diff --git a/.hgignore b/.hgignore index 023de87e688..81a7f7025ff 100644 --- a/.hgignore +++ b/.hgignore @@ -5,6 +5,6 @@ nbproject/private/ ^webrev ^.src-rev$ ^.jib/ -.DS_Store -.metadata/ -.recommenders/ +\.DS_Store +\.metadata/ +\.recommenders/ diff --git a/.hgtags-top-repo b/.hgtags-top-repo deleted file mode 100644 index 6bb033be77d..00000000000 --- a/.hgtags-top-repo +++ /dev/null @@ -1,449 +0,0 @@ -cfeea66a3fa8ca3686a7cfa2d0ce8ab0169f168d jdk7-b24 -cbc8ad9dd0e085a607427ea35411990982f19a36 jdk7-b25 -9410f77cc30c604d1caf7c9fe3a57fa19e1acbe8 jdk7-b26 -11b4dc9f2be3523ef989a0db8459eb56b3045c3a jdk7-b27 -56652b46f328937f6b9b5130f1e4cd80f48868ef jdk7-b28 -31e08f70e88d77c2053f91c21b49a04296bdc59a jdk7-b29 -2dab2f712e1832c92acfa63ec0337048b9422c20 jdk7-b30 -3300a35a0bd56d695b92fe0b34f03ebbfc939064 jdk7-b31 -64da805be725721bf2004e7409a0d7a16fc8ddbc jdk7-b32 -bb1ef4ee3d2c8cbf43a37d372325a7952be590b9 jdk7-b33 -46a989ab932992b2084b946eeb322fa99b9fee6c jdk7-b34 -143c1abedb7d3095eff0f9ee5fec9bf48e3490fc jdk7-b35 -4b4f5fea8d7d0743f0c30d91fcd9bf9d96e5d2ad jdk7-b36 -744554f5a3290e11c71cd2ddb1aff49e431f9ed0 jdk7-b37 -cc47a76899ed33a2c513cb688348244c9b5a1288 jdk7-b38 -ab523b49de1fc73fefe6855ce1e0349bdbd7af29 jdk7-b39 -44be42de6693063fb191989bf0e188de2fa51e7c jdk7-b40 -541bdc5ad32fc33255944d0a044ad992f3d915e8 jdk7-b41 -94052b87287303527125026fe4b2698cf867ea83 jdk7-b42 -848e684279d2ba42577d9621d5b2e5af3823d12d jdk7-b43 -a395e3aac4744cc9033fcd819fad1239a45add52 jdk7-b44 -99846f001ca214015578d593802d26e27246a802 jdk7-b45 -e8a2a4d187773a62f3309b0fa265c13425bc2258 jdk7-b46 -d7744e86dedc21a8ecf6bdb73eb191b8eaf5b0da jdk7-b47 -4ae9f4bfdb98f65bd957e3fe72471b320150b38e jdk7-b48 -aee93a8992d2389121eb610c00a86196f3e2b9b0 jdk7-b49 -5111e13e44e542fe945b47ab154546daec36737d jdk7-b50 -0f0189d55ce4a1f7840da7582ac7d970b3b7ab15 jdk7-b51 -4264c2fe66493e57c411045a1b61377796641e45 jdk7-b52 -c235f4a8559d196879c56af80159f67ee5d0e720 jdk7-b53 -2ef382b1bbd58a68e668391c6145a4b2066c5b96 jdk7-b54 -aea0ace7a1e43619800931d42bbf69c579361c2d jdk7-b55 -ba12117a5e6c918578d6b2a8c693232a33289024 jdk7-b56 -ffd09e767dfa6d21466183a400f72cf62d53297f jdk7-b57 -59b497130f82ec809c245ffb5e521e3a5fabf8af jdk7-b58 -030142474602b4a067662fffc0c8e541de5a78df jdk7-b59 -39565502682c7085369bd09e51640919dc741097 jdk7-b60 -472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61 -c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62 -57f7e028c7ad1806500ae89eb3f4cd9a51b10e18 jdk7-b63 -269c1ec4435dfb7b452ae6e3bdde005d55c5c830 jdk7-b64 -e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65 -6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66 -c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67 -e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68 -82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69 -175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70 -4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71 -0d7e03b426df27c21dcc44ffb9178eacd1b04f10 jdk7-b72 -3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73 -2c88089b6e1c053597418099a14232182c387edc jdk7-b74 -d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75 -c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76 -1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77 -ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78 -20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79 -a3242906c7747b5d9bcc3d118c7c3c69aa40f4b7 jdk7-b80 -8403096d1fe7ff5318df9708cfec84a3fd3e1cf9 jdk7-b81 -e1176f86805fe07fd9fb9da065dc51b47712ce76 jdk7-b82 -6880a3af9addb41541e80ebe8cde6f79ec402a58 jdk7-b83 -2f3ea057d1ad56cf3b269cdc4de2741411151982 jdk7-b84 -cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85 -433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86 -6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87 -82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88 -7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89 -425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90 -97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91 -5f5c33d417f3a14706b09a4a95e65fa7b6fa54d6 jdk7-b92 -5fc102ff48f0e787ce9cc77249841d5ff0941b75 jdk7-b93 -d7f35c61afa092b6357c2c4bce3f298f16620f71 jdk7-b94 -fd3663286e77b9f13c39eee124db2beb079b3ca6 jdk7-b95 -cf71cb5151166f35433afebaf67dbf34a704a170 jdk7-b96 -5e197c942c6ebd8b92f324a31049c5f1d26d40ef jdk7-b97 -6cea9984d73d74de0cd01f30d07ac0a1ed196117 jdk7-b98 -e7f18db469a3e947b7096bfd12e87380e5a042cd jdk7-b99 -b218a53ec7d3d42be61d31d6917a6c5c037b6f56 jdk7-b100 -4193eaf5f1b82794c6a0fb1a8d11af43d1b1d611 jdk7-b101 -a136a51f5113da4dad3853b74a8536ab583ab112 jdk7-b102 -be2aedc4e3b1751c1310f334242ba69e90867f38 jdk7-b103 -f8be576feefce0c6695f188ef97ec16b73ad9cfd jdk7-b104 -9f96a4269d7727dad68864eaab795eafce270311 jdk7-b105 -43096cccf1cee749c2f4e7714ee71f4e9e0f4d7f jdk7-b106 -7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107 -140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108 -81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109 -2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110 -9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111 -b852103caf73da70068473777ae867a457bb3ae1 jdk7-b112 -c1df968c4527bfab5f97662a89245f15d12d378b jdk7-b113 -27985a5c6e5268014d25d55886e0ecb96af4763d jdk7-b114 -e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115 -94e9a1bfba8b8d1fe0bfd43b88629b1f27b02a76 jdk7-b116 -7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117 -a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118 -661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119 -366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120 -2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121 -f1591eed71f64f6eba79fb7426f5616cc4dfea73 jdk7-b122 -ed6950da30cf1e8904b4bdb034d471647942271f jdk7-b123 -024a6755895bf91b5a3c98984c89ee018efbf538 jdk7-b124 -5c4df7e992775c102f08e9f1c0a124b324641b70 jdk7-b125 -b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126 -bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127 -57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128 -a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129 -cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130 -5d86d951426aaf340b1ba84ae2d5ab5da65a71e2 jdk7-b131 -0f62a65fb666b337caa585015ab6ea2e60e709ca jdk7-b132 -c6f380693342feadccc5fe2c5adf500e861361aa jdk7-b133 -ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134 -783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135 -2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136 -7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137 -fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138 -7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139 -dcfe74f1c6553c556e7d361c30b0b614eb5e40f6 jdk7-b140 -c6569c5585851dfd39b8de8e021c3c312f51af12 jdk7-b141 -cfbbdb77eac0397b03eb99ee2e07ea00e0a7b81e jdk7-b142 -14b8e7eee1058fd4ed5a2700a2ce14b3616278f1 jdk7-b143 -7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144 -55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145 -2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 -d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 -f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01 -69f592185747226a9c765a9fe139c1d34d616f9c jdk8-b02 -587bb549dff83131b65f40aa51864f69562f34a7 jdk8-b03 -0b66a233bfb9ba2ebda1e5cdfdb0373d6c1e3c69 jdk8-b04 -b910aac18c772b823b1f7da03e2c6528725cc6de jdk8-b05 -28cf2aec4dd7c3c75efc1c15078522467c781a6d jdk8-b06 -0db7ae9f2b1017124c779bccd016c976928859a0 jdk8-b07 -fb1bc13260d76447e269e843859eb593fe2a8ab2 jdk8-b08 -8adb70647b5af5273dfe6a540f07be667cd50216 jdk8-b09 -a6c4c248e8fa350c35014fa94bab5ac1a1ac3299 jdk8-b10 -1defbc57940a56f0aa41e9dee87b71e8c8b71103 jdk8-b11 -8e2104d565baee473895d5eba20e39f85ab4bf9f jdk8-b12 -26fb81a1e9ceb9baffba216acd9ded62e9e9d5ab jdk8-b13 -23aa7f2c80a2fa354c80decf03e7c2018177ef4e jdk8-b14 -a4f28069d44a379cda99dd1d921d19f819726d22 jdk8-b15 -4e06ae613e99549835896720c7a68c29ad5543f5 jdk8-b17 -4e06ae613e99549835896720c7a68c29ad5543f5 jdk8-b16 -7010bd24cdd07bc7daef80702f39124854dec36c jdk8-b18 -237bc29afbfc6f56a4fe4a6008e2befb59c44bac jdk8-b19 -5a5eaf6374bcbe23530899579fed17a05b7705f3 jdk8-b20 -cc771d92284f71765eca14d6d08703c4af254c04 jdk8-b21 -7ad075c809952e355d25030605da6af30456ed74 jdk8-b22 -60d6f64a86b1e511169d264727f6d51415978df0 jdk8-b23 -1a5f1d6b98d6827cdb529a4abe6e52a886d944f4 jdk8-b24 -221a378e06a326f45e5d89e2123cd6323e0181d1 jdk8-b25 -2accafff224ae39caf5f532c305251ba624bf2c0 jdk8-b26 -1533dfab9903e4edcfead3b0192643f38c418b9b jdk8-b27 -6e2541d60f4e342b5b67140271d7611643929dc3 jdk8-b28 -41460de042580bc4a4ce3f863779c66f39cb8578 jdk8-b29 -6cea54809b51db92979c22fd8aa8fcb1cb13d12e jdk8-b30 -0b66f43b89a6c0ac1c15d7ec51992c541cdc9089 jdk8-b31 -88176171e940f02916a312c265a34c32552a8376 jdk8-b32 -42f275168fa5d9e7c70b246614dca8cf81f52c2e jdk8-b33 -894a478d2c4819a1a0f230bd7bdd09f3b2de9a8c jdk8-b34 -5285317ebb4e8e4f6d8d52b5616fa801e2ea844d jdk8-b35 -6a6ba0a07f33d37a2f97b1107e60c6a9a69ec84d jdk8-b36 -b2972095a4b1e2a97409b7c3df61f3b263a5ce14 jdk8-b37 -d939bd0ab13c16647ffa38cc4b64fb31b7d44e10 jdk8-b38 -8927dd68aee3fa54a1a698e2980e1b2f6c7c12c1 jdk8-b39 -a2b2d435f1d275fa8010774c653197c64e326d3a jdk8-b40 -1a8c7c530f8a9b7f5bdb9b0693b2f5435ca5205e jdk8-b41 -1ce5dc16416611c58b7480ca67a2eee5153498a6 jdk8-b42 -661c9aae602bbd9766d12590800c90f1edd1d8dd jdk8-b43 -e4f81a817447c3a4f6868f083c81c2fb1b15d44c jdk8-b44 -633f2378c904c92bb922a6e19e9f62fe8eac14af jdk8-b45 -27fa766a2298ba8347dc198f0cf85ba6618e17db jdk8-b46 -1dcb4b7b9373e64e135c12fe1f8699f1f80e51e8 jdk8-b47 -3f6c72d1c2a6e5c9e7d81c3dc984886678a128ad jdk8-b48 -c97b99424815c43818e3cc3ffcdd1a60f3198b52 jdk8-b49 -2fd67618b9a3c847780ed7b9d228e862b6e2824c jdk8-b50 -57c0aee7309050b9d6cfcbd202dc704e9260b377 jdk8-b51 -8d24def5ceb3b8f2e857f2e18b2804fc59eecf8d jdk8-b52 -febd7ff5280067ca482faaeb9418ae88764c1a35 jdk8-b53 -c1a277c6022affbc6855bdfb039511e73fbe2395 jdk8-b54 -b85b44cced2406792cfb9baab1377ff03e7001d8 jdk8-b55 -76844579fa4b30929731115b237e477181a82394 jdk8-b56 -522dfac8ca4d07c0b74025d4ac3b6e5feefbb829 jdk8-b57 -9367024804874faf8e958adeb333682bab1c0c47 jdk8-b58 -dae9821589ccd2611bdf7084269b98e819091770 jdk8-b59 -e07f499b9dccb529ecf74172cf6ac11a195ec57a jdk8-b60 -20ff117b509075c3aec4ee3a57990ecd5db5df9c jdk8-b61 -8a3fe0ae06a8cc21347da5a18384b0aa6c2349f5 jdk8-b62 -3229597524cab4239325bc3602df6c486397a511 jdk8-b63 -1c8370a55b305d35353346202bde042ba9e8a9fd jdk8-b64 -b772de306dc24c17f7bd1398531ddeb58723b804 jdk8-b65 -13bb8c326e7b7b0b19d78c8088033e3932e3f7ca jdk8-b66 -9a6ec97ec45c1a62d5233cefa91e8390e380e13a jdk8-b67 -cdb401a60cea6ad5ef3f498725ed1decf8dda1ea jdk8-b68 -6ee8080a6efe0639fcd00627a5e0f839bf010481 jdk8-b69 -105a25ffa4a4f0af70188d4371b4a0385009b7ce jdk8-b70 -51ad2a34342055333eb5f36e2fb514b027895708 jdk8-b71 -c1be681d80a1f1c848dc671d664fccb19e046a12 jdk8-b72 -93b9664f97eeb6f89397a8842318ebacaac9feb9 jdk8-b73 -b43aa5bd8ca5c8121336495382d35ecfa7a71536 jdk8-b74 -2a713921952cbd77a1e699626976cb6cdfe3e57e jdk8-b75 -278af9fc67e7eba2884936b49ec07345f423aabb jdk8-b76 -3933eebc659d58c597aa8cb4b3e58f2250ce3e1a jdk8-b77 -fd1a5574cf68af24bfd52decc37ac6361afb278a jdk8-b78 -91d35211e74464dca5edf9b66ab01d0d0d8cded7 jdk8-b79 -907a926d3c96472f357617b48b6b968ea855c23c jdk8-b80 -145dbc56f931c134e837b675b9e6e7bf08902e93 jdk8-b81 -29153d0df68f84162ffe8c2cf4f402a3f2245e85 jdk8-b82 -466685ba01bfb7bc1e1ac61490fd8c0f3cc18763 jdk8-b83 -01f631f89fa392b4e484d0812c40ea8f9d2353aa jdk8-b84 -7fc358f5943676b82f1dccd3152b1ac07d92e38b jdk8-b85 -df9b5240f0a76c91cfe1a5b39da4d08df56e05be jdk8-b86 -b9415faa7066a4d3b16d466556d5428446918d95 jdk8-b87 -e1a929afcfc492470d50be0b6b0e8dc77d3760b9 jdk8-b88 -892a0196d10c67f3a12f0eefb0bb536e423d8868 jdk8-b89 -69b773a221b956a3386933ecdbfeccee0edeac47 jdk8-b90 -cb51fb4789ac0b8be4056482077ddfb8f3bd3805 jdk8-b91 -3a36c926a7aafa9d4a892a45ef3678e87ad8359b jdk8-b92 -27c51c6e31c1ef36afa0e6efb031f9b13f26c12b jdk8-b93 -50d2bde060f2a9bbbe4da0c8986e20aca61f2e2e jdk8-b94 -785d07fe38901ecc1b7e0145e53e1c3da9361fee jdk8-b95 -c156084add486f941c12d886a0b1b2854795d557 jdk8-b96 -a1c1e8bf71f354f3aec0214cf13d6668811e021d jdk8-b97 -0d0c983a817bbe8518a5ff201306334a8de267f2 jdk8-b98 -59dc9da813794c924a0383c2a6241af94defdfed jdk8-b99 -d2dcb110e9dbaf9903c05b211df800e78e4b394e jdk8-b100 -9f74a220677dc265a724515d8e2617548cef62f1 jdk8-b101 -5eb3c1dc348f72a7f84f7d9d07834e8bbe09a799 jdk8-b102 -b7e64be81c8a7690703df5711f4fc2375da8a9cb jdk8-b103 -96c1b9b7524b52c3fcefc90ffad4c767396727c8 jdk8-b104 -5166118c59178b5d31001bc4058e92486ee07d9b jdk8-b105 -8e7b4d9fb00fdf1334376aeac050c9bca6d1b383 jdk8-b106 -0874bb4707b723d5bb108d379c557cf41529d1a7 jdk8-b107 -9286a6e61291246d88af713f1ef79adeea30fe2e jdk8-b108 -91f47e8da5c60de58ed195e9b57f3bf192a18f83 jdk8-b109 -4faa09c7fe555de086dd9048d3c5cc92317d6f45 jdk8-b110 -d086227bfc45d124f09b3bd72a07956b4073bf71 jdk8-b111 -547316ea137d83d9c63083a9b83db64198fe0c81 jdk8-b112 -6ba4c7cb623ec612031e05cf8bf279d8f407bd1e jdk8-b113 -4f2011496393a26dcfd7b1f7787a3673ddd32599 jdk8-b114 -763ada2a1d8c5962bc8c3d297e57c562d2e95338 jdk8-b115 -cbfe5da942c63ef865cab4a7159e01eff7d7fcf5 jdk8-b116 -a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117 -0a6db1aac998cdc88e52f9adb97d40ca5b0f1da6 jdk8-b118 -9e90215673be68a3e77a9e444e4232076373734d jdk8-b119 -cd3825b2983045784d6fc6d1729c799b08215752 jdk8-b120 -1e1f86d5d4e22c15a9bf9f1581acddb8c59abae2 jdk9-b00 -50669e45cec4491de0d921d3118a3fe2e767020a jdk9-b01 -135f0c7af57ebace31383d8877f47e32172759ff jdk9-b02 -fd8d51bdf9aadf7ae83e65e8655c53581017c363 jdk9-b03 -cb4c3440bc2748101923e2488506e61009ab1bf5 jdk9-b04 -8c63f0b6ada282f27e3a80125e53c3be603f9af7 jdk9-b05 -d0b525cd31b87abeb6d5b7e3516953eeb13b323c jdk9-b06 -0ea015c298b201c07fa33990f2445b6d0ef3566d jdk9-b07 -db045d8faa0924b7378102d24a1a0d850c1e3834 jdk9-b08 -4a21dc7d57d1069a01f68e7182c074cb37349dfb jdk9-b09 -fa13f2b926f8426876ec03e7903f3ee0ee150f2e jdk9-b10 -ab55a18a95e1990a588929d5d29db3eb9985fea0 jdk9-b11 -59f6350295f9681fe5956d8bc889bf341914c6cb jdk9-b12 -5800456add07e1a68170a229fb5e27376f8875e5 jdk9-b13 -4e3aa9723e9972623e3dafc321b368e7db7e9b3b jdk9-b14 -b114474fb25af4e73cb7219f7c04bd8994da03a5 jdk9-b15 -cf22a728521f91a4692b433d39d730a0a1b23155 jdk9-b16 -24152ee0ee1abef54a8bab04c099261dba7bcca5 jdk9-b17 -65abab59f783fcf02ff8e133431c252f9e5f07d5 jdk9-b18 -75a08df650eb3126bab0c4d15241f5886162393c jdk9-b19 -ee4fd72b2ec3d92497f37163352f294aa695c6fb jdk9-b20 -9052803f4d01feda28b3d65f2b64dd457d21c7b6 jdk9-b21 -8e4bdab4c362aadde2d321f968cd503a2f779e2f jdk9-b22 -88567461a2cd9b7fb431fee6440005a694df1f47 jdk9-b23 -1d4a293fbec19dc2d5790bbb2c7dd0ed8f265484 jdk9-b24 -aefd8899a8d6615fb34ba99b2e38996a7145baa8 jdk9-b25 -d3ec8d048e6c3c46b6e0ee011cc551ad386dfba5 jdk9-b26 -ba5645f2735b41ed085d07ba20fa7b322afff318 jdk9-b27 -ea2f7981236f3812436958748ab3d26e80a35130 jdk9-b28 -9e6581aeda388a23fbee021fc33e6aa152a60657 jdk9-b29 -36e9bc875325813ac9c44ac0c617a463091fa9f5 jdk9-b30 -69a84c16d9c28e0e3d504b9c8766c24bafcd58f6 jdk9-b31 -7e3512dae8e020d44399c0f1c579ff1fe3090ed6 jdk9-b32 -e4ba01b726e263953ae129be37c94de6ed145b1d jdk9-b33 -087b23f35631e68e950496a36fce8ccca612966a jdk9-b34 -c173ba994245380fb11ef077d1e59823386840eb jdk9-b35 -201d4e235d597a25a2d3ee1404394789ba386119 jdk9-b36 -723a67b0c442391447b1d8aad8b249d06d1032e8 jdk9-b37 -d42c0a90afc3c66ca87543076ec9aafd4b4680de jdk9-b38 -512dbbeb1730edcebfec873fc3f1455660b32000 jdk9-b39 -cf136458ee747e151a27aa9ea0c1492ea55ef3e7 jdk9-b40 -67395f7ca2db3b52e3a62a84888487de5cb9210a jdk9-b41 -f7c11da0b0481d49cc7a65a453336c108191e821 jdk9-b42 -02ee8c65622e8bd97496d584e22fc7dcf0edc4ae jdk9-b43 -8994f5d87b3bb5e8d317d4e8ccb326da1a73684a jdk9-b44 -3dd628fde2086218d548841022ee8436b6b88185 jdk9-b45 -12f1e276447bcc81516e85367d53e4f08897049d jdk9-b46 -b6cca3e6175a69f39e5799b7349ddb0176630291 jdk9-b47 -0064e246d83f6f9fc245c19b6d05041ecaf4b6d4 jdk9-b48 -d91ed1951b948210590ce1394bea5515357246ba jdk9-b49 -d1f37d39ff2421f956a6ddf316cf763807bc3363 jdk9-b50 -6207b4b8731ca75c51b031c47daa813ab92ef558 jdk9-b51 -1822e59f17121b09e7899cf338cfb6e37fe5fceb jdk9-b52 -d6ed47125a76cd1cf8a100568507bfb5e9669d9f jdk9-b53 -cb7367141e910e265b8344a8facee740bd1e5467 jdk9-b54 -0c37a832458f0e0b7d2a3f1a6f69aeae311aeb18 jdk9-b55 -eb7febe45865ba6b81f2ea68082262d0708a0b22 jdk9-b56 -f25ee9f62427a9ba27418e5531a89754791a305b jdk9-b57 -6e78dd9b121037719a065fe8fb25b936babdfecb jdk9-b58 -39e8a131289e8386aa4c3e4b184faa812a7c0421 jdk9-b59 -9fa2185bee17462d1014538bff60af6e6f0b01e7 jdk9-b60 -ea38728b4f4bdd8fd0d7a89b18069f521cf05013 jdk9-b61 -105d045a69174d870b69bfe471b3f2d05a9f8ecc jdk9-b62 -0b32ed628fa60e4ab99fb0b5866d648e16231f17 jdk9-b63 -82cf9aab9a83e41c8194ba01af9666afdb856cbe jdk9-b64 -7c31f9d7b932f7924f1258d52885b1c7c3e078c2 jdk9-b65 -dc6e8336f51bb6b67b7245766179eab5ca7720b4 jdk9-b66 -f546760134eb861fcfecd4ce611b0040b0d25a6a jdk9-b67 -70e4272790b6199e9ca89df2758ff9cb58ec4125 jdk9-b68 -1bcfd6b8726582cff5a42dbfc75903e36f9dd4fe jdk9-b69 -eed77fcd77711fcdba05f18fc22f37d86efb243c jdk9-b70 -c706ef5ea5da00078dc5e4334660315f7d99c15b jdk9-b71 -8582c35016fb6211b373810b6b172feccf9c483b jdk9-b72 -4c2cbaae528bce970dabbb5676005d379357f4b6 jdk9-b73 -57f3134853ecdd4a3ee2d4d26f22ba981d653d79 jdk9-b74 -8fd6eeb878606e39c908f12535f34ebbfd225a4a jdk9-b75 -d82072b699b880a1f647a5e2d7c0f86cec958941 jdk9-b76 -7972dc8f2a47f0c4cd8f02fa5662af41f028aa14 jdk9-b77 -8c40d4143ee13bdf8170c68cc384c36ab1e9fadb jdk9-b78 -ba08a9f79b9849716bae1f39f71333d47f604012 jdk9-b79 -f7c5ae2933c0b8510a420d1713a955e4ffc7ad0b jdk9-b80 -b8afcf91331d78626a583ec1b63164468d6f4181 jdk9-b81 -42b56d1f418523ecb61a49d7493302c80c8009cc jdk9-b82 -ce5c14d97d95084504c32b9320cb33cce4235588 jdk9-b83 -1c8134475511ffe6726677e1418a89a7a45e92d6 jdk9-b84 -1f345217c9bab05f192d00cf1665b3286c49ccdb jdk9-b85 -2aa1daf98d3e2ee37f20f6858c53cc37020f6937 jdk9-b86 -fd4f4f7561074dc0dbc1772c8489c7b902b6b8a9 jdk9-b87 -0bb87e05d83e1cf41cfb7ddeb2c8eaec539fd907 jdk9-b88 -895353113f382d24e623191fdab0e29a3ce34738 jdk9-b89 -cf1dc4c035fb84693d4ae5ad818785cb4d1465d1 jdk9-b90 -122142a185381ce5cea959bf13b923d8cc333628 jdk9-b91 -106c06398f7ab330eef9e335fbd3a5a8ead23b77 jdk9-b92 -331fda57dfd323c61804ba0472776790de572937 jdk9-b93 -349488425abcaf3ff62f580007860b4b56875d10 jdk9-b94 -12a6fb4f070f8ca8fbca219ab9abf5da8908b317 jdk-9+95 -5582a79892596169ebddb3e2c2aa44939e4e3f40 jdk-9+96 -75c3897541ecb52ee16d001ea605b12971df7303 jdk-9+97 -48987460c7d49a29013963ee44d090194396bb61 jdk-9+98 -7c0577bea4c65d69c5bef67023a89d2efa4fb2f7 jdk-9+99 -c1f30ac14db0eaff398429c04cd9fab92e1b4b2a jdk-9+100 -c4d72a1620835b5d657b7b6792c2879367d0154f jdk-9+101 -6406ecf5d39482623225bb1b3098c2cac6f7d450 jdk-9+102 -47d6462e514b2097663305a57d9c844c15d5b609 jdk-9+103 -9a38f8b4ba220708db198d08d82fd2144a64777d jdk-9+104 -be58b02c11f90b88c67e4d0e2cb5e4cf2d9b3c57 jdk-9+105 -54575d8783b3a39a2d710c28cda675d44261f9d9 jdk-9+106 -4d65eba233a8730f913734a6804910b842d2cb54 jdk-9+107 -c7be2a78c31b3b6132f2f5e9e4b3d3bb1c20245c jdk-9+108 -1787bdaabb2b6f4193406e25a50cb0419ea8e8f3 jdk-9+109 -925be13b3740d07a5958ccb5ab3c0ae1baba7055 jdk-9+110 -f900d5afd9c83a0df8f36161c27c5e4c86a66f4c jdk-9+111 -03543a758cd5890f2266e4b9678378a925dde22a jdk-9+112 -55b6d550828d1223b364e6ead4a56e56411c56df jdk-9+113 -1d992540870ff33fe6cc550443388588df9b9e4f jdk-9+114 -09617ce980b99d49abfd54dacfed353c47e2a115 jdk-9+115 -6743a8e0cab7b5f6f4a0575f6664892f0ab740af jdk-9+116 -e882bcdbdac436523f3d5681611d3118a3804ea7 jdk-9+117 -047f95de8f918d8ff5e8cd2636a2abb5c3c8adb8 jdk-9+118 -3463a3f14f0f0e8a68f29ac6405454f2fa2f598a jdk-9+119 -647e0142a5a52749db572b5e6638d561def6479e jdk-9+120 -cae471d3b87783e0a3deea658e1e1c84b2485b6c jdk-9+121 -346be2df0f5b31d423807f53a719d1b9a67f3354 jdk-9+122 -405d811c0d7b9b48ff718ae6c240b732f098c028 jdk-9+123 -f80c841ae2545eaf9acd2724bccc305d98cefbe2 jdk-9+124 -9aa7d40f3a453f51e47f4c1b19eff5740a74a9f8 jdk-9+125 -3a58466296d36944454756ef01e7513ac5e14a16 jdk-9+126 -8fa686245bd2a072ece3392743460030f0854520 jdk-9+127 -b30ae794d974d7dd3eb4e84203f70021823fa6c6 jdk-9+128 -f5902d3841b82cac6e7716a20c24e8e916fb14a8 jdk-9+129 -d94d54a3192fea79234c3ac55cd0b4052d45e954 jdk-9+130 -8728756c2f70a79a90188f4019cfd6b9a275765c jdk-9+131 -a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132 -be1218f792a450dfb5d4b1f82616b9d95a6a732e jdk-9+133 -065724348690eda41fc69112278d8da6dcde548c jdk-9+134 -82b94cb5f342319d2cda77f9fa59703ad7fde576 jdk-9+135 -3ec350f5f32af249b59620d7e37b54bdcd77b233 jdk-9+136 -d7f519b004254b19e384131d9f0d0e40e31a0fd3 jdk-9+137 -67c4388142bdf58aec8fefa4475faaa8a5d7380c jdk-9+138 -7dcf453eacae79ee86a6bcc75fd0b546fc99b48a jdk-9+139 -a5815c6098a241d3a1df64d22b84b3524e4a77df jdk-9+140 -f64afae7f1a5608e438585bbf0bc23785e69cba0 jdk-9+141 -2b3e5caafe3594ea507c37675c4d3086f415dc64 jdk-9+142 -1fc62b1c629fb80fdaa639d3b59452a184f0d705 jdk-9+143 -8d337fd6333e28c48aa87880144b840aad82baaf jdk-9+144 -ff98aa9ec9fae991e426ce5926fc9036d25f5562 jdk-9+145 -a22e2671d88f6b22a4aa82e3966986542ed2a381 jdk-9+146 -5f6920274c48eb00d31afee6c034826a754c13d9 jdk-9+147 -3ffc3e886c74736e387f3685e86b557cdea706c8 jdk-9+148 -b119012d1c2ab2570fe8718633840d0c1f1f441d jdk-9+149 -6234069ff9789f7582e1faa32cb6283cbd1a5a2d jdk-9+150 -71a766d4c18041a7f833ee22823125b02e1a7f1e jdk-9+151 -ef056360ddf3977d7d2ddbeb456a4d612d19ea05 jdk-9+152 -816a6d03a7c44edfbd8780110529f1bdc3964fb9 jdk-9+153 -8d22611ffb6540bc1ace64a00c048c8b82d8c69a jdk-10+0 -8d26916eaa21b689835ffc1c0dbf12470aa9be61 jdk-9+154 -688a3863c00ebc089ab17ee1fc46272cbbd96815 jdk-9+155 -783ec7542cf7154e5d2b87f55bb97d28f81e9ada jdk-9+156 -4df5f619c9ead4604d2f97ed231b3a35ec688c41 jdk-10+1 -4eb77fb98952dc477a4229575c81d2263a9ce711 jdk-9+157 -a4087bc10a88a43ea3ad0919b5b4af1c86977221 jdk-9+158 -fe8466adaef8178dba94be53c789a0aaa87d13bb jdk-9+159 -4d29ee32d926ebc960072d51a3bc558f95c1cbad jdk-9+160 -cda60babd152d889aba4d8f20a8f643ab151d3de jdk-9+161 -21b063d75b3edbffb9bebc8872d990920c4ae1e5 jdk-9+162 -c38c6b270ccc8e2b86d1631bcf42248241b54d2c jdk-9+163 -7810f75d016a52e32295c4233009de5ca90e31af jdk-9+164 -aff4f339acd40942d3dab499846b52acd87b3af1 jdk-9+165 -ba5b16c9c6d80632b61959a33d424b1c3398ce62 jdk-9+166 -35017c286513ddcbcc6b63b99679c604993fc639 jdk-9+167 -143d4c87bc1ef1ed6dadd613cd9dd4488fdefc29 jdk-9+168 -9c7248b787c39b034d4f48d4aa48df903836cca7 jdk-10+2 -06373236a30801f72e2a31ee5c691c2a1e500f57 jdk-10+3 -8ec175c61fc3f58328a3324f07d7ded00e060be3 jdk-10+4 -111e2e7d00f45c983cdbc9c59ae40552152fcc23 jdk-10+5 -03fe61bb7670644cf6e46b5cfafb6b27c0e0157e jdk-10+6 -b25838a28195f4b6dab34668411eedd2d366a16c jdk-9+169 -4d163ec59d989a9261ed7f848bc6303f90869af5 jdk-9+170 -aa3c97810d7c484c93a2fd75d3c76ff574deb6d8 jdk-10+7 -df33ef1dc163f994177fd97d4d0e73a1e3cb5d85 jdk-10+8 -b94be69cbb1d2943b886bf2d458745756df146e4 jdk-10+9 -4c12464a907db4656c1033f56fa49cba643ac629 jdk-9+171 -6558c37afe832582238d338578d598f30c6fdd75 jdk-10+10 -2c25fc24103251f9711a1c280c31e1e41016d90f jdk-9+172 -6b750cdb823a029a25ff2e560302cc2d28a86cb6 jdk-10+11 -88d7fd969e7df0e07a53b201cfd29393ca33ede9 jdk-9+173 -5466f409346e0446ee9a6daeb7f5d75c8fc76823 jdk-9+174 -8d4ed1e06fe184c9cb08c5b708e7d6f5c066644f jdk-10+12 -8f7227c6012b0051ea4e0bcee040c627bf699b88 jdk-9+175 -d67a3f1f057f7e31e12f33ebe3667cb73d252268 jdk-10+13 -1fd5901544acc50bb30fde9388c8e53cb7c449e4 jdk-10+14 -84777531d994ef70163d35078ec9c4127f2eadb5 jdk-9+176 -a4371edb589c60db01142e45c317adb9ccbcb083 jdk-9+177 -a6c830ee8a6798b186730475e700027cdf4598aa jdk-10+15 -2fe66ca1e2b3c361f949de9cb2894661dc0a3fa2 jdk-10+16 -ec4159ebe7050fcc5dcee8a2d150cf948ecc97db jdk-9+178 -252475ccfd84cc249f8d6faf4b7806b5e2c384ce jdk-9+179 -a133a7d1007b1456bc62824382fd8ac93b45d329 jdk-10+17 -536b81db8075486ca0fe3225d8e59313df5b936c jdk-10+18 -b803e6cff41e72a1e6d8782e1ef7c25a6e3e5ee3 jdk-10+19 -d2982a786f53814367698e63efe6349c9128e1db jdk-9+180 -b656dea9398ef601f7fc08d1a5157a560e0ccbe0 jdk-9+181 -682e2a6df836f4731f92eb2ddcd467075047f6ea jdk-10+20 -90cdfe56f1543267a8005e638bd1b44551fda189 jdk-10+21 -8625e8491887bfd4310b2cfc2b84bac26312ba20 jdk-10+22 diff --git a/common/bin/blessed-modifier-order.sh b/bin/blessed-modifier-order.sh similarity index 100% rename from common/bin/blessed-modifier-order.sh rename to bin/blessed-modifier-order.sh diff --git a/common/bin/idea.sh b/bin/idea.sh similarity index 100% rename from common/bin/idea.sh rename to bin/idea.sh diff --git a/common/bin/jib.sh b/bin/jib.sh similarity index 100% rename from common/bin/jib.sh rename to bin/jib.sh diff --git a/nashorn/bin/fixwhitespace.sh b/bin/nashorn/fixwhitespace.sh similarity index 100% rename from nashorn/bin/fixwhitespace.sh rename to bin/nashorn/fixwhitespace.sh diff --git a/nashorn/bin/runopt.sh b/bin/nashorn/runopt.sh similarity index 100% rename from nashorn/bin/runopt.sh rename to bin/nashorn/runopt.sh diff --git a/common/bin/print-config.js b/bin/print-config.js similarity index 100% rename from common/bin/print-config.js rename to bin/print-config.js diff --git a/common/bin/unshuffle_list.txt b/bin/unshuffle_list.txt similarity index 100% rename from common/bin/unshuffle_list.txt rename to bin/unshuffle_list.txt diff --git a/common/bin/unshuffle_patch.sh b/bin/unshuffle_patch.sh similarity index 100% rename from common/bin/unshuffle_patch.sh rename to bin/unshuffle_patch.sh diff --git a/common/bin/hgforest.sh b/common/bin/hgforest.sh deleted file mode 100644 index b5d6a6c938c..00000000000 --- a/common/bin/hgforest.sh +++ /dev/null @@ -1,444 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# Shell script for a fast parallel forest/trees command - -usage() { - echo "usage: $0 [-h|--help] [-q|--quiet] [-v|--verbose] [-s|--sequential] [--] [commands...]" > ${status_output} - echo "command format : mercurial-command [ "jdk" ] [ extra-url ]" - echo "command option: jdk : used only with clone command to request just the extra repos for JDK-only builds" - echo "command option : extra-url : server hosting the extra repositories" - echo "Environment variables which modify behaviour:" - echo " HGFOREST_QUIET : (boolean) If 'true' then standard output is redirected to /dev/null" - echo " HGFOREST_VERBOSE : (boolean) If 'true' then Mercurial asked to produce verbose output" - echo " HGFOREST_SEQUENTIAL : (boolean) If 'true' then repos are processed sequentially. Disables concurrency" - echo " HGFOREST_GLOBALOPTS : (string, must begin with space) Additional Mercurial global options" - echo " HGFOREST_REDIRECT : (file path) Redirect standard output to specified file" - echo " HGFOREST_FIFOS : (boolean) Default behaviour for FIFO detection. Does not override FIFOs disabled" - echo " HGFOREST_CONCURRENCY: (positive integer) Number of repos to process concurrently" - echo " HGFOREST_DEBUG : (boolean) If 'true' then temp files are retained" - exit 1 -} - -global_opts="${HGFOREST_GLOBALOPTS:-}" -status_output="${HGFOREST_REDIRECT:-/dev/stdout}" -qflag="${HGFOREST_QUIET:-false}" -vflag="${HGFOREST_VERBOSE:-false}" -sflag="${HGFOREST_SEQUENTIAL:-false}" -while [ $# -gt 0 ] -do - case $1 in - -h | --help ) - usage - ;; - - -q | --quiet ) - qflag="true" - ;; - - -v | --verbose ) - vflag="true" - ;; - - -s | --sequential ) - sflag="true" - ;; - - '--' ) # no more options - shift; break - ;; - - -*) # bad option - usage - ;; - - * ) # non option - break - ;; - esac - shift -done - -# debug mode -if [ "${HGFOREST_DEBUG:-false}" = "true" ] ; then - global_opts="${global_opts} --debug" -fi - -# silence standard output? -if [ ${qflag} = "true" ] ; then - global_opts="${global_opts} -q" - status_output="/dev/null" -fi - -# verbose output? -if [ ${vflag} = "true" ] ; then - global_opts="${global_opts} -v" -fi - -# Make sure we have a command. -if [ ${#} -lt 1 -o -z "${1:-}" ] ; then - echo "ERROR: No command to hg supplied!" > ${status_output} - usage > ${status_output} -fi - -# grab command -command="${1}"; shift - -if [ ${vflag} = "true" ] ; then - echo "# Mercurial command: ${command}" > ${status_output} -fi - -# At this point all command options and args are in "$@". -# Always use "$@" (within double quotes) to avoid breaking -# args with spaces into separate args. - -if [ ${vflag} = "true" ] ; then - echo "# Mercurial command argument count: $#" > ${status_output} - for cmdarg in "$@" ; do - echo "# Mercurial command argument: ${cmdarg}" > ${status_output} - done -fi - -# Clean out the temporary directory that stores the pid files. -tmp=/tmp/forest.$$ -rm -f -r ${tmp} -mkdir -p ${tmp} - - -if [ "${HGFOREST_DEBUG:-false}" = "true" ] ; then - # ignores redirection. - echo "DEBUG: temp files are in: ${tmp}" >&2 -fi - -# Check if we can use fifos for monitoring sub-process completion. -echo "1" > ${tmp}/read -while_subshell=1 -while read line; do - while_subshell=0 - break; -done < ${tmp}/read -rm ${tmp}/read - -on_windows=`uname -s | egrep -ic -e 'cygwin|msys'` - -if [ ${while_subshell} = "1" -o ${on_windows} = "1" ]; then - # cygwin has (2014-04-18) broken (single writer only) FIFOs - # msys has (2014-04-18) no FIFOs. - # older shells create a sub-shell for redirect to while - have_fifos="false" -else - have_fifos="${HGFOREST_FIFOS:-true}" -fi - -safe_interrupt () { - if [ -d ${tmp} ]; then - if [ "`ls ${tmp}/*.pid`" != "" ]; then - echo "Waiting for processes ( `cat ${tmp}/.*.pid ${tmp}/*.pid 2> /dev/null | tr '\n' ' '`) to terminate nicely!" > ${status_output} - sleep 1 - # Pipe stderr to dev/null to silence kill, that complains when trying to kill - # a subprocess that has already exited. - kill -TERM `cat ${tmp}/*.pid | tr '\n' ' '` 2> /dev/null - wait - echo "Interrupt complete!" > ${status_output} - fi - rm -f -r ${tmp} - fi - exit 130 -} - -nice_exit () { - if [ -d ${tmp} ]; then - if [ "`ls -A ${tmp} 2> /dev/null`" != "" ]; then - wait - fi - if [ "${HGFOREST_DEBUG:-false}" != "true" ] ; then - rm -f -r ${tmp} - fi - fi -} - -trap 'safe_interrupt' INT QUIT -trap 'nice_exit' EXIT - -subrepos="corba jaxp jaxws langtools jdk hotspot nashorn" -jdk_subrepos_extra="closed jdk/src/closed jdk/make/closed jdk/test/closed hotspot/make/closed hotspot/src/closed hotspot/test/closed" -subrepos_extra="$jdk_subrepos_extra deploy install sponsors" - -# Only look in specific locations for possible forests (avoids long searches) -pull_default="" -repos="" -repos_extra="" -if [ "${command}" = "clone" -o "${command}" = "fclone" -o "${command}" = "tclone" ] ; then - # we must be a clone - if [ ! -f .hg/hgrc ] ; then - echo "ERROR: Need initial repository to use this script" > ${status_output} - exit 1 - fi - - # the clone must know where it came from (have a default pull path). - pull_default=`hg paths default` - if [ "${pull_default}" = "" ] ; then - echo "ERROR: Need initial clone with 'hg paths default' defined" > ${status_output} - exit 1 - fi - - # determine which sub repos need to be cloned. - for i in ${subrepos} ; do - if [ ! -f ${i}/.hg/hgrc ] ; then - repos="${repos} ${i}" - fi - done - - pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'` - - if [ $# -gt 0 ] ; then - if [ "x${1}" = "xjdk" ] ; then - subrepos_extra=$jdk_subrepos_extra - echo "subrepos being cloned are $subrepos_extra" - shift - fi - # if there is an "extra sources" path then reparent "extra" repos to that path - if [ "x${pull_default}" = "x${pull_default_tail}" ] ; then - echo "ERROR: Need initial clone from non-local source" > ${status_output} - exit 1 - fi - # assume that "extra sources" path is the first arg - pull_extra="${1}/${pull_default_tail}" - - # determine which extra subrepos need to be cloned. - for i in ${subrepos_extra} ; do - if [ ! -f ${i}/.hg/hgrc ] ; then - repos_extra="${repos_extra} ${i}" - fi - done - else - if [ "x${pull_default}" = "x${pull_default_tail}" ] ; then - # local source repo. Clone the "extra" subrepos that exist there. - for i in ${subrepos_extra} ; do - if [ -f ${pull_default}/${i}/.hg/hgrc -a ! -f ${i}/.hg/hgrc ] ; then - # sub-repo there in source but not here - repos_extra="${repos_extra} ${i}" - fi - done - fi - fi - - # Any repos to deal with? - if [ "${repos}" = "" -a "${repos_extra}" = "" ] ; then - echo "No repositories to process." > ${status_output} - exit - fi - - # Repos to process concurrently. Clone does better with low concurrency. - at_a_time="${HGFOREST_CONCURRENCY:-2}" -else - # Process command for all of the present repos - for i in . ${subrepos} ${subrepos_extra} ; do - if [ -d ${i}/.hg ] ; then - repos="${repos} ${i}" - fi - done - - # Any repos to deal with? - if [ "${repos}" = "" ] ; then - echo "No repositories to process." > ${status_output} - exit - fi - - # any of the repos locked? - locked="" - for i in ${repos} ; do - if [ -h ${i}/.hg/store/lock -o -f ${i}/.hg/store/lock ] ; then - locked="${i} ${locked}" - fi - done - if [ "${locked}" != "" ] ; then - echo "ERROR: These repositories are locked: ${locked}" > ${status_output} - exit 1 - fi - - # Repos to process concurrently. - at_a_time="${HGFOREST_CONCURRENCY:-8}" -fi - -# Echo out what repositories we do a command on. -echo "# Repositories: ${repos} ${repos_extra}" > ${status_output} - -if [ "${command}" = "serve" ] ; then - # "serve" is run for all the repos as one command. - ( - ( - cwd=`pwd` - serving=`basename ${cwd}` - ( - echo "[web]" - echo "description = ${serving}" - echo "allow_push = *" - echo "push_ssl = False" - - echo "[paths]" - for i in ${repos} ; do - if [ "${i}" != "." ] ; then - echo "/${serving}/${i} = ${i}" - else - echo "/${serving} = ${cwd}" - fi - done - ) > ${tmp}/serve.web-conf - - echo "serving root repo ${serving}" > ${status_output} - - echo "hg${global_opts} serve ${@}" > ${status_output} - (PYTHONUNBUFFERED=true hg${global_opts} serve -A ${status_output} -E ${status_output} --pid-file ${tmp}/serve.pid --web-conf ${tmp}/serve.web-conf "${@}"; echo "$?" > ${tmp}/serve.pid.rc ) 2>&1 & - ) 2>&1 | sed -e "s@^@serve: @" > ${status_output} - ) & -else - # Run the supplied command on all repos in parallel. - - # n is the number of subprocess started or which might still be running. - n=0 - if [ ${have_fifos} = "true" ]; then - # if we have fifos use them to detect command completion. - mkfifo ${tmp}/fifo - exec 3<>${tmp}/fifo - fi - - # iterate over all of the subrepos. - for i in ${repos} ${repos_extra} ; do - n=`expr ${n} '+' 1` - repopidfile=`echo ${i} | sed -e 's@./@@' -e 's@/@_@g'` - reponame=`echo ${i} | sed -e :a -e 's/^.\{1,20\}$/ &/;ta'` - pull_base="${pull_default}" - - # regular repo or "extra" repo? - for j in ${repos_extra} ; do - if [ "${i}" = "${j}" ] ; then - # it's an "extra" - if [ -n "${pull_extra}" ]; then - # if no pull_extra is defined, assume that pull_default is valid - pull_base="${pull_extra}" - fi - fi - done - - # remove trailing slash - pull_base="`echo ${pull_base} | sed -e 's@[/]*$@@'`" - - # execute the command on the subrepo - ( - ( - if [ "${command}" = "clone" -o "${command}" = "fclone" -o "${command}" = "tclone" ] ; then - # some form of clone - clone_newrepo="${pull_base}/${i}" - parent_path="`dirname ${i}`" - if [ "${parent_path}" != "." ] ; then - times=0 - while [ ! -d "${parent_path}" ] ; do ## nested repo, ensure containing dir exists - if [ "${sflag}" = "true" ] ; then - # Missing parent is fatal during sequential operation. - echo "ERROR: Missing parent path: ${parent_path}" > ${status_output} - exit 1 - fi - times=`expr ${times} '+' 1` - if [ `expr ${times} '%' 10` -eq 0 ] ; then - echo "${parent_path} still not created, waiting..." > ${status_output} - fi - sleep 5 - done - fi - # run the clone command. - echo "hg${global_opts} clone ${clone_newrepo} ${i}" > ${status_output} - (PYTHONUNBUFFERED=true hg${global_opts} clone ${clone_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc ) 2>&1 & - else - # run the command. - echo "cd ${i} && hg${global_opts} ${command} ${@}" > ${status_output} - cd ${i} && (PYTHONUNBUFFERED=true hg${global_opts} ${command} "${@}"; echo "$?" > ${tmp}/${repopidfile}.pid.rc ) 2>&1 & - fi - - echo $! > ${tmp}/${repopidfile}.pid - ) 2>&1 | sed -e "s@^@${reponame}: @" > ${status_output} - # tell the fifo waiter that this subprocess is done. - if [ ${have_fifos} = "true" ]; then - echo "${i}" >&3 - fi - ) & - - if [ "${sflag}" = "true" ] ; then - # complete this task before starting another. - wait - else - if [ "${have_fifos}" = "true" ]; then - # check on count of running subprocesses and possibly wait for completion - if [ ${n} -ge ${at_a_time} ] ; then - # read will block until there are completed subprocesses - while read repo_done; do - n=`expr ${n} '-' 1` - if [ ${n} -lt ${at_a_time} ] ; then - # we should start more subprocesses - break; - fi - done <&3 - fi - else - # Compare completions to starts - completed="`(ls -a1 ${tmp}/*.pid.rc 2> /dev/null | wc -l) || echo 0`" - while [ `expr ${n} '-' ${completed}` -ge ${at_a_time} ] ; do - # sleep a short time to give time for something to complete - sleep 1 - completed="`(ls -a1 ${tmp}/*.pid.rc 2> /dev/null | wc -l) || echo 0`" - done - fi - fi - done - - if [ ${have_fifos} = "true" ]; then - # done with the fifo - exec 3>&- - fi -fi - -# Wait for all subprocesses to complete -wait - -# Terminate with exit 0 only if all subprocesses were successful -# Terminate with highest exit code of subprocesses -ec=0 -if [ -d ${tmp} ]; then - rcfiles="`(ls -a ${tmp}/*.pid.rc 2> /dev/null) || echo ''`" - for rc in ${rcfiles} ; do - exit_code=`cat ${rc} | tr -d ' \n\r'` - if [ "${exit_code}" != "0" ] ; then - if [ ${exit_code} -gt 1 ]; then - # mercurial exit codes greater than "1" signal errors. - repo="`echo ${rc} | sed -e 's@^'${tmp}'@@' -e 's@/*\([^/]*\)\.pid\.rc$@\1@' -e 's@_@/@g'`" - echo "WARNING: ${repo} exited abnormally (${exit_code})" > ${status_output} - fi - if [ ${exit_code} -gt ${ec} ]; then - # assume that larger exit codes are more significant - ec=${exit_code} - fi - fi - done -fi -exit ${ec} diff --git a/corba/.hgignore b/corba/.hgignore deleted file mode 100644 index d782b284ae1..00000000000 --- a/corba/.hgignore +++ /dev/null @@ -1,5 +0,0 @@ -^build/ -^dist/ -^webrev -/nbproject/private/ -.DS_Store diff --git a/corba/.hgtags b/corba/.hgtags deleted file mode 100644 index dc09494f034..00000000000 --- a/corba/.hgtags +++ /dev/null @@ -1,449 +0,0 @@ -55540e827aef970ecc010b7e06b912d991c8e3ce jdk7-b24 -5e61d5df62586474414d1058e9186441aa908f51 jdk7-b25 -0043eb3d4e628f049ff80a8c223b5657136085e7 jdk7-b26 -e84e9018bebbf3e5bafc5706e7882a15cb1c7d99 jdk7-b27 -27509b7d21ed783b3f6eb7b7612781c675a30c2f jdk7-b28 -8b71960f79ce0a6fb8ddfeec03f03d400a361747 jdk7-b29 -c0252adbb2abbfdd6c35595429ac6fbdd98e20ac jdk7-b30 -ef6af34d75a7b44e77083f1d4ee47631fa09d3b4 jdk7-b31 -80a0f46a6203e727012bd579fe38a609b83decce jdk7-b32 -6a5b9d2f8b20de54e3bfe33cd12bd0793caedc4e jdk7-b33 -0a812b9824e5d17b073765d1505594b49ff88a10 jdk7-b34 -3867c4d14a5bfdbb37c97b4874ccb0ee5343111c jdk7-b35 -0723891eb8d1c27e67c54163af0b4cea05a4e036 jdk7-b36 -59d5848bdedebe91cc2753acce78911bcb4a66db jdk7-b37 -08be802754b0296c91a7713b6d85a015dbcd5349 jdk7-b38 -55078b6661e286e90387d1d9950bd865f5cc436e jdk7-b39 -184e21992f47a8d730df1adc5b21a108f3125489 jdk7-b40 -c90eeda9594ed2983403e2049aed8d503126c62e jdk7-b41 -ccd6a16502e0650d91d85c4b86be05cbcd461a87 jdk7-b42 -9cd740d48a4855321d69f137a7109c00bcda76be jdk7-b43 -9803dac7254041b30ca65e3852d4c566b9757c3b jdk7-b44 -68814aa5b44b1f16931a97e7cd4028c70eb9586b jdk7-b45 -1691dbfc08f8ee3f4e23a1ff30cdff920718696c jdk7-b46 -167ad0164301f318b069a947e1c9c07ed667748a jdk7-b47 -0be222241fd405e48915647facfaa176621b39b9 jdk7-b48 -d70978bc64bc7a04be7797ab0dcd9b7b1b3a6bff jdk7-b49 -0edbd0074b02b42b2b83cc47cb391d4869b7a8ec jdk7-b50 -3eb8f1047a7402a9a79937d1c39560e931e91da2 jdk7-b51 -bec82237d694f9802b820fa11bbb4f7fa9bf8e77 jdk7-b52 -3c4d73194f6f89f040ae3b2d257335dfa8a1b2b5 jdk7-b53 -8130ac858d6789d5853d23044ba4a992afda574a jdk7-b54 -7a869f16ba83060c34b77620406cfa89d1cd7084 jdk7-b55 -553a664b807bb3a3c93f3b5a3c20ff0a90e08371 jdk7-b56 -972c6157fae57850694675da82fd58a17930db0a jdk7-b57 -2e3b8edab3ef55406494d3dd562e06882e6fc15e jdk7-b58 -7e6b2b55c00cc523b468272353ada3979adbbf16 jdk7-b59 -f1e1cccbd13aa96d2d8bd872782ff764010bc22c jdk7-b60 -e906b16a12a9a63b615898afa5d9673cbd1c5ab8 jdk7-b61 -65b66117dbd70a493e9644aeb4033cf95a4e3c99 jdk7-b62 -d20e45cd539f20405ff843652069cfd7550c5ab3 jdk7-b63 -047dd27fddb607f8135296b3754131f6e13cb8c7 jdk7-b64 -97fd9b42f5c2d342b90d18f0a2b57e4117e39415 jdk7-b65 -a821e059a961bcb02830280d51f6dd030425c066 jdk7-b66 -a12ea7c7b497b4ba7830550095ef633bd6f43971 jdk7-b67 -5182bcc9c60cac429d1f7988676cec7320752be3 jdk7-b68 -8120d308ec4e805c5588b8d9372844d781c4112d jdk7-b69 -175bd68779546078dbdb6dacd7f0aced79ed22b1 jdk7-b70 -3f1ef7f899ea2aec189c4fb67e5c8fa374437c50 jdk7-b71 -c793a31209263fbb867c23c752599d85c21abb73 jdk7-b72 -b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73 -5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74 -0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75 -937144222e2219939101b0129d26a872a7956b13 jdk7-b76 -6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77 -a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78 -ec0421b5703b677e2226cf4bf7ae4eaafd8061c5 jdk7-b79 -0336e70ca0aeabc783cc01658f36cb6e27ea7934 jdk7-b80 -e08a42a2a94d97ea8eedb187a94dbff822c8fbba jdk7-b81 -1e8c1bfad1abb4b81407a0f2645e0fb85764ca48 jdk7-b82 -fde0df7a2384f7fe33204a79678989807d9c2b98 jdk7-b83 -68c8961a82e4a3ad2a67991e5d834192a81eb4cd jdk7-b84 -c67a9df7bc0ca291f08f9a9cc05cb78ea15d25e6 jdk7-b85 -6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86 -09a41111a401d327f65e453384d976a10154d9ea jdk7-b87 -39e14d2da687c7e592142137517aaf689544820f jdk7-b88 -bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89 -56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90 -bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91 -930582f667a13391cd0b3e41e8cb760f55e3a5c0 jdk7-b92 -9718d624864c29dca44373d541e93cdd309a994f jdk7-b93 -533c11186b44e3a02d6c5fe69a73260505fcfe5e jdk7-b94 -06dbf406818c789bb586c1de4c002024cd26ecd2 jdk7-b95 -edc2a2659c77dabc55cb55bb617bad89e3a05bb3 jdk7-b96 -4ec9d59374caa1e5d72fa802291b4d66955a4936 jdk7-b97 -3b99409057e4c255da946f9f540d051a5ef4ab23 jdk7-b98 -95db968660e7d87c345d5cf3dc2e3db037fb7220 jdk7-b99 -a56d734a1e970e1a21a8f4feb13053e9a33674c7 jdk7-b100 -86a239832646a74811695428984b6947c0bd6dc8 jdk7-b101 -78561a95779090b5106c8d0f1a75360a027ef087 jdk7-b102 -11e7678c3eb169b77d9a9892fe5e3dfa1d1a0d51 jdk7-b103 -9607213481d400ac477183191cc080e1bef6f475 jdk7-b104 -6f21b030092fb61244cc8a0aedf8058f7c022b81 jdk7-b105 -519daea48888196af76a975a3b31258efa860bad jdk7-b106 -232adb83eae8375439ccff65b6e205ca0da0510d jdk7-b107 -8d810527b499a67153365db74421a03c12b46f35 jdk7-b108 -c3dd858e09b20206459d9e7b0ead99d27ab00eab jdk7-b109 -0e1f80fda2271f53d4bbb59ec3f301dfbcef6a0a jdk7-b110 -640fa4d4e2ad4c2d7e4815c955026740d8c52b7a jdk7-b111 -cc67fdc4fee9a5b25caee4e71b51a8ff24ae7d1a jdk7-b112 -a89a6c5be9d1a754868d3d359cbf7ad36aa95631 jdk7-b113 -88fddb73c5c4a4b50c319cbae9380caf5172ab45 jdk7-b114 -da7561d479e0ddaa4650d8023ac0fc7294e014e3 jdk7-b115 -98c028de4301106f2285ac0e128a1bb9b4c24f5c jdk7-b116 -fa502e4834dac2176499cc1f44794d5dc32a11b9 jdk7-b117 -42e77836fded7c2a3080d27316b96634ea9e33c6 jdk7-b118 -39829414ae31a0080578a49b751899edd518cd7d jdk7-b119 -cff5a173ec1e89013359e804a3e31736ef6fb462 jdk7-b120 -2cc9f32992101732b23730b737740e64ebc5fa89 jdk7-b121 -1523a060032c8a5b7840198da8911abeff88118f jdk7-b122 -a230c142628cea22475ab9dc5cd544266ddf2466 jdk7-b123 -f90b3e014e831eb4f32ef035a1dad2b8ba87949f jdk7-b124 -1ce58c72b7892cb813eb920276c7e7f17a1b79fe jdk7-b125 -d7532bcd3742f1576dd07ff9fbb535c9c9a276e9 jdk7-b126 -64775e83f4df894355f45555f50c410de6727b4e jdk7-b127 -9baa8f94a11d6c5cab3f9f0e5a20106326d0932e jdk7-b128 -66fa0fcc779296c99746b09efce6109944f82f30 jdk7-b129 -563a8f8b5be3940e9346cffac4eff9ed02b3c69f jdk7-b130 -9d6dd2cdfcb92612dbd836ecded87770d52b49db jdk7-b131 -1b1e75e8f476e5c07f0d2b035993895e2603e1f0 jdk7-b132 -671fe2e623ffefb4b7c312be919fc71eb48c1df1 jdk7-b133 -918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134 -e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135 -48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136 -a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137 -78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138 -60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139 -cdf5d19ec142424489549025e9c42e51f32cf688 jdk7-b140 -a58635cdd921bafef353f4864184a0481353197b jdk7-b141 -a2f340a048c88d10cbedc0504f5cf03d39925a40 jdk7-b142 -51ed32f6f4de56f16e910ac54ba6c6f6606f4f17 jdk7-b143 -7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144 -77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145 -770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 -73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147 -949fb60ca830364571e7c4c9964e6b351ca929ec jdk8-b01 -ed8d94519a87b4adac270c3eec9134ff1f62bff5 jdk8-b02 -cd0da00694fbce642db9be936d3e4909a71d911d jdk8-b03 -60a68d688e24473cf84dedd1e60901a61ab82555 jdk8-b04 -cc1b599b986a37cb57de4584c5e58169766ca535 jdk8-b05 -45c43dde7ba7f176333a51a98f086275478836fa jdk8-b06 -3d61f0856f349e2163bf98146465dab3b7437f63 jdk8-b07 -0d52b1c87aa8fdea7fdc9c4126ea58f95ca6b351 jdk8-b08 -a891732c1a83082177ff7a4cf1506068d9cc0a47 jdk8-b09 -cda87f7fefcee3b89742a57ce5ad9b03a54c210d jdk8-b10 -0199e4fef5cc2bd234c65b93220459ef7a3bb3b1 jdk8-b11 -31d70911b712c6b4e580a3110363d5f044cfed7a jdk8-b12 -5b9d9b839d3d7fe02347827221c97c6d242a6f96 jdk8-b13 -e59c47de1ad8982ff3b0e843773a6902b36c2337 jdk8-b14 -7da69e7175a7c7564ee6d0e52255cbb8a57ef577 jdk8-b15 -82dc033975bb9b553b4ef97b6d483eda8de32e0f jdk8-b17 -82dc033975bb9b553b4ef97b6d483eda8de32e0f jdk8-b16 -312cf15d16577ef198b033d2a4cc0a52369b7343 jdk8-b18 -e1366c5d84ef984095a332bcee70b3938232d07d jdk8-b19 -51d8b6cb18c0978ecfa4f33e1537d35ee01b69fa jdk8-b20 -f157fc2a71a38ce44007a6f18d5b011824dce705 jdk8-b21 -a11d0062c445d5f36651c78650ab88aa594bcbff jdk8-b22 -5218eb256658442b62b05295aafa5b5f35252972 jdk8-b23 -b98f0e6dddf987df565029a1f58417fc1844c3f3 jdk8-b24 -e45d6b406d5f91ff5256a5c82456ab1e7eb8becd jdk8-b25 -79f709a099f40c08f76567fa6d813f9009a69826 jdk8-b26 -4fffe75e4edd39a2517f10b743941bf94edb143d jdk8-b27 -2082eb35d49a9c2aab90b8d4fd31cefb7a23b82e jdk8-b28 -6117395d422682f89d228347e319fcaac7edc729 jdk8-b29 -4605f8418bf562e78be79b25b6b8a5110281acae jdk8-b30 -1954151dfae8f73db24e396380f7c02bdd47c486 jdk8-b31 -5d820cb6b1afd75b619e7fd69e4f2b0eb1d5d6a1 jdk8-b32 -1e2ac1ea3f6c32a62bf88f3fa330120c30db59cb jdk8-b33 -e24c5cc8b0f7cc48374eef0f995838fb4823e0eb jdk8-b34 -e3d735914edd0a621b16bb85417423f8e6af5d51 jdk8-b35 -a5a61f259961a7f46b002e5cc50b4a9bf86927b6 jdk8-b36 -83fac66442cf680bb59ec9e3a71cc4729322b595 jdk8-b37 -b8cbfb31139f820e5e094ba71449e58159fbe22e jdk8-b38 -785af00e2827990f149b32ec37f523dbca3efdd1 jdk8-b39 -56d030e5035fdee5bba6cf318a06287fda5d67ec jdk8-b40 -113f0d5f0a08aa0947b3edf783b603e7f042748a jdk8-b41 -79cc42c9c71bbd6630ede681642e98f5e4a841fa jdk8-b42 -cd879aff5d3cc1f58829aab3116880aa19525b78 jdk8-b43 -439d9bf8e4ff204cc89c9974c1515a508b2cc6ff jdk8-b44 -747dad9e9d37d244a5c765a1afe9194f7ddae118 jdk8-b45 -30141e598d72a6146126cb86b034ed6d0bd191b3 jdk8-b46 -21e46ea21c6a26246fb7a1926ac7fe8d580d0518 jdk8-b47 -7e2b179a5b4dbd3f097e28daa00abfcc72ba3e0b jdk8-b48 -fe44e58a6bdbeae350ce96aafb49770a5dca5d8a jdk8-b49 -d20d9eb9f093adbf392918c703960ad24c93a331 jdk8-b50 -9b0f841ca9f7ee9bacf16a5ab41c4f829276bc6b jdk8-b51 -80689ff9cb499837513f18a1136dac7f0686cd55 jdk8-b52 -63aeb7a2472fb299134ad7388e0a111a5340b02d jdk8-b53 -16c82fc74695bab9b9e0fb05c086a5a08ba0082f jdk8-b54 -e8a0e84383d6fbd303ce44bd355fb25972b13286 jdk8-b55 -bf1bb47414e178beff67dc255fc3b97bf401f679 jdk8-b56 -f3ab4163ae012965fc8acdfc25ce0fece8d6906d jdk8-b57 -18462a19f7bd66d38015f61ea549a5e0c0c889a3 jdk8-b58 -d54dc53e223ed9ce7d5f4d2cd02ad9d5def3c2db jdk8-b59 -207ef43ba69ead6cbbab415d81834545e4d46747 jdk8-b60 -0e08ba7648fb3faa0986cb217887d7c4990977f3 jdk8-b61 -08afb9c6f44f11c3595b01fd0985db64b29834dd jdk8-b62 -6ccbf67b68bfed1ab9c44ab8748a5bdc7df33506 jdk8-b63 -54d599a5b4aad83c235d590652fc81f41c2824fb jdk8-b64 -5132f7900a8f0c30c3ca7f7a32f9433f4fee7745 jdk8-b65 -65771ad1ca557ca26e4979d4dc633cf685435cb8 jdk8-b66 -394515ad2a55d4d54df990b36065505d3e7a3cbb jdk8-b67 -82000531feaa7baef76b6406099e5cd88943d635 jdk8-b68 -22ddcac208a8dea894a16887d04f3ca4d3c5d267 jdk8-b69 -603cceb495c8133d47b26a7502d51c7d8a67d76b jdk8-b70 -8171d23e914d758836527b80b06debcfdb718f2d jdk8-b71 -cb40427f47145b01b7e53c3e02b38ff7625efbda jdk8-b72 -191afde59e7be0e1a1d76d06f2a32ff17444f0ec jdk8-b73 -2132845cf5f717ff5c240a2431c0c0e03e66e3a5 jdk8-b74 -d4e68ce17795601017ac2f952baad7272942c36e jdk8-b75 -58be6ca3c0603882a1ec478724e337aac85e0da0 jdk8-b76 -35684a40c5845782324dbcc9ac8969528020ff61 jdk8-b77 -27d6368ae8ba570c31c2f0e696d39c99fa2f4538 jdk8-b78 -e41fb1aa0329767b2737303c994e38bede1baa07 jdk8-b79 -5f3d4a6bdd027a1631d97e2dfff63fd5e46987a4 jdk8-b80 -2a00aeeb466b9dee22508f6261f63b70f9c696fe jdk8-b81 -48e1bc77004d9af575b733c04637b98fd17603c2 jdk8-b82 -a45bb25a67c7517b45f00c9682e317f46fecbba9 jdk8-b83 -928f8b888deb785cbd7bbd5f951cd6880f11f14e jdk8-b84 -9583a6431596bac1959d2d8828f5ea217843dd12 jdk8-b85 -44a8ce4a759f2668ff434661a93ff462ea472478 jdk8-b86 -f1709874d55a06bc3d5dfa02dbcdfbc59f4cba34 jdk8-b87 -4e3a881ebb1ee96ce0872508b0066d74f310dbfa jdk8-b88 -fe4150590ee597f4e125fea950aa3b352622cc2d jdk8-b89 -c8286839d0df04aba819ec4bef12b86babccf30e jdk8-b90 -8f7ffb296385f85a4a6d53f9f2d4a7b13a8fa1ff jdk8-b91 -717aa26f8e0a1c0e768aebb3a763aca56db0c83e jdk8-b92 -8dc9d7ccbb2d77fd89bc321bb02e67c152aca257 jdk8-b93 -22f5d7f261d9d61a953d2d9a53f2e9ce0ca361d1 jdk8-b94 -2cf36f43df36137980d9828cec27003ec10daeee jdk8-b95 -3357c2776431d51a8de326a85e0f41420e40774f jdk8-b96 -469995a8e97424f450c880606d689bf345277b19 jdk8-b97 -3370fb6146e47a6cc05a213fc213e12fc0a38d07 jdk8-b98 -3f67804ab61303782df57e54989ef5e0e4629beb jdk8-b99 -8d492f1dfd1b131a4c7886ee6b59528609f7e4fe jdk8-b100 -a013024b07475782f1fa8e196e950b34b4077663 jdk8-b101 -528c7e76eaeee022817ee085668459bc97cf5665 jdk8-b102 -49c4a777fdfd648d4c3fffc940fdb97a23108ca8 jdk8-b103 -d411c60a8c2fe8fdc572af907775e90f7eefd513 jdk8-b104 -4e38de7c767e34104fa147b5b346d9fe6b731279 jdk8-b105 -2e3a056c84a71eba78945c18b05397858ffd7ad0 jdk8-b106 -23fc34133152692b725db4bd617b4c8dfd6ccb05 jdk8-b107 -a4bb3b4500164748a9c33b2283cfda76d89f25ab jdk8-b108 -428428cf5e06163322144cfb5367e1faa86acf20 jdk8-b109 -3d2b7ce93c5c2e3db748f29c3d29620a8b3b748a jdk8-b110 -85c1c94e723582f9a1dd0251502c42b73d6deea7 jdk8-b111 -43cec76d1d62587a07af07e2d9bec93aba2a506b jdk8-b112 -a259ff3e42d91da68f4d4f09d7eb9dc22bc024fc jdk8-b113 -0bbccf77c23e566170b88b52c2cf28e5d31ce927 jdk8-b114 -8d07115924b7d703a5048adb24e8aba751442f13 jdk8-b115 -5fdc4465208933ba704825b2b05e1afd062235fb jdk8-b116 -e53d1ee4d2ae898f1cf58688d45a5afe7c482173 jdk8-b117 -d6820a414f182a011a53a29a52370c696cd58dab jdk8-b118 -379fc7609beb7a3d85ebc0cc21a8a51c60d3c7d3 jdk8-b119 -53fd772d28c8a9f0f43adfc06f75f6b3cfa93cb5 jdk8-b120 -a7d3638deb2f4e33217b1ecf889479e90f9e5b50 jdk9-b00 -79a8136b18c1c6848f500088f5a4b39f262f082d jdk9-b01 -8394993063135a42b63a94473280399fb2a13aa7 jdk9-b02 -d338b892a13db19b093f85cf5f949a4504e4d31f jdk9-b03 -1ed19de263e1e0772da0269118cdd9deeb9fff04 jdk9-b04 -167c39eb44731a5d66770d0f00e231164653a2ff jdk9-b05 -a4bf701ac316946c2e5e83138ad8e687da6a4b30 jdk9-b06 -6c8563600a71394c949405189ddd66267a88d8cd jdk9-b07 -2da7fead826bc27f193c7d63048c2cf100a8809c jdk9-b08 -1a3a4f48515dbf1cff37279691b2fb74f228298d jdk9-b09 -3bd4039dfc632fd7fc8418a25a3dcc34d1cd4019 jdk9-b10 -77ea0a2503582a28e4e66be7239a49a0d1dd313f jdk9-b11 -e212cdcc8c11f0ba5acf6f5ddb596c4c545a93f9 jdk9-b12 -088eec4c36f4d7f250fcd19c4969bf698e3d2cdc jdk9-b13 -a2b82f863ba95a596da555a4c1b871c404863e7e jdk9-b14 -e54022d0dd92106fff7f7fe670010cd7e6517ee3 jdk9-b15 -422ef9d29d84f571453f015c4cb8713c3af70ee4 jdk9-b16 -4c75c2ca7cf3e0618315879acf17f42c8fcd0c09 jdk9-b17 -77565aaaa2bb814e94817e92d680168052a25395 jdk9-b18 -eecc1b6adc7e193d00a0641eb0963add5a4c06e8 jdk9-b19 -87f36eecb1665012d01c5cf102494e591c943ea6 jdk9-b20 -3615a4e7f0542ca7552ad6454b742c73ee211d8e jdk9-b21 -ddc07abf4307855c0dc904cc5c96cc764023a930 jdk9-b22 -57735d66face054440a63ce99789eac5a5ee1dfd jdk9-b23 -8a44142bb7fc8118f70f91a1b97c12dfc50563ee jdk9-b24 -da08cca6b97f41b7081a3e176dcb400af6e4bb26 jdk9-b25 -6c777df597bbf5abba3488d44c401edfe73c74af jdk9-b26 -7e06bf1dcb0907b80ddf59315426ce9ce775e56d jdk9-b27 -a00b04ef067e39f50b9a0fea6f1904e35d632a73 jdk9-b28 -163a9cd806fd09970baf1f5f42b92a3cfe7ee945 jdk9-b29 -98967ae6ae53ebf15615e07cd5a6b1ae04dfd84c jdk9-b30 -c432b80aadd0cb2b2361b02add4d671957d4cec9 jdk9-b31 -b5b139354630edb2d06190bf31653acbdcea63a8 jdk9-b32 -cfdac5887952c2dd73c73a1d8d9aa880d0539bbf jdk9-b33 -24a0bad5910f775bb4002d1dacf8b3af87c63cd8 jdk9-b34 -9bc2dbd3dfb8c9fa88e00056b8b93a81ee6d306e jdk9-b35 -ffd90c81d4ef9d94d880fc852e2fc482ecd9b374 jdk9-b36 -7e9add74ad50841fb39dae75db56374aefa1de4c jdk9-b37 -8acf056126e819cf536eef02aee0f61f207a6b52 jdk9-b38 -53bf36cb722db50815712258a77cb6bbe25a2f5f jdk9-b39 -e27c725d6c9d155667b35255f442d4ceb8c3c084 jdk9-b40 -1908b886ba1eda46fa725cf1160fe5d30fd1a7e5 jdk9-b41 -078bb11af876fe528d4b516f33ad4dd9bb60549e jdk9-b42 -9645e35616b60c5c07b4fdf11a132afc8081dfa8 jdk9-b43 -1f57bd728c9e6865ccb9d43ccd80a1c11230a32f jdk9-b44 -9e3f2bed80c0e5a84a256ce41f1d10c5ade48466 jdk9-b45 -326f2068b4a4c05e2fa27d6acf93eba7b54b090d jdk9-b46 -ee8447ca632e1d39180b4767c749db101bff7314 jdk9-b47 -a13c49c5f2899b702652a460ed7aa73123e671e6 jdk9-b48 -9285d14eb7b6b0815679bae98dd936dbc136218d jdk9-b49 -224f593393e5b01b3c8f1e591b7f4b1790a3737a jdk9-b50 -2309c02386d1fa4ced5051873ffb9e04874f7a44 jdk9-b51 -b8538bbb6f224ab1dabba579137099c166ad4724 jdk9-b52 -aadc16ca5ab7d56f92ef9dbfa443595a939241b4 jdk9-b53 -d469c5ad0c763e325a78e0af3016878a57dfc5cc jdk9-b54 -734ca5311a225711b79618f3e92f47f07c82154a jdk9-b55 -ef4afd6832b00b8687832c2a36c90e43750ebe40 jdk9-b56 -d8ebf1a5b18ccbc849f5bf0f80aa3d78583eee68 jdk9-b57 -86dd5de1f5cb09073019bd629e22cfcd012d8b4b jdk9-b58 -cda6ae062f85fac5555f4e1318885b0ecd998bd1 jdk9-b59 -caa330b275f39282793466529f6864766b31d9fd jdk9-b60 -d690f489ca0bb95a6157d996da2fa72bcbcf02ea jdk9-b61 -d27f7e0a7aca129969de23e9934408a31b4abf4c jdk9-b62 -0acac6937de7a0868f8c6f88b7d036d780abeee6 jdk9-b63 -0a5e5a7c3539e8bde73d9fe55750e49a49cb8dac jdk9-b64 -afc1e295c4bf83f9a5dd539c29914edd4a754a3f jdk9-b65 -44ee68f7dbacab24a45115fd6a8ccdc7eb6e8f0b jdk9-b66 -4418697e56f1f43597f55c7cb6573549c6117868 jdk9-b67 -8efad64f40eb8cd4df376c0a5275892eeb396bbd jdk9-b68 -de8acedcb5b5870f1dc54cba575aaa5d33897ea2 jdk9-b69 -e7cf01990ed366bd493080663259281e91ce223b jdk9-b70 -cd39ed501fb0504554a7f58ac6cf3dd2b64afec0 jdk9-b71 -f9f3706bd24c42c07cb260fe05730a749b8e52f4 jdk9-b72 -29096b78d93b01a2f8882509cd40755e3d6b8cd9 jdk9-b73 -622fe934e351e89107edf3c667d6b57f543f58f1 jdk9-b74 -960b56805abd8460598897481820bd6a75f979e7 jdk9-b75 -d8126bc88fa5cd1ae4e44d86a4b1280ca1c9e2aa jdk9-b76 -8bb2441c0fec8b28f7bf11a0ca3ec1642e7ef457 jdk9-b77 -182bb7accc5253bcfefd8edc1d4997ec8f9f8694 jdk9-b78 -4ab250b8fac66ef8cd15ee78c40f0c651c96e16a jdk9-b79 -821a0373ef2d1642a9824facb938b901ad010413 jdk9-b80 -45c35b7f5b40d5af0085e4a7b3a4d6e3e0347c35 jdk9-b81 -c20d8ebddaa6fb09cc81d3edf3d1d05f4232700a jdk9-b82 -ca8a1719588424f6e04e943790c7fcb7cb0b8c8f jdk9-b83 -df70bb200356fec686681f0295c50cc3ed43c3b3 jdk9-b84 -3ec06af1368924469f7ce60a00324bac55eaeecc jdk9-b85 -0a3f0d25c201b40575a7c3920fce4d6f4d3ae310 jdk9-b86 -a5c40ac9b916ff44d512ee764fa919ed2097e149 jdk9-b87 -00f48ecbc09915f793d9e5ad74ab0b25f2549bf5 jdk9-b88 -c847a53b38d2fffb87afc483c74db05eced9b4f4 jdk9-b89 -29cc8228d62319af21cad7c90817671e0813b6bd jdk9-b90 -75843e0a9371d445a3c9b440bab85e50b5dc287c jdk9-b91 -f7d70caad89ad0c43bb057bca0aad6f17ce05a6a jdk9-b92 -27e9c8d8091e2447ea7ef3e3103e9b7dd286e03a jdk9-b93 -61e9f509be0f78f0961477960f372b0533214bb8 jdk9-b94 -fd038e8a16eec80d0d6b337d74a582790ed4b3ee jdk-9+95 -feb1bd85d7990dcf5584ca9e53104269c01db006 jdk-9+96 -10a482b863582376d4ca229090334b23b05159fc jdk-9+97 -ea285530245cf4e0edf0479121a41347d3030eba jdk-9+98 -180212ee1d8710691ba9944593dfc1ff3e4f1532 jdk-9+99 -791d0d3ac0138faeb6110bd840a4545bc1950df2 jdk-9+100 -30dfb3bd3d06b4bb80a087babc0d1841edba187b jdk-9+101 -9c4662334d933d299928d1f599d02ff50777cbf8 jdk-9+102 -0680fb7dae4da1ee6cf783c4b74184e3e08d3179 jdk-9+103 -e385e95e6101711d5c63e7b1a827e99b6ec7a1cc jdk-9+104 -64006ae915b3aa85ac7e6fac679024d2da7fe526 jdk-9+105 -8ec4f97943fe56f93e4621f622b56b7144c0181a jdk-9+106 -49202432b69445164a42be7cbdf74ed5fce98157 jdk-9+107 -84f2862a25eb3232ff36c376b4e2bf2a83dfced3 jdk-9+108 -b75afa17aefe480c23c616a6a2497063312f7189 jdk-9+109 -9666775734fb6028ee86df9972626b3667b6a318 jdk-9+110 -2bb92dd44275679edb29fdbffc3b7cbebc9a6bf0 jdk-9+111 -780d0620add32bf545471cf65038c9ac6d9c036d jdk-9+112 -cc30faa2da498c478e89ab062ff160653ca1b170 jdk-9+113 -10d175b0368c30f54350fc648adc41b94ce357ee jdk-9+114 -7bab1b1b36824924b1c657a8419369ba93d198d3 jdk-9+115 -7dfa7377a5e601b8f740741a9a80e04c72dd04d6 jdk-9+116 -7a1b36bf2fe55a9a7732489ccdd326c910329a7e jdk-9+117 -8c2c2d17f7ce92a31c9ccb44a122ec62f5a85ace jdk-9+118 -daf533920b1266603b5cbdab31908d2a931c5361 jdk-9+119 -5943b791e131e79b969d4cea053aecda34801723 jdk-9+120 -9a5fc5a27560ac272c1341f8f3838338fba49059 jdk-9+121 -a39131aafc51a6fd8836e6ebe1b04458702ce7d6 jdk-9+122 -e33a34cc551907617d8129c4faaf1a5a7e61d21c jdk-9+123 -45121d5afb9d5bfadab75378572ad96832e0809e jdk-9+124 -1d48e67d1b91eb9f72e49e69a4021edb85e357fc jdk-9+125 -c7f5ba08fcd4b8416e62c21229f9a07c95498919 jdk-9+126 -8fab452b6f4710762ba1d8e55fd62db00b1355fe jdk-9+127 -1f093d3f8cd99cd37c3b0af4cf5c3bffaa9c8b98 jdk-9+128 -c3e83ccab3bb1733ae903d681879a33f85ed465c jdk-9+129 -77f9692d5976ae155773dd3e07533616bb95bae1 jdk-9+130 -f7e1d5337c2e550fe553df7a3886bbed80292ecd jdk-9+131 -1ab4b9399c4cba584f66c1c088188f2f565fbf9c jdk-9+132 -2021bfedf1c478a4808a7711a6090682a12f4c0e jdk-9+133 -1a497f5ca0cfd88115cc7daa8af8a62b8741caf2 jdk-9+134 -094d0db606db976045f594dba47d4593b715cc81 jdk-9+135 -aa053a3faf266c12b4fd5272da431a3e08e4a3e3 jdk-9+136 -258cf18fa7fc59359b874f8743b7168dc48baf73 jdk-9+137 -27bb44be32076861a0951bcefb07a1d92509a4b6 jdk-9+138 -8c9da7fc5b07c606afd571c7012441b77dda83b2 jdk-9+139 -9f3fc931bc230f44f2a58d75f7f6360af98bb113 jdk-9+140 -b32f998da32b488ec7c4e9dbb3c750841b48e74d jdk-9+141 -408c9c621938ca028e20bced0459f815de47eba8 jdk-9+142 -6211236ef15ec796806357608b1dd1b70c258ece jdk-9+143 -d4f1dae174098e799c48948e866054c52e11a186 jdk-9+144 -a44b156ae7f06bf41b9bece30df7775e482395dd jdk-9+145 -ecd74b41ab65bf228837b5bdf99690638d55425c jdk-9+146 -dc49e0922a8e4387cbf8670bbe1dc51c9874b74b jdk-9+147 -f95cc86b6ac22ec1ade5d4f825dc7782adeea228 jdk-9+148 -00b19338e505690abe93d5995ed74a473d969c2c jdk-9+149 -9205e980062a5c4530b51021c6e274025f4ccbdf jdk-9+150 -77f827f5bbad3ef795664bc675f72d98d156b9f8 jdk-9+151 -ff8cb43c07c069b1debdee44cb88ca22db1ec757 jdk-9+152 -68a8e8658511093b322a46ed04b2a321e1da2a43 jdk-9+153 -d66f97a610a6beac987740edc2bf6a70f46ba574 jdk-10+0 -078ebe23b584466dc8346e620d7821d91751e5a9 jdk-9+154 -a545f54babfa31aa7eb611f36031609acd617cbc jdk-9+155 -907c26240cd481579e919bfd23740797ff8ce1c8 jdk-9+156 -37c9962586a4d3498fa673d93eab1a336acd7652 jdk-10+1 -9383da04b385cca46b7ca67f3a39ac1b673e09fe jdk-9+157 -de6bdf38935fa753183ca288bed5c06a23c0bb12 jdk-9+158 -6feea77d2083c99e44aa3e272d07b7fb3b801683 jdk-9+159 -c7688f2fa07936b089ca0e9a0a0eff68ff37a542 jdk-9+160 -18f02bc43fe96aef36791d0df7aca748485210cc jdk-9+161 -18ffcf99a3b4a10457853d94190e825bdf07e39b jdk-9+162 -493011dee80e51c2a2b064d049183c047df36d80 jdk-9+163 -965bbae3072702f7c0d95c240523b65e6bb19261 jdk-9+164 -a510b2201154abdd12ede42788086b5283bfb9a6 jdk-9+165 -934c18145915b06d3fcc0de1a30f91f5aab8a192 jdk-9+166 -56a8bf5322684e9a31cda64c336c32bcdb592211 jdk-10+2 -3813c94c8585dd7507887916c6943f45051f1b55 jdk-10+3 -5d6d891bb36dbeeacaffa06b5a3e3b4e44b35fbd jdk-10+4 -7c5328012799923d45d1cf87e8725e725b3d298b jdk-10+5 -c7358d703e1282af3dcd8af6c037dc4342de9054 jdk-10+6 -43de67f51801b9e16507865fcb7e8344f4ca4aa9 jdk-9+167 -03a2cc9c8a1e8f87924c9863e917bc8b91770d5f jdk-9+168 -b2218d41edef02ee8f94bb438f885b2ba79bfa08 jdk-9+169 -8a4ab3b0ab9a86df73d9a1e337134f2dbe006725 jdk-9+170 -aed5a4edc8275c1c50195503756ff92bfe0197f5 jdk-10+7 -648b0a00824eb29e71936bc3258d309a25e3b8c0 jdk-10+8 -54c6621f7b34cc6ce6c0882d047f61fe0962c257 jdk-10+9 -c62e5964cfcf144d8f72e9ba69757897785349a9 jdk-9+171 -080c37fd77e2c4629b91059298e37758afbdbc46 jdk-10+10 -95ed14547ca9246baed34f90ef3ca13217538a8c jdk-9+172 -8ef8a0f1c4dfea17e10125e1f885920538e63085 jdk-10+11 -534ba4f8cfcf12accc5b9adb943103f2ff79fe16 jdk-9+173 -3615768c12904e29bb2ec1b506cd4633cd8a9ced jdk-9+174 -00ae6307d78bac49883ddc85d687aa88c49f3971 jdk-10+12 -dc78a3dd6b3a4f11cdae8a3e3d160e6a78bc7838 jdk-9+175 -564fced058bd2c8375e9104aa8f9494642cd7bdd jdk-10+13 -25d991a67cba240eeaf15c19c5857b40fdd71561 jdk-10+14 -40fb9f229471ef357d493813d34b15afcce9f32b jdk-9+176 -c72e9d3823f04cb3ef3166646dfea9e4c2769133 jdk-9+177 -15f59cfc6fbe9387423fb173e962265c7b5d357e jdk-10+15 -b82b62ed5debda2d98dda597506ef29cf947fbae jdk-10+16 -9c1e9712648921ae389d623042d22561fad82d75 jdk-9+178 -24390da83c5ee9e23ceafbcaff4460a01e37bb3a jdk-9+179 -50ff1fd66362f212a8db6de76089d9d0ffa4df0f jdk-10+17 -a923b3f30e7bddb4f960059ddfc7978fc63e2e6e jdk-10+18 -28488561cfbcfa4d0d9c489e8afe0155f4231360 jdk-10+19 -6ce6cb8ff41c71c49f23b15e0f0468aca5d52b17 jdk-9+180 -ba71941ad9dba53b8fffb30602ef673eee88696c jdk-9+181 -7a54ec280513a33e49e60546c0cf9ca573925a43 jdk-10+20 -68b5f8eeac3325c02aac2f4b452b8a37c20c970e jdk-10+21 -1f4456d51b07098af1848d0d968084b1e9b85a36 jdk-10+22 diff --git a/corba/.jcheck/conf b/corba/.jcheck/conf deleted file mode 100644 index ad4189d7de5..00000000000 --- a/corba/.jcheck/conf +++ /dev/null @@ -1,2 +0,0 @@ -project=jdk10 -bugids=dup diff --git a/corba/ASSEMBLY_EXCEPTION b/corba/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d90239..00000000000 --- a/corba/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/corba/LICENSE b/corba/LICENSE deleted file mode 100644 index 8b400c7ab81..00000000000 --- a/corba/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/common/doc/building.html b/doc/building.html similarity index 100% rename from common/doc/building.html rename to doc/building.html diff --git a/common/doc/building.md b/doc/building.md similarity index 100% rename from common/doc/building.md rename to doc/building.md diff --git a/nashorn/docs/DEVELOPER_README b/doc/nashorn/DEVELOPER_README similarity index 100% rename from nashorn/docs/DEVELOPER_README rename to doc/nashorn/DEVELOPER_README diff --git a/nashorn/docs/JavaScriptingProgrammersGuide.html b/doc/nashorn/JavaScriptingProgrammersGuide.html similarity index 100% rename from nashorn/docs/JavaScriptingProgrammersGuide.html rename to doc/nashorn/JavaScriptingProgrammersGuide.html diff --git a/nashorn/docs/genshelldoc.js b/doc/nashorn/genshelldoc.js similarity index 100% rename from nashorn/docs/genshelldoc.js rename to doc/nashorn/genshelldoc.js diff --git a/nashorn/docs/source/EvalFile.java b/doc/nashorn/source/EvalFile.java similarity index 100% rename from nashorn/docs/source/EvalFile.java rename to doc/nashorn/source/EvalFile.java diff --git a/nashorn/docs/source/EvalScript.java b/doc/nashorn/source/EvalScript.java similarity index 100% rename from nashorn/docs/source/EvalScript.java rename to doc/nashorn/source/EvalScript.java diff --git a/nashorn/docs/source/InvokeScriptFunction.java b/doc/nashorn/source/InvokeScriptFunction.java similarity index 100% rename from nashorn/docs/source/InvokeScriptFunction.java rename to doc/nashorn/source/InvokeScriptFunction.java diff --git a/nashorn/docs/source/InvokeScriptMethod.java b/doc/nashorn/source/InvokeScriptMethod.java similarity index 100% rename from nashorn/docs/source/InvokeScriptMethod.java rename to doc/nashorn/source/InvokeScriptMethod.java diff --git a/nashorn/docs/source/MultiScopes.java b/doc/nashorn/source/MultiScopes.java similarity index 100% rename from nashorn/docs/source/MultiScopes.java rename to doc/nashorn/source/MultiScopes.java diff --git a/nashorn/docs/source/RunnableImpl.java b/doc/nashorn/source/RunnableImpl.java similarity index 100% rename from nashorn/docs/source/RunnableImpl.java rename to doc/nashorn/source/RunnableImpl.java diff --git a/nashorn/docs/source/RunnableImplObject.java b/doc/nashorn/source/RunnableImplObject.java similarity index 100% rename from nashorn/docs/source/RunnableImplObject.java rename to doc/nashorn/source/RunnableImplObject.java diff --git a/nashorn/docs/source/ScriptVars.java b/doc/nashorn/source/ScriptVars.java similarity index 100% rename from nashorn/docs/source/ScriptVars.java rename to doc/nashorn/source/ScriptVars.java diff --git a/nashorn/docs/source/importpackageclass.js b/doc/nashorn/source/importpackageclass.js similarity index 100% rename from nashorn/docs/source/importpackageclass.js rename to doc/nashorn/source/importpackageclass.js diff --git a/nashorn/docs/source/javaarray.js b/doc/nashorn/source/javaarray.js similarity index 100% rename from nashorn/docs/source/javaarray.js rename to doc/nashorn/source/javaarray.js diff --git a/nashorn/docs/source/javaextend.js b/doc/nashorn/source/javaextend.js similarity index 100% rename from nashorn/docs/source/javaextend.js rename to doc/nashorn/source/javaextend.js diff --git a/nashorn/docs/source/javaimporter.js b/doc/nashorn/source/javaimporter.js similarity index 100% rename from nashorn/docs/source/javaimporter.js rename to doc/nashorn/source/javaimporter.js diff --git a/nashorn/docs/source/javatypes.js b/doc/nashorn/source/javatypes.js similarity index 100% rename from nashorn/docs/source/javatypes.js rename to doc/nashorn/source/javatypes.js diff --git a/nashorn/docs/source/overload.js b/doc/nashorn/source/overload.js similarity index 100% rename from nashorn/docs/source/overload.js rename to doc/nashorn/source/overload.js diff --git a/nashorn/docs/source/runnable.js b/doc/nashorn/source/runnable.js similarity index 100% rename from nashorn/docs/source/runnable.js rename to doc/nashorn/source/runnable.js diff --git a/nashorn/docs/source/samfunc.js b/doc/nashorn/source/samfunc.js similarity index 100% rename from nashorn/docs/source/samfunc.js rename to doc/nashorn/source/samfunc.js diff --git a/nashorn/docs/source/test.js b/doc/nashorn/source/test.js similarity index 100% rename from nashorn/docs/source/test.js rename to doc/nashorn/source/test.js diff --git a/common/doc/testing.html b/doc/testing.html similarity index 100% rename from common/doc/testing.html rename to doc/testing.html diff --git a/common/doc/testing.md b/doc/testing.md similarity index 100% rename from common/doc/testing.md rename to doc/testing.md diff --git a/get_source.sh b/get_source.sh deleted file mode 100644 index 72049bdec8a..00000000000 --- a/get_source.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -to_stderr() { - echo "$@" >&2 -} - -error() { - to_stderr "ERROR: $1" - exit ${2:-126} -} - -warning() { - to_stderr "WARNING: $1" -} - -version_field() { - # rev is typically omitted for minor and major releases - field=`echo ${1}.0 | cut -f ${2} -d .` - if expr 1 + $field >/dev/null 2> /dev/null; then - echo $field - else - echo -1 - fi -} - -# Version check - -# required -reqdmajor=1 -reqdminor=4 -reqdrev=0 - -# requested -rqstmajor=2 -rqstminor=6 -rqstrev=3 - - -# installed -hgwhere="`command -v hg`" -if [ "x$hgwhere" = "x" ]; then - error "Could not locate Mercurial command" -fi - -hgversion="`LANGUAGE=en hg --version 2> /dev/null | sed -n -e 's@^Mercurial Distributed SCM (version \([^+]*\).*)\$@\1@p'`" -if [ "x${hgversion}" = "x" ] ; then - error "Could not determine Mercurial version of $hgwhere" -fi - -hgmajor="`version_field $hgversion 1`" -hgminor="`version_field $hgversion 2`" -hgrev="`version_field $hgversion 3`" - -if [ $hgmajor -eq -1 -o $hgminor -eq -1 -o $hgrev -eq -1 ] ; then - error "Could not determine Mercurial version of $hgwhere from \"$hgversion\"" -fi - - -# Require -if [ $hgmajor -lt $reqdmajor -o \( $hgmajor -eq $reqdmajor -a $hgminor -lt $reqdminor \) -o \( $hgmajor -eq $reqdmajor -a $hgminor -eq $reqdminor -a $hgrev -lt $reqdrev \) ] ; then - error "Mercurial version $reqdmajor.$reqdminor.$reqdrev or later is required. $hgwhere is version $hgversion" -fi - - -# Request -if [ $hgmajor -lt $rqstmajor -o \( $hgmajor -eq $rqstmajor -a $hgminor -lt $rqstminor \) -o \( $hgmajor -eq $rqstmajor -a $hgminor -eq $rqstminor -a $hgrev -lt $rqstrev \) ] ; then - warning "Mercurial version $rqstmajor.$rqstminor.$rqstrev or later is recommended. $hgwhere is version $hgversion" -fi - - -# Get clones of all absent nested repositories (harmless if already exist) -sh ./common/bin/hgforest.sh clone "$@" || exit $? - -# Update all existing repositories to the latest sources -sh ./common/bin/hgforest.sh pull -u diff --git a/hotspot/.hgignore b/hotspot/.hgignore deleted file mode 100644 index db11ccf9c54..00000000000 --- a/hotspot/.hgignore +++ /dev/null @@ -1,41 +0,0 @@ -^build/ -^dist/ -^webrev -/nbproject/private/ -^src/share/tools/hsdis/build/ -^src/share/tools/IdealGraphVisualizer/[a-zA-Z0-9]*/build/ -^src/share/tools/IdealGraphVisualizer/build/ -^src/share/tools/IdealGraphVisualizer/dist/ -^src/share/tools/IdealGraphVisualizer/nbplatform/ -.igv.log -.DS_Store -^\.mx.jvmci/env -^\.mx.jvmci/.*\.pyc -^\.mx.jvmci/eclipse-launches/.* -^\.mx.jvmci/hotspot/eclipse/.* -^\.idea/ -^workingsets.xml -^src/jdk.internal.vm.ci/share/classes/\w[\w\.]*/.*\.xml -^src/jdk.internal.vm.ci/share/classes/\w[\w\.]*/.*\.iml -^src/jdk.internal.vm.ci/share/classes/\w[\w\.]*/nbproject -^src/jdk.internal.vm.ci/share/classes/\w[\w\.]*/\..* -^test/compiler/jvmci/\w[\w\.]*/.*\.xml -^test/compiler/jvmci/\w[\w\.]*/.*\.iml -^test/compiler/jvmci/\w[\w\.]*/nbproject -^test/compiler/jvmci/\w[\w\.]*/\..* -^test/compiler/aot/\w[\w\.]*/.*\.xml -^test/compiler/aot/\w[\w\.]*/.*\.iml -^test/compiler/aot/\w[\w\.]*/nbproject -^test/compiler/aot/\w[\w\.]*/\..* -^src/jdk.internal.vm.compiler/\.mx.graal/env -^src/jdk.internal.vm.compiler/\.mx.graal/.*\.pyc -^src/jdk.internal.vm.compiler/\.mx.graal/eclipse-launches/.* -^src/jdk.aot/share/classes/\w[\w\.]*/.*\.xml -^src/jdk.aot/share/classes/\w[\w\.]*/.*\.iml -^src/jdk.aot/share/classes/\w[\w\.]*/nbproject -^src/jdk.aot/share/classes/\w[\w\.]*/\..* -^src/jdk.internal.vm.compiler/share/classes/\w[\w\.]*/.*\.xml -^src/jdk.internal.vm.compiler/share/classes/\w[\w\.]*/.*\.iml -^src/jdk.internal.vm.compiler/share/classes/\w[\w\.]*/nbproject -^src/jdk.internal.vm.compiler/share/classes/\w[\w\.]*/\..* - diff --git a/hotspot/.hgtags b/hotspot/.hgtags deleted file mode 100644 index 51b6aa07416..00000000000 --- a/hotspot/.hgtags +++ /dev/null @@ -1,609 +0,0 @@ -a61af66fc99eb5ec9d50c05b0c599757b1289ceb jdk7-b24 -7836be3e92d0a4f9ee7566f602c91f5609534e66 jdk7-b25 -ad0b851458ff9d1d490ed2d79bb84f75a9fdb753 jdk7-b26 -e3d2692f8442e2d951166dc9bd9a330684754438 jdk7-b27 -c14dab40ed9bf45ad21150bd70c9c80cdf655415 jdk7-b28 -4f91c08b3e4498213a9c5a24898f7d9c38cf86fb jdk7-b29 -d1605aabd0a15ecf93787c47de63073c33fba52d jdk7-b30 -9c2ecc2ffb125f14fab3857fe7689598956348a0 jdk7-b31 -b727c32788a906c04839516ae7443a085185a300 jdk7-b32 -585535ec8a14adafa6bfea65d6975e29094c8cec jdk7-b33 -5251a9cd8eb8743eee647365bee1c8afdc131556 jdk7-b34 -5fa96a5a7e76da7c8dad12486293a0456c2c116c jdk7-b35 -e91159f921a58af3698e6479ea1fc5818da66d09 jdk7-b36 -9ee9cf798b59e7d51f8c0a686959f313867a55d6 jdk7-b37 -d9bc824aa078573829bb66572af847e26e1bd12e jdk7-b38 -49ca90d77f34571b0757ebfcb8a7848ef2696b88 jdk7-b39 -81a0cbe3b28460ce836109934ece03db7afaf9cc jdk7-b40 -f9d938ede1960d18cb7cf23c645b026519c1a678 jdk7-b41 -ad8c8ca4ab0f4c86e74c061958f44a8f4a930f2c jdk7-b42 -fc6a5ae3fef5ebacfa896dbb3ae37715e388e282 jdk7-b43 -809e899c638bd9b21836abf9d09ab2a30ff3900b jdk7-b44 -945bf754069766e76873c53102fae48abf04cf5b jdk7-b45 -16bb38eeda35b46268eefa4c1f829eb086e0ca46 jdk7-b46 -fcb923bad68e2b10380a030ea83a723f4dc3d4d6 jdk7-b47 -bcb33806d186561c781992e5f4d8a90bb033f9f0 jdk7-b48 -8b22ccb5aba2c6c11bddf6488a7bb7ef5b4bf2be jdk7-b49 -dae503d9f04c1a11e182dbf7f770509c28dc0609 jdk7-b50 -2581d90c6c9b2012da930eb4742add94a03069a0 jdk7-b51 -1b1e8f1a4fe8cebc01c022484f78148e17b62a0d jdk7-b52 -032c6af894dae8d939b3dd31d82042549e7793e0 jdk7-b53 -fafab5d5349c7c066d677538db67a1ee0fb33bd2 jdk7-b54 -f8e839c086152da70d6ec5913ba6f9f509282e8d jdk7-b55 -a3fd9e40ff2e854f6169eb6d09d491a28634d04f jdk7-b56 -f4cbf78110c726919f46b59a3b054c54c7e889b4 jdk7-b57 -53d9bf689e80fcc76b221bbe6c5d58e08b80cbc6 jdk7-b58 -c55be0c7bd32c016c52218eb4c8b5da8a75450b5 jdk7-b59 -a77eddcd510c3972717c025cfcef9a60bfa4ecac jdk7-b60 -27b728fd1281ab62e9d7e4424f8bbb6ca438d803 jdk7-b61 -a88386380bdaaa5ab4ffbedf22c57bac5dbec034 jdk7-b62 -32c83fb84370a35344676991a48440378e6b6c8a jdk7-b63 -ba36394eb84b949b31212bdb32a518a8f92bab5b jdk7-b64 -ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65 -57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66 -18f526145aea355a9320b724373386fc2170f183 jdk7-b67 -d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68 -54fd4d9232969ea6cd3d236e5ad276183bb0d423 jdk7-b69 -0632c3e615a315ff11e2ab1d64f4d82ff9853461 jdk7-b70 -50a95aa4a247f0cbbf66df285a8b1d78ffb153d9 jdk7-b71 -a94714c550658fd6741793ef036cb9625dc2ab1a jdk7-b72 -faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73 -f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74 -d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75 -9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76 -455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77 -e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78 -a5a6adfca6ecefb5894a848debabfe442ff50e25 jdk7-b79 -3003ddd1d4330b06cb4691ae74d600d3685899eb jdk7-b80 -1f9b07674480c224828852ffe137beea36b3cab5 jdk7-b81 -1999f5b12482d66c8b0daf6709daea4f51893a04 jdk7-b82 -a94714c550658fd6741793ef036cb9625dc2ab1a hs17-b01 -faf94d94786b621f8e13cbcc941ca69c6d967c3f hs17-b02 -f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 hs17-b03 -d8dd291a362acb656026a9c0a9da48501505a1e7 hs17-b04 -9174bb32e934965288121f75394874eeb1fcb649 hs17-b05 -a5a6adfca6ecefb5894a848debabfe442ff50e25 hs17-b06 -3003ddd1d4330b06cb4691ae74d600d3685899eb hs17-b07 -1f9b07674480c224828852ffe137beea36b3cab5 hs17-b08 -ff3232b68fbb35185b338d7ff4695b52460243f3 hs17-b09 -981375ca07b7f0605f92f57aad95122e8c385a4d hs16-b01 -f4cbf78110c726919f46b59a3b054c54c7e889b4 hs16-b02 -07c1c01e031513bfe6a7d17c6cf30d2752824ae9 hs16-b03 -08f86fa55a31113df626a75c8a626e66a543a1bd hs16-b04 -32c83fb84370a35344676991a48440378e6b6c8a hs16-b05 -ba313800759b678979434d6da8ed3bf49eb8bea4 hs16-b06 -3c0f729815607e1678bd0c41ae68494c700dcc71 hs16-b07 -ac59d4e6dae51ac5fc31a9a4940d1857f91161b1 hs16-b08 -3f844a28c5f4912bd04043b44f21b25b0805ffc2 hs15-b01 -1605bb4eb5a7a1703b13d5b077a22cc665fe45f7 hs15-b02 -2581d90c6c9b2012da930eb4742add94a03069a0 hs15-b03 -9ab385cb0c42997e16a7761ebcd25c90560a2714 hs15-b04 -fafab5d5349c7c066d677538db67a1ee0fb33bd2 hs15-b05 -3f370a32906eb5ba993fabd7b4279be7f31052b9 jdk7-b83 -ffc8d176b84bcfb5ac21302b4feb3b0c0d69b97c jdk7-b84 -6c9796468b91dcbb39e09dfa1baf9779ac45eb66 jdk7-b85 -418bc80ce13995149eadc9eecbba21d7a9fa02ae hs17-b10 -bf823ef06b4f211e66988d76a2e2669be5c0820e jdk7-b86 -07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01 -e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87 -4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88 -15836273ac2494f36ef62088bc1cb6f3f011f565 jdk7-b89 -4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b hs18-b02 -605c9707a766ff518cd841fc04f9bb4b36a3a30b jdk7-b90 -e0a1a502e402dbe7bf2d9102b4084a7e79a99a9b jdk7-b91 -25f53b53aaa3eb8b2d5391a1e8de9a76ae1dd8a2 hs18-b03 -3221d1887d30341bedfdac1dbf365ea41beff20f jdk7-b92 -310cdbc355355a13aa53c002b6bde4a8c5ba67ff hs18-b04 -9d865fc2f644fdd9a0108fd6407944ee610aadd9 jdk7-b93 -d38f45079fe98792a7381dbb4b64f5b589ec8c58 jdk7-b94 -8bfe9058ca4661779ac1d0572329f3943e68362e hs19-b01 -91d861ba858daca645993a1ab6ba2fa06a8f4a5b jdk7-b95 -573e8ea5fd68e8e51eb6308d283ac3b3889d15e0 jdk7-b96 -573e8ea5fd68e8e51eb6308d283ac3b3889d15e0 hs19-b02 -5f42499e57adc16380780f40541e1a66cd601891 jdk7-b97 -8a045b3f5c13eaad92ff4baf15ca671845fcad1a jdk7-b98 -6a236384a379642b5a2398e2819db9ab4e711e9b jdk7-b99 -ad1977f08c4d69162a0775fe3f9576b9fd521d10 jdk7-b100 -6c3a919105b68c15b7db923ec9a00006e9560910 jdk7-b101 -ad1977f08c4d69162a0775fe3f9576b9fd521d10 hs19-b03 -c5cadf1a07717955cf60dbaec16e35b529fd2cb0 jdk7-b102 -cb4250ef73b21de6c487ea14e2b0b99eed67b4b6 jdk7-b103 -e55900b5c1b865cac17e18abc639c7dc50de7fd8 hs19-b04 -b4acf10eb134fe930802c97e36db65e7ccb544b5 jdk7-b104 -6709c14587c2cc6faca208767335afeb01e33de5 jdk7-b105 -1b81ca701fa5fc30adc4cfdaa4bdd153df5e6c86 jdk7-b106 -cc3fdfeb54b049f18edcf3463e6ab051d0b7b609 hs19-b05 -688a538aa65412178286ae2a6b0c00b6711e121b hs19-b06 -bf496cbe9b74dda5975a1559da7ecfdd313e509e jdk7-b107 -0000000000000000000000000000000000000000 hs19-b06 -6c43216df13513a0f96532aa06f213066c49e27b hs19-b06 -e44a93947ccbfce712b51725f313163606f15486 jdk7-b108 -cc4bb3022b3144dc5db0805b9ef6c7eff2aa3b81 jdk7-b109 -2f25f2b8de2700a1822463b1bd3d02b5e218018f jdk7-b110 -07b042e13dde4f3479ba9ec55120fcd5e8623323 jdk7-b111 -5511edd5d719f3fc9fdd04879482026a3d2c8652 jdk7-b112 -beef35b96b81129c375d572357fb9548d9020db1 jdk7-b113 -68d6141ea19de3a9ba98ef753f0da41a61f736a0 jdk7-b114 -5511edd5d719f3fc9fdd04879482026a3d2c8652 hs20-b01 -bdbc48857210a509b3c50a3291ecb9dd6a72e016 jdk7-b115 -96b3f2a7add0b445b8aa421f6823cff5a2e2fe03 jdk7-b116 -52f19c724d9634af79044a2e0defbe4a5f1adbda hs20-b02 -806d0c037e6bbb88dac0699673f4ba55ee8c02da jdk7-b117 -698b7b727e12de44139d8cca6ab9a494ead13253 jdk7-b118 -3ef7426b4deac5dcfd4afb35cabe9ab3d666df91 hs20-b02 -5484e7c53fa7da5e869902437ee08a9ae10c1c69 jdk7-b119 -f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120 -3f3653ab7af8dc1ddb9fa75dad56bf94f89e81a8 jdk7-b121 -3a548dc9cb456110ca8fc1514441a8c3bda0014d jdk7-b122 -5484e7c53fa7da5e869902437ee08a9ae10c1c69 hs20-b03 -9669f9b284108a9ee0a0ccbe215c37a130c9dcf5 jdk7-b123 -9669f9b284108a9ee0a0ccbe215c37a130c9dcf5 hs20-b04 -0a8e0d4345b37b71ec49dda08ee03b68c4f1b592 jdk7-b124 -0a8e0d4345b37b71ec49dda08ee03b68c4f1b592 hs20-b05 -e24ab3fa6aafad3efabbe7dba9918c5f461a20b1 jdk7-b125 -4c851c931d001a882cab809aaf3a55371b919244 jdk7-b126 -e24ab3fa6aafad3efabbe7dba9918c5f461a20b1 hs20-b06 -d535bf4c12355a2897e918da9f8910c0aceec4fb hs20-b07 -102466e70debc4b907afbd7624e34ddb1aafee9f jdk7-b127 -9a5762f448595794d449a8e17342abd81a3fadaf jdk7-b128 -ae4b185f2ed14af7bab610738c333840598cdcc4 jdk7-b129 -ae4b185f2ed14af7bab610738c333840598cdcc4 hs21-b01 -e9aa2ca89ad6c53420623d579765f9706ec523d7 jdk7-b130 -0aa3b49089112d5faa77902ad680c582ab53f651 jdk7-b131 -e9aa2ca89ad6c53420623d579765f9706ec523d7 hs21-b02 -0e531ab5ba04967a0e9aa6aef65e6eb3a0dcf632 jdk7-b132 -a8d643a4db47c7b58e0bcb49c77b5c3610de86a8 hs21-b03 -1b3a350709e4325d759bb453ff3fb6a463270488 jdk7-b133 -447e6faab4a8755d4860c2366630729dbaec111c jdk7-b134 -3c76374706ea8a77e15aec8310e831e5734f8775 hs21-b04 -b898f0fc3cedc972d884d31a751afd75969531cf jdk7-b135 -b898f0fc3cedc972d884d31a751afd75969531cf hs21-b05 -bd586e392d93b7ed7a1636dcc8da2b6a4203a102 jdk7-b136 -bd586e392d93b7ed7a1636dcc8da2b6a4203a102 hs21-b06 -2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f jdk7-b137 -2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f hs21-b07 -0930dc920c185afbf40fed9a655290b8e5b16783 jdk7-b138 -0930dc920c185afbf40fed9a655290b8e5b16783 hs21-b08 -611e19a16519d6fb5deea9ab565336e6e6ee475d jdk7-b139 -611e19a16519d6fb5deea9ab565336e6e6ee475d hs21-b09 -d283b82966712b353fa307845a1316da42a355f4 jdk7-b140 -d283b82966712b353fa307845a1316da42a355f4 hs21-b10 -5d07913abd59261c77f24cc04a759cb75d804099 jdk7-b141 -3aea9e9feb073f5500e031be6186666bcae89aa2 hs21-b11 -9ad1548c6b63d596c411afc35147ffd5254426d9 jdk7-b142 -9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12 -c149193c768b8b7233da4c3a3fdc0756b975848e hs21-b13 -c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143 -0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01 -31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02 -3a2fb61165dfc72e398179a2796d740c8da5b8c0 jdk8-b03 -0fa3ace511fe98fe948e751531f3e2b7c60c8376 jdk8-b04 -dce7d24674f4d0bed00de24f00119057fdce7cfb jdk8-b05 -0db80d8e77fccddf5e6fa49963226b54ac7d0f62 jdk8-b06 -3f0cf875af83f55ec5e1a5cea80455315f9322a2 jdk8-b07 -0cc8a70952c368e06de2adab1f2649a408f5e577 hs22-b01 -7c29742c41b44fb0cd5a13c7ac8834f3f2ca649e hs22-b02 -3a2fb61165dfc72e398179a2796d740c8da5b8c0 hs22-b03 -ce9bde819dcba4a5d2822229d9183e69c74326ca hs22-b04 -513a84dd0f8b56dc0836b4e0bdd5dd0a778fc634 hs22-b05 -650d15d8f37255d3b805aa00c5bd1c30984b203d hs22-b06 -da883b9e6d3788057f9577e72712998ed82c9b7e hs23-b01 -49ed7eacfd16616166ff066493143889741097af jdk8-b08 -7c20d272643f47195478708eff593a9cce40fec4 jdk8-b09 -e4f412d2b75d2c797acff965aa2c420e3d358f09 hs23-b02 -d815de2e85e511b7deab2a83cf80c0224d011da9 jdk8-b10 -4d3850d9d326ac3a9bee2d867727e954322d014e hs23-b03 -4538caeef7b6cbd4302bebced805d65e68ccf301 jdk8-b11 -6534482ff68ad79066dfe15dfb6d8905f09681bd hs23-b04 -1d3900713a67a0a39faf4e12c9c158d55aebef87 jdk8-b12 -3e609627e780736f372eb14d29bb9b5e53b21fbf hs23-b05 -b92ca8e229d29004f840c67e620833d23a346761 jdk8-b13 -088d09a130ff02d8f5f05e92256baabe412f0439 jdk8-b14 -6c2a55d4902f202e1c2de1df17b7da083a2c31e8 hs23-b06 -fde2a39ed7f39233b287fbc278f437aac06c275b jdk8-b15 -d1f29d4e0bc60e8bd7ae961f1306d8ab33290212 jdk8-b17 -d1f29d4e0bc60e8bd7ae961f1306d8ab33290212 jdk8-b16 -6de8c9ba5907e4c5ca05ac4b8d84a8e2cbd92399 hs23-b07 -a2fef924d8e6f37dac2a887315e3502876cc8e24 hs23-b08 -61165f53f1656b9f99e4fb806429bf98b99d59c3 jdk8-b18 -4bcf61041217f8677dcec18e90e9196acc945bba hs23-b09 -9232e0ecbc2cec54dcc8f93004fb00c214446460 jdk8-b19 -fe2c8764998112b7fefcd7d41599714813ae4327 jdk8-b20 -9952d1c439d64c5fd4ad1236a63a62bd5a49d4c3 jdk8-b21 -513351373923f74a7c91755748b95c9771e59f96 hs23-b10 -24727fb37561779077fdfa5a33342246f20e5c0f jdk8-b22 -dcc292399a39113957eebbd3e487b7e05e2c79fc hs23-b11 -e850d8e7ea54b91c7aa656e297f0f9f38dd4c296 jdk8-b23 -9e177d44b10fe92ecffa965fef9c5ac5433c1b46 hs23-b12 -a80fd4f45d7aaa154ed2f86a129f3c9c4035ec7a jdk8-b24 -b22de824749922986ce4d442bed029916b832807 hs23-b13 -64b46f975ab82948c1e021e17775ff4fab8bc40e hs23-b14 -9ad8feb5afbddec46d3cfe29fb5f73c2e99d5a43 jdk8-b25 -d71e662fe03741b6de498ca2077220148405a978 hs23-b15 -fd3060701216a11c0df6dcd053c6fd7c2b17a42c jdk8-b26 -f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 -f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 -931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16 -3b24e7e01d20ca590d0f86b1222bb7c3f1a2aa2d jdk8-b27 -975c4105f1e2ef1190a75b77124033f1fd4290b5 hs24-b01 -b183b0863611b85dbac16f3b08b40ba978756d19 jdk8-b28 -030b5306d60f140e822e4a6d301744cb110ff0c8 hs24-b02 -b45b5c564098c58ea69e7cff3f7d341f0254dd1d jdk8-b29 -d61761bf305031c94f7f8eca49abd978b7d3c5da jdk8-b30 -dfae0140457cfb2c381d7679735fbedbae862c62 hs24-b03 -f4767e53d6e0d5da7e3f1775904076cce54247c1 hs24-b04 -0cd147eaa673d1642b2f466f5dc257cf192db524 jdk8-b31 -27863e4586de38be7dd17da4163f542038f4d1d7 hs24-b05 -25410a347ebb0bef166c4338a90d9dea82463a20 jdk8-b32 -cd47da9383cd932cb2b659064057feafa2a91134 hs24-b06 -785bcf415ead2eaa5f6677aaf528481008140bac jdk8-b33 -7c6aba65acd2c334f1c3512b574f9038cddac24b hs24-b07 -f284b08835584517c1ca3dd67341f569e763841f jdk8-b34 -f621660a297baa48fab9dca28e99d318826e8304 jdk8-b35 -dff6e3459210f8dd0430b9b03ccc99280560da30 hs24-b08 -50b4400ca1ecb2ac2fde35f5e53ec8f04b86be7f jdk8-b36 -bfcf92bfefb82da00f7fdbf0d9273feaa0a9456d jdk8-b37 -7d5ec8bf38d1b12e0e09ec381f10976b8beede3b hs24-b09 -637c3f5f068f88fb9ec9c5867341cf59fd5ebedc jdk8-b38 -73147e6c48813b5fee904aa33f79a77103250ff4 hs24-b10 -96a403721094ecdaf6a1f4f52ebd0a82e07df199 jdk8-b39 -14b0e07ab9a6fa1662414496b7e07ac8450cf517 hs24-b11 -ff9decc8235d5af80ea45fda4ecbe643ea252564 jdk8-b40 -785573170238f0eae6dc8e22ecf1050fbc9ea055 hs24-b12 -37add4fa0296705f67481e1fd50e2900cd25e39b jdk8-b41 -bd568544be7fcd12a9327e6c448592198d57b043 hs24-b13 -55954061c6e8750ea39a63523fd65d580db6eeb1 jdk8-b42 -e77b8e0ed1f84e3e268239e276c7ab64fa573baa jdk8-b43 -5ba29a1db46ecb80a321ca873adb56a3fe6ad320 hs24-b14 -831e5c76a20af18f3c08c5a95ed31be0e128a010 jdk8-b44 -9d5f20961bc5846fa8d098d534effafbbdae0a58 jdk8-b45 -40e5a3f2907ed02b335c7caa8ecf068cc801380d hs24-b15 -cf37a594c38db2ea926954154636f9f81da2e032 jdk8-b46 -0c7bb1f4f9c8062b5c5bfa56b3bdca44839b4109 jdk8-b47 -66b0450071c1534e014b131892cc86b63f1d009c hs24-b16 -1e26f61bbb521642639f56fae11326f1932f5a7d jdk8-b48 -bd54fe36b5e50f9ef1e30a5047b27fee5297e268 hs24-b17 -e3619706a7253540a2d94e9e841acaab8ace7038 jdk8-b49 -72e0362c3f0cfacbbac8af8a5b9d2e182f21c17b hs24-b18 -58f237a9e83af6ded0d2e2c81d252cd47c0f4c45 jdk8-b50 -3b3ad16429701b2eb6712851c2f7c5a726eb2cbe hs24-b19 -663fc23da8d51c4c0552cbcb17ffc85f5869d4fd jdk8-b51 -4c8f2a12e757e7a808aa85827573e09f75d7459f hs24-b20 -6d0436885201db3f581523344a734793bb989549 jdk8-b52 -54240c1b8e87758f28da2c6a569a926fd9e0910a jdk8-b53 -9e3ae661284dc04185b029d85440fe7811f1ed07 hs24-b21 -e8fb566b94667f88462164defa654203f0ab6820 jdk8-b54 -09ea7e0752b306b8ae74713aeb4eb6263e1c6836 hs24-b22 -af0c8a0808516317333dcf9af15567cdd52761ce jdk8-b55 -6124ff4218296c91e4a72f1a76c064892d39d61b jdk8-b56 -9b076bc3ab67d42d1d02144ef8dcd6006a7fc0d6 hs25-b01 -d70102c4cb73158902acaa6016f47c7bc14e0d67 jdk8-b57 -5f54277c67f755a377999bff904ab48aa63ddaf9 hs25-b02 -6bb378c50828e9d76fb2653d1712c66ea8fc47db jdk8-b58 -f2e12eb74117c917c0bb264694c02de4a6a15a10 hs25-b03 -8a1a6b9b4f20fd2f6a12441d638e51f19a82db19 jdk8-b59 -1cc7a2a11d00832e3d07f81f3744a6883422db7e hs25-b04 -3cfd05b2219a29649741a52637696f06acf24a4e jdk8-b60 -b261523fe66c40a02968f0aa7e73602491bb3386 hs25-b05 -4547dc71db765276e027b0c2780b724bae0a07d3 jdk8-b61 -d0337c31c8be7716369b4e7c3bd5f352983c6a06 hs25-b06 -dccd40de8db1fa96f186e6179907818d75320440 jdk8-b62 -dc16fe422c535ecd4e9f80fb814a1bb9704da6f5 hs25-b07 -acabb5c282f59be7e3238920b2ea06b684ab68f7 jdk8-b63 -8cb93eadfb6dcab88d91b8e2cd3e0e07d0ac4048 hs25-b08 -5920f72e799c8133d1066c4a62fa1fafcb729966 jdk8-b64 -b4ee7b773144a88af8b6b92e4384dea82cb948d8 hs25-b09 -0f7290a03b24bd562583fa325d3566c21c51fb94 jdk8-b65 -cfc5309f03b7bd6c1567618b63cf1fc74c0f2a8f hs25-b10 -01684f7fee1b86222be69bc23841ec2a4416696c jdk8-b66 -b61d9c88b759d1594b8af1655598e8fa00393672 hs25-b11 -25bdce771bb3a7ae9825261a284d292cda700122 jdk8-b67 -a35a72dd2e1255239d31f796f9f693e49b36bc9f hs25-b12 -121aa71316af6cd877bf455e775fa3fdbcdd4b65 jdk8-b68 -b6c9c0109a608eedbb6b868d260952990e3c91fe hs25-b13 -cb8a4e04bc8c104de8a2f67463c7e31232bf8d68 jdk8-b69 -990bbd393c239d95310ccc38094e57923bbf1d4a hs25-b14 -e94068d4ff52849c8aa0786a53a59b63d1312a39 jdk8-b70 -0847210f85480bf3848dc90bc2ab23c0a4791b55 jdk8-b71 -d5cb5830f570d1304ea4b196dde672a291b55f29 jdk8-b72 -1e129851479e4f5df439109fca2c7be1f1613522 hs25-b15 -11619f33cd683c2f1d6ef72f1c6ff3dacf5a9f1c jdk8-b73 -70c89bd6b895a10d25ca70e08093c09ff2005fda hs25-b16 -1a3e54283c54aaa8b3437813e8507fbdc966e5b6 jdk8-b74 -b4391649e91ea8d37f66317a03d6d2573a93d10d hs25-b17 -6778d0b1659323a506ca47600ca29a9d9f8b383d jdk8-b75 -20b605466ccb1b3725eb25314d9e8782199630c5 jdk8-b76 -412d722168bc23f8e6d98995202728678561417f hs25-b18 -cdb46031e7184d37301288f5719121a63c7054b5 jdk8-b77 -9f19f4a7d48a4ebe7f616b6068971ea5f8b075fa hs25-b19 -d5e12e7d2f719144d84903d9151455661c47b476 jdk8-b78 -555ec35a250783110aa070dbc8a8603f6cabe41f hs25-b20 -6691814929b606fe0e7954fd6e485dd876505c83 jdk8-b79 -df5396524152118535c36da5801d828b560d19a2 hs25-b21 -4a198b201f3ce84433fa94a3ca65d061473e7c4c jdk8-b80 -dd6350b4abc4a6c19c89dd982cc0e4f3d119885c hs25-b22 -65b797426a3bec6e91b64085a0cfb94adadb634a jdk8-b81 -0631ebcc45f05c73b09a56c2586685af1f781c1d hs25-b23 -3db4ab0e12f437fe374817de346b2b0c6b4a5b31 jdk8-b82 -e3a41fc0234895eba4f272b984f7dacff495f8eb hs25-b24 -1c8db54ee9f315e20d6d5d9bf0b5c10349e9d301 jdk8-b83 -8d0f263a370c5f3e61791bb06054560804117288 hs25-b25 -af788b85010ebabbc1e8f52c6766e08c7a95cf99 jdk8-b84 -a947f40fb536e5b9e0aa210cf26abb430f80887a hs25-b26 -42fe530cd478744a4d12a0cbf803f0fc804bab1a jdk8-b85 -09b0d3e9ba6cdf7da07d4010d2d1df14596f6864 hs25-b27 -6d88a566d369f6a1f86912cad7d0912686b2fda1 hs25-b28 -86db4847f195c0ecceea646431f1ff22d56282e8 jdk8-b86 -d4c2667846607042370760e23f64c3ab9350e60d jdk8-b87 -01d5f04e64dc2d64625b2db2056f5ed4de918a45 hs25-b29 -c4af77d2045476c56fbf3f914b336bb1b7cd18af hs25-b30 -8482058e74bc8c1a890e6f3be3eff192dba6ce67 jdk8-b88 -4ec91349972255650f97bedfd07e6423e02428cf hs25-b31 -9c1fe0b419b40a9ecdd1653cc9af1b6d67a12c46 jdk8-b89 -69494caf57908ba2c8efa9eaaa472b4d1875588a hs25-b32 -1ae0472ff3a0117b5b019d380ad59fface2fde14 jdk8-b90 -b19517cecc2e91636d7c16ba2f35e3d3dc628099 hs25-b33 -7cbdf0e3725c0c56a2ff7540fc70b6d4b5890d04 jdk8-b91 -38da9f4f67096745f851318d792d6468aa1f6cf8 hs25-b34 -092018493d3bbeb1c24278fd8c40ff3d76e1fed7 jdk8-b92 -573d86d412cd9d3df7912194c1a540be50e9544e jdk8-b93 -b786c04b7be15194febe88dc1f0c9443e737a84b hs25-b35 -3c78a14da19d26d6937af5f98b97e2a21c653b04 hs25-b36 -1beed1f6f9edefe47ba8ed1355fbd3e7606b8288 jdk8-b94 -69689078dff8b21e6df30870464f5d736eebdf72 hs25-b37 -5d65c078cd0ac455aa5e58a09844c7acce54b487 jdk8-b95 -2cc5a9d1ba66dfdff578918b393c727bd9450210 hs25-b38 -e6a4b8c71fa6f225bd989a34de2d0d0a656a8be8 jdk8-b96 -2b9380b0bf0b649f40704735773e8956c2d88ba0 hs25-b39 -d197d377ab2e016d024e8c86cb06a57bd7eae590 jdk8-b97 -c9dd82da51ed34a28f7c6b3245163ee962e94572 hs25-b40 -30b5b75c42ac5174b640fbef8aa87527668e8400 jdk8-b98 -2b9946e10587f74ef75ae8145bea484df4a2738b hs25-b41 -81b6cb70717c66375846b78bb174594ec3aa998e jdk8-b99 -9f71e36a471ae4a668e08827d33035963ed10c08 hs25-b42 -5787fac72e760c6a5fd9efa113b0c75caf554136 jdk8-b100 -46487ba40ff225654d0c51787ed3839bafcbd9f3 hs25-b43 -f6921c876db192bba389cec062855a66372da01c jdk8-b101 -530fe88b3b2c710f42810b3580d86a0d83ad6c1c hs25-b44 -c4697c1c448416108743b59118b4a2498b339d0c jdk8-b102 -7f55137d6aa81efc6eb0035813709f2cb6a26b8b hs25-b45 -6f9be7f87b9653e94fd8fb3070891a0cc91b15bf jdk8-b103 -580430d131ccd475e2f2ad4006531b8c4813d102 hs25-b46 -104743074675359cfbf7f4dcd9ab2a5974a16627 jdk8-b104 -c1604d5885a6f2adc0bcea2fa142a8f6bafad2f0 hs25-b47 -acac3bde66b2c22791c257a8d99611d6d08c6713 jdk8-b105 -18b4798adbc42c6fa16f5ecb7d5cd3ca130754bf hs25-b48 -aed585cafc0d9655726af6d1e1081d1c94cb3b5c jdk8-b106 -50794d8ac11c9579b41dec4de23b808fef9f34a1 hs25-b49 -5b7f90aab3ad25a25b75b7b2bb18d5ae23d8231c jdk8-b107 -a09fe9d1e016c285307507a5793bc4fa6215e9c9 hs25-b50 -85072013aad46050a362d10ab78e963121c8014c jdk8-b108 -566db1b0e6efca31f181456e54c8911d0192410d hs25-b51 -c81dd5393a5e333df7cb1f6621f5897ada6522b5 jdk8-b109 -58043478c26d4e8bf48700acea5f97aba8b417d4 hs25-b52 -6209b0ed51c086d4127bac0e086c8f326d1764d7 jdk8-b110 -562a3d356de67670b4172b82aca2d30743449e04 hs25-b53 -f6962730bbde82f279a0ae3a1c14bc5e58096c6e jdk8-b111 -4a845c7a463844cead9e1e1641d6bcfb8a77f1c7 hs25-b54 -0ed9a90f45e1b392c671005f9ee22ce1acf02984 jdk8-b112 -23b8db5ea31d3079f1326afde4cd5c67b1dac49c hs25-b55 -4589b398ab03aba6a5da8c06ff53603488d1b8f4 jdk8-b113 -82a9cdbf683e374a76f2009352de53e16bed5a91 hs25-b56 -7fd913010dbbf75260688fd2fa8964763fa49a09 jdk8-b114 -3b32d287da89a47a45d16f6d9ba5bd3cd9bf4b3e hs25-b57 -9ebaac78a8a0061fb9597e07f806498cb626cdeb jdk8-b115 -e510dfdec6dd701410f3398ed86ebcdff0cca63a hs25-b58 -52b076e6ffae247c1c7d8b7aba995195be2b6fc2 jdk8-b116 -c78d517c7ea47501b456e707afd4b78e7b5b202e hs25-b59 -f573d00213b7170c2ff856f9cd83cd148437f5b9 jdk8-b117 -abad3b2d905d9e1ad767c94baa94aba6ed5b207b hs25-b60 -c9f439732b18ea16f7e65815327d5ea7092cc258 jdk8-b118 -b2426da30009cd3069d03de073f351e6432c7682 hs25-b61 -ce42d815dd2130250acf6132b51b624001638f0d jdk8-b119 -05fedd51e40da22c9460bf17c7185889e435db3d hs25-b62 -fca262db9c4309f99d2f5542ab0780e45c2f1578 jdk8-b120 -ce2d7e46f3c7e41241f3b407705a4071323a11ab jdk9-b00 -050a626a88951140df874f7b163e304d07b6c296 jdk9-b01 -b188446de75bda5fc52d102cddf242c3ef5ecbdf jdk9-b02 -b2fee789d23f3cdabb3db4e51af43038e5692d3a jdk9-b03 -3812c088b9456ee22c933e88aee1ece71f4e783a jdk9-b04 -bdc5311e1db7598589b77015119b821bf8c828bd jdk9-b05 -52377a30a3f87b62d6135706997b8c7a47366e37 jdk9-b06 -52f7edf2589d9f9d35db3008bc5377f279de9c18 jdk9-b07 -4dedef5e51ed3a36677a8ba82949fc517ad64162 jdk9-b08 -05e8f5242c26ba45d4fa947e4f4f54c058c9b522 jdk9-b09 -ebc44d040cd149d2120d69fe183a3dae7840f4b4 jdk9-b10 -783309c3a1a629a452673399dcfa83ef7eca94d8 jdk9-b11 -1c383bb39e2849ca62cb763f4e182a29b421d60a jdk9-b12 -456ad9c99133803d4e1433124c85a6fd141b9ac9 jdk9-b13 -bd333491bb6c012d7b606939406d0fa9a5ac7ffd jdk9-b14 -170f6d733d7aec062f743a6b8c1cce940a7a984a jdk9-b15 -b14e7c0b7d3ec04127f565cda1d84122e205680c jdk9-b16 -14b656df31c2cb09c505921061e79977823de71a jdk9-b17 -871fd128548480095e0dc3fc34c422666baeec75 jdk9-b18 -d4cffb3ae6213c66c7522ebffe0349360a45f0ef jdk9-b19 -c1af79d122ec9f715fa29312b5e91763f3a4dfc4 jdk9-b20 -17b4a5e831b398738feedb0afe75245744510153 jdk9-b21 -518d1fcc0799494f013e00e0a94a91b6f212d54f jdk9-b22 -dd472cdacc32e3afc7c5bfa7ef16ea0e0befb7fa jdk9-b23 -dde2d03b0ea46a27650839e3a1d212c7c1f7b4c8 jdk9-b24 -6de94e8693240cec8aae11f6b42f43433456a733 jdk9-b25 -48b95a073d752d6891cc0d1d2836b321ecf3ce0c jdk9-b26 -f95347244306affc32ce3056f27ceff7b2100810 jdk9-b27 -657294869d7ff063e055f5492cab7ce5612ca851 jdk9-b28 -deb29e92f68ace2808a36ecfa18c7d61dcb645bb jdk9-b29 -5c722dffbc0f34eb8d903dca7b261e52248fa17e jdk9-b30 -9f7d155d28e519f3e4645dc21cf185c25f3176ed jdk9-b31 -af46576a8d7cb4003028b8ee8bf408cfe227315b jdk9-b32 -9b3f5e4f33725f7c1d9b8e523133fe8383a54d9f jdk9-b33 -821164b0131a47ca065697c7d27d8f215e608c8d jdk9-b34 -438cb613151c4bd290bb732697517cba1cafcb04 jdk9-b35 -464ab653fbb17eb518d8ef60f8df301de7ef00d0 jdk9-b36 -b1c2dd843f247a1db19e1e85eb62ca405f72dc26 jdk9-b37 -c363a8b87e477ee45d6d3cb2a36cb365141bc596 jdk9-b38 -9cb75e5e394827ccbaf2e15524108a412dc4ddc5 jdk9-b39 -6b09b3193d731e3288e2a240c504a20d0a06c766 jdk9-b40 -1d29b13e8a515a7ea3b882f140576d5d675bc11f jdk9-b41 -38cb4fbd47e3472bd1b5ebac83bda96fe4869c4f jdk9-b42 -65a9747147b8090037541040ba67156ec914db6a jdk9-b43 -43a44b56dca61a4d766a20f0528fdd8b5ceff873 jdk9-b44 -5dc8184af1e2bb30b0103113d1f1a58a21a80c37 jdk9-b45 -a184ee1d717297bd35b7c3e35393e137921a3ed2 jdk9-b46 -3b241fb72b8925b75941d612db762a6d5da66d02 jdk9-b47 -cc775a4a24c7f5d9e624b4205e9fbd48a17331f6 jdk9-b48 -360cd1fc42f10941a9fd17cc32d5b85a22d12a0b jdk9-b49 -e0947f58c9c1426aa0d98b98ebb78357b27a7b99 jdk9-b50 -403b9cbadb04d3d1201823591cf931dc93b38e3a jdk9-b51 -9fb7fdc554db5be5c5b10f88f529ec3b870c44e3 jdk9-b52 -effd5ef0c3eb4bb85aa975c489d6761dbf13ad6a jdk9-b53 -c3b117fa5bdedfafd9ed236403e6d406911195b1 jdk9-b54 -be49ab55e5c498c5077bbf58c2737100d1992339 jdk9-b55 -fd2d5ec7e7b16c7bf4043a7fe7cfd8af96b819e2 jdk9-b56 -56a85ffe743d3f9d70ba25d6ce82ddd2ad1bf33c jdk9-b57 -ee878f3d6732856f7725c590312bfbe2ffa52cc7 jdk9-b58 -96bcaec07cb165782bae1b9a1f28450b37a10e3a jdk9-b59 -9c916db4bf3bc164a47b5a9cefe5ffd71e111f6a jdk9-b60 -715d2da5801c410746e92f08066d53bde1496286 jdk9-b61 -1eab877142cce6ca06e556e2ad0af688f993f00b jdk9-b62 -2ac9b6b36689b50d1562627067c92d51781b5684 jdk9-b63 -bf92b8db249cdfa5651ef954b6c0743a7e0ea4cd jdk9-b64 -e7ae94c4f35e940ea423fc1dd260435df34a77c0 jdk9-b65 -197e94e0dacddd16816f101d24fc0442ab518326 jdk9-b66 -d47dfabd16d48eb96a451edd1b61194a39ee0eb5 jdk9-b67 -11af3990d56c97b40318bc1f20608e86f051a3f7 jdk9-b68 -ff0929a59ced0e144201aa05819ae2e47d6f2c61 jdk9-b69 -8672e9264db30c21504063932dbc374eabc287a1 jdk9-b70 -07c6b035d68b0c41b1dcd442157b50b41a2551e9 jdk9-b71 -c1b2825ef47e75cb34dd18450d1c4280b7c5853c jdk9-b72 -e37d432868be0aa7cb5e0f3d7caff1e825d8ead3 jdk9-b73 -fff6b54e9770ac4c12c2fb4cab5aa7672affa4bd jdk9-b74 -2f354281e9915275693c4e519a959b8a6f22d3a3 jdk9-b75 -0bc8d1656d6f2b1fdfe803c1305a108bb9939f35 jdk9-b76 -e66c3813789debfc06f206afde1bf7a84cb08451 jdk9-b77 -20dc06b04fe5ec373879414d60ef82ac70faef98 jdk9-b78 -e9e63d93bbfe2c6c23447e2c1f5cc71c98671cba jdk9-b79 -8e8377739c06b99b9011c003c77e0bef84c91e09 jdk9-b80 -4142c190cd5ca4fb70ec367b4f97ef936272d8ef jdk9-b81 -1c453a12be3036d482abef1dd470f8aff536b6b9 jdk9-b82 -3ed0df2c553a80e0e26b91a6ce08806ea17a066a jdk9-b83 -184c4328444974edd6b3b490b9d0177ace7e331c jdk9-b84 -03845376ea9dbf9690b6a9cfb4ed63f8cc0541c0 jdk9-b85 -1ae4191359d811a51512f17dca80ffe79837a5ff jdk9-b86 -d7ffd16382fe7071181b967932b47cff6d1312e1 jdk9-b87 -bc48b669bc6610fac97e16593050c0f559cf6945 jdk9-b88 -20dff0211deda8d5877fda0e80b6d165ab93c6c2 jdk9-b89 -7fe46dc64bb3a8df554b24cde0153ffb24f39c5e jdk9-b90 -3fd5c2ca4c20c183628b6dbeb8df821a961419e3 jdk9-b91 -53cb98d68a1aeb08d29c89d6da748de60c448e37 jdk9-b92 -d8b24776484cc4dfd19f50b23eaa18a80a161371 jdk9-b93 -a22b7c80529f5f05c847e932e017456e83c46233 jdk9-b94 -0c79cf3cdf0904fc4a630b91b32904491e1ae430 jdk-9+95 -a94bb7203596dd632486f1e3655fa5f70541dc08 jdk-9+96 -de592ea5f7ba0f8a8c5afc03bd169f7690c72b6f jdk-9+97 -e5b1a23be1e105417ba1c4c576ab373eb3fa2c2b jdk-9+98 -f008e8cc10d5b3212fb22d58c96fa01d38654f19 jdk-9+99 -bdb0acafc63c42e84d9d8195bf2e2b25ee9c3306 jdk-9+100 -9f45d3d57d6948cf526fbc2e2891a9a74ac6941a jdk-9+101 -d5239fc1b69749ae50793c61b899fcdacf3df857 jdk-9+102 -c5f55130b1b69510d9a6f4a3105b58e21cd7ffe1 jdk-9+103 -534c50395957c6025fb6627e93b35756f8d48a08 jdk-9+104 -266fa9bb5297bf02cb2a7b038b10a109817d2b48 jdk-9+105 -7232de4c17c37f60aecec4f3191090bd3d41d334 jdk-9+106 -c5146d4da417f76edfc43097d2e2ced042a65b4e jdk-9+107 -934f6793f5f7dca44f69b4559d525fa64b31840d jdk-9+108 -7e7e50ac4faf19899fc811569e32cfa478759ebb jdk-9+109 -2f5d1578b24060ea06bd1f340a124db95d1475b2 jdk-9+110 -c558850fac5750d8ca98a45180121980f57cdd28 jdk-9+111 -76582e8dc9e6374e4f99ab797c8d364b6e9449b4 jdk-9+112 -c569f8d89269fb6205b90f727581eb8cc04132f9 jdk-9+113 -b64432bae5271735fd53300b2005b713e98ef411 jdk-9+114 -88dd08d7be0fe7fb9f1914b1628f0aae9bf56e25 jdk-9+115 -61a214186dae6811dd989e9165e42f7dbf02acde jdk-9+116 -88170d3642905b9e6cac03e8efcc976885a7e6da jdk-9+117 -9b1075cac08dc836ec32e7b368415cbe3aceaf8c jdk-9+118 -15f3fe264872766bcb205696198f0c1502420e17 jdk-9+119 -0be6f4f5d18671184e62583668cb1d783dffa128 jdk-9+120 -7e293105dbb0789a468655f81320c891f491f371 jdk-9+121 -af6b4ad908e732d23021f12e8322b204433d5cf6 jdk-9+122 -75f81e1fecfb444f34f357295fe06af60e2762d9 jdk-9+123 -479631362b4930be985245ea063d87d821a472eb jdk-9+124 -bb640b49741af3f57f9994129934c46fc173219f jdk-9+125 -adc8c84b7cf8c540d920182f78a2bc982366432a jdk-9+126 -352357128f602dcf0426b1cbe011a4685a4d9f97 jdk-9+127 -22bf6db9767b1b3a1994cbf32eb3331f31ae2093 jdk-9+128 -e96b34b76d863ed1fa04e0eeb3f297ac17b490fd jdk-9+129 -7d54c7056328b6a2bf4877458b8f4d8cd870f93b jdk-9+130 -943bf73b49c33c2d7cbd796f6a4ae3c7a00ae932 jdk-9+131 -713951c08aa26813375175c2ab6cc99ff2a56903 jdk-9+132 -a25e0fb6033245ab075136e744d362ce765464cd jdk-9+133 -b8b694c6b4d2ab0939aed7adaf0eec1ac321a085 jdk-9+134 -3b1c4562953db47e36b237a500f368d5c9746d47 jdk-9+135 -a20da289f646ee44440695b81abc0548330e4ca7 jdk-9+136 -dfcbf839e299e7e2bba1da69bdb347617ea4c7e8 jdk-9+137 -fc0956308c7a586267c5dd35dff74f773aa9c3eb jdk-9+138 -08492e67bf3226784dab3bf9ae967382ddbc1af5 jdk-9+139 -fec31089c2ef5a12dd64f401b0bf2e00f56ee0d0 jdk-9+140 -160a00bc6ed0af1fdf8418fc65e6bddbbc0c536d jdk-9+141 -7b48d63dfd6b8e2657288de3d7b1f153dee02d7e jdk-9+142 -d87d5d430c42342f0320ca7f5cbe0cbd1f9d62ba jdk-9+143 -6187b582d02aee38341dc8ce4011906e9b364e9f jdk-9+144 -61e7ea56312351657e69198c503a6f7bf865af83 jdk-9+145 -a82cb5350cad96a0b4de496afebe3ded89f27efa jdk-9+146 -132a72c782071cc11ab25cc7c9ee167c3632fea4 jdk-9+147 -5e4e893520ecdbd517c6ed6375f0885664fe62c4 jdk-9+148 -30e1996bd55da36183434f24ed964adebf9ca71e jdk-9+149 -98fe046473c90204cbc9b34c512b9fc10dfb8479 jdk-9+150 -2a2ac7d9f52c8cb2b80077e515b5840b947e640c jdk-9+151 -31f1d26c60df7b2e516a4f84160d76ba017d4e09 jdk-9+152 -217ba81b9a4ce8698200370175aa2db86a39f66c jdk-9+153 -fc7e94cb748507366b839e859f865f724467446a jdk-10+0 -a9fdfd55835ef9dccb7f317b07249bd66653b874 jdk-9+154 -f3b3d77a1751897413aae43ac340a130b6fa2ae1 jdk-9+155 -43139c588ea48b6504e52b6c3dec530b17b1fdb4 jdk-9+156 -1ea217626ba0995dd03127f8322ba3687926a085 jdk-10+1 -b2d0a906afd73dcf27f572217eb1be0f196ec16c jdk-9+157 -4e78f30935229f13ce7c43089621cf7169f5abac jdk-9+158 -9211c2e89c1cd11ec2d5752b0f97131a7d7525c7 jdk-9+159 -94b4e2e5331d38eab6a3639c3511b2e0715df0e9 jdk-9+160 -191ffbdb3d7b734288daa7fb76b37a0a85dfe7eb jdk-9+161 -b01c519b715ef6f785d0631adee0a6537cf6c12e jdk-9+162 -983fe207555724d98f4876991e1cbafbcf2733e8 jdk-9+163 -0af429be8bbaeaaf0cb838e9af28c953dda6a9c8 jdk-9+164 -c92c6416ca03b1464d5ed99cf6201e52b5ba0a70 jdk-9+165 -560d7aa083a24b6a56443feb8de0f40435d33aa9 jdk-9+166 -48809c513ed5ebb4d4dbf2f454afcce2780db6db jdk-10+2 -6c3b6b3438c4a63e619f00bd5732d1260ffd5600 jdk-10+3 -8295ca08f5cb09c090eb048bbdd338d7e270c8bf jdk-10+4 -7b5ca2ff1f78873ca3ee99b6589d3cb4dde2e454 jdk-10+5 -762465099d938fd96cd1efda193bc1fa23d070d3 jdk-10+6 -1ca7ed1b17b5776930d641d1379834f3140a74e4 jdk-9+167 -fbb9c802649585d19f6d7e81b4a519d44806225a jdk-9+168 -16d692be099c5c38eb48cc9aca78b0c900910d5b jdk-9+169 -38a240fd58a287acb1963920b92ed4d9c2fd39e3 jdk-9+170 -9d4746eca95aec3e5a344bf2520745dcc1d17eed jdk-10+7 -f5ded0cf954c770deeecb80f2ba1ba6a05cd979b jdk-10+8 -233647e3d3800e76d7612014b745b37a88098f63 jdk-10+9 -d53171650a2cc6c6f699c966c533b914ca9c0602 jdk-9+171 -c6cd3ec8d46b034e57c86399380ffcf7f25706e4 jdk-10+10 -1ae9e84f68b359420d2d153ecfe5ee2903e33a2e jdk-9+172 -7f14e550f1e8abea41c223e5fdad2261e99ba929 jdk-10+11 -e64b1cb48d6e7703928a9d1da106fc27f8cb65fd jdk-9+173 -944791f8160185bffa13fbb821fc09b6198f1f25 jdk-9+174 -070aa7a2eb14c4645f7eb31384cba0a2ba72a4b5 jdk-10+12 -8f04d457168b9f1f4a1b2c37f49e0513ca9d33a7 jdk-9+175 -a9da03357f190807591177fe9846d6e68ad64fc0 jdk-10+13 -e920b4d008d914f3414bd4630b58837cf0b7f08d jdk-10+14 -2ab74e5dbdc2b6a962c865500cafd23cf387dc60 jdk-9+176 -1ca8f038fceb88c640badf9bd18905205bc63b43 jdk-9+177 -c1f3649a3a42f124b418a5a916dbad13d059b757 jdk-10+15 -2fe2a593e8ebf3a9e4dcd9ba3333a7b43126589d jdk-10+16 -9d032191f82fca5ba0aac98682f69c4ff0f1283d jdk-9+178 -d2661aa42bff322badbe6c1337fc638d2e0f5730 jdk-9+179 -73e2cb8700bfa51304bd4b02f224620859a3f600 jdk-10+17 -c9d3317623d48da3327232c81e3f8cfc0d29d888 jdk-10+18 -33b74e13c1457f36041addb8b850831f81ca6e9f jdk-10+19 -d7baadc223e790c08bc69bf7e553bce65b4e7e40 jdk-9+180 -4a443796f6f57842d6a0434ac27ca3d1033ccc20 jdk-9+181 -e93ed1a092409351c90b3a76d80b9aa8b44d5e6a jdk-10+20 -bdb2dbc43ff065b74c2121bdfb0d6e1fa8684b73 jdk-10+21 -71337910df60ff2b62daf10357f553def25e2d0b jdk-10+22 diff --git a/hotspot/.jcheck/conf b/hotspot/.jcheck/conf deleted file mode 100644 index ad4189d7de5..00000000000 --- a/hotspot/.jcheck/conf +++ /dev/null @@ -1,2 +0,0 @@ -project=jdk10 -bugids=dup diff --git a/hotspot/ASSEMBLY_EXCEPTION b/hotspot/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d90239..00000000000 --- a/hotspot/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/hotspot/LICENSE b/hotspot/LICENSE deleted file mode 100644 index 8b400c7ab81..00000000000 --- a/hotspot/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp b/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp deleted file mode 100644 index 111f64491ab..00000000000 --- a/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp +++ /dev/null @@ -1,304 +0,0 @@ -/* - * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -/* - * This is to provide sanity check in jhelper.d which compares SCCS - * versions of generateJvmOffsets.cpp used to create and extract - * contents of __JvmOffsets[] table. - * The __JvmOffsets[] table is located in generated JvmOffsets.cpp. - * - * GENOFFS_SCCS_VER 34 - */ - -#include "generateJvmOffsets.h" - -/* A workaround for private and protected fields */ -#define private public -#define protected public - -// not on macosx #include -#include "code/codeBlob.hpp" -#include "code/nmethod.hpp" -#include "code/pcDesc.hpp" -#include "gc/shared/collectedHeap.hpp" -#include "memory/heap.hpp" -#include "memory/memRegion.hpp" -#include "memory/universe.hpp" -#include "memory/virtualspace.hpp" -#include "oops/constMethod.hpp" -#include "oops/klass.hpp" -#include "oops/method.hpp" -#include "oops/oop.hpp" -#include "oops/symbol.hpp" -#include "runtime/vmStructs.hpp" -#include "utilities/accessFlags.hpp" -#include "utilities/globalDefinitions.hpp" - -// These are defined somewhere for Solaris -#define PR_MODEL_ILP32 1 -#define PR_MODEL_LP64 2 - -#ifdef COMPILER1 -#ifdef ASSERT - -/* - * To avoid the most part of potential link errors - * we link this program with -z nodefs . - * - * But for 'debug1' and 'fastdebug1' we still have to provide - * a particular workaround for the following symbols below. - * It will be good to find out a generic way in the future. - */ - -#pragma weak tty -#pragma weak CMSExpAvgFactor - -#if defined(i386) || defined(__i386) || defined(__amd64) -#pragma weak noreg -#endif /* i386 */ - -LIR_Opr LIR_OprFact::illegalOpr = (LIR_Opr) 0; - -address StubRoutines::_call_stub_return_address = NULL; - -StubQueue* AbstractInterpreter::_code = NULL; - -#endif /* ASSERT */ -#endif /* COMPILER1 */ - -#define GEN_OFFS_NAME(Type,Name,OutputType) \ - switch(gen_variant) { \ - case GEN_OFFSET: \ - printf("#define OFFSET_%-33s %ld\n", \ - #OutputType #Name, offset_of(Type, Name)); \ - break; \ - case GEN_INDEX: \ - printf("#define IDX_OFFSET_%-33s %d\n", \ - #OutputType #Name, index++); \ - break; \ - case GEN_TABLE: \ - printf("\tOFFSET_%s,\n", #OutputType #Name); \ - break; \ - } - -#define GEN_OFFS(Type,Name) \ - GEN_OFFS_NAME(Type,Name,Type) - -#define GEN_SIZE(Type) \ - switch(gen_variant) { \ - case GEN_OFFSET: \ - printf("#define SIZE_%-35s %ld\n", \ - #Type, sizeof(Type)); \ - break; \ - case GEN_INDEX: \ - printf("#define IDX_SIZE_%-35s %d\n", \ - #Type, index++); \ - break; \ - case GEN_TABLE: \ - printf("\tSIZE_%s,\n", #Type); \ - break; \ - } - -#define GEN_VALUE(String,Value) \ - switch(gen_variant) { \ - case GEN_OFFSET: \ - printf("#define %-40s %d\n", #String, Value); \ - break; \ - case GEN_INDEX: \ - printf("#define IDX_%-40s %d\n", #String, index++); \ - break; \ - case GEN_TABLE: \ - printf("\t" #String ",\n"); \ - break; \ - } - -void gen_prologue(GEN_variant gen_variant) { - const char *suffix = "Undefined-Suffix"; - - switch(gen_variant) { - case GEN_OFFSET: suffix = ".h"; break; - case GEN_INDEX: suffix = "Index.h"; break; - case GEN_TABLE: suffix = ".cpp"; break; - } - - printf("/*\n"); - printf(" * JvmOffsets%s !!!DO NOT EDIT!!! \n", suffix); - printf(" * The generateJvmOffsets program generates this file!\n"); - printf(" */\n\n"); - switch(gen_variant) { - - case GEN_OFFSET: - case GEN_INDEX: - break; - - case GEN_TABLE: - printf("#include \"JvmOffsets.h\"\n"); - printf("\n"); - printf("int __JvmOffsets[] = {\n"); - break; - } -} - -void gen_epilogue(GEN_variant gen_variant) { - if (gen_variant != GEN_TABLE) { - return; - } - printf("};\n\n"); - return; -} - -int generateJvmOffsets(GEN_variant gen_variant) { - int index = 0; /* It is used to generate JvmOffsetsIndex.h */ - int pointer_size = sizeof(void *); - int data_model = (pointer_size == 4) ? PR_MODEL_ILP32 : PR_MODEL_LP64; - - gen_prologue(gen_variant); - - GEN_VALUE(DATA_MODEL, data_model); - GEN_VALUE(POINTER_SIZE, pointer_size); -#if defined(TIERED) - GEN_VALUE(COMPILER, 3); -#elif COMPILER1 - GEN_VALUE(COMPILER, 1); -#elif COMPILER2 - GEN_VALUE(COMPILER, 2); -#else - GEN_VALUE(COMPILER, 0); -#endif // COMPILER1 && COMPILER2 - printf("\n"); - - GEN_OFFS(CollectedHeap, _reserved); - GEN_OFFS(MemRegion, _start); - GEN_OFFS(MemRegion, _word_size); - GEN_SIZE(HeapWord); - printf("\n"); - - GEN_OFFS(VMStructEntry, typeName); - GEN_OFFS(VMStructEntry, fieldName); - GEN_OFFS(VMStructEntry, address); - GEN_SIZE(VMStructEntry); - printf("\n"); - - GEN_VALUE(MAX_METHOD_CODE_SIZE, max_method_code_size); -#if defined(sparc) || defined(__sparc) - GEN_VALUE(OFFSET_interpreter_frame_method, 2 * pointer_size); /* L2 in saved window */ - GEN_VALUE(OFFSET_interpreter_frame_sender_sp, 13 * pointer_size); /* I5 in saved window */ - // Fake value for consistency. It is not going to be used. - GEN_VALUE(OFFSET_interpreter_frame_bcp_offset, 0xFFFF); -#elif defined(i386) || defined(__i386) || defined(__amd64) - GEN_VALUE(OFFSET_interpreter_frame_sender_sp, -1 * pointer_size); - GEN_VALUE(OFFSET_interpreter_frame_method, -3 * pointer_size); - GEN_VALUE(OFFSET_interpreter_frame_bcp_offset, -7 * pointer_size); -#endif - - GEN_OFFS(Klass, _name); - GEN_OFFS(ConstantPool, _pool_holder); - printf("\n"); - - GEN_VALUE(OFFSET_HeapBlockHeader_used, (int) offset_of(HeapBlock::Header, _used)); - GEN_OFFS(oopDesc, _metadata); - printf("\n"); - - GEN_VALUE(AccessFlags_NATIVE, JVM_ACC_NATIVE); - GEN_VALUE(ConstMethod_has_linenumber_table, ConstMethod::_has_linenumber_table); - GEN_OFFS(AccessFlags, _flags); - GEN_OFFS(Symbol, _length); - GEN_OFFS(Symbol, _body); - printf("\n"); - - GEN_OFFS(Method, _constMethod); - GEN_OFFS(Method, _access_flags); - printf("\n"); - - GEN_OFFS(ConstMethod, _constants); - GEN_OFFS(ConstMethod, _flags); - GEN_OFFS(ConstMethod, _code_size); - GEN_OFFS(ConstMethod, _name_index); - GEN_OFFS(ConstMethod, _signature_index); - printf("\n"); - - GEN_OFFS(CodeHeap, _memory); - GEN_OFFS(CodeHeap, _segmap); - GEN_OFFS(CodeHeap, _log2_segment_size); - printf("\n"); - - GEN_OFFS(VirtualSpace, _low_boundary); - GEN_OFFS(VirtualSpace, _high_boundary); - GEN_OFFS(VirtualSpace, _low); - GEN_OFFS(VirtualSpace, _high); - printf("\n"); - - /* We need to use different names here because of the template parameter */ - GEN_OFFS_NAME(GrowableArray, _data, GrowableArray_CodeHeap); - GEN_OFFS_NAME(GrowableArray, _len, GrowableArray_CodeHeap); - printf("\n"); - - GEN_OFFS(CodeBlob, _name); - GEN_OFFS(CodeBlob, _header_size); - GEN_OFFS(CodeBlob, _content_begin); - GEN_OFFS(CodeBlob, _code_begin); - GEN_OFFS(CodeBlob, _code_end); - GEN_OFFS(CodeBlob, _data_offset); - GEN_OFFS(CodeBlob, _frame_size); - printf("\n"); - - GEN_OFFS(nmethod, _method); - GEN_OFFS(nmethod, _dependencies_offset); - GEN_OFFS(nmethod, _metadata_offset); - GEN_OFFS(nmethod, _scopes_data_begin); - GEN_OFFS(nmethod, _scopes_pcs_offset); - GEN_OFFS(nmethod, _handler_table_offset); - GEN_OFFS(nmethod, _deopt_handler_begin); - GEN_OFFS(nmethod, _orig_pc_offset); - - GEN_OFFS(PcDesc, _pc_offset); - GEN_OFFS(PcDesc, _scope_decode_offset); - - printf("\n"); - - GEN_OFFS(NarrowPtrStruct, _base); - GEN_OFFS(NarrowPtrStruct, _shift); - printf("\n"); - - GEN_VALUE(SIZE_HeapBlockHeader, (int) sizeof(HeapBlock::Header)); - GEN_SIZE(oopDesc); - GEN_SIZE(ConstantPool); - printf("\n"); - - GEN_SIZE(PcDesc); - GEN_SIZE(Method); - GEN_SIZE(ConstMethod); - GEN_SIZE(nmethod); - GEN_SIZE(CodeBlob); - GEN_SIZE(BufferBlob); - GEN_SIZE(SingletonBlob); - GEN_SIZE(RuntimeStub); - GEN_SIZE(SafepointBlob); - - gen_epilogue(gen_variant); - printf("\n"); - - fflush(stdout); - return 0; -} diff --git a/hotspot/src/os/bsd/dtrace/jhelper.d b/hotspot/src/os/bsd/dtrace/jhelper.d deleted file mode 100644 index dbe0a4a42f9..00000000000 --- a/hotspot/src/os/bsd/dtrace/jhelper.d +++ /dev/null @@ -1,543 +0,0 @@ -/* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -/* This file is auto-generated */ -#include "JvmOffsetsIndex.h" - -#define DEBUG - -#ifdef DEBUG -#define MARK_LINE this->line = __LINE__ -#else -#define MARK_LINE -#endif - -#ifdef _LP64 -#define STACK_BIAS 0x7ff -#define pointer uint64_t -#else -#define STACK_BIAS 0 -#define pointer uint32_t -#endif - -extern pointer __JvmOffsets; - -/* GrowableArray* */ -extern pointer __1cJCodeCacheG_heaps_; - -extern pointer __1cIUniverseO_collectedHeap_; - -extern pointer __1cHnmethodG__vtbl_; -extern pointer __1cGMethodG__vtbl_; -extern pointer __1cKBufferBlobG__vtbl_; - -#define copyin_ptr(ADDR) *(pointer*) copyin((pointer) (ADDR), sizeof(pointer)) -#define copyin_uchar(ADDR) *(uchar_t*) copyin((pointer) (ADDR), sizeof(uchar_t)) -#define copyin_uint16(ADDR) *(uint16_t*) copyin((pointer) (ADDR), sizeof(uint16_t)) -#define copyin_uint32(ADDR) *(uint32_t*) copyin((pointer) (ADDR), sizeof(uint32_t)) -#define copyin_int32(ADDR) *(int32_t*) copyin((pointer) (ADDR), sizeof(int32_t)) -#define copyin_uint8(ADDR) *(uint8_t*) copyin((pointer) (ADDR), sizeof(uint8_t)) - -#define SAME(x) x -#define copyin_offset(JVM_CONST) JVM_CONST = \ - copyin_int32(JvmOffsetsPtr + SAME(IDX_)JVM_CONST * sizeof(int32_t)) - -int init_done; - -dtrace:helper:ustack: -{ - MARK_LINE; - this->done = 0; - /* - * TBD: - * Here we initialize init_done, otherwise jhelper does not work. - * Therefore, copyin_offset() statements work multiple times now. - * There is a hope we could avoid it in the future, and so, - * this initialization can be removed. - */ - init_done = 0; - this->error = (char *) NULL; - this->result = (char *) NULL; - this->isMethod = 0; - this->codecache = 0; - this->klass = (pointer) NULL; - this->vtbl = (pointer) NULL; - this->suffix = '\0'; -} - -dtrace:helper:ustack: -{ - MARK_LINE; - /* Initialization of JvmOffsets constants */ - JvmOffsetsPtr = (pointer) &``__JvmOffsets; -} - -dtrace:helper:ustack: -/!init_done && !this->done/ -{ - MARK_LINE; - - copyin_offset(POINTER_SIZE); - copyin_offset(COMPILER); - copyin_offset(OFFSET_CollectedHeap_reserved); - copyin_offset(OFFSET_MemRegion_start); - copyin_offset(OFFSET_MemRegion_word_size); - copyin_offset(SIZE_HeapWord); - - copyin_offset(OFFSET_interpreter_frame_method); - copyin_offset(OFFSET_Klass_name); - copyin_offset(OFFSET_ConstantPool_pool_holder); - - copyin_offset(OFFSET_HeapBlockHeader_used); - copyin_offset(OFFSET_oopDesc_metadata); - - copyin_offset(OFFSET_Symbol_length); - copyin_offset(OFFSET_Symbol_body); - - copyin_offset(OFFSET_Method_constMethod); - copyin_offset(OFFSET_ConstMethod_constants); - copyin_offset(OFFSET_ConstMethod_name_index); - copyin_offset(OFFSET_ConstMethod_signature_index); - - copyin_offset(OFFSET_CodeHeap_memory); - copyin_offset(OFFSET_CodeHeap_segmap); - copyin_offset(OFFSET_CodeHeap_log2_segment_size); - - copyin_offset(OFFSET_GrowableArray_CodeHeap_data); - copyin_offset(OFFSET_GrowableArray_CodeHeap_len); - - copyin_offset(OFFSET_VirtualSpace_low); - copyin_offset(OFFSET_VirtualSpace_high); - - copyin_offset(OFFSET_CodeBlob_name); - - copyin_offset(OFFSET_nmethod_method); - copyin_offset(SIZE_HeapBlockHeader); - copyin_offset(SIZE_oopDesc); - copyin_offset(SIZE_ConstantPool); - - copyin_offset(OFFSET_NarrowPtrStruct_base); - copyin_offset(OFFSET_NarrowPtrStruct_shift); - - /* - * The PC to translate is in arg0. - */ - this->pc = arg0; - - /* - * The methodPtr is in %l2 on SPARC. This can be found at - * offset 8 from the frame pointer on 32-bit processes. - */ -#if defined(__sparc) - this->methodPtr = copyin_ptr(arg1 + 2 * sizeof(pointer) + STACK_BIAS); -#elif defined(__i386) || defined(__amd64) - this->methodPtr = copyin_ptr(arg1 + OFFSET_interpreter_frame_method); -#else -#error "Don't know architecture" -#endif - - /* Read address of GrowableArray */ - this->code_heaps_address = copyin_ptr(&``__1cJCodeCacheG_heaps_); - /* Read address of _data array field in GrowableArray */ - this->code_heaps_array_address = copyin_ptr(this->code_heaps_address + OFFSET_GrowableArray_CodeHeap_data); - this->number_of_heaps = copyin_uint32(this->code_heaps_address + OFFSET_GrowableArray_CodeHeap_len); - - this->Method_vtbl = (pointer) &``__1cGMethodG__vtbl_; - - /* - * Get Java heap bounds - */ - this->Universe_collectedHeap = copyin_ptr(&``__1cIUniverseO_collectedHeap_); - this->heap_start = copyin_ptr(this->Universe_collectedHeap + - OFFSET_CollectedHeap_reserved + - OFFSET_MemRegion_start); - this->heap_size = SIZE_HeapWord * - copyin_ptr(this->Universe_collectedHeap + - OFFSET_CollectedHeap_reserved + - OFFSET_MemRegion_word_size - ); - this->heap_end = this->heap_start + this->heap_size; -} - -/* - * IMPORTANT: At the moment the ustack helper supports up to 5 code heaps in - * the code cache. If more code heaps are added the following probes have to - * be extended. This is done by simply adding a probe to get the heap bounds - * and another probe to set the code heap address of the newly created heap. - */ - -/* - * ----- BEGIN: Get bounds of code heaps ----- - */ -dtrace:helper:ustack: -/init_done < 1 && this->number_of_heaps >= 1 && !this->done/ -{ - MARK_LINE; - /* CodeHeap 1 */ - init_done = 1; - this->code_heap1_address = copyin_ptr(this->code_heaps_array_address); - this->code_heap1_low = copyin_ptr(this->code_heap1_address + - OFFSET_CodeHeap_memory + OFFSET_VirtualSpace_low); - this->code_heap1_high = copyin_ptr(this->code_heap1_address + - OFFSET_CodeHeap_memory + OFFSET_VirtualSpace_high); -} - -dtrace:helper:ustack: -/init_done < 2 && this->number_of_heaps >= 2 && !this->done/ -{ - MARK_LINE; - /* CodeHeap 2 */ - init_done = 2; - this->code_heaps_array_address = this->code_heaps_array_address + POINTER_SIZE; - this->code_heap2_address = copyin_ptr(this->code_heaps_array_address); - this->code_heap2_low = copyin_ptr(this->code_heap2_address + - OFFSET_CodeHeap_memory + OFFSET_VirtualSpace_low); - this->code_heap2_high = copyin_ptr(this->code_heap2_address + - OFFSET_CodeHeap_memory + OFFSET_VirtualSpace_high); -} - -dtrace:helper:ustack: -/init_done < 3 && this->number_of_heaps >= 3 && !this->done/ -{ - /* CodeHeap 3 */ - init_done = 3; - this->code_heaps_array_address = this->code_heaps_array_address + POINTER_SIZE; - this->code_heap3_address = copyin_ptr(this->code_heaps_array_address); - this->code_heap3_low = copyin_ptr(this->code_heap3_address + - OFFSET_CodeHeap_memory + OFFSET_VirtualSpace_low); - this->code_heap3_high = copyin_ptr(this->code_heap3_address + - OFFSET_CodeHeap_memory + OFFSET_VirtualSpace_high); -} - -dtrace:helper:ustack: -/init_done < 4 && this->number_of_heaps >= 4 && !this->done/ -{ - /* CodeHeap 4 */ - init_done = 4; - this->code_heaps_array_address = this->code_heaps_array_address + POINTER_SIZE; - this->code_heap4_address = copyin_ptr(this->code_heaps_array_address); - this->code_heap4_low = copyin_ptr(this->code_heap4_address + - OFFSET_CodeHeap_memory + OFFSET_VirtualSpace_low); - this->code_heap4_high = copyin_ptr(this->code_heap4_address + - OFFSET_CodeHeap_memory + OFFSET_VirtualSpace_high); -} - -dtrace:helper:ustack: -/init_done < 5 && this->number_of_heaps >= 5 && !this->done/ -{ - /* CodeHeap 5 */ - init_done = 5; - this->code_heaps_array_address = this->code_heaps_array_address + POINTER_SIZE; - this->code_heap5_address = copyin_ptr(this->code_heaps_array_address); - this->code_heap5_low = copyin_ptr(this->code_heap5_address + - OFFSET_CodeHeap_memory + OFFSET_VirtualSpace_low); - this->code_heap5_high = copyin_ptr(this->code_heap5_address + - OFFSET_CodeHeap_memory + OFFSET_VirtualSpace_high); -} -/* - * ----- END: Get bounds of code heaps ----- - */ - -/* - * ----- BEGIN: Get address of the code heap pc points to ----- - */ -dtrace:helper:ustack: -/!this->done && this->number_of_heaps >= 1 && this->code_heap1_low <= this->pc && this->pc < this->code_heap1_high/ -{ - MARK_LINE; - this->codecache = 1; - this->code_heap_address = this->code_heap1_address; -} - -dtrace:helper:ustack: -/!this->done && this->number_of_heaps >= 2 && this->code_heap2_low <= this->pc && this->pc < this->code_heap2_high/ -{ - MARK_LINE; - this->codecache = 1; - this->code_heap_address = this->code_heap2_address; -} - -dtrace:helper:ustack: -/!this->done && this->number_of_heaps >= 3 && this->code_heap3_low <= this->pc && this->pc < this->code_heap3_high/ -{ - MARK_LINE; - this->codecache = 1; - this->code_heap_address = this->code_heap3_address; -} - -dtrace:helper:ustack: -/!this->done && this->number_of_heaps >= 4 && this->code_heap4_low <= this->pc && this->pc < this->code_heap4_high/ -{ - MARK_LINE; - this->codecache = 1; - this->code_heap_address = this->code_heap4_address; -} - -dtrace:helper:ustack: -/!this->done && this->number_of_heaps >= 5 && this->code_heap5_low <= this->pc && this->pc < this->code_heap5_high/ -{ - MARK_LINE; - this->codecache = 1; - this->code_heap_address = this->code_heap5_address; -} -/* - * ----- END: Get address of the code heap pc points to ----- - */ - -dtrace:helper:ustack: -/!this->done && this->codecache/ -{ - MARK_LINE; - /* - * Get code heap configuration - */ - this->code_heap_low = copyin_ptr(this->code_heap_address + - OFFSET_CodeHeap_memory + OFFSET_VirtualSpace_low); - this->code_heap_segmap_low = copyin_ptr(this->code_heap_address + - OFFSET_CodeHeap_segmap + OFFSET_VirtualSpace_low); - this->code_heap_log2_segment_size = copyin_uint32( - this->code_heap_address + OFFSET_CodeHeap_log2_segment_size); - - /* - * Find start - */ - this->segment = (this->pc - this->code_heap_low) >> - this->code_heap_log2_segment_size; - this->block = this->code_heap_segmap_low; - this->tag = copyin_uchar(this->block + this->segment); -} - -dtrace:helper:ustack: -/!this->done && this->codecache && this->tag > 0/ -{ - MARK_LINE; - this->tag = copyin_uchar(this->block + this->segment); - this->segment = this->segment - this->tag; -} - -dtrace:helper:ustack: -/!this->done && this->codecache && this->tag > 0/ -{ - MARK_LINE; - this->tag = copyin_uchar(this->block + this->segment); - this->segment = this->segment - this->tag; -} - -dtrace:helper:ustack: -/!this->done && this->codecache && this->tag > 0/ -{ - MARK_LINE; - this->tag = copyin_uchar(this->block + this->segment); - this->segment = this->segment - this->tag; -} - -dtrace:helper:ustack: -/!this->done && this->codecache && this->tag > 0/ -{ - MARK_LINE; - this->tag = copyin_uchar(this->block + this->segment); - this->segment = this->segment - this->tag; -} - -dtrace:helper:ustack: -/!this->done && this->codecache && this->tag > 0/ -{ - MARK_LINE; - this->tag = copyin_uchar(this->block + this->segment); - this->segment = this->segment - this->tag; -} - -dtrace:helper:ustack: -/!this->done && this->codecache && this->tag > 0/ -{ - MARK_LINE; - this->error = ""; - this->done = 1; -} - -dtrace:helper:ustack: -/!this->done && this->codecache/ -{ - MARK_LINE; - this->block = this->code_heap_low + - (this->segment << this->code_heap_log2_segment_size); - this->used = copyin_uint32(this->block + OFFSET_HeapBlockHeader_used); -} - -dtrace:helper:ustack: -/!this->done && this->codecache && !this->used/ -{ - MARK_LINE; - this->error = ""; - this->done = 1; -} - -dtrace:helper:ustack: -/!this->done && this->codecache/ -{ - MARK_LINE; - this->start = this->block + SIZE_HeapBlockHeader; - this->vtbl = copyin_ptr(this->start); - - this->nmethod_vtbl = (pointer) &``__1cHnmethodG__vtbl_; - this->BufferBlob_vtbl = (pointer) &``__1cKBufferBlobG__vtbl_; -} - -dtrace:helper:ustack: -/!this->done && this->vtbl == this->nmethod_vtbl/ -{ - MARK_LINE; - this->methodPtr = copyin_ptr(this->start + OFFSET_nmethod_method); - this->suffix = '*'; - this->isMethod = 1; -} - -dtrace:helper:ustack: -/!this->done && this->vtbl == this->BufferBlob_vtbl/ -{ - MARK_LINE; - this->name = copyin_ptr(this->start + OFFSET_CodeBlob_name); -} - - -dtrace:helper:ustack: -/!this->done && this->vtbl == this->BufferBlob_vtbl && this->methodPtr != 0/ -{ - MARK_LINE; - this->klass = copyin_ptr(this->methodPtr); - this->isMethod = this->klass == this->Method_vtbl; - this->done = !this->isMethod; -} - -dtrace:helper:ustack: -/!this->done && !this->isMethod/ -{ - MARK_LINE; - this->name = copyin_ptr(this->start + OFFSET_CodeBlob_name); - this->result = this->name != 0 ? copyinstr(this->name) : ""; - this->done = 1; -} - -dtrace:helper:ustack: -/!this->done && this->isMethod/ -{ - MARK_LINE; - this->constMethod = copyin_ptr(this->methodPtr + - OFFSET_Method_constMethod); - - this->nameIndex = copyin_uint16(this->constMethod + - OFFSET_ConstMethod_name_index); - - this->signatureIndex = copyin_uint16(this->constMethod + - OFFSET_ConstMethod_signature_index); - - this->constantPool = copyin_ptr(this->constMethod + - OFFSET_ConstMethod_constants); - - this->nameSymbol = copyin_ptr(this->constantPool + - this->nameIndex * sizeof (pointer) + SIZE_ConstantPool); - /* The symbol is a CPSlot and has lower bit set to indicate metadata */ - this->nameSymbol &= (~1); /* remove metadata lsb */ - - this->nameSymbolLength = copyin_uint16(this->nameSymbol + - OFFSET_Symbol_length); - - this->signatureSymbol = copyin_ptr(this->constantPool + - this->signatureIndex * sizeof (pointer) + SIZE_ConstantPool); - this->signatureSymbol &= (~1); /* remove metadata lsb */ - - this->signatureSymbolLength = copyin_uint16(this->signatureSymbol + - OFFSET_Symbol_length); - - this->klassPtr = copyin_ptr(this->constantPool + - OFFSET_ConstantPool_pool_holder); - - this->klassSymbol = copyin_ptr(this->klassPtr + - OFFSET_Klass_name); - - this->klassSymbolLength = copyin_uint16(this->klassSymbol + - OFFSET_Symbol_length); - - /* - * Enough for three strings, plus the '.', plus the trailing '\0'. - */ - this->result = (char *) alloca(this->klassSymbolLength + - this->nameSymbolLength + - this->signatureSymbolLength + 2 + 1); - - copyinto(this->klassSymbol + OFFSET_Symbol_body, - this->klassSymbolLength, this->result); - - /* - * Add the '.' between the class and the name. - */ - this->result[this->klassSymbolLength] = '.'; - - copyinto(this->nameSymbol + OFFSET_Symbol_body, - this->nameSymbolLength, - this->result + this->klassSymbolLength + 1); - - copyinto(this->signatureSymbol + OFFSET_Symbol_body, - this->signatureSymbolLength, - this->result + this->klassSymbolLength + - this->nameSymbolLength + 1); - - /* - * Now we need to add a trailing '\0' and possibly a tag character. - */ - this->result[this->klassSymbolLength + 1 + - this->nameSymbolLength + - this->signatureSymbolLength] = this->suffix; - this->result[this->klassSymbolLength + 2 + - this->nameSymbolLength + - this->signatureSymbolLength] = '\0'; - - this->done = 1; -} - -dtrace:helper:ustack: -/this->done && this->error == (char *) NULL/ -{ - this->result; -} - -dtrace:helper:ustack: -/this->done && this->error != (char *) NULL/ -{ - this->error; -} - -dtrace:helper:ustack: -/!this->done && this->codecache/ -{ - this->done = 1; - "error"; -} - - -dtrace:helper:ustack: -/!this->done/ -{ - NULL; -} diff --git a/hotspot/src/os/bsd/dtrace/libjvm_db.c b/hotspot/src/os/bsd/dtrace/libjvm_db.c deleted file mode 100644 index d68436c3f3c..00000000000 --- a/hotspot/src/os/bsd/dtrace/libjvm_db.c +++ /dev/null @@ -1,1566 +0,0 @@ -/* - * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#include -#include -#include -#include -// not available on macosx #include - -#include "libjvm_db.h" -#include "JvmOffsets.h" - -#define LIBJVM_SO "libjvm.so" - -#if defined(i386) || defined(__i386) || defined(__amd64) -#ifdef COMPILER2 -#define X86_COMPILER2 -#endif /* COMPILER2 */ -#endif /* i386 */ - -typedef struct { - short vf_cnt; /* number of recognized java vframes */ - short bci; /* current frame method byte code index */ - int line; /* current frame method source line */ - uint64_t new_fp; /* fp for the next frame */ - uint64_t new_pc; /* pc for the next frame */ - uint64_t new_sp; /* "raw" sp for the next frame (includes extension by interpreter/adapter */ - char locinf; /* indicates there is valid location info */ -} Jframe_t; - -int Jlookup_by_regs(jvm_agent_t* J, const prgregset_t regs, char *name, - size_t size, Jframe_t *jframe); - -int main(int arg) { return arg; } - -static int debug = 0; - -static void failed(int err, const char * file, int line) { - if (debug) { - fprintf(stderr, "failed %d at %s:%d\n", err, file, line); - } -} - -static void warn(const char * file, int line, const char * msg) { - if (debug) { - fprintf(stderr, "warning: %s at %s:%d\n", msg, file, line); - } -} - -static void warn1(const char * file, int line, const char * msg, intptr_t arg1) { - if (debug) { - fprintf(stderr, "warning: "); - fprintf(stderr, msg, arg1); - fprintf(stderr, " at %s:%d\n", file, line); - } -} - -#define CHECK_FAIL(err) \ - if (err != PS_OK) { failed(err, __FILE__, __LINE__); goto fail; } -#define WARN(msg) warn(__FILE__, __LINE__, msg) -#define WARN1(msg, arg1) warn1(__FILE__, __LINE__, msg, arg1) - -typedef struct VMStructEntry { - const char * typeName; /* The type name containing the given field (example: "Klass") */ - const char * fieldName; /* The field name within the type (example: "_name") */ - uint64_t address; /* Address of field; only used for static fields */ - /* ("offset" can not be reused because of apparent SparcWorks compiler bug */ - /* in generation of initializer data) */ -} VMStructEntry; - -/* Prototyping inlined methods */ - -int sprintf(char *s, const char *format, ...); - -#define SZ16 sizeof(int16_t) -#define SZ32 sizeof(int32_t) - -#define COMP_METHOD_SIGN '*' - -#define MAX_VFRAMES_CNT 256 - -typedef struct vframe { - uint64_t method; - int32_t sender_decode_offset; - int32_t methodIdx; - int32_t bci; - int32_t line; -} Vframe_t; - -typedef struct frame { - uintptr_t fp; - uintptr_t pc; - uintptr_t sp; - uintptr_t sender_sp; // The unextended sp of the caller -} Frame_t; - -typedef struct Nmethod_t { - struct jvm_agent* J; - Jframe_t *jframe; - - uint64_t nm; /* _nmethod */ - uint64_t pc; - uint64_t pc_desc; - - int32_t orig_pc_offset; /* _orig_pc_offset */ - uint64_t instrs_beg; /* _code_offset */ - uint64_t instrs_end; - uint64_t deopt_beg; /* _deoptimize_offset */ - uint64_t scopes_data_beg; /* _scopes_data_offset */ - int32_t scopes_data_end; - int32_t metadata_beg; /* _metadata_offset */ - int32_t metadata_end; - int32_t scopes_pcs_beg; /* _scopes_pcs_offset */ - int32_t scopes_pcs_end; - - int vf_cnt; - Vframe_t vframes[MAX_VFRAMES_CNT]; -} Nmethod_t; - -struct jvm_agent { - struct ps_prochandle* P; - - uint64_t nmethod_vtbl; - uint64_t CodeBlob_vtbl; - uint64_t BufferBlob_vtbl; - uint64_t RuntimeStub_vtbl; - uint64_t Method_vtbl; - - uint64_t Use_Compressed_Oops_address; - uint64_t Universe_narrow_oop_base_address; - uint64_t Universe_narrow_oop_shift_address; - uint64_t CodeCache_heaps_address; - - /* Volatiles */ - uint8_t Use_Compressed_Oops; - uint64_t Universe_narrow_oop_base; - uint32_t Universe_narrow_oop_shift; - // Code cache heaps - int32_t Number_of_heaps; - uint64_t* Heap_low; - uint64_t* Heap_high; - uint64_t* Heap_segmap_low; - uint64_t* Heap_segmap_high; - - int32_t SIZE_CodeCache_log2_segment; - - uint64_t methodPtr; - uint64_t bcp; - - Nmethod_t *N; /*Inlined methods support */ - Frame_t prev_fr; - Frame_t curr_fr; -}; - -static int -read_string(struct ps_prochandle *P, - char *buf, /* caller's buffer */ - size_t size, /* upper limit on bytes to read */ - uintptr_t addr) /* address in process */ -{ - int err = PS_OK; - while (size-- > 1 && err == PS_OK) { - err = ps_pread(P, addr, buf, 1); - if (*buf == '\0') { - return PS_OK; - } - addr += 1; - buf += 1; - } - return -1; -} - -static int read_compressed_pointer(jvm_agent_t* J, uint64_t base, uint32_t *ptr) { - int err = -1; - uint32_t ptr32; - err = ps_pread(J->P, base, &ptr32, sizeof(uint32_t)); - *ptr = ptr32; - return err; -} - -static int read_pointer(jvm_agent_t* J, uint64_t base, uint64_t* ptr) { - int err = -1; - uint32_t ptr32; - - switch (DATA_MODEL) { - case PR_MODEL_LP64: - err = ps_pread(J->P, base, ptr, sizeof(uint64_t)); - break; - case PR_MODEL_ILP32: - err = ps_pread(J->P, base, &ptr32, sizeof(uint32_t)); - *ptr = ptr32; - break; - } - - return err; -} - -static int read_string_pointer(jvm_agent_t* J, uint64_t base, const char ** stringp) { - uint64_t ptr; - int err; - char buffer[1024]; - - *stringp = NULL; - err = read_pointer(J, base, &ptr); - CHECK_FAIL(err); - if (ptr != 0) { - err = read_string(J->P, buffer, sizeof(buffer), ptr); - CHECK_FAIL(err); - *stringp = strdup(buffer); - } - return PS_OK; - - fail: - return err; -} - -static int parse_vmstruct_entry(jvm_agent_t* J, uint64_t base, VMStructEntry* vmp) { - uint64_t ptr; - int err; - - err = read_string_pointer(J, base + OFFSET_VMStructEntrytypeName, &vmp->typeName); - CHECK_FAIL(err); - err = read_string_pointer(J, base + OFFSET_VMStructEntryfieldName, &vmp->fieldName); - CHECK_FAIL(err); - err = read_pointer(J, base + OFFSET_VMStructEntryaddress, &vmp->address); - CHECK_FAIL(err); - - return PS_OK; - - fail: - if (vmp->typeName != NULL) free((void*)vmp->typeName); - if (vmp->fieldName != NULL) free((void*)vmp->fieldName); - return err; -} - -static int parse_vmstructs(jvm_agent_t* J) { - VMStructEntry vmVar; - VMStructEntry* vmp = &vmVar; - uint64_t gHotSpotVMStructs; - psaddr_t sym_addr; - uint64_t base; - int err; - - /* Clear *vmp now in case we jump to fail: */ - memset(vmp, 0, sizeof(VMStructEntry)); - - err = ps_pglobal_lookup(J->P, LIBJVM_SO, "gHotSpotVMStructs", &sym_addr); - CHECK_FAIL(err); - err = read_pointer(J, sym_addr, &gHotSpotVMStructs); - CHECK_FAIL(err); - base = gHotSpotVMStructs; - - err = PS_OK; - while (err == PS_OK) { - memset(vmp, 0, sizeof(VMStructEntry)); - err = parse_vmstruct_entry(J, base, vmp); - if (err != PS_OK || vmp->typeName == NULL) { - break; - } - - if (vmp->typeName[0] == 'C' && strcmp("CodeCache", vmp->typeName) == 0) { - /* Read _heaps field of type GrowableArray* */ - if (strcmp("_heaps", vmp->fieldName) == 0) { - err = read_pointer(J, vmp->address, &J->CodeCache_heaps_address); - } - } else if (vmp->typeName[0] == 'U' && strcmp("Universe", vmp->typeName) == 0) { - if (strcmp("_narrow_oop._base", vmp->fieldName) == 0) { - J->Universe_narrow_oop_base_address = vmp->address; - } - if (strcmp("_narrow_oop._shift", vmp->fieldName) == 0) { - J->Universe_narrow_oop_shift_address = vmp->address; - } - } - CHECK_FAIL(err); - - base += SIZE_VMStructEntry; - if (vmp->typeName != NULL) free((void*)vmp->typeName); - if (vmp->fieldName != NULL) free((void*)vmp->fieldName); - } - - return PS_OK; - - fail: - if (vmp->typeName != NULL) free((void*)vmp->typeName); - if (vmp->fieldName != NULL) free((void*)vmp->fieldName); - return -1; -} - -static int find_symbol(jvm_agent_t* J, const char *name, uint64_t* valuep) { - psaddr_t sym_addr; - int err; - - err = ps_pglobal_lookup(J->P, LIBJVM_SO, name, &sym_addr); - if (err != PS_OK) goto fail; - *valuep = sym_addr; - return PS_OK; - - fail: - return err; -} - -static int read_volatiles(jvm_agent_t* J) { - int i; - uint64_t array_data; - uint64_t code_heap_address; - int err; - - err = find_symbol(J, "UseCompressedOops", &J->Use_Compressed_Oops_address); - if (err == PS_OK) { - err = ps_pread(J->P, J->Use_Compressed_Oops_address, &J->Use_Compressed_Oops, sizeof(uint8_t)); - CHECK_FAIL(err); - } else { - J->Use_Compressed_Oops = 0; - } - - err = read_pointer(J, J->Universe_narrow_oop_base_address, &J->Universe_narrow_oop_base); - CHECK_FAIL(err); - err = ps_pread(J->P, J->Universe_narrow_oop_shift_address, &J->Universe_narrow_oop_shift, sizeof(uint32_t)); - CHECK_FAIL(err); - - /* CodeCache_heaps_address points to GrowableArray, read _data field - pointing to the first entry of type CodeCache* in the array */ - err = read_pointer(J, J->CodeCache_heaps_address + OFFSET_GrowableArray_CodeHeap_data, &array_data); - /* Read _len field containing the number of code heaps */ - err = ps_pread(J->P, J->CodeCache_heaps_address + OFFSET_GrowableArray_CodeHeap_len, - &J->Number_of_heaps, sizeof(J->Number_of_heaps)); - - /* Allocate memory for heap configurations */ - J->Heap_low = (uint64_t*)calloc(J->Number_of_heaps, sizeof(uint64_t)); - J->Heap_high = (uint64_t*)calloc(J->Number_of_heaps, sizeof(uint64_t)); - J->Heap_segmap_low = (uint64_t*)calloc(J->Number_of_heaps, sizeof(uint64_t)); - J->Heap_segmap_high = (uint64_t*)calloc(J->Number_of_heaps, sizeof(uint64_t)); - - /* Read code heap configurations */ - for (i = 0; i < J->Number_of_heaps; ++i) { - /* Read address of heap */ - err = read_pointer(J, array_data, &code_heap_address); - CHECK_FAIL(err); - - err = read_pointer(J, code_heap_address + OFFSET_CodeHeap_memory + - OFFSET_VirtualSpace_low, &J->Heap_low[i]); - CHECK_FAIL(err); - err = read_pointer(J, code_heap_address + OFFSET_CodeHeap_memory + - OFFSET_VirtualSpace_high, &J->Heap_high[i]); - CHECK_FAIL(err); - err = read_pointer(J, code_heap_address + OFFSET_CodeHeap_segmap + - OFFSET_VirtualSpace_low, &J->Heap_segmap_low[i]); - CHECK_FAIL(err); - err = read_pointer(J, code_heap_address + OFFSET_CodeHeap_segmap + - OFFSET_VirtualSpace_high, &J->Heap_segmap_high[i]); - CHECK_FAIL(err); - - /* Increment pointer to next entry */ - array_data = array_data + POINTER_SIZE; - } - - err = ps_pread(J->P, code_heap_address + OFFSET_CodeHeap_log2_segment_size, - &J->SIZE_CodeCache_log2_segment, sizeof(J->SIZE_CodeCache_log2_segment)); - CHECK_FAIL(err); - - return PS_OK; - - fail: - return err; -} - -static int codeheap_contains(int heap_num, jvm_agent_t* J, uint64_t ptr) { - return (J->Heap_low[heap_num] <= ptr && ptr < J->Heap_high[heap_num]); -} - -static int codecache_contains(jvm_agent_t* J, uint64_t ptr) { - int i; - for (i = 0; i < J->Number_of_heaps; ++i) { - if (codeheap_contains(i, J, ptr)) { - return 1; - } - } - return 0; -} - -static uint64_t segment_for(int heap_num, jvm_agent_t* J, uint64_t p) { - return (p - J->Heap_low[heap_num]) >> J->SIZE_CodeCache_log2_segment; -} - -static uint64_t block_at(int heap_num, jvm_agent_t* J, int i) { - return J->Heap_low[heap_num] + (i << J->SIZE_CodeCache_log2_segment); -} - -static int find_start(jvm_agent_t* J, uint64_t ptr, uint64_t *startp) { - int err; - int i; - - for (i = 0; i < J->Number_of_heaps; ++i) { - *startp = 0; - if (codeheap_contains(i, J, ptr)) { - int32_t used; - uint64_t segment = segment_for(i, J, ptr); - uint64_t block = J->Heap_segmap_low[i]; - uint8_t tag; - err = ps_pread(J->P, block + segment, &tag, sizeof(tag)); - CHECK_FAIL(err); - if (tag == 0xff) - return PS_OK; - while (tag > 0) { - err = ps_pread(J->P, block + segment, &tag, sizeof(tag)); - CHECK_FAIL(err); - segment -= tag; - } - block = block_at(i, J, segment); - err = ps_pread(J->P, block + OFFSET_HeapBlockHeader_used, &used, sizeof(used)); - CHECK_FAIL(err); - if (used) { - *startp = block + SIZE_HeapBlockHeader; - } - } - return PS_OK; - } - - fail: - return -1; -} - -static int find_jlong_constant(jvm_agent_t* J, const char *name, uint64_t* valuep) { - psaddr_t sym_addr; - int err = ps_pglobal_lookup(J->P, LIBJVM_SO, name, &sym_addr); - if (err == PS_OK) { - err = ps_pread(J->P, sym_addr, valuep, sizeof(uint64_t)); - return err; - } - *valuep = -1; - return -1; -} - -jvm_agent_t *Jagent_create(struct ps_prochandle *P, int vers) { - jvm_agent_t* J; - int err; - - if (vers != JVM_DB_VERSION) { - errno = ENOTSUP; - return NULL; - } - - J = (jvm_agent_t*)calloc(sizeof(struct jvm_agent), 1); - - debug = getenv("LIBJVMDB_DEBUG") != NULL; - if (debug) debug = 3; - - if (debug) { - fprintf(stderr, "Jagent_create: debug=%d\n", debug); -#ifdef X86_COMPILER2 - fprintf(stderr, "Jagent_create: R_SP=%d, R_FP=%d, POINTER_SIZE=%d\n", R_SP, R_FP, POINTER_SIZE); -#endif /* X86_COMPILER2 */ - } - - J->P = P; - - // Initialize the initial previous frame - - J->prev_fr.fp = 0; - J->prev_fr.pc = 0; - J->prev_fr.sp = 0; - J->prev_fr.sender_sp = 0; - - err = find_symbol(J, "__1cHnmethodG__vtbl_", &J->nmethod_vtbl); - CHECK_FAIL(err); - err = find_symbol(J, "__1cKBufferBlobG__vtbl_", &J->BufferBlob_vtbl); - if (err != PS_OK) J->BufferBlob_vtbl = 0; - err = find_symbol(J, "__1cICodeBlobG__vtbl_", &J->CodeBlob_vtbl); - CHECK_FAIL(err); - err = find_symbol(J, "__1cLRuntimeStubG__vtbl_", &J->RuntimeStub_vtbl); - CHECK_FAIL(err); - err = find_symbol(J, "__1cNMethodG__vtbl_", &J->Method_vtbl); - CHECK_FAIL(err); - - err = parse_vmstructs(J); - CHECK_FAIL(err); - err = read_volatiles(J); - CHECK_FAIL(err); - - return J; - - fail: - Jagent_destroy(J); - return NULL; -} - -void Jagent_destroy(jvm_agent_t *J) { - if (J != NULL) { - free(J); - } -} - -static int is_method(jvm_agent_t* J, uint64_t methodPtr) { - uint64_t klass; - int err = read_pointer(J, methodPtr, &klass); - if (err != PS_OK) goto fail; - return klass == J->Method_vtbl; - - fail: - return 0; -} - -static int -name_for_methodPtr(jvm_agent_t* J, uint64_t methodPtr, char * result, size_t size) -{ - short nameIndex; - short signatureIndex; - uint64_t constantPool; - uint64_t constMethod; - uint64_t nameSymbol; - uint64_t signatureSymbol; - uint64_t klassPtr; - uint64_t klassSymbol; - short klassSymbolLength; - short nameSymbolLength; - short signatureSymbolLength; - char * nameString = NULL; - char * klassString = NULL; - char * signatureString = NULL; - int err; - - err = read_pointer(J, methodPtr + OFFSET_Method_constMethod, &constMethod); - CHECK_FAIL(err); - err = read_pointer(J, constMethod + OFFSET_ConstMethod_constants, &constantPool); - CHECK_FAIL(err); - - /* To get name string */ - err = ps_pread(J->P, constMethod + OFFSET_ConstMethod_name_index, &nameIndex, 2); - CHECK_FAIL(err); - err = read_pointer(J, constantPool + nameIndex * POINTER_SIZE + SIZE_ConstantPool, &nameSymbol); - CHECK_FAIL(err); - // The symbol is a CPSlot and has lower bit set to indicate metadata - nameSymbol &= (~1); // remove metadata lsb - err = ps_pread(J->P, nameSymbol + OFFSET_Symbol_length, &nameSymbolLength, 2); - CHECK_FAIL(err); - nameString = (char*)calloc(nameSymbolLength + 1, 1); - err = ps_pread(J->P, nameSymbol + OFFSET_Symbol_body, nameString, nameSymbolLength); - CHECK_FAIL(err); - - /* To get signature string */ - err = ps_pread(J->P, constMethod + OFFSET_ConstMethod_signature_index, &signatureIndex, 2); - CHECK_FAIL(err); - err = read_pointer(J, constantPool + signatureIndex * POINTER_SIZE + SIZE_ConstantPool, &signatureSymbol); - CHECK_FAIL(err); - signatureSymbol &= (~1); // remove metadata lsb - err = ps_pread(J->P, signatureSymbol + OFFSET_Symbol_length, &signatureSymbolLength, 2); - CHECK_FAIL(err); - signatureString = (char*)calloc(signatureSymbolLength + 1, 1); - err = ps_pread(J->P, signatureSymbol + OFFSET_Symbol_body, signatureString, signatureSymbolLength); - CHECK_FAIL(err); - - /* To get klass string */ - err = read_pointer(J, constantPool + OFFSET_ConstantPool_pool_holder, &klassPtr); - CHECK_FAIL(err); - err = read_pointer(J, klassPtr + OFFSET_Klass_name, &klassSymbol); - CHECK_FAIL(err); - err = ps_pread(J->P, klassSymbol + OFFSET_Symbol_length, &klassSymbolLength, 2); - CHECK_FAIL(err); - klassString = (char*)calloc(klassSymbolLength + 1, 1); - err = ps_pread(J->P, klassSymbol + OFFSET_Symbol_body, klassString, klassSymbolLength); - CHECK_FAIL(err); - - result[0] = '\0'; - if (snprintf(result, size, - "%s.%s%s", - klassString, - nameString, - signatureString) >= size) { - // truncation - goto fail; - } - - if (nameString != NULL) free(nameString); - if (klassString != NULL) free(klassString); - if (signatureString != NULL) free(signatureString); - - return PS_OK; - - fail: - if (debug) { - fprintf(stderr, "name_for_methodPtr: FAIL \n\n"); - } - if (nameString != NULL) free(nameString); - if (klassString != NULL) free(klassString); - if (signatureString != NULL) free(signatureString); - return -1; -} - -static int nmethod_info(Nmethod_t *N) -{ - jvm_agent_t *J = N->J; - uint64_t nm = N->nm; - int32_t err; - - if (debug > 2 ) - fprintf(stderr, "\t nmethod_info: BEGIN \n"); - - /* Instructions */ - err = read_pointer(J, base + OFFSET_VMStructEntryaddress, &vmp->address); - err = read_pointer(J, nm + OFFSET_CodeBlob_code_begin, &N->instrs_beg); - CHECK_FAIL(err); - err = read_pointer(J, nm + OFFSET_CodeBlob_code_end, &N->instrs_end); - CHECK_FAIL(err); - err = read_pointer(J, nm + OFFSET_nmethod_deopt_handler_begin, &N->deopt_beg); - CHECK_FAIL(err); - err = ps_pread(J->P, nm + OFFSET_nmethod_orig_pc_offset, &N->orig_pc_offset, SZ32); - CHECK_FAIL(err); - - /* Metadata */ - err = ps_pread(J->P, nm + OFFSET_nmethod_metadata_offset, &N->metadata_beg, SZ32); - CHECK_FAIL(err); - err = ps_pread(J->P, nm + OFFSET_nmethod_scopes_data_offset, &N->metadata_end, SZ32); - CHECK_FAIL(err); - - /* scopes_pcs */ - err = ps_pread(J->P, nm + OFFSET_nmethod_scopes_pcs_offset, &N->scopes_pcs_beg, SZ32); - CHECK_FAIL(err); - err = ps_pread(J->P, nm + OFFSET_nmethod_dependencies_offset, &N->scopes_pcs_end, SZ32); - CHECK_FAIL(err); - - /* scopes_data */ - err = ps_pread(J->P, nm + OFFSET_nmethod_scopes_data_begin, &N->scopes_data_beg, POINTER_SIZE); - CHECK_FAIL(err); - - if (debug > 2 ) { - N->scopes_data_end = N->scopes_pcs_beg; - - fprintf(stderr, "\t nmethod_info: instrs_beg: %#x, instrs_end: %#x\n", - N->instrs_beg, N->instrs_end); - - fprintf(stderr, "\t nmethod_info: deopt_beg: %#x \n", - N->deopt_beg); - - fprintf(stderr, "\t nmethod_info: orig_pc_offset: %#x \n", - N->orig_pc_offset); - - fprintf(stderr, "\t nmethod_info: metadata_beg: %#x, metadata_end: %#x\n", - N->metadata_beg, N->metadata_end); - - fprintf(stderr, "\t nmethod_info: scopes_data_beg: %#x, scopes_data_end: %#x\n", - N->scopes_data_beg, N->scopes_data_end); - - fprintf(stderr, "\t nmethod_info: scopes_pcs_beg: %#x, scopes_pcs_end: %#x\n", - N->scopes_pcs_beg, N->scopes_pcs_end); - - fprintf(stderr, "\t nmethod_info: END \n\n"); - } - return PS_OK; - - fail: - return err; -} - -static int -raw_read_int(jvm_agent_t* J, uint64_t *buffer, int32_t *val) -{ - int shift = 0; - int value = 0; - uint8_t ch = 0; - int32_t err; - int32_t sum; - // Constants for UNSIGNED5 coding of Pack200 - // see compressedStream.hpp - enum { - lg_H = 6, - H = 1<P, (*buffer)++, &ch, sizeof(uint8_t)); - CHECK_FAIL(err); - if (debug > 2) - fprintf(stderr, "\t\t\t raw_read_int: *buffer: %#llx, ch: %#x\n", *buffer, ch); - - sum = ch; - if ( sum >= L ) { - int32_t lg_H_i = lg_H; - // Read maximum of 5 total bytes (we've already read 1). - // See CompressedReadStream::read_int_mb - for ( i = 0; i < 4; i++) { - err = ps_pread(J->P, (*buffer)++, &ch, sizeof(uint8_t)); - CHECK_FAIL(err); - sum += ch << lg_H_i; - if (ch < L ) { - *val = sum; - return PS_OK; - } - lg_H_i += lg_H; - } - } - *val = sum; - return PS_OK; - - fail: - return err; -} - -static int -read_pair(jvm_agent_t* J, uint64_t *buffer, int32_t *bci, int32_t *line) -{ - uint8_t next = 0; - int32_t bci_delta; - int32_t line_delta; - int32_t err; - - if (debug > 2) - fprintf(stderr, "\t\t read_pair: BEGIN\n"); - - err = ps_pread(J->P, (*buffer)++, &next, sizeof(uint8_t)); - CHECK_FAIL(err); - - if (next == 0) { - if (debug > 2) - fprintf(stderr, "\t\t read_pair: END: next == 0\n"); - return 1; /* stream terminated */ - } - if (next == 0xFF) { - if (debug > 2) - fprintf(stderr, "\t\t read_pair: END: next == 0xFF\n"); - - /* Escape character, regular compression used */ - - err = raw_read_int(J, buffer, &bci_delta); - CHECK_FAIL(err); - - err = raw_read_int(J, buffer, &line_delta); - CHECK_FAIL(err); - - *bci += bci_delta; - *line += line_delta; - - if (debug > 2) { - fprintf(stderr, "\t\t read_pair: delta = (line %d: %d)\n", - line_delta, bci_delta); - fprintf(stderr, "\t\t read_pair: unpack= (line %d: %d)\n", - *line, *bci); - } - } else { - /* Single byte compression used */ - *bci += next >> 3; - *line += next & 0x7; - if (debug > 2) { - fprintf(stderr, "\t\t read_pair: delta = (line %d: %d)\n", - next & 0x7, next >> 3); - fprintf(stderr, "\t\t read_pair: unpack= (line %d: %d)\n", - *line, *bci); - } - } - if (debug > 2) - fprintf(stderr, "\t\t read_pair: END\n"); - return PS_OK; - - fail: - if (debug) - fprintf(stderr, "\t\t read_pair: FAIL\n"); - return err; -} - -static int -line_number_from_bci(jvm_agent_t* J, Vframe_t *vf) -{ - uint64_t buffer; - uint16_t code_size; - uint64_t code_end_delta; - uint64_t constMethod; - int8_t access_flags; - int32_t best_bci = 0; - int32_t stream_bci = 0; - int32_t stream_line = 0; - int32_t err; - - if (debug > 2) { - char name[256]; - err = name_for_methodPtr(J, vf->method, name, 256); - CHECK_FAIL(err); - fprintf(stderr, "\t line_number_from_bci: BEGIN, method name: %s, targ bci: %d\n", - name, vf->bci); - } - - err = read_pointer(J, vf->method + OFFSET_Method_constMethod, &constMethod); - CHECK_FAIL(err); - - vf->line = 0; - err = ps_pread(J->P, constMethod + OFFSET_ConstMethod_flags, &access_flags, sizeof(int8_t)); - CHECK_FAIL(err); - - if (!(access_flags & ConstMethod_has_linenumber_table)) { - if (debug > 2) - fprintf(stderr, "\t line_number_from_bci: END: !HAS_LINE_NUMBER_TABLE \n\n"); - return PS_OK; - } - - /* The line numbers are a short array of 2-tuples [start_pc, line_number]. - * Not necessarily sorted and not necessarily one-to-one. - */ - - err = ps_pread(J->P, constMethod + OFFSET_ConstMethod_code_size, &code_size, SZ16); - CHECK_FAIL(err); - - /* inlined_table_start() */ - code_end_delta = (uint64_t) (access_flags & AccessFlags_NATIVE) ? 2*POINTER_SIZE : 0; - buffer = constMethod + (uint64_t) SIZE_ConstMethod + (uint64_t) code_size + code_end_delta; - - if (debug > 2) { - fprintf(stderr, "\t\t line_number_from_bci: method: %#llx, native: %d\n", - vf->method, (access_flags & AccessFlags_NATIVE)); - fprintf(stderr, "\t\t line_number_from_bci: buffer: %#llx, code_size: %d\n", - buffer, (int) code_size); - } - - while (read_pair(J, &buffer, &stream_bci, &stream_line) == 0) { - if (stream_bci == vf->bci) { - /* perfect match */ - if (debug > 2) - fprintf(stderr, "\t line_number_from_bci: END: exact line: %d \n\n", vf->line); - vf->line = stream_line; - return PS_OK; - } else { - /* update best_bci/line */ - if (stream_bci < vf->bci && stream_bci >= best_bci) { - best_bci = stream_bci; - vf->line = stream_line; - if (debug > 2) { - fprintf(stderr, "\t line_number_from_bci: best_bci: %d, best_line: %d\n", - best_bci, vf->line); - } - } - } - } - if (debug > 2) - fprintf(stderr, "\t line_number_from_bci: END: line: %d \n\n", vf->line); - return PS_OK; - - fail: - if (debug) - fprintf(stderr, "\t line_number_from_bci: FAIL\n"); - return err; -} - -static int -get_real_pc(Nmethod_t *N, uint64_t pc_desc, uint64_t *real_pc) -{ - int32_t pc_offset; - int32_t err; - - err = ps_pread(N->J->P, pc_desc + OFFSET_PcDesc_pc_offset, &pc_offset, SZ32); - CHECK_FAIL(err); - - *real_pc = N->instrs_beg + pc_offset; - if (debug > 2) { - fprintf(stderr, "\t\t get_real_pc: pc_offset: %lx, real_pc: %llx\n", - pc_offset, *real_pc); - } - return PS_OK; - - fail: - return err; -} - -/* Finds a PcDesc with real-pc equal to N->pc */ -static int pc_desc_at(Nmethod_t *N) -{ - uint64_t pc_diff = 999; - int32_t offs; - int32_t err; - - if (debug > 2) - fprintf(stderr, "\t pc_desc_at: BEGIN\n"); - - N->vf_cnt = 0; - N->pc_desc = 0; - - for (offs = N->scopes_pcs_beg; offs < N->scopes_pcs_end; offs += SIZE_PcDesc) { - uint64_t pd; - uint64_t best_pc_diff = 16; /* some approximation */ - uint64_t real_pc = 0; - - pd = N->nm + offs; - err = get_real_pc(N, pd, &real_pc); - CHECK_FAIL(err); - - pc_diff = real_pc - N->pc; - - /* In general, this fragment should work */ - if (pc_diff == 0) { - N->pc_desc = pd; - if (debug) { - fprintf(stderr, "\t pc_desc_at: END: pc_desc: FOUND: %#lx \n\n", pd); - } - return PS_OK; - } - /* This fragment is to be able to find out an appropriate - * pc_desc entry even if pc_desc info is inaccurate. - */ - if (best_pc_diff > pc_diff && pc_diff > 0) { - best_pc_diff = pc_diff; - N->pc_desc = pd; - } - } - if (debug) { - fprintf(stderr, "\t pc_desc_at: END: pc_desc NOT FOUND"); - if (pc_diff < 20) - fprintf(stderr, ", best pc_diff: %d\n\n", pc_diff); - else - fprintf(stderr, "\n\n"); - } - return PS_OK; - - fail: - return err; -} - -static int -scope_desc_at(Nmethod_t *N, int32_t decode_offset, Vframe_t *vf) -{ - uint64_t buffer; - int32_t err; - - if (debug > 2) { - fprintf(stderr, "\t\t scope_desc_at: BEGIN \n"); - } - - buffer = N->scopes_data_beg + decode_offset; - - err = raw_read_int(N->J, &buffer, &vf->sender_decode_offset); - CHECK_FAIL(err); - - err = raw_read_int(N->J, &buffer, &vf->methodIdx); - CHECK_FAIL(err); - - err = raw_read_int(N->J, &buffer, &vf->bci); - CHECK_FAIL(err); - - if (debug > 2) { - fprintf(stderr, "\t\t scope_desc_at: sender_decode_offset: %#x\n", - vf->sender_decode_offset); - fprintf(stderr, "\t\t scope_desc_at: methodIdx: %d\n", vf->methodIdx); - fprintf(stderr, "\t\t scope_desc_at: bci: %d\n", vf->bci); - - fprintf(stderr, "\t\t scope_desc_at: END \n\n"); - } - return PS_OK; - - fail: - return err; -} - -static int scopeDesc_chain(Nmethod_t *N) { - int32_t decode_offset = 0; - int32_t err; - - if (debug > 2) { - fprintf(stderr, "\t scopeDesc_chain: BEGIN\n"); - } - - err = ps_pread(N->J->P, N->pc_desc + OFFSET_PcDesc_scope_decode_offset, - &decode_offset, SZ32); - CHECK_FAIL(err); - - while (decode_offset > 0) { - Vframe_t *vf = &N->vframes[N->vf_cnt]; - - if (debug > 2) { - fprintf(stderr, "\t scopeDesc_chain: decode_offset: %#x\n", decode_offset); - } - - err = scope_desc_at(N, decode_offset, vf); - CHECK_FAIL(err); - - if (vf->methodIdx > ((N->metadata_end - N->metadata_beg) / POINTER_SIZE)) { - fprintf(stderr, "\t scopeDesc_chain: (methodIdx > metadata length) !\n"); - return -1; - } - err = read_pointer(N->J, N->nm + N->metadata_beg + (vf->methodIdx-1)*POINTER_SIZE, - &vf->method); - CHECK_FAIL(err); - - if (vf->method) { - N->vf_cnt++; - err = line_number_from_bci(N->J, vf); - CHECK_FAIL(err); - if (debug > 2) { - fprintf(stderr, "\t scopeDesc_chain: method: %#8llx, line: %d\n", - vf->method, vf->line); - } - } - decode_offset = vf->sender_decode_offset; - } - if (debug > 2) { - fprintf(stderr, "\t scopeDesc_chain: END \n\n"); - } - return PS_OK; - - fail: - if (debug) { - fprintf(stderr, "\t scopeDesc_chain: FAIL \n\n"); - } - return err; -} - - -static int -name_for_nmethod(jvm_agent_t* J, - uint64_t nm, - uint64_t pc, - uint64_t method, - char *result, - size_t size, - Jframe_t *jframe -) { - Nmethod_t *N; - Vframe_t *vf; - int32_t err; - int deoptimized = 0; - - if (debug) { - fprintf(stderr, "name_for_nmethod: BEGIN: nmethod: %#llx, pc: %#llx\n", nm, pc); - } - if (J->N == NULL) { - J->N = (Nmethod_t *) malloc(sizeof(Nmethod_t)); - } - memset(J->N, 0, sizeof(Nmethod_t)); /* Initial stat: all values are zeros */ - N = J->N; - N->J = J; - N->nm = nm; - N->pc = pc; - N->jframe = jframe; - - err = nmethod_info(N); - CHECK_FAIL(err); - if (debug) { - fprintf(stderr, "name_for_nmethod: pc: %#llx, deopt_pc: %#llx\n", - pc, N->deopt_beg); - } - - /* check for a deoptimized frame */ - if ( pc == N->deopt_beg) { - uint64_t base; - if (debug) { - fprintf(stderr, "name_for_nmethod: found deoptimized frame\n"); - } - if (J->prev_fr.sender_sp != 0) { - base = J->prev_fr.sender_sp + N->orig_pc_offset; - } else { - base = J->curr_fr.sp + N->orig_pc_offset; - } - err = read_pointer(J, base, &N->pc); - CHECK_FAIL(err); - if (debug) { - fprintf(stderr, "name_for_nmethod: found deoptimized frame converting pc from %#8llx to %#8llx\n", - pc, N->pc); - } - deoptimized = 1; - } - - err = pc_desc_at(N); - CHECK_FAIL(err); - - if (N->pc_desc > 0) { - jframe->locinf = 1; - err = scopeDesc_chain(N); - CHECK_FAIL(err); - } - result[0] = COMP_METHOD_SIGN; - vf = &N->vframes[0]; - if (N->vf_cnt > 0) { - jframe->vf_cnt = N->vf_cnt; - jframe->bci = vf->bci; - jframe->line = vf->line; - err = name_for_methodPtr(J, N->vframes[0].method, result+1, size-1); - CHECK_FAIL(err); - } else { - err = name_for_methodPtr(J, method, result+1, size-1); - CHECK_FAIL(err); - } - if (deoptimized) { - strncat(result, " [deoptimized frame]; ", size - strlen(result) - 1); - } else { - strncat(result, " [compiled] ", size - strlen(result) - 1); - } - if (debug) - fprintf(stderr, "name_for_nmethod: END: method name: %s, vf_cnt: %d\n\n", - result, N->vf_cnt); - return PS_OK; - - fail: - if (debug) - fprintf(stderr, "name_for_nmethod: FAIL \n\n"); - return err; -} - -static int -name_for_imethod(jvm_agent_t* J, - uint64_t bcp, - uint64_t method, - char *result, - size_t size, - Jframe_t *jframe -) { - uint64_t bci; - uint64_t constMethod; - Vframe_t vframe = {0}; - Vframe_t *vf = &vframe; - int32_t err; - - err = read_pointer(J, method + OFFSET_Method_constMethod, &constMethod); - CHECK_FAIL(err); - - bci = bcp - (constMethod + (uint64_t) SIZE_ConstMethod); - - if (debug) - fprintf(stderr, "\t name_for_imethod: BEGIN: method: %#llx\n", method); - - err = name_for_methodPtr(J, method, result, size); - CHECK_FAIL(err); - if (debug) - fprintf(stderr, "\t name_for_imethod: method name: %s\n", result); - - if (bci > 0) { - vf->method = method; - vf->bci = bci; - err = line_number_from_bci(J, vf); - CHECK_FAIL(err); - } - jframe->bci = vf->bci; - jframe->line = vf->line; - jframe->locinf = 1; - - if (debug) { - fprintf(stderr, "\t name_for_imethod: END: bci: %d, line: %d\n\n", - vf->bci, vf->line); - } - return PS_OK; - - fail: - if (debug) - fprintf(stderr, "\t name_for_imethod: FAIL\n"); - return err; -} - -static int -name_for_codecache(jvm_agent_t* J, uint64_t fp, uint64_t pc, char * result, - size_t size, Jframe_t *jframe, int* is_interpreted) -{ - uint64_t start; - uint64_t vtbl; - int32_t err; - *is_interpreted = 0; - - result[0] = '\0'; - - err = find_start(J, pc, &start); - CHECK_FAIL(err); - - err = read_pointer(J, start, &vtbl); - CHECK_FAIL(err); - - if (vtbl == J->nmethod_vtbl) { - uint64_t method; - - err = read_pointer(J, start + OFFSET_nmethod_method, &method); - CHECK_FAIL(err); - - if (debug) { - fprintf(stderr, "name_for_codecache: start: %#8llx, pc: %#8llx, method: %#8llx \n", - start, pc, method); - } - err = name_for_nmethod(J, start, pc, method, result, size, jframe); - CHECK_FAIL(err); - } else if (vtbl == J->BufferBlob_vtbl) { - const char * name; - - err = read_string_pointer(J, start + OFFSET_CodeBlob_name, &name); - - /* - * Temporary usage of string "Interpreter". - * We need some other way to distinguish "StubRoutines" - * and regular interpreted frames. - */ - if (err == PS_OK && strncmp(name, "Interpreter", 11) == 0) { - *is_interpreted = 1; - if (is_method(J, J->methodPtr)) { - return name_for_imethod(J, J->bcp, J->methodPtr, result, size, jframe); - } - } - - if (err == PS_OK) { - strncpy(result, name, size); - free((void*)name); - } else { - strncpy(result, "", size); - } - /* return PS_OK; */ - } else { - const char * name; - - err = read_string_pointer(J, start + OFFSET_CodeBlob_name, &name); - if (err == PS_OK) { - strncpy(result, name, size); - free((void*)name); - } else { - strncpy(result, "", size); - WARN1("unknown CodeBlob: vtbl = 0x%x", vtbl); - } - } - result[size-1] = '\0'; - -#ifdef X86_COMPILER2 - if (vtbl != J->RuntimeStub_vtbl) { - uint64_t trial_pc; - int frame_size; - err = ps_pread(J->P, start + OFFSET_CodeBlob_frame_size, - &frame_size, SZ32); - CHECK_FAIL(err); - - // frame_size is in words, we want bytes. - frame_size *= POINTER_SIZE; /* word => byte conversion */ - - /* - Because c2 doesn't use FP as a framepointer the value of sp/fp we receive - in the initial entry to a set of stack frames containing server frames - will pretty much be nonsense. We can detect that nonsense by looking to - see if the PC we received is correct if we look at the expected storage - location in relation to the FP (ie. POINTER_SIZE(FP) ) - */ - - err = read_pointer(J, fp + POINTER_SIZE , &trial_pc); - if ( (err != PS_OK || trial_pc != pc) && frame_size > 0 ) { - // Either we couldn't even read at the "fp" or the pc didn't match - // both are sure clues that the fp is bogus. We no search the stack - // for a reasonable number of words trying to find the bogus fp - // and the current pc in adjacent words. The we will be able to - // deduce an approximation of the frame pointer and actually get - // the correct stack pointer. Which we can then unwind for the - // next frame. - int i; - uint64_t check; - uint64_t base = J->curr_fr.sp; - uint64_t prev_fp = 0; - for ( i = 0; i < frame_size * 5 ; i++, base += POINTER_SIZE ) { - err = read_pointer(J, base , &check); - CHECK_FAIL(err); - if (check == fp) { - base += POINTER_SIZE; - err = read_pointer(J, base , &check); - CHECK_FAIL(err); - if (check == pc) { - if (debug) { - fprintf(stderr, "name_for_codecache: found matching fp/pc combo at 0x%llx\n", base - POINTER_SIZE); - } - prev_fp = base - 2 * POINTER_SIZE; - break; - } - } - } - if ( prev_fp != 0 ) { - // real_sp is the sp we should have received for this frame - uint64_t real_sp = prev_fp + 2 * POINTER_SIZE; - // +POINTER_SIZE because callee owns the return address so caller's sp is +1 word - jframe->new_sp = real_sp + frame_size + POINTER_SIZE; - err = read_pointer(J, jframe->new_sp - POINTER_SIZE , &jframe->new_pc); - CHECK_FAIL(err); - err = read_pointer(J, jframe->new_sp - 2*POINTER_SIZE, &jframe->new_fp); - CHECK_FAIL(err); - return PS_OK; - } - } - - /* A prototype to workaround FP absence */ - /* - * frame_size can be 0 for StubRoutines (1) frame. - * In this case it should work with fp as usual. - */ - if (frame_size > 0) { - jframe->new_fp = J->prev_fr.fp + frame_size; - jframe->new_sp = jframe->new_fp + 2 * POINTER_SIZE; - } else { - memset(&J->curr_fr, 0, sizeof(Frame_t)); - err = read_pointer(J, fp, &jframe->new_fp); - CHECK_FAIL(err); - - err = read_pointer(J, jframe->new_fp + POINTER_SIZE, &jframe->new_pc); - CHECK_FAIL(err); - } - if (debug) { - fprintf(stderr, "name_for_codecache: %s, frame_size=%#lx\n", - result, frame_size); - fprintf(stderr, "name_for_codecache: prev_fr.fp=%#lx, fp=%#lx\n", - J->prev_fr.fp, jframe->new_fp); - } - } -#endif /* X86_COMPILER2 */ - - return PS_OK; - - fail: - return err; -} - -int Jget_vframe(jvm_agent_t* J, int vframe_no, - char *name, size_t size, Jframe_t *jframe) -{ - Nmethod_t *N = J->N; - Vframe_t *vf; - int32_t err; - - if (vframe_no >= N->vf_cnt) { - (void) sprintf(name, "Wrong inlinedMethod%1d()", vframe_no); - return -1; - } - vf = N->vframes + vframe_no; - name[0] = COMP_METHOD_SIGN; - err = name_for_methodPtr(J, vf->method, name + 1, size); - CHECK_FAIL(err); - - jframe->bci = vf->bci; - jframe->line = vf->line; - if (debug) { - fprintf(stderr, "\t Jget_vframe: method name: %s, line: %d\n", - name, vf->line); - } - return PS_OK; - - fail: - if (debug) { - fprintf(stderr, "\t Jget_vframe: FAIL\n"); - } - return err; -} - -#define MAX_SYM_SIZE 256 - -int Jlookup_by_regs(jvm_agent_t* J, const prgregset_t regs, char *name, - size_t size, Jframe_t *jframe) { - uintptr_t fp; - uintptr_t pc; - /* arguments given to read_pointer need to be worst case sized */ - uint64_t methodPtr = 0; - uint64_t sender_sp; - uint64_t bcp = 0; - int is_interpreted = 0; - int result = PS_OK; - int err = PS_OK; - - if (J == NULL) { - return -1; - } - - jframe->vf_cnt = 1; - jframe->new_fp = 0; - jframe->new_pc = 0; - jframe->line = 0; - jframe->bci = 0; - jframe->locinf = 0; - - read_volatiles(J); - pc = (uintptr_t) regs[R_PC]; - J->curr_fr.pc = pc; - J->curr_fr.fp = regs[R_FP]; - J->curr_fr.sp = regs[R_SP]; - - if (debug) - fprintf(stderr, "Jlookup_by_regs: BEGINs: fp=%#lx, pc=%#lx\n", regs[R_FP], pc); - -#if defined(sparc) || defined(__sparc) - /* The following workaround is for SPARC. CALL instruction occupates 8 bytes. - * In the pcDesc structure return pc offset is recorded for CALL instructions. - * regs[R_PC] contains a CALL instruction pc offset. - */ - pc += 8; - bcp = (uintptr_t) regs[R_L1]; - methodPtr = (uintptr_t) regs[R_L2]; - sender_sp = regs[R_I5]; - if (debug > 2) { - fprintf(stderr, "\nregs[R_I1]=%lx, regs[R_I2]=%lx, regs[R_I5]=%lx, regs[R_L1]=%lx, regs[R_L2]=%lx\n", - regs[R_I1], regs[R_I2], regs[R_I5], regs[R_L1], regs[R_L2]); - } -#elif defined(i386) || defined(__i386) || defined(__amd64) - - fp = (uintptr_t) regs[R_FP]; - if (J->prev_fr.fp == 0) { -#ifdef X86_COMPILER2 - /* A workaround for top java frames */ - J->prev_fr.fp = (uintptr_t)(regs[R_SP] - 2 * POINTER_SIZE); -#else - J->prev_fr.fp = (uintptr_t)(regs[R_SP] - POINTER_SIZE); -#endif /* COMPILER2 */ - } - if (debug > 2) { - printf("Jlookup_by_regs: J->prev_fr.fp = %#lx\n", J->prev_fr.fp); - } - - if (read_pointer(J, fp + OFFSET_interpreter_frame_method, &methodPtr) != PS_OK) { - methodPtr = 0; - } - if (read_pointer(J, fp + OFFSET_interpreter_frame_sender_sp, &sender_sp) != PS_OK) { - sender_sp = 0; - } - if (read_pointer(J, fp + OFFSET_interpreter_frame_bcp_offset, &bcp) != PS_OK) { - bcp = 0; - } -#endif /* i386 */ - - J->methodPtr = methodPtr; - J->bcp = bcp; - - /* On x86 with C2 JVM: native frame may have wrong regs[R_FP] - * For example: JVM_SuspendThread frame poins to the top interpreted frame. - * If we call is_method(J, methodPtr) before codecache_contains(J, pc) - * then we go over and omit both: nmethod and I2CAdapter frames. - * Note, that regs[R_PC] is always correct if frame defined correctly. - * So it is better to call codecache_contains(J, pc) from the beginning. - */ -#ifndef X86_COMPILER2 - if (is_method(J, J->methodPtr)) { - result = name_for_imethod(J, bcp, J->methodPtr, name, size, jframe); - /* If the methodPtr is a method then this is highly likely to be - an interpreter frame */ - if (result >= 0) { - is_interpreted = 1; - } - } else -#endif /* ! X86_COMPILER2 */ - - if (codecache_contains(J, pc)) { - result = name_for_codecache(J, fp, pc, name, size, jframe, &is_interpreted); - } -#ifdef X86_COMPILER2 - else if (is_method(J, J->methodPtr)) { - result = name_for_imethod(J, bcp, J->methodPtr, name, size, jframe); - /* If the methodPtr is a method then this is highly likely to be - an interpreter frame */ - if (result >= 0) { - is_interpreted = 1; - } - } -#endif /* X86_COMPILER2 */ - else { - if (debug) { - fprintf(stderr, "Jlookup_by_regs: END with -1\n\n"); - } - result = -1; - } - if (!is_interpreted) { - sender_sp = 0; - } - J->curr_fr.sender_sp = sender_sp; - -#ifdef X86_COMPILER2 - if (!J->curr_fr.fp) { - J->curr_fr.fp = (jframe->new_fp) ? jframe->new_fp : (uintptr_t)regs[R_FP]; - } - if (!jframe->new_pc && jframe->new_fp) { - // This seems dubious - read_pointer(J, jframe->new_fp + POINTER_SIZE, &jframe->new_pc); - CHECK_FAIL(err); - if (debug > 2) { - printf("Jlookup_by_regs: (update pc) jframe->new_fp: %#llx, jframe->new_pc: %#llx\n", - jframe->new_fp, jframe->new_pc); - } - } - -#endif /* X86_COMPILER2 */ - J->prev_fr = J->curr_fr; - - if (debug) - fprintf(stderr, "Jlookup_by_regs: END\n\n"); - - return result; - - fail: - return err; -} - -void update_gregs(prgregset_t gregs, Jframe_t jframe) { -#ifdef X86_COMPILER2 - if (debug > 0) { - fprintf(stderr, "update_gregs: before update sp = 0x%llx, fp = 0x%llx, pc = 0x%llx\n", gregs[R_SP], gregs[R_FP], gregs[R_PC]); - } - /* - * A workaround for java C2 frames with unconventional FP. - * may have to modify regset with new values for FP/PC/SP when needed. - */ - if (jframe.new_sp) { - *((uintptr_t *) &gregs[R_SP]) = (uintptr_t) jframe.new_sp; - } else { - // *((uintptr_t *) &gregs[R_SP]) = (uintptr_t) gregs[R_FP] + 2 * POINTER_SIZE; - } - - if (jframe.new_fp) { - *((uintptr_t *) &gregs[R_FP]) = (uintptr_t) jframe.new_fp; - } - if (jframe.new_pc) { - *((uintptr_t *) &gregs[R_PC]) = (uintptr_t) jframe.new_pc; - } - if (debug > 0) { - fprintf(stderr, "update_gregs: after update sp = 0x%llx, fp = 0x%llx, pc = 0x%llx\n", gregs[R_SP], gregs[R_FP], gregs[R_PC]); - } -#endif /* X86_COMPILER2 */ -} - -/* - * Iterates over java frames at current location given by 'gregs'. - * - * Returns -1 if no java frames are present or if an error is encountered. - * Returns the result of calling 'func' if the return value is non-zero. - * Returns 0 otherwise. - */ -int Jframe_iter(jvm_agent_t *J, prgregset_t gregs, java_stack_f *func, void* cld) { - char buf[MAX_SYM_SIZE + 1]; - Jframe_t jframe; - int i = 0, res; -#ifdef X86_COMPILER2 - if (debug > 0) { - fprintf(stderr, "Jframe_iter: Entry sp = 0x%llx, fp = 0x%llx, pc = 0x%llx\n", gregs[R_SP], gregs[R_FP], gregs[R_PC]); - } -#endif /* X86_COMPILER2 */ - - memset(&jframe, 0, sizeof(Jframe_t)); - memset(buf, 0, sizeof(buf)); - res = Jlookup_by_regs(J, gregs, buf, sizeof(buf), &jframe); - if (res != PS_OK) - return (-1); - - - res = func(cld, gregs, buf, (jframe.locinf)? jframe.bci : -1, - jframe.line, NULL); - if (res != 0) { - update_gregs(gregs, jframe); - return (res); - } - for (i = 1; i < jframe.vf_cnt; i++) { - Jget_vframe(J, i, buf, sizeof(buf), &jframe); - res = func(cld, gregs, buf, (jframe.locinf)? jframe.bci : -1, - jframe.line, NULL); - if (res != 0) { - update_gregs(gregs, jframe); - return (res); - } - } - update_gregs(gregs, jframe); - return (0); -} diff --git a/hotspot/src/os/bsd/dtrace/libjvm_db.h b/hotspot/src/os/bsd/dtrace/libjvm_db.h deleted file mode 100644 index f56b9d855bd..00000000000 --- a/hotspot/src/os/bsd/dtrace/libjvm_db.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#ifndef OS_SOLARIS_DTRACE_LIBJVM_DB_H -#define OS_SOLARIS_DTRACE_LIBJVM_DB_H - -// not available on macosx #include - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct jvm_agent jvm_agent_t; - -#define JVM_DB_VERSION 1 - -jvm_agent_t *Jagent_create(struct ps_prochandle *P, int vers); - -/* - * Called from Jframe_iter() for each java frame. If it returns 0, then - * Jframe_iter() proceeds to the next frame. Otherwise, the return value is - * immediately returned to the caller of Jframe_iter(). - * - * Parameters: - * 'cld' is client supplied data (to maintain iterator state, if any). - * 'name' is java method name. - * 'bci' is byte code index. it will be -1 if not available. - * 'line' is java source line number. it will be 0 if not available. - * 'handle' is an abstract client handle, reserved for future expansions - */ - -typedef int java_stack_f(void *cld, const prgregset_t regs, const char* name, int bci, int line, void *handle); - -/* - * Iterates over the java frames at the current location. Returns -1 if no java - * frames were found, or if there was some unrecoverable error. Otherwise, - * returns the last value returned from 'func'. - */ -int Jframe_iter(jvm_agent_t *agent, prgregset_t gregs, java_stack_f *func, void* cld); - -void Jagent_destroy(jvm_agent_t *J); - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* __cplusplus */ - -#endif // OS_SOLARIS_DTRACE_LIBJVM_DB_H diff --git a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.h b/hotspot/src/os/solaris/dtrace/generateJvmOffsets.h deleted file mode 100644 index 99146f12c3b..00000000000 --- a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#ifndef OS_SOLARIS_DTRACE_GENERATEJVMOFFSETS_H -#define OS_SOLARIS_DTRACE_GENERATEJVMOFFSETS_H - -#include -#include - -typedef enum GEN_variant { - GEN_OFFSET = 0, - GEN_INDEX = 1, - GEN_TABLE = 2 -} GEN_variant; - -extern "C" { - int generateJvmOffsets(GEN_variant gen_var); - void gen_prologue(GEN_variant gen_var); - void gen_epilogue(GEN_variant gen_var); -} - -#endif // OS_SOLARIS_DTRACE_GENERATEJVMOFFSETS_H diff --git a/hotspot/src/os/solaris/dtrace/generateJvmOffsetsMain.c b/hotspot/src/os/solaris/dtrace/generateJvmOffsetsMain.c deleted file mode 100644 index 4cd8ebfb49e..00000000000 --- a/hotspot/src/os/solaris/dtrace/generateJvmOffsetsMain.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - - -#include "generateJvmOffsets.h" - -const char *HELP = - "HELP: generateJvmOffsets {-header | -index | -table} \n"; - -int main(int argc, const char *argv[]) { - GEN_variant gen_var; - - if (argc != 2) { - printf("%s", HELP); - return 1; - } - - if (0 == strcmp(argv[1], "-header")) { - gen_var = GEN_OFFSET; - } - else if (0 == strcmp(argv[1], "-index")) { - gen_var = GEN_INDEX; - } - else if (0 == strcmp(argv[1], "-table")) { - gen_var = GEN_TABLE; - } - else { - printf("%s", HELP); - return 1; - } - return generateJvmOffsets(gen_var); -} diff --git a/hotspot/src/os/solaris/dtrace/jvm_dtrace.c b/hotspot/src/os/solaris/dtrace/jvm_dtrace.c deleted file mode 100644 index 58fc9197c7e..00000000000 --- a/hotspot/src/os/solaris/dtrace/jvm_dtrace.c +++ /dev/null @@ -1,562 +0,0 @@ -/* - * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "jvm_dtrace.h" - -// NOTE: These constants are used in JVM code as well. -// KEEP JVM CODE IN SYNC if you are going to change these... - -#define DTRACE_ALLOC_PROBES 0x1 -#define DTRACE_METHOD_PROBES 0x2 -#define DTRACE_MONITOR_PROBES 0x4 -#define DTRACE_ALL_PROBES -1 - -// generic error messages -#define JVM_ERR_OUT_OF_MEMORY "out of memory (native heap)" -#define JVM_ERR_INVALID_PARAM "invalid input parameter(s)" -#define JVM_ERR_NULL_PARAM "input paramater is NULL" - -// error messages for attach -#define JVM_ERR_CANT_OPEN_DOOR "cannot open door file" -#define JVM_ERR_CANT_CREATE_ATTACH_FILE "cannot create attach file" -#define JVM_ERR_DOOR_FILE_PERMISSION "door file is not secure" -#define JVM_ERR_CANT_SIGNAL "cannot send SIGQUIT to target" - -// error messages for enable probe -#define JVM_ERR_DOOR_CMD_SEND "door command send failed" -#define JVM_ERR_DOOR_CANT_READ_STATUS "cannot read door command status" -#define JVM_ERR_DOOR_CMD_STATUS "door command error status" - -// error message for detach -#define JVM_ERR_CANT_CLOSE_DOOR "cannot close door file" - -#define RESTARTABLE(_cmd, _result) do { \ - do { \ - _result = _cmd; \ - } while((_result == -1) && (errno == EINTR)); \ -} while(0) - -struct _jvm_t { - pid_t pid; - int door_fd; -}; - -static int libjvm_dtrace_debug; -static void print_debug(const char* fmt,...) { - if (libjvm_dtrace_debug) { - va_list alist; - va_start(alist, fmt); - fputs("libjvm_dtrace DEBUG: ", stderr); - vfprintf(stderr, fmt, alist); - va_end(alist); - } -} - -/* Key for thread local error message */ -static thread_key_t jvm_error_key; - -/* init function for this library */ -static void init_jvm_dtrace() { - /* check for env. var for debug mode */ - libjvm_dtrace_debug = getenv("LIBJVM_DTRACE_DEBUG") != NULL; - /* create key for thread local error message */ - if (thr_keycreate(&jvm_error_key, NULL) != 0) { - print_debug("can't create thread_key_t for jvm error key\n"); - // exit(1); ? - } -} - -#pragma init(init_jvm_dtrace) - -/* set thread local error message */ -static void set_jvm_error(const char* msg) { - thr_setspecific(jvm_error_key, (void*)msg); -} - -/* clear thread local error message */ -static void clear_jvm_error() { - thr_setspecific(jvm_error_key, NULL); -} - -/* file handling functions that can handle interrupt */ - -static int file_open(const char* path, int flag) { - int ret; - RESTARTABLE(open(path, flag), ret); - return ret; -} - -static int file_close(int fd) { - return close(fd); -} - -static int file_read(int fd, char* buf, int len) { - int ret; - RESTARTABLE(read(fd, buf, len), ret); - return ret; -} - -/* send SIGQUIT signal to given process */ -static int send_sigquit(pid_t pid) { - int ret; - RESTARTABLE(kill(pid, SIGQUIT), ret); - return ret; -} - -/* called to check permissions on attach file */ -static int check_permission(const char* path) { - struct stat64 sb; - uid_t uid, gid; - int res; - - /* - * Check that the path is owned by the effective uid/gid of this - * process. Also check that group/other access is not allowed. - */ - uid = geteuid(); - gid = getegid(); - - res = stat64(path, &sb); - if (res != 0) { - print_debug("stat failed for %s\n", path); - return -1; - } - - if ((sb.st_uid != uid) || (sb.st_gid != gid) || - ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0)) { - print_debug("well-known file %s is not secure\n", path); - return -1; - } - return 0; -} - -#define ATTACH_FILE_PATTERN "/tmp/.attach_pid%d" - -/* fill-in the name of attach file name in given buffer */ -static void fill_attach_file_name(char* path, int len, pid_t pid) { - memset(path, 0, len); - sprintf(path, ATTACH_FILE_PATTERN, pid); -} - -#define DOOR_FILE_PATTERN "/tmp/.java_pid%d" - -/* open door file for the given JVM */ -static int open_door(pid_t pid) { - char path[PATH_MAX + 1]; - int fd; - - sprintf(path, DOOR_FILE_PATTERN, pid); - fd = file_open(path, O_RDONLY); - if (fd < 0) { - set_jvm_error(JVM_ERR_CANT_OPEN_DOOR); - print_debug("cannot open door file %s\n", path); - return -1; - } - print_debug("opened door file %s\n", path); - if (check_permission(path) != 0) { - set_jvm_error(JVM_ERR_DOOR_FILE_PERMISSION); - print_debug("check permission failed for %s\n", path); - file_close(fd); - fd = -1; - } - return fd; -} - -/* create attach file for given process */ -static int create_attach_file(pid_t pid) { - char path[PATH_MAX + 1]; - int fd; - fill_attach_file_name(path, sizeof(path), pid); - fd = file_open(path, O_CREAT | O_RDWR); - if (fd < 0) { - set_jvm_error(JVM_ERR_CANT_CREATE_ATTACH_FILE); - print_debug("cannot create file %s\n", path); - } else { - print_debug("created attach file %s\n", path); - } - return fd; -} - -/* delete attach file for given process */ -static void delete_attach_file(pid_t pid) { - char path[PATH_MAX + 1]; - fill_attach_file_name(path, sizeof(path), pid); - int res = unlink(path); - if (res) { - print_debug("cannot delete attach file %s\n", path); - } else { - print_debug("deleted attach file %s\n", path); - } -} - -/* attach to given JVM */ -jvm_t* jvm_attach(pid_t pid) { - jvm_t* jvm; - int door_fd, attach_fd, i = 0; - - jvm = (jvm_t*) calloc(1, sizeof(jvm_t)); - if (jvm == NULL) { - set_jvm_error(JVM_ERR_OUT_OF_MEMORY); - print_debug("calloc failed in %s at %d\n", __FILE__, __LINE__); - return NULL; - } - jvm->pid = pid; - attach_fd = -1; - - door_fd = open_door(pid); - if (door_fd < 0) { - print_debug("trying to create attach file\n"); - if ((attach_fd = create_attach_file(pid)) < 0) { - goto quit; - } - - /* send QUIT signal to the target so that it will - * check for the attach file. - */ - if (send_sigquit(pid) != 0) { - set_jvm_error(JVM_ERR_CANT_SIGNAL); - print_debug("sending SIGQUIT failed\n"); - goto quit; - } - - /* give the target VM time to start the attach mechanism */ - do { - int res; - RESTARTABLE(poll(0, 0, 200), res); - door_fd = open_door(pid); - i++; - } while (i <= 50 && door_fd == -1); - if (door_fd < 0) { - print_debug("Unable to open door to process %d\n", pid); - goto quit; - } - } - -quit: - if (attach_fd >= 0) { - file_close(attach_fd); - delete_attach_file(jvm->pid); - } - if (door_fd >= 0) { - jvm->door_fd = door_fd; - clear_jvm_error(); - } else { - free(jvm); - jvm = NULL; - } - return jvm; -} - -/* return the last thread local error message */ -const char* jvm_get_last_error() { - const char* res = NULL; - thr_getspecific(jvm_error_key, (void**)&res); - return res; -} - -/* detach the givenb JVM */ -int jvm_detach(jvm_t* jvm) { - if (jvm) { - int res = 0; - if (jvm->door_fd != -1) { - if (file_close(jvm->door_fd) != 0) { - set_jvm_error(JVM_ERR_CANT_CLOSE_DOOR); - res = -1; - } else { - clear_jvm_error(); - } - } - free(jvm); - return res; - } else { - set_jvm_error(JVM_ERR_NULL_PARAM); - print_debug("jvm_t* is NULL\n"); - return -1; - } -} - -/* - * A simple table to translate some known errors into reasonable - * error messages - */ -static struct { - int err; - const char* msg; -} const error_messages[] = { - { 100, "Bad request" }, - { 101, "Protocol mismatch" }, - { 102, "Resource failure" }, - { 103, "Internal error" }, - { 104, "Permission denied" }, -}; - -/* - * Lookup the given error code and return the appropriate - * message. If not found return NULL. - */ -static const char* translate_error(int err) { - int table_size = sizeof(error_messages) / sizeof(error_messages[0]); - int i; - - for (i=0; i\0\0 - */ - if (cstr == NULL) { - print_debug("command name is NULL\n"); - goto quit; - } - size = strlen(PROTOCOL_VERSION) + strlen(cstr) + 2; - buf = (char*)malloc(size); - if (buf != NULL) { - char* pos = buf; - strcpy(buf, PROTOCOL_VERSION); - pos += strlen(PROTOCOL_VERSION)+1; - strcpy(pos, cstr); - } else { - set_jvm_error(JVM_ERR_OUT_OF_MEMORY); - print_debug("malloc failed at %d in %s\n", __LINE__, __FILE__); - goto quit; - } - - /* - * Next we iterate over the arguments and extend the buffer - * to include them. - */ - for (i=0; idoor_fd, &door_args), rc); - - /* - * door_call failed - */ - if (rc == -1) { - print_debug("door_call failed\n"); - } else { - /* - * door_call succeeded but the call didn't return the the expected jint. - */ - if (door_args.data_size < sizeof(int)) { - print_debug("Enqueue error - reason unknown as result is truncated!"); - } else { - int* res = (int*)(door_args.data_ptr); - if (*res != 0) { - const char* msg = translate_error(*res); - if (msg == NULL) { - print_debug("Unable to enqueue command to target VM: %d\n", *res); - } else { - print_debug("Unable to enqueue command to target VM: %s\n", msg); - } - } else { - /* - * The door call should return a file descriptor to one end of - * a socket pair - */ - if ((door_args.desc_ptr != NULL) && - (door_args.desc_num == 1) && - (door_args.desc_ptr->d_attributes & DOOR_DESCRIPTOR)) { - result = door_args.desc_ptr->d_data.d_desc.d_descriptor; - } else { - print_debug("Reply from enqueue missing descriptor!\n"); - } - } - } - } - -quit: - if (buf) free(buf); - return result; -} - -/* read status code for a door command */ -static int read_status(int fd) { - char ch, buf[16]; - int index = 0; - - while (1) { - if (file_read(fd, &ch, sizeof(ch)) != sizeof(ch)) { - set_jvm_error(JVM_ERR_DOOR_CANT_READ_STATUS); - print_debug("door cmd status: read status failed\n"); - return -1; - } - buf[index++] = ch; - if (ch == '\n') { - buf[index - 1] = '\0'; - return atoi(buf); - } - if (index == sizeof(buf)) { - set_jvm_error(JVM_ERR_DOOR_CANT_READ_STATUS); - print_debug("door cmd status: read status overflow\n"); - return -1; - } - } -} - -static const char* ENABLE_DPROBES_CMD = "enabledprobes"; - -/* enable one or more DTrace probes for a given JVM */ -int jvm_enable_dtprobes(jvm_t* jvm, int num_probe_types, const char** probe_types) { - int fd, status = 0; - char ch; - const char* args[1]; - char buf[16]; - int probe_type = 0, index; - int count = 0; - - if (jvm == NULL) { - set_jvm_error(JVM_ERR_NULL_PARAM); - print_debug("jvm_t* is NULL\n"); - return -1; - } - - if (num_probe_types == 0 || probe_types == NULL || - probe_types[0] == NULL) { - set_jvm_error(JVM_ERR_INVALID_PARAM); - print_debug("invalid probe type argument(s)\n"); - return -1; - } - - for (index = 0; index < num_probe_types; index++) { - const char* p = probe_types[index]; - if (strcmp(p, JVM_DTPROBE_OBJECT_ALLOC) == 0) { - probe_type |= DTRACE_ALLOC_PROBES; - count++; - } else if (strcmp(p, JVM_DTPROBE_METHOD_ENTRY) == 0 || - strcmp(p, JVM_DTPROBE_METHOD_RETURN) == 0) { - probe_type |= DTRACE_METHOD_PROBES; - count++; - } else if (strcmp(p, JVM_DTPROBE_MONITOR_ENTER) == 0 || - strcmp(p, JVM_DTPROBE_MONITOR_ENTERED) == 0 || - strcmp(p, JVM_DTPROBE_MONITOR_EXIT) == 0 || - strcmp(p, JVM_DTPROBE_MONITOR_WAIT) == 0 || - strcmp(p, JVM_DTPROBE_MONITOR_WAITED) == 0 || - strcmp(p, JVM_DTPROBE_MONITOR_NOTIFY) == 0 || - strcmp(p, JVM_DTPROBE_MONITOR_NOTIFYALL) == 0) { - probe_type |= DTRACE_MONITOR_PROBES; - count++; - } else if (strcmp(p, JVM_DTPROBE_ALL) == 0) { - probe_type |= DTRACE_ALL_PROBES; - count++; - } - } - - if (count == 0) { - return count; - } - sprintf(buf, "%d", probe_type); - args[0] = buf; - - fd = enqueue_command(jvm, ENABLE_DPROBES_CMD, 1, args); - if (fd < 0) { - set_jvm_error(JVM_ERR_DOOR_CMD_SEND); - return -1; - } - - status = read_status(fd); - // non-zero status is error - if (status) { - set_jvm_error(JVM_ERR_DOOR_CMD_STATUS); - print_debug("%s command failed (status: %d) in target JVM\n", - ENABLE_DPROBES_CMD, status); - file_close(fd); - return -1; - } - // read from stream until EOF - while (file_read(fd, &ch, sizeof(ch)) == sizeof(ch)) { - if (libjvm_dtrace_debug) { - printf("%c", ch); - } - } - - file_close(fd); - clear_jvm_error(); - return count; -} diff --git a/hotspot/src/os/solaris/dtrace/jvm_dtrace.h b/hotspot/src/os/solaris/dtrace/jvm_dtrace.h deleted file mode 100644 index edc6dbdfc3b..00000000000 --- a/hotspot/src/os/solaris/dtrace/jvm_dtrace.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#ifndef _JVM_DTRACE_H_ -#define _JVM_DTRACE_H_ - -/* - * Interface to dynamically turn on probes in Hotspot JVM. Currently, - * this interface can be used to dynamically enable certain DTrace - * probe points that are costly to have "always on". - */ - -#ifdef __cplusplus -extern "C" { -#endif - -#include - - -struct _jvm_t; -typedef struct _jvm_t jvm_t; - - -/* Attach to the given JVM process. Returns NULL on failure. - jvm_get_last_error() returns last error message. */ -jvm_t* jvm_attach(pid_t pid); - -/* Returns the last error message from this library or NULL if none. */ -const char* jvm_get_last_error(); - -/* few well-known probe type constants for 'probe_types' param below */ - -#define JVM_DTPROBE_METHOD_ENTRY "method-entry" -#define JVM_DTPROBE_METHOD_RETURN "method-return" -#define JVM_DTPROBE_MONITOR_ENTER "monitor-contended-enter" -#define JVM_DTPROBE_MONITOR_ENTERED "monitor-contended-entered" -#define JVM_DTPROBE_MONITOR_EXIT "monitor-contended-exit" -#define JVM_DTPROBE_MONITOR_WAIT "monitor-wait" -#define JVM_DTPROBE_MONITOR_WAITED "monitor-waited" -#define JVM_DTPROBE_MONITOR_NOTIFY "monitor-notify" -#define JVM_DTPROBE_MONITOR_NOTIFYALL "monitor-notifyall" -#define JVM_DTPROBE_OBJECT_ALLOC "object-alloc" -#define JVM_DTPROBE_ALL "*" - -/* Enable the specified DTrace probes of given probe types on - * the specified JVM. Returns >= 0 on success, -1 on failure. - * On success, this returns number of probe_types enabled. - * On failure, jvm_get_last_error() returns the last error message. - */ -int jvm_enable_dtprobes(jvm_t* jvm, int num_probe_types, const char** probe_types); - -/* Note: There is no jvm_disable_dtprobes function. Probes are automatically - * disabled when there are no more clients requiring those probes. - */ - -/* Detach the given JVM. Returns 0 on success, -1 on failure. - * jvm_get_last_error() returns the last error message. - */ -int jvm_detach(jvm_t* jvm); - -#ifdef __cplusplus -} -#endif - -#endif /* _JVM_DTRACE_H_ */ diff --git a/jaxp/.hgignore b/jaxp/.hgignore deleted file mode 100644 index 1c1d4fc1a3f..00000000000 --- a/jaxp/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -^build/ -^dist/ -^drop/ -^drop_included/ -^webrev -/nbproject/private/ diff --git a/jaxp/.hgtags b/jaxp/.hgtags deleted file mode 100644 index b7b311f8847..00000000000 --- a/jaxp/.hgtags +++ /dev/null @@ -1,449 +0,0 @@ -6ce5f4757bde08f7470cbb9f0b46da8f2f3d4f56 jdk7-b24 -a3b3ba7d6034dc754b51ddc3d281399ac1cae5f1 jdk7-b25 -da43cb85fac1646d6f97e4a35e510bbfdff97bdb jdk7-b26 -bafed478d67c3acf7744aaad88b9404261ea6739 jdk7-b27 -b996318955c0ad8e9fa0ffb56c74f626786e863f jdk7-b28 -617ee8607cfd5fd81f233f3c0b690f85084687a0 jdk7-b29 -2d94a238a1641d074e6032dcdceed461d6f85d6a jdk7-b30 -255d64ee287e926e8629dd80bc67690e65eeba30 jdk7-b31 -400a5ee432cc2db9031e06852ddde9264a192b48 jdk7-b32 -95375835527f0bf06124ce984266e2ad5de8a6dc jdk7-b33 -01facdf8cabdeaaf68cca037aef56cc5f074897f jdk7-b34 -eac46d1eb7f0935ba04f1c7929ec15423fd0309e jdk7-b35 -c84ca638db42a8b6b227b4e3b63bca192c5ca634 jdk7-b36 -af49591bc486d82aa04b832257de0d18adc9af52 jdk7-b37 -e9f750f0a3a00413a7b77028b2ecdabb7129ae32 jdk7-b38 -831b80be6cea8e7d7da197ccdac5fd4c701a5033 jdk7-b39 -54946f466e2c047c44c903f1bec400b685c2508e jdk7-b40 -0758bd3e2852e4f931ba211cc4d48f589450eeb4 jdk7-b41 -036e0dca841a5a17f784d15c86a9da88d2a6f1e6 jdk7-b42 -96fe28d4a9131e1a97bfe00f779e5626cd09c4d0 jdk7-b43 -b203df0741af3eb08687bc5eb798bac87363758d jdk7-b44 -0f113667880d335cfa2c35721b1b45144fb757f5 jdk7-b45 -b2271877894af809b7703767fe8d4e38591a02a2 jdk7-b46 -d711ad1954b294957737ea386cfd4d3c05028a36 jdk7-b47 -39de90eb4822cafaacc69edd67ab5547e55ae920 jdk7-b48 -5c1f24531903573c1830775432276da567243f9c jdk7-b49 -e8514e2be76d90889ebdb90d627aca2db5c150c6 jdk7-b50 -ae890d80d5dffcd4dc77a1f17d768e192d1852c7 jdk7-b51 -69ad87dc25cbcaaaded4727199395ad0c78bc427 jdk7-b52 -e8837366d3fd72f7c7a47ebfdbd5106c16156f12 jdk7-b53 -946a9f0c493261fa6a010dc33e61b9b535ba80c1 jdk7-b54 -039945fba683ee6773a721e2bd4e449f6133769a jdk7-b55 -c197c6801271c60f9c9f5d18fcc95b59e76dcd54 jdk7-b56 -e4851e9f7be26fc52a628be06ffa8aaea0919bd7 jdk7-b57 -13bf67d8c6341b841d268985cabaf747f2652bc8 jdk7-b58 -75113d7ce083048e7576b9d0d60a4e80db6b181f jdk7-b59 -259aef5045a155eb6a2f8dd0e2429c6dbe0f652f jdk7-b60 -f1ac756616eaaad795f77f7f5e7f7c7bfdc9c1de jdk7-b61 -a97dd57a62604c35c79bc2fa77a612ed547f6135 jdk7-b62 -ae449e9c04c1fe651bd30f0f4d4cc24ba794e0c4 jdk7-b63 -a10eec7a1edf536f39b5828d8623054dbc62c2b7 jdk7-b64 -008c662e0ee9a91aebb75e46b97de979083d5c1c jdk7-b65 -22f9d5d5b5fe0f47048f41e6c6e54fee5edad0ec jdk7-b66 -a033af8d824a408d3ac602205ecdefc128749e1e jdk7-b67 -83b2a9331383f9db7a49350d4cb13b7635f6b861 jdk7-b68 -a4ab0d6ded63bed0fd1e5be55d38090e0ee5efb7 jdk7-b69 -c83f0106b78a85c7e614d27a328675460b2081cf jdk7-b70 -ff94d8ce0daded647bb326630e643d010357afce jdk7-b71 -37c805b6156fd492c12301688b54a6bcca39e729 jdk7-b72 -feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73 -ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74 -555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75 -233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76 -bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77 -7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78 -b1005c504358c18694c84e95fec16b28cdce7ae1 jdk7-b79 -9219574db5936367114b0f31469837f27d5a375a jdk7-b80 -204e59d488cdaa9eafa8cb7164ea955b5a9d4a51 jdk7-b81 -c876ad22e4bf9d3c6460080db7ace478e29a3ff9 jdk7-b82 -309a0a7fc6ceb1c9fc3a85b3608e97ef8f7b0dfd jdk7-b83 -32c0cf01d555747918529a6ff9e06b0090c7a474 jdk7-b84 -6c0ccabb430dacdcd4479f8b197980d5da4eeb66 jdk7-b85 -81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86 -8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87 -d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88 -d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89 -c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90 -b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91 -e6a40e4bb10499fb6ee9db71ab5654e5a17ab75b jdk7-b92 -c725ca829c5aa4b50a8ed5728579ec8809fbfb1d jdk7-b93 -2de307cd3b4e71127e75dff70809c1b1fbc1a494 jdk7-b94 -07050840f98cda357aa6a8d416fdccbd03038d35 jdk7-b95 -9510ed0e1c7ab46a8b6659234e1dc7786407a72b jdk7-b96 -ca01ec32561fee1855630b68a2fcd0042257a8ef jdk7-b97 -d4adf4f2d14c7b79df0a81de884b6b57c6850802 jdk7-b98 -7ef8469021fbc824ac49d57c83a14b1bb08f1766 jdk7-b99 -d524be5ef62e8b8cb890c59a5d2c19ef0ab50d45 jdk7-b100 -17f62a566a2020fd908e77106ed885e0c4e7c14d jdk7-b101 -15573625af97d01c4e24549041cba7584da7fe88 jdk7-b102 -b7722e8788644507c10bb69a137de422d0300b24 jdk7-b103 -d42c4acb6424a094bdafe2ad9c8c1c7ca7fb7b7e jdk7-b104 -3233b9a4c12ef2663a356d08bb141c02736c7f49 jdk7-b105 -5ba8469212a6cab95ca652eea414b753be7d245a jdk7-b106 -20ee37c1372a3eaefa49b426c6eb68a2e8f5d6e2 jdk7-b107 -7d379f8934caf255f53def1310c0ef0f1b512601 jdk7-b108 -0f382d6120fc07aed2209484a42458cabf405916 jdk7-b109 -d422dbdd09766269344b796b3a46a5b3f74557e1 jdk7-b110 -8106c747067c905d814a737a57fea0e29057b33f jdk7-b111 -1b05254242881527b4d5d711295c0fe708c8823a jdk7-b112 -bc0c84ce54c34d3e8b0604b94da0d7c75c26755e jdk7-b113 -d57197d22c2bfc39d1a860040f655b466ab46f52 jdk7-b114 -dc1612e1d3ac08eb8fcad764daff21c9247d33c9 jdk7-b115 -f8d4e6c6cfce1cda23fcbd144628a9791a9e1a63 jdk7-b116 -9ee4d96e893436a48607924227dadd2d93b9b00d jdk7-b117 -b2f6d9c4f12ffd307a5de40455b2b61b31a5cb79 jdk7-b118 -9ee900f01c5872551c06f33ae909662ffd8463ac jdk7-b119 -4821de0908defe647fcdaab4485f98873e24dea0 jdk7-b120 -63dae40fa19fd3bf4689ea2f3c1d9d690e1abcee jdk7-b121 -03ff13d19c8fa983cbab6542930a7f352e9b5b33 jdk7-b122 -e2aedea6495d61557326928de20dbb2d78fdd9aa jdk7-b123 -57ed1f3bec72924cdad102f9bf90f7449ea7bb83 jdk7-b124 -6c9bdee0cc3a8912acc5189cc092b8cba6851f9d jdk7-b125 -2fde639439c1fb3fbc44f533d48bb2916e813312 jdk7-b126 -c532d6dbc8d18d55b5d693599ee5cd8250e16eb4 jdk7-b127 -a42c6132c746c86e9fc27ec80cbd699f6ee5edca jdk7-b128 -f5b60c5a310f992c6ca627d17ca3e042f0e0b2c3 jdk7-b129 -ab107c1bc4b918404b191838c455e9b2892389f3 jdk7-b130 -eab6f27131e4e2f0af0016b35b18ae65cdd249d9 jdk7-b131 -abe04c59a556a3821c30bd8839e3c74f5d4281d1 jdk7-b132 -8e1148c7911b02e00a727461525f239da025cab7 jdk7-b133 -d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134 -4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135 -1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136 -1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137 -be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138 -28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139 -c8136fd161c83917f87e93b14fa2ba3483f9be83 jdk7-b140 -e1b5ef243445bf836d095fd44866e1771ef99374 jdk7-b141 -7d067af4b25e4b7e6b28bef48527d67f8650e6c5 jdk7-b142 -16b847e9bbd747f9d27785b2fc20d4d720cca893 jdk7-b143 -39bf6dcaab2336326b21743cef7042d0a2de9ba0 jdk7-b144 -10ca7570f47f2ae4132648f7e8da1a05f1a98a15 jdk7-b145 -bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146 -fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147 -4f0fcb812767594fe9de509f946b56942db5a2f0 jdk8-b01 -ca4d6ad55a660f0469882e85b4dacf7822d50abf jdk8-b02 -7a74371ce0c64108b857c497ae130dfe9514532c jdk8-b03 -acbcadef0b21582abf406f07f1b74d2b8f80dc01 jdk8-b04 -ff0a3d78e7a22743eabbaa71e9d17b2f094ddf62 jdk8-b05 -d7b8192e7277c49b9c702f4c4fd99bd83ba947ea jdk8-b06 -c114306576dcc1cb871a48058b41bf7d87ce882a jdk8-b07 -de4794dd69c48b08029d158a972993ff9d5627df jdk8-b08 -93554324c014282571aeeb48552ad00d3fedb089 jdk8-b09 -d21a4d5141c04bc9e88f2c0253121d449b66d667 jdk8-b10 -d1b7a4f6dd2065fdeafbcdfd9dcc0072da8c6881 jdk8-b11 -ca977d167697a561c04894187fc1c4d927582ffa jdk8-b12 -bcc739229f6384786c7ac0b52c1822c85674dcf1 jdk8-b13 -9d0c9d638757cb09de18933b946fa04b4f3fb94f jdk8-b14 -804f666d6d44e33caac12ad8da3d2780ac44ef72 jdk8-b15 -09eb517404b059607aca30cdd1af83ffc57eafeb jdk8-b17 -09eb517404b059607aca30cdd1af83ffc57eafeb jdk8-b16 -ebec6a7e8d4e481d205a2109ddeea8121d76db7f jdk8-b18 -dffeb62b1a7fc8b316bf58fe5479323f3661894e jdk8-b19 -f052abb8f37444ba77858913887d0d92795dd6b8 jdk8-b20 -d41eeadf5c1344b88c5051a997aec9e1ad7ce1db jdk8-b21 -cf9d6ec44f891236ad18451021d6dcd57dc82f7b jdk8-b22 -95102fd334183d15dc98a95dd0d749527b6c7300 jdk8-b23 -7836655e2495646c462f13de73dcc3ada197b64f jdk8-b24 -bb694c151fc7b5c8f9edc8af6a80738530feacaf jdk8-b25 -dbb7283c197b27da1fc12ae8a83785c851b68c12 jdk8-b26 -80c47eb83d24fdd64bbb48f288bd6d4f03e0ec88 jdk8-b27 -f3244c1f04864d35c41fa8d13669faf4f65b81e2 jdk8-b28 -25099a745e1a43579b6af86b3e052b2e50958753 jdk8-b29 -3be30c25a8255803652b5c466336055d36e2ba21 jdk8-b30 -94aabe098916440ae7911866311c9617d8481a36 jdk8-b31 -60960fbc75df8be4c1a2504aa69fc1428cc94f93 jdk8-b32 -9bcab2b8b8ea578e594916a3d3df6dbec7984bcb jdk8-b33 -8b91a897a04486cf901af0de7f684a3eb31f121f jdk8-b34 -e187f3ede64965dc2979df9a211107cd3d38eacb jdk8-b35 -cfd288fe1d3e2b700838342e70d71d44ac991af5 jdk8-b36 -90204bfab4e2bed402badcc997cbf8446ab5669f jdk8-b37 -5bbe0cb6f2f2d7ce292da77bf4fa9d618d770a78 jdk8-b38 -f95fdbe525c88ef0d57dc1390be6582a8af5e07c jdk8-b39 -9ecfdbd6aed4702674eaede2023b4a19513d6b36 jdk8-b40 -6f5c0e17415de7a9c74900ef4ba12f47accdf88b jdk8-b41 -39ee03c1602155ff02e5feb6cd44869452f24cf7 jdk8-b42 -eff4ece9c8bc43b3ce2b3758574c4c20147f0689 jdk8-b43 -0b3f3a4ce13930430b32b616a717dfc7fe385b28 jdk8-b44 -57476f66e13c55eea2f2fe2b858369a4c64b9936 jdk8-b45 -300f45e990643af230d6cca39477ff62c44a9a54 jdk8-b46 -404521944ac9383afda7d55d60713b212c730646 jdk8-b47 -1c88da9a1365797e49be77ae42c34bbc0a3c3f0c jdk8-b48 -f81e981eca7b63316cf9d778f93903a4fc62161d jdk8-b49 -2791ec55f66b57a702349c649567a391e6301f4e jdk8-b50 -dc1ea77ed9d9746e0f98bb1268987c3596c8b4b5 jdk8-b51 -bd3c00d5761408954cc29ffb82016a76cbc90b43 jdk8-b52 -2c566f25c39f0087464b73e3bcf1c1421d0f2a7e jdk8-b53 -7dd81ccb7c1134df70969b3068b1e98def701746 jdk8-b54 -7c2363666890c6675194948fbcd74d81ddb84298 jdk8-b55 -f19d63b2119a0092f016203981ffef5cc31bc3c5 jdk8-b56 -7c9475c7618cb131bcd7470f859bf43c5e5f9905 jdk8-b57 -1cb19abb3f7b40bf233b349cd2f51f02d37a9f5b jdk8-b58 -af9e8b0f1900b631a8a0fcccff9f1514fe58c808 jdk8-b59 -2d1dff5310daaf226421a8c92823cb8afcf35f31 jdk8-b60 -6b1db0b41d2f6e2a7b3bdbc8a8db823b47752906 jdk8-b61 -5d0fa0108d028c05753a47bcf2a598357dabf0c0 jdk8-b62 -192d8a244bc36427757866e9fb3a08938c0e674c jdk8-b63 -27ab79568c34abf80958d5fa8c04fd1740d243da jdk8-b64 -5cf3c69a93d6d088a1cdfa28031d4f0f9438c0de jdk8-b65 -e6af1ad464e3d9b1154b9f9ed9a5373b97d129fc jdk8-b66 -83df3493ca3cf0be077f1d0dd90119456f266f54 jdk8-b67 -b854e70084214e9dcf1b37373f6e4b1a68760e03 jdk8-b68 -789a855de959f7e9600e57759c6c3dbb0b24d78b jdk8-b69 -6ec9edffc286c9c9ac96c9cd2050b01cb5d514a8 jdk8-b70 -499be952a291cec1dc774a84a238941d6faf772d jdk8-b71 -bdf2af722a6b54fca47d8c51d17a1b8f41dd7a3e jdk8-b72 -84946404d1e1de003ed2bf218ef8d48906a90e37 jdk8-b73 -2087e24a4357eceb6432e94918e75fdc706a27d6 jdk8-b74 -ff0b73a6b3f6cea644d37d56d746a37743419fa7 jdk8-b75 -0c08593944d0cd30645f6e1e4946c51ff2b10c8c jdk8-b76 -573e789c187a69a3ae00bffd26eb35c0f4a60636 jdk8-b77 -00958c5a7070bd578aa8b70773cb3f204a9c1be1 jdk8-b78 -58fa065dd5d663d62f85402461388fb7a92656fa jdk8-b79 -4873a0499bc3bd263b7dd3b551a2b4e275ab5a0b jdk8-b80 -ef3495555a4c6e706a3058c18aa229b14220de0b jdk8-b81 -d5a58291f09a5081eaf22c2a6ab2f9ced4b78882 jdk8-b82 -a46d69a1a8ec9652a48114823535372e1c980799 jdk8-b83 -f5f40094ffcc1230e2a5f76ea4c968645369be6c jdk8-b84 -41b50e2c5ea3f4aa1af729e1deb1678cb3e1ef9c jdk8-b85 -ca71ec37b2efc9c3f0971ebabb3a6eb1213d76de jdk8-b86 -eddbc8ad2435a89f64729512337c9f2669e4dd85 jdk8-b87 -7122f7bb0fcc8a39e5254402119b2ee3fa0ad313 jdk8-b88 -893d2ba8bbea3a8d090e51d8eaea285b390789ea jdk8-b89 -668acc0e1034bc1bec6d02be92e0dd4a63d0667e jdk8-b90 -e3065fb07877c7e96e8b93416fe2ab9a4c9eb2a5 jdk8-b91 -1ab5d8d6eab81e65c6c3cf21739474cd67a0e7cf jdk8-b92 -d583a491d63c49eeda4869525048075da1cb596e jdk8-b93 -c84658e1740df64931005a9bc4c8ecef38eb47c3 jdk8-b94 -b8c5f4b6f0fffb44618fc609a584953c4ed67c0b jdk8-b95 -6121efd299235b057f3de94b0a4158c388c2907c jdk8-b96 -6c830db28d21108f32af990ecf4d80a75887980d jdk8-b97 -15e5bb51bc0cd89304dc2f7f29b4c8002e632353 jdk8-b98 -adf49c3ef83c160d53ece623049b2cdccaf78fc7 jdk8-b99 -5d1974c1d7b9a86431bc253dc5a6a52d4586622e jdk8-b100 -0a7432f898e579ea35e8c51e3edab37f949168e4 jdk8-b101 -7cffafa606e9fb865e7b5e6a56e0a681ce5cf617 jdk8-b102 -b1ceab582fc6d795b20aaa8a3fde2eba34af9399 jdk8-b103 -a22fe9bd01e6c7e7ddc7995dfc9471711692b8d1 jdk8-b104 -09a46ec11f880154886c70be03aff5ab2ddf0ab7 jdk8-b105 -d3be8e3b429df917e72c1c23e7920c651219b587 jdk8-b106 -d6a32e3831aab20a9a3bc78cdc0a60aaad725c6c jdk8-b107 -8ade3eed63da87067a7137c111f684a821e9e531 jdk8-b108 -02bfab2aa93899e0f02584f1e85537485a196553 jdk8-b109 -4c84c5b447b09aff27f3b72667ab3a5401e85968 jdk8-b110 -17ee0d3e97fdb412e48f14d87f504946a708f846 jdk8-b111 -c1f9158fbb9c2da50f6946fffd974e8236e08447 jdk8-b112 -0046d2278204b7eff76803fc4623cb48c7e6384d jdk8-b113 -1b1e12117fe2840e5d21ae9a4b309e4f981f3ea8 jdk8-b114 -f610fd46463e6b0533dd92bce11a1e7d84984e64 jdk8-b115 -e757eb9aee3d6bec7da074c47e07616104a8df33 jdk8-b116 -c1d234d4f16472a5163464420fa00b25ffa5298a jdk8-b117 -e4e5069250e717defcb556e2f6be291460988c51 jdk8-b118 -69a930376c70beb9877970128bad0f04cb0c6eb1 jdk8-b119 -64d8b228a72cf9082b1a9a881c81188ccffde234 jdk8-b120 -4045edd35e8ba73bfdc23ce8961b9640d4145fe5 jdk9-b00 -e5256f530a9b5f2d677ca245de44a617ffb58f52 jdk9-b01 -02f60a253e15240087c043bad77a106792e4d56a jdk9-b02 -fb92ed0399424193f444489ad49a16748816dc12 jdk9-b03 -2846d8fc31490897817a122a668af4f44fc913d0 jdk9-b04 -b92a20e303d24c74078888cd7084b14d7626d48f jdk9-b05 -46e4951b2a267e98341613a3b796f2c7554eb831 jdk9-b06 -389f4094fd603c17e215997b0b40171179629007 jdk9-b07 -3b360a77658e6b3ac150dd7cdbff1a7abe855afc jdk9-b08 -f93a792fe37279d4d37aea86a99f3abbdc6fe79b jdk9-b09 -4ce98701efe3b28f6ce3ab23385445731e968af7 jdk9-b10 -6b4280dceb00642f54d5bc1c2cb7d34c99a04992 jdk9-b11 -e88cecf5a21b760ff7d7761c2db6bb8c82bc9f0c jdk9-b12 -5eaf717f6e36037a6d3744ffeee0e4c88e64a0d2 jdk9-b13 -32b3fc4bc7374a34d52b7f4e2391b4b4b0c084e8 jdk9-b14 -6bad71866c7598587860e0981b0b0e51ec8c0476 jdk9-b15 -a1461221b05d4620e4d7d1907e2a0282aaedf31c jdk9-b16 -6f923fcbe5129eceb9617a9a18dbdd743980e785 jdk9-b17 -5afa90c28742d175431be75f9098745510bd2b30 jdk9-b18 -f9c82769a6bc2b219a8f01c24afe5c91039267d7 jdk9-b19 -94fd4d9d3a75819644b21e18c8a567fd0e973eaf jdk9-b20 -7eb0ab676ea75cb1dd31c613e77008a7d8cb0af7 jdk9-b21 -82b94ff002c6e007a03bf0f364ca94b381e09135 jdk9-b22 -2e5b63006187bfc64d8eace374dbc2806267a160 jdk9-b23 -345af113f57206711f75089c3ebf84a36a789122 jdk9-b24 -73757f4b8aa353ca8937abc07e79e7ece4c011a1 jdk9-b25 -a5aea8318ae4a9c2105228568688875142d70344 jdk9-b26 -2bfaf29cc90b19948938e3ef1a0983eee68806c7 jdk9-b27 -dc1e26434b3fd7e9b8eeab149103c1e30965f95c jdk9-b28 -30adcd13a313ea91e81164801a2f89282756d933 jdk9-b29 -d181d4002214e4914d5525bd5ee13369311c765c jdk9-b30 -292317ebc7dbaca6b3965f0bc7b38a2cee733b7a jdk9-b31 -b940ca3d2c7e8a279ca850706b89c2ad3a841e82 jdk9-b32 -46b360454dadbb329d42c59bb8192daeb9d59875 jdk9-b33 -6b343b9b7a7008f5f699a2d99881163cab7a2986 jdk9-b34 -b9370464572fc663a38956047aa612d6e7854c3d jdk9-b35 -61b4c9acaa58e482db6601ec5dc4fc3d2d8dbb55 jdk9-b36 -48e4ec70cc1c8651e4a0324d91f193c4edd83af9 jdk9-b37 -6c6b34477e93e6fb350035f73ed7c02266b78380 jdk9-b38 -a12d347f84176200593999f4da91ae2bb86865b2 jdk9-b39 -3f46e2196498de33e7c65efa7b372e46f1faba01 jdk9-b40 -71dd8f7649428efd3a56ca5fefc80e59d37b8434 jdk9-b41 -47b0d3fa4118b9d56870cf4004987438c501f5c0 jdk9-b42 -40b242363040229a05224fbc5dc203a3f46a8f8f jdk9-b43 -0cb0844b58924d6086d2850c22087d06679d5eef jdk9-b44 -0dab3e848229127c7aca4c58b98e2d90ba70372f jdk9-b45 -74eaf7ad986576c792df4dbff05eed63e5727695 jdk9-b46 -e391de88e69b59d7c618387e3cf91032f6991ce9 jdk9-b47 -833051855168a973780fafeb6fc59e7370bcf400 jdk9-b48 -786058752e0ac3e48d7aef79e0885d29d6a2a7eb jdk9-b49 -74ead7bddde19263fd463bc1bd87de84f27d1b5e jdk9-b50 -7cb3674cbd8c06222851444285bb66b2952a2a5c jdk9-b51 -57b26c883d54f45912bc3885ccad3c6b80960b1f jdk9-b52 -d5b5a010a16688f188f5a9247ed873f5100b530c jdk9-b53 -542c0c855ad467624cbedf11bff08e44b86b068d jdk9-b54 -2a460ce60ed47081f756f0cc0321d8e9ba7cac17 jdk9-b55 -139092a10dedd32bc1155e40c67a6ef682e39873 jdk9-b56 -2c417f7d7b0dc98e887474884aa39f974894f0c2 jdk9-b57 -270fb9a2dcb5ff3ef95da6d529fa35187026af0a jdk9-b58 -a1a9d943446911a4a0f74f0d082c32094af944ae jdk9-b59 -c12db18748dacfccd6581ead29228c2cb6e51b34 jdk9-b60 -f4a4a54620370f077c2e830a5561c8cfa811712b jdk9-b61 -3bcf83c1bbc1b7663e930d72c133a9bd86c7618d jdk9-b62 -4a8f895f0317dcc90479cb7cc97014312e69edf7 jdk9-b63 -6f91749b5aaef1a171ec2254163233438d1071d1 jdk9-b64 -ae7406e82828fe1c245ac7507a9da5fd5b1c9529 jdk9-b65 -d5963ccce28d7a3e96ee3e2dc8a8676e61699b70 jdk9-b66 -78c2685daabafae827c686ca2d1bb2e451faed2b jdk9-b67 -82aae947938ec9b0119fdd78a616d0b7263072ee jdk9-b68 -f844a908d3308f47d73cf64e87c98d37d5d76ce8 jdk9-b69 -42180703e0a362c1de7cdbf61d2cbc6609e678c4 jdk9-b70 -a3200b88f259f904876b9ab13fd4c4ec2726f8ba jdk9-b71 -81e85f3b6174314155991048767452a9931e12e2 jdk9-b72 -be5efc34a43bdd982d1cbe11cb2f6d6a060dde60 jdk9-b73 -eadcb2b55cd1daf77625813aad0f6f3967b1528a jdk9-b74 -16b5e696f948cd8aa9b3afdb686ddffd48bd17a8 jdk9-b75 -36801a89a04201b59874ec776ffe85d6253c9ab5 jdk9-b76 -be357705874c4ba1a69c38fb211e5e31e35bf9cb jdk9-b77 -5b1899c9822db4a80a29cac82af492afea9f8f41 jdk9-b78 -cf809edc840ff7546677d38b13ebd8b3cae2bbda jdk9-b79 -f464f9b2fb1178f6a957e5730b4b5252c6149ed9 jdk9-b80 -6a418934997fc4b56664b88f8417e2f0fe658091 jdk9-b81 -53fe3c103b6fdf48e2b2676c0c4818ef5a10fa21 jdk9-b82 -497bc2654e11684b11de46744227883d7e760f35 jdk9-b83 -91795d86744f3074d1e59b1e75d9c851c098688f jdk9-b84 -1d9850c1b35c74e8b5c17970ed5d46dc0fc33f06 jdk9-b85 -88d9b1f6b73e0c46fcb5ccabe1231a30ce758a22 jdk9-b86 -eb435c878c2cbbfb043d0b205f4d5bd6faffd44a jdk9-b87 -4700fd67e942714046df1d0514f2ef4ddcac78bb jdk9-b88 -5021da4c949690e5c2578c073c36fb161e4b35e5 jdk9-b89 -35f68242b624112cb6ef7e6226059674d6b499f4 jdk9-b90 -ffaff3d0ad0e0ca1e632b80826afa8729ee72a48 jdk9-b91 -fcabfb3c38ac1da99394e821902537d92e45222d jdk9-b92 -b9c50c63305cf1120263f6b7c6993021b53c2c40 jdk9-b93 -5e75b8a9c01bca09c56dec7539e44dc82090c7c2 jdk9-b94 -c8d0845877a811ab4350935892f826929359a3ff jdk-9+95 -1f3182529f2c474e5506955ccb3820cfa5822265 jdk-9+96 -9c107c050335d7ee63b2a8b38ca5d498f19713a2 jdk-9+97 -52b01339235f24c93b679bd6b8fb36a1072ad0ac jdk-9+98 -52774b544850c791f1d1c67db2601b33739b18c9 jdk-9+99 -d45bcd374f6057851e3c2dcd45607cd362afadfa jdk-9+100 -d3e834ff74e724a2b92a558e18e8cbf81c6dbc59 jdk-9+101 -9dcf193c0b6cf22c0e89e2dc705a2c0f520ae064 jdk-9+102 -bdbf2342b21bd8ecad1b4e6499a0dfb314952bd7 jdk-9+103 -58448465334e1d8bf1cfc09052783937b1cc21c0 jdk-9+104 -5acf6071d4d610068a19c79e004ba8e59cf1b087 jdk-9+105 -65d615f71e81bae46dcb4d053e590582e5705879 jdk-9+106 -781b83dadcae89b8ae7545bb4044ddc62c6fa006 jdk-9+107 -3b9fa8b1491479f7ae18131a34036b58b647493e jdk-9+108 -24e247ee1fffaa625d480b2a4eef2d3a8a59f5cb jdk-9+109 -1c1bb661d35b846dc04931bd5f687a0348f80345 jdk-9+110 -27a3d65e1580386d060e0aa3a68ab52c1a9ab568 jdk-9+111 -36326537f929d20cc5885b93939f90c0efcc4681 jdk-9+112 -28626780e245fccbfb9bad8e3b05f62357958038 jdk-9+113 -147114dd0641cd7c9fe6e81642eb993a7b9c6f0b jdk-9+114 -1902a5bda18e794b31fc5f520f5e7d827714b50d jdk-9+115 -9d71d20e614777cd23c1a43b38b5c08a9094d27a jdk-9+116 -46b57560cd06ebcdd21489250628ff5f9d9d8916 jdk-9+117 -a8aa25fc6c5fda0ed7a93b8ffee62da326a752fc jdk-9+118 -f92e8518bb34a9628b11e662bf7308561a55eb3b jdk-9+119 -ecbe72546137cd29cb73d4dcc81cc099e847d543 jdk-9+120 -a265b8116058c56179c321c38618570b780329be jdk-9+121 -f8899b1884e2c4a000dbcc5b1a80954245fe462e jdk-9+122 -3c19ab8742c196ac267b3d87e1d19ec3472c708d jdk-9+123 -e04a15153cc293f05fcd60bc98236f50e16af46a jdk-9+124 -493eb91ec32a6dea7604cfbd86c10045ad9af15b jdk-9+125 -15722f71281f034bc696d8b96136da2ef34da44f jdk-9+126 -bdc3c0b737efbf899709eb3121ce760dcfb51151 jdk-9+127 -8a7681a9d70640ac7fbf05c28f53c1d51d8d00a1 jdk-9+128 -74241304e87b0d463391a8ecab40979b5af86dc2 jdk-9+129 -e66cdc2de6b02443911d386fc9217b0d824d0686 jdk-9+130 -874082a9b565a7092a40bfa934a6e3e3c3455a60 jdk-9+131 -907445d85e680ea410fe2c83c0ec64b5508e4f3e jdk-9+132 -9490ba2e5e41685c858a0ca2a6ec87611eb011c6 jdk-9+133 -1c6c21d87aa459d82425e1fddc9ce8647aebde34 jdk-9+134 -f695240370c77a25fed88225a392e7d530cb4d78 jdk-9+135 -f1eafcb0eb7182b937bc93f214d8cabd01ec4d59 jdk-9+136 -a8d5fe567ae72b4931040e59dd4478363f9004f5 jdk-9+137 -69c3b12ba75b2e321dee731ac545e7fbff608451 jdk-9+138 -8991d71c5316bde259e6a417c1199b008ca3cdf0 jdk-9+139 -8d100cb9b04819b5bd09f33c7fd5b8628d1a456f jdk-9+140 -037c095ba0c345edbeaaab52fda913a76c3930c0 jdk-9+141 -bdafa0cc34a97a2f8db4847a4efd34b407943591 jdk-9+142 -ce81d03ad7320dca3d673374c1a33bc0efd9136a jdk-9+143 -99be33734ff62b75116b1202d49a4d4e1bda4226 jdk-9+144 -71558b38bad786f11350790cef7d2c6409813e91 jdk-9+145 -09eda28b98e4b9cae1d29e94f0cf1a01cc42c207 jdk-9+146 -149559dd882ddca2c78355641a46db9138b12763 jdk-9+147 -c45db75bfe8bc20bb80b4a009ae3f69c9cd2d885 jdk-9+148 -5978df8bfa3894f2b3d07b7256f25f78dffb1f9c jdk-9+149 -f85154af719f99a3b4d81b67a8b4c18a650d10f9 jdk-9+150 -13c6906bfc861d99dc35a19c80b7a99f0b0ac58d jdk-9+151 -7e3da313b1746578da648155e37dd8526e83153d jdk-9+152 -1384504d2cd0e55c5e0becaeaf40ab05cae959d6 jdk-9+153 -0908877116d17c6e59092ec7d53ef687a96d3278 jdk-10+0 -7fa738305436d14c0926df0f04892890cacc766b jdk-9+154 -48fa77af153288b08ba794e1616a7b0685f3b67e jdk-9+155 -e930c373aaa4e0e712c9a25ba4b03d473b48c294 jdk-9+156 -b4257a40e55d5dea9fe27f7cc11c430531b7ad66 jdk-10+1 -412df235a8a229469a2cb9e7bb274d43277077d2 jdk-9+157 -60e670a65e07cc309951bd838b484401e6dd7847 jdk-9+158 -5695854e8831d0c088ab0ecf83b367ec16c9760a jdk-9+159 -fb8f2c8e15295120ff0f281dc057cfffb309e90e jdk-9+160 -51b63f1b8001a48a16805b43babc3af7b314d501 jdk-9+161 -d02b6fbcab06c59a5f5a4a6736bd4ec6d2567855 jdk-9+162 -92a38c75cd277d8b11f4382511a62087044659a1 jdk-9+163 -6dc790a4e8310c86712cfdf7561a9820818546e6 jdk-9+164 -55419603989707ec50c84bb379bbdc1adeec3ab2 jdk-9+165 -8d3febd5c9d82e49f3e6e5f8eb10f959e7b50f83 jdk-9+166 -fb8f87183981ae0ea7afdafec64763e2f1a88227 jdk-10+2 -97423b4995a216d3fb566dcc5825f3d54dcfe17f jdk-10+3 -1f64e853c72b269a3e45878515c07dad9c533592 jdk-10+4 -ac697b2bdf486ef18caad2092bd24036e14946ac jdk-10+5 -26ed5e84fa13b8dca066b01ece5bc029323611be jdk-10+6 -646567dcfa64b9a39b33d71330427737d1c1a0d5 jdk-9+167 -23a87f409371fb8ce7b764cccb3a74c3f6b29900 jdk-9+168 -5d9d2a65fb26aa183019346c11d9314819621665 jdk-9+169 -6e78f902f477a093afca85a1042f97410d01eb69 jdk-9+170 -09cae4c36242734f5450de739b8264523a030809 jdk-10+7 -856998840907b67b7e1fc49259f785ac085a189b jdk-10+8 -3c75f07b2a49cb0a4f4eb5df8bbcbc64dda3153f jdk-10+9 -c27321c889cf4c8e465a61b84572c00ef7ee6004 jdk-9+171 -bd4b2c8835f35760a51c1475b03a16cc20c62973 jdk-10+10 -eedb6e54c8bd6197ecba5fc0d8568bac8ae852dd jdk-9+172 -95bab8bf9201ae8bfdf28e164bf33b78e49477e7 jdk-10+11 -9788347e0629d0cb3a0e55a903494ff741d4fa15 jdk-9+173 -b9c0b105002272d7414c8b34af9aded151f9cad6 jdk-9+174 -ff293e39e83366c40a5687dacd1ccb2305ed2c1e jdk-10+12 -736412a8dccee9d439044e6b1af2e7470d0a3563 jdk-9+175 -5d374af9e78d02976e0e7f8dc2706f91a020f025 jdk-10+13 -4d05f673cf773f1c20e8f5a879d64115d2f741d9 jdk-10+14 -38cf34e2328070cc691c4f136e6dde1a44c04171 jdk-9+176 -332ad9f92632f56f337b8c40edef9a95a42b26bc jdk-9+177 -02a876781a3a6193140591d92db7b95ca743eac2 jdk-10+15 -d109d55cf642bf2b438624e81f94c18c168f9178 jdk-10+16 -0983b2dbe17ba4fed3af34e0512ca77a9845fe8a jdk-9+178 -87243a3131f79e8b3903eaca6b629abc48f08ace jdk-9+179 -97d6f14334cfd766f57c296a5a707c8a709aeff0 jdk-10+17 -7ba7ebbc304a4817e05b72efa6b45ed635839b98 jdk-10+18 -f5789425c26cee0274d0e2ebabb21faf268f218f jdk-10+19 -9934a03646f91ce55f61f53d8448c629828f8088 jdk-9+180 -ea18d767c9ec50ea7f40bbe6cf7379d3538110f1 jdk-9+181 -f7d596aa57aece4e5f473b1ac97e26cd0aebc647 jdk-10+20 -dcd49f380d7504a49769c26d7bd756623cb9b828 jdk-10+21 -47872600e78b509a15490fe009986d4969794f56 jdk-10+22 diff --git a/jaxp/.jcheck/conf b/jaxp/.jcheck/conf deleted file mode 100644 index ad4189d7de5..00000000000 --- a/jaxp/.jcheck/conf +++ /dev/null @@ -1,2 +0,0 @@ -project=jdk10 -bugids=dup diff --git a/jaxp/ASSEMBLY_EXCEPTION b/jaxp/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d90239..00000000000 --- a/jaxp/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jaxp/LICENSE b/jaxp/LICENSE deleted file mode 100644 index 8b400c7ab81..00000000000 --- a/jaxp/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jaxp/TRADEMARK b/jaxp/TRADEMARK deleted file mode 100644 index 6587bafba88..00000000000 --- a/jaxp/TRADEMARK +++ /dev/null @@ -1,41 +0,0 @@ -OpenJDK Trademark Notice -Version 1.1, 2008/3/10 - -OpenJDK (the "Name") is a trademark of Sun Microsystems, Inc. (the "Owner"). -Owner permits any person obtaining a copy of this software (the "Software") -which is based on original software retrieved from one of the following -websites: http://download.java.net/openjdk, http://hg.openjdk.java.net/jdk6, -or http://openjdk.java.net (each a "Website", with the original software made -available by the Owner on a Website being known as the "Website Software") to -use the Name in package names and version strings of the Software subject to -the following conditions: - - - The Software is a substantially complete implementation of the OpenJDK - development kit or runtime environment code made available by Owner on a - Website, and the vast majority of the Software code is identical to the - upstream Website Software; - - - No permission is hereby granted to use the Name in any other manner, - unless such use constitutes "fair use." - - - The Owner makes no warranties of any kind respecting the Name and all - representations and warranties, including any implied warranty of - merchantability, fitness for a particular purpose or non-infringement - are hereby disclaimed; and - - - This notice and the following legend are included in all copies of the - Software or portions of it: - - OpenJDK is a trademark or registered trademark of Sun Microsystems, - Inc. in the United States and other countries. - -The Name may also be used in connection with descriptions of the Software that -constitute "fair use," such as "derived from the OpenJDK code base" or "based -on the OpenJDK source code." - -Owner intends to revise this Notice as necessary in order to meet the needs of -the OpenJDK Community. Please send questions or comments about this Notice to -Sun Microsystems at openjdk-tm@sun.com. Revisions to this Notice will be -announced on the public mailing list announce@openjdk.java.net, to which you -may subscribe by visiting http://mail.openjdk.java.net. The latest version of -this Notice may be found at http://openjdk.java.net/legal. diff --git a/jaxp/build.properties b/jaxp/build.properties deleted file mode 100644 index 9240acc57f8..00000000000 --- a/jaxp/build.properties +++ /dev/null @@ -1,92 +0,0 @@ -# -# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# This is the JDK used to build and run the bootstrap version of javac. -# The bootstrap javac is used to compile both boostrap versions of the -# other tools, and product versions of all the tools. -# Override this path as needed, either on the command line or in -# one of the standard user build.properties files (see build.xml) -javac.jar=${bootstrap.dir}/lib/javac.jar - -# The tools.jar is needed in the classpath to compile these sources -jdk.home=${java.home}/.. -tools.jar=${jdk.home}/lib/tools.jar - -# options for the tasks used to compile the tools -javac.source = 7 -javac.target = 7 -javac.debug = true -javac.no.jdk.warnings = -XDignore.symbol.file=true -# set the following to -version to verify the versions of javac being used -javac.version.opt = -# in time, there should be no exceptions to -Xlint:all -#javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -javac.lint.opts= - -# JVM memory size -javac.memoryInitialSize = 256m -javac.memoryMaximumSize = 512m - -#------------------------------------------------------------ - -# Root of output directories -output.dir=. - -# Built files -build.dir=${output.dir}/build -build.classes.dir=${build.dir}/classes - -# Distributed results -dist.dir=${output.dir}/dist -dist.lib.dir=${dist.dir}/lib -dist.classes.jar=${dist.lib.dir}/classes.jar -dist.src.zip=${dist.lib.dir}/src.zip - -# Sanity information -sanity.info= Sanity Settings:${line.separator}\ - ant.home=${ant.home}${line.separator}\ - ant.version=${ant.version}${line.separator}\ - ant.java.version=${ant.java.version}${line.separator}\ - java.home=${java.home}${line.separator}\ - java.version=${java.version}${line.separator}\ - os.name=${os.name}${line.separator}\ - os.arch=${os.arch}${line.separator}\ - os.version=${os.version}${line.separator}\ - bootstrap.dir=${bootstrap.dir}${line.separator}\ - javac.jar=${javac.jar}${line.separator}\ - javac.memoryInitialSize=${javac.memoryInitialSize}${line.separator}\ - javac.memoryMaximumSize=${javac.memoryMaximumSize}${line.separator}\ - javac.source=${javac.source}${line.separator}\ - javac.debug=${javac.debug}${line.separator}\ - javac.target=${javac.target}${line.separator}\ - javac.version.opt=${javac.version.opt}${line.separator}\ - javac.lint.opts=${javac.lint.opts}${line.separator}\ - javac.no.jdk.warnings=${javac.no.jdk.warnings}${line.separator}\ - output.dir=${output.dir}${line.separator}\ - build.dir=${build.dir}${line.separator}\ - dist.dir=${dist.dir}${line.separator}\ -${line.separator} - -#------------------------------------------------------------ diff --git a/jaxp/build.xml b/jaxp/build.xml deleted file mode 100644 index 72cdca25ce7..00000000000 --- a/jaxp/build.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - Ant build script for the ${ant.project.name} part of the jdk. - - Input Properties: (see build.properties for the ant defaults) - bootstrap.dir - dir with lib/javac.jar, added to javac bootclasspath - javac.debug - true or false for debug classfiles - javac.target - classfile version target - javac.source - source version - - Run 'make help' for help using the Makefile. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Unofficial Javadoc generated from developer sources for preview purposes only]]>
- - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jaxp/nbproject/findbugs.settings b/jaxp/nbproject/findbugs.settings deleted file mode 100644 index a5d76311443..00000000000 --- a/jaxp/nbproject/findbugs.settings +++ /dev/null @@ -1,72 +0,0 @@ -#FindBugs User Preferences -#Tue Jun 30 18:33:11 PDT 2009 -detectorAbnormalFinallyBlockReturn=AbnormalFinallyBlockReturn|false -detectorAbstractClassEmptyMethods=AbstractClassEmptyMethods|false -detectorAbstractOverriddenMethod=AbstractOverriddenMethod|false -detectorArrayBasedCollections=ArrayBasedCollections|false -detectorArrayWrappedCallByReference=ArrayWrappedCallByReference|false -detectorBloatedAssignmentScope=BloatedAssignmentScope|false -detectorBloatedSynchronizedBlock=BloatedSynchronizedBlock|false -detectorClassEnvy=ClassEnvy|false -detectorCollectStatistics=CollectStatistics|false -detectorConfusingAutoboxedOverloading=ConfusingAutoboxedOverloading|false -detectorConstantListIndex=ConstantListIndex|false -detectorCopiedOverriddenMethod=CopiedOverriddenMethod|false -detectorCustomBuiltXML=CustomBuiltXML|false -detectorCyclomaticComplexity=CyclomaticComplexity|false -detectorDateComparison=DateComparison|false -detectorDeclaredRuntimeException=DeclaredRuntimeException|false -detectorDeletingWhileIterating=DeletingWhileIterating|false -detectorDubiousListCollection=DubiousListCollection|false -detectorFieldCouldBeLocal=FieldCouldBeLocal|false -detectorFinalParameters=FinalParameters|false -detectorFloatingPointLoops=FloatingPointLoops|false -detectorInefficientStringBuffering=InefficientStringBuffering|false -detectorInheritanceTypeChecking=InheritanceTypeChecking|false -detectorJDBCVendorReliance=JDBCVendorReliance|false -detectorListIndexedIterating=ListIndexedIterating|false -detectorLiteralStringComparison=LiteralStringComparison|false -detectorLocalSynchronizedCollection=LocalSynchronizedCollection|false -detectorLostExceptionStackTrace=LostExceptionStackTrace|false -detectorManualArrayCopy=ManualArrayCopy|false -detectorMethodReturnsConstant=MethodReturnsConstant|false -detectorNeedlessAutoboxing=NeedlessAutoboxing|false -detectorNeedlessCustomSerialization=NeedlessCustomSerialization|false -detectorNeedlessInstanceRetrieval=NeedlessInstanceRetrieval|false -detectorNeedlessMemberCollectionSynchronization=NeedlessMemberCollectionSynchronization|false -detectorNonCollectionMethodUse=NonCollectionMethodUse|false -detectorNonOwnedSynchronization=NonOwnedSynchronization|false -detectorNonRecycleableTaglibs=NonRecycleableTaglibs|false -detectorOrphanedDOMNode=OrphanedDOMNode|false -detectorOverlyConcreteParameter=OverlyConcreteParameter|false -detectorParallelLists=ParallelLists|false -detectorPartiallyConstructedObjectAccess=PartiallyConstructedObjectAccess|false -detectorPossibleIncompleteSerialization=PossibleIncompleteSerialization|false -detectorPossibleMemoryBloat=PossibleMemoryBloat|false -detectorPossiblyRedundantMethodCalls=PossiblyRedundantMethodCalls|false -detectorSQLInLoop=SQLInLoop|false -detectorSection508Compliance=Section508Compliance|false -detectorSillynessPotPourri=SillynessPotPourri|false -detectorSloppyClassReflection=SloppyClassReflection|false -detectorSluggishGui=SluggishGui|false -detectorSpoiledChildInterfaceImplementor=SpoiledChildInterfaceImplementor|false -detectorSpuriousThreadStates=SpuriousThreadStates|false -detectorStaticArrayCreatedInMethod=StaticArrayCreatedInMethod|false -detectorStaticMethodInstanceInvocation=StaticMethodInstanceInvocation|false -detectorSuspiciousComparatorReturnValues=SuspiciousComparatorReturnValues|false -detectorSuspiciousJDKVersionUse=SuspiciousJDKVersionUse|false -detectorSuspiciousWaitOnConcurrentObject=SuspiciousWaitOnConcurrentObject|false -detectorSyncCollectionIterators=SyncCollectionIterators|false -detectorTailRecursion=TailRecursion|false -detectorUnnecessaryStoreBeforeReturn=UnnecessaryStoreBeforeReturn|false -detectorUnrelatedCollectionContents=UnrelatedCollectionContents|false -detectorUnrelatedReturnValues=UnrelatedReturnValues|false -detectorUseAddAll=UseAddAll|false -detectorUseCharacterParameterizedMethod=UseCharacterParameterizedMethod|false -detectorUseEnumCollections=UseEnumCollections|false -detectorUseSplit=UseSplit|false -detectorUseToArray=UseToArray|false -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false -filter_settings_neg=| diff --git a/jaxp/nbproject/project.xml b/jaxp/nbproject/project.xml deleted file mode 100644 index 4d3322cafcb..00000000000 --- a/jaxp/nbproject/project.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - org.netbeans.modules.ant.freeform - - - jaxp - - - - jaxp - - - - - . - UTF-8 - - - - java - src - UTF-8 - - - - - build - - - clean - - - clean - build - - - javadoc-nb - - - - - - - src - - - build.xml - - - - - - - - - - - - - - src - - - - - - - diff --git a/jaxws/.hgignore b/jaxws/.hgignore deleted file mode 100644 index 00a3c015497..00000000000 --- a/jaxws/.hgignore +++ /dev/null @@ -1,7 +0,0 @@ -^build/ -^dist/ -^drop/ -^drop_included/ -^webrev -/nbproject/private/ -.DS_Store diff --git a/jaxws/.hgtags b/jaxws/.hgtags deleted file mode 100644 index c7ac5114de7..00000000000 --- a/jaxws/.hgtags +++ /dev/null @@ -1,452 +0,0 @@ -0961a4a211765fea071b8dac419003ee0c3d5973 jdk7-b24 -59fd8224ba2da5c2d8d4c68e33cf33ab41ce8de0 jdk7-b25 -debd37e1a422e580edb086c95d6e89199133a39c jdk7-b26 -27d8f42862c11b4ddc4af2dd2d2a3cd86cda04c2 jdk7-b27 -eefcd5204500a11d6aa802dca9f961cf10ab64c2 jdk7-b28 -836c55713abab186e4de0c6eabd06ff008c7b8d0 jdk7-b29 -7f2466f8cc7009702e548d1a763254f546024d7e jdk7-b30 -f978623825364a2ad9c6f51d02fc9424a8b0bc86 jdk7-b31 -e6daca2eced9d84b01255cabcfcc49164c26405e jdk7-b32 -6dcbcfb9551aaa2a80906c28ab48c9a8564e0e64 jdk7-b33 -7a9f629cd957e3169a1a769f763fe060d078785c jdk7-b34 -b0f01c2508b690dd225298edfec70b5e8b8dc367 jdk7-b35 -f60187f44a0d62906a5e2f6bd0989b5b24c1ca1e jdk7-b36 -a2a6f9edf761934faf59ea60d7fe7178371302cd jdk7-b37 -9ce439969184c753a9ba3caf8ed277b05230f2e5 jdk7-b38 -077bc9b1b035a409a76bd5366f73ed9dd9846934 jdk7-b39 -70a6ac6dd737fe45c2fadb57646195b2b4fe269d jdk7-b40 -a8379d24aa03386610169cb0f4e4b8ed266a2e8d jdk7-b41 -621c02d83abc850c170fb6726d57b19f1eaf5033 jdk7-b42 -1ad2f51564db6ca4c6d95760cf13fb083d3dec94 jdk7-b43 -344485a03674b6950a7a23d01a6efb8055afb6ec jdk7-b44 -dea7753d713936c5b6fd942a91811b0676537fd0 jdk7-b45 -af4a3eeb7812a5d09a241c50b51b3c648a9d45c1 jdk7-b46 -223011570edbd49bb0fe51cdeb2089f95d305267 jdk7-b47 -01e5dd31d0c10a2db3d50db346905d2d3db45e88 jdk7-b48 -18ca864890f3d4ed942ecbffb78c936a57759921 jdk7-b49 -5be52db581f1ea91ab6e0eb34ba7f439125bfb16 jdk7-b50 -41a66a42791ba90bff489af72cbfea71be9b40a5 jdk7-b51 -e646890d18b770f625f14ed4ad5c50554d8d3d8b jdk7-b52 -b250218eb2e534384667ec73e3713e684667fd4c jdk7-b53 -50ea00dc5f143fe00025233e704903c37f8464aa jdk7-b54 -e0eebd978b830c09e7862cff3f77a914c15651c9 jdk7-b55 -0f7fbf85f7a1d9c027a863b9955c623352ed1292 jdk7-b56 -68257a5eb19afc11aee7eb19f7250f9b9eec7c05 jdk7-b57 -5fb4fbea81c3609916da00417fdd15dbd9e39e97 jdk7-b58 -f64566bf4c2bc92e65ab2b9fab51b119f0d493d1 jdk7-b59 -3b054db3e277ca224fe6576c59ed6f4ab5ed0bb5 jdk7-b60 -aeabf802f2a1ca72b87d7397c5ece58058e000a9 jdk7-b61 -75c801c13ea1ddebc58b1a8c8da9318d72750e62 jdk7-b62 -b8a6e883c0a6708f6d818815040525d472262495 jdk7-b63 -aaa25dfd3de68c6f1a1d3ef8c45fd99f76bca6dd jdk7-b64 -aa22a1be5866a6608ba17a7a443945559409ae0f jdk7-b65 -fa8712c099edd5c9a6b3ed9729353738004d388f jdk7-b66 -faa13cd4d6cdcfb155da5ed23b0da6e0ed0f9ea8 jdk7-b67 -845fa487f0f72a9f232ead8315c0087a477a5a31 jdk7-b68 -3e64fdfb92910e164d1f4b21b147719d5c674254 jdk7-b69 -dd3c5f3ec28d5d5e5c0dc3229fdd52d85d04274d jdk7-b70 -03314cf56a7212bbb6c186dbc9f15aca988a48ec jdk7-b71 -4c990aa99bc037fd81dd1b1b269690e9bea8a0b4 jdk7-b72 -558985e26fe16f5a6ebb2edb9180a42e1c8e8202 jdk7-b73 -f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74 -fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75 -765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76 -5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77 -fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78 -c08894f5b6e594b9b12993e256b96c1b38099632 jdk7-b79 -447767dee56a0f8cb89acc8bf7be5f9be7d84e8b jdk7-b80 -f051045fe94a48fae1097f90cbd9227e6aae6b7e jdk7-b81 -31573ae8eed15a6c170f3f0d1abd0b9109c0e086 jdk7-b82 -371e3ded591d09112a9f231e37cb072781c486ac jdk7-b83 -8bc02839eee4ef02cd1b50e87638874368a26535 jdk7-b84 -8424512588ff95362c1f1e5f11c6efd4e7f7db6e jdk7-b85 -512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86 -3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87 -8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88 -bf3675aa7f20fc6f241ce95760005aef2a30ff41 jdk7-b89 -ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90 -cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91 -df7c033f6a11c0973ab0e74701b1248aee9b659f jdk7-b92 -797bef19197566ffb056edaa1b34db43bd9bf7b0 jdk7-b93 -8515e093efd14ac054e941ef743f76561a393a70 jdk7-b94 -ee06cfb113d554b5c8a9a53383bae2b168533829 jdk7-b95 -208fd4451232f7a522ddb20334c598656844ccb7 jdk7-b96 -dac23846092ad4956ed41b5278f8686476ae46ef jdk7-b97 -4571098071094e705e680db5324bfa15a57b1290 jdk7-b98 -818366ce23d8919cafaa4db4c51605ee2a7c8eaf jdk7-b99 -bd26d0ce0c3cb43e58a8e2770cc03f26d96ffe5c jdk7-b100 -b55ce274490082712f5e002b38d2eed505ca863d jdk7-b101 -d8580443d1815d68e0035a0560634e50fa899288 jdk7-b102 -267386d6b923f724309cab855a555e2d86a15c8f jdk7-b103 -bbc4cce6c20aeca4862804a6e8315a2350d43633 jdk7-b104 -39eb4f3031f4a985664cace00fca3bd1eab1e0aa jdk7-b105 -bc45ccc5bcca6cbe4ea433e279d4a93b06ab38c6 jdk7-b106 -017612ea6af417a5e378619704da01bb3a583bdb jdk7-b107 -b1ca39340238a239ba6d8489ad5315215e1366ca jdk7-b108 -4f626e0d70bda68c76bbd0e89d2bc2407f979736 jdk7-b109 -95ecac35fb11530752bd0404c9bf02bcfb30990e jdk7-b110 -2575ebca96c7fb1b78f6ae025a97321210aba309 jdk7-b111 -8e0f0054817f0f73fb33e80fb1333fb45b1d513d jdk7-b112 -d35c94fd22362f478f75b4bfcd2bef6a83cb9b3f jdk7-b113 -400f494c81c5ec87714b705648afbb3cb680bf73 jdk7-b114 -824cc44bd6eba9abae07cc420f7fe3926c1adbd9 jdk7-b115 -376ac153078dd3b5f6d4a0981feee092c1492c96 jdk7-b116 -1320fb3bb588298c79716bd2d10b5b4afacb9370 jdk7-b117 -19a2fab3f91a275f90791c15d1c21a24e820ff2d jdk7-b118 -41fa02b3663795ddf529690df7aa6714210093ec jdk7-b119 -a4f2e1ca67163ef79555082809d7cd719893c338 jdk7-b120 -0fa950117faac7bdbc94e6c46b88f6f892031c17 jdk7-b121 -17b6c48a344968880925dcef1178fec282feb335 jdk7-b122 -5a8e43bcce56b7cd5576419067a929b74575ae71 jdk7-b123 -86f60e5b3975840968f3147ddce047a27a9fc83e jdk7-b124 -d72eea121c3bc2b649272a37b80d9417855b7146 jdk7-b125 -6d772c5119d5e247bc98a57ce8b1be121554ee0a jdk7-b126 -ef19f173578c804772d586a959fa3ab8a12c0598 jdk7-b127 -88d74afc55938033e744b537a22714bb2c82c9c0 jdk7-b128 -0f7b39ad902424e949e3d2dca8411b884888a76f jdk7-b129 -ba1fac1c2083196422a12130db174334179a4d44 jdk7-b130 -438abc0356cd97d91b25f67cd1abc9883e22f6ed jdk7-b131 -0e57c3272d377eee04cc32c898e9a558051516b0 jdk7-b132 -359d0c8c00a02d3a094c19f8a485b2217c99a4e0 jdk7-b133 -545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134 -d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135 -c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136 -ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137 -cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138 -c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139 -82a9022c4f21b1313023c8303b557a17c4106701 jdk7-b140 -66826b0aec5a1834da3821c35cf85ac154e9b04d jdk7-b141 -0ef3ef823c39eee3d670e58027c3219cb66f0283 jdk7-b142 -569d1e7ea980d172046c4aba79d96b5c3afabbba jdk7-b143 -6bd683f2d527c9afd47beac1cbf614506929598d jdk7-b144 -42bfba80beb7d3260b7b135b9a39202b512eb8c2 jdk7-b145 -05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 -d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147 -64df57a1edeca74388bd62f0a87d056db981fbdf jdk8-b01 -1034127ed402e9d0f1ed1477238ef594e9cc8da6 jdk8-b02 -7dcb0307508f408507d878cd7c2048c102b15158 jdk8-b03 -3f6f08163331ed75b30a6de1246670ce655645c8 jdk8-b04 -7d5d91fddbceb1fc3ae7ff409e732ae4a0391b34 jdk8-b05 -acffff22a9465005e8eb206224fae9f2ea4fd469 jdk8-b06 -134b0debf7b04fe6e317394b04b8e7a4a0181b1b jdk8-b07 -1c9d4f59acf8f71477473c170239b43b2c9dee24 jdk8-b08 -70172e57cf29efe271b068987eefb601c2a77780 jdk8-b09 -8e7fdc8e3c758644ca6d0fd70bb255e9d2e64cda jdk8-b10 -a12ab897a249feb7859a6e6cd84b49411f4c06ac jdk8-b11 -e6eed2ff5d5f62bdc815beb5276d23347600c760 jdk8-b12 -adf2a6b5fde14090beb9ebc40c4114132ddee731 jdk8-b13 -54c4bf4b83ecc191351747d5d28da849d34c0243 jdk8-b14 -c9ab96ff23d52d85d5dcce1f9c0fd7a3de418c74 jdk8-b15 -3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b17 -3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b16 -54928c8850f5498670dd43d6c9299f36de1a6746 jdk8-b18 -b73b733214aa43648d69a2da51e6b48fda902a2d jdk8-b19 -2b2818e3386f4510c390f6aea90d77e1c6a5bf9e jdk8-b20 -c266cab0e3fff05f2048c23046c14d60f7102175 jdk8-b21 -8d3df89b0f2d3c603b2edb0f5e24af1245397cc6 jdk8-b22 -25ce7a0004874273f6aeda14e7c3538cba34bdf1 jdk8-b23 -e0d90803439b174fe0b0033e09d50444ba12498f jdk8-b24 -b376d901e006cd9e0c59733c84e190aace23eec6 jdk8-b25 -3518639eab6ce5c7b482bdb0a60342c392ab97a8 jdk8-b26 -38c037af4127289de12efc67f45d19bb67abff69 jdk8-b27 -88b85470e72ce48515c802d2158f61cad198b935 jdk8-b28 -4897d9d2d04838e3479745efa238a99bacd939c9 jdk8-b29 -6882b10e85d6f6ba110dbb50926d6fe2222cc7ad jdk8-b30 -4c41c6d0e15de3b56919a5ba0a0f248a2d07f2b2 jdk8-b31 -017a7dbfaa92f5a8b144e6c890d1cebdaecaf681 jdk8-b32 -ea80b2388dce711fbde8e4fd6e07c2c64ad16743 jdk8-b33 -f1d020a49c8c33667fb10c8caa255206a78a3675 jdk8-b34 -e8afc16522e190cb93c66bcb15d6fba0fe9e6833 jdk8-b35 -89b36c658e39f0a2957be55453a3a3befd9c8a6b jdk8-b36 -b05a948db1b6c933c980f24e4dc8fd897b7cf4ef jdk8-b37 -ac1ba3b56775e3cdcd91b7a48793b59f6a3c18b5 jdk8-b38 -7f6b44fd303478caa83575dbc225de187c509c50 jdk8-b39 -09a0ddda03cb36deb6ee9edf789da12aa4674c6b jdk8-b40 -f2072b164b0519227833a2994f78e3988ee67827 jdk8-b41 -1f20f37818a91b66eaeba268d0b785718598ee0e jdk8-b42 -f00c12994562c2f68d348a7c3e829374a89294e2 jdk8-b43 -f6a417540ef124c9b4123d07da5e26f2ab909949 jdk8-b44 -e80ac58b5ba904f24e125c742c30d0d740f05f86 jdk8-b45 -ae368a83c2404b65c9e38c65e2aa081f2201ca74 jdk8-b46 -fe6a060afc404dcf0921708a740de770666b781f jdk8-b47 -efb564de8a8ee397a65fab77d45cb20200f6ddd8 jdk8-b48 -b48865af8ac559ba6f60fb86fa3fe0ebdd22746c jdk8-b49 -bdab72e87b83bcccf3abe6eaaa4cdc7b1cd2d92b jdk8-b50 -1a70b6333ebe12e1c6dbca30e58bc1ba894ab898 jdk8-b51 -f62bc618122e87a8bea69865cc02074e9d850426 jdk8-b52 -8a35fd644d3c0b75813ff0236adef8a1c6f895c6 jdk8-b53 -91970935926a20f19a5cbbf20931745ac1975e91 jdk8-b54 -109c9e1f2d8546e9954e1b7be9a37a4396434544 jdk8-b55 -7813455ccdb08c3ee6051161176821325a5d44d7 jdk8-b56 -b51b611209f159f94dd2ce3dc2c56daa6d6ac1df jdk8-b57 -cac4c393706343df778a13dc6c84cad0f8c237c9 jdk8-b58 -ae107401be116f9e384d3a23192f543828e03da5 jdk8-b59 -5c5a65ad5291b7cefcdc308f627cf2b195cf2b69 jdk8-b60 -97e5e74e2a341d9142ce28043912a3c255e28e03 jdk8-b61 -d265b9b4c0f55c23a1c9fda02a8052fd9df2eec5 jdk8-b62 -86989f702267debe16d13720d5ae7ae9839796f4 jdk8-b63 -5ded18a14bcc80b2a253f2b84da0073a0ecac665 jdk8-b64 -fbe54291c9d337ea4dfef4d846f1d9a22f76249c jdk8-b65 -3eb7f11cb4e000555c1b6f0f1a10fe2919633c8e jdk8-b66 -eb06aa51dfc225614dba2d89ae7ca6cedddff982 jdk8-b67 -d3fe408f3a9ad250bc9a4e9365bdfc3f28c1d3f4 jdk8-b68 -756323c990115a9c0341d67b10f2d52c6370e35d jdk8-b69 -3b1c2733d47ee9f8c530925df4041c59f9ee5a31 jdk8-b70 -f577a39c9fb3d5820248c13c2cc74a192a9313e0 jdk8-b71 -d9707230294d54e695e745a90de6112909100f12 jdk8-b72 -c606f644a5d9118c14b5822738bf23c300f14f24 jdk8-b73 -12db3c5a3393b03eeb09ff26f418c4420c21aaab jdk8-b74 -966bf9f3c41a59ff5d86ff4275291c52f329f984 jdk8-b75 -c4853f3f0e89ac60aa5b517f5f224f0f60e08577 jdk8-b76 -64dfba1bad16433f609f17a42c3c5990367c5c0b jdk8-b77 -391de4c992d1960a09cdd340362ff936bac69323 jdk8-b78 -70d8658d2a3063bc13127f3452af017d838f1362 jdk8-b79 -b0224010e2f0c2474055ac592c8d3f37b9264690 jdk8-b80 -c88bb21560ccf1a9e6d2a2ba08ed2045a002676f jdk8-b81 -d8d8032d02d77fbf5f9b3bb8df73663f42fd4dd0 jdk8-b82 -a1dcc0d83da1e07f3ada60ef110dd105d95d3554 jdk8-b83 -5773e3fc83803f392234ba54c3a437ba176f1ead jdk8-b84 -8c0b6bccfe474576d6b30d1582c4329029330150 jdk8-b85 -a5e7c2f093c9996ab3419db1565094a07b059e9c jdk8-b86 -72e03566f0a61282cc48ebc869803b256cccd66c jdk8-b87 -24fa5452e5d4e9df8b85196283275a6ca4b4adb4 jdk8-b88 -88838e08e4ef6a254867c8126070a1975683108d jdk8-b89 -3e5b9ea5ac35ea7096da484e24a863cf4552179f jdk8-b90 -0bb1a9fa56b037d072efdaae5f5b73a0f23c966c jdk8-b91 -a0f604766ca14818e2a7b1558cc399499caabf75 jdk8-b92 -7386eca865e1f7216637cdf8dcf3f5d5c255f208 jdk8-b93 -254c53fd97ab24942043adcfa5c1a0a38a3b274e jdk8-b94 -1468c94135f978dd29d03bce2f7d7e952154d144 jdk8-b95 -690d34b326bc78a6f5f225522695b41c7f7f70e8 jdk8-b96 -dcde7f049111353ad23175f54985a4f6bfea720c jdk8-b97 -b1fb4612a2caea52b5661b87509e560fa044b194 jdk8-b98 -8ef83d4b23c933935e28f59b282cea920b1b1f5f jdk8-b99 -4fd722afae5c02f00bbd44c3a34425ee474afb1c jdk8-b100 -60b623a361642a0f5aef5f06dad9e5f279b9d9a9 jdk8-b101 -988a5f2ac559dcab05698b8a8633aa453e012260 jdk8-b102 -6cdc6ed987801c175a1217d0d3e53c3bd69ba52e jdk8-b103 -42211ab0ab1cca51a050d184634cf1db7ef81fbf jdk8-b104 -88390df7ed2cf128298a02c5e6d978f0a603cd58 jdk8-b105 -6908370afe834ff01739e8ec992d4246c74b7e6e jdk8-b106 -e3c9328f75638289a342ce15fbe532f05078946e jdk8-b107 -d1ea68556fd7925a3c7078dd9f77c6ca73d5aa9e jdk8-b108 -df5d4d01642572e77fd3c01e4c8703ed3f6eec87 jdk8-b109 -cc682329886be2fc26220fc30597ee4e5bba43ed jdk8-b110 -32edc7a2c86696dfcbdb6ffae641ff153f8e34bd jdk8-b111 -dbdd5c76250928582cb5342bcf7b299a6007d538 jdk8-b112 -9261f342aa73a79bbd1a817ae72fa72b15ef30bc jdk8-b113 -9ad289610fc6effe9076280b7920d0f16470709f jdk8-b114 -e126d8eca69b83a1cc159c2375b7c33140346d2b jdk8-b115 -587560c222a2476066852224ed02d39b5090a299 jdk8-b116 -fe56ba456fd32758c72db629938d69067468d89c jdk8-b117 -76a598cf50c4e1dc1fc8adc08b451943aa1a3179 jdk8-b118 -172b8e056ff259044ca48c5425d643dc8e2e05c8 jdk8-b119 -6c152deb600d8a11bc46149ace317b1c9fce1482 jdk8-b120 -32050ab53c8a8e4cb09f04b88db78258a480fb61 jdk8-b121 -bc622ba563f9316f981c11c3a260f4c3fdc5ef07 jdk8-b122 -91f5c542ccad330efc0d281362dd6f33f2039746 jdk8-b123 -32050ab53c8a8e4cb09f04b88db78258a480fb61 jdk9-b00 -9c9fabbcd3d526d7ca29165169155f49a107533a jdk9-b01 -efe2bc258c78af49de9517a4a5699d3a2e630c44 jdk9-b02 -1cd9786257ed4f82a3371fd606b162e5bb6fcd81 jdk9-b03 -da44a8bdf1f3fdd518e7d785d60cc1b15983b176 jdk9-b04 -eae966c8133fec0a8bf9e16d1274a4ede3c0fb52 jdk9-b05 -cf0a6e41670f990414cd337000ad5f3bd1908073 jdk9-b06 -856a9132f506cafe2f251c1a16a0b14e4d16048d jdk9-b07 -2d9f4166e0be68aa43c5f4fd0f8d34768e11f652 jdk9-b08 -c9e8bb8c1144a966ca7b481142c6b5e55d14a29c jdk9-b09 -9af43f4d215f6f19b1767f6ac66da931b8ee9535 jdk9-b10 -1f953ba7db2b535e19f0354abfee6d67605e0684 jdk9-b11 -779f8b21c75f83e3918dac8499e4d0ecb3a54ed7 jdk9-b12 -3d42204854c9f703e3ccdc8891248e73057713ab jdk9-b13 -02e58850b7062825308413d420f2b02c1f25a724 jdk9-b14 -e9780330017a6b464a385356d77e5136f9de8d09 jdk9-b15 -1e1a3b2215b7551d88e89d1ca8c1e1ebe3d3c0ab jdk9-b16 -6b159e727dac283f424b7d19f5be3ddd9f85acf5 jdk9-b17 -275f2385aed80c84297840638d58656366350c58 jdk9-b18 -7f922a73e8a2c6ce42634238090fce7c6d599541 jdk9-b19 -6a9f8ff45c04a172df446a418c586da6a86564d5 jdk9-b20 -4a099451fd7e17b6cc4772fe9547907576a45b6f jdk9-b21 -7f5e5902cde75fd9335c52f469491f061fe0239e jdk9-b22 -ce19e0403ec8a80223cc47320c905b2a4d45881d jdk9-b23 -0b35542d6bf32af23a9fc59a37c52aa091fee388 jdk9-b24 -ab8726a0fcde897e4cfd1ea581ed90b0d8a7cbb7 jdk9-b25 -9b43f3993b96c2213428e95127a2d3fd0e709d3a jdk9-b26 -dcaa586ab756420e9a62643793bacef2c84bf637 jdk9-b27 -5282a14f131f897cc9575872c0fae72d47dc4e65 jdk9-b28 -3d1a4bfb6abbf5011ba6d8896301ee3b6ef3ba72 jdk9-b29 -e58d3ea638c3824f01547596b2a98aa5f77c4a5c jdk9-b30 -7af228ae847f3c02aaafb7b01cdbb3bdc2e89e77 jdk9-b31 -838a2f693e51b869e7bc26a20afffdde1300394e jdk9-b32 -77a45995dd3b6e57805475ae3111ac6f7db7749e jdk9-b33 -28ea43d925f1e5250976097a2977dd3e66e11f0b jdk9-b34 -afe0c89e2edbdfb1a7ceff3d9b3ff46c4186202f jdk9-b35 -84803c3be7f79d29c7dc40749d7743675f64107a jdk9-b36 -90de6ecbff46386a3f9d6f7ca876e7aa6381f50a jdk9-b37 -dd4ba422dba858b1c3c4b38f49a3e514be4e2790 jdk9-b38 -381bad1174c7c27352bee604535332da4ee2c556 jdk9-b39 -5455969de31f3083bcfd779b7acc3ab758ecb308 jdk9-b40 -4f785187377fe4c7ff388a7026dd72fcccdcfe7a jdk9-b41 -301ddb4478fb36d1f025d14e7e48c2a434e9e6ff jdk9-b42 -edc13d27dc871be57d7ca77eef77e6d04972fee2 jdk9-b43 -2a03baa4d849818ff6d635f110c2813b12fc2326 jdk9-b44 -e529374fbe526dbd668e5e98fc047b42b3bc6d33 jdk9-b45 -64ca52b0bda8028636e4ccafbe1107befcdda47d jdk9-b46 -6c17d648d03e4bf4729c3645f8db55d34115e0b7 jdk9-b47 -33e7e699804892c0496adf60ad67cc12855aeb61 jdk9-b48 -435a49db1de0589acc86b2cc5fd61d546f94b56c jdk9-b49 -45a30e7ee623031a1532685512dd2c2d8e8fa0ad jdk9-b50 -bb9cf97a5ac6aa1aa2a1034676d64413071f58ea jdk9-b51 -1d1e7704eca9c77ebe6a8705d17ac568801f7a3b jdk9-b52 -b8fbe40efa97fe0753076ccc6dfc50747c7877d0 jdk9-b53 -83a0cf0e08788c33872e1fe3e87bf9a0d1e59eaa jdk9-b54 -ca481b0492c82cc38fa0e6b746305ed88c26b4fd jdk9-b55 -b4f913b48e699980bd11fe19cce134d0adb4c31c jdk9-b56 -17c4241395e97312bd75e7acd693ffcdd41ae993 jdk9-b57 -1e06b36bb396c0495e0774f1c6b0356d03847659 jdk9-b58 -8a9ebae410bc388668fc203e559b5407bde757eb jdk9-b59 -f31835b59035377a220efc5a248b90f090ee1689 jdk9-b60 -77f44848c44c003205490bf5ab88035233b65418 jdk9-b61 -cd0cf72b2cbf4adb778a02505fb065bb2292688c jdk9-b62 -b5c22d09b1c91dd49b006f38d8ba9c4397517ccc jdk9-b63 -df100399ed27d0eaa57c137ca99819a0fee66178 jdk9-b64 -45ef73bb85c12ec1b291835c1d40e342a454e3f0 jdk9-b65 -1232f4013417e4a9cd291096798d10f2e601d69d jdk9-b66 -c9785bc8ade98a16a050d7520b70c68363857e00 jdk9-b67 -b5878b03d1b2e105917d959fbfa3c57c22495803 jdk9-b68 -f5911c6155c29ac24b6f9068273207e5ebd3a3df jdk9-b69 -94084caa27a3c8a09a7510aef596ebd64e97c569 jdk9-b70 -61caeb7061bbf8cc74a767997e5d17cc00712629 jdk9-b71 -1d87054e2d2f405c114f0061b97cbf8214bddf0a jdk9-b72 -285939df908721cdb2b18a119638114306b8dca7 jdk9-b73 -6232472e51418757f7b2bf05332678ea78096e6b jdk9-b74 -086bcd5e4a531a350c84668c8dc019461588ee3d jdk9-b75 -55bb88306dc57d07f2c854803465f6d9a7eb4aba jdk9-b76 -bd6ece68cf8aca34c8d992569892060c82cfd3f1 jdk9-b77 -ac1748bab0743137574be3451307b6a6361719eb jdk9-b78 -42ae657e0e104fa7877996b8095f2e3ab1596118 jdk9-b79 -e9940bf1c8ddaa6f1f5f1813846b080f0ccaf50b jdk9-b80 -139338618c77d793ab8b550f06819ddb8381316f jdk9-b81 -52d9ad2536ba6c6f1cc5561c0a0ee2b4847fd62c jdk9-b82 -d7ee8157f4feced67924e421225c6f844079a03d jdk9-b83 -51729143f8fe038f52cf55720c4c1f89267f5948 jdk9-b84 -67b626ec730d2601d95ef036d06be34b37fa9ce6 jdk9-b85 -5289646179079394890a34a898a8ab70fcde0331 jdk9-b86 -f7dba191a38cfc29665b0d77174615a530803297 jdk9-b87 -f6425fec60abe3c096c5251be61e4621c817be80 jdk9-b88 -2d84c6f4cbbac5871b099e97f8f968d9de6b52bc jdk9-b89 -b3e45213d574618f6520fa6978e4a14ba577c2db jdk9-b90 -3b2a3cb658e41618bd152a7598d12e1f0c10e8f7 jdk9-b91 -fe772cbc64f4e0418c5bf694e9e7123f02e1808f jdk9-b92 -5e94fbbb7032b3bba8254ddb1af8fc45a4d1448b jdk9-b93 -e8d15c61400c1682a7873e053d7b39efde0b79be jdk9-b94 -3e03ddaaac6585fa27e91596eb2a9a31e10bdcc9 jdk-9+95 -b55cebc47555293cf9c2aefb3bf63c56e847ab19 jdk-9+96 -7293db4716ee25b814e14f738b9acfb85700e3fa jdk-9+97 -67c84077edc3db6b24998b35970b37c01aae985e jdk-9+98 -97b31ca0dd77483cf20ff99a033a455673639578 jdk-9+99 -d0a97e57d2336238edf6a4cd60aafe67deb7258d jdk-9+100 -3e99318616da903e0dc8f07f9f9203dc1bd49921 jdk-9+101 -0868b93587cc99df3a4f4d3817a1aa756bea60ab jdk-9+102 -eb5e005a17e50d7d8340daaf21a5c3c5ae358d68 jdk-9+103 -0f557aa096e2a5c9733d406d8cf0c2e6b1f8ca60 jdk-9+104 -45a666c58e4c7d07638878684ad09decb3229dc9 jdk-9+105 -c072c572d14948563ef5d86e1921699b3a2396ab jdk-9+106 -fafd694e801f0f5a7c737fb08630ced3ca8f772c jdk-9+107 -513eb2e432f64f85992442da9acdfcfbb36555d9 jdk-9+108 -4b0697e4ce8940b1599af274ff02296d7f59aded jdk-9+109 -0db939c930f332dfa275cedfc7cf223ff1221ea4 jdk-9+110 -4d5296e0920afe7ef8d4db1939b76f0d407a3812 jdk-9+111 -21274e7937bae291658d68143aca0e3ee9296db0 jdk-9+112 -e980062475c10d21137051045bf95ee229db9b27 jdk-9+113 -b314bb02182b9ca94708a91f312c377f5435f740 jdk-9+114 -4ff86e5489e4c0513dadfa69def8601c110ca5cd jdk-9+115 -529f0bf896e58525614d863e283ad155531941cb jdk-9+116 -58265b39fc74b932bda4d4f4649c530a89f55c4e jdk-9+117 -6ba73d04589ccc0705a5d8ae5111b63632b6ad20 jdk-9+118 -331a825f849afd2e5126c93c88e55bd9ef0c6b8f jdk-9+119 -ecd0d6a71c7ccf93584ba4dacdd4fa8455efd741 jdk-9+120 -fb771fa3a986ccfcb00d743b1956b98c380d1dd8 jdk-9+121 -342705d785ffd9e999991a3d4baae2eca58ea7c3 jdk-9+122 -c42decd28bbfa817347112ed6053b5fbd30517a2 jdk-9+123 -1600da1665cd2cc127014e8c002b328ec33a9147 jdk-9+124 -5b0570e3db29f6b8c80a4beac70d51284507b203 jdk-9+125 -264a44128cd6286e598d5a849ceeb613c06269d0 jdk-9+126 -06d706c70634775418dc79a2671780ba1c624fd2 jdk-9+127 -fe4e11bd2423635dc0f5f5cb9a64eb2f2cce7f4c jdk-9+128 -46a02f57218e4a8c334dbccf656fb048f823f163 jdk-9+129 -39c6293131d91aec7f2f5120395e070a937b8858 jdk-9+130 -783e7e2c587f2c7e1b9998a46d90ec196ab2a195 jdk-9+131 -9fff2477a4cadf2a9618a76f1f4fe0f20bb5ff3b jdk-9+132 -05e99eefda2b58d1ed176e411302d9d6b35dca16 jdk-9+133 -ab1d78d395d4cb8be426ff181211da1a4085cf01 jdk-9+134 -22631824f55128a7ab6605493b3001a37af6a168 jdk-9+135 -09ec13a99f50a4a346180d1e3b0fd8bc1ee399ce jdk-9+136 -297c16d401c534cb879809d2a746d21ca99d2954 jdk-9+137 -7d3a8f52b124db26ba8425c2931b748dd9d2791b jdk-9+138 -7a7aadf3c4500cc273c889aa1172d4fe3844bb6b jdk-9+139 -9004617323fe99cbe4fad48f373cb2ed4fc50aa6 jdk-9+140 -b2c18f755228d1d19a86cd7d5fa1abb6b1495dfb jdk-9+141 -59101416d90160cfcb4f45dfbccaec15e2c27a29 jdk-9+142 -1c988e708a06257119d54d8a57e99e3b0f37ff18 jdk-9+143 -92523c51d6a48b0a83912ba3cc43bc57b8159c2a jdk-9+144 -29277a4e73077269358859c43bd6658593fc0410 jdk-9+145 -1461e3e07876ea61bd0a07355a43912c9b04022a jdk-9+146 -be37411855de5b76035bef6f1b0d90d8607f2205 jdk-9+147 -c8c9c334743caf8155c9809b6b4ac315d3a66476 jdk-9+148 -72554d319b474b3636c7d02fe3c110254d111b1a jdk-9+149 -77e4e30d9d111272cd4a45a2203e8f570d40b12e jdk-9+150 -c48b4d4768b1c2b8fe5d1a844ca13732e5dfbe2a jdk-9+151 -6f8fb1cf7e5f61c40dcc3654f9a623c505f6de1f jdk-9+152 -7a532a9a227137155b905341d4b99939db51220e jdk-9+153 -34af95c7dbff74f3448fcdb7d745524e8a1cc88a jdk-10+0 -34af95c7dbff74f3448fcdb7d745524e8a1cc88a jdk-9+154 -9b9918656c97724fd89c04a8547043bbd37f5935 jdk-9+155 -7c829eba781409b4fe15392639289af1553dcf63 jdk-9+156 -6afc1d9b8c41457cc8ebe2e1a27b8fd6d887c1fb jdk-10+1 -b7e70e1e0154e1d2c69f814e03a8800ef8634fe0 jdk-9+157 -e53b322357382209fb553b9a1541ccfd12cbcb6c jdk-9+158 -0ea34706c7fa5cd71accd493eb4f54262e4a5f4e jdk-9+159 -6bff08fd5d217549aec10a20007378e52099be6c jdk-9+160 -7d5352c54fc802b3301d8433b6b2b2a92b616630 jdk-9+161 -b8aebe5292f23689f97cb8e66a9f327834dd43e6 jdk-9+162 -3890f96e8995be8c84f330d1f65269b03ac36b24 jdk-9+163 -1a52de2da827459e866fd736f9e9c62eb2ecd6bb jdk-9+164 -a987401bac0d528475e57732c9d5d93f4405804c jdk-9+165 -b1f30c27367bd286fa4eb8a767335e917a5b5b82 jdk-9+166 -06b9f0de66d3a17a10af380c950619c63b62d4cd jdk-10+2 -2e2c78f1713b2c6b760b870946d2b4341a1522e3 jdk-10+3 -ac7e572a6a6ba5bbd7e6aa94a289f88cc86256a4 jdk-10+4 -879aad463c21065254918629e6dfd7d7bf98adb2 jdk-10+5 -85e15cdc75aaaea8a1bb00563af7889869d3e602 jdk-10+6 -1c610f1b4097c64cdd722a7fb59f5a4d9cc15ca9 jdk-9+167 -2746716dcc5a8c28ccf41df0c8fb620b1a1e7098 jdk-9+168 -912cf69806d518c5af7fba30b340c4cb5458dd22 jdk-9+169 -e75d3abe579a7b39b762fc0a1a337c49eb072d82 jdk-9+170 -b0efae7df1dfa14926058baebaf999e4268c955c jdk-10+7 -e705867d9989d00e4357f66f18b302c95e13b5e7 jdk-10+8 -2fe03e35bed54238bcaeeb298b011df240e3711d jdk-10+9 -139e7c786ee4885efe53eb650b72c7b5a2d3b964 jdk-9+171 -3ccd9f37faa601866db5edb827363e797f5a2493 jdk-10+10 -8c615099f3e3ca137325be34bf566b767d9e3c64 jdk-9+172 -2d22d6732a73e615b9e13d6bc93bf026db3bc231 jdk-10+11 -2bd967aa452c1e0e87a6173bef6fbb96ef1c521b jdk-9+173 -c2296642010f1b215ac35da89e92c3ce44104e32 jdk-9+174 -712a3a657654079514590d37a0f4894d43541d5c jdk-10+12 -a5d361b9d1f7f78a675f3baef0d1fd32deee9ea2 jdk-9+175 -46a14aad004aa0b980d5f4ff7810d894fd5a36ae jdk-10+13 -bddeaa49ffd55567ad232548c38aa270e1a1420a jdk-10+14 -ea819b6009d33a72e6672bab6c101d51db0cfb4c jdk-9+176 -b44a721aee3d3b2537754e559fe9ecccadea548b jdk-9+177 -6d17fd0a5133a0dd916c77a9a24ae7f0ca402876 jdk-10+15 -bc8289ce1ed3ed5fff62152ed46da3be0b60b7c3 jdk-10+16 -d0190aaf1816081d9b2e0577b65b793804896d1e jdk-9+178 -56ac1831ac5924b5092a53a85d6fc68749501fb8 jdk-9+179 -4c07d366c2e177edba7aa54c4b015e4dbf12bc83 jdk-10+17 -6859ffbe2c510c930f88983743578d8186cf6dbd jdk-10+18 -0c3c118b0245165ed46dc32d0a28c39648de7cdb jdk-10+19 -f112f294a89ea61260b645f450bd37fd6578a5e8 jdk-9+180 -4f852cc3a1c998e78a989ba4667ffa9b867d9d01 jdk-9+181 -1658a5e7d171e9c3cc2462fac2789ec63294ecca jdk-10+20 -30ed8fb6a1d17e4065d07bc031cf2368aeca8d1e jdk-10+21 -c162c9e4c9c0976c8de44d2377a16a452bb99126 jdk-10+22 diff --git a/jaxws/.jcheck/conf b/jaxws/.jcheck/conf deleted file mode 100644 index ad4189d7de5..00000000000 --- a/jaxws/.jcheck/conf +++ /dev/null @@ -1,2 +0,0 @@ -project=jdk10 -bugids=dup diff --git a/jaxws/ASSEMBLY_EXCEPTION b/jaxws/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d90239..00000000000 --- a/jaxws/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jaxws/LICENSE b/jaxws/LICENSE deleted file mode 100644 index 8b400c7ab81..00000000000 --- a/jaxws/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jaxws/TRADEMARK b/jaxws/TRADEMARK deleted file mode 100644 index 6587bafba88..00000000000 --- a/jaxws/TRADEMARK +++ /dev/null @@ -1,41 +0,0 @@ -OpenJDK Trademark Notice -Version 1.1, 2008/3/10 - -OpenJDK (the "Name") is a trademark of Sun Microsystems, Inc. (the "Owner"). -Owner permits any person obtaining a copy of this software (the "Software") -which is based on original software retrieved from one of the following -websites: http://download.java.net/openjdk, http://hg.openjdk.java.net/jdk6, -or http://openjdk.java.net (each a "Website", with the original software made -available by the Owner on a Website being known as the "Website Software") to -use the Name in package names and version strings of the Software subject to -the following conditions: - - - The Software is a substantially complete implementation of the OpenJDK - development kit or runtime environment code made available by Owner on a - Website, and the vast majority of the Software code is identical to the - upstream Website Software; - - - No permission is hereby granted to use the Name in any other manner, - unless such use constitutes "fair use." - - - The Owner makes no warranties of any kind respecting the Name and all - representations and warranties, including any implied warranty of - merchantability, fitness for a particular purpose or non-infringement - are hereby disclaimed; and - - - This notice and the following legend are included in all copies of the - Software or portions of it: - - OpenJDK is a trademark or registered trademark of Sun Microsystems, - Inc. in the United States and other countries. - -The Name may also be used in connection with descriptions of the Software that -constitute "fair use," such as "derived from the OpenJDK code base" or "based -on the OpenJDK source code." - -Owner intends to revise this Notice as necessary in order to meet the needs of -the OpenJDK Community. Please send questions or comments about this Notice to -Sun Microsystems at openjdk-tm@sun.com. Revisions to this Notice will be -announced on the public mailing list announce@openjdk.java.net, to which you -may subscribe by visiting http://mail.openjdk.java.net. The latest version of -this Notice may be found at http://openjdk.java.net/legal. diff --git a/jaxws/build.properties b/jaxws/build.properties deleted file mode 100644 index f2c977cd749..00000000000 --- a/jaxws/build.properties +++ /dev/null @@ -1,92 +0,0 @@ -# -# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# This is the JDK used to build and run the bootstrap version of javac. -# The bootstrap javac is used to compile both boostrap versions of the -# other tools, and product versions of all the tools. -# Override this path as needed, either on the command line or in -# one of the standard user build.properties files (see build.xml) -javac.jar=${bootstrap.dir}/lib/javac.jar - -# The tools.jar is needed in the classpath to compile these sources -jdk.home=${java.home}/.. -tools.jar=${jdk.home}/lib/tools.jar - -# options for the tasks used to compile the tools -javac.source = 7 -javac.target = 7 -javac.debug = true -javac.no.jdk.warnings = -XDignore.symbol.file=true -# set the following to -version to verify the versions of javac being used -javac.version.opt = -# in time, there should be no exceptions to -Xlint:all -#javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -javac.lint.opts= - -# JVM memory size -javac.memoryInitialSize = 256m -javac.memoryMaximumSize = 512m - -#------------------------------------------------------------ - -# Root of output directories -output.dir=. - -# Built files -build.dir=${output.dir}/build -build.classes.dir=${build.dir}/classes - -# Distributed results -dist.dir=${output.dir}/dist -dist.lib.dir=${dist.dir}/lib -dist.classes.jar=${dist.lib.dir}/classes.jar -dist.src.zip=${dist.lib.dir}/src.zip - -# Sanity information -sanity.info= Sanity Settings:${line.separator}\ - ant.home=${ant.home}${line.separator}\ - ant.version=${ant.version}${line.separator}\ - ant.java.version=${ant.java.version}${line.separator}\ - java.home=${java.home}${line.separator}\ - java.version=${java.version}${line.separator}\ - os.name=${os.name}${line.separator}\ - os.arch=${os.arch}${line.separator}\ - os.version=${os.version}${line.separator}\ - bootstrap.dir=${bootstrap.dir}${line.separator}\ - javac.jar=${javac.jar}${line.separator}\ - javac.memoryInitialSize=${javac.memoryInitialSize}${line.separator}\ - javac.memoryMaximumSize=${javac.memoryMaximumSize}${line.separator}\ - javac.source=${javac.source}${line.separator}\ - javac.debug=${javac.debug}${line.separator}\ - javac.target=${javac.target}${line.separator}\ - javac.version.opt=${javac.version.opt}${line.separator}\ - javac.lint.opts=${javac.lint.opts}${line.separator}\ - javac.no.jdk.warnings=${javac.no.jdk.warnings}${line.separator}\ - output.dir=${output.dir}${line.separator}\ - build.dir=${build.dir}${line.separator}\ - dist.dir=${dist.dir}${line.separator}\ -${line.separator} - -#------------------------------------------------------------ diff --git a/jaxws/build.xml b/jaxws/build.xml deleted file mode 100644 index ef0402f3b01..00000000000 --- a/jaxws/build.xml +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - Ant build script for the ${ant.project.name} part of the jdk. - - Input Properties: (see build.properties for the ant defaults) - bootstrap.dir - dir with lib/javac.jar, added to javac bootclasspath - javac.debug - true or false for debug classfiles - javac.target - classfile version target - javac.source - source version - - Run 'make help' for help using the Makefile. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jaxws/nbproject/findbugs.settings b/jaxws/nbproject/findbugs.settings deleted file mode 100644 index a5d76311443..00000000000 --- a/jaxws/nbproject/findbugs.settings +++ /dev/null @@ -1,72 +0,0 @@ -#FindBugs User Preferences -#Tue Jun 30 18:33:11 PDT 2009 -detectorAbnormalFinallyBlockReturn=AbnormalFinallyBlockReturn|false -detectorAbstractClassEmptyMethods=AbstractClassEmptyMethods|false -detectorAbstractOverriddenMethod=AbstractOverriddenMethod|false -detectorArrayBasedCollections=ArrayBasedCollections|false -detectorArrayWrappedCallByReference=ArrayWrappedCallByReference|false -detectorBloatedAssignmentScope=BloatedAssignmentScope|false -detectorBloatedSynchronizedBlock=BloatedSynchronizedBlock|false -detectorClassEnvy=ClassEnvy|false -detectorCollectStatistics=CollectStatistics|false -detectorConfusingAutoboxedOverloading=ConfusingAutoboxedOverloading|false -detectorConstantListIndex=ConstantListIndex|false -detectorCopiedOverriddenMethod=CopiedOverriddenMethod|false -detectorCustomBuiltXML=CustomBuiltXML|false -detectorCyclomaticComplexity=CyclomaticComplexity|false -detectorDateComparison=DateComparison|false -detectorDeclaredRuntimeException=DeclaredRuntimeException|false -detectorDeletingWhileIterating=DeletingWhileIterating|false -detectorDubiousListCollection=DubiousListCollection|false -detectorFieldCouldBeLocal=FieldCouldBeLocal|false -detectorFinalParameters=FinalParameters|false -detectorFloatingPointLoops=FloatingPointLoops|false -detectorInefficientStringBuffering=InefficientStringBuffering|false -detectorInheritanceTypeChecking=InheritanceTypeChecking|false -detectorJDBCVendorReliance=JDBCVendorReliance|false -detectorListIndexedIterating=ListIndexedIterating|false -detectorLiteralStringComparison=LiteralStringComparison|false -detectorLocalSynchronizedCollection=LocalSynchronizedCollection|false -detectorLostExceptionStackTrace=LostExceptionStackTrace|false -detectorManualArrayCopy=ManualArrayCopy|false -detectorMethodReturnsConstant=MethodReturnsConstant|false -detectorNeedlessAutoboxing=NeedlessAutoboxing|false -detectorNeedlessCustomSerialization=NeedlessCustomSerialization|false -detectorNeedlessInstanceRetrieval=NeedlessInstanceRetrieval|false -detectorNeedlessMemberCollectionSynchronization=NeedlessMemberCollectionSynchronization|false -detectorNonCollectionMethodUse=NonCollectionMethodUse|false -detectorNonOwnedSynchronization=NonOwnedSynchronization|false -detectorNonRecycleableTaglibs=NonRecycleableTaglibs|false -detectorOrphanedDOMNode=OrphanedDOMNode|false -detectorOverlyConcreteParameter=OverlyConcreteParameter|false -detectorParallelLists=ParallelLists|false -detectorPartiallyConstructedObjectAccess=PartiallyConstructedObjectAccess|false -detectorPossibleIncompleteSerialization=PossibleIncompleteSerialization|false -detectorPossibleMemoryBloat=PossibleMemoryBloat|false -detectorPossiblyRedundantMethodCalls=PossiblyRedundantMethodCalls|false -detectorSQLInLoop=SQLInLoop|false -detectorSection508Compliance=Section508Compliance|false -detectorSillynessPotPourri=SillynessPotPourri|false -detectorSloppyClassReflection=SloppyClassReflection|false -detectorSluggishGui=SluggishGui|false -detectorSpoiledChildInterfaceImplementor=SpoiledChildInterfaceImplementor|false -detectorSpuriousThreadStates=SpuriousThreadStates|false -detectorStaticArrayCreatedInMethod=StaticArrayCreatedInMethod|false -detectorStaticMethodInstanceInvocation=StaticMethodInstanceInvocation|false -detectorSuspiciousComparatorReturnValues=SuspiciousComparatorReturnValues|false -detectorSuspiciousJDKVersionUse=SuspiciousJDKVersionUse|false -detectorSuspiciousWaitOnConcurrentObject=SuspiciousWaitOnConcurrentObject|false -detectorSyncCollectionIterators=SyncCollectionIterators|false -detectorTailRecursion=TailRecursion|false -detectorUnnecessaryStoreBeforeReturn=UnnecessaryStoreBeforeReturn|false -detectorUnrelatedCollectionContents=UnrelatedCollectionContents|false -detectorUnrelatedReturnValues=UnrelatedReturnValues|false -detectorUseAddAll=UseAddAll|false -detectorUseCharacterParameterizedMethod=UseCharacterParameterizedMethod|false -detectorUseEnumCollections=UseEnumCollections|false -detectorUseSplit=UseSplit|false -detectorUseToArray=UseToArray|false -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false -filter_settings_neg=| diff --git a/jaxws/nbproject/project.xml b/jaxws/nbproject/project.xml deleted file mode 100644 index 36adb0c1bac..00000000000 --- a/jaxws/nbproject/project.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - org.netbeans.modules.ant.freeform - - - jaxws - - - - jaxws - - - - - . - UTF-8 - - - - - build - - - clean - - - clean - build - - - - - - build.xml - - - - - - - - - - - - - - - - diff --git a/jaxws/nbproject/sqe.properties b/jaxws/nbproject/sqe.properties deleted file mode 100644 index 978ef5bc013..00000000000 --- a/jaxws/nbproject/sqe.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Path to FindbugsSettingsFile (relative) -findbugs.settings.file=findbugs.settings diff --git a/jdk/.hgignore b/jdk/.hgignore deleted file mode 100644 index 21a0a228a61..00000000000 --- a/jdk/.hgignore +++ /dev/null @@ -1,10 +0,0 @@ -^build/ -^dist/ -^webrev -^testoutput/ -/nbproject/private/ -^make/netbeans/.*/build/ -^make/netbeans/.*/dist/ -.DS_Store -.*/JTreport/.* -.*/JTwork/.* diff --git a/jdk/.hgtags b/jdk/.hgtags deleted file mode 100644 index 3d7b0a4b8c3..00000000000 --- a/jdk/.hgtags +++ /dev/null @@ -1,449 +0,0 @@ -37a05a11f281b4d238e2f9e7ebb67c63f64d0e77 jdk7-b24 -75fca0b0ab83ab1392e615910cea020f66535390 jdk7-b25 -fb57027902e04ecafceae31a605e69b436c23d57 jdk7-b26 -3e599d98875ddf919c8ea11cff9b3a99ba631a9b jdk7-b27 -02e4c5348592a8d7fc2cba28bc5f8e35c0e17277 jdk7-b28 -e21f4266466cd1306b176aaa08b2cd8337a9be3d jdk7-b29 -b6d6877c1155621a175dccd12dc14c54f938fb8b jdk7-b30 -b7474b739d13bacd9972f88ac91f6350b7b0be12 jdk7-b31 -c51121419e30eac5f0fbbce45ff1711c4ce0de28 jdk7-b32 -fa4c0a6cdd25d97d4e6f5d7aa180bcbb0e0d56af jdk7-b33 -434055a0716ee44bca712ebca02fc04b20e6e288 jdk7-b34 -cf4894b78ceb966326e93bf221db0c2d14d59218 jdk7-b35 -134fd1a656ea85acd1f97f6700f75029b9b472a0 jdk7-b36 -14f50aee4989b75934d385c56a83da0c23d2f68b jdk7-b37 -cc5f810b5af8a3a83b0df5a29d9e24d7a0ff8086 jdk7-b38 -4e51997582effa006dde5c6d8b8820b2045b9c7f jdk7-b39 -2201dad60231a3c3e0346e3a0250d69ca3b71fd4 jdk7-b40 -44941f893cea95ecdd5987b12e548069bd803849 jdk7-b41 -3ef0bdfa7609f79d4f2ea621f30cf593a2e432ce jdk7-b42 -50c67678b0d180063ade199d398b67a54063fa7f jdk7-b43 -d8eb2738db6b148911177d9bcfe888109b7f2f71 jdk7-b44 -527b426497a259d0605d069e3930e838948531a6 jdk7-b45 -4b03e27a44090d1f646af28dc58f9ead827e24c7 jdk7-b46 -b4ac413b1f129eeef0acab3f31081c1b7dfe3b27 jdk7-b47 -5fbd9ea7def17186693b6f7099b5d0dc73903eee jdk7-b48 -8311105ea7a3db7bcbcb2b696459127c7f2297a4 jdk7-b49 -58ba2cd5a25053684ec53205d95edeeaa0006f13 jdk7-b50 -fea0898259ae41c73620b1815aa48f036216155c jdk7-b51 -bcbeadb4a5d759b29e876ee2c83401e91ff22f60 jdk7-b52 -a2033addca678f9e4c0d92ffa1e389171cc9321d jdk7-b53 -d1c43d1f5676a24ba86221ac7cad5694f3a9afda jdk7-b54 -522bb5aa17e0c0cff00b1ed7d1b51bc4db2cfef9 jdk7-b55 -7fd3bc37afe36f8f6165ba679db1229716db822a jdk7-b56 -d5a1223e961891564de25c39fba6f2442d0fb045 jdk7-b57 -9ba256e2e5c161b89e638390f998baa175ec9abe jdk7-b58 -2a5a1b269e89f27ebe419ef4cf6e66a3face0df1 jdk7-b59 -0c3ef2d612a47667829eb17a192decef23f1c536 jdk7-b60 -f72c0dc047b9b2e797beee68ae0b50decb1f020d jdk7-b61 -12e11fab9a839a9666a996a8f9a02fd8fa03aab6 jdk7-b62 -2ed6ed6b5bfc7dd724925b90dbb31223df59c25d jdk7-b63 -a50217eb3ee10b9f9547e0708e5c9625405083ef jdk7-b64 -382a27aa78d3236fa123c60577797a887fe93e09 jdk7-b65 -bd31b30a5b21f20e42965b1633f18a5c7946d398 jdk7-b66 -a952aafd5181af953b0ef3010dbd2fcc28460e8a jdk7-b67 -b23d905cb5d3b382295240d28ab0bfb266b4503c jdk7-b68 -226b20019b1f020c09ea97d137d98e011ce65d76 jdk7-b69 -893bcca951b747ddcf6986362b877f0e1dbb835b jdk7-b70 -b3f3240135f0c10b9f2481c174b81b7fcf0daa60 jdk7-b71 -460639b036f327282832a4fe52b7aa45688afd50 jdk7-b72 -f708138c9aca4b389872838fe6773872fce3609e jdk7-b73 -eacb36e30327e7ae33baa068e82ddccbd91eaae2 jdk7-b74 -8885b22565077236a927e824ef450742e434a230 jdk7-b75 -8fb602395be0f7d5af4e7e93b7df2d960faf9d17 jdk7-b76 -e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77 -1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78 -918920710d65432a2d54fdf407c1524a5571c4ad jdk7-b79 -049cfaaa9a7374e3768a79969a799e8b59ad52fa jdk7-b80 -10b993d417fcdb40480dad7032ac241f4b87f1af jdk7-b81 -69ef657320ad5c35cfa12e4d8322d877e778f8b3 jdk7-b82 -9027c6b9d7e2c9ca04a1add691b5b50d0f22b1aa jdk7-b83 -7cb9388bb1a16365fa5118c5efa38b1cd58be40d jdk7-b84 -b396584a3e64988839cca21ea1f7fbdcc9248783 jdk7-b85 -eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86 -2cafbbe9825e911a6ca6c17d9a18eb1f0bf0873c jdk7-b87 -b3c69282f6d3c90ec21056cd1ab70dc0c895b069 jdk7-b88 -4a6abb7e224cc8d9a583c23c5782e4668739a119 jdk7-b89 -7f90d0b9dbb7ab4c60d0b0233e4e77fb4fac597c jdk7-b90 -08a31cab971fcad4695e913d0f3be7bde3a90747 jdk7-b91 -f2dce7210cc00453c23e53edeec7156f112ca382 jdk7-b92 -219b84b9533ae4fe3c6c2083f8a8962cb579f1de jdk7-b93 -cf44386c8fe3fbdb9da14346be25d19fd1092f71 jdk7-b94 -db951e984ccf50756160fee3078c791300b0917e jdk7-b95 -51b9e5dbc2da0631414484b934ac3fb62e48a2c6 jdk7-b96 -b1903d7528d33b521df42bc9291bdcdd2f444a29 jdk7-b97 -82593186fa54ab12f17af31f86a7bf364efaf4df jdk7-b98 -2587c9f0b60dc3146b4247b8674ada456a643d6f jdk7-b99 -820b4e843d5168370a3bf166d19751a3271d8575 jdk7-b100 -d58354a69011f3d3354765fa3167567c4c4a9612 jdk7-b101 -13029a61b16bec06535d4f0aa98229b358684128 jdk7-b102 -6488b70a23cc6dc4b7e00809bc503c2884bafb28 jdk7-b103 -1a92820132a0221c5bdedd42d0888c57ce4cbb34 jdk7-b104 -3b0abcb512807bb6f6d27755bc50103211bde6ee jdk7-b105 -b91ef6b60f4e19bf4592c6dd594c9bac62487519 jdk7-b106 -882103f334bb23745d3fd70fb7928c347478b0f4 jdk7-b107 -17a5d84b75610255a3527e8ede1da19c91ba7a7e jdk7-b108 -ab0d3f54a63f2aadfcdd2e14b81f79362ce454e2 jdk7-b109 -176586cd040e4dd17a5ff6e91f72df10d7442453 jdk7-b110 -fb63a2688db807a73e2a3de7d9bab298f1bff0e8 jdk7-b111 -b53f226b1d91473ac54184afa827be07b87e0319 jdk7-b112 -61d3b9fbb26bdef56cfa41b9af5bc312a22cbeb8 jdk7-b113 -e250cef36ea05e627e7e6f7d75e5e19f529e2ba3 jdk7-b114 -449bad8d67b5808ecf0f927683acc0a5940f8c85 jdk7-b115 -1657ed4e1d86c8aa2028ab5a41f9da1ac4a369f8 jdk7-b116 -3e6726bbf80a4254ecd01051c8ed77ee19325e46 jdk7-b117 -b357910aa04aead2a16b6d6ff395a8df4b51d1dd jdk7-b118 -ecab7eefb8f2326fd90fb632f47f1b6f81e928f8 jdk7-b119 -37d74e29687cf07c2bf9411af58c7e42440855c3 jdk7-b120 -a661d8587b5d8986aacae086f5df66af9e1a96b1 jdk7-b121 -ac311eb325bfc763698219252bf3cee9e091f3af jdk7-b122 -869190935eedee7750d955019ab2a1b80f0a13a8 jdk7-b123 -1c72adc9d5f331cb882cf5354ba0dcb118a60b23 jdk7-b124 -0a56bdd709d01c1663047e55201d19152ffd3d69 jdk7-b125 -8361ef97a0f90086c9048beaf7cea1a37216c4cd jdk7-b126 -29e09de1d0b4f84faea114cf10b3ec08b59acc4e jdk7-b127 -f08682e23279d6cccbdcafda1eb0647ba4900874 jdk7-b128 -14cd5d54a8d0b9c368d60ea83a066735b9931015 jdk7-b129 -bdc069d3f9101f89ec3f81c2950ee2d68fa846d3 jdk7-b130 -8ac52c85f9e91336dc00b52ef90b42eecf3230b3 jdk7-b131 -6bbc7a4734952ae7604578f270e1566639fa8752 jdk7-b132 -5e5f68a01d12a4432172f384d5201f3a05254493 jdk7-b133 -554adcfb615e63e62af530b1c10fcf7813a75b26 jdk7-b134 -d8ced728159fbb2caa8b6adb477fd8efdbbdf179 jdk7-b135 -aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136 -29296ea6529a418037ccce95903249665ef31c11 jdk7-b137 -60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138 -d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139 -9315c733fb17ddfb9fb44be7e0ffea37bf3c727d jdk7-b140 -63eeefe118da18c75ba3d36266768cd1ccaaca6b jdk7-b141 -312612e89ece62633f4809706dec00bcd5fe7c2d jdk7-b142 -efbf75c24b0f31847c9c403f6dc07dc80551908d jdk7-b143 -23bdcede4e3945894574892e80b848bd9f15b5f3 jdk7-b144 -1e04b38b3824a4a1d197ef681a302e6813e53f8b jdk7-b145 -539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146 -f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147 -2cdbbc4a63592be7f1556fffe37b1253a77bd481 jdk8-b01 -13e70aa1398eb959c54bc68b783ca0eef1286ad2 jdk8-b02 -7989ee9fe673a87f4db3917fa6a005732a6a9b85 jdk8-b03 -fc569517f3cf242f90ce3503b743eb5553938946 jdk8-b04 -0b32369b83d81c226a2e79e730f3a8c0d2595e92 jdk8-b05 -bdb870cc269ef8b221d17a217be89092400b59d2 jdk8-b06 -19f0a3db863cc491affc78b48c4a81a6679b2433 jdk8-b07 -1c023bcd0c5a01ac07bc7eea728aafbb0d8991e9 jdk8-b08 -f1ec21b8142168ff40f3278d2f6b5fe4bd5f3b26 jdk8-b09 -4788745572ef2bde34924ef34e7e4d55ba07e979 jdk8-b10 -7ab0d613cd1a271a9763ffb894dc1f0a5b95a7e4 jdk8-b11 -09fd2067f715e4505c44b01c301258a4e8f8964e jdk8-b12 -4cb2e8679b27432854690cb688ea06d3b2d8e008 jdk8-b13 -99632935785e2038b2fc836da9f2ede69dea294b jdk8-b14 -3c248d0e2c486624cc0d7aba1e4df45ae5774ff7 jdk8-b15 -b71d1acfae5240d8c1359443cd02b5ddb587231c jdk8-b17 -929597c6e777f742ad252660045ebaa4a3ea4772 jdk8-b16 -334bd51fb3f321cd6777416ae7bafac71a84140a jdk8-b18 -3778f85773055e81eab6c5ef828935ecca241810 jdk8-b19 -39e938cd1b82ec3aab0a9aa66fd8a0457cd0c9c2 jdk8-b20 -664fa4fb0ee411ef048903c479f8b962fcdb2f4b jdk8-b21 -dda27c73d8db4a9c7a23872b6f0c5106edcb2021 jdk8-b22 -54202e0148ec7d4570cab5bc9b00d216a7677569 jdk8-b23 -34029a0c69bba882264a29fc822f8283fd15f104 jdk8-b24 -ec17fbe5b8fbc52da070eec43b4711d9354b2ab8 jdk8-b25 -5aca406e87cb9144a9405be312dadd728a9c6fe2 jdk8-b26 -c68342532e2e7deb3a25fc04ed3e4c142278f747 jdk8-b27 -1e1d41daaded291ab3a370ca6a27f7325701978e jdk8-b28 -c5b882dce0fe27e05dc64debc92b1fb9ebf880ec jdk8-b29 -cdbb33303ea344d5e9013e2dd642e7a6e7768db6 jdk8-b30 -27f0c08c427c65fcab6917edf646f59058e59524 jdk8-b31 -ddfe5562f61f54ed2121ac0c73b688b94f3e66b5 jdk8-b32 -78cea258caaba3980ba186c426da82c8fe41bfd7 jdk8-b33 -29b680393f33bf953688c17d93aca7a870ca4024 jdk8-b34 -2e3e1356ffbddb2ae95c08da72830ba9ab8b3181 jdk8-b35 -45da9cb055ee258dc09e69c1718e27eadea38e45 jdk8-b36 -9e82ac15ab80370d6e021aea7b98c7c9626adb5e jdk8-b37 -c45f3509a70796c54b48f32910d1caf435763416 jdk8-b38 -b6f52911752110a2889681923992c7a0baa52ccc jdk8-b39 -b88fc3359dc7edabfa8a228855d8cebf8843c055 jdk8-b40 -4eac56f073ea8179b1a35fcd2af9b48b0088be9f jdk8-b41 -cf5c1f6fbc5ba14163fe0ef8eb8601b33f951372 jdk8-b42 -b3246687c3695dff6f461bb407f9db88f7d072e7 jdk8-b43 -db471a7af03168e4441c245b1d9976f720a7cb77 jdk8-b44 -b92353a01aa049bc508fc56f0347d5934b7c4390 jdk8-b45 -8d2ed9d58453c8049715a72a6d26b6b66b37a94c jdk8-b46 -00b22b23269a57d0bb46c57753be2fe9a9d2c1a3 jdk8-b47 -3e4ab821f46166fcf63e8fe5c8046216003c941f jdk8-b48 -51707c3b75c0f521794d9ab425f4e5b2351c70c1 jdk8-b49 -e4bae5c53fca8fcb9393d47fd36a34b9e2e8d4ec jdk8-b50 -e865efbc71059a414b3b2dd2e0adfcb3d2ab6ff9 jdk8-b51 -e8569a473cee7f4955bd9e76a9bdf6c6a07ced27 jdk8-b52 -2c6933c5106b81a8578b70996fe5b735fb3adb60 jdk8-b53 -70ad0ed1d6cef0e7712690d1bab21e4769708aad jdk8-b54 -1f3f4b333341873f00da3dee85e4879f0e89c9bb jdk8-b55 -2e9eeef2909b33c9224a024afddb61ccb0b77f14 jdk8-b56 -51594d095a4bcffac4a314bf6e148214501399e0 jdk8-b57 -d94613ac03d8de375ef60493e2bb76dbd30d875d jdk8-b58 -abad1f417bd3df4296631fc943cd3b7f5062c88a jdk8-b59 -cec8fa02f15634acd7d02d04b0b2d8c044cdbaaa jdk8-b60 -61ddb3fd000a09ab05bff1940b0ac211661e94cf jdk8-b61 -50b8b17449d200c66bfd68fb4f3a9197432c9e2b jdk8-b62 -f117a3e06f78a258074674ad17601f99bcb1ce0d jdk8-b63 -26dbd73fb7662a29b3e47179fdc88a0bfa4e231e jdk8-b64 -130d3a54d28becaac0846137256c2684adb34c33 jdk8-b65 -4d337fae2250135729ee9ed2bf8baf3c60da5d6d jdk8-b66 -ce9b02a3a17edd1983201002cfa0f364e4ab7524 jdk8-b67 -53fb43e4d614c92310e1fb00ec41d1960fd9facf jdk8-b68 -a8012d8d7e9c5035de0bdd4887dc9f7c54008f21 jdk8-b69 -a996b57e554198f4592a5f3c30f2f9f4075e545d jdk8-b70 -2a5af0f766d0acd68a81fb08fe11fd66795f86af jdk8-b71 -32a57e645e012a1f0665c075969ca598e0dbb948 jdk8-b72 -733885f57e14cc27f5a5ff0dffe641d2fa3c704a jdk8-b73 -57d5d954462831ac353a1f40d3bb05ddb4620952 jdk8-b74 -4a67fdb752b7d6329d9be9c28d3f9d6cf7eb9a3c jdk8-b75 -3a263052866137b645ab86498a43693ff5c19e69 jdk8-b76 -b2fc8e31cecc35b76188e821d4c5dc0e0b74ac24 jdk8-b77 -00b7535d743f83eda763c10b3c9ea19ba4b67f55 jdk8-b78 -c933505d75c2a0a671f06d6dac5d2237a9228d2d jdk8-b79 -dfb40f066c6ce129822f0f5dc2ac89173808781a jdk8-b80 -c0f8022eba536dcdc8aae659005b33f3982b9368 jdk8-b81 -624bcb4800065c6656171948e31ebb2925f25c7a jdk8-b82 -ac519af51769e92c51b597a730974e8607357709 jdk8-b83 -7b4721e4edb4e1c65e9c839a70d7cc67f81c7632 jdk8-b84 -296676d534c52888c36e305a2bf7f345c4ca70f8 jdk8-b85 -7989cd0cc3a9149864589438ee2c949015d8aa9a jdk8-b86 -d5228e624826a10ccc5b05f30ad8d839b58fe48d jdk8-b87 -8dbb4b159e04de3c447c9242c70505e71f8624c7 jdk8-b88 -845025546e35519fbb8970e79fc2a834063a5e19 jdk8-b89 -c63eda8f63008a4398d2c22ac8d72f7fef6f9238 jdk8-b90 -169451cf0cc53bde5af24f9820ea3f35ec4b4df4 jdk8-b91 -a2a2a91075ad85becbe10a39d7fd04ef9bea8df5 jdk8-b92 -691d6c6cd332d98b0f0221445a73906776f31f72 jdk8-b93 -51479fa56b7c4363c6d87c2e8b898d8185cf4b22 jdk8-b94 -42aa9f1828852bb8b77e98ec695211493ae0759d jdk8-b95 -4a5d3cf2b3af1660db0237e8da324c140e534fa4 jdk8-b96 -978a95239044f26dcc8a6d59246be07ad6ca6be2 jdk8-b97 -c4908732fef5235f1b98cafe0ce507771ef7892c jdk8-b98 -6a099a36589bd933957272ba63e5263bede29971 jdk8-b99 -5be9c5bfcfe9b2a40412b4fb364377d49de014eb jdk8-b100 -6901612328239fbd471d20823113c1cf3fdaebee jdk8-b101 -8ed8e2b4b90e0ac9aa5b3efef51cd576a9db96a9 jdk8-b102 -e0f6039c0290b7381042a6fec3100a69a5a67e37 jdk8-b103 -f1d8d15bfcb5ada858a942f8a31f6598f23214d1 jdk8-b104 -1fe211ae3d2b8cc2dfc4f58d9a6eb96418679672 jdk8-b105 -c817276bd870dfe1dcc3a3dbbc092436b6907f75 jdk8-b106 -eea685b9ccaa1980e0a7e07d6a3a84bcc7e9ab82 jdk8-b107 -006aaa5f069e7dd98fccdc696866c9f8582c087c jdk8-b108 -946f3fd5f8bf0ccd180c258d25e5837fa1bf004c jdk8-b109 -54e099776f08430d3a7f4feabd9f2ba886b55320 jdk8-b110 -719befd87c7b96ae103c05730ca555227bfc0116 jdk8-b111 -f002f5f3a16cca62e139cb8eed05ffaeb373587d jdk8-b112 -5b4261b4b72af53e8e178933ef6bc6c7f8cdbc60 jdk8-b113 -f26a0c8071bde1e3b923713c75156e4a58955623 jdk8-b114 -f82b730c798b6bf38946baaba8a7d80fd5efaa70 jdk8-b115 -0dc0067f3b8efb299a4c23f76ee26ea64df9e1d7 jdk8-b116 -fc4ac66aa657e09de5f8257c3174f240ed0cbaf7 jdk8-b117 -28ca338366ff2774ac9002f9f6eaff4101a3ea3b jdk8-b118 -e4499a6529e8c3e762ba86f45cdd774c92a8e7bc jdk8-b119 -d31cd980e1da31fa496a359caaf1a165aeb5791a jdk8-b120 -27b384262cba51dd0fe3e3534820189b46abc8cb jdk9-b00 -3b4ac8d1b76fc6bec9815f0ab714f15b552e4c7b jdk9-b01 -8c8275426a3207d91393354f7a7f9bc362ec25cf jdk9-b02 -4111af6151ed8ca8e3f5603c69729a68427e1d5b jdk9-b03 -627deed79b595a4789fc9151455b663a47381257 jdk9-b04 -263198a1d8f1f4cb97d35f40c61704b08ebd3686 jdk9-b05 -cac7b28b8b1e0e11d7a8e1ac1fe75a03b3749eab jdk9-b06 -f4e624447514f12dd7c51f1e5b0cb97efcd15be2 jdk9-b07 -9e7bd44ea85c72318130379c34b98716b9c7c248 jdk9-b08 -2cef452ba711b17950da275fd15931925799f07c jdk9-b09 -ab06ba2894313a47e4969ca37792ff119c49e711 jdk9-b10 -47feccd164b7187a0147693a922ee47c6629643c jdk9-b11 -83d9bc20973de232cae45b139fdff8a4549c130f jdk9-b12 -c7c8002d02721e02131d104549ebeb8b379fb8d2 jdk9-b13 -5c7a17a81afd0906b53ee31d95a3211c96ff6b25 jdk9-b14 -4537360f09fe23ab339ee588747b657feb12d0c8 jdk9-b15 -ab7d2c565b0de5bee1361d282d4029371327fc9e jdk9-b16 -fd8e675f141b9bdb2f46d1ae8251f4ee3a895d64 jdk9-b17 -6ad17b31f0d30593392b1e8695b9709dbbd7fb70 jdk9-b18 -27561aede285c25a3e9ed8bf8918234ad3bb81e3 jdk9-b19 -f87c5be90e01a7ffb47947108eb3e0b0b1920880 jdk9-b20 -2df45ac1bf491278f38c12e0dfbeebadb6c54c8c jdk9-b21 -85bcf0f99edc08873614afbe5a5563e13ce13c83 jdk9-b22 -9febf9dbc0a4b15323f2dbd29931cfbf086332b4 jdk9-b23 -875450e7ef8dde8f59db662ec1351ea30b8cb35d jdk9-b24 -a31efe49556a7c12f9ea2c9ee8b4fae8aa67723a jdk9-b25 -dde9f5cfde5f46e62ceb5fab81151578e5277aef jdk9-b26 -f0870554049807d3392bd7976ab114f7f2b7bafa jdk9-b27 -1828f73b35cfe35e460e41fd6e087ab1f83e0621 jdk9-b28 -2da27e8e2c865e154f0c2eb9009f011a44649b11 jdk9-b29 -8d24fb4493f13d380a2adf62d444e1e5a4451f37 jdk9-b30 -71e99dae28f9791287b88d46e16a266b564f22be jdk9-b31 -8bdf7083b5bd02aa330ba622895e586dd3378d37 jdk9-b32 -60fe681c30bc3821545a2506d4d3c2e04073f67c jdk9-b33 -21568031434d7a9dbb0cc6516cc3183d349c2253 jdk9-b34 -e549291a0227031310fa91c574891f892d27f959 jdk9-b35 -cdcf2e599e42935c2d1d19a24bb19e808aeb43b5 jdk9-b36 -27c3345d6dce39a22c262f30bb1f0e0b00c3709e jdk9-b37 -d2d745313c81d1fc01f426983b9f784ab1f750e8 jdk9-b38 -ca6edf957fe1c6ea818530b503578e872cea7239 jdk9-b39 -f1ed1540da70a066527fd043413107e47721edbf jdk9-b40 -e336cbd8b15e959e70ed02f0f5e93fa76ebd4c07 jdk9-b41 -6b2314173433467245261364a52fb8e347fe6342 jdk9-b42 -8c6ad41974f9ab6c33d544b088648314963f2a50 jdk9-b43 -8cc4dc300041eb70a7a40e4b2431a8f4d4965ea4 jdk9-b44 -9acaa4f57b0b9e3757a7b4576ca9418a75ea8287 jdk9-b45 -efedac7f44ed41cea2b1038138047271f55aacba jdk9-b46 -b641c14730ac05d9ec8b4f66e6fca3dc21adb403 jdk9-b47 -ebb2eb7f1aec78eb6d8cc4c96f018afa11093cde jdk9-b48 -541a8cef4e0d54c3e4b52a98c6af3c31e2096669 jdk9-b49 -f6b8edd397ee463be208fee27517c99101293267 jdk9-b50 -a0dad230aeb3b0d5cfd5b0715029e48d50573f8c jdk9-b51 -607ea68032cd4a4cf2c7a7a41fcb39602d6a75e2 jdk9-b52 -6cb5f5c34009630749a40cefe116d143f0b2583e jdk9-b53 -568a62ab7d764d7c74ac1d87387dbe500662b551 jdk9-b54 -d49e247dade61f29f771f09b2105857492241156 jdk9-b55 -7969f7b6465e47ce4afa77670ca600b04c1d746c jdk9-b56 -c76339e86ea7da5d9ac7856f3fae9ef73eef04a2 jdk9-b57 -36fc65e80d811ee43aedfc69284224b86a403662 jdk9-b58 -48ee960f29df93a9b2a895621321358a86909086 jdk9-b59 -84c5527f742bc64562e47d3149c16197fe1c4c1a jdk9-b60 -da84dcac1b0b12c5b836b05ac75ecbfadee0cd32 jdk9-b61 -49118e68fbd4cc0044e718c47db681946d5efd69 jdk9-b62 -fd3281c400347088b36aeb16273aa679d53a81a4 jdk9-b63 -7de8d036ad0980d988d1b9b4b4e6be555d9fbf98 jdk9-b64 -ed94f3e7ba6bbfec0772de6d24e39543e13f6d88 jdk9-b65 -4fbcca8ab812198c7fb747ea7b213b6e404f36e9 jdk9-b66 -1abd45df5480a04bff98fba1851d66a5230e67d4 jdk9-b67 -046fd17bb9a0cdf6681124866df9626d17b0516a jdk9-b68 -551323004d0ce2f1d4b0e99552f7e0cdcebc6fca jdk9-b69 -a7f731125b7fb0e4b0186172f85a21e2d5139f7e jdk9-b70 -e47d3bfbc61accc3fbd372a674fdce2933b54f31 jdk9-b71 -f376824d4940f45719d91838f3f6249f873440db jdk9-b72 -1c8bca2ebba13948199de33a1b71e2d6f1c7a8a6 jdk9-b73 -6dd82d2e4a104f4d204b2890f33ef11ec3e3f8d0 jdk9-b74 -4dd09cb5f7c2a2a23a9958ea7a602dd74d5709b2 jdk9-b75 -4526c0da8fb362eebd7e88f4d44e86858cf9b80b jdk9-b76 -7fd081100f48828431e7c1bff65c906ee759069b jdk9-b77 -0940ce86c614458f5bdd72278b190abbf36b7b45 jdk9-b78 -d99c2ffdd0f15753e69126583688f2f075a0a5e8 jdk9-b79 -4947810137ae53abba3028cc366af953d90fa81a jdk9-b80 -fdc13a2d32867ca3c57b7fa2620c6b59c83168cb jdk9-b81 -b10b64263b563e21f055c881444f625ec618b826 jdk9-b82 -d11f25ce3c545823f53bb978d454a4d2901abac3 jdk9-b83 -757ef7f6d0042934edea3e0bf616fad2c1a22789 jdk9-b84 -fe40b31c0e526d357cf5b62044fea006e43b53a5 jdk9-b85 -e8a66c0b05d786a282a7ff1d7eb4989afa30c891 jdk9-b86 -110fc90bdfa0fe59606c047c2301ed75d2bad6cf jdk9-b87 -6e50b992bef4def597a5033e696e5b1d4fe5b294 jdk9-b88 -0d0a63b325592607974612f9cfb48590975aa2d6 jdk9-b89 -b433e4dfb830fea60e5187e4580791b62cc362d2 jdk9-b90 -97624df5026a2fb191793697dbd2c604c4d5c66e jdk9-b91 -6a5c99506f44538b879d8635a3979849ed587130 jdk9-b92 -2f12392d0dde768150c83087cdbdd0d33a4d866c jdk9-b93 -559b626b01179420a94feb9c3d0f246970d2e3fa jdk9-b94 -8581faf0d474472e32f589bbc16db7eec912d83f jdk-9+95 -c021b855f51e572e63982654b17742cb1f814fb4 jdk-9+96 -fdd84b2265ddce7f50e084b7c8635189bba6f012 jdk-9+97 -f86ee68d1107dad41a27efc34306e0e56244a12e jdk-9+98 -e1a789be1535741274c9779f4d4ca3495196b5c3 jdk-9+99 -3d452840f48299a36842760d17c0c8402f0e1266 jdk-9+100 -5e8370fb3ed925335164afe340d1e54beab2d4d5 jdk-9+101 -6eb3c8132e489dab81adde4ce29844904ce15482 jdk-9+102 -eee1ced1d8e78293f2a004af818ca474387dbebf jdk-9+103 -8faf1aec77a9517c69d2f4d8dd146429852ace7f jdk-9+104 -55518739e399a1066c8613e19100d51b38d9f223 jdk-9+105 -6e9ecae50b4e0d37483fb2719202eea5dca026a4 jdk-9+106 -8701b2bb1d2e1b9abc2a9be0933993c7150a9dbe jdk-9+107 -42794e648cfe9fd67461dcbe8b7594241a84bcff jdk-9+108 -1c7bad0798900fe58f4db01ae7ffdc84f5baee8c jdk-9+109 -9417e1bcded6af5532c3b26235437ab227758877 jdk-9+110 -b2a69d66dc65ad1d3aeb3bd362cf5bb0deba040e jdk-9+111 -1565a0efe6f0ca411a6df277df1e069431c60988 jdk-9+112 -68f8be44b6a6b33dfa841ec671c0ba6e4056b372 jdk-9+113 -bb8379287f3736f38c52b2d1418784e2592461d1 jdk-9+114 -35225b837d66582037eeadeb471c13235dfd793d jdk-9+115 -baeb5edb38939cdb78ae0ac6f4fd368465cbf188 jdk-9+116 -4da0f73ce03aaf245b92cc040cc0ab0e3fa54dc2 jdk-9+117 -e1eba5cfa5cc8c66d524396a05323dc93568730a jdk-9+118 -bad3f8a33db271a6143ba6eac0c8bd5bbd942417 jdk-9+119 -b9a518bf72516954e57ac2f6e3ef21e13008f1cd jdk-9+120 -ee29aaab5889555ea56e4c0ed690aabb7613529d jdk-9+121 -981ae344923f09c46d8d1d5a3ed9fa71deafe0c6 jdk-9+122 -c40c8739bcdc88892ff58ebee3fd8a3f287be94d jdk-9+123 -7ff61c55b5c6c124592f09b18953222009a204a6 jdk-9+124 -073ab1d4edf5590cf1af7b6d819350c14e425c1a jdk-9+125 -6fda66a5bdf2da8994032b9da2078a4137f4d954 jdk-9+126 -7a97b89ba83077ca62e4aa5a05437adc8f315343 jdk-9+127 -9446c534f0222b4eecfd9d9e25ab37c4fd4400a5 jdk-9+128 -47699aa2e69ec2702542dc73eb01de3bfb61aea0 jdk-9+129 -6c827500e34587061af97ad6fef0e859280255c5 jdk-9+130 -8c57f4c293bbc5609928308a6d91ba765760b5f9 jdk-9+131 -d5c70818cd8a82e76632c8c815bdb4f75f53aeaf jdk-9+132 -3cdae27c90b5e41afe75eab904fda19fac076330 jdk-9+133 -803adcd526d74ae0b64948d1f8260c2dbe514779 jdk-9+134 -021369229cfd0b5feb76834b2ea498f47f43c0f3 jdk-9+135 -54c5931849a33a363e03fdffa141503f5cc4779d jdk-9+136 -e72df94364e3686e7d62059ce0d6b187b82da713 jdk-9+137 -665096863382bf23ce891307cf2a7511e77c1c88 jdk-9+138 -5518ac2f2ead5e594bd983f2047178136aafdfd0 jdk-9+139 -e93b7ea559759f036c9f69fd2ddaf47bb4e98385 jdk-9+140 -8d752af5f61d41f226adf2cda72a20faa9ad620a jdk-9+141 -6ce43dd8e954b452f330dd7a412df5107f7e1923 jdk-9+142 -8dbc8594f9d5149bf1c22221272284609408227a jdk-9+143 -efa71dc820eb8bd5a6c9f2f66f39c383ac3ee99d jdk-9+144 -99b7853cfbd8227c4441de4b6119c10742556840 jdk-9+145 -6e4ff59afb5d0adf21a72c4ff534326594a99e5d jdk-9+146 -c41140100bf1e5c10c7b8f3bde91c16eff7485f5 jdk-9+147 -9098b2b9d997d65af0026fc2f39cf75234e26bc5 jdk-9+148 -5a846396a24c7aff01d6a8feaa7afc0a6369f04d jdk-9+149 -71e198ef3839045e829a879af1d709be16ab0f88 jdk-9+150 -d27bab22ff62823902d93d1d35ca397cfd50d059 jdk-9+151 -a20f2cf90762673e1bc4980fd6597e70a2578045 jdk-9+152 -1c4411322327aea3f91011ec3977a12a05b09629 jdk-9+153 -f2325d80b37c2817e15039bf64189a08e29c6d39 jdk-10+0 -c97e7a8b8da062b9070df442f9cf308e10845fb7 jdk-9+154 -e170c858888e83d5c0994504599b6ed7a1fb0cfc jdk-9+155 -7d64e541a6c04c714bcad4c8b553db912f827cd5 jdk-9+156 -e209a98d40a1c353199285f31ca0ff6f0d68264a jdk-10+1 -fdfa7b2fe9a7db06792eae20f97748f3e85bb83a jdk-9+157 -c476ca73750698fa5654e101af699ee45db38e2a jdk-9+158 -49b54a4d9e84b7ba956b8c27fced5035465146ae jdk-9+159 -cac788454598b95d8b0153c021a7fae3cd7e6fda jdk-9+160 -09b92d3067a38ee07bc14efa336b14790c93f7e7 jdk-9+161 -f6bf027e88e9a4dd19f721001a7af00157af42c4 jdk-9+162 -50171f8c47961710cbf87aead6f03fa431d8d240 jdk-9+163 -6dea581453d7c0e767e3169cfec8b423a381e71d jdk-9+164 -a7942c3b1e59495dbf51dc7c41aab355fcd253d7 jdk-9+165 -5d2b48f1f0a322aca719b49ff02ab421705bffc7 jdk-9+166 -5adecda6cf9a5623f983ea29e5511755ccfd1273 jdk-10+2 -4723e1d233195e253f018e8a46732c7ffbe6ce90 jdk-10+3 -37f8b938b680cf8fb551e9a48bffc5536b061fa8 jdk-10+4 -d1436b2945383cef15edbdba9bb41ef1656c987b jdk-10+5 -329609d00aef2443cf1e44ded94637c5ed55a143 jdk-10+6 -7828aedcb525df40b7c8122bcc3f997c75ebaf7f jdk-9+167 -e78da9db6299b3fcba49300d52e2359e82fdd218 jdk-9+168 -177436a54ca13730ffc725a6e5dbfcd9486f3da3 jdk-9+169 -ef9954f6896bb0b95ac62bf769f68b59a7a56ccd jdk-9+170 -cbd65760a005766610583949b3b5c9ace92e74b3 jdk-10+7 -f0adc10ed8316e6cf316e3208c5ecf6835d22bc4 jdk-10+8 -b9409a7daa6c793dd631e52fe6ef79d08a3b337a jdk-10+9 -29bbedd4cce8e14742bdb22118c057b877c02f0f jdk-9+171 -df64bd4757d0d130d62a22b8143ba31d3a16ac18 jdk-10+10 -0ff9ad7d067cd4fa14450cf208bf019175a0aaba jdk-9+172 -7c54889c0ec649ee04643e5cace434623d0dc667 jdk-10+11 -a5506b425f1bf91530d8417b57360e5d89328c0c jdk-9+173 -42f18c931bd4fae5c206ccf6d8e591e4c4e69d31 jdk-9+174 -5f504872a75b71f2fb19299f0d1e3395cf32eaa0 jdk-10+12 -e6c4f6ef717d104dba880e2dae538690c993b46f jdk-9+175 -4540d6376f3ef22305cca546f85f9b2ce9a210c4 jdk-10+13 -7a2bc0a80087b63c909df2af6ec7d9ef44e6d7f7 jdk-10+14 -9f27d513658d5375b0e26846857d92563f279073 jdk-9+176 -80acf577b7d0b886fb555c9916552844f6cc72af jdk-9+177 -e069834e2c518a7bc2ffadc8c7e3cd7ec69fa8a0 jdk-10+15 -3281b964ab104002623d744e8b77a12269b70acd jdk-10+16 -443025bee731eb2225371b92c1c74b519b7baf33 jdk-9+178 -06df1ce4b9b887d05ce6a13f4def3547e434dd1a jdk-9+179 -d93f2fd542b7d7855c2cd49ae15ebcc3d441a83b jdk-10+17 -c4b709bad6c5d29294124de5e74e1e2ac84fcf1f jdk-10+18 -b561eeca30decc6258b4aca8bb23beffbb6e2f7d jdk-10+19 -4feab1acec6a9c3620a19ff379a65ab8618d0e2a jdk-9+180 -bd66ea2fdde3d60a73b5272263a7b8b0ca926a33 jdk-9+181 -6256e94781f55e6f9e04eb284298d00eb9c5e106 jdk-10+20 -4e08a69241eab6e7a67a819a7b4fe29e7398855d jdk-10+21 -83720375178f919700dfbbd90650f8c8e0cf34f2 jdk-10+22 diff --git a/jdk/.jcheck/conf b/jdk/.jcheck/conf deleted file mode 100644 index ad4189d7de5..00000000000 --- a/jdk/.jcheck/conf +++ /dev/null @@ -1,2 +0,0 @@ -project=jdk10 -bugids=dup diff --git a/jdk/ASSEMBLY_EXCEPTION b/jdk/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d90239..00000000000 --- a/jdk/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jdk/LICENSE b/jdk/LICENSE deleted file mode 100644 index 8b400c7ab81..00000000000 --- a/jdk/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jdk/make/netbeans/jdwpgen/nbproject/sqe.properties b/jdk/make/netbeans/jdwpgen/nbproject/sqe.properties deleted file mode 100644 index 978ef5bc013..00000000000 --- a/jdk/make/netbeans/jdwpgen/nbproject/sqe.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Path to FindbugsSettingsFile (relative) -findbugs.settings.file=findbugs.settings diff --git a/jdk/src/java.base/macosx/native/launcher/Info-privileged.plist b/jdk/src/java.base/macosx/native/launcher/Info-privileged.plist deleted file mode 100644 index 9b2fc0a32fc..00000000000 --- a/jdk/src/java.base/macosx/native/launcher/Info-privileged.plist +++ /dev/null @@ -1,18 +0,0 @@ - - - - - CFBundleIdentifier - net.java.openjdk.cmd - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - OpenJDK Command - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1.0 - SecTaskAccess - allowed - - diff --git a/langtools/.hgignore b/langtools/.hgignore deleted file mode 100644 index d29603e7935..00000000000 --- a/langtools/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -^build/ -^dist/ -^webrev -^.idea -/nbproject/private/ -.DS_Store diff --git a/langtools/.hgtags b/langtools/.hgtags deleted file mode 100644 index b9d5294f6c3..00000000000 --- a/langtools/.hgtags +++ /dev/null @@ -1,449 +0,0 @@ -9a66ca7c79fab293c1bb0534e0d208c7e4f58b01 jdk7-b24 -58039502942e52f4144a33f36290a2bd2f3581e6 jdk7-b25 -c46d25a2350ac147d0121d9c9725af6fcb1b4dbe jdk7-b26 -a17265993253d61becd04fe7d96d1fe8b4bd6dff jdk7-b27 -4ef4bd31856949554967fbf22783babb21a62a0e jdk7-b28 -dec081837b01d509dcc2b9de86a4299c1ec17e04 jdk7-b29 -eaf608c64fecf70f955dc9f29f94c055b183aeec jdk7-b30 -07c916ecfc71f6bf432e4ff09bfbfb6290b5703c jdk7-b31 -13aee98cc0d8e24a084b62ad1d48d2a49792416c jdk7-b32 -0a5f04fb72825302a80a67c636a7ddc410ead266 jdk7-b33 -4026dece07e86ae75154c05b98ba342d00828ed7 jdk7-b34 -81f66dd906eb28e43bcaa66c092e794f59a4e52d jdk7-b35 -258af9b67b7cb4262ab1b5424160c9ad22d52e8f jdk7-b36 -24a47c3062fe8869fcfb533ce0ff770c8ceb550d jdk7-b37 -3fd42dfa6f27f2767a241fb82bc01a613f0c2096 jdk7-b38 -3fb51e47622bb771571680bc6a7b64c6172b482d jdk7-b39 -32e30988324601d08b87989f0821d99aa8534511 jdk7-b40 -ded6b40f558e8d19b3c17715b3d67ee001606645 jdk7-b41 -5e5567c2db56a931cf07768218c20903d9828b5f jdk7-b42 -e2f8f6daee9decd5721d598dacf4d0b5915651df jdk7-b43 -28f0b10d6c1afc106465c13b8c663a6afa4fb1a1 jdk7-b44 -30db5e0aaf83fe262d9a7227d3fc3e451cd5d459 jdk7-b45 -be546a6c08e3c31fba2edcae1de43ae3515d2e59 jdk7-b46 -2b8f6bab23926aa32b9cf7e4c540b9d1ce74b7d5 jdk7-b47 -c53007f34195f69223bdd4125ec6c0740f7d6736 jdk7-b48 -d17d927ad9bdfafae32451645d182acb7bed7be6 jdk7-b49 -46f2f6ed96f13fc49fec3d1b6aa616686128cb57 jdk7-b50 -8c55d5b0ed71ed3a749eb97e4eab79b4831649b8 jdk7-b51 -29329051d483d39f66073752ba4afbf29d893cfe jdk7-b52 -dbdeb4a7581b2a8699644b91cae6793cb01953f7 jdk7-b53 -197a7f881937d406a01214aa9ded49c073f7d380 jdk7-b54 -7394a8694cedea574c7dbd38de87f4cbe0e27b8a jdk7-b55 -825f23a4f262eb06cfc94406140f3bfecb17ffe8 jdk7-b56 -4030cc469205bbd517ca629fb170afb81760bbc5 jdk7-b57 -5bcac54d408b436d2364925ee7947b5609e07962 jdk7-b58 -88bcb6772159602317f2e184a69010737db72270 jdk7-b59 -5cdce469ea2ad90d308c9abe420fd0643c0a6b9e jdk7-b60 -522520757dd34321b27a7145ecbd24ac4fb64f34 jdk7-b61 -6855e5aa3348f185fe5b443ee43a1b00ec5d390e jdk7-b62 -5c2c8112055565b4980b6756e001e45eb7b88d6e jdk7-b63 -d8f23a81d46f47a4186f1044dd9e44841bbeab84 jdk7-b64 -7e0056ded28c802609d2bd79bfcda551d72a3fec jdk7-b65 -634f519d6f9a602b16bba1c7cd4a17242a8f6889 jdk7-b66 -14b1a8ede95493fc53c37ff2626f1f98ce94d108 jdk7-b67 -95c1212b07e33b1b8c689b1d279d82ffd5a56e43 jdk7-b68 -ce9bcdcb7859bb7ef10afd078ad59ba7847f208d jdk7-b69 -97d06f3e87873e310aa2f3fbca58fc8872d86b9f jdk7-b70 -33c8c38e1757006c17d80499fb3347102501fae5 jdk7-b71 -261c54b2312ed26d6ec45c675831375460250519 jdk7-b72 -9596dff460935f09684c11d156ce591f92584f0d jdk7-b73 -1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74 -2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75 -8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76 -0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77 -acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78 -ac5b4c5644ce54585e5287563dde2b006fa664f4 jdk7-b79 -f0074aa48d4e2a4c03c92b9c4f880679fea0306c jdk7-b80 -cfabfcf9f110ef896cbdd382903d20eefbceefe0 jdk7-b81 -47003a3622f6a17756ab0338bfa8a43e36549e99 jdk7-b82 -c9f4ae1f1480e89aaf7e72173184089d9cea397a jdk7-b83 -d9cd5b8286e44f3baf90da290cd295433e21c05a jdk7-b84 -136bfc67946219fb02ee223984540a4a9c5b209f jdk7-b85 -ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86 -409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87 -f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88 -6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89 -71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90 -97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91 -98cba5876cb50fa3c58a313ddd668f5014ff14f6 jdk7-b92 -683cd1f6bc4b562b0ddf29d5f80f05c2123b76b0 jdk7-b93 -bb3d7c75a56df0c00246072b996fad1858a771a1 jdk7-b94 -752bb790fc2d6df91e91d84420c9c87136eb81eb jdk7-b95 -89cd267c216751bdacf8629bb07a40c0950fc4f2 jdk7-b96 -c0a41294297ed397098dd92b647f481f0e1bb8fa jdk7-b97 -3b38f3aa3dc388eef0737a9fba99f54a1602ee3b jdk7-b98 -005bec70ca27239bdd4e6169b9b078507401aa72 jdk7-b99 -d1d7595fa824925651f09b8ffcb86c9cf39807be jdk7-b100 -20a8fe72ee7b673f59c319a5222fe0eebbd92082 jdk7-b101 -ff9c0a0bf7edf637a7dac5062b920924536ed79c jdk7-b102 -bd85271c580ce4600b1b2d5598daa19d02174cf7 jdk7-b103 -fc7219517ec16b28d729d259020a25b05ffdf0b6 jdk7-b104 -aaecac256d39c7cb536e70d20ddd833fc118e43a jdk7-b105 -112fcc00659dda1a356ec75d964584e4dae0228f jdk7-b106 -2c1c657f69a4ff608a43e1ac61baf3294cd55797 jdk7-b107 -a408ebb8b3d427dbb3d8ce153dfaeb060564a0a4 jdk7-b108 -4826378eaade4c6676c452efe954be4ee113cc11 jdk7-b109 -32da0f38d2fe96c558492b8707b40da24643d41e jdk7-b110 -8bec624274ef8535720cff553374347c2f4f5fb2 jdk7-b111 -fd2579b80b83bf5d4289426016c7d29174ba5dd9 jdk7-b112 -6dbd2d869b0573fa5b799a23cccff47d20c12696 jdk7-b113 -e4e7408cdc5b3d91d39161e1e94aad576ecc2dcd jdk7-b114 -01e8ac5fbefd35d2d9a0996213cf2390fd164e57 jdk7-b115 -857bfcea3f30cb5f4ae96f46a53ae1c772f9b0e5 jdk7-b116 -2129a046f117547fc8a5cb3397a767e6d528f5b6 jdk7-b117 -c491eec0acc73fa41b77e1619ed03e56d8a75b83 jdk7-b118 -814561077c448292f78de461b6de5d78d57c2089 jdk7-b119 -1dd813a529cfa06d850ee7dc42da42efb8f6af0e jdk7-b120 -1bf969e9792f977a8593496681539840a54fe644 jdk7-b121 -11e7b4c0476e4d6085d8d28c4aa2833d46714a2a jdk7-b122 -a3b5b531542a372f30e014b1543a619a15a90780 jdk7-b123 -4868a36f6fd8972505c466013813eeb28f0482ea jdk7-b124 -4b0560c72b529d4b952924b2da94d8436af79d05 jdk7-b125 -438a8ad60f7ae7aa897663148fd43fe85ef05e5b jdk7-b126 -1e6094c33187f6c3dca55ced3701ee1f9d73a77d jdk7-b127 -d7225b476a5d1aebffb8827e7c72ba2e1651f4e7 jdk7-b128 -1383d1ee8b5db13d5df9523d1760df17b9d228d4 jdk7-b129 -7a98db8cbfce77a619057aa4fdde69d2a06d4101 jdk7-b130 -67221b8643b478c4fceacc89240db876455aae76 jdk7-b131 -e3d011d59a33acef79eff7523bef069557e91002 jdk7-b132 -e77e98f936e83d94c9b56cc7af218dc822a06122 jdk7-b133 -3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134 -9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135 -ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136 -a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137 -53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138 -853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139 -258e6654aba25aab91c9ba3b4c53d05bc895a86c jdk7-b140 -90adb5d6adc7d99d27c8b142a31ac8921070274f jdk7-b141 -7476b164194c1814704153e74d5ff7e965c6fdbf jdk7-b142 -5faa9eedc44e201f2b13ad837e9077668b823d28 jdk7-b143 -8eb952f43b117d538f6ca5e9e43ff9ce7646c7ee jdk7-b144 -c455e2ae5c93014ae3fc475aba4509b5f70465f7 jdk7-b145 -9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146 -58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147 -e9f118c2bd3c4690d8d2e6b108b5bad7e226634c jdk8-b01 -b3c059de2a61fc122c99d555cdd8b85f112393c1 jdk8-b02 -f497fac86cf9ada4801ecaf49eb0d2307a2b61c8 jdk8-b03 -5df63fd8fa64741e829281ee6febe9954932841b jdk8-b04 -5304c2a17d4b001e365a8f0163082dc375f1abab jdk8-b05 -d2422276f9dabc848b7a079025719826d2f9a30f jdk8-b06 -116980ecec5cc7d52736f09cf332321e0773265f jdk8-b07 -e8acc2d6c32f0c8321e642e1a86672a2e196a056 jdk8-b08 -b7a7e47c8d3daf7822abf7c37e5179ccbbf53008 jdk8-b09 -f6c783e18bdf4d46a0ab273868afebbf32600ff7 jdk8-b10 -4bf01f1c4e3464f378959d10f3983a0469181d94 jdk8-b11 -f2d6ed25857dfa7f269ac66e13666d648cb988c6 jdk8-b12 -ae25163501bc7477cd907e26a006a6f1b05fdb6d jdk8-b13 -58f1325d72b2bacc901f5189ee5e4e81e81ea657 jdk8-b14 -07599bd780cab1f40da7915e1dc6774629b0cf8c jdk8-b15 -1cbe86c11ba69521875c0b0357d7540781eb334d jdk8-b17 -ec2c0973cc31e143cffc05ceb63d98fae76f97d4 jdk8-b16 -ab1b1cc7857716914f2bb20b3128e5a8978290f7 jdk8-b18 -77b2c066084cbc75150efc6603a713c558329813 jdk8-b19 -ffd294128a48cbb90ce8f0569f82b61f1f164a18 jdk8-b20 -bcb21abf1c4177baf4574f99709513dcd4474727 jdk8-b21 -390a7828ae18324030c0546b6452d51093ffa451 jdk8-b22 -601ffcc6551d5414ef871be306c3a26396cf16a7 jdk8-b23 -6c9d21ca92c41ff5fcfa76c5b7fafe0f042f4aef jdk8-b24 -520c30f85bb529a3daf5d7623764c2464f00fd19 jdk8-b25 -b556aa8a99c358469861770aebdce884e06fa178 jdk8-b26 -be456f9c64e818161c789252145d4ddc292ae863 jdk8-b27 -5bed623b0c773aa8a8d5f8d4004ce9d3974143cc jdk8-b28 -e974e82abe51ef66dc32bb6ab5d0733753d3c7d7 jdk8-b29 -08a3425f39f829502ca0ddbfb2d051c31710cb19 jdk8-b30 -b28cfbe7e8b196da954bed9a22bfd790e55333aa jdk8-b31 -be069d72dde2bfe6f996c46325a320961ca854c2 jdk8-b32 -46831c72b7f6c69fef2cc2935001863643a65f94 jdk8-b33 -6b105afbb77ca9600a99eade31f686d070c70581 jdk8-b34 -defd666a786334465496c8901fa302b779c7e045 jdk8-b35 -94bbaa67686f44a124cd16fd9f1e8a6a3f684d2d jdk8-b36 -5891b38985e8b2502296fc29e726b527d03116d2 jdk8-b37 -1f224f160aa852c9541380735a27a3439dfb7217 jdk8-b38 -a9f547c218d957306dfc0cdd710be041bb62a555 jdk8-b39 -86e0dad6aadf626bf5755f503aee2d0da525d9d5 jdk8-b40 -179fa85aeefab338cccf1cbe8b494c59bc5df122 jdk8-b41 -02c5a3575539e737a1855b31287654e843edd6da jdk8-b42 -f8c64d835b2806293b8e924b44f0e32b20657ed3 jdk8-b43 -59cbead12ff46dbb397120bd26635bcd7d41ff21 jdk8-b44 -e111e4587ccada8eb93f72e834e378c76256f4b7 jdk8-b45 -4ca5994971724731233735f055f33d4936fd11d3 jdk8-b46 -7e6be2f239c9a4ac6dec280bd18ec296dd78e464 jdk8-b47 -afb0a523155727d42b1c773f783ff3a7cfab8e86 jdk8-b48 -c72c164ced676d3c360d99b1c52cc80940fc3122 jdk8-b49 -b2d8a270f5f2144e14a1fe97fbda9e4391a5332e jdk8-b50 -c4cd4cab2220817c88c8c139c9bfc91c36b48826 jdk8-b51 -1d2db0e5eabc2eaf865986f7b7ffbf7b14b00232 jdk8-b52 -d3d0b9cd76e04bf9e381b402630ac3cfe464bb38 jdk8-b53 -9cf72631baf5cb1ebd8736c5efeab7746977ea68 jdk8-b54 -e48e7e1f026b82d921433150180799898c088890 jdk8-b55 -363e9198b9de68ebf37a3e2c2f3f23543d3915cd jdk8-b56 -86d5740b9fdc20ababb8aefde89ae1509ff216a9 jdk8-b57 -804a3fbc86e28a4d9e77c30aa0bd4aa68056f23f jdk8-b58 -f299927fc31689385f67ab7322c18eb41d8bd71e jdk8-b59 -3d2b98ffcb534b0e5be87bb1f9f68d1518ad7729 jdk8-b60 -26020b247ad3806dbca33e029ee12e1b191f59f9 jdk8-b61 -b47bb81ba962ef80bb6f0b863c33a0afcfb0b49e jdk8-b62 -92e6f2190ca0567c857f85c3fb7a2be5adf079d0 jdk8-b63 -e6ee43b3e2473798b17a556e9f11eebe25ab81d4 jdk8-b64 -5f2faba89cac665e365c05074064ffc934a495eb jdk8-b65 -20230f8b0eef92a57043735fc2ca00fea7e510a0 jdk8-b66 -303b09787a69136cd2019f9edfed3f308572e9fc jdk8-b67 -014a6a11dfe5ddc23ec8c76bb42ac998dbf49acb jdk8-b68 -d7360bf35ee1f40ff78c2e83a22b5446ee464346 jdk8-b69 -47f71d7c124f24c2fe2dfc49865b332345b458ed jdk8-b70 -467e4d9281bcf119eaec42af1423c96bd401871c jdk8-b71 -6f0986ed9b7e11d6eb06618f27e20b18f19fb797 jdk8-b72 -8d0baee36c7184d55c80354b45704c37d6b7ac79 jdk8-b73 -56c97aff46bb577b8668874154c24115a7e8a3e8 jdk8-b74 -c2e11e2ec4a3682513e566849e5562f31ded8c65 jdk8-b75 -e81839b3233792415daaab051698edc6067f1a16 jdk8-b76 -89c66415168925dffe492356ff893ff248bb5603 jdk8-b77 -af8417e590f4e76e0dfed09e71239fb102ef0d43 jdk8-b78 -56dfafbb9e1ad7548a4415316dc003296fb498cb jdk8-b79 -a8227c61768499dac847ea718af6719027c949f2 jdk8-b80 -ed69d087fdfd394491657a28ba9bc58e7849b7db jdk8-b81 -825da6847791994a8f405ee397df9e7fa638a458 jdk8-b82 -22ba3f92d4ae43bbc19793e854171cae2586f644 jdk8-b83 -cfb65ca92082b2412aed66c8422c2466bde544ef jdk8-b84 -4a48f31735349782ad13980267358c97076adc66 jdk8-b85 -6ab578e141dfd17c4dc03869bb204aafa490c9f4 jdk8-b86 -1329f9c38d93c8caf339d7687df8371d06fe9e56 jdk8-b87 -a1e10f3adc47c8602a72e43a41403a642e73e0b1 jdk8-b88 -ec434cfd2752a7742c875c2fe7d556d8b81c0f3a jdk8-b89 -e19283cd30a43fca94d8f7639c73ef66db493b1e jdk8-b90 -997c0fae2b12108959387862be54b78ca0ae3fca jdk8-b91 -149890642a0ed5138a4f16fe08ddbfeb8f8a1cb4 jdk8-b92 -2c5a568ee36eb2d9471483b7a310c49ed545db55 jdk8-b93 -48c6e6ab7c815fd41d747f0218f8041c22f3a460 jdk8-b94 -4cb1136231275a1f8af53f5bfdef0b488e4b5bab jdk8-b95 -988aef3a8c3adac482363293f65e77ec4c5ce98d jdk8-b96 -6a11a81a8824c17f6cd2ec8f8492e1229b694e96 jdk8-b97 -ce5a90df517bdceb2739d7dd3e6764b070def802 jdk8-b98 -6d85acab769eb79bc058f5640fa86a6ef096a583 jdk8-b99 -82f68da70e471ee5640016e3f38c014347a5c785 jdk8-b100 -0324dbf07b0f1cc51ad9fa18976489d02d23b60d jdk8-b101 -453a305e116507847cc6577b80b4d9794bcb08bf jdk8-b102 -76cfe7c61f2575ea5400845b8e80dab6f4b1d7d0 jdk8-b103 -dd4a00c220c6e14d9b2ce93a2bd436a1d04f0d03 jdk8-b104 -375834b5cf086dd7ce9e49f602d81bb51d3e0fa9 jdk8-b105 -fcd768844b9926c5f994292ec6350c20cc7c0f76 jdk8-b106 -3f274927ec1863544b8214262ab02b7de2970da6 jdk8-b107 -252f872b8a2f81a416f9127e77924ca56a4578b0 jdk8-b108 -985abf1cd327169a317d4ff4f318a8162a5cd47d jdk8-b109 -41541097533aa3933a018c8c1c426c1871dfd76e jdk8-b110 -af6244ba81b6b8d1bf4ab06587a2067e021e4570 jdk8-b111 -954dd199d6ff3e4cfc42b894c1f611150526eecd jdk8-b112 -54150586ba785e1eb0c0de8d13906f643f640644 jdk8-b113 -850d2602ae9811687b0f404d05ec3e55df91d9cb jdk8-b114 -6b4d6205366c1170ebefea95b1b9ae1d69add036 jdk8-b115 -3c040b04af05646878798216ebf939d27e6fe687 jdk8-b116 -19de039a03a619b99f1a8b454e1618c9fa9dae66 jdk8-b117 -4fd6a7ff8c068eceaaaf8bf12a394195203b99b3 jdk8-b118 -43a80d75d06ed22d6942f25f067587a3be3a129d jdk8-b119 -b3d7e86a06474fe5100a7b15a95eaa10d41509a6 jdk8-b120 -afe63d41c699e0e2ee910ef20c41b60603c852a1 jdk9-b00 -077c12d527fb5531c59666c1f84000fc1245a260 jdk9-b01 -f2c58a337c8aaa1ce84dfa8a8e8c5d4c8c1e12fa jdk9-b02 -151222468d1d04ce6613d33efa3d45bfaf53e3e5 jdk9-b03 -fa2ec6b6b1697ae4a78b03b609664dc6b47dee86 jdk9-b04 -1d5e6fc88a4cca287090c16b0530a0d5849a5603 jdk9-b05 -31946c0a3f4dc2c78f6f09a0524aaa2a0dad1c78 jdk9-b06 -e25d44c21b29e155734f8d832f2edac3d0debe35 jdk9-b07 -ea02d24b3f1dd1417132d6587dd38b056cca0be2 jdk9-b08 -2d13524486b46a0f879361fbadf68fe42d02d221 jdk9-b09 -7736a820af6f15cef9a1499f122e40abc83b2fbd jdk9-b10 -f04fccfbd880c819affc3ef33e0083aab9556409 jdk9-b11 -72efbe612e494f98b9c3ede1b4a3d02304e1e9cc jdk9-b12 -2c8bb81b5d48161019218c7604fa88c67edc6105 jdk9-b13 -1df3f53b9d980b66739f05e14053381ffb0f38ee jdk9-b14 -8666a9611eb8ba711b001bf8d942282e3e2d8e3d jdk9-b15 -7d67ebd3e35c3c36ad2caee482a84f8310d2f838 jdk9-b16 -b64f8d5b97faa29e4d629bf4e56ebe0e26c40ecc jdk9-b17 -fd8da51c5df4546995c360fc49f0b985cbf8fbd3 jdk9-b18 -a9accd7c44159f191ad09740d54493e563c39f95 jdk9-b19 -31acbc476a5251824f919df0b82bca9cbb19cf7c jdk9-b20 -fa0d1059a26f82f95620b7dc8bbfbe302bce8883 jdk9-b21 -aca19c52b24627a6b085cfeb433051a3e420cd81 jdk9-b22 -0402a91cd14b530b6e98452341ff853717948239 jdk9-b23 -980b18627fd3f4936be2d9e2b013abb461cb2ddb jdk9-b24 -d60b572d759449913d02478219ad87e0574a3909 jdk9-b25 -5b20a93f8db0b87b902bde48bb7cbb05e88e6e9c jdk9-b26 -10fc81ac75b445528851c9e46c6eeb4438d4e363 jdk9-b27 -016786f793149135ab6b23c71087c1ca12691d77 jdk9-b28 -13705e2ddeb20a78e066595a1709e61f257189e9 jdk9-b29 -ef5427c13e1e741c457a2ed868e3b6d6bf717754 jdk9-b30 -0046d55383a9d873ffbc7253d7c5e28ab98c5bea jdk9-b31 -ad99965443d19a59e810ae67b0b742bb9722f5ed jdk9-b32 -e891e0c4edc5174a4da6d19dc2d59697b79f1916 jdk9-b33 -e18407fcede818b30709913784cb6b904030531d jdk9-b34 -b8e7bbdd806465a916e64413c283075ceb0a782c jdk9-b35 -c536541235e566701ff772700c15de14b75e2979 jdk9-b36 -478972d90f7bf5002615c5b2fb1ec3e0338fcadd jdk9-b37 -5ad591bc3ef6d1b30b215cb9c228bf94aac6dc7c jdk9-b38 -5ff1cd07bd9297e82cfea5ec01249d162260fe4e jdk9-b39 -c286272a81dd8f6005e22fed0238c4a3f75188c7 jdk9-b40 -f7ce2cfa4cdbec0ae0f46080484eace66be7987a jdk9-b41 -23a3a063a906a91ba696d792f0eeabf157cd2f86 jdk9-b42 -6a06008aec10d32898ca665685f531c681b28f5f jdk9-b43 -de2ce70d907c9f227b802cea29285bece5194cd5 jdk9-b44 -73bbdcf236b297a0c1b8875f2eeba65eaf7ade60 jdk9-b45 -e272d9be5f90edb6bb6b40f7816ec85eec0f5dc2 jdk9-b46 -230c139552501e612dd0d4423ac30f94c1201c0d jdk9-b47 -5b102fc29edf8b7eee7df208d8a8bba0e0a52f3a jdk9-b48 -15c79f28e30a1be561abe0d67674232ad5034d32 jdk9-b49 -1ccb6ef2f40bf9961b27adac390a6fc5181aa1fc jdk9-b50 -7c44d9a33bbea75f5d91625df9bbccea360aea2a jdk9-b51 -ee20efe0255d7ac6e06e88e06f7c72f6c6da7bf9 jdk9-b52 -99ff00581f3633c1787bec21f2a8f3a2ffe57665 jdk9-b53 -ed34864f3b43a7df394fce6c3f0bc86b70a5d686 jdk9-b54 -32a2e724988499e6f68611a65168c5f2fde0f6b9 jdk9-b55 -5ee7bba6ef41447f921184e8522da36734aec089 jdk9-b56 -ec977a00cecbf0007b0fa26c7af2852d57a79cad jdk9-b57 -07ce89fec30165a2f1212047bd23b30086ed1e74 jdk9-b58 -a598534d277e170a0bbf177bd54d9d179245532b jdk9-b59 -81bdc4545337c404bb87373838c983584a49afd6 jdk9-b60 -0eb91327db5a840779cc5c35b9b858d6ef7959d1 jdk9-b61 -40058141a4ec04a3d4cacdb693ad188a5ddf48ed jdk9-b62 -a28b7f42dae9bd59513beaa5a2d6eb563dc09e08 jdk9-b63 -809d66512998789b620d08c335d7c31211a0cf29 jdk9-b64 -4fcf722b811406a7db8f206d88446c82cda1b5f4 jdk9-b65 -fd6bda430d96fc5ab421161de016412f2ddd9082 jdk9-b66 -fd782cd69b0497299269952d30a6b88cad960fcf jdk9-b67 -c71857c93f57c63be44258d3d67e656c2bacdb45 jdk9-b68 -931ec7dd6cd9e4a92bde7b2cd26e9a9fb0ecdb56 jdk9-b69 -d732d6dfa72743e3aa96375c6e33f1388dbaa5c6 jdk9-b70 -dc35e315436d21eab68ef44909922fb3424917f3 jdk9-b71 -832e51533706b633d37a77282ae94d016b95e649 jdk9-b72 -1fccc38cd6f56cb2173195e317ba2784b484c2d1 jdk9-b73 -02681b7c4232ba5d43ccba794492db9502211ff0 jdk9-b74 -827915d1e55eac4f2e138f9b8c79d154862c2284 jdk9-b75 -80ab772222fb6b85f8174bf97261178ee4026620 jdk9-b76 -6ec3d5cb1bfcfba135c8d18866e567f1b1ada861 jdk9-b77 -7fd155b7041c8aba7084f03e2fd1d6f74cceda75 jdk9-b78 -eaab8a16dcfb807acacdb6d133f3ecd502667a8c jdk9-b79 -c5671e662392df372b2005b75afa6cfdc0eebce7 jdk9-b80 -ead8b7192f00417185f0e64d0cb332f0f8ad4ae1 jdk9-b81 -d68904d5a00e7e6c714e11f7ec9d0689af959d79 jdk9-b82 -6b3b94a2ebca4a99b2effefb2a1556cee954fd2f jdk9-b83 -e3445ccab58f741801021dec9aa46e7f2c09efd9 jdk9-b84 -7ef2c66892a3af15540c2800104c660c4f7f45e9 jdk9-b85 -130a7c2a85900dde04e119bc36853b73146e3414 jdk9-b86 -45f796d8cdcd8dbde5d4d660c3e749a14c923e6d jdk9-b87 -ac57d80b205db48d726084ade228e0199735831b jdk9-b88 -16873e56156e9917ad97ba5da0d0abe44fc94003 jdk9-b89 -00a25f93cee8a82096a0736716da392cafdb0cb0 jdk9-b90 -79501a97ca5720af846509f4bf3c6c04d7bdf82a jdk9-b91 -a3415b57507c928af8f2ad1c771eebafcd00c6c7 jdk9-b92 -7f880f98506c9046f8fb69597a41762ea1b7d042 jdk9-b93 -8356d7a909a29f321e3eaf9d3c2bbc71648529e2 jdk9-b94 -c35ddcde581676275cfeff33e1a2b90b902593d9 jdk-9+95 -d2a44416cba39957ea231eedc2fb8aad7be1b30c jdk-9+96 -ae8cdc734bab4f19ef8babd2434dcf024672ad38 jdk-9+97 -345520da2ec17100cb512a53d541a307a195305e jdk-9+98 -cb73b474703e2de266542b505cffd658bcc052da jdk-9+99 -51136404ee5e6cd5868b60d66ebd55a02170b508 jdk-9+100 -3b3bea483542bc08278af529fb25f2e5930da945 jdk-9+101 -6149fc30cd710eb3484dc9863d8837ecaedb96b6 jdk-9+102 -94cfc50c1b8a74fd7b0ed2e9e4f4a9dab4f2c6a1 jdk-9+103 -3f60a4808377a276f6398ff19e61c1b9086f4d97 jdk-9+104 -81bd82222f8a1f2b291a44a49e063973caa4e73b jdk-9+105 -dd05d3761a341143ef4a6b1a245e0960cc125b76 jdk-9+106 -7a0c343551497bd0e38ad69a77cc57d9f396615a jdk-9+107 -fd18a155ad22f62e06a9b74850ab8609d415c752 jdk-9+108 -f5991c73ed73b9a355a090b65c8d7fb9a1901f89 jdk-9+109 -9b4c916633f8d61509a3dc6175efdf185b421343 jdk-9+110 -9adfb22ff08f2e82c7801b272607cd685976dbb1 jdk-9+111 -3d4117c36559b344a73f786d39cc7626b4d8e2c0 jdk-9+112 -4e87682893e662421af10a62d29ae822ce0fea04 jdk-9+113 -cba09a2e6ae969b029783eb59bb01017b78f8eef jdk-9+114 -31c8b18fdc5b94a2ddd5ea0694f350a2c907e9f7 jdk-9+115 -3e3553ee39d9e081573bc7c88a252214a3152763 jdk-9+116 -59adcdd0cd3b6724b4fc0083c258bf4682689f2f jdk-9+117 -59a16fa5dedea9ff5bea0a501e4d0d40193426f3 jdk-9+118 -6347efd1be03b4fdcf18f64c4fe4be5f60c0831a jdk-9+119 -0f81cdd51b42ad38fbceae40985e9bd0bca12180 jdk-9+120 -095bd53bdd1ef211a473553a95ee625fcfbc3f59 jdk-9+121 -203a9e1b82b6cc7918f96a92e5a7eb28eafcdd18 jdk-9+122 -d0c742ddfb01ebe427720798c4c8335023ae20f8 jdk-9+123 -26aa3caa778eab1c931910149c414783ee83bce7 jdk-9+124 -2d65e127e93d5ff0df61bf78e57d7f46a2f1edeb jdk-9+125 -ea4eea2997b9e2f26cd7965839921710ff4065c8 jdk-9+126 -a42768b48cb0c5af9063e12093975baeeca3b5fa jdk-9+127 -2764986661b6d339ba73af52d69d3506ce12e648 jdk-9+128 -e181909291981038b041ed4d22714c4760e049cd jdk-9+129 -3665ebc22a42c8f33777ee025ba0e300e6086a8c jdk-9+130 -aebfafc43714d5a27d5064d8a0011eaccde633cf jdk-9+131 -2c17b65a37a8d7afdb9f96d5f11b28a3f21c78f2 jdk-9+132 -7efa4b3477b2b93edbdb4abf827b74c6391f056e jdk-9+133 -f08683786207a48b652266b3b7b908e6c863c3fc jdk-9+134 -af5eb8f3ffd21288305a54ea177ffad75021a741 jdk-9+135 -c8f02f0ecbd7cd6700f47416e4b7e9d5ec20ad77 jdk-9+136 -dd56c243c199a540c9f1fbff4855f0934b32a9d0 jdk-9+137 -90dd93e668a521642382561c47abe96ee2e065b7 jdk-9+138 -17a82cb0e4b480e97021691d39917f15e3f7b653 jdk-9+139 -6842e63d6c3971172214b411f29965852ca175d1 jdk-9+140 -296c875051187918f8f3f87e9432036d13013d39 jdk-9+141 -d245e56f4a79a8a8d18bd143c08f079ee98ab638 jdk-9+142 -6ef8a1453577832626b0efb7f70a3102b721ebbf jdk-9+143 -47871e348144bafddea0ede3a44299461e254a2d jdk-9+144 -cb9e896265ef45295fdd09986dee76624e4d41e4 jdk-9+145 -26f972dc2d174a75bc32131c29661c78568586b0 jdk-9+146 -76389430a13e82a9321cdc085216f6bff526e316 jdk-9+147 -586c93260d3b2f91a055b96118b141c05841694f jdk-9+148 -4d4cd7cd731c1952d7330ea5bcfda8bd26820fa5 jdk-9+149 -e5a42ddaf633fde14b983f740ae0e7e490741fd1 jdk-9+150 -4f348bd05341581df84ff1510d5b3a9b5b488367 jdk-9+151 -5b6f12de6f9167a582fa2c6ac54e69c591b09e68 jdk-9+152 -03f48cd283f5dd6b7153fd7e0cf2df8582b14391 jdk-9+153 -b670e95106f5327a29e2e2c4f18ee48a8d36e481 jdk-10+0 -6a9dd3d893b0a493a3e5d8d392815b5ee76a02d9 jdk-9+154 -dfcfdb2db85f1bb434209f56ca557ea6f9830aa8 jdk-9+155 -6f91e41163bc09e9b3ec72e8d1185f39296ee5d4 jdk-9+156 -ce999290d1c31bf8b28c51b1890268cc73cd4722 jdk-10+1 -162b521af7bb097019a8afaa44e1f8069ce274eb jdk-9+157 -4eb737a8d439f49a197e8000de26c6580cb4d57b jdk-9+158 -39449d2a6398fee779630f041c55c0466f5fd2c0 jdk-9+159 -0f4fef68d2d84ad78b3aaf6eab2c07873aedf971 jdk-9+160 -2340259b31554a3761e9909953c8ab8ef124ac07 jdk-9+161 -440c45c2e8cee78f6883fa6f2505a781505f323c jdk-9+162 -24582dd2649a155876de89273975ebe1adb5f18c jdk-9+163 -c7f3df19667b093538c6eecb73dcb3fb531706b4 jdk-9+164 -98108b7d4cb6078773e2d27ad8471dc25d4d6124 jdk-9+165 -2a8b403a623320479705aad04ed8d78396661eb7 jdk-9+166 -657b68876fe39c6104c8a6350b746203edfd9da2 jdk-10+2 -e5689e13301ec65d8fba8ae7e581b1cb3bf5a391 jdk-10+3 -ef9180164e0847387519152d08bbcbcf9da0606d jdk-10+4 -6190dbeac954c5efd64201a8ab04d393330ff192 jdk-10+5 -2b33ceb2cee7ba561657ed69fcb14d6cf0543f3d jdk-10+6 -f260f1a2acf616509a4ee5a29bc7f2acca3853e3 jdk-9+167 -bc21e5ba6bf1538551093f57fa0f1a6571be05cc jdk-9+168 -0e522ff8b9f52a9d4929af9a6aa84110f4dcd81d jdk-9+169 -18355c879c69a33167f1862896738a7b9a4da729 jdk-9+170 -85581ae8a97f20fd2f817a71eb3cd7b04e492722 jdk-10+7 -6d9a33d72d0647f3981c9d9c636a6f1290689895 jdk-10+8 -a8e4d2286ebaf93c0f69fb4bbd399253f396db00 jdk-10+9 -aae59039c1f5701ae933c5eed30e75d6e3afaeee jdk-9+171 -48a87c3414d374e3a26ddb270318c9af10de4b32 jdk-10+10 -03669efa77f51852f5301623cad4a2e1bb4fb9f6 jdk-9+172 -daa70bfed35ecf0575884c954dc95135e0f94b29 jdk-10+11 -123eb0956a459bca29d0812c62fca50da563ee40 jdk-9+173 -50c077995aa249890ece698a2a2db4c4fba90e10 jdk-9+174 -2bd34895dda246cff9e713401f3544260dfbe80f jdk-10+12 -83f6eb009d8f6e94fd348c7d23e4b00754d745db jdk-9+175 -123f40b60a18225b1485fad891e3fa173a10e5af jdk-10+13 -add6717b655efa3aa9350e917175f3965cfc0729 jdk-10+14 -0d0ac75b0f6cbe218362e3fac4bb443496e7258f jdk-9+176 -2f01728210c1405ef459e69d9c7247b5df6abb78 jdk-9+177 -2b9273266ea629ca686239c416a7ff8a592d822a jdk-10+15 -4070d214e88729006184a4abbe8f494fcec6afb6 jdk-10+16 -849e366ef175012e6dedc3ca151da416716e0ea9 jdk-9+178 -b653b1b2ea883593596bc18e9af73a9b369eeb0a jdk-9+179 -41028d8c0a71c6beaf1886ca095e703fbb1513ec jdk-10+17 -bc2a67fe6b7fcec3a33e3912e27efec83ec6b52c jdk-10+18 -acda582f271a2c776b0391fc93dd669b1d44d461 jdk-10+19 -e2096f634fb46d469c9f8cada7dc5e27d1409b1f jdk-9+180 -5ecbed31312536cc2f3c454425c7607385ff8834 jdk-9+181 -d78323fc3fd5fc443e3be8f88bf874ca3744c2a1 jdk-10+20 -fd3ce6210d0c53489ba231ee83ff61f9a3cd3288 jdk-10+21 -9fa96500eb1538b9cfd70099f8c47dc59a31e208 jdk-10+22 diff --git a/langtools/.jcheck/conf b/langtools/.jcheck/conf deleted file mode 100644 index ad4189d7de5..00000000000 --- a/langtools/.jcheck/conf +++ /dev/null @@ -1,2 +0,0 @@ -project=jdk10 -bugids=dup diff --git a/langtools/ASSEMBLY_EXCEPTION b/langtools/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d90239..00000000000 --- a/langtools/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/langtools/LICENSE b/langtools/LICENSE deleted file mode 100644 index 8b400c7ab81..00000000000 --- a/langtools/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/langtools/README b/langtools/README deleted file mode 100644 index 94beb071e92..00000000000 --- a/langtools/README +++ /dev/null @@ -1,43 +0,0 @@ -Building the "langtools" workspace. - -The "langtools" workspace can be built from the command line with Ant. -The build file is make/build.xml, in conjunction with make/build.properties. -Some additional user-specific properties files are also read, to allow -you to customize selected properties as needed. - -Individual tools within the workspace can also be built and worked on -with NetBeans, using the projects in the make/netbeans directory. - -The "langtools" workspace can also be built from the command line with -GNU Make, although the Makefile is simply a wrapper around the Ant -build file. This is provided for systems (such as the full OpenJDK build) -that expect to be able to build this workspace with GNU Make. - -System Requirements: - Ant: version 1.6.5 or later - NetBeans: version 6.0 or later (optional) - JDK: currently version 1.5.0, although 1.6.0 is recommended - OS: any system supporting the above tools - -For more information: - Ant: http://ant.apache.org/ - GNU Make: http://www.gnu.org/software/make/ - NetBeans: http://www.netbeans.org/ - - -Testing the "langtools" workspace. - -The primary set of tests for the compiler is the compiler TCK. This -tests that the compiler performs according to the specifications in -JLS and JVMS. - -In addition, there is a substantial collection of regression and unit -tests for all the tools in the main langtools test/ directory. - -Finally, there is a small set of tests to do basic validation of a build -of the langtools workspace for use by JDK. These tests check the contents -of the dist/ directory generated by the build, and verify that the various -tools can do basic "Hello World"-style processing. These tests should be -run by jtreg, with the -jdk option set a version of JDK capable of running -the default output of the javac compiler in this workspace. Currently, -this means JDK 6 or better. diff --git a/langtools/src/sample/share/javac/processing/src/CheckNamesProcessor.java b/langtools/src/sample/share/javac/processing/src/CheckNamesProcessor.java deleted file mode 100644 index e8ecdda02e0..00000000000 --- a/langtools/src/sample/share/javac/processing/src/CheckNamesProcessor.java +++ /dev/null @@ -1,548 +0,0 @@ -/* - * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * - Neither the name of Oracle nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.util.Set; -import java.util.EnumSet; - -import javax.annotation.processing.*; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; -import static javax.lang.model.SourceVersion.*; -import static javax.lang.model.element.Modifier.*; -import static javax.lang.model.element.ElementKind.*; -import static javax.lang.model.type.TypeKind.*; -import static javax.lang.model.util.ElementFilter.*; -import static javax.tools.Diagnostic.Kind.*; - -/** - * A sample processor to check naming conventions are being followed. - * - *

How to run this processor from the command line

- *
    - *
  1. Compile this file; for example
    - * {@code javac -d procdir CheckNamesProcessor.java} - *
  2. Use {@code javac} to run the annotation processor on itself:
    - * {@code javac -processorpath procdir -processor CheckNamesProcessor -proc:only CheckNamesProcessor.java} - *
- * - *

Another way to run this processor from the command line

- *
    - *
  1. Compile the processor as before - * - *
  2. Create a UTF-8 encoded text file named {@code - * javax.annotation.processing.Processor} in the {@code - * META-INF/services} directory. The contents of the file are a list - * of the binary names of the concrete processor classes, one per - * line. This provider-configuration file is used by {@linkplain - * java.util.ServiceLoader service-loader} style lookup. - * - *
  3. Create a {@code jar} file with the processor classes and - * {@code META-INF} information. - * - *
  4. Such a {@code jar} file can now be used with the discovery - * process without explicitly naming the processor to run:
    - * {@code javac -processorpath procdir -proc:only CheckNamesProcessor.java} - * - *
- * - *

Possible Enhancements

- *
    - * - *
  • Support an annotation processor option to control checking - * exported API elements ({@code public} and {@code protected} ones) - * or all elements - * - *
  • Print out warnings that are more informative - * - *
  • Return a true/false status if any warnings were printed or - * compute and return name warning count - * - *
  • Implement checks of package names - * - *
  • Use the Tree API, com.sun.source, to examine names within method bodies - * - *
  • Define an annotation type whose presence can indicate a - * different naming convention is being followed - * - *
  • Implement customized checks on elements in chosen packages - * - *
- * - * @author Joseph D. Darcy - */ -@SupportedAnnotationTypes("*") // Process (check) everything -public class CheckNamesProcessor extends AbstractProcessor { - private NameChecker nameChecker; - - /** - * Check that the names of the root elements (and their enclosed - * elements) follow the appropriate naming conventions. This - * processor examines all files regardless of whether or not - * annotations are present; no new source or class files are - * generated. - * - *

Processors that actually process specific annotations should - * not report supporting {@code *}; this could cause - * performance degradations and other undesirable outcomes. - */ - @Override - public boolean process(Set annotations, - RoundEnvironment roundEnv) { - if (!roundEnv.processingOver()) { - for (Element element : roundEnv.getRootElements() ) - nameChecker.checkNames(element); - } - return false; // Allow other processors to examine files too. - } - - @Override - public void init(ProcessingEnvironment processingEnv) { - super.init(processingEnv); - nameChecker = new NameChecker(processingEnv); - } - - @Override - public SourceVersion getSupportedSourceVersion() { - /* - * Return latest source version instead of a fixed version - * like RELEASE_9. To return a fixed version, this class could - * be annotated with a SupportedSourceVersion annotation. - * - * Warnings will be issued if any unknown language constructs - * are encountered. - */ - return SourceVersion.latest(); - } - - /** - * Provide checks that an element and its enclosed elements follow - * the usual naming conventions. - * - *

Conventions from section 6.8 of - * The Java™ Language Specification - * - *

    - *
  • Classes and interfaces: camel case, first letter is uppercase - *
  • Methods: camel case, first letter is lowercase - *
  • Type variables: one uppercase letter - *
  • Fields - *
      - *
    • non-final: camel case, initial lowercase - *
    • constant: uppercase separated by underscores - *
    - *
  • Packages: checks left as exercise for the reader, see section 7.7 of - * The Java™ Language Specification. - *
- */ - private static class NameChecker { - private final Messager messager; - private final Types typeUtils; - - NameCheckScanner nameCheckScanner = new NameCheckScanner(); - - NameChecker(ProcessingEnvironment processsingEnv) { - this.messager = processsingEnv.getMessager(); - this.typeUtils = processsingEnv.getTypeUtils(); - } - - /** - * If the name of the argument or its enclosed elements - * violates the naming conventions, report a warning. - */ - public void checkNames(Element element) { - // Implement name checks with a visitor, but expose that - // functionality through this method instead. - nameCheckScanner.scan(element); - } - - /** - * Visitor to implement name checks. - */ - private class NameCheckScanner extends ElementScanner9 { - // The visitor could be enhanced to return true/false if - // there were warnings reported or a count of the number - // of warnings. This could be facilitated by using - // Boolean or Integer instead of Void for the actual type - // arguments. In more detail, one way to tally the number - // of warnings would be for each method to return the sum - // of the warnings it and the methods it called issued, a - // bottom-up computation. In that case, the first type - // argument would be Integer and the second type argument - // would still be Void. Alternatively, the current count - // could be passed along in Integer parameter p and each - // method could return the Integer sum of p and the - // warnings the method issued. Some computations are more - // naturally expressed in one form instead of the other. - // If greater control is needed over traversal order, a - // SimpleElementVisitor can be extended instead of an - // ElementScanner. - - /** - * Check the name of a type and its enclosed elements and - * type parameters. - */ - @Override - public Void visitType(TypeElement e, Void p) { - scan(e.getTypeParameters(), p); // Check the names of any type parameters - checkCamelCase(e, true); // Check the name of the class or interface - super.visitType(e, p); // Check the names of any enclosed elements - return null; - } - - /** - * Check the name of an executable (method, constructor, - * etc.) and its type parameters. - */ - @Override - public Void visitExecutable(ExecutableElement e, Void p) { - scan(e.getTypeParameters(), p); // Check the names of any type parameters - - // Check the name of the executable - if (e.getKind() == METHOD) { - // Make sure that a method does not have the same - // name as its class or interface. - Name name = e.getSimpleName(); - if (name.contentEquals(e.getEnclosingElement().getSimpleName())) - messager.printMessage(WARNING, - "A method should not have the same name as its enclosing type, ``" + - name + "''." , e); - checkCamelCase(e, false); - } - // else constructors and initializers don't have user-defined names - - // At this point, could use the Tree API, - // com.sun.source, to examine the names of entities - // inside a method. - super.visitExecutable(e, p); - return null; - } - - /** - * Check the name of a field, parameter, etc. - */ - @Override - public Void visitVariable(VariableElement e, Void p) { - if (!checkForSerial(e)) { // serialVersionUID checks - // Is the variable a constant? - if (e.getKind() == ENUM_CONSTANT || - e.getConstantValue() != null || - heuristicallyConstant(e) ) - checkAllCaps(e); // includes enum constants - else - checkCamelCase(e, false); - } - // A call to super can be elided with the current language definition. - // super.visitVariable(e, p); - return null; - } - - /** - * Check the name of a type parameter. - */ - @Override - public Void visitTypeParameter(TypeParameterElement e, Void p) { - checkAllCaps(e); - // A call to super can be elided with the current language definition. - // super.visitTypeParameter(e, p); - return null; - } - - /** - * Check the name of a package. - */ - @Override - public Void visitPackage(PackageElement e, Void p) { - /* - * Implementing the checks of package names is left - * as an exercise for the reader, see JLS section - * 7.7 for conventions. - */ - - // Whether or not this method should call - // super.visitPackage, to visit the packages enclosed - // elements, is a design decision based on what a - // PackageElemement is used to mean in this context. - // A PackageElement can represent a whole package, so - // it can provide a concise way to indicate many - // user-defined types should be visited. However, a - // PackageElement can also represent a - // package-info.java file, as would be in the case if - // the PackageElement came from - // RoundEnvironment.getRootElements. In that case, - // the package-info file and other files in that - // package could be passed in. Therefore, without - // further checks, types in a package could be visited - // more than once if a package's elements were visited - // too. - return null; - } - - /** - * Check the name of a module. - */ - @Override - public Void visitModule(ModuleElement e, Void p) { - /* - * Implementing the checks of package names is left as - * an exercise for the reader. - */ - - // Similar to the options of how visiting a package - // could be handled, whether or not this method should - // call super and scan, etc. is a design choice on - // whether it is desired for a ModuleElement to - // represent a module-info file or for the - // ModuleElement to represent the entire contents of a - // module, including its packages. - return null; - } - - @Override - public Void visitUnknown(Element e, Void p) { - // This method will be called if a kind of element - // added after JDK 9 is visited. Since as of this - // writing the conventions for such constructs aren't - // known, issue a warning. - messager.printMessage(WARNING, - "Unknown kind of element, " + e.getKind() + - ", no name checking performed.", e); - return null; - } - - // All the name checking methods assume the examined names - // are syntactically well-formed identifiers. - - /** - * Return {@code true} if this variable is a field named - * "serialVersionUID"; false otherwise. A true - * serialVersionUID of a class has type {@code long} and - * is static and final. - * - *

To check that a Serializable class defines a proper - * serialVersionUID, run javac with -Xlint:serial. - * - * @return true if this variable is a serialVersionUID field and false otherwise - */ - private boolean checkForSerial(VariableElement e) { - // If a field is named "serialVersionUID" ... - if (e.getKind() == FIELD && - e.getSimpleName().contentEquals("serialVersionUID")) { - // ... issue a warning if it does not act as a serialVersionUID - if (!(e.getModifiers().containsAll(EnumSet.of(STATIC, FINAL)) && - typeUtils.isSameType(e.asType(), typeUtils.getPrimitiveType(LONG)) && - e.getEnclosingElement().getKind() == CLASS )) // could check that class implements Serializable - messager.printMessage(WARNING, - "Field named ``serialVersionUID'' is not acting as such.", e); - return true; - } - return false; - } - - /** - * Using heuristics, return {@code true} is the variable - * should follow the naming conventions for constants and - * {@code false} otherwise. For example, the public - * static final fields ZERO, ONE, and TEN in - * java.math.BigDecimal are logically constants (and named - * as constants) even though BigDecimal values are not - * regarded as constants by the language specification. - * However, some final fields may not act as constants - * since the field may be a reference to a mutable object. - * - *

These heuristics could be tweaked to provide better - * fidelity. - * - * @return true if the current heuristics regard the - * variable as a constant and false otherwise. - */ - private boolean heuristicallyConstant(VariableElement e) { - // Fields declared in interfaces are logically - // constants, JLSv3 section 9.3. - if (e.getEnclosingElement().getKind() == INTERFACE) - return true; - else if (e.getKind() == FIELD && - e.getModifiers().containsAll(EnumSet.of(PUBLIC, STATIC, FINAL))) - return true; - else { - // A parameter declared final should not be named like - // a constant, neither should exception parameters. - return false; - } - } - - /** - * Print a warning if an element's simple name is not in - * camel case. If there are two adjacent uppercase - * characters, the name is considered to violate the - * camel case naming convention. - * - * @param e the element whose name will be checked - * @param initialCaps whether or not the first character should be uppercase - */ - private void checkCamelCase(Element e, boolean initialCaps) { - String name = e.getSimpleName().toString(); - boolean previousUpper = false; - boolean conventional = true; - int firstCodePoint = name.codePointAt(0); - - if (Character.isUpperCase(firstCodePoint)) { - previousUpper = true; - if (!initialCaps) { - messager.printMessage(WARNING, - "Name ``" + name + "'' should start in lowercase.", e); - return; - } - } else if (Character.isLowerCase(firstCodePoint)) { - if (initialCaps) { - messager.printMessage(WARNING, - "Name ``" + name + "'' should start in uppercase.", e); - return; - } - } else // underscore, etc. - conventional = false; - - if (conventional) { - int cp = firstCodePoint; - for (int i = Character.charCount(cp); - i < name.length(); - i += Character.charCount(cp)) { - cp = name.codePointAt(i); - if (Character.isUpperCase(cp)){ - if (previousUpper) { - conventional = false; - break; - } - previousUpper = true; - } else - previousUpper = false; - } - } - - if (!conventional) - messager.printMessage(WARNING, - "Name ``" + name + "'', should be in camel case.", e); - } - - /** - * Print a warning if the element's name is not a sequence - * of uppercase letters separated by underscores ("_"). - * - * @param e the element whose name will be checked - */ - private void checkAllCaps(Element e) { - String name = e.getSimpleName().toString(); - /* - * Traditionally type variables are recommended to - * have one-character names. As an exercise for the - * reader, a more nuanced policy can be implemented. - */ - if (e.getKind() == TYPE_PARAMETER) { - if (name.codePointCount(0, name.length()) > 1 || - // Assume names are non-empty - !Character.isUpperCase(name.codePointAt(0))) - messager.printMessage(WARNING, - "A type variable's name,``" + name + - "'', should be a single uppercace character.", - e); - } else { - boolean conventional = true; - int firstCodePoint = name.codePointAt(0); - - // Starting with an underscore is not conventional - if (!Character.isUpperCase(firstCodePoint)) - conventional = false; - else { - // Was the previous character an underscore? - boolean previousUnderscore = false; - int cp = firstCodePoint; - for (int i = Character.charCount(cp); - i < name.length(); - i += Character.charCount(cp)) { - cp = name.codePointAt(i); - if (cp == (int) '_') { - if (previousUnderscore) { - conventional = false; - break; - } - previousUnderscore = true; - } else { - previousUnderscore = false; - if (!Character.isUpperCase(cp) && !Character.isDigit(cp) ) { - conventional = false; - break; - } - } - } - } - - if (!conventional) - messager.printMessage(WARNING, - "A constant's name, ``" + name + "'', should be ALL_CAPS.", - e); - } - } - - } - } -} - -/** - * Lots of bad names. Don't write code like this! - * - * The unmodified name checks will print 11 warnings for this class. - */ -class BADLY_NAMED_CODE { - enum colors { - red, - blue, - green; - } - - // Don't start the name of a constant with an underscore - static final int _FORTY_TWO = 42; - - // Non-constants shouldn't use ALL_CAPS - public static int NOT_A_CONSTANT = _FORTY_TWO; - - // *Not* a serialVersionUID - private static final int serialVersionUID = _FORTY_TWO; - - // Not a constructor - protected void BADLY_NAMED_CODE() { - return; - } - - public void NOTcamelCASEmethodNAME() { - return; - } -} diff --git a/langtools/src/sample/share/language/model/CoreReflectionFactory.java b/langtools/src/sample/share/language/model/CoreReflectionFactory.java deleted file mode 100644 index 6c6a32dc003..00000000000 --- a/langtools/src/sample/share/language/model/CoreReflectionFactory.java +++ /dev/null @@ -1,3767 +0,0 @@ -/* - * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * - Neither the name of Oracle nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.lang.annotation.Annotation; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.element.*; -import javax.lang.model.element.Modifier; -import javax.lang.model.type.*; -import javax.lang.model.util.*; -import java.lang.reflect.*; -import java.io.Writer; -import java.util.*; - -import static javax.lang.model.SourceVersion.RELEASE_9; -import static java.util.Objects.*; - -/** - * This class provides a proof-of-concept implementation of the {@code - * javax.lang.model.*} API backed by core reflection. That is, rather - * than having a source file or compile-time class file as the - * originator of the information about an element or type, as done - * during standard annotation processing, runtime core reflection - * objects serve that purpose instead. - * - * With this kind of implementation, the same logic can be used for - * both compile-time and runtime processing of annotations. - * - * The nested types in this class define a specialization of {@code - * javax.lang.model.*} to provide some additional functionality and - * type information. The original {@code javax.lang.model.*} API was - * designed to accommodate such a specialization by using wildcards in - * the return types of methods. - * - * It would be technically possible for further specializations of the - * API implemented in this class to define alternative semantics of - * annotation look-up. For example to allow one annotation to have the - * effect of macro-expanding into a set of other annotations. - * - * Some aspects of the implementation are left as "exercises for the - * reader" to complete if interested. - * - * When passed null pointers, the methods defined in this type will - * generally throw null pointer exceptions. - * - * To get started, first compile this file with a command line like: - * - * 

- * $JDK/bin/javac -parameters -Xdoclint:all/public -Xlint:all -d $OUTPUT_DIR CoreReflectionFactory.java
- *
- * - * and then run the main method of {@code CoreReflectionFactory}, - * which will print out a representation of {@code - * CoreReflectionFactory}. To use the printing logic defined in {@code - * javac}, put {@code tools.jar} on the classpath as in: - * - * 
- * $JDK/bin/java -cp $OUTPUT_DIR:$JDK_ROOT/lib/tools.jar CoreReflectionFactory
- *
- * - * @author Joseph D. Darcy (darcy) - * @author Joel Borggren-Franck (jfranck) - */ -public class CoreReflectionFactory { - private CoreReflectionFactory() { - throw new AssertionError("No instances of CoreReflectionFactory for you!"); - } - - /** - * Returns a reflection type element mirroring a {@code Class} object. - * @return a reflection type element mirroring a {@code Class} object - * @param clazz the {@code Class} to mirror - */ - public static ReflectionTypeElement createMirror(Class clazz) { - return new CoreReflTypeElement(Objects.requireNonNull(clazz)); - } - - /** - * Returns a reflection package element mirroring a {@code Package} object. - * @return a reflection package element mirroring a {@code Package} object - * @param pkg the {@code Package} to mirror - */ - public static ReflectionPackageElement createMirror(Package pkg) { - // Treat a null pkg to mean an unnamed package. - return new CoreReflPackageElement(pkg); - } - - /** - * Returns a reflection variable element mirroring a {@code Field} object. - * @return a reflection variable element mirroring a {@code Field} object - * @param field the {@code Field} to mirror - */ - public static ReflectionVariableElement createMirror(Field field) { - return new CoreReflFieldVariableElement(Objects.requireNonNull(field)); - } - - /** - * Returns a reflection executable element mirroring a {@code Method} object. - * @return a reflection executable element mirroring a {@code Method} object - * @param method the {@code Method} to mirror - */ - public static ReflectionExecutableElement createMirror(Method method) { - return new CoreReflMethodExecutableElement(Objects.requireNonNull(method)); - } - - /** - * Returns a reflection executable element mirroring a {@code Constructor} object. - * @return a reflection executable element mirroring a {@code Constructor} object - * @param constructor the {@code Constructor} to mirror - */ - public static ReflectionExecutableElement createMirror(Constructor constructor) { - return new CoreReflConstructorExecutableElement(Objects.requireNonNull(constructor)); - } - - /** - * Returns a type parameter element mirroring a {@code TypeVariable} object. - * @return a type parameter element mirroring a {@code TypeVariable} object - * @param tv the {@code TypeVariable} to mirror - */ - public static TypeParameterElement createMirror(java.lang.reflect.TypeVariable tv) { - return new CoreReflTypeParameterElement(Objects.requireNonNull(tv)); - } - - /** - * Returns a variable element mirroring a {@code Parameter} object. - * @return a variable element mirroring a {@code Parameter} object - * @param p the {Parameter} to mirror - */ - public static VariableElement createMirror(java.lang.reflect.Parameter p) { - return new CoreReflParameterVariableElement(Objects.requireNonNull(p)); - } - - /** - * Returns an annotation mirror mirroring an annotation object. - * @return an annotation mirror mirroring an annotation object - * @param annotation the annotation to mirror - */ - public static AnnotationMirror createMirror(Annotation annotation) { - return new CoreReflAnnotationMirror(Objects.requireNonNull(annotation)); - } - - /** - * Returns a {@code Types} utility object for type objects backed by core reflection. - * @return a {@code Types} utility object for type objects backed by core reflection - */ - public static Types getTypes() { - return CoreReflTypes.instance(); - } - - /** - * Returns an {@code Elements} utility object for type objects backed by core reflection. - * @return an {@code Elements} utility object for type objects backed by core reflection - */ - public static Elements getElements() { - return CoreReflElements.instance(); - } - - // Helper - private static TypeMirror createTypeMirror(Class c) { - return TypeFactory.instance(Objects.requireNonNull(c)); - } - - /** - * Main method; prints out a representation of this class. - * @param args command-line arguments, currently ignored - */ - public static void main(String... args) { - getElements().printElements(new java.io.PrintWriter(System.out), - createMirror(CoreReflectionFactory.class)); - } - - /** - * A specialization of {@code javax.lang.model.element.Element} that is - * backed by core reflection. - */ - public static interface ReflectionElement - extends Element, AnnotatedElement { - - /** - * {@inheritDoc} - */ - @Override - ReflectionElement getEnclosingElement(); - - /** - * {@inheritDoc} - */ - @Override - List getEnclosedElements(); - - /** - * Applies a visitor to this element. - * - * @param v the visitor operating on this element - * @param p additional parameter to the visitor - * @param the return type of the visitor's methods - * @param

the type of the additional parameter to the visitor's methods - * @return a visitor-specified result - */ - R accept(ReflectionElementVisitor v, P p); - - // Functionality specific to the specialization - /** - * Returns the underlying core reflection source object, if applicable. - * @return the underlying core reflection source object, if applicable - */ - AnnotatedElement getSource(); - - // Functionality from javax.lang.model.util.Elements - /** - * Returns the package of an element. The package of a package - * is itself. - * @return the package of an element - */ - ReflectionPackageElement getPackage(); - - } - - /** - * A logical specialization of {@code - * javax.lang.model.element.ElementVisitor} being backed by core - * reflection. - * - * @param the return type of this visitor's methods. - * @param

the type of the additional parameter to this visitor's - * methods. - */ - public static interface ReflectionElementVisitor { - /** - * Visits an element. - * @param e the element to visit - * @param p a visitor-specified parameter - * @return a visitor-specified result - */ - R visit(ReflectionElement e, P p); - - /** - * A convenience method equivalent to {@code v.visit(e, null)}. - * @param e the element to visit - * @return a visitor-specified result - */ - R visit(ReflectionElement e); - - /** - * Visits a package element. - * @param e the element to visit - * @param p a visitor-specified parameter - * @return a visitor-specified result - */ - R visitPackage(ReflectionPackageElement e, P p); - - /** - * Visits a type element. - * @param e the element to visit - * @param p a visitor-specified parameter - * @return a visitor-specified result - */ - R visitType(ReflectionTypeElement e, P p); - - /** - * Visits a variable element. - * @param e the element to visit - * @param p a visitor-specified parameter - * @return a visitor-specified result - */ - R visitVariable(ReflectionVariableElement e, P p); - - /** - * Visits an executable element. - * @param e the element to visit - * @param p a visitor-specified parameter - * @return a visitor-specified result - */ - R visitExecutable(ReflectionExecutableElement e, P p); - - /** - * Visits a type parameter element. - * @param e the element to visit - * @param p a visitor-specified parameter - * @return a visitor-specified result - */ - R visitTypeParameter(ReflectionTypeParameterElement e, P p); - - /** - * Visits an unknown kind of element. - * This can occur if the language evolves and new kinds - * of elements are added to the {@code Element} hierarchy. - * - * @param e the element to visit - * @param p a visitor-specified parameter - * @return a visitor-specified result - * @throws UnknownElementException - * a visitor implementation may optionally throw this exception - */ - R visitUnknown(ReflectionElement e, P p); - } - - /** - * A specialization of {@code javax.lang.model.element.ExecutableElement} that is - * backed by core reflection. - */ - public static interface ReflectionExecutableElement - extends ReflectionElement, ExecutableElement, ReflectionParameterizable { - - /** - * {@inheritDoc} - */ - @Override - List getTypeParameters(); - - /** - * {@inheritDoc} - */ - @Override - List getParameters(); - - // Functionality specific to the specialization - /** - * Returns all parameters, including synthetic ones. - * @return all parameters, including synthetic ones - */ - List getAllParameters(); - - /** - * {@inheritDoc} - */ - @Override - Executable getSource(); - - /** - * Returns true if this executable is a synthetic construct; returns false otherwise. - * @return true if this executable is a synthetic construct; returns false otherwise - */ - boolean isSynthetic(); - - /** - * Returns true if this executable is a bridge method; returns false otherwise. - * @return true if this executable is a bridge method; returns false otherwise - */ - boolean isBridge(); - } - - /** - * A specialization of {@code javax.lang.model.element.PackageElement} being - * backed by core reflection. - */ - public static interface ReflectionPackageElement - extends ReflectionElement, PackageElement { - - // Functionality specific to the specialization - /** - * {@inheritDoc} - */ - @Override - Package getSource(); - } - - /** - * A specialization of {@code javax.lang.model.element.TypeElement} that is - * backed by core reflection. - */ - public static interface ReflectionTypeElement - extends ReflectionElement, TypeElement, ReflectionParameterizable { - - /** - * {@inheritDoc} - */ - @Override - List getTypeParameters(); - - /** - * {@inheritDoc} - */ - @Override - List getEnclosedElements(); - - // Methods specific to the specialization, but functionality - // also present in javax.lang.model.util.Elements. - /** - * Returns all members of a type element, whether inherited or - * declared directly. For a class the result also includes its - * constructors, but not local or anonymous classes. - * @return all members of the type - */ - List getAllMembers(); - - /** - * Returns the binary name of a type element. - * @return the binary name of a type element - */ - Name getBinaryName(); - - // Functionality specific to the specialization - /** - * {@inheritDoc} - */ - @Override - Class getSource(); - } - - /** - * A specialization of {@code javax.lang.model.element.TypeParameterElement} being - * backed by core reflection. - */ - public static interface ReflectionTypeParameterElement - extends ReflectionElement, TypeParameterElement { - - /** - * {@inheritDoc} - */ - @Override - ReflectionElement getGenericElement(); - - // Functionality specific to the specialization - /** - * {@inheritDoc} - */ - @Override - java.lang.reflect.TypeVariable getSource(); - } - - /** - * A specialization of {@code javax.lang.model.element.VariableElement} that is - * backed by core reflection. - */ - public static interface ReflectionVariableElement - extends ReflectionElement, VariableElement { - - // Functionality specific to the specialization - /** - * Returns true if this variable is a synthetic construct; returns false otherwise. - * @return true if this variable is a synthetic construct; returns false otherwise - */ - boolean isSynthetic(); - - /** - * Returns true if this variable is implicitly declared in source code; returns false otherwise. - * @return true if this variable is implicitly declared in source code; returns false otherwise - */ - boolean isImplicit(); - - // The VariableElement concept covers fields, variables, and - // method and constructor parameters. Therefore, this - // interface cannot define a more precise override of - // getSource since those three concept have different core - // reflection types with no supertype more precise than - // AnnotatedElement. - } - - /** - * A specialization of {@code javax.lang.model.element.Parameterizable} being - * backed by core reflection. - */ - public static interface ReflectionParameterizable - extends ReflectionElement, Parameterizable { - @Override - List getTypeParameters(); - } - - /** - * Base class for concrete visitors of elements backed by core reflection. - */ - public static abstract class AbstractReflectionElementVisitor9 - extends AbstractElementVisitor9 - implements ReflectionElementVisitor { - protected AbstractReflectionElementVisitor9() { - super(); - } - } - - /** - * Base class for simple visitors of elements that are backed by core reflection. - */ - @SupportedSourceVersion(value=RELEASE_9) - public static abstract class SimpleReflectionElementVisitor9 - extends SimpleElementVisitor9 - implements ReflectionElementVisitor { - - protected SimpleReflectionElementVisitor9(){ - super(); - } - - protected SimpleReflectionElementVisitor9(R defaultValue) { - super(defaultValue); - } - - // Create manual "bridge methods" for now. - - @Override - public final R visitPackage(PackageElement e, P p) { - return visitPackage((ReflectionPackageElement) e , p); - } - - @Override - public final R visitType(TypeElement e, P p) { - return visitType((ReflectionTypeElement) e , p); - } - - @Override - public final R visitVariable(VariableElement e, P p) { - return visitVariable((ReflectionVariableElement) e , p); - } - - @Override - public final R visitExecutable(ExecutableElement e, P p) { - return visitExecutable((ReflectionExecutableElement) e , p); - } - - @Override - public final R visitTypeParameter(TypeParameterElement e, P p) { - return visitTypeParameter((ReflectionTypeParameterElement) e , p); - } - } - - /** - * {@inheritDoc} - */ - public static interface ReflectionElements extends Elements { - /** - * Returns the innermost enclosing {@link ReflectionTypeElement} - * of the {@link ReflectionElement} or {@code null} if the - * supplied ReflectionElement is toplevel or represents a - * Package. - * - * @param e the {@link ReflectionElement} whose innermost - * enclosing {@link ReflectionTypeElement} is sought - * @return the innermost enclosing {@link - * ReflectionTypeElement} or @{code null} if the parameter - * {@code e} is a toplevel element or a package - */ - ReflectionTypeElement getEnclosingTypeElement(ReflectionElement e); - - /** - * {@inheritDoc} - */ - @Override - List getAllMembers(TypeElement type); - - /** - * {@inheritDoc} - */ - @Override - ReflectionPackageElement getPackageElement(CharSequence name); - - /** - * {@inheritDoc} - */ - @Override - ReflectionPackageElement getPackageOf(Element type); - - /** - * {@inheritDoc} - */ - @Override - ReflectionTypeElement getTypeElement(CharSequence name); - } - - // ------------------------- Implementation classes ------------------------ - - // Exercise for the reader: review the CoreReflElement class - // hierarchy below with an eye toward exposing it as an extensible - // API that could be subclassed to provide customized behavior, - // such as alternate annotation lookup semantics. - - private static abstract class CoreReflElement - implements ReflectionElement, AnnotatedElement { - public abstract AnnotatedElement getSource(); - - protected CoreReflElement() { - super(); - } - - // ReflectionElement methods - @Override - public ReflectionPackageElement getPackage() { - throw new UnsupportedOperationException(); - } - - @Override - public TypeMirror asType() { - throw new UnsupportedOperationException(getClass().toString()); - } - - @Override - public List getAnnotationMirrors() { - Annotation[] annotations = getSource().getDeclaredAnnotations(); - int len = annotations.length; - - if (len > 0) { - List res = new ArrayList<>(len); - for (Annotation a : annotations) { - res.add(createMirror(a)); - } - return Collections.unmodifiableList(res); - } else { - return Collections.emptyList(); - } - } - - @Override - public Set getModifiers() { - return ModifierUtil.instance(0, false); - } - - @Override - public abstract Name getSimpleName(); - - @Override - public abstract ReflectionElement getEnclosingElement(); - - @Override - public abstract List getEnclosedElements(); - - //AnnotatedElement methods - @Override - public T getAnnotation(Class annotationClass) { - return getSource().getAnnotation(annotationClass); - } - - @Override - public T[] getAnnotationsByType(Class annotationClass) { - return getSource().getAnnotationsByType(annotationClass); - } - - @Override - public Annotation[] getAnnotations() { - return getSource().getAnnotations(); - } - - @Override - public T getDeclaredAnnotation(Class annotationClass) { - return getSource().getDeclaredAnnotation(annotationClass); - } - - @Override - public T[] getDeclaredAnnotationsByType(Class annotationClass) { - return getSource().getDeclaredAnnotationsByType(annotationClass); - } - - @Override - public Annotation[] getDeclaredAnnotations() { - return getSource().getDeclaredAnnotations(); - } - - // java.lang.Object methods - @Override - public boolean equals(Object obj) { - if (obj instanceof CoreReflElement) { - CoreReflElement other = (CoreReflElement)obj; - return Objects.equals(other.getSource(), this.getSource()); - } - return false; - } - - @Override - public int hashCode() { - return Objects.hashCode(getSource()); - } - - @Override - public String toString() { - return getKind().toString() + " " + getSimpleName().toString(); - } - } - - // Type - private static class CoreReflTypeElement extends CoreReflElement - implements ReflectionTypeElement { - private final Class source; - - protected CoreReflTypeElement(Class source) { - Objects.requireNonNull(source); - if (source.isPrimitive() || - source.isArray()) { - throw new IllegalArgumentException("Cannot create a ReflectionTypeElement based on class: " + source); - } - - this.source = source; - } - - @Override - public TypeMirror asType() { - return createTypeMirror(source); - } - - @Override - public Class getSource() { - return source; - } - - @Override - public boolean equals(Object o) { - if (o instanceof CoreReflTypeElement) { - return source.equals(((CoreReflTypeElement)o).getSource()); - } else { - return false; - } - } - - @Override - public R accept(ElementVisitor v, P p) { - return v.visitType(this, p); - } - - @Override - public R accept(ReflectionElementVisitor v, P p) { - return v.visitType(this, p); - } - - @Override - public Set getModifiers() { - return ModifierUtil.instance(source.getModifiers() & - (source.isInterface() ? - java.lang.reflect.Modifier.interfaceModifiers() : - java.lang.reflect.Modifier.classModifiers()), - false); - } - - @Override - public List getEnclosedElements() { - List enclosedElements = new ArrayList<>(); - - for (Class declaredClass : source.getDeclaredClasses()) { - enclosedElements.add(createMirror(declaredClass)); - } - - // Add elements in the conventional ordering: fields, then - // constructors, then methods. - for (Field f : source.getDeclaredFields()) { - enclosedElements.add(createMirror(f)); - } - - for (Constructor c : source.getDeclaredConstructors()) { - enclosedElements.add(createMirror(c)); - } - - for (Method m : source.getDeclaredMethods()) { - enclosedElements.add(createMirror(m)); - } - - return (enclosedElements.isEmpty() ? - Collections.emptyList(): - Collections.unmodifiableList(enclosedElements)); - } - - // Review for default method handling. - @Override - public List getAllMembers() { - List allMembers = new ArrayList<>(); - - // If I only had a MultiMap ... - List fields = new ArrayList<>(); - List methods = new ArrayList<>(); - List classes = new ArrayList<>(); - - // Add all fields for this class - for (Field f : source.getDeclaredFields()) { - fields.add(createMirror(f)); - } - - // Add all methods for this class - for (Method m : source.getDeclaredMethods()) { - methods.add(createMirror(m)); - } - - // Add all classes for this class, except anonymous/local as per Elements.getAllMembers doc - for (Class c : source.getDeclaredClasses()) { - if (c.isLocalClass() || c.isAnonymousClass()) - continue; - classes.add(createMirror(c)); - } - - Class cls = source; - if (cls.isInterface()) { - cls = null; - } - do { - // Walk up superclasses adding non-private elements. - // If source is an interface, just add Object's - // elements. - - if (cls == null) { - cls = java.lang.Object.class; - } else { - cls = cls.getSuperclass(); - } - - addMembers(cls, fields, methods, classes); - - } while (cls != java.lang.Object.class); - - // add members on (super)interface(s) - Set> seenInterfaces = new HashSet<>(); - Queue> interfaces = new LinkedList<>(); - if (source.isInterface()) { - seenInterfaces.add(source); - interfaces.add(source); - } else { - Class[] ifaces = source.getInterfaces(); - for (Class iface : ifaces) { - seenInterfaces.add(iface); - interfaces.add(iface); - } - } - - while (interfaces.peek() != null) { - Class head = interfaces.remove(); - addMembers(head, fields, methods, classes); - - Class[] ifaces = head.getInterfaces(); - for (Class iface : ifaces) { - if (!seenInterfaces.contains(iface)) { - seenInterfaces.add(iface); - interfaces.add(iface); - } - } - } - - // Add constructors - for (Constructor c : source.getDeclaredConstructors()) { - allMembers.add(createMirror(c)); - } - - // Add all unique methods - allMembers.addAll(methods); - - // Add all unique fields - allMembers.addAll(fields); - - // Add all unique classes - allMembers.addAll(classes); - - return Collections.unmodifiableList(allMembers); - } - - private void addMembers(Class cls, - List fields, - List methods, - List classes) { - Elements elements = getElements(); - - for (Field f : cls.getDeclaredFields()) { - if (java.lang.reflect.Modifier.isPrivate(f.getModifiers())) { continue; } - ReflectionElement tmp = createMirror(f); - boolean add = true; - for (ReflectionElement e : fields) { - if (elements.hides(e, tmp)) { - add = false; - break; - } - } - if (add) { - fields.add(tmp); - } - } - - for (Method m : cls.getDeclaredMethods()) { - if (java.lang.reflect.Modifier.isPrivate(m.getModifiers())) - continue; - - ReflectionExecutableElement tmp = createMirror(m); - boolean add = true; - for (ReflectionExecutableElement e : methods) { - if (elements.hides(e, tmp)) { - add = false; - break; - } else if (elements.overrides(e, tmp, this)) { - add = false; - break; - } - } - if (add) { - methods.add(tmp); - } - } - - for (Class c : cls.getDeclaredClasses()) { - if (java.lang.reflect.Modifier.isPrivate(c.getModifiers()) || - c.isLocalClass() || - c.isAnonymousClass()) - continue; - - ReflectionElement tmp = createMirror(c); - boolean add = true; - for (ReflectionElement e : classes) { - if (elements.hides(e, tmp)) { - add = false; - break; - } - } - if (add) { - classes.add(tmp); - } - } - } - - @Override - public ElementKind getKind() { - if (source.isInterface()) { - if (source.isAnnotation()) - return ElementKind.ANNOTATION_TYPE; - else - return ElementKind.INTERFACE; - } else if (source.isEnum()) { - return ElementKind.ENUM; - } else - return ElementKind.CLASS; - } - - @Override - public NestingKind getNestingKind() { - if (source.isAnonymousClass()) - return NestingKind.ANONYMOUS; - else if (source.isLocalClass()) - return NestingKind.LOCAL; - else if (source.isMemberClass()) - return NestingKind.MEMBER; - else return - NestingKind.TOP_LEVEL; - } - - @Override - public Name getQualifiedName() { - String name = source.getCanonicalName(); // TODO, this should be a FQN for - // the current element - if (name == null) - name = ""; - return StringName.instance(name); - } - - @Override - public Name getSimpleName() { - return StringName.instance(source.getSimpleName()); - } - - @Override - public TypeMirror getSuperclass() { - if (source.equals(java.lang.Object.class)) { - return NoType.getNoneInstance(); - } else { - return createTypeMirror(source.getSuperclass()); - } - } - - @Override - public List getInterfaces() { - Class[] interfaces = source.getInterfaces(); - int len = interfaces.length; - List res = new ArrayList<>(len); - - if (len > 0) { - for (Class c : interfaces) { - res.add(createTypeMirror(c)); - } - } else { - return Collections.emptyList(); - } - return Collections.unmodifiableList(res); - } - - @Override - public List getTypeParameters() { - return createTypeParameterList(source); - } - - @Override - public ReflectionElement getEnclosingElement() { - // Returns the package of a top-level type and returns the - // immediately lexically enclosing element for a nested type. - - switch(getNestingKind()) { - case TOP_LEVEL: - return createMirror(source.getPackage()); - case MEMBER: - return createMirror(source.getEnclosingClass()); - default: - if (source.getEnclosingConstructor() != null) { - return createMirror(source.getEnclosingConstructor()); - } else if (source.getEnclosingMethod() != null) { - return createMirror(source.getEnclosingMethod()); - } else { - return createMirror(source.getEnclosingClass()); - } - } - } - - @Override - public Name getBinaryName() { - return StringName.instance(getSource().getName()); - } - } - - private static abstract class CoreReflExecutableElement extends CoreReflElement - implements ReflectionExecutableElement { - - protected Executable source = null; - protected final List parameters; - - protected CoreReflExecutableElement(Executable source, - List parameters) { - this.source = Objects.requireNonNull(source); - this.parameters = Objects.requireNonNull(parameters); - } - - @Override - public R accept(ElementVisitor v, P p) { - return v.visitExecutable(this, p); - } - - @Override - public R accept(ReflectionElementVisitor v, P p) { - return v.visitExecutable(this, p); - } - - @Override - public abstract ExecutableType asType(); - - // Only Types and Packages enclose elements; see Element.getEnclosedElements() - @Override - public List getEnclosedElements() { - return Collections.emptyList(); - } - - @Override - public List getParameters() { - List tmp = new ArrayList<>(); - for (ReflectionVariableElement parameter : parameters) { - if (!parameter.isSynthetic()) - tmp.add(parameter); - } - return tmp; - } - - @Override - public List getAllParameters() { - // Could "fix" this if the return type included wildcards - @SuppressWarnings("unchecked") - List tmp = (List)(List)parameters; - return tmp; - } - - @Override - public List getThrownTypes() { - Class[] thrown = source.getExceptionTypes(); - int len = thrown.length; - List res = new ArrayList<>(len); - - if (len > 0) { - for (Class c : thrown) { - res.add(createTypeMirror(c)); - } - } else { - return Collections.emptyList(); - } - return Collections.unmodifiableList(res); - } - - @Override - public boolean isVarArgs() { - return source.isVarArgs(); - } - - @Override - public boolean isSynthetic() { - return source.isSynthetic(); - } - - @Override - public boolean isBridge() { - return false; - } - - @Override - public List getTypeParameters() { - return createTypeParameterList(source); - } - - public abstract AnnotationValue getDefaultValue(); - - @Override - public TypeMirror getReceiverType() { - // New in JDK 8 - throw new UnsupportedOperationException(this.toString()); - } - } - - private static class CoreReflConstructorExecutableElement - extends CoreReflExecutableElement { - - protected CoreReflConstructorExecutableElement(Constructor source) { - super(Objects.requireNonNull(source), - createParameterList(source)); - } - - @Override - public Constructor getSource() { - return (Constructor)source; - } - - @Override - public TypeMirror getReturnType() { - return NoType.getVoidInstance(); - } - - @Override - public ExecutableType asType() { - throw new UnsupportedOperationException(getClass().toString()); - } - - @Override - public boolean equals(Object o) { - if (o instanceof CoreReflConstructorExecutableElement) { - return source.equals(((CoreReflConstructorExecutableElement)o).getSource()); - } else { - return false; - } - } - - @Override - public ElementKind getKind() { - return ElementKind.CONSTRUCTOR; - } - - @Override - public Set getModifiers() { - return ModifierUtil.instance(source.getModifiers() & - java.lang.reflect.Modifier.constructorModifiers(), false); - } - - @Override - public ReflectionElement getEnclosingElement() { - return createMirror(source.getDeclaringClass()); - } - - @Override - public Name getSimpleName() { - return StringName.instance(""); - } - - @Override - public AnnotationValue getDefaultValue() { - // a constructor is never an annotation element - return null; - } - - @Override - public boolean isDefault() { - return false; // A constructor cannot be a default method - } - } - - private static class CoreReflMethodExecutableElement - extends CoreReflExecutableElement { - - protected CoreReflMethodExecutableElement(Method source) { - super(Objects.requireNonNull(source), - createParameterList(source)); - this.source = source; - } - - @Override - public Method getSource() { - return (Method)source; - } - - @Override - public TypeMirror getReturnType() { - return TypeFactory.instance(getSource().getReturnType()); - } - - @Override - public boolean equals(Object o) { - if (o instanceof CoreReflMethodExecutableElement) { - return source.equals( ((CoreReflMethodExecutableElement)o).getSource()); - } else { - return false; - } - } - - @Override - public ElementKind getKind() { - return ElementKind.METHOD; - } - - @Override - public Set getModifiers() { - return ModifierUtil.instance(source.getModifiers() & - java.lang.reflect.Modifier.methodModifiers(), - isDefault()); - } - - @Override - public ReflectionElement getEnclosingElement() { - return createMirror(source.getDeclaringClass()); - } - - @Override - public Name getSimpleName() { - return StringName.instance(source.getName()); - } - - @Override - public AnnotationValue getDefaultValue() { - Object value = getSource().getDefaultValue(); - if (null == value) { - return null; - } else { - return new CoreReflAnnotationValue(value); - } - } - - @Override - public boolean isDefault() { - return getSource().isDefault(); - } - - @Override - public boolean isBridge() { - return getSource().isBridge(); - } - - @Override - public ExecutableType asType() { - return TypeFactory.instance(getSource()); - } - } - - private static List createParameterList(Executable source) { - Parameter[] parameters = source.getParameters(); - int length = parameters.length; - if (length == 0) - return Collections.emptyList(); - else { - List tmp = new ArrayList<>(length); - for (Parameter parameter : parameters) { - tmp.add(new CoreReflParameterVariableElement(parameter)); - } - return Collections.unmodifiableList(tmp); - } - } - - private static List createTypeParameterList(GenericDeclaration source) { - java.lang.reflect.TypeVariable[] typeParams = source.getTypeParameters(); - int length = typeParams.length; - if (length == 0) - return Collections.emptyList(); - else { - List tmp = new ArrayList<>(length); - for (java.lang.reflect.TypeVariable typeVar : typeParams) - tmp.add(new CoreReflTypeParameterElement(typeVar)); - return Collections.unmodifiableList(tmp); - } - } - - private static class CoreReflTypeParameterElement - extends CoreReflElement - implements ReflectionTypeParameterElement { - - private final GenericDeclaration source; - private final java.lang.reflect.TypeVariable sourceTypeVar; - - protected CoreReflTypeParameterElement(java.lang.reflect.TypeVariable sourceTypeVar) { - this.sourceTypeVar = Objects.requireNonNull(sourceTypeVar); - this.source = Objects.requireNonNull(sourceTypeVar.getGenericDeclaration()); - } - - @Override - public java.lang.reflect.TypeVariable getSource() { - return sourceTypeVar; - } - - protected java.lang.reflect.TypeVariable getSourceTypeVar() { - return sourceTypeVar; - } - - @Override - public boolean equals(Object o) { - if (o instanceof CoreReflTypeParameterElement) { - return sourceTypeVar.equals(((CoreReflTypeParameterElement)o).sourceTypeVar); - } else { - return false; - } - } - - @Override - public R accept(ElementVisitor v, P p) { - return v.visitTypeParameter(this, p); - } - - @Override - public R accept(ReflectionElementVisitor v, P p) { - return v.visitTypeParameter(this, p); - } - - @Override - public List getEnclosedElements() { - return Collections.emptyList(); - } - - @Override - public ReflectionElement getEnclosingElement() { - if (source instanceof Class) - return createMirror((Class)source); - else if (source instanceof Method) - return createMirror((Method)source); - else if (source instanceof Constructor) - return createMirror((Constructor)source); - else - throw new AssertionError("Unexpected enclosing element: " + source); - } - - @Override - public ElementKind getKind() { - return ElementKind.TYPE_PARAMETER; - } - - @Override - public Name getSimpleName() { - return StringName.instance(sourceTypeVar.getName()); - } - - // TypeParameterElement methods - @Override - public ReflectionElement getGenericElement() { - return getEnclosingElement(); // As per the doc, - // getEnclosingElement and - // getGenericElement return - // the same information. - } - - @Override - public List getBounds() { - Type[] types = getSourceTypeVar().getBounds(); - int len = types.length; - - if (len > 0) { - List res = new ArrayList<>(len); - for (Type t : types) { - res.add(TypeFactory.instance(t)); - } - return Collections.unmodifiableList(res); - } else { - return Collections.emptyList(); - } - } - } - - private abstract static class CoreReflVariableElement extends CoreReflElement - implements ReflectionVariableElement { - - protected CoreReflVariableElement() {} - - // Element visitor - @Override - public R accept(ElementVisitorv, P p) { - return v.visitVariable(this, p); - } - - // ReflectElement visitor - @Override - public R accept(ReflectionElementVisitor v, P p) { - return v.visitVariable(this, p); - } - - @Override - public List getEnclosedElements() { - return Collections.emptyList(); - } - - @Override - public ReflectionElement getEnclosingElement() { - return null; - } - - @Override - public boolean isSynthetic() { - return false; - } - - @Override - public boolean isImplicit() { - return false; - } - } - - private static class CoreReflFieldVariableElement extends CoreReflVariableElement { - private final Field source; - - protected CoreReflFieldVariableElement(Field source) { - this.source = Objects.requireNonNull(source); - } - - @Override - public Field getSource() { - return source; - } - - @Override - public TypeMirror asType() { - return createTypeMirror(getSource().getType()); - } - - @Override - public ElementKind getKind() { - if (source.isEnumConstant()) - return ElementKind.ENUM_CONSTANT; - else - return ElementKind.FIELD; - } - - @Override - public Set getModifiers() { - return ModifierUtil.instance(source.getModifiers() & - java.lang.reflect.Modifier.fieldModifiers(), false); - } - - @Override - public Name getSimpleName() { - return StringName.instance(source.getName()); - } - - @Override - public ReflectionElement getEnclosingElement() { - return createMirror(source.getDeclaringClass()); - } - - @Override - public boolean equals(Object o) { - if (o instanceof CoreReflFieldVariableElement) { - return Objects.equals(source, - ((CoreReflFieldVariableElement)o).getSource()); - } else { - return false; - } - } - - @Override - public Object getConstantValue() { - Field target = source; - - // The api says only Strings and primitives may be compile time constants. - // Ensure field is that, and final. - // - // Also, we don't have an instance so restrict to static Fields - // - if (!(source.getType().equals(java.lang.String.class) - || source.getType().isPrimitive())) { - return null; - } - final int modifiers = target.getModifiers(); - if (!( java.lang.reflect.Modifier.isFinal(modifiers) && - java.lang.reflect.Modifier.isStatic(modifiers))) { - return null; - } - - try { - return target.get(null); - } catch (IllegalAccessException e) { - try { - target.setAccessible(true); - return target.get(null); - } catch (IllegalAccessException i) { - throw new SecurityException(i); - } - } - } - } - - private static class CoreReflParameterVariableElement - extends CoreReflVariableElement { - private final Parameter source; - - protected CoreReflParameterVariableElement(Parameter source) { - this.source = Objects.requireNonNull(source); - } - - @Override - public Parameter getSource() { - return source; - } - - @Override - public Set getModifiers() { - return ModifierUtil.instance(source.getModifiers() & - java.lang.reflect.Modifier.parameterModifiers(), false); - } - - @Override - public TypeMirror asType() { - // TODO : switch to parameterized type - return createTypeMirror(source.getType()); - } - - @Override - public ElementKind getKind() { - return ElementKind.PARAMETER; - } - - @Override - public Name getSimpleName() { - return StringName.instance(source.getName()); - } - - @Override - public ReflectionElement getEnclosingElement() { - Executable enclosing = source.getDeclaringExecutable(); - if (enclosing instanceof Method) - return createMirror((Method)enclosing); - else if (enclosing instanceof Constructor) - return createMirror((Constructor)enclosing); - else - throw new AssertionError("Bad enclosing value."); - } - - @Override - public boolean equals(Object o) { - if (o instanceof CoreReflParameterVariableElement) { - return source.equals(((CoreReflParameterVariableElement) o).getSource()); - } else - return false; - } - - // VariableElement methods - @Override - public Object getConstantValue() { - return null; - } - - @Override - public boolean isSynthetic() { - return source.isSynthetic(); - } - - @Override - public boolean isImplicit() { - return source.isImplicit(); - } - } - - private static class CoreReflPackageElement extends CoreReflElement - implements ReflectionPackageElement { - - private final Package source; - - protected CoreReflPackageElement(Package source) { - this.source = source; - } - - @Override - public Package getSource() { - return source; - } - - @Override - public R accept(ElementVisitor v, P p) { - return v.visitPackage(this, p); - } - - @Override - public R accept(ReflectionElementVisitor v, P p) { - return v.visitPackage(this, p); - } - - @Override - public boolean equals(Object o) { - if (o instanceof CoreReflPackageElement) { - return Objects.equals(source, - ((CoreReflPackageElement)o).getSource()); - } else { - return false; - } - } - - @Override - public ElementKind getKind() { - return ElementKind.PACKAGE; - } - - @Override - public ReflectionElement getEnclosingElement() { - return null; - } - - @Override - public List getEnclosedElements() { - throw new UnsupportedOperationException(); - } - - @Override - public Name getQualifiedName() { - return StringName.instance((source != null) ? - source.getName() : - "" ); - } - - @Override - public Name getSimpleName() { - String n = ((source != null) ? - source.getName() : - ""); - int index = n.lastIndexOf('.'); - if (index > 0) { - return StringName.instance(n.substring(index + 1, n.length())); - } else { - return StringName.instance(n); - } - } - - @Override - public boolean isUnnamed() { - if (source != null) { - String name = source.getName(); - return(name == null || name.isEmpty()); - } else - return true; - } - } - - private static class CoreReflAnnotationMirror - implements javax.lang.model.element.AnnotationMirror { - private final Annotation annotation; - - protected CoreReflAnnotationMirror(Annotation annotation) { - this.annotation = Objects.requireNonNull(annotation); - } - - @Override - public DeclaredType getAnnotationType() { - return (DeclaredType)TypeFactory.instance(annotation.annotationType()); - } - - @Override - public Map getElementValues() { - // This differs from the javac implementation in that it returns default values - - Method[] elems = annotation.annotationType().getDeclaredMethods(); - int len = elems.length; - - if (len > 0) { - Map res = new HashMap<>(); - for (Method m : elems) { - AnnotationValue v; - try { - v = new CoreReflAnnotationValue(m.invoke(annotation)); - } catch (IllegalAccessException e) { - try { - m.setAccessible(true); - v = new CoreReflAnnotationValue(m.invoke(annotation)); - } catch (IllegalAccessException i) { - throw new SecurityException(i); - } catch (InvocationTargetException ee) { - throw new RuntimeException(ee); - } - } catch (InvocationTargetException ee) { - throw new RuntimeException(ee); - } - ReflectionExecutableElement e = createMirror(m); - res.put(e, v); - } - - return Collections.unmodifiableMap(res); - } else { - return Collections.emptyMap(); - } - } - - @Override - public boolean equals(Object other) { - if (other instanceof CoreReflAnnotationMirror) { - return annotation.equals(((CoreReflAnnotationMirror)other).annotation); - } else { - return false; - } - } - - @Override - public int hashCode() { - return Objects.hashCode(annotation); - } - - @Override - public String toString() { - return annotation.toString(); - } - } - - private static class CoreReflAnnotationValue - implements javax.lang.model.element.AnnotationValue { - private Object value = null; - - protected CoreReflAnnotationValue(Object value) { - // Is this constraint really necessary? - Objects.requireNonNull(value); - this.value = value; - } - - @Override - public Object getValue() { - return value; - } - - @Override - public String toString() { - return value.toString(); - } - - @Override - public R accept(AnnotationValueVisitor v, P p) { - return v.visit(this, p); - } - } - - // Helper utility classes - - private static class StringName implements Name { - private String name; - - private StringName(String name) { - this.name = Objects.requireNonNull(name); - } - - public static StringName instance(String name) { - return new StringName(name); - } - - @Override - public int length() { - return name.length(); - } - - @Override - public char charAt(int index) { - return name.charAt(index); - } - - @Override - public CharSequence subSequence(int start, int end) { - return name.subSequence(start, end); - } - - @Override - public String toString() { - return name; - } - - @Override - public boolean equals(Object other) { - if (other instanceof StringName) { - return name.equals(((StringName) other).name); - } else { - return false; - } - } - - @Override - public int hashCode() { - return name.hashCode(); - } - - @Override - public boolean contentEquals(CharSequence cs) { - return name.contentEquals(cs); - } - } - - /* - * Given an {@code int} value of modifiers, return a proper immutable set - * of {@code Modifier}s as a result. - */ - private static class ModifierUtil { - private ModifierUtil() { - throw new AssertionError("No instances for you."); - } - - // Exercise for the reader: explore if caching of sets of - // Modifiers would be helpful. - - public static Set instance(int modifiers, boolean isDefault) { - Set modSet = EnumSet.noneOf(Modifier.class); - - if (java.lang.reflect.Modifier.isAbstract(modifiers)) - modSet.add(Modifier.ABSTRACT); - - if (java.lang.reflect.Modifier.isFinal(modifiers)) - modSet.add(Modifier.FINAL); - - if (java.lang.reflect.Modifier.isNative(modifiers)) - modSet.add(Modifier.NATIVE); - - if (java.lang.reflect.Modifier.isPrivate(modifiers)) - modSet.add(Modifier.PRIVATE); - - if (java.lang.reflect.Modifier.isProtected(modifiers)) - modSet.add(Modifier.PROTECTED); - - if (java.lang.reflect.Modifier.isPublic(modifiers)) - modSet.add(Modifier.PUBLIC); - - if (java.lang.reflect.Modifier.isStatic(modifiers)) - modSet.add(Modifier.STATIC); - - if (java.lang.reflect.Modifier.isStrict(modifiers)) - modSet.add(Modifier.STRICTFP); - - if (java.lang.reflect.Modifier.isSynchronized(modifiers)) - modSet.add(Modifier.SYNCHRONIZED); - - if (java.lang.reflect.Modifier.isTransient(modifiers)) - modSet.add(Modifier.TRANSIENT); - - if (java.lang.reflect.Modifier.isVolatile(modifiers)) - modSet.add(Modifier.VOLATILE); - - if (isDefault) - modSet.add(Modifier.DEFAULT); - - return Collections.unmodifiableSet(modSet); - } - } - - private abstract static class AbstractTypeMirror implements TypeMirror { - private final TypeKind kind; - - protected AbstractTypeMirror(TypeKind kind) { - this.kind = Objects.requireNonNull(kind); - } - - @Override - public TypeKind getKind() { - return kind; - } - - @Override - public R accept(TypeVisitor v, P p) { - return v.visit(this, p); - } - - //Types methods - abstract List directSuperTypes(); - - TypeMirror capture() { - // Exercise for the reader: make this abstract and implement in subtypes - throw new UnsupportedOperationException(); - } - - TypeMirror erasure() { - // Exercise for the reader: make this abstract and implement in subtypes - throw new UnsupportedOperationException(); - } - - // Exercise for the reader: implement the AnnotatedConstruct methods - @Override - public List getAnnotationMirrors() { - throw new UnsupportedOperationException(); - } - - @Override - public T getAnnotation(Class annotationClass) { - throw new UnsupportedOperationException(); - } - - @Override - public T[] getAnnotationsByType(Class annotationClass) { - throw new UnsupportedOperationException(); - } - } - - private static class CoreReflArrayType extends AbstractTypeMirror - implements javax.lang.model.type.ArrayType, - Reifiable { - private Class source = null; - private Class component = null; - private TypeMirror eagerComponent = null; - - protected CoreReflArrayType(Class source) { - super(TypeKind.ARRAY); - this.source = source; - this.component = source.getComponentType(); - this.eagerComponent = TypeFactory.instance(component); - } - - public TypeMirror getComponentType() { - return eagerComponent; - } - - @Override - public Class getSource() { - return source; - } - - @Override - List directSuperTypes() { - final TypeMirror componentType = getComponentType(); - final TypeMirror[] directSupers; - - // JLS v4 4.10.3 - if (componentType.getKind().isPrimitive() || - component.equals(java.lang.Object.class)) { - directSupers = new TypeMirror[3]; - directSupers[0] = TypeFactory.instance(java.lang.Object.class); - directSupers[1] = TypeFactory.instance(java.lang.Cloneable.class); - directSupers[2] = TypeFactory.instance(java.io.Serializable.class); - } else if (componentType.getKind() == TypeKind.ARRAY) { - List componentDirectSupertypes = CoreReflTypes.instance().directSupertypes(componentType); - directSupers = new TypeMirror[componentDirectSupertypes.size()]; - for (int i = 0; i < directSupers.length; i++) { - directSupers[i] = new CoreReflArrayType(Array.newInstance(((Reifiable)componentDirectSupertypes.get(i)).getSource(), 0).getClass()); - } - } else { - Class superClass = component.getSuperclass(); - Class[] interfaces = component.getInterfaces(); - directSupers = new TypeMirror[1 + interfaces.length]; - - directSupers[0] = TypeFactory.instance(Array.newInstance(superClass, 0).getClass()); - - for (int i = 0; i < interfaces.length; i++) { - directSupers[i + 1] = TypeFactory.instance(Array.newInstance(interfaces[i],0).getClass()); - } - } - - return Collections.unmodifiableList(Arrays.asList(directSupers)); - } - - @Override - public String toString() { - return getKind() + " of " + getComponentType().toString(); - } - } - - private static class CaptureTypeVariable extends AbstractTypeMirror implements javax.lang.model.type.TypeVariable { - private TypeMirror source = null; - private TypeMirror upperBound = null; - private TypeMirror lowerBound = null; - - CaptureTypeVariable(TypeMirror source, - TypeMirror upperBound, - TypeMirror lowerBound) { - super(TypeKind.TYPEVAR); - - this.source = Objects.requireNonNull(source); - this.upperBound = (upperBound == null ? CoreReflTypes.instance().getNullType() : upperBound); - this.lowerBound = (lowerBound == null ? CoreReflTypes.instance().getNullType() : lowerBound); - } - - protected Class getSource() { - if (source instanceof CoreReflDeclaredType) { - return ((CoreReflDeclaredType)source).getSource(); - } else { - return null; - } - } - - @Override - public TypeMirror getUpperBound() { - return upperBound; - } - - @Override - public TypeMirror getLowerBound() { - return lowerBound; - } - - @Override - public Element asElement() { - if (null == getSource()) { - return null; - } - return CoreReflectionFactory.createMirror(getSource()); - } - - @Override - List directSuperTypes() { - throw new UnsupportedOperationException(); - - } - - @Override - public String toString() { - return getKind() + " CAPTURE of: " + source.toString(); - } - } - - private static class CoreReflElements implements ReflectionElements { - private CoreReflElements() {} // mostly one instance for you - - private static CoreReflElements instance = new CoreReflElements(); - - static CoreReflElements instance() { - return instance; - } - - /** - * {@inheritDoc} - */ - @Override - public ReflectionPackageElement getPackageElement(CharSequence name) { - return createMirror(Package.getPackage(name.toString())); - } - - /** - * {@inheritDoc} - */ - @Override - public ReflectionTypeElement getTypeElement(CharSequence name) { - // where name is a Canonical Name jls 6.7 - // but this method will probably accept an equivalent FQN - // depending on Class.forName(String) - - ReflectionTypeElement tmp = null; - - // Filter out arrays - String n = name.toString(); - if (n.contains("[")) return null; - if (n.equals("")) return null; - - // The intention of this loop is to handle nested - // elements. If finding the element using Class.forName - // fails, an attempt is made to find the element as an - // enclosed element by trying fo find a prefix of the name - // (dropping a trailing ".xyz") and looking for "xyz" as - // an enclosed element. - - Deque parts = new ArrayDeque<>(); - boolean again; - do { - again = false; - try { - tmp = createMirror(Class.forName(n)); - } catch (ClassNotFoundException e) { - tmp = null; - } - - if (tmp != null) { - if (parts.isEmpty()) { - return tmp; - } - - tmp = findInner(tmp, parts); - if (tmp != null) { - return tmp; - } - } - - int indx = n.lastIndexOf('.'); - if (indx > -1) { - parts.addFirst(n.substring(indx + 1)); - n = n.substring(0, indx); - again = true; - } - } while (again); - - return null; - } - - // Recursively finds enclosed type elements named as part.top() popping part and repeating - private ReflectionTypeElement findInner(ReflectionTypeElement e, Deque parts) { - if (parts.isEmpty()) { - return e; - } - - String part = parts.removeFirst(); - List enclosed = e.getEnclosedElements(); - for (ReflectionElement elm : enclosed) { - if ((elm.getKind() == ElementKind.CLASS || - elm.getKind() == ElementKind.INTERFACE || - elm.getKind() == ElementKind.ENUM || - elm.getKind() == ElementKind.ANNOTATION_TYPE) - && elm.getSimpleName().toString().equals(part)) { - ReflectionTypeElement t = findInner((ReflectionTypeElement)elm, parts); - if (t != null) { - return t; - } - } - } - return null; - } - - /** - * {@inheritDoc} - */ - @Override - public Map - getElementValuesWithDefaults(AnnotationMirror a) { - if (a instanceof CoreReflAnnotationMirror) { - return ((CoreReflAnnotationMirror)a).getElementValues(); - } else { - throw new IllegalArgumentException(); - } - } - - /** - * {@inheritDoc} - */ - @Override - public String getDocComment(Element e) { - checkElement(e); - return null; // As per the doc - } - - /** - * {@inheritDoc} - */ - @Override - public boolean isDeprecated(Element e) { - checkElement(e); - return ((CoreReflElement)e).getSource().isAnnotationPresent(java.lang.Deprecated.class); - } - - /** - * {@inheritDoc} - */ - @Override - public Name getBinaryName(TypeElement type) { - checkElement(type); - return StringName.instance(((CoreReflTypeElement)type) - .getSource() - .getName()); - } - - /** - * {@inheritDoc} - */ - @Override - public ReflectionPackageElement getPackageOf(Element type) { - checkElement(type); - if (type instanceof ReflectionPackageElement) { - return (ReflectionPackageElement)type; - } - - Package p; - if (type instanceof CoreReflTypeElement) { - p = ((CoreReflTypeElement)type).getSource().getPackage(); - } else { - CoreReflTypeElement enclosingTypeElement = (CoreReflTypeElement)getEnclosingTypeElement((ReflectionElement)type); - p = enclosingTypeElement.getSource().getPackage(); - } - - return createMirror(p); - } - - /** - * {@inheritDoc} - */ - @Override - public List getAllMembers(TypeElement type) { - checkElement(type); - return getAllMembers((ReflectionTypeElement)type); - } - - // Exercise for the reader: should this method, and similar - // ones that specialize on the more specific argument types, - // be addd to the public ReflectionElements API? - public List getAllMembers(ReflectionTypeElement type) { - return type.getAllMembers(); - } - - /** - * {@inheritDoc} - */ - @Override - public List getAllAnnotationMirrors(Element e) { - checkElement(e); - AnnotatedElement ae = CoreReflElement.class.cast(e).getSource(); - Annotation[] annotations = ae.getAnnotations(); - int len = annotations.length; - - if (len > 0) { - List res = new ArrayList<>(len); - for (Annotation a : annotations) { - res.add(createMirror(a)); - } - return Collections.unmodifiableList(res); - } else { - List ret = Collections.emptyList(); - return ret; - } - } - - /** - * {@inheritDoc} - */ - @Override - public boolean hides(Element hider, Element hidden) { - checkElement(hider); - checkElement(hidden); - - // Names must be equal - if (!hider.getSimpleName().equals(hidden.getSimpleName())) { - return false; - } - - // Hides isn't reflexive - if (hider.equals(hidden)) { - return false; - } - - // Hider and hidden needs to be field, method or type - // and fields hide fields, types hide types, methods hide methods - // IE a Field doesn't hide a Methods etc - ElementKind hiderKind = hider.getKind(); - ElementKind hiddenKind = hidden.getKind(); - if (hiderKind.isField() && !hiddenKind.isField()) { - return false; - } else if (hiderKind.isClass() && - !(hiddenKind.isClass() || hiddenKind.isInterface())) { - return false; - } else if (hiderKind.isInterface() && - !(hiddenKind.isClass() || hiddenKind.isInterface())) { - return false; - } else if (hiderKind == ElementKind.METHOD && hiddenKind != ElementKind.METHOD) { - return false; - } else if (!(hiderKind.isClass() || - hiderKind.isInterface() || - hiderKind.isField() || - hiderKind == ElementKind.METHOD)) { - return false; - } - - Set hm = hidden.getModifiers(); - // jls 8.4.8.2 only static methods can hide methods - if (hider.getKind() == ElementKind.METHOD) { - if (!hider.getModifiers().contains(Modifier.STATIC)) { - return false; // hider not static - } else if (!hm.contains(Modifier.STATIC)) { // we know it's a method - return false; // hidden not static - } - - // For methods we also need to check parameter types - Class[] h1 = ((CoreReflMethodExecutableElement)hider).getSource().getParameterTypes(); - Class[] h2 = ((CoreReflMethodExecutableElement)hidden).getSource().getParameterTypes(); - if (h1.length != h2.length) { - return false; - } - for (int i = 0; i < h1.length; i++) { - if (h1[i] != h2[i]) { - return false; - } - } - } - - // You can only hide visible elements - if (hm.contains(Modifier.PRIVATE)) { - return false; // hidden private, can't be hidden - } else if ((!(hm.contains(Modifier.PUBLIC) || hm.contains(Modifier.PROTECTED))) && // not private, not (public or protected) IE package private - (!getPackageOf(hider).equals(getPackageOf(hidden)))) { - return false; // hidden package private, and different packages, IE not visible - } - - // Ok so now hider actually hides hidden if hider is - // declared on a subtype of hidden. - // - // TODO: should this be a proper subtype or is that taken - // care of by the reflexive check in the beginning? - // - TypeMirror hiderType = getEnclosingTypeElement((ReflectionElement)hider).asType(); - TypeMirror hiddenType = getEnclosingTypeElement((ReflectionElement)hidden).asType(); - - return getTypes().isSubtype(hiderType, hiddenType); - } - - /** - * {@inheritDoc} - */ - @Override - public ReflectionTypeElement getEnclosingTypeElement(ReflectionElement e) { - if (e.getKind() == ElementKind.PACKAGE) { - return null; - } - - if(e instanceof CoreReflTypeParameterElement) { - ReflectionElement encElem = ((CoreReflTypeParameterElement)e).getEnclosingElement(); - if (encElem instanceof ReflectionTypeElement) { - return (ReflectionTypeElement)encElem; - } else { - return getEnclosingTypeElement(encElem); - } - } - - Class encl = null; - if (e instanceof CoreReflTypeElement) { - encl = ((CoreReflTypeElement)e).getSource().getDeclaringClass(); - } else if (e instanceof CoreReflExecutableElement) { - encl = (((CoreReflExecutableElement)e).getSource()).getDeclaringClass(); - } else if (e instanceof CoreReflFieldVariableElement) { - encl = ((CoreReflFieldVariableElement)e).getSource().getDeclaringClass(); - } else if (e instanceof CoreReflParameterVariableElement) { - encl = ((CoreReflParameterVariableElement)e).getSource().getDeclaringExecutable().getDeclaringClass(); - } - - return encl == null ? null : createMirror(encl); - } - - /** - *{@inheritDoc} - * - * Note that this implementation does not handle the situation - * where A overrides B and B overrides C but A does not - * directly override C. In this case, this implementation will - * erroneously return false. - */ - @Override - public boolean overrides(ExecutableElement overrider, ExecutableElement overridden, - TypeElement type) { - checkElement(overrider); - checkElement(overridden); - checkElement(type); - - // TODO handle transitive overrides - return overridesDirect(overrider, overridden, type); - } - - private boolean overridesDirect(ExecutableElement overrider, ExecutableElement overridden, - TypeElement type) { - // Should we check that at least one of the types - // overrider has is in fact a supertype of the TypeElement - // 'type' supplied? - - CoreReflExecutableElement rider = (CoreReflExecutableElement)overrider; - CoreReflExecutableElement ridden = (CoreReflExecutableElement)overridden; - CoreReflTypeElement riderType = (CoreReflTypeElement)type; - - // Names must match, redundant - see subsignature below - if (!rider.getSimpleName().equals(ridden.getSimpleName())) { - return false; - } - - // Constructors don't override - // TODO: verify this fact - if (rider.getKind() == ElementKind.CONSTRUCTOR || - ridden.getKind() == ElementKind.CONSTRUCTOR) { - return false; - } - - // Overridden must be visible to be overridden - // TODO Fix transitive visibility/override - Set rm = ridden.getModifiers(); - if (rm.contains(Modifier.PRIVATE)) { - return false; // overridden private, can't be overridden - } else if ((!(rm.contains(Modifier.PUBLIC) || rm.contains(Modifier.PROTECTED))) && // not private, not (public or protected) IE package private - (!getPackageOf(rider).equals(getPackageOf(ridden)))) { - return false; // ridden package private, and different packages, IE not visible - } - - // Static methods doesn't override - if (rm.contains(Modifier.STATIC) || - rider.getModifiers().contains(Modifier.STATIC)) { - return false; - } - - // Declaring class of overrider must be a subclass of declaring class of overridden - // except we use the parameter type as declaring class of overrider - if (!getTypes().isSubtype(riderType.asType(), getEnclosingTypeElement(ridden).asType())) { - return false; - } - - // Now overrider overrides overridden if the signature of rider is a subsignature of ridden - return getTypes().isSubsignature(rider.asType(), ridden.asType()); - } - - /** - *{@inheritDoc} - */ - @Override - public String getConstantExpression(Object value) { - return Constants.format(value); - } - - // If CoreReflectionFactory were a proper part of the JDK, the - // analogous functionality in javac could be reused. - private static class Constants { - /** - * Returns a string representation of a constant value (given in - * standard wrapped representation), quoted and formatted as in - * Java source. - */ - public static String format(Object value) { - if (value instanceof Byte) return formatByte((Byte) value); - if (value instanceof Short) return formatShort((Short) value); - if (value instanceof Long) return formatLong((Long) value); - if (value instanceof Float) return formatFloat((Float) value); - if (value instanceof Double) return formatDouble((Double) value); - if (value instanceof Character) return formatChar((Character) value); - if (value instanceof String) return formatString((String) value); - if (value instanceof Integer || - value instanceof Boolean) return value.toString(); - else - throw new IllegalArgumentException("Argument is not a primitive type or a string; it " + - ((value == null) ? - "is a null value." : - "has class " + - value.getClass().getName()) + "." ); - } - - private static String formatByte(byte b) { - return String.format("(byte)0x%02x", b); - } - - private static String formatShort(short s) { - return String.format("(short)%d", s); - } - - private static String formatLong(long lng) { - return lng + "L"; - } - - private static String formatFloat(float f) { - if (Float.isNaN(f)) - return "0.0f/0.0f"; - else if (Float.isInfinite(f)) - return (f < 0) ? "-1.0f/0.0f" : "1.0f/0.0f"; - else - return f + "f"; - } - - private static String formatDouble(double d) { - if (Double.isNaN(d)) - return "0.0/0.0"; - else if (Double.isInfinite(d)) - return (d < 0) ? "-1.0/0.0" : "1.0/0.0"; - else - return d + ""; - } - - private static String formatChar(char c) { - return '\'' + quote(c) + '\''; - } - - private static String formatString(String s) { - return '"' + quote(s) + '"'; - } - - /** - * Escapes each character in a string that has an escape sequence or - * is non-printable ASCII. Leaves non-ASCII characters alone. - */ - private static String quote(String s) { - StringBuilder buf = new StringBuilder(); - for (int i = 0; i < s.length(); i++) { - buf.append(quote(s.charAt(i))); - } - return buf.toString(); - } - - /** - * Escapes a character if it has an escape sequence or is - * non-printable ASCII. Leaves ASCII characters alone. - */ - private static String quote(char ch) { - switch (ch) { - case '\b': return "\\b"; - case '\f': return "\\f"; - case '\n': return "\\n"; - case '\r': return "\\r"; - case '\t': return "\\t"; - case '\'': return "\\'"; - case '\"': return "\\\""; - case '\\': return "\\\\"; - default: - return (isPrintableAscii(ch)) - ? String.valueOf(ch) - : String.format("\\u%04x", (int) ch); - } - } - - /** - * Is a character printable ASCII? - */ - private static boolean isPrintableAscii(char ch) { - return ch >= ' ' && ch <= '~'; - } - } - - /** - * {@inheritDoc} - */ - @Override - public void printElements(Writer w, Element... elements) { - ElementVisitor printer = getPrinter(w); - try { - for (Element e : elements) { - checkElement(e); - printer.visit(e); - } - } finally { - try { - w.flush(); - } catch (java.io.IOException e) { /* Ignore */;} - } - } - - private ElementVisitor getPrinter(Writer w) { - // First try a reflective call into javac and if that - // fails, fallback to a very simple toString-based - // scanner. - try { - //reflective form of - // return new com.sun.tools.javac.processing.PrintingProcessor.PrintingElementVisitor(w, getElements()); - Class printProcClass = - ClassLoader.getSystemClassLoader().loadClass("com.sun.tools.javac.processing.PrintingProcessor$PrintingElementVisitor"); - Constructor printProcCtor = printProcClass.getConstructor(Writer.class, Elements.class); - return (ElementVisitor) printProcCtor.newInstance(w, getElements()); - } catch (ReflectiveOperationException | SecurityException e) { - return new ElementScanner9(w){ - @Override - public Writer scan(Element e, Void v) { - try { - DEFAULT_VALUE.append(e.toString()); - DEFAULT_VALUE.append("\n"); - } catch (java.io.IOException ioe) { - throw new RuntimeException(ioe); - } - return DEFAULT_VALUE; - } - }; - } - } - - /** - * {@inheritDoc} - */ - @Override - public Name getName(CharSequence cs) { - return StringName.instance(cs.toString()); - } - - private void checkElement(Element e) { - if(!(e instanceof CoreReflElement)) { - throw new IllegalArgumentException(); - } - } - - @Override - public boolean isFunctionalInterface(TypeElement e) { - throw new UnsupportedOperationException(); - // Update once this functionality is in core reflection - } - } - - private static class CoreReflTypes implements javax.lang.model.util.Types { - private static Types instance = new CoreReflTypes(); - - public static Types instance() { - return instance; - } - - // Private to suppress instantiation - private CoreReflTypes() {} - - // Types methods - @Override - public Element asElement(TypeMirror t) { - checkType(t); - if (t instanceof javax.lang.model.type.TypeVariable) { - ((javax.lang.model.type.TypeVariable)t).asElement(); - } else if (t instanceof DeclaredType) { - return ((DeclaredType)t).asElement(); - } - return null; - } - - @Override - public boolean isSameType(TypeMirror t1, TypeMirror t2) { - if (t1.getKind() != t2.getKind()) { - return false; - } - - if (t1.getKind() == TypeKind.WILDCARD || - t2.getKind() == TypeKind.WILDCARD) { - // Wildcards are not equal to any type - return false; - } - - if (t1 instanceof CoreReflDeclaredType && - t2 instanceof CoreReflDeclaredType) { - return ((CoreReflDeclaredType)t1).isSameType((CoreReflDeclaredType)t2); - } else if (t1 instanceof PrimitiveType && - t2 instanceof PrimitiveType) { - return t1.getKind() == t2.getKind(); - } else if (t1 instanceof NoType && - t2 instanceof NoType) { - return true; - } else if (t1 instanceof NullType && - t2 instanceof NullType) { - return true; - } else if (t1 instanceof ArrayType && - t2 instanceof ArrayType) { - return isSameType(((ArrayType)t1).getComponentType(), ((ArrayType)t2).getComponentType()); - } - - return false; - } - - @Override - public boolean isSubtype(TypeMirror t1, TypeMirror t2) { - checkType(t1); - checkType(t2); - - if (isSameType(t1, t2)) { - return true; - } else if(t1.getKind() == TypeKind.NULL) { - return true; - } - - // This depth first traversal should terminate due to the ban on circular inheritance - List directSupertypes = directSupertypes(t1); - if (directSupertypes.isEmpty()) { - return false; - } - for (TypeMirror ti : directSupertypes) { - if (isSameType(ti, t2) || isSubtype(ti, t2)) { - return true; - } - } - return false; - } - - @Override - public boolean isAssignable(TypeMirror t1, TypeMirror t2) { - throw new UnsupportedOperationException(); - } - - @Override - public boolean contains(TypeMirror t1, TypeMirror t2) { - throw new UnsupportedOperationException(); - } - - @Override - public boolean isSubsignature(ExecutableType m1, ExecutableType m2) { - checkType(m1); - checkType(m2); - - ExecutableMethodType m0 = (ExecutableMethodType)m1; - - return m0.sameSignature((ExecutableMethodType)m2) || m0.sameSignature((ExecutableMethodType)erasure(m2)); - } - - @Override - public List directSupertypes(TypeMirror t) { - checkType(t); - if (t instanceof ExecutableType || - t.getKind() == TypeKind.PACKAGE) { - throw new IllegalArgumentException("You can't ask for direct supertypes for type: " + t); - } - return ((AbstractTypeMirror)t).directSuperTypes(); - } - - @Override - public TypeMirror erasure(TypeMirror t) { - checkType(t); - return ((AbstractTypeMirror)t).erasure(); - } - - @Override - public TypeElement boxedClass(javax.lang.model.type.PrimitiveType p) { - throw new UnsupportedOperationException(); - } - - @Override - public PrimitiveType unboxedType(TypeMirror t) { - throw new UnsupportedOperationException(); - } - - @Override - public TypeMirror capture(TypeMirror t) { - checkType(t); - return ((AbstractTypeMirror)t).capture(); - } - - @Override - public PrimitiveType getPrimitiveType(TypeKind kind) { - return PrimitiveType.instance(kind); - } - - @Override - public NullType getNullType() { - return CoreReflNullType.getInstance(); - } - - @Override - public javax.lang.model.type.NoType getNoType(TypeKind kind) { - if (kind == TypeKind.NONE) { - return NoType.getNoneInstance(); - } else if (kind == TypeKind.VOID) { - return NoType.getVoidInstance(); - } else { - throw new IllegalArgumentException("No NoType of kind: " + kind); - } - } - - @Override - public ArrayType getArrayType(TypeMirror componentType) { - throw new UnsupportedOperationException(); - } - - @Override - public javax.lang.model.type.WildcardType getWildcardType(TypeMirror extendsBound, - TypeMirror superBound) { - throw new UnsupportedOperationException(); - } - - @Override - public DeclaredType getDeclaredType(TypeElement typeElem, TypeMirror... typeArgs) { - throw new UnsupportedOperationException(); - } - - @Override - public javax.lang.model.type.DeclaredType getDeclaredType(javax.lang.model.type.DeclaredType containing, - TypeElement typeElem, - TypeMirror... typeArgs) { - throw new UnsupportedOperationException(); - } - - @Override - public TypeMirror asMemberOf(javax.lang.model.type.DeclaredType containing, Element element) { - throw new UnsupportedOperationException(); - } - - private void checkType(TypeMirror t) { - if (!(t instanceof AbstractTypeMirror)) { - throw new IllegalArgumentException("This Types implementation can only operate on CoreReflectionFactory type classes"); - } - } - } - - private abstract static class CoreReflDeclaredType extends AbstractTypeMirror - implements javax.lang.model.type.DeclaredType { - private Class source = null; - - private CoreReflDeclaredType(Class source) { - super(TypeKind.DECLARED); - this.source = source; - } - - static DeclaredType instance(Class source, Type genericSource) { - if (genericSource instanceof ParameterizedType) { - return new ParameterizedDeclaredType(source, (ParameterizedType)genericSource); - } else if (genericSource instanceof Class) { // This happens when a field has a raw type - if (!source.equals(genericSource)) { - throw new IllegalArgumentException("Don't know how to handle this"); - } - return instance(source); - } - throw new IllegalArgumentException("Don't know how to create a declared type from: " + - source + - " and genericSource " + - genericSource); - } - - static DeclaredType instance(Class source) { - return new RawDeclaredType(source); - } - - protected Class getSource() { - return source; - } - - @Override - public Element asElement() { - return CoreReflectionFactory.createMirror(getSource()); - } - - abstract boolean isSameType(DeclaredType other); - - @Override - TypeMirror capture() { - return new CaptureDeclaredType(this); - } - - private static class CaptureDeclaredType extends CoreReflDeclaredType { - CoreReflDeclaredType cap; - CaptureDeclaredType(CoreReflDeclaredType t) { - super(t.source); - this.cap = t; - } - - @Override - public List getTypeArguments() { - List wrapped = cap.getTypeArguments(); - ArrayList res = new ArrayList<>(wrapped.size()); - res.ensureCapacity(wrapped.size()); - - for (int i = 0; i < wrapped.size(); i++) { - TypeMirror t = wrapped.get(i); - - if (t instanceof javax.lang.model.type.WildcardType) { - res.add(i, convert(t)); - } else { - res.add(i, t); - } - } - return Collections.unmodifiableList(res); - } - - private TypeMirror convert(TypeMirror t) { - if (!(t instanceof javax.lang.model.type.WildcardType)) { - throw new IllegalArgumentException(); - } else { - javax.lang.model.type.WildcardType w = (javax.lang.model.type.WildcardType)t; - return TypeFactory.typeVariableInstance(w, w.getExtendsBound(), w.getSuperBound()); - } - } - - @Override - public TypeMirror getEnclosingType() { - return cap.getEnclosingType(); - } - - @Override - List directSuperTypes() { - return cap.directSuperTypes(); - } - - @Override - boolean isSameType(DeclaredType other) { - return other == this; - } - - @Override - public String toString() { - return " CAPTURE of: " + cap.toString(); - } - } - - private static class RawDeclaredType extends CoreReflDeclaredType - implements Reifiable { - private RawDeclaredType(Class source) { - super(source); - } - - @Override - public Class getSource() { - return super.getSource(); - } - - @Override - public TypeMirror getEnclosingType() { - Class enclosing = getSource().getEnclosingClass(); - if (null == enclosing) { - return NoType.getNoneInstance(); - } else { - return TypeFactory.instance(enclosing); - } - } - - @Override - public List getTypeArguments() { - return Collections.emptyList(); - } - - @Override - List directSuperTypes() { - if (getSource().isEnum()) { - return enumSuper(); - } - - if (getSource() == java.lang.Object.class) { - return Collections.emptyList(); - } - List res = new ArrayList<>(); - Type[] superInterfaces = getSource().getInterfaces(); - if (!getSource().isInterface()) { - res.add(TypeFactory.instance(getSource().getSuperclass())); - } else if (superInterfaces.length == 0) { - // Interfaces that don't extend another interface - // have java.lang.Object as a direct supertype. - return Collections.unmodifiableList(Arrays.asList(TypeFactory.instance(java.lang.Object.class))); - } - - for (Type t : superInterfaces) { - res.add(TypeFactory.instance(t)); - } - return Collections.unmodifiableList(res); - } - - private List enumSuper() { - Class rawSuper = getSource().getSuperclass(); - Type[] actualArgs = ((ParameterizedTypeImpl)getSource().getGenericSuperclass()).getActualTypeArguments(); - - // Reconsider this : assume the problem is making - // Enum rather than just a raw enum. - return Collections.unmodifiableList(Arrays.asList(TypeFactory.instance(ParameterizedTypeImpl.make(rawSuper, - Arrays.copyOf(actualArgs, - actualArgs.length), - null)))); - } - - @Override - boolean isSameType(DeclaredType other) { - if (other instanceof RawDeclaredType) { - return Objects.equals(getSource(), ((RawDeclaredType)other).getSource()); - } else { - return false; - } - } - - @Override - public String toString() { - return getSource().toString(); - } - } - - private static class ParameterizedDeclaredType extends CoreReflDeclaredType { - private ParameterizedType genericSource = null; - private ParameterizedDeclaredType(Class source, ParameterizedType genericSource) { - super(source); - this.genericSource = genericSource; - } - - @Override - public TypeMirror getEnclosingType() { - Type me = genericSource; - Type owner = GenericTypes.getEnclosingType(me); - if (owner == null) { - return NoType.getNoneInstance(); - } - return TypeFactory.instance(owner); - } - - @Override - public List getTypeArguments() { - Type[] typeArgs = genericSource.getActualTypeArguments(); - - int length = typeArgs.length; - if (length == 0) - return Collections.emptyList(); - else { - List tmp = new ArrayList<>(length); - for (Type t : typeArgs) { - tmp.add(TypeFactory.instance(t)); - } - return Collections.unmodifiableList(tmp); - } - } - - @Override - List directSuperTypes() { - if (getSource() == java.lang.Object.class) { - return Collections.emptyList(); - } - - List res = new ArrayList<>(); - Type[] superInterfaces = getSource().getGenericInterfaces(); - if (!getSource().isInterface()) { - // Replace actual type arguments with our type arguments - res.add(TypeFactory.instance(substituteTypeArgs(getSource().getGenericSuperclass()))); - } else if (superInterfaces.length == 0) { - // Interfaces that don't extend another interface - // have java.lang.Object as a direct supertype, plus - // possibly the interface's raw type - res.add(TypeFactory.instance(java.lang.Object.class)); - } - - for (Type t : superInterfaces) { - res.add(TypeFactory.instance(substituteTypeArgs(t))); - } - - res.add(TypeFactory.instance(getSource())); // Add raw type - return Collections.unmodifiableList(res); - } - - private Type substituteTypeArgs(Type type) { - if (!(type instanceof ParameterizedType)) { - return type; - } - - ParameterizedType target = (ParameterizedType)type; - // Cast to get a Class instead of a plain type. - Class raw = ((ParameterizedTypeImpl)target).getRawType(); - Type[] actualArgs = genericSource.getActualTypeArguments(); - - return ParameterizedTypeImpl.make(raw, Arrays.copyOf(actualArgs, actualArgs.length), null); - } - - @Override - boolean isSameType(DeclaredType other) { - if (other instanceof ParameterizedDeclaredType) { - return GenericTypes.isSameGenericType(genericSource, - ((ParameterizedDeclaredType)other).genericSource); - } else { - return false; - } - } - - @Override - public String toString() { - return getKind().toString() + " " + genericSource.toString(); - } - } - - /** - * Implementing class for ParameterizedType interface. - * Derived from sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl - */ - - private static class ParameterizedTypeImpl implements ParameterizedType { - private Type[] actualTypeArguments; - private Class rawType; - private Type ownerType; - - private ParameterizedTypeImpl(Class rawType, - Type[] actualTypeArguments, - Type ownerType) { - this.actualTypeArguments = actualTypeArguments; - this.rawType = rawType; - if (ownerType != null) { - this.ownerType = ownerType; - } else { - this.ownerType = rawType.getDeclaringClass(); - } - validateConstructorArguments(); - } - - private void validateConstructorArguments() { - java.lang.reflect.TypeVariable/**/[] formals = rawType.getTypeParameters(); - // check correct arity of actual type args - if (formals.length != actualTypeArguments.length){ - throw new MalformedParameterizedTypeException(); - } - } - - /** - * Static factory. Given a (generic) class, actual type arguments - * and an owner type, creates a parameterized type. - * This class can be instantiated with a a raw type that does not - * represent a generic type, provided the list of actual type - * arguments is empty. - * If the ownerType argument is null, the declaring class of the - * raw type is used as the owner type. - *

This method throws a MalformedParameterizedTypeException - * under the following circumstances: - * If the number of actual type arguments (i.e., the size of the - * array {@code typeArgs}) does not correspond to the number of - * formal type arguments. - * If any of the actual type arguments is not an instance of the - * bounds on the corresponding formal. - * @param rawType the Class representing the generic type declaration being - * instantiated - * @param actualTypeArguments - a (possibly empty) array of types - * representing the actual type arguments to the parameterized type - * @param ownerType - the enclosing type, if known. - * @return An instance of {@code ParameterizedType} - * @throws MalformedParameterizedTypeException - if the instantiation - * is invalid - */ - public static ParameterizedTypeImpl make(Class rawType, - Type[] actualTypeArguments, - Type ownerType) { - return new ParameterizedTypeImpl(rawType, actualTypeArguments, - ownerType); - } - - - /** - * Returns an array of {@code Type} objects representing the actual type - * arguments to this type. - * - *

Note that in some cases, the returned array be empty. This can occur - * if this type represents a non-parameterized type nested within - * a parameterized type. - * - * @return an array of {@code Type} objects representing the actual type - * arguments to this type - * @throws {@code TypeNotPresentException} if any of the - * actual type arguments refers to a non-existent type declaration - * @throws {@code MalformedParameterizedTypeException} if any of the - * actual type parameters refer to a parameterized type that cannot - * be instantiated for any reason - * @since 1.5 - */ - public Type[] getActualTypeArguments() { - return actualTypeArguments.clone(); - } - - /** - * Returns the {@code Type} object representing the class or interface - * that declared this type. - * - * @return the {@code Type} object representing the class or interface - * that declared this type - */ - public Class getRawType() { - return rawType; - } - - - /** - * Returns a {@code Type} object representing the type that this type - * is a member of. For example, if this type is {@code O.I}, - * return a representation of {@code O}. - * - *

If this type is a top-level type, {@code null} is returned. - * - * @return a {@code Type} object representing the type that - * this type is a member of. If this type is a top-level type, - * {@code null} is returned - */ - public Type getOwnerType() { - return ownerType; - } - - /* - * From the JavaDoc for java.lang.reflect.ParameterizedType - * "Instances of classes that implement this interface must - * implement an equals() method that equates any two instances - * that share the same generic type declaration and have equal - * type parameters." - */ - @Override - public boolean equals(Object o) { - if (o instanceof ParameterizedType) { - // Check that information is equivalent - ParameterizedType that = (ParameterizedType) o; - - if (this == that) - return true; - - Type thatOwner = that.getOwnerType(); - Type thatRawType = that.getRawType(); - - return Objects.equals(ownerType, thatOwner) && - Objects.equals(rawType, thatRawType) && - Arrays.equals(actualTypeArguments, // avoid clone - that.getActualTypeArguments()); - } else - return false; - } - - @Override - public int hashCode() { - return - Arrays.hashCode(actualTypeArguments) ^ - Objects.hashCode(ownerType) ^ - Objects.hashCode(rawType); - } - - public String toString() { - StringBuilder sb = new StringBuilder(); - - if (ownerType != null) { - if (ownerType instanceof Class) - sb.append(((Class)ownerType).getName()); - else - sb.append(ownerType.toString()); - - sb.append("."); - - if (ownerType instanceof ParameterizedTypeImpl) { - // Find simple name of nested type by removing the - // shared prefix with owner. - sb.append(rawType.getName().replace( ((ParameterizedTypeImpl)ownerType).rawType.getName() + "$", - "")); - } else - sb.append(rawType.getName()); - } else - sb.append(rawType.getName()); - - if (actualTypeArguments != null && - actualTypeArguments.length > 0) { - sb.append("<"); - boolean first = true; - for (Type t: actualTypeArguments) { - if (!first) - sb.append(", "); - if (t instanceof Class) - sb.append(((Class)t).getName()); - else - sb.append(t.toString()); - first = false; - } - sb.append(">"); - } - - return sb.toString(); - } - } - - } - - private static class ErasedMethodType extends ExecutableMethodType implements javax.lang.model.type.ExecutableType { - private final Method m; - - ErasedMethodType(Method m) { - super(m); - this.m = Objects.requireNonNull(m); - } - - @Override - public List getTypeVariables() { - return Collections.emptyList(); - } - - @Override - public List getThrownTypes() { - Class[] exceptions = m.getExceptionTypes(); - int len = exceptions.length; - - if (len > 0) { - List res = new ArrayList(len); - for (Class t : exceptions) { - res.add(TypeFactory.instance(t)); - } - return Collections.unmodifiableList(res); - } else { - List ret = Collections.emptyList(); - return ret; - } - } - - @Override - public List getParameterTypes() { - Class[] params = m.getParameterTypes(); - int len = params.length; - - if (len > 0) { - List res = new ArrayList(len); - for (Class t : params) { - res.add(TypeFactory.instance(t)); - } - return Collections.unmodifiableList(res); - } else { - List ret = Collections.emptyList(); - return ret; - } - } - - @Override - public TypeMirror getReturnType() { - return TypeFactory.instance(m.getReturnType()); - } - - @Override - TypeMirror erasure() { - return this; - } - } - - private static class ErrorType extends AbstractTypeMirror implements javax.lang.model.type.ErrorType { - private static ErrorType errorType = new ErrorType(); - - public static ErrorType getErrorInstance() { - return errorType; - } - - private ErrorType() { - super(TypeKind.ERROR); - } - - @Override - public List getTypeArguments() { - throw new UnsupportedOperationException(); - } - - @Override - public TypeMirror getEnclosingType() { - throw new UnsupportedOperationException(); - } - - @Override - public Element asElement() { - throw new UnsupportedOperationException(); - } - - @Override - List directSuperTypes() { - throw new UnsupportedOperationException(); - } - } - - private static class ExecutableMethodType extends AbstractTypeMirror - implements javax.lang.model.type.ExecutableType { - private final Method m; - - ExecutableMethodType(Method m) { - super(TypeKind.EXECUTABLE); - this.m = Objects.requireNonNull(m); - } - - @Override - public List getThrownTypes() { - Type[] exceptions = m.getGenericExceptionTypes(); - int len = exceptions.length; - - if (len > 0) { - List res = new ArrayList(len); - for (Type t : exceptions) { - res.add(TypeFactory.instance(t)); - } - return Collections.unmodifiableList(res); - } else { - List ret = Collections.emptyList(); - return ret; - } - } - - @Override - public List getTypeVariables() { - java.lang.reflect.TypeVariable[] variables = m.getTypeParameters(); - int len = variables.length; - - if (len > 0) { - List res = new ArrayList<>(len); - for (java.lang.reflect.TypeVariable t : variables) { - res.add(TypeFactory.typeVariableInstance(t)); - } - return Collections.unmodifiableList(res); - } else { - return Collections.emptyList(); - } - } - - @Override - public TypeMirror getReturnType() { - return TypeFactory.instance(m.getGenericReturnType()); - } - - @Override - public List getParameterTypes() { - Type[] params = m.getGenericParameterTypes(); - int len = params.length; - - if (len > 0) { - List res = new ArrayList(len); - for (Type t : params) { - res.add(TypeFactory.instance(t)); - } - return Collections.unmodifiableList(res); - } else { - return Collections.emptyList(); - } - } - - @Override - List directSuperTypes() { - // Spec says we don't need this - throw new UnsupportedOperationException(); - } - - @Override - TypeMirror erasure() { - return new ErasedMethodType(m); - } - - @Override - public TypeMirror getReceiverType() { - throw new UnsupportedOperationException(); - } - - boolean sameSignature(ExecutableMethodType other){ - if (!m.getName().equals(other.m.getName())) { - return false; - } - - List thisParams = getParameterTypes(); - List otherParams = other.getParameterTypes(); - if (thisParams.size() != otherParams.size()) { - return false; - } - for (int i = 0; i < thisParams.size(); i++) { - if (!CoreReflTypes.instance().isSameType(thisParams.get(i), otherParams.get(i))) { - return false; - } - } - return true; - } - } - - private static class GenericTypes { - public static boolean isSameGenericType(Type t1, Type t2) { - if (t1 instanceof Class) { - return ((Class)t1).equals(t2); - } else if (t1 instanceof ParameterizedType) { - return ((ParameterizedType)t1).equals(t2); - } - throw new UnsupportedOperationException(); - } - - public static Type getEnclosingType(Type t1) { - if (t1 instanceof Class) { - return ((Class)t1).getEnclosingClass(); - } else if (t1 instanceof ParameterizedType) { - return ((ParameterizedType)t1).getOwnerType(); - } - throw new UnsupportedOperationException(); - } - } - - private static class IntersectionDeclaredType extends AbstractTypeMirror - implements javax.lang.model.type.DeclaredType { - private Type[] sources = null; - - IntersectionDeclaredType(Type[] sources) { - super(TypeKind.DECLARED); - this.sources = Arrays.copyOf(Objects.requireNonNull(sources), - sources.length); - } - - @Override - public TypeMirror getEnclosingType() { - return NoType.getNoneInstance(); - } - - @Override - public Element asElement() { - throw new UnsupportedOperationException(); - } - - @Override - public List getTypeArguments() { - throw new UnsupportedOperationException(); - } - - @Override - List directSuperTypes() { - int len = sources.length; - - if (len > 0) { - List res = new ArrayList(len); - for (Type c : sources) { - res.add(TypeFactory.instance(c)); - } - return Collections.unmodifiableList(res); - } else { - return Collections.emptyList(); - } - } - } - - private static class ModelWildcardType extends AbstractTypeMirror - implements javax.lang.model.type.WildcardType { - private java.lang.reflect.WildcardType genericSource; - - ModelWildcardType(java.lang.reflect.WildcardType genericSource) { - super(TypeKind.WILDCARD); - this.genericSource = Objects.requireNonNull(genericSource); - } - - @Override - List directSuperTypes() { - // TODO Add support for this operation - throw new UnsupportedOperationException(); - } - - @Override - public TypeMirror getExtendsBound() { - Type[] t = genericSource.getUpperBounds(); - - if (t.length == 1) { - if (t[0].equals(Object.class) && getSuperBound() != null) { // can't have both lower and upper explicit - return null; - } - return TypeFactory.instance(t[0]); - } - throw new UnsupportedOperationException(); // TODO: intersection type? - } - - @Override - public TypeMirror getSuperBound() { - Type[] t = genericSource.getLowerBounds(); - - if (t.length == 0) { // bound is null - return null; - } else if (t.length == 1) { - return TypeFactory.instance(t[0]); - } - throw new UnsupportedOperationException(); // TODO: intersection type? - } - - @Override - public String toString() { - return getKind() + " " + genericSource.toString(); - } - } - - private static class NoType extends AbstractTypeMirror - implements javax.lang.model.type.NoType { - private static NoType noneType = new NoType(TypeKind.NONE, "none"); - private static NoType packageType = new NoType(TypeKind.PACKAGE, "package"); - private static NoType voidType = new NoType(TypeKind.VOID, "void"); - - private String str; - - public static NoType getNoneInstance() { - return noneType; - } - - public static NoType getPackageInstance() { - return packageType; - } - - public static NoType getVoidInstance() { - return voidType; - } - - private NoType(TypeKind k, String str) { - super(k); - this.str = str; - } - - @Override - List directSuperTypes() { - // TODO We don't need this for the Package instance, how about the others? - throw new UnsupportedOperationException(); - } - - @Override - public String toString() { - return str; - } - } - - private static class CoreReflNullType extends AbstractTypeMirror - implements javax.lang.model.type.NullType { - private static CoreReflNullType nullType = new CoreReflNullType(); - - public static NullType getInstance() { - return nullType; - } - - private CoreReflNullType() { - super(TypeKind.NULL); - } - - @Override - List directSuperTypes() { - // JLS 4.10.2 says: - // "The direct supertypes of the null type are all reference types other than the null type itself." - // TODO return null? an empty list? the error type? anyhow fix this - throw new UnsupportedOperationException(); - } - } - - private static interface Reifiable { - Class getSource(); - } - - private static class PrimitiveType extends AbstractTypeMirror - implements javax.lang.model.type.PrimitiveType, - Reifiable { - private Class source; - - private static PrimitiveType booleanInstance = new PrimitiveType(TypeKind.BOOLEAN, boolean.class); - private static PrimitiveType byteInstance = new PrimitiveType(TypeKind.BYTE, byte.class); - private static PrimitiveType charInstance = new PrimitiveType(TypeKind.CHAR, char.class); - private static PrimitiveType shortInstance = new PrimitiveType(TypeKind.SHORT, short.class); - private static PrimitiveType intInstance = new PrimitiveType(TypeKind.INT, int.class); - private static PrimitiveType longInstance = new PrimitiveType(TypeKind.LONG, long.class); - private static PrimitiveType floatInstance = new PrimitiveType(TypeKind.FLOAT, float.class); - private static PrimitiveType doubleInstance = new PrimitiveType(TypeKind.DOUBLE, double.class); - - private PrimitiveType(TypeKind kind, Class source) { - super(kind); - this.source = source; - } - - @Override - public Class getSource() { - return source; - } - - static PrimitiveType instance(Class c) { - switch(c.getName()) { - case "boolean": - return booleanInstance; - case "byte": - return byteInstance; - case "char": - return charInstance; - case "short": - return shortInstance; - case "int": - return intInstance; - case "long": - return longInstance; - case "float": - return floatInstance; - case "double": - return doubleInstance; - default: - throw new IllegalArgumentException(); - } - } - - static PrimitiveType instance(TypeKind k) { - switch(k) { - case BOOLEAN: - return booleanInstance; - case BYTE: - return byteInstance; - case CHAR: - return charInstance; - case SHORT: - return shortInstance; - case INT: - return intInstance; - case LONG: - return longInstance; - case FLOAT: - return floatInstance; - case DOUBLE: - return doubleInstance; - default: - throw new IllegalArgumentException(); - } - } - - @Override - public String toString() { - return source.getName(); - } - - //Types methods - @Override - List directSuperTypes() { - switch (getKind()) { - case DOUBLE: - return Collections.emptyList(); - case FLOAT: - return Arrays.asList(doubleInstance); - case LONG: - return Arrays.asList(floatInstance); - case INT: - return Arrays.asList(longInstance); - case CHAR: - return Arrays.asList(intInstance); - case SHORT: - return Arrays.asList(intInstance); - case BYTE: - return Arrays.asList(shortInstance); - default: - return Collections.emptyList(); - } - } - } - - private static class TypeFactory { - private TypeFactory() { }// no instances for you - - public static TypeMirror instance(Class c) { - if (c.isPrimitive()) { - if (c.getName().equals("void")) { - return NoType.getVoidInstance(); - } else { - return PrimitiveType.instance(c); - } - } else if (c.isArray()) { - return new CoreReflArrayType(c); - } else if (c.isAnonymousClass() || - c.isLocalClass() || - c.isMemberClass() || - c.isInterface() || // covers annotations - c.isEnum()) { - return CoreReflDeclaredType.instance(c); - } else { // plain old class ?? - return CoreReflDeclaredType.instance(c); - } - } - - public static TypeMirror instance(Type t) { - if (t instanceof Class) { - return instance((Class)t); - } else if (t instanceof ParameterizedType) { - ParameterizedType tmp = (ParameterizedType)t; - Type raw = tmp.getRawType(); - if (!(raw instanceof Class)) { - throw new IllegalArgumentException(t + " " + raw ); - } - return CoreReflDeclaredType.instance((Class)raw, tmp); - } else if (t instanceof java.lang.reflect.WildcardType) { - return new ModelWildcardType((java.lang.reflect.WildcardType)t); - } else if (t instanceof java.lang.reflect.TypeVariable) { - return new CoreReflTypeVariable((java.lang.reflect.TypeVariable)t); - } - throw new IllegalArgumentException("Don't know how to make instance from: " + t.getClass()); - } - - public static TypeMirror instance(Field f) { - return CoreReflDeclaredType.instance(f.getType(), f.getGenericType()); - } - - public static ExecutableType instance(Method m) { - return new ExecutableMethodType(m); - } - - public static javax.lang.model.type.TypeVariable typeVariableInstance(java.lang.reflect.TypeVariable v) { - return new CoreReflTypeVariable(v); - } - - public static javax.lang.model.type.TypeVariable typeVariableInstance(TypeMirror source, - TypeMirror upperBound, - TypeMirror lowerBound) { - return new CaptureTypeVariable(source, upperBound, lowerBound); - } - } - - private static class CoreReflTypeVariable extends AbstractTypeMirror - implements javax.lang.model.type.TypeVariable { - private final java.lang.reflect.TypeVariable source; - private boolean isCapture = false; - - protected CoreReflTypeVariable(java.lang.reflect.TypeVariable source) { - super(TypeKind.TYPEVAR); - Objects.requireNonNull(source); - this.source = source; - } - - @Override - public TypeMirror getUpperBound() { - return new IntersectionDeclaredType(source.getBounds()); - } - - @Override - public TypeMirror getLowerBound() { - return CoreReflTypes.instance().getNullType(); - } - - @Override - public Element asElement() { - return CoreReflectionFactory.createMirror(source); - } - - @Override - List directSuperTypes() { - return ((AbstractTypeMirror)getUpperBound()).directSuperTypes(); - } - - @Override - public int hashCode() { - return source.hashCode(); - } - - @Override - public boolean equals(Object other) { - if (other instanceof CoreReflTypeVariable) { - return this.source.equals(((CoreReflTypeVariable)other).source); - } else { - return false; - } - } - } -} diff --git a/nashorn/make/BuildNashorn.gmk b/make/BuildNashorn.gmk similarity index 100% rename from nashorn/make/BuildNashorn.gmk rename to make/BuildNashorn.gmk diff --git a/jdk/make/CompileDemos.gmk b/make/CompileDemos.gmk similarity index 100% rename from jdk/make/CompileDemos.gmk rename to make/CompileDemos.gmk diff --git a/langtools/make/CompileInterim.gmk b/make/CompileInterimLangtools.gmk similarity index 100% rename from langtools/make/CompileInterim.gmk rename to make/CompileInterimLangtools.gmk diff --git a/jdk/make/CompileInterimRmic.gmk b/make/CompileInterimRmic.gmk similarity index 100% rename from jdk/make/CompileInterimRmic.gmk rename to make/CompileInterimRmic.gmk diff --git a/jdk/make/CompileModuleTools.gmk b/make/CompileModuleTools.gmk similarity index 100% rename from jdk/make/CompileModuleTools.gmk rename to make/CompileModuleTools.gmk diff --git a/hotspot/make/CompileTools.gmk b/make/CompileToolsHotspot.gmk similarity index 100% rename from hotspot/make/CompileTools.gmk rename to make/CompileToolsHotspot.gmk diff --git a/jdk/make/CompileTools.gmk b/make/CompileToolsJdk.gmk similarity index 100% rename from jdk/make/CompileTools.gmk rename to make/CompileToolsJdk.gmk diff --git a/jdk/make/CopyInterimCLDRConverter.gmk b/make/CopyInterimCLDRConverter.gmk similarity index 100% rename from jdk/make/CopyInterimCLDRConverter.gmk rename to make/CopyInterimCLDRConverter.gmk diff --git a/jdk/make/GenerateModuleSummary.gmk b/make/GenerateModuleSummary.gmk similarity index 100% rename from jdk/make/GenerateModuleSummary.gmk rename to make/GenerateModuleSummary.gmk diff --git a/jdk/make/ModuleTools.gmk b/make/ModuleTools.gmk similarity index 100% rename from jdk/make/ModuleTools.gmk rename to make/ModuleTools.gmk diff --git a/jdk/make/Tools.gmk b/make/ToolsJdk.gmk similarity index 100% rename from jdk/make/Tools.gmk rename to make/ToolsJdk.gmk diff --git a/langtools/make/Tools.gmk b/make/ToolsLangtools.gmk similarity index 100% rename from langtools/make/Tools.gmk rename to make/ToolsLangtools.gmk diff --git a/jdk/make/UnpackSecurity.gmk b/make/UnpackSecurity.gmk similarity index 100% rename from jdk/make/UnpackSecurity.gmk rename to make/UnpackSecurity.gmk diff --git a/common/autoconf/Makefile.in b/make/autoconf/Makefile.in similarity index 100% rename from common/autoconf/Makefile.in rename to make/autoconf/Makefile.in diff --git a/common/autoconf/autogen.sh b/make/autoconf/autogen.sh similarity index 100% rename from common/autoconf/autogen.sh rename to make/autoconf/autogen.sh diff --git a/common/autoconf/basics.m4 b/make/autoconf/basics.m4 similarity index 100% rename from common/autoconf/basics.m4 rename to make/autoconf/basics.m4 diff --git a/common/autoconf/basics_windows.m4 b/make/autoconf/basics_windows.m4 similarity index 100% rename from common/autoconf/basics_windows.m4 rename to make/autoconf/basics_windows.m4 diff --git a/common/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4 similarity index 100% rename from common/autoconf/boot-jdk.m4 rename to make/autoconf/boot-jdk.m4 diff --git a/common/autoconf/bootcycle-spec.gmk.in b/make/autoconf/bootcycle-spec.gmk.in similarity index 100% rename from common/autoconf/bootcycle-spec.gmk.in rename to make/autoconf/bootcycle-spec.gmk.in diff --git a/common/autoconf/build-aux/autoconf-config.guess b/make/autoconf/build-aux/autoconf-config.guess similarity index 100% rename from common/autoconf/build-aux/autoconf-config.guess rename to make/autoconf/build-aux/autoconf-config.guess diff --git a/common/autoconf/build-aux/autoconf-config.sub b/make/autoconf/build-aux/autoconf-config.sub similarity index 100% rename from common/autoconf/build-aux/autoconf-config.sub rename to make/autoconf/build-aux/autoconf-config.sub diff --git a/common/autoconf/build-aux/config.guess b/make/autoconf/build-aux/config.guess similarity index 100% rename from common/autoconf/build-aux/config.guess rename to make/autoconf/build-aux/config.guess diff --git a/common/autoconf/build-aux/config.sub b/make/autoconf/build-aux/config.sub similarity index 100% rename from common/autoconf/build-aux/config.sub rename to make/autoconf/build-aux/config.sub diff --git a/common/autoconf/build-aux/install.sh b/make/autoconf/build-aux/install.sh similarity index 100% rename from common/autoconf/build-aux/install.sh rename to make/autoconf/build-aux/install.sh diff --git a/common/autoconf/build-aux/pkg.m4 b/make/autoconf/build-aux/pkg.m4 similarity index 100% rename from common/autoconf/build-aux/pkg.m4 rename to make/autoconf/build-aux/pkg.m4 diff --git a/common/autoconf/build-performance.m4 b/make/autoconf/build-performance.m4 similarity index 100% rename from common/autoconf/build-performance.m4 rename to make/autoconf/build-performance.m4 diff --git a/common/autoconf/buildjdk-spec.gmk.in b/make/autoconf/buildjdk-spec.gmk.in similarity index 100% rename from common/autoconf/buildjdk-spec.gmk.in rename to make/autoconf/buildjdk-spec.gmk.in diff --git a/common/autoconf/compare.sh.in b/make/autoconf/compare.sh.in similarity index 100% rename from common/autoconf/compare.sh.in rename to make/autoconf/compare.sh.in diff --git a/common/autoconf/configure b/make/autoconf/configure similarity index 100% rename from common/autoconf/configure rename to make/autoconf/configure diff --git a/common/autoconf/configure.ac b/make/autoconf/configure.ac similarity index 100% rename from common/autoconf/configure.ac rename to make/autoconf/configure.ac diff --git a/common/autoconf/flags.m4 b/make/autoconf/flags.m4 similarity index 100% rename from common/autoconf/flags.m4 rename to make/autoconf/flags.m4 diff --git a/common/autoconf/generated-configure.sh b/make/autoconf/generated-configure.sh similarity index 100% rename from common/autoconf/generated-configure.sh rename to make/autoconf/generated-configure.sh diff --git a/common/autoconf/help.m4 b/make/autoconf/help.m4 similarity index 100% rename from common/autoconf/help.m4 rename to make/autoconf/help.m4 diff --git a/common/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4 similarity index 100% rename from common/autoconf/hotspot.m4 rename to make/autoconf/hotspot.m4 diff --git a/common/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 similarity index 100% rename from common/autoconf/jdk-options.m4 rename to make/autoconf/jdk-options.m4 diff --git a/common/autoconf/jdk-version.m4 b/make/autoconf/jdk-version.m4 similarity index 100% rename from common/autoconf/jdk-version.m4 rename to make/autoconf/jdk-version.m4 diff --git a/common/autoconf/lib-alsa.m4 b/make/autoconf/lib-alsa.m4 similarity index 100% rename from common/autoconf/lib-alsa.m4 rename to make/autoconf/lib-alsa.m4 diff --git a/common/autoconf/lib-bundled.m4 b/make/autoconf/lib-bundled.m4 similarity index 100% rename from common/autoconf/lib-bundled.m4 rename to make/autoconf/lib-bundled.m4 diff --git a/common/autoconf/lib-cups.m4 b/make/autoconf/lib-cups.m4 similarity index 100% rename from common/autoconf/lib-cups.m4 rename to make/autoconf/lib-cups.m4 diff --git a/common/autoconf/lib-ffi.m4 b/make/autoconf/lib-ffi.m4 similarity index 100% rename from common/autoconf/lib-ffi.m4 rename to make/autoconf/lib-ffi.m4 diff --git a/common/autoconf/lib-freetype.m4 b/make/autoconf/lib-freetype.m4 similarity index 100% rename from common/autoconf/lib-freetype.m4 rename to make/autoconf/lib-freetype.m4 diff --git a/common/autoconf/lib-std.m4 b/make/autoconf/lib-std.m4 similarity index 100% rename from common/autoconf/lib-std.m4 rename to make/autoconf/lib-std.m4 diff --git a/common/autoconf/lib-x11.m4 b/make/autoconf/lib-x11.m4 similarity index 100% rename from common/autoconf/lib-x11.m4 rename to make/autoconf/lib-x11.m4 diff --git a/common/autoconf/libraries.m4 b/make/autoconf/libraries.m4 similarity index 100% rename from common/autoconf/libraries.m4 rename to make/autoconf/libraries.m4 diff --git a/common/autoconf/platform.m4 b/make/autoconf/platform.m4 similarity index 100% rename from common/autoconf/platform.m4 rename to make/autoconf/platform.m4 diff --git a/common/autoconf/source-dirs.m4 b/make/autoconf/source-dirs.m4 similarity index 100% rename from common/autoconf/source-dirs.m4 rename to make/autoconf/source-dirs.m4 diff --git a/common/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in similarity index 100% rename from common/autoconf/spec.gmk.in rename to make/autoconf/spec.gmk.in diff --git a/common/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4 similarity index 100% rename from common/autoconf/toolchain.m4 rename to make/autoconf/toolchain.m4 diff --git a/common/autoconf/toolchain_windows.m4 b/make/autoconf/toolchain_windows.m4 similarity index 100% rename from common/autoconf/toolchain_windows.m4 rename to make/autoconf/toolchain_windows.m4 diff --git a/common/autoconf/version-numbers b/make/autoconf/version-numbers similarity index 100% rename from common/autoconf/version-numbers rename to make/autoconf/version-numbers diff --git a/common/conf/jib-profiles.js b/make/conf/jib-profiles.js similarity index 100% rename from common/conf/jib-profiles.js rename to make/conf/jib-profiles.js diff --git a/jdk/make/copy/Copy-java.base.gmk b/make/copy/Copy-java.base.gmk similarity index 100% rename from jdk/make/copy/Copy-java.base.gmk rename to make/copy/Copy-java.base.gmk diff --git a/corba/make/copy/Copy-java.corba.gmk b/make/copy/Copy-java.corba.gmk similarity index 100% rename from corba/make/copy/Copy-java.corba.gmk rename to make/copy/Copy-java.corba.gmk diff --git a/jdk/make/copy/Copy-java.desktop.gmk b/make/copy/Copy-java.desktop.gmk similarity index 100% rename from jdk/make/copy/Copy-java.desktop.gmk rename to make/copy/Copy-java.desktop.gmk diff --git a/jdk/make/copy/Copy-java.logging.gmk b/make/copy/Copy-java.logging.gmk similarity index 100% rename from jdk/make/copy/Copy-java.logging.gmk rename to make/copy/Copy-java.logging.gmk diff --git a/jdk/make/copy/Copy-jdk.accessibility.gmk b/make/copy/Copy-jdk.accessibility.gmk similarity index 100% rename from jdk/make/copy/Copy-jdk.accessibility.gmk rename to make/copy/Copy-jdk.accessibility.gmk diff --git a/jdk/make/copy/Copy-jdk.crypto.cryptoki.gmk b/make/copy/Copy-jdk.crypto.cryptoki.gmk similarity index 100% rename from jdk/make/copy/Copy-jdk.crypto.cryptoki.gmk rename to make/copy/Copy-jdk.crypto.cryptoki.gmk diff --git a/jdk/make/copy/Copy-jdk.crypto.ucrypto.gmk b/make/copy/Copy-jdk.crypto.ucrypto.gmk similarity index 100% rename from jdk/make/copy/Copy-jdk.crypto.ucrypto.gmk rename to make/copy/Copy-jdk.crypto.ucrypto.gmk diff --git a/jdk/make/copy/Copy-jdk.jdwp.agent.gmk b/make/copy/Copy-jdk.jdwp.agent.gmk similarity index 100% rename from jdk/make/copy/Copy-jdk.jdwp.agent.gmk rename to make/copy/Copy-jdk.jdwp.agent.gmk diff --git a/jdk/make/copy/Copy-jdk.management.agent.gmk b/make/copy/Copy-jdk.management.agent.gmk similarity index 100% rename from jdk/make/copy/Copy-jdk.management.agent.gmk rename to make/copy/Copy-jdk.management.agent.gmk diff --git a/jdk/make/copy/CopyCommon.gmk b/make/copy/CopyCommon.gmk similarity index 100% rename from jdk/make/copy/CopyCommon.gmk rename to make/copy/CopyCommon.gmk diff --git a/corba/make/Makefile b/make/corba/Makefile similarity index 100% rename from corba/make/Makefile rename to make/corba/Makefile diff --git a/corba/make/src/classes/build/tools/logutil/IndentingPrintWriter.java b/make/corba/src/classes/build/tools/logutil/IndentingPrintWriter.java similarity index 100% rename from corba/make/src/classes/build/tools/logutil/IndentingPrintWriter.java rename to make/corba/src/classes/build/tools/logutil/IndentingPrintWriter.java diff --git a/corba/make/src/classes/build/tools/logutil/Input.java b/make/corba/src/classes/build/tools/logutil/Input.java similarity index 100% rename from corba/make/src/classes/build/tools/logutil/Input.java rename to make/corba/src/classes/build/tools/logutil/Input.java diff --git a/corba/make/src/classes/build/tools/logutil/InputCode.java b/make/corba/src/classes/build/tools/logutil/InputCode.java similarity index 100% rename from corba/make/src/classes/build/tools/logutil/InputCode.java rename to make/corba/src/classes/build/tools/logutil/InputCode.java diff --git a/corba/make/src/classes/build/tools/logutil/InputException.java b/make/corba/src/classes/build/tools/logutil/InputException.java similarity index 100% rename from corba/make/src/classes/build/tools/logutil/InputException.java rename to make/corba/src/classes/build/tools/logutil/InputException.java diff --git a/corba/make/src/classes/build/tools/logutil/MC.java b/make/corba/src/classes/build/tools/logutil/MC.java similarity index 100% rename from corba/make/src/classes/build/tools/logutil/MC.java rename to make/corba/src/classes/build/tools/logutil/MC.java diff --git a/corba/make/src/classes/build/tools/logutil/StringUtil.java b/make/corba/src/classes/build/tools/logutil/StringUtil.java similarity index 100% rename from corba/make/src/classes/build/tools/logutil/StringUtil.java rename to make/corba/src/classes/build/tools/logutil/StringUtil.java diff --git a/jdk/make/data/blacklistedcertsconverter/blacklisted.certs.pem b/make/data/blacklistedcertsconverter/blacklisted.certs.pem similarity index 100% rename from jdk/make/data/blacklistedcertsconverter/blacklisted.certs.pem rename to make/data/blacklistedcertsconverter/blacklisted.certs.pem diff --git a/jdk/make/data/bundle/JDK-Info.plist b/make/data/bundle/JDK-Info.plist similarity index 100% rename from jdk/make/data/bundle/JDK-Info.plist rename to make/data/bundle/JDK-Info.plist diff --git a/jdk/make/data/bundle/JRE-Info.plist b/make/data/bundle/JRE-Info.plist similarity index 100% rename from jdk/make/data/bundle/JRE-Info.plist rename to make/data/bundle/JRE-Info.plist diff --git a/jdk/make/data/characterdata/CharacterData00.java.template b/make/data/characterdata/CharacterData00.java.template similarity index 100% rename from jdk/make/data/characterdata/CharacterData00.java.template rename to make/data/characterdata/CharacterData00.java.template diff --git a/jdk/make/data/characterdata/CharacterData01.java.template b/make/data/characterdata/CharacterData01.java.template similarity index 100% rename from jdk/make/data/characterdata/CharacterData01.java.template rename to make/data/characterdata/CharacterData01.java.template diff --git a/jdk/make/data/characterdata/CharacterData02.java.template b/make/data/characterdata/CharacterData02.java.template similarity index 100% rename from jdk/make/data/characterdata/CharacterData02.java.template rename to make/data/characterdata/CharacterData02.java.template diff --git a/jdk/make/data/characterdata/CharacterData0E.java.template b/make/data/characterdata/CharacterData0E.java.template similarity index 100% rename from jdk/make/data/characterdata/CharacterData0E.java.template rename to make/data/characterdata/CharacterData0E.java.template diff --git a/jdk/make/data/characterdata/CharacterDataLatin1.java.template b/make/data/characterdata/CharacterDataLatin1.java.template similarity index 100% rename from jdk/make/data/characterdata/CharacterDataLatin1.java.template rename to make/data/characterdata/CharacterDataLatin1.java.template diff --git a/jdk/make/data/characterdata/CharacterDataPrivateUse.java.template b/make/data/characterdata/CharacterDataPrivateUse.java.template similarity index 100% rename from jdk/make/data/characterdata/CharacterDataPrivateUse.java.template rename to make/data/characterdata/CharacterDataPrivateUse.java.template diff --git a/jdk/make/data/characterdata/CharacterDataUndefined.java.template b/make/data/characterdata/CharacterDataUndefined.java.template similarity index 100% rename from jdk/make/data/characterdata/CharacterDataUndefined.java.template rename to make/data/characterdata/CharacterDataUndefined.java.template diff --git a/jdk/make/data/charsetmapping/Big5.map b/make/data/charsetmapping/Big5.map similarity index 100% rename from jdk/make/data/charsetmapping/Big5.map rename to make/data/charsetmapping/Big5.map diff --git a/jdk/make/data/charsetmapping/Big5.nr b/make/data/charsetmapping/Big5.nr similarity index 100% rename from jdk/make/data/charsetmapping/Big5.nr rename to make/data/charsetmapping/Big5.nr diff --git a/jdk/make/data/charsetmapping/Big5_HKSCS.c2b b/make/data/charsetmapping/Big5_HKSCS.c2b similarity index 100% rename from jdk/make/data/charsetmapping/Big5_HKSCS.c2b rename to make/data/charsetmapping/Big5_HKSCS.c2b diff --git a/jdk/make/data/charsetmapping/Big5_HKSCS.map b/make/data/charsetmapping/Big5_HKSCS.map similarity index 100% rename from jdk/make/data/charsetmapping/Big5_HKSCS.map rename to make/data/charsetmapping/Big5_HKSCS.map diff --git a/jdk/make/data/charsetmapping/Big5_HKSCS.nr b/make/data/charsetmapping/Big5_HKSCS.nr similarity index 100% rename from jdk/make/data/charsetmapping/Big5_HKSCS.nr rename to make/data/charsetmapping/Big5_HKSCS.nr diff --git a/jdk/make/data/charsetmapping/Big5_Solaris.map b/make/data/charsetmapping/Big5_Solaris.map similarity index 100% rename from jdk/make/data/charsetmapping/Big5_Solaris.map rename to make/data/charsetmapping/Big5_Solaris.map diff --git a/jdk/make/data/charsetmapping/DoubleByte-X.java.template b/make/data/charsetmapping/DoubleByte-X.java.template similarity index 100% rename from jdk/make/data/charsetmapping/DoubleByte-X.java.template rename to make/data/charsetmapping/DoubleByte-X.java.template diff --git a/jdk/make/data/charsetmapping/EUC_CN.map b/make/data/charsetmapping/EUC_CN.map similarity index 100% rename from jdk/make/data/charsetmapping/EUC_CN.map rename to make/data/charsetmapping/EUC_CN.map diff --git a/jdk/make/data/charsetmapping/EUC_JP.map b/make/data/charsetmapping/EUC_JP.map similarity index 100% rename from jdk/make/data/charsetmapping/EUC_JP.map rename to make/data/charsetmapping/EUC_JP.map diff --git a/jdk/make/data/charsetmapping/EUC_JP_LINUX.map b/make/data/charsetmapping/EUC_JP_LINUX.map similarity index 100% rename from jdk/make/data/charsetmapping/EUC_JP_LINUX.map rename to make/data/charsetmapping/EUC_JP_LINUX.map diff --git a/jdk/make/data/charsetmapping/EUC_JP_Open.map b/make/data/charsetmapping/EUC_JP_Open.map similarity index 100% rename from jdk/make/data/charsetmapping/EUC_JP_Open.map rename to make/data/charsetmapping/EUC_JP_Open.map diff --git a/jdk/make/data/charsetmapping/EUC_KR.map b/make/data/charsetmapping/EUC_KR.map similarity index 100% rename from jdk/make/data/charsetmapping/EUC_KR.map rename to make/data/charsetmapping/EUC_KR.map diff --git a/jdk/make/data/charsetmapping/EUC_TW.map b/make/data/charsetmapping/EUC_TW.map similarity index 100% rename from jdk/make/data/charsetmapping/EUC_TW.map rename to make/data/charsetmapping/EUC_TW.map diff --git a/jdk/make/data/charsetmapping/EUC_TW.nr b/make/data/charsetmapping/EUC_TW.nr similarity index 100% rename from jdk/make/data/charsetmapping/EUC_TW.nr rename to make/data/charsetmapping/EUC_TW.nr diff --git a/jdk/make/data/charsetmapping/GB18030.map b/make/data/charsetmapping/GB18030.map similarity index 100% rename from jdk/make/data/charsetmapping/GB18030.map rename to make/data/charsetmapping/GB18030.map diff --git a/jdk/make/data/charsetmapping/GBK.map b/make/data/charsetmapping/GBK.map similarity index 100% rename from jdk/make/data/charsetmapping/GBK.map rename to make/data/charsetmapping/GBK.map diff --git a/jdk/make/data/charsetmapping/HKSCS2001.c2b b/make/data/charsetmapping/HKSCS2001.c2b similarity index 100% rename from jdk/make/data/charsetmapping/HKSCS2001.c2b rename to make/data/charsetmapping/HKSCS2001.c2b diff --git a/jdk/make/data/charsetmapping/HKSCS2001.map b/make/data/charsetmapping/HKSCS2001.map similarity index 100% rename from jdk/make/data/charsetmapping/HKSCS2001.map rename to make/data/charsetmapping/HKSCS2001.map diff --git a/jdk/make/data/charsetmapping/HKSCS2008.c2b b/make/data/charsetmapping/HKSCS2008.c2b similarity index 100% rename from jdk/make/data/charsetmapping/HKSCS2008.c2b rename to make/data/charsetmapping/HKSCS2008.c2b diff --git a/jdk/make/data/charsetmapping/HKSCS2008.map b/make/data/charsetmapping/HKSCS2008.map similarity index 100% rename from jdk/make/data/charsetmapping/HKSCS2008.map rename to make/data/charsetmapping/HKSCS2008.map diff --git a/jdk/make/data/charsetmapping/HKSCS_XP.c2b b/make/data/charsetmapping/HKSCS_XP.c2b similarity index 100% rename from jdk/make/data/charsetmapping/HKSCS_XP.c2b rename to make/data/charsetmapping/HKSCS_XP.c2b diff --git a/jdk/make/data/charsetmapping/HKSCS_XP.map b/make/data/charsetmapping/HKSCS_XP.map similarity index 100% rename from jdk/make/data/charsetmapping/HKSCS_XP.map rename to make/data/charsetmapping/HKSCS_XP.map diff --git a/jdk/make/data/charsetmapping/IBM037.c2b b/make/data/charsetmapping/IBM037.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM037.c2b rename to make/data/charsetmapping/IBM037.c2b diff --git a/jdk/make/data/charsetmapping/IBM037.map b/make/data/charsetmapping/IBM037.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM037.map rename to make/data/charsetmapping/IBM037.map diff --git a/jdk/make/data/charsetmapping/IBM037.nr b/make/data/charsetmapping/IBM037.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM037.nr rename to make/data/charsetmapping/IBM037.nr diff --git a/jdk/make/data/charsetmapping/IBM1006.map b/make/data/charsetmapping/IBM1006.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1006.map rename to make/data/charsetmapping/IBM1006.map diff --git a/jdk/make/data/charsetmapping/IBM1025.c2b b/make/data/charsetmapping/IBM1025.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1025.c2b rename to make/data/charsetmapping/IBM1025.c2b diff --git a/jdk/make/data/charsetmapping/IBM1025.map b/make/data/charsetmapping/IBM1025.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1025.map rename to make/data/charsetmapping/IBM1025.map diff --git a/jdk/make/data/charsetmapping/IBM1025.nr b/make/data/charsetmapping/IBM1025.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1025.nr rename to make/data/charsetmapping/IBM1025.nr diff --git a/jdk/make/data/charsetmapping/IBM1026.c2b b/make/data/charsetmapping/IBM1026.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1026.c2b rename to make/data/charsetmapping/IBM1026.c2b diff --git a/jdk/make/data/charsetmapping/IBM1026.map b/make/data/charsetmapping/IBM1026.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1026.map rename to make/data/charsetmapping/IBM1026.map diff --git a/jdk/make/data/charsetmapping/IBM1026.nr b/make/data/charsetmapping/IBM1026.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1026.nr rename to make/data/charsetmapping/IBM1026.nr diff --git a/jdk/make/data/charsetmapping/IBM1046.map b/make/data/charsetmapping/IBM1046.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1046.map rename to make/data/charsetmapping/IBM1046.map diff --git a/jdk/make/data/charsetmapping/IBM1047.map b/make/data/charsetmapping/IBM1047.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1047.map rename to make/data/charsetmapping/IBM1047.map diff --git a/jdk/make/data/charsetmapping/IBM1097.map b/make/data/charsetmapping/IBM1097.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1097.map rename to make/data/charsetmapping/IBM1097.map diff --git a/jdk/make/data/charsetmapping/IBM1098.map b/make/data/charsetmapping/IBM1098.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1098.map rename to make/data/charsetmapping/IBM1098.map diff --git a/jdk/make/data/charsetmapping/IBM1112.c2b b/make/data/charsetmapping/IBM1112.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1112.c2b rename to make/data/charsetmapping/IBM1112.c2b diff --git a/jdk/make/data/charsetmapping/IBM1112.map b/make/data/charsetmapping/IBM1112.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1112.map rename to make/data/charsetmapping/IBM1112.map diff --git a/jdk/make/data/charsetmapping/IBM1112.nr b/make/data/charsetmapping/IBM1112.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1112.nr rename to make/data/charsetmapping/IBM1112.nr diff --git a/jdk/make/data/charsetmapping/IBM1122.c2b b/make/data/charsetmapping/IBM1122.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1122.c2b rename to make/data/charsetmapping/IBM1122.c2b diff --git a/jdk/make/data/charsetmapping/IBM1122.map b/make/data/charsetmapping/IBM1122.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1122.map rename to make/data/charsetmapping/IBM1122.map diff --git a/jdk/make/data/charsetmapping/IBM1122.nr b/make/data/charsetmapping/IBM1122.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1122.nr rename to make/data/charsetmapping/IBM1122.nr diff --git a/jdk/make/data/charsetmapping/IBM1123.c2b b/make/data/charsetmapping/IBM1123.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1123.c2b rename to make/data/charsetmapping/IBM1123.c2b diff --git a/jdk/make/data/charsetmapping/IBM1123.map b/make/data/charsetmapping/IBM1123.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1123.map rename to make/data/charsetmapping/IBM1123.map diff --git a/jdk/make/data/charsetmapping/IBM1123.nr b/make/data/charsetmapping/IBM1123.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1123.nr rename to make/data/charsetmapping/IBM1123.nr diff --git a/jdk/make/data/charsetmapping/IBM1124.map b/make/data/charsetmapping/IBM1124.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1124.map rename to make/data/charsetmapping/IBM1124.map diff --git a/jdk/make/data/charsetmapping/IBM1140.c2b b/make/data/charsetmapping/IBM1140.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1140.c2b rename to make/data/charsetmapping/IBM1140.c2b diff --git a/jdk/make/data/charsetmapping/IBM1140.map b/make/data/charsetmapping/IBM1140.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1140.map rename to make/data/charsetmapping/IBM1140.map diff --git a/jdk/make/data/charsetmapping/IBM1140.nr b/make/data/charsetmapping/IBM1140.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1140.nr rename to make/data/charsetmapping/IBM1140.nr diff --git a/jdk/make/data/charsetmapping/IBM1141.c2b b/make/data/charsetmapping/IBM1141.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1141.c2b rename to make/data/charsetmapping/IBM1141.c2b diff --git a/jdk/make/data/charsetmapping/IBM1141.map b/make/data/charsetmapping/IBM1141.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1141.map rename to make/data/charsetmapping/IBM1141.map diff --git a/jdk/make/data/charsetmapping/IBM1141.nr b/make/data/charsetmapping/IBM1141.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1141.nr rename to make/data/charsetmapping/IBM1141.nr diff --git a/jdk/make/data/charsetmapping/IBM1142.c2b b/make/data/charsetmapping/IBM1142.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1142.c2b rename to make/data/charsetmapping/IBM1142.c2b diff --git a/jdk/make/data/charsetmapping/IBM1142.map b/make/data/charsetmapping/IBM1142.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1142.map rename to make/data/charsetmapping/IBM1142.map diff --git a/jdk/make/data/charsetmapping/IBM1142.nr b/make/data/charsetmapping/IBM1142.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1142.nr rename to make/data/charsetmapping/IBM1142.nr diff --git a/jdk/make/data/charsetmapping/IBM1143.c2b b/make/data/charsetmapping/IBM1143.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1143.c2b rename to make/data/charsetmapping/IBM1143.c2b diff --git a/jdk/make/data/charsetmapping/IBM1143.map b/make/data/charsetmapping/IBM1143.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1143.map rename to make/data/charsetmapping/IBM1143.map diff --git a/jdk/make/data/charsetmapping/IBM1143.nr b/make/data/charsetmapping/IBM1143.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1143.nr rename to make/data/charsetmapping/IBM1143.nr diff --git a/jdk/make/data/charsetmapping/IBM1144.c2b b/make/data/charsetmapping/IBM1144.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1144.c2b rename to make/data/charsetmapping/IBM1144.c2b diff --git a/jdk/make/data/charsetmapping/IBM1144.map b/make/data/charsetmapping/IBM1144.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1144.map rename to make/data/charsetmapping/IBM1144.map diff --git a/jdk/make/data/charsetmapping/IBM1144.nr b/make/data/charsetmapping/IBM1144.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1144.nr rename to make/data/charsetmapping/IBM1144.nr diff --git a/jdk/make/data/charsetmapping/IBM1145.c2b b/make/data/charsetmapping/IBM1145.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1145.c2b rename to make/data/charsetmapping/IBM1145.c2b diff --git a/jdk/make/data/charsetmapping/IBM1145.map b/make/data/charsetmapping/IBM1145.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1145.map rename to make/data/charsetmapping/IBM1145.map diff --git a/jdk/make/data/charsetmapping/IBM1145.nr b/make/data/charsetmapping/IBM1145.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1145.nr rename to make/data/charsetmapping/IBM1145.nr diff --git a/jdk/make/data/charsetmapping/IBM1146.c2b b/make/data/charsetmapping/IBM1146.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1146.c2b rename to make/data/charsetmapping/IBM1146.c2b diff --git a/jdk/make/data/charsetmapping/IBM1146.map b/make/data/charsetmapping/IBM1146.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1146.map rename to make/data/charsetmapping/IBM1146.map diff --git a/jdk/make/data/charsetmapping/IBM1146.nr b/make/data/charsetmapping/IBM1146.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1146.nr rename to make/data/charsetmapping/IBM1146.nr diff --git a/jdk/make/data/charsetmapping/IBM1147.c2b b/make/data/charsetmapping/IBM1147.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1147.c2b rename to make/data/charsetmapping/IBM1147.c2b diff --git a/jdk/make/data/charsetmapping/IBM1147.map b/make/data/charsetmapping/IBM1147.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1147.map rename to make/data/charsetmapping/IBM1147.map diff --git a/jdk/make/data/charsetmapping/IBM1147.nr b/make/data/charsetmapping/IBM1147.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1147.nr rename to make/data/charsetmapping/IBM1147.nr diff --git a/jdk/make/data/charsetmapping/IBM1148.c2b b/make/data/charsetmapping/IBM1148.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1148.c2b rename to make/data/charsetmapping/IBM1148.c2b diff --git a/jdk/make/data/charsetmapping/IBM1148.map b/make/data/charsetmapping/IBM1148.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1148.map rename to make/data/charsetmapping/IBM1148.map diff --git a/jdk/make/data/charsetmapping/IBM1148.nr b/make/data/charsetmapping/IBM1148.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1148.nr rename to make/data/charsetmapping/IBM1148.nr diff --git a/jdk/make/data/charsetmapping/IBM1149.c2b b/make/data/charsetmapping/IBM1149.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1149.c2b rename to make/data/charsetmapping/IBM1149.c2b diff --git a/jdk/make/data/charsetmapping/IBM1149.map b/make/data/charsetmapping/IBM1149.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1149.map rename to make/data/charsetmapping/IBM1149.map diff --git a/jdk/make/data/charsetmapping/IBM1149.nr b/make/data/charsetmapping/IBM1149.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1149.nr rename to make/data/charsetmapping/IBM1149.nr diff --git a/jdk/make/data/charsetmapping/IBM1166.c2b b/make/data/charsetmapping/IBM1166.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1166.c2b rename to make/data/charsetmapping/IBM1166.c2b diff --git a/jdk/make/data/charsetmapping/IBM1166.map b/make/data/charsetmapping/IBM1166.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1166.map rename to make/data/charsetmapping/IBM1166.map diff --git a/jdk/make/data/charsetmapping/IBM1166.nr b/make/data/charsetmapping/IBM1166.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1166.nr rename to make/data/charsetmapping/IBM1166.nr diff --git a/jdk/make/data/charsetmapping/IBM1364.c2b b/make/data/charsetmapping/IBM1364.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1364.c2b rename to make/data/charsetmapping/IBM1364.c2b diff --git a/jdk/make/data/charsetmapping/IBM1364.map b/make/data/charsetmapping/IBM1364.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1364.map rename to make/data/charsetmapping/IBM1364.map diff --git a/jdk/make/data/charsetmapping/IBM1381.c2b b/make/data/charsetmapping/IBM1381.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1381.c2b rename to make/data/charsetmapping/IBM1381.c2b diff --git a/jdk/make/data/charsetmapping/IBM1381.map b/make/data/charsetmapping/IBM1381.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1381.map rename to make/data/charsetmapping/IBM1381.map diff --git a/jdk/make/data/charsetmapping/IBM1383.c2b b/make/data/charsetmapping/IBM1383.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM1383.c2b rename to make/data/charsetmapping/IBM1383.c2b diff --git a/jdk/make/data/charsetmapping/IBM1383.map b/make/data/charsetmapping/IBM1383.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM1383.map rename to make/data/charsetmapping/IBM1383.map diff --git a/jdk/make/data/charsetmapping/IBM1383.nr b/make/data/charsetmapping/IBM1383.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM1383.nr rename to make/data/charsetmapping/IBM1383.nr diff --git a/jdk/make/data/charsetmapping/IBM273.c2b b/make/data/charsetmapping/IBM273.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM273.c2b rename to make/data/charsetmapping/IBM273.c2b diff --git a/jdk/make/data/charsetmapping/IBM273.map b/make/data/charsetmapping/IBM273.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM273.map rename to make/data/charsetmapping/IBM273.map diff --git a/jdk/make/data/charsetmapping/IBM273.nr b/make/data/charsetmapping/IBM273.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM273.nr rename to make/data/charsetmapping/IBM273.nr diff --git a/jdk/make/data/charsetmapping/IBM277.c2b b/make/data/charsetmapping/IBM277.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM277.c2b rename to make/data/charsetmapping/IBM277.c2b diff --git a/jdk/make/data/charsetmapping/IBM277.map b/make/data/charsetmapping/IBM277.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM277.map rename to make/data/charsetmapping/IBM277.map diff --git a/jdk/make/data/charsetmapping/IBM277.nr b/make/data/charsetmapping/IBM277.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM277.nr rename to make/data/charsetmapping/IBM277.nr diff --git a/jdk/make/data/charsetmapping/IBM278.c2b b/make/data/charsetmapping/IBM278.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM278.c2b rename to make/data/charsetmapping/IBM278.c2b diff --git a/jdk/make/data/charsetmapping/IBM278.map b/make/data/charsetmapping/IBM278.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM278.map rename to make/data/charsetmapping/IBM278.map diff --git a/jdk/make/data/charsetmapping/IBM278.nr b/make/data/charsetmapping/IBM278.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM278.nr rename to make/data/charsetmapping/IBM278.nr diff --git a/jdk/make/data/charsetmapping/IBM280.c2b b/make/data/charsetmapping/IBM280.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM280.c2b rename to make/data/charsetmapping/IBM280.c2b diff --git a/jdk/make/data/charsetmapping/IBM280.map b/make/data/charsetmapping/IBM280.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM280.map rename to make/data/charsetmapping/IBM280.map diff --git a/jdk/make/data/charsetmapping/IBM280.nr b/make/data/charsetmapping/IBM280.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM280.nr rename to make/data/charsetmapping/IBM280.nr diff --git a/jdk/make/data/charsetmapping/IBM284.c2b b/make/data/charsetmapping/IBM284.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM284.c2b rename to make/data/charsetmapping/IBM284.c2b diff --git a/jdk/make/data/charsetmapping/IBM284.map b/make/data/charsetmapping/IBM284.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM284.map rename to make/data/charsetmapping/IBM284.map diff --git a/jdk/make/data/charsetmapping/IBM284.nr b/make/data/charsetmapping/IBM284.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM284.nr rename to make/data/charsetmapping/IBM284.nr diff --git a/jdk/make/data/charsetmapping/IBM285.c2b b/make/data/charsetmapping/IBM285.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM285.c2b rename to make/data/charsetmapping/IBM285.c2b diff --git a/jdk/make/data/charsetmapping/IBM285.map b/make/data/charsetmapping/IBM285.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM285.map rename to make/data/charsetmapping/IBM285.map diff --git a/jdk/make/data/charsetmapping/IBM285.nr b/make/data/charsetmapping/IBM285.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM285.nr rename to make/data/charsetmapping/IBM285.nr diff --git a/jdk/make/data/charsetmapping/IBM290.c2b b/make/data/charsetmapping/IBM290.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM290.c2b rename to make/data/charsetmapping/IBM290.c2b diff --git a/jdk/make/data/charsetmapping/IBM290.map b/make/data/charsetmapping/IBM290.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM290.map rename to make/data/charsetmapping/IBM290.map diff --git a/jdk/make/data/charsetmapping/IBM297.c2b b/make/data/charsetmapping/IBM297.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM297.c2b rename to make/data/charsetmapping/IBM297.c2b diff --git a/jdk/make/data/charsetmapping/IBM297.map b/make/data/charsetmapping/IBM297.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM297.map rename to make/data/charsetmapping/IBM297.map diff --git a/jdk/make/data/charsetmapping/IBM297.nr b/make/data/charsetmapping/IBM297.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM297.nr rename to make/data/charsetmapping/IBM297.nr diff --git a/jdk/make/data/charsetmapping/IBM300.c2b b/make/data/charsetmapping/IBM300.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM300.c2b rename to make/data/charsetmapping/IBM300.c2b diff --git a/jdk/make/data/charsetmapping/IBM300.map b/make/data/charsetmapping/IBM300.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM300.map rename to make/data/charsetmapping/IBM300.map diff --git a/jdk/make/data/charsetmapping/IBM420.c2b b/make/data/charsetmapping/IBM420.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM420.c2b rename to make/data/charsetmapping/IBM420.c2b diff --git a/jdk/make/data/charsetmapping/IBM420.map b/make/data/charsetmapping/IBM420.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM420.map rename to make/data/charsetmapping/IBM420.map diff --git a/jdk/make/data/charsetmapping/IBM420.nr b/make/data/charsetmapping/IBM420.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM420.nr rename to make/data/charsetmapping/IBM420.nr diff --git a/jdk/make/data/charsetmapping/IBM424.c2b b/make/data/charsetmapping/IBM424.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM424.c2b rename to make/data/charsetmapping/IBM424.c2b diff --git a/jdk/make/data/charsetmapping/IBM424.map b/make/data/charsetmapping/IBM424.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM424.map rename to make/data/charsetmapping/IBM424.map diff --git a/jdk/make/data/charsetmapping/IBM424.nr b/make/data/charsetmapping/IBM424.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM424.nr rename to make/data/charsetmapping/IBM424.nr diff --git a/jdk/make/data/charsetmapping/IBM437.map b/make/data/charsetmapping/IBM437.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM437.map rename to make/data/charsetmapping/IBM437.map diff --git a/jdk/make/data/charsetmapping/IBM500.c2b b/make/data/charsetmapping/IBM500.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM500.c2b rename to make/data/charsetmapping/IBM500.c2b diff --git a/jdk/make/data/charsetmapping/IBM500.map b/make/data/charsetmapping/IBM500.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM500.map rename to make/data/charsetmapping/IBM500.map diff --git a/jdk/make/data/charsetmapping/IBM500.nr b/make/data/charsetmapping/IBM500.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM500.nr rename to make/data/charsetmapping/IBM500.nr diff --git a/jdk/make/data/charsetmapping/IBM737.map b/make/data/charsetmapping/IBM737.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM737.map rename to make/data/charsetmapping/IBM737.map diff --git a/jdk/make/data/charsetmapping/IBM775.map b/make/data/charsetmapping/IBM775.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM775.map rename to make/data/charsetmapping/IBM775.map diff --git a/jdk/make/data/charsetmapping/IBM833.c2b b/make/data/charsetmapping/IBM833.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM833.c2b rename to make/data/charsetmapping/IBM833.c2b diff --git a/jdk/make/data/charsetmapping/IBM833.map b/make/data/charsetmapping/IBM833.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM833.map rename to make/data/charsetmapping/IBM833.map diff --git a/jdk/make/data/charsetmapping/IBM838.c2b b/make/data/charsetmapping/IBM838.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM838.c2b rename to make/data/charsetmapping/IBM838.c2b diff --git a/jdk/make/data/charsetmapping/IBM838.map b/make/data/charsetmapping/IBM838.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM838.map rename to make/data/charsetmapping/IBM838.map diff --git a/jdk/make/data/charsetmapping/IBM838.nr b/make/data/charsetmapping/IBM838.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM838.nr rename to make/data/charsetmapping/IBM838.nr diff --git a/jdk/make/data/charsetmapping/IBM850.map b/make/data/charsetmapping/IBM850.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM850.map rename to make/data/charsetmapping/IBM850.map diff --git a/jdk/make/data/charsetmapping/IBM852.map b/make/data/charsetmapping/IBM852.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM852.map rename to make/data/charsetmapping/IBM852.map diff --git a/jdk/make/data/charsetmapping/IBM855.map b/make/data/charsetmapping/IBM855.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM855.map rename to make/data/charsetmapping/IBM855.map diff --git a/jdk/make/data/charsetmapping/IBM856.map b/make/data/charsetmapping/IBM856.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM856.map rename to make/data/charsetmapping/IBM856.map diff --git a/jdk/make/data/charsetmapping/IBM857.map b/make/data/charsetmapping/IBM857.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM857.map rename to make/data/charsetmapping/IBM857.map diff --git a/jdk/make/data/charsetmapping/IBM858.map b/make/data/charsetmapping/IBM858.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM858.map rename to make/data/charsetmapping/IBM858.map diff --git a/jdk/make/data/charsetmapping/IBM860.map b/make/data/charsetmapping/IBM860.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM860.map rename to make/data/charsetmapping/IBM860.map diff --git a/jdk/make/data/charsetmapping/IBM861.map b/make/data/charsetmapping/IBM861.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM861.map rename to make/data/charsetmapping/IBM861.map diff --git a/jdk/make/data/charsetmapping/IBM862.map b/make/data/charsetmapping/IBM862.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM862.map rename to make/data/charsetmapping/IBM862.map diff --git a/jdk/make/data/charsetmapping/IBM863.map b/make/data/charsetmapping/IBM863.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM863.map rename to make/data/charsetmapping/IBM863.map diff --git a/jdk/make/data/charsetmapping/IBM864.map b/make/data/charsetmapping/IBM864.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM864.map rename to make/data/charsetmapping/IBM864.map diff --git a/jdk/make/data/charsetmapping/IBM865.map b/make/data/charsetmapping/IBM865.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM865.map rename to make/data/charsetmapping/IBM865.map diff --git a/jdk/make/data/charsetmapping/IBM866.map b/make/data/charsetmapping/IBM866.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM866.map rename to make/data/charsetmapping/IBM866.map diff --git a/jdk/make/data/charsetmapping/IBM868.map b/make/data/charsetmapping/IBM868.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM868.map rename to make/data/charsetmapping/IBM868.map diff --git a/jdk/make/data/charsetmapping/IBM869.map b/make/data/charsetmapping/IBM869.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM869.map rename to make/data/charsetmapping/IBM869.map diff --git a/jdk/make/data/charsetmapping/IBM870.c2b b/make/data/charsetmapping/IBM870.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM870.c2b rename to make/data/charsetmapping/IBM870.c2b diff --git a/jdk/make/data/charsetmapping/IBM870.map b/make/data/charsetmapping/IBM870.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM870.map rename to make/data/charsetmapping/IBM870.map diff --git a/jdk/make/data/charsetmapping/IBM870.nr b/make/data/charsetmapping/IBM870.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM870.nr rename to make/data/charsetmapping/IBM870.nr diff --git a/jdk/make/data/charsetmapping/IBM871.c2b b/make/data/charsetmapping/IBM871.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM871.c2b rename to make/data/charsetmapping/IBM871.c2b diff --git a/jdk/make/data/charsetmapping/IBM871.map b/make/data/charsetmapping/IBM871.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM871.map rename to make/data/charsetmapping/IBM871.map diff --git a/jdk/make/data/charsetmapping/IBM871.nr b/make/data/charsetmapping/IBM871.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM871.nr rename to make/data/charsetmapping/IBM871.nr diff --git a/jdk/make/data/charsetmapping/IBM874.map b/make/data/charsetmapping/IBM874.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM874.map rename to make/data/charsetmapping/IBM874.map diff --git a/jdk/make/data/charsetmapping/IBM874.nr b/make/data/charsetmapping/IBM874.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM874.nr rename to make/data/charsetmapping/IBM874.nr diff --git a/jdk/make/data/charsetmapping/IBM875.c2b b/make/data/charsetmapping/IBM875.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM875.c2b rename to make/data/charsetmapping/IBM875.c2b diff --git a/jdk/make/data/charsetmapping/IBM875.map b/make/data/charsetmapping/IBM875.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM875.map rename to make/data/charsetmapping/IBM875.map diff --git a/jdk/make/data/charsetmapping/IBM875.nr b/make/data/charsetmapping/IBM875.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM875.nr rename to make/data/charsetmapping/IBM875.nr diff --git a/jdk/make/data/charsetmapping/IBM918.c2b b/make/data/charsetmapping/IBM918.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM918.c2b rename to make/data/charsetmapping/IBM918.c2b diff --git a/jdk/make/data/charsetmapping/IBM918.map b/make/data/charsetmapping/IBM918.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM918.map rename to make/data/charsetmapping/IBM918.map diff --git a/jdk/make/data/charsetmapping/IBM918.nr b/make/data/charsetmapping/IBM918.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM918.nr rename to make/data/charsetmapping/IBM918.nr diff --git a/jdk/make/data/charsetmapping/IBM921.map b/make/data/charsetmapping/IBM921.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM921.map rename to make/data/charsetmapping/IBM921.map diff --git a/jdk/make/data/charsetmapping/IBM922.map b/make/data/charsetmapping/IBM922.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM922.map rename to make/data/charsetmapping/IBM922.map diff --git a/jdk/make/data/charsetmapping/IBM930.c2b b/make/data/charsetmapping/IBM930.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM930.c2b rename to make/data/charsetmapping/IBM930.c2b diff --git a/jdk/make/data/charsetmapping/IBM930.map b/make/data/charsetmapping/IBM930.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM930.map rename to make/data/charsetmapping/IBM930.map diff --git a/jdk/make/data/charsetmapping/IBM930.nr b/make/data/charsetmapping/IBM930.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM930.nr rename to make/data/charsetmapping/IBM930.nr diff --git a/jdk/make/data/charsetmapping/IBM933.c2b b/make/data/charsetmapping/IBM933.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM933.c2b rename to make/data/charsetmapping/IBM933.c2b diff --git a/jdk/make/data/charsetmapping/IBM933.map b/make/data/charsetmapping/IBM933.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM933.map rename to make/data/charsetmapping/IBM933.map diff --git a/jdk/make/data/charsetmapping/IBM935.c2b b/make/data/charsetmapping/IBM935.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM935.c2b rename to make/data/charsetmapping/IBM935.c2b diff --git a/jdk/make/data/charsetmapping/IBM935.map b/make/data/charsetmapping/IBM935.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM935.map rename to make/data/charsetmapping/IBM935.map diff --git a/jdk/make/data/charsetmapping/IBM935.nr b/make/data/charsetmapping/IBM935.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM935.nr rename to make/data/charsetmapping/IBM935.nr diff --git a/jdk/make/data/charsetmapping/IBM937.c2b b/make/data/charsetmapping/IBM937.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM937.c2b rename to make/data/charsetmapping/IBM937.c2b diff --git a/jdk/make/data/charsetmapping/IBM937.map b/make/data/charsetmapping/IBM937.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM937.map rename to make/data/charsetmapping/IBM937.map diff --git a/jdk/make/data/charsetmapping/IBM937.nr b/make/data/charsetmapping/IBM937.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM937.nr rename to make/data/charsetmapping/IBM937.nr diff --git a/jdk/make/data/charsetmapping/IBM939.c2b b/make/data/charsetmapping/IBM939.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM939.c2b rename to make/data/charsetmapping/IBM939.c2b diff --git a/jdk/make/data/charsetmapping/IBM939.map b/make/data/charsetmapping/IBM939.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM939.map rename to make/data/charsetmapping/IBM939.map diff --git a/jdk/make/data/charsetmapping/IBM939.nr b/make/data/charsetmapping/IBM939.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM939.nr rename to make/data/charsetmapping/IBM939.nr diff --git a/jdk/make/data/charsetmapping/IBM942.c2b b/make/data/charsetmapping/IBM942.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM942.c2b rename to make/data/charsetmapping/IBM942.c2b diff --git a/jdk/make/data/charsetmapping/IBM942.map b/make/data/charsetmapping/IBM942.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM942.map rename to make/data/charsetmapping/IBM942.map diff --git a/jdk/make/data/charsetmapping/IBM943.map b/make/data/charsetmapping/IBM943.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM943.map rename to make/data/charsetmapping/IBM943.map diff --git a/jdk/make/data/charsetmapping/IBM943.nr b/make/data/charsetmapping/IBM943.nr similarity index 100% rename from jdk/make/data/charsetmapping/IBM943.nr rename to make/data/charsetmapping/IBM943.nr diff --git a/jdk/make/data/charsetmapping/IBM948.c2b b/make/data/charsetmapping/IBM948.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM948.c2b rename to make/data/charsetmapping/IBM948.c2b diff --git a/jdk/make/data/charsetmapping/IBM948.map b/make/data/charsetmapping/IBM948.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM948.map rename to make/data/charsetmapping/IBM948.map diff --git a/jdk/make/data/charsetmapping/IBM949.map b/make/data/charsetmapping/IBM949.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM949.map rename to make/data/charsetmapping/IBM949.map diff --git a/jdk/make/data/charsetmapping/IBM950.c2b b/make/data/charsetmapping/IBM950.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM950.c2b rename to make/data/charsetmapping/IBM950.c2b diff --git a/jdk/make/data/charsetmapping/IBM950.map b/make/data/charsetmapping/IBM950.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM950.map rename to make/data/charsetmapping/IBM950.map diff --git a/jdk/make/data/charsetmapping/IBM970.c2b b/make/data/charsetmapping/IBM970.c2b similarity index 100% rename from jdk/make/data/charsetmapping/IBM970.c2b rename to make/data/charsetmapping/IBM970.c2b diff --git a/jdk/make/data/charsetmapping/IBM970.map b/make/data/charsetmapping/IBM970.map similarity index 100% rename from jdk/make/data/charsetmapping/IBM970.map rename to make/data/charsetmapping/IBM970.map diff --git a/jdk/make/data/charsetmapping/ISO_8859_11.map b/make/data/charsetmapping/ISO_8859_11.map similarity index 100% rename from jdk/make/data/charsetmapping/ISO_8859_11.map rename to make/data/charsetmapping/ISO_8859_11.map diff --git a/jdk/make/data/charsetmapping/ISO_8859_13.map b/make/data/charsetmapping/ISO_8859_13.map similarity index 100% rename from jdk/make/data/charsetmapping/ISO_8859_13.map rename to make/data/charsetmapping/ISO_8859_13.map diff --git a/jdk/make/data/charsetmapping/ISO_8859_15.map b/make/data/charsetmapping/ISO_8859_15.map similarity index 100% rename from jdk/make/data/charsetmapping/ISO_8859_15.map rename to make/data/charsetmapping/ISO_8859_15.map diff --git a/jdk/make/data/charsetmapping/ISO_8859_16.map b/make/data/charsetmapping/ISO_8859_16.map similarity index 100% rename from jdk/make/data/charsetmapping/ISO_8859_16.map rename to make/data/charsetmapping/ISO_8859_16.map diff --git a/jdk/make/data/charsetmapping/ISO_8859_2.map b/make/data/charsetmapping/ISO_8859_2.map similarity index 100% rename from jdk/make/data/charsetmapping/ISO_8859_2.map rename to make/data/charsetmapping/ISO_8859_2.map diff --git a/jdk/make/data/charsetmapping/ISO_8859_3.map b/make/data/charsetmapping/ISO_8859_3.map similarity index 100% rename from jdk/make/data/charsetmapping/ISO_8859_3.map rename to make/data/charsetmapping/ISO_8859_3.map diff --git a/jdk/make/data/charsetmapping/ISO_8859_4.map b/make/data/charsetmapping/ISO_8859_4.map similarity index 100% rename from jdk/make/data/charsetmapping/ISO_8859_4.map rename to make/data/charsetmapping/ISO_8859_4.map diff --git a/jdk/make/data/charsetmapping/ISO_8859_5.map b/make/data/charsetmapping/ISO_8859_5.map similarity index 100% rename from jdk/make/data/charsetmapping/ISO_8859_5.map rename to make/data/charsetmapping/ISO_8859_5.map diff --git a/jdk/make/data/charsetmapping/ISO_8859_6.map b/make/data/charsetmapping/ISO_8859_6.map similarity index 100% rename from jdk/make/data/charsetmapping/ISO_8859_6.map rename to make/data/charsetmapping/ISO_8859_6.map diff --git a/jdk/make/data/charsetmapping/ISO_8859_7.map b/make/data/charsetmapping/ISO_8859_7.map similarity index 100% rename from jdk/make/data/charsetmapping/ISO_8859_7.map rename to make/data/charsetmapping/ISO_8859_7.map diff --git a/jdk/make/data/charsetmapping/ISO_8859_8.map b/make/data/charsetmapping/ISO_8859_8.map similarity index 100% rename from jdk/make/data/charsetmapping/ISO_8859_8.map rename to make/data/charsetmapping/ISO_8859_8.map diff --git a/jdk/make/data/charsetmapping/ISO_8859_9.map b/make/data/charsetmapping/ISO_8859_9.map similarity index 100% rename from jdk/make/data/charsetmapping/ISO_8859_9.map rename to make/data/charsetmapping/ISO_8859_9.map diff --git a/jdk/make/data/charsetmapping/JIS_X_0201.c2b b/make/data/charsetmapping/JIS_X_0201.c2b similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0201.c2b rename to make/data/charsetmapping/JIS_X_0201.c2b diff --git a/jdk/make/data/charsetmapping/JIS_X_0201.map b/make/data/charsetmapping/JIS_X_0201.map similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0201.map rename to make/data/charsetmapping/JIS_X_0201.map diff --git a/jdk/make/data/charsetmapping/JIS_X_0208.map b/make/data/charsetmapping/JIS_X_0208.map similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0208.map rename to make/data/charsetmapping/JIS_X_0208.map diff --git a/jdk/make/data/charsetmapping/JIS_X_0208_MS5022X.c2b b/make/data/charsetmapping/JIS_X_0208_MS5022X.c2b similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0208_MS5022X.c2b rename to make/data/charsetmapping/JIS_X_0208_MS5022X.c2b diff --git a/jdk/make/data/charsetmapping/JIS_X_0208_MS5022X.map b/make/data/charsetmapping/JIS_X_0208_MS5022X.map similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0208_MS5022X.map rename to make/data/charsetmapping/JIS_X_0208_MS5022X.map diff --git a/jdk/make/data/charsetmapping/JIS_X_0208_MS932.c2b b/make/data/charsetmapping/JIS_X_0208_MS932.c2b similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0208_MS932.c2b rename to make/data/charsetmapping/JIS_X_0208_MS932.c2b diff --git a/jdk/make/data/charsetmapping/JIS_X_0208_MS932.map b/make/data/charsetmapping/JIS_X_0208_MS932.map similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0208_MS932.map rename to make/data/charsetmapping/JIS_X_0208_MS932.map diff --git a/jdk/make/data/charsetmapping/JIS_X_0208_MS932.nr b/make/data/charsetmapping/JIS_X_0208_MS932.nr similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0208_MS932.nr rename to make/data/charsetmapping/JIS_X_0208_MS932.nr diff --git a/jdk/make/data/charsetmapping/JIS_X_0208_Solaris.map b/make/data/charsetmapping/JIS_X_0208_Solaris.map similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0208_Solaris.map rename to make/data/charsetmapping/JIS_X_0208_Solaris.map diff --git a/jdk/make/data/charsetmapping/JIS_X_0208_Solaris.nr b/make/data/charsetmapping/JIS_X_0208_Solaris.nr similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0208_Solaris.nr rename to make/data/charsetmapping/JIS_X_0208_Solaris.nr diff --git a/jdk/make/data/charsetmapping/JIS_X_0212.map b/make/data/charsetmapping/JIS_X_0212.map similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0212.map rename to make/data/charsetmapping/JIS_X_0212.map diff --git a/jdk/make/data/charsetmapping/JIS_X_0212_MS5022X.map b/make/data/charsetmapping/JIS_X_0212_MS5022X.map similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0212_MS5022X.map rename to make/data/charsetmapping/JIS_X_0212_MS5022X.map diff --git a/jdk/make/data/charsetmapping/JIS_X_0212_Solaris.map b/make/data/charsetmapping/JIS_X_0212_Solaris.map similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0212_Solaris.map rename to make/data/charsetmapping/JIS_X_0212_Solaris.map diff --git a/jdk/make/data/charsetmapping/JIS_X_0212_Solaris.nr b/make/data/charsetmapping/JIS_X_0212_Solaris.nr similarity index 100% rename from jdk/make/data/charsetmapping/JIS_X_0212_Solaris.nr rename to make/data/charsetmapping/JIS_X_0212_Solaris.nr diff --git a/jdk/make/data/charsetmapping/Johab.map b/make/data/charsetmapping/Johab.map similarity index 100% rename from jdk/make/data/charsetmapping/Johab.map rename to make/data/charsetmapping/Johab.map diff --git a/jdk/make/data/charsetmapping/KOI8_R.map b/make/data/charsetmapping/KOI8_R.map similarity index 100% rename from jdk/make/data/charsetmapping/KOI8_R.map rename to make/data/charsetmapping/KOI8_R.map diff --git a/jdk/make/data/charsetmapping/KOI8_U.map b/make/data/charsetmapping/KOI8_U.map similarity index 100% rename from jdk/make/data/charsetmapping/KOI8_U.map rename to make/data/charsetmapping/KOI8_U.map diff --git a/jdk/make/data/charsetmapping/MS1250.map b/make/data/charsetmapping/MS1250.map similarity index 100% rename from jdk/make/data/charsetmapping/MS1250.map rename to make/data/charsetmapping/MS1250.map diff --git a/jdk/make/data/charsetmapping/MS1251.map b/make/data/charsetmapping/MS1251.map similarity index 100% rename from jdk/make/data/charsetmapping/MS1251.map rename to make/data/charsetmapping/MS1251.map diff --git a/jdk/make/data/charsetmapping/MS1252.map b/make/data/charsetmapping/MS1252.map similarity index 100% rename from jdk/make/data/charsetmapping/MS1252.map rename to make/data/charsetmapping/MS1252.map diff --git a/jdk/make/data/charsetmapping/MS1253.map b/make/data/charsetmapping/MS1253.map similarity index 100% rename from jdk/make/data/charsetmapping/MS1253.map rename to make/data/charsetmapping/MS1253.map diff --git a/jdk/make/data/charsetmapping/MS1254.map b/make/data/charsetmapping/MS1254.map similarity index 100% rename from jdk/make/data/charsetmapping/MS1254.map rename to make/data/charsetmapping/MS1254.map diff --git a/jdk/make/data/charsetmapping/MS1255.map b/make/data/charsetmapping/MS1255.map similarity index 100% rename from jdk/make/data/charsetmapping/MS1255.map rename to make/data/charsetmapping/MS1255.map diff --git a/jdk/make/data/charsetmapping/MS1256.map b/make/data/charsetmapping/MS1256.map similarity index 100% rename from jdk/make/data/charsetmapping/MS1256.map rename to make/data/charsetmapping/MS1256.map diff --git a/jdk/make/data/charsetmapping/MS1257.map b/make/data/charsetmapping/MS1257.map similarity index 100% rename from jdk/make/data/charsetmapping/MS1257.map rename to make/data/charsetmapping/MS1257.map diff --git a/jdk/make/data/charsetmapping/MS1258.map b/make/data/charsetmapping/MS1258.map similarity index 100% rename from jdk/make/data/charsetmapping/MS1258.map rename to make/data/charsetmapping/MS1258.map diff --git a/jdk/make/data/charsetmapping/MS874.map b/make/data/charsetmapping/MS874.map similarity index 100% rename from jdk/make/data/charsetmapping/MS874.map rename to make/data/charsetmapping/MS874.map diff --git a/jdk/make/data/charsetmapping/MS932.c2b b/make/data/charsetmapping/MS932.c2b similarity index 100% rename from jdk/make/data/charsetmapping/MS932.c2b rename to make/data/charsetmapping/MS932.c2b diff --git a/jdk/make/data/charsetmapping/MS932.map b/make/data/charsetmapping/MS932.map similarity index 100% rename from jdk/make/data/charsetmapping/MS932.map rename to make/data/charsetmapping/MS932.map diff --git a/jdk/make/data/charsetmapping/MS932.nr b/make/data/charsetmapping/MS932.nr similarity index 100% rename from jdk/make/data/charsetmapping/MS932.nr rename to make/data/charsetmapping/MS932.nr diff --git a/jdk/make/data/charsetmapping/MS936.map b/make/data/charsetmapping/MS936.map similarity index 100% rename from jdk/make/data/charsetmapping/MS936.map rename to make/data/charsetmapping/MS936.map diff --git a/jdk/make/data/charsetmapping/MS949.map b/make/data/charsetmapping/MS949.map similarity index 100% rename from jdk/make/data/charsetmapping/MS949.map rename to make/data/charsetmapping/MS949.map diff --git a/jdk/make/data/charsetmapping/MS950.map b/make/data/charsetmapping/MS950.map similarity index 100% rename from jdk/make/data/charsetmapping/MS950.map rename to make/data/charsetmapping/MS950.map diff --git a/jdk/make/data/charsetmapping/MS950.nr b/make/data/charsetmapping/MS950.nr similarity index 100% rename from jdk/make/data/charsetmapping/MS950.nr rename to make/data/charsetmapping/MS950.nr diff --git a/jdk/make/data/charsetmapping/MS950_HKSCS_XP.map b/make/data/charsetmapping/MS950_HKSCS_XP.map similarity index 100% rename from jdk/make/data/charsetmapping/MS950_HKSCS_XP.map rename to make/data/charsetmapping/MS950_HKSCS_XP.map diff --git a/jdk/make/data/charsetmapping/MacArabic.map b/make/data/charsetmapping/MacArabic.map similarity index 100% rename from jdk/make/data/charsetmapping/MacArabic.map rename to make/data/charsetmapping/MacArabic.map diff --git a/jdk/make/data/charsetmapping/MacCentralEurope.map b/make/data/charsetmapping/MacCentralEurope.map similarity index 100% rename from jdk/make/data/charsetmapping/MacCentralEurope.map rename to make/data/charsetmapping/MacCentralEurope.map diff --git a/jdk/make/data/charsetmapping/MacCroatian.map b/make/data/charsetmapping/MacCroatian.map similarity index 100% rename from jdk/make/data/charsetmapping/MacCroatian.map rename to make/data/charsetmapping/MacCroatian.map diff --git a/jdk/make/data/charsetmapping/MacCyrillic.map b/make/data/charsetmapping/MacCyrillic.map similarity index 100% rename from jdk/make/data/charsetmapping/MacCyrillic.map rename to make/data/charsetmapping/MacCyrillic.map diff --git a/jdk/make/data/charsetmapping/MacDingbat.map b/make/data/charsetmapping/MacDingbat.map similarity index 100% rename from jdk/make/data/charsetmapping/MacDingbat.map rename to make/data/charsetmapping/MacDingbat.map diff --git a/jdk/make/data/charsetmapping/MacGreek.map b/make/data/charsetmapping/MacGreek.map similarity index 100% rename from jdk/make/data/charsetmapping/MacGreek.map rename to make/data/charsetmapping/MacGreek.map diff --git a/jdk/make/data/charsetmapping/MacHebrew.map b/make/data/charsetmapping/MacHebrew.map similarity index 100% rename from jdk/make/data/charsetmapping/MacHebrew.map rename to make/data/charsetmapping/MacHebrew.map diff --git a/jdk/make/data/charsetmapping/MacIceland.map b/make/data/charsetmapping/MacIceland.map similarity index 100% rename from jdk/make/data/charsetmapping/MacIceland.map rename to make/data/charsetmapping/MacIceland.map diff --git a/jdk/make/data/charsetmapping/MacRoman.map b/make/data/charsetmapping/MacRoman.map similarity index 100% rename from jdk/make/data/charsetmapping/MacRoman.map rename to make/data/charsetmapping/MacRoman.map diff --git a/jdk/make/data/charsetmapping/MacRomania.map b/make/data/charsetmapping/MacRomania.map similarity index 100% rename from jdk/make/data/charsetmapping/MacRomania.map rename to make/data/charsetmapping/MacRomania.map diff --git a/jdk/make/data/charsetmapping/MacSymbol.map b/make/data/charsetmapping/MacSymbol.map similarity index 100% rename from jdk/make/data/charsetmapping/MacSymbol.map rename to make/data/charsetmapping/MacSymbol.map diff --git a/jdk/make/data/charsetmapping/MacThai.map b/make/data/charsetmapping/MacThai.map similarity index 100% rename from jdk/make/data/charsetmapping/MacThai.map rename to make/data/charsetmapping/MacThai.map diff --git a/jdk/make/data/charsetmapping/MacTurkish.map b/make/data/charsetmapping/MacTurkish.map similarity index 100% rename from jdk/make/data/charsetmapping/MacTurkish.map rename to make/data/charsetmapping/MacTurkish.map diff --git a/jdk/make/data/charsetmapping/MacUkraine.map b/make/data/charsetmapping/MacUkraine.map similarity index 100% rename from jdk/make/data/charsetmapping/MacUkraine.map rename to make/data/charsetmapping/MacUkraine.map diff --git a/jdk/make/data/charsetmapping/PCK.c2b b/make/data/charsetmapping/PCK.c2b similarity index 100% rename from jdk/make/data/charsetmapping/PCK.c2b rename to make/data/charsetmapping/PCK.c2b diff --git a/jdk/make/data/charsetmapping/PCK.map b/make/data/charsetmapping/PCK.map similarity index 100% rename from jdk/make/data/charsetmapping/PCK.map rename to make/data/charsetmapping/PCK.map diff --git a/jdk/make/data/charsetmapping/PCK.nr b/make/data/charsetmapping/PCK.nr similarity index 100% rename from jdk/make/data/charsetmapping/PCK.nr rename to make/data/charsetmapping/PCK.nr diff --git a/jdk/make/data/charsetmapping/SJIS.c2b b/make/data/charsetmapping/SJIS.c2b similarity index 100% rename from jdk/make/data/charsetmapping/SJIS.c2b rename to make/data/charsetmapping/SJIS.c2b diff --git a/jdk/make/data/charsetmapping/SJIS.map b/make/data/charsetmapping/SJIS.map similarity index 100% rename from jdk/make/data/charsetmapping/SJIS.map rename to make/data/charsetmapping/SJIS.map diff --git a/jdk/make/data/charsetmapping/SingleByte-X.java.template b/make/data/charsetmapping/SingleByte-X.java.template similarity index 100% rename from jdk/make/data/charsetmapping/SingleByte-X.java.template rename to make/data/charsetmapping/SingleByte-X.java.template diff --git a/jdk/make/data/charsetmapping/TIS_620.map b/make/data/charsetmapping/TIS_620.map similarity index 100% rename from jdk/make/data/charsetmapping/TIS_620.map rename to make/data/charsetmapping/TIS_620.map diff --git a/jdk/make/data/charsetmapping/charsets b/make/data/charsetmapping/charsets similarity index 100% rename from jdk/make/data/charsetmapping/charsets rename to make/data/charsetmapping/charsets diff --git a/jdk/make/data/charsetmapping/list_old b/make/data/charsetmapping/list_old similarity index 100% rename from jdk/make/data/charsetmapping/list_old rename to make/data/charsetmapping/list_old diff --git a/jdk/make/data/charsetmapping/sjis0213.map b/make/data/charsetmapping/sjis0213.map similarity index 100% rename from jdk/make/data/charsetmapping/sjis0213.map rename to make/data/charsetmapping/sjis0213.map diff --git a/jdk/make/data/charsetmapping/stdcs-aix b/make/data/charsetmapping/stdcs-aix similarity index 100% rename from jdk/make/data/charsetmapping/stdcs-aix rename to make/data/charsetmapping/stdcs-aix diff --git a/jdk/make/data/charsetmapping/stdcs-linux b/make/data/charsetmapping/stdcs-linux similarity index 100% rename from jdk/make/data/charsetmapping/stdcs-linux rename to make/data/charsetmapping/stdcs-linux diff --git a/jdk/make/data/charsetmapping/stdcs-solaris b/make/data/charsetmapping/stdcs-solaris similarity index 100% rename from jdk/make/data/charsetmapping/stdcs-solaris rename to make/data/charsetmapping/stdcs-solaris diff --git a/jdk/make/data/charsetmapping/stdcs-windows b/make/data/charsetmapping/stdcs-windows similarity index 100% rename from jdk/make/data/charsetmapping/stdcs-windows rename to make/data/charsetmapping/stdcs-windows diff --git a/jdk/make/data/currency/CurrencyData.properties b/make/data/currency/CurrencyData.properties similarity index 100% rename from jdk/make/data/currency/CurrencyData.properties rename to make/data/currency/CurrencyData.properties diff --git a/jdk/make/data/docs-resources/resources/jdk-default.css b/make/data/docs-resources/resources/jdk-default.css similarity index 100% rename from jdk/make/data/docs-resources/resources/jdk-default.css rename to make/data/docs-resources/resources/jdk-default.css diff --git a/jdk/make/data/dtdbuilder/HTMLlat1.sgml b/make/data/dtdbuilder/HTMLlat1.sgml similarity index 100% rename from jdk/make/data/dtdbuilder/HTMLlat1.sgml rename to make/data/dtdbuilder/HTMLlat1.sgml diff --git a/jdk/make/data/dtdbuilder/HTMLspecial.sgml b/make/data/dtdbuilder/HTMLspecial.sgml similarity index 100% rename from jdk/make/data/dtdbuilder/HTMLspecial.sgml rename to make/data/dtdbuilder/HTMLspecial.sgml diff --git a/jdk/make/data/dtdbuilder/HTMLsymbol.sgml b/make/data/dtdbuilder/HTMLsymbol.sgml similarity index 100% rename from jdk/make/data/dtdbuilder/HTMLsymbol.sgml rename to make/data/dtdbuilder/HTMLsymbol.sgml diff --git a/jdk/make/data/dtdbuilder/html32.dtd b/make/data/dtdbuilder/html32.dtd similarity index 100% rename from jdk/make/data/dtdbuilder/html32.dtd rename to make/data/dtdbuilder/html32.dtd diff --git a/jdk/make/data/dtdbuilder/public.map b/make/data/dtdbuilder/public.map similarity index 100% rename from jdk/make/data/dtdbuilder/public.map rename to make/data/dtdbuilder/public.map diff --git a/jdk/make/data/fontconfig/aix.fontconfig.properties b/make/data/fontconfig/aix.fontconfig.properties similarity index 100% rename from jdk/make/data/fontconfig/aix.fontconfig.properties rename to make/data/fontconfig/aix.fontconfig.properties diff --git a/jdk/make/data/fontconfig/bsd.fontconfig.properties b/make/data/fontconfig/bsd.fontconfig.properties similarity index 100% rename from jdk/make/data/fontconfig/bsd.fontconfig.properties rename to make/data/fontconfig/bsd.fontconfig.properties diff --git a/jdk/make/data/fontconfig/macosx.fontconfig.properties b/make/data/fontconfig/macosx.fontconfig.properties similarity index 100% rename from jdk/make/data/fontconfig/macosx.fontconfig.properties rename to make/data/fontconfig/macosx.fontconfig.properties diff --git a/jdk/make/data/fontconfig/solaris.fontconfig.properties b/make/data/fontconfig/solaris.fontconfig.properties similarity index 100% rename from jdk/make/data/fontconfig/solaris.fontconfig.properties rename to make/data/fontconfig/solaris.fontconfig.properties diff --git a/jdk/make/data/fontconfig/windows.fontconfig.properties b/make/data/fontconfig/windows.fontconfig.properties similarity index 100% rename from jdk/make/data/fontconfig/windows.fontconfig.properties rename to make/data/fontconfig/windows.fontconfig.properties diff --git a/jdk/make/data/jdwp/jdwp.spec b/make/data/jdwp/jdwp.spec similarity index 100% rename from jdk/make/data/jdwp/jdwp.spec rename to make/data/jdwp/jdwp.spec diff --git a/jdk/make/data/lsrdata/language-subtag-registry.txt b/make/data/lsrdata/language-subtag-registry.txt similarity index 100% rename from jdk/make/data/lsrdata/language-subtag-registry.txt rename to make/data/lsrdata/language-subtag-registry.txt diff --git a/jdk/make/data/macosxicons/JavaApp.icns b/make/data/macosxicons/JavaApp.icns similarity index 100% rename from jdk/make/data/macosxicons/JavaApp.icns rename to make/data/macosxicons/JavaApp.icns diff --git a/jdk/make/data/mainmanifest/manifest.mf b/make/data/mainmanifest/manifest.mf similarity index 100% rename from jdk/make/data/mainmanifest/manifest.mf rename to make/data/mainmanifest/manifest.mf diff --git a/langtools/make/data/symbols/README b/make/data/symbols/README similarity index 100% rename from langtools/make/data/symbols/README rename to make/data/symbols/README diff --git a/langtools/make/data/symbols/include.list b/make/data/symbols/include.list similarity index 100% rename from langtools/make/data/symbols/include.list rename to make/data/symbols/include.list diff --git a/langtools/make/data/symbols/java.activation-6.sym.txt b/make/data/symbols/java.activation-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.activation-6.sym.txt rename to make/data/symbols/java.activation-6.sym.txt diff --git a/langtools/make/data/symbols/java.activation-7.sym.txt b/make/data/symbols/java.activation-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.activation-7.sym.txt rename to make/data/symbols/java.activation-7.sym.txt diff --git a/langtools/make/data/symbols/java.activation-8.sym.txt b/make/data/symbols/java.activation-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.activation-8.sym.txt rename to make/data/symbols/java.activation-8.sym.txt diff --git a/langtools/make/data/symbols/java.annotations.common-6.sym.txt b/make/data/symbols/java.annotations.common-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.annotations.common-6.sym.txt rename to make/data/symbols/java.annotations.common-6.sym.txt diff --git a/langtools/make/data/symbols/java.annotations.common-7.sym.txt b/make/data/symbols/java.annotations.common-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.annotations.common-7.sym.txt rename to make/data/symbols/java.annotations.common-7.sym.txt diff --git a/langtools/make/data/symbols/java.annotations.common-8.sym.txt b/make/data/symbols/java.annotations.common-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.annotations.common-8.sym.txt rename to make/data/symbols/java.annotations.common-8.sym.txt diff --git a/langtools/make/data/symbols/java.base-6.sym.txt b/make/data/symbols/java.base-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.base-6.sym.txt rename to make/data/symbols/java.base-6.sym.txt diff --git a/langtools/make/data/symbols/java.base-7.sym.txt b/make/data/symbols/java.base-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.base-7.sym.txt rename to make/data/symbols/java.base-7.sym.txt diff --git a/langtools/make/data/symbols/java.base-8.sym.txt b/make/data/symbols/java.base-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.base-8.sym.txt rename to make/data/symbols/java.base-8.sym.txt diff --git a/langtools/make/data/symbols/java.compiler-6.sym.txt b/make/data/symbols/java.compiler-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.compiler-6.sym.txt rename to make/data/symbols/java.compiler-6.sym.txt diff --git a/langtools/make/data/symbols/java.compiler-7.sym.txt b/make/data/symbols/java.compiler-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.compiler-7.sym.txt rename to make/data/symbols/java.compiler-7.sym.txt diff --git a/langtools/make/data/symbols/java.compiler-8.sym.txt b/make/data/symbols/java.compiler-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.compiler-8.sym.txt rename to make/data/symbols/java.compiler-8.sym.txt diff --git a/langtools/make/data/symbols/java.corba-6.sym.txt b/make/data/symbols/java.corba-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.corba-6.sym.txt rename to make/data/symbols/java.corba-6.sym.txt diff --git a/langtools/make/data/symbols/java.corba-7.sym.txt b/make/data/symbols/java.corba-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.corba-7.sym.txt rename to make/data/symbols/java.corba-7.sym.txt diff --git a/langtools/make/data/symbols/java.corba-8.sym.txt b/make/data/symbols/java.corba-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.corba-8.sym.txt rename to make/data/symbols/java.corba-8.sym.txt diff --git a/langtools/make/data/symbols/java.datatransfer-6.sym.txt b/make/data/symbols/java.datatransfer-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.datatransfer-6.sym.txt rename to make/data/symbols/java.datatransfer-6.sym.txt diff --git a/langtools/make/data/symbols/java.datatransfer-7.sym.txt b/make/data/symbols/java.datatransfer-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.datatransfer-7.sym.txt rename to make/data/symbols/java.datatransfer-7.sym.txt diff --git a/langtools/make/data/symbols/java.datatransfer-8.sym.txt b/make/data/symbols/java.datatransfer-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.datatransfer-8.sym.txt rename to make/data/symbols/java.datatransfer-8.sym.txt diff --git a/langtools/make/data/symbols/java.desktop-6.sym.txt b/make/data/symbols/java.desktop-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.desktop-6.sym.txt rename to make/data/symbols/java.desktop-6.sym.txt diff --git a/langtools/make/data/symbols/java.desktop-7.sym.txt b/make/data/symbols/java.desktop-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.desktop-7.sym.txt rename to make/data/symbols/java.desktop-7.sym.txt diff --git a/langtools/make/data/symbols/java.desktop-8.sym.txt b/make/data/symbols/java.desktop-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.desktop-8.sym.txt rename to make/data/symbols/java.desktop-8.sym.txt diff --git a/langtools/make/data/symbols/java.instrument-6.sym.txt b/make/data/symbols/java.instrument-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.instrument-6.sym.txt rename to make/data/symbols/java.instrument-6.sym.txt diff --git a/langtools/make/data/symbols/java.instrument-7.sym.txt b/make/data/symbols/java.instrument-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.instrument-7.sym.txt rename to make/data/symbols/java.instrument-7.sym.txt diff --git a/langtools/make/data/symbols/java.instrument-8.sym.txt b/make/data/symbols/java.instrument-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.instrument-8.sym.txt rename to make/data/symbols/java.instrument-8.sym.txt diff --git a/langtools/make/data/symbols/java.logging-6.sym.txt b/make/data/symbols/java.logging-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.logging-6.sym.txt rename to make/data/symbols/java.logging-6.sym.txt diff --git a/langtools/make/data/symbols/java.logging-7.sym.txt b/make/data/symbols/java.logging-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.logging-7.sym.txt rename to make/data/symbols/java.logging-7.sym.txt diff --git a/langtools/make/data/symbols/java.logging-8.sym.txt b/make/data/symbols/java.logging-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.logging-8.sym.txt rename to make/data/symbols/java.logging-8.sym.txt diff --git a/langtools/make/data/symbols/java.management-6.sym.txt b/make/data/symbols/java.management-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.management-6.sym.txt rename to make/data/symbols/java.management-6.sym.txt diff --git a/langtools/make/data/symbols/java.management-7.sym.txt b/make/data/symbols/java.management-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.management-7.sym.txt rename to make/data/symbols/java.management-7.sym.txt diff --git a/langtools/make/data/symbols/java.management-8.sym.txt b/make/data/symbols/java.management-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.management-8.sym.txt rename to make/data/symbols/java.management-8.sym.txt diff --git a/langtools/make/data/symbols/java.naming-6.sym.txt b/make/data/symbols/java.naming-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.naming-6.sym.txt rename to make/data/symbols/java.naming-6.sym.txt diff --git a/langtools/make/data/symbols/java.naming-7.sym.txt b/make/data/symbols/java.naming-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.naming-7.sym.txt rename to make/data/symbols/java.naming-7.sym.txt diff --git a/langtools/make/data/symbols/java.naming-8.sym.txt b/make/data/symbols/java.naming-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.naming-8.sym.txt rename to make/data/symbols/java.naming-8.sym.txt diff --git a/langtools/make/data/symbols/java.prefs-6.sym.txt b/make/data/symbols/java.prefs-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.prefs-6.sym.txt rename to make/data/symbols/java.prefs-6.sym.txt diff --git a/langtools/make/data/symbols/java.prefs-7.sym.txt b/make/data/symbols/java.prefs-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.prefs-7.sym.txt rename to make/data/symbols/java.prefs-7.sym.txt diff --git a/langtools/make/data/symbols/java.prefs-8.sym.txt b/make/data/symbols/java.prefs-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.prefs-8.sym.txt rename to make/data/symbols/java.prefs-8.sym.txt diff --git a/langtools/make/data/symbols/java.rmi-6.sym.txt b/make/data/symbols/java.rmi-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.rmi-6.sym.txt rename to make/data/symbols/java.rmi-6.sym.txt diff --git a/langtools/make/data/symbols/java.rmi-7.sym.txt b/make/data/symbols/java.rmi-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.rmi-7.sym.txt rename to make/data/symbols/java.rmi-7.sym.txt diff --git a/langtools/make/data/symbols/java.rmi-8.sym.txt b/make/data/symbols/java.rmi-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.rmi-8.sym.txt rename to make/data/symbols/java.rmi-8.sym.txt diff --git a/langtools/make/data/symbols/java.scripting-6.sym.txt b/make/data/symbols/java.scripting-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.scripting-6.sym.txt rename to make/data/symbols/java.scripting-6.sym.txt diff --git a/langtools/make/data/symbols/java.scripting-7.sym.txt b/make/data/symbols/java.scripting-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.scripting-7.sym.txt rename to make/data/symbols/java.scripting-7.sym.txt diff --git a/langtools/make/data/symbols/java.scripting-8.sym.txt b/make/data/symbols/java.scripting-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.scripting-8.sym.txt rename to make/data/symbols/java.scripting-8.sym.txt diff --git a/langtools/make/data/symbols/java.security.jgss-6.sym.txt b/make/data/symbols/java.security.jgss-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.security.jgss-6.sym.txt rename to make/data/symbols/java.security.jgss-6.sym.txt diff --git a/langtools/make/data/symbols/java.security.jgss-7.sym.txt b/make/data/symbols/java.security.jgss-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.security.jgss-7.sym.txt rename to make/data/symbols/java.security.jgss-7.sym.txt diff --git a/langtools/make/data/symbols/java.security.jgss-8.sym.txt b/make/data/symbols/java.security.jgss-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.security.jgss-8.sym.txt rename to make/data/symbols/java.security.jgss-8.sym.txt diff --git a/langtools/make/data/symbols/java.security.sasl-6.sym.txt b/make/data/symbols/java.security.sasl-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.security.sasl-6.sym.txt rename to make/data/symbols/java.security.sasl-6.sym.txt diff --git a/langtools/make/data/symbols/java.security.sasl-7.sym.txt b/make/data/symbols/java.security.sasl-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.security.sasl-7.sym.txt rename to make/data/symbols/java.security.sasl-7.sym.txt diff --git a/langtools/make/data/symbols/java.security.sasl-8.sym.txt b/make/data/symbols/java.security.sasl-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.security.sasl-8.sym.txt rename to make/data/symbols/java.security.sasl-8.sym.txt diff --git a/langtools/make/data/symbols/java.sql-6.sym.txt b/make/data/symbols/java.sql-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.sql-6.sym.txt rename to make/data/symbols/java.sql-6.sym.txt diff --git a/langtools/make/data/symbols/java.sql-7.sym.txt b/make/data/symbols/java.sql-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.sql-7.sym.txt rename to make/data/symbols/java.sql-7.sym.txt diff --git a/langtools/make/data/symbols/java.sql-8.sym.txt b/make/data/symbols/java.sql-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.sql-8.sym.txt rename to make/data/symbols/java.sql-8.sym.txt diff --git a/langtools/make/data/symbols/java.sql.rowset-6.sym.txt b/make/data/symbols/java.sql.rowset-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.sql.rowset-6.sym.txt rename to make/data/symbols/java.sql.rowset-6.sym.txt diff --git a/langtools/make/data/symbols/java.sql.rowset-7.sym.txt b/make/data/symbols/java.sql.rowset-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.sql.rowset-7.sym.txt rename to make/data/symbols/java.sql.rowset-7.sym.txt diff --git a/langtools/make/data/symbols/java.sql.rowset-8.sym.txt b/make/data/symbols/java.sql.rowset-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.sql.rowset-8.sym.txt rename to make/data/symbols/java.sql.rowset-8.sym.txt diff --git a/langtools/make/data/symbols/java.transaction-6.sym.txt b/make/data/symbols/java.transaction-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.transaction-6.sym.txt rename to make/data/symbols/java.transaction-6.sym.txt diff --git a/langtools/make/data/symbols/java.transaction-7.sym.txt b/make/data/symbols/java.transaction-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.transaction-7.sym.txt rename to make/data/symbols/java.transaction-7.sym.txt diff --git a/langtools/make/data/symbols/java.transaction-8.sym.txt b/make/data/symbols/java.transaction-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.transaction-8.sym.txt rename to make/data/symbols/java.transaction-8.sym.txt diff --git a/langtools/make/data/symbols/java.xml-6.sym.txt b/make/data/symbols/java.xml-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.xml-6.sym.txt rename to make/data/symbols/java.xml-6.sym.txt diff --git a/langtools/make/data/symbols/java.xml-7.sym.txt b/make/data/symbols/java.xml-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.xml-7.sym.txt rename to make/data/symbols/java.xml-7.sym.txt diff --git a/langtools/make/data/symbols/java.xml-8.sym.txt b/make/data/symbols/java.xml-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.xml-8.sym.txt rename to make/data/symbols/java.xml-8.sym.txt diff --git a/langtools/make/data/symbols/java.xml.bind-6.sym.txt b/make/data/symbols/java.xml.bind-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.xml.bind-6.sym.txt rename to make/data/symbols/java.xml.bind-6.sym.txt diff --git a/langtools/make/data/symbols/java.xml.bind-7.sym.txt b/make/data/symbols/java.xml.bind-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.xml.bind-7.sym.txt rename to make/data/symbols/java.xml.bind-7.sym.txt diff --git a/langtools/make/data/symbols/java.xml.bind-8.sym.txt b/make/data/symbols/java.xml.bind-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.xml.bind-8.sym.txt rename to make/data/symbols/java.xml.bind-8.sym.txt diff --git a/langtools/make/data/symbols/java.xml.crypto-6.sym.txt b/make/data/symbols/java.xml.crypto-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.xml.crypto-6.sym.txt rename to make/data/symbols/java.xml.crypto-6.sym.txt diff --git a/langtools/make/data/symbols/java.xml.crypto-7.sym.txt b/make/data/symbols/java.xml.crypto-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.xml.crypto-7.sym.txt rename to make/data/symbols/java.xml.crypto-7.sym.txt diff --git a/langtools/make/data/symbols/java.xml.crypto-8.sym.txt b/make/data/symbols/java.xml.crypto-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.xml.crypto-8.sym.txt rename to make/data/symbols/java.xml.crypto-8.sym.txt diff --git a/langtools/make/data/symbols/java.xml.ws-6.sym.txt b/make/data/symbols/java.xml.ws-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.xml.ws-6.sym.txt rename to make/data/symbols/java.xml.ws-6.sym.txt diff --git a/langtools/make/data/symbols/java.xml.ws-7.sym.txt b/make/data/symbols/java.xml.ws-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.xml.ws-7.sym.txt rename to make/data/symbols/java.xml.ws-7.sym.txt diff --git a/langtools/make/data/symbols/java.xml.ws-8.sym.txt b/make/data/symbols/java.xml.ws-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/java.xml.ws-8.sym.txt rename to make/data/symbols/java.xml.ws-8.sym.txt diff --git a/langtools/make/data/symbols/jdk.httpserver-6.sym.txt b/make/data/symbols/jdk.httpserver-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.httpserver-6.sym.txt rename to make/data/symbols/jdk.httpserver-6.sym.txt diff --git a/langtools/make/data/symbols/jdk.httpserver-7.sym.txt b/make/data/symbols/jdk.httpserver-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.httpserver-7.sym.txt rename to make/data/symbols/jdk.httpserver-7.sym.txt diff --git a/langtools/make/data/symbols/jdk.httpserver-8.sym.txt b/make/data/symbols/jdk.httpserver-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.httpserver-8.sym.txt rename to make/data/symbols/jdk.httpserver-8.sym.txt diff --git a/langtools/make/data/symbols/jdk.management-6.sym.txt b/make/data/symbols/jdk.management-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.management-6.sym.txt rename to make/data/symbols/jdk.management-6.sym.txt diff --git a/langtools/make/data/symbols/jdk.management-7.sym.txt b/make/data/symbols/jdk.management-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.management-7.sym.txt rename to make/data/symbols/jdk.management-7.sym.txt diff --git a/langtools/make/data/symbols/jdk.management-8.sym.txt b/make/data/symbols/jdk.management-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.management-8.sym.txt rename to make/data/symbols/jdk.management-8.sym.txt diff --git a/langtools/make/data/symbols/jdk.scripting.nashorn-6.sym.txt b/make/data/symbols/jdk.scripting.nashorn-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.scripting.nashorn-6.sym.txt rename to make/data/symbols/jdk.scripting.nashorn-6.sym.txt diff --git a/langtools/make/data/symbols/jdk.scripting.nashorn-7.sym.txt b/make/data/symbols/jdk.scripting.nashorn-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.scripting.nashorn-7.sym.txt rename to make/data/symbols/jdk.scripting.nashorn-7.sym.txt diff --git a/langtools/make/data/symbols/jdk.scripting.nashorn-8.sym.txt b/make/data/symbols/jdk.scripting.nashorn-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.scripting.nashorn-8.sym.txt rename to make/data/symbols/jdk.scripting.nashorn-8.sym.txt diff --git a/langtools/make/data/symbols/jdk.sctp-6.sym.txt b/make/data/symbols/jdk.sctp-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.sctp-6.sym.txt rename to make/data/symbols/jdk.sctp-6.sym.txt diff --git a/langtools/make/data/symbols/jdk.sctp-7.sym.txt b/make/data/symbols/jdk.sctp-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.sctp-7.sym.txt rename to make/data/symbols/jdk.sctp-7.sym.txt diff --git a/langtools/make/data/symbols/jdk.sctp-8.sym.txt b/make/data/symbols/jdk.sctp-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.sctp-8.sym.txt rename to make/data/symbols/jdk.sctp-8.sym.txt diff --git a/langtools/make/data/symbols/jdk.security.auth-6.sym.txt b/make/data/symbols/jdk.security.auth-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.security.auth-6.sym.txt rename to make/data/symbols/jdk.security.auth-6.sym.txt diff --git a/langtools/make/data/symbols/jdk.security.auth-7.sym.txt b/make/data/symbols/jdk.security.auth-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.security.auth-7.sym.txt rename to make/data/symbols/jdk.security.auth-7.sym.txt diff --git a/langtools/make/data/symbols/jdk.security.auth-8.sym.txt b/make/data/symbols/jdk.security.auth-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.security.auth-8.sym.txt rename to make/data/symbols/jdk.security.auth-8.sym.txt diff --git a/langtools/make/data/symbols/jdk.security.jgss-6.sym.txt b/make/data/symbols/jdk.security.jgss-6.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.security.jgss-6.sym.txt rename to make/data/symbols/jdk.security.jgss-6.sym.txt diff --git a/langtools/make/data/symbols/jdk.security.jgss-7.sym.txt b/make/data/symbols/jdk.security.jgss-7.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.security.jgss-7.sym.txt rename to make/data/symbols/jdk.security.jgss-7.sym.txt diff --git a/langtools/make/data/symbols/jdk.security.jgss-8.sym.txt b/make/data/symbols/jdk.security.jgss-8.sym.txt similarity index 100% rename from langtools/make/data/symbols/jdk.security.jgss-8.sym.txt rename to make/data/symbols/jdk.security.jgss-8.sym.txt diff --git a/langtools/make/data/symbols/symbols b/make/data/symbols/symbols similarity index 100% rename from langtools/make/data/symbols/symbols rename to make/data/symbols/symbols diff --git a/jdk/make/data/tzdata/VERSION b/make/data/tzdata/VERSION similarity index 100% rename from jdk/make/data/tzdata/VERSION rename to make/data/tzdata/VERSION diff --git a/jdk/make/data/tzdata/africa b/make/data/tzdata/africa similarity index 100% rename from jdk/make/data/tzdata/africa rename to make/data/tzdata/africa diff --git a/jdk/make/data/tzdata/antarctica b/make/data/tzdata/antarctica similarity index 100% rename from jdk/make/data/tzdata/antarctica rename to make/data/tzdata/antarctica diff --git a/jdk/make/data/tzdata/asia b/make/data/tzdata/asia similarity index 100% rename from jdk/make/data/tzdata/asia rename to make/data/tzdata/asia diff --git a/jdk/make/data/tzdata/australasia b/make/data/tzdata/australasia similarity index 100% rename from jdk/make/data/tzdata/australasia rename to make/data/tzdata/australasia diff --git a/jdk/make/data/tzdata/backward b/make/data/tzdata/backward similarity index 100% rename from jdk/make/data/tzdata/backward rename to make/data/tzdata/backward diff --git a/jdk/make/data/tzdata/etcetera b/make/data/tzdata/etcetera similarity index 100% rename from jdk/make/data/tzdata/etcetera rename to make/data/tzdata/etcetera diff --git a/jdk/make/data/tzdata/europe b/make/data/tzdata/europe similarity index 100% rename from jdk/make/data/tzdata/europe rename to make/data/tzdata/europe diff --git a/jdk/make/data/tzdata/factory b/make/data/tzdata/factory similarity index 100% rename from jdk/make/data/tzdata/factory rename to make/data/tzdata/factory diff --git a/jdk/make/data/tzdata/gmt b/make/data/tzdata/gmt similarity index 100% rename from jdk/make/data/tzdata/gmt rename to make/data/tzdata/gmt diff --git a/jdk/make/data/tzdata/iso3166.tab b/make/data/tzdata/iso3166.tab similarity index 100% rename from jdk/make/data/tzdata/iso3166.tab rename to make/data/tzdata/iso3166.tab diff --git a/jdk/make/data/tzdata/jdk11_backward b/make/data/tzdata/jdk11_backward similarity index 100% rename from jdk/make/data/tzdata/jdk11_backward rename to make/data/tzdata/jdk11_backward diff --git a/jdk/make/data/tzdata/leapseconds b/make/data/tzdata/leapseconds similarity index 100% rename from jdk/make/data/tzdata/leapseconds rename to make/data/tzdata/leapseconds diff --git a/jdk/make/data/tzdata/northamerica b/make/data/tzdata/northamerica similarity index 100% rename from jdk/make/data/tzdata/northamerica rename to make/data/tzdata/northamerica diff --git a/jdk/make/data/tzdata/pacificnew b/make/data/tzdata/pacificnew similarity index 100% rename from jdk/make/data/tzdata/pacificnew rename to make/data/tzdata/pacificnew diff --git a/jdk/make/data/tzdata/solar87 b/make/data/tzdata/solar87 similarity index 100% rename from jdk/make/data/tzdata/solar87 rename to make/data/tzdata/solar87 diff --git a/jdk/make/data/tzdata/solar88 b/make/data/tzdata/solar88 similarity index 100% rename from jdk/make/data/tzdata/solar88 rename to make/data/tzdata/solar88 diff --git a/jdk/make/data/tzdata/solar89 b/make/data/tzdata/solar89 similarity index 100% rename from jdk/make/data/tzdata/solar89 rename to make/data/tzdata/solar89 diff --git a/jdk/make/data/tzdata/southamerica b/make/data/tzdata/southamerica similarity index 100% rename from jdk/make/data/tzdata/southamerica rename to make/data/tzdata/southamerica diff --git a/jdk/make/data/tzdata/systemv b/make/data/tzdata/systemv similarity index 100% rename from jdk/make/data/tzdata/systemv rename to make/data/tzdata/systemv diff --git a/jdk/make/data/tzdata/zone.tab b/make/data/tzdata/zone.tab similarity index 100% rename from jdk/make/data/tzdata/zone.tab rename to make/data/tzdata/zone.tab diff --git a/jdk/make/data/unicodedata/PropList.txt b/make/data/unicodedata/PropList.txt similarity index 100% rename from jdk/make/data/unicodedata/PropList.txt rename to make/data/unicodedata/PropList.txt diff --git a/jdk/make/data/unicodedata/Scripts.txt b/make/data/unicodedata/Scripts.txt similarity index 100% rename from jdk/make/data/unicodedata/Scripts.txt rename to make/data/unicodedata/Scripts.txt diff --git a/jdk/make/data/unicodedata/SpecialCasing.txt b/make/data/unicodedata/SpecialCasing.txt similarity index 100% rename from jdk/make/data/unicodedata/SpecialCasing.txt rename to make/data/unicodedata/SpecialCasing.txt diff --git a/jdk/make/data/unicodedata/UnicodeData.txt b/make/data/unicodedata/UnicodeData.txt similarity index 100% rename from jdk/make/data/unicodedata/UnicodeData.txt rename to make/data/unicodedata/UnicodeData.txt diff --git a/jdk/make/data/unicodedata/VERSION b/make/data/unicodedata/VERSION similarity index 100% rename from jdk/make/data/unicodedata/VERSION rename to make/data/unicodedata/VERSION diff --git a/jdk/make/data/x11wrappergen/functions.txt b/make/data/x11wrappergen/functions.txt similarity index 100% rename from jdk/make/data/x11wrappergen/functions.txt rename to make/data/x11wrappergen/functions.txt diff --git a/jdk/make/data/x11wrappergen/sizes.32 b/make/data/x11wrappergen/sizes.32 similarity index 100% rename from jdk/make/data/x11wrappergen/sizes.32 rename to make/data/x11wrappergen/sizes.32 diff --git a/jdk/make/data/x11wrappergen/sizes.64 b/make/data/x11wrappergen/sizes.64 similarity index 100% rename from jdk/make/data/x11wrappergen/sizes.64 rename to make/data/x11wrappergen/sizes.64 diff --git a/jdk/make/data/x11wrappergen/sizes.64-solaris-i386 b/make/data/x11wrappergen/sizes.64-solaris-i386 similarity index 100% rename from jdk/make/data/x11wrappergen/sizes.64-solaris-i386 rename to make/data/x11wrappergen/sizes.64-solaris-i386 diff --git a/jdk/make/data/x11wrappergen/xlibtypes.txt b/make/data/x11wrappergen/xlibtypes.txt similarity index 100% rename from jdk/make/data/x11wrappergen/xlibtypes.txt rename to make/data/x11wrappergen/xlibtypes.txt diff --git a/jdk/make/gendata/Gendata-java.base.gmk b/make/gendata/Gendata-java.base.gmk similarity index 100% rename from jdk/make/gendata/Gendata-java.base.gmk rename to make/gendata/Gendata-java.base.gmk diff --git a/jdk/make/gendata/Gendata-java.desktop.gmk b/make/gendata/Gendata-java.desktop.gmk similarity index 100% rename from jdk/make/gendata/Gendata-java.desktop.gmk rename to make/gendata/Gendata-java.desktop.gmk diff --git a/langtools/make/gendata/Gendata-jdk.compiler.gmk b/make/gendata/Gendata-jdk.compiler.gmk similarity index 100% rename from langtools/make/gendata/Gendata-jdk.compiler.gmk rename to make/gendata/Gendata-jdk.compiler.gmk diff --git a/jdk/make/gendata/GendataBlacklistedCerts.gmk b/make/gendata/GendataBlacklistedCerts.gmk similarity index 100% rename from jdk/make/gendata/GendataBlacklistedCerts.gmk rename to make/gendata/GendataBlacklistedCerts.gmk diff --git a/jdk/make/gendata/GendataBreakIterator.gmk b/make/gendata/GendataBreakIterator.gmk similarity index 100% rename from jdk/make/gendata/GendataBreakIterator.gmk rename to make/gendata/GendataBreakIterator.gmk diff --git a/jdk/make/gendata/GendataCommon.gmk b/make/gendata/GendataCommon.gmk similarity index 100% rename from jdk/make/gendata/GendataCommon.gmk rename to make/gendata/GendataCommon.gmk diff --git a/jdk/make/gendata/GendataCryptoPolicy.gmk b/make/gendata/GendataCryptoPolicy.gmk similarity index 100% rename from jdk/make/gendata/GendataCryptoPolicy.gmk rename to make/gendata/GendataCryptoPolicy.gmk diff --git a/jdk/make/gendata/GendataFontConfig.gmk b/make/gendata/GendataFontConfig.gmk similarity index 100% rename from jdk/make/gendata/GendataFontConfig.gmk rename to make/gendata/GendataFontConfig.gmk diff --git a/jdk/make/gendata/GendataHtml32dtd.gmk b/make/gendata/GendataHtml32dtd.gmk similarity index 100% rename from jdk/make/gendata/GendataHtml32dtd.gmk rename to make/gendata/GendataHtml32dtd.gmk diff --git a/jdk/make/gendata/GendataTZDB.gmk b/make/gendata/GendataTZDB.gmk similarity index 100% rename from jdk/make/gendata/GendataTZDB.gmk rename to make/gendata/GendataTZDB.gmk diff --git a/jdk/make/gensrc/Gensrc-java.base.gmk b/make/gensrc/Gensrc-java.base.gmk similarity index 100% rename from jdk/make/gensrc/Gensrc-java.base.gmk rename to make/gensrc/Gensrc-java.base.gmk diff --git a/corba/make/gensrc/Gensrc-java.corba.gmk b/make/gensrc/Gensrc-java.corba.gmk similarity index 100% rename from corba/make/gensrc/Gensrc-java.corba.gmk rename to make/gensrc/Gensrc-java.corba.gmk diff --git a/jdk/make/gensrc/Gensrc-java.desktop.gmk b/make/gensrc/Gensrc-java.desktop.gmk similarity index 100% rename from jdk/make/gensrc/Gensrc-java.desktop.gmk rename to make/gensrc/Gensrc-java.desktop.gmk diff --git a/jdk/make/gensrc/Gensrc-java.logging.gmk b/make/gensrc/Gensrc-java.logging.gmk similarity index 100% rename from jdk/make/gensrc/Gensrc-java.logging.gmk rename to make/gensrc/Gensrc-java.logging.gmk diff --git a/jdk/make/gensrc/Gensrc-jdk.charsets.gmk b/make/gensrc/Gensrc-jdk.charsets.gmk similarity index 100% rename from jdk/make/gensrc/Gensrc-jdk.charsets.gmk rename to make/gensrc/Gensrc-jdk.charsets.gmk diff --git a/langtools/make/gensrc/Gensrc-jdk.compiler.gmk b/make/gensrc/Gensrc-jdk.compiler.gmk similarity index 100% rename from langtools/make/gensrc/Gensrc-jdk.compiler.gmk rename to make/gensrc/Gensrc-jdk.compiler.gmk diff --git a/hotspot/make/gensrc/Gensrc-jdk.hotspot.agent.gmk b/make/gensrc/Gensrc-jdk.hotspot.agent.gmk similarity index 100% rename from hotspot/make/gensrc/Gensrc-jdk.hotspot.agent.gmk rename to make/gensrc/Gensrc-jdk.hotspot.agent.gmk diff --git a/hotspot/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk b/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk similarity index 100% rename from hotspot/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk rename to make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk diff --git a/jdk/make/gensrc/Gensrc-jdk.jartool.gmk b/make/gensrc/Gensrc-jdk.jartool.gmk similarity index 100% rename from jdk/make/gensrc/Gensrc-jdk.jartool.gmk rename to make/gensrc/Gensrc-jdk.jartool.gmk diff --git a/langtools/make/gensrc/Gensrc-jdk.javadoc.gmk b/make/gensrc/Gensrc-jdk.javadoc.gmk similarity index 100% rename from langtools/make/gensrc/Gensrc-jdk.javadoc.gmk rename to make/gensrc/Gensrc-jdk.javadoc.gmk diff --git a/langtools/make/gensrc/Gensrc-jdk.jdeps.gmk b/make/gensrc/Gensrc-jdk.jdeps.gmk similarity index 100% rename from langtools/make/gensrc/Gensrc-jdk.jdeps.gmk rename to make/gensrc/Gensrc-jdk.jdeps.gmk diff --git a/jdk/make/gensrc/Gensrc-jdk.jdi.gmk b/make/gensrc/Gensrc-jdk.jdi.gmk similarity index 100% rename from jdk/make/gensrc/Gensrc-jdk.jdi.gmk rename to make/gensrc/Gensrc-jdk.jdi.gmk diff --git a/jdk/make/gensrc/Gensrc-jdk.jlink.gmk b/make/gensrc/Gensrc-jdk.jlink.gmk similarity index 100% rename from jdk/make/gensrc/Gensrc-jdk.jlink.gmk rename to make/gensrc/Gensrc-jdk.jlink.gmk diff --git a/langtools/make/gensrc/Gensrc-jdk.jshell.gmk b/make/gensrc/Gensrc-jdk.jshell.gmk similarity index 100% rename from langtools/make/gensrc/Gensrc-jdk.jshell.gmk rename to make/gensrc/Gensrc-jdk.jshell.gmk diff --git a/jdk/make/gensrc/Gensrc-jdk.localedata.gmk b/make/gensrc/Gensrc-jdk.localedata.gmk similarity index 100% rename from jdk/make/gensrc/Gensrc-jdk.localedata.gmk rename to make/gensrc/Gensrc-jdk.localedata.gmk diff --git a/jdk/make/gensrc/Gensrc-jdk.management.agent.gmk b/make/gensrc/Gensrc-jdk.management.agent.gmk similarity index 100% rename from jdk/make/gensrc/Gensrc-jdk.management.agent.gmk rename to make/gensrc/Gensrc-jdk.management.agent.gmk diff --git a/jdk/make/gensrc/GensrcBuffer.gmk b/make/gensrc/GensrcBuffer.gmk similarity index 100% rename from jdk/make/gensrc/GensrcBuffer.gmk rename to make/gensrc/GensrcBuffer.gmk diff --git a/jdk/make/gensrc/GensrcCLDR.gmk b/make/gensrc/GensrcCLDR.gmk similarity index 100% rename from jdk/make/gensrc/GensrcCLDR.gmk rename to make/gensrc/GensrcCLDR.gmk diff --git a/jdk/make/gensrc/GensrcCharacterData.gmk b/make/gensrc/GensrcCharacterData.gmk similarity index 100% rename from jdk/make/gensrc/GensrcCharacterData.gmk rename to make/gensrc/GensrcCharacterData.gmk diff --git a/jdk/make/gensrc/GensrcCharsetCoder.gmk b/make/gensrc/GensrcCharsetCoder.gmk similarity index 100% rename from jdk/make/gensrc/GensrcCharsetCoder.gmk rename to make/gensrc/GensrcCharsetCoder.gmk diff --git a/jdk/make/gensrc/GensrcCharsetMapping.gmk b/make/gensrc/GensrcCharsetMapping.gmk similarity index 100% rename from jdk/make/gensrc/GensrcCharsetMapping.gmk rename to make/gensrc/GensrcCharsetMapping.gmk diff --git a/jdk/make/gensrc/GensrcCommon.gmk b/make/gensrc/GensrcCommonJdk.gmk similarity index 100% rename from jdk/make/gensrc/GensrcCommon.gmk rename to make/gensrc/GensrcCommonJdk.gmk diff --git a/langtools/make/gensrc/GensrcCommon.gmk b/make/gensrc/GensrcCommonLangtools.gmk similarity index 100% rename from langtools/make/gensrc/GensrcCommon.gmk rename to make/gensrc/GensrcCommonLangtools.gmk diff --git a/jdk/make/gensrc/GensrcExceptions.gmk b/make/gensrc/GensrcExceptions.gmk similarity index 100% rename from jdk/make/gensrc/GensrcExceptions.gmk rename to make/gensrc/GensrcExceptions.gmk diff --git a/jdk/make/gensrc/GensrcIcons.gmk b/make/gensrc/GensrcIcons.gmk similarity index 100% rename from jdk/make/gensrc/GensrcIcons.gmk rename to make/gensrc/GensrcIcons.gmk diff --git a/jdk/make/gensrc/GensrcLocaleData.gmk b/make/gensrc/GensrcLocaleData.gmk similarity index 100% rename from jdk/make/gensrc/GensrcLocaleData.gmk rename to make/gensrc/GensrcLocaleData.gmk diff --git a/jdk/make/gensrc/GensrcMisc.gmk b/make/gensrc/GensrcMisc.gmk similarity index 100% rename from jdk/make/gensrc/GensrcMisc.gmk rename to make/gensrc/GensrcMisc.gmk diff --git a/jdk/make/gensrc/GensrcModuleLoaderMap.gmk b/make/gensrc/GensrcModuleLoaderMap.gmk similarity index 100% rename from jdk/make/gensrc/GensrcModuleLoaderMap.gmk rename to make/gensrc/GensrcModuleLoaderMap.gmk diff --git a/jdk/make/gensrc/GensrcProperties.gmk b/make/gensrc/GensrcProperties.gmk similarity index 100% rename from jdk/make/gensrc/GensrcProperties.gmk rename to make/gensrc/GensrcProperties.gmk diff --git a/jdk/make/gensrc/GensrcSwing.gmk b/make/gensrc/GensrcSwing.gmk similarity index 100% rename from jdk/make/gensrc/GensrcSwing.gmk rename to make/gensrc/GensrcSwing.gmk diff --git a/jdk/make/gensrc/GensrcVarHandles.gmk b/make/gensrc/GensrcVarHandles.gmk similarity index 100% rename from jdk/make/gensrc/GensrcVarHandles.gmk rename to make/gensrc/GensrcVarHandles.gmk diff --git a/jdk/make/gensrc/GensrcX11Wrappers.gmk b/make/gensrc/GensrcX11Wrappers.gmk similarity index 100% rename from jdk/make/gensrc/GensrcX11Wrappers.gmk rename to make/gensrc/GensrcX11Wrappers.gmk diff --git a/hotspot/make/CopyToExplodedJdk.gmk b/make/hotspot/CopyToExplodedJdk.gmk similarity index 100% rename from hotspot/make/CopyToExplodedJdk.gmk rename to make/hotspot/CopyToExplodedJdk.gmk diff --git a/hotspot/make/HotspotCommon.gmk b/make/hotspot/HotspotCommon.gmk similarity index 100% rename from hotspot/make/HotspotCommon.gmk rename to make/hotspot/HotspotCommon.gmk diff --git a/hotspot/make/copy/Copy-java.base.gmk b/make/hotspot/copy/Copy-java.base.gmk similarity index 100% rename from hotspot/make/copy/Copy-java.base.gmk rename to make/hotspot/copy/Copy-java.base.gmk diff --git a/hotspot/make/gensrc/GenerateSources.gmk b/make/hotspot/gensrc/GenerateSources.gmk similarity index 100% rename from hotspot/make/gensrc/GenerateSources.gmk rename to make/hotspot/gensrc/GenerateSources.gmk diff --git a/hotspot/make/gensrc/GensrcAdlc.gmk b/make/hotspot/gensrc/GensrcAdlc.gmk similarity index 100% rename from hotspot/make/gensrc/GensrcAdlc.gmk rename to make/hotspot/gensrc/GensrcAdlc.gmk diff --git a/hotspot/make/gensrc/GensrcDtrace.gmk b/make/hotspot/gensrc/GensrcDtrace.gmk similarity index 100% rename from hotspot/make/gensrc/GensrcDtrace.gmk rename to make/hotspot/gensrc/GensrcDtrace.gmk diff --git a/hotspot/make/gensrc/GensrcJvmti.gmk b/make/hotspot/gensrc/GensrcJvmti.gmk similarity index 100% rename from hotspot/make/gensrc/GensrcJvmti.gmk rename to make/hotspot/gensrc/GensrcJvmti.gmk diff --git a/hotspot/make/hotspot.script b/make/hotspot/hotspot.script similarity index 100% rename from hotspot/make/hotspot.script rename to make/hotspot/hotspot.script diff --git a/hotspot/make/ide/CreateVSProject.gmk b/make/hotspot/ide/CreateVSProject.gmk similarity index 100% rename from hotspot/make/ide/CreateVSProject.gmk rename to make/hotspot/ide/CreateVSProject.gmk diff --git a/hotspot/make/lib/CompileDtracePostJvm.gmk b/make/hotspot/lib/CompileDtracePostJvm.gmk similarity index 100% rename from hotspot/make/lib/CompileDtracePostJvm.gmk rename to make/hotspot/lib/CompileDtracePostJvm.gmk diff --git a/hotspot/make/lib/CompileDtracePreJvm.gmk b/make/hotspot/lib/CompileDtracePreJvm.gmk similarity index 100% rename from hotspot/make/lib/CompileDtracePreJvm.gmk rename to make/hotspot/lib/CompileDtracePreJvm.gmk diff --git a/hotspot/make/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk similarity index 100% rename from hotspot/make/lib/CompileGtest.gmk rename to make/hotspot/lib/CompileGtest.gmk diff --git a/hotspot/make/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk similarity index 100% rename from hotspot/make/lib/CompileJvm.gmk rename to make/hotspot/lib/CompileJvm.gmk diff --git a/hotspot/make/lib/CompileLibjsig.gmk b/make/hotspot/lib/CompileLibjsig.gmk similarity index 100% rename from hotspot/make/lib/CompileLibjsig.gmk rename to make/hotspot/lib/CompileLibjsig.gmk diff --git a/hotspot/make/lib/CompileLibraries.gmk b/make/hotspot/lib/CompileLibraries.gmk similarity index 100% rename from hotspot/make/lib/CompileLibraries.gmk rename to make/hotspot/lib/CompileLibraries.gmk diff --git a/hotspot/make/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk similarity index 100% rename from hotspot/make/lib/JvmFeatures.gmk rename to make/hotspot/lib/JvmFeatures.gmk diff --git a/hotspot/make/lib/JvmMapfile.gmk b/make/hotspot/lib/JvmMapfile.gmk similarity index 100% rename from hotspot/make/lib/JvmMapfile.gmk rename to make/hotspot/lib/JvmMapfile.gmk diff --git a/hotspot/make/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk similarity index 100% rename from hotspot/make/lib/JvmOverrideFiles.gmk rename to make/hotspot/lib/JvmOverrideFiles.gmk diff --git a/hotspot/make/src/classes/build/tools/projectcreator/ArgsParser.java b/make/hotspot/src/classes/build/tools/projectcreator/ArgsParser.java similarity index 100% rename from hotspot/make/src/classes/build/tools/projectcreator/ArgsParser.java rename to make/hotspot/src/classes/build/tools/projectcreator/ArgsParser.java diff --git a/hotspot/make/src/classes/build/tools/projectcreator/BuildConfig.java b/make/hotspot/src/classes/build/tools/projectcreator/BuildConfig.java similarity index 100% rename from hotspot/make/src/classes/build/tools/projectcreator/BuildConfig.java rename to make/hotspot/src/classes/build/tools/projectcreator/BuildConfig.java diff --git a/hotspot/make/src/classes/build/tools/projectcreator/FileTreeCreator.java b/make/hotspot/src/classes/build/tools/projectcreator/FileTreeCreator.java similarity index 100% rename from hotspot/make/src/classes/build/tools/projectcreator/FileTreeCreator.java rename to make/hotspot/src/classes/build/tools/projectcreator/FileTreeCreator.java diff --git a/hotspot/make/src/classes/build/tools/projectcreator/FileTreeCreatorVC10.java b/make/hotspot/src/classes/build/tools/projectcreator/FileTreeCreatorVC10.java similarity index 100% rename from hotspot/make/src/classes/build/tools/projectcreator/FileTreeCreatorVC10.java rename to make/hotspot/src/classes/build/tools/projectcreator/FileTreeCreatorVC10.java diff --git a/hotspot/make/src/classes/build/tools/projectcreator/ProjectCreator.java b/make/hotspot/src/classes/build/tools/projectcreator/ProjectCreator.java similarity index 100% rename from hotspot/make/src/classes/build/tools/projectcreator/ProjectCreator.java rename to make/hotspot/src/classes/build/tools/projectcreator/ProjectCreator.java diff --git a/hotspot/make/src/classes/build/tools/projectcreator/Util.java b/make/hotspot/src/classes/build/tools/projectcreator/Util.java similarity index 100% rename from hotspot/make/src/classes/build/tools/projectcreator/Util.java rename to make/hotspot/src/classes/build/tools/projectcreator/Util.java diff --git a/hotspot/make/src/classes/build/tools/projectcreator/WinGammaPlatform.java b/make/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatform.java similarity index 100% rename from hotspot/make/src/classes/build/tools/projectcreator/WinGammaPlatform.java rename to make/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatform.java diff --git a/hotspot/make/src/classes/build/tools/projectcreator/WinGammaPlatformVC10.java b/make/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatformVC10.java similarity index 100% rename from hotspot/make/src/classes/build/tools/projectcreator/WinGammaPlatformVC10.java rename to make/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatformVC10.java diff --git a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp b/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp similarity index 100% rename from hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp rename to make/hotspot/src/native/dtrace/generateJvmOffsets.cpp diff --git a/hotspot/src/os/bsd/dtrace/generateJvmOffsets.h b/make/hotspot/src/native/dtrace/generateJvmOffsets.h similarity index 100% rename from hotspot/src/os/bsd/dtrace/generateJvmOffsets.h rename to make/hotspot/src/native/dtrace/generateJvmOffsets.h diff --git a/hotspot/src/os/bsd/dtrace/generateJvmOffsetsMain.c b/make/hotspot/src/native/dtrace/generateJvmOffsetsMain.c similarity index 100% rename from hotspot/src/os/bsd/dtrace/generateJvmOffsetsMain.c rename to make/hotspot/src/native/dtrace/generateJvmOffsetsMain.c diff --git a/hotspot/make/symbols/symbols-aix b/make/hotspot/symbols/symbols-aix similarity index 100% rename from hotspot/make/symbols/symbols-aix rename to make/hotspot/symbols/symbols-aix diff --git a/hotspot/make/symbols/symbols-aix-debug b/make/hotspot/symbols/symbols-aix-debug similarity index 100% rename from hotspot/make/symbols/symbols-aix-debug rename to make/hotspot/symbols/symbols-aix-debug diff --git a/hotspot/make/symbols/symbols-linux b/make/hotspot/symbols/symbols-linux similarity index 100% rename from hotspot/make/symbols/symbols-linux rename to make/hotspot/symbols/symbols-linux diff --git a/hotspot/make/symbols/symbols-macosx b/make/hotspot/symbols/symbols-macosx similarity index 100% rename from hotspot/make/symbols/symbols-macosx rename to make/hotspot/symbols/symbols-macosx diff --git a/hotspot/make/symbols/symbols-shared b/make/hotspot/symbols/symbols-shared similarity index 100% rename from hotspot/make/symbols/symbols-shared rename to make/hotspot/symbols/symbols-shared diff --git a/hotspot/make/symbols/symbols-solaris b/make/hotspot/symbols/symbols-solaris similarity index 100% rename from hotspot/make/symbols/symbols-solaris rename to make/hotspot/symbols/symbols-solaris diff --git a/hotspot/make/symbols/symbols-solaris-dtrace-compiler1 b/make/hotspot/symbols/symbols-solaris-dtrace-compiler1 similarity index 100% rename from hotspot/make/symbols/symbols-solaris-dtrace-compiler1 rename to make/hotspot/symbols/symbols-solaris-dtrace-compiler1 diff --git a/hotspot/make/symbols/symbols-solaris-dtrace-compiler2 b/make/hotspot/symbols/symbols-solaris-dtrace-compiler2 similarity index 100% rename from hotspot/make/symbols/symbols-solaris-dtrace-compiler2 rename to make/hotspot/symbols/symbols-solaris-dtrace-compiler2 diff --git a/hotspot/make/symbols/symbols-unix b/make/hotspot/symbols/symbols-unix similarity index 100% rename from hotspot/make/symbols/symbols-unix rename to make/hotspot/symbols/symbols-unix diff --git a/hotspot/make/test/GtestImage.gmk b/make/hotspot/test/GtestImage.gmk similarity index 100% rename from hotspot/make/test/GtestImage.gmk rename to make/hotspot/test/GtestImage.gmk diff --git a/jdk/make/netbeans/README b/make/jdk/netbeans/README similarity index 100% rename from jdk/make/netbeans/README rename to make/jdk/netbeans/README diff --git a/jdk/make/netbeans/awt2d/README b/make/jdk/netbeans/awt2d/README similarity index 100% rename from jdk/make/netbeans/awt2d/README rename to make/jdk/netbeans/awt2d/README diff --git a/jdk/make/netbeans/awt2d/build.properties b/make/jdk/netbeans/awt2d/build.properties similarity index 100% rename from jdk/make/netbeans/awt2d/build.properties rename to make/jdk/netbeans/awt2d/build.properties diff --git a/jdk/make/netbeans/awt2d/build.xml b/make/jdk/netbeans/awt2d/build.xml similarity index 100% rename from jdk/make/netbeans/awt2d/build.xml rename to make/jdk/netbeans/awt2d/build.xml diff --git a/jdk/make/netbeans/awt2d/nbproject/project.xml b/make/jdk/netbeans/awt2d/nbproject/project.xml similarity index 100% rename from jdk/make/netbeans/awt2d/nbproject/project.xml rename to make/jdk/netbeans/awt2d/nbproject/project.xml diff --git a/jdk/make/netbeans/client_sanity/README b/make/jdk/netbeans/client_sanity/README similarity index 100% rename from jdk/make/netbeans/client_sanity/README rename to make/jdk/netbeans/client_sanity/README diff --git a/jdk/make/netbeans/client_sanity/build.xml b/make/jdk/netbeans/client_sanity/build.xml similarity index 100% rename from jdk/make/netbeans/client_sanity/build.xml rename to make/jdk/netbeans/client_sanity/build.xml diff --git a/jdk/make/netbeans/client_sanity/manifest.mf b/make/jdk/netbeans/client_sanity/manifest.mf similarity index 100% rename from jdk/make/netbeans/client_sanity/manifest.mf rename to make/jdk/netbeans/client_sanity/manifest.mf diff --git a/jdk/make/netbeans/client_sanity/nbproject/build-impl.xml b/make/jdk/netbeans/client_sanity/nbproject/build-impl.xml similarity index 100% rename from jdk/make/netbeans/client_sanity/nbproject/build-impl.xml rename to make/jdk/netbeans/client_sanity/nbproject/build-impl.xml diff --git a/jdk/make/netbeans/client_sanity/nbproject/genfiles.properties b/make/jdk/netbeans/client_sanity/nbproject/genfiles.properties similarity index 100% rename from jdk/make/netbeans/client_sanity/nbproject/genfiles.properties rename to make/jdk/netbeans/client_sanity/nbproject/genfiles.properties diff --git a/jdk/make/netbeans/client_sanity/nbproject/project.properties b/make/jdk/netbeans/client_sanity/nbproject/project.properties similarity index 100% rename from jdk/make/netbeans/client_sanity/nbproject/project.properties rename to make/jdk/netbeans/client_sanity/nbproject/project.properties diff --git a/jdk/make/netbeans/client_sanity/nbproject/project.xml b/make/jdk/netbeans/client_sanity/nbproject/project.xml similarity index 100% rename from jdk/make/netbeans/client_sanity/nbproject/project.xml rename to make/jdk/netbeans/client_sanity/nbproject/project.xml diff --git a/jdk/make/netbeans/common/README-ent b/make/jdk/netbeans/common/README-ent similarity index 100% rename from jdk/make/netbeans/common/README-ent rename to make/jdk/netbeans/common/README-ent diff --git a/jdk/make/netbeans/common/architectures/README b/make/jdk/netbeans/common/architectures/README similarity index 100% rename from jdk/make/netbeans/common/architectures/README rename to make/jdk/netbeans/common/architectures/README diff --git a/jdk/make/netbeans/common/architectures/arch-amd64.properties b/make/jdk/netbeans/common/architectures/arch-amd64.properties similarity index 100% rename from jdk/make/netbeans/common/architectures/arch-amd64.properties rename to make/jdk/netbeans/common/architectures/arch-amd64.properties diff --git a/jdk/make/netbeans/common/architectures/arch-i386.properties b/make/jdk/netbeans/common/architectures/arch-i386.properties similarity index 100% rename from jdk/make/netbeans/common/architectures/arch-i386.properties rename to make/jdk/netbeans/common/architectures/arch-i386.properties diff --git a/jdk/make/netbeans/common/architectures/arch-sparc.properties b/make/jdk/netbeans/common/architectures/arch-sparc.properties similarity index 100% rename from jdk/make/netbeans/common/architectures/arch-sparc.properties rename to make/jdk/netbeans/common/architectures/arch-sparc.properties diff --git a/jdk/make/netbeans/common/architectures/arch-x86.properties b/make/jdk/netbeans/common/architectures/arch-x86.properties similarity index 100% rename from jdk/make/netbeans/common/architectures/arch-x86.properties rename to make/jdk/netbeans/common/architectures/arch-x86.properties diff --git a/jdk/make/netbeans/common/architectures/arch-x86_64.properties b/make/jdk/netbeans/common/architectures/arch-x86_64.properties similarity index 100% rename from jdk/make/netbeans/common/architectures/arch-x86_64.properties rename to make/jdk/netbeans/common/architectures/arch-x86_64.properties diff --git a/jdk/make/netbeans/common/architectures/name-Bsd.properties b/make/jdk/netbeans/common/architectures/name-Bsd.properties similarity index 100% rename from jdk/make/netbeans/common/architectures/name-Bsd.properties rename to make/jdk/netbeans/common/architectures/name-Bsd.properties diff --git a/jdk/make/netbeans/common/architectures/name-Linux.properties b/make/jdk/netbeans/common/architectures/name-Linux.properties similarity index 100% rename from jdk/make/netbeans/common/architectures/name-Linux.properties rename to make/jdk/netbeans/common/architectures/name-Linux.properties diff --git a/jdk/make/netbeans/common/architectures/name-Macosx.properties b/make/jdk/netbeans/common/architectures/name-Macosx.properties similarity index 100% rename from jdk/make/netbeans/common/architectures/name-Macosx.properties rename to make/jdk/netbeans/common/architectures/name-Macosx.properties diff --git a/jdk/make/netbeans/common/architectures/name-SunOS.properties b/make/jdk/netbeans/common/architectures/name-SunOS.properties similarity index 100% rename from jdk/make/netbeans/common/architectures/name-SunOS.properties rename to make/jdk/netbeans/common/architectures/name-SunOS.properties diff --git a/jdk/make/netbeans/common/build-folder.ent b/make/jdk/netbeans/common/build-folder.ent similarity index 100% rename from jdk/make/netbeans/common/build-folder.ent rename to make/jdk/netbeans/common/build-folder.ent diff --git a/jdk/make/netbeans/common/closed-share-sources.ent b/make/jdk/netbeans/common/closed-share-sources.ent similarity index 100% rename from jdk/make/netbeans/common/closed-share-sources.ent rename to make/jdk/netbeans/common/closed-share-sources.ent diff --git a/jdk/make/netbeans/common/closed-share-view.ent b/make/jdk/netbeans/common/closed-share-view.ent similarity index 100% rename from jdk/make/netbeans/common/closed-share-view.ent rename to make/jdk/netbeans/common/closed-share-view.ent diff --git a/jdk/make/netbeans/common/demo-sources.ent b/make/jdk/netbeans/common/demo-sources.ent similarity index 100% rename from jdk/make/netbeans/common/demo-sources.ent rename to make/jdk/netbeans/common/demo-sources.ent diff --git a/jdk/make/netbeans/common/demo-view.ent b/make/jdk/netbeans/common/demo-view.ent similarity index 100% rename from jdk/make/netbeans/common/demo-view.ent rename to make/jdk/netbeans/common/demo-view.ent diff --git a/jdk/make/netbeans/common/file-view.ent b/make/jdk/netbeans/common/file-view.ent similarity index 100% rename from jdk/make/netbeans/common/file-view.ent rename to make/jdk/netbeans/common/file-view.ent diff --git a/jdk/make/netbeans/common/java-data-native.ent b/make/jdk/netbeans/common/java-data-native.ent similarity index 100% rename from jdk/make/netbeans/common/java-data-native.ent rename to make/jdk/netbeans/common/java-data-native.ent diff --git a/jdk/make/netbeans/common/java-data-no-native.ent b/make/jdk/netbeans/common/java-data-no-native.ent similarity index 100% rename from jdk/make/netbeans/common/java-data-no-native.ent rename to make/jdk/netbeans/common/java-data-no-native.ent diff --git a/jdk/make/netbeans/common/jtreg-sources.ent b/make/jdk/netbeans/common/jtreg-sources.ent similarity index 100% rename from jdk/make/netbeans/common/jtreg-sources.ent rename to make/jdk/netbeans/common/jtreg-sources.ent diff --git a/jdk/make/netbeans/common/jtreg-view.ent b/make/jdk/netbeans/common/jtreg-view.ent similarity index 100% rename from jdk/make/netbeans/common/jtreg-view.ent rename to make/jdk/netbeans/common/jtreg-view.ent diff --git a/jdk/make/netbeans/common/macosx-sources.ent b/make/jdk/netbeans/common/macosx-sources.ent similarity index 100% rename from jdk/make/netbeans/common/macosx-sources.ent rename to make/jdk/netbeans/common/macosx-sources.ent diff --git a/jdk/make/netbeans/common/macosx-view.ent b/make/jdk/netbeans/common/macosx-view.ent similarity index 100% rename from jdk/make/netbeans/common/macosx-view.ent rename to make/jdk/netbeans/common/macosx-view.ent diff --git a/jdk/make/netbeans/common/make.xml b/make/jdk/netbeans/common/make.xml similarity index 100% rename from jdk/make/netbeans/common/make.xml rename to make/jdk/netbeans/common/make.xml diff --git a/jdk/make/netbeans/common/properties.ent b/make/jdk/netbeans/common/properties.ent similarity index 100% rename from jdk/make/netbeans/common/properties.ent rename to make/jdk/netbeans/common/properties.ent diff --git a/jdk/make/netbeans/common/sample-sources.ent b/make/jdk/netbeans/common/sample-sources.ent similarity index 100% rename from jdk/make/netbeans/common/sample-sources.ent rename to make/jdk/netbeans/common/sample-sources.ent diff --git a/jdk/make/netbeans/common/sample-view.ent b/make/jdk/netbeans/common/sample-view.ent similarity index 100% rename from jdk/make/netbeans/common/sample-view.ent rename to make/jdk/netbeans/common/sample-view.ent diff --git a/jdk/make/netbeans/common/share-sources.ent b/make/jdk/netbeans/common/share-sources.ent similarity index 100% rename from jdk/make/netbeans/common/share-sources.ent rename to make/jdk/netbeans/common/share-sources.ent diff --git a/jdk/make/netbeans/common/share-view.ent b/make/jdk/netbeans/common/share-view.ent similarity index 100% rename from jdk/make/netbeans/common/share-view.ent rename to make/jdk/netbeans/common/share-view.ent diff --git a/jdk/make/netbeans/common/shared.xml b/make/jdk/netbeans/common/shared.xml similarity index 100% rename from jdk/make/netbeans/common/shared.xml rename to make/jdk/netbeans/common/shared.xml diff --git a/jdk/make/netbeans/common/standard-actions.ent b/make/jdk/netbeans/common/standard-actions.ent similarity index 100% rename from jdk/make/netbeans/common/standard-actions.ent rename to make/jdk/netbeans/common/standard-actions.ent diff --git a/jdk/make/netbeans/common/standard-bindings.ent b/make/jdk/netbeans/common/standard-bindings.ent similarity index 100% rename from jdk/make/netbeans/common/standard-bindings.ent rename to make/jdk/netbeans/common/standard-bindings.ent diff --git a/jdk/make/netbeans/common/unix-sources.ent b/make/jdk/netbeans/common/unix-sources.ent similarity index 100% rename from jdk/make/netbeans/common/unix-sources.ent rename to make/jdk/netbeans/common/unix-sources.ent diff --git a/jdk/make/netbeans/common/unix-view.ent b/make/jdk/netbeans/common/unix-view.ent similarity index 100% rename from jdk/make/netbeans/common/unix-view.ent rename to make/jdk/netbeans/common/unix-view.ent diff --git a/jdk/make/netbeans/common/windows-sources.ent b/make/jdk/netbeans/common/windows-sources.ent similarity index 100% rename from jdk/make/netbeans/common/windows-sources.ent rename to make/jdk/netbeans/common/windows-sources.ent diff --git a/jdk/make/netbeans/common/windows-view.ent b/make/jdk/netbeans/common/windows-view.ent similarity index 100% rename from jdk/make/netbeans/common/windows-view.ent rename to make/jdk/netbeans/common/windows-view.ent diff --git a/jdk/make/netbeans/j2se/README b/make/jdk/netbeans/j2se/README similarity index 100% rename from jdk/make/netbeans/j2se/README rename to make/jdk/netbeans/j2se/README diff --git a/jdk/make/netbeans/j2se/build.properties b/make/jdk/netbeans/j2se/build.properties similarity index 100% rename from jdk/make/netbeans/j2se/build.properties rename to make/jdk/netbeans/j2se/build.properties diff --git a/jdk/make/netbeans/j2se/build.xml b/make/jdk/netbeans/j2se/build.xml similarity index 100% rename from jdk/make/netbeans/j2se/build.xml rename to make/jdk/netbeans/j2se/build.xml diff --git a/jdk/make/netbeans/j2se/nbproject/project.xml b/make/jdk/netbeans/j2se/nbproject/project.xml similarity index 100% rename from jdk/make/netbeans/j2se/nbproject/project.xml rename to make/jdk/netbeans/j2se/nbproject/project.xml diff --git a/jdk/make/netbeans/jarzip/README b/make/jdk/netbeans/jarzip/README similarity index 100% rename from jdk/make/netbeans/jarzip/README rename to make/jdk/netbeans/jarzip/README diff --git a/jdk/make/netbeans/jarzip/build.properties b/make/jdk/netbeans/jarzip/build.properties similarity index 100% rename from jdk/make/netbeans/jarzip/build.properties rename to make/jdk/netbeans/jarzip/build.properties diff --git a/jdk/make/netbeans/jarzip/build.xml b/make/jdk/netbeans/jarzip/build.xml similarity index 100% rename from jdk/make/netbeans/jarzip/build.xml rename to make/jdk/netbeans/jarzip/build.xml diff --git a/jdk/make/netbeans/jarzip/nbproject/project.xml b/make/jdk/netbeans/jarzip/nbproject/project.xml similarity index 100% rename from jdk/make/netbeans/jarzip/nbproject/project.xml rename to make/jdk/netbeans/jarzip/nbproject/project.xml diff --git a/jdk/make/netbeans/jconsole/README b/make/jdk/netbeans/jconsole/README similarity index 100% rename from jdk/make/netbeans/jconsole/README rename to make/jdk/netbeans/jconsole/README diff --git a/jdk/make/netbeans/jconsole/build.properties b/make/jdk/netbeans/jconsole/build.properties similarity index 100% rename from jdk/make/netbeans/jconsole/build.properties rename to make/jdk/netbeans/jconsole/build.properties diff --git a/jdk/make/netbeans/jconsole/build.xml b/make/jdk/netbeans/jconsole/build.xml similarity index 100% rename from jdk/make/netbeans/jconsole/build.xml rename to make/jdk/netbeans/jconsole/build.xml diff --git a/jdk/make/netbeans/jconsole/nbproject/project.xml b/make/jdk/netbeans/jconsole/nbproject/project.xml similarity index 100% rename from jdk/make/netbeans/jconsole/nbproject/project.xml rename to make/jdk/netbeans/jconsole/nbproject/project.xml diff --git a/jdk/make/netbeans/jdbc/README b/make/jdk/netbeans/jdbc/README similarity index 100% rename from jdk/make/netbeans/jdbc/README rename to make/jdk/netbeans/jdbc/README diff --git a/jdk/make/netbeans/jdbc/build.properties b/make/jdk/netbeans/jdbc/build.properties similarity index 100% rename from jdk/make/netbeans/jdbc/build.properties rename to make/jdk/netbeans/jdbc/build.properties diff --git a/jdk/make/netbeans/jdbc/build.xml b/make/jdk/netbeans/jdbc/build.xml similarity index 100% rename from jdk/make/netbeans/jdbc/build.xml rename to make/jdk/netbeans/jdbc/build.xml diff --git a/jdk/make/netbeans/jdbc/nbproject/project.xml b/make/jdk/netbeans/jdbc/nbproject/project.xml similarity index 100% rename from jdk/make/netbeans/jdbc/nbproject/project.xml rename to make/jdk/netbeans/jdbc/nbproject/project.xml diff --git a/jdk/make/netbeans/jdwpgen/build.xml b/make/jdk/netbeans/jdwpgen/build.xml similarity index 100% rename from jdk/make/netbeans/jdwpgen/build.xml rename to make/jdk/netbeans/jdwpgen/build.xml diff --git a/jdk/make/netbeans/jdwpgen/nbproject/build-impl.xml b/make/jdk/netbeans/jdwpgen/nbproject/build-impl.xml similarity index 100% rename from jdk/make/netbeans/jdwpgen/nbproject/build-impl.xml rename to make/jdk/netbeans/jdwpgen/nbproject/build-impl.xml diff --git a/jdk/make/netbeans/jdwpgen/nbproject/findbugs.settings b/make/jdk/netbeans/jdwpgen/nbproject/findbugs.settings similarity index 100% rename from jdk/make/netbeans/jdwpgen/nbproject/findbugs.settings rename to make/jdk/netbeans/jdwpgen/nbproject/findbugs.settings diff --git a/jdk/make/netbeans/jdwpgen/nbproject/genfiles.properties b/make/jdk/netbeans/jdwpgen/nbproject/genfiles.properties similarity index 100% rename from jdk/make/netbeans/jdwpgen/nbproject/genfiles.properties rename to make/jdk/netbeans/jdwpgen/nbproject/genfiles.properties diff --git a/jdk/make/netbeans/jdwpgen/nbproject/project.properties b/make/jdk/netbeans/jdwpgen/nbproject/project.properties similarity index 100% rename from jdk/make/netbeans/jdwpgen/nbproject/project.properties rename to make/jdk/netbeans/jdwpgen/nbproject/project.properties diff --git a/jdk/make/netbeans/jdwpgen/nbproject/project.xml b/make/jdk/netbeans/jdwpgen/nbproject/project.xml similarity index 100% rename from jdk/make/netbeans/jdwpgen/nbproject/project.xml rename to make/jdk/netbeans/jdwpgen/nbproject/project.xml diff --git a/jaxp/nbproject/sqe.properties b/make/jdk/netbeans/jdwpgen/nbproject/sqe.properties similarity index 100% rename from jaxp/nbproject/sqe.properties rename to make/jdk/netbeans/jdwpgen/nbproject/sqe.properties diff --git a/jdk/make/netbeans/jmx/README b/make/jdk/netbeans/jmx/README similarity index 100% rename from jdk/make/netbeans/jmx/README rename to make/jdk/netbeans/jmx/README diff --git a/jdk/make/netbeans/jmx/build.properties b/make/jdk/netbeans/jmx/build.properties similarity index 100% rename from jdk/make/netbeans/jmx/build.properties rename to make/jdk/netbeans/jmx/build.properties diff --git a/jdk/make/netbeans/jmx/build.xml b/make/jdk/netbeans/jmx/build.xml similarity index 100% rename from jdk/make/netbeans/jmx/build.xml rename to make/jdk/netbeans/jmx/build.xml diff --git a/jdk/make/netbeans/jmx/nbproject/project.xml b/make/jdk/netbeans/jmx/nbproject/project.xml similarity index 100% rename from jdk/make/netbeans/jmx/nbproject/project.xml rename to make/jdk/netbeans/jmx/nbproject/project.xml diff --git a/jdk/make/netbeans/swing/README b/make/jdk/netbeans/swing/README similarity index 100% rename from jdk/make/netbeans/swing/README rename to make/jdk/netbeans/swing/README diff --git a/jdk/make/netbeans/swing/build.properties b/make/jdk/netbeans/swing/build.properties similarity index 100% rename from jdk/make/netbeans/swing/build.properties rename to make/jdk/netbeans/swing/build.properties diff --git a/jdk/make/netbeans/swing/build.xml b/make/jdk/netbeans/swing/build.xml similarity index 100% rename from jdk/make/netbeans/swing/build.xml rename to make/jdk/netbeans/swing/build.xml diff --git a/jdk/make/netbeans/swing/nbproject/project.xml b/make/jdk/netbeans/swing/nbproject/project.xml similarity index 100% rename from jdk/make/netbeans/swing/nbproject/project.xml rename to make/jdk/netbeans/swing/nbproject/project.xml diff --git a/jdk/make/netbeans/world/README b/make/jdk/netbeans/world/README similarity index 100% rename from jdk/make/netbeans/world/README rename to make/jdk/netbeans/world/README diff --git a/jdk/make/netbeans/world/build.properties b/make/jdk/netbeans/world/build.properties similarity index 100% rename from jdk/make/netbeans/world/build.properties rename to make/jdk/netbeans/world/build.properties diff --git a/jdk/make/netbeans/world/build.xml b/make/jdk/netbeans/world/build.xml similarity index 100% rename from jdk/make/netbeans/world/build.xml rename to make/jdk/netbeans/world/build.xml diff --git a/jdk/make/netbeans/world/nbproject/project.xml b/make/jdk/netbeans/world/nbproject/project.xml similarity index 100% rename from jdk/make/netbeans/world/nbproject/project.xml rename to make/jdk/netbeans/world/nbproject/project.xml diff --git a/jdk/make/src/classes/build/tools/blacklistedcertsconverter/BlacklistedCertsConverter.java b/make/jdk/src/classes/build/tools/blacklistedcertsconverter/BlacklistedCertsConverter.java similarity index 100% rename from jdk/make/src/classes/build/tools/blacklistedcertsconverter/BlacklistedCertsConverter.java rename to make/jdk/src/classes/build/tools/blacklistedcertsconverter/BlacklistedCertsConverter.java diff --git a/jdk/make/src/classes/build/tools/charsetmapping/Charset.java b/make/jdk/src/classes/build/tools/charsetmapping/Charset.java similarity index 100% rename from jdk/make/src/classes/build/tools/charsetmapping/Charset.java rename to make/jdk/src/classes/build/tools/charsetmapping/Charset.java diff --git a/jdk/make/src/classes/build/tools/charsetmapping/DBCS.java b/make/jdk/src/classes/build/tools/charsetmapping/DBCS.java similarity index 100% rename from jdk/make/src/classes/build/tools/charsetmapping/DBCS.java rename to make/jdk/src/classes/build/tools/charsetmapping/DBCS.java diff --git a/jdk/make/src/classes/build/tools/charsetmapping/EUC_TW.java b/make/jdk/src/classes/build/tools/charsetmapping/EUC_TW.java similarity index 100% rename from jdk/make/src/classes/build/tools/charsetmapping/EUC_TW.java rename to make/jdk/src/classes/build/tools/charsetmapping/EUC_TW.java diff --git a/jdk/make/src/classes/build/tools/charsetmapping/HKSCS.java b/make/jdk/src/classes/build/tools/charsetmapping/HKSCS.java similarity index 100% rename from jdk/make/src/classes/build/tools/charsetmapping/HKSCS.java rename to make/jdk/src/classes/build/tools/charsetmapping/HKSCS.java diff --git a/jdk/make/src/classes/build/tools/charsetmapping/Hasher.java b/make/jdk/src/classes/build/tools/charsetmapping/Hasher.java similarity index 100% rename from jdk/make/src/classes/build/tools/charsetmapping/Hasher.java rename to make/jdk/src/classes/build/tools/charsetmapping/Hasher.java diff --git a/jdk/make/src/classes/build/tools/charsetmapping/JIS0213.java b/make/jdk/src/classes/build/tools/charsetmapping/JIS0213.java similarity index 100% rename from jdk/make/src/classes/build/tools/charsetmapping/JIS0213.java rename to make/jdk/src/classes/build/tools/charsetmapping/JIS0213.java diff --git a/jdk/make/src/classes/build/tools/charsetmapping/Main.java b/make/jdk/src/classes/build/tools/charsetmapping/Main.java similarity index 100% rename from jdk/make/src/classes/build/tools/charsetmapping/Main.java rename to make/jdk/src/classes/build/tools/charsetmapping/Main.java diff --git a/jdk/make/src/classes/build/tools/charsetmapping/SBCS.java b/make/jdk/src/classes/build/tools/charsetmapping/SBCS.java similarity index 100% rename from jdk/make/src/classes/build/tools/charsetmapping/SBCS.java rename to make/jdk/src/classes/build/tools/charsetmapping/SBCS.java diff --git a/jdk/make/src/classes/build/tools/charsetmapping/SPI.java b/make/jdk/src/classes/build/tools/charsetmapping/SPI.java similarity index 100% rename from jdk/make/src/classes/build/tools/charsetmapping/SPI.java rename to make/jdk/src/classes/build/tools/charsetmapping/SPI.java diff --git a/jdk/make/src/classes/build/tools/charsetmapping/SRC.java b/make/jdk/src/classes/build/tools/charsetmapping/SRC.java similarity index 100% rename from jdk/make/src/classes/build/tools/charsetmapping/SRC.java rename to make/jdk/src/classes/build/tools/charsetmapping/SRC.java diff --git a/jdk/make/src/classes/build/tools/charsetmapping/Utils.java b/make/jdk/src/classes/build/tools/charsetmapping/Utils.java similarity index 100% rename from jdk/make/src/classes/build/tools/charsetmapping/Utils.java rename to make/jdk/src/classes/build/tools/charsetmapping/Utils.java diff --git a/jdk/make/src/classes/build/tools/classlist/HelloClasslist.java b/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java similarity index 100% rename from jdk/make/src/classes/build/tools/classlist/HelloClasslist.java rename to make/jdk/src/classes/build/tools/classlist/HelloClasslist.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/AbstractLDMLHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/AbstractLDMLHandler.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/AbstractLDMLHandler.java rename to make/jdk/src/classes/build/tools/cldrconverter/AbstractLDMLHandler.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/AliasEntry.java b/make/jdk/src/classes/build/tools/cldrconverter/AliasEntry.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/AliasEntry.java rename to make/jdk/src/classes/build/tools/cldrconverter/AliasEntry.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/Bundle.java b/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/Bundle.java rename to make/jdk/src/classes/build/tools/cldrconverter/Bundle.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/BundleGenerator.java b/make/jdk/src/classes/build/tools/cldrconverter/BundleGenerator.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/BundleGenerator.java rename to make/jdk/src/classes/build/tools/cldrconverter/BundleGenerator.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java rename to make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/CalendarType.java b/make/jdk/src/classes/build/tools/cldrconverter/CalendarType.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/CalendarType.java rename to make/jdk/src/classes/build/tools/cldrconverter/CalendarType.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/Container.java b/make/jdk/src/classes/build/tools/cldrconverter/Container.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/Container.java rename to make/jdk/src/classes/build/tools/cldrconverter/Container.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/CopyrightHeaders.java b/make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/CopyrightHeaders.java rename to make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/Entry.java b/make/jdk/src/classes/build/tools/cldrconverter/Entry.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/Entry.java rename to make/jdk/src/classes/build/tools/cldrconverter/Entry.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/IgnoredContainer.java b/make/jdk/src/classes/build/tools/cldrconverter/IgnoredContainer.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/IgnoredContainer.java rename to make/jdk/src/classes/build/tools/cldrconverter/IgnoredContainer.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/KeyContainer.java b/make/jdk/src/classes/build/tools/cldrconverter/KeyContainer.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/KeyContainer.java rename to make/jdk/src/classes/build/tools/cldrconverter/KeyContainer.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java rename to make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/LikelySubtagsParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/LikelySubtagsParseHandler.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/LikelySubtagsParseHandler.java rename to make/jdk/src/classes/build/tools/cldrconverter/LikelySubtagsParseHandler.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java rename to make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/NumberingSystemsParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/NumberingSystemsParseHandler.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/NumberingSystemsParseHandler.java rename to make/jdk/src/classes/build/tools/cldrconverter/NumberingSystemsParseHandler.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java b/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java rename to make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/StringArrayElement.java b/make/jdk/src/classes/build/tools/cldrconverter/StringArrayElement.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/StringArrayElement.java rename to make/jdk/src/classes/build/tools/cldrconverter/StringArrayElement.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/StringArrayEntry.java b/make/jdk/src/classes/build/tools/cldrconverter/StringArrayEntry.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/StringArrayEntry.java rename to make/jdk/src/classes/build/tools/cldrconverter/StringArrayEntry.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/StringEntry.java b/make/jdk/src/classes/build/tools/cldrconverter/StringEntry.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/StringEntry.java rename to make/jdk/src/classes/build/tools/cldrconverter/StringEntry.java diff --git a/jdk/make/src/classes/build/tools/cldrconverter/SupplementDataParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/SupplementDataParseHandler.java similarity index 100% rename from jdk/make/src/classes/build/tools/cldrconverter/SupplementDataParseHandler.java rename to make/jdk/src/classes/build/tools/cldrconverter/SupplementDataParseHandler.java diff --git a/jdk/make/src/classes/build/tools/compilefontconfig/CompileFontConfig.java b/make/jdk/src/classes/build/tools/compilefontconfig/CompileFontConfig.java similarity index 100% rename from jdk/make/src/classes/build/tools/compilefontconfig/CompileFontConfig.java rename to make/jdk/src/classes/build/tools/compilefontconfig/CompileFontConfig.java diff --git a/jdk/make/src/classes/build/tools/compileproperties/CompileProperties.java b/make/jdk/src/classes/build/tools/compileproperties/CompileProperties.java similarity index 100% rename from jdk/make/src/classes/build/tools/compileproperties/CompileProperties.java rename to make/jdk/src/classes/build/tools/compileproperties/CompileProperties.java diff --git a/jdk/make/src/classes/build/tools/dtdbuilder/DTDBuilder.java b/make/jdk/src/classes/build/tools/dtdbuilder/DTDBuilder.java similarity index 100% rename from jdk/make/src/classes/build/tools/dtdbuilder/DTDBuilder.java rename to make/jdk/src/classes/build/tools/dtdbuilder/DTDBuilder.java diff --git a/jdk/make/src/classes/build/tools/dtdbuilder/DTDInputStream.java b/make/jdk/src/classes/build/tools/dtdbuilder/DTDInputStream.java similarity index 100% rename from jdk/make/src/classes/build/tools/dtdbuilder/DTDInputStream.java rename to make/jdk/src/classes/build/tools/dtdbuilder/DTDInputStream.java diff --git a/jdk/make/src/classes/build/tools/dtdbuilder/DTDParser.java b/make/jdk/src/classes/build/tools/dtdbuilder/DTDParser.java similarity index 100% rename from jdk/make/src/classes/build/tools/dtdbuilder/DTDParser.java rename to make/jdk/src/classes/build/tools/dtdbuilder/DTDParser.java diff --git a/jdk/make/src/classes/build/tools/dtdbuilder/PublicMapping.java b/make/jdk/src/classes/build/tools/dtdbuilder/PublicMapping.java similarity index 100% rename from jdk/make/src/classes/build/tools/dtdbuilder/PublicMapping.java rename to make/jdk/src/classes/build/tools/dtdbuilder/PublicMapping.java diff --git a/jdk/make/src/classes/build/tools/dtdbuilder/README.txt b/make/jdk/src/classes/build/tools/dtdbuilder/README.txt similarity index 100% rename from jdk/make/src/classes/build/tools/dtdbuilder/README.txt rename to make/jdk/src/classes/build/tools/dtdbuilder/README.txt diff --git a/jdk/make/src/classes/build/tools/generatebreakiteratordata/CharSet.java b/make/jdk/src/classes/build/tools/generatebreakiteratordata/CharSet.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatebreakiteratordata/CharSet.java rename to make/jdk/src/classes/build/tools/generatebreakiteratordata/CharSet.java diff --git a/jdk/make/src/classes/build/tools/generatebreakiteratordata/CharacterCategory.java b/make/jdk/src/classes/build/tools/generatebreakiteratordata/CharacterCategory.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatebreakiteratordata/CharacterCategory.java rename to make/jdk/src/classes/build/tools/generatebreakiteratordata/CharacterCategory.java diff --git a/jdk/make/src/classes/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java b/make/jdk/src/classes/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java rename to make/jdk/src/classes/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java diff --git a/jdk/make/src/classes/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java b/make/jdk/src/classes/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java rename to make/jdk/src/classes/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java diff --git a/jdk/make/src/classes/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java b/make/jdk/src/classes/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java rename to make/jdk/src/classes/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java diff --git a/jdk/make/src/classes/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java b/make/jdk/src/classes/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java rename to make/jdk/src/classes/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java diff --git a/jdk/make/src/classes/build/tools/generatecharacter/CharacterName.java b/make/jdk/src/classes/build/tools/generatecharacter/CharacterName.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatecharacter/CharacterName.java rename to make/jdk/src/classes/build/tools/generatecharacter/CharacterName.java diff --git a/jdk/make/src/classes/build/tools/generatecharacter/CharacterScript.java b/make/jdk/src/classes/build/tools/generatecharacter/CharacterScript.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatecharacter/CharacterScript.java rename to make/jdk/src/classes/build/tools/generatecharacter/CharacterScript.java diff --git a/jdk/make/src/classes/build/tools/generatecharacter/GenerateCharacter.java b/make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatecharacter/GenerateCharacter.java rename to make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java diff --git a/jdk/make/src/classes/build/tools/generatecharacter/PrintCharacterRanges.java b/make/jdk/src/classes/build/tools/generatecharacter/PrintCharacterRanges.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatecharacter/PrintCharacterRanges.java rename to make/jdk/src/classes/build/tools/generatecharacter/PrintCharacterRanges.java diff --git a/jdk/make/src/classes/build/tools/generatecharacter/PropList.java b/make/jdk/src/classes/build/tools/generatecharacter/PropList.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatecharacter/PropList.java rename to make/jdk/src/classes/build/tools/generatecharacter/PropList.java diff --git a/jdk/make/src/classes/build/tools/generatecharacter/SpecialCaseMap.java b/make/jdk/src/classes/build/tools/generatecharacter/SpecialCaseMap.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatecharacter/SpecialCaseMap.java rename to make/jdk/src/classes/build/tools/generatecharacter/SpecialCaseMap.java diff --git a/jdk/make/src/classes/build/tools/generatecharacter/UnicodeSpec.java b/make/jdk/src/classes/build/tools/generatecharacter/UnicodeSpec.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatecharacter/UnicodeSpec.java rename to make/jdk/src/classes/build/tools/generatecharacter/UnicodeSpec.java diff --git a/jdk/make/src/classes/build/tools/generatecharacter/Utility.java b/make/jdk/src/classes/build/tools/generatecharacter/Utility.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatecharacter/Utility.java rename to make/jdk/src/classes/build/tools/generatecharacter/Utility.java diff --git a/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java b/make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java rename to make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java diff --git a/jdk/make/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java b/make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java rename to make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/AbstractGradient.java b/make/jdk/src/classes/build/tools/generatenimbus/AbstractGradient.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/AbstractGradient.java rename to make/jdk/src/classes/build/tools/generatenimbus/AbstractGradient.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Border.java b/make/jdk/src/classes/build/tools/generatenimbus/Border.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Border.java rename to make/jdk/src/classes/build/tools/generatenimbus/Border.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Canvas.java b/make/jdk/src/classes/build/tools/generatenimbus/Canvas.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Canvas.java rename to make/jdk/src/classes/build/tools/generatenimbus/Canvas.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/ComponentColor.java b/make/jdk/src/classes/build/tools/generatenimbus/ComponentColor.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/ComponentColor.java rename to make/jdk/src/classes/build/tools/generatenimbus/ComponentColor.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Dimension.java b/make/jdk/src/classes/build/tools/generatenimbus/Dimension.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Dimension.java rename to make/jdk/src/classes/build/tools/generatenimbus/Dimension.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Ellipse.java b/make/jdk/src/classes/build/tools/generatenimbus/Ellipse.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Ellipse.java rename to make/jdk/src/classes/build/tools/generatenimbus/Ellipse.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Generator.java b/make/jdk/src/classes/build/tools/generatenimbus/Generator.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Generator.java rename to make/jdk/src/classes/build/tools/generatenimbus/Generator.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Gradient.java b/make/jdk/src/classes/build/tools/generatenimbus/Gradient.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Gradient.java rename to make/jdk/src/classes/build/tools/generatenimbus/Gradient.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/GradientStop.java b/make/jdk/src/classes/build/tools/generatenimbus/GradientStop.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/GradientStop.java rename to make/jdk/src/classes/build/tools/generatenimbus/GradientStop.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Insets.java b/make/jdk/src/classes/build/tools/generatenimbus/Insets.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Insets.java rename to make/jdk/src/classes/build/tools/generatenimbus/Insets.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Layer.java b/make/jdk/src/classes/build/tools/generatenimbus/Layer.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Layer.java rename to make/jdk/src/classes/build/tools/generatenimbus/Layer.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Matte.java b/make/jdk/src/classes/build/tools/generatenimbus/Matte.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Matte.java rename to make/jdk/src/classes/build/tools/generatenimbus/Matte.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/ObjectFactory.java b/make/jdk/src/classes/build/tools/generatenimbus/ObjectFactory.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/ObjectFactory.java rename to make/jdk/src/classes/build/tools/generatenimbus/ObjectFactory.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Paint.java b/make/jdk/src/classes/build/tools/generatenimbus/Paint.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Paint.java rename to make/jdk/src/classes/build/tools/generatenimbus/Paint.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/PainterGenerator.java b/make/jdk/src/classes/build/tools/generatenimbus/PainterGenerator.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/PainterGenerator.java rename to make/jdk/src/classes/build/tools/generatenimbus/PainterGenerator.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Path.java b/make/jdk/src/classes/build/tools/generatenimbus/Path.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Path.java rename to make/jdk/src/classes/build/tools/generatenimbus/Path.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Point.java b/make/jdk/src/classes/build/tools/generatenimbus/Point.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Point.java rename to make/jdk/src/classes/build/tools/generatenimbus/Point.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/RadialGradient.java b/make/jdk/src/classes/build/tools/generatenimbus/RadialGradient.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/RadialGradient.java rename to make/jdk/src/classes/build/tools/generatenimbus/RadialGradient.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Rectangle.java b/make/jdk/src/classes/build/tools/generatenimbus/Rectangle.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Rectangle.java rename to make/jdk/src/classes/build/tools/generatenimbus/Rectangle.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Shape.java b/make/jdk/src/classes/build/tools/generatenimbus/Shape.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Shape.java rename to make/jdk/src/classes/build/tools/generatenimbus/Shape.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/SynthModel.java b/make/jdk/src/classes/build/tools/generatenimbus/SynthModel.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/SynthModel.java rename to make/jdk/src/classes/build/tools/generatenimbus/SynthModel.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Typeface.java b/make/jdk/src/classes/build/tools/generatenimbus/Typeface.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Typeface.java rename to make/jdk/src/classes/build/tools/generatenimbus/Typeface.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/UIColor.java b/make/jdk/src/classes/build/tools/generatenimbus/UIColor.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/UIColor.java rename to make/jdk/src/classes/build/tools/generatenimbus/UIColor.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/UIComponent.java b/make/jdk/src/classes/build/tools/generatenimbus/UIComponent.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/UIComponent.java rename to make/jdk/src/classes/build/tools/generatenimbus/UIComponent.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/UIDefault.java b/make/jdk/src/classes/build/tools/generatenimbus/UIDefault.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/UIDefault.java rename to make/jdk/src/classes/build/tools/generatenimbus/UIDefault.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/UIFont.java b/make/jdk/src/classes/build/tools/generatenimbus/UIFont.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/UIFont.java rename to make/jdk/src/classes/build/tools/generatenimbus/UIFont.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/UIIconRegion.java b/make/jdk/src/classes/build/tools/generatenimbus/UIIconRegion.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/UIIconRegion.java rename to make/jdk/src/classes/build/tools/generatenimbus/UIIconRegion.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/UIProperty.java b/make/jdk/src/classes/build/tools/generatenimbus/UIProperty.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/UIProperty.java rename to make/jdk/src/classes/build/tools/generatenimbus/UIProperty.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/UIRegion.java b/make/jdk/src/classes/build/tools/generatenimbus/UIRegion.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/UIRegion.java rename to make/jdk/src/classes/build/tools/generatenimbus/UIRegion.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/UIState.java b/make/jdk/src/classes/build/tools/generatenimbus/UIState.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/UIState.java rename to make/jdk/src/classes/build/tools/generatenimbus/UIState.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/UIStateType.java b/make/jdk/src/classes/build/tools/generatenimbus/UIStateType.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/UIStateType.java rename to make/jdk/src/classes/build/tools/generatenimbus/UIStateType.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/UIStyle.java b/make/jdk/src/classes/build/tools/generatenimbus/UIStyle.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/UIStyle.java rename to make/jdk/src/classes/build/tools/generatenimbus/UIStyle.java diff --git a/jdk/make/src/classes/build/tools/generatenimbus/Utils.java b/make/jdk/src/classes/build/tools/generatenimbus/Utils.java similarity index 100% rename from jdk/make/src/classes/build/tools/generatenimbus/Utils.java rename to make/jdk/src/classes/build/tools/generatenimbus/Utils.java diff --git a/jdk/make/src/classes/build/tools/hasher/Hasher.java b/make/jdk/src/classes/build/tools/hasher/Hasher.java similarity index 100% rename from jdk/make/src/classes/build/tools/hasher/Hasher.java rename to make/jdk/src/classes/build/tools/hasher/Hasher.java diff --git a/jdk/make/src/classes/build/tools/icondata/awt/ToBin.java b/make/jdk/src/classes/build/tools/icondata/awt/ToBin.java similarity index 100% rename from jdk/make/src/classes/build/tools/icondata/awt/ToBin.java rename to make/jdk/src/classes/build/tools/icondata/awt/ToBin.java diff --git a/jdk/make/src/classes/build/tools/icondata/osxapp/ToBin.java b/make/jdk/src/classes/build/tools/icondata/osxapp/ToBin.java similarity index 100% rename from jdk/make/src/classes/build/tools/icondata/osxapp/ToBin.java rename to make/jdk/src/classes/build/tools/icondata/osxapp/ToBin.java diff --git a/jdk/make/src/classes/build/tools/jarreorder/JarReorder.java b/make/jdk/src/classes/build/tools/jarreorder/JarReorder.java similarity index 100% rename from jdk/make/src/classes/build/tools/jarreorder/JarReorder.java rename to make/jdk/src/classes/build/tools/jarreorder/JarReorder.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/AbstractCommandNode.java b/make/jdk/src/classes/build/tools/jdwpgen/AbstractCommandNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/AbstractCommandNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/AbstractCommandNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/AbstractGroupNode.java b/make/jdk/src/classes/build/tools/jdwpgen/AbstractGroupNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/AbstractGroupNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/AbstractGroupNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/AbstractNamedNode.java b/make/jdk/src/classes/build/tools/jdwpgen/AbstractNamedNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/AbstractNamedNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/AbstractNamedNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/AbstractSimpleNode.java b/make/jdk/src/classes/build/tools/jdwpgen/AbstractSimpleNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/AbstractSimpleNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/AbstractSimpleNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/AbstractSimpleTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/AbstractSimpleTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/AbstractSimpleTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/AbstractSimpleTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/AbstractTypeListNode.java b/make/jdk/src/classes/build/tools/jdwpgen/AbstractTypeListNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/AbstractTypeListNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/AbstractTypeListNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/AbstractTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/AbstractTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/AbstractTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/AbstractTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/AltNode.java b/make/jdk/src/classes/build/tools/jdwpgen/AltNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/AltNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/AltNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ArrayObjectTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ArrayObjectTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ArrayObjectTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ArrayObjectTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ArrayRegionTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ArrayRegionTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ArrayRegionTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ArrayRegionTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ArrayTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ArrayTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ArrayTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ArrayTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/BooleanTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/BooleanTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/BooleanTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/BooleanTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ByteTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ByteTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ByteTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ByteTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ClassLoaderObjectTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ClassLoaderObjectTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ClassLoaderObjectTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ClassLoaderObjectTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ClassObjectTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ClassObjectTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ClassObjectTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ClassObjectTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ClassTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ClassTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ClassTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ClassTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/CommandNode.java b/make/jdk/src/classes/build/tools/jdwpgen/CommandNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/CommandNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/CommandNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/CommandSetNode.java b/make/jdk/src/classes/build/tools/jdwpgen/CommandSetNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/CommandSetNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/CommandSetNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/CommentNode.java b/make/jdk/src/classes/build/tools/jdwpgen/CommentNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/CommentNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/CommentNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ConstantNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ConstantNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ConstantNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ConstantNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ConstantSetNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ConstantSetNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ConstantSetNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ConstantSetNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/Context.java b/make/jdk/src/classes/build/tools/jdwpgen/Context.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/Context.java rename to make/jdk/src/classes/build/tools/jdwpgen/Context.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ErrorNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ErrorNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ErrorNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ErrorNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ErrorSetNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ErrorSetNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ErrorSetNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ErrorSetNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/EventNode.java b/make/jdk/src/classes/build/tools/jdwpgen/EventNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/EventNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/EventNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/FieldTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/FieldTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/FieldTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/FieldTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/FrameTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/FrameTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/FrameTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/FrameTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/GroupNode.java b/make/jdk/src/classes/build/tools/jdwpgen/GroupNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/GroupNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/GroupNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/IntTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/IntTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/IntTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/IntTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/InterfaceTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/InterfaceTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/InterfaceTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/InterfaceTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/LocationTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/LocationTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/LocationTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/LocationTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/LongTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/LongTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/LongTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/LongTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/Main.java b/make/jdk/src/classes/build/tools/jdwpgen/Main.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/Main.java rename to make/jdk/src/classes/build/tools/jdwpgen/Main.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/MethodTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/MethodTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/MethodTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/MethodTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ModuleTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ModuleTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ModuleTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ModuleTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/NameNode.java b/make/jdk/src/classes/build/tools/jdwpgen/NameNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/NameNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/NameNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/NameValueNode.java b/make/jdk/src/classes/build/tools/jdwpgen/NameValueNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/NameValueNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/NameValueNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/Node.java b/make/jdk/src/classes/build/tools/jdwpgen/Node.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/Node.java rename to make/jdk/src/classes/build/tools/jdwpgen/Node.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ObjectTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ObjectTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ObjectTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ObjectTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/OutNode.java b/make/jdk/src/classes/build/tools/jdwpgen/OutNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/OutNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/OutNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/Parse.java b/make/jdk/src/classes/build/tools/jdwpgen/Parse.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/Parse.java rename to make/jdk/src/classes/build/tools/jdwpgen/Parse.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ReferenceIDTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ReferenceIDTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ReferenceIDTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ReferenceIDTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ReferenceTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ReferenceTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ReferenceTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ReferenceTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/RepeatNode.java b/make/jdk/src/classes/build/tools/jdwpgen/RepeatNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/RepeatNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/RepeatNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ReplyNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ReplyNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ReplyNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ReplyNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/RootNode.java b/make/jdk/src/classes/build/tools/jdwpgen/RootNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/RootNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/RootNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/SelectNode.java b/make/jdk/src/classes/build/tools/jdwpgen/SelectNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/SelectNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/SelectNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/StringObjectTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/StringObjectTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/StringObjectTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/StringObjectTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/StringTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/StringTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/StringTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/StringTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/TaggedObjectTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/TaggedObjectTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/TaggedObjectTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/TaggedObjectTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ThreadGroupObjectTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ThreadGroupObjectTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ThreadGroupObjectTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ThreadGroupObjectTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ThreadObjectTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ThreadObjectTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ThreadObjectTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ThreadObjectTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/TypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/TypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/TypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/TypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/UntaggedValueTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/UntaggedValueTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/UntaggedValueTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/UntaggedValueTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jdwpgen/ValueTypeNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ValueTypeNode.java similarity index 100% rename from jdk/make/src/classes/build/tools/jdwpgen/ValueTypeNode.java rename to make/jdk/src/classes/build/tools/jdwpgen/ValueTypeNode.java diff --git a/jdk/make/src/classes/build/tools/jigsaw/AddPackagesAttribute.java b/make/jdk/src/classes/build/tools/jigsaw/AddPackagesAttribute.java similarity index 100% rename from jdk/make/src/classes/build/tools/jigsaw/AddPackagesAttribute.java rename to make/jdk/src/classes/build/tools/jigsaw/AddPackagesAttribute.java diff --git a/jdk/make/src/classes/build/tools/jigsaw/GenGraphs.java b/make/jdk/src/classes/build/tools/jigsaw/GenGraphs.java similarity index 100% rename from jdk/make/src/classes/build/tools/jigsaw/GenGraphs.java rename to make/jdk/src/classes/build/tools/jigsaw/GenGraphs.java diff --git a/jdk/make/src/classes/build/tools/jigsaw/ListPackages.java b/make/jdk/src/classes/build/tools/jigsaw/ListPackages.java similarity index 100% rename from jdk/make/src/classes/build/tools/jigsaw/ListPackages.java rename to make/jdk/src/classes/build/tools/jigsaw/ListPackages.java diff --git a/jdk/make/src/classes/build/tools/jigsaw/ModuleSummary.java b/make/jdk/src/classes/build/tools/jigsaw/ModuleSummary.java similarity index 100% rename from jdk/make/src/classes/build/tools/jigsaw/ModuleSummary.java rename to make/jdk/src/classes/build/tools/jigsaw/ModuleSummary.java diff --git a/jdk/make/src/classes/build/tools/jigsaw/javadoc-graphs.properties b/make/jdk/src/classes/build/tools/jigsaw/javadoc-graphs.properties similarity index 100% rename from jdk/make/src/classes/build/tools/jigsaw/javadoc-graphs.properties rename to make/jdk/src/classes/build/tools/jigsaw/javadoc-graphs.properties diff --git a/jdk/make/src/classes/build/tools/jigsaw/technology-summary.html b/make/jdk/src/classes/build/tools/jigsaw/technology-summary.html similarity index 100% rename from jdk/make/src/classes/build/tools/jigsaw/technology-summary.html rename to make/jdk/src/classes/build/tools/jigsaw/technology-summary.html diff --git a/jdk/make/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java b/make/jdk/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java similarity index 100% rename from jdk/make/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java rename to make/jdk/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java diff --git a/jdk/make/src/classes/build/tools/module/GenModuleInfoSource.java b/make/jdk/src/classes/build/tools/module/GenModuleInfoSource.java similarity index 100% rename from jdk/make/src/classes/build/tools/module/GenModuleInfoSource.java rename to make/jdk/src/classes/build/tools/module/GenModuleInfoSource.java diff --git a/jdk/make/src/classes/build/tools/module/GenModuleLoaderMap.java b/make/jdk/src/classes/build/tools/module/GenModuleLoaderMap.java similarity index 100% rename from jdk/make/src/classes/build/tools/module/GenModuleLoaderMap.java rename to make/jdk/src/classes/build/tools/module/GenModuleLoaderMap.java diff --git a/jdk/make/src/classes/build/tools/module/ModuleInfoExtraTest.java b/make/jdk/src/classes/build/tools/module/ModuleInfoExtraTest.java similarity index 100% rename from jdk/make/src/classes/build/tools/module/ModuleInfoExtraTest.java rename to make/jdk/src/classes/build/tools/module/ModuleInfoExtraTest.java diff --git a/jdk/make/src/classes/build/tools/spp/Spp.java b/make/jdk/src/classes/build/tools/spp/Spp.java similarity index 100% rename from jdk/make/src/classes/build/tools/spp/Spp.java rename to make/jdk/src/classes/build/tools/spp/Spp.java diff --git a/jdk/make/src/classes/build/tools/taglet/ExtLink.java b/make/jdk/src/classes/build/tools/taglet/ExtLink.java similarity index 100% rename from jdk/make/src/classes/build/tools/taglet/ExtLink.java rename to make/jdk/src/classes/build/tools/taglet/ExtLink.java diff --git a/jdk/make/src/classes/build/tools/taglet/Incubating.java b/make/jdk/src/classes/build/tools/taglet/Incubating.java similarity index 100% rename from jdk/make/src/classes/build/tools/taglet/Incubating.java rename to make/jdk/src/classes/build/tools/taglet/Incubating.java diff --git a/jdk/make/src/classes/build/tools/taglet/ModuleGraph.java b/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java similarity index 100% rename from jdk/make/src/classes/build/tools/taglet/ModuleGraph.java rename to make/jdk/src/classes/build/tools/taglet/ModuleGraph.java diff --git a/jdk/make/src/classes/build/tools/tzdb/TzdbZoneRulesCompiler.java b/make/jdk/src/classes/build/tools/tzdb/TzdbZoneRulesCompiler.java similarity index 100% rename from jdk/make/src/classes/build/tools/tzdb/TzdbZoneRulesCompiler.java rename to make/jdk/src/classes/build/tools/tzdb/TzdbZoneRulesCompiler.java diff --git a/jdk/make/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java b/make/jdk/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java similarity index 100% rename from jdk/make/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java rename to make/jdk/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java diff --git a/jdk/make/src/classes/build/tools/tzdb/ZoneRules.java b/make/jdk/src/classes/build/tools/tzdb/ZoneRules.java similarity index 100% rename from jdk/make/src/classes/build/tools/tzdb/ZoneRules.java rename to make/jdk/src/classes/build/tools/tzdb/ZoneRules.java diff --git a/jdk/make/src/classes/build/tools/x11wrappergen/WrapperGenerator.java b/make/jdk/src/classes/build/tools/x11wrappergen/WrapperGenerator.java similarity index 100% rename from jdk/make/src/classes/build/tools/x11wrappergen/WrapperGenerator.java rename to make/jdk/src/classes/build/tools/x11wrappergen/WrapperGenerator.java diff --git a/langtools/make/build.properties b/make/langtools/build.properties similarity index 100% rename from langtools/make/build.properties rename to make/langtools/build.properties diff --git a/langtools/make/build.xml b/make/langtools/build.xml similarity index 100% rename from langtools/make/build.xml rename to make/langtools/build.xml diff --git a/langtools/make/conf/checkstyle-emacs.xsl b/make/langtools/conf/checkstyle-emacs.xsl similarity index 100% rename from langtools/make/conf/checkstyle-emacs.xsl rename to make/langtools/conf/checkstyle-emacs.xsl diff --git a/langtools/make/conf/checkstyle-langtools.xml b/make/langtools/conf/checkstyle-langtools.xml similarity index 100% rename from langtools/make/conf/checkstyle-langtools.xml rename to make/langtools/conf/checkstyle-langtools.xml diff --git a/langtools/make/diags-examples.xml b/make/langtools/diags-examples.xml similarity index 100% rename from langtools/make/diags-examples.xml rename to make/langtools/diags-examples.xml diff --git a/langtools/make/intellij/ant.xml b/make/langtools/intellij/ant.xml similarity index 100% rename from langtools/make/intellij/ant.xml rename to make/langtools/intellij/ant.xml diff --git a/langtools/make/intellij/build.xml b/make/langtools/intellij/build.xml similarity index 100% rename from langtools/make/intellij/build.xml rename to make/langtools/intellij/build.xml diff --git a/langtools/make/intellij/codeStyleSettings.xml b/make/langtools/intellij/codeStyleSettings.xml similarity index 100% rename from langtools/make/intellij/codeStyleSettings.xml rename to make/langtools/intellij/codeStyleSettings.xml diff --git a/langtools/make/intellij/compiler.xml b/make/langtools/intellij/compiler.xml similarity index 100% rename from langtools/make/intellij/compiler.xml rename to make/langtools/intellij/compiler.xml diff --git a/langtools/make/intellij/copyright/langtools.xml b/make/langtools/intellij/copyright/langtools.xml similarity index 100% rename from langtools/make/intellij/copyright/langtools.xml rename to make/langtools/intellij/copyright/langtools.xml diff --git a/langtools/make/intellij/copyright/profiles_settings.xml b/make/langtools/intellij/copyright/profiles_settings.xml similarity index 100% rename from langtools/make/intellij/copyright/profiles_settings.xml rename to make/langtools/intellij/copyright/profiles_settings.xml diff --git a/langtools/make/intellij/inspectionProfiles/langtools.xml b/make/langtools/intellij/inspectionProfiles/langtools.xml similarity index 100% rename from langtools/make/intellij/inspectionProfiles/langtools.xml rename to make/langtools/intellij/inspectionProfiles/langtools.xml diff --git a/langtools/make/intellij/inspectionProfiles/profiles_settings.xml b/make/langtools/intellij/inspectionProfiles/profiles_settings.xml similarity index 100% rename from langtools/make/intellij/inspectionProfiles/profiles_settings.xml rename to make/langtools/intellij/inspectionProfiles/profiles_settings.xml diff --git a/langtools/make/intellij/langtools.iml b/make/langtools/intellij/langtools.iml similarity index 100% rename from langtools/make/intellij/langtools.iml rename to make/langtools/intellij/langtools.iml diff --git a/langtools/make/intellij/misc.xml b/make/langtools/intellij/misc.xml similarity index 100% rename from langtools/make/intellij/misc.xml rename to make/langtools/intellij/misc.xml diff --git a/langtools/make/intellij/modules.xml b/make/langtools/intellij/modules.xml similarity index 100% rename from langtools/make/intellij/modules.xml rename to make/langtools/intellij/modules.xml diff --git a/langtools/make/intellij/runConfigurations/javac.xml b/make/langtools/intellij/runConfigurations/javac.xml similarity index 100% rename from langtools/make/intellij/runConfigurations/javac.xml rename to make/langtools/intellij/runConfigurations/javac.xml diff --git a/langtools/make/intellij/runConfigurations/javadoc.xml b/make/langtools/intellij/runConfigurations/javadoc.xml similarity index 100% rename from langtools/make/intellij/runConfigurations/javadoc.xml rename to make/langtools/intellij/runConfigurations/javadoc.xml diff --git a/langtools/make/intellij/runConfigurations/javah.xml b/make/langtools/intellij/runConfigurations/javah.xml similarity index 100% rename from langtools/make/intellij/runConfigurations/javah.xml rename to make/langtools/intellij/runConfigurations/javah.xml diff --git a/langtools/make/intellij/runConfigurations/javap.xml b/make/langtools/intellij/runConfigurations/javap.xml similarity index 100% rename from langtools/make/intellij/runConfigurations/javap.xml rename to make/langtools/intellij/runConfigurations/javap.xml diff --git a/langtools/make/intellij/runConfigurations/jshell.xml b/make/langtools/intellij/runConfigurations/jshell.xml similarity index 100% rename from langtools/make/intellij/runConfigurations/jshell.xml rename to make/langtools/intellij/runConfigurations/jshell.xml diff --git a/langtools/make/intellij/runConfigurations/sjavac.xml b/make/langtools/intellij/runConfigurations/sjavac.xml similarity index 100% rename from langtools/make/intellij/runConfigurations/sjavac.xml rename to make/langtools/intellij/runConfigurations/sjavac.xml diff --git a/langtools/make/intellij/src/idea/LangtoolsIdeaAntLogger.java b/make/langtools/intellij/src/idea/LangtoolsIdeaAntLogger.java similarity index 100% rename from langtools/make/intellij/src/idea/LangtoolsIdeaAntLogger.java rename to make/langtools/intellij/src/idea/LangtoolsIdeaAntLogger.java diff --git a/langtools/make/intellij/vcs.xml b/make/langtools/intellij/vcs.xml similarity index 100% rename from langtools/make/intellij/vcs.xml rename to make/langtools/intellij/vcs.xml diff --git a/langtools/make/intellij/workspace.xml b/make/langtools/intellij/workspace.xml similarity index 100% rename from langtools/make/intellij/workspace.xml rename to make/langtools/intellij/workspace.xml diff --git a/langtools/make/launcher.sh-template b/make/langtools/launcher.sh-template similarity index 100% rename from langtools/make/launcher.sh-template rename to make/langtools/launcher.sh-template diff --git a/langtools/make/netbeans/README b/make/langtools/netbeans/README similarity index 100% rename from langtools/make/netbeans/README rename to make/langtools/netbeans/README diff --git a/langtools/make/netbeans/langtools/build.xml b/make/langtools/netbeans/langtools/build.xml similarity index 100% rename from langtools/make/netbeans/langtools/build.xml rename to make/langtools/netbeans/langtools/build.xml diff --git a/langtools/make/netbeans/langtools/nbproject/project.properties b/make/langtools/netbeans/langtools/nbproject/project.properties similarity index 100% rename from langtools/make/netbeans/langtools/nbproject/project.properties rename to make/langtools/netbeans/langtools/nbproject/project.properties diff --git a/langtools/make/netbeans/langtools/nbproject/project.xml b/make/langtools/netbeans/langtools/nbproject/project.xml similarity index 100% rename from langtools/make/netbeans/langtools/nbproject/project.xml rename to make/langtools/netbeans/langtools/nbproject/project.xml diff --git a/langtools/make/src/classes/build/tools/symbolgenerator/CreateSymbols.java b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java similarity index 100% rename from langtools/make/src/classes/build/tools/symbolgenerator/CreateSymbols.java rename to make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java diff --git a/langtools/make/src/classes/build/tools/symbolgenerator/Probe.java b/make/langtools/src/classes/build/tools/symbolgenerator/Probe.java similarity index 100% rename from langtools/make/src/classes/build/tools/symbolgenerator/Probe.java rename to make/langtools/src/classes/build/tools/symbolgenerator/Probe.java diff --git a/langtools/make/src/classes/build/tools/symbolgenerator/TransitiveDependencies.java b/make/langtools/src/classes/build/tools/symbolgenerator/TransitiveDependencies.java similarity index 100% rename from langtools/make/src/classes/build/tools/symbolgenerator/TransitiveDependencies.java rename to make/langtools/src/classes/build/tools/symbolgenerator/TransitiveDependencies.java diff --git a/langtools/make/test/HelloWorld.apt.gold.txt b/make/langtools/test/HelloWorld.apt.gold.txt similarity index 100% rename from langtools/make/test/HelloWorld.apt.gold.txt rename to make/langtools/test/HelloWorld.apt.gold.txt diff --git a/langtools/make/test/HelloWorld.gold.h b/make/langtools/test/HelloWorld.gold.h similarity index 100% rename from langtools/make/test/HelloWorld.gold.h rename to make/langtools/test/HelloWorld.gold.h diff --git a/langtools/make/test/HelloWorld.java b/make/langtools/test/HelloWorld.java similarity index 100% rename from langtools/make/test/HelloWorld.java rename to make/langtools/test/HelloWorld.java diff --git a/langtools/make/test/HelloWorld.javadoc.gold.txt b/make/langtools/test/HelloWorld.javadoc.gold.txt similarity index 100% rename from langtools/make/test/HelloWorld.javadoc.gold.txt rename to make/langtools/test/HelloWorld.javadoc.gold.txt diff --git a/langtools/make/test/HelloWorld.javap.gold.txt b/make/langtools/test/HelloWorld.javap.gold.txt similarity index 100% rename from langtools/make/test/HelloWorld.javap.gold.txt rename to make/langtools/test/HelloWorld.javap.gold.txt diff --git a/langtools/make/test/README b/make/langtools/test/README similarity index 100% rename from langtools/make/test/README rename to make/langtools/test/README diff --git a/langtools/make/test/TEST.ROOT b/make/langtools/test/TEST.ROOT similarity index 100% rename from langtools/make/test/TEST.ROOT rename to make/langtools/test/TEST.ROOT diff --git a/langtools/make/test/bootstrap/javac.sh b/make/langtools/test/bootstrap/javac.sh similarity index 100% rename from langtools/make/test/bootstrap/javac.sh rename to make/langtools/test/bootstrap/javac.sh diff --git a/langtools/make/test/bootstrap/javadoc.sh b/make/langtools/test/bootstrap/javadoc.sh similarity index 100% rename from langtools/make/test/bootstrap/javadoc.sh rename to make/langtools/test/bootstrap/javadoc.sh diff --git a/langtools/make/test/bootstrap/javah.sh b/make/langtools/test/bootstrap/javah.sh similarity index 100% rename from langtools/make/test/bootstrap/javah.sh rename to make/langtools/test/bootstrap/javah.sh diff --git a/langtools/make/test/contents.gold.txt b/make/langtools/test/contents.gold.txt similarity index 100% rename from langtools/make/test/contents.gold.txt rename to make/langtools/test/contents.gold.txt diff --git a/langtools/make/test/contents.sh b/make/langtools/test/contents.sh similarity index 100% rename from langtools/make/test/contents.sh rename to make/langtools/test/contents.sh diff --git a/langtools/make/test/crules/CodingRulesAnalyzerPlugin/Test.java b/make/langtools/test/crules/CodingRulesAnalyzerPlugin/Test.java similarity index 100% rename from langtools/make/test/crules/CodingRulesAnalyzerPlugin/Test.java rename to make/langtools/test/crules/CodingRulesAnalyzerPlugin/Test.java diff --git a/langtools/make/test/crules/CodingRulesAnalyzerPlugin/Test.out b/make/langtools/test/crules/CodingRulesAnalyzerPlugin/Test.out similarity index 100% rename from langtools/make/test/crules/CodingRulesAnalyzerPlugin/Test.out rename to make/langtools/test/crules/CodingRulesAnalyzerPlugin/Test.out diff --git a/langtools/make/test/crules/DefinedByAnalyzer/Test.java b/make/langtools/test/crules/DefinedByAnalyzer/Test.java similarity index 100% rename from langtools/make/test/crules/DefinedByAnalyzer/Test.java rename to make/langtools/test/crules/DefinedByAnalyzer/Test.java diff --git a/langtools/make/test/crules/DefinedByAnalyzer/Test.out b/make/langtools/test/crules/DefinedByAnalyzer/Test.out similarity index 100% rename from langtools/make/test/crules/DefinedByAnalyzer/Test.out rename to make/langtools/test/crules/DefinedByAnalyzer/Test.out diff --git a/langtools/make/test/crules/MutableFieldsAnalyzer/Test.java b/make/langtools/test/crules/MutableFieldsAnalyzer/Test.java similarity index 100% rename from langtools/make/test/crules/MutableFieldsAnalyzer/Test.java rename to make/langtools/test/crules/MutableFieldsAnalyzer/Test.java diff --git a/langtools/make/test/crules/MutableFieldsAnalyzer/Test.out b/make/langtools/test/crules/MutableFieldsAnalyzer/Test.out similarity index 100% rename from langtools/make/test/crules/MutableFieldsAnalyzer/Test.out rename to make/langtools/test/crules/MutableFieldsAnalyzer/Test.out diff --git a/langtools/make/test/lib/classes.gold.txt b/make/langtools/test/lib/classes.gold.txt similarity index 100% rename from langtools/make/test/lib/classes.gold.txt rename to make/langtools/test/lib/classes.gold.txt diff --git a/langtools/make/test/lib/classes.sh b/make/langtools/test/lib/classes.sh similarity index 100% rename from langtools/make/test/lib/classes.sh rename to make/langtools/test/lib/classes.sh diff --git a/langtools/make/test/lib/javac.sh b/make/langtools/test/lib/javac.sh similarity index 100% rename from langtools/make/test/lib/javac.sh rename to make/langtools/test/lib/javac.sh diff --git a/langtools/make/test/lib/javadoc.sh b/make/langtools/test/lib/javadoc.sh similarity index 100% rename from langtools/make/test/lib/javadoc.sh rename to make/langtools/test/lib/javadoc.sh diff --git a/langtools/make/test/lib/javah.sh b/make/langtools/test/lib/javah.sh similarity index 100% rename from langtools/make/test/lib/javah.sh rename to make/langtools/test/lib/javah.sh diff --git a/langtools/make/test/lib/javap.sh b/make/langtools/test/lib/javap.sh similarity index 100% rename from langtools/make/test/lib/javap.sh rename to make/langtools/test/lib/javap.sh diff --git a/langtools/make/test/lib/src.gold.txt b/make/langtools/test/lib/src.gold.txt similarity index 100% rename from langtools/make/test/lib/src.gold.txt rename to make/langtools/test/lib/src.gold.txt diff --git a/langtools/make/test/lib/src.sh b/make/langtools/test/lib/src.sh similarity index 100% rename from langtools/make/test/lib/src.sh rename to make/langtools/test/lib/src.sh diff --git a/langtools/make/test/sym/CreateSymbolsTest.java b/make/langtools/test/sym/CreateSymbolsTest.java similarity index 100% rename from langtools/make/test/sym/CreateSymbolsTest.java rename to make/langtools/test/sym/CreateSymbolsTest.java diff --git a/langtools/make/test/sym/CreateSymbolsTestImpl.java b/make/langtools/test/sym/CreateSymbolsTestImpl.java similarity index 100% rename from langtools/make/test/sym/CreateSymbolsTestImpl.java rename to make/langtools/test/sym/CreateSymbolsTestImpl.java diff --git a/langtools/make/tools/anttasks/CompilePropertiesTask.java b/make/langtools/tools/anttasks/CompilePropertiesTask.java similarity index 100% rename from langtools/make/tools/anttasks/CompilePropertiesTask.java rename to make/langtools/tools/anttasks/CompilePropertiesTask.java diff --git a/langtools/make/tools/anttasks/DumpClassesTask.java b/make/langtools/tools/anttasks/DumpClassesTask.java similarity index 100% rename from langtools/make/tools/anttasks/DumpClassesTask.java rename to make/langtools/tools/anttasks/DumpClassesTask.java diff --git a/langtools/make/tools/anttasks/GenStubsTask.java b/make/langtools/tools/anttasks/GenStubsTask.java similarity index 100% rename from langtools/make/tools/anttasks/GenStubsTask.java rename to make/langtools/tools/anttasks/GenStubsTask.java diff --git a/langtools/make/tools/anttasks/PropertiesParserTask.java b/make/langtools/tools/anttasks/PropertiesParserTask.java similarity index 100% rename from langtools/make/tools/anttasks/PropertiesParserTask.java rename to make/langtools/tools/anttasks/PropertiesParserTask.java diff --git a/langtools/make/tools/anttasks/SelectToolTask.java b/make/langtools/tools/anttasks/SelectToolTask.java similarity index 100% rename from langtools/make/tools/anttasks/SelectToolTask.java rename to make/langtools/tools/anttasks/SelectToolTask.java diff --git a/langtools/make/tools/compileproperties/CompileProperties.java b/make/langtools/tools/compileproperties/CompileProperties.java similarity index 100% rename from langtools/make/tools/compileproperties/CompileProperties.java rename to make/langtools/tools/compileproperties/CompileProperties.java diff --git a/langtools/make/tools/crules/AbstractCodingRulesAnalyzer.java b/make/langtools/tools/crules/AbstractCodingRulesAnalyzer.java similarity index 100% rename from langtools/make/tools/crules/AbstractCodingRulesAnalyzer.java rename to make/langtools/tools/crules/AbstractCodingRulesAnalyzer.java diff --git a/langtools/make/tools/crules/AssertCheckAnalyzer.java b/make/langtools/tools/crules/AssertCheckAnalyzer.java similarity index 100% rename from langtools/make/tools/crules/AssertCheckAnalyzer.java rename to make/langtools/tools/crules/AssertCheckAnalyzer.java diff --git a/langtools/make/tools/crules/CodingRulesAnalyzerPlugin.java b/make/langtools/tools/crules/CodingRulesAnalyzerPlugin.java similarity index 100% rename from langtools/make/tools/crules/CodingRulesAnalyzerPlugin.java rename to make/langtools/tools/crules/CodingRulesAnalyzerPlugin.java diff --git a/langtools/make/tools/crules/DefinedByAnalyzer.java b/make/langtools/tools/crules/DefinedByAnalyzer.java similarity index 100% rename from langtools/make/tools/crules/DefinedByAnalyzer.java rename to make/langtools/tools/crules/DefinedByAnalyzer.java diff --git a/langtools/make/tools/crules/LegacyLogMethodAnalyzer.java b/make/langtools/tools/crules/LegacyLogMethodAnalyzer.java similarity index 100% rename from langtools/make/tools/crules/LegacyLogMethodAnalyzer.java rename to make/langtools/tools/crules/LegacyLogMethodAnalyzer.java diff --git a/langtools/make/tools/crules/MutableFieldsAnalyzer.java b/make/langtools/tools/crules/MutableFieldsAnalyzer.java similarity index 100% rename from langtools/make/tools/crules/MutableFieldsAnalyzer.java rename to make/langtools/tools/crules/MutableFieldsAnalyzer.java diff --git a/langtools/make/tools/crules/resources/crules.properties b/make/langtools/tools/crules/resources/crules.properties similarity index 100% rename from langtools/make/tools/crules/resources/crules.properties rename to make/langtools/tools/crules/resources/crules.properties diff --git a/langtools/make/tools/genstubs/GenStubs.java b/make/langtools/tools/genstubs/GenStubs.java similarity index 100% rename from langtools/make/tools/genstubs/GenStubs.java rename to make/langtools/tools/genstubs/GenStubs.java diff --git a/langtools/make/tools/propertiesparser/PropertiesParser.java b/make/langtools/tools/propertiesparser/PropertiesParser.java similarity index 100% rename from langtools/make/tools/propertiesparser/PropertiesParser.java rename to make/langtools/tools/propertiesparser/PropertiesParser.java diff --git a/langtools/make/tools/propertiesparser/gen/ClassGenerator.java b/make/langtools/tools/propertiesparser/gen/ClassGenerator.java similarity index 100% rename from langtools/make/tools/propertiesparser/gen/ClassGenerator.java rename to make/langtools/tools/propertiesparser/gen/ClassGenerator.java diff --git a/langtools/make/tools/propertiesparser/parser/Message.java b/make/langtools/tools/propertiesparser/parser/Message.java similarity index 100% rename from langtools/make/tools/propertiesparser/parser/Message.java rename to make/langtools/tools/propertiesparser/parser/Message.java diff --git a/langtools/make/tools/propertiesparser/parser/MessageFile.java b/make/langtools/tools/propertiesparser/parser/MessageFile.java similarity index 100% rename from langtools/make/tools/propertiesparser/parser/MessageFile.java rename to make/langtools/tools/propertiesparser/parser/MessageFile.java diff --git a/langtools/make/tools/propertiesparser/parser/MessageInfo.java b/make/langtools/tools/propertiesparser/parser/MessageInfo.java similarity index 100% rename from langtools/make/tools/propertiesparser/parser/MessageInfo.java rename to make/langtools/tools/propertiesparser/parser/MessageInfo.java diff --git a/langtools/make/tools/propertiesparser/parser/MessageLine.java b/make/langtools/tools/propertiesparser/parser/MessageLine.java similarity index 100% rename from langtools/make/tools/propertiesparser/parser/MessageLine.java rename to make/langtools/tools/propertiesparser/parser/MessageLine.java diff --git a/langtools/make/tools/propertiesparser/parser/MessageType.java b/make/langtools/tools/propertiesparser/parser/MessageType.java similarity index 100% rename from langtools/make/tools/propertiesparser/parser/MessageType.java rename to make/langtools/tools/propertiesparser/parser/MessageType.java diff --git a/langtools/make/tools/propertiesparser/resources/templates.properties b/make/langtools/tools/propertiesparser/resources/templates.properties similarity index 100% rename from langtools/make/tools/propertiesparser/resources/templates.properties rename to make/langtools/tools/propertiesparser/resources/templates.properties diff --git a/jdk/make/launcher/Launcher-java.base.gmk b/make/launcher/Launcher-java.base.gmk similarity index 100% rename from jdk/make/launcher/Launcher-java.base.gmk rename to make/launcher/Launcher-java.base.gmk diff --git a/jdk/make/launcher/Launcher-java.corba.gmk b/make/launcher/Launcher-java.corba.gmk similarity index 100% rename from jdk/make/launcher/Launcher-java.corba.gmk rename to make/launcher/Launcher-java.corba.gmk diff --git a/jdk/make/launcher/Launcher-java.desktop.gmk b/make/launcher/Launcher-java.desktop.gmk similarity index 100% rename from jdk/make/launcher/Launcher-java.desktop.gmk rename to make/launcher/Launcher-java.desktop.gmk diff --git a/jdk/make/launcher/Launcher-java.rmi.gmk b/make/launcher/Launcher-java.rmi.gmk similarity index 100% rename from jdk/make/launcher/Launcher-java.rmi.gmk rename to make/launcher/Launcher-java.rmi.gmk diff --git a/jdk/make/launcher/Launcher-java.scripting.gmk b/make/launcher/Launcher-java.scripting.gmk similarity index 100% rename from jdk/make/launcher/Launcher-java.scripting.gmk rename to make/launcher/Launcher-java.scripting.gmk diff --git a/jdk/make/launcher/Launcher-java.security.jgss.gmk b/make/launcher/Launcher-java.security.jgss.gmk similarity index 100% rename from jdk/make/launcher/Launcher-java.security.jgss.gmk rename to make/launcher/Launcher-java.security.jgss.gmk diff --git a/jdk/make/launcher/Launcher-jdk.accessibility.gmk b/make/launcher/Launcher-jdk.accessibility.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.accessibility.gmk rename to make/launcher/Launcher-jdk.accessibility.gmk diff --git a/jdk/make/launcher/Launcher-jdk.aot.gmk b/make/launcher/Launcher-jdk.aot.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.aot.gmk rename to make/launcher/Launcher-jdk.aot.gmk diff --git a/jdk/make/launcher/Launcher-jdk.compiler.gmk b/make/launcher/Launcher-jdk.compiler.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.compiler.gmk rename to make/launcher/Launcher-jdk.compiler.gmk diff --git a/jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk b/make/launcher/Launcher-jdk.hotspot.agent.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk rename to make/launcher/Launcher-jdk.hotspot.agent.gmk diff --git a/jdk/make/launcher/Launcher-jdk.jartool.gmk b/make/launcher/Launcher-jdk.jartool.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.jartool.gmk rename to make/launcher/Launcher-jdk.jartool.gmk diff --git a/jdk/make/launcher/Launcher-jdk.javadoc.gmk b/make/launcher/Launcher-jdk.javadoc.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.javadoc.gmk rename to make/launcher/Launcher-jdk.javadoc.gmk diff --git a/jdk/make/launcher/Launcher-jdk.jcmd.gmk b/make/launcher/Launcher-jdk.jcmd.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.jcmd.gmk rename to make/launcher/Launcher-jdk.jcmd.gmk diff --git a/jdk/make/launcher/Launcher-jdk.jconsole.gmk b/make/launcher/Launcher-jdk.jconsole.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.jconsole.gmk rename to make/launcher/Launcher-jdk.jconsole.gmk diff --git a/jdk/make/launcher/Launcher-jdk.jdeps.gmk b/make/launcher/Launcher-jdk.jdeps.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.jdeps.gmk rename to make/launcher/Launcher-jdk.jdeps.gmk diff --git a/jdk/make/launcher/Launcher-jdk.jdi.gmk b/make/launcher/Launcher-jdk.jdi.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.jdi.gmk rename to make/launcher/Launcher-jdk.jdi.gmk diff --git a/jdk/make/launcher/Launcher-jdk.jlink.gmk b/make/launcher/Launcher-jdk.jlink.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.jlink.gmk rename to make/launcher/Launcher-jdk.jlink.gmk diff --git a/jdk/make/launcher/Launcher-jdk.jshell.gmk b/make/launcher/Launcher-jdk.jshell.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.jshell.gmk rename to make/launcher/Launcher-jdk.jshell.gmk diff --git a/jdk/make/launcher/Launcher-jdk.jstatd.gmk b/make/launcher/Launcher-jdk.jstatd.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.jstatd.gmk rename to make/launcher/Launcher-jdk.jstatd.gmk diff --git a/jdk/make/launcher/Launcher-jdk.pack.gmk b/make/launcher/Launcher-jdk.pack.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.pack.gmk rename to make/launcher/Launcher-jdk.pack.gmk diff --git a/jdk/make/launcher/Launcher-jdk.policytool.gmk b/make/launcher/Launcher-jdk.policytool.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.policytool.gmk rename to make/launcher/Launcher-jdk.policytool.gmk diff --git a/jdk/make/launcher/Launcher-jdk.rmic.gmk b/make/launcher/Launcher-jdk.rmic.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.rmic.gmk rename to make/launcher/Launcher-jdk.rmic.gmk diff --git a/jdk/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk b/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk rename to make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk diff --git a/jdk/make/launcher/Launcher-jdk.xml.bind.gmk b/make/launcher/Launcher-jdk.xml.bind.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.xml.bind.gmk rename to make/launcher/Launcher-jdk.xml.bind.gmk diff --git a/jdk/make/launcher/Launcher-jdk.xml.ws.gmk b/make/launcher/Launcher-jdk.xml.ws.gmk similarity index 100% rename from jdk/make/launcher/Launcher-jdk.xml.ws.gmk rename to make/launcher/Launcher-jdk.xml.ws.gmk diff --git a/jdk/make/launcher/LauncherCommon.gmk b/make/launcher/LauncherCommon.gmk similarity index 100% rename from jdk/make/launcher/LauncherCommon.gmk rename to make/launcher/LauncherCommon.gmk diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk similarity index 100% rename from jdk/make/lib/Awt2dLibraries.gmk rename to make/lib/Awt2dLibraries.gmk diff --git a/jdk/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk similarity index 100% rename from jdk/make/lib/CoreLibraries.gmk rename to make/lib/CoreLibraries.gmk diff --git a/jdk/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk similarity index 100% rename from jdk/make/lib/Lib-java.base.gmk rename to make/lib/Lib-java.base.gmk diff --git a/jdk/make/lib/Lib-java.desktop.gmk b/make/lib/Lib-java.desktop.gmk similarity index 100% rename from jdk/make/lib/Lib-java.desktop.gmk rename to make/lib/Lib-java.desktop.gmk diff --git a/jdk/make/lib/Lib-java.instrument.gmk b/make/lib/Lib-java.instrument.gmk similarity index 100% rename from jdk/make/lib/Lib-java.instrument.gmk rename to make/lib/Lib-java.instrument.gmk diff --git a/jdk/make/lib/Lib-java.management.gmk b/make/lib/Lib-java.management.gmk similarity index 100% rename from jdk/make/lib/Lib-java.management.gmk rename to make/lib/Lib-java.management.gmk diff --git a/jdk/make/lib/Lib-java.prefs.gmk b/make/lib/Lib-java.prefs.gmk similarity index 100% rename from jdk/make/lib/Lib-java.prefs.gmk rename to make/lib/Lib-java.prefs.gmk diff --git a/jdk/make/lib/Lib-java.rmi.gmk b/make/lib/Lib-java.rmi.gmk similarity index 100% rename from jdk/make/lib/Lib-java.rmi.gmk rename to make/lib/Lib-java.rmi.gmk diff --git a/jdk/make/lib/Lib-java.security.jgss.gmk b/make/lib/Lib-java.security.jgss.gmk similarity index 100% rename from jdk/make/lib/Lib-java.security.jgss.gmk rename to make/lib/Lib-java.security.jgss.gmk diff --git a/jdk/make/lib/Lib-java.smartcardio.gmk b/make/lib/Lib-java.smartcardio.gmk similarity index 100% rename from jdk/make/lib/Lib-java.smartcardio.gmk rename to make/lib/Lib-java.smartcardio.gmk diff --git a/jdk/make/lib/Lib-jdk.accessibility.gmk b/make/lib/Lib-jdk.accessibility.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.accessibility.gmk rename to make/lib/Lib-jdk.accessibility.gmk diff --git a/jdk/make/lib/Lib-jdk.attach.gmk b/make/lib/Lib-jdk.attach.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.attach.gmk rename to make/lib/Lib-jdk.attach.gmk diff --git a/jdk/make/lib/Lib-jdk.crypto.cryptoki.gmk b/make/lib/Lib-jdk.crypto.cryptoki.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.crypto.cryptoki.gmk rename to make/lib/Lib-jdk.crypto.cryptoki.gmk diff --git a/jdk/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.crypto.ec.gmk rename to make/lib/Lib-jdk.crypto.ec.gmk diff --git a/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk b/make/lib/Lib-jdk.crypto.mscapi.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.crypto.mscapi.gmk rename to make/lib/Lib-jdk.crypto.mscapi.gmk diff --git a/jdk/make/lib/Lib-jdk.crypto.ucrypto.gmk b/make/lib/Lib-jdk.crypto.ucrypto.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.crypto.ucrypto.gmk rename to make/lib/Lib-jdk.crypto.ucrypto.gmk diff --git a/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk similarity index 100% rename from hotspot/make/lib/Lib-jdk.hotspot.agent.gmk rename to make/lib/Lib-jdk.hotspot.agent.gmk diff --git a/jdk/make/lib/Lib-jdk.internal.le.gmk b/make/lib/Lib-jdk.internal.le.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.internal.le.gmk rename to make/lib/Lib-jdk.internal.le.gmk diff --git a/jdk/make/lib/Lib-jdk.jdi.gmk b/make/lib/Lib-jdk.jdi.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.jdi.gmk rename to make/lib/Lib-jdk.jdi.gmk diff --git a/jdk/make/lib/Lib-jdk.jdwp.agent.gmk b/make/lib/Lib-jdk.jdwp.agent.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.jdwp.agent.gmk rename to make/lib/Lib-jdk.jdwp.agent.gmk diff --git a/jdk/make/lib/Lib-jdk.management.agent.gmk b/make/lib/Lib-jdk.management.agent.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.management.agent.gmk rename to make/lib/Lib-jdk.management.agent.gmk diff --git a/jdk/make/lib/Lib-jdk.management.gmk b/make/lib/Lib-jdk.management.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.management.gmk rename to make/lib/Lib-jdk.management.gmk diff --git a/jdk/make/lib/Lib-jdk.net.gmk b/make/lib/Lib-jdk.net.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.net.gmk rename to make/lib/Lib-jdk.net.gmk diff --git a/jdk/make/lib/Lib-jdk.pack.gmk b/make/lib/Lib-jdk.pack.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.pack.gmk rename to make/lib/Lib-jdk.pack.gmk diff --git a/jdk/make/lib/Lib-jdk.sctp.gmk b/make/lib/Lib-jdk.sctp.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.sctp.gmk rename to make/lib/Lib-jdk.sctp.gmk diff --git a/jdk/make/lib/Lib-jdk.security.auth.gmk b/make/lib/Lib-jdk.security.auth.gmk similarity index 100% rename from jdk/make/lib/Lib-jdk.security.auth.gmk rename to make/lib/Lib-jdk.security.auth.gmk diff --git a/jdk/make/lib/LibCommon.gmk b/make/lib/LibCommon.gmk similarity index 100% rename from jdk/make/lib/LibCommon.gmk rename to make/lib/LibCommon.gmk diff --git a/jdk/make/lib/LibosxLibraries.gmk b/make/lib/LibosxLibraries.gmk similarity index 100% rename from jdk/make/lib/LibosxLibraries.gmk rename to make/lib/LibosxLibraries.gmk diff --git a/jdk/make/lib/NetworkingLibraries.gmk b/make/lib/NetworkingLibraries.gmk similarity index 100% rename from jdk/make/lib/NetworkingLibraries.gmk rename to make/lib/NetworkingLibraries.gmk diff --git a/jdk/make/lib/NioLibraries.gmk b/make/lib/NioLibraries.gmk similarity index 100% rename from jdk/make/lib/NioLibraries.gmk rename to make/lib/NioLibraries.gmk diff --git a/jdk/make/lib/PlatformLibraries.gmk b/make/lib/PlatformLibraries.gmk similarity index 100% rename from jdk/make/lib/PlatformLibraries.gmk rename to make/lib/PlatformLibraries.gmk diff --git a/jdk/make/lib/SecurityLibraries.gmk b/make/lib/SecurityLibraries.gmk similarity index 100% rename from jdk/make/lib/SecurityLibraries.gmk rename to make/lib/SecurityLibraries.gmk diff --git a/jdk/make/lib/SoundLibraries.gmk b/make/lib/SoundLibraries.gmk similarity index 100% rename from jdk/make/lib/SoundLibraries.gmk rename to make/lib/SoundLibraries.gmk diff --git a/jdk/make/mapfiles/launchers/mapfile-ppc64 b/make/mapfiles/launchers/mapfile-ppc64 similarity index 100% rename from jdk/make/mapfiles/launchers/mapfile-ppc64 rename to make/mapfiles/launchers/mapfile-ppc64 diff --git a/jdk/make/mapfiles/launchers/mapfile-ppc64.anonymous b/make/mapfiles/launchers/mapfile-ppc64.anonymous similarity index 100% rename from jdk/make/mapfiles/launchers/mapfile-ppc64.anonymous rename to make/mapfiles/launchers/mapfile-ppc64.anonymous diff --git a/jdk/make/mapfiles/launchers/mapfile-sparc b/make/mapfiles/launchers/mapfile-sparc similarity index 100% rename from jdk/make/mapfiles/launchers/mapfile-sparc rename to make/mapfiles/launchers/mapfile-sparc diff --git a/jdk/make/mapfiles/launchers/mapfile-sparcv9 b/make/mapfiles/launchers/mapfile-sparcv9 similarity index 100% rename from jdk/make/mapfiles/launchers/mapfile-sparcv9 rename to make/mapfiles/launchers/mapfile-sparcv9 diff --git a/jdk/make/mapfiles/launchers/mapfile-x86 b/make/mapfiles/launchers/mapfile-x86 similarity index 100% rename from jdk/make/mapfiles/launchers/mapfile-x86 rename to make/mapfiles/launchers/mapfile-x86 diff --git a/jdk/make/mapfiles/launchers/mapfile-x86.anonymous b/make/mapfiles/launchers/mapfile-x86.anonymous similarity index 100% rename from jdk/make/mapfiles/launchers/mapfile-x86.anonymous rename to make/mapfiles/launchers/mapfile-x86.anonymous diff --git a/jdk/make/mapfiles/launchers/mapfile-x86_64 b/make/mapfiles/launchers/mapfile-x86_64 similarity index 100% rename from jdk/make/mapfiles/launchers/mapfile-x86_64 rename to make/mapfiles/launchers/mapfile-x86_64 diff --git a/jdk/make/mapfiles/launchers/mapfile-x86_64.anonymous b/make/mapfiles/launchers/mapfile-x86_64.anonymous similarity index 100% rename from jdk/make/mapfiles/launchers/mapfile-x86_64.anonymous rename to make/mapfiles/launchers/mapfile-x86_64.anonymous diff --git a/jdk/make/mapfiles/libattach/mapfile-aix b/make/mapfiles/libattach/mapfile-aix similarity index 100% rename from jdk/make/mapfiles/libattach/mapfile-aix rename to make/mapfiles/libattach/mapfile-aix diff --git a/jdk/make/mapfiles/libattach/mapfile-linux b/make/mapfiles/libattach/mapfile-linux similarity index 100% rename from jdk/make/mapfiles/libattach/mapfile-linux rename to make/mapfiles/libattach/mapfile-linux diff --git a/jdk/make/mapfiles/libattach/mapfile-solaris b/make/mapfiles/libattach/mapfile-solaris similarity index 100% rename from jdk/make/mapfiles/libattach/mapfile-solaris rename to make/mapfiles/libattach/mapfile-solaris diff --git a/jdk/make/mapfiles/libattach/reorder-windows-x86 b/make/mapfiles/libattach/reorder-windows-x86 similarity index 100% rename from jdk/make/mapfiles/libattach/reorder-windows-x86 rename to make/mapfiles/libattach/reorder-windows-x86 diff --git a/jdk/make/mapfiles/libattach/reorder-windows-x86_64 b/make/mapfiles/libattach/reorder-windows-x86_64 similarity index 100% rename from jdk/make/mapfiles/libattach/reorder-windows-x86_64 rename to make/mapfiles/libattach/reorder-windows-x86_64 diff --git a/jdk/make/mapfiles/libawt/mapfile-mawt-vers b/make/mapfiles/libawt/mapfile-mawt-vers similarity index 100% rename from jdk/make/mapfiles/libawt/mapfile-mawt-vers rename to make/mapfiles/libawt/mapfile-mawt-vers diff --git a/jdk/make/mapfiles/libawt/mapfile-vers b/make/mapfiles/libawt/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libawt/mapfile-vers rename to make/mapfiles/libawt/mapfile-vers diff --git a/jdk/make/mapfiles/libawt/mapfile-vers-linux b/make/mapfiles/libawt/mapfile-vers-linux similarity index 100% rename from jdk/make/mapfiles/libawt/mapfile-vers-linux rename to make/mapfiles/libawt/mapfile-vers-linux diff --git a/jdk/make/mapfiles/libawt_headless/mapfile-vers b/make/mapfiles/libawt_headless/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libawt_headless/mapfile-vers rename to make/mapfiles/libawt_headless/mapfile-vers diff --git a/jdk/make/mapfiles/libawt_headless/reorder-sparc b/make/mapfiles/libawt_headless/reorder-sparc similarity index 100% rename from jdk/make/mapfiles/libawt_headless/reorder-sparc rename to make/mapfiles/libawt_headless/reorder-sparc diff --git a/jdk/make/mapfiles/libawt_headless/reorder-sparcv9 b/make/mapfiles/libawt_headless/reorder-sparcv9 similarity index 100% rename from jdk/make/mapfiles/libawt_headless/reorder-sparcv9 rename to make/mapfiles/libawt_headless/reorder-sparcv9 diff --git a/jdk/make/mapfiles/libawt_headless/reorder-x86 b/make/mapfiles/libawt_headless/reorder-x86 similarity index 100% rename from jdk/make/mapfiles/libawt_headless/reorder-x86 rename to make/mapfiles/libawt_headless/reorder-x86 diff --git a/jdk/make/mapfiles/libawt_xawt/mapfile-vers b/make/mapfiles/libawt_xawt/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libawt_xawt/mapfile-vers rename to make/mapfiles/libawt_xawt/mapfile-vers diff --git a/jdk/make/mapfiles/libdt_socket/mapfile-vers b/make/mapfiles/libdt_socket/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libdt_socket/mapfile-vers rename to make/mapfiles/libdt_socket/mapfile-vers diff --git a/jdk/make/mapfiles/libextnet/mapfile-vers b/make/mapfiles/libextnet/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libextnet/mapfile-vers rename to make/mapfiles/libextnet/mapfile-vers diff --git a/jdk/make/mapfiles/libfontmanager/mapfile-vers b/make/mapfiles/libfontmanager/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libfontmanager/mapfile-vers rename to make/mapfiles/libfontmanager/mapfile-vers diff --git a/jdk/make/mapfiles/libinstrument/mapfile-vers b/make/mapfiles/libinstrument/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libinstrument/mapfile-vers rename to make/mapfiles/libinstrument/mapfile-vers diff --git a/jdk/make/mapfiles/libj2gss/mapfile-vers b/make/mapfiles/libj2gss/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libj2gss/mapfile-vers rename to make/mapfiles/libj2gss/mapfile-vers diff --git a/jdk/make/mapfiles/libj2pcsc/mapfile-vers b/make/mapfiles/libj2pcsc/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libj2pcsc/mapfile-vers rename to make/mapfiles/libj2pcsc/mapfile-vers diff --git a/jdk/make/mapfiles/libj2pkcs11/mapfile-vers b/make/mapfiles/libj2pkcs11/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libj2pkcs11/mapfile-vers rename to make/mapfiles/libj2pkcs11/mapfile-vers diff --git a/jdk/make/mapfiles/libj2ucrypto/mapfile-vers b/make/mapfiles/libj2ucrypto/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libj2ucrypto/mapfile-vers rename to make/mapfiles/libj2ucrypto/mapfile-vers diff --git a/jdk/make/mapfiles/libjaas/mapfile-vers b/make/mapfiles/libjaas/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libjaas/mapfile-vers rename to make/mapfiles/libjaas/mapfile-vers diff --git a/jdk/make/mapfiles/libjava/mapfile-vers b/make/mapfiles/libjava/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libjava/mapfile-vers rename to make/mapfiles/libjava/mapfile-vers diff --git a/jdk/make/mapfiles/libjava/reorder-sparc b/make/mapfiles/libjava/reorder-sparc similarity index 100% rename from jdk/make/mapfiles/libjava/reorder-sparc rename to make/mapfiles/libjava/reorder-sparc diff --git a/jdk/make/mapfiles/libjava/reorder-sparcv9 b/make/mapfiles/libjava/reorder-sparcv9 similarity index 100% rename from jdk/make/mapfiles/libjava/reorder-sparcv9 rename to make/mapfiles/libjava/reorder-sparcv9 diff --git a/jdk/make/mapfiles/libjava/reorder-x86 b/make/mapfiles/libjava/reorder-x86 similarity index 100% rename from jdk/make/mapfiles/libjava/reorder-x86 rename to make/mapfiles/libjava/reorder-x86 diff --git a/jdk/make/mapfiles/libjawt/mapfile-vers b/make/mapfiles/libjawt/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libjawt/mapfile-vers rename to make/mapfiles/libjawt/mapfile-vers diff --git a/jdk/make/mapfiles/libjdwp/mapfile-vers b/make/mapfiles/libjdwp/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libjdwp/mapfile-vers rename to make/mapfiles/libjdwp/mapfile-vers diff --git a/jdk/make/mapfiles/libjimage/mapfile-vers b/make/mapfiles/libjimage/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libjimage/mapfile-vers rename to make/mapfiles/libjimage/mapfile-vers diff --git a/jdk/make/mapfiles/libjli/mapfile-vers b/make/mapfiles/libjli/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libjli/mapfile-vers rename to make/mapfiles/libjli/mapfile-vers diff --git a/jdk/make/mapfiles/libjpeg/mapfile-vers b/make/mapfiles/libjpeg/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libjpeg/mapfile-vers rename to make/mapfiles/libjpeg/mapfile-vers diff --git a/jdk/make/mapfiles/libjpeg/reorder-sparc b/make/mapfiles/libjpeg/reorder-sparc similarity index 100% rename from jdk/make/mapfiles/libjpeg/reorder-sparc rename to make/mapfiles/libjpeg/reorder-sparc diff --git a/jdk/make/mapfiles/libjpeg/reorder-sparcv9 b/make/mapfiles/libjpeg/reorder-sparcv9 similarity index 100% rename from jdk/make/mapfiles/libjpeg/reorder-sparcv9 rename to make/mapfiles/libjpeg/reorder-sparcv9 diff --git a/jdk/make/mapfiles/libjpeg/reorder-x86 b/make/mapfiles/libjpeg/reorder-x86 similarity index 100% rename from jdk/make/mapfiles/libjpeg/reorder-x86 rename to make/mapfiles/libjpeg/reorder-x86 diff --git a/jdk/make/mapfiles/libjsdt/mapfile-vers b/make/mapfiles/libjsdt/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libjsdt/mapfile-vers rename to make/mapfiles/libjsdt/mapfile-vers diff --git a/hotspot/make/mapfiles/libjsig/mapfile-vers-solaris b/make/mapfiles/libjsig/mapfile-vers-solaris similarity index 100% rename from hotspot/make/mapfiles/libjsig/mapfile-vers-solaris rename to make/mapfiles/libjsig/mapfile-vers-solaris diff --git a/jdk/make/mapfiles/libjsound/mapfile-vers b/make/mapfiles/libjsound/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libjsound/mapfile-vers rename to make/mapfiles/libjsound/mapfile-vers diff --git a/jdk/make/mapfiles/libjsoundalsa/mapfile-vers b/make/mapfiles/libjsoundalsa/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libjsoundalsa/mapfile-vers rename to make/mapfiles/libjsoundalsa/mapfile-vers diff --git a/hotspot/make/mapfiles/libjvm_db/mapfile-vers b/make/mapfiles/libjvm_db/mapfile-vers similarity index 100% rename from hotspot/make/mapfiles/libjvm_db/mapfile-vers rename to make/mapfiles/libjvm_db/mapfile-vers diff --git a/hotspot/make/mapfiles/libjvm_dtrace/mapfile-vers b/make/mapfiles/libjvm_dtrace/mapfile-vers similarity index 100% rename from hotspot/make/mapfiles/libjvm_dtrace/mapfile-vers rename to make/mapfiles/libjvm_dtrace/mapfile-vers diff --git a/jdk/make/mapfiles/liblcms/mapfile-vers b/make/mapfiles/liblcms/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/liblcms/mapfile-vers rename to make/mapfiles/liblcms/mapfile-vers diff --git a/jdk/make/mapfiles/libmanagement/mapfile-vers b/make/mapfiles/libmanagement/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libmanagement/mapfile-vers rename to make/mapfiles/libmanagement/mapfile-vers diff --git a/jdk/make/mapfiles/libmanagement_agent/mapfile-vers b/make/mapfiles/libmanagement_agent/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libmanagement_agent/mapfile-vers rename to make/mapfiles/libmanagement_agent/mapfile-vers diff --git a/jdk/make/mapfiles/libmanagement_ext/mapfile-vers b/make/mapfiles/libmanagement_ext/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libmanagement_ext/mapfile-vers rename to make/mapfiles/libmanagement_ext/mapfile-vers diff --git a/jdk/make/mapfiles/libmlib_image/mapfile-vers b/make/mapfiles/libmlib_image/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libmlib_image/mapfile-vers rename to make/mapfiles/libmlib_image/mapfile-vers diff --git a/jdk/make/mapfiles/libnet/mapfile-vers b/make/mapfiles/libnet/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libnet/mapfile-vers rename to make/mapfiles/libnet/mapfile-vers diff --git a/jdk/make/mapfiles/libnio/mapfile-aix b/make/mapfiles/libnio/mapfile-aix similarity index 100% rename from jdk/make/mapfiles/libnio/mapfile-aix rename to make/mapfiles/libnio/mapfile-aix diff --git a/jdk/make/mapfiles/libnio/mapfile-linux b/make/mapfiles/libnio/mapfile-linux similarity index 100% rename from jdk/make/mapfiles/libnio/mapfile-linux rename to make/mapfiles/libnio/mapfile-linux diff --git a/jdk/make/mapfiles/libnio/mapfile-macosx b/make/mapfiles/libnio/mapfile-macosx similarity index 100% rename from jdk/make/mapfiles/libnio/mapfile-macosx rename to make/mapfiles/libnio/mapfile-macosx diff --git a/jdk/make/mapfiles/libnio/mapfile-solaris b/make/mapfiles/libnio/mapfile-solaris similarity index 100% rename from jdk/make/mapfiles/libnio/mapfile-solaris rename to make/mapfiles/libnio/mapfile-solaris diff --git a/jdk/make/mapfiles/libnio/reorder-sparc b/make/mapfiles/libnio/reorder-sparc similarity index 100% rename from jdk/make/mapfiles/libnio/reorder-sparc rename to make/mapfiles/libnio/reorder-sparc diff --git a/jdk/make/mapfiles/libnio/reorder-sparcv9 b/make/mapfiles/libnio/reorder-sparcv9 similarity index 100% rename from jdk/make/mapfiles/libnio/reorder-sparcv9 rename to make/mapfiles/libnio/reorder-sparcv9 diff --git a/jdk/make/mapfiles/libnio/reorder-x86 b/make/mapfiles/libnio/reorder-x86 similarity index 100% rename from jdk/make/mapfiles/libnio/reorder-x86 rename to make/mapfiles/libnio/reorder-x86 diff --git a/jdk/make/mapfiles/libprefs/mapfile-vers b/make/mapfiles/libprefs/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libprefs/mapfile-vers rename to make/mapfiles/libprefs/mapfile-vers diff --git a/jdk/make/mapfiles/librmi/mapfile-vers b/make/mapfiles/librmi/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/librmi/mapfile-vers rename to make/mapfiles/librmi/mapfile-vers diff --git a/hotspot/make/mapfiles/libsaproc/mapfile-linux b/make/mapfiles/libsaproc/mapfile-linux similarity index 100% rename from hotspot/make/mapfiles/libsaproc/mapfile-linux rename to make/mapfiles/libsaproc/mapfile-linux diff --git a/hotspot/make/mapfiles/libsaproc/mapfile-macosx b/make/mapfiles/libsaproc/mapfile-macosx similarity index 100% rename from hotspot/make/mapfiles/libsaproc/mapfile-macosx rename to make/mapfiles/libsaproc/mapfile-macosx diff --git a/hotspot/make/mapfiles/libsaproc/mapfile-solaris b/make/mapfiles/libsaproc/mapfile-solaris similarity index 100% rename from hotspot/make/mapfiles/libsaproc/mapfile-solaris rename to make/mapfiles/libsaproc/mapfile-solaris diff --git a/jdk/make/mapfiles/libsctp/mapfile-vers b/make/mapfiles/libsctp/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libsctp/mapfile-vers rename to make/mapfiles/libsctp/mapfile-vers diff --git a/jdk/make/mapfiles/libsplashscreen/mapfile-vers b/make/mapfiles/libsplashscreen/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libsplashscreen/mapfile-vers rename to make/mapfiles/libsplashscreen/mapfile-vers diff --git a/jdk/make/mapfiles/libsunec/mapfile-vers b/make/mapfiles/libsunec/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libsunec/mapfile-vers rename to make/mapfiles/libsunec/mapfile-vers diff --git a/jdk/make/mapfiles/libunpack/mapfile-vers b/make/mapfiles/libunpack/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libunpack/mapfile-vers rename to make/mapfiles/libunpack/mapfile-vers diff --git a/jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 b/make/mapfiles/libunpack/mapfile-vers-unpack200 similarity index 100% rename from jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 rename to make/mapfiles/libunpack/mapfile-vers-unpack200 diff --git a/jdk/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-sparc b/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-sparc similarity index 100% rename from jdk/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-sparc rename to make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-sparc diff --git a/jdk/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-x86 b/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-x86 similarity index 100% rename from jdk/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-x86 rename to make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-x86 diff --git a/jdk/make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous b/make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous similarity index 100% rename from jdk/make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous rename to make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous diff --git a/jdk/make/mapfiles/libverify/mapfile-vers b/make/mapfiles/libverify/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libverify/mapfile-vers rename to make/mapfiles/libverify/mapfile-vers diff --git a/jdk/make/mapfiles/libverify/reorder-sparc b/make/mapfiles/libverify/reorder-sparc similarity index 100% rename from jdk/make/mapfiles/libverify/reorder-sparc rename to make/mapfiles/libverify/reorder-sparc diff --git a/jdk/make/mapfiles/libverify/reorder-sparcv9 b/make/mapfiles/libverify/reorder-sparcv9 similarity index 100% rename from jdk/make/mapfiles/libverify/reorder-sparcv9 rename to make/mapfiles/libverify/reorder-sparcv9 diff --git a/jdk/make/mapfiles/libverify/reorder-x86 b/make/mapfiles/libverify/reorder-x86 similarity index 100% rename from jdk/make/mapfiles/libverify/reorder-x86 rename to make/mapfiles/libverify/reorder-x86 diff --git a/jdk/make/mapfiles/libzip/mapfile-vers b/make/mapfiles/libzip/mapfile-vers similarity index 100% rename from jdk/make/mapfiles/libzip/mapfile-vers rename to make/mapfiles/libzip/mapfile-vers diff --git a/jdk/make/mapfiles/libzip/reorder-sparc b/make/mapfiles/libzip/reorder-sparc similarity index 100% rename from jdk/make/mapfiles/libzip/reorder-sparc rename to make/mapfiles/libzip/reorder-sparc diff --git a/jdk/make/mapfiles/libzip/reorder-sparcv9 b/make/mapfiles/libzip/reorder-sparcv9 similarity index 100% rename from jdk/make/mapfiles/libzip/reorder-sparcv9 rename to make/mapfiles/libzip/reorder-sparcv9 diff --git a/jdk/make/mapfiles/libzip/reorder-x86 b/make/mapfiles/libzip/reorder-x86 similarity index 100% rename from jdk/make/mapfiles/libzip/reorder-x86 rename to make/mapfiles/libzip/reorder-x86 diff --git a/nashorn/make/build-benchmark.xml b/make/nashorn/build-benchmark.xml similarity index 100% rename from nashorn/make/build-benchmark.xml rename to make/nashorn/build-benchmark.xml diff --git a/nashorn/make/build-nasgen.xml b/make/nashorn/build-nasgen.xml similarity index 100% rename from nashorn/make/build-nasgen.xml rename to make/nashorn/build-nasgen.xml diff --git a/nashorn/make/build.xml b/make/nashorn/build.xml similarity index 100% rename from nashorn/make/build.xml rename to make/nashorn/build.xml diff --git a/nashorn/buildtools/nasgen/README b/make/nashorn/buildtools/nasgen/README similarity index 100% rename from nashorn/buildtools/nasgen/README rename to make/nashorn/buildtools/nasgen/README diff --git a/nashorn/buildtools/nasgen/build.xml b/make/nashorn/buildtools/nasgen/build.xml similarity index 100% rename from nashorn/buildtools/nasgen/build.xml rename to make/nashorn/buildtools/nasgen/build.xml diff --git a/nashorn/buildtools/nasgen/nasgen.iml b/make/nashorn/buildtools/nasgen/nasgen.iml similarity index 100% rename from nashorn/buildtools/nasgen/nasgen.iml rename to make/nashorn/buildtools/nasgen/nasgen.iml diff --git a/nashorn/buildtools/nasgen/project.properties b/make/nashorn/buildtools/nasgen/project.properties similarity index 100% rename from nashorn/buildtools/nasgen/project.properties rename to make/nashorn/buildtools/nasgen/project.properties diff --git a/nashorn/buildtools/nasgen/src/META-INF/MANIFEST.MF b/make/nashorn/buildtools/nasgen/src/META-INF/MANIFEST.MF similarity index 100% rename from nashorn/buildtools/nasgen/src/META-INF/MANIFEST.MF rename to make/nashorn/buildtools/nasgen/src/META-INF/MANIFEST.MF diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java similarity index 100% rename from nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java rename to make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java similarity index 100% rename from nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java rename to make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java similarity index 100% rename from nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java rename to make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java similarity index 100% rename from nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java rename to make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java similarity index 100% rename from nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java rename to make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java similarity index 100% rename from nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java rename to make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java similarity index 100% rename from nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java rename to make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java similarity index 100% rename from nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java rename to make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java similarity index 100% rename from nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java rename to make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java similarity index 100% rename from nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java rename to make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java similarity index 100% rename from nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java rename to make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Where.java b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Where.java similarity index 100% rename from nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Where.java rename to make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Where.java diff --git a/nashorn/buildtools/nashorntask/README b/make/nashorn/buildtools/nashorntask/README similarity index 100% rename from nashorn/buildtools/nashorntask/README rename to make/nashorn/buildtools/nashorntask/README diff --git a/nashorn/buildtools/nashorntask/build.xml b/make/nashorn/buildtools/nashorntask/build.xml similarity index 100% rename from nashorn/buildtools/nashorntask/build.xml rename to make/nashorn/buildtools/nashorntask/build.xml diff --git a/nashorn/buildtools/nashorntask/project.properties b/make/nashorn/buildtools/nashorntask/project.properties similarity index 100% rename from nashorn/buildtools/nashorntask/project.properties rename to make/nashorn/buildtools/nashorntask/project.properties diff --git a/nashorn/buildtools/nashorntask/src/jdk/nashorn/ant/NashornTask.java b/make/nashorn/buildtools/nashorntask/src/jdk/nashorn/ant/NashornTask.java similarity index 100% rename from nashorn/buildtools/nashorntask/src/jdk/nashorn/ant/NashornTask.java rename to make/nashorn/buildtools/nashorntask/src/jdk/nashorn/ant/NashornTask.java diff --git a/nashorn/make/code_coverage.xml b/make/nashorn/code_coverage.xml similarity index 100% rename from nashorn/make/code_coverage.xml rename to make/nashorn/code_coverage.xml diff --git a/nashorn/exclude/exclude_list.txt b/make/nashorn/exclude/exclude_list.txt similarity index 100% rename from nashorn/exclude/exclude_list.txt rename to make/nashorn/exclude/exclude_list.txt diff --git a/nashorn/exclude/exclude_list_cc.txt b/make/nashorn/exclude/exclude_list_cc.txt similarity index 100% rename from nashorn/exclude/exclude_list_cc.txt rename to make/nashorn/exclude/exclude_list_cc.txt diff --git a/nashorn/make/nbproject/ide-file-targets.xml b/make/nashorn/nbproject/ide-file-targets.xml similarity index 100% rename from nashorn/make/nbproject/ide-file-targets.xml rename to make/nashorn/nbproject/ide-file-targets.xml diff --git a/nashorn/make/nbproject/ide-targets.xml b/make/nashorn/nbproject/ide-targets.xml similarity index 100% rename from nashorn/make/nbproject/ide-targets.xml rename to make/nashorn/nbproject/ide-targets.xml diff --git a/nashorn/make/nbproject/jdk.xml b/make/nashorn/nbproject/jdk.xml similarity index 100% rename from nashorn/make/nbproject/jdk.xml rename to make/nashorn/nbproject/jdk.xml diff --git a/nashorn/make/nbproject/nbjdk.properties b/make/nashorn/nbproject/nbjdk.properties similarity index 100% rename from nashorn/make/nbproject/nbjdk.properties rename to make/nashorn/nbproject/nbjdk.properties diff --git a/nashorn/make/nbproject/nbjdk.xml b/make/nashorn/nbproject/nbjdk.xml similarity index 100% rename from nashorn/make/nbproject/nbjdk.xml rename to make/nashorn/nbproject/nbjdk.xml diff --git a/nashorn/make/nbproject/project.xml b/make/nashorn/nbproject/project.xml similarity index 100% rename from nashorn/make/nbproject/project.xml rename to make/nashorn/nbproject/project.xml diff --git a/nashorn/make/project.properties b/make/nashorn/project.properties similarity index 100% rename from nashorn/make/project.properties rename to make/nashorn/project.properties diff --git a/common/nb_native/nbproject/configurations.xml b/make/nb_native/nbproject/configurations.xml similarity index 100% rename from common/nb_native/nbproject/configurations.xml rename to make/nb_native/nbproject/configurations.xml diff --git a/common/nb_native/nbproject/project.xml b/make/nb_native/nbproject/project.xml similarity index 100% rename from common/nb_native/nbproject/project.xml rename to make/nb_native/nbproject/project.xml diff --git a/jdk/make/rmic/Rmic-java.management.rmi.gmk b/make/rmic/Rmic-java.management.rmi.gmk similarity index 100% rename from jdk/make/rmic/Rmic-java.management.rmi.gmk rename to make/rmic/Rmic-java.management.rmi.gmk diff --git a/jdk/make/rmic/Rmic-java.rmi.gmk b/make/rmic/Rmic-java.rmi.gmk similarity index 100% rename from jdk/make/rmic/Rmic-java.rmi.gmk rename to make/rmic/Rmic-java.rmi.gmk diff --git a/jdk/make/rmic/Rmic-jdk.naming.rmi.gmk b/make/rmic/Rmic-jdk.naming.rmi.gmk similarity index 100% rename from jdk/make/rmic/Rmic-jdk.naming.rmi.gmk rename to make/rmic/Rmic-jdk.naming.rmi.gmk diff --git a/jdk/make/rmic/RmicCommon.gmk b/make/rmic/RmicCommon.gmk similarity index 100% rename from jdk/make/rmic/RmicCommon.gmk rename to make/rmic/RmicCommon.gmk diff --git a/jdk/make/scripts/addNotices.sh b/make/scripts/addNotices.sh similarity index 100% rename from jdk/make/scripts/addNotices.sh rename to make/scripts/addNotices.sh diff --git a/common/bin/compare.sh b/make/scripts/compare.sh similarity index 100% rename from common/bin/compare.sh rename to make/scripts/compare.sh diff --git a/common/bin/compare_exceptions.sh.incl b/make/scripts/compare_exceptions.sh.incl similarity index 100% rename from common/bin/compare_exceptions.sh.incl rename to make/scripts/compare_exceptions.sh.incl diff --git a/jdk/make/scripts/genExceptions.sh b/make/scripts/genExceptions.sh similarity index 100% rename from jdk/make/scripts/genExceptions.sh rename to make/scripts/genExceptions.sh diff --git a/common/bin/hide_important_warnings_from_javac.sh b/make/scripts/hide_important_warnings_from_javac.sh similarity index 100% rename from common/bin/hide_important_warnings_from_javac.sh rename to make/scripts/hide_important_warnings_from_javac.sh diff --git a/common/bin/logger.sh b/make/scripts/logger.sh similarity index 100% rename from common/bin/logger.sh rename to make/scripts/logger.sh diff --git a/common/bin/shell-profiler.sh b/make/scripts/shell-profiler.sh similarity index 100% rename from common/bin/shell-profiler.sh rename to make/scripts/shell-profiler.sh diff --git a/common/src/fixpath.c b/make/src/native/fixpath.c similarity index 100% rename from common/src/fixpath.c rename to make/src/native/fixpath.c diff --git a/hotspot/make/test/JtregNative.gmk b/make/test/JtregNativeHotspot.gmk similarity index 100% rename from hotspot/make/test/JtregNative.gmk rename to make/test/JtregNativeHotspot.gmk diff --git a/jdk/make/test/JtregNative.gmk b/make/test/JtregNativeJdk.gmk similarity index 100% rename from jdk/make/test/JtregNative.gmk rename to make/test/JtregNativeJdk.gmk diff --git a/nashorn/.hgignore b/nashorn/.hgignore deleted file mode 100644 index 28d612d25e7..00000000000 --- a/nashorn/.hgignore +++ /dev/null @@ -1,30 +0,0 @@ -syntax: glob - -build/* -dist/* -/nbproject/private/ -private.xml -private.properties -^webrev -.classpath -*.class -*.clazz -*.log -*.orig -*.rej -*~ -genfiles.properties -hotspot.log -.DS_Store* -TEST-*.xml -TESTS-*.xml -report.xml -CC/* -jcov2/* -.idea/* -test/lib/*.jar -test/script/external/* -.project -.externalToolBuilders/* -.settings/* -NashornProfile.txt diff --git a/nashorn/.hgtags b/nashorn/.hgtags deleted file mode 100644 index d13251bbab4..00000000000 --- a/nashorn/.hgtags +++ /dev/null @@ -1,440 +0,0 @@ -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b24 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b25 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b26 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b27 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b28 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b29 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b30 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b31 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b32 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b33 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b34 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b35 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b36 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b37 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b38 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b39 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b40 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b41 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b42 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b43 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b44 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b45 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b46 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b47 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b48 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b49 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b50 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b51 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b52 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b53 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b54 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b55 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b56 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b57 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b58 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b59 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b60 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b61 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b62 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b63 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b64 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b65 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b66 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b67 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b68 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b69 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b70 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b71 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b72 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b73 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b74 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b75 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b76 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b77 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b78 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b79 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b80 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b81 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b82 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b83 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b84 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b85 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b86 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b87 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b88 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b89 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b90 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b91 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b92 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b93 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b94 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b95 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b96 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b97 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b98 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b99 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b100 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b101 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b102 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b103 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b104 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b105 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b106 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b107 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b108 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b109 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b110 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b111 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b112 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b113 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b114 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b115 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b116 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b117 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b118 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b119 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b120 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b121 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b122 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b123 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b124 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b125 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b126 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b127 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b128 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b129 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b130 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b131 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b132 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b133 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b134 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b135 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b136 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b137 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b138 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b139 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b140 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b141 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b142 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b143 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b144 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b145 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b146 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b147 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b01 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b02 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b03 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b04 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b05 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b06 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b07 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b08 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b09 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b10 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b11 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b12 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b13 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b14 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b15 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b17 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b16 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b18 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b19 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b20 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b21 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b22 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b23 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b24 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b25 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b26 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b27 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b28 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b29 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b30 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b31 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b32 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b33 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b34 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b35 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b36 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b37 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b38 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b39 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b40 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b41 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b42 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b43 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b44 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b45 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b46 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b47 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b48 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b49 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b50 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b51 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b52 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b53 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b54 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b55 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b56 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b57 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b58 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b59 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b60 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b61 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b62 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b63 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b64 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b65 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b66 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b67 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b68 -b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b69 -5759f600fcf7b51ccc6cc8229be980e2153f8675 jdk8-b82 -053d7c55dc8272b58b8bb870dc92a4acf896d52a jdk8-b83 -999cc1bf55203f51b2985feae6378932667ecff2 jdk8-b84 -e0378f0a50dafdcfb7b04f6401d320f89884baa1 jdk8-b85 -002ad9d6735f36d1204e133324c73058c8abb1b0 jdk8-b86 -774aeaa89bc15f4365e3c2fc36f6a3a0da70ba28 jdk8-b87 -40c107d1ae6f81a62e35dfe618b827897405e9b2 jdk8-b88 -45ce27fbe2720d80070095c0db7344ec41e2833d jdk8-b89 -67ca019e3713dd71c884d753de02fd0021981969 jdk8-b90 -6b9f4120380091b8b1751a825b9f84bf1be224fe jdk8-b91 -dee23cce5235b594a96d3361b65eacc97bd5a583 jdk8-b92 -ddbf41575a2bdb12ccb9f91e169018bf04073038 jdk8-b93 -d92b756bc73966f1bfd111f44f3216cea3bba129 jdk8-b94 -cbc9926f5b40a24025c1e15d8870157d651a9ff7 jdk8-b95 -d6bd440ac5b97bb1205b6c3274569c1cfe626723 jdk8-b96 -1bf1d6ce30427e1f9dc1ada18db409d1f14d99fe jdk8-b97 -542b7803f0389a91fab58608a0f46fac0e15d759 jdk8-b98 -10a1ab9e20a42d278aa1a89698f2a4cf5883d00d jdk8-b99 -598321c438b52d9408a2671fb3fc2b2947d0f654 jdk8-b100 -a302b05d0ee460679501dc01004f70eb395fadf5 jdk8-b101 -e966ff0a3ffef8a687eaf5a14167bb595b623d02 jdk8-b102 -414203de4374e1964a9918c38a95fb245010a9f1 jdk8-b103 -afc100513451d22f0b8135999d6eb52f36df3d36 jdk8-b104 -f484bfb624dd06683cb33b524700a5dd4927a82b jdk8-b105 -bf70cbd2c8369fd97ffdfcbe1a80dbc2797408ee jdk8-b106 -f35e1255024b66f7cf82517798f45f6e194e5567 jdk8-b107 -445ad3f6d3b4ba62ebc483323e1919110a304053 jdk8-b108 -6ec2f9e5ed5bd60c2900976e6a54fdcac2f37e9e jdk8-b109 -d49a8c2173f5f90c9a39cc4af8e03cfa8f35ee4c jdk8-b110 -75fd3486e584f20475c064a2cd4d01ac6406a511 jdk8-b111 -6a4fdb3bb4e34af4c5bb8db467bb01e13b1a7e31 jdk8-b112 -676cd7bf5e092356f7ee2116c8cf88cdc12377c7 jdk8-b113 -79f7b79bf97b71c9b5c9b103dbdef5f269eeb86d jdk8-b114 -f0d3ac2474ee755b1180ec71bcdfa190845b17eb jdk8-b115 -0fb1a427fbf6e04c77cebbbf99b6631c664ed793 jdk8-b116 -1db3d4e4d18913e853d7bebf86816e87fda00a71 jdk8-b117 -8d014b039b44c23fa520ce20c2c27f7aa91441e9 jdk8-b118 -c3343930c73c58a22c1d58719bb988aeb25a871f jdk8-b119 -55cbc2d00c93f82513ce33819d41dc67e71aaefd jdk8-b120 -32631eed0fad2b31346eb41b29a50227bd29e2ec jdk8-b121 -9d112a0e7df737f3b1fa2a021d5bb350ed56c1b7 jdk8-b122 -688f4167f92188482b0d80e315c72f726c6d5ff6 jdk8-b123 -32631eed0fad2b31346eb41b29a50227bd29e2ec jdk9-b00 -65347535840f045f2cd4341d7466c51009b1b06f jdk9-b01 -b3517e51f40477f10db8bc30a557aa0ea712c274 jdk9-b02 -832f89ff25d903c45cfc994553f1ade8821a4398 jdk9-b03 -3f6ef92cd7823372c45e79125adba4cbf1c9f7b2 jdk9-b04 -2a1cac93c33317d828d4a5b81239204a9927cc4a jdk9-b05 -1f75bcbe74e315470dc0b75b7d5bcd209e287c39 jdk9-b06 -9a34d2a0a5bdaf0bf0d81d6fe6324aa0cfb35bfe jdk9-b07 -4764920fd81d631915b13ba03b5d962ab14a50c4 jdk9-b08 -27f6ea87dcbd52c4b59e34a9f18d5b3321d53fa7 jdk9-b09 -0eaa55c7abe5d96023a4b38a326f411209c43f49 jdk9-b10 -4d60c3292e14aac90dc3b8232496ba4af4254cc3 jdk9-b11 -282e9a675e079cc84dbfaa4c10050f08397faab0 jdk9-b12 -be4580ae56e2ef0ce521d3f840753eaa83cacf33 jdk9-b13 -806df06b6ac58d3e9c9c6a680dbdd7a6c94ca700 jdk9-b14 -32b66f4661eac52f8b04fb3d7703feb2c96febb7 jdk9-b15 -fed8c83dfba4dce94d2ae1cb82f026634ff2a3e4 jdk9-b16 -4a47b7cfecdf2a865811ab08a7ef49c942801d7c jdk9-b17 -893c337bc95fef3885baa3e4ffc30d68f62a829f jdk9-b18 -46e36a92e37c06dea50f8c829549d9d0bfed4e3c jdk9-b19 -d703c59c556f9fcd9604272806ef7acf55c92363 jdk9-b20 -174cf53bce4e93a3d5d880ed7915ce8d0f08bc5e jdk9-b21 -a9d39bcfeb1bb3f7de929c56a2ecbea10a554ca1 jdk9-b22 -aa3fda2d2967847dbd264aa962d624c07fc6c29f jdk9-b23 -49d7a2a66ae6b70fee367e2ceb29d0c20f8be01b jdk9-b24 -b33633fc10c5bffd39d3492ed2602dadd8d44642 jdk9-b25 -ed60a4e9dd35dcabb9b24e90434f5f615d988981 jdk9-b26 -221a84ef44c00335b563d92f470efaf8162b471e jdk9-b27 -00c31e5eaf26f9b238165157b9d1c617b03abcb6 jdk9-b28 -e541ebaf2ab7038333ad0c13f4decd327c26dd15 jdk9-b29 -072dbed6c5d968a6b9e156c36cd8838b4ff86ea1 jdk9-b30 -77efdecfa2a5c28672b7c7dcc2d1b52dcb90d493 jdk9-b31 -62ba20541b948fb98a7036d9f01baa54e95fb6fa jdk9-b32 -b374d8910e7f8de2b7ecacee9ae4cad88f23feab jdk9-b33 -4ece2dad8c37f520f1ccc1cf84870f362c8eb9d6 jdk9-b34 -63b8da4c958c3bbadfff082c547983f5daa50c0f jdk9-b35 -10fe62bc188476abb025e55f55128cbfecf24584 jdk9-b36 -dd7bbdf81a537106cfa9227d1a9a57849cb26b4d jdk9-b37 -365f55e7b3c45637bf912c88d31b32a127ad7429 jdk9-b38 -900508346b1c2436d7059fe46a621e6ec3ffdaad jdk9-b39 -74dcd8dbef252938d6deb032aefb46b8f452dd9e jdk9-b40 -52340a35aec9955d4aeaaf01d6337284f179b31c jdk9-b41 -498d1d6c4219086143b764b3bf61afe65dcece47 jdk9-b42 -8ae8dff2a28f3b8831cce97ae0c7a957c5dc650a jdk9-b43 -50ee576062726e536d1bb9a5eadd8fd4470128fc jdk9-b44 -3c2bbeda038aef7061455fec604db7d8a342fac5 jdk9-b45 -2ecf0a617f0f9af1ffd278a0c70e76f1946ce773 jdk9-b46 -29046d42a95e5b9f105ab086a628bbd7f81c915d jdk9-b47 -f08660f30051ba0b38ad00e692979b37d107c9c4 jdk9-b48 -2ae58b5f05f803a469f0f6c1ed72c6b5313f4ff0 jdk9-b49 -32e48a0d59e186df8a041e1e5f8bfb0b8d2bc4cd jdk9-b50 -10b32cc48ccc2592621b28558a1cf70a0ce22fe5 jdk9-b51 -fada76c29db9c792ad7127e674ef5337e15d2225 jdk9-b52 -6cd23482ca9bd0caa6bfa6bf9064251178083d17 jdk9-b53 -26460b897225010a4c7664eaff7a71f1156cacb3 jdk9-b54 -b2b332e64b7b2e06e25bccae9c0c0b585a03b4b5 jdk9-b55 -2e640036000dfadcadaf6638b5fd61db9c71a25c jdk9-b56 -3bcfcb13c23402cf435079766eb2f9a3c4f890e8 jdk9-b57 -5096a7cca5f0fda814832ac777966bea893f837e jdk9-b58 -ea4e794c3927df4e03f53202e15a3248375b7902 jdk9-b59 -c55ce3738888b6c7596780b7b2ad1aa0f9ebccd7 jdk9-b60 -89937bee80bd28826de8cf60aa63a21edab63f79 jdk9-b61 -1b5604bc81a6161b1c3c9dd654cd1399474ae9ee jdk9-b62 -bc8e67bec2f92772c4a67e20e66a4f216207f0af jdk9-b63 -00df6e4fc75a83bdd958f9ef86d80e008c9ba967 jdk9-b64 -2054d01ae32649d3179e93d14108fdd6259c1c0d jdk9-b65 -9dd95cff9dae897e8dee712f1f0303c460262288 jdk9-b66 -f822b749821e364cae0b7bd7c8f667d9437e6d83 jdk9-b67 -dd6dd848b854dbd3f3cc422668276b1ae0834179 jdk9-b68 -194b74467afcab3ca0096f04570def424977215d jdk9-b69 -3379235149c0e14e59e05c4ab8df450f5777b552 jdk9-b70 -7066af6e7b06f3c6ebf449c88fc1064d2181237a jdk9-b71 -d017877b3b8cd39337f1bdc00d958f821433c4c3 jdk9-b72 -548f1eb2c3c89e024ef3805f48ceed9de503588f jdk9-b73 -2e8bb16872d7b15dc0a4f8e45c6ad65f762c1b04 jdk9-b74 -f884dff432a7ac349153f3d1ea1eb222f3764c6c jdk9-b75 -ab231613d7206431ba31917a02e7cedd70e88e70 jdk9-b76 -33cecbc59f2ad78ac0934cbc3e014d346077e848 jdk9-b77 -6f634e84387e97b2421d5e776e46935784156d1c jdk9-b78 -9b3eca69b88b2d1bebce92d58280ae66fc0b6091 jdk9-b79 -61b401b23fc28208930977d46b690423911173c6 jdk9-b80 -42d8ed4651b62572b39e6fed3fafcb7ee93f9dc2 jdk9-b81 -8bab0a9d8a638affdd680c5ec783373f71c19267 jdk9-b82 -21b86b980a5f0d27f1f758a3e4818d3331387172 jdk9-b83 -214b97ba911f4d768c0214098739e32ab54c8503 jdk9-b84 -285628dac94332d95979de365630c93ab8fa9962 jdk9-b85 -e4283eeb182cbdf5004740728a404aac6afa1104 jdk9-b86 -0bf2fe0c7b3277cd247ed4f6faaf2b56d83139cf jdk9-b87 -a2aa804daac974289e20bf8f9106740732f08b34 jdk9-b88 -62641244c378c17183b7208f3f1d75ba5f248a79 jdk9-b89 -bc92163c4e0aa3fcca51a290c55715c54a5faa5f jdk9-b90 -fee4d2015e24ced4f28f4dcf93076a4fbd03844d jdk9-b91 -34b77a618e98c5da59a760341f43af6aefc56efb jdk9-b92 -e13533f7bb78da49bbd909fdf22e13e0e2538146 jdk9-b93 -328932975c749ba7ae40cd5b63e3a7983b564936 jdk9-b94 -9d52f9bb589c4caa3617fe1cf11c72512ab8e973 jdk-9+95 -d52c09d5d98a81ee6102a25f662ec4b9ae614163 jdk-9+96 -2beaef2b6a880c0bff8c9f57ffca33477d647f8b jdk-9+97 -68a36216f70c0de4c7e36f8978995934fc72ec03 jdk-9+98 -74ddd1339c57cf2c2a13e34e1760006c2e54d1fc jdk-9+99 -da397aea8adad7e6f743b60bfe0c415fc8508df5 jdk-9+100 -1916a2c680d8c33b59943dbb6dc2dd2000ec821a jdk-9+101 -e5620875888583d35e9492b62fe27e054df26049 jdk-9+102 -c9406f325a23e9093fa667ad3c594e2efe078f47 jdk-9+103 -a618d3e89fdea5361895ef142a59074fe7ae3d98 jdk-9+104 -4e9749cc32f15251d9b2d0eab4373529952902a3 jdk-9+105 -cfb3167456932b14c16a6d4cffd5fe295fbe01ff jdk-9+106 -8042e81b530e480dfdad41fd53a7a26f69ebba26 jdk-9+107 -58409eff7e3e0c07f12f543341769964619c0acf jdk-9+108 -70f0c397021116d7dbd79b01c6711c5d2e68dab4 jdk-9+109 -9937077e48f19e98af07c4954790fe09b94ca510 jdk-9+110 -133ea8746b37739a0510c80b42888bd85ace9477 jdk-9+111 -c261f8440c5578b34596e6b0419a81aec431a884 jdk-9+112 -a5d1990fd32d908da8154d79116fce8013ba4d40 jdk-9+113 -ba21793a0e4816283cc0ecdab5142a4959363529 jdk-9+114 -295ac208a4443d433214d0c1f32d2ea45a3a32d2 jdk-9+115 -208388a5622dcca8227d6ad6c268f2c88087d283 jdk-9+116 -5267e91811614bac129817e566f730e9d63cf22a jdk-9+117 -05679aac2f7ec3d8dd2a96d7e7899906224bf5cf jdk-9+118 -621ad507bf9b07e7c6da2150aa619fe7e78ec5a0 jdk-9+119 -7ab7fc00b147e5b50d6bd5516147680f11c0b165 jdk-9+120 -5992041b0794fa5f25518673d63e8f35bcc89360 jdk-9+121 -b1de131a3fed6845c78bdda358ee127532f16a3f jdk-9+122 -9ed859b4faaf9ff7cd35f9e7f51c7e630303067a jdk-9+123 -5d68f5155dded7efec7d5aca5d631caa7ee1042b jdk-9+124 -a32d419d73fe881a935b567c57dab9bfe3ed5f92 jdk-9+125 -ee90c69a18409533df8f7b602044bf966a28381a jdk-9+126 -ff07be6106fa56b72c163244f45a3ecb4c995564 jdk-9+127 -5a189c5b396c353786343b590f6c19a5d929f01d jdk-9+128 -68020a486500422e2c8b94b0f35cafe54c9e219a jdk-9+129 -0de67a63e2c73781ecf5979a2f3aa9619a445c37 jdk-9+130 -ee77c6b3713ab293e027ac3ea1cc16f86dac535f jdk-9+131 -55a75af751dfe44039baef2b762ee7347021025b jdk-9+132 -3a924b820d02b108cf57b51e145b5150d1eedcca jdk-9+133 -e05400ba935753c77697af936db24657eb811022 jdk-9+134 -cb00d5ef023a18a66fcb4311ed4474d4145c66e9 jdk-9+135 -f11b8f5c4ccbf9c87d283815abac6c0117fba3c0 jdk-9+136 -17ed43add2f9e3528686cd786ae2ed49c8ed36e9 jdk-9+137 -4a6ee1185fc821df063e4d1537fa7ad2ebe9eb02 jdk-9+138 -e3b11296395b39bfeb3364f26c2ef77fa652e300 jdk-9+139 -785843878cf78d50cc2959ea2c5a4202bbe885b4 jdk-9+140 -a46b7d3867957a868a6cc8ee66c05079b883733a jdk-9+141 -d3f5d7311a1aec3152b17d75046d5d298245a0b4 jdk-9+142 -b4e57ead3fae4939b70dd345d1f6744a1dedfa21 jdk-9+143 -a7f21ee6ed30695a6de14e74035d2857a754f62b jdk-9+144 -4a68dd740be8aa0d1a25f94985b3cb2e190ccfce jdk-9+145 -55f5a96988de8237f3ee65a69aa4a48aed9ca8d4 jdk-9+146 -9e86d6383456a1eb0298c72bb9ca363939ad90cf jdk-9+147 -0a4bc2f049132ddc20985565bb41b2be8a458dda jdk-9+148 -c281306d33d83c92e0d870ace385d5f99678d7e7 jdk-9+149 -ace1d994bca775d6545a4c874ae73d1dfc9ec18b jdk-9+150 -2a0437036a64853334e538044eb68d2df70075fa jdk-9+151 -ddc52e72757086a75a54371e8e7f56a3f89f1e55 jdk-9+152 -19aaaf2d02b7d6986538cd9a8c46901ecb50eebf jdk-9+153 -a84b49cfee63716975535abae2865ffef4dd6474 jdk-10+0 -a84b49cfee63716975535abae2865ffef4dd6474 jdk-9+154 -f9bb37a817b3cd3b758a60f3c68258a6554eb382 jdk-9+155 -d577398d31111be4bdaa08008247cf4242eaea94 jdk-9+156 -ac893c3a86ddeda4bed2573037175a2913ec570e jdk-10+1 -f6070efba6af0dc003e24ca736426c93e99ee96a jdk-9+157 -13ae2480a4c395026b3aa1739e0f9895dc8b25d9 jdk-9+158 -d75af059cff651c1b5cccfeb4c9ea8d054b28cfd jdk-9+159 -9d4dbb8cbe7ce321c6e9e34dc9e0974760710907 jdk-9+160 -d6ef419af865dccf1e5be8047b0aba09286ffa93 jdk-9+161 -2cd29b339692524de64d049b329873facaff9727 jdk-9+162 -5e5e436543daea0c174d878d5e3ff8dd791e538a jdk-9+163 -b473fab09baab51a06ffba02eb06c7f5ee8578f7 jdk-9+164 -e36e62d3ea53c316f295b37bcc19867fbf510235 jdk-9+165 -5b2e7b2101c0048ba9f1df722e56611f523fdfe8 jdk-9+166 -47277bbced66869e17899eee7ac197b78a5c69b8 jdk-10+2 -a76a5e1c9d0b94541826e2121f5754aaa78f0376 jdk-10+3 -e6bc0ad505e65c884a66c42cc92b24371ccf971d jdk-10+4 -59278e0c6ccd7cc6d2427c29e8c3446fc2af0e26 jdk-10+5 -0c5f25cc0d1b89664d1517a256b805e2a97116a4 jdk-10+6 -e118c818dbf84d15191414c453b77c089116fdc0 jdk-9+167 -0f81cde5a1f75786f381dbfb59b9afbab70174c7 jdk-9+168 -131e250080158e57ce45130560f5f987b92642b5 jdk-9+169 -550bfc15779f8f339610793867fdc251125811b5 jdk-9+170 -7e9cb37e6d6edbe56fdf4d510e5110f797823f09 jdk-10+7 -edb825e2dfb140c8e57a61b5d45de19edebccccf jdk-10+8 -d7d69c89088aec56d13bbff81a6f0a8b68ca75f4 jdk-10+9 -fc416270a776409b74006262dd0a9f5f5ff31555 jdk-9+171 -f381e171bec90afee95dc2920793754b58b6f705 jdk-10+10 -c8d6b740f0f7ec834b4157bf0d4523e8bbddb3f0 jdk-9+172 -ae0c4f1560e41e94a843e9933558d0223575869d jdk-10+11 -fa8e4de50e821eed876388c84f7129a6739268be jdk-9+173 -7d4006eaa088848c4fa2ac4aef0ba9982f80752a jdk-9+174 -de571c0a93258599054f18184cbdeae42cd95265 jdk-10+12 -734b3209b6edeb57e482c97793ae9c066af72871 jdk-9+175 -2ab4a2055c2e309872f648fa7ab4daae0bf8994c jdk-10+13 -fed3f329875710c74f3ec1a0c4714046a79af100 jdk-10+14 -3c6fbdf6e785aaf18d35ce9c6684369952fd22ec jdk-9+176 -aa7404e062b95f679018f25eaaf933dcf0cf3f2b jdk-9+177 -f8a0c4895b2abe64a8c55af6117ffda192e34d30 jdk-10+15 -f456f59dad3f6b74bcc3c668a56d51f5955cfb28 jdk-10+16 -7497ad85759ff010f44344b553223d1647fb6eba jdk-9+178 -3adfb547e3e49e304ffc82d8c6489cb830b74d62 jdk-9+179 -6ac0ca441ccb9ccc49c5007248dc1f3af8076a71 jdk-10+17 -e7fbd9c8637ff362e5a1801e3c89c579f23279f7 jdk-10+18 -32228b3fd77a8c65ba5d4d9e30de0f7eb56fca94 jdk-10+19 -bece58f762168a6615bd036626a572a647f6b507 jdk-9+180 -47f8d75b8765ff8410ebc89619e537321cc10c32 jdk-9+181 -9133969febb50ec683bfd79fc506771fb4f7de6c jdk-10+20 -03d3d3c6bc5a06c1c763ef4615bb43672efe6b3f jdk-10+21 -bd933afd9e2ea9b3ce0ebf8deee5a7f9c7dda76c jdk-10+22 diff --git a/nashorn/.jcheck/conf b/nashorn/.jcheck/conf deleted file mode 100644 index ad4189d7de5..00000000000 --- a/nashorn/.jcheck/conf +++ /dev/null @@ -1,2 +0,0 @@ -project=jdk10 -bugids=dup diff --git a/nashorn/ASSEMBLY_EXCEPTION b/nashorn/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d90239..00000000000 --- a/nashorn/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/nashorn/LICENSE b/nashorn/LICENSE deleted file mode 100644 index 8b400c7ab81..00000000000 --- a/nashorn/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/nashorn/README b/nashorn/README deleted file mode 100644 index f518a1bb57d..00000000000 --- a/nashorn/README +++ /dev/null @@ -1,149 +0,0 @@ -- What is Nashorn? - -Nashorn is a runtime environment for programs written in ECMAScript 5.1 -that runs on top of JVM. - -- How to find out more about ECMAScript 5.1? - -The specification can be found at - - http://www.ecma-international.org/publications/standards/Ecma-262.htm - -- How to checkout sources of Nashorn project? - -Nashorn project uses Mercurial source code control system. You can -download Mercurial from http://mercurial.selenic.com/wiki/Download - -Information about the forest extension can be found at - - http://mercurial.selenic.com/wiki/ForestExtension - -and downloaded using - - hg clone https://bitbucket.org/gxti/hgforest - -You can clone Nashorn Mercurial forest using this command: - - hg fclone http://hg.openjdk.java.net/nashorn/jdk9 nashorn~jdk9 - -To update your copy of the forest (fwith the latest code: - - (cd nashorn~jdk9 ; hg fpull) - -Or just the nashorn subdirectory with - - (cd nashorn~jdk9/nashorn ; hg pull -u) - -To learn about Mercurial in detail, please visit http://hgbook.red-bean.com. - -- How to build? - -To build Nashorn, you need to install JDK 9. You may use the Nashorn -forest build (recommended) or download from java.net. You will need to -set JAVA_HOME environmental variable to point to your JDK installation -directory. - - cd nashorn~jdk9/nashorn/make - ant clean; ant - -- How to run? - -Use the jjs script (see RELESE_README): - - cd nashorn~jdk9/nashorn - sh bin/jjs - -Nashorn supports javax.script API. It is possible to drop nashorn.jar in -class path and request for "nashorn" script engine from -javax.script.ScriptEngineManager. - -Look for samples under the directory test/src/jdk/nashorn/api/scripting/. - -- Documentation - -Comprehensive development documentation is found in the Nashorn JavaDoc. You can -build it using: - - cd nashorn~jdk9/nashorn/make - ant javadoc - -after which you can view the generated documentation at dist/javadoc/index.html. - -- Running tests - -Nashorn tests are TestNG based. Running tests requires downloading the -TestNG library and placing its jar file into the test/lib subdirectory. This is -done automatically when executing the "ant externals" command to get external -test suites (see below). - -Once TestNG is properly installed, you can run the tests using: - cd make - ant clean test - -You can also run the ECMA-262 test suite with Nashorn. In order to do -that, you will need to get a copy of it and put it in -test/script/external/test262 directory. A convenient way to do it is: - - git clone https://github.com/tc39/test262 test/script/external/test262 - -Alternatively, you can check it out elsewhere and make -test/script/external/test262 a symbolic link to that directory. After -you've done this, you can run the ECMA-262 tests using: - - cd nashorn~jdk9/nashorn/make - ant test262 - -Ant target to get/update external test suites: - - ant externals - ant update-externals - -These tests take time, so we have a parallelized runner for them that -takes advantage of all processor cores on the computer: - - cd nashorn~jdk9/nashorn/make - ant test262parallel - -- How to write your own test? - -Nashorn uses it's own simple test framework. Any .js file dropped under -nashorn/test directory is considered as a test. A test file can -optionally have .js.EXPECTED (foo.js.EXPECTED for foo.js) associated -with it. The .EXPECTED file, if exists, should contain the output -expected from compiling and/or running the test file. - -The test runner crawls these directories for .js files and looks for -JTReg-style @foo comments to identify tests. - - * @test - A test is tagged with @test. - - * @test/fail - Tests that are supposed to fail (compiling, see @run/fail - for runtime) are tagged with @test/fail. - - * @test/compile-error - Test expects compilation to fail, compares - output. - - * @test/warning - Test expects compiler warnings, compares output. - - * @test/nocompare - Test expects to compile [and/or run?] - successfully(may be warnings), does not compare output. - - * @subtest - denotes necessary file for a main test file; itself is not - a test. - - * @run - A test that should be run is also tagged with @run (otherwise - the test runner only compiles the test). - - * @run/fail - A test that should compile but fail with a runtime error. - - * @run/ignore-std-error - script may produce output on stderr, ignore - this output. - - * @argument - pass an argument to script. - - * @option \ - pass option to engine, sample. - -/** - * @option --dump-ir-graph - * @test - */ diff --git a/jdk/src/bsd/doc/man/DO_NOT_EDIT--GENERATED_FILES b/src/bsd/doc/man/DO_NOT_EDIT--GENERATED_FILES similarity index 100% rename from jdk/src/bsd/doc/man/DO_NOT_EDIT--GENERATED_FILES rename to src/bsd/doc/man/DO_NOT_EDIT--GENERATED_FILES diff --git a/jdk/src/bsd/doc/man/appletviewer.1 b/src/bsd/doc/man/appletviewer.1 similarity index 100% rename from jdk/src/bsd/doc/man/appletviewer.1 rename to src/bsd/doc/man/appletviewer.1 diff --git a/jdk/src/bsd/doc/man/apt.1 b/src/bsd/doc/man/apt.1 similarity index 100% rename from jdk/src/bsd/doc/man/apt.1 rename to src/bsd/doc/man/apt.1 diff --git a/jdk/src/bsd/doc/man/idlj.1 b/src/bsd/doc/man/idlj.1 similarity index 100% rename from jdk/src/bsd/doc/man/idlj.1 rename to src/bsd/doc/man/idlj.1 diff --git a/jdk/src/bsd/doc/man/ja/appletviewer.1 b/src/bsd/doc/man/ja/appletviewer.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/appletviewer.1 rename to src/bsd/doc/man/ja/appletviewer.1 diff --git a/jdk/src/bsd/doc/man/ja/apt.1 b/src/bsd/doc/man/ja/apt.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/apt.1 rename to src/bsd/doc/man/ja/apt.1 diff --git a/jdk/src/bsd/doc/man/ja/idlj.1 b/src/bsd/doc/man/ja/idlj.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/idlj.1 rename to src/bsd/doc/man/ja/idlj.1 diff --git a/jdk/src/bsd/doc/man/ja/jar.1 b/src/bsd/doc/man/ja/jar.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jar.1 rename to src/bsd/doc/man/ja/jar.1 diff --git a/jdk/src/bsd/doc/man/ja/jarsigner.1 b/src/bsd/doc/man/ja/jarsigner.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jarsigner.1 rename to src/bsd/doc/man/ja/jarsigner.1 diff --git a/jdk/src/bsd/doc/man/ja/java.1 b/src/bsd/doc/man/ja/java.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/java.1 rename to src/bsd/doc/man/ja/java.1 diff --git a/jdk/src/bsd/doc/man/ja/javac.1 b/src/bsd/doc/man/ja/javac.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/javac.1 rename to src/bsd/doc/man/ja/javac.1 diff --git a/jdk/src/bsd/doc/man/ja/javadoc.1 b/src/bsd/doc/man/ja/javadoc.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/javadoc.1 rename to src/bsd/doc/man/ja/javadoc.1 diff --git a/jdk/src/bsd/doc/man/ja/javah.1 b/src/bsd/doc/man/ja/javah.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/javah.1 rename to src/bsd/doc/man/ja/javah.1 diff --git a/jdk/src/bsd/doc/man/ja/javap.1 b/src/bsd/doc/man/ja/javap.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/javap.1 rename to src/bsd/doc/man/ja/javap.1 diff --git a/jdk/src/bsd/doc/man/ja/javaws.1 b/src/bsd/doc/man/ja/javaws.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/javaws.1 rename to src/bsd/doc/man/ja/javaws.1 diff --git a/jdk/src/bsd/doc/man/ja/jcmd.1 b/src/bsd/doc/man/ja/jcmd.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jcmd.1 rename to src/bsd/doc/man/ja/jcmd.1 diff --git a/jdk/src/bsd/doc/man/ja/jconsole.1 b/src/bsd/doc/man/ja/jconsole.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jconsole.1 rename to src/bsd/doc/man/ja/jconsole.1 diff --git a/jdk/src/bsd/doc/man/ja/jdb.1 b/src/bsd/doc/man/ja/jdb.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jdb.1 rename to src/bsd/doc/man/ja/jdb.1 diff --git a/jdk/src/bsd/doc/man/ja/jdeps.1 b/src/bsd/doc/man/ja/jdeps.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jdeps.1 rename to src/bsd/doc/man/ja/jdeps.1 diff --git a/jdk/src/bsd/doc/man/ja/jhat.1 b/src/bsd/doc/man/ja/jhat.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jhat.1 rename to src/bsd/doc/man/ja/jhat.1 diff --git a/jdk/src/bsd/doc/man/ja/jinfo.1 b/src/bsd/doc/man/ja/jinfo.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jinfo.1 rename to src/bsd/doc/man/ja/jinfo.1 diff --git a/jdk/src/bsd/doc/man/ja/jjs.1 b/src/bsd/doc/man/ja/jjs.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jjs.1 rename to src/bsd/doc/man/ja/jjs.1 diff --git a/jdk/src/bsd/doc/man/ja/jmap.1 b/src/bsd/doc/man/ja/jmap.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jmap.1 rename to src/bsd/doc/man/ja/jmap.1 diff --git a/jdk/src/bsd/doc/man/ja/jps.1 b/src/bsd/doc/man/ja/jps.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jps.1 rename to src/bsd/doc/man/ja/jps.1 diff --git a/jdk/src/bsd/doc/man/ja/jrunscript.1 b/src/bsd/doc/man/ja/jrunscript.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jrunscript.1 rename to src/bsd/doc/man/ja/jrunscript.1 diff --git a/jdk/src/bsd/doc/man/ja/jsadebugd.1 b/src/bsd/doc/man/ja/jsadebugd.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jsadebugd.1 rename to src/bsd/doc/man/ja/jsadebugd.1 diff --git a/jdk/src/bsd/doc/man/ja/jstack.1 b/src/bsd/doc/man/ja/jstack.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jstack.1 rename to src/bsd/doc/man/ja/jstack.1 diff --git a/jdk/src/bsd/doc/man/ja/jstat.1 b/src/bsd/doc/man/ja/jstat.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jstat.1 rename to src/bsd/doc/man/ja/jstat.1 diff --git a/jdk/src/bsd/doc/man/ja/jstatd.1 b/src/bsd/doc/man/ja/jstatd.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/jstatd.1 rename to src/bsd/doc/man/ja/jstatd.1 diff --git a/jdk/src/bsd/doc/man/ja/keytool.1 b/src/bsd/doc/man/ja/keytool.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/keytool.1 rename to src/bsd/doc/man/ja/keytool.1 diff --git a/jdk/src/bsd/doc/man/ja/orbd.1 b/src/bsd/doc/man/ja/orbd.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/orbd.1 rename to src/bsd/doc/man/ja/orbd.1 diff --git a/jdk/src/bsd/doc/man/ja/pack200.1 b/src/bsd/doc/man/ja/pack200.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/pack200.1 rename to src/bsd/doc/man/ja/pack200.1 diff --git a/jdk/src/bsd/doc/man/ja/policytool.1 b/src/bsd/doc/man/ja/policytool.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/policytool.1 rename to src/bsd/doc/man/ja/policytool.1 diff --git a/jdk/src/bsd/doc/man/ja/rmic.1 b/src/bsd/doc/man/ja/rmic.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/rmic.1 rename to src/bsd/doc/man/ja/rmic.1 diff --git a/jdk/src/bsd/doc/man/ja/rmid.1 b/src/bsd/doc/man/ja/rmid.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/rmid.1 rename to src/bsd/doc/man/ja/rmid.1 diff --git a/jdk/src/bsd/doc/man/ja/rmiregistry.1 b/src/bsd/doc/man/ja/rmiregistry.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/rmiregistry.1 rename to src/bsd/doc/man/ja/rmiregistry.1 diff --git a/jdk/src/bsd/doc/man/ja/schemagen.1 b/src/bsd/doc/man/ja/schemagen.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/schemagen.1 rename to src/bsd/doc/man/ja/schemagen.1 diff --git a/jdk/src/bsd/doc/man/ja/serialver.1 b/src/bsd/doc/man/ja/serialver.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/serialver.1 rename to src/bsd/doc/man/ja/serialver.1 diff --git a/jdk/src/bsd/doc/man/ja/servertool.1 b/src/bsd/doc/man/ja/servertool.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/servertool.1 rename to src/bsd/doc/man/ja/servertool.1 diff --git a/jdk/src/bsd/doc/man/ja/tnameserv.1 b/src/bsd/doc/man/ja/tnameserv.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/tnameserv.1 rename to src/bsd/doc/man/ja/tnameserv.1 diff --git a/jdk/src/bsd/doc/man/ja/unpack200.1 b/src/bsd/doc/man/ja/unpack200.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/unpack200.1 rename to src/bsd/doc/man/ja/unpack200.1 diff --git a/jdk/src/bsd/doc/man/ja/wsgen.1 b/src/bsd/doc/man/ja/wsgen.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/wsgen.1 rename to src/bsd/doc/man/ja/wsgen.1 diff --git a/jdk/src/bsd/doc/man/ja/wsimport.1 b/src/bsd/doc/man/ja/wsimport.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/wsimport.1 rename to src/bsd/doc/man/ja/wsimport.1 diff --git a/jdk/src/bsd/doc/man/ja/xjc.1 b/src/bsd/doc/man/ja/xjc.1 similarity index 100% rename from jdk/src/bsd/doc/man/ja/xjc.1 rename to src/bsd/doc/man/ja/xjc.1 diff --git a/jdk/src/bsd/doc/man/jar.1 b/src/bsd/doc/man/jar.1 similarity index 100% rename from jdk/src/bsd/doc/man/jar.1 rename to src/bsd/doc/man/jar.1 diff --git a/jdk/src/bsd/doc/man/jarsigner.1 b/src/bsd/doc/man/jarsigner.1 similarity index 100% rename from jdk/src/bsd/doc/man/jarsigner.1 rename to src/bsd/doc/man/jarsigner.1 diff --git a/jdk/src/bsd/doc/man/java.1 b/src/bsd/doc/man/java.1 similarity index 100% rename from jdk/src/bsd/doc/man/java.1 rename to src/bsd/doc/man/java.1 diff --git a/jdk/src/bsd/doc/man/javac.1 b/src/bsd/doc/man/javac.1 similarity index 100% rename from jdk/src/bsd/doc/man/javac.1 rename to src/bsd/doc/man/javac.1 diff --git a/jdk/src/bsd/doc/man/javadoc.1 b/src/bsd/doc/man/javadoc.1 similarity index 100% rename from jdk/src/bsd/doc/man/javadoc.1 rename to src/bsd/doc/man/javadoc.1 diff --git a/jdk/src/bsd/doc/man/javah.1 b/src/bsd/doc/man/javah.1 similarity index 100% rename from jdk/src/bsd/doc/man/javah.1 rename to src/bsd/doc/man/javah.1 diff --git a/jdk/src/bsd/doc/man/javap.1 b/src/bsd/doc/man/javap.1 similarity index 100% rename from jdk/src/bsd/doc/man/javap.1 rename to src/bsd/doc/man/javap.1 diff --git a/jdk/src/bsd/doc/man/javaws.1 b/src/bsd/doc/man/javaws.1 similarity index 100% rename from jdk/src/bsd/doc/man/javaws.1 rename to src/bsd/doc/man/javaws.1 diff --git a/jdk/src/bsd/doc/man/jcmd.1 b/src/bsd/doc/man/jcmd.1 similarity index 100% rename from jdk/src/bsd/doc/man/jcmd.1 rename to src/bsd/doc/man/jcmd.1 diff --git a/jdk/src/bsd/doc/man/jconsole.1 b/src/bsd/doc/man/jconsole.1 similarity index 100% rename from jdk/src/bsd/doc/man/jconsole.1 rename to src/bsd/doc/man/jconsole.1 diff --git a/jdk/src/bsd/doc/man/jdb.1 b/src/bsd/doc/man/jdb.1 similarity index 100% rename from jdk/src/bsd/doc/man/jdb.1 rename to src/bsd/doc/man/jdb.1 diff --git a/jdk/src/bsd/doc/man/jdeps.1 b/src/bsd/doc/man/jdeps.1 similarity index 100% rename from jdk/src/bsd/doc/man/jdeps.1 rename to src/bsd/doc/man/jdeps.1 diff --git a/jdk/src/bsd/doc/man/jhat.1 b/src/bsd/doc/man/jhat.1 similarity index 100% rename from jdk/src/bsd/doc/man/jhat.1 rename to src/bsd/doc/man/jhat.1 diff --git a/jdk/src/bsd/doc/man/jinfo.1 b/src/bsd/doc/man/jinfo.1 similarity index 100% rename from jdk/src/bsd/doc/man/jinfo.1 rename to src/bsd/doc/man/jinfo.1 diff --git a/jdk/src/bsd/doc/man/jjs.1 b/src/bsd/doc/man/jjs.1 similarity index 100% rename from jdk/src/bsd/doc/man/jjs.1 rename to src/bsd/doc/man/jjs.1 diff --git a/jdk/src/bsd/doc/man/jmap.1 b/src/bsd/doc/man/jmap.1 similarity index 100% rename from jdk/src/bsd/doc/man/jmap.1 rename to src/bsd/doc/man/jmap.1 diff --git a/jdk/src/bsd/doc/man/jps.1 b/src/bsd/doc/man/jps.1 similarity index 100% rename from jdk/src/bsd/doc/man/jps.1 rename to src/bsd/doc/man/jps.1 diff --git a/jdk/src/bsd/doc/man/jrunscript.1 b/src/bsd/doc/man/jrunscript.1 similarity index 100% rename from jdk/src/bsd/doc/man/jrunscript.1 rename to src/bsd/doc/man/jrunscript.1 diff --git a/jdk/src/bsd/doc/man/jsadebugd.1 b/src/bsd/doc/man/jsadebugd.1 similarity index 100% rename from jdk/src/bsd/doc/man/jsadebugd.1 rename to src/bsd/doc/man/jsadebugd.1 diff --git a/jdk/src/bsd/doc/man/jstack.1 b/src/bsd/doc/man/jstack.1 similarity index 100% rename from jdk/src/bsd/doc/man/jstack.1 rename to src/bsd/doc/man/jstack.1 diff --git a/jdk/src/bsd/doc/man/jstat.1 b/src/bsd/doc/man/jstat.1 similarity index 100% rename from jdk/src/bsd/doc/man/jstat.1 rename to src/bsd/doc/man/jstat.1 diff --git a/jdk/src/bsd/doc/man/jstatd.1 b/src/bsd/doc/man/jstatd.1 similarity index 100% rename from jdk/src/bsd/doc/man/jstatd.1 rename to src/bsd/doc/man/jstatd.1 diff --git a/jdk/src/bsd/doc/man/keytool.1 b/src/bsd/doc/man/keytool.1 similarity index 100% rename from jdk/src/bsd/doc/man/keytool.1 rename to src/bsd/doc/man/keytool.1 diff --git a/jdk/src/bsd/doc/man/orbd.1 b/src/bsd/doc/man/orbd.1 similarity index 100% rename from jdk/src/bsd/doc/man/orbd.1 rename to src/bsd/doc/man/orbd.1 diff --git a/jdk/src/bsd/doc/man/pack200.1 b/src/bsd/doc/man/pack200.1 similarity index 100% rename from jdk/src/bsd/doc/man/pack200.1 rename to src/bsd/doc/man/pack200.1 diff --git a/jdk/src/bsd/doc/man/policytool.1 b/src/bsd/doc/man/policytool.1 similarity index 100% rename from jdk/src/bsd/doc/man/policytool.1 rename to src/bsd/doc/man/policytool.1 diff --git a/jdk/src/bsd/doc/man/rmic.1 b/src/bsd/doc/man/rmic.1 similarity index 100% rename from jdk/src/bsd/doc/man/rmic.1 rename to src/bsd/doc/man/rmic.1 diff --git a/jdk/src/bsd/doc/man/rmid.1 b/src/bsd/doc/man/rmid.1 similarity index 100% rename from jdk/src/bsd/doc/man/rmid.1 rename to src/bsd/doc/man/rmid.1 diff --git a/jdk/src/bsd/doc/man/rmiregistry.1 b/src/bsd/doc/man/rmiregistry.1 similarity index 100% rename from jdk/src/bsd/doc/man/rmiregistry.1 rename to src/bsd/doc/man/rmiregistry.1 diff --git a/jdk/src/bsd/doc/man/schemagen.1 b/src/bsd/doc/man/schemagen.1 similarity index 100% rename from jdk/src/bsd/doc/man/schemagen.1 rename to src/bsd/doc/man/schemagen.1 diff --git a/jdk/src/bsd/doc/man/serialver.1 b/src/bsd/doc/man/serialver.1 similarity index 100% rename from jdk/src/bsd/doc/man/serialver.1 rename to src/bsd/doc/man/serialver.1 diff --git a/jdk/src/bsd/doc/man/servertool.1 b/src/bsd/doc/man/servertool.1 similarity index 100% rename from jdk/src/bsd/doc/man/servertool.1 rename to src/bsd/doc/man/servertool.1 diff --git a/jdk/src/bsd/doc/man/tnameserv.1 b/src/bsd/doc/man/tnameserv.1 similarity index 100% rename from jdk/src/bsd/doc/man/tnameserv.1 rename to src/bsd/doc/man/tnameserv.1 diff --git a/jdk/src/bsd/doc/man/unpack200.1 b/src/bsd/doc/man/unpack200.1 similarity index 100% rename from jdk/src/bsd/doc/man/unpack200.1 rename to src/bsd/doc/man/unpack200.1 diff --git a/jdk/src/bsd/doc/man/wsgen.1 b/src/bsd/doc/man/wsgen.1 similarity index 100% rename from jdk/src/bsd/doc/man/wsgen.1 rename to src/bsd/doc/man/wsgen.1 diff --git a/jdk/src/bsd/doc/man/wsimport.1 b/src/bsd/doc/man/wsimport.1 similarity index 100% rename from jdk/src/bsd/doc/man/wsimport.1 rename to src/bsd/doc/man/wsimport.1 diff --git a/jdk/src/bsd/doc/man/xjc.1 b/src/bsd/doc/man/xjc.1 similarity index 100% rename from jdk/src/bsd/doc/man/xjc.1 rename to src/bsd/doc/man/xjc.1 diff --git a/jdk/src/demo/share/README b/src/demo/share/README similarity index 100% rename from jdk/src/demo/share/README rename to src/demo/share/README diff --git a/jdk/src/demo/share/applets.html b/src/demo/share/applets.html similarity index 100% rename from jdk/src/demo/share/applets.html rename to src/demo/share/applets.html diff --git a/jdk/src/demo/share/applets/ArcTest/ArcTest.java b/src/demo/share/applets/ArcTest/ArcTest.java similarity index 100% rename from jdk/src/demo/share/applets/ArcTest/ArcTest.java rename to src/demo/share/applets/ArcTest/ArcTest.java diff --git a/jdk/src/demo/share/applets/ArcTest/example1.html b/src/demo/share/applets/ArcTest/example1.html similarity index 100% rename from jdk/src/demo/share/applets/ArcTest/example1.html rename to src/demo/share/applets/ArcTest/example1.html diff --git a/jdk/src/demo/share/applets/BarChart/BarChart.java b/src/demo/share/applets/BarChart/BarChart.java similarity index 100% rename from jdk/src/demo/share/applets/BarChart/BarChart.java rename to src/demo/share/applets/BarChart/BarChart.java diff --git a/jdk/src/demo/share/applets/BarChart/example1.html b/src/demo/share/applets/BarChart/example1.html similarity index 100% rename from jdk/src/demo/share/applets/BarChart/example1.html rename to src/demo/share/applets/BarChart/example1.html diff --git a/jdk/src/demo/share/applets/BarChart/example2.html b/src/demo/share/applets/BarChart/example2.html similarity index 100% rename from jdk/src/demo/share/applets/BarChart/example2.html rename to src/demo/share/applets/BarChart/example2.html diff --git a/jdk/src/demo/share/applets/Blink/Blink.java b/src/demo/share/applets/Blink/Blink.java similarity index 100% rename from jdk/src/demo/share/applets/Blink/Blink.java rename to src/demo/share/applets/Blink/Blink.java diff --git a/jdk/src/demo/share/applets/Blink/example1.html b/src/demo/share/applets/Blink/example1.html similarity index 100% rename from jdk/src/demo/share/applets/Blink/example1.html rename to src/demo/share/applets/Blink/example1.html diff --git a/jdk/src/demo/share/applets/CardTest/CardTest.java b/src/demo/share/applets/CardTest/CardTest.java similarity index 100% rename from jdk/src/demo/share/applets/CardTest/CardTest.java rename to src/demo/share/applets/CardTest/CardTest.java diff --git a/jdk/src/demo/share/applets/CardTest/example1.html b/src/demo/share/applets/CardTest/example1.html similarity index 100% rename from jdk/src/demo/share/applets/CardTest/example1.html rename to src/demo/share/applets/CardTest/example1.html diff --git a/jdk/src/demo/share/applets/Clock/Clock.java b/src/demo/share/applets/Clock/Clock.java similarity index 100% rename from jdk/src/demo/share/applets/Clock/Clock.java rename to src/demo/share/applets/Clock/Clock.java diff --git a/jdk/src/demo/share/applets/Clock/example1.html b/src/demo/share/applets/Clock/example1.html similarity index 100% rename from jdk/src/demo/share/applets/Clock/example1.html rename to src/demo/share/applets/Clock/example1.html diff --git a/jdk/src/demo/share/applets/DitherTest/DitherTest.java b/src/demo/share/applets/DitherTest/DitherTest.java similarity index 100% rename from jdk/src/demo/share/applets/DitherTest/DitherTest.java rename to src/demo/share/applets/DitherTest/DitherTest.java diff --git a/jdk/src/demo/share/applets/DitherTest/example1.html b/src/demo/share/applets/DitherTest/example1.html similarity index 100% rename from jdk/src/demo/share/applets/DitherTest/example1.html rename to src/demo/share/applets/DitherTest/example1.html diff --git a/jdk/src/demo/share/applets/DrawTest/DrawTest.java b/src/demo/share/applets/DrawTest/DrawTest.java similarity index 100% rename from jdk/src/demo/share/applets/DrawTest/DrawTest.java rename to src/demo/share/applets/DrawTest/DrawTest.java diff --git a/jdk/src/demo/share/applets/DrawTest/example1.html b/src/demo/share/applets/DrawTest/example1.html similarity index 100% rename from jdk/src/demo/share/applets/DrawTest/example1.html rename to src/demo/share/applets/DrawTest/example1.html diff --git a/jdk/src/demo/share/applets/Fractal/CLSFractal.java b/src/demo/share/applets/Fractal/CLSFractal.java similarity index 100% rename from jdk/src/demo/share/applets/Fractal/CLSFractal.java rename to src/demo/share/applets/Fractal/CLSFractal.java diff --git a/jdk/src/demo/share/applets/Fractal/example1.html b/src/demo/share/applets/Fractal/example1.html similarity index 100% rename from jdk/src/demo/share/applets/Fractal/example1.html rename to src/demo/share/applets/Fractal/example1.html diff --git a/jdk/src/demo/share/applets/GraphicsTest/AppletFrame.java b/src/demo/share/applets/GraphicsTest/AppletFrame.java similarity index 100% rename from jdk/src/demo/share/applets/GraphicsTest/AppletFrame.java rename to src/demo/share/applets/GraphicsTest/AppletFrame.java diff --git a/jdk/src/demo/share/applets/GraphicsTest/GraphicsTest.java b/src/demo/share/applets/GraphicsTest/GraphicsTest.java similarity index 100% rename from jdk/src/demo/share/applets/GraphicsTest/GraphicsTest.java rename to src/demo/share/applets/GraphicsTest/GraphicsTest.java diff --git a/jdk/src/demo/share/applets/GraphicsTest/example1.html b/src/demo/share/applets/GraphicsTest/example1.html similarity index 100% rename from jdk/src/demo/share/applets/GraphicsTest/example1.html rename to src/demo/share/applets/GraphicsTest/example1.html diff --git a/jdk/src/demo/share/applets/MoleculeViewer/Matrix3D.java b/src/demo/share/applets/MoleculeViewer/Matrix3D.java similarity index 100% rename from jdk/src/demo/share/applets/MoleculeViewer/Matrix3D.java rename to src/demo/share/applets/MoleculeViewer/Matrix3D.java diff --git a/jdk/src/demo/share/applets/MoleculeViewer/XYZApp.java b/src/demo/share/applets/MoleculeViewer/XYZApp.java similarity index 100% rename from jdk/src/demo/share/applets/MoleculeViewer/XYZApp.java rename to src/demo/share/applets/MoleculeViewer/XYZApp.java diff --git a/jdk/src/demo/share/applets/MoleculeViewer/example1.html b/src/demo/share/applets/MoleculeViewer/example1.html similarity index 100% rename from jdk/src/demo/share/applets/MoleculeViewer/example1.html rename to src/demo/share/applets/MoleculeViewer/example1.html diff --git a/jdk/src/demo/share/applets/MoleculeViewer/example2.html b/src/demo/share/applets/MoleculeViewer/example2.html similarity index 100% rename from jdk/src/demo/share/applets/MoleculeViewer/example2.html rename to src/demo/share/applets/MoleculeViewer/example2.html diff --git a/jdk/src/demo/share/applets/MoleculeViewer/example3.html b/src/demo/share/applets/MoleculeViewer/example3.html similarity index 100% rename from jdk/src/demo/share/applets/MoleculeViewer/example3.html rename to src/demo/share/applets/MoleculeViewer/example3.html diff --git a/jdk/src/demo/share/applets/MoleculeViewer/models/HyaluronicAcid.xyz b/src/demo/share/applets/MoleculeViewer/models/HyaluronicAcid.xyz similarity index 100% rename from jdk/src/demo/share/applets/MoleculeViewer/models/HyaluronicAcid.xyz rename to src/demo/share/applets/MoleculeViewer/models/HyaluronicAcid.xyz diff --git a/jdk/src/demo/share/applets/MoleculeViewer/models/benzene.xyz b/src/demo/share/applets/MoleculeViewer/models/benzene.xyz similarity index 100% rename from jdk/src/demo/share/applets/MoleculeViewer/models/benzene.xyz rename to src/demo/share/applets/MoleculeViewer/models/benzene.xyz diff --git a/jdk/src/demo/share/applets/MoleculeViewer/models/buckminsterfullerine.xyz b/src/demo/share/applets/MoleculeViewer/models/buckminsterfullerine.xyz similarity index 100% rename from jdk/src/demo/share/applets/MoleculeViewer/models/buckminsterfullerine.xyz rename to src/demo/share/applets/MoleculeViewer/models/buckminsterfullerine.xyz diff --git a/jdk/src/demo/share/applets/MoleculeViewer/models/cyclohexane.xyz b/src/demo/share/applets/MoleculeViewer/models/cyclohexane.xyz similarity index 100% rename from jdk/src/demo/share/applets/MoleculeViewer/models/cyclohexane.xyz rename to src/demo/share/applets/MoleculeViewer/models/cyclohexane.xyz diff --git a/jdk/src/demo/share/applets/MoleculeViewer/models/ethane.xyz b/src/demo/share/applets/MoleculeViewer/models/ethane.xyz similarity index 100% rename from jdk/src/demo/share/applets/MoleculeViewer/models/ethane.xyz rename to src/demo/share/applets/MoleculeViewer/models/ethane.xyz diff --git a/jdk/src/demo/share/applets/MoleculeViewer/models/water.xyz b/src/demo/share/applets/MoleculeViewer/models/water.xyz similarity index 100% rename from jdk/src/demo/share/applets/MoleculeViewer/models/water.xyz rename to src/demo/share/applets/MoleculeViewer/models/water.xyz diff --git a/jdk/src/demo/share/applets/NervousText/NervousText.java b/src/demo/share/applets/NervousText/NervousText.java similarity index 100% rename from jdk/src/demo/share/applets/NervousText/NervousText.java rename to src/demo/share/applets/NervousText/NervousText.java diff --git a/jdk/src/demo/share/applets/NervousText/example1.html b/src/demo/share/applets/NervousText/example1.html similarity index 100% rename from jdk/src/demo/share/applets/NervousText/example1.html rename to src/demo/share/applets/NervousText/example1.html diff --git a/jdk/src/demo/share/applets/SimpleGraph/GraphApplet.java b/src/demo/share/applets/SimpleGraph/GraphApplet.java similarity index 100% rename from jdk/src/demo/share/applets/SimpleGraph/GraphApplet.java rename to src/demo/share/applets/SimpleGraph/GraphApplet.java diff --git a/jdk/src/demo/share/applets/SimpleGraph/example1.html b/src/demo/share/applets/SimpleGraph/example1.html similarity index 100% rename from jdk/src/demo/share/applets/SimpleGraph/example1.html rename to src/demo/share/applets/SimpleGraph/example1.html diff --git a/jdk/src/demo/share/applets/SortDemo/BidirBubbleSortAlgorithm.java b/src/demo/share/applets/SortDemo/BidirBubbleSortAlgorithm.java similarity index 100% rename from jdk/src/demo/share/applets/SortDemo/BidirBubbleSortAlgorithm.java rename to src/demo/share/applets/SortDemo/BidirBubbleSortAlgorithm.java diff --git a/jdk/src/demo/share/applets/SortDemo/BubbleSortAlgorithm.java b/src/demo/share/applets/SortDemo/BubbleSortAlgorithm.java similarity index 100% rename from jdk/src/demo/share/applets/SortDemo/BubbleSortAlgorithm.java rename to src/demo/share/applets/SortDemo/BubbleSortAlgorithm.java diff --git a/jdk/src/demo/share/applets/SortDemo/QSortAlgorithm.java b/src/demo/share/applets/SortDemo/QSortAlgorithm.java similarity index 100% rename from jdk/src/demo/share/applets/SortDemo/QSortAlgorithm.java rename to src/demo/share/applets/SortDemo/QSortAlgorithm.java diff --git a/jdk/src/demo/share/applets/SortDemo/SortAlgorithm.java b/src/demo/share/applets/SortDemo/SortAlgorithm.java similarity index 100% rename from jdk/src/demo/share/applets/SortDemo/SortAlgorithm.java rename to src/demo/share/applets/SortDemo/SortAlgorithm.java diff --git a/jdk/src/demo/share/applets/SortDemo/SortItem.java b/src/demo/share/applets/SortDemo/SortItem.java similarity index 100% rename from jdk/src/demo/share/applets/SortDemo/SortItem.java rename to src/demo/share/applets/SortDemo/SortItem.java diff --git a/jdk/src/demo/share/applets/SortDemo/example1.html b/src/demo/share/applets/SortDemo/example1.html similarity index 100% rename from jdk/src/demo/share/applets/SortDemo/example1.html rename to src/demo/share/applets/SortDemo/example1.html diff --git a/jdk/src/demo/share/applets/SpreadSheet/SpreadSheet.java b/src/demo/share/applets/SpreadSheet/SpreadSheet.java similarity index 100% rename from jdk/src/demo/share/applets/SpreadSheet/SpreadSheet.java rename to src/demo/share/applets/SpreadSheet/SpreadSheet.java diff --git a/jdk/src/demo/share/applets/SpreadSheet/example1.html b/src/demo/share/applets/SpreadSheet/example1.html similarity index 100% rename from jdk/src/demo/share/applets/SpreadSheet/example1.html rename to src/demo/share/applets/SpreadSheet/example1.html diff --git a/jdk/src/demo/share/applets/WireFrame/Matrix3D.java b/src/demo/share/applets/WireFrame/Matrix3D.java similarity index 100% rename from jdk/src/demo/share/applets/WireFrame/Matrix3D.java rename to src/demo/share/applets/WireFrame/Matrix3D.java diff --git a/jdk/src/demo/share/applets/WireFrame/ThreeD.java b/src/demo/share/applets/WireFrame/ThreeD.java similarity index 100% rename from jdk/src/demo/share/applets/WireFrame/ThreeD.java rename to src/demo/share/applets/WireFrame/ThreeD.java diff --git a/jdk/src/demo/share/applets/WireFrame/example1.html b/src/demo/share/applets/WireFrame/example1.html similarity index 100% rename from jdk/src/demo/share/applets/WireFrame/example1.html rename to src/demo/share/applets/WireFrame/example1.html diff --git a/jdk/src/demo/share/applets/WireFrame/example2.html b/src/demo/share/applets/WireFrame/example2.html similarity index 100% rename from jdk/src/demo/share/applets/WireFrame/example2.html rename to src/demo/share/applets/WireFrame/example2.html diff --git a/jdk/src/demo/share/applets/WireFrame/example3.html b/src/demo/share/applets/WireFrame/example3.html similarity index 100% rename from jdk/src/demo/share/applets/WireFrame/example3.html rename to src/demo/share/applets/WireFrame/example3.html diff --git a/jdk/src/demo/share/applets/WireFrame/example4.html b/src/demo/share/applets/WireFrame/example4.html similarity index 100% rename from jdk/src/demo/share/applets/WireFrame/example4.html rename to src/demo/share/applets/WireFrame/example4.html diff --git a/jdk/src/demo/share/applets/WireFrame/models/cube.obj b/src/demo/share/applets/WireFrame/models/cube.obj similarity index 100% rename from jdk/src/demo/share/applets/WireFrame/models/cube.obj rename to src/demo/share/applets/WireFrame/models/cube.obj diff --git a/jdk/src/demo/share/applets/WireFrame/models/dinasaur.obj b/src/demo/share/applets/WireFrame/models/dinasaur.obj similarity index 100% rename from jdk/src/demo/share/applets/WireFrame/models/dinasaur.obj rename to src/demo/share/applets/WireFrame/models/dinasaur.obj diff --git a/jdk/src/demo/share/applets/WireFrame/models/hughes_500.obj b/src/demo/share/applets/WireFrame/models/hughes_500.obj similarity index 100% rename from jdk/src/demo/share/applets/WireFrame/models/hughes_500.obj rename to src/demo/share/applets/WireFrame/models/hughes_500.obj diff --git a/jdk/src/demo/share/applets/WireFrame/models/knoxS.obj b/src/demo/share/applets/WireFrame/models/knoxS.obj similarity index 100% rename from jdk/src/demo/share/applets/WireFrame/models/knoxS.obj rename to src/demo/share/applets/WireFrame/models/knoxS.obj diff --git a/jdk/src/demo/share/java2d/J2DBench/Makefile b/src/demo/share/java2d/J2DBench/Makefile similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/Makefile rename to src/demo/share/java2d/J2DBench/Makefile diff --git a/jdk/src/demo/share/java2d/J2DBench/README b/src/demo/share/java2d/J2DBench/README similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/README rename to src/demo/share/java2d/J2DBench/README diff --git a/jdk/src/demo/share/java2d/J2DBench/build.xml b/src/demo/share/java2d/J2DBench/build.xml similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/build.xml rename to src/demo/share/java2d/J2DBench/build.xml diff --git a/jdk/src/demo/share/java2d/J2DBench/nbproject/project.xml b/src/demo/share/java2d/J2DBench/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/nbproject/project.xml rename to src/demo/share/java2d/J2DBench/nbproject/project.xml diff --git a/jdk/src/demo/share/java2d/J2DBench/options/default.opt b/src/demo/share/java2d/J2DBench/options/default.opt similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/options/default.opt rename to src/demo/share/java2d/J2DBench/options/default.opt diff --git a/jdk/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg b/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg rename to src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg diff --git a/jdk/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg b/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg rename to src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg diff --git a/jdk/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg b/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg rename to src/demo/share/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg diff --git a/jdk/src/demo/share/java2d/J2DBench/resources/images/photo.jpg b/src/demo/share/java2d/J2DBench/resources/images/photo.jpg similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/resources/images/photo.jpg rename to src/demo/share/java2d/J2DBench/resources/images/photo.jpg diff --git a/jdk/src/demo/share/java2d/J2DBench/resources/textdata/arabic.ut8.txt b/src/demo/share/java2d/J2DBench/resources/textdata/arabic.ut8.txt similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/resources/textdata/arabic.ut8.txt rename to src/demo/share/java2d/J2DBench/resources/textdata/arabic.ut8.txt diff --git a/jdk/src/demo/share/java2d/J2DBench/resources/textdata/english.ut8.txt b/src/demo/share/java2d/J2DBench/resources/textdata/english.ut8.txt similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/resources/textdata/english.ut8.txt rename to src/demo/share/java2d/J2DBench/resources/textdata/english.ut8.txt diff --git a/jdk/src/demo/share/java2d/J2DBench/resources/textdata/greek.ut8.txt b/src/demo/share/java2d/J2DBench/resources/textdata/greek.ut8.txt similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/resources/textdata/greek.ut8.txt rename to src/demo/share/java2d/J2DBench/resources/textdata/greek.ut8.txt diff --git a/jdk/src/demo/share/java2d/J2DBench/resources/textdata/hebrew.ut8.txt b/src/demo/share/java2d/J2DBench/resources/textdata/hebrew.ut8.txt similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/resources/textdata/hebrew.ut8.txt rename to src/demo/share/java2d/J2DBench/resources/textdata/hebrew.ut8.txt diff --git a/jdk/src/demo/share/java2d/J2DBench/resources/textdata/hindi.ut8.txt b/src/demo/share/java2d/J2DBench/resources/textdata/hindi.ut8.txt similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/resources/textdata/hindi.ut8.txt rename to src/demo/share/java2d/J2DBench/resources/textdata/hindi.ut8.txt diff --git a/jdk/src/demo/share/java2d/J2DBench/resources/textdata/japanese.ut8.txt b/src/demo/share/java2d/J2DBench/resources/textdata/japanese.ut8.txt similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/resources/textdata/japanese.ut8.txt rename to src/demo/share/java2d/J2DBench/resources/textdata/japanese.ut8.txt diff --git a/jdk/src/demo/share/java2d/J2DBench/resources/textdata/korean.ut8.txt b/src/demo/share/java2d/J2DBench/resources/textdata/korean.ut8.txt similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/resources/textdata/korean.ut8.txt rename to src/demo/share/java2d/J2DBench/resources/textdata/korean.ut8.txt diff --git a/jdk/src/demo/share/java2d/J2DBench/resources/textdata/thai.ut8.txt b/src/demo/share/java2d/J2DBench/resources/textdata/thai.ut8.txt similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/resources/textdata/thai.ut8.txt rename to src/demo/share/java2d/J2DBench/resources/textdata/thai.ut8.txt diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Destinations.java b/src/demo/share/java2d/J2DBench/src/j2dbench/Destinations.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Destinations.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/Destinations.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Group.java b/src/demo/share/java2d/J2DBench/src/j2dbench/Group.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Group.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/Group.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/J2DBench.java b/src/demo/share/java2d/J2DBench/src/j2dbench/J2DBench.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/J2DBench.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/J2DBench.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Modifier.java b/src/demo/share/java2d/J2DBench/src/j2dbench/Modifier.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Modifier.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/Modifier.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Node.java b/src/demo/share/java2d/J2DBench/src/j2dbench/Node.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Node.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/Node.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Option.java b/src/demo/share/java2d/J2DBench/src/j2dbench/Option.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Option.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/Option.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Result.java b/src/demo/share/java2d/J2DBench/src/j2dbench/Result.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Result.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/Result.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/ResultSet.java b/src/demo/share/java2d/J2DBench/src/j2dbench/ResultSet.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/ResultSet.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/ResultSet.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Test.java b/src/demo/share/java2d/J2DBench/src/j2dbench/Test.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/Test.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/Test.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/TestEnvironment.java b/src/demo/share/java2d/J2DBench/src/j2dbench/TestEnvironment.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/TestEnvironment.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/TestEnvironment.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java b/src/demo/share/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/IIOComparator.java b/src/demo/share/java2d/J2DBench/src/j2dbench/report/IIOComparator.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/IIOComparator.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/report/IIOComparator.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java b/src/demo/share/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java b/src/demo/share/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/ImageTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/ImageTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/ImageTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/ImageTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/MiscTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/MiscTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/MiscTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/MiscTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/PixelTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/PixelTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/PixelTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/PixelTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/RenderTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/RenderTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/RenderTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/RenderTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/CMMTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/CMMTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/CMMTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/CMMTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConvertOpTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConvertOpTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConvertOpTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConvertOpTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/DataConversionTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/DataConversionTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/DataConversionTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/DataConversionTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ProfileTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ProfileTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ProfileTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ProfileTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/IIOTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/IIOTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/IIOTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/IIOTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/InputTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputStreamTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputStreamTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputStreamTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputStreamTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/iio/OutputTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextConstructionTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextConstructionTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextConstructionTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextConstructionTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextRenderTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextRenderTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextRenderTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextRenderTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/ui/CompactLayout.java b/src/demo/share/java2d/J2DBench/src/j2dbench/ui/CompactLayout.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/ui/CompactLayout.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/ui/CompactLayout.java diff --git a/jdk/src/demo/share/java2d/J2DBench/src/j2dbench/ui/EnableButton.java b/src/demo/share/java2d/J2DBench/src/j2dbench/ui/EnableButton.java similarity index 100% rename from jdk/src/demo/share/java2d/J2DBench/src/j2dbench/ui/EnableButton.java rename to src/demo/share/java2d/J2DBench/src/j2dbench/ui/EnableButton.java diff --git a/jdk/src/demo/share/jfc/CodePointIM/CodePointIM.java b/src/demo/share/jfc/CodePointIM/CodePointIM.java similarity index 100% rename from jdk/src/demo/share/jfc/CodePointIM/CodePointIM.java rename to src/demo/share/jfc/CodePointIM/CodePointIM.java diff --git a/jdk/src/demo/share/jfc/CodePointIM/README.html b/src/demo/share/jfc/CodePointIM/README.html similarity index 100% rename from jdk/src/demo/share/jfc/CodePointIM/README.html rename to src/demo/share/jfc/CodePointIM/README.html diff --git a/jdk/src/demo/share/jfc/CodePointIM/README_ja.html b/src/demo/share/jfc/CodePointIM/README_ja.html similarity index 100% rename from jdk/src/demo/share/jfc/CodePointIM/README_ja.html rename to src/demo/share/jfc/CodePointIM/README_ja.html diff --git a/jdk/src/demo/share/jfc/CodePointIM/README_zh_CN.html b/src/demo/share/jfc/CodePointIM/README_zh_CN.html similarity index 100% rename from jdk/src/demo/share/jfc/CodePointIM/README_zh_CN.html rename to src/demo/share/jfc/CodePointIM/README_zh_CN.html diff --git a/jdk/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethod.java b/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethod.java similarity index 100% rename from jdk/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethod.java rename to src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethod.java diff --git a/jdk/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java b/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java similarity index 100% rename from jdk/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java rename to src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java diff --git a/jdk/src/demo/share/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor b/src/demo/share/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor similarity index 100% rename from jdk/src/demo/share/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor rename to src/demo/share/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor diff --git a/jdk/src/demo/share/jfc/CodePointIM/resources/codepoint.properties b/src/demo/share/jfc/CodePointIM/resources/codepoint.properties similarity index 100% rename from jdk/src/demo/share/jfc/CodePointIM/resources/codepoint.properties rename to src/demo/share/jfc/CodePointIM/resources/codepoint.properties diff --git a/jdk/src/demo/share/jfc/CodePointIM/resources/codepoint_ja.properties b/src/demo/share/jfc/CodePointIM/resources/codepoint_ja.properties similarity index 100% rename from jdk/src/demo/share/jfc/CodePointIM/resources/codepoint_ja.properties rename to src/demo/share/jfc/CodePointIM/resources/codepoint_ja.properties diff --git a/jdk/src/demo/share/jfc/CodePointIM/resources/codepoint_zh_CN.properties b/src/demo/share/jfc/CodePointIM/resources/codepoint_zh_CN.properties similarity index 100% rename from jdk/src/demo/share/jfc/CodePointIM/resources/codepoint_zh_CN.properties rename to src/demo/share/jfc/CodePointIM/resources/codepoint_zh_CN.properties diff --git a/jdk/src/demo/share/jfc/FileChooserDemo/ExampleFileSystemView.java b/src/demo/share/jfc/FileChooserDemo/ExampleFileSystemView.java similarity index 100% rename from jdk/src/demo/share/jfc/FileChooserDemo/ExampleFileSystemView.java rename to src/demo/share/jfc/FileChooserDemo/ExampleFileSystemView.java diff --git a/jdk/src/demo/share/jfc/FileChooserDemo/ExampleFileView.java b/src/demo/share/jfc/FileChooserDemo/ExampleFileView.java similarity index 100% rename from jdk/src/demo/share/jfc/FileChooserDemo/ExampleFileView.java rename to src/demo/share/jfc/FileChooserDemo/ExampleFileView.java diff --git a/jdk/src/demo/share/jfc/FileChooserDemo/FileChooserDemo.java b/src/demo/share/jfc/FileChooserDemo/FileChooserDemo.java similarity index 100% rename from jdk/src/demo/share/jfc/FileChooserDemo/FileChooserDemo.java rename to src/demo/share/jfc/FileChooserDemo/FileChooserDemo.java diff --git a/jdk/src/demo/share/jfc/FileChooserDemo/README.txt b/src/demo/share/jfc/FileChooserDemo/README.txt similarity index 100% rename from jdk/src/demo/share/jfc/FileChooserDemo/README.txt rename to src/demo/share/jfc/FileChooserDemo/README.txt diff --git a/jdk/src/demo/share/jfc/FileChooserDemo/resources/images/gifIcon.gif b/src/demo/share/jfc/FileChooserDemo/resources/images/gifIcon.gif similarity index 100% rename from jdk/src/demo/share/jfc/FileChooserDemo/resources/images/gifIcon.gif rename to src/demo/share/jfc/FileChooserDemo/resources/images/gifIcon.gif diff --git a/jdk/src/demo/share/jfc/FileChooserDemo/resources/images/jpgIcon.jpg b/src/demo/share/jfc/FileChooserDemo/resources/images/jpgIcon.jpg similarity index 100% rename from jdk/src/demo/share/jfc/FileChooserDemo/resources/images/jpgIcon.jpg rename to src/demo/share/jfc/FileChooserDemo/resources/images/jpgIcon.jpg diff --git a/jdk/src/demo/share/jfc/Font2DTest/Font2DTest.html b/src/demo/share/jfc/Font2DTest/Font2DTest.html similarity index 100% rename from jdk/src/demo/share/jfc/Font2DTest/Font2DTest.html rename to src/demo/share/jfc/Font2DTest/Font2DTest.html diff --git a/jdk/src/demo/share/jfc/Font2DTest/Font2DTest.java b/src/demo/share/jfc/Font2DTest/Font2DTest.java similarity index 100% rename from jdk/src/demo/share/jfc/Font2DTest/Font2DTest.java rename to src/demo/share/jfc/Font2DTest/Font2DTest.java diff --git a/jdk/src/demo/share/jfc/Font2DTest/Font2DTestApplet.java b/src/demo/share/jfc/Font2DTest/Font2DTestApplet.java similarity index 100% rename from jdk/src/demo/share/jfc/Font2DTest/Font2DTestApplet.java rename to src/demo/share/jfc/Font2DTest/Font2DTestApplet.java diff --git a/jdk/src/demo/share/jfc/Font2DTest/FontPanel.java b/src/demo/share/jfc/Font2DTest/FontPanel.java similarity index 100% rename from jdk/src/demo/share/jfc/Font2DTest/FontPanel.java rename to src/demo/share/jfc/Font2DTest/FontPanel.java diff --git a/jdk/src/demo/share/jfc/Font2DTest/README.txt b/src/demo/share/jfc/Font2DTest/README.txt similarity index 100% rename from jdk/src/demo/share/jfc/Font2DTest/README.txt rename to src/demo/share/jfc/Font2DTest/README.txt diff --git a/jdk/src/demo/share/jfc/Font2DTest/RangeMenu.java b/src/demo/share/jfc/Font2DTest/RangeMenu.java similarity index 100% rename from jdk/src/demo/share/jfc/Font2DTest/RangeMenu.java rename to src/demo/share/jfc/Font2DTest/RangeMenu.java diff --git a/jdk/src/demo/share/jfc/Metalworks/AquaMetalTheme.java b/src/demo/share/jfc/Metalworks/AquaMetalTheme.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/AquaMetalTheme.java rename to src/demo/share/jfc/Metalworks/AquaMetalTheme.java diff --git a/jdk/src/demo/share/jfc/Metalworks/BigContrastMetalTheme.java b/src/demo/share/jfc/Metalworks/BigContrastMetalTheme.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/BigContrastMetalTheme.java rename to src/demo/share/jfc/Metalworks/BigContrastMetalTheme.java diff --git a/jdk/src/demo/share/jfc/Metalworks/ContrastMetalTheme.java b/src/demo/share/jfc/Metalworks/ContrastMetalTheme.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/ContrastMetalTheme.java rename to src/demo/share/jfc/Metalworks/ContrastMetalTheme.java diff --git a/jdk/src/demo/share/jfc/Metalworks/DemoMetalTheme.java b/src/demo/share/jfc/Metalworks/DemoMetalTheme.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/DemoMetalTheme.java rename to src/demo/share/jfc/Metalworks/DemoMetalTheme.java diff --git a/jdk/src/demo/share/jfc/Metalworks/GreenMetalTheme.java b/src/demo/share/jfc/Metalworks/GreenMetalTheme.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/GreenMetalTheme.java rename to src/demo/share/jfc/Metalworks/GreenMetalTheme.java diff --git a/jdk/src/demo/share/jfc/Metalworks/KhakiMetalTheme.java b/src/demo/share/jfc/Metalworks/KhakiMetalTheme.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/KhakiMetalTheme.java rename to src/demo/share/jfc/Metalworks/KhakiMetalTheme.java diff --git a/jdk/src/demo/share/jfc/Metalworks/MetalThemeMenu.java b/src/demo/share/jfc/Metalworks/MetalThemeMenu.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/MetalThemeMenu.java rename to src/demo/share/jfc/Metalworks/MetalThemeMenu.java diff --git a/jdk/src/demo/share/jfc/Metalworks/Metalworks.java b/src/demo/share/jfc/Metalworks/Metalworks.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/Metalworks.java rename to src/demo/share/jfc/Metalworks/Metalworks.java diff --git a/jdk/src/demo/share/jfc/Metalworks/MetalworksDocumentFrame.java b/src/demo/share/jfc/Metalworks/MetalworksDocumentFrame.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/MetalworksDocumentFrame.java rename to src/demo/share/jfc/Metalworks/MetalworksDocumentFrame.java diff --git a/jdk/src/demo/share/jfc/Metalworks/MetalworksFrame.java b/src/demo/share/jfc/Metalworks/MetalworksFrame.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/MetalworksFrame.java rename to src/demo/share/jfc/Metalworks/MetalworksFrame.java diff --git a/jdk/src/demo/share/jfc/Metalworks/MetalworksHelp.java b/src/demo/share/jfc/Metalworks/MetalworksHelp.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/MetalworksHelp.java rename to src/demo/share/jfc/Metalworks/MetalworksHelp.java diff --git a/jdk/src/demo/share/jfc/Metalworks/MetalworksInBox.java b/src/demo/share/jfc/Metalworks/MetalworksInBox.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/MetalworksInBox.java rename to src/demo/share/jfc/Metalworks/MetalworksInBox.java diff --git a/jdk/src/demo/share/jfc/Metalworks/MetalworksPrefs.java b/src/demo/share/jfc/Metalworks/MetalworksPrefs.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/MetalworksPrefs.java rename to src/demo/share/jfc/Metalworks/MetalworksPrefs.java diff --git a/jdk/src/demo/share/jfc/Metalworks/PropertiesMetalTheme.java b/src/demo/share/jfc/Metalworks/PropertiesMetalTheme.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/PropertiesMetalTheme.java rename to src/demo/share/jfc/Metalworks/PropertiesMetalTheme.java diff --git a/jdk/src/demo/share/jfc/Metalworks/README.txt b/src/demo/share/jfc/Metalworks/README.txt similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/README.txt rename to src/demo/share/jfc/Metalworks/README.txt diff --git a/jdk/src/demo/share/jfc/Metalworks/UISwitchListener.java b/src/demo/share/jfc/Metalworks/UISwitchListener.java similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/UISwitchListener.java rename to src/demo/share/jfc/Metalworks/UISwitchListener.java diff --git a/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/back.gif b/src/demo/share/jfc/Metalworks/resources/HelpFiles/back.gif similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/back.gif rename to src/demo/share/jfc/Metalworks/resources/HelpFiles/back.gif diff --git a/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/credits.html b/src/demo/share/jfc/Metalworks/resources/HelpFiles/credits.html similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/credits.html rename to src/demo/share/jfc/Metalworks/resources/HelpFiles/credits.html diff --git a/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/duke.gif b/src/demo/share/jfc/Metalworks/resources/HelpFiles/duke.gif similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/duke.gif rename to src/demo/share/jfc/Metalworks/resources/HelpFiles/duke.gif diff --git a/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/javalogo.gif b/src/demo/share/jfc/Metalworks/resources/HelpFiles/javalogo.gif similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/javalogo.gif rename to src/demo/share/jfc/Metalworks/resources/HelpFiles/javalogo.gif diff --git a/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/metal.html b/src/demo/share/jfc/Metalworks/resources/HelpFiles/metal.html similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/metal.html rename to src/demo/share/jfc/Metalworks/resources/HelpFiles/metal.html diff --git a/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/metalworks.html b/src/demo/share/jfc/Metalworks/resources/HelpFiles/metalworks.html similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/metalworks.html rename to src/demo/share/jfc/Metalworks/resources/HelpFiles/metalworks.html diff --git a/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/swing.html b/src/demo/share/jfc/Metalworks/resources/HelpFiles/swing.html similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/swing.html rename to src/demo/share/jfc/Metalworks/resources/HelpFiles/swing.html diff --git a/jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/toc.html b/src/demo/share/jfc/Metalworks/resources/HelpFiles/toc.html similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/resources/HelpFiles/toc.html rename to src/demo/share/jfc/Metalworks/resources/HelpFiles/toc.html diff --git a/jdk/src/demo/share/jfc/Metalworks/resources/MyTheme.theme b/src/demo/share/jfc/Metalworks/resources/MyTheme.theme similarity index 100% rename from jdk/src/demo/share/jfc/Metalworks/resources/MyTheme.theme rename to src/demo/share/jfc/Metalworks/resources/MyTheme.theme diff --git a/jdk/src/demo/share/jfc/Notepad/ElementTreePanel.java b/src/demo/share/jfc/Notepad/ElementTreePanel.java similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/ElementTreePanel.java rename to src/demo/share/jfc/Notepad/ElementTreePanel.java diff --git a/jdk/src/demo/share/jfc/Notepad/Notepad.java b/src/demo/share/jfc/Notepad/Notepad.java similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/Notepad.java rename to src/demo/share/jfc/Notepad/Notepad.java diff --git a/jdk/src/demo/share/jfc/Notepad/README.txt b/src/demo/share/jfc/Notepad/README.txt similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/README.txt rename to src/demo/share/jfc/Notepad/README.txt diff --git a/jdk/src/demo/share/jfc/Notepad/resources/Notepad.properties b/src/demo/share/jfc/Notepad/resources/Notepad.properties similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/resources/Notepad.properties rename to src/demo/share/jfc/Notepad/resources/Notepad.properties diff --git a/jdk/src/demo/share/jfc/Notepad/resources/NotepadSystem.properties b/src/demo/share/jfc/Notepad/resources/NotepadSystem.properties similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/resources/NotepadSystem.properties rename to src/demo/share/jfc/Notepad/resources/NotepadSystem.properties diff --git a/jdk/src/demo/share/jfc/Notepad/resources/Notepad_ja.properties b/src/demo/share/jfc/Notepad/resources/Notepad_ja.properties similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/resources/Notepad_ja.properties rename to src/demo/share/jfc/Notepad/resources/Notepad_ja.properties diff --git a/jdk/src/demo/share/jfc/Notepad/resources/Notepad_zh_CN.properties b/src/demo/share/jfc/Notepad/resources/Notepad_zh_CN.properties similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/resources/Notepad_zh_CN.properties rename to src/demo/share/jfc/Notepad/resources/Notepad_zh_CN.properties diff --git a/jdk/src/demo/share/jfc/Notepad/resources/copy.gif b/src/demo/share/jfc/Notepad/resources/copy.gif similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/resources/copy.gif rename to src/demo/share/jfc/Notepad/resources/copy.gif diff --git a/jdk/src/demo/share/jfc/Notepad/resources/cut.gif b/src/demo/share/jfc/Notepad/resources/cut.gif similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/resources/cut.gif rename to src/demo/share/jfc/Notepad/resources/cut.gif diff --git a/jdk/src/demo/share/jfc/Notepad/resources/new.gif b/src/demo/share/jfc/Notepad/resources/new.gif similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/resources/new.gif rename to src/demo/share/jfc/Notepad/resources/new.gif diff --git a/jdk/src/demo/share/jfc/Notepad/resources/open.gif b/src/demo/share/jfc/Notepad/resources/open.gif similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/resources/open.gif rename to src/demo/share/jfc/Notepad/resources/open.gif diff --git a/jdk/src/demo/share/jfc/Notepad/resources/paste.gif b/src/demo/share/jfc/Notepad/resources/paste.gif similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/resources/paste.gif rename to src/demo/share/jfc/Notepad/resources/paste.gif diff --git a/jdk/src/demo/share/jfc/Notepad/resources/save.gif b/src/demo/share/jfc/Notepad/resources/save.gif similarity index 100% rename from jdk/src/demo/share/jfc/Notepad/resources/save.gif rename to src/demo/share/jfc/Notepad/resources/save.gif diff --git a/jdk/src/demo/share/jfc/SampleTree/DynamicTreeNode.java b/src/demo/share/jfc/SampleTree/DynamicTreeNode.java similarity index 100% rename from jdk/src/demo/share/jfc/SampleTree/DynamicTreeNode.java rename to src/demo/share/jfc/SampleTree/DynamicTreeNode.java diff --git a/jdk/src/demo/share/jfc/SampleTree/README.txt b/src/demo/share/jfc/SampleTree/README.txt similarity index 100% rename from jdk/src/demo/share/jfc/SampleTree/README.txt rename to src/demo/share/jfc/SampleTree/README.txt diff --git a/jdk/src/demo/share/jfc/SampleTree/SampleData.java b/src/demo/share/jfc/SampleTree/SampleData.java similarity index 100% rename from jdk/src/demo/share/jfc/SampleTree/SampleData.java rename to src/demo/share/jfc/SampleTree/SampleData.java diff --git a/jdk/src/demo/share/jfc/SampleTree/SampleTree.java b/src/demo/share/jfc/SampleTree/SampleTree.java similarity index 100% rename from jdk/src/demo/share/jfc/SampleTree/SampleTree.java rename to src/demo/share/jfc/SampleTree/SampleTree.java diff --git a/jdk/src/demo/share/jfc/SampleTree/SampleTreeCellRenderer.java b/src/demo/share/jfc/SampleTree/SampleTreeCellRenderer.java similarity index 100% rename from jdk/src/demo/share/jfc/SampleTree/SampleTreeCellRenderer.java rename to src/demo/share/jfc/SampleTree/SampleTreeCellRenderer.java diff --git a/jdk/src/demo/share/jfc/SampleTree/SampleTreeModel.java b/src/demo/share/jfc/SampleTree/SampleTreeModel.java similarity index 100% rename from jdk/src/demo/share/jfc/SampleTree/SampleTreeModel.java rename to src/demo/share/jfc/SampleTree/SampleTreeModel.java diff --git a/jdk/src/demo/share/jfc/SampleTree/resources/images/collapsed.gif b/src/demo/share/jfc/SampleTree/resources/images/collapsed.gif similarity index 100% rename from jdk/src/demo/share/jfc/SampleTree/resources/images/collapsed.gif rename to src/demo/share/jfc/SampleTree/resources/images/collapsed.gif diff --git a/jdk/src/demo/share/jfc/SampleTree/resources/images/expanded.gif b/src/demo/share/jfc/SampleTree/resources/images/expanded.gif similarity index 100% rename from jdk/src/demo/share/jfc/SampleTree/resources/images/expanded.gif rename to src/demo/share/jfc/SampleTree/resources/images/expanded.gif diff --git a/jdk/src/demo/share/jfc/SwingApplet/README.txt b/src/demo/share/jfc/SwingApplet/README.txt similarity index 100% rename from jdk/src/demo/share/jfc/SwingApplet/README.txt rename to src/demo/share/jfc/SwingApplet/README.txt diff --git a/jdk/src/demo/share/jfc/SwingApplet/SwingApplet.html b/src/demo/share/jfc/SwingApplet/SwingApplet.html similarity index 100% rename from jdk/src/demo/share/jfc/SwingApplet/SwingApplet.html rename to src/demo/share/jfc/SwingApplet/SwingApplet.html diff --git a/jdk/src/demo/share/jfc/SwingApplet/SwingApplet.java b/src/demo/share/jfc/SwingApplet/SwingApplet.java similarity index 100% rename from jdk/src/demo/share/jfc/SwingApplet/SwingApplet.java rename to src/demo/share/jfc/SwingApplet/SwingApplet.java diff --git a/jdk/src/demo/share/jfc/TableExample/JDBCAdapter.java b/src/demo/share/jfc/TableExample/JDBCAdapter.java similarity index 100% rename from jdk/src/demo/share/jfc/TableExample/JDBCAdapter.java rename to src/demo/share/jfc/TableExample/JDBCAdapter.java diff --git a/jdk/src/demo/share/jfc/TableExample/OldJTable.java b/src/demo/share/jfc/TableExample/OldJTable.java similarity index 100% rename from jdk/src/demo/share/jfc/TableExample/OldJTable.java rename to src/demo/share/jfc/TableExample/OldJTable.java diff --git a/jdk/src/demo/share/jfc/TableExample/README.txt b/src/demo/share/jfc/TableExample/README.txt similarity index 100% rename from jdk/src/demo/share/jfc/TableExample/README.txt rename to src/demo/share/jfc/TableExample/README.txt diff --git a/jdk/src/demo/share/jfc/TableExample/TableExample.java b/src/demo/share/jfc/TableExample/TableExample.java similarity index 100% rename from jdk/src/demo/share/jfc/TableExample/TableExample.java rename to src/demo/share/jfc/TableExample/TableExample.java diff --git a/jdk/src/demo/share/jfc/TableExample/TableExample2.java b/src/demo/share/jfc/TableExample/TableExample2.java similarity index 100% rename from jdk/src/demo/share/jfc/TableExample/TableExample2.java rename to src/demo/share/jfc/TableExample/TableExample2.java diff --git a/jdk/src/demo/share/jfc/TableExample/TableExample3.java b/src/demo/share/jfc/TableExample/TableExample3.java similarity index 100% rename from jdk/src/demo/share/jfc/TableExample/TableExample3.java rename to src/demo/share/jfc/TableExample/TableExample3.java diff --git a/jdk/src/demo/share/jfc/TableExample/TableExample4.java b/src/demo/share/jfc/TableExample/TableExample4.java similarity index 100% rename from jdk/src/demo/share/jfc/TableExample/TableExample4.java rename to src/demo/share/jfc/TableExample/TableExample4.java diff --git a/jdk/src/demo/share/jfc/TableExample/TableMap.java b/src/demo/share/jfc/TableExample/TableMap.java similarity index 100% rename from jdk/src/demo/share/jfc/TableExample/TableMap.java rename to src/demo/share/jfc/TableExample/TableMap.java diff --git a/jdk/src/demo/share/jfc/TableExample/TableSorter.java b/src/demo/share/jfc/TableExample/TableSorter.java similarity index 100% rename from jdk/src/demo/share/jfc/TableExample/TableSorter.java rename to src/demo/share/jfc/TableExample/TableSorter.java diff --git a/jdk/src/demo/share/jfc/TransparentRuler/README.txt b/src/demo/share/jfc/TransparentRuler/README.txt similarity index 100% rename from jdk/src/demo/share/jfc/TransparentRuler/README.txt rename to src/demo/share/jfc/TransparentRuler/README.txt diff --git a/jdk/src/demo/share/jfc/TransparentRuler/transparentruler/Ruler.java b/src/demo/share/jfc/TransparentRuler/transparentruler/Ruler.java similarity index 100% rename from jdk/src/demo/share/jfc/TransparentRuler/transparentruler/Ruler.java rename to src/demo/share/jfc/TransparentRuler/transparentruler/Ruler.java diff --git a/jdk/src/demo/share/nbproject/README.txt b/src/demo/share/nbproject/README.txt similarity index 100% rename from jdk/src/demo/share/nbproject/README.txt rename to src/demo/share/nbproject/README.txt diff --git a/jdk/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties b/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties rename to src/demo/share/nbproject/jfc/FileChooserDemo/build.properties diff --git a/jdk/src/demo/share/nbproject/jfc/FileChooserDemo/build.xml b/src/demo/share/nbproject/jfc/FileChooserDemo/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/FileChooserDemo/build.xml rename to src/demo/share/nbproject/jfc/FileChooserDemo/build.xml diff --git a/jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml rename to src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml rename to src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/project.xml b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/project.xml rename to src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Font2DTest/build.properties b/src/demo/share/nbproject/jfc/Font2DTest/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Font2DTest/build.properties rename to src/demo/share/nbproject/jfc/Font2DTest/build.properties diff --git a/jdk/src/demo/share/nbproject/jfc/Font2DTest/build.xml b/src/demo/share/nbproject/jfc/Font2DTest/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Font2DTest/build.xml rename to src/demo/share/nbproject/jfc/Font2DTest/build.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/file-targets.xml b/src/demo/share/nbproject/jfc/Font2DTest/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/file-targets.xml rename to src/demo/share/nbproject/jfc/Font2DTest/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/jdk.xml b/src/demo/share/nbproject/jfc/Font2DTest/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/jdk.xml rename to src/demo/share/nbproject/jfc/Font2DTest/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/project.xml b/src/demo/share/nbproject/jfc/Font2DTest/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Font2DTest/nbproject/project.xml rename to src/demo/share/nbproject/jfc/Font2DTest/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Metalworks/build.properties b/src/demo/share/nbproject/jfc/Metalworks/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Metalworks/build.properties rename to src/demo/share/nbproject/jfc/Metalworks/build.properties diff --git a/jdk/src/demo/share/nbproject/jfc/Metalworks/build.xml b/src/demo/share/nbproject/jfc/Metalworks/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Metalworks/build.xml rename to src/demo/share/nbproject/jfc/Metalworks/build.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/file-targets.xml b/src/demo/share/nbproject/jfc/Metalworks/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/file-targets.xml rename to src/demo/share/nbproject/jfc/Metalworks/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/jdk.xml b/src/demo/share/nbproject/jfc/Metalworks/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/jdk.xml rename to src/demo/share/nbproject/jfc/Metalworks/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/project.xml b/src/demo/share/nbproject/jfc/Metalworks/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Metalworks/nbproject/project.xml rename to src/demo/share/nbproject/jfc/Metalworks/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Notepad/build.properties b/src/demo/share/nbproject/jfc/Notepad/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Notepad/build.properties rename to src/demo/share/nbproject/jfc/Notepad/build.properties diff --git a/jdk/src/demo/share/nbproject/jfc/Notepad/build.xml b/src/demo/share/nbproject/jfc/Notepad/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Notepad/build.xml rename to src/demo/share/nbproject/jfc/Notepad/build.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/file-targets.xml b/src/demo/share/nbproject/jfc/Notepad/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/file-targets.xml rename to src/demo/share/nbproject/jfc/Notepad/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/jdk.xml b/src/demo/share/nbproject/jfc/Notepad/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/jdk.xml rename to src/demo/share/nbproject/jfc/Notepad/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/project.xml b/src/demo/share/nbproject/jfc/Notepad/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/Notepad/nbproject/project.xml rename to src/demo/share/nbproject/jfc/Notepad/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/jfc/SampleTree/build.properties b/src/demo/share/nbproject/jfc/SampleTree/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/SampleTree/build.properties rename to src/demo/share/nbproject/jfc/SampleTree/build.properties diff --git a/jdk/src/demo/share/nbproject/jfc/SampleTree/build.xml b/src/demo/share/nbproject/jfc/SampleTree/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/SampleTree/build.xml rename to src/demo/share/nbproject/jfc/SampleTree/build.xml diff --git a/jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/file-targets.xml b/src/demo/share/nbproject/jfc/SampleTree/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/file-targets.xml rename to src/demo/share/nbproject/jfc/SampleTree/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/jdk.xml b/src/demo/share/nbproject/jfc/SampleTree/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/jdk.xml rename to src/demo/share/nbproject/jfc/SampleTree/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/project.xml b/src/demo/share/nbproject/jfc/SampleTree/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/SampleTree/nbproject/project.xml rename to src/demo/share/nbproject/jfc/SampleTree/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/jfc/SwingApplet/build.properties b/src/demo/share/nbproject/jfc/SwingApplet/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/SwingApplet/build.properties rename to src/demo/share/nbproject/jfc/SwingApplet/build.properties diff --git a/jdk/src/demo/share/nbproject/jfc/SwingApplet/build.xml b/src/demo/share/nbproject/jfc/SwingApplet/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/SwingApplet/build.xml rename to src/demo/share/nbproject/jfc/SwingApplet/build.xml diff --git a/jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/file-targets.xml b/src/demo/share/nbproject/jfc/SwingApplet/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/file-targets.xml rename to src/demo/share/nbproject/jfc/SwingApplet/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/jdk.xml b/src/demo/share/nbproject/jfc/SwingApplet/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/jdk.xml rename to src/demo/share/nbproject/jfc/SwingApplet/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/project.xml b/src/demo/share/nbproject/jfc/SwingApplet/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/SwingApplet/nbproject/project.xml rename to src/demo/share/nbproject/jfc/SwingApplet/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/jfc/TableExample/build.properties b/src/demo/share/nbproject/jfc/TableExample/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/TableExample/build.properties rename to src/demo/share/nbproject/jfc/TableExample/build.properties diff --git a/jdk/src/demo/share/nbproject/jfc/TableExample/build.xml b/src/demo/share/nbproject/jfc/TableExample/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/TableExample/build.xml rename to src/demo/share/nbproject/jfc/TableExample/build.xml diff --git a/jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/file-targets.xml b/src/demo/share/nbproject/jfc/TableExample/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/file-targets.xml rename to src/demo/share/nbproject/jfc/TableExample/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/jdk.xml b/src/demo/share/nbproject/jfc/TableExample/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/jdk.xml rename to src/demo/share/nbproject/jfc/TableExample/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/project.xml b/src/demo/share/nbproject/jfc/TableExample/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/TableExample/nbproject/project.xml rename to src/demo/share/nbproject/jfc/TableExample/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/jfc/TransparentRuler/build.properties b/src/demo/share/nbproject/jfc/TransparentRuler/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/TransparentRuler/build.properties rename to src/demo/share/nbproject/jfc/TransparentRuler/build.properties diff --git a/jdk/src/demo/share/nbproject/jfc/TransparentRuler/build.xml b/src/demo/share/nbproject/jfc/TransparentRuler/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/TransparentRuler/build.xml rename to src/demo/share/nbproject/jfc/TransparentRuler/build.xml diff --git a/jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml b/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml rename to src/demo/share/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/jdk.xml b/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/jdk.xml rename to src/demo/share/nbproject/jfc/TransparentRuler/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/project.xml b/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/project.xml rename to src/demo/share/nbproject/jfc/TransparentRuler/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/management/FullThreadDump/build.properties b/src/demo/share/nbproject/management/FullThreadDump/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/management/FullThreadDump/build.properties rename to src/demo/share/nbproject/management/FullThreadDump/build.properties diff --git a/jdk/src/demo/share/nbproject/management/FullThreadDump/build.xml b/src/demo/share/nbproject/management/FullThreadDump/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/FullThreadDump/build.xml rename to src/demo/share/nbproject/management/FullThreadDump/build.xml diff --git a/jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/file-targets.xml b/src/demo/share/nbproject/management/FullThreadDump/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/file-targets.xml rename to src/demo/share/nbproject/management/FullThreadDump/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/jdk.xml b/src/demo/share/nbproject/management/FullThreadDump/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/jdk.xml rename to src/demo/share/nbproject/management/FullThreadDump/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/project.xml b/src/demo/share/nbproject/management/FullThreadDump/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/FullThreadDump/nbproject/project.xml rename to src/demo/share/nbproject/management/FullThreadDump/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/management/JTop/build.properties b/src/demo/share/nbproject/management/JTop/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/management/JTop/build.properties rename to src/demo/share/nbproject/management/JTop/build.properties diff --git a/jdk/src/demo/share/nbproject/management/JTop/build.xml b/src/demo/share/nbproject/management/JTop/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/JTop/build.xml rename to src/demo/share/nbproject/management/JTop/build.xml diff --git a/jdk/src/demo/share/nbproject/management/JTop/nbproject/file-targets.xml b/src/demo/share/nbproject/management/JTop/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/JTop/nbproject/file-targets.xml rename to src/demo/share/nbproject/management/JTop/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/management/JTop/nbproject/jdk.xml b/src/demo/share/nbproject/management/JTop/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/JTop/nbproject/jdk.xml rename to src/demo/share/nbproject/management/JTop/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/management/JTop/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/management/JTop/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/JTop/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/management/JTop/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/management/JTop/nbproject/project.xml b/src/demo/share/nbproject/management/JTop/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/JTop/nbproject/project.xml rename to src/demo/share/nbproject/management/JTop/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/management/MemoryMonitor/build.properties b/src/demo/share/nbproject/management/MemoryMonitor/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/management/MemoryMonitor/build.properties rename to src/demo/share/nbproject/management/MemoryMonitor/build.properties diff --git a/jdk/src/demo/share/nbproject/management/MemoryMonitor/build.xml b/src/demo/share/nbproject/management/MemoryMonitor/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/MemoryMonitor/build.xml rename to src/demo/share/nbproject/management/MemoryMonitor/build.xml diff --git a/jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/file-targets.xml b/src/demo/share/nbproject/management/MemoryMonitor/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/file-targets.xml rename to src/demo/share/nbproject/management/MemoryMonitor/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/jdk.xml b/src/demo/share/nbproject/management/MemoryMonitor/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/jdk.xml rename to src/demo/share/nbproject/management/MemoryMonitor/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/project.xml b/src/demo/share/nbproject/management/MemoryMonitor/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/MemoryMonitor/nbproject/project.xml rename to src/demo/share/nbproject/management/MemoryMonitor/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/management/VerboseGC/build.properties b/src/demo/share/nbproject/management/VerboseGC/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/management/VerboseGC/build.properties rename to src/demo/share/nbproject/management/VerboseGC/build.properties diff --git a/jdk/src/demo/share/nbproject/management/VerboseGC/build.xml b/src/demo/share/nbproject/management/VerboseGC/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/VerboseGC/build.xml rename to src/demo/share/nbproject/management/VerboseGC/build.xml diff --git a/jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/file-targets.xml b/src/demo/share/nbproject/management/VerboseGC/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/file-targets.xml rename to src/demo/share/nbproject/management/VerboseGC/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/jdk.xml b/src/demo/share/nbproject/management/VerboseGC/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/jdk.xml rename to src/demo/share/nbproject/management/VerboseGC/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/project.xml b/src/demo/share/nbproject/management/VerboseGC/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/management/VerboseGC/nbproject/project.xml rename to src/demo/share/nbproject/management/VerboseGC/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/project.xml b/src/demo/share/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/project.xml rename to src/demo/share/nbproject/project.xml diff --git a/jdk/src/demo/share/nbproject/scripting/jconsole-plugin/build.properties b/src/demo/share/nbproject/scripting/jconsole-plugin/build.properties similarity index 100% rename from jdk/src/demo/share/nbproject/scripting/jconsole-plugin/build.properties rename to src/demo/share/nbproject/scripting/jconsole-plugin/build.properties diff --git a/jdk/src/demo/share/nbproject/scripting/jconsole-plugin/build.xml b/src/demo/share/nbproject/scripting/jconsole-plugin/build.xml similarity index 100% rename from jdk/src/demo/share/nbproject/scripting/jconsole-plugin/build.xml rename to src/demo/share/nbproject/scripting/jconsole-plugin/build.xml diff --git a/jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/file-targets.xml b/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/file-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/file-targets.xml rename to src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/file-targets.xml diff --git a/jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml b/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml similarity index 100% rename from jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml rename to src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml diff --git a/jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml similarity index 100% rename from jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml rename to src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml diff --git a/jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/project.xml b/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/project.xml similarity index 100% rename from jdk/src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/project.xml rename to src/demo/share/nbproject/scripting/jconsole-plugin/nbproject/project.xml diff --git a/hotspot/.mx.jvmci/.project b/src/hotspot/.mx.jvmci/.project similarity index 100% rename from hotspot/.mx.jvmci/.project rename to src/hotspot/.mx.jvmci/.project diff --git a/hotspot/.mx.jvmci/.pydevproject b/src/hotspot/.mx.jvmci/.pydevproject similarity index 100% rename from hotspot/.mx.jvmci/.pydevproject rename to src/hotspot/.mx.jvmci/.pydevproject diff --git a/hotspot/.mx.jvmci/eclipse-settings/org.eclipse.jdt.core.prefs b/src/hotspot/.mx.jvmci/eclipse-settings/org.eclipse.jdt.core.prefs similarity index 100% rename from hotspot/.mx.jvmci/eclipse-settings/org.eclipse.jdt.core.prefs rename to src/hotspot/.mx.jvmci/eclipse-settings/org.eclipse.jdt.core.prefs diff --git a/hotspot/.mx.jvmci/hotspot/templates/eclipse/cproject b/src/hotspot/.mx.jvmci/hotspot/templates/eclipse/cproject similarity index 100% rename from hotspot/.mx.jvmci/hotspot/templates/eclipse/cproject rename to src/hotspot/.mx.jvmci/hotspot/templates/eclipse/cproject diff --git a/hotspot/.mx.jvmci/hotspot/templates/eclipse/settings/org.eclipse.cdt.core.prefs b/src/hotspot/.mx.jvmci/hotspot/templates/eclipse/settings/org.eclipse.cdt.core.prefs similarity index 100% rename from hotspot/.mx.jvmci/hotspot/templates/eclipse/settings/org.eclipse.cdt.core.prefs rename to src/hotspot/.mx.jvmci/hotspot/templates/eclipse/settings/org.eclipse.cdt.core.prefs diff --git a/hotspot/.mx.jvmci/hotspot/templates/eclipse/settings/org.eclipse.cdt.ui.prefs b/src/hotspot/.mx.jvmci/hotspot/templates/eclipse/settings/org.eclipse.cdt.ui.prefs similarity index 100% rename from hotspot/.mx.jvmci/hotspot/templates/eclipse/settings/org.eclipse.cdt.ui.prefs rename to src/hotspot/.mx.jvmci/hotspot/templates/eclipse/settings/org.eclipse.cdt.ui.prefs diff --git a/hotspot/.mx.jvmci/hotspot/templates/eclipse/settings/org.eclipse.core.runtime.prefs b/src/hotspot/.mx.jvmci/hotspot/templates/eclipse/settings/org.eclipse.core.runtime.prefs similarity index 100% rename from hotspot/.mx.jvmci/hotspot/templates/eclipse/settings/org.eclipse.core.runtime.prefs rename to src/hotspot/.mx.jvmci/hotspot/templates/eclipse/settings/org.eclipse.core.runtime.prefs diff --git a/hotspot/.mx.jvmci/mx_jvmci.py b/src/hotspot/.mx.jvmci/mx_jvmci.py similarity index 100% rename from hotspot/.mx.jvmci/mx_jvmci.py rename to src/hotspot/.mx.jvmci/mx_jvmci.py diff --git a/hotspot/.mx.jvmci/suite.py b/src/hotspot/.mx.jvmci/suite.py similarity index 100% rename from hotspot/.mx.jvmci/suite.py rename to src/hotspot/.mx.jvmci/suite.py diff --git a/hotspot/src/cpu/aarch64/vm/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad similarity index 100% rename from hotspot/src/cpu/aarch64/vm/aarch64.ad rename to src/hotspot/cpu/aarch64/aarch64.ad diff --git a/hotspot/src/cpu/aarch64/vm/aarch64Test.cpp b/src/hotspot/cpu/aarch64/aarch64Test.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/aarch64Test.cpp rename to src/hotspot/cpu/aarch64/aarch64Test.cpp diff --git a/hotspot/src/cpu/aarch64/vm/aarch64_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_ad.m4 similarity index 100% rename from hotspot/src/cpu/aarch64/vm/aarch64_ad.m4 rename to src/hotspot/cpu/aarch64/aarch64_ad.m4 diff --git a/hotspot/src/cpu/aarch64/vm/aarch64_call.cpp b/src/hotspot/cpu/aarch64/aarch64_call.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/aarch64_call.cpp rename to src/hotspot/cpu/aarch64/aarch64_call.cpp diff --git a/hotspot/src/cpu/aarch64/vm/aarch64_linkage.S b/src/hotspot/cpu/aarch64/aarch64_linkage.S similarity index 100% rename from hotspot/src/cpu/aarch64/vm/aarch64_linkage.S rename to src/hotspot/cpu/aarch64/aarch64_linkage.S diff --git a/hotspot/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp b/src/hotspot/cpu/aarch64/abstractInterpreter_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp rename to src/hotspot/cpu/aarch64/abstractInterpreter_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/ad_encode.m4 b/src/hotspot/cpu/aarch64/ad_encode.m4 similarity index 100% rename from hotspot/src/cpu/aarch64/vm/ad_encode.m4 rename to src/hotspot/cpu/aarch64/ad_encode.m4 diff --git a/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp rename to src/hotspot/cpu/aarch64/assembler_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp rename to src/hotspot/cpu/aarch64/assembler_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/assembler_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/assembler_aarch64.inline.hpp rename to src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp diff --git a/hotspot/src/cpu/aarch64/vm/bytecodes_aarch64.cpp b/src/hotspot/cpu/aarch64/bytecodes_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/bytecodes_aarch64.cpp rename to src/hotspot/cpu/aarch64/bytecodes_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/bytecodes_aarch64.hpp b/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/bytecodes_aarch64.hpp rename to src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/bytes_aarch64.hpp b/src/hotspot/cpu/aarch64/bytes_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/bytes_aarch64.hpp rename to src/hotspot/cpu/aarch64/bytes_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp rename to src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_Defs_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_Defs_aarch64.hpp rename to src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_FpuStackSim_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_FpuStackSim_aarch64.cpp rename to src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_FpuStackSim_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_FpuStackSim_aarch64.hpp rename to src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_FrameMap_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_FrameMap_aarch64.cpp rename to src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_FrameMap_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_FrameMap_aarch64.hpp rename to src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp rename to src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp rename to src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp rename to src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIR_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIR_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_LIR_aarch64.cpp rename to src/hotspot/cpu/aarch64/c1_LIR_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_LinearScan_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_LinearScan_aarch64.cpp rename to src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_LinearScan_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_LinearScan_aarch64.hpp rename to src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp rename to src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.hpp rename to src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp rename to src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/c1_globals_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c1_globals_aarch64.hpp rename to src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/c2_globals_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c2_globals_aarch64.hpp rename to src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/c2_init_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_init_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/c2_init_aarch64.cpp rename to src/hotspot/cpu/aarch64/c2_init_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/cas.m4 b/src/hotspot/cpu/aarch64/cas.m4 similarity index 100% rename from hotspot/src/cpu/aarch64/vm/cas.m4 rename to src/hotspot/cpu/aarch64/cas.m4 diff --git a/hotspot/src/cpu/aarch64/vm/codeBuffer_aarch64.hpp b/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/codeBuffer_aarch64.hpp rename to src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp b/src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp rename to src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/copy_aarch64.hpp b/src/hotspot/cpu/aarch64/copy_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/copy_aarch64.hpp rename to src/hotspot/cpu/aarch64/copy_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/cpustate_aarch64.hpp b/src/hotspot/cpu/aarch64/cpustate_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/cpustate_aarch64.hpp rename to src/hotspot/cpu/aarch64/cpustate_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/decode_aarch64.hpp b/src/hotspot/cpu/aarch64/decode_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/decode_aarch64.hpp rename to src/hotspot/cpu/aarch64/decode_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/depChecker_aarch64.cpp b/src/hotspot/cpu/aarch64/depChecker_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/depChecker_aarch64.cpp rename to src/hotspot/cpu/aarch64/depChecker_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/depChecker_aarch64.hpp b/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/depChecker_aarch64.hpp rename to src/hotspot/cpu/aarch64/depChecker_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/disassembler_aarch64.hpp b/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/disassembler_aarch64.hpp rename to src/hotspot/cpu/aarch64/disassembler_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/frame_aarch64.cpp b/src/hotspot/cpu/aarch64/frame_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/frame_aarch64.cpp rename to src/hotspot/cpu/aarch64/frame_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/frame_aarch64.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/frame_aarch64.hpp rename to src/hotspot/cpu/aarch64/frame_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/frame_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/frame_aarch64.inline.hpp rename to src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp diff --git a/hotspot/src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp rename to src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp b/src/hotspot/cpu/aarch64/globals_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp rename to src/hotspot/cpu/aarch64/globals_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/icBuffer_aarch64.cpp b/src/hotspot/cpu/aarch64/icBuffer_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/icBuffer_aarch64.cpp rename to src/hotspot/cpu/aarch64/icBuffer_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/icache_aarch64.cpp b/src/hotspot/cpu/aarch64/icache_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/icache_aarch64.cpp rename to src/hotspot/cpu/aarch64/icache_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/icache_aarch64.hpp b/src/hotspot/cpu/aarch64/icache_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/icache_aarch64.hpp rename to src/hotspot/cpu/aarch64/icache_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/immediate_aarch64.cpp b/src/hotspot/cpu/aarch64/immediate_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/immediate_aarch64.cpp rename to src/hotspot/cpu/aarch64/immediate_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/immediate_aarch64.hpp b/src/hotspot/cpu/aarch64/immediate_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/immediate_aarch64.hpp rename to src/hotspot/cpu/aarch64/immediate_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.cpp rename to src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp rename to src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/interpreterRT_aarch64.cpp b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/interpreterRT_aarch64.cpp rename to src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/interpreterRT_aarch64.hpp b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/interpreterRT_aarch64.hpp rename to src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/javaFrameAnchor_aarch64.hpp b/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/javaFrameAnchor_aarch64.hpp rename to src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/jniFastGetField_aarch64.cpp b/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/jniFastGetField_aarch64.cpp rename to src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/jniTypes_aarch64.hpp b/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/jniTypes_aarch64.hpp rename to src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/jni_aarch64.h b/src/hotspot/cpu/aarch64/jni_aarch64.h similarity index 100% rename from hotspot/src/cpu/aarch64/vm/jni_aarch64.h rename to src/hotspot/cpu/aarch64/jni_aarch64.h diff --git a/hotspot/src/cpu/aarch64/vm/jvmciCodeInstaller_aarch64.cpp b/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/jvmciCodeInstaller_aarch64.cpp rename to src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp rename to src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp rename to src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.inline.hpp rename to src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp diff --git a/hotspot/src/cpu/aarch64/vm/methodHandles_aarch64.cpp b/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/methodHandles_aarch64.cpp rename to src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/methodHandles_aarch64.hpp b/src/hotspot/cpu/aarch64/methodHandles_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/methodHandles_aarch64.hpp rename to src/hotspot/cpu/aarch64/methodHandles_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/nativeInst_aarch64.cpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/nativeInst_aarch64.cpp rename to src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/nativeInst_aarch64.hpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/nativeInst_aarch64.hpp rename to src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/registerMap_aarch64.hpp b/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/registerMap_aarch64.hpp rename to src/hotspot/cpu/aarch64/registerMap_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/register_aarch64.cpp b/src/hotspot/cpu/aarch64/register_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/register_aarch64.cpp rename to src/hotspot/cpu/aarch64/register_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/register_aarch64.hpp b/src/hotspot/cpu/aarch64/register_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/register_aarch64.hpp rename to src/hotspot/cpu/aarch64/register_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/register_definitions_aarch64.cpp b/src/hotspot/cpu/aarch64/register_definitions_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/register_definitions_aarch64.cpp rename to src/hotspot/cpu/aarch64/register_definitions_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/relocInfo_aarch64.cpp b/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/relocInfo_aarch64.cpp rename to src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/relocInfo_aarch64.hpp b/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/relocInfo_aarch64.hpp rename to src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/runtime_aarch64.cpp b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/runtime_aarch64.cpp rename to src/hotspot/cpu/aarch64/runtime_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp rename to src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp rename to src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/stubRoutines_aarch64.cpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/stubRoutines_aarch64.cpp rename to src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/stubRoutines_aarch64.hpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/stubRoutines_aarch64.hpp rename to src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp rename to src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp rename to src/hotspot/cpu/aarch64/templateTable_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.hpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/templateTable_aarch64.hpp rename to src/hotspot/cpu/aarch64/templateTable_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/vmStructs_aarch64.hpp b/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/vmStructs_aarch64.hpp rename to src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp rename to src/hotspot/cpu/aarch64/vm_version_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/vm_version_aarch64.hpp rename to src/hotspot/cpu/aarch64/vm_version_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/vmreg_aarch64.cpp b/src/hotspot/cpu/aarch64/vmreg_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/vmreg_aarch64.cpp rename to src/hotspot/cpu/aarch64/vmreg_aarch64.cpp diff --git a/hotspot/src/cpu/aarch64/vm/vmreg_aarch64.hpp b/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/vmreg_aarch64.hpp rename to src/hotspot/cpu/aarch64/vmreg_aarch64.hpp diff --git a/hotspot/src/cpu/aarch64/vm/vmreg_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/vmreg_aarch64.inline.hpp rename to src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp diff --git a/hotspot/src/cpu/aarch64/vm/vtableStubs_aarch64.cpp b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp similarity index 100% rename from hotspot/src/cpu/aarch64/vm/vtableStubs_aarch64.cpp rename to src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp diff --git a/hotspot/src/cpu/arm/vm/abstractInterpreter_arm.cpp b/src/hotspot/cpu/arm/abstractInterpreter_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/abstractInterpreter_arm.cpp rename to src/hotspot/cpu/arm/abstractInterpreter_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/arm.ad b/src/hotspot/cpu/arm/arm.ad similarity index 100% rename from hotspot/src/cpu/arm/vm/arm.ad rename to src/hotspot/cpu/arm/arm.ad diff --git a/hotspot/src/cpu/arm/vm/arm_32.ad b/src/hotspot/cpu/arm/arm_32.ad similarity index 100% rename from hotspot/src/cpu/arm/vm/arm_32.ad rename to src/hotspot/cpu/arm/arm_32.ad diff --git a/hotspot/src/cpu/arm/vm/arm_64.ad b/src/hotspot/cpu/arm/arm_64.ad similarity index 100% rename from hotspot/src/cpu/arm/vm/arm_64.ad rename to src/hotspot/cpu/arm/arm_64.ad diff --git a/hotspot/src/cpu/arm/vm/assembler_arm.cpp b/src/hotspot/cpu/arm/assembler_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/assembler_arm.cpp rename to src/hotspot/cpu/arm/assembler_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/assembler_arm.hpp b/src/hotspot/cpu/arm/assembler_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/assembler_arm.hpp rename to src/hotspot/cpu/arm/assembler_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/assembler_arm.inline.hpp b/src/hotspot/cpu/arm/assembler_arm.inline.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/assembler_arm.inline.hpp rename to src/hotspot/cpu/arm/assembler_arm.inline.hpp diff --git a/hotspot/src/cpu/arm/vm/assembler_arm_32.cpp b/src/hotspot/cpu/arm/assembler_arm_32.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/assembler_arm_32.cpp rename to src/hotspot/cpu/arm/assembler_arm_32.cpp diff --git a/hotspot/src/cpu/arm/vm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/assembler_arm_32.hpp rename to src/hotspot/cpu/arm/assembler_arm_32.hpp diff --git a/hotspot/src/cpu/arm/vm/assembler_arm_64.cpp b/src/hotspot/cpu/arm/assembler_arm_64.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/assembler_arm_64.cpp rename to src/hotspot/cpu/arm/assembler_arm_64.cpp diff --git a/hotspot/src/cpu/arm/vm/assembler_arm_64.hpp b/src/hotspot/cpu/arm/assembler_arm_64.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/assembler_arm_64.hpp rename to src/hotspot/cpu/arm/assembler_arm_64.hpp diff --git a/hotspot/src/cpu/arm/vm/bytes_arm.hpp b/src/hotspot/cpu/arm/bytes_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/bytes_arm.hpp rename to src/hotspot/cpu/arm/bytes_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/c1_CodeStubs_arm.cpp b/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_CodeStubs_arm.cpp rename to src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/c1_Defs_arm.hpp b/src/hotspot/cpu/arm/c1_Defs_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_Defs_arm.hpp rename to src/hotspot/cpu/arm/c1_Defs_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/c1_FpuStackSim_arm.cpp b/src/hotspot/cpu/arm/c1_FpuStackSim_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_FpuStackSim_arm.cpp rename to src/hotspot/cpu/arm/c1_FpuStackSim_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/c1_FpuStackSim_arm.hpp b/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_FpuStackSim_arm.hpp rename to src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/c1_FrameMap_arm.cpp b/src/hotspot/cpu/arm/c1_FrameMap_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_FrameMap_arm.cpp rename to src/hotspot/cpu/arm/c1_FrameMap_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/c1_FrameMap_arm.hpp b/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_FrameMap_arm.hpp rename to src/hotspot/cpu/arm/c1_FrameMap_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_LIRAssembler_arm.cpp rename to src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/c1_LIRAssembler_arm.hpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_LIRAssembler_arm.hpp rename to src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.cpp b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.cpp rename to src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.hpp b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.hpp rename to src/hotspot/cpu/arm/c1_LIRGenerator_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/c1_LIR_arm.cpp b/src/hotspot/cpu/arm/c1_LIR_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_LIR_arm.cpp rename to src/hotspot/cpu/arm/c1_LIR_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/c1_LinearScan_arm.cpp b/src/hotspot/cpu/arm/c1_LinearScan_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_LinearScan_arm.cpp rename to src/hotspot/cpu/arm/c1_LinearScan_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/c1_LinearScan_arm.hpp b/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_LinearScan_arm.hpp rename to src/hotspot/cpu/arm/c1_LinearScan_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/c1_MacroAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_MacroAssembler_arm.cpp rename to src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/c1_MacroAssembler_arm.hpp b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_MacroAssembler_arm.hpp rename to src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/c1_Runtime1_arm.cpp b/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_Runtime1_arm.cpp rename to src/hotspot/cpu/arm/c1_Runtime1_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/c1_globals_arm.hpp b/src/hotspot/cpu/arm/c1_globals_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c1_globals_arm.hpp rename to src/hotspot/cpu/arm/c1_globals_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/c2_globals_arm.hpp b/src/hotspot/cpu/arm/c2_globals_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/c2_globals_arm.hpp rename to src/hotspot/cpu/arm/c2_globals_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/codeBuffer_arm.hpp b/src/hotspot/cpu/arm/codeBuffer_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/codeBuffer_arm.hpp rename to src/hotspot/cpu/arm/codeBuffer_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/compiledIC_arm.cpp b/src/hotspot/cpu/arm/compiledIC_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/compiledIC_arm.cpp rename to src/hotspot/cpu/arm/compiledIC_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/copy_arm.hpp b/src/hotspot/cpu/arm/copy_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/copy_arm.hpp rename to src/hotspot/cpu/arm/copy_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/depChecker_arm.cpp b/src/hotspot/cpu/arm/depChecker_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/depChecker_arm.cpp rename to src/hotspot/cpu/arm/depChecker_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/depChecker_arm.hpp b/src/hotspot/cpu/arm/depChecker_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/depChecker_arm.hpp rename to src/hotspot/cpu/arm/depChecker_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/disassembler_arm.hpp b/src/hotspot/cpu/arm/disassembler_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/disassembler_arm.hpp rename to src/hotspot/cpu/arm/disassembler_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/frame_arm.cpp b/src/hotspot/cpu/arm/frame_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/frame_arm.cpp rename to src/hotspot/cpu/arm/frame_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/frame_arm.hpp b/src/hotspot/cpu/arm/frame_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/frame_arm.hpp rename to src/hotspot/cpu/arm/frame_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/frame_arm.inline.hpp b/src/hotspot/cpu/arm/frame_arm.inline.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/frame_arm.inline.hpp rename to src/hotspot/cpu/arm/frame_arm.inline.hpp diff --git a/hotspot/src/cpu/arm/vm/globalDefinitions_arm.hpp b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/globalDefinitions_arm.hpp rename to src/hotspot/cpu/arm/globalDefinitions_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/globals_arm.hpp b/src/hotspot/cpu/arm/globals_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/globals_arm.hpp rename to src/hotspot/cpu/arm/globals_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/icBuffer_arm.cpp b/src/hotspot/cpu/arm/icBuffer_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/icBuffer_arm.cpp rename to src/hotspot/cpu/arm/icBuffer_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/icache_arm.cpp b/src/hotspot/cpu/arm/icache_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/icache_arm.cpp rename to src/hotspot/cpu/arm/icache_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/icache_arm.hpp b/src/hotspot/cpu/arm/icache_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/icache_arm.hpp rename to src/hotspot/cpu/arm/icache_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/interp_masm_arm.cpp b/src/hotspot/cpu/arm/interp_masm_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/interp_masm_arm.cpp rename to src/hotspot/cpu/arm/interp_masm_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/interp_masm_arm.hpp b/src/hotspot/cpu/arm/interp_masm_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/interp_masm_arm.hpp rename to src/hotspot/cpu/arm/interp_masm_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/interpreterRT_arm.cpp b/src/hotspot/cpu/arm/interpreterRT_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/interpreterRT_arm.cpp rename to src/hotspot/cpu/arm/interpreterRT_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/interpreterRT_arm.hpp b/src/hotspot/cpu/arm/interpreterRT_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/interpreterRT_arm.hpp rename to src/hotspot/cpu/arm/interpreterRT_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/javaFrameAnchor_arm.hpp b/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/javaFrameAnchor_arm.hpp rename to src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/jniFastGetField_arm.cpp b/src/hotspot/cpu/arm/jniFastGetField_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/jniFastGetField_arm.cpp rename to src/hotspot/cpu/arm/jniFastGetField_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/jniTypes_arm.hpp b/src/hotspot/cpu/arm/jniTypes_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/jniTypes_arm.hpp rename to src/hotspot/cpu/arm/jniTypes_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/jni_arm.h b/src/hotspot/cpu/arm/jni_arm.h similarity index 100% rename from hotspot/src/cpu/arm/vm/jni_arm.h rename to src/hotspot/cpu/arm/jni_arm.h diff --git a/hotspot/src/cpu/arm/vm/jvmciCodeInstaller_arm.cpp b/src/hotspot/cpu/arm/jvmciCodeInstaller_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/jvmciCodeInstaller_arm.cpp rename to src/hotspot/cpu/arm/jvmciCodeInstaller_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/macroAssembler_arm.cpp b/src/hotspot/cpu/arm/macroAssembler_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/macroAssembler_arm.cpp rename to src/hotspot/cpu/arm/macroAssembler_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/macroAssembler_arm.hpp b/src/hotspot/cpu/arm/macroAssembler_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/macroAssembler_arm.hpp rename to src/hotspot/cpu/arm/macroAssembler_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/macroAssembler_arm.inline.hpp b/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/macroAssembler_arm.inline.hpp rename to src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp diff --git a/hotspot/src/cpu/arm/vm/methodHandles_arm.cpp b/src/hotspot/cpu/arm/methodHandles_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/methodHandles_arm.cpp rename to src/hotspot/cpu/arm/methodHandles_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/methodHandles_arm.hpp b/src/hotspot/cpu/arm/methodHandles_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/methodHandles_arm.hpp rename to src/hotspot/cpu/arm/methodHandles_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/nativeInst_arm.hpp b/src/hotspot/cpu/arm/nativeInst_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/nativeInst_arm.hpp rename to src/hotspot/cpu/arm/nativeInst_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/nativeInst_arm_32.cpp b/src/hotspot/cpu/arm/nativeInst_arm_32.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/nativeInst_arm_32.cpp rename to src/hotspot/cpu/arm/nativeInst_arm_32.cpp diff --git a/hotspot/src/cpu/arm/vm/nativeInst_arm_32.hpp b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/nativeInst_arm_32.hpp rename to src/hotspot/cpu/arm/nativeInst_arm_32.hpp diff --git a/hotspot/src/cpu/arm/vm/nativeInst_arm_64.cpp b/src/hotspot/cpu/arm/nativeInst_arm_64.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/nativeInst_arm_64.cpp rename to src/hotspot/cpu/arm/nativeInst_arm_64.cpp diff --git a/hotspot/src/cpu/arm/vm/nativeInst_arm_64.hpp b/src/hotspot/cpu/arm/nativeInst_arm_64.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/nativeInst_arm_64.hpp rename to src/hotspot/cpu/arm/nativeInst_arm_64.hpp diff --git a/hotspot/src/cpu/arm/vm/registerMap_arm.hpp b/src/hotspot/cpu/arm/registerMap_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/registerMap_arm.hpp rename to src/hotspot/cpu/arm/registerMap_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/register_arm.cpp b/src/hotspot/cpu/arm/register_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/register_arm.cpp rename to src/hotspot/cpu/arm/register_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/register_arm.hpp b/src/hotspot/cpu/arm/register_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/register_arm.hpp rename to src/hotspot/cpu/arm/register_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/register_definitions_arm.cpp b/src/hotspot/cpu/arm/register_definitions_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/register_definitions_arm.cpp rename to src/hotspot/cpu/arm/register_definitions_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/relocInfo_arm.cpp b/src/hotspot/cpu/arm/relocInfo_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/relocInfo_arm.cpp rename to src/hotspot/cpu/arm/relocInfo_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/relocInfo_arm.hpp b/src/hotspot/cpu/arm/relocInfo_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/relocInfo_arm.hpp rename to src/hotspot/cpu/arm/relocInfo_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/runtime_arm.cpp b/src/hotspot/cpu/arm/runtime_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/runtime_arm.cpp rename to src/hotspot/cpu/arm/runtime_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/sharedRuntime_arm.cpp b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/sharedRuntime_arm.cpp rename to src/hotspot/cpu/arm/sharedRuntime_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/stubGenerator_arm.cpp b/src/hotspot/cpu/arm/stubGenerator_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/stubGenerator_arm.cpp rename to src/hotspot/cpu/arm/stubGenerator_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/stubRoutinesCrypto_arm.cpp b/src/hotspot/cpu/arm/stubRoutinesCrypto_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/stubRoutinesCrypto_arm.cpp rename to src/hotspot/cpu/arm/stubRoutinesCrypto_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/stubRoutines_arm.cpp b/src/hotspot/cpu/arm/stubRoutines_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/stubRoutines_arm.cpp rename to src/hotspot/cpu/arm/stubRoutines_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/stubRoutines_arm.hpp b/src/hotspot/cpu/arm/stubRoutines_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/stubRoutines_arm.hpp rename to src/hotspot/cpu/arm/stubRoutines_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/templateInterpreterGenerator_arm.cpp b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/templateInterpreterGenerator_arm.cpp rename to src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/templateTable_arm.cpp b/src/hotspot/cpu/arm/templateTable_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/templateTable_arm.cpp rename to src/hotspot/cpu/arm/templateTable_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/templateTable_arm.hpp b/src/hotspot/cpu/arm/templateTable_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/templateTable_arm.hpp rename to src/hotspot/cpu/arm/templateTable_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/vmStructs_arm.hpp b/src/hotspot/cpu/arm/vmStructs_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/vmStructs_arm.hpp rename to src/hotspot/cpu/arm/vmStructs_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/vm_version_arm.hpp b/src/hotspot/cpu/arm/vm_version_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/vm_version_arm.hpp rename to src/hotspot/cpu/arm/vm_version_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/vm_version_arm_32.cpp b/src/hotspot/cpu/arm/vm_version_arm_32.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/vm_version_arm_32.cpp rename to src/hotspot/cpu/arm/vm_version_arm_32.cpp diff --git a/hotspot/src/cpu/arm/vm/vm_version_arm_64.cpp b/src/hotspot/cpu/arm/vm_version_arm_64.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/vm_version_arm_64.cpp rename to src/hotspot/cpu/arm/vm_version_arm_64.cpp diff --git a/hotspot/src/cpu/arm/vm/vmreg_arm.cpp b/src/hotspot/cpu/arm/vmreg_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/vmreg_arm.cpp rename to src/hotspot/cpu/arm/vmreg_arm.cpp diff --git a/hotspot/src/cpu/arm/vm/vmreg_arm.hpp b/src/hotspot/cpu/arm/vmreg_arm.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/vmreg_arm.hpp rename to src/hotspot/cpu/arm/vmreg_arm.hpp diff --git a/hotspot/src/cpu/arm/vm/vmreg_arm.inline.hpp b/src/hotspot/cpu/arm/vmreg_arm.inline.hpp similarity index 100% rename from hotspot/src/cpu/arm/vm/vmreg_arm.inline.hpp rename to src/hotspot/cpu/arm/vmreg_arm.inline.hpp diff --git a/hotspot/src/cpu/arm/vm/vtableStubs_arm.cpp b/src/hotspot/cpu/arm/vtableStubs_arm.cpp similarity index 100% rename from hotspot/src/cpu/arm/vm/vtableStubs_arm.cpp rename to src/hotspot/cpu/arm/vtableStubs_arm.cpp diff --git a/hotspot/src/cpu/ppc/vm/abstractInterpreter_ppc.cpp b/src/hotspot/cpu/ppc/abstractInterpreter_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/abstractInterpreter_ppc.cpp rename to src/hotspot/cpu/ppc/abstractInterpreter_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp b/src/hotspot/cpu/ppc/assembler_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/assembler_ppc.cpp rename to src/hotspot/cpu/ppc/assembler_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp b/src/hotspot/cpu/ppc/assembler_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/assembler_ppc.hpp rename to src/hotspot/cpu/ppc/assembler_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp rename to src/hotspot/cpu/ppc/assembler_ppc.inline.hpp diff --git a/hotspot/src/cpu/ppc/vm/bytes_ppc.hpp b/src/hotspot/cpu/ppc/bytes_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/bytes_ppc.hpp rename to src/hotspot/cpu/ppc/bytes_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp b/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp rename to src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp b/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp rename to src/hotspot/cpu/ppc/c1_Defs_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/c1_FpuStackSim_ppc.hpp b/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_FpuStackSim_ppc.hpp rename to src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp b/src/hotspot/cpu/ppc/c1_FrameMap_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp rename to src/hotspot/cpu/ppc/c1_FrameMap_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp b/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp rename to src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp rename to src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp rename to src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp rename to src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/c1_LIR_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIR_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_LIR_ppc.cpp rename to src/hotspot/cpu/ppc/c1_LIR_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.cpp b/src/hotspot/cpu/ppc/c1_LinearScan_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.cpp rename to src/hotspot/cpu/ppc/c1_LinearScan_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.hpp b/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.hpp rename to src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp rename to src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.hpp rename to src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp b/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp rename to src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/c1_globals_ppc.hpp b/src/hotspot/cpu/ppc/c1_globals_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c1_globals_ppc.hpp rename to src/hotspot/cpu/ppc/c1_globals_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/c2_globals_ppc.hpp b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c2_globals_ppc.hpp rename to src/hotspot/cpu/ppc/c2_globals_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/c2_init_ppc.cpp b/src/hotspot/cpu/ppc/c2_init_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/c2_init_ppc.cpp rename to src/hotspot/cpu/ppc/c2_init_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/codeBuffer_ppc.hpp b/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/codeBuffer_ppc.hpp rename to src/hotspot/cpu/ppc/codeBuffer_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp b/src/hotspot/cpu/ppc/compiledIC_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp rename to src/hotspot/cpu/ppc/compiledIC_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/copy_ppc.hpp b/src/hotspot/cpu/ppc/copy_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/copy_ppc.hpp rename to src/hotspot/cpu/ppc/copy_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/depChecker_ppc.hpp b/src/hotspot/cpu/ppc/depChecker_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/depChecker_ppc.hpp rename to src/hotspot/cpu/ppc/depChecker_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/disassembler_ppc.hpp b/src/hotspot/cpu/ppc/disassembler_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/disassembler_ppc.hpp rename to src/hotspot/cpu/ppc/disassembler_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/frame_ppc.cpp b/src/hotspot/cpu/ppc/frame_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/frame_ppc.cpp rename to src/hotspot/cpu/ppc/frame_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/frame_ppc.hpp b/src/hotspot/cpu/ppc/frame_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/frame_ppc.hpp rename to src/hotspot/cpu/ppc/frame_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp rename to src/hotspot/cpu/ppc/frame_ppc.inline.hpp diff --git a/hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp b/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp rename to src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/globals_ppc.hpp b/src/hotspot/cpu/ppc/globals_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/globals_ppc.hpp rename to src/hotspot/cpu/ppc/globals_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp b/src/hotspot/cpu/ppc/icBuffer_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp rename to src/hotspot/cpu/ppc/icBuffer_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/icache_ppc.cpp b/src/hotspot/cpu/ppc/icache_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/icache_ppc.cpp rename to src/hotspot/cpu/ppc/icache_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/icache_ppc.hpp b/src/hotspot/cpu/ppc/icache_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/icache_ppc.hpp rename to src/hotspot/cpu/ppc/icache_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp rename to src/hotspot/cpu/ppc/interp_masm_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp rename to src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp diff --git a/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp b/src/hotspot/cpu/ppc/interpreterRT_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp rename to src/hotspot/cpu/ppc/interpreterRT_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.hpp b/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/interpreterRT_ppc.hpp rename to src/hotspot/cpu/ppc/interpreterRT_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp b/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp rename to src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/jniFastGetField_ppc.cpp b/src/hotspot/cpu/ppc/jniFastGetField_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/jniFastGetField_ppc.cpp rename to src/hotspot/cpu/ppc/jniFastGetField_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/jniTypes_ppc.hpp b/src/hotspot/cpu/ppc/jniTypes_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/jniTypes_ppc.hpp rename to src/hotspot/cpu/ppc/jniTypes_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/jni_ppc.h b/src/hotspot/cpu/ppc/jni_ppc.h similarity index 100% rename from hotspot/src/cpu/ppc/vm/jni_ppc.h rename to src/hotspot/cpu/ppc/jni_ppc.h diff --git a/hotspot/src/cpu/ppc/vm/jvmciCodeInstaller_ppc.cpp b/src/hotspot/cpu/ppc/jvmciCodeInstaller_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/jvmciCodeInstaller_ppc.cpp rename to src/hotspot/cpu/ppc/jvmciCodeInstaller_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp rename to src/hotspot/cpu/ppc/macroAssembler_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp rename to src/hotspot/cpu/ppc/macroAssembler_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp rename to src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp diff --git a/hotspot/src/cpu/ppc/vm/methodHandles_ppc.cpp b/src/hotspot/cpu/ppc/methodHandles_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/methodHandles_ppc.cpp rename to src/hotspot/cpu/ppc/methodHandles_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/methodHandles_ppc.hpp b/src/hotspot/cpu/ppc/methodHandles_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/methodHandles_ppc.hpp rename to src/hotspot/cpu/ppc/methodHandles_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/nativeInst_ppc.cpp b/src/hotspot/cpu/ppc/nativeInst_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/nativeInst_ppc.cpp rename to src/hotspot/cpu/ppc/nativeInst_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp b/src/hotspot/cpu/ppc/nativeInst_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp rename to src/hotspot/cpu/ppc/nativeInst_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad similarity index 100% rename from hotspot/src/cpu/ppc/vm/ppc.ad rename to src/hotspot/cpu/ppc/ppc.ad diff --git a/hotspot/src/cpu/ppc/vm/registerMap_ppc.hpp b/src/hotspot/cpu/ppc/registerMap_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/registerMap_ppc.hpp rename to src/hotspot/cpu/ppc/registerMap_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp b/src/hotspot/cpu/ppc/register_definitions_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp rename to src/hotspot/cpu/ppc/register_definitions_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/register_ppc.cpp b/src/hotspot/cpu/ppc/register_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/register_ppc.cpp rename to src/hotspot/cpu/ppc/register_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/register_ppc.hpp b/src/hotspot/cpu/ppc/register_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/register_ppc.hpp rename to src/hotspot/cpu/ppc/register_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/relocInfo_ppc.cpp b/src/hotspot/cpu/ppc/relocInfo_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/relocInfo_ppc.cpp rename to src/hotspot/cpu/ppc/relocInfo_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/relocInfo_ppc.hpp b/src/hotspot/cpu/ppc/relocInfo_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/relocInfo_ppc.hpp rename to src/hotspot/cpu/ppc/relocInfo_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/runtime_ppc.cpp b/src/hotspot/cpu/ppc/runtime_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/runtime_ppc.cpp rename to src/hotspot/cpu/ppc/runtime_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp rename to src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp rename to src/hotspot/cpu/ppc/stubGenerator_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/stubRoutines_ppc.hpp b/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/stubRoutines_ppc.hpp rename to src/hotspot/cpu/ppc/stubRoutines_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp b/src/hotspot/cpu/ppc/stubRoutines_ppc_64.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp rename to src/hotspot/cpu/ppc/stubRoutines_ppc_64.cpp diff --git a/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp rename to src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/templateTable_ppc.hpp b/src/hotspot/cpu/ppc/templateTable_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/templateTable_ppc.hpp rename to src/hotspot/cpu/ppc/templateTable_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp rename to src/hotspot/cpu/ppc/templateTable_ppc_64.cpp diff --git a/hotspot/src/cpu/ppc/vm/vmStructs_ppc.hpp b/src/hotspot/cpu/ppc/vmStructs_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/vmStructs_ppc.hpp rename to src/hotspot/cpu/ppc/vmStructs_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp rename to src/hotspot/cpu/ppc/vm_version_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp b/src/hotspot/cpu/ppc/vm_version_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp rename to src/hotspot/cpu/ppc/vm_version_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp b/src/hotspot/cpu/ppc/vmreg_ppc.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp rename to src/hotspot/cpu/ppc/vmreg_ppc.cpp diff --git a/hotspot/src/cpu/ppc/vm/vmreg_ppc.hpp b/src/hotspot/cpu/ppc/vmreg_ppc.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/vmreg_ppc.hpp rename to src/hotspot/cpu/ppc/vmreg_ppc.hpp diff --git a/hotspot/src/cpu/ppc/vm/vmreg_ppc.inline.hpp b/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/vmreg_ppc.inline.hpp rename to src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp diff --git a/hotspot/src/cpu/ppc/vm/vtableStubs_ppc_64.cpp b/src/hotspot/cpu/ppc/vtableStubs_ppc_64.cpp similarity index 100% rename from hotspot/src/cpu/ppc/vm/vtableStubs_ppc_64.cpp rename to src/hotspot/cpu/ppc/vtableStubs_ppc_64.cpp diff --git a/hotspot/src/cpu/s390/vm/abstractInterpreter_s390.cpp b/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/abstractInterpreter_s390.cpp rename to src/hotspot/cpu/s390/abstractInterpreter_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/assembler_s390.cpp b/src/hotspot/cpu/s390/assembler_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/assembler_s390.cpp rename to src/hotspot/cpu/s390/assembler_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/assembler_s390.hpp b/src/hotspot/cpu/s390/assembler_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/assembler_s390.hpp rename to src/hotspot/cpu/s390/assembler_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/assembler_s390.inline.hpp b/src/hotspot/cpu/s390/assembler_s390.inline.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/assembler_s390.inline.hpp rename to src/hotspot/cpu/s390/assembler_s390.inline.hpp diff --git a/hotspot/src/cpu/s390/vm/bytes_s390.hpp b/src/hotspot/cpu/s390/bytes_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/bytes_s390.hpp rename to src/hotspot/cpu/s390/bytes_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/c1_CodeStubs_s390.cpp b/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_CodeStubs_s390.cpp rename to src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/c1_Defs_s390.hpp b/src/hotspot/cpu/s390/c1_Defs_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_Defs_s390.hpp rename to src/hotspot/cpu/s390/c1_Defs_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/c1_FpuStackSim_s390.hpp b/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_FpuStackSim_s390.hpp rename to src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/c1_FrameMap_s390.cpp b/src/hotspot/cpu/s390/c1_FrameMap_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_FrameMap_s390.cpp rename to src/hotspot/cpu/s390/c1_FrameMap_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/c1_FrameMap_s390.hpp b/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_FrameMap_s390.hpp rename to src/hotspot/cpu/s390/c1_FrameMap_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/c1_LIRAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_LIRAssembler_s390.cpp rename to src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/c1_LIRAssembler_s390.hpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_LIRAssembler_s390.hpp rename to src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/c1_LIRGenerator_s390.cpp b/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_LIRGenerator_s390.cpp rename to src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/c1_LIR_s390.cpp b/src/hotspot/cpu/s390/c1_LIR_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_LIR_s390.cpp rename to src/hotspot/cpu/s390/c1_LIR_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/c1_LinearScan_s390.cpp b/src/hotspot/cpu/s390/c1_LinearScan_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_LinearScan_s390.cpp rename to src/hotspot/cpu/s390/c1_LinearScan_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/c1_LinearScan_s390.hpp b/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_LinearScan_s390.hpp rename to src/hotspot/cpu/s390/c1_LinearScan_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/c1_MacroAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_MacroAssembler_s390.cpp rename to src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/c1_MacroAssembler_s390.hpp b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_MacroAssembler_s390.hpp rename to src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/c1_Runtime1_s390.cpp b/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_Runtime1_s390.cpp rename to src/hotspot/cpu/s390/c1_Runtime1_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/c1_globals_s390.hpp b/src/hotspot/cpu/s390/c1_globals_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c1_globals_s390.hpp rename to src/hotspot/cpu/s390/c1_globals_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/c2_globals_s390.hpp b/src/hotspot/cpu/s390/c2_globals_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c2_globals_s390.hpp rename to src/hotspot/cpu/s390/c2_globals_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/c2_init_s390.cpp b/src/hotspot/cpu/s390/c2_init_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/c2_init_s390.cpp rename to src/hotspot/cpu/s390/c2_init_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/codeBuffer_s390.hpp b/src/hotspot/cpu/s390/codeBuffer_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/codeBuffer_s390.hpp rename to src/hotspot/cpu/s390/codeBuffer_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/compiledIC_s390.cpp b/src/hotspot/cpu/s390/compiledIC_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/compiledIC_s390.cpp rename to src/hotspot/cpu/s390/compiledIC_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/copy_s390.hpp b/src/hotspot/cpu/s390/copy_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/copy_s390.hpp rename to src/hotspot/cpu/s390/copy_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/depChecker_s390.hpp b/src/hotspot/cpu/s390/depChecker_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/depChecker_s390.hpp rename to src/hotspot/cpu/s390/depChecker_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/disassembler_s390.hpp b/src/hotspot/cpu/s390/disassembler_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/disassembler_s390.hpp rename to src/hotspot/cpu/s390/disassembler_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/frame_s390.cpp b/src/hotspot/cpu/s390/frame_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/frame_s390.cpp rename to src/hotspot/cpu/s390/frame_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/frame_s390.hpp b/src/hotspot/cpu/s390/frame_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/frame_s390.hpp rename to src/hotspot/cpu/s390/frame_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/frame_s390.inline.hpp rename to src/hotspot/cpu/s390/frame_s390.inline.hpp diff --git a/hotspot/src/cpu/s390/vm/globalDefinitions_s390.hpp b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/globalDefinitions_s390.hpp rename to src/hotspot/cpu/s390/globalDefinitions_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/globals_s390.hpp b/src/hotspot/cpu/s390/globals_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/globals_s390.hpp rename to src/hotspot/cpu/s390/globals_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/icBuffer_s390.cpp b/src/hotspot/cpu/s390/icBuffer_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/icBuffer_s390.cpp rename to src/hotspot/cpu/s390/icBuffer_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/icache_s390.cpp b/src/hotspot/cpu/s390/icache_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/icache_s390.cpp rename to src/hotspot/cpu/s390/icache_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/icache_s390.hpp b/src/hotspot/cpu/s390/icache_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/icache_s390.hpp rename to src/hotspot/cpu/s390/icache_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/interp_masm_s390.cpp rename to src/hotspot/cpu/s390/interp_masm_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/interp_masm_s390.hpp b/src/hotspot/cpu/s390/interp_masm_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/interp_masm_s390.hpp rename to src/hotspot/cpu/s390/interp_masm_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/interpreterRT_s390.cpp b/src/hotspot/cpu/s390/interpreterRT_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/interpreterRT_s390.cpp rename to src/hotspot/cpu/s390/interpreterRT_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/interpreterRT_s390.hpp b/src/hotspot/cpu/s390/interpreterRT_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/interpreterRT_s390.hpp rename to src/hotspot/cpu/s390/interpreterRT_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/javaFrameAnchor_s390.hpp b/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/javaFrameAnchor_s390.hpp rename to src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/jniFastGetField_s390.cpp b/src/hotspot/cpu/s390/jniFastGetField_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/jniFastGetField_s390.cpp rename to src/hotspot/cpu/s390/jniFastGetField_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/jniTypes_s390.hpp b/src/hotspot/cpu/s390/jniTypes_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/jniTypes_s390.hpp rename to src/hotspot/cpu/s390/jniTypes_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/jni_s390.h b/src/hotspot/cpu/s390/jni_s390.h similarity index 100% rename from hotspot/src/cpu/s390/vm/jni_s390.h rename to src/hotspot/cpu/s390/jni_s390.h diff --git a/hotspot/src/cpu/s390/vm/jvmciCodeInstaller_s390.cpp b/src/hotspot/cpu/s390/jvmciCodeInstaller_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/jvmciCodeInstaller_s390.cpp rename to src/hotspot/cpu/s390/jvmciCodeInstaller_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/macroAssembler_s390.cpp rename to src/hotspot/cpu/s390/macroAssembler_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/macroAssembler_s390.hpp b/src/hotspot/cpu/s390/macroAssembler_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/macroAssembler_s390.hpp rename to src/hotspot/cpu/s390/macroAssembler_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/macroAssembler_s390.inline.hpp b/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/macroAssembler_s390.inline.hpp rename to src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp diff --git a/hotspot/src/cpu/s390/vm/methodHandles_s390.cpp b/src/hotspot/cpu/s390/methodHandles_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/methodHandles_s390.cpp rename to src/hotspot/cpu/s390/methodHandles_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/methodHandles_s390.hpp b/src/hotspot/cpu/s390/methodHandles_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/methodHandles_s390.hpp rename to src/hotspot/cpu/s390/methodHandles_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/nativeInst_s390.cpp b/src/hotspot/cpu/s390/nativeInst_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/nativeInst_s390.cpp rename to src/hotspot/cpu/s390/nativeInst_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/nativeInst_s390.hpp b/src/hotspot/cpu/s390/nativeInst_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/nativeInst_s390.hpp rename to src/hotspot/cpu/s390/nativeInst_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/registerMap_s390.hpp b/src/hotspot/cpu/s390/registerMap_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/registerMap_s390.hpp rename to src/hotspot/cpu/s390/registerMap_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/registerSaver_s390.hpp b/src/hotspot/cpu/s390/registerSaver_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/registerSaver_s390.hpp rename to src/hotspot/cpu/s390/registerSaver_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/register_definitions_s390.cpp b/src/hotspot/cpu/s390/register_definitions_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/register_definitions_s390.cpp rename to src/hotspot/cpu/s390/register_definitions_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/register_s390.cpp b/src/hotspot/cpu/s390/register_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/register_s390.cpp rename to src/hotspot/cpu/s390/register_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/register_s390.hpp b/src/hotspot/cpu/s390/register_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/register_s390.hpp rename to src/hotspot/cpu/s390/register_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/relocInfo_s390.cpp b/src/hotspot/cpu/s390/relocInfo_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/relocInfo_s390.cpp rename to src/hotspot/cpu/s390/relocInfo_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/relocInfo_s390.hpp b/src/hotspot/cpu/s390/relocInfo_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/relocInfo_s390.hpp rename to src/hotspot/cpu/s390/relocInfo_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/runtime_s390.cpp b/src/hotspot/cpu/s390/runtime_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/runtime_s390.cpp rename to src/hotspot/cpu/s390/runtime_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/s390.ad b/src/hotspot/cpu/s390/s390.ad similarity index 100% rename from hotspot/src/cpu/s390/vm/s390.ad rename to src/hotspot/cpu/s390/s390.ad diff --git a/hotspot/src/cpu/s390/vm/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/sharedRuntime_s390.cpp rename to src/hotspot/cpu/s390/sharedRuntime_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/stubGenerator_s390.cpp b/src/hotspot/cpu/s390/stubGenerator_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/stubGenerator_s390.cpp rename to src/hotspot/cpu/s390/stubGenerator_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/stubRoutines_s390.cpp b/src/hotspot/cpu/s390/stubRoutines_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/stubRoutines_s390.cpp rename to src/hotspot/cpu/s390/stubRoutines_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/stubRoutines_s390.hpp b/src/hotspot/cpu/s390/stubRoutines_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/stubRoutines_s390.hpp rename to src/hotspot/cpu/s390/stubRoutines_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/templateInterpreterGenerator_s390.cpp rename to src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/templateTable_s390.cpp b/src/hotspot/cpu/s390/templateTable_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/templateTable_s390.cpp rename to src/hotspot/cpu/s390/templateTable_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/templateTable_s390.hpp b/src/hotspot/cpu/s390/templateTable_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/templateTable_s390.hpp rename to src/hotspot/cpu/s390/templateTable_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/vmStructs_s390.hpp b/src/hotspot/cpu/s390/vmStructs_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/vmStructs_s390.hpp rename to src/hotspot/cpu/s390/vmStructs_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/vm_version_s390.cpp b/src/hotspot/cpu/s390/vm_version_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/vm_version_s390.cpp rename to src/hotspot/cpu/s390/vm_version_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/vm_version_s390.hpp b/src/hotspot/cpu/s390/vm_version_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/vm_version_s390.hpp rename to src/hotspot/cpu/s390/vm_version_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/vmreg_s390.cpp b/src/hotspot/cpu/s390/vmreg_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/vmreg_s390.cpp rename to src/hotspot/cpu/s390/vmreg_s390.cpp diff --git a/hotspot/src/cpu/s390/vm/vmreg_s390.hpp b/src/hotspot/cpu/s390/vmreg_s390.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/vmreg_s390.hpp rename to src/hotspot/cpu/s390/vmreg_s390.hpp diff --git a/hotspot/src/cpu/s390/vm/vmreg_s390.inline.hpp b/src/hotspot/cpu/s390/vmreg_s390.inline.hpp similarity index 100% rename from hotspot/src/cpu/s390/vm/vmreg_s390.inline.hpp rename to src/hotspot/cpu/s390/vmreg_s390.inline.hpp diff --git a/hotspot/src/cpu/s390/vm/vtableStubs_s390.cpp b/src/hotspot/cpu/s390/vtableStubs_s390.cpp similarity index 100% rename from hotspot/src/cpu/s390/vm/vtableStubs_s390.cpp rename to src/hotspot/cpu/s390/vtableStubs_s390.cpp diff --git a/hotspot/src/cpu/sparc/vm/abstractInterpreter_sparc.cpp b/src/hotspot/cpu/sparc/abstractInterpreter_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/abstractInterpreter_sparc.cpp rename to src/hotspot/cpu/sparc/abstractInterpreter_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/args.cc b/src/hotspot/cpu/sparc/args.cc similarity index 100% rename from hotspot/src/cpu/sparc/vm/args.cc rename to src/hotspot/cpu/sparc/args.cc diff --git a/hotspot/src/cpu/sparc/vm/assembler_sparc.cpp b/src/hotspot/cpu/sparc/assembler_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/assembler_sparc.cpp rename to src/hotspot/cpu/sparc/assembler_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp b/src/hotspot/cpu/sparc/assembler_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/assembler_sparc.hpp rename to src/hotspot/cpu/sparc/assembler_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp b/src/hotspot/cpu/sparc/assembler_sparc.inline.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp rename to src/hotspot/cpu/sparc/assembler_sparc.inline.hpp diff --git a/hotspot/src/cpu/sparc/vm/bytes_sparc.hpp b/src/hotspot/cpu/sparc/bytes_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/bytes_sparc.hpp rename to src/hotspot/cpu/sparc/bytes_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp b/src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp rename to src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/c1_Defs_sparc.hpp b/src/hotspot/cpu/sparc/c1_Defs_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_Defs_sparc.hpp rename to src/hotspot/cpu/sparc/c1_Defs_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/c1_FpuStackSim_sparc.cpp b/src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_FpuStackSim_sparc.cpp rename to src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/c1_FpuStackSim_sparc.hpp b/src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_FpuStackSim_sparc.hpp rename to src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp b/src/hotspot/cpu/sparc/c1_FrameMap_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp rename to src/hotspot/cpu/sparc/c1_FrameMap_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/c1_FrameMap_sparc.hpp b/src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_FrameMap_sparc.hpp rename to src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp b/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp rename to src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.hpp b/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.hpp rename to src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp b/src/hotspot/cpu/sparc/c1_LIRGenerator_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp rename to src/hotspot/cpu/sparc/c1_LIRGenerator_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/c1_LIR_sparc.cpp b/src/hotspot/cpu/sparc/c1_LIR_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_LIR_sparc.cpp rename to src/hotspot/cpu/sparc/c1_LIR_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/c1_LinearScan_sparc.cpp b/src/hotspot/cpu/sparc/c1_LinearScan_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_LinearScan_sparc.cpp rename to src/hotspot/cpu/sparc/c1_LinearScan_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/c1_LinearScan_sparc.hpp b/src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_LinearScan_sparc.hpp rename to src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp b/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp rename to src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.hpp b/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.hpp rename to src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp b/src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp rename to src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/c1_globals_sparc.hpp b/src/hotspot/cpu/sparc/c1_globals_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c1_globals_sparc.hpp rename to src/hotspot/cpu/sparc/c1_globals_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/c2_globals_sparc.hpp b/src/hotspot/cpu/sparc/c2_globals_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c2_globals_sparc.hpp rename to src/hotspot/cpu/sparc/c2_globals_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/c2_init_sparc.cpp b/src/hotspot/cpu/sparc/c2_init_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/c2_init_sparc.cpp rename to src/hotspot/cpu/sparc/c2_init_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/codeBuffer_sparc.hpp b/src/hotspot/cpu/sparc/codeBuffer_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/codeBuffer_sparc.hpp rename to src/hotspot/cpu/sparc/codeBuffer_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp b/src/hotspot/cpu/sparc/compiledIC_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp rename to src/hotspot/cpu/sparc/compiledIC_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/copy_sparc.hpp b/src/hotspot/cpu/sparc/copy_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/copy_sparc.hpp rename to src/hotspot/cpu/sparc/copy_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/depChecker_sparc.cpp b/src/hotspot/cpu/sparc/depChecker_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/depChecker_sparc.cpp rename to src/hotspot/cpu/sparc/depChecker_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/depChecker_sparc.hpp b/src/hotspot/cpu/sparc/depChecker_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/depChecker_sparc.hpp rename to src/hotspot/cpu/sparc/depChecker_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/disassembler_sparc.hpp b/src/hotspot/cpu/sparc/disassembler_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/disassembler_sparc.hpp rename to src/hotspot/cpu/sparc/disassembler_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/frame_sparc.cpp b/src/hotspot/cpu/sparc/frame_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/frame_sparc.cpp rename to src/hotspot/cpu/sparc/frame_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/frame_sparc.hpp b/src/hotspot/cpu/sparc/frame_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/frame_sparc.hpp rename to src/hotspot/cpu/sparc/frame_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp b/src/hotspot/cpu/sparc/frame_sparc.inline.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp rename to src/hotspot/cpu/sparc/frame_sparc.inline.hpp diff --git a/hotspot/src/cpu/sparc/vm/globalDefinitions_sparc.hpp b/src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/globalDefinitions_sparc.hpp rename to src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp b/src/hotspot/cpu/sparc/globals_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/globals_sparc.hpp rename to src/hotspot/cpu/sparc/globals_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/icBuffer_sparc.cpp b/src/hotspot/cpu/sparc/icBuffer_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/icBuffer_sparc.cpp rename to src/hotspot/cpu/sparc/icBuffer_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/icache_sparc.cpp b/src/hotspot/cpu/sparc/icache_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/icache_sparc.cpp rename to src/hotspot/cpu/sparc/icache_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/icache_sparc.hpp b/src/hotspot/cpu/sparc/icache_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/icache_sparc.hpp rename to src/hotspot/cpu/sparc/icache_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp b/src/hotspot/cpu/sparc/interp_masm_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp rename to src/hotspot/cpu/sparc/interp_masm_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp b/src/hotspot/cpu/sparc/interp_masm_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp rename to src/hotspot/cpu/sparc/interp_masm_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/interpreterRT_sparc.cpp b/src/hotspot/cpu/sparc/interpreterRT_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/interpreterRT_sparc.cpp rename to src/hotspot/cpu/sparc/interpreterRT_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/interpreterRT_sparc.hpp b/src/hotspot/cpu/sparc/interpreterRT_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/interpreterRT_sparc.hpp rename to src/hotspot/cpu/sparc/interpreterRT_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/javaFrameAnchor_sparc.hpp b/src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/javaFrameAnchor_sparc.hpp rename to src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/jniFastGetField_sparc.cpp b/src/hotspot/cpu/sparc/jniFastGetField_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/jniFastGetField_sparc.cpp rename to src/hotspot/cpu/sparc/jniFastGetField_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/jniTypes_sparc.hpp b/src/hotspot/cpu/sparc/jniTypes_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/jniTypes_sparc.hpp rename to src/hotspot/cpu/sparc/jniTypes_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/jni_sparc.h b/src/hotspot/cpu/sparc/jni_sparc.h similarity index 100% rename from hotspot/src/cpu/sparc/vm/jni_sparc.h rename to src/hotspot/cpu/sparc/jni_sparc.h diff --git a/hotspot/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp b/src/hotspot/cpu/sparc/jvmciCodeInstaller_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp rename to src/hotspot/cpu/sparc/jvmciCodeInstaller_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp b/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp rename to src/hotspot/cpu/sparc/macroAssembler_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.hpp b/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/macroAssembler_sparc.hpp rename to src/hotspot/cpu/sparc/macroAssembler_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp b/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp rename to src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp diff --git a/hotspot/src/cpu/sparc/vm/memset_with_concurrent_readers_sparc.cpp b/src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/memset_with_concurrent_readers_sparc.cpp rename to src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp b/src/hotspot/cpu/sparc/methodHandles_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp rename to src/hotspot/cpu/sparc/methodHandles_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.hpp b/src/hotspot/cpu/sparc/methodHandles_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/methodHandles_sparc.hpp rename to src/hotspot/cpu/sparc/methodHandles_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/nativeInst_sparc.cpp b/src/hotspot/cpu/sparc/nativeInst_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/nativeInst_sparc.cpp rename to src/hotspot/cpu/sparc/nativeInst_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/nativeInst_sparc.hpp b/src/hotspot/cpu/sparc/nativeInst_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/nativeInst_sparc.hpp rename to src/hotspot/cpu/sparc/nativeInst_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/registerMap_sparc.hpp b/src/hotspot/cpu/sparc/registerMap_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/registerMap_sparc.hpp rename to src/hotspot/cpu/sparc/registerMap_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/register_definitions_sparc.cpp b/src/hotspot/cpu/sparc/register_definitions_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/register_definitions_sparc.cpp rename to src/hotspot/cpu/sparc/register_definitions_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/register_sparc.cpp b/src/hotspot/cpu/sparc/register_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/register_sparc.cpp rename to src/hotspot/cpu/sparc/register_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/register_sparc.hpp b/src/hotspot/cpu/sparc/register_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/register_sparc.hpp rename to src/hotspot/cpu/sparc/register_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/relocInfo_sparc.cpp b/src/hotspot/cpu/sparc/relocInfo_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/relocInfo_sparc.cpp rename to src/hotspot/cpu/sparc/relocInfo_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/relocInfo_sparc.hpp b/src/hotspot/cpu/sparc/relocInfo_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/relocInfo_sparc.hpp rename to src/hotspot/cpu/sparc/relocInfo_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/runtime_sparc.cpp b/src/hotspot/cpu/sparc/runtime_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/runtime_sparc.cpp rename to src/hotspot/cpu/sparc/runtime_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp b/src/hotspot/cpu/sparc/sharedRuntime_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp rename to src/hotspot/cpu/sparc/sharedRuntime_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/sparc.ad b/src/hotspot/cpu/sparc/sparc.ad similarity index 100% rename from hotspot/src/cpu/sparc/vm/sparc.ad rename to src/hotspot/cpu/sparc/sparc.ad diff --git a/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp b/src/hotspot/cpu/sparc/stubGenerator_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp rename to src/hotspot/cpu/sparc/stubGenerator_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/stubRoutines_sparc.cpp b/src/hotspot/cpu/sparc/stubRoutines_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/stubRoutines_sparc.cpp rename to src/hotspot/cpu/sparc/stubRoutines_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/stubRoutines_sparc.hpp b/src/hotspot/cpu/sparc/stubRoutines_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/stubRoutines_sparc.hpp rename to src/hotspot/cpu/sparc/stubRoutines_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp b/src/hotspot/cpu/sparc/templateInterpreterGenerator_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp rename to src/hotspot/cpu/sparc/templateInterpreterGenerator_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp b/src/hotspot/cpu/sparc/templateTable_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp rename to src/hotspot/cpu/sparc/templateTable_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/templateTable_sparc.hpp b/src/hotspot/cpu/sparc/templateTable_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/templateTable_sparc.hpp rename to src/hotspot/cpu/sparc/templateTable_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/vmStructs_sparc.hpp b/src/hotspot/cpu/sparc/vmStructs_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/vmStructs_sparc.hpp rename to src/hotspot/cpu/sparc/vmStructs_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp b/src/hotspot/cpu/sparc/vm_version_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp rename to src/hotspot/cpu/sparc/vm_version_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/vm_version_sparc.hpp b/src/hotspot/cpu/sparc/vm_version_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/vm_version_sparc.hpp rename to src/hotspot/cpu/sparc/vm_version_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/vmreg_sparc.cpp b/src/hotspot/cpu/sparc/vmreg_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/vmreg_sparc.cpp rename to src/hotspot/cpu/sparc/vmreg_sparc.cpp diff --git a/hotspot/src/cpu/sparc/vm/vmreg_sparc.hpp b/src/hotspot/cpu/sparc/vmreg_sparc.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/vmreg_sparc.hpp rename to src/hotspot/cpu/sparc/vmreg_sparc.hpp diff --git a/hotspot/src/cpu/sparc/vm/vmreg_sparc.inline.hpp b/src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/vmreg_sparc.inline.hpp rename to src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp diff --git a/hotspot/src/cpu/sparc/vm/vtableStubs_sparc.cpp b/src/hotspot/cpu/sparc/vtableStubs_sparc.cpp similarity index 100% rename from hotspot/src/cpu/sparc/vm/vtableStubs_sparc.cpp rename to src/hotspot/cpu/sparc/vtableStubs_sparc.cpp diff --git a/hotspot/src/cpu/x86/vm/abstractInterpreter_x86.cpp b/src/hotspot/cpu/x86/abstractInterpreter_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/abstractInterpreter_x86.cpp rename to src/hotspot/cpu/x86/abstractInterpreter_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/assembler_x86.cpp rename to src/hotspot/cpu/x86/assembler_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/assembler_x86.hpp rename to src/hotspot/cpu/x86/assembler_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.inline.hpp b/src/hotspot/cpu/x86/assembler_x86.inline.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/assembler_x86.inline.hpp rename to src/hotspot/cpu/x86/assembler_x86.inline.hpp diff --git a/hotspot/src/cpu/x86/vm/bytes_x86.hpp b/src/hotspot/cpu/x86/bytes_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/bytes_x86.hpp rename to src/hotspot/cpu/x86/bytes_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp b/src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp rename to src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/c1_Defs_x86.hpp b/src/hotspot/cpu/x86/c1_Defs_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_Defs_x86.hpp rename to src/hotspot/cpu/x86/c1_Defs_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp b/src/hotspot/cpu/x86/c1_FpuStackSim_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp rename to src/hotspot/cpu/x86/c1_FpuStackSim_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/c1_FpuStackSim_x86.hpp b/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_FpuStackSim_x86.hpp rename to src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/c1_FrameMap_x86.cpp b/src/hotspot/cpu/x86/c1_FrameMap_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_FrameMap_x86.cpp rename to src/hotspot/cpu/x86/c1_FrameMap_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/c1_FrameMap_x86.hpp b/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_FrameMap_x86.hpp rename to src/hotspot/cpu/x86/c1_FrameMap_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp rename to src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.hpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.hpp rename to src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp rename to src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/c1_LIR_x86.cpp b/src/hotspot/cpu/x86/c1_LIR_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_LIR_x86.cpp rename to src/hotspot/cpu/x86/c1_LIR_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/c1_LinearScan_x86.cpp b/src/hotspot/cpu/x86/c1_LinearScan_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_LinearScan_x86.cpp rename to src/hotspot/cpu/x86/c1_LinearScan_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/c1_LinearScan_x86.hpp b/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_LinearScan_x86.hpp rename to src/hotspot/cpu/x86/c1_LinearScan_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp rename to src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.hpp rename to src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp rename to src/hotspot/cpu/x86/c1_Runtime1_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/c1_globals_x86.hpp b/src/hotspot/cpu/x86/c1_globals_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c1_globals_x86.hpp rename to src/hotspot/cpu/x86/c1_globals_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp b/src/hotspot/cpu/x86/c2_globals_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c2_globals_x86.hpp rename to src/hotspot/cpu/x86/c2_globals_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/c2_init_x86.cpp b/src/hotspot/cpu/x86/c2_init_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/c2_init_x86.cpp rename to src/hotspot/cpu/x86/c2_init_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/codeBuffer_x86.hpp b/src/hotspot/cpu/x86/codeBuffer_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/codeBuffer_x86.hpp rename to src/hotspot/cpu/x86/codeBuffer_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/compiledIC_aot_x86_64.cpp b/src/hotspot/cpu/x86/compiledIC_aot_x86_64.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/compiledIC_aot_x86_64.cpp rename to src/hotspot/cpu/x86/compiledIC_aot_x86_64.cpp diff --git a/hotspot/src/cpu/x86/vm/compiledIC_x86.cpp b/src/hotspot/cpu/x86/compiledIC_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/compiledIC_x86.cpp rename to src/hotspot/cpu/x86/compiledIC_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/copy_x86.hpp b/src/hotspot/cpu/x86/copy_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/copy_x86.hpp rename to src/hotspot/cpu/x86/copy_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/crc32c.h b/src/hotspot/cpu/x86/crc32c.h similarity index 100% rename from hotspot/src/cpu/x86/vm/crc32c.h rename to src/hotspot/cpu/x86/crc32c.h diff --git a/hotspot/src/cpu/x86/vm/depChecker_x86.cpp b/src/hotspot/cpu/x86/depChecker_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/depChecker_x86.cpp rename to src/hotspot/cpu/x86/depChecker_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/depChecker_x86.hpp b/src/hotspot/cpu/x86/depChecker_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/depChecker_x86.hpp rename to src/hotspot/cpu/x86/depChecker_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/disassembler_x86.hpp b/src/hotspot/cpu/x86/disassembler_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/disassembler_x86.hpp rename to src/hotspot/cpu/x86/disassembler_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/frame_x86.cpp b/src/hotspot/cpu/x86/frame_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/frame_x86.cpp rename to src/hotspot/cpu/x86/frame_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/frame_x86.hpp b/src/hotspot/cpu/x86/frame_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/frame_x86.hpp rename to src/hotspot/cpu/x86/frame_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/frame_x86.inline.hpp b/src/hotspot/cpu/x86/frame_x86.inline.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/frame_x86.inline.hpp rename to src/hotspot/cpu/x86/frame_x86.inline.hpp diff --git a/hotspot/src/cpu/x86/vm/globalDefinitions_x86.hpp b/src/hotspot/cpu/x86/globalDefinitions_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/globalDefinitions_x86.hpp rename to src/hotspot/cpu/x86/globalDefinitions_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/globals_x86.hpp b/src/hotspot/cpu/x86/globals_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/globals_x86.hpp rename to src/hotspot/cpu/x86/globals_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/icBuffer_x86.cpp b/src/hotspot/cpu/x86/icBuffer_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/icBuffer_x86.cpp rename to src/hotspot/cpu/x86/icBuffer_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/icache_x86.cpp b/src/hotspot/cpu/x86/icache_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/icache_x86.cpp rename to src/hotspot/cpu/x86/icache_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/icache_x86.hpp b/src/hotspot/cpu/x86/icache_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/icache_x86.hpp rename to src/hotspot/cpu/x86/icache_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/interp_masm_x86.cpp rename to src/hotspot/cpu/x86/interp_masm_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86.hpp b/src/hotspot/cpu/x86/interp_masm_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/interp_masm_x86.hpp rename to src/hotspot/cpu/x86/interp_masm_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/interpreterRT_x86.hpp b/src/hotspot/cpu/x86/interpreterRT_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/interpreterRT_x86.hpp rename to src/hotspot/cpu/x86/interpreterRT_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp b/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp rename to src/hotspot/cpu/x86/interpreterRT_x86_32.cpp diff --git a/hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp rename to src/hotspot/cpu/x86/interpreterRT_x86_64.cpp diff --git a/hotspot/src/cpu/x86/vm/javaFrameAnchor_x86.hpp b/src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/javaFrameAnchor_x86.hpp rename to src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/jniFastGetField_x86_32.cpp b/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/jniFastGetField_x86_32.cpp rename to src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp diff --git a/hotspot/src/cpu/x86/vm/jniFastGetField_x86_64.cpp b/src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/jniFastGetField_x86_64.cpp rename to src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp diff --git a/hotspot/src/cpu/x86/vm/jniTypes_x86.hpp b/src/hotspot/cpu/x86/jniTypes_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/jniTypes_x86.hpp rename to src/hotspot/cpu/x86/jniTypes_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/jni_x86.h b/src/hotspot/cpu/x86/jni_x86.h similarity index 100% rename from hotspot/src/cpu/x86/vm/jni_x86.h rename to src/hotspot/cpu/x86/jni_x86.h diff --git a/hotspot/src/cpu/x86/vm/jvmciCodeInstaller_x86.cpp b/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/jvmciCodeInstaller_x86.cpp rename to src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp rename to src/hotspot/cpu/x86/macroAssembler_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp rename to src/hotspot/cpu/x86/macroAssembler_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86.inline.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/macroAssembler_x86.inline.hpp rename to src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86_cos.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_cos.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/macroAssembler_x86_cos.cpp rename to src/hotspot/cpu/x86/macroAssembler_x86_cos.cpp diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86_exp.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_exp.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/macroAssembler_x86_exp.cpp rename to src/hotspot/cpu/x86/macroAssembler_x86_exp.cpp diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86_log.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_log.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/macroAssembler_x86_log.cpp rename to src/hotspot/cpu/x86/macroAssembler_x86_log.cpp diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86_log10.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_log10.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/macroAssembler_x86_log10.cpp rename to src/hotspot/cpu/x86/macroAssembler_x86_log10.cpp diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86_pow.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_pow.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/macroAssembler_x86_pow.cpp rename to src/hotspot/cpu/x86/macroAssembler_x86_pow.cpp diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86_sha.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/macroAssembler_x86_sha.cpp rename to src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86_sin.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_sin.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/macroAssembler_x86_sin.cpp rename to src/hotspot/cpu/x86/macroAssembler_x86_sin.cpp diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86_tan.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_tan.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/macroAssembler_x86_tan.cpp rename to src/hotspot/cpu/x86/macroAssembler_x86_tan.cpp diff --git a/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp b/src/hotspot/cpu/x86/methodHandles_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/methodHandles_x86.cpp rename to src/hotspot/cpu/x86/methodHandles_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp b/src/hotspot/cpu/x86/methodHandles_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/methodHandles_x86.hpp rename to src/hotspot/cpu/x86/methodHandles_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/nativeInst_x86.cpp b/src/hotspot/cpu/x86/nativeInst_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/nativeInst_x86.cpp rename to src/hotspot/cpu/x86/nativeInst_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/nativeInst_x86.hpp b/src/hotspot/cpu/x86/nativeInst_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/nativeInst_x86.hpp rename to src/hotspot/cpu/x86/nativeInst_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/registerMap_x86.cpp b/src/hotspot/cpu/x86/registerMap_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/registerMap_x86.cpp rename to src/hotspot/cpu/x86/registerMap_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/registerMap_x86.hpp b/src/hotspot/cpu/x86/registerMap_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/registerMap_x86.hpp rename to src/hotspot/cpu/x86/registerMap_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/register_definitions_x86.cpp b/src/hotspot/cpu/x86/register_definitions_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/register_definitions_x86.cpp rename to src/hotspot/cpu/x86/register_definitions_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/register_x86.cpp b/src/hotspot/cpu/x86/register_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/register_x86.cpp rename to src/hotspot/cpu/x86/register_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/register_x86.hpp b/src/hotspot/cpu/x86/register_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/register_x86.hpp rename to src/hotspot/cpu/x86/register_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/relocInfo_x86.cpp b/src/hotspot/cpu/x86/relocInfo_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/relocInfo_x86.cpp rename to src/hotspot/cpu/x86/relocInfo_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/relocInfo_x86.hpp b/src/hotspot/cpu/x86/relocInfo_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/relocInfo_x86.hpp rename to src/hotspot/cpu/x86/relocInfo_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/runtime_x86_32.cpp b/src/hotspot/cpu/x86/runtime_x86_32.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/runtime_x86_32.cpp rename to src/hotspot/cpu/x86/runtime_x86_32.cpp diff --git a/hotspot/src/cpu/x86/vm/runtime_x86_64.cpp b/src/hotspot/cpu/x86/runtime_x86_64.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/runtime_x86_64.cpp rename to src/hotspot/cpu/x86/runtime_x86_64.cpp diff --git a/hotspot/src/cpu/x86/vm/sharedRuntime_x86.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/sharedRuntime_x86.cpp rename to src/hotspot/cpu/x86/sharedRuntime_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp rename to src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp diff --git a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp rename to src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp diff --git a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp rename to src/hotspot/cpu/x86/stubGenerator_x86_32.cpp diff --git a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp rename to src/hotspot/cpu/x86/stubGenerator_x86_64.cpp diff --git a/hotspot/src/cpu/x86/vm/stubRoutines_x86.cpp b/src/hotspot/cpu/x86/stubRoutines_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/stubRoutines_x86.cpp rename to src/hotspot/cpu/x86/stubRoutines_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/stubRoutines_x86.hpp b/src/hotspot/cpu/x86/stubRoutines_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/stubRoutines_x86.hpp rename to src/hotspot/cpu/x86/stubRoutines_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp b/src/hotspot/cpu/x86/stubRoutines_x86_32.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp rename to src/hotspot/cpu/x86/stubRoutines_x86_32.cpp diff --git a/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp b/src/hotspot/cpu/x86/stubRoutines_x86_64.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp rename to src/hotspot/cpu/x86/stubRoutines_x86_64.cpp diff --git a/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp rename to src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86_32.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_32.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86_32.cpp rename to src/hotspot/cpu/x86/templateInterpreterGenerator_x86_32.cpp diff --git a/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86_64.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86_64.cpp rename to src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp diff --git a/hotspot/src/cpu/x86/vm/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/templateTable_x86.cpp rename to src/hotspot/cpu/x86/templateTable_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/templateTable_x86.hpp b/src/hotspot/cpu/x86/templateTable_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/templateTable_x86.hpp rename to src/hotspot/cpu/x86/templateTable_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/vmStructs_x86.hpp b/src/hotspot/cpu/x86/vmStructs_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/vmStructs_x86.hpp rename to src/hotspot/cpu/x86/vmStructs_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/vm_version_x86.cpp rename to src/hotspot/cpu/x86/vm_version_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/vm_version_x86.hpp rename to src/hotspot/cpu/x86/vm_version_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/vmreg_x86.cpp b/src/hotspot/cpu/x86/vmreg_x86.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/vmreg_x86.cpp rename to src/hotspot/cpu/x86/vmreg_x86.cpp diff --git a/hotspot/src/cpu/x86/vm/vmreg_x86.hpp b/src/hotspot/cpu/x86/vmreg_x86.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/vmreg_x86.hpp rename to src/hotspot/cpu/x86/vmreg_x86.hpp diff --git a/hotspot/src/cpu/x86/vm/vmreg_x86.inline.hpp b/src/hotspot/cpu/x86/vmreg_x86.inline.hpp similarity index 100% rename from hotspot/src/cpu/x86/vm/vmreg_x86.inline.hpp rename to src/hotspot/cpu/x86/vmreg_x86.inline.hpp diff --git a/hotspot/src/cpu/x86/vm/vtableStubs_x86_32.cpp b/src/hotspot/cpu/x86/vtableStubs_x86_32.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/vtableStubs_x86_32.cpp rename to src/hotspot/cpu/x86/vtableStubs_x86_32.cpp diff --git a/hotspot/src/cpu/x86/vm/vtableStubs_x86_64.cpp b/src/hotspot/cpu/x86/vtableStubs_x86_64.cpp similarity index 100% rename from hotspot/src/cpu/x86/vm/vtableStubs_x86_64.cpp rename to src/hotspot/cpu/x86/vtableStubs_x86_64.cpp diff --git a/hotspot/src/cpu/x86/vm/x86.ad b/src/hotspot/cpu/x86/x86.ad similarity index 100% rename from hotspot/src/cpu/x86/vm/x86.ad rename to src/hotspot/cpu/x86/x86.ad diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/src/hotspot/cpu/x86/x86_32.ad similarity index 100% rename from hotspot/src/cpu/x86/vm/x86_32.ad rename to src/hotspot/cpu/x86/x86_32.ad diff --git a/hotspot/src/cpu/x86/vm/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad similarity index 100% rename from hotspot/src/cpu/x86/vm/x86_64.ad rename to src/hotspot/cpu/x86/x86_64.ad diff --git a/hotspot/src/cpu/zero/vm/abstractInterpreter_zero.cpp b/src/hotspot/cpu/zero/abstractInterpreter_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/abstractInterpreter_zero.cpp rename to src/hotspot/cpu/zero/abstractInterpreter_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/assembler_zero.cpp b/src/hotspot/cpu/zero/assembler_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/assembler_zero.cpp rename to src/hotspot/cpu/zero/assembler_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/assembler_zero.hpp b/src/hotspot/cpu/zero/assembler_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/assembler_zero.hpp rename to src/hotspot/cpu/zero/assembler_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp b/src/hotspot/cpu/zero/assembler_zero.inline.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp rename to src/hotspot/cpu/zero/assembler_zero.inline.hpp diff --git a/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp rename to src/hotspot/cpu/zero/bytecodeInterpreter_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp rename to src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp rename to src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp diff --git a/hotspot/src/cpu/zero/vm/bytes_zero.hpp b/src/hotspot/cpu/zero/bytes_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/bytes_zero.hpp rename to src/hotspot/cpu/zero/bytes_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp b/src/hotspot/cpu/zero/codeBuffer_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp rename to src/hotspot/cpu/zero/codeBuffer_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp b/src/hotspot/cpu/zero/compiledIC_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/compiledIC_zero.cpp rename to src/hotspot/cpu/zero/compiledIC_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/copy_zero.hpp b/src/hotspot/cpu/zero/copy_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/copy_zero.hpp rename to src/hotspot/cpu/zero/copy_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.cpp b/src/hotspot/cpu/zero/cppInterpreterGenerator_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.cpp rename to src/hotspot/cpu/zero/cppInterpreterGenerator_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/src/hotspot/cpu/zero/cppInterpreter_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp rename to src/hotspot/cpu/zero/cppInterpreter_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp b/src/hotspot/cpu/zero/cppInterpreter_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp rename to src/hotspot/cpu/zero/cppInterpreter_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/depChecker_zero.cpp b/src/hotspot/cpu/zero/depChecker_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/depChecker_zero.cpp rename to src/hotspot/cpu/zero/depChecker_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/depChecker_zero.hpp b/src/hotspot/cpu/zero/depChecker_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/depChecker_zero.hpp rename to src/hotspot/cpu/zero/depChecker_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/disassembler_zero.cpp b/src/hotspot/cpu/zero/disassembler_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/disassembler_zero.cpp rename to src/hotspot/cpu/zero/disassembler_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/disassembler_zero.hpp b/src/hotspot/cpu/zero/disassembler_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/disassembler_zero.hpp rename to src/hotspot/cpu/zero/disassembler_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp b/src/hotspot/cpu/zero/entryFrame_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/entryFrame_zero.hpp rename to src/hotspot/cpu/zero/entryFrame_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/entry_zero.hpp b/src/hotspot/cpu/zero/entry_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/entry_zero.hpp rename to src/hotspot/cpu/zero/entry_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp b/src/hotspot/cpu/zero/fakeStubFrame_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp rename to src/hotspot/cpu/zero/fakeStubFrame_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/frame_zero.cpp b/src/hotspot/cpu/zero/frame_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/frame_zero.cpp rename to src/hotspot/cpu/zero/frame_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/frame_zero.hpp b/src/hotspot/cpu/zero/frame_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/frame_zero.hpp rename to src/hotspot/cpu/zero/frame_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp b/src/hotspot/cpu/zero/frame_zero.inline.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/frame_zero.inline.hpp rename to src/hotspot/cpu/zero/frame_zero.inline.hpp diff --git a/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp b/src/hotspot/cpu/zero/globalDefinitions_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp rename to src/hotspot/cpu/zero/globalDefinitions_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/globals_zero.hpp b/src/hotspot/cpu/zero/globals_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/globals_zero.hpp rename to src/hotspot/cpu/zero/globals_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp b/src/hotspot/cpu/zero/icBuffer_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/icBuffer_zero.cpp rename to src/hotspot/cpu/zero/icBuffer_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/icache_zero.cpp b/src/hotspot/cpu/zero/icache_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/icache_zero.cpp rename to src/hotspot/cpu/zero/icache_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/icache_zero.hpp b/src/hotspot/cpu/zero/icache_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/icache_zero.hpp rename to src/hotspot/cpu/zero/icache_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp b/src/hotspot/cpu/zero/interp_masm_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/interp_masm_zero.hpp rename to src/hotspot/cpu/zero/interp_masm_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp b/src/hotspot/cpu/zero/interpreterFrame_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp rename to src/hotspot/cpu/zero/interpreterFrame_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp b/src/hotspot/cpu/zero/interpreterRT_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp rename to src/hotspot/cpu/zero/interpreterRT_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp b/src/hotspot/cpu/zero/interpreterRT_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp rename to src/hotspot/cpu/zero/interpreterRT_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp b/src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp rename to src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp b/src/hotspot/cpu/zero/jniFastGetField_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp rename to src/hotspot/cpu/zero/jniFastGetField_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp b/src/hotspot/cpu/zero/jniTypes_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/jniTypes_zero.hpp rename to src/hotspot/cpu/zero/jniTypes_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/jni_zero.h b/src/hotspot/cpu/zero/jni_zero.h similarity index 100% rename from hotspot/src/cpu/zero/vm/jni_zero.h rename to src/hotspot/cpu/zero/jni_zero.h diff --git a/hotspot/src/cpu/zero/vm/macroAssembler_zero.hpp b/src/hotspot/cpu/zero/macroAssembler_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/macroAssembler_zero.hpp rename to src/hotspot/cpu/zero/macroAssembler_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/macroAssembler_zero.inline.hpp b/src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/macroAssembler_zero.inline.hpp rename to src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp diff --git a/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp b/src/hotspot/cpu/zero/methodHandles_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/methodHandles_zero.cpp rename to src/hotspot/cpu/zero/methodHandles_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp b/src/hotspot/cpu/zero/methodHandles_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/methodHandles_zero.hpp rename to src/hotspot/cpu/zero/methodHandles_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp b/src/hotspot/cpu/zero/nativeInst_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/nativeInst_zero.cpp rename to src/hotspot/cpu/zero/nativeInst_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp b/src/hotspot/cpu/zero/nativeInst_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/nativeInst_zero.hpp rename to src/hotspot/cpu/zero/nativeInst_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/registerMap_zero.hpp b/src/hotspot/cpu/zero/registerMap_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/registerMap_zero.hpp rename to src/hotspot/cpu/zero/registerMap_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/register_zero.cpp b/src/hotspot/cpu/zero/register_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/register_zero.cpp rename to src/hotspot/cpu/zero/register_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/register_zero.hpp b/src/hotspot/cpu/zero/register_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/register_zero.hpp rename to src/hotspot/cpu/zero/register_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp b/src/hotspot/cpu/zero/relocInfo_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/relocInfo_zero.cpp rename to src/hotspot/cpu/zero/relocInfo_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp b/src/hotspot/cpu/zero/relocInfo_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/relocInfo_zero.hpp rename to src/hotspot/cpu/zero/relocInfo_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp b/src/hotspot/cpu/zero/sharedRuntime_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp rename to src/hotspot/cpu/zero/sharedRuntime_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp b/src/hotspot/cpu/zero/sharkFrame_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp rename to src/hotspot/cpu/zero/sharkFrame_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp b/src/hotspot/cpu/zero/shark_globals_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/shark_globals_zero.hpp rename to src/hotspot/cpu/zero/shark_globals_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/stack_zero.cpp b/src/hotspot/cpu/zero/stack_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/stack_zero.cpp rename to src/hotspot/cpu/zero/stack_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/stack_zero.hpp b/src/hotspot/cpu/zero/stack_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/stack_zero.hpp rename to src/hotspot/cpu/zero/stack_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp b/src/hotspot/cpu/zero/stack_zero.inline.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/stack_zero.inline.hpp rename to src/hotspot/cpu/zero/stack_zero.inline.hpp diff --git a/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp b/src/hotspot/cpu/zero/stubGenerator_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp rename to src/hotspot/cpu/zero/stubGenerator_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp b/src/hotspot/cpu/zero/stubRoutines_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp rename to src/hotspot/cpu/zero/stubRoutines_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp b/src/hotspot/cpu/zero/stubRoutines_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp rename to src/hotspot/cpu/zero/stubRoutines_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp b/src/hotspot/cpu/zero/vmStructs_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/vmStructs_zero.hpp rename to src/hotspot/cpu/zero/vmStructs_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/vm_version_zero.cpp b/src/hotspot/cpu/zero/vm_version_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/vm_version_zero.cpp rename to src/hotspot/cpu/zero/vm_version_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/vm_version_zero.hpp b/src/hotspot/cpu/zero/vm_version_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/vm_version_zero.hpp rename to src/hotspot/cpu/zero/vm_version_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/vmreg_zero.cpp b/src/hotspot/cpu/zero/vmreg_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/vmreg_zero.cpp rename to src/hotspot/cpu/zero/vmreg_zero.cpp diff --git a/hotspot/src/cpu/zero/vm/vmreg_zero.hpp b/src/hotspot/cpu/zero/vmreg_zero.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/vmreg_zero.hpp rename to src/hotspot/cpu/zero/vmreg_zero.hpp diff --git a/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp b/src/hotspot/cpu/zero/vmreg_zero.inline.hpp similarity index 100% rename from hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp rename to src/hotspot/cpu/zero/vmreg_zero.inline.hpp diff --git a/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp b/src/hotspot/cpu/zero/vtableStubs_zero.cpp similarity index 100% rename from hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp rename to src/hotspot/cpu/zero/vtableStubs_zero.cpp diff --git a/hotspot/src/os/aix/vm/attachListener_aix.cpp b/src/hotspot/os/aix/attachListener_aix.cpp similarity index 100% rename from hotspot/src/os/aix/vm/attachListener_aix.cpp rename to src/hotspot/os/aix/attachListener_aix.cpp diff --git a/hotspot/src/os/aix/vm/c1_globals_aix.hpp b/src/hotspot/os/aix/c1_globals_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/c1_globals_aix.hpp rename to src/hotspot/os/aix/c1_globals_aix.hpp diff --git a/hotspot/src/os/aix/vm/c2_globals_aix.hpp b/src/hotspot/os/aix/c2_globals_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/c2_globals_aix.hpp rename to src/hotspot/os/aix/c2_globals_aix.hpp diff --git a/hotspot/src/os/aix/vm/decoder_aix.hpp b/src/hotspot/os/aix/decoder_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/decoder_aix.hpp rename to src/hotspot/os/aix/decoder_aix.hpp diff --git a/hotspot/src/os/aix/vm/globals_aix.hpp b/src/hotspot/os/aix/globals_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/globals_aix.hpp rename to src/hotspot/os/aix/globals_aix.hpp diff --git a/hotspot/src/os/aix/vm/jvm_aix.cpp b/src/hotspot/os/aix/jvm_aix.cpp similarity index 100% rename from hotspot/src/os/aix/vm/jvm_aix.cpp rename to src/hotspot/os/aix/jvm_aix.cpp diff --git a/hotspot/src/os/aix/vm/jvm_aix.h b/src/hotspot/os/aix/jvm_aix.h similarity index 100% rename from hotspot/src/os/aix/vm/jvm_aix.h rename to src/hotspot/os/aix/jvm_aix.h diff --git a/hotspot/src/os/aix/vm/libo4.cpp b/src/hotspot/os/aix/libo4.cpp similarity index 100% rename from hotspot/src/os/aix/vm/libo4.cpp rename to src/hotspot/os/aix/libo4.cpp diff --git a/hotspot/src/os/aix/vm/libo4.hpp b/src/hotspot/os/aix/libo4.hpp similarity index 100% rename from hotspot/src/os/aix/vm/libo4.hpp rename to src/hotspot/os/aix/libo4.hpp diff --git a/hotspot/src/os/aix/vm/libodm_aix.cpp b/src/hotspot/os/aix/libodm_aix.cpp similarity index 100% rename from hotspot/src/os/aix/vm/libodm_aix.cpp rename to src/hotspot/os/aix/libodm_aix.cpp diff --git a/hotspot/src/os/aix/vm/libodm_aix.hpp b/src/hotspot/os/aix/libodm_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/libodm_aix.hpp rename to src/hotspot/os/aix/libodm_aix.hpp diff --git a/hotspot/src/os/aix/vm/libperfstat_aix.cpp b/src/hotspot/os/aix/libperfstat_aix.cpp similarity index 100% rename from hotspot/src/os/aix/vm/libperfstat_aix.cpp rename to src/hotspot/os/aix/libperfstat_aix.cpp diff --git a/hotspot/src/os/aix/vm/libperfstat_aix.hpp b/src/hotspot/os/aix/libperfstat_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/libperfstat_aix.hpp rename to src/hotspot/os/aix/libperfstat_aix.hpp diff --git a/hotspot/src/os/aix/vm/loadlib_aix.cpp b/src/hotspot/os/aix/loadlib_aix.cpp similarity index 100% rename from hotspot/src/os/aix/vm/loadlib_aix.cpp rename to src/hotspot/os/aix/loadlib_aix.cpp diff --git a/hotspot/src/os/aix/vm/loadlib_aix.hpp b/src/hotspot/os/aix/loadlib_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/loadlib_aix.hpp rename to src/hotspot/os/aix/loadlib_aix.hpp diff --git a/hotspot/src/os/aix/vm/misc_aix.cpp b/src/hotspot/os/aix/misc_aix.cpp similarity index 100% rename from hotspot/src/os/aix/vm/misc_aix.cpp rename to src/hotspot/os/aix/misc_aix.cpp diff --git a/hotspot/src/os/aix/vm/misc_aix.hpp b/src/hotspot/os/aix/misc_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/misc_aix.hpp rename to src/hotspot/os/aix/misc_aix.hpp diff --git a/hotspot/src/os/aix/vm/osThread_aix.cpp b/src/hotspot/os/aix/osThread_aix.cpp similarity index 100% rename from hotspot/src/os/aix/vm/osThread_aix.cpp rename to src/hotspot/os/aix/osThread_aix.cpp diff --git a/hotspot/src/os/aix/vm/osThread_aix.hpp b/src/hotspot/os/aix/osThread_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/osThread_aix.hpp rename to src/hotspot/os/aix/osThread_aix.hpp diff --git a/hotspot/src/os/aix/vm/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp similarity index 100% rename from hotspot/src/os/aix/vm/os_aix.cpp rename to src/hotspot/os/aix/os_aix.cpp diff --git a/hotspot/src/os/aix/vm/os_aix.hpp b/src/hotspot/os/aix/os_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/os_aix.hpp rename to src/hotspot/os/aix/os_aix.hpp diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/src/hotspot/os/aix/os_aix.inline.hpp similarity index 100% rename from hotspot/src/os/aix/vm/os_aix.inline.hpp rename to src/hotspot/os/aix/os_aix.inline.hpp diff --git a/hotspot/src/os/aix/vm/os_share_aix.hpp b/src/hotspot/os/aix/os_share_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/os_share_aix.hpp rename to src/hotspot/os/aix/os_share_aix.hpp diff --git a/hotspot/src/os/aix/vm/perfMemory_aix.cpp b/src/hotspot/os/aix/perfMemory_aix.cpp similarity index 100% rename from hotspot/src/os/aix/vm/perfMemory_aix.cpp rename to src/hotspot/os/aix/perfMemory_aix.cpp diff --git a/hotspot/src/os/aix/vm/porting_aix.cpp b/src/hotspot/os/aix/porting_aix.cpp similarity index 100% rename from hotspot/src/os/aix/vm/porting_aix.cpp rename to src/hotspot/os/aix/porting_aix.cpp diff --git a/hotspot/src/os/aix/vm/porting_aix.hpp b/src/hotspot/os/aix/porting_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/porting_aix.hpp rename to src/hotspot/os/aix/porting_aix.hpp diff --git a/hotspot/src/os/aix/vm/threadCritical_aix.cpp b/src/hotspot/os/aix/threadCritical_aix.cpp similarity index 100% rename from hotspot/src/os/aix/vm/threadCritical_aix.cpp rename to src/hotspot/os/aix/threadCritical_aix.cpp diff --git a/hotspot/src/os/aix/vm/vmStructs_aix.hpp b/src/hotspot/os/aix/vmStructs_aix.hpp similarity index 100% rename from hotspot/src/os/aix/vm/vmStructs_aix.hpp rename to src/hotspot/os/aix/vmStructs_aix.hpp diff --git a/hotspot/src/os/bsd/vm/attachListener_bsd.cpp b/src/hotspot/os/bsd/attachListener_bsd.cpp similarity index 100% rename from hotspot/src/os/bsd/vm/attachListener_bsd.cpp rename to src/hotspot/os/bsd/attachListener_bsd.cpp diff --git a/hotspot/src/os/bsd/vm/c1_globals_bsd.hpp b/src/hotspot/os/bsd/c1_globals_bsd.hpp similarity index 100% rename from hotspot/src/os/bsd/vm/c1_globals_bsd.hpp rename to src/hotspot/os/bsd/c1_globals_bsd.hpp diff --git a/hotspot/src/os/bsd/vm/c2_globals_bsd.hpp b/src/hotspot/os/bsd/c2_globals_bsd.hpp similarity index 100% rename from hotspot/src/os/bsd/vm/c2_globals_bsd.hpp rename to src/hotspot/os/bsd/c2_globals_bsd.hpp diff --git a/hotspot/src/os/bsd/vm/decoder_machO.cpp b/src/hotspot/os/bsd/decoder_machO.cpp similarity index 100% rename from hotspot/src/os/bsd/vm/decoder_machO.cpp rename to src/hotspot/os/bsd/decoder_machO.cpp diff --git a/hotspot/src/os/bsd/vm/decoder_machO.hpp b/src/hotspot/os/bsd/decoder_machO.hpp similarity index 100% rename from hotspot/src/os/bsd/vm/decoder_machO.hpp rename to src/hotspot/os/bsd/decoder_machO.hpp diff --git a/hotspot/src/os/bsd/vm/globals_bsd.hpp b/src/hotspot/os/bsd/globals_bsd.hpp similarity index 100% rename from hotspot/src/os/bsd/vm/globals_bsd.hpp rename to src/hotspot/os/bsd/globals_bsd.hpp diff --git a/hotspot/src/os/bsd/vm/jvm_bsd.cpp b/src/hotspot/os/bsd/jvm_bsd.cpp similarity index 100% rename from hotspot/src/os/bsd/vm/jvm_bsd.cpp rename to src/hotspot/os/bsd/jvm_bsd.cpp diff --git a/hotspot/src/os/bsd/vm/jvm_bsd.h b/src/hotspot/os/bsd/jvm_bsd.h similarity index 100% rename from hotspot/src/os/bsd/vm/jvm_bsd.h rename to src/hotspot/os/bsd/jvm_bsd.h diff --git a/hotspot/src/os/bsd/vm/osThread_bsd.cpp b/src/hotspot/os/bsd/osThread_bsd.cpp similarity index 100% rename from hotspot/src/os/bsd/vm/osThread_bsd.cpp rename to src/hotspot/os/bsd/osThread_bsd.cpp diff --git a/hotspot/src/os/bsd/vm/osThread_bsd.hpp b/src/hotspot/os/bsd/osThread_bsd.hpp similarity index 100% rename from hotspot/src/os/bsd/vm/osThread_bsd.hpp rename to src/hotspot/os/bsd/osThread_bsd.hpp diff --git a/hotspot/src/os/bsd/vm/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp similarity index 100% rename from hotspot/src/os/bsd/vm/os_bsd.cpp rename to src/hotspot/os/bsd/os_bsd.cpp diff --git a/hotspot/src/os/bsd/vm/os_bsd.hpp b/src/hotspot/os/bsd/os_bsd.hpp similarity index 100% rename from hotspot/src/os/bsd/vm/os_bsd.hpp rename to src/hotspot/os/bsd/os_bsd.hpp diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/src/hotspot/os/bsd/os_bsd.inline.hpp similarity index 100% rename from hotspot/src/os/bsd/vm/os_bsd.inline.hpp rename to src/hotspot/os/bsd/os_bsd.inline.hpp diff --git a/hotspot/src/os/bsd/vm/os_share_bsd.hpp b/src/hotspot/os/bsd/os_share_bsd.hpp similarity index 100% rename from hotspot/src/os/bsd/vm/os_share_bsd.hpp rename to src/hotspot/os/bsd/os_share_bsd.hpp diff --git a/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp b/src/hotspot/os/bsd/perfMemory_bsd.cpp similarity index 100% rename from hotspot/src/os/bsd/vm/perfMemory_bsd.cpp rename to src/hotspot/os/bsd/perfMemory_bsd.cpp diff --git a/hotspot/src/os/bsd/vm/semaphore_bsd.hpp b/src/hotspot/os/bsd/semaphore_bsd.hpp similarity index 100% rename from hotspot/src/os/bsd/vm/semaphore_bsd.hpp rename to src/hotspot/os/bsd/semaphore_bsd.hpp diff --git a/hotspot/src/os/bsd/vm/threadCritical_bsd.cpp b/src/hotspot/os/bsd/threadCritical_bsd.cpp similarity index 100% rename from hotspot/src/os/bsd/vm/threadCritical_bsd.cpp rename to src/hotspot/os/bsd/threadCritical_bsd.cpp diff --git a/hotspot/src/os/bsd/vm/vmStructs_bsd.hpp b/src/hotspot/os/bsd/vmStructs_bsd.hpp similarity index 100% rename from hotspot/src/os/bsd/vm/vmStructs_bsd.hpp rename to src/hotspot/os/bsd/vmStructs_bsd.hpp diff --git a/hotspot/src/os/linux/vm/attachListener_linux.cpp b/src/hotspot/os/linux/attachListener_linux.cpp similarity index 100% rename from hotspot/src/os/linux/vm/attachListener_linux.cpp rename to src/hotspot/os/linux/attachListener_linux.cpp diff --git a/hotspot/src/os/linux/vm/c1_globals_linux.hpp b/src/hotspot/os/linux/c1_globals_linux.hpp similarity index 100% rename from hotspot/src/os/linux/vm/c1_globals_linux.hpp rename to src/hotspot/os/linux/c1_globals_linux.hpp diff --git a/hotspot/src/os/linux/vm/c2_globals_linux.hpp b/src/hotspot/os/linux/c2_globals_linux.hpp similarity index 100% rename from hotspot/src/os/linux/vm/c2_globals_linux.hpp rename to src/hotspot/os/linux/c2_globals_linux.hpp diff --git a/hotspot/src/os/linux/vm/decoder_linux.cpp b/src/hotspot/os/linux/decoder_linux.cpp similarity index 100% rename from hotspot/src/os/linux/vm/decoder_linux.cpp rename to src/hotspot/os/linux/decoder_linux.cpp diff --git a/hotspot/src/os/linux/vm/globals_linux.hpp b/src/hotspot/os/linux/globals_linux.hpp similarity index 100% rename from hotspot/src/os/linux/vm/globals_linux.hpp rename to src/hotspot/os/linux/globals_linux.hpp diff --git a/hotspot/src/os/linux/vm/jvm_linux.cpp b/src/hotspot/os/linux/jvm_linux.cpp similarity index 100% rename from hotspot/src/os/linux/vm/jvm_linux.cpp rename to src/hotspot/os/linux/jvm_linux.cpp diff --git a/hotspot/src/os/linux/vm/jvm_linux.h b/src/hotspot/os/linux/jvm_linux.h similarity index 100% rename from hotspot/src/os/linux/vm/jvm_linux.h rename to src/hotspot/os/linux/jvm_linux.h diff --git a/hotspot/src/os/linux/vm/osThread_linux.cpp b/src/hotspot/os/linux/osThread_linux.cpp similarity index 100% rename from hotspot/src/os/linux/vm/osThread_linux.cpp rename to src/hotspot/os/linux/osThread_linux.cpp diff --git a/hotspot/src/os/linux/vm/osThread_linux.hpp b/src/hotspot/os/linux/osThread_linux.hpp similarity index 100% rename from hotspot/src/os/linux/vm/osThread_linux.hpp rename to src/hotspot/os/linux/osThread_linux.hpp diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp similarity index 100% rename from hotspot/src/os/linux/vm/os_linux.cpp rename to src/hotspot/os/linux/os_linux.cpp diff --git a/hotspot/src/os/linux/vm/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp similarity index 100% rename from hotspot/src/os/linux/vm/os_linux.hpp rename to src/hotspot/os/linux/os_linux.hpp diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/src/hotspot/os/linux/os_linux.inline.hpp similarity index 100% rename from hotspot/src/os/linux/vm/os_linux.inline.hpp rename to src/hotspot/os/linux/os_linux.inline.hpp diff --git a/hotspot/src/os/linux/vm/os_share_linux.hpp b/src/hotspot/os/linux/os_share_linux.hpp similarity index 100% rename from hotspot/src/os/linux/vm/os_share_linux.hpp rename to src/hotspot/os/linux/os_share_linux.hpp diff --git a/hotspot/src/os/linux/vm/perfMemory_linux.cpp b/src/hotspot/os/linux/perfMemory_linux.cpp similarity index 100% rename from hotspot/src/os/linux/vm/perfMemory_linux.cpp rename to src/hotspot/os/linux/perfMemory_linux.cpp diff --git a/hotspot/src/os/linux/vm/threadCritical_linux.cpp b/src/hotspot/os/linux/threadCritical_linux.cpp similarity index 100% rename from hotspot/src/os/linux/vm/threadCritical_linux.cpp rename to src/hotspot/os/linux/threadCritical_linux.cpp diff --git a/hotspot/src/os/linux/vm/vmStructs_linux.hpp b/src/hotspot/os/linux/vmStructs_linux.hpp similarity index 100% rename from hotspot/src/os/linux/vm/vmStructs_linux.hpp rename to src/hotspot/os/linux/vmStructs_linux.hpp diff --git a/hotspot/src/os/posix/dtrace/hotspot.d b/src/hotspot/os/posix/dtrace/hotspot.d similarity index 100% rename from hotspot/src/os/posix/dtrace/hotspot.d rename to src/hotspot/os/posix/dtrace/hotspot.d diff --git a/hotspot/src/os/posix/dtrace/hotspot_jni.d b/src/hotspot/os/posix/dtrace/hotspot_jni.d similarity index 100% rename from hotspot/src/os/posix/dtrace/hotspot_jni.d rename to src/hotspot/os/posix/dtrace/hotspot_jni.d diff --git a/hotspot/src/os/posix/dtrace/hs_private.d b/src/hotspot/os/posix/dtrace/hs_private.d similarity index 100% rename from hotspot/src/os/posix/dtrace/hs_private.d rename to src/hotspot/os/posix/dtrace/hs_private.d diff --git a/hotspot/src/os/posix/vm/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp similarity index 100% rename from hotspot/src/os/posix/vm/os_posix.cpp rename to src/hotspot/os/posix/os_posix.cpp diff --git a/hotspot/src/os/posix/vm/os_posix.hpp b/src/hotspot/os/posix/os_posix.hpp similarity index 100% rename from hotspot/src/os/posix/vm/os_posix.hpp rename to src/hotspot/os/posix/os_posix.hpp diff --git a/hotspot/src/os/posix/vm/semaphore_posix.hpp b/src/hotspot/os/posix/semaphore_posix.hpp similarity index 100% rename from hotspot/src/os/posix/vm/semaphore_posix.hpp rename to src/hotspot/os/posix/semaphore_posix.hpp diff --git a/hotspot/src/os/posix/vm/threadLocalStorage_posix.cpp b/src/hotspot/os/posix/threadLocalStorage_posix.cpp similarity index 100% rename from hotspot/src/os/posix/vm/threadLocalStorage_posix.cpp rename to src/hotspot/os/posix/threadLocalStorage_posix.cpp diff --git a/hotspot/src/os/posix/vm/vmError_posix.cpp b/src/hotspot/os/posix/vmError_posix.cpp similarity index 100% rename from hotspot/src/os/posix/vm/vmError_posix.cpp rename to src/hotspot/os/posix/vmError_posix.cpp diff --git a/hotspot/src/os/solaris/vm/attachListener_solaris.cpp b/src/hotspot/os/solaris/attachListener_solaris.cpp similarity index 100% rename from hotspot/src/os/solaris/vm/attachListener_solaris.cpp rename to src/hotspot/os/solaris/attachListener_solaris.cpp diff --git a/hotspot/src/os/solaris/vm/c1_globals_solaris.hpp b/src/hotspot/os/solaris/c1_globals_solaris.hpp similarity index 100% rename from hotspot/src/os/solaris/vm/c1_globals_solaris.hpp rename to src/hotspot/os/solaris/c1_globals_solaris.hpp diff --git a/hotspot/src/os/solaris/vm/c2_globals_solaris.hpp b/src/hotspot/os/solaris/c2_globals_solaris.hpp similarity index 100% rename from hotspot/src/os/solaris/vm/c2_globals_solaris.hpp rename to src/hotspot/os/solaris/c2_globals_solaris.hpp diff --git a/hotspot/src/os/solaris/vm/decoder_solaris.cpp b/src/hotspot/os/solaris/decoder_solaris.cpp similarity index 100% rename from hotspot/src/os/solaris/vm/decoder_solaris.cpp rename to src/hotspot/os/solaris/decoder_solaris.cpp diff --git a/hotspot/src/os/solaris/dtrace/jhelper.d b/src/hotspot/os/solaris/dtrace/jhelper.d similarity index 100% rename from hotspot/src/os/solaris/dtrace/jhelper.d rename to src/hotspot/os/solaris/dtrace/jhelper.d diff --git a/hotspot/src/os/solaris/vm/globals_solaris.hpp b/src/hotspot/os/solaris/globals_solaris.hpp similarity index 100% rename from hotspot/src/os/solaris/vm/globals_solaris.hpp rename to src/hotspot/os/solaris/globals_solaris.hpp diff --git a/hotspot/src/os/solaris/vm/jvm_solaris.cpp b/src/hotspot/os/solaris/jvm_solaris.cpp similarity index 100% rename from hotspot/src/os/solaris/vm/jvm_solaris.cpp rename to src/hotspot/os/solaris/jvm_solaris.cpp diff --git a/hotspot/src/os/solaris/vm/jvm_solaris.h b/src/hotspot/os/solaris/jvm_solaris.h similarity index 100% rename from hotspot/src/os/solaris/vm/jvm_solaris.h rename to src/hotspot/os/solaris/jvm_solaris.h diff --git a/hotspot/src/os/solaris/vm/osThread_solaris.cpp b/src/hotspot/os/solaris/osThread_solaris.cpp similarity index 100% rename from hotspot/src/os/solaris/vm/osThread_solaris.cpp rename to src/hotspot/os/solaris/osThread_solaris.cpp diff --git a/hotspot/src/os/solaris/vm/osThread_solaris.hpp b/src/hotspot/os/solaris/osThread_solaris.hpp similarity index 100% rename from hotspot/src/os/solaris/vm/osThread_solaris.hpp rename to src/hotspot/os/solaris/osThread_solaris.hpp diff --git a/hotspot/src/os/solaris/vm/os_share_solaris.hpp b/src/hotspot/os/solaris/os_share_solaris.hpp similarity index 100% rename from hotspot/src/os/solaris/vm/os_share_solaris.hpp rename to src/hotspot/os/solaris/os_share_solaris.hpp diff --git a/hotspot/src/os/solaris/vm/os_solaris.cpp b/src/hotspot/os/solaris/os_solaris.cpp similarity index 100% rename from hotspot/src/os/solaris/vm/os_solaris.cpp rename to src/hotspot/os/solaris/os_solaris.cpp diff --git a/hotspot/src/os/solaris/vm/os_solaris.hpp b/src/hotspot/os/solaris/os_solaris.hpp similarity index 100% rename from hotspot/src/os/solaris/vm/os_solaris.hpp rename to src/hotspot/os/solaris/os_solaris.hpp diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/src/hotspot/os/solaris/os_solaris.inline.hpp similarity index 100% rename from hotspot/src/os/solaris/vm/os_solaris.inline.hpp rename to src/hotspot/os/solaris/os_solaris.inline.hpp diff --git a/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp b/src/hotspot/os/solaris/perfMemory_solaris.cpp similarity index 100% rename from hotspot/src/os/solaris/vm/perfMemory_solaris.cpp rename to src/hotspot/os/solaris/perfMemory_solaris.cpp diff --git a/hotspot/src/os/solaris/vm/threadCritical_solaris.cpp b/src/hotspot/os/solaris/threadCritical_solaris.cpp similarity index 100% rename from hotspot/src/os/solaris/vm/threadCritical_solaris.cpp rename to src/hotspot/os/solaris/threadCritical_solaris.cpp diff --git a/hotspot/src/os/solaris/vm/vmStructs_solaris.hpp b/src/hotspot/os/solaris/vmStructs_solaris.hpp similarity index 100% rename from hotspot/src/os/solaris/vm/vmStructs_solaris.hpp rename to src/hotspot/os/solaris/vmStructs_solaris.hpp diff --git a/hotspot/src/os/windows/vm/attachListener_windows.cpp b/src/hotspot/os/windows/attachListener_windows.cpp similarity index 100% rename from hotspot/src/os/windows/vm/attachListener_windows.cpp rename to src/hotspot/os/windows/attachListener_windows.cpp diff --git a/hotspot/src/os/windows/vm/c1_globals_windows.hpp b/src/hotspot/os/windows/c1_globals_windows.hpp similarity index 100% rename from hotspot/src/os/windows/vm/c1_globals_windows.hpp rename to src/hotspot/os/windows/c1_globals_windows.hpp diff --git a/hotspot/src/os/windows/vm/c2_globals_windows.hpp b/src/hotspot/os/windows/c2_globals_windows.hpp similarity index 100% rename from hotspot/src/os/windows/vm/c2_globals_windows.hpp rename to src/hotspot/os/windows/c2_globals_windows.hpp diff --git a/hotspot/src/os/windows/vm/decoder_windows.cpp b/src/hotspot/os/windows/decoder_windows.cpp similarity index 100% rename from hotspot/src/os/windows/vm/decoder_windows.cpp rename to src/hotspot/os/windows/decoder_windows.cpp diff --git a/hotspot/src/os/windows/vm/decoder_windows.hpp b/src/hotspot/os/windows/decoder_windows.hpp similarity index 100% rename from hotspot/src/os/windows/vm/decoder_windows.hpp rename to src/hotspot/os/windows/decoder_windows.hpp diff --git a/hotspot/src/os/windows/vm/globals_windows.hpp b/src/hotspot/os/windows/globals_windows.hpp similarity index 100% rename from hotspot/src/os/windows/vm/globals_windows.hpp rename to src/hotspot/os/windows/globals_windows.hpp diff --git a/hotspot/src/os/windows/vm/jvm_windows.cpp b/src/hotspot/os/windows/jvm_windows.cpp similarity index 100% rename from hotspot/src/os/windows/vm/jvm_windows.cpp rename to src/hotspot/os/windows/jvm_windows.cpp diff --git a/hotspot/src/os/windows/vm/jvm_windows.h b/src/hotspot/os/windows/jvm_windows.h similarity index 100% rename from hotspot/src/os/windows/vm/jvm_windows.h rename to src/hotspot/os/windows/jvm_windows.h diff --git a/hotspot/src/os/windows/vm/osThread_windows.cpp b/src/hotspot/os/windows/osThread_windows.cpp similarity index 100% rename from hotspot/src/os/windows/vm/osThread_windows.cpp rename to src/hotspot/os/windows/osThread_windows.cpp diff --git a/hotspot/src/os/windows/vm/osThread_windows.hpp b/src/hotspot/os/windows/osThread_windows.hpp similarity index 100% rename from hotspot/src/os/windows/vm/osThread_windows.hpp rename to src/hotspot/os/windows/osThread_windows.hpp diff --git a/hotspot/src/os/windows/vm/os_share_windows.hpp b/src/hotspot/os/windows/os_share_windows.hpp similarity index 100% rename from hotspot/src/os/windows/vm/os_share_windows.hpp rename to src/hotspot/os/windows/os_share_windows.hpp diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp similarity index 100% rename from hotspot/src/os/windows/vm/os_windows.cpp rename to src/hotspot/os/windows/os_windows.cpp diff --git a/hotspot/src/os/windows/vm/os_windows.hpp b/src/hotspot/os/windows/os_windows.hpp similarity index 100% rename from hotspot/src/os/windows/vm/os_windows.hpp rename to src/hotspot/os/windows/os_windows.hpp diff --git a/hotspot/src/os/windows/vm/os_windows.inline.hpp b/src/hotspot/os/windows/os_windows.inline.hpp similarity index 100% rename from hotspot/src/os/windows/vm/os_windows.inline.hpp rename to src/hotspot/os/windows/os_windows.inline.hpp diff --git a/hotspot/src/os/windows/vm/perfMemory_windows.cpp b/src/hotspot/os/windows/perfMemory_windows.cpp similarity index 100% rename from hotspot/src/os/windows/vm/perfMemory_windows.cpp rename to src/hotspot/os/windows/perfMemory_windows.cpp diff --git a/hotspot/src/os/windows/vm/semaphore_windows.hpp b/src/hotspot/os/windows/semaphore_windows.hpp similarity index 100% rename from hotspot/src/os/windows/vm/semaphore_windows.hpp rename to src/hotspot/os/windows/semaphore_windows.hpp diff --git a/hotspot/src/os/windows/vm/sharedRuntimeRem.cpp b/src/hotspot/os/windows/sharedRuntimeRem.cpp similarity index 100% rename from hotspot/src/os/windows/vm/sharedRuntimeRem.cpp rename to src/hotspot/os/windows/sharedRuntimeRem.cpp diff --git a/hotspot/src/os/windows/vm/threadCritical_windows.cpp b/src/hotspot/os/windows/threadCritical_windows.cpp similarity index 100% rename from hotspot/src/os/windows/vm/threadCritical_windows.cpp rename to src/hotspot/os/windows/threadCritical_windows.cpp diff --git a/hotspot/src/os/windows/vm/threadLocalStorage_windows.cpp b/src/hotspot/os/windows/threadLocalStorage_windows.cpp similarity index 100% rename from hotspot/src/os/windows/vm/threadLocalStorage_windows.cpp rename to src/hotspot/os/windows/threadLocalStorage_windows.cpp diff --git a/hotspot/src/os/windows/vm/version.rc b/src/hotspot/os/windows/version.rc similarity index 100% rename from hotspot/src/os/windows/vm/version.rc rename to src/hotspot/os/windows/version.rc diff --git a/hotspot/src/os/windows/vm/vmError_windows.cpp b/src/hotspot/os/windows/vmError_windows.cpp similarity index 100% rename from hotspot/src/os/windows/vm/vmError_windows.cpp rename to src/hotspot/os/windows/vmError_windows.cpp diff --git a/hotspot/src/os/windows/vm/vmStructs_windows.hpp b/src/hotspot/os/windows/vmStructs_windows.hpp similarity index 100% rename from hotspot/src/os/windows/vm/vmStructs_windows.hpp rename to src/hotspot/os/windows/vmStructs_windows.hpp diff --git a/hotspot/src/os/windows/vm/windbghelp.cpp b/src/hotspot/os/windows/windbghelp.cpp similarity index 100% rename from hotspot/src/os/windows/vm/windbghelp.cpp rename to src/hotspot/os/windows/windbghelp.cpp diff --git a/hotspot/src/os/windows/vm/windbghelp.hpp b/src/hotspot/os/windows/windbghelp.hpp similarity index 100% rename from hotspot/src/os/windows/vm/windbghelp.hpp rename to src/hotspot/os/windows/windbghelp.hpp diff --git a/hotspot/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp similarity index 100% rename from hotspot/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.hpp rename to src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp diff --git a/hotspot/src/os_cpu/aix_ppc/vm/bytes_aix_ppc.inline.hpp b/src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/aix_ppc/vm/bytes_aix_ppc.inline.hpp rename to src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp diff --git a/hotspot/src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp similarity index 100% rename from hotspot/src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp rename to src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp diff --git a/hotspot/src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp b/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp rename to src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.inline.hpp diff --git a/hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp similarity index 100% rename from hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp rename to src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp diff --git a/hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp similarity index 100% rename from hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp rename to src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp diff --git a/hotspot/src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp b/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp rename to src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp diff --git a/hotspot/src/os_cpu/aix_ppc/vm/thread_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.cpp similarity index 100% rename from hotspot/src/os_cpu/aix_ppc/vm/thread_aix_ppc.cpp rename to src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.cpp diff --git a/hotspot/src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp similarity index 100% rename from hotspot/src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp rename to src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp diff --git a/hotspot/src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp similarity index 100% rename from hotspot/src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp rename to src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp b/src/hotspot/os_cpu/bsd_x86/assembler_bsd_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp rename to src/hotspot/os_cpu/bsd_x86/assembler_bsd_x86.cpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.hpp rename to src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s b/src/hotspot/os_cpu/bsd_x86/bsd_x86_32.s similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s rename to src/hotspot/os_cpu/bsd_x86/bsd_x86_32.s diff --git a/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s b/src/hotspot/os_cpu/bsd_x86/bsd_x86_64.s similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s rename to src/hotspot/os_cpu/bsd_x86/bsd_x86_64.s diff --git a/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp rename to src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp rename to src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp rename to src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp rename to src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.inline.hpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp rename to src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp rename to src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.inline.hpp rename to src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp rename to src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp b/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp rename to src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.cpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp rename to src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp rename to src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp diff --git a/hotspot/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp b/src/hotspot/os_cpu/bsd_x86/vm_version_bsd_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp rename to src/hotspot/os_cpu/bsd_x86/vm_version_bsd_x86.cpp diff --git a/hotspot/src/os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp b/src/hotspot/os_cpu/bsd_zero/assembler_bsd_zero.cpp similarity index 100% rename from hotspot/src/os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp rename to src/hotspot/os_cpu/bsd_zero/assembler_bsd_zero.cpp diff --git a/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.hpp rename to src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp diff --git a/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp b/src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp rename to src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp diff --git a/hotspot/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp rename to src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp diff --git a/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp b/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp rename to src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.inline.hpp diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp similarity index 100% rename from hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp rename to src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp rename to src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp diff --git a/hotspot/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp b/src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp rename to src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp diff --git a/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp b/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.cpp similarity index 100% rename from hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp rename to src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.cpp diff --git a/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp rename to src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp diff --git a/hotspot/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp similarity index 100% rename from hotspot/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp rename to src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp diff --git a/hotspot/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp b/src/hotspot/os_cpu/bsd_zero/vm_version_bsd_zero.cpp similarity index 100% rename from hotspot/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp rename to src/hotspot/os_cpu/bsd_zero/vm_version_bsd_zero.cpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/assembler_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/assembler_linux_aarch64.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/assembler_linux_aarch64.cpp rename to src/hotspot/os_cpu/linux_aarch64/assembler_linux_aarch64.cpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.hpp rename to src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/bytes_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/bytes_linux_aarch64.inline.hpp rename to src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/copy_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/copy_linux_aarch64.inline.hpp rename to src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/copy_linux_aarch64.s b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.s similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/copy_linux_aarch64.s rename to src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.s diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/globals_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/globals_linux_aarch64.hpp rename to src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/linux_aarch64.S b/src/hotspot/os_cpu/linux_aarch64/linux_aarch64.S similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/linux_aarch64.S rename to src/hotspot/os_cpu/linux_aarch64/linux_aarch64.S diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/linux_aarch64.ad b/src/hotspot/os_cpu/linux_aarch64/linux_aarch64.ad similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/linux_aarch64.ad rename to src/hotspot/os_cpu/linux_aarch64/linux_aarch64.ad diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/orderAccess_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/orderAccess_linux_aarch64.inline.hpp rename to src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.inline.hpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp rename to src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.hpp rename to src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.inline.hpp rename to src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/prefetch_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/prefetch_linux_aarch64.inline.hpp rename to src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.s b/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.s similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.s rename to src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.s diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp rename to src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.cpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.hpp rename to src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/vmStructs_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/vmStructs_linux_aarch64.hpp rename to src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/vm_version_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_aarch64/vm/vm_version_linux_aarch64.cpp rename to src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/atomic_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/atomic_linux_arm.hpp rename to src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/bytes_linux_arm.inline.hpp b/src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/bytes_linux_arm.inline.hpp rename to src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/copy_linux_arm.inline.hpp b/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/copy_linux_arm.inline.hpp rename to src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/globals_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/globals_linux_arm.hpp rename to src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/linux_arm_32.s b/src/hotspot/os_cpu/linux_arm/linux_arm_32.s similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/linux_arm_32.s rename to src/hotspot/os_cpu/linux_arm/linux_arm_32.s diff --git a/hotspot/src/os_cpu/linux_arm/vm/linux_arm_64.s b/src/hotspot/os_cpu/linux_arm/linux_arm_64.s similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/linux_arm_64.s rename to src/hotspot/os_cpu/linux_arm/linux_arm_64.s diff --git a/hotspot/src/os_cpu/linux_arm/vm/macroAssembler_linux_arm_32.cpp b/src/hotspot/os_cpu/linux_arm/macroAssembler_linux_arm_32.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/macroAssembler_linux_arm_32.cpp rename to src/hotspot/os_cpu/linux_arm/macroAssembler_linux_arm_32.cpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/orderAccess_linux_arm.inline.hpp b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/orderAccess_linux_arm.inline.hpp rename to src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/os_linux_arm.cpp rename to src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/os_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/os_linux_arm.hpp rename to src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/prefetch_linux_arm.inline.hpp b/src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/prefetch_linux_arm.inline.hpp rename to src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/thread_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/thread_linux_arm.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/thread_linux_arm.cpp rename to src/hotspot/os_cpu/linux_arm/thread_linux_arm.cpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/thread_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/thread_linux_arm.hpp rename to src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/vmStructs_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/vmStructs_linux_arm.hpp rename to src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp diff --git a/hotspot/src/os_cpu/linux_arm/vm/vm_version_linux_arm_32.cpp b/src/hotspot/os_cpu/linux_arm/vm_version_linux_arm_32.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_arm/vm/vm_version_linux_arm_32.cpp rename to src/hotspot/os_cpu/linux_arm/vm_version_linux_arm_32.cpp diff --git a/hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.hpp rename to src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp diff --git a/hotspot/src/os_cpu/linux_ppc/vm/bytes_linux_ppc.inline.hpp b/src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_ppc/vm/bytes_linux_ppc.inline.hpp rename to src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp diff --git a/hotspot/src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp rename to src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp diff --git a/hotspot/src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp b/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp rename to src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.inline.hpp diff --git a/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp rename to src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp diff --git a/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp rename to src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp diff --git a/hotspot/src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp b/src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp rename to src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp diff --git a/hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp rename to src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp diff --git a/hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp rename to src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp diff --git a/hotspot/src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp rename to src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp diff --git a/hotspot/src/os_cpu/linux_s390/vm/atomic_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_s390/vm/atomic_linux_s390.hpp rename to src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp diff --git a/hotspot/src/os_cpu/linux_s390/vm/bytes_linux_s390.inline.hpp b/src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_s390/vm/bytes_linux_s390.inline.hpp rename to src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp diff --git a/hotspot/src/os_cpu/linux_s390/vm/globals_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_s390/vm/globals_linux_s390.hpp rename to src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp diff --git a/hotspot/src/os_cpu/linux_s390/vm/orderAccess_linux_s390.inline.hpp b/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_s390/vm/orderAccess_linux_s390.inline.hpp rename to src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.inline.hpp diff --git a/hotspot/src/os_cpu/linux_s390/vm/os_linux_s390.cpp b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_s390/vm/os_linux_s390.cpp rename to src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp diff --git a/hotspot/src/os_cpu/linux_s390/vm/os_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_s390/vm/os_linux_s390.hpp rename to src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp diff --git a/hotspot/src/os_cpu/linux_s390/vm/prefetch_linux_s390.inline.hpp b/src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_s390/vm/prefetch_linux_s390.inline.hpp rename to src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp diff --git a/hotspot/src/os_cpu/linux_s390/vm/thread_linux_s390.cpp b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_s390/vm/thread_linux_s390.cpp rename to src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp diff --git a/hotspot/src/os_cpu/linux_s390/vm/thread_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_s390/vm/thread_linux_s390.hpp rename to src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp diff --git a/hotspot/src/os_cpu/linux_s390/vm/vmStructs_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_s390/vm/vmStructs_linux_s390.hpp rename to src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp diff --git a/hotspot/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.hpp rename to src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp diff --git a/hotspot/src/os_cpu/linux_sparc/vm/globals_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_sparc/vm/globals_linux_sparc.hpp rename to src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp diff --git a/hotspot/src/os_cpu/linux_sparc/vm/linux_sparc.ad b/src/hotspot/os_cpu/linux_sparc/linux_sparc.ad similarity index 100% rename from hotspot/src/os_cpu/linux_sparc/vm/linux_sparc.ad rename to src/hotspot/os_cpu/linux_sparc/linux_sparc.ad diff --git a/hotspot/src/os_cpu/linux_sparc/vm/linux_sparc.s b/src/hotspot/os_cpu/linux_sparc/linux_sparc.s similarity index 100% rename from hotspot/src/os_cpu/linux_sparc/vm/linux_sparc.s rename to src/hotspot/os_cpu/linux_sparc/linux_sparc.s diff --git a/hotspot/src/os_cpu/linux_sparc/vm/orderAccess_linux_sparc.inline.hpp b/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_sparc/vm/orderAccess_linux_sparc.inline.hpp rename to src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.inline.hpp diff --git a/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp b/src/hotspot/os_cpu/linux_sparc/os_linux_sparc.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp rename to src/hotspot/os_cpu/linux_sparc/os_linux_sparc.cpp diff --git a/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp rename to src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp diff --git a/hotspot/src/os_cpu/linux_sparc/vm/prefetch_linux_sparc.inline.hpp b/src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_sparc/vm/prefetch_linux_sparc.inline.hpp rename to src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp diff --git a/hotspot/src/os_cpu/linux_sparc/vm/thread_linux_sparc.cpp b/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_sparc/vm/thread_linux_sparc.cpp rename to src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.cpp diff --git a/hotspot/src/os_cpu/linux_sparc/vm/thread_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_sparc/vm/thread_linux_sparc.hpp rename to src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp diff --git a/hotspot/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp rename to src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp diff --git a/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp b/src/hotspot/os_cpu/linux_sparc/vm_version_linux_sparc.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp rename to src/hotspot/os_cpu/linux_sparc/vm_version_linux_sparc.cpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/assembler_linux_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp rename to src/hotspot/os_cpu/linux_x86/assembler_linux_x86.cpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/atomic_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/atomic_linux_x86.hpp rename to src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/bytes_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/bytes_linux_x86.inline.hpp rename to src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/copy_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/copy_linux_x86.inline.hpp rename to src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/globals_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/globals_linux_x86.hpp rename to src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s b/src/hotspot/os_cpu/linux_x86/linux_x86_32.s similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s rename to src/hotspot/os_cpu/linux_x86/linux_x86_32.s diff --git a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.s b/src/hotspot/os_cpu/linux_x86/linux_x86_64.s similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.s rename to src/hotspot/os_cpu/linux_x86/linux_x86_64.s diff --git a/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp rename to src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.inline.hpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp rename to src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.hpp rename to src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.inline.hpp rename to src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/prefetch_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/prefetch_linux_x86.inline.hpp rename to src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/thread_linux_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp rename to src/hotspot/os_cpu/linux_x86/thread_linux_x86.cpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/thread_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/thread_linux_x86.hpp rename to src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp rename to src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp diff --git a/hotspot/src/os_cpu/linux_x86/vm/vm_version_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/vm_version_linux_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_x86/vm/vm_version_linux_x86.cpp rename to src/hotspot/os_cpu/linux_x86/vm_version_linux_x86.cpp diff --git a/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp b/src/hotspot/os_cpu/linux_zero/assembler_linux_zero.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp rename to src/hotspot/os_cpu/linux_zero/assembler_linux_zero.cpp diff --git a/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.hpp rename to src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp diff --git a/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp b/src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp rename to src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp diff --git a/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp rename to src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp diff --git a/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp b/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp rename to src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.inline.hpp diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp rename to src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp rename to src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp diff --git a/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp b/src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp rename to src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp diff --git a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp b/src/hotspot/os_cpu/linux_zero/thread_linux_zero.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp rename to src/hotspot/os_cpu/linux_zero/thread_linux_zero.cpp diff --git a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp rename to src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp diff --git a/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp similarity index 100% rename from hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp rename to src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp diff --git a/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp b/src/hotspot/os_cpu/linux_zero/vm_version_linux_zero.cpp similarity index 100% rename from hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp rename to src/hotspot/os_cpu/linux_zero/vm_version_linux_zero.cpp diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.hpp rename to src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/count_trailing_zeros_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/count_trailing_zeros_solaris_sparc.hpp rename to src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/globals_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/globals_solaris_sparc.hpp rename to src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp b/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp rename to src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.inline.hpp diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp b/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.cpp similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp rename to src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.cpp diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.hpp rename to src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/prefetch_solaris_sparc.inline.hpp b/src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/prefetch_solaris_sparc.inline.hpp rename to src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/solaris_sparc.il b/src/hotspot/os_cpu/solaris_sparc/solaris_sparc.il similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/solaris_sparc.il rename to src/hotspot/os_cpu/solaris_sparc/solaris_sparc.il diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/solaris_sparc.s b/src/hotspot/os_cpu/solaris_sparc/solaris_sparc.s similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/solaris_sparc.s rename to src/hotspot/os_cpu/solaris_sparc/solaris_sparc.s diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.cpp b/src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.cpp similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.cpp rename to src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.cpp diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.hpp rename to src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/vmStructs_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/vmStructs_solaris_sparc.hpp rename to src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp b/src/hotspot/os_cpu/solaris_sparc/vm_version_solaris_sparc.cpp similarity index 100% rename from hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp rename to src/hotspot/os_cpu/solaris_sparc/vm_version_solaris_sparc.cpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp b/src/hotspot/os_cpu/solaris_x86/assembler_solaris_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp rename to src/hotspot/os_cpu/solaris_x86/assembler_solaris_x86.cpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.hpp rename to src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/bytes_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/bytes_solaris_x86.inline.hpp rename to src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/copy_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/copy_solaris_x86.inline.hpp rename to src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/count_trailing_zeros_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/count_trailing_zeros_solaris_x86.hpp rename to src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp rename to src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp rename to src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.inline.hpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp rename to src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.hpp rename to src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.inline.hpp rename to src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp rename to src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il b/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.il similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il rename to src/hotspot/os_cpu/solaris_x86/solaris_x86_64.il diff --git a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.s b/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.s similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.s rename to src/hotspot/os_cpu/solaris_x86/solaris_x86_64.s diff --git a/hotspot/src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp b/src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp rename to src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.cpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/thread_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/thread_solaris_x86.hpp rename to src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/vmStructs_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/vmStructs_solaris_x86.hpp rename to src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp diff --git a/hotspot/src/os_cpu/solaris_x86/vm/vm_version_solaris_x86.cpp b/src/hotspot/os_cpu/solaris_x86/vm_version_solaris_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/solaris_x86/vm/vm_version_solaris_x86.cpp rename to src/hotspot/os_cpu/solaris_x86/vm_version_solaris_x86.cpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/assembler_windows_x86.cpp b/src/hotspot/os_cpu/windows_x86/assembler_windows_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/assembler_windows_x86.cpp rename to src/hotspot/os_cpu/windows_x86/assembler_windows_x86.cpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/atomic_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/atomic_windows_x86.hpp rename to src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/bytes_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/bytes_windows_x86.inline.hpp rename to src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp rename to src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/globals_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/globals_windows_x86.hpp rename to src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp rename to src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.inline.hpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp rename to src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.hpp rename to src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.inline.hpp rename to src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/prefetch_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/prefetch_windows_x86.inline.hpp rename to src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp b/src/hotspot/os_cpu/windows_x86/thread_windows_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp rename to src/hotspot/os_cpu/windows_x86/thread_windows_x86.cpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/thread_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/thread_windows_x86.hpp rename to src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp rename to src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/vmStructs_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/vmStructs_windows_x86.hpp rename to src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp diff --git a/hotspot/src/os_cpu/windows_x86/vm/vm_version_windows_x86.cpp b/src/hotspot/os_cpu/windows_x86/vm_version_windows_x86.cpp similarity index 100% rename from hotspot/src/os_cpu/windows_x86/vm/vm_version_windows_x86.cpp rename to src/hotspot/os_cpu/windows_x86/vm_version_windows_x86.cpp diff --git a/hotspot/src/share/vm/Xusage.txt b/src/hotspot/share/Xusage.txt similarity index 100% rename from hotspot/src/share/vm/Xusage.txt rename to src/hotspot/share/Xusage.txt diff --git a/hotspot/src/share/vm/adlc/Doc/Syntax.doc b/src/hotspot/share/adlc/Doc/Syntax.doc similarity index 100% rename from hotspot/src/share/vm/adlc/Doc/Syntax.doc rename to src/hotspot/share/adlc/Doc/Syntax.doc diff --git a/hotspot/src/share/vm/adlc/Test/i486.ad b/src/hotspot/share/adlc/Test/i486.ad similarity index 100% rename from hotspot/src/share/vm/adlc/Test/i486.ad rename to src/hotspot/share/adlc/Test/i486.ad diff --git a/hotspot/src/share/vm/adlc/adlc.hpp b/src/hotspot/share/adlc/adlc.hpp similarity index 100% rename from hotspot/src/share/vm/adlc/adlc.hpp rename to src/hotspot/share/adlc/adlc.hpp diff --git a/hotspot/src/share/vm/adlc/adlparse.cpp b/src/hotspot/share/adlc/adlparse.cpp similarity index 100% rename from hotspot/src/share/vm/adlc/adlparse.cpp rename to src/hotspot/share/adlc/adlparse.cpp diff --git a/hotspot/src/share/vm/adlc/adlparse.hpp b/src/hotspot/share/adlc/adlparse.hpp similarity index 100% rename from hotspot/src/share/vm/adlc/adlparse.hpp rename to src/hotspot/share/adlc/adlparse.hpp diff --git a/hotspot/src/share/vm/adlc/archDesc.cpp b/src/hotspot/share/adlc/archDesc.cpp similarity index 100% rename from hotspot/src/share/vm/adlc/archDesc.cpp rename to src/hotspot/share/adlc/archDesc.cpp diff --git a/hotspot/src/share/vm/adlc/archDesc.hpp b/src/hotspot/share/adlc/archDesc.hpp similarity index 100% rename from hotspot/src/share/vm/adlc/archDesc.hpp rename to src/hotspot/share/adlc/archDesc.hpp diff --git a/hotspot/src/share/vm/adlc/arena.cpp b/src/hotspot/share/adlc/arena.cpp similarity index 100% rename from hotspot/src/share/vm/adlc/arena.cpp rename to src/hotspot/share/adlc/arena.cpp diff --git a/hotspot/src/share/vm/adlc/arena.hpp b/src/hotspot/share/adlc/arena.hpp similarity index 100% rename from hotspot/src/share/vm/adlc/arena.hpp rename to src/hotspot/share/adlc/arena.hpp diff --git a/hotspot/src/share/vm/adlc/dfa.cpp b/src/hotspot/share/adlc/dfa.cpp similarity index 100% rename from hotspot/src/share/vm/adlc/dfa.cpp rename to src/hotspot/share/adlc/dfa.cpp diff --git a/hotspot/src/share/vm/adlc/dict2.cpp b/src/hotspot/share/adlc/dict2.cpp similarity index 100% rename from hotspot/src/share/vm/adlc/dict2.cpp rename to src/hotspot/share/adlc/dict2.cpp diff --git a/hotspot/src/share/vm/adlc/dict2.hpp b/src/hotspot/share/adlc/dict2.hpp similarity index 100% rename from hotspot/src/share/vm/adlc/dict2.hpp rename to src/hotspot/share/adlc/dict2.hpp diff --git a/hotspot/src/share/vm/adlc/filebuff.cpp b/src/hotspot/share/adlc/filebuff.cpp similarity index 100% rename from hotspot/src/share/vm/adlc/filebuff.cpp rename to src/hotspot/share/adlc/filebuff.cpp diff --git a/hotspot/src/share/vm/adlc/filebuff.hpp b/src/hotspot/share/adlc/filebuff.hpp similarity index 100% rename from hotspot/src/share/vm/adlc/filebuff.hpp rename to src/hotspot/share/adlc/filebuff.hpp diff --git a/hotspot/src/share/vm/adlc/forms.cpp b/src/hotspot/share/adlc/forms.cpp similarity index 100% rename from hotspot/src/share/vm/adlc/forms.cpp rename to src/hotspot/share/adlc/forms.cpp diff --git a/hotspot/src/share/vm/adlc/forms.hpp b/src/hotspot/share/adlc/forms.hpp similarity index 100% rename from hotspot/src/share/vm/adlc/forms.hpp rename to src/hotspot/share/adlc/forms.hpp diff --git a/hotspot/src/share/vm/adlc/formsopt.cpp b/src/hotspot/share/adlc/formsopt.cpp similarity index 100% rename from hotspot/src/share/vm/adlc/formsopt.cpp rename to src/hotspot/share/adlc/formsopt.cpp diff --git a/hotspot/src/share/vm/adlc/formsopt.hpp b/src/hotspot/share/adlc/formsopt.hpp similarity index 100% rename from hotspot/src/share/vm/adlc/formsopt.hpp rename to src/hotspot/share/adlc/formsopt.hpp diff --git a/hotspot/src/share/vm/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp similarity index 100% rename from hotspot/src/share/vm/adlc/formssel.cpp rename to src/hotspot/share/adlc/formssel.cpp diff --git a/hotspot/src/share/vm/adlc/formssel.hpp b/src/hotspot/share/adlc/formssel.hpp similarity index 100% rename from hotspot/src/share/vm/adlc/formssel.hpp rename to src/hotspot/share/adlc/formssel.hpp diff --git a/hotspot/src/share/vm/adlc/main.cpp b/src/hotspot/share/adlc/main.cpp similarity index 100% rename from hotspot/src/share/vm/adlc/main.cpp rename to src/hotspot/share/adlc/main.cpp diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/src/hotspot/share/adlc/output_c.cpp similarity index 100% rename from hotspot/src/share/vm/adlc/output_c.cpp rename to src/hotspot/share/adlc/output_c.cpp diff --git a/hotspot/src/share/vm/adlc/output_h.cpp b/src/hotspot/share/adlc/output_h.cpp similarity index 100% rename from hotspot/src/share/vm/adlc/output_h.cpp rename to src/hotspot/share/adlc/output_h.cpp diff --git a/hotspot/src/share/vm/aot/aotCodeHeap.cpp b/src/hotspot/share/aot/aotCodeHeap.cpp similarity index 100% rename from hotspot/src/share/vm/aot/aotCodeHeap.cpp rename to src/hotspot/share/aot/aotCodeHeap.cpp diff --git a/hotspot/src/share/vm/aot/aotCodeHeap.hpp b/src/hotspot/share/aot/aotCodeHeap.hpp similarity index 100% rename from hotspot/src/share/vm/aot/aotCodeHeap.hpp rename to src/hotspot/share/aot/aotCodeHeap.hpp diff --git a/hotspot/src/share/vm/aot/aotCompiledMethod.cpp b/src/hotspot/share/aot/aotCompiledMethod.cpp similarity index 100% rename from hotspot/src/share/vm/aot/aotCompiledMethod.cpp rename to src/hotspot/share/aot/aotCompiledMethod.cpp diff --git a/hotspot/src/share/vm/aot/aotCompiledMethod.hpp b/src/hotspot/share/aot/aotCompiledMethod.hpp similarity index 100% rename from hotspot/src/share/vm/aot/aotCompiledMethod.hpp rename to src/hotspot/share/aot/aotCompiledMethod.hpp diff --git a/hotspot/src/share/vm/aot/aotLoader.cpp b/src/hotspot/share/aot/aotLoader.cpp similarity index 100% rename from hotspot/src/share/vm/aot/aotLoader.cpp rename to src/hotspot/share/aot/aotLoader.cpp diff --git a/hotspot/src/share/vm/aot/aotLoader.hpp b/src/hotspot/share/aot/aotLoader.hpp similarity index 100% rename from hotspot/src/share/vm/aot/aotLoader.hpp rename to src/hotspot/share/aot/aotLoader.hpp diff --git a/hotspot/src/share/vm/aot/aotLoader.inline.hpp b/src/hotspot/share/aot/aotLoader.inline.hpp similarity index 100% rename from hotspot/src/share/vm/aot/aotLoader.inline.hpp rename to src/hotspot/share/aot/aotLoader.inline.hpp diff --git a/hotspot/src/share/vm/aot/compiledIC_aot.cpp b/src/hotspot/share/aot/compiledIC_aot.cpp similarity index 100% rename from hotspot/src/share/vm/aot/compiledIC_aot.cpp rename to src/hotspot/share/aot/compiledIC_aot.cpp diff --git a/hotspot/src/share/vm/aot/compiledIC_aot.hpp b/src/hotspot/share/aot/compiledIC_aot.hpp similarity index 100% rename from hotspot/src/share/vm/aot/compiledIC_aot.hpp rename to src/hotspot/share/aot/compiledIC_aot.hpp diff --git a/hotspot/src/share/vm/asm/assembler.cpp b/src/hotspot/share/asm/assembler.cpp similarity index 100% rename from hotspot/src/share/vm/asm/assembler.cpp rename to src/hotspot/share/asm/assembler.cpp diff --git a/hotspot/src/share/vm/asm/assembler.hpp b/src/hotspot/share/asm/assembler.hpp similarity index 100% rename from hotspot/src/share/vm/asm/assembler.hpp rename to src/hotspot/share/asm/assembler.hpp diff --git a/hotspot/src/share/vm/asm/assembler.inline.hpp b/src/hotspot/share/asm/assembler.inline.hpp similarity index 100% rename from hotspot/src/share/vm/asm/assembler.inline.hpp rename to src/hotspot/share/asm/assembler.inline.hpp diff --git a/hotspot/src/share/vm/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp similarity index 100% rename from hotspot/src/share/vm/asm/codeBuffer.cpp rename to src/hotspot/share/asm/codeBuffer.cpp diff --git a/hotspot/src/share/vm/asm/codeBuffer.hpp b/src/hotspot/share/asm/codeBuffer.hpp similarity index 100% rename from hotspot/src/share/vm/asm/codeBuffer.hpp rename to src/hotspot/share/asm/codeBuffer.hpp diff --git a/hotspot/src/share/vm/asm/macroAssembler.hpp b/src/hotspot/share/asm/macroAssembler.hpp similarity index 100% rename from hotspot/src/share/vm/asm/macroAssembler.hpp rename to src/hotspot/share/asm/macroAssembler.hpp diff --git a/hotspot/src/share/vm/asm/macroAssembler.inline.hpp b/src/hotspot/share/asm/macroAssembler.inline.hpp similarity index 100% rename from hotspot/src/share/vm/asm/macroAssembler.inline.hpp rename to src/hotspot/share/asm/macroAssembler.inline.hpp diff --git a/hotspot/src/share/vm/asm/register.cpp b/src/hotspot/share/asm/register.cpp similarity index 100% rename from hotspot/src/share/vm/asm/register.cpp rename to src/hotspot/share/asm/register.cpp diff --git a/hotspot/src/share/vm/asm/register.hpp b/src/hotspot/share/asm/register.hpp similarity index 100% rename from hotspot/src/share/vm/asm/register.hpp rename to src/hotspot/share/asm/register.hpp diff --git a/hotspot/src/share/vm/c1/c1_CFGPrinter.cpp b/src/hotspot/share/c1/c1_CFGPrinter.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_CFGPrinter.cpp rename to src/hotspot/share/c1/c1_CFGPrinter.cpp diff --git a/hotspot/src/share/vm/c1/c1_CFGPrinter.hpp b/src/hotspot/share/c1/c1_CFGPrinter.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_CFGPrinter.hpp rename to src/hotspot/share/c1/c1_CFGPrinter.hpp diff --git a/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp b/src/hotspot/share/c1/c1_Canonicalizer.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Canonicalizer.cpp rename to src/hotspot/share/c1/c1_Canonicalizer.cpp diff --git a/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp b/src/hotspot/share/c1/c1_Canonicalizer.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Canonicalizer.hpp rename to src/hotspot/share/c1/c1_Canonicalizer.hpp diff --git a/hotspot/src/share/vm/c1/c1_CodeStubs.hpp b/src/hotspot/share/c1/c1_CodeStubs.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_CodeStubs.hpp rename to src/hotspot/share/c1/c1_CodeStubs.hpp diff --git a/hotspot/src/share/vm/c1/c1_Compilation.cpp b/src/hotspot/share/c1/c1_Compilation.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Compilation.cpp rename to src/hotspot/share/c1/c1_Compilation.cpp diff --git a/hotspot/src/share/vm/c1/c1_Compilation.hpp b/src/hotspot/share/c1/c1_Compilation.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Compilation.hpp rename to src/hotspot/share/c1/c1_Compilation.hpp diff --git a/hotspot/src/share/vm/c1/c1_Compiler.cpp b/src/hotspot/share/c1/c1_Compiler.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Compiler.cpp rename to src/hotspot/share/c1/c1_Compiler.cpp diff --git a/hotspot/src/share/vm/c1/c1_Compiler.hpp b/src/hotspot/share/c1/c1_Compiler.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Compiler.hpp rename to src/hotspot/share/c1/c1_Compiler.hpp diff --git a/hotspot/src/share/vm/c1/c1_Defs.cpp b/src/hotspot/share/c1/c1_Defs.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Defs.cpp rename to src/hotspot/share/c1/c1_Defs.cpp diff --git a/hotspot/src/share/vm/c1/c1_Defs.hpp b/src/hotspot/share/c1/c1_Defs.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Defs.hpp rename to src/hotspot/share/c1/c1_Defs.hpp diff --git a/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp b/src/hotspot/share/c1/c1_FpuStackSim.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_FpuStackSim.hpp rename to src/hotspot/share/c1/c1_FpuStackSim.hpp diff --git a/hotspot/src/share/vm/c1/c1_FrameMap.cpp b/src/hotspot/share/c1/c1_FrameMap.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_FrameMap.cpp rename to src/hotspot/share/c1/c1_FrameMap.cpp diff --git a/hotspot/src/share/vm/c1/c1_FrameMap.hpp b/src/hotspot/share/c1/c1_FrameMap.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_FrameMap.hpp rename to src/hotspot/share/c1/c1_FrameMap.hpp diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_GraphBuilder.cpp rename to src/hotspot/share/c1/c1_GraphBuilder.cpp diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp b/src/hotspot/share/c1/c1_GraphBuilder.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_GraphBuilder.hpp rename to src/hotspot/share/c1/c1_GraphBuilder.hpp diff --git a/hotspot/src/share/vm/c1/c1_IR.cpp b/src/hotspot/share/c1/c1_IR.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_IR.cpp rename to src/hotspot/share/c1/c1_IR.cpp diff --git a/hotspot/src/share/vm/c1/c1_IR.hpp b/src/hotspot/share/c1/c1_IR.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_IR.hpp rename to src/hotspot/share/c1/c1_IR.hpp diff --git a/hotspot/src/share/vm/c1/c1_Instruction.cpp b/src/hotspot/share/c1/c1_Instruction.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Instruction.cpp rename to src/hotspot/share/c1/c1_Instruction.cpp diff --git a/hotspot/src/share/vm/c1/c1_Instruction.hpp b/src/hotspot/share/c1/c1_Instruction.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Instruction.hpp rename to src/hotspot/share/c1/c1_Instruction.hpp diff --git a/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp b/src/hotspot/share/c1/c1_InstructionPrinter.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp rename to src/hotspot/share/c1/c1_InstructionPrinter.cpp diff --git a/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp b/src/hotspot/share/c1/c1_InstructionPrinter.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp rename to src/hotspot/share/c1/c1_InstructionPrinter.hpp diff --git a/hotspot/src/share/vm/c1/c1_LIR.cpp b/src/hotspot/share/c1/c1_LIR.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_LIR.cpp rename to src/hotspot/share/c1/c1_LIR.cpp diff --git a/hotspot/src/share/vm/c1/c1_LIR.hpp b/src/hotspot/share/c1/c1_LIR.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_LIR.hpp rename to src/hotspot/share/c1/c1_LIR.hpp diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp b/src/hotspot/share/c1/c1_LIRAssembler.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_LIRAssembler.cpp rename to src/hotspot/share/c1/c1_LIRAssembler.cpp diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp b/src/hotspot/share/c1/c1_LIRAssembler.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_LIRAssembler.hpp rename to src/hotspot/share/c1/c1_LIRAssembler.hpp diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp b/src/hotspot/share/c1/c1_LIRGenerator.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_LIRGenerator.cpp rename to src/hotspot/share/c1/c1_LIRGenerator.cpp diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp b/src/hotspot/share/c1/c1_LIRGenerator.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_LIRGenerator.hpp rename to src/hotspot/share/c1/c1_LIRGenerator.hpp diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.cpp b/src/hotspot/share/c1/c1_LinearScan.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_LinearScan.cpp rename to src/hotspot/share/c1/c1_LinearScan.cpp diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.hpp b/src/hotspot/share/c1/c1_LinearScan.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_LinearScan.hpp rename to src/hotspot/share/c1/c1_LinearScan.hpp diff --git a/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp b/src/hotspot/share/c1/c1_MacroAssembler.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_MacroAssembler.hpp rename to src/hotspot/share/c1/c1_MacroAssembler.hpp diff --git a/hotspot/src/share/vm/c1/c1_Optimizer.cpp b/src/hotspot/share/c1/c1_Optimizer.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Optimizer.cpp rename to src/hotspot/share/c1/c1_Optimizer.cpp diff --git a/hotspot/src/share/vm/c1/c1_Optimizer.hpp b/src/hotspot/share/c1/c1_Optimizer.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Optimizer.hpp rename to src/hotspot/share/c1/c1_Optimizer.hpp diff --git a/hotspot/src/share/vm/c1/c1_RangeCheckElimination.cpp b/src/hotspot/share/c1/c1_RangeCheckElimination.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_RangeCheckElimination.cpp rename to src/hotspot/share/c1/c1_RangeCheckElimination.cpp diff --git a/hotspot/src/share/vm/c1/c1_RangeCheckElimination.hpp b/src/hotspot/share/c1/c1_RangeCheckElimination.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_RangeCheckElimination.hpp rename to src/hotspot/share/c1/c1_RangeCheckElimination.hpp diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.cpp b/src/hotspot/share/c1/c1_Runtime1.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Runtime1.cpp rename to src/hotspot/share/c1/c1_Runtime1.cpp diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.hpp b/src/hotspot/share/c1/c1_Runtime1.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_Runtime1.hpp rename to src/hotspot/share/c1/c1_Runtime1.hpp diff --git a/hotspot/src/share/vm/c1/c1_ValueMap.cpp b/src/hotspot/share/c1/c1_ValueMap.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_ValueMap.cpp rename to src/hotspot/share/c1/c1_ValueMap.cpp diff --git a/hotspot/src/share/vm/c1/c1_ValueMap.hpp b/src/hotspot/share/c1/c1_ValueMap.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_ValueMap.hpp rename to src/hotspot/share/c1/c1_ValueMap.hpp diff --git a/hotspot/src/share/vm/c1/c1_ValueSet.cpp b/src/hotspot/share/c1/c1_ValueSet.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_ValueSet.cpp rename to src/hotspot/share/c1/c1_ValueSet.cpp diff --git a/hotspot/src/share/vm/c1/c1_ValueSet.hpp b/src/hotspot/share/c1/c1_ValueSet.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_ValueSet.hpp rename to src/hotspot/share/c1/c1_ValueSet.hpp diff --git a/hotspot/src/share/vm/c1/c1_ValueSet.inline.hpp b/src/hotspot/share/c1/c1_ValueSet.inline.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_ValueSet.inline.hpp rename to src/hotspot/share/c1/c1_ValueSet.inline.hpp diff --git a/hotspot/src/share/vm/c1/c1_ValueStack.cpp b/src/hotspot/share/c1/c1_ValueStack.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_ValueStack.cpp rename to src/hotspot/share/c1/c1_ValueStack.cpp diff --git a/hotspot/src/share/vm/c1/c1_ValueStack.hpp b/src/hotspot/share/c1/c1_ValueStack.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_ValueStack.hpp rename to src/hotspot/share/c1/c1_ValueStack.hpp diff --git a/hotspot/src/share/vm/c1/c1_ValueType.cpp b/src/hotspot/share/c1/c1_ValueType.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_ValueType.cpp rename to src/hotspot/share/c1/c1_ValueType.cpp diff --git a/hotspot/src/share/vm/c1/c1_ValueType.hpp b/src/hotspot/share/c1/c1_ValueType.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_ValueType.hpp rename to src/hotspot/share/c1/c1_ValueType.hpp diff --git a/hotspot/src/share/vm/c1/c1_globals.cpp b/src/hotspot/share/c1/c1_globals.cpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_globals.cpp rename to src/hotspot/share/c1/c1_globals.cpp diff --git a/hotspot/src/share/vm/c1/c1_globals.hpp b/src/hotspot/share/c1/c1_globals.hpp similarity index 100% rename from hotspot/src/share/vm/c1/c1_globals.hpp rename to src/hotspot/share/c1/c1_globals.hpp diff --git a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp b/src/hotspot/share/ci/bcEscapeAnalyzer.cpp similarity index 100% rename from hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp rename to src/hotspot/share/ci/bcEscapeAnalyzer.cpp diff --git a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.hpp b/src/hotspot/share/ci/bcEscapeAnalyzer.hpp similarity index 100% rename from hotspot/src/share/vm/ci/bcEscapeAnalyzer.hpp rename to src/hotspot/share/ci/bcEscapeAnalyzer.hpp diff --git a/hotspot/src/share/vm/ci/ciArray.cpp b/src/hotspot/share/ci/ciArray.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciArray.cpp rename to src/hotspot/share/ci/ciArray.cpp diff --git a/hotspot/src/share/vm/ci/ciArray.hpp b/src/hotspot/share/ci/ciArray.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciArray.hpp rename to src/hotspot/share/ci/ciArray.hpp diff --git a/hotspot/src/share/vm/ci/ciArrayKlass.cpp b/src/hotspot/share/ci/ciArrayKlass.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciArrayKlass.cpp rename to src/hotspot/share/ci/ciArrayKlass.cpp diff --git a/hotspot/src/share/vm/ci/ciArrayKlass.hpp b/src/hotspot/share/ci/ciArrayKlass.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciArrayKlass.hpp rename to src/hotspot/share/ci/ciArrayKlass.hpp diff --git a/hotspot/src/share/vm/ci/ciBaseObject.cpp b/src/hotspot/share/ci/ciBaseObject.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciBaseObject.cpp rename to src/hotspot/share/ci/ciBaseObject.cpp diff --git a/hotspot/src/share/vm/ci/ciBaseObject.hpp b/src/hotspot/share/ci/ciBaseObject.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciBaseObject.hpp rename to src/hotspot/share/ci/ciBaseObject.hpp diff --git a/hotspot/src/share/vm/ci/ciCallProfile.hpp b/src/hotspot/share/ci/ciCallProfile.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciCallProfile.hpp rename to src/hotspot/share/ci/ciCallProfile.hpp diff --git a/hotspot/src/share/vm/ci/ciCallSite.cpp b/src/hotspot/share/ci/ciCallSite.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciCallSite.cpp rename to src/hotspot/share/ci/ciCallSite.cpp diff --git a/hotspot/src/share/vm/ci/ciCallSite.hpp b/src/hotspot/share/ci/ciCallSite.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciCallSite.hpp rename to src/hotspot/share/ci/ciCallSite.hpp diff --git a/hotspot/src/share/vm/ci/ciClassList.hpp b/src/hotspot/share/ci/ciClassList.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciClassList.hpp rename to src/hotspot/share/ci/ciClassList.hpp diff --git a/hotspot/src/share/vm/ci/ciConstant.cpp b/src/hotspot/share/ci/ciConstant.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciConstant.cpp rename to src/hotspot/share/ci/ciConstant.cpp diff --git a/hotspot/src/share/vm/ci/ciConstant.hpp b/src/hotspot/share/ci/ciConstant.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciConstant.hpp rename to src/hotspot/share/ci/ciConstant.hpp diff --git a/hotspot/src/share/vm/ci/ciConstantPoolCache.cpp b/src/hotspot/share/ci/ciConstantPoolCache.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciConstantPoolCache.cpp rename to src/hotspot/share/ci/ciConstantPoolCache.cpp diff --git a/hotspot/src/share/vm/ci/ciConstantPoolCache.hpp b/src/hotspot/share/ci/ciConstantPoolCache.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciConstantPoolCache.hpp rename to src/hotspot/share/ci/ciConstantPoolCache.hpp diff --git a/hotspot/src/share/vm/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciEnv.cpp rename to src/hotspot/share/ci/ciEnv.cpp diff --git a/hotspot/src/share/vm/ci/ciEnv.hpp b/src/hotspot/share/ci/ciEnv.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciEnv.hpp rename to src/hotspot/share/ci/ciEnv.hpp diff --git a/hotspot/src/share/vm/ci/ciExceptionHandler.cpp b/src/hotspot/share/ci/ciExceptionHandler.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciExceptionHandler.cpp rename to src/hotspot/share/ci/ciExceptionHandler.cpp diff --git a/hotspot/src/share/vm/ci/ciExceptionHandler.hpp b/src/hotspot/share/ci/ciExceptionHandler.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciExceptionHandler.hpp rename to src/hotspot/share/ci/ciExceptionHandler.hpp diff --git a/hotspot/src/share/vm/ci/ciField.cpp b/src/hotspot/share/ci/ciField.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciField.cpp rename to src/hotspot/share/ci/ciField.cpp diff --git a/hotspot/src/share/vm/ci/ciField.hpp b/src/hotspot/share/ci/ciField.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciField.hpp rename to src/hotspot/share/ci/ciField.hpp diff --git a/hotspot/src/share/vm/ci/ciFlags.cpp b/src/hotspot/share/ci/ciFlags.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciFlags.cpp rename to src/hotspot/share/ci/ciFlags.cpp diff --git a/hotspot/src/share/vm/ci/ciFlags.hpp b/src/hotspot/share/ci/ciFlags.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciFlags.hpp rename to src/hotspot/share/ci/ciFlags.hpp diff --git a/hotspot/src/share/vm/ci/ciInstance.cpp b/src/hotspot/share/ci/ciInstance.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciInstance.cpp rename to src/hotspot/share/ci/ciInstance.cpp diff --git a/hotspot/src/share/vm/ci/ciInstance.hpp b/src/hotspot/share/ci/ciInstance.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciInstance.hpp rename to src/hotspot/share/ci/ciInstance.hpp diff --git a/hotspot/src/share/vm/ci/ciInstanceKlass.cpp b/src/hotspot/share/ci/ciInstanceKlass.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciInstanceKlass.cpp rename to src/hotspot/share/ci/ciInstanceKlass.cpp diff --git a/hotspot/src/share/vm/ci/ciInstanceKlass.hpp b/src/hotspot/share/ci/ciInstanceKlass.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciInstanceKlass.hpp rename to src/hotspot/share/ci/ciInstanceKlass.hpp diff --git a/hotspot/src/share/vm/ci/ciKlass.cpp b/src/hotspot/share/ci/ciKlass.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciKlass.cpp rename to src/hotspot/share/ci/ciKlass.cpp diff --git a/hotspot/src/share/vm/ci/ciKlass.hpp b/src/hotspot/share/ci/ciKlass.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciKlass.hpp rename to src/hotspot/share/ci/ciKlass.hpp diff --git a/hotspot/src/share/vm/ci/ciMemberName.cpp b/src/hotspot/share/ci/ciMemberName.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMemberName.cpp rename to src/hotspot/share/ci/ciMemberName.cpp diff --git a/hotspot/src/share/vm/ci/ciMemberName.hpp b/src/hotspot/share/ci/ciMemberName.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMemberName.hpp rename to src/hotspot/share/ci/ciMemberName.hpp diff --git a/hotspot/src/share/vm/ci/ciMetadata.cpp b/src/hotspot/share/ci/ciMetadata.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMetadata.cpp rename to src/hotspot/share/ci/ciMetadata.cpp diff --git a/hotspot/src/share/vm/ci/ciMetadata.hpp b/src/hotspot/share/ci/ciMetadata.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMetadata.hpp rename to src/hotspot/share/ci/ciMetadata.hpp diff --git a/hotspot/src/share/vm/ci/ciMethod.cpp b/src/hotspot/share/ci/ciMethod.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMethod.cpp rename to src/hotspot/share/ci/ciMethod.cpp diff --git a/hotspot/src/share/vm/ci/ciMethod.hpp b/src/hotspot/share/ci/ciMethod.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMethod.hpp rename to src/hotspot/share/ci/ciMethod.hpp diff --git a/hotspot/src/share/vm/ci/ciMethodBlocks.cpp b/src/hotspot/share/ci/ciMethodBlocks.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMethodBlocks.cpp rename to src/hotspot/share/ci/ciMethodBlocks.cpp diff --git a/hotspot/src/share/vm/ci/ciMethodBlocks.hpp b/src/hotspot/share/ci/ciMethodBlocks.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMethodBlocks.hpp rename to src/hotspot/share/ci/ciMethodBlocks.hpp diff --git a/hotspot/src/share/vm/ci/ciMethodData.cpp b/src/hotspot/share/ci/ciMethodData.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMethodData.cpp rename to src/hotspot/share/ci/ciMethodData.cpp diff --git a/hotspot/src/share/vm/ci/ciMethodData.hpp b/src/hotspot/share/ci/ciMethodData.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMethodData.hpp rename to src/hotspot/share/ci/ciMethodData.hpp diff --git a/hotspot/src/share/vm/ci/ciMethodHandle.cpp b/src/hotspot/share/ci/ciMethodHandle.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMethodHandle.cpp rename to src/hotspot/share/ci/ciMethodHandle.cpp diff --git a/hotspot/src/share/vm/ci/ciMethodHandle.hpp b/src/hotspot/share/ci/ciMethodHandle.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMethodHandle.hpp rename to src/hotspot/share/ci/ciMethodHandle.hpp diff --git a/hotspot/src/share/vm/ci/ciMethodType.hpp b/src/hotspot/share/ci/ciMethodType.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciMethodType.hpp rename to src/hotspot/share/ci/ciMethodType.hpp diff --git a/hotspot/src/share/vm/ci/ciNullObject.cpp b/src/hotspot/share/ci/ciNullObject.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciNullObject.cpp rename to src/hotspot/share/ci/ciNullObject.cpp diff --git a/hotspot/src/share/vm/ci/ciNullObject.hpp b/src/hotspot/share/ci/ciNullObject.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciNullObject.hpp rename to src/hotspot/share/ci/ciNullObject.hpp diff --git a/hotspot/src/share/vm/ci/ciObjArray.cpp b/src/hotspot/share/ci/ciObjArray.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciObjArray.cpp rename to src/hotspot/share/ci/ciObjArray.cpp diff --git a/hotspot/src/share/vm/ci/ciObjArray.hpp b/src/hotspot/share/ci/ciObjArray.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciObjArray.hpp rename to src/hotspot/share/ci/ciObjArray.hpp diff --git a/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp b/src/hotspot/share/ci/ciObjArrayKlass.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciObjArrayKlass.cpp rename to src/hotspot/share/ci/ciObjArrayKlass.cpp diff --git a/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp b/src/hotspot/share/ci/ciObjArrayKlass.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciObjArrayKlass.hpp rename to src/hotspot/share/ci/ciObjArrayKlass.hpp diff --git a/hotspot/src/share/vm/ci/ciObject.cpp b/src/hotspot/share/ci/ciObject.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciObject.cpp rename to src/hotspot/share/ci/ciObject.cpp diff --git a/hotspot/src/share/vm/ci/ciObject.hpp b/src/hotspot/share/ci/ciObject.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciObject.hpp rename to src/hotspot/share/ci/ciObject.hpp diff --git a/hotspot/src/share/vm/ci/ciObjectFactory.cpp b/src/hotspot/share/ci/ciObjectFactory.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciObjectFactory.cpp rename to src/hotspot/share/ci/ciObjectFactory.cpp diff --git a/hotspot/src/share/vm/ci/ciObjectFactory.hpp b/src/hotspot/share/ci/ciObjectFactory.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciObjectFactory.hpp rename to src/hotspot/share/ci/ciObjectFactory.hpp diff --git a/hotspot/src/share/vm/ci/ciReplay.cpp b/src/hotspot/share/ci/ciReplay.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciReplay.cpp rename to src/hotspot/share/ci/ciReplay.cpp diff --git a/hotspot/src/share/vm/ci/ciReplay.hpp b/src/hotspot/share/ci/ciReplay.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciReplay.hpp rename to src/hotspot/share/ci/ciReplay.hpp diff --git a/hotspot/src/share/vm/ci/ciSignature.cpp b/src/hotspot/share/ci/ciSignature.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciSignature.cpp rename to src/hotspot/share/ci/ciSignature.cpp diff --git a/hotspot/src/share/vm/ci/ciSignature.hpp b/src/hotspot/share/ci/ciSignature.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciSignature.hpp rename to src/hotspot/share/ci/ciSignature.hpp diff --git a/hotspot/src/share/vm/ci/ciStreams.cpp b/src/hotspot/share/ci/ciStreams.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciStreams.cpp rename to src/hotspot/share/ci/ciStreams.cpp diff --git a/hotspot/src/share/vm/ci/ciStreams.hpp b/src/hotspot/share/ci/ciStreams.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciStreams.hpp rename to src/hotspot/share/ci/ciStreams.hpp diff --git a/hotspot/src/share/vm/ci/ciSymbol.cpp b/src/hotspot/share/ci/ciSymbol.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciSymbol.cpp rename to src/hotspot/share/ci/ciSymbol.cpp diff --git a/hotspot/src/share/vm/ci/ciSymbol.hpp b/src/hotspot/share/ci/ciSymbol.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciSymbol.hpp rename to src/hotspot/share/ci/ciSymbol.hpp diff --git a/hotspot/src/share/vm/ci/ciType.cpp b/src/hotspot/share/ci/ciType.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciType.cpp rename to src/hotspot/share/ci/ciType.cpp diff --git a/hotspot/src/share/vm/ci/ciType.hpp b/src/hotspot/share/ci/ciType.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciType.hpp rename to src/hotspot/share/ci/ciType.hpp diff --git a/hotspot/src/share/vm/ci/ciTypeArray.cpp b/src/hotspot/share/ci/ciTypeArray.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciTypeArray.cpp rename to src/hotspot/share/ci/ciTypeArray.cpp diff --git a/hotspot/src/share/vm/ci/ciTypeArray.hpp b/src/hotspot/share/ci/ciTypeArray.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciTypeArray.hpp rename to src/hotspot/share/ci/ciTypeArray.hpp diff --git a/hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp b/src/hotspot/share/ci/ciTypeArrayKlass.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp rename to src/hotspot/share/ci/ciTypeArrayKlass.cpp diff --git a/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp b/src/hotspot/share/ci/ciTypeArrayKlass.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp rename to src/hotspot/share/ci/ciTypeArrayKlass.hpp diff --git a/hotspot/src/share/vm/ci/ciTypeFlow.cpp b/src/hotspot/share/ci/ciTypeFlow.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciTypeFlow.cpp rename to src/hotspot/share/ci/ciTypeFlow.cpp diff --git a/hotspot/src/share/vm/ci/ciTypeFlow.hpp b/src/hotspot/share/ci/ciTypeFlow.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciTypeFlow.hpp rename to src/hotspot/share/ci/ciTypeFlow.hpp diff --git a/hotspot/src/share/vm/ci/ciUtilities.cpp b/src/hotspot/share/ci/ciUtilities.cpp similarity index 100% rename from hotspot/src/share/vm/ci/ciUtilities.cpp rename to src/hotspot/share/ci/ciUtilities.cpp diff --git a/hotspot/src/share/vm/ci/ciUtilities.hpp b/src/hotspot/share/ci/ciUtilities.hpp similarity index 100% rename from hotspot/src/share/vm/ci/ciUtilities.hpp rename to src/hotspot/share/ci/ciUtilities.hpp diff --git a/hotspot/src/share/vm/ci/compilerInterface.hpp b/src/hotspot/share/ci/compilerInterface.hpp similarity index 100% rename from hotspot/src/share/vm/ci/compilerInterface.hpp rename to src/hotspot/share/ci/compilerInterface.hpp diff --git a/hotspot/src/share/vm/classfile/altHashing.cpp b/src/hotspot/share/classfile/altHashing.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/altHashing.cpp rename to src/hotspot/share/classfile/altHashing.cpp diff --git a/hotspot/src/share/vm/classfile/altHashing.hpp b/src/hotspot/share/classfile/altHashing.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/altHashing.hpp rename to src/hotspot/share/classfile/altHashing.hpp diff --git a/hotspot/src/share/vm/classfile/bytecodeAssembler.cpp b/src/hotspot/share/classfile/bytecodeAssembler.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/bytecodeAssembler.cpp rename to src/hotspot/share/classfile/bytecodeAssembler.cpp diff --git a/hotspot/src/share/vm/classfile/bytecodeAssembler.hpp b/src/hotspot/share/classfile/bytecodeAssembler.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/bytecodeAssembler.hpp rename to src/hotspot/share/classfile/bytecodeAssembler.hpp diff --git a/hotspot/src/share/vm/classfile/classFileError.cpp b/src/hotspot/share/classfile/classFileError.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/classFileError.cpp rename to src/hotspot/share/classfile/classFileError.cpp diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/classFileParser.cpp rename to src/hotspot/share/classfile/classFileParser.cpp diff --git a/hotspot/src/share/vm/classfile/classFileParser.hpp b/src/hotspot/share/classfile/classFileParser.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/classFileParser.hpp rename to src/hotspot/share/classfile/classFileParser.hpp diff --git a/hotspot/src/share/vm/classfile/classFileStream.cpp b/src/hotspot/share/classfile/classFileStream.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/classFileStream.cpp rename to src/hotspot/share/classfile/classFileStream.cpp diff --git a/hotspot/src/share/vm/classfile/classFileStream.hpp b/src/hotspot/share/classfile/classFileStream.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/classFileStream.hpp rename to src/hotspot/share/classfile/classFileStream.hpp diff --git a/hotspot/src/share/vm/classfile/classListParser.cpp b/src/hotspot/share/classfile/classListParser.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/classListParser.cpp rename to src/hotspot/share/classfile/classListParser.cpp diff --git a/hotspot/src/share/vm/classfile/classListParser.hpp b/src/hotspot/share/classfile/classListParser.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/classListParser.hpp rename to src/hotspot/share/classfile/classListParser.hpp diff --git a/hotspot/src/share/vm/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/classLoader.cpp rename to src/hotspot/share/classfile/classLoader.cpp diff --git a/hotspot/src/share/vm/classfile/classLoader.hpp b/src/hotspot/share/classfile/classLoader.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/classLoader.hpp rename to src/hotspot/share/classfile/classLoader.hpp diff --git a/hotspot/src/share/vm/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/classLoaderData.cpp rename to src/hotspot/share/classfile/classLoaderData.cpp diff --git a/hotspot/src/share/vm/classfile/classLoaderData.hpp b/src/hotspot/share/classfile/classLoaderData.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/classLoaderData.hpp rename to src/hotspot/share/classfile/classLoaderData.hpp diff --git a/hotspot/src/share/vm/classfile/classLoaderData.inline.hpp b/src/hotspot/share/classfile/classLoaderData.inline.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/classLoaderData.inline.hpp rename to src/hotspot/share/classfile/classLoaderData.inline.hpp diff --git a/hotspot/src/share/vm/classfile/classLoaderExt.cpp b/src/hotspot/share/classfile/classLoaderExt.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/classLoaderExt.cpp rename to src/hotspot/share/classfile/classLoaderExt.cpp diff --git a/hotspot/src/share/vm/classfile/classLoaderExt.hpp b/src/hotspot/share/classfile/classLoaderExt.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/classLoaderExt.hpp rename to src/hotspot/share/classfile/classLoaderExt.hpp diff --git a/hotspot/src/share/vm/classfile/classLoaderStats.cpp b/src/hotspot/share/classfile/classLoaderStats.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/classLoaderStats.cpp rename to src/hotspot/share/classfile/classLoaderStats.cpp diff --git a/hotspot/src/share/vm/classfile/classLoaderStats.hpp b/src/hotspot/share/classfile/classLoaderStats.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/classLoaderStats.hpp rename to src/hotspot/share/classfile/classLoaderStats.hpp diff --git a/hotspot/src/share/vm/classfile/compactHashtable.cpp b/src/hotspot/share/classfile/compactHashtable.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/compactHashtable.cpp rename to src/hotspot/share/classfile/compactHashtable.cpp diff --git a/hotspot/src/share/vm/classfile/compactHashtable.hpp b/src/hotspot/share/classfile/compactHashtable.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/compactHashtable.hpp rename to src/hotspot/share/classfile/compactHashtable.hpp diff --git a/hotspot/src/share/vm/classfile/compactHashtable.inline.hpp b/src/hotspot/share/classfile/compactHashtable.inline.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/compactHashtable.inline.hpp rename to src/hotspot/share/classfile/compactHashtable.inline.hpp diff --git a/hotspot/src/share/vm/classfile/defaultMethods.cpp b/src/hotspot/share/classfile/defaultMethods.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/defaultMethods.cpp rename to src/hotspot/share/classfile/defaultMethods.cpp diff --git a/hotspot/src/share/vm/classfile/defaultMethods.hpp b/src/hotspot/share/classfile/defaultMethods.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/defaultMethods.hpp rename to src/hotspot/share/classfile/defaultMethods.hpp diff --git a/hotspot/src/share/vm/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/dictionary.cpp rename to src/hotspot/share/classfile/dictionary.cpp diff --git a/hotspot/src/share/vm/classfile/dictionary.hpp b/src/hotspot/share/classfile/dictionary.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/dictionary.hpp rename to src/hotspot/share/classfile/dictionary.hpp diff --git a/hotspot/src/share/vm/classfile/javaAssertions.cpp b/src/hotspot/share/classfile/javaAssertions.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/javaAssertions.cpp rename to src/hotspot/share/classfile/javaAssertions.cpp diff --git a/hotspot/src/share/vm/classfile/javaAssertions.hpp b/src/hotspot/share/classfile/javaAssertions.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/javaAssertions.hpp rename to src/hotspot/share/classfile/javaAssertions.hpp diff --git a/hotspot/src/share/vm/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/javaClasses.cpp rename to src/hotspot/share/classfile/javaClasses.cpp diff --git a/hotspot/src/share/vm/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/javaClasses.hpp rename to src/hotspot/share/classfile/javaClasses.hpp diff --git a/hotspot/src/share/vm/classfile/javaClasses.inline.hpp b/src/hotspot/share/classfile/javaClasses.inline.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/javaClasses.inline.hpp rename to src/hotspot/share/classfile/javaClasses.inline.hpp diff --git a/hotspot/src/share/vm/classfile/jimage.hpp b/src/hotspot/share/classfile/jimage.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/jimage.hpp rename to src/hotspot/share/classfile/jimage.hpp diff --git a/hotspot/src/share/vm/classfile/klassFactory.cpp b/src/hotspot/share/classfile/klassFactory.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/klassFactory.cpp rename to src/hotspot/share/classfile/klassFactory.cpp diff --git a/hotspot/src/share/vm/classfile/klassFactory.hpp b/src/hotspot/share/classfile/klassFactory.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/klassFactory.hpp rename to src/hotspot/share/classfile/klassFactory.hpp diff --git a/hotspot/src/share/vm/classfile/loaderConstraints.cpp b/src/hotspot/share/classfile/loaderConstraints.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/loaderConstraints.cpp rename to src/hotspot/share/classfile/loaderConstraints.cpp diff --git a/hotspot/src/share/vm/classfile/loaderConstraints.hpp b/src/hotspot/share/classfile/loaderConstraints.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/loaderConstraints.hpp rename to src/hotspot/share/classfile/loaderConstraints.hpp diff --git a/hotspot/src/share/vm/classfile/metadataOnStackMark.cpp b/src/hotspot/share/classfile/metadataOnStackMark.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/metadataOnStackMark.cpp rename to src/hotspot/share/classfile/metadataOnStackMark.cpp diff --git a/hotspot/src/share/vm/classfile/metadataOnStackMark.hpp b/src/hotspot/share/classfile/metadataOnStackMark.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/metadataOnStackMark.hpp rename to src/hotspot/share/classfile/metadataOnStackMark.hpp diff --git a/hotspot/src/share/vm/classfile/moduleEntry.cpp b/src/hotspot/share/classfile/moduleEntry.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/moduleEntry.cpp rename to src/hotspot/share/classfile/moduleEntry.cpp diff --git a/hotspot/src/share/vm/classfile/moduleEntry.hpp b/src/hotspot/share/classfile/moduleEntry.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/moduleEntry.hpp rename to src/hotspot/share/classfile/moduleEntry.hpp diff --git a/hotspot/src/share/vm/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/modules.cpp rename to src/hotspot/share/classfile/modules.cpp diff --git a/hotspot/src/share/vm/classfile/modules.hpp b/src/hotspot/share/classfile/modules.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/modules.hpp rename to src/hotspot/share/classfile/modules.hpp diff --git a/hotspot/src/share/vm/classfile/packageEntry.cpp b/src/hotspot/share/classfile/packageEntry.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/packageEntry.cpp rename to src/hotspot/share/classfile/packageEntry.cpp diff --git a/hotspot/src/share/vm/classfile/packageEntry.hpp b/src/hotspot/share/classfile/packageEntry.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/packageEntry.hpp rename to src/hotspot/share/classfile/packageEntry.hpp diff --git a/hotspot/src/share/vm/classfile/placeholders.cpp b/src/hotspot/share/classfile/placeholders.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/placeholders.cpp rename to src/hotspot/share/classfile/placeholders.cpp diff --git a/hotspot/src/share/vm/classfile/placeholders.hpp b/src/hotspot/share/classfile/placeholders.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/placeholders.hpp rename to src/hotspot/share/classfile/placeholders.hpp diff --git a/hotspot/src/share/vm/classfile/protectionDomainCache.cpp b/src/hotspot/share/classfile/protectionDomainCache.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/protectionDomainCache.cpp rename to src/hotspot/share/classfile/protectionDomainCache.cpp diff --git a/hotspot/src/share/vm/classfile/protectionDomainCache.hpp b/src/hotspot/share/classfile/protectionDomainCache.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/protectionDomainCache.hpp rename to src/hotspot/share/classfile/protectionDomainCache.hpp diff --git a/hotspot/src/share/vm/classfile/resolutionErrors.cpp b/src/hotspot/share/classfile/resolutionErrors.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/resolutionErrors.cpp rename to src/hotspot/share/classfile/resolutionErrors.cpp diff --git a/hotspot/src/share/vm/classfile/resolutionErrors.hpp b/src/hotspot/share/classfile/resolutionErrors.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/resolutionErrors.hpp rename to src/hotspot/share/classfile/resolutionErrors.hpp diff --git a/hotspot/src/share/vm/classfile/sharedClassUtil.hpp b/src/hotspot/share/classfile/sharedClassUtil.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/sharedClassUtil.hpp rename to src/hotspot/share/classfile/sharedClassUtil.hpp diff --git a/hotspot/src/share/vm/classfile/sharedPathsMiscInfo.cpp b/src/hotspot/share/classfile/sharedPathsMiscInfo.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/sharedPathsMiscInfo.cpp rename to src/hotspot/share/classfile/sharedPathsMiscInfo.cpp diff --git a/hotspot/src/share/vm/classfile/sharedPathsMiscInfo.hpp b/src/hotspot/share/classfile/sharedPathsMiscInfo.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/sharedPathsMiscInfo.hpp rename to src/hotspot/share/classfile/sharedPathsMiscInfo.hpp diff --git a/hotspot/src/share/vm/classfile/stackMapFrame.cpp b/src/hotspot/share/classfile/stackMapFrame.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/stackMapFrame.cpp rename to src/hotspot/share/classfile/stackMapFrame.cpp diff --git a/hotspot/src/share/vm/classfile/stackMapFrame.hpp b/src/hotspot/share/classfile/stackMapFrame.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/stackMapFrame.hpp rename to src/hotspot/share/classfile/stackMapFrame.hpp diff --git a/hotspot/src/share/vm/classfile/stackMapTable.cpp b/src/hotspot/share/classfile/stackMapTable.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/stackMapTable.cpp rename to src/hotspot/share/classfile/stackMapTable.cpp diff --git a/hotspot/src/share/vm/classfile/stackMapTable.hpp b/src/hotspot/share/classfile/stackMapTable.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/stackMapTable.hpp rename to src/hotspot/share/classfile/stackMapTable.hpp diff --git a/hotspot/src/share/vm/classfile/stackMapTableFormat.hpp b/src/hotspot/share/classfile/stackMapTableFormat.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/stackMapTableFormat.hpp rename to src/hotspot/share/classfile/stackMapTableFormat.hpp diff --git a/hotspot/src/share/vm/classfile/stringTable.cpp b/src/hotspot/share/classfile/stringTable.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/stringTable.cpp rename to src/hotspot/share/classfile/stringTable.cpp diff --git a/hotspot/src/share/vm/classfile/stringTable.hpp b/src/hotspot/share/classfile/stringTable.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/stringTable.hpp rename to src/hotspot/share/classfile/stringTable.hpp diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/src/hotspot/share/classfile/symbolTable.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/symbolTable.cpp rename to src/hotspot/share/classfile/symbolTable.cpp diff --git a/hotspot/src/share/vm/classfile/symbolTable.hpp b/src/hotspot/share/classfile/symbolTable.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/symbolTable.hpp rename to src/hotspot/share/classfile/symbolTable.hpp diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/systemDictionary.cpp rename to src/hotspot/share/classfile/systemDictionary.cpp diff --git a/hotspot/src/share/vm/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/systemDictionary.hpp rename to src/hotspot/share/classfile/systemDictionary.hpp diff --git a/hotspot/src/share/vm/classfile/systemDictionaryShared.hpp b/src/hotspot/share/classfile/systemDictionaryShared.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/systemDictionaryShared.hpp rename to src/hotspot/share/classfile/systemDictionaryShared.hpp diff --git a/hotspot/src/share/vm/classfile/systemDictionary_ext.hpp b/src/hotspot/share/classfile/systemDictionary_ext.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/systemDictionary_ext.hpp rename to src/hotspot/share/classfile/systemDictionary_ext.hpp diff --git a/hotspot/src/share/vm/classfile/verificationType.cpp b/src/hotspot/share/classfile/verificationType.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/verificationType.cpp rename to src/hotspot/share/classfile/verificationType.cpp diff --git a/hotspot/src/share/vm/classfile/verificationType.hpp b/src/hotspot/share/classfile/verificationType.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/verificationType.hpp rename to src/hotspot/share/classfile/verificationType.hpp diff --git a/hotspot/src/share/vm/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/verifier.cpp rename to src/hotspot/share/classfile/verifier.cpp diff --git a/hotspot/src/share/vm/classfile/verifier.hpp b/src/hotspot/share/classfile/verifier.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/verifier.hpp rename to src/hotspot/share/classfile/verifier.hpp diff --git a/hotspot/src/share/vm/classfile/vmSymbols.cpp b/src/hotspot/share/classfile/vmSymbols.cpp similarity index 100% rename from hotspot/src/share/vm/classfile/vmSymbols.cpp rename to src/hotspot/share/classfile/vmSymbols.cpp diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/vmSymbols.hpp rename to src/hotspot/share/classfile/vmSymbols.hpp diff --git a/hotspot/src/share/vm/classfile/vmSymbols_ext.hpp b/src/hotspot/share/classfile/vmSymbols_ext.hpp similarity index 100% rename from hotspot/src/share/vm/classfile/vmSymbols_ext.hpp rename to src/hotspot/share/classfile/vmSymbols_ext.hpp diff --git a/hotspot/src/share/vm/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp similarity index 100% rename from hotspot/src/share/vm/code/codeBlob.cpp rename to src/hotspot/share/code/codeBlob.cpp diff --git a/hotspot/src/share/vm/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp similarity index 100% rename from hotspot/src/share/vm/code/codeBlob.hpp rename to src/hotspot/share/code/codeBlob.hpp diff --git a/hotspot/src/share/vm/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp similarity index 100% rename from hotspot/src/share/vm/code/codeCache.cpp rename to src/hotspot/share/code/codeCache.cpp diff --git a/hotspot/src/share/vm/code/codeCache.hpp b/src/hotspot/share/code/codeCache.hpp similarity index 100% rename from hotspot/src/share/vm/code/codeCache.hpp rename to src/hotspot/share/code/codeCache.hpp diff --git a/hotspot/src/share/vm/code/compiledIC.cpp b/src/hotspot/share/code/compiledIC.cpp similarity index 100% rename from hotspot/src/share/vm/code/compiledIC.cpp rename to src/hotspot/share/code/compiledIC.cpp diff --git a/hotspot/src/share/vm/code/compiledIC.hpp b/src/hotspot/share/code/compiledIC.hpp similarity index 100% rename from hotspot/src/share/vm/code/compiledIC.hpp rename to src/hotspot/share/code/compiledIC.hpp diff --git a/hotspot/src/share/vm/code/compiledMethod.cpp b/src/hotspot/share/code/compiledMethod.cpp similarity index 100% rename from hotspot/src/share/vm/code/compiledMethod.cpp rename to src/hotspot/share/code/compiledMethod.cpp diff --git a/hotspot/src/share/vm/code/compiledMethod.hpp b/src/hotspot/share/code/compiledMethod.hpp similarity index 100% rename from hotspot/src/share/vm/code/compiledMethod.hpp rename to src/hotspot/share/code/compiledMethod.hpp diff --git a/hotspot/src/share/vm/code/compiledMethod.inline.hpp b/src/hotspot/share/code/compiledMethod.inline.hpp similarity index 100% rename from hotspot/src/share/vm/code/compiledMethod.inline.hpp rename to src/hotspot/share/code/compiledMethod.inline.hpp diff --git a/hotspot/src/share/vm/code/compressedStream.cpp b/src/hotspot/share/code/compressedStream.cpp similarity index 100% rename from hotspot/src/share/vm/code/compressedStream.cpp rename to src/hotspot/share/code/compressedStream.cpp diff --git a/hotspot/src/share/vm/code/compressedStream.hpp b/src/hotspot/share/code/compressedStream.hpp similarity index 100% rename from hotspot/src/share/vm/code/compressedStream.hpp rename to src/hotspot/share/code/compressedStream.hpp diff --git a/hotspot/src/share/vm/code/debugInfo.cpp b/src/hotspot/share/code/debugInfo.cpp similarity index 100% rename from hotspot/src/share/vm/code/debugInfo.cpp rename to src/hotspot/share/code/debugInfo.cpp diff --git a/hotspot/src/share/vm/code/debugInfo.hpp b/src/hotspot/share/code/debugInfo.hpp similarity index 100% rename from hotspot/src/share/vm/code/debugInfo.hpp rename to src/hotspot/share/code/debugInfo.hpp diff --git a/hotspot/src/share/vm/code/debugInfoRec.cpp b/src/hotspot/share/code/debugInfoRec.cpp similarity index 100% rename from hotspot/src/share/vm/code/debugInfoRec.cpp rename to src/hotspot/share/code/debugInfoRec.cpp diff --git a/hotspot/src/share/vm/code/debugInfoRec.hpp b/src/hotspot/share/code/debugInfoRec.hpp similarity index 100% rename from hotspot/src/share/vm/code/debugInfoRec.hpp rename to src/hotspot/share/code/debugInfoRec.hpp diff --git a/hotspot/src/share/vm/code/dependencies.cpp b/src/hotspot/share/code/dependencies.cpp similarity index 100% rename from hotspot/src/share/vm/code/dependencies.cpp rename to src/hotspot/share/code/dependencies.cpp diff --git a/hotspot/src/share/vm/code/dependencies.hpp b/src/hotspot/share/code/dependencies.hpp similarity index 100% rename from hotspot/src/share/vm/code/dependencies.hpp rename to src/hotspot/share/code/dependencies.hpp diff --git a/hotspot/src/share/vm/code/dependencyContext.cpp b/src/hotspot/share/code/dependencyContext.cpp similarity index 100% rename from hotspot/src/share/vm/code/dependencyContext.cpp rename to src/hotspot/share/code/dependencyContext.cpp diff --git a/hotspot/src/share/vm/code/dependencyContext.hpp b/src/hotspot/share/code/dependencyContext.hpp similarity index 100% rename from hotspot/src/share/vm/code/dependencyContext.hpp rename to src/hotspot/share/code/dependencyContext.hpp diff --git a/hotspot/src/share/vm/code/exceptionHandlerTable.cpp b/src/hotspot/share/code/exceptionHandlerTable.cpp similarity index 100% rename from hotspot/src/share/vm/code/exceptionHandlerTable.cpp rename to src/hotspot/share/code/exceptionHandlerTable.cpp diff --git a/hotspot/src/share/vm/code/exceptionHandlerTable.hpp b/src/hotspot/share/code/exceptionHandlerTable.hpp similarity index 100% rename from hotspot/src/share/vm/code/exceptionHandlerTable.hpp rename to src/hotspot/share/code/exceptionHandlerTable.hpp diff --git a/hotspot/src/share/vm/code/icBuffer.cpp b/src/hotspot/share/code/icBuffer.cpp similarity index 100% rename from hotspot/src/share/vm/code/icBuffer.cpp rename to src/hotspot/share/code/icBuffer.cpp diff --git a/hotspot/src/share/vm/code/icBuffer.hpp b/src/hotspot/share/code/icBuffer.hpp similarity index 100% rename from hotspot/src/share/vm/code/icBuffer.hpp rename to src/hotspot/share/code/icBuffer.hpp diff --git a/hotspot/src/share/vm/code/jvmticmlr.h b/src/hotspot/share/code/jvmticmlr.h similarity index 100% rename from hotspot/src/share/vm/code/jvmticmlr.h rename to src/hotspot/share/code/jvmticmlr.h diff --git a/hotspot/src/share/vm/code/location.cpp b/src/hotspot/share/code/location.cpp similarity index 100% rename from hotspot/src/share/vm/code/location.cpp rename to src/hotspot/share/code/location.cpp diff --git a/hotspot/src/share/vm/code/location.hpp b/src/hotspot/share/code/location.hpp similarity index 100% rename from hotspot/src/share/vm/code/location.hpp rename to src/hotspot/share/code/location.hpp diff --git a/hotspot/src/share/vm/code/nativeInst.hpp b/src/hotspot/share/code/nativeInst.hpp similarity index 100% rename from hotspot/src/share/vm/code/nativeInst.hpp rename to src/hotspot/share/code/nativeInst.hpp diff --git a/hotspot/src/share/vm/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp similarity index 100% rename from hotspot/src/share/vm/code/nmethod.cpp rename to src/hotspot/share/code/nmethod.cpp diff --git a/hotspot/src/share/vm/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp similarity index 100% rename from hotspot/src/share/vm/code/nmethod.hpp rename to src/hotspot/share/code/nmethod.hpp diff --git a/hotspot/src/share/vm/code/oopRecorder.cpp b/src/hotspot/share/code/oopRecorder.cpp similarity index 100% rename from hotspot/src/share/vm/code/oopRecorder.cpp rename to src/hotspot/share/code/oopRecorder.cpp diff --git a/hotspot/src/share/vm/code/oopRecorder.hpp b/src/hotspot/share/code/oopRecorder.hpp similarity index 100% rename from hotspot/src/share/vm/code/oopRecorder.hpp rename to src/hotspot/share/code/oopRecorder.hpp diff --git a/hotspot/src/share/vm/code/pcDesc.cpp b/src/hotspot/share/code/pcDesc.cpp similarity index 100% rename from hotspot/src/share/vm/code/pcDesc.cpp rename to src/hotspot/share/code/pcDesc.cpp diff --git a/hotspot/src/share/vm/code/pcDesc.hpp b/src/hotspot/share/code/pcDesc.hpp similarity index 100% rename from hotspot/src/share/vm/code/pcDesc.hpp rename to src/hotspot/share/code/pcDesc.hpp diff --git a/hotspot/src/share/vm/code/relocInfo.cpp b/src/hotspot/share/code/relocInfo.cpp similarity index 100% rename from hotspot/src/share/vm/code/relocInfo.cpp rename to src/hotspot/share/code/relocInfo.cpp diff --git a/hotspot/src/share/vm/code/relocInfo.hpp b/src/hotspot/share/code/relocInfo.hpp similarity index 100% rename from hotspot/src/share/vm/code/relocInfo.hpp rename to src/hotspot/share/code/relocInfo.hpp diff --git a/hotspot/src/share/vm/code/relocInfo_ext.cpp b/src/hotspot/share/code/relocInfo_ext.cpp similarity index 100% rename from hotspot/src/share/vm/code/relocInfo_ext.cpp rename to src/hotspot/share/code/relocInfo_ext.cpp diff --git a/hotspot/src/share/vm/code/relocInfo_ext.hpp b/src/hotspot/share/code/relocInfo_ext.hpp similarity index 100% rename from hotspot/src/share/vm/code/relocInfo_ext.hpp rename to src/hotspot/share/code/relocInfo_ext.hpp diff --git a/hotspot/src/share/vm/code/scopeDesc.cpp b/src/hotspot/share/code/scopeDesc.cpp similarity index 100% rename from hotspot/src/share/vm/code/scopeDesc.cpp rename to src/hotspot/share/code/scopeDesc.cpp diff --git a/hotspot/src/share/vm/code/scopeDesc.hpp b/src/hotspot/share/code/scopeDesc.hpp similarity index 100% rename from hotspot/src/share/vm/code/scopeDesc.hpp rename to src/hotspot/share/code/scopeDesc.hpp diff --git a/hotspot/src/share/vm/code/stubs.cpp b/src/hotspot/share/code/stubs.cpp similarity index 100% rename from hotspot/src/share/vm/code/stubs.cpp rename to src/hotspot/share/code/stubs.cpp diff --git a/hotspot/src/share/vm/code/stubs.hpp b/src/hotspot/share/code/stubs.hpp similarity index 100% rename from hotspot/src/share/vm/code/stubs.hpp rename to src/hotspot/share/code/stubs.hpp diff --git a/hotspot/src/share/vm/code/vmreg.cpp b/src/hotspot/share/code/vmreg.cpp similarity index 100% rename from hotspot/src/share/vm/code/vmreg.cpp rename to src/hotspot/share/code/vmreg.cpp diff --git a/hotspot/src/share/vm/code/vmreg.hpp b/src/hotspot/share/code/vmreg.hpp similarity index 100% rename from hotspot/src/share/vm/code/vmreg.hpp rename to src/hotspot/share/code/vmreg.hpp diff --git a/hotspot/src/share/vm/code/vmreg.inline.hpp b/src/hotspot/share/code/vmreg.inline.hpp similarity index 100% rename from hotspot/src/share/vm/code/vmreg.inline.hpp rename to src/hotspot/share/code/vmreg.inline.hpp diff --git a/hotspot/src/share/vm/code/vtableStubs.cpp b/src/hotspot/share/code/vtableStubs.cpp similarity index 100% rename from hotspot/src/share/vm/code/vtableStubs.cpp rename to src/hotspot/share/code/vtableStubs.cpp diff --git a/hotspot/src/share/vm/code/vtableStubs.hpp b/src/hotspot/share/code/vtableStubs.hpp similarity index 100% rename from hotspot/src/share/vm/code/vtableStubs.hpp rename to src/hotspot/share/code/vtableStubs.hpp diff --git a/hotspot/src/share/vm/compiler/abstractCompiler.cpp b/src/hotspot/share/compiler/abstractCompiler.cpp similarity index 100% rename from hotspot/src/share/vm/compiler/abstractCompiler.cpp rename to src/hotspot/share/compiler/abstractCompiler.cpp diff --git a/hotspot/src/share/vm/compiler/abstractCompiler.hpp b/src/hotspot/share/compiler/abstractCompiler.hpp similarity index 100% rename from hotspot/src/share/vm/compiler/abstractCompiler.hpp rename to src/hotspot/share/compiler/abstractCompiler.hpp diff --git a/hotspot/src/share/vm/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp similarity index 100% rename from hotspot/src/share/vm/compiler/compileBroker.cpp rename to src/hotspot/share/compiler/compileBroker.cpp diff --git a/hotspot/src/share/vm/compiler/compileBroker.hpp b/src/hotspot/share/compiler/compileBroker.hpp similarity index 100% rename from hotspot/src/share/vm/compiler/compileBroker.hpp rename to src/hotspot/share/compiler/compileBroker.hpp diff --git a/hotspot/src/share/vm/compiler/compileLog.cpp b/src/hotspot/share/compiler/compileLog.cpp similarity index 100% rename from hotspot/src/share/vm/compiler/compileLog.cpp rename to src/hotspot/share/compiler/compileLog.cpp diff --git a/hotspot/src/share/vm/compiler/compileLog.hpp b/src/hotspot/share/compiler/compileLog.hpp similarity index 100% rename from hotspot/src/share/vm/compiler/compileLog.hpp rename to src/hotspot/share/compiler/compileLog.hpp diff --git a/hotspot/src/share/vm/compiler/compileTask.cpp b/src/hotspot/share/compiler/compileTask.cpp similarity index 100% rename from hotspot/src/share/vm/compiler/compileTask.cpp rename to src/hotspot/share/compiler/compileTask.cpp diff --git a/hotspot/src/share/vm/compiler/compileTask.hpp b/src/hotspot/share/compiler/compileTask.hpp similarity index 100% rename from hotspot/src/share/vm/compiler/compileTask.hpp rename to src/hotspot/share/compiler/compileTask.hpp diff --git a/hotspot/src/share/vm/compiler/compilerDefinitions.cpp b/src/hotspot/share/compiler/compilerDefinitions.cpp similarity index 100% rename from hotspot/src/share/vm/compiler/compilerDefinitions.cpp rename to src/hotspot/share/compiler/compilerDefinitions.cpp diff --git a/hotspot/src/share/vm/compiler/compilerDefinitions.hpp b/src/hotspot/share/compiler/compilerDefinitions.hpp similarity index 100% rename from hotspot/src/share/vm/compiler/compilerDefinitions.hpp rename to src/hotspot/share/compiler/compilerDefinitions.hpp diff --git a/hotspot/src/share/vm/compiler/compilerDirectives.cpp b/src/hotspot/share/compiler/compilerDirectives.cpp similarity index 100% rename from hotspot/src/share/vm/compiler/compilerDirectives.cpp rename to src/hotspot/share/compiler/compilerDirectives.cpp diff --git a/hotspot/src/share/vm/compiler/compilerDirectives.hpp b/src/hotspot/share/compiler/compilerDirectives.hpp similarity index 100% rename from hotspot/src/share/vm/compiler/compilerDirectives.hpp rename to src/hotspot/share/compiler/compilerDirectives.hpp diff --git a/hotspot/src/share/vm/compiler/compilerOracle.cpp b/src/hotspot/share/compiler/compilerOracle.cpp similarity index 100% rename from hotspot/src/share/vm/compiler/compilerOracle.cpp rename to src/hotspot/share/compiler/compilerOracle.cpp diff --git a/hotspot/src/share/vm/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp similarity index 100% rename from hotspot/src/share/vm/compiler/compilerOracle.hpp rename to src/hotspot/share/compiler/compilerOracle.hpp diff --git a/hotspot/src/share/vm/compiler/directivesParser.cpp b/src/hotspot/share/compiler/directivesParser.cpp similarity index 100% rename from hotspot/src/share/vm/compiler/directivesParser.cpp rename to src/hotspot/share/compiler/directivesParser.cpp diff --git a/hotspot/src/share/vm/compiler/directivesParser.hpp b/src/hotspot/share/compiler/directivesParser.hpp similarity index 100% rename from hotspot/src/share/vm/compiler/directivesParser.hpp rename to src/hotspot/share/compiler/directivesParser.hpp diff --git a/hotspot/src/share/vm/compiler/disassembler.cpp b/src/hotspot/share/compiler/disassembler.cpp similarity index 100% rename from hotspot/src/share/vm/compiler/disassembler.cpp rename to src/hotspot/share/compiler/disassembler.cpp diff --git a/hotspot/src/share/vm/compiler/disassembler.hpp b/src/hotspot/share/compiler/disassembler.hpp similarity index 100% rename from hotspot/src/share/vm/compiler/disassembler.hpp rename to src/hotspot/share/compiler/disassembler.hpp diff --git a/hotspot/src/share/vm/compiler/methodLiveness.cpp b/src/hotspot/share/compiler/methodLiveness.cpp similarity index 100% rename from hotspot/src/share/vm/compiler/methodLiveness.cpp rename to src/hotspot/share/compiler/methodLiveness.cpp diff --git a/hotspot/src/share/vm/compiler/methodLiveness.hpp b/src/hotspot/share/compiler/methodLiveness.hpp similarity index 100% rename from hotspot/src/share/vm/compiler/methodLiveness.hpp rename to src/hotspot/share/compiler/methodLiveness.hpp diff --git a/hotspot/src/share/vm/compiler/methodMatcher.cpp b/src/hotspot/share/compiler/methodMatcher.cpp similarity index 100% rename from hotspot/src/share/vm/compiler/methodMatcher.cpp rename to src/hotspot/share/compiler/methodMatcher.cpp diff --git a/hotspot/src/share/vm/compiler/methodMatcher.hpp b/src/hotspot/share/compiler/methodMatcher.hpp similarity index 100% rename from hotspot/src/share/vm/compiler/methodMatcher.hpp rename to src/hotspot/share/compiler/methodMatcher.hpp diff --git a/hotspot/src/share/vm/compiler/oopMap.cpp b/src/hotspot/share/compiler/oopMap.cpp similarity index 100% rename from hotspot/src/share/vm/compiler/oopMap.cpp rename to src/hotspot/share/compiler/oopMap.cpp diff --git a/hotspot/src/share/vm/compiler/oopMap.hpp b/src/hotspot/share/compiler/oopMap.hpp similarity index 100% rename from hotspot/src/share/vm/compiler/oopMap.hpp rename to src/hotspot/share/compiler/oopMap.hpp diff --git a/hotspot/src/share/vm/gc/cms/adaptiveFreeList.cpp b/src/hotspot/share/gc/cms/adaptiveFreeList.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/adaptiveFreeList.cpp rename to src/hotspot/share/gc/cms/adaptiveFreeList.cpp diff --git a/hotspot/src/share/vm/gc/cms/adaptiveFreeList.hpp b/src/hotspot/share/gc/cms/adaptiveFreeList.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/adaptiveFreeList.hpp rename to src/hotspot/share/gc/cms/adaptiveFreeList.hpp diff --git a/hotspot/src/share/vm/gc/cms/allocationStats.cpp b/src/hotspot/share/gc/cms/allocationStats.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/allocationStats.cpp rename to src/hotspot/share/gc/cms/allocationStats.cpp diff --git a/hotspot/src/share/vm/gc/cms/allocationStats.hpp b/src/hotspot/share/gc/cms/allocationStats.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/allocationStats.hpp rename to src/hotspot/share/gc/cms/allocationStats.hpp diff --git a/hotspot/src/share/vm/gc/cms/cmsCollectorPolicy.cpp b/src/hotspot/share/gc/cms/cmsCollectorPolicy.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/cmsCollectorPolicy.cpp rename to src/hotspot/share/gc/cms/cmsCollectorPolicy.cpp diff --git a/hotspot/src/share/vm/gc/cms/cmsCollectorPolicy.hpp b/src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/cmsCollectorPolicy.hpp rename to src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp diff --git a/hotspot/src/share/vm/gc/cms/cmsLockVerifier.cpp b/src/hotspot/share/gc/cms/cmsLockVerifier.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/cmsLockVerifier.cpp rename to src/hotspot/share/gc/cms/cmsLockVerifier.cpp diff --git a/hotspot/src/share/vm/gc/cms/cmsLockVerifier.hpp b/src/hotspot/share/gc/cms/cmsLockVerifier.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/cmsLockVerifier.hpp rename to src/hotspot/share/gc/cms/cmsLockVerifier.hpp diff --git a/hotspot/src/share/vm/gc/cms/cmsOopClosures.cpp b/src/hotspot/share/gc/cms/cmsOopClosures.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/cmsOopClosures.cpp rename to src/hotspot/share/gc/cms/cmsOopClosures.cpp diff --git a/hotspot/src/share/vm/gc/cms/cmsOopClosures.hpp b/src/hotspot/share/gc/cms/cmsOopClosures.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/cmsOopClosures.hpp rename to src/hotspot/share/gc/cms/cmsOopClosures.hpp diff --git a/hotspot/src/share/vm/gc/cms/cmsOopClosures.inline.hpp b/src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/cmsOopClosures.inline.hpp rename to src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp diff --git a/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp rename to src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp diff --git a/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.hpp b/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.hpp rename to src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp diff --git a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp rename to src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp diff --git a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.hpp b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.hpp rename to src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp diff --git a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.inline.hpp b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.inline.hpp rename to src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp diff --git a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp b/src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp rename to src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp diff --git a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.hpp b/src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.hpp rename to src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp diff --git a/hotspot/src/share/vm/gc/cms/freeChunk.cpp b/src/hotspot/share/gc/cms/freeChunk.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/freeChunk.cpp rename to src/hotspot/share/gc/cms/freeChunk.cpp diff --git a/hotspot/src/share/vm/gc/cms/freeChunk.hpp b/src/hotspot/share/gc/cms/freeChunk.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/freeChunk.hpp rename to src/hotspot/share/gc/cms/freeChunk.hpp diff --git a/hotspot/src/share/vm/gc/cms/gSpaceCounters.cpp b/src/hotspot/share/gc/cms/gSpaceCounters.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/gSpaceCounters.cpp rename to src/hotspot/share/gc/cms/gSpaceCounters.cpp diff --git a/hotspot/src/share/vm/gc/cms/gSpaceCounters.hpp b/src/hotspot/share/gc/cms/gSpaceCounters.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/gSpaceCounters.hpp rename to src/hotspot/share/gc/cms/gSpaceCounters.hpp diff --git a/hotspot/src/share/vm/gc/cms/parCardTableModRefBS.cpp b/src/hotspot/share/gc/cms/parCardTableModRefBS.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/parCardTableModRefBS.cpp rename to src/hotspot/share/gc/cms/parCardTableModRefBS.cpp diff --git a/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp b/src/hotspot/share/gc/cms/parNewGeneration.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/parNewGeneration.cpp rename to src/hotspot/share/gc/cms/parNewGeneration.cpp diff --git a/hotspot/src/share/vm/gc/cms/parNewGeneration.hpp b/src/hotspot/share/gc/cms/parNewGeneration.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/parNewGeneration.hpp rename to src/hotspot/share/gc/cms/parNewGeneration.hpp diff --git a/hotspot/src/share/vm/gc/cms/parNewGeneration.inline.hpp b/src/hotspot/share/gc/cms/parNewGeneration.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/parNewGeneration.inline.hpp rename to src/hotspot/share/gc/cms/parNewGeneration.inline.hpp diff --git a/hotspot/src/share/vm/gc/cms/parOopClosures.cpp b/src/hotspot/share/gc/cms/parOopClosures.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/parOopClosures.cpp rename to src/hotspot/share/gc/cms/parOopClosures.cpp diff --git a/hotspot/src/share/vm/gc/cms/parOopClosures.hpp b/src/hotspot/share/gc/cms/parOopClosures.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/parOopClosures.hpp rename to src/hotspot/share/gc/cms/parOopClosures.hpp diff --git a/hotspot/src/share/vm/gc/cms/parOopClosures.inline.hpp b/src/hotspot/share/gc/cms/parOopClosures.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/parOopClosures.inline.hpp rename to src/hotspot/share/gc/cms/parOopClosures.inline.hpp diff --git a/hotspot/src/share/vm/gc/cms/promotionInfo.cpp b/src/hotspot/share/gc/cms/promotionInfo.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/promotionInfo.cpp rename to src/hotspot/share/gc/cms/promotionInfo.cpp diff --git a/hotspot/src/share/vm/gc/cms/promotionInfo.hpp b/src/hotspot/share/gc/cms/promotionInfo.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/promotionInfo.hpp rename to src/hotspot/share/gc/cms/promotionInfo.hpp diff --git a/hotspot/src/share/vm/gc/cms/vmCMSOperations.cpp b/src/hotspot/share/gc/cms/vmCMSOperations.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/vmCMSOperations.cpp rename to src/hotspot/share/gc/cms/vmCMSOperations.cpp diff --git a/hotspot/src/share/vm/gc/cms/vmCMSOperations.hpp b/src/hotspot/share/gc/cms/vmCMSOperations.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/vmCMSOperations.hpp rename to src/hotspot/share/gc/cms/vmCMSOperations.hpp diff --git a/hotspot/src/share/vm/gc/cms/vmStructs_cms.hpp b/src/hotspot/share/gc/cms/vmStructs_cms.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/vmStructs_cms.hpp rename to src/hotspot/share/gc/cms/vmStructs_cms.hpp diff --git a/hotspot/src/share/vm/gc/cms/vmStructs_parNew.hpp b/src/hotspot/share/gc/cms/vmStructs_parNew.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/vmStructs_parNew.hpp rename to src/hotspot/share/gc/cms/vmStructs_parNew.hpp diff --git a/hotspot/src/share/vm/gc/cms/yieldingWorkgroup.cpp b/src/hotspot/share/gc/cms/yieldingWorkgroup.cpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/yieldingWorkgroup.cpp rename to src/hotspot/share/gc/cms/yieldingWorkgroup.cpp diff --git a/hotspot/src/share/vm/gc/cms/yieldingWorkgroup.hpp b/src/hotspot/share/gc/cms/yieldingWorkgroup.hpp similarity index 100% rename from hotspot/src/share/vm/gc/cms/yieldingWorkgroup.hpp rename to src/hotspot/share/gc/cms/yieldingWorkgroup.hpp diff --git a/hotspot/src/share/vm/gc/g1/bufferingOopClosure.hpp b/src/hotspot/share/gc/g1/bufferingOopClosure.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/bufferingOopClosure.hpp rename to src/hotspot/share/gc/g1/bufferingOopClosure.hpp diff --git a/hotspot/src/share/vm/gc/g1/collectionSetChooser.cpp b/src/hotspot/share/gc/g1/collectionSetChooser.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/collectionSetChooser.cpp rename to src/hotspot/share/gc/g1/collectionSetChooser.cpp diff --git a/hotspot/src/share/vm/gc/g1/collectionSetChooser.hpp b/src/hotspot/share/gc/g1/collectionSetChooser.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/collectionSetChooser.hpp rename to src/hotspot/share/gc/g1/collectionSetChooser.hpp diff --git a/hotspot/src/share/vm/gc/g1/concurrentG1Refine.cpp b/src/hotspot/share/gc/g1/concurrentG1Refine.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/concurrentG1Refine.cpp rename to src/hotspot/share/gc/g1/concurrentG1Refine.cpp diff --git a/hotspot/src/share/vm/gc/g1/concurrentG1Refine.hpp b/src/hotspot/share/gc/g1/concurrentG1Refine.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/concurrentG1Refine.hpp rename to src/hotspot/share/gc/g1/concurrentG1Refine.hpp diff --git a/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.cpp b/src/hotspot/share/gc/g1/concurrentG1RefineThread.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.cpp rename to src/hotspot/share/gc/g1/concurrentG1RefineThread.cpp diff --git a/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.hpp b/src/hotspot/share/gc/g1/concurrentG1RefineThread.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.hpp rename to src/hotspot/share/gc/g1/concurrentG1RefineThread.hpp diff --git a/hotspot/src/share/vm/gc/g1/concurrentMarkThread.cpp b/src/hotspot/share/gc/g1/concurrentMarkThread.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/concurrentMarkThread.cpp rename to src/hotspot/share/gc/g1/concurrentMarkThread.cpp diff --git a/hotspot/src/share/vm/gc/g1/concurrentMarkThread.hpp b/src/hotspot/share/gc/g1/concurrentMarkThread.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/concurrentMarkThread.hpp rename to src/hotspot/share/gc/g1/concurrentMarkThread.hpp diff --git a/hotspot/src/share/vm/gc/g1/concurrentMarkThread.inline.hpp b/src/hotspot/share/gc/g1/concurrentMarkThread.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/concurrentMarkThread.inline.hpp rename to src/hotspot/share/gc/g1/concurrentMarkThread.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/dirtyCardQueue.cpp b/src/hotspot/share/gc/g1/dirtyCardQueue.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/dirtyCardQueue.cpp rename to src/hotspot/share/gc/g1/dirtyCardQueue.cpp diff --git a/hotspot/src/share/vm/gc/g1/dirtyCardQueue.hpp b/src/hotspot/share/gc/g1/dirtyCardQueue.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/dirtyCardQueue.hpp rename to src/hotspot/share/gc/g1/dirtyCardQueue.hpp diff --git a/hotspot/src/share/vm/gc/g1/evacuationInfo.hpp b/src/hotspot/share/gc/g1/evacuationInfo.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/evacuationInfo.hpp rename to src/hotspot/share/gc/g1/evacuationInfo.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1AllocRegion.cpp b/src/hotspot/share/gc/g1/g1AllocRegion.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1AllocRegion.cpp rename to src/hotspot/share/gc/g1/g1AllocRegion.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1AllocRegion.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1AllocRegion.hpp rename to src/hotspot/share/gc/g1/g1AllocRegion.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1AllocRegion.inline.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1AllocRegion.inline.hpp rename to src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1AllocationContext.hpp b/src/hotspot/share/gc/g1/g1AllocationContext.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1AllocationContext.hpp rename to src/hotspot/share/gc/g1/g1AllocationContext.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1Allocator.cpp b/src/hotspot/share/gc/g1/g1Allocator.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1Allocator.cpp rename to src/hotspot/share/gc/g1/g1Allocator.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1Allocator.hpp b/src/hotspot/share/gc/g1/g1Allocator.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1Allocator.hpp rename to src/hotspot/share/gc/g1/g1Allocator.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1Allocator.inline.hpp b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1Allocator.inline.hpp rename to src/hotspot/share/gc/g1/g1Allocator.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1Allocator_ext.cpp b/src/hotspot/share/gc/g1/g1Allocator_ext.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1Allocator_ext.cpp rename to src/hotspot/share/gc/g1/g1Allocator_ext.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1Analytics.cpp b/src/hotspot/share/gc/g1/g1Analytics.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1Analytics.cpp rename to src/hotspot/share/gc/g1/g1Analytics.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1Analytics.hpp b/src/hotspot/share/gc/g1/g1Analytics.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1Analytics.hpp rename to src/hotspot/share/gc/g1/g1Analytics.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1BiasedArray.cpp b/src/hotspot/share/gc/g1/g1BiasedArray.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1BiasedArray.cpp rename to src/hotspot/share/gc/g1/g1BiasedArray.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1BiasedArray.hpp b/src/hotspot/share/gc/g1/g1BiasedArray.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1BiasedArray.hpp rename to src/hotspot/share/gc/g1/g1BiasedArray.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.cpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.cpp rename to src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.hpp rename to src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.inline.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.inline.hpp rename to src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1CardCounts.cpp b/src/hotspot/share/gc/g1/g1CardCounts.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CardCounts.cpp rename to src/hotspot/share/gc/g1/g1CardCounts.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1CardCounts.hpp b/src/hotspot/share/gc/g1/g1CardCounts.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CardCounts.hpp rename to src/hotspot/share/gc/g1/g1CardCounts.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1CardLiveData.cpp b/src/hotspot/share/gc/g1/g1CardLiveData.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CardLiveData.cpp rename to src/hotspot/share/gc/g1/g1CardLiveData.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1CardLiveData.hpp b/src/hotspot/share/gc/g1/g1CardLiveData.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CardLiveData.hpp rename to src/hotspot/share/gc/g1/g1CardLiveData.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1CardLiveData.inline.hpp b/src/hotspot/share/gc/g1/g1CardLiveData.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CardLiveData.inline.hpp rename to src/hotspot/share/gc/g1/g1CardLiveData.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1CodeBlobClosure.cpp b/src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CodeBlobClosure.cpp rename to src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1CodeBlobClosure.hpp b/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CodeBlobClosure.hpp rename to src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1CodeCacheRemSet.cpp b/src/hotspot/share/gc/g1/g1CodeCacheRemSet.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CodeCacheRemSet.cpp rename to src/hotspot/share/gc/g1/g1CodeCacheRemSet.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1CodeCacheRemSet.hpp b/src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CodeCacheRemSet.hpp rename to src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1CodeRootSetTable.hpp b/src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CodeRootSetTable.hpp rename to src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp rename to src/hotspot/share/gc/g1/g1CollectedHeap.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp rename to src/hotspot/share/gc/g1/g1CollectedHeap.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CollectedHeap.inline.hpp rename to src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1CollectedHeap_ext.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap_ext.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CollectedHeap_ext.cpp rename to src/hotspot/share/gc/g1/g1CollectedHeap_ext.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1CollectionSet.cpp b/src/hotspot/share/gc/g1/g1CollectionSet.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CollectionSet.cpp rename to src/hotspot/share/gc/g1/g1CollectionSet.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1CollectionSet.hpp b/src/hotspot/share/gc/g1/g1CollectionSet.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CollectionSet.hpp rename to src/hotspot/share/gc/g1/g1CollectionSet.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp b/src/hotspot/share/gc/g1/g1CollectorPolicy.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp rename to src/hotspot/share/gc/g1/g1CollectorPolicy.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.hpp b/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CollectorPolicy.hpp rename to src/hotspot/share/gc/g1/g1CollectorPolicy.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1CollectorState.hpp b/src/hotspot/share/gc/g1/g1CollectorState.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1CollectorState.hpp rename to src/hotspot/share/gc/g1/g1CollectorState.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp rename to src/hotspot/share/gc/g1/g1ConcurrentMark.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ConcurrentMark.hpp rename to src/hotspot/share/gc/g1/g1ConcurrentMark.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ConcurrentMark.inline.hpp rename to src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1ConcurrentMarkBitMap.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ConcurrentMarkBitMap.cpp rename to src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1ConcurrentMarkBitMap.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ConcurrentMarkBitMap.hpp rename to src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1ConcurrentMarkBitMap.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ConcurrentMarkBitMap.inline.hpp rename to src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp rename to src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp rename to src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp rename to src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1DefaultPolicy.cpp b/src/hotspot/share/gc/g1/g1DefaultPolicy.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1DefaultPolicy.cpp rename to src/hotspot/share/gc/g1/g1DefaultPolicy.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1DefaultPolicy.hpp b/src/hotspot/share/gc/g1/g1DefaultPolicy.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1DefaultPolicy.hpp rename to src/hotspot/share/gc/g1/g1DefaultPolicy.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1EdenRegions.hpp b/src/hotspot/share/gc/g1/g1EdenRegions.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1EdenRegions.hpp rename to src/hotspot/share/gc/g1/g1EdenRegions.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1EvacFailure.cpp b/src/hotspot/share/gc/g1/g1EvacFailure.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1EvacFailure.cpp rename to src/hotspot/share/gc/g1/g1EvacFailure.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1EvacFailure.hpp b/src/hotspot/share/gc/g1/g1EvacFailure.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1EvacFailure.hpp rename to src/hotspot/share/gc/g1/g1EvacFailure.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1EvacStats.cpp b/src/hotspot/share/gc/g1/g1EvacStats.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1EvacStats.cpp rename to src/hotspot/share/gc/g1/g1EvacStats.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1EvacStats.hpp b/src/hotspot/share/gc/g1/g1EvacStats.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1EvacStats.hpp rename to src/hotspot/share/gc/g1/g1EvacStats.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1EvacStats.inline.hpp b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1EvacStats.inline.hpp rename to src/hotspot/share/gc/g1/g1EvacStats.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1FromCardCache.cpp b/src/hotspot/share/gc/g1/g1FromCardCache.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1FromCardCache.cpp rename to src/hotspot/share/gc/g1/g1FromCardCache.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1FromCardCache.hpp b/src/hotspot/share/gc/g1/g1FromCardCache.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1FromCardCache.hpp rename to src/hotspot/share/gc/g1/g1FromCardCache.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1FullGCScope.cpp b/src/hotspot/share/gc/g1/g1FullGCScope.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1FullGCScope.cpp rename to src/hotspot/share/gc/g1/g1FullGCScope.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1FullGCScope.hpp b/src/hotspot/share/gc/g1/g1FullGCScope.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1FullGCScope.hpp rename to src/hotspot/share/gc/g1/g1FullGCScope.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.cpp rename to src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.hpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.hpp rename to src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1HRPrinter.hpp b/src/hotspot/share/gc/g1/g1HRPrinter.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1HRPrinter.hpp rename to src/hotspot/share/gc/g1/g1HRPrinter.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1HeapRegionTraceType.hpp b/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1HeapRegionTraceType.hpp rename to src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1HeapSizingPolicy.cpp b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1HeapSizingPolicy.cpp rename to src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1HeapSizingPolicy.hpp b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1HeapSizingPolicy.hpp rename to src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1HeapSizingPolicy_ext.cpp b/src/hotspot/share/gc/g1/g1HeapSizingPolicy_ext.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1HeapSizingPolicy_ext.cpp rename to src/hotspot/share/gc/g1/g1HeapSizingPolicy_ext.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1HeapTransition.cpp b/src/hotspot/share/gc/g1/g1HeapTransition.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1HeapTransition.cpp rename to src/hotspot/share/gc/g1/g1HeapTransition.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1HeapTransition.hpp b/src/hotspot/share/gc/g1/g1HeapTransition.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1HeapTransition.hpp rename to src/hotspot/share/gc/g1/g1HeapTransition.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1HeapVerifier.cpp b/src/hotspot/share/gc/g1/g1HeapVerifier.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1HeapVerifier.cpp rename to src/hotspot/share/gc/g1/g1HeapVerifier.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1HeapVerifier.hpp b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1HeapVerifier.hpp rename to src/hotspot/share/gc/g1/g1HeapVerifier.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1HotCardCache.cpp b/src/hotspot/share/gc/g1/g1HotCardCache.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1HotCardCache.cpp rename to src/hotspot/share/gc/g1/g1HotCardCache.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1HotCardCache.hpp b/src/hotspot/share/gc/g1/g1HotCardCache.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1HotCardCache.hpp rename to src/hotspot/share/gc/g1/g1HotCardCache.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1IHOPControl.cpp b/src/hotspot/share/gc/g1/g1IHOPControl.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1IHOPControl.cpp rename to src/hotspot/share/gc/g1/g1IHOPControl.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1IHOPControl.hpp b/src/hotspot/share/gc/g1/g1IHOPControl.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1IHOPControl.hpp rename to src/hotspot/share/gc/g1/g1IHOPControl.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1InCSetState.hpp b/src/hotspot/share/gc/g1/g1InCSetState.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1InCSetState.hpp rename to src/hotspot/share/gc/g1/g1InCSetState.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1InitialMarkToMixedTimeTracker.hpp b/src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1InitialMarkToMixedTimeTracker.hpp rename to src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1MMUTracker.cpp b/src/hotspot/share/gc/g1/g1MMUTracker.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1MMUTracker.cpp rename to src/hotspot/share/gc/g1/g1MMUTracker.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1MMUTracker.hpp b/src/hotspot/share/gc/g1/g1MMUTracker.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1MMUTracker.hpp rename to src/hotspot/share/gc/g1/g1MMUTracker.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1MarkSweep.cpp b/src/hotspot/share/gc/g1/g1MarkSweep.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1MarkSweep.cpp rename to src/hotspot/share/gc/g1/g1MarkSweep.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1MarkSweep.hpp b/src/hotspot/share/gc/g1/g1MarkSweep.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1MarkSweep.hpp rename to src/hotspot/share/gc/g1/g1MarkSweep.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1MarkSweep_ext.cpp b/src/hotspot/share/gc/g1/g1MarkSweep_ext.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1MarkSweep_ext.cpp rename to src/hotspot/share/gc/g1/g1MarkSweep_ext.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1MonitoringSupport.cpp b/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1MonitoringSupport.cpp rename to src/hotspot/share/gc/g1/g1MonitoringSupport.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1MonitoringSupport.hpp b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1MonitoringSupport.hpp rename to src/hotspot/share/gc/g1/g1MonitoringSupport.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1OopClosures.cpp b/src/hotspot/share/gc/g1/g1OopClosures.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1OopClosures.cpp rename to src/hotspot/share/gc/g1/g1OopClosures.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1OopClosures.hpp b/src/hotspot/share/gc/g1/g1OopClosures.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1OopClosures.hpp rename to src/hotspot/share/gc/g1/g1OopClosures.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1OopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1OopClosures.inline.hpp rename to src/hotspot/share/gc/g1/g1OopClosures.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp rename to src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp rename to src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp rename to src/hotspot/share/gc/g1/g1ParScanThreadState.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ParScanThreadState.hpp rename to src/hotspot/share/gc/g1/g1ParScanThreadState.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.inline.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ParScanThreadState.inline.hpp rename to src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1ParScanThreadState_ext.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState_ext.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1ParScanThreadState_ext.cpp rename to src/hotspot/share/gc/g1/g1ParScanThreadState_ext.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1Policy.hpp rename to src/hotspot/share/gc/g1/g1Policy.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1Predictions.hpp b/src/hotspot/share/gc/g1/g1Predictions.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1Predictions.hpp rename to src/hotspot/share/gc/g1/g1Predictions.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.cpp b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.cpp rename to src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.hpp b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.hpp rename to src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1RemSet.cpp rename to src/hotspot/share/gc/g1/g1RemSet.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1RemSet.hpp b/src/hotspot/share/gc/g1/g1RemSet.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1RemSet.hpp rename to src/hotspot/share/gc/g1/g1RemSet.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1RemSet.inline.hpp b/src/hotspot/share/gc/g1/g1RemSet.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1RemSet.inline.hpp rename to src/hotspot/share/gc/g1/g1RemSet.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1RemSetSummary.cpp b/src/hotspot/share/gc/g1/g1RemSetSummary.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1RemSetSummary.cpp rename to src/hotspot/share/gc/g1/g1RemSetSummary.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1RemSetSummary.hpp b/src/hotspot/share/gc/g1/g1RemSetSummary.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1RemSetSummary.hpp rename to src/hotspot/share/gc/g1/g1RemSetSummary.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1RootClosures.cpp b/src/hotspot/share/gc/g1/g1RootClosures.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1RootClosures.cpp rename to src/hotspot/share/gc/g1/g1RootClosures.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1RootClosures.hpp b/src/hotspot/share/gc/g1/g1RootClosures.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1RootClosures.hpp rename to src/hotspot/share/gc/g1/g1RootClosures.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1RootClosures_ext.cpp b/src/hotspot/share/gc/g1/g1RootClosures_ext.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1RootClosures_ext.cpp rename to src/hotspot/share/gc/g1/g1RootClosures_ext.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1RootProcessor.cpp b/src/hotspot/share/gc/g1/g1RootProcessor.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1RootProcessor.cpp rename to src/hotspot/share/gc/g1/g1RootProcessor.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1RootProcessor.hpp b/src/hotspot/share/gc/g1/g1RootProcessor.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1RootProcessor.hpp rename to src/hotspot/share/gc/g1/g1RootProcessor.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.cpp b/src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.cpp rename to src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.hpp b/src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.hpp rename to src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.inline.hpp b/src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.inline.hpp rename to src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1SerialFullCollector.cpp b/src/hotspot/share/gc/g1/g1SerialFullCollector.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1SerialFullCollector.cpp rename to src/hotspot/share/gc/g1/g1SerialFullCollector.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1SerialFullCollector.hpp b/src/hotspot/share/gc/g1/g1SerialFullCollector.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1SerialFullCollector.hpp rename to src/hotspot/share/gc/g1/g1SerialFullCollector.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1SharedClosures.hpp b/src/hotspot/share/gc/g1/g1SharedClosures.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1SharedClosures.hpp rename to src/hotspot/share/gc/g1/g1SharedClosures.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedup.cpp b/src/hotspot/share/gc/g1/g1StringDedup.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1StringDedup.cpp rename to src/hotspot/share/gc/g1/g1StringDedup.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedup.hpp b/src/hotspot/share/gc/g1/g1StringDedup.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1StringDedup.hpp rename to src/hotspot/share/gc/g1/g1StringDedup.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedupQueue.cpp b/src/hotspot/share/gc/g1/g1StringDedupQueue.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1StringDedupQueue.cpp rename to src/hotspot/share/gc/g1/g1StringDedupQueue.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedupQueue.hpp b/src/hotspot/share/gc/g1/g1StringDedupQueue.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1StringDedupQueue.hpp rename to src/hotspot/share/gc/g1/g1StringDedupQueue.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedupStat.cpp b/src/hotspot/share/gc/g1/g1StringDedupStat.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1StringDedupStat.cpp rename to src/hotspot/share/gc/g1/g1StringDedupStat.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedupStat.hpp b/src/hotspot/share/gc/g1/g1StringDedupStat.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1StringDedupStat.hpp rename to src/hotspot/share/gc/g1/g1StringDedupStat.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedupTable.cpp b/src/hotspot/share/gc/g1/g1StringDedupTable.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1StringDedupTable.cpp rename to src/hotspot/share/gc/g1/g1StringDedupTable.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedupTable.hpp b/src/hotspot/share/gc/g1/g1StringDedupTable.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1StringDedupTable.hpp rename to src/hotspot/share/gc/g1/g1StringDedupTable.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp b/src/hotspot/share/gc/g1/g1StringDedupThread.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp rename to src/hotspot/share/gc/g1/g1StringDedupThread.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedupThread.hpp b/src/hotspot/share/gc/g1/g1StringDedupThread.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1StringDedupThread.hpp rename to src/hotspot/share/gc/g1/g1StringDedupThread.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1SurvivorRegions.cpp b/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1SurvivorRegions.cpp rename to src/hotspot/share/gc/g1/g1SurvivorRegions.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1SurvivorRegions.hpp b/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1SurvivorRegions.hpp rename to src/hotspot/share/gc/g1/g1SurvivorRegions.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1YCTypes.hpp b/src/hotspot/share/gc/g1/g1YCTypes.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1YCTypes.hpp rename to src/hotspot/share/gc/g1/g1YCTypes.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1YoungGenSizer.cpp b/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1YoungGenSizer.cpp rename to src/hotspot/share/gc/g1/g1YoungGenSizer.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1YoungGenSizer.hpp b/src/hotspot/share/gc/g1/g1YoungGenSizer.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1YoungGenSizer.hpp rename to src/hotspot/share/gc/g1/g1YoungGenSizer.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1YoungRemSetSamplingThread.cpp b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1YoungRemSetSamplingThread.cpp rename to src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1YoungRemSetSamplingThread.hpp b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1YoungRemSetSamplingThread.hpp rename to src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1_globals.cpp b/src/hotspot/share/gc/g1/g1_globals.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1_globals.cpp rename to src/hotspot/share/gc/g1/g1_globals.cpp diff --git a/hotspot/src/share/vm/gc/g1/g1_globals.hpp b/src/hotspot/share/gc/g1/g1_globals.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1_globals.hpp rename to src/hotspot/share/gc/g1/g1_globals.hpp diff --git a/hotspot/src/share/vm/gc/g1/g1_specialized_oop_closures.hpp b/src/hotspot/share/gc/g1/g1_specialized_oop_closures.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/g1_specialized_oop_closures.hpp rename to src/hotspot/share/gc/g1/g1_specialized_oop_closures.hpp diff --git a/hotspot/src/share/vm/gc/g1/hSpaceCounters.cpp b/src/hotspot/share/gc/g1/hSpaceCounters.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/hSpaceCounters.cpp rename to src/hotspot/share/gc/g1/hSpaceCounters.cpp diff --git a/hotspot/src/share/vm/gc/g1/hSpaceCounters.hpp b/src/hotspot/share/gc/g1/hSpaceCounters.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/hSpaceCounters.hpp rename to src/hotspot/share/gc/g1/hSpaceCounters.hpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegion.cpp b/src/hotspot/share/gc/g1/heapRegion.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegion.cpp rename to src/hotspot/share/gc/g1/heapRegion.cpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegion.hpp b/src/hotspot/share/gc/g1/heapRegion.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegion.hpp rename to src/hotspot/share/gc/g1/heapRegion.hpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegion.inline.hpp b/src/hotspot/share/gc/g1/heapRegion.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegion.inline.hpp rename to src/hotspot/share/gc/g1/heapRegion.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionBounds.hpp b/src/hotspot/share/gc/g1/heapRegionBounds.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionBounds.hpp rename to src/hotspot/share/gc/g1/heapRegionBounds.hpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionBounds.inline.hpp b/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionBounds.inline.hpp rename to src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionManager.cpp b/src/hotspot/share/gc/g1/heapRegionManager.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionManager.cpp rename to src/hotspot/share/gc/g1/heapRegionManager.cpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionManager.hpp b/src/hotspot/share/gc/g1/heapRegionManager.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionManager.hpp rename to src/hotspot/share/gc/g1/heapRegionManager.hpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionManager.inline.hpp b/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionManager.inline.hpp rename to src/hotspot/share/gc/g1/heapRegionManager.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp b/src/hotspot/share/gc/g1/heapRegionRemSet.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp rename to src/hotspot/share/gc/g1/heapRegionRemSet.cpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionRemSet.hpp b/src/hotspot/share/gc/g1/heapRegionRemSet.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionRemSet.hpp rename to src/hotspot/share/gc/g1/heapRegionRemSet.hpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionSet.cpp b/src/hotspot/share/gc/g1/heapRegionSet.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionSet.cpp rename to src/hotspot/share/gc/g1/heapRegionSet.cpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionSet.hpp b/src/hotspot/share/gc/g1/heapRegionSet.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionSet.hpp rename to src/hotspot/share/gc/g1/heapRegionSet.hpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionSet.inline.hpp b/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionSet.inline.hpp rename to src/hotspot/share/gc/g1/heapRegionSet.inline.hpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionTracer.cpp b/src/hotspot/share/gc/g1/heapRegionTracer.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionTracer.cpp rename to src/hotspot/share/gc/g1/heapRegionTracer.cpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionTracer.hpp b/src/hotspot/share/gc/g1/heapRegionTracer.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionTracer.hpp rename to src/hotspot/share/gc/g1/heapRegionTracer.hpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionType.cpp b/src/hotspot/share/gc/g1/heapRegionType.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionType.cpp rename to src/hotspot/share/gc/g1/heapRegionType.cpp diff --git a/hotspot/src/share/vm/gc/g1/heapRegionType.hpp b/src/hotspot/share/gc/g1/heapRegionType.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/heapRegionType.hpp rename to src/hotspot/share/gc/g1/heapRegionType.hpp diff --git a/hotspot/src/share/vm/gc/g1/ptrQueue.cpp b/src/hotspot/share/gc/g1/ptrQueue.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/ptrQueue.cpp rename to src/hotspot/share/gc/g1/ptrQueue.cpp diff --git a/hotspot/src/share/vm/gc/g1/ptrQueue.hpp b/src/hotspot/share/gc/g1/ptrQueue.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/ptrQueue.hpp rename to src/hotspot/share/gc/g1/ptrQueue.hpp diff --git a/hotspot/src/share/vm/gc/g1/satbMarkQueue.cpp b/src/hotspot/share/gc/g1/satbMarkQueue.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/satbMarkQueue.cpp rename to src/hotspot/share/gc/g1/satbMarkQueue.cpp diff --git a/hotspot/src/share/vm/gc/g1/satbMarkQueue.hpp b/src/hotspot/share/gc/g1/satbMarkQueue.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/satbMarkQueue.hpp rename to src/hotspot/share/gc/g1/satbMarkQueue.hpp diff --git a/hotspot/src/share/vm/gc/g1/sparsePRT.cpp b/src/hotspot/share/gc/g1/sparsePRT.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/sparsePRT.cpp rename to src/hotspot/share/gc/g1/sparsePRT.cpp diff --git a/hotspot/src/share/vm/gc/g1/sparsePRT.hpp b/src/hotspot/share/gc/g1/sparsePRT.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/sparsePRT.hpp rename to src/hotspot/share/gc/g1/sparsePRT.hpp diff --git a/hotspot/src/share/vm/gc/g1/survRateGroup.cpp b/src/hotspot/share/gc/g1/survRateGroup.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/survRateGroup.cpp rename to src/hotspot/share/gc/g1/survRateGroup.cpp diff --git a/hotspot/src/share/vm/gc/g1/survRateGroup.hpp b/src/hotspot/share/gc/g1/survRateGroup.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/survRateGroup.hpp rename to src/hotspot/share/gc/g1/survRateGroup.hpp diff --git a/hotspot/src/share/vm/gc/g1/suspendibleThreadSet.cpp b/src/hotspot/share/gc/g1/suspendibleThreadSet.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/suspendibleThreadSet.cpp rename to src/hotspot/share/gc/g1/suspendibleThreadSet.cpp diff --git a/hotspot/src/share/vm/gc/g1/suspendibleThreadSet.hpp b/src/hotspot/share/gc/g1/suspendibleThreadSet.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/suspendibleThreadSet.hpp rename to src/hotspot/share/gc/g1/suspendibleThreadSet.hpp diff --git a/hotspot/src/share/vm/gc/g1/vmStructs_g1.hpp b/src/hotspot/share/gc/g1/vmStructs_g1.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/vmStructs_g1.hpp rename to src/hotspot/share/gc/g1/vmStructs_g1.hpp diff --git a/hotspot/src/share/vm/gc/g1/vm_operations_g1.cpp b/src/hotspot/share/gc/g1/vm_operations_g1.cpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/vm_operations_g1.cpp rename to src/hotspot/share/gc/g1/vm_operations_g1.cpp diff --git a/hotspot/src/share/vm/gc/g1/vm_operations_g1.hpp b/src/hotspot/share/gc/g1/vm_operations_g1.hpp similarity index 100% rename from hotspot/src/share/vm/gc/g1/vm_operations_g1.hpp rename to src/hotspot/share/gc/g1/vm_operations_g1.hpp diff --git a/hotspot/src/share/vm/gc/parallel/adjoiningGenerations.cpp b/src/hotspot/share/gc/parallel/adjoiningGenerations.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/adjoiningGenerations.cpp rename to src/hotspot/share/gc/parallel/adjoiningGenerations.cpp diff --git a/hotspot/src/share/vm/gc/parallel/adjoiningGenerations.hpp b/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/adjoiningGenerations.hpp rename to src/hotspot/share/gc/parallel/adjoiningGenerations.hpp diff --git a/hotspot/src/share/vm/gc/parallel/adjoiningVirtualSpaces.cpp b/src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/adjoiningVirtualSpaces.cpp rename to src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.cpp diff --git a/hotspot/src/share/vm/gc/parallel/adjoiningVirtualSpaces.hpp b/src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/adjoiningVirtualSpaces.hpp rename to src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp diff --git a/hotspot/src/share/vm/gc/parallel/asPSOldGen.cpp b/src/hotspot/share/gc/parallel/asPSOldGen.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/asPSOldGen.cpp rename to src/hotspot/share/gc/parallel/asPSOldGen.cpp diff --git a/hotspot/src/share/vm/gc/parallel/asPSOldGen.hpp b/src/hotspot/share/gc/parallel/asPSOldGen.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/asPSOldGen.hpp rename to src/hotspot/share/gc/parallel/asPSOldGen.hpp diff --git a/hotspot/src/share/vm/gc/parallel/asPSYoungGen.cpp b/src/hotspot/share/gc/parallel/asPSYoungGen.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/asPSYoungGen.cpp rename to src/hotspot/share/gc/parallel/asPSYoungGen.cpp diff --git a/hotspot/src/share/vm/gc/parallel/asPSYoungGen.hpp b/src/hotspot/share/gc/parallel/asPSYoungGen.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/asPSYoungGen.hpp rename to src/hotspot/share/gc/parallel/asPSYoungGen.hpp diff --git a/hotspot/src/share/vm/gc/parallel/cardTableExtension.cpp b/src/hotspot/share/gc/parallel/cardTableExtension.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/cardTableExtension.cpp rename to src/hotspot/share/gc/parallel/cardTableExtension.cpp diff --git a/hotspot/src/share/vm/gc/parallel/cardTableExtension.hpp b/src/hotspot/share/gc/parallel/cardTableExtension.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/cardTableExtension.hpp rename to src/hotspot/share/gc/parallel/cardTableExtension.hpp diff --git a/hotspot/src/share/vm/gc/parallel/gcAdaptivePolicyCounters.cpp b/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/gcAdaptivePolicyCounters.cpp rename to src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.cpp diff --git a/hotspot/src/share/vm/gc/parallel/gcAdaptivePolicyCounters.hpp b/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/gcAdaptivePolicyCounters.hpp rename to src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp diff --git a/hotspot/src/share/vm/gc/parallel/gcTaskManager.cpp b/src/hotspot/share/gc/parallel/gcTaskManager.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/gcTaskManager.cpp rename to src/hotspot/share/gc/parallel/gcTaskManager.cpp diff --git a/hotspot/src/share/vm/gc/parallel/gcTaskManager.hpp b/src/hotspot/share/gc/parallel/gcTaskManager.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/gcTaskManager.hpp rename to src/hotspot/share/gc/parallel/gcTaskManager.hpp diff --git a/hotspot/src/share/vm/gc/parallel/gcTaskThread.cpp b/src/hotspot/share/gc/parallel/gcTaskThread.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/gcTaskThread.cpp rename to src/hotspot/share/gc/parallel/gcTaskThread.cpp diff --git a/hotspot/src/share/vm/gc/parallel/gcTaskThread.hpp b/src/hotspot/share/gc/parallel/gcTaskThread.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/gcTaskThread.hpp rename to src/hotspot/share/gc/parallel/gcTaskThread.hpp diff --git a/hotspot/src/share/vm/gc/parallel/generationSizer.cpp b/src/hotspot/share/gc/parallel/generationSizer.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/generationSizer.cpp rename to src/hotspot/share/gc/parallel/generationSizer.cpp diff --git a/hotspot/src/share/vm/gc/parallel/generationSizer.hpp b/src/hotspot/share/gc/parallel/generationSizer.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/generationSizer.hpp rename to src/hotspot/share/gc/parallel/generationSizer.hpp diff --git a/hotspot/src/share/vm/gc/parallel/immutableSpace.cpp b/src/hotspot/share/gc/parallel/immutableSpace.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/immutableSpace.cpp rename to src/hotspot/share/gc/parallel/immutableSpace.cpp diff --git a/hotspot/src/share/vm/gc/parallel/immutableSpace.hpp b/src/hotspot/share/gc/parallel/immutableSpace.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/immutableSpace.hpp rename to src/hotspot/share/gc/parallel/immutableSpace.hpp diff --git a/hotspot/src/share/vm/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/mutableNUMASpace.cpp rename to src/hotspot/share/gc/parallel/mutableNUMASpace.cpp diff --git a/hotspot/src/share/vm/gc/parallel/mutableNUMASpace.hpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/mutableNUMASpace.hpp rename to src/hotspot/share/gc/parallel/mutableNUMASpace.hpp diff --git a/hotspot/src/share/vm/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/mutableSpace.cpp rename to src/hotspot/share/gc/parallel/mutableSpace.cpp diff --git a/hotspot/src/share/vm/gc/parallel/mutableSpace.hpp b/src/hotspot/share/gc/parallel/mutableSpace.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/mutableSpace.hpp rename to src/hotspot/share/gc/parallel/mutableSpace.hpp diff --git a/hotspot/src/share/vm/gc/parallel/objectStartArray.cpp b/src/hotspot/share/gc/parallel/objectStartArray.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/objectStartArray.cpp rename to src/hotspot/share/gc/parallel/objectStartArray.cpp diff --git a/hotspot/src/share/vm/gc/parallel/objectStartArray.hpp b/src/hotspot/share/gc/parallel/objectStartArray.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/objectStartArray.hpp rename to src/hotspot/share/gc/parallel/objectStartArray.hpp diff --git a/hotspot/src/share/vm/gc/parallel/objectStartArray.inline.hpp b/src/hotspot/share/gc/parallel/objectStartArray.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/objectStartArray.inline.hpp rename to src/hotspot/share/gc/parallel/objectStartArray.inline.hpp diff --git a/hotspot/src/share/vm/gc/parallel/parMarkBitMap.cpp b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/parMarkBitMap.cpp rename to src/hotspot/share/gc/parallel/parMarkBitMap.cpp diff --git a/hotspot/src/share/vm/gc/parallel/parMarkBitMap.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/parMarkBitMap.hpp rename to src/hotspot/share/gc/parallel/parMarkBitMap.hpp diff --git a/hotspot/src/share/vm/gc/parallel/parMarkBitMap.inline.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/parMarkBitMap.inline.hpp rename to src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp diff --git a/hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.cpp rename to src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp diff --git a/hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.hpp rename to src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp diff --git a/hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.inline.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.inline.hpp rename to src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp diff --git a/hotspot/src/share/vm/gc/parallel/pcTasks.cpp b/src/hotspot/share/gc/parallel/pcTasks.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/pcTasks.cpp rename to src/hotspot/share/gc/parallel/pcTasks.cpp diff --git a/hotspot/src/share/vm/gc/parallel/pcTasks.hpp b/src/hotspot/share/gc/parallel/pcTasks.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/pcTasks.hpp rename to src/hotspot/share/gc/parallel/pcTasks.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp rename to src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.hpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.hpp rename to src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psCompactionManager.cpp b/src/hotspot/share/gc/parallel/psCompactionManager.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psCompactionManager.cpp rename to src/hotspot/share/gc/parallel/psCompactionManager.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psCompactionManager.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psCompactionManager.hpp rename to src/hotspot/share/gc/parallel/psCompactionManager.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psCompactionManager.inline.hpp rename to src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psGCAdaptivePolicyCounters.cpp b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psGCAdaptivePolicyCounters.cpp rename to src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psGCAdaptivePolicyCounters.hpp b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psGCAdaptivePolicyCounters.hpp rename to src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psGenerationCounters.cpp b/src/hotspot/share/gc/parallel/psGenerationCounters.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psGenerationCounters.cpp rename to src/hotspot/share/gc/parallel/psGenerationCounters.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psGenerationCounters.hpp b/src/hotspot/share/gc/parallel/psGenerationCounters.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psGenerationCounters.hpp rename to src/hotspot/share/gc/parallel/psGenerationCounters.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psMarkSweep.cpp b/src/hotspot/share/gc/parallel/psMarkSweep.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psMarkSweep.cpp rename to src/hotspot/share/gc/parallel/psMarkSweep.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psMarkSweep.hpp b/src/hotspot/share/gc/parallel/psMarkSweep.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psMarkSweep.hpp rename to src/hotspot/share/gc/parallel/psMarkSweep.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psMarkSweepDecorator.cpp b/src/hotspot/share/gc/parallel/psMarkSweepDecorator.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psMarkSweepDecorator.cpp rename to src/hotspot/share/gc/parallel/psMarkSweepDecorator.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psMarkSweepDecorator.hpp b/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psMarkSweepDecorator.hpp rename to src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psOldGen.cpp rename to src/hotspot/share/gc/parallel/psOldGen.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psOldGen.hpp rename to src/hotspot/share/gc/parallel/psOldGen.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp rename to src/hotspot/share/gc/parallel/psParallelCompact.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psParallelCompact.hpp rename to src/hotspot/share/gc/parallel/psParallelCompact.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psParallelCompact.inline.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psParallelCompact.inline.hpp rename to src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psPromotionLAB.cpp b/src/hotspot/share/gc/parallel/psPromotionLAB.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psPromotionLAB.cpp rename to src/hotspot/share/gc/parallel/psPromotionLAB.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psPromotionLAB.hpp b/src/hotspot/share/gc/parallel/psPromotionLAB.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psPromotionLAB.hpp rename to src/hotspot/share/gc/parallel/psPromotionLAB.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psPromotionLAB.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psPromotionLAB.inline.hpp rename to src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psPromotionManager.cpp b/src/hotspot/share/gc/parallel/psPromotionManager.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psPromotionManager.cpp rename to src/hotspot/share/gc/parallel/psPromotionManager.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psPromotionManager.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psPromotionManager.hpp rename to src/hotspot/share/gc/parallel/psPromotionManager.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psPromotionManager.inline.hpp rename to src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psScavenge.cpp rename to src/hotspot/share/gc/parallel/psScavenge.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psScavenge.hpp b/src/hotspot/share/gc/parallel/psScavenge.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psScavenge.hpp rename to src/hotspot/share/gc/parallel/psScavenge.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psScavenge.inline.hpp b/src/hotspot/share/gc/parallel/psScavenge.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psScavenge.inline.hpp rename to src/hotspot/share/gc/parallel/psScavenge.inline.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psTasks.cpp b/src/hotspot/share/gc/parallel/psTasks.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psTasks.cpp rename to src/hotspot/share/gc/parallel/psTasks.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psTasks.hpp b/src/hotspot/share/gc/parallel/psTasks.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psTasks.hpp rename to src/hotspot/share/gc/parallel/psTasks.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psVirtualspace.cpp b/src/hotspot/share/gc/parallel/psVirtualspace.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psVirtualspace.cpp rename to src/hotspot/share/gc/parallel/psVirtualspace.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psVirtualspace.hpp b/src/hotspot/share/gc/parallel/psVirtualspace.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psVirtualspace.hpp rename to src/hotspot/share/gc/parallel/psVirtualspace.hpp diff --git a/hotspot/src/share/vm/gc/parallel/psYoungGen.cpp b/src/hotspot/share/gc/parallel/psYoungGen.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psYoungGen.cpp rename to src/hotspot/share/gc/parallel/psYoungGen.cpp diff --git a/hotspot/src/share/vm/gc/parallel/psYoungGen.hpp b/src/hotspot/share/gc/parallel/psYoungGen.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/psYoungGen.hpp rename to src/hotspot/share/gc/parallel/psYoungGen.hpp diff --git a/hotspot/src/share/vm/gc/parallel/spaceCounters.cpp b/src/hotspot/share/gc/parallel/spaceCounters.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/spaceCounters.cpp rename to src/hotspot/share/gc/parallel/spaceCounters.cpp diff --git a/hotspot/src/share/vm/gc/parallel/spaceCounters.hpp b/src/hotspot/share/gc/parallel/spaceCounters.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/spaceCounters.hpp rename to src/hotspot/share/gc/parallel/spaceCounters.hpp diff --git a/hotspot/src/share/vm/gc/parallel/vmPSOperations.cpp b/src/hotspot/share/gc/parallel/vmPSOperations.cpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/vmPSOperations.cpp rename to src/hotspot/share/gc/parallel/vmPSOperations.cpp diff --git a/hotspot/src/share/vm/gc/parallel/vmPSOperations.hpp b/src/hotspot/share/gc/parallel/vmPSOperations.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/vmPSOperations.hpp rename to src/hotspot/share/gc/parallel/vmPSOperations.hpp diff --git a/hotspot/src/share/vm/gc/parallel/vmStructs_parallelgc.hpp b/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp similarity index 100% rename from hotspot/src/share/vm/gc/parallel/vmStructs_parallelgc.hpp rename to src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp diff --git a/hotspot/src/share/vm/gc/serial/cSpaceCounters.cpp b/src/hotspot/share/gc/serial/cSpaceCounters.cpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/cSpaceCounters.cpp rename to src/hotspot/share/gc/serial/cSpaceCounters.cpp diff --git a/hotspot/src/share/vm/gc/serial/cSpaceCounters.hpp b/src/hotspot/share/gc/serial/cSpaceCounters.hpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/cSpaceCounters.hpp rename to src/hotspot/share/gc/serial/cSpaceCounters.hpp diff --git a/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/defNewGeneration.cpp rename to src/hotspot/share/gc/serial/defNewGeneration.cpp diff --git a/hotspot/src/share/vm/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/defNewGeneration.hpp rename to src/hotspot/share/gc/serial/defNewGeneration.hpp diff --git a/hotspot/src/share/vm/gc/serial/defNewGeneration.inline.hpp b/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/defNewGeneration.inline.hpp rename to src/hotspot/share/gc/serial/defNewGeneration.inline.hpp diff --git a/hotspot/src/share/vm/gc/serial/genMarkSweep.cpp b/src/hotspot/share/gc/serial/genMarkSweep.cpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/genMarkSweep.cpp rename to src/hotspot/share/gc/serial/genMarkSweep.cpp diff --git a/hotspot/src/share/vm/gc/serial/genMarkSweep.hpp b/src/hotspot/share/gc/serial/genMarkSweep.hpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/genMarkSweep.hpp rename to src/hotspot/share/gc/serial/genMarkSweep.hpp diff --git a/hotspot/src/share/vm/gc/serial/markSweep.cpp b/src/hotspot/share/gc/serial/markSweep.cpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/markSweep.cpp rename to src/hotspot/share/gc/serial/markSweep.cpp diff --git a/hotspot/src/share/vm/gc/serial/markSweep.hpp b/src/hotspot/share/gc/serial/markSweep.hpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/markSweep.hpp rename to src/hotspot/share/gc/serial/markSweep.hpp diff --git a/hotspot/src/share/vm/gc/serial/markSweep.inline.hpp b/src/hotspot/share/gc/serial/markSweep.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/markSweep.inline.hpp rename to src/hotspot/share/gc/serial/markSweep.inline.hpp diff --git a/hotspot/src/share/vm/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/tenuredGeneration.cpp rename to src/hotspot/share/gc/serial/tenuredGeneration.cpp diff --git a/hotspot/src/share/vm/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/tenuredGeneration.hpp rename to src/hotspot/share/gc/serial/tenuredGeneration.hpp diff --git a/hotspot/src/share/vm/gc/serial/tenuredGeneration.inline.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/serial/tenuredGeneration.inline.hpp rename to src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/adaptiveSizePolicy.cpp b/src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/adaptiveSizePolicy.cpp rename to src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp diff --git a/hotspot/src/share/vm/gc/shared/adaptiveSizePolicy.hpp b/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/adaptiveSizePolicy.hpp rename to src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp diff --git a/hotspot/src/share/vm/gc/shared/ageTable.cpp b/src/hotspot/share/gc/shared/ageTable.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/ageTable.cpp rename to src/hotspot/share/gc/shared/ageTable.cpp diff --git a/hotspot/src/share/vm/gc/shared/ageTable.hpp b/src/hotspot/share/gc/shared/ageTable.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/ageTable.hpp rename to src/hotspot/share/gc/shared/ageTable.hpp diff --git a/hotspot/src/share/vm/gc/shared/ageTable.inline.hpp b/src/hotspot/share/gc/shared/ageTable.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/ageTable.inline.hpp rename to src/hotspot/share/gc/shared/ageTable.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/ageTableTracer.cpp b/src/hotspot/share/gc/shared/ageTableTracer.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/ageTableTracer.cpp rename to src/hotspot/share/gc/shared/ageTableTracer.cpp diff --git a/hotspot/src/share/vm/gc/shared/ageTableTracer.hpp b/src/hotspot/share/gc/shared/ageTableTracer.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/ageTableTracer.hpp rename to src/hotspot/share/gc/shared/ageTableTracer.hpp diff --git a/hotspot/src/share/vm/gc/shared/allocTracer.cpp b/src/hotspot/share/gc/shared/allocTracer.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/allocTracer.cpp rename to src/hotspot/share/gc/shared/allocTracer.cpp diff --git a/hotspot/src/share/vm/gc/shared/allocTracer.hpp b/src/hotspot/share/gc/shared/allocTracer.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/allocTracer.hpp rename to src/hotspot/share/gc/shared/allocTracer.hpp diff --git a/hotspot/src/share/vm/gc/shared/barrierSet.cpp b/src/hotspot/share/gc/shared/barrierSet.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/barrierSet.cpp rename to src/hotspot/share/gc/shared/barrierSet.cpp diff --git a/hotspot/src/share/vm/gc/shared/barrierSet.hpp b/src/hotspot/share/gc/shared/barrierSet.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/barrierSet.hpp rename to src/hotspot/share/gc/shared/barrierSet.hpp diff --git a/hotspot/src/share/vm/gc/shared/barrierSet.inline.hpp b/src/hotspot/share/gc/shared/barrierSet.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/barrierSet.inline.hpp rename to src/hotspot/share/gc/shared/barrierSet.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/blockOffsetTable.cpp b/src/hotspot/share/gc/shared/blockOffsetTable.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/blockOffsetTable.cpp rename to src/hotspot/share/gc/shared/blockOffsetTable.cpp diff --git a/hotspot/src/share/vm/gc/shared/blockOffsetTable.hpp b/src/hotspot/share/gc/shared/blockOffsetTable.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/blockOffsetTable.hpp rename to src/hotspot/share/gc/shared/blockOffsetTable.hpp diff --git a/hotspot/src/share/vm/gc/shared/blockOffsetTable.inline.hpp b/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/blockOffsetTable.inline.hpp rename to src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/cardGeneration.cpp b/src/hotspot/share/gc/shared/cardGeneration.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/cardGeneration.cpp rename to src/hotspot/share/gc/shared/cardGeneration.cpp diff --git a/hotspot/src/share/vm/gc/shared/cardGeneration.hpp b/src/hotspot/share/gc/shared/cardGeneration.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/cardGeneration.hpp rename to src/hotspot/share/gc/shared/cardGeneration.hpp diff --git a/hotspot/src/share/vm/gc/shared/cardGeneration.inline.hpp b/src/hotspot/share/gc/shared/cardGeneration.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/cardGeneration.inline.hpp rename to src/hotspot/share/gc/shared/cardGeneration.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/cardTableModRefBS.cpp b/src/hotspot/share/gc/shared/cardTableModRefBS.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/cardTableModRefBS.cpp rename to src/hotspot/share/gc/shared/cardTableModRefBS.cpp diff --git a/hotspot/src/share/vm/gc/shared/cardTableModRefBS.hpp b/src/hotspot/share/gc/shared/cardTableModRefBS.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/cardTableModRefBS.hpp rename to src/hotspot/share/gc/shared/cardTableModRefBS.hpp diff --git a/hotspot/src/share/vm/gc/shared/cardTableModRefBS.inline.hpp b/src/hotspot/share/gc/shared/cardTableModRefBS.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/cardTableModRefBS.inline.hpp rename to src/hotspot/share/gc/shared/cardTableModRefBS.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/cardTableModRefBSForCTRS.cpp b/src/hotspot/share/gc/shared/cardTableModRefBSForCTRS.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/cardTableModRefBSForCTRS.cpp rename to src/hotspot/share/gc/shared/cardTableModRefBSForCTRS.cpp diff --git a/hotspot/src/share/vm/gc/shared/cardTableModRefBSForCTRS.hpp b/src/hotspot/share/gc/shared/cardTableModRefBSForCTRS.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/cardTableModRefBSForCTRS.hpp rename to src/hotspot/share/gc/shared/cardTableModRefBSForCTRS.hpp diff --git a/hotspot/src/share/vm/gc/shared/cardTableRS.cpp b/src/hotspot/share/gc/shared/cardTableRS.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/cardTableRS.cpp rename to src/hotspot/share/gc/shared/cardTableRS.cpp diff --git a/hotspot/src/share/vm/gc/shared/cardTableRS.hpp b/src/hotspot/share/gc/shared/cardTableRS.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/cardTableRS.hpp rename to src/hotspot/share/gc/shared/cardTableRS.hpp diff --git a/hotspot/src/share/vm/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/collectedHeap.cpp rename to src/hotspot/share/gc/shared/collectedHeap.cpp diff --git a/hotspot/src/share/vm/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/collectedHeap.hpp rename to src/hotspot/share/gc/shared/collectedHeap.hpp diff --git a/hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp rename to src/hotspot/share/gc/shared/collectedHeap.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/collectorCounters.cpp b/src/hotspot/share/gc/shared/collectorCounters.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/collectorCounters.cpp rename to src/hotspot/share/gc/shared/collectorCounters.cpp diff --git a/hotspot/src/share/vm/gc/shared/collectorCounters.hpp b/src/hotspot/share/gc/shared/collectorCounters.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/collectorCounters.hpp rename to src/hotspot/share/gc/shared/collectorCounters.hpp diff --git a/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp b/src/hotspot/share/gc/shared/collectorPolicy.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/collectorPolicy.cpp rename to src/hotspot/share/gc/shared/collectorPolicy.cpp diff --git a/hotspot/src/share/vm/gc/shared/collectorPolicy.hpp b/src/hotspot/share/gc/shared/collectorPolicy.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/collectorPolicy.hpp rename to src/hotspot/share/gc/shared/collectorPolicy.hpp diff --git a/hotspot/src/share/vm/gc/shared/concurrentGCPhaseManager.cpp b/src/hotspot/share/gc/shared/concurrentGCPhaseManager.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/concurrentGCPhaseManager.cpp rename to src/hotspot/share/gc/shared/concurrentGCPhaseManager.cpp diff --git a/hotspot/src/share/vm/gc/shared/concurrentGCPhaseManager.hpp b/src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/concurrentGCPhaseManager.hpp rename to src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp diff --git a/hotspot/src/share/vm/gc/shared/concurrentGCThread.cpp b/src/hotspot/share/gc/shared/concurrentGCThread.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/concurrentGCThread.cpp rename to src/hotspot/share/gc/shared/concurrentGCThread.cpp diff --git a/hotspot/src/share/vm/gc/shared/concurrentGCThread.hpp b/src/hotspot/share/gc/shared/concurrentGCThread.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/concurrentGCThread.hpp rename to src/hotspot/share/gc/shared/concurrentGCThread.hpp diff --git a/hotspot/src/share/vm/gc/shared/copyFailedInfo.hpp b/src/hotspot/share/gc/shared/copyFailedInfo.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/copyFailedInfo.hpp rename to src/hotspot/share/gc/shared/copyFailedInfo.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcCause.cpp b/src/hotspot/share/gc/shared/gcCause.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcCause.cpp rename to src/hotspot/share/gc/shared/gcCause.cpp diff --git a/hotspot/src/share/vm/gc/shared/gcCause.hpp b/src/hotspot/share/gc/shared/gcCause.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcCause.hpp rename to src/hotspot/share/gc/shared/gcCause.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcHeapSummary.hpp b/src/hotspot/share/gc/shared/gcHeapSummary.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcHeapSummary.hpp rename to src/hotspot/share/gc/shared/gcHeapSummary.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcId.cpp b/src/hotspot/share/gc/shared/gcId.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcId.cpp rename to src/hotspot/share/gc/shared/gcId.cpp diff --git a/hotspot/src/share/vm/gc/shared/gcId.hpp b/src/hotspot/share/gc/shared/gcId.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcId.hpp rename to src/hotspot/share/gc/shared/gcId.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcLocker.cpp b/src/hotspot/share/gc/shared/gcLocker.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcLocker.cpp rename to src/hotspot/share/gc/shared/gcLocker.cpp diff --git a/hotspot/src/share/vm/gc/shared/gcLocker.hpp b/src/hotspot/share/gc/shared/gcLocker.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcLocker.hpp rename to src/hotspot/share/gc/shared/gcLocker.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcLocker.inline.hpp b/src/hotspot/share/gc/shared/gcLocker.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcLocker.inline.hpp rename to src/hotspot/share/gc/shared/gcLocker.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcName.hpp b/src/hotspot/share/gc/shared/gcName.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcName.hpp rename to src/hotspot/share/gc/shared/gcName.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcPolicyCounters.cpp b/src/hotspot/share/gc/shared/gcPolicyCounters.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcPolicyCounters.cpp rename to src/hotspot/share/gc/shared/gcPolicyCounters.cpp diff --git a/hotspot/src/share/vm/gc/shared/gcPolicyCounters.hpp b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcPolicyCounters.hpp rename to src/hotspot/share/gc/shared/gcPolicyCounters.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcStats.cpp b/src/hotspot/share/gc/shared/gcStats.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcStats.cpp rename to src/hotspot/share/gc/shared/gcStats.cpp diff --git a/hotspot/src/share/vm/gc/shared/gcStats.hpp b/src/hotspot/share/gc/shared/gcStats.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcStats.hpp rename to src/hotspot/share/gc/shared/gcStats.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcTimer.cpp b/src/hotspot/share/gc/shared/gcTimer.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcTimer.cpp rename to src/hotspot/share/gc/shared/gcTimer.cpp diff --git a/hotspot/src/share/vm/gc/shared/gcTimer.hpp b/src/hotspot/share/gc/shared/gcTimer.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcTimer.hpp rename to src/hotspot/share/gc/shared/gcTimer.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcTrace.cpp b/src/hotspot/share/gc/shared/gcTrace.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcTrace.cpp rename to src/hotspot/share/gc/shared/gcTrace.cpp diff --git a/hotspot/src/share/vm/gc/shared/gcTrace.hpp b/src/hotspot/share/gc/shared/gcTrace.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcTrace.hpp rename to src/hotspot/share/gc/shared/gcTrace.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcTraceSend.cpp b/src/hotspot/share/gc/shared/gcTraceSend.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcTraceSend.cpp rename to src/hotspot/share/gc/shared/gcTraceSend.cpp diff --git a/hotspot/src/share/vm/gc/shared/gcTraceTime.cpp b/src/hotspot/share/gc/shared/gcTraceTime.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcTraceTime.cpp rename to src/hotspot/share/gc/shared/gcTraceTime.cpp diff --git a/hotspot/src/share/vm/gc/shared/gcTraceTime.hpp b/src/hotspot/share/gc/shared/gcTraceTime.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcTraceTime.hpp rename to src/hotspot/share/gc/shared/gcTraceTime.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcTraceTime.inline.hpp b/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcTraceTime.inline.hpp rename to src/hotspot/share/gc/shared/gcTraceTime.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcUtil.cpp b/src/hotspot/share/gc/shared/gcUtil.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcUtil.cpp rename to src/hotspot/share/gc/shared/gcUtil.cpp diff --git a/hotspot/src/share/vm/gc/shared/gcUtil.hpp b/src/hotspot/share/gc/shared/gcUtil.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcUtil.hpp rename to src/hotspot/share/gc/shared/gcUtil.hpp diff --git a/hotspot/src/share/vm/gc/shared/gcWhen.hpp b/src/hotspot/share/gc/shared/gcWhen.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/gcWhen.hpp rename to src/hotspot/share/gc/shared/gcWhen.hpp diff --git a/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp rename to src/hotspot/share/gc/shared/genCollectedHeap.cpp diff --git a/hotspot/src/share/vm/gc/shared/genCollectedHeap.hpp b/src/hotspot/share/gc/shared/genCollectedHeap.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/genCollectedHeap.hpp rename to src/hotspot/share/gc/shared/genCollectedHeap.hpp diff --git a/hotspot/src/share/vm/gc/shared/genOopClosures.cpp b/src/hotspot/share/gc/shared/genOopClosures.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/genOopClosures.cpp rename to src/hotspot/share/gc/shared/genOopClosures.cpp diff --git a/hotspot/src/share/vm/gc/shared/genOopClosures.hpp b/src/hotspot/share/gc/shared/genOopClosures.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/genOopClosures.hpp rename to src/hotspot/share/gc/shared/genOopClosures.hpp diff --git a/hotspot/src/share/vm/gc/shared/genOopClosures.inline.hpp b/src/hotspot/share/gc/shared/genOopClosures.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/genOopClosures.inline.hpp rename to src/hotspot/share/gc/shared/genOopClosures.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/generation.cpp b/src/hotspot/share/gc/shared/generation.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/generation.cpp rename to src/hotspot/share/gc/shared/generation.cpp diff --git a/hotspot/src/share/vm/gc/shared/generation.hpp b/src/hotspot/share/gc/shared/generation.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/generation.hpp rename to src/hotspot/share/gc/shared/generation.hpp diff --git a/hotspot/src/share/vm/gc/shared/generationCounters.cpp b/src/hotspot/share/gc/shared/generationCounters.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/generationCounters.cpp rename to src/hotspot/share/gc/shared/generationCounters.cpp diff --git a/hotspot/src/share/vm/gc/shared/generationCounters.hpp b/src/hotspot/share/gc/shared/generationCounters.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/generationCounters.hpp rename to src/hotspot/share/gc/shared/generationCounters.hpp diff --git a/hotspot/src/share/vm/gc/shared/generationSpec.cpp b/src/hotspot/share/gc/shared/generationSpec.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/generationSpec.cpp rename to src/hotspot/share/gc/shared/generationSpec.cpp diff --git a/hotspot/src/share/vm/gc/shared/generationSpec.hpp b/src/hotspot/share/gc/shared/generationSpec.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/generationSpec.hpp rename to src/hotspot/share/gc/shared/generationSpec.hpp diff --git a/hotspot/src/share/vm/gc/shared/isGCActiveMark.hpp b/src/hotspot/share/gc/shared/isGCActiveMark.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/isGCActiveMark.hpp rename to src/hotspot/share/gc/shared/isGCActiveMark.hpp diff --git a/hotspot/src/share/vm/gc/shared/memset_with_concurrent_readers.hpp b/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/memset_with_concurrent_readers.hpp rename to src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp diff --git a/hotspot/src/share/vm/gc/shared/modRefBarrierSet.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/modRefBarrierSet.hpp rename to src/hotspot/share/gc/shared/modRefBarrierSet.hpp diff --git a/hotspot/src/share/vm/gc/shared/objectCountEventSender.cpp b/src/hotspot/share/gc/shared/objectCountEventSender.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/objectCountEventSender.cpp rename to src/hotspot/share/gc/shared/objectCountEventSender.cpp diff --git a/hotspot/src/share/vm/gc/shared/objectCountEventSender.hpp b/src/hotspot/share/gc/shared/objectCountEventSender.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/objectCountEventSender.hpp rename to src/hotspot/share/gc/shared/objectCountEventSender.hpp diff --git a/hotspot/src/share/vm/gc/shared/plab.cpp b/src/hotspot/share/gc/shared/plab.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/plab.cpp rename to src/hotspot/share/gc/shared/plab.cpp diff --git a/hotspot/src/share/vm/gc/shared/plab.hpp b/src/hotspot/share/gc/shared/plab.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/plab.hpp rename to src/hotspot/share/gc/shared/plab.hpp diff --git a/hotspot/src/share/vm/gc/shared/plab.inline.hpp b/src/hotspot/share/gc/shared/plab.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/plab.inline.hpp rename to src/hotspot/share/gc/shared/plab.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/preservedMarks.cpp b/src/hotspot/share/gc/shared/preservedMarks.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/preservedMarks.cpp rename to src/hotspot/share/gc/shared/preservedMarks.cpp diff --git a/hotspot/src/share/vm/gc/shared/preservedMarks.hpp b/src/hotspot/share/gc/shared/preservedMarks.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/preservedMarks.hpp rename to src/hotspot/share/gc/shared/preservedMarks.hpp diff --git a/hotspot/src/share/vm/gc/shared/preservedMarks.inline.hpp b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/preservedMarks.inline.hpp rename to src/hotspot/share/gc/shared/preservedMarks.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/referencePolicy.cpp b/src/hotspot/share/gc/shared/referencePolicy.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/referencePolicy.cpp rename to src/hotspot/share/gc/shared/referencePolicy.cpp diff --git a/hotspot/src/share/vm/gc/shared/referencePolicy.hpp b/src/hotspot/share/gc/shared/referencePolicy.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/referencePolicy.hpp rename to src/hotspot/share/gc/shared/referencePolicy.hpp diff --git a/hotspot/src/share/vm/gc/shared/referenceProcessor.cpp b/src/hotspot/share/gc/shared/referenceProcessor.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/referenceProcessor.cpp rename to src/hotspot/share/gc/shared/referenceProcessor.cpp diff --git a/hotspot/src/share/vm/gc/shared/referenceProcessor.hpp b/src/hotspot/share/gc/shared/referenceProcessor.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/referenceProcessor.hpp rename to src/hotspot/share/gc/shared/referenceProcessor.hpp diff --git a/hotspot/src/share/vm/gc/shared/referenceProcessor.inline.hpp b/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/referenceProcessor.inline.hpp rename to src/hotspot/share/gc/shared/referenceProcessor.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/referenceProcessorPhaseTimes.cpp b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/referenceProcessorPhaseTimes.cpp rename to src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp diff --git a/hotspot/src/share/vm/gc/shared/referenceProcessorPhaseTimes.hpp b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/referenceProcessorPhaseTimes.hpp rename to src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp diff --git a/hotspot/src/share/vm/gc/shared/referenceProcessorStats.hpp b/src/hotspot/share/gc/shared/referenceProcessorStats.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/referenceProcessorStats.hpp rename to src/hotspot/share/gc/shared/referenceProcessorStats.hpp diff --git a/hotspot/src/share/vm/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/space.cpp rename to src/hotspot/share/gc/shared/space.cpp diff --git a/hotspot/src/share/vm/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/space.hpp rename to src/hotspot/share/gc/shared/space.hpp diff --git a/hotspot/src/share/vm/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/space.inline.hpp rename to src/hotspot/share/gc/shared/space.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/spaceDecorator.cpp b/src/hotspot/share/gc/shared/spaceDecorator.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/spaceDecorator.cpp rename to src/hotspot/share/gc/shared/spaceDecorator.cpp diff --git a/hotspot/src/share/vm/gc/shared/spaceDecorator.hpp b/src/hotspot/share/gc/shared/spaceDecorator.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/spaceDecorator.hpp rename to src/hotspot/share/gc/shared/spaceDecorator.hpp diff --git a/hotspot/src/share/vm/gc/shared/specialized_oop_closures.hpp b/src/hotspot/share/gc/shared/specialized_oop_closures.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/specialized_oop_closures.hpp rename to src/hotspot/share/gc/shared/specialized_oop_closures.hpp diff --git a/hotspot/src/share/vm/gc/shared/strongRootsScope.cpp b/src/hotspot/share/gc/shared/strongRootsScope.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/strongRootsScope.cpp rename to src/hotspot/share/gc/shared/strongRootsScope.cpp diff --git a/hotspot/src/share/vm/gc/shared/strongRootsScope.hpp b/src/hotspot/share/gc/shared/strongRootsScope.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/strongRootsScope.hpp rename to src/hotspot/share/gc/shared/strongRootsScope.hpp diff --git a/hotspot/src/share/vm/gc/shared/taskqueue.cpp b/src/hotspot/share/gc/shared/taskqueue.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/taskqueue.cpp rename to src/hotspot/share/gc/shared/taskqueue.cpp diff --git a/hotspot/src/share/vm/gc/shared/taskqueue.hpp b/src/hotspot/share/gc/shared/taskqueue.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/taskqueue.hpp rename to src/hotspot/share/gc/shared/taskqueue.hpp diff --git a/hotspot/src/share/vm/gc/shared/taskqueue.inline.hpp b/src/hotspot/share/gc/shared/taskqueue.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/taskqueue.inline.hpp rename to src/hotspot/share/gc/shared/taskqueue.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.cpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.cpp rename to src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp diff --git a/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.hpp rename to src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp diff --git a/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.inline.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.inline.hpp rename to src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/vmGCOperations.cpp b/src/hotspot/share/gc/shared/vmGCOperations.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/vmGCOperations.cpp rename to src/hotspot/share/gc/shared/vmGCOperations.cpp diff --git a/hotspot/src/share/vm/gc/shared/vmGCOperations.hpp b/src/hotspot/share/gc/shared/vmGCOperations.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/vmGCOperations.hpp rename to src/hotspot/share/gc/shared/vmGCOperations.hpp diff --git a/hotspot/src/share/vm/gc/shared/workerDataArray.cpp b/src/hotspot/share/gc/shared/workerDataArray.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/workerDataArray.cpp rename to src/hotspot/share/gc/shared/workerDataArray.cpp diff --git a/hotspot/src/share/vm/gc/shared/workerDataArray.hpp b/src/hotspot/share/gc/shared/workerDataArray.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/workerDataArray.hpp rename to src/hotspot/share/gc/shared/workerDataArray.hpp diff --git a/hotspot/src/share/vm/gc/shared/workerDataArray.inline.hpp b/src/hotspot/share/gc/shared/workerDataArray.inline.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/workerDataArray.inline.hpp rename to src/hotspot/share/gc/shared/workerDataArray.inline.hpp diff --git a/hotspot/src/share/vm/gc/shared/workerManager.hpp b/src/hotspot/share/gc/shared/workerManager.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/workerManager.hpp rename to src/hotspot/share/gc/shared/workerManager.hpp diff --git a/hotspot/src/share/vm/gc/shared/workgroup.cpp b/src/hotspot/share/gc/shared/workgroup.cpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/workgroup.cpp rename to src/hotspot/share/gc/shared/workgroup.cpp diff --git a/hotspot/src/share/vm/gc/shared/workgroup.hpp b/src/hotspot/share/gc/shared/workgroup.hpp similarity index 100% rename from hotspot/src/share/vm/gc/shared/workgroup.hpp rename to src/hotspot/share/gc/shared/workgroup.hpp diff --git a/hotspot/src/share/vm/interpreter/abstractInterpreter.cpp b/src/hotspot/share/interpreter/abstractInterpreter.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/abstractInterpreter.cpp rename to src/hotspot/share/interpreter/abstractInterpreter.cpp diff --git a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp b/src/hotspot/share/interpreter/abstractInterpreter.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/abstractInterpreter.hpp rename to src/hotspot/share/interpreter/abstractInterpreter.hpp diff --git a/hotspot/src/share/vm/interpreter/bytecode.cpp b/src/hotspot/share/interpreter/bytecode.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecode.cpp rename to src/hotspot/share/interpreter/bytecode.cpp diff --git a/hotspot/src/share/vm/interpreter/bytecode.hpp b/src/hotspot/share/interpreter/bytecode.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecode.hpp rename to src/hotspot/share/interpreter/bytecode.hpp diff --git a/hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp b/src/hotspot/share/interpreter/bytecodeHistogram.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp rename to src/hotspot/share/interpreter/bytecodeHistogram.cpp diff --git a/hotspot/src/share/vm/interpreter/bytecodeHistogram.hpp b/src/hotspot/share/interpreter/bytecodeHistogram.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodeHistogram.hpp rename to src/hotspot/share/interpreter/bytecodeHistogram.hpp diff --git a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp b/src/hotspot/share/interpreter/bytecodeInterpreter.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp rename to src/hotspot/share/interpreter/bytecodeInterpreter.cpp diff --git a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp b/src/hotspot/share/interpreter/bytecodeInterpreter.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp rename to src/hotspot/share/interpreter/bytecodeInterpreter.hpp diff --git a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp b/src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp rename to src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp diff --git a/hotspot/src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp b/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp rename to src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp diff --git a/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml b/src/hotspot/share/interpreter/bytecodeInterpreterWithChecks.xml similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml rename to src/hotspot/share/interpreter/bytecodeInterpreterWithChecks.xml diff --git a/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl b/src/hotspot/share/interpreter/bytecodeInterpreterWithChecks.xsl similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl rename to src/hotspot/share/interpreter/bytecodeInterpreterWithChecks.xsl diff --git a/hotspot/src/share/vm/interpreter/bytecodeStream.cpp b/src/hotspot/share/interpreter/bytecodeStream.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodeStream.cpp rename to src/hotspot/share/interpreter/bytecodeStream.cpp diff --git a/hotspot/src/share/vm/interpreter/bytecodeStream.hpp b/src/hotspot/share/interpreter/bytecodeStream.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodeStream.hpp rename to src/hotspot/share/interpreter/bytecodeStream.hpp diff --git a/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp b/src/hotspot/share/interpreter/bytecodeTracer.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodeTracer.cpp rename to src/hotspot/share/interpreter/bytecodeTracer.cpp diff --git a/hotspot/src/share/vm/interpreter/bytecodeTracer.hpp b/src/hotspot/share/interpreter/bytecodeTracer.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodeTracer.hpp rename to src/hotspot/share/interpreter/bytecodeTracer.hpp diff --git a/hotspot/src/share/vm/interpreter/bytecodes.cpp b/src/hotspot/share/interpreter/bytecodes.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodes.cpp rename to src/hotspot/share/interpreter/bytecodes.cpp diff --git a/hotspot/src/share/vm/interpreter/bytecodes.hpp b/src/hotspot/share/interpreter/bytecodes.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/bytecodes.hpp rename to src/hotspot/share/interpreter/bytecodes.hpp diff --git a/hotspot/src/share/vm/interpreter/cppInterpreter.cpp b/src/hotspot/share/interpreter/cppInterpreter.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/cppInterpreter.cpp rename to src/hotspot/share/interpreter/cppInterpreter.cpp diff --git a/hotspot/src/share/vm/interpreter/cppInterpreter.hpp b/src/hotspot/share/interpreter/cppInterpreter.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/cppInterpreter.hpp rename to src/hotspot/share/interpreter/cppInterpreter.hpp diff --git a/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.cpp b/src/hotspot/share/interpreter/cppInterpreterGenerator.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/cppInterpreterGenerator.cpp rename to src/hotspot/share/interpreter/cppInterpreterGenerator.cpp diff --git a/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp b/src/hotspot/share/interpreter/cppInterpreterGenerator.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp rename to src/hotspot/share/interpreter/cppInterpreterGenerator.hpp diff --git a/hotspot/src/share/vm/interpreter/interp_masm.hpp b/src/hotspot/share/interpreter/interp_masm.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/interp_masm.hpp rename to src/hotspot/share/interpreter/interp_masm.hpp diff --git a/hotspot/src/share/vm/interpreter/interpreter.cpp b/src/hotspot/share/interpreter/interpreter.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/interpreter.cpp rename to src/hotspot/share/interpreter/interpreter.cpp diff --git a/hotspot/src/share/vm/interpreter/interpreter.hpp b/src/hotspot/share/interpreter/interpreter.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/interpreter.hpp rename to src/hotspot/share/interpreter/interpreter.hpp diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/interpreterRuntime.cpp rename to src/hotspot/share/interpreter/interpreterRuntime.cpp diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp b/src/hotspot/share/interpreter/interpreterRuntime.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/interpreterRuntime.hpp rename to src/hotspot/share/interpreter/interpreterRuntime.hpp diff --git a/hotspot/src/share/vm/interpreter/invocationCounter.cpp b/src/hotspot/share/interpreter/invocationCounter.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/invocationCounter.cpp rename to src/hotspot/share/interpreter/invocationCounter.cpp diff --git a/hotspot/src/share/vm/interpreter/invocationCounter.hpp b/src/hotspot/share/interpreter/invocationCounter.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/invocationCounter.hpp rename to src/hotspot/share/interpreter/invocationCounter.hpp diff --git a/hotspot/src/share/vm/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/linkResolver.cpp rename to src/hotspot/share/interpreter/linkResolver.cpp diff --git a/hotspot/src/share/vm/interpreter/linkResolver.hpp b/src/hotspot/share/interpreter/linkResolver.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/linkResolver.hpp rename to src/hotspot/share/interpreter/linkResolver.hpp diff --git a/hotspot/src/share/vm/interpreter/oopMapCache.cpp b/src/hotspot/share/interpreter/oopMapCache.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/oopMapCache.cpp rename to src/hotspot/share/interpreter/oopMapCache.cpp diff --git a/hotspot/src/share/vm/interpreter/oopMapCache.hpp b/src/hotspot/share/interpreter/oopMapCache.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/oopMapCache.hpp rename to src/hotspot/share/interpreter/oopMapCache.hpp diff --git a/hotspot/src/share/vm/interpreter/rewriter.cpp b/src/hotspot/share/interpreter/rewriter.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/rewriter.cpp rename to src/hotspot/share/interpreter/rewriter.cpp diff --git a/hotspot/src/share/vm/interpreter/rewriter.hpp b/src/hotspot/share/interpreter/rewriter.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/rewriter.hpp rename to src/hotspot/share/interpreter/rewriter.hpp diff --git a/hotspot/src/share/vm/interpreter/templateInterpreter.cpp b/src/hotspot/share/interpreter/templateInterpreter.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/templateInterpreter.cpp rename to src/hotspot/share/interpreter/templateInterpreter.cpp diff --git a/hotspot/src/share/vm/interpreter/templateInterpreter.hpp b/src/hotspot/share/interpreter/templateInterpreter.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/templateInterpreter.hpp rename to src/hotspot/share/interpreter/templateInterpreter.hpp diff --git a/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.cpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/templateInterpreterGenerator.cpp rename to src/hotspot/share/interpreter/templateInterpreterGenerator.cpp diff --git a/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp rename to src/hotspot/share/interpreter/templateInterpreterGenerator.hpp diff --git a/hotspot/src/share/vm/interpreter/templateTable.cpp b/src/hotspot/share/interpreter/templateTable.cpp similarity index 100% rename from hotspot/src/share/vm/interpreter/templateTable.cpp rename to src/hotspot/share/interpreter/templateTable.cpp diff --git a/hotspot/src/share/vm/interpreter/templateTable.hpp b/src/hotspot/share/interpreter/templateTable.hpp similarity index 100% rename from hotspot/src/share/vm/interpreter/templateTable.hpp rename to src/hotspot/share/interpreter/templateTable.hpp diff --git a/hotspot/src/share/vm/jvmci/compilerRuntime.cpp b/src/hotspot/share/jvmci/compilerRuntime.cpp similarity index 100% rename from hotspot/src/share/vm/jvmci/compilerRuntime.cpp rename to src/hotspot/share/jvmci/compilerRuntime.cpp diff --git a/hotspot/src/share/vm/jvmci/compilerRuntime.hpp b/src/hotspot/share/jvmci/compilerRuntime.hpp similarity index 100% rename from hotspot/src/share/vm/jvmci/compilerRuntime.hpp rename to src/hotspot/share/jvmci/compilerRuntime.hpp diff --git a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp rename to src/hotspot/share/jvmci/jvmciCodeInstaller.cpp diff --git a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.hpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmciCodeInstaller.hpp rename to src/hotspot/share/jvmci/jvmciCodeInstaller.hpp diff --git a/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp b/src/hotspot/share/jvmci/jvmciCompiler.cpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmciCompiler.cpp rename to src/hotspot/share/jvmci/jvmciCompiler.cpp diff --git a/hotspot/src/share/vm/jvmci/jvmciCompiler.hpp b/src/hotspot/share/jvmci/jvmciCompiler.hpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmciCompiler.hpp rename to src/hotspot/share/jvmci/jvmciCompiler.hpp diff --git a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp rename to src/hotspot/share/jvmci/jvmciCompilerToVM.cpp diff --git a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.hpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmciCompilerToVM.hpp rename to src/hotspot/share/jvmci/jvmciCompilerToVM.hpp diff --git a/hotspot/src/share/vm/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmciEnv.cpp rename to src/hotspot/share/jvmci/jvmciEnv.cpp diff --git a/hotspot/src/share/vm/jvmci/jvmciEnv.hpp b/src/hotspot/share/jvmci/jvmciEnv.hpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmciEnv.hpp rename to src/hotspot/share/jvmci/jvmciEnv.hpp diff --git a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.cpp b/src/hotspot/share/jvmci/jvmciJavaClasses.cpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmciJavaClasses.cpp rename to src/hotspot/share/jvmci/jvmciJavaClasses.cpp diff --git a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp rename to src/hotspot/share/jvmci/jvmciJavaClasses.hpp diff --git a/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmciRuntime.cpp rename to src/hotspot/share/jvmci/jvmciRuntime.cpp diff --git a/hotspot/src/share/vm/jvmci/jvmciRuntime.hpp b/src/hotspot/share/jvmci/jvmciRuntime.hpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmciRuntime.hpp rename to src/hotspot/share/jvmci/jvmciRuntime.hpp diff --git a/hotspot/src/share/vm/jvmci/jvmci_globals.cpp b/src/hotspot/share/jvmci/jvmci_globals.cpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmci_globals.cpp rename to src/hotspot/share/jvmci/jvmci_globals.cpp diff --git a/hotspot/src/share/vm/jvmci/jvmci_globals.hpp b/src/hotspot/share/jvmci/jvmci_globals.hpp similarity index 100% rename from hotspot/src/share/vm/jvmci/jvmci_globals.hpp rename to src/hotspot/share/jvmci/jvmci_globals.hpp diff --git a/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp b/src/hotspot/share/jvmci/systemDictionary_jvmci.hpp similarity index 100% rename from hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp rename to src/hotspot/share/jvmci/systemDictionary_jvmci.hpp diff --git a/hotspot/src/share/vm/jvmci/vmStructs_compiler_runtime.hpp b/src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp similarity index 100% rename from hotspot/src/share/vm/jvmci/vmStructs_compiler_runtime.hpp rename to src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp diff --git a/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp similarity index 100% rename from hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp rename to src/hotspot/share/jvmci/vmStructs_jvmci.cpp diff --git a/hotspot/src/share/vm/jvmci/vmStructs_jvmci.hpp b/src/hotspot/share/jvmci/vmStructs_jvmci.hpp similarity index 100% rename from hotspot/src/share/vm/jvmci/vmStructs_jvmci.hpp rename to src/hotspot/share/jvmci/vmStructs_jvmci.hpp diff --git a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp b/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp similarity index 100% rename from hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp rename to src/hotspot/share/jvmci/vmSymbols_jvmci.hpp diff --git a/hotspot/src/share/vm/libadt/dict.cpp b/src/hotspot/share/libadt/dict.cpp similarity index 100% rename from hotspot/src/share/vm/libadt/dict.cpp rename to src/hotspot/share/libadt/dict.cpp diff --git a/hotspot/src/share/vm/libadt/dict.hpp b/src/hotspot/share/libadt/dict.hpp similarity index 100% rename from hotspot/src/share/vm/libadt/dict.hpp rename to src/hotspot/share/libadt/dict.hpp diff --git a/hotspot/src/share/vm/libadt/set.cpp b/src/hotspot/share/libadt/set.cpp similarity index 100% rename from hotspot/src/share/vm/libadt/set.cpp rename to src/hotspot/share/libadt/set.cpp diff --git a/hotspot/src/share/vm/libadt/set.hpp b/src/hotspot/share/libadt/set.hpp similarity index 100% rename from hotspot/src/share/vm/libadt/set.hpp rename to src/hotspot/share/libadt/set.hpp diff --git a/hotspot/src/share/vm/libadt/vectset.cpp b/src/hotspot/share/libadt/vectset.cpp similarity index 100% rename from hotspot/src/share/vm/libadt/vectset.cpp rename to src/hotspot/share/libadt/vectset.cpp diff --git a/hotspot/src/share/vm/libadt/vectset.hpp b/src/hotspot/share/libadt/vectset.hpp similarity index 100% rename from hotspot/src/share/vm/libadt/vectset.hpp rename to src/hotspot/share/libadt/vectset.hpp diff --git a/hotspot/src/share/vm/logging/log.hpp b/src/hotspot/share/logging/log.hpp similarity index 100% rename from hotspot/src/share/vm/logging/log.hpp rename to src/hotspot/share/logging/log.hpp diff --git a/hotspot/src/share/vm/logging/logConfiguration.cpp b/src/hotspot/share/logging/logConfiguration.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logConfiguration.cpp rename to src/hotspot/share/logging/logConfiguration.cpp diff --git a/hotspot/src/share/vm/logging/logConfiguration.hpp b/src/hotspot/share/logging/logConfiguration.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logConfiguration.hpp rename to src/hotspot/share/logging/logConfiguration.hpp diff --git a/hotspot/src/share/vm/logging/logDecorations.cpp b/src/hotspot/share/logging/logDecorations.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logDecorations.cpp rename to src/hotspot/share/logging/logDecorations.cpp diff --git a/hotspot/src/share/vm/logging/logDecorations.hpp b/src/hotspot/share/logging/logDecorations.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logDecorations.hpp rename to src/hotspot/share/logging/logDecorations.hpp diff --git a/hotspot/src/share/vm/logging/logDecorators.cpp b/src/hotspot/share/logging/logDecorators.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logDecorators.cpp rename to src/hotspot/share/logging/logDecorators.cpp diff --git a/hotspot/src/share/vm/logging/logDecorators.hpp b/src/hotspot/share/logging/logDecorators.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logDecorators.hpp rename to src/hotspot/share/logging/logDecorators.hpp diff --git a/hotspot/src/share/vm/logging/logDiagnosticCommand.cpp b/src/hotspot/share/logging/logDiagnosticCommand.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logDiagnosticCommand.cpp rename to src/hotspot/share/logging/logDiagnosticCommand.cpp diff --git a/hotspot/src/share/vm/logging/logDiagnosticCommand.hpp b/src/hotspot/share/logging/logDiagnosticCommand.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logDiagnosticCommand.hpp rename to src/hotspot/share/logging/logDiagnosticCommand.hpp diff --git a/hotspot/src/share/vm/logging/logFileOutput.cpp b/src/hotspot/share/logging/logFileOutput.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logFileOutput.cpp rename to src/hotspot/share/logging/logFileOutput.cpp diff --git a/hotspot/src/share/vm/logging/logFileOutput.hpp b/src/hotspot/share/logging/logFileOutput.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logFileOutput.hpp rename to src/hotspot/share/logging/logFileOutput.hpp diff --git a/hotspot/src/share/vm/logging/logFileStreamOutput.cpp b/src/hotspot/share/logging/logFileStreamOutput.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logFileStreamOutput.cpp rename to src/hotspot/share/logging/logFileStreamOutput.cpp diff --git a/hotspot/src/share/vm/logging/logFileStreamOutput.hpp b/src/hotspot/share/logging/logFileStreamOutput.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logFileStreamOutput.hpp rename to src/hotspot/share/logging/logFileStreamOutput.hpp diff --git a/hotspot/src/share/vm/logging/logHandle.hpp b/src/hotspot/share/logging/logHandle.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logHandle.hpp rename to src/hotspot/share/logging/logHandle.hpp diff --git a/hotspot/src/share/vm/logging/logLevel.cpp b/src/hotspot/share/logging/logLevel.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logLevel.cpp rename to src/hotspot/share/logging/logLevel.cpp diff --git a/hotspot/src/share/vm/logging/logLevel.hpp b/src/hotspot/share/logging/logLevel.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logLevel.hpp rename to src/hotspot/share/logging/logLevel.hpp diff --git a/hotspot/src/share/vm/logging/logMessage.hpp b/src/hotspot/share/logging/logMessage.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logMessage.hpp rename to src/hotspot/share/logging/logMessage.hpp diff --git a/hotspot/src/share/vm/logging/logMessageBuffer.cpp b/src/hotspot/share/logging/logMessageBuffer.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logMessageBuffer.cpp rename to src/hotspot/share/logging/logMessageBuffer.cpp diff --git a/hotspot/src/share/vm/logging/logMessageBuffer.hpp b/src/hotspot/share/logging/logMessageBuffer.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logMessageBuffer.hpp rename to src/hotspot/share/logging/logMessageBuffer.hpp diff --git a/hotspot/src/share/vm/logging/logOutput.cpp b/src/hotspot/share/logging/logOutput.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logOutput.cpp rename to src/hotspot/share/logging/logOutput.cpp diff --git a/hotspot/src/share/vm/logging/logOutput.hpp b/src/hotspot/share/logging/logOutput.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logOutput.hpp rename to src/hotspot/share/logging/logOutput.hpp diff --git a/hotspot/src/share/vm/logging/logOutputList.cpp b/src/hotspot/share/logging/logOutputList.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logOutputList.cpp rename to src/hotspot/share/logging/logOutputList.cpp diff --git a/hotspot/src/share/vm/logging/logOutputList.hpp b/src/hotspot/share/logging/logOutputList.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logOutputList.hpp rename to src/hotspot/share/logging/logOutputList.hpp diff --git a/hotspot/src/share/vm/logging/logPrefix.hpp b/src/hotspot/share/logging/logPrefix.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logPrefix.hpp rename to src/hotspot/share/logging/logPrefix.hpp diff --git a/hotspot/src/share/vm/logging/logStream.cpp b/src/hotspot/share/logging/logStream.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logStream.cpp rename to src/hotspot/share/logging/logStream.cpp diff --git a/hotspot/src/share/vm/logging/logStream.hpp b/src/hotspot/share/logging/logStream.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logStream.hpp rename to src/hotspot/share/logging/logStream.hpp diff --git a/hotspot/src/share/vm/logging/logTag.cpp b/src/hotspot/share/logging/logTag.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logTag.cpp rename to src/hotspot/share/logging/logTag.cpp diff --git a/hotspot/src/share/vm/logging/logTag.hpp b/src/hotspot/share/logging/logTag.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logTag.hpp rename to src/hotspot/share/logging/logTag.hpp diff --git a/hotspot/src/share/vm/logging/logTagLevelExpression.cpp b/src/hotspot/share/logging/logTagLevelExpression.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logTagLevelExpression.cpp rename to src/hotspot/share/logging/logTagLevelExpression.cpp diff --git a/hotspot/src/share/vm/logging/logTagLevelExpression.hpp b/src/hotspot/share/logging/logTagLevelExpression.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logTagLevelExpression.hpp rename to src/hotspot/share/logging/logTagLevelExpression.hpp diff --git a/hotspot/src/share/vm/logging/logTagSet.cpp b/src/hotspot/share/logging/logTagSet.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logTagSet.cpp rename to src/hotspot/share/logging/logTagSet.cpp diff --git a/hotspot/src/share/vm/logging/logTagSet.hpp b/src/hotspot/share/logging/logTagSet.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logTagSet.hpp rename to src/hotspot/share/logging/logTagSet.hpp diff --git a/hotspot/src/share/vm/logging/logTagSetDescriptions.cpp b/src/hotspot/share/logging/logTagSetDescriptions.cpp similarity index 100% rename from hotspot/src/share/vm/logging/logTagSetDescriptions.cpp rename to src/hotspot/share/logging/logTagSetDescriptions.cpp diff --git a/hotspot/src/share/vm/logging/logTagSetDescriptions.hpp b/src/hotspot/share/logging/logTagSetDescriptions.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logTagSetDescriptions.hpp rename to src/hotspot/share/logging/logTagSetDescriptions.hpp diff --git a/hotspot/src/share/vm/logging/logTag_ext.hpp b/src/hotspot/share/logging/logTag_ext.hpp similarity index 100% rename from hotspot/src/share/vm/logging/logTag_ext.hpp rename to src/hotspot/share/logging/logTag_ext.hpp diff --git a/hotspot/src/share/vm/memory/allocation.cpp b/src/hotspot/share/memory/allocation.cpp similarity index 100% rename from hotspot/src/share/vm/memory/allocation.cpp rename to src/hotspot/share/memory/allocation.cpp diff --git a/hotspot/src/share/vm/memory/allocation.hpp b/src/hotspot/share/memory/allocation.hpp similarity index 100% rename from hotspot/src/share/vm/memory/allocation.hpp rename to src/hotspot/share/memory/allocation.hpp diff --git a/hotspot/src/share/vm/memory/allocation.inline.hpp b/src/hotspot/share/memory/allocation.inline.hpp similarity index 100% rename from hotspot/src/share/vm/memory/allocation.inline.hpp rename to src/hotspot/share/memory/allocation.inline.hpp diff --git a/hotspot/src/share/vm/memory/arena.cpp b/src/hotspot/share/memory/arena.cpp similarity index 100% rename from hotspot/src/share/vm/memory/arena.cpp rename to src/hotspot/share/memory/arena.cpp diff --git a/hotspot/src/share/vm/memory/arena.hpp b/src/hotspot/share/memory/arena.hpp similarity index 100% rename from hotspot/src/share/vm/memory/arena.hpp rename to src/hotspot/share/memory/arena.hpp diff --git a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp b/src/hotspot/share/memory/binaryTreeDictionary.cpp similarity index 100% rename from hotspot/src/share/vm/memory/binaryTreeDictionary.cpp rename to src/hotspot/share/memory/binaryTreeDictionary.cpp diff --git a/hotspot/src/share/vm/memory/binaryTreeDictionary.hpp b/src/hotspot/share/memory/binaryTreeDictionary.hpp similarity index 100% rename from hotspot/src/share/vm/memory/binaryTreeDictionary.hpp rename to src/hotspot/share/memory/binaryTreeDictionary.hpp diff --git a/hotspot/src/share/vm/memory/filemap.cpp b/src/hotspot/share/memory/filemap.cpp similarity index 100% rename from hotspot/src/share/vm/memory/filemap.cpp rename to src/hotspot/share/memory/filemap.cpp diff --git a/hotspot/src/share/vm/memory/filemap.hpp b/src/hotspot/share/memory/filemap.hpp similarity index 100% rename from hotspot/src/share/vm/memory/filemap.hpp rename to src/hotspot/share/memory/filemap.hpp diff --git a/hotspot/src/share/vm/memory/freeList.cpp b/src/hotspot/share/memory/freeList.cpp similarity index 100% rename from hotspot/src/share/vm/memory/freeList.cpp rename to src/hotspot/share/memory/freeList.cpp diff --git a/hotspot/src/share/vm/memory/freeList.hpp b/src/hotspot/share/memory/freeList.hpp similarity index 100% rename from hotspot/src/share/vm/memory/freeList.hpp rename to src/hotspot/share/memory/freeList.hpp diff --git a/hotspot/src/share/vm/memory/guardedMemory.cpp b/src/hotspot/share/memory/guardedMemory.cpp similarity index 100% rename from hotspot/src/share/vm/memory/guardedMemory.cpp rename to src/hotspot/share/memory/guardedMemory.cpp diff --git a/hotspot/src/share/vm/memory/guardedMemory.hpp b/src/hotspot/share/memory/guardedMemory.hpp similarity index 100% rename from hotspot/src/share/vm/memory/guardedMemory.hpp rename to src/hotspot/share/memory/guardedMemory.hpp diff --git a/hotspot/src/share/vm/memory/heap.cpp b/src/hotspot/share/memory/heap.cpp similarity index 100% rename from hotspot/src/share/vm/memory/heap.cpp rename to src/hotspot/share/memory/heap.cpp diff --git a/hotspot/src/share/vm/memory/heap.hpp b/src/hotspot/share/memory/heap.hpp similarity index 100% rename from hotspot/src/share/vm/memory/heap.hpp rename to src/hotspot/share/memory/heap.hpp diff --git a/hotspot/src/share/vm/memory/heapInspection.cpp b/src/hotspot/share/memory/heapInspection.cpp similarity index 100% rename from hotspot/src/share/vm/memory/heapInspection.cpp rename to src/hotspot/share/memory/heapInspection.cpp diff --git a/hotspot/src/share/vm/memory/heapInspection.hpp b/src/hotspot/share/memory/heapInspection.hpp similarity index 100% rename from hotspot/src/share/vm/memory/heapInspection.hpp rename to src/hotspot/share/memory/heapInspection.hpp diff --git a/hotspot/src/share/vm/memory/iterator.cpp b/src/hotspot/share/memory/iterator.cpp similarity index 100% rename from hotspot/src/share/vm/memory/iterator.cpp rename to src/hotspot/share/memory/iterator.cpp diff --git a/hotspot/src/share/vm/memory/iterator.hpp b/src/hotspot/share/memory/iterator.hpp similarity index 100% rename from hotspot/src/share/vm/memory/iterator.hpp rename to src/hotspot/share/memory/iterator.hpp diff --git a/hotspot/src/share/vm/memory/iterator.inline.hpp b/src/hotspot/share/memory/iterator.inline.hpp similarity index 100% rename from hotspot/src/share/vm/memory/iterator.inline.hpp rename to src/hotspot/share/memory/iterator.inline.hpp diff --git a/hotspot/src/share/vm/memory/memRegion.cpp b/src/hotspot/share/memory/memRegion.cpp similarity index 100% rename from hotspot/src/share/vm/memory/memRegion.cpp rename to src/hotspot/share/memory/memRegion.cpp diff --git a/hotspot/src/share/vm/memory/memRegion.hpp b/src/hotspot/share/memory/memRegion.hpp similarity index 100% rename from hotspot/src/share/vm/memory/memRegion.hpp rename to src/hotspot/share/memory/memRegion.hpp diff --git a/hotspot/src/share/vm/memory/metachunk.cpp b/src/hotspot/share/memory/metachunk.cpp similarity index 100% rename from hotspot/src/share/vm/memory/metachunk.cpp rename to src/hotspot/share/memory/metachunk.cpp diff --git a/hotspot/src/share/vm/memory/metachunk.hpp b/src/hotspot/share/memory/metachunk.hpp similarity index 100% rename from hotspot/src/share/vm/memory/metachunk.hpp rename to src/hotspot/share/memory/metachunk.hpp diff --git a/hotspot/src/share/vm/memory/metadataFactory.hpp b/src/hotspot/share/memory/metadataFactory.hpp similarity index 100% rename from hotspot/src/share/vm/memory/metadataFactory.hpp rename to src/hotspot/share/memory/metadataFactory.hpp diff --git a/hotspot/src/share/vm/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp similarity index 100% rename from hotspot/src/share/vm/memory/metaspace.cpp rename to src/hotspot/share/memory/metaspace.cpp diff --git a/hotspot/src/share/vm/memory/metaspace.hpp b/src/hotspot/share/memory/metaspace.hpp similarity index 100% rename from hotspot/src/share/vm/memory/metaspace.hpp rename to src/hotspot/share/memory/metaspace.hpp diff --git a/hotspot/src/share/vm/memory/metaspaceChunkFreeListSummary.hpp b/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp similarity index 100% rename from hotspot/src/share/vm/memory/metaspaceChunkFreeListSummary.hpp rename to src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp diff --git a/hotspot/src/share/vm/memory/metaspaceClosure.cpp b/src/hotspot/share/memory/metaspaceClosure.cpp similarity index 100% rename from hotspot/src/share/vm/memory/metaspaceClosure.cpp rename to src/hotspot/share/memory/metaspaceClosure.cpp diff --git a/hotspot/src/share/vm/memory/metaspaceClosure.hpp b/src/hotspot/share/memory/metaspaceClosure.hpp similarity index 100% rename from hotspot/src/share/vm/memory/metaspaceClosure.hpp rename to src/hotspot/share/memory/metaspaceClosure.hpp diff --git a/hotspot/src/share/vm/memory/metaspaceCounters.cpp b/src/hotspot/share/memory/metaspaceCounters.cpp similarity index 100% rename from hotspot/src/share/vm/memory/metaspaceCounters.cpp rename to src/hotspot/share/memory/metaspaceCounters.cpp diff --git a/hotspot/src/share/vm/memory/metaspaceCounters.hpp b/src/hotspot/share/memory/metaspaceCounters.hpp similarity index 100% rename from hotspot/src/share/vm/memory/metaspaceCounters.hpp rename to src/hotspot/share/memory/metaspaceCounters.hpp diff --git a/hotspot/src/share/vm/memory/metaspaceGCThresholdUpdater.hpp b/src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp similarity index 100% rename from hotspot/src/share/vm/memory/metaspaceGCThresholdUpdater.hpp rename to src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp diff --git a/hotspot/src/share/vm/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp similarity index 100% rename from hotspot/src/share/vm/memory/metaspaceShared.cpp rename to src/hotspot/share/memory/metaspaceShared.cpp diff --git a/hotspot/src/share/vm/memory/metaspaceShared.hpp b/src/hotspot/share/memory/metaspaceShared.hpp similarity index 100% rename from hotspot/src/share/vm/memory/metaspaceShared.hpp rename to src/hotspot/share/memory/metaspaceShared.hpp diff --git a/hotspot/src/share/vm/memory/metaspaceTracer.cpp b/src/hotspot/share/memory/metaspaceTracer.cpp similarity index 100% rename from hotspot/src/share/vm/memory/metaspaceTracer.cpp rename to src/hotspot/share/memory/metaspaceTracer.cpp diff --git a/hotspot/src/share/vm/memory/metaspaceTracer.hpp b/src/hotspot/share/memory/metaspaceTracer.hpp similarity index 100% rename from hotspot/src/share/vm/memory/metaspaceTracer.hpp rename to src/hotspot/share/memory/metaspaceTracer.hpp diff --git a/hotspot/src/share/vm/memory/oopFactory.cpp b/src/hotspot/share/memory/oopFactory.cpp similarity index 100% rename from hotspot/src/share/vm/memory/oopFactory.cpp rename to src/hotspot/share/memory/oopFactory.cpp diff --git a/hotspot/src/share/vm/memory/oopFactory.hpp b/src/hotspot/share/memory/oopFactory.hpp similarity index 100% rename from hotspot/src/share/vm/memory/oopFactory.hpp rename to src/hotspot/share/memory/oopFactory.hpp diff --git a/hotspot/src/share/vm/memory/operator_new.cpp b/src/hotspot/share/memory/operator_new.cpp similarity index 100% rename from hotspot/src/share/vm/memory/operator_new.cpp rename to src/hotspot/share/memory/operator_new.cpp diff --git a/hotspot/src/share/vm/memory/padded.hpp b/src/hotspot/share/memory/padded.hpp similarity index 100% rename from hotspot/src/share/vm/memory/padded.hpp rename to src/hotspot/share/memory/padded.hpp diff --git a/hotspot/src/share/vm/memory/padded.inline.hpp b/src/hotspot/share/memory/padded.inline.hpp similarity index 100% rename from hotspot/src/share/vm/memory/padded.inline.hpp rename to src/hotspot/share/memory/padded.inline.hpp diff --git a/hotspot/src/share/vm/memory/referenceType.hpp b/src/hotspot/share/memory/referenceType.hpp similarity index 100% rename from hotspot/src/share/vm/memory/referenceType.hpp rename to src/hotspot/share/memory/referenceType.hpp diff --git a/hotspot/src/share/vm/memory/resourceArea.cpp b/src/hotspot/share/memory/resourceArea.cpp similarity index 100% rename from hotspot/src/share/vm/memory/resourceArea.cpp rename to src/hotspot/share/memory/resourceArea.cpp diff --git a/hotspot/src/share/vm/memory/resourceArea.hpp b/src/hotspot/share/memory/resourceArea.hpp similarity index 100% rename from hotspot/src/share/vm/memory/resourceArea.hpp rename to src/hotspot/share/memory/resourceArea.hpp diff --git a/hotspot/src/share/vm/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp similarity index 100% rename from hotspot/src/share/vm/memory/universe.cpp rename to src/hotspot/share/memory/universe.cpp diff --git a/hotspot/src/share/vm/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp similarity index 100% rename from hotspot/src/share/vm/memory/universe.hpp rename to src/hotspot/share/memory/universe.hpp diff --git a/hotspot/src/share/vm/memory/universe.inline.hpp b/src/hotspot/share/memory/universe.inline.hpp similarity index 100% rename from hotspot/src/share/vm/memory/universe.inline.hpp rename to src/hotspot/share/memory/universe.inline.hpp diff --git a/hotspot/src/share/vm/memory/universe_ext.cpp b/src/hotspot/share/memory/universe_ext.cpp similarity index 100% rename from hotspot/src/share/vm/memory/universe_ext.cpp rename to src/hotspot/share/memory/universe_ext.cpp diff --git a/hotspot/src/share/vm/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp similarity index 100% rename from hotspot/src/share/vm/memory/virtualspace.cpp rename to src/hotspot/share/memory/virtualspace.cpp diff --git a/hotspot/src/share/vm/memory/virtualspace.hpp b/src/hotspot/share/memory/virtualspace.hpp similarity index 100% rename from hotspot/src/share/vm/memory/virtualspace.hpp rename to src/hotspot/share/memory/virtualspace.hpp diff --git a/hotspot/src/share/vm/metaprogramming/conditional.hpp b/src/hotspot/share/metaprogramming/conditional.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/conditional.hpp rename to src/hotspot/share/metaprogramming/conditional.hpp diff --git a/hotspot/src/share/vm/metaprogramming/decay.hpp b/src/hotspot/share/metaprogramming/decay.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/decay.hpp rename to src/hotspot/share/metaprogramming/decay.hpp diff --git a/hotspot/src/share/vm/metaprogramming/enableIf.hpp b/src/hotspot/share/metaprogramming/enableIf.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/enableIf.hpp rename to src/hotspot/share/metaprogramming/enableIf.hpp diff --git a/hotspot/src/share/vm/metaprogramming/integralConstant.hpp b/src/hotspot/share/metaprogramming/integralConstant.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/integralConstant.hpp rename to src/hotspot/share/metaprogramming/integralConstant.hpp diff --git a/hotspot/src/share/vm/metaprogramming/isConst.hpp b/src/hotspot/share/metaprogramming/isConst.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/isConst.hpp rename to src/hotspot/share/metaprogramming/isConst.hpp diff --git a/hotspot/src/share/vm/metaprogramming/isFloatingPoint.hpp b/src/hotspot/share/metaprogramming/isFloatingPoint.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/isFloatingPoint.hpp rename to src/hotspot/share/metaprogramming/isFloatingPoint.hpp diff --git a/hotspot/src/share/vm/metaprogramming/isIntegral.hpp b/src/hotspot/share/metaprogramming/isIntegral.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/isIntegral.hpp rename to src/hotspot/share/metaprogramming/isIntegral.hpp diff --git a/hotspot/src/share/vm/metaprogramming/isPointer.hpp b/src/hotspot/share/metaprogramming/isPointer.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/isPointer.hpp rename to src/hotspot/share/metaprogramming/isPointer.hpp diff --git a/hotspot/src/share/vm/metaprogramming/isRegisteredEnum.hpp b/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/isRegisteredEnum.hpp rename to src/hotspot/share/metaprogramming/isRegisteredEnum.hpp diff --git a/hotspot/src/share/vm/metaprogramming/isSame.hpp b/src/hotspot/share/metaprogramming/isSame.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/isSame.hpp rename to src/hotspot/share/metaprogramming/isSame.hpp diff --git a/hotspot/src/share/vm/metaprogramming/isSigned.hpp b/src/hotspot/share/metaprogramming/isSigned.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/isSigned.hpp rename to src/hotspot/share/metaprogramming/isSigned.hpp diff --git a/hotspot/src/share/vm/metaprogramming/isVolatile.hpp b/src/hotspot/share/metaprogramming/isVolatile.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/isVolatile.hpp rename to src/hotspot/share/metaprogramming/isVolatile.hpp diff --git a/hotspot/src/share/vm/metaprogramming/primitiveConversions.hpp b/src/hotspot/share/metaprogramming/primitiveConversions.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/primitiveConversions.hpp rename to src/hotspot/share/metaprogramming/primitiveConversions.hpp diff --git a/hotspot/src/share/vm/metaprogramming/removeCV.hpp b/src/hotspot/share/metaprogramming/removeCV.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/removeCV.hpp rename to src/hotspot/share/metaprogramming/removeCV.hpp diff --git a/hotspot/src/share/vm/metaprogramming/removePointer.hpp b/src/hotspot/share/metaprogramming/removePointer.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/removePointer.hpp rename to src/hotspot/share/metaprogramming/removePointer.hpp diff --git a/hotspot/src/share/vm/metaprogramming/removeReference.hpp b/src/hotspot/share/metaprogramming/removeReference.hpp similarity index 100% rename from hotspot/src/share/vm/metaprogramming/removeReference.hpp rename to src/hotspot/share/metaprogramming/removeReference.hpp diff --git a/hotspot/src/share/vm/oops/annotations.cpp b/src/hotspot/share/oops/annotations.cpp similarity index 100% rename from hotspot/src/share/vm/oops/annotations.cpp rename to src/hotspot/share/oops/annotations.cpp diff --git a/hotspot/src/share/vm/oops/annotations.hpp b/src/hotspot/share/oops/annotations.hpp similarity index 100% rename from hotspot/src/share/vm/oops/annotations.hpp rename to src/hotspot/share/oops/annotations.hpp diff --git a/hotspot/src/share/vm/oops/array.hpp b/src/hotspot/share/oops/array.hpp similarity index 100% rename from hotspot/src/share/vm/oops/array.hpp rename to src/hotspot/share/oops/array.hpp diff --git a/hotspot/src/share/vm/oops/arrayKlass.cpp b/src/hotspot/share/oops/arrayKlass.cpp similarity index 100% rename from hotspot/src/share/vm/oops/arrayKlass.cpp rename to src/hotspot/share/oops/arrayKlass.cpp diff --git a/hotspot/src/share/vm/oops/arrayKlass.hpp b/src/hotspot/share/oops/arrayKlass.hpp similarity index 100% rename from hotspot/src/share/vm/oops/arrayKlass.hpp rename to src/hotspot/share/oops/arrayKlass.hpp diff --git a/hotspot/src/share/vm/oops/arrayKlass.inline.hpp b/src/hotspot/share/oops/arrayKlass.inline.hpp similarity index 100% rename from hotspot/src/share/vm/oops/arrayKlass.inline.hpp rename to src/hotspot/share/oops/arrayKlass.inline.hpp diff --git a/hotspot/src/share/vm/oops/arrayOop.hpp b/src/hotspot/share/oops/arrayOop.hpp similarity index 100% rename from hotspot/src/share/vm/oops/arrayOop.hpp rename to src/hotspot/share/oops/arrayOop.hpp diff --git a/hotspot/src/share/vm/oops/compiledICHolder.cpp b/src/hotspot/share/oops/compiledICHolder.cpp similarity index 100% rename from hotspot/src/share/vm/oops/compiledICHolder.cpp rename to src/hotspot/share/oops/compiledICHolder.cpp diff --git a/hotspot/src/share/vm/oops/compiledICHolder.hpp b/src/hotspot/share/oops/compiledICHolder.hpp similarity index 100% rename from hotspot/src/share/vm/oops/compiledICHolder.hpp rename to src/hotspot/share/oops/compiledICHolder.hpp diff --git a/hotspot/src/share/vm/oops/constMethod.cpp b/src/hotspot/share/oops/constMethod.cpp similarity index 100% rename from hotspot/src/share/vm/oops/constMethod.cpp rename to src/hotspot/share/oops/constMethod.cpp diff --git a/hotspot/src/share/vm/oops/constMethod.hpp b/src/hotspot/share/oops/constMethod.hpp similarity index 100% rename from hotspot/src/share/vm/oops/constMethod.hpp rename to src/hotspot/share/oops/constMethod.hpp diff --git a/hotspot/src/share/vm/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp similarity index 100% rename from hotspot/src/share/vm/oops/constantPool.cpp rename to src/hotspot/share/oops/constantPool.cpp diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/src/hotspot/share/oops/constantPool.hpp similarity index 100% rename from hotspot/src/share/vm/oops/constantPool.hpp rename to src/hotspot/share/oops/constantPool.hpp diff --git a/hotspot/src/share/vm/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp similarity index 100% rename from hotspot/src/share/vm/oops/cpCache.cpp rename to src/hotspot/share/oops/cpCache.cpp diff --git a/hotspot/src/share/vm/oops/cpCache.hpp b/src/hotspot/share/oops/cpCache.hpp similarity index 100% rename from hotspot/src/share/vm/oops/cpCache.hpp rename to src/hotspot/share/oops/cpCache.hpp diff --git a/hotspot/src/share/vm/oops/fieldInfo.hpp b/src/hotspot/share/oops/fieldInfo.hpp similarity index 100% rename from hotspot/src/share/vm/oops/fieldInfo.hpp rename to src/hotspot/share/oops/fieldInfo.hpp diff --git a/hotspot/src/share/vm/oops/fieldStreams.hpp b/src/hotspot/share/oops/fieldStreams.hpp similarity index 100% rename from hotspot/src/share/vm/oops/fieldStreams.hpp rename to src/hotspot/share/oops/fieldStreams.hpp diff --git a/hotspot/src/share/vm/oops/generateOopMap.cpp b/src/hotspot/share/oops/generateOopMap.cpp similarity index 100% rename from hotspot/src/share/vm/oops/generateOopMap.cpp rename to src/hotspot/share/oops/generateOopMap.cpp diff --git a/hotspot/src/share/vm/oops/generateOopMap.hpp b/src/hotspot/share/oops/generateOopMap.hpp similarity index 100% rename from hotspot/src/share/vm/oops/generateOopMap.hpp rename to src/hotspot/share/oops/generateOopMap.hpp diff --git a/hotspot/src/share/vm/oops/instanceClassLoaderKlass.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceClassLoaderKlass.hpp rename to src/hotspot/share/oops/instanceClassLoaderKlass.hpp diff --git a/hotspot/src/share/vm/oops/instanceClassLoaderKlass.inline.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceClassLoaderKlass.inline.hpp rename to src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp diff --git a/hotspot/src/share/vm/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceKlass.cpp rename to src/hotspot/share/oops/instanceKlass.cpp diff --git a/hotspot/src/share/vm/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceKlass.hpp rename to src/hotspot/share/oops/instanceKlass.hpp diff --git a/hotspot/src/share/vm/oops/instanceKlass.inline.hpp b/src/hotspot/share/oops/instanceKlass.inline.hpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceKlass.inline.hpp rename to src/hotspot/share/oops/instanceKlass.inline.hpp diff --git a/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp b/src/hotspot/share/oops/instanceMirrorKlass.cpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceMirrorKlass.cpp rename to src/hotspot/share/oops/instanceMirrorKlass.cpp diff --git a/hotspot/src/share/vm/oops/instanceMirrorKlass.hpp b/src/hotspot/share/oops/instanceMirrorKlass.hpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceMirrorKlass.hpp rename to src/hotspot/share/oops/instanceMirrorKlass.hpp diff --git a/hotspot/src/share/vm/oops/instanceMirrorKlass.inline.hpp b/src/hotspot/share/oops/instanceMirrorKlass.inline.hpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceMirrorKlass.inline.hpp rename to src/hotspot/share/oops/instanceMirrorKlass.inline.hpp diff --git a/hotspot/src/share/vm/oops/instanceOop.cpp b/src/hotspot/share/oops/instanceOop.cpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceOop.cpp rename to src/hotspot/share/oops/instanceOop.cpp diff --git a/hotspot/src/share/vm/oops/instanceOop.hpp b/src/hotspot/share/oops/instanceOop.hpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceOop.hpp rename to src/hotspot/share/oops/instanceOop.hpp diff --git a/hotspot/src/share/vm/oops/instanceRefKlass.cpp b/src/hotspot/share/oops/instanceRefKlass.cpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceRefKlass.cpp rename to src/hotspot/share/oops/instanceRefKlass.cpp diff --git a/hotspot/src/share/vm/oops/instanceRefKlass.hpp b/src/hotspot/share/oops/instanceRefKlass.hpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceRefKlass.hpp rename to src/hotspot/share/oops/instanceRefKlass.hpp diff --git a/hotspot/src/share/vm/oops/instanceRefKlass.inline.hpp b/src/hotspot/share/oops/instanceRefKlass.inline.hpp similarity index 100% rename from hotspot/src/share/vm/oops/instanceRefKlass.inline.hpp rename to src/hotspot/share/oops/instanceRefKlass.inline.hpp diff --git a/hotspot/src/share/vm/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp similarity index 100% rename from hotspot/src/share/vm/oops/klass.cpp rename to src/hotspot/share/oops/klass.cpp diff --git a/hotspot/src/share/vm/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp similarity index 100% rename from hotspot/src/share/vm/oops/klass.hpp rename to src/hotspot/share/oops/klass.hpp diff --git a/hotspot/src/share/vm/oops/klass.inline.hpp b/src/hotspot/share/oops/klass.inline.hpp similarity index 100% rename from hotspot/src/share/vm/oops/klass.inline.hpp rename to src/hotspot/share/oops/klass.inline.hpp diff --git a/hotspot/src/share/vm/oops/klassVtable.cpp b/src/hotspot/share/oops/klassVtable.cpp similarity index 100% rename from hotspot/src/share/vm/oops/klassVtable.cpp rename to src/hotspot/share/oops/klassVtable.cpp diff --git a/hotspot/src/share/vm/oops/klassVtable.hpp b/src/hotspot/share/oops/klassVtable.hpp similarity index 100% rename from hotspot/src/share/vm/oops/klassVtable.hpp rename to src/hotspot/share/oops/klassVtable.hpp diff --git a/hotspot/src/share/vm/oops/markOop.cpp b/src/hotspot/share/oops/markOop.cpp similarity index 100% rename from hotspot/src/share/vm/oops/markOop.cpp rename to src/hotspot/share/oops/markOop.cpp diff --git a/hotspot/src/share/vm/oops/markOop.hpp b/src/hotspot/share/oops/markOop.hpp similarity index 100% rename from hotspot/src/share/vm/oops/markOop.hpp rename to src/hotspot/share/oops/markOop.hpp diff --git a/hotspot/src/share/vm/oops/markOop.inline.hpp b/src/hotspot/share/oops/markOop.inline.hpp similarity index 100% rename from hotspot/src/share/vm/oops/markOop.inline.hpp rename to src/hotspot/share/oops/markOop.inline.hpp diff --git a/hotspot/src/share/vm/oops/metadata.cpp b/src/hotspot/share/oops/metadata.cpp similarity index 100% rename from hotspot/src/share/vm/oops/metadata.cpp rename to src/hotspot/share/oops/metadata.cpp diff --git a/hotspot/src/share/vm/oops/metadata.hpp b/src/hotspot/share/oops/metadata.hpp similarity index 100% rename from hotspot/src/share/vm/oops/metadata.hpp rename to src/hotspot/share/oops/metadata.hpp diff --git a/hotspot/src/share/vm/oops/method.cpp b/src/hotspot/share/oops/method.cpp similarity index 100% rename from hotspot/src/share/vm/oops/method.cpp rename to src/hotspot/share/oops/method.cpp diff --git a/hotspot/src/share/vm/oops/method.hpp b/src/hotspot/share/oops/method.hpp similarity index 100% rename from hotspot/src/share/vm/oops/method.hpp rename to src/hotspot/share/oops/method.hpp diff --git a/hotspot/src/share/vm/oops/methodCounters.cpp b/src/hotspot/share/oops/methodCounters.cpp similarity index 100% rename from hotspot/src/share/vm/oops/methodCounters.cpp rename to src/hotspot/share/oops/methodCounters.cpp diff --git a/hotspot/src/share/vm/oops/methodCounters.hpp b/src/hotspot/share/oops/methodCounters.hpp similarity index 100% rename from hotspot/src/share/vm/oops/methodCounters.hpp rename to src/hotspot/share/oops/methodCounters.hpp diff --git a/hotspot/src/share/vm/oops/methodData.cpp b/src/hotspot/share/oops/methodData.cpp similarity index 100% rename from hotspot/src/share/vm/oops/methodData.cpp rename to src/hotspot/share/oops/methodData.cpp diff --git a/hotspot/src/share/vm/oops/methodData.hpp b/src/hotspot/share/oops/methodData.hpp similarity index 100% rename from hotspot/src/share/vm/oops/methodData.hpp rename to src/hotspot/share/oops/methodData.hpp diff --git a/hotspot/src/share/vm/oops/objArrayKlass.cpp b/src/hotspot/share/oops/objArrayKlass.cpp similarity index 100% rename from hotspot/src/share/vm/oops/objArrayKlass.cpp rename to src/hotspot/share/oops/objArrayKlass.cpp diff --git a/hotspot/src/share/vm/oops/objArrayKlass.hpp b/src/hotspot/share/oops/objArrayKlass.hpp similarity index 100% rename from hotspot/src/share/vm/oops/objArrayKlass.hpp rename to src/hotspot/share/oops/objArrayKlass.hpp diff --git a/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp b/src/hotspot/share/oops/objArrayKlass.inline.hpp similarity index 100% rename from hotspot/src/share/vm/oops/objArrayKlass.inline.hpp rename to src/hotspot/share/oops/objArrayKlass.inline.hpp diff --git a/hotspot/src/share/vm/oops/objArrayOop.cpp b/src/hotspot/share/oops/objArrayOop.cpp similarity index 100% rename from hotspot/src/share/vm/oops/objArrayOop.cpp rename to src/hotspot/share/oops/objArrayOop.cpp diff --git a/hotspot/src/share/vm/oops/objArrayOop.hpp b/src/hotspot/share/oops/objArrayOop.hpp similarity index 100% rename from hotspot/src/share/vm/oops/objArrayOop.hpp rename to src/hotspot/share/oops/objArrayOop.hpp diff --git a/hotspot/src/share/vm/oops/objArrayOop.inline.hpp b/src/hotspot/share/oops/objArrayOop.inline.hpp similarity index 100% rename from hotspot/src/share/vm/oops/objArrayOop.inline.hpp rename to src/hotspot/share/oops/objArrayOop.inline.hpp diff --git a/hotspot/src/share/vm/oops/oop.cpp b/src/hotspot/share/oops/oop.cpp similarity index 100% rename from hotspot/src/share/vm/oops/oop.cpp rename to src/hotspot/share/oops/oop.cpp diff --git a/hotspot/src/share/vm/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp similarity index 100% rename from hotspot/src/share/vm/oops/oop.hpp rename to src/hotspot/share/oops/oop.hpp diff --git a/hotspot/src/share/vm/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp similarity index 100% rename from hotspot/src/share/vm/oops/oop.inline.hpp rename to src/hotspot/share/oops/oop.inline.hpp diff --git a/hotspot/src/share/vm/oops/oopHandle.hpp b/src/hotspot/share/oops/oopHandle.hpp similarity index 100% rename from hotspot/src/share/vm/oops/oopHandle.hpp rename to src/hotspot/share/oops/oopHandle.hpp diff --git a/hotspot/src/share/vm/oops/oopsHierarchy.cpp b/src/hotspot/share/oops/oopsHierarchy.cpp similarity index 100% rename from hotspot/src/share/vm/oops/oopsHierarchy.cpp rename to src/hotspot/share/oops/oopsHierarchy.cpp diff --git a/hotspot/src/share/vm/oops/oopsHierarchy.hpp b/src/hotspot/share/oops/oopsHierarchy.hpp similarity index 100% rename from hotspot/src/share/vm/oops/oopsHierarchy.hpp rename to src/hotspot/share/oops/oopsHierarchy.hpp diff --git a/hotspot/src/share/vm/oops/symbol.cpp b/src/hotspot/share/oops/symbol.cpp similarity index 100% rename from hotspot/src/share/vm/oops/symbol.cpp rename to src/hotspot/share/oops/symbol.cpp diff --git a/hotspot/src/share/vm/oops/symbol.hpp b/src/hotspot/share/oops/symbol.hpp similarity index 100% rename from hotspot/src/share/vm/oops/symbol.hpp rename to src/hotspot/share/oops/symbol.hpp diff --git a/hotspot/src/share/vm/oops/typeArrayKlass.cpp b/src/hotspot/share/oops/typeArrayKlass.cpp similarity index 100% rename from hotspot/src/share/vm/oops/typeArrayKlass.cpp rename to src/hotspot/share/oops/typeArrayKlass.cpp diff --git a/hotspot/src/share/vm/oops/typeArrayKlass.hpp b/src/hotspot/share/oops/typeArrayKlass.hpp similarity index 100% rename from hotspot/src/share/vm/oops/typeArrayKlass.hpp rename to src/hotspot/share/oops/typeArrayKlass.hpp diff --git a/hotspot/src/share/vm/oops/typeArrayKlass.inline.hpp b/src/hotspot/share/oops/typeArrayKlass.inline.hpp similarity index 100% rename from hotspot/src/share/vm/oops/typeArrayKlass.inline.hpp rename to src/hotspot/share/oops/typeArrayKlass.inline.hpp diff --git a/hotspot/src/share/vm/oops/typeArrayOop.hpp b/src/hotspot/share/oops/typeArrayOop.hpp similarity index 100% rename from hotspot/src/share/vm/oops/typeArrayOop.hpp rename to src/hotspot/share/oops/typeArrayOop.hpp diff --git a/hotspot/src/share/vm/oops/typeArrayOop.inline.hpp b/src/hotspot/share/oops/typeArrayOop.inline.hpp similarity index 100% rename from hotspot/src/share/vm/oops/typeArrayOop.inline.hpp rename to src/hotspot/share/oops/typeArrayOop.inline.hpp diff --git a/hotspot/src/share/vm/oops/verifyOopClosure.hpp b/src/hotspot/share/oops/verifyOopClosure.hpp similarity index 100% rename from hotspot/src/share/vm/oops/verifyOopClosure.hpp rename to src/hotspot/share/oops/verifyOopClosure.hpp diff --git a/hotspot/src/share/vm/opto/ad.hpp b/src/hotspot/share/opto/ad.hpp similarity index 100% rename from hotspot/src/share/vm/opto/ad.hpp rename to src/hotspot/share/opto/ad.hpp diff --git a/hotspot/src/share/vm/opto/addnode.cpp b/src/hotspot/share/opto/addnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/addnode.cpp rename to src/hotspot/share/opto/addnode.cpp diff --git a/hotspot/src/share/vm/opto/addnode.hpp b/src/hotspot/share/opto/addnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/addnode.hpp rename to src/hotspot/share/opto/addnode.hpp diff --git a/hotspot/src/share/vm/opto/adlcVMDeps.hpp b/src/hotspot/share/opto/adlcVMDeps.hpp similarity index 100% rename from hotspot/src/share/vm/opto/adlcVMDeps.hpp rename to src/hotspot/share/opto/adlcVMDeps.hpp diff --git a/hotspot/src/share/vm/opto/arraycopynode.cpp b/src/hotspot/share/opto/arraycopynode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/arraycopynode.cpp rename to src/hotspot/share/opto/arraycopynode.cpp diff --git a/hotspot/src/share/vm/opto/arraycopynode.hpp b/src/hotspot/share/opto/arraycopynode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/arraycopynode.hpp rename to src/hotspot/share/opto/arraycopynode.hpp diff --git a/hotspot/src/share/vm/opto/block.cpp b/src/hotspot/share/opto/block.cpp similarity index 100% rename from hotspot/src/share/vm/opto/block.cpp rename to src/hotspot/share/opto/block.cpp diff --git a/hotspot/src/share/vm/opto/block.hpp b/src/hotspot/share/opto/block.hpp similarity index 100% rename from hotspot/src/share/vm/opto/block.hpp rename to src/hotspot/share/opto/block.hpp diff --git a/hotspot/src/share/vm/opto/buildOopMap.cpp b/src/hotspot/share/opto/buildOopMap.cpp similarity index 100% rename from hotspot/src/share/vm/opto/buildOopMap.cpp rename to src/hotspot/share/opto/buildOopMap.cpp diff --git a/hotspot/src/share/vm/opto/bytecodeInfo.cpp b/src/hotspot/share/opto/bytecodeInfo.cpp similarity index 100% rename from hotspot/src/share/vm/opto/bytecodeInfo.cpp rename to src/hotspot/share/opto/bytecodeInfo.cpp diff --git a/hotspot/src/share/vm/opto/c2_globals.cpp b/src/hotspot/share/opto/c2_globals.cpp similarity index 100% rename from hotspot/src/share/vm/opto/c2_globals.cpp rename to src/hotspot/share/opto/c2_globals.cpp diff --git a/hotspot/src/share/vm/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp similarity index 100% rename from hotspot/src/share/vm/opto/c2_globals.hpp rename to src/hotspot/share/opto/c2_globals.hpp diff --git a/hotspot/src/share/vm/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp similarity index 100% rename from hotspot/src/share/vm/opto/c2compiler.cpp rename to src/hotspot/share/opto/c2compiler.cpp diff --git a/hotspot/src/share/vm/opto/c2compiler.hpp b/src/hotspot/share/opto/c2compiler.hpp similarity index 100% rename from hotspot/src/share/vm/opto/c2compiler.hpp rename to src/hotspot/share/opto/c2compiler.hpp diff --git a/hotspot/src/share/vm/opto/callGenerator.cpp b/src/hotspot/share/opto/callGenerator.cpp similarity index 100% rename from hotspot/src/share/vm/opto/callGenerator.cpp rename to src/hotspot/share/opto/callGenerator.cpp diff --git a/hotspot/src/share/vm/opto/callGenerator.hpp b/src/hotspot/share/opto/callGenerator.hpp similarity index 100% rename from hotspot/src/share/vm/opto/callGenerator.hpp rename to src/hotspot/share/opto/callGenerator.hpp diff --git a/hotspot/src/share/vm/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/callnode.cpp rename to src/hotspot/share/opto/callnode.cpp diff --git a/hotspot/src/share/vm/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/callnode.hpp rename to src/hotspot/share/opto/callnode.hpp diff --git a/hotspot/src/share/vm/opto/castnode.cpp b/src/hotspot/share/opto/castnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/castnode.cpp rename to src/hotspot/share/opto/castnode.cpp diff --git a/hotspot/src/share/vm/opto/castnode.hpp b/src/hotspot/share/opto/castnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/castnode.hpp rename to src/hotspot/share/opto/castnode.hpp diff --git a/hotspot/src/share/vm/opto/cfgnode.cpp b/src/hotspot/share/opto/cfgnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/cfgnode.cpp rename to src/hotspot/share/opto/cfgnode.cpp diff --git a/hotspot/src/share/vm/opto/cfgnode.hpp b/src/hotspot/share/opto/cfgnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/cfgnode.hpp rename to src/hotspot/share/opto/cfgnode.hpp diff --git a/hotspot/src/share/vm/opto/chaitin.cpp b/src/hotspot/share/opto/chaitin.cpp similarity index 100% rename from hotspot/src/share/vm/opto/chaitin.cpp rename to src/hotspot/share/opto/chaitin.cpp diff --git a/hotspot/src/share/vm/opto/chaitin.hpp b/src/hotspot/share/opto/chaitin.hpp similarity index 100% rename from hotspot/src/share/vm/opto/chaitin.hpp rename to src/hotspot/share/opto/chaitin.hpp diff --git a/hotspot/src/share/vm/opto/classes.cpp b/src/hotspot/share/opto/classes.cpp similarity index 100% rename from hotspot/src/share/vm/opto/classes.cpp rename to src/hotspot/share/opto/classes.cpp diff --git a/hotspot/src/share/vm/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp similarity index 100% rename from hotspot/src/share/vm/opto/classes.hpp rename to src/hotspot/share/opto/classes.hpp diff --git a/hotspot/src/share/vm/opto/coalesce.cpp b/src/hotspot/share/opto/coalesce.cpp similarity index 100% rename from hotspot/src/share/vm/opto/coalesce.cpp rename to src/hotspot/share/opto/coalesce.cpp diff --git a/hotspot/src/share/vm/opto/coalesce.hpp b/src/hotspot/share/opto/coalesce.hpp similarity index 100% rename from hotspot/src/share/vm/opto/coalesce.hpp rename to src/hotspot/share/opto/coalesce.hpp diff --git a/hotspot/src/share/vm/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp similarity index 100% rename from hotspot/src/share/vm/opto/compile.cpp rename to src/hotspot/share/opto/compile.cpp diff --git a/hotspot/src/share/vm/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp similarity index 100% rename from hotspot/src/share/vm/opto/compile.hpp rename to src/hotspot/share/opto/compile.hpp diff --git a/hotspot/src/share/vm/opto/connode.cpp b/src/hotspot/share/opto/connode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/connode.cpp rename to src/hotspot/share/opto/connode.cpp diff --git a/hotspot/src/share/vm/opto/connode.hpp b/src/hotspot/share/opto/connode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/connode.hpp rename to src/hotspot/share/opto/connode.hpp diff --git a/hotspot/src/share/vm/opto/convertnode.cpp b/src/hotspot/share/opto/convertnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/convertnode.cpp rename to src/hotspot/share/opto/convertnode.cpp diff --git a/hotspot/src/share/vm/opto/convertnode.hpp b/src/hotspot/share/opto/convertnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/convertnode.hpp rename to src/hotspot/share/opto/convertnode.hpp diff --git a/hotspot/src/share/vm/opto/countbitsnode.cpp b/src/hotspot/share/opto/countbitsnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/countbitsnode.cpp rename to src/hotspot/share/opto/countbitsnode.cpp diff --git a/hotspot/src/share/vm/opto/countbitsnode.hpp b/src/hotspot/share/opto/countbitsnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/countbitsnode.hpp rename to src/hotspot/share/opto/countbitsnode.hpp diff --git a/hotspot/src/share/vm/opto/divnode.cpp b/src/hotspot/share/opto/divnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/divnode.cpp rename to src/hotspot/share/opto/divnode.cpp diff --git a/hotspot/src/share/vm/opto/divnode.hpp b/src/hotspot/share/opto/divnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/divnode.hpp rename to src/hotspot/share/opto/divnode.hpp diff --git a/hotspot/src/share/vm/opto/doCall.cpp b/src/hotspot/share/opto/doCall.cpp similarity index 100% rename from hotspot/src/share/vm/opto/doCall.cpp rename to src/hotspot/share/opto/doCall.cpp diff --git a/hotspot/src/share/vm/opto/domgraph.cpp b/src/hotspot/share/opto/domgraph.cpp similarity index 100% rename from hotspot/src/share/vm/opto/domgraph.cpp rename to src/hotspot/share/opto/domgraph.cpp diff --git a/hotspot/src/share/vm/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp similarity index 100% rename from hotspot/src/share/vm/opto/escape.cpp rename to src/hotspot/share/opto/escape.cpp diff --git a/hotspot/src/share/vm/opto/escape.hpp b/src/hotspot/share/opto/escape.hpp similarity index 100% rename from hotspot/src/share/vm/opto/escape.hpp rename to src/hotspot/share/opto/escape.hpp diff --git a/hotspot/src/share/vm/opto/gcm.cpp b/src/hotspot/share/opto/gcm.cpp similarity index 100% rename from hotspot/src/share/vm/opto/gcm.cpp rename to src/hotspot/share/opto/gcm.cpp diff --git a/hotspot/src/share/vm/opto/generateOptoStub.cpp b/src/hotspot/share/opto/generateOptoStub.cpp similarity index 100% rename from hotspot/src/share/vm/opto/generateOptoStub.cpp rename to src/hotspot/share/opto/generateOptoStub.cpp diff --git a/hotspot/src/share/vm/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp similarity index 100% rename from hotspot/src/share/vm/opto/graphKit.cpp rename to src/hotspot/share/opto/graphKit.cpp diff --git a/hotspot/src/share/vm/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp similarity index 100% rename from hotspot/src/share/vm/opto/graphKit.hpp rename to src/hotspot/share/opto/graphKit.hpp diff --git a/hotspot/src/share/vm/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp similarity index 100% rename from hotspot/src/share/vm/opto/idealGraphPrinter.cpp rename to src/hotspot/share/opto/idealGraphPrinter.cpp diff --git a/hotspot/src/share/vm/opto/idealGraphPrinter.hpp b/src/hotspot/share/opto/idealGraphPrinter.hpp similarity index 100% rename from hotspot/src/share/vm/opto/idealGraphPrinter.hpp rename to src/hotspot/share/opto/idealGraphPrinter.hpp diff --git a/hotspot/src/share/vm/opto/idealKit.cpp b/src/hotspot/share/opto/idealKit.cpp similarity index 100% rename from hotspot/src/share/vm/opto/idealKit.cpp rename to src/hotspot/share/opto/idealKit.cpp diff --git a/hotspot/src/share/vm/opto/idealKit.hpp b/src/hotspot/share/opto/idealKit.hpp similarity index 100% rename from hotspot/src/share/vm/opto/idealKit.hpp rename to src/hotspot/share/opto/idealKit.hpp diff --git a/hotspot/src/share/vm/opto/ifg.cpp b/src/hotspot/share/opto/ifg.cpp similarity index 100% rename from hotspot/src/share/vm/opto/ifg.cpp rename to src/hotspot/share/opto/ifg.cpp diff --git a/hotspot/src/share/vm/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/ifnode.cpp rename to src/hotspot/share/opto/ifnode.cpp diff --git a/hotspot/src/share/vm/opto/indexSet.cpp b/src/hotspot/share/opto/indexSet.cpp similarity index 100% rename from hotspot/src/share/vm/opto/indexSet.cpp rename to src/hotspot/share/opto/indexSet.cpp diff --git a/hotspot/src/share/vm/opto/indexSet.hpp b/src/hotspot/share/opto/indexSet.hpp similarity index 100% rename from hotspot/src/share/vm/opto/indexSet.hpp rename to src/hotspot/share/opto/indexSet.hpp diff --git a/hotspot/src/share/vm/opto/intrinsicnode.cpp b/src/hotspot/share/opto/intrinsicnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/intrinsicnode.cpp rename to src/hotspot/share/opto/intrinsicnode.cpp diff --git a/hotspot/src/share/vm/opto/intrinsicnode.hpp b/src/hotspot/share/opto/intrinsicnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/intrinsicnode.hpp rename to src/hotspot/share/opto/intrinsicnode.hpp diff --git a/hotspot/src/share/vm/opto/lcm.cpp b/src/hotspot/share/opto/lcm.cpp similarity index 100% rename from hotspot/src/share/vm/opto/lcm.cpp rename to src/hotspot/share/opto/lcm.cpp diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp similarity index 100% rename from hotspot/src/share/vm/opto/library_call.cpp rename to src/hotspot/share/opto/library_call.cpp diff --git a/hotspot/src/share/vm/opto/live.cpp b/src/hotspot/share/opto/live.cpp similarity index 100% rename from hotspot/src/share/vm/opto/live.cpp rename to src/hotspot/share/opto/live.cpp diff --git a/hotspot/src/share/vm/opto/live.hpp b/src/hotspot/share/opto/live.hpp similarity index 100% rename from hotspot/src/share/vm/opto/live.hpp rename to src/hotspot/share/opto/live.hpp diff --git a/hotspot/src/share/vm/opto/locknode.cpp b/src/hotspot/share/opto/locknode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/locknode.cpp rename to src/hotspot/share/opto/locknode.cpp diff --git a/hotspot/src/share/vm/opto/locknode.hpp b/src/hotspot/share/opto/locknode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/locknode.hpp rename to src/hotspot/share/opto/locknode.hpp diff --git a/hotspot/src/share/vm/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp similarity index 100% rename from hotspot/src/share/vm/opto/loopPredicate.cpp rename to src/hotspot/share/opto/loopPredicate.cpp diff --git a/hotspot/src/share/vm/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp similarity index 100% rename from hotspot/src/share/vm/opto/loopTransform.cpp rename to src/hotspot/share/opto/loopTransform.cpp diff --git a/hotspot/src/share/vm/opto/loopUnswitch.cpp b/src/hotspot/share/opto/loopUnswitch.cpp similarity index 100% rename from hotspot/src/share/vm/opto/loopUnswitch.cpp rename to src/hotspot/share/opto/loopUnswitch.cpp diff --git a/hotspot/src/share/vm/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/loopnode.cpp rename to src/hotspot/share/opto/loopnode.cpp diff --git a/hotspot/src/share/vm/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/loopnode.hpp rename to src/hotspot/share/opto/loopnode.hpp diff --git a/hotspot/src/share/vm/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp similarity index 100% rename from hotspot/src/share/vm/opto/loopopts.cpp rename to src/hotspot/share/opto/loopopts.cpp diff --git a/hotspot/src/share/vm/opto/machnode.cpp b/src/hotspot/share/opto/machnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/machnode.cpp rename to src/hotspot/share/opto/machnode.cpp diff --git a/hotspot/src/share/vm/opto/machnode.hpp b/src/hotspot/share/opto/machnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/machnode.hpp rename to src/hotspot/share/opto/machnode.hpp diff --git a/hotspot/src/share/vm/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp similarity index 100% rename from hotspot/src/share/vm/opto/macro.cpp rename to src/hotspot/share/opto/macro.cpp diff --git a/hotspot/src/share/vm/opto/macro.hpp b/src/hotspot/share/opto/macro.hpp similarity index 100% rename from hotspot/src/share/vm/opto/macro.hpp rename to src/hotspot/share/opto/macro.hpp diff --git a/hotspot/src/share/vm/opto/macroArrayCopy.cpp b/src/hotspot/share/opto/macroArrayCopy.cpp similarity index 100% rename from hotspot/src/share/vm/opto/macroArrayCopy.cpp rename to src/hotspot/share/opto/macroArrayCopy.cpp diff --git a/hotspot/src/share/vm/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp similarity index 100% rename from hotspot/src/share/vm/opto/matcher.cpp rename to src/hotspot/share/opto/matcher.cpp diff --git a/hotspot/src/share/vm/opto/matcher.hpp b/src/hotspot/share/opto/matcher.hpp similarity index 100% rename from hotspot/src/share/vm/opto/matcher.hpp rename to src/hotspot/share/opto/matcher.hpp diff --git a/hotspot/src/share/vm/opto/mathexactnode.cpp b/src/hotspot/share/opto/mathexactnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/mathexactnode.cpp rename to src/hotspot/share/opto/mathexactnode.cpp diff --git a/hotspot/src/share/vm/opto/mathexactnode.hpp b/src/hotspot/share/opto/mathexactnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/mathexactnode.hpp rename to src/hotspot/share/opto/mathexactnode.hpp diff --git a/hotspot/src/share/vm/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/memnode.cpp rename to src/hotspot/share/opto/memnode.cpp diff --git a/hotspot/src/share/vm/opto/memnode.hpp b/src/hotspot/share/opto/memnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/memnode.hpp rename to src/hotspot/share/opto/memnode.hpp diff --git a/hotspot/src/share/vm/opto/movenode.cpp b/src/hotspot/share/opto/movenode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/movenode.cpp rename to src/hotspot/share/opto/movenode.cpp diff --git a/hotspot/src/share/vm/opto/movenode.hpp b/src/hotspot/share/opto/movenode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/movenode.hpp rename to src/hotspot/share/opto/movenode.hpp diff --git a/hotspot/src/share/vm/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/mulnode.cpp rename to src/hotspot/share/opto/mulnode.cpp diff --git a/hotspot/src/share/vm/opto/mulnode.hpp b/src/hotspot/share/opto/mulnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/mulnode.hpp rename to src/hotspot/share/opto/mulnode.hpp diff --git a/hotspot/src/share/vm/opto/multnode.cpp b/src/hotspot/share/opto/multnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/multnode.cpp rename to src/hotspot/share/opto/multnode.cpp diff --git a/hotspot/src/share/vm/opto/multnode.hpp b/src/hotspot/share/opto/multnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/multnode.hpp rename to src/hotspot/share/opto/multnode.hpp diff --git a/hotspot/src/share/vm/opto/narrowptrnode.cpp b/src/hotspot/share/opto/narrowptrnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/narrowptrnode.cpp rename to src/hotspot/share/opto/narrowptrnode.cpp diff --git a/hotspot/src/share/vm/opto/narrowptrnode.hpp b/src/hotspot/share/opto/narrowptrnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/narrowptrnode.hpp rename to src/hotspot/share/opto/narrowptrnode.hpp diff --git a/hotspot/src/share/vm/opto/node.cpp b/src/hotspot/share/opto/node.cpp similarity index 100% rename from hotspot/src/share/vm/opto/node.cpp rename to src/hotspot/share/opto/node.cpp diff --git a/hotspot/src/share/vm/opto/node.hpp b/src/hotspot/share/opto/node.hpp similarity index 100% rename from hotspot/src/share/vm/opto/node.hpp rename to src/hotspot/share/opto/node.hpp diff --git a/hotspot/src/share/vm/opto/opaquenode.cpp b/src/hotspot/share/opto/opaquenode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/opaquenode.cpp rename to src/hotspot/share/opto/opaquenode.cpp diff --git a/hotspot/src/share/vm/opto/opaquenode.hpp b/src/hotspot/share/opto/opaquenode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/opaquenode.hpp rename to src/hotspot/share/opto/opaquenode.hpp diff --git a/hotspot/src/share/vm/opto/opcodes.cpp b/src/hotspot/share/opto/opcodes.cpp similarity index 100% rename from hotspot/src/share/vm/opto/opcodes.cpp rename to src/hotspot/share/opto/opcodes.cpp diff --git a/hotspot/src/share/vm/opto/opcodes.hpp b/src/hotspot/share/opto/opcodes.hpp similarity index 100% rename from hotspot/src/share/vm/opto/opcodes.hpp rename to src/hotspot/share/opto/opcodes.hpp diff --git a/hotspot/src/share/vm/opto/optoreg.hpp b/src/hotspot/share/opto/optoreg.hpp similarity index 100% rename from hotspot/src/share/vm/opto/optoreg.hpp rename to src/hotspot/share/opto/optoreg.hpp diff --git a/hotspot/src/share/vm/opto/output.cpp b/src/hotspot/share/opto/output.cpp similarity index 100% rename from hotspot/src/share/vm/opto/output.cpp rename to src/hotspot/share/opto/output.cpp diff --git a/hotspot/src/share/vm/opto/output.hpp b/src/hotspot/share/opto/output.hpp similarity index 100% rename from hotspot/src/share/vm/opto/output.hpp rename to src/hotspot/share/opto/output.hpp diff --git a/hotspot/src/share/vm/opto/parse.hpp b/src/hotspot/share/opto/parse.hpp similarity index 100% rename from hotspot/src/share/vm/opto/parse.hpp rename to src/hotspot/share/opto/parse.hpp diff --git a/hotspot/src/share/vm/opto/parse1.cpp b/src/hotspot/share/opto/parse1.cpp similarity index 100% rename from hotspot/src/share/vm/opto/parse1.cpp rename to src/hotspot/share/opto/parse1.cpp diff --git a/hotspot/src/share/vm/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp similarity index 100% rename from hotspot/src/share/vm/opto/parse2.cpp rename to src/hotspot/share/opto/parse2.cpp diff --git a/hotspot/src/share/vm/opto/parse3.cpp b/src/hotspot/share/opto/parse3.cpp similarity index 100% rename from hotspot/src/share/vm/opto/parse3.cpp rename to src/hotspot/share/opto/parse3.cpp diff --git a/hotspot/src/share/vm/opto/parseHelper.cpp b/src/hotspot/share/opto/parseHelper.cpp similarity index 100% rename from hotspot/src/share/vm/opto/parseHelper.cpp rename to src/hotspot/share/opto/parseHelper.cpp diff --git a/hotspot/src/share/vm/opto/phase.cpp b/src/hotspot/share/opto/phase.cpp similarity index 100% rename from hotspot/src/share/vm/opto/phase.cpp rename to src/hotspot/share/opto/phase.cpp diff --git a/hotspot/src/share/vm/opto/phase.hpp b/src/hotspot/share/opto/phase.hpp similarity index 100% rename from hotspot/src/share/vm/opto/phase.hpp rename to src/hotspot/share/opto/phase.hpp diff --git a/hotspot/src/share/vm/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp similarity index 100% rename from hotspot/src/share/vm/opto/phaseX.cpp rename to src/hotspot/share/opto/phaseX.cpp diff --git a/hotspot/src/share/vm/opto/phaseX.hpp b/src/hotspot/share/opto/phaseX.hpp similarity index 100% rename from hotspot/src/share/vm/opto/phaseX.hpp rename to src/hotspot/share/opto/phaseX.hpp diff --git a/hotspot/src/share/vm/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp similarity index 100% rename from hotspot/src/share/vm/opto/phasetype.hpp rename to src/hotspot/share/opto/phasetype.hpp diff --git a/hotspot/src/share/vm/opto/postaloc.cpp b/src/hotspot/share/opto/postaloc.cpp similarity index 100% rename from hotspot/src/share/vm/opto/postaloc.cpp rename to src/hotspot/share/opto/postaloc.cpp diff --git a/hotspot/src/share/vm/opto/reg_split.cpp b/src/hotspot/share/opto/reg_split.cpp similarity index 100% rename from hotspot/src/share/vm/opto/reg_split.cpp rename to src/hotspot/share/opto/reg_split.cpp diff --git a/hotspot/src/share/vm/opto/regalloc.cpp b/src/hotspot/share/opto/regalloc.cpp similarity index 100% rename from hotspot/src/share/vm/opto/regalloc.cpp rename to src/hotspot/share/opto/regalloc.cpp diff --git a/hotspot/src/share/vm/opto/regalloc.hpp b/src/hotspot/share/opto/regalloc.hpp similarity index 100% rename from hotspot/src/share/vm/opto/regalloc.hpp rename to src/hotspot/share/opto/regalloc.hpp diff --git a/hotspot/src/share/vm/opto/regmask.cpp b/src/hotspot/share/opto/regmask.cpp similarity index 100% rename from hotspot/src/share/vm/opto/regmask.cpp rename to src/hotspot/share/opto/regmask.cpp diff --git a/hotspot/src/share/vm/opto/regmask.hpp b/src/hotspot/share/opto/regmask.hpp similarity index 100% rename from hotspot/src/share/vm/opto/regmask.hpp rename to src/hotspot/share/opto/regmask.hpp diff --git a/hotspot/src/share/vm/opto/replacednodes.cpp b/src/hotspot/share/opto/replacednodes.cpp similarity index 100% rename from hotspot/src/share/vm/opto/replacednodes.cpp rename to src/hotspot/share/opto/replacednodes.cpp diff --git a/hotspot/src/share/vm/opto/replacednodes.hpp b/src/hotspot/share/opto/replacednodes.hpp similarity index 100% rename from hotspot/src/share/vm/opto/replacednodes.hpp rename to src/hotspot/share/opto/replacednodes.hpp diff --git a/hotspot/src/share/vm/opto/rootnode.cpp b/src/hotspot/share/opto/rootnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/rootnode.cpp rename to src/hotspot/share/opto/rootnode.cpp diff --git a/hotspot/src/share/vm/opto/rootnode.hpp b/src/hotspot/share/opto/rootnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/rootnode.hpp rename to src/hotspot/share/opto/rootnode.hpp diff --git a/hotspot/src/share/vm/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp similarity index 100% rename from hotspot/src/share/vm/opto/runtime.cpp rename to src/hotspot/share/opto/runtime.cpp diff --git a/hotspot/src/share/vm/opto/runtime.hpp b/src/hotspot/share/opto/runtime.hpp similarity index 100% rename from hotspot/src/share/vm/opto/runtime.hpp rename to src/hotspot/share/opto/runtime.hpp diff --git a/hotspot/src/share/vm/opto/split_if.cpp b/src/hotspot/share/opto/split_if.cpp similarity index 100% rename from hotspot/src/share/vm/opto/split_if.cpp rename to src/hotspot/share/opto/split_if.cpp diff --git a/hotspot/src/share/vm/opto/stringopts.cpp b/src/hotspot/share/opto/stringopts.cpp similarity index 100% rename from hotspot/src/share/vm/opto/stringopts.cpp rename to src/hotspot/share/opto/stringopts.cpp diff --git a/hotspot/src/share/vm/opto/stringopts.hpp b/src/hotspot/share/opto/stringopts.hpp similarity index 100% rename from hotspot/src/share/vm/opto/stringopts.hpp rename to src/hotspot/share/opto/stringopts.hpp diff --git a/hotspot/src/share/vm/opto/subnode.cpp b/src/hotspot/share/opto/subnode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/subnode.cpp rename to src/hotspot/share/opto/subnode.cpp diff --git a/hotspot/src/share/vm/opto/subnode.hpp b/src/hotspot/share/opto/subnode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/subnode.hpp rename to src/hotspot/share/opto/subnode.hpp diff --git a/hotspot/src/share/vm/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp similarity index 100% rename from hotspot/src/share/vm/opto/superword.cpp rename to src/hotspot/share/opto/superword.cpp diff --git a/hotspot/src/share/vm/opto/superword.hpp b/src/hotspot/share/opto/superword.hpp similarity index 100% rename from hotspot/src/share/vm/opto/superword.hpp rename to src/hotspot/share/opto/superword.hpp diff --git a/hotspot/src/share/vm/opto/type.cpp b/src/hotspot/share/opto/type.cpp similarity index 100% rename from hotspot/src/share/vm/opto/type.cpp rename to src/hotspot/share/opto/type.cpp diff --git a/hotspot/src/share/vm/opto/type.hpp b/src/hotspot/share/opto/type.hpp similarity index 100% rename from hotspot/src/share/vm/opto/type.hpp rename to src/hotspot/share/opto/type.hpp diff --git a/hotspot/src/share/vm/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp similarity index 100% rename from hotspot/src/share/vm/opto/vectornode.cpp rename to src/hotspot/share/opto/vectornode.cpp diff --git a/hotspot/src/share/vm/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp similarity index 100% rename from hotspot/src/share/vm/opto/vectornode.hpp rename to src/hotspot/share/opto/vectornode.hpp diff --git a/hotspot/src/share/vm/precompiled/precompiled.hpp b/src/hotspot/share/precompiled/precompiled.hpp similarity index 100% rename from hotspot/src/share/vm/precompiled/precompiled.hpp rename to src/hotspot/share/precompiled/precompiled.hpp diff --git a/hotspot/src/share/vm/prims/evmCompat.cpp b/src/hotspot/share/prims/evmCompat.cpp similarity index 100% rename from hotspot/src/share/vm/prims/evmCompat.cpp rename to src/hotspot/share/prims/evmCompat.cpp diff --git a/hotspot/src/share/vm/prims/forte.cpp b/src/hotspot/share/prims/forte.cpp similarity index 100% rename from hotspot/src/share/vm/prims/forte.cpp rename to src/hotspot/share/prims/forte.cpp diff --git a/hotspot/src/share/vm/prims/forte.hpp b/src/hotspot/share/prims/forte.hpp similarity index 100% rename from hotspot/src/share/vm/prims/forte.hpp rename to src/hotspot/share/prims/forte.hpp diff --git a/hotspot/src/share/vm/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jni.cpp rename to src/hotspot/share/prims/jni.cpp diff --git a/hotspot/src/share/vm/prims/jni.h b/src/hotspot/share/prims/jni.h similarity index 100% rename from hotspot/src/share/vm/prims/jni.h rename to src/hotspot/share/prims/jni.h diff --git a/hotspot/src/share/vm/prims/jniCheck.cpp b/src/hotspot/share/prims/jniCheck.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jniCheck.cpp rename to src/hotspot/share/prims/jniCheck.cpp diff --git a/hotspot/src/share/vm/prims/jniCheck.hpp b/src/hotspot/share/prims/jniCheck.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jniCheck.hpp rename to src/hotspot/share/prims/jniCheck.hpp diff --git a/hotspot/src/share/vm/prims/jniExport.hpp b/src/hotspot/share/prims/jniExport.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jniExport.hpp rename to src/hotspot/share/prims/jniExport.hpp diff --git a/hotspot/src/share/vm/prims/jniFastGetField.cpp b/src/hotspot/share/prims/jniFastGetField.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jniFastGetField.cpp rename to src/hotspot/share/prims/jniFastGetField.cpp diff --git a/hotspot/src/share/vm/prims/jniFastGetField.hpp b/src/hotspot/share/prims/jniFastGetField.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jniFastGetField.hpp rename to src/hotspot/share/prims/jniFastGetField.hpp diff --git a/hotspot/src/share/vm/prims/jni_md.h b/src/hotspot/share/prims/jni_md.h similarity index 100% rename from hotspot/src/share/vm/prims/jni_md.h rename to src/hotspot/share/prims/jni_md.h diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvm.cpp rename to src/hotspot/share/prims/jvm.cpp diff --git a/hotspot/src/share/vm/prims/jvm.h b/src/hotspot/share/prims/jvm.h similarity index 100% rename from hotspot/src/share/vm/prims/jvm.h rename to src/hotspot/share/prims/jvm.h diff --git a/hotspot/src/share/vm/prims/jvm_misc.hpp b/src/hotspot/share/prims/jvm_misc.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvm_misc.hpp rename to src/hotspot/share/prims/jvm_misc.hpp diff --git a/hotspot/src/share/vm/prims/jvmti.xml b/src/hotspot/share/prims/jvmti.xml similarity index 100% rename from hotspot/src/share/vm/prims/jvmti.xml rename to src/hotspot/share/prims/jvmti.xml diff --git a/hotspot/src/share/vm/prims/jvmti.xsl b/src/hotspot/share/prims/jvmti.xsl similarity index 100% rename from hotspot/src/share/vm/prims/jvmti.xsl rename to src/hotspot/share/prims/jvmti.xsl diff --git a/hotspot/src/share/vm/prims/jvmtiAgentThread.hpp b/src/hotspot/share/prims/jvmtiAgentThread.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiAgentThread.hpp rename to src/hotspot/share/prims/jvmtiAgentThread.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp b/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp rename to src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp b/src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp rename to src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp b/src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp rename to src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.hpp b/src/hotspot/share/prims/jvmtiCodeBlobEvents.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.hpp rename to src/hotspot/share/prims/jvmtiCodeBlobEvents.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiEnter.hpp b/src/hotspot/share/prims/jvmtiEnter.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiEnter.hpp rename to src/hotspot/share/prims/jvmtiEnter.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiEnter.xsl b/src/hotspot/share/prims/jvmtiEnter.xsl similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiEnter.xsl rename to src/hotspot/share/prims/jvmtiEnter.xsl diff --git a/hotspot/src/share/vm/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiEnv.cpp rename to src/hotspot/share/prims/jvmtiEnv.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiEnv.xsl b/src/hotspot/share/prims/jvmtiEnv.xsl similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiEnv.xsl rename to src/hotspot/share/prims/jvmtiEnv.xsl diff --git a/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiEnvBase.cpp rename to src/hotspot/share/prims/jvmtiEnvBase.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp b/src/hotspot/share/prims/jvmtiEnvBase.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiEnvBase.hpp rename to src/hotspot/share/prims/jvmtiEnvBase.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiEnvFill.java b/src/hotspot/share/prims/jvmtiEnvFill.java similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiEnvFill.java rename to src/hotspot/share/prims/jvmtiEnvFill.java diff --git a/hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp b/src/hotspot/share/prims/jvmtiEnvThreadState.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp rename to src/hotspot/share/prims/jvmtiEnvThreadState.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiEnvThreadState.hpp b/src/hotspot/share/prims/jvmtiEnvThreadState.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiEnvThreadState.hpp rename to src/hotspot/share/prims/jvmtiEnvThreadState.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiEventController.cpp b/src/hotspot/share/prims/jvmtiEventController.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiEventController.cpp rename to src/hotspot/share/prims/jvmtiEventController.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiEventController.hpp b/src/hotspot/share/prims/jvmtiEventController.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiEventController.hpp rename to src/hotspot/share/prims/jvmtiEventController.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiEventController.inline.hpp b/src/hotspot/share/prims/jvmtiEventController.inline.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiEventController.inline.hpp rename to src/hotspot/share/prims/jvmtiEventController.inline.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiExport.cpp rename to src/hotspot/share/prims/jvmtiExport.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiExport.hpp b/src/hotspot/share/prims/jvmtiExport.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiExport.hpp rename to src/hotspot/share/prims/jvmtiExport.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiExtensions.cpp b/src/hotspot/share/prims/jvmtiExtensions.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiExtensions.cpp rename to src/hotspot/share/prims/jvmtiExtensions.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiExtensions.hpp b/src/hotspot/share/prims/jvmtiExtensions.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiExtensions.hpp rename to src/hotspot/share/prims/jvmtiExtensions.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiGen.java b/src/hotspot/share/prims/jvmtiGen.java similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiGen.java rename to src/hotspot/share/prims/jvmtiGen.java diff --git a/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp rename to src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.hpp b/src/hotspot/share/prims/jvmtiGetLoadedClasses.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.hpp rename to src/hotspot/share/prims/jvmtiGetLoadedClasses.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiH.xsl b/src/hotspot/share/prims/jvmtiH.xsl similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiH.xsl rename to src/hotspot/share/prims/jvmtiH.xsl diff --git a/hotspot/src/share/vm/prims/jvmtiHpp.xsl b/src/hotspot/share/prims/jvmtiHpp.xsl similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiHpp.xsl rename to src/hotspot/share/prims/jvmtiHpp.xsl diff --git a/hotspot/src/share/vm/prims/jvmtiImpl.cpp b/src/hotspot/share/prims/jvmtiImpl.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiImpl.cpp rename to src/hotspot/share/prims/jvmtiImpl.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiImpl.hpp b/src/hotspot/share/prims/jvmtiImpl.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiImpl.hpp rename to src/hotspot/share/prims/jvmtiImpl.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiLib.xsl b/src/hotspot/share/prims/jvmtiLib.xsl similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiLib.xsl rename to src/hotspot/share/prims/jvmtiLib.xsl diff --git a/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp b/src/hotspot/share/prims/jvmtiManageCapabilities.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp rename to src/hotspot/share/prims/jvmtiManageCapabilities.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiManageCapabilities.hpp b/src/hotspot/share/prims/jvmtiManageCapabilities.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiManageCapabilities.hpp rename to src/hotspot/share/prims/jvmtiManageCapabilities.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiRawMonitor.cpp b/src/hotspot/share/prims/jvmtiRawMonitor.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiRawMonitor.cpp rename to src/hotspot/share/prims/jvmtiRawMonitor.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiRawMonitor.hpp b/src/hotspot/share/prims/jvmtiRawMonitor.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiRawMonitor.hpp rename to src/hotspot/share/prims/jvmtiRawMonitor.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp rename to src/hotspot/share/prims/jvmtiRedefineClasses.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiRedefineClasses.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp rename to src/hotspot/share/prims/jvmtiRedefineClasses.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp b/src/hotspot/share/prims/jvmtiTagMap.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiTagMap.cpp rename to src/hotspot/share/prims/jvmtiTagMap.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiTagMap.hpp b/src/hotspot/share/prims/jvmtiTagMap.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiTagMap.hpp rename to src/hotspot/share/prims/jvmtiTagMap.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiThreadState.cpp b/src/hotspot/share/prims/jvmtiThreadState.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiThreadState.cpp rename to src/hotspot/share/prims/jvmtiThreadState.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiThreadState.hpp b/src/hotspot/share/prims/jvmtiThreadState.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiThreadState.hpp rename to src/hotspot/share/prims/jvmtiThreadState.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiThreadState.inline.hpp b/src/hotspot/share/prims/jvmtiThreadState.inline.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiThreadState.inline.hpp rename to src/hotspot/share/prims/jvmtiThreadState.inline.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiTrace.cpp b/src/hotspot/share/prims/jvmtiTrace.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiTrace.cpp rename to src/hotspot/share/prims/jvmtiTrace.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiTrace.hpp b/src/hotspot/share/prims/jvmtiTrace.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiTrace.hpp rename to src/hotspot/share/prims/jvmtiTrace.hpp diff --git a/hotspot/src/share/vm/prims/jvmtiUtil.cpp b/src/hotspot/share/prims/jvmtiUtil.cpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiUtil.cpp rename to src/hotspot/share/prims/jvmtiUtil.cpp diff --git a/hotspot/src/share/vm/prims/jvmtiUtil.hpp b/src/hotspot/share/prims/jvmtiUtil.hpp similarity index 100% rename from hotspot/src/share/vm/prims/jvmtiUtil.hpp rename to src/hotspot/share/prims/jvmtiUtil.hpp diff --git a/hotspot/src/share/vm/prims/methodComparator.cpp b/src/hotspot/share/prims/methodComparator.cpp similarity index 100% rename from hotspot/src/share/vm/prims/methodComparator.cpp rename to src/hotspot/share/prims/methodComparator.cpp diff --git a/hotspot/src/share/vm/prims/methodComparator.hpp b/src/hotspot/share/prims/methodComparator.hpp similarity index 100% rename from hotspot/src/share/vm/prims/methodComparator.hpp rename to src/hotspot/share/prims/methodComparator.hpp diff --git a/hotspot/src/share/vm/prims/methodHandles.cpp b/src/hotspot/share/prims/methodHandles.cpp similarity index 100% rename from hotspot/src/share/vm/prims/methodHandles.cpp rename to src/hotspot/share/prims/methodHandles.cpp diff --git a/hotspot/src/share/vm/prims/methodHandles.hpp b/src/hotspot/share/prims/methodHandles.hpp similarity index 100% rename from hotspot/src/share/vm/prims/methodHandles.hpp rename to src/hotspot/share/prims/methodHandles.hpp diff --git a/hotspot/src/share/vm/prims/nativeLookup.cpp b/src/hotspot/share/prims/nativeLookup.cpp similarity index 100% rename from hotspot/src/share/vm/prims/nativeLookup.cpp rename to src/hotspot/share/prims/nativeLookup.cpp diff --git a/hotspot/src/share/vm/prims/nativeLookup.hpp b/src/hotspot/share/prims/nativeLookup.hpp similarity index 100% rename from hotspot/src/share/vm/prims/nativeLookup.hpp rename to src/hotspot/share/prims/nativeLookup.hpp diff --git a/hotspot/src/share/vm/prims/perf.cpp b/src/hotspot/share/prims/perf.cpp similarity index 100% rename from hotspot/src/share/vm/prims/perf.cpp rename to src/hotspot/share/prims/perf.cpp diff --git a/hotspot/src/share/vm/prims/privilegedStack.cpp b/src/hotspot/share/prims/privilegedStack.cpp similarity index 100% rename from hotspot/src/share/vm/prims/privilegedStack.cpp rename to src/hotspot/share/prims/privilegedStack.cpp diff --git a/hotspot/src/share/vm/prims/privilegedStack.hpp b/src/hotspot/share/prims/privilegedStack.hpp similarity index 100% rename from hotspot/src/share/vm/prims/privilegedStack.hpp rename to src/hotspot/share/prims/privilegedStack.hpp diff --git a/hotspot/src/share/vm/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp similarity index 100% rename from hotspot/src/share/vm/prims/resolvedMethodTable.cpp rename to src/hotspot/share/prims/resolvedMethodTable.cpp diff --git a/hotspot/src/share/vm/prims/resolvedMethodTable.hpp b/src/hotspot/share/prims/resolvedMethodTable.hpp similarity index 100% rename from hotspot/src/share/vm/prims/resolvedMethodTable.hpp rename to src/hotspot/share/prims/resolvedMethodTable.hpp diff --git a/hotspot/src/share/vm/prims/stackwalk.cpp b/src/hotspot/share/prims/stackwalk.cpp similarity index 100% rename from hotspot/src/share/vm/prims/stackwalk.cpp rename to src/hotspot/share/prims/stackwalk.cpp diff --git a/hotspot/src/share/vm/prims/stackwalk.hpp b/src/hotspot/share/prims/stackwalk.hpp similarity index 100% rename from hotspot/src/share/vm/prims/stackwalk.hpp rename to src/hotspot/share/prims/stackwalk.hpp diff --git a/hotspot/src/share/vm/prims/unsafe.cpp b/src/hotspot/share/prims/unsafe.cpp similarity index 100% rename from hotspot/src/share/vm/prims/unsafe.cpp rename to src/hotspot/share/prims/unsafe.cpp diff --git a/hotspot/src/share/vm/prims/unsafe.hpp b/src/hotspot/share/prims/unsafe.hpp similarity index 100% rename from hotspot/src/share/vm/prims/unsafe.hpp rename to src/hotspot/share/prims/unsafe.hpp diff --git a/hotspot/src/share/vm/prims/wbtestmethods/parserTests.cpp b/src/hotspot/share/prims/wbtestmethods/parserTests.cpp similarity index 100% rename from hotspot/src/share/vm/prims/wbtestmethods/parserTests.cpp rename to src/hotspot/share/prims/wbtestmethods/parserTests.cpp diff --git a/hotspot/src/share/vm/prims/wbtestmethods/parserTests.hpp b/src/hotspot/share/prims/wbtestmethods/parserTests.hpp similarity index 100% rename from hotspot/src/share/vm/prims/wbtestmethods/parserTests.hpp rename to src/hotspot/share/prims/wbtestmethods/parserTests.hpp diff --git a/hotspot/src/share/vm/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp similarity index 100% rename from hotspot/src/share/vm/prims/whitebox.cpp rename to src/hotspot/share/prims/whitebox.cpp diff --git a/hotspot/src/share/vm/prims/whitebox.hpp b/src/hotspot/share/prims/whitebox.hpp similarity index 100% rename from hotspot/src/share/vm/prims/whitebox.hpp rename to src/hotspot/share/prims/whitebox.hpp diff --git a/hotspot/src/share/vm/prims/whitebox_ext.cpp b/src/hotspot/share/prims/whitebox_ext.cpp similarity index 100% rename from hotspot/src/share/vm/prims/whitebox_ext.cpp rename to src/hotspot/share/prims/whitebox_ext.cpp diff --git a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp b/src/hotspot/share/runtime/advancedThresholdPolicy.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp rename to src/hotspot/share/runtime/advancedThresholdPolicy.cpp diff --git a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp b/src/hotspot/share/runtime/advancedThresholdPolicy.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp rename to src/hotspot/share/runtime/advancedThresholdPolicy.hpp diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/arguments.cpp rename to src/hotspot/share/runtime/arguments.cpp diff --git a/hotspot/src/share/vm/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/arguments.hpp rename to src/hotspot/share/runtime/arguments.hpp diff --git a/hotspot/src/share/vm/runtime/arguments_ext.cpp b/src/hotspot/share/runtime/arguments_ext.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/arguments_ext.cpp rename to src/hotspot/share/runtime/arguments_ext.cpp diff --git a/hotspot/src/share/vm/runtime/arguments_ext.hpp b/src/hotspot/share/runtime/arguments_ext.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/arguments_ext.hpp rename to src/hotspot/share/runtime/arguments_ext.hpp diff --git a/hotspot/src/share/vm/runtime/atomic.hpp b/src/hotspot/share/runtime/atomic.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/atomic.hpp rename to src/hotspot/share/runtime/atomic.hpp diff --git a/hotspot/src/share/vm/runtime/basicLock.cpp b/src/hotspot/share/runtime/basicLock.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/basicLock.cpp rename to src/hotspot/share/runtime/basicLock.cpp diff --git a/hotspot/src/share/vm/runtime/basicLock.hpp b/src/hotspot/share/runtime/basicLock.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/basicLock.hpp rename to src/hotspot/share/runtime/basicLock.hpp diff --git a/hotspot/src/share/vm/runtime/biasedLocking.cpp b/src/hotspot/share/runtime/biasedLocking.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/biasedLocking.cpp rename to src/hotspot/share/runtime/biasedLocking.cpp diff --git a/hotspot/src/share/vm/runtime/biasedLocking.hpp b/src/hotspot/share/runtime/biasedLocking.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/biasedLocking.hpp rename to src/hotspot/share/runtime/biasedLocking.hpp diff --git a/hotspot/src/share/vm/runtime/commandLineFlagConstraintList.cpp b/src/hotspot/share/runtime/commandLineFlagConstraintList.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/commandLineFlagConstraintList.cpp rename to src/hotspot/share/runtime/commandLineFlagConstraintList.cpp diff --git a/hotspot/src/share/vm/runtime/commandLineFlagConstraintList.hpp b/src/hotspot/share/runtime/commandLineFlagConstraintList.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/commandLineFlagConstraintList.hpp rename to src/hotspot/share/runtime/commandLineFlagConstraintList.hpp diff --git a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp b/src/hotspot/share/runtime/commandLineFlagConstraintsCompiler.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp rename to src/hotspot/share/runtime/commandLineFlagConstraintsCompiler.cpp diff --git a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.hpp b/src/hotspot/share/runtime/commandLineFlagConstraintsCompiler.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.hpp rename to src/hotspot/share/runtime/commandLineFlagConstraintsCompiler.hpp diff --git a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsGC.cpp b/src/hotspot/share/runtime/commandLineFlagConstraintsGC.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/commandLineFlagConstraintsGC.cpp rename to src/hotspot/share/runtime/commandLineFlagConstraintsGC.cpp diff --git a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsGC.hpp b/src/hotspot/share/runtime/commandLineFlagConstraintsGC.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/commandLineFlagConstraintsGC.hpp rename to src/hotspot/share/runtime/commandLineFlagConstraintsGC.hpp diff --git a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsRuntime.cpp b/src/hotspot/share/runtime/commandLineFlagConstraintsRuntime.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/commandLineFlagConstraintsRuntime.cpp rename to src/hotspot/share/runtime/commandLineFlagConstraintsRuntime.cpp diff --git a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsRuntime.hpp b/src/hotspot/share/runtime/commandLineFlagConstraintsRuntime.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/commandLineFlagConstraintsRuntime.hpp rename to src/hotspot/share/runtime/commandLineFlagConstraintsRuntime.hpp diff --git a/hotspot/src/share/vm/runtime/commandLineFlagRangeList.cpp b/src/hotspot/share/runtime/commandLineFlagRangeList.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/commandLineFlagRangeList.cpp rename to src/hotspot/share/runtime/commandLineFlagRangeList.cpp diff --git a/hotspot/src/share/vm/runtime/commandLineFlagRangeList.hpp b/src/hotspot/share/runtime/commandLineFlagRangeList.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/commandLineFlagRangeList.hpp rename to src/hotspot/share/runtime/commandLineFlagRangeList.hpp diff --git a/hotspot/src/share/vm/runtime/commandLineFlagWriteableList.cpp b/src/hotspot/share/runtime/commandLineFlagWriteableList.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/commandLineFlagWriteableList.cpp rename to src/hotspot/share/runtime/commandLineFlagWriteableList.cpp diff --git a/hotspot/src/share/vm/runtime/commandLineFlagWriteableList.hpp b/src/hotspot/share/runtime/commandLineFlagWriteableList.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/commandLineFlagWriteableList.hpp rename to src/hotspot/share/runtime/commandLineFlagWriteableList.hpp diff --git a/hotspot/src/share/vm/runtime/compilationPolicy.cpp b/src/hotspot/share/runtime/compilationPolicy.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/compilationPolicy.cpp rename to src/hotspot/share/runtime/compilationPolicy.cpp diff --git a/hotspot/src/share/vm/runtime/compilationPolicy.hpp b/src/hotspot/share/runtime/compilationPolicy.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/compilationPolicy.hpp rename to src/hotspot/share/runtime/compilationPolicy.hpp diff --git a/hotspot/src/share/vm/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/deoptimization.cpp rename to src/hotspot/share/runtime/deoptimization.cpp diff --git a/hotspot/src/share/vm/runtime/deoptimization.hpp b/src/hotspot/share/runtime/deoptimization.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/deoptimization.hpp rename to src/hotspot/share/runtime/deoptimization.hpp diff --git a/hotspot/src/share/vm/runtime/extendedPC.hpp b/src/hotspot/share/runtime/extendedPC.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/extendedPC.hpp rename to src/hotspot/share/runtime/extendedPC.hpp diff --git a/hotspot/src/share/vm/runtime/fieldDescriptor.cpp b/src/hotspot/share/runtime/fieldDescriptor.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/fieldDescriptor.cpp rename to src/hotspot/share/runtime/fieldDescriptor.cpp diff --git a/hotspot/src/share/vm/runtime/fieldDescriptor.hpp b/src/hotspot/share/runtime/fieldDescriptor.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/fieldDescriptor.hpp rename to src/hotspot/share/runtime/fieldDescriptor.hpp diff --git a/hotspot/src/share/vm/runtime/fieldType.cpp b/src/hotspot/share/runtime/fieldType.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/fieldType.cpp rename to src/hotspot/share/runtime/fieldType.cpp diff --git a/hotspot/src/share/vm/runtime/fieldType.hpp b/src/hotspot/share/runtime/fieldType.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/fieldType.hpp rename to src/hotspot/share/runtime/fieldType.hpp diff --git a/hotspot/src/share/vm/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/frame.cpp rename to src/hotspot/share/runtime/frame.cpp diff --git a/hotspot/src/share/vm/runtime/frame.hpp b/src/hotspot/share/runtime/frame.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/frame.hpp rename to src/hotspot/share/runtime/frame.hpp diff --git a/hotspot/src/share/vm/runtime/frame.inline.hpp b/src/hotspot/share/runtime/frame.inline.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/frame.inline.hpp rename to src/hotspot/share/runtime/frame.inline.hpp diff --git a/hotspot/src/share/vm/runtime/globals.cpp b/src/hotspot/share/runtime/globals.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/globals.cpp rename to src/hotspot/share/runtime/globals.cpp diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/globals.hpp rename to src/hotspot/share/runtime/globals.hpp diff --git a/hotspot/src/share/vm/runtime/globals_ext.hpp b/src/hotspot/share/runtime/globals_ext.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/globals_ext.hpp rename to src/hotspot/share/runtime/globals_ext.hpp diff --git a/hotspot/src/share/vm/runtime/globals_extension.hpp b/src/hotspot/share/runtime/globals_extension.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/globals_extension.hpp rename to src/hotspot/share/runtime/globals_extension.hpp diff --git a/hotspot/src/share/vm/runtime/handles.cpp b/src/hotspot/share/runtime/handles.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/handles.cpp rename to src/hotspot/share/runtime/handles.cpp diff --git a/hotspot/src/share/vm/runtime/handles.hpp b/src/hotspot/share/runtime/handles.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/handles.hpp rename to src/hotspot/share/runtime/handles.hpp diff --git a/hotspot/src/share/vm/runtime/handles.inline.hpp b/src/hotspot/share/runtime/handles.inline.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/handles.inline.hpp rename to src/hotspot/share/runtime/handles.inline.hpp diff --git a/hotspot/src/share/vm/runtime/icache.cpp b/src/hotspot/share/runtime/icache.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/icache.cpp rename to src/hotspot/share/runtime/icache.cpp diff --git a/hotspot/src/share/vm/runtime/icache.hpp b/src/hotspot/share/runtime/icache.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/icache.hpp rename to src/hotspot/share/runtime/icache.hpp diff --git a/hotspot/src/share/vm/runtime/init.cpp b/src/hotspot/share/runtime/init.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/init.cpp rename to src/hotspot/share/runtime/init.cpp diff --git a/hotspot/src/share/vm/runtime/init.hpp b/src/hotspot/share/runtime/init.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/init.hpp rename to src/hotspot/share/runtime/init.hpp diff --git a/hotspot/src/share/vm/runtime/interfaceSupport.cpp b/src/hotspot/share/runtime/interfaceSupport.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/interfaceSupport.cpp rename to src/hotspot/share/runtime/interfaceSupport.cpp diff --git a/hotspot/src/share/vm/runtime/interfaceSupport.hpp b/src/hotspot/share/runtime/interfaceSupport.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/interfaceSupport.hpp rename to src/hotspot/share/runtime/interfaceSupport.hpp diff --git a/hotspot/src/share/vm/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/java.cpp rename to src/hotspot/share/runtime/java.cpp diff --git a/hotspot/src/share/vm/runtime/java.hpp b/src/hotspot/share/runtime/java.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/java.hpp rename to src/hotspot/share/runtime/java.hpp diff --git a/hotspot/src/share/vm/runtime/javaCalls.cpp b/src/hotspot/share/runtime/javaCalls.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/javaCalls.cpp rename to src/hotspot/share/runtime/javaCalls.cpp diff --git a/hotspot/src/share/vm/runtime/javaCalls.hpp b/src/hotspot/share/runtime/javaCalls.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/javaCalls.hpp rename to src/hotspot/share/runtime/javaCalls.hpp diff --git a/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp b/src/hotspot/share/runtime/javaFrameAnchor.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/javaFrameAnchor.hpp rename to src/hotspot/share/runtime/javaFrameAnchor.hpp diff --git a/hotspot/src/share/vm/runtime/jfieldIDWorkaround.hpp b/src/hotspot/share/runtime/jfieldIDWorkaround.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/jfieldIDWorkaround.hpp rename to src/hotspot/share/runtime/jfieldIDWorkaround.hpp diff --git a/hotspot/src/share/vm/runtime/jniHandles.cpp b/src/hotspot/share/runtime/jniHandles.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/jniHandles.cpp rename to src/hotspot/share/runtime/jniHandles.cpp diff --git a/hotspot/src/share/vm/runtime/jniHandles.hpp b/src/hotspot/share/runtime/jniHandles.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/jniHandles.hpp rename to src/hotspot/share/runtime/jniHandles.hpp diff --git a/hotspot/src/share/vm/runtime/jniPeriodicChecker.cpp b/src/hotspot/share/runtime/jniPeriodicChecker.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/jniPeriodicChecker.cpp rename to src/hotspot/share/runtime/jniPeriodicChecker.cpp diff --git a/hotspot/src/share/vm/runtime/jniPeriodicChecker.hpp b/src/hotspot/share/runtime/jniPeriodicChecker.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/jniPeriodicChecker.hpp rename to src/hotspot/share/runtime/jniPeriodicChecker.hpp diff --git a/hotspot/src/share/vm/runtime/memprofiler.cpp b/src/hotspot/share/runtime/memprofiler.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/memprofiler.cpp rename to src/hotspot/share/runtime/memprofiler.cpp diff --git a/hotspot/src/share/vm/runtime/memprofiler.hpp b/src/hotspot/share/runtime/memprofiler.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/memprofiler.hpp rename to src/hotspot/share/runtime/memprofiler.hpp diff --git a/hotspot/src/share/vm/runtime/monitorChunk.cpp b/src/hotspot/share/runtime/monitorChunk.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/monitorChunk.cpp rename to src/hotspot/share/runtime/monitorChunk.cpp diff --git a/hotspot/src/share/vm/runtime/monitorChunk.hpp b/src/hotspot/share/runtime/monitorChunk.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/monitorChunk.hpp rename to src/hotspot/share/runtime/monitorChunk.hpp diff --git a/hotspot/src/share/vm/runtime/mutex.cpp b/src/hotspot/share/runtime/mutex.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/mutex.cpp rename to src/hotspot/share/runtime/mutex.cpp diff --git a/hotspot/src/share/vm/runtime/mutex.hpp b/src/hotspot/share/runtime/mutex.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/mutex.hpp rename to src/hotspot/share/runtime/mutex.hpp diff --git a/hotspot/src/share/vm/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/mutexLocker.cpp rename to src/hotspot/share/runtime/mutexLocker.cpp diff --git a/hotspot/src/share/vm/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/mutexLocker.hpp rename to src/hotspot/share/runtime/mutexLocker.hpp diff --git a/hotspot/src/share/vm/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/objectMonitor.cpp rename to src/hotspot/share/runtime/objectMonitor.cpp diff --git a/hotspot/src/share/vm/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/objectMonitor.hpp rename to src/hotspot/share/runtime/objectMonitor.hpp diff --git a/hotspot/src/share/vm/runtime/objectMonitor.inline.hpp b/src/hotspot/share/runtime/objectMonitor.inline.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/objectMonitor.inline.hpp rename to src/hotspot/share/runtime/objectMonitor.inline.hpp diff --git a/hotspot/src/share/vm/runtime/orderAccess.cpp b/src/hotspot/share/runtime/orderAccess.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/orderAccess.cpp rename to src/hotspot/share/runtime/orderAccess.cpp diff --git a/hotspot/src/share/vm/runtime/orderAccess.hpp b/src/hotspot/share/runtime/orderAccess.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/orderAccess.hpp rename to src/hotspot/share/runtime/orderAccess.hpp diff --git a/hotspot/src/share/vm/runtime/orderAccess.inline.hpp b/src/hotspot/share/runtime/orderAccess.inline.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/orderAccess.inline.hpp rename to src/hotspot/share/runtime/orderAccess.inline.hpp diff --git a/hotspot/src/share/vm/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/os.cpp rename to src/hotspot/share/runtime/os.cpp diff --git a/hotspot/src/share/vm/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/os.hpp rename to src/hotspot/share/runtime/os.hpp diff --git a/hotspot/src/share/vm/runtime/os.inline.hpp b/src/hotspot/share/runtime/os.inline.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/os.inline.hpp rename to src/hotspot/share/runtime/os.inline.hpp diff --git a/hotspot/src/share/vm/runtime/osThread.cpp b/src/hotspot/share/runtime/osThread.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/osThread.cpp rename to src/hotspot/share/runtime/osThread.cpp diff --git a/hotspot/src/share/vm/runtime/osThread.hpp b/src/hotspot/share/runtime/osThread.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/osThread.hpp rename to src/hotspot/share/runtime/osThread.hpp diff --git a/hotspot/src/share/vm/runtime/os_ext.hpp b/src/hotspot/share/runtime/os_ext.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/os_ext.hpp rename to src/hotspot/share/runtime/os_ext.hpp diff --git a/hotspot/src/share/vm/runtime/park.cpp b/src/hotspot/share/runtime/park.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/park.cpp rename to src/hotspot/share/runtime/park.cpp diff --git a/hotspot/src/share/vm/runtime/park.hpp b/src/hotspot/share/runtime/park.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/park.hpp rename to src/hotspot/share/runtime/park.hpp diff --git a/hotspot/src/share/vm/runtime/perfData.cpp b/src/hotspot/share/runtime/perfData.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/perfData.cpp rename to src/hotspot/share/runtime/perfData.cpp diff --git a/hotspot/src/share/vm/runtime/perfData.hpp b/src/hotspot/share/runtime/perfData.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/perfData.hpp rename to src/hotspot/share/runtime/perfData.hpp diff --git a/hotspot/src/share/vm/runtime/perfMemory.cpp b/src/hotspot/share/runtime/perfMemory.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/perfMemory.cpp rename to src/hotspot/share/runtime/perfMemory.cpp diff --git a/hotspot/src/share/vm/runtime/perfMemory.hpp b/src/hotspot/share/runtime/perfMemory.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/perfMemory.hpp rename to src/hotspot/share/runtime/perfMemory.hpp diff --git a/hotspot/src/share/vm/runtime/prefetch.hpp b/src/hotspot/share/runtime/prefetch.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/prefetch.hpp rename to src/hotspot/share/runtime/prefetch.hpp diff --git a/hotspot/src/share/vm/runtime/prefetch.inline.hpp b/src/hotspot/share/runtime/prefetch.inline.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/prefetch.inline.hpp rename to src/hotspot/share/runtime/prefetch.inline.hpp diff --git a/hotspot/src/share/vm/runtime/reflection.cpp b/src/hotspot/share/runtime/reflection.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/reflection.cpp rename to src/hotspot/share/runtime/reflection.cpp diff --git a/hotspot/src/share/vm/runtime/reflection.hpp b/src/hotspot/share/runtime/reflection.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/reflection.hpp rename to src/hotspot/share/runtime/reflection.hpp diff --git a/hotspot/src/share/vm/runtime/reflectionUtils.cpp b/src/hotspot/share/runtime/reflectionUtils.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/reflectionUtils.cpp rename to src/hotspot/share/runtime/reflectionUtils.cpp diff --git a/hotspot/src/share/vm/runtime/reflectionUtils.hpp b/src/hotspot/share/runtime/reflectionUtils.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/reflectionUtils.hpp rename to src/hotspot/share/runtime/reflectionUtils.hpp diff --git a/hotspot/src/share/vm/runtime/registerMap.hpp b/src/hotspot/share/runtime/registerMap.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/registerMap.hpp rename to src/hotspot/share/runtime/registerMap.hpp diff --git a/hotspot/src/share/vm/runtime/relocator.cpp b/src/hotspot/share/runtime/relocator.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/relocator.cpp rename to src/hotspot/share/runtime/relocator.cpp diff --git a/hotspot/src/share/vm/runtime/relocator.hpp b/src/hotspot/share/runtime/relocator.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/relocator.hpp rename to src/hotspot/share/runtime/relocator.hpp diff --git a/hotspot/src/share/vm/runtime/rframe.cpp b/src/hotspot/share/runtime/rframe.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/rframe.cpp rename to src/hotspot/share/runtime/rframe.cpp diff --git a/hotspot/src/share/vm/runtime/rframe.hpp b/src/hotspot/share/runtime/rframe.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/rframe.hpp rename to src/hotspot/share/runtime/rframe.hpp diff --git a/hotspot/src/share/vm/runtime/rtmLocking.cpp b/src/hotspot/share/runtime/rtmLocking.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/rtmLocking.cpp rename to src/hotspot/share/runtime/rtmLocking.cpp diff --git a/hotspot/src/share/vm/runtime/rtmLocking.hpp b/src/hotspot/share/runtime/rtmLocking.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/rtmLocking.hpp rename to src/hotspot/share/runtime/rtmLocking.hpp diff --git a/hotspot/src/share/vm/runtime/safepoint.cpp b/src/hotspot/share/runtime/safepoint.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/safepoint.cpp rename to src/hotspot/share/runtime/safepoint.cpp diff --git a/hotspot/src/share/vm/runtime/safepoint.hpp b/src/hotspot/share/runtime/safepoint.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/safepoint.hpp rename to src/hotspot/share/runtime/safepoint.hpp diff --git a/hotspot/src/share/vm/runtime/semaphore.hpp b/src/hotspot/share/runtime/semaphore.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/semaphore.hpp rename to src/hotspot/share/runtime/semaphore.hpp diff --git a/hotspot/src/share/vm/runtime/serviceThread.cpp b/src/hotspot/share/runtime/serviceThread.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/serviceThread.cpp rename to src/hotspot/share/runtime/serviceThread.cpp diff --git a/hotspot/src/share/vm/runtime/serviceThread.hpp b/src/hotspot/share/runtime/serviceThread.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/serviceThread.hpp rename to src/hotspot/share/runtime/serviceThread.hpp diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/sharedRuntime.cpp rename to src/hotspot/share/runtime/sharedRuntime.cpp diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/sharedRuntime.hpp rename to src/hotspot/share/runtime/sharedRuntime.hpp diff --git a/hotspot/src/share/vm/runtime/sharedRuntimeMath.hpp b/src/hotspot/share/runtime/sharedRuntimeMath.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/sharedRuntimeMath.hpp rename to src/hotspot/share/runtime/sharedRuntimeMath.hpp diff --git a/hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp b/src/hotspot/share/runtime/sharedRuntimeTrans.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp rename to src/hotspot/share/runtime/sharedRuntimeTrans.cpp diff --git a/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp b/src/hotspot/share/runtime/sharedRuntimeTrig.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp rename to src/hotspot/share/runtime/sharedRuntimeTrig.cpp diff --git a/hotspot/src/share/vm/runtime/signature.cpp b/src/hotspot/share/runtime/signature.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/signature.cpp rename to src/hotspot/share/runtime/signature.cpp diff --git a/hotspot/src/share/vm/runtime/signature.hpp b/src/hotspot/share/runtime/signature.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/signature.hpp rename to src/hotspot/share/runtime/signature.hpp diff --git a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp b/src/hotspot/share/runtime/simpleThresholdPolicy.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp rename to src/hotspot/share/runtime/simpleThresholdPolicy.cpp diff --git a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp b/src/hotspot/share/runtime/simpleThresholdPolicy.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp rename to src/hotspot/share/runtime/simpleThresholdPolicy.hpp diff --git a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp b/src/hotspot/share/runtime/simpleThresholdPolicy.inline.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp rename to src/hotspot/share/runtime/simpleThresholdPolicy.inline.hpp diff --git a/hotspot/src/share/vm/runtime/stackValue.cpp b/src/hotspot/share/runtime/stackValue.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/stackValue.cpp rename to src/hotspot/share/runtime/stackValue.cpp diff --git a/hotspot/src/share/vm/runtime/stackValue.hpp b/src/hotspot/share/runtime/stackValue.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/stackValue.hpp rename to src/hotspot/share/runtime/stackValue.hpp diff --git a/hotspot/src/share/vm/runtime/stackValueCollection.cpp b/src/hotspot/share/runtime/stackValueCollection.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/stackValueCollection.cpp rename to src/hotspot/share/runtime/stackValueCollection.cpp diff --git a/hotspot/src/share/vm/runtime/stackValueCollection.hpp b/src/hotspot/share/runtime/stackValueCollection.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/stackValueCollection.hpp rename to src/hotspot/share/runtime/stackValueCollection.hpp diff --git a/hotspot/src/share/vm/runtime/statSampler.cpp b/src/hotspot/share/runtime/statSampler.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/statSampler.cpp rename to src/hotspot/share/runtime/statSampler.cpp diff --git a/hotspot/src/share/vm/runtime/statSampler.hpp b/src/hotspot/share/runtime/statSampler.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/statSampler.hpp rename to src/hotspot/share/runtime/statSampler.hpp diff --git a/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp b/src/hotspot/share/runtime/stubCodeGenerator.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/stubCodeGenerator.cpp rename to src/hotspot/share/runtime/stubCodeGenerator.cpp diff --git a/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp b/src/hotspot/share/runtime/stubCodeGenerator.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/stubCodeGenerator.hpp rename to src/hotspot/share/runtime/stubCodeGenerator.hpp diff --git a/hotspot/src/share/vm/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/stubRoutines.cpp rename to src/hotspot/share/runtime/stubRoutines.cpp diff --git a/hotspot/src/share/vm/runtime/stubRoutines.hpp b/src/hotspot/share/runtime/stubRoutines.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/stubRoutines.hpp rename to src/hotspot/share/runtime/stubRoutines.hpp diff --git a/hotspot/src/share/vm/runtime/sweeper.cpp b/src/hotspot/share/runtime/sweeper.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/sweeper.cpp rename to src/hotspot/share/runtime/sweeper.cpp diff --git a/hotspot/src/share/vm/runtime/sweeper.hpp b/src/hotspot/share/runtime/sweeper.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/sweeper.hpp rename to src/hotspot/share/runtime/sweeper.hpp diff --git a/hotspot/src/share/vm/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/synchronizer.cpp rename to src/hotspot/share/runtime/synchronizer.cpp diff --git a/hotspot/src/share/vm/runtime/synchronizer.hpp b/src/hotspot/share/runtime/synchronizer.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/synchronizer.hpp rename to src/hotspot/share/runtime/synchronizer.hpp diff --git a/hotspot/src/share/vm/runtime/task.cpp b/src/hotspot/share/runtime/task.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/task.cpp rename to src/hotspot/share/runtime/task.cpp diff --git a/hotspot/src/share/vm/runtime/task.hpp b/src/hotspot/share/runtime/task.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/task.hpp rename to src/hotspot/share/runtime/task.hpp diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/thread.cpp rename to src/hotspot/share/runtime/thread.cpp diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/thread.hpp rename to src/hotspot/share/runtime/thread.hpp diff --git a/hotspot/src/share/vm/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/thread.inline.hpp rename to src/hotspot/share/runtime/thread.inline.hpp diff --git a/hotspot/src/share/vm/runtime/threadCritical.hpp b/src/hotspot/share/runtime/threadCritical.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/threadCritical.hpp rename to src/hotspot/share/runtime/threadCritical.hpp diff --git a/hotspot/src/share/vm/runtime/threadLocalStorage.hpp b/src/hotspot/share/runtime/threadLocalStorage.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/threadLocalStorage.hpp rename to src/hotspot/share/runtime/threadLocalStorage.hpp diff --git a/hotspot/src/share/vm/runtime/thread_ext.cpp b/src/hotspot/share/runtime/thread_ext.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/thread_ext.cpp rename to src/hotspot/share/runtime/thread_ext.cpp diff --git a/hotspot/src/share/vm/runtime/thread_ext.hpp b/src/hotspot/share/runtime/thread_ext.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/thread_ext.hpp rename to src/hotspot/share/runtime/thread_ext.hpp diff --git a/hotspot/src/share/vm/runtime/timer.cpp b/src/hotspot/share/runtime/timer.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/timer.cpp rename to src/hotspot/share/runtime/timer.cpp diff --git a/hotspot/src/share/vm/runtime/timer.hpp b/src/hotspot/share/runtime/timer.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/timer.hpp rename to src/hotspot/share/runtime/timer.hpp diff --git a/hotspot/src/share/vm/runtime/timerTrace.cpp b/src/hotspot/share/runtime/timerTrace.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/timerTrace.cpp rename to src/hotspot/share/runtime/timerTrace.cpp diff --git a/hotspot/src/share/vm/runtime/timerTrace.hpp b/src/hotspot/share/runtime/timerTrace.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/timerTrace.hpp rename to src/hotspot/share/runtime/timerTrace.hpp diff --git a/hotspot/src/share/vm/runtime/unhandledOops.cpp b/src/hotspot/share/runtime/unhandledOops.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/unhandledOops.cpp rename to src/hotspot/share/runtime/unhandledOops.cpp diff --git a/hotspot/src/share/vm/runtime/unhandledOops.hpp b/src/hotspot/share/runtime/unhandledOops.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/unhandledOops.hpp rename to src/hotspot/share/runtime/unhandledOops.hpp diff --git a/hotspot/src/share/vm/runtime/vframe.cpp b/src/hotspot/share/runtime/vframe.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/vframe.cpp rename to src/hotspot/share/runtime/vframe.cpp diff --git a/hotspot/src/share/vm/runtime/vframe.hpp b/src/hotspot/share/runtime/vframe.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/vframe.hpp rename to src/hotspot/share/runtime/vframe.hpp diff --git a/hotspot/src/share/vm/runtime/vframeArray.cpp b/src/hotspot/share/runtime/vframeArray.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/vframeArray.cpp rename to src/hotspot/share/runtime/vframeArray.cpp diff --git a/hotspot/src/share/vm/runtime/vframeArray.hpp b/src/hotspot/share/runtime/vframeArray.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/vframeArray.hpp rename to src/hotspot/share/runtime/vframeArray.hpp diff --git a/hotspot/src/share/vm/runtime/vframe_hp.cpp b/src/hotspot/share/runtime/vframe_hp.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/vframe_hp.cpp rename to src/hotspot/share/runtime/vframe_hp.cpp diff --git a/hotspot/src/share/vm/runtime/vframe_hp.hpp b/src/hotspot/share/runtime/vframe_hp.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/vframe_hp.hpp rename to src/hotspot/share/runtime/vframe_hp.hpp diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/vmStructs.cpp rename to src/hotspot/share/runtime/vmStructs.cpp diff --git a/hotspot/src/share/vm/runtime/vmStructs.hpp b/src/hotspot/share/runtime/vmStructs.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/vmStructs.hpp rename to src/hotspot/share/runtime/vmStructs.hpp diff --git a/hotspot/src/share/vm/runtime/vmStructs_ext.hpp b/src/hotspot/share/runtime/vmStructs_ext.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/vmStructs_ext.hpp rename to src/hotspot/share/runtime/vmStructs_ext.hpp diff --git a/hotspot/src/share/vm/runtime/vmStructs_trace.hpp b/src/hotspot/share/runtime/vmStructs_trace.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/vmStructs_trace.hpp rename to src/hotspot/share/runtime/vmStructs_trace.hpp diff --git a/hotspot/src/share/vm/runtime/vmThread.cpp b/src/hotspot/share/runtime/vmThread.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/vmThread.cpp rename to src/hotspot/share/runtime/vmThread.cpp diff --git a/hotspot/src/share/vm/runtime/vmThread.hpp b/src/hotspot/share/runtime/vmThread.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/vmThread.hpp rename to src/hotspot/share/runtime/vmThread.hpp diff --git a/hotspot/src/share/vm/runtime/vm_operations.cpp b/src/hotspot/share/runtime/vm_operations.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/vm_operations.cpp rename to src/hotspot/share/runtime/vm_operations.cpp diff --git a/hotspot/src/share/vm/runtime/vm_operations.hpp b/src/hotspot/share/runtime/vm_operations.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/vm_operations.hpp rename to src/hotspot/share/runtime/vm_operations.hpp diff --git a/hotspot/src/share/vm/runtime/vm_version.cpp b/src/hotspot/share/runtime/vm_version.cpp similarity index 100% rename from hotspot/src/share/vm/runtime/vm_version.cpp rename to src/hotspot/share/runtime/vm_version.cpp diff --git a/hotspot/src/share/vm/runtime/vm_version.hpp b/src/hotspot/share/runtime/vm_version.hpp similarity index 100% rename from hotspot/src/share/vm/runtime/vm_version.hpp rename to src/hotspot/share/runtime/vm_version.hpp diff --git a/hotspot/src/share/vm/services/allocationContextService.hpp b/src/hotspot/share/services/allocationContextService.hpp similarity index 100% rename from hotspot/src/share/vm/services/allocationContextService.hpp rename to src/hotspot/share/services/allocationContextService.hpp diff --git a/hotspot/src/share/vm/services/allocationSite.hpp b/src/hotspot/share/services/allocationSite.hpp similarity index 100% rename from hotspot/src/share/vm/services/allocationSite.hpp rename to src/hotspot/share/services/allocationSite.hpp diff --git a/hotspot/src/share/vm/services/attachListener.cpp b/src/hotspot/share/services/attachListener.cpp similarity index 100% rename from hotspot/src/share/vm/services/attachListener.cpp rename to src/hotspot/share/services/attachListener.cpp diff --git a/hotspot/src/share/vm/services/attachListener.hpp b/src/hotspot/share/services/attachListener.hpp similarity index 100% rename from hotspot/src/share/vm/services/attachListener.hpp rename to src/hotspot/share/services/attachListener.hpp diff --git a/hotspot/src/share/vm/services/classLoadingService.cpp b/src/hotspot/share/services/classLoadingService.cpp similarity index 100% rename from hotspot/src/share/vm/services/classLoadingService.cpp rename to src/hotspot/share/services/classLoadingService.cpp diff --git a/hotspot/src/share/vm/services/classLoadingService.hpp b/src/hotspot/share/services/classLoadingService.hpp similarity index 100% rename from hotspot/src/share/vm/services/classLoadingService.hpp rename to src/hotspot/share/services/classLoadingService.hpp diff --git a/hotspot/src/share/vm/services/diagnosticArgument.cpp b/src/hotspot/share/services/diagnosticArgument.cpp similarity index 100% rename from hotspot/src/share/vm/services/diagnosticArgument.cpp rename to src/hotspot/share/services/diagnosticArgument.cpp diff --git a/hotspot/src/share/vm/services/diagnosticArgument.hpp b/src/hotspot/share/services/diagnosticArgument.hpp similarity index 100% rename from hotspot/src/share/vm/services/diagnosticArgument.hpp rename to src/hotspot/share/services/diagnosticArgument.hpp diff --git a/hotspot/src/share/vm/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp similarity index 100% rename from hotspot/src/share/vm/services/diagnosticCommand.cpp rename to src/hotspot/share/services/diagnosticCommand.cpp diff --git a/hotspot/src/share/vm/services/diagnosticCommand.hpp b/src/hotspot/share/services/diagnosticCommand.hpp similarity index 100% rename from hotspot/src/share/vm/services/diagnosticCommand.hpp rename to src/hotspot/share/services/diagnosticCommand.hpp diff --git a/hotspot/src/share/vm/services/diagnosticCommand_ext.hpp b/src/hotspot/share/services/diagnosticCommand_ext.hpp similarity index 100% rename from hotspot/src/share/vm/services/diagnosticCommand_ext.hpp rename to src/hotspot/share/services/diagnosticCommand_ext.hpp diff --git a/hotspot/src/share/vm/services/diagnosticFramework.cpp b/src/hotspot/share/services/diagnosticFramework.cpp similarity index 100% rename from hotspot/src/share/vm/services/diagnosticFramework.cpp rename to src/hotspot/share/services/diagnosticFramework.cpp diff --git a/hotspot/src/share/vm/services/diagnosticFramework.hpp b/src/hotspot/share/services/diagnosticFramework.hpp similarity index 100% rename from hotspot/src/share/vm/services/diagnosticFramework.hpp rename to src/hotspot/share/services/diagnosticFramework.hpp diff --git a/hotspot/src/share/vm/services/dtraceAttacher.cpp b/src/hotspot/share/services/dtraceAttacher.cpp similarity index 100% rename from hotspot/src/share/vm/services/dtraceAttacher.cpp rename to src/hotspot/share/services/dtraceAttacher.cpp diff --git a/hotspot/src/share/vm/services/dtraceAttacher.hpp b/src/hotspot/share/services/dtraceAttacher.hpp similarity index 100% rename from hotspot/src/share/vm/services/dtraceAttacher.hpp rename to src/hotspot/share/services/dtraceAttacher.hpp diff --git a/hotspot/src/share/vm/services/g1MemoryPool.cpp b/src/hotspot/share/services/g1MemoryPool.cpp similarity index 100% rename from hotspot/src/share/vm/services/g1MemoryPool.cpp rename to src/hotspot/share/services/g1MemoryPool.cpp diff --git a/hotspot/src/share/vm/services/g1MemoryPool.hpp b/src/hotspot/share/services/g1MemoryPool.hpp similarity index 100% rename from hotspot/src/share/vm/services/g1MemoryPool.hpp rename to src/hotspot/share/services/g1MemoryPool.hpp diff --git a/hotspot/src/share/vm/services/gcNotifier.cpp b/src/hotspot/share/services/gcNotifier.cpp similarity index 100% rename from hotspot/src/share/vm/services/gcNotifier.cpp rename to src/hotspot/share/services/gcNotifier.cpp diff --git a/hotspot/src/share/vm/services/gcNotifier.hpp b/src/hotspot/share/services/gcNotifier.hpp similarity index 100% rename from hotspot/src/share/vm/services/gcNotifier.hpp rename to src/hotspot/share/services/gcNotifier.hpp diff --git a/hotspot/src/share/vm/services/heapDumper.cpp b/src/hotspot/share/services/heapDumper.cpp similarity index 100% rename from hotspot/src/share/vm/services/heapDumper.cpp rename to src/hotspot/share/services/heapDumper.cpp diff --git a/hotspot/src/share/vm/services/heapDumper.hpp b/src/hotspot/share/services/heapDumper.hpp similarity index 100% rename from hotspot/src/share/vm/services/heapDumper.hpp rename to src/hotspot/share/services/heapDumper.hpp diff --git a/hotspot/src/share/vm/services/jmm.h b/src/hotspot/share/services/jmm.h similarity index 100% rename from hotspot/src/share/vm/services/jmm.h rename to src/hotspot/share/services/jmm.h diff --git a/hotspot/src/share/vm/services/lowMemoryDetector.cpp b/src/hotspot/share/services/lowMemoryDetector.cpp similarity index 100% rename from hotspot/src/share/vm/services/lowMemoryDetector.cpp rename to src/hotspot/share/services/lowMemoryDetector.cpp diff --git a/hotspot/src/share/vm/services/lowMemoryDetector.hpp b/src/hotspot/share/services/lowMemoryDetector.hpp similarity index 100% rename from hotspot/src/share/vm/services/lowMemoryDetector.hpp rename to src/hotspot/share/services/lowMemoryDetector.hpp diff --git a/hotspot/src/share/vm/services/mallocSiteTable.cpp b/src/hotspot/share/services/mallocSiteTable.cpp similarity index 100% rename from hotspot/src/share/vm/services/mallocSiteTable.cpp rename to src/hotspot/share/services/mallocSiteTable.cpp diff --git a/hotspot/src/share/vm/services/mallocSiteTable.hpp b/src/hotspot/share/services/mallocSiteTable.hpp similarity index 100% rename from hotspot/src/share/vm/services/mallocSiteTable.hpp rename to src/hotspot/share/services/mallocSiteTable.hpp diff --git a/hotspot/src/share/vm/services/mallocTracker.cpp b/src/hotspot/share/services/mallocTracker.cpp similarity index 100% rename from hotspot/src/share/vm/services/mallocTracker.cpp rename to src/hotspot/share/services/mallocTracker.cpp diff --git a/hotspot/src/share/vm/services/mallocTracker.hpp b/src/hotspot/share/services/mallocTracker.hpp similarity index 100% rename from hotspot/src/share/vm/services/mallocTracker.hpp rename to src/hotspot/share/services/mallocTracker.hpp diff --git a/hotspot/src/share/vm/services/mallocTracker.inline.hpp b/src/hotspot/share/services/mallocTracker.inline.hpp similarity index 100% rename from hotspot/src/share/vm/services/mallocTracker.inline.hpp rename to src/hotspot/share/services/mallocTracker.inline.hpp diff --git a/hotspot/src/share/vm/services/management.cpp b/src/hotspot/share/services/management.cpp similarity index 100% rename from hotspot/src/share/vm/services/management.cpp rename to src/hotspot/share/services/management.cpp diff --git a/hotspot/src/share/vm/services/management.hpp b/src/hotspot/share/services/management.hpp similarity index 100% rename from hotspot/src/share/vm/services/management.hpp rename to src/hotspot/share/services/management.hpp diff --git a/hotspot/src/share/vm/services/memBaseline.cpp b/src/hotspot/share/services/memBaseline.cpp similarity index 100% rename from hotspot/src/share/vm/services/memBaseline.cpp rename to src/hotspot/share/services/memBaseline.cpp diff --git a/hotspot/src/share/vm/services/memBaseline.hpp b/src/hotspot/share/services/memBaseline.hpp similarity index 100% rename from hotspot/src/share/vm/services/memBaseline.hpp rename to src/hotspot/share/services/memBaseline.hpp diff --git a/hotspot/src/share/vm/services/memReporter.cpp b/src/hotspot/share/services/memReporter.cpp similarity index 100% rename from hotspot/src/share/vm/services/memReporter.cpp rename to src/hotspot/share/services/memReporter.cpp diff --git a/hotspot/src/share/vm/services/memReporter.hpp b/src/hotspot/share/services/memReporter.hpp similarity index 100% rename from hotspot/src/share/vm/services/memReporter.hpp rename to src/hotspot/share/services/memReporter.hpp diff --git a/hotspot/src/share/vm/services/memTracker.cpp b/src/hotspot/share/services/memTracker.cpp similarity index 100% rename from hotspot/src/share/vm/services/memTracker.cpp rename to src/hotspot/share/services/memTracker.cpp diff --git a/hotspot/src/share/vm/services/memTracker.hpp b/src/hotspot/share/services/memTracker.hpp similarity index 100% rename from hotspot/src/share/vm/services/memTracker.hpp rename to src/hotspot/share/services/memTracker.hpp diff --git a/hotspot/src/share/vm/services/memoryManager.cpp b/src/hotspot/share/services/memoryManager.cpp similarity index 100% rename from hotspot/src/share/vm/services/memoryManager.cpp rename to src/hotspot/share/services/memoryManager.cpp diff --git a/hotspot/src/share/vm/services/memoryManager.hpp b/src/hotspot/share/services/memoryManager.hpp similarity index 100% rename from hotspot/src/share/vm/services/memoryManager.hpp rename to src/hotspot/share/services/memoryManager.hpp diff --git a/hotspot/src/share/vm/services/memoryPool.cpp b/src/hotspot/share/services/memoryPool.cpp similarity index 100% rename from hotspot/src/share/vm/services/memoryPool.cpp rename to src/hotspot/share/services/memoryPool.cpp diff --git a/hotspot/src/share/vm/services/memoryPool.hpp b/src/hotspot/share/services/memoryPool.hpp similarity index 100% rename from hotspot/src/share/vm/services/memoryPool.hpp rename to src/hotspot/share/services/memoryPool.hpp diff --git a/hotspot/src/share/vm/services/memoryService.cpp b/src/hotspot/share/services/memoryService.cpp similarity index 100% rename from hotspot/src/share/vm/services/memoryService.cpp rename to src/hotspot/share/services/memoryService.cpp diff --git a/hotspot/src/share/vm/services/memoryService.hpp b/src/hotspot/share/services/memoryService.hpp similarity index 100% rename from hotspot/src/share/vm/services/memoryService.hpp rename to src/hotspot/share/services/memoryService.hpp diff --git a/hotspot/src/share/vm/services/memoryUsage.hpp b/src/hotspot/share/services/memoryUsage.hpp similarity index 100% rename from hotspot/src/share/vm/services/memoryUsage.hpp rename to src/hotspot/share/services/memoryUsage.hpp diff --git a/hotspot/src/share/vm/services/nmtCommon.cpp b/src/hotspot/share/services/nmtCommon.cpp similarity index 100% rename from hotspot/src/share/vm/services/nmtCommon.cpp rename to src/hotspot/share/services/nmtCommon.cpp diff --git a/hotspot/src/share/vm/services/nmtCommon.hpp b/src/hotspot/share/services/nmtCommon.hpp similarity index 100% rename from hotspot/src/share/vm/services/nmtCommon.hpp rename to src/hotspot/share/services/nmtCommon.hpp diff --git a/hotspot/src/share/vm/services/nmtDCmd.cpp b/src/hotspot/share/services/nmtDCmd.cpp similarity index 100% rename from hotspot/src/share/vm/services/nmtDCmd.cpp rename to src/hotspot/share/services/nmtDCmd.cpp diff --git a/hotspot/src/share/vm/services/nmtDCmd.hpp b/src/hotspot/share/services/nmtDCmd.hpp similarity index 100% rename from hotspot/src/share/vm/services/nmtDCmd.hpp rename to src/hotspot/share/services/nmtDCmd.hpp diff --git a/hotspot/src/share/vm/services/psMemoryPool.cpp b/src/hotspot/share/services/psMemoryPool.cpp similarity index 100% rename from hotspot/src/share/vm/services/psMemoryPool.cpp rename to src/hotspot/share/services/psMemoryPool.cpp diff --git a/hotspot/src/share/vm/services/psMemoryPool.hpp b/src/hotspot/share/services/psMemoryPool.hpp similarity index 100% rename from hotspot/src/share/vm/services/psMemoryPool.hpp rename to src/hotspot/share/services/psMemoryPool.hpp diff --git a/hotspot/src/share/vm/services/runtimeService.cpp b/src/hotspot/share/services/runtimeService.cpp similarity index 100% rename from hotspot/src/share/vm/services/runtimeService.cpp rename to src/hotspot/share/services/runtimeService.cpp diff --git a/hotspot/src/share/vm/services/runtimeService.hpp b/src/hotspot/share/services/runtimeService.hpp similarity index 100% rename from hotspot/src/share/vm/services/runtimeService.hpp rename to src/hotspot/share/services/runtimeService.hpp diff --git a/hotspot/src/share/vm/services/serviceUtil.hpp b/src/hotspot/share/services/serviceUtil.hpp similarity index 100% rename from hotspot/src/share/vm/services/serviceUtil.hpp rename to src/hotspot/share/services/serviceUtil.hpp diff --git a/hotspot/src/share/vm/services/threadService.cpp b/src/hotspot/share/services/threadService.cpp similarity index 100% rename from hotspot/src/share/vm/services/threadService.cpp rename to src/hotspot/share/services/threadService.cpp diff --git a/hotspot/src/share/vm/services/threadService.hpp b/src/hotspot/share/services/threadService.hpp similarity index 100% rename from hotspot/src/share/vm/services/threadService.hpp rename to src/hotspot/share/services/threadService.hpp diff --git a/hotspot/src/share/vm/services/virtualMemoryTracker.cpp b/src/hotspot/share/services/virtualMemoryTracker.cpp similarity index 100% rename from hotspot/src/share/vm/services/virtualMemoryTracker.cpp rename to src/hotspot/share/services/virtualMemoryTracker.cpp diff --git a/hotspot/src/share/vm/services/virtualMemoryTracker.hpp b/src/hotspot/share/services/virtualMemoryTracker.hpp similarity index 100% rename from hotspot/src/share/vm/services/virtualMemoryTracker.hpp rename to src/hotspot/share/services/virtualMemoryTracker.hpp diff --git a/hotspot/src/share/vm/services/writeableFlags.cpp b/src/hotspot/share/services/writeableFlags.cpp similarity index 100% rename from hotspot/src/share/vm/services/writeableFlags.cpp rename to src/hotspot/share/services/writeableFlags.cpp diff --git a/hotspot/src/share/vm/services/writeableFlags.hpp b/src/hotspot/share/services/writeableFlags.hpp similarity index 100% rename from hotspot/src/share/vm/services/writeableFlags.hpp rename to src/hotspot/share/services/writeableFlags.hpp diff --git a/hotspot/src/share/vm/shark/llvmHeaders.hpp b/src/hotspot/share/shark/llvmHeaders.hpp similarity index 100% rename from hotspot/src/share/vm/shark/llvmHeaders.hpp rename to src/hotspot/share/shark/llvmHeaders.hpp diff --git a/hotspot/src/share/vm/shark/llvmValue.hpp b/src/hotspot/share/shark/llvmValue.hpp similarity index 100% rename from hotspot/src/share/vm/shark/llvmValue.hpp rename to src/hotspot/share/shark/llvmValue.hpp diff --git a/hotspot/src/share/vm/shark/sharkBlock.cpp b/src/hotspot/share/shark/sharkBlock.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkBlock.cpp rename to src/hotspot/share/shark/sharkBlock.cpp diff --git a/hotspot/src/share/vm/shark/sharkBlock.hpp b/src/hotspot/share/shark/sharkBlock.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkBlock.hpp rename to src/hotspot/share/shark/sharkBlock.hpp diff --git a/hotspot/src/share/vm/shark/sharkBuilder.cpp b/src/hotspot/share/shark/sharkBuilder.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkBuilder.cpp rename to src/hotspot/share/shark/sharkBuilder.cpp diff --git a/hotspot/src/share/vm/shark/sharkBuilder.hpp b/src/hotspot/share/shark/sharkBuilder.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkBuilder.hpp rename to src/hotspot/share/shark/sharkBuilder.hpp diff --git a/hotspot/src/share/vm/shark/sharkCacheDecache.cpp b/src/hotspot/share/shark/sharkCacheDecache.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkCacheDecache.cpp rename to src/hotspot/share/shark/sharkCacheDecache.cpp diff --git a/hotspot/src/share/vm/shark/sharkCacheDecache.hpp b/src/hotspot/share/shark/sharkCacheDecache.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkCacheDecache.hpp rename to src/hotspot/share/shark/sharkCacheDecache.hpp diff --git a/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp b/src/hotspot/share/shark/sharkCodeBuffer.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkCodeBuffer.hpp rename to src/hotspot/share/shark/sharkCodeBuffer.hpp diff --git a/hotspot/src/share/vm/shark/sharkCompiler.cpp b/src/hotspot/share/shark/sharkCompiler.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkCompiler.cpp rename to src/hotspot/share/shark/sharkCompiler.cpp diff --git a/hotspot/src/share/vm/shark/sharkCompiler.hpp b/src/hotspot/share/shark/sharkCompiler.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkCompiler.hpp rename to src/hotspot/share/shark/sharkCompiler.hpp diff --git a/hotspot/src/share/vm/shark/sharkConstant.cpp b/src/hotspot/share/shark/sharkConstant.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkConstant.cpp rename to src/hotspot/share/shark/sharkConstant.cpp diff --git a/hotspot/src/share/vm/shark/sharkConstant.hpp b/src/hotspot/share/shark/sharkConstant.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkConstant.hpp rename to src/hotspot/share/shark/sharkConstant.hpp diff --git a/hotspot/src/share/vm/shark/sharkContext.cpp b/src/hotspot/share/shark/sharkContext.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkContext.cpp rename to src/hotspot/share/shark/sharkContext.cpp diff --git a/hotspot/src/share/vm/shark/sharkContext.hpp b/src/hotspot/share/shark/sharkContext.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkContext.hpp rename to src/hotspot/share/shark/sharkContext.hpp diff --git a/hotspot/src/share/vm/shark/sharkEntry.hpp b/src/hotspot/share/shark/sharkEntry.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkEntry.hpp rename to src/hotspot/share/shark/sharkEntry.hpp diff --git a/hotspot/src/share/vm/shark/sharkFunction.cpp b/src/hotspot/share/shark/sharkFunction.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkFunction.cpp rename to src/hotspot/share/shark/sharkFunction.cpp diff --git a/hotspot/src/share/vm/shark/sharkFunction.hpp b/src/hotspot/share/shark/sharkFunction.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkFunction.hpp rename to src/hotspot/share/shark/sharkFunction.hpp diff --git a/hotspot/src/share/vm/shark/sharkInliner.cpp b/src/hotspot/share/shark/sharkInliner.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkInliner.cpp rename to src/hotspot/share/shark/sharkInliner.cpp diff --git a/hotspot/src/share/vm/shark/sharkInliner.hpp b/src/hotspot/share/shark/sharkInliner.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkInliner.hpp rename to src/hotspot/share/shark/sharkInliner.hpp diff --git a/hotspot/src/share/vm/shark/sharkIntrinsics.cpp b/src/hotspot/share/shark/sharkIntrinsics.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkIntrinsics.cpp rename to src/hotspot/share/shark/sharkIntrinsics.cpp diff --git a/hotspot/src/share/vm/shark/sharkIntrinsics.hpp b/src/hotspot/share/shark/sharkIntrinsics.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkIntrinsics.hpp rename to src/hotspot/share/shark/sharkIntrinsics.hpp diff --git a/hotspot/src/share/vm/shark/sharkInvariants.cpp b/src/hotspot/share/shark/sharkInvariants.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkInvariants.cpp rename to src/hotspot/share/shark/sharkInvariants.cpp diff --git a/hotspot/src/share/vm/shark/sharkInvariants.hpp b/src/hotspot/share/shark/sharkInvariants.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkInvariants.hpp rename to src/hotspot/share/shark/sharkInvariants.hpp diff --git a/hotspot/src/share/vm/shark/sharkMemoryManager.cpp b/src/hotspot/share/shark/sharkMemoryManager.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkMemoryManager.cpp rename to src/hotspot/share/shark/sharkMemoryManager.cpp diff --git a/hotspot/src/share/vm/shark/sharkMemoryManager.hpp b/src/hotspot/share/shark/sharkMemoryManager.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkMemoryManager.hpp rename to src/hotspot/share/shark/sharkMemoryManager.hpp diff --git a/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp b/src/hotspot/share/shark/sharkNativeWrapper.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkNativeWrapper.cpp rename to src/hotspot/share/shark/sharkNativeWrapper.cpp diff --git a/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp b/src/hotspot/share/shark/sharkNativeWrapper.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkNativeWrapper.hpp rename to src/hotspot/share/shark/sharkNativeWrapper.hpp diff --git a/hotspot/src/share/vm/shark/sharkRuntime.cpp b/src/hotspot/share/shark/sharkRuntime.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkRuntime.cpp rename to src/hotspot/share/shark/sharkRuntime.cpp diff --git a/hotspot/src/share/vm/shark/sharkRuntime.hpp b/src/hotspot/share/shark/sharkRuntime.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkRuntime.hpp rename to src/hotspot/share/shark/sharkRuntime.hpp diff --git a/hotspot/src/share/vm/shark/sharkStack.cpp b/src/hotspot/share/shark/sharkStack.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkStack.cpp rename to src/hotspot/share/shark/sharkStack.cpp diff --git a/hotspot/src/share/vm/shark/sharkStack.hpp b/src/hotspot/share/shark/sharkStack.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkStack.hpp rename to src/hotspot/share/shark/sharkStack.hpp diff --git a/hotspot/src/share/vm/shark/sharkState.cpp b/src/hotspot/share/shark/sharkState.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkState.cpp rename to src/hotspot/share/shark/sharkState.cpp diff --git a/hotspot/src/share/vm/shark/sharkState.hpp b/src/hotspot/share/shark/sharkState.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkState.hpp rename to src/hotspot/share/shark/sharkState.hpp diff --git a/hotspot/src/share/vm/shark/sharkStateScanner.cpp b/src/hotspot/share/shark/sharkStateScanner.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkStateScanner.cpp rename to src/hotspot/share/shark/sharkStateScanner.cpp diff --git a/hotspot/src/share/vm/shark/sharkStateScanner.hpp b/src/hotspot/share/shark/sharkStateScanner.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkStateScanner.hpp rename to src/hotspot/share/shark/sharkStateScanner.hpp diff --git a/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp b/src/hotspot/share/shark/sharkTopLevelBlock.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp rename to src/hotspot/share/shark/sharkTopLevelBlock.cpp diff --git a/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp b/src/hotspot/share/shark/sharkTopLevelBlock.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp rename to src/hotspot/share/shark/sharkTopLevelBlock.hpp diff --git a/hotspot/src/share/vm/shark/sharkType.hpp b/src/hotspot/share/shark/sharkType.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkType.hpp rename to src/hotspot/share/shark/sharkType.hpp diff --git a/hotspot/src/share/vm/shark/sharkValue.cpp b/src/hotspot/share/shark/sharkValue.cpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkValue.cpp rename to src/hotspot/share/shark/sharkValue.cpp diff --git a/hotspot/src/share/vm/shark/sharkValue.hpp b/src/hotspot/share/shark/sharkValue.hpp similarity index 100% rename from hotspot/src/share/vm/shark/sharkValue.hpp rename to src/hotspot/share/shark/sharkValue.hpp diff --git a/hotspot/src/share/vm/shark/shark_globals.cpp b/src/hotspot/share/shark/shark_globals.cpp similarity index 100% rename from hotspot/src/share/vm/shark/shark_globals.cpp rename to src/hotspot/share/shark/shark_globals.cpp diff --git a/hotspot/src/share/vm/shark/shark_globals.hpp b/src/hotspot/share/shark/shark_globals.hpp similarity index 100% rename from hotspot/src/share/vm/shark/shark_globals.hpp rename to src/hotspot/share/shark/shark_globals.hpp diff --git a/hotspot/src/share/vm/trace/noTraceBackend.hpp b/src/hotspot/share/trace/noTraceBackend.hpp similarity index 100% rename from hotspot/src/share/vm/trace/noTraceBackend.hpp rename to src/hotspot/share/trace/noTraceBackend.hpp diff --git a/hotspot/src/share/vm/trace/trace.dtd b/src/hotspot/share/trace/trace.dtd similarity index 100% rename from hotspot/src/share/vm/trace/trace.dtd rename to src/hotspot/share/trace/trace.dtd diff --git a/hotspot/src/share/vm/trace/trace.xml b/src/hotspot/share/trace/trace.xml similarity index 100% rename from hotspot/src/share/vm/trace/trace.xml rename to src/hotspot/share/trace/trace.xml diff --git a/hotspot/src/share/vm/trace/traceBackend.cpp b/src/hotspot/share/trace/traceBackend.cpp similarity index 100% rename from hotspot/src/share/vm/trace/traceBackend.cpp rename to src/hotspot/share/trace/traceBackend.cpp diff --git a/hotspot/src/share/vm/trace/traceBackend.hpp b/src/hotspot/share/trace/traceBackend.hpp similarity index 100% rename from hotspot/src/share/vm/trace/traceBackend.hpp rename to src/hotspot/share/trace/traceBackend.hpp diff --git a/hotspot/src/share/vm/trace/traceDataTypes.hpp b/src/hotspot/share/trace/traceDataTypes.hpp similarity index 100% rename from hotspot/src/share/vm/trace/traceDataTypes.hpp rename to src/hotspot/share/trace/traceDataTypes.hpp diff --git a/hotspot/src/share/vm/trace/traceEvent.hpp b/src/hotspot/share/trace/traceEvent.hpp similarity index 100% rename from hotspot/src/share/vm/trace/traceEvent.hpp rename to src/hotspot/share/trace/traceEvent.hpp diff --git a/hotspot/src/share/vm/trace/traceEventClasses.xsl b/src/hotspot/share/trace/traceEventClasses.xsl similarity index 100% rename from hotspot/src/share/vm/trace/traceEventClasses.xsl rename to src/hotspot/share/trace/traceEventClasses.xsl diff --git a/hotspot/src/share/vm/trace/traceEventIds.xsl b/src/hotspot/share/trace/traceEventIds.xsl similarity index 100% rename from hotspot/src/share/vm/trace/traceEventIds.xsl rename to src/hotspot/share/trace/traceEventIds.xsl diff --git a/hotspot/src/share/vm/trace/traceMacros.hpp b/src/hotspot/share/trace/traceMacros.hpp similarity index 100% rename from hotspot/src/share/vm/trace/traceMacros.hpp rename to src/hotspot/share/trace/traceMacros.hpp diff --git a/hotspot/src/share/vm/trace/traceStream.cpp b/src/hotspot/share/trace/traceStream.cpp similarity index 100% rename from hotspot/src/share/vm/trace/traceStream.cpp rename to src/hotspot/share/trace/traceStream.cpp diff --git a/hotspot/src/share/vm/trace/traceStream.hpp b/src/hotspot/share/trace/traceStream.hpp similarity index 100% rename from hotspot/src/share/vm/trace/traceStream.hpp rename to src/hotspot/share/trace/traceStream.hpp diff --git a/hotspot/src/share/vm/trace/traceTime.hpp b/src/hotspot/share/trace/traceTime.hpp similarity index 100% rename from hotspot/src/share/vm/trace/traceTime.hpp rename to src/hotspot/share/trace/traceTime.hpp diff --git a/hotspot/src/share/vm/trace/traceTypes.xsl b/src/hotspot/share/trace/traceTypes.xsl similarity index 100% rename from hotspot/src/share/vm/trace/traceTypes.xsl rename to src/hotspot/share/trace/traceTypes.xsl diff --git a/hotspot/src/share/vm/trace/traceevents.xml b/src/hotspot/share/trace/traceevents.xml similarity index 100% rename from hotspot/src/share/vm/trace/traceevents.xml rename to src/hotspot/share/trace/traceevents.xml diff --git a/hotspot/src/share/vm/trace/tracerelationdecls.xml b/src/hotspot/share/trace/tracerelationdecls.xml similarity index 100% rename from hotspot/src/share/vm/trace/tracerelationdecls.xml rename to src/hotspot/share/trace/tracerelationdecls.xml diff --git a/hotspot/src/share/vm/trace/tracetypes.xml b/src/hotspot/share/trace/tracetypes.xml similarity index 100% rename from hotspot/src/share/vm/trace/tracetypes.xml rename to src/hotspot/share/trace/tracetypes.xml diff --git a/hotspot/src/share/vm/trace/tracing.hpp b/src/hotspot/share/trace/tracing.hpp similarity index 100% rename from hotspot/src/share/vm/trace/tracing.hpp rename to src/hotspot/share/trace/tracing.hpp diff --git a/hotspot/src/share/vm/trace/xinclude.mod b/src/hotspot/share/trace/xinclude.mod similarity index 100% rename from hotspot/src/share/vm/trace/xinclude.mod rename to src/hotspot/share/trace/xinclude.mod diff --git a/hotspot/src/share/vm/trace/xsl_util.xsl b/src/hotspot/share/trace/xsl_util.xsl similarity index 100% rename from hotspot/src/share/vm/trace/xsl_util.xsl rename to src/hotspot/share/trace/xsl_util.xsl diff --git a/hotspot/src/share/vm/utilities/accessFlags.cpp b/src/hotspot/share/utilities/accessFlags.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/accessFlags.cpp rename to src/hotspot/share/utilities/accessFlags.cpp diff --git a/hotspot/src/share/vm/utilities/accessFlags.hpp b/src/hotspot/share/utilities/accessFlags.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/accessFlags.hpp rename to src/hotspot/share/utilities/accessFlags.hpp diff --git a/hotspot/src/share/vm/utilities/align.hpp b/src/hotspot/share/utilities/align.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/align.hpp rename to src/hotspot/share/utilities/align.hpp diff --git a/hotspot/src/share/vm/utilities/bitMap.cpp b/src/hotspot/share/utilities/bitMap.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/bitMap.cpp rename to src/hotspot/share/utilities/bitMap.cpp diff --git a/hotspot/src/share/vm/utilities/bitMap.hpp b/src/hotspot/share/utilities/bitMap.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/bitMap.hpp rename to src/hotspot/share/utilities/bitMap.hpp diff --git a/hotspot/src/share/vm/utilities/bitMap.inline.hpp b/src/hotspot/share/utilities/bitMap.inline.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/bitMap.inline.hpp rename to src/hotspot/share/utilities/bitMap.inline.hpp diff --git a/hotspot/src/share/vm/utilities/breakpoint.hpp b/src/hotspot/share/utilities/breakpoint.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/breakpoint.hpp rename to src/hotspot/share/utilities/breakpoint.hpp diff --git a/hotspot/src/share/vm/utilities/bytes.hpp b/src/hotspot/share/utilities/bytes.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/bytes.hpp rename to src/hotspot/share/utilities/bytes.hpp diff --git a/hotspot/src/share/vm/utilities/chunkedList.hpp b/src/hotspot/share/utilities/chunkedList.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/chunkedList.hpp rename to src/hotspot/share/utilities/chunkedList.hpp diff --git a/hotspot/src/share/vm/utilities/compilerWarnings.hpp b/src/hotspot/share/utilities/compilerWarnings.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/compilerWarnings.hpp rename to src/hotspot/share/utilities/compilerWarnings.hpp diff --git a/hotspot/src/share/vm/utilities/constantTag.cpp b/src/hotspot/share/utilities/constantTag.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/constantTag.cpp rename to src/hotspot/share/utilities/constantTag.cpp diff --git a/hotspot/src/share/vm/utilities/constantTag.hpp b/src/hotspot/share/utilities/constantTag.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/constantTag.hpp rename to src/hotspot/share/utilities/constantTag.hpp diff --git a/hotspot/src/share/vm/utilities/copy.cpp b/src/hotspot/share/utilities/copy.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/copy.cpp rename to src/hotspot/share/utilities/copy.cpp diff --git a/hotspot/src/share/vm/utilities/copy.hpp b/src/hotspot/share/utilities/copy.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/copy.hpp rename to src/hotspot/share/utilities/copy.hpp diff --git a/hotspot/src/share/vm/utilities/count_trailing_zeros.hpp b/src/hotspot/share/utilities/count_trailing_zeros.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/count_trailing_zeros.hpp rename to src/hotspot/share/utilities/count_trailing_zeros.hpp diff --git a/hotspot/src/share/vm/utilities/debug.cpp b/src/hotspot/share/utilities/debug.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/debug.cpp rename to src/hotspot/share/utilities/debug.cpp diff --git a/hotspot/src/share/vm/utilities/debug.hpp b/src/hotspot/share/utilities/debug.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/debug.hpp rename to src/hotspot/share/utilities/debug.hpp diff --git a/hotspot/src/share/vm/utilities/decoder.cpp b/src/hotspot/share/utilities/decoder.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/decoder.cpp rename to src/hotspot/share/utilities/decoder.cpp diff --git a/hotspot/src/share/vm/utilities/decoder.hpp b/src/hotspot/share/utilities/decoder.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/decoder.hpp rename to src/hotspot/share/utilities/decoder.hpp diff --git a/hotspot/src/share/vm/utilities/decoder_elf.cpp b/src/hotspot/share/utilities/decoder_elf.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/decoder_elf.cpp rename to src/hotspot/share/utilities/decoder_elf.cpp diff --git a/hotspot/src/share/vm/utilities/decoder_elf.hpp b/src/hotspot/share/utilities/decoder_elf.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/decoder_elf.hpp rename to src/hotspot/share/utilities/decoder_elf.hpp diff --git a/hotspot/src/share/vm/utilities/defaultStream.hpp b/src/hotspot/share/utilities/defaultStream.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/defaultStream.hpp rename to src/hotspot/share/utilities/defaultStream.hpp diff --git a/hotspot/src/share/vm/utilities/dtrace.hpp b/src/hotspot/share/utilities/dtrace.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/dtrace.hpp rename to src/hotspot/share/utilities/dtrace.hpp diff --git a/hotspot/src/share/vm/utilities/dtrace_disabled.hpp b/src/hotspot/share/utilities/dtrace_disabled.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/dtrace_disabled.hpp rename to src/hotspot/share/utilities/dtrace_disabled.hpp diff --git a/hotspot/src/share/vm/utilities/elfFile.cpp b/src/hotspot/share/utilities/elfFile.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/elfFile.cpp rename to src/hotspot/share/utilities/elfFile.cpp diff --git a/hotspot/src/share/vm/utilities/elfFile.hpp b/src/hotspot/share/utilities/elfFile.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/elfFile.hpp rename to src/hotspot/share/utilities/elfFile.hpp diff --git a/hotspot/src/share/vm/utilities/elfFuncDescTable.cpp b/src/hotspot/share/utilities/elfFuncDescTable.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/elfFuncDescTable.cpp rename to src/hotspot/share/utilities/elfFuncDescTable.cpp diff --git a/hotspot/src/share/vm/utilities/elfFuncDescTable.hpp b/src/hotspot/share/utilities/elfFuncDescTable.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/elfFuncDescTable.hpp rename to src/hotspot/share/utilities/elfFuncDescTable.hpp diff --git a/hotspot/src/share/vm/utilities/elfStringTable.cpp b/src/hotspot/share/utilities/elfStringTable.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/elfStringTable.cpp rename to src/hotspot/share/utilities/elfStringTable.cpp diff --git a/hotspot/src/share/vm/utilities/elfStringTable.hpp b/src/hotspot/share/utilities/elfStringTable.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/elfStringTable.hpp rename to src/hotspot/share/utilities/elfStringTable.hpp diff --git a/hotspot/src/share/vm/utilities/elfSymbolTable.cpp b/src/hotspot/share/utilities/elfSymbolTable.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/elfSymbolTable.cpp rename to src/hotspot/share/utilities/elfSymbolTable.cpp diff --git a/hotspot/src/share/vm/utilities/elfSymbolTable.hpp b/src/hotspot/share/utilities/elfSymbolTable.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/elfSymbolTable.hpp rename to src/hotspot/share/utilities/elfSymbolTable.hpp diff --git a/hotspot/src/share/vm/utilities/errorReporter.cpp b/src/hotspot/share/utilities/errorReporter.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/errorReporter.cpp rename to src/hotspot/share/utilities/errorReporter.cpp diff --git a/hotspot/src/share/vm/utilities/errorReporter.hpp b/src/hotspot/share/utilities/errorReporter.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/errorReporter.hpp rename to src/hotspot/share/utilities/errorReporter.hpp diff --git a/hotspot/src/share/vm/utilities/events.cpp b/src/hotspot/share/utilities/events.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/events.cpp rename to src/hotspot/share/utilities/events.cpp diff --git a/hotspot/src/share/vm/utilities/events.hpp b/src/hotspot/share/utilities/events.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/events.hpp rename to src/hotspot/share/utilities/events.hpp diff --git a/hotspot/src/share/vm/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/exceptions.cpp rename to src/hotspot/share/utilities/exceptions.cpp diff --git a/hotspot/src/share/vm/utilities/exceptions.hpp b/src/hotspot/share/utilities/exceptions.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/exceptions.hpp rename to src/hotspot/share/utilities/exceptions.hpp diff --git a/hotspot/src/share/vm/utilities/fakeRttiSupport.hpp b/src/hotspot/share/utilities/fakeRttiSupport.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/fakeRttiSupport.hpp rename to src/hotspot/share/utilities/fakeRttiSupport.hpp diff --git a/hotspot/src/share/vm/utilities/formatBuffer.cpp b/src/hotspot/share/utilities/formatBuffer.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/formatBuffer.cpp rename to src/hotspot/share/utilities/formatBuffer.cpp diff --git a/hotspot/src/share/vm/utilities/formatBuffer.hpp b/src/hotspot/share/utilities/formatBuffer.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/formatBuffer.hpp rename to src/hotspot/share/utilities/formatBuffer.hpp diff --git a/hotspot/src/share/vm/utilities/globalDefinitions.cpp b/src/hotspot/share/utilities/globalDefinitions.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/globalDefinitions.cpp rename to src/hotspot/share/utilities/globalDefinitions.cpp diff --git a/hotspot/src/share/vm/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/globalDefinitions.hpp rename to src/hotspot/share/utilities/globalDefinitions.hpp diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp rename to src/hotspot/share/utilities/globalDefinitions_gcc.hpp diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp b/src/hotspot/share/utilities/globalDefinitions_sparcWorks.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp rename to src/hotspot/share/utilities/globalDefinitions_sparcWorks.hpp diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp rename to src/hotspot/share/utilities/globalDefinitions_visCPP.hpp diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_xlc.hpp b/src/hotspot/share/utilities/globalDefinitions_xlc.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/globalDefinitions_xlc.hpp rename to src/hotspot/share/utilities/globalDefinitions_xlc.hpp diff --git a/hotspot/src/share/vm/utilities/growableArray.cpp b/src/hotspot/share/utilities/growableArray.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/growableArray.cpp rename to src/hotspot/share/utilities/growableArray.cpp diff --git a/hotspot/src/share/vm/utilities/growableArray.hpp b/src/hotspot/share/utilities/growableArray.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/growableArray.hpp rename to src/hotspot/share/utilities/growableArray.hpp diff --git a/hotspot/src/share/vm/utilities/hashtable.cpp b/src/hotspot/share/utilities/hashtable.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/hashtable.cpp rename to src/hotspot/share/utilities/hashtable.cpp diff --git a/hotspot/src/share/vm/utilities/hashtable.hpp b/src/hotspot/share/utilities/hashtable.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/hashtable.hpp rename to src/hotspot/share/utilities/hashtable.hpp diff --git a/hotspot/src/share/vm/utilities/hashtable.inline.hpp b/src/hotspot/share/utilities/hashtable.inline.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/hashtable.inline.hpp rename to src/hotspot/share/utilities/hashtable.inline.hpp diff --git a/hotspot/src/share/vm/utilities/histogram.cpp b/src/hotspot/share/utilities/histogram.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/histogram.cpp rename to src/hotspot/share/utilities/histogram.cpp diff --git a/hotspot/src/share/vm/utilities/histogram.hpp b/src/hotspot/share/utilities/histogram.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/histogram.hpp rename to src/hotspot/share/utilities/histogram.hpp diff --git a/hotspot/src/share/vm/utilities/intHisto.cpp b/src/hotspot/share/utilities/intHisto.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/intHisto.cpp rename to src/hotspot/share/utilities/intHisto.cpp diff --git a/hotspot/src/share/vm/utilities/intHisto.hpp b/src/hotspot/share/utilities/intHisto.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/intHisto.hpp rename to src/hotspot/share/utilities/intHisto.hpp diff --git a/hotspot/src/share/vm/utilities/internalVMTests.cpp b/src/hotspot/share/utilities/internalVMTests.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/internalVMTests.cpp rename to src/hotspot/share/utilities/internalVMTests.cpp diff --git a/hotspot/src/share/vm/utilities/internalVMTests.hpp b/src/hotspot/share/utilities/internalVMTests.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/internalVMTests.hpp rename to src/hotspot/share/utilities/internalVMTests.hpp diff --git a/hotspot/src/share/vm/utilities/json.cpp b/src/hotspot/share/utilities/json.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/json.cpp rename to src/hotspot/share/utilities/json.cpp diff --git a/hotspot/src/share/vm/utilities/json.hpp b/src/hotspot/share/utilities/json.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/json.hpp rename to src/hotspot/share/utilities/json.hpp diff --git a/hotspot/src/share/vm/utilities/linkedlist.hpp b/src/hotspot/share/utilities/linkedlist.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/linkedlist.hpp rename to src/hotspot/share/utilities/linkedlist.hpp diff --git a/hotspot/src/share/vm/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/macros.hpp rename to src/hotspot/share/utilities/macros.hpp diff --git a/hotspot/src/share/vm/utilities/nativeCallStack.cpp b/src/hotspot/share/utilities/nativeCallStack.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/nativeCallStack.cpp rename to src/hotspot/share/utilities/nativeCallStack.cpp diff --git a/hotspot/src/share/vm/utilities/nativeCallStack.hpp b/src/hotspot/share/utilities/nativeCallStack.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/nativeCallStack.hpp rename to src/hotspot/share/utilities/nativeCallStack.hpp diff --git a/hotspot/src/share/vm/utilities/numberSeq.cpp b/src/hotspot/share/utilities/numberSeq.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/numberSeq.cpp rename to src/hotspot/share/utilities/numberSeq.cpp diff --git a/hotspot/src/share/vm/utilities/numberSeq.hpp b/src/hotspot/share/utilities/numberSeq.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/numberSeq.hpp rename to src/hotspot/share/utilities/numberSeq.hpp diff --git a/hotspot/src/share/vm/utilities/ostream.cpp b/src/hotspot/share/utilities/ostream.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/ostream.cpp rename to src/hotspot/share/utilities/ostream.cpp diff --git a/hotspot/src/share/vm/utilities/ostream.hpp b/src/hotspot/share/utilities/ostream.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/ostream.hpp rename to src/hotspot/share/utilities/ostream.hpp diff --git a/hotspot/src/share/vm/utilities/pair.hpp b/src/hotspot/share/utilities/pair.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/pair.hpp rename to src/hotspot/share/utilities/pair.hpp diff --git a/hotspot/src/share/vm/utilities/preserveException.cpp b/src/hotspot/share/utilities/preserveException.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/preserveException.cpp rename to src/hotspot/share/utilities/preserveException.cpp diff --git a/hotspot/src/share/vm/utilities/preserveException.hpp b/src/hotspot/share/utilities/preserveException.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/preserveException.hpp rename to src/hotspot/share/utilities/preserveException.hpp diff --git a/hotspot/src/share/vm/utilities/quickSort.hpp b/src/hotspot/share/utilities/quickSort.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/quickSort.hpp rename to src/hotspot/share/utilities/quickSort.hpp diff --git a/hotspot/src/share/vm/utilities/resourceHash.hpp b/src/hotspot/share/utilities/resourceHash.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/resourceHash.hpp rename to src/hotspot/share/utilities/resourceHash.hpp diff --git a/hotspot/src/share/vm/utilities/sizes.cpp b/src/hotspot/share/utilities/sizes.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/sizes.cpp rename to src/hotspot/share/utilities/sizes.cpp diff --git a/hotspot/src/share/vm/utilities/sizes.hpp b/src/hotspot/share/utilities/sizes.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/sizes.hpp rename to src/hotspot/share/utilities/sizes.hpp diff --git a/hotspot/src/share/vm/utilities/stack.hpp b/src/hotspot/share/utilities/stack.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/stack.hpp rename to src/hotspot/share/utilities/stack.hpp diff --git a/hotspot/src/share/vm/utilities/stack.inline.hpp b/src/hotspot/share/utilities/stack.inline.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/stack.inline.hpp rename to src/hotspot/share/utilities/stack.inline.hpp diff --git a/hotspot/src/share/vm/utilities/stringUtils.cpp b/src/hotspot/share/utilities/stringUtils.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/stringUtils.cpp rename to src/hotspot/share/utilities/stringUtils.cpp diff --git a/hotspot/src/share/vm/utilities/stringUtils.hpp b/src/hotspot/share/utilities/stringUtils.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/stringUtils.hpp rename to src/hotspot/share/utilities/stringUtils.hpp diff --git a/hotspot/src/share/vm/utilities/ticks.cpp b/src/hotspot/share/utilities/ticks.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/ticks.cpp rename to src/hotspot/share/utilities/ticks.cpp diff --git a/hotspot/src/share/vm/utilities/ticks.hpp b/src/hotspot/share/utilities/ticks.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/ticks.hpp rename to src/hotspot/share/utilities/ticks.hpp diff --git a/hotspot/src/share/vm/utilities/ticks.inline.hpp b/src/hotspot/share/utilities/ticks.inline.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/ticks.inline.hpp rename to src/hotspot/share/utilities/ticks.inline.hpp diff --git a/hotspot/src/share/vm/utilities/utf8.cpp b/src/hotspot/share/utilities/utf8.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/utf8.cpp rename to src/hotspot/share/utilities/utf8.cpp diff --git a/hotspot/src/share/vm/utilities/utf8.hpp b/src/hotspot/share/utilities/utf8.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/utf8.hpp rename to src/hotspot/share/utilities/utf8.hpp diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/vmError.cpp rename to src/hotspot/share/utilities/vmError.cpp diff --git a/hotspot/src/share/vm/utilities/vmError.hpp b/src/hotspot/share/utilities/vmError.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/vmError.hpp rename to src/hotspot/share/utilities/vmError.hpp diff --git a/hotspot/src/share/vm/utilities/xmlstream.cpp b/src/hotspot/share/utilities/xmlstream.cpp similarity index 100% rename from hotspot/src/share/vm/utilities/xmlstream.cpp rename to src/hotspot/share/utilities/xmlstream.cpp diff --git a/hotspot/src/share/vm/utilities/xmlstream.hpp b/src/hotspot/share/utilities/xmlstream.hpp similarity index 100% rename from hotspot/src/share/vm/utilities/xmlstream.hpp rename to src/hotspot/share/utilities/xmlstream.hpp diff --git a/jaxws/src/java.activation/share/classes/META-INF/mailcap.default b/src/java.activation/share/classes/META-INF/mailcap.default similarity index 100% rename from jaxws/src/java.activation/share/classes/META-INF/mailcap.default rename to src/java.activation/share/classes/META-INF/mailcap.default diff --git a/jaxws/src/java.activation/share/classes/META-INF/mimetypes.default b/src/java.activation/share/classes/META-INF/mimetypes.default similarity index 100% rename from jaxws/src/java.activation/share/classes/META-INF/mimetypes.default rename to src/java.activation/share/classes/META-INF/mimetypes.default diff --git a/jaxws/src/java.activation/share/classes/com/sun/activation/registries/LogSupport.java b/src/java.activation/share/classes/com/sun/activation/registries/LogSupport.java similarity index 100% rename from jaxws/src/java.activation/share/classes/com/sun/activation/registries/LogSupport.java rename to src/java.activation/share/classes/com/sun/activation/registries/LogSupport.java diff --git a/jaxws/src/java.activation/share/classes/com/sun/activation/registries/MailcapFile.java b/src/java.activation/share/classes/com/sun/activation/registries/MailcapFile.java similarity index 100% rename from jaxws/src/java.activation/share/classes/com/sun/activation/registries/MailcapFile.java rename to src/java.activation/share/classes/com/sun/activation/registries/MailcapFile.java diff --git a/jaxws/src/java.activation/share/classes/com/sun/activation/registries/MailcapParseException.java b/src/java.activation/share/classes/com/sun/activation/registries/MailcapParseException.java similarity index 100% rename from jaxws/src/java.activation/share/classes/com/sun/activation/registries/MailcapParseException.java rename to src/java.activation/share/classes/com/sun/activation/registries/MailcapParseException.java diff --git a/jaxws/src/java.activation/share/classes/com/sun/activation/registries/MailcapTokenizer.java b/src/java.activation/share/classes/com/sun/activation/registries/MailcapTokenizer.java similarity index 100% rename from jaxws/src/java.activation/share/classes/com/sun/activation/registries/MailcapTokenizer.java rename to src/java.activation/share/classes/com/sun/activation/registries/MailcapTokenizer.java diff --git a/jaxws/src/java.activation/share/classes/com/sun/activation/registries/MimeTypeEntry.java b/src/java.activation/share/classes/com/sun/activation/registries/MimeTypeEntry.java similarity index 100% rename from jaxws/src/java.activation/share/classes/com/sun/activation/registries/MimeTypeEntry.java rename to src/java.activation/share/classes/com/sun/activation/registries/MimeTypeEntry.java diff --git a/jaxws/src/java.activation/share/classes/com/sun/activation/registries/MimeTypeFile.java b/src/java.activation/share/classes/com/sun/activation/registries/MimeTypeFile.java similarity index 100% rename from jaxws/src/java.activation/share/classes/com/sun/activation/registries/MimeTypeFile.java rename to src/java.activation/share/classes/com/sun/activation/registries/MimeTypeFile.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/ActivationDataFlavor.java b/src/java.activation/share/classes/javax/activation/ActivationDataFlavor.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/ActivationDataFlavor.java rename to src/java.activation/share/classes/javax/activation/ActivationDataFlavor.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/CommandInfo.java b/src/java.activation/share/classes/javax/activation/CommandInfo.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/CommandInfo.java rename to src/java.activation/share/classes/javax/activation/CommandInfo.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/CommandMap.java b/src/java.activation/share/classes/javax/activation/CommandMap.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/CommandMap.java rename to src/java.activation/share/classes/javax/activation/CommandMap.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/CommandObject.java b/src/java.activation/share/classes/javax/activation/CommandObject.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/CommandObject.java rename to src/java.activation/share/classes/javax/activation/CommandObject.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/DataContentHandler.java b/src/java.activation/share/classes/javax/activation/DataContentHandler.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/DataContentHandler.java rename to src/java.activation/share/classes/javax/activation/DataContentHandler.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/DataContentHandlerFactory.java b/src/java.activation/share/classes/javax/activation/DataContentHandlerFactory.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/DataContentHandlerFactory.java rename to src/java.activation/share/classes/javax/activation/DataContentHandlerFactory.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/DataHandler.java b/src/java.activation/share/classes/javax/activation/DataHandler.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/DataHandler.java rename to src/java.activation/share/classes/javax/activation/DataHandler.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/DataSource.java b/src/java.activation/share/classes/javax/activation/DataSource.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/DataSource.java rename to src/java.activation/share/classes/javax/activation/DataSource.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/FileDataSource.java b/src/java.activation/share/classes/javax/activation/FileDataSource.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/FileDataSource.java rename to src/java.activation/share/classes/javax/activation/FileDataSource.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/FileTypeMap.java b/src/java.activation/share/classes/javax/activation/FileTypeMap.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/FileTypeMap.java rename to src/java.activation/share/classes/javax/activation/FileTypeMap.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java b/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java rename to src/java.activation/share/classes/javax/activation/MailcapCommandMap.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/MimeType.java b/src/java.activation/share/classes/javax/activation/MimeType.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/MimeType.java rename to src/java.activation/share/classes/javax/activation/MimeType.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java b/src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java rename to src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParseException.java b/src/java.activation/share/classes/javax/activation/MimeTypeParseException.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParseException.java rename to src/java.activation/share/classes/javax/activation/MimeTypeParseException.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java b/src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java rename to src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/SecuritySupport.java b/src/java.activation/share/classes/javax/activation/SecuritySupport.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/SecuritySupport.java rename to src/java.activation/share/classes/javax/activation/SecuritySupport.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/URLDataSource.java b/src/java.activation/share/classes/javax/activation/URLDataSource.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/URLDataSource.java rename to src/java.activation/share/classes/javax/activation/URLDataSource.java diff --git a/jaxws/src/java.activation/share/classes/javax/activation/UnsupportedDataTypeException.java b/src/java.activation/share/classes/javax/activation/UnsupportedDataTypeException.java similarity index 100% rename from jaxws/src/java.activation/share/classes/javax/activation/UnsupportedDataTypeException.java rename to src/java.activation/share/classes/javax/activation/UnsupportedDataTypeException.java diff --git a/jaxws/src/java.activation/share/classes/module-info.java b/src/java.activation/share/classes/module-info.java similarity index 100% rename from jaxws/src/java.activation/share/classes/module-info.java rename to src/java.activation/share/classes/module-info.java diff --git a/jdk/src/java.base/aix/classes/sun/nio/ch/AixAsynchronousChannelProvider.java b/src/java.base/aix/classes/sun/nio/ch/AixAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/java.base/aix/classes/sun/nio/ch/AixAsynchronousChannelProvider.java rename to src/java.base/aix/classes/sun/nio/ch/AixAsynchronousChannelProvider.java diff --git a/jdk/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java b/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java similarity index 100% rename from jdk/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java rename to src/java.base/aix/classes/sun/nio/ch/AixPollPort.java diff --git a/jdk/src/java.base/aix/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java b/src/java.base/aix/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/java.base/aix/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java rename to src/java.base/aix/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java diff --git a/jdk/src/java.base/aix/classes/sun/nio/ch/DefaultSelectorProvider.java b/src/java.base/aix/classes/sun/nio/ch/DefaultSelectorProvider.java similarity index 100% rename from jdk/src/java.base/aix/classes/sun/nio/ch/DefaultSelectorProvider.java rename to src/java.base/aix/classes/sun/nio/ch/DefaultSelectorProvider.java diff --git a/jdk/src/java.base/aix/classes/sun/nio/fs/AixFileStore.java b/src/java.base/aix/classes/sun/nio/fs/AixFileStore.java similarity index 100% rename from jdk/src/java.base/aix/classes/sun/nio/fs/AixFileStore.java rename to src/java.base/aix/classes/sun/nio/fs/AixFileStore.java diff --git a/jdk/src/java.base/aix/classes/sun/nio/fs/AixFileSystem.java b/src/java.base/aix/classes/sun/nio/fs/AixFileSystem.java similarity index 100% rename from jdk/src/java.base/aix/classes/sun/nio/fs/AixFileSystem.java rename to src/java.base/aix/classes/sun/nio/fs/AixFileSystem.java diff --git a/jdk/src/java.base/aix/classes/sun/nio/fs/AixFileSystemProvider.java b/src/java.base/aix/classes/sun/nio/fs/AixFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/aix/classes/sun/nio/fs/AixFileSystemProvider.java rename to src/java.base/aix/classes/sun/nio/fs/AixFileSystemProvider.java diff --git a/jdk/src/java.base/aix/classes/sun/nio/fs/AixNativeDispatcher.java b/src/java.base/aix/classes/sun/nio/fs/AixNativeDispatcher.java similarity index 100% rename from jdk/src/java.base/aix/classes/sun/nio/fs/AixNativeDispatcher.java rename to src/java.base/aix/classes/sun/nio/fs/AixNativeDispatcher.java diff --git a/jdk/src/java.base/aix/classes/sun/nio/fs/DefaultFileSystemProvider.java b/src/java.base/aix/classes/sun/nio/fs/DefaultFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/aix/classes/sun/nio/fs/DefaultFileSystemProvider.java rename to src/java.base/aix/classes/sun/nio/fs/DefaultFileSystemProvider.java diff --git a/jdk/src/java.base/aix/conf/tzmappings b/src/java.base/aix/conf/tzmappings similarity index 100% rename from jdk/src/java.base/aix/conf/tzmappings rename to src/java.base/aix/conf/tzmappings diff --git a/jdk/src/java.base/aix/native/libjava/ProcessHandleImpl_aix.c b/src/java.base/aix/native/libjava/ProcessHandleImpl_aix.c similarity index 100% rename from jdk/src/java.base/aix/native/libjava/ProcessHandleImpl_aix.c rename to src/java.base/aix/native/libjava/ProcessHandleImpl_aix.c diff --git a/jdk/src/java.base/aix/native/libjli/java_md_aix.c b/src/java.base/aix/native/libjli/java_md_aix.c similarity index 100% rename from jdk/src/java.base/aix/native/libjli/java_md_aix.c rename to src/java.base/aix/native/libjli/java_md_aix.c diff --git a/jdk/src/java.base/aix/native/libjli/java_md_aix.h b/src/java.base/aix/native/libjli/java_md_aix.h similarity index 100% rename from jdk/src/java.base/aix/native/libjli/java_md_aix.h rename to src/java.base/aix/native/libjli/java_md_aix.h diff --git a/hotspot/src/os/aix/vm/jsig.c b/src/java.base/aix/native/libjsig/jsig.c similarity index 100% rename from hotspot/src/os/aix/vm/jsig.c rename to src/java.base/aix/native/libjsig/jsig.c diff --git a/jdk/src/java.base/aix/native/libnet/aix_close.c b/src/java.base/aix/native/libnet/aix_close.c similarity index 100% rename from jdk/src/java.base/aix/native/libnet/aix_close.c rename to src/java.base/aix/native/libnet/aix_close.c diff --git a/jdk/src/java.base/aix/native/libnio/ch/AixPollPort.c b/src/java.base/aix/native/libnio/ch/AixPollPort.c similarity index 100% rename from jdk/src/java.base/aix/native/libnio/ch/AixPollPort.c rename to src/java.base/aix/native/libnio/ch/AixPollPort.c diff --git a/jdk/src/java.base/aix/native/libnio/fs/AixNativeDispatcher.c b/src/java.base/aix/native/libnio/fs/AixNativeDispatcher.c similarity index 100% rename from jdk/src/java.base/aix/native/libnio/fs/AixNativeDispatcher.c rename to src/java.base/aix/native/libnio/fs/AixNativeDispatcher.c diff --git a/jdk/src/java.base/linux/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java b/src/java.base/linux/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java rename to src/java.base/linux/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/ch/DefaultSelectorProvider.java b/src/java.base/linux/classes/sun/nio/ch/DefaultSelectorProvider.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/ch/DefaultSelectorProvider.java rename to src/java.base/linux/classes/sun/nio/ch/DefaultSelectorProvider.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/ch/EPoll.java b/src/java.base/linux/classes/sun/nio/ch/EPoll.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/ch/EPoll.java rename to src/java.base/linux/classes/sun/nio/ch/EPoll.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/ch/EPollArrayWrapper.java b/src/java.base/linux/classes/sun/nio/ch/EPollArrayWrapper.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/ch/EPollArrayWrapper.java rename to src/java.base/linux/classes/sun/nio/ch/EPollArrayWrapper.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/ch/EPollPort.java b/src/java.base/linux/classes/sun/nio/ch/EPollPort.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/ch/EPollPort.java rename to src/java.base/linux/classes/sun/nio/ch/EPollPort.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java rename to src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/ch/EPollSelectorProvider.java b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorProvider.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/ch/EPollSelectorProvider.java rename to src/java.base/linux/classes/sun/nio/ch/EPollSelectorProvider.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java b/src/java.base/linux/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java rename to src/java.base/linux/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/fs/DefaultFileSystemProvider.java b/src/java.base/linux/classes/sun/nio/fs/DefaultFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/fs/DefaultFileSystemProvider.java rename to src/java.base/linux/classes/sun/nio/fs/DefaultFileSystemProvider.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java b/src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java rename to src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java b/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java rename to src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java b/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java rename to src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java b/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java rename to src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxNativeDispatcher.java b/src/java.base/linux/classes/sun/nio/fs/LinuxNativeDispatcher.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/fs/LinuxNativeDispatcher.java rename to src/java.base/linux/classes/sun/nio/fs/LinuxNativeDispatcher.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java b/src/java.base/linux/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java rename to src/java.base/linux/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java diff --git a/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java b/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java similarity index 100% rename from jdk/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java rename to src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java diff --git a/jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c b/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c similarity index 100% rename from jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c rename to src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c diff --git a/hotspot/src/os/linux/vm/jsig.c b/src/java.base/linux/native/libjsig/jsig.c similarity index 100% rename from hotspot/src/os/linux/vm/jsig.c rename to src/java.base/linux/native/libjsig/jsig.c diff --git a/jdk/src/java.base/linux/native/libnet/linux_close.c b/src/java.base/linux/native/libnet/linux_close.c similarity index 100% rename from jdk/src/java.base/linux/native/libnet/linux_close.c rename to src/java.base/linux/native/libnet/linux_close.c diff --git a/jdk/src/java.base/linux/native/libnio/ch/EPoll.c b/src/java.base/linux/native/libnio/ch/EPoll.c similarity index 100% rename from jdk/src/java.base/linux/native/libnio/ch/EPoll.c rename to src/java.base/linux/native/libnio/ch/EPoll.c diff --git a/jdk/src/java.base/linux/native/libnio/ch/EPollArrayWrapper.c b/src/java.base/linux/native/libnio/ch/EPollArrayWrapper.c similarity index 100% rename from jdk/src/java.base/linux/native/libnio/ch/EPollArrayWrapper.c rename to src/java.base/linux/native/libnio/ch/EPollArrayWrapper.c diff --git a/jdk/src/java.base/linux/native/libnio/ch/EPollPort.c b/src/java.base/linux/native/libnio/ch/EPollPort.c similarity index 100% rename from jdk/src/java.base/linux/native/libnio/ch/EPollPort.c rename to src/java.base/linux/native/libnio/ch/EPollPort.c diff --git a/jdk/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c similarity index 100% rename from jdk/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c rename to src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c diff --git a/jdk/src/java.base/linux/native/libnio/fs/LinuxWatchService.c b/src/java.base/linux/native/libnio/fs/LinuxWatchService.c similarity index 100% rename from jdk/src/java.base/linux/native/libnio/fs/LinuxWatchService.c rename to src/java.base/linux/native/libnio/fs/LinuxWatchService.c diff --git a/jdk/src/java.base/macosx/classes/apple/security/AppleProvider.java b/src/java.base/macosx/classes/apple/security/AppleProvider.java similarity index 100% rename from jdk/src/java.base/macosx/classes/apple/security/AppleProvider.java rename to src/java.base/macosx/classes/apple/security/AppleProvider.java diff --git a/jdk/src/java.base/macosx/classes/apple/security/KeychainStore.java b/src/java.base/macosx/classes/apple/security/KeychainStore.java similarity index 100% rename from jdk/src/java.base/macosx/classes/apple/security/KeychainStore.java rename to src/java.base/macosx/classes/apple/security/KeychainStore.java diff --git a/jdk/src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java b/src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java similarity index 100% rename from jdk/src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java rename to src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java diff --git a/jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java b/src/java.base/macosx/classes/java/net/DefaultInterface.java similarity index 100% rename from jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java rename to src/java.base/macosx/classes/java/net/DefaultInterface.java diff --git a/jdk/src/java.base/macosx/classes/module-info.java.extra b/src/java.base/macosx/classes/module-info.java.extra similarity index 100% rename from jdk/src/java.base/macosx/classes/module-info.java.extra rename to src/java.base/macosx/classes/module-info.java.extra diff --git a/jdk/src/java.base/macosx/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java b/src/java.base/macosx/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java rename to src/java.base/macosx/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java b/src/java.base/macosx/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java rename to src/java.base/macosx/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java b/src/java.base/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java rename to src/java.base/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/ch/KQueue.java b/src/java.base/macosx/classes/sun/nio/ch/KQueue.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/ch/KQueue.java rename to src/java.base/macosx/classes/sun/nio/ch/KQueue.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java b/src/java.base/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java rename to src/java.base/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/ch/KQueuePort.java b/src/java.base/macosx/classes/sun/nio/ch/KQueuePort.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/ch/KQueuePort.java rename to src/java.base/macosx/classes/sun/nio/ch/KQueuePort.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java rename to src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java rename to src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/fs/BsdFileStore.java b/src/java.base/macosx/classes/sun/nio/fs/BsdFileStore.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/fs/BsdFileStore.java rename to src/java.base/macosx/classes/sun/nio/fs/BsdFileStore.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystem.java b/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystem.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystem.java rename to src/java.base/macosx/classes/sun/nio/fs/BsdFileSystem.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystemProvider.java b/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystemProvider.java rename to src/java.base/macosx/classes/sun/nio/fs/BsdFileSystemProvider.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/fs/BsdNativeDispatcher.java b/src/java.base/macosx/classes/sun/nio/fs/BsdNativeDispatcher.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/fs/BsdNativeDispatcher.java rename to src/java.base/macosx/classes/sun/nio/fs/BsdNativeDispatcher.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/fs/DefaultFileSystemProvider.java b/src/java.base/macosx/classes/sun/nio/fs/DefaultFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/fs/DefaultFileSystemProvider.java rename to src/java.base/macosx/classes/sun/nio/fs/DefaultFileSystemProvider.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystem.java b/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystem.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystem.java rename to src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystem.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystemProvider.java b/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystemProvider.java rename to src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystemProvider.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/fs/MacOSXNativeDispatcher.java b/src/java.base/macosx/classes/sun/nio/fs/MacOSXNativeDispatcher.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/fs/MacOSXNativeDispatcher.java rename to src/java.base/macosx/classes/sun/nio/fs/MacOSXNativeDispatcher.java diff --git a/jdk/src/java.base/macosx/classes/sun/nio/fs/UTIFileTypeDetector.java b/src/java.base/macosx/classes/sun/nio/fs/UTIFileTypeDetector.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/nio/fs/UTIFileTypeDetector.java rename to src/java.base/macosx/classes/sun/nio/fs/UTIFileTypeDetector.java diff --git a/jdk/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java b/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java similarity index 100% rename from jdk/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java rename to src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java diff --git a/jdk/src/java.base/macosx/conf/x86_64/jvm.cfg b/src/java.base/macosx/conf/x86_64/jvm.cfg similarity index 100% rename from jdk/src/java.base/macosx/conf/x86_64/jvm.cfg rename to src/java.base/macosx/conf/x86_64/jvm.cfg diff --git a/jdk/src/java.base/macosx/native/include/jni_md.h b/src/java.base/macosx/native/include/jni_md.h similarity index 100% rename from jdk/src/java.base/macosx/native/include/jni_md.h rename to src/java.base/macosx/native/include/jni_md.h diff --git a/jdk/src/java.base/macosx/native/include/jvm_md.h b/src/java.base/macosx/native/include/jvm_md.h similarity index 100% rename from jdk/src/java.base/macosx/native/include/jvm_md.h rename to src/java.base/macosx/native/include/jvm_md.h diff --git a/jdk/src/java.base/macosx/native/launcher/Info-cmdline.plist b/src/java.base/macosx/native/launcher/Info-cmdline.plist similarity index 100% rename from jdk/src/java.base/macosx/native/launcher/Info-cmdline.plist rename to src/java.base/macosx/native/launcher/Info-cmdline.plist diff --git a/hotspot/src/os/bsd/launcher/Info-privileged.plist b/src/java.base/macosx/native/launcher/Info-privileged.plist similarity index 100% rename from hotspot/src/os/bsd/launcher/Info-privileged.plist rename to src/java.base/macosx/native/launcher/Info-privileged.plist diff --git a/jdk/src/java.base/macosx/native/libjava/HostLocaleProviderAdapter_md.c b/src/java.base/macosx/native/libjava/HostLocaleProviderAdapter_md.c similarity index 100% rename from jdk/src/java.base/macosx/native/libjava/HostLocaleProviderAdapter_md.c rename to src/java.base/macosx/native/libjava/HostLocaleProviderAdapter_md.c diff --git a/jdk/src/java.base/macosx/native/libjava/ProcessHandleImpl_macosx.c b/src/java.base/macosx/native/libjava/ProcessHandleImpl_macosx.c similarity index 100% rename from jdk/src/java.base/macosx/native/libjava/ProcessHandleImpl_macosx.c rename to src/java.base/macosx/native/libjava/ProcessHandleImpl_macosx.c diff --git a/jdk/src/java.base/macosx/native/libjava/java_props_macosx.c b/src/java.base/macosx/native/libjava/java_props_macosx.c similarity index 100% rename from jdk/src/java.base/macosx/native/libjava/java_props_macosx.c rename to src/java.base/macosx/native/libjava/java_props_macosx.c diff --git a/jdk/src/java.base/macosx/native/libjava/java_props_macosx.h b/src/java.base/macosx/native/libjava/java_props_macosx.h similarity index 100% rename from jdk/src/java.base/macosx/native/libjava/java_props_macosx.h rename to src/java.base/macosx/native/libjava/java_props_macosx.h diff --git a/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c b/src/java.base/macosx/native/libjli/java_md_macosx.c similarity index 100% rename from jdk/src/java.base/macosx/native/libjli/java_md_macosx.c rename to src/java.base/macosx/native/libjli/java_md_macosx.c diff --git a/jdk/src/java.base/macosx/native/libjli/java_md_macosx.h b/src/java.base/macosx/native/libjli/java_md_macosx.h similarity index 100% rename from jdk/src/java.base/macosx/native/libjli/java_md_macosx.h rename to src/java.base/macosx/native/libjli/java_md_macosx.h diff --git a/hotspot/src/os/bsd/vm/jsig.c b/src/java.base/macosx/native/libjsig/jsig.c similarity index 100% rename from hotspot/src/os/bsd/vm/jsig.c rename to src/java.base/macosx/native/libjsig/jsig.c diff --git a/jdk/src/java.base/macosx/native/libnet/DefaultProxySelector.c b/src/java.base/macosx/native/libnet/DefaultProxySelector.c similarity index 100% rename from jdk/src/java.base/macosx/native/libnet/DefaultProxySelector.c rename to src/java.base/macosx/native/libnet/DefaultProxySelector.c diff --git a/jdk/src/java.base/macosx/native/libnet/bsd_close.c b/src/java.base/macosx/native/libnet/bsd_close.c similarity index 100% rename from jdk/src/java.base/macosx/native/libnet/bsd_close.c rename to src/java.base/macosx/native/libnet/bsd_close.c diff --git a/jdk/src/java.base/macosx/native/libnio/ch/KQueue.c b/src/java.base/macosx/native/libnio/ch/KQueue.c similarity index 100% rename from jdk/src/java.base/macosx/native/libnio/ch/KQueue.c rename to src/java.base/macosx/native/libnio/ch/KQueue.c diff --git a/jdk/src/java.base/macosx/native/libnio/ch/KQueueArrayWrapper.c b/src/java.base/macosx/native/libnio/ch/KQueueArrayWrapper.c similarity index 100% rename from jdk/src/java.base/macosx/native/libnio/ch/KQueueArrayWrapper.c rename to src/java.base/macosx/native/libnio/ch/KQueueArrayWrapper.c diff --git a/jdk/src/java.base/macosx/native/libnio/ch/KQueuePort.c b/src/java.base/macosx/native/libnio/ch/KQueuePort.c similarity index 100% rename from jdk/src/java.base/macosx/native/libnio/ch/KQueuePort.c rename to src/java.base/macosx/native/libnio/ch/KQueuePort.c diff --git a/jdk/src/java.base/macosx/native/libnio/fs/BsdNativeDispatcher.c b/src/java.base/macosx/native/libnio/fs/BsdNativeDispatcher.c similarity index 100% rename from jdk/src/java.base/macosx/native/libnio/fs/BsdNativeDispatcher.c rename to src/java.base/macosx/native/libnio/fs/BsdNativeDispatcher.c diff --git a/jdk/src/java.base/macosx/native/libnio/fs/MacOSXNativeDispatcher.c b/src/java.base/macosx/native/libnio/fs/MacOSXNativeDispatcher.c similarity index 100% rename from jdk/src/java.base/macosx/native/libnio/fs/MacOSXNativeDispatcher.c rename to src/java.base/macosx/native/libnio/fs/MacOSXNativeDispatcher.c diff --git a/jdk/src/java.base/macosx/native/libnio/fs/UTIFileTypeDetector.c b/src/java.base/macosx/native/libnio/fs/UTIFileTypeDetector.c similarity index 100% rename from jdk/src/java.base/macosx/native/libnio/fs/UTIFileTypeDetector.c rename to src/java.base/macosx/native/libnio/fs/UTIFileTypeDetector.c diff --git a/jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m b/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m similarity index 100% rename from jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m rename to src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m diff --git a/jdk/src/java.base/share/classes/META-INF/services/java.nio.file.spi.FileSystemProvider b/src/java.base/share/classes/META-INF/services/java.nio.file.spi.FileSystemProvider similarity index 100% rename from jdk/src/java.base/share/classes/META-INF/services/java.nio.file.spi.FileSystemProvider rename to src/java.base/share/classes/META-INF/services/java.nio.file.spi.FileSystemProvider diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESConstants.java b/src/java.base/share/classes/com/sun/crypto/provider/AESConstants.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/AESConstants.java rename to src/java.base/share/classes/com/sun/crypto/provider/AESConstants.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESCrypt.java b/src/java.base/share/classes/com/sun/crypto/provider/AESCrypt.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/AESCrypt.java rename to src/java.base/share/classes/com/sun/crypto/provider/AESCrypt.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java rename to src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESParameters.java b/src/java.base/share/classes/com/sun/crypto/provider/AESParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/AESParameters.java rename to src/java.base/share/classes/com/sun/crypto/provider/AESParameters.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESWrapCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/AESWrapCipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/AESWrapCipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/AESWrapCipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java b/src/java.base/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java rename to src/java.base/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/BlowfishCipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishConstants.java b/src/java.base/share/classes/com/sun/crypto/provider/BlowfishConstants.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishConstants.java rename to src/java.base/share/classes/com/sun/crypto/provider/BlowfishConstants.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCrypt.java b/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCrypt.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCrypt.java rename to src/java.base/share/classes/com/sun/crypto/provider/BlowfishCrypt.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java rename to src/java.base/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishParameters.java b/src/java.base/share/classes/com/sun/crypto/provider/BlowfishParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/BlowfishParameters.java rename to src/java.base/share/classes/com/sun/crypto/provider/BlowfishParameters.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java b/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java rename to src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java b/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java rename to src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherFeedback.java b/src/java.base/share/classes/com/sun/crypto/provider/CipherFeedback.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherFeedback.java rename to src/java.base/share/classes/com/sun/crypto/provider/CipherFeedback.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherTextStealing.java b/src/java.base/share/classes/com/sun/crypto/provider/CipherTextStealing.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherTextStealing.java rename to src/java.base/share/classes/com/sun/crypto/provider/CipherTextStealing.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherWithWrappingSpi.java b/src/java.base/share/classes/com/sun/crypto/provider/CipherWithWrappingSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherWithWrappingSpi.java rename to src/java.base/share/classes/com/sun/crypto/provider/CipherWithWrappingSpi.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/ConstructKeys.java b/src/java.base/share/classes/com/sun/crypto/provider/ConstructKeys.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/ConstructKeys.java rename to src/java.base/share/classes/com/sun/crypto/provider/ConstructKeys.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java b/src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java rename to src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/DESCipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESCipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESCipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESConstants.java b/src/java.base/share/classes/com/sun/crypto/provider/DESConstants.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESConstants.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESConstants.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESCrypt.java b/src/java.base/share/classes/com/sun/crypto/provider/DESCrypt.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESCrypt.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESCrypt.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESKey.java b/src/java.base/share/classes/com/sun/crypto/provider/DESKey.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESKey.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESKey.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESKeyFactory.java b/src/java.base/share/classes/com/sun/crypto/provider/DESKeyFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESKeyFactory.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESKeyFactory.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESKeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/DESKeyGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESKeyGenerator.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESKeyGenerator.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESParameters.java b/src/java.base/share/classes/com/sun/crypto/provider/DESParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESParameters.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESParameters.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/DESedeCipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeCipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESedeCipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeCrypt.java b/src/java.base/share/classes/com/sun/crypto/provider/DESedeCrypt.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeCrypt.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESedeCrypt.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeKey.java b/src/java.base/share/classes/com/sun/crypto/provider/DESedeKey.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeKey.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESedeKey.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java b/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeParameters.java b/src/java.base/share/classes/com/sun/crypto/provider/DESedeParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeParameters.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESedeParameters.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java rename to src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHKeyFactory.java b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DHKeyFactory.java rename to src/java.base/share/classes/com/sun/crypto/provider/DHKeyFactory.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java rename to src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/DHParameterGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DHParameterGenerator.java rename to src/java.base/share/classes/com/sun/crypto/provider/DHParameterGenerator.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHParameters.java b/src/java.base/share/classes/com/sun/crypto/provider/DHParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DHParameters.java rename to src/java.base/share/classes/com/sun/crypto/provider/DHParameters.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHPrivateKey.java b/src/java.base/share/classes/com/sun/crypto/provider/DHPrivateKey.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DHPrivateKey.java rename to src/java.base/share/classes/com/sun/crypto/provider/DHPrivateKey.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/DHPublicKey.java b/src/java.base/share/classes/com/sun/crypto/provider/DHPublicKey.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/DHPublicKey.java rename to src/java.base/share/classes/com/sun/crypto/provider/DHPublicKey.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java b/src/java.base/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java rename to src/java.base/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java b/src/java.base/share/classes/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java rename to src/java.base/share/classes/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/GCMParameters.java b/src/java.base/share/classes/com/sun/crypto/provider/GCMParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/GCMParameters.java rename to src/java.base/share/classes/com/sun/crypto/provider/GCMParameters.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java b/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java rename to src/java.base/share/classes/com/sun/crypto/provider/GCTR.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java b/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java rename to src/java.base/share/classes/com/sun/crypto/provider/GHASH.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java b/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java rename to src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacCore.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacCore.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacCore.java rename to src/java.base/share/classes/com/sun/crypto/provider/HmacCore.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5.java rename to src/java.base/share/classes/com/sun/crypto/provider/HmacMD5.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java rename to src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java rename to src/java.base/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1.java rename to src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java rename to src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java b/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java rename to src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java b/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java rename to src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java b/src/java.base/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java rename to src/java.base/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java b/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java rename to src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java b/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java rename to src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/OutputFeedback.java b/src/java.base/share/classes/com/sun/crypto/provider/OutputFeedback.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/OutputFeedback.java rename to src/java.base/share/classes/com/sun/crypto/provider/OutputFeedback.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBECipherCore.java b/src/java.base/share/classes/com/sun/crypto/provider/PBECipherCore.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBECipherCore.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBECipherCore.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEKey.java b/src/java.base/share/classes/com/sun/crypto/provider/PBEKey.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEKey.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBEKey.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java b/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEParameters.java b/src/java.base/share/classes/com/sun/crypto/provider/PBEParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEParameters.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBEParameters.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java b/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBES2Core.java b/src/java.base/share/classes/com/sun/crypto/provider/PBES2Core.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBES2Core.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBES2Core.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java b/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2Core.java b/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2Core.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2Core.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBKDF2Core.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java b/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java b/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBMAC1Core.java b/src/java.base/share/classes/com/sun/crypto/provider/PBMAC1Core.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PBMAC1Core.java rename to src/java.base/share/classes/com/sun/crypto/provider/PBMAC1Core.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PCBC.java b/src/java.base/share/classes/com/sun/crypto/provider/PCBC.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PCBC.java rename to src/java.base/share/classes/com/sun/crypto/provider/PCBC.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java b/src/java.base/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java rename to src/java.base/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java b/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java rename to src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/Padding.java b/src/java.base/share/classes/com/sun/crypto/provider/Padding.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/Padding.java rename to src/java.base/share/classes/com/sun/crypto/provider/Padding.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PrivateKeyInfo.java b/src/java.base/share/classes/com/sun/crypto/provider/PrivateKeyInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/PrivateKeyInfo.java rename to src/java.base/share/classes/com/sun/crypto/provider/PrivateKeyInfo.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Cipher.java b/src/java.base/share/classes/com/sun/crypto/provider/RC2Cipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Cipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/RC2Cipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java b/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java rename to src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java b/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java rename to src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java b/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java b/src/java.base/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java rename to src/java.base/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/SslMacCore.java b/src/java.base/share/classes/com/sun/crypto/provider/SslMacCore.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/SslMacCore.java rename to src/java.base/share/classes/com/sun/crypto/provider/SslMacCore.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java rename to src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/SymmetricCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/SymmetricCipher.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/SymmetricCipher.java rename to src/java.base/share/classes/com/sun/crypto/provider/SymmetricCipher.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java rename to src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java rename to src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java rename to src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java rename to src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/ai.java b/src/java.base/share/classes/com/sun/crypto/provider/ai.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/crypto/provider/ai.java rename to src/java.base/share/classes/com/sun/crypto/provider/ai.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ClassReader.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/ClassReader.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ClassReader.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/ClassReader.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ClassWriter.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/ClassWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ClassWriter.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/ClassWriter.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingMethod.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingMethod.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingMethod.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/CodingMethod.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/FixedList.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/FixedList.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/FixedList.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/FixedList.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Fixups.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/Fixups.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Fixups.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/Fixups.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageWriter.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageWriter.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/PackageWriter.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PropMap.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/PropMap.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PropMap.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/PropMap.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/TLGlobals.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/TLGlobals.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/TLGlobals.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/TLGlobals.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties b/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties rename to src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/package-info.java b/src/java.base/share/classes/com/sun/java/util/jar/pack/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/package-info.java rename to src/java.base/share/classes/com/sun/java/util/jar/pack/package-info.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java b/src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java rename to src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java b/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java rename to src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManager.java b/src/java.base/share/classes/com/sun/net/ssl/KeyManager.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManager.java rename to src/java.base/share/classes/com/sun/net/ssl/KeyManager.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java b/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java rename to src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java b/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java rename to src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContext.java b/src/java.base/share/classes/com/sun/net/ssl/SSLContext.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContext.java rename to src/java.base/share/classes/com/sun/net/ssl/SSLContext.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java b/src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java rename to src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java b/src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java rename to src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLSecurity.java b/src/java.base/share/classes/com/sun/net/ssl/SSLSecurity.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/SSLSecurity.java rename to src/java.base/share/classes/com/sun/net/ssl/SSLSecurity.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManager.java b/src/java.base/share/classes/com/sun/net/ssl/TrustManager.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManager.java rename to src/java.base/share/classes/com/sun/net/ssl/TrustManager.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java b/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java rename to src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java b/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java rename to src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java b/src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java rename to src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java b/src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java rename to src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java b/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java rename to src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java b/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java rename to src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java b/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java rename to src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java b/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java rename to src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java b/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java rename to src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/package-info.java b/src/java.base/share/classes/com/sun/net/ssl/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/net/ssl/package-info.java rename to src/java.base/share/classes/com/sun/net/ssl/package-info.java diff --git a/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java b/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java rename to src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java diff --git a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java b/src/java.base/share/classes/com/sun/security/ntlm/Client.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java rename to src/java.base/share/classes/com/sun/security/ntlm/Client.java diff --git a/jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLM.java b/src/java.base/share/classes/com/sun/security/ntlm/NTLM.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLM.java rename to src/java.base/share/classes/com/sun/security/ntlm/NTLM.java diff --git a/jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java b/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java rename to src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java diff --git a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java b/src/java.base/share/classes/com/sun/security/ntlm/Server.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java rename to src/java.base/share/classes/com/sun/security/ntlm/Server.java diff --git a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Version.java b/src/java.base/share/classes/com/sun/security/ntlm/Version.java similarity index 100% rename from jdk/src/java.base/share/classes/com/sun/security/ntlm/Version.java rename to src/java.base/share/classes/com/sun/security/ntlm/Version.java diff --git a/jdk/src/java.base/share/classes/java/io/Bits.java b/src/java.base/share/classes/java/io/Bits.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/Bits.java rename to src/java.base/share/classes/java/io/Bits.java diff --git a/jdk/src/java.base/share/classes/java/io/BufferedInputStream.java b/src/java.base/share/classes/java/io/BufferedInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/BufferedInputStream.java rename to src/java.base/share/classes/java/io/BufferedInputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/BufferedOutputStream.java b/src/java.base/share/classes/java/io/BufferedOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/BufferedOutputStream.java rename to src/java.base/share/classes/java/io/BufferedOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/BufferedReader.java b/src/java.base/share/classes/java/io/BufferedReader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/BufferedReader.java rename to src/java.base/share/classes/java/io/BufferedReader.java diff --git a/jdk/src/java.base/share/classes/java/io/BufferedWriter.java b/src/java.base/share/classes/java/io/BufferedWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/BufferedWriter.java rename to src/java.base/share/classes/java/io/BufferedWriter.java diff --git a/jdk/src/java.base/share/classes/java/io/ByteArrayInputStream.java b/src/java.base/share/classes/java/io/ByteArrayInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ByteArrayInputStream.java rename to src/java.base/share/classes/java/io/ByteArrayInputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/ByteArrayOutputStream.java b/src/java.base/share/classes/java/io/ByteArrayOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ByteArrayOutputStream.java rename to src/java.base/share/classes/java/io/ByteArrayOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/CharArrayReader.java b/src/java.base/share/classes/java/io/CharArrayReader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/CharArrayReader.java rename to src/java.base/share/classes/java/io/CharArrayReader.java diff --git a/jdk/src/java.base/share/classes/java/io/CharArrayWriter.java b/src/java.base/share/classes/java/io/CharArrayWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/CharArrayWriter.java rename to src/java.base/share/classes/java/io/CharArrayWriter.java diff --git a/jdk/src/java.base/share/classes/java/io/CharConversionException.java b/src/java.base/share/classes/java/io/CharConversionException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/CharConversionException.java rename to src/java.base/share/classes/java/io/CharConversionException.java diff --git a/jdk/src/java.base/share/classes/java/io/Closeable.java b/src/java.base/share/classes/java/io/Closeable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/Closeable.java rename to src/java.base/share/classes/java/io/Closeable.java diff --git a/jdk/src/java.base/share/classes/java/io/Console.java b/src/java.base/share/classes/java/io/Console.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/Console.java rename to src/java.base/share/classes/java/io/Console.java diff --git a/jdk/src/java.base/share/classes/java/io/DataInput.java b/src/java.base/share/classes/java/io/DataInput.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/DataInput.java rename to src/java.base/share/classes/java/io/DataInput.java diff --git a/jdk/src/java.base/share/classes/java/io/DataInputStream.java b/src/java.base/share/classes/java/io/DataInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/DataInputStream.java rename to src/java.base/share/classes/java/io/DataInputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/DataOutput.java b/src/java.base/share/classes/java/io/DataOutput.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/DataOutput.java rename to src/java.base/share/classes/java/io/DataOutput.java diff --git a/jdk/src/java.base/share/classes/java/io/DataOutputStream.java b/src/java.base/share/classes/java/io/DataOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/DataOutputStream.java rename to src/java.base/share/classes/java/io/DataOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/DeleteOnExitHook.java b/src/java.base/share/classes/java/io/DeleteOnExitHook.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/DeleteOnExitHook.java rename to src/java.base/share/classes/java/io/DeleteOnExitHook.java diff --git a/jdk/src/java.base/share/classes/java/io/EOFException.java b/src/java.base/share/classes/java/io/EOFException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/EOFException.java rename to src/java.base/share/classes/java/io/EOFException.java diff --git a/jdk/src/java.base/share/classes/java/io/ExpiringCache.java b/src/java.base/share/classes/java/io/ExpiringCache.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ExpiringCache.java rename to src/java.base/share/classes/java/io/ExpiringCache.java diff --git a/jdk/src/java.base/share/classes/java/io/Externalizable.java b/src/java.base/share/classes/java/io/Externalizable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/Externalizable.java rename to src/java.base/share/classes/java/io/Externalizable.java diff --git a/jdk/src/java.base/share/classes/java/io/File.java b/src/java.base/share/classes/java/io/File.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/File.java rename to src/java.base/share/classes/java/io/File.java diff --git a/jdk/src/java.base/share/classes/java/io/FileFilter.java b/src/java.base/share/classes/java/io/FileFilter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FileFilter.java rename to src/java.base/share/classes/java/io/FileFilter.java diff --git a/jdk/src/java.base/share/classes/java/io/FileInputStream.java b/src/java.base/share/classes/java/io/FileInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FileInputStream.java rename to src/java.base/share/classes/java/io/FileInputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/FileNotFoundException.java b/src/java.base/share/classes/java/io/FileNotFoundException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FileNotFoundException.java rename to src/java.base/share/classes/java/io/FileNotFoundException.java diff --git a/jdk/src/java.base/share/classes/java/io/FileOutputStream.java b/src/java.base/share/classes/java/io/FileOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FileOutputStream.java rename to src/java.base/share/classes/java/io/FileOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/FilePermission.java b/src/java.base/share/classes/java/io/FilePermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FilePermission.java rename to src/java.base/share/classes/java/io/FilePermission.java diff --git a/jdk/src/java.base/share/classes/java/io/FileReader.java b/src/java.base/share/classes/java/io/FileReader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FileReader.java rename to src/java.base/share/classes/java/io/FileReader.java diff --git a/jdk/src/java.base/share/classes/java/io/FileSystem.java b/src/java.base/share/classes/java/io/FileSystem.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FileSystem.java rename to src/java.base/share/classes/java/io/FileSystem.java diff --git a/jdk/src/java.base/share/classes/java/io/FileWriter.java b/src/java.base/share/classes/java/io/FileWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FileWriter.java rename to src/java.base/share/classes/java/io/FileWriter.java diff --git a/jdk/src/java.base/share/classes/java/io/FilenameFilter.java b/src/java.base/share/classes/java/io/FilenameFilter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FilenameFilter.java rename to src/java.base/share/classes/java/io/FilenameFilter.java diff --git a/jdk/src/java.base/share/classes/java/io/FilterInputStream.java b/src/java.base/share/classes/java/io/FilterInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FilterInputStream.java rename to src/java.base/share/classes/java/io/FilterInputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/FilterOutputStream.java b/src/java.base/share/classes/java/io/FilterOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FilterOutputStream.java rename to src/java.base/share/classes/java/io/FilterOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/FilterReader.java b/src/java.base/share/classes/java/io/FilterReader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FilterReader.java rename to src/java.base/share/classes/java/io/FilterReader.java diff --git a/jdk/src/java.base/share/classes/java/io/FilterWriter.java b/src/java.base/share/classes/java/io/FilterWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/FilterWriter.java rename to src/java.base/share/classes/java/io/FilterWriter.java diff --git a/jdk/src/java.base/share/classes/java/io/Flushable.java b/src/java.base/share/classes/java/io/Flushable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/Flushable.java rename to src/java.base/share/classes/java/io/Flushable.java diff --git a/jdk/src/java.base/share/classes/java/io/IOError.java b/src/java.base/share/classes/java/io/IOError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/IOError.java rename to src/java.base/share/classes/java/io/IOError.java diff --git a/jdk/src/java.base/share/classes/java/io/IOException.java b/src/java.base/share/classes/java/io/IOException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/IOException.java rename to src/java.base/share/classes/java/io/IOException.java diff --git a/jdk/src/java.base/share/classes/java/io/InputStream.java b/src/java.base/share/classes/java/io/InputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/InputStream.java rename to src/java.base/share/classes/java/io/InputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/InputStreamReader.java b/src/java.base/share/classes/java/io/InputStreamReader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/InputStreamReader.java rename to src/java.base/share/classes/java/io/InputStreamReader.java diff --git a/jdk/src/java.base/share/classes/java/io/InterruptedIOException.java b/src/java.base/share/classes/java/io/InterruptedIOException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/InterruptedIOException.java rename to src/java.base/share/classes/java/io/InterruptedIOException.java diff --git a/jdk/src/java.base/share/classes/java/io/InvalidClassException.java b/src/java.base/share/classes/java/io/InvalidClassException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/InvalidClassException.java rename to src/java.base/share/classes/java/io/InvalidClassException.java diff --git a/jdk/src/java.base/share/classes/java/io/InvalidObjectException.java b/src/java.base/share/classes/java/io/InvalidObjectException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/InvalidObjectException.java rename to src/java.base/share/classes/java/io/InvalidObjectException.java diff --git a/jdk/src/java.base/share/classes/java/io/LineNumberInputStream.java b/src/java.base/share/classes/java/io/LineNumberInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/LineNumberInputStream.java rename to src/java.base/share/classes/java/io/LineNumberInputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/LineNumberReader.java b/src/java.base/share/classes/java/io/LineNumberReader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/LineNumberReader.java rename to src/java.base/share/classes/java/io/LineNumberReader.java diff --git a/jdk/src/java.base/share/classes/java/io/NotActiveException.java b/src/java.base/share/classes/java/io/NotActiveException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/NotActiveException.java rename to src/java.base/share/classes/java/io/NotActiveException.java diff --git a/jdk/src/java.base/share/classes/java/io/NotSerializableException.java b/src/java.base/share/classes/java/io/NotSerializableException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/NotSerializableException.java rename to src/java.base/share/classes/java/io/NotSerializableException.java diff --git a/jdk/src/java.base/share/classes/java/io/ObjectInput.java b/src/java.base/share/classes/java/io/ObjectInput.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ObjectInput.java rename to src/java.base/share/classes/java/io/ObjectInput.java diff --git a/jdk/src/java.base/share/classes/java/io/ObjectInputFilter.java b/src/java.base/share/classes/java/io/ObjectInputFilter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ObjectInputFilter.java rename to src/java.base/share/classes/java/io/ObjectInputFilter.java diff --git a/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ObjectInputStream.java rename to src/java.base/share/classes/java/io/ObjectInputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/ObjectInputValidation.java b/src/java.base/share/classes/java/io/ObjectInputValidation.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ObjectInputValidation.java rename to src/java.base/share/classes/java/io/ObjectInputValidation.java diff --git a/jdk/src/java.base/share/classes/java/io/ObjectOutput.java b/src/java.base/share/classes/java/io/ObjectOutput.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ObjectOutput.java rename to src/java.base/share/classes/java/io/ObjectOutput.java diff --git a/jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java b/src/java.base/share/classes/java/io/ObjectOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java rename to src/java.base/share/classes/java/io/ObjectOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java b/src/java.base/share/classes/java/io/ObjectStreamClass.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java rename to src/java.base/share/classes/java/io/ObjectStreamClass.java diff --git a/jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java b/src/java.base/share/classes/java/io/ObjectStreamConstants.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java rename to src/java.base/share/classes/java/io/ObjectStreamConstants.java diff --git a/jdk/src/java.base/share/classes/java/io/ObjectStreamException.java b/src/java.base/share/classes/java/io/ObjectStreamException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ObjectStreamException.java rename to src/java.base/share/classes/java/io/ObjectStreamException.java diff --git a/jdk/src/java.base/share/classes/java/io/ObjectStreamField.java b/src/java.base/share/classes/java/io/ObjectStreamField.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/ObjectStreamField.java rename to src/java.base/share/classes/java/io/ObjectStreamField.java diff --git a/jdk/src/java.base/share/classes/java/io/OptionalDataException.java b/src/java.base/share/classes/java/io/OptionalDataException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/OptionalDataException.java rename to src/java.base/share/classes/java/io/OptionalDataException.java diff --git a/jdk/src/java.base/share/classes/java/io/OutputStream.java b/src/java.base/share/classes/java/io/OutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/OutputStream.java rename to src/java.base/share/classes/java/io/OutputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/OutputStreamWriter.java b/src/java.base/share/classes/java/io/OutputStreamWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/OutputStreamWriter.java rename to src/java.base/share/classes/java/io/OutputStreamWriter.java diff --git a/jdk/src/java.base/share/classes/java/io/PipedInputStream.java b/src/java.base/share/classes/java/io/PipedInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/PipedInputStream.java rename to src/java.base/share/classes/java/io/PipedInputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/PipedOutputStream.java b/src/java.base/share/classes/java/io/PipedOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/PipedOutputStream.java rename to src/java.base/share/classes/java/io/PipedOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/PipedReader.java b/src/java.base/share/classes/java/io/PipedReader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/PipedReader.java rename to src/java.base/share/classes/java/io/PipedReader.java diff --git a/jdk/src/java.base/share/classes/java/io/PipedWriter.java b/src/java.base/share/classes/java/io/PipedWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/PipedWriter.java rename to src/java.base/share/classes/java/io/PipedWriter.java diff --git a/jdk/src/java.base/share/classes/java/io/PrintStream.java b/src/java.base/share/classes/java/io/PrintStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/PrintStream.java rename to src/java.base/share/classes/java/io/PrintStream.java diff --git a/jdk/src/java.base/share/classes/java/io/PrintWriter.java b/src/java.base/share/classes/java/io/PrintWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/PrintWriter.java rename to src/java.base/share/classes/java/io/PrintWriter.java diff --git a/jdk/src/java.base/share/classes/java/io/PushbackInputStream.java b/src/java.base/share/classes/java/io/PushbackInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/PushbackInputStream.java rename to src/java.base/share/classes/java/io/PushbackInputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/PushbackReader.java b/src/java.base/share/classes/java/io/PushbackReader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/PushbackReader.java rename to src/java.base/share/classes/java/io/PushbackReader.java diff --git a/jdk/src/java.base/share/classes/java/io/RandomAccessFile.java b/src/java.base/share/classes/java/io/RandomAccessFile.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/RandomAccessFile.java rename to src/java.base/share/classes/java/io/RandomAccessFile.java diff --git a/jdk/src/java.base/share/classes/java/io/Reader.java b/src/java.base/share/classes/java/io/Reader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/Reader.java rename to src/java.base/share/classes/java/io/Reader.java diff --git a/jdk/src/java.base/share/classes/java/io/SequenceInputStream.java b/src/java.base/share/classes/java/io/SequenceInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/SequenceInputStream.java rename to src/java.base/share/classes/java/io/SequenceInputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/SerialCallbackContext.java b/src/java.base/share/classes/java/io/SerialCallbackContext.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/SerialCallbackContext.java rename to src/java.base/share/classes/java/io/SerialCallbackContext.java diff --git a/jdk/src/java.base/share/classes/java/io/Serializable.java b/src/java.base/share/classes/java/io/Serializable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/Serializable.java rename to src/java.base/share/classes/java/io/Serializable.java diff --git a/jdk/src/java.base/share/classes/java/io/SerializablePermission.java b/src/java.base/share/classes/java/io/SerializablePermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/SerializablePermission.java rename to src/java.base/share/classes/java/io/SerializablePermission.java diff --git a/jdk/src/java.base/share/classes/java/io/StreamCorruptedException.java b/src/java.base/share/classes/java/io/StreamCorruptedException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/StreamCorruptedException.java rename to src/java.base/share/classes/java/io/StreamCorruptedException.java diff --git a/jdk/src/java.base/share/classes/java/io/StreamTokenizer.java b/src/java.base/share/classes/java/io/StreamTokenizer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/StreamTokenizer.java rename to src/java.base/share/classes/java/io/StreamTokenizer.java diff --git a/jdk/src/java.base/share/classes/java/io/StringBufferInputStream.java b/src/java.base/share/classes/java/io/StringBufferInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/StringBufferInputStream.java rename to src/java.base/share/classes/java/io/StringBufferInputStream.java diff --git a/jdk/src/java.base/share/classes/java/io/StringReader.java b/src/java.base/share/classes/java/io/StringReader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/StringReader.java rename to src/java.base/share/classes/java/io/StringReader.java diff --git a/jdk/src/java.base/share/classes/java/io/StringWriter.java b/src/java.base/share/classes/java/io/StringWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/StringWriter.java rename to src/java.base/share/classes/java/io/StringWriter.java diff --git a/jdk/src/java.base/share/classes/java/io/SyncFailedException.java b/src/java.base/share/classes/java/io/SyncFailedException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/SyncFailedException.java rename to src/java.base/share/classes/java/io/SyncFailedException.java diff --git a/jdk/src/java.base/share/classes/java/io/UTFDataFormatException.java b/src/java.base/share/classes/java/io/UTFDataFormatException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/UTFDataFormatException.java rename to src/java.base/share/classes/java/io/UTFDataFormatException.java diff --git a/jdk/src/java.base/share/classes/java/io/UncheckedIOException.java b/src/java.base/share/classes/java/io/UncheckedIOException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/UncheckedIOException.java rename to src/java.base/share/classes/java/io/UncheckedIOException.java diff --git a/jdk/src/java.base/share/classes/java/io/UnsupportedEncodingException.java b/src/java.base/share/classes/java/io/UnsupportedEncodingException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/UnsupportedEncodingException.java rename to src/java.base/share/classes/java/io/UnsupportedEncodingException.java diff --git a/jdk/src/java.base/share/classes/java/io/WriteAbortedException.java b/src/java.base/share/classes/java/io/WriteAbortedException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/WriteAbortedException.java rename to src/java.base/share/classes/java/io/WriteAbortedException.java diff --git a/jdk/src/java.base/share/classes/java/io/Writer.java b/src/java.base/share/classes/java/io/Writer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/Writer.java rename to src/java.base/share/classes/java/io/Writer.java diff --git a/jdk/src/java.base/share/classes/java/io/package-info.java b/src/java.base/share/classes/java/io/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/io/package-info.java rename to src/java.base/share/classes/java/io/package-info.java diff --git a/jdk/src/java.base/share/classes/java/lang/AbstractMethodError.java b/src/java.base/share/classes/java/lang/AbstractMethodError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/AbstractMethodError.java rename to src/java.base/share/classes/java/lang/AbstractMethodError.java diff --git a/jdk/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/AbstractStringBuilder.java rename to src/java.base/share/classes/java/lang/AbstractStringBuilder.java diff --git a/jdk/src/java.base/share/classes/java/lang/Appendable.java b/src/java.base/share/classes/java/lang/Appendable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Appendable.java rename to src/java.base/share/classes/java/lang/Appendable.java diff --git a/jdk/src/java.base/share/classes/java/lang/ApplicationShutdownHooks.java b/src/java.base/share/classes/java/lang/ApplicationShutdownHooks.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ApplicationShutdownHooks.java rename to src/java.base/share/classes/java/lang/ApplicationShutdownHooks.java diff --git a/jdk/src/java.base/share/classes/java/lang/ArithmeticException.java b/src/java.base/share/classes/java/lang/ArithmeticException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ArithmeticException.java rename to src/java.base/share/classes/java/lang/ArithmeticException.java diff --git a/jdk/src/java.base/share/classes/java/lang/ArrayIndexOutOfBoundsException.java b/src/java.base/share/classes/java/lang/ArrayIndexOutOfBoundsException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ArrayIndexOutOfBoundsException.java rename to src/java.base/share/classes/java/lang/ArrayIndexOutOfBoundsException.java diff --git a/jdk/src/java.base/share/classes/java/lang/ArrayStoreException.java b/src/java.base/share/classes/java/lang/ArrayStoreException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ArrayStoreException.java rename to src/java.base/share/classes/java/lang/ArrayStoreException.java diff --git a/jdk/src/java.base/share/classes/java/lang/AssertionError.java b/src/java.base/share/classes/java/lang/AssertionError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/AssertionError.java rename to src/java.base/share/classes/java/lang/AssertionError.java diff --git a/jdk/src/java.base/share/classes/java/lang/AssertionStatusDirectives.java b/src/java.base/share/classes/java/lang/AssertionStatusDirectives.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/AssertionStatusDirectives.java rename to src/java.base/share/classes/java/lang/AssertionStatusDirectives.java diff --git a/jdk/src/java.base/share/classes/java/lang/AutoCloseable.java b/src/java.base/share/classes/java/lang/AutoCloseable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/AutoCloseable.java rename to src/java.base/share/classes/java/lang/AutoCloseable.java diff --git a/jdk/src/java.base/share/classes/java/lang/Boolean.java b/src/java.base/share/classes/java/lang/Boolean.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Boolean.java rename to src/java.base/share/classes/java/lang/Boolean.java diff --git a/jdk/src/java.base/share/classes/java/lang/BootstrapMethodError.java b/src/java.base/share/classes/java/lang/BootstrapMethodError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/BootstrapMethodError.java rename to src/java.base/share/classes/java/lang/BootstrapMethodError.java diff --git a/jdk/src/java.base/share/classes/java/lang/Byte.java b/src/java.base/share/classes/java/lang/Byte.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Byte.java rename to src/java.base/share/classes/java/lang/Byte.java diff --git a/jdk/src/java.base/share/classes/java/lang/CharSequence.java b/src/java.base/share/classes/java/lang/CharSequence.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/CharSequence.java rename to src/java.base/share/classes/java/lang/CharSequence.java diff --git a/jdk/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Character.java rename to src/java.base/share/classes/java/lang/Character.java diff --git a/jdk/src/java.base/share/classes/java/lang/CharacterData.java b/src/java.base/share/classes/java/lang/CharacterData.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/CharacterData.java rename to src/java.base/share/classes/java/lang/CharacterData.java diff --git a/jdk/src/java.base/share/classes/java/lang/CharacterName.java b/src/java.base/share/classes/java/lang/CharacterName.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/CharacterName.java rename to src/java.base/share/classes/java/lang/CharacterName.java diff --git a/jdk/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Class.java rename to src/java.base/share/classes/java/lang/Class.java diff --git a/jdk/src/java.base/share/classes/java/lang/ClassCastException.java b/src/java.base/share/classes/java/lang/ClassCastException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ClassCastException.java rename to src/java.base/share/classes/java/lang/ClassCastException.java diff --git a/jdk/src/java.base/share/classes/java/lang/ClassCircularityError.java b/src/java.base/share/classes/java/lang/ClassCircularityError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ClassCircularityError.java rename to src/java.base/share/classes/java/lang/ClassCircularityError.java diff --git a/jdk/src/java.base/share/classes/java/lang/ClassFormatError.java b/src/java.base/share/classes/java/lang/ClassFormatError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ClassFormatError.java rename to src/java.base/share/classes/java/lang/ClassFormatError.java diff --git a/jdk/src/java.base/share/classes/java/lang/ClassLoader.java b/src/java.base/share/classes/java/lang/ClassLoader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ClassLoader.java rename to src/java.base/share/classes/java/lang/ClassLoader.java diff --git a/jdk/src/java.base/share/classes/java/lang/ClassNotFoundException.java b/src/java.base/share/classes/java/lang/ClassNotFoundException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ClassNotFoundException.java rename to src/java.base/share/classes/java/lang/ClassNotFoundException.java diff --git a/jdk/src/java.base/share/classes/java/lang/ClassValue.java b/src/java.base/share/classes/java/lang/ClassValue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ClassValue.java rename to src/java.base/share/classes/java/lang/ClassValue.java diff --git a/jdk/src/java.base/share/classes/java/lang/CloneNotSupportedException.java b/src/java.base/share/classes/java/lang/CloneNotSupportedException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/CloneNotSupportedException.java rename to src/java.base/share/classes/java/lang/CloneNotSupportedException.java diff --git a/jdk/src/java.base/share/classes/java/lang/Cloneable.java b/src/java.base/share/classes/java/lang/Cloneable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Cloneable.java rename to src/java.base/share/classes/java/lang/Cloneable.java diff --git a/jdk/src/java.base/share/classes/java/lang/Comparable.java b/src/java.base/share/classes/java/lang/Comparable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Comparable.java rename to src/java.base/share/classes/java/lang/Comparable.java diff --git a/jdk/src/java.base/share/classes/java/lang/Compiler.java b/src/java.base/share/classes/java/lang/Compiler.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Compiler.java rename to src/java.base/share/classes/java/lang/Compiler.java diff --git a/jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java b/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java rename to src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java diff --git a/jdk/src/java.base/share/classes/java/lang/Deprecated.java b/src/java.base/share/classes/java/lang/Deprecated.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Deprecated.java rename to src/java.base/share/classes/java/lang/Deprecated.java diff --git a/jdk/src/java.base/share/classes/java/lang/Double.java b/src/java.base/share/classes/java/lang/Double.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Double.java rename to src/java.base/share/classes/java/lang/Double.java diff --git a/jdk/src/java.base/share/classes/java/lang/Enum.java b/src/java.base/share/classes/java/lang/Enum.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Enum.java rename to src/java.base/share/classes/java/lang/Enum.java diff --git a/jdk/src/java.base/share/classes/java/lang/EnumConstantNotPresentException.java b/src/java.base/share/classes/java/lang/EnumConstantNotPresentException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/EnumConstantNotPresentException.java rename to src/java.base/share/classes/java/lang/EnumConstantNotPresentException.java diff --git a/jdk/src/java.base/share/classes/java/lang/Error.java b/src/java.base/share/classes/java/lang/Error.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Error.java rename to src/java.base/share/classes/java/lang/Error.java diff --git a/jdk/src/java.base/share/classes/java/lang/Exception.java b/src/java.base/share/classes/java/lang/Exception.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Exception.java rename to src/java.base/share/classes/java/lang/Exception.java diff --git a/jdk/src/java.base/share/classes/java/lang/ExceptionInInitializerError.java b/src/java.base/share/classes/java/lang/ExceptionInInitializerError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ExceptionInInitializerError.java rename to src/java.base/share/classes/java/lang/ExceptionInInitializerError.java diff --git a/jdk/src/java.base/share/classes/java/lang/FdLibm.java b/src/java.base/share/classes/java/lang/FdLibm.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/FdLibm.java rename to src/java.base/share/classes/java/lang/FdLibm.java diff --git a/jdk/src/java.base/share/classes/java/lang/Float.java b/src/java.base/share/classes/java/lang/Float.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Float.java rename to src/java.base/share/classes/java/lang/Float.java diff --git a/jdk/src/java.base/share/classes/java/lang/FunctionalInterface.java b/src/java.base/share/classes/java/lang/FunctionalInterface.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/FunctionalInterface.java rename to src/java.base/share/classes/java/lang/FunctionalInterface.java diff --git a/jdk/src/java.base/share/classes/java/lang/IllegalAccessError.java b/src/java.base/share/classes/java/lang/IllegalAccessError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/IllegalAccessError.java rename to src/java.base/share/classes/java/lang/IllegalAccessError.java diff --git a/jdk/src/java.base/share/classes/java/lang/IllegalAccessException.java b/src/java.base/share/classes/java/lang/IllegalAccessException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/IllegalAccessException.java rename to src/java.base/share/classes/java/lang/IllegalAccessException.java diff --git a/jdk/src/java.base/share/classes/java/lang/IllegalArgumentException.java b/src/java.base/share/classes/java/lang/IllegalArgumentException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/IllegalArgumentException.java rename to src/java.base/share/classes/java/lang/IllegalArgumentException.java diff --git a/jdk/src/java.base/share/classes/java/lang/IllegalCallerException.java b/src/java.base/share/classes/java/lang/IllegalCallerException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/IllegalCallerException.java rename to src/java.base/share/classes/java/lang/IllegalCallerException.java diff --git a/jdk/src/java.base/share/classes/java/lang/IllegalMonitorStateException.java b/src/java.base/share/classes/java/lang/IllegalMonitorStateException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/IllegalMonitorStateException.java rename to src/java.base/share/classes/java/lang/IllegalMonitorStateException.java diff --git a/jdk/src/java.base/share/classes/java/lang/IllegalStateException.java b/src/java.base/share/classes/java/lang/IllegalStateException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/IllegalStateException.java rename to src/java.base/share/classes/java/lang/IllegalStateException.java diff --git a/jdk/src/java.base/share/classes/java/lang/IllegalThreadStateException.java b/src/java.base/share/classes/java/lang/IllegalThreadStateException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/IllegalThreadStateException.java rename to src/java.base/share/classes/java/lang/IllegalThreadStateException.java diff --git a/jdk/src/java.base/share/classes/java/lang/IncompatibleClassChangeError.java b/src/java.base/share/classes/java/lang/IncompatibleClassChangeError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/IncompatibleClassChangeError.java rename to src/java.base/share/classes/java/lang/IncompatibleClassChangeError.java diff --git a/jdk/src/java.base/share/classes/java/lang/IndexOutOfBoundsException.java b/src/java.base/share/classes/java/lang/IndexOutOfBoundsException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/IndexOutOfBoundsException.java rename to src/java.base/share/classes/java/lang/IndexOutOfBoundsException.java diff --git a/jdk/src/java.base/share/classes/java/lang/InheritableThreadLocal.java b/src/java.base/share/classes/java/lang/InheritableThreadLocal.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/InheritableThreadLocal.java rename to src/java.base/share/classes/java/lang/InheritableThreadLocal.java diff --git a/jdk/src/java.base/share/classes/java/lang/InstantiationError.java b/src/java.base/share/classes/java/lang/InstantiationError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/InstantiationError.java rename to src/java.base/share/classes/java/lang/InstantiationError.java diff --git a/jdk/src/java.base/share/classes/java/lang/InstantiationException.java b/src/java.base/share/classes/java/lang/InstantiationException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/InstantiationException.java rename to src/java.base/share/classes/java/lang/InstantiationException.java diff --git a/jdk/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Integer.java rename to src/java.base/share/classes/java/lang/Integer.java diff --git a/jdk/src/java.base/share/classes/java/lang/InternalError.java b/src/java.base/share/classes/java/lang/InternalError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/InternalError.java rename to src/java.base/share/classes/java/lang/InternalError.java diff --git a/jdk/src/java.base/share/classes/java/lang/InterruptedException.java b/src/java.base/share/classes/java/lang/InterruptedException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/InterruptedException.java rename to src/java.base/share/classes/java/lang/InterruptedException.java diff --git a/jdk/src/java.base/share/classes/java/lang/Iterable.java b/src/java.base/share/classes/java/lang/Iterable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Iterable.java rename to src/java.base/share/classes/java/lang/Iterable.java diff --git a/jdk/src/java.base/share/classes/java/lang/LayerInstantiationException.java b/src/java.base/share/classes/java/lang/LayerInstantiationException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/LayerInstantiationException.java rename to src/java.base/share/classes/java/lang/LayerInstantiationException.java diff --git a/jdk/src/java.base/share/classes/java/lang/LinkageError.java b/src/java.base/share/classes/java/lang/LinkageError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/LinkageError.java rename to src/java.base/share/classes/java/lang/LinkageError.java diff --git a/jdk/src/java.base/share/classes/java/lang/LiveStackFrame.java b/src/java.base/share/classes/java/lang/LiveStackFrame.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/LiveStackFrame.java rename to src/java.base/share/classes/java/lang/LiveStackFrame.java diff --git a/jdk/src/java.base/share/classes/java/lang/LiveStackFrameInfo.java b/src/java.base/share/classes/java/lang/LiveStackFrameInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/LiveStackFrameInfo.java rename to src/java.base/share/classes/java/lang/LiveStackFrameInfo.java diff --git a/jdk/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Long.java rename to src/java.base/share/classes/java/lang/Long.java diff --git a/jdk/src/java.base/share/classes/java/lang/Math.java b/src/java.base/share/classes/java/lang/Math.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Math.java rename to src/java.base/share/classes/java/lang/Math.java diff --git a/jdk/src/java.base/share/classes/java/lang/Module.java b/src/java.base/share/classes/java/lang/Module.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Module.java rename to src/java.base/share/classes/java/lang/Module.java diff --git a/jdk/src/java.base/share/classes/java/lang/ModuleLayer.java b/src/java.base/share/classes/java/lang/ModuleLayer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ModuleLayer.java rename to src/java.base/share/classes/java/lang/ModuleLayer.java diff --git a/jdk/src/java.base/share/classes/java/lang/NamedPackage.java b/src/java.base/share/classes/java/lang/NamedPackage.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/NamedPackage.java rename to src/java.base/share/classes/java/lang/NamedPackage.java diff --git a/jdk/src/java.base/share/classes/java/lang/NegativeArraySizeException.java b/src/java.base/share/classes/java/lang/NegativeArraySizeException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/NegativeArraySizeException.java rename to src/java.base/share/classes/java/lang/NegativeArraySizeException.java diff --git a/jdk/src/java.base/share/classes/java/lang/NoClassDefFoundError.java b/src/java.base/share/classes/java/lang/NoClassDefFoundError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/NoClassDefFoundError.java rename to src/java.base/share/classes/java/lang/NoClassDefFoundError.java diff --git a/jdk/src/java.base/share/classes/java/lang/NoSuchFieldError.java b/src/java.base/share/classes/java/lang/NoSuchFieldError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/NoSuchFieldError.java rename to src/java.base/share/classes/java/lang/NoSuchFieldError.java diff --git a/jdk/src/java.base/share/classes/java/lang/NoSuchFieldException.java b/src/java.base/share/classes/java/lang/NoSuchFieldException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/NoSuchFieldException.java rename to src/java.base/share/classes/java/lang/NoSuchFieldException.java diff --git a/jdk/src/java.base/share/classes/java/lang/NoSuchMethodError.java b/src/java.base/share/classes/java/lang/NoSuchMethodError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/NoSuchMethodError.java rename to src/java.base/share/classes/java/lang/NoSuchMethodError.java diff --git a/jdk/src/java.base/share/classes/java/lang/NoSuchMethodException.java b/src/java.base/share/classes/java/lang/NoSuchMethodException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/NoSuchMethodException.java rename to src/java.base/share/classes/java/lang/NoSuchMethodException.java diff --git a/jdk/src/java.base/share/classes/java/lang/NullPointerException.java b/src/java.base/share/classes/java/lang/NullPointerException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/NullPointerException.java rename to src/java.base/share/classes/java/lang/NullPointerException.java diff --git a/jdk/src/java.base/share/classes/java/lang/Number.java b/src/java.base/share/classes/java/lang/Number.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Number.java rename to src/java.base/share/classes/java/lang/Number.java diff --git a/jdk/src/java.base/share/classes/java/lang/NumberFormatException.java b/src/java.base/share/classes/java/lang/NumberFormatException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/NumberFormatException.java rename to src/java.base/share/classes/java/lang/NumberFormatException.java diff --git a/jdk/src/java.base/share/classes/java/lang/Object.java b/src/java.base/share/classes/java/lang/Object.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Object.java rename to src/java.base/share/classes/java/lang/Object.java diff --git a/jdk/src/java.base/share/classes/java/lang/OutOfMemoryError.java b/src/java.base/share/classes/java/lang/OutOfMemoryError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/OutOfMemoryError.java rename to src/java.base/share/classes/java/lang/OutOfMemoryError.java diff --git a/jdk/src/java.base/share/classes/java/lang/Override.java b/src/java.base/share/classes/java/lang/Override.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Override.java rename to src/java.base/share/classes/java/lang/Override.java diff --git a/jdk/src/java.base/share/classes/java/lang/Package.java b/src/java.base/share/classes/java/lang/Package.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Package.java rename to src/java.base/share/classes/java/lang/Package.java diff --git a/jdk/src/java.base/share/classes/java/lang/Process.java b/src/java.base/share/classes/java/lang/Process.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Process.java rename to src/java.base/share/classes/java/lang/Process.java diff --git a/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java b/src/java.base/share/classes/java/lang/ProcessBuilder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java rename to src/java.base/share/classes/java/lang/ProcessBuilder.java diff --git a/jdk/src/java.base/share/classes/java/lang/ProcessHandle.java b/src/java.base/share/classes/java/lang/ProcessHandle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ProcessHandle.java rename to src/java.base/share/classes/java/lang/ProcessHandle.java diff --git a/jdk/src/java.base/share/classes/java/lang/ProcessHandleImpl.java b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ProcessHandleImpl.java rename to src/java.base/share/classes/java/lang/ProcessHandleImpl.java diff --git a/jdk/src/java.base/share/classes/java/lang/PublicMethods.java b/src/java.base/share/classes/java/lang/PublicMethods.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/PublicMethods.java rename to src/java.base/share/classes/java/lang/PublicMethods.java diff --git a/jdk/src/java.base/share/classes/java/lang/Readable.java b/src/java.base/share/classes/java/lang/Readable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Readable.java rename to src/java.base/share/classes/java/lang/Readable.java diff --git a/jdk/src/java.base/share/classes/java/lang/ReflectiveOperationException.java b/src/java.base/share/classes/java/lang/ReflectiveOperationException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ReflectiveOperationException.java rename to src/java.base/share/classes/java/lang/ReflectiveOperationException.java diff --git a/jdk/src/java.base/share/classes/java/lang/Runnable.java b/src/java.base/share/classes/java/lang/Runnable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Runnable.java rename to src/java.base/share/classes/java/lang/Runnable.java diff --git a/jdk/src/java.base/share/classes/java/lang/Runtime.java b/src/java.base/share/classes/java/lang/Runtime.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Runtime.java rename to src/java.base/share/classes/java/lang/Runtime.java diff --git a/jdk/src/java.base/share/classes/java/lang/RuntimeException.java b/src/java.base/share/classes/java/lang/RuntimeException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/RuntimeException.java rename to src/java.base/share/classes/java/lang/RuntimeException.java diff --git a/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java b/src/java.base/share/classes/java/lang/RuntimePermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/RuntimePermission.java rename to src/java.base/share/classes/java/lang/RuntimePermission.java diff --git a/jdk/src/java.base/share/classes/java/lang/SafeVarargs.java b/src/java.base/share/classes/java/lang/SafeVarargs.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/SafeVarargs.java rename to src/java.base/share/classes/java/lang/SafeVarargs.java diff --git a/jdk/src/java.base/share/classes/java/lang/SecurityException.java b/src/java.base/share/classes/java/lang/SecurityException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/SecurityException.java rename to src/java.base/share/classes/java/lang/SecurityException.java diff --git a/jdk/src/java.base/share/classes/java/lang/SecurityManager.java b/src/java.base/share/classes/java/lang/SecurityManager.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/SecurityManager.java rename to src/java.base/share/classes/java/lang/SecurityManager.java diff --git a/jdk/src/java.base/share/classes/java/lang/Short.java b/src/java.base/share/classes/java/lang/Short.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Short.java rename to src/java.base/share/classes/java/lang/Short.java diff --git a/jdk/src/java.base/share/classes/java/lang/Shutdown.java b/src/java.base/share/classes/java/lang/Shutdown.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Shutdown.java rename to src/java.base/share/classes/java/lang/Shutdown.java diff --git a/jdk/src/java.base/share/classes/java/lang/StackFrameInfo.java b/src/java.base/share/classes/java/lang/StackFrameInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StackFrameInfo.java rename to src/java.base/share/classes/java/lang/StackFrameInfo.java diff --git a/jdk/src/java.base/share/classes/java/lang/StackOverflowError.java b/src/java.base/share/classes/java/lang/StackOverflowError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StackOverflowError.java rename to src/java.base/share/classes/java/lang/StackOverflowError.java diff --git a/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java b/src/java.base/share/classes/java/lang/StackStreamFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java rename to src/java.base/share/classes/java/lang/StackStreamFactory.java diff --git a/jdk/src/java.base/share/classes/java/lang/StackTraceElement.java b/src/java.base/share/classes/java/lang/StackTraceElement.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StackTraceElement.java rename to src/java.base/share/classes/java/lang/StackTraceElement.java diff --git a/jdk/src/java.base/share/classes/java/lang/StackWalker.java b/src/java.base/share/classes/java/lang/StackWalker.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StackWalker.java rename to src/java.base/share/classes/java/lang/StackWalker.java diff --git a/jdk/src/java.base/share/classes/java/lang/StrictMath.java b/src/java.base/share/classes/java/lang/StrictMath.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StrictMath.java rename to src/java.base/share/classes/java/lang/StrictMath.java diff --git a/jdk/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/String.java rename to src/java.base/share/classes/java/lang/String.java diff --git a/jdk/src/java.base/share/classes/java/lang/StringBuffer.java b/src/java.base/share/classes/java/lang/StringBuffer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StringBuffer.java rename to src/java.base/share/classes/java/lang/StringBuffer.java diff --git a/jdk/src/java.base/share/classes/java/lang/StringBuilder.java b/src/java.base/share/classes/java/lang/StringBuilder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StringBuilder.java rename to src/java.base/share/classes/java/lang/StringBuilder.java diff --git a/jdk/src/java.base/share/classes/java/lang/StringCoding.java b/src/java.base/share/classes/java/lang/StringCoding.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StringCoding.java rename to src/java.base/share/classes/java/lang/StringCoding.java diff --git a/jdk/src/java.base/share/classes/java/lang/StringConcatHelper.java b/src/java.base/share/classes/java/lang/StringConcatHelper.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StringConcatHelper.java rename to src/java.base/share/classes/java/lang/StringConcatHelper.java diff --git a/jdk/src/java.base/share/classes/java/lang/StringDecoderUTF8.java b/src/java.base/share/classes/java/lang/StringDecoderUTF8.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StringDecoderUTF8.java rename to src/java.base/share/classes/java/lang/StringDecoderUTF8.java diff --git a/jdk/src/java.base/share/classes/java/lang/StringIndexOutOfBoundsException.java b/src/java.base/share/classes/java/lang/StringIndexOutOfBoundsException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StringIndexOutOfBoundsException.java rename to src/java.base/share/classes/java/lang/StringIndexOutOfBoundsException.java diff --git a/jdk/src/java.base/share/classes/java/lang/StringLatin1.java b/src/java.base/share/classes/java/lang/StringLatin1.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StringLatin1.java rename to src/java.base/share/classes/java/lang/StringLatin1.java diff --git a/jdk/src/java.base/share/classes/java/lang/StringUTF16.java b/src/java.base/share/classes/java/lang/StringUTF16.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/StringUTF16.java rename to src/java.base/share/classes/java/lang/StringUTF16.java diff --git a/jdk/src/java.base/share/classes/java/lang/SuppressWarnings.java b/src/java.base/share/classes/java/lang/SuppressWarnings.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/SuppressWarnings.java rename to src/java.base/share/classes/java/lang/SuppressWarnings.java diff --git a/jdk/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/System.java rename to src/java.base/share/classes/java/lang/System.java diff --git a/jdk/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Thread.java rename to src/java.base/share/classes/java/lang/Thread.java diff --git a/jdk/src/java.base/share/classes/java/lang/ThreadDeath.java b/src/java.base/share/classes/java/lang/ThreadDeath.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ThreadDeath.java rename to src/java.base/share/classes/java/lang/ThreadDeath.java diff --git a/jdk/src/java.base/share/classes/java/lang/ThreadGroup.java b/src/java.base/share/classes/java/lang/ThreadGroup.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ThreadGroup.java rename to src/java.base/share/classes/java/lang/ThreadGroup.java diff --git a/jdk/src/java.base/share/classes/java/lang/ThreadLocal.java b/src/java.base/share/classes/java/lang/ThreadLocal.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ThreadLocal.java rename to src/java.base/share/classes/java/lang/ThreadLocal.java diff --git a/jdk/src/java.base/share/classes/java/lang/Throwable.java b/src/java.base/share/classes/java/lang/Throwable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Throwable.java rename to src/java.base/share/classes/java/lang/Throwable.java diff --git a/jdk/src/java.base/share/classes/java/lang/TypeNotPresentException.java b/src/java.base/share/classes/java/lang/TypeNotPresentException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/TypeNotPresentException.java rename to src/java.base/share/classes/java/lang/TypeNotPresentException.java diff --git a/jdk/src/java.base/share/classes/java/lang/UnknownError.java b/src/java.base/share/classes/java/lang/UnknownError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/UnknownError.java rename to src/java.base/share/classes/java/lang/UnknownError.java diff --git a/jdk/src/java.base/share/classes/java/lang/UnsatisfiedLinkError.java b/src/java.base/share/classes/java/lang/UnsatisfiedLinkError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/UnsatisfiedLinkError.java rename to src/java.base/share/classes/java/lang/UnsatisfiedLinkError.java diff --git a/jdk/src/java.base/share/classes/java/lang/UnsupportedClassVersionError.java b/src/java.base/share/classes/java/lang/UnsupportedClassVersionError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/UnsupportedClassVersionError.java rename to src/java.base/share/classes/java/lang/UnsupportedClassVersionError.java diff --git a/jdk/src/java.base/share/classes/java/lang/UnsupportedOperationException.java b/src/java.base/share/classes/java/lang/UnsupportedOperationException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/UnsupportedOperationException.java rename to src/java.base/share/classes/java/lang/UnsupportedOperationException.java diff --git a/jdk/src/java.base/share/classes/java/lang/VerifyError.java b/src/java.base/share/classes/java/lang/VerifyError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/VerifyError.java rename to src/java.base/share/classes/java/lang/VerifyError.java diff --git a/jdk/src/java.base/share/classes/java/lang/VersionProps.java.template b/src/java.base/share/classes/java/lang/VersionProps.java.template similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/VersionProps.java.template rename to src/java.base/share/classes/java/lang/VersionProps.java.template diff --git a/jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java b/src/java.base/share/classes/java/lang/VirtualMachineError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java rename to src/java.base/share/classes/java/lang/VirtualMachineError.java diff --git a/jdk/src/java.base/share/classes/java/lang/Void.java b/src/java.base/share/classes/java/lang/Void.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/Void.java rename to src/java.base/share/classes/java/lang/Void.java diff --git a/jdk/src/java.base/share/classes/java/lang/WeakPairMap.java b/src/java.base/share/classes/java/lang/WeakPairMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/WeakPairMap.java rename to src/java.base/share/classes/java/lang/WeakPairMap.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/Annotation.java b/src/java.base/share/classes/java/lang/annotation/Annotation.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/Annotation.java rename to src/java.base/share/classes/java/lang/annotation/Annotation.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/AnnotationFormatError.java b/src/java.base/share/classes/java/lang/annotation/AnnotationFormatError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/AnnotationFormatError.java rename to src/java.base/share/classes/java/lang/annotation/AnnotationFormatError.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java b/src/java.base/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java rename to src/java.base/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/Documented.java b/src/java.base/share/classes/java/lang/annotation/Documented.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/Documented.java rename to src/java.base/share/classes/java/lang/annotation/Documented.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/ElementType.java b/src/java.base/share/classes/java/lang/annotation/ElementType.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/ElementType.java rename to src/java.base/share/classes/java/lang/annotation/ElementType.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/IncompleteAnnotationException.java b/src/java.base/share/classes/java/lang/annotation/IncompleteAnnotationException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/IncompleteAnnotationException.java rename to src/java.base/share/classes/java/lang/annotation/IncompleteAnnotationException.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/Inherited.java b/src/java.base/share/classes/java/lang/annotation/Inherited.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/Inherited.java rename to src/java.base/share/classes/java/lang/annotation/Inherited.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/Native.java b/src/java.base/share/classes/java/lang/annotation/Native.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/Native.java rename to src/java.base/share/classes/java/lang/annotation/Native.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/Repeatable.java b/src/java.base/share/classes/java/lang/annotation/Repeatable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/Repeatable.java rename to src/java.base/share/classes/java/lang/annotation/Repeatable.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/Retention.java b/src/java.base/share/classes/java/lang/annotation/Retention.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/Retention.java rename to src/java.base/share/classes/java/lang/annotation/Retention.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/RetentionPolicy.java b/src/java.base/share/classes/java/lang/annotation/RetentionPolicy.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/RetentionPolicy.java rename to src/java.base/share/classes/java/lang/annotation/RetentionPolicy.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/Target.java b/src/java.base/share/classes/java/lang/annotation/Target.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/Target.java rename to src/java.base/share/classes/java/lang/annotation/Target.java diff --git a/jdk/src/java.base/share/classes/java/lang/annotation/package-info.java b/src/java.base/share/classes/java/lang/annotation/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/annotation/package-info.java rename to src/java.base/share/classes/java/lang/annotation/package-info.java diff --git a/jdk/src/java.base/share/classes/java/lang/doc-files/ValueBased.html b/src/java.base/share/classes/java/lang/doc-files/ValueBased.html similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/doc-files/ValueBased.html rename to src/java.base/share/classes/java/lang/doc-files/ValueBased.html diff --git a/jdk/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html b/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html rename to src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java b/src/java.base/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java rename to src/java.base/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java rename to src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/CallSite.java b/src/java.base/share/classes/java/lang/invoke/CallSite.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/CallSite.java rename to src/java.base/share/classes/java/lang/invoke/CallSite.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java b/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java rename to src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java rename to src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java rename to src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java b/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java rename to src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/InfoFromMemberName.java b/src/java.base/share/classes/java/lang/invoke/InfoFromMemberName.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/InfoFromMemberName.java rename to src/java.base/share/classes/java/lang/invoke/InfoFromMemberName.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/InjectedProfile.java b/src/java.base/share/classes/java/lang/invoke/InjectedProfile.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/InjectedProfile.java rename to src/java.base/share/classes/java/lang/invoke/InjectedProfile.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java b/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java rename to src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/InvokeDynamic.java b/src/java.base/share/classes/java/lang/invoke/InvokeDynamic.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/InvokeDynamic.java rename to src/java.base/share/classes/java/lang/invoke/InvokeDynamic.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java rename to src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java b/src/java.base/share/classes/java/lang/invoke/Invokers.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java rename to src/java.base/share/classes/java/lang/invoke/Invokers.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/LambdaConversionException.java b/src/java.base/share/classes/java/lang/invoke/LambdaConversionException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/LambdaConversionException.java rename to src/java.base/share/classes/java/lang/invoke/LambdaConversionException.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/LambdaForm.java b/src/java.base/share/classes/java/lang/invoke/LambdaForm.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/LambdaForm.java rename to src/java.base/share/classes/java/lang/invoke/LambdaForm.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/LambdaFormBuffer.java b/src/java.base/share/classes/java/lang/invoke/LambdaFormBuffer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/LambdaFormBuffer.java rename to src/java.base/share/classes/java/lang/invoke/LambdaFormBuffer.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java b/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java rename to src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java b/src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java rename to src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java b/src/java.base/share/classes/java/lang/invoke/MemberName.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java rename to src/java.base/share/classes/java/lang/invoke/MemberName.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java b/src/java.base/share/classes/java/lang/invoke/MethodHandle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java rename to src/java.base/share/classes/java/lang/invoke/MethodHandle.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java rename to src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleInfo.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleInfo.java rename to src/java.base/share/classes/java/lang/invoke/MethodHandleInfo.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java rename to src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java rename to src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleStatics.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleStatics.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleStatics.java rename to src/java.base/share/classes/java/lang/invoke/MethodHandleStatics.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java rename to src/java.base/share/classes/java/lang/invoke/MethodHandles.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodType.java b/src/java.base/share/classes/java/lang/invoke/MethodType.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/MethodType.java rename to src/java.base/share/classes/java/lang/invoke/MethodType.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java b/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java rename to src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java b/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java rename to src/java.base/share/classes/java/lang/invoke/MutableCallSite.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java b/src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java rename to src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/SerializedLambda.java b/src/java.base/share/classes/java/lang/invoke/SerializedLambda.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/SerializedLambda.java rename to src/java.base/share/classes/java/lang/invoke/SerializedLambda.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java rename to src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatException.java b/src/java.base/share/classes/java/lang/invoke/StringConcatException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/StringConcatException.java rename to src/java.base/share/classes/java/lang/invoke/StringConcatException.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java rename to src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/SwitchPoint.java b/src/java.base/share/classes/java/lang/invoke/SwitchPoint.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/SwitchPoint.java rename to src/java.base/share/classes/java/lang/invoke/SwitchPoint.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java b/src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java rename to src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/VarForm.java b/src/java.base/share/classes/java/lang/invoke/VarForm.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/VarForm.java rename to src/java.base/share/classes/java/lang/invoke/VarForm.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java b/src/java.base/share/classes/java/lang/invoke/VarHandle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java rename to src/java.base/share/classes/java/lang/invoke/VarHandle.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/VarHandleByteArrayBase.java b/src/java.base/share/classes/java/lang/invoke/VarHandleByteArrayBase.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/VarHandleByteArrayBase.java rename to src/java.base/share/classes/java/lang/invoke/VarHandleByteArrayBase.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java b/src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java rename to src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/VarHandles.java b/src/java.base/share/classes/java/lang/invoke/VarHandles.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/VarHandles.java rename to src/java.base/share/classes/java/lang/invoke/VarHandles.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java b/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java rename to src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/WrongMethodTypeException.java b/src/java.base/share/classes/java/lang/invoke/WrongMethodTypeException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/WrongMethodTypeException.java rename to src/java.base/share/classes/java/lang/invoke/WrongMethodTypeException.java diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template b/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template rename to src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template b/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template rename to src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/package-info.java b/src/java.base/share/classes/java/lang/invoke/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/invoke/package-info.java rename to src/java.base/share/classes/java/lang/invoke/package-info.java diff --git a/jdk/src/java.base/share/classes/java/lang/module/Configuration.java b/src/java.base/share/classes/java/lang/module/Configuration.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/module/Configuration.java rename to src/java.base/share/classes/java/lang/module/Configuration.java diff --git a/jdk/src/java.base/share/classes/java/lang/module/FindException.java b/src/java.base/share/classes/java/lang/module/FindException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/module/FindException.java rename to src/java.base/share/classes/java/lang/module/FindException.java diff --git a/jdk/src/java.base/share/classes/java/lang/module/InvalidModuleDescriptorException.java b/src/java.base/share/classes/java/lang/module/InvalidModuleDescriptorException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/module/InvalidModuleDescriptorException.java rename to src/java.base/share/classes/java/lang/module/InvalidModuleDescriptorException.java diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java rename to src/java.base/share/classes/java/lang/module/ModuleDescriptor.java diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleFinder.java b/src/java.base/share/classes/java/lang/module/ModuleFinder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/module/ModuleFinder.java rename to src/java.base/share/classes/java/lang/module/ModuleFinder.java diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleReader.java b/src/java.base/share/classes/java/lang/module/ModuleReader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/module/ModuleReader.java rename to src/java.base/share/classes/java/lang/module/ModuleReader.java diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleReference.java b/src/java.base/share/classes/java/lang/module/ModuleReference.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/module/ModuleReference.java rename to src/java.base/share/classes/java/lang/module/ModuleReference.java diff --git a/jdk/src/java.base/share/classes/java/lang/module/ResolutionException.java b/src/java.base/share/classes/java/lang/module/ResolutionException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/module/ResolutionException.java rename to src/java.base/share/classes/java/lang/module/ResolutionException.java diff --git a/jdk/src/java.base/share/classes/java/lang/module/ResolvedModule.java b/src/java.base/share/classes/java/lang/module/ResolvedModule.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/module/ResolvedModule.java rename to src/java.base/share/classes/java/lang/module/ResolvedModule.java diff --git a/jdk/src/java.base/share/classes/java/lang/module/Resolver.java b/src/java.base/share/classes/java/lang/module/Resolver.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/module/Resolver.java rename to src/java.base/share/classes/java/lang/module/Resolver.java diff --git a/jdk/src/java.base/share/classes/java/lang/module/package-info.java b/src/java.base/share/classes/java/lang/module/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/module/package-info.java rename to src/java.base/share/classes/java/lang/module/package-info.java diff --git a/jdk/src/java.base/share/classes/java/lang/package-info.java b/src/java.base/share/classes/java/lang/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/package-info.java rename to src/java.base/share/classes/java/lang/package-info.java diff --git a/jdk/src/java.base/share/classes/java/lang/ref/Cleaner.java b/src/java.base/share/classes/java/lang/ref/Cleaner.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ref/Cleaner.java rename to src/java.base/share/classes/java/lang/ref/Cleaner.java diff --git a/jdk/src/java.base/share/classes/java/lang/ref/FinalReference.java b/src/java.base/share/classes/java/lang/ref/FinalReference.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ref/FinalReference.java rename to src/java.base/share/classes/java/lang/ref/FinalReference.java diff --git a/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java b/src/java.base/share/classes/java/lang/ref/Finalizer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java rename to src/java.base/share/classes/java/lang/ref/Finalizer.java diff --git a/jdk/src/java.base/share/classes/java/lang/ref/FinalizerHistogram.java b/src/java.base/share/classes/java/lang/ref/FinalizerHistogram.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ref/FinalizerHistogram.java rename to src/java.base/share/classes/java/lang/ref/FinalizerHistogram.java diff --git a/jdk/src/java.base/share/classes/java/lang/ref/PhantomReference.java b/src/java.base/share/classes/java/lang/ref/PhantomReference.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ref/PhantomReference.java rename to src/java.base/share/classes/java/lang/ref/PhantomReference.java diff --git a/jdk/src/java.base/share/classes/java/lang/ref/Reference.java b/src/java.base/share/classes/java/lang/ref/Reference.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ref/Reference.java rename to src/java.base/share/classes/java/lang/ref/Reference.java diff --git a/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java rename to src/java.base/share/classes/java/lang/ref/ReferenceQueue.java diff --git a/jdk/src/java.base/share/classes/java/lang/ref/SoftReference.java b/src/java.base/share/classes/java/lang/ref/SoftReference.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ref/SoftReference.java rename to src/java.base/share/classes/java/lang/ref/SoftReference.java diff --git a/jdk/src/java.base/share/classes/java/lang/ref/WeakReference.java b/src/java.base/share/classes/java/lang/ref/WeakReference.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ref/WeakReference.java rename to src/java.base/share/classes/java/lang/ref/WeakReference.java diff --git a/jdk/src/java.base/share/classes/java/lang/ref/package-info.java b/src/java.base/share/classes/java/lang/ref/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/ref/package-info.java rename to src/java.base/share/classes/java/lang/ref/package-info.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java rename to src/java.base/share/classes/java/lang/reflect/AccessibleObject.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedArrayType.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedArrayType.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedArrayType.java rename to src/java.base/share/classes/java/lang/reflect/AnnotatedArrayType.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java rename to src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedParameterizedType.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedParameterizedType.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedParameterizedType.java rename to src/java.base/share/classes/java/lang/reflect/AnnotatedParameterizedType.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedType.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedType.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedType.java rename to src/java.base/share/classes/java/lang/reflect/AnnotatedType.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedTypeVariable.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedTypeVariable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedTypeVariable.java rename to src/java.base/share/classes/java/lang/reflect/AnnotatedTypeVariable.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java rename to src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Array.java b/src/java.base/share/classes/java/lang/reflect/Array.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/Array.java rename to src/java.base/share/classes/java/lang/reflect/Array.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java b/src/java.base/share/classes/java/lang/reflect/Constructor.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java rename to src/java.base/share/classes/java/lang/reflect/Constructor.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java b/src/java.base/share/classes/java/lang/reflect/Executable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/Executable.java rename to src/java.base/share/classes/java/lang/reflect/Executable.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Field.java b/src/java.base/share/classes/java/lang/reflect/Field.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/Field.java rename to src/java.base/share/classes/java/lang/reflect/Field.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/GenericArrayType.java b/src/java.base/share/classes/java/lang/reflect/GenericArrayType.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/GenericArrayType.java rename to src/java.base/share/classes/java/lang/reflect/GenericArrayType.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java b/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java rename to src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/GenericSignatureFormatError.java b/src/java.base/share/classes/java/lang/reflect/GenericSignatureFormatError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/GenericSignatureFormatError.java rename to src/java.base/share/classes/java/lang/reflect/GenericSignatureFormatError.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/InaccessibleObjectException.java b/src/java.base/share/classes/java/lang/reflect/InaccessibleObjectException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/InaccessibleObjectException.java rename to src/java.base/share/classes/java/lang/reflect/InaccessibleObjectException.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java b/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java rename to src/java.base/share/classes/java/lang/reflect/InvocationHandler.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java b/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java rename to src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java b/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java rename to src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/MalformedParametersException.java b/src/java.base/share/classes/java/lang/reflect/MalformedParametersException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/MalformedParametersException.java rename to src/java.base/share/classes/java/lang/reflect/MalformedParametersException.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Member.java b/src/java.base/share/classes/java/lang/reflect/Member.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/Member.java rename to src/java.base/share/classes/java/lang/reflect/Member.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Method.java b/src/java.base/share/classes/java/lang/reflect/Method.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/Method.java rename to src/java.base/share/classes/java/lang/reflect/Method.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Modifier.java b/src/java.base/share/classes/java/lang/reflect/Modifier.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/Modifier.java rename to src/java.base/share/classes/java/lang/reflect/Modifier.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Parameter.java b/src/java.base/share/classes/java/lang/reflect/Parameter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/Parameter.java rename to src/java.base/share/classes/java/lang/reflect/Parameter.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/ParameterizedType.java b/src/java.base/share/classes/java/lang/reflect/ParameterizedType.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/ParameterizedType.java rename to src/java.base/share/classes/java/lang/reflect/ParameterizedType.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java b/src/java.base/share/classes/java/lang/reflect/Proxy.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java rename to src/java.base/share/classes/java/lang/reflect/Proxy.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java rename to src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java b/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java rename to src/java.base/share/classes/java/lang/reflect/ReflectAccess.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/ReflectPermission.java b/src/java.base/share/classes/java/lang/reflect/ReflectPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/ReflectPermission.java rename to src/java.base/share/classes/java/lang/reflect/ReflectPermission.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Type.java b/src/java.base/share/classes/java/lang/reflect/Type.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/Type.java rename to src/java.base/share/classes/java/lang/reflect/Type.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/TypeVariable.java b/src/java.base/share/classes/java/lang/reflect/TypeVariable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/TypeVariable.java rename to src/java.base/share/classes/java/lang/reflect/TypeVariable.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java b/src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java rename to src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/WildcardType.java b/src/java.base/share/classes/java/lang/reflect/WildcardType.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/WildcardType.java rename to src/java.base/share/classes/java/lang/reflect/WildcardType.java diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/package-info.java b/src/java.base/share/classes/java/lang/reflect/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/lang/reflect/package-info.java rename to src/java.base/share/classes/java/lang/reflect/package-info.java diff --git a/jdk/src/java.base/share/classes/java/math/BigDecimal.java b/src/java.base/share/classes/java/math/BigDecimal.java similarity index 100% rename from jdk/src/java.base/share/classes/java/math/BigDecimal.java rename to src/java.base/share/classes/java/math/BigDecimal.java diff --git a/jdk/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java similarity index 100% rename from jdk/src/java.base/share/classes/java/math/BigInteger.java rename to src/java.base/share/classes/java/math/BigInteger.java diff --git a/jdk/src/java.base/share/classes/java/math/BitSieve.java b/src/java.base/share/classes/java/math/BitSieve.java similarity index 100% rename from jdk/src/java.base/share/classes/java/math/BitSieve.java rename to src/java.base/share/classes/java/math/BitSieve.java diff --git a/jdk/src/java.base/share/classes/java/math/MathContext.java b/src/java.base/share/classes/java/math/MathContext.java similarity index 100% rename from jdk/src/java.base/share/classes/java/math/MathContext.java rename to src/java.base/share/classes/java/math/MathContext.java diff --git a/jdk/src/java.base/share/classes/java/math/MutableBigInteger.java b/src/java.base/share/classes/java/math/MutableBigInteger.java similarity index 100% rename from jdk/src/java.base/share/classes/java/math/MutableBigInteger.java rename to src/java.base/share/classes/java/math/MutableBigInteger.java diff --git a/jdk/src/java.base/share/classes/java/math/RoundingMode.java b/src/java.base/share/classes/java/math/RoundingMode.java similarity index 100% rename from jdk/src/java.base/share/classes/java/math/RoundingMode.java rename to src/java.base/share/classes/java/math/RoundingMode.java diff --git a/jdk/src/java.base/share/classes/java/math/SignedMutableBigInteger.java b/src/java.base/share/classes/java/math/SignedMutableBigInteger.java similarity index 100% rename from jdk/src/java.base/share/classes/java/math/SignedMutableBigInteger.java rename to src/java.base/share/classes/java/math/SignedMutableBigInteger.java diff --git a/jdk/src/java.base/share/classes/java/math/package-info.java b/src/java.base/share/classes/java/math/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/math/package-info.java rename to src/java.base/share/classes/java/math/package-info.java diff --git a/jdk/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java b/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java rename to src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java diff --git a/jdk/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java b/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java rename to src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java diff --git a/jdk/src/java.base/share/classes/java/net/Authenticator.java b/src/java.base/share/classes/java/net/Authenticator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/Authenticator.java rename to src/java.base/share/classes/java/net/Authenticator.java diff --git a/jdk/src/java.base/share/classes/java/net/BindException.java b/src/java.base/share/classes/java/net/BindException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/BindException.java rename to src/java.base/share/classes/java/net/BindException.java diff --git a/jdk/src/java.base/share/classes/java/net/CacheRequest.java b/src/java.base/share/classes/java/net/CacheRequest.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/CacheRequest.java rename to src/java.base/share/classes/java/net/CacheRequest.java diff --git a/jdk/src/java.base/share/classes/java/net/CacheResponse.java b/src/java.base/share/classes/java/net/CacheResponse.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/CacheResponse.java rename to src/java.base/share/classes/java/net/CacheResponse.java diff --git a/jdk/src/java.base/share/classes/java/net/ConnectException.java b/src/java.base/share/classes/java/net/ConnectException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/ConnectException.java rename to src/java.base/share/classes/java/net/ConnectException.java diff --git a/jdk/src/java.base/share/classes/java/net/ContentHandler.java b/src/java.base/share/classes/java/net/ContentHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/ContentHandler.java rename to src/java.base/share/classes/java/net/ContentHandler.java diff --git a/jdk/src/java.base/share/classes/java/net/ContentHandlerFactory.java b/src/java.base/share/classes/java/net/ContentHandlerFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/ContentHandlerFactory.java rename to src/java.base/share/classes/java/net/ContentHandlerFactory.java diff --git a/jdk/src/java.base/share/classes/java/net/CookieHandler.java b/src/java.base/share/classes/java/net/CookieHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/CookieHandler.java rename to src/java.base/share/classes/java/net/CookieHandler.java diff --git a/jdk/src/java.base/share/classes/java/net/CookieManager.java b/src/java.base/share/classes/java/net/CookieManager.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/CookieManager.java rename to src/java.base/share/classes/java/net/CookieManager.java diff --git a/jdk/src/java.base/share/classes/java/net/CookiePolicy.java b/src/java.base/share/classes/java/net/CookiePolicy.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/CookiePolicy.java rename to src/java.base/share/classes/java/net/CookiePolicy.java diff --git a/jdk/src/java.base/share/classes/java/net/CookieStore.java b/src/java.base/share/classes/java/net/CookieStore.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/CookieStore.java rename to src/java.base/share/classes/java/net/CookieStore.java diff --git a/jdk/src/java.base/share/classes/java/net/DatagramPacket.java b/src/java.base/share/classes/java/net/DatagramPacket.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/DatagramPacket.java rename to src/java.base/share/classes/java/net/DatagramPacket.java diff --git a/jdk/src/java.base/share/classes/java/net/DatagramSocket.java b/src/java.base/share/classes/java/net/DatagramSocket.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/DatagramSocket.java rename to src/java.base/share/classes/java/net/DatagramSocket.java diff --git a/jdk/src/java.base/share/classes/java/net/DatagramSocketImpl.java b/src/java.base/share/classes/java/net/DatagramSocketImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/DatagramSocketImpl.java rename to src/java.base/share/classes/java/net/DatagramSocketImpl.java diff --git a/jdk/src/java.base/share/classes/java/net/DatagramSocketImplFactory.java b/src/java.base/share/classes/java/net/DatagramSocketImplFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/DatagramSocketImplFactory.java rename to src/java.base/share/classes/java/net/DatagramSocketImplFactory.java diff --git a/jdk/src/java.base/share/classes/java/net/FileNameMap.java b/src/java.base/share/classes/java/net/FileNameMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/FileNameMap.java rename to src/java.base/share/classes/java/net/FileNameMap.java diff --git a/jdk/src/java.base/share/classes/java/net/HostPortrange.java b/src/java.base/share/classes/java/net/HostPortrange.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/HostPortrange.java rename to src/java.base/share/classes/java/net/HostPortrange.java diff --git a/jdk/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java b/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java rename to src/java.base/share/classes/java/net/HttpConnectSocketImpl.java diff --git a/jdk/src/java.base/share/classes/java/net/HttpCookie.java b/src/java.base/share/classes/java/net/HttpCookie.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/HttpCookie.java rename to src/java.base/share/classes/java/net/HttpCookie.java diff --git a/jdk/src/java.base/share/classes/java/net/HttpRetryException.java b/src/java.base/share/classes/java/net/HttpRetryException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/HttpRetryException.java rename to src/java.base/share/classes/java/net/HttpRetryException.java diff --git a/jdk/src/java.base/share/classes/java/net/HttpURLConnection.java b/src/java.base/share/classes/java/net/HttpURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/HttpURLConnection.java rename to src/java.base/share/classes/java/net/HttpURLConnection.java diff --git a/jdk/src/java.base/share/classes/java/net/IDN.java b/src/java.base/share/classes/java/net/IDN.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/IDN.java rename to src/java.base/share/classes/java/net/IDN.java diff --git a/jdk/src/java.base/share/classes/java/net/InMemoryCookieStore.java b/src/java.base/share/classes/java/net/InMemoryCookieStore.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/InMemoryCookieStore.java rename to src/java.base/share/classes/java/net/InMemoryCookieStore.java diff --git a/jdk/src/java.base/share/classes/java/net/Inet4Address.java b/src/java.base/share/classes/java/net/Inet4Address.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/Inet4Address.java rename to src/java.base/share/classes/java/net/Inet4Address.java diff --git a/jdk/src/java.base/share/classes/java/net/Inet4AddressImpl.java b/src/java.base/share/classes/java/net/Inet4AddressImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/Inet4AddressImpl.java rename to src/java.base/share/classes/java/net/Inet4AddressImpl.java diff --git a/jdk/src/java.base/share/classes/java/net/Inet6Address.java b/src/java.base/share/classes/java/net/Inet6Address.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/Inet6Address.java rename to src/java.base/share/classes/java/net/Inet6Address.java diff --git a/jdk/src/java.base/share/classes/java/net/Inet6AddressImpl.java b/src/java.base/share/classes/java/net/Inet6AddressImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/Inet6AddressImpl.java rename to src/java.base/share/classes/java/net/Inet6AddressImpl.java diff --git a/jdk/src/java.base/share/classes/java/net/InetAddress.java b/src/java.base/share/classes/java/net/InetAddress.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/InetAddress.java rename to src/java.base/share/classes/java/net/InetAddress.java diff --git a/jdk/src/java.base/share/classes/java/net/InetAddressContainer.java b/src/java.base/share/classes/java/net/InetAddressContainer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/InetAddressContainer.java rename to src/java.base/share/classes/java/net/InetAddressContainer.java diff --git a/jdk/src/java.base/share/classes/java/net/InetAddressImpl.java b/src/java.base/share/classes/java/net/InetAddressImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/InetAddressImpl.java rename to src/java.base/share/classes/java/net/InetAddressImpl.java diff --git a/jdk/src/java.base/share/classes/java/net/InetSocketAddress.java b/src/java.base/share/classes/java/net/InetSocketAddress.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/InetSocketAddress.java rename to src/java.base/share/classes/java/net/InetSocketAddress.java diff --git a/jdk/src/java.base/share/classes/java/net/InterfaceAddress.java b/src/java.base/share/classes/java/net/InterfaceAddress.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/InterfaceAddress.java rename to src/java.base/share/classes/java/net/InterfaceAddress.java diff --git a/jdk/src/java.base/share/classes/java/net/JarURLConnection.java b/src/java.base/share/classes/java/net/JarURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/JarURLConnection.java rename to src/java.base/share/classes/java/net/JarURLConnection.java diff --git a/jdk/src/java.base/share/classes/java/net/MalformedURLException.java b/src/java.base/share/classes/java/net/MalformedURLException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/MalformedURLException.java rename to src/java.base/share/classes/java/net/MalformedURLException.java diff --git a/jdk/src/java.base/share/classes/java/net/MulticastSocket.java b/src/java.base/share/classes/java/net/MulticastSocket.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/MulticastSocket.java rename to src/java.base/share/classes/java/net/MulticastSocket.java diff --git a/jdk/src/java.base/share/classes/java/net/NetPermission.java b/src/java.base/share/classes/java/net/NetPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/NetPermission.java rename to src/java.base/share/classes/java/net/NetPermission.java diff --git a/jdk/src/java.base/share/classes/java/net/NetworkInterface.java b/src/java.base/share/classes/java/net/NetworkInterface.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/NetworkInterface.java rename to src/java.base/share/classes/java/net/NetworkInterface.java diff --git a/jdk/src/java.base/share/classes/java/net/NoRouteToHostException.java b/src/java.base/share/classes/java/net/NoRouteToHostException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/NoRouteToHostException.java rename to src/java.base/share/classes/java/net/NoRouteToHostException.java diff --git a/jdk/src/java.base/share/classes/java/net/PasswordAuthentication.java b/src/java.base/share/classes/java/net/PasswordAuthentication.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/PasswordAuthentication.java rename to src/java.base/share/classes/java/net/PasswordAuthentication.java diff --git a/jdk/src/java.base/share/classes/java/net/PortUnreachableException.java b/src/java.base/share/classes/java/net/PortUnreachableException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/PortUnreachableException.java rename to src/java.base/share/classes/java/net/PortUnreachableException.java diff --git a/jdk/src/java.base/share/classes/java/net/ProtocolException.java b/src/java.base/share/classes/java/net/ProtocolException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/ProtocolException.java rename to src/java.base/share/classes/java/net/ProtocolException.java diff --git a/jdk/src/java.base/share/classes/java/net/ProtocolFamily.java b/src/java.base/share/classes/java/net/ProtocolFamily.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/ProtocolFamily.java rename to src/java.base/share/classes/java/net/ProtocolFamily.java diff --git a/jdk/src/java.base/share/classes/java/net/Proxy.java b/src/java.base/share/classes/java/net/Proxy.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/Proxy.java rename to src/java.base/share/classes/java/net/Proxy.java diff --git a/jdk/src/java.base/share/classes/java/net/ProxySelector.java b/src/java.base/share/classes/java/net/ProxySelector.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/ProxySelector.java rename to src/java.base/share/classes/java/net/ProxySelector.java diff --git a/jdk/src/java.base/share/classes/java/net/ResponseCache.java b/src/java.base/share/classes/java/net/ResponseCache.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/ResponseCache.java rename to src/java.base/share/classes/java/net/ResponseCache.java diff --git a/jdk/src/java.base/share/classes/java/net/SecureCacheResponse.java b/src/java.base/share/classes/java/net/SecureCacheResponse.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SecureCacheResponse.java rename to src/java.base/share/classes/java/net/SecureCacheResponse.java diff --git a/jdk/src/java.base/share/classes/java/net/ServerSocket.java b/src/java.base/share/classes/java/net/ServerSocket.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/ServerSocket.java rename to src/java.base/share/classes/java/net/ServerSocket.java diff --git a/jdk/src/java.base/share/classes/java/net/Socket.java b/src/java.base/share/classes/java/net/Socket.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/Socket.java rename to src/java.base/share/classes/java/net/Socket.java diff --git a/jdk/src/java.base/share/classes/java/net/SocketAddress.java b/src/java.base/share/classes/java/net/SocketAddress.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SocketAddress.java rename to src/java.base/share/classes/java/net/SocketAddress.java diff --git a/jdk/src/java.base/share/classes/java/net/SocketException.java b/src/java.base/share/classes/java/net/SocketException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SocketException.java rename to src/java.base/share/classes/java/net/SocketException.java diff --git a/jdk/src/java.base/share/classes/java/net/SocketImpl.java b/src/java.base/share/classes/java/net/SocketImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SocketImpl.java rename to src/java.base/share/classes/java/net/SocketImpl.java diff --git a/jdk/src/java.base/share/classes/java/net/SocketImplFactory.java b/src/java.base/share/classes/java/net/SocketImplFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SocketImplFactory.java rename to src/java.base/share/classes/java/net/SocketImplFactory.java diff --git a/jdk/src/java.base/share/classes/java/net/SocketInputStream.java b/src/java.base/share/classes/java/net/SocketInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SocketInputStream.java rename to src/java.base/share/classes/java/net/SocketInputStream.java diff --git a/jdk/src/java.base/share/classes/java/net/SocketOption.java b/src/java.base/share/classes/java/net/SocketOption.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SocketOption.java rename to src/java.base/share/classes/java/net/SocketOption.java diff --git a/jdk/src/java.base/share/classes/java/net/SocketOptions.java b/src/java.base/share/classes/java/net/SocketOptions.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SocketOptions.java rename to src/java.base/share/classes/java/net/SocketOptions.java diff --git a/jdk/src/java.base/share/classes/java/net/SocketOutputStream.java b/src/java.base/share/classes/java/net/SocketOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SocketOutputStream.java rename to src/java.base/share/classes/java/net/SocketOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/net/SocketPermission.java b/src/java.base/share/classes/java/net/SocketPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SocketPermission.java rename to src/java.base/share/classes/java/net/SocketPermission.java diff --git a/jdk/src/java.base/share/classes/java/net/SocketTimeoutException.java b/src/java.base/share/classes/java/net/SocketTimeoutException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SocketTimeoutException.java rename to src/java.base/share/classes/java/net/SocketTimeoutException.java diff --git a/jdk/src/java.base/share/classes/java/net/SocksConsts.java b/src/java.base/share/classes/java/net/SocksConsts.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SocksConsts.java rename to src/java.base/share/classes/java/net/SocksConsts.java diff --git a/jdk/src/java.base/share/classes/java/net/SocksSocketImpl.java b/src/java.base/share/classes/java/net/SocksSocketImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/SocksSocketImpl.java rename to src/java.base/share/classes/java/net/SocksSocketImpl.java diff --git a/jdk/src/java.base/share/classes/java/net/StandardProtocolFamily.java b/src/java.base/share/classes/java/net/StandardProtocolFamily.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/StandardProtocolFamily.java rename to src/java.base/share/classes/java/net/StandardProtocolFamily.java diff --git a/jdk/src/java.base/share/classes/java/net/StandardSocketOptions.java b/src/java.base/share/classes/java/net/StandardSocketOptions.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/StandardSocketOptions.java rename to src/java.base/share/classes/java/net/StandardSocketOptions.java diff --git a/jdk/src/java.base/share/classes/java/net/URI.java b/src/java.base/share/classes/java/net/URI.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/URI.java rename to src/java.base/share/classes/java/net/URI.java diff --git a/jdk/src/java.base/share/classes/java/net/URISyntaxException.java b/src/java.base/share/classes/java/net/URISyntaxException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/URISyntaxException.java rename to src/java.base/share/classes/java/net/URISyntaxException.java diff --git a/jdk/src/java.base/share/classes/java/net/URL.java b/src/java.base/share/classes/java/net/URL.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/URL.java rename to src/java.base/share/classes/java/net/URL.java diff --git a/jdk/src/java.base/share/classes/java/net/URLClassLoader.java b/src/java.base/share/classes/java/net/URLClassLoader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/URLClassLoader.java rename to src/java.base/share/classes/java/net/URLClassLoader.java diff --git a/jdk/src/java.base/share/classes/java/net/URLConnection.java b/src/java.base/share/classes/java/net/URLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/URLConnection.java rename to src/java.base/share/classes/java/net/URLConnection.java diff --git a/jdk/src/java.base/share/classes/java/net/URLDecoder.java b/src/java.base/share/classes/java/net/URLDecoder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/URLDecoder.java rename to src/java.base/share/classes/java/net/URLDecoder.java diff --git a/jdk/src/java.base/share/classes/java/net/URLEncoder.java b/src/java.base/share/classes/java/net/URLEncoder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/URLEncoder.java rename to src/java.base/share/classes/java/net/URLEncoder.java diff --git a/jdk/src/java.base/share/classes/java/net/URLPermission.java b/src/java.base/share/classes/java/net/URLPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/URLPermission.java rename to src/java.base/share/classes/java/net/URLPermission.java diff --git a/jdk/src/java.base/share/classes/java/net/URLStreamHandler.java b/src/java.base/share/classes/java/net/URLStreamHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/URLStreamHandler.java rename to src/java.base/share/classes/java/net/URLStreamHandler.java diff --git a/jdk/src/java.base/share/classes/java/net/URLStreamHandlerFactory.java b/src/java.base/share/classes/java/net/URLStreamHandlerFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/URLStreamHandlerFactory.java rename to src/java.base/share/classes/java/net/URLStreamHandlerFactory.java diff --git a/jdk/src/java.base/share/classes/java/net/UnknownHostException.java b/src/java.base/share/classes/java/net/UnknownHostException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/UnknownHostException.java rename to src/java.base/share/classes/java/net/UnknownHostException.java diff --git a/jdk/src/java.base/share/classes/java/net/UnknownServiceException.java b/src/java.base/share/classes/java/net/UnknownServiceException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/UnknownServiceException.java rename to src/java.base/share/classes/java/net/UnknownServiceException.java diff --git a/jdk/src/java.base/share/classes/java/net/doc-files/net-properties.html b/src/java.base/share/classes/java/net/doc-files/net-properties.html similarity index 100% rename from jdk/src/java.base/share/classes/java/net/doc-files/net-properties.html rename to src/java.base/share/classes/java/net/doc-files/net-properties.html diff --git a/jdk/src/java.base/share/classes/java/net/package-info.java b/src/java.base/share/classes/java/net/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/package-info.java rename to src/java.base/share/classes/java/net/package-info.java diff --git a/jdk/src/java.base/share/classes/java/net/spi/URLStreamHandlerProvider.java b/src/java.base/share/classes/java/net/spi/URLStreamHandlerProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/spi/URLStreamHandlerProvider.java rename to src/java.base/share/classes/java/net/spi/URLStreamHandlerProvider.java diff --git a/jdk/src/java.base/share/classes/java/net/spi/package-info.java b/src/java.base/share/classes/java/net/spi/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/net/spi/package-info.java rename to src/java.base/share/classes/java/net/spi/package-info.java diff --git a/jdk/src/java.base/share/classes/java/nio/Bits.java b/src/java.base/share/classes/java/nio/Bits.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/Bits.java rename to src/java.base/share/classes/java/nio/Bits.java diff --git a/jdk/src/java.base/share/classes/java/nio/Buffer.java b/src/java.base/share/classes/java/nio/Buffer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/Buffer.java rename to src/java.base/share/classes/java/nio/Buffer.java diff --git a/jdk/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template b/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template rename to src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template diff --git a/jdk/src/java.base/share/classes/java/nio/ByteOrder.java b/src/java.base/share/classes/java/nio/ByteOrder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/ByteOrder.java rename to src/java.base/share/classes/java/nio/ByteOrder.java diff --git a/jdk/src/java.base/share/classes/java/nio/CharBufferSpliterator.java b/src/java.base/share/classes/java/nio/CharBufferSpliterator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/CharBufferSpliterator.java rename to src/java.base/share/classes/java/nio/CharBufferSpliterator.java diff --git a/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template b/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template rename to src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template diff --git a/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template rename to src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template diff --git a/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template b/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template rename to src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template diff --git a/jdk/src/java.base/share/classes/java/nio/MappedByteBuffer.java b/src/java.base/share/classes/java/nio/MappedByteBuffer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/MappedByteBuffer.java rename to src/java.base/share/classes/java/nio/MappedByteBuffer.java diff --git a/jdk/src/java.base/share/classes/java/nio/StringCharBuffer.java b/src/java.base/share/classes/java/nio/StringCharBuffer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/StringCharBuffer.java rename to src/java.base/share/classes/java/nio/StringCharBuffer.java diff --git a/jdk/src/java.base/share/classes/java/nio/X-Buffer-bin.java.template b/src/java.base/share/classes/java/nio/X-Buffer-bin.java.template similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/X-Buffer-bin.java.template rename to src/java.base/share/classes/java/nio/X-Buffer-bin.java.template diff --git a/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template b/src/java.base/share/classes/java/nio/X-Buffer.java.template similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template rename to src/java.base/share/classes/java/nio/X-Buffer.java.template diff --git a/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java b/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java rename to src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousChannel.java b/src/java.base/share/classes/java/nio/channels/AsynchronousChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/AsynchronousChannel.java rename to src/java.base/share/classes/java/nio/channels/AsynchronousChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousChannelGroup.java b/src/java.base/share/classes/java/nio/channels/AsynchronousChannelGroup.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/AsynchronousChannelGroup.java rename to src/java.base/share/classes/java/nio/channels/AsynchronousChannelGroup.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java b/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java rename to src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java b/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java rename to src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java b/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java rename to src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/ByteChannel.java b/src/java.base/share/classes/java/nio/channels/ByteChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/ByteChannel.java rename to src/java.base/share/classes/java/nio/channels/ByteChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/Channel.java b/src/java.base/share/classes/java/nio/channels/Channel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/Channel.java rename to src/java.base/share/classes/java/nio/channels/Channel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/Channels.java b/src/java.base/share/classes/java/nio/channels/Channels.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/Channels.java rename to src/java.base/share/classes/java/nio/channels/Channels.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/CompletionHandler.java b/src/java.base/share/classes/java/nio/channels/CompletionHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/CompletionHandler.java rename to src/java.base/share/classes/java/nio/channels/CompletionHandler.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/DatagramChannel.java b/src/java.base/share/classes/java/nio/channels/DatagramChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/DatagramChannel.java rename to src/java.base/share/classes/java/nio/channels/DatagramChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/FileChannel.java b/src/java.base/share/classes/java/nio/channels/FileChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/FileChannel.java rename to src/java.base/share/classes/java/nio/channels/FileChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/FileLock.java b/src/java.base/share/classes/java/nio/channels/FileLock.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/FileLock.java rename to src/java.base/share/classes/java/nio/channels/FileLock.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/GatheringByteChannel.java b/src/java.base/share/classes/java/nio/channels/GatheringByteChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/GatheringByteChannel.java rename to src/java.base/share/classes/java/nio/channels/GatheringByteChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/InterruptibleChannel.java b/src/java.base/share/classes/java/nio/channels/InterruptibleChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/InterruptibleChannel.java rename to src/java.base/share/classes/java/nio/channels/InterruptibleChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/MembershipKey.java b/src/java.base/share/classes/java/nio/channels/MembershipKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/MembershipKey.java rename to src/java.base/share/classes/java/nio/channels/MembershipKey.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/MulticastChannel.java b/src/java.base/share/classes/java/nio/channels/MulticastChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/MulticastChannel.java rename to src/java.base/share/classes/java/nio/channels/MulticastChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/NetworkChannel.java b/src/java.base/share/classes/java/nio/channels/NetworkChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/NetworkChannel.java rename to src/java.base/share/classes/java/nio/channels/NetworkChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/Pipe.java b/src/java.base/share/classes/java/nio/channels/Pipe.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/Pipe.java rename to src/java.base/share/classes/java/nio/channels/Pipe.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/ReadableByteChannel.java b/src/java.base/share/classes/java/nio/channels/ReadableByteChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/ReadableByteChannel.java rename to src/java.base/share/classes/java/nio/channels/ReadableByteChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java b/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java rename to src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/SeekableByteChannel.java b/src/java.base/share/classes/java/nio/channels/SeekableByteChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/SeekableByteChannel.java rename to src/java.base/share/classes/java/nio/channels/SeekableByteChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/SelectableChannel.java b/src/java.base/share/classes/java/nio/channels/SelectableChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/SelectableChannel.java rename to src/java.base/share/classes/java/nio/channels/SelectableChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/SelectionKey.java b/src/java.base/share/classes/java/nio/channels/SelectionKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/SelectionKey.java rename to src/java.base/share/classes/java/nio/channels/SelectionKey.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/Selector.java b/src/java.base/share/classes/java/nio/channels/Selector.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/Selector.java rename to src/java.base/share/classes/java/nio/channels/Selector.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java b/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java rename to src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/SocketChannel.java b/src/java.base/share/classes/java/nio/channels/SocketChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/SocketChannel.java rename to src/java.base/share/classes/java/nio/channels/SocketChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/WritableByteChannel.java b/src/java.base/share/classes/java/nio/channels/WritableByteChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/WritableByteChannel.java rename to src/java.base/share/classes/java/nio/channels/WritableByteChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/exceptions b/src/java.base/share/classes/java/nio/channels/exceptions similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/exceptions rename to src/java.base/share/classes/java/nio/channels/exceptions diff --git a/jdk/src/java.base/share/classes/java/nio/channels/package-info.java b/src/java.base/share/classes/java/nio/channels/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/package-info.java rename to src/java.base/share/classes/java/nio/channels/package-info.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java b/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java rename to src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java b/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java rename to src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectionKey.java b/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectionKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectionKey.java rename to src/java.base/share/classes/java/nio/channels/spi/AbstractSelectionKey.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelector.java b/src/java.base/share/classes/java/nio/channels/spi/AbstractSelector.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelector.java rename to src/java.base/share/classes/java/nio/channels/spi/AbstractSelector.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java b/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java rename to src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java b/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java rename to src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/package-info.java b/src/java.base/share/classes/java/nio/channels/spi/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/channels/spi/package-info.java rename to src/java.base/share/classes/java/nio/channels/spi/package-info.java diff --git a/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template b/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template rename to src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template diff --git a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java b/src/java.base/share/classes/java/nio/charset/Charset.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/charset/Charset.java rename to src/java.base/share/classes/java/nio/charset/Charset.java diff --git a/jdk/src/java.base/share/classes/java/nio/charset/CoderMalfunctionError.java b/src/java.base/share/classes/java/nio/charset/CoderMalfunctionError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/charset/CoderMalfunctionError.java rename to src/java.base/share/classes/java/nio/charset/CoderMalfunctionError.java diff --git a/jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java b/src/java.base/share/classes/java/nio/charset/CoderResult.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java rename to src/java.base/share/classes/java/nio/charset/CoderResult.java diff --git a/jdk/src/java.base/share/classes/java/nio/charset/CodingErrorAction.java b/src/java.base/share/classes/java/nio/charset/CodingErrorAction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/charset/CodingErrorAction.java rename to src/java.base/share/classes/java/nio/charset/CodingErrorAction.java diff --git a/jdk/src/java.base/share/classes/java/nio/charset/MalformedInputException.java b/src/java.base/share/classes/java/nio/charset/MalformedInputException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/charset/MalformedInputException.java rename to src/java.base/share/classes/java/nio/charset/MalformedInputException.java diff --git a/jdk/src/java.base/share/classes/java/nio/charset/StandardCharsets.java b/src/java.base/share/classes/java/nio/charset/StandardCharsets.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/charset/StandardCharsets.java rename to src/java.base/share/classes/java/nio/charset/StandardCharsets.java diff --git a/jdk/src/java.base/share/classes/java/nio/charset/UnmappableCharacterException.java b/src/java.base/share/classes/java/nio/charset/UnmappableCharacterException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/charset/UnmappableCharacterException.java rename to src/java.base/share/classes/java/nio/charset/UnmappableCharacterException.java diff --git a/jdk/src/java.base/share/classes/java/nio/charset/exceptions b/src/java.base/share/classes/java/nio/charset/exceptions similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/charset/exceptions rename to src/java.base/share/classes/java/nio/charset/exceptions diff --git a/jdk/src/java.base/share/classes/java/nio/charset/package-info.java b/src/java.base/share/classes/java/nio/charset/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/charset/package-info.java rename to src/java.base/share/classes/java/nio/charset/package-info.java diff --git a/jdk/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java b/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java rename to src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java diff --git a/jdk/src/java.base/share/classes/java/nio/charset/spi/package-info.java b/src/java.base/share/classes/java/nio/charset/spi/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/charset/spi/package-info.java rename to src/java.base/share/classes/java/nio/charset/spi/package-info.java diff --git a/jdk/src/java.base/share/classes/java/nio/exceptions b/src/java.base/share/classes/java/nio/exceptions similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/exceptions rename to src/java.base/share/classes/java/nio/exceptions diff --git a/jdk/src/java.base/share/classes/java/nio/file/AccessDeniedException.java b/src/java.base/share/classes/java/nio/file/AccessDeniedException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/AccessDeniedException.java rename to src/java.base/share/classes/java/nio/file/AccessDeniedException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/AccessMode.java b/src/java.base/share/classes/java/nio/file/AccessMode.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/AccessMode.java rename to src/java.base/share/classes/java/nio/file/AccessMode.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/AtomicMoveNotSupportedException.java b/src/java.base/share/classes/java/nio/file/AtomicMoveNotSupportedException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/AtomicMoveNotSupportedException.java rename to src/java.base/share/classes/java/nio/file/AtomicMoveNotSupportedException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/ClosedDirectoryStreamException.java b/src/java.base/share/classes/java/nio/file/ClosedDirectoryStreamException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/ClosedDirectoryStreamException.java rename to src/java.base/share/classes/java/nio/file/ClosedDirectoryStreamException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/ClosedFileSystemException.java b/src/java.base/share/classes/java/nio/file/ClosedFileSystemException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/ClosedFileSystemException.java rename to src/java.base/share/classes/java/nio/file/ClosedFileSystemException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/ClosedWatchServiceException.java b/src/java.base/share/classes/java/nio/file/ClosedWatchServiceException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/ClosedWatchServiceException.java rename to src/java.base/share/classes/java/nio/file/ClosedWatchServiceException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java b/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java rename to src/java.base/share/classes/java/nio/file/CopyMoveHelper.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/CopyOption.java b/src/java.base/share/classes/java/nio/file/CopyOption.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/CopyOption.java rename to src/java.base/share/classes/java/nio/file/CopyOption.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/DirectoryIteratorException.java b/src/java.base/share/classes/java/nio/file/DirectoryIteratorException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/DirectoryIteratorException.java rename to src/java.base/share/classes/java/nio/file/DirectoryIteratorException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/DirectoryNotEmptyException.java b/src/java.base/share/classes/java/nio/file/DirectoryNotEmptyException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/DirectoryNotEmptyException.java rename to src/java.base/share/classes/java/nio/file/DirectoryNotEmptyException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/DirectoryStream.java b/src/java.base/share/classes/java/nio/file/DirectoryStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/DirectoryStream.java rename to src/java.base/share/classes/java/nio/file/DirectoryStream.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileAlreadyExistsException.java b/src/java.base/share/classes/java/nio/file/FileAlreadyExistsException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileAlreadyExistsException.java rename to src/java.base/share/classes/java/nio/file/FileAlreadyExistsException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileChannelLinesSpliterator.java b/src/java.base/share/classes/java/nio/file/FileChannelLinesSpliterator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileChannelLinesSpliterator.java rename to src/java.base/share/classes/java/nio/file/FileChannelLinesSpliterator.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileStore.java b/src/java.base/share/classes/java/nio/file/FileStore.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileStore.java rename to src/java.base/share/classes/java/nio/file/FileStore.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileSystem.java b/src/java.base/share/classes/java/nio/file/FileSystem.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileSystem.java rename to src/java.base/share/classes/java/nio/file/FileSystem.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileSystemAlreadyExistsException.java b/src/java.base/share/classes/java/nio/file/FileSystemAlreadyExistsException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileSystemAlreadyExistsException.java rename to src/java.base/share/classes/java/nio/file/FileSystemAlreadyExistsException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileSystemException.java b/src/java.base/share/classes/java/nio/file/FileSystemException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileSystemException.java rename to src/java.base/share/classes/java/nio/file/FileSystemException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileSystemLoopException.java b/src/java.base/share/classes/java/nio/file/FileSystemLoopException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileSystemLoopException.java rename to src/java.base/share/classes/java/nio/file/FileSystemLoopException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileSystemNotFoundException.java b/src/java.base/share/classes/java/nio/file/FileSystemNotFoundException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileSystemNotFoundException.java rename to src/java.base/share/classes/java/nio/file/FileSystemNotFoundException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileSystems.java b/src/java.base/share/classes/java/nio/file/FileSystems.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileSystems.java rename to src/java.base/share/classes/java/nio/file/FileSystems.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileTreeIterator.java b/src/java.base/share/classes/java/nio/file/FileTreeIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileTreeIterator.java rename to src/java.base/share/classes/java/nio/file/FileTreeIterator.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileTreeWalker.java b/src/java.base/share/classes/java/nio/file/FileTreeWalker.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileTreeWalker.java rename to src/java.base/share/classes/java/nio/file/FileTreeWalker.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileVisitOption.java b/src/java.base/share/classes/java/nio/file/FileVisitOption.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileVisitOption.java rename to src/java.base/share/classes/java/nio/file/FileVisitOption.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileVisitResult.java b/src/java.base/share/classes/java/nio/file/FileVisitResult.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileVisitResult.java rename to src/java.base/share/classes/java/nio/file/FileVisitResult.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileVisitor.java b/src/java.base/share/classes/java/nio/file/FileVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/FileVisitor.java rename to src/java.base/share/classes/java/nio/file/FileVisitor.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/Files.java b/src/java.base/share/classes/java/nio/file/Files.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/Files.java rename to src/java.base/share/classes/java/nio/file/Files.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/InvalidPathException.java b/src/java.base/share/classes/java/nio/file/InvalidPathException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/InvalidPathException.java rename to src/java.base/share/classes/java/nio/file/InvalidPathException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/LinkOption.java b/src/java.base/share/classes/java/nio/file/LinkOption.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/LinkOption.java rename to src/java.base/share/classes/java/nio/file/LinkOption.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/LinkPermission.java b/src/java.base/share/classes/java/nio/file/LinkPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/LinkPermission.java rename to src/java.base/share/classes/java/nio/file/LinkPermission.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/NoSuchFileException.java b/src/java.base/share/classes/java/nio/file/NoSuchFileException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/NoSuchFileException.java rename to src/java.base/share/classes/java/nio/file/NoSuchFileException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/NotDirectoryException.java b/src/java.base/share/classes/java/nio/file/NotDirectoryException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/NotDirectoryException.java rename to src/java.base/share/classes/java/nio/file/NotDirectoryException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/NotLinkException.java b/src/java.base/share/classes/java/nio/file/NotLinkException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/NotLinkException.java rename to src/java.base/share/classes/java/nio/file/NotLinkException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/OpenOption.java b/src/java.base/share/classes/java/nio/file/OpenOption.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/OpenOption.java rename to src/java.base/share/classes/java/nio/file/OpenOption.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/Path.java b/src/java.base/share/classes/java/nio/file/Path.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/Path.java rename to src/java.base/share/classes/java/nio/file/Path.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/PathMatcher.java b/src/java.base/share/classes/java/nio/file/PathMatcher.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/PathMatcher.java rename to src/java.base/share/classes/java/nio/file/PathMatcher.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/Paths.java b/src/java.base/share/classes/java/nio/file/Paths.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/Paths.java rename to src/java.base/share/classes/java/nio/file/Paths.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/ProviderMismatchException.java b/src/java.base/share/classes/java/nio/file/ProviderMismatchException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/ProviderMismatchException.java rename to src/java.base/share/classes/java/nio/file/ProviderMismatchException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/ProviderNotFoundException.java b/src/java.base/share/classes/java/nio/file/ProviderNotFoundException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/ProviderNotFoundException.java rename to src/java.base/share/classes/java/nio/file/ProviderNotFoundException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/ReadOnlyFileSystemException.java b/src/java.base/share/classes/java/nio/file/ReadOnlyFileSystemException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/ReadOnlyFileSystemException.java rename to src/java.base/share/classes/java/nio/file/ReadOnlyFileSystemException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java b/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java rename to src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/SimpleFileVisitor.java b/src/java.base/share/classes/java/nio/file/SimpleFileVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/SimpleFileVisitor.java rename to src/java.base/share/classes/java/nio/file/SimpleFileVisitor.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/StandardCopyOption.java b/src/java.base/share/classes/java/nio/file/StandardCopyOption.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/StandardCopyOption.java rename to src/java.base/share/classes/java/nio/file/StandardCopyOption.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/StandardOpenOption.java b/src/java.base/share/classes/java/nio/file/StandardOpenOption.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/StandardOpenOption.java rename to src/java.base/share/classes/java/nio/file/StandardOpenOption.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/StandardWatchEventKinds.java b/src/java.base/share/classes/java/nio/file/StandardWatchEventKinds.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/StandardWatchEventKinds.java rename to src/java.base/share/classes/java/nio/file/StandardWatchEventKinds.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/TempFileHelper.java b/src/java.base/share/classes/java/nio/file/TempFileHelper.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/TempFileHelper.java rename to src/java.base/share/classes/java/nio/file/TempFileHelper.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/WatchEvent.java b/src/java.base/share/classes/java/nio/file/WatchEvent.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/WatchEvent.java rename to src/java.base/share/classes/java/nio/file/WatchEvent.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/WatchKey.java b/src/java.base/share/classes/java/nio/file/WatchKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/WatchKey.java rename to src/java.base/share/classes/java/nio/file/WatchKey.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/WatchService.java b/src/java.base/share/classes/java/nio/file/WatchService.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/WatchService.java rename to src/java.base/share/classes/java/nio/file/WatchService.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/Watchable.java b/src/java.base/share/classes/java/nio/file/Watchable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/Watchable.java rename to src/java.base/share/classes/java/nio/file/Watchable.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntry.java b/src/java.base/share/classes/java/nio/file/attribute/AclEntry.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntry.java rename to src/java.base/share/classes/java/nio/file/attribute/AclEntry.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntryFlag.java b/src/java.base/share/classes/java/nio/file/attribute/AclEntryFlag.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntryFlag.java rename to src/java.base/share/classes/java/nio/file/attribute/AclEntryFlag.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntryPermission.java b/src/java.base/share/classes/java/nio/file/attribute/AclEntryPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntryPermission.java rename to src/java.base/share/classes/java/nio/file/attribute/AclEntryPermission.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntryType.java b/src/java.base/share/classes/java/nio/file/attribute/AclEntryType.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/AclEntryType.java rename to src/java.base/share/classes/java/nio/file/attribute/AclEntryType.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java rename to src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/AttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/AttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/AttributeView.java rename to src/java.base/share/classes/java/nio/file/attribute/AttributeView.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributeView.java rename to src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributeView.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributes.java b/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributes.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributes.java rename to src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributes.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributeView.java rename to src/java.base/share/classes/java/nio/file/attribute/DosFileAttributeView.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributes.java b/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributes.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributes.java rename to src/java.base/share/classes/java/nio/file/attribute/DosFileAttributes.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/FileAttribute.java b/src/java.base/share/classes/java/nio/file/attribute/FileAttribute.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/FileAttribute.java rename to src/java.base/share/classes/java/nio/file/attribute/FileAttribute.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/FileAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/FileAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/FileAttributeView.java rename to src/java.base/share/classes/java/nio/file/attribute/FileAttributeView.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java rename to src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/FileStoreAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/FileStoreAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/FileStoreAttributeView.java rename to src/java.base/share/classes/java/nio/file/attribute/FileStoreAttributeView.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/FileTime.java b/src/java.base/share/classes/java/nio/file/attribute/FileTime.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/FileTime.java rename to src/java.base/share/classes/java/nio/file/attribute/FileTime.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/GroupPrincipal.java b/src/java.base/share/classes/java/nio/file/attribute/GroupPrincipal.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/GroupPrincipal.java rename to src/java.base/share/classes/java/nio/file/attribute/GroupPrincipal.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java rename to src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributes.java b/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributes.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributes.java rename to src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributes.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFilePermission.java b/src/java.base/share/classes/java/nio/file/attribute/PosixFilePermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFilePermission.java rename to src/java.base/share/classes/java/nio/file/attribute/PosixFilePermission.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFilePermissions.java b/src/java.base/share/classes/java/nio/file/attribute/PosixFilePermissions.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFilePermissions.java rename to src/java.base/share/classes/java/nio/file/attribute/PosixFilePermissions.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java rename to src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipal.java b/src/java.base/share/classes/java/nio/file/attribute/UserPrincipal.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipal.java rename to src/java.base/share/classes/java/nio/file/attribute/UserPrincipal.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java b/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java rename to src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java b/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java rename to src/java.base/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/package-info.java b/src/java.base/share/classes/java/nio/file/attribute/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/attribute/package-info.java rename to src/java.base/share/classes/java/nio/file/attribute/package-info.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/package-info.java b/src/java.base/share/classes/java/nio/file/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/package-info.java rename to src/java.base/share/classes/java/nio/file/package-info.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java b/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java rename to src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java b/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java rename to src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java diff --git a/jdk/src/java.base/share/classes/java/nio/file/spi/package-info.java b/src/java.base/share/classes/java/nio/file/spi/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/file/spi/package-info.java rename to src/java.base/share/classes/java/nio/file/spi/package-info.java diff --git a/jdk/src/java.base/share/classes/java/nio/package-info.java b/src/java.base/share/classes/java/nio/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/nio/package-info.java rename to src/java.base/share/classes/java/nio/package-info.java diff --git a/jdk/src/java.base/share/classes/java/security/AccessControlContext.java b/src/java.base/share/classes/java/security/AccessControlContext.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/AccessControlContext.java rename to src/java.base/share/classes/java/security/AccessControlContext.java diff --git a/jdk/src/java.base/share/classes/java/security/AccessControlException.java b/src/java.base/share/classes/java/security/AccessControlException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/AccessControlException.java rename to src/java.base/share/classes/java/security/AccessControlException.java diff --git a/jdk/src/java.base/share/classes/java/security/AccessController.java b/src/java.base/share/classes/java/security/AccessController.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/AccessController.java rename to src/java.base/share/classes/java/security/AccessController.java diff --git a/jdk/src/java.base/share/classes/java/security/AlgorithmConstraints.java b/src/java.base/share/classes/java/security/AlgorithmConstraints.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/AlgorithmConstraints.java rename to src/java.base/share/classes/java/security/AlgorithmConstraints.java diff --git a/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java b/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java rename to src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java diff --git a/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGeneratorSpi.java b/src/java.base/share/classes/java/security/AlgorithmParameterGeneratorSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/AlgorithmParameterGeneratorSpi.java rename to src/java.base/share/classes/java/security/AlgorithmParameterGeneratorSpi.java diff --git a/jdk/src/java.base/share/classes/java/security/AlgorithmParameters.java b/src/java.base/share/classes/java/security/AlgorithmParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/AlgorithmParameters.java rename to src/java.base/share/classes/java/security/AlgorithmParameters.java diff --git a/jdk/src/java.base/share/classes/java/security/AlgorithmParametersSpi.java b/src/java.base/share/classes/java/security/AlgorithmParametersSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/AlgorithmParametersSpi.java rename to src/java.base/share/classes/java/security/AlgorithmParametersSpi.java diff --git a/jdk/src/java.base/share/classes/java/security/AllPermission.java b/src/java.base/share/classes/java/security/AllPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/AllPermission.java rename to src/java.base/share/classes/java/security/AllPermission.java diff --git a/jdk/src/java.base/share/classes/java/security/AuthProvider.java b/src/java.base/share/classes/java/security/AuthProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/AuthProvider.java rename to src/java.base/share/classes/java/security/AuthProvider.java diff --git a/jdk/src/java.base/share/classes/java/security/BasicPermission.java b/src/java.base/share/classes/java/security/BasicPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/BasicPermission.java rename to src/java.base/share/classes/java/security/BasicPermission.java diff --git a/jdk/src/java.base/share/classes/java/security/Certificate.java b/src/java.base/share/classes/java/security/Certificate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Certificate.java rename to src/java.base/share/classes/java/security/Certificate.java diff --git a/jdk/src/java.base/share/classes/java/security/CodeSigner.java b/src/java.base/share/classes/java/security/CodeSigner.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/CodeSigner.java rename to src/java.base/share/classes/java/security/CodeSigner.java diff --git a/jdk/src/java.base/share/classes/java/security/CodeSource.java b/src/java.base/share/classes/java/security/CodeSource.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/CodeSource.java rename to src/java.base/share/classes/java/security/CodeSource.java diff --git a/jdk/src/java.base/share/classes/java/security/CryptoPrimitive.java b/src/java.base/share/classes/java/security/CryptoPrimitive.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/CryptoPrimitive.java rename to src/java.base/share/classes/java/security/CryptoPrimitive.java diff --git a/jdk/src/java.base/share/classes/java/security/DigestException.java b/src/java.base/share/classes/java/security/DigestException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/DigestException.java rename to src/java.base/share/classes/java/security/DigestException.java diff --git a/jdk/src/java.base/share/classes/java/security/DigestInputStream.java b/src/java.base/share/classes/java/security/DigestInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/DigestInputStream.java rename to src/java.base/share/classes/java/security/DigestInputStream.java diff --git a/jdk/src/java.base/share/classes/java/security/DigestOutputStream.java b/src/java.base/share/classes/java/security/DigestOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/DigestOutputStream.java rename to src/java.base/share/classes/java/security/DigestOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/security/DomainCombiner.java b/src/java.base/share/classes/java/security/DomainCombiner.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/DomainCombiner.java rename to src/java.base/share/classes/java/security/DomainCombiner.java diff --git a/jdk/src/java.base/share/classes/java/security/DomainLoadStoreParameter.java b/src/java.base/share/classes/java/security/DomainLoadStoreParameter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/DomainLoadStoreParameter.java rename to src/java.base/share/classes/java/security/DomainLoadStoreParameter.java diff --git a/jdk/src/java.base/share/classes/java/security/DrbgParameters.java b/src/java.base/share/classes/java/security/DrbgParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/DrbgParameters.java rename to src/java.base/share/classes/java/security/DrbgParameters.java diff --git a/jdk/src/java.base/share/classes/java/security/GeneralSecurityException.java b/src/java.base/share/classes/java/security/GeneralSecurityException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/GeneralSecurityException.java rename to src/java.base/share/classes/java/security/GeneralSecurityException.java diff --git a/jdk/src/java.base/share/classes/java/security/Guard.java b/src/java.base/share/classes/java/security/Guard.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Guard.java rename to src/java.base/share/classes/java/security/Guard.java diff --git a/jdk/src/java.base/share/classes/java/security/GuardedObject.java b/src/java.base/share/classes/java/security/GuardedObject.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/GuardedObject.java rename to src/java.base/share/classes/java/security/GuardedObject.java diff --git a/jdk/src/java.base/share/classes/java/security/Identity.java b/src/java.base/share/classes/java/security/Identity.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Identity.java rename to src/java.base/share/classes/java/security/Identity.java diff --git a/jdk/src/java.base/share/classes/java/security/IdentityScope.java b/src/java.base/share/classes/java/security/IdentityScope.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/IdentityScope.java rename to src/java.base/share/classes/java/security/IdentityScope.java diff --git a/jdk/src/java.base/share/classes/java/security/InvalidAlgorithmParameterException.java b/src/java.base/share/classes/java/security/InvalidAlgorithmParameterException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/InvalidAlgorithmParameterException.java rename to src/java.base/share/classes/java/security/InvalidAlgorithmParameterException.java diff --git a/jdk/src/java.base/share/classes/java/security/InvalidKeyException.java b/src/java.base/share/classes/java/security/InvalidKeyException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/InvalidKeyException.java rename to src/java.base/share/classes/java/security/InvalidKeyException.java diff --git a/jdk/src/java.base/share/classes/java/security/InvalidParameterException.java b/src/java.base/share/classes/java/security/InvalidParameterException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/InvalidParameterException.java rename to src/java.base/share/classes/java/security/InvalidParameterException.java diff --git a/jdk/src/java.base/share/classes/java/security/Key.java b/src/java.base/share/classes/java/security/Key.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Key.java rename to src/java.base/share/classes/java/security/Key.java diff --git a/jdk/src/java.base/share/classes/java/security/KeyException.java b/src/java.base/share/classes/java/security/KeyException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/KeyException.java rename to src/java.base/share/classes/java/security/KeyException.java diff --git a/jdk/src/java.base/share/classes/java/security/KeyFactory.java b/src/java.base/share/classes/java/security/KeyFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/KeyFactory.java rename to src/java.base/share/classes/java/security/KeyFactory.java diff --git a/jdk/src/java.base/share/classes/java/security/KeyFactorySpi.java b/src/java.base/share/classes/java/security/KeyFactorySpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/KeyFactorySpi.java rename to src/java.base/share/classes/java/security/KeyFactorySpi.java diff --git a/jdk/src/java.base/share/classes/java/security/KeyManagementException.java b/src/java.base/share/classes/java/security/KeyManagementException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/KeyManagementException.java rename to src/java.base/share/classes/java/security/KeyManagementException.java diff --git a/jdk/src/java.base/share/classes/java/security/KeyPair.java b/src/java.base/share/classes/java/security/KeyPair.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/KeyPair.java rename to src/java.base/share/classes/java/security/KeyPair.java diff --git a/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java b/src/java.base/share/classes/java/security/KeyPairGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java rename to src/java.base/share/classes/java/security/KeyPairGenerator.java diff --git a/jdk/src/java.base/share/classes/java/security/KeyPairGeneratorSpi.java b/src/java.base/share/classes/java/security/KeyPairGeneratorSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/KeyPairGeneratorSpi.java rename to src/java.base/share/classes/java/security/KeyPairGeneratorSpi.java diff --git a/jdk/src/java.base/share/classes/java/security/KeyRep.java b/src/java.base/share/classes/java/security/KeyRep.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/KeyRep.java rename to src/java.base/share/classes/java/security/KeyRep.java diff --git a/jdk/src/java.base/share/classes/java/security/KeyStore.java b/src/java.base/share/classes/java/security/KeyStore.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/KeyStore.java rename to src/java.base/share/classes/java/security/KeyStore.java diff --git a/jdk/src/java.base/share/classes/java/security/KeyStoreException.java b/src/java.base/share/classes/java/security/KeyStoreException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/KeyStoreException.java rename to src/java.base/share/classes/java/security/KeyStoreException.java diff --git a/jdk/src/java.base/share/classes/java/security/KeyStoreSpi.java b/src/java.base/share/classes/java/security/KeyStoreSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/KeyStoreSpi.java rename to src/java.base/share/classes/java/security/KeyStoreSpi.java diff --git a/jdk/src/java.base/share/classes/java/security/MessageDigest.java b/src/java.base/share/classes/java/security/MessageDigest.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/MessageDigest.java rename to src/java.base/share/classes/java/security/MessageDigest.java diff --git a/jdk/src/java.base/share/classes/java/security/MessageDigestSpi.java b/src/java.base/share/classes/java/security/MessageDigestSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/MessageDigestSpi.java rename to src/java.base/share/classes/java/security/MessageDigestSpi.java diff --git a/jdk/src/java.base/share/classes/java/security/NoSuchAlgorithmException.java b/src/java.base/share/classes/java/security/NoSuchAlgorithmException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/NoSuchAlgorithmException.java rename to src/java.base/share/classes/java/security/NoSuchAlgorithmException.java diff --git a/jdk/src/java.base/share/classes/java/security/NoSuchProviderException.java b/src/java.base/share/classes/java/security/NoSuchProviderException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/NoSuchProviderException.java rename to src/java.base/share/classes/java/security/NoSuchProviderException.java diff --git a/jdk/src/java.base/share/classes/java/security/PKCS12Attribute.java b/src/java.base/share/classes/java/security/PKCS12Attribute.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/PKCS12Attribute.java rename to src/java.base/share/classes/java/security/PKCS12Attribute.java diff --git a/jdk/src/java.base/share/classes/java/security/Permission.java b/src/java.base/share/classes/java/security/Permission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Permission.java rename to src/java.base/share/classes/java/security/Permission.java diff --git a/jdk/src/java.base/share/classes/java/security/PermissionCollection.java b/src/java.base/share/classes/java/security/PermissionCollection.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/PermissionCollection.java rename to src/java.base/share/classes/java/security/PermissionCollection.java diff --git a/jdk/src/java.base/share/classes/java/security/Permissions.java b/src/java.base/share/classes/java/security/Permissions.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Permissions.java rename to src/java.base/share/classes/java/security/Permissions.java diff --git a/jdk/src/java.base/share/classes/java/security/Policy.java b/src/java.base/share/classes/java/security/Policy.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Policy.java rename to src/java.base/share/classes/java/security/Policy.java diff --git a/jdk/src/java.base/share/classes/java/security/PolicySpi.java b/src/java.base/share/classes/java/security/PolicySpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/PolicySpi.java rename to src/java.base/share/classes/java/security/PolicySpi.java diff --git a/jdk/src/java.base/share/classes/java/security/Principal.java b/src/java.base/share/classes/java/security/Principal.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Principal.java rename to src/java.base/share/classes/java/security/Principal.java diff --git a/jdk/src/java.base/share/classes/java/security/PrivateKey.java b/src/java.base/share/classes/java/security/PrivateKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/PrivateKey.java rename to src/java.base/share/classes/java/security/PrivateKey.java diff --git a/jdk/src/java.base/share/classes/java/security/PrivilegedAction.java b/src/java.base/share/classes/java/security/PrivilegedAction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/PrivilegedAction.java rename to src/java.base/share/classes/java/security/PrivilegedAction.java diff --git a/jdk/src/java.base/share/classes/java/security/PrivilegedActionException.java b/src/java.base/share/classes/java/security/PrivilegedActionException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/PrivilegedActionException.java rename to src/java.base/share/classes/java/security/PrivilegedActionException.java diff --git a/jdk/src/java.base/share/classes/java/security/PrivilegedExceptionAction.java b/src/java.base/share/classes/java/security/PrivilegedExceptionAction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/PrivilegedExceptionAction.java rename to src/java.base/share/classes/java/security/PrivilegedExceptionAction.java diff --git a/jdk/src/java.base/share/classes/java/security/ProtectionDomain.java b/src/java.base/share/classes/java/security/ProtectionDomain.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/ProtectionDomain.java rename to src/java.base/share/classes/java/security/ProtectionDomain.java diff --git a/jdk/src/java.base/share/classes/java/security/Provider.java b/src/java.base/share/classes/java/security/Provider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Provider.java rename to src/java.base/share/classes/java/security/Provider.java diff --git a/jdk/src/java.base/share/classes/java/security/ProviderException.java b/src/java.base/share/classes/java/security/ProviderException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/ProviderException.java rename to src/java.base/share/classes/java/security/ProviderException.java diff --git a/jdk/src/java.base/share/classes/java/security/PublicKey.java b/src/java.base/share/classes/java/security/PublicKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/PublicKey.java rename to src/java.base/share/classes/java/security/PublicKey.java diff --git a/jdk/src/java.base/share/classes/java/security/SecureClassLoader.java b/src/java.base/share/classes/java/security/SecureClassLoader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/SecureClassLoader.java rename to src/java.base/share/classes/java/security/SecureClassLoader.java diff --git a/jdk/src/java.base/share/classes/java/security/SecureRandom.java b/src/java.base/share/classes/java/security/SecureRandom.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/SecureRandom.java rename to src/java.base/share/classes/java/security/SecureRandom.java diff --git a/jdk/src/java.base/share/classes/java/security/SecureRandomParameters.java b/src/java.base/share/classes/java/security/SecureRandomParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/SecureRandomParameters.java rename to src/java.base/share/classes/java/security/SecureRandomParameters.java diff --git a/jdk/src/java.base/share/classes/java/security/SecureRandomSpi.java b/src/java.base/share/classes/java/security/SecureRandomSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/SecureRandomSpi.java rename to src/java.base/share/classes/java/security/SecureRandomSpi.java diff --git a/jdk/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Security.java rename to src/java.base/share/classes/java/security/Security.java diff --git a/jdk/src/java.base/share/classes/java/security/SecurityPermission.java b/src/java.base/share/classes/java/security/SecurityPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/SecurityPermission.java rename to src/java.base/share/classes/java/security/SecurityPermission.java diff --git a/jdk/src/java.base/share/classes/java/security/Signature.java b/src/java.base/share/classes/java/security/Signature.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Signature.java rename to src/java.base/share/classes/java/security/Signature.java diff --git a/jdk/src/java.base/share/classes/java/security/SignatureException.java b/src/java.base/share/classes/java/security/SignatureException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/SignatureException.java rename to src/java.base/share/classes/java/security/SignatureException.java diff --git a/jdk/src/java.base/share/classes/java/security/SignatureSpi.java b/src/java.base/share/classes/java/security/SignatureSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/SignatureSpi.java rename to src/java.base/share/classes/java/security/SignatureSpi.java diff --git a/jdk/src/java.base/share/classes/java/security/SignedObject.java b/src/java.base/share/classes/java/security/SignedObject.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/SignedObject.java rename to src/java.base/share/classes/java/security/SignedObject.java diff --git a/jdk/src/java.base/share/classes/java/security/Signer.java b/src/java.base/share/classes/java/security/Signer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Signer.java rename to src/java.base/share/classes/java/security/Signer.java diff --git a/jdk/src/java.base/share/classes/java/security/Timestamp.java b/src/java.base/share/classes/java/security/Timestamp.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/Timestamp.java rename to src/java.base/share/classes/java/security/Timestamp.java diff --git a/jdk/src/java.base/share/classes/java/security/URIParameter.java b/src/java.base/share/classes/java/security/URIParameter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/URIParameter.java rename to src/java.base/share/classes/java/security/URIParameter.java diff --git a/jdk/src/java.base/share/classes/java/security/UnrecoverableEntryException.java b/src/java.base/share/classes/java/security/UnrecoverableEntryException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/UnrecoverableEntryException.java rename to src/java.base/share/classes/java/security/UnrecoverableEntryException.java diff --git a/jdk/src/java.base/share/classes/java/security/UnrecoverableKeyException.java b/src/java.base/share/classes/java/security/UnrecoverableKeyException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/UnrecoverableKeyException.java rename to src/java.base/share/classes/java/security/UnrecoverableKeyException.java diff --git a/jdk/src/java.base/share/classes/java/security/UnresolvedPermission.java b/src/java.base/share/classes/java/security/UnresolvedPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/UnresolvedPermission.java rename to src/java.base/share/classes/java/security/UnresolvedPermission.java diff --git a/jdk/src/java.base/share/classes/java/security/UnresolvedPermissionCollection.java b/src/java.base/share/classes/java/security/UnresolvedPermissionCollection.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/UnresolvedPermissionCollection.java rename to src/java.base/share/classes/java/security/UnresolvedPermissionCollection.java diff --git a/jdk/src/java.base/share/classes/java/security/acl/Acl.java b/src/java.base/share/classes/java/security/acl/Acl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/acl/Acl.java rename to src/java.base/share/classes/java/security/acl/Acl.java diff --git a/jdk/src/java.base/share/classes/java/security/acl/AclEntry.java b/src/java.base/share/classes/java/security/acl/AclEntry.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/acl/AclEntry.java rename to src/java.base/share/classes/java/security/acl/AclEntry.java diff --git a/jdk/src/java.base/share/classes/java/security/acl/AclNotFoundException.java b/src/java.base/share/classes/java/security/acl/AclNotFoundException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/acl/AclNotFoundException.java rename to src/java.base/share/classes/java/security/acl/AclNotFoundException.java diff --git a/jdk/src/java.base/share/classes/java/security/acl/Group.java b/src/java.base/share/classes/java/security/acl/Group.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/acl/Group.java rename to src/java.base/share/classes/java/security/acl/Group.java diff --git a/jdk/src/java.base/share/classes/java/security/acl/LastOwnerException.java b/src/java.base/share/classes/java/security/acl/LastOwnerException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/acl/LastOwnerException.java rename to src/java.base/share/classes/java/security/acl/LastOwnerException.java diff --git a/jdk/src/java.base/share/classes/java/security/acl/NotOwnerException.java b/src/java.base/share/classes/java/security/acl/NotOwnerException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/acl/NotOwnerException.java rename to src/java.base/share/classes/java/security/acl/NotOwnerException.java diff --git a/jdk/src/java.base/share/classes/java/security/acl/Owner.java b/src/java.base/share/classes/java/security/acl/Owner.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/acl/Owner.java rename to src/java.base/share/classes/java/security/acl/Owner.java diff --git a/jdk/src/java.base/share/classes/java/security/acl/Permission.java b/src/java.base/share/classes/java/security/acl/Permission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/acl/Permission.java rename to src/java.base/share/classes/java/security/acl/Permission.java diff --git a/jdk/src/java.base/share/classes/java/security/acl/package-info.java b/src/java.base/share/classes/java/security/acl/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/acl/package-info.java rename to src/java.base/share/classes/java/security/acl/package-info.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CRL.java b/src/java.base/share/classes/java/security/cert/CRL.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CRL.java rename to src/java.base/share/classes/java/security/cert/CRL.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CRLException.java b/src/java.base/share/classes/java/security/cert/CRLException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CRLException.java rename to src/java.base/share/classes/java/security/cert/CRLException.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CRLReason.java b/src/java.base/share/classes/java/security/cert/CRLReason.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CRLReason.java rename to src/java.base/share/classes/java/security/cert/CRLReason.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CRLSelector.java b/src/java.base/share/classes/java/security/cert/CRLSelector.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CRLSelector.java rename to src/java.base/share/classes/java/security/cert/CRLSelector.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPath.java b/src/java.base/share/classes/java/security/cert/CertPath.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertPath.java rename to src/java.base/share/classes/java/security/cert/CertPath.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilder.java b/src/java.base/share/classes/java/security/cert/CertPathBuilder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertPathBuilder.java rename to src/java.base/share/classes/java/security/cert/CertPathBuilder.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilderException.java b/src/java.base/share/classes/java/security/cert/CertPathBuilderException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertPathBuilderException.java rename to src/java.base/share/classes/java/security/cert/CertPathBuilderException.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilderResult.java b/src/java.base/share/classes/java/security/cert/CertPathBuilderResult.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertPathBuilderResult.java rename to src/java.base/share/classes/java/security/cert/CertPathBuilderResult.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilderSpi.java b/src/java.base/share/classes/java/security/cert/CertPathBuilderSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertPathBuilderSpi.java rename to src/java.base/share/classes/java/security/cert/CertPathBuilderSpi.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathChecker.java b/src/java.base/share/classes/java/security/cert/CertPathChecker.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertPathChecker.java rename to src/java.base/share/classes/java/security/cert/CertPathChecker.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java b/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java rename to src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathParameters.java b/src/java.base/share/classes/java/security/cert/CertPathParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertPathParameters.java rename to src/java.base/share/classes/java/security/cert/CertPathParameters.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathValidator.java b/src/java.base/share/classes/java/security/cert/CertPathValidator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertPathValidator.java rename to src/java.base/share/classes/java/security/cert/CertPathValidator.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathValidatorException.java b/src/java.base/share/classes/java/security/cert/CertPathValidatorException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertPathValidatorException.java rename to src/java.base/share/classes/java/security/cert/CertPathValidatorException.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathValidatorResult.java b/src/java.base/share/classes/java/security/cert/CertPathValidatorResult.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertPathValidatorResult.java rename to src/java.base/share/classes/java/security/cert/CertPathValidatorResult.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathValidatorSpi.java b/src/java.base/share/classes/java/security/cert/CertPathValidatorSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertPathValidatorSpi.java rename to src/java.base/share/classes/java/security/cert/CertPathValidatorSpi.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertSelector.java b/src/java.base/share/classes/java/security/cert/CertSelector.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertSelector.java rename to src/java.base/share/classes/java/security/cert/CertSelector.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertStore.java b/src/java.base/share/classes/java/security/cert/CertStore.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertStore.java rename to src/java.base/share/classes/java/security/cert/CertStore.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertStoreException.java b/src/java.base/share/classes/java/security/cert/CertStoreException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertStoreException.java rename to src/java.base/share/classes/java/security/cert/CertStoreException.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertStoreParameters.java b/src/java.base/share/classes/java/security/cert/CertStoreParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertStoreParameters.java rename to src/java.base/share/classes/java/security/cert/CertStoreParameters.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertStoreSpi.java b/src/java.base/share/classes/java/security/cert/CertStoreSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertStoreSpi.java rename to src/java.base/share/classes/java/security/cert/CertStoreSpi.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/Certificate.java b/src/java.base/share/classes/java/security/cert/Certificate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/Certificate.java rename to src/java.base/share/classes/java/security/cert/Certificate.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertificateEncodingException.java b/src/java.base/share/classes/java/security/cert/CertificateEncodingException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertificateEncodingException.java rename to src/java.base/share/classes/java/security/cert/CertificateEncodingException.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertificateException.java b/src/java.base/share/classes/java/security/cert/CertificateException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertificateException.java rename to src/java.base/share/classes/java/security/cert/CertificateException.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertificateExpiredException.java b/src/java.base/share/classes/java/security/cert/CertificateExpiredException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertificateExpiredException.java rename to src/java.base/share/classes/java/security/cert/CertificateExpiredException.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertificateFactory.java b/src/java.base/share/classes/java/security/cert/CertificateFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertificateFactory.java rename to src/java.base/share/classes/java/security/cert/CertificateFactory.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertificateFactorySpi.java b/src/java.base/share/classes/java/security/cert/CertificateFactorySpi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertificateFactorySpi.java rename to src/java.base/share/classes/java/security/cert/CertificateFactorySpi.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertificateNotYetValidException.java b/src/java.base/share/classes/java/security/cert/CertificateNotYetValidException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertificateNotYetValidException.java rename to src/java.base/share/classes/java/security/cert/CertificateNotYetValidException.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertificateParsingException.java b/src/java.base/share/classes/java/security/cert/CertificateParsingException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertificateParsingException.java rename to src/java.base/share/classes/java/security/cert/CertificateParsingException.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertificateRevokedException.java b/src/java.base/share/classes/java/security/cert/CertificateRevokedException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CertificateRevokedException.java rename to src/java.base/share/classes/java/security/cert/CertificateRevokedException.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/CollectionCertStoreParameters.java b/src/java.base/share/classes/java/security/cert/CollectionCertStoreParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/CollectionCertStoreParameters.java rename to src/java.base/share/classes/java/security/cert/CollectionCertStoreParameters.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/Extension.java b/src/java.base/share/classes/java/security/cert/Extension.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/Extension.java rename to src/java.base/share/classes/java/security/cert/Extension.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/LDAPCertStoreParameters.java b/src/java.base/share/classes/java/security/cert/LDAPCertStoreParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/LDAPCertStoreParameters.java rename to src/java.base/share/classes/java/security/cert/LDAPCertStoreParameters.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/PKIXBuilderParameters.java b/src/java.base/share/classes/java/security/cert/PKIXBuilderParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/PKIXBuilderParameters.java rename to src/java.base/share/classes/java/security/cert/PKIXBuilderParameters.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/PKIXCertPathBuilderResult.java b/src/java.base/share/classes/java/security/cert/PKIXCertPathBuilderResult.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/PKIXCertPathBuilderResult.java rename to src/java.base/share/classes/java/security/cert/PKIXCertPathBuilderResult.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/PKIXCertPathChecker.java b/src/java.base/share/classes/java/security/cert/PKIXCertPathChecker.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/PKIXCertPathChecker.java rename to src/java.base/share/classes/java/security/cert/PKIXCertPathChecker.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/PKIXCertPathValidatorResult.java b/src/java.base/share/classes/java/security/cert/PKIXCertPathValidatorResult.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/PKIXCertPathValidatorResult.java rename to src/java.base/share/classes/java/security/cert/PKIXCertPathValidatorResult.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/PKIXParameters.java b/src/java.base/share/classes/java/security/cert/PKIXParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/PKIXParameters.java rename to src/java.base/share/classes/java/security/cert/PKIXParameters.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/PKIXReason.java b/src/java.base/share/classes/java/security/cert/PKIXReason.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/PKIXReason.java rename to src/java.base/share/classes/java/security/cert/PKIXReason.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/PKIXRevocationChecker.java b/src/java.base/share/classes/java/security/cert/PKIXRevocationChecker.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/PKIXRevocationChecker.java rename to src/java.base/share/classes/java/security/cert/PKIXRevocationChecker.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/PolicyNode.java b/src/java.base/share/classes/java/security/cert/PolicyNode.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/PolicyNode.java rename to src/java.base/share/classes/java/security/cert/PolicyNode.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/PolicyQualifierInfo.java b/src/java.base/share/classes/java/security/cert/PolicyQualifierInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/PolicyQualifierInfo.java rename to src/java.base/share/classes/java/security/cert/PolicyQualifierInfo.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/TrustAnchor.java b/src/java.base/share/classes/java/security/cert/TrustAnchor.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/TrustAnchor.java rename to src/java.base/share/classes/java/security/cert/TrustAnchor.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/URICertStoreParameters.java b/src/java.base/share/classes/java/security/cert/URICertStoreParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/URICertStoreParameters.java rename to src/java.base/share/classes/java/security/cert/URICertStoreParameters.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/X509CRL.java b/src/java.base/share/classes/java/security/cert/X509CRL.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/X509CRL.java rename to src/java.base/share/classes/java/security/cert/X509CRL.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/X509CRLEntry.java b/src/java.base/share/classes/java/security/cert/X509CRLEntry.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/X509CRLEntry.java rename to src/java.base/share/classes/java/security/cert/X509CRLEntry.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/X509CRLSelector.java b/src/java.base/share/classes/java/security/cert/X509CRLSelector.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/X509CRLSelector.java rename to src/java.base/share/classes/java/security/cert/X509CRLSelector.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java b/src/java.base/share/classes/java/security/cert/X509CertSelector.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java rename to src/java.base/share/classes/java/security/cert/X509CertSelector.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/X509Certificate.java b/src/java.base/share/classes/java/security/cert/X509Certificate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/X509Certificate.java rename to src/java.base/share/classes/java/security/cert/X509Certificate.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/X509Extension.java b/src/java.base/share/classes/java/security/cert/X509Extension.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/X509Extension.java rename to src/java.base/share/classes/java/security/cert/X509Extension.java diff --git a/jdk/src/java.base/share/classes/java/security/cert/package-info.java b/src/java.base/share/classes/java/security/cert/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/cert/package-info.java rename to src/java.base/share/classes/java/security/cert/package-info.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/DSAKey.java b/src/java.base/share/classes/java/security/interfaces/DSAKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/DSAKey.java rename to src/java.base/share/classes/java/security/interfaces/DSAKey.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/DSAKeyPairGenerator.java b/src/java.base/share/classes/java/security/interfaces/DSAKeyPairGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/DSAKeyPairGenerator.java rename to src/java.base/share/classes/java/security/interfaces/DSAKeyPairGenerator.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/DSAParams.java b/src/java.base/share/classes/java/security/interfaces/DSAParams.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/DSAParams.java rename to src/java.base/share/classes/java/security/interfaces/DSAParams.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java rename to src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java b/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java rename to src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/ECKey.java b/src/java.base/share/classes/java/security/interfaces/ECKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/ECKey.java rename to src/java.base/share/classes/java/security/interfaces/ECKey.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java rename to src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java b/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java rename to src/java.base/share/classes/java/security/interfaces/ECPublicKey.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/RSAKey.java b/src/java.base/share/classes/java/security/interfaces/RSAKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/RSAKey.java rename to src/java.base/share/classes/java/security/interfaces/RSAKey.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java b/src/java.base/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java rename to src/java.base/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/RSAPrivateCrtKey.java b/src/java.base/share/classes/java/security/interfaces/RSAPrivateCrtKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/RSAPrivateCrtKey.java rename to src/java.base/share/classes/java/security/interfaces/RSAPrivateCrtKey.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java rename to src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java b/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java rename to src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/package-info.java b/src/java.base/share/classes/java/security/interfaces/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/interfaces/package-info.java rename to src/java.base/share/classes/java/security/interfaces/package-info.java diff --git a/jdk/src/java.base/share/classes/java/security/package-info.java b/src/java.base/share/classes/java/security/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/package-info.java rename to src/java.base/share/classes/java/security/package-info.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/AlgorithmParameterSpec.java b/src/java.base/share/classes/java/security/spec/AlgorithmParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/AlgorithmParameterSpec.java rename to src/java.base/share/classes/java/security/spec/AlgorithmParameterSpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/DSAGenParameterSpec.java b/src/java.base/share/classes/java/security/spec/DSAGenParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/DSAGenParameterSpec.java rename to src/java.base/share/classes/java/security/spec/DSAGenParameterSpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/DSAParameterSpec.java b/src/java.base/share/classes/java/security/spec/DSAParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/DSAParameterSpec.java rename to src/java.base/share/classes/java/security/spec/DSAParameterSpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/DSAPrivateKeySpec.java b/src/java.base/share/classes/java/security/spec/DSAPrivateKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/DSAPrivateKeySpec.java rename to src/java.base/share/classes/java/security/spec/DSAPrivateKeySpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/DSAPublicKeySpec.java b/src/java.base/share/classes/java/security/spec/DSAPublicKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/DSAPublicKeySpec.java rename to src/java.base/share/classes/java/security/spec/DSAPublicKeySpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/ECField.java b/src/java.base/share/classes/java/security/spec/ECField.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/ECField.java rename to src/java.base/share/classes/java/security/spec/ECField.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/ECFieldF2m.java b/src/java.base/share/classes/java/security/spec/ECFieldF2m.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/ECFieldF2m.java rename to src/java.base/share/classes/java/security/spec/ECFieldF2m.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/ECFieldFp.java b/src/java.base/share/classes/java/security/spec/ECFieldFp.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/ECFieldFp.java rename to src/java.base/share/classes/java/security/spec/ECFieldFp.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/ECGenParameterSpec.java b/src/java.base/share/classes/java/security/spec/ECGenParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/ECGenParameterSpec.java rename to src/java.base/share/classes/java/security/spec/ECGenParameterSpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/ECParameterSpec.java b/src/java.base/share/classes/java/security/spec/ECParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/ECParameterSpec.java rename to src/java.base/share/classes/java/security/spec/ECParameterSpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/ECPoint.java b/src/java.base/share/classes/java/security/spec/ECPoint.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/ECPoint.java rename to src/java.base/share/classes/java/security/spec/ECPoint.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/ECPrivateKeySpec.java b/src/java.base/share/classes/java/security/spec/ECPrivateKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/ECPrivateKeySpec.java rename to src/java.base/share/classes/java/security/spec/ECPrivateKeySpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/ECPublicKeySpec.java b/src/java.base/share/classes/java/security/spec/ECPublicKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/ECPublicKeySpec.java rename to src/java.base/share/classes/java/security/spec/ECPublicKeySpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/EllipticCurve.java b/src/java.base/share/classes/java/security/spec/EllipticCurve.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/EllipticCurve.java rename to src/java.base/share/classes/java/security/spec/EllipticCurve.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/EncodedKeySpec.java b/src/java.base/share/classes/java/security/spec/EncodedKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/EncodedKeySpec.java rename to src/java.base/share/classes/java/security/spec/EncodedKeySpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/InvalidKeySpecException.java b/src/java.base/share/classes/java/security/spec/InvalidKeySpecException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/InvalidKeySpecException.java rename to src/java.base/share/classes/java/security/spec/InvalidKeySpecException.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/InvalidParameterSpecException.java b/src/java.base/share/classes/java/security/spec/InvalidParameterSpecException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/InvalidParameterSpecException.java rename to src/java.base/share/classes/java/security/spec/InvalidParameterSpecException.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/KeySpec.java b/src/java.base/share/classes/java/security/spec/KeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/KeySpec.java rename to src/java.base/share/classes/java/security/spec/KeySpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/MGF1ParameterSpec.java b/src/java.base/share/classes/java/security/spec/MGF1ParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/MGF1ParameterSpec.java rename to src/java.base/share/classes/java/security/spec/MGF1ParameterSpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java b/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java rename to src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/PSSParameterSpec.java b/src/java.base/share/classes/java/security/spec/PSSParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/PSSParameterSpec.java rename to src/java.base/share/classes/java/security/spec/PSSParameterSpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/RSAKeyGenParameterSpec.java b/src/java.base/share/classes/java/security/spec/RSAKeyGenParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/RSAKeyGenParameterSpec.java rename to src/java.base/share/classes/java/security/spec/RSAKeyGenParameterSpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java b/src/java.base/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java rename to src/java.base/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/RSAOtherPrimeInfo.java b/src/java.base/share/classes/java/security/spec/RSAOtherPrimeInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/RSAOtherPrimeInfo.java rename to src/java.base/share/classes/java/security/spec/RSAOtherPrimeInfo.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java b/src/java.base/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java rename to src/java.base/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/RSAPrivateKeySpec.java b/src/java.base/share/classes/java/security/spec/RSAPrivateKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/RSAPrivateKeySpec.java rename to src/java.base/share/classes/java/security/spec/RSAPrivateKeySpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/RSAPublicKeySpec.java b/src/java.base/share/classes/java/security/spec/RSAPublicKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/RSAPublicKeySpec.java rename to src/java.base/share/classes/java/security/spec/RSAPublicKeySpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/X509EncodedKeySpec.java b/src/java.base/share/classes/java/security/spec/X509EncodedKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/X509EncodedKeySpec.java rename to src/java.base/share/classes/java/security/spec/X509EncodedKeySpec.java diff --git a/jdk/src/java.base/share/classes/java/security/spec/package-info.java b/src/java.base/share/classes/java/security/spec/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/security/spec/package-info.java rename to src/java.base/share/classes/java/security/spec/package-info.java diff --git a/jdk/src/java.base/share/classes/java/text/Annotation.java b/src/java.base/share/classes/java/text/Annotation.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/Annotation.java rename to src/java.base/share/classes/java/text/Annotation.java diff --git a/jdk/src/java.base/share/classes/java/text/AttributedCharacterIterator.java b/src/java.base/share/classes/java/text/AttributedCharacterIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/AttributedCharacterIterator.java rename to src/java.base/share/classes/java/text/AttributedCharacterIterator.java diff --git a/jdk/src/java.base/share/classes/java/text/AttributedString.java b/src/java.base/share/classes/java/text/AttributedString.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/AttributedString.java rename to src/java.base/share/classes/java/text/AttributedString.java diff --git a/jdk/src/java.base/share/classes/java/text/Bidi.java b/src/java.base/share/classes/java/text/Bidi.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/Bidi.java rename to src/java.base/share/classes/java/text/Bidi.java diff --git a/jdk/src/java.base/share/classes/java/text/BreakIterator.java b/src/java.base/share/classes/java/text/BreakIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/BreakIterator.java rename to src/java.base/share/classes/java/text/BreakIterator.java diff --git a/jdk/src/java.base/share/classes/java/text/CalendarBuilder.java b/src/java.base/share/classes/java/text/CalendarBuilder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/CalendarBuilder.java rename to src/java.base/share/classes/java/text/CalendarBuilder.java diff --git a/jdk/src/java.base/share/classes/java/text/CharacterIterator.java b/src/java.base/share/classes/java/text/CharacterIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/CharacterIterator.java rename to src/java.base/share/classes/java/text/CharacterIterator.java diff --git a/jdk/src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java b/src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java rename to src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java diff --git a/jdk/src/java.base/share/classes/java/text/ChoiceFormat.java b/src/java.base/share/classes/java/text/ChoiceFormat.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/ChoiceFormat.java rename to src/java.base/share/classes/java/text/ChoiceFormat.java diff --git a/jdk/src/java.base/share/classes/java/text/CollationElementIterator.java b/src/java.base/share/classes/java/text/CollationElementIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/CollationElementIterator.java rename to src/java.base/share/classes/java/text/CollationElementIterator.java diff --git a/jdk/src/java.base/share/classes/java/text/CollationKey.java b/src/java.base/share/classes/java/text/CollationKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/CollationKey.java rename to src/java.base/share/classes/java/text/CollationKey.java diff --git a/jdk/src/java.base/share/classes/java/text/Collator.java b/src/java.base/share/classes/java/text/Collator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/Collator.java rename to src/java.base/share/classes/java/text/Collator.java diff --git a/jdk/src/java.base/share/classes/java/text/DateFormat.java b/src/java.base/share/classes/java/text/DateFormat.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/DateFormat.java rename to src/java.base/share/classes/java/text/DateFormat.java diff --git a/jdk/src/java.base/share/classes/java/text/DateFormatSymbols.java b/src/java.base/share/classes/java/text/DateFormatSymbols.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/DateFormatSymbols.java rename to src/java.base/share/classes/java/text/DateFormatSymbols.java diff --git a/jdk/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/DecimalFormat.java rename to src/java.base/share/classes/java/text/DecimalFormat.java diff --git a/jdk/src/java.base/share/classes/java/text/DecimalFormatSymbols.java b/src/java.base/share/classes/java/text/DecimalFormatSymbols.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/DecimalFormatSymbols.java rename to src/java.base/share/classes/java/text/DecimalFormatSymbols.java diff --git a/jdk/src/java.base/share/classes/java/text/DigitList.java b/src/java.base/share/classes/java/text/DigitList.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/DigitList.java rename to src/java.base/share/classes/java/text/DigitList.java diff --git a/jdk/src/java.base/share/classes/java/text/DontCareFieldPosition.java b/src/java.base/share/classes/java/text/DontCareFieldPosition.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/DontCareFieldPosition.java rename to src/java.base/share/classes/java/text/DontCareFieldPosition.java diff --git a/jdk/src/java.base/share/classes/java/text/EntryPair.java b/src/java.base/share/classes/java/text/EntryPair.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/EntryPair.java rename to src/java.base/share/classes/java/text/EntryPair.java diff --git a/jdk/src/java.base/share/classes/java/text/FieldPosition.java b/src/java.base/share/classes/java/text/FieldPosition.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/FieldPosition.java rename to src/java.base/share/classes/java/text/FieldPosition.java diff --git a/jdk/src/java.base/share/classes/java/text/Format.java b/src/java.base/share/classes/java/text/Format.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/Format.java rename to src/java.base/share/classes/java/text/Format.java diff --git a/jdk/src/java.base/share/classes/java/text/MergeCollation.java b/src/java.base/share/classes/java/text/MergeCollation.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/MergeCollation.java rename to src/java.base/share/classes/java/text/MergeCollation.java diff --git a/jdk/src/java.base/share/classes/java/text/MessageFormat.java b/src/java.base/share/classes/java/text/MessageFormat.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/MessageFormat.java rename to src/java.base/share/classes/java/text/MessageFormat.java diff --git a/jdk/src/java.base/share/classes/java/text/Normalizer.java b/src/java.base/share/classes/java/text/Normalizer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/Normalizer.java rename to src/java.base/share/classes/java/text/Normalizer.java diff --git a/jdk/src/java.base/share/classes/java/text/NumberFormat.java b/src/java.base/share/classes/java/text/NumberFormat.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/NumberFormat.java rename to src/java.base/share/classes/java/text/NumberFormat.java diff --git a/jdk/src/java.base/share/classes/java/text/ParseException.java b/src/java.base/share/classes/java/text/ParseException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/ParseException.java rename to src/java.base/share/classes/java/text/ParseException.java diff --git a/jdk/src/java.base/share/classes/java/text/ParsePosition.java b/src/java.base/share/classes/java/text/ParsePosition.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/ParsePosition.java rename to src/java.base/share/classes/java/text/ParsePosition.java diff --git a/jdk/src/java.base/share/classes/java/text/PatternEntry.java b/src/java.base/share/classes/java/text/PatternEntry.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/PatternEntry.java rename to src/java.base/share/classes/java/text/PatternEntry.java diff --git a/jdk/src/java.base/share/classes/java/text/RBCollationTables.java b/src/java.base/share/classes/java/text/RBCollationTables.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/RBCollationTables.java rename to src/java.base/share/classes/java/text/RBCollationTables.java diff --git a/jdk/src/java.base/share/classes/java/text/RBTableBuilder.java b/src/java.base/share/classes/java/text/RBTableBuilder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/RBTableBuilder.java rename to src/java.base/share/classes/java/text/RBTableBuilder.java diff --git a/jdk/src/java.base/share/classes/java/text/RuleBasedCollationKey.java b/src/java.base/share/classes/java/text/RuleBasedCollationKey.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/RuleBasedCollationKey.java rename to src/java.base/share/classes/java/text/RuleBasedCollationKey.java diff --git a/jdk/src/java.base/share/classes/java/text/RuleBasedCollator.java b/src/java.base/share/classes/java/text/RuleBasedCollator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/RuleBasedCollator.java rename to src/java.base/share/classes/java/text/RuleBasedCollator.java diff --git a/jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java b/src/java.base/share/classes/java/text/SimpleDateFormat.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java rename to src/java.base/share/classes/java/text/SimpleDateFormat.java diff --git a/jdk/src/java.base/share/classes/java/text/StringCharacterIterator.java b/src/java.base/share/classes/java/text/StringCharacterIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/StringCharacterIterator.java rename to src/java.base/share/classes/java/text/StringCharacterIterator.java diff --git a/jdk/src/java.base/share/classes/java/text/package-info.java b/src/java.base/share/classes/java/text/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/package-info.java rename to src/java.base/share/classes/java/text/package-info.java diff --git a/jdk/src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java b/src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java rename to src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java diff --git a/jdk/src/java.base/share/classes/java/text/spi/CollatorProvider.java b/src/java.base/share/classes/java/text/spi/CollatorProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/spi/CollatorProvider.java rename to src/java.base/share/classes/java/text/spi/CollatorProvider.java diff --git a/jdk/src/java.base/share/classes/java/text/spi/DateFormatProvider.java b/src/java.base/share/classes/java/text/spi/DateFormatProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/spi/DateFormatProvider.java rename to src/java.base/share/classes/java/text/spi/DateFormatProvider.java diff --git a/jdk/src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java b/src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java rename to src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java diff --git a/jdk/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java b/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java rename to src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java diff --git a/jdk/src/java.base/share/classes/java/text/spi/NumberFormatProvider.java b/src/java.base/share/classes/java/text/spi/NumberFormatProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/spi/NumberFormatProvider.java rename to src/java.base/share/classes/java/text/spi/NumberFormatProvider.java diff --git a/jdk/src/java.base/share/classes/java/text/spi/package-info.java b/src/java.base/share/classes/java/text/spi/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/text/spi/package-info.java rename to src/java.base/share/classes/java/text/spi/package-info.java diff --git a/jdk/src/java.base/share/classes/java/time/Clock.java b/src/java.base/share/classes/java/time/Clock.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/Clock.java rename to src/java.base/share/classes/java/time/Clock.java diff --git a/jdk/src/java.base/share/classes/java/time/DateTimeException.java b/src/java.base/share/classes/java/time/DateTimeException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/DateTimeException.java rename to src/java.base/share/classes/java/time/DateTimeException.java diff --git a/jdk/src/java.base/share/classes/java/time/DayOfWeek.java b/src/java.base/share/classes/java/time/DayOfWeek.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/DayOfWeek.java rename to src/java.base/share/classes/java/time/DayOfWeek.java diff --git a/jdk/src/java.base/share/classes/java/time/Duration.java b/src/java.base/share/classes/java/time/Duration.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/Duration.java rename to src/java.base/share/classes/java/time/Duration.java diff --git a/jdk/src/java.base/share/classes/java/time/Instant.java b/src/java.base/share/classes/java/time/Instant.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/Instant.java rename to src/java.base/share/classes/java/time/Instant.java diff --git a/jdk/src/java.base/share/classes/java/time/LocalDate.java b/src/java.base/share/classes/java/time/LocalDate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/LocalDate.java rename to src/java.base/share/classes/java/time/LocalDate.java diff --git a/jdk/src/java.base/share/classes/java/time/LocalDateTime.java b/src/java.base/share/classes/java/time/LocalDateTime.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/LocalDateTime.java rename to src/java.base/share/classes/java/time/LocalDateTime.java diff --git a/jdk/src/java.base/share/classes/java/time/LocalTime.java b/src/java.base/share/classes/java/time/LocalTime.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/LocalTime.java rename to src/java.base/share/classes/java/time/LocalTime.java diff --git a/jdk/src/java.base/share/classes/java/time/Month.java b/src/java.base/share/classes/java/time/Month.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/Month.java rename to src/java.base/share/classes/java/time/Month.java diff --git a/jdk/src/java.base/share/classes/java/time/MonthDay.java b/src/java.base/share/classes/java/time/MonthDay.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/MonthDay.java rename to src/java.base/share/classes/java/time/MonthDay.java diff --git a/jdk/src/java.base/share/classes/java/time/OffsetDateTime.java b/src/java.base/share/classes/java/time/OffsetDateTime.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/OffsetDateTime.java rename to src/java.base/share/classes/java/time/OffsetDateTime.java diff --git a/jdk/src/java.base/share/classes/java/time/OffsetTime.java b/src/java.base/share/classes/java/time/OffsetTime.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/OffsetTime.java rename to src/java.base/share/classes/java/time/OffsetTime.java diff --git a/jdk/src/java.base/share/classes/java/time/Period.java b/src/java.base/share/classes/java/time/Period.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/Period.java rename to src/java.base/share/classes/java/time/Period.java diff --git a/jdk/src/java.base/share/classes/java/time/Ser.java b/src/java.base/share/classes/java/time/Ser.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/Ser.java rename to src/java.base/share/classes/java/time/Ser.java diff --git a/jdk/src/java.base/share/classes/java/time/Year.java b/src/java.base/share/classes/java/time/Year.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/Year.java rename to src/java.base/share/classes/java/time/Year.java diff --git a/jdk/src/java.base/share/classes/java/time/YearMonth.java b/src/java.base/share/classes/java/time/YearMonth.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/YearMonth.java rename to src/java.base/share/classes/java/time/YearMonth.java diff --git a/jdk/src/java.base/share/classes/java/time/ZoneId.java b/src/java.base/share/classes/java/time/ZoneId.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/ZoneId.java rename to src/java.base/share/classes/java/time/ZoneId.java diff --git a/jdk/src/java.base/share/classes/java/time/ZoneOffset.java b/src/java.base/share/classes/java/time/ZoneOffset.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/ZoneOffset.java rename to src/java.base/share/classes/java/time/ZoneOffset.java diff --git a/jdk/src/java.base/share/classes/java/time/ZoneRegion.java b/src/java.base/share/classes/java/time/ZoneRegion.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/ZoneRegion.java rename to src/java.base/share/classes/java/time/ZoneRegion.java diff --git a/jdk/src/java.base/share/classes/java/time/ZonedDateTime.java b/src/java.base/share/classes/java/time/ZonedDateTime.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/ZonedDateTime.java rename to src/java.base/share/classes/java/time/ZonedDateTime.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/AbstractChronology.java b/src/java.base/share/classes/java/time/chrono/AbstractChronology.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/AbstractChronology.java rename to src/java.base/share/classes/java/time/chrono/AbstractChronology.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDate.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDate.java rename to src/java.base/share/classes/java/time/chrono/ChronoLocalDate.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java rename to src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTime.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTime.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTime.java rename to src/java.base/share/classes/java/time/chrono/ChronoLocalDateTime.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java rename to src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/ChronoPeriod.java b/src/java.base/share/classes/java/time/chrono/ChronoPeriod.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/ChronoPeriod.java rename to src/java.base/share/classes/java/time/chrono/ChronoPeriod.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java rename to src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTime.java b/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTime.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTime.java rename to src/java.base/share/classes/java/time/chrono/ChronoZonedDateTime.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java rename to src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/Chronology.java b/src/java.base/share/classes/java/time/chrono/Chronology.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/Chronology.java rename to src/java.base/share/classes/java/time/chrono/Chronology.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/Era.java b/src/java.base/share/classes/java/time/chrono/Era.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/Era.java rename to src/java.base/share/classes/java/time/chrono/Era.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/HijrahChronology.java b/src/java.base/share/classes/java/time/chrono/HijrahChronology.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/HijrahChronology.java rename to src/java.base/share/classes/java/time/chrono/HijrahChronology.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/HijrahDate.java b/src/java.base/share/classes/java/time/chrono/HijrahDate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/HijrahDate.java rename to src/java.base/share/classes/java/time/chrono/HijrahDate.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/HijrahEra.java b/src/java.base/share/classes/java/time/chrono/HijrahEra.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/HijrahEra.java rename to src/java.base/share/classes/java/time/chrono/HijrahEra.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/IsoChronology.java b/src/java.base/share/classes/java/time/chrono/IsoChronology.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/IsoChronology.java rename to src/java.base/share/classes/java/time/chrono/IsoChronology.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/IsoEra.java b/src/java.base/share/classes/java/time/chrono/IsoEra.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/IsoEra.java rename to src/java.base/share/classes/java/time/chrono/IsoEra.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java b/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java rename to src/java.base/share/classes/java/time/chrono/JapaneseChronology.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/JapaneseDate.java b/src/java.base/share/classes/java/time/chrono/JapaneseDate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/JapaneseDate.java rename to src/java.base/share/classes/java/time/chrono/JapaneseDate.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java b/src/java.base/share/classes/java/time/chrono/JapaneseEra.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java rename to src/java.base/share/classes/java/time/chrono/JapaneseEra.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/MinguoChronology.java b/src/java.base/share/classes/java/time/chrono/MinguoChronology.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/MinguoChronology.java rename to src/java.base/share/classes/java/time/chrono/MinguoChronology.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/MinguoDate.java b/src/java.base/share/classes/java/time/chrono/MinguoDate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/MinguoDate.java rename to src/java.base/share/classes/java/time/chrono/MinguoDate.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/MinguoEra.java b/src/java.base/share/classes/java/time/chrono/MinguoEra.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/MinguoEra.java rename to src/java.base/share/classes/java/time/chrono/MinguoEra.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/Ser.java b/src/java.base/share/classes/java/time/chrono/Ser.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/Ser.java rename to src/java.base/share/classes/java/time/chrono/Ser.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java b/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java rename to src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java b/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java rename to src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/ThaiBuddhistEra.java b/src/java.base/share/classes/java/time/chrono/ThaiBuddhistEra.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/ThaiBuddhistEra.java rename to src/java.base/share/classes/java/time/chrono/ThaiBuddhistEra.java diff --git a/jdk/src/java.base/share/classes/java/time/chrono/hijrah-config-islamic-umalqura.properties b/src/java.base/share/classes/java/time/chrono/hijrah-config-islamic-umalqura.properties similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/hijrah-config-islamic-umalqura.properties rename to src/java.base/share/classes/java/time/chrono/hijrah-config-islamic-umalqura.properties diff --git a/jdk/src/java.base/share/classes/java/time/chrono/package-info.java b/src/java.base/share/classes/java/time/chrono/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/chrono/package-info.java rename to src/java.base/share/classes/java/time/chrono/package-info.java diff --git a/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatter.java b/src/java.base/share/classes/java/time/format/DateTimeFormatter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/DateTimeFormatter.java rename to src/java.base/share/classes/java/time/format/DateTimeFormatter.java diff --git a/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java rename to src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java diff --git a/jdk/src/java.base/share/classes/java/time/format/DateTimeParseContext.java b/src/java.base/share/classes/java/time/format/DateTimeParseContext.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/DateTimeParseContext.java rename to src/java.base/share/classes/java/time/format/DateTimeParseContext.java diff --git a/jdk/src/java.base/share/classes/java/time/format/DateTimeParseException.java b/src/java.base/share/classes/java/time/format/DateTimeParseException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/DateTimeParseException.java rename to src/java.base/share/classes/java/time/format/DateTimeParseException.java diff --git a/jdk/src/java.base/share/classes/java/time/format/DateTimePrintContext.java b/src/java.base/share/classes/java/time/format/DateTimePrintContext.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/DateTimePrintContext.java rename to src/java.base/share/classes/java/time/format/DateTimePrintContext.java diff --git a/jdk/src/java.base/share/classes/java/time/format/DateTimeTextProvider.java b/src/java.base/share/classes/java/time/format/DateTimeTextProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/DateTimeTextProvider.java rename to src/java.base/share/classes/java/time/format/DateTimeTextProvider.java diff --git a/jdk/src/java.base/share/classes/java/time/format/DecimalStyle.java b/src/java.base/share/classes/java/time/format/DecimalStyle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/DecimalStyle.java rename to src/java.base/share/classes/java/time/format/DecimalStyle.java diff --git a/jdk/src/java.base/share/classes/java/time/format/FormatStyle.java b/src/java.base/share/classes/java/time/format/FormatStyle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/FormatStyle.java rename to src/java.base/share/classes/java/time/format/FormatStyle.java diff --git a/jdk/src/java.base/share/classes/java/time/format/Parsed.java b/src/java.base/share/classes/java/time/format/Parsed.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/Parsed.java rename to src/java.base/share/classes/java/time/format/Parsed.java diff --git a/jdk/src/java.base/share/classes/java/time/format/ResolverStyle.java b/src/java.base/share/classes/java/time/format/ResolverStyle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/ResolverStyle.java rename to src/java.base/share/classes/java/time/format/ResolverStyle.java diff --git a/jdk/src/java.base/share/classes/java/time/format/SignStyle.java b/src/java.base/share/classes/java/time/format/SignStyle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/SignStyle.java rename to src/java.base/share/classes/java/time/format/SignStyle.java diff --git a/jdk/src/java.base/share/classes/java/time/format/TextStyle.java b/src/java.base/share/classes/java/time/format/TextStyle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/TextStyle.java rename to src/java.base/share/classes/java/time/format/TextStyle.java diff --git a/jdk/src/java.base/share/classes/java/time/format/ZoneName.java b/src/java.base/share/classes/java/time/format/ZoneName.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/ZoneName.java rename to src/java.base/share/classes/java/time/format/ZoneName.java diff --git a/jdk/src/java.base/share/classes/java/time/format/package-info.java b/src/java.base/share/classes/java/time/format/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/format/package-info.java rename to src/java.base/share/classes/java/time/format/package-info.java diff --git a/jdk/src/java.base/share/classes/java/time/overview.html b/src/java.base/share/classes/java/time/overview.html similarity index 100% rename from jdk/src/java.base/share/classes/java/time/overview.html rename to src/java.base/share/classes/java/time/overview.html diff --git a/jdk/src/java.base/share/classes/java/time/package-info.java b/src/java.base/share/classes/java/time/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/package-info.java rename to src/java.base/share/classes/java/time/package-info.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/ChronoField.java b/src/java.base/share/classes/java/time/temporal/ChronoField.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/ChronoField.java rename to src/java.base/share/classes/java/time/temporal/ChronoField.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/ChronoUnit.java b/src/java.base/share/classes/java/time/temporal/ChronoUnit.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/ChronoUnit.java rename to src/java.base/share/classes/java/time/temporal/ChronoUnit.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/IsoFields.java b/src/java.base/share/classes/java/time/temporal/IsoFields.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/IsoFields.java rename to src/java.base/share/classes/java/time/temporal/IsoFields.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/JulianFields.java b/src/java.base/share/classes/java/time/temporal/JulianFields.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/JulianFields.java rename to src/java.base/share/classes/java/time/temporal/JulianFields.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/Temporal.java b/src/java.base/share/classes/java/time/temporal/Temporal.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/Temporal.java rename to src/java.base/share/classes/java/time/temporal/Temporal.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/TemporalAccessor.java b/src/java.base/share/classes/java/time/temporal/TemporalAccessor.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/TemporalAccessor.java rename to src/java.base/share/classes/java/time/temporal/TemporalAccessor.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/TemporalAdjuster.java b/src/java.base/share/classes/java/time/temporal/TemporalAdjuster.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/TemporalAdjuster.java rename to src/java.base/share/classes/java/time/temporal/TemporalAdjuster.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/TemporalAdjusters.java b/src/java.base/share/classes/java/time/temporal/TemporalAdjusters.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/TemporalAdjusters.java rename to src/java.base/share/classes/java/time/temporal/TemporalAdjusters.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/TemporalAmount.java b/src/java.base/share/classes/java/time/temporal/TemporalAmount.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/TemporalAmount.java rename to src/java.base/share/classes/java/time/temporal/TemporalAmount.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/TemporalField.java b/src/java.base/share/classes/java/time/temporal/TemporalField.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/TemporalField.java rename to src/java.base/share/classes/java/time/temporal/TemporalField.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/TemporalQueries.java b/src/java.base/share/classes/java/time/temporal/TemporalQueries.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/TemporalQueries.java rename to src/java.base/share/classes/java/time/temporal/TemporalQueries.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/TemporalQuery.java b/src/java.base/share/classes/java/time/temporal/TemporalQuery.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/TemporalQuery.java rename to src/java.base/share/classes/java/time/temporal/TemporalQuery.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/TemporalUnit.java b/src/java.base/share/classes/java/time/temporal/TemporalUnit.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/TemporalUnit.java rename to src/java.base/share/classes/java/time/temporal/TemporalUnit.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/UnsupportedTemporalTypeException.java b/src/java.base/share/classes/java/time/temporal/UnsupportedTemporalTypeException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/UnsupportedTemporalTypeException.java rename to src/java.base/share/classes/java/time/temporal/UnsupportedTemporalTypeException.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/ValueRange.java b/src/java.base/share/classes/java/time/temporal/ValueRange.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/ValueRange.java rename to src/java.base/share/classes/java/time/temporal/ValueRange.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/WeekFields.java b/src/java.base/share/classes/java/time/temporal/WeekFields.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/WeekFields.java rename to src/java.base/share/classes/java/time/temporal/WeekFields.java diff --git a/jdk/src/java.base/share/classes/java/time/temporal/package-info.java b/src/java.base/share/classes/java/time/temporal/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/temporal/package-info.java rename to src/java.base/share/classes/java/time/temporal/package-info.java diff --git a/jdk/src/java.base/share/classes/java/time/zone/Ser.java b/src/java.base/share/classes/java/time/zone/Ser.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/zone/Ser.java rename to src/java.base/share/classes/java/time/zone/Ser.java diff --git a/jdk/src/java.base/share/classes/java/time/zone/TzdbZoneRulesProvider.java b/src/java.base/share/classes/java/time/zone/TzdbZoneRulesProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/zone/TzdbZoneRulesProvider.java rename to src/java.base/share/classes/java/time/zone/TzdbZoneRulesProvider.java diff --git a/jdk/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java b/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java rename to src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java diff --git a/jdk/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java b/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java rename to src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java diff --git a/jdk/src/java.base/share/classes/java/time/zone/ZoneRules.java b/src/java.base/share/classes/java/time/zone/ZoneRules.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/zone/ZoneRules.java rename to src/java.base/share/classes/java/time/zone/ZoneRules.java diff --git a/jdk/src/java.base/share/classes/java/time/zone/ZoneRulesException.java b/src/java.base/share/classes/java/time/zone/ZoneRulesException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/zone/ZoneRulesException.java rename to src/java.base/share/classes/java/time/zone/ZoneRulesException.java diff --git a/jdk/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java b/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java rename to src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java diff --git a/jdk/src/java.base/share/classes/java/time/zone/package-info.java b/src/java.base/share/classes/java/time/zone/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/time/zone/package-info.java rename to src/java.base/share/classes/java/time/zone/package-info.java diff --git a/jdk/src/java.base/share/classes/java/util/AbstractCollection.java b/src/java.base/share/classes/java/util/AbstractCollection.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/AbstractCollection.java rename to src/java.base/share/classes/java/util/AbstractCollection.java diff --git a/jdk/src/java.base/share/classes/java/util/AbstractList.java b/src/java.base/share/classes/java/util/AbstractList.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/AbstractList.java rename to src/java.base/share/classes/java/util/AbstractList.java diff --git a/jdk/src/java.base/share/classes/java/util/AbstractMap.java b/src/java.base/share/classes/java/util/AbstractMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/AbstractMap.java rename to src/java.base/share/classes/java/util/AbstractMap.java diff --git a/jdk/src/java.base/share/classes/java/util/AbstractQueue.java b/src/java.base/share/classes/java/util/AbstractQueue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/AbstractQueue.java rename to src/java.base/share/classes/java/util/AbstractQueue.java diff --git a/jdk/src/java.base/share/classes/java/util/AbstractSequentialList.java b/src/java.base/share/classes/java/util/AbstractSequentialList.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/AbstractSequentialList.java rename to src/java.base/share/classes/java/util/AbstractSequentialList.java diff --git a/jdk/src/java.base/share/classes/java/util/AbstractSet.java b/src/java.base/share/classes/java/util/AbstractSet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/AbstractSet.java rename to src/java.base/share/classes/java/util/AbstractSet.java diff --git a/jdk/src/java.base/share/classes/java/util/ArrayDeque.java b/src/java.base/share/classes/java/util/ArrayDeque.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ArrayDeque.java rename to src/java.base/share/classes/java/util/ArrayDeque.java diff --git a/jdk/src/java.base/share/classes/java/util/ArrayList.java b/src/java.base/share/classes/java/util/ArrayList.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ArrayList.java rename to src/java.base/share/classes/java/util/ArrayList.java diff --git a/jdk/src/java.base/share/classes/java/util/ArrayPrefixHelpers.java b/src/java.base/share/classes/java/util/ArrayPrefixHelpers.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ArrayPrefixHelpers.java rename to src/java.base/share/classes/java/util/ArrayPrefixHelpers.java diff --git a/jdk/src/java.base/share/classes/java/util/Arrays.java b/src/java.base/share/classes/java/util/Arrays.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Arrays.java rename to src/java.base/share/classes/java/util/Arrays.java diff --git a/jdk/src/java.base/share/classes/java/util/ArraysParallelSortHelpers.java b/src/java.base/share/classes/java/util/ArraysParallelSortHelpers.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ArraysParallelSortHelpers.java rename to src/java.base/share/classes/java/util/ArraysParallelSortHelpers.java diff --git a/jdk/src/java.base/share/classes/java/util/ArraysSupport.java b/src/java.base/share/classes/java/util/ArraysSupport.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ArraysSupport.java rename to src/java.base/share/classes/java/util/ArraysSupport.java diff --git a/jdk/src/java.base/share/classes/java/util/Base64.java b/src/java.base/share/classes/java/util/Base64.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Base64.java rename to src/java.base/share/classes/java/util/Base64.java diff --git a/jdk/src/java.base/share/classes/java/util/BitSet.java b/src/java.base/share/classes/java/util/BitSet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/BitSet.java rename to src/java.base/share/classes/java/util/BitSet.java diff --git a/jdk/src/java.base/share/classes/java/util/Calendar.java b/src/java.base/share/classes/java/util/Calendar.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Calendar.java rename to src/java.base/share/classes/java/util/Calendar.java diff --git a/jdk/src/java.base/share/classes/java/util/Collection.java b/src/java.base/share/classes/java/util/Collection.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Collection.java rename to src/java.base/share/classes/java/util/Collection.java diff --git a/jdk/src/java.base/share/classes/java/util/Collections.java b/src/java.base/share/classes/java/util/Collections.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Collections.java rename to src/java.base/share/classes/java/util/Collections.java diff --git a/jdk/src/java.base/share/classes/java/util/ComparableTimSort.java b/src/java.base/share/classes/java/util/ComparableTimSort.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ComparableTimSort.java rename to src/java.base/share/classes/java/util/ComparableTimSort.java diff --git a/jdk/src/java.base/share/classes/java/util/Comparator.java b/src/java.base/share/classes/java/util/Comparator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Comparator.java rename to src/java.base/share/classes/java/util/Comparator.java diff --git a/jdk/src/java.base/share/classes/java/util/Comparators.java b/src/java.base/share/classes/java/util/Comparators.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Comparators.java rename to src/java.base/share/classes/java/util/Comparators.java diff --git a/jdk/src/java.base/share/classes/java/util/ConcurrentModificationException.java b/src/java.base/share/classes/java/util/ConcurrentModificationException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ConcurrentModificationException.java rename to src/java.base/share/classes/java/util/ConcurrentModificationException.java diff --git a/jdk/src/java.base/share/classes/java/util/Currency.java b/src/java.base/share/classes/java/util/Currency.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Currency.java rename to src/java.base/share/classes/java/util/Currency.java diff --git a/jdk/src/java.base/share/classes/java/util/Date.java b/src/java.base/share/classes/java/util/Date.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Date.java rename to src/java.base/share/classes/java/util/Date.java diff --git a/jdk/src/java.base/share/classes/java/util/Deque.java b/src/java.base/share/classes/java/util/Deque.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Deque.java rename to src/java.base/share/classes/java/util/Deque.java diff --git a/jdk/src/java.base/share/classes/java/util/Dictionary.java b/src/java.base/share/classes/java/util/Dictionary.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Dictionary.java rename to src/java.base/share/classes/java/util/Dictionary.java diff --git a/jdk/src/java.base/share/classes/java/util/DoubleSummaryStatistics.java b/src/java.base/share/classes/java/util/DoubleSummaryStatistics.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/DoubleSummaryStatistics.java rename to src/java.base/share/classes/java/util/DoubleSummaryStatistics.java diff --git a/jdk/src/java.base/share/classes/java/util/DualPivotQuicksort.java b/src/java.base/share/classes/java/util/DualPivotQuicksort.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/DualPivotQuicksort.java rename to src/java.base/share/classes/java/util/DualPivotQuicksort.java diff --git a/jdk/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java b/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java rename to src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java diff --git a/jdk/src/java.base/share/classes/java/util/EmptyStackException.java b/src/java.base/share/classes/java/util/EmptyStackException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/EmptyStackException.java rename to src/java.base/share/classes/java/util/EmptyStackException.java diff --git a/jdk/src/java.base/share/classes/java/util/EnumMap.java b/src/java.base/share/classes/java/util/EnumMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/EnumMap.java rename to src/java.base/share/classes/java/util/EnumMap.java diff --git a/jdk/src/java.base/share/classes/java/util/EnumSet.java b/src/java.base/share/classes/java/util/EnumSet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/EnumSet.java rename to src/java.base/share/classes/java/util/EnumSet.java diff --git a/jdk/src/java.base/share/classes/java/util/Enumeration.java b/src/java.base/share/classes/java/util/Enumeration.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Enumeration.java rename to src/java.base/share/classes/java/util/Enumeration.java diff --git a/jdk/src/java.base/share/classes/java/util/EventListener.java b/src/java.base/share/classes/java/util/EventListener.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/EventListener.java rename to src/java.base/share/classes/java/util/EventListener.java diff --git a/jdk/src/java.base/share/classes/java/util/EventListenerProxy.java b/src/java.base/share/classes/java/util/EventListenerProxy.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/EventListenerProxy.java rename to src/java.base/share/classes/java/util/EventListenerProxy.java diff --git a/jdk/src/java.base/share/classes/java/util/EventObject.java b/src/java.base/share/classes/java/util/EventObject.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/EventObject.java rename to src/java.base/share/classes/java/util/EventObject.java diff --git a/jdk/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java b/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java rename to src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java diff --git a/jdk/src/java.base/share/classes/java/util/Formattable.java b/src/java.base/share/classes/java/util/Formattable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Formattable.java rename to src/java.base/share/classes/java/util/Formattable.java diff --git a/jdk/src/java.base/share/classes/java/util/FormattableFlags.java b/src/java.base/share/classes/java/util/FormattableFlags.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/FormattableFlags.java rename to src/java.base/share/classes/java/util/FormattableFlags.java diff --git a/jdk/src/java.base/share/classes/java/util/Formatter.java b/src/java.base/share/classes/java/util/Formatter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Formatter.java rename to src/java.base/share/classes/java/util/Formatter.java diff --git a/jdk/src/java.base/share/classes/java/util/FormatterClosedException.java b/src/java.base/share/classes/java/util/FormatterClosedException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/FormatterClosedException.java rename to src/java.base/share/classes/java/util/FormatterClosedException.java diff --git a/jdk/src/java.base/share/classes/java/util/GregorianCalendar.java b/src/java.base/share/classes/java/util/GregorianCalendar.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/GregorianCalendar.java rename to src/java.base/share/classes/java/util/GregorianCalendar.java diff --git a/jdk/src/java.base/share/classes/java/util/HashMap.java b/src/java.base/share/classes/java/util/HashMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/HashMap.java rename to src/java.base/share/classes/java/util/HashMap.java diff --git a/jdk/src/java.base/share/classes/java/util/HashSet.java b/src/java.base/share/classes/java/util/HashSet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/HashSet.java rename to src/java.base/share/classes/java/util/HashSet.java diff --git a/jdk/src/java.base/share/classes/java/util/Hashtable.java b/src/java.base/share/classes/java/util/Hashtable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Hashtable.java rename to src/java.base/share/classes/java/util/Hashtable.java diff --git a/jdk/src/java.base/share/classes/java/util/IdentityHashMap.java b/src/java.base/share/classes/java/util/IdentityHashMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/IdentityHashMap.java rename to src/java.base/share/classes/java/util/IdentityHashMap.java diff --git a/jdk/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java b/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java rename to src/java.base/share/classes/java/util/IllegalFormatCodePointException.java diff --git a/jdk/src/java.base/share/classes/java/util/IllegalFormatConversionException.java b/src/java.base/share/classes/java/util/IllegalFormatConversionException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/IllegalFormatConversionException.java rename to src/java.base/share/classes/java/util/IllegalFormatConversionException.java diff --git a/jdk/src/java.base/share/classes/java/util/IllegalFormatException.java b/src/java.base/share/classes/java/util/IllegalFormatException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/IllegalFormatException.java rename to src/java.base/share/classes/java/util/IllegalFormatException.java diff --git a/jdk/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java b/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java rename to src/java.base/share/classes/java/util/IllegalFormatFlagsException.java diff --git a/jdk/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java b/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java rename to src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java diff --git a/jdk/src/java.base/share/classes/java/util/IllegalFormatWidthException.java b/src/java.base/share/classes/java/util/IllegalFormatWidthException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/IllegalFormatWidthException.java rename to src/java.base/share/classes/java/util/IllegalFormatWidthException.java diff --git a/jdk/src/java.base/share/classes/java/util/IllformedLocaleException.java b/src/java.base/share/classes/java/util/IllformedLocaleException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/IllformedLocaleException.java rename to src/java.base/share/classes/java/util/IllformedLocaleException.java diff --git a/jdk/src/java.base/share/classes/java/util/ImmutableCollections.java b/src/java.base/share/classes/java/util/ImmutableCollections.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ImmutableCollections.java rename to src/java.base/share/classes/java/util/ImmutableCollections.java diff --git a/jdk/src/java.base/share/classes/java/util/InputMismatchException.java b/src/java.base/share/classes/java/util/InputMismatchException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/InputMismatchException.java rename to src/java.base/share/classes/java/util/InputMismatchException.java diff --git a/jdk/src/java.base/share/classes/java/util/IntSummaryStatistics.java b/src/java.base/share/classes/java/util/IntSummaryStatistics.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/IntSummaryStatistics.java rename to src/java.base/share/classes/java/util/IntSummaryStatistics.java diff --git a/jdk/src/java.base/share/classes/java/util/InvalidPropertiesFormatException.java b/src/java.base/share/classes/java/util/InvalidPropertiesFormatException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/InvalidPropertiesFormatException.java rename to src/java.base/share/classes/java/util/InvalidPropertiesFormatException.java diff --git a/jdk/src/java.base/share/classes/java/util/Iterator.java b/src/java.base/share/classes/java/util/Iterator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Iterator.java rename to src/java.base/share/classes/java/util/Iterator.java diff --git a/jdk/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java rename to src/java.base/share/classes/java/util/JapaneseImperialCalendar.java diff --git a/jdk/src/java.base/share/classes/java/util/JumboEnumSet.java b/src/java.base/share/classes/java/util/JumboEnumSet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/JumboEnumSet.java rename to src/java.base/share/classes/java/util/JumboEnumSet.java diff --git a/jdk/src/java.base/share/classes/java/util/KeyValueHolder.java b/src/java.base/share/classes/java/util/KeyValueHolder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/KeyValueHolder.java rename to src/java.base/share/classes/java/util/KeyValueHolder.java diff --git a/jdk/src/java.base/share/classes/java/util/LinkedHashMap.java b/src/java.base/share/classes/java/util/LinkedHashMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/LinkedHashMap.java rename to src/java.base/share/classes/java/util/LinkedHashMap.java diff --git a/jdk/src/java.base/share/classes/java/util/LinkedHashSet.java b/src/java.base/share/classes/java/util/LinkedHashSet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/LinkedHashSet.java rename to src/java.base/share/classes/java/util/LinkedHashSet.java diff --git a/jdk/src/java.base/share/classes/java/util/LinkedList.java b/src/java.base/share/classes/java/util/LinkedList.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/LinkedList.java rename to src/java.base/share/classes/java/util/LinkedList.java diff --git a/jdk/src/java.base/share/classes/java/util/List.java b/src/java.base/share/classes/java/util/List.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/List.java rename to src/java.base/share/classes/java/util/List.java diff --git a/jdk/src/java.base/share/classes/java/util/ListIterator.java b/src/java.base/share/classes/java/util/ListIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ListIterator.java rename to src/java.base/share/classes/java/util/ListIterator.java diff --git a/jdk/src/java.base/share/classes/java/util/ListResourceBundle.java b/src/java.base/share/classes/java/util/ListResourceBundle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ListResourceBundle.java rename to src/java.base/share/classes/java/util/ListResourceBundle.java diff --git a/jdk/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Locale.java rename to src/java.base/share/classes/java/util/Locale.java diff --git a/jdk/src/java.base/share/classes/java/util/LocaleISOData.java b/src/java.base/share/classes/java/util/LocaleISOData.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/LocaleISOData.java rename to src/java.base/share/classes/java/util/LocaleISOData.java diff --git a/jdk/src/java.base/share/classes/java/util/LongSummaryStatistics.java b/src/java.base/share/classes/java/util/LongSummaryStatistics.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/LongSummaryStatistics.java rename to src/java.base/share/classes/java/util/LongSummaryStatistics.java diff --git a/jdk/src/java.base/share/classes/java/util/Map.java b/src/java.base/share/classes/java/util/Map.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Map.java rename to src/java.base/share/classes/java/util/Map.java diff --git a/jdk/src/java.base/share/classes/java/util/MissingFormatArgumentException.java b/src/java.base/share/classes/java/util/MissingFormatArgumentException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/MissingFormatArgumentException.java rename to src/java.base/share/classes/java/util/MissingFormatArgumentException.java diff --git a/jdk/src/java.base/share/classes/java/util/MissingFormatWidthException.java b/src/java.base/share/classes/java/util/MissingFormatWidthException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/MissingFormatWidthException.java rename to src/java.base/share/classes/java/util/MissingFormatWidthException.java diff --git a/jdk/src/java.base/share/classes/java/util/MissingResourceException.java b/src/java.base/share/classes/java/util/MissingResourceException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/MissingResourceException.java rename to src/java.base/share/classes/java/util/MissingResourceException.java diff --git a/jdk/src/java.base/share/classes/java/util/NavigableMap.java b/src/java.base/share/classes/java/util/NavigableMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/NavigableMap.java rename to src/java.base/share/classes/java/util/NavigableMap.java diff --git a/jdk/src/java.base/share/classes/java/util/NavigableSet.java b/src/java.base/share/classes/java/util/NavigableSet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/NavigableSet.java rename to src/java.base/share/classes/java/util/NavigableSet.java diff --git a/jdk/src/java.base/share/classes/java/util/NoSuchElementException.java b/src/java.base/share/classes/java/util/NoSuchElementException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/NoSuchElementException.java rename to src/java.base/share/classes/java/util/NoSuchElementException.java diff --git a/jdk/src/java.base/share/classes/java/util/Objects.java b/src/java.base/share/classes/java/util/Objects.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Objects.java rename to src/java.base/share/classes/java/util/Objects.java diff --git a/jdk/src/java.base/share/classes/java/util/Observable.java b/src/java.base/share/classes/java/util/Observable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Observable.java rename to src/java.base/share/classes/java/util/Observable.java diff --git a/jdk/src/java.base/share/classes/java/util/Observer.java b/src/java.base/share/classes/java/util/Observer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Observer.java rename to src/java.base/share/classes/java/util/Observer.java diff --git a/jdk/src/java.base/share/classes/java/util/Optional.java b/src/java.base/share/classes/java/util/Optional.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Optional.java rename to src/java.base/share/classes/java/util/Optional.java diff --git a/jdk/src/java.base/share/classes/java/util/OptionalDouble.java b/src/java.base/share/classes/java/util/OptionalDouble.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/OptionalDouble.java rename to src/java.base/share/classes/java/util/OptionalDouble.java diff --git a/jdk/src/java.base/share/classes/java/util/OptionalInt.java b/src/java.base/share/classes/java/util/OptionalInt.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/OptionalInt.java rename to src/java.base/share/classes/java/util/OptionalInt.java diff --git a/jdk/src/java.base/share/classes/java/util/OptionalLong.java b/src/java.base/share/classes/java/util/OptionalLong.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/OptionalLong.java rename to src/java.base/share/classes/java/util/OptionalLong.java diff --git a/jdk/src/java.base/share/classes/java/util/PrimitiveIterator.java b/src/java.base/share/classes/java/util/PrimitiveIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/PrimitiveIterator.java rename to src/java.base/share/classes/java/util/PrimitiveIterator.java diff --git a/jdk/src/java.base/share/classes/java/util/PriorityQueue.java b/src/java.base/share/classes/java/util/PriorityQueue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/PriorityQueue.java rename to src/java.base/share/classes/java/util/PriorityQueue.java diff --git a/jdk/src/java.base/share/classes/java/util/Properties.java b/src/java.base/share/classes/java/util/Properties.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Properties.java rename to src/java.base/share/classes/java/util/Properties.java diff --git a/jdk/src/java.base/share/classes/java/util/PropertyPermission.java b/src/java.base/share/classes/java/util/PropertyPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/PropertyPermission.java rename to src/java.base/share/classes/java/util/PropertyPermission.java diff --git a/jdk/src/java.base/share/classes/java/util/PropertyResourceBundle.java b/src/java.base/share/classes/java/util/PropertyResourceBundle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/PropertyResourceBundle.java rename to src/java.base/share/classes/java/util/PropertyResourceBundle.java diff --git a/jdk/src/java.base/share/classes/java/util/Queue.java b/src/java.base/share/classes/java/util/Queue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Queue.java rename to src/java.base/share/classes/java/util/Queue.java diff --git a/jdk/src/java.base/share/classes/java/util/Random.java b/src/java.base/share/classes/java/util/Random.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Random.java rename to src/java.base/share/classes/java/util/Random.java diff --git a/jdk/src/java.base/share/classes/java/util/RandomAccess.java b/src/java.base/share/classes/java/util/RandomAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/RandomAccess.java rename to src/java.base/share/classes/java/util/RandomAccess.java diff --git a/jdk/src/java.base/share/classes/java/util/RegularEnumSet.java b/src/java.base/share/classes/java/util/RegularEnumSet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/RegularEnumSet.java rename to src/java.base/share/classes/java/util/RegularEnumSet.java diff --git a/jdk/src/java.base/share/classes/java/util/ResourceBundle.java b/src/java.base/share/classes/java/util/ResourceBundle.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ResourceBundle.java rename to src/java.base/share/classes/java/util/ResourceBundle.java diff --git a/jdk/src/java.base/share/classes/java/util/Scanner.java b/src/java.base/share/classes/java/util/Scanner.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Scanner.java rename to src/java.base/share/classes/java/util/Scanner.java diff --git a/jdk/src/java.base/share/classes/java/util/ServiceConfigurationError.java b/src/java.base/share/classes/java/util/ServiceConfigurationError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ServiceConfigurationError.java rename to src/java.base/share/classes/java/util/ServiceConfigurationError.java diff --git a/jdk/src/java.base/share/classes/java/util/ServiceLoader.java b/src/java.base/share/classes/java/util/ServiceLoader.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/ServiceLoader.java rename to src/java.base/share/classes/java/util/ServiceLoader.java diff --git a/jdk/src/java.base/share/classes/java/util/Set.java b/src/java.base/share/classes/java/util/Set.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Set.java rename to src/java.base/share/classes/java/util/Set.java diff --git a/jdk/src/java.base/share/classes/java/util/SimpleTimeZone.java b/src/java.base/share/classes/java/util/SimpleTimeZone.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/SimpleTimeZone.java rename to src/java.base/share/classes/java/util/SimpleTimeZone.java diff --git a/jdk/src/java.base/share/classes/java/util/SortedMap.java b/src/java.base/share/classes/java/util/SortedMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/SortedMap.java rename to src/java.base/share/classes/java/util/SortedMap.java diff --git a/jdk/src/java.base/share/classes/java/util/SortedSet.java b/src/java.base/share/classes/java/util/SortedSet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/SortedSet.java rename to src/java.base/share/classes/java/util/SortedSet.java diff --git a/jdk/src/java.base/share/classes/java/util/Spliterator.java b/src/java.base/share/classes/java/util/Spliterator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Spliterator.java rename to src/java.base/share/classes/java/util/Spliterator.java diff --git a/jdk/src/java.base/share/classes/java/util/Spliterators.java b/src/java.base/share/classes/java/util/Spliterators.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Spliterators.java rename to src/java.base/share/classes/java/util/Spliterators.java diff --git a/jdk/src/java.base/share/classes/java/util/SplittableRandom.java b/src/java.base/share/classes/java/util/SplittableRandom.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/SplittableRandom.java rename to src/java.base/share/classes/java/util/SplittableRandom.java diff --git a/jdk/src/java.base/share/classes/java/util/Stack.java b/src/java.base/share/classes/java/util/Stack.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Stack.java rename to src/java.base/share/classes/java/util/Stack.java diff --git a/jdk/src/java.base/share/classes/java/util/StringJoiner.java b/src/java.base/share/classes/java/util/StringJoiner.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/StringJoiner.java rename to src/java.base/share/classes/java/util/StringJoiner.java diff --git a/jdk/src/java.base/share/classes/java/util/StringTokenizer.java b/src/java.base/share/classes/java/util/StringTokenizer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/StringTokenizer.java rename to src/java.base/share/classes/java/util/StringTokenizer.java diff --git a/jdk/src/java.base/share/classes/java/util/TimSort.java b/src/java.base/share/classes/java/util/TimSort.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/TimSort.java rename to src/java.base/share/classes/java/util/TimSort.java diff --git a/jdk/src/java.base/share/classes/java/util/TimeZone.java b/src/java.base/share/classes/java/util/TimeZone.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/TimeZone.java rename to src/java.base/share/classes/java/util/TimeZone.java diff --git a/jdk/src/java.base/share/classes/java/util/Timer.java b/src/java.base/share/classes/java/util/Timer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Timer.java rename to src/java.base/share/classes/java/util/Timer.java diff --git a/jdk/src/java.base/share/classes/java/util/TimerTask.java b/src/java.base/share/classes/java/util/TimerTask.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/TimerTask.java rename to src/java.base/share/classes/java/util/TimerTask.java diff --git a/jdk/src/java.base/share/classes/java/util/TooManyListenersException.java b/src/java.base/share/classes/java/util/TooManyListenersException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/TooManyListenersException.java rename to src/java.base/share/classes/java/util/TooManyListenersException.java diff --git a/jdk/src/java.base/share/classes/java/util/TreeMap.java b/src/java.base/share/classes/java/util/TreeMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/TreeMap.java rename to src/java.base/share/classes/java/util/TreeMap.java diff --git a/jdk/src/java.base/share/classes/java/util/TreeSet.java b/src/java.base/share/classes/java/util/TreeSet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/TreeSet.java rename to src/java.base/share/classes/java/util/TreeSet.java diff --git a/jdk/src/java.base/share/classes/java/util/Tripwire.java b/src/java.base/share/classes/java/util/Tripwire.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Tripwire.java rename to src/java.base/share/classes/java/util/Tripwire.java diff --git a/jdk/src/java.base/share/classes/java/util/UUID.java b/src/java.base/share/classes/java/util/UUID.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/UUID.java rename to src/java.base/share/classes/java/util/UUID.java diff --git a/jdk/src/java.base/share/classes/java/util/UnknownFormatConversionException.java b/src/java.base/share/classes/java/util/UnknownFormatConversionException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/UnknownFormatConversionException.java rename to src/java.base/share/classes/java/util/UnknownFormatConversionException.java diff --git a/jdk/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java b/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java rename to src/java.base/share/classes/java/util/UnknownFormatFlagsException.java diff --git a/jdk/src/java.base/share/classes/java/util/Vector.java b/src/java.base/share/classes/java/util/Vector.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/Vector.java rename to src/java.base/share/classes/java/util/Vector.java diff --git a/jdk/src/java.base/share/classes/java/util/WeakHashMap.java b/src/java.base/share/classes/java/util/WeakHashMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/WeakHashMap.java rename to src/java.base/share/classes/java/util/WeakHashMap.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java b/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java rename to src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java b/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java rename to src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/BlockingDeque.java b/src/java.base/share/classes/java/util/concurrent/BlockingDeque.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/BlockingDeque.java rename to src/java.base/share/classes/java/util/concurrent/BlockingDeque.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/BlockingQueue.java b/src/java.base/share/classes/java/util/concurrent/BlockingQueue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/BlockingQueue.java rename to src/java.base/share/classes/java/util/concurrent/BlockingQueue.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/BrokenBarrierException.java b/src/java.base/share/classes/java/util/concurrent/BrokenBarrierException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/BrokenBarrierException.java rename to src/java.base/share/classes/java/util/concurrent/BrokenBarrierException.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/Callable.java b/src/java.base/share/classes/java/util/concurrent/Callable.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/Callable.java rename to src/java.base/share/classes/java/util/concurrent/Callable.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/CancellationException.java b/src/java.base/share/classes/java/util/concurrent/CancellationException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/CancellationException.java rename to src/java.base/share/classes/java/util/concurrent/CancellationException.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java rename to src/java.base/share/classes/java/util/concurrent/CompletableFuture.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/CompletionException.java b/src/java.base/share/classes/java/util/concurrent/CompletionException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/CompletionException.java rename to src/java.base/share/classes/java/util/concurrent/CompletionException.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/CompletionService.java b/src/java.base/share/classes/java/util/concurrent/CompletionService.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/CompletionService.java rename to src/java.base/share/classes/java/util/concurrent/CompletionService.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/CompletionStage.java b/src/java.base/share/classes/java/util/concurrent/CompletionStage.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/CompletionStage.java rename to src/java.base/share/classes/java/util/concurrent/CompletionStage.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java rename to src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java rename to src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java rename to src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentMap.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentMap.java rename to src/java.base/share/classes/java/util/concurrent/ConcurrentMap.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentNavigableMap.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentNavigableMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentNavigableMap.java rename to src/java.base/share/classes/java/util/concurrent/ConcurrentNavigableMap.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java rename to src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java rename to src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java rename to src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java rename to src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/CountDownLatch.java b/src/java.base/share/classes/java/util/concurrent/CountDownLatch.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/CountDownLatch.java rename to src/java.base/share/classes/java/util/concurrent/CountDownLatch.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java b/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java rename to src/java.base/share/classes/java/util/concurrent/CountedCompleter.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java b/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java rename to src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/DelayQueue.java b/src/java.base/share/classes/java/util/concurrent/DelayQueue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/DelayQueue.java rename to src/java.base/share/classes/java/util/concurrent/DelayQueue.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/Delayed.java b/src/java.base/share/classes/java/util/concurrent/Delayed.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/Delayed.java rename to src/java.base/share/classes/java/util/concurrent/Delayed.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/Exchanger.java b/src/java.base/share/classes/java/util/concurrent/Exchanger.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/Exchanger.java rename to src/java.base/share/classes/java/util/concurrent/Exchanger.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ExecutionException.java b/src/java.base/share/classes/java/util/concurrent/ExecutionException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ExecutionException.java rename to src/java.base/share/classes/java/util/concurrent/ExecutionException.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/Executor.java b/src/java.base/share/classes/java/util/concurrent/Executor.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/Executor.java rename to src/java.base/share/classes/java/util/concurrent/Executor.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ExecutorCompletionService.java b/src/java.base/share/classes/java/util/concurrent/ExecutorCompletionService.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ExecutorCompletionService.java rename to src/java.base/share/classes/java/util/concurrent/ExecutorCompletionService.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ExecutorService.java b/src/java.base/share/classes/java/util/concurrent/ExecutorService.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ExecutorService.java rename to src/java.base/share/classes/java/util/concurrent/ExecutorService.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/Executors.java b/src/java.base/share/classes/java/util/concurrent/Executors.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/Executors.java rename to src/java.base/share/classes/java/util/concurrent/Executors.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/Flow.java b/src/java.base/share/classes/java/util/concurrent/Flow.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/Flow.java rename to src/java.base/share/classes/java/util/concurrent/Flow.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java rename to src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java rename to src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java rename to src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/Future.java b/src/java.base/share/classes/java/util/concurrent/Future.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/Future.java rename to src/java.base/share/classes/java/util/concurrent/Future.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/FutureTask.java b/src/java.base/share/classes/java/util/concurrent/FutureTask.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/FutureTask.java rename to src/java.base/share/classes/java/util/concurrent/FutureTask.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/Helpers.java b/src/java.base/share/classes/java/util/concurrent/Helpers.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/Helpers.java rename to src/java.base/share/classes/java/util/concurrent/Helpers.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java b/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java rename to src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java b/src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java rename to src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java b/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java rename to src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/Phaser.java b/src/java.base/share/classes/java/util/concurrent/Phaser.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/Phaser.java rename to src/java.base/share/classes/java/util/concurrent/Phaser.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java b/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java rename to src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/RecursiveAction.java b/src/java.base/share/classes/java/util/concurrent/RecursiveAction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/RecursiveAction.java rename to src/java.base/share/classes/java/util/concurrent/RecursiveAction.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/RecursiveTask.java b/src/java.base/share/classes/java/util/concurrent/RecursiveTask.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/RecursiveTask.java rename to src/java.base/share/classes/java/util/concurrent/RecursiveTask.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/RejectedExecutionException.java b/src/java.base/share/classes/java/util/concurrent/RejectedExecutionException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/RejectedExecutionException.java rename to src/java.base/share/classes/java/util/concurrent/RejectedExecutionException.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/RejectedExecutionHandler.java b/src/java.base/share/classes/java/util/concurrent/RejectedExecutionHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/RejectedExecutionHandler.java rename to src/java.base/share/classes/java/util/concurrent/RejectedExecutionHandler.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/RunnableFuture.java b/src/java.base/share/classes/java/util/concurrent/RunnableFuture.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/RunnableFuture.java rename to src/java.base/share/classes/java/util/concurrent/RunnableFuture.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/RunnableScheduledFuture.java b/src/java.base/share/classes/java/util/concurrent/RunnableScheduledFuture.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/RunnableScheduledFuture.java rename to src/java.base/share/classes/java/util/concurrent/RunnableScheduledFuture.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ScheduledExecutorService.java b/src/java.base/share/classes/java/util/concurrent/ScheduledExecutorService.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ScheduledExecutorService.java rename to src/java.base/share/classes/java/util/concurrent/ScheduledExecutorService.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ScheduledFuture.java b/src/java.base/share/classes/java/util/concurrent/ScheduledFuture.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ScheduledFuture.java rename to src/java.base/share/classes/java/util/concurrent/ScheduledFuture.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java b/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java rename to src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/Semaphore.java b/src/java.base/share/classes/java/util/concurrent/Semaphore.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/Semaphore.java rename to src/java.base/share/classes/java/util/concurrent/Semaphore.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java b/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java rename to src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java b/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java rename to src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ThreadFactory.java b/src/java.base/share/classes/java/util/concurrent/ThreadFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ThreadFactory.java rename to src/java.base/share/classes/java/util/concurrent/ThreadFactory.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java rename to src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java b/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java rename to src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/TimeUnit.java b/src/java.base/share/classes/java/util/concurrent/TimeUnit.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/TimeUnit.java rename to src/java.base/share/classes/java/util/concurrent/TimeUnit.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/TimeoutException.java b/src/java.base/share/classes/java/util/concurrent/TimeoutException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/TimeoutException.java rename to src/java.base/share/classes/java/util/concurrent/TimeoutException.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/TransferQueue.java b/src/java.base/share/classes/java/util/concurrent/TransferQueue.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/TransferQueue.java rename to src/java.base/share/classes/java/util/concurrent/TransferQueue.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java rename to src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java rename to src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java rename to src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java rename to src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java rename to src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java rename to src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java rename to src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java rename to src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java rename to src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java rename to src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java rename to src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java rename to src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java b/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java rename to src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAdder.java b/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAdder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAdder.java rename to src/java.base/share/classes/java/util/concurrent/atomic/DoubleAdder.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java b/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java rename to src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/LongAdder.java b/src/java.base/share/classes/java/util/concurrent/atomic/LongAdder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/LongAdder.java rename to src/java.base/share/classes/java/util/concurrent/atomic/LongAdder.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java b/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java rename to src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/package-info.java b/src/java.base/share/classes/java/util/concurrent/atomic/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/atomic/package-info.java rename to src/java.base/share/classes/java/util/concurrent/atomic/package-info.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java rename to src/java.base/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java rename to src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java rename to src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/locks/Condition.java b/src/java.base/share/classes/java/util/concurrent/locks/Condition.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/locks/Condition.java rename to src/java.base/share/classes/java/util/concurrent/locks/Condition.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/locks/Lock.java b/src/java.base/share/classes/java/util/concurrent/locks/Lock.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/locks/Lock.java rename to src/java.base/share/classes/java/util/concurrent/locks/Lock.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java b/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java rename to src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/locks/ReadWriteLock.java b/src/java.base/share/classes/java/util/concurrent/locks/ReadWriteLock.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/locks/ReadWriteLock.java rename to src/java.base/share/classes/java/util/concurrent/locks/ReadWriteLock.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java rename to src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java rename to src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java b/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java rename to src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/locks/package-info.java b/src/java.base/share/classes/java/util/concurrent/locks/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/locks/package-info.java rename to src/java.base/share/classes/java/util/concurrent/locks/package-info.java diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/package-info.java b/src/java.base/share/classes/java/util/concurrent/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/concurrent/package-info.java rename to src/java.base/share/classes/java/util/concurrent/package-info.java diff --git a/jdk/src/java.base/share/classes/java/util/doc-files/coll-designfaq.html b/src/java.base/share/classes/java/util/doc-files/coll-designfaq.html similarity index 100% rename from jdk/src/java.base/share/classes/java/util/doc-files/coll-designfaq.html rename to src/java.base/share/classes/java/util/doc-files/coll-designfaq.html diff --git a/jdk/src/java.base/share/classes/java/util/doc-files/coll-index.html b/src/java.base/share/classes/java/util/doc-files/coll-index.html similarity index 100% rename from jdk/src/java.base/share/classes/java/util/doc-files/coll-index.html rename to src/java.base/share/classes/java/util/doc-files/coll-index.html diff --git a/jdk/src/java.base/share/classes/java/util/doc-files/coll-overview.html b/src/java.base/share/classes/java/util/doc-files/coll-overview.html similarity index 100% rename from jdk/src/java.base/share/classes/java/util/doc-files/coll-overview.html rename to src/java.base/share/classes/java/util/doc-files/coll-overview.html diff --git a/jdk/src/java.base/share/classes/java/util/doc-files/coll-reference.html b/src/java.base/share/classes/java/util/doc-files/coll-reference.html similarity index 100% rename from jdk/src/java.base/share/classes/java/util/doc-files/coll-reference.html rename to src/java.base/share/classes/java/util/doc-files/coll-reference.html diff --git a/jdk/src/java.base/share/classes/java/util/function/BiConsumer.java b/src/java.base/share/classes/java/util/function/BiConsumer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/BiConsumer.java rename to src/java.base/share/classes/java/util/function/BiConsumer.java diff --git a/jdk/src/java.base/share/classes/java/util/function/BiFunction.java b/src/java.base/share/classes/java/util/function/BiFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/BiFunction.java rename to src/java.base/share/classes/java/util/function/BiFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/BiPredicate.java b/src/java.base/share/classes/java/util/function/BiPredicate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/BiPredicate.java rename to src/java.base/share/classes/java/util/function/BiPredicate.java diff --git a/jdk/src/java.base/share/classes/java/util/function/BinaryOperator.java b/src/java.base/share/classes/java/util/function/BinaryOperator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/BinaryOperator.java rename to src/java.base/share/classes/java/util/function/BinaryOperator.java diff --git a/jdk/src/java.base/share/classes/java/util/function/BooleanSupplier.java b/src/java.base/share/classes/java/util/function/BooleanSupplier.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/BooleanSupplier.java rename to src/java.base/share/classes/java/util/function/BooleanSupplier.java diff --git a/jdk/src/java.base/share/classes/java/util/function/Consumer.java b/src/java.base/share/classes/java/util/function/Consumer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/Consumer.java rename to src/java.base/share/classes/java/util/function/Consumer.java diff --git a/jdk/src/java.base/share/classes/java/util/function/DoubleBinaryOperator.java b/src/java.base/share/classes/java/util/function/DoubleBinaryOperator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/DoubleBinaryOperator.java rename to src/java.base/share/classes/java/util/function/DoubleBinaryOperator.java diff --git a/jdk/src/java.base/share/classes/java/util/function/DoubleConsumer.java b/src/java.base/share/classes/java/util/function/DoubleConsumer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/DoubleConsumer.java rename to src/java.base/share/classes/java/util/function/DoubleConsumer.java diff --git a/jdk/src/java.base/share/classes/java/util/function/DoubleFunction.java b/src/java.base/share/classes/java/util/function/DoubleFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/DoubleFunction.java rename to src/java.base/share/classes/java/util/function/DoubleFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/DoublePredicate.java b/src/java.base/share/classes/java/util/function/DoublePredicate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/DoublePredicate.java rename to src/java.base/share/classes/java/util/function/DoublePredicate.java diff --git a/jdk/src/java.base/share/classes/java/util/function/DoubleSupplier.java b/src/java.base/share/classes/java/util/function/DoubleSupplier.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/DoubleSupplier.java rename to src/java.base/share/classes/java/util/function/DoubleSupplier.java diff --git a/jdk/src/java.base/share/classes/java/util/function/DoubleToIntFunction.java b/src/java.base/share/classes/java/util/function/DoubleToIntFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/DoubleToIntFunction.java rename to src/java.base/share/classes/java/util/function/DoubleToIntFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/DoubleToLongFunction.java b/src/java.base/share/classes/java/util/function/DoubleToLongFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/DoubleToLongFunction.java rename to src/java.base/share/classes/java/util/function/DoubleToLongFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/DoubleUnaryOperator.java b/src/java.base/share/classes/java/util/function/DoubleUnaryOperator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/DoubleUnaryOperator.java rename to src/java.base/share/classes/java/util/function/DoubleUnaryOperator.java diff --git a/jdk/src/java.base/share/classes/java/util/function/Function.java b/src/java.base/share/classes/java/util/function/Function.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/Function.java rename to src/java.base/share/classes/java/util/function/Function.java diff --git a/jdk/src/java.base/share/classes/java/util/function/IntBinaryOperator.java b/src/java.base/share/classes/java/util/function/IntBinaryOperator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/IntBinaryOperator.java rename to src/java.base/share/classes/java/util/function/IntBinaryOperator.java diff --git a/jdk/src/java.base/share/classes/java/util/function/IntConsumer.java b/src/java.base/share/classes/java/util/function/IntConsumer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/IntConsumer.java rename to src/java.base/share/classes/java/util/function/IntConsumer.java diff --git a/jdk/src/java.base/share/classes/java/util/function/IntFunction.java b/src/java.base/share/classes/java/util/function/IntFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/IntFunction.java rename to src/java.base/share/classes/java/util/function/IntFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/IntPredicate.java b/src/java.base/share/classes/java/util/function/IntPredicate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/IntPredicate.java rename to src/java.base/share/classes/java/util/function/IntPredicate.java diff --git a/jdk/src/java.base/share/classes/java/util/function/IntSupplier.java b/src/java.base/share/classes/java/util/function/IntSupplier.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/IntSupplier.java rename to src/java.base/share/classes/java/util/function/IntSupplier.java diff --git a/jdk/src/java.base/share/classes/java/util/function/IntToDoubleFunction.java b/src/java.base/share/classes/java/util/function/IntToDoubleFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/IntToDoubleFunction.java rename to src/java.base/share/classes/java/util/function/IntToDoubleFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/IntToLongFunction.java b/src/java.base/share/classes/java/util/function/IntToLongFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/IntToLongFunction.java rename to src/java.base/share/classes/java/util/function/IntToLongFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/IntUnaryOperator.java b/src/java.base/share/classes/java/util/function/IntUnaryOperator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/IntUnaryOperator.java rename to src/java.base/share/classes/java/util/function/IntUnaryOperator.java diff --git a/jdk/src/java.base/share/classes/java/util/function/LongBinaryOperator.java b/src/java.base/share/classes/java/util/function/LongBinaryOperator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/LongBinaryOperator.java rename to src/java.base/share/classes/java/util/function/LongBinaryOperator.java diff --git a/jdk/src/java.base/share/classes/java/util/function/LongConsumer.java b/src/java.base/share/classes/java/util/function/LongConsumer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/LongConsumer.java rename to src/java.base/share/classes/java/util/function/LongConsumer.java diff --git a/jdk/src/java.base/share/classes/java/util/function/LongFunction.java b/src/java.base/share/classes/java/util/function/LongFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/LongFunction.java rename to src/java.base/share/classes/java/util/function/LongFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/LongPredicate.java b/src/java.base/share/classes/java/util/function/LongPredicate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/LongPredicate.java rename to src/java.base/share/classes/java/util/function/LongPredicate.java diff --git a/jdk/src/java.base/share/classes/java/util/function/LongSupplier.java b/src/java.base/share/classes/java/util/function/LongSupplier.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/LongSupplier.java rename to src/java.base/share/classes/java/util/function/LongSupplier.java diff --git a/jdk/src/java.base/share/classes/java/util/function/LongToDoubleFunction.java b/src/java.base/share/classes/java/util/function/LongToDoubleFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/LongToDoubleFunction.java rename to src/java.base/share/classes/java/util/function/LongToDoubleFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/LongToIntFunction.java b/src/java.base/share/classes/java/util/function/LongToIntFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/LongToIntFunction.java rename to src/java.base/share/classes/java/util/function/LongToIntFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/LongUnaryOperator.java b/src/java.base/share/classes/java/util/function/LongUnaryOperator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/LongUnaryOperator.java rename to src/java.base/share/classes/java/util/function/LongUnaryOperator.java diff --git a/jdk/src/java.base/share/classes/java/util/function/ObjDoubleConsumer.java b/src/java.base/share/classes/java/util/function/ObjDoubleConsumer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/ObjDoubleConsumer.java rename to src/java.base/share/classes/java/util/function/ObjDoubleConsumer.java diff --git a/jdk/src/java.base/share/classes/java/util/function/ObjIntConsumer.java b/src/java.base/share/classes/java/util/function/ObjIntConsumer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/ObjIntConsumer.java rename to src/java.base/share/classes/java/util/function/ObjIntConsumer.java diff --git a/jdk/src/java.base/share/classes/java/util/function/ObjLongConsumer.java b/src/java.base/share/classes/java/util/function/ObjLongConsumer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/ObjLongConsumer.java rename to src/java.base/share/classes/java/util/function/ObjLongConsumer.java diff --git a/jdk/src/java.base/share/classes/java/util/function/Predicate.java b/src/java.base/share/classes/java/util/function/Predicate.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/Predicate.java rename to src/java.base/share/classes/java/util/function/Predicate.java diff --git a/jdk/src/java.base/share/classes/java/util/function/Supplier.java b/src/java.base/share/classes/java/util/function/Supplier.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/Supplier.java rename to src/java.base/share/classes/java/util/function/Supplier.java diff --git a/jdk/src/java.base/share/classes/java/util/function/ToDoubleBiFunction.java b/src/java.base/share/classes/java/util/function/ToDoubleBiFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/ToDoubleBiFunction.java rename to src/java.base/share/classes/java/util/function/ToDoubleBiFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/ToDoubleFunction.java b/src/java.base/share/classes/java/util/function/ToDoubleFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/ToDoubleFunction.java rename to src/java.base/share/classes/java/util/function/ToDoubleFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/ToIntBiFunction.java b/src/java.base/share/classes/java/util/function/ToIntBiFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/ToIntBiFunction.java rename to src/java.base/share/classes/java/util/function/ToIntBiFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/ToIntFunction.java b/src/java.base/share/classes/java/util/function/ToIntFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/ToIntFunction.java rename to src/java.base/share/classes/java/util/function/ToIntFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/ToLongBiFunction.java b/src/java.base/share/classes/java/util/function/ToLongBiFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/ToLongBiFunction.java rename to src/java.base/share/classes/java/util/function/ToLongBiFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/ToLongFunction.java b/src/java.base/share/classes/java/util/function/ToLongFunction.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/ToLongFunction.java rename to src/java.base/share/classes/java/util/function/ToLongFunction.java diff --git a/jdk/src/java.base/share/classes/java/util/function/UnaryOperator.java b/src/java.base/share/classes/java/util/function/UnaryOperator.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/UnaryOperator.java rename to src/java.base/share/classes/java/util/function/UnaryOperator.java diff --git a/jdk/src/java.base/share/classes/java/util/function/package-info.java b/src/java.base/share/classes/java/util/function/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/function/package-info.java rename to src/java.base/share/classes/java/util/function/package-info.java diff --git a/jdk/src/java.base/share/classes/java/util/jar/Attributes.java b/src/java.base/share/classes/java/util/jar/Attributes.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/jar/Attributes.java rename to src/java.base/share/classes/java/util/jar/Attributes.java diff --git a/jdk/src/java.base/share/classes/java/util/jar/JarEntry.java b/src/java.base/share/classes/java/util/jar/JarEntry.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/jar/JarEntry.java rename to src/java.base/share/classes/java/util/jar/JarEntry.java diff --git a/jdk/src/java.base/share/classes/java/util/jar/JarException.java b/src/java.base/share/classes/java/util/jar/JarException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/jar/JarException.java rename to src/java.base/share/classes/java/util/jar/JarException.java diff --git a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/jar/JarFile.java rename to src/java.base/share/classes/java/util/jar/JarFile.java diff --git a/jdk/src/java.base/share/classes/java/util/jar/JarInputStream.java b/src/java.base/share/classes/java/util/jar/JarInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/jar/JarInputStream.java rename to src/java.base/share/classes/java/util/jar/JarInputStream.java diff --git a/jdk/src/java.base/share/classes/java/util/jar/JarOutputStream.java b/src/java.base/share/classes/java/util/jar/JarOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/jar/JarOutputStream.java rename to src/java.base/share/classes/java/util/jar/JarOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/util/jar/JarVerifier.java b/src/java.base/share/classes/java/util/jar/JarVerifier.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/jar/JarVerifier.java rename to src/java.base/share/classes/java/util/jar/JarVerifier.java diff --git a/jdk/src/java.base/share/classes/java/util/jar/JavaUtilJarAccessImpl.java b/src/java.base/share/classes/java/util/jar/JavaUtilJarAccessImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/jar/JavaUtilJarAccessImpl.java rename to src/java.base/share/classes/java/util/jar/JavaUtilJarAccessImpl.java diff --git a/jdk/src/java.base/share/classes/java/util/jar/Manifest.java b/src/java.base/share/classes/java/util/jar/Manifest.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/jar/Manifest.java rename to src/java.base/share/classes/java/util/jar/Manifest.java diff --git a/jdk/src/java.base/share/classes/java/util/jar/Pack200.java b/src/java.base/share/classes/java/util/jar/Pack200.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/jar/Pack200.java rename to src/java.base/share/classes/java/util/jar/Pack200.java diff --git a/jdk/src/java.base/share/classes/java/util/jar/package-info.java b/src/java.base/share/classes/java/util/jar/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/jar/package-info.java rename to src/java.base/share/classes/java/util/jar/package-info.java diff --git a/jdk/src/java.base/share/classes/java/util/package-info.java b/src/java.base/share/classes/java/util/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/package-info.java rename to src/java.base/share/classes/java/util/package-info.java diff --git a/jdk/src/java.base/share/classes/java/util/regex/ASCII.java b/src/java.base/share/classes/java/util/regex/ASCII.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/regex/ASCII.java rename to src/java.base/share/classes/java/util/regex/ASCII.java diff --git a/jdk/src/java.base/share/classes/java/util/regex/CharPredicates.java b/src/java.base/share/classes/java/util/regex/CharPredicates.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/regex/CharPredicates.java rename to src/java.base/share/classes/java/util/regex/CharPredicates.java diff --git a/jdk/src/java.base/share/classes/java/util/regex/Grapheme.java b/src/java.base/share/classes/java/util/regex/Grapheme.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/regex/Grapheme.java rename to src/java.base/share/classes/java/util/regex/Grapheme.java diff --git a/jdk/src/java.base/share/classes/java/util/regex/IntHashSet.java b/src/java.base/share/classes/java/util/regex/IntHashSet.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/regex/IntHashSet.java rename to src/java.base/share/classes/java/util/regex/IntHashSet.java diff --git a/jdk/src/java.base/share/classes/java/util/regex/MatchResult.java b/src/java.base/share/classes/java/util/regex/MatchResult.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/regex/MatchResult.java rename to src/java.base/share/classes/java/util/regex/MatchResult.java diff --git a/jdk/src/java.base/share/classes/java/util/regex/Matcher.java b/src/java.base/share/classes/java/util/regex/Matcher.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/regex/Matcher.java rename to src/java.base/share/classes/java/util/regex/Matcher.java diff --git a/jdk/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/regex/Pattern.java rename to src/java.base/share/classes/java/util/regex/Pattern.java diff --git a/jdk/src/java.base/share/classes/java/util/regex/PatternSyntaxException.java b/src/java.base/share/classes/java/util/regex/PatternSyntaxException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/regex/PatternSyntaxException.java rename to src/java.base/share/classes/java/util/regex/PatternSyntaxException.java diff --git a/jdk/src/java.base/share/classes/java/util/regex/PrintPattern.java b/src/java.base/share/classes/java/util/regex/PrintPattern.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/regex/PrintPattern.java rename to src/java.base/share/classes/java/util/regex/PrintPattern.java diff --git a/jdk/src/java.base/share/classes/java/util/regex/package-info.java b/src/java.base/share/classes/java/util/regex/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/regex/package-info.java rename to src/java.base/share/classes/java/util/regex/package-info.java diff --git a/jdk/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java b/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java rename to src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java diff --git a/jdk/src/java.base/share/classes/java/util/spi/CalendarDataProvider.java b/src/java.base/share/classes/java/util/spi/CalendarDataProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/spi/CalendarDataProvider.java rename to src/java.base/share/classes/java/util/spi/CalendarDataProvider.java diff --git a/jdk/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java b/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java rename to src/java.base/share/classes/java/util/spi/CalendarNameProvider.java diff --git a/jdk/src/java.base/share/classes/java/util/spi/CurrencyNameProvider.java b/src/java.base/share/classes/java/util/spi/CurrencyNameProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/spi/CurrencyNameProvider.java rename to src/java.base/share/classes/java/util/spi/CurrencyNameProvider.java diff --git a/jdk/src/java.base/share/classes/java/util/spi/LocaleNameProvider.java b/src/java.base/share/classes/java/util/spi/LocaleNameProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/spi/LocaleNameProvider.java rename to src/java.base/share/classes/java/util/spi/LocaleNameProvider.java diff --git a/jdk/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java rename to src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java diff --git a/jdk/src/java.base/share/classes/java/util/spi/ResourceBundleControlProvider.java b/src/java.base/share/classes/java/util/spi/ResourceBundleControlProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/spi/ResourceBundleControlProvider.java rename to src/java.base/share/classes/java/util/spi/ResourceBundleControlProvider.java diff --git a/jdk/src/java.base/share/classes/java/util/spi/ResourceBundleProvider.java b/src/java.base/share/classes/java/util/spi/ResourceBundleProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/spi/ResourceBundleProvider.java rename to src/java.base/share/classes/java/util/spi/ResourceBundleProvider.java diff --git a/jdk/src/java.base/share/classes/java/util/spi/TimeZoneNameProvider.java b/src/java.base/share/classes/java/util/spi/TimeZoneNameProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/spi/TimeZoneNameProvider.java rename to src/java.base/share/classes/java/util/spi/TimeZoneNameProvider.java diff --git a/jdk/src/java.base/share/classes/java/util/spi/ToolProvider.java b/src/java.base/share/classes/java/util/spi/ToolProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/spi/ToolProvider.java rename to src/java.base/share/classes/java/util/spi/ToolProvider.java diff --git a/jdk/src/java.base/share/classes/java/util/spi/package-info.java b/src/java.base/share/classes/java/util/spi/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/spi/package-info.java rename to src/java.base/share/classes/java/util/spi/package-info.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/AbstractPipeline.java b/src/java.base/share/classes/java/util/stream/AbstractPipeline.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/AbstractPipeline.java rename to src/java.base/share/classes/java/util/stream/AbstractPipeline.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/AbstractShortCircuitTask.java b/src/java.base/share/classes/java/util/stream/AbstractShortCircuitTask.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/AbstractShortCircuitTask.java rename to src/java.base/share/classes/java/util/stream/AbstractShortCircuitTask.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/AbstractSpinedBuffer.java b/src/java.base/share/classes/java/util/stream/AbstractSpinedBuffer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/AbstractSpinedBuffer.java rename to src/java.base/share/classes/java/util/stream/AbstractSpinedBuffer.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/AbstractTask.java b/src/java.base/share/classes/java/util/stream/AbstractTask.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/AbstractTask.java rename to src/java.base/share/classes/java/util/stream/AbstractTask.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/BaseStream.java b/src/java.base/share/classes/java/util/stream/BaseStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/BaseStream.java rename to src/java.base/share/classes/java/util/stream/BaseStream.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/Collector.java b/src/java.base/share/classes/java/util/stream/Collector.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/Collector.java rename to src/java.base/share/classes/java/util/stream/Collector.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/Collectors.java b/src/java.base/share/classes/java/util/stream/Collectors.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/Collectors.java rename to src/java.base/share/classes/java/util/stream/Collectors.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/DistinctOps.java b/src/java.base/share/classes/java/util/stream/DistinctOps.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/DistinctOps.java rename to src/java.base/share/classes/java/util/stream/DistinctOps.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/DoublePipeline.java b/src/java.base/share/classes/java/util/stream/DoublePipeline.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/DoublePipeline.java rename to src/java.base/share/classes/java/util/stream/DoublePipeline.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java b/src/java.base/share/classes/java/util/stream/DoubleStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java rename to src/java.base/share/classes/java/util/stream/DoubleStream.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/FindOps.java b/src/java.base/share/classes/java/util/stream/FindOps.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/FindOps.java rename to src/java.base/share/classes/java/util/stream/FindOps.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/ForEachOps.java b/src/java.base/share/classes/java/util/stream/ForEachOps.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/ForEachOps.java rename to src/java.base/share/classes/java/util/stream/ForEachOps.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/IntPipeline.java b/src/java.base/share/classes/java/util/stream/IntPipeline.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/IntPipeline.java rename to src/java.base/share/classes/java/util/stream/IntPipeline.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/IntStream.java b/src/java.base/share/classes/java/util/stream/IntStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/IntStream.java rename to src/java.base/share/classes/java/util/stream/IntStream.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/LongPipeline.java b/src/java.base/share/classes/java/util/stream/LongPipeline.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/LongPipeline.java rename to src/java.base/share/classes/java/util/stream/LongPipeline.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/LongStream.java b/src/java.base/share/classes/java/util/stream/LongStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/LongStream.java rename to src/java.base/share/classes/java/util/stream/LongStream.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/MatchOps.java b/src/java.base/share/classes/java/util/stream/MatchOps.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/MatchOps.java rename to src/java.base/share/classes/java/util/stream/MatchOps.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/Node.java b/src/java.base/share/classes/java/util/stream/Node.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/Node.java rename to src/java.base/share/classes/java/util/stream/Node.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/Nodes.java b/src/java.base/share/classes/java/util/stream/Nodes.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/Nodes.java rename to src/java.base/share/classes/java/util/stream/Nodes.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/PipelineHelper.java b/src/java.base/share/classes/java/util/stream/PipelineHelper.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/PipelineHelper.java rename to src/java.base/share/classes/java/util/stream/PipelineHelper.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java b/src/java.base/share/classes/java/util/stream/ReduceOps.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java rename to src/java.base/share/classes/java/util/stream/ReduceOps.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/ReferencePipeline.java b/src/java.base/share/classes/java/util/stream/ReferencePipeline.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/ReferencePipeline.java rename to src/java.base/share/classes/java/util/stream/ReferencePipeline.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/Sink.java b/src/java.base/share/classes/java/util/stream/Sink.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/Sink.java rename to src/java.base/share/classes/java/util/stream/Sink.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/SliceOps.java b/src/java.base/share/classes/java/util/stream/SliceOps.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/SliceOps.java rename to src/java.base/share/classes/java/util/stream/SliceOps.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/SortedOps.java b/src/java.base/share/classes/java/util/stream/SortedOps.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/SortedOps.java rename to src/java.base/share/classes/java/util/stream/SortedOps.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/SpinedBuffer.java b/src/java.base/share/classes/java/util/stream/SpinedBuffer.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/SpinedBuffer.java rename to src/java.base/share/classes/java/util/stream/SpinedBuffer.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/Stream.java b/src/java.base/share/classes/java/util/stream/Stream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/Stream.java rename to src/java.base/share/classes/java/util/stream/Stream.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/StreamOpFlag.java b/src/java.base/share/classes/java/util/stream/StreamOpFlag.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/StreamOpFlag.java rename to src/java.base/share/classes/java/util/stream/StreamOpFlag.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/StreamShape.java b/src/java.base/share/classes/java/util/stream/StreamShape.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/StreamShape.java rename to src/java.base/share/classes/java/util/stream/StreamShape.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java b/src/java.base/share/classes/java/util/stream/StreamSpliterators.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java rename to src/java.base/share/classes/java/util/stream/StreamSpliterators.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/StreamSupport.java b/src/java.base/share/classes/java/util/stream/StreamSupport.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/StreamSupport.java rename to src/java.base/share/classes/java/util/stream/StreamSupport.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/Streams.java b/src/java.base/share/classes/java/util/stream/Streams.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/Streams.java rename to src/java.base/share/classes/java/util/stream/Streams.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/TerminalOp.java b/src/java.base/share/classes/java/util/stream/TerminalOp.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/TerminalOp.java rename to src/java.base/share/classes/java/util/stream/TerminalOp.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/TerminalSink.java b/src/java.base/share/classes/java/util/stream/TerminalSink.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/TerminalSink.java rename to src/java.base/share/classes/java/util/stream/TerminalSink.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/Tripwire.java b/src/java.base/share/classes/java/util/stream/Tripwire.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/Tripwire.java rename to src/java.base/share/classes/java/util/stream/Tripwire.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/WhileOps.java b/src/java.base/share/classes/java/util/stream/WhileOps.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/WhileOps.java rename to src/java.base/share/classes/java/util/stream/WhileOps.java diff --git a/jdk/src/java.base/share/classes/java/util/stream/package-info.java b/src/java.base/share/classes/java/util/stream/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/stream/package-info.java rename to src/java.base/share/classes/java/util/stream/package-info.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/Adler32.java b/src/java.base/share/classes/java/util/zip/Adler32.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/Adler32.java rename to src/java.base/share/classes/java/util/zip/Adler32.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/CRC32.java b/src/java.base/share/classes/java/util/zip/CRC32.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/CRC32.java rename to src/java.base/share/classes/java/util/zip/CRC32.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/CRC32C.java b/src/java.base/share/classes/java/util/zip/CRC32C.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/CRC32C.java rename to src/java.base/share/classes/java/util/zip/CRC32C.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/CheckedInputStream.java b/src/java.base/share/classes/java/util/zip/CheckedInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/CheckedInputStream.java rename to src/java.base/share/classes/java/util/zip/CheckedInputStream.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/CheckedOutputStream.java b/src/java.base/share/classes/java/util/zip/CheckedOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/CheckedOutputStream.java rename to src/java.base/share/classes/java/util/zip/CheckedOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/Checksum.java b/src/java.base/share/classes/java/util/zip/Checksum.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/Checksum.java rename to src/java.base/share/classes/java/util/zip/Checksum.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/DataFormatException.java b/src/java.base/share/classes/java/util/zip/DataFormatException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/DataFormatException.java rename to src/java.base/share/classes/java/util/zip/DataFormatException.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/Deflater.java b/src/java.base/share/classes/java/util/zip/Deflater.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/Deflater.java rename to src/java.base/share/classes/java/util/zip/Deflater.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/DeflaterInputStream.java b/src/java.base/share/classes/java/util/zip/DeflaterInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/DeflaterInputStream.java rename to src/java.base/share/classes/java/util/zip/DeflaterInputStream.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java b/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java rename to src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/GZIPInputStream.java b/src/java.base/share/classes/java/util/zip/GZIPInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/GZIPInputStream.java rename to src/java.base/share/classes/java/util/zip/GZIPInputStream.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java b/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java rename to src/java.base/share/classes/java/util/zip/GZIPOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/Inflater.java b/src/java.base/share/classes/java/util/zip/Inflater.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/Inflater.java rename to src/java.base/share/classes/java/util/zip/Inflater.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/InflaterInputStream.java b/src/java.base/share/classes/java/util/zip/InflaterInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/InflaterInputStream.java rename to src/java.base/share/classes/java/util/zip/InflaterInputStream.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/InflaterOutputStream.java b/src/java.base/share/classes/java/util/zip/InflaterOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/InflaterOutputStream.java rename to src/java.base/share/classes/java/util/zip/InflaterOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZStreamRef.java b/src/java.base/share/classes/java/util/zip/ZStreamRef.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/ZStreamRef.java rename to src/java.base/share/classes/java/util/zip/ZStreamRef.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipCoder.java b/src/java.base/share/classes/java/util/zip/ZipCoder.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/ZipCoder.java rename to src/java.base/share/classes/java/util/zip/ZipCoder.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipConstants.java b/src/java.base/share/classes/java/util/zip/ZipConstants.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/ZipConstants.java rename to src/java.base/share/classes/java/util/zip/ZipConstants.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipConstants64.java b/src/java.base/share/classes/java/util/zip/ZipConstants64.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/ZipConstants64.java rename to src/java.base/share/classes/java/util/zip/ZipConstants64.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipEntry.java b/src/java.base/share/classes/java/util/zip/ZipEntry.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/ZipEntry.java rename to src/java.base/share/classes/java/util/zip/ZipEntry.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipError.java b/src/java.base/share/classes/java/util/zip/ZipError.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/ZipError.java rename to src/java.base/share/classes/java/util/zip/ZipError.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipException.java b/src/java.base/share/classes/java/util/zip/ZipException.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/ZipException.java rename to src/java.base/share/classes/java/util/zip/ZipException.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/ZipFile.java rename to src/java.base/share/classes/java/util/zip/ZipFile.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipInputStream.java b/src/java.base/share/classes/java/util/zip/ZipInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/ZipInputStream.java rename to src/java.base/share/classes/java/util/zip/ZipInputStream.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipOutputStream.java b/src/java.base/share/classes/java/util/zip/ZipOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/ZipOutputStream.java rename to src/java.base/share/classes/java/util/zip/ZipOutputStream.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java b/src/java.base/share/classes/java/util/zip/ZipUtils.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java rename to src/java.base/share/classes/java/util/zip/ZipUtils.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/package-info.java b/src/java.base/share/classes/java/util/zip/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/java/util/zip/package-info.java rename to src/java.base/share/classes/java/util/zip/package-info.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/AEADBadTagException.java b/src/java.base/share/classes/javax/crypto/AEADBadTagException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/AEADBadTagException.java rename to src/java.base/share/classes/javax/crypto/AEADBadTagException.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/BadPaddingException.java b/src/java.base/share/classes/javax/crypto/BadPaddingException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/BadPaddingException.java rename to src/java.base/share/classes/javax/crypto/BadPaddingException.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/Cipher.java b/src/java.base/share/classes/javax/crypto/Cipher.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/Cipher.java rename to src/java.base/share/classes/javax/crypto/Cipher.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/CipherInputStream.java b/src/java.base/share/classes/javax/crypto/CipherInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/CipherInputStream.java rename to src/java.base/share/classes/javax/crypto/CipherInputStream.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/CipherOutputStream.java b/src/java.base/share/classes/javax/crypto/CipherOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/CipherOutputStream.java rename to src/java.base/share/classes/javax/crypto/CipherOutputStream.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/CipherSpi.java b/src/java.base/share/classes/javax/crypto/CipherSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/CipherSpi.java rename to src/java.base/share/classes/javax/crypto/CipherSpi.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/CryptoAllPermission.java b/src/java.base/share/classes/javax/crypto/CryptoAllPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/CryptoAllPermission.java rename to src/java.base/share/classes/javax/crypto/CryptoAllPermission.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/CryptoPermission.java b/src/java.base/share/classes/javax/crypto/CryptoPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/CryptoPermission.java rename to src/java.base/share/classes/javax/crypto/CryptoPermission.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/CryptoPermissions.java b/src/java.base/share/classes/javax/crypto/CryptoPermissions.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/CryptoPermissions.java rename to src/java.base/share/classes/javax/crypto/CryptoPermissions.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/CryptoPolicyParser.java b/src/java.base/share/classes/javax/crypto/CryptoPolicyParser.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/CryptoPolicyParser.java rename to src/java.base/share/classes/javax/crypto/CryptoPolicyParser.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java b/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java rename to src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanism.java b/src/java.base/share/classes/javax/crypto/ExemptionMechanism.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanism.java rename to src/java.base/share/classes/javax/crypto/ExemptionMechanism.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanismException.java b/src/java.base/share/classes/javax/crypto/ExemptionMechanismException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanismException.java rename to src/java.base/share/classes/javax/crypto/ExemptionMechanismException.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanismSpi.java b/src/java.base/share/classes/javax/crypto/ExemptionMechanismSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanismSpi.java rename to src/java.base/share/classes/javax/crypto/ExemptionMechanismSpi.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/IllegalBlockSizeException.java b/src/java.base/share/classes/javax/crypto/IllegalBlockSizeException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/IllegalBlockSizeException.java rename to src/java.base/share/classes/javax/crypto/IllegalBlockSizeException.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/JceSecurity.java.template b/src/java.base/share/classes/javax/crypto/JceSecurity.java.template similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/JceSecurity.java.template rename to src/java.base/share/classes/javax/crypto/JceSecurity.java.template diff --git a/jdk/src/java.base/share/classes/javax/crypto/JceSecurityManager.java b/src/java.base/share/classes/javax/crypto/JceSecurityManager.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/JceSecurityManager.java rename to src/java.base/share/classes/javax/crypto/JceSecurityManager.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java b/src/java.base/share/classes/javax/crypto/KeyAgreement.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java rename to src/java.base/share/classes/javax/crypto/KeyAgreement.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/KeyAgreementSpi.java b/src/java.base/share/classes/javax/crypto/KeyAgreementSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/KeyAgreementSpi.java rename to src/java.base/share/classes/javax/crypto/KeyAgreementSpi.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java b/src/java.base/share/classes/javax/crypto/KeyGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java rename to src/java.base/share/classes/javax/crypto/KeyGenerator.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/KeyGeneratorSpi.java b/src/java.base/share/classes/javax/crypto/KeyGeneratorSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/KeyGeneratorSpi.java rename to src/java.base/share/classes/javax/crypto/KeyGeneratorSpi.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/Mac.java b/src/java.base/share/classes/javax/crypto/Mac.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/Mac.java rename to src/java.base/share/classes/javax/crypto/Mac.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/MacSpi.java b/src/java.base/share/classes/javax/crypto/MacSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/MacSpi.java rename to src/java.base/share/classes/javax/crypto/MacSpi.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/NoSuchPaddingException.java b/src/java.base/share/classes/javax/crypto/NoSuchPaddingException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/NoSuchPaddingException.java rename to src/java.base/share/classes/javax/crypto/NoSuchPaddingException.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/NullCipher.java b/src/java.base/share/classes/javax/crypto/NullCipher.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/NullCipher.java rename to src/java.base/share/classes/javax/crypto/NullCipher.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/NullCipherSpi.java b/src/java.base/share/classes/javax/crypto/NullCipherSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/NullCipherSpi.java rename to src/java.base/share/classes/javax/crypto/NullCipherSpi.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/ProviderVerifier.java b/src/java.base/share/classes/javax/crypto/ProviderVerifier.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/ProviderVerifier.java rename to src/java.base/share/classes/javax/crypto/ProviderVerifier.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/SealedObject.java b/src/java.base/share/classes/javax/crypto/SealedObject.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/SealedObject.java rename to src/java.base/share/classes/javax/crypto/SealedObject.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/SecretKey.java b/src/java.base/share/classes/javax/crypto/SecretKey.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/SecretKey.java rename to src/java.base/share/classes/javax/crypto/SecretKey.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java b/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java rename to src/java.base/share/classes/javax/crypto/SecretKeyFactory.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/SecretKeyFactorySpi.java b/src/java.base/share/classes/javax/crypto/SecretKeyFactorySpi.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/SecretKeyFactorySpi.java rename to src/java.base/share/classes/javax/crypto/SecretKeyFactorySpi.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/ShortBufferException.java b/src/java.base/share/classes/javax/crypto/ShortBufferException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/ShortBufferException.java rename to src/java.base/share/classes/javax/crypto/ShortBufferException.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/interfaces/DHKey.java b/src/java.base/share/classes/javax/crypto/interfaces/DHKey.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/interfaces/DHKey.java rename to src/java.base/share/classes/javax/crypto/interfaces/DHKey.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java b/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java rename to src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java b/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java rename to src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/interfaces/PBEKey.java b/src/java.base/share/classes/javax/crypto/interfaces/PBEKey.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/interfaces/PBEKey.java rename to src/java.base/share/classes/javax/crypto/interfaces/PBEKey.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/interfaces/package-info.java b/src/java.base/share/classes/javax/crypto/interfaces/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/interfaces/package-info.java rename to src/java.base/share/classes/javax/crypto/interfaces/package-info.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/package-info.java b/src/java.base/share/classes/javax/crypto/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/package-info.java rename to src/java.base/share/classes/javax/crypto/package-info.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/DESKeySpec.java b/src/java.base/share/classes/javax/crypto/spec/DESKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/DESKeySpec.java rename to src/java.base/share/classes/javax/crypto/spec/DESKeySpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/DESedeKeySpec.java b/src/java.base/share/classes/javax/crypto/spec/DESedeKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/DESedeKeySpec.java rename to src/java.base/share/classes/javax/crypto/spec/DESedeKeySpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/DHGenParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/DHGenParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/DHGenParameterSpec.java rename to src/java.base/share/classes/javax/crypto/spec/DHGenParameterSpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/DHParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/DHParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/DHParameterSpec.java rename to src/java.base/share/classes/javax/crypto/spec/DHParameterSpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/DHPrivateKeySpec.java b/src/java.base/share/classes/javax/crypto/spec/DHPrivateKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/DHPrivateKeySpec.java rename to src/java.base/share/classes/javax/crypto/spec/DHPrivateKeySpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/DHPublicKeySpec.java b/src/java.base/share/classes/javax/crypto/spec/DHPublicKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/DHPublicKeySpec.java rename to src/java.base/share/classes/javax/crypto/spec/DHPublicKeySpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/GCMParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/GCMParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/GCMParameterSpec.java rename to src/java.base/share/classes/javax/crypto/spec/GCMParameterSpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/IvParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/IvParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/IvParameterSpec.java rename to src/java.base/share/classes/javax/crypto/spec/IvParameterSpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/OAEPParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/OAEPParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/OAEPParameterSpec.java rename to src/java.base/share/classes/javax/crypto/spec/OAEPParameterSpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/PBEKeySpec.java b/src/java.base/share/classes/javax/crypto/spec/PBEKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/PBEKeySpec.java rename to src/java.base/share/classes/javax/crypto/spec/PBEKeySpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/PBEParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/PBEParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/PBEParameterSpec.java rename to src/java.base/share/classes/javax/crypto/spec/PBEParameterSpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/PSource.java b/src/java.base/share/classes/javax/crypto/spec/PSource.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/PSource.java rename to src/java.base/share/classes/javax/crypto/spec/PSource.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java rename to src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java rename to src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java b/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java rename to src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/package-info.java b/src/java.base/share/classes/javax/crypto/spec/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/crypto/spec/package-info.java rename to src/java.base/share/classes/javax/crypto/spec/package-info.java diff --git a/jdk/src/java.base/share/classes/javax/net/ServerSocketFactory.java b/src/java.base/share/classes/javax/net/ServerSocketFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ServerSocketFactory.java rename to src/java.base/share/classes/javax/net/ServerSocketFactory.java diff --git a/jdk/src/java.base/share/classes/javax/net/SocketFactory.java b/src/java.base/share/classes/javax/net/SocketFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/SocketFactory.java rename to src/java.base/share/classes/javax/net/SocketFactory.java diff --git a/jdk/src/java.base/share/classes/javax/net/package-info.java b/src/java.base/share/classes/javax/net/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/package-info.java rename to src/java.base/share/classes/javax/net/package-info.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java b/src/java.base/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java rename to src/java.base/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java b/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java rename to src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java b/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java rename to src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedListener.java b/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedListener.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedListener.java rename to src/java.base/share/classes/javax/net/ssl/HandshakeCompletedListener.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/HostnameVerifier.java b/src/java.base/share/classes/javax/net/ssl/HostnameVerifier.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/HostnameVerifier.java rename to src/java.base/share/classes/javax/net/ssl/HostnameVerifier.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java b/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java rename to src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/KeyManager.java b/src/java.base/share/classes/javax/net/ssl/KeyManager.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/KeyManager.java rename to src/java.base/share/classes/javax/net/ssl/KeyManager.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java b/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java rename to src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactorySpi.java b/src/java.base/share/classes/javax/net/ssl/KeyManagerFactorySpi.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactorySpi.java rename to src/java.base/share/classes/javax/net/ssl/KeyManagerFactorySpi.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java b/src/java.base/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java rename to src/java.base/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/ManagerFactoryParameters.java b/src/java.base/share/classes/javax/net/ssl/ManagerFactoryParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/ManagerFactoryParameters.java rename to src/java.base/share/classes/javax/net/ssl/ManagerFactoryParameters.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SNIHostName.java b/src/java.base/share/classes/javax/net/ssl/SNIHostName.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SNIHostName.java rename to src/java.base/share/classes/javax/net/ssl/SNIHostName.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SNIMatcher.java b/src/java.base/share/classes/javax/net/ssl/SNIMatcher.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SNIMatcher.java rename to src/java.base/share/classes/javax/net/ssl/SNIMatcher.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SNIServerName.java b/src/java.base/share/classes/javax/net/ssl/SNIServerName.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SNIServerName.java rename to src/java.base/share/classes/javax/net/ssl/SNIServerName.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java b/src/java.base/share/classes/javax/net/ssl/SSLContext.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java rename to src/java.base/share/classes/javax/net/ssl/SSLContext.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLContextSpi.java b/src/java.base/share/classes/javax/net/ssl/SSLContextSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLContextSpi.java rename to src/java.base/share/classes/javax/net/ssl/SSLContextSpi.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java b/src/java.base/share/classes/javax/net/ssl/SSLEngine.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java rename to src/java.base/share/classes/javax/net/ssl/SSLEngine.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java b/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java rename to src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLException.java b/src/java.base/share/classes/javax/net/ssl/SSLException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLException.java rename to src/java.base/share/classes/javax/net/ssl/SSLException.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLHandshakeException.java b/src/java.base/share/classes/javax/net/ssl/SSLHandshakeException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLHandshakeException.java rename to src/java.base/share/classes/javax/net/ssl/SSLHandshakeException.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLKeyException.java b/src/java.base/share/classes/javax/net/ssl/SSLKeyException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLKeyException.java rename to src/java.base/share/classes/javax/net/ssl/SSLKeyException.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLParameters.java b/src/java.base/share/classes/javax/net/ssl/SSLParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLParameters.java rename to src/java.base/share/classes/javax/net/ssl/SSLParameters.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java b/src/java.base/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java rename to src/java.base/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLPermission.java b/src/java.base/share/classes/javax/net/ssl/SSLPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLPermission.java rename to src/java.base/share/classes/javax/net/ssl/SSLPermission.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLProtocolException.java b/src/java.base/share/classes/javax/net/ssl/SSLProtocolException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLProtocolException.java rename to src/java.base/share/classes/javax/net/ssl/SSLProtocolException.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java b/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java rename to src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java b/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java rename to src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java b/src/java.base/share/classes/javax/net/ssl/SSLSession.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java rename to src/java.base/share/classes/javax/net/ssl/SSLSession.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSessionBindingEvent.java b/src/java.base/share/classes/javax/net/ssl/SSLSessionBindingEvent.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLSessionBindingEvent.java rename to src/java.base/share/classes/javax/net/ssl/SSLSessionBindingEvent.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSessionBindingListener.java b/src/java.base/share/classes/javax/net/ssl/SSLSessionBindingListener.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLSessionBindingListener.java rename to src/java.base/share/classes/javax/net/ssl/SSLSessionBindingListener.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSessionContext.java b/src/java.base/share/classes/javax/net/ssl/SSLSessionContext.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLSessionContext.java rename to src/java.base/share/classes/javax/net/ssl/SSLSessionContext.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java b/src/java.base/share/classes/javax/net/ssl/SSLSocket.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java rename to src/java.base/share/classes/javax/net/ssl/SSLSocket.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java b/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java rename to src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/StandardConstants.java b/src/java.base/share/classes/javax/net/ssl/StandardConstants.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/StandardConstants.java rename to src/java.base/share/classes/javax/net/ssl/StandardConstants.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManager.java b/src/java.base/share/classes/javax/net/ssl/TrustManager.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/TrustManager.java rename to src/java.base/share/classes/javax/net/ssl/TrustManager.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java b/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java rename to src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactorySpi.java b/src/java.base/share/classes/javax/net/ssl/TrustManagerFactorySpi.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactorySpi.java rename to src/java.base/share/classes/javax/net/ssl/TrustManagerFactorySpi.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/X509ExtendedKeyManager.java b/src/java.base/share/classes/javax/net/ssl/X509ExtendedKeyManager.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/X509ExtendedKeyManager.java rename to src/java.base/share/classes/javax/net/ssl/X509ExtendedKeyManager.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/X509ExtendedTrustManager.java b/src/java.base/share/classes/javax/net/ssl/X509ExtendedTrustManager.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/X509ExtendedTrustManager.java rename to src/java.base/share/classes/javax/net/ssl/X509ExtendedTrustManager.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/X509KeyManager.java b/src/java.base/share/classes/javax/net/ssl/X509KeyManager.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/X509KeyManager.java rename to src/java.base/share/classes/javax/net/ssl/X509KeyManager.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/X509TrustManager.java b/src/java.base/share/classes/javax/net/ssl/X509TrustManager.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/X509TrustManager.java rename to src/java.base/share/classes/javax/net/ssl/X509TrustManager.java diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/package-info.java b/src/java.base/share/classes/javax/net/ssl/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/net/ssl/package-info.java rename to src/java.base/share/classes/javax/net/ssl/package-info.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/AuthPermission.java b/src/java.base/share/classes/javax/security/auth/AuthPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/AuthPermission.java rename to src/java.base/share/classes/javax/security/auth/AuthPermission.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/DestroyFailedException.java b/src/java.base/share/classes/javax/security/auth/DestroyFailedException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/DestroyFailedException.java rename to src/java.base/share/classes/javax/security/auth/DestroyFailedException.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/Destroyable.java b/src/java.base/share/classes/javax/security/auth/Destroyable.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/Destroyable.java rename to src/java.base/share/classes/javax/security/auth/Destroyable.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/Policy.java b/src/java.base/share/classes/javax/security/auth/Policy.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/Policy.java rename to src/java.base/share/classes/javax/security/auth/Policy.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/PrivateCredentialPermission.java b/src/java.base/share/classes/javax/security/auth/PrivateCredentialPermission.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/PrivateCredentialPermission.java rename to src/java.base/share/classes/javax/security/auth/PrivateCredentialPermission.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/RefreshFailedException.java b/src/java.base/share/classes/javax/security/auth/RefreshFailedException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/RefreshFailedException.java rename to src/java.base/share/classes/javax/security/auth/RefreshFailedException.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/Refreshable.java b/src/java.base/share/classes/javax/security/auth/Refreshable.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/Refreshable.java rename to src/java.base/share/classes/javax/security/auth/Refreshable.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/Subject.java b/src/java.base/share/classes/javax/security/auth/Subject.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/Subject.java rename to src/java.base/share/classes/javax/security/auth/Subject.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java b/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java rename to src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/callback/Callback.java b/src/java.base/share/classes/javax/security/auth/callback/Callback.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/callback/Callback.java rename to src/java.base/share/classes/javax/security/auth/callback/Callback.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/callback/CallbackHandler.java b/src/java.base/share/classes/javax/security/auth/callback/CallbackHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/callback/CallbackHandler.java rename to src/java.base/share/classes/javax/security/auth/callback/CallbackHandler.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/callback/ChoiceCallback.java b/src/java.base/share/classes/javax/security/auth/callback/ChoiceCallback.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/callback/ChoiceCallback.java rename to src/java.base/share/classes/javax/security/auth/callback/ChoiceCallback.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/callback/ConfirmationCallback.java b/src/java.base/share/classes/javax/security/auth/callback/ConfirmationCallback.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/callback/ConfirmationCallback.java rename to src/java.base/share/classes/javax/security/auth/callback/ConfirmationCallback.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/callback/LanguageCallback.java b/src/java.base/share/classes/javax/security/auth/callback/LanguageCallback.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/callback/LanguageCallback.java rename to src/java.base/share/classes/javax/security/auth/callback/LanguageCallback.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/callback/NameCallback.java b/src/java.base/share/classes/javax/security/auth/callback/NameCallback.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/callback/NameCallback.java rename to src/java.base/share/classes/javax/security/auth/callback/NameCallback.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/callback/PasswordCallback.java b/src/java.base/share/classes/javax/security/auth/callback/PasswordCallback.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/callback/PasswordCallback.java rename to src/java.base/share/classes/javax/security/auth/callback/PasswordCallback.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/callback/TextInputCallback.java b/src/java.base/share/classes/javax/security/auth/callback/TextInputCallback.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/callback/TextInputCallback.java rename to src/java.base/share/classes/javax/security/auth/callback/TextInputCallback.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/callback/TextOutputCallback.java b/src/java.base/share/classes/javax/security/auth/callback/TextOutputCallback.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/callback/TextOutputCallback.java rename to src/java.base/share/classes/javax/security/auth/callback/TextOutputCallback.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java b/src/java.base/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java rename to src/java.base/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/callback/package-info.java b/src/java.base/share/classes/javax/security/auth/callback/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/callback/package-info.java rename to src/java.base/share/classes/javax/security/auth/callback/package-info.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/AccountException.java b/src/java.base/share/classes/javax/security/auth/login/AccountException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/AccountException.java rename to src/java.base/share/classes/javax/security/auth/login/AccountException.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/AccountExpiredException.java b/src/java.base/share/classes/javax/security/auth/login/AccountExpiredException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/AccountExpiredException.java rename to src/java.base/share/classes/javax/security/auth/login/AccountExpiredException.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/AccountLockedException.java b/src/java.base/share/classes/javax/security/auth/login/AccountLockedException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/AccountLockedException.java rename to src/java.base/share/classes/javax/security/auth/login/AccountLockedException.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/AccountNotFoundException.java b/src/java.base/share/classes/javax/security/auth/login/AccountNotFoundException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/AccountNotFoundException.java rename to src/java.base/share/classes/javax/security/auth/login/AccountNotFoundException.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/AppConfigurationEntry.java b/src/java.base/share/classes/javax/security/auth/login/AppConfigurationEntry.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/AppConfigurationEntry.java rename to src/java.base/share/classes/javax/security/auth/login/AppConfigurationEntry.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/Configuration.java b/src/java.base/share/classes/javax/security/auth/login/Configuration.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/Configuration.java rename to src/java.base/share/classes/javax/security/auth/login/Configuration.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/ConfigurationSpi.java b/src/java.base/share/classes/javax/security/auth/login/ConfigurationSpi.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/ConfigurationSpi.java rename to src/java.base/share/classes/javax/security/auth/login/ConfigurationSpi.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/CredentialException.java b/src/java.base/share/classes/javax/security/auth/login/CredentialException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/CredentialException.java rename to src/java.base/share/classes/javax/security/auth/login/CredentialException.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/CredentialExpiredException.java b/src/java.base/share/classes/javax/security/auth/login/CredentialExpiredException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/CredentialExpiredException.java rename to src/java.base/share/classes/javax/security/auth/login/CredentialExpiredException.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/CredentialNotFoundException.java b/src/java.base/share/classes/javax/security/auth/login/CredentialNotFoundException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/CredentialNotFoundException.java rename to src/java.base/share/classes/javax/security/auth/login/CredentialNotFoundException.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/FailedLoginException.java b/src/java.base/share/classes/javax/security/auth/login/FailedLoginException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/FailedLoginException.java rename to src/java.base/share/classes/javax/security/auth/login/FailedLoginException.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/LoginContext.java b/src/java.base/share/classes/javax/security/auth/login/LoginContext.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/LoginContext.java rename to src/java.base/share/classes/javax/security/auth/login/LoginContext.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/LoginException.java b/src/java.base/share/classes/javax/security/auth/login/LoginException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/LoginException.java rename to src/java.base/share/classes/javax/security/auth/login/LoginException.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/login/package-info.java b/src/java.base/share/classes/javax/security/auth/login/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/login/package-info.java rename to src/java.base/share/classes/javax/security/auth/login/package-info.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/package-info.java b/src/java.base/share/classes/javax/security/auth/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/package-info.java rename to src/java.base/share/classes/javax/security/auth/package-info.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/spi/LoginModule.java b/src/java.base/share/classes/javax/security/auth/spi/LoginModule.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/spi/LoginModule.java rename to src/java.base/share/classes/javax/security/auth/spi/LoginModule.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/spi/package-info.java b/src/java.base/share/classes/javax/security/auth/spi/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/spi/package-info.java rename to src/java.base/share/classes/javax/security/auth/spi/package-info.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/x500/X500Principal.java b/src/java.base/share/classes/javax/security/auth/x500/X500Principal.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/x500/X500Principal.java rename to src/java.base/share/classes/javax/security/auth/x500/X500Principal.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/x500/X500PrivateCredential.java b/src/java.base/share/classes/javax/security/auth/x500/X500PrivateCredential.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/x500/X500PrivateCredential.java rename to src/java.base/share/classes/javax/security/auth/x500/X500PrivateCredential.java diff --git a/jdk/src/java.base/share/classes/javax/security/auth/x500/package-info.java b/src/java.base/share/classes/javax/security/auth/x500/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/auth/x500/package-info.java rename to src/java.base/share/classes/javax/security/auth/x500/package-info.java diff --git a/jdk/src/java.base/share/classes/javax/security/cert/Certificate.java b/src/java.base/share/classes/javax/security/cert/Certificate.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/cert/Certificate.java rename to src/java.base/share/classes/javax/security/cert/Certificate.java diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java b/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java rename to src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java b/src/java.base/share/classes/javax/security/cert/CertificateException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java rename to src/java.base/share/classes/javax/security/cert/CertificateException.java diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java b/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java rename to src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java b/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java rename to src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java b/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java rename to src/java.base/share/classes/javax/security/cert/CertificateParsingException.java diff --git a/jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java b/src/java.base/share/classes/javax/security/cert/X509Certificate.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java rename to src/java.base/share/classes/javax/security/cert/X509Certificate.java diff --git a/jdk/src/java.base/share/classes/javax/security/cert/package-info.java b/src/java.base/share/classes/javax/security/cert/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/javax/security/cert/package-info.java rename to src/java.base/share/classes/javax/security/cert/package-info.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java b/src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java rename to src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java b/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java rename to src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageBufferCache.java b/src/java.base/share/classes/jdk/internal/jimage/ImageBufferCache.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/ImageBufferCache.java rename to src/java.base/share/classes/jdk/internal/jimage/ImageBufferCache.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageHeader.java b/src/java.base/share/classes/jdk/internal/jimage/ImageHeader.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/ImageHeader.java rename to src/java.base/share/classes/jdk/internal/jimage/ImageHeader.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageLocation.java b/src/java.base/share/classes/jdk/internal/jimage/ImageLocation.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/ImageLocation.java rename to src/java.base/share/classes/jdk/internal/jimage/ImageLocation.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java b/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java rename to src/java.base/share/classes/jdk/internal/jimage/ImageReader.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReaderFactory.java b/src/java.base/share/classes/jdk/internal/jimage/ImageReaderFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReaderFactory.java rename to src/java.base/share/classes/jdk/internal/jimage/ImageReaderFactory.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStream.java b/src/java.base/share/classes/jdk/internal/jimage/ImageStream.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStream.java rename to src/java.base/share/classes/jdk/internal/jimage/ImageStream.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStrings.java b/src/java.base/share/classes/jdk/internal/jimage/ImageStrings.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStrings.java rename to src/java.base/share/classes/jdk/internal/jimage/ImageStrings.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStringsReader.java b/src/java.base/share/classes/jdk/internal/jimage/ImageStringsReader.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStringsReader.java rename to src/java.base/share/classes/jdk/internal/jimage/ImageStringsReader.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java b/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java rename to src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/CompressIndexes.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/CompressIndexes.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/CompressIndexes.java rename to src/java.base/share/classes/jdk/internal/jimage/decompressor/CompressIndexes.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/CompressedResourceHeader.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/CompressedResourceHeader.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/CompressedResourceHeader.java rename to src/java.base/share/classes/jdk/internal/jimage/decompressor/CompressedResourceHeader.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/Decompressor.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/Decompressor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/Decompressor.java rename to src/java.base/share/classes/jdk/internal/jimage/decompressor/Decompressor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/ResourceDecompressor.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/ResourceDecompressor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/ResourceDecompressor.java rename to src/java.base/share/classes/jdk/internal/jimage/decompressor/ResourceDecompressor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/ResourceDecompressorFactory.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/ResourceDecompressorFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/ResourceDecompressorFactory.java rename to src/java.base/share/classes/jdk/internal/jimage/decompressor/ResourceDecompressorFactory.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/ResourceDecompressorRepository.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/ResourceDecompressorRepository.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/ResourceDecompressorRepository.java rename to src/java.base/share/classes/jdk/internal/jimage/decompressor/ResourceDecompressorRepository.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/SignatureParser.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/SignatureParser.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/SignatureParser.java rename to src/java.base/share/classes/jdk/internal/jimage/decompressor/SignatureParser.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java rename to src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressorFactory.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressorFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressorFactory.java rename to src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressorFactory.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressor.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressor.java rename to src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressorFactory.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressorFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressorFactory.java rename to src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressorFactory.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jmod/JmodFile.java b/src/java.base/share/classes/jdk/internal/jmod/JmodFile.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jmod/JmodFile.java rename to src/java.base/share/classes/jdk/internal/jmod/JmodFile.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/ExplodedImage.java b/src/java.base/share/classes/jdk/internal/jrtfs/ExplodedImage.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jrtfs/ExplodedImage.java rename to src/java.base/share/classes/jdk/internal/jrtfs/ExplodedImage.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtDirectoryStream.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtDirectoryStream.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtDirectoryStream.java rename to src/java.base/share/classes/jdk/internal/jrtfs/JrtDirectoryStream.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributeView.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributeView.java rename to src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributeView.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java rename to src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileStore.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileStore.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileStore.java rename to src/java.base/share/classes/jdk/internal/jrtfs/JrtFileStore.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystem.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystem.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystem.java rename to src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystem.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java rename to src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtPath.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtPath.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtPath.java rename to src/java.base/share/classes/jdk/internal/jrtfs/JrtPath.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtUtils.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtUtils.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtUtils.java rename to src/java.base/share/classes/jdk/internal/jrtfs/JrtUtils.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/SystemImage.java b/src/java.base/share/classes/jdk/internal/jrtfs/SystemImage.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jrtfs/SystemImage.java rename to src/java.base/share/classes/jdk/internal/jrtfs/SystemImage.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js b/src/java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js rename to src/java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtls.js b/src/java.base/share/classes/jdk/internal/jrtfs/jrtls.js similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtls.js rename to src/java.base/share/classes/jdk/internal/jrtfs/jrtls.js diff --git a/jdk/src/java.base/share/classes/jdk/internal/loader/AbstractClassLoaderValue.java b/src/java.base/share/classes/jdk/internal/loader/AbstractClassLoaderValue.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/loader/AbstractClassLoaderValue.java rename to src/java.base/share/classes/jdk/internal/loader/AbstractClassLoaderValue.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/loader/BootLoader.java b/src/java.base/share/classes/jdk/internal/loader/BootLoader.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/loader/BootLoader.java rename to src/java.base/share/classes/jdk/internal/loader/BootLoader.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java b/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java rename to src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaderValue.java b/src/java.base/share/classes/jdk/internal/loader/ClassLoaderValue.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaderValue.java rename to src/java.base/share/classes/jdk/internal/loader/ClassLoaderValue.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java b/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java rename to src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/loader/Loader.java b/src/java.base/share/classes/jdk/internal/loader/Loader.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/loader/Loader.java rename to src/java.base/share/classes/jdk/internal/loader/Loader.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/loader/LoaderPool.java b/src/java.base/share/classes/jdk/internal/loader/LoaderPool.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/loader/LoaderPool.java rename to src/java.base/share/classes/jdk/internal/loader/LoaderPool.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/loader/Resource.java b/src/java.base/share/classes/jdk/internal/loader/Resource.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/loader/Resource.java rename to src/java.base/share/classes/jdk/internal/loader/Resource.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java b/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java rename to src/java.base/share/classes/jdk/internal/loader/URLClassPath.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/AbstractLoggerWrapper.java b/src/java.base/share/classes/jdk/internal/logger/AbstractLoggerWrapper.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/logger/AbstractLoggerWrapper.java rename to src/java.base/share/classes/jdk/internal/logger/AbstractLoggerWrapper.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java b/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java rename to src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/DefaultLoggerFinder.java b/src/java.base/share/classes/jdk/internal/logger/DefaultLoggerFinder.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/logger/DefaultLoggerFinder.java rename to src/java.base/share/classes/jdk/internal/logger/DefaultLoggerFinder.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java b/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java rename to src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/LocalizedLoggerWrapper.java b/src/java.base/share/classes/jdk/internal/logger/LocalizedLoggerWrapper.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/logger/LocalizedLoggerWrapper.java rename to src/java.base/share/classes/jdk/internal/logger/LocalizedLoggerWrapper.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java b/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java rename to src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/LoggerWrapper.java b/src/java.base/share/classes/jdk/internal/logger/LoggerWrapper.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/logger/LoggerWrapper.java rename to src/java.base/share/classes/jdk/internal/logger/LoggerWrapper.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/SimpleConsoleLogger.java b/src/java.base/share/classes/jdk/internal/logger/SimpleConsoleLogger.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/logger/SimpleConsoleLogger.java rename to src/java.base/share/classes/jdk/internal/logger/SimpleConsoleLogger.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/SurrogateLogger.java b/src/java.base/share/classes/jdk/internal/logger/SurrogateLogger.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/logger/SurrogateLogger.java rename to src/java.base/share/classes/jdk/internal/logger/SurrogateLogger.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/package-info.java b/src/java.base/share/classes/jdk/internal/logger/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/logger/package-info.java rename to src/java.base/share/classes/jdk/internal/logger/package-info.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/math/DoubleConsts.java b/src/java.base/share/classes/jdk/internal/math/DoubleConsts.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/math/DoubleConsts.java rename to src/java.base/share/classes/jdk/internal/math/DoubleConsts.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/math/FDBigInteger.java b/src/java.base/share/classes/jdk/internal/math/FDBigInteger.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/math/FDBigInteger.java rename to src/java.base/share/classes/jdk/internal/math/FDBigInteger.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/math/FloatConsts.java b/src/java.base/share/classes/jdk/internal/math/FloatConsts.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/math/FloatConsts.java rename to src/java.base/share/classes/jdk/internal/math/FloatConsts.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/math/FloatingDecimal.java b/src/java.base/share/classes/jdk/internal/math/FloatingDecimal.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/math/FloatingDecimal.java rename to src/java.base/share/classes/jdk/internal/math/FloatingDecimal.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/math/FormattedFloatingDecimal.java b/src/java.base/share/classes/jdk/internal/math/FormattedFloatingDecimal.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/math/FormattedFloatingDecimal.java rename to src/java.base/share/classes/jdk/internal/math/FormattedFloatingDecimal.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java b/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java rename to src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaAWTAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaAWTAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaAWTAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaAWTAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaAWTFontAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaAWTFontAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaAWTFontAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaAWTFontAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaBeansAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaBeansAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaBeansAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaBeansAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaIOAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaIOAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaIOAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaIOAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaIOFileDescriptorAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaIOFileDescriptorAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaIOFileDescriptorAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaIOFileDescriptorAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaIOFilePermissionAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaIOFilePermissionAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaIOFilePermissionAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaIOFilePermissionAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaIORandomAccessFileAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaIORandomAccessFileAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaIORandomAccessFileAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaIORandomAccessFileAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangInvokeAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaLangInvokeAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangInvokeAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaLangInvokeAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangRefAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaLangRefAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangRefAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaLangRefAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetHttpCookieAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaNetHttpCookieAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetHttpCookieAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaNetHttpCookieAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetInetAddressAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaNetInetAddressAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetInetAddressAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaNetInetAddressAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetSocketAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaNetSocketAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetSocketAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaNetSocketAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetURLAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaNetURLAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetURLAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaNetURLAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetURLClassLoaderAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaNetURLClassLoaderAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetURLClassLoaderAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaNetURLClassLoaderAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetUriAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaNetUriAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetUriAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaNetUriAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNioAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaNioAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaNioAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaNioAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaObjectInputFilterAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaObjectInputFilterAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaObjectInputFilterAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaObjectInputFilterAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaObjectInputStreamAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaObjectInputStreamAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaObjectInputStreamAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaObjectInputStreamAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaSecurityAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaSecurityAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaSecurityAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaSecurityAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaSecurityProtectionDomainAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaSecurityProtectionDomainAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaSecurityProtectionDomainAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaSecurityProtectionDomainAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaUtilJarAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaUtilJarAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaUtilJarAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaUtilJarAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaUtilResourceBundleAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaUtilResourceBundleAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaUtilResourceBundleAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaUtilResourceBundleAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaUtilZipFileAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaUtilZipFileAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/JavaUtilZipFileAccess.java rename to src/java.base/share/classes/jdk/internal/misc/JavaUtilZipFileAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/ObjectStreamClassValidator.java b/src/java.base/share/classes/jdk/internal/misc/ObjectStreamClassValidator.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/ObjectStreamClassValidator.java rename to src/java.base/share/classes/jdk/internal/misc/ObjectStreamClassValidator.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java b/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java rename to src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/Signal.java b/src/java.base/share/classes/jdk/internal/misc/Signal.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/Signal.java rename to src/java.base/share/classes/jdk/internal/misc/Signal.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java b/src/java.base/share/classes/jdk/internal/misc/Unsafe.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java rename to src/java.base/share/classes/jdk/internal/misc/Unsafe.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/VM.java b/src/java.base/share/classes/jdk/internal/misc/VM.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/VM.java rename to src/java.base/share/classes/jdk/internal/misc/VM.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/VMNotification.java b/src/java.base/share/classes/jdk/internal/misc/VMNotification.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/misc/VMNotification.java rename to src/java.base/share/classes/jdk/internal/misc/VMNotification.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/Builder.java b/src/java.base/share/classes/jdk/internal/module/Builder.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/Builder.java rename to src/java.base/share/classes/jdk/internal/module/Builder.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/Checks.java b/src/java.base/share/classes/jdk/internal/module/Checks.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/Checks.java rename to src/java.base/share/classes/jdk/internal/module/Checks.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java b/src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java rename to src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ClassFileConstants.java b/src/java.base/share/classes/jdk/internal/module/ClassFileConstants.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ClassFileConstants.java rename to src/java.base/share/classes/jdk/internal/module/ClassFileConstants.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/DefaultRoots.java b/src/java.base/share/classes/jdk/internal/module/DefaultRoots.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/DefaultRoots.java rename to src/java.base/share/classes/jdk/internal/module/DefaultRoots.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ExplodedSystemModules.java b/src/java.base/share/classes/jdk/internal/module/ExplodedSystemModules.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ExplodedSystemModules.java rename to src/java.base/share/classes/jdk/internal/module/ExplodedSystemModules.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/IllegalAccessLogger.java b/src/java.base/share/classes/jdk/internal/module/IllegalAccessLogger.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/IllegalAccessLogger.java rename to src/java.base/share/classes/jdk/internal/module/IllegalAccessLogger.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/IllegalAccessMaps.java b/src/java.base/share/classes/jdk/internal/module/IllegalAccessMaps.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/IllegalAccessMaps.java rename to src/java.base/share/classes/jdk/internal/module/IllegalAccessMaps.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java rename to src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java b/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java rename to src/java.base/share/classes/jdk/internal/module/ModuleHashes.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java b/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java rename to src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java b/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java rename to src/java.base/share/classes/jdk/internal/module/ModuleInfo.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java b/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java rename to src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java b/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java rename to src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java b/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java rename to src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java b/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java rename to src/java.base/share/classes/jdk/internal/module/ModulePatcher.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModulePath.java b/src/java.base/share/classes/jdk/internal/module/ModulePath.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModulePath.java rename to src/java.base/share/classes/jdk/internal/module/ModulePath.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferenceImpl.java b/src/java.base/share/classes/jdk/internal/module/ModuleReferenceImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferenceImpl.java rename to src/java.base/share/classes/jdk/internal/module/ModuleReferenceImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java b/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java rename to src/java.base/share/classes/jdk/internal/module/ModuleReferences.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleResolution.java b/src/java.base/share/classes/jdk/internal/module/ModuleResolution.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModuleResolution.java rename to src/java.base/share/classes/jdk/internal/module/ModuleResolution.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleTarget.java b/src/java.base/share/classes/jdk/internal/module/ModuleTarget.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ModuleTarget.java rename to src/java.base/share/classes/jdk/internal/module/ModuleTarget.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/Modules.java b/src/java.base/share/classes/jdk/internal/module/Modules.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/Modules.java rename to src/java.base/share/classes/jdk/internal/module/Modules.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/Resources.java b/src/java.base/share/classes/jdk/internal/module/Resources.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/Resources.java rename to src/java.base/share/classes/jdk/internal/module/Resources.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ServicesCatalog.java b/src/java.base/share/classes/jdk/internal/module/ServicesCatalog.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/ServicesCatalog.java rename to src/java.base/share/classes/jdk/internal/module/ServicesCatalog.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java b/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java rename to src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java b/src/java.base/share/classes/jdk/internal/module/SystemModules.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java rename to src/java.base/share/classes/jdk/internal/module/SystemModules.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/SystemModulesMap.java b/src/java.base/share/classes/jdk/internal/module/SystemModulesMap.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/SystemModulesMap.java rename to src/java.base/share/classes/jdk/internal/module/SystemModulesMap.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/jdk8_packages.dat b/src/java.base/share/classes/jdk/internal/module/jdk8_packages.dat similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/module/jdk8_packages.dat rename to src/java.base/share/classes/jdk/internal/module/jdk8_packages.dat diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnnotationRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnnotationRemapper.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnnotationRemapper.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnnotationRemapper.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ClassRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ClassRemapper.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ClassRemapper.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ClassRemapper.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/FieldRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/FieldRemapper.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/FieldRemapper.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/FieldRemapper.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SignatureRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SignatureRemapper.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SignatureRemapper.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SignatureRemapper.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt rename to src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/Attributes.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/Attributes.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/Attributes.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/Attributes.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/ContentHandler.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/ContentHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/ContentHandler.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/ContentHandler.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/DTDHandler.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/DTDHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/DTDHandler.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/DTDHandler.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/EntityResolver.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/EntityResolver.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/EntityResolver.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/EntityResolver.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/ErrorHandler.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/ErrorHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/ErrorHandler.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/ErrorHandler.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/InputSource.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/InputSource.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/InputSource.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/InputSource.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/Locator.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/Locator.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/Locator.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/Locator.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXException.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXException.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXException.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/SAXException.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXNotRecognizedException.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXNotRecognizedException.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXNotRecognizedException.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/SAXNotRecognizedException.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXNotSupportedException.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXNotSupportedException.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXNotSupportedException.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/SAXNotSupportedException.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXParseException.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXParseException.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXParseException.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/SAXParseException.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/XMLReader.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/XMLReader.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/XMLReader.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/XMLReader.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java rename to src/java.base/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/perf/Perf.java b/src/java.base/share/classes/jdk/internal/perf/Perf.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/perf/Perf.java rename to src/java.base/share/classes/jdk/internal/perf/Perf.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java b/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java rename to src/java.base/share/classes/jdk/internal/perf/PerfCounter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/ref/Cleaner.java b/src/java.base/share/classes/jdk/internal/ref/Cleaner.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/ref/Cleaner.java rename to src/java.base/share/classes/jdk/internal/ref/Cleaner.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/ref/CleanerFactory.java b/src/java.base/share/classes/jdk/internal/ref/CleanerFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/ref/CleanerFactory.java rename to src/java.base/share/classes/jdk/internal/ref/CleanerFactory.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java b/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java rename to src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java b/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java rename to src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/ref/SoftCleanable.java b/src/java.base/share/classes/jdk/internal/ref/SoftCleanable.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/ref/SoftCleanable.java rename to src/java.base/share/classes/jdk/internal/ref/SoftCleanable.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/ref/WeakCleanable.java b/src/java.base/share/classes/jdk/internal/ref/WeakCleanable.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/ref/WeakCleanable.java rename to src/java.base/share/classes/jdk/internal/ref/WeakCleanable.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/AccessorGenerator.java b/src/java.base/share/classes/jdk/internal/reflect/AccessorGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/AccessorGenerator.java rename to src/java.base/share/classes/jdk/internal/reflect/AccessorGenerator.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/BootstrapConstructorAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/BootstrapConstructorAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/BootstrapConstructorAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/BootstrapConstructorAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/ByteVector.java b/src/java.base/share/classes/jdk/internal/reflect/ByteVector.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/ByteVector.java rename to src/java.base/share/classes/jdk/internal/reflect/ByteVector.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/ByteVectorFactory.java b/src/java.base/share/classes/jdk/internal/reflect/ByteVectorFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/ByteVectorFactory.java rename to src/java.base/share/classes/jdk/internal/reflect/ByteVectorFactory.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/ByteVectorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/ByteVectorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/ByteVectorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/ByteVectorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/CallerSensitive.java b/src/java.base/share/classes/jdk/internal/reflect/CallerSensitive.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/CallerSensitive.java rename to src/java.base/share/classes/jdk/internal/reflect/CallerSensitive.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/ClassDefiner.java b/src/java.base/share/classes/jdk/internal/reflect/ClassDefiner.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/ClassDefiner.java rename to src/java.base/share/classes/jdk/internal/reflect/ClassDefiner.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/ClassFileAssembler.java b/src/java.base/share/classes/jdk/internal/reflect/ClassFileAssembler.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/ClassFileAssembler.java rename to src/java.base/share/classes/jdk/internal/reflect/ClassFileAssembler.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/ClassFileConstants.java b/src/java.base/share/classes/jdk/internal/reflect/ClassFileConstants.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/ClassFileConstants.java rename to src/java.base/share/classes/jdk/internal/reflect/ClassFileConstants.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/ConstantPool.java b/src/java.base/share/classes/jdk/internal/reflect/ConstantPool.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/ConstantPool.java rename to src/java.base/share/classes/jdk/internal/reflect/ConstantPool.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/ConstructorAccessor.java b/src/java.base/share/classes/jdk/internal/reflect/ConstructorAccessor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/ConstructorAccessor.java rename to src/java.base/share/classes/jdk/internal/reflect/ConstructorAccessor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/ConstructorAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/ConstructorAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/ConstructorAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/ConstructorAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/DelegatingConstructorAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/DelegatingConstructorAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/DelegatingConstructorAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/DelegatingConstructorAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/DelegatingMethodAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/DelegatingMethodAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/DelegatingMethodAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/DelegatingMethodAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/FieldAccessor.java b/src/java.base/share/classes/jdk/internal/reflect/FieldAccessor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/FieldAccessor.java rename to src/java.base/share/classes/jdk/internal/reflect/FieldAccessor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/FieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/FieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/FieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/FieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/InstantiationExceptionConstructorAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/InstantiationExceptionConstructorAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/InstantiationExceptionConstructorAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/InstantiationExceptionConstructorAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/Label.java b/src/java.base/share/classes/jdk/internal/reflect/Label.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/Label.java rename to src/java.base/share/classes/jdk/internal/reflect/Label.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/LangReflectAccess.java b/src/java.base/share/classes/jdk/internal/reflect/LangReflectAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/LangReflectAccess.java rename to src/java.base/share/classes/jdk/internal/reflect/LangReflectAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/MagicAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/MagicAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/MagicAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/MagicAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/MethodAccessor.java b/src/java.base/share/classes/jdk/internal/reflect/MethodAccessor.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/MethodAccessor.java rename to src/java.base/share/classes/jdk/internal/reflect/MethodAccessor.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorGenerator.java b/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorGenerator.java rename to src/java.base/share/classes/jdk/internal/reflect/MethodAccessorGenerator.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/MethodAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/NativeConstructorAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/NativeConstructorAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/NativeConstructorAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/NativeConstructorAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/NativeMethodAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/NativeMethodAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/NativeMethodAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/NativeMethodAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/Reflection.java b/src/java.base/share/classes/jdk/internal/reflect/Reflection.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/Reflection.java rename to src/java.base/share/classes/jdk/internal/reflect/Reflection.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java rename to src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/SerializationConstructorAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/SerializationConstructorAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/SerializationConstructorAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/SerializationConstructorAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/SignatureIterator.java b/src/java.base/share/classes/jdk/internal/reflect/SignatureIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/SignatureIterator.java rename to src/java.base/share/classes/jdk/internal/reflect/SignatureIterator.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UTF8.java b/src/java.base/share/classes/jdk/internal/reflect/UTF8.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UTF8.java rename to src/java.base/share/classes/jdk/internal/reflect/UTF8.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeBooleanFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeBooleanFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeBooleanFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeBooleanFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeByteFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeByteFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeByteFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeByteFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeCharacterFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeCharacterFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeCharacterFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeCharacterFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeDoubleFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeDoubleFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeDoubleFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeDoubleFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeFieldAccessorFactory.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeFieldAccessorFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeFieldAccessorFactory.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeFieldAccessorFactory.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeFloatFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeFloatFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeFloatFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeFloatFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeIntegerFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeIntegerFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeIntegerFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeIntegerFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeLongFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeLongFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeLongFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeLongFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeObjectFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeObjectFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeObjectFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeObjectFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedByteFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedByteFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedByteFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedByteFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedLongFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedLongFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedLongFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedLongFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedShortFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedShortFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedShortFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedShortFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticDoubleFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticDoubleFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticDoubleFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticDoubleFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeShortFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeShortFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeShortFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeShortFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticBooleanFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticBooleanFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticBooleanFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticBooleanFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticByteFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticByteFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticByteFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticByteFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticCharacterFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticCharacterFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticCharacterFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticCharacterFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticDoubleFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticDoubleFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticDoubleFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticDoubleFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticFloatFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticFloatFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticFloatFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticFloatFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticIntegerFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticIntegerFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticIntegerFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticIntegerFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticLongFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticLongFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticLongFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticLongFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticObjectFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticObjectFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticObjectFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticObjectFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticShortFieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticShortFieldAccessorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticShortFieldAccessorImpl.java rename to src/java.base/share/classes/jdk/internal/reflect/UnsafeStaticShortFieldAccessorImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/Preconditions.java b/src/java.base/share/classes/jdk/internal/util/Preconditions.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/Preconditions.java rename to src/java.base/share/classes/jdk/internal/util/Preconditions.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/jar/InvalidJarIndexError.java b/src/java.base/share/classes/jdk/internal/util/jar/InvalidJarIndexError.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/jar/InvalidJarIndexError.java rename to src/java.base/share/classes/jdk/internal/util/jar/InvalidJarIndexError.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/jar/JarIndex.java b/src/java.base/share/classes/jdk/internal/util/jar/JarIndex.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/jar/JarIndex.java rename to src/java.base/share/classes/jdk/internal/util/jar/JarIndex.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/jar/VersionedStream.java b/src/java.base/share/classes/jdk/internal/util/jar/VersionedStream.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/jar/VersionedStream.java rename to src/java.base/share/classes/jdk/internal/util/jar/VersionedStream.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java b/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java rename to src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/SAXParser.java b/src/java.base/share/classes/jdk/internal/util/xml/SAXParser.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/SAXParser.java rename to src/java.base/share/classes/jdk/internal/util/xml/SAXParser.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamException.java b/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamException.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamException.java rename to src/java.base/share/classes/jdk/internal/util/xml/XMLStreamException.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java b/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java rename to src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Attrs.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/Attrs.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Attrs.java rename to src/java.base/share/classes/jdk/internal/util/xml/impl/Attrs.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Input.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/Input.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Input.java rename to src/java.base/share/classes/jdk/internal/util/xml/impl/Input.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Pair.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/Pair.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Pair.java rename to src/java.base/share/classes/jdk/internal/util/xml/impl/Pair.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java rename to src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java rename to src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ReaderUTF16.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/ReaderUTF16.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ReaderUTF16.java rename to src/java.base/share/classes/jdk/internal/util/xml/impl/ReaderUTF16.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ReaderUTF8.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/ReaderUTF8.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ReaderUTF8.java rename to src/java.base/share/classes/jdk/internal/util/xml/impl/ReaderUTF8.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/SAXParserImpl.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/SAXParserImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/SAXParserImpl.java rename to src/java.base/share/classes/jdk/internal/util/xml/impl/SAXParserImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java rename to src/java.base/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLWriter.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLWriter.java rename to src/java.base/share/classes/jdk/internal/util/xml/impl/XMLWriter.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/vm/VMSupport.java b/src/java.base/share/classes/jdk/internal/vm/VMSupport.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/vm/VMSupport.java rename to src/java.base/share/classes/jdk/internal/vm/VMSupport.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/vm/annotation/Contended.java b/src/java.base/share/classes/jdk/internal/vm/annotation/Contended.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/vm/annotation/Contended.java rename to src/java.base/share/classes/jdk/internal/vm/annotation/Contended.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/vm/annotation/DontInline.java b/src/java.base/share/classes/jdk/internal/vm/annotation/DontInline.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/vm/annotation/DontInline.java rename to src/java.base/share/classes/jdk/internal/vm/annotation/DontInline.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/vm/annotation/ForceInline.java b/src/java.base/share/classes/jdk/internal/vm/annotation/ForceInline.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/vm/annotation/ForceInline.java rename to src/java.base/share/classes/jdk/internal/vm/annotation/ForceInline.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/vm/annotation/ReservedStackAccess.java b/src/java.base/share/classes/jdk/internal/vm/annotation/ReservedStackAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/vm/annotation/ReservedStackAccess.java rename to src/java.base/share/classes/jdk/internal/vm/annotation/ReservedStackAccess.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/vm/annotation/Stable.java b/src/java.base/share/classes/jdk/internal/vm/annotation/Stable.java similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/vm/annotation/Stable.java rename to src/java.base/share/classes/jdk/internal/vm/annotation/Stable.java diff --git a/jdk/src/java.base/share/classes/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat b/src/java.base/share/classes/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat similarity index 100% rename from jdk/src/java.base/share/classes/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat rename to src/java.base/share/classes/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat diff --git a/jdk/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java similarity index 100% rename from jdk/src/java.base/share/classes/module-info.java rename to src/java.base/share/classes/module-info.java diff --git a/jdk/src/java.base/share/classes/sun/invoke/WrapperInstance.java b/src/java.base/share/classes/sun/invoke/WrapperInstance.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/invoke/WrapperInstance.java rename to src/java.base/share/classes/sun/invoke/WrapperInstance.java diff --git a/jdk/src/java.base/share/classes/sun/invoke/empty/Empty.java b/src/java.base/share/classes/sun/invoke/empty/Empty.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/invoke/empty/Empty.java rename to src/java.base/share/classes/sun/invoke/empty/Empty.java diff --git a/jdk/src/java.base/share/classes/sun/invoke/package-info.java b/src/java.base/share/classes/sun/invoke/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/invoke/package-info.java rename to src/java.base/share/classes/sun/invoke/package-info.java diff --git a/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java b/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java rename to src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java diff --git a/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeName.java b/src/java.base/share/classes/sun/invoke/util/BytecodeName.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/invoke/util/BytecodeName.java rename to src/java.base/share/classes/sun/invoke/util/BytecodeName.java diff --git a/jdk/src/java.base/share/classes/sun/invoke/util/ValueConversions.java b/src/java.base/share/classes/sun/invoke/util/ValueConversions.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/invoke/util/ValueConversions.java rename to src/java.base/share/classes/sun/invoke/util/ValueConversions.java diff --git a/jdk/src/java.base/share/classes/sun/invoke/util/VerifyAccess.java b/src/java.base/share/classes/sun/invoke/util/VerifyAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/invoke/util/VerifyAccess.java rename to src/java.base/share/classes/sun/invoke/util/VerifyAccess.java diff --git a/jdk/src/java.base/share/classes/sun/invoke/util/VerifyType.java b/src/java.base/share/classes/sun/invoke/util/VerifyType.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/invoke/util/VerifyType.java rename to src/java.base/share/classes/sun/invoke/util/VerifyType.java diff --git a/jdk/src/java.base/share/classes/sun/invoke/util/Wrapper.java b/src/java.base/share/classes/sun/invoke/util/Wrapper.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/invoke/util/Wrapper.java rename to src/java.base/share/classes/sun/invoke/util/Wrapper.java diff --git a/jdk/src/java.base/share/classes/sun/invoke/util/package-info.java b/src/java.base/share/classes/sun/invoke/util/package-info.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/invoke/util/package-info.java rename to src/java.base/share/classes/sun/invoke/util/package-info.java diff --git a/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java b/src/java.base/share/classes/sun/launcher/LauncherHelper.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java rename to src/java.base/share/classes/sun/launcher/LauncherHelper.java diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties b/src/java.base/share/classes/sun/launcher/resources/launcher.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties rename to src/java.base/share/classes/sun/launcher/resources/launcher.properties diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties rename to src/java.base/share/classes/sun/launcher/resources/launcher_de.properties diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_es.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_es.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/launcher/resources/launcher_es.properties rename to src/java.base/share/classes/sun/launcher/resources/launcher_es.properties diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_fr.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_fr.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/launcher/resources/launcher_fr.properties rename to src/java.base/share/classes/sun/launcher/resources/launcher_fr.properties diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_it.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_it.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/launcher/resources/launcher_it.properties rename to src/java.base/share/classes/sun/launcher/resources/launcher_it.properties diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties rename to src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_ko.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_ko.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/launcher/resources/launcher_ko.properties rename to src/java.base/share/classes/sun/launcher/resources/launcher_ko.properties diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_pt_BR.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_pt_BR.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/launcher/resources/launcher_pt_BR.properties rename to src/java.base/share/classes/sun/launcher/resources/launcher_pt_BR.properties diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_sv.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_sv.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/launcher/resources/launcher_sv.properties rename to src/java.base/share/classes/sun/launcher/resources/launcher_sv.properties diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties rename to src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_zh_TW.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_TW.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/launcher/resources/launcher_zh_TW.properties rename to src/java.base/share/classes/sun/launcher/resources/launcher_zh_TW.properties diff --git a/jdk/src/java.base/share/classes/sun/net/ApplicationProxy.java b/src/java.base/share/classes/sun/net/ApplicationProxy.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ApplicationProxy.java rename to src/java.base/share/classes/sun/net/ApplicationProxy.java diff --git a/jdk/src/java.base/share/classes/sun/net/ConnectionResetException.java b/src/java.base/share/classes/sun/net/ConnectionResetException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ConnectionResetException.java rename to src/java.base/share/classes/sun/net/ConnectionResetException.java diff --git a/jdk/src/java.base/share/classes/sun/net/InetAddressCachePolicy.java b/src/java.base/share/classes/sun/net/InetAddressCachePolicy.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/InetAddressCachePolicy.java rename to src/java.base/share/classes/sun/net/InetAddressCachePolicy.java diff --git a/jdk/src/java.base/share/classes/sun/net/NetProperties.java b/src/java.base/share/classes/sun/net/NetProperties.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/NetProperties.java rename to src/java.base/share/classes/sun/net/NetProperties.java diff --git a/jdk/src/java.base/share/classes/sun/net/NetworkClient.java b/src/java.base/share/classes/sun/net/NetworkClient.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/NetworkClient.java rename to src/java.base/share/classes/sun/net/NetworkClient.java diff --git a/jdk/src/java.base/share/classes/sun/net/NetworkServer.java b/src/java.base/share/classes/sun/net/NetworkServer.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/NetworkServer.java rename to src/java.base/share/classes/sun/net/NetworkServer.java diff --git a/jdk/src/java.base/share/classes/sun/net/ProgressEvent.java b/src/java.base/share/classes/sun/net/ProgressEvent.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ProgressEvent.java rename to src/java.base/share/classes/sun/net/ProgressEvent.java diff --git a/jdk/src/java.base/share/classes/sun/net/ProgressListener.java b/src/java.base/share/classes/sun/net/ProgressListener.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ProgressListener.java rename to src/java.base/share/classes/sun/net/ProgressListener.java diff --git a/jdk/src/java.base/share/classes/sun/net/ProgressMeteringPolicy.java b/src/java.base/share/classes/sun/net/ProgressMeteringPolicy.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ProgressMeteringPolicy.java rename to src/java.base/share/classes/sun/net/ProgressMeteringPolicy.java diff --git a/jdk/src/java.base/share/classes/sun/net/ProgressMonitor.java b/src/java.base/share/classes/sun/net/ProgressMonitor.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ProgressMonitor.java rename to src/java.base/share/classes/sun/net/ProgressMonitor.java diff --git a/jdk/src/java.base/share/classes/sun/net/ProgressSource.java b/src/java.base/share/classes/sun/net/ProgressSource.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ProgressSource.java rename to src/java.base/share/classes/sun/net/ProgressSource.java diff --git a/jdk/src/java.base/share/classes/sun/net/RegisteredDomain.java b/src/java.base/share/classes/sun/net/RegisteredDomain.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/RegisteredDomain.java rename to src/java.base/share/classes/sun/net/RegisteredDomain.java diff --git a/jdk/src/java.base/share/classes/sun/net/ResourceManager.java b/src/java.base/share/classes/sun/net/ResourceManager.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ResourceManager.java rename to src/java.base/share/classes/sun/net/ResourceManager.java diff --git a/jdk/src/java.base/share/classes/sun/net/SocksProxy.java b/src/java.base/share/classes/sun/net/SocksProxy.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/SocksProxy.java rename to src/java.base/share/classes/sun/net/SocksProxy.java diff --git a/jdk/src/java.base/share/classes/sun/net/TelnetInputStream.java b/src/java.base/share/classes/sun/net/TelnetInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/TelnetInputStream.java rename to src/java.base/share/classes/sun/net/TelnetInputStream.java diff --git a/jdk/src/java.base/share/classes/sun/net/TelnetOutputStream.java b/src/java.base/share/classes/sun/net/TelnetOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/TelnetOutputStream.java rename to src/java.base/share/classes/sun/net/TelnetOutputStream.java diff --git a/jdk/src/java.base/share/classes/sun/net/TelnetProtocolException.java b/src/java.base/share/classes/sun/net/TelnetProtocolException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/TelnetProtocolException.java rename to src/java.base/share/classes/sun/net/TelnetProtocolException.java diff --git a/jdk/src/java.base/share/classes/sun/net/TransferProtocolClient.java b/src/java.base/share/classes/sun/net/TransferProtocolClient.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/TransferProtocolClient.java rename to src/java.base/share/classes/sun/net/TransferProtocolClient.java diff --git a/jdk/src/java.base/share/classes/sun/net/URLCanonicalizer.java b/src/java.base/share/classes/sun/net/URLCanonicalizer.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/URLCanonicalizer.java rename to src/java.base/share/classes/sun/net/URLCanonicalizer.java diff --git a/jdk/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java b/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java rename to src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java diff --git a/jdk/src/java.base/share/classes/sun/net/ext/ExtendedSocketOptions.java b/src/java.base/share/classes/sun/net/ext/ExtendedSocketOptions.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ext/ExtendedSocketOptions.java rename to src/java.base/share/classes/sun/net/ext/ExtendedSocketOptions.java diff --git a/jdk/src/java.base/share/classes/sun/net/ftp/FtpClient.java b/src/java.base/share/classes/sun/net/ftp/FtpClient.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ftp/FtpClient.java rename to src/java.base/share/classes/sun/net/ftp/FtpClient.java diff --git a/jdk/src/java.base/share/classes/sun/net/ftp/FtpClientProvider.java b/src/java.base/share/classes/sun/net/ftp/FtpClientProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ftp/FtpClientProvider.java rename to src/java.base/share/classes/sun/net/ftp/FtpClientProvider.java diff --git a/jdk/src/java.base/share/classes/sun/net/ftp/FtpDirEntry.java b/src/java.base/share/classes/sun/net/ftp/FtpDirEntry.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ftp/FtpDirEntry.java rename to src/java.base/share/classes/sun/net/ftp/FtpDirEntry.java diff --git a/jdk/src/java.base/share/classes/sun/net/ftp/FtpDirParser.java b/src/java.base/share/classes/sun/net/ftp/FtpDirParser.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ftp/FtpDirParser.java rename to src/java.base/share/classes/sun/net/ftp/FtpDirParser.java diff --git a/jdk/src/java.base/share/classes/sun/net/ftp/FtpLoginException.java b/src/java.base/share/classes/sun/net/ftp/FtpLoginException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ftp/FtpLoginException.java rename to src/java.base/share/classes/sun/net/ftp/FtpLoginException.java diff --git a/jdk/src/java.base/share/classes/sun/net/ftp/FtpProtocolException.java b/src/java.base/share/classes/sun/net/ftp/FtpProtocolException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ftp/FtpProtocolException.java rename to src/java.base/share/classes/sun/net/ftp/FtpProtocolException.java diff --git a/jdk/src/java.base/share/classes/sun/net/ftp/FtpReplyCode.java b/src/java.base/share/classes/sun/net/ftp/FtpReplyCode.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ftp/FtpReplyCode.java rename to src/java.base/share/classes/sun/net/ftp/FtpReplyCode.java diff --git a/jdk/src/java.base/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java b/src/java.base/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java rename to src/java.base/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java diff --git a/jdk/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java b/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java rename to src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java diff --git a/jdk/src/java.base/share/classes/sun/net/idn/Punycode.java b/src/java.base/share/classes/sun/net/idn/Punycode.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/idn/Punycode.java rename to src/java.base/share/classes/sun/net/idn/Punycode.java diff --git a/jdk/src/java.base/share/classes/sun/net/idn/StringPrep.java b/src/java.base/share/classes/sun/net/idn/StringPrep.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/idn/StringPrep.java rename to src/java.base/share/classes/sun/net/idn/StringPrep.java diff --git a/jdk/src/java.base/share/classes/sun/net/idn/StringPrepDataReader.java b/src/java.base/share/classes/sun/net/idn/StringPrepDataReader.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/idn/StringPrepDataReader.java rename to src/java.base/share/classes/sun/net/idn/StringPrepDataReader.java diff --git a/jdk/src/java.base/share/classes/sun/net/idn/UCharacterDirection.java b/src/java.base/share/classes/sun/net/idn/UCharacterDirection.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/idn/UCharacterDirection.java rename to src/java.base/share/classes/sun/net/idn/UCharacterDirection.java diff --git a/jdk/src/java.base/share/classes/sun/net/idn/UCharacterEnums.java b/src/java.base/share/classes/sun/net/idn/UCharacterEnums.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/idn/UCharacterEnums.java rename to src/java.base/share/classes/sun/net/idn/UCharacterEnums.java diff --git a/jdk/src/java.base/share/classes/sun/net/idn/uidna.spp b/src/java.base/share/classes/sun/net/idn/uidna.spp similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/idn/uidna.spp rename to src/java.base/share/classes/sun/net/idn/uidna.spp diff --git a/jdk/src/java.base/share/classes/sun/net/sdp/SdpSupport.java b/src/java.base/share/classes/sun/net/sdp/SdpSupport.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/sdp/SdpSupport.java rename to src/java.base/share/classes/sun/net/sdp/SdpSupport.java diff --git a/jdk/src/java.base/share/classes/sun/net/smtp/SmtpClient.java b/src/java.base/share/classes/sun/net/smtp/SmtpClient.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/smtp/SmtpClient.java rename to src/java.base/share/classes/sun/net/smtp/SmtpClient.java diff --git a/jdk/src/java.base/share/classes/sun/net/smtp/SmtpProtocolException.java b/src/java.base/share/classes/sun/net/smtp/SmtpProtocolException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/smtp/SmtpProtocolException.java rename to src/java.base/share/classes/sun/net/smtp/SmtpProtocolException.java diff --git a/jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java b/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java rename to src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java diff --git a/jdk/src/java.base/share/classes/sun/net/util/IPAddressUtil.java b/src/java.base/share/classes/sun/net/util/IPAddressUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/util/IPAddressUtil.java rename to src/java.base/share/classes/sun/net/util/IPAddressUtil.java diff --git a/jdk/src/java.base/share/classes/sun/net/util/URLUtil.java b/src/java.base/share/classes/sun/net/util/URLUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/util/URLUtil.java rename to src/java.base/share/classes/sun/net/util/URLUtil.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/ApplicationLaunchException.java b/src/java.base/share/classes/sun/net/www/ApplicationLaunchException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/ApplicationLaunchException.java rename to src/java.base/share/classes/sun/net/www/ApplicationLaunchException.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/HeaderParser.java b/src/java.base/share/classes/sun/net/www/HeaderParser.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/HeaderParser.java rename to src/java.base/share/classes/sun/net/www/HeaderParser.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/MessageHeader.java b/src/java.base/share/classes/sun/net/www/MessageHeader.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/MessageHeader.java rename to src/java.base/share/classes/sun/net/www/MessageHeader.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/MeteredStream.java b/src/java.base/share/classes/sun/net/www/MeteredStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/MeteredStream.java rename to src/java.base/share/classes/sun/net/www/MeteredStream.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/MimeEntry.java b/src/java.base/share/classes/sun/net/www/MimeEntry.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/MimeEntry.java rename to src/java.base/share/classes/sun/net/www/MimeEntry.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/MimeLauncher.java b/src/java.base/share/classes/sun/net/www/MimeLauncher.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/MimeLauncher.java rename to src/java.base/share/classes/sun/net/www/MimeLauncher.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/MimeTable.java b/src/java.base/share/classes/sun/net/www/MimeTable.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/MimeTable.java rename to src/java.base/share/classes/sun/net/www/MimeTable.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java b/src/java.base/share/classes/sun/net/www/ParseUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java rename to src/java.base/share/classes/sun/net/www/ParseUtil.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/URLConnection.java b/src/java.base/share/classes/sun/net/www/URLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/URLConnection.java rename to src/java.base/share/classes/sun/net/www/URLConnection.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/content/text/Generic.java b/src/java.base/share/classes/sun/net/www/content/text/Generic.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/content/text/Generic.java rename to src/java.base/share/classes/sun/net/www/content/text/Generic.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/content/text/PlainTextInputStream.java b/src/java.base/share/classes/sun/net/www/content/text/PlainTextInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/content/text/PlainTextInputStream.java rename to src/java.base/share/classes/sun/net/www/content/text/PlainTextInputStream.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/content/text/plain.java b/src/java.base/share/classes/sun/net/www/content/text/plain.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/content/text/plain.java rename to src/java.base/share/classes/sun/net/www/content/text/plain.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java b/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java rename to src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/ChunkedOutputStream.java b/src/java.base/share/classes/sun/net/www/http/ChunkedOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/http/ChunkedOutputStream.java rename to src/java.base/share/classes/sun/net/www/http/ChunkedOutputStream.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/HttpCapture.java b/src/java.base/share/classes/sun/net/www/http/HttpCapture.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/http/HttpCapture.java rename to src/java.base/share/classes/sun/net/www/http/HttpCapture.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/HttpCaptureInputStream.java b/src/java.base/share/classes/sun/net/www/http/HttpCaptureInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/http/HttpCaptureInputStream.java rename to src/java.base/share/classes/sun/net/www/http/HttpCaptureInputStream.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/HttpCaptureOutputStream.java b/src/java.base/share/classes/sun/net/www/http/HttpCaptureOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/http/HttpCaptureOutputStream.java rename to src/java.base/share/classes/sun/net/www/http/HttpCaptureOutputStream.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java b/src/java.base/share/classes/sun/net/www/http/HttpClient.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java rename to src/java.base/share/classes/sun/net/www/http/HttpClient.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/Hurryable.java b/src/java.base/share/classes/sun/net/www/http/Hurryable.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/http/Hurryable.java rename to src/java.base/share/classes/sun/net/www/http/Hurryable.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveCache.java b/src/java.base/share/classes/sun/net/www/http/KeepAliveCache.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveCache.java rename to src/java.base/share/classes/sun/net/www/http/KeepAliveCache.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveCleanerEntry.java b/src/java.base/share/classes/sun/net/www/http/KeepAliveCleanerEntry.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveCleanerEntry.java rename to src/java.base/share/classes/sun/net/www/http/KeepAliveCleanerEntry.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveStream.java b/src/java.base/share/classes/sun/net/www/http/KeepAliveStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveStream.java rename to src/java.base/share/classes/sun/net/www/http/KeepAliveStream.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java b/src/java.base/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java rename to src/java.base/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/PosterOutputStream.java b/src/java.base/share/classes/sun/net/www/http/PosterOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/http/PosterOutputStream.java rename to src/java.base/share/classes/sun/net/www/http/PosterOutputStream.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java rename to src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java rename to src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/ftp/Handler.java b/src/java.base/share/classes/sun/net/www/protocol/ftp/Handler.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/ftp/Handler.java rename to src/java.base/share/classes/sun/net/www/protocol/ftp/Handler.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCache.java b/src/java.base/share/classes/sun/net/www/protocol/http/AuthCache.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCache.java rename to src/java.base/share/classes/sun/net/www/protocol/http/AuthCache.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java b/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java rename to src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java b/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java rename to src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthScheme.java b/src/java.base/share/classes/sun/net/www/protocol/http/AuthScheme.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthScheme.java rename to src/java.base/share/classes/sun/net/www/protocol/http/AuthScheme.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java b/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java rename to src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java b/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java rename to src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticatorKeys.java b/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticatorKeys.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticatorKeys.java rename to src/java.base/share/classes/sun/net/www/protocol/http/AuthenticatorKeys.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/BasicAuthentication.java b/src/java.base/share/classes/sun/net/www/protocol/http/BasicAuthentication.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/BasicAuthentication.java rename to src/java.base/share/classes/sun/net/www/protocol/http/BasicAuthentication.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java b/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java rename to src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/Handler.java b/src/java.base/share/classes/sun/net/www/protocol/http/Handler.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/Handler.java rename to src/java.base/share/classes/sun/net/www/protocol/http/Handler.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java b/src/java.base/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java rename to src/java.base/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java b/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java rename to src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java rename to src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java b/src/java.base/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java rename to src/java.base/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java b/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java rename to src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java b/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java rename to src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java b/src/java.base/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java rename to src/java.base/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java rename to src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java rename to src/java.base/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/Handler.java b/src/java.base/share/classes/sun/net/www/protocol/https/Handler.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/https/Handler.java rename to src/java.base/share/classes/sun/net/www/protocol/https/Handler.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java rename to src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java rename to src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/Handler.java b/src/java.base/share/classes/sun/net/www/protocol/jar/Handler.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/jar/Handler.java rename to src/java.base/share/classes/sun/net/www/protocol/jar/Handler.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java rename to src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java b/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java rename to src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFileCallBack.java b/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFileCallBack.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFileCallBack.java rename to src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFileCallBack.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/jmod/Handler.java b/src/java.base/share/classes/sun/net/www/protocol/jmod/Handler.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/jmod/Handler.java rename to src/java.base/share/classes/sun/net/www/protocol/jmod/Handler.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/jrt/Handler.java b/src/java.base/share/classes/sun/net/www/protocol/jrt/Handler.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/jrt/Handler.java rename to src/java.base/share/classes/sun/net/www/protocol/jrt/Handler.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/jrt/JavaRuntimeURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/jrt/JavaRuntimeURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/jrt/JavaRuntimeURLConnection.java rename to src/java.base/share/classes/sun/net/www/protocol/jrt/JavaRuntimeURLConnection.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/mailto/Handler.java b/src/java.base/share/classes/sun/net/www/protocol/mailto/Handler.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/mailto/Handler.java rename to src/java.base/share/classes/sun/net/www/protocol/mailto/Handler.java diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/mailto/MailToURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/mailto/MailToURLConnection.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/net/www/protocol/mailto/MailToURLConnection.java rename to src/java.base/share/classes/sun/net/www/protocol/mailto/MailToURLConnection.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ByteBuffered.java b/src/java.base/share/classes/sun/nio/ByteBuffered.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ByteBuffered.java rename to src/java.base/share/classes/sun/nio/ByteBuffered.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java b/src/java.base/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java rename to src/java.base/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java b/src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java rename to src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/AllocatedNativeObject.java b/src/java.base/share/classes/sun/nio/ch/AllocatedNativeObject.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/AllocatedNativeObject.java rename to src/java.base/share/classes/sun/nio/ch/AllocatedNativeObject.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java rename to src/java.base/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java rename to src/java.base/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java rename to src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java rename to src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/Cancellable.java b/src/java.base/share/classes/sun/nio/ch/Cancellable.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/Cancellable.java rename to src/java.base/share/classes/sun/nio/ch/Cancellable.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java b/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java rename to src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/CompletedFuture.java b/src/java.base/share/classes/sun/nio/ch/CompletedFuture.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/CompletedFuture.java rename to src/java.base/share/classes/sun/nio/ch/CompletedFuture.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java rename to src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java b/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java rename to src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/DirectBuffer.java b/src/java.base/share/classes/sun/nio/ch/DirectBuffer.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/DirectBuffer.java rename to src/java.base/share/classes/sun/nio/ch/DirectBuffer.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/ExtendedSocketOption.java b/src/java.base/share/classes/sun/nio/ch/ExtendedSocketOption.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/ExtendedSocketOption.java rename to src/java.base/share/classes/sun/nio/ch/ExtendedSocketOption.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java rename to src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/FileDispatcher.java b/src/java.base/share/classes/sun/nio/ch/FileDispatcher.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/FileDispatcher.java rename to src/java.base/share/classes/sun/nio/ch/FileDispatcher.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/FileLockImpl.java b/src/java.base/share/classes/sun/nio/ch/FileLockImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/FileLockImpl.java rename to src/java.base/share/classes/sun/nio/ch/FileLockImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/FileLockTable.java b/src/java.base/share/classes/sun/nio/ch/FileLockTable.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/FileLockTable.java rename to src/java.base/share/classes/sun/nio/ch/FileLockTable.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/Groupable.java b/src/java.base/share/classes/sun/nio/ch/Groupable.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/Groupable.java rename to src/java.base/share/classes/sun/nio/ch/Groupable.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/IOStatus.java b/src/java.base/share/classes/sun/nio/ch/IOStatus.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/IOStatus.java rename to src/java.base/share/classes/sun/nio/ch/IOStatus.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/IOUtil.java b/src/java.base/share/classes/sun/nio/ch/IOUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/IOUtil.java rename to src/java.base/share/classes/sun/nio/ch/IOUtil.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/IOVecWrapper.java b/src/java.base/share/classes/sun/nio/ch/IOVecWrapper.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/IOVecWrapper.java rename to src/java.base/share/classes/sun/nio/ch/IOVecWrapper.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/Interruptible.java b/src/java.base/share/classes/sun/nio/ch/Interruptible.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/Interruptible.java rename to src/java.base/share/classes/sun/nio/ch/Interruptible.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/Invoker.java b/src/java.base/share/classes/sun/nio/ch/Invoker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/Invoker.java rename to src/java.base/share/classes/sun/nio/ch/Invoker.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/MembershipKeyImpl.java b/src/java.base/share/classes/sun/nio/ch/MembershipKeyImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/MembershipKeyImpl.java rename to src/java.base/share/classes/sun/nio/ch/MembershipKeyImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/MembershipRegistry.java b/src/java.base/share/classes/sun/nio/ch/MembershipRegistry.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/MembershipRegistry.java rename to src/java.base/share/classes/sun/nio/ch/MembershipRegistry.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java b/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java rename to src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/NativeObject.java b/src/java.base/share/classes/sun/nio/ch/NativeObject.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/NativeObject.java rename to src/java.base/share/classes/sun/nio/ch/NativeObject.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/NativeThreadSet.java b/src/java.base/share/classes/sun/nio/ch/NativeThreadSet.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/NativeThreadSet.java rename to src/java.base/share/classes/sun/nio/ch/NativeThreadSet.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/Net.java b/src/java.base/share/classes/sun/nio/ch/Net.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/Net.java rename to src/java.base/share/classes/sun/nio/ch/Net.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/OptionKey.java b/src/java.base/share/classes/sun/nio/ch/OptionKey.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/OptionKey.java rename to src/java.base/share/classes/sun/nio/ch/OptionKey.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/PendingFuture.java b/src/java.base/share/classes/sun/nio/ch/PendingFuture.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/PendingFuture.java rename to src/java.base/share/classes/sun/nio/ch/PendingFuture.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/PollSelectorProvider.java b/src/java.base/share/classes/sun/nio/ch/PollSelectorProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/PollSelectorProvider.java rename to src/java.base/share/classes/sun/nio/ch/PollSelectorProvider.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/Reflect.java b/src/java.base/share/classes/sun/nio/ch/Reflect.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/Reflect.java rename to src/java.base/share/classes/sun/nio/ch/Reflect.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/Secrets.java b/src/java.base/share/classes/sun/nio/ch/Secrets.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/Secrets.java rename to src/java.base/share/classes/sun/nio/ch/Secrets.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/SelChImpl.java b/src/java.base/share/classes/sun/nio/ch/SelChImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/SelChImpl.java rename to src/java.base/share/classes/sun/nio/ch/SelChImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java b/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java rename to src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java b/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java rename to src/java.base/share/classes/sun/nio/ch/SelectorImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/SelectorProviderImpl.java b/src/java.base/share/classes/sun/nio/ch/SelectorProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/SelectorProviderImpl.java rename to src/java.base/share/classes/sun/nio/ch/SelectorProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/ServerSocketAdaptor.java b/src/java.base/share/classes/sun/nio/ch/ServerSocketAdaptor.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/ServerSocketAdaptor.java rename to src/java.base/share/classes/sun/nio/ch/ServerSocketAdaptor.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java rename to src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java rename to src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java b/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java rename to src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java rename to src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template b/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template rename to src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/ThreadPool.java b/src/java.base/share/classes/sun/nio/ch/ThreadPool.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/ThreadPool.java rename to src/java.base/share/classes/sun/nio/ch/ThreadPool.java diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/Util.java b/src/java.base/share/classes/sun/nio/ch/Util.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/ch/Util.java rename to src/java.base/share/classes/sun/nio/ch/Util.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/ArrayDecoder.java b/src/java.base/share/classes/sun/nio/cs/ArrayDecoder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/ArrayDecoder.java rename to src/java.base/share/classes/sun/nio/cs/ArrayDecoder.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/ArrayEncoder.java b/src/java.base/share/classes/sun/nio/cs/ArrayEncoder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/ArrayEncoder.java rename to src/java.base/share/classes/sun/nio/cs/ArrayEncoder.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/CESU_8.java b/src/java.base/share/classes/sun/nio/cs/CESU_8.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/CESU_8.java rename to src/java.base/share/classes/sun/nio/cs/CESU_8.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java b/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java rename to src/java.base/share/classes/sun/nio/cs/CharsetMapping.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/DelegatableDecoder.java b/src/java.base/share/classes/sun/nio/cs/DelegatableDecoder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/DelegatableDecoder.java rename to src/java.base/share/classes/sun/nio/cs/DelegatableDecoder.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/DoubleByte.java b/src/java.base/share/classes/sun/nio/cs/DoubleByte.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/DoubleByte.java rename to src/java.base/share/classes/sun/nio/cs/DoubleByte.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java b/src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java rename to src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/HKSCS.java b/src/java.base/share/classes/sun/nio/cs/HKSCS.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/HKSCS.java rename to src/java.base/share/classes/sun/nio/cs/HKSCS.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/HistoricallyNamedCharset.java b/src/java.base/share/classes/sun/nio/cs/HistoricallyNamedCharset.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/HistoricallyNamedCharset.java rename to src/java.base/share/classes/sun/nio/cs/HistoricallyNamedCharset.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java b/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java rename to src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/SingleByte.java b/src/java.base/share/classes/sun/nio/cs/SingleByte.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/SingleByte.java rename to src/java.base/share/classes/sun/nio/cs/SingleByte.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template b/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template rename to src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/StreamDecoder.java b/src/java.base/share/classes/sun/nio/cs/StreamDecoder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/StreamDecoder.java rename to src/java.base/share/classes/sun/nio/cs/StreamDecoder.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/StreamEncoder.java b/src/java.base/share/classes/sun/nio/cs/StreamEncoder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/StreamEncoder.java rename to src/java.base/share/classes/sun/nio/cs/StreamEncoder.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/StringUTF16.java b/src/java.base/share/classes/sun/nio/cs/StringUTF16.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/StringUTF16.java rename to src/java.base/share/classes/sun/nio/cs/StringUTF16.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/Surrogate.java b/src/java.base/share/classes/sun/nio/cs/Surrogate.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/Surrogate.java rename to src/java.base/share/classes/sun/nio/cs/Surrogate.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java b/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java rename to src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/US_ASCII.java b/src/java.base/share/classes/sun/nio/cs/US_ASCII.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/US_ASCII.java rename to src/java.base/share/classes/sun/nio/cs/US_ASCII.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UTF_16.java b/src/java.base/share/classes/sun/nio/cs/UTF_16.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UTF_16.java rename to src/java.base/share/classes/sun/nio/cs/UTF_16.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UTF_16BE.java b/src/java.base/share/classes/sun/nio/cs/UTF_16BE.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UTF_16BE.java rename to src/java.base/share/classes/sun/nio/cs/UTF_16BE.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UTF_16LE.java b/src/java.base/share/classes/sun/nio/cs/UTF_16LE.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UTF_16LE.java rename to src/java.base/share/classes/sun/nio/cs/UTF_16LE.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UTF_16LE_BOM.java b/src/java.base/share/classes/sun/nio/cs/UTF_16LE_BOM.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UTF_16LE_BOM.java rename to src/java.base/share/classes/sun/nio/cs/UTF_16LE_BOM.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UTF_32.java b/src/java.base/share/classes/sun/nio/cs/UTF_32.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UTF_32.java rename to src/java.base/share/classes/sun/nio/cs/UTF_32.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UTF_32BE.java b/src/java.base/share/classes/sun/nio/cs/UTF_32BE.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UTF_32BE.java rename to src/java.base/share/classes/sun/nio/cs/UTF_32BE.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UTF_32BE_BOM.java b/src/java.base/share/classes/sun/nio/cs/UTF_32BE_BOM.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UTF_32BE_BOM.java rename to src/java.base/share/classes/sun/nio/cs/UTF_32BE_BOM.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UTF_32Coder.java b/src/java.base/share/classes/sun/nio/cs/UTF_32Coder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UTF_32Coder.java rename to src/java.base/share/classes/sun/nio/cs/UTF_32Coder.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UTF_32LE.java b/src/java.base/share/classes/sun/nio/cs/UTF_32LE.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UTF_32LE.java rename to src/java.base/share/classes/sun/nio/cs/UTF_32LE.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UTF_32LE_BOM.java b/src/java.base/share/classes/sun/nio/cs/UTF_32LE_BOM.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UTF_32LE_BOM.java rename to src/java.base/share/classes/sun/nio/cs/UTF_32LE_BOM.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UTF_8.java b/src/java.base/share/classes/sun/nio/cs/UTF_8.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UTF_8.java rename to src/java.base/share/classes/sun/nio/cs/UTF_8.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/Unicode.java b/src/java.base/share/classes/sun/nio/cs/Unicode.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/Unicode.java rename to src/java.base/share/classes/sun/nio/cs/Unicode.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UnicodeDecoder.java b/src/java.base/share/classes/sun/nio/cs/UnicodeDecoder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UnicodeDecoder.java rename to src/java.base/share/classes/sun/nio/cs/UnicodeDecoder.java diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/UnicodeEncoder.java b/src/java.base/share/classes/sun/nio/cs/UnicodeEncoder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/cs/UnicodeEncoder.java rename to src/java.base/share/classes/sun/nio/cs/UnicodeEncoder.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java b/src/java.base/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java rename to src/java.base/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java b/src/java.base/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java rename to src/java.base/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileSystemProvider.java b/src/java.base/share/classes/sun/nio/fs/AbstractFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileSystemProvider.java rename to src/java.base/share/classes/sun/nio/fs/AbstractFileSystemProvider.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java b/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java rename to src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/AbstractPoller.java b/src/java.base/share/classes/sun/nio/fs/AbstractPoller.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/AbstractPoller.java rename to src/java.base/share/classes/sun/nio/fs/AbstractPoller.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java b/src/java.base/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java rename to src/java.base/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/AbstractWatchKey.java b/src/java.base/share/classes/sun/nio/fs/AbstractWatchKey.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/AbstractWatchKey.java rename to src/java.base/share/classes/sun/nio/fs/AbstractWatchKey.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/AbstractWatchService.java b/src/java.base/share/classes/sun/nio/fs/AbstractWatchService.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/AbstractWatchService.java rename to src/java.base/share/classes/sun/nio/fs/AbstractWatchService.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/BasicFileAttributesHolder.java b/src/java.base/share/classes/sun/nio/fs/BasicFileAttributesHolder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/BasicFileAttributesHolder.java rename to src/java.base/share/classes/sun/nio/fs/BasicFileAttributesHolder.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/Cancellable.java b/src/java.base/share/classes/sun/nio/fs/Cancellable.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/Cancellable.java rename to src/java.base/share/classes/sun/nio/fs/Cancellable.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/DynamicFileAttributeView.java b/src/java.base/share/classes/sun/nio/fs/DynamicFileAttributeView.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/DynamicFileAttributeView.java rename to src/java.base/share/classes/sun/nio/fs/DynamicFileAttributeView.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java b/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java rename to src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java b/src/java.base/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java rename to src/java.base/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/Globs.java b/src/java.base/share/classes/sun/nio/fs/Globs.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/Globs.java rename to src/java.base/share/classes/sun/nio/fs/Globs.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/NativeBuffer.java b/src/java.base/share/classes/sun/nio/fs/NativeBuffer.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/NativeBuffer.java rename to src/java.base/share/classes/sun/nio/fs/NativeBuffer.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/NativeBuffers.java b/src/java.base/share/classes/sun/nio/fs/NativeBuffers.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/NativeBuffers.java rename to src/java.base/share/classes/sun/nio/fs/NativeBuffers.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java b/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java rename to src/java.base/share/classes/sun/nio/fs/PollingWatchService.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/Reflect.java b/src/java.base/share/classes/sun/nio/fs/Reflect.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/Reflect.java rename to src/java.base/share/classes/sun/nio/fs/Reflect.java diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/Util.java b/src/java.base/share/classes/sun/nio/fs/Util.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/nio/fs/Util.java rename to src/java.base/share/classes/sun/nio/fs/Util.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java rename to src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java rename to src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java rename to src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationSupport.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotationSupport.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationSupport.java rename to src/java.base/share/classes/sun/reflect/annotation/AnnotationSupport.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java rename to src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java rename to src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java b/src/java.base/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java rename to src/java.base/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/ExceptionProxy.java b/src/java.base/share/classes/sun/reflect/annotation/ExceptionProxy.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/annotation/ExceptionProxy.java rename to src/java.base/share/classes/sun/reflect/annotation/ExceptionProxy.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotation.java b/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotation.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotation.java rename to src/java.base/share/classes/sun/reflect/annotation/TypeAnnotation.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java b/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java rename to src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java b/src/java.base/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java rename to src/java.base/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java b/src/java.base/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java rename to src/java.base/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/factory/GenericsFactory.java b/src/java.base/share/classes/sun/reflect/generics/factory/GenericsFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/factory/GenericsFactory.java rename to src/java.base/share/classes/sun/reflect/generics/factory/GenericsFactory.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/parser/SignatureParser.java b/src/java.base/share/classes/sun/reflect/generics/parser/SignatureParser.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/parser/SignatureParser.java rename to src/java.base/share/classes/sun/reflect/generics/parser/SignatureParser.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java b/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java rename to src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java b/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java rename to src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java b/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java rename to src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java b/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java rename to src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java b/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java rename to src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java b/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java rename to src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/repository/AbstractRepository.java b/src/java.base/share/classes/sun/reflect/generics/repository/AbstractRepository.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/repository/AbstractRepository.java rename to src/java.base/share/classes/sun/reflect/generics/repository/AbstractRepository.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/repository/ClassRepository.java b/src/java.base/share/classes/sun/reflect/generics/repository/ClassRepository.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/repository/ClassRepository.java rename to src/java.base/share/classes/sun/reflect/generics/repository/ClassRepository.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/repository/ConstructorRepository.java b/src/java.base/share/classes/sun/reflect/generics/repository/ConstructorRepository.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/repository/ConstructorRepository.java rename to src/java.base/share/classes/sun/reflect/generics/repository/ConstructorRepository.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/repository/FieldRepository.java b/src/java.base/share/classes/sun/reflect/generics/repository/FieldRepository.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/repository/FieldRepository.java rename to src/java.base/share/classes/sun/reflect/generics/repository/FieldRepository.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java b/src/java.base/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java rename to src/java.base/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/repository/MethodRepository.java b/src/java.base/share/classes/sun/reflect/generics/repository/MethodRepository.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/repository/MethodRepository.java rename to src/java.base/share/classes/sun/reflect/generics/repository/MethodRepository.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/scope/AbstractScope.java b/src/java.base/share/classes/sun/reflect/generics/scope/AbstractScope.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/scope/AbstractScope.java rename to src/java.base/share/classes/sun/reflect/generics/scope/AbstractScope.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/scope/ClassScope.java b/src/java.base/share/classes/sun/reflect/generics/scope/ClassScope.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/scope/ClassScope.java rename to src/java.base/share/classes/sun/reflect/generics/scope/ClassScope.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/scope/ConstructorScope.java b/src/java.base/share/classes/sun/reflect/generics/scope/ConstructorScope.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/scope/ConstructorScope.java rename to src/java.base/share/classes/sun/reflect/generics/scope/ConstructorScope.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/scope/DummyScope.java b/src/java.base/share/classes/sun/reflect/generics/scope/DummyScope.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/scope/DummyScope.java rename to src/java.base/share/classes/sun/reflect/generics/scope/DummyScope.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/scope/MethodScope.java b/src/java.base/share/classes/sun/reflect/generics/scope/MethodScope.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/scope/MethodScope.java rename to src/java.base/share/classes/sun/reflect/generics/scope/MethodScope.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/scope/Scope.java b/src/java.base/share/classes/sun/reflect/generics/scope/Scope.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/scope/Scope.java rename to src/java.base/share/classes/sun/reflect/generics/scope/Scope.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/BaseType.java b/src/java.base/share/classes/sun/reflect/generics/tree/BaseType.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/BaseType.java rename to src/java.base/share/classes/sun/reflect/generics/tree/BaseType.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/BooleanSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/BooleanSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/BooleanSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/BooleanSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/BottomSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/BottomSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/BottomSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/BottomSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/ByteSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/ByteSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/ByteSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/ByteSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/CharSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/CharSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/CharSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/CharSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/ClassSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/ClassSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/ClassSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/ClassSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/DoubleSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/DoubleSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/DoubleSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/DoubleSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/FieldTypeSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/FieldTypeSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/FieldTypeSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/FieldTypeSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/FloatSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/FloatSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/FloatSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/FloatSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java b/src/java.base/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java rename to src/java.base/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/IntSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/IntSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/IntSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/IntSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/LongSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/LongSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/LongSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/LongSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/ReturnType.java b/src/java.base/share/classes/sun/reflect/generics/tree/ReturnType.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/ReturnType.java rename to src/java.base/share/classes/sun/reflect/generics/tree/ReturnType.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/ShortSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/ShortSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/ShortSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/ShortSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/Signature.java b/src/java.base/share/classes/sun/reflect/generics/tree/Signature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/Signature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/Signature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/Tree.java b/src/java.base/share/classes/sun/reflect/generics/tree/Tree.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/Tree.java rename to src/java.base/share/classes/sun/reflect/generics/tree/Tree.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeArgument.java b/src/java.base/share/classes/sun/reflect/generics/tree/TypeArgument.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeArgument.java rename to src/java.base/share/classes/sun/reflect/generics/tree/TypeArgument.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/TypeSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/TypeSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeTree.java b/src/java.base/share/classes/sun/reflect/generics/tree/TypeTree.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeTree.java rename to src/java.base/share/classes/sun/reflect/generics/tree/TypeTree.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java b/src/java.base/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java rename to src/java.base/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/VoidDescriptor.java b/src/java.base/share/classes/sun/reflect/generics/tree/VoidDescriptor.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/VoidDescriptor.java rename to src/java.base/share/classes/sun/reflect/generics/tree/VoidDescriptor.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/tree/Wildcard.java b/src/java.base/share/classes/sun/reflect/generics/tree/Wildcard.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/tree/Wildcard.java rename to src/java.base/share/classes/sun/reflect/generics/tree/Wildcard.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/visitor/Reifier.java b/src/java.base/share/classes/sun/reflect/generics/visitor/Reifier.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/visitor/Reifier.java rename to src/java.base/share/classes/sun/reflect/generics/visitor/Reifier.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/visitor/TypeTreeVisitor.java b/src/java.base/share/classes/sun/reflect/generics/visitor/TypeTreeVisitor.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/visitor/TypeTreeVisitor.java rename to src/java.base/share/classes/sun/reflect/generics/visitor/TypeTreeVisitor.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/generics/visitor/Visitor.java b/src/java.base/share/classes/sun/reflect/generics/visitor/Visitor.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/generics/visitor/Visitor.java rename to src/java.base/share/classes/sun/reflect/generics/visitor/Visitor.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/misc/ConstructorUtil.java b/src/java.base/share/classes/sun/reflect/misc/ConstructorUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/misc/ConstructorUtil.java rename to src/java.base/share/classes/sun/reflect/misc/ConstructorUtil.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/misc/FieldUtil.java b/src/java.base/share/classes/sun/reflect/misc/FieldUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/misc/FieldUtil.java rename to src/java.base/share/classes/sun/reflect/misc/FieldUtil.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/misc/MethodUtil.java b/src/java.base/share/classes/sun/reflect/misc/MethodUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/misc/MethodUtil.java rename to src/java.base/share/classes/sun/reflect/misc/MethodUtil.java diff --git a/jdk/src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java b/src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java rename to src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java diff --git a/jdk/src/java.base/share/classes/sun/security/action/GetBooleanAction.java b/src/java.base/share/classes/sun/security/action/GetBooleanAction.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/action/GetBooleanAction.java rename to src/java.base/share/classes/sun/security/action/GetBooleanAction.java diff --git a/jdk/src/java.base/share/classes/sun/security/action/GetIntegerAction.java b/src/java.base/share/classes/sun/security/action/GetIntegerAction.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/action/GetIntegerAction.java rename to src/java.base/share/classes/sun/security/action/GetIntegerAction.java diff --git a/jdk/src/java.base/share/classes/sun/security/action/GetLongAction.java b/src/java.base/share/classes/sun/security/action/GetLongAction.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/action/GetLongAction.java rename to src/java.base/share/classes/sun/security/action/GetLongAction.java diff --git a/jdk/src/java.base/share/classes/sun/security/action/GetPropertyAction.java b/src/java.base/share/classes/sun/security/action/GetPropertyAction.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/action/GetPropertyAction.java rename to src/java.base/share/classes/sun/security/action/GetPropertyAction.java diff --git a/jdk/src/java.base/share/classes/sun/security/action/OpenFileInputStreamAction.java b/src/java.base/share/classes/sun/security/action/OpenFileInputStreamAction.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/action/OpenFileInputStreamAction.java rename to src/java.base/share/classes/sun/security/action/OpenFileInputStreamAction.java diff --git a/jdk/src/java.base/share/classes/sun/security/action/PutAllAction.java b/src/java.base/share/classes/sun/security/action/PutAllAction.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/action/PutAllAction.java rename to src/java.base/share/classes/sun/security/action/PutAllAction.java diff --git a/jdk/src/java.base/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java b/src/java.base/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java rename to src/java.base/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java diff --git a/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java b/src/java.base/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java rename to src/java.base/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java diff --git a/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java b/src/java.base/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java rename to src/java.base/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java diff --git a/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java b/src/java.base/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java rename to src/java.base/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java diff --git a/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java b/src/java.base/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java rename to src/java.base/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java diff --git a/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java b/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java rename to src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java diff --git a/jdk/src/java.base/share/classes/sun/security/jca/GetInstance.java b/src/java.base/share/classes/sun/security/jca/GetInstance.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/jca/GetInstance.java rename to src/java.base/share/classes/sun/security/jca/GetInstance.java diff --git a/jdk/src/java.base/share/classes/sun/security/jca/JCAUtil.java b/src/java.base/share/classes/sun/security/jca/JCAUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/jca/JCAUtil.java rename to src/java.base/share/classes/sun/security/jca/JCAUtil.java diff --git a/jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java b/src/java.base/share/classes/sun/security/jca/ProviderConfig.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java rename to src/java.base/share/classes/sun/security/jca/ProviderConfig.java diff --git a/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java b/src/java.base/share/classes/sun/security/jca/ProviderList.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java rename to src/java.base/share/classes/sun/security/jca/ProviderList.java diff --git a/jdk/src/java.base/share/classes/sun/security/jca/Providers.java b/src/java.base/share/classes/sun/security/jca/Providers.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/jca/Providers.java rename to src/java.base/share/classes/sun/security/jca/Providers.java diff --git a/jdk/src/java.base/share/classes/sun/security/jca/ServiceId.java b/src/java.base/share/classes/sun/security/jca/ServiceId.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/jca/ServiceId.java rename to src/java.base/share/classes/sun/security/jca/ServiceId.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java b/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java rename to src/java.base/share/classes/sun/security/pkcs/ContentInfo.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java b/src/java.base/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java rename to src/java.base/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS7.java b/src/java.base/share/classes/sun/security/pkcs/PKCS7.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs/PKCS7.java rename to src/java.base/share/classes/sun/security/pkcs/PKCS7.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java b/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java rename to src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java b/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java rename to src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attributes.java b/src/java.base/share/classes/sun/security/pkcs/PKCS9Attributes.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attributes.java rename to src/java.base/share/classes/sun/security/pkcs/PKCS9Attributes.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/ParsingException.java b/src/java.base/share/classes/sun/security/pkcs/ParsingException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs/ParsingException.java rename to src/java.base/share/classes/sun/security/pkcs/ParsingException.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java b/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java rename to src/java.base/share/classes/sun/security/pkcs/SignerInfo.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/SigningCertificateInfo.java b/src/java.base/share/classes/sun/security/pkcs/SigningCertificateInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs/SigningCertificateInfo.java rename to src/java.base/share/classes/sun/security/pkcs/SigningCertificateInfo.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10.java b/src/java.base/share/classes/sun/security/pkcs10/PKCS10.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10.java rename to src/java.base/share/classes/sun/security/pkcs10/PKCS10.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10Attribute.java b/src/java.base/share/classes/sun/security/pkcs10/PKCS10Attribute.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10Attribute.java rename to src/java.base/share/classes/sun/security/pkcs10/PKCS10Attribute.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10Attributes.java b/src/java.base/share/classes/sun/security/pkcs10/PKCS10Attributes.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10Attributes.java rename to src/java.base/share/classes/sun/security/pkcs10/PKCS10Attributes.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs12/MacData.java b/src/java.base/share/classes/sun/security/pkcs12/MacData.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs12/MacData.java rename to src/java.base/share/classes/sun/security/pkcs12/MacData.java diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java b/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java rename to src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/AbstractDrbg.java b/src/java.base/share/classes/sun/security/provider/AbstractDrbg.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/AbstractDrbg.java rename to src/java.base/share/classes/sun/security/provider/AbstractDrbg.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/AbstractHashDrbg.java b/src/java.base/share/classes/sun/security/provider/AbstractHashDrbg.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/AbstractHashDrbg.java rename to src/java.base/share/classes/sun/security/provider/AbstractHashDrbg.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java b/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java rename to src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java b/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java rename to src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/ConfigFile.java b/src/java.base/share/classes/sun/security/provider/ConfigFile.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/ConfigFile.java rename to src/java.base/share/classes/sun/security/provider/ConfigFile.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/CtrDrbg.java b/src/java.base/share/classes/sun/security/provider/CtrDrbg.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/CtrDrbg.java rename to src/java.base/share/classes/sun/security/provider/CtrDrbg.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/DRBG.java b/src/java.base/share/classes/sun/security/provider/DRBG.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/DRBG.java rename to src/java.base/share/classes/sun/security/provider/DRBG.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/DSA.java b/src/java.base/share/classes/sun/security/provider/DSA.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/DSA.java rename to src/java.base/share/classes/sun/security/provider/DSA.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/DSAKeyFactory.java b/src/java.base/share/classes/sun/security/provider/DSAKeyFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/DSAKeyFactory.java rename to src/java.base/share/classes/sun/security/provider/DSAKeyFactory.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/DSAKeyPairGenerator.java b/src/java.base/share/classes/sun/security/provider/DSAKeyPairGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/DSAKeyPairGenerator.java rename to src/java.base/share/classes/sun/security/provider/DSAKeyPairGenerator.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/DSAParameterGenerator.java b/src/java.base/share/classes/sun/security/provider/DSAParameterGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/DSAParameterGenerator.java rename to src/java.base/share/classes/sun/security/provider/DSAParameterGenerator.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/DSAParameters.java b/src/java.base/share/classes/sun/security/provider/DSAParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/DSAParameters.java rename to src/java.base/share/classes/sun/security/provider/DSAParameters.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/DSAPrivateKey.java b/src/java.base/share/classes/sun/security/provider/DSAPrivateKey.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/DSAPrivateKey.java rename to src/java.base/share/classes/sun/security/provider/DSAPrivateKey.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/DSAPublicKey.java b/src/java.base/share/classes/sun/security/provider/DSAPublicKey.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/DSAPublicKey.java rename to src/java.base/share/classes/sun/security/provider/DSAPublicKey.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/DSAPublicKeyImpl.java b/src/java.base/share/classes/sun/security/provider/DSAPublicKeyImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/DSAPublicKeyImpl.java rename to src/java.base/share/classes/sun/security/provider/DSAPublicKeyImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/DigestBase.java b/src/java.base/share/classes/sun/security/provider/DigestBase.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/DigestBase.java rename to src/java.base/share/classes/sun/security/provider/DigestBase.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/DomainKeyStore.java b/src/java.base/share/classes/sun/security/provider/DomainKeyStore.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/DomainKeyStore.java rename to src/java.base/share/classes/sun/security/provider/DomainKeyStore.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/EntropySource.java b/src/java.base/share/classes/sun/security/provider/EntropySource.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/EntropySource.java rename to src/java.base/share/classes/sun/security/provider/EntropySource.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/FileInputStreamPool.java b/src/java.base/share/classes/sun/security/provider/FileInputStreamPool.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/FileInputStreamPool.java rename to src/java.base/share/classes/sun/security/provider/FileInputStreamPool.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/HashDrbg.java b/src/java.base/share/classes/sun/security/provider/HashDrbg.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/HashDrbg.java rename to src/java.base/share/classes/sun/security/provider/HashDrbg.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/HmacDrbg.java b/src/java.base/share/classes/sun/security/provider/HmacDrbg.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/HmacDrbg.java rename to src/java.base/share/classes/sun/security/provider/HmacDrbg.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java b/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java rename to src/java.base/share/classes/sun/security/provider/JavaKeyStore.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/KeyProtector.java b/src/java.base/share/classes/sun/security/provider/KeyProtector.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/KeyProtector.java rename to src/java.base/share/classes/sun/security/provider/KeyProtector.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/MD2.java b/src/java.base/share/classes/sun/security/provider/MD2.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/MD2.java rename to src/java.base/share/classes/sun/security/provider/MD2.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/MD4.java b/src/java.base/share/classes/sun/security/provider/MD4.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/MD4.java rename to src/java.base/share/classes/sun/security/provider/MD4.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/MD5.java b/src/java.base/share/classes/sun/security/provider/MD5.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/MD5.java rename to src/java.base/share/classes/sun/security/provider/MD5.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/MoreDrbgParameters.java b/src/java.base/share/classes/sun/security/provider/MoreDrbgParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/MoreDrbgParameters.java rename to src/java.base/share/classes/sun/security/provider/MoreDrbgParameters.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/ParameterCache.java b/src/java.base/share/classes/sun/security/provider/ParameterCache.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/ParameterCache.java rename to src/java.base/share/classes/sun/security/provider/ParameterCache.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java b/src/java.base/share/classes/sun/security/provider/PolicyFile.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java rename to src/java.base/share/classes/sun/security/provider/PolicyFile.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java b/src/java.base/share/classes/sun/security/provider/PolicyParser.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java rename to src/java.base/share/classes/sun/security/provider/PolicyParser.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/PolicySpiFile.java b/src/java.base/share/classes/sun/security/provider/PolicySpiFile.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/PolicySpiFile.java rename to src/java.base/share/classes/sun/security/provider/PolicySpiFile.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SHA.java b/src/java.base/share/classes/sun/security/provider/SHA.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/SHA.java rename to src/java.base/share/classes/sun/security/provider/SHA.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SHA2.java b/src/java.base/share/classes/sun/security/provider/SHA2.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/SHA2.java rename to src/java.base/share/classes/sun/security/provider/SHA2.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SHA3.java b/src/java.base/share/classes/sun/security/provider/SHA3.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/SHA3.java rename to src/java.base/share/classes/sun/security/provider/SHA3.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SHA5.java b/src/java.base/share/classes/sun/security/provider/SHA5.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/SHA5.java rename to src/java.base/share/classes/sun/security/provider/SHA5.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java b/src/java.base/share/classes/sun/security/provider/SecureRandom.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java rename to src/java.base/share/classes/sun/security/provider/SecureRandom.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SeedGenerator.java b/src/java.base/share/classes/sun/security/provider/SeedGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/SeedGenerator.java rename to src/java.base/share/classes/sun/security/provider/SeedGenerator.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SubjectCodeSource.java b/src/java.base/share/classes/sun/security/provider/SubjectCodeSource.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/SubjectCodeSource.java rename to src/java.base/share/classes/sun/security/provider/SubjectCodeSource.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/Sun.java b/src/java.base/share/classes/sun/security/provider/Sun.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/Sun.java rename to src/java.base/share/classes/sun/security/provider/Sun.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SunEntries.java b/src/java.base/share/classes/sun/security/provider/SunEntries.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/SunEntries.java rename to src/java.base/share/classes/sun/security/provider/SunEntries.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/VerificationProvider.java b/src/java.base/share/classes/sun/security/provider/VerificationProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/VerificationProvider.java rename to src/java.base/share/classes/sun/security/provider/VerificationProvider.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java b/src/java.base/share/classes/sun/security/provider/X509Factory.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java rename to src/java.base/share/classes/sun/security/provider/X509Factory.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java b/src/java.base/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java rename to src/java.base/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/AdjacencyList.java b/src/java.base/share/classes/sun/security/provider/certpath/AdjacencyList.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/AdjacencyList.java rename to src/java.base/share/classes/sun/security/provider/certpath/AdjacencyList.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java b/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java rename to src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/BasicChecker.java b/src/java.base/share/classes/sun/security/provider/certpath/BasicChecker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/BasicChecker.java rename to src/java.base/share/classes/sun/security/provider/certpath/BasicChecker.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/BuildStep.java b/src/java.base/share/classes/sun/security/provider/certpath/BuildStep.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/BuildStep.java rename to src/java.base/share/classes/sun/security/provider/certpath/BuildStep.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/Builder.java b/src/java.base/share/classes/sun/security/provider/certpath/Builder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/Builder.java rename to src/java.base/share/classes/sun/security/provider/certpath/Builder.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/CertId.java b/src/java.base/share/classes/sun/security/provider/certpath/CertId.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/CertId.java rename to src/java.base/share/classes/sun/security/provider/certpath/CertId.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/CertPathHelper.java b/src/java.base/share/classes/sun/security/provider/certpath/CertPathHelper.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/CertPathHelper.java rename to src/java.base/share/classes/sun/security/provider/certpath/CertPathHelper.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/CollectionCertStore.java b/src/java.base/share/classes/sun/security/provider/certpath/CollectionCertStore.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/CollectionCertStore.java rename to src/java.base/share/classes/sun/security/provider/certpath/CollectionCertStore.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/ConstraintsChecker.java b/src/java.base/share/classes/sun/security/provider/certpath/ConstraintsChecker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/ConstraintsChecker.java rename to src/java.base/share/classes/sun/security/provider/certpath/ConstraintsChecker.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java b/src/java.base/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java rename to src/java.base/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java b/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java rename to src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardState.java b/src/java.base/share/classes/sun/security/provider/certpath/ForwardState.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardState.java rename to src/java.base/share/classes/sun/security/provider/certpath/ForwardState.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java b/src/java.base/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java rename to src/java.base/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/KeyChecker.java b/src/java.base/share/classes/sun/security/provider/certpath/KeyChecker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/KeyChecker.java rename to src/java.base/share/classes/sun/security/provider/certpath/KeyChecker.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java b/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java rename to src/java.base/share/classes/sun/security/provider/certpath/OCSP.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPNonceExtension.java b/src/java.base/share/classes/sun/security/provider/certpath/OCSPNonceExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPNonceExtension.java rename to src/java.base/share/classes/sun/security/provider/certpath/OCSPNonceExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPRequest.java b/src/java.base/share/classes/sun/security/provider/certpath/OCSPRequest.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPRequest.java rename to src/java.base/share/classes/sun/security/provider/certpath/OCSPRequest.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java b/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java rename to src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIX.java b/src/java.base/share/classes/sun/security/provider/certpath/PKIX.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIX.java rename to src/java.base/share/classes/sun/security/provider/certpath/PKIX.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java b/src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java rename to src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXExtendedParameters.java b/src/java.base/share/classes/sun/security/provider/certpath/PKIXExtendedParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXExtendedParameters.java rename to src/java.base/share/classes/sun/security/provider/certpath/PKIXExtendedParameters.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java b/src/java.base/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java rename to src/java.base/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyChecker.java b/src/java.base/share/classes/sun/security/provider/certpath/PolicyChecker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyChecker.java rename to src/java.base/share/classes/sun/security/provider/certpath/PolicyChecker.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java b/src/java.base/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java rename to src/java.base/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/ResponderId.java b/src/java.base/share/classes/sun/security/provider/certpath/ResponderId.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/ResponderId.java rename to src/java.base/share/classes/sun/security/provider/certpath/ResponderId.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/RevocationChecker.java b/src/java.base/share/classes/sun/security/provider/certpath/RevocationChecker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/RevocationChecker.java rename to src/java.base/share/classes/sun/security/provider/certpath/RevocationChecker.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/State.java b/src/java.base/share/classes/sun/security/provider/certpath/State.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/State.java rename to src/java.base/share/classes/sun/security/provider/certpath/State.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java b/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java rename to src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java b/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java rename to src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java b/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java rename to src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java b/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java rename to src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java b/src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java rename to src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/Vertex.java b/src/java.base/share/classes/sun/security/provider/certpath/Vertex.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/Vertex.java rename to src/java.base/share/classes/sun/security/provider/certpath/Vertex.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/X509CertPath.java b/src/java.base/share/classes/sun/security/provider/certpath/X509CertPath.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/X509CertPath.java rename to src/java.base/share/classes/sun/security/provider/certpath/X509CertPath.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/X509CertificatePair.java b/src/java.base/share/classes/sun/security/provider/certpath/X509CertificatePair.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/X509CertificatePair.java rename to src/java.base/share/classes/sun/security/provider/certpath/X509CertificatePair.java diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java b/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java rename to src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSACore.java b/src/java.base/share/classes/sun/security/rsa/RSACore.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/rsa/RSACore.java rename to src/java.base/share/classes/sun/security/rsa/RSACore.java diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java b/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java rename to src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java b/src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java rename to src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java b/src/java.base/share/classes/sun/security/rsa/RSAPadding.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java rename to src/java.base/share/classes/sun/security/rsa/RSAPadding.java diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java b/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java rename to src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java b/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java rename to src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java b/src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java rename to src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSASignature.java b/src/java.base/share/classes/sun/security/rsa/RSASignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/rsa/RSASignature.java rename to src/java.base/share/classes/sun/security/rsa/RSASignature.java diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/SunRsaSign.java b/src/java.base/share/classes/sun/security/rsa/SunRsaSign.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/rsa/SunRsaSign.java rename to src/java.base/share/classes/sun/security/rsa/SunRsaSign.java diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java b/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java rename to src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ALPNExtension.java b/src/java.base/share/classes/sun/security/ssl/ALPNExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ALPNExtension.java rename to src/java.base/share/classes/sun/security/ssl/ALPNExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Alerts.java b/src/java.base/share/classes/sun/security/ssl/Alerts.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/Alerts.java rename to src/java.base/share/classes/sun/security/ssl/Alerts.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/AppInputStream.java b/src/java.base/share/classes/sun/security/ssl/AppInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/AppInputStream.java rename to src/java.base/share/classes/sun/security/ssl/AppInputStream.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/AppOutputStream.java b/src/java.base/share/classes/sun/security/ssl/AppOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/AppOutputStream.java rename to src/java.base/share/classes/sun/security/ssl/AppOutputStream.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Authenticator.java b/src/java.base/share/classes/sun/security/ssl/Authenticator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/Authenticator.java rename to src/java.base/share/classes/sun/security/ssl/Authenticator.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java rename to src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ByteBufferInputStream.java b/src/java.base/share/classes/sun/security/ssl/ByteBufferInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ByteBufferInputStream.java rename to src/java.base/share/classes/sun/security/ssl/ByteBufferInputStream.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/CertStatusReqExtension.java b/src/java.base/share/classes/sun/security/ssl/CertStatusReqExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/CertStatusReqExtension.java rename to src/java.base/share/classes/sun/security/ssl/CertStatusReqExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/CertStatusReqItemV2.java b/src/java.base/share/classes/sun/security/ssl/CertStatusReqItemV2.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/CertStatusReqItemV2.java rename to src/java.base/share/classes/sun/security/ssl/CertStatusReqItemV2.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/CertStatusReqListV2Extension.java b/src/java.base/share/classes/sun/security/ssl/CertStatusReqListV2Extension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/CertStatusReqListV2Extension.java rename to src/java.base/share/classes/sun/security/ssl/CertStatusReqListV2Extension.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/CipherBox.java b/src/java.base/share/classes/sun/security/ssl/CipherBox.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/CipherBox.java rename to src/java.base/share/classes/sun/security/ssl/CipherBox.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java b/src/java.base/share/classes/sun/security/ssl/CipherSuite.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java rename to src/java.base/share/classes/sun/security/ssl/CipherSuite.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuiteList.java b/src/java.base/share/classes/sun/security/ssl/CipherSuiteList.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/CipherSuiteList.java rename to src/java.base/share/classes/sun/security/ssl/CipherSuiteList.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Ciphertext.java b/src/java.base/share/classes/sun/security/ssl/Ciphertext.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/Ciphertext.java rename to src/java.base/share/classes/sun/security/ssl/Ciphertext.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ClientAuthType.java b/src/java.base/share/classes/sun/security/ssl/ClientAuthType.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ClientAuthType.java rename to src/java.base/share/classes/sun/security/ssl/ClientAuthType.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java b/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java rename to src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java rename to src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ClientKeyExchangeService.java b/src/java.base/share/classes/sun/security/ssl/ClientKeyExchangeService.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ClientKeyExchangeService.java rename to src/java.base/share/classes/sun/security/ssl/ClientKeyExchangeService.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java rename to src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/DHCrypt.java b/src/java.base/share/classes/sun/security/ssl/DHCrypt.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/DHCrypt.java rename to src/java.base/share/classes/sun/security/ssl/DHCrypt.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java b/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java rename to src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java rename to src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/DTLSRecord.java b/src/java.base/share/classes/sun/security/ssl/DTLSRecord.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/DTLSRecord.java rename to src/java.base/share/classes/sun/security/ssl/DTLSRecord.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Debug.java b/src/java.base/share/classes/sun/security/ssl/Debug.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/Debug.java rename to src/java.base/share/classes/sun/security/ssl/Debug.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java rename to src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ECDHCrypt.java b/src/java.base/share/classes/sun/security/ssl/ECDHCrypt.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ECDHCrypt.java rename to src/java.base/share/classes/sun/security/ssl/ECDHCrypt.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/EllipticPointFormatsExtension.java b/src/java.base/share/classes/sun/security/ssl/EllipticPointFormatsExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/EllipticPointFormatsExtension.java rename to src/java.base/share/classes/sun/security/ssl/EllipticPointFormatsExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java b/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java rename to src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ExtensionType.java b/src/java.base/share/classes/sun/security/ssl/ExtensionType.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ExtensionType.java rename to src/java.base/share/classes/sun/security/ssl/ExtensionType.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java b/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java rename to src/java.base/share/classes/sun/security/ssl/HandshakeHash.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeInStream.java b/src/java.base/share/classes/sun/security/ssl/HandshakeInStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/HandshakeInStream.java rename to src/java.base/share/classes/sun/security/ssl/HandshakeInStream.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java b/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java rename to src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java b/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java rename to src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeStateManager.java b/src/java.base/share/classes/sun/security/ssl/HandshakeStateManager.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/HandshakeStateManager.java rename to src/java.base/share/classes/sun/security/ssl/HandshakeStateManager.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java b/src/java.base/share/classes/sun/security/ssl/Handshaker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java rename to src/java.base/share/classes/sun/security/ssl/Handshaker.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/HelloCookieManager.java b/src/java.base/share/classes/sun/security/ssl/HelloCookieManager.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/HelloCookieManager.java rename to src/java.base/share/classes/sun/security/ssl/HelloCookieManager.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/HelloExtension.java b/src/java.base/share/classes/sun/security/ssl/HelloExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/HelloExtension.java rename to src/java.base/share/classes/sun/security/ssl/HelloExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/HelloExtensions.java b/src/java.base/share/classes/sun/security/ssl/HelloExtensions.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/HelloExtensions.java rename to src/java.base/share/classes/sun/security/ssl/HelloExtensions.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/InputRecord.java b/src/java.base/share/classes/sun/security/ssl/InputRecord.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/InputRecord.java rename to src/java.base/share/classes/sun/security/ssl/InputRecord.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java b/src/java.base/share/classes/sun/security/ssl/JsseJce.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java rename to src/java.base/share/classes/sun/security/ssl/JsseJce.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java b/src/java.base/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java rename to src/java.base/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/MAC.java b/src/java.base/share/classes/sun/security/ssl/MAC.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/MAC.java rename to src/java.base/share/classes/sun/security/ssl/MAC.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/MaxFragmentLengthExtension.java b/src/java.base/share/classes/sun/security/ssl/MaxFragmentLengthExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/MaxFragmentLengthExtension.java rename to src/java.base/share/classes/sun/security/ssl/MaxFragmentLengthExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/NamedGroup.java b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/NamedGroup.java rename to src/java.base/share/classes/sun/security/ssl/NamedGroup.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/NamedGroupType.java b/src/java.base/share/classes/sun/security/ssl/NamedGroupType.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/NamedGroupType.java rename to src/java.base/share/classes/sun/security/ssl/NamedGroupType.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/OCSPStatusRequest.java b/src/java.base/share/classes/sun/security/ssl/OCSPStatusRequest.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/OCSPStatusRequest.java rename to src/java.base/share/classes/sun/security/ssl/OCSPStatusRequest.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/OutputRecord.java b/src/java.base/share/classes/sun/security/ssl/OutputRecord.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/OutputRecord.java rename to src/java.base/share/classes/sun/security/ssl/OutputRecord.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Plaintext.java b/src/java.base/share/classes/sun/security/ssl/Plaintext.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/Plaintext.java rename to src/java.base/share/classes/sun/security/ssl/Plaintext.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java b/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java rename to src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolList.java b/src/java.base/share/classes/sun/security/ssl/ProtocolList.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ProtocolList.java rename to src/java.base/share/classes/sun/security/ssl/ProtocolList.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java b/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java rename to src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java rename to src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/RSASignature.java b/src/java.base/share/classes/sun/security/ssl/RSASignature.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/RSASignature.java rename to src/java.base/share/classes/sun/security/ssl/RSASignature.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/RandomCookie.java b/src/java.base/share/classes/sun/security/ssl/RandomCookie.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/RandomCookie.java rename to src/java.base/share/classes/sun/security/ssl/RandomCookie.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Record.java b/src/java.base/share/classes/sun/security/ssl/Record.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/Record.java rename to src/java.base/share/classes/sun/security/ssl/Record.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/RenegotiationInfoExtension.java b/src/java.base/share/classes/sun/security/ssl/RenegotiationInfoExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/RenegotiationInfoExtension.java rename to src/java.base/share/classes/sun/security/ssl/RenegotiationInfoExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java rename to src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java b/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java rename to src/java.base/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java rename to src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java rename to src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java rename to src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java rename to src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLRecord.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLRecord.java rename to src/java.base/share/classes/sun/security/ssl/SSLRecord.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java rename to src/java.base/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java rename to src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java rename to src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java rename to src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java rename to src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java rename to src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java rename to src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java rename to src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java b/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java rename to src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java rename to src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SessionId.java b/src/java.base/share/classes/sun/security/ssl/SessionId.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SessionId.java rename to src/java.base/share/classes/sun/security/ssl/SessionId.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java b/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java rename to src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java b/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java rename to src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/StatusRequest.java b/src/java.base/share/classes/sun/security/ssl/StatusRequest.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/StatusRequest.java rename to src/java.base/share/classes/sun/security/ssl/StatusRequest.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/StatusRequestType.java b/src/java.base/share/classes/sun/security/ssl/StatusRequestType.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/StatusRequestType.java rename to src/java.base/share/classes/sun/security/ssl/StatusRequestType.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/StatusResponseManager.java b/src/java.base/share/classes/sun/security/ssl/StatusResponseManager.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/StatusResponseManager.java rename to src/java.base/share/classes/sun/security/ssl/StatusResponseManager.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SunJSSE.java b/src/java.base/share/classes/sun/security/ssl/SunJSSE.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SunJSSE.java rename to src/java.base/share/classes/sun/security/ssl/SunJSSE.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java rename to src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java rename to src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java rename to src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java rename to src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/UnknownExtension.java b/src/java.base/share/classes/sun/security/ssl/UnknownExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/UnknownExtension.java rename to src/java.base/share/classes/sun/security/ssl/UnknownExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/UnknownStatusRequest.java b/src/java.base/share/classes/sun/security/ssl/UnknownStatusRequest.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/UnknownStatusRequest.java rename to src/java.base/share/classes/sun/security/ssl/UnknownStatusRequest.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Utilities.java b/src/java.base/share/classes/sun/security/ssl/Utilities.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/Utilities.java rename to src/java.base/share/classes/sun/security/ssl/Utilities.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java rename to src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java rename to src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java b/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java rename to src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java diff --git a/jdk/src/java.base/share/classes/sun/security/timestamp/TSRequest.java b/src/java.base/share/classes/sun/security/timestamp/TSRequest.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/timestamp/TSRequest.java rename to src/java.base/share/classes/sun/security/timestamp/TSRequest.java diff --git a/jdk/src/java.base/share/classes/sun/security/timestamp/TSResponse.java b/src/java.base/share/classes/sun/security/timestamp/TSResponse.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/timestamp/TSResponse.java rename to src/java.base/share/classes/sun/security/timestamp/TSResponse.java diff --git a/jdk/src/java.base/share/classes/sun/security/timestamp/TimestampToken.java b/src/java.base/share/classes/sun/security/timestamp/TimestampToken.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/timestamp/TimestampToken.java rename to src/java.base/share/classes/sun/security/timestamp/TimestampToken.java diff --git a/jdk/src/java.base/share/classes/sun/security/timestamp/Timestamper.java b/src/java.base/share/classes/sun/security/timestamp/Timestamper.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/timestamp/Timestamper.java rename to src/java.base/share/classes/sun/security/timestamp/Timestamper.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java b/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java rename to src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/PathList.java b/src/java.base/share/classes/sun/security/tools/PathList.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/PathList.java rename to src/java.base/share/classes/sun/security/tools/PathList.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java b/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java rename to src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java rename to src/java.base/share/classes/sun/security/tools/keytool/Main.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources.java rename to src/java.base/share/classes/sun/security/tools/keytool/Resources.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java rename to src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java rename to src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java rename to src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java rename to src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java rename to src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java rename to src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java rename to src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java rename to src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java rename to src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java rename to src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java rename to src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AbstractAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/util/AbstractAlgorithmConstraints.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AbstractAlgorithmConstraints.java rename to src/java.base/share/classes/sun/security/util/AbstractAlgorithmConstraints.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AlgorithmDecomposer.java b/src/java.base/share/classes/sun/security/util/AlgorithmDecomposer.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AlgorithmDecomposer.java rename to src/java.base/share/classes/sun/security/util/AlgorithmDecomposer.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AnchorCertificates.java b/src/java.base/share/classes/sun/security/util/AnchorCertificates.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AnchorCertificates.java rename to src/java.base/share/classes/sun/security/util/AnchorCertificates.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AuthResources.java b/src/java.base/share/classes/sun/security/util/AuthResources.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AuthResources.java rename to src/java.base/share/classes/sun/security/util/AuthResources.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AuthResources_de.java b/src/java.base/share/classes/sun/security/util/AuthResources_de.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AuthResources_de.java rename to src/java.base/share/classes/sun/security/util/AuthResources_de.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AuthResources_es.java b/src/java.base/share/classes/sun/security/util/AuthResources_es.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AuthResources_es.java rename to src/java.base/share/classes/sun/security/util/AuthResources_es.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AuthResources_fr.java b/src/java.base/share/classes/sun/security/util/AuthResources_fr.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AuthResources_fr.java rename to src/java.base/share/classes/sun/security/util/AuthResources_fr.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AuthResources_it.java b/src/java.base/share/classes/sun/security/util/AuthResources_it.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AuthResources_it.java rename to src/java.base/share/classes/sun/security/util/AuthResources_it.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AuthResources_ja.java b/src/java.base/share/classes/sun/security/util/AuthResources_ja.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AuthResources_ja.java rename to src/java.base/share/classes/sun/security/util/AuthResources_ja.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AuthResources_ko.java b/src/java.base/share/classes/sun/security/util/AuthResources_ko.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AuthResources_ko.java rename to src/java.base/share/classes/sun/security/util/AuthResources_ko.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AuthResources_pt_BR.java b/src/java.base/share/classes/sun/security/util/AuthResources_pt_BR.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AuthResources_pt_BR.java rename to src/java.base/share/classes/sun/security/util/AuthResources_pt_BR.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AuthResources_sv.java b/src/java.base/share/classes/sun/security/util/AuthResources_sv.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AuthResources_sv.java rename to src/java.base/share/classes/sun/security/util/AuthResources_sv.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AuthResources_zh_CN.java b/src/java.base/share/classes/sun/security/util/AuthResources_zh_CN.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AuthResources_zh_CN.java rename to src/java.base/share/classes/sun/security/util/AuthResources_zh_CN.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/AuthResources_zh_TW.java b/src/java.base/share/classes/sun/security/util/AuthResources_zh_TW.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/AuthResources_zh_TW.java rename to src/java.base/share/classes/sun/security/util/AuthResources_zh_TW.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/BitArray.java b/src/java.base/share/classes/sun/security/util/BitArray.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/BitArray.java rename to src/java.base/share/classes/sun/security/util/BitArray.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/ByteArrayLexOrder.java b/src/java.base/share/classes/sun/security/util/ByteArrayLexOrder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/ByteArrayLexOrder.java rename to src/java.base/share/classes/sun/security/util/ByteArrayLexOrder.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java b/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java rename to src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Cache.java b/src/java.base/share/classes/sun/security/util/Cache.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Cache.java rename to src/java.base/share/classes/sun/security/util/Cache.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/ConsoleCallbackHandler.java b/src/java.base/share/classes/sun/security/util/ConsoleCallbackHandler.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/ConsoleCallbackHandler.java rename to src/java.base/share/classes/sun/security/util/ConsoleCallbackHandler.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/ConstraintsParameters.java b/src/java.base/share/classes/sun/security/util/ConstraintsParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/ConstraintsParameters.java rename to src/java.base/share/classes/sun/security/util/ConstraintsParameters.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/java.base/share/classes/sun/security/util/CurveDB.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/CurveDB.java rename to src/java.base/share/classes/sun/security/util/CurveDB.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Debug.java b/src/java.base/share/classes/sun/security/util/Debug.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Debug.java rename to src/java.base/share/classes/sun/security/util/Debug.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/DerEncoder.java b/src/java.base/share/classes/sun/security/util/DerEncoder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/DerEncoder.java rename to src/java.base/share/classes/sun/security/util/DerEncoder.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/DerIndefLenConverter.java b/src/java.base/share/classes/sun/security/util/DerIndefLenConverter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/DerIndefLenConverter.java rename to src/java.base/share/classes/sun/security/util/DerIndefLenConverter.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/DerInputBuffer.java b/src/java.base/share/classes/sun/security/util/DerInputBuffer.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/DerInputBuffer.java rename to src/java.base/share/classes/sun/security/util/DerInputBuffer.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/DerInputStream.java b/src/java.base/share/classes/sun/security/util/DerInputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/DerInputStream.java rename to src/java.base/share/classes/sun/security/util/DerInputStream.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/DerOutputStream.java b/src/java.base/share/classes/sun/security/util/DerOutputStream.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/DerOutputStream.java rename to src/java.base/share/classes/sun/security/util/DerOutputStream.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/DerValue.java b/src/java.base/share/classes/sun/security/util/DerValue.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/DerValue.java rename to src/java.base/share/classes/sun/security/util/DerValue.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java rename to src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/ECKeySizeParameterSpec.java b/src/java.base/share/classes/sun/security/util/ECKeySizeParameterSpec.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/ECKeySizeParameterSpec.java rename to src/java.base/share/classes/sun/security/util/ECKeySizeParameterSpec.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/ECParameters.java b/src/java.base/share/classes/sun/security/util/ECParameters.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/ECParameters.java rename to src/java.base/share/classes/sun/security/util/ECParameters.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/ECUtil.java b/src/java.base/share/classes/sun/security/util/ECUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/ECUtil.java rename to src/java.base/share/classes/sun/security/util/ECUtil.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/FilePermCompat.java b/src/java.base/share/classes/sun/security/util/FilePermCompat.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/FilePermCompat.java rename to src/java.base/share/classes/sun/security/util/FilePermCompat.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/HexDumpEncoder.java b/src/java.base/share/classes/sun/security/util/HexDumpEncoder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/HexDumpEncoder.java rename to src/java.base/share/classes/sun/security/util/HexDumpEncoder.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/HostnameChecker.java b/src/java.base/share/classes/sun/security/util/HostnameChecker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/HostnameChecker.java rename to src/java.base/share/classes/sun/security/util/HostnameChecker.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/IOUtils.java b/src/java.base/share/classes/sun/security/util/IOUtils.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/IOUtils.java rename to src/java.base/share/classes/sun/security/util/IOUtils.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/KeyStoreDelegator.java b/src/java.base/share/classes/sun/security/util/KeyStoreDelegator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/KeyStoreDelegator.java rename to src/java.base/share/classes/sun/security/util/KeyStoreDelegator.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/KeyUtil.java b/src/java.base/share/classes/sun/security/util/KeyUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/KeyUtil.java rename to src/java.base/share/classes/sun/security/util/KeyUtil.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java rename to src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Length.java b/src/java.base/share/classes/sun/security/util/Length.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Length.java rename to src/java.base/share/classes/sun/security/util/Length.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/LocalizedMessage.java b/src/java.base/share/classes/sun/security/util/LocalizedMessage.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/LocalizedMessage.java rename to src/java.base/share/classes/sun/security/util/LocalizedMessage.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/ManifestDigester.java b/src/java.base/share/classes/sun/security/util/ManifestDigester.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/ManifestDigester.java rename to src/java.base/share/classes/sun/security/util/ManifestDigester.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/ManifestEntryVerifier.java b/src/java.base/share/classes/sun/security/util/ManifestEntryVerifier.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/ManifestEntryVerifier.java rename to src/java.base/share/classes/sun/security/util/ManifestEntryVerifier.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/MessageDigestSpi2.java b/src/java.base/share/classes/sun/security/util/MessageDigestSpi2.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/MessageDigestSpi2.java rename to src/java.base/share/classes/sun/security/util/MessageDigestSpi2.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/NamedCurve.java b/src/java.base/share/classes/sun/security/util/NamedCurve.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/NamedCurve.java rename to src/java.base/share/classes/sun/security/util/NamedCurve.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java b/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java rename to src/java.base/share/classes/sun/security/util/ObjectIdentifier.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Password.java b/src/java.base/share/classes/sun/security/util/Password.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Password.java rename to src/java.base/share/classes/sun/security/util/Password.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Pem.java b/src/java.base/share/classes/sun/security/util/Pem.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Pem.java rename to src/java.base/share/classes/sun/security/util/Pem.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/PendingException.java b/src/java.base/share/classes/sun/security/util/PendingException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/PendingException.java rename to src/java.base/share/classes/sun/security/util/PendingException.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/PermissionFactory.java b/src/java.base/share/classes/sun/security/util/PermissionFactory.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/PermissionFactory.java rename to src/java.base/share/classes/sun/security/util/PermissionFactory.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/PolicyUtil.java b/src/java.base/share/classes/sun/security/util/PolicyUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/PolicyUtil.java rename to src/java.base/share/classes/sun/security/util/PolicyUtil.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/PropertyExpander.java b/src/java.base/share/classes/sun/security/util/PropertyExpander.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/PropertyExpander.java rename to src/java.base/share/classes/sun/security/util/PropertyExpander.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/RegisteredDomain.java b/src/java.base/share/classes/sun/security/util/RegisteredDomain.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/RegisteredDomain.java rename to src/java.base/share/classes/sun/security/util/RegisteredDomain.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Resources.java b/src/java.base/share/classes/sun/security/util/Resources.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Resources.java rename to src/java.base/share/classes/sun/security/util/Resources.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/ResourcesMgr.java b/src/java.base/share/classes/sun/security/util/ResourcesMgr.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/ResourcesMgr.java rename to src/java.base/share/classes/sun/security/util/ResourcesMgr.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Resources_de.java b/src/java.base/share/classes/sun/security/util/Resources_de.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Resources_de.java rename to src/java.base/share/classes/sun/security/util/Resources_de.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Resources_es.java b/src/java.base/share/classes/sun/security/util/Resources_es.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Resources_es.java rename to src/java.base/share/classes/sun/security/util/Resources_es.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Resources_fr.java b/src/java.base/share/classes/sun/security/util/Resources_fr.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Resources_fr.java rename to src/java.base/share/classes/sun/security/util/Resources_fr.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Resources_it.java b/src/java.base/share/classes/sun/security/util/Resources_it.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Resources_it.java rename to src/java.base/share/classes/sun/security/util/Resources_it.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Resources_ja.java b/src/java.base/share/classes/sun/security/util/Resources_ja.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Resources_ja.java rename to src/java.base/share/classes/sun/security/util/Resources_ja.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Resources_ko.java b/src/java.base/share/classes/sun/security/util/Resources_ko.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Resources_ko.java rename to src/java.base/share/classes/sun/security/util/Resources_ko.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Resources_pt_BR.java b/src/java.base/share/classes/sun/security/util/Resources_pt_BR.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Resources_pt_BR.java rename to src/java.base/share/classes/sun/security/util/Resources_pt_BR.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Resources_sv.java b/src/java.base/share/classes/sun/security/util/Resources_sv.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Resources_sv.java rename to src/java.base/share/classes/sun/security/util/Resources_sv.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java b/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java rename to src/java.base/share/classes/sun/security/util/Resources_zh_CN.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/Resources_zh_TW.java b/src/java.base/share/classes/sun/security/util/Resources_zh_TW.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/Resources_zh_TW.java rename to src/java.base/share/classes/sun/security/util/Resources_zh_TW.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/SecurityConstants.java b/src/java.base/share/classes/sun/security/util/SecurityConstants.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/SecurityConstants.java rename to src/java.base/share/classes/sun/security/util/SecurityConstants.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java rename to src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java diff --git a/jdk/src/java.base/share/classes/sun/security/util/UntrustedCertificates.java b/src/java.base/share/classes/sun/security/util/UntrustedCertificates.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/util/UntrustedCertificates.java rename to src/java.base/share/classes/sun/security/util/UntrustedCertificates.java diff --git a/jdk/src/java.base/share/classes/sun/security/validator/EndEntityChecker.java b/src/java.base/share/classes/sun/security/validator/EndEntityChecker.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/validator/EndEntityChecker.java rename to src/java.base/share/classes/sun/security/validator/EndEntityChecker.java diff --git a/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java b/src/java.base/share/classes/sun/security/validator/PKIXValidator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java rename to src/java.base/share/classes/sun/security/validator/PKIXValidator.java diff --git a/jdk/src/java.base/share/classes/sun/security/validator/SimpleValidator.java b/src/java.base/share/classes/sun/security/validator/SimpleValidator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/validator/SimpleValidator.java rename to src/java.base/share/classes/sun/security/validator/SimpleValidator.java diff --git a/jdk/src/java.base/share/classes/sun/security/validator/TrustStoreUtil.java b/src/java.base/share/classes/sun/security/validator/TrustStoreUtil.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/validator/TrustStoreUtil.java rename to src/java.base/share/classes/sun/security/validator/TrustStoreUtil.java diff --git a/jdk/src/java.base/share/classes/sun/security/validator/Validator.java b/src/java.base/share/classes/sun/security/validator/Validator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/validator/Validator.java rename to src/java.base/share/classes/sun/security/validator/Validator.java diff --git a/jdk/src/java.base/share/classes/sun/security/validator/ValidatorException.java b/src/java.base/share/classes/sun/security/validator/ValidatorException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/validator/ValidatorException.java rename to src/java.base/share/classes/sun/security/validator/ValidatorException.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AVA.java b/src/java.base/share/classes/sun/security/x509/AVA.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/AVA.java rename to src/java.base/share/classes/sun/security/x509/AVA.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AccessDescription.java b/src/java.base/share/classes/sun/security/x509/AccessDescription.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/AccessDescription.java rename to src/java.base/share/classes/sun/security/x509/AccessDescription.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java b/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java rename to src/java.base/share/classes/sun/security/x509/AlgIdDSA.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AlgorithmId.java b/src/java.base/share/classes/sun/security/x509/AlgorithmId.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/AlgorithmId.java rename to src/java.base/share/classes/sun/security/x509/AlgorithmId.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AttributeNameEnumeration.java b/src/java.base/share/classes/sun/security/x509/AttributeNameEnumeration.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/AttributeNameEnumeration.java rename to src/java.base/share/classes/sun/security/x509/AttributeNameEnumeration.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java b/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java rename to src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java b/src/java.base/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java rename to src/java.base/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/BasicConstraintsExtension.java b/src/java.base/share/classes/sun/security/x509/BasicConstraintsExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/BasicConstraintsExtension.java rename to src/java.base/share/classes/sun/security/x509/BasicConstraintsExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CRLDistributionPointsExtension.java b/src/java.base/share/classes/sun/security/x509/CRLDistributionPointsExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CRLDistributionPointsExtension.java rename to src/java.base/share/classes/sun/security/x509/CRLDistributionPointsExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CRLExtensions.java b/src/java.base/share/classes/sun/security/x509/CRLExtensions.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CRLExtensions.java rename to src/java.base/share/classes/sun/security/x509/CRLExtensions.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CRLNumberExtension.java b/src/java.base/share/classes/sun/security/x509/CRLNumberExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CRLNumberExtension.java rename to src/java.base/share/classes/sun/security/x509/CRLNumberExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CRLReasonCodeExtension.java b/src/java.base/share/classes/sun/security/x509/CRLReasonCodeExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CRLReasonCodeExtension.java rename to src/java.base/share/classes/sun/security/x509/CRLReasonCodeExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertAttrSet.java b/src/java.base/share/classes/sun/security/x509/CertAttrSet.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertAttrSet.java rename to src/java.base/share/classes/sun/security/x509/CertAttrSet.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertException.java b/src/java.base/share/classes/sun/security/x509/CertException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertException.java rename to src/java.base/share/classes/sun/security/x509/CertException.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertParseError.java b/src/java.base/share/classes/sun/security/x509/CertParseError.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertParseError.java rename to src/java.base/share/classes/sun/security/x509/CertParseError.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificateAlgorithmId.java b/src/java.base/share/classes/sun/security/x509/CertificateAlgorithmId.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificateAlgorithmId.java rename to src/java.base/share/classes/sun/security/x509/CertificateAlgorithmId.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificateExtensions.java b/src/java.base/share/classes/sun/security/x509/CertificateExtensions.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificateExtensions.java rename to src/java.base/share/classes/sun/security/x509/CertificateExtensions.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificateIssuerExtension.java b/src/java.base/share/classes/sun/security/x509/CertificateIssuerExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificateIssuerExtension.java rename to src/java.base/share/classes/sun/security/x509/CertificateIssuerExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificateIssuerName.java b/src/java.base/share/classes/sun/security/x509/CertificateIssuerName.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificateIssuerName.java rename to src/java.base/share/classes/sun/security/x509/CertificateIssuerName.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificatePoliciesExtension.java b/src/java.base/share/classes/sun/security/x509/CertificatePoliciesExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificatePoliciesExtension.java rename to src/java.base/share/classes/sun/security/x509/CertificatePoliciesExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicyId.java b/src/java.base/share/classes/sun/security/x509/CertificatePolicyId.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicyId.java rename to src/java.base/share/classes/sun/security/x509/CertificatePolicyId.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicyMap.java b/src/java.base/share/classes/sun/security/x509/CertificatePolicyMap.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicyMap.java rename to src/java.base/share/classes/sun/security/x509/CertificatePolicyMap.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicySet.java b/src/java.base/share/classes/sun/security/x509/CertificatePolicySet.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicySet.java rename to src/java.base/share/classes/sun/security/x509/CertificatePolicySet.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java b/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java rename to src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificateSubjectName.java b/src/java.base/share/classes/sun/security/x509/CertificateSubjectName.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificateSubjectName.java rename to src/java.base/share/classes/sun/security/x509/CertificateSubjectName.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificateValidity.java b/src/java.base/share/classes/sun/security/x509/CertificateValidity.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificateValidity.java rename to src/java.base/share/classes/sun/security/x509/CertificateValidity.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificateVersion.java b/src/java.base/share/classes/sun/security/x509/CertificateVersion.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificateVersion.java rename to src/java.base/share/classes/sun/security/x509/CertificateVersion.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificateX509Key.java b/src/java.base/share/classes/sun/security/x509/CertificateX509Key.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/CertificateX509Key.java rename to src/java.base/share/classes/sun/security/x509/CertificateX509Key.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/DNSName.java b/src/java.base/share/classes/sun/security/x509/DNSName.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/DNSName.java rename to src/java.base/share/classes/sun/security/x509/DNSName.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java b/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java rename to src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java b/src/java.base/share/classes/sun/security/x509/DistributionPoint.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java rename to src/java.base/share/classes/sun/security/x509/DistributionPoint.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/DistributionPointName.java b/src/java.base/share/classes/sun/security/x509/DistributionPointName.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/DistributionPointName.java rename to src/java.base/share/classes/sun/security/x509/DistributionPointName.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/EDIPartyName.java b/src/java.base/share/classes/sun/security/x509/EDIPartyName.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/EDIPartyName.java rename to src/java.base/share/classes/sun/security/x509/EDIPartyName.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java b/src/java.base/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java rename to src/java.base/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/Extension.java b/src/java.base/share/classes/sun/security/x509/Extension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/Extension.java rename to src/java.base/share/classes/sun/security/x509/Extension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/FreshestCRLExtension.java b/src/java.base/share/classes/sun/security/x509/FreshestCRLExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/FreshestCRLExtension.java rename to src/java.base/share/classes/sun/security/x509/FreshestCRLExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/GeneralName.java b/src/java.base/share/classes/sun/security/x509/GeneralName.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/GeneralName.java rename to src/java.base/share/classes/sun/security/x509/GeneralName.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/GeneralNameInterface.java b/src/java.base/share/classes/sun/security/x509/GeneralNameInterface.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/GeneralNameInterface.java rename to src/java.base/share/classes/sun/security/x509/GeneralNameInterface.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/GeneralNames.java b/src/java.base/share/classes/sun/security/x509/GeneralNames.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/GeneralNames.java rename to src/java.base/share/classes/sun/security/x509/GeneralNames.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtree.java b/src/java.base/share/classes/sun/security/x509/GeneralSubtree.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtree.java rename to src/java.base/share/classes/sun/security/x509/GeneralSubtree.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java b/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java rename to src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java b/src/java.base/share/classes/sun/security/x509/IPAddressName.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java rename to src/java.base/share/classes/sun/security/x509/IPAddressName.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java b/src/java.base/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java rename to src/java.base/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/InvalidityDateExtension.java b/src/java.base/share/classes/sun/security/x509/InvalidityDateExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/InvalidityDateExtension.java rename to src/java.base/share/classes/sun/security/x509/InvalidityDateExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java b/src/java.base/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java rename to src/java.base/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/IssuingDistributionPointExtension.java b/src/java.base/share/classes/sun/security/x509/IssuingDistributionPointExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/IssuingDistributionPointExtension.java rename to src/java.base/share/classes/sun/security/x509/IssuingDistributionPointExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/KeyIdentifier.java b/src/java.base/share/classes/sun/security/x509/KeyIdentifier.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/KeyIdentifier.java rename to src/java.base/share/classes/sun/security/x509/KeyIdentifier.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/KeyUsageExtension.java b/src/java.base/share/classes/sun/security/x509/KeyUsageExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/KeyUsageExtension.java rename to src/java.base/share/classes/sun/security/x509/KeyUsageExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java b/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java rename to src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/NetscapeCertTypeExtension.java b/src/java.base/share/classes/sun/security/x509/NetscapeCertTypeExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/NetscapeCertTypeExtension.java rename to src/java.base/share/classes/sun/security/x509/NetscapeCertTypeExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/OCSPNoCheckExtension.java b/src/java.base/share/classes/sun/security/x509/OCSPNoCheckExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/OCSPNoCheckExtension.java rename to src/java.base/share/classes/sun/security/x509/OCSPNoCheckExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java b/src/java.base/share/classes/sun/security/x509/OIDMap.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java rename to src/java.base/share/classes/sun/security/x509/OIDMap.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/OIDName.java b/src/java.base/share/classes/sun/security/x509/OIDName.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/OIDName.java rename to src/java.base/share/classes/sun/security/x509/OIDName.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/OtherName.java b/src/java.base/share/classes/sun/security/x509/OtherName.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/OtherName.java rename to src/java.base/share/classes/sun/security/x509/OtherName.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/PKIXExtensions.java b/src/java.base/share/classes/sun/security/x509/PKIXExtensions.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/PKIXExtensions.java rename to src/java.base/share/classes/sun/security/x509/PKIXExtensions.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/PolicyConstraintsExtension.java b/src/java.base/share/classes/sun/security/x509/PolicyConstraintsExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/PolicyConstraintsExtension.java rename to src/java.base/share/classes/sun/security/x509/PolicyConstraintsExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/PolicyInformation.java b/src/java.base/share/classes/sun/security/x509/PolicyInformation.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/PolicyInformation.java rename to src/java.base/share/classes/sun/security/x509/PolicyInformation.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/PolicyMappingsExtension.java b/src/java.base/share/classes/sun/security/x509/PolicyMappingsExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/PolicyMappingsExtension.java rename to src/java.base/share/classes/sun/security/x509/PolicyMappingsExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/PrivateKeyUsageExtension.java b/src/java.base/share/classes/sun/security/x509/PrivateKeyUsageExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/PrivateKeyUsageExtension.java rename to src/java.base/share/classes/sun/security/x509/PrivateKeyUsageExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/RDN.java b/src/java.base/share/classes/sun/security/x509/RDN.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/RDN.java rename to src/java.base/share/classes/sun/security/x509/RDN.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/README b/src/java.base/share/classes/sun/security/x509/README similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/README rename to src/java.base/share/classes/sun/security/x509/README diff --git a/jdk/src/java.base/share/classes/sun/security/x509/RFC822Name.java b/src/java.base/share/classes/sun/security/x509/RFC822Name.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/RFC822Name.java rename to src/java.base/share/classes/sun/security/x509/RFC822Name.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/ReasonFlags.java b/src/java.base/share/classes/sun/security/x509/ReasonFlags.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/ReasonFlags.java rename to src/java.base/share/classes/sun/security/x509/ReasonFlags.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/SerialNumber.java b/src/java.base/share/classes/sun/security/x509/SerialNumber.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/SerialNumber.java rename to src/java.base/share/classes/sun/security/x509/SerialNumber.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java b/src/java.base/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java rename to src/java.base/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java b/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java rename to src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java b/src/java.base/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java rename to src/java.base/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/URIName.java b/src/java.base/share/classes/sun/security/x509/URIName.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/URIName.java rename to src/java.base/share/classes/sun/security/x509/URIName.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/UniqueIdentity.java b/src/java.base/share/classes/sun/security/x509/UniqueIdentity.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/UniqueIdentity.java rename to src/java.base/share/classes/sun/security/x509/UniqueIdentity.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X400Address.java b/src/java.base/share/classes/sun/security/x509/X400Address.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/X400Address.java rename to src/java.base/share/classes/sun/security/x509/X400Address.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X500Name.java b/src/java.base/share/classes/sun/security/x509/X500Name.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/X500Name.java rename to src/java.base/share/classes/sun/security/x509/X500Name.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509AttributeName.java b/src/java.base/share/classes/sun/security/x509/X509AttributeName.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/X509AttributeName.java rename to src/java.base/share/classes/sun/security/x509/X509AttributeName.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java b/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java rename to src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java b/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java rename to src/java.base/share/classes/sun/security/x509/X509CRLImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java b/src/java.base/share/classes/sun/security/x509/X509CertImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java rename to src/java.base/share/classes/sun/security/x509/X509CertImpl.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CertInfo.java b/src/java.base/share/classes/sun/security/x509/X509CertInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/X509CertInfo.java rename to src/java.base/share/classes/sun/security/x509/X509CertInfo.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509Key.java b/src/java.base/share/classes/sun/security/x509/X509Key.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/X509Key.java rename to src/java.base/share/classes/sun/security/x509/X509Key.java diff --git a/jdk/src/java.base/share/classes/sun/security/x509/certAttributes.html b/src/java.base/share/classes/sun/security/x509/certAttributes.html similarity index 100% rename from jdk/src/java.base/share/classes/sun/security/x509/certAttributes.html rename to src/java.base/share/classes/sun/security/x509/certAttributes.html diff --git a/jdk/src/java.base/share/classes/sun/text/BreakDictionary.java b/src/java.base/share/classes/sun/text/BreakDictionary.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/BreakDictionary.java rename to src/java.base/share/classes/sun/text/BreakDictionary.java diff --git a/jdk/src/java.base/share/classes/sun/text/CollatorUtilities.java b/src/java.base/share/classes/sun/text/CollatorUtilities.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/CollatorUtilities.java rename to src/java.base/share/classes/sun/text/CollatorUtilities.java diff --git a/jdk/src/java.base/share/classes/sun/text/CompactByteArray.java b/src/java.base/share/classes/sun/text/CompactByteArray.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/CompactByteArray.java rename to src/java.base/share/classes/sun/text/CompactByteArray.java diff --git a/jdk/src/java.base/share/classes/sun/text/ComposedCharIter.java b/src/java.base/share/classes/sun/text/ComposedCharIter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/ComposedCharIter.java rename to src/java.base/share/classes/sun/text/ComposedCharIter.java diff --git a/jdk/src/java.base/share/classes/sun/text/DictionaryBasedBreakIterator.java b/src/java.base/share/classes/sun/text/DictionaryBasedBreakIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/DictionaryBasedBreakIterator.java rename to src/java.base/share/classes/sun/text/DictionaryBasedBreakIterator.java diff --git a/jdk/src/java.base/share/classes/sun/text/IntHashtable.java b/src/java.base/share/classes/sun/text/IntHashtable.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/IntHashtable.java rename to src/java.base/share/classes/sun/text/IntHashtable.java diff --git a/jdk/src/java.base/share/classes/sun/text/Normalizer.java b/src/java.base/share/classes/sun/text/Normalizer.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/Normalizer.java rename to src/java.base/share/classes/sun/text/Normalizer.java diff --git a/jdk/src/java.base/share/classes/sun/text/RuleBasedBreakIterator.java b/src/java.base/share/classes/sun/text/RuleBasedBreakIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/RuleBasedBreakIterator.java rename to src/java.base/share/classes/sun/text/RuleBasedBreakIterator.java diff --git a/jdk/src/java.base/share/classes/sun/text/SupplementaryCharacterData.java b/src/java.base/share/classes/sun/text/SupplementaryCharacterData.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/SupplementaryCharacterData.java rename to src/java.base/share/classes/sun/text/SupplementaryCharacterData.java diff --git a/jdk/src/java.base/share/classes/sun/text/UCompactIntArray.java b/src/java.base/share/classes/sun/text/UCompactIntArray.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/UCompactIntArray.java rename to src/java.base/share/classes/sun/text/UCompactIntArray.java diff --git a/jdk/src/java.base/share/classes/sun/text/bidi/BidiBase.java b/src/java.base/share/classes/sun/text/bidi/BidiBase.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/bidi/BidiBase.java rename to src/java.base/share/classes/sun/text/bidi/BidiBase.java diff --git a/jdk/src/java.base/share/classes/sun/text/bidi/BidiLine.java b/src/java.base/share/classes/sun/text/bidi/BidiLine.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/bidi/BidiLine.java rename to src/java.base/share/classes/sun/text/bidi/BidiLine.java diff --git a/jdk/src/java.base/share/classes/sun/text/bidi/BidiRun.java b/src/java.base/share/classes/sun/text/bidi/BidiRun.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/bidi/BidiRun.java rename to src/java.base/share/classes/sun/text/bidi/BidiRun.java diff --git a/jdk/src/java.base/share/classes/sun/text/bidi/BidiWriter.java b/src/java.base/share/classes/sun/text/bidi/BidiWriter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/bidi/BidiWriter.java rename to src/java.base/share/classes/sun/text/bidi/BidiWriter.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/BMPSet.java b/src/java.base/share/classes/sun/text/normalizer/BMPSet.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/BMPSet.java rename to src/java.base/share/classes/sun/text/normalizer/BMPSet.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/CharTrie.java b/src/java.base/share/classes/sun/text/normalizer/CharTrie.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/CharTrie.java rename to src/java.base/share/classes/sun/text/normalizer/CharTrie.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java b/src/java.base/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java rename to src/java.base/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/FilteredNormalizer2.java b/src/java.base/share/classes/sun/text/normalizer/FilteredNormalizer2.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/FilteredNormalizer2.java rename to src/java.base/share/classes/sun/text/normalizer/FilteredNormalizer2.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/ICUBinary.java b/src/java.base/share/classes/sun/text/normalizer/ICUBinary.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/ICUBinary.java rename to src/java.base/share/classes/sun/text/normalizer/ICUBinary.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java b/src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java rename to src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Normalizer2.java b/src/java.base/share/classes/sun/text/normalizer/Normalizer2.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/Normalizer2.java rename to src/java.base/share/classes/sun/text/normalizer/Normalizer2.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java b/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java rename to src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerImpl.java b/src/java.base/share/classes/sun/text/normalizer/NormalizerImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerImpl.java rename to src/java.base/share/classes/sun/text/normalizer/NormalizerImpl.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/OutputInt.java b/src/java.base/share/classes/sun/text/normalizer/OutputInt.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/OutputInt.java rename to src/java.base/share/classes/sun/text/normalizer/OutputInt.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Replaceable.java b/src/java.base/share/classes/sun/text/normalizer/Replaceable.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/Replaceable.java rename to src/java.base/share/classes/sun/text/normalizer/Replaceable.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java b/src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java rename to src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java b/src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java rename to src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Trie.java b/src/java.base/share/classes/sun/text/normalizer/Trie.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/Trie.java rename to src/java.base/share/classes/sun/text/normalizer/Trie.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Trie2.java b/src/java.base/share/classes/sun/text/normalizer/Trie2.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/Trie2.java rename to src/java.base/share/classes/sun/text/normalizer/Trie2.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Trie2_16.java b/src/java.base/share/classes/sun/text/normalizer/Trie2_16.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/Trie2_16.java rename to src/java.base/share/classes/sun/text/normalizer/Trie2_16.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java b/src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java rename to src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacter.java b/src/java.base/share/classes/sun/text/normalizer/UCharacter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/UCharacter.java rename to src/java.base/share/classes/sun/text/normalizer/UCharacter.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java b/src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java rename to src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterProperty.java b/src/java.base/share/classes/sun/text/normalizer/UCharacterProperty.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterProperty.java rename to src/java.base/share/classes/sun/text/normalizer/UCharacterProperty.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UTF16.java b/src/java.base/share/classes/sun/text/normalizer/UTF16.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/UTF16.java rename to src/java.base/share/classes/sun/text/normalizer/UTF16.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java b/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java rename to src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSetStringSpan.java b/src/java.base/share/classes/sun/text/normalizer/UnicodeSetStringSpan.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSetStringSpan.java rename to src/java.base/share/classes/sun/text/normalizer/UnicodeSetStringSpan.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java b/src/java.base/share/classes/sun/text/normalizer/Utility.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java rename to src/java.base/share/classes/sun/text/normalizer/Utility.java diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/VersionInfo.java b/src/java.base/share/classes/sun/text/normalizer/VersionInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/normalizer/VersionInfo.java rename to src/java.base/share/classes/sun/text/normalizer/VersionInfo.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorInfo.java b/src/java.base/share/classes/sun/text/resources/BreakIteratorInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorInfo.java rename to src/java.base/share/classes/sun/text/resources/BreakIteratorInfo.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorInfoProvider.java b/src/java.base/share/classes/sun/text/resources/BreakIteratorInfoProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorInfoProvider.java rename to src/java.base/share/classes/sun/text/resources/BreakIteratorInfoProvider.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorResources.java b/src/java.base/share/classes/sun/text/resources/BreakIteratorResources.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorResources.java rename to src/java.base/share/classes/sun/text/resources/BreakIteratorResources.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorRules.java b/src/java.base/share/classes/sun/text/resources/BreakIteratorRules.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorRules.java rename to src/java.base/share/classes/sun/text/resources/BreakIteratorRules.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/CollationData.java b/src/java.base/share/classes/sun/text/resources/CollationData.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/CollationData.java rename to src/java.base/share/classes/sun/text/resources/CollationData.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/CollationDataProvider.java b/src/java.base/share/classes/sun/text/resources/CollationDataProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/CollationDataProvider.java rename to src/java.base/share/classes/sun/text/resources/CollationDataProvider.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/FormatData.java b/src/java.base/share/classes/sun/text/resources/FormatData.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/FormatData.java rename to src/java.base/share/classes/sun/text/resources/FormatData.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/FormatDataProvider.java b/src/java.base/share/classes/sun/text/resources/FormatDataProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/FormatDataProvider.java rename to src/java.base/share/classes/sun/text/resources/FormatDataProvider.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/FormatData_en.java b/src/java.base/share/classes/sun/text/resources/FormatData_en.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/FormatData_en.java rename to src/java.base/share/classes/sun/text/resources/FormatData_en.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/FormatData_en_US.java b/src/java.base/share/classes/sun/text/resources/FormatData_en_US.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/FormatData_en_US.java rename to src/java.base/share/classes/sun/text/resources/FormatData_en_US.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java b/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java rename to src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementaryProvider.java b/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementaryProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementaryProvider.java rename to src/java.base/share/classes/sun/text/resources/JavaTimeSupplementaryProvider.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java b/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java rename to src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/cldr/FormatDataProvider.java b/src/java.base/share/classes/sun/text/resources/cldr/FormatDataProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/cldr/FormatDataProvider.java rename to src/java.base/share/classes/sun/text/resources/cldr/FormatDataProvider.java diff --git a/jdk/src/java.base/share/classes/sun/text/resources/nfc.icu b/src/java.base/share/classes/sun/text/resources/nfc.icu similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/nfc.icu rename to src/java.base/share/classes/sun/text/resources/nfc.icu diff --git a/jdk/src/java.base/share/classes/sun/text/resources/nfkc.icu b/src/java.base/share/classes/sun/text/resources/nfkc.icu similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/nfkc.icu rename to src/java.base/share/classes/sun/text/resources/nfkc.icu diff --git a/jdk/src/java.base/share/classes/sun/text/resources/nfkc_cf.icu b/src/java.base/share/classes/sun/text/resources/nfkc_cf.icu similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/nfkc_cf.icu rename to src/java.base/share/classes/sun/text/resources/nfkc_cf.icu diff --git a/jdk/src/java.base/share/classes/sun/text/resources/ubidi.icu b/src/java.base/share/classes/sun/text/resources/ubidi.icu similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/ubidi.icu rename to src/java.base/share/classes/sun/text/resources/ubidi.icu diff --git a/jdk/src/java.base/share/classes/sun/text/resources/uprops.icu b/src/java.base/share/classes/sun/text/resources/uprops.icu similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/resources/uprops.icu rename to src/java.base/share/classes/sun/text/resources/uprops.icu diff --git a/jdk/src/java.base/share/classes/sun/text/spi/JavaTimeDateTimePatternProvider.java b/src/java.base/share/classes/sun/text/spi/JavaTimeDateTimePatternProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/text/spi/JavaTimeDateTimePatternProvider.java rename to src/java.base/share/classes/sun/text/spi/JavaTimeDateTimePatternProvider.java diff --git a/jdk/src/java.base/share/classes/sun/util/BuddhistCalendar.java b/src/java.base/share/classes/sun/util/BuddhistCalendar.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/BuddhistCalendar.java rename to src/java.base/share/classes/sun/util/BuddhistCalendar.java diff --git a/jdk/src/java.base/share/classes/sun/util/PreHashedMap.java b/src/java.base/share/classes/sun/util/PreHashedMap.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/PreHashedMap.java rename to src/java.base/share/classes/sun/util/PreHashedMap.java diff --git a/jdk/src/java.base/share/classes/sun/util/PropertyResourceBundleCharset.java b/src/java.base/share/classes/sun/util/PropertyResourceBundleCharset.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/PropertyResourceBundleCharset.java rename to src/java.base/share/classes/sun/util/PropertyResourceBundleCharset.java diff --git a/jdk/src/java.base/share/classes/sun/util/ResourceBundleEnumeration.java b/src/java.base/share/classes/sun/util/ResourceBundleEnumeration.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/ResourceBundleEnumeration.java rename to src/java.base/share/classes/sun/util/ResourceBundleEnumeration.java diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java b/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java rename to src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/BaseCalendar.java b/src/java.base/share/classes/sun/util/calendar/BaseCalendar.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/calendar/BaseCalendar.java rename to src/java.base/share/classes/sun/util/calendar/BaseCalendar.java diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/CalendarDate.java b/src/java.base/share/classes/sun/util/calendar/CalendarDate.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/calendar/CalendarDate.java rename to src/java.base/share/classes/sun/util/calendar/CalendarDate.java diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java b/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java rename to src/java.base/share/classes/sun/util/calendar/CalendarSystem.java diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/CalendarUtils.java b/src/java.base/share/classes/sun/util/calendar/CalendarUtils.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/calendar/CalendarUtils.java rename to src/java.base/share/classes/sun/util/calendar/CalendarUtils.java diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/Era.java b/src/java.base/share/classes/sun/util/calendar/Era.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/calendar/Era.java rename to src/java.base/share/classes/sun/util/calendar/Era.java diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/Gregorian.java b/src/java.base/share/classes/sun/util/calendar/Gregorian.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/calendar/Gregorian.java rename to src/java.base/share/classes/sun/util/calendar/Gregorian.java diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/ImmutableGregorianDate.java b/src/java.base/share/classes/sun/util/calendar/ImmutableGregorianDate.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/calendar/ImmutableGregorianDate.java rename to src/java.base/share/classes/sun/util/calendar/ImmutableGregorianDate.java diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/JulianCalendar.java b/src/java.base/share/classes/sun/util/calendar/JulianCalendar.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/calendar/JulianCalendar.java rename to src/java.base/share/classes/sun/util/calendar/JulianCalendar.java diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java b/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java rename to src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java b/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java rename to src/java.base/share/classes/sun/util/calendar/ZoneInfo.java diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java rename to src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java diff --git a/jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java rename to src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/BaseLocale.java b/src/java.base/share/classes/sun/util/locale/BaseLocale.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/BaseLocale.java rename to src/java.base/share/classes/sun/util/locale/BaseLocale.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/Extension.java b/src/java.base/share/classes/sun/util/locale/Extension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/Extension.java rename to src/java.base/share/classes/sun/util/locale/Extension.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/InternalLocaleBuilder.java b/src/java.base/share/classes/sun/util/locale/InternalLocaleBuilder.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/InternalLocaleBuilder.java rename to src/java.base/share/classes/sun/util/locale/InternalLocaleBuilder.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/LanguageTag.java b/src/java.base/share/classes/sun/util/locale/LanguageTag.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/LanguageTag.java rename to src/java.base/share/classes/sun/util/locale/LanguageTag.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/LocaleExtensions.java b/src/java.base/share/classes/sun/util/locale/LocaleExtensions.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/LocaleExtensions.java rename to src/java.base/share/classes/sun/util/locale/LocaleExtensions.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/LocaleMatcher.java b/src/java.base/share/classes/sun/util/locale/LocaleMatcher.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/LocaleMatcher.java rename to src/java.base/share/classes/sun/util/locale/LocaleMatcher.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/LocaleObjectCache.java b/src/java.base/share/classes/sun/util/locale/LocaleObjectCache.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/LocaleObjectCache.java rename to src/java.base/share/classes/sun/util/locale/LocaleObjectCache.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/LocaleSyntaxException.java b/src/java.base/share/classes/sun/util/locale/LocaleSyntaxException.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/LocaleSyntaxException.java rename to src/java.base/share/classes/sun/util/locale/LocaleSyntaxException.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/LocaleUtils.java b/src/java.base/share/classes/sun/util/locale/LocaleUtils.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/LocaleUtils.java rename to src/java.base/share/classes/sun/util/locale/LocaleUtils.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/ParseStatus.java b/src/java.base/share/classes/sun/util/locale/ParseStatus.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/ParseStatus.java rename to src/java.base/share/classes/sun/util/locale/ParseStatus.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/StringTokenIterator.java b/src/java.base/share/classes/sun/util/locale/StringTokenIterator.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/StringTokenIterator.java rename to src/java.base/share/classes/sun/util/locale/StringTokenIterator.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/UnicodeLocaleExtension.java b/src/java.base/share/classes/sun/util/locale/UnicodeLocaleExtension.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/UnicodeLocaleExtension.java rename to src/java.base/share/classes/sun/util/locale/UnicodeLocaleExtension.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/AuxLocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/AuxLocaleProviderAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/AuxLocaleProviderAdapter.java rename to src/java.base/share/classes/sun/util/locale/provider/AuxLocaleProviderAdapter.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/AvailableLanguageTags.java b/src/java.base/share/classes/sun/util/locale/provider/AvailableLanguageTags.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/AvailableLanguageTags.java rename to src/java.base/share/classes/sun/util/locale/provider/AvailableLanguageTags.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java b/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java rename to src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/CalendarProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarProviderImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/CalendarProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/CollationRules.java b/src/java.base/share/classes/sun/util/locale/provider/CollationRules.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/CollationRules.java rename to src/java.base/share/classes/sun/util/locale/provider/CollationRules.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/CollatorProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/CollatorProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/CollatorProviderImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/CollatorProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/DateFormatProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/DateFormatProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/DateFormatProviderImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/DateFormatProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/DateFormatSymbolsProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/DateFormatSymbolsProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/DateFormatSymbolsProviderImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/DateFormatSymbolsProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/DecimalFormatSymbolsProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/DecimalFormatSymbolsProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/DecimalFormatSymbolsProviderImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/DecimalFormatSymbolsProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java rename to src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/HostLocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/HostLocaleProviderAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/HostLocaleProviderAdapter.java rename to src/java.base/share/classes/sun/util/locale/provider/HostLocaleProviderAdapter.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleConstants.java b/src/java.base/share/classes/sun/util/locale/provider/JRELocaleConstants.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleConstants.java rename to src/java.base/share/classes/sun/util/locale/provider/JRELocaleConstants.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java rename to src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/JavaTimeDateTimePatternImpl.java b/src/java.base/share/classes/sun/util/locale/provider/JavaTimeDateTimePatternImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/JavaTimeDateTimePatternImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/JavaTimeDateTimePatternImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template b/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template rename to src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo.java b/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo.java rename to src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java rename to src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java b/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java rename to src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java b/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java rename to src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/NumberFormatProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/NumberFormatProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/NumberFormatProviderImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/NumberFormatProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/ResourceBundleBasedAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/ResourceBundleBasedAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/ResourceBundleBasedAdapter.java rename to src/java.base/share/classes/sun/util/locale/provider/ResourceBundleBasedAdapter.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java rename to src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java rename to src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameUtility.java b/src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameUtility.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameUtility.java rename to src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameUtility.java diff --git a/jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java b/src/java.base/share/classes/sun/util/logging/PlatformLogger.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java rename to src/java.base/share/classes/sun/util/logging/PlatformLogger.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/BreakIteratorResourceBundle.java b/src/java.base/share/classes/sun/util/resources/BreakIteratorResourceBundle.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/BreakIteratorResourceBundle.java rename to src/java.base/share/classes/sun/util/resources/BreakIteratorResourceBundle.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/Bundles.java b/src/java.base/share/classes/sun/util/resources/Bundles.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/Bundles.java rename to src/java.base/share/classes/sun/util/resources/Bundles.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/CalendarData.properties b/src/java.base/share/classes/sun/util/resources/CalendarData.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/CalendarData.properties rename to src/java.base/share/classes/sun/util/resources/CalendarData.properties diff --git a/jdk/src/java.base/share/classes/sun/util/resources/CalendarDataProvider.java b/src/java.base/share/classes/sun/util/resources/CalendarDataProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/CalendarDataProvider.java rename to src/java.base/share/classes/sun/util/resources/CalendarDataProvider.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/CalendarData_en.properties b/src/java.base/share/classes/sun/util/resources/CalendarData_en.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/CalendarData_en.properties rename to src/java.base/share/classes/sun/util/resources/CalendarData_en.properties diff --git a/jdk/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties rename to src/java.base/share/classes/sun/util/resources/CurrencyNames.properties diff --git a/jdk/src/java.base/share/classes/sun/util/resources/CurrencyNamesProvider.java b/src/java.base/share/classes/sun/util/resources/CurrencyNamesProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/CurrencyNamesProvider.java rename to src/java.base/share/classes/sun/util/resources/CurrencyNamesProvider.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/CurrencyNames_en_US.properties b/src/java.base/share/classes/sun/util/resources/CurrencyNames_en_US.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/CurrencyNames_en_US.properties rename to src/java.base/share/classes/sun/util/resources/CurrencyNames_en_US.properties diff --git a/jdk/src/java.base/share/classes/sun/util/resources/LocaleData.java b/src/java.base/share/classes/sun/util/resources/LocaleData.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/LocaleData.java rename to src/java.base/share/classes/sun/util/resources/LocaleData.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/LocaleDataProvider.java b/src/java.base/share/classes/sun/util/resources/LocaleDataProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/LocaleDataProvider.java rename to src/java.base/share/classes/sun/util/resources/LocaleDataProvider.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/LocaleNames.properties b/src/java.base/share/classes/sun/util/resources/LocaleNames.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/LocaleNames.properties rename to src/java.base/share/classes/sun/util/resources/LocaleNames.properties diff --git a/jdk/src/java.base/share/classes/sun/util/resources/LocaleNamesBundle.java b/src/java.base/share/classes/sun/util/resources/LocaleNamesBundle.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/LocaleNamesBundle.java rename to src/java.base/share/classes/sun/util/resources/LocaleNamesBundle.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/LocaleNamesProvider.java b/src/java.base/share/classes/sun/util/resources/LocaleNamesProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/LocaleNamesProvider.java rename to src/java.base/share/classes/sun/util/resources/LocaleNamesProvider.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/LocaleNames_en.properties b/src/java.base/share/classes/sun/util/resources/LocaleNames_en.properties similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/LocaleNames_en.properties rename to src/java.base/share/classes/sun/util/resources/LocaleNames_en.properties diff --git a/jdk/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java b/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java rename to src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/ParallelListResourceBundle.java b/src/java.base/share/classes/sun/util/resources/ParallelListResourceBundle.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/ParallelListResourceBundle.java rename to src/java.base/share/classes/sun/util/resources/ParallelListResourceBundle.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java rename to src/java.base/share/classes/sun/util/resources/TimeZoneNames.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNamesBundle.java b/src/java.base/share/classes/sun/util/resources/TimeZoneNamesBundle.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNamesBundle.java rename to src/java.base/share/classes/sun/util/resources/TimeZoneNamesBundle.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNamesProvider.java b/src/java.base/share/classes/sun/util/resources/TimeZoneNamesProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNamesProvider.java rename to src/java.base/share/classes/sun/util/resources/TimeZoneNamesProvider.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNames_en.java b/src/java.base/share/classes/sun/util/resources/TimeZoneNames_en.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNames_en.java rename to src/java.base/share/classes/sun/util/resources/TimeZoneNames_en.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/cldr/CalendarDataProvider.java b/src/java.base/share/classes/sun/util/resources/cldr/CalendarDataProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/cldr/CalendarDataProvider.java rename to src/java.base/share/classes/sun/util/resources/cldr/CalendarDataProvider.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/cldr/CurrencyNamesProvider.java b/src/java.base/share/classes/sun/util/resources/cldr/CurrencyNamesProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/cldr/CurrencyNamesProvider.java rename to src/java.base/share/classes/sun/util/resources/cldr/CurrencyNamesProvider.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/cldr/LocaleNamesProvider.java b/src/java.base/share/classes/sun/util/resources/cldr/LocaleNamesProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/cldr/LocaleNamesProvider.java rename to src/java.base/share/classes/sun/util/resources/cldr/LocaleNamesProvider.java diff --git a/jdk/src/java.base/share/classes/sun/util/resources/cldr/TimeZoneNamesProvider.java b/src/java.base/share/classes/sun/util/resources/cldr/TimeZoneNamesProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/resources/cldr/TimeZoneNamesProvider.java rename to src/java.base/share/classes/sun/util/resources/cldr/TimeZoneNamesProvider.java diff --git a/jdk/src/java.base/share/classes/sun/util/spi/CalendarProvider.java b/src/java.base/share/classes/sun/util/spi/CalendarProvider.java similarity index 100% rename from jdk/src/java.base/share/classes/sun/util/spi/CalendarProvider.java rename to src/java.base/share/classes/sun/util/spi/CalendarProvider.java diff --git a/jdk/src/java.base/share/conf/net.properties b/src/java.base/share/conf/net.properties similarity index 100% rename from jdk/src/java.base/share/conf/net.properties rename to src/java.base/share/conf/net.properties diff --git a/jdk/src/java.base/share/conf/security/java.policy b/src/java.base/share/conf/security/java.policy similarity index 100% rename from jdk/src/java.base/share/conf/security/java.policy rename to src/java.base/share/conf/security/java.policy diff --git a/jdk/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security similarity index 100% rename from jdk/src/java.base/share/conf/security/java.security rename to src/java.base/share/conf/security/java.security diff --git a/jdk/src/java.base/share/conf/security/policy/README.txt b/src/java.base/share/conf/security/policy/README.txt similarity index 100% rename from jdk/src/java.base/share/conf/security/policy/README.txt rename to src/java.base/share/conf/security/policy/README.txt diff --git a/jdk/src/java.base/share/conf/security/policy/limited/default_US_export.policy b/src/java.base/share/conf/security/policy/limited/default_US_export.policy similarity index 100% rename from jdk/src/java.base/share/conf/security/policy/limited/default_US_export.policy rename to src/java.base/share/conf/security/policy/limited/default_US_export.policy diff --git a/jdk/src/java.base/share/conf/security/policy/limited/default_local.policy b/src/java.base/share/conf/security/policy/limited/default_local.policy similarity index 100% rename from jdk/src/java.base/share/conf/security/policy/limited/default_local.policy rename to src/java.base/share/conf/security/policy/limited/default_local.policy diff --git a/jdk/src/java.base/share/conf/security/policy/limited/exempt_local.policy b/src/java.base/share/conf/security/policy/limited/exempt_local.policy similarity index 100% rename from jdk/src/java.base/share/conf/security/policy/limited/exempt_local.policy rename to src/java.base/share/conf/security/policy/limited/exempt_local.policy diff --git a/jdk/src/java.base/share/conf/security/policy/unlimited/default_US_export.policy b/src/java.base/share/conf/security/policy/unlimited/default_US_export.policy similarity index 100% rename from jdk/src/java.base/share/conf/security/policy/unlimited/default_US_export.policy rename to src/java.base/share/conf/security/policy/unlimited/default_US_export.policy diff --git a/jdk/src/java.base/share/conf/security/policy/unlimited/default_local.policy b/src/java.base/share/conf/security/policy/unlimited/default_local.policy similarity index 100% rename from jdk/src/java.base/share/conf/security/policy/unlimited/default_local.policy rename to src/java.base/share/conf/security/policy/unlimited/default_local.policy diff --git a/jdk/src/java.base/share/legal/aes.md b/src/java.base/share/legal/aes.md similarity index 100% rename from jdk/src/java.base/share/legal/aes.md rename to src/java.base/share/legal/aes.md diff --git a/jdk/src/java.base/share/legal/asm.md b/src/java.base/share/legal/asm.md similarity index 100% rename from jdk/src/java.base/share/legal/asm.md rename to src/java.base/share/legal/asm.md diff --git a/jdk/src/java.base/share/legal/cldr.md b/src/java.base/share/legal/cldr.md similarity index 100% rename from jdk/src/java.base/share/legal/cldr.md rename to src/java.base/share/legal/cldr.md diff --git a/jdk/src/java.base/share/legal/icu.md b/src/java.base/share/legal/icu.md similarity index 100% rename from jdk/src/java.base/share/legal/icu.md rename to src/java.base/share/legal/icu.md diff --git a/jdk/src/java.base/share/legal/zlib.md b/src/java.base/share/legal/zlib.md similarity index 100% rename from jdk/src/java.base/share/legal/zlib.md rename to src/java.base/share/legal/zlib.md diff --git a/jdk/src/java.base/share/lib/security/cacerts b/src/java.base/share/lib/security/cacerts similarity index 100% rename from jdk/src/java.base/share/lib/security/cacerts rename to src/java.base/share/lib/security/cacerts diff --git a/jdk/src/java.base/share/lib/security/default.policy b/src/java.base/share/lib/security/default.policy similarity index 100% rename from jdk/src/java.base/share/lib/security/default.policy rename to src/java.base/share/lib/security/default.policy diff --git a/jdk/src/java.base/share/native/include/classfile_constants.h b/src/java.base/share/native/include/classfile_constants.h similarity index 100% rename from jdk/src/java.base/share/native/include/classfile_constants.h rename to src/java.base/share/native/include/classfile_constants.h diff --git a/jdk/src/java.base/share/native/include/jni.h b/src/java.base/share/native/include/jni.h similarity index 100% rename from jdk/src/java.base/share/native/include/jni.h rename to src/java.base/share/native/include/jni.h diff --git a/jdk/src/java.base/share/native/include/jvm.h b/src/java.base/share/native/include/jvm.h similarity index 100% rename from jdk/src/java.base/share/native/include/jvm.h rename to src/java.base/share/native/include/jvm.h diff --git a/jdk/src/java.base/share/native/include/jvmticmlr.h b/src/java.base/share/native/include/jvmticmlr.h similarity index 100% rename from jdk/src/java.base/share/native/include/jvmticmlr.h rename to src/java.base/share/native/include/jvmticmlr.h diff --git a/jdk/src/java.base/share/native/launcher/defines.h b/src/java.base/share/native/launcher/defines.h similarity index 100% rename from jdk/src/java.base/share/native/launcher/defines.h rename to src/java.base/share/native/launcher/defines.h diff --git a/jdk/src/java.base/share/native/launcher/main.c b/src/java.base/share/native/launcher/main.c similarity index 100% rename from jdk/src/java.base/share/native/launcher/main.c rename to src/java.base/share/native/launcher/main.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_acos.c b/src/java.base/share/native/libfdlibm/e_acos.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_acos.c rename to src/java.base/share/native/libfdlibm/e_acos.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_asin.c b/src/java.base/share/native/libfdlibm/e_asin.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_asin.c rename to src/java.base/share/native/libfdlibm/e_asin.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_atan2.c b/src/java.base/share/native/libfdlibm/e_atan2.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_atan2.c rename to src/java.base/share/native/libfdlibm/e_atan2.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_atanh.c b/src/java.base/share/native/libfdlibm/e_atanh.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_atanh.c rename to src/java.base/share/native/libfdlibm/e_atanh.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_cosh.c b/src/java.base/share/native/libfdlibm/e_cosh.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_cosh.c rename to src/java.base/share/native/libfdlibm/e_cosh.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_exp.c b/src/java.base/share/native/libfdlibm/e_exp.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_exp.c rename to src/java.base/share/native/libfdlibm/e_exp.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_fmod.c b/src/java.base/share/native/libfdlibm/e_fmod.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_fmod.c rename to src/java.base/share/native/libfdlibm/e_fmod.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_log.c b/src/java.base/share/native/libfdlibm/e_log.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_log.c rename to src/java.base/share/native/libfdlibm/e_log.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_log10.c b/src/java.base/share/native/libfdlibm/e_log10.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_log10.c rename to src/java.base/share/native/libfdlibm/e_log10.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_rem_pio2.c b/src/java.base/share/native/libfdlibm/e_rem_pio2.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_rem_pio2.c rename to src/java.base/share/native/libfdlibm/e_rem_pio2.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_remainder.c b/src/java.base/share/native/libfdlibm/e_remainder.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_remainder.c rename to src/java.base/share/native/libfdlibm/e_remainder.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_scalb.c b/src/java.base/share/native/libfdlibm/e_scalb.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_scalb.c rename to src/java.base/share/native/libfdlibm/e_scalb.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_sinh.c b/src/java.base/share/native/libfdlibm/e_sinh.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_sinh.c rename to src/java.base/share/native/libfdlibm/e_sinh.c diff --git a/jdk/src/java.base/share/native/libfdlibm/e_sqrt.c b/src/java.base/share/native/libfdlibm/e_sqrt.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/e_sqrt.c rename to src/java.base/share/native/libfdlibm/e_sqrt.c diff --git a/jdk/src/java.base/share/native/libfdlibm/fdlibm.h b/src/java.base/share/native/libfdlibm/fdlibm.h similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/fdlibm.h rename to src/java.base/share/native/libfdlibm/fdlibm.h diff --git a/jdk/src/java.base/share/native/libfdlibm/jfdlibm.h b/src/java.base/share/native/libfdlibm/jfdlibm.h similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/jfdlibm.h rename to src/java.base/share/native/libfdlibm/jfdlibm.h diff --git a/jdk/src/java.base/share/native/libfdlibm/k_cos.c b/src/java.base/share/native/libfdlibm/k_cos.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/k_cos.c rename to src/java.base/share/native/libfdlibm/k_cos.c diff --git a/jdk/src/java.base/share/native/libfdlibm/k_rem_pio2.c b/src/java.base/share/native/libfdlibm/k_rem_pio2.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/k_rem_pio2.c rename to src/java.base/share/native/libfdlibm/k_rem_pio2.c diff --git a/jdk/src/java.base/share/native/libfdlibm/k_sin.c b/src/java.base/share/native/libfdlibm/k_sin.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/k_sin.c rename to src/java.base/share/native/libfdlibm/k_sin.c diff --git a/jdk/src/java.base/share/native/libfdlibm/k_standard.c b/src/java.base/share/native/libfdlibm/k_standard.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/k_standard.c rename to src/java.base/share/native/libfdlibm/k_standard.c diff --git a/jdk/src/java.base/share/native/libfdlibm/k_tan.c b/src/java.base/share/native/libfdlibm/k_tan.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/k_tan.c rename to src/java.base/share/native/libfdlibm/k_tan.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_atan.c b/src/java.base/share/native/libfdlibm/s_atan.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_atan.c rename to src/java.base/share/native/libfdlibm/s_atan.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_ceil.c b/src/java.base/share/native/libfdlibm/s_ceil.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_ceil.c rename to src/java.base/share/native/libfdlibm/s_ceil.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_copysign.c b/src/java.base/share/native/libfdlibm/s_copysign.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_copysign.c rename to src/java.base/share/native/libfdlibm/s_copysign.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_cos.c b/src/java.base/share/native/libfdlibm/s_cos.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_cos.c rename to src/java.base/share/native/libfdlibm/s_cos.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_expm1.c b/src/java.base/share/native/libfdlibm/s_expm1.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_expm1.c rename to src/java.base/share/native/libfdlibm/s_expm1.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_fabs.c b/src/java.base/share/native/libfdlibm/s_fabs.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_fabs.c rename to src/java.base/share/native/libfdlibm/s_fabs.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_finite.c b/src/java.base/share/native/libfdlibm/s_finite.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_finite.c rename to src/java.base/share/native/libfdlibm/s_finite.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_floor.c b/src/java.base/share/native/libfdlibm/s_floor.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_floor.c rename to src/java.base/share/native/libfdlibm/s_floor.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_frexp.c b/src/java.base/share/native/libfdlibm/s_frexp.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_frexp.c rename to src/java.base/share/native/libfdlibm/s_frexp.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_ilogb.c b/src/java.base/share/native/libfdlibm/s_ilogb.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_ilogb.c rename to src/java.base/share/native/libfdlibm/s_ilogb.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_isnan.c b/src/java.base/share/native/libfdlibm/s_isnan.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_isnan.c rename to src/java.base/share/native/libfdlibm/s_isnan.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_ldexp.c b/src/java.base/share/native/libfdlibm/s_ldexp.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_ldexp.c rename to src/java.base/share/native/libfdlibm/s_ldexp.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_lib_version.c b/src/java.base/share/native/libfdlibm/s_lib_version.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_lib_version.c rename to src/java.base/share/native/libfdlibm/s_lib_version.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_log1p.c b/src/java.base/share/native/libfdlibm/s_log1p.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_log1p.c rename to src/java.base/share/native/libfdlibm/s_log1p.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_logb.c b/src/java.base/share/native/libfdlibm/s_logb.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_logb.c rename to src/java.base/share/native/libfdlibm/s_logb.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_matherr.c b/src/java.base/share/native/libfdlibm/s_matherr.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_matherr.c rename to src/java.base/share/native/libfdlibm/s_matherr.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_modf.c b/src/java.base/share/native/libfdlibm/s_modf.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_modf.c rename to src/java.base/share/native/libfdlibm/s_modf.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_nextafter.c b/src/java.base/share/native/libfdlibm/s_nextafter.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_nextafter.c rename to src/java.base/share/native/libfdlibm/s_nextafter.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_rint.c b/src/java.base/share/native/libfdlibm/s_rint.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_rint.c rename to src/java.base/share/native/libfdlibm/s_rint.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_scalbn.c b/src/java.base/share/native/libfdlibm/s_scalbn.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_scalbn.c rename to src/java.base/share/native/libfdlibm/s_scalbn.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_signgam.c b/src/java.base/share/native/libfdlibm/s_signgam.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_signgam.c rename to src/java.base/share/native/libfdlibm/s_signgam.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_significand.c b/src/java.base/share/native/libfdlibm/s_significand.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_significand.c rename to src/java.base/share/native/libfdlibm/s_significand.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_sin.c b/src/java.base/share/native/libfdlibm/s_sin.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_sin.c rename to src/java.base/share/native/libfdlibm/s_sin.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_tan.c b/src/java.base/share/native/libfdlibm/s_tan.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_tan.c rename to src/java.base/share/native/libfdlibm/s_tan.c diff --git a/jdk/src/java.base/share/native/libfdlibm/s_tanh.c b/src/java.base/share/native/libfdlibm/s_tanh.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/s_tanh.c rename to src/java.base/share/native/libfdlibm/s_tanh.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_acos.c b/src/java.base/share/native/libfdlibm/w_acos.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_acos.c rename to src/java.base/share/native/libfdlibm/w_acos.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_asin.c b/src/java.base/share/native/libfdlibm/w_asin.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_asin.c rename to src/java.base/share/native/libfdlibm/w_asin.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_atan2.c b/src/java.base/share/native/libfdlibm/w_atan2.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_atan2.c rename to src/java.base/share/native/libfdlibm/w_atan2.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_atanh.c b/src/java.base/share/native/libfdlibm/w_atanh.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_atanh.c rename to src/java.base/share/native/libfdlibm/w_atanh.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_cosh.c b/src/java.base/share/native/libfdlibm/w_cosh.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_cosh.c rename to src/java.base/share/native/libfdlibm/w_cosh.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_exp.c b/src/java.base/share/native/libfdlibm/w_exp.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_exp.c rename to src/java.base/share/native/libfdlibm/w_exp.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_fmod.c b/src/java.base/share/native/libfdlibm/w_fmod.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_fmod.c rename to src/java.base/share/native/libfdlibm/w_fmod.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_log.c b/src/java.base/share/native/libfdlibm/w_log.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_log.c rename to src/java.base/share/native/libfdlibm/w_log.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_log10.c b/src/java.base/share/native/libfdlibm/w_log10.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_log10.c rename to src/java.base/share/native/libfdlibm/w_log10.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_remainder.c b/src/java.base/share/native/libfdlibm/w_remainder.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_remainder.c rename to src/java.base/share/native/libfdlibm/w_remainder.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_scalb.c b/src/java.base/share/native/libfdlibm/w_scalb.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_scalb.c rename to src/java.base/share/native/libfdlibm/w_scalb.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_sinh.c b/src/java.base/share/native/libfdlibm/w_sinh.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_sinh.c rename to src/java.base/share/native/libfdlibm/w_sinh.c diff --git a/jdk/src/java.base/share/native/libfdlibm/w_sqrt.c b/src/java.base/share/native/libfdlibm/w_sqrt.c similarity index 100% rename from jdk/src/java.base/share/native/libfdlibm/w_sqrt.c rename to src/java.base/share/native/libfdlibm/w_sqrt.c diff --git a/jdk/src/java.base/share/native/libjava/AccessController.c b/src/java.base/share/native/libjava/AccessController.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/AccessController.c rename to src/java.base/share/native/libjava/AccessController.c diff --git a/jdk/src/java.base/share/native/libjava/Array.c b/src/java.base/share/native/libjava/Array.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Array.c rename to src/java.base/share/native/libjava/Array.c diff --git a/jdk/src/java.base/share/native/libjava/AtomicLong.c b/src/java.base/share/native/libjava/AtomicLong.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/AtomicLong.c rename to src/java.base/share/native/libjava/AtomicLong.c diff --git a/jdk/src/java.base/share/native/libjava/BootLoader.c b/src/java.base/share/native/libjava/BootLoader.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/BootLoader.c rename to src/java.base/share/native/libjava/BootLoader.c diff --git a/jdk/src/java.base/share/native/libjava/Class.c b/src/java.base/share/native/libjava/Class.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Class.c rename to src/java.base/share/native/libjava/Class.c diff --git a/jdk/src/java.base/share/native/libjava/ClassLoader.c b/src/java.base/share/native/libjava/ClassLoader.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/ClassLoader.c rename to src/java.base/share/native/libjava/ClassLoader.c diff --git a/jdk/src/java.base/share/native/libjava/ConstantPool.c b/src/java.base/share/native/libjava/ConstantPool.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/ConstantPool.c rename to src/java.base/share/native/libjava/ConstantPool.c diff --git a/jdk/src/java.base/share/native/libjava/Double.c b/src/java.base/share/native/libjava/Double.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Double.c rename to src/java.base/share/native/libjava/Double.c diff --git a/jdk/src/java.base/share/native/libjava/Executable.c b/src/java.base/share/native/libjava/Executable.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Executable.c rename to src/java.base/share/native/libjava/Executable.c diff --git a/jdk/src/java.base/share/native/libjava/Field.c b/src/java.base/share/native/libjava/Field.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Field.c rename to src/java.base/share/native/libjava/Field.c diff --git a/jdk/src/java.base/share/native/libjava/FileInputStream.c b/src/java.base/share/native/libjava/FileInputStream.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/FileInputStream.c rename to src/java.base/share/native/libjava/FileInputStream.c diff --git a/jdk/src/java.base/share/native/libjava/Float.c b/src/java.base/share/native/libjava/Float.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Float.c rename to src/java.base/share/native/libjava/Float.c diff --git a/jdk/src/java.base/share/native/libjava/Module.c b/src/java.base/share/native/libjava/Module.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Module.c rename to src/java.base/share/native/libjava/Module.c diff --git a/jdk/src/java.base/share/native/libjava/NativeAccessors.c b/src/java.base/share/native/libjava/NativeAccessors.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/NativeAccessors.c rename to src/java.base/share/native/libjava/NativeAccessors.c diff --git a/jdk/src/java.base/share/native/libjava/Object.c b/src/java.base/share/native/libjava/Object.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Object.c rename to src/java.base/share/native/libjava/Object.c diff --git a/jdk/src/java.base/share/native/libjava/ObjectInputStream.c b/src/java.base/share/native/libjava/ObjectInputStream.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/ObjectInputStream.c rename to src/java.base/share/native/libjava/ObjectInputStream.c diff --git a/jdk/src/java.base/share/native/libjava/ObjectOutputStream.c b/src/java.base/share/native/libjava/ObjectOutputStream.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/ObjectOutputStream.c rename to src/java.base/share/native/libjava/ObjectOutputStream.c diff --git a/jdk/src/java.base/share/native/libjava/ObjectStreamClass.c b/src/java.base/share/native/libjava/ObjectStreamClass.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/ObjectStreamClass.c rename to src/java.base/share/native/libjava/ObjectStreamClass.c diff --git a/jdk/src/java.base/share/native/libjava/RandomAccessFile.c b/src/java.base/share/native/libjava/RandomAccessFile.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/RandomAccessFile.c rename to src/java.base/share/native/libjava/RandomAccessFile.c diff --git a/jdk/src/java.base/share/native/libjava/Reference.c b/src/java.base/share/native/libjava/Reference.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Reference.c rename to src/java.base/share/native/libjava/Reference.c diff --git a/jdk/src/java.base/share/native/libjava/Reflection.c b/src/java.base/share/native/libjava/Reflection.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Reflection.c rename to src/java.base/share/native/libjava/Reflection.c diff --git a/jdk/src/java.base/share/native/libjava/Runtime.c b/src/java.base/share/native/libjava/Runtime.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Runtime.c rename to src/java.base/share/native/libjava/Runtime.c diff --git a/jdk/src/java.base/share/native/libjava/SecurityManager.c b/src/java.base/share/native/libjava/SecurityManager.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/SecurityManager.c rename to src/java.base/share/native/libjava/SecurityManager.c diff --git a/jdk/src/java.base/share/native/libjava/Shutdown.c b/src/java.base/share/native/libjava/Shutdown.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Shutdown.c rename to src/java.base/share/native/libjava/Shutdown.c diff --git a/jdk/src/java.base/share/native/libjava/Signal.c b/src/java.base/share/native/libjava/Signal.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Signal.c rename to src/java.base/share/native/libjava/Signal.c diff --git a/jdk/src/java.base/share/native/libjava/StackStreamFactory.c b/src/java.base/share/native/libjava/StackStreamFactory.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/StackStreamFactory.c rename to src/java.base/share/native/libjava/StackStreamFactory.c diff --git a/jdk/src/java.base/share/native/libjava/StackTraceElement.c b/src/java.base/share/native/libjava/StackTraceElement.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/StackTraceElement.c rename to src/java.base/share/native/libjava/StackTraceElement.c diff --git a/jdk/src/java.base/share/native/libjava/StrictMath.c b/src/java.base/share/native/libjava/StrictMath.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/StrictMath.c rename to src/java.base/share/native/libjava/StrictMath.c diff --git a/jdk/src/java.base/share/native/libjava/String.c b/src/java.base/share/native/libjava/String.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/String.c rename to src/java.base/share/native/libjava/String.c diff --git a/jdk/src/java.base/share/native/libjava/StringCoding.c b/src/java.base/share/native/libjava/StringCoding.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/StringCoding.c rename to src/java.base/share/native/libjava/StringCoding.c diff --git a/jdk/src/java.base/share/native/libjava/System.c b/src/java.base/share/native/libjava/System.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/System.c rename to src/java.base/share/native/libjava/System.c diff --git a/jdk/src/java.base/share/native/libjava/Thread.c b/src/java.base/share/native/libjava/Thread.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Thread.c rename to src/java.base/share/native/libjava/Thread.c diff --git a/jdk/src/java.base/share/native/libjava/Throwable.c b/src/java.base/share/native/libjava/Throwable.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/Throwable.c rename to src/java.base/share/native/libjava/Throwable.c diff --git a/jdk/src/java.base/share/native/libjava/TimeZone.c b/src/java.base/share/native/libjava/TimeZone.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/TimeZone.c rename to src/java.base/share/native/libjava/TimeZone.c diff --git a/jdk/src/java.base/share/native/libjava/VM.c b/src/java.base/share/native/libjava/VM.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/VM.c rename to src/java.base/share/native/libjava/VM.c diff --git a/jdk/src/java.base/share/native/libjava/VMSupport.c b/src/java.base/share/native/libjava/VMSupport.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/VMSupport.c rename to src/java.base/share/native/libjava/VMSupport.c diff --git a/jdk/src/java.base/share/native/libjava/check_version.c b/src/java.base/share/native/libjava/check_version.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/check_version.c rename to src/java.base/share/native/libjava/check_version.c diff --git a/jdk/src/java.base/share/native/libjava/gdefs.h b/src/java.base/share/native/libjava/gdefs.h similarity index 100% rename from jdk/src/java.base/share/native/libjava/gdefs.h rename to src/java.base/share/native/libjava/gdefs.h diff --git a/jdk/src/java.base/share/native/libjava/io_util.c b/src/java.base/share/native/libjava/io_util.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/io_util.c rename to src/java.base/share/native/libjava/io_util.c diff --git a/jdk/src/java.base/share/native/libjava/io_util.h b/src/java.base/share/native/libjava/io_util.h similarity index 100% rename from jdk/src/java.base/share/native/libjava/io_util.h rename to src/java.base/share/native/libjava/io_util.h diff --git a/jdk/src/java.base/share/native/libjava/java_props.h b/src/java.base/share/native/libjava/java_props.h similarity index 100% rename from jdk/src/java.base/share/native/libjava/java_props.h rename to src/java.base/share/native/libjava/java_props.h diff --git a/jdk/src/java.base/share/native/libjava/jdk_util.c b/src/java.base/share/native/libjava/jdk_util.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/jdk_util.c rename to src/java.base/share/native/libjava/jdk_util.c diff --git a/jdk/src/java.base/share/native/libjava/jdk_util.h b/src/java.base/share/native/libjava/jdk_util.h similarity index 100% rename from jdk/src/java.base/share/native/libjava/jdk_util.h rename to src/java.base/share/native/libjava/jdk_util.h diff --git a/jdk/src/java.base/share/native/libjava/jio.c b/src/java.base/share/native/libjava/jio.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/jio.c rename to src/java.base/share/native/libjava/jio.c diff --git a/jdk/src/java.base/share/native/libjava/jlong.h b/src/java.base/share/native/libjava/jlong.h similarity index 100% rename from jdk/src/java.base/share/native/libjava/jlong.h rename to src/java.base/share/native/libjava/jlong.h diff --git a/jdk/src/java.base/share/native/libjava/jni_util.c b/src/java.base/share/native/libjava/jni_util.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/jni_util.c rename to src/java.base/share/native/libjava/jni_util.c diff --git a/jdk/src/java.base/share/native/libjava/jni_util.h b/src/java.base/share/native/libjava/jni_util.h similarity index 100% rename from jdk/src/java.base/share/native/libjava/jni_util.h rename to src/java.base/share/native/libjava/jni_util.h diff --git a/jdk/src/java.base/share/native/libjava/sizecalc.h b/src/java.base/share/native/libjava/sizecalc.h similarity index 100% rename from jdk/src/java.base/share/native/libjava/sizecalc.h rename to src/java.base/share/native/libjava/sizecalc.h diff --git a/jdk/src/java.base/share/native/libjava/verify_stub.c b/src/java.base/share/native/libjava/verify_stub.c similarity index 100% rename from jdk/src/java.base/share/native/libjava/verify_stub.c rename to src/java.base/share/native/libjava/verify_stub.c diff --git a/jdk/src/java.base/share/native/libjimage/NativeImageBuffer.cpp b/src/java.base/share/native/libjimage/NativeImageBuffer.cpp similarity index 100% rename from jdk/src/java.base/share/native/libjimage/NativeImageBuffer.cpp rename to src/java.base/share/native/libjimage/NativeImageBuffer.cpp diff --git a/jdk/src/java.base/share/native/libjimage/endian.cpp b/src/java.base/share/native/libjimage/endian.cpp similarity index 100% rename from jdk/src/java.base/share/native/libjimage/endian.cpp rename to src/java.base/share/native/libjimage/endian.cpp diff --git a/jdk/src/java.base/share/native/libjimage/endian.hpp b/src/java.base/share/native/libjimage/endian.hpp similarity index 100% rename from jdk/src/java.base/share/native/libjimage/endian.hpp rename to src/java.base/share/native/libjimage/endian.hpp diff --git a/jdk/src/java.base/share/native/libjimage/imageDecompressor.cpp b/src/java.base/share/native/libjimage/imageDecompressor.cpp similarity index 100% rename from jdk/src/java.base/share/native/libjimage/imageDecompressor.cpp rename to src/java.base/share/native/libjimage/imageDecompressor.cpp diff --git a/jdk/src/java.base/share/native/libjimage/imageDecompressor.hpp b/src/java.base/share/native/libjimage/imageDecompressor.hpp similarity index 100% rename from jdk/src/java.base/share/native/libjimage/imageDecompressor.hpp rename to src/java.base/share/native/libjimage/imageDecompressor.hpp diff --git a/jdk/src/java.base/share/native/libjimage/imageFile.cpp b/src/java.base/share/native/libjimage/imageFile.cpp similarity index 100% rename from jdk/src/java.base/share/native/libjimage/imageFile.cpp rename to src/java.base/share/native/libjimage/imageFile.cpp diff --git a/jdk/src/java.base/share/native/libjimage/imageFile.hpp b/src/java.base/share/native/libjimage/imageFile.hpp similarity index 100% rename from jdk/src/java.base/share/native/libjimage/imageFile.hpp rename to src/java.base/share/native/libjimage/imageFile.hpp diff --git a/jdk/src/java.base/share/native/libjimage/inttypes.hpp b/src/java.base/share/native/libjimage/inttypes.hpp similarity index 100% rename from jdk/src/java.base/share/native/libjimage/inttypes.hpp rename to src/java.base/share/native/libjimage/inttypes.hpp diff --git a/jdk/src/java.base/share/native/libjimage/jimage.cpp b/src/java.base/share/native/libjimage/jimage.cpp similarity index 100% rename from jdk/src/java.base/share/native/libjimage/jimage.cpp rename to src/java.base/share/native/libjimage/jimage.cpp diff --git a/jdk/src/java.base/share/native/libjimage/jimage.hpp b/src/java.base/share/native/libjimage/jimage.hpp similarity index 100% rename from jdk/src/java.base/share/native/libjimage/jimage.hpp rename to src/java.base/share/native/libjimage/jimage.hpp diff --git a/jdk/src/java.base/share/native/libjimage/osSupport.hpp b/src/java.base/share/native/libjimage/osSupport.hpp similarity index 100% rename from jdk/src/java.base/share/native/libjimage/osSupport.hpp rename to src/java.base/share/native/libjimage/osSupport.hpp diff --git a/jdk/src/java.base/share/native/libjli/args.c b/src/java.base/share/native/libjli/args.c similarity index 100% rename from jdk/src/java.base/share/native/libjli/args.c rename to src/java.base/share/native/libjli/args.c diff --git a/jdk/src/java.base/share/native/libjli/emessages.h b/src/java.base/share/native/libjli/emessages.h similarity index 100% rename from jdk/src/java.base/share/native/libjli/emessages.h rename to src/java.base/share/native/libjli/emessages.h diff --git a/jdk/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c similarity index 100% rename from jdk/src/java.base/share/native/libjli/java.c rename to src/java.base/share/native/libjli/java.c diff --git a/jdk/src/java.base/share/native/libjli/java.h b/src/java.base/share/native/libjli/java.h similarity index 100% rename from jdk/src/java.base/share/native/libjli/java.h rename to src/java.base/share/native/libjli/java.h diff --git a/jdk/src/java.base/share/native/libjli/jli_util.c b/src/java.base/share/native/libjli/jli_util.c similarity index 100% rename from jdk/src/java.base/share/native/libjli/jli_util.c rename to src/java.base/share/native/libjli/jli_util.c diff --git a/jdk/src/java.base/share/native/libjli/jli_util.h b/src/java.base/share/native/libjli/jli_util.h similarity index 100% rename from jdk/src/java.base/share/native/libjli/jli_util.h rename to src/java.base/share/native/libjli/jli_util.h diff --git a/jdk/src/java.base/share/native/libjli/manifest_info.h b/src/java.base/share/native/libjli/manifest_info.h similarity index 100% rename from jdk/src/java.base/share/native/libjli/manifest_info.h rename to src/java.base/share/native/libjli/manifest_info.h diff --git a/jdk/src/java.base/share/native/libjli/parse_manifest.c b/src/java.base/share/native/libjli/parse_manifest.c similarity index 100% rename from jdk/src/java.base/share/native/libjli/parse_manifest.c rename to src/java.base/share/native/libjli/parse_manifest.c diff --git a/jdk/src/java.base/share/native/libjli/splashscreen.h b/src/java.base/share/native/libjli/splashscreen.h similarity index 100% rename from jdk/src/java.base/share/native/libjli/splashscreen.h rename to src/java.base/share/native/libjli/splashscreen.h diff --git a/jdk/src/java.base/share/native/libjli/splashscreen_stubs.c b/src/java.base/share/native/libjli/splashscreen_stubs.c similarity index 100% rename from jdk/src/java.base/share/native/libjli/splashscreen_stubs.c rename to src/java.base/share/native/libjli/splashscreen_stubs.c diff --git a/jdk/src/java.base/share/native/libjli/wildcard.c b/src/java.base/share/native/libjli/wildcard.c similarity index 100% rename from jdk/src/java.base/share/native/libjli/wildcard.c rename to src/java.base/share/native/libjli/wildcard.c diff --git a/jdk/src/java.base/share/native/libjli/wildcard.h b/src/java.base/share/native/libjli/wildcard.h similarity index 100% rename from jdk/src/java.base/share/native/libjli/wildcard.h rename to src/java.base/share/native/libjli/wildcard.h diff --git a/jdk/src/java.base/share/native/libnet/DatagramPacket.c b/src/java.base/share/native/libnet/DatagramPacket.c similarity index 100% rename from jdk/src/java.base/share/native/libnet/DatagramPacket.c rename to src/java.base/share/native/libnet/DatagramPacket.c diff --git a/jdk/src/java.base/share/native/libnet/Inet4Address.c b/src/java.base/share/native/libnet/Inet4Address.c similarity index 100% rename from jdk/src/java.base/share/native/libnet/Inet4Address.c rename to src/java.base/share/native/libnet/Inet4Address.c diff --git a/jdk/src/java.base/share/native/libnet/Inet6Address.c b/src/java.base/share/native/libnet/Inet6Address.c similarity index 100% rename from jdk/src/java.base/share/native/libnet/Inet6Address.c rename to src/java.base/share/native/libnet/Inet6Address.c diff --git a/jdk/src/java.base/share/native/libnet/InetAddress.c b/src/java.base/share/native/libnet/InetAddress.c similarity index 100% rename from jdk/src/java.base/share/native/libnet/InetAddress.c rename to src/java.base/share/native/libnet/InetAddress.c diff --git a/jdk/src/java.base/share/native/libnet/net_util.c b/src/java.base/share/native/libnet/net_util.c similarity index 100% rename from jdk/src/java.base/share/native/libnet/net_util.c rename to src/java.base/share/native/libnet/net_util.c diff --git a/jdk/src/java.base/share/native/libnet/net_util.h b/src/java.base/share/native/libnet/net_util.h similarity index 100% rename from jdk/src/java.base/share/native/libnet/net_util.h rename to src/java.base/share/native/libnet/net_util.h diff --git a/jdk/src/java.base/share/native/libnet/proxy_util.c b/src/java.base/share/native/libnet/proxy_util.c similarity index 100% rename from jdk/src/java.base/share/native/libnet/proxy_util.c rename to src/java.base/share/native/libnet/proxy_util.c diff --git a/jdk/src/java.base/share/native/libnet/proxy_util.h b/src/java.base/share/native/libnet/proxy_util.h similarity index 100% rename from jdk/src/java.base/share/native/libnet/proxy_util.h rename to src/java.base/share/native/libnet/proxy_util.h diff --git a/jdk/src/java.base/share/native/libnio/ch/nio.h b/src/java.base/share/native/libnio/ch/nio.h similarity index 100% rename from jdk/src/java.base/share/native/libnio/ch/nio.h rename to src/java.base/share/native/libnio/ch/nio.h diff --git a/jdk/src/java.base/share/native/libnio/nio_util.c b/src/java.base/share/native/libnio/nio_util.c similarity index 100% rename from jdk/src/java.base/share/native/libnio/nio_util.c rename to src/java.base/share/native/libnio/nio_util.c diff --git a/jdk/src/java.base/share/native/libverify/check_code.c b/src/java.base/share/native/libverify/check_code.c similarity index 100% rename from jdk/src/java.base/share/native/libverify/check_code.c rename to src/java.base/share/native/libverify/check_code.c diff --git a/jdk/src/java.base/share/native/libverify/check_format.c b/src/java.base/share/native/libverify/check_format.c similarity index 100% rename from jdk/src/java.base/share/native/libverify/check_format.c rename to src/java.base/share/native/libverify/check_format.c diff --git a/jdk/src/java.base/share/native/libverify/opcodes.in_out b/src/java.base/share/native/libverify/opcodes.in_out similarity index 100% rename from jdk/src/java.base/share/native/libverify/opcodes.in_out rename to src/java.base/share/native/libverify/opcodes.in_out diff --git a/jdk/src/java.base/share/native/libzip/Adler32.c b/src/java.base/share/native/libzip/Adler32.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/Adler32.c rename to src/java.base/share/native/libzip/Adler32.c diff --git a/jdk/src/java.base/share/native/libzip/CRC32.c b/src/java.base/share/native/libzip/CRC32.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/CRC32.c rename to src/java.base/share/native/libzip/CRC32.c diff --git a/jdk/src/java.base/share/native/libzip/Deflater.c b/src/java.base/share/native/libzip/Deflater.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/Deflater.c rename to src/java.base/share/native/libzip/Deflater.c diff --git a/jdk/src/java.base/share/native/libzip/Inflater.c b/src/java.base/share/native/libzip/Inflater.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/Inflater.c rename to src/java.base/share/native/libzip/Inflater.c diff --git a/jdk/src/java.base/share/native/libzip/zip_util.c b/src/java.base/share/native/libzip/zip_util.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zip_util.c rename to src/java.base/share/native/libzip/zip_util.c diff --git a/jdk/src/java.base/share/native/libzip/zip_util.h b/src/java.base/share/native/libzip/zip_util.h similarity index 100% rename from jdk/src/java.base/share/native/libzip/zip_util.h rename to src/java.base/share/native/libzip/zip_util.h diff --git a/jdk/src/java.base/share/native/libzip/zlib/ChangeLog b/src/java.base/share/native/libzip/zlib/ChangeLog similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/ChangeLog rename to src/java.base/share/native/libzip/zlib/ChangeLog diff --git a/jdk/src/java.base/share/native/libzip/zlib/README b/src/java.base/share/native/libzip/zlib/README similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/README rename to src/java.base/share/native/libzip/zlib/README diff --git a/jdk/src/java.base/share/native/libzip/zlib/compress.c b/src/java.base/share/native/libzip/zlib/compress.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/compress.c rename to src/java.base/share/native/libzip/zlib/compress.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/crc32.h b/src/java.base/share/native/libzip/zlib/crc32.h similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/crc32.h rename to src/java.base/share/native/libzip/zlib/crc32.h diff --git a/jdk/src/java.base/share/native/libzip/zlib/deflate.c b/src/java.base/share/native/libzip/zlib/deflate.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/deflate.c rename to src/java.base/share/native/libzip/zlib/deflate.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/deflate.h b/src/java.base/share/native/libzip/zlib/deflate.h similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/deflate.h rename to src/java.base/share/native/libzip/zlib/deflate.h diff --git a/jdk/src/java.base/share/native/libzip/zlib/gzclose.c b/src/java.base/share/native/libzip/zlib/gzclose.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/gzclose.c rename to src/java.base/share/native/libzip/zlib/gzclose.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/gzguts.h b/src/java.base/share/native/libzip/zlib/gzguts.h similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/gzguts.h rename to src/java.base/share/native/libzip/zlib/gzguts.h diff --git a/jdk/src/java.base/share/native/libzip/zlib/gzlib.c b/src/java.base/share/native/libzip/zlib/gzlib.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/gzlib.c rename to src/java.base/share/native/libzip/zlib/gzlib.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/gzread.c b/src/java.base/share/native/libzip/zlib/gzread.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/gzread.c rename to src/java.base/share/native/libzip/zlib/gzread.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/gzwrite.c b/src/java.base/share/native/libzip/zlib/gzwrite.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/gzwrite.c rename to src/java.base/share/native/libzip/zlib/gzwrite.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/infback.c b/src/java.base/share/native/libzip/zlib/infback.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/infback.c rename to src/java.base/share/native/libzip/zlib/infback.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/inffast.c b/src/java.base/share/native/libzip/zlib/inffast.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/inffast.c rename to src/java.base/share/native/libzip/zlib/inffast.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/inffast.h b/src/java.base/share/native/libzip/zlib/inffast.h similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/inffast.h rename to src/java.base/share/native/libzip/zlib/inffast.h diff --git a/jdk/src/java.base/share/native/libzip/zlib/inffixed.h b/src/java.base/share/native/libzip/zlib/inffixed.h similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/inffixed.h rename to src/java.base/share/native/libzip/zlib/inffixed.h diff --git a/jdk/src/java.base/share/native/libzip/zlib/inflate.c b/src/java.base/share/native/libzip/zlib/inflate.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/inflate.c rename to src/java.base/share/native/libzip/zlib/inflate.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/inflate.h b/src/java.base/share/native/libzip/zlib/inflate.h similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/inflate.h rename to src/java.base/share/native/libzip/zlib/inflate.h diff --git a/jdk/src/java.base/share/native/libzip/zlib/inftrees.c b/src/java.base/share/native/libzip/zlib/inftrees.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/inftrees.c rename to src/java.base/share/native/libzip/zlib/inftrees.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/inftrees.h b/src/java.base/share/native/libzip/zlib/inftrees.h similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/inftrees.h rename to src/java.base/share/native/libzip/zlib/inftrees.h diff --git a/jdk/src/java.base/share/native/libzip/zlib/patches/ChangeLog_java b/src/java.base/share/native/libzip/zlib/patches/ChangeLog_java similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/patches/ChangeLog_java rename to src/java.base/share/native/libzip/zlib/patches/ChangeLog_java diff --git a/jdk/src/java.base/share/native/libzip/zlib/trees.c b/src/java.base/share/native/libzip/zlib/trees.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/trees.c rename to src/java.base/share/native/libzip/zlib/trees.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/trees.h b/src/java.base/share/native/libzip/zlib/trees.h similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/trees.h rename to src/java.base/share/native/libzip/zlib/trees.h diff --git a/jdk/src/java.base/share/native/libzip/zlib/uncompr.c b/src/java.base/share/native/libzip/zlib/uncompr.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/uncompr.c rename to src/java.base/share/native/libzip/zlib/uncompr.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/zadler32.c b/src/java.base/share/native/libzip/zlib/zadler32.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/zadler32.c rename to src/java.base/share/native/libzip/zlib/zadler32.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/zconf.h b/src/java.base/share/native/libzip/zlib/zconf.h similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/zconf.h rename to src/java.base/share/native/libzip/zlib/zconf.h diff --git a/jdk/src/java.base/share/native/libzip/zlib/zcrc32.c b/src/java.base/share/native/libzip/zlib/zcrc32.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/zcrc32.c rename to src/java.base/share/native/libzip/zlib/zcrc32.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/zlib.h b/src/java.base/share/native/libzip/zlib/zlib.h similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/zlib.h rename to src/java.base/share/native/libzip/zlib/zlib.h diff --git a/jdk/src/java.base/share/native/libzip/zlib/zutil.c b/src/java.base/share/native/libzip/zlib/zutil.c similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/zutil.c rename to src/java.base/share/native/libzip/zlib/zutil.c diff --git a/jdk/src/java.base/share/native/libzip/zlib/zutil.h b/src/java.base/share/native/libzip/zlib/zutil.h similarity index 100% rename from jdk/src/java.base/share/native/libzip/zlib/zutil.h rename to src/java.base/share/native/libzip/zlib/zutil.h diff --git a/jdk/src/java.base/solaris/classes/module-info.java.extra b/src/java.base/solaris/classes/module-info.java.extra similarity index 100% rename from jdk/src/java.base/solaris/classes/module-info.java.extra rename to src/java.base/solaris/classes/module-info.java.extra diff --git a/jdk/src/java.base/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java b/src/java.base/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java rename to src/java.base/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java b/src/java.base/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java rename to src/java.base/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java b/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java rename to src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java b/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java rename to src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java b/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java rename to src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java b/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java rename to src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java b/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java rename to src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java b/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java rename to src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java b/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java rename to src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java b/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java rename to src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java b/src/java.base/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java rename to src/java.base/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java b/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java rename to src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template b/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template rename to src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template diff --git a/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java b/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java rename to src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java b/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java rename to src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java b/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java rename to src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java b/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java rename to src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java b/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java rename to src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java diff --git a/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java b/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java similarity index 100% rename from jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java rename to src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java diff --git a/jdk/src/java.base/solaris/lib/security/default.policy b/src/java.base/solaris/lib/security/default.policy similarity index 100% rename from jdk/src/java.base/solaris/lib/security/default.policy rename to src/java.base/solaris/lib/security/default.policy diff --git a/jdk/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c b/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c similarity index 100% rename from jdk/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c rename to src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c diff --git a/hotspot/src/os/solaris/vm/jsig.c b/src/java.base/solaris/native/libjsig/jsig.c similarity index 100% rename from hotspot/src/os/solaris/vm/jsig.c rename to src/java.base/solaris/native/libjsig/jsig.c diff --git a/hotspot/src/os/solaris/dtrace/libjvm_db.c b/src/java.base/solaris/native/libjvm_db/libjvm_db.c similarity index 100% rename from hotspot/src/os/solaris/dtrace/libjvm_db.c rename to src/java.base/solaris/native/libjvm_db/libjvm_db.c diff --git a/hotspot/src/os/solaris/dtrace/libjvm_db.h b/src/java.base/solaris/native/libjvm_db/libjvm_db.h similarity index 100% rename from hotspot/src/os/solaris/dtrace/libjvm_db.h rename to src/java.base/solaris/native/libjvm_db/libjvm_db.h diff --git a/hotspot/src/os/bsd/dtrace/jvm_dtrace.c b/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c similarity index 100% rename from hotspot/src/os/bsd/dtrace/jvm_dtrace.c rename to src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c diff --git a/hotspot/src/os/bsd/dtrace/jvm_dtrace.h b/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.h similarity index 100% rename from hotspot/src/os/bsd/dtrace/jvm_dtrace.h rename to src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.h diff --git a/jdk/src/java.base/solaris/native/libnet/solaris_close.c b/src/java.base/solaris/native/libnet/solaris_close.c similarity index 100% rename from jdk/src/java.base/solaris/native/libnet/solaris_close.c rename to src/java.base/solaris/native/libnet/solaris_close.c diff --git a/jdk/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c b/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c similarity index 100% rename from jdk/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c rename to src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c diff --git a/jdk/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c b/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c similarity index 100% rename from jdk/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c rename to src/java.base/solaris/native/libnio/ch/SolarisEventPort.c diff --git a/jdk/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c b/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c similarity index 100% rename from jdk/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c rename to src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c diff --git a/jdk/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c b/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c similarity index 100% rename from jdk/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c rename to src/java.base/solaris/native/libnio/fs/SolarisWatchService.c diff --git a/jdk/src/java.base/unix/classes/java/io/DefaultFileSystem.java b/src/java.base/unix/classes/java/io/DefaultFileSystem.java similarity index 100% rename from jdk/src/java.base/unix/classes/java/io/DefaultFileSystem.java rename to src/java.base/unix/classes/java/io/DefaultFileSystem.java diff --git a/jdk/src/java.base/unix/classes/java/io/FileDescriptor.java b/src/java.base/unix/classes/java/io/FileDescriptor.java similarity index 100% rename from jdk/src/java.base/unix/classes/java/io/FileDescriptor.java rename to src/java.base/unix/classes/java/io/FileDescriptor.java diff --git a/jdk/src/java.base/unix/classes/java/io/UnixFileSystem.java b/src/java.base/unix/classes/java/io/UnixFileSystem.java similarity index 100% rename from jdk/src/java.base/unix/classes/java/io/UnixFileSystem.java rename to src/java.base/unix/classes/java/io/UnixFileSystem.java diff --git a/jdk/src/java.base/unix/classes/java/lang/ClassLoaderHelper.java b/src/java.base/unix/classes/java/lang/ClassLoaderHelper.java similarity index 100% rename from jdk/src/java.base/unix/classes/java/lang/ClassLoaderHelper.java rename to src/java.base/unix/classes/java/lang/ClassLoaderHelper.java diff --git a/jdk/src/java.base/unix/classes/java/lang/ProcessEnvironment.java b/src/java.base/unix/classes/java/lang/ProcessEnvironment.java similarity index 100% rename from jdk/src/java.base/unix/classes/java/lang/ProcessEnvironment.java rename to src/java.base/unix/classes/java/lang/ProcessEnvironment.java diff --git a/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java b/src/java.base/unix/classes/java/lang/ProcessImpl.java similarity index 100% rename from jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java rename to src/java.base/unix/classes/java/lang/ProcessImpl.java diff --git a/jdk/src/java.base/unix/classes/java/lang/Terminator.java b/src/java.base/unix/classes/java/lang/Terminator.java similarity index 100% rename from jdk/src/java.base/unix/classes/java/lang/Terminator.java rename to src/java.base/unix/classes/java/lang/Terminator.java diff --git a/jdk/src/java.base/unix/classes/java/net/DefaultDatagramSocketImplFactory.java b/src/java.base/unix/classes/java/net/DefaultDatagramSocketImplFactory.java similarity index 100% rename from jdk/src/java.base/unix/classes/java/net/DefaultDatagramSocketImplFactory.java rename to src/java.base/unix/classes/java/net/DefaultDatagramSocketImplFactory.java diff --git a/jdk/src/java.base/unix/classes/java/net/DefaultInterface.java b/src/java.base/unix/classes/java/net/DefaultInterface.java similarity index 100% rename from jdk/src/java.base/unix/classes/java/net/DefaultInterface.java rename to src/java.base/unix/classes/java/net/DefaultInterface.java diff --git a/jdk/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java b/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java similarity index 100% rename from jdk/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java rename to src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java diff --git a/jdk/src/java.base/unix/classes/java/net/PlainSocketImpl.java b/src/java.base/unix/classes/java/net/PlainSocketImpl.java similarity index 100% rename from jdk/src/java.base/unix/classes/java/net/PlainSocketImpl.java rename to src/java.base/unix/classes/java/net/PlainSocketImpl.java diff --git a/jdk/src/java.base/unix/classes/jdk/internal/loader/FileURLMapper.java b/src/java.base/unix/classes/jdk/internal/loader/FileURLMapper.java similarity index 100% rename from jdk/src/java.base/unix/classes/jdk/internal/loader/FileURLMapper.java rename to src/java.base/unix/classes/jdk/internal/loader/FileURLMapper.java diff --git a/jdk/src/java.base/unix/classes/jdk/internal/misc/OSEnvironment.java b/src/java.base/unix/classes/jdk/internal/misc/OSEnvironment.java similarity index 100% rename from jdk/src/java.base/unix/classes/jdk/internal/misc/OSEnvironment.java rename to src/java.base/unix/classes/jdk/internal/misc/OSEnvironment.java diff --git a/jdk/src/java.base/unix/classes/module-info.java.extra b/src/java.base/unix/classes/module-info.java.extra similarity index 100% rename from jdk/src/java.base/unix/classes/module-info.java.extra rename to src/java.base/unix/classes/module-info.java.extra diff --git a/jdk/src/java.base/unix/classes/sun/net/NetHooks.java b/src/java.base/unix/classes/sun/net/NetHooks.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/net/NetHooks.java rename to src/java.base/unix/classes/sun/net/NetHooks.java diff --git a/jdk/src/java.base/unix/classes/sun/net/PortConfig.java b/src/java.base/unix/classes/sun/net/PortConfig.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/net/PortConfig.java rename to src/java.base/unix/classes/sun/net/PortConfig.java diff --git a/jdk/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java b/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java rename to src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java diff --git a/jdk/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java b/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java rename to src/java.base/unix/classes/sun/net/sdp/SdpProvider.java diff --git a/jdk/src/java.base/unix/classes/sun/net/www/content-types.properties b/src/java.base/unix/classes/sun/net/www/content-types.properties similarity index 100% rename from jdk/src/java.base/unix/classes/sun/net/www/content-types.properties rename to src/java.base/unix/classes/sun/net/www/content-types.properties diff --git a/jdk/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java b/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java rename to src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java diff --git a/jdk/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java b/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java rename to src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java diff --git a/jdk/src/java.base/unix/classes/sun/net/www/protocol/jar/JarFileFactory.java b/src/java.base/unix/classes/sun/net/www/protocol/jar/JarFileFactory.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/net/www/protocol/jar/JarFileFactory.java rename to src/java.base/unix/classes/sun/net/www/protocol/jar/JarFileFactory.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/DatagramDispatcher.java b/src/java.base/unix/classes/sun/nio/ch/DatagramDispatcher.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/DatagramDispatcher.java rename to src/java.base/unix/classes/sun/nio/ch/DatagramDispatcher.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/FileDispatcherImpl.java b/src/java.base/unix/classes/sun/nio/ch/FileDispatcherImpl.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/FileDispatcherImpl.java rename to src/java.base/unix/classes/sun/nio/ch/FileDispatcherImpl.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/FileKey.java b/src/java.base/unix/classes/sun/nio/ch/FileKey.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/FileKey.java rename to src/java.base/unix/classes/sun/nio/ch/FileKey.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/InheritedChannel.java b/src/java.base/unix/classes/sun/nio/ch/InheritedChannel.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/InheritedChannel.java rename to src/java.base/unix/classes/sun/nio/ch/InheritedChannel.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/NativeThread.java b/src/java.base/unix/classes/sun/nio/ch/NativeThread.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/NativeThread.java rename to src/java.base/unix/classes/sun/nio/ch/NativeThread.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/PipeImpl.java b/src/java.base/unix/classes/sun/nio/ch/PipeImpl.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/PipeImpl.java rename to src/java.base/unix/classes/sun/nio/ch/PipeImpl.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/PollArrayWrapper.java b/src/java.base/unix/classes/sun/nio/ch/PollArrayWrapper.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/PollArrayWrapper.java rename to src/java.base/unix/classes/sun/nio/ch/PollArrayWrapper.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java b/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java rename to src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/Port.java b/src/java.base/unix/classes/sun/nio/ch/Port.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/Port.java rename to src/java.base/unix/classes/sun/nio/ch/Port.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java rename to src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java b/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java rename to src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java rename to src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java rename to src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java rename to src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/DefaultFileTypeDetector.java b/src/java.base/unix/classes/sun/nio/fs/DefaultFileTypeDetector.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/DefaultFileTypeDetector.java rename to src/java.base/unix/classes/sun/nio/fs/DefaultFileTypeDetector.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java b/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java rename to src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java b/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java rename to src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template b/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template rename to src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java b/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java rename to src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixDirectoryStream.java b/src/java.base/unix/classes/sun/nio/fs/UnixDirectoryStream.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixDirectoryStream.java rename to src/java.base/unix/classes/sun/nio/fs/UnixDirectoryStream.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixException.java b/src/java.base/unix/classes/sun/nio/fs/UnixException.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixException.java rename to src/java.base/unix/classes/sun/nio/fs/UnixException.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java rename to src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java rename to src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java rename to src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileModeAttribute.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileModeAttribute.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileModeAttribute.java rename to src/java.base/unix/classes/sun/nio/fs/UnixFileModeAttribute.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java rename to src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileStoreAttributes.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileStoreAttributes.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileStoreAttributes.java rename to src/java.base/unix/classes/sun/nio/fs/UnixFileStoreAttributes.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java rename to src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java rename to src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixMountEntry.java b/src/java.base/unix/classes/sun/nio/fs/UnixMountEntry.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixMountEntry.java rename to src/java.base/unix/classes/sun/nio/fs/UnixMountEntry.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java b/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java rename to src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixPath.java b/src/java.base/unix/classes/sun/nio/fs/UnixPath.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixPath.java rename to src/java.base/unix/classes/sun/nio/fs/UnixPath.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java b/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java rename to src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java b/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java rename to src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixUserPrincipals.java b/src/java.base/unix/classes/sun/nio/fs/UnixUserPrincipals.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/UnixUserPrincipals.java rename to src/java.base/unix/classes/sun/nio/fs/UnixUserPrincipals.java diff --git a/jdk/src/java.base/unix/classes/sun/security/provider/NativePRNG.java b/src/java.base/unix/classes/sun/security/provider/NativePRNG.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/security/provider/NativePRNG.java rename to src/java.base/unix/classes/sun/security/provider/NativePRNG.java diff --git a/jdk/src/java.base/unix/classes/sun/security/provider/NativeSeedGenerator.java b/src/java.base/unix/classes/sun/security/provider/NativeSeedGenerator.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/security/provider/NativeSeedGenerator.java rename to src/java.base/unix/classes/sun/security/provider/NativeSeedGenerator.java diff --git a/jdk/src/java.base/unix/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java b/src/java.base/unix/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java rename to src/java.base/unix/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java diff --git a/jdk/src/java.base/unix/conf/aarch64/jvm.cfg b/src/java.base/unix/conf/aarch64/jvm.cfg similarity index 100% rename from jdk/src/java.base/unix/conf/aarch64/jvm.cfg rename to src/java.base/unix/conf/aarch64/jvm.cfg diff --git a/jdk/src/java.base/unix/conf/amd64/jvm.cfg b/src/java.base/unix/conf/amd64/jvm.cfg similarity index 100% rename from jdk/src/java.base/unix/conf/amd64/jvm.cfg rename to src/java.base/unix/conf/amd64/jvm.cfg diff --git a/jdk/src/java.base/unix/conf/arm/jvm.cfg b/src/java.base/unix/conf/arm/jvm.cfg similarity index 100% rename from jdk/src/java.base/unix/conf/arm/jvm.cfg rename to src/java.base/unix/conf/arm/jvm.cfg diff --git a/jdk/src/java.base/unix/conf/i586/jvm.cfg b/src/java.base/unix/conf/i586/jvm.cfg similarity index 100% rename from jdk/src/java.base/unix/conf/i586/jvm.cfg rename to src/java.base/unix/conf/i586/jvm.cfg diff --git a/jdk/src/java.base/unix/conf/ia64/jvm.cfg b/src/java.base/unix/conf/ia64/jvm.cfg similarity index 100% rename from jdk/src/java.base/unix/conf/ia64/jvm.cfg rename to src/java.base/unix/conf/ia64/jvm.cfg diff --git a/jdk/src/java.base/unix/conf/ppc64/jvm.cfg b/src/java.base/unix/conf/ppc64/jvm.cfg similarity index 100% rename from jdk/src/java.base/unix/conf/ppc64/jvm.cfg rename to src/java.base/unix/conf/ppc64/jvm.cfg diff --git a/jdk/src/java.base/unix/conf/ppc64le/jvm.cfg b/src/java.base/unix/conf/ppc64le/jvm.cfg similarity index 100% rename from jdk/src/java.base/unix/conf/ppc64le/jvm.cfg rename to src/java.base/unix/conf/ppc64le/jvm.cfg diff --git a/jdk/src/java.base/unix/conf/s390x/jvm.cfg b/src/java.base/unix/conf/s390x/jvm.cfg similarity index 100% rename from jdk/src/java.base/unix/conf/s390x/jvm.cfg rename to src/java.base/unix/conf/s390x/jvm.cfg diff --git a/jdk/src/java.base/unix/conf/sdp/sdp.conf.template b/src/java.base/unix/conf/sdp/sdp.conf.template similarity index 100% rename from jdk/src/java.base/unix/conf/sdp/sdp.conf.template rename to src/java.base/unix/conf/sdp/sdp.conf.template diff --git a/jdk/src/java.base/unix/conf/sparc/jvm.cfg b/src/java.base/unix/conf/sparc/jvm.cfg similarity index 100% rename from jdk/src/java.base/unix/conf/sparc/jvm.cfg rename to src/java.base/unix/conf/sparc/jvm.cfg diff --git a/jdk/src/java.base/unix/conf/sparcv9/jvm.cfg b/src/java.base/unix/conf/sparcv9/jvm.cfg similarity index 100% rename from jdk/src/java.base/unix/conf/sparcv9/jvm.cfg rename to src/java.base/unix/conf/sparcv9/jvm.cfg diff --git a/jdk/src/java.base/unix/conf/zero/jvm.cfg b/src/java.base/unix/conf/zero/jvm.cfg similarity index 100% rename from jdk/src/java.base/unix/conf/zero/jvm.cfg rename to src/java.base/unix/conf/zero/jvm.cfg diff --git a/jdk/src/java.base/unix/native/include/jni_md.h b/src/java.base/unix/native/include/jni_md.h similarity index 100% rename from jdk/src/java.base/unix/native/include/jni_md.h rename to src/java.base/unix/native/include/jni_md.h diff --git a/jdk/src/java.base/unix/native/include/jvm_md.h b/src/java.base/unix/native/include/jvm_md.h similarity index 100% rename from jdk/src/java.base/unix/native/include/jvm_md.h rename to src/java.base/unix/native/include/jvm_md.h diff --git a/jdk/src/java.base/unix/native/jspawnhelper/jspawnhelper.c b/src/java.base/unix/native/jspawnhelper/jspawnhelper.c similarity index 100% rename from jdk/src/java.base/unix/native/jspawnhelper/jspawnhelper.c rename to src/java.base/unix/native/jspawnhelper/jspawnhelper.c diff --git a/jdk/src/java.base/unix/native/launcher/jexec.c b/src/java.base/unix/native/launcher/jexec.c similarity index 100% rename from jdk/src/java.base/unix/native/launcher/jexec.c rename to src/java.base/unix/native/launcher/jexec.c diff --git a/jdk/src/java.base/unix/native/libjava/Console_md.c b/src/java.base/unix/native/libjava/Console_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/Console_md.c rename to src/java.base/unix/native/libjava/Console_md.c diff --git a/jdk/src/java.base/unix/native/libjava/FileDescriptor_md.c b/src/java.base/unix/native/libjava/FileDescriptor_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/FileDescriptor_md.c rename to src/java.base/unix/native/libjava/FileDescriptor_md.c diff --git a/jdk/src/java.base/unix/native/libjava/FileInputStream_md.c b/src/java.base/unix/native/libjava/FileInputStream_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/FileInputStream_md.c rename to src/java.base/unix/native/libjava/FileInputStream_md.c diff --git a/jdk/src/java.base/unix/native/libjava/FileOutputStream_md.c b/src/java.base/unix/native/libjava/FileOutputStream_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/FileOutputStream_md.c rename to src/java.base/unix/native/libjava/FileOutputStream_md.c diff --git a/jdk/src/java.base/unix/native/libjava/ProcessEnvironment_md.c b/src/java.base/unix/native/libjava/ProcessEnvironment_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/ProcessEnvironment_md.c rename to src/java.base/unix/native/libjava/ProcessEnvironment_md.c diff --git a/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c b/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c rename to src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c diff --git a/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h b/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h similarity index 100% rename from jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h rename to src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h diff --git a/jdk/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/ProcessImpl_md.c rename to src/java.base/unix/native/libjava/ProcessImpl_md.c diff --git a/jdk/src/java.base/unix/native/libjava/RandomAccessFile_md.c b/src/java.base/unix/native/libjava/RandomAccessFile_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/RandomAccessFile_md.c rename to src/java.base/unix/native/libjava/RandomAccessFile_md.c diff --git a/jdk/src/java.base/unix/native/libjava/TimeZone_md.c b/src/java.base/unix/native/libjava/TimeZone_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/TimeZone_md.c rename to src/java.base/unix/native/libjava/TimeZone_md.c diff --git a/jdk/src/java.base/unix/native/libjava/TimeZone_md.h b/src/java.base/unix/native/libjava/TimeZone_md.h similarity index 100% rename from jdk/src/java.base/unix/native/libjava/TimeZone_md.h rename to src/java.base/unix/native/libjava/TimeZone_md.h diff --git a/jdk/src/java.base/unix/native/libjava/UnixFileSystem_md.c b/src/java.base/unix/native/libjava/UnixFileSystem_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/UnixFileSystem_md.c rename to src/java.base/unix/native/libjava/UnixFileSystem_md.c diff --git a/jdk/src/java.base/unix/native/libjava/VM_md.c b/src/java.base/unix/native/libjava/VM_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/VM_md.c rename to src/java.base/unix/native/libjava/VM_md.c diff --git a/jdk/src/java.base/unix/native/libjava/canonicalize_md.c b/src/java.base/unix/native/libjava/canonicalize_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/canonicalize_md.c rename to src/java.base/unix/native/libjava/canonicalize_md.c diff --git a/jdk/src/java.base/unix/native/libjava/childproc.c b/src/java.base/unix/native/libjava/childproc.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/childproc.c rename to src/java.base/unix/native/libjava/childproc.c diff --git a/jdk/src/java.base/unix/native/libjava/childproc.h b/src/java.base/unix/native/libjava/childproc.h similarity index 100% rename from jdk/src/java.base/unix/native/libjava/childproc.h rename to src/java.base/unix/native/libjava/childproc.h diff --git a/jdk/src/java.base/unix/native/libjava/gdefs_md.h b/src/java.base/unix/native/libjava/gdefs_md.h similarity index 100% rename from jdk/src/java.base/unix/native/libjava/gdefs_md.h rename to src/java.base/unix/native/libjava/gdefs_md.h diff --git a/jdk/src/java.base/unix/native/libjava/io_util_md.c b/src/java.base/unix/native/libjava/io_util_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/io_util_md.c rename to src/java.base/unix/native/libjava/io_util_md.c diff --git a/jdk/src/java.base/unix/native/libjava/io_util_md.h b/src/java.base/unix/native/libjava/io_util_md.h similarity index 100% rename from jdk/src/java.base/unix/native/libjava/io_util_md.h rename to src/java.base/unix/native/libjava/io_util_md.h diff --git a/jdk/src/java.base/unix/native/libjava/java_props_md.c b/src/java.base/unix/native/libjava/java_props_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/java_props_md.c rename to src/java.base/unix/native/libjava/java_props_md.c diff --git a/jdk/src/java.base/unix/native/libjava/jdk_util_md.c b/src/java.base/unix/native/libjava/jdk_util_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/jdk_util_md.c rename to src/java.base/unix/native/libjava/jdk_util_md.c diff --git a/jdk/src/java.base/unix/native/libjava/jdk_util_md.h b/src/java.base/unix/native/libjava/jdk_util_md.h similarity index 100% rename from jdk/src/java.base/unix/native/libjava/jdk_util_md.h rename to src/java.base/unix/native/libjava/jdk_util_md.h diff --git a/jdk/src/java.base/unix/native/libjava/jlong_md.h b/src/java.base/unix/native/libjava/jlong_md.h similarity index 100% rename from jdk/src/java.base/unix/native/libjava/jlong_md.h rename to src/java.base/unix/native/libjava/jlong_md.h diff --git a/jdk/src/java.base/unix/native/libjava/jni_util_md.c b/src/java.base/unix/native/libjava/jni_util_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libjava/jni_util_md.c rename to src/java.base/unix/native/libjava/jni_util_md.c diff --git a/jdk/src/java.base/unix/native/libjava/locale_str.h b/src/java.base/unix/native/libjava/locale_str.h similarity index 100% rename from jdk/src/java.base/unix/native/libjava/locale_str.h rename to src/java.base/unix/native/libjava/locale_str.h diff --git a/jdk/src/java.base/unix/native/libjimage/osSupport_unix.cpp b/src/java.base/unix/native/libjimage/osSupport_unix.cpp similarity index 100% rename from jdk/src/java.base/unix/native/libjimage/osSupport_unix.cpp rename to src/java.base/unix/native/libjimage/osSupport_unix.cpp diff --git a/jdk/src/java.base/unix/native/libjli/java_md.h b/src/java.base/unix/native/libjli/java_md.h similarity index 100% rename from jdk/src/java.base/unix/native/libjli/java_md.h rename to src/java.base/unix/native/libjli/java_md.h diff --git a/jdk/src/java.base/unix/native/libjli/java_md_common.c b/src/java.base/unix/native/libjli/java_md_common.c similarity index 100% rename from jdk/src/java.base/unix/native/libjli/java_md_common.c rename to src/java.base/unix/native/libjli/java_md_common.c diff --git a/jdk/src/java.base/unix/native/libjli/java_md_solinux.c b/src/java.base/unix/native/libjli/java_md_solinux.c similarity index 100% rename from jdk/src/java.base/unix/native/libjli/java_md_solinux.c rename to src/java.base/unix/native/libjli/java_md_solinux.c diff --git a/jdk/src/java.base/unix/native/libjli/java_md_solinux.h b/src/java.base/unix/native/libjli/java_md_solinux.h similarity index 100% rename from jdk/src/java.base/unix/native/libjli/java_md_solinux.h rename to src/java.base/unix/native/libjli/java_md_solinux.h diff --git a/jdk/src/java.base/unix/native/libnet/DefaultProxySelector.c b/src/java.base/unix/native/libnet/DefaultProxySelector.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/DefaultProxySelector.c rename to src/java.base/unix/native/libnet/DefaultProxySelector.c diff --git a/jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c b/src/java.base/unix/native/libnet/Inet4AddressImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c rename to src/java.base/unix/native/libnet/Inet4AddressImpl.c diff --git a/jdk/src/java.base/unix/native/libnet/Inet6AddressImpl.c b/src/java.base/unix/native/libnet/Inet6AddressImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/Inet6AddressImpl.c rename to src/java.base/unix/native/libnet/Inet6AddressImpl.c diff --git a/jdk/src/java.base/unix/native/libnet/InetAddressImplFactory.c b/src/java.base/unix/native/libnet/InetAddressImplFactory.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/InetAddressImplFactory.c rename to src/java.base/unix/native/libnet/InetAddressImplFactory.c diff --git a/jdk/src/java.base/unix/native/libnet/NetworkInterface.c b/src/java.base/unix/native/libnet/NetworkInterface.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/NetworkInterface.c rename to src/java.base/unix/native/libnet/NetworkInterface.c diff --git a/jdk/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c b/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c rename to src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c diff --git a/jdk/src/java.base/unix/native/libnet/PlainSocketImpl.c b/src/java.base/unix/native/libnet/PlainSocketImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/PlainSocketImpl.c rename to src/java.base/unix/native/libnet/PlainSocketImpl.c diff --git a/jdk/src/java.base/unix/native/libnet/ResolverConfigurationImpl.c b/src/java.base/unix/native/libnet/ResolverConfigurationImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/ResolverConfigurationImpl.c rename to src/java.base/unix/native/libnet/ResolverConfigurationImpl.c diff --git a/jdk/src/java.base/unix/native/libnet/SdpSupport.c b/src/java.base/unix/native/libnet/SdpSupport.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/SdpSupport.c rename to src/java.base/unix/native/libnet/SdpSupport.c diff --git a/jdk/src/java.base/unix/native/libnet/SocketImpl.c b/src/java.base/unix/native/libnet/SocketImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/SocketImpl.c rename to src/java.base/unix/native/libnet/SocketImpl.c diff --git a/jdk/src/java.base/unix/native/libnet/SocketInputStream.c b/src/java.base/unix/native/libnet/SocketInputStream.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/SocketInputStream.c rename to src/java.base/unix/native/libnet/SocketInputStream.c diff --git a/jdk/src/java.base/unix/native/libnet/SocketOutputStream.c b/src/java.base/unix/native/libnet/SocketOutputStream.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/SocketOutputStream.c rename to src/java.base/unix/native/libnet/SocketOutputStream.c diff --git a/jdk/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/net_util_md.c rename to src/java.base/unix/native/libnet/net_util_md.c diff --git a/jdk/src/java.base/unix/native/libnet/net_util_md.h b/src/java.base/unix/native/libnet/net_util_md.h similarity index 100% rename from jdk/src/java.base/unix/native/libnet/net_util_md.h rename to src/java.base/unix/native/libnet/net_util_md.h diff --git a/jdk/src/java.base/unix/native/libnet/portconfig.c b/src/java.base/unix/native/libnet/portconfig.c similarity index 100% rename from jdk/src/java.base/unix/native/libnet/portconfig.c rename to src/java.base/unix/native/libnet/portconfig.c diff --git a/jdk/src/java.base/unix/native/libnio/MappedByteBuffer.c b/src/java.base/unix/native/libnio/MappedByteBuffer.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/MappedByteBuffer.c rename to src/java.base/unix/native/libnio/MappedByteBuffer.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c b/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c rename to src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/DatagramDispatcher.c b/src/java.base/unix/native/libnio/ch/DatagramDispatcher.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/DatagramDispatcher.c rename to src/java.base/unix/native/libnio/ch/DatagramDispatcher.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/FileChannelImpl.c b/src/java.base/unix/native/libnio/ch/FileChannelImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/FileChannelImpl.c rename to src/java.base/unix/native/libnio/ch/FileChannelImpl.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c b/src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c rename to src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/FileKey.c b/src/java.base/unix/native/libnio/ch/FileKey.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/FileKey.c rename to src/java.base/unix/native/libnio/ch/FileKey.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/IOUtil.c b/src/java.base/unix/native/libnio/ch/IOUtil.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/IOUtil.c rename to src/java.base/unix/native/libnio/ch/IOUtil.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/InheritedChannel.c b/src/java.base/unix/native/libnio/ch/InheritedChannel.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/InheritedChannel.c rename to src/java.base/unix/native/libnio/ch/InheritedChannel.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/NativeThread.c b/src/java.base/unix/native/libnio/ch/NativeThread.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/NativeThread.c rename to src/java.base/unix/native/libnio/ch/NativeThread.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/Net.c b/src/java.base/unix/native/libnio/ch/Net.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/Net.c rename to src/java.base/unix/native/libnio/ch/Net.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/PollArrayWrapper.c b/src/java.base/unix/native/libnio/ch/PollArrayWrapper.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/PollArrayWrapper.c rename to src/java.base/unix/native/libnio/ch/PollArrayWrapper.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/ServerSocketChannelImpl.c b/src/java.base/unix/native/libnio/ch/ServerSocketChannelImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/ServerSocketChannelImpl.c rename to src/java.base/unix/native/libnio/ch/ServerSocketChannelImpl.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/SocketChannelImpl.c b/src/java.base/unix/native/libnio/ch/SocketChannelImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/SocketChannelImpl.c rename to src/java.base/unix/native/libnio/ch/SocketChannelImpl.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/SocketDispatcher.c b/src/java.base/unix/native/libnio/ch/SocketDispatcher.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/SocketDispatcher.c rename to src/java.base/unix/native/libnio/ch/SocketDispatcher.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/UnixAsynchronousServerSocketChannelImpl.c b/src/java.base/unix/native/libnio/ch/UnixAsynchronousServerSocketChannelImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/UnixAsynchronousServerSocketChannelImpl.c rename to src/java.base/unix/native/libnio/ch/UnixAsynchronousServerSocketChannelImpl.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/UnixAsynchronousSocketChannelImpl.c b/src/java.base/unix/native/libnio/ch/UnixAsynchronousSocketChannelImpl.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/UnixAsynchronousSocketChannelImpl.c rename to src/java.base/unix/native/libnio/ch/UnixAsynchronousSocketChannelImpl.c diff --git a/jdk/src/java.base/unix/native/libnio/ch/nio_util.h b/src/java.base/unix/native/libnio/ch/nio_util.h similarity index 100% rename from jdk/src/java.base/unix/native/libnio/ch/nio_util.h rename to src/java.base/unix/native/libnio/ch/nio_util.h diff --git a/jdk/src/java.base/unix/native/libnio/fs/UnixCopyFile.c b/src/java.base/unix/native/libnio/fs/UnixCopyFile.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/fs/UnixCopyFile.c rename to src/java.base/unix/native/libnio/fs/UnixCopyFile.c diff --git a/jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c rename to src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c diff --git a/jdk/src/java.base/windows/classes/java/io/DefaultFileSystem.java b/src/java.base/windows/classes/java/io/DefaultFileSystem.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/io/DefaultFileSystem.java rename to src/java.base/windows/classes/java/io/DefaultFileSystem.java diff --git a/jdk/src/java.base/windows/classes/java/io/FileDescriptor.java b/src/java.base/windows/classes/java/io/FileDescriptor.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/io/FileDescriptor.java rename to src/java.base/windows/classes/java/io/FileDescriptor.java diff --git a/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java b/src/java.base/windows/classes/java/io/WinNTFileSystem.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java rename to src/java.base/windows/classes/java/io/WinNTFileSystem.java diff --git a/jdk/src/java.base/windows/classes/java/lang/ClassLoaderHelper.java b/src/java.base/windows/classes/java/lang/ClassLoaderHelper.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/lang/ClassLoaderHelper.java rename to src/java.base/windows/classes/java/lang/ClassLoaderHelper.java diff --git a/jdk/src/java.base/windows/classes/java/lang/ProcessEnvironment.java b/src/java.base/windows/classes/java/lang/ProcessEnvironment.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/lang/ProcessEnvironment.java rename to src/java.base/windows/classes/java/lang/ProcessEnvironment.java diff --git a/jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java b/src/java.base/windows/classes/java/lang/ProcessImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java rename to src/java.base/windows/classes/java/lang/ProcessImpl.java diff --git a/jdk/src/java.base/windows/classes/java/lang/Terminator.java b/src/java.base/windows/classes/java/lang/Terminator.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/lang/Terminator.java rename to src/java.base/windows/classes/java/lang/Terminator.java diff --git a/jdk/src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java b/src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java rename to src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java diff --git a/jdk/src/java.base/windows/classes/java/net/DefaultInterface.java b/src/java.base/windows/classes/java/net/DefaultInterface.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/net/DefaultInterface.java rename to src/java.base/windows/classes/java/net/DefaultInterface.java diff --git a/jdk/src/java.base/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java b/src/java.base/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java rename to src/java.base/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java diff --git a/jdk/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java b/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java rename to src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java diff --git a/jdk/src/java.base/windows/classes/java/net/PlainSocketImpl.java b/src/java.base/windows/classes/java/net/PlainSocketImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/net/PlainSocketImpl.java rename to src/java.base/windows/classes/java/net/PlainSocketImpl.java diff --git a/jdk/src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java b/src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java rename to src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java diff --git a/jdk/src/java.base/windows/classes/java/net/TwoStacksPlainSocketImpl.java b/src/java.base/windows/classes/java/net/TwoStacksPlainSocketImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/java/net/TwoStacksPlainSocketImpl.java rename to src/java.base/windows/classes/java/net/TwoStacksPlainSocketImpl.java diff --git a/jdk/src/java.base/windows/classes/jdk/internal/loader/FileURLMapper.java b/src/java.base/windows/classes/jdk/internal/loader/FileURLMapper.java similarity index 100% rename from jdk/src/java.base/windows/classes/jdk/internal/loader/FileURLMapper.java rename to src/java.base/windows/classes/jdk/internal/loader/FileURLMapper.java diff --git a/jdk/src/java.base/windows/classes/jdk/internal/misc/OSEnvironment.java b/src/java.base/windows/classes/jdk/internal/misc/OSEnvironment.java similarity index 100% rename from jdk/src/java.base/windows/classes/jdk/internal/misc/OSEnvironment.java rename to src/java.base/windows/classes/jdk/internal/misc/OSEnvironment.java diff --git a/jdk/src/java.base/windows/classes/module-info.java.extra b/src/java.base/windows/classes/module-info.java.extra similarity index 100% rename from jdk/src/java.base/windows/classes/module-info.java.extra rename to src/java.base/windows/classes/module-info.java.extra diff --git a/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java b/src/java.base/windows/classes/sun/io/Win32ErrorMode.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java rename to src/java.base/windows/classes/sun/io/Win32ErrorMode.java diff --git a/jdk/src/java.base/windows/classes/sun/net/NetHooks.java b/src/java.base/windows/classes/sun/net/NetHooks.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/net/NetHooks.java rename to src/java.base/windows/classes/sun/net/NetHooks.java diff --git a/jdk/src/java.base/windows/classes/sun/net/PortConfig.java b/src/java.base/windows/classes/sun/net/PortConfig.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/net/PortConfig.java rename to src/java.base/windows/classes/sun/net/PortConfig.java diff --git a/jdk/src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java b/src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java rename to src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java diff --git a/jdk/src/java.base/windows/classes/sun/net/www/content-types.properties b/src/java.base/windows/classes/sun/net/www/content-types.properties similarity index 100% rename from jdk/src/java.base/windows/classes/sun/net/www/content-types.properties rename to src/java.base/windows/classes/sun/net/www/content-types.properties diff --git a/jdk/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java b/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java rename to src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java diff --git a/jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java b/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java rename to src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java diff --git a/jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java b/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java rename to src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java diff --git a/jdk/src/java.base/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java b/src/java.base/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java rename to src/java.base/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/DatagramDispatcher.java b/src/java.base/windows/classes/sun/nio/ch/DatagramDispatcher.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/DatagramDispatcher.java rename to src/java.base/windows/classes/sun/nio/ch/DatagramDispatcher.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java b/src/java.base/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java rename to src/java.base/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/DefaultSelectorProvider.java b/src/java.base/windows/classes/sun/nio/ch/DefaultSelectorProvider.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/DefaultSelectorProvider.java rename to src/java.base/windows/classes/sun/nio/ch/DefaultSelectorProvider.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java b/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java rename to src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/FileKey.java b/src/java.base/windows/classes/sun/nio/ch/FileKey.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/FileKey.java rename to src/java.base/windows/classes/sun/nio/ch/FileKey.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/Iocp.java b/src/java.base/windows/classes/sun/nio/ch/Iocp.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/Iocp.java rename to src/java.base/windows/classes/sun/nio/ch/Iocp.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/NativeThread.java b/src/java.base/windows/classes/sun/nio/ch/NativeThread.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/NativeThread.java rename to src/java.base/windows/classes/sun/nio/ch/NativeThread.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/PendingIoCache.java b/src/java.base/windows/classes/sun/nio/ch/PendingIoCache.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/PendingIoCache.java rename to src/java.base/windows/classes/sun/nio/ch/PendingIoCache.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java b/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java rename to src/java.base/windows/classes/sun/nio/ch/PipeImpl.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/PollArrayWrapper.java b/src/java.base/windows/classes/sun/nio/ch/PollArrayWrapper.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/PollArrayWrapper.java rename to src/java.base/windows/classes/sun/nio/ch/PollArrayWrapper.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/SinkChannelImpl.java b/src/java.base/windows/classes/sun/nio/ch/SinkChannelImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/SinkChannelImpl.java rename to src/java.base/windows/classes/sun/nio/ch/SinkChannelImpl.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java b/src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java rename to src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/SourceChannelImpl.java b/src/java.base/windows/classes/sun/nio/ch/SourceChannelImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/SourceChannelImpl.java rename to src/java.base/windows/classes/sun/nio/ch/SourceChannelImpl.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java rename to src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java rename to src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java rename to src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java rename to src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java rename to src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorProvider.java b/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorProvider.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorProvider.java rename to src/java.base/windows/classes/sun/nio/ch/WindowsSelectorProvider.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java b/src/java.base/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java rename to src/java.base/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java b/src/java.base/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java rename to src/java.base/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java b/src/java.base/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java rename to src/java.base/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java b/src/java.base/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java b/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java b/src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsDirectoryStream.java b/src/java.base/windows/classes/sun/nio/fs/WindowsDirectoryStream.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsDirectoryStream.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsDirectoryStream.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsException.java b/src/java.base/windows/classes/sun/nio/fs/WindowsException.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsException.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsException.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java b/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributes.java b/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributes.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributes.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributes.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java b/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileStore.java b/src/java.base/windows/classes/sun/nio/fs/WindowsFileStore.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileStore.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsFileStore.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystem.java b/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystem.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystem.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsFileSystem.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java b/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsLinkSupport.java b/src/java.base/windows/classes/sun/nio/fs/WindowsLinkSupport.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsLinkSupport.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsLinkSupport.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java b/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java b/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsPath.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPathParser.java b/src/java.base/windows/classes/sun/nio/fs/WindowsPathParser.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPathParser.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsPathParser.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPathType.java b/src/java.base/windows/classes/sun/nio/fs/WindowsPathType.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPathType.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsPathType.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java b/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java b/src/java.base/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUriSupport.java b/src/java.base/windows/classes/sun/nio/fs/WindowsUriSupport.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUriSupport.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsUriSupport.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java b/src/java.base/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUserPrincipals.java b/src/java.base/windows/classes/sun/nio/fs/WindowsUserPrincipals.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUserPrincipals.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsUserPrincipals.java diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java b/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java rename to src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java diff --git a/jdk/src/java.base/windows/classes/sun/security/provider/NativePRNG.java b/src/java.base/windows/classes/sun/security/provider/NativePRNG.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/security/provider/NativePRNG.java rename to src/java.base/windows/classes/sun/security/provider/NativePRNG.java diff --git a/jdk/src/java.base/windows/classes/sun/security/provider/NativeSeedGenerator.java b/src/java.base/windows/classes/sun/security/provider/NativeSeedGenerator.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/security/provider/NativeSeedGenerator.java rename to src/java.base/windows/classes/sun/security/provider/NativeSeedGenerator.java diff --git a/jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java b/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java similarity index 100% rename from jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java rename to src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java diff --git a/jdk/src/java.base/windows/conf/amd64/jvm.cfg b/src/java.base/windows/conf/amd64/jvm.cfg similarity index 100% rename from jdk/src/java.base/windows/conf/amd64/jvm.cfg rename to src/java.base/windows/conf/amd64/jvm.cfg diff --git a/jdk/src/java.base/windows/conf/i586/jvm.cfg b/src/java.base/windows/conf/i586/jvm.cfg similarity index 100% rename from jdk/src/java.base/windows/conf/i586/jvm.cfg rename to src/java.base/windows/conf/i586/jvm.cfg diff --git a/jdk/src/java.base/windows/conf/ia64/jvm.cfg b/src/java.base/windows/conf/ia64/jvm.cfg similarity index 100% rename from jdk/src/java.base/windows/conf/ia64/jvm.cfg rename to src/java.base/windows/conf/ia64/jvm.cfg diff --git a/jdk/src/java.base/windows/conf/tzmappings b/src/java.base/windows/conf/tzmappings similarity index 100% rename from jdk/src/java.base/windows/conf/tzmappings rename to src/java.base/windows/conf/tzmappings diff --git a/jdk/src/java.base/windows/lib/security/default.policy b/src/java.base/windows/lib/security/default.policy similarity index 100% rename from jdk/src/java.base/windows/lib/security/default.policy rename to src/java.base/windows/lib/security/default.policy diff --git a/jdk/src/java.base/windows/native/common/version.rc b/src/java.base/windows/native/common/version.rc similarity index 100% rename from jdk/src/java.base/windows/native/common/version.rc rename to src/java.base/windows/native/common/version.rc diff --git a/jdk/src/java.base/windows/native/include/jni_md.h b/src/java.base/windows/native/include/jni_md.h similarity index 100% rename from jdk/src/java.base/windows/native/include/jni_md.h rename to src/java.base/windows/native/include/jni_md.h diff --git a/jdk/src/java.base/windows/native/include/jvm_md.h b/src/java.base/windows/native/include/jvm_md.h similarity index 100% rename from jdk/src/java.base/windows/native/include/jvm_md.h rename to src/java.base/windows/native/include/jvm_md.h diff --git a/jdk/src/java.base/windows/native/launcher/icons/awt.ico b/src/java.base/windows/native/launcher/icons/awt.ico similarity index 100% rename from jdk/src/java.base/windows/native/launcher/icons/awt.ico rename to src/java.base/windows/native/launcher/icons/awt.ico diff --git a/jdk/src/java.base/windows/native/launcher/java.manifest b/src/java.base/windows/native/launcher/java.manifest similarity index 100% rename from jdk/src/java.base/windows/native/launcher/java.manifest rename to src/java.base/windows/native/launcher/java.manifest diff --git a/jdk/src/java.base/windows/native/launcher/java.rc b/src/java.base/windows/native/launcher/java.rc similarity index 100% rename from jdk/src/java.base/windows/native/launcher/java.rc rename to src/java.base/windows/native/launcher/java.rc diff --git a/jdk/src/java.base/windows/native/libjava/Console_md.c b/src/java.base/windows/native/libjava/Console_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/Console_md.c rename to src/java.base/windows/native/libjava/Console_md.c diff --git a/jdk/src/java.base/windows/native/libjava/FileDescriptor_md.c b/src/java.base/windows/native/libjava/FileDescriptor_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/FileDescriptor_md.c rename to src/java.base/windows/native/libjava/FileDescriptor_md.c diff --git a/jdk/src/java.base/windows/native/libjava/FileInputStream_md.c b/src/java.base/windows/native/libjava/FileInputStream_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/FileInputStream_md.c rename to src/java.base/windows/native/libjava/FileInputStream_md.c diff --git a/jdk/src/java.base/windows/native/libjava/FileOutputStream_md.c b/src/java.base/windows/native/libjava/FileOutputStream_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/FileOutputStream_md.c rename to src/java.base/windows/native/libjava/FileOutputStream_md.c diff --git a/jdk/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c b/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c rename to src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c diff --git a/jdk/src/java.base/windows/native/libjava/ProcessEnvironment_md.c b/src/java.base/windows/native/libjava/ProcessEnvironment_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/ProcessEnvironment_md.c rename to src/java.base/windows/native/libjava/ProcessEnvironment_md.c diff --git a/jdk/src/java.base/windows/native/libjava/ProcessHandleImpl_win.c b/src/java.base/windows/native/libjava/ProcessHandleImpl_win.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/ProcessHandleImpl_win.c rename to src/java.base/windows/native/libjava/ProcessHandleImpl_win.c diff --git a/jdk/src/java.base/windows/native/libjava/ProcessImpl_md.c b/src/java.base/windows/native/libjava/ProcessImpl_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/ProcessImpl_md.c rename to src/java.base/windows/native/libjava/ProcessImpl_md.c diff --git a/jdk/src/java.base/windows/native/libjava/RandomAccessFile_md.c b/src/java.base/windows/native/libjava/RandomAccessFile_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/RandomAccessFile_md.c rename to src/java.base/windows/native/libjava/RandomAccessFile_md.c diff --git a/jdk/src/java.base/windows/native/libjava/TimeZone_md.c b/src/java.base/windows/native/libjava/TimeZone_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/TimeZone_md.c rename to src/java.base/windows/native/libjava/TimeZone_md.c diff --git a/jdk/src/java.base/windows/native/libjava/TimeZone_md.h b/src/java.base/windows/native/libjava/TimeZone_md.h similarity index 100% rename from jdk/src/java.base/windows/native/libjava/TimeZone_md.h rename to src/java.base/windows/native/libjava/TimeZone_md.h diff --git a/jdk/src/java.base/windows/native/libjava/VM_md.c b/src/java.base/windows/native/libjava/VM_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/VM_md.c rename to src/java.base/windows/native/libjava/VM_md.c diff --git a/jdk/src/java.base/windows/native/libjava/Win32ErrorMode.c b/src/java.base/windows/native/libjava/Win32ErrorMode.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/Win32ErrorMode.c rename to src/java.base/windows/native/libjava/Win32ErrorMode.c diff --git a/jdk/src/java.base/windows/native/libjava/WinCAPISeedGenerator.c b/src/java.base/windows/native/libjava/WinCAPISeedGenerator.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/WinCAPISeedGenerator.c rename to src/java.base/windows/native/libjava/WinCAPISeedGenerator.c diff --git a/jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c b/src/java.base/windows/native/libjava/WinNTFileSystem_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c rename to src/java.base/windows/native/libjava/WinNTFileSystem_md.c diff --git a/jdk/src/java.base/windows/native/libjava/canonicalize_md.c b/src/java.base/windows/native/libjava/canonicalize_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/canonicalize_md.c rename to src/java.base/windows/native/libjava/canonicalize_md.c diff --git a/jdk/src/java.base/windows/native/libjava/dirent_md.c b/src/java.base/windows/native/libjava/dirent_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/dirent_md.c rename to src/java.base/windows/native/libjava/dirent_md.c diff --git a/jdk/src/java.base/windows/native/libjava/dirent_md.h b/src/java.base/windows/native/libjava/dirent_md.h similarity index 100% rename from jdk/src/java.base/windows/native/libjava/dirent_md.h rename to src/java.base/windows/native/libjava/dirent_md.h diff --git a/jdk/src/java.base/windows/native/libjava/gdefs_md.h b/src/java.base/windows/native/libjava/gdefs_md.h similarity index 100% rename from jdk/src/java.base/windows/native/libjava/gdefs_md.h rename to src/java.base/windows/native/libjava/gdefs_md.h diff --git a/jdk/src/java.base/windows/native/libjava/io_util_md.c b/src/java.base/windows/native/libjava/io_util_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/io_util_md.c rename to src/java.base/windows/native/libjava/io_util_md.c diff --git a/jdk/src/java.base/windows/native/libjava/io_util_md.h b/src/java.base/windows/native/libjava/io_util_md.h similarity index 100% rename from jdk/src/java.base/windows/native/libjava/io_util_md.h rename to src/java.base/windows/native/libjava/io_util_md.h diff --git a/jdk/src/java.base/windows/native/libjava/java_main_md.h b/src/java.base/windows/native/libjava/java_main_md.h similarity index 100% rename from jdk/src/java.base/windows/native/libjava/java_main_md.h rename to src/java.base/windows/native/libjava/java_main_md.h diff --git a/jdk/src/java.base/windows/native/libjava/java_props_md.c b/src/java.base/windows/native/libjava/java_props_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/java_props_md.c rename to src/java.base/windows/native/libjava/java_props_md.c diff --git a/jdk/src/java.base/windows/native/libjava/jdk_util_md.c b/src/java.base/windows/native/libjava/jdk_util_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/jdk_util_md.c rename to src/java.base/windows/native/libjava/jdk_util_md.c diff --git a/jdk/src/java.base/windows/native/libjava/jdk_util_md.h b/src/java.base/windows/native/libjava/jdk_util_md.h similarity index 100% rename from jdk/src/java.base/windows/native/libjava/jdk_util_md.h rename to src/java.base/windows/native/libjava/jdk_util_md.h diff --git a/jdk/src/java.base/windows/native/libjava/jlong_md.h b/src/java.base/windows/native/libjava/jlong_md.h similarity index 100% rename from jdk/src/java.base/windows/native/libjava/jlong_md.h rename to src/java.base/windows/native/libjava/jlong_md.h diff --git a/jdk/src/java.base/windows/native/libjava/jni_util_md.c b/src/java.base/windows/native/libjava/jni_util_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjava/jni_util_md.c rename to src/java.base/windows/native/libjava/jni_util_md.c diff --git a/jdk/src/java.base/windows/native/libjava/locale_str.h b/src/java.base/windows/native/libjava/locale_str.h similarity index 100% rename from jdk/src/java.base/windows/native/libjava/locale_str.h rename to src/java.base/windows/native/libjava/locale_str.h diff --git a/jdk/src/java.base/windows/native/libjimage/osSupport_windows.cpp b/src/java.base/windows/native/libjimage/osSupport_windows.cpp similarity index 100% rename from jdk/src/java.base/windows/native/libjimage/osSupport_windows.cpp rename to src/java.base/windows/native/libjimage/osSupport_windows.cpp diff --git a/jdk/src/java.base/windows/native/libjli/cmdtoargs.c b/src/java.base/windows/native/libjli/cmdtoargs.c similarity index 100% rename from jdk/src/java.base/windows/native/libjli/cmdtoargs.c rename to src/java.base/windows/native/libjli/cmdtoargs.c diff --git a/jdk/src/java.base/windows/native/libjli/java_md.c b/src/java.base/windows/native/libjli/java_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libjli/java_md.c rename to src/java.base/windows/native/libjli/java_md.c diff --git a/jdk/src/java.base/windows/native/libjli/java_md.h b/src/java.base/windows/native/libjli/java_md.h similarity index 100% rename from jdk/src/java.base/windows/native/libjli/java_md.h rename to src/java.base/windows/native/libjli/java_md.h diff --git a/jdk/src/java.base/windows/native/libnet/DefaultProxySelector.c b/src/java.base/windows/native/libnet/DefaultProxySelector.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/DefaultProxySelector.c rename to src/java.base/windows/native/libnet/DefaultProxySelector.c diff --git a/jdk/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c b/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c rename to src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c diff --git a/jdk/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c b/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c rename to src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c diff --git a/jdk/src/java.base/windows/native/libnet/Inet4AddressImpl.c b/src/java.base/windows/native/libnet/Inet4AddressImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/Inet4AddressImpl.c rename to src/java.base/windows/native/libnet/Inet4AddressImpl.c diff --git a/jdk/src/java.base/windows/native/libnet/Inet6AddressImpl.c b/src/java.base/windows/native/libnet/Inet6AddressImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/Inet6AddressImpl.c rename to src/java.base/windows/native/libnet/Inet6AddressImpl.c diff --git a/jdk/src/java.base/windows/native/libnet/InetAddressImplFactory.c b/src/java.base/windows/native/libnet/InetAddressImplFactory.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/InetAddressImplFactory.c rename to src/java.base/windows/native/libnet/InetAddressImplFactory.c diff --git a/jdk/src/java.base/windows/native/libnet/NTLMAuthSequence.c b/src/java.base/windows/native/libnet/NTLMAuthSequence.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/NTLMAuthSequence.c rename to src/java.base/windows/native/libnet/NTLMAuthSequence.c diff --git a/jdk/src/java.base/windows/native/libnet/NetworkInterface.c b/src/java.base/windows/native/libnet/NetworkInterface.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/NetworkInterface.c rename to src/java.base/windows/native/libnet/NetworkInterface.c diff --git a/jdk/src/java.base/windows/native/libnet/NetworkInterface.h b/src/java.base/windows/native/libnet/NetworkInterface.h similarity index 100% rename from jdk/src/java.base/windows/native/libnet/NetworkInterface.h rename to src/java.base/windows/native/libnet/NetworkInterface.h diff --git a/jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c b/src/java.base/windows/native/libnet/NetworkInterface_winXP.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c rename to src/java.base/windows/native/libnet/NetworkInterface_winXP.c diff --git a/jdk/src/java.base/windows/native/libnet/ResolverConfigurationImpl.c b/src/java.base/windows/native/libnet/ResolverConfigurationImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/ResolverConfigurationImpl.c rename to src/java.base/windows/native/libnet/ResolverConfigurationImpl.c diff --git a/jdk/src/java.base/windows/native/libnet/SocketImpl.c b/src/java.base/windows/native/libnet/SocketImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/SocketImpl.c rename to src/java.base/windows/native/libnet/SocketImpl.c diff --git a/jdk/src/java.base/windows/native/libnet/SocketInputStream.c b/src/java.base/windows/native/libnet/SocketInputStream.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/SocketInputStream.c rename to src/java.base/windows/native/libnet/SocketInputStream.c diff --git a/jdk/src/java.base/windows/native/libnet/SocketOutputStream.c b/src/java.base/windows/native/libnet/SocketOutputStream.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/SocketOutputStream.c rename to src/java.base/windows/native/libnet/SocketOutputStream.c diff --git a/jdk/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c b/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c rename to src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c diff --git a/jdk/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c b/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c rename to src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c diff --git a/jdk/src/java.base/windows/native/libnet/net_util_md.c b/src/java.base/windows/native/libnet/net_util_md.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/net_util_md.c rename to src/java.base/windows/native/libnet/net_util_md.c diff --git a/jdk/src/java.base/windows/native/libnet/net_util_md.h b/src/java.base/windows/native/libnet/net_util_md.h similarity index 100% rename from jdk/src/java.base/windows/native/libnet/net_util_md.h rename to src/java.base/windows/native/libnet/net_util_md.h diff --git a/jdk/src/java.base/windows/native/libnet/portconfig.c b/src/java.base/windows/native/libnet/portconfig.c similarity index 100% rename from jdk/src/java.base/windows/native/libnet/portconfig.c rename to src/java.base/windows/native/libnet/portconfig.c diff --git a/jdk/src/java.base/windows/native/libnio/MappedByteBuffer.c b/src/java.base/windows/native/libnio/MappedByteBuffer.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/MappedByteBuffer.c rename to src/java.base/windows/native/libnio/MappedByteBuffer.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/DatagramChannelImpl.c b/src/java.base/windows/native/libnio/ch/DatagramChannelImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/DatagramChannelImpl.c rename to src/java.base/windows/native/libnio/ch/DatagramChannelImpl.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/DatagramDispatcher.c b/src/java.base/windows/native/libnio/ch/DatagramDispatcher.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/DatagramDispatcher.c rename to src/java.base/windows/native/libnio/ch/DatagramDispatcher.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/FileChannelImpl.c b/src/java.base/windows/native/libnio/ch/FileChannelImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/FileChannelImpl.c rename to src/java.base/windows/native/libnio/ch/FileChannelImpl.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/FileDispatcherImpl.c b/src/java.base/windows/native/libnio/ch/FileDispatcherImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/FileDispatcherImpl.c rename to src/java.base/windows/native/libnio/ch/FileDispatcherImpl.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/FileKey.c b/src/java.base/windows/native/libnio/ch/FileKey.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/FileKey.c rename to src/java.base/windows/native/libnio/ch/FileKey.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/IOUtil.c b/src/java.base/windows/native/libnio/ch/IOUtil.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/IOUtil.c rename to src/java.base/windows/native/libnio/ch/IOUtil.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/Iocp.c b/src/java.base/windows/native/libnio/ch/Iocp.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/Iocp.c rename to src/java.base/windows/native/libnio/ch/Iocp.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/Net.c b/src/java.base/windows/native/libnio/ch/Net.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/Net.c rename to src/java.base/windows/native/libnio/ch/Net.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/ServerSocketChannelImpl.c b/src/java.base/windows/native/libnio/ch/ServerSocketChannelImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/ServerSocketChannelImpl.c rename to src/java.base/windows/native/libnio/ch/ServerSocketChannelImpl.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/SocketChannelImpl.c b/src/java.base/windows/native/libnio/ch/SocketChannelImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/SocketChannelImpl.c rename to src/java.base/windows/native/libnio/ch/SocketChannelImpl.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/SocketDispatcher.c b/src/java.base/windows/native/libnio/ch/SocketDispatcher.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/SocketDispatcher.c rename to src/java.base/windows/native/libnio/ch/SocketDispatcher.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousFileChannelImpl.c b/src/java.base/windows/native/libnio/ch/WindowsAsynchronousFileChannelImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousFileChannelImpl.c rename to src/java.base/windows/native/libnio/ch/WindowsAsynchronousFileChannelImpl.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousServerSocketChannelImpl.c b/src/java.base/windows/native/libnio/ch/WindowsAsynchronousServerSocketChannelImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousServerSocketChannelImpl.c rename to src/java.base/windows/native/libnio/ch/WindowsAsynchronousServerSocketChannelImpl.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c b/src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c rename to src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/WindowsSelectorImpl.c b/src/java.base/windows/native/libnio/ch/WindowsSelectorImpl.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/WindowsSelectorImpl.c rename to src/java.base/windows/native/libnio/ch/WindowsSelectorImpl.c diff --git a/jdk/src/java.base/windows/native/libnio/ch/nio_util.h b/src/java.base/windows/native/libnio/ch/nio_util.h similarity index 100% rename from jdk/src/java.base/windows/native/libnio/ch/nio_util.h rename to src/java.base/windows/native/libnio/ch/nio_util.h diff --git a/jdk/src/java.base/windows/native/libnio/fs/RegistryFileTypeDetector.c b/src/java.base/windows/native/libnio/fs/RegistryFileTypeDetector.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/fs/RegistryFileTypeDetector.c rename to src/java.base/windows/native/libnio/fs/RegistryFileTypeDetector.c diff --git a/jdk/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c b/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c similarity index 100% rename from jdk/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c rename to src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/AbstractProcessor.java b/src/java.compiler/share/classes/javax/annotation/processing/AbstractProcessor.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/AbstractProcessor.java rename to src/java.compiler/share/classes/javax/annotation/processing/AbstractProcessor.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/Completion.java b/src/java.compiler/share/classes/javax/annotation/processing/Completion.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/Completion.java rename to src/java.compiler/share/classes/javax/annotation/processing/Completion.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/Completions.java b/src/java.compiler/share/classes/javax/annotation/processing/Completions.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/Completions.java rename to src/java.compiler/share/classes/javax/annotation/processing/Completions.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/Filer.java b/src/java.compiler/share/classes/javax/annotation/processing/Filer.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/Filer.java rename to src/java.compiler/share/classes/javax/annotation/processing/Filer.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/FilerException.java b/src/java.compiler/share/classes/javax/annotation/processing/FilerException.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/FilerException.java rename to src/java.compiler/share/classes/javax/annotation/processing/FilerException.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/Generated.java b/src/java.compiler/share/classes/javax/annotation/processing/Generated.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/Generated.java rename to src/java.compiler/share/classes/javax/annotation/processing/Generated.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/Messager.java b/src/java.compiler/share/classes/javax/annotation/processing/Messager.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/Messager.java rename to src/java.compiler/share/classes/javax/annotation/processing/Messager.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java b/src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java rename to src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/Processor.java b/src/java.compiler/share/classes/javax/annotation/processing/Processor.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/Processor.java rename to src/java.compiler/share/classes/javax/annotation/processing/Processor.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java b/src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java rename to src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java b/src/java.compiler/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java rename to src/java.compiler/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/SupportedOptions.java b/src/java.compiler/share/classes/javax/annotation/processing/SupportedOptions.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/SupportedOptions.java rename to src/java.compiler/share/classes/javax/annotation/processing/SupportedOptions.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/SupportedSourceVersion.java b/src/java.compiler/share/classes/javax/annotation/processing/SupportedSourceVersion.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/SupportedSourceVersion.java rename to src/java.compiler/share/classes/javax/annotation/processing/SupportedSourceVersion.java diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/package-info.java b/src/java.compiler/share/classes/javax/annotation/processing/package-info.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/annotation/processing/package-info.java rename to src/java.compiler/share/classes/javax/annotation/processing/package-info.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java b/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java rename to src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java rename to src/java.compiler/share/classes/javax/lang/model/SourceVersion.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.java b/src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.java rename to src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/AnnotationMirror.java b/src/java.compiler/share/classes/javax/lang/model/element/AnnotationMirror.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/AnnotationMirror.java rename to src/java.compiler/share/classes/javax/lang/model/element/AnnotationMirror.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValue.java b/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValue.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValue.java rename to src/java.compiler/share/classes/javax/lang/model/element/AnnotationValue.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java b/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java rename to src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/Element.java b/src/java.compiler/share/classes/javax/lang/model/element/Element.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/Element.java rename to src/java.compiler/share/classes/javax/lang/model/element/Element.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java b/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java rename to src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java b/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java rename to src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/ExecutableElement.java b/src/java.compiler/share/classes/javax/lang/model/element/ExecutableElement.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/ExecutableElement.java rename to src/java.compiler/share/classes/javax/lang/model/element/ExecutableElement.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java b/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java rename to src/java.compiler/share/classes/javax/lang/model/element/Modifier.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java b/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java rename to src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/Name.java b/src/java.compiler/share/classes/javax/lang/model/element/Name.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/Name.java rename to src/java.compiler/share/classes/javax/lang/model/element/Name.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java b/src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java rename to src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java b/src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java rename to src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/Parameterizable.java b/src/java.compiler/share/classes/javax/lang/model/element/Parameterizable.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/Parameterizable.java rename to src/java.compiler/share/classes/javax/lang/model/element/Parameterizable.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/QualifiedNameable.java b/src/java.compiler/share/classes/javax/lang/model/element/QualifiedNameable.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/QualifiedNameable.java rename to src/java.compiler/share/classes/javax/lang/model/element/QualifiedNameable.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java b/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java rename to src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/TypeParameterElement.java b/src/java.compiler/share/classes/javax/lang/model/element/TypeParameterElement.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/TypeParameterElement.java rename to src/java.compiler/share/classes/javax/lang/model/element/TypeParameterElement.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java b/src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java rename to src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/UnknownDirectiveException.java b/src/java.compiler/share/classes/javax/lang/model/element/UnknownDirectiveException.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/UnknownDirectiveException.java rename to src/java.compiler/share/classes/javax/lang/model/element/UnknownDirectiveException.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.java b/src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.java rename to src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java b/src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java rename to src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/package-info.java b/src/java.compiler/share/classes/javax/lang/model/element/package-info.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/element/package-info.java rename to src/java.compiler/share/classes/javax/lang/model/element/package-info.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/overview.html b/src/java.compiler/share/classes/javax/lang/model/overview.html similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/overview.html rename to src/java.compiler/share/classes/javax/lang/model/overview.html diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/package-info.java b/src/java.compiler/share/classes/javax/lang/model/package-info.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/package-info.java rename to src/java.compiler/share/classes/javax/lang/model/package-info.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/ArrayType.java b/src/java.compiler/share/classes/javax/lang/model/type/ArrayType.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/ArrayType.java rename to src/java.compiler/share/classes/javax/lang/model/type/ArrayType.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/DeclaredType.java b/src/java.compiler/share/classes/javax/lang/model/type/DeclaredType.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/DeclaredType.java rename to src/java.compiler/share/classes/javax/lang/model/type/DeclaredType.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/ErrorType.java b/src/java.compiler/share/classes/javax/lang/model/type/ErrorType.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/ErrorType.java rename to src/java.compiler/share/classes/javax/lang/model/type/ErrorType.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/ExecutableType.java b/src/java.compiler/share/classes/javax/lang/model/type/ExecutableType.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/ExecutableType.java rename to src/java.compiler/share/classes/javax/lang/model/type/ExecutableType.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/IntersectionType.java b/src/java.compiler/share/classes/javax/lang/model/type/IntersectionType.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/IntersectionType.java rename to src/java.compiler/share/classes/javax/lang/model/type/IntersectionType.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.java b/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.java rename to src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.java b/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.java rename to src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/NoType.java b/src/java.compiler/share/classes/javax/lang/model/type/NoType.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/NoType.java rename to src/java.compiler/share/classes/javax/lang/model/type/NoType.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/NullType.java b/src/java.compiler/share/classes/javax/lang/model/type/NullType.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/NullType.java rename to src/java.compiler/share/classes/javax/lang/model/type/NullType.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/PrimitiveType.java b/src/java.compiler/share/classes/javax/lang/model/type/PrimitiveType.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/PrimitiveType.java rename to src/java.compiler/share/classes/javax/lang/model/type/PrimitiveType.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/ReferenceType.java b/src/java.compiler/share/classes/javax/lang/model/type/ReferenceType.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/ReferenceType.java rename to src/java.compiler/share/classes/javax/lang/model/type/ReferenceType.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java rename to src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeMirror.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeMirror.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeMirror.java rename to src/java.compiler/share/classes/javax/lang/model/type/TypeMirror.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java rename to src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java rename to src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/UnionType.java b/src/java.compiler/share/classes/javax/lang/model/type/UnionType.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/UnionType.java rename to src/java.compiler/share/classes/javax/lang/model/type/UnionType.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.java b/src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.java rename to src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/WildcardType.java b/src/java.compiler/share/classes/javax/lang/model/type/WildcardType.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/WildcardType.java rename to src/java.compiler/share/classes/javax/lang/model/type/WildcardType.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/type/package-info.java b/src/java.compiler/share/classes/javax/lang/model/type/package-info.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/type/package-info.java rename to src/java.compiler/share/classes/javax/lang/model/type/package-info.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java rename to src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java rename to src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java rename to src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java rename to src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java rename to src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor7.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor7.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor7.java rename to src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor7.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor8.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor8.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor8.java rename to src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor8.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java rename to src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java rename to src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java rename to src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java rename to src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java rename to src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java rename to src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java rename to src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor7.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor7.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor7.java rename to src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor7.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor8.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor8.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor8.java rename to src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor8.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java rename to src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java rename to src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java rename to src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java rename to src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java rename to src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/Elements.java b/src/java.compiler/share/classes/javax/lang/model/util/Elements.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/Elements.java rename to src/java.compiler/share/classes/javax/lang/model/util/Elements.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java rename to src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java rename to src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java rename to src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java rename to src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java rename to src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java rename to src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor8.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor8.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor8.java rename to src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor8.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java rename to src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java rename to src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java rename to src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java rename to src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java rename to src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java rename to src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor7.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor7.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor7.java rename to src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor7.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor8.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor8.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor8.java rename to src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor8.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java rename to src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/Types.java b/src/java.compiler/share/classes/javax/lang/model/util/Types.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/Types.java rename to src/java.compiler/share/classes/javax/lang/model/util/Types.java diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/package-info.java b/src/java.compiler/share/classes/javax/lang/model/util/package-info.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/lang/model/util/package-info.java rename to src/java.compiler/share/classes/javax/lang/model/util/package-info.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/Diagnostic.java b/src/java.compiler/share/classes/javax/tools/Diagnostic.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/Diagnostic.java rename to src/java.compiler/share/classes/javax/tools/Diagnostic.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/DiagnosticCollector.java b/src/java.compiler/share/classes/javax/tools/DiagnosticCollector.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/DiagnosticCollector.java rename to src/java.compiler/share/classes/javax/tools/DiagnosticCollector.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/DiagnosticListener.java b/src/java.compiler/share/classes/javax/tools/DiagnosticListener.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/DiagnosticListener.java rename to src/java.compiler/share/classes/javax/tools/DiagnosticListener.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/DocumentationTool.java b/src/java.compiler/share/classes/javax/tools/DocumentationTool.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/DocumentationTool.java rename to src/java.compiler/share/classes/javax/tools/DocumentationTool.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/FileManagerUtils.java b/src/java.compiler/share/classes/javax/tools/FileManagerUtils.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/FileManagerUtils.java rename to src/java.compiler/share/classes/javax/tools/FileManagerUtils.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/FileObject.java b/src/java.compiler/share/classes/javax/tools/FileObject.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/FileObject.java rename to src/java.compiler/share/classes/javax/tools/FileObject.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/ForwardingFileObject.java b/src/java.compiler/share/classes/javax/tools/ForwardingFileObject.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/ForwardingFileObject.java rename to src/java.compiler/share/classes/javax/tools/ForwardingFileObject.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java b/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java rename to src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileObject.java b/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileObject.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileObject.java rename to src/java.compiler/share/classes/javax/tools/ForwardingJavaFileObject.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/JavaCompiler.java b/src/java.compiler/share/classes/javax/tools/JavaCompiler.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/JavaCompiler.java rename to src/java.compiler/share/classes/javax/tools/JavaCompiler.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/JavaFileManager.java b/src/java.compiler/share/classes/javax/tools/JavaFileManager.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/JavaFileManager.java rename to src/java.compiler/share/classes/javax/tools/JavaFileManager.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/JavaFileObject.java b/src/java.compiler/share/classes/javax/tools/JavaFileObject.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/JavaFileObject.java rename to src/java.compiler/share/classes/javax/tools/JavaFileObject.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/OptionChecker.java b/src/java.compiler/share/classes/javax/tools/OptionChecker.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/OptionChecker.java rename to src/java.compiler/share/classes/javax/tools/OptionChecker.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/SimpleJavaFileObject.java b/src/java.compiler/share/classes/javax/tools/SimpleJavaFileObject.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/SimpleJavaFileObject.java rename to src/java.compiler/share/classes/javax/tools/SimpleJavaFileObject.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java b/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java rename to src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/StandardLocation.java b/src/java.compiler/share/classes/javax/tools/StandardLocation.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/StandardLocation.java rename to src/java.compiler/share/classes/javax/tools/StandardLocation.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/Tool.java b/src/java.compiler/share/classes/javax/tools/Tool.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/Tool.java rename to src/java.compiler/share/classes/javax/tools/Tool.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/ToolProvider.java b/src/java.compiler/share/classes/javax/tools/ToolProvider.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/ToolProvider.java rename to src/java.compiler/share/classes/javax/tools/ToolProvider.java diff --git a/langtools/src/java.compiler/share/classes/javax/tools/overview.html b/src/java.compiler/share/classes/javax/tools/overview.html similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/overview.html rename to src/java.compiler/share/classes/javax/tools/overview.html diff --git a/langtools/src/java.compiler/share/classes/javax/tools/package-info.java b/src/java.compiler/share/classes/javax/tools/package-info.java similarity index 100% rename from langtools/src/java.compiler/share/classes/javax/tools/package-info.java rename to src/java.compiler/share/classes/javax/tools/package-info.java diff --git a/langtools/src/java.compiler/share/classes/module-info.java b/src/java.compiler/share/classes/module-info.java similarity index 100% rename from langtools/src/java.compiler/share/classes/module-info.java rename to src/java.compiler/share/classes/module-info.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/GiopIDL/GIOP.idl b/src/java.corba/share/classes/com/sun/corba/se/GiopIDL/GIOP.idl similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/GiopIDL/GIOP.idl rename to src/java.corba/share/classes/com/sun/corba/se/GiopIDL/GIOP.idl diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/GiopIDL/messages.idl b/src/java.corba/share/classes/com/sun/corba/se/GiopIDL/messages.idl similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/GiopIDL/messages.idl rename to src/java.corba/share/classes/com/sun/corba/se/GiopIDL/messages.idl diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/PortableActivationIDL/activation.idl b/src/java.corba/share/classes/com/sun/corba/se/PortableActivationIDL/activation.idl similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/PortableActivationIDL/activation.idl rename to src/java.corba/share/classes/com/sun/corba/se/PortableActivationIDL/activation.idl diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/CommandHandler.java b/src/java.corba/share/classes/com/sun/corba/se/impl/activation/CommandHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/CommandHandler.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/activation/CommandHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/NameServiceStartThread.java b/src/java.corba/share/classes/com/sun/corba/se/impl/activation/NameServiceStartThread.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/NameServiceStartThread.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/activation/NameServiceStartThread.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ORBD.java b/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ORBD.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ORBD.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/activation/ORBD.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ProcessMonitorThread.java b/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ProcessMonitorThread.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ProcessMonitorThread.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/activation/ProcessMonitorThread.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/RepositoryImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/activation/RepositoryImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/RepositoryImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/activation/RepositoryImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerMain.java b/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerMain.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerMain.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerMain.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerTableEntry.java b/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerTableEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerTableEntry.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerTableEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerTool.java b/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerTool.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerTool.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/activation/ServerTool.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/CopierManagerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/CopierManagerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/CopierManagerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/CopierManagerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImplHelper.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImplHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImplHelper.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImplHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AsynchInvoke.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AsynchInvoke.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AsynchInvoke.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/AsynchInvoke.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/CORBAObjectImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/CORBAObjectImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/CORBAObjectImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/CORBAObjectImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ContextImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ContextImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ContextImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/ContextImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ContextListImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ContextListImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ContextListImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/ContextListImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/EnvironmentImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/EnvironmentImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/EnvironmentImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/EnvironmentImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ExceptionListImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ExceptionListImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ExceptionListImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/ExceptionListImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/NVListImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/NVListImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/NVListImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/NVListImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/NamedValueImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/NamedValueImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/NamedValueImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/NamedValueImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/PrincipalImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/PrincipalImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/PrincipalImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/PrincipalImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ServerRequestImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ServerRequestImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/ServerRequestImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/ServerRequestImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TCUtility.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TCUtility.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TCUtility.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/TCUtility.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeFactory.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeImplHelper.java b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeImplHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeImplHelper.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/TypeCodeImplHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt rename to src/java.corba/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyBasicImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyBasicImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyBasicImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyBasicImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyCollectionImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyCollectionImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyCollectionImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyCollectionImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyConstructedImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyConstructedImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyConstructedImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyConstructedImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyUtil.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyUtil.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyUtil.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyUtil.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynArrayImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynArrayImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynArrayImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynArrayImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynEnumImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynEnumImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynEnumImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynEnumImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynFixedImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynFixedImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynFixedImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynFixedImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynStructImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynStructImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynStructImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynStructImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynUnionImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynUnionImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynUnionImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynUnionImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/dynamicany/DynValueImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerFactory.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerRead.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerRead.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerRead.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerRead.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadGrow.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadGrow.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadGrow.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadGrow.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWrite.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWrite.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWrite.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWrite.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteCollect.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteCollect.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteCollect.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteCollect.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferQueue.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferQueue.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferQueue.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/BufferQueue.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/ByteBufferWithInfo.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/ByteBufferWithInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/ByteBufferWithInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/ByteBufferWithInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputObject.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputObject.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputObject.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputObject.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStreamBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStreamBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStreamBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStreamBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_1.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_1.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_1.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_1.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_2.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_2.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_2.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_2.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStreamBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStreamBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStreamBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStreamBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_1.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_1.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_1.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_1.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_2.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_2.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_2.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_2.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetCache.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetCache.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetCache.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetCache.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarkAndResetHandler.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarkAndResetHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarkAndResetHandler.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarkAndResetHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarshalInputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarshalInputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarshalInputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarshalInputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarshalOutputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarshalOutputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarshalOutputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/MarshalOutputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/OSFCodeSetRegistry.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/OSFCodeSetRegistry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/OSFCodeSetRegistry.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/OSFCodeSetRegistry.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/RestorableInputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/RestorableInputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/RestorableInputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/RestorableInputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeReader.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeReader.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeReader.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/TypeCodeReader.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/WrapperInputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/WrapperInputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/WrapperInputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/encoding/WrapperInputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/InterceptorList.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/InterceptorList.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/InterceptorList.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/InterceptorList.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/SlotTable.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/SlotTable.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/SlotTable.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/SlotTable.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/SlotTableStack.java b/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/SlotTableStack.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/SlotTableStack.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/interceptors/SlotTableStack.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClassCorbaExt.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClassCorbaExt.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClassCorbaExt.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClassCorbaExt.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamField.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamField.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamField.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamField.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/OptionalDataException.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/OptionalDataException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/OptionalDataException.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/io/OptionalDataException.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/TypeMismatchException.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/TypeMismatchException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/TypeMismatchException.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/io/TypeMismatchException.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueUtility.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueUtility.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueUtility.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueUtility.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/FreezableList.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/FreezableList.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/FreezableList.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/FreezableList.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateListImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateListImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateListImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateListImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IdentifiableFactoryFinderBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IdentifiableFactoryFinderBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IdentifiableFactoryFinderBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/IdentifiableFactoryFinderBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/JIDLObjectKeyTemplate.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/JIDLObjectKeyTemplate.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/JIDLObjectKeyTemplate.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/JIDLObjectKeyTemplate.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/NewObjectKeyTemplateBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/NewObjectKeyTemplateBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/NewObjectKeyTemplateBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/NewObjectKeyTemplateBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdArray.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdArray.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdArray.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdArray.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceFactoryImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceFactoryImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceFactoryImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceFactoryImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceProducerBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceProducerBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceProducerBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceProducerBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceTemplateImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceTemplateImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceTemplateImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceTemplateImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldJIDLObjectKeyTemplate.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldJIDLObjectKeyTemplate.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldJIDLObjectKeyTemplate.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldJIDLObjectKeyTemplate.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldObjectKeyTemplateBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldObjectKeyTemplateBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldObjectKeyTemplateBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldObjectKeyTemplateBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldPOAObjectKeyTemplate.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldPOAObjectKeyTemplate.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldPOAObjectKeyTemplate.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/OldPOAObjectKeyTemplate.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TestAssertions b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TestAssertions similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TestAssertions rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/TestAssertions diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/WireObjectKeyTemplate.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/WireObjectKeyTemplate.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/WireObjectKeyTemplate.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/WireObjectKeyTemplate.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/notes b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/notes similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/notes rename to src/java.corba/share/classes/com/sun/corba/se/impl/ior/notes diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java b/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/PortableRemoteObject.java b/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/PortableRemoteObject.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/PortableRemoteObject.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/PortableRemoteObject.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java b/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/USLPort.java b/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/USLPort.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/USLPort.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/legacy/connection/USLPort.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoFactoryImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoFactoryImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoFactoryImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoFactoryImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectFactoryImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectFactoryImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectFactoryImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectFactoryImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerFactoryImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerFactoryImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerFactoryImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerFactoryImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InterOperableNamingImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InterOperableNamingImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InterOperableNamingImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InterOperableNamingImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingKey.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingKey.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingKey.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingKey.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingValue.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingValue.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingValue.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingValue.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextDataStore.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextDataStore.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextDataStore.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextDataStore.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameServer.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameServer.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameServer.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameServer.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNamingContext.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNamingContext.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNamingContext.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNamingContext.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbalocURL.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbalocURL.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbalocURL.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbalocURL.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/NamingConstants.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/NamingConstants.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/NamingConstants.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/NamingConstants.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingKey.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingKey.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingKey.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingKey.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingValue.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingValue.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingValue.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingValue.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameServer.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameServer.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameServer.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameServer.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/ServantManagerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/ServantManagerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/ServantManagerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/ServantManagerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/NullServantImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/NullServantImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/NullServantImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/NullServantImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ActiveObjectMap.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ActiveObjectMap.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ActiveObjectMap.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ActiveObjectMap.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/BadServerIdHandler.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/BadServerIdHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/BadServerIdHandler.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/BadServerIdHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/DelegateImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/DelegateImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/DelegateImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/DelegateImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/IdAssignmentPolicyImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/IdAssignmentPolicyImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/IdAssignmentPolicyImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/IdAssignmentPolicyImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/IdUniquenessPolicyImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/IdUniquenessPolicyImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/IdUniquenessPolicyImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/IdUniquenessPolicyImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ImplicitActivationPolicyImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ImplicitActivationPolicyImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ImplicitActivationPolicyImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ImplicitActivationPolicyImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/LifespanPolicyImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/LifespanPolicyImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/LifespanPolicyImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/LifespanPolicyImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POACurrent.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POACurrent.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POACurrent.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POACurrent.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediator.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediator.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediator.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorFactory.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/Policies.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/Policies.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/Policies.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/Policies.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ServantRetentionPolicyImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ServantRetentionPolicyImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ServantRetentionPolicyImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ServantRetentionPolicyImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ThreadPolicyImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ThreadPolicyImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ThreadPolicyImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/ThreadPolicyImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/minor_code_example.txt b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/minor_code_example.txt similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/minor_code_example.txt rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/minor_code_example.txt diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/standard_minor_codes.txt b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/standard_minor_codes.txt similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/standard_minor_codes.txt rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/standard_minor_codes.txt diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOA.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOA.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOA.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOA.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TransientObjectManager.java b/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TransientObjectManager.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TransientObjectManager.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TransientObjectManager.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/AppletDataCollector.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/AppletDataCollector.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/AppletDataCollector.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/AppletDataCollector.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/DataCollectorBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/DataCollectorBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/DataCollectorBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/DataCollectorBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/DataCollectorFactory.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/DataCollectorFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/DataCollectorFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/DataCollectorFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalDataCollector.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalDataCollector.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalDataCollector.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalDataCollector.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalParserAction.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalParserAction.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalParserAction.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalParserAction.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalParserData.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalParserData.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalParserData.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/NormalParserData.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBConfiguratorImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBConfiguratorImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBConfiguratorImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBConfiguratorImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBVersionImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBVersionImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBVersionImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBVersionImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserAction.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserAction.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserAction.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserAction.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserActionBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserActionBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserActionBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserActionBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserActionFactory.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserActionFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserActionFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserActionFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserDataBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserDataBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserDataBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserDataBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserTable.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserTable.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserTable.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/ParserTable.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PrefixParserAction.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PrefixParserAction.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PrefixParserAction.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/PrefixParserAction.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PrefixParserData.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PrefixParserData.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PrefixParserData.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/PrefixParserData.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PropertyOnlyDataCollector.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PropertyOnlyDataCollector.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/PropertyOnlyDataCollector.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/PropertyOnlyDataCollector.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/parsing_combinators.txt b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/parsing_combinators.txt similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/parsing_combinators.txt rename to src/java.corba/share/classes/com/sun/corba/se/impl/orb/parsing_combinators.txt diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/CacheTable.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/CacheTable.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/CacheTable.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/CacheTable.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/HexOutputStream.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/HexOutputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/HexOutputStream.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/HexOutputStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LogKeywords.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LogKeywords.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LogKeywords.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/LogKeywords.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamField.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamField.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamField.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamField.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectWriter.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectWriter.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectWriter.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectWriter.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/StackImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/StackImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/StackImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/StackImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/closure/Constant.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/closure/Constant.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/closure/Constant.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/closure/Constant.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/closure/Future.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/closure/Future.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/closure/Future.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/closure/Future.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/CondVar.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/CondVar.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/CondVar.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/CondVar.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/DebugMutex.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/DebugMutex.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/DebugMutex.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/DebugMutex.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/ReentrantMutex.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/ReentrantMutex.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/ReentrantMutex.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/ReentrantMutex.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/SyncUtil.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/SyncUtil.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/SyncUtil.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/SyncUtil.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/GuardedAction.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/GuardedAction.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/GuardedAction.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/GuardedAction.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/NameBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/NameBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/NameBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/NameBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/StateEngineImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/StateEngineImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/StateEngineImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/fsm/StateEngineImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/Graph.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/Graph.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/Graph.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/Graph.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/GraphImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/GraphImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/GraphImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/GraphImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/Node.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/Node.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/Node.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/Node.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/NodeData.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/NodeData.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/NodeData.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/graph/NodeData.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb.properties b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb.properties rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb.properties diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolManagerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolManagerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolManagerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolManagerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/TimeoutException.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/TimeoutException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/TimeoutException.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/TimeoutException.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/WorkQueueImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/WorkQueueImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/WorkQueueImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/WorkQueueImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicAccessPermission.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicAccessPermission.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicAccessPermission.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicAccessPermission.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicStubImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicStubImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicStubImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicStubImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandler.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandler.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLType.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLType.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLType.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLType.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypeException.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypeException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypeException.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypeException.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/PresentationManagerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/PresentationManagerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/PresentationManagerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/PresentationManagerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ReflectiveTie.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ReflectiveTie.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ReflectiveTie.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/ReflectiveTie.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubConnectImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubConnectImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubConnectImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubConnectImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryStaticImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryStaticImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryStaticImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryStaticImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubInvocationHandlerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubInvocationHandlerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubInvocationHandlerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubInvocationHandlerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/jndi.properties b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/jndi.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/jndi.properties rename to src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/jndi.properties diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/AddressingDispositionException.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/AddressingDispositionException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/AddressingDispositionException.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/AddressingDispositionException.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/BootstrapServerRequestDispatcher.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/BootstrapServerRequestDispatcher.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/BootstrapServerRequestDispatcher.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/BootstrapServerRequestDispatcher.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaClientDelegateImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaClientDelegateImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaClientDelegateImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaClientDelegateImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaInvocationInfo.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaInvocationInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaInvocationInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaInvocationInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaServerRequestDispatcherImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaServerRequestDispatcherImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaServerRequestDispatcherImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/CorbaServerRequestDispatcherImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/FullServantCacheLocalCRDImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/FullServantCacheLocalCRDImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/FullServantCacheLocalCRDImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/FullServantCacheLocalCRDImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/INSServerRequestDispatcher.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/INSServerRequestDispatcher.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/INSServerRequestDispatcher.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/INSServerRequestDispatcher.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/JIDLLocalCRDImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/JIDLLocalCRDImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/JIDLLocalCRDImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/JIDLLocalCRDImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/MinimalServantCacheLocalCRDImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/MinimalServantCacheLocalCRDImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/MinimalServantCacheLocalCRDImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/MinimalServantCacheLocalCRDImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/NotLocalLocalCRDImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/NotLocalLocalCRDImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/NotLocalLocalCRDImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/NotLocalLocalCRDImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/POALocalCRDImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/POALocalCRDImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/POALocalCRDImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/POALocalCRDImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/RequestCanceledException.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/RequestCanceledException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/RequestCanceledException.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/RequestCanceledException.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/RequestDispatcherRegistryImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/RequestDispatcherRegistryImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/RequestDispatcherRegistryImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/RequestDispatcherRegistryImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/ServantCacheLocalCRDBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/ServantCacheLocalCRDBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/ServantCacheLocalCRDBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/ServantCacheLocalCRDBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/SpecialMethod.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/SpecialMethod.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/SpecialMethod.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/SpecialMethod.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/AddressingDispositionHelper.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/AddressingDispositionHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/AddressingDispositionHelper.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/AddressingDispositionHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_2.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_2.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_2.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_2.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfo.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/KeyAddr.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/KeyAddr.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/KeyAddr.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/KeyAddr.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_0.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_0.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_0.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_0.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_1.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_1.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_1.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_1.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_2.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_2.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_2.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_2.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ProfileAddr.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ProfileAddr.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ProfileAddr.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ProfileAddr.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReferenceAddr.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReferenceAddr.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReferenceAddr.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReferenceAddr.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_0.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_0.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_0.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_0.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java b/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/BootstrapResolverImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/BootstrapResolverImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/BootstrapResolverImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/resolver/BootstrapResolverImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/CompositeResolverImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/CompositeResolverImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/CompositeResolverImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/resolver/CompositeResolverImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/FileResolverImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/FileResolverImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/FileResolverImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/resolver/FileResolverImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/LocalResolverImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/LocalResolverImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/LocalResolverImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/resolver/LocalResolverImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/ORBDefaultInitRefResolverImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/ORBDefaultInitRefResolverImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/ORBDefaultInitRefResolverImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/resolver/ORBDefaultInitRefResolverImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/ORBInitRefResolverImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/ORBInitRefResolverImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/ORBInitRefResolverImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/resolver/ORBInitRefResolverImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/SplitLocalResolverImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/SplitLocalResolverImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/resolver/SplitLocalResolverImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/resolver/SplitLocalResolverImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ByteBufferPoolImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ByteBufferPoolImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ByteBufferPoolImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/ByteBufferPoolImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListIteratorImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListIteratorImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListIteratorImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListIteratorImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaOutboundConnectionCacheImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaOutboundConnectionCacheImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaOutboundConnectionCacheImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaOutboundConnectionCacheImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultIORToSocketInfoImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultIORToSocketInfoImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultIORToSocketInfoImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultIORToSocketInfoImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/EventHandlerBase.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/EventHandlerBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/EventHandlerBase.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/EventHandlerBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ListenerThreadImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ListenerThreadImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ListenerThreadImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/ListenerThreadImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ReadTCPTimeoutsImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ReadTCPTimeoutsImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ReadTCPTimeoutsImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/ReadTCPTimeoutsImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ReaderThreadImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ReaderThreadImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/ReaderThreadImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/ReaderThreadImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelContactInfoImpl.java b/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelContactInfoImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelContactInfoImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelContactInfoImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java b/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEntry.java b/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEntry.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEnumerator.java b/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEnumerator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEnumerator.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEnumerator.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/JDKBridge.java b/src/java.corba/share/classes/com/sun/corba/se/impl/util/JDKBridge.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/JDKBridge.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/util/JDKBridge.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/JDKClassLoader.java b/src/java.corba/share/classes/com/sun/corba/se/impl/util/JDKClassLoader.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/JDKClassLoader.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/util/JDKClassLoader.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/ORBProperties.java b/src/java.corba/share/classes/com/sun/corba/se/impl/util/ORBProperties.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/ORBProperties.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/util/ORBProperties.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/PackagePrefixChecker.java b/src/java.corba/share/classes/com/sun/corba/se/impl/util/PackagePrefixChecker.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/PackagePrefixChecker.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/util/PackagePrefixChecker.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/RepositoryId.java b/src/java.corba/share/classes/com/sun/corba/se/impl/util/RepositoryId.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/RepositoryId.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/util/RepositoryId.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/RepositoryIdCache.java b/src/java.corba/share/classes/com/sun/corba/se/impl/util/RepositoryIdCache.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/RepositoryIdCache.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/util/RepositoryIdCache.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/SUNVMCID.java b/src/java.corba/share/classes/com/sun/corba/se/impl/util/SUNVMCID.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/SUNVMCID.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/util/SUNVMCID.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/Utility.java b/src/java.corba/share/classes/com/sun/corba/se/impl/util/Utility.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/Utility.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/util/Utility.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/Version.java b/src/java.corba/share/classes/com/sun/corba/se/impl/util/Version.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/impl/util/Version.java rename to src/java.corba/share/classes/com/sun/corba/se/impl/util/Version.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/internal/CosNaming/BootstrapServer.java b/src/java.corba/share/classes/com/sun/corba/se/internal/CosNaming/BootstrapServer.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/internal/CosNaming/BootstrapServer.java rename to src/java.corba/share/classes/com/sun/corba/se/internal/CosNaming/BootstrapServer.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/internal/Interceptors/PIORB.java b/src/java.corba/share/classes/com/sun/corba/se/internal/Interceptors/PIORB.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/internal/Interceptors/PIORB.java rename to src/java.corba/share/classes/com/sun/corba/se/internal/Interceptors/PIORB.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/internal/POA/POAORB.java b/src/java.corba/share/classes/com/sun/corba/se/internal/POA/POAORB.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/internal/POA/POAORB.java rename to src/java.corba/share/classes/com/sun/corba/se/internal/POA/POAORB.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/internal/corba/ORBSingleton.java b/src/java.corba/share/classes/com/sun/corba/se/internal/corba/ORBSingleton.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/internal/corba/ORBSingleton.java rename to src/java.corba/share/classes/com/sun/corba/se/internal/corba/ORBSingleton.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/internal/iiop/ORB.java b/src/java.corba/share/classes/com/sun/corba/se/internal/iiop/ORB.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/internal/iiop/ORB.java rename to src/java.corba/share/classes/com/sun/corba/se/internal/iiop/ORB.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/org/omg/CORBA/ORB.java b/src/java.corba/share/classes/com/sun/corba/se/org/omg/CORBA/ORB.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/org/omg/CORBA/ORB.java rename to src/java.corba/share/classes/com/sun/corba/se/org/omg/CORBA/ORB.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/broker/Broker.java b/src/java.corba/share/classes/com/sun/corba/se/pept/broker/Broker.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/broker/Broker.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/broker/Broker.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/encoding/InputObject.java b/src/java.corba/share/classes/com/sun/corba/se/pept/encoding/InputObject.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/encoding/InputObject.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/encoding/InputObject.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/encoding/OutputObject.java b/src/java.corba/share/classes/com/sun/corba/se/pept/encoding/OutputObject.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/encoding/OutputObject.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/encoding/OutputObject.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/package.html b/src/java.corba/share/classes/com/sun/corba/se/pept/package.html similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/package.html rename to src/java.corba/share/classes/com/sun/corba/se/pept/package.html diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientDelegate.java b/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientDelegate.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientDelegate.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientDelegate.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java b/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java b/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/MessageMediator.java b/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/MessageMediator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/MessageMediator.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/protocol/MessageMediator.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ProtocolHandler.java b/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ProtocolHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ProtocolHandler.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ProtocolHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java b/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ByteBufferPool.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ByteBufferPool.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ByteBufferPool.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/ByteBufferPool.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Connection.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Connection.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Connection.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/Connection.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ConnectionCache.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ConnectionCache.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ConnectionCache.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/ConnectionCache.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfo.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfoList.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfoList.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfoList.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfoList.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfoListIterator.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfoListIterator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfoListIterator.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/ContactInfoListIterator.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/EventHandler.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/EventHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/EventHandler.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/EventHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/InboundConnectionCache.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/InboundConnectionCache.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/InboundConnectionCache.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/InboundConnectionCache.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ListenerThread.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ListenerThread.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ListenerThread.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/ListenerThread.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/OutboundConnectionCache.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/OutboundConnectionCache.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/OutboundConnectionCache.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/OutboundConnectionCache.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ReaderThread.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ReaderThread.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ReaderThread.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/ReaderThread.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ResponseWaitingRoom.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ResponseWaitingRoom.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/ResponseWaitingRoom.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/ResponseWaitingRoom.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Selector.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Selector.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Selector.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/Selector.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/TransportManager.java b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/TransportManager.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/TransportManager.java rename to src/java.corba/share/classes/com/sun/corba/se/pept/transport/TransportManager.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/activation/activation.idl b/src/java.corba/share/classes/com/sun/corba/se/spi/activation/activation.idl similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/activation/activation.idl rename to src/java.corba/share/classes/com/sun/corba/se/spi/activation/activation.idl diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/CopierManager.java b/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/CopierManager.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/CopierManager.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/CopierManager.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java b/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopier.java b/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopier.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopier.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopier.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopierFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopierFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopierFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopierFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java b/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/encoding/CorbaInputObject.java b/src/java.corba/share/classes/com/sun/corba/se/spi/encoding/CorbaInputObject.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/encoding/CorbaInputObject.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/encoding/CorbaInputObject.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/encoding/CorbaOutputObject.java b/src/java.corba/share/classes/com/sun/corba/se/spi/encoding/CorbaOutputObject.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/encoding/CorbaOutputObject.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/encoding/CorbaOutputObject.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/CopyObjectPolicy.java b/src/java.corba/share/classes/com/sun/corba/se/spi/extension/CopyObjectPolicy.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/CopyObjectPolicy.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/extension/CopyObjectPolicy.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/RequestPartitioningPolicy.java b/src/java.corba/share/classes/com/sun/corba/se/spi/extension/RequestPartitioningPolicy.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/RequestPartitioningPolicy.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/extension/RequestPartitioningPolicy.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java b/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ZeroPortPolicy.java b/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ZeroPortPolicy.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ZeroPortPolicy.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/extension/ZeroPortPolicy.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/EncapsulationFactoryBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/EncapsulationFactoryBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/EncapsulationFactoryBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/EncapsulationFactoryBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IOR.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IOR.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IOR.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/IOR.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORFactories.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORFactories.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORFactories.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORFactories.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORTemplate.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORTemplate.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORTemplate.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORTemplate.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORTemplateList.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORTemplateList.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORTemplateList.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/IORTemplateList.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/Identifiable.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/Identifiable.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/Identifiable.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/Identifiable.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableContainerBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableContainerBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableContainerBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableContainerBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactoryFinder.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactoryFinder.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactoryFinder.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactoryFinder.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/MakeImmutable.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/MakeImmutable.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/MakeImmutable.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/MakeImmutable.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectAdapterId.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectAdapterId.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectAdapterId.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectAdapterId.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectId.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectId.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectId.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectId.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKey.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKey.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKey.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKey.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKeyFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKeyFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKeyFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKeyFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKeyTemplate.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKeyTemplate.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKeyTemplate.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/ObjectKeyTemplate.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponent.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponent.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponent.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponent.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponentFactoryFinder.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponentFactoryFinder.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponentFactoryFinder.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedComponentFactoryFinder.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfile.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfile.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfile.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfile.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplate.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplate.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplate.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplate.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplateBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplateBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplateBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplateBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/WriteContents.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/WriteContents.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/WriteContents.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/WriteContents.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/Writeable.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/Writeable.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/Writeable.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/Writeable.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/GIOPVersion.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/GIOPVersion.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/GIOPVersion.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/GIOPVersion.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPAddress.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPAddress.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPAddress.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPAddress.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPFactories.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPFactories.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPFactories.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPFactories.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfile.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfile.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfile.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfile.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/JavaCodebaseComponent.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/JavaCodebaseComponent.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/JavaCodebaseComponent.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/JavaCodebaseComponent.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/MaxStreamFormatVersionComponent.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/MaxStreamFormatVersionComponent.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/MaxStreamFormatVersionComponent.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/MaxStreamFormatVersionComponent.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/RequestPartitioningComponent.java b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/RequestPartitioningComponent.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/RequestPartitioningComponent.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/iiop/RequestPartitioningComponent.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iornotes b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iornotes similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/iornotes rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/iornotes diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html b/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html rename to src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/Connection.java b/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/Connection.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/Connection.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/Connection.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java b/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java b/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java b/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/README.txt b/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/README.txt similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/README.txt rename to src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/README.txt diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java b/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java b/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java b/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/UnknownType.java b/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/UnknownType.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/UnknownType.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/UnknownType.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java b/src/java.corba/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/LogWrapperBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/logging/LogWrapperBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/LogWrapperBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/logging/LogWrapperBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/LogWrapperFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/logging/LogWrapperFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/LogWrapperFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/logging/LogWrapperFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc b/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc rename to src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc b/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc rename to src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc b/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc rename to src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc b/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc rename to src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc b/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc rename to src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc b/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc rename to src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/POA.mc b/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/POA.mc similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/POA.mc rename to src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/POA.mc diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Util.mc b/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Util.mc similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Util.mc rename to src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/Util.mc diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringConstants.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringConstants.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringConstants.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringConstants.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/package.html b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/package.html similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/package.html rename to src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/package.html diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/NullServant.java b/src/java.corba/share/classes/com/sun/corba/se/spi/oa/NullServant.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/NullServant.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/oa/NullServant.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OADefault.java b/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OADefault.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OADefault.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/oa/OADefault.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OADestroyed.java b/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OADestroyed.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OADestroyed.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/oa/OADestroyed.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OAInvocationInfo.java b/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OAInvocationInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/OAInvocationInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/oa/OAInvocationInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java b/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/DataCollector.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/DataCollector.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/DataCollector.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/DataCollector.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORB.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORB.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORB.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORB.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBConfigurator.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBConfigurator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBConfigurator.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBConfigurator.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBData.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBData.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBData.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBData.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBVersion.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBVersion.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBVersion.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBVersion.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBVersionFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBVersionFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBVersionFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORBVersionFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/Operation.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/Operation.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/Operation.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/Operation.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserData.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserData.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserData.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserData.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserDataFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserDataFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserDataFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserDataFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserImplBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserImplBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserImplBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserImplBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserImplTableBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserImplTableBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserImplTableBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/ParserImplTableBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/PropertyParser.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/PropertyParser.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/PropertyParser.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/PropertyParser.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/StringPair.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orb/StringPair.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/StringPair.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orb/StringPair.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/closure/Closure.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/closure/Closure.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/closure/Closure.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/closure/Closure.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/closure/ClosureFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/closure/ClosureFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/closure/ClosureFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/closure/ClosureFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/ActionBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/ActionBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/ActionBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/ActionBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSM.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSM.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSM.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSM.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMImpl.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMTest.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMTest.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMTest.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMTest.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/GuardBase.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/GuardBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/GuardBase.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/GuardBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Input.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Input.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Input.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Input.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/InputImpl.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/InputImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/InputImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/InputImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/State.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/State.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/State.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/State.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngine.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngine.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngine.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngine.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngineFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngineFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngineFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngineFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateImpl.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandler.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandler.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/DelegateInvocationHandlerImpl.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/DelegateInvocationHandlerImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/DelegateInvocationHandlerImpl.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/DelegateInvocationHandlerImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/LinkedInvocationHandler.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/LinkedInvocationHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/LinkedInvocationHandler.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/proxy/LinkedInvocationHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchWorkQueueException.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchWorkQueueException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchWorkQueueException.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchWorkQueueException.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPool.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPool.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPool.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPool.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolChooser.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolChooser.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolChooser.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolChooser.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolManager.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolManager.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolManager.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolManager.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/Work.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/Work.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/Work.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/Work.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/WorkQueue.java b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/WorkQueue.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/WorkQueue.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/threadpool/WorkQueue.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java b/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicStub.java b/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicStub.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicStub.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicStub.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java b/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java b/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationManager.java b/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationManager.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationManager.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationManager.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/StubAdapter.java b/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/StubAdapter.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/StubAdapter.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/StubAdapter.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/StubWrapper.java b/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/StubWrapper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/StubWrapper.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/presentation/rmi/StubWrapper.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/ClientDelegateFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/ClientDelegateFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/ClientDelegateFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/ClientDelegateFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaClientDelegate.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaClientDelegate.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaClientDelegate.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaClientDelegate.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaMessageMediator.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaMessageMediator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaMessageMediator.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaMessageMediator.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/ForwardException.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/ForwardException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/ForwardException.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/ForwardException.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/InitialServerRequestDispatcher.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/InitialServerRequestDispatcher.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/InitialServerRequestDispatcher.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/InitialServerRequestDispatcher.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcher.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcher.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcher.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcher.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcherFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcherFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcherFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcherFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/PIHandler.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/PIHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/PIHandler.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/PIHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherRegistry.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherRegistry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherRegistry.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherRegistry.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RetryType.java b/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RetryType.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RetryType.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/protocol/RetryType.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/LocalResolver.java b/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/LocalResolver.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/LocalResolver.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/resolver/LocalResolver.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/Resolver.java b/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/Resolver.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/Resolver.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/resolver/Resolver.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/ResolverDefault.java b/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/ResolverDefault.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/resolver/ResolverDefault.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/resolver/ResolverDefault.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java b/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/MaxStreamFormatVersionServiceContext.java b/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/MaxStreamFormatVersionServiceContext.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/MaxStreamFormatVersionServiceContext.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/MaxStreamFormatVersionServiceContext.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java b/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/SendingContextServiceContext.java b/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/SendingContextServiceContext.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/SendingContextServiceContext.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/SendingContextServiceContext.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java b/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextData.java b/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextData.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextData.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextData.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextRegistry.java b/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextRegistry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextRegistry.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextRegistry.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java b/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/UEInfoServiceContext.java b/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/UEInfoServiceContext.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/UEInfoServiceContext.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/UEInfoServiceContext.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/UnknownServiceContext.java b/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/UnknownServiceContext.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/UnknownServiceContext.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/UnknownServiceContext.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaAcceptor.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaAcceptor.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaAcceptor.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaAcceptor.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaConnection.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaConnection.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaConnection.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaConnection.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaConnectionCache.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaConnectionCache.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaConnectionCache.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaConnectionCache.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfo.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoList.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoList.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoList.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoList.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListIterator.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListIterator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListIterator.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListIterator.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaResponseWaitingRoom.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaResponseWaitingRoom.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaResponseWaitingRoom.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaResponseWaitingRoom.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaTransportManager.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaTransportManager.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaTransportManager.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/CorbaTransportManager.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IORToSocketInfo.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IORToSocketInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IORToSocketInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/IORToSocketInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IORTransformer.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IORTransformer.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/IORTransformer.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/IORTransformer.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ORBSocketFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ORBSocketFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ORBSocketFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/ORBSocketFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ReadTimeouts.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ReadTimeouts.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ReadTimeouts.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/ReadTimeouts.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ReadTimeoutsFactory.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ReadTimeoutsFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/ReadTimeoutsFactory.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/ReadTimeoutsFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/SocketInfo.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/SocketInfo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/SocketInfo.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/SocketInfo.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/SocketOrChannelAcceptor.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/SocketOrChannelAcceptor.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/SocketOrChannelAcceptor.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/SocketOrChannelAcceptor.java diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/TransportDefault.java b/src/java.corba/share/classes/com/sun/corba/se/spi/transport/TransportDefault.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/corba/se/spi/transport/TransportDefault.java rename to src/java.corba/share/classes/com/sun/corba/se/spi/transport/TransportDefault.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java b/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java rename to src/java.corba/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtx.java b/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtx.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtx.java rename to src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtx.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java b/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java rename to src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNNameParser.java b/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNNameParser.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNNameParser.java rename to src/java.corba/share/classes/com/sun/jndi/cosnaming/CNNameParser.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java b/src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java rename to src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java b/src/java.corba/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java rename to src/java.corba/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java b/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java rename to src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java b/src/java.corba/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java rename to src/java.corba/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java b/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java rename to src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties b/src/java.corba/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties rename to src/java.corba/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java b/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java rename to src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java b/src/java.corba/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java rename to src/java.corba/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/GenericURLContext.java b/src/java.corba/share/classes/com/sun/jndi/url/iiop/GenericURLContext.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/GenericURLContext.java rename to src/java.corba/share/classes/com/sun/jndi/url/iiop/GenericURLContext.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java b/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java rename to src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java b/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java rename to src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java b/src/java.corba/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java rename to src/java.corba/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttrDescriptionSeqHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttrDescriptionSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttrDescriptionSeqHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/AttrDescriptionSeqHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeDescription.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeDescription.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeDescription.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeDescription.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeMode.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeMode.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeMode.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeMode.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeModeHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeModeHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeModeHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/AttributeModeHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ContextIdSeqHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ContextIdSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ContextIdSeqHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ContextIdSeqHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ContextIdentifierHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ContextIdentifierHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ContextIdentifierHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ContextIdentifierHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/DefinitionKindHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/DefinitionKindHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/DefinitionKindHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/DefinitionKindHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExceptionDescription.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExceptionDescription.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExceptionDescription.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ExceptionDescription.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/IDLTypeHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/IDLTypeHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/IDLTypeHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/IDLTypeHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/IdentifierHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/IdentifierHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/IdentifierHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/IdentifierHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/Initializer.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/Initializer.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/Initializer.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/Initializer.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/InitializerHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/InitializerHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/InitializerHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/InitializerHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/InitializerSeqHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/InitializerSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/InitializerSeqHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/InitializerSeqHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationDescription.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationDescription.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationDescription.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationDescription.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationDescriptionHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationDescriptionHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationDescriptionHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationDescriptionHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationMode.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationMode.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationMode.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationMode.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationModeHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationModeHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationModeHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/OperationModeHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParDescriptionSeqHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParDescriptionSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParDescriptionSeqHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ParDescriptionSeqHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterDescription.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterDescription.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterDescription.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterDescription.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterMode.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterMode.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterMode.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterMode.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterModeHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterModeHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterModeHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ParameterModeHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/Repository.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/Repository.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/Repository.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/Repository.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryIdHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryIdHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryIdHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryIdHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/StructMemberHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/StructMemberHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/StructMemberHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/StructMemberHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/StructMemberSeqHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/StructMemberSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/StructMemberSeqHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/StructMemberSeqHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueMemberHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueMemberHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueMemberHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueMemberHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/VersionSpecHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/VersionSpecHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/VersionSpecHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/VersionSpecHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/VisibilityHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/VisibilityHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/VisibilityHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/VisibilityHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/_IDLTypeStub.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/_IDLTypeStub.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/_IDLTypeStub.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/_IDLTypeStub.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java b/src/java.corba/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBase.java b/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBase.java rename to src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBaseHelper.java b/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBaseHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBaseHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBaseHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBaseOperations.java b/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBaseOperations.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBaseOperations.java rename to src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBaseOperations.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java b/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java b/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java b/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java rename to src/java.corba/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java b/src/java.corba/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java rename to src/java.corba/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java diff --git a/corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/_CodeBaseStub.java b/src/java.corba/share/classes/com/sun/org/omg/SendingContext/_CodeBaseStub.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/org/omg/SendingContext/_CodeBaseStub.java rename to src/java.corba/share/classes/com/sun/org/omg/SendingContext/_CodeBaseStub.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Comment.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Comment.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Comment.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/Comment.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Compile.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Compile.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Compile.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/Compile.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/DefaultSymtabFactory.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/DefaultSymtabFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/DefaultSymtabFactory.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/DefaultSymtabFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Factories.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Factories.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Factories.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/Factories.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/GenFactory.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/GenFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/GenFactory.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/GenFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/GenFileStream.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/GenFileStream.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/GenFileStream.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/GenFileStream.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Generator.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Generator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Generator.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/Generator.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IDLID.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IDLID.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IDLID.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/IDLID.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceState.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceState.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceState.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceState.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceType.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceType.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceType.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceType.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InvalidArgument.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InvalidArgument.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InvalidArgument.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/InvalidArgument.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InvalidCharacter.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InvalidCharacter.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InvalidCharacter.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/InvalidCharacter.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NoPragma.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NoPragma.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NoPragma.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/NoPragma.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Noop.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Noop.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Noop.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/Noop.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParseException.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParseException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParseException.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParseException.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Parser.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Parser.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Parser.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/Parser.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaHandler.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaHandler.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaHandler.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Preprocessor.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Preprocessor.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Preprocessor.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/Preprocessor.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ResourceBundleUtil.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ResourceBundleUtil.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ResourceBundleUtil.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ResourceBundleUtil.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Scanner.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Scanner.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Scanner.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/Scanner.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TokenBuffer.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TokenBuffer.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TokenBuffer.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/TokenBuffer.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionBranch.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionBranch.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionBranch.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionBranch.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Util.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Util.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Util.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/Util.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueRepositoryId.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueRepositoryId.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueRepositoryId.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueRepositoryId.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/And.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/And.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/And.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/And.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BinaryExpr.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BinaryExpr.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BinaryExpr.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BinaryExpr.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanNot.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanNot.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanNot.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanNot.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanOr.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanOr.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanOr.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanOr.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/DefaultExprFactory.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/DefaultExprFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/DefaultExprFactory.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/DefaultExprFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Divide.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Divide.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Divide.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Divide.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Equal.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Equal.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Equal.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Equal.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/EvaluationException.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/EvaluationException.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/EvaluationException.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/EvaluationException.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ExprFactory.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ExprFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ExprFactory.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ExprFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterEqual.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterEqual.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterEqual.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterEqual.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterThan.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterThan.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterThan.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterThan.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessEqual.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessEqual.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessEqual.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessEqual.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessThan.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessThan.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessThan.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/LessThan.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Minus.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Minus.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Minus.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Minus.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Modulo.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Modulo.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Modulo.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Modulo.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Negative.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Negative.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Negative.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Negative.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Not.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Not.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Not.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Not.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/NotEqual.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/NotEqual.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/NotEqual.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/NotEqual.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Or.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Or.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Or.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Or.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Plus.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Plus.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Plus.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Plus.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Positive.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Positive.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Positive.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Positive.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftLeft.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftLeft.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftLeft.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftLeft.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftRight.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftRight.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftRight.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftRight.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Times.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Times.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Times.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Times.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/UnaryExpr.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/UnaryExpr.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/UnaryExpr.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/UnaryExpr.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Xor.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Xor.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Xor.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Xor.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/first.set b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/first.set similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/first.set rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/first.set diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/follow.set b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/follow.set similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/follow.set rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/follow.set diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/grammar.idl b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/grammar.idl similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/grammar.idl rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/grammar.idl diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/grammar3.idl b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/grammar3.idl similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/grammar3.idl rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/grammar3.idl diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl.prp b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl.prp similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl.prp rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl.prp diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ir.idl b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ir.idl similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ir.idl rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/ir.idl diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/keywords b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/keywords similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/keywords rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/keywords diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/orb.idl b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/orb.idl similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/orb.idl rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/orb.idl diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/Messages.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/Messages.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/Messages.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/Messages.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/idlemit/MetaPragma.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/idlemit/MetaPragma.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/idlemit/MetaPragma.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/idlemit/MetaPragma.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AuxGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AuxGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AuxGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AuxGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ConstGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ConstGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ConstGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ConstGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/EnumGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/EnumGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/EnumGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/EnumGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Factories.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Factories.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Factories.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Factories.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ForwardValueGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ForwardValueGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ForwardValueGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ForwardValueGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Holder.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Holder.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Holder.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Holder.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/JavaGenerator.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/JavaGenerator.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/JavaGenerator.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/JavaGenerator.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifier.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifier.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifier.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifier.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifierImpl.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifierImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifierImpl.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifierImpl.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NativeGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NativeGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NativeGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NativeGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/PrimitiveGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/PrimitiveGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/PrimitiveGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/PrimitiveGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Skeleton.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Skeleton.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Skeleton.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Skeleton.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StringGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StringGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StringGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StringGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StructGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StructGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StructGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StructGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Stub.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Stub.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Stub.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Stub.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TCOffsets.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TCOffsets.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TCOffsets.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TCOffsets.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TypedefGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TypedefGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TypedefGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TypedefGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueFactory.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueFactory.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp similarity index 100% rename from corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp rename to src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp diff --git a/corba/src/java.corba/share/classes/javax/activity/ActivityCompletedException.java b/src/java.corba/share/classes/javax/activity/ActivityCompletedException.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/activity/ActivityCompletedException.java rename to src/java.corba/share/classes/javax/activity/ActivityCompletedException.java diff --git a/corba/src/java.corba/share/classes/javax/activity/ActivityRequiredException.java b/src/java.corba/share/classes/javax/activity/ActivityRequiredException.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/activity/ActivityRequiredException.java rename to src/java.corba/share/classes/javax/activity/ActivityRequiredException.java diff --git a/corba/src/java.corba/share/classes/javax/activity/InvalidActivityException.java b/src/java.corba/share/classes/javax/activity/InvalidActivityException.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/activity/InvalidActivityException.java rename to src/java.corba/share/classes/javax/activity/InvalidActivityException.java diff --git a/corba/src/java.corba/share/classes/javax/activity/package.html b/src/java.corba/share/classes/javax/activity/package.html similarity index 100% rename from corba/src/java.corba/share/classes/javax/activity/package.html rename to src/java.corba/share/classes/javax/activity/package.html diff --git a/corba/src/java.corba/share/classes/javax/rmi/CORBA/ClassDesc.java b/src/java.corba/share/classes/javax/rmi/CORBA/ClassDesc.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/CORBA/ClassDesc.java rename to src/java.corba/share/classes/javax/rmi/CORBA/ClassDesc.java diff --git a/corba/src/java.corba/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java b/src/java.corba/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java rename to src/java.corba/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java diff --git a/corba/src/java.corba/share/classes/javax/rmi/CORBA/PortableRemoteObjectDelegate.java b/src/java.corba/share/classes/javax/rmi/CORBA/PortableRemoteObjectDelegate.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/CORBA/PortableRemoteObjectDelegate.java rename to src/java.corba/share/classes/javax/rmi/CORBA/PortableRemoteObjectDelegate.java diff --git a/corba/src/java.corba/share/classes/javax/rmi/CORBA/Stub.java b/src/java.corba/share/classes/javax/rmi/CORBA/Stub.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/CORBA/Stub.java rename to src/java.corba/share/classes/javax/rmi/CORBA/Stub.java diff --git a/corba/src/java.corba/share/classes/javax/rmi/CORBA/StubDelegate.java b/src/java.corba/share/classes/javax/rmi/CORBA/StubDelegate.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/CORBA/StubDelegate.java rename to src/java.corba/share/classes/javax/rmi/CORBA/StubDelegate.java diff --git a/corba/src/java.corba/share/classes/javax/rmi/CORBA/Tie.java b/src/java.corba/share/classes/javax/rmi/CORBA/Tie.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/CORBA/Tie.java rename to src/java.corba/share/classes/javax/rmi/CORBA/Tie.java diff --git a/corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java b/src/java.corba/share/classes/javax/rmi/CORBA/Util.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java rename to src/java.corba/share/classes/javax/rmi/CORBA/Util.java diff --git a/corba/src/java.corba/share/classes/javax/rmi/CORBA/UtilDelegate.java b/src/java.corba/share/classes/javax/rmi/CORBA/UtilDelegate.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/CORBA/UtilDelegate.java rename to src/java.corba/share/classes/javax/rmi/CORBA/UtilDelegate.java diff --git a/corba/src/java.corba/share/classes/javax/rmi/CORBA/ValueHandler.java b/src/java.corba/share/classes/javax/rmi/CORBA/ValueHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/CORBA/ValueHandler.java rename to src/java.corba/share/classes/javax/rmi/CORBA/ValueHandler.java diff --git a/corba/src/java.corba/share/classes/javax/rmi/CORBA/ValueHandlerMultiFormat.java b/src/java.corba/share/classes/javax/rmi/CORBA/ValueHandlerMultiFormat.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/CORBA/ValueHandlerMultiFormat.java rename to src/java.corba/share/classes/javax/rmi/CORBA/ValueHandlerMultiFormat.java diff --git a/corba/src/java.corba/share/classes/javax/rmi/CORBA/package.html b/src/java.corba/share/classes/javax/rmi/CORBA/package.html similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/CORBA/package.html rename to src/java.corba/share/classes/javax/rmi/CORBA/package.html diff --git a/corba/src/java.corba/share/classes/javax/rmi/PortableRemoteObject.java b/src/java.corba/share/classes/javax/rmi/PortableRemoteObject.java similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/PortableRemoteObject.java rename to src/java.corba/share/classes/javax/rmi/PortableRemoteObject.java diff --git a/corba/src/java.corba/share/classes/javax/rmi/package.html b/src/java.corba/share/classes/javax/rmi/package.html similarity index 100% rename from corba/src/java.corba/share/classes/javax/rmi/package.html rename to src/java.corba/share/classes/javax/rmi/package.html diff --git a/corba/src/java.corba/share/classes/module-info.java b/src/java.corba/share/classes/module-info.java similarity index 100% rename from corba/src/java.corba/share/classes/module-info.java rename to src/java.corba/share/classes/module-info.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ACTIVITY_COMPLETED.java b/src/java.corba/share/classes/org/omg/CORBA/ACTIVITY_COMPLETED.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ACTIVITY_COMPLETED.java rename to src/java.corba/share/classes/org/omg/CORBA/ACTIVITY_COMPLETED.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ACTIVITY_REQUIRED.java b/src/java.corba/share/classes/org/omg/CORBA/ACTIVITY_REQUIRED.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ACTIVITY_REQUIRED.java rename to src/java.corba/share/classes/org/omg/CORBA/ACTIVITY_REQUIRED.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ARG_IN.java b/src/java.corba/share/classes/org/omg/CORBA/ARG_IN.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ARG_IN.java rename to src/java.corba/share/classes/org/omg/CORBA/ARG_IN.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ARG_INOUT.java b/src/java.corba/share/classes/org/omg/CORBA/ARG_INOUT.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ARG_INOUT.java rename to src/java.corba/share/classes/org/omg/CORBA/ARG_INOUT.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ARG_OUT.java b/src/java.corba/share/classes/org/omg/CORBA/ARG_OUT.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ARG_OUT.java rename to src/java.corba/share/classes/org/omg/CORBA/ARG_OUT.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/Any.java b/src/java.corba/share/classes/org/omg/CORBA/Any.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/Any.java rename to src/java.corba/share/classes/org/omg/CORBA/Any.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/AnyHolder.java b/src/java.corba/share/classes/org/omg/CORBA/AnyHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/AnyHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/AnyHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/AnySeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/AnySeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/AnySeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/AnySeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_CONTEXT.java b/src/java.corba/share/classes/org/omg/CORBA/BAD_CONTEXT.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BAD_CONTEXT.java rename to src/java.corba/share/classes/org/omg/CORBA/BAD_CONTEXT.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_INV_ORDER.java b/src/java.corba/share/classes/org/omg/CORBA/BAD_INV_ORDER.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BAD_INV_ORDER.java rename to src/java.corba/share/classes/org/omg/CORBA/BAD_INV_ORDER.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_OPERATION.java b/src/java.corba/share/classes/org/omg/CORBA/BAD_OPERATION.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BAD_OPERATION.java rename to src/java.corba/share/classes/org/omg/CORBA/BAD_OPERATION.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_PARAM.java b/src/java.corba/share/classes/org/omg/CORBA/BAD_PARAM.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BAD_PARAM.java rename to src/java.corba/share/classes/org/omg/CORBA/BAD_PARAM.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY.java b/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY.java rename to src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java b/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java rename to src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_VALUE.java b/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_VALUE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_VALUE.java rename to src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_VALUE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_QOS.java b/src/java.corba/share/classes/org/omg/CORBA/BAD_QOS.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BAD_QOS.java rename to src/java.corba/share/classes/org/omg/CORBA/BAD_QOS.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_TYPECODE.java b/src/java.corba/share/classes/org/omg/CORBA/BAD_TYPECODE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BAD_TYPECODE.java rename to src/java.corba/share/classes/org/omg/CORBA/BAD_TYPECODE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanHolder.java b/src/java.corba/share/classes/org/omg/CORBA/BooleanHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BooleanHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/BooleanHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/Bounds.java b/src/java.corba/share/classes/org/omg/CORBA/Bounds.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/Bounds.java rename to src/java.corba/share/classes/org/omg/CORBA/Bounds.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java b/src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ByteHolder.java b/src/java.corba/share/classes/org/omg/CORBA/ByteHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ByteHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/ByteHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/CODESET_INCOMPATIBLE.java b/src/java.corba/share/classes/org/omg/CORBA/CODESET_INCOMPATIBLE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/CODESET_INCOMPATIBLE.java rename to src/java.corba/share/classes/org/omg/CORBA/CODESET_INCOMPATIBLE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/COMM_FAILURE.java b/src/java.corba/share/classes/org/omg/CORBA/COMM_FAILURE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/COMM_FAILURE.java rename to src/java.corba/share/classes/org/omg/CORBA/COMM_FAILURE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/CTX_RESTRICT_SCOPE.java b/src/java.corba/share/classes/org/omg/CORBA/CTX_RESTRICT_SCOPE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/CTX_RESTRICT_SCOPE.java rename to src/java.corba/share/classes/org/omg/CORBA/CTX_RESTRICT_SCOPE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/CharHolder.java b/src/java.corba/share/classes/org/omg/CORBA/CharHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/CharHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/CharHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/CharSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/CharSeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/CharSeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/CharSeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java b/src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java rename to src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatusHelper.java b/src/java.corba/share/classes/org/omg/CORBA/CompletionStatusHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatusHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/CompletionStatusHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/Context.java b/src/java.corba/share/classes/org/omg/CORBA/Context.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/Context.java rename to src/java.corba/share/classes/org/omg/CORBA/Context.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ContextList.java b/src/java.corba/share/classes/org/omg/CORBA/ContextList.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ContextList.java rename to src/java.corba/share/classes/org/omg/CORBA/ContextList.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/Current.java b/src/java.corba/share/classes/org/omg/CORBA/Current.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/Current.java rename to src/java.corba/share/classes/org/omg/CORBA/Current.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHelper.java b/src/java.corba/share/classes/org/omg/CORBA/CurrentHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/CurrentHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHolder.java b/src/java.corba/share/classes/org/omg/CORBA/CurrentHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/CurrentHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentOperations.java b/src/java.corba/share/classes/org/omg/CORBA/CurrentOperations.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/CurrentOperations.java rename to src/java.corba/share/classes/org/omg/CORBA/CurrentOperations.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/CustomMarshal.java b/src/java.corba/share/classes/org/omg/CORBA/CustomMarshal.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/CustomMarshal.java rename to src/java.corba/share/classes/org/omg/CORBA/CustomMarshal.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DATA_CONVERSION.java b/src/java.corba/share/classes/org/omg/CORBA/DATA_CONVERSION.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DATA_CONVERSION.java rename to src/java.corba/share/classes/org/omg/CORBA/DATA_CONVERSION.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java b/src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java rename to src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DataOutputStream.java b/src/java.corba/share/classes/org/omg/CORBA/DataOutputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DataOutputStream.java rename to src/java.corba/share/classes/org/omg/CORBA/DataOutputStream.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKind.java b/src/java.corba/share/classes/org/omg/CORBA/DefinitionKind.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKind.java rename to src/java.corba/share/classes/org/omg/CORBA/DefinitionKind.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKindHelper.java b/src/java.corba/share/classes/org/omg/CORBA/DefinitionKindHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKindHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/DefinitionKindHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DomainManager.java b/src/java.corba/share/classes/org/omg/CORBA/DomainManager.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DomainManager.java rename to src/java.corba/share/classes/org/omg/CORBA/DomainManager.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DomainManagerOperations.java b/src/java.corba/share/classes/org/omg/CORBA/DomainManagerOperations.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DomainManagerOperations.java rename to src/java.corba/share/classes/org/omg/CORBA/DomainManagerOperations.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleHolder.java b/src/java.corba/share/classes/org/omg/CORBA/DoubleHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DoubleHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/DoubleHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynAny.java b/src/java.corba/share/classes/org/omg/CORBA/DynAny.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynAny.java rename to src/java.corba/share/classes/org/omg/CORBA/DynAny.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/Invalid.java b/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/Invalid.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/Invalid.java rename to src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/Invalid.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/InvalidSeq.java b/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/InvalidSeq.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/InvalidSeq.java rename to src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/InvalidSeq.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/InvalidValue.java b/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/InvalidValue.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/InvalidValue.java rename to src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/InvalidValue.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/TypeMismatch.java b/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/TypeMismatch.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/TypeMismatch.java rename to src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/TypeMismatch.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/package.html b/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/package.html rename to src/java.corba/share/classes/org/omg/CORBA/DynAnyPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynArray.java b/src/java.corba/share/classes/org/omg/CORBA/DynArray.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynArray.java rename to src/java.corba/share/classes/org/omg/CORBA/DynArray.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynEnum.java b/src/java.corba/share/classes/org/omg/CORBA/DynEnum.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynEnum.java rename to src/java.corba/share/classes/org/omg/CORBA/DynEnum.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynFixed.java b/src/java.corba/share/classes/org/omg/CORBA/DynFixed.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynFixed.java rename to src/java.corba/share/classes/org/omg/CORBA/DynFixed.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynSequence.java b/src/java.corba/share/classes/org/omg/CORBA/DynSequence.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynSequence.java rename to src/java.corba/share/classes/org/omg/CORBA/DynSequence.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynStruct.java b/src/java.corba/share/classes/org/omg/CORBA/DynStruct.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynStruct.java rename to src/java.corba/share/classes/org/omg/CORBA/DynStruct.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynUnion.java b/src/java.corba/share/classes/org/omg/CORBA/DynUnion.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynUnion.java rename to src/java.corba/share/classes/org/omg/CORBA/DynUnion.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynValue.java b/src/java.corba/share/classes/org/omg/CORBA/DynValue.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynValue.java rename to src/java.corba/share/classes/org/omg/CORBA/DynValue.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DynamicImplementation.java b/src/java.corba/share/classes/org/omg/CORBA/DynamicImplementation.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/DynamicImplementation.java rename to src/java.corba/share/classes/org/omg/CORBA/DynamicImplementation.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/Environment.java b/src/java.corba/share/classes/org/omg/CORBA/Environment.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/Environment.java rename to src/java.corba/share/classes/org/omg/CORBA/Environment.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ExceptionList.java b/src/java.corba/share/classes/org/omg/CORBA/ExceptionList.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ExceptionList.java rename to src/java.corba/share/classes/org/omg/CORBA/ExceptionList.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/FREE_MEM.java b/src/java.corba/share/classes/org/omg/CORBA/FREE_MEM.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/FREE_MEM.java rename to src/java.corba/share/classes/org/omg/CORBA/FREE_MEM.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/FieldNameHelper.java b/src/java.corba/share/classes/org/omg/CORBA/FieldNameHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/FieldNameHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/FieldNameHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/FixedHolder.java b/src/java.corba/share/classes/org/omg/CORBA/FixedHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/FixedHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/FixedHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/FloatHolder.java b/src/java.corba/share/classes/org/omg/CORBA/FloatHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/FloatHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/FloatHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/FloatSeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/IDLType.java b/src/java.corba/share/classes/org/omg/CORBA/IDLType.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/IDLType.java rename to src/java.corba/share/classes/org/omg/CORBA/IDLType.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeHelper.java b/src/java.corba/share/classes/org/omg/CORBA/IDLTypeHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/IDLTypeHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeOperations.java b/src/java.corba/share/classes/org/omg/CORBA/IDLTypeOperations.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeOperations.java rename to src/java.corba/share/classes/org/omg/CORBA/IDLTypeOperations.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/IMP_LIMIT.java b/src/java.corba/share/classes/org/omg/CORBA/IMP_LIMIT.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/IMP_LIMIT.java rename to src/java.corba/share/classes/org/omg/CORBA/IMP_LIMIT.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/INITIALIZE.java b/src/java.corba/share/classes/org/omg/CORBA/INITIALIZE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/INITIALIZE.java rename to src/java.corba/share/classes/org/omg/CORBA/INITIALIZE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/INTERNAL.java b/src/java.corba/share/classes/org/omg/CORBA/INTERNAL.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/INTERNAL.java rename to src/java.corba/share/classes/org/omg/CORBA/INTERNAL.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/INTF_REPOS.java b/src/java.corba/share/classes/org/omg/CORBA/INTF_REPOS.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/INTF_REPOS.java rename to src/java.corba/share/classes/org/omg/CORBA/INTF_REPOS.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/INVALID_ACTIVITY.java b/src/java.corba/share/classes/org/omg/CORBA/INVALID_ACTIVITY.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/INVALID_ACTIVITY.java rename to src/java.corba/share/classes/org/omg/CORBA/INVALID_ACTIVITY.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/INVALID_TRANSACTION.java b/src/java.corba/share/classes/org/omg/CORBA/INVALID_TRANSACTION.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/INVALID_TRANSACTION.java rename to src/java.corba/share/classes/org/omg/CORBA/INVALID_TRANSACTION.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/INV_FLAG.java b/src/java.corba/share/classes/org/omg/CORBA/INV_FLAG.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/INV_FLAG.java rename to src/java.corba/share/classes/org/omg/CORBA/INV_FLAG.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/INV_IDENT.java b/src/java.corba/share/classes/org/omg/CORBA/INV_IDENT.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/INV_IDENT.java rename to src/java.corba/share/classes/org/omg/CORBA/INV_IDENT.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/INV_OBJREF.java b/src/java.corba/share/classes/org/omg/CORBA/INV_OBJREF.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/INV_OBJREF.java rename to src/java.corba/share/classes/org/omg/CORBA/INV_OBJREF.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/INV_POLICY.java b/src/java.corba/share/classes/org/omg/CORBA/INV_POLICY.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/INV_POLICY.java rename to src/java.corba/share/classes/org/omg/CORBA/INV_POLICY.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/IRObject.java b/src/java.corba/share/classes/org/omg/CORBA/IRObject.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/IRObject.java rename to src/java.corba/share/classes/org/omg/CORBA/IRObject.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/IRObjectOperations.java b/src/java.corba/share/classes/org/omg/CORBA/IRObjectOperations.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/IRObjectOperations.java rename to src/java.corba/share/classes/org/omg/CORBA/IRObjectOperations.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/IdentifierHelper.java b/src/java.corba/share/classes/org/omg/CORBA/IdentifierHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/IdentifierHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/IdentifierHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/IntHolder.java b/src/java.corba/share/classes/org/omg/CORBA/IntHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/IntHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/IntHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java b/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java rename to src/java.corba/share/classes/org/omg/CORBA/LocalObject.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/LongHolder.java b/src/java.corba/share/classes/org/omg/CORBA/LongHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/LongHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/LongHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/LongSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/LongSeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/LongSeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/LongSeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/MARSHAL.java b/src/java.corba/share/classes/org/omg/CORBA/MARSHAL.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/MARSHAL.java rename to src/java.corba/share/classes/org/omg/CORBA/MARSHAL.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/NO_IMPLEMENT.java b/src/java.corba/share/classes/org/omg/CORBA/NO_IMPLEMENT.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/NO_IMPLEMENT.java rename to src/java.corba/share/classes/org/omg/CORBA/NO_IMPLEMENT.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/NO_MEMORY.java b/src/java.corba/share/classes/org/omg/CORBA/NO_MEMORY.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/NO_MEMORY.java rename to src/java.corba/share/classes/org/omg/CORBA/NO_MEMORY.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/NO_PERMISSION.java b/src/java.corba/share/classes/org/omg/CORBA/NO_PERMISSION.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/NO_PERMISSION.java rename to src/java.corba/share/classes/org/omg/CORBA/NO_PERMISSION.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/NO_RESOURCES.java b/src/java.corba/share/classes/org/omg/CORBA/NO_RESOURCES.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/NO_RESOURCES.java rename to src/java.corba/share/classes/org/omg/CORBA/NO_RESOURCES.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/NO_RESPONSE.java b/src/java.corba/share/classes/org/omg/CORBA/NO_RESPONSE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/NO_RESPONSE.java rename to src/java.corba/share/classes/org/omg/CORBA/NO_RESPONSE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/NVList.java b/src/java.corba/share/classes/org/omg/CORBA/NVList.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/NVList.java rename to src/java.corba/share/classes/org/omg/CORBA/NVList.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePair.java b/src/java.corba/share/classes/org/omg/CORBA/NameValuePair.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePair.java rename to src/java.corba/share/classes/org/omg/CORBA/NameValuePair.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePairHelper.java b/src/java.corba/share/classes/org/omg/CORBA/NameValuePairHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePairHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/NameValuePairHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/NamedValue.java b/src/java.corba/share/classes/org/omg/CORBA/NamedValue.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/NamedValue.java rename to src/java.corba/share/classes/org/omg/CORBA/NamedValue.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/OBJECT_NOT_EXIST.java b/src/java.corba/share/classes/org/omg/CORBA/OBJECT_NOT_EXIST.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/OBJECT_NOT_EXIST.java rename to src/java.corba/share/classes/org/omg/CORBA/OBJECT_NOT_EXIST.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/OBJ_ADAPTER.java b/src/java.corba/share/classes/org/omg/CORBA/OBJ_ADAPTER.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/OBJ_ADAPTER.java rename to src/java.corba/share/classes/org/omg/CORBA/OBJ_ADAPTER.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/OMGVMCID.java b/src/java.corba/share/classes/org/omg/CORBA/OMGVMCID.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/OMGVMCID.java rename to src/java.corba/share/classes/org/omg/CORBA/OMGVMCID.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java b/src/java.corba/share/classes/org/omg/CORBA/ORB.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java rename to src/java.corba/share/classes/org/omg/CORBA/ORB.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java b/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java rename to src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidName.java b/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidName.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidName.java rename to src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidName.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java b/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/package.html b/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/package.html rename to src/java.corba/share/classes/org/omg/CORBA/ORBPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/Object.java b/src/java.corba/share/classes/org/omg/CORBA/Object.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/Object.java rename to src/java.corba/share/classes/org/omg/CORBA/Object.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHelper.java b/src/java.corba/share/classes/org/omg/CORBA/ObjectHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/ObjectHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHolder.java b/src/java.corba/share/classes/org/omg/CORBA/ObjectHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/ObjectHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/OctetSeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/OctetSeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/PERSIST_STORE.java b/src/java.corba/share/classes/org/omg/CORBA/PERSIST_STORE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/PERSIST_STORE.java rename to src/java.corba/share/classes/org/omg/CORBA/PERSIST_STORE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/PRIVATE_MEMBER.java b/src/java.corba/share/classes/org/omg/CORBA/PRIVATE_MEMBER.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/PRIVATE_MEMBER.java rename to src/java.corba/share/classes/org/omg/CORBA/PRIVATE_MEMBER.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/PUBLIC_MEMBER.java b/src/java.corba/share/classes/org/omg/CORBA/PUBLIC_MEMBER.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/PUBLIC_MEMBER.java rename to src/java.corba/share/classes/org/omg/CORBA/PUBLIC_MEMBER.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/Policy.java b/src/java.corba/share/classes/org/omg/CORBA/Policy.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/Policy.java rename to src/java.corba/share/classes/org/omg/CORBA/Policy.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyError.java b/src/java.corba/share/classes/org/omg/CORBA/PolicyError.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/PolicyError.java rename to src/java.corba/share/classes/org/omg/CORBA/PolicyError.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyHelper.java b/src/java.corba/share/classes/org/omg/CORBA/PolicyHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/PolicyHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/PolicyHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyHolder.java b/src/java.corba/share/classes/org/omg/CORBA/PolicyHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/PolicyHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/PolicyHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyListHelper.java b/src/java.corba/share/classes/org/omg/CORBA/PolicyListHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/PolicyListHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/PolicyListHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyListHolder.java b/src/java.corba/share/classes/org/omg/CORBA/PolicyListHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/PolicyListHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/PolicyListHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyOperations.java b/src/java.corba/share/classes/org/omg/CORBA/PolicyOperations.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/PolicyOperations.java rename to src/java.corba/share/classes/org/omg/CORBA/PolicyOperations.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyTypeHelper.java b/src/java.corba/share/classes/org/omg/CORBA/PolicyTypeHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/PolicyTypeHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/PolicyTypeHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/Principal.java b/src/java.corba/share/classes/org/omg/CORBA/Principal.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/Principal.java rename to src/java.corba/share/classes/org/omg/CORBA/Principal.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/PrincipalHolder.java b/src/java.corba/share/classes/org/omg/CORBA/PrincipalHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/PrincipalHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/PrincipalHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/REBIND.java b/src/java.corba/share/classes/org/omg/CORBA/REBIND.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/REBIND.java rename to src/java.corba/share/classes/org/omg/CORBA/REBIND.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/RepositoryIdHelper.java b/src/java.corba/share/classes/org/omg/CORBA/RepositoryIdHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/RepositoryIdHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/RepositoryIdHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/Request.java b/src/java.corba/share/classes/org/omg/CORBA/Request.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/Request.java rename to src/java.corba/share/classes/org/omg/CORBA/Request.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java b/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java rename to src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ServiceDetail.java b/src/java.corba/share/classes/org/omg/CORBA/ServiceDetail.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ServiceDetail.java rename to src/java.corba/share/classes/org/omg/CORBA/ServiceDetail.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ServiceDetailHelper.java b/src/java.corba/share/classes/org/omg/CORBA/ServiceDetailHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ServiceDetailHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/ServiceDetailHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ServiceInformation.java b/src/java.corba/share/classes/org/omg/CORBA/ServiceInformation.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ServiceInformation.java rename to src/java.corba/share/classes/org/omg/CORBA/ServiceInformation.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ServiceInformationHelper.java b/src/java.corba/share/classes/org/omg/CORBA/ServiceInformationHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ServiceInformationHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/ServiceInformationHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ServiceInformationHolder.java b/src/java.corba/share/classes/org/omg/CORBA/ServiceInformationHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ServiceInformationHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/ServiceInformationHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/SetOverrideType.java b/src/java.corba/share/classes/org/omg/CORBA/SetOverrideType.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/SetOverrideType.java rename to src/java.corba/share/classes/org/omg/CORBA/SetOverrideType.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/SetOverrideTypeHelper.java b/src/java.corba/share/classes/org/omg/CORBA/SetOverrideTypeHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/SetOverrideTypeHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/SetOverrideTypeHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java b/src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ShortSeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/ShortSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ShortSeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/ShortSeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ShortSeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/ShortSeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ShortSeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/ShortSeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/StringHolder.java b/src/java.corba/share/classes/org/omg/CORBA/StringHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/StringHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/StringHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/StringValueHelper.java b/src/java.corba/share/classes/org/omg/CORBA/StringValueHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/StringValueHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/StringValueHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/StructMember.java b/src/java.corba/share/classes/org/omg/CORBA/StructMember.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/StructMember.java rename to src/java.corba/share/classes/org/omg/CORBA/StructMember.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/StructMemberHelper.java b/src/java.corba/share/classes/org/omg/CORBA/StructMemberHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/StructMemberHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/StructMemberHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/SystemException.java b/src/java.corba/share/classes/org/omg/CORBA/SystemException.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/SystemException.java rename to src/java.corba/share/classes/org/omg/CORBA/SystemException.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TCKind.java b/src/java.corba/share/classes/org/omg/CORBA/TCKind.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TCKind.java rename to src/java.corba/share/classes/org/omg/CORBA/TCKind.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TIMEOUT.java b/src/java.corba/share/classes/org/omg/CORBA/TIMEOUT.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TIMEOUT.java rename to src/java.corba/share/classes/org/omg/CORBA/TIMEOUT.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_MODE.java b/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_MODE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_MODE.java rename to src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_MODE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_REQUIRED.java b/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_REQUIRED.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_REQUIRED.java rename to src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_REQUIRED.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java b/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java rename to src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java b/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java rename to src/java.corba/share/classes/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TRANSIENT.java b/src/java.corba/share/classes/org/omg/CORBA/TRANSIENT.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TRANSIENT.java rename to src/java.corba/share/classes/org/omg/CORBA/TRANSIENT.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCode.java b/src/java.corba/share/classes/org/omg/CORBA/TypeCode.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TypeCode.java rename to src/java.corba/share/classes/org/omg/CORBA/TypeCode.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodeHolder.java b/src/java.corba/share/classes/org/omg/CORBA/TypeCodeHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodeHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/TypeCodeHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKind.java b/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKind.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKind.java rename to src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKind.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java b/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/Bounds.java b/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/Bounds.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/Bounds.java rename to src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/Bounds.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java b/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/package.html b/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/package.html rename to src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ULongLongSeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/ULongLongSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ULongLongSeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/ULongLongSeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ULongLongSeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/ULongLongSeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ULongLongSeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/ULongLongSeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ULongSeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/ULongSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ULongSeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/ULongSeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ULongSeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/ULongSeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ULongSeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/ULongSeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/UNKNOWN.java b/src/java.corba/share/classes/org/omg/CORBA/UNKNOWN.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/UNKNOWN.java rename to src/java.corba/share/classes/org/omg/CORBA/UNKNOWN.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY.java b/src/java.corba/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY.java rename to src/java.corba/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java b/src/java.corba/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java rename to src/java.corba/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/UShortSeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/UShortSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/UShortSeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/UShortSeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/UShortSeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/UShortSeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/UShortSeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/UShortSeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/UnionMember.java b/src/java.corba/share/classes/org/omg/CORBA/UnionMember.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/UnionMember.java rename to src/java.corba/share/classes/org/omg/CORBA/UnionMember.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/UnionMemberHelper.java b/src/java.corba/share/classes/org/omg/CORBA/UnionMemberHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/UnionMemberHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/UnionMemberHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/UnknownUserException.java b/src/java.corba/share/classes/org/omg/CORBA/UnknownUserException.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/UnknownUserException.java rename to src/java.corba/share/classes/org/omg/CORBA/UnknownUserException.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/UnknownUserExceptionHelper.java b/src/java.corba/share/classes/org/omg/CORBA/UnknownUserExceptionHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/UnknownUserExceptionHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/UnknownUserExceptionHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/UnknownUserExceptionHolder.java b/src/java.corba/share/classes/org/omg/CORBA/UnknownUserExceptionHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/UnknownUserExceptionHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/UnknownUserExceptionHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/UserException.java b/src/java.corba/share/classes/org/omg/CORBA/UserException.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/UserException.java rename to src/java.corba/share/classes/org/omg/CORBA/UserException.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/VM_ABSTRACT.java b/src/java.corba/share/classes/org/omg/CORBA/VM_ABSTRACT.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/VM_ABSTRACT.java rename to src/java.corba/share/classes/org/omg/CORBA/VM_ABSTRACT.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/VM_CUSTOM.java b/src/java.corba/share/classes/org/omg/CORBA/VM_CUSTOM.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/VM_CUSTOM.java rename to src/java.corba/share/classes/org/omg/CORBA/VM_CUSTOM.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/VM_NONE.java b/src/java.corba/share/classes/org/omg/CORBA/VM_NONE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/VM_NONE.java rename to src/java.corba/share/classes/org/omg/CORBA/VM_NONE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/VM_TRUNCATABLE.java b/src/java.corba/share/classes/org/omg/CORBA/VM_TRUNCATABLE.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/VM_TRUNCATABLE.java rename to src/java.corba/share/classes/org/omg/CORBA/VM_TRUNCATABLE.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ValueBaseHelper.java b/src/java.corba/share/classes/org/omg/CORBA/ValueBaseHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ValueBaseHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/ValueBaseHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ValueBaseHolder.java b/src/java.corba/share/classes/org/omg/CORBA/ValueBaseHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ValueBaseHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/ValueBaseHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ValueMember.java b/src/java.corba/share/classes/org/omg/CORBA/ValueMember.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ValueMember.java rename to src/java.corba/share/classes/org/omg/CORBA/ValueMember.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ValueMemberHelper.java b/src/java.corba/share/classes/org/omg/CORBA/ValueMemberHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ValueMemberHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/ValueMemberHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/VersionSpecHelper.java b/src/java.corba/share/classes/org/omg/CORBA/VersionSpecHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/VersionSpecHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/VersionSpecHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/VisibilityHelper.java b/src/java.corba/share/classes/org/omg/CORBA/VisibilityHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/VisibilityHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/VisibilityHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/WCharSeqHelper.java b/src/java.corba/share/classes/org/omg/CORBA/WCharSeqHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/WCharSeqHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/WCharSeqHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/WCharSeqHolder.java b/src/java.corba/share/classes/org/omg/CORBA/WCharSeqHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/WCharSeqHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/WCharSeqHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/WStringValueHelper.java b/src/java.corba/share/classes/org/omg/CORBA/WStringValueHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/WStringValueHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/WStringValueHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/WrongTransaction.java b/src/java.corba/share/classes/org/omg/CORBA/WrongTransaction.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/WrongTransaction.java rename to src/java.corba/share/classes/org/omg/CORBA/WrongTransaction.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/WrongTransactionHelper.java b/src/java.corba/share/classes/org/omg/CORBA/WrongTransactionHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/WrongTransactionHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/WrongTransactionHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/WrongTransactionHolder.java b/src/java.corba/share/classes/org/omg/CORBA/WrongTransactionHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/WrongTransactionHolder.java rename to src/java.corba/share/classes/org/omg/CORBA/WrongTransactionHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/_IDLTypeStub.java b/src/java.corba/share/classes/org/omg/CORBA/_IDLTypeStub.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/_IDLTypeStub.java rename to src/java.corba/share/classes/org/omg/CORBA/_IDLTypeStub.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/_PolicyStub.java b/src/java.corba/share/classes/org/omg/CORBA/_PolicyStub.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/_PolicyStub.java rename to src/java.corba/share/classes/org/omg/CORBA/_PolicyStub.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html b/src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html rename to src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html b/src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html rename to src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ir.idl b/src/java.corba/share/classes/org/omg/CORBA/ir.idl similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/ir.idl rename to src/java.corba/share/classes/org/omg/CORBA/ir.idl diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/orb.idl b/src/java.corba/share/classes/org/omg/CORBA/orb.idl similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/orb.idl rename to src/java.corba/share/classes/org/omg/CORBA/orb.idl diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/package.html b/src/java.corba/share/classes/org/omg/CORBA/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/package.html rename to src/java.corba/share/classes/org/omg/CORBA/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ApplicationException.java b/src/java.corba/share/classes/org/omg/CORBA/portable/ApplicationException.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/ApplicationException.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/ApplicationException.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/BoxedValueHelper.java b/src/java.corba/share/classes/org/omg/CORBA/portable/BoxedValueHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/BoxedValueHelper.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/BoxedValueHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/CustomValue.java b/src/java.corba/share/classes/org/omg/CORBA/portable/CustomValue.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/CustomValue.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/CustomValue.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/Delegate.java b/src/java.corba/share/classes/org/omg/CORBA/portable/Delegate.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/Delegate.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/Delegate.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/IDLEntity.java b/src/java.corba/share/classes/org/omg/CORBA/portable/IDLEntity.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/IDLEntity.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/IDLEntity.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/IndirectionException.java b/src/java.corba/share/classes/org/omg/CORBA/portable/IndirectionException.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/IndirectionException.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/IndirectionException.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/InputStream.java b/src/java.corba/share/classes/org/omg/CORBA/portable/InputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/InputStream.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/InputStream.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java b/src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ObjectImpl.java b/src/java.corba/share/classes/org/omg/CORBA/portable/ObjectImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/ObjectImpl.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/ObjectImpl.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/OutputStream.java b/src/java.corba/share/classes/org/omg/CORBA/portable/OutputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/OutputStream.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/OutputStream.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/RemarshalException.java b/src/java.corba/share/classes/org/omg/CORBA/portable/RemarshalException.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/RemarshalException.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/RemarshalException.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ResponseHandler.java b/src/java.corba/share/classes/org/omg/CORBA/portable/ResponseHandler.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/ResponseHandler.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/ResponseHandler.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ServantObject.java b/src/java.corba/share/classes/org/omg/CORBA/portable/ServantObject.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/ServantObject.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/ServantObject.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/Streamable.java b/src/java.corba/share/classes/org/omg/CORBA/portable/Streamable.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/Streamable.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/Streamable.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/StreamableValue.java b/src/java.corba/share/classes/org/omg/CORBA/portable/StreamableValue.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/StreamableValue.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/StreamableValue.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/UnknownException.java b/src/java.corba/share/classes/org/omg/CORBA/portable/UnknownException.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/UnknownException.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/UnknownException.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueBase.java b/src/java.corba/share/classes/org/omg/CORBA/portable/ValueBase.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueBase.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/ValueBase.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueFactory.java b/src/java.corba/share/classes/org/omg/CORBA/portable/ValueFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueFactory.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/ValueFactory.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueInputStream.java b/src/java.corba/share/classes/org/omg/CORBA/portable/ValueInputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueInputStream.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/ValueInputStream.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueOutputStream.java b/src/java.corba/share/classes/org/omg/CORBA/portable/ValueOutputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/ValueOutputStream.java rename to src/java.corba/share/classes/org/omg/CORBA/portable/ValueOutputStream.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/package.html b/src/java.corba/share/classes/org/omg/CORBA/portable/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA/portable/package.html rename to src/java.corba/share/classes/org/omg/CORBA/portable/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/ORB.java b/src/java.corba/share/classes/org/omg/CORBA_2_3/ORB.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA_2_3/ORB.java rename to src/java.corba/share/classes/org/omg/CORBA_2_3/ORB.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/package.html b/src/java.corba/share/classes/org/omg/CORBA_2_3/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA_2_3/package.html rename to src/java.corba/share/classes/org/omg/CORBA_2_3/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/Delegate.java b/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/Delegate.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/Delegate.java rename to src/java.corba/share/classes/org/omg/CORBA_2_3/portable/Delegate.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java b/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java rename to src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/ObjectImpl.java b/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/ObjectImpl.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/ObjectImpl.java rename to src/java.corba/share/classes/org/omg/CORBA_2_3/portable/ObjectImpl.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java b/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java rename to src/java.corba/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html b/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html rename to src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html b/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html rename to src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html b/src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html rename to src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/CosNaming/_BindingIteratorImplBase.java b/src/java.corba/share/classes/org/omg/CosNaming/_BindingIteratorImplBase.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CosNaming/_BindingIteratorImplBase.java rename to src/java.corba/share/classes/org/omg/CosNaming/_BindingIteratorImplBase.java diff --git a/corba/src/java.corba/share/classes/org/omg/CosNaming/_NamingContextImplBase.java b/src/java.corba/share/classes/org/omg/CosNaming/_NamingContextImplBase.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CosNaming/_NamingContextImplBase.java rename to src/java.corba/share/classes/org/omg/CosNaming/_NamingContextImplBase.java diff --git a/corba/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl b/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl rename to src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl diff --git a/corba/src/java.corba/share/classes/org/omg/CosNaming/package.html b/src/java.corba/share/classes/org/omg/CosNaming/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/CosNaming/package.html rename to src/java.corba/share/classes/org/omg/CosNaming/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/Dynamic/package.html b/src/java.corba/share/classes/org/omg/Dynamic/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/Dynamic/package.html rename to src/java.corba/share/classes/org/omg/Dynamic/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html b/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html rename to src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html b/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html rename to src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynamicAny.idl b/src/java.corba/share/classes/org/omg/DynamicAny/DynamicAny.idl similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/DynamicAny/DynamicAny.idl rename to src/java.corba/share/classes/org/omg/DynamicAny/DynamicAny.idl diff --git a/corba/src/java.corba/share/classes/org/omg/DynamicAny/package.html b/src/java.corba/share/classes/org/omg/DynamicAny/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/DynamicAny/package.html rename to src/java.corba/share/classes/org/omg/DynamicAny/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html b/src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html rename to src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html b/src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html rename to src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/IOP/package.html b/src/java.corba/share/classes/org/omg/IOP/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/IOP/package.html rename to src/java.corba/share/classes/org/omg/IOP/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/Messaging/package.html b/src/java.corba/share/classes/org/omg/Messaging/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/Messaging/package.html rename to src/java.corba/share/classes/org/omg/Messaging/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/CORBAX.idl b/src/java.corba/share/classes/org/omg/PortableInterceptor/CORBAX.idl similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableInterceptor/CORBAX.idl rename to src/java.corba/share/classes/org/omg/PortableInterceptor/CORBAX.idl diff --git a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl b/src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl rename to src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl diff --git a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl b/src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl rename to src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl diff --git a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Messaging.idl b/src/java.corba/share/classes/org/omg/PortableInterceptor/Messaging.idl similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Messaging.idl rename to src/java.corba/share/classes/org/omg/PortableInterceptor/Messaging.idl diff --git a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html b/src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html rename to src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/package.html b/src/java.corba/share/classes/org/omg/PortableInterceptor/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableInterceptor/package.html rename to src/java.corba/share/classes/org/omg/PortableInterceptor/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentHelper.java b/src/java.corba/share/classes/org/omg/PortableServer/CurrentHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentHelper.java rename to src/java.corba/share/classes/org/omg/PortableServer/CurrentHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html b/src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html rename to src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/DynamicImplementation.java b/src/java.corba/share/classes/org/omg/PortableServer/DynamicImplementation.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/DynamicImplementation.java rename to src/java.corba/share/classes/org/omg/PortableServer/DynamicImplementation.java diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/POAHelper.java b/src/java.corba/share/classes/org/omg/PortableServer/POAHelper.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/POAHelper.java rename to src/java.corba/share/classes/org/omg/PortableServer/POAHelper.java diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html b/src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html rename to src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html b/src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html rename to src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/Servant.java b/src/java.corba/share/classes/org/omg/PortableServer/Servant.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/Servant.java rename to src/java.corba/share/classes/org/omg/PortableServer/Servant.java diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java b/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java rename to src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html b/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html rename to src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/corba.idl b/src/java.corba/share/classes/org/omg/PortableServer/corba.idl similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/corba.idl rename to src/java.corba/share/classes/org/omg/PortableServer/corba.idl diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/package.html b/src/java.corba/share/classes/org/omg/PortableServer/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/package.html rename to src/java.corba/share/classes/org/omg/PortableServer/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/poa.idl b/src/java.corba/share/classes/org/omg/PortableServer/poa.idl similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/poa.idl rename to src/java.corba/share/classes/org/omg/PortableServer/poa.idl diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/portable/Delegate.java b/src/java.corba/share/classes/org/omg/PortableServer/portable/Delegate.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/portable/Delegate.java rename to src/java.corba/share/classes/org/omg/PortableServer/portable/Delegate.java diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/portable/package.html b/src/java.corba/share/classes/org/omg/PortableServer/portable/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/PortableServer/portable/package.html rename to src/java.corba/share/classes/org/omg/PortableServer/portable/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/SendingContext/RunTime.java b/src/java.corba/share/classes/org/omg/SendingContext/RunTime.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/SendingContext/RunTime.java rename to src/java.corba/share/classes/org/omg/SendingContext/RunTime.java diff --git a/corba/src/java.corba/share/classes/org/omg/SendingContext/RunTimeOperations.java b/src/java.corba/share/classes/org/omg/SendingContext/RunTimeOperations.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/SendingContext/RunTimeOperations.java rename to src/java.corba/share/classes/org/omg/SendingContext/RunTimeOperations.java diff --git a/corba/src/java.corba/share/classes/org/omg/SendingContext/package.html b/src/java.corba/share/classes/org/omg/SendingContext/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/SendingContext/package.html rename to src/java.corba/share/classes/org/omg/SendingContext/package.html diff --git a/corba/src/java.corba/share/classes/org/omg/stub/java/rmi/_Remote_Stub.java b/src/java.corba/share/classes/org/omg/stub/java/rmi/_Remote_Stub.java similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/stub/java/rmi/_Remote_Stub.java rename to src/java.corba/share/classes/org/omg/stub/java/rmi/_Remote_Stub.java diff --git a/corba/src/java.corba/share/classes/org/omg/stub/java/rmi/package.html b/src/java.corba/share/classes/org/omg/stub/java/rmi/package.html similarity index 100% rename from corba/src/java.corba/share/classes/org/omg/stub/java/rmi/package.html rename to src/java.corba/share/classes/org/omg/stub/java/rmi/package.html diff --git a/corba/src/java.corba/share/classes/sun/corba/Bridge.java b/src/java.corba/share/classes/sun/corba/Bridge.java similarity index 100% rename from corba/src/java.corba/share/classes/sun/corba/Bridge.java rename to src/java.corba/share/classes/sun/corba/Bridge.java diff --git a/corba/src/java.corba/share/classes/sun/corba/BridgePermission.java b/src/java.corba/share/classes/sun/corba/BridgePermission.java similarity index 100% rename from corba/src/java.corba/share/classes/sun/corba/BridgePermission.java rename to src/java.corba/share/classes/sun/corba/BridgePermission.java diff --git a/corba/src/java.corba/share/classes/sun/corba/EncapsInputStreamFactory.java b/src/java.corba/share/classes/sun/corba/EncapsInputStreamFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/sun/corba/EncapsInputStreamFactory.java rename to src/java.corba/share/classes/sun/corba/EncapsInputStreamFactory.java diff --git a/corba/src/java.corba/share/classes/sun/corba/JavaCorbaAccess.java b/src/java.corba/share/classes/sun/corba/JavaCorbaAccess.java similarity index 100% rename from corba/src/java.corba/share/classes/sun/corba/JavaCorbaAccess.java rename to src/java.corba/share/classes/sun/corba/JavaCorbaAccess.java diff --git a/corba/src/java.corba/share/classes/sun/corba/OutputStreamFactory.java b/src/java.corba/share/classes/sun/corba/OutputStreamFactory.java similarity index 100% rename from corba/src/java.corba/share/classes/sun/corba/OutputStreamFactory.java rename to src/java.corba/share/classes/sun/corba/OutputStreamFactory.java diff --git a/corba/src/java.corba/share/classes/sun/corba/SharedSecrets.java b/src/java.corba/share/classes/sun/corba/SharedSecrets.java similarity index 100% rename from corba/src/java.corba/share/classes/sun/corba/SharedSecrets.java rename to src/java.corba/share/classes/sun/corba/SharedSecrets.java diff --git a/corba/src/java.corba/share/classes/sun/corba/package.html b/src/java.corba/share/classes/sun/corba/package.html similarity index 100% rename from corba/src/java.corba/share/classes/sun/corba/package.html rename to src/java.corba/share/classes/sun/corba/package.html diff --git a/jdk/src/java.datatransfer/macosx/classes/sun/datatransfer/resources/flavormap.properties b/src/java.datatransfer/macosx/classes/sun/datatransfer/resources/flavormap.properties similarity index 100% rename from jdk/src/java.datatransfer/macosx/classes/sun/datatransfer/resources/flavormap.properties rename to src/java.datatransfer/macosx/classes/sun/datatransfer/resources/flavormap.properties diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/Clipboard.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/Clipboard.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/Clipboard.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/Clipboard.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/ClipboardOwner.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/ClipboardOwner.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/ClipboardOwner.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/ClipboardOwner.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorEvent.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorEvent.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorEvent.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorEvent.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorListener.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorListener.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorListener.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorListener.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorMap.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorMap.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorMap.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorMap.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorTable.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorTable.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorTable.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorTable.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeType.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeType.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeType.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/MimeType.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParameterList.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParameterList.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParameterList.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParameterList.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParseException.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParseException.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParseException.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParseException.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/StringSelection.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/StringSelection.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/StringSelection.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/StringSelection.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/SystemFlavorMap.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/SystemFlavorMap.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/SystemFlavorMap.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/SystemFlavorMap.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/Transferable.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/Transferable.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/Transferable.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/Transferable.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java diff --git a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/package-info.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/package-info.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/package-info.java rename to src/java.datatransfer/share/classes/java/awt/datatransfer/package-info.java diff --git a/jdk/src/java.datatransfer/share/classes/module-info.java b/src/java.datatransfer/share/classes/module-info.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/module-info.java rename to src/java.datatransfer/share/classes/module-info.java diff --git a/jdk/src/java.datatransfer/share/classes/sun/datatransfer/DataFlavorUtil.java b/src/java.datatransfer/share/classes/sun/datatransfer/DataFlavorUtil.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/sun/datatransfer/DataFlavorUtil.java rename to src/java.datatransfer/share/classes/sun/datatransfer/DataFlavorUtil.java diff --git a/jdk/src/java.datatransfer/share/classes/sun/datatransfer/DesktopDatatransferService.java b/src/java.datatransfer/share/classes/sun/datatransfer/DesktopDatatransferService.java similarity index 100% rename from jdk/src/java.datatransfer/share/classes/sun/datatransfer/DesktopDatatransferService.java rename to src/java.datatransfer/share/classes/sun/datatransfer/DesktopDatatransferService.java diff --git a/jdk/src/java.datatransfer/unix/classes/sun/datatransfer/resources/flavormap.properties b/src/java.datatransfer/unix/classes/sun/datatransfer/resources/flavormap.properties similarity index 100% rename from jdk/src/java.datatransfer/unix/classes/sun/datatransfer/resources/flavormap.properties rename to src/java.datatransfer/unix/classes/sun/datatransfer/resources/flavormap.properties diff --git a/jdk/src/java.datatransfer/windows/classes/sun/datatransfer/resources/flavormap.properties b/src/java.datatransfer/windows/classes/sun/datatransfer/resources/flavormap.properties similarity index 100% rename from jdk/src/java.datatransfer/windows/classes/sun/datatransfer/resources/flavormap.properties rename to src/java.datatransfer/windows/classes/sun/datatransfer/resources/flavormap.properties diff --git a/jdk/src/java.desktop/aix/native/libawt/porting_aix.c b/src/java.desktop/aix/native/libawt/porting_aix.c similarity index 100% rename from jdk/src/java.desktop/aix/native/libawt/porting_aix.c rename to src/java.desktop/aix/native/libawt/porting_aix.c diff --git a/jdk/src/java.desktop/aix/native/libawt/porting_aix.h b/src/java.desktop/aix/native/libawt/porting_aix.h similarity index 100% rename from jdk/src/java.desktop/aix/native/libawt/porting_aix.h rename to src/java.desktop/aix/native/libawt/porting_aix.h diff --git a/jdk/src/java.desktop/linux/conf/oblique-fonts/fonts.dir b/src/java.desktop/linux/conf/oblique-fonts/fonts.dir similarity index 100% rename from jdk/src/java.desktop/linux/conf/oblique-fonts/fonts.dir rename to src/java.desktop/linux/conf/oblique-fonts/fonts.dir diff --git a/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIConstants.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIConstants.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIConstants.java rename to src/java.desktop/macosx/classes/apple/laf/JRSUIConstants.java diff --git a/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java rename to src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java diff --git a/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIFocus.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIFocus.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIFocus.java rename to src/java.desktop/macosx/classes/apple/laf/JRSUIFocus.java diff --git a/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java rename to src/java.desktop/macosx/classes/apple/laf/JRSUIState.java diff --git a/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIStateFactory.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIStateFactory.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIStateFactory.java rename to src/java.desktop/macosx/classes/apple/laf/JRSUIStateFactory.java diff --git a/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java rename to src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/Application.java b/src/java.desktop/macosx/classes/com/apple/eawt/Application.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/Application.java rename to src/java.desktop/macosx/classes/com/apple/eawt/Application.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java b/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java rename to src/java.desktop/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenAdapter.java b/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenAdapter.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenAdapter.java rename to src/java.desktop/macosx/classes/com/apple/eawt/FullScreenAdapter.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenHandler.java b/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenHandler.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenHandler.java rename to src/java.desktop/macosx/classes/com/apple/eawt/FullScreenHandler.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenListener.java b/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenListener.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenListener.java rename to src/java.desktop/macosx/classes/com/apple/eawt/FullScreenListener.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenUtilities.java b/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenUtilities.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenUtilities.java rename to src/java.desktop/macosx/classes/com/apple/eawt/FullScreenUtilities.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/MacQuitResponse.java b/src/java.desktop/macosx/classes/com/apple/eawt/MacQuitResponse.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/MacQuitResponse.java rename to src/java.desktop/macosx/classes/com/apple/eawt/MacQuitResponse.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppDockIconHandler.java b/src/java.desktop/macosx/classes/com/apple/eawt/_AppDockIconHandler.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppDockIconHandler.java rename to src/java.desktop/macosx/classes/com/apple/eawt/_AppDockIconHandler.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java b/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java rename to src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java b/src/java.desktop/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java rename to src/java.desktop/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppMiscHandlers.java b/src/java.desktop/macosx/classes/com/apple/eawt/_AppMiscHandlers.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppMiscHandlers.java rename to src/java.desktop/macosx/classes/com/apple/eawt/_AppMiscHandlers.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/_OpenAppHandler.java b/src/java.desktop/macosx/classes/com/apple/eawt/_OpenAppHandler.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/_OpenAppHandler.java rename to src/java.desktop/macosx/classes/com/apple/eawt/_OpenAppHandler.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/FullScreenEvent.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/FullScreenEvent.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/FullScreenEvent.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/FullScreenEvent.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureAdapter.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureAdapter.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureAdapter.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/GestureAdapter.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureEvent.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureEvent.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureEvent.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/GestureEvent.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureHandler.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureHandler.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureHandler.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/GestureHandler.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureListener.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureListener.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureListener.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/GestureListener.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseListener.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseListener.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseListener.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseListener.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureUtilities.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureUtilities.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureUtilities.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/GestureUtilities.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationEvent.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationEvent.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationEvent.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationEvent.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationListener.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationListener.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationListener.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationListener.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationEvent.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationEvent.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationEvent.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/RotationEvent.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationListener.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationListener.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationListener.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/RotationListener.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeEvent.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeEvent.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeEvent.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeEvent.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeListener.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeListener.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeListener.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeListener.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/package-info.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/package-info.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/package-info.java rename to src/java.desktop/macosx/classes/com/apple/eawt/event/package-info.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/package-info.java b/src/java.desktop/macosx/classes/com/apple/eawt/package-info.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eawt/package-info.java rename to src/java.desktop/macosx/classes/com/apple/eawt/package-info.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java b/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java rename to src/java.desktop/macosx/classes/com/apple/eio/FileManager.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/eio/package-info.java b/src/java.desktop/macosx/classes/com/apple/eio/package-info.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/eio/package-info.java rename to src/java.desktop/macosx/classes/com/apple/eio/package-info.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaBorder.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaBorder.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaBorder.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonRadioUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonRadioUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonRadioUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaButtonRadioUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonToggleUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonToggleUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonToggleUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaButtonToggleUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxPopup.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxPopup.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxPopup.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxPopup.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaEditorPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaEditorPaneUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaEditorPaneUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaEditorPaneUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFocus.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFocus.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFocus.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaFocus.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFocusHandler.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFocusHandler.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFocusHandler.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaFocusHandler.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFonts.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFonts.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFonts.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaFonts.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaGroupBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaGroupBorder.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaGroupBorder.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaGroupBorder.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaHighlighter.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaHighlighter.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaHighlighter.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaHighlighter.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorderMetrics.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorderMetrics.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorderMetrics.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorderMetrics.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameManager.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameManager.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameManager.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameManager.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaListUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaListUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaListUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaListUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarBorder.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarBorder.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarBorder.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBorder.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBorder.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBorder.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMnemonicHandler.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMnemonicHandler.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMnemonicHandler.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaMnemonicHandler.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaOptionPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaOptionPaneUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaOptionPaneUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaOptionPaneUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPainter.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaPainter.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPainter.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaPainter.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPanelUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaPanelUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPanelUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaPanelUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollPaneUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollPaneUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaScrollPaneUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSliderUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaSliderUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSliderUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaSliderUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTableUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTableUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTableUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextAreaUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextAreaUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextAreaUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTextAreaUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldBorder.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldBorder.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldBorder.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldSearch.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldSearch.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldSearch.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldSearch.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPaneUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPaneUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTextPaneUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolTipUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaToolTipUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaToolTipUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaToolTipUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTreeUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTreeUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTreeUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaTreeUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java rename to src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ClientPropertyApplicator.java b/src/java.desktop/macosx/classes/com/apple/laf/ClientPropertyApplicator.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/ClientPropertyApplicator.java rename to src/java.desktop/macosx/classes/com/apple/laf/ClientPropertyApplicator.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java rename to src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBar.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBar.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBar.java rename to src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBar.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBarProvider.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBarProvider.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBarProvider.java rename to src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBarProvider.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItem.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItem.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItem.java rename to src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItem.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java rename to src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemUI.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemUI.java rename to src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemUI.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyHandler.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyHandler.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyHandler.java rename to src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyHandler.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java rename to src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenPopupFactory.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenPopupFactory.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenPopupFactory.java rename to src/java.desktop/macosx/classes/com/apple/laf/ScreenPopupFactory.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua.properties similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua.properties rename to src/java.desktop/macosx/classes/com/apple/laf/resources/aqua.properties diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties rename to src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_es.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_es.properties similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_es.properties rename to src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_es.properties diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_fr.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_fr.properties similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_fr.properties rename to src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_fr.properties diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_it.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_it.properties similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_it.properties rename to src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_it.properties diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ja.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ja.properties similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ja.properties rename to src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ja.properties diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ko.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ko.properties similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ko.properties rename to src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ko.properties diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties rename to src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_sv.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_sv.properties similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_sv.properties rename to src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_sv.properties diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties rename to src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties similarity index 100% rename from jdk/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties rename to src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties diff --git a/jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java rename to src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsDevice.java b/src/java.desktop/macosx/classes/sun/awt/CGraphicsDevice.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsDevice.java rename to src/java.desktop/macosx/classes/sun/awt/CGraphicsDevice.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java b/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java rename to src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/awt/FullScreenCapable.java b/src/java.desktop/macosx/classes/sun/awt/FullScreenCapable.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/awt/FullScreenCapable.java rename to src/java.desktop/macosx/classes/sun/awt/FullScreenCapable.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties b/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties rename to src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties diff --git a/jdk/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java b/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java rename to src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java b/src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java rename to src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/font/CFont.java b/src/java.desktop/macosx/classes/sun/font/CFont.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/font/CFont.java rename to src/java.desktop/macosx/classes/sun/font/CFont.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/font/CFontConfiguration.java b/src/java.desktop/macosx/classes/sun/font/CFontConfiguration.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/font/CFontConfiguration.java rename to src/java.desktop/macosx/classes/sun/font/CFontConfiguration.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java b/src/java.desktop/macosx/classes/sun/font/CFontManager.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java rename to src/java.desktop/macosx/classes/sun/font/CFontManager.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/font/CStrike.java b/src/java.desktop/macosx/classes/sun/font/CStrike.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/font/CStrike.java rename to src/java.desktop/macosx/classes/sun/font/CStrike.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/font/CStrikeDisposer.java b/src/java.desktop/macosx/classes/sun/font/CStrikeDisposer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/font/CStrikeDisposer.java rename to src/java.desktop/macosx/classes/sun/font/CStrikeDisposer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/font/NativeFont.java b/src/java.desktop/macosx/classes/sun/font/NativeFont.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/font/NativeFont.java rename to src/java.desktop/macosx/classes/sun/font/NativeFont.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/font/NativeStrike.java b/src/java.desktop/macosx/classes/sun/font/NativeStrike.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/font/NativeStrike.java rename to src/java.desktop/macosx/classes/sun/font/NativeStrike.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/BackBufferCapsProvider.java b/src/java.desktop/macosx/classes/sun/java2d/BackBufferCapsProvider.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/java2d/BackBufferCapsProvider.java rename to src/java.desktop/macosx/classes/sun/java2d/BackBufferCapsProvider.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java b/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java rename to src/java.desktop/macosx/classes/sun/java2d/CRenderer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java b/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java rename to src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java b/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java rename to src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java b/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java rename to src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java b/src/java.desktop/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java rename to src/java.desktop/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java b/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java rename to src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java b/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java rename to src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java rename to src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java rename to src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java rename to src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java rename to src/java.desktop/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWButtonPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWButtonPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWButtonPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWButtonPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCanvasPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWCanvasPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCanvasPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWCanvasPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCheckboxPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWCheckboxPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCheckboxPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWCheckboxPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWChoicePeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWChoicePeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWChoicePeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWChoicePeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWContainerPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWContainerPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWContainerPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWContainerPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCursorManager.java b/src/java.desktop/macosx/classes/sun/lwawt/LWCursorManager.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWCursorManager.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWCursorManager.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/lwawt/LWGraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWGraphicsConfig.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWGraphicsConfig.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWLabelPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWLabelPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWLabelPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWLabelPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWLightweightFramePeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWLightweightFramePeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWLightweightFramePeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWLightweightFramePeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWListPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWListPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWListPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWListPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWMouseInfoPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWMouseInfoPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWMouseInfoPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWMouseInfoPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWPanelPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWPanelPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWPanelPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWPanelPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWRepaintArea.java b/src/java.desktop/macosx/classes/sun/lwawt/LWRepaintArea.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWRepaintArea.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWRepaintArea.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWScrollBarPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWScrollBarPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWScrollBarPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWScrollBarPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWScrollPanePeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWScrollPanePeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWScrollPanePeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWScrollPanePeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWTextAreaPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWTextAreaPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWTextAreaPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWTextAreaPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWTextComponentPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWTextComponentPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWTextComponentPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWTextComponentPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWTextFieldPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWTextFieldPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWTextFieldPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWTextFieldPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java b/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformComponent.java b/src/java.desktop/macosx/classes/sun/lwawt/PlatformComponent.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformComponent.java rename to src/java.desktop/macosx/classes/sun/lwawt/PlatformComponent.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformDropTarget.java b/src/java.desktop/macosx/classes/sun/lwawt/PlatformDropTarget.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformDropTarget.java rename to src/java.desktop/macosx/classes/sun/lwawt/PlatformDropTarget.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformEventNotifier.java b/src/java.desktop/macosx/classes/sun/lwawt/PlatformEventNotifier.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformEventNotifier.java rename to src/java.desktop/macosx/classes/sun/lwawt/PlatformEventNotifier.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformWindow.java b/src/java.desktop/macosx/classes/sun/lwawt/PlatformWindow.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/PlatformWindow.java rename to src/java.desktop/macosx/classes/sun/lwawt/PlatformWindow.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/SecurityWarningWindow.java b/src/java.desktop/macosx/classes/sun/lwawt/SecurityWarningWindow.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/SecurityWarningWindow.java rename to src/java.desktop/macosx/classes/sun/lwawt/SecurityWarningWindow.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibleText.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibleText.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibleText.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibleText.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCursorManager.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCursorManager.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCursorManager.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CCursorManager.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCustomCursor.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCustomCursor.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCustomCursor.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CCustomCursor.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTarget.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTarget.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTarget.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTarget.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFRetainedResource.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFRetainedResource.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFRetainedResource.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CFRetainedResource.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenu.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenu.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenu.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenu.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuBar.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuBar.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuBar.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuBar.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuComponent.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuComponent.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuComponent.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuComponent.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuItem.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuItem.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuItem.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuItem.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformView.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformView.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformView.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformView.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPopupMenu.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPopupMenu.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPopupMenu.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPopupMenu.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDevice.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDevice.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDevice.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDevice.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphics.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphics.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphics.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphics.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CSystemTray.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CSystemTray.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CSystemTray.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CSystemTray.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWarningWindow.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWarningWindow.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWarningWindow.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CWarningWindow.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWrapper.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWrapper.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CWrapper.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CWrapper.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CocoaConstants.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CocoaConstants.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CocoaConstants.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/CocoaConstants.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/NSEvent.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/NSEvent.java similarity index 100% rename from jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/NSEvent.java rename to src/java.desktop/macosx/classes/sun/lwawt/macosx/NSEvent.java diff --git a/jdk/src/java.desktop/macosx/native/include/jawt_md.h b/src/java.desktop/macosx/native/include/jawt_md.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/include/jawt_md.h rename to src/java.desktop/macosx/native/include/jawt_md.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CCursorManager.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CCursorManager.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CCursorManager.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CCursorManager.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSourceContextPeer.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSourceContextPeer.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSourceContextPeer.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSourceContextPeer.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTextPipe.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CTextPipe.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTextPipe.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CTextPipe.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CWrapper.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CWrapper.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CWrapper.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/CWrapper.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzRenderer.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzRenderer.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzRenderer.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzRenderer.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.h rename to src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/awt_DrawingSurface.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/awt_DrawingSurface.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/awt_DrawingSurface.m rename to src/java.desktop/macosx/native/libawt_lwawt/awt/awt_DrawingSurface.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.h b/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.h rename to src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m b/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m rename to src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.h b/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.h rename to src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m b/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m rename to src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CCharToGlyphMapper.m b/src/java.desktop/macosx/native/libawt_lwawt/font/CCharToGlyphMapper.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CCharToGlyphMapper.m rename to src/java.desktop/macosx/native/libawt_lwawt/font/CCharToGlyphMapper.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.h b/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.h rename to src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m b/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m rename to src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphOutlines.h b/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphOutlines.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphOutlines.h rename to src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphOutlines.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphOutlines.m b/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphOutlines.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphOutlines.m rename to src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphOutlines.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h b/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h rename to src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m b/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m rename to src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.h b/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.h rename to src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.m rename to src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.h b/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.h rename to src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.m rename to src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.h b/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.h rename to src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m rename to src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/J2D_GL/cglext.h b/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/J2D_GL/cglext.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/J2D_GL/cglext.h rename to src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/J2D_GL/cglext.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/OGLFuncs_md.h b/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/OGLFuncs_md.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/OGLFuncs_md.h rename to src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/OGLFuncs_md.h diff --git a/jdk/src/java.desktop/macosx/native/libjawt/jawt.m b/src/java.desktop/macosx/native/libjawt/jawt.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libjawt/jawt.m rename to src/java.desktop/macosx/native/libjawt/jawt.m diff --git a/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiIn.c b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiIn.c similarity index 100% rename from jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiIn.c rename to src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiIn.c diff --git a/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiOut.c b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiOut.c similarity index 100% rename from jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiOut.c rename to src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiOut.c diff --git a/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.c b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.c similarity index 100% rename from jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.c rename to src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.c diff --git a/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.h b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.h rename to src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.h diff --git a/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_PCM.cpp b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_PCM.cpp similarity index 100% rename from jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_PCM.cpp rename to src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_PCM.cpp diff --git a/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp similarity index 100% rename from jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp rename to src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp diff --git a/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.cpp b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.cpp similarity index 100% rename from jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.cpp rename to src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.cpp diff --git a/jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.h b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.h rename to src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.h diff --git a/jdk/src/java.desktop/macosx/native/libosx/CFileManager.m b/src/java.desktop/macosx/native/libosx/CFileManager.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosx/CFileManager.m rename to src/java.desktop/macosx/native/libosx/CFileManager.m diff --git a/jdk/src/java.desktop/macosx/native/libosxapp/AWT_debug.h b/src/java.desktop/macosx/native/libosxapp/AWT_debug.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxapp/AWT_debug.h rename to src/java.desktop/macosx/native/libosxapp/AWT_debug.h diff --git a/jdk/src/java.desktop/macosx/native/libosxapp/AWT_debug.m b/src/java.desktop/macosx/native/libosxapp/AWT_debug.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxapp/AWT_debug.m rename to src/java.desktop/macosx/native/libosxapp/AWT_debug.m diff --git a/jdk/src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.h b/src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.h rename to src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.h diff --git a/jdk/src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.m b/src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.m rename to src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.m diff --git a/jdk/src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.h b/src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.h rename to src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.h diff --git a/jdk/src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.m b/src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.m rename to src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.m diff --git a/jdk/src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.h b/src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.h rename to src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.h diff --git a/jdk/src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.m b/src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.m rename to src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.m diff --git a/jdk/src/java.desktop/macosx/native/libosxapp/ThreadUtilities.h b/src/java.desktop/macosx/native/libosxapp/ThreadUtilities.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxapp/ThreadUtilities.h rename to src/java.desktop/macosx/native/libosxapp/ThreadUtilities.h diff --git a/jdk/src/java.desktop/macosx/native/libosxapp/ThreadUtilities.m b/src/java.desktop/macosx/native/libosxapp/ThreadUtilities.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxapp/ThreadUtilities.m rename to src/java.desktop/macosx/native/libosxapp/ThreadUtilities.m diff --git a/jdk/src/java.desktop/macosx/native/libosxui/AquaFileView.m b/src/java.desktop/macosx/native/libosxui/AquaFileView.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxui/AquaFileView.m rename to src/java.desktop/macosx/native/libosxui/AquaFileView.m diff --git a/jdk/src/java.desktop/macosx/native/libosxui/AquaLookAndFeel.m b/src/java.desktop/macosx/native/libosxui/AquaLookAndFeel.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxui/AquaLookAndFeel.m rename to src/java.desktop/macosx/native/libosxui/AquaLookAndFeel.m diff --git a/jdk/src/java.desktop/macosx/native/libosxui/AquaNativeResources.m b/src/java.desktop/macosx/native/libosxui/AquaNativeResources.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxui/AquaNativeResources.m rename to src/java.desktop/macosx/native/libosxui/AquaNativeResources.m diff --git a/jdk/src/java.desktop/macosx/native/libosxui/JRSUIConstantSync.h b/src/java.desktop/macosx/native/libosxui/JRSUIConstantSync.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxui/JRSUIConstantSync.h rename to src/java.desktop/macosx/native/libosxui/JRSUIConstantSync.h diff --git a/jdk/src/java.desktop/macosx/native/libosxui/JRSUIConstantSync.m b/src/java.desktop/macosx/native/libosxui/JRSUIConstantSync.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxui/JRSUIConstantSync.m rename to src/java.desktop/macosx/native/libosxui/JRSUIConstantSync.m diff --git a/jdk/src/java.desktop/macosx/native/libosxui/JRSUIController.m b/src/java.desktop/macosx/native/libosxui/JRSUIController.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxui/JRSUIController.m rename to src/java.desktop/macosx/native/libosxui/JRSUIController.m diff --git a/jdk/src/java.desktop/macosx/native/libosxui/JRSUIFocus.m b/src/java.desktop/macosx/native/libosxui/JRSUIFocus.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxui/JRSUIFocus.m rename to src/java.desktop/macosx/native/libosxui/JRSUIFocus.m diff --git a/jdk/src/java.desktop/macosx/native/libosxui/ScreenMenu.h b/src/java.desktop/macosx/native/libosxui/ScreenMenu.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxui/ScreenMenu.h rename to src/java.desktop/macosx/native/libosxui/ScreenMenu.h diff --git a/jdk/src/java.desktop/macosx/native/libosxui/ScreenMenu.m b/src/java.desktop/macosx/native/libosxui/ScreenMenu.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libosxui/ScreenMenu.m rename to src/java.desktop/macosx/native/libosxui/ScreenMenu.m diff --git a/jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_config.h b/src/java.desktop/macosx/native/libsplashscreen/splashscreen_config.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_config.h rename to src/java.desktop/macosx/native/libsplashscreen/splashscreen_config.h diff --git a/jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m b/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m rename to src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m diff --git a/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility.properties rename to src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties rename to src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_en.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_en.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_en.properties rename to src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_en.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties rename to src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties rename to src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties rename to src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties rename to src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties rename to src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties rename to src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties rename to src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties rename to src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties rename to src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/awt/AWTUtilities.java b/src/java.desktop/share/classes/com/sun/awt/AWTUtilities.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/awt/AWTUtilities.java rename to src/java.desktop/share/classes/com/sun/awt/AWTUtilities.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/awt/SecurityWarning.java b/src/java.desktop/share/classes/com/sun/awt/SecurityWarning.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/awt/SecurityWarning.java rename to src/java.desktop/share/classes/com/sun/awt/SecurityWarning.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java b/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java rename to src/java.desktop/share/classes/com/sun/beans/TypeResolver.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/WeakCache.java b/src/java.desktop/share/classes/com/sun/beans/WeakCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/WeakCache.java rename to src/java.desktop/share/classes/com/sun/beans/WeakCache.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/WildcardTypeImpl.java b/src/java.desktop/share/classes/com/sun/beans/WildcardTypeImpl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/WildcardTypeImpl.java rename to src/java.desktop/share/classes/com/sun/beans/WildcardTypeImpl.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/AccessorElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/AccessorElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/AccessorElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/AccessorElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ArrayElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/ArrayElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ArrayElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/ArrayElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/BooleanElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/BooleanElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/BooleanElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/BooleanElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ByteElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/ByteElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ByteElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/ByteElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/CharElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/CharElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/CharElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/CharElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ClassElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/ClassElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ClassElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/ClassElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/DoubleElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/DoubleElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/DoubleElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/DoubleElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/ElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/ElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/FalseElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/FalseElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/FalseElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/FalseElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/FieldElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/FieldElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/FieldElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/FieldElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/FloatElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/FloatElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/FloatElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/FloatElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/IntElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/IntElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/IntElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/IntElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/JavaElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/JavaElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/JavaElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/JavaElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/LongElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/LongElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/LongElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/LongElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/MethodElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/MethodElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/MethodElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/MethodElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/NewElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/NewElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/NewElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/NewElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/NullElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/NullElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/NullElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/NullElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ObjectElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/ObjectElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ObjectElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/ObjectElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/PropertyElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/PropertyElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/PropertyElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/PropertyElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ShortElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/ShortElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ShortElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/ShortElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/StringElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/StringElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/StringElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/StringElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/TrueElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/TrueElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/TrueElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/TrueElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ValueObject.java b/src/java.desktop/share/classes/com/sun/beans/decoder/ValueObject.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ValueObject.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/ValueObject.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ValueObjectImpl.java b/src/java.desktop/share/classes/com/sun/beans/decoder/ValueObjectImpl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/ValueObjectImpl.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/ValueObjectImpl.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/VarElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/VarElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/VarElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/VarElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/VoidElementHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/VoidElementHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/decoder/VoidElementHandler.java rename to src/java.desktop/share/classes/com/sun/beans/decoder/VoidElementHandler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/BooleanEditor.java b/src/java.desktop/share/classes/com/sun/beans/editors/BooleanEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/editors/BooleanEditor.java rename to src/java.desktop/share/classes/com/sun/beans/editors/BooleanEditor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/ByteEditor.java b/src/java.desktop/share/classes/com/sun/beans/editors/ByteEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/editors/ByteEditor.java rename to src/java.desktop/share/classes/com/sun/beans/editors/ByteEditor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java b/src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java rename to src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/DoubleEditor.java b/src/java.desktop/share/classes/com/sun/beans/editors/DoubleEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/editors/DoubleEditor.java rename to src/java.desktop/share/classes/com/sun/beans/editors/DoubleEditor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/EnumEditor.java b/src/java.desktop/share/classes/com/sun/beans/editors/EnumEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/editors/EnumEditor.java rename to src/java.desktop/share/classes/com/sun/beans/editors/EnumEditor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/FloatEditor.java b/src/java.desktop/share/classes/com/sun/beans/editors/FloatEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/editors/FloatEditor.java rename to src/java.desktop/share/classes/com/sun/beans/editors/FloatEditor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java b/src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java rename to src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/IntegerEditor.java b/src/java.desktop/share/classes/com/sun/beans/editors/IntegerEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/editors/IntegerEditor.java rename to src/java.desktop/share/classes/com/sun/beans/editors/IntegerEditor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/LongEditor.java b/src/java.desktop/share/classes/com/sun/beans/editors/LongEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/editors/LongEditor.java rename to src/java.desktop/share/classes/com/sun/beans/editors/LongEditor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/NumberEditor.java b/src/java.desktop/share/classes/com/sun/beans/editors/NumberEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/editors/NumberEditor.java rename to src/java.desktop/share/classes/com/sun/beans/editors/NumberEditor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/ShortEditor.java b/src/java.desktop/share/classes/com/sun/beans/editors/ShortEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/editors/ShortEditor.java rename to src/java.desktop/share/classes/com/sun/beans/editors/ShortEditor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/StringEditor.java b/src/java.desktop/share/classes/com/sun/beans/editors/StringEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/editors/StringEditor.java rename to src/java.desktop/share/classes/com/sun/beans/editors/StringEditor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/AbstractFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/AbstractFinder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/AbstractFinder.java rename to src/java.desktop/share/classes/com/sun/beans/finder/AbstractFinder.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/BeanInfoFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/BeanInfoFinder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/BeanInfoFinder.java rename to src/java.desktop/share/classes/com/sun/beans/finder/BeanInfoFinder.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java rename to src/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java rename to src/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java rename to src/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/FinderUtils.java b/src/java.desktop/share/classes/com/sun/beans/finder/FinderUtils.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/FinderUtils.java rename to src/java.desktop/share/classes/com/sun/beans/finder/FinderUtils.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/InstanceFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/InstanceFinder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/InstanceFinder.java rename to src/java.desktop/share/classes/com/sun/beans/finder/InstanceFinder.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java rename to src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java rename to src/java.desktop/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java b/src/java.desktop/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java rename to src/java.desktop/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/PrimitiveWrapperMap.java b/src/java.desktop/share/classes/com/sun/beans/finder/PrimitiveWrapperMap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/PrimitiveWrapperMap.java rename to src/java.desktop/share/classes/com/sun/beans/finder/PrimitiveWrapperMap.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/PropertyEditorFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/PropertyEditorFinder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/PropertyEditorFinder.java rename to src/java.desktop/share/classes/com/sun/beans/finder/PropertyEditorFinder.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/Signature.java b/src/java.desktop/share/classes/com/sun/beans/finder/Signature.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/Signature.java rename to src/java.desktop/share/classes/com/sun/beans/finder/Signature.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/finder/SignatureException.java b/src/java.desktop/share/classes/com/sun/beans/finder/SignatureException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/finder/SignatureException.java rename to src/java.desktop/share/classes/com/sun/beans/finder/SignatureException.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/infos/ComponentBeanInfo.java b/src/java.desktop/share/classes/com/sun/beans/infos/ComponentBeanInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/infos/ComponentBeanInfo.java rename to src/java.desktop/share/classes/com/sun/beans/infos/ComponentBeanInfo.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java b/src/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java rename to src/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/introspect/EventSetInfo.java b/src/java.desktop/share/classes/com/sun/beans/introspect/EventSetInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/introspect/EventSetInfo.java rename to src/java.desktop/share/classes/com/sun/beans/introspect/EventSetInfo.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/introspect/MethodInfo.java b/src/java.desktop/share/classes/com/sun/beans/introspect/MethodInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/introspect/MethodInfo.java rename to src/java.desktop/share/classes/com/sun/beans/introspect/MethodInfo.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java b/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java rename to src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/util/Cache.java b/src/java.desktop/share/classes/com/sun/beans/util/Cache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/beans/util/Cache.java rename to src/java.desktop/share/classes/com/sun/beans/util/Cache.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPCompressionTypes.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPCompressionTypes.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPCompressionTypes.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPCompressionTypes.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BitFile.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BitFile.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BitFile.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/BitFile.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18N.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18N.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18N.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18N.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18NImpl.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18NImpl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18NImpl.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/I18NImpl.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ImageUtil.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ImageUtil.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ImageUtil.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/ImageUtil.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SingleTileRenderedImage.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SingleTileRenderedImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SingleTileRenderedImage.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/SingleTileRenderedImage.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties rename to src/java.desktop/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormatResources.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormatResources.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormatResources.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormat.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/RowFilter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/RowFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/png/RowFilter.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/png/RowFilter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFAttrInfo.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFAttrInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFAttrInfo.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFAttrInfo.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFBaseJPEGCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFBaseJPEGCompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFBaseJPEGCompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFBaseJPEGCompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCIELabColorConverter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCIELabColorConverter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCIELabColorConverter.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCIELabColorConverter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFColorConverter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFColorConverter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFColorConverter.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFColorConverter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflateCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflateCompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflateCompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflateCompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflateDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflateDecompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflateDecompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflateDecompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflater.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflater.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflater.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflater.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFElementInfo.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFElementInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFElementInfo.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFElementInfo.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFExifJPEGCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFExifJPEGCompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFExifJPEGCompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFExifJPEGCompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxCompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxCompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxCompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFieldNode.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFieldNode.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFieldNode.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFieldNode.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormat.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormatResources.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormatResources.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormatResources.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReaderSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReaderSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReaderSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReaderSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriterSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriterSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriterSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGDecompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGDecompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGDecompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBCompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBCompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBCompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBDecompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBDecompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBDecompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWCompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWCompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWCompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWUtil.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWUtil.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWUtil.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWUtil.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFMetadataFormat.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullCompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullCompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullCompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsCompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsCompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsCompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsDecompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsDecompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsDecompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsUtil.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsUtil.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsUtil.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsUtil.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRLECompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRLECompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRLECompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRLECompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRenderedImage.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRenderedImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRenderedImage.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRenderedImage.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadata.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadata.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadata.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormat.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormatResources.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormatResources.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormatResources.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT4Compressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT4Compressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT4Compressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT4Compressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT6Compressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT6Compressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT6Compressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT6Compressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrColorConverter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrColorConverter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrColorConverter.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrColorConverter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrDecompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrDecompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrDecompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFZLibCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFZLibCompressor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFZLibCompressor.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFZLibCompressor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java rename to src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java b/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java b/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java b/src/java.desktop/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java b/src/java.desktop/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java b/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java b/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java rename to src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java b/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java rename to src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java b/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java rename to src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/stream/StreamFinalizer.java b/src/java.desktop/share/classes/com/sun/imageio/stream/StreamFinalizer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/imageio/stream/StreamFinalizer.java rename to src/java.desktop/share/classes/com/sun/imageio/stream/StreamFinalizer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java b/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java rename to src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorType.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorType.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorType.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorType.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKConstants.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKConstants.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKConstants.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKConstants.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKRegion.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKRegion.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKRegion.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKRegion.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/XColors.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/XColors.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/XColors.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/XColors.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/Directory.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/Directory.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/Directory.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/Directory.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/image-failed.png b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/image-failed.png similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/image-failed.png rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/icons/image-failed.png diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Error.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Error.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Error.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Error.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Inform.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Inform.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Inform.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Inform.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Question.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Question.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Question.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Question.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Warn.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Warn.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Warn.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/Warn.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Directory.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Directory.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Directory.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Directory.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/NewFolder.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/NewFolder.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/NewFolder.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/NewFolder.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/UpFolder.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/UpFolder.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/UpFolder.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/UpFolder.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Warn.gif b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Warn.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Warn.gif rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Warn.gif diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-delayed.png b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-delayed.png similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-delayed.png rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-delayed.png diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-failed.png b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-failed.png similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-failed.png rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-failed.png diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties rename to src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractDataLine.java b/src/java.desktop/share/classes/com/sun/media/sound/AbstractDataLine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractDataLine.java rename to src/java.desktop/share/classes/com/sun/media/sound/AbstractDataLine.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractLine.java b/src/java.desktop/share/classes/com/sun/media/sound/AbstractLine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractLine.java rename to src/java.desktop/share/classes/com/sun/media/sound/AbstractLine.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDevice.java b/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDevice.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDevice.java rename to src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDevice.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java b/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java rename to src/java.desktop/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractMixer.java b/src/java.desktop/share/classes/com/sun/media/sound/AbstractMixer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AbstractMixer.java rename to src/java.desktop/share/classes/com/sun/media/sound/AbstractMixer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileFormat.java b/src/java.desktop/share/classes/com/sun/media/sound/AiffFileFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileFormat.java rename to src/java.desktop/share/classes/com/sun/media/sound/AiffFileFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java b/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java rename to src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java b/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java rename to src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileFormat.java b/src/java.desktop/share/classes/com/sun/media/sound/AuFileFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileFormat.java rename to src/java.desktop/share/classes/com/sun/media/sound/AuFileFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java b/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java rename to src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java b/src/java.desktop/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatConverter.java b/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatConverter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatConverter.java rename to src/java.desktop/share/classes/com/sun/media/sound/AudioFloatConverter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java b/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java rename to src/java.desktop/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatInputStream.java b/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatInputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatInputStream.java rename to src/java.desktop/share/classes/com/sun/media/sound/AudioFloatInputStream.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizer.java b/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizer.java rename to src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java b/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java rename to src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AutoClosingClip.java b/src/java.desktop/share/classes/com/sun/media/sound/AutoClosingClip.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AutoClosingClip.java rename to src/java.desktop/share/classes/com/sun/media/sound/AutoClosingClip.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AutoConnectSequencer.java b/src/java.desktop/share/classes/com/sun/media/sound/AutoConnectSequencer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/AutoConnectSequencer.java rename to src/java.desktop/share/classes/com/sun/media/sound/AutoConnectSequencer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSInfo.java b/src/java.desktop/share/classes/com/sun/media/sound/DLSInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSInfo.java rename to src/java.desktop/share/classes/com/sun/media/sound/DLSInfo.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSInstrument.java b/src/java.desktop/share/classes/com/sun/media/sound/DLSInstrument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSInstrument.java rename to src/java.desktop/share/classes/com/sun/media/sound/DLSInstrument.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSModulator.java b/src/java.desktop/share/classes/com/sun/media/sound/DLSModulator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSModulator.java rename to src/java.desktop/share/classes/com/sun/media/sound/DLSModulator.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSRegion.java b/src/java.desktop/share/classes/com/sun/media/sound/DLSRegion.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSRegion.java rename to src/java.desktop/share/classes/com/sun/media/sound/DLSRegion.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSample.java b/src/java.desktop/share/classes/com/sun/media/sound/DLSSample.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSample.java rename to src/java.desktop/share/classes/com/sun/media/sound/DLSSample.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleLoop.java b/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleLoop.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleLoop.java rename to src/java.desktop/share/classes/com/sun/media/sound/DLSSampleLoop.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleOptions.java b/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleOptions.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSampleOptions.java rename to src/java.desktop/share/classes/com/sun/media/sound/DLSSampleOptions.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java b/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java rename to src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbankReader.java b/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbankReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbankReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbankReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java b/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java rename to src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java b/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java rename to src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java b/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java rename to src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java b/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java rename to src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/EventDispatcher.java b/src/java.desktop/share/classes/com/sun/media/sound/EventDispatcher.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/EventDispatcher.java rename to src/java.desktop/share/classes/com/sun/media/sound/EventDispatcher.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/FFT.java b/src/java.desktop/share/classes/com/sun/media/sound/FFT.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/FFT.java rename to src/java.desktop/share/classes/com/sun/media/sound/FFT.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/FastShortMessage.java b/src/java.desktop/share/classes/com/sun/media/sound/FastShortMessage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/FastShortMessage.java rename to src/java.desktop/share/classes/com/sun/media/sound/FastShortMessage.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/FastSysexMessage.java b/src/java.desktop/share/classes/com/sun/media/sound/FastSysexMessage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/FastSysexMessage.java rename to src/java.desktop/share/classes/com/sun/media/sound/FastSysexMessage.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/InvalidDataException.java b/src/java.desktop/share/classes/com/sun/media/sound/InvalidDataException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/InvalidDataException.java rename to src/java.desktop/share/classes/com/sun/media/sound/InvalidDataException.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/InvalidFormatException.java b/src/java.desktop/share/classes/com/sun/media/sound/InvalidFormatException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/InvalidFormatException.java rename to src/java.desktop/share/classes/com/sun/media/sound/InvalidFormatException.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/JARSoundbankReader.java b/src/java.desktop/share/classes/com/sun/media/sound/JARSoundbankReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/JARSoundbankReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/JARSoundbankReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java b/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java rename to src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java b/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java rename to src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java b/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java rename to src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java b/src/java.desktop/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java rename to src/java.desktop/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java b/src/java.desktop/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java rename to src/java.desktop/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiInDevice.java b/src/java.desktop/share/classes/com/sun/media/sound/MidiInDevice.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiInDevice.java rename to src/java.desktop/share/classes/com/sun/media/sound/MidiInDevice.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiInDeviceProvider.java b/src/java.desktop/share/classes/com/sun/media/sound/MidiInDeviceProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiInDeviceProvider.java rename to src/java.desktop/share/classes/com/sun/media/sound/MidiInDeviceProvider.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDevice.java b/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDevice.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDevice.java rename to src/java.desktop/share/classes/com/sun/media/sound/MidiOutDevice.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java b/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java rename to src/java.desktop/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiUtils.java b/src/java.desktop/share/classes/com/sun/media/sound/MidiUtils.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/MidiUtils.java rename to src/java.desktop/share/classes/com/sun/media/sound/MidiUtils.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelAbstractOscillator.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelAbstractOscillator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelAbstractOscillator.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelAbstractOscillator.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBuffer.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBuffer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBuffer.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelByteBuffer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelChannelMixer.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelChannelMixer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelChannelMixer.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelChannelMixer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelConnectionBlock.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelConnectionBlock.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelConnectionBlock.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelConnectionBlock.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelDestination.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelDestination.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelDestination.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelDestination.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelDirectedPlayer.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelDirectedPlayer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelDirectedPlayer.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelDirectedPlayer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelDirector.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelDirector.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelDirector.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelDirector.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelIdentifier.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelIdentifier.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelIdentifier.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelIdentifier.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelInstrument.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelInstrument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelInstrument.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelInstrument.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelInstrumentComparator.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelInstrumentComparator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelInstrumentComparator.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelInstrumentComparator.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelMappedInstrument.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelMappedInstrument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelMappedInstrument.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelMappedInstrument.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelOscillator.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelOscillator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelOscillator.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelOscillator.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelOscillatorStream.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelOscillatorStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelOscillatorStream.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelOscillatorStream.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelPatch.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelPatch.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelPatch.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelPatch.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelPerformer.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelPerformer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelPerformer.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelPerformer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelSource.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelSource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelSource.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelSource.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardDirector.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardDirector.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardDirector.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelStandardDirector.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardTransform.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardTransform.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelStandardTransform.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelStandardTransform.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelTransform.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelTransform.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelTransform.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelTransform.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelWavetable.java b/src/java.desktop/share/classes/com/sun/media/sound/ModelWavetable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ModelWavetable.java rename to src/java.desktop/share/classes/com/sun/media/sound/ModelWavetable.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/PCMtoPCMCodec.java b/src/java.desktop/share/classes/com/sun/media/sound/PCMtoPCMCodec.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/PCMtoPCMCodec.java rename to src/java.desktop/share/classes/com/sun/media/sound/PCMtoPCMCodec.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/Platform.java b/src/java.desktop/share/classes/com/sun/media/sound/Platform.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/Platform.java rename to src/java.desktop/share/classes/com/sun/media/sound/Platform.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/PortMixer.java b/src/java.desktop/share/classes/com/sun/media/sound/PortMixer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/PortMixer.java rename to src/java.desktop/share/classes/com/sun/media/sound/PortMixer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/PortMixerProvider.java b/src/java.desktop/share/classes/com/sun/media/sound/PortMixerProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/PortMixerProvider.java rename to src/java.desktop/share/classes/com/sun/media/sound/PortMixerProvider.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/Printer.java b/src/java.desktop/share/classes/com/sun/media/sound/Printer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/Printer.java rename to src/java.desktop/share/classes/com/sun/media/sound/Printer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidDataException.java b/src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidDataException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidDataException.java rename to src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidDataException.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java b/src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java rename to src/java.desktop/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java b/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFWriter.java b/src/java.desktop/share/classes/com/sun/media/sound/RIFFWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFWriter.java rename to src/java.desktop/share/classes/com/sun/media/sound/RIFFWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java b/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java rename to src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java b/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java rename to src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/ReferenceCountingDevice.java b/src/java.desktop/share/classes/com/sun/media/sound/ReferenceCountingDevice.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/ReferenceCountingDevice.java rename to src/java.desktop/share/classes/com/sun/media/sound/ReferenceCountingDevice.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2GlobalRegion.java b/src/java.desktop/share/classes/com/sun/media/sound/SF2GlobalRegion.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2GlobalRegion.java rename to src/java.desktop/share/classes/com/sun/media/sound/SF2GlobalRegion.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Instrument.java b/src/java.desktop/share/classes/com/sun/media/sound/SF2Instrument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Instrument.java rename to src/java.desktop/share/classes/com/sun/media/sound/SF2Instrument.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2InstrumentRegion.java b/src/java.desktop/share/classes/com/sun/media/sound/SF2InstrumentRegion.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2InstrumentRegion.java rename to src/java.desktop/share/classes/com/sun/media/sound/SF2InstrumentRegion.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Layer.java b/src/java.desktop/share/classes/com/sun/media/sound/SF2Layer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Layer.java rename to src/java.desktop/share/classes/com/sun/media/sound/SF2Layer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2LayerRegion.java b/src/java.desktop/share/classes/com/sun/media/sound/SF2LayerRegion.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2LayerRegion.java rename to src/java.desktop/share/classes/com/sun/media/sound/SF2LayerRegion.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Modulator.java b/src/java.desktop/share/classes/com/sun/media/sound/SF2Modulator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Modulator.java rename to src/java.desktop/share/classes/com/sun/media/sound/SF2Modulator.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java b/src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java rename to src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Sample.java b/src/java.desktop/share/classes/com/sun/media/sound/SF2Sample.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Sample.java rename to src/java.desktop/share/classes/com/sun/media/sound/SF2Sample.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Soundbank.java b/src/java.desktop/share/classes/com/sun/media/sound/SF2Soundbank.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Soundbank.java rename to src/java.desktop/share/classes/com/sun/media/sound/SF2Soundbank.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2SoundbankReader.java b/src/java.desktop/share/classes/com/sun/media/sound/SF2SoundbankReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2SoundbankReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/SF2SoundbankReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SimpleInstrument.java b/src/java.desktop/share/classes/com/sun/media/sound/SimpleInstrument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SimpleInstrument.java rename to src/java.desktop/share/classes/com/sun/media/sound/SimpleInstrument.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SimpleSoundbank.java b/src/java.desktop/share/classes/com/sun/media/sound/SimpleSoundbank.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SimpleSoundbank.java rename to src/java.desktop/share/classes/com/sun/media/sound/SimpleSoundbank.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAbstractResampler.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftAbstractResampler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAbstractResampler.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftAbstractResampler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioBuffer.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioBuffer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioBuffer.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftAudioBuffer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioProcessor.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioProcessor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioProcessor.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftAudioProcessor.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioPusher.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioPusher.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftAudioPusher.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftAudioPusher.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftChannel.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftChannel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftChannel.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftChannel.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftChannelProxy.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftChannelProxy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftChannelProxy.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftChannelProxy.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftChorus.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftChorus.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftChorus.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftChorus.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftControl.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftControl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftControl.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftControl.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftCubicResampler.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftCubicResampler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftCubicResampler.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftCubicResampler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftFilter.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftFilter.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftFilter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftInstrument.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftInstrument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftInstrument.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftInstrument.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftJitterCorrector.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftJitterCorrector.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftJitterCorrector.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftJitterCorrector.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLanczosResampler.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftLanczosResampler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLanczosResampler.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftLanczosResampler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLimiter.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftLimiter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLimiter.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftLimiter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLinearResampler.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftLinearResampler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLinearResampler.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftLinearResampler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLinearResampler2.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftLinearResampler2.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLinearResampler2.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftLinearResampler2.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMainMixer.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftMainMixer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMainMixer.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftMainMixer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingClip.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingClip.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingClip.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftMixingClip.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingDataLine.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingDataLine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingDataLine.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftMixingDataLine.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMainMixer.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMainMixer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMainMixer.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMainMixer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMixer.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMixer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMixer.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMixer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftPerformer.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftPerformer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftPerformer.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftPerformer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftPointResampler.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftPointResampler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftPointResampler.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftPointResampler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftProcess.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftProcess.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftProcess.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftProcess.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftProvider.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftProvider.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftProvider.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftReceiver.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftReceiver.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftReceiver.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftReceiver.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftResampler.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftResampler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftResampler.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftResampler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftResamplerStreamer.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftResamplerStreamer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftResamplerStreamer.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftResamplerStreamer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftShortMessage.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftShortMessage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftShortMessage.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftShortMessage.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSincResampler.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftSincResampler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSincResampler.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftSincResampler.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftTuning.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftTuning.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftTuning.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftTuning.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftVoice.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftVoice.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftVoice.java rename to src/java.desktop/share/classes/com/sun/media/sound/SoftVoice.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardFileFormat.java b/src/java.desktop/share/classes/com/sun/media/sound/StandardFileFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardFileFormat.java rename to src/java.desktop/share/classes/com/sun/media/sound/StandardFileFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java b/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java rename to src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java b/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java rename to src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/Toolkit.java b/src/java.desktop/share/classes/com/sun/media/sound/Toolkit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/Toolkit.java rename to src/java.desktop/share/classes/com/sun/media/sound/Toolkit.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java b/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java rename to src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileFormat.java b/src/java.desktop/share/classes/com/sun/media/sound/WaveFileFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileFormat.java rename to src/java.desktop/share/classes/com/sun/media/sound/WaveFileFormat.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileWriter.java b/src/java.desktop/share/classes/com/sun/media/sound/WaveFileWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileWriter.java rename to src/java.desktop/share/classes/com/sun/media/sound/WaveFileWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java rename to src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileWriter.java b/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileWriter.java rename to src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileWriter.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties diff --git a/jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties rename to src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties diff --git a/jdk/src/java.desktop/share/classes/java/applet/Applet.java b/src/java.desktop/share/classes/java/applet/Applet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/applet/Applet.java rename to src/java.desktop/share/classes/java/applet/Applet.java diff --git a/jdk/src/java.desktop/share/classes/java/applet/AppletContext.java b/src/java.desktop/share/classes/java/applet/AppletContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/applet/AppletContext.java rename to src/java.desktop/share/classes/java/applet/AppletContext.java diff --git a/jdk/src/java.desktop/share/classes/java/applet/AppletStub.java b/src/java.desktop/share/classes/java/applet/AppletStub.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/applet/AppletStub.java rename to src/java.desktop/share/classes/java/applet/AppletStub.java diff --git a/jdk/src/java.desktop/share/classes/java/applet/AudioClip.java b/src/java.desktop/share/classes/java/applet/AudioClip.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/applet/AudioClip.java rename to src/java.desktop/share/classes/java/applet/AudioClip.java diff --git a/jdk/src/java.desktop/share/classes/java/applet/package-info.java b/src/java.desktop/share/classes/java/applet/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/applet/package-info.java rename to src/java.desktop/share/classes/java/applet/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/AWTError.java b/src/java.desktop/share/classes/java/awt/AWTError.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/AWTError.java rename to src/java.desktop/share/classes/java/awt/AWTError.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/AWTEvent.java b/src/java.desktop/share/classes/java/awt/AWTEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/AWTEvent.java rename to src/java.desktop/share/classes/java/awt/AWTEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/AWTEventMulticaster.java b/src/java.desktop/share/classes/java/awt/AWTEventMulticaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/AWTEventMulticaster.java rename to src/java.desktop/share/classes/java/awt/AWTEventMulticaster.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/AWTException.java b/src/java.desktop/share/classes/java/awt/AWTException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/AWTException.java rename to src/java.desktop/share/classes/java/awt/AWTException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/AWTKeyStroke.java b/src/java.desktop/share/classes/java/awt/AWTKeyStroke.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/AWTKeyStroke.java rename to src/java.desktop/share/classes/java/awt/AWTKeyStroke.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/AWTPermission.java b/src/java.desktop/share/classes/java/awt/AWTPermission.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/AWTPermission.java rename to src/java.desktop/share/classes/java/awt/AWTPermission.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/ActiveEvent.java b/src/java.desktop/share/classes/java/awt/ActiveEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/ActiveEvent.java rename to src/java.desktop/share/classes/java/awt/ActiveEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Adjustable.java b/src/java.desktop/share/classes/java/awt/Adjustable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Adjustable.java rename to src/java.desktop/share/classes/java/awt/Adjustable.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/AlphaComposite.java b/src/java.desktop/share/classes/java/awt/AlphaComposite.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/AlphaComposite.java rename to src/java.desktop/share/classes/java/awt/AlphaComposite.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/AttributeValue.java b/src/java.desktop/share/classes/java/awt/AttributeValue.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/AttributeValue.java rename to src/java.desktop/share/classes/java/awt/AttributeValue.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/BasicStroke.java b/src/java.desktop/share/classes/java/awt/BasicStroke.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/BasicStroke.java rename to src/java.desktop/share/classes/java/awt/BasicStroke.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/BorderLayout.java b/src/java.desktop/share/classes/java/awt/BorderLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/BorderLayout.java rename to src/java.desktop/share/classes/java/awt/BorderLayout.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/BufferCapabilities.java b/src/java.desktop/share/classes/java/awt/BufferCapabilities.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/BufferCapabilities.java rename to src/java.desktop/share/classes/java/awt/BufferCapabilities.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Button.java b/src/java.desktop/share/classes/java/awt/Button.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Button.java rename to src/java.desktop/share/classes/java/awt/Button.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Canvas.java b/src/java.desktop/share/classes/java/awt/Canvas.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Canvas.java rename to src/java.desktop/share/classes/java/awt/Canvas.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/CardLayout.java b/src/java.desktop/share/classes/java/awt/CardLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/CardLayout.java rename to src/java.desktop/share/classes/java/awt/CardLayout.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Checkbox.java b/src/java.desktop/share/classes/java/awt/Checkbox.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Checkbox.java rename to src/java.desktop/share/classes/java/awt/Checkbox.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/CheckboxGroup.java b/src/java.desktop/share/classes/java/awt/CheckboxGroup.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/CheckboxGroup.java rename to src/java.desktop/share/classes/java/awt/CheckboxGroup.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java b/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java rename to src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Choice.java b/src/java.desktop/share/classes/java/awt/Choice.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Choice.java rename to src/java.desktop/share/classes/java/awt/Choice.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Color.java b/src/java.desktop/share/classes/java/awt/Color.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Color.java rename to src/java.desktop/share/classes/java/awt/Color.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/ColorPaintContext.java b/src/java.desktop/share/classes/java/awt/ColorPaintContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/ColorPaintContext.java rename to src/java.desktop/share/classes/java/awt/ColorPaintContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Component.java b/src/java.desktop/share/classes/java/awt/Component.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Component.java rename to src/java.desktop/share/classes/java/awt/Component.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/ComponentOrientation.java b/src/java.desktop/share/classes/java/awt/ComponentOrientation.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/ComponentOrientation.java rename to src/java.desktop/share/classes/java/awt/ComponentOrientation.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Composite.java b/src/java.desktop/share/classes/java/awt/Composite.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Composite.java rename to src/java.desktop/share/classes/java/awt/Composite.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/CompositeContext.java b/src/java.desktop/share/classes/java/awt/CompositeContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/CompositeContext.java rename to src/java.desktop/share/classes/java/awt/CompositeContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Conditional.java b/src/java.desktop/share/classes/java/awt/Conditional.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Conditional.java rename to src/java.desktop/share/classes/java/awt/Conditional.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Container.java b/src/java.desktop/share/classes/java/awt/Container.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Container.java rename to src/java.desktop/share/classes/java/awt/Container.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java b/src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java rename to src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Cursor.java b/src/java.desktop/share/classes/java/awt/Cursor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Cursor.java rename to src/java.desktop/share/classes/java/awt/Cursor.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/DefaultFocusTraversalPolicy.java b/src/java.desktop/share/classes/java/awt/DefaultFocusTraversalPolicy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/DefaultFocusTraversalPolicy.java rename to src/java.desktop/share/classes/java/awt/DefaultFocusTraversalPolicy.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java b/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java rename to src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Desktop.java b/src/java.desktop/share/classes/java/awt/Desktop.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Desktop.java rename to src/java.desktop/share/classes/java/awt/Desktop.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Dialog.java b/src/java.desktop/share/classes/java/awt/Dialog.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Dialog.java rename to src/java.desktop/share/classes/java/awt/Dialog.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Dimension.java b/src/java.desktop/share/classes/java/awt/Dimension.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Dimension.java rename to src/java.desktop/share/classes/java/awt/Dimension.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/DisplayMode.java b/src/java.desktop/share/classes/java/awt/DisplayMode.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/DisplayMode.java rename to src/java.desktop/share/classes/java/awt/DisplayMode.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Event.java b/src/java.desktop/share/classes/java/awt/Event.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Event.java rename to src/java.desktop/share/classes/java/awt/Event.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/EventDispatchThread.java b/src/java.desktop/share/classes/java/awt/EventDispatchThread.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/EventDispatchThread.java rename to src/java.desktop/share/classes/java/awt/EventDispatchThread.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/EventFilter.java b/src/java.desktop/share/classes/java/awt/EventFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/EventFilter.java rename to src/java.desktop/share/classes/java/awt/EventFilter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java b/src/java.desktop/share/classes/java/awt/EventQueue.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/EventQueue.java rename to src/java.desktop/share/classes/java/awt/EventQueue.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/FileDialog.java b/src/java.desktop/share/classes/java/awt/FileDialog.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/FileDialog.java rename to src/java.desktop/share/classes/java/awt/FileDialog.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/FlowLayout.java b/src/java.desktop/share/classes/java/awt/FlowLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/FlowLayout.java rename to src/java.desktop/share/classes/java/awt/FlowLayout.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/FocusTraversalPolicy.java b/src/java.desktop/share/classes/java/awt/FocusTraversalPolicy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/FocusTraversalPolicy.java rename to src/java.desktop/share/classes/java/awt/FocusTraversalPolicy.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Font.java b/src/java.desktop/share/classes/java/awt/Font.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Font.java rename to src/java.desktop/share/classes/java/awt/Font.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/FontFormatException.java b/src/java.desktop/share/classes/java/awt/FontFormatException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/FontFormatException.java rename to src/java.desktop/share/classes/java/awt/FontFormatException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/FontMetrics.java b/src/java.desktop/share/classes/java/awt/FontMetrics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/FontMetrics.java rename to src/java.desktop/share/classes/java/awt/FontMetrics.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Frame.java b/src/java.desktop/share/classes/java/awt/Frame.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Frame.java rename to src/java.desktop/share/classes/java/awt/Frame.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/GradientPaint.java b/src/java.desktop/share/classes/java/awt/GradientPaint.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/GradientPaint.java rename to src/java.desktop/share/classes/java/awt/GradientPaint.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/GradientPaintContext.java b/src/java.desktop/share/classes/java/awt/GradientPaintContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/GradientPaintContext.java rename to src/java.desktop/share/classes/java/awt/GradientPaintContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Graphics.java b/src/java.desktop/share/classes/java/awt/Graphics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Graphics.java rename to src/java.desktop/share/classes/java/awt/Graphics.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Graphics2D.java b/src/java.desktop/share/classes/java/awt/Graphics2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Graphics2D.java rename to src/java.desktop/share/classes/java/awt/Graphics2D.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/GraphicsCallback.java b/src/java.desktop/share/classes/java/awt/GraphicsCallback.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/GraphicsCallback.java rename to src/java.desktop/share/classes/java/awt/GraphicsCallback.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/GraphicsConfigTemplate.java b/src/java.desktop/share/classes/java/awt/GraphicsConfigTemplate.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/GraphicsConfigTemplate.java rename to src/java.desktop/share/classes/java/awt/GraphicsConfigTemplate.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java b/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java rename to src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/GraphicsDevice.java b/src/java.desktop/share/classes/java/awt/GraphicsDevice.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/GraphicsDevice.java rename to src/java.desktop/share/classes/java/awt/GraphicsDevice.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java b/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java rename to src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/GridBagConstraints.java b/src/java.desktop/share/classes/java/awt/GridBagConstraints.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/GridBagConstraints.java rename to src/java.desktop/share/classes/java/awt/GridBagConstraints.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/GridBagLayout.java b/src/java.desktop/share/classes/java/awt/GridBagLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/GridBagLayout.java rename to src/java.desktop/share/classes/java/awt/GridBagLayout.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java b/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java rename to src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/GridLayout.java b/src/java.desktop/share/classes/java/awt/GridLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/GridLayout.java rename to src/java.desktop/share/classes/java/awt/GridLayout.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/HeadlessException.java b/src/java.desktop/share/classes/java/awt/HeadlessException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/HeadlessException.java rename to src/java.desktop/share/classes/java/awt/HeadlessException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/IllegalComponentStateException.java b/src/java.desktop/share/classes/java/awt/IllegalComponentStateException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/IllegalComponentStateException.java rename to src/java.desktop/share/classes/java/awt/IllegalComponentStateException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Image.java b/src/java.desktop/share/classes/java/awt/Image.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Image.java rename to src/java.desktop/share/classes/java/awt/Image.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/ImageCapabilities.java b/src/java.desktop/share/classes/java/awt/ImageCapabilities.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/ImageCapabilities.java rename to src/java.desktop/share/classes/java/awt/ImageCapabilities.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Insets.java b/src/java.desktop/share/classes/java/awt/Insets.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Insets.java rename to src/java.desktop/share/classes/java/awt/Insets.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/ItemSelectable.java b/src/java.desktop/share/classes/java/awt/ItemSelectable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/ItemSelectable.java rename to src/java.desktop/share/classes/java/awt/ItemSelectable.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/JobAttributes.java b/src/java.desktop/share/classes/java/awt/JobAttributes.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/JobAttributes.java rename to src/java.desktop/share/classes/java/awt/JobAttributes.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/KeyEventDispatcher.java b/src/java.desktop/share/classes/java/awt/KeyEventDispatcher.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/KeyEventDispatcher.java rename to src/java.desktop/share/classes/java/awt/KeyEventDispatcher.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/KeyEventPostProcessor.java b/src/java.desktop/share/classes/java/awt/KeyEventPostProcessor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/KeyEventPostProcessor.java rename to src/java.desktop/share/classes/java/awt/KeyEventPostProcessor.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java b/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java rename to src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Label.java b/src/java.desktop/share/classes/java/awt/Label.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Label.java rename to src/java.desktop/share/classes/java/awt/Label.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/LayoutManager.java b/src/java.desktop/share/classes/java/awt/LayoutManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/LayoutManager.java rename to src/java.desktop/share/classes/java/awt/LayoutManager.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/LayoutManager2.java b/src/java.desktop/share/classes/java/awt/LayoutManager2.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/LayoutManager2.java rename to src/java.desktop/share/classes/java/awt/LayoutManager2.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/LinearGradientPaint.java b/src/java.desktop/share/classes/java/awt/LinearGradientPaint.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/LinearGradientPaint.java rename to src/java.desktop/share/classes/java/awt/LinearGradientPaint.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/LinearGradientPaintContext.java b/src/java.desktop/share/classes/java/awt/LinearGradientPaintContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/LinearGradientPaintContext.java rename to src/java.desktop/share/classes/java/awt/LinearGradientPaintContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/List.java b/src/java.desktop/share/classes/java/awt/List.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/List.java rename to src/java.desktop/share/classes/java/awt/List.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/MediaTracker.java b/src/java.desktop/share/classes/java/awt/MediaTracker.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/MediaTracker.java rename to src/java.desktop/share/classes/java/awt/MediaTracker.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Menu.java b/src/java.desktop/share/classes/java/awt/Menu.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Menu.java rename to src/java.desktop/share/classes/java/awt/Menu.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java b/src/java.desktop/share/classes/java/awt/MenuBar.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/MenuBar.java rename to src/java.desktop/share/classes/java/awt/MenuBar.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java b/src/java.desktop/share/classes/java/awt/MenuComponent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java rename to src/java.desktop/share/classes/java/awt/MenuComponent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuContainer.java b/src/java.desktop/share/classes/java/awt/MenuContainer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/MenuContainer.java rename to src/java.desktop/share/classes/java/awt/MenuContainer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuItem.java b/src/java.desktop/share/classes/java/awt/MenuItem.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/MenuItem.java rename to src/java.desktop/share/classes/java/awt/MenuItem.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuShortcut.java b/src/java.desktop/share/classes/java/awt/MenuShortcut.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/MenuShortcut.java rename to src/java.desktop/share/classes/java/awt/MenuShortcut.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/ModalEventFilter.java b/src/java.desktop/share/classes/java/awt/ModalEventFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/ModalEventFilter.java rename to src/java.desktop/share/classes/java/awt/ModalEventFilter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/MouseInfo.java b/src/java.desktop/share/classes/java/awt/MouseInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/MouseInfo.java rename to src/java.desktop/share/classes/java/awt/MouseInfo.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/MultipleGradientPaint.java b/src/java.desktop/share/classes/java/awt/MultipleGradientPaint.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/MultipleGradientPaint.java rename to src/java.desktop/share/classes/java/awt/MultipleGradientPaint.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/MultipleGradientPaintContext.java b/src/java.desktop/share/classes/java/awt/MultipleGradientPaintContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/MultipleGradientPaintContext.java rename to src/java.desktop/share/classes/java/awt/MultipleGradientPaintContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/PageAttributes.java b/src/java.desktop/share/classes/java/awt/PageAttributes.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/PageAttributes.java rename to src/java.desktop/share/classes/java/awt/PageAttributes.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Paint.java b/src/java.desktop/share/classes/java/awt/Paint.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Paint.java rename to src/java.desktop/share/classes/java/awt/Paint.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/PaintContext.java b/src/java.desktop/share/classes/java/awt/PaintContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/PaintContext.java rename to src/java.desktop/share/classes/java/awt/PaintContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Panel.java b/src/java.desktop/share/classes/java/awt/Panel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Panel.java rename to src/java.desktop/share/classes/java/awt/Panel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Point.java b/src/java.desktop/share/classes/java/awt/Point.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Point.java rename to src/java.desktop/share/classes/java/awt/Point.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/PointerInfo.java b/src/java.desktop/share/classes/java/awt/PointerInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/PointerInfo.java rename to src/java.desktop/share/classes/java/awt/PointerInfo.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Polygon.java b/src/java.desktop/share/classes/java/awt/Polygon.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Polygon.java rename to src/java.desktop/share/classes/java/awt/Polygon.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java b/src/java.desktop/share/classes/java/awt/PopupMenu.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java rename to src/java.desktop/share/classes/java/awt/PopupMenu.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/PrintGraphics.java b/src/java.desktop/share/classes/java/awt/PrintGraphics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/PrintGraphics.java rename to src/java.desktop/share/classes/java/awt/PrintGraphics.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/PrintJob.java b/src/java.desktop/share/classes/java/awt/PrintJob.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/PrintJob.java rename to src/java.desktop/share/classes/java/awt/PrintJob.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/RadialGradientPaint.java b/src/java.desktop/share/classes/java/awt/RadialGradientPaint.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/RadialGradientPaint.java rename to src/java.desktop/share/classes/java/awt/RadialGradientPaint.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/RadialGradientPaintContext.java b/src/java.desktop/share/classes/java/awt/RadialGradientPaintContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/RadialGradientPaintContext.java rename to src/java.desktop/share/classes/java/awt/RadialGradientPaintContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Rectangle.java b/src/java.desktop/share/classes/java/awt/Rectangle.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Rectangle.java rename to src/java.desktop/share/classes/java/awt/Rectangle.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/RenderingHints.java b/src/java.desktop/share/classes/java/awt/RenderingHints.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/RenderingHints.java rename to src/java.desktop/share/classes/java/awt/RenderingHints.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Robot.java b/src/java.desktop/share/classes/java/awt/Robot.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Robot.java rename to src/java.desktop/share/classes/java/awt/Robot.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/ScrollPane.java b/src/java.desktop/share/classes/java/awt/ScrollPane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/ScrollPane.java rename to src/java.desktop/share/classes/java/awt/ScrollPane.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/ScrollPaneAdjustable.java b/src/java.desktop/share/classes/java/awt/ScrollPaneAdjustable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/ScrollPaneAdjustable.java rename to src/java.desktop/share/classes/java/awt/ScrollPaneAdjustable.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Scrollbar.java b/src/java.desktop/share/classes/java/awt/Scrollbar.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Scrollbar.java rename to src/java.desktop/share/classes/java/awt/Scrollbar.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/SecondaryLoop.java b/src/java.desktop/share/classes/java/awt/SecondaryLoop.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/SecondaryLoop.java rename to src/java.desktop/share/classes/java/awt/SecondaryLoop.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/SentEvent.java b/src/java.desktop/share/classes/java/awt/SentEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/SentEvent.java rename to src/java.desktop/share/classes/java/awt/SentEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/SequencedEvent.java b/src/java.desktop/share/classes/java/awt/SequencedEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/SequencedEvent.java rename to src/java.desktop/share/classes/java/awt/SequencedEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Shape.java b/src/java.desktop/share/classes/java/awt/Shape.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Shape.java rename to src/java.desktop/share/classes/java/awt/Shape.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/SplashScreen.java b/src/java.desktop/share/classes/java/awt/SplashScreen.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/SplashScreen.java rename to src/java.desktop/share/classes/java/awt/SplashScreen.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Stroke.java b/src/java.desktop/share/classes/java/awt/Stroke.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Stroke.java rename to src/java.desktop/share/classes/java/awt/Stroke.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/SystemColor.java b/src/java.desktop/share/classes/java/awt/SystemColor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/SystemColor.java rename to src/java.desktop/share/classes/java/awt/SystemColor.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/SystemTray.java b/src/java.desktop/share/classes/java/awt/SystemTray.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/SystemTray.java rename to src/java.desktop/share/classes/java/awt/SystemTray.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Taskbar.java b/src/java.desktop/share/classes/java/awt/Taskbar.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Taskbar.java rename to src/java.desktop/share/classes/java/awt/Taskbar.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/TextArea.java b/src/java.desktop/share/classes/java/awt/TextArea.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/TextArea.java rename to src/java.desktop/share/classes/java/awt/TextArea.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/TextComponent.java b/src/java.desktop/share/classes/java/awt/TextComponent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/TextComponent.java rename to src/java.desktop/share/classes/java/awt/TextComponent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/TextField.java b/src/java.desktop/share/classes/java/awt/TextField.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/TextField.java rename to src/java.desktop/share/classes/java/awt/TextField.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/TexturePaint.java b/src/java.desktop/share/classes/java/awt/TexturePaint.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/TexturePaint.java rename to src/java.desktop/share/classes/java/awt/TexturePaint.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/TexturePaintContext.java b/src/java.desktop/share/classes/java/awt/TexturePaintContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/TexturePaintContext.java rename to src/java.desktop/share/classes/java/awt/TexturePaintContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java b/src/java.desktop/share/classes/java/awt/Toolkit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Toolkit.java rename to src/java.desktop/share/classes/java/awt/Toolkit.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Transparency.java b/src/java.desktop/share/classes/java/awt/Transparency.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Transparency.java rename to src/java.desktop/share/classes/java/awt/Transparency.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/TrayIcon.java b/src/java.desktop/share/classes/java/awt/TrayIcon.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/TrayIcon.java rename to src/java.desktop/share/classes/java/awt/TrayIcon.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java b/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java rename to src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/Window.java b/src/java.desktop/share/classes/java/awt/Window.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/Window.java rename to src/java.desktop/share/classes/java/awt/Window.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/color/CMMException.java b/src/java.desktop/share/classes/java/awt/color/CMMException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/color/CMMException.java rename to src/java.desktop/share/classes/java/awt/color/CMMException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/color/ColorSpace.java b/src/java.desktop/share/classes/java/awt/color/ColorSpace.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/color/ColorSpace.java rename to src/java.desktop/share/classes/java/awt/color/ColorSpace.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java b/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java rename to src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java rename to src/java.desktop/share/classes/java/awt/color/ICC_Profile.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java b/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java rename to src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java b/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java rename to src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/color/ProfileDataException.java b/src/java.desktop/share/classes/java/awt/color/ProfileDataException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/color/ProfileDataException.java rename to src/java.desktop/share/classes/java/awt/color/ProfileDataException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/color/package-info.java b/src/java.desktop/share/classes/java/awt/color/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/color/package-info.java rename to src/java.desktop/share/classes/java/awt/color/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/AboutEvent.java b/src/java.desktop/share/classes/java/awt/desktop/AboutEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/AboutEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/AboutEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/AboutHandler.java b/src/java.desktop/share/classes/java/awt/desktop/AboutHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/AboutHandler.java rename to src/java.desktop/share/classes/java/awt/desktop/AboutHandler.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/AppEvent.java b/src/java.desktop/share/classes/java/awt/desktop/AppEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/AppEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/AppEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/AppForegroundEvent.java b/src/java.desktop/share/classes/java/awt/desktop/AppForegroundEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/AppForegroundEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/AppForegroundEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/AppForegroundListener.java b/src/java.desktop/share/classes/java/awt/desktop/AppForegroundListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/AppForegroundListener.java rename to src/java.desktop/share/classes/java/awt/desktop/AppForegroundListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/AppHiddenEvent.java b/src/java.desktop/share/classes/java/awt/desktop/AppHiddenEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/AppHiddenEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/AppHiddenEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/AppHiddenListener.java b/src/java.desktop/share/classes/java/awt/desktop/AppHiddenListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/AppHiddenListener.java rename to src/java.desktop/share/classes/java/awt/desktop/AppHiddenListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/AppReopenedEvent.java b/src/java.desktop/share/classes/java/awt/desktop/AppReopenedEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/AppReopenedEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/AppReopenedEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/AppReopenedListener.java b/src/java.desktop/share/classes/java/awt/desktop/AppReopenedListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/AppReopenedListener.java rename to src/java.desktop/share/classes/java/awt/desktop/AppReopenedListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java b/src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/OpenFilesEvent.java b/src/java.desktop/share/classes/java/awt/desktop/OpenFilesEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/OpenFilesEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/OpenFilesEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/OpenFilesHandler.java b/src/java.desktop/share/classes/java/awt/desktop/OpenFilesHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/OpenFilesHandler.java rename to src/java.desktop/share/classes/java/awt/desktop/OpenFilesHandler.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/OpenURIEvent.java b/src/java.desktop/share/classes/java/awt/desktop/OpenURIEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/OpenURIEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/OpenURIEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/OpenURIHandler.java b/src/java.desktop/share/classes/java/awt/desktop/OpenURIHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/OpenURIHandler.java rename to src/java.desktop/share/classes/java/awt/desktop/OpenURIHandler.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/PreferencesEvent.java b/src/java.desktop/share/classes/java/awt/desktop/PreferencesEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/PreferencesEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/PreferencesEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/PreferencesHandler.java b/src/java.desktop/share/classes/java/awt/desktop/PreferencesHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/PreferencesHandler.java rename to src/java.desktop/share/classes/java/awt/desktop/PreferencesHandler.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/PrintFilesEvent.java b/src/java.desktop/share/classes/java/awt/desktop/PrintFilesEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/PrintFilesEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/PrintFilesEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/PrintFilesHandler.java b/src/java.desktop/share/classes/java/awt/desktop/PrintFilesHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/PrintFilesHandler.java rename to src/java.desktop/share/classes/java/awt/desktop/PrintFilesHandler.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/QuitEvent.java b/src/java.desktop/share/classes/java/awt/desktop/QuitEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/QuitEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/QuitEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/QuitHandler.java b/src/java.desktop/share/classes/java/awt/desktop/QuitHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/QuitHandler.java rename to src/java.desktop/share/classes/java/awt/desktop/QuitHandler.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/QuitResponse.java b/src/java.desktop/share/classes/java/awt/desktop/QuitResponse.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/QuitResponse.java rename to src/java.desktop/share/classes/java/awt/desktop/QuitResponse.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/QuitStrategy.java b/src/java.desktop/share/classes/java/awt/desktop/QuitStrategy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/QuitStrategy.java rename to src/java.desktop/share/classes/java/awt/desktop/QuitStrategy.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/ScreenSleepEvent.java b/src/java.desktop/share/classes/java/awt/desktop/ScreenSleepEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/ScreenSleepEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/ScreenSleepEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/ScreenSleepListener.java b/src/java.desktop/share/classes/java/awt/desktop/ScreenSleepListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/ScreenSleepListener.java rename to src/java.desktop/share/classes/java/awt/desktop/ScreenSleepListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/SystemEventListener.java b/src/java.desktop/share/classes/java/awt/desktop/SystemEventListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/SystemEventListener.java rename to src/java.desktop/share/classes/java/awt/desktop/SystemEventListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/SystemSleepEvent.java b/src/java.desktop/share/classes/java/awt/desktop/SystemSleepEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/SystemSleepEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/SystemSleepEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/SystemSleepListener.java b/src/java.desktop/share/classes/java/awt/desktop/SystemSleepListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/SystemSleepListener.java rename to src/java.desktop/share/classes/java/awt/desktop/SystemSleepListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/UserSessionEvent.java b/src/java.desktop/share/classes/java/awt/desktop/UserSessionEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/UserSessionEvent.java rename to src/java.desktop/share/classes/java/awt/desktop/UserSessionEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/UserSessionListener.java b/src/java.desktop/share/classes/java/awt/desktop/UserSessionListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/UserSessionListener.java rename to src/java.desktop/share/classes/java/awt/desktop/UserSessionListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/desktop/package-info.java b/src/java.desktop/share/classes/java/awt/desktop/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/desktop/package-info.java rename to src/java.desktop/share/classes/java/awt/desktop/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/Autoscroll.java b/src/java.desktop/share/classes/java/awt/dnd/Autoscroll.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/Autoscroll.java rename to src/java.desktop/share/classes/java/awt/dnd/Autoscroll.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DnDConstants.java b/src/java.desktop/share/classes/java/awt/dnd/DnDConstants.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DnDConstants.java rename to src/java.desktop/share/classes/java/awt/dnd/DnDConstants.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DnDEventMulticaster.java b/src/java.desktop/share/classes/java/awt/dnd/DnDEventMulticaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DnDEventMulticaster.java rename to src/java.desktop/share/classes/java/awt/dnd/DnDEventMulticaster.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragGestureEvent.java b/src/java.desktop/share/classes/java/awt/dnd/DragGestureEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DragGestureEvent.java rename to src/java.desktop/share/classes/java/awt/dnd/DragGestureEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragGestureListener.java b/src/java.desktop/share/classes/java/awt/dnd/DragGestureListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DragGestureListener.java rename to src/java.desktop/share/classes/java/awt/dnd/DragGestureListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragGestureRecognizer.java b/src/java.desktop/share/classes/java/awt/dnd/DragGestureRecognizer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DragGestureRecognizer.java rename to src/java.desktop/share/classes/java/awt/dnd/DragGestureRecognizer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSource.java b/src/java.desktop/share/classes/java/awt/dnd/DragSource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DragSource.java rename to src/java.desktop/share/classes/java/awt/dnd/DragSource.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceAdapter.java b/src/java.desktop/share/classes/java/awt/dnd/DragSourceAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceAdapter.java rename to src/java.desktop/share/classes/java/awt/dnd/DragSourceAdapter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java b/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java rename to src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceDragEvent.java b/src/java.desktop/share/classes/java/awt/dnd/DragSourceDragEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceDragEvent.java rename to src/java.desktop/share/classes/java/awt/dnd/DragSourceDragEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceDropEvent.java b/src/java.desktop/share/classes/java/awt/dnd/DragSourceDropEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceDropEvent.java rename to src/java.desktop/share/classes/java/awt/dnd/DragSourceDropEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceEvent.java b/src/java.desktop/share/classes/java/awt/dnd/DragSourceEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceEvent.java rename to src/java.desktop/share/classes/java/awt/dnd/DragSourceEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceListener.java b/src/java.desktop/share/classes/java/awt/dnd/DragSourceListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceListener.java rename to src/java.desktop/share/classes/java/awt/dnd/DragSourceListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceMotionListener.java b/src/java.desktop/share/classes/java/awt/dnd/DragSourceMotionListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceMotionListener.java rename to src/java.desktop/share/classes/java/awt/dnd/DragSourceMotionListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java b/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java rename to src/java.desktop/share/classes/java/awt/dnd/DropTarget.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetAdapter.java b/src/java.desktop/share/classes/java/awt/dnd/DropTargetAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetAdapter.java rename to src/java.desktop/share/classes/java/awt/dnd/DropTargetAdapter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetContext.java b/src/java.desktop/share/classes/java/awt/dnd/DropTargetContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetContext.java rename to src/java.desktop/share/classes/java/awt/dnd/DropTargetContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetDragEvent.java b/src/java.desktop/share/classes/java/awt/dnd/DropTargetDragEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetDragEvent.java rename to src/java.desktop/share/classes/java/awt/dnd/DropTargetDragEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetDropEvent.java b/src/java.desktop/share/classes/java/awt/dnd/DropTargetDropEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetDropEvent.java rename to src/java.desktop/share/classes/java/awt/dnd/DropTargetDropEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetEvent.java b/src/java.desktop/share/classes/java/awt/dnd/DropTargetEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetEvent.java rename to src/java.desktop/share/classes/java/awt/dnd/DropTargetEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetListener.java b/src/java.desktop/share/classes/java/awt/dnd/DropTargetListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/DropTargetListener.java rename to src/java.desktop/share/classes/java/awt/dnd/DropTargetListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/InvalidDnDOperationException.java b/src/java.desktop/share/classes/java/awt/dnd/InvalidDnDOperationException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/InvalidDnDOperationException.java rename to src/java.desktop/share/classes/java/awt/dnd/InvalidDnDOperationException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java b/src/java.desktop/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java rename to src/java.desktop/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/SerializationTester.java b/src/java.desktop/share/classes/java/awt/dnd/SerializationTester.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/SerializationTester.java rename to src/java.desktop/share/classes/java/awt/dnd/SerializationTester.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/package-info.java b/src/java.desktop/share/classes/java/awt/dnd/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/package-info.java rename to src/java.desktop/share/classes/java/awt/dnd/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/peer/DragSourceContextPeer.java b/src/java.desktop/share/classes/java/awt/dnd/peer/DragSourceContextPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/peer/DragSourceContextPeer.java rename to src/java.desktop/share/classes/java/awt/dnd/peer/DragSourceContextPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/peer/DropTargetContextPeer.java b/src/java.desktop/share/classes/java/awt/dnd/peer/DropTargetContextPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/peer/DropTargetContextPeer.java rename to src/java.desktop/share/classes/java/awt/dnd/peer/DropTargetContextPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/peer/DropTargetPeer.java b/src/java.desktop/share/classes/java/awt/dnd/peer/DropTargetPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/peer/DropTargetPeer.java rename to src/java.desktop/share/classes/java/awt/dnd/peer/DropTargetPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/peer/package-info.java b/src/java.desktop/share/classes/java/awt/dnd/peer/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/dnd/peer/package-info.java rename to src/java.desktop/share/classes/java/awt/dnd/peer/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html b/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html rename to src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/BorderLayout-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/BorderLayout-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/BorderLayout-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/BorderLayout-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/Button-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/Button-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/Button-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/Button-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/Checkbox-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/Checkbox-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/Checkbox-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/Checkbox-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/CheckboxGroup-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/CheckboxGroup-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/CheckboxGroup-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/CheckboxGroup-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/Choice-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/Choice-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/Choice-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/Choice-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html b/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html rename to src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/FlowLayout-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/FlowLayout-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/FlowLayout-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/FlowLayout-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/FocusCycle.gif b/src/java.desktop/share/classes/java/awt/doc-files/FocusCycle.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/FocusCycle.gif rename to src/java.desktop/share/classes/java/awt/doc-files/FocusCycle.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html b/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html rename to src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/FontMetrics-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/FontMetrics-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/FontMetrics-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/FontMetrics-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-2.gif b/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-2.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-2.gif rename to src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-2.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-baseline.png b/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-baseline.png similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-baseline.png rename to src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-baseline.png diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/GridLayout-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-2.gif b/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-2.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-2.gif rename to src/java.desktop/share/classes/java/awt/doc-files/GridLayout-2.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/ImplicitFocusTransfer.gif b/src/java.desktop/share/classes/java/awt/doc-files/ImplicitFocusTransfer.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/ImplicitFocusTransfer.gif rename to src/java.desktop/share/classes/java/awt/doc-files/ImplicitFocusTransfer.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/Label-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/Label-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/Label-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/Label-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/LinearGradientPaint.png b/src/java.desktop/share/classes/java/awt/doc-files/LinearGradientPaint.png similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/LinearGradientPaint.png rename to src/java.desktop/share/classes/java/awt/doc-files/LinearGradientPaint.png diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/List-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/List-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/List-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/List-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/MenuBar-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/MenuBar-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/MenuBar-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/MenuBar-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/Modality.html b/src/java.desktop/share/classes/java/awt/doc-files/Modality.html similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/Modality.html rename to src/java.desktop/share/classes/java/awt/doc-files/Modality.html diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/MultiScreen.gif b/src/java.desktop/share/classes/java/awt/doc-files/MultiScreen.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/MultiScreen.gif rename to src/java.desktop/share/classes/java/awt/doc-files/MultiScreen.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-1.png b/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-1.png similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-1.png rename to src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-1.png diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-2.png b/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-2.png similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-2.png rename to src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-2.png diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-3.png b/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-3.png similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-3.png rename to src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-3.png diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-4.png b/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-4.png similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-4.png rename to src/java.desktop/share/classes/java/awt/doc-files/RadialGradientPaint-4.png diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/Scrollbar-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/Scrollbar-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/Scrollbar-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/Scrollbar-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/Scrollbar-2.gif b/src/java.desktop/share/classes/java/awt/doc-files/Scrollbar-2.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/Scrollbar-2.gif rename to src/java.desktop/share/classes/java/awt/doc-files/Scrollbar-2.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/TextArea-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/TextArea-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/TextArea-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/TextArea-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/TextField-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/TextField-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/TextField-1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/TextField-1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example1.gif b/src/java.desktop/share/classes/java/awt/doc-files/modal-example1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example1.gif rename to src/java.desktop/share/classes/java/awt/doc-files/modal-example1.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example2.gif b/src/java.desktop/share/classes/java/awt/doc-files/modal-example2.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example2.gif rename to src/java.desktop/share/classes/java/awt/doc-files/modal-example2.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example3.gif b/src/java.desktop/share/classes/java/awt/doc-files/modal-example3.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example3.gif rename to src/java.desktop/share/classes/java/awt/doc-files/modal-example3.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example4.gif b/src/java.desktop/share/classes/java/awt/doc-files/modal-example4.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/doc-files/modal-example4.gif rename to src/java.desktop/share/classes/java/awt/doc-files/modal-example4.gif diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/AWTEventListener.java b/src/java.desktop/share/classes/java/awt/event/AWTEventListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/AWTEventListener.java rename to src/java.desktop/share/classes/java/awt/event/AWTEventListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/AWTEventListenerProxy.java b/src/java.desktop/share/classes/java/awt/event/AWTEventListenerProxy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/AWTEventListenerProxy.java rename to src/java.desktop/share/classes/java/awt/event/AWTEventListenerProxy.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/ActionEvent.java b/src/java.desktop/share/classes/java/awt/event/ActionEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/ActionEvent.java rename to src/java.desktop/share/classes/java/awt/event/ActionEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/ActionListener.java b/src/java.desktop/share/classes/java/awt/event/ActionListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/ActionListener.java rename to src/java.desktop/share/classes/java/awt/event/ActionListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/AdjustmentEvent.java b/src/java.desktop/share/classes/java/awt/event/AdjustmentEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/AdjustmentEvent.java rename to src/java.desktop/share/classes/java/awt/event/AdjustmentEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/AdjustmentListener.java b/src/java.desktop/share/classes/java/awt/event/AdjustmentListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/AdjustmentListener.java rename to src/java.desktop/share/classes/java/awt/event/AdjustmentListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/ComponentAdapter.java b/src/java.desktop/share/classes/java/awt/event/ComponentAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/ComponentAdapter.java rename to src/java.desktop/share/classes/java/awt/event/ComponentAdapter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/ComponentEvent.java b/src/java.desktop/share/classes/java/awt/event/ComponentEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/ComponentEvent.java rename to src/java.desktop/share/classes/java/awt/event/ComponentEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/ComponentListener.java b/src/java.desktop/share/classes/java/awt/event/ComponentListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/ComponentListener.java rename to src/java.desktop/share/classes/java/awt/event/ComponentListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/ContainerAdapter.java b/src/java.desktop/share/classes/java/awt/event/ContainerAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/ContainerAdapter.java rename to src/java.desktop/share/classes/java/awt/event/ContainerAdapter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/ContainerEvent.java b/src/java.desktop/share/classes/java/awt/event/ContainerEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/ContainerEvent.java rename to src/java.desktop/share/classes/java/awt/event/ContainerEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/ContainerListener.java b/src/java.desktop/share/classes/java/awt/event/ContainerListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/ContainerListener.java rename to src/java.desktop/share/classes/java/awt/event/ContainerListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/FocusAdapter.java b/src/java.desktop/share/classes/java/awt/event/FocusAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/FocusAdapter.java rename to src/java.desktop/share/classes/java/awt/event/FocusAdapter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/FocusEvent.java b/src/java.desktop/share/classes/java/awt/event/FocusEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/FocusEvent.java rename to src/java.desktop/share/classes/java/awt/event/FocusEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/FocusListener.java b/src/java.desktop/share/classes/java/awt/event/FocusListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/FocusListener.java rename to src/java.desktop/share/classes/java/awt/event/FocusListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/HierarchyBoundsAdapter.java b/src/java.desktop/share/classes/java/awt/event/HierarchyBoundsAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/HierarchyBoundsAdapter.java rename to src/java.desktop/share/classes/java/awt/event/HierarchyBoundsAdapter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/HierarchyBoundsListener.java b/src/java.desktop/share/classes/java/awt/event/HierarchyBoundsListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/HierarchyBoundsListener.java rename to src/java.desktop/share/classes/java/awt/event/HierarchyBoundsListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/HierarchyEvent.java b/src/java.desktop/share/classes/java/awt/event/HierarchyEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/HierarchyEvent.java rename to src/java.desktop/share/classes/java/awt/event/HierarchyEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/HierarchyListener.java b/src/java.desktop/share/classes/java/awt/event/HierarchyListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/HierarchyListener.java rename to src/java.desktop/share/classes/java/awt/event/HierarchyListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/InputEvent.java b/src/java.desktop/share/classes/java/awt/event/InputEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/InputEvent.java rename to src/java.desktop/share/classes/java/awt/event/InputEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java b/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java rename to src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/InputMethodListener.java b/src/java.desktop/share/classes/java/awt/event/InputMethodListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/InputMethodListener.java rename to src/java.desktop/share/classes/java/awt/event/InputMethodListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/InvocationEvent.java b/src/java.desktop/share/classes/java/awt/event/InvocationEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/InvocationEvent.java rename to src/java.desktop/share/classes/java/awt/event/InvocationEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/ItemEvent.java b/src/java.desktop/share/classes/java/awt/event/ItemEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/ItemEvent.java rename to src/java.desktop/share/classes/java/awt/event/ItemEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/ItemListener.java b/src/java.desktop/share/classes/java/awt/event/ItemListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/ItemListener.java rename to src/java.desktop/share/classes/java/awt/event/ItemListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/KeyAdapter.java b/src/java.desktop/share/classes/java/awt/event/KeyAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/KeyAdapter.java rename to src/java.desktop/share/classes/java/awt/event/KeyAdapter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/KeyEvent.java b/src/java.desktop/share/classes/java/awt/event/KeyEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/KeyEvent.java rename to src/java.desktop/share/classes/java/awt/event/KeyEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/KeyListener.java b/src/java.desktop/share/classes/java/awt/event/KeyListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/KeyListener.java rename to src/java.desktop/share/classes/java/awt/event/KeyListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/MouseAdapter.java b/src/java.desktop/share/classes/java/awt/event/MouseAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/MouseAdapter.java rename to src/java.desktop/share/classes/java/awt/event/MouseAdapter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/MouseEvent.java b/src/java.desktop/share/classes/java/awt/event/MouseEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/MouseEvent.java rename to src/java.desktop/share/classes/java/awt/event/MouseEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/MouseListener.java b/src/java.desktop/share/classes/java/awt/event/MouseListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/MouseListener.java rename to src/java.desktop/share/classes/java/awt/event/MouseListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/MouseMotionAdapter.java b/src/java.desktop/share/classes/java/awt/event/MouseMotionAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/MouseMotionAdapter.java rename to src/java.desktop/share/classes/java/awt/event/MouseMotionAdapter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/MouseMotionListener.java b/src/java.desktop/share/classes/java/awt/event/MouseMotionListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/MouseMotionListener.java rename to src/java.desktop/share/classes/java/awt/event/MouseMotionListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/MouseWheelEvent.java b/src/java.desktop/share/classes/java/awt/event/MouseWheelEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/MouseWheelEvent.java rename to src/java.desktop/share/classes/java/awt/event/MouseWheelEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/MouseWheelListener.java b/src/java.desktop/share/classes/java/awt/event/MouseWheelListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/MouseWheelListener.java rename to src/java.desktop/share/classes/java/awt/event/MouseWheelListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java b/src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java rename to src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/PaintEvent.java b/src/java.desktop/share/classes/java/awt/event/PaintEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/PaintEvent.java rename to src/java.desktop/share/classes/java/awt/event/PaintEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/TextEvent.java b/src/java.desktop/share/classes/java/awt/event/TextEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/TextEvent.java rename to src/java.desktop/share/classes/java/awt/event/TextEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/TextListener.java b/src/java.desktop/share/classes/java/awt/event/TextListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/TextListener.java rename to src/java.desktop/share/classes/java/awt/event/TextListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/WindowAdapter.java b/src/java.desktop/share/classes/java/awt/event/WindowAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/WindowAdapter.java rename to src/java.desktop/share/classes/java/awt/event/WindowAdapter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/WindowEvent.java b/src/java.desktop/share/classes/java/awt/event/WindowEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/WindowEvent.java rename to src/java.desktop/share/classes/java/awt/event/WindowEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/WindowFocusListener.java b/src/java.desktop/share/classes/java/awt/event/WindowFocusListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/WindowFocusListener.java rename to src/java.desktop/share/classes/java/awt/event/WindowFocusListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/WindowListener.java b/src/java.desktop/share/classes/java/awt/event/WindowListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/WindowListener.java rename to src/java.desktop/share/classes/java/awt/event/WindowListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/WindowStateListener.java b/src/java.desktop/share/classes/java/awt/event/WindowStateListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/WindowStateListener.java rename to src/java.desktop/share/classes/java/awt/event/WindowStateListener.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/event/package-info.java b/src/java.desktop/share/classes/java/awt/event/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/event/package-info.java rename to src/java.desktop/share/classes/java/awt/event/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/CharArrayIterator.java b/src/java.desktop/share/classes/java/awt/font/CharArrayIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/CharArrayIterator.java rename to src/java.desktop/share/classes/java/awt/font/CharArrayIterator.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/FontRenderContext.java b/src/java.desktop/share/classes/java/awt/font/FontRenderContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/FontRenderContext.java rename to src/java.desktop/share/classes/java/awt/font/FontRenderContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/GlyphJustificationInfo.java b/src/java.desktop/share/classes/java/awt/font/GlyphJustificationInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/GlyphJustificationInfo.java rename to src/java.desktop/share/classes/java/awt/font/GlyphJustificationInfo.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/GlyphMetrics.java b/src/java.desktop/share/classes/java/awt/font/GlyphMetrics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/GlyphMetrics.java rename to src/java.desktop/share/classes/java/awt/font/GlyphMetrics.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/GlyphVector.java b/src/java.desktop/share/classes/java/awt/font/GlyphVector.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/GlyphVector.java rename to src/java.desktop/share/classes/java/awt/font/GlyphVector.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/GraphicAttribute.java b/src/java.desktop/share/classes/java/awt/font/GraphicAttribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/GraphicAttribute.java rename to src/java.desktop/share/classes/java/awt/font/GraphicAttribute.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/ImageGraphicAttribute.java b/src/java.desktop/share/classes/java/awt/font/ImageGraphicAttribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/ImageGraphicAttribute.java rename to src/java.desktop/share/classes/java/awt/font/ImageGraphicAttribute.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/JavaAWTFontAccessImpl.java b/src/java.desktop/share/classes/java/awt/font/JavaAWTFontAccessImpl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/JavaAWTFontAccessImpl.java rename to src/java.desktop/share/classes/java/awt/font/JavaAWTFontAccessImpl.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/LayoutPath.java b/src/java.desktop/share/classes/java/awt/font/LayoutPath.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/LayoutPath.java rename to src/java.desktop/share/classes/java/awt/font/LayoutPath.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/LineBreakMeasurer.java b/src/java.desktop/share/classes/java/awt/font/LineBreakMeasurer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/LineBreakMeasurer.java rename to src/java.desktop/share/classes/java/awt/font/LineBreakMeasurer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/LineMetrics.java b/src/java.desktop/share/classes/java/awt/font/LineMetrics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/LineMetrics.java rename to src/java.desktop/share/classes/java/awt/font/LineMetrics.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/MultipleMaster.java b/src/java.desktop/share/classes/java/awt/font/MultipleMaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/MultipleMaster.java rename to src/java.desktop/share/classes/java/awt/font/MultipleMaster.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/NumericShaper.java b/src/java.desktop/share/classes/java/awt/font/NumericShaper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/NumericShaper.java rename to src/java.desktop/share/classes/java/awt/font/NumericShaper.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/OpenType.java b/src/java.desktop/share/classes/java/awt/font/OpenType.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/OpenType.java rename to src/java.desktop/share/classes/java/awt/font/OpenType.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/ShapeGraphicAttribute.java b/src/java.desktop/share/classes/java/awt/font/ShapeGraphicAttribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/ShapeGraphicAttribute.java rename to src/java.desktop/share/classes/java/awt/font/ShapeGraphicAttribute.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/StyledParagraph.java b/src/java.desktop/share/classes/java/awt/font/StyledParagraph.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/StyledParagraph.java rename to src/java.desktop/share/classes/java/awt/font/StyledParagraph.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/TextAttribute.java b/src/java.desktop/share/classes/java/awt/font/TextAttribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/TextAttribute.java rename to src/java.desktop/share/classes/java/awt/font/TextAttribute.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/TextHitInfo.java b/src/java.desktop/share/classes/java/awt/font/TextHitInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/TextHitInfo.java rename to src/java.desktop/share/classes/java/awt/font/TextHitInfo.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/TextJustifier.java b/src/java.desktop/share/classes/java/awt/font/TextJustifier.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/TextJustifier.java rename to src/java.desktop/share/classes/java/awt/font/TextJustifier.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/TextLayout.java b/src/java.desktop/share/classes/java/awt/font/TextLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/TextLayout.java rename to src/java.desktop/share/classes/java/awt/font/TextLayout.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/TextLine.java b/src/java.desktop/share/classes/java/awt/font/TextLine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/TextLine.java rename to src/java.desktop/share/classes/java/awt/font/TextLine.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/TextMeasurer.java b/src/java.desktop/share/classes/java/awt/font/TextMeasurer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/TextMeasurer.java rename to src/java.desktop/share/classes/java/awt/font/TextMeasurer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/TransformAttribute.java b/src/java.desktop/share/classes/java/awt/font/TransformAttribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/TransformAttribute.java rename to src/java.desktop/share/classes/java/awt/font/TransformAttribute.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/package-info.java b/src/java.desktop/share/classes/java/awt/font/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/font/package-info.java rename to src/java.desktop/share/classes/java/awt/font/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java b/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java rename to src/java.desktop/share/classes/java/awt/geom/AffineTransform.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/Arc2D.java b/src/java.desktop/share/classes/java/awt/geom/Arc2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/Arc2D.java rename to src/java.desktop/share/classes/java/awt/geom/Arc2D.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/ArcIterator.java b/src/java.desktop/share/classes/java/awt/geom/ArcIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/ArcIterator.java rename to src/java.desktop/share/classes/java/awt/geom/ArcIterator.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/Area.java b/src/java.desktop/share/classes/java/awt/geom/Area.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/Area.java rename to src/java.desktop/share/classes/java/awt/geom/Area.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java b/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java rename to src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/CubicIterator.java b/src/java.desktop/share/classes/java/awt/geom/CubicIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/CubicIterator.java rename to src/java.desktop/share/classes/java/awt/geom/CubicIterator.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java b/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java rename to src/java.desktop/share/classes/java/awt/geom/Dimension2D.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/Ellipse2D.java b/src/java.desktop/share/classes/java/awt/geom/Ellipse2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/Ellipse2D.java rename to src/java.desktop/share/classes/java/awt/geom/Ellipse2D.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/EllipseIterator.java b/src/java.desktop/share/classes/java/awt/geom/EllipseIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/EllipseIterator.java rename to src/java.desktop/share/classes/java/awt/geom/EllipseIterator.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java b/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java rename to src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/GeneralPath.java b/src/java.desktop/share/classes/java/awt/geom/GeneralPath.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/GeneralPath.java rename to src/java.desktop/share/classes/java/awt/geom/GeneralPath.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/IllegalPathStateException.java b/src/java.desktop/share/classes/java/awt/geom/IllegalPathStateException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/IllegalPathStateException.java rename to src/java.desktop/share/classes/java/awt/geom/IllegalPathStateException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/Line2D.java b/src/java.desktop/share/classes/java/awt/geom/Line2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/Line2D.java rename to src/java.desktop/share/classes/java/awt/geom/Line2D.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/LineIterator.java b/src/java.desktop/share/classes/java/awt/geom/LineIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/LineIterator.java rename to src/java.desktop/share/classes/java/awt/geom/LineIterator.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/NoninvertibleTransformException.java b/src/java.desktop/share/classes/java/awt/geom/NoninvertibleTransformException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/NoninvertibleTransformException.java rename to src/java.desktop/share/classes/java/awt/geom/NoninvertibleTransformException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/Path2D.java b/src/java.desktop/share/classes/java/awt/geom/Path2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/Path2D.java rename to src/java.desktop/share/classes/java/awt/geom/Path2D.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/PathIterator.java b/src/java.desktop/share/classes/java/awt/geom/PathIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/PathIterator.java rename to src/java.desktop/share/classes/java/awt/geom/PathIterator.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/Point2D.java b/src/java.desktop/share/classes/java/awt/geom/Point2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/Point2D.java rename to src/java.desktop/share/classes/java/awt/geom/Point2D.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java b/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java rename to src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/QuadIterator.java b/src/java.desktop/share/classes/java/awt/geom/QuadIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/QuadIterator.java rename to src/java.desktop/share/classes/java/awt/geom/QuadIterator.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/RectIterator.java b/src/java.desktop/share/classes/java/awt/geom/RectIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/RectIterator.java rename to src/java.desktop/share/classes/java/awt/geom/RectIterator.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/Rectangle2D.java b/src/java.desktop/share/classes/java/awt/geom/Rectangle2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/Rectangle2D.java rename to src/java.desktop/share/classes/java/awt/geom/Rectangle2D.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java b/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java rename to src/java.desktop/share/classes/java/awt/geom/RectangularShape.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/RoundRectIterator.java b/src/java.desktop/share/classes/java/awt/geom/RoundRectIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/RoundRectIterator.java rename to src/java.desktop/share/classes/java/awt/geom/RoundRectIterator.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/RoundRectangle2D.java b/src/java.desktop/share/classes/java/awt/geom/RoundRectangle2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/RoundRectangle2D.java rename to src/java.desktop/share/classes/java/awt/geom/RoundRectangle2D.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/geom/package-info.java b/src/java.desktop/share/classes/java/awt/geom/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/geom/package-info.java rename to src/java.desktop/share/classes/java/awt/geom/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/im/InputContext.java b/src/java.desktop/share/classes/java/awt/im/InputContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/im/InputContext.java rename to src/java.desktop/share/classes/java/awt/im/InputContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java b/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java rename to src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/im/InputMethodRequests.java b/src/java.desktop/share/classes/java/awt/im/InputMethodRequests.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/im/InputMethodRequests.java rename to src/java.desktop/share/classes/java/awt/im/InputMethodRequests.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/im/InputSubset.java b/src/java.desktop/share/classes/java/awt/im/InputSubset.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/im/InputSubset.java rename to src/java.desktop/share/classes/java/awt/im/InputSubset.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/im/package-info.java b/src/java.desktop/share/classes/java/awt/im/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/im/package-info.java rename to src/java.desktop/share/classes/java/awt/im/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java b/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java rename to src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java b/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java rename to src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java b/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java rename to src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/im/spi/package-info.java b/src/java.desktop/share/classes/java/awt/im/spi/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/im/spi/package-info.java rename to src/java.desktop/share/classes/java/awt/im/spi/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java b/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java rename to src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/AffineTransformOp.java b/src/java.desktop/share/classes/java/awt/image/AffineTransformOp.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/AffineTransformOp.java rename to src/java.desktop/share/classes/java/awt/image/AffineTransformOp.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/AreaAveragingScaleFilter.java b/src/java.desktop/share/classes/java/awt/image/AreaAveragingScaleFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/AreaAveragingScaleFilter.java rename to src/java.desktop/share/classes/java/awt/image/AreaAveragingScaleFilter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/BandCombineOp.java b/src/java.desktop/share/classes/java/awt/image/BandCombineOp.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/BandCombineOp.java rename to src/java.desktop/share/classes/java/awt/image/BandCombineOp.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java rename to src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/BaseMultiResolutionImage.java b/src/java.desktop/share/classes/java/awt/image/BaseMultiResolutionImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/BaseMultiResolutionImage.java rename to src/java.desktop/share/classes/java/awt/image/BaseMultiResolutionImage.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/BufferStrategy.java b/src/java.desktop/share/classes/java/awt/image/BufferStrategy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/BufferStrategy.java rename to src/java.desktop/share/classes/java/awt/image/BufferStrategy.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/BufferedImage.java b/src/java.desktop/share/classes/java/awt/image/BufferedImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/BufferedImage.java rename to src/java.desktop/share/classes/java/awt/image/BufferedImage.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java b/src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java rename to src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/BufferedImageOp.java b/src/java.desktop/share/classes/java/awt/image/BufferedImageOp.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/BufferedImageOp.java rename to src/java.desktop/share/classes/java/awt/image/BufferedImageOp.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java b/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java rename to src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java b/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java rename to src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ColorModel.java b/src/java.desktop/share/classes/java/awt/image/ColorModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ColorModel.java rename to src/java.desktop/share/classes/java/awt/image/ColorModel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ComponentColorModel.java b/src/java.desktop/share/classes/java/awt/image/ComponentColorModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ComponentColorModel.java rename to src/java.desktop/share/classes/java/awt/image/ComponentColorModel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java b/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java rename to src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ConvolveOp.java b/src/java.desktop/share/classes/java/awt/image/ConvolveOp.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ConvolveOp.java rename to src/java.desktop/share/classes/java/awt/image/ConvolveOp.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/CropImageFilter.java b/src/java.desktop/share/classes/java/awt/image/CropImageFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/CropImageFilter.java rename to src/java.desktop/share/classes/java/awt/image/CropImageFilter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/DataBuffer.java b/src/java.desktop/share/classes/java/awt/image/DataBuffer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/DataBuffer.java rename to src/java.desktop/share/classes/java/awt/image/DataBuffer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/DataBufferByte.java b/src/java.desktop/share/classes/java/awt/image/DataBufferByte.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/DataBufferByte.java rename to src/java.desktop/share/classes/java/awt/image/DataBufferByte.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/DataBufferDouble.java b/src/java.desktop/share/classes/java/awt/image/DataBufferDouble.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/DataBufferDouble.java rename to src/java.desktop/share/classes/java/awt/image/DataBufferDouble.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/DataBufferFloat.java b/src/java.desktop/share/classes/java/awt/image/DataBufferFloat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/DataBufferFloat.java rename to src/java.desktop/share/classes/java/awt/image/DataBufferFloat.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/DataBufferInt.java b/src/java.desktop/share/classes/java/awt/image/DataBufferInt.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/DataBufferInt.java rename to src/java.desktop/share/classes/java/awt/image/DataBufferInt.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/DataBufferShort.java b/src/java.desktop/share/classes/java/awt/image/DataBufferShort.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/DataBufferShort.java rename to src/java.desktop/share/classes/java/awt/image/DataBufferShort.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/DataBufferUShort.java b/src/java.desktop/share/classes/java/awt/image/DataBufferUShort.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/DataBufferUShort.java rename to src/java.desktop/share/classes/java/awt/image/DataBufferUShort.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java b/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java rename to src/java.desktop/share/classes/java/awt/image/DirectColorModel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/FilteredImageSource.java b/src/java.desktop/share/classes/java/awt/image/FilteredImageSource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/FilteredImageSource.java rename to src/java.desktop/share/classes/java/awt/image/FilteredImageSource.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ImageConsumer.java b/src/java.desktop/share/classes/java/awt/image/ImageConsumer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ImageConsumer.java rename to src/java.desktop/share/classes/java/awt/image/ImageConsumer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ImageFilter.java b/src/java.desktop/share/classes/java/awt/image/ImageFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ImageFilter.java rename to src/java.desktop/share/classes/java/awt/image/ImageFilter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ImageObserver.java b/src/java.desktop/share/classes/java/awt/image/ImageObserver.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ImageObserver.java rename to src/java.desktop/share/classes/java/awt/image/ImageObserver.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ImageProducer.java b/src/java.desktop/share/classes/java/awt/image/ImageProducer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ImageProducer.java rename to src/java.desktop/share/classes/java/awt/image/ImageProducer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ImagingOpException.java b/src/java.desktop/share/classes/java/awt/image/ImagingOpException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ImagingOpException.java rename to src/java.desktop/share/classes/java/awt/image/ImagingOpException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java b/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java rename to src/java.desktop/share/classes/java/awt/image/IndexColorModel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/Kernel.java b/src/java.desktop/share/classes/java/awt/image/Kernel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/Kernel.java rename to src/java.desktop/share/classes/java/awt/image/Kernel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/LookupOp.java b/src/java.desktop/share/classes/java/awt/image/LookupOp.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/LookupOp.java rename to src/java.desktop/share/classes/java/awt/image/LookupOp.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/LookupTable.java b/src/java.desktop/share/classes/java/awt/image/LookupTable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/LookupTable.java rename to src/java.desktop/share/classes/java/awt/image/LookupTable.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/MemoryImageSource.java b/src/java.desktop/share/classes/java/awt/image/MemoryImageSource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/MemoryImageSource.java rename to src/java.desktop/share/classes/java/awt/image/MemoryImageSource.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java rename to src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/MultiResolutionImage.java b/src/java.desktop/share/classes/java/awt/image/MultiResolutionImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/MultiResolutionImage.java rename to src/java.desktop/share/classes/java/awt/image/MultiResolutionImage.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/PackedColorModel.java b/src/java.desktop/share/classes/java/awt/image/PackedColorModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/PackedColorModel.java rename to src/java.desktop/share/classes/java/awt/image/PackedColorModel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java b/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java rename to src/java.desktop/share/classes/java/awt/image/PixelGrabber.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/PixelInterleavedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/PixelInterleavedSampleModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/PixelInterleavedSampleModel.java rename to src/java.desktop/share/classes/java/awt/image/PixelInterleavedSampleModel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java b/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java rename to src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/Raster.java b/src/java.desktop/share/classes/java/awt/image/Raster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/Raster.java rename to src/java.desktop/share/classes/java/awt/image/Raster.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/RasterFormatException.java b/src/java.desktop/share/classes/java/awt/image/RasterFormatException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/RasterFormatException.java rename to src/java.desktop/share/classes/java/awt/image/RasterFormatException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/RasterOp.java b/src/java.desktop/share/classes/java/awt/image/RasterOp.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/RasterOp.java rename to src/java.desktop/share/classes/java/awt/image/RasterOp.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/RenderedImage.java b/src/java.desktop/share/classes/java/awt/image/RenderedImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/RenderedImage.java rename to src/java.desktop/share/classes/java/awt/image/RenderedImage.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ReplicateScaleFilter.java b/src/java.desktop/share/classes/java/awt/image/ReplicateScaleFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ReplicateScaleFilter.java rename to src/java.desktop/share/classes/java/awt/image/ReplicateScaleFilter.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/RescaleOp.java b/src/java.desktop/share/classes/java/awt/image/RescaleOp.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/RescaleOp.java rename to src/java.desktop/share/classes/java/awt/image/RescaleOp.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/SampleModel.java b/src/java.desktop/share/classes/java/awt/image/SampleModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/SampleModel.java rename to src/java.desktop/share/classes/java/awt/image/SampleModel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java b/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java rename to src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java rename to src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/TileObserver.java b/src/java.desktop/share/classes/java/awt/image/TileObserver.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/TileObserver.java rename to src/java.desktop/share/classes/java/awt/image/TileObserver.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/VolatileImage.java b/src/java.desktop/share/classes/java/awt/image/VolatileImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/VolatileImage.java rename to src/java.desktop/share/classes/java/awt/image/VolatileImage.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/WritableRaster.java b/src/java.desktop/share/classes/java/awt/image/WritableRaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/WritableRaster.java rename to src/java.desktop/share/classes/java/awt/image/WritableRaster.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/WritableRenderedImage.java b/src/java.desktop/share/classes/java/awt/image/WritableRenderedImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/WritableRenderedImage.java rename to src/java.desktop/share/classes/java/awt/image/WritableRenderedImage.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/package-info.java b/src/java.desktop/share/classes/java/awt/image/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/package-info.java rename to src/java.desktop/share/classes/java/awt/image/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java b/src/java.desktop/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java rename to src/java.desktop/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/renderable/ParameterBlock.java b/src/java.desktop/share/classes/java/awt/image/renderable/ParameterBlock.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/renderable/ParameterBlock.java rename to src/java.desktop/share/classes/java/awt/image/renderable/ParameterBlock.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderContext.java b/src/java.desktop/share/classes/java/awt/image/renderable/RenderContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderContext.java rename to src/java.desktop/share/classes/java/awt/image/renderable/RenderContext.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImage.java b/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImage.java rename to src/java.desktop/share/classes/java/awt/image/renderable/RenderableImage.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageOp.java b/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageOp.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageOp.java rename to src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageOp.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageProducer.java b/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageProducer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageProducer.java rename to src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageProducer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderedImageFactory.java b/src/java.desktop/share/classes/java/awt/image/renderable/RenderedImageFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/renderable/RenderedImageFactory.java rename to src/java.desktop/share/classes/java/awt/image/renderable/RenderedImageFactory.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/renderable/package-info.java b/src/java.desktop/share/classes/java/awt/image/renderable/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/image/renderable/package-info.java rename to src/java.desktop/share/classes/java/awt/image/renderable/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/package-info.java b/src/java.desktop/share/classes/java/awt/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/package-info.java rename to src/java.desktop/share/classes/java/awt/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/ButtonPeer.java b/src/java.desktop/share/classes/java/awt/peer/ButtonPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/ButtonPeer.java rename to src/java.desktop/share/classes/java/awt/peer/ButtonPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/CanvasPeer.java b/src/java.desktop/share/classes/java/awt/peer/CanvasPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/CanvasPeer.java rename to src/java.desktop/share/classes/java/awt/peer/CanvasPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/CheckboxMenuItemPeer.java b/src/java.desktop/share/classes/java/awt/peer/CheckboxMenuItemPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/CheckboxMenuItemPeer.java rename to src/java.desktop/share/classes/java/awt/peer/CheckboxMenuItemPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/CheckboxPeer.java b/src/java.desktop/share/classes/java/awt/peer/CheckboxPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/CheckboxPeer.java rename to src/java.desktop/share/classes/java/awt/peer/CheckboxPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/ChoicePeer.java b/src/java.desktop/share/classes/java/awt/peer/ChoicePeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/ChoicePeer.java rename to src/java.desktop/share/classes/java/awt/peer/ChoicePeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/ComponentPeer.java b/src/java.desktop/share/classes/java/awt/peer/ComponentPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/ComponentPeer.java rename to src/java.desktop/share/classes/java/awt/peer/ComponentPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/ContainerPeer.java b/src/java.desktop/share/classes/java/awt/peer/ContainerPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/ContainerPeer.java rename to src/java.desktop/share/classes/java/awt/peer/ContainerPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/DesktopPeer.java b/src/java.desktop/share/classes/java/awt/peer/DesktopPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/DesktopPeer.java rename to src/java.desktop/share/classes/java/awt/peer/DesktopPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/DialogPeer.java b/src/java.desktop/share/classes/java/awt/peer/DialogPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/DialogPeer.java rename to src/java.desktop/share/classes/java/awt/peer/DialogPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/FileDialogPeer.java b/src/java.desktop/share/classes/java/awt/peer/FileDialogPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/FileDialogPeer.java rename to src/java.desktop/share/classes/java/awt/peer/FileDialogPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/FontPeer.java b/src/java.desktop/share/classes/java/awt/peer/FontPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/FontPeer.java rename to src/java.desktop/share/classes/java/awt/peer/FontPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/FramePeer.java b/src/java.desktop/share/classes/java/awt/peer/FramePeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/FramePeer.java rename to src/java.desktop/share/classes/java/awt/peer/FramePeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java b/src/java.desktop/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java rename to src/java.desktop/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/LabelPeer.java b/src/java.desktop/share/classes/java/awt/peer/LabelPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/LabelPeer.java rename to src/java.desktop/share/classes/java/awt/peer/LabelPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/LightweightPeer.java b/src/java.desktop/share/classes/java/awt/peer/LightweightPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/LightweightPeer.java rename to src/java.desktop/share/classes/java/awt/peer/LightweightPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/ListPeer.java b/src/java.desktop/share/classes/java/awt/peer/ListPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/ListPeer.java rename to src/java.desktop/share/classes/java/awt/peer/ListPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/MenuBarPeer.java b/src/java.desktop/share/classes/java/awt/peer/MenuBarPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/MenuBarPeer.java rename to src/java.desktop/share/classes/java/awt/peer/MenuBarPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/MenuComponentPeer.java b/src/java.desktop/share/classes/java/awt/peer/MenuComponentPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/MenuComponentPeer.java rename to src/java.desktop/share/classes/java/awt/peer/MenuComponentPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/MenuItemPeer.java b/src/java.desktop/share/classes/java/awt/peer/MenuItemPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/MenuItemPeer.java rename to src/java.desktop/share/classes/java/awt/peer/MenuItemPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/MenuPeer.java b/src/java.desktop/share/classes/java/awt/peer/MenuPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/MenuPeer.java rename to src/java.desktop/share/classes/java/awt/peer/MenuPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/MouseInfoPeer.java b/src/java.desktop/share/classes/java/awt/peer/MouseInfoPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/MouseInfoPeer.java rename to src/java.desktop/share/classes/java/awt/peer/MouseInfoPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/PanelPeer.java b/src/java.desktop/share/classes/java/awt/peer/PanelPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/PanelPeer.java rename to src/java.desktop/share/classes/java/awt/peer/PanelPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/PopupMenuPeer.java b/src/java.desktop/share/classes/java/awt/peer/PopupMenuPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/PopupMenuPeer.java rename to src/java.desktop/share/classes/java/awt/peer/PopupMenuPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/RobotPeer.java b/src/java.desktop/share/classes/java/awt/peer/RobotPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/RobotPeer.java rename to src/java.desktop/share/classes/java/awt/peer/RobotPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/ScrollPanePeer.java b/src/java.desktop/share/classes/java/awt/peer/ScrollPanePeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/ScrollPanePeer.java rename to src/java.desktop/share/classes/java/awt/peer/ScrollPanePeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/ScrollbarPeer.java b/src/java.desktop/share/classes/java/awt/peer/ScrollbarPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/ScrollbarPeer.java rename to src/java.desktop/share/classes/java/awt/peer/ScrollbarPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/SystemTrayPeer.java b/src/java.desktop/share/classes/java/awt/peer/SystemTrayPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/SystemTrayPeer.java rename to src/java.desktop/share/classes/java/awt/peer/SystemTrayPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/TaskbarPeer.java b/src/java.desktop/share/classes/java/awt/peer/TaskbarPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/TaskbarPeer.java rename to src/java.desktop/share/classes/java/awt/peer/TaskbarPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/TextAreaPeer.java b/src/java.desktop/share/classes/java/awt/peer/TextAreaPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/TextAreaPeer.java rename to src/java.desktop/share/classes/java/awt/peer/TextAreaPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/TextComponentPeer.java b/src/java.desktop/share/classes/java/awt/peer/TextComponentPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/TextComponentPeer.java rename to src/java.desktop/share/classes/java/awt/peer/TextComponentPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/TextFieldPeer.java b/src/java.desktop/share/classes/java/awt/peer/TextFieldPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/TextFieldPeer.java rename to src/java.desktop/share/classes/java/awt/peer/TextFieldPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/TrayIconPeer.java b/src/java.desktop/share/classes/java/awt/peer/TrayIconPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/TrayIconPeer.java rename to src/java.desktop/share/classes/java/awt/peer/TrayIconPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/WindowPeer.java b/src/java.desktop/share/classes/java/awt/peer/WindowPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/WindowPeer.java rename to src/java.desktop/share/classes/java/awt/peer/WindowPeer.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/peer/package-info.java b/src/java.desktop/share/classes/java/awt/peer/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/peer/package-info.java rename to src/java.desktop/share/classes/java/awt/peer/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/print/Book.java b/src/java.desktop/share/classes/java/awt/print/Book.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/print/Book.java rename to src/java.desktop/share/classes/java/awt/print/Book.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/print/PageFormat.java b/src/java.desktop/share/classes/java/awt/print/PageFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/print/PageFormat.java rename to src/java.desktop/share/classes/java/awt/print/PageFormat.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/print/Pageable.java b/src/java.desktop/share/classes/java/awt/print/Pageable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/print/Pageable.java rename to src/java.desktop/share/classes/java/awt/print/Pageable.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/print/Paper.java b/src/java.desktop/share/classes/java/awt/print/Paper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/print/Paper.java rename to src/java.desktop/share/classes/java/awt/print/Paper.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/print/Printable.java b/src/java.desktop/share/classes/java/awt/print/Printable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/print/Printable.java rename to src/java.desktop/share/classes/java/awt/print/Printable.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/print/PrinterAbortException.java b/src/java.desktop/share/classes/java/awt/print/PrinterAbortException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/print/PrinterAbortException.java rename to src/java.desktop/share/classes/java/awt/print/PrinterAbortException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/print/PrinterException.java b/src/java.desktop/share/classes/java/awt/print/PrinterException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/print/PrinterException.java rename to src/java.desktop/share/classes/java/awt/print/PrinterException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/print/PrinterGraphics.java b/src/java.desktop/share/classes/java/awt/print/PrinterGraphics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/print/PrinterGraphics.java rename to src/java.desktop/share/classes/java/awt/print/PrinterGraphics.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/print/PrinterIOException.java b/src/java.desktop/share/classes/java/awt/print/PrinterIOException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/print/PrinterIOException.java rename to src/java.desktop/share/classes/java/awt/print/PrinterIOException.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/print/PrinterJob.java b/src/java.desktop/share/classes/java/awt/print/PrinterJob.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/print/PrinterJob.java rename to src/java.desktop/share/classes/java/awt/print/PrinterJob.java diff --git a/jdk/src/java.desktop/share/classes/java/awt/print/package-info.java b/src/java.desktop/share/classes/java/awt/print/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/awt/print/package-info.java rename to src/java.desktop/share/classes/java/awt/print/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/AppletInitializer.java b/src/java.desktop/share/classes/java/beans/AppletInitializer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/AppletInitializer.java rename to src/java.desktop/share/classes/java/beans/AppletInitializer.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/BeanDescriptor.java b/src/java.desktop/share/classes/java/beans/BeanDescriptor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/BeanDescriptor.java rename to src/java.desktop/share/classes/java/beans/BeanDescriptor.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/BeanInfo.java b/src/java.desktop/share/classes/java/beans/BeanInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/BeanInfo.java rename to src/java.desktop/share/classes/java/beans/BeanInfo.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/BeanProperty.java b/src/java.desktop/share/classes/java/beans/BeanProperty.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/BeanProperty.java rename to src/java.desktop/share/classes/java/beans/BeanProperty.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/Beans.java b/src/java.desktop/share/classes/java/beans/Beans.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/Beans.java rename to src/java.desktop/share/classes/java/beans/Beans.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/ChangeListenerMap.java b/src/java.desktop/share/classes/java/beans/ChangeListenerMap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/ChangeListenerMap.java rename to src/java.desktop/share/classes/java/beans/ChangeListenerMap.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/ConstructorProperties.java b/src/java.desktop/share/classes/java/beans/ConstructorProperties.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/ConstructorProperties.java rename to src/java.desktop/share/classes/java/beans/ConstructorProperties.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/Customizer.java b/src/java.desktop/share/classes/java/beans/Customizer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/Customizer.java rename to src/java.desktop/share/classes/java/beans/Customizer.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java b/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java rename to src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/DesignMode.java b/src/java.desktop/share/classes/java/beans/DesignMode.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/DesignMode.java rename to src/java.desktop/share/classes/java/beans/DesignMode.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/Encoder.java b/src/java.desktop/share/classes/java/beans/Encoder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/Encoder.java rename to src/java.desktop/share/classes/java/beans/Encoder.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/EventHandler.java b/src/java.desktop/share/classes/java/beans/EventHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/EventHandler.java rename to src/java.desktop/share/classes/java/beans/EventHandler.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java b/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java rename to src/java.desktop/share/classes/java/beans/EventSetDescriptor.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/ExceptionListener.java b/src/java.desktop/share/classes/java/beans/ExceptionListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/ExceptionListener.java rename to src/java.desktop/share/classes/java/beans/ExceptionListener.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/Expression.java b/src/java.desktop/share/classes/java/beans/Expression.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/Expression.java rename to src/java.desktop/share/classes/java/beans/Expression.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/FeatureDescriptor.java b/src/java.desktop/share/classes/java/beans/FeatureDescriptor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/FeatureDescriptor.java rename to src/java.desktop/share/classes/java/beans/FeatureDescriptor.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java b/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java rename to src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java b/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java rename to src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/IntrospectionException.java b/src/java.desktop/share/classes/java/beans/IntrospectionException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/IntrospectionException.java rename to src/java.desktop/share/classes/java/beans/IntrospectionException.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/Introspector.java b/src/java.desktop/share/classes/java/beans/Introspector.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/Introspector.java rename to src/java.desktop/share/classes/java/beans/Introspector.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/JavaBean.java b/src/java.desktop/share/classes/java/beans/JavaBean.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/JavaBean.java rename to src/java.desktop/share/classes/java/beans/JavaBean.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/MetaData.java b/src/java.desktop/share/classes/java/beans/MetaData.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/MetaData.java rename to src/java.desktop/share/classes/java/beans/MetaData.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/MethodDescriptor.java b/src/java.desktop/share/classes/java/beans/MethodDescriptor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/MethodDescriptor.java rename to src/java.desktop/share/classes/java/beans/MethodDescriptor.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/MethodRef.java b/src/java.desktop/share/classes/java/beans/MethodRef.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/MethodRef.java rename to src/java.desktop/share/classes/java/beans/MethodRef.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/NameGenerator.java b/src/java.desktop/share/classes/java/beans/NameGenerator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/NameGenerator.java rename to src/java.desktop/share/classes/java/beans/NameGenerator.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/ParameterDescriptor.java b/src/java.desktop/share/classes/java/beans/ParameterDescriptor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/ParameterDescriptor.java rename to src/java.desktop/share/classes/java/beans/ParameterDescriptor.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/PersistenceDelegate.java b/src/java.desktop/share/classes/java/beans/PersistenceDelegate.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/PersistenceDelegate.java rename to src/java.desktop/share/classes/java/beans/PersistenceDelegate.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/PropertyChangeEvent.java b/src/java.desktop/share/classes/java/beans/PropertyChangeEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/PropertyChangeEvent.java rename to src/java.desktop/share/classes/java/beans/PropertyChangeEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/PropertyChangeListener.java b/src/java.desktop/share/classes/java/beans/PropertyChangeListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/PropertyChangeListener.java rename to src/java.desktop/share/classes/java/beans/PropertyChangeListener.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/PropertyChangeListenerProxy.java b/src/java.desktop/share/classes/java/beans/PropertyChangeListenerProxy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/PropertyChangeListenerProxy.java rename to src/java.desktop/share/classes/java/beans/PropertyChangeListenerProxy.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java b/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java rename to src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java b/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java rename to src/java.desktop/share/classes/java/beans/PropertyDescriptor.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/PropertyEditor.java b/src/java.desktop/share/classes/java/beans/PropertyEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/PropertyEditor.java rename to src/java.desktop/share/classes/java/beans/PropertyEditor.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java b/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java rename to src/java.desktop/share/classes/java/beans/PropertyEditorManager.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/PropertyEditorSupport.java b/src/java.desktop/share/classes/java/beans/PropertyEditorSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/PropertyEditorSupport.java rename to src/java.desktop/share/classes/java/beans/PropertyEditorSupport.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/PropertyVetoException.java b/src/java.desktop/share/classes/java/beans/PropertyVetoException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/PropertyVetoException.java rename to src/java.desktop/share/classes/java/beans/PropertyVetoException.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java b/src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java rename to src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/Statement.java b/src/java.desktop/share/classes/java/beans/Statement.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/Statement.java rename to src/java.desktop/share/classes/java/beans/Statement.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/ThreadGroupContext.java b/src/java.desktop/share/classes/java/beans/ThreadGroupContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/ThreadGroupContext.java rename to src/java.desktop/share/classes/java/beans/ThreadGroupContext.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/Transient.java b/src/java.desktop/share/classes/java/beans/Transient.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/Transient.java rename to src/java.desktop/share/classes/java/beans/Transient.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/VetoableChangeListener.java b/src/java.desktop/share/classes/java/beans/VetoableChangeListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/VetoableChangeListener.java rename to src/java.desktop/share/classes/java/beans/VetoableChangeListener.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java b/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java rename to src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java b/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java rename to src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/Visibility.java b/src/java.desktop/share/classes/java/beans/Visibility.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/Visibility.java rename to src/java.desktop/share/classes/java/beans/Visibility.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/WeakIdentityMap.java b/src/java.desktop/share/classes/java/beans/WeakIdentityMap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/WeakIdentityMap.java rename to src/java.desktop/share/classes/java/beans/WeakIdentityMap.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/XMLDecoder.java b/src/java.desktop/share/classes/java/beans/XMLDecoder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/XMLDecoder.java rename to src/java.desktop/share/classes/java/beans/XMLDecoder.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/XMLEncoder.java b/src/java.desktop/share/classes/java/beans/XMLEncoder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/XMLEncoder.java rename to src/java.desktop/share/classes/java/beans/XMLEncoder.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java rename to src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/beancontext/package-info.java b/src/java.desktop/share/classes/java/beans/beancontext/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/beancontext/package-info.java rename to src/java.desktop/share/classes/java/beans/beancontext/package-info.java diff --git a/jdk/src/java.desktop/share/classes/java/beans/package-info.java b/src/java.desktop/share/classes/java/beans/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/java/beans/package-info.java rename to src/java.desktop/share/classes/java/beans/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibilityProvider.java b/src/java.desktop/share/classes/javax/accessibility/AccessibilityProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibilityProvider.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibilityProvider.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/Accessible.java b/src/java.desktop/share/classes/javax/accessibility/Accessible.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/Accessible.java rename to src/java.desktop/share/classes/javax/accessibility/Accessible.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleAction.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleAction.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleAction.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleAction.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleAttributeSequence.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleAttributeSequence.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleAttributeSequence.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleAttributeSequence.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleBundle.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleBundle.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleBundle.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleBundle.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleComponent.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleComponent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleComponent.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleComponent.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleContext.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleContext.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleContext.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleEditableText.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleEditableText.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleEditableText.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleEditableText.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedComponent.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedComponent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedComponent.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedComponent.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedTable.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedTable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedTable.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedTable.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedText.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedText.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedText.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleExtendedText.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleHyperlink.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleHyperlink.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleHyperlink.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleHyperlink.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleHypertext.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleHypertext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleHypertext.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleHypertext.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleIcon.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleIcon.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleIcon.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleIcon.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleKeyBinding.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleKeyBinding.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleKeyBinding.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleKeyBinding.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRelation.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleRelation.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRelation.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleRelation.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRelationSet.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleRelationSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRelationSet.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleRelationSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleResourceBundle.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleResourceBundle.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleResourceBundle.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleResourceBundle.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRole.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleRole.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleRole.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleRole.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleSelection.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleSelection.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleSelection.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleSelection.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleState.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleState.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleState.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleState.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleStateSet.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleStateSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleStateSet.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleStateSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleStreamable.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleStreamable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleStreamable.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleStreamable.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleTable.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleTable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleTable.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleTable.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleTableModelChange.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleTableModelChange.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleTableModelChange.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleTableModelChange.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleText.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleText.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleText.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleText.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleTextSequence.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleTextSequence.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleTextSequence.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleTextSequence.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleValue.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleValue.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/AccessibleValue.java rename to src/java.desktop/share/classes/javax/accessibility/AccessibleValue.java diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/package-info.java b/src/java.desktop/share/classes/javax/accessibility/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/accessibility/package-info.java rename to src/java.desktop/share/classes/javax/accessibility/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/IIOException.java b/src/java.desktop/share/classes/javax/imageio/IIOException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/IIOException.java rename to src/java.desktop/share/classes/javax/imageio/IIOException.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/IIOImage.java b/src/java.desktop/share/classes/javax/imageio/IIOImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/IIOImage.java rename to src/java.desktop/share/classes/javax/imageio/IIOImage.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/IIOParam.java b/src/java.desktop/share/classes/javax/imageio/IIOParam.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/IIOParam.java rename to src/java.desktop/share/classes/javax/imageio/IIOParam.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/IIOParamController.java b/src/java.desktop/share/classes/javax/imageio/IIOParamController.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/IIOParamController.java rename to src/java.desktop/share/classes/javax/imageio/IIOParamController.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/ImageIO.java b/src/java.desktop/share/classes/javax/imageio/ImageIO.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/ImageIO.java rename to src/java.desktop/share/classes/javax/imageio/ImageIO.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/ImageReadParam.java b/src/java.desktop/share/classes/javax/imageio/ImageReadParam.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/ImageReadParam.java rename to src/java.desktop/share/classes/javax/imageio/ImageReadParam.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/ImageReader.java b/src/java.desktop/share/classes/javax/imageio/ImageReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/ImageReader.java rename to src/java.desktop/share/classes/javax/imageio/ImageReader.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/ImageTranscoder.java b/src/java.desktop/share/classes/javax/imageio/ImageTranscoder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/ImageTranscoder.java rename to src/java.desktop/share/classes/javax/imageio/ImageTranscoder.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java b/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java rename to src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java b/src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java rename to src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/ImageWriter.java b/src/java.desktop/share/classes/javax/imageio/ImageWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/ImageWriter.java rename to src/java.desktop/share/classes/javax/imageio/ImageWriter.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/event/IIOReadProgressListener.java b/src/java.desktop/share/classes/javax/imageio/event/IIOReadProgressListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/event/IIOReadProgressListener.java rename to src/java.desktop/share/classes/javax/imageio/event/IIOReadProgressListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/event/IIOReadUpdateListener.java b/src/java.desktop/share/classes/javax/imageio/event/IIOReadUpdateListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/event/IIOReadUpdateListener.java rename to src/java.desktop/share/classes/javax/imageio/event/IIOReadUpdateListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/event/IIOReadWarningListener.java b/src/java.desktop/share/classes/javax/imageio/event/IIOReadWarningListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/event/IIOReadWarningListener.java rename to src/java.desktop/share/classes/javax/imageio/event/IIOReadWarningListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/event/IIOWriteProgressListener.java b/src/java.desktop/share/classes/javax/imageio/event/IIOWriteProgressListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/event/IIOWriteProgressListener.java rename to src/java.desktop/share/classes/javax/imageio/event/IIOWriteProgressListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/event/IIOWriteWarningListener.java b/src/java.desktop/share/classes/javax/imageio/event/IIOWriteWarningListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/event/IIOWriteWarningListener.java rename to src/java.desktop/share/classes/javax/imageio/event/IIOWriteWarningListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/event/package-info.java b/src/java.desktop/share/classes/javax/imageio/event/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/event/package-info.java rename to src/java.desktop/share/classes/javax/imageio/event/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java rename to src/java.desktop/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java rename to src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataController.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataController.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataController.java rename to src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataController.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormat.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormat.java rename to src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormat.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java rename to src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataNode.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataNode.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataNode.java rename to src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataNode.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html rename to src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html rename to src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html rename to src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html rename to src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html rename to src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html rename to src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html rename to src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/package-info.java b/src/java.desktop/share/classes/javax/imageio/metadata/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/metadata/package-info.java rename to src/java.desktop/share/classes/javax/imageio/metadata/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/package-info.java b/src/java.desktop/share/classes/javax/imageio/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/package-info.java rename to src/java.desktop/share/classes/javax/imageio/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java b/src/java.desktop/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java rename to src/java.desktop/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/bmp/package-info.java b/src/java.desktop/share/classes/javax/imageio/plugins/bmp/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/bmp/package-info.java rename to src/java.desktop/share/classes/javax/imageio/plugins/bmp/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java b/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java rename to src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java b/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java rename to src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java b/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java rename to src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGQTable.java b/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGQTable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGQTable.java rename to src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGQTable.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/package-info.java b/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/package-info.java rename to src/java.desktop/share/classes/javax/imageio/plugins/jpeg/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifGPSTagSet.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifGPSTagSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifGPSTagSet.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifGPSTagSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifInteroperabilityTagSet.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifInteroperabilityTagSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifInteroperabilityTagSet.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifInteroperabilityTagSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifParentTIFFTagSet.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifParentTIFFTagSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifParentTIFFTagSet.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifParentTIFFTagSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifTIFFTagSet.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifTIFFTagSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifTIFFTagSet.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifTIFFTagSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFDirectory.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFDirectory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFDirectory.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFDirectory.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTag.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTag.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTag.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTag.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTagSet.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTagSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTagSet.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTagSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/package-info.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/package-info.java rename to src/java.desktop/share/classes/javax/imageio/plugins/tiff/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/DigraphNode.java b/src/java.desktop/share/classes/javax/imageio/spi/DigraphNode.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/DigraphNode.java rename to src/java.desktop/share/classes/javax/imageio/spi/DigraphNode.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java b/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java rename to src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/IIOServiceProvider.java b/src/java.desktop/share/classes/javax/imageio/spi/IIOServiceProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/IIOServiceProvider.java rename to src/java.desktop/share/classes/javax/imageio/spi/IIOServiceProvider.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageInputStreamSpi.java b/src/java.desktop/share/classes/javax/imageio/spi/ImageInputStreamSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageInputStreamSpi.java rename to src/java.desktop/share/classes/javax/imageio/spi/ImageInputStreamSpi.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java b/src/java.desktop/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java rename to src/java.desktop/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderSpi.java b/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderSpi.java rename to src/java.desktop/share/classes/javax/imageio/spi/ImageReaderSpi.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java b/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java rename to src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageTranscoderSpi.java b/src/java.desktop/share/classes/javax/imageio/spi/ImageTranscoderSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageTranscoderSpi.java rename to src/java.desktop/share/classes/javax/imageio/spi/ImageTranscoderSpi.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageWriterSpi.java b/src/java.desktop/share/classes/javax/imageio/spi/ImageWriterSpi.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageWriterSpi.java rename to src/java.desktop/share/classes/javax/imageio/spi/ImageWriterSpi.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/PartiallyOrderedSet.java b/src/java.desktop/share/classes/javax/imageio/spi/PartiallyOrderedSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/PartiallyOrderedSet.java rename to src/java.desktop/share/classes/javax/imageio/spi/PartiallyOrderedSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/RegisterableService.java b/src/java.desktop/share/classes/javax/imageio/spi/RegisterableService.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/RegisterableService.java rename to src/java.desktop/share/classes/javax/imageio/spi/RegisterableService.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java b/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java rename to src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/package-info.java b/src/java.desktop/share/classes/javax/imageio/spi/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/spi/package-info.java rename to src/java.desktop/share/classes/javax/imageio/spi/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java rename to src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java rename to src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java rename to src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java rename to src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/IIOByteBuffer.java b/src/java.desktop/share/classes/javax/imageio/stream/IIOByteBuffer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/IIOByteBuffer.java rename to src/java.desktop/share/classes/javax/imageio/stream/IIOByteBuffer.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java rename to src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java b/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java rename to src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java rename to src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java b/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java rename to src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/MemoryCache.java b/src/java.desktop/share/classes/javax/imageio/stream/MemoryCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/MemoryCache.java rename to src/java.desktop/share/classes/javax/imageio/stream/MemoryCache.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java rename to src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java rename to src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/stream/package-info.java b/src/java.desktop/share/classes/javax/imageio/stream/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/imageio/stream/package-info.java rename to src/java.desktop/share/classes/javax/imageio/stream/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/AttributeException.java b/src/java.desktop/share/classes/javax/print/AttributeException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/AttributeException.java rename to src/java.desktop/share/classes/javax/print/AttributeException.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/CancelablePrintJob.java b/src/java.desktop/share/classes/javax/print/CancelablePrintJob.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/CancelablePrintJob.java rename to src/java.desktop/share/classes/javax/print/CancelablePrintJob.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/Doc.java b/src/java.desktop/share/classes/javax/print/Doc.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/Doc.java rename to src/java.desktop/share/classes/javax/print/Doc.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/DocFlavor.java b/src/java.desktop/share/classes/javax/print/DocFlavor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/DocFlavor.java rename to src/java.desktop/share/classes/javax/print/DocFlavor.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/DocPrintJob.java b/src/java.desktop/share/classes/javax/print/DocPrintJob.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/DocPrintJob.java rename to src/java.desktop/share/classes/javax/print/DocPrintJob.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/FlavorException.java b/src/java.desktop/share/classes/javax/print/FlavorException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/FlavorException.java rename to src/java.desktop/share/classes/javax/print/FlavorException.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/MimeType.java b/src/java.desktop/share/classes/javax/print/MimeType.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/MimeType.java rename to src/java.desktop/share/classes/javax/print/MimeType.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/MultiDoc.java b/src/java.desktop/share/classes/javax/print/MultiDoc.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/MultiDoc.java rename to src/java.desktop/share/classes/javax/print/MultiDoc.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/MultiDocPrintJob.java b/src/java.desktop/share/classes/javax/print/MultiDocPrintJob.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/MultiDocPrintJob.java rename to src/java.desktop/share/classes/javax/print/MultiDocPrintJob.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/MultiDocPrintService.java b/src/java.desktop/share/classes/javax/print/MultiDocPrintService.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/MultiDocPrintService.java rename to src/java.desktop/share/classes/javax/print/MultiDocPrintService.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/PrintException.java b/src/java.desktop/share/classes/javax/print/PrintException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/PrintException.java rename to src/java.desktop/share/classes/javax/print/PrintException.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/PrintService.java b/src/java.desktop/share/classes/javax/print/PrintService.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/PrintService.java rename to src/java.desktop/share/classes/javax/print/PrintService.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java b/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java rename to src/java.desktop/share/classes/javax/print/PrintServiceLookup.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/ServiceUI.java b/src/java.desktop/share/classes/javax/print/ServiceUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/ServiceUI.java rename to src/java.desktop/share/classes/javax/print/ServiceUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/ServiceUIFactory.java b/src/java.desktop/share/classes/javax/print/ServiceUIFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/ServiceUIFactory.java rename to src/java.desktop/share/classes/javax/print/ServiceUIFactory.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/SimpleDoc.java b/src/java.desktop/share/classes/javax/print/SimpleDoc.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/SimpleDoc.java rename to src/java.desktop/share/classes/javax/print/SimpleDoc.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/StreamPrintService.java b/src/java.desktop/share/classes/javax/print/StreamPrintService.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/StreamPrintService.java rename to src/java.desktop/share/classes/javax/print/StreamPrintService.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java b/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java rename to src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/URIException.java b/src/java.desktop/share/classes/javax/print/URIException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/URIException.java rename to src/java.desktop/share/classes/javax/print/URIException.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/Attribute.java b/src/java.desktop/share/classes/javax/print/attribute/Attribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/Attribute.java rename to src/java.desktop/share/classes/javax/print/attribute/Attribute.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/AttributeSet.java b/src/java.desktop/share/classes/javax/print/attribute/AttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/AttributeSet.java rename to src/java.desktop/share/classes/javax/print/attribute/AttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/AttributeSetUtilities.java b/src/java.desktop/share/classes/javax/print/attribute/AttributeSetUtilities.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/AttributeSetUtilities.java rename to src/java.desktop/share/classes/javax/print/attribute/AttributeSetUtilities.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/DateTimeSyntax.java b/src/java.desktop/share/classes/javax/print/attribute/DateTimeSyntax.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/DateTimeSyntax.java rename to src/java.desktop/share/classes/javax/print/attribute/DateTimeSyntax.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/DocAttribute.java b/src/java.desktop/share/classes/javax/print/attribute/DocAttribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/DocAttribute.java rename to src/java.desktop/share/classes/javax/print/attribute/DocAttribute.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/DocAttributeSet.java b/src/java.desktop/share/classes/javax/print/attribute/DocAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/DocAttributeSet.java rename to src/java.desktop/share/classes/javax/print/attribute/DocAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/EnumSyntax.java b/src/java.desktop/share/classes/javax/print/attribute/EnumSyntax.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/EnumSyntax.java rename to src/java.desktop/share/classes/javax/print/attribute/EnumSyntax.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/HashAttributeSet.java b/src/java.desktop/share/classes/javax/print/attribute/HashAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/HashAttributeSet.java rename to src/java.desktop/share/classes/javax/print/attribute/HashAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/HashDocAttributeSet.java b/src/java.desktop/share/classes/javax/print/attribute/HashDocAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/HashDocAttributeSet.java rename to src/java.desktop/share/classes/javax/print/attribute/HashDocAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java b/src/java.desktop/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java rename to src/java.desktop/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/HashPrintRequestAttributeSet.java b/src/java.desktop/share/classes/javax/print/attribute/HashPrintRequestAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/HashPrintRequestAttributeSet.java rename to src/java.desktop/share/classes/javax/print/attribute/HashPrintRequestAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/HashPrintServiceAttributeSet.java b/src/java.desktop/share/classes/javax/print/attribute/HashPrintServiceAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/HashPrintServiceAttributeSet.java rename to src/java.desktop/share/classes/javax/print/attribute/HashPrintServiceAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/IntegerSyntax.java b/src/java.desktop/share/classes/javax/print/attribute/IntegerSyntax.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/IntegerSyntax.java rename to src/java.desktop/share/classes/javax/print/attribute/IntegerSyntax.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/PrintJobAttribute.java b/src/java.desktop/share/classes/javax/print/attribute/PrintJobAttribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/PrintJobAttribute.java rename to src/java.desktop/share/classes/javax/print/attribute/PrintJobAttribute.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/PrintJobAttributeSet.java b/src/java.desktop/share/classes/javax/print/attribute/PrintJobAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/PrintJobAttributeSet.java rename to src/java.desktop/share/classes/javax/print/attribute/PrintJobAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/PrintRequestAttribute.java b/src/java.desktop/share/classes/javax/print/attribute/PrintRequestAttribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/PrintRequestAttribute.java rename to src/java.desktop/share/classes/javax/print/attribute/PrintRequestAttribute.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/PrintRequestAttributeSet.java b/src/java.desktop/share/classes/javax/print/attribute/PrintRequestAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/PrintRequestAttributeSet.java rename to src/java.desktop/share/classes/javax/print/attribute/PrintRequestAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/PrintServiceAttribute.java b/src/java.desktop/share/classes/javax/print/attribute/PrintServiceAttribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/PrintServiceAttribute.java rename to src/java.desktop/share/classes/javax/print/attribute/PrintServiceAttribute.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/PrintServiceAttributeSet.java b/src/java.desktop/share/classes/javax/print/attribute/PrintServiceAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/PrintServiceAttributeSet.java rename to src/java.desktop/share/classes/javax/print/attribute/PrintServiceAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/ResolutionSyntax.java b/src/java.desktop/share/classes/javax/print/attribute/ResolutionSyntax.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/ResolutionSyntax.java rename to src/java.desktop/share/classes/javax/print/attribute/ResolutionSyntax.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/SetOfIntegerSyntax.java b/src/java.desktop/share/classes/javax/print/attribute/SetOfIntegerSyntax.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/SetOfIntegerSyntax.java rename to src/java.desktop/share/classes/javax/print/attribute/SetOfIntegerSyntax.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/Size2DSyntax.java b/src/java.desktop/share/classes/javax/print/attribute/Size2DSyntax.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/Size2DSyntax.java rename to src/java.desktop/share/classes/javax/print/attribute/Size2DSyntax.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/SupportedValuesAttribute.java b/src/java.desktop/share/classes/javax/print/attribute/SupportedValuesAttribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/SupportedValuesAttribute.java rename to src/java.desktop/share/classes/javax/print/attribute/SupportedValuesAttribute.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/TextSyntax.java b/src/java.desktop/share/classes/javax/print/attribute/TextSyntax.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/TextSyntax.java rename to src/java.desktop/share/classes/javax/print/attribute/TextSyntax.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/URISyntax.java b/src/java.desktop/share/classes/javax/print/attribute/URISyntax.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/URISyntax.java rename to src/java.desktop/share/classes/javax/print/attribute/URISyntax.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/UnmodifiableSetException.java b/src/java.desktop/share/classes/javax/print/attribute/UnmodifiableSetException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/UnmodifiableSetException.java rename to src/java.desktop/share/classes/javax/print/attribute/UnmodifiableSetException.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/package-info.java b/src/java.desktop/share/classes/javax/print/attribute/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/package-info.java rename to src/java.desktop/share/classes/javax/print/attribute/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Chromaticity.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Chromaticity.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Chromaticity.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/Chromaticity.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/ColorSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/ColorSupported.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/ColorSupported.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/ColorSupported.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Compression.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Compression.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Compression.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/Compression.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Copies.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Copies.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Copies.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/Copies.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/CopiesSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/CopiesSupported.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/CopiesSupported.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/CopiesSupported.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java b/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java b/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java b/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Destination.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Destination.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Destination.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/Destination.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DialogTypeSelection.java b/src/java.desktop/share/classes/javax/print/attribute/standard/DialogTypeSelection.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DialogTypeSelection.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/DialogTypeSelection.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DocumentName.java b/src/java.desktop/share/classes/javax/print/attribute/standard/DocumentName.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/DocumentName.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/DocumentName.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Fidelity.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Fidelity.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Fidelity.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/Fidelity.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobHoldUntil.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobHoldUntil.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobHoldUntil.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobHoldUntil.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressions.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressions.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressions.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressions.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctets.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctets.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctets.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctets.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheets.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheets.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheets.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheets.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobName.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobName.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobName.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobName.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobPriority.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobPriority.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobPriority.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobPriority.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobPrioritySupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobPrioritySupported.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobPrioritySupported.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobPrioritySupported.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobSheets.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobSheets.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobSheets.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobSheets.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobState.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobState.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobState.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobState.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReasons.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReasons.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReasons.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReasons.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Media.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Media.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Media.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/Media.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaName.java b/src/java.desktop/share/classes/javax/print/attribute/standard/MediaName.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaName.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/MediaName.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaPrintableArea.java b/src/java.desktop/share/classes/javax/print/attribute/standard/MediaPrintableArea.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaPrintableArea.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/MediaPrintableArea.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java b/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSizeName.java b/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSizeName.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSizeName.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/MediaSizeName.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaTray.java b/src/java.desktop/share/classes/javax/print/attribute/standard/MediaTray.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MediaTray.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/MediaTray.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java b/src/java.desktop/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberOfDocuments.java b/src/java.desktop/share/classes/javax/print/attribute/standard/NumberOfDocuments.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberOfDocuments.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/NumberOfDocuments.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberOfInterveningJobs.java b/src/java.desktop/share/classes/javax/print/attribute/standard/NumberOfInterveningJobs.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberOfInterveningJobs.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/NumberOfInterveningJobs.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberUp.java b/src/java.desktop/share/classes/javax/print/attribute/standard/NumberUp.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberUp.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/NumberUp.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberUpSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/NumberUpSupported.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/NumberUpSupported.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/NumberUpSupported.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/OrientationRequested.java b/src/java.desktop/share/classes/javax/print/attribute/standard/OrientationRequested.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/OrientationRequested.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/OrientationRequested.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/OutputDeviceAssigned.java b/src/java.desktop/share/classes/javax/print/attribute/standard/OutputDeviceAssigned.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/OutputDeviceAssigned.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/OutputDeviceAssigned.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PageRanges.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PageRanges.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PageRanges.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PageRanges.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinute.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinute.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinute.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinuteColor.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinuteColor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinuteColor.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinuteColor.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PresentationDirection.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PresentationDirection.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PresentationDirection.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PresentationDirection.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrintQuality.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrintQuality.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrintQuality.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrintQuality.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterInfo.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterInfo.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterInfo.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterIsAcceptingJobs.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterIsAcceptingJobs.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterIsAcceptingJobs.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterIsAcceptingJobs.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterLocation.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterLocation.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterLocation.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterLocation.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMessageFromOperator.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMessageFromOperator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMessageFromOperator.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMessageFromOperator.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfo.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfo.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfo.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterName.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterName.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterName.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterName.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterResolution.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterResolution.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterResolution.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterResolution.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterState.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterState.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterState.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterState.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterStateReason.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterStateReason.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterStateReason.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterStateReason.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterStateReasons.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterStateReasons.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterStateReasons.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterStateReasons.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterURI.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterURI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterURI.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/PrinterURI.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/QueuedJobCount.java b/src/java.desktop/share/classes/javax/print/attribute/standard/QueuedJobCount.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/QueuedJobCount.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/QueuedJobCount.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/RequestingUserName.java b/src/java.desktop/share/classes/javax/print/attribute/standard/RequestingUserName.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/RequestingUserName.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/RequestingUserName.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Severity.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Severity.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Severity.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/Severity.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/SheetCollate.java b/src/java.desktop/share/classes/javax/print/attribute/standard/SheetCollate.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/SheetCollate.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/SheetCollate.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Sides.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Sides.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/Sides.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/Sides.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/package-info.java b/src/java.desktop/share/classes/javax/print/attribute/standard/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/attribute/standard/package-info.java rename to src/java.desktop/share/classes/javax/print/attribute/standard/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/event/PrintEvent.java b/src/java.desktop/share/classes/javax/print/event/PrintEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/event/PrintEvent.java rename to src/java.desktop/share/classes/javax/print/event/PrintEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/event/PrintJobAdapter.java b/src/java.desktop/share/classes/javax/print/event/PrintJobAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/event/PrintJobAdapter.java rename to src/java.desktop/share/classes/javax/print/event/PrintJobAdapter.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/event/PrintJobAttributeEvent.java b/src/java.desktop/share/classes/javax/print/event/PrintJobAttributeEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/event/PrintJobAttributeEvent.java rename to src/java.desktop/share/classes/javax/print/event/PrintJobAttributeEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/event/PrintJobAttributeListener.java b/src/java.desktop/share/classes/javax/print/event/PrintJobAttributeListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/event/PrintJobAttributeListener.java rename to src/java.desktop/share/classes/javax/print/event/PrintJobAttributeListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/event/PrintJobEvent.java b/src/java.desktop/share/classes/javax/print/event/PrintJobEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/event/PrintJobEvent.java rename to src/java.desktop/share/classes/javax/print/event/PrintJobEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/event/PrintJobListener.java b/src/java.desktop/share/classes/javax/print/event/PrintJobListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/event/PrintJobListener.java rename to src/java.desktop/share/classes/javax/print/event/PrintJobListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/event/PrintServiceAttributeEvent.java b/src/java.desktop/share/classes/javax/print/event/PrintServiceAttributeEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/event/PrintServiceAttributeEvent.java rename to src/java.desktop/share/classes/javax/print/event/PrintServiceAttributeEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/event/PrintServiceAttributeListener.java b/src/java.desktop/share/classes/javax/print/event/PrintServiceAttributeListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/event/PrintServiceAttributeListener.java rename to src/java.desktop/share/classes/javax/print/event/PrintServiceAttributeListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/event/package-info.java b/src/java.desktop/share/classes/javax/print/event/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/event/package-info.java rename to src/java.desktop/share/classes/javax/print/event/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/print/package-info.java b/src/java.desktop/share/classes/javax/print/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/print/package-info.java rename to src/java.desktop/share/classes/javax/print/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/ControllerEventListener.java b/src/java.desktop/share/classes/javax/sound/midi/ControllerEventListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/ControllerEventListener.java rename to src/java.desktop/share/classes/javax/sound/midi/ControllerEventListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Instrument.java b/src/java.desktop/share/classes/javax/sound/midi/Instrument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/Instrument.java rename to src/java.desktop/share/classes/javax/sound/midi/Instrument.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/InvalidMidiDataException.java b/src/java.desktop/share/classes/javax/sound/midi/InvalidMidiDataException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/InvalidMidiDataException.java rename to src/java.desktop/share/classes/javax/sound/midi/InvalidMidiDataException.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaEventListener.java b/src/java.desktop/share/classes/javax/sound/midi/MetaEventListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/MetaEventListener.java rename to src/java.desktop/share/classes/javax/sound/midi/MetaEventListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java b/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java rename to src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiChannel.java b/src/java.desktop/share/classes/javax/sound/midi/MidiChannel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/MidiChannel.java rename to src/java.desktop/share/classes/javax/sound/midi/MidiChannel.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java b/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java rename to src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceReceiver.java b/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceReceiver.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceReceiver.java rename to src/java.desktop/share/classes/javax/sound/midi/MidiDeviceReceiver.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceTransmitter.java b/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceTransmitter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceTransmitter.java rename to src/java.desktop/share/classes/javax/sound/midi/MidiDeviceTransmitter.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiEvent.java b/src/java.desktop/share/classes/javax/sound/midi/MidiEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/MidiEvent.java rename to src/java.desktop/share/classes/javax/sound/midi/MidiEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiFileFormat.java b/src/java.desktop/share/classes/javax/sound/midi/MidiFileFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/MidiFileFormat.java rename to src/java.desktop/share/classes/javax/sound/midi/MidiFileFormat.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java b/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java rename to src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java b/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java rename to src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiUnavailableException.java b/src/java.desktop/share/classes/javax/sound/midi/MidiUnavailableException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/MidiUnavailableException.java rename to src/java.desktop/share/classes/javax/sound/midi/MidiUnavailableException.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Patch.java b/src/java.desktop/share/classes/javax/sound/midi/Patch.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/Patch.java rename to src/java.desktop/share/classes/javax/sound/midi/Patch.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Receiver.java b/src/java.desktop/share/classes/javax/sound/midi/Receiver.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/Receiver.java rename to src/java.desktop/share/classes/javax/sound/midi/Receiver.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequence.java b/src/java.desktop/share/classes/javax/sound/midi/Sequence.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/Sequence.java rename to src/java.desktop/share/classes/javax/sound/midi/Sequence.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java b/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java rename to src/java.desktop/share/classes/javax/sound/midi/Sequencer.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java b/src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java rename to src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Soundbank.java b/src/java.desktop/share/classes/javax/sound/midi/Soundbank.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/Soundbank.java rename to src/java.desktop/share/classes/javax/sound/midi/Soundbank.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/SoundbankResource.java b/src/java.desktop/share/classes/javax/sound/midi/SoundbankResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/SoundbankResource.java rename to src/java.desktop/share/classes/javax/sound/midi/SoundbankResource.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java b/src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java rename to src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java b/src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java rename to src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Track.java b/src/java.desktop/share/classes/javax/sound/midi/Track.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/Track.java rename to src/java.desktop/share/classes/javax/sound/midi/Track.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Transmitter.java b/src/java.desktop/share/classes/javax/sound/midi/Transmitter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/Transmitter.java rename to src/java.desktop/share/classes/javax/sound/midi/Transmitter.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/VoiceStatus.java b/src/java.desktop/share/classes/javax/sound/midi/VoiceStatus.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/VoiceStatus.java rename to src/java.desktop/share/classes/javax/sound/midi/VoiceStatus.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/package-info.java b/src/java.desktop/share/classes/javax/sound/midi/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/package-info.java rename to src/java.desktop/share/classes/javax/sound/midi/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java b/src/java.desktop/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java rename to src/java.desktop/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java b/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java rename to src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileWriter.java b/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileWriter.java rename to src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileWriter.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java b/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java rename to src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/package-info.java b/src/java.desktop/share/classes/javax/sound/midi/spi/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/midi/spi/package-info.java rename to src/java.desktop/share/classes/javax/sound/midi/spi/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioFileFormat.java b/src/java.desktop/share/classes/javax/sound/sampled/AudioFileFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioFileFormat.java rename to src/java.desktop/share/classes/javax/sound/sampled/AudioFileFormat.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioFormat.java b/src/java.desktop/share/classes/javax/sound/sampled/AudioFormat.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioFormat.java rename to src/java.desktop/share/classes/javax/sound/sampled/AudioFormat.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioInputStream.java b/src/java.desktop/share/classes/javax/sound/sampled/AudioInputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioInputStream.java rename to src/java.desktop/share/classes/javax/sound/sampled/AudioInputStream.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioPermission.java b/src/java.desktop/share/classes/javax/sound/sampled/AudioPermission.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioPermission.java rename to src/java.desktop/share/classes/javax/sound/sampled/AudioPermission.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java b/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java rename to src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/BooleanControl.java b/src/java.desktop/share/classes/javax/sound/sampled/BooleanControl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/BooleanControl.java rename to src/java.desktop/share/classes/javax/sound/sampled/BooleanControl.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/Clip.java b/src/java.desktop/share/classes/javax/sound/sampled/Clip.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/Clip.java rename to src/java.desktop/share/classes/javax/sound/sampled/Clip.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/CompoundControl.java b/src/java.desktop/share/classes/javax/sound/sampled/CompoundControl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/CompoundControl.java rename to src/java.desktop/share/classes/javax/sound/sampled/CompoundControl.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/Control.java b/src/java.desktop/share/classes/javax/sound/sampled/Control.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/Control.java rename to src/java.desktop/share/classes/javax/sound/sampled/Control.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/DataLine.java b/src/java.desktop/share/classes/javax/sound/sampled/DataLine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/DataLine.java rename to src/java.desktop/share/classes/javax/sound/sampled/DataLine.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/EnumControl.java b/src/java.desktop/share/classes/javax/sound/sampled/EnumControl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/EnumControl.java rename to src/java.desktop/share/classes/javax/sound/sampled/EnumControl.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/FloatControl.java b/src/java.desktop/share/classes/javax/sound/sampled/FloatControl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/FloatControl.java rename to src/java.desktop/share/classes/javax/sound/sampled/FloatControl.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/Line.java b/src/java.desktop/share/classes/javax/sound/sampled/Line.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/Line.java rename to src/java.desktop/share/classes/javax/sound/sampled/Line.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/LineEvent.java b/src/java.desktop/share/classes/javax/sound/sampled/LineEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/LineEvent.java rename to src/java.desktop/share/classes/javax/sound/sampled/LineEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/LineListener.java b/src/java.desktop/share/classes/javax/sound/sampled/LineListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/LineListener.java rename to src/java.desktop/share/classes/javax/sound/sampled/LineListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/LineUnavailableException.java b/src/java.desktop/share/classes/javax/sound/sampled/LineUnavailableException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/LineUnavailableException.java rename to src/java.desktop/share/classes/javax/sound/sampled/LineUnavailableException.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/Mixer.java b/src/java.desktop/share/classes/javax/sound/sampled/Mixer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/Mixer.java rename to src/java.desktop/share/classes/javax/sound/sampled/Mixer.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/Port.java b/src/java.desktop/share/classes/javax/sound/sampled/Port.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/Port.java rename to src/java.desktop/share/classes/javax/sound/sampled/Port.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/ReverbType.java b/src/java.desktop/share/classes/javax/sound/sampled/ReverbType.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/ReverbType.java rename to src/java.desktop/share/classes/javax/sound/sampled/ReverbType.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/SourceDataLine.java b/src/java.desktop/share/classes/javax/sound/sampled/SourceDataLine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/SourceDataLine.java rename to src/java.desktop/share/classes/javax/sound/sampled/SourceDataLine.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/TargetDataLine.java b/src/java.desktop/share/classes/javax/sound/sampled/TargetDataLine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/TargetDataLine.java rename to src/java.desktop/share/classes/javax/sound/sampled/TargetDataLine.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java b/src/java.desktop/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java rename to src/java.desktop/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/package-info.java b/src/java.desktop/share/classes/javax/sound/sampled/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/package-info.java rename to src/java.desktop/share/classes/javax/sound/sampled/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java b/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java rename to src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java b/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java rename to src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java b/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java rename to src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/MixerProvider.java b/src/java.desktop/share/classes/javax/sound/sampled/spi/MixerProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/MixerProvider.java rename to src/java.desktop/share/classes/javax/sound/sampled/spi/MixerProvider.java diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/package-info.java b/src/java.desktop/share/classes/javax/sound/sampled/spi/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/package-info.java rename to src/java.desktop/share/classes/javax/sound/sampled/spi/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/AbstractAction.java b/src/java.desktop/share/classes/javax/swing/AbstractAction.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/AbstractAction.java rename to src/java.desktop/share/classes/javax/swing/AbstractAction.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/AbstractButton.java b/src/java.desktop/share/classes/javax/swing/AbstractButton.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/AbstractButton.java rename to src/java.desktop/share/classes/javax/swing/AbstractButton.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java b/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java rename to src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/AbstractListModel.java b/src/java.desktop/share/classes/javax/swing/AbstractListModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/AbstractListModel.java rename to src/java.desktop/share/classes/javax/swing/AbstractListModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/AbstractSpinnerModel.java b/src/java.desktop/share/classes/javax/swing/AbstractSpinnerModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/AbstractSpinnerModel.java rename to src/java.desktop/share/classes/javax/swing/AbstractSpinnerModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/Action.java b/src/java.desktop/share/classes/javax/swing/Action.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/Action.java rename to src/java.desktop/share/classes/javax/swing/Action.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ActionMap.java b/src/java.desktop/share/classes/javax/swing/ActionMap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ActionMap.java rename to src/java.desktop/share/classes/javax/swing/ActionMap.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ActionPropertyChangeListener.java b/src/java.desktop/share/classes/javax/swing/ActionPropertyChangeListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ActionPropertyChangeListener.java rename to src/java.desktop/share/classes/javax/swing/ActionPropertyChangeListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/AncestorNotifier.java b/src/java.desktop/share/classes/javax/swing/AncestorNotifier.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/AncestorNotifier.java rename to src/java.desktop/share/classes/javax/swing/AncestorNotifier.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ArrayTable.java b/src/java.desktop/share/classes/javax/swing/ArrayTable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ArrayTable.java rename to src/java.desktop/share/classes/javax/swing/ArrayTable.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/Autoscroller.java b/src/java.desktop/share/classes/javax/swing/Autoscroller.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/Autoscroller.java rename to src/java.desktop/share/classes/javax/swing/Autoscroller.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/BorderFactory.java b/src/java.desktop/share/classes/javax/swing/BorderFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/BorderFactory.java rename to src/java.desktop/share/classes/javax/swing/BorderFactory.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/BoundedRangeModel.java b/src/java.desktop/share/classes/javax/swing/BoundedRangeModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/BoundedRangeModel.java rename to src/java.desktop/share/classes/javax/swing/BoundedRangeModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/Box.java b/src/java.desktop/share/classes/javax/swing/Box.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/Box.java rename to src/java.desktop/share/classes/javax/swing/Box.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/BoxLayout.java b/src/java.desktop/share/classes/javax/swing/BoxLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/BoxLayout.java rename to src/java.desktop/share/classes/javax/swing/BoxLayout.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java b/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java rename to src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ButtonGroup.java b/src/java.desktop/share/classes/javax/swing/ButtonGroup.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ButtonGroup.java rename to src/java.desktop/share/classes/javax/swing/ButtonGroup.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ButtonModel.java b/src/java.desktop/share/classes/javax/swing/ButtonModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ButtonModel.java rename to src/java.desktop/share/classes/javax/swing/ButtonModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/CellEditor.java b/src/java.desktop/share/classes/javax/swing/CellEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/CellEditor.java rename to src/java.desktop/share/classes/javax/swing/CellEditor.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/CellRendererPane.java b/src/java.desktop/share/classes/javax/swing/CellRendererPane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/CellRendererPane.java rename to src/java.desktop/share/classes/javax/swing/CellRendererPane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ClientPropertyKey.java b/src/java.desktop/share/classes/javax/swing/ClientPropertyKey.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ClientPropertyKey.java rename to src/java.desktop/share/classes/javax/swing/ClientPropertyKey.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ComboBoxEditor.java b/src/java.desktop/share/classes/javax/swing/ComboBoxEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ComboBoxEditor.java rename to src/java.desktop/share/classes/javax/swing/ComboBoxEditor.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ComboBoxModel.java b/src/java.desktop/share/classes/javax/swing/ComboBoxModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ComboBoxModel.java rename to src/java.desktop/share/classes/javax/swing/ComboBoxModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ComponentInputMap.java b/src/java.desktop/share/classes/javax/swing/ComponentInputMap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ComponentInputMap.java rename to src/java.desktop/share/classes/javax/swing/ComponentInputMap.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DebugGraphics.java b/src/java.desktop/share/classes/javax/swing/DebugGraphics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DebugGraphics.java rename to src/java.desktop/share/classes/javax/swing/DebugGraphics.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DebugGraphicsFilter.java b/src/java.desktop/share/classes/javax/swing/DebugGraphicsFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DebugGraphicsFilter.java rename to src/java.desktop/share/classes/javax/swing/DebugGraphicsFilter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DebugGraphicsInfo.java b/src/java.desktop/share/classes/javax/swing/DebugGraphicsInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DebugGraphicsInfo.java rename to src/java.desktop/share/classes/javax/swing/DebugGraphicsInfo.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DebugGraphicsObserver.java b/src/java.desktop/share/classes/javax/swing/DebugGraphicsObserver.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DebugGraphicsObserver.java rename to src/java.desktop/share/classes/javax/swing/DebugGraphicsObserver.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java b/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java rename to src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java b/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java rename to src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java b/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java rename to src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java b/src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java rename to src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java b/src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java rename to src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultFocusManager.java b/src/java.desktop/share/classes/javax/swing/DefaultFocusManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DefaultFocusManager.java rename to src/java.desktop/share/classes/javax/swing/DefaultFocusManager.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java b/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java rename to src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultListModel.java b/src/java.desktop/share/classes/javax/swing/DefaultListModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DefaultListModel.java rename to src/java.desktop/share/classes/javax/swing/DefaultListModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java b/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java rename to src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java b/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java rename to src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java b/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java rename to src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DelegatingDefaultFocusManager.java b/src/java.desktop/share/classes/javax/swing/DelegatingDefaultFocusManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DelegatingDefaultFocusManager.java rename to src/java.desktop/share/classes/javax/swing/DelegatingDefaultFocusManager.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DesktopManager.java b/src/java.desktop/share/classes/javax/swing/DesktopManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DesktopManager.java rename to src/java.desktop/share/classes/javax/swing/DesktopManager.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DropMode.java b/src/java.desktop/share/classes/javax/swing/DropMode.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/DropMode.java rename to src/java.desktop/share/classes/javax/swing/DropMode.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/FocusManager.java b/src/java.desktop/share/classes/javax/swing/FocusManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/FocusManager.java rename to src/java.desktop/share/classes/javax/swing/FocusManager.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/GraphicsWrapper.java b/src/java.desktop/share/classes/javax/swing/GraphicsWrapper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/GraphicsWrapper.java rename to src/java.desktop/share/classes/javax/swing/GraphicsWrapper.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/GrayFilter.java b/src/java.desktop/share/classes/javax/swing/GrayFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/GrayFilter.java rename to src/java.desktop/share/classes/javax/swing/GrayFilter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/GroupLayout.java b/src/java.desktop/share/classes/javax/swing/GroupLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/GroupLayout.java rename to src/java.desktop/share/classes/javax/swing/GroupLayout.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/Icon.java b/src/java.desktop/share/classes/javax/swing/Icon.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/Icon.java rename to src/java.desktop/share/classes/javax/swing/Icon.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ImageIcon.java b/src/java.desktop/share/classes/javax/swing/ImageIcon.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ImageIcon.java rename to src/java.desktop/share/classes/javax/swing/ImageIcon.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/InputMap.java b/src/java.desktop/share/classes/javax/swing/InputMap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/InputMap.java rename to src/java.desktop/share/classes/javax/swing/InputMap.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/InputVerifier.java b/src/java.desktop/share/classes/javax/swing/InputVerifier.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/InputVerifier.java rename to src/java.desktop/share/classes/javax/swing/InputVerifier.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/InternalFrameFocusTraversalPolicy.java b/src/java.desktop/share/classes/javax/swing/InternalFrameFocusTraversalPolicy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/InternalFrameFocusTraversalPolicy.java rename to src/java.desktop/share/classes/javax/swing/InternalFrameFocusTraversalPolicy.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JApplet.java b/src/java.desktop/share/classes/javax/swing/JApplet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JApplet.java rename to src/java.desktop/share/classes/javax/swing/JApplet.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JButton.java b/src/java.desktop/share/classes/javax/swing/JButton.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JButton.java rename to src/java.desktop/share/classes/javax/swing/JButton.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JCheckBox.java b/src/java.desktop/share/classes/javax/swing/JCheckBox.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JCheckBox.java rename to src/java.desktop/share/classes/javax/swing/JCheckBox.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java b/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java rename to src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JColorChooser.java b/src/java.desktop/share/classes/javax/swing/JColorChooser.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JColorChooser.java rename to src/java.desktop/share/classes/javax/swing/JColorChooser.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JComboBox.java b/src/java.desktop/share/classes/javax/swing/JComboBox.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JComboBox.java rename to src/java.desktop/share/classes/javax/swing/JComboBox.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java b/src/java.desktop/share/classes/javax/swing/JComponent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JComponent.java rename to src/java.desktop/share/classes/javax/swing/JComponent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JDesktopPane.java b/src/java.desktop/share/classes/javax/swing/JDesktopPane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JDesktopPane.java rename to src/java.desktop/share/classes/javax/swing/JDesktopPane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JDialog.java b/src/java.desktop/share/classes/javax/swing/JDialog.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JDialog.java rename to src/java.desktop/share/classes/javax/swing/JDialog.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java b/src/java.desktop/share/classes/javax/swing/JEditorPane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java rename to src/java.desktop/share/classes/javax/swing/JEditorPane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JFileChooser.java b/src/java.desktop/share/classes/javax/swing/JFileChooser.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JFileChooser.java rename to src/java.desktop/share/classes/javax/swing/JFileChooser.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java b/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java rename to src/java.desktop/share/classes/javax/swing/JFormattedTextField.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JFrame.java b/src/java.desktop/share/classes/javax/swing/JFrame.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JFrame.java rename to src/java.desktop/share/classes/javax/swing/JFrame.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java rename to src/java.desktop/share/classes/javax/swing/JInternalFrame.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JLabel.java b/src/java.desktop/share/classes/javax/swing/JLabel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JLabel.java rename to src/java.desktop/share/classes/javax/swing/JLabel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JLayer.java b/src/java.desktop/share/classes/javax/swing/JLayer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JLayer.java rename to src/java.desktop/share/classes/javax/swing/JLayer.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JLayeredPane.java b/src/java.desktop/share/classes/javax/swing/JLayeredPane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JLayeredPane.java rename to src/java.desktop/share/classes/javax/swing/JLayeredPane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JList.java b/src/java.desktop/share/classes/javax/swing/JList.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JList.java rename to src/java.desktop/share/classes/javax/swing/JList.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JMenu.java b/src/java.desktop/share/classes/javax/swing/JMenu.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JMenu.java rename to src/java.desktop/share/classes/javax/swing/JMenu.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JMenuBar.java b/src/java.desktop/share/classes/javax/swing/JMenuBar.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JMenuBar.java rename to src/java.desktop/share/classes/javax/swing/JMenuBar.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JMenuItem.java b/src/java.desktop/share/classes/javax/swing/JMenuItem.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JMenuItem.java rename to src/java.desktop/share/classes/javax/swing/JMenuItem.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java b/src/java.desktop/share/classes/javax/swing/JOptionPane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java rename to src/java.desktop/share/classes/javax/swing/JOptionPane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JPanel.java b/src/java.desktop/share/classes/javax/swing/JPanel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JPanel.java rename to src/java.desktop/share/classes/javax/swing/JPanel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JPasswordField.java b/src/java.desktop/share/classes/javax/swing/JPasswordField.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JPasswordField.java rename to src/java.desktop/share/classes/javax/swing/JPasswordField.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JPopupMenu.java b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JPopupMenu.java rename to src/java.desktop/share/classes/javax/swing/JPopupMenu.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JProgressBar.java b/src/java.desktop/share/classes/javax/swing/JProgressBar.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JProgressBar.java rename to src/java.desktop/share/classes/javax/swing/JProgressBar.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JRadioButton.java b/src/java.desktop/share/classes/javax/swing/JRadioButton.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JRadioButton.java rename to src/java.desktop/share/classes/javax/swing/JRadioButton.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java b/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java rename to src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JRootPane.java b/src/java.desktop/share/classes/javax/swing/JRootPane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JRootPane.java rename to src/java.desktop/share/classes/javax/swing/JRootPane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JScrollBar.java b/src/java.desktop/share/classes/javax/swing/JScrollBar.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JScrollBar.java rename to src/java.desktop/share/classes/javax/swing/JScrollBar.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JScrollPane.java b/src/java.desktop/share/classes/javax/swing/JScrollPane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JScrollPane.java rename to src/java.desktop/share/classes/javax/swing/JScrollPane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JSeparator.java b/src/java.desktop/share/classes/javax/swing/JSeparator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JSeparator.java rename to src/java.desktop/share/classes/javax/swing/JSeparator.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JSlider.java b/src/java.desktop/share/classes/javax/swing/JSlider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JSlider.java rename to src/java.desktop/share/classes/javax/swing/JSlider.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JSpinner.java b/src/java.desktop/share/classes/javax/swing/JSpinner.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JSpinner.java rename to src/java.desktop/share/classes/javax/swing/JSpinner.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JSplitPane.java b/src/java.desktop/share/classes/javax/swing/JSplitPane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JSplitPane.java rename to src/java.desktop/share/classes/javax/swing/JSplitPane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JTabbedPane.java b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JTabbedPane.java rename to src/java.desktop/share/classes/javax/swing/JTabbedPane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JTable.java rename to src/java.desktop/share/classes/javax/swing/JTable.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JTextArea.java b/src/java.desktop/share/classes/javax/swing/JTextArea.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JTextArea.java rename to src/java.desktop/share/classes/javax/swing/JTextArea.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JTextField.java b/src/java.desktop/share/classes/javax/swing/JTextField.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JTextField.java rename to src/java.desktop/share/classes/javax/swing/JTextField.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JTextPane.java b/src/java.desktop/share/classes/javax/swing/JTextPane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JTextPane.java rename to src/java.desktop/share/classes/javax/swing/JTextPane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JToggleButton.java b/src/java.desktop/share/classes/javax/swing/JToggleButton.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JToggleButton.java rename to src/java.desktop/share/classes/javax/swing/JToggleButton.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JToolBar.java b/src/java.desktop/share/classes/javax/swing/JToolBar.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JToolBar.java rename to src/java.desktop/share/classes/javax/swing/JToolBar.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JToolTip.java b/src/java.desktop/share/classes/javax/swing/JToolTip.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JToolTip.java rename to src/java.desktop/share/classes/javax/swing/JToolTip.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JTree.java b/src/java.desktop/share/classes/javax/swing/JTree.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JTree.java rename to src/java.desktop/share/classes/javax/swing/JTree.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java b/src/java.desktop/share/classes/javax/swing/JViewport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JViewport.java rename to src/java.desktop/share/classes/javax/swing/JViewport.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JWindow.java b/src/java.desktop/share/classes/javax/swing/JWindow.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/JWindow.java rename to src/java.desktop/share/classes/javax/swing/JWindow.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/KeyStroke.java b/src/java.desktop/share/classes/javax/swing/KeyStroke.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/KeyStroke.java rename to src/java.desktop/share/classes/javax/swing/KeyStroke.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/KeyboardManager.java b/src/java.desktop/share/classes/javax/swing/KeyboardManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/KeyboardManager.java rename to src/java.desktop/share/classes/javax/swing/KeyboardManager.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/LayoutComparator.java b/src/java.desktop/share/classes/javax/swing/LayoutComparator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/LayoutComparator.java rename to src/java.desktop/share/classes/javax/swing/LayoutComparator.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/LayoutFocusTraversalPolicy.java b/src/java.desktop/share/classes/javax/swing/LayoutFocusTraversalPolicy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/LayoutFocusTraversalPolicy.java rename to src/java.desktop/share/classes/javax/swing/LayoutFocusTraversalPolicy.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/LayoutStyle.java b/src/java.desktop/share/classes/javax/swing/LayoutStyle.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/LayoutStyle.java rename to src/java.desktop/share/classes/javax/swing/LayoutStyle.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java b/src/java.desktop/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java rename to src/java.desktop/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ListCellRenderer.java b/src/java.desktop/share/classes/javax/swing/ListCellRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ListCellRenderer.java rename to src/java.desktop/share/classes/javax/swing/ListCellRenderer.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ListModel.java b/src/java.desktop/share/classes/javax/swing/ListModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ListModel.java rename to src/java.desktop/share/classes/javax/swing/ListModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ListSelectionModel.java b/src/java.desktop/share/classes/javax/swing/ListSelectionModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ListSelectionModel.java rename to src/java.desktop/share/classes/javax/swing/ListSelectionModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/LookAndFeel.java b/src/java.desktop/share/classes/javax/swing/LookAndFeel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/LookAndFeel.java rename to src/java.desktop/share/classes/javax/swing/LookAndFeel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/MenuElement.java b/src/java.desktop/share/classes/javax/swing/MenuElement.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/MenuElement.java rename to src/java.desktop/share/classes/javax/swing/MenuElement.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java b/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java rename to src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/MultiUIDefaults.java b/src/java.desktop/share/classes/javax/swing/MultiUIDefaults.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/MultiUIDefaults.java rename to src/java.desktop/share/classes/javax/swing/MultiUIDefaults.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/MutableComboBoxModel.java b/src/java.desktop/share/classes/javax/swing/MutableComboBoxModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/MutableComboBoxModel.java rename to src/java.desktop/share/classes/javax/swing/MutableComboBoxModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/OverlayLayout.java b/src/java.desktop/share/classes/javax/swing/OverlayLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/OverlayLayout.java rename to src/java.desktop/share/classes/javax/swing/OverlayLayout.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/Painter.java b/src/java.desktop/share/classes/javax/swing/Painter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/Painter.java rename to src/java.desktop/share/classes/javax/swing/Painter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/Popup.java b/src/java.desktop/share/classes/javax/swing/Popup.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/Popup.java rename to src/java.desktop/share/classes/javax/swing/Popup.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/PopupFactory.java b/src/java.desktop/share/classes/javax/swing/PopupFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/PopupFactory.java rename to src/java.desktop/share/classes/javax/swing/PopupFactory.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java b/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java rename to src/java.desktop/share/classes/javax/swing/ProgressMonitor.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ProgressMonitorInputStream.java b/src/java.desktop/share/classes/javax/swing/ProgressMonitorInputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ProgressMonitorInputStream.java rename to src/java.desktop/share/classes/javax/swing/ProgressMonitorInputStream.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/Renderer.java b/src/java.desktop/share/classes/javax/swing/Renderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/Renderer.java rename to src/java.desktop/share/classes/javax/swing/Renderer.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java b/src/java.desktop/share/classes/javax/swing/RepaintManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java rename to src/java.desktop/share/classes/javax/swing/RepaintManager.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java b/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java rename to src/java.desktop/share/classes/javax/swing/RootPaneContainer.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/RowFilter.java b/src/java.desktop/share/classes/javax/swing/RowFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/RowFilter.java rename to src/java.desktop/share/classes/javax/swing/RowFilter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/RowSorter.java b/src/java.desktop/share/classes/javax/swing/RowSorter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/RowSorter.java rename to src/java.desktop/share/classes/javax/swing/RowSorter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ScrollPaneConstants.java b/src/java.desktop/share/classes/javax/swing/ScrollPaneConstants.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ScrollPaneConstants.java rename to src/java.desktop/share/classes/javax/swing/ScrollPaneConstants.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java b/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java rename to src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/Scrollable.java b/src/java.desktop/share/classes/javax/swing/Scrollable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/Scrollable.java rename to src/java.desktop/share/classes/javax/swing/Scrollable.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SingleSelectionModel.java b/src/java.desktop/share/classes/javax/swing/SingleSelectionModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SingleSelectionModel.java rename to src/java.desktop/share/classes/javax/swing/SingleSelectionModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SizeRequirements.java b/src/java.desktop/share/classes/javax/swing/SizeRequirements.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SizeRequirements.java rename to src/java.desktop/share/classes/javax/swing/SizeRequirements.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SizeSequence.java b/src/java.desktop/share/classes/javax/swing/SizeSequence.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SizeSequence.java rename to src/java.desktop/share/classes/javax/swing/SizeSequence.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SortOrder.java b/src/java.desktop/share/classes/javax/swing/SortOrder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SortOrder.java rename to src/java.desktop/share/classes/javax/swing/SortOrder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java b/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java rename to src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SpinnerDateModel.java b/src/java.desktop/share/classes/javax/swing/SpinnerDateModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SpinnerDateModel.java rename to src/java.desktop/share/classes/javax/swing/SpinnerDateModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SpinnerListModel.java b/src/java.desktop/share/classes/javax/swing/SpinnerListModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SpinnerListModel.java rename to src/java.desktop/share/classes/javax/swing/SpinnerListModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SpinnerModel.java b/src/java.desktop/share/classes/javax/swing/SpinnerModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SpinnerModel.java rename to src/java.desktop/share/classes/javax/swing/SpinnerModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SpinnerNumberModel.java b/src/java.desktop/share/classes/javax/swing/SpinnerNumberModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SpinnerNumberModel.java rename to src/java.desktop/share/classes/javax/swing/SpinnerNumberModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/Spring.java b/src/java.desktop/share/classes/javax/swing/Spring.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/Spring.java rename to src/java.desktop/share/classes/javax/swing/Spring.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SpringLayout.java b/src/java.desktop/share/classes/javax/swing/SpringLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SpringLayout.java rename to src/java.desktop/share/classes/javax/swing/SpringLayout.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SwingConstants.java b/src/java.desktop/share/classes/javax/swing/SwingConstants.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SwingConstants.java rename to src/java.desktop/share/classes/javax/swing/SwingConstants.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SwingContainer.java b/src/java.desktop/share/classes/javax/swing/SwingContainer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SwingContainer.java rename to src/java.desktop/share/classes/javax/swing/SwingContainer.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SwingHeavyWeight.java b/src/java.desktop/share/classes/javax/swing/SwingHeavyWeight.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SwingHeavyWeight.java rename to src/java.desktop/share/classes/javax/swing/SwingHeavyWeight.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java b/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java rename to src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SwingUtilities.java b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SwingUtilities.java rename to src/java.desktop/share/classes/javax/swing/SwingUtilities.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SwingWorker.java b/src/java.desktop/share/classes/javax/swing/SwingWorker.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/SwingWorker.java rename to src/java.desktop/share/classes/javax/swing/SwingWorker.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/TablePrintable.java b/src/java.desktop/share/classes/javax/swing/TablePrintable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/TablePrintable.java rename to src/java.desktop/share/classes/javax/swing/TablePrintable.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/Timer.java b/src/java.desktop/share/classes/javax/swing/Timer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/Timer.java rename to src/java.desktop/share/classes/javax/swing/Timer.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/TimerQueue.java b/src/java.desktop/share/classes/javax/swing/TimerQueue.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/TimerQueue.java rename to src/java.desktop/share/classes/javax/swing/TimerQueue.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ToolTipManager.java b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ToolTipManager.java rename to src/java.desktop/share/classes/javax/swing/ToolTipManager.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java b/src/java.desktop/share/classes/javax/swing/TransferHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java rename to src/java.desktop/share/classes/javax/swing/TransferHandler.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/UIClientPropertyKey.java b/src/java.desktop/share/classes/javax/swing/UIClientPropertyKey.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/UIClientPropertyKey.java rename to src/java.desktop/share/classes/javax/swing/UIClientPropertyKey.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/UIDefaults.java b/src/java.desktop/share/classes/javax/swing/UIDefaults.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/UIDefaults.java rename to src/java.desktop/share/classes/javax/swing/UIDefaults.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java b/src/java.desktop/share/classes/javax/swing/UIManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/UIManager.java rename to src/java.desktop/share/classes/javax/swing/UIManager.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java b/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java rename to src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ViewportLayout.java b/src/java.desktop/share/classes/javax/swing/ViewportLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/ViewportLayout.java rename to src/java.desktop/share/classes/javax/swing/ViewportLayout.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/WindowConstants.java b/src/java.desktop/share/classes/javax/swing/WindowConstants.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/WindowConstants.java rename to src/java.desktop/share/classes/javax/swing/WindowConstants.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/AbstractButtonColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/AbstractButtonColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/AbstractButtonColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/AbstractButtonColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/BorderColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/BorderColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/BorderColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/BorderColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/BoxMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JAppletMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JButtonMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMenuItemMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JCheckBoxMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JColorChooserMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JComboBoxMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComponentColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComponentColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JComponentColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JComponentColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JDesktopPaneMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JDialogMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JEditorPaneMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JFileChooserMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JFormattedTextFieldMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JFrameMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JInternalFrameMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JLabelMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JLayeredPaneMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JListColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JListColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JListColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JListColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JListColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JListColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JListColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JListColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JListMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JListMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JListMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JListMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JListMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JListMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JListMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JListMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuBarMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuItemMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JMenuMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JOptionPaneMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JPanelMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JPasswordFieldMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JPopupMenuMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JProgressBarMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMenuItemMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JRadioButtonMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JRootPaneMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollBarMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JScrollPaneMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSeparatorMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSliderMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSpinnerMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JSplitPaneMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTabbedPaneMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTableMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextAreaMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextFieldMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTextPaneMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JToggleButtonMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JToolBarMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JTreeMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JViewportMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowColor16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowColor16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowColor16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowColor16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowColor32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowColor32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowColor32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowColor32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowMono16.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowMono16.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowMono16.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowMono16.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowMono32.gif b/src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowMono32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowMono32.gif rename to src/java.desktop/share/classes/javax/swing/beaninfo/images/JWindowMono32.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java b/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java rename to src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java b/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java rename to src/java.desktop/share/classes/javax/swing/border/BevelBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/Border.java b/src/java.desktop/share/classes/javax/swing/border/Border.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/border/Border.java rename to src/java.desktop/share/classes/javax/swing/border/Border.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java b/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java rename to src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java b/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java rename to src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java b/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java rename to src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/LineBorder.java b/src/java.desktop/share/classes/javax/swing/border/LineBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/border/LineBorder.java rename to src/java.desktop/share/classes/javax/swing/border/LineBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java b/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java rename to src/java.desktop/share/classes/javax/swing/border/MatteBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java b/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java rename to src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java b/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java rename to src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java b/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java rename to src/java.desktop/share/classes/javax/swing/border/TitledBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/border/package-info.java b/src/java.desktop/share/classes/javax/swing/border/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/border/package-info.java rename to src/java.desktop/share/classes/javax/swing/border/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/CenterLayout.java b/src/java.desktop/share/classes/javax/swing/colorchooser/CenterLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/CenterLayout.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/CenterLayout.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java b/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserPanel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserPanel.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserPanel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModel.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/ColorModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelCMYK.java b/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelCMYK.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelCMYK.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelCMYK.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelHSL.java b/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelHSL.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelHSL.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelHSL.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelHSV.java b/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelHSV.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelHSV.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/ColorModelHSV.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/ColorPanel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorPanel.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/ColorPanel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorSelectionModel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/ColorSelectionModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorSelectionModel.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/ColorSelectionModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DiagramComponent.java b/src/java.desktop/share/classes/javax/swing/colorchooser/DiagramComponent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DiagramComponent.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/DiagramComponent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/SlidingSpinner.java b/src/java.desktop/share/classes/javax/swing/colorchooser/SlidingSpinner.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/SlidingSpinner.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/SlidingSpinner.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/SmartGridLayout.java b/src/java.desktop/share/classes/javax/swing/colorchooser/SmartGridLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/SmartGridLayout.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/SmartGridLayout.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ValueFormatter.java b/src/java.desktop/share/classes/javax/swing/colorchooser/ValueFormatter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ValueFormatter.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/ValueFormatter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/package-info.java b/src/java.desktop/share/classes/javax/swing/colorchooser/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/colorchooser/package-info.java rename to src/java.desktop/share/classes/javax/swing/colorchooser/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.gif b/src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.gif rename to src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/JLayeredPane-1.gif b/src/java.desktop/share/classes/javax/swing/doc-files/JLayeredPane-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/JLayeredPane-1.gif rename to src/java.desktop/share/classes/javax/swing/doc-files/JLayeredPane-1.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/JRootPane-1.gif b/src/java.desktop/share/classes/javax/swing/doc-files/JRootPane-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/JRootPane-1.gif rename to src/java.desktop/share/classes/javax/swing/doc-files/JRootPane-1.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/JRootPane-2.gif b/src/java.desktop/share/classes/javax/swing/doc-files/JRootPane-2.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/JRootPane-2.gif rename to src/java.desktop/share/classes/javax/swing/doc-files/JRootPane-2.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/JScrollPane-1.gif b/src/java.desktop/share/classes/javax/swing/doc-files/JScrollPane-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/JScrollPane-1.gif rename to src/java.desktop/share/classes/javax/swing/doc-files/JScrollPane-1.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/SizeSequence-1.gif b/src/java.desktop/share/classes/javax/swing/doc-files/SizeSequence-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/SizeSequence-1.gif rename to src/java.desktop/share/classes/javax/swing/doc-files/SizeSequence-1.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.1.gif b/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.1.gif rename to src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.1.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.2.gif b/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.2.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.2.gif rename to src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.2.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.3.gif b/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.3.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.3.gif rename to src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.3.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.example.png b/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.example.png similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.example.png rename to src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.example.png diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.gif b/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.gif rename to src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.horizontal.gif b/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.horizontal.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.horizontal.gif rename to src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.horizontal.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif b/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif rename to src/java.desktop/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java b/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java rename to src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/AncestorListener.java b/src/java.desktop/share/classes/javax/swing/event/AncestorListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/AncestorListener.java rename to src/java.desktop/share/classes/javax/swing/event/AncestorListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java b/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java rename to src/java.desktop/share/classes/javax/swing/event/CaretEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/CaretListener.java b/src/java.desktop/share/classes/javax/swing/event/CaretListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/CaretListener.java rename to src/java.desktop/share/classes/javax/swing/event/CaretListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/CellEditorListener.java b/src/java.desktop/share/classes/javax/swing/event/CellEditorListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/CellEditorListener.java rename to src/java.desktop/share/classes/javax/swing/event/CellEditorListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java b/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java rename to src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/ChangeListener.java b/src/java.desktop/share/classes/javax/swing/event/ChangeListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/ChangeListener.java rename to src/java.desktop/share/classes/javax/swing/event/ChangeListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/DocumentEvent.java b/src/java.desktop/share/classes/javax/swing/event/DocumentEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/DocumentEvent.java rename to src/java.desktop/share/classes/javax/swing/event/DocumentEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/DocumentListener.java b/src/java.desktop/share/classes/javax/swing/event/DocumentListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/DocumentListener.java rename to src/java.desktop/share/classes/javax/swing/event/DocumentListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java b/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java rename to src/java.desktop/share/classes/javax/swing/event/EventListenerList.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java b/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java rename to src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/HyperlinkListener.java b/src/java.desktop/share/classes/javax/swing/event/HyperlinkListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/HyperlinkListener.java rename to src/java.desktop/share/classes/javax/swing/event/HyperlinkListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/InternalFrameAdapter.java b/src/java.desktop/share/classes/javax/swing/event/InternalFrameAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/InternalFrameAdapter.java rename to src/java.desktop/share/classes/javax/swing/event/InternalFrameAdapter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java b/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java rename to src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/InternalFrameListener.java b/src/java.desktop/share/classes/javax/swing/event/InternalFrameListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/InternalFrameListener.java rename to src/java.desktop/share/classes/javax/swing/event/InternalFrameListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java b/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java rename to src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/ListDataListener.java b/src/java.desktop/share/classes/javax/swing/event/ListDataListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/ListDataListener.java rename to src/java.desktop/share/classes/javax/swing/event/ListDataListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java b/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java rename to src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/ListSelectionListener.java b/src/java.desktop/share/classes/javax/swing/event/ListSelectionListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/ListSelectionListener.java rename to src/java.desktop/share/classes/javax/swing/event/ListSelectionListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java b/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java rename to src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseListener.java b/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseListener.java rename to src/java.desktop/share/classes/javax/swing/event/MenuDragMouseListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java b/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java rename to src/java.desktop/share/classes/javax/swing/event/MenuEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java b/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java rename to src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/MenuKeyListener.java b/src/java.desktop/share/classes/javax/swing/event/MenuKeyListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/MenuKeyListener.java rename to src/java.desktop/share/classes/javax/swing/event/MenuKeyListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/MenuListener.java b/src/java.desktop/share/classes/javax/swing/event/MenuListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/MenuListener.java rename to src/java.desktop/share/classes/javax/swing/event/MenuListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/MouseInputAdapter.java b/src/java.desktop/share/classes/javax/swing/event/MouseInputAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/MouseInputAdapter.java rename to src/java.desktop/share/classes/javax/swing/event/MouseInputAdapter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/MouseInputListener.java b/src/java.desktop/share/classes/javax/swing/event/MouseInputListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/MouseInputListener.java rename to src/java.desktop/share/classes/javax/swing/event/MouseInputListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java b/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java rename to src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/PopupMenuListener.java b/src/java.desktop/share/classes/javax/swing/event/PopupMenuListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/PopupMenuListener.java rename to src/java.desktop/share/classes/javax/swing/event/PopupMenuListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/RowSorterEvent.java b/src/java.desktop/share/classes/javax/swing/event/RowSorterEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/RowSorterEvent.java rename to src/java.desktop/share/classes/javax/swing/event/RowSorterEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/RowSorterListener.java b/src/java.desktop/share/classes/javax/swing/event/RowSorterListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/RowSorterListener.java rename to src/java.desktop/share/classes/javax/swing/event/RowSorterListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/SwingPropertyChangeSupport.java b/src/java.desktop/share/classes/javax/swing/event/SwingPropertyChangeSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/SwingPropertyChangeSupport.java rename to src/java.desktop/share/classes/javax/swing/event/SwingPropertyChangeSupport.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java b/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java rename to src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TableColumnModelListener.java b/src/java.desktop/share/classes/javax/swing/event/TableColumnModelListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/TableColumnModelListener.java rename to src/java.desktop/share/classes/javax/swing/event/TableColumnModelListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java b/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java rename to src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TableModelListener.java b/src/java.desktop/share/classes/javax/swing/event/TableModelListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/TableModelListener.java rename to src/java.desktop/share/classes/javax/swing/event/TableModelListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java b/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java rename to src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TreeExpansionListener.java b/src/java.desktop/share/classes/javax/swing/event/TreeExpansionListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/TreeExpansionListener.java rename to src/java.desktop/share/classes/javax/swing/event/TreeExpansionListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java b/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java rename to src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TreeModelListener.java b/src/java.desktop/share/classes/javax/swing/event/TreeModelListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/TreeModelListener.java rename to src/java.desktop/share/classes/javax/swing/event/TreeModelListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java b/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java rename to src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TreeSelectionListener.java b/src/java.desktop/share/classes/javax/swing/event/TreeSelectionListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/TreeSelectionListener.java rename to src/java.desktop/share/classes/javax/swing/event/TreeSelectionListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TreeWillExpandListener.java b/src/java.desktop/share/classes/javax/swing/event/TreeWillExpandListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/TreeWillExpandListener.java rename to src/java.desktop/share/classes/javax/swing/event/TreeWillExpandListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java b/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java rename to src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/UndoableEditListener.java b/src/java.desktop/share/classes/javax/swing/event/UndoableEditListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/UndoableEditListener.java rename to src/java.desktop/share/classes/javax/swing/event/UndoableEditListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/package-info.java b/src/java.desktop/share/classes/javax/swing/event/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/event/package-info.java rename to src/java.desktop/share/classes/javax/swing/event/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileFilter.java b/src/java.desktop/share/classes/javax/swing/filechooser/FileFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileFilter.java rename to src/java.desktop/share/classes/javax/swing/filechooser/FileFilter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileNameExtensionFilter.java b/src/java.desktop/share/classes/javax/swing/filechooser/FileNameExtensionFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileNameExtensionFilter.java rename to src/java.desktop/share/classes/javax/swing/filechooser/FileNameExtensionFilter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java b/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java rename to src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileView.java b/src/java.desktop/share/classes/javax/swing/filechooser/FileView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileView.java rename to src/java.desktop/share/classes/javax/swing/filechooser/FileView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/filechooser/package-info.java b/src/java.desktop/share/classes/javax/swing/filechooser/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/filechooser/package-info.java rename to src/java.desktop/share/classes/javax/swing/filechooser/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/package-info.java b/src/java.desktop/share/classes/javax/swing/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/package-info.java rename to src/java.desktop/share/classes/javax/swing/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ActionMapUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/ActionMapUIResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ActionMapUIResource.java rename to src/java.desktop/share/classes/javax/swing/plaf/ActionMapUIResource.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java rename to src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/ButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ButtonUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/ButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ColorChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/ColorChooserUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ColorChooserUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/ColorChooserUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java rename to src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComboBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/ComboBoxUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ComboBoxUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/ComboBoxUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java rename to src/java.desktop/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComponentUI.java b/src/java.desktop/share/classes/javax/swing/plaf/ComponentUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ComponentUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/ComponentUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/DesktopIconUI.java b/src/java.desktop/share/classes/javax/swing/plaf/DesktopIconUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/DesktopIconUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/DesktopIconUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/DesktopPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/DesktopPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/DesktopPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/DesktopPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java rename to src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/FileChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/FileChooserUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/FileChooserUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/FileChooserUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java rename to src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java rename to src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/InputMapUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/InputMapUIResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/InputMapUIResource.java rename to src/java.desktop/share/classes/javax/swing/plaf/InputMapUIResource.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java rename to src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/InternalFrameUI.java b/src/java.desktop/share/classes/javax/swing/plaf/InternalFrameUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/InternalFrameUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/InternalFrameUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/LabelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/LabelUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/LabelUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/LabelUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/LayerUI.java b/src/java.desktop/share/classes/javax/swing/plaf/LayerUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/LayerUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/LayerUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ListUI.java b/src/java.desktop/share/classes/javax/swing/plaf/ListUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ListUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/ListUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/MenuBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/MenuBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/MenuBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/MenuBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/MenuItemUI.java b/src/java.desktop/share/classes/javax/swing/plaf/MenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/MenuItemUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/MenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/OptionPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/OptionPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/OptionPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/OptionPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/PanelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/PanelUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/PanelUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/PanelUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/PopupMenuUI.java b/src/java.desktop/share/classes/javax/swing/plaf/PopupMenuUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/PopupMenuUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/PopupMenuUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ProgressBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/ProgressBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ProgressBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/ProgressBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/RootPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/RootPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/RootPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/RootPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ScrollBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/ScrollBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ScrollBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/ScrollBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ScrollPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/ScrollPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ScrollPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/ScrollPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/SeparatorUI.java b/src/java.desktop/share/classes/javax/swing/plaf/SeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/SeparatorUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/SeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/SliderUI.java b/src/java.desktop/share/classes/javax/swing/plaf/SliderUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/SliderUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/SliderUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/SpinnerUI.java b/src/java.desktop/share/classes/javax/swing/plaf/SpinnerUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/SpinnerUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/SpinnerUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/SplitPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/SplitPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/SplitPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/SplitPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/TabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/TabbedPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/TabbedPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/TabbedPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/TableHeaderUI.java b/src/java.desktop/share/classes/javax/swing/plaf/TableHeaderUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/TableHeaderUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/TableHeaderUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/TableUI.java b/src/java.desktop/share/classes/javax/swing/plaf/TableUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/TableUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/TableUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java b/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/TextUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ToolBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/ToolBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ToolBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/ToolBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ToolTipUI.java b/src/java.desktop/share/classes/javax/swing/plaf/ToolTipUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ToolTipUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/ToolTipUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/TreeUI.java b/src/java.desktop/share/classes/javax/swing/plaf/TreeUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/TreeUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/TreeUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/UIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/UIResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/UIResource.java rename to src/java.desktop/share/classes/javax/swing/plaf/UIResource.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ViewportUI.java b/src/java.desktop/share/classes/javax/swing/plaf/ViewportUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/ViewportUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/ViewportUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicBorders.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicBorders.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicBorders.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicBorders.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonListener.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonListener.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonListener.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPanelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPanelUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPanelUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPanelUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRootPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRootPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRootPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRootPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTransferable.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTransferable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTransferable.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTransferable.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicViewportUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicViewportUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicViewportUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/BasicViewportUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/CenterLayout.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/CenterLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/CenterLayout.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/CenterLayout.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/ComboPopup.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/ComboPopup.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/ComboPopup.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/ComboPopup.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/LazyActionMap.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/LazyActionMap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/LazyActionMap.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/LazyActionMap.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png b/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png rename to src/java.desktop/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/image-delayed.png b/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/image-delayed.png similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/image-delayed.png rename to src/java.desktop/share/classes/javax/swing/plaf/basic/icons/image-delayed.png diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/image-failed.png b/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/image-failed.png similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/icons/image-failed.png rename to src/java.desktop/share/classes/javax/swing/plaf/basic/icons/image-failed.png diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/package-info.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/package-info.java rename to src/java.desktop/share/classes/javax/swing/plaf/basic/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxIcon.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxIcon.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxIcon.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxIcon.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalHighContrastTheme.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalHighContrastTheme.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalHighContrastTheme.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalHighContrastTheme.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollButton.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollButton.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollButton.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollButton.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSliderUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSliderUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSliderUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSliderUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTheme.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTheme.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTheme.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTheme.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTitlePane.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTitlePane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTitlePane.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTitlePane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTreeUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTreeUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTreeUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTreeUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalUtils.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalUtils.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalUtils.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/MetalUtils.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/OceanTheme.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/OceanTheme.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/OceanTheme.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/OceanTheme.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Error.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Error.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Error.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Error.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Inform.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Inform.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Inform.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Inform.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Question.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Question.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Question.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Question.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Warn.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Warn.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Warn.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/Warn.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/close.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/close.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/close.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/close.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed-rtl.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed-rtl.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed-rtl.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed-rtl.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/computer.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/computer.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/computer.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/computer.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/directory.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/directory.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/directory.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/directory.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/error.png b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/error.png similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/error.png rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/error.png diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/file.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/file.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/file.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/file.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/hardDrive.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/hardDrive.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/hardDrive.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/hardDrive.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/homeFolder.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/homeFolder.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/homeFolder.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/homeFolder.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/iconify.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/iconify.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/iconify.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/iconify.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/info.png b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/info.png similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/info.png rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/info.png diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/maximize.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/maximize.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/maximize.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/maximize.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/menu.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/menu.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/menu.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/menu.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose-pressed.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose-pressed.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose-pressed.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose-pressed.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/question.png b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/question.png similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/question.png rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/question.png diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/upFolder.gif b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/upFolder.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/upFolder.gif rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/upFolder.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/warning.png b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/warning.png similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/warning.png rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/ocean/warning.png diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/sortDown.png b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/sortDown.png similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/sortDown.png rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/sortDown.png diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/sortUp.png b/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/sortUp.png similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/icons/sortUp.png rename to src/java.desktop/share/classes/javax/swing/plaf/metal/icons/sortUp.png diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/package-info.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/package-info.java rename to src/java.desktop/share/classes/javax/swing/plaf/metal/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameClose.wav b/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameClose.wav similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameClose.wav rename to src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameClose.wav diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameMaximize.wav b/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameMaximize.wav similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameMaximize.wav rename to src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameMaximize.wav diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameMinimize.wav b/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameMinimize.wav similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameMinimize.wav rename to src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameMinimize.wav diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav b/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav rename to src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav b/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav rename to src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav b/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav rename to src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneError.wav b/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneError.wav similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneError.wav rename to src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneError.wav diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav b/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav rename to src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneQuestion.wav b/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneQuestion.wav similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneQuestion.wav rename to src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneQuestion.wav diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav b/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav rename to src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav b/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav rename to src/java.desktop/share/classes/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiButtonUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiColorChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiColorChooserUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiColorChooserUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiColorChooserUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiDesktopIconUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiDesktopIconUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiDesktopIconUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiDesktopIconUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiDesktopPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiDesktopPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiDesktopPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiDesktopPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiFileChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiFileChooserUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiFileChooserUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiFileChooserUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLabelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLabelUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLabelUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLabelUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiListUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiListUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiListUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiListUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiMenuBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiMenuBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiMenuBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiMenuBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiMenuItemUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiMenuItemUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiOptionPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiOptionPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiOptionPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiOptionPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiPanelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiPanelUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiPanelUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiPanelUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiPopupMenuUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiPopupMenuUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiPopupMenuUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiPopupMenuUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiRootPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiRootPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiRootPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiRootPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiScrollBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiScrollBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiScrollBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiScrollBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiScrollPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiScrollPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiScrollPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiScrollPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSeparatorUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSeparatorUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSliderUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSliderUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSliderUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSliderUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSpinnerUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSpinnerUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSpinnerUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSpinnerUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSplitPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSplitPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSplitPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiSplitPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTabbedPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTabbedPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTabbedPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTableHeaderUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTableHeaderUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTableHeaderUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTableHeaderUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTableUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTableUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTableUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTableUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTextUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTextUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTextUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTextUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiToolBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiToolBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiToolBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiToolBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTreeUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTreeUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTreeUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiTreeUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiViewportUI.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiViewportUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiViewportUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/MultiViewportUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html b/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html rename to src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/package-info.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/package-info.java rename to src/java.desktop/share/classes/javax/swing/plaf/multi/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Defaults.template b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Defaults.template similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Defaults.template rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/Defaults.template diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/EffectUtils.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/EffectUtils.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/EffectUtils.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/EffectUtils.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageCache.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageCache.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageCache.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerGlowEffect.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerGlowEffect.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerGlowEffect.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerGlowEffect.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/PainterImpl.template b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/PainterImpl.template similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/PainterImpl.template rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/PainterImpl.template diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ShadowEffect.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ShadowEffect.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ShadowEffect.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/ShadowEffect.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/State.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/State.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/State.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/State.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/StateImpl.template b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/StateImpl.template similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/StateImpl.template rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/StateImpl.template diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/TableScrollPaneCorner.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/TableScrollPaneCorner.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/TableScrollPaneCorner.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/TableScrollPaneCorner.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/package-info.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/package-info.java rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf rename to src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/package-info.java b/src/java.desktop/share/classes/javax/swing/plaf/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/package-info.java rename to src/java.desktop/share/classes/javax/swing/plaf/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/ColorType.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/ColorType.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/ColorType.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/ColorType.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/ImagePainter.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/ImagePainter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/ImagePainter.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/ImagePainter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/Region.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/Region.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/Region.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/Region.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthArrowButton.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthArrowButton.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthArrowButton.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthArrowButton.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthBorder.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthBorder.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthButtonUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthComboPopup.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthComboPopup.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthComboPopup.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthComboPopup.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthConstants.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthConstants.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthConstants.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthConstants.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthContext.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthContext.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthContext.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthFormattedTextFieldUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthFormattedTextFieldUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthFormattedTextFieldUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthFormattedTextFieldUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthIcon.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthIcon.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthIcon.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthIcon.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLabelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLabelUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLabelUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLabelUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthListUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthListUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthListUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthListUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuLayout.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuLayout.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuLayout.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthMenuUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPainter.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPainter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPainter.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPainter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPanelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPanelUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPanelUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPanelUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRadioButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRadioButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRadioButtonUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRadioButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSliderUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSliderUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSliderUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSliderUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyle.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyle.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyle.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyle.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToggleButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToggleButtonUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToggleButtonUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToggleButtonUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTreeUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTreeUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTreeUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTreeUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthViewportUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthViewportUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthViewportUI.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/SynthViewportUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html rename to src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd rename to src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html rename to src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/package-info.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/package-info.java rename to src/java.desktop/share/classes/javax/swing/plaf/synth/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java b/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java rename to src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java rename to src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java rename to src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java rename to src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java b/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java rename to src/java.desktop/share/classes/javax/swing/table/JTableHeader.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/TableCellEditor.java b/src/java.desktop/share/classes/javax/swing/table/TableCellEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/TableCellEditor.java rename to src/java.desktop/share/classes/javax/swing/table/TableCellEditor.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/TableCellRenderer.java b/src/java.desktop/share/classes/javax/swing/table/TableCellRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/TableCellRenderer.java rename to src/java.desktop/share/classes/javax/swing/table/TableCellRenderer.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/TableColumn.java b/src/java.desktop/share/classes/javax/swing/table/TableColumn.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/TableColumn.java rename to src/java.desktop/share/classes/javax/swing/table/TableColumn.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java b/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java rename to src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/TableModel.java b/src/java.desktop/share/classes/javax/swing/table/TableModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/TableModel.java rename to src/java.desktop/share/classes/javax/swing/table/TableModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/TableRowSorter.java b/src/java.desktop/share/classes/javax/swing/table/TableRowSorter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/TableRowSorter.java rename to src/java.desktop/share/classes/javax/swing/table/TableRowSorter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/TableStringConverter.java b/src/java.desktop/share/classes/javax/swing/table/TableStringConverter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/TableStringConverter.java rename to src/java.desktop/share/classes/javax/swing/table/TableStringConverter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/package-info.java b/src/java.desktop/share/classes/javax/swing/table/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/table/package-info.java rename to src/java.desktop/share/classes/javax/swing/table/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java rename to src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java b/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java rename to src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java b/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java rename to src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/AttributeSet.java b/src/java.desktop/share/classes/javax/swing/text/AttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/AttributeSet.java rename to src/java.desktop/share/classes/javax/swing/text/AttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/BadLocationException.java b/src/java.desktop/share/classes/javax/swing/text/BadLocationException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/BadLocationException.java rename to src/java.desktop/share/classes/javax/swing/text/BadLocationException.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/BoxView.java b/src/java.desktop/share/classes/javax/swing/text/BoxView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/BoxView.java rename to src/java.desktop/share/classes/javax/swing/text/BoxView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/Caret.java b/src/java.desktop/share/classes/javax/swing/text/Caret.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/Caret.java rename to src/java.desktop/share/classes/javax/swing/text/Caret.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/ChangedCharSetException.java b/src/java.desktop/share/classes/javax/swing/text/ChangedCharSetException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/ChangedCharSetException.java rename to src/java.desktop/share/classes/javax/swing/text/ChangedCharSetException.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/ComponentView.java b/src/java.desktop/share/classes/javax/swing/text/ComponentView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/ComponentView.java rename to src/java.desktop/share/classes/javax/swing/text/ComponentView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/CompositeView.java b/src/java.desktop/share/classes/javax/swing/text/CompositeView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/CompositeView.java rename to src/java.desktop/share/classes/javax/swing/text/CompositeView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DateFormatter.java b/src/java.desktop/share/classes/javax/swing/text/DateFormatter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/DateFormatter.java rename to src/java.desktop/share/classes/javax/swing/text/DateFormatter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java b/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java rename to src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java rename to src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java b/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java rename to src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultFormatterFactory.java b/src/java.desktop/share/classes/javax/swing/text/DefaultFormatterFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/DefaultFormatterFactory.java rename to src/java.desktop/share/classes/javax/swing/text/DefaultFormatterFactory.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java b/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java rename to src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java b/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java rename to src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultTextUI.java b/src/java.desktop/share/classes/javax/swing/text/DefaultTextUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/DefaultTextUI.java rename to src/java.desktop/share/classes/javax/swing/text/DefaultTextUI.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/Document.java b/src/java.desktop/share/classes/javax/swing/text/Document.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/Document.java rename to src/java.desktop/share/classes/javax/swing/text/Document.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java b/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java rename to src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/EditorKit.java b/src/java.desktop/share/classes/javax/swing/text/EditorKit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/EditorKit.java rename to src/java.desktop/share/classes/javax/swing/text/EditorKit.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/Element.java b/src/java.desktop/share/classes/javax/swing/text/Element.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/Element.java rename to src/java.desktop/share/classes/javax/swing/text/Element.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/ElementIterator.java b/src/java.desktop/share/classes/javax/swing/text/ElementIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/ElementIterator.java rename to src/java.desktop/share/classes/javax/swing/text/ElementIterator.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/FieldView.java b/src/java.desktop/share/classes/javax/swing/text/FieldView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/FieldView.java rename to src/java.desktop/share/classes/javax/swing/text/FieldView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/FlowView.java b/src/java.desktop/share/classes/javax/swing/text/FlowView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/FlowView.java rename to src/java.desktop/share/classes/javax/swing/text/FlowView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/GapContent.java b/src/java.desktop/share/classes/javax/swing/text/GapContent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/GapContent.java rename to src/java.desktop/share/classes/javax/swing/text/GapContent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/GapVector.java b/src/java.desktop/share/classes/javax/swing/text/GapVector.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/GapVector.java rename to src/java.desktop/share/classes/javax/swing/text/GapVector.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java b/src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java rename to src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java b/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java rename to src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java b/src/java.desktop/share/classes/javax/swing/text/GlyphView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java rename to src/java.desktop/share/classes/javax/swing/text/GlyphView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/Highlighter.java b/src/java.desktop/share/classes/javax/swing/text/Highlighter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/Highlighter.java rename to src/java.desktop/share/classes/javax/swing/text/Highlighter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/IconView.java b/src/java.desktop/share/classes/javax/swing/text/IconView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/IconView.java rename to src/java.desktop/share/classes/javax/swing/text/IconView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java b/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java rename to src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java rename to src/java.desktop/share/classes/javax/swing/text/JTextComponent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/Keymap.java b/src/java.desktop/share/classes/javax/swing/text/Keymap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/Keymap.java rename to src/java.desktop/share/classes/javax/swing/text/Keymap.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/LabelView.java b/src/java.desktop/share/classes/javax/swing/text/LabelView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/LabelView.java rename to src/java.desktop/share/classes/javax/swing/text/LabelView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/LayeredHighlighter.java b/src/java.desktop/share/classes/javax/swing/text/LayeredHighlighter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/LayeredHighlighter.java rename to src/java.desktop/share/classes/javax/swing/text/LayeredHighlighter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/LayoutQueue.java b/src/java.desktop/share/classes/javax/swing/text/LayoutQueue.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/LayoutQueue.java rename to src/java.desktop/share/classes/javax/swing/text/LayoutQueue.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java b/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java rename to src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/MutableAttributeSet.java b/src/java.desktop/share/classes/javax/swing/text/MutableAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/MutableAttributeSet.java rename to src/java.desktop/share/classes/javax/swing/text/MutableAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java b/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java rename to src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java b/src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java rename to src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java b/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java rename to src/java.desktop/share/classes/javax/swing/text/ParagraphView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/PasswordView.java b/src/java.desktop/share/classes/javax/swing/text/PasswordView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/PasswordView.java rename to src/java.desktop/share/classes/javax/swing/text/PasswordView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java b/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java rename to src/java.desktop/share/classes/javax/swing/text/PlainDocument.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/PlainView.java b/src/java.desktop/share/classes/javax/swing/text/PlainView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/PlainView.java rename to src/java.desktop/share/classes/javax/swing/text/PlainView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/Position.java b/src/java.desktop/share/classes/javax/swing/text/Position.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/Position.java rename to src/java.desktop/share/classes/javax/swing/text/Position.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/Segment.java b/src/java.desktop/share/classes/javax/swing/text/Segment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/Segment.java rename to src/java.desktop/share/classes/javax/swing/text/Segment.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/SegmentCache.java b/src/java.desktop/share/classes/javax/swing/text/SegmentCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/SegmentCache.java rename to src/java.desktop/share/classes/javax/swing/text/SegmentCache.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/SimpleAttributeSet.java b/src/java.desktop/share/classes/javax/swing/text/SimpleAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/SimpleAttributeSet.java rename to src/java.desktop/share/classes/javax/swing/text/SimpleAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/StateInvariantError.java b/src/java.desktop/share/classes/javax/swing/text/StateInvariantError.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/StateInvariantError.java rename to src/java.desktop/share/classes/javax/swing/text/StateInvariantError.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/StringContent.java b/src/java.desktop/share/classes/javax/swing/text/StringContent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/StringContent.java rename to src/java.desktop/share/classes/javax/swing/text/StringContent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/Style.java b/src/java.desktop/share/classes/javax/swing/text/Style.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/Style.java rename to src/java.desktop/share/classes/javax/swing/text/Style.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/StyleConstants.java b/src/java.desktop/share/classes/javax/swing/text/StyleConstants.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/StyleConstants.java rename to src/java.desktop/share/classes/javax/swing/text/StyleConstants.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/StyleContext.java b/src/java.desktop/share/classes/javax/swing/text/StyleContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/StyleContext.java rename to src/java.desktop/share/classes/javax/swing/text/StyleContext.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/StyledDocument.java b/src/java.desktop/share/classes/javax/swing/text/StyledDocument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/StyledDocument.java rename to src/java.desktop/share/classes/javax/swing/text/StyledDocument.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java rename to src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/TabExpander.java b/src/java.desktop/share/classes/javax/swing/text/TabExpander.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/TabExpander.java rename to src/java.desktop/share/classes/javax/swing/text/TabExpander.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/TabSet.java b/src/java.desktop/share/classes/javax/swing/text/TabSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/TabSet.java rename to src/java.desktop/share/classes/javax/swing/text/TabSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/TabStop.java b/src/java.desktop/share/classes/javax/swing/text/TabStop.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/TabStop.java rename to src/java.desktop/share/classes/javax/swing/text/TabStop.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/TabableView.java b/src/java.desktop/share/classes/javax/swing/text/TabableView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/TabableView.java rename to src/java.desktop/share/classes/javax/swing/text/TabableView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/TableView.java b/src/java.desktop/share/classes/javax/swing/text/TableView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/TableView.java rename to src/java.desktop/share/classes/javax/swing/text/TableView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/TextAction.java b/src/java.desktop/share/classes/javax/swing/text/TextAction.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/TextAction.java rename to src/java.desktop/share/classes/javax/swing/text/TextAction.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/TextLayoutStrategy.java b/src/java.desktop/share/classes/javax/swing/text/TextLayoutStrategy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/TextLayoutStrategy.java rename to src/java.desktop/share/classes/javax/swing/text/TextLayoutStrategy.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/Utilities.java b/src/java.desktop/share/classes/javax/swing/text/Utilities.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/Utilities.java rename to src/java.desktop/share/classes/javax/swing/text/Utilities.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/View.java b/src/java.desktop/share/classes/javax/swing/text/View.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/View.java rename to src/java.desktop/share/classes/javax/swing/text/View.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/ViewFactory.java b/src/java.desktop/share/classes/javax/swing/text/ViewFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/ViewFactory.java rename to src/java.desktop/share/classes/javax/swing/text/ViewFactory.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java b/src/java.desktop/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java rename to src/java.desktop/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java b/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java rename to src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/ZoneView.java b/src/java.desktop/share/classes/javax/swing/text/ZoneView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/ZoneView.java rename to src/java.desktop/share/classes/javax/swing/text/ZoneView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-coord.gif b/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-coord.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-coord.gif rename to src/java.desktop/share/classes/javax/swing/text/doc-files/Document-coord.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-insert.gif b/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-insert.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-insert.gif rename to src/java.desktop/share/classes/javax/swing/text/doc-files/Document-insert.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-notification.gif b/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-notification.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-notification.gif rename to src/java.desktop/share/classes/javax/swing/text/doc-files/Document-notification.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-remove.gif b/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-remove.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-remove.gif rename to src/java.desktop/share/classes/javax/swing/text/doc-files/Document-remove.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-structure.gif b/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-structure.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-structure.gif rename to src/java.desktop/share/classes/javax/swing/text/doc-files/Document-structure.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/OpenBookIcon.gif b/src/java.desktop/share/classes/javax/swing/text/doc-files/OpenBookIcon.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/OpenBookIcon.gif rename to src/java.desktop/share/classes/javax/swing/text/doc-files/OpenBookIcon.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/View-flexibility.jpg b/src/java.desktop/share/classes/javax/swing/text/doc-files/View-flexibility.jpg similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/View-flexibility.jpg rename to src/java.desktop/share/classes/javax/swing/text/doc-files/View-flexibility.jpg diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/View-layout.jpg b/src/java.desktop/share/classes/javax/swing/text/doc-files/View-layout.jpg similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/View-layout.jpg rename to src/java.desktop/share/classes/javax/swing/text/doc-files/View-layout.jpg diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/editor.gif b/src/java.desktop/share/classes/javax/swing/text/doc-files/editor.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/editor.gif rename to src/java.desktop/share/classes/javax/swing/text/doc-files/editor.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/paragraph.gif b/src/java.desktop/share/classes/javax/swing/text/doc-files/paragraph.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/doc-files/paragraph.gif rename to src/java.desktop/share/classes/javax/swing/text/doc-files/paragraph.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java rename to src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/BRView.java b/src/java.desktop/share/classes/javax/swing/text/html/BRView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/BRView.java rename to src/java.desktop/share/classes/javax/swing/text/html/BRView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java b/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java rename to src/java.desktop/share/classes/javax/swing/text/html/BlockView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java b/src/java.desktop/share/classes/javax/swing/text/html/CSS.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java rename to src/java.desktop/share/classes/javax/swing/text/html/CSS.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java b/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java rename to src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSSParser.java b/src/java.desktop/share/classes/javax/swing/text/html/CSSParser.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/CSSParser.java rename to src/java.desktop/share/classes/javax/swing/text/html/CSSParser.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/CommentView.java b/src/java.desktop/share/classes/javax/swing/text/html/CommentView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/CommentView.java rename to src/java.desktop/share/classes/javax/swing/text/html/CommentView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/EditableView.java b/src/java.desktop/share/classes/javax/swing/text/html/EditableView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/EditableView.java rename to src/java.desktop/share/classes/javax/swing/text/html/EditableView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/FormSubmitEvent.java b/src/java.desktop/share/classes/javax/swing/text/html/FormSubmitEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/FormSubmitEvent.java rename to src/java.desktop/share/classes/javax/swing/text/html/FormSubmitEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/FormView.java b/src/java.desktop/share/classes/javax/swing/text/html/FormView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/FormView.java rename to src/java.desktop/share/classes/javax/swing/text/html/FormView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/FrameSetView.java b/src/java.desktop/share/classes/javax/swing/text/html/FrameSetView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/FrameSetView.java rename to src/java.desktop/share/classes/javax/swing/text/html/FrameSetView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/FrameView.java b/src/java.desktop/share/classes/javax/swing/text/html/FrameView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/FrameView.java rename to src/java.desktop/share/classes/javax/swing/text/html/FrameView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java b/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java rename to src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTML.java b/src/java.desktop/share/classes/javax/swing/text/html/HTML.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/HTML.java rename to src/java.desktop/share/classes/javax/swing/text/html/HTML.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java rename to src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java rename to src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java rename to src/java.desktop/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java rename to src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/HiddenTagView.java b/src/java.desktop/share/classes/javax/swing/text/html/HiddenTagView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/HiddenTagView.java rename to src/java.desktop/share/classes/javax/swing/text/html/HiddenTagView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java b/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java rename to src/java.desktop/share/classes/javax/swing/text/html/ImageView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/InlineView.java b/src/java.desktop/share/classes/javax/swing/text/html/InlineView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/InlineView.java rename to src/java.desktop/share/classes/javax/swing/text/html/InlineView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/IsindexView.java b/src/java.desktop/share/classes/javax/swing/text/html/IsindexView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/IsindexView.java rename to src/java.desktop/share/classes/javax/swing/text/html/IsindexView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/LineView.java b/src/java.desktop/share/classes/javax/swing/text/html/LineView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/LineView.java rename to src/java.desktop/share/classes/javax/swing/text/html/LineView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/ListView.java b/src/java.desktop/share/classes/javax/swing/text/html/ListView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/ListView.java rename to src/java.desktop/share/classes/javax/swing/text/html/ListView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/Map.java b/src/java.desktop/share/classes/javax/swing/text/html/Map.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/Map.java rename to src/java.desktop/share/classes/javax/swing/text/html/Map.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java b/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java rename to src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java b/src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java rename to src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/NoFramesView.java b/src/java.desktop/share/classes/javax/swing/text/html/NoFramesView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/NoFramesView.java rename to src/java.desktop/share/classes/javax/swing/text/html/NoFramesView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java b/src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java rename to src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/Option.java b/src/java.desktop/share/classes/javax/swing/text/html/Option.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/Option.java rename to src/java.desktop/share/classes/javax/swing/text/html/Option.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/OptionComboBoxModel.java b/src/java.desktop/share/classes/javax/swing/text/html/OptionComboBoxModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/OptionComboBoxModel.java rename to src/java.desktop/share/classes/javax/swing/text/html/OptionComboBoxModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java b/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java rename to src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/ParagraphView.java b/src/java.desktop/share/classes/javax/swing/text/html/ParagraphView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/ParagraphView.java rename to src/java.desktop/share/classes/javax/swing/text/html/ParagraphView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java rename to src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/TableView.java b/src/java.desktop/share/classes/javax/swing/text/html/TableView.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/TableView.java rename to src/java.desktop/share/classes/javax/swing/text/html/TableView.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/TextAreaDocument.java b/src/java.desktop/share/classes/javax/swing/text/html/TextAreaDocument.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/TextAreaDocument.java rename to src/java.desktop/share/classes/javax/swing/text/html/TextAreaDocument.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/default.css b/src/java.desktop/share/classes/javax/swing/text/html/default.css similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/default.css rename to src/java.desktop/share/classes/javax/swing/text/html/default.css diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/package-info.java b/src/java.desktop/share/classes/javax/swing/text/html/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/package-info.java rename to src/java.desktop/share/classes/javax/swing/text/html/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/AttributeList.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/AttributeList.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/AttributeList.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/AttributeList.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModel.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModel.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModelState.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModelState.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModelState.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModelState.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/DTDConstants.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/DTDConstants.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/DTDConstants.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/DTDConstants.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/DocumentParser.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/DocumentParser.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/DocumentParser.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/DocumentParser.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/TagElement.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/TagElement.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/TagElement.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/TagElement.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/TagStack.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/TagStack.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/TagStack.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/TagStack.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/package-info.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/package-info.java rename to src/java.desktop/share/classes/javax/swing/text/html/parser/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/package-info.java b/src/java.desktop/share/classes/javax/swing/text/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/package-info.java rename to src/java.desktop/share/classes/javax/swing/text/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/AbstractFilter.java b/src/java.desktop/share/classes/javax/swing/text/rtf/AbstractFilter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/AbstractFilter.java rename to src/java.desktop/share/classes/javax/swing/text/rtf/AbstractFilter.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/Constants.java b/src/java.desktop/share/classes/javax/swing/text/rtf/Constants.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/Constants.java rename to src/java.desktop/share/classes/javax/swing/text/rtf/Constants.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/MockAttributeSet.java b/src/java.desktop/share/classes/javax/swing/text/rtf/MockAttributeSet.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/MockAttributeSet.java rename to src/java.desktop/share/classes/javax/swing/text/rtf/MockAttributeSet.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttribute.java b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttribute.java rename to src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttribute.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java rename to src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java rename to src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java rename to src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java rename to src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java rename to src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/NeXT.txt b/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/NeXT.txt similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/NeXT.txt rename to src/java.desktop/share/classes/javax/swing/text/rtf/charsets/NeXT.txt diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/ansi.txt b/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/ansi.txt similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/ansi.txt rename to src/java.desktop/share/classes/javax/swing/text/rtf/charsets/ansi.txt diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/cpg437.txt b/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/cpg437.txt similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/cpg437.txt rename to src/java.desktop/share/classes/javax/swing/text/rtf/charsets/cpg437.txt diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/cpg850.txt b/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/cpg850.txt similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/cpg850.txt rename to src/java.desktop/share/classes/javax/swing/text/rtf/charsets/cpg850.txt diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/mac.txt b/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/mac.txt similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/charsets/mac.txt rename to src/java.desktop/share/classes/javax/swing/text/rtf/charsets/mac.txt diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/package-info.java b/src/java.desktop/share/classes/javax/swing/text/rtf/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/text/rtf/package-info.java rename to src/java.desktop/share/classes/javax/swing/text/rtf/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java b/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java rename to src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java rename to src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java rename to src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java rename to src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java rename to src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java rename to src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/ExpandVetoException.java b/src/java.desktop/share/classes/javax/swing/tree/ExpandVetoException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/ExpandVetoException.java rename to src/java.desktop/share/classes/javax/swing/tree/ExpandVetoException.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java b/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java rename to src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/MutableTreeNode.java b/src/java.desktop/share/classes/javax/swing/tree/MutableTreeNode.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/MutableTreeNode.java rename to src/java.desktop/share/classes/javax/swing/tree/MutableTreeNode.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/RowMapper.java b/src/java.desktop/share/classes/javax/swing/tree/RowMapper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/RowMapper.java rename to src/java.desktop/share/classes/javax/swing/tree/RowMapper.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/TreeCellEditor.java b/src/java.desktop/share/classes/javax/swing/tree/TreeCellEditor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/TreeCellEditor.java rename to src/java.desktop/share/classes/javax/swing/tree/TreeCellEditor.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/TreeCellRenderer.java b/src/java.desktop/share/classes/javax/swing/tree/TreeCellRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/TreeCellRenderer.java rename to src/java.desktop/share/classes/javax/swing/tree/TreeCellRenderer.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/TreeModel.java b/src/java.desktop/share/classes/javax/swing/tree/TreeModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/TreeModel.java rename to src/java.desktop/share/classes/javax/swing/tree/TreeModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/TreeNode.java b/src/java.desktop/share/classes/javax/swing/tree/TreeNode.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/TreeNode.java rename to src/java.desktop/share/classes/javax/swing/tree/TreeNode.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/TreePath.java b/src/java.desktop/share/classes/javax/swing/tree/TreePath.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/TreePath.java rename to src/java.desktop/share/classes/javax/swing/tree/TreePath.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/TreeSelectionModel.java b/src/java.desktop/share/classes/javax/swing/tree/TreeSelectionModel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/TreeSelectionModel.java rename to src/java.desktop/share/classes/javax/swing/tree/TreeSelectionModel.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java b/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java rename to src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/package-info.java b/src/java.desktop/share/classes/javax/swing/tree/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/tree/package-info.java rename to src/java.desktop/share/classes/javax/swing/tree/package-info.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java b/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java rename to src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java b/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java rename to src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java b/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java rename to src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/CompoundEdit.java b/src/java.desktop/share/classes/javax/swing/undo/CompoundEdit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/CompoundEdit.java rename to src/java.desktop/share/classes/javax/swing/undo/CompoundEdit.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/StateEdit.java b/src/java.desktop/share/classes/javax/swing/undo/StateEdit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/StateEdit.java rename to src/java.desktop/share/classes/javax/swing/undo/StateEdit.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/StateEditable.java b/src/java.desktop/share/classes/javax/swing/undo/StateEditable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/StateEditable.java rename to src/java.desktop/share/classes/javax/swing/undo/StateEditable.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java b/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java rename to src/java.desktop/share/classes/javax/swing/undo/UndoManager.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/UndoableEdit.java b/src/java.desktop/share/classes/javax/swing/undo/UndoableEdit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/UndoableEdit.java rename to src/java.desktop/share/classes/javax/swing/undo/UndoableEdit.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/UndoableEditSupport.java b/src/java.desktop/share/classes/javax/swing/undo/UndoableEditSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/UndoableEditSupport.java rename to src/java.desktop/share/classes/javax/swing/undo/UndoableEditSupport.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-1.gif b/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-1.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-1.gif rename to src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-1.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-2.gif b/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-2.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-2.gif rename to src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-2.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif b/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif rename to src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-4.gif b/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-4.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-4.gif rename to src/java.desktop/share/classes/javax/swing/undo/doc-files/UndoManager-4.gif diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/package-info.java b/src/java.desktop/share/classes/javax/swing/undo/package-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/javax/swing/undo/package-info.java rename to src/java.desktop/share/classes/javax/swing/undo/package-info.java diff --git a/jdk/src/java.desktop/share/classes/module-info.java b/src/java.desktop/share/classes/module-info.java similarity index 100% rename from jdk/src/java.desktop/share/classes/module-info.java rename to src/java.desktop/share/classes/module-info.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletAudioClip.java b/src/java.desktop/share/classes/sun/applet/AppletAudioClip.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletAudioClip.java rename to src/java.desktop/share/classes/sun/applet/AppletAudioClip.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java b/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java rename to src/java.desktop/share/classes/sun/applet/AppletClassLoader.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletEvent.java b/src/java.desktop/share/classes/sun/applet/AppletEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletEvent.java rename to src/java.desktop/share/classes/sun/applet/AppletEvent.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java b/src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java rename to src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletIOException.java b/src/java.desktop/share/classes/sun/applet/AppletIOException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletIOException.java rename to src/java.desktop/share/classes/sun/applet/AppletIOException.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java b/src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java rename to src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletImageRef.java b/src/java.desktop/share/classes/sun/applet/AppletImageRef.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletImageRef.java rename to src/java.desktop/share/classes/sun/applet/AppletImageRef.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletListener.java b/src/java.desktop/share/classes/sun/applet/AppletListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletListener.java rename to src/java.desktop/share/classes/sun/applet/AppletListener.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java b/src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java rename to src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java b/src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java rename to src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java b/src/java.desktop/share/classes/sun/applet/AppletPanel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java rename to src/java.desktop/share/classes/sun/applet/AppletPanel.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletProps.java b/src/java.desktop/share/classes/sun/applet/AppletProps.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletProps.java rename to src/java.desktop/share/classes/sun/applet/AppletProps.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java b/src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java rename to src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletSecurity.java b/src/java.desktop/share/classes/sun/applet/AppletSecurity.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletSecurity.java rename to src/java.desktop/share/classes/sun/applet/AppletSecurity.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletSecurityException.java b/src/java.desktop/share/classes/sun/applet/AppletSecurityException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletSecurityException.java rename to src/java.desktop/share/classes/sun/applet/AppletSecurityException.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletThreadGroup.java b/src/java.desktop/share/classes/sun/applet/AppletThreadGroup.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletThreadGroup.java rename to src/java.desktop/share/classes/sun/applet/AppletThreadGroup.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java b/src/java.desktop/share/classes/sun/applet/AppletViewer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java rename to src/java.desktop/share/classes/sun/applet/AppletViewer.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java b/src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java rename to src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java b/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java rename to src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/Main.java b/src/java.desktop/share/classes/sun/applet/Main.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/Main.java rename to src/java.desktop/share/classes/sun/applet/Main.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java rename to src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java rename to src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java rename to src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java rename to src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java rename to src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java rename to src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java rename to src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java rename to src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java rename to src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java rename to src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java rename to src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/AWTAccessor.java b/src/java.desktop/share/classes/sun/awt/AWTAccessor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/AWTAccessor.java rename to src/java.desktop/share/classes/sun/awt/AWTAccessor.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/AWTAutoShutdown.java b/src/java.desktop/share/classes/sun/awt/AWTAutoShutdown.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/AWTAutoShutdown.java rename to src/java.desktop/share/classes/sun/awt/AWTAutoShutdown.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/AWTCharset.java b/src/java.desktop/share/classes/sun/awt/AWTCharset.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/AWTCharset.java rename to src/java.desktop/share/classes/sun/awt/AWTCharset.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/AWTPermissions.java b/src/java.desktop/share/classes/sun/awt/AWTPermissions.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/AWTPermissions.java rename to src/java.desktop/share/classes/sun/awt/AWTPermissions.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/AWTSecurityManager.java b/src/java.desktop/share/classes/sun/awt/AWTSecurityManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/AWTSecurityManager.java rename to src/java.desktop/share/classes/sun/awt/AWTSecurityManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java b/src/java.desktop/share/classes/sun/awt/AppContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/AppContext.java rename to src/java.desktop/share/classes/sun/awt/AppContext.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/CausedFocusEvent.java b/src/java.desktop/share/classes/sun/awt/CausedFocusEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/CausedFocusEvent.java rename to src/java.desktop/share/classes/sun/awt/CausedFocusEvent.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/CharsetString.java b/src/java.desktop/share/classes/sun/awt/CharsetString.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/CharsetString.java rename to src/java.desktop/share/classes/sun/awt/CharsetString.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/ComponentFactory.java b/src/java.desktop/share/classes/sun/awt/ComponentFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/ComponentFactory.java rename to src/java.desktop/share/classes/sun/awt/ComponentFactory.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/ConstrainableGraphics.java b/src/java.desktop/share/classes/sun/awt/ConstrainableGraphics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/ConstrainableGraphics.java rename to src/java.desktop/share/classes/sun/awt/ConstrainableGraphics.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/CustomCursor.java b/src/java.desktop/share/classes/sun/awt/CustomCursor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/CustomCursor.java rename to src/java.desktop/share/classes/sun/awt/CustomCursor.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/DebugSettings.java b/src/java.desktop/share/classes/sun/awt/DebugSettings.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/DebugSettings.java rename to src/java.desktop/share/classes/sun/awt/DebugSettings.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/DesktopBrowse.java b/src/java.desktop/share/classes/sun/awt/DesktopBrowse.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/DesktopBrowse.java rename to src/java.desktop/share/classes/sun/awt/DesktopBrowse.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/DisplayChangedListener.java b/src/java.desktop/share/classes/sun/awt/DisplayChangedListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/DisplayChangedListener.java rename to src/java.desktop/share/classes/sun/awt/DisplayChangedListener.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java b/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java rename to src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/EventQueueItem.java b/src/java.desktop/share/classes/sun/awt/EventQueueItem.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/EventQueueItem.java rename to src/java.desktop/share/classes/sun/awt/EventQueueItem.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/ExtendedKeyCodes.java b/src/java.desktop/share/classes/sun/awt/ExtendedKeyCodes.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/ExtendedKeyCodes.java rename to src/java.desktop/share/classes/sun/awt/ExtendedKeyCodes.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/FontConfiguration.java b/src/java.desktop/share/classes/sun/awt/FontConfiguration.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/FontConfiguration.java rename to src/java.desktop/share/classes/sun/awt/FontConfiguration.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/FontDescriptor.java b/src/java.desktop/share/classes/sun/awt/FontDescriptor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/FontDescriptor.java rename to src/java.desktop/share/classes/sun/awt/FontDescriptor.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/FwDispatcher.java b/src/java.desktop/share/classes/sun/awt/FwDispatcher.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/FwDispatcher.java rename to src/java.desktop/share/classes/sun/awt/FwDispatcher.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/GlobalCursorManager.java b/src/java.desktop/share/classes/sun/awt/GlobalCursorManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/GlobalCursorManager.java rename to src/java.desktop/share/classes/sun/awt/GlobalCursorManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/Graphics2Delegate.java b/src/java.desktop/share/classes/sun/awt/Graphics2Delegate.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/Graphics2Delegate.java rename to src/java.desktop/share/classes/sun/awt/Graphics2Delegate.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/HKSCS.java b/src/java.desktop/share/classes/sun/awt/HKSCS.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/HKSCS.java rename to src/java.desktop/share/classes/sun/awt/HKSCS.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/HToolkit.java b/src/java.desktop/share/classes/sun/awt/HToolkit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/HToolkit.java rename to src/java.desktop/share/classes/sun/awt/HToolkit.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/HeadlessToolkit.java b/src/java.desktop/share/classes/sun/awt/HeadlessToolkit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/HeadlessToolkit.java rename to src/java.desktop/share/classes/sun/awt/HeadlessToolkit.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/IconInfo.java b/src/java.desktop/share/classes/sun/awt/IconInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/IconInfo.java rename to src/java.desktop/share/classes/sun/awt/IconInfo.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/InputMethodSupport.java b/src/java.desktop/share/classes/sun/awt/InputMethodSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/InputMethodSupport.java rename to src/java.desktop/share/classes/sun/awt/InputMethodSupport.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java b/src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java rename to src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java b/src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java rename to src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/LightweightFrame.java b/src/java.desktop/share/classes/sun/awt/LightweightFrame.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/LightweightFrame.java rename to src/java.desktop/share/classes/sun/awt/LightweightFrame.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/ModalExclude.java b/src/java.desktop/share/classes/sun/awt/ModalExclude.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/ModalExclude.java rename to src/java.desktop/share/classes/sun/awt/ModalExclude.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/ModalityEvent.java b/src/java.desktop/share/classes/sun/awt/ModalityEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/ModalityEvent.java rename to src/java.desktop/share/classes/sun/awt/ModalityEvent.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/ModalityListener.java b/src/java.desktop/share/classes/sun/awt/ModalityListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/ModalityListener.java rename to src/java.desktop/share/classes/sun/awt/ModalityListener.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/Mutex.java b/src/java.desktop/share/classes/sun/awt/Mutex.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/Mutex.java rename to src/java.desktop/share/classes/sun/awt/Mutex.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/NativeLibLoader.java b/src/java.desktop/share/classes/sun/awt/NativeLibLoader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/NativeLibLoader.java rename to src/java.desktop/share/classes/sun/awt/NativeLibLoader.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/NullComponentPeer.java b/src/java.desktop/share/classes/sun/awt/NullComponentPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/NullComponentPeer.java rename to src/java.desktop/share/classes/sun/awt/NullComponentPeer.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/OSInfo.java b/src/java.desktop/share/classes/sun/awt/OSInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/OSInfo.java rename to src/java.desktop/share/classes/sun/awt/OSInfo.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/PaintEventDispatcher.java b/src/java.desktop/share/classes/sun/awt/PaintEventDispatcher.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/PaintEventDispatcher.java rename to src/java.desktop/share/classes/sun/awt/PaintEventDispatcher.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/PeerEvent.java b/src/java.desktop/share/classes/sun/awt/PeerEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/PeerEvent.java rename to src/java.desktop/share/classes/sun/awt/PeerEvent.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/PlatformFont.java b/src/java.desktop/share/classes/sun/awt/PlatformFont.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/PlatformFont.java rename to src/java.desktop/share/classes/sun/awt/PlatformFont.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/RepaintArea.java b/src/java.desktop/share/classes/sun/awt/RepaintArea.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/RepaintArea.java rename to src/java.desktop/share/classes/sun/awt/RepaintArea.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/RequestFocusController.java b/src/java.desktop/share/classes/sun/awt/RequestFocusController.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/RequestFocusController.java rename to src/java.desktop/share/classes/sun/awt/RequestFocusController.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/ScrollPaneWheelScroller.java b/src/java.desktop/share/classes/sun/awt/ScrollPaneWheelScroller.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/ScrollPaneWheelScroller.java rename to src/java.desktop/share/classes/sun/awt/ScrollPaneWheelScroller.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SoftCache.java b/src/java.desktop/share/classes/sun/awt/SoftCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/SoftCache.java rename to src/java.desktop/share/classes/sun/awt/SoftCache.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SubRegionShowable.java b/src/java.desktop/share/classes/sun/awt/SubRegionShowable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/SubRegionShowable.java rename to src/java.desktop/share/classes/sun/awt/SubRegionShowable.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunDisplayChanger.java b/src/java.desktop/share/classes/sun/awt/SunDisplayChanger.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/SunDisplayChanger.java rename to src/java.desktop/share/classes/sun/awt/SunDisplayChanger.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunGraphicsCallback.java b/src/java.desktop/share/classes/sun/awt/SunGraphicsCallback.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/SunGraphicsCallback.java rename to src/java.desktop/share/classes/sun/awt/SunGraphicsCallback.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunHints.java b/src/java.desktop/share/classes/sun/awt/SunHints.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/SunHints.java rename to src/java.desktop/share/classes/sun/awt/SunHints.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/src/java.desktop/share/classes/sun/awt/SunToolkit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java rename to src/java.desktop/share/classes/sun/awt/SunToolkit.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/Symbol.java b/src/java.desktop/share/classes/sun/awt/Symbol.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/Symbol.java rename to src/java.desktop/share/classes/sun/awt/Symbol.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/TimedWindowEvent.java b/src/java.desktop/share/classes/sun/awt/TimedWindowEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/TimedWindowEvent.java rename to src/java.desktop/share/classes/sun/awt/TimedWindowEvent.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/TracedEventQueue.java b/src/java.desktop/share/classes/sun/awt/TracedEventQueue.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/TracedEventQueue.java rename to src/java.desktop/share/classes/sun/awt/TracedEventQueue.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/UngrabEvent.java b/src/java.desktop/share/classes/sun/awt/UngrabEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/UngrabEvent.java rename to src/java.desktop/share/classes/sun/awt/UngrabEvent.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/WeakIdentityHashMap.java b/src/java.desktop/share/classes/sun/awt/WeakIdentityHashMap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/WeakIdentityHashMap.java rename to src/java.desktop/share/classes/sun/awt/WeakIdentityHashMap.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/WindowIDProvider.java b/src/java.desktop/share/classes/sun/awt/WindowIDProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/WindowIDProvider.java rename to src/java.desktop/share/classes/sun/awt/WindowIDProvider.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/ClipboardTransferable.java b/src/java.desktop/share/classes/sun/awt/datatransfer/ClipboardTransferable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/datatransfer/ClipboardTransferable.java rename to src/java.desktop/share/classes/sun/awt/datatransfer/ClipboardTransferable.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java b/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java rename to src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DesktopDatatransferServiceImpl.java b/src/java.desktop/share/classes/sun/awt/datatransfer/DesktopDatatransferServiceImpl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DesktopDatatransferServiceImpl.java rename to src/java.desktop/share/classes/sun/awt/datatransfer/DesktopDatatransferServiceImpl.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java b/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java rename to src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/ToolkitThreadBlockedHandler.java b/src/java.desktop/share/classes/sun/awt/datatransfer/ToolkitThreadBlockedHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/datatransfer/ToolkitThreadBlockedHandler.java rename to src/java.desktop/share/classes/sun/awt/datatransfer/ToolkitThreadBlockedHandler.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/TransferableProxy.java b/src/java.desktop/share/classes/sun/awt/datatransfer/TransferableProxy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/datatransfer/TransferableProxy.java rename to src/java.desktop/share/classes/sun/awt/datatransfer/TransferableProxy.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java b/src/java.desktop/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java rename to src/java.desktop/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java b/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java rename to src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetEvent.java b/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetEvent.java rename to src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetEvent.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/event/IgnorePaintEvent.java b/src/java.desktop/share/classes/sun/awt/event/IgnorePaintEvent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/event/IgnorePaintEvent.java rename to src/java.desktop/share/classes/sun/awt/event/IgnorePaintEvent.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/AreaOp.java b/src/java.desktop/share/classes/sun/awt/geom/AreaOp.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/geom/AreaOp.java rename to src/java.desktop/share/classes/sun/awt/geom/AreaOp.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/ChainEnd.java b/src/java.desktop/share/classes/sun/awt/geom/ChainEnd.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/geom/ChainEnd.java rename to src/java.desktop/share/classes/sun/awt/geom/ChainEnd.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/Crossings.java b/src/java.desktop/share/classes/sun/awt/geom/Crossings.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/geom/Crossings.java rename to src/java.desktop/share/classes/sun/awt/geom/Crossings.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/Curve.java b/src/java.desktop/share/classes/sun/awt/geom/Curve.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/geom/Curve.java rename to src/java.desktop/share/classes/sun/awt/geom/Curve.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/CurveLink.java b/src/java.desktop/share/classes/sun/awt/geom/CurveLink.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/geom/CurveLink.java rename to src/java.desktop/share/classes/sun/awt/geom/CurveLink.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/Edge.java b/src/java.desktop/share/classes/sun/awt/geom/Edge.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/geom/Edge.java rename to src/java.desktop/share/classes/sun/awt/geom/Edge.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/Order0.java b/src/java.desktop/share/classes/sun/awt/geom/Order0.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/geom/Order0.java rename to src/java.desktop/share/classes/sun/awt/geom/Order0.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/Order1.java b/src/java.desktop/share/classes/sun/awt/geom/Order1.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/geom/Order1.java rename to src/java.desktop/share/classes/sun/awt/geom/Order1.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/Order2.java b/src/java.desktop/share/classes/sun/awt/geom/Order2.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/geom/Order2.java rename to src/java.desktop/share/classes/sun/awt/geom/Order2.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/Order3.java b/src/java.desktop/share/classes/sun/awt/geom/Order3.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/geom/Order3.java rename to src/java.desktop/share/classes/sun/awt/geom/Order3.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/PathConsumer2D.java b/src/java.desktop/share/classes/sun/awt/geom/PathConsumer2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/geom/PathConsumer2D.java rename to src/java.desktop/share/classes/sun/awt/geom/PathConsumer2D.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/CompositionArea.java b/src/java.desktop/share/classes/sun/awt/im/CompositionArea.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/im/CompositionArea.java rename to src/java.desktop/share/classes/sun/awt/im/CompositionArea.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/CompositionAreaHandler.java b/src/java.desktop/share/classes/sun/awt/im/CompositionAreaHandler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/im/CompositionAreaHandler.java rename to src/java.desktop/share/classes/sun/awt/im/CompositionAreaHandler.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java b/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java rename to src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/InputContext.java b/src/java.desktop/share/classes/sun/awt/im/InputContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/im/InputContext.java rename to src/java.desktop/share/classes/sun/awt/im/InputContext.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodAdapter.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodAdapter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodAdapter.java rename to src/java.desktop/share/classes/sun/awt/im/InputMethodAdapter.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java rename to src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodJFrame.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodJFrame.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodJFrame.java rename to src/java.desktop/share/classes/sun/awt/im/InputMethodJFrame.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodLocator.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodLocator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodLocator.java rename to src/java.desktop/share/classes/sun/awt/im/InputMethodLocator.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java rename to src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodPopupMenu.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodPopupMenu.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodPopupMenu.java rename to src/java.desktop/share/classes/sun/awt/im/InputMethodPopupMenu.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodWindow.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodWindow.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/im/InputMethodWindow.java rename to src/java.desktop/share/classes/sun/awt/im/InputMethodWindow.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/SimpleInputMethodWindow.java b/src/java.desktop/share/classes/sun/awt/im/SimpleInputMethodWindow.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/im/SimpleInputMethodWindow.java rename to src/java.desktop/share/classes/sun/awt/im/SimpleInputMethodWindow.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/BadDepthException.java b/src/java.desktop/share/classes/sun/awt/image/BadDepthException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/BadDepthException.java rename to src/java.desktop/share/classes/sun/awt/image/BadDepthException.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java b/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java rename to src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceManager.java b/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceManager.java rename to src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java b/src/java.desktop/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java rename to src/java.desktop/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/BufferedImageDevice.java b/src/java.desktop/share/classes/sun/awt/image/BufferedImageDevice.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/BufferedImageDevice.java rename to src/java.desktop/share/classes/sun/awt/image/BufferedImageDevice.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java b/src/java.desktop/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java rename to src/java.desktop/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ByteArrayImageSource.java b/src/java.desktop/share/classes/sun/awt/image/ByteArrayImageSource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ByteArrayImageSource.java rename to src/java.desktop/share/classes/sun/awt/image/ByteArrayImageSource.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java rename to src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java b/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java rename to src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java rename to src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java b/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java rename to src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/DataBufferNative.java b/src/java.desktop/share/classes/sun/awt/image/DataBufferNative.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/DataBufferNative.java rename to src/java.desktop/share/classes/sun/awt/image/DataBufferNative.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/FileImageSource.java b/src/java.desktop/share/classes/sun/awt/image/FileImageSource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/FileImageSource.java rename to src/java.desktop/share/classes/sun/awt/image/FileImageSource.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java b/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java rename to src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageAccessException.java b/src/java.desktop/share/classes/sun/awt/image/ImageAccessException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ImageAccessException.java rename to src/java.desktop/share/classes/sun/awt/image/ImageAccessException.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageCache.java b/src/java.desktop/share/classes/sun/awt/image/ImageCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ImageCache.java rename to src/java.desktop/share/classes/sun/awt/image/ImageCache.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageConsumerQueue.java b/src/java.desktop/share/classes/sun/awt/image/ImageConsumerQueue.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ImageConsumerQueue.java rename to src/java.desktop/share/classes/sun/awt/image/ImageConsumerQueue.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java b/src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java rename to src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageFetchable.java b/src/java.desktop/share/classes/sun/awt/image/ImageFetchable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ImageFetchable.java rename to src/java.desktop/share/classes/sun/awt/image/ImageFetchable.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java b/src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java rename to src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageFormatException.java b/src/java.desktop/share/classes/sun/awt/image/ImageFormatException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ImageFormatException.java rename to src/java.desktop/share/classes/sun/awt/image/ImageFormatException.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java b/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java rename to src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImageWatched.java b/src/java.desktop/share/classes/sun/awt/image/ImageWatched.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ImageWatched.java rename to src/java.desktop/share/classes/sun/awt/image/ImageWatched.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java b/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java rename to src/java.desktop/share/classes/sun/awt/image/ImagingLib.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/InputStreamImageSource.java b/src/java.desktop/share/classes/sun/awt/image/InputStreamImageSource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/InputStreamImageSource.java rename to src/java.desktop/share/classes/sun/awt/image/InputStreamImageSource.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java b/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java rename to src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java b/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java rename to src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java b/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java rename to src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java b/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java rename to src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java b/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java rename to src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java b/src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java rename to src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/OffScreenImage.java b/src/java.desktop/share/classes/sun/awt/image/OffScreenImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/OffScreenImage.java rename to src/java.desktop/share/classes/sun/awt/image/OffScreenImage.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/OffScreenImageSource.java b/src/java.desktop/share/classes/sun/awt/image/OffScreenImageSource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/OffScreenImageSource.java rename to src/java.desktop/share/classes/sun/awt/image/OffScreenImageSource.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java b/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java rename to src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/PixelConverter.java b/src/java.desktop/share/classes/sun/awt/image/PixelConverter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/PixelConverter.java rename to src/java.desktop/share/classes/sun/awt/image/PixelConverter.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java rename to src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java b/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java rename to src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java rename to src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java b/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java rename to src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/SunWritableRaster.java b/src/java.desktop/share/classes/sun/awt/image/SunWritableRaster.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/SunWritableRaster.java rename to src/java.desktop/share/classes/sun/awt/image/SunWritableRaster.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java b/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java rename to src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/ToolkitImage.java b/src/java.desktop/share/classes/sun/awt/image/ToolkitImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/ToolkitImage.java rename to src/java.desktop/share/classes/sun/awt/image/ToolkitImage.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/URLImageSource.java b/src/java.desktop/share/classes/sun/awt/image/URLImageSource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/URLImageSource.java rename to src/java.desktop/share/classes/sun/awt/image/URLImageSource.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/VSyncedBSManager.java b/src/java.desktop/share/classes/sun/awt/image/VSyncedBSManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/VSyncedBSManager.java rename to src/java.desktop/share/classes/sun/awt/image/VSyncedBSManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/VolatileSurfaceManager.java b/src/java.desktop/share/classes/sun/awt/image/VolatileSurfaceManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/VolatileSurfaceManager.java rename to src/java.desktop/share/classes/sun/awt/image/VolatileSurfaceManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/WritableRasterNative.java b/src/java.desktop/share/classes/sun/awt/image/WritableRasterNative.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/WritableRasterNative.java rename to src/java.desktop/share/classes/sun/awt/image/WritableRasterNative.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java b/src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java rename to src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/awt.properties b/src/java.desktop/share/classes/sun/awt/resources/awt.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/awt.properties rename to src/java.desktop/share/classes/sun/awt/resources/awt.properties diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties rename to src/java.desktop/share/classes/sun/awt/resources/awt_de.properties diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_es.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_es.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/awt_es.properties rename to src/java.desktop/share/classes/sun/awt/resources/awt_es.properties diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_fr.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_fr.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/awt_fr.properties rename to src/java.desktop/share/classes/sun/awt/resources/awt_fr.properties diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_it.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_it.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/awt_it.properties rename to src/java.desktop/share/classes/sun/awt/resources/awt_it.properties diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_ja.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_ja.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/awt_ja.properties rename to src/java.desktop/share/classes/sun/awt/resources/awt_ja.properties diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_ko.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_ko.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/awt_ko.properties rename to src/java.desktop/share/classes/sun/awt/resources/awt_ko.properties diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_pt_BR.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_pt_BR.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/awt_pt_BR.properties rename to src/java.desktop/share/classes/sun/awt/resources/awt_pt_BR.properties diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_sv.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_sv.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/awt_sv.properties rename to src/java.desktop/share/classes/sun/awt/resources/awt_sv.properties diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_zh_CN.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_zh_CN.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/awt_zh_CN.properties rename to src/java.desktop/share/classes/sun/awt/resources/awt_zh_CN.properties diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/awt_zh_TW.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_zh_TW.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/awt_zh_TW.properties rename to src/java.desktop/share/classes/sun/awt/resources/awt_zh_TW.properties diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/cursors/CopyDrop32x32.gif b/src/java.desktop/share/classes/sun/awt/resources/cursors/CopyDrop32x32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/cursors/CopyDrop32x32.gif rename to src/java.desktop/share/classes/sun/awt/resources/cursors/CopyDrop32x32.gif diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/cursors/LinkDrop32x32.gif b/src/java.desktop/share/classes/sun/awt/resources/cursors/LinkDrop32x32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/cursors/LinkDrop32x32.gif rename to src/java.desktop/share/classes/sun/awt/resources/cursors/LinkDrop32x32.gif diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/cursors/MoveDrop32x32.gif b/src/java.desktop/share/classes/sun/awt/resources/cursors/MoveDrop32x32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/cursors/MoveDrop32x32.gif rename to src/java.desktop/share/classes/sun/awt/resources/cursors/MoveDrop32x32.gif diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/cursors/cursors.properties b/src/java.desktop/share/classes/sun/awt/resources/cursors/cursors.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/cursors/cursors.properties rename to src/java.desktop/share/classes/sun/awt/resources/cursors/cursors.properties diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/cursors/invalid32x32.gif b/src/java.desktop/share/classes/sun/awt/resources/cursors/invalid32x32.gif similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/cursors/invalid32x32.gif rename to src/java.desktop/share/classes/sun/awt/resources/cursors/invalid32x32.gif diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw16.png b/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw16.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw16.png rename to src/java.desktop/share/classes/sun/awt/resources/security-icon-bw16.png diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw24.png b/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw24.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw24.png rename to src/java.desktop/share/classes/sun/awt/resources/security-icon-bw24.png diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw32.png b/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw32.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw32.png rename to src/java.desktop/share/classes/sun/awt/resources/security-icon-bw32.png diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw48.png b/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw48.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-bw48.png rename to src/java.desktop/share/classes/sun/awt/resources/security-icon-bw48.png diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim16.png b/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim16.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim16.png rename to src/java.desktop/share/classes/sun/awt/resources/security-icon-interim16.png diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim24.png b/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim24.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim24.png rename to src/java.desktop/share/classes/sun/awt/resources/security-icon-interim24.png diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim32.png b/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim32.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim32.png rename to src/java.desktop/share/classes/sun/awt/resources/security-icon-interim32.png diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim48.png b/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim48.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-interim48.png rename to src/java.desktop/share/classes/sun/awt/resources/security-icon-interim48.png diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow16.png b/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow16.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow16.png rename to src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow16.png diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow24.png b/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow24.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow24.png rename to src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow24.png diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow32.png b/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow32.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow32.png rename to src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow32.png diff --git a/jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow48.png b/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow48.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow48.png rename to src/java.desktop/share/classes/sun/awt/resources/security-icon-yellow48.png diff --git a/jdk/src/java.desktop/share/classes/sun/awt/shell/DefaultShellFolder.java b/src/java.desktop/share/classes/sun/awt/shell/DefaultShellFolder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/shell/DefaultShellFolder.java rename to src/java.desktop/share/classes/sun/awt/shell/DefaultShellFolder.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java b/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java rename to src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/shell/ShellFolderColumnInfo.java b/src/java.desktop/share/classes/sun/awt/shell/ShellFolderColumnInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/shell/ShellFolderColumnInfo.java rename to src/java.desktop/share/classes/sun/awt/shell/ShellFolderColumnInfo.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/shell/ShellFolderManager.java b/src/java.desktop/share/classes/sun/awt/shell/ShellFolderManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/shell/ShellFolderManager.java rename to src/java.desktop/share/classes/sun/awt/shell/ShellFolderManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java b/src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java rename to src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/util/IdentityLinkedList.java b/src/java.desktop/share/classes/sun/awt/util/IdentityLinkedList.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/util/IdentityLinkedList.java rename to src/java.desktop/share/classes/sun/awt/util/IdentityLinkedList.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java b/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java rename to src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/util/ThreadGroupUtils.java b/src/java.desktop/share/classes/sun/awt/util/ThreadGroupUtils.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/util/ThreadGroupUtils.java rename to src/java.desktop/share/classes/sun/awt/util/ThreadGroupUtils.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/www/content/MultimediaContentHandlers.java b/src/java.desktop/share/classes/sun/awt/www/content/MultimediaContentHandlers.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/www/content/MultimediaContentHandlers.java rename to src/java.desktop/share/classes/sun/awt/www/content/MultimediaContentHandlers.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/www/content/audio/aiff.java b/src/java.desktop/share/classes/sun/awt/www/content/audio/aiff.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/www/content/audio/aiff.java rename to src/java.desktop/share/classes/sun/awt/www/content/audio/aiff.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/www/content/audio/basic.java b/src/java.desktop/share/classes/sun/awt/www/content/audio/basic.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/www/content/audio/basic.java rename to src/java.desktop/share/classes/sun/awt/www/content/audio/basic.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/www/content/audio/wav.java b/src/java.desktop/share/classes/sun/awt/www/content/audio/wav.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/www/content/audio/wav.java rename to src/java.desktop/share/classes/sun/awt/www/content/audio/wav.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/www/content/audio/x_aiff.java b/src/java.desktop/share/classes/sun/awt/www/content/audio/x_aiff.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/www/content/audio/x_aiff.java rename to src/java.desktop/share/classes/sun/awt/www/content/audio/x_aiff.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/www/content/audio/x_wav.java b/src/java.desktop/share/classes/sun/awt/www/content/audio/x_wav.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/www/content/audio/x_wav.java rename to src/java.desktop/share/classes/sun/awt/www/content/audio/x_wav.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/www/content/image/gif.java b/src/java.desktop/share/classes/sun/awt/www/content/image/gif.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/www/content/image/gif.java rename to src/java.desktop/share/classes/sun/awt/www/content/image/gif.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/www/content/image/jpeg.java b/src/java.desktop/share/classes/sun/awt/www/content/image/jpeg.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/www/content/image/jpeg.java rename to src/java.desktop/share/classes/sun/awt/www/content/image/jpeg.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/www/content/image/png.java b/src/java.desktop/share/classes/sun/awt/www/content/image/png.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/www/content/image/png.java rename to src/java.desktop/share/classes/sun/awt/www/content/image/png.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/www/content/image/x_xbitmap.java b/src/java.desktop/share/classes/sun/awt/www/content/image/x_xbitmap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/www/content/image/x_xbitmap.java rename to src/java.desktop/share/classes/sun/awt/www/content/image/x_xbitmap.java diff --git a/jdk/src/java.desktop/share/classes/sun/awt/www/content/image/x_xpixmap.java b/src/java.desktop/share/classes/sun/awt/www/content/image/x_xpixmap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/awt/www/content/image/x_xpixmap.java rename to src/java.desktop/share/classes/sun/awt/www/content/image/x_xpixmap.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/AttributeMap.java b/src/java.desktop/share/classes/sun/font/AttributeMap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/AttributeMap.java rename to src/java.desktop/share/classes/sun/font/AttributeMap.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/AttributeValues.java b/src/java.desktop/share/classes/sun/font/AttributeValues.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/AttributeValues.java rename to src/java.desktop/share/classes/sun/font/AttributeValues.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/BidiUtils.java b/src/java.desktop/share/classes/sun/font/BidiUtils.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/BidiUtils.java rename to src/java.desktop/share/classes/sun/font/BidiUtils.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/CMap.java b/src/java.desktop/share/classes/sun/font/CMap.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/CMap.java rename to src/java.desktop/share/classes/sun/font/CMap.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/CharToGlyphMapper.java b/src/java.desktop/share/classes/sun/font/CharToGlyphMapper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/CharToGlyphMapper.java rename to src/java.desktop/share/classes/sun/font/CharToGlyphMapper.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/CodePointIterator.java b/src/java.desktop/share/classes/sun/font/CodePointIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/CodePointIterator.java rename to src/java.desktop/share/classes/sun/font/CodePointIterator.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/CompositeFont.java b/src/java.desktop/share/classes/sun/font/CompositeFont.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/CompositeFont.java rename to src/java.desktop/share/classes/sun/font/CompositeFont.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/CompositeFontDescriptor.java b/src/java.desktop/share/classes/sun/font/CompositeFontDescriptor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/CompositeFontDescriptor.java rename to src/java.desktop/share/classes/sun/font/CompositeFontDescriptor.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java b/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java rename to src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/CompositeStrike.java b/src/java.desktop/share/classes/sun/font/CompositeStrike.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/CompositeStrike.java rename to src/java.desktop/share/classes/sun/font/CompositeStrike.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/CoreMetrics.java b/src/java.desktop/share/classes/sun/font/CoreMetrics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/CoreMetrics.java rename to src/java.desktop/share/classes/sun/font/CoreMetrics.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/CreatedFontTracker.java b/src/java.desktop/share/classes/sun/font/CreatedFontTracker.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/CreatedFontTracker.java rename to src/java.desktop/share/classes/sun/font/CreatedFontTracker.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/Decoration.java b/src/java.desktop/share/classes/sun/font/Decoration.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/Decoration.java rename to src/java.desktop/share/classes/sun/font/Decoration.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/DelegatingShape.java b/src/java.desktop/share/classes/sun/font/DelegatingShape.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/DelegatingShape.java rename to src/java.desktop/share/classes/sun/font/DelegatingShape.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/EAttribute.java b/src/java.desktop/share/classes/sun/font/EAttribute.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/EAttribute.java rename to src/java.desktop/share/classes/sun/font/EAttribute.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/ExtendedTextLabel.java b/src/java.desktop/share/classes/sun/font/ExtendedTextLabel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/ExtendedTextLabel.java rename to src/java.desktop/share/classes/sun/font/ExtendedTextLabel.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java b/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java rename to src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FileFont.java b/src/java.desktop/share/classes/sun/font/FileFont.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FileFont.java rename to src/java.desktop/share/classes/sun/font/FileFont.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FileFontStrike.java b/src/java.desktop/share/classes/sun/font/FileFontStrike.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FileFontStrike.java rename to src/java.desktop/share/classes/sun/font/FileFontStrike.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/Font2D.java b/src/java.desktop/share/classes/sun/font/Font2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/Font2D.java rename to src/java.desktop/share/classes/sun/font/Font2D.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/Font2DHandle.java b/src/java.desktop/share/classes/sun/font/Font2DHandle.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/Font2DHandle.java rename to src/java.desktop/share/classes/sun/font/Font2DHandle.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontAccess.java b/src/java.desktop/share/classes/sun/font/FontAccess.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontAccess.java rename to src/java.desktop/share/classes/sun/font/FontAccess.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontDesignMetrics.java b/src/java.desktop/share/classes/sun/font/FontDesignMetrics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontDesignMetrics.java rename to src/java.desktop/share/classes/sun/font/FontDesignMetrics.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontFamily.java b/src/java.desktop/share/classes/sun/font/FontFamily.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontFamily.java rename to src/java.desktop/share/classes/sun/font/FontFamily.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontLineMetrics.java b/src/java.desktop/share/classes/sun/font/FontLineMetrics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontLineMetrics.java rename to src/java.desktop/share/classes/sun/font/FontLineMetrics.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontManager.java b/src/java.desktop/share/classes/sun/font/FontManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontManager.java rename to src/java.desktop/share/classes/sun/font/FontManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontManagerFactory.java b/src/java.desktop/share/classes/sun/font/FontManagerFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontManagerFactory.java rename to src/java.desktop/share/classes/sun/font/FontManagerFactory.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontManagerForSGE.java b/src/java.desktop/share/classes/sun/font/FontManagerForSGE.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontManagerForSGE.java rename to src/java.desktop/share/classes/sun/font/FontManagerForSGE.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java b/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java rename to src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontResolver.java b/src/java.desktop/share/classes/sun/font/FontResolver.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontResolver.java rename to src/java.desktop/share/classes/sun/font/FontResolver.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontRunIterator.java b/src/java.desktop/share/classes/sun/font/FontRunIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontRunIterator.java rename to src/java.desktop/share/classes/sun/font/FontRunIterator.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontScaler.java b/src/java.desktop/share/classes/sun/font/FontScaler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontScaler.java rename to src/java.desktop/share/classes/sun/font/FontScaler.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontScalerException.java b/src/java.desktop/share/classes/sun/font/FontScalerException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontScalerException.java rename to src/java.desktop/share/classes/sun/font/FontScalerException.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontStrike.java b/src/java.desktop/share/classes/sun/font/FontStrike.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontStrike.java rename to src/java.desktop/share/classes/sun/font/FontStrike.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontStrikeDesc.java b/src/java.desktop/share/classes/sun/font/FontStrikeDesc.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontStrikeDesc.java rename to src/java.desktop/share/classes/sun/font/FontStrikeDesc.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontStrikeDisposer.java b/src/java.desktop/share/classes/sun/font/FontStrikeDisposer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontStrikeDisposer.java rename to src/java.desktop/share/classes/sun/font/FontStrikeDisposer.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontSubstitution.java b/src/java.desktop/share/classes/sun/font/FontSubstitution.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontSubstitution.java rename to src/java.desktop/share/classes/sun/font/FontSubstitution.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontUtilities.java b/src/java.desktop/share/classes/sun/font/FontUtilities.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FontUtilities.java rename to src/java.desktop/share/classes/sun/font/FontUtilities.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java b/src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java rename to src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/GlyphDisposedListener.java b/src/java.desktop/share/classes/sun/font/GlyphDisposedListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/GlyphDisposedListener.java rename to src/java.desktop/share/classes/sun/font/GlyphDisposedListener.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/GlyphLayout.java b/src/java.desktop/share/classes/sun/font/GlyphLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/GlyphLayout.java rename to src/java.desktop/share/classes/sun/font/GlyphLayout.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/GlyphList.java b/src/java.desktop/share/classes/sun/font/GlyphList.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/GlyphList.java rename to src/java.desktop/share/classes/sun/font/GlyphList.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/GraphicComponent.java b/src/java.desktop/share/classes/sun/font/GraphicComponent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/GraphicComponent.java rename to src/java.desktop/share/classes/sun/font/GraphicComponent.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/LayoutPathImpl.java b/src/java.desktop/share/classes/sun/font/LayoutPathImpl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/LayoutPathImpl.java rename to src/java.desktop/share/classes/sun/font/LayoutPathImpl.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/NullFontScaler.java b/src/java.desktop/share/classes/sun/font/NullFontScaler.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/NullFontScaler.java rename to src/java.desktop/share/classes/sun/font/NullFontScaler.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/PhysicalFont.java b/src/java.desktop/share/classes/sun/font/PhysicalFont.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/PhysicalFont.java rename to src/java.desktop/share/classes/sun/font/PhysicalFont.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/PhysicalStrike.java b/src/java.desktop/share/classes/sun/font/PhysicalStrike.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/PhysicalStrike.java rename to src/java.desktop/share/classes/sun/font/PhysicalStrike.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/Script.java b/src/java.desktop/share/classes/sun/font/Script.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/Script.java rename to src/java.desktop/share/classes/sun/font/Script.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/ScriptRun.java b/src/java.desktop/share/classes/sun/font/ScriptRun.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/ScriptRun.java rename to src/java.desktop/share/classes/sun/font/ScriptRun.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/ScriptRunData.java b/src/java.desktop/share/classes/sun/font/ScriptRunData.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/ScriptRunData.java rename to src/java.desktop/share/classes/sun/font/ScriptRunData.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java b/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java rename to src/java.desktop/share/classes/sun/font/StandardGlyphVector.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/StandardTextSource.java b/src/java.desktop/share/classes/sun/font/StandardTextSource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/StandardTextSource.java rename to src/java.desktop/share/classes/sun/font/StandardTextSource.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/StrikeCache.java b/src/java.desktop/share/classes/sun/font/StrikeCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/StrikeCache.java rename to src/java.desktop/share/classes/sun/font/StrikeCache.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/StrikeMetrics.java b/src/java.desktop/share/classes/sun/font/StrikeMetrics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/StrikeMetrics.java rename to src/java.desktop/share/classes/sun/font/StrikeMetrics.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/SunFontManager.java b/src/java.desktop/share/classes/sun/font/SunFontManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/SunFontManager.java rename to src/java.desktop/share/classes/sun/font/SunFontManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/SunLayoutEngine.java b/src/java.desktop/share/classes/sun/font/SunLayoutEngine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/SunLayoutEngine.java rename to src/java.desktop/share/classes/sun/font/SunLayoutEngine.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/TextLabel.java b/src/java.desktop/share/classes/sun/font/TextLabel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/TextLabel.java rename to src/java.desktop/share/classes/sun/font/TextLabel.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/TextLabelFactory.java b/src/java.desktop/share/classes/sun/font/TextLabelFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/TextLabelFactory.java rename to src/java.desktop/share/classes/sun/font/TextLabelFactory.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/TextLineComponent.java b/src/java.desktop/share/classes/sun/font/TextLineComponent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/TextLineComponent.java rename to src/java.desktop/share/classes/sun/font/TextLineComponent.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/TextRecord.java b/src/java.desktop/share/classes/sun/font/TextRecord.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/TextRecord.java rename to src/java.desktop/share/classes/sun/font/TextRecord.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/TextSource.java b/src/java.desktop/share/classes/sun/font/TextSource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/TextSource.java rename to src/java.desktop/share/classes/sun/font/TextSource.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/TextSourceLabel.java b/src/java.desktop/share/classes/sun/font/TextSourceLabel.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/TextSourceLabel.java rename to src/java.desktop/share/classes/sun/font/TextSourceLabel.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/TrueTypeFont.java b/src/java.desktop/share/classes/sun/font/TrueTypeFont.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/TrueTypeFont.java rename to src/java.desktop/share/classes/sun/font/TrueTypeFont.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java b/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java rename to src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/Type1Font.java b/src/java.desktop/share/classes/sun/font/Type1Font.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/Type1Font.java rename to src/java.desktop/share/classes/sun/font/Type1Font.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java b/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java rename to src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/Underline.java b/src/java.desktop/share/classes/sun/font/Underline.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/Underline.java rename to src/java.desktop/share/classes/sun/font/Underline.java diff --git a/jdk/src/java.desktop/share/classes/sun/font/lookup/JDKFontLookup.java b/src/java.desktop/share/classes/sun/font/lookup/JDKFontLookup.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/font/lookup/JDKFontLookup.java rename to src/java.desktop/share/classes/sun/font/lookup/JDKFontLookup.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/DefaultDisposerRecord.java b/src/java.desktop/share/classes/sun/java2d/DefaultDisposerRecord.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/DefaultDisposerRecord.java rename to src/java.desktop/share/classes/sun/java2d/DefaultDisposerRecord.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/DestSurfaceProvider.java b/src/java.desktop/share/classes/sun/java2d/DestSurfaceProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/DestSurfaceProvider.java rename to src/java.desktop/share/classes/sun/java2d/DestSurfaceProvider.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/Disposer.java b/src/java.desktop/share/classes/sun/java2d/Disposer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/Disposer.java rename to src/java.desktop/share/classes/sun/java2d/Disposer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/DisposerRecord.java b/src/java.desktop/share/classes/sun/java2d/DisposerRecord.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/DisposerRecord.java rename to src/java.desktop/share/classes/sun/java2d/DisposerRecord.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/DisposerTarget.java b/src/java.desktop/share/classes/sun/java2d/DisposerTarget.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/DisposerTarget.java rename to src/java.desktop/share/classes/sun/java2d/DisposerTarget.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/FontSupport.java b/src/java.desktop/share/classes/sun/java2d/FontSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/FontSupport.java rename to src/java.desktop/share/classes/sun/java2d/FontSupport.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java b/src/java.desktop/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java rename to src/java.desktop/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/InvalidPipeException.java b/src/java.desktop/share/classes/sun/java2d/InvalidPipeException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/InvalidPipeException.java rename to src/java.desktop/share/classes/sun/java2d/InvalidPipeException.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java b/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java rename to src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/ReentrantContext.java b/src/java.desktop/share/classes/sun/java2d/ReentrantContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/ReentrantContext.java rename to src/java.desktop/share/classes/sun/java2d/ReentrantContext.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/ReentrantContextProvider.java b/src/java.desktop/share/classes/sun/java2d/ReentrantContextProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/ReentrantContextProvider.java rename to src/java.desktop/share/classes/sun/java2d/ReentrantContextProvider.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/ReentrantContextProviderCLQ.java b/src/java.desktop/share/classes/sun/java2d/ReentrantContextProviderCLQ.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/ReentrantContextProviderCLQ.java rename to src/java.desktop/share/classes/sun/java2d/ReentrantContextProviderCLQ.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/ReentrantContextProviderTL.java b/src/java.desktop/share/classes/sun/java2d/ReentrantContextProviderTL.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/ReentrantContextProviderTL.java rename to src/java.desktop/share/classes/sun/java2d/ReentrantContextProviderTL.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/Spans.java b/src/java.desktop/share/classes/sun/java2d/Spans.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/Spans.java rename to src/java.desktop/share/classes/sun/java2d/Spans.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/StateTrackable.java b/src/java.desktop/share/classes/sun/java2d/StateTrackable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/StateTrackable.java rename to src/java.desktop/share/classes/sun/java2d/StateTrackable.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java b/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java rename to src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/StateTracker.java b/src/java.desktop/share/classes/sun/java2d/StateTracker.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/StateTracker.java rename to src/java.desktop/share/classes/sun/java2d/StateTracker.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SunCompositeContext.java b/src/java.desktop/share/classes/sun/java2d/SunCompositeContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/SunCompositeContext.java rename to src/java.desktop/share/classes/sun/java2d/SunCompositeContext.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java b/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java rename to src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java b/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java rename to src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/Surface.java b/src/java.desktop/share/classes/sun/java2d/Surface.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/Surface.java rename to src/java.desktop/share/classes/sun/java2d/Surface.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SurfaceData.java b/src/java.desktop/share/classes/sun/java2d/SurfaceData.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/SurfaceData.java rename to src/java.desktop/share/classes/sun/java2d/SurfaceData.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SurfaceDataProxy.java b/src/java.desktop/share/classes/sun/java2d/SurfaceDataProxy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/SurfaceDataProxy.java rename to src/java.desktop/share/classes/sun/java2d/SurfaceDataProxy.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java b/src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java rename to src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/CMMServiceProvider.java b/src/java.desktop/share/classes/sun/java2d/cmm/CMMServiceProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/CMMServiceProvider.java rename to src/java.desktop/share/classes/sun/java2d/cmm/CMMServiceProvider.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/CMSManager.java b/src/java.desktop/share/classes/sun/java2d/cmm/CMSManager.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/CMSManager.java rename to src/java.desktop/share/classes/sun/java2d/cmm/CMSManager.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/ColorTransform.java b/src/java.desktop/share/classes/sun/java2d/cmm/ColorTransform.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/ColorTransform.java rename to src/java.desktop/share/classes/sun/java2d/cmm/ColorTransform.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/PCMM.java b/src/java.desktop/share/classes/sun/java2d/cmm/PCMM.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/PCMM.java rename to src/java.desktop/share/classes/sun/java2d/cmm/PCMM.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/Profile.java b/src/java.desktop/share/classes/sun/java2d/cmm/Profile.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/Profile.java rename to src/java.desktop/share/classes/sun/java2d/cmm/Profile.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileActivator.java b/src/java.desktop/share/classes/sun/java2d/cmm/ProfileActivator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileActivator.java rename to src/java.desktop/share/classes/sun/java2d/cmm/ProfileActivator.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDataVerifier.java b/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDataVerifier.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDataVerifier.java rename to src/java.desktop/share/classes/sun/java2d/cmm/ProfileDataVerifier.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java b/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java rename to src/java.desktop/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java b/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java rename to src/java.desktop/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java rename to src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java rename to src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java rename to src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java rename to src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LcmsServiceProvider.java b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LcmsServiceProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LcmsServiceProvider.java rename to src/java.desktop/share/classes/sun/java2d/cmm/lcms/LcmsServiceProvider.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/profiles/CIEXYZ.pf b/src/java.desktop/share/classes/sun/java2d/cmm/profiles/CIEXYZ.pf similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/profiles/CIEXYZ.pf rename to src/java.desktop/share/classes/sun/java2d/cmm/profiles/CIEXYZ.pf diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/profiles/GRAY.pf b/src/java.desktop/share/classes/sun/java2d/cmm/profiles/GRAY.pf similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/profiles/GRAY.pf rename to src/java.desktop/share/classes/sun/java2d/cmm/profiles/GRAY.pf diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/profiles/LINEAR_RGB.pf b/src/java.desktop/share/classes/sun/java2d/cmm/profiles/LINEAR_RGB.pf similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/profiles/LINEAR_RGB.pf rename to src/java.desktop/share/classes/sun/java2d/cmm/profiles/LINEAR_RGB.pf diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/profiles/PYCC.pf b/src/java.desktop/share/classes/sun/java2d/cmm/profiles/PYCC.pf similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/profiles/PYCC.pf rename to src/java.desktop/share/classes/sun/java2d/cmm/profiles/PYCC.pf diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/profiles/sRGB.pf b/src/java.desktop/share/classes/sun/java2d/cmm/profiles/sRGB.pf similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/cmm/profiles/sRGB.pf rename to src/java.desktop/share/classes/sun/java2d/cmm/profiles/sRGB.pf diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/Blit.java b/src/java.desktop/share/classes/sun/java2d/loops/Blit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/Blit.java rename to src/java.desktop/share/classes/sun/java2d/loops/Blit.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/BlitBg.java b/src/java.desktop/share/classes/sun/java2d/loops/BlitBg.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/BlitBg.java rename to src/java.desktop/share/classes/sun/java2d/loops/BlitBg.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java b/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java rename to src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/CustomComponent.java b/src/java.desktop/share/classes/sun/java2d/loops/CustomComponent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/CustomComponent.java rename to src/java.desktop/share/classes/sun/java2d/loops/CustomComponent.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java rename to src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java rename to src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java rename to src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java rename to src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java rename to src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java rename to src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java rename to src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java rename to src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java b/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java rename to src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java b/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java rename to src/java.desktop/share/classes/sun/java2d/loops/FillPath.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java b/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java rename to src/java.desktop/share/classes/sun/java2d/loops/FillRect.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java b/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java rename to src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FontInfo.java b/src/java.desktop/share/classes/sun/java2d/loops/FontInfo.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/FontInfo.java rename to src/java.desktop/share/classes/sun/java2d/loops/FontInfo.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/GeneralRenderer.java b/src/java.desktop/share/classes/sun/java2d/loops/GeneralRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/GeneralRenderer.java rename to src/java.desktop/share/classes/sun/java2d/loops/GeneralRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java rename to src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java rename to src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java rename to src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java b/src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java rename to src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java b/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java rename to src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java b/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java rename to src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/RenderCache.java b/src/java.desktop/share/classes/sun/java2d/loops/RenderCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/RenderCache.java rename to src/java.desktop/share/classes/sun/java2d/loops/RenderCache.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/RenderLoops.java b/src/java.desktop/share/classes/sun/java2d/loops/RenderLoops.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/RenderLoops.java rename to src/java.desktop/share/classes/sun/java2d/loops/RenderLoops.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/ScaledBlit.java b/src/java.desktop/share/classes/sun/java2d/loops/ScaledBlit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/ScaledBlit.java rename to src/java.desktop/share/classes/sun/java2d/loops/ScaledBlit.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/SurfaceType.java b/src/java.desktop/share/classes/sun/java2d/loops/SurfaceType.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/SurfaceType.java rename to src/java.desktop/share/classes/sun/java2d/loops/SurfaceType.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/TransformBlit.java b/src/java.desktop/share/classes/sun/java2d/loops/TransformBlit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/TransformBlit.java rename to src/java.desktop/share/classes/sun/java2d/loops/TransformBlit.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java b/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java rename to src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/XORComposite.java b/src/java.desktop/share/classes/sun/java2d/loops/XORComposite.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/loops/XORComposite.java rename to src/java.desktop/share/classes/sun/java2d/loops/XORComposite.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/ArrayCacheConst.java b/src/java.desktop/share/classes/sun/java2d/marlin/ArrayCacheConst.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/ArrayCacheConst.java rename to src/java.desktop/share/classes/sun/java2d/marlin/ArrayCacheConst.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/ByteArrayCache.java b/src/java.desktop/share/classes/sun/java2d/marlin/ByteArrayCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/ByteArrayCache.java rename to src/java.desktop/share/classes/sun/java2d/marlin/ByteArrayCache.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/CollinearSimplifier.java b/src/java.desktop/share/classes/sun/java2d/marlin/CollinearSimplifier.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/CollinearSimplifier.java rename to src/java.desktop/share/classes/sun/java2d/marlin/CollinearSimplifier.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/Curve.java b/src/java.desktop/share/classes/sun/java2d/marlin/Curve.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/Curve.java rename to src/java.desktop/share/classes/sun/java2d/marlin/Curve.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/DCollinearSimplifier.java b/src/java.desktop/share/classes/sun/java2d/marlin/DCollinearSimplifier.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/DCollinearSimplifier.java rename to src/java.desktop/share/classes/sun/java2d/marlin/DCollinearSimplifier.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/DCurve.java b/src/java.desktop/share/classes/sun/java2d/marlin/DCurve.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/DCurve.java rename to src/java.desktop/share/classes/sun/java2d/marlin/DCurve.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/DDasher.java b/src/java.desktop/share/classes/sun/java2d/marlin/DDasher.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/DDasher.java rename to src/java.desktop/share/classes/sun/java2d/marlin/DDasher.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/DHelpers.java b/src/java.desktop/share/classes/sun/java2d/marlin/DHelpers.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/DHelpers.java rename to src/java.desktop/share/classes/sun/java2d/marlin/DHelpers.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java b/src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java rename to src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/DPathConsumer2D.java b/src/java.desktop/share/classes/sun/java2d/marlin/DPathConsumer2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/DPathConsumer2D.java rename to src/java.desktop/share/classes/sun/java2d/marlin/DPathConsumer2D.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/DRenderer.java b/src/java.desktop/share/classes/sun/java2d/marlin/DRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/DRenderer.java rename to src/java.desktop/share/classes/sun/java2d/marlin/DRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/DRendererContext.java b/src/java.desktop/share/classes/sun/java2d/marlin/DRendererContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/DRendererContext.java rename to src/java.desktop/share/classes/sun/java2d/marlin/DRendererContext.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/DStroker.java b/src/java.desktop/share/classes/sun/java2d/marlin/DStroker.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/DStroker.java rename to src/java.desktop/share/classes/sun/java2d/marlin/DStroker.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/DTransformingPathConsumer2D.java b/src/java.desktop/share/classes/sun/java2d/marlin/DTransformingPathConsumer2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/DTransformingPathConsumer2D.java rename to src/java.desktop/share/classes/sun/java2d/marlin/DTransformingPathConsumer2D.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/Dasher.java b/src/java.desktop/share/classes/sun/java2d/marlin/Dasher.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/Dasher.java rename to src/java.desktop/share/classes/sun/java2d/marlin/Dasher.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/DoubleArrayCache.java b/src/java.desktop/share/classes/sun/java2d/marlin/DoubleArrayCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/DoubleArrayCache.java rename to src/java.desktop/share/classes/sun/java2d/marlin/DoubleArrayCache.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/FloatArrayCache.java b/src/java.desktop/share/classes/sun/java2d/marlin/FloatArrayCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/FloatArrayCache.java rename to src/java.desktop/share/classes/sun/java2d/marlin/FloatArrayCache.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/FloatMath.java b/src/java.desktop/share/classes/sun/java2d/marlin/FloatMath.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/FloatMath.java rename to src/java.desktop/share/classes/sun/java2d/marlin/FloatMath.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/Helpers.java b/src/java.desktop/share/classes/sun/java2d/marlin/Helpers.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/Helpers.java rename to src/java.desktop/share/classes/sun/java2d/marlin/Helpers.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/IRendererContext.java b/src/java.desktop/share/classes/sun/java2d/marlin/IRendererContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/IRendererContext.java rename to src/java.desktop/share/classes/sun/java2d/marlin/IRendererContext.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/IntArrayCache.java b/src/java.desktop/share/classes/sun/java2d/marlin/IntArrayCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/IntArrayCache.java rename to src/java.desktop/share/classes/sun/java2d/marlin/IntArrayCache.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinCache.java b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinCache.java rename to src/java.desktop/share/classes/sun/java2d/marlin/MarlinCache.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinConst.java b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinConst.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinConst.java rename to src/java.desktop/share/classes/sun/java2d/marlin/MarlinConst.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinProperties.java b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinProperties.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinProperties.java rename to src/java.desktop/share/classes/sun/java2d/marlin/MarlinProperties.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinRenderer.java b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinRenderer.java rename to src/java.desktop/share/classes/sun/java2d/marlin/MarlinRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinRenderingEngine.java b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinRenderingEngine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinRenderingEngine.java rename to src/java.desktop/share/classes/sun/java2d/marlin/MarlinRenderingEngine.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinTileGenerator.java b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinTileGenerator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinTileGenerator.java rename to src/java.desktop/share/classes/sun/java2d/marlin/MarlinTileGenerator.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinUtils.java b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinUtils.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinUtils.java rename to src/java.desktop/share/classes/sun/java2d/marlin/MarlinUtils.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/MergeSort.java b/src/java.desktop/share/classes/sun/java2d/marlin/MergeSort.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/MergeSort.java rename to src/java.desktop/share/classes/sun/java2d/marlin/MergeSort.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/OffHeapArray.java b/src/java.desktop/share/classes/sun/java2d/marlin/OffHeapArray.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/OffHeapArray.java rename to src/java.desktop/share/classes/sun/java2d/marlin/OffHeapArray.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/Renderer.java b/src/java.desktop/share/classes/sun/java2d/marlin/Renderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/Renderer.java rename to src/java.desktop/share/classes/sun/java2d/marlin/Renderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/RendererContext.java b/src/java.desktop/share/classes/sun/java2d/marlin/RendererContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/RendererContext.java rename to src/java.desktop/share/classes/sun/java2d/marlin/RendererContext.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/RendererStats.java b/src/java.desktop/share/classes/sun/java2d/marlin/RendererStats.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/RendererStats.java rename to src/java.desktop/share/classes/sun/java2d/marlin/RendererStats.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/Stroker.java b/src/java.desktop/share/classes/sun/java2d/marlin/Stroker.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/Stroker.java rename to src/java.desktop/share/classes/sun/java2d/marlin/Stroker.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/TransformingPathConsumer2D.java b/src/java.desktop/share/classes/sun/java2d/marlin/TransformingPathConsumer2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/TransformingPathConsumer2D.java rename to src/java.desktop/share/classes/sun/java2d/marlin/TransformingPathConsumer2D.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/Version.java b/src/java.desktop/share/classes/sun/java2d/marlin/Version.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/Version.java rename to src/java.desktop/share/classes/sun/java2d/marlin/Version.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/stats/Histogram.java b/src/java.desktop/share/classes/sun/java2d/marlin/stats/Histogram.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/stats/Histogram.java rename to src/java.desktop/share/classes/sun/java2d/marlin/stats/Histogram.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/stats/Monitor.java b/src/java.desktop/share/classes/sun/java2d/marlin/stats/Monitor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/stats/Monitor.java rename to src/java.desktop/share/classes/sun/java2d/marlin/stats/Monitor.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/stats/StatLong.java b/src/java.desktop/share/classes/sun/java2d/marlin/stats/StatLong.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/marlin/stats/StatLong.java rename to src/java.desktop/share/classes/sun/java2d/marlin/stats/StatLong.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLBlitLoops.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLBlitLoops.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLBlitLoops.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLBlitLoops.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLBufImgOps.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLBufImgOps.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLBufImgOps.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLBufImgOps.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLContext.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLContext.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLContext.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLDrawImage.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLDrawImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLDrawImage.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLDrawImage.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLMaskBlit.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLMaskBlit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLMaskBlit.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLMaskBlit.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLMaskFill.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLMaskFill.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLMaskFill.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLMaskFill.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLPaints.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLPaints.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLPaints.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLPaints.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderQueue.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderQueue.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderQueue.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderQueue.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderer.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderer.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceData.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceData.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceData.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLTextRenderer.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLTextRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLTextRenderer.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLTextRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLUtilities.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLUtilities.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/opengl/OGLUtilities.java rename to src/java.desktop/share/classes/sun/java2d/opengl/OGLUtilities.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AAShapePipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/AAShapePipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/AAShapePipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/AAShapePipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AATextRenderer.java b/src/java.desktop/share/classes/sun/java2d/pipe/AATextRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/AATextRenderer.java rename to src/java.desktop/share/classes/sun/java2d/pipe/AATextRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AATileGenerator.java b/src/java.desktop/share/classes/sun/java2d/pipe/AATileGenerator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/AATileGenerator.java rename to src/java.desktop/share/classes/sun/java2d/pipe/AATileGenerator.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AlphaColorPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/AlphaColorPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/AlphaColorPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/AlphaColorPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AlphaPaintPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/AlphaPaintPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/AlphaPaintPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/AlphaPaintPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedBufImgOps.java b/src/java.desktop/share/classes/sun/java2d/pipe/BufferedBufImgOps.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedBufImgOps.java rename to src/java.desktop/share/classes/sun/java2d/pipe/BufferedBufImgOps.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java b/src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java rename to src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedMaskBlit.java b/src/java.desktop/share/classes/sun/java2d/pipe/BufferedMaskBlit.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedMaskBlit.java rename to src/java.desktop/share/classes/sun/java2d/pipe/BufferedMaskBlit.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedMaskFill.java b/src/java.desktop/share/classes/sun/java2d/pipe/BufferedMaskFill.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedMaskFill.java rename to src/java.desktop/share/classes/sun/java2d/pipe/BufferedMaskFill.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedOpCodes.java b/src/java.desktop/share/classes/sun/java2d/pipe/BufferedOpCodes.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedOpCodes.java rename to src/java.desktop/share/classes/sun/java2d/pipe/BufferedOpCodes.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedPaints.java b/src/java.desktop/share/classes/sun/java2d/pipe/BufferedPaints.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedPaints.java rename to src/java.desktop/share/classes/sun/java2d/pipe/BufferedPaints.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedRenderPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/BufferedRenderPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedRenderPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/BufferedRenderPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedTextPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/BufferedTextPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/BufferedTextPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/BufferedTextPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/CompositePipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/CompositePipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/CompositePipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/CompositePipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java b/src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java rename to src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/DrawImagePipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/DrawImagePipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/DrawImagePipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/DrawImagePipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/GeneralCompositePipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/GeneralCompositePipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/GeneralCompositePipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/GeneralCompositePipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/GlyphListPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/LCDTextRenderer.java b/src/java.desktop/share/classes/sun/java2d/pipe/LCDTextRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/LCDTextRenderer.java rename to src/java.desktop/share/classes/sun/java2d/pipe/LCDTextRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopBasedPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/LoopBasedPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopBasedPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/LoopBasedPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/NullPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/NullPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/NullPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/NullPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/OutlineTextRenderer.java b/src/java.desktop/share/classes/sun/java2d/pipe/OutlineTextRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/OutlineTextRenderer.java rename to src/java.desktop/share/classes/sun/java2d/pipe/OutlineTextRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/ParallelogramPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/ParallelogramPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/ParallelogramPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/ParallelogramPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelDrawPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/PixelDrawPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelDrawPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/PixelDrawPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelFillPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/PixelFillPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelFillPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/PixelFillPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java b/src/java.desktop/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java rename to src/java.desktop/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelToShapeConverter.java b/src/java.desktop/share/classes/sun/java2d/pipe/PixelToShapeConverter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/PixelToShapeConverter.java rename to src/java.desktop/share/classes/sun/java2d/pipe/PixelToShapeConverter.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/Region.java b/src/java.desktop/share/classes/sun/java2d/pipe/Region.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/Region.java rename to src/java.desktop/share/classes/sun/java2d/pipe/Region.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java b/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java rename to src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionIterator.java b/src/java.desktop/share/classes/sun/java2d/pipe/RegionIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionIterator.java rename to src/java.desktop/share/classes/sun/java2d/pipe/RegionIterator.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java b/src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java rename to src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderBuffer.java b/src/java.desktop/share/classes/sun/java2d/pipe/RenderBuffer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderBuffer.java rename to src/java.desktop/share/classes/sun/java2d/pipe/RenderBuffer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderQueue.java b/src/java.desktop/share/classes/sun/java2d/pipe/RenderQueue.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderQueue.java rename to src/java.desktop/share/classes/sun/java2d/pipe/RenderQueue.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java b/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java rename to src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/ShapeDrawPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/ShapeDrawPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/ShapeDrawPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/ShapeDrawPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/ShapeSpanIterator.java b/src/java.desktop/share/classes/sun/java2d/pipe/ShapeSpanIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/ShapeSpanIterator.java rename to src/java.desktop/share/classes/sun/java2d/pipe/ShapeSpanIterator.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SolidTextRenderer.java b/src/java.desktop/share/classes/sun/java2d/pipe/SolidTextRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/SolidTextRenderer.java rename to src/java.desktop/share/classes/sun/java2d/pipe/SolidTextRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java b/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java rename to src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanIterator.java b/src/java.desktop/share/classes/sun/java2d/pipe/SpanIterator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanIterator.java rename to src/java.desktop/share/classes/sun/java2d/pipe/SpanIterator.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java b/src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java rename to src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/TextPipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/TextPipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/TextPipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/TextPipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/TextRenderer.java b/src/java.desktop/share/classes/sun/java2d/pipe/TextRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/TextRenderer.java rename to src/java.desktop/share/classes/sun/java2d/pipe/TextRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/ValidatePipe.java b/src/java.desktop/share/classes/sun/java2d/pipe/ValidatePipe.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/ValidatePipe.java rename to src/java.desktop/share/classes/sun/java2d/pipe/ValidatePipe.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelGraphicsConfig.java b/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelGraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelGraphicsConfig.java rename to src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelGraphicsConfig.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelSurface.java b/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelSurface.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelSurface.java rename to src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelSurface.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java b/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java rename to src/java.desktop/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java b/src/java.desktop/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java rename to src/java.desktop/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java b/src/java.desktop/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java rename to src/java.desktop/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java b/src/java.desktop/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java rename to src/java.desktop/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Curve.java b/src/java.desktop/share/classes/sun/java2d/pisces/Curve.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pisces/Curve.java rename to src/java.desktop/share/classes/sun/java2d/pisces/Curve.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Dasher.java b/src/java.desktop/share/classes/sun/java2d/pisces/Dasher.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pisces/Dasher.java rename to src/java.desktop/share/classes/sun/java2d/pisces/Dasher.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Helpers.java b/src/java.desktop/share/classes/sun/java2d/pisces/Helpers.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pisces/Helpers.java rename to src/java.desktop/share/classes/sun/java2d/pisces/Helpers.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pisces/PiscesCache.java b/src/java.desktop/share/classes/sun/java2d/pisces/PiscesCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pisces/PiscesCache.java rename to src/java.desktop/share/classes/sun/java2d/pisces/PiscesCache.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java b/src/java.desktop/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java rename to src/java.desktop/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pisces/PiscesTileGenerator.java b/src/java.desktop/share/classes/sun/java2d/pisces/PiscesTileGenerator.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pisces/PiscesTileGenerator.java rename to src/java.desktop/share/classes/sun/java2d/pisces/PiscesTileGenerator.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Renderer.java b/src/java.desktop/share/classes/sun/java2d/pisces/Renderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pisces/Renderer.java rename to src/java.desktop/share/classes/sun/java2d/pisces/Renderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pisces/Stroker.java b/src/java.desktop/share/classes/sun/java2d/pisces/Stroker.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pisces/Stroker.java rename to src/java.desktop/share/classes/sun/java2d/pisces/Stroker.java diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java b/src/java.desktop/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java rename to src/java.desktop/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/AttributeUpdater.java b/src/java.desktop/share/classes/sun/print/AttributeUpdater.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/AttributeUpdater.java rename to src/java.desktop/share/classes/sun/print/AttributeUpdater.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/BackgroundLookupListener.java b/src/java.desktop/share/classes/sun/print/BackgroundLookupListener.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/BackgroundLookupListener.java rename to src/java.desktop/share/classes/sun/print/BackgroundLookupListener.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/BackgroundServiceLookup.java b/src/java.desktop/share/classes/sun/print/BackgroundServiceLookup.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/BackgroundServiceLookup.java rename to src/java.desktop/share/classes/sun/print/BackgroundServiceLookup.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java b/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java rename to src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/CustomMediaTray.java b/src/java.desktop/share/classes/sun/print/CustomMediaTray.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/CustomMediaTray.java rename to src/java.desktop/share/classes/sun/print/CustomMediaTray.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/DialogOnTop.java b/src/java.desktop/share/classes/sun/print/DialogOnTop.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/DialogOnTop.java rename to src/java.desktop/share/classes/sun/print/DialogOnTop.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/DialogOwner.java b/src/java.desktop/share/classes/sun/print/DialogOwner.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/DialogOwner.java rename to src/java.desktop/share/classes/sun/print/DialogOwner.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/DocumentPropertiesUI.java b/src/java.desktop/share/classes/sun/print/DocumentPropertiesUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/DocumentPropertiesUI.java rename to src/java.desktop/share/classes/sun/print/DocumentPropertiesUI.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/ImagePrinter.java b/src/java.desktop/share/classes/sun/print/ImagePrinter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/ImagePrinter.java rename to src/java.desktop/share/classes/sun/print/ImagePrinter.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/OpenBook.java b/src/java.desktop/share/classes/sun/print/OpenBook.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/OpenBook.java rename to src/java.desktop/share/classes/sun/print/OpenBook.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PSPathGraphics.java b/src/java.desktop/share/classes/sun/print/PSPathGraphics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PSPathGraphics.java rename to src/java.desktop/share/classes/sun/print/PSPathGraphics.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java rename to src/java.desktop/share/classes/sun/print/PSPrinterJob.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java b/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java rename to src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java b/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java rename to src/java.desktop/share/classes/sun/print/PSStreamPrintService.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrinterFactory.java b/src/java.desktop/share/classes/sun/print/PSStreamPrinterFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PSStreamPrinterFactory.java rename to src/java.desktop/share/classes/sun/print/PSStreamPrinterFactory.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PageableDoc.java b/src/java.desktop/share/classes/sun/print/PageableDoc.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PageableDoc.java rename to src/java.desktop/share/classes/sun/print/PageableDoc.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PathGraphics.java b/src/java.desktop/share/classes/sun/print/PathGraphics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PathGraphics.java rename to src/java.desktop/share/classes/sun/print/PathGraphics.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PeekGraphics.java b/src/java.desktop/share/classes/sun/print/PeekGraphics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PeekGraphics.java rename to src/java.desktop/share/classes/sun/print/PeekGraphics.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PeekMetrics.java b/src/java.desktop/share/classes/sun/print/PeekMetrics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PeekMetrics.java rename to src/java.desktop/share/classes/sun/print/PeekMetrics.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PrintJob2D.java b/src/java.desktop/share/classes/sun/print/PrintJob2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PrintJob2D.java rename to src/java.desktop/share/classes/sun/print/PrintJob2D.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PrintJobAttributeException.java b/src/java.desktop/share/classes/sun/print/PrintJobAttributeException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PrintJobAttributeException.java rename to src/java.desktop/share/classes/sun/print/PrintJobAttributeException.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PrintJobFlavorException.java b/src/java.desktop/share/classes/sun/print/PrintJobFlavorException.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PrintJobFlavorException.java rename to src/java.desktop/share/classes/sun/print/PrintJobFlavorException.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsConfig.java b/src/java.desktop/share/classes/sun/print/PrinterGraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsConfig.java rename to src/java.desktop/share/classes/sun/print/PrinterGraphicsConfig.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsDevice.java b/src/java.desktop/share/classes/sun/print/PrinterGraphicsDevice.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsDevice.java rename to src/java.desktop/share/classes/sun/print/PrinterGraphicsDevice.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/PrinterJobWrapper.java b/src/java.desktop/share/classes/sun/print/PrinterJobWrapper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/PrinterJobWrapper.java rename to src/java.desktop/share/classes/sun/print/PrinterJobWrapper.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics.java b/src/java.desktop/share/classes/sun/print/ProxyGraphics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics.java rename to src/java.desktop/share/classes/sun/print/ProxyGraphics.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics2D.java b/src/java.desktop/share/classes/sun/print/ProxyGraphics2D.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics2D.java rename to src/java.desktop/share/classes/sun/print/ProxyGraphics2D.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/ProxyPrintGraphics.java b/src/java.desktop/share/classes/sun/print/ProxyPrintGraphics.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/ProxyPrintGraphics.java rename to src/java.desktop/share/classes/sun/print/ProxyPrintGraphics.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java rename to src/java.desktop/share/classes/sun/print/RasterPrinterJob.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java b/src/java.desktop/share/classes/sun/print/ServiceDialog.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java rename to src/java.desktop/share/classes/sun/print/ServiceDialog.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/ServiceNotifier.java b/src/java.desktop/share/classes/sun/print/ServiceNotifier.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/ServiceNotifier.java rename to src/java.desktop/share/classes/sun/print/ServiceNotifier.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/SunAlternateMedia.java b/src/java.desktop/share/classes/sun/print/SunAlternateMedia.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/SunAlternateMedia.java rename to src/java.desktop/share/classes/sun/print/SunAlternateMedia.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/SunMinMaxPage.java b/src/java.desktop/share/classes/sun/print/SunMinMaxPage.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/SunMinMaxPage.java rename to src/java.desktop/share/classes/sun/print/SunMinMaxPage.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/SunPageSelection.java b/src/java.desktop/share/classes/sun/print/SunPageSelection.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/SunPageSelection.java rename to src/java.desktop/share/classes/sun/print/SunPageSelection.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/SunPrinterJobService.java b/src/java.desktop/share/classes/sun/print/SunPrinterJobService.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/SunPrinterJobService.java rename to src/java.desktop/share/classes/sun/print/SunPrinterJobService.java diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/duplex.png b/src/java.desktop/share/classes/sun/print/resources/duplex.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/duplex.png rename to src/java.desktop/share/classes/sun/print/resources/duplex.png diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/oneside.png b/src/java.desktop/share/classes/sun/print/resources/oneside.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/oneside.png rename to src/java.desktop/share/classes/sun/print/resources/oneside.png diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/orientLandscape.png b/src/java.desktop/share/classes/sun/print/resources/orientLandscape.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/orientLandscape.png rename to src/java.desktop/share/classes/sun/print/resources/orientLandscape.png diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/orientPortrait.png b/src/java.desktop/share/classes/sun/print/resources/orientPortrait.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/orientPortrait.png rename to src/java.desktop/share/classes/sun/print/resources/orientPortrait.png diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/orientRevLandscape.png b/src/java.desktop/share/classes/sun/print/resources/orientRevLandscape.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/orientRevLandscape.png rename to src/java.desktop/share/classes/sun/print/resources/orientRevLandscape.png diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/orientRevPortrait.png b/src/java.desktop/share/classes/sun/print/resources/orientRevPortrait.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/orientRevPortrait.png rename to src/java.desktop/share/classes/sun/print/resources/orientRevPortrait.png diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/serviceui.properties rename to src/java.desktop/share/classes/sun/print/resources/serviceui.properties diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties rename to src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties rename to src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties rename to src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties rename to src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties rename to src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties rename to src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties rename to src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties rename to src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties rename to src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties rename to src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties diff --git a/jdk/src/java.desktop/share/classes/sun/print/resources/tumble.png b/src/java.desktop/share/classes/sun/print/resources/tumble.png similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/print/resources/tumble.png rename to src/java.desktop/share/classes/sun/print/resources/tumble.png diff --git a/jdk/src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java b/src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java rename to src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/BakedArrayList.java b/src/java.desktop/share/classes/sun/swing/BakedArrayList.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/BakedArrayList.java rename to src/java.desktop/share/classes/sun/swing/BakedArrayList.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/CachedPainter.java b/src/java.desktop/share/classes/sun/swing/CachedPainter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/CachedPainter.java rename to src/java.desktop/share/classes/sun/swing/CachedPainter.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/DefaultLayoutStyle.java b/src/java.desktop/share/classes/sun/swing/DefaultLayoutStyle.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/DefaultLayoutStyle.java rename to src/java.desktop/share/classes/sun/swing/DefaultLayoutStyle.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/DefaultLookup.java b/src/java.desktop/share/classes/sun/swing/DefaultLookup.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/DefaultLookup.java rename to src/java.desktop/share/classes/sun/swing/DefaultLookup.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/FilePane.java b/src/java.desktop/share/classes/sun/swing/FilePane.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/FilePane.java rename to src/java.desktop/share/classes/sun/swing/FilePane.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/ImageCache.java b/src/java.desktop/share/classes/sun/swing/ImageCache.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/ImageCache.java rename to src/java.desktop/share/classes/sun/swing/ImageCache.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/ImageIconUIResource.java b/src/java.desktop/share/classes/sun/swing/ImageIconUIResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/ImageIconUIResource.java rename to src/java.desktop/share/classes/sun/swing/ImageIconUIResource.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java b/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java rename to src/java.desktop/share/classes/sun/swing/JLightweightFrame.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/LightweightContent.java b/src/java.desktop/share/classes/sun/swing/LightweightContent.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/LightweightContent.java rename to src/java.desktop/share/classes/sun/swing/LightweightContent.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/MenuItemCheckIconFactory.java b/src/java.desktop/share/classes/sun/swing/MenuItemCheckIconFactory.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/MenuItemCheckIconFactory.java rename to src/java.desktop/share/classes/sun/swing/MenuItemCheckIconFactory.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/MenuItemLayoutHelper.java b/src/java.desktop/share/classes/sun/swing/MenuItemLayoutHelper.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/MenuItemLayoutHelper.java rename to src/java.desktop/share/classes/sun/swing/MenuItemLayoutHelper.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/PrintColorUIResource.java b/src/java.desktop/share/classes/sun/swing/PrintColorUIResource.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/PrintColorUIResource.java rename to src/java.desktop/share/classes/sun/swing/PrintColorUIResource.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/PrintingStatus.java b/src/java.desktop/share/classes/sun/swing/PrintingStatus.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/PrintingStatus.java rename to src/java.desktop/share/classes/sun/swing/PrintingStatus.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/StringUIClientPropertyKey.java b/src/java.desktop/share/classes/sun/swing/StringUIClientPropertyKey.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/StringUIClientPropertyKey.java rename to src/java.desktop/share/classes/sun/swing/StringUIClientPropertyKey.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/SwingAccessor.java b/src/java.desktop/share/classes/sun/swing/SwingAccessor.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/SwingAccessor.java rename to src/java.desktop/share/classes/sun/swing/SwingAccessor.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java rename to src/java.desktop/share/classes/sun/swing/SwingUtilities2.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/UIAction.java b/src/java.desktop/share/classes/sun/swing/UIAction.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/UIAction.java rename to src/java.desktop/share/classes/sun/swing/UIAction.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java b/src/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java rename to src/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/icon/SortArrowIcon.java b/src/java.desktop/share/classes/sun/swing/icon/SortArrowIcon.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/icon/SortArrowIcon.java rename to src/java.desktop/share/classes/sun/swing/icon/SortArrowIcon.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/plaf/GTKKeybindings.java b/src/java.desktop/share/classes/sun/swing/plaf/GTKKeybindings.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/plaf/GTKKeybindings.java rename to src/java.desktop/share/classes/sun/swing/plaf/GTKKeybindings.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/plaf/WindowsKeybindings.java b/src/java.desktop/share/classes/sun/swing/plaf/WindowsKeybindings.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/plaf/WindowsKeybindings.java rename to src/java.desktop/share/classes/sun/swing/plaf/WindowsKeybindings.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java b/src/java.desktop/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java rename to src/java.desktop/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/Paint9Painter.java b/src/java.desktop/share/classes/sun/swing/plaf/synth/Paint9Painter.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/Paint9Painter.java rename to src/java.desktop/share/classes/sun/swing/plaf/synth/Paint9Painter.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/StyleAssociation.java b/src/java.desktop/share/classes/sun/swing/plaf/synth/StyleAssociation.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/StyleAssociation.java rename to src/java.desktop/share/classes/sun/swing/plaf/synth/StyleAssociation.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java b/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java rename to src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java b/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java rename to src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java b/src/java.desktop/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java rename to src/java.desktop/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java b/src/java.desktop/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java rename to src/java.desktop/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/text/CompoundPrintable.java b/src/java.desktop/share/classes/sun/swing/text/CompoundPrintable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/text/CompoundPrintable.java rename to src/java.desktop/share/classes/sun/swing/text/CompoundPrintable.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/text/CountingPrintable.java b/src/java.desktop/share/classes/sun/swing/text/CountingPrintable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/text/CountingPrintable.java rename to src/java.desktop/share/classes/sun/swing/text/CountingPrintable.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java b/src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java rename to src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/text/UndoableEditLockSupport.java b/src/java.desktop/share/classes/sun/swing/text/UndoableEditLockSupport.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/text/UndoableEditLockSupport.java rename to src/java.desktop/share/classes/sun/swing/text/UndoableEditLockSupport.java diff --git a/jdk/src/java.desktop/share/classes/sun/swing/text/html/FrameEditorPaneTag.java b/src/java.desktop/share/classes/sun/swing/text/html/FrameEditorPaneTag.java similarity index 100% rename from jdk/src/java.desktop/share/classes/sun/swing/text/html/FrameEditorPaneTag.java rename to src/java.desktop/share/classes/sun/swing/text/html/FrameEditorPaneTag.java diff --git a/jdk/src/java.desktop/share/conf/psfont.properties.ja b/src/java.desktop/share/conf/psfont.properties.ja similarity index 100% rename from jdk/src/java.desktop/share/conf/psfont.properties.ja rename to src/java.desktop/share/conf/psfont.properties.ja diff --git a/jdk/src/java.desktop/share/conf/psfontj2d.properties b/src/java.desktop/share/conf/psfontj2d.properties similarity index 100% rename from jdk/src/java.desktop/share/conf/psfontj2d.properties rename to src/java.desktop/share/conf/psfontj2d.properties diff --git a/jdk/src/java.desktop/share/conf/sound.properties b/src/java.desktop/share/conf/sound.properties similarity index 100% rename from jdk/src/java.desktop/share/conf/sound.properties rename to src/java.desktop/share/conf/sound.properties diff --git a/jdk/src/java.desktop/share/legal/colorimaging.md b/src/java.desktop/share/legal/colorimaging.md similarity index 100% rename from jdk/src/java.desktop/share/legal/colorimaging.md rename to src/java.desktop/share/legal/colorimaging.md diff --git a/jdk/src/java.desktop/share/legal/giflib.md b/src/java.desktop/share/legal/giflib.md similarity index 100% rename from jdk/src/java.desktop/share/legal/giflib.md rename to src/java.desktop/share/legal/giflib.md diff --git a/jdk/src/java.desktop/share/legal/harfbuzz.md b/src/java.desktop/share/legal/harfbuzz.md similarity index 100% rename from jdk/src/java.desktop/share/legal/harfbuzz.md rename to src/java.desktop/share/legal/harfbuzz.md diff --git a/jdk/src/java.desktop/share/legal/jpeg.md b/src/java.desktop/share/legal/jpeg.md similarity index 100% rename from jdk/src/java.desktop/share/legal/jpeg.md rename to src/java.desktop/share/legal/jpeg.md diff --git a/jdk/src/java.desktop/share/legal/lcms.md b/src/java.desktop/share/legal/lcms.md similarity index 100% rename from jdk/src/java.desktop/share/legal/lcms.md rename to src/java.desktop/share/legal/lcms.md diff --git a/jdk/src/java.desktop/share/legal/libpng.md b/src/java.desktop/share/legal/libpng.md similarity index 100% rename from jdk/src/java.desktop/share/legal/libpng.md rename to src/java.desktop/share/legal/libpng.md diff --git a/jdk/src/java.desktop/share/legal/mesa3d.md b/src/java.desktop/share/legal/mesa3d.md similarity index 100% rename from jdk/src/java.desktop/share/legal/mesa3d.md rename to src/java.desktop/share/legal/mesa3d.md diff --git a/jdk/src/java.desktop/share/legal/opengl.md b/src/java.desktop/share/legal/opengl.md similarity index 100% rename from jdk/src/java.desktop/share/legal/opengl.md rename to src/java.desktop/share/legal/opengl.md diff --git a/jdk/src/java.desktop/share/native/common/awt/debug/debug_assert.c b/src/java.desktop/share/native/common/awt/debug/debug_assert.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/awt/debug/debug_assert.c rename to src/java.desktop/share/native/common/awt/debug/debug_assert.c diff --git a/jdk/src/java.desktop/share/native/common/awt/debug/debug_assert.h b/src/java.desktop/share/native/common/awt/debug/debug_assert.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/awt/debug/debug_assert.h rename to src/java.desktop/share/native/common/awt/debug/debug_assert.h diff --git a/jdk/src/java.desktop/share/native/common/awt/debug/debug_mem.c b/src/java.desktop/share/native/common/awt/debug/debug_mem.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/awt/debug/debug_mem.c rename to src/java.desktop/share/native/common/awt/debug/debug_mem.c diff --git a/jdk/src/java.desktop/share/native/common/awt/debug/debug_mem.h b/src/java.desktop/share/native/common/awt/debug/debug_mem.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/awt/debug/debug_mem.h rename to src/java.desktop/share/native/common/awt/debug/debug_mem.h diff --git a/jdk/src/java.desktop/share/native/common/awt/debug/debug_trace.c b/src/java.desktop/share/native/common/awt/debug/debug_trace.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/awt/debug/debug_trace.c rename to src/java.desktop/share/native/common/awt/debug/debug_trace.c diff --git a/jdk/src/java.desktop/share/native/common/awt/debug/debug_trace.h b/src/java.desktop/share/native/common/awt/debug/debug_trace.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/awt/debug/debug_trace.h rename to src/java.desktop/share/native/common/awt/debug/debug_trace.h diff --git a/jdk/src/java.desktop/share/native/common/awt/debug/debug_util.c b/src/java.desktop/share/native/common/awt/debug/debug_util.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/awt/debug/debug_util.c rename to src/java.desktop/share/native/common/awt/debug/debug_util.c diff --git a/jdk/src/java.desktop/share/native/common/awt/debug/debug_util.h b/src/java.desktop/share/native/common/awt/debug/debug_util.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/awt/debug/debug_util.h rename to src/java.desktop/share/native/common/awt/debug/debug_util.h diff --git a/jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCopy_Bit.c b/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCopy_Bit.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCopy_Bit.c rename to src/java.desktop/share/native/common/awt/medialib/mlib_ImageCopy_Bit.c diff --git a/jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c b/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c rename to src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c diff --git a/jdk/src/java.desktop/share/native/common/awt/medialib/mlib_sys.c b/src/java.desktop/share/native/common/awt/medialib/mlib_sys.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/awt/medialib/mlib_sys.c rename to src/java.desktop/share/native/common/awt/medialib/mlib_sys.c diff --git a/jdk/src/java.desktop/share/native/common/awt/utility/rect.c b/src/java.desktop/share/native/common/awt/utility/rect.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/awt/utility/rect.c rename to src/java.desktop/share/native/common/awt/utility/rect.c diff --git a/jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.c b/src/java.desktop/share/native/common/font/AccelGlyphCache.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.c rename to src/java.desktop/share/native/common/font/AccelGlyphCache.c diff --git a/jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.h b/src/java.desktop/share/native/common/font/AccelGlyphCache.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.h rename to src/java.desktop/share/native/common/font/AccelGlyphCache.h diff --git a/jdk/src/java.desktop/share/native/common/font/fontscalerdefs.h b/src/java.desktop/share/native/common/font/fontscalerdefs.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/font/fontscalerdefs.h rename to src/java.desktop/share/native/common/font/fontscalerdefs.h diff --git a/jdk/src/java.desktop/share/native/common/font/sunfontids.h b/src/java.desktop/share/native/common/font/sunfontids.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/font/sunfontids.h rename to src/java.desktop/share/native/common/font/sunfontids.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL/gl.h b/src/java.desktop/share/native/common/java2d/opengl/J2D_GL/gl.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL/gl.h rename to src/java.desktop/share/native/common/java2d/opengl/J2D_GL/gl.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL/glext.h b/src/java.desktop/share/native/common/java2d/opengl/J2D_GL/glext.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL/glext.h rename to src/java.desktop/share/native/common/java2d/opengl/J2D_GL/glext.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c b/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c rename to src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.h b/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBufImgOps.c b/src/java.desktop/share/native/common/java2d/opengl/OGLBufImgOps.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBufImgOps.c rename to src/java.desktop/share/native/common/java2d/opengl/OGLBufImgOps.c diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBufImgOps.h b/src/java.desktop/share/native/common/java2d/opengl/OGLBufImgOps.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBufImgOps.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLBufImgOps.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c b/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c rename to src/java.desktop/share/native/common/java2d/opengl/OGLContext.c diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h b/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLContext.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLFuncMacros.h b/src/java.desktop/share/native/common/java2d/opengl/OGLFuncMacros.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLFuncMacros.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLFuncMacros.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLFuncs.c b/src/java.desktop/share/native/common/java2d/opengl/OGLFuncs.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLFuncs.c rename to src/java.desktop/share/native/common/java2d/opengl/OGLFuncs.c diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLFuncs.h b/src/java.desktop/share/native/common/java2d/opengl/OGLFuncs.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLFuncs.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLFuncs.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskBlit.c b/src/java.desktop/share/native/common/java2d/opengl/OGLMaskBlit.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskBlit.c rename to src/java.desktop/share/native/common/java2d/opengl/OGLMaskBlit.c diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskBlit.h b/src/java.desktop/share/native/common/java2d/opengl/OGLMaskBlit.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskBlit.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLMaskBlit.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskFill.c b/src/java.desktop/share/native/common/java2d/opengl/OGLMaskFill.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskFill.c rename to src/java.desktop/share/native/common/java2d/opengl/OGLMaskFill.c diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskFill.h b/src/java.desktop/share/native/common/java2d/opengl/OGLMaskFill.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskFill.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLMaskFill.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLPaints.c b/src/java.desktop/share/native/common/java2d/opengl/OGLPaints.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLPaints.c rename to src/java.desktop/share/native/common/java2d/opengl/OGLPaints.c diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLPaints.h b/src/java.desktop/share/native/common/java2d/opengl/OGLPaints.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLPaints.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLPaints.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.c b/src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.c rename to src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.c diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.h b/src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderer.c b/src/java.desktop/share/native/common/java2d/opengl/OGLRenderer.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderer.c rename to src/java.desktop/share/native/common/java2d/opengl/OGLRenderer.c diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderer.h b/src/java.desktop/share/native/common/java2d/opengl/OGLRenderer.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderer.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLRenderer.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.c b/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.c rename to src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.c diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.h b/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.c b/src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.c rename to src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.c diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.h b/src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.h diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLVertexCache.c b/src/java.desktop/share/native/common/java2d/opengl/OGLVertexCache.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLVertexCache.c rename to src/java.desktop/share/native/common/java2d/opengl/OGLVertexCache.c diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLVertexCache.h b/src/java.desktop/share/native/common/java2d/opengl/OGLVertexCache.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/java2d/opengl/OGLVertexCache.h rename to src/java.desktop/share/native/common/java2d/opengl/OGLVertexCache.h diff --git a/jdk/src/java.desktop/share/native/include/jawt.h b/src/java.desktop/share/native/include/jawt.h similarity index 100% rename from jdk/src/java.desktop/share/native/include/jawt.h rename to src/java.desktop/share/native/include/jawt.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c b/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c rename to src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.h b/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.h rename to src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/DataBufferNative.c b/src/java.desktop/share/native/libawt/awt/image/DataBufferNative.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/DataBufferNative.c rename to src/java.desktop/share/native/libawt/awt/image/DataBufferNative.c diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/awt_ImageRep.c b/src/java.desktop/share/native/libawt/awt/image/awt_ImageRep.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/awt_ImageRep.c rename to src/java.desktop/share/native/libawt/awt/image/awt_ImageRep.c diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c b/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c rename to src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.h b/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.h rename to src/java.desktop/share/native/libawt/awt/image/awt_parseImage.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/README b/src/java.desktop/share/native/libawt/awt/image/cvutils/README similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/README rename to src/java.desktop/share/native/libawt/awt/image/cvutils/README diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_alpha.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_alpha.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_alpha.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_alpha.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_anycm.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_anycm.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_anycm.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_anycm.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_colors.c b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_colors.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_colors.c rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_colors.c diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_colors.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_colors.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_colors.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_colors.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dcm.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dcm.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dcm.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_dcm.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dcm8.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dcm8.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dcm8.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_dcm8.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dir8dither.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dir8dither.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dir8dither.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_dir8dither.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dirdither.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dirdither.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dirdither.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_dirdither.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fscolor.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fscolor.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fscolor.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_fscolor.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsdither.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsdither.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsdither.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsdither.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsgray.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsgray.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsgray.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsgray.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsutil.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsutil.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsutil.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsutil.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_globals.c b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_globals.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_globals.c rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_globals.c diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_globals.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_globals.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_globals.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_globals.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_icm.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_icm.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_icm.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_icm.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input32.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input32.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input32.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_input32.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input8.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input8.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input8.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_input8.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input8_32.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input8_32.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input8_32.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_input8_32.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_nodither.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_nodither.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_nodither.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_nodither.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_noscale.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_noscale.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_noscale.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_noscale.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_opaque.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_opaque.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_opaque.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_opaque.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordclrsgn.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordclrsgn.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordclrsgn.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordclrsgn.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordclruns.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordclruns.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordclruns.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordclruns.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_orddither.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_orddither.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_orddither.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_orddither.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordgray.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordgray.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordgray.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordgray.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output16.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output16.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output16.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_output16.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output16_32.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output16_32.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output16_32.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_output16_32.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output24.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output24.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output24.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_output24.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output32.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output32.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output32.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_output32.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_16_24.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_16_24.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_16_24.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_16_24.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_16_32.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_16_32.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_16_32.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_16_32.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_32.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_32.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_32.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_32.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_replscale.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_replscale.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_replscale.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_replscale.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_scaleloop.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_scaleloop.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_scaleloop.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_scaleloop.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_util.h b/src/java.desktop/share/native/libawt/awt/image/cvutils/img_util.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_util.h rename to src/java.desktop/share/native/libawt/awt/image/cvutils/img_util.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/dither.c b/src/java.desktop/share/native/libawt/awt/image/dither.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/dither.c rename to src/java.desktop/share/native/libawt/awt/image/dither.c diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/dither.h b/src/java.desktop/share/native/libawt/awt/image/dither.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/dither.h rename to src/java.desktop/share/native/libawt/awt/image/dither.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c b/src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c rename to src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.c b/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.c rename to src/java.desktop/share/native/libawt/awt/image/imageInitIDs.c diff --git a/jdk/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h b/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h rename to src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h diff --git a/jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c b/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c rename to src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c diff --git a/jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.h b/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.h rename to src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/Disposer.c b/src/java.desktop/share/native/libawt/java2d/Disposer.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/Disposer.c rename to src/java.desktop/share/native/libawt/java2d/Disposer.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/Disposer.h b/src/java.desktop/share/native/libawt/java2d/Disposer.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/Disposer.h rename to src/java.desktop/share/native/libawt/java2d/Disposer.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/SurfaceData.c b/src/java.desktop/share/native/libawt/java2d/SurfaceData.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/SurfaceData.c rename to src/java.desktop/share/native/libawt/java2d/SurfaceData.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/SurfaceData.h b/src/java.desktop/share/native/libawt/java2d/SurfaceData.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/SurfaceData.h rename to src/java.desktop/share/native/libawt/java2d/SurfaceData.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/Trace.c b/src/java.desktop/share/native/libawt/java2d/Trace.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/Trace.c rename to src/java.desktop/share/native/libawt/java2d/Trace.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/Trace.h b/src/java.desktop/share/native/libawt/java2d/Trace.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/Trace.h rename to src/java.desktop/share/native/libawt/java2d/Trace.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMacros.c b/src/java.desktop/share/native/libawt/java2d/loops/AlphaMacros.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMacros.c rename to src/java.desktop/share/native/libawt/java2d/loops/AlphaMacros.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMacros.h b/src/java.desktop/share/native/libawt/java2d/loops/AlphaMacros.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMacros.h rename to src/java.desktop/share/native/libawt/java2d/loops/AlphaMacros.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMath.c b/src/java.desktop/share/native/libawt/java2d/loops/AlphaMath.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMath.c rename to src/java.desktop/share/native/libawt/java2d/loops/AlphaMath.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMath.h b/src/java.desktop/share/native/libawt/java2d/loops/AlphaMath.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMath.h rename to src/java.desktop/share/native/libawt/java2d/loops/AlphaMath.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Any3Byte.c b/src/java.desktop/share/native/libawt/java2d/loops/Any3Byte.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Any3Byte.c rename to src/java.desktop/share/native/libawt/java2d/loops/Any3Byte.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Any3Byte.h b/src/java.desktop/share/native/libawt/java2d/loops/Any3Byte.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Any3Byte.h rename to src/java.desktop/share/native/libawt/java2d/loops/Any3Byte.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Any4Byte.c b/src/java.desktop/share/native/libawt/java2d/loops/Any4Byte.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Any4Byte.c rename to src/java.desktop/share/native/libawt/java2d/loops/Any4Byte.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Any4Byte.h b/src/java.desktop/share/native/libawt/java2d/loops/Any4Byte.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Any4Byte.h rename to src/java.desktop/share/native/libawt/java2d/loops/Any4Byte.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyByte.c b/src/java.desktop/share/native/libawt/java2d/loops/AnyByte.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyByte.c rename to src/java.desktop/share/native/libawt/java2d/loops/AnyByte.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyByte.h b/src/java.desktop/share/native/libawt/java2d/loops/AnyByte.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyByte.h rename to src/java.desktop/share/native/libawt/java2d/loops/AnyByte.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyByteBinary.h b/src/java.desktop/share/native/libawt/java2d/loops/AnyByteBinary.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyByteBinary.h rename to src/java.desktop/share/native/libawt/java2d/loops/AnyByteBinary.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyInt.c b/src/java.desktop/share/native/libawt/java2d/loops/AnyInt.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyInt.c rename to src/java.desktop/share/native/libawt/java2d/loops/AnyInt.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyInt.h b/src/java.desktop/share/native/libawt/java2d/loops/AnyInt.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyInt.h rename to src/java.desktop/share/native/libawt/java2d/loops/AnyInt.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyShort.c b/src/java.desktop/share/native/libawt/java2d/loops/AnyShort.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyShort.c rename to src/java.desktop/share/native/libawt/java2d/loops/AnyShort.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyShort.h b/src/java.desktop/share/native/libawt/java2d/loops/AnyShort.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyShort.h rename to src/java.desktop/share/native/libawt/java2d/loops/AnyShort.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Blit.c b/src/java.desktop/share/native/libawt/java2d/loops/Blit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Blit.c rename to src/java.desktop/share/native/libawt/java2d/loops/Blit.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/BlitBg.c b/src/java.desktop/share/native/libawt/java2d/loops/BlitBg.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/BlitBg.c rename to src/java.desktop/share/native/libawt/java2d/loops/BlitBg.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary1Bit.c b/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary1Bit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary1Bit.c rename to src/java.desktop/share/native/libawt/java2d/loops/ByteBinary1Bit.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary1Bit.h b/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary1Bit.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary1Bit.h rename to src/java.desktop/share/native/libawt/java2d/loops/ByteBinary1Bit.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary2Bit.c b/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary2Bit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary2Bit.c rename to src/java.desktop/share/native/libawt/java2d/loops/ByteBinary2Bit.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary2Bit.h b/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary2Bit.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary2Bit.h rename to src/java.desktop/share/native/libawt/java2d/loops/ByteBinary2Bit.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary4Bit.c b/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary4Bit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary4Bit.c rename to src/java.desktop/share/native/libawt/java2d/loops/ByteBinary4Bit.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary4Bit.h b/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary4Bit.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary4Bit.h rename to src/java.desktop/share/native/libawt/java2d/loops/ByteBinary4Bit.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteGray.c b/src/java.desktop/share/native/libawt/java2d/loops/ByteGray.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteGray.c rename to src/java.desktop/share/native/libawt/java2d/loops/ByteGray.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteGray.h b/src/java.desktop/share/native/libawt/java2d/loops/ByteGray.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteGray.h rename to src/java.desktop/share/native/libawt/java2d/loops/ByteGray.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteIndexed.c b/src/java.desktop/share/native/libawt/java2d/loops/ByteIndexed.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteIndexed.c rename to src/java.desktop/share/native/libawt/java2d/loops/ByteIndexed.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteIndexed.h b/src/java.desktop/share/native/libawt/java2d/loops/ByteIndexed.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteIndexed.h rename to src/java.desktop/share/native/libawt/java2d/loops/ByteIndexed.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawLine.c b/src/java.desktop/share/native/libawt/java2d/loops/DrawLine.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawLine.c rename to src/java.desktop/share/native/libawt/java2d/loops/DrawLine.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawParallelogram.c b/src/java.desktop/share/native/libawt/java2d/loops/DrawParallelogram.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawParallelogram.c rename to src/java.desktop/share/native/libawt/java2d/loops/DrawParallelogram.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawPath.c b/src/java.desktop/share/native/libawt/java2d/loops/DrawPath.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawPath.c rename to src/java.desktop/share/native/libawt/java2d/loops/DrawPath.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawPath.h b/src/java.desktop/share/native/libawt/java2d/loops/DrawPath.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawPath.h rename to src/java.desktop/share/native/libawt/java2d/loops/DrawPath.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawPolygons.c b/src/java.desktop/share/native/libawt/java2d/loops/DrawPolygons.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawPolygons.c rename to src/java.desktop/share/native/libawt/java2d/loops/DrawPolygons.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawRect.c b/src/java.desktop/share/native/libawt/java2d/loops/DrawRect.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawRect.c rename to src/java.desktop/share/native/libawt/java2d/loops/DrawRect.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/FillParallelogram.c b/src/java.desktop/share/native/libawt/java2d/loops/FillParallelogram.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/FillParallelogram.c rename to src/java.desktop/share/native/libawt/java2d/loops/FillParallelogram.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/FillPath.c b/src/java.desktop/share/native/libawt/java2d/loops/FillPath.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/FillPath.c rename to src/java.desktop/share/native/libawt/java2d/loops/FillPath.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/FillRect.c b/src/java.desktop/share/native/libawt/java2d/loops/FillRect.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/FillRect.c rename to src/java.desktop/share/native/libawt/java2d/loops/FillRect.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/FillSpans.c b/src/java.desktop/share/native/libawt/java2d/loops/FillSpans.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/FillSpans.c rename to src/java.desktop/share/native/libawt/java2d/loops/FillSpans.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgr.c b/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgr.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgr.c rename to src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgr.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgr.h b/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgr.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgr.h rename to src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgr.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgrPre.c b/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgrPre.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgrPre.c rename to src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgrPre.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgrPre.h b/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgrPre.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgrPre.h rename to src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgrPre.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/GlyphImageRef.h b/src/java.desktop/share/native/libawt/java2d/loops/GlyphImageRef.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/GlyphImageRef.h rename to src/java.desktop/share/native/libawt/java2d/loops/GlyphImageRef.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c b/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c rename to src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h b/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h rename to src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ImageData.h b/src/java.desktop/share/native/libawt/java2d/loops/ImageData.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ImageData.h rename to src/java.desktop/share/native/libawt/java2d/loops/ImageData.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Index12Gray.c b/src/java.desktop/share/native/libawt/java2d/loops/Index12Gray.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Index12Gray.c rename to src/java.desktop/share/native/libawt/java2d/loops/Index12Gray.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Index12Gray.h b/src/java.desktop/share/native/libawt/java2d/loops/Index12Gray.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Index12Gray.h rename to src/java.desktop/share/native/libawt/java2d/loops/Index12Gray.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Index8Gray.c b/src/java.desktop/share/native/libawt/java2d/loops/Index8Gray.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Index8Gray.c rename to src/java.desktop/share/native/libawt/java2d/loops/Index8Gray.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Index8Gray.h b/src/java.desktop/share/native/libawt/java2d/loops/Index8Gray.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Index8Gray.h rename to src/java.desktop/share/native/libawt/java2d/loops/Index8Gray.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgb.c b/src/java.desktop/share/native/libawt/java2d/loops/IntArgb.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgb.c rename to src/java.desktop/share/native/libawt/java2d/loops/IntArgb.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgb.h b/src/java.desktop/share/native/libawt/java2d/loops/IntArgb.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgb.h rename to src/java.desktop/share/native/libawt/java2d/loops/IntArgb.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbBm.c b/src/java.desktop/share/native/libawt/java2d/loops/IntArgbBm.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbBm.c rename to src/java.desktop/share/native/libawt/java2d/loops/IntArgbBm.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbBm.h b/src/java.desktop/share/native/libawt/java2d/loops/IntArgbBm.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbBm.h rename to src/java.desktop/share/native/libawt/java2d/loops/IntArgbBm.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbPre.c b/src/java.desktop/share/native/libawt/java2d/loops/IntArgbPre.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbPre.c rename to src/java.desktop/share/native/libawt/java2d/loops/IntArgbPre.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbPre.h b/src/java.desktop/share/native/libawt/java2d/loops/IntArgbPre.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbPre.h rename to src/java.desktop/share/native/libawt/java2d/loops/IntArgbPre.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntBgr.c b/src/java.desktop/share/native/libawt/java2d/loops/IntBgr.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntBgr.c rename to src/java.desktop/share/native/libawt/java2d/loops/IntBgr.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntBgr.h b/src/java.desktop/share/native/libawt/java2d/loops/IntBgr.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntBgr.h rename to src/java.desktop/share/native/libawt/java2d/loops/IntBgr.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntDcm.h b/src/java.desktop/share/native/libawt/java2d/loops/IntDcm.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntDcm.h rename to src/java.desktop/share/native/libawt/java2d/loops/IntDcm.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.c b/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.c rename to src/java.desktop/share/native/libawt/java2d/loops/IntRgb.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.h b/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.h rename to src/java.desktop/share/native/libawt/java2d/loops/IntRgb.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgbx.c b/src/java.desktop/share/native/libawt/java2d/loops/IntRgbx.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgbx.c rename to src/java.desktop/share/native/libawt/java2d/loops/IntRgbx.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgbx.h b/src/java.desktop/share/native/libawt/java2d/loops/IntRgbx.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgbx.h rename to src/java.desktop/share/native/libawt/java2d/loops/IntRgbx.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/LineUtils.h b/src/java.desktop/share/native/libawt/java2d/loops/LineUtils.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/LineUtils.h rename to src/java.desktop/share/native/libawt/java2d/loops/LineUtils.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/LoopMacros.h b/src/java.desktop/share/native/libawt/java2d/loops/LoopMacros.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/LoopMacros.h rename to src/java.desktop/share/native/libawt/java2d/loops/LoopMacros.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/MapAccelFunc.c b/src/java.desktop/share/native/libawt/java2d/loops/MapAccelFunc.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/MapAccelFunc.c rename to src/java.desktop/share/native/libawt/java2d/loops/MapAccelFunc.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/MaskBlit.c b/src/java.desktop/share/native/libawt/java2d/loops/MaskBlit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/MaskBlit.c rename to src/java.desktop/share/native/libawt/java2d/loops/MaskBlit.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/MaskFill.c b/src/java.desktop/share/native/libawt/java2d/loops/MaskFill.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/MaskFill.c rename to src/java.desktop/share/native/libawt/java2d/loops/MaskFill.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ParallelogramUtils.h b/src/java.desktop/share/native/libawt/java2d/loops/ParallelogramUtils.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ParallelogramUtils.h rename to src/java.desktop/share/native/libawt/java2d/loops/ParallelogramUtils.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.c b/src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.c rename to src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.h b/src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.h rename to src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ScaledBlit.c b/src/java.desktop/share/native/libawt/java2d/loops/ScaledBlit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ScaledBlit.c rename to src/java.desktop/share/native/libawt/java2d/loops/ScaledBlit.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ThreeByteBgr.c b/src/java.desktop/share/native/libawt/java2d/loops/ThreeByteBgr.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ThreeByteBgr.c rename to src/java.desktop/share/native/libawt/java2d/loops/ThreeByteBgr.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/ThreeByteBgr.h b/src/java.desktop/share/native/libawt/java2d/loops/ThreeByteBgr.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/ThreeByteBgr.h rename to src/java.desktop/share/native/libawt/java2d/loops/ThreeByteBgr.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c b/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c rename to src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort4444Argb.c b/src/java.desktop/share/native/libawt/java2d/loops/Ushort4444Argb.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort4444Argb.c rename to src/java.desktop/share/native/libawt/java2d/loops/Ushort4444Argb.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort4444Argb.h b/src/java.desktop/share/native/libawt/java2d/loops/Ushort4444Argb.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort4444Argb.h rename to src/java.desktop/share/native/libawt/java2d/loops/Ushort4444Argb.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgb.c b/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgb.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgb.c rename to src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgb.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgb.h b/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgb.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgb.h rename to src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgb.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgbx.c b/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgbx.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgbx.c rename to src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgbx.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgbx.h b/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgbx.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgbx.h rename to src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgbx.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort565Rgb.c b/src/java.desktop/share/native/libawt/java2d/loops/Ushort565Rgb.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort565Rgb.c rename to src/java.desktop/share/native/libawt/java2d/loops/Ushort565Rgb.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort565Rgb.h b/src/java.desktop/share/native/libawt/java2d/loops/Ushort565Rgb.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort565Rgb.h rename to src/java.desktop/share/native/libawt/java2d/loops/Ushort565Rgb.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortGray.c b/src/java.desktop/share/native/libawt/java2d/loops/UshortGray.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortGray.c rename to src/java.desktop/share/native/libawt/java2d/loops/UshortGray.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortGray.h b/src/java.desktop/share/native/libawt/java2d/loops/UshortGray.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortGray.h rename to src/java.desktop/share/native/libawt/java2d/loops/UshortGray.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortIndexed.c b/src/java.desktop/share/native/libawt/java2d/loops/UshortIndexed.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortIndexed.c rename to src/java.desktop/share/native/libawt/java2d/loops/UshortIndexed.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortIndexed.h b/src/java.desktop/share/native/libawt/java2d/loops/UshortIndexed.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortIndexed.h rename to src/java.desktop/share/native/libawt/java2d/loops/UshortIndexed.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/pipe/BufferedMaskBlit.c b/src/java.desktop/share/native/libawt/java2d/pipe/BufferedMaskBlit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/pipe/BufferedMaskBlit.c rename to src/java.desktop/share/native/libawt/java2d/pipe/BufferedMaskBlit.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/pipe/BufferedRenderPipe.c b/src/java.desktop/share/native/libawt/java2d/pipe/BufferedRenderPipe.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/pipe/BufferedRenderPipe.c rename to src/java.desktop/share/native/libawt/java2d/pipe/BufferedRenderPipe.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/pipe/PathConsumer2D.h b/src/java.desktop/share/native/libawt/java2d/pipe/PathConsumer2D.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/pipe/PathConsumer2D.h rename to src/java.desktop/share/native/libawt/java2d/pipe/PathConsumer2D.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/pipe/Region.c b/src/java.desktop/share/native/libawt/java2d/pipe/Region.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/pipe/Region.c rename to src/java.desktop/share/native/libawt/java2d/pipe/Region.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/pipe/Region.h b/src/java.desktop/share/native/libawt/java2d/pipe/Region.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/pipe/Region.h rename to src/java.desktop/share/native/libawt/java2d/pipe/Region.h diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/pipe/ShapeSpanIterator.c b/src/java.desktop/share/native/libawt/java2d/pipe/ShapeSpanIterator.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/pipe/ShapeSpanIterator.c rename to src/java.desktop/share/native/libawt/java2d/pipe/ShapeSpanIterator.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/pipe/SpanClipRenderer.c b/src/java.desktop/share/native/libawt/java2d/pipe/SpanClipRenderer.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/pipe/SpanClipRenderer.c rename to src/java.desktop/share/native/libawt/java2d/pipe/SpanClipRenderer.c diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/pipe/SpanIterator.h b/src/java.desktop/share/native/libawt/java2d/pipe/SpanIterator.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/pipe/SpanIterator.h rename to src/java.desktop/share/native/libawt/java2d/pipe/SpanIterator.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c b/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c rename to src/java.desktop/share/native/libfontmanager/DrawGlyphList.c diff --git a/jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.cpp b/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.cpp rename to src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.h b/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.h rename to src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c b/src/java.desktop/share/native/libfontmanager/HBShaper.c similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c rename to src/java.desktop/share/native/libfontmanager/HBShaper.c diff --git a/jdk/src/java.desktop/share/native/libfontmanager/fontscaler.h b/src/java.desktop/share/native/libfontmanager/fontscaler.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/fontscaler.h rename to src/java.desktop/share/native/libfontmanager/fontscaler.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/freetypeScaler.c b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/freetypeScaler.c rename to src/java.desktop/share/native/libfontmanager/freetypeScaler.c diff --git a/jdk/src/java.desktop/share/native/libfontmanager/glyphblitting.h b/src/java.desktop/share/native/libfontmanager/glyphblitting.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/glyphblitting.h rename to src/java.desktop/share/native/libfontmanager/glyphblitting.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-json.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-json.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-json.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-json.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-text.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-text.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-text.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-text.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cache-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cache-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cache-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cache-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-deprecated.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-deprecated.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-deprecated.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-deprecated.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-fallback-shape.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-fallback-shape.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-fallback-shape.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-fallback-shape.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-mutex-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-mutex-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-mutex-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-mutex-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-object-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-object-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-object-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-object-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cbdt-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cbdt-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cbdt-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cbdt-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-jstf-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-jstf-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-jstf-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-jstf-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-table.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-table.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-table.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-table.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-default.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-default.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-default.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-default.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hangul.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hangul.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hangul.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hangul.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-thai.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-thai.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-thai.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-thai.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-tibetan.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-tibetan.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-tibetan.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-tibetan.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-impl-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-impl-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-impl-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-impl-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-list.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-list.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-list.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-list.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.c b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.c similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.c rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.c diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/unicodedata_db.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/unicodedata_db.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/unicodedata_db.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/unicodedata_db.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-utf-private.hh b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-utf-private.hh similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-utf-private.hh rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-utf-private.hh diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-warning.cc b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-warning.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-warning.cc rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb-warning.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb.h b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb.h rename to src/java.desktop/share/native/libfontmanager/harfbuzz/hb.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc b/src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc rename to src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc diff --git a/jdk/src/java.desktop/share/native/libfontmanager/hb-jdk.h b/src/java.desktop/share/native/libfontmanager/hb-jdk.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/hb-jdk.h rename to src/java.desktop/share/native/libfontmanager/hb-jdk.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.cpp b/src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/AnchorTables.cpp b/src/java.desktop/share/native/libfontmanager/layout/AnchorTables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/AnchorTables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/AnchorTables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/AnchorTables.h b/src/java.desktop/share/native/libfontmanager/layout/AnchorTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/AnchorTables.h rename to src/java.desktop/share/native/libfontmanager/layout/AnchorTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.cpp b/src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.h b/src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.h rename to src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.cpp b/src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.h b/src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.h rename to src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/AttachmentPosnSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/AttachmentPosnSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/AttachmentPosnSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/AttachmentPosnSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/CanonData.cpp b/src/java.desktop/share/native/libfontmanager/layout/CanonData.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/CanonData.cpp rename to src/java.desktop/share/native/libfontmanager/layout/CanonData.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/CanonShaping.cpp b/src/java.desktop/share/native/libfontmanager/layout/CanonShaping.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/CanonShaping.cpp rename to src/java.desktop/share/native/libfontmanager/layout/CanonShaping.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/CanonShaping.h b/src/java.desktop/share/native/libfontmanager/layout/CanonShaping.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/CanonShaping.h rename to src/java.desktop/share/native/libfontmanager/layout/CanonShaping.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/CharSubstitutionFilter.h b/src/java.desktop/share/native/libfontmanager/layout/CharSubstitutionFilter.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/CharSubstitutionFilter.h rename to src/java.desktop/share/native/libfontmanager/layout/CharSubstitutionFilter.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.cpp b/src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.h b/src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.h rename to src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertion.h b/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertion.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertion.h rename to src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertion.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.cpp b/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.h b/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.h rename to src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.cpp b/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.h b/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.h rename to src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.cpp b/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.h b/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.h rename to src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstitution.h b/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstitution.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstitution.h rename to src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstitution.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.cpp b/src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/CoverageTables.cpp b/src/java.desktop/share/native/libfontmanager/layout/CoverageTables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/CoverageTables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/CoverageTables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/CoverageTables.h b/src/java.desktop/share/native/libfontmanager/layout/CoverageTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/CoverageTables.h rename to src/java.desktop/share/native/libfontmanager/layout/CoverageTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.cpp b/src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/DefaultCharMapper.h b/src/java.desktop/share/native/libfontmanager/layout/DefaultCharMapper.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/DefaultCharMapper.h rename to src/java.desktop/share/native/libfontmanager/layout/DefaultCharMapper.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/DeviceTables.cpp b/src/java.desktop/share/native/libfontmanager/layout/DeviceTables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/DeviceTables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/DeviceTables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/DeviceTables.h b/src/java.desktop/share/native/libfontmanager/layout/DeviceTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/DeviceTables.h rename to src/java.desktop/share/native/libfontmanager/layout/DeviceTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.cpp b/src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/Features.cpp b/src/java.desktop/share/native/libfontmanager/layout/Features.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/Features.cpp rename to src/java.desktop/share/native/libfontmanager/layout/Features.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.cpp b/src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.cpp rename to src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.h b/src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.h rename to src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.cpp b/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.cpp rename to src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.h b/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.h rename to src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.cpp b/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.h b/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.h rename to src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.cpp b/src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.h b/src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.h rename to src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.cpp b/src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.cpp rename to src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.h b/src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.h rename to src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.cpp b/src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.h b/src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.h rename to src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.cpp b/src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.cpp rename to src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.h b/src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.h rename to src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.cpp b/src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.h b/src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.h rename to src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.cpp b/src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.cpp rename to src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.h b/src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.h rename to src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.cpp b/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.cpp rename to src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.h b/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.h rename to src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.cpp b/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.h b/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.h rename to src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.cpp b/src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.cpp rename to src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.h b/src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.h rename to src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.cpp b/src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.cpp rename to src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.h b/src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.h rename to src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ICUFeatures.h b/src/java.desktop/share/native/libfontmanager/layout/ICUFeatures.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ICUFeatures.h rename to src/java.desktop/share/native/libfontmanager/layout/ICUFeatures.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicClassTables.cpp b/src/java.desktop/share/native/libfontmanager/layout/IndicClassTables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/IndicClassTables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/IndicClassTables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.cpp b/src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.cpp rename to src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.h b/src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.h rename to src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangement.h b/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangement.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangement.h rename to src/java.desktop/share/native/libfontmanager/layout/IndicRearrangement.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.cpp b/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.cpp rename to src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.h b/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.h rename to src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.cpp b/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.h b/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.h rename to src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicReordering.cpp b/src/java.desktop/share/native/libfontmanager/layout/IndicReordering.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/IndicReordering.cpp rename to src/java.desktop/share/native/libfontmanager/layout/IndicReordering.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/IndicReordering.h b/src/java.desktop/share/native/libfontmanager/layout/IndicReordering.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/IndicReordering.h rename to src/java.desktop/share/native/libfontmanager/layout/IndicReordering.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/KernTable.cpp b/src/java.desktop/share/native/libfontmanager/layout/KernTable.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/KernTable.cpp rename to src/java.desktop/share/native/libfontmanager/layout/KernTable.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/KernTable.h b/src/java.desktop/share/native/libfontmanager/layout/KernTable.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/KernTable.h rename to src/java.desktop/share/native/libfontmanager/layout/KernTable.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.cpp b/src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.cpp rename to src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.h b/src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.h rename to src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.cpp b/src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.cpp rename to src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.h b/src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.h rename to src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.cpp b/src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.cpp rename to src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.h b/src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.h rename to src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LEGlyphFilter.h b/src/java.desktop/share/native/libfontmanager/layout/LEGlyphFilter.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LEGlyphFilter.h rename to src/java.desktop/share/native/libfontmanager/layout/LEGlyphFilter.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.cpp b/src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.cpp rename to src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.h b/src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.h rename to src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.cpp b/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.cpp rename to src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.h b/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.h rename to src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LELanguages.h b/src/java.desktop/share/native/libfontmanager/layout/LELanguages.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LELanguages.h rename to src/java.desktop/share/native/libfontmanager/layout/LELanguages.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LEScripts.h b/src/java.desktop/share/native/libfontmanager/layout/LEScripts.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LEScripts.h rename to src/java.desktop/share/native/libfontmanager/layout/LEScripts.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LEStandalone.h b/src/java.desktop/share/native/libfontmanager/layout/LEStandalone.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LEStandalone.h rename to src/java.desktop/share/native/libfontmanager/layout/LEStandalone.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LESwaps.h b/src/java.desktop/share/native/libfontmanager/layout/LESwaps.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LESwaps.h rename to src/java.desktop/share/native/libfontmanager/layout/LESwaps.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LETableReference.h b/src/java.desktop/share/native/libfontmanager/layout/LETableReference.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LETableReference.h rename to src/java.desktop/share/native/libfontmanager/layout/LETableReference.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LETypes.h b/src/java.desktop/share/native/libfontmanager/layout/LETypes.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LETypes.h rename to src/java.desktop/share/native/libfontmanager/layout/LETypes.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.cpp b/src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.cpp rename to src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.h b/src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.h rename to src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LayoutTables.h b/src/java.desktop/share/native/libfontmanager/layout/LayoutTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LayoutTables.h rename to src/java.desktop/share/native/libfontmanager/layout/LayoutTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp b/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp rename to src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.h b/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.h rename to src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp b/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.h b/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.h rename to src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.cpp b/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstitution.h b/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstitution.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstitution.h rename to src/java.desktop/share/native/libfontmanager/layout/LigatureSubstitution.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.cpp b/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.cpp rename to src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.h b/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.h rename to src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LookupTables.cpp b/src/java.desktop/share/native/libfontmanager/layout/LookupTables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LookupTables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/LookupTables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LookupTables.h b/src/java.desktop/share/native/libfontmanager/layout/LookupTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/LookupTables.h rename to src/java.desktop/share/native/libfontmanager/layout/LookupTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/Lookups.cpp b/src/java.desktop/share/native/libfontmanager/layout/Lookups.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/Lookups.cpp rename to src/java.desktop/share/native/libfontmanager/layout/Lookups.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/Lookups.h b/src/java.desktop/share/native/libfontmanager/layout/Lookups.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/Lookups.h rename to src/java.desktop/share/native/libfontmanager/layout/Lookups.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MPreFixups.cpp b/src/java.desktop/share/native/libfontmanager/layout/MPreFixups.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MPreFixups.cpp rename to src/java.desktop/share/native/libfontmanager/layout/MPreFixups.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MPreFixups.h b/src/java.desktop/share/native/libfontmanager/layout/MPreFixups.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MPreFixups.h rename to src/java.desktop/share/native/libfontmanager/layout/MPreFixups.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkArrays.cpp b/src/java.desktop/share/native/libfontmanager/layout/MarkArrays.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MarkArrays.cpp rename to src/java.desktop/share/native/libfontmanager/layout/MarkArrays.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkArrays.h b/src/java.desktop/share/native/libfontmanager/layout/MarkArrays.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MarkArrays.h rename to src/java.desktop/share/native/libfontmanager/layout/MarkArrays.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.cpp b/src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.cpp b/src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.cpp b/src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MirroredCharData.cpp b/src/java.desktop/share/native/libfontmanager/layout/MirroredCharData.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MirroredCharData.cpp rename to src/java.desktop/share/native/libfontmanager/layout/MirroredCharData.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MorphStateTables.h b/src/java.desktop/share/native/libfontmanager/layout/MorphStateTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MorphStateTables.h rename to src/java.desktop/share/native/libfontmanager/layout/MorphStateTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MorphTables.cpp b/src/java.desktop/share/native/libfontmanager/layout/MorphTables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MorphTables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/MorphTables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MorphTables.h b/src/java.desktop/share/native/libfontmanager/layout/MorphTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MorphTables.h rename to src/java.desktop/share/native/libfontmanager/layout/MorphTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MorphTables2.cpp b/src/java.desktop/share/native/libfontmanager/layout/MorphTables2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MorphTables2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/MorphTables2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.cpp b/src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubst.h b/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubst.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubst.h rename to src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubst.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.cpp b/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.cpp rename to src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.h b/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.h rename to src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.cpp b/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.h b/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.h rename to src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.cpp b/src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.cpp rename to src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.h b/src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.h rename to src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeTables.h b/src/java.desktop/share/native/libfontmanager/layout/OpenTypeTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeTables.h rename to src/java.desktop/share/native/libfontmanager/layout/OpenTypeTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.cpp b/src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.cpp rename to src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.h b/src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.h rename to src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.cpp b/src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.cpp b/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.h b/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.h rename to src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.cpp b/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.h b/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.h rename to src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.cpp b/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.h b/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.h rename to src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.cpp b/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.h b/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.h rename to src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.cpp b/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.h b/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.h rename to src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.cpp b/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.h b/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.h rename to src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ShapingTypeData.cpp b/src/java.desktop/share/native/libfontmanager/layout/ShapingTypeData.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ShapingTypeData.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ShapingTypeData.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.cpp b/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.h b/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.h rename to src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.cpp b/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.h b/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.h rename to src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.cpp b/src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.cpp b/src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.h b/src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.h rename to src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.cpp b/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.h b/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.h rename to src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.cpp b/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.h b/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.h rename to src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.cpp b/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.cpp rename to src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.h b/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.h rename to src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.cpp b/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.h b/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.h rename to src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/StateTables.h b/src/java.desktop/share/native/libfontmanager/layout/StateTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/StateTables.h rename to src/java.desktop/share/native/libfontmanager/layout/StateTables.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.cpp b/src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.h b/src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.h rename to src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.cpp b/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.h b/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.h rename to src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.cpp b/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.h b/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.h rename to src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/SunLayoutEngine.cpp b/src/java.desktop/share/native/libfontmanager/layout/SunLayoutEngine.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/SunLayoutEngine.cpp rename to src/java.desktop/share/native/libfontmanager/layout/SunLayoutEngine.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.cpp b/src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.h b/src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.h rename to src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.cpp b/src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.h b/src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.h rename to src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiStateTables.cpp b/src/java.desktop/share/native/libfontmanager/layout/ThaiStateTables.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ThaiStateTables.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ThaiStateTables.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.cpp b/src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.cpp rename to src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.h b/src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.h rename to src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.cpp b/src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.cpp rename to src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.h b/src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.h rename to src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.cpp b/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.cpp rename to src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.h b/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.h rename to src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.cpp b/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.cpp rename to src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.h b/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.h rename to src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ValueRecords.cpp b/src/java.desktop/share/native/libfontmanager/layout/ValueRecords.cpp similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ValueRecords.cpp rename to src/java.desktop/share/native/libfontmanager/layout/ValueRecords.cpp diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/ValueRecords.h b/src/java.desktop/share/native/libfontmanager/layout/ValueRecords.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/layout/ValueRecords.h rename to src/java.desktop/share/native/libfontmanager/layout/ValueRecords.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/scriptMapping.c b/src/java.desktop/share/native/libfontmanager/scriptMapping.c similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/scriptMapping.c rename to src/java.desktop/share/native/libfontmanager/scriptMapping.c diff --git a/jdk/src/java.desktop/share/native/libfontmanager/scriptMapping.h b/src/java.desktop/share/native/libfontmanager/scriptMapping.h similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/scriptMapping.h rename to src/java.desktop/share/native/libfontmanager/scriptMapping.h diff --git a/jdk/src/java.desktop/share/native/libfontmanager/sunFont.c b/src/java.desktop/share/native/libfontmanager/sunFont.c similarity index 100% rename from jdk/src/java.desktop/share/native/libfontmanager/sunFont.c rename to src/java.desktop/share/native/libfontmanager/sunFont.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/README b/src/java.desktop/share/native/libjavajpeg/README similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/README rename to src/java.desktop/share/native/libjavajpeg/README diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c rename to src/java.desktop/share/native/libjavajpeg/imageioJPEG.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jcapimin.c b/src/java.desktop/share/native/libjavajpeg/jcapimin.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jcapimin.c rename to src/java.desktop/share/native/libjavajpeg/jcapimin.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jcapistd.c b/src/java.desktop/share/native/libjavajpeg/jcapistd.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jcapistd.c rename to src/java.desktop/share/native/libjavajpeg/jcapistd.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jccoefct.c b/src/java.desktop/share/native/libjavajpeg/jccoefct.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jccoefct.c rename to src/java.desktop/share/native/libjavajpeg/jccoefct.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jccolor.c b/src/java.desktop/share/native/libjavajpeg/jccolor.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jccolor.c rename to src/java.desktop/share/native/libjavajpeg/jccolor.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jcdctmgr.c b/src/java.desktop/share/native/libjavajpeg/jcdctmgr.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jcdctmgr.c rename to src/java.desktop/share/native/libjavajpeg/jcdctmgr.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jchuff.c b/src/java.desktop/share/native/libjavajpeg/jchuff.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jchuff.c rename to src/java.desktop/share/native/libjavajpeg/jchuff.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jchuff.h b/src/java.desktop/share/native/libjavajpeg/jchuff.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jchuff.h rename to src/java.desktop/share/native/libjavajpeg/jchuff.h diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jcinit.c b/src/java.desktop/share/native/libjavajpeg/jcinit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jcinit.c rename to src/java.desktop/share/native/libjavajpeg/jcinit.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jcmainct.c b/src/java.desktop/share/native/libjavajpeg/jcmainct.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jcmainct.c rename to src/java.desktop/share/native/libjavajpeg/jcmainct.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jcmarker.c b/src/java.desktop/share/native/libjavajpeg/jcmarker.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jcmarker.c rename to src/java.desktop/share/native/libjavajpeg/jcmarker.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jcmaster.c b/src/java.desktop/share/native/libjavajpeg/jcmaster.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jcmaster.c rename to src/java.desktop/share/native/libjavajpeg/jcmaster.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jcomapi.c b/src/java.desktop/share/native/libjavajpeg/jcomapi.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jcomapi.c rename to src/java.desktop/share/native/libjavajpeg/jcomapi.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jconfig.h b/src/java.desktop/share/native/libjavajpeg/jconfig.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jconfig.h rename to src/java.desktop/share/native/libjavajpeg/jconfig.h diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jcparam.c b/src/java.desktop/share/native/libjavajpeg/jcparam.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jcparam.c rename to src/java.desktop/share/native/libjavajpeg/jcparam.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jcphuff.c b/src/java.desktop/share/native/libjavajpeg/jcphuff.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jcphuff.c rename to src/java.desktop/share/native/libjavajpeg/jcphuff.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jcprepct.c b/src/java.desktop/share/native/libjavajpeg/jcprepct.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jcprepct.c rename to src/java.desktop/share/native/libjavajpeg/jcprepct.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jcsample.c b/src/java.desktop/share/native/libjavajpeg/jcsample.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jcsample.c rename to src/java.desktop/share/native/libjavajpeg/jcsample.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jctrans.c b/src/java.desktop/share/native/libjavajpeg/jctrans.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jctrans.c rename to src/java.desktop/share/native/libjavajpeg/jctrans.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdapimin.c b/src/java.desktop/share/native/libjavajpeg/jdapimin.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdapimin.c rename to src/java.desktop/share/native/libjavajpeg/jdapimin.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdapistd.c b/src/java.desktop/share/native/libjavajpeg/jdapistd.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdapistd.c rename to src/java.desktop/share/native/libjavajpeg/jdapistd.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdcoefct.c b/src/java.desktop/share/native/libjavajpeg/jdcoefct.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdcoefct.c rename to src/java.desktop/share/native/libjavajpeg/jdcoefct.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdcolor.c b/src/java.desktop/share/native/libjavajpeg/jdcolor.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdcolor.c rename to src/java.desktop/share/native/libjavajpeg/jdcolor.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdct.h b/src/java.desktop/share/native/libjavajpeg/jdct.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdct.h rename to src/java.desktop/share/native/libjavajpeg/jdct.h diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jddctmgr.c b/src/java.desktop/share/native/libjavajpeg/jddctmgr.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jddctmgr.c rename to src/java.desktop/share/native/libjavajpeg/jddctmgr.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdhuff.c b/src/java.desktop/share/native/libjavajpeg/jdhuff.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdhuff.c rename to src/java.desktop/share/native/libjavajpeg/jdhuff.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdhuff.h b/src/java.desktop/share/native/libjavajpeg/jdhuff.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdhuff.h rename to src/java.desktop/share/native/libjavajpeg/jdhuff.h diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdinput.c b/src/java.desktop/share/native/libjavajpeg/jdinput.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdinput.c rename to src/java.desktop/share/native/libjavajpeg/jdinput.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdmainct.c b/src/java.desktop/share/native/libjavajpeg/jdmainct.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdmainct.c rename to src/java.desktop/share/native/libjavajpeg/jdmainct.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdmarker.c b/src/java.desktop/share/native/libjavajpeg/jdmarker.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdmarker.c rename to src/java.desktop/share/native/libjavajpeg/jdmarker.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdmaster.c b/src/java.desktop/share/native/libjavajpeg/jdmaster.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdmaster.c rename to src/java.desktop/share/native/libjavajpeg/jdmaster.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdmerge.c b/src/java.desktop/share/native/libjavajpeg/jdmerge.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdmerge.c rename to src/java.desktop/share/native/libjavajpeg/jdmerge.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdphuff.c b/src/java.desktop/share/native/libjavajpeg/jdphuff.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdphuff.c rename to src/java.desktop/share/native/libjavajpeg/jdphuff.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdpostct.c b/src/java.desktop/share/native/libjavajpeg/jdpostct.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdpostct.c rename to src/java.desktop/share/native/libjavajpeg/jdpostct.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdsample.c b/src/java.desktop/share/native/libjavajpeg/jdsample.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdsample.c rename to src/java.desktop/share/native/libjavajpeg/jdsample.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jdtrans.c b/src/java.desktop/share/native/libjavajpeg/jdtrans.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jdtrans.c rename to src/java.desktop/share/native/libjavajpeg/jdtrans.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jerror.c b/src/java.desktop/share/native/libjavajpeg/jerror.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jerror.c rename to src/java.desktop/share/native/libjavajpeg/jerror.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jerror.h b/src/java.desktop/share/native/libjavajpeg/jerror.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jerror.h rename to src/java.desktop/share/native/libjavajpeg/jerror.h diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jfdctflt.c b/src/java.desktop/share/native/libjavajpeg/jfdctflt.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jfdctflt.c rename to src/java.desktop/share/native/libjavajpeg/jfdctflt.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jfdctfst.c b/src/java.desktop/share/native/libjavajpeg/jfdctfst.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jfdctfst.c rename to src/java.desktop/share/native/libjavajpeg/jfdctfst.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jfdctint.c b/src/java.desktop/share/native/libjavajpeg/jfdctint.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jfdctint.c rename to src/java.desktop/share/native/libjavajpeg/jfdctint.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jidctflt.c b/src/java.desktop/share/native/libjavajpeg/jidctflt.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jidctflt.c rename to src/java.desktop/share/native/libjavajpeg/jidctflt.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jidctfst.c b/src/java.desktop/share/native/libjavajpeg/jidctfst.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jidctfst.c rename to src/java.desktop/share/native/libjavajpeg/jidctfst.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jidctint.c b/src/java.desktop/share/native/libjavajpeg/jidctint.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jidctint.c rename to src/java.desktop/share/native/libjavajpeg/jidctint.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jidctred.c b/src/java.desktop/share/native/libjavajpeg/jidctred.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jidctred.c rename to src/java.desktop/share/native/libjavajpeg/jidctred.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jinclude.h b/src/java.desktop/share/native/libjavajpeg/jinclude.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jinclude.h rename to src/java.desktop/share/native/libjavajpeg/jinclude.h diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jmemmgr.c b/src/java.desktop/share/native/libjavajpeg/jmemmgr.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jmemmgr.c rename to src/java.desktop/share/native/libjavajpeg/jmemmgr.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jmemnobs.c b/src/java.desktop/share/native/libjavajpeg/jmemnobs.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jmemnobs.c rename to src/java.desktop/share/native/libjavajpeg/jmemnobs.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jmemsys.h b/src/java.desktop/share/native/libjavajpeg/jmemsys.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jmemsys.h rename to src/java.desktop/share/native/libjavajpeg/jmemsys.h diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jmorecfg.h b/src/java.desktop/share/native/libjavajpeg/jmorecfg.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jmorecfg.h rename to src/java.desktop/share/native/libjavajpeg/jmorecfg.h diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c b/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c rename to src/java.desktop/share/native/libjavajpeg/jpegdecoder.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jpegint.h b/src/java.desktop/share/native/libjavajpeg/jpegint.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jpegint.h rename to src/java.desktop/share/native/libjavajpeg/jpegint.h diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jpeglib.h b/src/java.desktop/share/native/libjavajpeg/jpeglib.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jpeglib.h rename to src/java.desktop/share/native/libjavajpeg/jpeglib.h diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jquant1.c b/src/java.desktop/share/native/libjavajpeg/jquant1.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jquant1.c rename to src/java.desktop/share/native/libjavajpeg/jquant1.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jquant2.c b/src/java.desktop/share/native/libjavajpeg/jquant2.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jquant2.c rename to src/java.desktop/share/native/libjavajpeg/jquant2.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jutils.c b/src/java.desktop/share/native/libjavajpeg/jutils.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jutils.c rename to src/java.desktop/share/native/libjavajpeg/jutils.c diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jversion.h b/src/java.desktop/share/native/libjavajpeg/jversion.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjavajpeg/jversion.h rename to src/java.desktop/share/native/libjavajpeg/jversion.h diff --git a/jdk/src/java.desktop/share/native/libjsound/Configure.h b/src/java.desktop/share/native/libjsound/Configure.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/Configure.h rename to src/java.desktop/share/native/libjsound/Configure.h diff --git a/jdk/src/java.desktop/share/native/libjsound/DirectAudio.h b/src/java.desktop/share/native/libjsound/DirectAudio.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/DirectAudio.h rename to src/java.desktop/share/native/libjsound/DirectAudio.h diff --git a/jdk/src/java.desktop/share/native/libjsound/DirectAudioDevice.c b/src/java.desktop/share/native/libjsound/DirectAudioDevice.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/DirectAudioDevice.c rename to src/java.desktop/share/native/libjsound/DirectAudioDevice.c diff --git a/jdk/src/java.desktop/share/native/libjsound/DirectAudioDeviceProvider.c b/src/java.desktop/share/native/libjsound/DirectAudioDeviceProvider.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/DirectAudioDeviceProvider.c rename to src/java.desktop/share/native/libjsound/DirectAudioDeviceProvider.c diff --git a/jdk/src/java.desktop/share/native/libjsound/MidiInDevice.c b/src/java.desktop/share/native/libjsound/MidiInDevice.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/MidiInDevice.c rename to src/java.desktop/share/native/libjsound/MidiInDevice.c diff --git a/jdk/src/java.desktop/share/native/libjsound/MidiInDeviceProvider.c b/src/java.desktop/share/native/libjsound/MidiInDeviceProvider.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/MidiInDeviceProvider.c rename to src/java.desktop/share/native/libjsound/MidiInDeviceProvider.c diff --git a/jdk/src/java.desktop/share/native/libjsound/MidiOutDevice.c b/src/java.desktop/share/native/libjsound/MidiOutDevice.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/MidiOutDevice.c rename to src/java.desktop/share/native/libjsound/MidiOutDevice.c diff --git a/jdk/src/java.desktop/share/native/libjsound/MidiOutDeviceProvider.c b/src/java.desktop/share/native/libjsound/MidiOutDeviceProvider.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/MidiOutDeviceProvider.c rename to src/java.desktop/share/native/libjsound/MidiOutDeviceProvider.c diff --git a/jdk/src/java.desktop/share/native/libjsound/Platform.c b/src/java.desktop/share/native/libjsound/Platform.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/Platform.c rename to src/java.desktop/share/native/libjsound/Platform.c diff --git a/jdk/src/java.desktop/share/native/libjsound/PlatformMidi.c b/src/java.desktop/share/native/libjsound/PlatformMidi.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/PlatformMidi.c rename to src/java.desktop/share/native/libjsound/PlatformMidi.c diff --git a/jdk/src/java.desktop/share/native/libjsound/PlatformMidi.h b/src/java.desktop/share/native/libjsound/PlatformMidi.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/PlatformMidi.h rename to src/java.desktop/share/native/libjsound/PlatformMidi.h diff --git a/jdk/src/java.desktop/share/native/libjsound/PortMixer.c b/src/java.desktop/share/native/libjsound/PortMixer.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/PortMixer.c rename to src/java.desktop/share/native/libjsound/PortMixer.c diff --git a/jdk/src/java.desktop/share/native/libjsound/PortMixerProvider.c b/src/java.desktop/share/native/libjsound/PortMixerProvider.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/PortMixerProvider.c rename to src/java.desktop/share/native/libjsound/PortMixerProvider.c diff --git a/jdk/src/java.desktop/share/native/libjsound/Ports.h b/src/java.desktop/share/native/libjsound/Ports.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/Ports.h rename to src/java.desktop/share/native/libjsound/Ports.h diff --git a/jdk/src/java.desktop/share/native/libjsound/SoundDefs.h b/src/java.desktop/share/native/libjsound/SoundDefs.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/SoundDefs.h rename to src/java.desktop/share/native/libjsound/SoundDefs.h diff --git a/jdk/src/java.desktop/share/native/libjsound/Utilities.c b/src/java.desktop/share/native/libjsound/Utilities.c similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/Utilities.c rename to src/java.desktop/share/native/libjsound/Utilities.c diff --git a/jdk/src/java.desktop/share/native/libjsound/Utilities.h b/src/java.desktop/share/native/libjsound/Utilities.h similarity index 100% rename from jdk/src/java.desktop/share/native/libjsound/Utilities.h rename to src/java.desktop/share/native/libjsound/Utilities.h diff --git a/jdk/src/java.desktop/share/native/liblcms/LCMS.c b/src/java.desktop/share/native/liblcms/LCMS.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/LCMS.c rename to src/java.desktop/share/native/liblcms/LCMS.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsalpha.c b/src/java.desktop/share/native/liblcms/cmsalpha.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsalpha.c rename to src/java.desktop/share/native/liblcms/cmsalpha.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmscam02.c b/src/java.desktop/share/native/liblcms/cmscam02.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmscam02.c rename to src/java.desktop/share/native/liblcms/cmscam02.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmscgats.c b/src/java.desktop/share/native/liblcms/cmscgats.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmscgats.c rename to src/java.desktop/share/native/liblcms/cmscgats.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmscnvrt.c b/src/java.desktop/share/native/liblcms/cmscnvrt.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmscnvrt.c rename to src/java.desktop/share/native/liblcms/cmscnvrt.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmserr.c b/src/java.desktop/share/native/liblcms/cmserr.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmserr.c rename to src/java.desktop/share/native/liblcms/cmserr.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsgamma.c b/src/java.desktop/share/native/liblcms/cmsgamma.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsgamma.c rename to src/java.desktop/share/native/liblcms/cmsgamma.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsgmt.c b/src/java.desktop/share/native/liblcms/cmsgmt.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsgmt.c rename to src/java.desktop/share/native/liblcms/cmsgmt.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmshalf.c b/src/java.desktop/share/native/liblcms/cmshalf.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmshalf.c rename to src/java.desktop/share/native/liblcms/cmshalf.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsintrp.c b/src/java.desktop/share/native/liblcms/cmsintrp.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsintrp.c rename to src/java.desktop/share/native/liblcms/cmsintrp.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsio0.c b/src/java.desktop/share/native/liblcms/cmsio0.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsio0.c rename to src/java.desktop/share/native/liblcms/cmsio0.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsio1.c b/src/java.desktop/share/native/liblcms/cmsio1.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsio1.c rename to src/java.desktop/share/native/liblcms/cmsio1.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmslut.c b/src/java.desktop/share/native/liblcms/cmslut.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmslut.c rename to src/java.desktop/share/native/liblcms/cmslut.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsmd5.c b/src/java.desktop/share/native/liblcms/cmsmd5.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsmd5.c rename to src/java.desktop/share/native/liblcms/cmsmd5.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsmtrx.c b/src/java.desktop/share/native/liblcms/cmsmtrx.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsmtrx.c rename to src/java.desktop/share/native/liblcms/cmsmtrx.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsnamed.c b/src/java.desktop/share/native/liblcms/cmsnamed.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsnamed.c rename to src/java.desktop/share/native/liblcms/cmsnamed.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsopt.c b/src/java.desktop/share/native/liblcms/cmsopt.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsopt.c rename to src/java.desktop/share/native/liblcms/cmsopt.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmspack.c b/src/java.desktop/share/native/liblcms/cmspack.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmspack.c rename to src/java.desktop/share/native/liblcms/cmspack.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmspcs.c b/src/java.desktop/share/native/liblcms/cmspcs.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmspcs.c rename to src/java.desktop/share/native/liblcms/cmspcs.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsplugin.c b/src/java.desktop/share/native/liblcms/cmsplugin.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsplugin.c rename to src/java.desktop/share/native/liblcms/cmsplugin.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsps2.c b/src/java.desktop/share/native/liblcms/cmsps2.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsps2.c rename to src/java.desktop/share/native/liblcms/cmsps2.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmssamp.c b/src/java.desktop/share/native/liblcms/cmssamp.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmssamp.c rename to src/java.desktop/share/native/liblcms/cmssamp.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmssm.c b/src/java.desktop/share/native/liblcms/cmssm.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmssm.c rename to src/java.desktop/share/native/liblcms/cmssm.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmstypes.c b/src/java.desktop/share/native/liblcms/cmstypes.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmstypes.c rename to src/java.desktop/share/native/liblcms/cmstypes.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsvirt.c b/src/java.desktop/share/native/liblcms/cmsvirt.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsvirt.c rename to src/java.desktop/share/native/liblcms/cmsvirt.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmswtpnt.c b/src/java.desktop/share/native/liblcms/cmswtpnt.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmswtpnt.c rename to src/java.desktop/share/native/liblcms/cmswtpnt.c diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsxform.c b/src/java.desktop/share/native/liblcms/cmsxform.c similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/cmsxform.c rename to src/java.desktop/share/native/liblcms/cmsxform.c diff --git a/jdk/src/java.desktop/share/native/liblcms/lcms2.h b/src/java.desktop/share/native/liblcms/lcms2.h similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/lcms2.h rename to src/java.desktop/share/native/liblcms/lcms2.h diff --git a/jdk/src/java.desktop/share/native/liblcms/lcms2_internal.h b/src/java.desktop/share/native/liblcms/lcms2_internal.h similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/lcms2_internal.h rename to src/java.desktop/share/native/liblcms/lcms2_internal.h diff --git a/jdk/src/java.desktop/share/native/liblcms/lcms2_plugin.h b/src/java.desktop/share/native/liblcms/lcms2_plugin.h similarity index 100% rename from jdk/src/java.desktop/share/native/liblcms/lcms2_plugin.h rename to src/java.desktop/share/native/liblcms/lcms2_plugin.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/j2d_names.h b/src/java.desktop/share/native/libmlib_image/j2d_names.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/j2d_names.h rename to src/java.desktop/share/native/libmlib_image/j2d_names.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib.h b/src/java.desktop/share/native/libmlib_image/mlib.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib.h rename to src/java.desktop/share/native/libmlib_image/mlib.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h rename to src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_D64.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_D64.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_D64.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_D64.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_F32.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_F32.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_F32.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_F32.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_S32.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_S32.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_S32.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_S32.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_D64.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_D64.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_D64.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_D64.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_F32.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_F32.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_F32.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_F32.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_S32.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_S32.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_S32.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_S32.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h b/src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h rename to src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.h b/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.h rename to src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Bit.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Bit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Bit.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Bit.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Fp.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Fp.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Fp.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Fp.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvCopyEdge_Bit.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvCopyEdge_Bit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvCopyEdge_Bit.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConvCopyEdge_Bit.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvEdge.h b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvEdge.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvEdge.h rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConvEdge.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCopy.h b/src/java.desktop/share/native/libmlib_image/mlib_ImageCopy.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCopy.h rename to src/java.desktop/share/native/libmlib_image/mlib_ImageCopy.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCreate.h b/src/java.desktop/share/native/libmlib_image/mlib_ImageCreate.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCreate.h rename to src/java.desktop/share/native/libmlib_image/mlib_ImageCreate.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.h b/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.h rename to src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.h b/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.h rename to src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp.h b/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp.h rename to src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_64.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_64.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_64.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_64.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageRowTable.h b/src/java.desktop/share/native/libmlib_image/mlib_ImageRowTable.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageRowTable.h rename to src/java.desktop/share/native/libmlib_image/mlib_ImageRowTable.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageUtils.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageUtils.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageUtils.c rename to src/java.desktop/share/native/libmlib_image/mlib_ImageUtils.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_SysMath.h b/src/java.desktop/share/native/libmlib_image/mlib_SysMath.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_SysMath.h rename to src/java.desktop/share/native/libmlib_image/mlib_SysMath.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_S16.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_S16.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_S16.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_S16.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_U16.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_U16.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_U16.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_U16.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_S16.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_S16.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_S16.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_S16.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_U16.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_U16.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_U16.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_U16.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_NN.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_NN.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_NN.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_NN.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvClearEdge.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvClearEdge.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvClearEdge.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvClearEdge.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvCopyEdge.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvCopyEdge.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvCopyEdge.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvCopyEdge.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvVersion.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvVersion.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvVersion.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvVersion.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.h b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.h rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp_f.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp_f.c similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp_f.c rename to src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp_f.c diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_image.h b/src/java.desktop/share/native/libmlib_image/mlib_image.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_image.h rename to src/java.desktop/share/native/libmlib_image/mlib_image.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_get.h b/src/java.desktop/share/native/libmlib_image/mlib_image_get.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_image_get.h rename to src/java.desktop/share/native/libmlib_image/mlib_image_get.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h b/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h rename to src/java.desktop/share/native/libmlib_image/mlib_image_proto.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_types.h b/src/java.desktop/share/native/libmlib_image/mlib_image_types.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_image_types.h rename to src/java.desktop/share/native/libmlib_image/mlib_image_types.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_status.h b/src/java.desktop/share/native/libmlib_image/mlib_status.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_status.h rename to src/java.desktop/share/native/libmlib_image/mlib_status.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_sys.h b/src/java.desktop/share/native/libmlib_image/mlib_sys.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_sys.h rename to src/java.desktop/share/native/libmlib_image/mlib_sys.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_sys_proto.h b/src/java.desktop/share/native/libmlib_image/mlib_sys_proto.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_sys_proto.h rename to src/java.desktop/share/native/libmlib_image/mlib_sys_proto.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_types.h b/src/java.desktop/share/native/libmlib_image/mlib_types.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/mlib_types.h rename to src/java.desktop/share/native/libmlib_image/mlib_types.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/safe_alloc.h b/src/java.desktop/share/native/libmlib_image/safe_alloc.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/safe_alloc.h rename to src/java.desktop/share/native/libmlib_image/safe_alloc.h diff --git a/jdk/src/java.desktop/share/native/libmlib_image/safe_math.h b/src/java.desktop/share/native/libmlib_image/safe_math.h similarity index 100% rename from jdk/src/java.desktop/share/native/libmlib_image/safe_math.h rename to src/java.desktop/share/native/libmlib_image/safe_math.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/giflib/COPYING b/src/java.desktop/share/native/libsplashscreen/giflib/COPYING similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/giflib/COPYING rename to src/java.desktop/share/native/libsplashscreen/giflib/COPYING diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/giflib/dgif_lib.c b/src/java.desktop/share/native/libsplashscreen/giflib/dgif_lib.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/giflib/dgif_lib.c rename to src/java.desktop/share/native/libsplashscreen/giflib/dgif_lib.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_err.c b/src/java.desktop/share/native/libsplashscreen/giflib/gif_err.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_err.c rename to src/java.desktop/share/native/libsplashscreen/giflib/gif_err.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_hash.h b/src/java.desktop/share/native/libsplashscreen/giflib/gif_hash.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_hash.h rename to src/java.desktop/share/native/libsplashscreen/giflib/gif_hash.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h b/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h rename to src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib_private.h b/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib_private.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib_private.h rename to src/java.desktop/share/native/libsplashscreen/giflib/gif_lib_private.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/giflib/gifalloc.c b/src/java.desktop/share/native/libsplashscreen/giflib/gifalloc.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/giflib/gifalloc.c rename to src/java.desktop/share/native/libsplashscreen/giflib/gifalloc.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/giflib/openbsd-reallocarray.c b/src/java.desktop/share/native/libsplashscreen/giflib/openbsd-reallocarray.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/giflib/openbsd-reallocarray.c rename to src/java.desktop/share/native/libsplashscreen/giflib/openbsd-reallocarray.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c b/src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c rename to src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES rename to src/java.desktop/share/native/libsplashscreen/libpng/CHANGES diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE b/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE rename to src/java.desktop/share/native/libsplashscreen/libpng/LICENSE diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/README b/src/java.desktop/share/native/libsplashscreen/libpng/README similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/README rename to src/java.desktop/share/native/libsplashscreen/libpng/README diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/png.c b/src/java.desktop/share/native/libsplashscreen/libpng/png.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/png.c rename to src/java.desktop/share/native/libsplashscreen/libpng/png.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/png.h b/src/java.desktop/share/native/libsplashscreen/libpng/png.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/png.h rename to src/java.desktop/share/native/libsplashscreen/libpng/png.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h rename to src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h rename to src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c rename to src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c rename to src/java.desktop/share/native/libsplashscreen/libpng/pngget.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h b/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h rename to src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h rename to src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c rename to src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c rename to src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h rename to src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c rename to src/java.desktop/share/native/libsplashscreen/libpng/pngread.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c rename to src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c rename to src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c rename to src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c rename to src/java.desktop/share/native/libsplashscreen/libpng/pngset.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h rename to src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c rename to src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx.h b/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx.h rename to src/java.desktop/share/native/libsplashscreen/splashscreen_gfx.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.c b/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.c rename to src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.h b/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.h rename to src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c b/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c rename to src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.c b/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.c rename to src/java.desktop/share/native/libsplashscreen/splashscreen_impl.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.h b/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.h similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.h rename to src/java.desktop/share/native/libsplashscreen/splashscreen_impl.h diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_jpeg.c b/src/java.desktop/share/native/libsplashscreen/splashscreen_jpeg.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_jpeg.c rename to src/java.desktop/share/native/libsplashscreen/splashscreen_jpeg.c diff --git a/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_png.c b/src/java.desktop/share/native/libsplashscreen/splashscreen_png.c similarity index 100% rename from jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_png.c rename to src/java.desktop/share/native/libsplashscreen/splashscreen_png.c diff --git a/jdk/src/java.desktop/solaris/classes/sun/font/X11CNS11643.java b/src/java.desktop/solaris/classes/sun/font/X11CNS11643.java similarity index 100% rename from jdk/src/java.desktop/solaris/classes/sun/font/X11CNS11643.java rename to src/java.desktop/solaris/classes/sun/font/X11CNS11643.java diff --git a/jdk/src/java.desktop/solaris/classes/sun/font/X11CNS11643P1.java b/src/java.desktop/solaris/classes/sun/font/X11CNS11643P1.java similarity index 100% rename from jdk/src/java.desktop/solaris/classes/sun/font/X11CNS11643P1.java rename to src/java.desktop/solaris/classes/sun/font/X11CNS11643P1.java diff --git a/jdk/src/java.desktop/solaris/classes/sun/font/X11CNS11643P2.java b/src/java.desktop/solaris/classes/sun/font/X11CNS11643P2.java similarity index 100% rename from jdk/src/java.desktop/solaris/classes/sun/font/X11CNS11643P2.java rename to src/java.desktop/solaris/classes/sun/font/X11CNS11643P2.java diff --git a/jdk/src/java.desktop/solaris/classes/sun/font/X11CNS11643P3.java b/src/java.desktop/solaris/classes/sun/font/X11CNS11643P3.java similarity index 100% rename from jdk/src/java.desktop/solaris/classes/sun/font/X11CNS11643P3.java rename to src/java.desktop/solaris/classes/sun/font/X11CNS11643P3.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/FcFontManager.java b/src/java.desktop/unix/classes/sun/awt/FcFontManager.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/FcFontManager.java rename to src/java.desktop/unix/classes/sun/awt/FcFontManager.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java b/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java rename to src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java rename to src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java b/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java rename to src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/MWMConstants.java b/src/java.desktop/unix/classes/sun/awt/X11/MWMConstants.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/MWMConstants.java rename to src/java.desktop/unix/classes/sun/awt/X11/MWMConstants.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java rename to src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java rename to src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java rename to src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java rename to src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/Native.java b/src/java.desktop/unix/classes/sun/awt/X11/Native.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/Native.java rename to src/java.desktop/unix/classes/sun/awt/X11/Native.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/OwnershipListener.java b/src/java.desktop/unix/classes/sun/awt/X11/OwnershipListener.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/OwnershipListener.java rename to src/java.desktop/unix/classes/sun/awt/X11/OwnershipListener.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/ToplevelStateListener.java b/src/java.desktop/unix/classes/sun/awt/X11/ToplevelStateListener.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/ToplevelStateListener.java rename to src/java.desktop/unix/classes/sun/awt/X11/ToplevelStateListener.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java b/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java rename to src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java b/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java rename to src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java b/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java rename to src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java b/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java rename to src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java b/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java rename to src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAbstractMenuItem.java b/src/java.desktop/unix/classes/sun/awt/X11/XAbstractMenuItem.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XAbstractMenuItem.java rename to src/java.desktop/unix/classes/sun/awt/X11/XAbstractMenuItem.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java b/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java rename to src/java.desktop/unix/classes/sun/awt/X11/XAtom.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java b/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java rename to src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java b/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java rename to src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java rename to src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java rename to src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxMenuItemPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxMenuItemPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxMenuItemPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XCheckboxMenuItemPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeerListener.java b/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeerListener.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeerListener.java rename to src/java.desktop/unix/classes/sun/awt/X11/XChoicePeerListener.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java b/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java rename to src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java b/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java rename to src/java.desktop/unix/classes/sun/awt/X11/XConstants.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java rename to src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java b/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java rename to src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCursorFontConstants.java b/src/java.desktop/unix/classes/sun/awt/X11/XCursorFontConstants.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XCursorFontConstants.java rename to src/java.desktop/unix/classes/sun/awt/X11/XCursorFontConstants.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java b/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java rename to src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java b/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragAndDropProtocols.java b/src/java.desktop/unix/classes/sun/awt/X11/XDragAndDropProtocols.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragAndDropProtocols.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDragAndDropProtocols.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocolListener.java b/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocolListener.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocolListener.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocolListener.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetEventProcessor.java b/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetEventProcessor.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetEventProcessor.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDropTargetEventProcessor.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetProtocol.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetProtocol.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDropTargetProtocol.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetProtocolListener.java b/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetProtocolListener.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetProtocolListener.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDropTargetProtocolListener.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetRegistry.java b/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetRegistry.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetRegistry.java rename to src/java.desktop/unix/classes/sun/awt/X11/XDropTargetRegistry.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java rename to src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java rename to src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java rename to src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java rename to src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java rename to src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java b/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java rename to src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandlerUtil.java b/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandlerUtil.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandlerUtil.java rename to src/java.desktop/unix/classes/sun/awt/X11/XErrorHandlerUtil.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEventDispatcher.java b/src/java.desktop/unix/classes/sun/awt/X11/XEventDispatcher.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XEventDispatcher.java rename to src/java.desktop/unix/classes/sun/awt/X11/XEventDispatcher.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XException.java b/src/java.desktop/unix/classes/sun/awt/X11/XException.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XException.java rename to src/java.desktop/unix/classes/sun/awt/X11/XException.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java rename to src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java b/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java rename to src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java b/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java rename to src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java rename to src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java b/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java rename to src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java b/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java rename to src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XKeySymConstants.java b/src/java.desktop/unix/classes/sun/awt/X11/XKeySymConstants.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XKeySymConstants.java rename to src/java.desktop/unix/classes/sun/awt/X11/XKeySymConstants.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java b/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java rename to src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XLayerProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XLayerProtocol.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XLayerProtocol.java rename to src/java.desktop/unix/classes/sun/awt/X11/XLayerProtocol.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java b/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java rename to src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMSelectionListener.java b/src/java.desktop/unix/classes/sun/awt/X11/XMSelectionListener.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XMSelectionListener.java rename to src/java.desktop/unix/classes/sun/awt/X11/XMSelectionListener.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java rename to src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XModalityProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XModalityProtocol.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XModalityProtocol.java rename to src/java.desktop/unix/classes/sun/awt/X11/XModalityProtocol.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java rename to src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java b/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java rename to src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XProtocol.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocol.java rename to src/java.desktop/unix/classes/sun/awt/X11/XProtocol.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocolConstants.java b/src/java.desktop/unix/classes/sun/awt/X11/XProtocolConstants.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XProtocolConstants.java rename to src/java.desktop/unix/classes/sun/awt/X11/XProtocolConstants.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java b/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java rename to src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java b/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java rename to src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java rename to src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java b/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java rename to src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarClient.java b/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarClient.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarClient.java rename to src/java.desktop/unix/classes/sun/awt/X11/XScrollbarClient.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java b/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java rename to src/java.desktop/unix/classes/sun/awt/X11/XSelection.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XStateProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XStateProtocol.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XStateProtocol.java rename to src/java.desktop/unix/classes/sun/awt/X11/XStateProtocol.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTaskbarPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XTaskbarPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XTaskbarPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XTaskbarPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTextFieldPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XTextFieldPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XTextFieldPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XTextFieldPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java b/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java rename to src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java b/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java rename to src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java b/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java rename to src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XUtilConstants.java b/src/java.desktop/unix/classes/sun/awt/X11/XUtilConstants.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XUtilConstants.java rename to src/java.desktop/unix/classes/sun/awt/X11/XUtilConstants.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java b/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java rename to src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java rename to src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWM.java b/src/java.desktop/unix/classes/sun/awt/X11/XWM.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XWM.java rename to src/java.desktop/unix/classes/sun/awt/X11/XWM.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWarningWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XWarningWindow.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XWarningWindow.java rename to src/java.desktop/unix/classes/sun/awt/X11/XWarningWindow.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java rename to src/java.desktop/unix/classes/sun/awt/X11/XWindow.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java b/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java rename to src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java b/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java rename to src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java b/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java rename to src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java b/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java rename to src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/doc-files/Modality.txt b/src/java.desktop/unix/classes/sun/awt/X11/doc-files/Modality.txt similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/doc-files/Modality.txt rename to src/java.desktop/unix/classes/sun/awt/X11/doc-files/Modality.txt diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/genhash.awk b/src/java.desktop/unix/classes/sun/awt/X11/genhash.awk similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/genhash.awk rename to src/java.desktop/unix/classes/sun/awt/X11/genhash.awk diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon16.png b/src/java.desktop/unix/classes/sun/awt/X11/java-icon16.png similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon16.png rename to src/java.desktop/unix/classes/sun/awt/X11/java-icon16.png diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon24.png b/src/java.desktop/unix/classes/sun/awt/X11/java-icon24.png similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon24.png rename to src/java.desktop/unix/classes/sun/awt/X11/java-icon24.png diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon32.png b/src/java.desktop/unix/classes/sun/awt/X11/java-icon32.png similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon32.png rename to src/java.desktop/unix/classes/sun/awt/X11/java-icon32.png diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon48.png b/src/java.desktop/unix/classes/sun/awt/X11/java-icon48.png similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon48.png rename to src/java.desktop/unix/classes/sun/awt/X11/java-icon48.png diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/keysym2ucs.h b/src/java.desktop/unix/classes/sun/awt/X11/keysym2ucs.h similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11/keysym2ucs.h rename to src/java.desktop/unix/classes/sun/awt/X11/keysym2ucs.h diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11ComponentPeer.java b/src/java.desktop/unix/classes/sun/awt/X11ComponentPeer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11ComponentPeer.java rename to src/java.desktop/unix/classes/sun/awt/X11ComponentPeer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java b/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java rename to src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11FontManager.java b/src/java.desktop/unix/classes/sun/awt/X11FontManager.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11FontManager.java rename to src/java.desktop/unix/classes/sun/awt/X11FontManager.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java rename to src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java rename to src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java rename to src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java b/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java rename to src/java.desktop/unix/classes/sun/awt/X11InputMethod.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java b/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java rename to src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/XSettings.java b/src/java.desktop/unix/classes/sun/awt/XSettings.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/XSettings.java rename to src/java.desktop/unix/classes/sun/awt/XSettings.java diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/windows/ThemeReader.java b/src/java.desktop/unix/classes/sun/awt/windows/ThemeReader.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/awt/windows/ThemeReader.java rename to src/java.desktop/unix/classes/sun/awt/windows/ThemeReader.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/DelegateStrike.java b/src/java.desktop/unix/classes/sun/font/DelegateStrike.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/DelegateStrike.java rename to src/java.desktop/unix/classes/sun/font/DelegateStrike.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java b/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java rename to src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java rename to src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/FontConfigManager.java b/src/java.desktop/unix/classes/sun/font/FontConfigManager.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/FontConfigManager.java rename to src/java.desktop/unix/classes/sun/font/FontConfigManager.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java rename to src/java.desktop/unix/classes/sun/font/MFontConfiguration.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/NativeFont.java b/src/java.desktop/unix/classes/sun/font/NativeFont.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/NativeFont.java rename to src/java.desktop/unix/classes/sun/font/NativeFont.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java b/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java rename to src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/NativeStrike.java b/src/java.desktop/unix/classes/sun/font/NativeStrike.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/NativeStrike.java rename to src/java.desktop/unix/classes/sun/font/NativeStrike.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java b/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java rename to src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11Dingbats.java b/src/java.desktop/unix/classes/sun/font/X11Dingbats.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/X11Dingbats.java rename to src/java.desktop/unix/classes/sun/font/X11Dingbats.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java b/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java rename to src/java.desktop/unix/classes/sun/font/X11GB18030_0.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java b/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java rename to src/java.desktop/unix/classes/sun/font/X11GB18030_1.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11GB2312.java b/src/java.desktop/unix/classes/sun/font/X11GB2312.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/X11GB2312.java rename to src/java.desktop/unix/classes/sun/font/X11GB2312.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11GBK.java b/src/java.desktop/unix/classes/sun/font/X11GBK.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/X11GBK.java rename to src/java.desktop/unix/classes/sun/font/X11GBK.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11Johab.java b/src/java.desktop/unix/classes/sun/font/X11Johab.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/X11Johab.java rename to src/java.desktop/unix/classes/sun/font/X11Johab.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11KSC5601.java b/src/java.desktop/unix/classes/sun/font/X11KSC5601.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/X11KSC5601.java rename to src/java.desktop/unix/classes/sun/font/X11KSC5601.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java b/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java rename to src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java b/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java rename to src/java.desktop/unix/classes/sun/font/X11TextRenderer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/XMap.java b/src/java.desktop/unix/classes/sun/font/XMap.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/XMap.java rename to src/java.desktop/unix/classes/sun/font/XMap.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java b/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java rename to src/java.desktop/unix/classes/sun/font/XRGlyphCache.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java b/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java rename to src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java diff --git a/jdk/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java b/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java rename to src/java.desktop/unix/classes/sun/font/XRTextRenderer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java b/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java rename to src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/UnixSurfaceManagerFactory.java b/src/java.desktop/unix/classes/sun/java2d/UnixSurfaceManagerFactory.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/UnixSurfaceManagerFactory.java rename to src/java.desktop/unix/classes/sun/java2d/UnixSurfaceManagerFactory.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/IdleTileCache.java b/src/java.desktop/unix/classes/sun/java2d/jules/IdleTileCache.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/jules/IdleTileCache.java rename to src/java.desktop/unix/classes/sun/java2d/jules/IdleTileCache.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesAATileGenerator.java b/src/java.desktop/unix/classes/sun/java2d/jules/JulesAATileGenerator.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesAATileGenerator.java rename to src/java.desktop/unix/classes/sun/java2d/jules/JulesAATileGenerator.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesPathBuf.java b/src/java.desktop/unix/classes/sun/java2d/jules/JulesPathBuf.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesPathBuf.java rename to src/java.desktop/unix/classes/sun/java2d/jules/JulesPathBuf.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesRenderingEngine.java b/src/java.desktop/unix/classes/sun/java2d/jules/JulesRenderingEngine.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesRenderingEngine.java rename to src/java.desktop/unix/classes/sun/java2d/jules/JulesRenderingEngine.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesShapePipe.java b/src/java.desktop/unix/classes/sun/java2d/jules/JulesShapePipe.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesShapePipe.java rename to src/java.desktop/unix/classes/sun/java2d/jules/JulesShapePipe.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesTile.java b/src/java.desktop/unix/classes/sun/java2d/jules/JulesTile.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/jules/JulesTile.java rename to src/java.desktop/unix/classes/sun/java2d/jules/JulesTile.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/TileTrapContainer.java b/src/java.desktop/unix/classes/sun/java2d/jules/TileTrapContainer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/jules/TileTrapContainer.java rename to src/java.desktop/unix/classes/sun/java2d/jules/TileTrapContainer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/TileWorker.java b/src/java.desktop/unix/classes/sun/java2d/jules/TileWorker.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/jules/TileWorker.java rename to src/java.desktop/unix/classes/sun/java2d/jules/TileWorker.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/jules/TrapezoidList.java b/src/java.desktop/unix/classes/sun/java2d/jules/TrapezoidList.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/jules/TrapezoidList.java rename to src/java.desktop/unix/classes/sun/java2d/jules/TrapezoidList.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java rename to src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java rename to src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java rename to src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java rename to src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java rename to src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java rename to src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java rename to src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java rename to src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java rename to src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/x11/XSurfaceData.java b/src/java.desktop/unix/classes/sun/java2d/x11/XSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/x11/XSurfaceData.java rename to src/java.desktop/unix/classes/sun/java2d/x11/XSurfaceData.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java b/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java rename to src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java rename to src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java rename to src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableIntArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableIntArray.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableIntArray.java rename to src/java.desktop/unix/classes/sun/java2d/xr/GrowableIntArray.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java rename to src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java rename to src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java b/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java rename to src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java b/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java rename to src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java b/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java rename to src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java b/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRBackend.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRBackend.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRBackend.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRBackend.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java b/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java rename to src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java diff --git a/jdk/src/java.desktop/unix/classes/sun/print/AttributeClass.java b/src/java.desktop/unix/classes/sun/print/AttributeClass.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/print/AttributeClass.java rename to src/java.desktop/unix/classes/sun/print/AttributeClass.java diff --git a/jdk/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java b/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java rename to src/java.desktop/unix/classes/sun/print/CUPSPrinter.java diff --git a/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java rename to src/java.desktop/unix/classes/sun/print/IPPPrintService.java diff --git a/jdk/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java b/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java rename to src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java diff --git a/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java rename to src/java.desktop/unix/classes/sun/print/UnixPrintJob.java diff --git a/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintService.java b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java similarity index 100% rename from jdk/src/java.desktop/unix/classes/sun/print/UnixPrintService.java rename to src/java.desktop/unix/classes/sun/print/UnixPrintService.java diff --git a/jdk/src/java.desktop/unix/conf/fonts/fonts.dir b/src/java.desktop/unix/conf/fonts/fonts.dir similarity index 100% rename from jdk/src/java.desktop/unix/conf/fonts/fonts.dir rename to src/java.desktop/unix/conf/fonts/fonts.dir diff --git a/jdk/src/java.desktop/unix/legal/fontconfig.md b/src/java.desktop/unix/legal/fontconfig.md similarity index 100% rename from jdk/src/java.desktop/unix/legal/fontconfig.md rename to src/java.desktop/unix/legal/fontconfig.md diff --git a/jdk/src/java.desktop/unix/legal/xwindows.md b/src/java.desktop/unix/legal/xwindows.md similarity index 100% rename from jdk/src/java.desktop/unix/legal/xwindows.md rename to src/java.desktop/unix/legal/xwindows.md diff --git a/jdk/src/java.desktop/unix/native/common/awt/CUPSfuncs.c b/src/java.desktop/unix/native/common/awt/CUPSfuncs.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/CUPSfuncs.c rename to src/java.desktop/unix/native/common/awt/CUPSfuncs.c diff --git a/jdk/src/java.desktop/unix/native/common/awt/X11Color.c b/src/java.desktop/unix/native/common/awt/X11Color.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/X11Color.c rename to src/java.desktop/unix/native/common/awt/X11Color.c diff --git a/jdk/src/java.desktop/unix/native/common/awt/awt.h b/src/java.desktop/unix/native/common/awt/awt.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/awt.h rename to src/java.desktop/unix/native/common/awt/awt.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/awt_Component.h b/src/java.desktop/unix/native/common/awt/awt_Component.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/awt_Component.h rename to src/java.desktop/unix/native/common/awt/awt_Component.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/awt_DrawingSurface.h b/src/java.desktop/unix/native/common/awt/awt_DrawingSurface.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/awt_DrawingSurface.h rename to src/java.desktop/unix/native/common/awt/awt_DrawingSurface.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/awt_Font.c b/src/java.desktop/unix/native/common/awt/awt_Font.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/awt_Font.c rename to src/java.desktop/unix/native/common/awt/awt_Font.c diff --git a/jdk/src/java.desktop/unix/native/common/awt/awt_Font.h b/src/java.desktop/unix/native/common/awt/awt_Font.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/awt_Font.h rename to src/java.desktop/unix/native/common/awt/awt_Font.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h b/src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h rename to src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/awt_Mlib.h b/src/java.desktop/unix/native/common/awt/awt_Mlib.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/awt_Mlib.h rename to src/java.desktop/unix/native/common/awt/awt_Mlib.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/awt_p.h b/src/java.desktop/unix/native/common/awt/awt_p.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/awt_p.h rename to src/java.desktop/unix/native/common/awt/awt_p.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/awt_util.h b/src/java.desktop/unix/native/common/awt/awt_util.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/awt_util.h rename to src/java.desktop/unix/native/common/awt/awt_util.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/color.h b/src/java.desktop/unix/native/common/awt/color.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/color.h rename to src/java.desktop/unix/native/common/awt/color.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/colordata.h b/src/java.desktop/unix/native/common/awt/colordata.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/colordata.h rename to src/java.desktop/unix/native/common/awt/colordata.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/fontconfig.h b/src/java.desktop/unix/native/common/awt/fontconfig.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/fontconfig.h rename to src/java.desktop/unix/native/common/awt/fontconfig.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/fontpath.c b/src/java.desktop/unix/native/common/awt/fontpath.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/fontpath.c rename to src/java.desktop/unix/native/common/awt/fontpath.c diff --git a/jdk/src/java.desktop/unix/native/common/awt/img_util_md.h b/src/java.desktop/unix/native/common/awt/img_util_md.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/img_util_md.h rename to src/java.desktop/unix/native/common/awt/img_util_md.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.c b/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.c rename to src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.c diff --git a/jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.h b/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.h rename to src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/medialib/vis_proto.h b/src/java.desktop/unix/native/common/awt/medialib/vis_proto.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/medialib/vis_proto.h rename to src/java.desktop/unix/native/common/awt/medialib/vis_proto.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/systemscale/systemScale.c b/src/java.desktop/unix/native/common/awt/systemscale/systemScale.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/systemscale/systemScale.c rename to src/java.desktop/unix/native/common/awt/systemscale/systemScale.c diff --git a/jdk/src/java.desktop/unix/native/common/awt/systemscale/systemScale.h b/src/java.desktop/unix/native/common/awt/systemscale/systemScale.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/systemscale/systemScale.h rename to src/java.desktop/unix/native/common/awt/systemscale/systemScale.h diff --git a/jdk/src/java.desktop/unix/native/common/awt/utility/rect.h b/src/java.desktop/unix/native/common/awt/utility/rect.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/awt/utility/rect.h rename to src/java.desktop/unix/native/common/awt/utility/rect.h diff --git a/jdk/src/java.desktop/unix/native/common/font/X11FontScaler.h b/src/java.desktop/unix/native/common/font/X11FontScaler.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/font/X11FontScaler.h rename to src/java.desktop/unix/native/common/font/X11FontScaler.h diff --git a/jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.c b/src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.c rename to src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.c diff --git a/jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.h b/src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.h rename to src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.h diff --git a/jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.c b/src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.c rename to src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.c diff --git a/jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.h b/src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.h rename to src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.h diff --git a/jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL/glx.h b/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL/glx.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL/glx.h rename to src/java.desktop/unix/native/common/java2d/opengl/J2D_GL/glx.h diff --git a/jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL/glxext.h b/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL/glxext.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL/glxext.h rename to src/java.desktop/unix/native/common/java2d/opengl/J2D_GL/glxext.h diff --git a/jdk/src/java.desktop/unix/native/common/java2d/opengl/OGLFuncs_md.h b/src/java.desktop/unix/native/common/java2d/opengl/OGLFuncs_md.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/opengl/OGLFuncs_md.h rename to src/java.desktop/unix/native/common/java2d/opengl/OGLFuncs_md.h diff --git a/jdk/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c b/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c rename to src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c diff --git a/jdk/src/java.desktop/unix/native/common/java2d/x11/X11PMBlitLoops.c b/src/java.desktop/unix/native/common/java2d/x11/X11PMBlitLoops.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/x11/X11PMBlitLoops.c rename to src/java.desktop/unix/native/common/java2d/x11/X11PMBlitLoops.c diff --git a/jdk/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c b/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c rename to src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c diff --git a/jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c b/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c rename to src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c diff --git a/jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h b/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h rename to src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h diff --git a/jdk/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c b/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c rename to src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c diff --git a/jdk/src/java.desktop/unix/native/include/jawt_md.h b/src/java.desktop/unix/native/include/jawt_md.h similarity index 100% rename from jdk/src/java.desktop/unix/native/include/jawt_md.h rename to src/java.desktop/unix/native/include/jawt_md.h diff --git a/jdk/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c b/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c rename to src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c diff --git a/jdk/src/java.desktop/unix/native/libawt/awt/awt_Mlib.c b/src/java.desktop/unix/native/libawt/awt/awt_Mlib.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/awt/awt_Mlib.c rename to src/java.desktop/unix/native/libawt/awt/awt_Mlib.c diff --git a/jdk/src/java.desktop/unix/native/libawt/awt/initIDs.c b/src/java.desktop/unix/native/libawt/awt/initIDs.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/awt/initIDs.c rename to src/java.desktop/unix/native/libawt/awt/initIDs.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/j2d_md.h b/src/java.desktop/unix/native/libawt/java2d/j2d_md.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/j2d_md.h rename to src/java.desktop/unix/native/libawt/java2d/j2d_md.h diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.c b/src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.c rename to src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.h b/src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.h rename to src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.h diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageCopy.h b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageCopy.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageCopy.h rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageCopy.h diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageLogic_proto.h b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageLogic_proto.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageLogic_proto.h rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageLogic_proto.h diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom.h b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom.h rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom.h diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom_NN.c b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom_NN.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom_NN.c rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom_NN.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear.c b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear.c rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.c b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.c rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.h b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.h rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.h diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstLogic.h b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstLogic.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstLogic.h rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstLogic.h diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstXor.c b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstXor.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstXor.c rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstXor.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic.h b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic.h rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic.h diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic_proto.h b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic_proto.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic_proto.h rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic_proto.h diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageXor.c b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageXor.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageXor.c rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageXor.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageZoom_NN_f.c b/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageZoom_NN_f.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageZoom_NN_f.c rename to src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageZoom_NN_f.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.h b/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.h rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.h diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskBlit.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskBlit.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskBlit.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskBlit.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskFill.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskFill.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskFill.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskFill.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_FromRgb.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_FromRgb.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_FromRgb.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_FromRgb.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_Mask.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_Mask.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_Mask.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_Mask.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteIndexed.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteIndexed.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteIndexed.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteIndexed.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_DrawLine.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_DrawLine.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_DrawLine.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_DrawLine.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgr.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgr.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgr.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgr.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgrPre.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgrPre.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgrPre.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgrPre.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_FuncArray.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_FuncArray.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_FuncArray.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_FuncArray.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphList.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphList.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphList.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphList.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphListXor.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphListXor.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphListXor.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphListXor.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgb.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgb.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgb.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgb.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbBm.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbBm.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbBm.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbBm.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre_Mask.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre_Mask.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre_Mask.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre_Mask.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntBgr.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntBgr.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntBgr.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_IntBgr.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgb.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgb.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgb.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgb.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgbx.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgbx.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgbx.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgbx.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_Interp.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_Interp.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_Interp.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_Interp.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcMaskFill.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcMaskFill.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcMaskFill.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcMaskFill.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskBlit.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskBlit.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskBlit.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskBlit.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskFill.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskFill.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskFill.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskFill.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ThreeByteBgr.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_ThreeByteBgr.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ThreeByteBgr.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_ThreeByteBgr.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray_FromRgb.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray_FromRgb.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray_FromRgb.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray_FromRgb.c diff --git a/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_XorBlit.c b/src/java.desktop/unix/native/libawt/java2d/loops/vis_XorBlit.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_XorBlit.c rename to src/java.desktop/unix/native/libawt/java2d/loops/vis_XorBlit.c diff --git a/jdk/src/java.desktop/unix/native/libawt_headless/awt/HeadlessToolkit.c b/src/java.desktop/unix/native/libawt_headless/awt/HeadlessToolkit.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_headless/awt/HeadlessToolkit.c rename to src/java.desktop/unix/native/libawt_headless/awt/HeadlessToolkit.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h b/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h rename to src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h b/src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h rename to src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.c rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.h b/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.h rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h b/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.c rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.h b/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.h rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_MenuComponent.h b/src/java.desktop/unix/native/libawt_xawt/awt/awt_MenuComponent.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_MenuComponent.h rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_MenuComponent.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c rename to src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/canvas.h b/src/java.desktop/unix/native/libawt_xawt/awt/canvas.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/canvas.h rename to src/java.desktop/unix/native/libawt_xawt/awt/canvas.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c b/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c rename to src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h b/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h rename to src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c rename to src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h rename to src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.c b/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.c rename to src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h b/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h rename to src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.c b/src/java.desktop/unix/native/libawt_xawt/awt/list.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.c rename to src/java.desktop/unix/native/libawt_xawt/awt/list.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.h b/src/java.desktop/unix/native/libawt_xawt/awt/list.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.h rename to src/java.desktop/unix/native/libawt_xawt/awt/list.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c b/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c rename to src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h b/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h rename to src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c b/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c rename to src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.h b/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.h rename to src/java.desktop/unix/native/libawt_xawt/awt/multi_font.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/randr.h b/src/java.desktop/unix/native/libawt_xawt/awt/randr.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/randr.h rename to src/java.desktop/unix/native/libawt_xawt/awt/randr.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c b/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c rename to src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h b/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h rename to src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c b/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c rename to src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c b/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c rename to src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKStyle.c b/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKStyle.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKStyle.c rename to src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKStyle.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/wsutils.h b/src/java.desktop/unix/native/libawt_xawt/awt/wsutils.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/awt/wsutils.h rename to src/java.desktop/unix/native/libawt_xawt/awt/wsutils.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c b/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c rename to src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRSurfaceData.c b/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRSurfaceData.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRSurfaceData.c rename to src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRSurfaceData.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c b/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c rename to src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c b/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c rename to src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c b/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c rename to src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Desktop.c b/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Desktop.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Desktop.c rename to src/java.desktop/unix/native/libawt_xawt/xawt/awt_Desktop.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c b/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c rename to src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.h b/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.h rename to src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.c b/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.c rename to src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h b/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h rename to src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h diff --git a/jdk/src/java.desktop/unix/native/libfontmanager/X11FontScaler.c b/src/java.desktop/unix/native/libfontmanager/X11FontScaler.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libfontmanager/X11FontScaler.c rename to src/java.desktop/unix/native/libfontmanager/X11FontScaler.c diff --git a/jdk/src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c b/src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c rename to src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c diff --git a/jdk/src/java.desktop/unix/native/libjawt/jawt.c b/src/java.desktop/unix/native/libjawt/jawt.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjawt/jawt.c rename to src/java.desktop/unix/native/libjawt/jawt.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h b/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiIn.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiIn.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiIn.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiIn.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiOut.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiOut.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiOut.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiOut.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h b/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCM.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCM.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCM.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCM.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h b/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_Ports.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_Ports.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_Ports.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_Ports.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h b/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h b/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h b/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_PCM.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_PCM.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_PCM.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_PCM.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Ports.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Ports.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Ports.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Ports.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.c b/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.c rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.c diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.h b/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.h rename to src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.h diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_ImageConvCopyEdge_Fp.c b/src/java.desktop/unix/native/libmlib_image/mlib_ImageConvCopyEdge_Fp.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_ImageConvCopyEdge_Fp.c rename to src/java.desktop/unix/native/libmlib_image/mlib_ImageConvCopyEdge_Fp.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_S16.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_S16.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_S16.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_S16.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_U16.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_U16.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_U16.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_U16.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.h b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.h rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.h diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_NN.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_NN.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_NN.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_NN.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvClearEdge.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvClearEdge.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvClearEdge.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvClearEdge.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvCopyEdge.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvCopyEdge.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvCopyEdge.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvCopyEdge.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8ext.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8ext.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8ext.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8ext.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvVersion.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvVersion.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvVersion.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvVersion.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.h b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.h rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.h diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUp.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUp.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUp.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUp.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpFunc.h b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpFunc.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpFunc.h rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpFunc.h diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S32Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S32Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S32Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S32Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U8Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U8Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U8Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U8Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S32Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S32Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S32Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S32Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U8Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U8Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U8Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U8Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S32Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S32Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S32Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S32Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U8Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U8Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U8Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U8Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S32Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S32Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S32Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S32Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U8Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U8Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U8Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U8Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S32Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S32Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S32Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S32Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U8Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U8Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U8Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U8Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S32Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S32Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S32Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S32Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U8Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U8Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U8Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U8Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S32Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S32Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S32Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S32Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U8Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U8Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U8Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U8Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S32Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S32Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S32Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S32Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U16Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U16Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U16Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U16Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U8Func.c b/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U8Func.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U8Func.c rename to src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U8Func.c diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/vis_32.il b/src/java.desktop/unix/native/libmlib_image/vis_32.il similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/vis_32.il rename to src/java.desktop/unix/native/libmlib_image/vis_32.il diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/vis_64.il b/src/java.desktop/unix/native/libmlib_image/vis_64.il similarity index 100% rename from jdk/src/java.desktop/unix/native/libmlib_image/vis_64.il rename to src/java.desktop/unix/native/libmlib_image/vis_64.il diff --git a/jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_config.h b/src/java.desktop/unix/native/libsplashscreen/splashscreen_config.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_config.h rename to src/java.desktop/unix/native/libsplashscreen/splashscreen_config.h diff --git a/jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c b/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c rename to src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java b/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java rename to src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java b/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java rename to src/java.desktop/windows/classes/sun/awt/Win32FontManager.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java rename to src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java rename to src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java rename to src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/resources/cursors/CopyDrop32x32.gif b/src/java.desktop/windows/classes/sun/awt/resources/cursors/CopyDrop32x32.gif similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/resources/cursors/CopyDrop32x32.gif rename to src/java.desktop/windows/classes/sun/awt/resources/cursors/CopyDrop32x32.gif diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/resources/cursors/LinkDrop32x32.gif b/src/java.desktop/windows/classes/sun/awt/resources/cursors/LinkDrop32x32.gif similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/resources/cursors/LinkDrop32x32.gif rename to src/java.desktop/windows/classes/sun/awt/resources/cursors/LinkDrop32x32.gif diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/resources/cursors/MoveDrop32x32.gif b/src/java.desktop/windows/classes/sun/awt/resources/cursors/MoveDrop32x32.gif similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/resources/cursors/MoveDrop32x32.gif rename to src/java.desktop/windows/classes/sun/awt/resources/cursors/MoveDrop32x32.gif diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java b/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java rename to src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java b/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java rename to src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java b/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java rename to src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java b/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java rename to src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WButtonPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WButtonPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WButtonPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WButtonPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WCanvasPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WCanvasPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WCanvasPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WCanvasPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WCheckboxMenuItemPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WCheckboxMenuItemPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WCheckboxMenuItemPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WCheckboxMenuItemPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WCheckboxPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WCheckboxPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WCheckboxPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WCheckboxPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WChoicePeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WChoicePeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WChoicePeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WChoicePeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WClipboard.java b/src/java.desktop/windows/classes/sun/awt/windows/WClipboard.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WClipboard.java rename to src/java.desktop/windows/classes/sun/awt/windows/WClipboard.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WCustomCursor.java b/src/java.desktop/windows/classes/sun/awt/windows/WCustomCursor.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WCustomCursor.java rename to src/java.desktop/windows/classes/sun/awt/windows/WCustomCursor.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java b/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java b/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java rename to src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java b/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java rename to src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WDropTargetContextPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WDropTargetContextPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WDropTargetContextPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WDropTargetContextPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java rename to src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFileDialogPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WFileDialogPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WFileDialogPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WFileDialogPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java b/src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java rename to src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFontMetrics.java b/src/java.desktop/windows/classes/sun/awt/windows/WFontMetrics.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WFontMetrics.java rename to src/java.desktop/windows/classes/sun/awt/windows/WFontMetrics.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFontPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WFontPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WFontPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WFontPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WFramePeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WFramePeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WFramePeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WFramePeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WGlobalCursorManager.java b/src/java.desktop/windows/classes/sun/awt/windows/WGlobalCursorManager.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WGlobalCursorManager.java rename to src/java.desktop/windows/classes/sun/awt/windows/WGlobalCursorManager.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java b/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java rename to src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethodDescriptor.java b/src/java.desktop/windows/classes/sun/awt/windows/WInputMethodDescriptor.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethodDescriptor.java rename to src/java.desktop/windows/classes/sun/awt/windows/WInputMethodDescriptor.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WMenuBarPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WMenuBarPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WMenuBarPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WMenuBarPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WMenuPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WMenuPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WMenuPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WMenuPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java b/src/java.desktop/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WMouseInfoPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WMouseInfoPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WMouseInfoPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WMouseInfoPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WObjectPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WObjectPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WObjectPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WObjectPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPageDialog.java b/src/java.desktop/windows/classes/sun/awt/windows/WPageDialog.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WPageDialog.java rename to src/java.desktop/windows/classes/sun/awt/windows/WPageDialog.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPageDialogPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WPageDialogPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WPageDialogPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WPageDialogPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPanelPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WPanelPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WPanelPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WPanelPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java b/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java rename to src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrintDialog.java b/src/java.desktop/windows/classes/sun/awt/windows/WPrintDialog.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrintDialog.java rename to src/java.desktop/windows/classes/sun/awt/windows/WPrintDialog.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrintDialogPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WPrintDialogPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrintDialogPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WPrintDialogPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java rename to src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WSystemTrayPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WSystemTrayPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WSystemTrayPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WSystemTrayPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTaskbarPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WTaskbarPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WTaskbarPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WTaskbarPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTextAreaPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WTextAreaPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WTextAreaPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WTextAreaPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTextComponentPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WTextComponentPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WTextComponentPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WTextComponentPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTextFieldPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WTextFieldPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WTextFieldPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WTextFieldPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java b/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java rename to src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java rename to src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java b/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java rename to src/java.desktop/windows/classes/sun/awt/windows/WingDings.java diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization.properties similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization.properties rename to src/java.desktop/windows/classes/sun/awt/windows/awtLocalization.properties diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_de.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_de.properties similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_de.properties rename to src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_de.properties diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_es.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_es.properties similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_es.properties rename to src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_es.properties diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_fr.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_fr.properties similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_fr.properties rename to src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_fr.properties diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_it.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_it.properties similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_it.properties rename to src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_it.properties diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ja.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ja.properties similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ja.properties rename to src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ja.properties diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ko.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ko.properties similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ko.properties rename to src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ko.properties diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_pt_BR.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_pt_BR.properties similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_pt_BR.properties rename to src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_pt_BR.properties diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_sv.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_sv.properties similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_sv.properties rename to src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_sv.properties diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties rename to src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties rename to src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties diff --git a/jdk/src/java.desktop/windows/classes/sun/font/NativeFont.java b/src/java.desktop/windows/classes/sun/font/NativeFont.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/font/NativeFont.java rename to src/java.desktop/windows/classes/sun/font/NativeFont.java diff --git a/jdk/src/java.desktop/windows/classes/sun/font/NativeStrike.java b/src/java.desktop/windows/classes/sun/font/NativeStrike.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/font/NativeStrike.java rename to src/java.desktop/windows/classes/sun/font/NativeStrike.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/ScreenUpdateManager.java b/src/java.desktop/windows/classes/sun/java2d/ScreenUpdateManager.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/ScreenUpdateManager.java rename to src/java.desktop/windows/classes/sun/java2d/ScreenUpdateManager.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java b/src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java rename to src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java rename to src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java rename to src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java rename to src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java rename to src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java b/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java rename to src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java b/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java rename to src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java b/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java rename to src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java b/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java rename to src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java diff --git a/jdk/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java b/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java rename to src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java diff --git a/jdk/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java b/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java rename to src/java.desktop/windows/classes/sun/print/Win32MediaTray.java diff --git a/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java b/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java rename to src/java.desktop/windows/classes/sun/print/Win32PrintJob.java diff --git a/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintService.java b/src/java.desktop/windows/classes/sun/print/Win32PrintService.java similarity index 100% rename from jdk/src/java.desktop/windows/classes/sun/print/Win32PrintService.java rename to src/java.desktop/windows/classes/sun/print/Win32PrintService.java diff --git a/jdk/src/java.desktop/windows/native/common/awt/systemscale/systemScale.cpp b/src/java.desktop/windows/native/common/awt/systemscale/systemScale.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/common/awt/systemscale/systemScale.cpp rename to src/java.desktop/windows/native/common/awt/systemscale/systemScale.cpp diff --git a/jdk/src/java.desktop/windows/native/common/awt/systemscale/systemScale.h b/src/java.desktop/windows/native/common/awt/systemscale/systemScale.h similarity index 100% rename from jdk/src/java.desktop/windows/native/common/awt/systemscale/systemScale.h rename to src/java.desktop/windows/native/common/awt/systemscale/systemScale.h diff --git a/jdk/src/java.desktop/windows/native/common/awt/utility/rect.h b/src/java.desktop/windows/native/common/awt/utility/rect.h similarity index 100% rename from jdk/src/java.desktop/windows/native/common/awt/utility/rect.h rename to src/java.desktop/windows/native/common/awt/utility/rect.h diff --git a/jdk/src/java.desktop/windows/native/common/awt_makecube.cpp b/src/java.desktop/windows/native/common/awt_makecube.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/common/awt_makecube.cpp rename to src/java.desktop/windows/native/common/awt_makecube.cpp diff --git a/jdk/src/java.desktop/windows/native/include/jawt_md.h b/src/java.desktop/windows/native/include/jawt_md.h similarity index 100% rename from jdk/src/java.desktop/windows/native/include/jawt_md.h rename to src/java.desktop/windows/native/include/jawt_md.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBadHardware.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBadHardware.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBadHardware.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DBadHardware.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBlitLoops.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBlitLoops.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBlitLoops.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DBlitLoops.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBlitLoops.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBlitLoops.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBlitLoops.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DBlitLoops.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBufImgOps.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBufImgOps.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBufImgOps.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DBufImgOps.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBufImgOps.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBufImgOps.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBufImgOps.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DBufImgOps.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGraphicsDevice.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGraphicsDevice.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGraphicsDevice.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DGraphicsDevice.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGraphicsDevice.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGraphicsDevice.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGraphicsDevice.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DGraphicsDevice.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskBlit.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskBlit.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskBlit.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskBlit.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskBlit.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskBlit.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskBlit.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskBlit.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskCache.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskCache.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskCache.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskCache.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskCache.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskCache.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskCache.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskCache.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskFill.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskFill.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskFill.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskFill.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskFill.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskFill.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskFill.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskFill.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPaints.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPaints.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPaints.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DPaints.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPaints.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPaints.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPaints.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DPaints.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipeline.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipeline.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipeline.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipeline.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderer.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderer.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderer.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderer.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderer.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderer.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderer.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderer.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DResourceManager.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DResourceManager.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DResourceManager.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DResourceManager.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DResourceManager.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DResourceManager.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DResourceManager.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DResourceManager.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DShaderGen.c b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DShaderGen.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DShaderGen.c rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DShaderGen.c diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DShaders.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DShaders.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DShaders.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DShaders.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DTextRenderer.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DTextRenderer.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DTextRenderer.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DTextRenderer.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DTextRenderer.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DTextRenderer.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DTextRenderer.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DTextRenderer.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DVertexCacher.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DVertexCacher.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DVertexCacher.cpp rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DVertexCacher.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DVertexCacher.h b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DVertexCacher.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DVertexCacher.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/D3DVertexCacher.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.c b/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.c rename to src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.c diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.h b/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.h rename to src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/j2d_md.h b/src/java.desktop/windows/native/libawt/java2d/j2d_md.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/j2d_md.h rename to src/java.desktop/windows/native/libawt/java2d/j2d_md.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/opengl/J2D_GL/wglext.h b/src/java.desktop/windows/native/libawt/java2d/opengl/J2D_GL/wglext.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/opengl/J2D_GL/wglext.h rename to src/java.desktop/windows/native/libawt/java2d/opengl/J2D_GL/wglext.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/opengl/OGLFuncs_md.h b/src/java.desktop/windows/native/libawt/java2d/opengl/OGLFuncs_md.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/opengl/OGLFuncs_md.h rename to src/java.desktop/windows/native/libawt/java2d/opengl/OGLFuncs_md.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLGraphicsConfig.c b/src/java.desktop/windows/native/libawt/java2d/opengl/WGLGraphicsConfig.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLGraphicsConfig.c rename to src/java.desktop/windows/native/libawt/java2d/opengl/WGLGraphicsConfig.c diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLGraphicsConfig.h b/src/java.desktop/windows/native/libawt/java2d/opengl/WGLGraphicsConfig.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLGraphicsConfig.h rename to src/java.desktop/windows/native/libawt/java2d/opengl/WGLGraphicsConfig.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLSurfaceData.c b/src/java.desktop/windows/native/libawt/java2d/opengl/WGLSurfaceData.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLSurfaceData.c rename to src/java.desktop/windows/native/libawt/java2d/opengl/WGLSurfaceData.c diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLSurfaceData.h b/src/java.desktop/windows/native/libawt/java2d/opengl/WGLSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLSurfaceData.h rename to src/java.desktop/windows/native/libawt/java2d/opengl/WGLSurfaceData.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIBlitLoops.cpp b/src/java.desktop/windows/native/libawt/java2d/windows/GDIBlitLoops.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIBlitLoops.cpp rename to src/java.desktop/windows/native/libawt/java2d/windows/GDIBlitLoops.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIRenderer.cpp b/src/java.desktop/windows/native/libawt/java2d/windows/GDIRenderer.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIRenderer.cpp rename to src/java.desktop/windows/native/libawt/java2d/windows/GDIRenderer.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp b/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp rename to src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.h b/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.h rename to src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.h diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp b/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp rename to src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h b/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h rename to src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp b/src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp rename to src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.h b/src/java.desktop/windows/native/libawt/windows/CmdIDList.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.h rename to src/java.desktop/windows/native/libawt/windows/CmdIDList.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.cpp b/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.cpp rename to src/java.desktop/windows/native/libawt/windows/ComCtl32Util.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.h b/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.h rename to src/java.desktop/windows/native/libawt/windows/ComCtl32Util.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/Devices.cpp b/src/java.desktop/windows/native/libawt/windows/Devices.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/Devices.cpp rename to src/java.desktop/windows/native/libawt/windows/Devices.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/Devices.h b/src/java.desktop/windows/native/libawt/windows/Devices.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/Devices.h rename to src/java.desktop/windows/native/libawt/windows/Devices.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.cpp b/src/java.desktop/windows/native/libawt/windows/DllUtil.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.cpp rename to src/java.desktop/windows/native/libawt/windows/DllUtil.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.h b/src/java.desktop/windows/native/libawt/windows/DllUtil.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.h rename to src/java.desktop/windows/native/libawt/windows/DllUtil.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.cpp b/src/java.desktop/windows/native/libawt/windows/GDIHashtable.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.cpp rename to src/java.desktop/windows/native/libawt/windows/GDIHashtable.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.h b/src/java.desktop/windows/native/libawt/windows/GDIHashtable.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.h rename to src/java.desktop/windows/native/libawt/windows/GDIHashtable.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.cpp b/src/java.desktop/windows/native/libawt/windows/Hashtable.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.cpp rename to src/java.desktop/windows/native/libawt/windows/Hashtable.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.h b/src/java.desktop/windows/native/libawt/windows/Hashtable.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.h rename to src/java.desktop/windows/native/libawt/windows/Hashtable.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp b/src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp rename to src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.cpp b/src/java.desktop/windows/native/libawt/windows/ObjectList.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.cpp rename to src/java.desktop/windows/native/libawt/windows/ObjectList.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.h b/src/java.desktop/windows/native/libawt/windows/ObjectList.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.h rename to src/java.desktop/windows/native/libawt/windows/ObjectList.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/README.JNI b/src/java.desktop/windows/native/libawt/windows/README.JNI similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/README.JNI rename to src/java.desktop/windows/native/libawt/windows/README.JNI diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp b/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp rename to src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp b/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp rename to src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp b/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp rename to src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/alloc.h b/src/java.desktop/windows/native/libawt/windows/alloc.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/alloc.h rename to src/java.desktop/windows/native/libawt/windows/alloc.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt.h b/src/java.desktop/windows/native/libawt/windows/awt.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt.h rename to src/java.desktop/windows/native/libawt/windows/awt.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt.rc b/src/java.desktop/windows/native/libawt/windows/awt.rc similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt.rc rename to src/java.desktop/windows/native/libawt/windows/awt.rc diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.cpp b/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.h b/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.h rename to src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.cpp b/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.h b/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.h rename to src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Brush.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Brush.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.h b/src/java.desktop/windows/native/libawt/windows/awt_Brush.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.h rename to src/java.desktop/windows/native/libawt/windows/awt_Brush.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Button.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.h b/src/java.desktop/windows/native/libawt/windows/awt_Button.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.h rename to src/java.desktop/windows/native/libawt/windows/awt_Button.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.h b/src/java.desktop/windows/native/libawt/windows/awt_Canvas.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.h rename to src/java.desktop/windows/native/libawt/windows/awt_Canvas.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.h b/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.h rename to src/java.desktop/windows/native/libawt/windows/awt_Checkbox.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.h b/src/java.desktop/windows/native/libawt/windows/awt_Choice.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.h rename to src/java.desktop/windows/native/libawt/windows/awt_Choice.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Clipboard.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.h b/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.h rename to src/java.desktop/windows/native/libawt/windows/awt_Clipboard.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Color.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Color.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.h b/src/java.desktop/windows/native/libawt/windows/awt_Color.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.h rename to src/java.desktop/windows/native/libawt/windows/awt_Color.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Component.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h b/src/java.desktop/windows/native/libawt/windows/awt_Component.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h rename to src/java.desktop/windows/native/libawt/windows/awt_Component.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Container.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Container.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.h b/src/java.desktop/windows/native/libawt/windows/awt_Container.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.h rename to src/java.desktop/windows/native/libawt/windows/awt_Container.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.h b/src/java.desktop/windows/native/libawt/windows/awt_Cursor.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.h rename to src/java.desktop/windows/native/libawt/windows/awt_Cursor.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_CustomPaletteDef.h b/src/java.desktop/windows/native/libawt/windows/awt_CustomPaletteDef.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_CustomPaletteDef.h rename to src/java.desktop/windows/native/libawt/windows/awt_CustomPaletteDef.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.h b/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.h rename to src/java.desktop/windows/native/libawt/windows/awt_DCHolder.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.h b/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.h rename to src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.h b/src/java.desktop/windows/native/libawt/windows/awt_Debug.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.h rename to src/java.desktop/windows/native/libawt/windows/awt_Debug.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.h b/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.h rename to src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.h b/src/java.desktop/windows/native/libawt/windows/awt_Dialog.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.h rename to src/java.desktop/windows/native/libawt/windows/awt_Dialog.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Dimension.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Dimension.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.h b/src/java.desktop/windows/native/libawt/windows/awt_Dimension.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.h rename to src/java.desktop/windows/native/libawt/windows/awt_Dimension.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h b/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h rename to src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h b/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h rename to src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.h b/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.h rename to src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Event.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Event.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.h b/src/java.desktop/windows/native/libawt/windows/awt_Event.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.h rename to src/java.desktop/windows/native/libawt/windows/awt_Event.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp b/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.h b/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.h rename to src/java.desktop/windows/native/libawt/windows/awt_FileDialog.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Font.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.h b/src/java.desktop/windows/native/libawt/windows/awt_Font.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.h rename to src/java.desktop/windows/native/libawt/windows/awt_Font.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.h b/src/java.desktop/windows/native/libawt/windows/awt_Frame.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.h rename to src/java.desktop/windows/native/libawt/windows/awt_Frame.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp b/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.h b/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.h rename to src/java.desktop/windows/native/libawt/windows/awt_GDIObject.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.cpp b/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_IconCursor.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.h b/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.h rename to src/java.desktop/windows/native/libawt/windows/awt_IconCursor.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.cpp b/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_InputEvent.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.h b/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.h rename to src/java.desktop/windows/native/libawt/windows/awt_InputEvent.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp b/src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.cpp b/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.h b/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.h rename to src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Insets.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Insets.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.h b/src/java.desktop/windows/native/libawt/windows/awt_Insets.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.h rename to src/java.desktop/windows/native/libawt/windows/awt_Insets.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.cpp b/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.h b/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.h rename to src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyboardFocusManager.cpp b/src/java.desktop/windows/native/libawt/windows/awt_KeyboardFocusManager.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyboardFocusManager.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_KeyboardFocusManager.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Label.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Label.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.h b/src/java.desktop/windows/native/libawt/windows/awt_Label.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.h rename to src/java.desktop/windows/native/libawt/windows/awt_Label.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_List.cpp b/src/java.desktop/windows/native/libawt/windows/awt_List.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_List.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_List.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_List.h b/src/java.desktop/windows/native/libawt/windows/awt_List.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_List.h rename to src/java.desktop/windows/native/libawt/windows/awt_List.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Menu.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Menu.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.h b/src/java.desktop/windows/native/libawt/windows/awt_Menu.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.h rename to src/java.desktop/windows/native/libawt/windows/awt_Menu.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.cpp b/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_MenuBar.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.h b/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.h rename to src/java.desktop/windows/native/libawt/windows/awt_MenuBar.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp b/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h b/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h rename to src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h b/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h rename to src/java.desktop/windows/native/libawt/windows/awt_Mlib.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.cpp b/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.h b/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.h rename to src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Object.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Object.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.h b/src/java.desktop/windows/native/libawt/windows/awt_Object.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.h rename to src/java.desktop/windows/native/libawt/windows/awt_Object.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Palette.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Palette.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.h b/src/java.desktop/windows/native/libawt/windows/awt_Palette.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.h rename to src/java.desktop/windows/native/libawt/windows/awt_Palette.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Panel.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Panel.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.h b/src/java.desktop/windows/native/libawt/windows/awt_Panel.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.h rename to src/java.desktop/windows/native/libawt/windows/awt_Panel.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Pen.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Pen.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.h b/src/java.desktop/windows/native/libawt/windows/awt_Pen.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.h rename to src/java.desktop/windows/native/libawt/windows/awt_Pen.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.cpp b/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.h b/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.h rename to src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp b/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.h b/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.h rename to src/java.desktop/windows/native/libawt/windows/awt_PrintControl.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.cpp b/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h b/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h rename to src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp b/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Rectangle.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.h b/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.h rename to src/java.desktop/windows/native/libawt/windows/awt_Rectangle.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.h b/src/java.desktop/windows/native/libawt/windows/awt_Robot.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.h rename to src/java.desktop/windows/native/libawt/windows/awt_Robot.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp b/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.h b/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.h rename to src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h b/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h rename to src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Taskbar.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Taskbar.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Taskbar.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Taskbar.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Taskbar.h b/src/java.desktop/windows/native/libawt/windows/awt_Taskbar.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Taskbar.h rename to src/java.desktop/windows/native/libawt/windows/awt_Taskbar.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp b/src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.h b/src/java.desktop/windows/native/libawt/windows/awt_TextArea.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.h rename to src/java.desktop/windows/native/libawt/windows/awt_TextArea.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp b/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.h b/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.h rename to src/java.desktop/windows/native/libawt/windows/awt_TextComponent.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp b/src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.h b/src/java.desktop/windows/native/libawt/windows/awt_TextField.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.h rename to src/java.desktop/windows/native/libawt/windows/awt_TextField.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h rename to src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp b/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.h b/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.h rename to src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.h b/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.h rename to src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.h b/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.h rename to src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_Window.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.h b/src/java.desktop/windows/native/libawt/windows/awt_Window.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.h rename to src/java.desktop/windows/native/libawt/windows/awt_Window.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_new.cpp b/src/java.desktop/windows/native/libawt/windows/awt_new.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_new.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_new.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_new.h b/src/java.desktop/windows/native/libawt/windows/awt_new.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_new.h rename to src/java.desktop/windows/native/libawt/windows/awt_new.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.cpp b/src/java.desktop/windows/native/libawt/windows/awt_ole.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.cpp rename to src/java.desktop/windows/native/libawt/windows/awt_ole.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.h b/src/java.desktop/windows/native/libawt/windows/awt_ole.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.h rename to src/java.desktop/windows/native/libawt/windows/awt_ole.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h b/src/java.desktop/windows/native/libawt/windows/awtmsg.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h rename to src/java.desktop/windows/native/libawt/windows/awtmsg.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/check.bmp b/src/java.desktop/windows/native/libawt/windows/check.bmp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/check.bmp rename to src/java.desktop/windows/native/libawt/windows/check.bmp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/colordata.h b/src/java.desktop/windows/native/libawt/windows/colordata.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/colordata.h rename to src/java.desktop/windows/native/libawt/windows/colordata.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/img_util_md.h b/src/java.desktop/windows/native/libawt/windows/img_util_md.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/img_util_md.h rename to src/java.desktop/windows/native/libawt/windows/img_util_md.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/initIDs.cpp b/src/java.desktop/windows/native/libawt/windows/initIDs.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/initIDs.cpp rename to src/java.desktop/windows/native/libawt/windows/initIDs.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/mlib_types_md.h b/src/java.desktop/windows/native/libawt/windows/mlib_types_md.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/mlib_types_md.h rename to src/java.desktop/windows/native/libawt/windows/mlib_types_md.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/security_warning.ico b/src/java.desktop/windows/native/libawt/windows/security_warning.ico similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/security_warning.ico rename to src/java.desktop/windows/native/libawt/windows/security_warning.ico diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/security_warning_bw.ico b/src/java.desktop/windows/native/libawt/windows/security_warning_bw.ico similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/security_warning_bw.ico rename to src/java.desktop/windows/native/libawt/windows/security_warning_bw.ico diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/security_warning_int.ico b/src/java.desktop/windows/native/libawt/windows/security_warning_int.ico similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/security_warning_int.ico rename to src/java.desktop/windows/native/libawt/windows/security_warning_int.ico diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/stdhdrs.h b/src/java.desktop/windows/native/libawt/windows/stdhdrs.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/windows/stdhdrs.h rename to src/java.desktop/windows/native/libawt/windows/stdhdrs.h diff --git a/jdk/src/java.desktop/windows/native/libfontmanager/fontpath.c b/src/java.desktop/windows/native/libfontmanager/fontpath.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libfontmanager/fontpath.c rename to src/java.desktop/windows/native/libfontmanager/fontpath.c diff --git a/jdk/src/java.desktop/windows/native/libfontmanager/lcdglyph.c b/src/java.desktop/windows/native/libfontmanager/lcdglyph.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libfontmanager/lcdglyph.c rename to src/java.desktop/windows/native/libfontmanager/lcdglyph.c diff --git a/jdk/src/java.desktop/windows/native/libjawt/jawt.cpp b/src/java.desktop/windows/native/libjawt/jawt.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libjawt/jawt.cpp rename to src/java.desktop/windows/native/libjawt/jawt.cpp diff --git a/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Charset_Util.cpp b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Charset_Util.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Charset_Util.cpp rename to src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Charset_Util.cpp diff --git a/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Charset_Util.h b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Charset_Util.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Charset_Util.h rename to src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Charset_Util.h diff --git a/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_DirectSound.cpp b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_DirectSound.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_DirectSound.cpp rename to src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_DirectSound.cpp diff --git a/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiIn.cpp b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiIn.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiIn.cpp rename to src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiIn.cpp diff --git a/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiOut.c b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiOut.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiOut.c rename to src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiOut.c diff --git a/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Ports.c b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Ports.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Ports.c rename to src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Ports.c diff --git a/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Util.c b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Util.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Util.c rename to src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Util.c diff --git a/jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Util.h b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Util.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Util.h rename to src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Util.h diff --git a/jdk/src/java.desktop/windows/native/libsplashscreen/splashscreen_config.h b/src/java.desktop/windows/native/libsplashscreen/splashscreen_config.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libsplashscreen/splashscreen_config.h rename to src/java.desktop/windows/native/libsplashscreen/splashscreen_config.h diff --git a/jdk/src/java.desktop/windows/native/libsplashscreen/splashscreen_sys.c b/src/java.desktop/windows/native/libsplashscreen/splashscreen_sys.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libsplashscreen/splashscreen_sys.c rename to src/java.desktop/windows/native/libsplashscreen/splashscreen_sys.c diff --git a/jdk/src/java.instrument/share/classes/java/lang/instrument/ClassDefinition.java b/src/java.instrument/share/classes/java/lang/instrument/ClassDefinition.java similarity index 100% rename from jdk/src/java.instrument/share/classes/java/lang/instrument/ClassDefinition.java rename to src/java.instrument/share/classes/java/lang/instrument/ClassDefinition.java diff --git a/jdk/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java b/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java similarity index 100% rename from jdk/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java rename to src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java diff --git a/jdk/src/java.instrument/share/classes/java/lang/instrument/IllegalClassFormatException.java b/src/java.instrument/share/classes/java/lang/instrument/IllegalClassFormatException.java similarity index 100% rename from jdk/src/java.instrument/share/classes/java/lang/instrument/IllegalClassFormatException.java rename to src/java.instrument/share/classes/java/lang/instrument/IllegalClassFormatException.java diff --git a/jdk/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java b/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java similarity index 100% rename from jdk/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java rename to src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java diff --git a/jdk/src/java.instrument/share/classes/java/lang/instrument/UnmodifiableClassException.java b/src/java.instrument/share/classes/java/lang/instrument/UnmodifiableClassException.java similarity index 100% rename from jdk/src/java.instrument/share/classes/java/lang/instrument/UnmodifiableClassException.java rename to src/java.instrument/share/classes/java/lang/instrument/UnmodifiableClassException.java diff --git a/jdk/src/java.instrument/share/classes/java/lang/instrument/UnmodifiableModuleException.java b/src/java.instrument/share/classes/java/lang/instrument/UnmodifiableModuleException.java similarity index 100% rename from jdk/src/java.instrument/share/classes/java/lang/instrument/UnmodifiableModuleException.java rename to src/java.instrument/share/classes/java/lang/instrument/UnmodifiableModuleException.java diff --git a/jdk/src/java.instrument/share/classes/java/lang/instrument/package-info.java b/src/java.instrument/share/classes/java/lang/instrument/package-info.java similarity index 100% rename from jdk/src/java.instrument/share/classes/java/lang/instrument/package-info.java rename to src/java.instrument/share/classes/java/lang/instrument/package-info.java diff --git a/jdk/src/java.instrument/share/classes/module-info.java b/src/java.instrument/share/classes/module-info.java similarity index 100% rename from jdk/src/java.instrument/share/classes/module-info.java rename to src/java.instrument/share/classes/module-info.java diff --git a/jdk/src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java b/src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java similarity index 100% rename from jdk/src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java rename to src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java diff --git a/jdk/src/java.instrument/share/classes/sun/instrument/TransformerManager.java b/src/java.instrument/share/classes/sun/instrument/TransformerManager.java similarity index 100% rename from jdk/src/java.instrument/share/classes/sun/instrument/TransformerManager.java rename to src/java.instrument/share/classes/sun/instrument/TransformerManager.java diff --git a/jdk/src/java.instrument/share/native/libinstrument/EncodingSupport.c b/src/java.instrument/share/native/libinstrument/EncodingSupport.c similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/EncodingSupport.c rename to src/java.instrument/share/native/libinstrument/EncodingSupport.c diff --git a/jdk/src/java.instrument/share/native/libinstrument/EncodingSupport.h b/src/java.instrument/share/native/libinstrument/EncodingSupport.h similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/EncodingSupport.h rename to src/java.instrument/share/native/libinstrument/EncodingSupport.h diff --git a/jdk/src/java.instrument/share/native/libinstrument/FileSystemSupport.h b/src/java.instrument/share/native/libinstrument/FileSystemSupport.h similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/FileSystemSupport.h rename to src/java.instrument/share/native/libinstrument/FileSystemSupport.h diff --git a/jdk/src/java.instrument/share/native/libinstrument/InstrumentationImplNativeMethods.c b/src/java.instrument/share/native/libinstrument/InstrumentationImplNativeMethods.c similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/InstrumentationImplNativeMethods.c rename to src/java.instrument/share/native/libinstrument/InstrumentationImplNativeMethods.c diff --git a/jdk/src/java.instrument/share/native/libinstrument/InvocationAdapter.c b/src/java.instrument/share/native/libinstrument/InvocationAdapter.c similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/InvocationAdapter.c rename to src/java.instrument/share/native/libinstrument/InvocationAdapter.c diff --git a/jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.c b/src/java.instrument/share/native/libinstrument/JPLISAgent.c similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.c rename to src/java.instrument/share/native/libinstrument/JPLISAgent.c diff --git a/jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.h b/src/java.instrument/share/native/libinstrument/JPLISAgent.h similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.h rename to src/java.instrument/share/native/libinstrument/JPLISAgent.h diff --git a/jdk/src/java.instrument/share/native/libinstrument/JPLISAssert.c b/src/java.instrument/share/native/libinstrument/JPLISAssert.c similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/JPLISAssert.c rename to src/java.instrument/share/native/libinstrument/JPLISAssert.c diff --git a/jdk/src/java.instrument/share/native/libinstrument/JPLISAssert.h b/src/java.instrument/share/native/libinstrument/JPLISAssert.h similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/JPLISAssert.h rename to src/java.instrument/share/native/libinstrument/JPLISAssert.h diff --git a/jdk/src/java.instrument/share/native/libinstrument/JarFacade.c b/src/java.instrument/share/native/libinstrument/JarFacade.c similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/JarFacade.c rename to src/java.instrument/share/native/libinstrument/JarFacade.c diff --git a/jdk/src/java.instrument/share/native/libinstrument/JarFacade.h b/src/java.instrument/share/native/libinstrument/JarFacade.h similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/JarFacade.h rename to src/java.instrument/share/native/libinstrument/JarFacade.h diff --git a/jdk/src/java.instrument/share/native/libinstrument/JavaExceptions.c b/src/java.instrument/share/native/libinstrument/JavaExceptions.c similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/JavaExceptions.c rename to src/java.instrument/share/native/libinstrument/JavaExceptions.c diff --git a/jdk/src/java.instrument/share/native/libinstrument/JavaExceptions.h b/src/java.instrument/share/native/libinstrument/JavaExceptions.h similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/JavaExceptions.h rename to src/java.instrument/share/native/libinstrument/JavaExceptions.h diff --git a/jdk/src/java.instrument/share/native/libinstrument/PathCharsValidator.c b/src/java.instrument/share/native/libinstrument/PathCharsValidator.c similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/PathCharsValidator.c rename to src/java.instrument/share/native/libinstrument/PathCharsValidator.c diff --git a/jdk/src/java.instrument/share/native/libinstrument/PathCharsValidator.h b/src/java.instrument/share/native/libinstrument/PathCharsValidator.h similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/PathCharsValidator.h rename to src/java.instrument/share/native/libinstrument/PathCharsValidator.h diff --git a/jdk/src/java.instrument/share/native/libinstrument/Reentrancy.c b/src/java.instrument/share/native/libinstrument/Reentrancy.c similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/Reentrancy.c rename to src/java.instrument/share/native/libinstrument/Reentrancy.c diff --git a/jdk/src/java.instrument/share/native/libinstrument/Reentrancy.h b/src/java.instrument/share/native/libinstrument/Reentrancy.h similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/Reentrancy.h rename to src/java.instrument/share/native/libinstrument/Reentrancy.h diff --git a/jdk/src/java.instrument/share/native/libinstrument/Utilities.c b/src/java.instrument/share/native/libinstrument/Utilities.c similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/Utilities.c rename to src/java.instrument/share/native/libinstrument/Utilities.c diff --git a/jdk/src/java.instrument/share/native/libinstrument/Utilities.h b/src/java.instrument/share/native/libinstrument/Utilities.h similarity index 100% rename from jdk/src/java.instrument/share/native/libinstrument/Utilities.h rename to src/java.instrument/share/native/libinstrument/Utilities.h diff --git a/jdk/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c b/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c similarity index 100% rename from jdk/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c rename to src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c diff --git a/jdk/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c b/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c similarity index 100% rename from jdk/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c rename to src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c diff --git a/jdk/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.h b/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.h similarity index 100% rename from jdk/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.h rename to src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.h diff --git a/jdk/src/java.instrument/windows/native/libinstrument/EncodingSupport_md.c b/src/java.instrument/windows/native/libinstrument/EncodingSupport_md.c similarity index 100% rename from jdk/src/java.instrument/windows/native/libinstrument/EncodingSupport_md.c rename to src/java.instrument/windows/native/libinstrument/EncodingSupport_md.c diff --git a/jdk/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.c b/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.c similarity index 100% rename from jdk/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.c rename to src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.c diff --git a/jdk/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.h b/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.h similarity index 100% rename from jdk/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.h rename to src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.h diff --git a/jdk/src/java.logging/share/classes/java/util/logging/ConsoleHandler.java b/src/java.logging/share/classes/java/util/logging/ConsoleHandler.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/ConsoleHandler.java rename to src/java.logging/share/classes/java/util/logging/ConsoleHandler.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/ErrorManager.java b/src/java.logging/share/classes/java/util/logging/ErrorManager.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/ErrorManager.java rename to src/java.logging/share/classes/java/util/logging/ErrorManager.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java b/src/java.logging/share/classes/java/util/logging/FileHandler.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java rename to src/java.logging/share/classes/java/util/logging/FileHandler.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/Filter.java b/src/java.logging/share/classes/java/util/logging/Filter.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/Filter.java rename to src/java.logging/share/classes/java/util/logging/Filter.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/Formatter.java b/src/java.logging/share/classes/java/util/logging/Formatter.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/Formatter.java rename to src/java.logging/share/classes/java/util/logging/Formatter.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/Handler.java b/src/java.logging/share/classes/java/util/logging/Handler.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/Handler.java rename to src/java.logging/share/classes/java/util/logging/Handler.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/Level.java b/src/java.logging/share/classes/java/util/logging/Level.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/Level.java rename to src/java.logging/share/classes/java/util/logging/Level.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java b/src/java.logging/share/classes/java/util/logging/LogManager.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/LogManager.java rename to src/java.logging/share/classes/java/util/logging/LogManager.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/LogRecord.java b/src/java.logging/share/classes/java/util/logging/LogRecord.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/LogRecord.java rename to src/java.logging/share/classes/java/util/logging/LogRecord.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/Logger.java b/src/java.logging/share/classes/java/util/logging/Logger.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/Logger.java rename to src/java.logging/share/classes/java/util/logging/Logger.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/Logging.java b/src/java.logging/share/classes/java/util/logging/Logging.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/Logging.java rename to src/java.logging/share/classes/java/util/logging/Logging.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java b/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java rename to src/java.logging/share/classes/java/util/logging/LoggingMXBean.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/LoggingPermission.java b/src/java.logging/share/classes/java/util/logging/LoggingPermission.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/LoggingPermission.java rename to src/java.logging/share/classes/java/util/logging/LoggingPermission.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/MemoryHandler.java b/src/java.logging/share/classes/java/util/logging/MemoryHandler.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/MemoryHandler.java rename to src/java.logging/share/classes/java/util/logging/MemoryHandler.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/SimpleFormatter.java b/src/java.logging/share/classes/java/util/logging/SimpleFormatter.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/SimpleFormatter.java rename to src/java.logging/share/classes/java/util/logging/SimpleFormatter.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/SocketHandler.java b/src/java.logging/share/classes/java/util/logging/SocketHandler.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/SocketHandler.java rename to src/java.logging/share/classes/java/util/logging/SocketHandler.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/StreamHandler.java b/src/java.logging/share/classes/java/util/logging/StreamHandler.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/StreamHandler.java rename to src/java.logging/share/classes/java/util/logging/StreamHandler.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/XMLFormatter.java b/src/java.logging/share/classes/java/util/logging/XMLFormatter.java similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/XMLFormatter.java rename to src/java.logging/share/classes/java/util/logging/XMLFormatter.java diff --git a/jdk/src/java.logging/share/classes/java/util/logging/package.html b/src/java.logging/share/classes/java/util/logging/package.html similarity index 100% rename from jdk/src/java.logging/share/classes/java/util/logging/package.html rename to src/java.logging/share/classes/java/util/logging/package.html diff --git a/jdk/src/java.logging/share/classes/module-info.java b/src/java.logging/share/classes/module-info.java similarity index 100% rename from jdk/src/java.logging/share/classes/module-info.java rename to src/java.logging/share/classes/module-info.java diff --git a/jdk/src/java.logging/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java b/src/java.logging/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java similarity index 100% rename from jdk/src/java.logging/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java rename to src/java.logging/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/internal/LoggingProviderImpl.java b/src/java.logging/share/classes/sun/util/logging/internal/LoggingProviderImpl.java similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/internal/LoggingProviderImpl.java rename to src/java.logging/share/classes/sun/util/logging/internal/LoggingProviderImpl.java diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/internal/package-info.java b/src/java.logging/share/classes/sun/util/logging/internal/package-info.java similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/internal/package-info.java rename to src/java.logging/share/classes/sun/util/logging/internal/package-info.java diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging.properties similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/resources/logging.properties rename to src/java.logging/share/classes/sun/util/logging/resources/logging.properties diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_de.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_de.properties similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_de.properties rename to src/java.logging/share/classes/sun/util/logging/resources/logging_de.properties diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_es.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_es.properties similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_es.properties rename to src/java.logging/share/classes/sun/util/logging/resources/logging_es.properties diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_fr.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_fr.properties similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_fr.properties rename to src/java.logging/share/classes/sun/util/logging/resources/logging_fr.properties diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_it.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_it.properties similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_it.properties rename to src/java.logging/share/classes/sun/util/logging/resources/logging_it.properties diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_ja.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_ja.properties similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_ja.properties rename to src/java.logging/share/classes/sun/util/logging/resources/logging_ja.properties diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_ko.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_ko.properties similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_ko.properties rename to src/java.logging/share/classes/sun/util/logging/resources/logging_ko.properties diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_pt_BR.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_pt_BR.properties similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_pt_BR.properties rename to src/java.logging/share/classes/sun/util/logging/resources/logging_pt_BR.properties diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_sv.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_sv.properties similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_sv.properties rename to src/java.logging/share/classes/sun/util/logging/resources/logging_sv.properties diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_CN.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_CN.properties similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_CN.properties rename to src/java.logging/share/classes/sun/util/logging/resources/logging_zh_CN.properties diff --git a/jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_TW.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_TW.properties similarity index 100% rename from jdk/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_TW.properties rename to src/java.logging/share/classes/sun/util/logging/resources/logging_zh_TW.properties diff --git a/jdk/src/java.logging/share/conf/logging.properties b/src/java.logging/share/conf/logging.properties similarity index 100% rename from jdk/src/java.logging/share/conf/logging.properties rename to src/java.logging/share/conf/logging.properties diff --git a/jdk/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java b/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java rename to src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java diff --git a/jdk/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/RMIExporter.java b/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/RMIExporter.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/RMIExporter.java rename to src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/RMIExporter.java diff --git a/jdk/src/java.management.rmi/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java b/src/java.management.rmi/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java rename to src/java.management.rmi/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java diff --git a/jdk/src/java.management.rmi/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java b/src/java.management.rmi/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java rename to src/java.management.rmi/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java diff --git a/jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java rename to src/java.management.rmi/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java diff --git a/jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnection.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnection.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnection.java rename to src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnection.java diff --git a/jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java rename to src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java diff --git a/jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java rename to src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java diff --git a/jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java rename to src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java diff --git a/jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java rename to src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java diff --git a/jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java rename to src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java diff --git a/jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIServer.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIServer.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIServer.java rename to src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIServer.java diff --git a/jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIServerImpl.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIServerImpl.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIServerImpl.java rename to src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIServerImpl.java diff --git a/jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/package.html b/src/java.management.rmi/share/classes/javax/management/remote/rmi/package.html similarity index 100% rename from jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi/package.html rename to src/java.management.rmi/share/classes/javax/management/remote/rmi/package.html diff --git a/jdk/src/java.management.rmi/share/classes/module-info.java b/src/java.management.rmi/share/classes/module-info.java similarity index 100% rename from jdk/src/java.management.rmi/share/classes/module-info.java rename to src/java.management.rmi/share/classes/module-info.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/defaults/JmxProperties.java b/src/java.management/share/classes/com/sun/jmx/defaults/JmxProperties.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/defaults/JmxProperties.java rename to src/java.management/share/classes/com/sun/jmx/defaults/JmxProperties.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/defaults/ServiceName.java b/src/java.management/share/classes/com/sun/jmx/defaults/ServiceName.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/defaults/ServiceName.java rename to src/java.management/share/classes/com/sun/jmx/defaults/ServiceName.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/defaults/package.html b/src/java.management/share/classes/com/sun/jmx/defaults/package.html similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/defaults/package.html rename to src/java.management/share/classes/com/sun/jmx/defaults/package.html diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java b/src/java.management/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java rename to src/java.management/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java b/src/java.management/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java rename to src/java.management/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/interceptor/package.html b/src/java.management/share/classes/com/sun/jmx/interceptor/package.html similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/interceptor/package.html rename to src/java.management/share/classes/com/sun/jmx/interceptor/package.html diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JavaBeansAccessor.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/JavaBeansAccessor.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JavaBeansAccessor.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/JavaBeansAccessor.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanMapping.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanMapping.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanMapping.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanMapping.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ModifiableClassLoaderRepository.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/ModifiableClassLoaderRepository.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ModifiableClassLoaderRepository.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/ModifiableClassLoaderRepository.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/NamedObject.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/NamedObject.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/NamedObject.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/NamedObject.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/PerInterface.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/PerInterface.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/PerInterface.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/PerInterface.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Repository.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/Repository.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Repository.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/Repository.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/SecureClassLoaderRepository.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/SecureClassLoaderRepository.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/SecureClassLoaderRepository.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/SecureClassLoaderRepository.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Util.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/Util.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Util.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/Util.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/WeakIdentityHashMap.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/WeakIdentityHashMap.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/WeakIdentityHashMap.java rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/WeakIdentityHashMap.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/package.html b/src/java.management/share/classes/com/sun/jmx/mbeanserver/package.html similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/package.html rename to src/java.management/share/classes/com/sun/jmx/mbeanserver/package.html diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java rename to src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayQueue.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayQueue.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayQueue.java rename to src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayQueue.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java rename to src/java.management/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java rename to src/java.management/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java rename to src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/NotificationBuffer.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/NotificationBuffer.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/NotificationBuffer.java rename to src/java.management/share/classes/com/sun/jmx/remote/internal/NotificationBuffer.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java rename to src/java.management/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java rename to src/java.management/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java rename to src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/package.html b/src/java.management/share/classes/com/sun/jmx/remote/internal/package.html similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/package.html rename to src/java.management/share/classes/com/sun/jmx/remote/internal/package.html diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java b/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java rename to src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java b/src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java rename to src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java b/src/java.management/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java rename to src/java.management/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java b/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java rename to src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java b/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java rename to src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/NotificationAccessController.java b/src/java.management/share/classes/com/sun/jmx/remote/security/NotificationAccessController.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/security/NotificationAccessController.java rename to src/java.management/share/classes/com/sun/jmx/remote/security/NotificationAccessController.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java b/src/java.management/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java rename to src/java.management/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java b/src/java.management/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java rename to src/java.management/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/ClassLogger.java b/src/java.management/share/classes/com/sun/jmx/remote/util/ClassLogger.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/util/ClassLogger.java rename to src/java.management/share/classes/com/sun/jmx/remote/util/ClassLogger.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java b/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java rename to src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java b/src/java.management/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java similarity index 100% rename from jdk/src/java.management/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java rename to src/java.management/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/BufferPoolMXBean.java b/src/java.management/share/classes/java/lang/management/BufferPoolMXBean.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/BufferPoolMXBean.java rename to src/java.management/share/classes/java/lang/management/BufferPoolMXBean.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java b/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java rename to src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/CompilationMXBean.java b/src/java.management/share/classes/java/lang/management/CompilationMXBean.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/CompilationMXBean.java rename to src/java.management/share/classes/java/lang/management/CompilationMXBean.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/DefaultPlatformMBeanProvider.java b/src/java.management/share/classes/java/lang/management/DefaultPlatformMBeanProvider.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/DefaultPlatformMBeanProvider.java rename to src/java.management/share/classes/java/lang/management/DefaultPlatformMBeanProvider.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/GarbageCollectorMXBean.java b/src/java.management/share/classes/java/lang/management/GarbageCollectorMXBean.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/GarbageCollectorMXBean.java rename to src/java.management/share/classes/java/lang/management/GarbageCollectorMXBean.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/LockInfo.java b/src/java.management/share/classes/java/lang/management/LockInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/LockInfo.java rename to src/java.management/share/classes/java/lang/management/LockInfo.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java b/src/java.management/share/classes/java/lang/management/ManagementFactory.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java rename to src/java.management/share/classes/java/lang/management/ManagementFactory.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/ManagementPermission.java b/src/java.management/share/classes/java/lang/management/ManagementPermission.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/ManagementPermission.java rename to src/java.management/share/classes/java/lang/management/ManagementPermission.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/MemoryMXBean.java b/src/java.management/share/classes/java/lang/management/MemoryMXBean.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/MemoryMXBean.java rename to src/java.management/share/classes/java/lang/management/MemoryMXBean.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/MemoryManagerMXBean.java b/src/java.management/share/classes/java/lang/management/MemoryManagerMXBean.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/MemoryManagerMXBean.java rename to src/java.management/share/classes/java/lang/management/MemoryManagerMXBean.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/MemoryNotificationInfo.java b/src/java.management/share/classes/java/lang/management/MemoryNotificationInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/MemoryNotificationInfo.java rename to src/java.management/share/classes/java/lang/management/MemoryNotificationInfo.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java b/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java rename to src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/MemoryType.java b/src/java.management/share/classes/java/lang/management/MemoryType.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/MemoryType.java rename to src/java.management/share/classes/java/lang/management/MemoryType.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/MemoryUsage.java b/src/java.management/share/classes/java/lang/management/MemoryUsage.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/MemoryUsage.java rename to src/java.management/share/classes/java/lang/management/MemoryUsage.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/MonitorInfo.java b/src/java.management/share/classes/java/lang/management/MonitorInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/MonitorInfo.java rename to src/java.management/share/classes/java/lang/management/MonitorInfo.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java b/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java rename to src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java b/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java rename to src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/PlatformManagedObject.java b/src/java.management/share/classes/java/lang/management/PlatformManagedObject.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/PlatformManagedObject.java rename to src/java.management/share/classes/java/lang/management/PlatformManagedObject.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java b/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java rename to src/java.management/share/classes/java/lang/management/RuntimeMXBean.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/ThreadInfo.java b/src/java.management/share/classes/java/lang/management/ThreadInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/ThreadInfo.java rename to src/java.management/share/classes/java/lang/management/ThreadInfo.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/ThreadMXBean.java b/src/java.management/share/classes/java/lang/management/ThreadMXBean.java similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/ThreadMXBean.java rename to src/java.management/share/classes/java/lang/management/ThreadMXBean.java diff --git a/jdk/src/java.management/share/classes/java/lang/management/package.html b/src/java.management/share/classes/java/lang/management/package.html similarity index 100% rename from jdk/src/java.management/share/classes/java/lang/management/package.html rename to src/java.management/share/classes/java/lang/management/package.html diff --git a/jdk/src/java.management/share/classes/javax/management/AndQueryExp.java b/src/java.management/share/classes/javax/management/AndQueryExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/AndQueryExp.java rename to src/java.management/share/classes/javax/management/AndQueryExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/Attribute.java b/src/java.management/share/classes/javax/management/Attribute.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/Attribute.java rename to src/java.management/share/classes/javax/management/Attribute.java diff --git a/jdk/src/java.management/share/classes/javax/management/AttributeChangeNotification.java b/src/java.management/share/classes/javax/management/AttributeChangeNotification.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/AttributeChangeNotification.java rename to src/java.management/share/classes/javax/management/AttributeChangeNotification.java diff --git a/jdk/src/java.management/share/classes/javax/management/AttributeChangeNotificationFilter.java b/src/java.management/share/classes/javax/management/AttributeChangeNotificationFilter.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/AttributeChangeNotificationFilter.java rename to src/java.management/share/classes/javax/management/AttributeChangeNotificationFilter.java diff --git a/jdk/src/java.management/share/classes/javax/management/AttributeList.java b/src/java.management/share/classes/javax/management/AttributeList.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/AttributeList.java rename to src/java.management/share/classes/javax/management/AttributeList.java diff --git a/jdk/src/java.management/share/classes/javax/management/AttributeNotFoundException.java b/src/java.management/share/classes/javax/management/AttributeNotFoundException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/AttributeNotFoundException.java rename to src/java.management/share/classes/javax/management/AttributeNotFoundException.java diff --git a/jdk/src/java.management/share/classes/javax/management/AttributeValueExp.java b/src/java.management/share/classes/javax/management/AttributeValueExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/AttributeValueExp.java rename to src/java.management/share/classes/javax/management/AttributeValueExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java b/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java rename to src/java.management/share/classes/javax/management/BadAttributeValueExpException.java diff --git a/jdk/src/java.management/share/classes/javax/management/BadBinaryOpValueExpException.java b/src/java.management/share/classes/javax/management/BadBinaryOpValueExpException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/BadBinaryOpValueExpException.java rename to src/java.management/share/classes/javax/management/BadBinaryOpValueExpException.java diff --git a/jdk/src/java.management/share/classes/javax/management/BadStringOperationException.java b/src/java.management/share/classes/javax/management/BadStringOperationException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/BadStringOperationException.java rename to src/java.management/share/classes/javax/management/BadStringOperationException.java diff --git a/jdk/src/java.management/share/classes/javax/management/BetweenQueryExp.java b/src/java.management/share/classes/javax/management/BetweenQueryExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/BetweenQueryExp.java rename to src/java.management/share/classes/javax/management/BetweenQueryExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/BinaryOpValueExp.java b/src/java.management/share/classes/javax/management/BinaryOpValueExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/BinaryOpValueExp.java rename to src/java.management/share/classes/javax/management/BinaryOpValueExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/BinaryRelQueryExp.java b/src/java.management/share/classes/javax/management/BinaryRelQueryExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/BinaryRelQueryExp.java rename to src/java.management/share/classes/javax/management/BinaryRelQueryExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/BooleanValueExp.java b/src/java.management/share/classes/javax/management/BooleanValueExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/BooleanValueExp.java rename to src/java.management/share/classes/javax/management/BooleanValueExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/ClassAttributeValueExp.java b/src/java.management/share/classes/javax/management/ClassAttributeValueExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/ClassAttributeValueExp.java rename to src/java.management/share/classes/javax/management/ClassAttributeValueExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/ConstructorParameters.java b/src/java.management/share/classes/javax/management/ConstructorParameters.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/ConstructorParameters.java rename to src/java.management/share/classes/javax/management/ConstructorParameters.java diff --git a/jdk/src/java.management/share/classes/javax/management/DefaultLoaderRepository.java b/src/java.management/share/classes/javax/management/DefaultLoaderRepository.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/DefaultLoaderRepository.java rename to src/java.management/share/classes/javax/management/DefaultLoaderRepository.java diff --git a/jdk/src/java.management/share/classes/javax/management/Descriptor.java b/src/java.management/share/classes/javax/management/Descriptor.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/Descriptor.java rename to src/java.management/share/classes/javax/management/Descriptor.java diff --git a/jdk/src/java.management/share/classes/javax/management/DescriptorAccess.java b/src/java.management/share/classes/javax/management/DescriptorAccess.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/DescriptorAccess.java rename to src/java.management/share/classes/javax/management/DescriptorAccess.java diff --git a/jdk/src/java.management/share/classes/javax/management/DescriptorKey.java b/src/java.management/share/classes/javax/management/DescriptorKey.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/DescriptorKey.java rename to src/java.management/share/classes/javax/management/DescriptorKey.java diff --git a/jdk/src/java.management/share/classes/javax/management/DescriptorRead.java b/src/java.management/share/classes/javax/management/DescriptorRead.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/DescriptorRead.java rename to src/java.management/share/classes/javax/management/DescriptorRead.java diff --git a/jdk/src/java.management/share/classes/javax/management/DynamicMBean.java b/src/java.management/share/classes/javax/management/DynamicMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/DynamicMBean.java rename to src/java.management/share/classes/javax/management/DynamicMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/ImmutableDescriptor.java b/src/java.management/share/classes/javax/management/ImmutableDescriptor.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/ImmutableDescriptor.java rename to src/java.management/share/classes/javax/management/ImmutableDescriptor.java diff --git a/jdk/src/java.management/share/classes/javax/management/InQueryExp.java b/src/java.management/share/classes/javax/management/InQueryExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/InQueryExp.java rename to src/java.management/share/classes/javax/management/InQueryExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/InstanceAlreadyExistsException.java b/src/java.management/share/classes/javax/management/InstanceAlreadyExistsException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/InstanceAlreadyExistsException.java rename to src/java.management/share/classes/javax/management/InstanceAlreadyExistsException.java diff --git a/jdk/src/java.management/share/classes/javax/management/InstanceNotFoundException.java b/src/java.management/share/classes/javax/management/InstanceNotFoundException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/InstanceNotFoundException.java rename to src/java.management/share/classes/javax/management/InstanceNotFoundException.java diff --git a/jdk/src/java.management/share/classes/javax/management/InstanceOfQueryExp.java b/src/java.management/share/classes/javax/management/InstanceOfQueryExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/InstanceOfQueryExp.java rename to src/java.management/share/classes/javax/management/InstanceOfQueryExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/IntrospectionException.java b/src/java.management/share/classes/javax/management/IntrospectionException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/IntrospectionException.java rename to src/java.management/share/classes/javax/management/IntrospectionException.java diff --git a/jdk/src/java.management/share/classes/javax/management/InvalidApplicationException.java b/src/java.management/share/classes/javax/management/InvalidApplicationException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/InvalidApplicationException.java rename to src/java.management/share/classes/javax/management/InvalidApplicationException.java diff --git a/jdk/src/java.management/share/classes/javax/management/InvalidAttributeValueException.java b/src/java.management/share/classes/javax/management/InvalidAttributeValueException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/InvalidAttributeValueException.java rename to src/java.management/share/classes/javax/management/InvalidAttributeValueException.java diff --git a/jdk/src/java.management/share/classes/javax/management/JMException.java b/src/java.management/share/classes/javax/management/JMException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/JMException.java rename to src/java.management/share/classes/javax/management/JMException.java diff --git a/jdk/src/java.management/share/classes/javax/management/JMRuntimeException.java b/src/java.management/share/classes/javax/management/JMRuntimeException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/JMRuntimeException.java rename to src/java.management/share/classes/javax/management/JMRuntimeException.java diff --git a/jdk/src/java.management/share/classes/javax/management/JMX.java b/src/java.management/share/classes/javax/management/JMX.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/JMX.java rename to src/java.management/share/classes/javax/management/JMX.java diff --git a/jdk/src/java.management/share/classes/javax/management/ListenerNotFoundException.java b/src/java.management/share/classes/javax/management/ListenerNotFoundException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/ListenerNotFoundException.java rename to src/java.management/share/classes/javax/management/ListenerNotFoundException.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanAttributeInfo.java b/src/java.management/share/classes/javax/management/MBeanAttributeInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanAttributeInfo.java rename to src/java.management/share/classes/javax/management/MBeanAttributeInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanConstructorInfo.java b/src/java.management/share/classes/javax/management/MBeanConstructorInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanConstructorInfo.java rename to src/java.management/share/classes/javax/management/MBeanConstructorInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanException.java b/src/java.management/share/classes/javax/management/MBeanException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanException.java rename to src/java.management/share/classes/javax/management/MBeanException.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanFeatureInfo.java b/src/java.management/share/classes/javax/management/MBeanFeatureInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanFeatureInfo.java rename to src/java.management/share/classes/javax/management/MBeanFeatureInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanInfo.java b/src/java.management/share/classes/javax/management/MBeanInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanInfo.java rename to src/java.management/share/classes/javax/management/MBeanInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanNotificationInfo.java b/src/java.management/share/classes/javax/management/MBeanNotificationInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanNotificationInfo.java rename to src/java.management/share/classes/javax/management/MBeanNotificationInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanOperationInfo.java b/src/java.management/share/classes/javax/management/MBeanOperationInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanOperationInfo.java rename to src/java.management/share/classes/javax/management/MBeanOperationInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanParameterInfo.java b/src/java.management/share/classes/javax/management/MBeanParameterInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanParameterInfo.java rename to src/java.management/share/classes/javax/management/MBeanParameterInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanPermission.java b/src/java.management/share/classes/javax/management/MBeanPermission.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanPermission.java rename to src/java.management/share/classes/javax/management/MBeanPermission.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanRegistration.java b/src/java.management/share/classes/javax/management/MBeanRegistration.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanRegistration.java rename to src/java.management/share/classes/javax/management/MBeanRegistration.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanRegistrationException.java b/src/java.management/share/classes/javax/management/MBeanRegistrationException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanRegistrationException.java rename to src/java.management/share/classes/javax/management/MBeanRegistrationException.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanServer.java b/src/java.management/share/classes/javax/management/MBeanServer.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanServer.java rename to src/java.management/share/classes/javax/management/MBeanServer.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanServerBuilder.java b/src/java.management/share/classes/javax/management/MBeanServerBuilder.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanServerBuilder.java rename to src/java.management/share/classes/javax/management/MBeanServerBuilder.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanServerConnection.java b/src/java.management/share/classes/javax/management/MBeanServerConnection.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanServerConnection.java rename to src/java.management/share/classes/javax/management/MBeanServerConnection.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanServerDelegate.java b/src/java.management/share/classes/javax/management/MBeanServerDelegate.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanServerDelegate.java rename to src/java.management/share/classes/javax/management/MBeanServerDelegate.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanServerDelegateMBean.java b/src/java.management/share/classes/javax/management/MBeanServerDelegateMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanServerDelegateMBean.java rename to src/java.management/share/classes/javax/management/MBeanServerDelegateMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanServerFactory.java b/src/java.management/share/classes/javax/management/MBeanServerFactory.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanServerFactory.java rename to src/java.management/share/classes/javax/management/MBeanServerFactory.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanServerInvocationHandler.java b/src/java.management/share/classes/javax/management/MBeanServerInvocationHandler.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanServerInvocationHandler.java rename to src/java.management/share/classes/javax/management/MBeanServerInvocationHandler.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanServerNotification.java b/src/java.management/share/classes/javax/management/MBeanServerNotification.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanServerNotification.java rename to src/java.management/share/classes/javax/management/MBeanServerNotification.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanServerPermission.java b/src/java.management/share/classes/javax/management/MBeanServerPermission.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanServerPermission.java rename to src/java.management/share/classes/javax/management/MBeanServerPermission.java diff --git a/jdk/src/java.management/share/classes/javax/management/MBeanTrustPermission.java b/src/java.management/share/classes/javax/management/MBeanTrustPermission.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MBeanTrustPermission.java rename to src/java.management/share/classes/javax/management/MBeanTrustPermission.java diff --git a/jdk/src/java.management/share/classes/javax/management/MXBean.java b/src/java.management/share/classes/javax/management/MXBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MXBean.java rename to src/java.management/share/classes/javax/management/MXBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/MalformedObjectNameException.java b/src/java.management/share/classes/javax/management/MalformedObjectNameException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MalformedObjectNameException.java rename to src/java.management/share/classes/javax/management/MalformedObjectNameException.java diff --git a/jdk/src/java.management/share/classes/javax/management/MatchQueryExp.java b/src/java.management/share/classes/javax/management/MatchQueryExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/MatchQueryExp.java rename to src/java.management/share/classes/javax/management/MatchQueryExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/NotCompliantMBeanException.java b/src/java.management/share/classes/javax/management/NotCompliantMBeanException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/NotCompliantMBeanException.java rename to src/java.management/share/classes/javax/management/NotCompliantMBeanException.java diff --git a/jdk/src/java.management/share/classes/javax/management/NotQueryExp.java b/src/java.management/share/classes/javax/management/NotQueryExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/NotQueryExp.java rename to src/java.management/share/classes/javax/management/NotQueryExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/Notification.java b/src/java.management/share/classes/javax/management/Notification.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/Notification.java rename to src/java.management/share/classes/javax/management/Notification.java diff --git a/jdk/src/java.management/share/classes/javax/management/NotificationBroadcaster.java b/src/java.management/share/classes/javax/management/NotificationBroadcaster.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/NotificationBroadcaster.java rename to src/java.management/share/classes/javax/management/NotificationBroadcaster.java diff --git a/jdk/src/java.management/share/classes/javax/management/NotificationBroadcasterSupport.java b/src/java.management/share/classes/javax/management/NotificationBroadcasterSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/NotificationBroadcasterSupport.java rename to src/java.management/share/classes/javax/management/NotificationBroadcasterSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/NotificationEmitter.java b/src/java.management/share/classes/javax/management/NotificationEmitter.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/NotificationEmitter.java rename to src/java.management/share/classes/javax/management/NotificationEmitter.java diff --git a/jdk/src/java.management/share/classes/javax/management/NotificationFilter.java b/src/java.management/share/classes/javax/management/NotificationFilter.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/NotificationFilter.java rename to src/java.management/share/classes/javax/management/NotificationFilter.java diff --git a/jdk/src/java.management/share/classes/javax/management/NotificationFilterSupport.java b/src/java.management/share/classes/javax/management/NotificationFilterSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/NotificationFilterSupport.java rename to src/java.management/share/classes/javax/management/NotificationFilterSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/NotificationListener.java b/src/java.management/share/classes/javax/management/NotificationListener.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/NotificationListener.java rename to src/java.management/share/classes/javax/management/NotificationListener.java diff --git a/jdk/src/java.management/share/classes/javax/management/NumericValueExp.java b/src/java.management/share/classes/javax/management/NumericValueExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/NumericValueExp.java rename to src/java.management/share/classes/javax/management/NumericValueExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/ObjectInstance.java b/src/java.management/share/classes/javax/management/ObjectInstance.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/ObjectInstance.java rename to src/java.management/share/classes/javax/management/ObjectInstance.java diff --git a/jdk/src/java.management/share/classes/javax/management/ObjectName.java b/src/java.management/share/classes/javax/management/ObjectName.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/ObjectName.java rename to src/java.management/share/classes/javax/management/ObjectName.java diff --git a/jdk/src/java.management/share/classes/javax/management/OperationsException.java b/src/java.management/share/classes/javax/management/OperationsException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/OperationsException.java rename to src/java.management/share/classes/javax/management/OperationsException.java diff --git a/jdk/src/java.management/share/classes/javax/management/OrQueryExp.java b/src/java.management/share/classes/javax/management/OrQueryExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/OrQueryExp.java rename to src/java.management/share/classes/javax/management/OrQueryExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/PersistentMBean.java b/src/java.management/share/classes/javax/management/PersistentMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/PersistentMBean.java rename to src/java.management/share/classes/javax/management/PersistentMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/QualifiedAttributeValueExp.java b/src/java.management/share/classes/javax/management/QualifiedAttributeValueExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/QualifiedAttributeValueExp.java rename to src/java.management/share/classes/javax/management/QualifiedAttributeValueExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/Query.java b/src/java.management/share/classes/javax/management/Query.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/Query.java rename to src/java.management/share/classes/javax/management/Query.java diff --git a/jdk/src/java.management/share/classes/javax/management/QueryEval.java b/src/java.management/share/classes/javax/management/QueryEval.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/QueryEval.java rename to src/java.management/share/classes/javax/management/QueryEval.java diff --git a/jdk/src/java.management/share/classes/javax/management/QueryExp.java b/src/java.management/share/classes/javax/management/QueryExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/QueryExp.java rename to src/java.management/share/classes/javax/management/QueryExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/ReflectionException.java b/src/java.management/share/classes/javax/management/ReflectionException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/ReflectionException.java rename to src/java.management/share/classes/javax/management/ReflectionException.java diff --git a/jdk/src/java.management/share/classes/javax/management/RuntimeErrorException.java b/src/java.management/share/classes/javax/management/RuntimeErrorException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/RuntimeErrorException.java rename to src/java.management/share/classes/javax/management/RuntimeErrorException.java diff --git a/jdk/src/java.management/share/classes/javax/management/RuntimeMBeanException.java b/src/java.management/share/classes/javax/management/RuntimeMBeanException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/RuntimeMBeanException.java rename to src/java.management/share/classes/javax/management/RuntimeMBeanException.java diff --git a/jdk/src/java.management/share/classes/javax/management/RuntimeOperationsException.java b/src/java.management/share/classes/javax/management/RuntimeOperationsException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/RuntimeOperationsException.java rename to src/java.management/share/classes/javax/management/RuntimeOperationsException.java diff --git a/jdk/src/java.management/share/classes/javax/management/ServiceNotFoundException.java b/src/java.management/share/classes/javax/management/ServiceNotFoundException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/ServiceNotFoundException.java rename to src/java.management/share/classes/javax/management/ServiceNotFoundException.java diff --git a/jdk/src/java.management/share/classes/javax/management/StandardEmitterMBean.java b/src/java.management/share/classes/javax/management/StandardEmitterMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/StandardEmitterMBean.java rename to src/java.management/share/classes/javax/management/StandardEmitterMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/StandardMBean.java b/src/java.management/share/classes/javax/management/StandardMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/StandardMBean.java rename to src/java.management/share/classes/javax/management/StandardMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/StringValueExp.java b/src/java.management/share/classes/javax/management/StringValueExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/StringValueExp.java rename to src/java.management/share/classes/javax/management/StringValueExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/ValueExp.java b/src/java.management/share/classes/javax/management/ValueExp.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/ValueExp.java rename to src/java.management/share/classes/javax/management/ValueExp.java diff --git a/jdk/src/java.management/share/classes/javax/management/loading/ClassLoaderRepository.java b/src/java.management/share/classes/javax/management/loading/ClassLoaderRepository.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/loading/ClassLoaderRepository.java rename to src/java.management/share/classes/javax/management/loading/ClassLoaderRepository.java diff --git a/jdk/src/java.management/share/classes/javax/management/loading/DefaultLoaderRepository.java b/src/java.management/share/classes/javax/management/loading/DefaultLoaderRepository.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/loading/DefaultLoaderRepository.java rename to src/java.management/share/classes/javax/management/loading/DefaultLoaderRepository.java diff --git a/jdk/src/java.management/share/classes/javax/management/loading/MLet.java b/src/java.management/share/classes/javax/management/loading/MLet.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/loading/MLet.java rename to src/java.management/share/classes/javax/management/loading/MLet.java diff --git a/jdk/src/java.management/share/classes/javax/management/loading/MLetContent.java b/src/java.management/share/classes/javax/management/loading/MLetContent.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/loading/MLetContent.java rename to src/java.management/share/classes/javax/management/loading/MLetContent.java diff --git a/jdk/src/java.management/share/classes/javax/management/loading/MLetMBean.java b/src/java.management/share/classes/javax/management/loading/MLetMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/loading/MLetMBean.java rename to src/java.management/share/classes/javax/management/loading/MLetMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/loading/MLetObjectInputStream.java b/src/java.management/share/classes/javax/management/loading/MLetObjectInputStream.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/loading/MLetObjectInputStream.java rename to src/java.management/share/classes/javax/management/loading/MLetObjectInputStream.java diff --git a/jdk/src/java.management/share/classes/javax/management/loading/MLetParser.java b/src/java.management/share/classes/javax/management/loading/MLetParser.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/loading/MLetParser.java rename to src/java.management/share/classes/javax/management/loading/MLetParser.java diff --git a/jdk/src/java.management/share/classes/javax/management/loading/PrivateClassLoader.java b/src/java.management/share/classes/javax/management/loading/PrivateClassLoader.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/loading/PrivateClassLoader.java rename to src/java.management/share/classes/javax/management/loading/PrivateClassLoader.java diff --git a/jdk/src/java.management/share/classes/javax/management/loading/PrivateMLet.java b/src/java.management/share/classes/javax/management/loading/PrivateMLet.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/loading/PrivateMLet.java rename to src/java.management/share/classes/javax/management/loading/PrivateMLet.java diff --git a/jdk/src/java.management/share/classes/javax/management/loading/package.html b/src/java.management/share/classes/javax/management/loading/package.html similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/loading/package.html rename to src/java.management/share/classes/javax/management/loading/package.html diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java b/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java rename to src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java b/src/java.management/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java rename to src/java.management/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBean.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBean.java rename to src/java.management/share/classes/javax/management/modelmbean/ModelMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java rename to src/java.management/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java rename to src/java.management/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfo.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfo.java rename to src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java rename to src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java rename to src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java rename to src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java rename to src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java b/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java rename to src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java b/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java rename to src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/package.html b/src/java.management/share/classes/javax/management/modelmbean/package.html similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/modelmbean/package.html rename to src/java.management/share/classes/javax/management/modelmbean/package.html diff --git a/jdk/src/java.management/share/classes/javax/management/monitor/CounterMonitor.java b/src/java.management/share/classes/javax/management/monitor/CounterMonitor.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/monitor/CounterMonitor.java rename to src/java.management/share/classes/javax/management/monitor/CounterMonitor.java diff --git a/jdk/src/java.management/share/classes/javax/management/monitor/CounterMonitorMBean.java b/src/java.management/share/classes/javax/management/monitor/CounterMonitorMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/monitor/CounterMonitorMBean.java rename to src/java.management/share/classes/javax/management/monitor/CounterMonitorMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/monitor/GaugeMonitor.java b/src/java.management/share/classes/javax/management/monitor/GaugeMonitor.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/monitor/GaugeMonitor.java rename to src/java.management/share/classes/javax/management/monitor/GaugeMonitor.java diff --git a/jdk/src/java.management/share/classes/javax/management/monitor/GaugeMonitorMBean.java b/src/java.management/share/classes/javax/management/monitor/GaugeMonitorMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/monitor/GaugeMonitorMBean.java rename to src/java.management/share/classes/javax/management/monitor/GaugeMonitorMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/monitor/Monitor.java b/src/java.management/share/classes/javax/management/monitor/Monitor.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/monitor/Monitor.java rename to src/java.management/share/classes/javax/management/monitor/Monitor.java diff --git a/jdk/src/java.management/share/classes/javax/management/monitor/MonitorMBean.java b/src/java.management/share/classes/javax/management/monitor/MonitorMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/monitor/MonitorMBean.java rename to src/java.management/share/classes/javax/management/monitor/MonitorMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java b/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java rename to src/java.management/share/classes/javax/management/monitor/MonitorNotification.java diff --git a/jdk/src/java.management/share/classes/javax/management/monitor/MonitorSettingException.java b/src/java.management/share/classes/javax/management/monitor/MonitorSettingException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/monitor/MonitorSettingException.java rename to src/java.management/share/classes/javax/management/monitor/MonitorSettingException.java diff --git a/jdk/src/java.management/share/classes/javax/management/monitor/StringMonitor.java b/src/java.management/share/classes/javax/management/monitor/StringMonitor.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/monitor/StringMonitor.java rename to src/java.management/share/classes/javax/management/monitor/StringMonitor.java diff --git a/jdk/src/java.management/share/classes/javax/management/monitor/StringMonitorMBean.java b/src/java.management/share/classes/javax/management/monitor/StringMonitorMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/monitor/StringMonitorMBean.java rename to src/java.management/share/classes/javax/management/monitor/StringMonitorMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/monitor/package.html b/src/java.management/share/classes/javax/management/monitor/package.html similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/monitor/package.html rename to src/java.management/share/classes/javax/management/monitor/package.html diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/ArrayType.java b/src/java.management/share/classes/javax/management/openmbean/ArrayType.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/ArrayType.java rename to src/java.management/share/classes/javax/management/openmbean/ArrayType.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/CompositeData.java b/src/java.management/share/classes/javax/management/openmbean/CompositeData.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/CompositeData.java rename to src/java.management/share/classes/javax/management/openmbean/CompositeData.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java b/src/java.management/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java rename to src/java.management/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java b/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java rename to src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/CompositeDataView.java b/src/java.management/share/classes/javax/management/openmbean/CompositeDataView.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/CompositeDataView.java rename to src/java.management/share/classes/javax/management/openmbean/CompositeDataView.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/CompositeType.java b/src/java.management/share/classes/javax/management/openmbean/CompositeType.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/CompositeType.java rename to src/java.management/share/classes/javax/management/openmbean/CompositeType.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/InvalidKeyException.java b/src/java.management/share/classes/javax/management/openmbean/InvalidKeyException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/InvalidKeyException.java rename to src/java.management/share/classes/javax/management/openmbean/InvalidKeyException.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/InvalidOpenTypeException.java b/src/java.management/share/classes/javax/management/openmbean/InvalidOpenTypeException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/InvalidOpenTypeException.java rename to src/java.management/share/classes/javax/management/openmbean/InvalidOpenTypeException.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/KeyAlreadyExistsException.java b/src/java.management/share/classes/javax/management/openmbean/KeyAlreadyExistsException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/KeyAlreadyExistsException.java rename to src/java.management/share/classes/javax/management/openmbean/KeyAlreadyExistsException.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/OpenDataException.java b/src/java.management/share/classes/javax/management/openmbean/OpenDataException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/OpenDataException.java rename to src/java.management/share/classes/javax/management/openmbean/OpenDataException.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java rename to src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java rename to src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java rename to src/java.management/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java rename to src/java.management/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanInfo.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanInfo.java rename to src/java.management/share/classes/javax/management/openmbean/OpenMBeanInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java rename to src/java.management/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java rename to src/java.management/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java rename to src/java.management/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java rename to src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java rename to src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/OpenType.java b/src/java.management/share/classes/javax/management/openmbean/OpenType.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/OpenType.java rename to src/java.management/share/classes/javax/management/openmbean/OpenType.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/SimpleType.java b/src/java.management/share/classes/javax/management/openmbean/SimpleType.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/SimpleType.java rename to src/java.management/share/classes/javax/management/openmbean/SimpleType.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/TabularData.java b/src/java.management/share/classes/javax/management/openmbean/TabularData.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/TabularData.java rename to src/java.management/share/classes/javax/management/openmbean/TabularData.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java b/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java rename to src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/TabularType.java b/src/java.management/share/classes/javax/management/openmbean/TabularType.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/TabularType.java rename to src/java.management/share/classes/javax/management/openmbean/TabularType.java diff --git a/jdk/src/java.management/share/classes/javax/management/openmbean/package.html b/src/java.management/share/classes/javax/management/openmbean/package.html similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/openmbean/package.html rename to src/java.management/share/classes/javax/management/openmbean/package.html diff --git a/jdk/src/java.management/share/classes/javax/management/package.html b/src/java.management/share/classes/javax/management/package.html similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/package.html rename to src/java.management/share/classes/javax/management/package.html diff --git a/jdk/src/java.management/share/classes/javax/management/relation/InvalidRelationIdException.java b/src/java.management/share/classes/javax/management/relation/InvalidRelationIdException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/InvalidRelationIdException.java rename to src/java.management/share/classes/javax/management/relation/InvalidRelationIdException.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/InvalidRelationServiceException.java b/src/java.management/share/classes/javax/management/relation/InvalidRelationServiceException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/InvalidRelationServiceException.java rename to src/java.management/share/classes/javax/management/relation/InvalidRelationServiceException.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/InvalidRelationTypeException.java b/src/java.management/share/classes/javax/management/relation/InvalidRelationTypeException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/InvalidRelationTypeException.java rename to src/java.management/share/classes/javax/management/relation/InvalidRelationTypeException.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/InvalidRoleInfoException.java b/src/java.management/share/classes/javax/management/relation/InvalidRoleInfoException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/InvalidRoleInfoException.java rename to src/java.management/share/classes/javax/management/relation/InvalidRoleInfoException.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/InvalidRoleValueException.java b/src/java.management/share/classes/javax/management/relation/InvalidRoleValueException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/InvalidRoleValueException.java rename to src/java.management/share/classes/javax/management/relation/InvalidRoleValueException.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/MBeanServerNotificationFilter.java b/src/java.management/share/classes/javax/management/relation/MBeanServerNotificationFilter.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/MBeanServerNotificationFilter.java rename to src/java.management/share/classes/javax/management/relation/MBeanServerNotificationFilter.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/Relation.java b/src/java.management/share/classes/javax/management/relation/Relation.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/Relation.java rename to src/java.management/share/classes/javax/management/relation/Relation.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RelationException.java b/src/java.management/share/classes/javax/management/relation/RelationException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RelationException.java rename to src/java.management/share/classes/javax/management/relation/RelationException.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RelationNotFoundException.java b/src/java.management/share/classes/javax/management/relation/RelationNotFoundException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RelationNotFoundException.java rename to src/java.management/share/classes/javax/management/relation/RelationNotFoundException.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RelationNotification.java b/src/java.management/share/classes/javax/management/relation/RelationNotification.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RelationNotification.java rename to src/java.management/share/classes/javax/management/relation/RelationNotification.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RelationService.java b/src/java.management/share/classes/javax/management/relation/RelationService.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RelationService.java rename to src/java.management/share/classes/javax/management/relation/RelationService.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RelationServiceMBean.java b/src/java.management/share/classes/javax/management/relation/RelationServiceMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RelationServiceMBean.java rename to src/java.management/share/classes/javax/management/relation/RelationServiceMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java b/src/java.management/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java rename to src/java.management/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RelationSupport.java b/src/java.management/share/classes/javax/management/relation/RelationSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RelationSupport.java rename to src/java.management/share/classes/javax/management/relation/RelationSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RelationSupportMBean.java b/src/java.management/share/classes/javax/management/relation/RelationSupportMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RelationSupportMBean.java rename to src/java.management/share/classes/javax/management/relation/RelationSupportMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RelationType.java b/src/java.management/share/classes/javax/management/relation/RelationType.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RelationType.java rename to src/java.management/share/classes/javax/management/relation/RelationType.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RelationTypeNotFoundException.java b/src/java.management/share/classes/javax/management/relation/RelationTypeNotFoundException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RelationTypeNotFoundException.java rename to src/java.management/share/classes/javax/management/relation/RelationTypeNotFoundException.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RelationTypeSupport.java b/src/java.management/share/classes/javax/management/relation/RelationTypeSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RelationTypeSupport.java rename to src/java.management/share/classes/javax/management/relation/RelationTypeSupport.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/Role.java b/src/java.management/share/classes/javax/management/relation/Role.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/Role.java rename to src/java.management/share/classes/javax/management/relation/Role.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RoleInfo.java b/src/java.management/share/classes/javax/management/relation/RoleInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RoleInfo.java rename to src/java.management/share/classes/javax/management/relation/RoleInfo.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RoleInfoNotFoundException.java b/src/java.management/share/classes/javax/management/relation/RoleInfoNotFoundException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RoleInfoNotFoundException.java rename to src/java.management/share/classes/javax/management/relation/RoleInfoNotFoundException.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RoleList.java b/src/java.management/share/classes/javax/management/relation/RoleList.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RoleList.java rename to src/java.management/share/classes/javax/management/relation/RoleList.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RoleNotFoundException.java b/src/java.management/share/classes/javax/management/relation/RoleNotFoundException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RoleNotFoundException.java rename to src/java.management/share/classes/javax/management/relation/RoleNotFoundException.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RoleResult.java b/src/java.management/share/classes/javax/management/relation/RoleResult.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RoleResult.java rename to src/java.management/share/classes/javax/management/relation/RoleResult.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RoleStatus.java b/src/java.management/share/classes/javax/management/relation/RoleStatus.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RoleStatus.java rename to src/java.management/share/classes/javax/management/relation/RoleStatus.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RoleUnresolved.java b/src/java.management/share/classes/javax/management/relation/RoleUnresolved.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RoleUnresolved.java rename to src/java.management/share/classes/javax/management/relation/RoleUnresolved.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/RoleUnresolvedList.java b/src/java.management/share/classes/javax/management/relation/RoleUnresolvedList.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/RoleUnresolvedList.java rename to src/java.management/share/classes/javax/management/relation/RoleUnresolvedList.java diff --git a/jdk/src/java.management/share/classes/javax/management/relation/package.html b/src/java.management/share/classes/javax/management/relation/package.html similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/relation/package.html rename to src/java.management/share/classes/javax/management/relation/package.html diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXAddressable.java b/src/java.management/share/classes/javax/management/remote/JMXAddressable.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXAddressable.java rename to src/java.management/share/classes/javax/management/remote/JMXAddressable.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXAuthenticator.java b/src/java.management/share/classes/javax/management/remote/JMXAuthenticator.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXAuthenticator.java rename to src/java.management/share/classes/javax/management/remote/JMXAuthenticator.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectionNotification.java b/src/java.management/share/classes/javax/management/remote/JMXConnectionNotification.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXConnectionNotification.java rename to src/java.management/share/classes/javax/management/remote/JMXConnectionNotification.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXConnector.java b/src/java.management/share/classes/javax/management/remote/JMXConnector.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXConnector.java rename to src/java.management/share/classes/javax/management/remote/JMXConnector.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java b/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java rename to src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorProvider.java b/src/java.management/share/classes/javax/management/remote/JMXConnectorProvider.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorProvider.java rename to src/java.management/share/classes/javax/management/remote/JMXConnectorProvider.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServer.java b/src/java.management/share/classes/javax/management/remote/JMXConnectorServer.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServer.java rename to src/java.management/share/classes/javax/management/remote/JMXConnectorServer.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerFactory.java b/src/java.management/share/classes/javax/management/remote/JMXConnectorServerFactory.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerFactory.java rename to src/java.management/share/classes/javax/management/remote/JMXConnectorServerFactory.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerMBean.java b/src/java.management/share/classes/javax/management/remote/JMXConnectorServerMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerMBean.java rename to src/java.management/share/classes/javax/management/remote/JMXConnectorServerMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerProvider.java b/src/java.management/share/classes/javax/management/remote/JMXConnectorServerProvider.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerProvider.java rename to src/java.management/share/classes/javax/management/remote/JMXConnectorServerProvider.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXPrincipal.java b/src/java.management/share/classes/javax/management/remote/JMXPrincipal.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXPrincipal.java rename to src/java.management/share/classes/javax/management/remote/JMXPrincipal.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXProviderException.java b/src/java.management/share/classes/javax/management/remote/JMXProviderException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXProviderException.java rename to src/java.management/share/classes/javax/management/remote/JMXProviderException.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXServerErrorException.java b/src/java.management/share/classes/javax/management/remote/JMXServerErrorException.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXServerErrorException.java rename to src/java.management/share/classes/javax/management/remote/JMXServerErrorException.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXServiceURL.java b/src/java.management/share/classes/javax/management/remote/JMXServiceURL.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/JMXServiceURL.java rename to src/java.management/share/classes/javax/management/remote/JMXServiceURL.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/MBeanServerForwarder.java b/src/java.management/share/classes/javax/management/remote/MBeanServerForwarder.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/MBeanServerForwarder.java rename to src/java.management/share/classes/javax/management/remote/MBeanServerForwarder.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/NotificationResult.java b/src/java.management/share/classes/javax/management/remote/NotificationResult.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/NotificationResult.java rename to src/java.management/share/classes/javax/management/remote/NotificationResult.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/SubjectDelegationPermission.java b/src/java.management/share/classes/javax/management/remote/SubjectDelegationPermission.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/SubjectDelegationPermission.java rename to src/java.management/share/classes/javax/management/remote/SubjectDelegationPermission.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/TargetedNotification.java b/src/java.management/share/classes/javax/management/remote/TargetedNotification.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/TargetedNotification.java rename to src/java.management/share/classes/javax/management/remote/TargetedNotification.java diff --git a/jdk/src/java.management/share/classes/javax/management/remote/package.html b/src/java.management/share/classes/javax/management/remote/package.html similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/remote/package.html rename to src/java.management/share/classes/javax/management/remote/package.html diff --git a/jdk/src/java.management/share/classes/javax/management/timer/Timer.java b/src/java.management/share/classes/javax/management/timer/Timer.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/timer/Timer.java rename to src/java.management/share/classes/javax/management/timer/Timer.java diff --git a/jdk/src/java.management/share/classes/javax/management/timer/TimerAlarmClock.java b/src/java.management/share/classes/javax/management/timer/TimerAlarmClock.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/timer/TimerAlarmClock.java rename to src/java.management/share/classes/javax/management/timer/TimerAlarmClock.java diff --git a/jdk/src/java.management/share/classes/javax/management/timer/TimerAlarmClockNotification.java b/src/java.management/share/classes/javax/management/timer/TimerAlarmClockNotification.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/timer/TimerAlarmClockNotification.java rename to src/java.management/share/classes/javax/management/timer/TimerAlarmClockNotification.java diff --git a/jdk/src/java.management/share/classes/javax/management/timer/TimerMBean.java b/src/java.management/share/classes/javax/management/timer/TimerMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/timer/TimerMBean.java rename to src/java.management/share/classes/javax/management/timer/TimerMBean.java diff --git a/jdk/src/java.management/share/classes/javax/management/timer/TimerNotification.java b/src/java.management/share/classes/javax/management/timer/TimerNotification.java similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/timer/TimerNotification.java rename to src/java.management/share/classes/javax/management/timer/TimerNotification.java diff --git a/jdk/src/java.management/share/classes/javax/management/timer/package.html b/src/java.management/share/classes/javax/management/timer/package.html similarity index 100% rename from jdk/src/java.management/share/classes/javax/management/timer/package.html rename to src/java.management/share/classes/javax/management/timer/package.html diff --git a/jdk/src/java.management/share/classes/module-info.java b/src/java.management/share/classes/module-info.java similarity index 100% rename from jdk/src/java.management/share/classes/module-info.java rename to src/java.management/share/classes/module-info.java diff --git a/jdk/src/java.management/share/classes/sun/management/BaseOperatingSystemImpl.java b/src/java.management/share/classes/sun/management/BaseOperatingSystemImpl.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/BaseOperatingSystemImpl.java rename to src/java.management/share/classes/sun/management/BaseOperatingSystemImpl.java diff --git a/jdk/src/java.management/share/classes/sun/management/ClassLoadingImpl.java b/src/java.management/share/classes/sun/management/ClassLoadingImpl.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/ClassLoadingImpl.java rename to src/java.management/share/classes/sun/management/ClassLoadingImpl.java diff --git a/jdk/src/java.management/share/classes/sun/management/CompilationImpl.java b/src/java.management/share/classes/sun/management/CompilationImpl.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/CompilationImpl.java rename to src/java.management/share/classes/sun/management/CompilationImpl.java diff --git a/jdk/src/java.management/share/classes/sun/management/CompilerThreadStat.java b/src/java.management/share/classes/sun/management/CompilerThreadStat.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/CompilerThreadStat.java rename to src/java.management/share/classes/sun/management/CompilerThreadStat.java diff --git a/jdk/src/java.management/share/classes/sun/management/GarbageCollectorImpl.java b/src/java.management/share/classes/sun/management/GarbageCollectorImpl.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/GarbageCollectorImpl.java rename to src/java.management/share/classes/sun/management/GarbageCollectorImpl.java diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotClassLoading.java b/src/java.management/share/classes/sun/management/HotspotClassLoading.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/HotspotClassLoading.java rename to src/java.management/share/classes/sun/management/HotspotClassLoading.java diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotClassLoadingMBean.java b/src/java.management/share/classes/sun/management/HotspotClassLoadingMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/HotspotClassLoadingMBean.java rename to src/java.management/share/classes/sun/management/HotspotClassLoadingMBean.java diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotCompilation.java b/src/java.management/share/classes/sun/management/HotspotCompilation.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/HotspotCompilation.java rename to src/java.management/share/classes/sun/management/HotspotCompilation.java diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java b/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java rename to src/java.management/share/classes/sun/management/HotspotCompilationMBean.java diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotInternal.java b/src/java.management/share/classes/sun/management/HotspotInternal.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/HotspotInternal.java rename to src/java.management/share/classes/sun/management/HotspotInternal.java diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotInternalMBean.java b/src/java.management/share/classes/sun/management/HotspotInternalMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/HotspotInternalMBean.java rename to src/java.management/share/classes/sun/management/HotspotInternalMBean.java diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotMemory.java b/src/java.management/share/classes/sun/management/HotspotMemory.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/HotspotMemory.java rename to src/java.management/share/classes/sun/management/HotspotMemory.java diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotMemoryMBean.java b/src/java.management/share/classes/sun/management/HotspotMemoryMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/HotspotMemoryMBean.java rename to src/java.management/share/classes/sun/management/HotspotMemoryMBean.java diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotRuntime.java b/src/java.management/share/classes/sun/management/HotspotRuntime.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/HotspotRuntime.java rename to src/java.management/share/classes/sun/management/HotspotRuntime.java diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java b/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java rename to src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotThread.java b/src/java.management/share/classes/sun/management/HotspotThread.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/HotspotThread.java rename to src/java.management/share/classes/sun/management/HotspotThread.java diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotThreadMBean.java b/src/java.management/share/classes/sun/management/HotspotThreadMBean.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/HotspotThreadMBean.java rename to src/java.management/share/classes/sun/management/HotspotThreadMBean.java diff --git a/jdk/src/java.management/share/classes/sun/management/LazyCompositeData.java b/src/java.management/share/classes/sun/management/LazyCompositeData.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/LazyCompositeData.java rename to src/java.management/share/classes/sun/management/LazyCompositeData.java diff --git a/jdk/src/java.management/share/classes/sun/management/LockInfoCompositeData.java b/src/java.management/share/classes/sun/management/LockInfoCompositeData.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/LockInfoCompositeData.java rename to src/java.management/share/classes/sun/management/LockInfoCompositeData.java diff --git a/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java b/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java rename to src/java.management/share/classes/sun/management/ManagementFactoryHelper.java diff --git a/jdk/src/java.management/share/classes/sun/management/MappedMXBeanType.java b/src/java.management/share/classes/sun/management/MappedMXBeanType.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/MappedMXBeanType.java rename to src/java.management/share/classes/sun/management/MappedMXBeanType.java diff --git a/jdk/src/java.management/share/classes/sun/management/MemoryImpl.java b/src/java.management/share/classes/sun/management/MemoryImpl.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/MemoryImpl.java rename to src/java.management/share/classes/sun/management/MemoryImpl.java diff --git a/jdk/src/java.management/share/classes/sun/management/MemoryManagerImpl.java b/src/java.management/share/classes/sun/management/MemoryManagerImpl.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/MemoryManagerImpl.java rename to src/java.management/share/classes/sun/management/MemoryManagerImpl.java diff --git a/jdk/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java b/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java rename to src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java diff --git a/jdk/src/java.management/share/classes/sun/management/MemoryPoolImpl.java b/src/java.management/share/classes/sun/management/MemoryPoolImpl.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/MemoryPoolImpl.java rename to src/java.management/share/classes/sun/management/MemoryPoolImpl.java diff --git a/jdk/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java b/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java rename to src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java diff --git a/jdk/src/java.management/share/classes/sun/management/MethodInfo.java b/src/java.management/share/classes/sun/management/MethodInfo.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/MethodInfo.java rename to src/java.management/share/classes/sun/management/MethodInfo.java diff --git a/jdk/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java b/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java rename to src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java diff --git a/jdk/src/java.management/share/classes/sun/management/NotificationEmitterSupport.java b/src/java.management/share/classes/sun/management/NotificationEmitterSupport.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/NotificationEmitterSupport.java rename to src/java.management/share/classes/sun/management/NotificationEmitterSupport.java diff --git a/jdk/src/java.management/share/classes/sun/management/RuntimeImpl.java b/src/java.management/share/classes/sun/management/RuntimeImpl.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/RuntimeImpl.java rename to src/java.management/share/classes/sun/management/RuntimeImpl.java diff --git a/jdk/src/java.management/share/classes/sun/management/Sensor.java b/src/java.management/share/classes/sun/management/Sensor.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/Sensor.java rename to src/java.management/share/classes/sun/management/Sensor.java diff --git a/jdk/src/java.management/share/classes/sun/management/StackTraceElementCompositeData.java b/src/java.management/share/classes/sun/management/StackTraceElementCompositeData.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/StackTraceElementCompositeData.java rename to src/java.management/share/classes/sun/management/StackTraceElementCompositeData.java diff --git a/jdk/src/java.management/share/classes/sun/management/ThreadImpl.java b/src/java.management/share/classes/sun/management/ThreadImpl.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/ThreadImpl.java rename to src/java.management/share/classes/sun/management/ThreadImpl.java diff --git a/jdk/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java b/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java rename to src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java diff --git a/jdk/src/java.management/share/classes/sun/management/TypeVersionMapper.java b/src/java.management/share/classes/sun/management/TypeVersionMapper.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/TypeVersionMapper.java rename to src/java.management/share/classes/sun/management/TypeVersionMapper.java diff --git a/jdk/src/java.management/share/classes/sun/management/Util.java b/src/java.management/share/classes/sun/management/Util.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/Util.java rename to src/java.management/share/classes/sun/management/Util.java diff --git a/jdk/src/java.management/share/classes/sun/management/VMManagement.java b/src/java.management/share/classes/sun/management/VMManagement.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/VMManagement.java rename to src/java.management/share/classes/sun/management/VMManagement.java diff --git a/jdk/src/java.management/share/classes/sun/management/VMManagementImpl.java b/src/java.management/share/classes/sun/management/VMManagementImpl.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/VMManagementImpl.java rename to src/java.management/share/classes/sun/management/VMManagementImpl.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/AbstractCounter.java b/src/java.management/share/classes/sun/management/counter/AbstractCounter.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/AbstractCounter.java rename to src/java.management/share/classes/sun/management/counter/AbstractCounter.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/ByteArrayCounter.java b/src/java.management/share/classes/sun/management/counter/ByteArrayCounter.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/ByteArrayCounter.java rename to src/java.management/share/classes/sun/management/counter/ByteArrayCounter.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/Counter.java b/src/java.management/share/classes/sun/management/counter/Counter.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/Counter.java rename to src/java.management/share/classes/sun/management/counter/Counter.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/LongArrayCounter.java b/src/java.management/share/classes/sun/management/counter/LongArrayCounter.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/LongArrayCounter.java rename to src/java.management/share/classes/sun/management/counter/LongArrayCounter.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/LongCounter.java b/src/java.management/share/classes/sun/management/counter/LongCounter.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/LongCounter.java rename to src/java.management/share/classes/sun/management/counter/LongCounter.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/StringCounter.java b/src/java.management/share/classes/sun/management/counter/StringCounter.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/StringCounter.java rename to src/java.management/share/classes/sun/management/counter/StringCounter.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/Units.java b/src/java.management/share/classes/sun/management/counter/Units.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/Units.java rename to src/java.management/share/classes/sun/management/counter/Units.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/Variability.java b/src/java.management/share/classes/sun/management/counter/Variability.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/Variability.java rename to src/java.management/share/classes/sun/management/counter/Variability.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java b/src/java.management/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java rename to src/java.management/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/InstrumentationException.java b/src/java.management/share/classes/sun/management/counter/perf/InstrumentationException.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/InstrumentationException.java rename to src/java.management/share/classes/sun/management/counter/perf/InstrumentationException.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/LongArrayCounterSnapshot.java b/src/java.management/share/classes/sun/management/counter/perf/LongArrayCounterSnapshot.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/LongArrayCounterSnapshot.java rename to src/java.management/share/classes/sun/management/counter/perf/LongArrayCounterSnapshot.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/LongCounterSnapshot.java b/src/java.management/share/classes/sun/management/counter/perf/LongCounterSnapshot.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/LongCounterSnapshot.java rename to src/java.management/share/classes/sun/management/counter/perf/LongCounterSnapshot.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java b/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java rename to src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfDataEntry.java b/src/java.management/share/classes/sun/management/counter/perf/PerfDataEntry.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/PerfDataEntry.java rename to src/java.management/share/classes/sun/management/counter/perf/PerfDataEntry.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfDataType.java b/src/java.management/share/classes/sun/management/counter/perf/PerfDataType.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/PerfDataType.java rename to src/java.management/share/classes/sun/management/counter/perf/PerfDataType.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfInstrumentation.java b/src/java.management/share/classes/sun/management/counter/perf/PerfInstrumentation.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/PerfInstrumentation.java rename to src/java.management/share/classes/sun/management/counter/perf/PerfInstrumentation.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java b/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java rename to src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java b/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java rename to src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/PerfStringCounter.java b/src/java.management/share/classes/sun/management/counter/perf/PerfStringCounter.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/PerfStringCounter.java rename to src/java.management/share/classes/sun/management/counter/perf/PerfStringCounter.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/Prologue.java b/src/java.management/share/classes/sun/management/counter/perf/Prologue.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/Prologue.java rename to src/java.management/share/classes/sun/management/counter/perf/Prologue.java diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/StringCounterSnapshot.java b/src/java.management/share/classes/sun/management/counter/perf/StringCounterSnapshot.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/counter/perf/StringCounterSnapshot.java rename to src/java.management/share/classes/sun/management/counter/perf/StringCounterSnapshot.java diff --git a/jdk/src/java.management/share/classes/sun/management/spi/PlatformMBeanProvider.java b/src/java.management/share/classes/sun/management/spi/PlatformMBeanProvider.java similarity index 100% rename from jdk/src/java.management/share/classes/sun/management/spi/PlatformMBeanProvider.java rename to src/java.management/share/classes/sun/management/spi/PlatformMBeanProvider.java diff --git a/jdk/src/java.management/share/native/include/jmm.h b/src/java.management/share/native/include/jmm.h similarity index 100% rename from jdk/src/java.management/share/native/include/jmm.h rename to src/java.management/share/native/include/jmm.h diff --git a/jdk/src/java.management/share/native/libmanagement/ClassLoadingImpl.c b/src/java.management/share/native/libmanagement/ClassLoadingImpl.c similarity index 100% rename from jdk/src/java.management/share/native/libmanagement/ClassLoadingImpl.c rename to src/java.management/share/native/libmanagement/ClassLoadingImpl.c diff --git a/jdk/src/java.management/share/native/libmanagement/GarbageCollectorImpl.c b/src/java.management/share/native/libmanagement/GarbageCollectorImpl.c similarity index 100% rename from jdk/src/java.management/share/native/libmanagement/GarbageCollectorImpl.c rename to src/java.management/share/native/libmanagement/GarbageCollectorImpl.c diff --git a/jdk/src/java.management/share/native/libmanagement/HotspotThread.c b/src/java.management/share/native/libmanagement/HotspotThread.c similarity index 100% rename from jdk/src/java.management/share/native/libmanagement/HotspotThread.c rename to src/java.management/share/native/libmanagement/HotspotThread.c diff --git a/jdk/src/java.management/share/native/libmanagement/MemoryImpl.c b/src/java.management/share/native/libmanagement/MemoryImpl.c similarity index 100% rename from jdk/src/java.management/share/native/libmanagement/MemoryImpl.c rename to src/java.management/share/native/libmanagement/MemoryImpl.c diff --git a/jdk/src/java.management/share/native/libmanagement/MemoryManagerImpl.c b/src/java.management/share/native/libmanagement/MemoryManagerImpl.c similarity index 100% rename from jdk/src/java.management/share/native/libmanagement/MemoryManagerImpl.c rename to src/java.management/share/native/libmanagement/MemoryManagerImpl.c diff --git a/jdk/src/java.management/share/native/libmanagement/MemoryPoolImpl.c b/src/java.management/share/native/libmanagement/MemoryPoolImpl.c similarity index 100% rename from jdk/src/java.management/share/native/libmanagement/MemoryPoolImpl.c rename to src/java.management/share/native/libmanagement/MemoryPoolImpl.c diff --git a/jdk/src/java.management/share/native/libmanagement/ThreadImpl.c b/src/java.management/share/native/libmanagement/ThreadImpl.c similarity index 100% rename from jdk/src/java.management/share/native/libmanagement/ThreadImpl.c rename to src/java.management/share/native/libmanagement/ThreadImpl.c diff --git a/jdk/src/java.management/share/native/libmanagement/VMManagementImpl.c b/src/java.management/share/native/libmanagement/VMManagementImpl.c similarity index 100% rename from jdk/src/java.management/share/native/libmanagement/VMManagementImpl.c rename to src/java.management/share/native/libmanagement/VMManagementImpl.c diff --git a/jdk/src/java.management/share/native/libmanagement/management.c b/src/java.management/share/native/libmanagement/management.c similarity index 100% rename from jdk/src/java.management/share/native/libmanagement/management.c rename to src/java.management/share/native/libmanagement/management.c diff --git a/jdk/src/java.management/share/native/libmanagement/management.h b/src/java.management/share/native/libmanagement/management.h similarity index 100% rename from jdk/src/java.management/share/native/libmanagement/management.h rename to src/java.management/share/native/libmanagement/management.h diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java b/src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BasicControl.java b/src/java.naming/share/classes/com/sun/jndi/ldap/BasicControl.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BasicControl.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/BasicControl.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Ber.java b/src/java.naming/share/classes/com/sun/jndi/ldap/Ber.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Ber.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/Ber.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BerDecoder.java b/src/java.naming/share/classes/com/sun/jndi/ldap/BerDecoder.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BerDecoder.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/BerDecoder.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BerEncoder.java b/src/java.naming/share/classes/com/sun/jndi/ldap/BerEncoder.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BerEncoder.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/BerEncoder.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BindingWithControls.java b/src/java.naming/share/classes/com/sun/jndi/ldap/BindingWithControls.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BindingWithControls.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/BindingWithControls.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ClientId.java b/src/java.naming/share/classes/com/sun/jndi/ldap/ClientId.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ClientId.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/ClientId.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java b/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java b/src/java.naming/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/DigestClientId.java b/src/java.naming/share/classes/com/sun/jndi/ldap/DigestClientId.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/DigestClientId.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/DigestClientId.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EntryChangeResponseControl.java b/src/java.naming/share/classes/com/sun/jndi/ldap/EntryChangeResponseControl.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EntryChangeResponseControl.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/EntryChangeResponseControl.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventQueue.java b/src/java.naming/share/classes/com/sun/jndi/ldap/EventQueue.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventQueue.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/EventQueue.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventSupport.java b/src/java.naming/share/classes/com/sun/jndi/ldap/EventSupport.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventSupport.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/EventSupport.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Filter.java b/src/java.naming/share/classes/com/sun/jndi/ldap/Filter.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Filter.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/Filter.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapAttribute.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapAttribute.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapAttribute.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapAttribute.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClientFactory.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClientFactory.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClientFactory.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapClientFactory.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtx.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtx.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtx.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtx.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapEntry.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapEntry.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapEntry.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapEntry.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapName.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapName.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapName.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapName.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNameParser.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNameParser.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNameParser.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapNameParser.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapPoolManager.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapPoolManager.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapPoolManager.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapPoolManager.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralContext.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralContext.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralContext.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralException.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralException.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralException.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralException.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapRequest.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapRequest.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapRequest.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapRequest.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapResult.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapResult.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapResult.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapResult.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapURL.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapURL.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapURL.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/LdapURL.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ManageReferralControl.java b/src/java.naming/share/classes/com/sun/jndi/ldap/ManageReferralControl.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ManageReferralControl.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/ManageReferralControl.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/NameClassPairWithControls.java b/src/java.naming/share/classes/com/sun/jndi/ldap/NameClassPairWithControls.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/NameClassPairWithControls.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/NameClassPairWithControls.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java b/src/java.naming/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/NotifierArgs.java b/src/java.naming/share/classes/com/sun/jndi/ldap/NotifierArgs.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/NotifierArgs.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/NotifierArgs.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Obj.java b/src/java.naming/share/classes/com/sun/jndi/ldap/Obj.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/Obj.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/Obj.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java b/src/java.naming/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ReferralEnumeration.java b/src/java.naming/share/classes/com/sun/jndi/ldap/ReferralEnumeration.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ReferralEnumeration.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/ReferralEnumeration.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/SearchResultWithControls.java b/src/java.naming/share/classes/com/sun/jndi/ldap/SearchResultWithControls.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/SearchResultWithControls.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/SearchResultWithControls.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ServiceLocator.java b/src/java.naming/share/classes/com/sun/jndi/ldap/ServiceLocator.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ServiceLocator.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/ServiceLocator.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/SimpleClientId.java b/src/java.naming/share/classes/com/sun/jndi/ldap/SimpleClientId.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/SimpleClientId.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/SimpleClientId.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java b/src/java.naming/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java b/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java b/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/jndiprovider.properties b/src/java.naming/share/classes/com/sun/jndi/ldap/jndiprovider.properties similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/jndiprovider.properties rename to src/java.naming/share/classes/com/sun/jndi/ldap/jndiprovider.properties diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionDesc.java b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionDesc.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionDesc.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionDesc.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionsRef.java b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionsRef.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionsRef.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionsRef.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCleaner.java b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCleaner.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCleaner.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCleaner.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PooledConnection.java b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PooledConnection.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PooledConnection.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/pool/PooledConnection.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PooledConnectionFactory.java b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PooledConnectionFactory.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PooledConnectionFactory.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/pool/PooledConnectionFactory.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java b/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java b/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslInputStream.java b/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslInputStream.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslInputStream.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslInputStream.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java b/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java rename to src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentContext.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentContext.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentContext.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/HeadTail.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/HeadTail.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/HeadTail.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/HeadTail.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/StringHeadTail.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/StringHeadTail.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/StringHeadTail.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/StringHeadTail.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLDirContext.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLDirContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLDirContext.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLDirContext.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java rename to src/java.naming/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/url/ldap/ldapURLContext.java b/src/java.naming/share/classes/com/sun/jndi/url/ldap/ldapURLContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/url/ldap/ldapURLContext.java rename to src/java.naming/share/classes/com/sun/jndi/url/ldap/ldapURLContext.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/url/ldap/ldapURLContextFactory.java b/src/java.naming/share/classes/com/sun/jndi/url/ldap/ldapURLContextFactory.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/url/ldap/ldapURLContextFactory.java rename to src/java.naming/share/classes/com/sun/jndi/url/ldap/ldapURLContextFactory.java diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/url/ldaps/ldapsURLContextFactory.java b/src/java.naming/share/classes/com/sun/jndi/url/ldaps/ldapsURLContextFactory.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/jndi/url/ldaps/ldapsURLContextFactory.java rename to src/java.naming/share/classes/com/sun/jndi/url/ldaps/ldapsURLContextFactory.java diff --git a/jdk/src/java.naming/share/classes/com/sun/naming/internal/FactoryEnumeration.java b/src/java.naming/share/classes/com/sun/naming/internal/FactoryEnumeration.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/naming/internal/FactoryEnumeration.java rename to src/java.naming/share/classes/com/sun/naming/internal/FactoryEnumeration.java diff --git a/jdk/src/java.naming/share/classes/com/sun/naming/internal/NamedWeakReference.java b/src/java.naming/share/classes/com/sun/naming/internal/NamedWeakReference.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/naming/internal/NamedWeakReference.java rename to src/java.naming/share/classes/com/sun/naming/internal/NamedWeakReference.java diff --git a/jdk/src/java.naming/share/classes/com/sun/naming/internal/ResourceManager.java b/src/java.naming/share/classes/com/sun/naming/internal/ResourceManager.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/naming/internal/ResourceManager.java rename to src/java.naming/share/classes/com/sun/naming/internal/ResourceManager.java diff --git a/jdk/src/java.naming/share/classes/com/sun/naming/internal/VersionHelper.java b/src/java.naming/share/classes/com/sun/naming/internal/VersionHelper.java similarity index 100% rename from jdk/src/java.naming/share/classes/com/sun/naming/internal/VersionHelper.java rename to src/java.naming/share/classes/com/sun/naming/internal/VersionHelper.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/AuthenticationException.java b/src/java.naming/share/classes/javax/naming/AuthenticationException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/AuthenticationException.java rename to src/java.naming/share/classes/javax/naming/AuthenticationException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/AuthenticationNotSupportedException.java b/src/java.naming/share/classes/javax/naming/AuthenticationNotSupportedException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/AuthenticationNotSupportedException.java rename to src/java.naming/share/classes/javax/naming/AuthenticationNotSupportedException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/BinaryRefAddr.java b/src/java.naming/share/classes/javax/naming/BinaryRefAddr.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/BinaryRefAddr.java rename to src/java.naming/share/classes/javax/naming/BinaryRefAddr.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/Binding.java b/src/java.naming/share/classes/javax/naming/Binding.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/Binding.java rename to src/java.naming/share/classes/javax/naming/Binding.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/CannotProceedException.java b/src/java.naming/share/classes/javax/naming/CannotProceedException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/CannotProceedException.java rename to src/java.naming/share/classes/javax/naming/CannotProceedException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/CommunicationException.java b/src/java.naming/share/classes/javax/naming/CommunicationException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/CommunicationException.java rename to src/java.naming/share/classes/javax/naming/CommunicationException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/CompositeName.java b/src/java.naming/share/classes/javax/naming/CompositeName.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/CompositeName.java rename to src/java.naming/share/classes/javax/naming/CompositeName.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/CompoundName.java b/src/java.naming/share/classes/javax/naming/CompoundName.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/CompoundName.java rename to src/java.naming/share/classes/javax/naming/CompoundName.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ConfigurationException.java b/src/java.naming/share/classes/javax/naming/ConfigurationException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ConfigurationException.java rename to src/java.naming/share/classes/javax/naming/ConfigurationException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/Context.java b/src/java.naming/share/classes/javax/naming/Context.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/Context.java rename to src/java.naming/share/classes/javax/naming/Context.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ContextNotEmptyException.java b/src/java.naming/share/classes/javax/naming/ContextNotEmptyException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ContextNotEmptyException.java rename to src/java.naming/share/classes/javax/naming/ContextNotEmptyException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/InitialContext.java b/src/java.naming/share/classes/javax/naming/InitialContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/InitialContext.java rename to src/java.naming/share/classes/javax/naming/InitialContext.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/InsufficientResourcesException.java b/src/java.naming/share/classes/javax/naming/InsufficientResourcesException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/InsufficientResourcesException.java rename to src/java.naming/share/classes/javax/naming/InsufficientResourcesException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/InterruptedNamingException.java b/src/java.naming/share/classes/javax/naming/InterruptedNamingException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/InterruptedNamingException.java rename to src/java.naming/share/classes/javax/naming/InterruptedNamingException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/InvalidNameException.java b/src/java.naming/share/classes/javax/naming/InvalidNameException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/InvalidNameException.java rename to src/java.naming/share/classes/javax/naming/InvalidNameException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/LimitExceededException.java b/src/java.naming/share/classes/javax/naming/LimitExceededException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/LimitExceededException.java rename to src/java.naming/share/classes/javax/naming/LimitExceededException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/LinkException.java b/src/java.naming/share/classes/javax/naming/LinkException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/LinkException.java rename to src/java.naming/share/classes/javax/naming/LinkException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/LinkLoopException.java b/src/java.naming/share/classes/javax/naming/LinkLoopException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/LinkLoopException.java rename to src/java.naming/share/classes/javax/naming/LinkLoopException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/LinkRef.java b/src/java.naming/share/classes/javax/naming/LinkRef.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/LinkRef.java rename to src/java.naming/share/classes/javax/naming/LinkRef.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/MalformedLinkException.java b/src/java.naming/share/classes/javax/naming/MalformedLinkException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/MalformedLinkException.java rename to src/java.naming/share/classes/javax/naming/MalformedLinkException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/Name.java b/src/java.naming/share/classes/javax/naming/Name.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/Name.java rename to src/java.naming/share/classes/javax/naming/Name.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/NameAlreadyBoundException.java b/src/java.naming/share/classes/javax/naming/NameAlreadyBoundException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/NameAlreadyBoundException.java rename to src/java.naming/share/classes/javax/naming/NameAlreadyBoundException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/NameClassPair.java b/src/java.naming/share/classes/javax/naming/NameClassPair.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/NameClassPair.java rename to src/java.naming/share/classes/javax/naming/NameClassPair.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/NameImpl.java b/src/java.naming/share/classes/javax/naming/NameImpl.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/NameImpl.java rename to src/java.naming/share/classes/javax/naming/NameImpl.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/NameNotFoundException.java b/src/java.naming/share/classes/javax/naming/NameNotFoundException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/NameNotFoundException.java rename to src/java.naming/share/classes/javax/naming/NameNotFoundException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/NameParser.java b/src/java.naming/share/classes/javax/naming/NameParser.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/NameParser.java rename to src/java.naming/share/classes/javax/naming/NameParser.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/NamingEnumeration.java b/src/java.naming/share/classes/javax/naming/NamingEnumeration.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/NamingEnumeration.java rename to src/java.naming/share/classes/javax/naming/NamingEnumeration.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/NamingException.java b/src/java.naming/share/classes/javax/naming/NamingException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/NamingException.java rename to src/java.naming/share/classes/javax/naming/NamingException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/NamingSecurityException.java b/src/java.naming/share/classes/javax/naming/NamingSecurityException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/NamingSecurityException.java rename to src/java.naming/share/classes/javax/naming/NamingSecurityException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/NoInitialContextException.java b/src/java.naming/share/classes/javax/naming/NoInitialContextException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/NoInitialContextException.java rename to src/java.naming/share/classes/javax/naming/NoInitialContextException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/NoPermissionException.java b/src/java.naming/share/classes/javax/naming/NoPermissionException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/NoPermissionException.java rename to src/java.naming/share/classes/javax/naming/NoPermissionException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/NotContextException.java b/src/java.naming/share/classes/javax/naming/NotContextException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/NotContextException.java rename to src/java.naming/share/classes/javax/naming/NotContextException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/OperationNotSupportedException.java b/src/java.naming/share/classes/javax/naming/OperationNotSupportedException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/OperationNotSupportedException.java rename to src/java.naming/share/classes/javax/naming/OperationNotSupportedException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/PartialResultException.java b/src/java.naming/share/classes/javax/naming/PartialResultException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/PartialResultException.java rename to src/java.naming/share/classes/javax/naming/PartialResultException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/RefAddr.java b/src/java.naming/share/classes/javax/naming/RefAddr.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/RefAddr.java rename to src/java.naming/share/classes/javax/naming/RefAddr.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/Reference.java b/src/java.naming/share/classes/javax/naming/Reference.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/Reference.java rename to src/java.naming/share/classes/javax/naming/Reference.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/Referenceable.java b/src/java.naming/share/classes/javax/naming/Referenceable.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/Referenceable.java rename to src/java.naming/share/classes/javax/naming/Referenceable.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ReferralException.java b/src/java.naming/share/classes/javax/naming/ReferralException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ReferralException.java rename to src/java.naming/share/classes/javax/naming/ReferralException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ServiceUnavailableException.java b/src/java.naming/share/classes/javax/naming/ServiceUnavailableException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ServiceUnavailableException.java rename to src/java.naming/share/classes/javax/naming/ServiceUnavailableException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/SizeLimitExceededException.java b/src/java.naming/share/classes/javax/naming/SizeLimitExceededException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/SizeLimitExceededException.java rename to src/java.naming/share/classes/javax/naming/SizeLimitExceededException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/StringRefAddr.java b/src/java.naming/share/classes/javax/naming/StringRefAddr.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/StringRefAddr.java rename to src/java.naming/share/classes/javax/naming/StringRefAddr.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/TimeLimitExceededException.java b/src/java.naming/share/classes/javax/naming/TimeLimitExceededException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/TimeLimitExceededException.java rename to src/java.naming/share/classes/javax/naming/TimeLimitExceededException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/Attribute.java b/src/java.naming/share/classes/javax/naming/directory/Attribute.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/Attribute.java rename to src/java.naming/share/classes/javax/naming/directory/Attribute.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/AttributeInUseException.java b/src/java.naming/share/classes/javax/naming/directory/AttributeInUseException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/AttributeInUseException.java rename to src/java.naming/share/classes/javax/naming/directory/AttributeInUseException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/AttributeModificationException.java b/src/java.naming/share/classes/javax/naming/directory/AttributeModificationException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/AttributeModificationException.java rename to src/java.naming/share/classes/javax/naming/directory/AttributeModificationException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/Attributes.java b/src/java.naming/share/classes/javax/naming/directory/Attributes.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/Attributes.java rename to src/java.naming/share/classes/javax/naming/directory/Attributes.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/BasicAttribute.java b/src/java.naming/share/classes/javax/naming/directory/BasicAttribute.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/BasicAttribute.java rename to src/java.naming/share/classes/javax/naming/directory/BasicAttribute.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java b/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java rename to src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/DirContext.java b/src/java.naming/share/classes/javax/naming/directory/DirContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/DirContext.java rename to src/java.naming/share/classes/javax/naming/directory/DirContext.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/InitialDirContext.java b/src/java.naming/share/classes/javax/naming/directory/InitialDirContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/InitialDirContext.java rename to src/java.naming/share/classes/javax/naming/directory/InitialDirContext.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/InvalidAttributeIdentifierException.java b/src/java.naming/share/classes/javax/naming/directory/InvalidAttributeIdentifierException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/InvalidAttributeIdentifierException.java rename to src/java.naming/share/classes/javax/naming/directory/InvalidAttributeIdentifierException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/InvalidAttributeValueException.java b/src/java.naming/share/classes/javax/naming/directory/InvalidAttributeValueException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/InvalidAttributeValueException.java rename to src/java.naming/share/classes/javax/naming/directory/InvalidAttributeValueException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/InvalidAttributesException.java b/src/java.naming/share/classes/javax/naming/directory/InvalidAttributesException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/InvalidAttributesException.java rename to src/java.naming/share/classes/javax/naming/directory/InvalidAttributesException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/InvalidSearchControlsException.java b/src/java.naming/share/classes/javax/naming/directory/InvalidSearchControlsException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/InvalidSearchControlsException.java rename to src/java.naming/share/classes/javax/naming/directory/InvalidSearchControlsException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/InvalidSearchFilterException.java b/src/java.naming/share/classes/javax/naming/directory/InvalidSearchFilterException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/InvalidSearchFilterException.java rename to src/java.naming/share/classes/javax/naming/directory/InvalidSearchFilterException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/ModificationItem.java b/src/java.naming/share/classes/javax/naming/directory/ModificationItem.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/ModificationItem.java rename to src/java.naming/share/classes/javax/naming/directory/ModificationItem.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/NoSuchAttributeException.java b/src/java.naming/share/classes/javax/naming/directory/NoSuchAttributeException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/NoSuchAttributeException.java rename to src/java.naming/share/classes/javax/naming/directory/NoSuchAttributeException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/SchemaViolationException.java b/src/java.naming/share/classes/javax/naming/directory/SchemaViolationException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/SchemaViolationException.java rename to src/java.naming/share/classes/javax/naming/directory/SchemaViolationException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/SearchControls.java b/src/java.naming/share/classes/javax/naming/directory/SearchControls.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/SearchControls.java rename to src/java.naming/share/classes/javax/naming/directory/SearchControls.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/SearchResult.java b/src/java.naming/share/classes/javax/naming/directory/SearchResult.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/SearchResult.java rename to src/java.naming/share/classes/javax/naming/directory/SearchResult.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/directory/package.html b/src/java.naming/share/classes/javax/naming/directory/package.html similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/directory/package.html rename to src/java.naming/share/classes/javax/naming/directory/package.html diff --git a/jdk/src/java.naming/share/classes/javax/naming/event/EventContext.java b/src/java.naming/share/classes/javax/naming/event/EventContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/event/EventContext.java rename to src/java.naming/share/classes/javax/naming/event/EventContext.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/event/EventDirContext.java b/src/java.naming/share/classes/javax/naming/event/EventDirContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/event/EventDirContext.java rename to src/java.naming/share/classes/javax/naming/event/EventDirContext.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/event/NamespaceChangeListener.java b/src/java.naming/share/classes/javax/naming/event/NamespaceChangeListener.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/event/NamespaceChangeListener.java rename to src/java.naming/share/classes/javax/naming/event/NamespaceChangeListener.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/event/NamingEvent.java b/src/java.naming/share/classes/javax/naming/event/NamingEvent.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/event/NamingEvent.java rename to src/java.naming/share/classes/javax/naming/event/NamingEvent.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/event/NamingExceptionEvent.java b/src/java.naming/share/classes/javax/naming/event/NamingExceptionEvent.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/event/NamingExceptionEvent.java rename to src/java.naming/share/classes/javax/naming/event/NamingExceptionEvent.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/event/NamingListener.java b/src/java.naming/share/classes/javax/naming/event/NamingListener.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/event/NamingListener.java rename to src/java.naming/share/classes/javax/naming/event/NamingListener.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/event/ObjectChangeListener.java b/src/java.naming/share/classes/javax/naming/event/ObjectChangeListener.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/event/ObjectChangeListener.java rename to src/java.naming/share/classes/javax/naming/event/ObjectChangeListener.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/event/package.html b/src/java.naming/share/classes/javax/naming/event/package.html similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/event/package.html rename to src/java.naming/share/classes/javax/naming/event/package.html diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/BasicControl.java b/src/java.naming/share/classes/javax/naming/ldap/BasicControl.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/BasicControl.java rename to src/java.naming/share/classes/javax/naming/ldap/BasicControl.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/Control.java b/src/java.naming/share/classes/javax/naming/ldap/Control.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/Control.java rename to src/java.naming/share/classes/javax/naming/ldap/Control.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/ControlFactory.java b/src/java.naming/share/classes/javax/naming/ldap/ControlFactory.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/ControlFactory.java rename to src/java.naming/share/classes/javax/naming/ldap/ControlFactory.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/ExtendedRequest.java b/src/java.naming/share/classes/javax/naming/ldap/ExtendedRequest.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/ExtendedRequest.java rename to src/java.naming/share/classes/javax/naming/ldap/ExtendedRequest.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/ExtendedResponse.java b/src/java.naming/share/classes/javax/naming/ldap/ExtendedResponse.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/ExtendedResponse.java rename to src/java.naming/share/classes/javax/naming/ldap/ExtendedResponse.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/HasControls.java b/src/java.naming/share/classes/javax/naming/ldap/HasControls.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/HasControls.java rename to src/java.naming/share/classes/javax/naming/ldap/HasControls.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/InitialLdapContext.java b/src/java.naming/share/classes/javax/naming/ldap/InitialLdapContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/InitialLdapContext.java rename to src/java.naming/share/classes/javax/naming/ldap/InitialLdapContext.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/LdapContext.java b/src/java.naming/share/classes/javax/naming/ldap/LdapContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/LdapContext.java rename to src/java.naming/share/classes/javax/naming/ldap/LdapContext.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/LdapName.java b/src/java.naming/share/classes/javax/naming/ldap/LdapName.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/LdapName.java rename to src/java.naming/share/classes/javax/naming/ldap/LdapName.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/LdapReferralException.java b/src/java.naming/share/classes/javax/naming/ldap/LdapReferralException.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/LdapReferralException.java rename to src/java.naming/share/classes/javax/naming/ldap/LdapReferralException.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/ManageReferralControl.java b/src/java.naming/share/classes/javax/naming/ldap/ManageReferralControl.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/ManageReferralControl.java rename to src/java.naming/share/classes/javax/naming/ldap/ManageReferralControl.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/PagedResultsControl.java b/src/java.naming/share/classes/javax/naming/ldap/PagedResultsControl.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/PagedResultsControl.java rename to src/java.naming/share/classes/javax/naming/ldap/PagedResultsControl.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/PagedResultsResponseControl.java b/src/java.naming/share/classes/javax/naming/ldap/PagedResultsResponseControl.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/PagedResultsResponseControl.java rename to src/java.naming/share/classes/javax/naming/ldap/PagedResultsResponseControl.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/Rdn.java b/src/java.naming/share/classes/javax/naming/ldap/Rdn.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/Rdn.java rename to src/java.naming/share/classes/javax/naming/ldap/Rdn.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/Rfc2253Parser.java b/src/java.naming/share/classes/javax/naming/ldap/Rfc2253Parser.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/Rfc2253Parser.java rename to src/java.naming/share/classes/javax/naming/ldap/Rfc2253Parser.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/SortControl.java b/src/java.naming/share/classes/javax/naming/ldap/SortControl.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/SortControl.java rename to src/java.naming/share/classes/javax/naming/ldap/SortControl.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/SortKey.java b/src/java.naming/share/classes/javax/naming/ldap/SortKey.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/SortKey.java rename to src/java.naming/share/classes/javax/naming/ldap/SortKey.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/SortResponseControl.java b/src/java.naming/share/classes/javax/naming/ldap/SortResponseControl.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/SortResponseControl.java rename to src/java.naming/share/classes/javax/naming/ldap/SortResponseControl.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/StartTlsRequest.java b/src/java.naming/share/classes/javax/naming/ldap/StartTlsRequest.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/StartTlsRequest.java rename to src/java.naming/share/classes/javax/naming/ldap/StartTlsRequest.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/StartTlsResponse.java b/src/java.naming/share/classes/javax/naming/ldap/StartTlsResponse.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/StartTlsResponse.java rename to src/java.naming/share/classes/javax/naming/ldap/StartTlsResponse.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotification.java b/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotification.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotification.java rename to src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotification.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotificationEvent.java b/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotificationEvent.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotificationEvent.java rename to src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotificationEvent.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java b/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java rename to src/java.naming/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/ldap/package.html b/src/java.naming/share/classes/javax/naming/ldap/package.html similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/ldap/package.html rename to src/java.naming/share/classes/javax/naming/ldap/package.html diff --git a/jdk/src/java.naming/share/classes/javax/naming/package.html b/src/java.naming/share/classes/javax/naming/package.html similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/package.html rename to src/java.naming/share/classes/javax/naming/package.html diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/ContinuationContext.java b/src/java.naming/share/classes/javax/naming/spi/ContinuationContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/ContinuationContext.java rename to src/java.naming/share/classes/javax/naming/spi/ContinuationContext.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/ContinuationDirContext.java b/src/java.naming/share/classes/javax/naming/spi/ContinuationDirContext.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/ContinuationDirContext.java rename to src/java.naming/share/classes/javax/naming/spi/ContinuationDirContext.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/DirObjectFactory.java b/src/java.naming/share/classes/javax/naming/spi/DirObjectFactory.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/DirObjectFactory.java rename to src/java.naming/share/classes/javax/naming/spi/DirObjectFactory.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/DirStateFactory.java b/src/java.naming/share/classes/javax/naming/spi/DirStateFactory.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/DirStateFactory.java rename to src/java.naming/share/classes/javax/naming/spi/DirStateFactory.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/DirectoryManager.java b/src/java.naming/share/classes/javax/naming/spi/DirectoryManager.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/DirectoryManager.java rename to src/java.naming/share/classes/javax/naming/spi/DirectoryManager.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/InitialContextFactory.java b/src/java.naming/share/classes/javax/naming/spi/InitialContextFactory.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/InitialContextFactory.java rename to src/java.naming/share/classes/javax/naming/spi/InitialContextFactory.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/InitialContextFactoryBuilder.java b/src/java.naming/share/classes/javax/naming/spi/InitialContextFactoryBuilder.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/InitialContextFactoryBuilder.java rename to src/java.naming/share/classes/javax/naming/spi/InitialContextFactoryBuilder.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/NamingManager.java b/src/java.naming/share/classes/javax/naming/spi/NamingManager.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/NamingManager.java rename to src/java.naming/share/classes/javax/naming/spi/NamingManager.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/ObjectFactory.java b/src/java.naming/share/classes/javax/naming/spi/ObjectFactory.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/ObjectFactory.java rename to src/java.naming/share/classes/javax/naming/spi/ObjectFactory.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/ObjectFactoryBuilder.java b/src/java.naming/share/classes/javax/naming/spi/ObjectFactoryBuilder.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/ObjectFactoryBuilder.java rename to src/java.naming/share/classes/javax/naming/spi/ObjectFactoryBuilder.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/ResolveResult.java b/src/java.naming/share/classes/javax/naming/spi/ResolveResult.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/ResolveResult.java rename to src/java.naming/share/classes/javax/naming/spi/ResolveResult.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/Resolver.java b/src/java.naming/share/classes/javax/naming/spi/Resolver.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/Resolver.java rename to src/java.naming/share/classes/javax/naming/spi/Resolver.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/StateFactory.java b/src/java.naming/share/classes/javax/naming/spi/StateFactory.java similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/StateFactory.java rename to src/java.naming/share/classes/javax/naming/spi/StateFactory.java diff --git a/jdk/src/java.naming/share/classes/javax/naming/spi/package.html b/src/java.naming/share/classes/javax/naming/spi/package.html similarity index 100% rename from jdk/src/java.naming/share/classes/javax/naming/spi/package.html rename to src/java.naming/share/classes/javax/naming/spi/package.html diff --git a/jdk/src/java.naming/share/classes/module-info.java b/src/java.naming/share/classes/module-info.java similarity index 100% rename from jdk/src/java.naming/share/classes/module-info.java rename to src/java.naming/share/classes/module-info.java diff --git a/jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap/JdkLDAP.java b/src/java.naming/share/classes/sun/security/provider/certpath/ldap/JdkLDAP.java similarity index 100% rename from jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap/JdkLDAP.java rename to src/java.naming/share/classes/sun/security/provider/certpath/ldap/JdkLDAP.java diff --git a/jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java b/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java similarity index 100% rename from jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java rename to src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java diff --git a/jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java b/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java similarity index 100% rename from jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java rename to src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java diff --git a/jdk/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferences.java b/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferences.java similarity index 100% rename from jdk/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferences.java rename to src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferences.java diff --git a/jdk/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferencesFactory.java b/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferencesFactory.java similarity index 100% rename from jdk/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferencesFactory.java rename to src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferencesFactory.java diff --git a/jdk/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferencesFile.java b/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferencesFile.java similarity index 100% rename from jdk/src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferencesFile.java rename to src/java.prefs/macosx/classes/java/util/prefs/MacOSXPreferencesFile.java diff --git a/jdk/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m b/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m similarity index 100% rename from jdk/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m rename to src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/AbstractPreferences.java b/src/java.prefs/share/classes/java/util/prefs/AbstractPreferences.java similarity index 100% rename from jdk/src/java.prefs/share/classes/java/util/prefs/AbstractPreferences.java rename to src/java.prefs/share/classes/java/util/prefs/AbstractPreferences.java diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/BackingStoreException.java b/src/java.prefs/share/classes/java/util/prefs/BackingStoreException.java similarity index 100% rename from jdk/src/java.prefs/share/classes/java/util/prefs/BackingStoreException.java rename to src/java.prefs/share/classes/java/util/prefs/BackingStoreException.java diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/Base64.java b/src/java.prefs/share/classes/java/util/prefs/Base64.java similarity index 100% rename from jdk/src/java.prefs/share/classes/java/util/prefs/Base64.java rename to src/java.prefs/share/classes/java/util/prefs/Base64.java diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/InvalidPreferencesFormatException.java b/src/java.prefs/share/classes/java/util/prefs/InvalidPreferencesFormatException.java similarity index 100% rename from jdk/src/java.prefs/share/classes/java/util/prefs/InvalidPreferencesFormatException.java rename to src/java.prefs/share/classes/java/util/prefs/InvalidPreferencesFormatException.java diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/NodeChangeEvent.java b/src/java.prefs/share/classes/java/util/prefs/NodeChangeEvent.java similarity index 100% rename from jdk/src/java.prefs/share/classes/java/util/prefs/NodeChangeEvent.java rename to src/java.prefs/share/classes/java/util/prefs/NodeChangeEvent.java diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/NodeChangeListener.java b/src/java.prefs/share/classes/java/util/prefs/NodeChangeListener.java similarity index 100% rename from jdk/src/java.prefs/share/classes/java/util/prefs/NodeChangeListener.java rename to src/java.prefs/share/classes/java/util/prefs/NodeChangeListener.java diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/PreferenceChangeEvent.java b/src/java.prefs/share/classes/java/util/prefs/PreferenceChangeEvent.java similarity index 100% rename from jdk/src/java.prefs/share/classes/java/util/prefs/PreferenceChangeEvent.java rename to src/java.prefs/share/classes/java/util/prefs/PreferenceChangeEvent.java diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/PreferenceChangeListener.java b/src/java.prefs/share/classes/java/util/prefs/PreferenceChangeListener.java similarity index 100% rename from jdk/src/java.prefs/share/classes/java/util/prefs/PreferenceChangeListener.java rename to src/java.prefs/share/classes/java/util/prefs/PreferenceChangeListener.java diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/Preferences.java b/src/java.prefs/share/classes/java/util/prefs/Preferences.java similarity index 100% rename from jdk/src/java.prefs/share/classes/java/util/prefs/Preferences.java rename to src/java.prefs/share/classes/java/util/prefs/Preferences.java diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/PreferencesFactory.java b/src/java.prefs/share/classes/java/util/prefs/PreferencesFactory.java similarity index 100% rename from jdk/src/java.prefs/share/classes/java/util/prefs/PreferencesFactory.java rename to src/java.prefs/share/classes/java/util/prefs/PreferencesFactory.java diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/XmlSupport.java b/src/java.prefs/share/classes/java/util/prefs/XmlSupport.java similarity index 100% rename from jdk/src/java.prefs/share/classes/java/util/prefs/XmlSupport.java rename to src/java.prefs/share/classes/java/util/prefs/XmlSupport.java diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/package.html b/src/java.prefs/share/classes/java/util/prefs/package.html similarity index 100% rename from jdk/src/java.prefs/share/classes/java/util/prefs/package.html rename to src/java.prefs/share/classes/java/util/prefs/package.html diff --git a/jdk/src/java.prefs/share/classes/module-info.java b/src/java.prefs/share/classes/module-info.java similarity index 100% rename from jdk/src/java.prefs/share/classes/module-info.java rename to src/java.prefs/share/classes/module-info.java diff --git a/jdk/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java b/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java similarity index 100% rename from jdk/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java rename to src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java diff --git a/jdk/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferencesFactory.java b/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferencesFactory.java similarity index 100% rename from jdk/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferencesFactory.java rename to src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferencesFactory.java diff --git a/jdk/src/java.prefs/unix/native/libprefs/FileSystemPreferences.c b/src/java.prefs/unix/native/libprefs/FileSystemPreferences.c similarity index 100% rename from jdk/src/java.prefs/unix/native/libprefs/FileSystemPreferences.c rename to src/java.prefs/unix/native/libprefs/FileSystemPreferences.c diff --git a/jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java b/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java similarity index 100% rename from jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java rename to src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java diff --git a/jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferencesFactory.java b/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferencesFactory.java similarity index 100% rename from jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferencesFactory.java rename to src/java.prefs/windows/classes/java/util/prefs/WindowsPreferencesFactory.java diff --git a/jdk/src/java.prefs/windows/native/libprefs/WindowsPreferences.c b/src/java.prefs/windows/native/libprefs/WindowsPreferences.c similarity index 100% rename from jdk/src/java.prefs/windows/native/libprefs/WindowsPreferences.c rename to src/java.prefs/windows/native/libprefs/WindowsPreferences.c diff --git a/jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java b/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java similarity index 100% rename from jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java rename to src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java diff --git a/jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java b/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java similarity index 100% rename from jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java rename to src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/AccessException.java b/src/java.rmi/share/classes/java/rmi/AccessException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/AccessException.java rename to src/java.rmi/share/classes/java/rmi/AccessException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/AlreadyBoundException.java b/src/java.rmi/share/classes/java/rmi/AlreadyBoundException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/AlreadyBoundException.java rename to src/java.rmi/share/classes/java/rmi/AlreadyBoundException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/ConnectException.java b/src/java.rmi/share/classes/java/rmi/ConnectException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/ConnectException.java rename to src/java.rmi/share/classes/java/rmi/ConnectException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/ConnectIOException.java b/src/java.rmi/share/classes/java/rmi/ConnectIOException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/ConnectIOException.java rename to src/java.rmi/share/classes/java/rmi/ConnectIOException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/MarshalException.java b/src/java.rmi/share/classes/java/rmi/MarshalException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/MarshalException.java rename to src/java.rmi/share/classes/java/rmi/MarshalException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/MarshalledObject.java b/src/java.rmi/share/classes/java/rmi/MarshalledObject.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/MarshalledObject.java rename to src/java.rmi/share/classes/java/rmi/MarshalledObject.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/Naming.java b/src/java.rmi/share/classes/java/rmi/Naming.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/Naming.java rename to src/java.rmi/share/classes/java/rmi/Naming.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/NoSuchObjectException.java b/src/java.rmi/share/classes/java/rmi/NoSuchObjectException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/NoSuchObjectException.java rename to src/java.rmi/share/classes/java/rmi/NoSuchObjectException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/NotBoundException.java b/src/java.rmi/share/classes/java/rmi/NotBoundException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/NotBoundException.java rename to src/java.rmi/share/classes/java/rmi/NotBoundException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/RMISecurityException.java b/src/java.rmi/share/classes/java/rmi/RMISecurityException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/RMISecurityException.java rename to src/java.rmi/share/classes/java/rmi/RMISecurityException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/RMISecurityManager.java b/src/java.rmi/share/classes/java/rmi/RMISecurityManager.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/RMISecurityManager.java rename to src/java.rmi/share/classes/java/rmi/RMISecurityManager.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/Remote.java b/src/java.rmi/share/classes/java/rmi/Remote.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/Remote.java rename to src/java.rmi/share/classes/java/rmi/Remote.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/RemoteException.java b/src/java.rmi/share/classes/java/rmi/RemoteException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/RemoteException.java rename to src/java.rmi/share/classes/java/rmi/RemoteException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/ServerError.java b/src/java.rmi/share/classes/java/rmi/ServerError.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/ServerError.java rename to src/java.rmi/share/classes/java/rmi/ServerError.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/ServerException.java b/src/java.rmi/share/classes/java/rmi/ServerException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/ServerException.java rename to src/java.rmi/share/classes/java/rmi/ServerException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/ServerRuntimeException.java b/src/java.rmi/share/classes/java/rmi/ServerRuntimeException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/ServerRuntimeException.java rename to src/java.rmi/share/classes/java/rmi/ServerRuntimeException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/StubNotFoundException.java b/src/java.rmi/share/classes/java/rmi/StubNotFoundException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/StubNotFoundException.java rename to src/java.rmi/share/classes/java/rmi/StubNotFoundException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/UnexpectedException.java b/src/java.rmi/share/classes/java/rmi/UnexpectedException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/UnexpectedException.java rename to src/java.rmi/share/classes/java/rmi/UnexpectedException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/UnknownHostException.java b/src/java.rmi/share/classes/java/rmi/UnknownHostException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/UnknownHostException.java rename to src/java.rmi/share/classes/java/rmi/UnknownHostException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/UnmarshalException.java b/src/java.rmi/share/classes/java/rmi/UnmarshalException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/UnmarshalException.java rename to src/java.rmi/share/classes/java/rmi/UnmarshalException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/Activatable.java b/src/java.rmi/share/classes/java/rmi/activation/Activatable.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/Activatable.java rename to src/java.rmi/share/classes/java/rmi/activation/Activatable.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivateFailedException.java b/src/java.rmi/share/classes/java/rmi/activation/ActivateFailedException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/ActivateFailedException.java rename to src/java.rmi/share/classes/java/rmi/activation/ActivateFailedException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationDesc.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationDesc.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationDesc.java rename to src/java.rmi/share/classes/java/rmi/activation/ActivationDesc.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java rename to src/java.rmi/share/classes/java/rmi/activation/ActivationException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java rename to src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupDesc.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupDesc.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupDesc.java rename to src/java.rmi/share/classes/java/rmi/activation/ActivationGroupDesc.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java rename to src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationID.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationID.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationID.java rename to src/java.rmi/share/classes/java/rmi/activation/ActivationID.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationInstantiator.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationInstantiator.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationInstantiator.java rename to src/java.rmi/share/classes/java/rmi/activation/ActivationInstantiator.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationMonitor.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationMonitor.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationMonitor.java rename to src/java.rmi/share/classes/java/rmi/activation/ActivationMonitor.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationSystem.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationSystem.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/ActivationSystem.java rename to src/java.rmi/share/classes/java/rmi/activation/ActivationSystem.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/Activator.java b/src/java.rmi/share/classes/java/rmi/activation/Activator.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/Activator.java rename to src/java.rmi/share/classes/java/rmi/activation/Activator.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/UnknownGroupException.java b/src/java.rmi/share/classes/java/rmi/activation/UnknownGroupException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/UnknownGroupException.java rename to src/java.rmi/share/classes/java/rmi/activation/UnknownGroupException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/UnknownObjectException.java b/src/java.rmi/share/classes/java/rmi/activation/UnknownObjectException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/UnknownObjectException.java rename to src/java.rmi/share/classes/java/rmi/activation/UnknownObjectException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/activation/package.html b/src/java.rmi/share/classes/java/rmi/activation/package.html similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/activation/package.html rename to src/java.rmi/share/classes/java/rmi/activation/package.html diff --git a/jdk/src/java.rmi/share/classes/java/rmi/dgc/DGC.java b/src/java.rmi/share/classes/java/rmi/dgc/DGC.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/dgc/DGC.java rename to src/java.rmi/share/classes/java/rmi/dgc/DGC.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/dgc/Lease.java b/src/java.rmi/share/classes/java/rmi/dgc/Lease.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/dgc/Lease.java rename to src/java.rmi/share/classes/java/rmi/dgc/Lease.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/dgc/VMID.java b/src/java.rmi/share/classes/java/rmi/dgc/VMID.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/dgc/VMID.java rename to src/java.rmi/share/classes/java/rmi/dgc/VMID.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/dgc/package.html b/src/java.rmi/share/classes/java/rmi/dgc/package.html similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/dgc/package.html rename to src/java.rmi/share/classes/java/rmi/dgc/package.html diff --git a/jdk/src/java.rmi/share/classes/java/rmi/package.html b/src/java.rmi/share/classes/java/rmi/package.html similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/package.html rename to src/java.rmi/share/classes/java/rmi/package.html diff --git a/jdk/src/java.rmi/share/classes/java/rmi/registry/LocateRegistry.java b/src/java.rmi/share/classes/java/rmi/registry/LocateRegistry.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/registry/LocateRegistry.java rename to src/java.rmi/share/classes/java/rmi/registry/LocateRegistry.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/registry/Registry.java b/src/java.rmi/share/classes/java/rmi/registry/Registry.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/registry/Registry.java rename to src/java.rmi/share/classes/java/rmi/registry/Registry.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/registry/RegistryHandler.java b/src/java.rmi/share/classes/java/rmi/registry/RegistryHandler.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/registry/RegistryHandler.java rename to src/java.rmi/share/classes/java/rmi/registry/RegistryHandler.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/registry/package.html b/src/java.rmi/share/classes/java/rmi/registry/package.html similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/registry/package.html rename to src/java.rmi/share/classes/java/rmi/registry/package.html diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/ExportException.java b/src/java.rmi/share/classes/java/rmi/server/ExportException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/ExportException.java rename to src/java.rmi/share/classes/java/rmi/server/ExportException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/LoaderHandler.java b/src/java.rmi/share/classes/java/rmi/server/LoaderHandler.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/LoaderHandler.java rename to src/java.rmi/share/classes/java/rmi/server/LoaderHandler.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/LogStream.java b/src/java.rmi/share/classes/java/rmi/server/LogStream.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/LogStream.java rename to src/java.rmi/share/classes/java/rmi/server/LogStream.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/ObjID.java b/src/java.rmi/share/classes/java/rmi/server/ObjID.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/ObjID.java rename to src/java.rmi/share/classes/java/rmi/server/ObjID.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/Operation.java b/src/java.rmi/share/classes/java/rmi/server/Operation.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/Operation.java rename to src/java.rmi/share/classes/java/rmi/server/Operation.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java b/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java rename to src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java b/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java rename to src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/RMIClientSocketFactory.java b/src/java.rmi/share/classes/java/rmi/server/RMIClientSocketFactory.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/RMIClientSocketFactory.java rename to src/java.rmi/share/classes/java/rmi/server/RMIClientSocketFactory.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/RMIFailureHandler.java b/src/java.rmi/share/classes/java/rmi/server/RMIFailureHandler.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/RMIFailureHandler.java rename to src/java.rmi/share/classes/java/rmi/server/RMIFailureHandler.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/RMIServerSocketFactory.java b/src/java.rmi/share/classes/java/rmi/server/RMIServerSocketFactory.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/RMIServerSocketFactory.java rename to src/java.rmi/share/classes/java/rmi/server/RMIServerSocketFactory.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/RMISocketFactory.java b/src/java.rmi/share/classes/java/rmi/server/RMISocketFactory.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/RMISocketFactory.java rename to src/java.rmi/share/classes/java/rmi/server/RMISocketFactory.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/RemoteCall.java b/src/java.rmi/share/classes/java/rmi/server/RemoteCall.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/RemoteCall.java rename to src/java.rmi/share/classes/java/rmi/server/RemoteCall.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/RemoteObject.java b/src/java.rmi/share/classes/java/rmi/server/RemoteObject.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/RemoteObject.java rename to src/java.rmi/share/classes/java/rmi/server/RemoteObject.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java b/src/java.rmi/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java rename to src/java.rmi/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/RemoteRef.java b/src/java.rmi/share/classes/java/rmi/server/RemoteRef.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/RemoteRef.java rename to src/java.rmi/share/classes/java/rmi/server/RemoteRef.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/RemoteServer.java b/src/java.rmi/share/classes/java/rmi/server/RemoteServer.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/RemoteServer.java rename to src/java.rmi/share/classes/java/rmi/server/RemoteServer.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/RemoteStub.java b/src/java.rmi/share/classes/java/rmi/server/RemoteStub.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/RemoteStub.java rename to src/java.rmi/share/classes/java/rmi/server/RemoteStub.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/ServerCloneException.java b/src/java.rmi/share/classes/java/rmi/server/ServerCloneException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/ServerCloneException.java rename to src/java.rmi/share/classes/java/rmi/server/ServerCloneException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/ServerNotActiveException.java b/src/java.rmi/share/classes/java/rmi/server/ServerNotActiveException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/ServerNotActiveException.java rename to src/java.rmi/share/classes/java/rmi/server/ServerNotActiveException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/ServerRef.java b/src/java.rmi/share/classes/java/rmi/server/ServerRef.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/ServerRef.java rename to src/java.rmi/share/classes/java/rmi/server/ServerRef.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/Skeleton.java b/src/java.rmi/share/classes/java/rmi/server/Skeleton.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/Skeleton.java rename to src/java.rmi/share/classes/java/rmi/server/Skeleton.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/SkeletonMismatchException.java b/src/java.rmi/share/classes/java/rmi/server/SkeletonMismatchException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/SkeletonMismatchException.java rename to src/java.rmi/share/classes/java/rmi/server/SkeletonMismatchException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/SkeletonNotFoundException.java b/src/java.rmi/share/classes/java/rmi/server/SkeletonNotFoundException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/SkeletonNotFoundException.java rename to src/java.rmi/share/classes/java/rmi/server/SkeletonNotFoundException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/SocketSecurityException.java b/src/java.rmi/share/classes/java/rmi/server/SocketSecurityException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/SocketSecurityException.java rename to src/java.rmi/share/classes/java/rmi/server/SocketSecurityException.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/UID.java b/src/java.rmi/share/classes/java/rmi/server/UID.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/UID.java rename to src/java.rmi/share/classes/java/rmi/server/UID.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/UnicastRemoteObject.java b/src/java.rmi/share/classes/java/rmi/server/UnicastRemoteObject.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/UnicastRemoteObject.java rename to src/java.rmi/share/classes/java/rmi/server/UnicastRemoteObject.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/Unreferenced.java b/src/java.rmi/share/classes/java/rmi/server/Unreferenced.java similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/Unreferenced.java rename to src/java.rmi/share/classes/java/rmi/server/Unreferenced.java diff --git a/jdk/src/java.rmi/share/classes/java/rmi/server/package.html b/src/java.rmi/share/classes/java/rmi/server/package.html similarity index 100% rename from jdk/src/java.rmi/share/classes/java/rmi/server/package.html rename to src/java.rmi/share/classes/java/rmi/server/package.html diff --git a/jdk/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java b/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java similarity index 100% rename from jdk/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java rename to src/java.rmi/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java diff --git a/jdk/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java b/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java similarity index 100% rename from jdk/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java rename to src/java.rmi/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java diff --git a/jdk/src/java.rmi/share/classes/javax/rmi/ssl/package.html b/src/java.rmi/share/classes/javax/rmi/ssl/package.html similarity index 100% rename from jdk/src/java.rmi/share/classes/javax/rmi/ssl/package.html rename to src/java.rmi/share/classes/javax/rmi/ssl/package.html diff --git a/jdk/src/java.rmi/share/classes/module-info.java b/src/java.rmi/share/classes/module-info.java similarity index 100% rename from jdk/src/java.rmi/share/classes/module-info.java rename to src/java.rmi/share/classes/module-info.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/log/LogHandler.java b/src/java.rmi/share/classes/sun/rmi/log/LogHandler.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/log/LogHandler.java rename to src/java.rmi/share/classes/sun/rmi/log/LogHandler.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java b/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java rename to src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/log/LogOutputStream.java b/src/java.rmi/share/classes/sun/rmi/log/LogOutputStream.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/log/LogOutputStream.java rename to src/java.rmi/share/classes/sun/rmi/log/LogOutputStream.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/log/ReliableLog.java b/src/java.rmi/share/classes/sun/rmi/log/ReliableLog.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/log/ReliableLog.java rename to src/java.rmi/share/classes/sun/rmi/log/ReliableLog.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java rename to src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java rename to src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Stub.java b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Stub.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Stub.java rename to src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Stub.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry.properties rename to src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties rename to src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties rename to src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties rename to src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties rename to src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties rename to src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties rename to src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties rename to src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties rename to src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties rename to src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties rename to src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/runtime/Log.java b/src/java.rmi/share/classes/sun/rmi/runtime/Log.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/runtime/Log.java rename to src/java.rmi/share/classes/sun/rmi/runtime/Log.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/runtime/NewThreadAction.java b/src/java.rmi/share/classes/sun/rmi/runtime/NewThreadAction.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/runtime/NewThreadAction.java rename to src/java.rmi/share/classes/sun/rmi/runtime/NewThreadAction.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/runtime/RuntimeUtil.java b/src/java.rmi/share/classes/sun/rmi/runtime/RuntimeUtil.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/runtime/RuntimeUtil.java rename to src/java.rmi/share/classes/sun/rmi/runtime/RuntimeUtil.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivatableRef.java b/src/java.rmi/share/classes/sun/rmi/server/ActivatableRef.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/ActivatableRef.java rename to src/java.rmi/share/classes/sun/rmi/server/ActivatableRef.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java b/src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java rename to src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/Activation.java b/src/java.rmi/share/classes/sun/rmi/server/Activation.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/Activation.java rename to src/java.rmi/share/classes/sun/rmi/server/Activation.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java b/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java rename to src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java b/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java rename to src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/DeserializationChecker.java b/src/java.rmi/share/classes/sun/rmi/server/DeserializationChecker.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/DeserializationChecker.java rename to src/java.rmi/share/classes/sun/rmi/server/DeserializationChecker.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/Dispatcher.java b/src/java.rmi/share/classes/sun/rmi/server/Dispatcher.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/Dispatcher.java rename to src/java.rmi/share/classes/sun/rmi/server/Dispatcher.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/InactiveGroupException.java b/src/java.rmi/share/classes/sun/rmi/server/InactiveGroupException.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/InactiveGroupException.java rename to src/java.rmi/share/classes/sun/rmi/server/InactiveGroupException.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java b/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java rename to src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java b/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java rename to src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalOutputStream.java b/src/java.rmi/share/classes/sun/rmi/server/MarshalOutputStream.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalOutputStream.java rename to src/java.rmi/share/classes/sun/rmi/server/MarshalOutputStream.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastRef.java b/src/java.rmi/share/classes/sun/rmi/server/UnicastRef.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastRef.java rename to src/java.rmi/share/classes/sun/rmi/server/UnicastRef.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastRef2.java b/src/java.rmi/share/classes/sun/rmi/server/UnicastRef2.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastRef2.java rename to src/java.rmi/share/classes/sun/rmi/server/UnicastRef2.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java b/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java rename to src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef2.java b/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef2.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef2.java rename to src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef2.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/Util.java b/src/java.rmi/share/classes/sun/rmi/server/Util.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/Util.java rename to src/java.rmi/share/classes/sun/rmi/server/Util.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/WeakClassHashMap.java b/src/java.rmi/share/classes/sun/rmi/server/WeakClassHashMap.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/WeakClassHashMap.java rename to src/java.rmi/share/classes/sun/rmi/server/WeakClassHashMap.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid.properties b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid.properties rename to src/java.rmi/share/classes/sun/rmi/server/resources/rmid.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_de.properties b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_de.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_de.properties rename to src/java.rmi/share/classes/sun/rmi/server/resources/rmid_de.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_es.properties b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_es.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_es.properties rename to src/java.rmi/share/classes/sun/rmi/server/resources/rmid_es.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_fr.properties b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_fr.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_fr.properties rename to src/java.rmi/share/classes/sun/rmi/server/resources/rmid_fr.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_it.properties b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_it.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_it.properties rename to src/java.rmi/share/classes/sun/rmi/server/resources/rmid_it.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_ja.properties b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_ja.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_ja.properties rename to src/java.rmi/share/classes/sun/rmi/server/resources/rmid_ja.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_ko.properties b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_ko.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_ko.properties rename to src/java.rmi/share/classes/sun/rmi/server/resources/rmid_ko.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties rename to src/java.rmi/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_sv.properties b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_sv.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_sv.properties rename to src/java.rmi/share/classes/sun/rmi/server/resources/rmid_sv.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties rename to src/java.rmi/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties rename to src/java.rmi/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/Channel.java b/src/java.rmi/share/classes/sun/rmi/transport/Channel.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/Channel.java rename to src/java.rmi/share/classes/sun/rmi/transport/Channel.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/Connection.java b/src/java.rmi/share/classes/sun/rmi/transport/Connection.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/Connection.java rename to src/java.rmi/share/classes/sun/rmi/transport/Connection.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/ConnectionInputStream.java b/src/java.rmi/share/classes/sun/rmi/transport/ConnectionInputStream.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/ConnectionInputStream.java rename to src/java.rmi/share/classes/sun/rmi/transport/ConnectionInputStream.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/ConnectionOutputStream.java b/src/java.rmi/share/classes/sun/rmi/transport/ConnectionOutputStream.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/ConnectionOutputStream.java rename to src/java.rmi/share/classes/sun/rmi/transport/ConnectionOutputStream.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCAckHandler.java b/src/java.rmi/share/classes/sun/rmi/transport/DGCAckHandler.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCAckHandler.java rename to src/java.rmi/share/classes/sun/rmi/transport/DGCAckHandler.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCClient.java b/src/java.rmi/share/classes/sun/rmi/transport/DGCClient.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCClient.java rename to src/java.rmi/share/classes/sun/rmi/transport/DGCClient.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl.java b/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl.java rename to src/java.rmi/share/classes/sun/rmi/transport/DGCImpl.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Skel.java b/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Skel.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Skel.java rename to src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Skel.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Stub.java b/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Stub.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Stub.java rename to src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Stub.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/Endpoint.java b/src/java.rmi/share/classes/sun/rmi/transport/Endpoint.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/Endpoint.java rename to src/java.rmi/share/classes/sun/rmi/transport/Endpoint.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/GC.java b/src/java.rmi/share/classes/sun/rmi/transport/GC.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/GC.java rename to src/java.rmi/share/classes/sun/rmi/transport/GC.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/LiveRef.java b/src/java.rmi/share/classes/sun/rmi/transport/LiveRef.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/LiveRef.java rename to src/java.rmi/share/classes/sun/rmi/transport/LiveRef.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/ObjectEndpoint.java b/src/java.rmi/share/classes/sun/rmi/transport/ObjectEndpoint.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/ObjectEndpoint.java rename to src/java.rmi/share/classes/sun/rmi/transport/ObjectEndpoint.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/ObjectTable.java b/src/java.rmi/share/classes/sun/rmi/transport/ObjectTable.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/ObjectTable.java rename to src/java.rmi/share/classes/sun/rmi/transport/ObjectTable.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/StreamRemoteCall.java b/src/java.rmi/share/classes/sun/rmi/transport/StreamRemoteCall.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/StreamRemoteCall.java rename to src/java.rmi/share/classes/sun/rmi/transport/StreamRemoteCall.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/Target.java b/src/java.rmi/share/classes/sun/rmi/transport/Target.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/Target.java rename to src/java.rmi/share/classes/sun/rmi/transport/Target.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/Transport.java b/src/java.rmi/share/classes/sun/rmi/transport/Transport.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/Transport.java rename to src/java.rmi/share/classes/sun/rmi/transport/Transport.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/TransportConstants.java b/src/java.rmi/share/classes/sun/rmi/transport/TransportConstants.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/TransportConstants.java rename to src/java.rmi/share/classes/sun/rmi/transport/TransportConstants.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/WeakRef.java b/src/java.rmi/share/classes/sun/rmi/transport/WeakRef.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/WeakRef.java rename to src/java.rmi/share/classes/sun/rmi/transport/WeakRef.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java rename to src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPConnection.java b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPConnection.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPConnection.java rename to src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPConnection.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPDirectSocketFactory.java b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPDirectSocketFactory.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPDirectSocketFactory.java rename to src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPDirectSocketFactory.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java rename to src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java similarity index 100% rename from jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java rename to src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java diff --git a/jdk/src/java.rmi/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java b/src/java.rmi/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java similarity index 100% rename from jdk/src/java.rmi/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java rename to src/java.rmi/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java diff --git a/jdk/src/java.rmi/share/native/librmi/GC.c b/src/java.rmi/share/native/librmi/GC.c similarity index 100% rename from jdk/src/java.rmi/share/native/librmi/GC.c rename to src/java.rmi/share/native/librmi/GC.c diff --git a/jdk/src/java.scripting/share/classes/com/sun/tools/script/shell/Main.java b/src/java.scripting/share/classes/com/sun/tools/script/shell/Main.java similarity index 100% rename from jdk/src/java.scripting/share/classes/com/sun/tools/script/shell/Main.java rename to src/java.scripting/share/classes/com/sun/tools/script/shell/Main.java diff --git a/jdk/src/java.scripting/share/classes/com/sun/tools/script/shell/init.js b/src/java.scripting/share/classes/com/sun/tools/script/shell/init.js similarity index 100% rename from jdk/src/java.scripting/share/classes/com/sun/tools/script/shell/init.js rename to src/java.scripting/share/classes/com/sun/tools/script/shell/init.js diff --git a/jdk/src/java.scripting/share/classes/com/sun/tools/script/shell/messages.properties b/src/java.scripting/share/classes/com/sun/tools/script/shell/messages.properties similarity index 100% rename from jdk/src/java.scripting/share/classes/com/sun/tools/script/shell/messages.properties rename to src/java.scripting/share/classes/com/sun/tools/script/shell/messages.properties diff --git a/jdk/src/java.scripting/share/classes/javax/script/AbstractScriptEngine.java b/src/java.scripting/share/classes/javax/script/AbstractScriptEngine.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/AbstractScriptEngine.java rename to src/java.scripting/share/classes/javax/script/AbstractScriptEngine.java diff --git a/jdk/src/java.scripting/share/classes/javax/script/Bindings.java b/src/java.scripting/share/classes/javax/script/Bindings.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/Bindings.java rename to src/java.scripting/share/classes/javax/script/Bindings.java diff --git a/jdk/src/java.scripting/share/classes/javax/script/Compilable.java b/src/java.scripting/share/classes/javax/script/Compilable.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/Compilable.java rename to src/java.scripting/share/classes/javax/script/Compilable.java diff --git a/jdk/src/java.scripting/share/classes/javax/script/CompiledScript.java b/src/java.scripting/share/classes/javax/script/CompiledScript.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/CompiledScript.java rename to src/java.scripting/share/classes/javax/script/CompiledScript.java diff --git a/jdk/src/java.scripting/share/classes/javax/script/Invocable.java b/src/java.scripting/share/classes/javax/script/Invocable.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/Invocable.java rename to src/java.scripting/share/classes/javax/script/Invocable.java diff --git a/jdk/src/java.scripting/share/classes/javax/script/ScriptContext.java b/src/java.scripting/share/classes/javax/script/ScriptContext.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/ScriptContext.java rename to src/java.scripting/share/classes/javax/script/ScriptContext.java diff --git a/jdk/src/java.scripting/share/classes/javax/script/ScriptEngine.java b/src/java.scripting/share/classes/javax/script/ScriptEngine.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/ScriptEngine.java rename to src/java.scripting/share/classes/javax/script/ScriptEngine.java diff --git a/jdk/src/java.scripting/share/classes/javax/script/ScriptEngineFactory.java b/src/java.scripting/share/classes/javax/script/ScriptEngineFactory.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/ScriptEngineFactory.java rename to src/java.scripting/share/classes/javax/script/ScriptEngineFactory.java diff --git a/jdk/src/java.scripting/share/classes/javax/script/ScriptEngineManager.java b/src/java.scripting/share/classes/javax/script/ScriptEngineManager.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/ScriptEngineManager.java rename to src/java.scripting/share/classes/javax/script/ScriptEngineManager.java diff --git a/jdk/src/java.scripting/share/classes/javax/script/ScriptException.java b/src/java.scripting/share/classes/javax/script/ScriptException.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/ScriptException.java rename to src/java.scripting/share/classes/javax/script/ScriptException.java diff --git a/jdk/src/java.scripting/share/classes/javax/script/SimpleBindings.java b/src/java.scripting/share/classes/javax/script/SimpleBindings.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/SimpleBindings.java rename to src/java.scripting/share/classes/javax/script/SimpleBindings.java diff --git a/jdk/src/java.scripting/share/classes/javax/script/SimpleScriptContext.java b/src/java.scripting/share/classes/javax/script/SimpleScriptContext.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/SimpleScriptContext.java rename to src/java.scripting/share/classes/javax/script/SimpleScriptContext.java diff --git a/jdk/src/java.scripting/share/classes/javax/script/package-info.java b/src/java.scripting/share/classes/javax/script/package-info.java similarity index 100% rename from jdk/src/java.scripting/share/classes/javax/script/package-info.java rename to src/java.scripting/share/classes/javax/script/package-info.java diff --git a/jdk/src/java.scripting/share/classes/module-info.java b/src/java.scripting/share/classes/module-info.java similarity index 100% rename from jdk/src/java.scripting/share/classes/module-info.java rename to src/java.scripting/share/classes/module-info.java diff --git a/jdk/src/java.se.ee/share/classes/module-info.java b/src/java.se.ee/share/classes/module-info.java similarity index 100% rename from jdk/src/java.se.ee/share/classes/module-info.java rename to src/java.se.ee/share/classes/module-info.java diff --git a/jdk/src/java.se/share/classes/module-info.java b/src/java.se/share/classes/module-info.java similarity index 100% rename from jdk/src/java.se/share/classes/module-info.java rename to src/java.se/share/classes/module-info.java diff --git a/jdk/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m b/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m similarity index 100% rename from jdk/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m rename to src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m diff --git a/jdk/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c b/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c similarity index 100% rename from jdk/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c rename to src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c diff --git a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java rename to src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java diff --git a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/EncryptionKey.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/EncryptionKey.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/EncryptionKey.java rename to src/java.security.jgss/share/classes/javax/security/auth/kerberos/EncryptionKey.java diff --git a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java rename to src/java.security.jgss/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java diff --git a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosCredMessage.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosCredMessage.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosCredMessage.java rename to src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosCredMessage.java diff --git a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java rename to src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java diff --git a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java rename to src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java diff --git a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java rename to src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java diff --git a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java rename to src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java diff --git a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java rename to src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java diff --git a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java rename to src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java diff --git a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/package-info.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/package-info.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/package-info.java rename to src/java.security.jgss/share/classes/javax/security/auth/kerberos/package-info.java diff --git a/jdk/src/java.security.jgss/share/classes/module-info.java b/src/java.security.jgss/share/classes/module-info.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/module-info.java rename to src/java.security.jgss/share/classes/module-info.java diff --git a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/ChannelBinding.java b/src/java.security.jgss/share/classes/org/ietf/jgss/ChannelBinding.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/org/ietf/jgss/ChannelBinding.java rename to src/java.security.jgss/share/classes/org/ietf/jgss/ChannelBinding.java diff --git a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java rename to src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java diff --git a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSCredential.java b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSCredential.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSCredential.java rename to src/java.security.jgss/share/classes/org/ietf/jgss/GSSCredential.java diff --git a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSException.java b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSException.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSException.java rename to src/java.security.jgss/share/classes/org/ietf/jgss/GSSException.java diff --git a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java rename to src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java diff --git a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java rename to src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java diff --git a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/MessageProp.java b/src/java.security.jgss/share/classes/org/ietf/jgss/MessageProp.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/org/ietf/jgss/MessageProp.java rename to src/java.security.jgss/share/classes/org/ietf/jgss/MessageProp.java diff --git a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/Oid.java b/src/java.security.jgss/share/classes/org/ietf/jgss/Oid.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/org/ietf/jgss/Oid.java rename to src/java.security.jgss/share/classes/org/ietf/jgss/Oid.java diff --git a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/package.html b/src/java.security.jgss/share/classes/org/ietf/jgss/package.html similarity index 100% rename from jdk/src/java.security.jgss/share/classes/org/ietf/jgss/package.html rename to src/java.security.jgss/share/classes/org/ietf/jgss/package.html diff --git a/jdk/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java b/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java rename to src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java b/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java rename to src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSCaller.java b/src/java.security.jgss/share/classes/sun/security/jgss/GSSCaller.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSCaller.java rename to src/java.security.jgss/share/classes/sun/security/jgss/GSSCaller.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java b/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java rename to src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSCredentialImpl.java b/src/java.security.jgss/share/classes/sun/security/jgss/GSSCredentialImpl.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSCredentialImpl.java rename to src/java.security.jgss/share/classes/sun/security/jgss/GSSCredentialImpl.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSExceptionImpl.java b/src/java.security.jgss/share/classes/sun/security/jgss/GSSExceptionImpl.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSExceptionImpl.java rename to src/java.security.jgss/share/classes/sun/security/jgss/GSSExceptionImpl.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSHeader.java b/src/java.security.jgss/share/classes/sun/security/jgss/GSSHeader.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSHeader.java rename to src/java.security.jgss/share/classes/sun/security/jgss/GSSHeader.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSManagerImpl.java b/src/java.security.jgss/share/classes/sun/security/jgss/GSSManagerImpl.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSManagerImpl.java rename to src/java.security.jgss/share/classes/sun/security/jgss/GSSManagerImpl.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSNameImpl.java b/src/java.security.jgss/share/classes/sun/security/jgss/GSSNameImpl.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSNameImpl.java rename to src/java.security.jgss/share/classes/sun/security/jgss/GSSNameImpl.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSToken.java b/src/java.security.jgss/share/classes/sun/security/jgss/GSSToken.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSToken.java rename to src/java.security.jgss/share/classes/sun/security/jgss/GSSToken.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSUtil.java b/src/java.security.jgss/share/classes/sun/security/jgss/GSSUtil.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSUtil.java rename to src/java.security.jgss/share/classes/sun/security/jgss/GSSUtil.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/HttpCaller.java b/src/java.security.jgss/share/classes/sun/security/jgss/HttpCaller.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/HttpCaller.java rename to src/java.security.jgss/share/classes/sun/security/jgss/HttpCaller.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/JgssExtender.java b/src/java.security.jgss/share/classes/sun/security/jgss/JgssExtender.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/JgssExtender.java rename to src/java.security.jgss/share/classes/sun/security/jgss/JgssExtender.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/LoginConfigImpl.java b/src/java.security.jgss/share/classes/sun/security/jgss/LoginConfigImpl.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/LoginConfigImpl.java rename to src/java.security.jgss/share/classes/sun/security/jgss/LoginConfigImpl.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/ProviderList.java b/src/java.security.jgss/share/classes/sun/security/jgss/ProviderList.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/ProviderList.java rename to src/java.security.jgss/share/classes/sun/security/jgss/ProviderList.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/SunProvider.java b/src/java.security.jgss/share/classes/sun/security/jgss/SunProvider.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/SunProvider.java rename to src/java.security.jgss/share/classes/sun/security/jgss/SunProvider.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/TokenTracker.java b/src/java.security.jgss/share/classes/sun/security/jgss/TokenTracker.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/TokenTracker.java rename to src/java.security.jgss/share/classes/sun/security/jgss/TokenTracker.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/CipherHelper.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/CipherHelper.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/CipherHelper.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/CipherHelper.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/InitSecContextToken.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/InitSecContextToken.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/InitSecContextToken.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/InitSecContextToken.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/InitialToken.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/InitialToken.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/InitialToken.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/InitialToken.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Context.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Context.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Context.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Context.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5CredElement.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5CredElement.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5CredElement.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5CredElement.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5ProxyCredential.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5ProxyCredential.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5ProxyCredential.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5ProxyCredential.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Token.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Token.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Token.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Token.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Util.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Util.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Util.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Util.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken_v2.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken_v2.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken_v2.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken_v2.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MicToken.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MicToken.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MicToken.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/MicToken.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MicToken_v2.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MicToken_v2.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MicToken_v2.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/MicToken_v2.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/ServiceCreds.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/ServiceCreds.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/ServiceCreds.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/ServiceCreds.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/SubjectComber.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/SubjectComber.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/SubjectComber.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/SubjectComber.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/WrapToken.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/WrapToken.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/WrapToken.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/WrapToken.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/WrapToken_v2.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/WrapToken_v2.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/WrapToken_v2.java rename to src/java.security.jgss/share/classes/sun/security/jgss/krb5/WrapToken_v2.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSContextSpi.java b/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSContextSpi.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSContextSpi.java rename to src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSContextSpi.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java b/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java rename to src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSNameSpi.java b/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSNameSpi.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSNameSpi.java rename to src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSNameSpi.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/MechanismFactory.java b/src/java.security.jgss/share/classes/sun/security/jgss/spi/MechanismFactory.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/MechanismFactory.java rename to src/java.security.jgss/share/classes/sun/security/jgss/spi/MechanismFactory.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/NegTokenInit.java b/src/java.security.jgss/share/classes/sun/security/jgss/spnego/NegTokenInit.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/NegTokenInit.java rename to src/java.security.jgss/share/classes/sun/security/jgss/spnego/NegTokenInit.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/NegTokenTarg.java b/src/java.security.jgss/share/classes/sun/security/jgss/spnego/NegTokenTarg.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/NegTokenTarg.java rename to src/java.security.jgss/share/classes/sun/security/jgss/spnego/NegTokenTarg.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java b/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java rename to src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java b/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java rename to src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java b/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java rename to src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoToken.java b/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoToken.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoToken.java rename to src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoToken.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSCredElement.java b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSCredElement.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSCredElement.java rename to src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSCredElement.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSLibStub.java b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSLibStub.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSLibStub.java rename to src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSLibStub.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSNameElement.java b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSNameElement.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSNameElement.java rename to src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSNameElement.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/Krb5Util.java b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/Krb5Util.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/Krb5Util.java rename to src/java.security.jgss/share/classes/sun/security/jgss/wrapper/Krb5Util.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java rename to src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSFactory.java b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSFactory.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSFactory.java rename to src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSFactory.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java rename to src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Asn1Exception.java b/src/java.security.jgss/share/classes/sun/security/krb5/Asn1Exception.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/Asn1Exception.java rename to src/java.security.jgss/share/classes/sun/security/krb5/Asn1Exception.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Checksum.java b/src/java.security.jgss/share/classes/sun/security/krb5/Checksum.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/Checksum.java rename to src/java.security.jgss/share/classes/sun/security/krb5/Checksum.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java b/src/java.security.jgss/share/classes/sun/security/krb5/Config.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java rename to src/java.security.jgss/share/classes/sun/security/krb5/Config.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Confounder.java b/src/java.security.jgss/share/classes/sun/security/krb5/Confounder.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/Confounder.java rename to src/java.security.jgss/share/classes/sun/security/krb5/Confounder.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java b/src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java rename to src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/EncryptedData.java b/src/java.security.jgss/share/classes/sun/security/krb5/EncryptedData.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/EncryptedData.java rename to src/java.security.jgss/share/classes/sun/security/krb5/EncryptedData.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/EncryptionKey.java b/src/java.security.jgss/share/classes/sun/security/krb5/EncryptionKey.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/EncryptionKey.java rename to src/java.security.jgss/share/classes/sun/security/krb5/EncryptionKey.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java b/src/java.security.jgss/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java rename to src/java.security.jgss/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KdcComm.java b/src/java.security.jgss/share/classes/sun/security/krb5/KdcComm.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KdcComm.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KdcComm.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KerberosSecrets.java b/src/java.security.jgss/share/classes/sun/security/krb5/KerberosSecrets.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KerberosSecrets.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KerberosSecrets.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbApRep.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbApRep.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbApRep.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbApRep.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbApReq.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbApReq.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbApReq.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbApReq.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAppMessage.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbAppMessage.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAppMessage.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbAppMessage.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsRep.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsRep.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsRep.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbAsRep.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReq.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReq.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReq.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReq.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReqBuilder.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReqBuilder.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReqBuilder.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReqBuilder.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbCred.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbCred.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbCred.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbCred.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbCryptoException.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbCryptoException.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbCryptoException.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbCryptoException.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbException.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbException.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbException.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbException.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbKdcRep.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbKdcRep.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbKdcRep.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbKdcRep.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbPriv.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbPriv.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbPriv.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbPriv.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbSafe.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbSafe.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbSafe.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbSafe.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbServiceLocator.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbServiceLocator.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbServiceLocator.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbServiceLocator.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsRep.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsRep.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsRep.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsRep.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsReq.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsReq.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsReq.java rename to src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsReq.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java b/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java rename to src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Realm.java b/src/java.security.jgss/share/classes/sun/security/krb5/Realm.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/Realm.java rename to src/java.security.jgss/share/classes/sun/security/krb5/Realm.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/RealmException.java b/src/java.security.jgss/share/classes/sun/security/krb5/RealmException.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/RealmException.java rename to src/java.security.jgss/share/classes/sun/security/krb5/RealmException.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/SCDynamicStoreConfig.java b/src/java.security.jgss/share/classes/sun/security/krb5/SCDynamicStoreConfig.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/SCDynamicStoreConfig.java rename to src/java.security.jgss/share/classes/sun/security/krb5/SCDynamicStoreConfig.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/APOptions.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/APOptions.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/APOptions.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/APOptions.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/APRep.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/APRep.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/APRep.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/APRep.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/APReq.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/APReq.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/APReq.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/APReq.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ASRep.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ASRep.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ASRep.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ASRep.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ASReq.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ASReq.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ASReq.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ASReq.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthContext.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthContext.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthContext.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthContext.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Authenticator.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/Authenticator.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Authenticator.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/Authenticator.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationData.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationData.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationData.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationData.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ETypeInfo.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ETypeInfo.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ETypeInfo.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ETypeInfo.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ETypeInfo2.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ETypeInfo2.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ETypeInfo2.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ETypeInfo2.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncAPRepPart.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncAPRepPart.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncAPRepPart.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/EncAPRepPart.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncASRepPart.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncASRepPart.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncASRepPart.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/EncASRepPart.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKDCRepPart.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKDCRepPart.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKDCRepPart.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKDCRepPart.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbCredPart.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbCredPart.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbCredPart.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbCredPart.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTGSRepPart.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTGSRepPart.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTGSRepPart.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTGSRepPart.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTicketPart.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTicketPart.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTicketPart.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTicketPart.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddress.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddress.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddress.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddress.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddresses.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddresses.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddresses.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddresses.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCOptions.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCOptions.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCOptions.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCOptions.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCRep.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCRep.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCRep.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCRep.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReq.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReq.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReq.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReq.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReqBody.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReqBody.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReqBody.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReqBody.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBCred.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBCred.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBCred.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBCred.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBError.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBError.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBError.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBError.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBPriv.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBPriv.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBPriv.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBPriv.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBSafe.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBSafe.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBSafe.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBSafe.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBSafeBody.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBSafeBody.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBSafeBody.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBSafeBody.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KdcErrException.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KdcErrException.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KdcErrException.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KdcErrException.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KerberosTime.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KerberosTime.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KerberosTime.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KerberosTime.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbApErrException.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbApErrException.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbApErrException.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbApErrException.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbCredInfo.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbCredInfo.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbCredInfo.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbCredInfo.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbErrException.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbErrException.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbErrException.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbErrException.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LastReq.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/LastReq.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LastReq.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/LastReq.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LastReqEntry.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/LastReqEntry.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LastReqEntry.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/LastReqEntry.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LocalSeqNumber.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/LocalSeqNumber.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LocalSeqNumber.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/LocalSeqNumber.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LoginOptions.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/LoginOptions.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/LoginOptions.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/LoginOptions.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/MethodData.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/MethodData.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/MethodData.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/MethodData.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/NetClient.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/NetClient.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/NetClient.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/NetClient.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAData.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAData.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAData.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/PAData.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAEncTSEnc.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAEncTSEnc.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAEncTSEnc.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/PAEncTSEnc.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAForUserEnc.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAForUserEnc.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAForUserEnc.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/PAForUserEnc.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ReplayCache.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ReplayCache.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ReplayCache.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ReplayCache.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/SeqNumber.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/SeqNumber.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/SeqNumber.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/SeqNumber.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TGSRep.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/TGSRep.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TGSRep.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/TGSRep.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TGSReq.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/TGSReq.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TGSReq.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/TGSReq.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Ticket.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/Ticket.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Ticket.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/Ticket.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TransitedEncoding.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/TransitedEncoding.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/TransitedEncoding.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/TransitedEncoding.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Credentials.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Credentials.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Credentials.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Credentials.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Tag.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Tag.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Tag.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Tag.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes128.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes128.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes128.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes128.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes256.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes256.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes256.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes256.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/CksumType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/CksumType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/CksumType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/CksumType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des3.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des3.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des3.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des3.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcEType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcEType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcEType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcEType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcMd5EType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcMd5EType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcMd5EType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesCbcMd5EType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/EType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/EType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/EType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/EType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Nonce.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Nonce.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Nonce.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/Nonce.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/NullEType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/NullEType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/NullEType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/NullEType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/crc32.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/crc32.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/crc32.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/crc32.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTab.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTab.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTab.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTab.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabOutputStream.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabOutputStream.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabOutputStream.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabOutputStream.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthList.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthList.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthList.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthList.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTimeWithHash.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTimeWithHash.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTimeWithHash.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTimeWithHash.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/MemoryCache.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/MemoryCache.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/MemoryCache.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/MemoryCache.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/KerberosPreMasterSecret.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/KerberosPreMasterSecret.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/KerberosPreMasterSecret.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/KerberosPreMasterSecret.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/Krb5KeyExchangeService.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/Krb5KeyExchangeService.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/Krb5KeyExchangeService.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/Krb5KeyExchangeService.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosFlags.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosFlags.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosFlags.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosFlags.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosString.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosString.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosString.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosString.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java similarity index 100% rename from jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java rename to src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java diff --git a/jdk/src/java.security.jgss/share/native/libj2gss/GSSLibStub.c b/src/java.security.jgss/share/native/libj2gss/GSSLibStub.c similarity index 100% rename from jdk/src/java.security.jgss/share/native/libj2gss/GSSLibStub.c rename to src/java.security.jgss/share/native/libj2gss/GSSLibStub.c diff --git a/jdk/src/java.security.jgss/share/native/libj2gss/NativeUtil.c b/src/java.security.jgss/share/native/libj2gss/NativeUtil.c similarity index 100% rename from jdk/src/java.security.jgss/share/native/libj2gss/NativeUtil.c rename to src/java.security.jgss/share/native/libj2gss/NativeUtil.c diff --git a/jdk/src/java.security.jgss/share/native/libj2gss/NativeUtil.h b/src/java.security.jgss/share/native/libj2gss/NativeUtil.h similarity index 100% rename from jdk/src/java.security.jgss/share/native/libj2gss/NativeUtil.h rename to src/java.security.jgss/share/native/libj2gss/NativeUtil.h diff --git a/jdk/src/java.security.jgss/share/native/libj2gss/gssapi.h b/src/java.security.jgss/share/native/libj2gss/gssapi.h similarity index 100% rename from jdk/src/java.security.jgss/share/native/libj2gss/gssapi.h rename to src/java.security.jgss/share/native/libj2gss/gssapi.h diff --git a/jdk/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c b/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c similarity index 100% rename from jdk/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c rename to src/java.security.jgss/unix/native/libj2gss/NativeFunc.c diff --git a/jdk/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h b/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h similarity index 100% rename from jdk/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h rename to src/java.security.jgss/unix/native/libj2gss/NativeFunc.h diff --git a/jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Kinit.java b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Kinit.java similarity index 100% rename from jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Kinit.java rename to src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Kinit.java diff --git a/jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java similarity index 100% rename from jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java rename to src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java diff --git a/jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java similarity index 100% rename from jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java rename to src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java diff --git a/jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java similarity index 100% rename from jdk/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java rename to src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java diff --git a/jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c b/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c similarity index 100% rename from jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c rename to src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c diff --git a/jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c b/src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c similarity index 100% rename from jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c rename to src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ClientFactoryImpl.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/ClientFactoryImpl.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ClientFactoryImpl.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/ClientFactoryImpl.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Base.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Base.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Base.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Base.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Client.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Client.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Client.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Client.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Server.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Server.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Server.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Server.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ExternalClient.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/ExternalClient.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ExternalClient.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/ExternalClient.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/PlainClient.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/PlainClient.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/PlainClient.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/PlainClient.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/Provider.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/Provider.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/Provider.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/Provider.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ServerFactoryImpl.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/ServerFactoryImpl.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ServerFactoryImpl.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/ServerFactoryImpl.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/FactoryImpl.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/FactoryImpl.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/FactoryImpl.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/digest/FactoryImpl.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/SecurityCtx.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/SecurityCtx.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/SecurityCtx.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/digest/SecurityCtx.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java diff --git a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/util/PolicyUtils.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/util/PolicyUtils.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/util/PolicyUtils.java rename to src/java.security.sasl/share/classes/com/sun/security/sasl/util/PolicyUtils.java diff --git a/jdk/src/java.security.sasl/share/classes/javax/security/sasl/AuthenticationException.java b/src/java.security.sasl/share/classes/javax/security/sasl/AuthenticationException.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/javax/security/sasl/AuthenticationException.java rename to src/java.security.sasl/share/classes/javax/security/sasl/AuthenticationException.java diff --git a/jdk/src/java.security.sasl/share/classes/javax/security/sasl/AuthorizeCallback.java b/src/java.security.sasl/share/classes/javax/security/sasl/AuthorizeCallback.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/javax/security/sasl/AuthorizeCallback.java rename to src/java.security.sasl/share/classes/javax/security/sasl/AuthorizeCallback.java diff --git a/jdk/src/java.security.sasl/share/classes/javax/security/sasl/RealmCallback.java b/src/java.security.sasl/share/classes/javax/security/sasl/RealmCallback.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/javax/security/sasl/RealmCallback.java rename to src/java.security.sasl/share/classes/javax/security/sasl/RealmCallback.java diff --git a/jdk/src/java.security.sasl/share/classes/javax/security/sasl/RealmChoiceCallback.java b/src/java.security.sasl/share/classes/javax/security/sasl/RealmChoiceCallback.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/javax/security/sasl/RealmChoiceCallback.java rename to src/java.security.sasl/share/classes/javax/security/sasl/RealmChoiceCallback.java diff --git a/jdk/src/java.security.sasl/share/classes/javax/security/sasl/Sasl.java b/src/java.security.sasl/share/classes/javax/security/sasl/Sasl.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/javax/security/sasl/Sasl.java rename to src/java.security.sasl/share/classes/javax/security/sasl/Sasl.java diff --git a/jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslClient.java b/src/java.security.sasl/share/classes/javax/security/sasl/SaslClient.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslClient.java rename to src/java.security.sasl/share/classes/javax/security/sasl/SaslClient.java diff --git a/jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslClientFactory.java b/src/java.security.sasl/share/classes/javax/security/sasl/SaslClientFactory.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslClientFactory.java rename to src/java.security.sasl/share/classes/javax/security/sasl/SaslClientFactory.java diff --git a/jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslException.java b/src/java.security.sasl/share/classes/javax/security/sasl/SaslException.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslException.java rename to src/java.security.sasl/share/classes/javax/security/sasl/SaslException.java diff --git a/jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslServer.java b/src/java.security.sasl/share/classes/javax/security/sasl/SaslServer.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslServer.java rename to src/java.security.sasl/share/classes/javax/security/sasl/SaslServer.java diff --git a/jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslServerFactory.java b/src/java.security.sasl/share/classes/javax/security/sasl/SaslServerFactory.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/javax/security/sasl/SaslServerFactory.java rename to src/java.security.sasl/share/classes/javax/security/sasl/SaslServerFactory.java diff --git a/jdk/src/java.security.sasl/share/classes/javax/security/sasl/package-info.java b/src/java.security.sasl/share/classes/javax/security/sasl/package-info.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/javax/security/sasl/package-info.java rename to src/java.security.sasl/share/classes/javax/security/sasl/package-info.java diff --git a/jdk/src/java.security.sasl/share/classes/module-info.java b/src/java.security.sasl/share/classes/module-info.java similarity index 100% rename from jdk/src/java.security.sasl/share/classes/module-info.java rename to src/java.security.sasl/share/classes/module-info.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/ATR.java b/src/java.smartcardio/share/classes/javax/smartcardio/ATR.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/ATR.java rename to src/java.smartcardio/share/classes/javax/smartcardio/ATR.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/Card.java b/src/java.smartcardio/share/classes/javax/smartcardio/Card.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/Card.java rename to src/java.smartcardio/share/classes/javax/smartcardio/Card.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardChannel.java b/src/java.smartcardio/share/classes/javax/smartcardio/CardChannel.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardChannel.java rename to src/java.smartcardio/share/classes/javax/smartcardio/CardChannel.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardException.java b/src/java.smartcardio/share/classes/javax/smartcardio/CardException.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardException.java rename to src/java.smartcardio/share/classes/javax/smartcardio/CardException.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardNotPresentException.java b/src/java.smartcardio/share/classes/javax/smartcardio/CardNotPresentException.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardNotPresentException.java rename to src/java.smartcardio/share/classes/javax/smartcardio/CardNotPresentException.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardPermission.java b/src/java.smartcardio/share/classes/javax/smartcardio/CardPermission.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardPermission.java rename to src/java.smartcardio/share/classes/javax/smartcardio/CardPermission.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardTerminal.java b/src/java.smartcardio/share/classes/javax/smartcardio/CardTerminal.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardTerminal.java rename to src/java.smartcardio/share/classes/javax/smartcardio/CardTerminal.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardTerminals.java b/src/java.smartcardio/share/classes/javax/smartcardio/CardTerminals.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/CardTerminals.java rename to src/java.smartcardio/share/classes/javax/smartcardio/CardTerminals.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/CommandAPDU.java b/src/java.smartcardio/share/classes/javax/smartcardio/CommandAPDU.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/CommandAPDU.java rename to src/java.smartcardio/share/classes/javax/smartcardio/CommandAPDU.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/ResponseAPDU.java b/src/java.smartcardio/share/classes/javax/smartcardio/ResponseAPDU.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/ResponseAPDU.java rename to src/java.smartcardio/share/classes/javax/smartcardio/ResponseAPDU.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/TerminalFactory.java b/src/java.smartcardio/share/classes/javax/smartcardio/TerminalFactory.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/TerminalFactory.java rename to src/java.smartcardio/share/classes/javax/smartcardio/TerminalFactory.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/TerminalFactorySpi.java b/src/java.smartcardio/share/classes/javax/smartcardio/TerminalFactorySpi.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/TerminalFactorySpi.java rename to src/java.smartcardio/share/classes/javax/smartcardio/TerminalFactorySpi.java diff --git a/jdk/src/java.smartcardio/share/classes/javax/smartcardio/package.html b/src/java.smartcardio/share/classes/javax/smartcardio/package.html similarity index 100% rename from jdk/src/java.smartcardio/share/classes/javax/smartcardio/package.html rename to src/java.smartcardio/share/classes/javax/smartcardio/package.html diff --git a/jdk/src/java.smartcardio/share/classes/module-info.java b/src/java.smartcardio/share/classes/module-info.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/module-info.java rename to src/java.smartcardio/share/classes/module-info.java diff --git a/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java b/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java rename to src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java diff --git a/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/ChannelImpl.java b/src/java.smartcardio/share/classes/sun/security/smartcardio/ChannelImpl.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/ChannelImpl.java rename to src/java.smartcardio/share/classes/sun/security/smartcardio/ChannelImpl.java diff --git a/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSC.java b/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSC.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSC.java rename to src/java.smartcardio/share/classes/sun/security/smartcardio/PCSC.java diff --git a/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSCException.java b/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSCException.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSCException.java rename to src/java.smartcardio/share/classes/sun/security/smartcardio/PCSCException.java diff --git a/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSCTerminals.java b/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSCTerminals.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/PCSCTerminals.java rename to src/java.smartcardio/share/classes/sun/security/smartcardio/PCSCTerminals.java diff --git a/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/SunPCSC.java b/src/java.smartcardio/share/classes/sun/security/smartcardio/SunPCSC.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/SunPCSC.java rename to src/java.smartcardio/share/classes/sun/security/smartcardio/SunPCSC.java diff --git a/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/TerminalImpl.java b/src/java.smartcardio/share/classes/sun/security/smartcardio/TerminalImpl.java similarity index 100% rename from jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/TerminalImpl.java rename to src/java.smartcardio/share/classes/sun/security/smartcardio/TerminalImpl.java diff --git a/jdk/src/java.smartcardio/share/native/libj2pcsc/pcsc.c b/src/java.smartcardio/share/native/libj2pcsc/pcsc.c similarity index 100% rename from jdk/src/java.smartcardio/share/native/libj2pcsc/pcsc.c rename to src/java.smartcardio/share/native/libj2pcsc/pcsc.c diff --git a/jdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java similarity index 100% rename from jdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java rename to src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java diff --git a/jdk/src/java.smartcardio/unix/legal/pcsclite.md b/src/java.smartcardio/unix/legal/pcsclite.md similarity index 100% rename from jdk/src/java.smartcardio/unix/legal/pcsclite.md rename to src/java.smartcardio/unix/legal/pcsclite.md diff --git a/jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/COPYING b/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/COPYING similarity index 100% rename from jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/COPYING rename to src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/COPYING diff --git a/jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/pcsclite.h b/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/pcsclite.h similarity index 100% rename from jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/pcsclite.h rename to src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/pcsclite.h diff --git a/jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/winscard.h b/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/winscard.h similarity index 100% rename from jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/winscard.h rename to src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/winscard.h diff --git a/jdk/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c b/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c similarity index 100% rename from jdk/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c rename to src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c diff --git a/jdk/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h b/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h similarity index 100% rename from jdk/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h rename to src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h diff --git a/jdk/src/java.smartcardio/windows/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/windows/classes/sun/security/smartcardio/PlatformPCSC.java similarity index 100% rename from jdk/src/java.smartcardio/windows/classes/sun/security/smartcardio/PlatformPCSC.java rename to src/java.smartcardio/windows/classes/sun/security/smartcardio/PlatformPCSC.java diff --git a/jdk/src/java.smartcardio/windows/native/libj2pcsc/pcsc_md.c b/src/java.smartcardio/windows/native/libj2pcsc/pcsc_md.c similarity index 100% rename from jdk/src/java.smartcardio/windows/native/libj2pcsc/pcsc_md.c rename to src/java.smartcardio/windows/native/libj2pcsc/pcsc_md.c diff --git a/jdk/src/java.smartcardio/windows/native/libj2pcsc/pcsc_md.h b/src/java.smartcardio/windows/native/libj2pcsc/pcsc_md.h similarity index 100% rename from jdk/src/java.smartcardio/windows/native/libj2pcsc/pcsc_md.h rename to src/java.smartcardio/windows/native/libj2pcsc/pcsc_md.h diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java b/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java b/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetImpl.java b/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetImpl.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetImpl.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetImpl.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java b/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java b/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetFactoryImpl.java b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetFactoryImpl.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetFactoryImpl.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/RowSetFactoryImpl.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties rename to src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties rename to src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties rename to src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties rename to src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties rename to src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties rename to src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties rename to src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties rename to src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties rename to src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties rename to src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties rename to src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/WebRowSetImpl.java b/src/java.sql.rowset/share/classes/com/sun/rowset/WebRowSetImpl.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/WebRowSetImpl.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/WebRowSetImpl.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/BaseRow.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/BaseRow.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/BaseRow.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/internal/BaseRow.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetReader.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetReader.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetReader.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetReader.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/InsertRow.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/InsertRow.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/InsertRow.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/internal/InsertRow.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/Row.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/Row.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/Row.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/internal/Row.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/SyncResolverImpl.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/SyncResolverImpl.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/SyncResolverImpl.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/internal/SyncResolverImpl.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlErrorHandler.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlErrorHandler.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlErrorHandler.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlErrorHandler.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlResolver.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlResolver.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlResolver.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlResolver.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/package.html b/src/java.sql.rowset/share/classes/com/sun/rowset/package.html similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/package.html rename to src/java.sql.rowset/share/classes/com/sun/rowset/package.html diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java b/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIXMLProvider.java b/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIXMLProvider.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIXMLProvider.java rename to src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIXMLProvider.java diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/package.html b/src/java.sql.rowset/share/classes/com/sun/rowset/providers/package.html similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/package.html rename to src/java.sql.rowset/share/classes/com/sun/rowset/providers/package.html diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetFactory.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetFactory.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetFactory.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetFactory.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetProvider.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetProvider.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetProvider.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetProvider.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html b/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html rename to src/java.sql.rowset/share/classes/javax/sql/rowset/package.html diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/rowset.properties b/src/java.sql.rowset/share/classes/javax/sql/rowset/rowset.properties similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/rowset.properties rename to src/java.sql.rowset/share/classes/javax/sql/rowset/rowset.properties diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLInputImpl.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLInputImpl.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLInputImpl.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLInputImpl.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialException.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialException.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialException.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialException.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html rename to src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactoryException.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactoryException.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactoryException.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactoryException.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProviderException.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProviderException.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProviderException.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProviderException.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncResolver.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncResolver.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncResolver.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncResolver.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/TransactionalWriter.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/TransactionalWriter.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/TransactionalWriter.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/spi/TransactionalWriter.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/XmlReader.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/XmlReader.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/XmlReader.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/spi/XmlReader.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/XmlWriter.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/XmlWriter.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/XmlWriter.java rename to src/java.sql.rowset/share/classes/javax/sql/rowset/spi/XmlWriter.java diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html rename to src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/sqlxml.xsd b/src/java.sql.rowset/share/classes/javax/sql/rowset/sqlxml.xsd similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/sqlxml.xsd rename to src/java.sql.rowset/share/classes/javax/sql/rowset/sqlxml.xsd diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/webrowset.xsd b/src/java.sql.rowset/share/classes/javax/sql/rowset/webrowset.xsd similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/webrowset.xsd rename to src/java.sql.rowset/share/classes/javax/sql/rowset/webrowset.xsd diff --git a/jdk/src/java.sql.rowset/share/classes/module-info.java b/src/java.sql.rowset/share/classes/module-info.java similarity index 100% rename from jdk/src/java.sql.rowset/share/classes/module-info.java rename to src/java.sql.rowset/share/classes/module-info.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Array.java b/src/java.sql/share/classes/java/sql/Array.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Array.java rename to src/java.sql/share/classes/java/sql/Array.java diff --git a/jdk/src/java.sql/share/classes/java/sql/BatchUpdateException.java b/src/java.sql/share/classes/java/sql/BatchUpdateException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/BatchUpdateException.java rename to src/java.sql/share/classes/java/sql/BatchUpdateException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Blob.java b/src/java.sql/share/classes/java/sql/Blob.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Blob.java rename to src/java.sql/share/classes/java/sql/Blob.java diff --git a/jdk/src/java.sql/share/classes/java/sql/CallableStatement.java b/src/java.sql/share/classes/java/sql/CallableStatement.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/CallableStatement.java rename to src/java.sql/share/classes/java/sql/CallableStatement.java diff --git a/jdk/src/java.sql/share/classes/java/sql/ClientInfoStatus.java b/src/java.sql/share/classes/java/sql/ClientInfoStatus.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/ClientInfoStatus.java rename to src/java.sql/share/classes/java/sql/ClientInfoStatus.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Clob.java b/src/java.sql/share/classes/java/sql/Clob.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Clob.java rename to src/java.sql/share/classes/java/sql/Clob.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Connection.java b/src/java.sql/share/classes/java/sql/Connection.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Connection.java rename to src/java.sql/share/classes/java/sql/Connection.java diff --git a/jdk/src/java.sql/share/classes/java/sql/ConnectionBuilder.java b/src/java.sql/share/classes/java/sql/ConnectionBuilder.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/ConnectionBuilder.java rename to src/java.sql/share/classes/java/sql/ConnectionBuilder.java diff --git a/jdk/src/java.sql/share/classes/java/sql/DataTruncation.java b/src/java.sql/share/classes/java/sql/DataTruncation.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/DataTruncation.java rename to src/java.sql/share/classes/java/sql/DataTruncation.java diff --git a/jdk/src/java.sql/share/classes/java/sql/DatabaseMetaData.java b/src/java.sql/share/classes/java/sql/DatabaseMetaData.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/DatabaseMetaData.java rename to src/java.sql/share/classes/java/sql/DatabaseMetaData.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Date.java b/src/java.sql/share/classes/java/sql/Date.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Date.java rename to src/java.sql/share/classes/java/sql/Date.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Driver.java b/src/java.sql/share/classes/java/sql/Driver.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Driver.java rename to src/java.sql/share/classes/java/sql/Driver.java diff --git a/jdk/src/java.sql/share/classes/java/sql/DriverAction.java b/src/java.sql/share/classes/java/sql/DriverAction.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/DriverAction.java rename to src/java.sql/share/classes/java/sql/DriverAction.java diff --git a/jdk/src/java.sql/share/classes/java/sql/DriverManager.java b/src/java.sql/share/classes/java/sql/DriverManager.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/DriverManager.java rename to src/java.sql/share/classes/java/sql/DriverManager.java diff --git a/jdk/src/java.sql/share/classes/java/sql/DriverPropertyInfo.java b/src/java.sql/share/classes/java/sql/DriverPropertyInfo.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/DriverPropertyInfo.java rename to src/java.sql/share/classes/java/sql/DriverPropertyInfo.java diff --git a/jdk/src/java.sql/share/classes/java/sql/JDBCType.java b/src/java.sql/share/classes/java/sql/JDBCType.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/JDBCType.java rename to src/java.sql/share/classes/java/sql/JDBCType.java diff --git a/jdk/src/java.sql/share/classes/java/sql/NClob.java b/src/java.sql/share/classes/java/sql/NClob.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/NClob.java rename to src/java.sql/share/classes/java/sql/NClob.java diff --git a/jdk/src/java.sql/share/classes/java/sql/ParameterMetaData.java b/src/java.sql/share/classes/java/sql/ParameterMetaData.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/ParameterMetaData.java rename to src/java.sql/share/classes/java/sql/ParameterMetaData.java diff --git a/jdk/src/java.sql/share/classes/java/sql/PreparedStatement.java b/src/java.sql/share/classes/java/sql/PreparedStatement.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/PreparedStatement.java rename to src/java.sql/share/classes/java/sql/PreparedStatement.java diff --git a/jdk/src/java.sql/share/classes/java/sql/PseudoColumnUsage.java b/src/java.sql/share/classes/java/sql/PseudoColumnUsage.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/PseudoColumnUsage.java rename to src/java.sql/share/classes/java/sql/PseudoColumnUsage.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Ref.java b/src/java.sql/share/classes/java/sql/Ref.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Ref.java rename to src/java.sql/share/classes/java/sql/Ref.java diff --git a/jdk/src/java.sql/share/classes/java/sql/ResultSet.java b/src/java.sql/share/classes/java/sql/ResultSet.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/ResultSet.java rename to src/java.sql/share/classes/java/sql/ResultSet.java diff --git a/jdk/src/java.sql/share/classes/java/sql/ResultSetMetaData.java b/src/java.sql/share/classes/java/sql/ResultSetMetaData.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/ResultSetMetaData.java rename to src/java.sql/share/classes/java/sql/ResultSetMetaData.java diff --git a/jdk/src/java.sql/share/classes/java/sql/RowId.java b/src/java.sql/share/classes/java/sql/RowId.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/RowId.java rename to src/java.sql/share/classes/java/sql/RowId.java diff --git a/jdk/src/java.sql/share/classes/java/sql/RowIdLifetime.java b/src/java.sql/share/classes/java/sql/RowIdLifetime.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/RowIdLifetime.java rename to src/java.sql/share/classes/java/sql/RowIdLifetime.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLClientInfoException.java b/src/java.sql/share/classes/java/sql/SQLClientInfoException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLClientInfoException.java rename to src/java.sql/share/classes/java/sql/SQLClientInfoException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLData.java b/src/java.sql/share/classes/java/sql/SQLData.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLData.java rename to src/java.sql/share/classes/java/sql/SQLData.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLDataException.java b/src/java.sql/share/classes/java/sql/SQLDataException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLDataException.java rename to src/java.sql/share/classes/java/sql/SQLDataException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLException.java b/src/java.sql/share/classes/java/sql/SQLException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLException.java rename to src/java.sql/share/classes/java/sql/SQLException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLFeatureNotSupportedException.java b/src/java.sql/share/classes/java/sql/SQLFeatureNotSupportedException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLFeatureNotSupportedException.java rename to src/java.sql/share/classes/java/sql/SQLFeatureNotSupportedException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLInput.java b/src/java.sql/share/classes/java/sql/SQLInput.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLInput.java rename to src/java.sql/share/classes/java/sql/SQLInput.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLIntegrityConstraintViolationException.java b/src/java.sql/share/classes/java/sql/SQLIntegrityConstraintViolationException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLIntegrityConstraintViolationException.java rename to src/java.sql/share/classes/java/sql/SQLIntegrityConstraintViolationException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java b/src/java.sql/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java rename to src/java.sql/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLNonTransientConnectionException.java b/src/java.sql/share/classes/java/sql/SQLNonTransientConnectionException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLNonTransientConnectionException.java rename to src/java.sql/share/classes/java/sql/SQLNonTransientConnectionException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLNonTransientException.java b/src/java.sql/share/classes/java/sql/SQLNonTransientException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLNonTransientException.java rename to src/java.sql/share/classes/java/sql/SQLNonTransientException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLOutput.java b/src/java.sql/share/classes/java/sql/SQLOutput.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLOutput.java rename to src/java.sql/share/classes/java/sql/SQLOutput.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLPermission.java b/src/java.sql/share/classes/java/sql/SQLPermission.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLPermission.java rename to src/java.sql/share/classes/java/sql/SQLPermission.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLRecoverableException.java b/src/java.sql/share/classes/java/sql/SQLRecoverableException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLRecoverableException.java rename to src/java.sql/share/classes/java/sql/SQLRecoverableException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLSyntaxErrorException.java b/src/java.sql/share/classes/java/sql/SQLSyntaxErrorException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLSyntaxErrorException.java rename to src/java.sql/share/classes/java/sql/SQLSyntaxErrorException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLTimeoutException.java b/src/java.sql/share/classes/java/sql/SQLTimeoutException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLTimeoutException.java rename to src/java.sql/share/classes/java/sql/SQLTimeoutException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLTransactionRollbackException.java b/src/java.sql/share/classes/java/sql/SQLTransactionRollbackException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLTransactionRollbackException.java rename to src/java.sql/share/classes/java/sql/SQLTransactionRollbackException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLTransientConnectionException.java b/src/java.sql/share/classes/java/sql/SQLTransientConnectionException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLTransientConnectionException.java rename to src/java.sql/share/classes/java/sql/SQLTransientConnectionException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLTransientException.java b/src/java.sql/share/classes/java/sql/SQLTransientException.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLTransientException.java rename to src/java.sql/share/classes/java/sql/SQLTransientException.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLType.java b/src/java.sql/share/classes/java/sql/SQLType.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLType.java rename to src/java.sql/share/classes/java/sql/SQLType.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLWarning.java b/src/java.sql/share/classes/java/sql/SQLWarning.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLWarning.java rename to src/java.sql/share/classes/java/sql/SQLWarning.java diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLXML.java b/src/java.sql/share/classes/java/sql/SQLXML.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/SQLXML.java rename to src/java.sql/share/classes/java/sql/SQLXML.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Savepoint.java b/src/java.sql/share/classes/java/sql/Savepoint.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Savepoint.java rename to src/java.sql/share/classes/java/sql/Savepoint.java diff --git a/jdk/src/java.sql/share/classes/java/sql/ShardingKey.java b/src/java.sql/share/classes/java/sql/ShardingKey.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/ShardingKey.java rename to src/java.sql/share/classes/java/sql/ShardingKey.java diff --git a/jdk/src/java.sql/share/classes/java/sql/ShardingKeyBuilder.java b/src/java.sql/share/classes/java/sql/ShardingKeyBuilder.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/ShardingKeyBuilder.java rename to src/java.sql/share/classes/java/sql/ShardingKeyBuilder.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Statement.java b/src/java.sql/share/classes/java/sql/Statement.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Statement.java rename to src/java.sql/share/classes/java/sql/Statement.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Struct.java b/src/java.sql/share/classes/java/sql/Struct.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Struct.java rename to src/java.sql/share/classes/java/sql/Struct.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Time.java b/src/java.sql/share/classes/java/sql/Time.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Time.java rename to src/java.sql/share/classes/java/sql/Time.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Timestamp.java b/src/java.sql/share/classes/java/sql/Timestamp.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Timestamp.java rename to src/java.sql/share/classes/java/sql/Timestamp.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Types.java b/src/java.sql/share/classes/java/sql/Types.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Types.java rename to src/java.sql/share/classes/java/sql/Types.java diff --git a/jdk/src/java.sql/share/classes/java/sql/Wrapper.java b/src/java.sql/share/classes/java/sql/Wrapper.java similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/Wrapper.java rename to src/java.sql/share/classes/java/sql/Wrapper.java diff --git a/jdk/src/java.sql/share/classes/java/sql/package.html b/src/java.sql/share/classes/java/sql/package.html similarity index 100% rename from jdk/src/java.sql/share/classes/java/sql/package.html rename to src/java.sql/share/classes/java/sql/package.html diff --git a/jdk/src/java.sql/share/classes/javax/sql/CommonDataSource.java b/src/java.sql/share/classes/javax/sql/CommonDataSource.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/CommonDataSource.java rename to src/java.sql/share/classes/javax/sql/CommonDataSource.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/ConnectionEvent.java b/src/java.sql/share/classes/javax/sql/ConnectionEvent.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/ConnectionEvent.java rename to src/java.sql/share/classes/javax/sql/ConnectionEvent.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/ConnectionEventListener.java b/src/java.sql/share/classes/javax/sql/ConnectionEventListener.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/ConnectionEventListener.java rename to src/java.sql/share/classes/javax/sql/ConnectionEventListener.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/ConnectionPoolDataSource.java b/src/java.sql/share/classes/javax/sql/ConnectionPoolDataSource.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/ConnectionPoolDataSource.java rename to src/java.sql/share/classes/javax/sql/ConnectionPoolDataSource.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/DataSource.java b/src/java.sql/share/classes/javax/sql/DataSource.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/DataSource.java rename to src/java.sql/share/classes/javax/sql/DataSource.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/PooledConnection.java b/src/java.sql/share/classes/javax/sql/PooledConnection.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/PooledConnection.java rename to src/java.sql/share/classes/javax/sql/PooledConnection.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/PooledConnectionBuilder.java b/src/java.sql/share/classes/javax/sql/PooledConnectionBuilder.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/PooledConnectionBuilder.java rename to src/java.sql/share/classes/javax/sql/PooledConnectionBuilder.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/RowSet.java b/src/java.sql/share/classes/javax/sql/RowSet.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/RowSet.java rename to src/java.sql/share/classes/javax/sql/RowSet.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/RowSetEvent.java b/src/java.sql/share/classes/javax/sql/RowSetEvent.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/RowSetEvent.java rename to src/java.sql/share/classes/javax/sql/RowSetEvent.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/RowSetInternal.java b/src/java.sql/share/classes/javax/sql/RowSetInternal.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/RowSetInternal.java rename to src/java.sql/share/classes/javax/sql/RowSetInternal.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/RowSetListener.java b/src/java.sql/share/classes/javax/sql/RowSetListener.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/RowSetListener.java rename to src/java.sql/share/classes/javax/sql/RowSetListener.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/RowSetMetaData.java b/src/java.sql/share/classes/javax/sql/RowSetMetaData.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/RowSetMetaData.java rename to src/java.sql/share/classes/javax/sql/RowSetMetaData.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/RowSetReader.java b/src/java.sql/share/classes/javax/sql/RowSetReader.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/RowSetReader.java rename to src/java.sql/share/classes/javax/sql/RowSetReader.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/RowSetWriter.java b/src/java.sql/share/classes/javax/sql/RowSetWriter.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/RowSetWriter.java rename to src/java.sql/share/classes/javax/sql/RowSetWriter.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/StatementEvent.java b/src/java.sql/share/classes/javax/sql/StatementEvent.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/StatementEvent.java rename to src/java.sql/share/classes/javax/sql/StatementEvent.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/StatementEventListener.java b/src/java.sql/share/classes/javax/sql/StatementEventListener.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/StatementEventListener.java rename to src/java.sql/share/classes/javax/sql/StatementEventListener.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/XAConnection.java b/src/java.sql/share/classes/javax/sql/XAConnection.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/XAConnection.java rename to src/java.sql/share/classes/javax/sql/XAConnection.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/XAConnectionBuilder.java b/src/java.sql/share/classes/javax/sql/XAConnectionBuilder.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/XAConnectionBuilder.java rename to src/java.sql/share/classes/javax/sql/XAConnectionBuilder.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/XADataSource.java b/src/java.sql/share/classes/javax/sql/XADataSource.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/XADataSource.java rename to src/java.sql/share/classes/javax/sql/XADataSource.java diff --git a/jdk/src/java.sql/share/classes/javax/sql/package.html b/src/java.sql/share/classes/javax/sql/package.html similarity index 100% rename from jdk/src/java.sql/share/classes/javax/sql/package.html rename to src/java.sql/share/classes/javax/sql/package.html diff --git a/jdk/src/java.sql/share/classes/javax/transaction/xa/XAException.java b/src/java.sql/share/classes/javax/transaction/xa/XAException.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/transaction/xa/XAException.java rename to src/java.sql/share/classes/javax/transaction/xa/XAException.java diff --git a/jdk/src/java.sql/share/classes/javax/transaction/xa/XAResource.java b/src/java.sql/share/classes/javax/transaction/xa/XAResource.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/transaction/xa/XAResource.java rename to src/java.sql/share/classes/javax/transaction/xa/XAResource.java diff --git a/jdk/src/java.sql/share/classes/javax/transaction/xa/Xid.java b/src/java.sql/share/classes/javax/transaction/xa/Xid.java similarity index 100% rename from jdk/src/java.sql/share/classes/javax/transaction/xa/Xid.java rename to src/java.sql/share/classes/javax/transaction/xa/Xid.java diff --git a/jdk/src/java.sql/share/classes/javax/transaction/xa/package.html b/src/java.sql/share/classes/javax/transaction/xa/package.html similarity index 100% rename from jdk/src/java.sql/share/classes/javax/transaction/xa/package.html rename to src/java.sql/share/classes/javax/transaction/xa/package.html diff --git a/jdk/src/java.sql/share/classes/module-info.java b/src/java.sql/share/classes/module-info.java similarity index 100% rename from jdk/src/java.sql/share/classes/module-info.java rename to src/java.sql/share/classes/module-info.java diff --git a/jdk/src/java.transaction/share/classes/javax/transaction/InvalidTransactionException.java b/src/java.transaction/share/classes/javax/transaction/InvalidTransactionException.java similarity index 100% rename from jdk/src/java.transaction/share/classes/javax/transaction/InvalidTransactionException.java rename to src/java.transaction/share/classes/javax/transaction/InvalidTransactionException.java diff --git a/jdk/src/java.transaction/share/classes/javax/transaction/TransactionRequiredException.java b/src/java.transaction/share/classes/javax/transaction/TransactionRequiredException.java similarity index 100% rename from jdk/src/java.transaction/share/classes/javax/transaction/TransactionRequiredException.java rename to src/java.transaction/share/classes/javax/transaction/TransactionRequiredException.java diff --git a/jdk/src/java.transaction/share/classes/javax/transaction/TransactionRolledbackException.java b/src/java.transaction/share/classes/javax/transaction/TransactionRolledbackException.java similarity index 100% rename from jdk/src/java.transaction/share/classes/javax/transaction/TransactionRolledbackException.java rename to src/java.transaction/share/classes/javax/transaction/TransactionRolledbackException.java diff --git a/jdk/src/java.transaction/share/classes/javax/transaction/package.html b/src/java.transaction/share/classes/javax/transaction/package.html similarity index 100% rename from jdk/src/java.transaction/share/classes/javax/transaction/package.html rename to src/java.transaction/share/classes/javax/transaction/package.html diff --git a/jdk/src/java.transaction/share/classes/module-info.java b/src/java.transaction/share/classes/module-info.java similarity index 100% rename from jdk/src/java.transaction/share/classes/module-info.java rename to src/java.transaction/share/classes/module-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Builder.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/Builder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Builder.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/Builder.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/ByteArrayDataSource.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/ByteArrayDataSource.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/ByteArrayDataSource.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/ByteArrayDataSource.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/FinalArrayList.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/FinalArrayList.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/FinalArrayList.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/FinalArrayList.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/FragmentContentHandler.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/FragmentContentHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/FragmentContentHandler.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/FragmentContentHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Interned.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/Interned.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Interned.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/Interned.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/NotNull.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/NotNull.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/NotNull.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/NotNull.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Nullable.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/Nullable.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Nullable.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/Nullable.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Pool.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/Pool.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/Pool.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/Pool.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/SAXException2.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/SAXException2.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/SAXException2.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/SAXException2.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/SAXParseException2.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/SAXParseException2.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/SAXParseException2.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/SAXParseException2.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/XMLStreamException2.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/XMLStreamException2.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/XMLStreamException2.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/XMLStreamException2.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizable.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizable.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizable.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizable.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizer.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizer.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/NullLocalizable.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/NullLocalizable.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/NullLocalizable.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/localization/NullLocalizable.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/package-info.java b/src/java.xml.bind/share/classes/com/sun/istack/internal/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/package-info.java rename to src/java.xml.bind/share/classes/com/sun/istack/internal/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/InternalAccessorFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/InternalAccessorFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/InternalAccessorFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/InternalAccessorFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Locatable.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Locatable.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Locatable.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Locatable.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_de.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_de.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_de.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_de.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_es.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_es.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_es.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_es.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_fr.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_fr.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_fr.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_fr.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_it.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_it.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_it.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_it.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_ja.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_ja.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_ja.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_ja.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_ko.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_ko.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_ko.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_ko.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_pt_BR.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_pt_BR.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_pt_BR.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_zh_CN.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_zh_CN.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_zh_CN.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_zh_TW.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_zh_TW.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Messages_zh_TW.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Util.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Util.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Util.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/Util.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/AccessorException.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/AccessorException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/AccessorException.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/AccessorException.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Bridge.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Bridge.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Bridge.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Bridge.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_de.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_de.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_de.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_de.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_es.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_es.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_es.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_es.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_fr.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_fr.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_fr.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_fr.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_it.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_it.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_it.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_it.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_ja.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_ja.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_ja.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_ja.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_ko.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_ko.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_ko.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_ko.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_pt_BR.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_pt_BR.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_pt_BR.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_zh_CN.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_zh_CN.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_zh_CN.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_zh_TW.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_zh_TW.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Messages_zh_TW.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/TypeReference.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/TypeReference.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/TypeReference.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/TypeReference.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Utils.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Utils.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Utils.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/Utils.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_de.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_de.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_de.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_de.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_es.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_es.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_es.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_es.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_fr.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_fr.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_fr.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_fr.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_it.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_it.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_it.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_it.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_ja.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_ja.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_ja.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_ja.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_ko.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_ko.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_ko.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_ko.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_pt_BR.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_pt_BR.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_pt_BR.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_zh_CN.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_zh_CN.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_zh_CN.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_zh_TW.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_zh_TW.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/Messages_zh_TW.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_de.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_de.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_de.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_de.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_es.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_es.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_es.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_es.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_fr.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_fr.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_fr.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_fr.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_it.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_it.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_it.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_it.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_ja.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_ja.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_ja.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_ja.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_ko.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_ko.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_ko.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_ko.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_pt_BR.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_pt_BR.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_pt_BR.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_CN.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_CN.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_CN.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_TW.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_TW.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages_zh_TW.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/SecureLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/SecureLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/SecureLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/SecureLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/Which.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/Which.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/Which.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/util/Which.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_de.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_de.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_de.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_de.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_es.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_es.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_es.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_es.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_fr.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_fr.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_fr.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_fr.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_it.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_it.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_it.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_it.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_ja.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_ja.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_ja.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_ja.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_ko.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_ko.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_ko.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_ko.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_pt_BR.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_pt_BR.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_pt_BR.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_zh_CN.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_zh_CN.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_zh_CN.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_zh_TW.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_zh_TW.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/Messages_zh_TW.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/TODO.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/TODO.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/TODO.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/TODO.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/SecureLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/SecureLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/SecureLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/SecureLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_de.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_de.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_de.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_de.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_es.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_es.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_es.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_es.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_fr.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_fr.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_fr.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_fr.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_it.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_it.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_it.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_it.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ja.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ja.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ja.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ja.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ko.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ko.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ko.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_ko.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_pt_BR.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_pt_BR.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_pt_BR.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_CN.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_CN.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_CN.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_TW.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_TW.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages_zh_TW.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/SecureLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/SecureLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/SecureLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/SecureLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_de.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_de.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_de.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_de.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_es.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_es.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_es.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_es.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_fr.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_fr.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_fr.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_fr.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_it.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_it.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_it.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_it.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ja.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ja.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ja.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ja.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ko.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ko.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ko.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_ko.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_pt_BR.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_pt_BR.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_pt_BR.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_CN.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_CN.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_CN.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_TW.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_TW.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages_zh_TW.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilderI.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilderI.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilderI.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilderI.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/SecureLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/SecureLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/SecureLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/SecureLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/SecureLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/SecureLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/SecureLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/SecureLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/util/ArrayInfoUtil.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/util/ArrayInfoUtil.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/util/ArrayInfoUtil.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/util/ArrayInfoUtil.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_de.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_de.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_de.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_de.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_es.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_es.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_es.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_es.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_fr.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_fr.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_fr.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_fr.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_it.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_it.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_it.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_it.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_ja.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_ja.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_ja.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_ja.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_ko.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_ko.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_ko.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_ko.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_pt_BR.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_pt_BR.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_pt_BR.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_CN.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_CN.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_CN.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_TW.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_TW.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages_zh_TW.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapterMarker.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapterMarker.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapterMarker.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapterMarker.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Utils.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Utils.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Utils.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/Utils.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SecureLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SecureLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SecureLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SecureLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_de.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_de.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_de.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_de.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_es.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_es.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_es.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_es.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_fr.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_fr.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_fr.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_fr.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_it.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_it.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_it.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_it.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ja.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ja.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ja.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ja.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ko.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ko.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ko.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_ko.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_pt_BR.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_pt_BR.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_pt_BR.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_CN.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_CN.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_CN.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_TW.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_TW.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages_zh_TW.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_de.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_de.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_de.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_de.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_es.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_es.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_es.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_es.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_fr.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_fr.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_fr.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_fr.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_it.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_it.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_it.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_it.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ja.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ja.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ja.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ja.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ko.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ko.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ko.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_ko.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_pt_BR.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_pt_BR.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_pt_BR.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_CN.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_CN.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_CN.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_TW.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_TW.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages_zh_TW.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/SecureLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/SecureLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/SecureLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/SecureLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_de.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_de.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_de.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_de.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_es.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_es.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_es.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_es.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_fr.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_fr.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_fr.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_fr.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_it.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_it.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_it.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_it.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ja.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ja.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ja.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ja.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ko.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ko.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ko.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_ko.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_pt_BR.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_pt_BR.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_pt_BR.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_CN.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_CN.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_CN.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_TW.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_TW.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages_zh_TW.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SecureLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SecureLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SecureLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SecureLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_de.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_de.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_de.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_de.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_es.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_es.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_es.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_es.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_fr.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_fr.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_fr.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_fr.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_it.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_it.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_it.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_it.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ja.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ja.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ja.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ja.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ko.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ko.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ko.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_ko.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_pt_BR.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_pt_BR.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_pt_BR.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_CN.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_CN.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_CN.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_TW.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_TW.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages_zh_TW.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Package.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Package.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Package.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Package.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Notation.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Notation.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Notation.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/Notation.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ASCIIUtility.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ASCIIUtility.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ASCIIUtility.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ASCIIUtility.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/BASE64DecoderStream.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/BASE64DecoderStream.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/BASE64DecoderStream.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/BASE64DecoderStream.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/CleanUpExecutorFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/CleanUpExecutorFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/CleanUpExecutorFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/CleanUpExecutorFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DecodingException.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DecodingException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DecodingException.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DecodingException.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FactoryFinder.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FactoryFinder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FactoryFinder.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FactoryFinder.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/LineInputStream.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/LineInputStream.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/LineInputStream.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/LineInputStream.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MimeUtility.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MimeUtility.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MimeUtility.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MimeUtility.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/PropUtil.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/PropUtil.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/PropUtil.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/PropUtil.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/QPDecoderStream.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/QPDecoderStream.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/QPDecoderStream.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/QPDecoderStream.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/UUDecoderStream.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/UUDecoderStream.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/UUDecoderStream.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/UUDecoderStream.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64EncoderStream.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64EncoderStream.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64EncoderStream.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64EncoderStream.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/BinaryText.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/BinaryText.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/BinaryText.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/BinaryText.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/MtomEnabled.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/MtomEnabled.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/MtomEnabled.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/MtomEnabled.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/StAxSOAPBody.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/StAxSOAPBody.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/StAxSOAPBody.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/StAxSOAPBody.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/DOMStreamReader.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/DOMStreamReader.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/DOMStreamReader.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/DOMStreamReader.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/DummyLocation.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/DummyLocation.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/DummyLocation.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/DummyLocation.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/FinalArrayList.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/FinalArrayList.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/FinalArrayList.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/FinalArrayList.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/MtomStreamWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/MtomStreamWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/MtomStreamWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/MtomStreamWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Attribute.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Attribute.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Attribute.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Attribute.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Cdata.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Cdata.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Cdata.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Cdata.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Comment.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Comment.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Comment.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Comment.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/ContainerElement.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/ContainerElement.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/ContainerElement.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/ContainerElement.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Content.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Content.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Content.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Content.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/ContentVisitor.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/ContentVisitor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/ContentVisitor.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/ContentVisitor.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/EndDocument.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/EndDocument.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/EndDocument.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/EndDocument.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/EndTag.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/EndTag.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/EndTag.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/EndTag.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/IllegalSignatureException.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/IllegalSignatureException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/IllegalSignatureException.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/IllegalSignatureException.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceDecl.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceDecl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceDecl.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceDecl.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceResolver.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceResolver.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceResolver.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceResolver.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Pcdata.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Pcdata.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Pcdata.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Pcdata.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/StartDocument.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/StartDocument.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/StartDocument.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/StartDocument.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/StartTag.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/StartTag.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/StartTag.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/StartTag.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TXW.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TXW.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TXW.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TXW.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Text.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Text.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Text.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Text.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TxwException.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TxwException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TxwException.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TxwException.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/package.html b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/package.html similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/package.html rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/package.html diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DomSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DomSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DomSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DomSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DumpSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DumpSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DumpSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DumpSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/SaxSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/SaxSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/SaxSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/SaxSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/StaxSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/StaxSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/StaxSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/StaxSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/StreamSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/StreamSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/StreamSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/StreamSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XmlSerializer.java b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XmlSerializer.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XmlSerializer.java rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XmlSerializer.java diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/package.html b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/package.html similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/package.html rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/package.html diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/package.html b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/package.html similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/package.html rename to src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/package.html diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Binder.java b/src/java.xml.bind/share/classes/javax/xml/bind/Binder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Binder.java rename to src/java.xml.bind/share/classes/javax/xml/bind/Binder.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java b/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java rename to src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java b/src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java rename to src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java b/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java rename to src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterImpl.java b/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterImpl.java rename to src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java b/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java rename to src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Element.java b/src/java.xml.bind/share/classes/javax/xml/bind/Element.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Element.java rename to src/java.xml.bind/share/classes/javax/xml/bind/Element.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/GetPropertyAction.java b/src/java.xml.bind/share/classes/javax/xml/bind/GetPropertyAction.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/GetPropertyAction.java rename to src/java.xml.bind/share/classes/javax/xml/bind/GetPropertyAction.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java b/src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java rename to src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java b/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java rename to src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java b/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java rename to src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java b/src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java rename to src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java b/src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java rename to src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java b/src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java rename to src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBPermission.java b/src/java.xml.bind/share/classes/javax/xml/bind/JAXBPermission.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBPermission.java rename to src/java.xml.bind/share/classes/javax/xml/bind/JAXBPermission.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java b/src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java rename to src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java b/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java rename to src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.java b/src/java.xml.bind/share/classes/javax/xml/bind/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.java rename to src/java.xml.bind/share/classes/javax/xml/bind/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties b/src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties rename to src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ModuleUtil.java b/src/java.xml.bind/share/classes/javax/xml/bind/ModuleUtil.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ModuleUtil.java rename to src/java.xml.bind/share/classes/javax/xml/bind/ModuleUtil.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/NotIdentifiableEvent.java b/src/java.xml.bind/share/classes/javax/xml/bind/NotIdentifiableEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/NotIdentifiableEvent.java rename to src/java.xml.bind/share/classes/javax/xml/bind/NotIdentifiableEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ParseConversionEvent.java b/src/java.xml.bind/share/classes/javax/xml/bind/ParseConversionEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ParseConversionEvent.java rename to src/java.xml.bind/share/classes/javax/xml/bind/ParseConversionEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/PrintConversionEvent.java b/src/java.xml.bind/share/classes/javax/xml/bind/PrintConversionEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/PrintConversionEvent.java rename to src/java.xml.bind/share/classes/javax/xml/bind/PrintConversionEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/PropertyException.java b/src/java.xml.bind/share/classes/javax/xml/bind/PropertyException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/PropertyException.java rename to src/java.xml.bind/share/classes/javax/xml/bind/PropertyException.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/SchemaOutputResolver.java b/src/java.xml.bind/share/classes/javax/xml/bind/SchemaOutputResolver.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/SchemaOutputResolver.java rename to src/java.xml.bind/share/classes/javax/xml/bind/SchemaOutputResolver.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ServiceLoaderUtil.java b/src/java.xml.bind/share/classes/javax/xml/bind/ServiceLoaderUtil.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ServiceLoaderUtil.java rename to src/java.xml.bind/share/classes/javax/xml/bind/ServiceLoaderUtil.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java b/src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java rename to src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java b/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java rename to src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java b/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java rename to src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshallerHandler.java b/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshallerHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshallerHandler.java rename to src/java.xml.bind/share/classes/javax/xml/bind/UnmarshallerHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java b/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java rename to src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java b/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java rename to src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java b/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java rename to src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java b/src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java rename to src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Validator.java b/src/java.xml.bind/share/classes/javax/xml/bind/Validator.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Validator.java rename to src/java.xml.bind/share/classes/javax/xml/bind/Validator.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/WhiteSpaceProcessor.java b/src/java.xml.bind/share/classes/javax/xml/bind/WhiteSpaceProcessor.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/WhiteSpaceProcessor.java rename to src/java.xml.bind/share/classes/javax/xml/bind/WhiteSpaceProcessor.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/DomHandler.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/DomHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/DomHandler.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/DomHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/W3CDomHandler.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/W3CDomHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/W3CDomHandler.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/W3CDomHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessType.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessType.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessType.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessType.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyElement.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyElement.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyElement.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyElement.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttachmentRef.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttachmentRef.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttachmentRef.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttachmentRef.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRefs.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRefs.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRefs.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRefs.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMimeType.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMimeType.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMimeType.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMimeType.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMixed.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMixed.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMixed.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMixed.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNs.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNs.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNs.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNs.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNsForm.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNsForm.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNsForm.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNsForm.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlRegistry.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlRegistry.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlRegistry.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlRegistry.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlRootElement.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlRootElement.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlRootElement.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlRootElement.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchema.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchema.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchema.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchema.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaType.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaType.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaType.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaType.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaTypes.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaTypes.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaTypes.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaTypes.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package-info.java b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package-info.java rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html rename to src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java b/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java rename to src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java b/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java rename to src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/package.html b/src/java.xml.bind/share/classes/javax/xml/bind/attachment/package.html similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/package.html rename to src/java.xml.bind/share/classes/javax/xml/bind/attachment/package.html diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java rename to src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java rename to src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java rename to src/java.xml.bind/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/Messages.java b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/Messages.java rename to src/java.xml.bind/share/classes/javax/xml/bind/helpers/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/Messages.properties b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/Messages.properties rename to src/java.xml.bind/share/classes/javax/xml/bind/helpers/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java rename to src/java.xml.bind/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java rename to src/java.xml.bind/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java rename to src/java.xml.bind/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java rename to src/java.xml.bind/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java rename to src/java.xml.bind/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package-info.java b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package-info.java rename to src/java.xml.bind/share/classes/javax/xml/bind/helpers/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/package-info.java b/src/java.xml.bind/share/classes/javax/xml/bind/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/package-info.java rename to src/java.xml.bind/share/classes/javax/xml/bind/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/package.html b/src/java.xml.bind/share/classes/javax/xml/bind/package.html similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/package.html rename to src/java.xml.bind/share/classes/javax/xml/bind/package.html diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/JAXBResult.java b/src/java.xml.bind/share/classes/javax/xml/bind/util/JAXBResult.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/JAXBResult.java rename to src/java.xml.bind/share/classes/javax/xml/bind/util/JAXBResult.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/JAXBSource.java b/src/java.xml.bind/share/classes/javax/xml/bind/util/JAXBSource.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/JAXBSource.java rename to src/java.xml.bind/share/classes/javax/xml/bind/util/JAXBSource.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/Messages.java b/src/java.xml.bind/share/classes/javax/xml/bind/util/Messages.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/Messages.java rename to src/java.xml.bind/share/classes/javax/xml/bind/util/Messages.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/Messages.properties b/src/java.xml.bind/share/classes/javax/xml/bind/util/Messages.properties similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/Messages.properties rename to src/java.xml.bind/share/classes/javax/xml/bind/util/Messages.properties diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/ValidationEventCollector.java b/src/java.xml.bind/share/classes/javax/xml/bind/util/ValidationEventCollector.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/ValidationEventCollector.java rename to src/java.xml.bind/share/classes/javax/xml/bind/util/ValidationEventCollector.java diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package-info.java b/src/java.xml.bind/share/classes/javax/xml/bind/util/package-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package-info.java rename to src/java.xml.bind/share/classes/javax/xml/bind/util/package-info.java diff --git a/jaxws/src/java.xml.bind/share/classes/module-info.java b/src/java.xml.bind/share/classes/module-info.java similarity index 100% rename from jaxws/src/java.xml.bind/share/classes/module-info.java rename to src/java.xml.bind/share/classes/module-info.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/Init.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/Init.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/Init.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/Init.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/C14nHelper.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/C14nHelper.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/C14nHelper.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/C14nHelper.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_OmitComments.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_OmitComments.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_OmitComments.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_OmitComments.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315OmitComments.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315OmitComments.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315OmitComments.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315OmitComments.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerPhysical.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerPhysical.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerPhysical.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerPhysical.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/DocumentSerializer.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/DocumentSerializer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/DocumentSerializer.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/DocumentSerializer.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Serializer.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Serializer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Serializer.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Serializer.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/AlgorithmAlreadyRegisteredException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/AlgorithmAlreadyRegisteredException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/AlgorithmAlreadyRegisteredException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/AlgorithmAlreadyRegisteredException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/Base64DecodingException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/Base64DecodingException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/Base64DecodingException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/Base64DecodingException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityRuntimeException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityRuntimeException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityRuntimeException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityRuntimeException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/DEREncodedKeyValue.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/DEREncodedKeyValue.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/DEREncodedKeyValue.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/DEREncodedKeyValue.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoReference.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoReference.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoReference.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoReference.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyName.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyName.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyName.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyName.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/X509Data.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/X509Data.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/X509Data.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/X509Data.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/RSAKeyValue.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/RSAKeyValue.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/RSAKeyValue.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/RSAKeyValue.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Digest.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Digest.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Digest.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Digest.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/PrivateKeyResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/PrivateKeyResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/PrivateKeyResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/PrivateKeyResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SecretKeyResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SecretKeyResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SecretKeyResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SecretKeyResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SingleKeyResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SingleKeyResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SingleKeyResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SingleKeyResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509DigestResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509DigestResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509DigestResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509DigestResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/config.xml b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/config.xml similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/config.xml rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/config.xml diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceData.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceData.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceData.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceNodeSetData.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceNodeSetData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceNodeSetData.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceNodeSetData.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceOctetStreamData.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceOctetStreamData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceOctetStreamData.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceOctetStreamData.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceSubTreeData.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceSubTreeData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceSubTreeData.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceSubTreeData.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ClassLoaderUtils.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ClassLoaderUtils.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ClassLoaderUtils.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ClassLoaderUtils.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/DOMNamespaceContext.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/DOMNamespaceContext.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/DOMNamespaceContext.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/DOMNamespaceContext.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/IgnoreAllErrorHandler.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/IgnoreAllErrorHandler.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/IgnoreAllErrorHandler.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/IgnoreAllErrorHandler.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathAPI.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathAPI.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathAPI.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathAPI.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathFactory.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathFactory.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathFactory.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathFactory.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Signature11ElementProxy.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Signature11ElementProxy.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Signature11ElementProxy.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/Signature11ElementProxy.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/SignatureElementProxy.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/SignatureElementProxy.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/SignatureElementProxy.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/SignatureElementProxy.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathAPI.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathAPI.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathAPI.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathAPI.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFactory.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFactory.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFactory.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFactory.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathFactory.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathFactory.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathFactory.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathFactory.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverContext.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverContext.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverContext.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverContext.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html rename to src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/AlgorithmMethod.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/AlgorithmMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/AlgorithmMethod.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/AlgorithmMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/Data.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/Data.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/Data.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/Data.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelector.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelector.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelector.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelector.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorException.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorException.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorException.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorResult.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorResult.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorResult.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/KeySelectorResult.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/MarshalException.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/MarshalException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/MarshalException.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/MarshalException.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/NoSuchMechanismException.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/NoSuchMechanismException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/NoSuchMechanismException.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/NoSuchMechanismException.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/NodeSetData.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/NodeSetData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/NodeSetData.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/NodeSetData.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/OctetStreamData.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/OctetStreamData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/OctetStreamData.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/OctetStreamData.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/URIDereferencer.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/URIDereferencer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/URIDereferencer.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/URIDereferencer.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReference.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReference.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReference.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/URIReference.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReferenceException.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReferenceException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReferenceException.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/URIReferenceException.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/XMLCryptoContext.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/XMLCryptoContext.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/XMLCryptoContext.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/XMLCryptoContext.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/XMLStructure.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/XMLStructure.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/XMLStructure.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/XMLStructure.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMStructure.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMStructure.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMStructure.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMStructure.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMURIReference.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMURIReference.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMURIReference.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMURIReference.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/package.html b/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/package.html rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dom/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/DigestMethod.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/DigestMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/DigestMethod.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/DigestMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Manifest.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Manifest.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Manifest.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Manifest.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Reference.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Reference.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Reference.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Reference.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureMethod.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureMethod.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperties.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperties.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperties.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperties.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperty.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperty.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperty.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperty.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignedInfo.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignedInfo.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignedInfo.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignedInfo.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Transform.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Transform.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Transform.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Transform.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformException.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformException.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformException.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformService.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformService.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformService.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformService.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLObject.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLObject.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLObject.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLObject.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignContext.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignContext.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignContext.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignContext.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignature.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignature.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignature.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignature.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLValidateContext.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLValidateContext.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLValidateContext.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLValidateContext.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/package.html b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/package.html rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/dom/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyName.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyName.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyName.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyName.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509IssuerSerial.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509IssuerSerial.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509IssuerSerial.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509IssuerSerial.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/package.html b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/package.html rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/package.html b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/package.html rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/C14NMethodParameterSpec.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/C14NMethodParameterSpec.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/C14NMethodParameterSpec.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/C14NMethodParameterSpec.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/DigestMethodParameterSpec.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/DigestMethodParameterSpec.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/DigestMethodParameterSpec.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/DigestMethodParameterSpec.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/SignatureMethodParameterSpec.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/SignatureMethodParameterSpec.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/SignatureMethodParameterSpec.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/SignatureMethodParameterSpec.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathType.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathType.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathType.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathType.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/package.html b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/package.html rename to src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/package.html b/src/java.xml.crypto/share/classes/javax/xml/crypto/package.html similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/package.html rename to src/java.xml.crypto/share/classes/javax/xml/crypto/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/module-info.java b/src/java.xml.crypto/share/classes/module-info.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/module-info.java rename to src/java.xml.crypto/share/classes/module-info.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Policy.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Policy.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Policy.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Policy.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java similarity index 100% rename from jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java rename to src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java diff --git a/jdk/src/java.xml.crypto/share/legal/santuario.md b/src/java.xml.crypto/share/legal/santuario.md similarity index 100% rename from jdk/src/java.xml.crypto/share/legal/santuario.md rename to src/java.xml.crypto/share/legal/santuario.md diff --git a/jaxws/src/java.xml.ws.annotation/share/classes/javax/annotation/Generated.java b/src/java.xml.ws.annotation/share/classes/javax/annotation/Generated.java similarity index 100% rename from jaxws/src/java.xml.ws.annotation/share/classes/javax/annotation/Generated.java rename to src/java.xml.ws.annotation/share/classes/javax/annotation/Generated.java diff --git a/jaxws/src/java.xml.ws.annotation/share/classes/javax/annotation/PostConstruct.java b/src/java.xml.ws.annotation/share/classes/javax/annotation/PostConstruct.java similarity index 100% rename from jaxws/src/java.xml.ws.annotation/share/classes/javax/annotation/PostConstruct.java rename to src/java.xml.ws.annotation/share/classes/javax/annotation/PostConstruct.java diff --git a/jaxws/src/java.xml.ws.annotation/share/classes/javax/annotation/PreDestroy.java b/src/java.xml.ws.annotation/share/classes/javax/annotation/PreDestroy.java similarity index 100% rename from jaxws/src/java.xml.ws.annotation/share/classes/javax/annotation/PreDestroy.java rename to src/java.xml.ws.annotation/share/classes/javax/annotation/PreDestroy.java diff --git a/jaxws/src/java.xml.ws.annotation/share/classes/javax/annotation/Resource.java b/src/java.xml.ws.annotation/share/classes/javax/annotation/Resource.java similarity index 100% rename from jaxws/src/java.xml.ws.annotation/share/classes/javax/annotation/Resource.java rename to src/java.xml.ws.annotation/share/classes/javax/annotation/Resource.java diff --git a/jaxws/src/java.xml.ws.annotation/share/classes/javax/annotation/Resources.java b/src/java.xml.ws.annotation/share/classes/javax/annotation/Resources.java similarity index 100% rename from jaxws/src/java.xml.ws.annotation/share/classes/javax/annotation/Resources.java rename to src/java.xml.ws.annotation/share/classes/javax/annotation/Resources.java diff --git a/jaxws/src/java.xml.ws.annotation/share/classes/module-info.java b/src/java.xml.ws.annotation/share/classes/module-info.java similarity index 100% rename from jaxws/src/java.xml.ws.annotation/share/classes/module-info.java rename to src/java.xml.ws.annotation/share/classes/module-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/EnvelopeStyle.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/EnvelopeStyle.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/EnvelopeStyle.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/EnvelopeStyle.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/EnvelopeStyleFeature.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/EnvelopeStyleFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/EnvelopeStyleFeature.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/EnvelopeStyleFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/Databinding.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/Databinding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/Databinding.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/Databinding.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingFactory.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingFactory.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingMode.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingMode.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingMode.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingMode.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingModeFeature.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingModeFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingModeFeature.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/DatabindingModeFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/ExternalMetadataFeature.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/ExternalMetadataFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/ExternalMetadataFeature.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/ExternalMetadataFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/JavaCallInfo.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/JavaCallInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/JavaCallInfo.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/JavaCallInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/WSDLGenerator.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/WSDLGenerator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/WSDLGenerator.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/WSDLGenerator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/WSDLResolver.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/WSDLResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/WSDLResolver.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/databinding/WSDLResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/BaseDistributedPropertySet.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/BaseDistributedPropertySet.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/BaseDistributedPropertySet.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/BaseDistributedPropertySet.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/BasePropertySet.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/BasePropertySet.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/BasePropertySet.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/BasePropertySet.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/ContentType.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/ContentType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/ContentType.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/ContentType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/DistributedPropertySet.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/DistributedPropertySet.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/DistributedPropertySet.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/DistributedPropertySet.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContext.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContext.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/PropertySet.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/PropertySet.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/PropertySet.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/PropertySet.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/ReadOnlyPropertyException.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/ReadOnlyPropertyException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/ReadOnlyPropertyException.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/ReadOnlyPropertyException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/impl/encoding/StreamDecoderImpl.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/impl/encoding/StreamDecoderImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/impl/encoding/StreamDecoderImpl.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/impl/encoding/StreamDecoderImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/impl/internalspi/encoding/StreamDecoder.java b/src/java.xml.ws/share/classes/com/oracle/webservices/internal/impl/internalspi/encoding/StreamDecoder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/impl/internalspi/encoding/StreamDecoder.java rename to src/java.xml.ws/share/classes/com/oracle/webservices/internal/impl/internalspi/encoding/StreamDecoder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ExistingAnnotationsType.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ExistingAnnotationsType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ExistingAnnotationsType.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ExistingAnnotationsType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaMethod.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaMethod.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaMethod.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaMethod.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaParam.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaParam.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaParam.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaParam.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaWsdlMappingType.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaWsdlMappingType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaWsdlMappingType.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaWsdlMappingType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ObjectFactory.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ObjectFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ObjectFactory.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ObjectFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingParameterStyle.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingParameterStyle.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingParameterStyle.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingParameterStyle.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingStyle.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingStyle.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingStyle.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingStyle.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingUse.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingUse.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingUse.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingUse.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/Util.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/Util.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/Util.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/Util.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/WebParamMode.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/WebParamMode.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/WebParamMode.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/WebParamMode.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAction.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAction.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAction.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAction.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAddressing.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAddressing.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAddressing.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAddressing.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlBindingType.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlBindingType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlBindingType.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlBindingType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlFaultAction.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlFaultAction.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlFaultAction.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlFaultAction.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlHandlerChain.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlHandlerChain.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlHandlerChain.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlHandlerChain.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlMTOM.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlMTOM.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlMTOM.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlMTOM.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlOneway.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlOneway.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlOneway.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlOneway.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlRequestWrapper.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlRequestWrapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlRequestWrapper.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlRequestWrapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlResponseWrapper.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlResponseWrapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlResponseWrapper.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlResponseWrapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlSOAPBinding.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlSOAPBinding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlSOAPBinding.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlSOAPBinding.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlServiceMode.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlServiceMode.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlServiceMode.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlServiceMode.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebEndpoint.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebEndpoint.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebEndpoint.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebEndpoint.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebFault.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebFault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebFault.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebFault.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebMethod.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebMethod.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebMethod.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebMethod.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebParam.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebParam.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebParam.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebParam.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebResult.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebResult.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebResult.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebResult.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebService.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebService.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebService.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebService.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceClient.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceClient.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceClient.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceClient.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceProvider.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceProvider.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceProvider.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceProvider.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceRef.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceRef.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceRef.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceRef.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/package-info.java b/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/package-info.java rename to src/java.xml.ws/share/classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMX.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMX.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMX.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMX.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMXUtil.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMXUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMXUtil.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/AMXUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/MBeanListener.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/MBeanListener.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/MBeanListener.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/amx/MBeanListener.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/arc/Stability.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/arc/Stability.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/arc/Stability.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/arc/Stability.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/arc/Taxonomy.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/arc/Taxonomy.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/arc/Taxonomy.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/arc/Taxonomy.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/CountStatistic.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/CountStatistic.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/CountStatistic.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/CountStatistic.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/Statistic.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/Statistic.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/Statistic.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/Statistic.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/Stats.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/Stats.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/Stats.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/Stats.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/StringStatistic.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/StringStatistic.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/StringStatistic.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/StringStatistic.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXClient.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXClient.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXClient.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXClient.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXMBeanInterface.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXMBeanInterface.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXMBeanInterface.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXMBeanInterface.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXMetadata.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXMetadata.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXMetadata.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/AMXMetadata.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/Description.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/Description.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/Description.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/Description.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/DescriptorFields.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/DescriptorFields.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/DescriptorFields.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/DescriptorFields.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/DescriptorKey.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/DescriptorKey.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/DescriptorKey.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/DescriptorKey.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalException.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalException.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalMBean.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalMBean.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalMBean.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalMBean.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalMBeanNOPImpl.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalMBeanNOPImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalMBeanNOPImpl.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/GmbalMBeanNOPImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/Impact.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/Impact.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/Impact.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/Impact.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/IncludeSubclass.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/IncludeSubclass.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/IncludeSubclass.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/IncludeSubclass.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/InheritedAttribute.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/InheritedAttribute.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/InheritedAttribute.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/InheritedAttribute.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/InheritedAttributes.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/InheritedAttributes.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/InheritedAttributes.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/InheritedAttributes.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedAttribute.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedAttribute.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedAttribute.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedAttribute.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedData.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedData.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedData.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedData.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObject.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObject.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObject.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObject.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManager.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManager.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManager.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManager.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerFactory.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerFactory.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerNOPImpl.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerNOPImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerNOPImpl.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerNOPImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedOperation.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedOperation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedOperation.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ManagedOperation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/NameValue.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/NameValue.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/NameValue.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/NameValue.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ParameterNames.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ParameterNames.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ParameterNames.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/ParameterNames.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/util/GenericConstructor.java b/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/util/GenericConstructor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/util/GenericConstructor.java rename to src/java.xml.ws/share/classes/com/sun/org/glassfish/gmbal/util/GenericConstructor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LazyEnvelope.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LazyEnvelope.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LazyEnvelope.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LazyEnvelope.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxBridge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxBridge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxBridge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxBridge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NamedNodeMapImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NamedNodeMapImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NamedNodeMapImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NamedNodeMapImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NodeListImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NodeListImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NodeListImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NodeListImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxReaderEx.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxReaderEx.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxReaderEx.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxReaderEx.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/Closeable.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/Closeable.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/Closeable.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/Closeable.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/EPRSDDocumentFilter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/EPRSDDocumentFilter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/EPRSDDocumentFilter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/EPRSDDocumentFilter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/ProblemAction.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/ProblemAction.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/ProblemAction.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/ProblemAction.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingMetadataConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingMetadataConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingMetadataConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingMetadataConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WSEPRExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WSEPRExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WSEPRExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WSEPRExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaActionUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaActionUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaActionUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaActionUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingFeatureConfigurator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingFeatureConfigurator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingFeatureConfigurator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingFeatureConfigurator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyMapConfigurator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyMapConfigurator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyMapConfigurator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyMapConfigurator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyValidator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyValidator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyValidator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyValidator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPrefixMapper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPrefixMapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPrefixMapper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/policy/AddressingPrefixMapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Component.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Component.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Component.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Component.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentEx.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentEx.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentEx.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentEx.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentRegistry.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentRegistry.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentRegistry.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentRegistry.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentsFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentsFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentsFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ComponentsFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureConstructor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureConstructor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureConstructor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureConstructor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureListValidator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureListValidator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureListValidator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureListValidator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureListValidatorAnnotation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureListValidatorAnnotation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureListValidatorAnnotation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/FeatureListValidatorAnnotation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ImpliesWebServiceFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ImpliesWebServiceFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ImpliesWebServiceFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ImpliesWebServiceFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/PropertySet.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/PropertySet.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/PropertySet.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/PropertySet.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ServiceSharedFeatureMarker.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ServiceSharedFeatureMarker.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ServiceSharedFeatureMarker.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ServiceSharedFeatureMarker.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSBinding.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSBinding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSBinding.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSBinding.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSDLLocator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSDLLocator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSDLLocator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSDLLocator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSFeatureList.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSFeatureList.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSFeatureList.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSFeatureList.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSService.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSService.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSService.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WSService.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WebServiceFeatureFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WebServiceFeatureFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WebServiceFeatureFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/WebServiceFeatureFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingPropertySet.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingPropertySet.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingPropertySet.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingPropertySet.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/NonAnonymousResponseProcessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/NonAnonymousResponseProcessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/NonAnonymousResponseProcessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/NonAnonymousResponseProcessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/addressing/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ThrowableInPacketCompletionFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ThrowableInPacketCompletionFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ThrowableInPacketCompletionFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ThrowableInPacketCompletionFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/EndpointCreationAttributes.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/EndpointCreationAttributes.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/EndpointCreationAttributes.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/EndpointCreationAttributes.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/ManagedEndpointFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/ManagedEndpointFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/ManagedEndpointFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/ManagedEndpointFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/Reconfigurable.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/Reconfigurable.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/Reconfigurable.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/Reconfigurable.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedClientAssertion.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedClientAssertion.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedClientAssertion.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedClientAssertion.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedServiceAssertion.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedServiceAssertion.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedServiceAssertion.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedServiceAssertion.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagementAssertion.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagementAssertion.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagementAssertion.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/config/management/policy/ManagementAssertion.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/ClientCallBridge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/ClientCallBridge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/ClientCallBridge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/ClientCallBridge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/Databinding.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/Databinding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/Databinding.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/Databinding.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/DatabindingConfig.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/DatabindingConfig.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/DatabindingConfig.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/DatabindingConfig.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/DatabindingFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/DatabindingFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/DatabindingFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/DatabindingFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/EndpointCallBridge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/EndpointCallBridge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/EndpointCallBridge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/EndpointCallBridge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/JavaCallInfo.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/JavaCallInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/JavaCallInfo.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/JavaCallInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/MappingInfo.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/MappingInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/MappingInfo.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/MappingInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/MetadataReader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/MetadataReader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/MetadataReader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/MetadataReader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/SoapBodyStyle.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/SoapBodyStyle.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/SoapBodyStyle.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/SoapBodyStyle.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/WSDLGenInfo.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/WSDLGenInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/WSDLGenInfo.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/databinding/WSDLGenInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ha/HaInfo.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ha/HaInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ha/HaInfo.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ha/HaInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ha/StickyFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ha/StickyFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ha/StickyFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/ha/StickyFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AddressingUtils.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AddressingUtils.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AddressingUtils.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AddressingUtils.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Attachment.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Attachment.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Attachment.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Attachment.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AttachmentEx.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AttachmentEx.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AttachmentEx.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AttachmentEx.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Headers.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Headers.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Headers.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Headers.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageHeaders.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageHeaders.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageHeaders.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageHeaders.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageMetadata.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageMetadata.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageMetadata.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageMetadata.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageWrapper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageWrapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageWrapper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageWrapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageWritable.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageWritable.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageWritable.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageWritable.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Messages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Messages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Messages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Messages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/SuppressAutomaticWSARequestHeadersFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/SuppressAutomaticWSARequestHeadersFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/SuppressAutomaticWSARequestHeadersFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/SuppressAutomaticWSARequestHeadersFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SaajStaxWriter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SaajStaxWriter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SaajStaxWriter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SaajStaxWriter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/MEP.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/MEP.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/MEP.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/MEP.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/SEIModel.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/SEIModel.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/SEIModel.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/SEIModel.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/WSDLOperationMapping.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/WSDLOperationMapping.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/WSDLOperationMapping.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/WSDLOperationMapping.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundFault.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundFault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundFault.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundFault.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundOperation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundOperation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundOperation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundOperation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundPortType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundPortType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundPortType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundPortType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLFault.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLFault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLFault.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLFault.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLInput.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLInput.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLInput.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLInput.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLModel.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLModel.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLModel.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLModel.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOperation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOperation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOperation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOperation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOutput.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOutput.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOutput.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOutput.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPart.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPart.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPart.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPart.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPort.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPort.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPort.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPort.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPortType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPortType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPortType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPortType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLService.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLService.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLService.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLService.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ContentType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ContentType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ContentType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ContentType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptorFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptorFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptorFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptorFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipeClonerImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipeClonerImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipeClonerImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipeClonerImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/SyncStartForAsyncFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/SyncStartForAsyncFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/SyncStartForAsyncFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/SyncStartForAsyncFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ThreadHelper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ThreadHelper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ThreadHelper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ThreadHelper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ThrowableContainerPropertySet.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ThrowableContainerPropertySet.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ThrowableContainerPropertySet.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/ThrowableContainerPropertySet.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/AlternativeSelector.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/AlternativeSelector.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/AlternativeSelector.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/AlternativeSelector.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelGenerator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelGenerator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelGenerator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelGenerator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelTranslator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelTranslator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelTranslator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelTranslator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelUnmarshaller.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelUnmarshaller.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelUnmarshaller.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ModelUnmarshaller.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/PolicyResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/PolicyResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/PolicyResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/PolicyResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/PolicyResolverFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/PolicyResolverFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/PolicyResolverFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/PolicyResolverFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/SourceModel.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/SourceModel.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/SourceModel.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/SourceModel.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ValidationProcessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ValidationProcessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ValidationProcessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/ValidationProcessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/subject/BindingSubject.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/subject/BindingSubject.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/subject/BindingSubject.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/policy/subject/BindingSubject.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Adapter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Adapter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Adapter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Adapter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointData.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointData.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointData.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointData.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointReferenceExtensionContributor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointReferenceExtensionContributor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointReferenceExtensionContributor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/EndpointReferenceExtensionContributor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/LazyMOMProvider.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/LazyMOMProvider.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/LazyMOMProvider.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/LazyMOMProvider.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/MethodUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/MethodUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/MethodUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/MethodUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Module.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Module.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Module.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Module.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ProviderInvokerTubeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ProviderInvokerTubeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ProviderInvokerTubeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ProviderInvokerTubeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/PolicyWSDLParserExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/PolicyWSDLParserExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/PolicyWSDLParserExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/PolicyWSDLParserExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/DefaultClientTubelineAssemblyContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/DefaultClientTubelineAssemblyContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/DefaultClientTubelineAssemblyContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/DefaultClientTubelineAssemblyContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/DefaultServerTubelineAssemblyContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/DefaultServerTubelineAssemblyContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/DefaultServerTubelineAssemblyContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/DefaultServerTubelineAssemblyContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigLoader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigLoader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigLoader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigLoader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigName.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigName.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigName.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigName.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigNameImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigNameImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigNameImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroConfigNameImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroTubelineAssembler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroTubelineAssembler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroTubelineAssembler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/MetroTubelineAssembler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubeCreator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubeCreator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubeCreator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubeCreator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyContextImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyContextImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyContextImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyContextImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyController.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyController.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyController.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyController.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/ClientTubelineAssemblyContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/ClientTubelineAssemblyContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/ClientTubelineAssemblyContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/ClientTubelineAssemblyContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/ServerTubelineAssemblyContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/ServerTubelineAssemblyContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/ServerTubelineAssemblyContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/ServerTubelineAssemblyContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContextUpdater.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContextUpdater.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContextUpdater.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContextUpdater.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyDecorator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyDecorator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyDecorator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyDecorator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/AddressingTubeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/AddressingTubeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/AddressingTubeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/AddressingTubeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/BasicTransportTubeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/BasicTransportTubeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/BasicTransportTubeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/BasicTransportTubeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/HandlerTubeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/HandlerTubeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/HandlerTubeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/HandlerTubeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/MonitoringTubeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/MonitoringTubeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/MonitoringTubeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/MonitoringTubeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/MustUnderstandTubeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/MustUnderstandTubeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/MustUnderstandTubeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/MustUnderstandTubeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/TerminalTubeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/TerminalTubeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/TerminalTubeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/TerminalTubeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/ValidationTubeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/ValidationTubeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/ValidationTubeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/assembler/jaxws/ValidationTubeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/FeatureListUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/FeatureListUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/FeatureListUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/FeatureListUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/MonitorRootClient.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/MonitorRootClient.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/MonitorRootClient.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/MonitorRootClient.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/PortInfo.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/PortInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/PortInfo.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/PortInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ResponseContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ResponseContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ResponseContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ResponseContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SCAnnotations.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SCAnnotations.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SCAnnotations.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SCAnnotations.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SEIPortInfo.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SEIPortInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SEIPortInfo.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SEIPortInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SenderException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SenderException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SenderException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/SenderException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/PacketDispatch.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/PacketDispatch.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/PacketDispatch.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/PacketDispatch.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/StubAsyncHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/StubAsyncHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/StubAsyncHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/StubAsyncHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/StubHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/StubHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/StubHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/StubHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/ContextClassloaderLocal.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/ContextClassloaderLocal.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/ContextClassloaderLocal.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementAssertionCreator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementAssertionCreator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementAssertionCreator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementAssertionCreator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementPolicyValidator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementPolicyValidator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementPolicyValidator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementPolicyValidator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementPrefixMapper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementPrefixMapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementPrefixMapper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/management/policy/ManagementPrefixMapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/metro/dev/FeatureReader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/metro/dev/FeatureReader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/metro/dev/FeatureReader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/metro/dev/FeatureReader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/metro/util/ParserUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/metro/util/ParserUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/metro/util/ParserUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/config/metro/util/ParserUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingFactoryImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingFactoryImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingFactoryImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingFactoryImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingProviderImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingProviderImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingProviderImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingProviderImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/BridgeWrapper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/BridgeWrapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/BridgeWrapper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/BridgeWrapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextWrapper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextWrapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextWrapper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextWrapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/MarshallerBridge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/MarshallerBridge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/MarshallerBridge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/MarshallerBridge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/RawAccessorWrapper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/RawAccessorWrapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/RawAccessorWrapper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/RawAccessorWrapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/WrapperBridge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/WrapperBridge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/WrapperBridge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/glassfish/WrapperBridge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/EPRRecipe.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/EPRRecipe.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/EPRRecipe.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/EPRRecipe.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/HttpConfigFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/HttpConfigFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/HttpConfigFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/HttpConfigFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/Serialization.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/Serialization.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/Serialization.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/Serialization.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SerializationFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SerializationFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SerializationFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/SerializationFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ServerSideException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ServerSideException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ServerSideException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ServerSideException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/LoggingDumpTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/LoggingDumpTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/LoggingDumpTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/LoggingDumpTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumping.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumping.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumping.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumping.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingTubeFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingTubeFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingTubeFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/dump/MessageDumpingTubeFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/DataHandlerDataSource.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/DataHandlerDataSource.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/DataHandlerDataSource.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/DataHandlerDataSource.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/HasEncoding.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/HasEncoding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/HasEncoding.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/HasEncoding.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingPolicyValidator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingPolicyValidator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingPolicyValidator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingPolicyValidator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingPrefixMapper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingPrefixMapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingPrefixMapper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/EncodingPrefixMapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/FastInfosetFeatureConfigurator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/FastInfosetFeatureConfigurator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/FastInfosetFeatureConfigurator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/FastInfosetFeatureConfigurator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/MtomFeatureConfigurator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/MtomFeatureConfigurator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/MtomFeatureConfigurator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/MtomFeatureConfigurator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/MtomPolicyMapConfigurator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/MtomPolicyMapConfigurator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/MtomPolicyMapConfigurator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/MtomPolicyMapConfigurator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/SelectOptimalEncodingFeatureConfigurator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/SelectOptimalEncodingFeatureConfigurator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/SelectOptimalEncodingFeatureConfigurator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/policy/SelectOptimalEncodingFeatureConfigurator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLPropertyBag.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLPropertyBag.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLPropertyBag.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLPropertyBag.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/CodeType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/CodeType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/CodeType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/CodeType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/DetailType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/DetailType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/DetailType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/DetailType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ExceptionBean.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ExceptionBean.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ExceptionBean.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ExceptionBean.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ReasonType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ReasonType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ReasonType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ReasonType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ServerSOAPFaultException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ServerSOAPFaultException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ServerSOAPFaultException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/ServerSOAPFaultException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SubcodeType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SubcodeType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SubcodeType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SubcodeType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/TextType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/TextType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/TextType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/TextType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DOMMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DOMMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DOMMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DOMMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/PayloadElementSniffer.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/PayloadElementSniffer.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/PayloadElementSniffer.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/PayloadElementSniffer.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/RelatesToHeader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/RelatesToHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/RelatesToHeader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/RelatesToHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/RootElementSniffer.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/RootElementSniffer.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/RootElementSniffer.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/RootElementSniffer.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/StringHeader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/StringHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/StringHeader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/StringHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/Util.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/Util.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/Util.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/Util.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBDispatchMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBDispatchMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBDispatchMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBDispatchMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/SourceUtils.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/SourceUtils.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/SourceUtils.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/source/SourceUtils.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractWrapperBeanGenerator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractWrapperBeanGenerator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractWrapperBeanGenerator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractWrapperBeanGenerator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ExternalMetadataReader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ExternalMetadataReader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ExternalMetadataReader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ExternalMetadataReader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/Injector.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/Injector.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/Injector.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/Injector.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ReflectAnnotationReader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ReflectAnnotationReader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ReflectAnnotationReader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ReflectAnnotationReader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/Utils.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/Utils.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/Utils.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/Utils.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/WrapperParameter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/WrapperParameter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/WrapperParameter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/WrapperParameter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLDirectProperties.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLDirectProperties.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLDirectProperties.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLDirectProperties.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortProperties.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortProperties.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortProperties.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortProperties.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassAdapter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassAdapter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassAdapter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassAdapter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodAdapter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodAdapter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodAdapter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodAdapter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/AssertionSet.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/AssertionSet.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/AssertionSet.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/AssertionSet.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/NestedPolicy.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/NestedPolicy.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/NestedPolicy.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/NestedPolicy.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/Policy.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/Policy.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/Policy.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/Policy.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMap.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMap.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMap.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMap.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMapUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMerger.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMerger.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMerger.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyMerger.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyScope.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyScope.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyScope.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicyScope.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicySubject.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicySubject.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicySubject.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/PolicySubject.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerEndpointScope.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerEndpointScope.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerEndpointScope.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerEndpointScope.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerMessageScope.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerMessageScope.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerMessageScope.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerMessageScope.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerOperationScope.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerOperationScope.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerOperationScope.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerOperationScope.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerServiceScope.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerServiceScope.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerServiceScope.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerServiceScope.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/DefaultPolicyResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/DefaultPolicyResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/DefaultPolicyResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/DefaultPolicyResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyMapBuilder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyMapBuilder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyMapBuilder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyMapBuilder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLGeneratorExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLGeneratorExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLGeneratorExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLGeneratorExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLParserExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLParserExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLParserExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLParserExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/SafePolicyReader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/SafePolicyReader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/SafePolicyReader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/SafePolicyReader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/WSDLBoundFaultContainer.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/WSDLBoundFaultContainer.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/WSDLBoundFaultContainer.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/WSDLBoundFaultContainer.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyFeatureConfigurator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyFeatureConfigurator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyFeatureConfigurator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyFeatureConfigurator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyMapConfigurator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyMapConfigurator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyMapConfigurator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyMapConfigurator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/Localization.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/Localization.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/Localization.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/Localization.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocalMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocalMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocalMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocalMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/spi/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/subject/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/util/MethodUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/util/MethodUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/util/MethodUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/util/MethodUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ContextClassloaderLocal.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ContextClassloaderLocal.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ContextClassloaderLocal.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ContextClassloaderLocalMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ContextClassloaderLocalMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ContextClassloaderLocalMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ContextClassloaderLocalMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/addressing_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/bindingApi_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/client_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/dispatch_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/encoding_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/handler_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/httpserver_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/management_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/policy_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/providerApi_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/sender_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/server_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/soap_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/streaming_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/tubelineassembly.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/tubelineassembly.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/tubelineassembly.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/tubelineassembly.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/util_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/wsservlet_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/xmlmessage_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/MetroConfig.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/MetroConfig.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/MetroConfig.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/MetroConfig.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/ObjectFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/ObjectFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/ObjectFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/ObjectFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryConfig.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryConfig.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryConfig.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryConfig.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryList.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryList.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryList.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryList.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineDefinition.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineDefinition.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineDefinition.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineDefinition.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineFeature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineFeature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineFeatureReader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineFeatureReader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineFeatureReader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineFeatureReader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineMapping.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineMapping.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineMapping.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/TubelineMapping.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/Tubelines.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/Tubelines.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/Tubelines.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/Tubelines.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/runtime/config/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/DefaultResourceInjector.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/DefaultResourceInjector.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/DefaultResourceInjector.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/DefaultResourceInjector.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointAwareTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointAwareTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointAwareTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointAwareTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/InvokerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/InvokerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/InvokerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/InvokerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/MonitorBase.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/MonitorBase.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/MonitorBase.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/MonitorBase.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/MonitorRootService.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/MonitorRootService.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/MonitorRootService.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/MonitorRootService.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerPropertyConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerPropertyConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerPropertyConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerPropertyConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerRtException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerRtException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerRtException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerRtException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/SingletonResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/SingletonResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/SingletonResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/SingletonResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSEndpointMOMProxy.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSEndpointMOMProxy.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSEndpointMOMProxy.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/WSEndpointMOMProxy.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/Invoker.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/Invoker.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/Invoker.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/Invoker.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/InvokerSource.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/InvokerSource.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/InvokerSource.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/InvokerSource.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/InvokerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/InvokerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/InvokerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/InvokerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/TieHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/TieHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/TieHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/TieHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContextFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContextFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContextFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContextFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingInfo.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingInfo.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/DatabindingException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/DatabindingException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/DatabindingException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/DatabindingException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/DatabindingProvider.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/DatabindingProvider.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/DatabindingProvider.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/DatabindingProvider.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/FieldGetter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/FieldGetter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/FieldGetter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/FieldGetter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/FieldSetter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/FieldSetter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/FieldSetter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/FieldSetter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/MethodGetter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/MethodGetter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/MethodGetter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/MethodGetter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/MethodSetter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/MethodSetter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/MethodSetter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/MethodSetter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/OldBridge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/OldBridge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/OldBridge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/OldBridge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyAccessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyAccessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyAccessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyAccessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyGetter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyGetter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyGetter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyGetter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyGetterBase.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyGetterBase.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyGetterBase.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertyGetterBase.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertySetter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertySetter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertySetter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertySetter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertySetterBase.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertySetterBase.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertySetterBase.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/PropertySetterBase.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/RepeatedElementBridge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/RepeatedElementBridge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/RepeatedElementBridge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/RepeatedElementBridge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/ServiceArtifactSchemaGenerator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/ServiceArtifactSchemaGenerator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/ServiceArtifactSchemaGenerator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/ServiceArtifactSchemaGenerator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/Utils.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/Utils.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/Utils.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/Utils.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperAccessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperAccessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperAccessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperAccessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperBridge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperBridge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperBridge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperBridge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperComposite.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperComposite.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperComposite.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/WrapperComposite.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/XMLBridge.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/XMLBridge.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/XMLBridge.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/XMLBridge.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/Attributes.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/Attributes.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/Attributes.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/Attributes.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/Headers.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/Headers.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/Headers.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/Headers.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/PortableConnectionImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/PortableConnectionImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/PortableConnectionImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/PortableConnectionImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/PortableHttpHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/PortableHttpHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/PortableHttpHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/PortableHttpHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapterList.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapterList.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapterList.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapterList.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerContainer.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerContainer.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerContainer.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerContainer.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ASCIIUtility.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ASCIIUtility.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ASCIIUtility.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ASCIIUtility.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/CompletedFuture.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/CompletedFuture.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/CompletedFuture.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/CompletedFuture.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Constants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Constants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Constants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Constants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/FastInfosetUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/FastInfosetUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/FastInfosetUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/FastInfosetUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/InjectionPlan.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/InjectionPlan.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/InjectionPlan.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/InjectionPlan.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/JAXWSUtils.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/JAXWSUtils.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/JAXWSUtils.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/JAXWSUtils.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MethodUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MethodUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MethodUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MethodUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MrJarUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MrJarUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MrJarUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MrJarUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NamespaceSupport.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NamespaceSupport.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NamespaceSupport.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NamespaceSupport.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NoCloseInputStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NoCloseInputStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NoCloseInputStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NoCloseInputStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Pool.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Pool.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Pool.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Pool.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ReadAllStream.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ReadAllStream.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ReadAllStream.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ReadAllStream.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceConfigurationError.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceConfigurationError.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceConfigurationError.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceConfigurationError.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/StreamUtils.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/StreamUtils.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/StreamUtils.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/StreamUtils.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/StringUtils.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/StringUtils.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/StringUtils.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/StringUtils.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/UtilException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/UtilException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/UtilException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/UtilException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Version.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Version.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Version.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Version.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/VersionUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/VersionUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/VersionUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/VersionUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_de.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_de.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_de.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_de.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_es.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_es.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_es.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_es.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_fr.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_fr.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_fr.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_fr.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_it.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_it.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_it.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_it.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_ja.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_ja.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_ja.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_ja.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_ko.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_ko.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_ko.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_ko.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_pt_BR.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_pt_BR.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_pt_BR.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_CN.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_CN.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_CN.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_TW.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_TW.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en_zh_TW.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/CDATA.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/CDATA.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/CDATA.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/CDATA.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/DummyLocation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/DummyLocation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/DummyLocation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/DummyLocation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NodeListIterator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NodeListIterator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NodeListIterator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/NodeListIterator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/StAXResult.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/StAXResult.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/StAXResult.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/StAXResult.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XmlCatalogUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XmlCatalogUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XmlCatalogUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XmlCatalogUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationFinder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationFinder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationFinder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationFinder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationSignature.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationSignature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationSignature.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationSignature.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/DispatchException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/DispatchException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/DispatchException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/DispatchException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/OperationDispatcher.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/OperationDispatcher.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/OperationDispatcher.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/OperationDispatcher.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/PayloadQNameBasedOperationFinder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/PayloadQNameBasedOperationFinder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/PayloadQNameBasedOperationFinder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/PayloadQNameBasedOperationFinder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/SDDocumentResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/SDDocumentResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/SDDocumentResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/SDDocumentResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/SOAPActionBasedOperationFinder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/SOAPActionBasedOperationFinder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/SOAPActionBasedOperationFinder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/SOAPActionBasedOperationFinder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/WSDLOperationFinder.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/WSDLOperationFinder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/WSDLOperationFinder.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/WSDLOperationFinder.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/DocumentLocationResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/DocumentLocationResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/DocumentLocationResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/DocumentLocationResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/TXWContentHandler.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/TXWContentHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/TXWContentHandler.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/TXWContentHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingMetadataWSDLGeneratorExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingMetadataWSDLGeneratorExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingMetadataWSDLGeneratorExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingMetadataWSDLGeneratorExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLPatcher.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLPatcher.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLPatcher.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLPatcher.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Import.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Import.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Import.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Import.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Message.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Message.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Message.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Message.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Part.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Part.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Part.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Part.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Port.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Port.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Port.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Port.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Service.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Service.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Service.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Service.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Types.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Types.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Types.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Types.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java rename to src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/jws/HandlerChain.java b/src/java.xml.ws/share/classes/javax/jws/HandlerChain.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/jws/HandlerChain.java rename to src/java.xml.ws/share/classes/javax/jws/HandlerChain.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/jws/Oneway.java b/src/java.xml.ws/share/classes/javax/jws/Oneway.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/jws/Oneway.java rename to src/java.xml.ws/share/classes/javax/jws/Oneway.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/jws/WebMethod.java b/src/java.xml.ws/share/classes/javax/jws/WebMethod.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/jws/WebMethod.java rename to src/java.xml.ws/share/classes/javax/jws/WebMethod.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/jws/WebParam.java b/src/java.xml.ws/share/classes/javax/jws/WebParam.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/jws/WebParam.java rename to src/java.xml.ws/share/classes/javax/jws/WebParam.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/jws/WebResult.java b/src/java.xml.ws/share/classes/javax/jws/WebResult.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/jws/WebResult.java rename to src/java.xml.ws/share/classes/javax/jws/WebResult.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/jws/WebService.java b/src/java.xml.ws/share/classes/javax/jws/WebService.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/jws/WebService.java rename to src/java.xml.ws/share/classes/javax/jws/WebService.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/jws/soap/InitParam.java b/src/java.xml.ws/share/classes/javax/jws/soap/InitParam.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/jws/soap/InitParam.java rename to src/java.xml.ws/share/classes/javax/jws/soap/InitParam.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/jws/soap/SOAPBinding.java b/src/java.xml.ws/share/classes/javax/jws/soap/SOAPBinding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/jws/soap/SOAPBinding.java rename to src/java.xml.ws/share/classes/javax/jws/soap/SOAPBinding.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/jws/soap/SOAPMessageHandler.java b/src/java.xml.ws/share/classes/javax/jws/soap/SOAPMessageHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/jws/soap/SOAPMessageHandler.java rename to src/java.xml.ws/share/classes/javax/jws/soap/SOAPMessageHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/jws/soap/SOAPMessageHandlers.java b/src/java.xml.ws/share/classes/javax/jws/soap/SOAPMessageHandlers.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/jws/soap/SOAPMessageHandlers.java rename to src/java.xml.ws/share/classes/javax/jws/soap/SOAPMessageHandlers.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/AttachmentPart.java b/src/java.xml.ws/share/classes/javax/xml/soap/AttachmentPart.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/AttachmentPart.java rename to src/java.xml.ws/share/classes/javax/xml/soap/AttachmentPart.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Detail.java b/src/java.xml.ws/share/classes/javax/xml/soap/Detail.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Detail.java rename to src/java.xml.ws/share/classes/javax/xml/soap/Detail.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/DetailEntry.java b/src/java.xml.ws/share/classes/javax/xml/soap/DetailEntry.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/DetailEntry.java rename to src/java.xml.ws/share/classes/javax/xml/soap/DetailEntry.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/FactoryFinder.java b/src/java.xml.ws/share/classes/javax/xml/soap/FactoryFinder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/FactoryFinder.java rename to src/java.xml.ws/share/classes/javax/xml/soap/FactoryFinder.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MessageFactory.java b/src/java.xml.ws/share/classes/javax/xml/soap/MessageFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MessageFactory.java rename to src/java.xml.ws/share/classes/javax/xml/soap/MessageFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeader.java b/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeader.java rename to src/java.xml.ws/share/classes/javax/xml/soap/MimeHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeaders.java b/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeaders.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeaders.java rename to src/java.xml.ws/share/classes/javax/xml/soap/MimeHeaders.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Name.java b/src/java.xml.ws/share/classes/javax/xml/soap/Name.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Name.java rename to src/java.xml.ws/share/classes/javax/xml/soap/Name.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Node.java b/src/java.xml.ws/share/classes/javax/xml/soap/Node.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Node.java rename to src/java.xml.ws/share/classes/javax/xml/soap/Node.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SAAJMetaFactory.java b/src/java.xml.ws/share/classes/javax/xml/soap/SAAJMetaFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SAAJMetaFactory.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SAAJMetaFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SAAJResult.java b/src/java.xml.ws/share/classes/javax/xml/soap/SAAJResult.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SAAJResult.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SAAJResult.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPBody.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPBody.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPBody.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPBody.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPBodyElement.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPBodyElement.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPBodyElement.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPBodyElement.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConnection.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConnection.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConnection.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPConnection.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConnectionFactory.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConnectionFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConnectionFactory.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPConnectionFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConstants.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConstants.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConstants.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPConstants.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElement.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElement.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElement.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPElement.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElementFactory.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElementFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElementFactory.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPElementFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPEnvelope.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPEnvelope.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPEnvelope.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPEnvelope.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFactory.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFactory.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFactory.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPFactory.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFault.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFault.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPFault.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFaultElement.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFaultElement.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFaultElement.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPFaultElement.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeader.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeader.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeader.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeader.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeaderElement.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeaderElement.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeaderElement.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeaderElement.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPMessage.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPMessage.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPPart.java b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPPart.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPPart.java rename to src/java.xml.ws/share/classes/javax/xml/soap/SOAPPart.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/ServiceLoaderUtil.java b/src/java.xml.ws/share/classes/javax/xml/soap/ServiceLoaderUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/ServiceLoaderUtil.java rename to src/java.xml.ws/share/classes/javax/xml/soap/ServiceLoaderUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Text.java b/src/java.xml.ws/share/classes/javax/xml/soap/Text.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Text.java rename to src/java.xml.ws/share/classes/javax/xml/soap/Text.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/package-info.java b/src/java.xml.ws/share/classes/javax/xml/soap/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/soap/package-info.java rename to src/java.xml.ws/share/classes/javax/xml/soap/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Action.java b/src/java.xml.ws/share/classes/javax/xml/ws/Action.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Action.java rename to src/java.xml.ws/share/classes/javax/xml/ws/Action.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java b/src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java rename to src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Binding.java b/src/java.xml.ws/share/classes/javax/xml/ws/Binding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Binding.java rename to src/java.xml.ws/share/classes/javax/xml/ws/Binding.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingProvider.java b/src/java.xml.ws/share/classes/javax/xml/ws/BindingProvider.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingProvider.java rename to src/java.xml.ws/share/classes/javax/xml/ws/BindingProvider.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingType.java b/src/java.xml.ws/share/classes/javax/xml/ws/BindingType.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingType.java rename to src/java.xml.ws/share/classes/javax/xml/ws/BindingType.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java b/src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java rename to src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Endpoint.java b/src/java.xml.ws/share/classes/javax/xml/ws/Endpoint.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Endpoint.java rename to src/java.xml.ws/share/classes/javax/xml/ws/Endpoint.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/EndpointContext.java b/src/java.xml.ws/share/classes/javax/xml/ws/EndpointContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/EndpointContext.java rename to src/java.xml.ws/share/classes/javax/xml/ws/EndpointContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/EndpointReference.java b/src/java.xml.ws/share/classes/javax/xml/ws/EndpointReference.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/EndpointReference.java rename to src/java.xml.ws/share/classes/javax/xml/ws/EndpointReference.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/FaultAction.java b/src/java.xml.ws/share/classes/javax/xml/ws/FaultAction.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/FaultAction.java rename to src/java.xml.ws/share/classes/javax/xml/ws/FaultAction.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Holder.java b/src/java.xml.ws/share/classes/javax/xml/ws/Holder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Holder.java rename to src/java.xml.ws/share/classes/javax/xml/ws/Holder.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/LogicalMessage.java b/src/java.xml.ws/share/classes/javax/xml/ws/LogicalMessage.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/LogicalMessage.java rename to src/java.xml.ws/share/classes/javax/xml/ws/LogicalMessage.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ProtocolException.java b/src/java.xml.ws/share/classes/javax/xml/ws/ProtocolException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ProtocolException.java rename to src/java.xml.ws/share/classes/javax/xml/ws/ProtocolException.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Provider.java b/src/java.xml.ws/share/classes/javax/xml/ws/Provider.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Provider.java rename to src/java.xml.ws/share/classes/javax/xml/ws/Provider.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RequestWrapper.java b/src/java.xml.ws/share/classes/javax/xml/ws/RequestWrapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RequestWrapper.java rename to src/java.xml.ws/share/classes/javax/xml/ws/RequestWrapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RespectBinding.java b/src/java.xml.ws/share/classes/javax/xml/ws/RespectBinding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RespectBinding.java rename to src/java.xml.ws/share/classes/javax/xml/ws/RespectBinding.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RespectBindingFeature.java b/src/java.xml.ws/share/classes/javax/xml/ws/RespectBindingFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RespectBindingFeature.java rename to src/java.xml.ws/share/classes/javax/xml/ws/RespectBindingFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Response.java b/src/java.xml.ws/share/classes/javax/xml/ws/Response.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Response.java rename to src/java.xml.ws/share/classes/javax/xml/ws/Response.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ResponseWrapper.java b/src/java.xml.ws/share/classes/javax/xml/ws/ResponseWrapper.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ResponseWrapper.java rename to src/java.xml.ws/share/classes/javax/xml/ws/ResponseWrapper.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Service.java b/src/java.xml.ws/share/classes/javax/xml/ws/Service.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Service.java rename to src/java.xml.ws/share/classes/javax/xml/ws/Service.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ServiceMode.java b/src/java.xml.ws/share/classes/javax/xml/ws/ServiceMode.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ServiceMode.java rename to src/java.xml.ws/share/classes/javax/xml/ws/ServiceMode.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebEndpoint.java b/src/java.xml.ws/share/classes/javax/xml/ws/WebEndpoint.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebEndpoint.java rename to src/java.xml.ws/share/classes/javax/xml/ws/WebEndpoint.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebFault.java b/src/java.xml.ws/share/classes/javax/xml/ws/WebFault.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebFault.java rename to src/java.xml.ws/share/classes/javax/xml/ws/WebFault.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceClient.java b/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceClient.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceClient.java rename to src/java.xml.ws/share/classes/javax/xml/ws/WebServiceClient.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceContext.java b/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceContext.java rename to src/java.xml.ws/share/classes/javax/xml/ws/WebServiceContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java b/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java rename to src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceFeature.java b/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceFeature.java rename to src/java.xml.ws/share/classes/javax/xml/ws/WebServiceFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServicePermission.java b/src/java.xml.ws/share/classes/javax/xml/ws/WebServicePermission.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServicePermission.java rename to src/java.xml.ws/share/classes/javax/xml/ws/WebServicePermission.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceProvider.java b/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceProvider.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceProvider.java rename to src/java.xml.ws/share/classes/javax/xml/ws/WebServiceProvider.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRef.java b/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRef.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRef.java rename to src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRef.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRefs.java b/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRefs.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRefs.java rename to src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRefs.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/Handler.java b/src/java.xml.ws/share/classes/javax/xml/ws/handler/Handler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/Handler.java rename to src/java.xml.ws/share/classes/javax/xml/ws/handler/Handler.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/HandlerResolver.java b/src/java.xml.ws/share/classes/javax/xml/ws/handler/HandlerResolver.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/HandlerResolver.java rename to src/java.xml.ws/share/classes/javax/xml/ws/handler/HandlerResolver.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalHandler.java b/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalHandler.java rename to src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalMessageContext.java b/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalMessageContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalMessageContext.java rename to src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalMessageContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/MessageContext.java b/src/java.xml.ws/share/classes/javax/xml/ws/handler/MessageContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/MessageContext.java rename to src/java.xml.ws/share/classes/javax/xml/ws/handler/MessageContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/PortInfo.java b/src/java.xml.ws/share/classes/javax/xml/ws/handler/PortInfo.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/PortInfo.java rename to src/java.xml.ws/share/classes/javax/xml/ws/handler/PortInfo.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/package-info.java b/src/java.xml.ws/share/classes/javax/xml/ws/handler/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/package-info.java rename to src/java.xml.ws/share/classes/javax/xml/ws/handler/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java b/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java rename to src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPMessageContext.java b/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPMessageContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPMessageContext.java rename to src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPMessageContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package-info.java b/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package-info.java rename to src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/HTTPBinding.java b/src/java.xml.ws/share/classes/javax/xml/ws/http/HTTPBinding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/HTTPBinding.java rename to src/java.xml.ws/share/classes/javax/xml/ws/http/HTTPBinding.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/HTTPException.java b/src/java.xml.ws/share/classes/javax/xml/ws/http/HTTPException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/HTTPException.java rename to src/java.xml.ws/share/classes/javax/xml/ws/http/HTTPException.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/package-info.java b/src/java.xml.ws/share/classes/javax/xml/ws/http/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/package-info.java rename to src/java.xml.ws/share/classes/javax/xml/ws/http/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/package-info.java b/src/java.xml.ws/share/classes/javax/xml/ws/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/package-info.java rename to src/java.xml.ws/share/classes/javax/xml/ws/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/Addressing.java b/src/java.xml.ws/share/classes/javax/xml/ws/soap/Addressing.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/Addressing.java rename to src/java.xml.ws/share/classes/javax/xml/ws/soap/Addressing.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/AddressingFeature.java b/src/java.xml.ws/share/classes/javax/xml/ws/soap/AddressingFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/AddressingFeature.java rename to src/java.xml.ws/share/classes/javax/xml/ws/soap/AddressingFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java b/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java rename to src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOMFeature.java b/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOMFeature.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOMFeature.java rename to src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOMFeature.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/SOAPBinding.java b/src/java.xml.ws/share/classes/javax/xml/ws/soap/SOAPBinding.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/SOAPBinding.java rename to src/java.xml.ws/share/classes/javax/xml/ws/soap/SOAPBinding.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/SOAPFaultException.java b/src/java.xml.ws/share/classes/javax/xml/ws/soap/SOAPFaultException.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/SOAPFaultException.java rename to src/java.xml.ws/share/classes/javax/xml/ws/soap/SOAPFaultException.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package-info.java b/src/java.xml.ws/share/classes/javax/xml/ws/soap/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package-info.java rename to src/java.xml.ws/share/classes/javax/xml/ws/soap/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/FactoryFinder.java b/src/java.xml.ws/share/classes/javax/xml/ws/spi/FactoryFinder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/FactoryFinder.java rename to src/java.xml.ws/share/classes/javax/xml/ws/spi/FactoryFinder.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/Invoker.java b/src/java.xml.ws/share/classes/javax/xml/ws/spi/Invoker.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/Invoker.java rename to src/java.xml.ws/share/classes/javax/xml/ws/spi/Invoker.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/Provider.java b/src/java.xml.ws/share/classes/javax/xml/ws/spi/Provider.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/Provider.java rename to src/java.xml.ws/share/classes/javax/xml/ws/spi/Provider.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceDelegate.java b/src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceDelegate.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceDelegate.java rename to src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceDelegate.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceLoaderUtil.java b/src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceLoaderUtil.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceLoaderUtil.java rename to src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceLoaderUtil.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java b/src/java.xml.ws/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java rename to src/java.xml.ws/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpContext.java b/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpContext.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpContext.java rename to src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpContext.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java b/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java rename to src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpHandler.java b/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpHandler.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpHandler.java rename to src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpHandler.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/package-info.java b/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/package-info.java rename to src/java.xml.ws/share/classes/javax/xml/ws/spi/http/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/package-info.java b/src/java.xml.ws/share/classes/javax/xml/ws/spi/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/package-info.java rename to src/java.xml.ws/share/classes/javax/xml/ws/spi/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java b/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java rename to src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java b/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java rename to src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/package-info.java b/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/package-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/package-info.java rename to src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/package-info.java diff --git a/jaxws/src/java.xml.ws/share/classes/module-info.java b/src/java.xml.ws/share/classes/module-info.java similarity index 100% rename from jaxws/src/java.xml.ws/share/classes/module-info.java rename to src/java.xml.ws/share/classes/module-info.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Scanner.java b/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Scanner.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Scanner.java rename to src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Scanner.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Symbol.java b/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Symbol.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Symbol.java rename to src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Symbol.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/lr_parser.java b/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/lr_parser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/lr_parser.java rename to src/java.xml/share/classes/com/sun/java_cup/internal/runtime/lr_parser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/virtual_parse_stack.java b/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/virtual_parse_stack.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/virtual_parse_stack.java rename to src/java.xml/share/classes/com/sun/java_cup/internal/runtime/virtual_parse_stack.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Const.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Const.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Const.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Const.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConst.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConst.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConst.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConst.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Repository.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Repository.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Repository.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Repository.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationDefault.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationDefault.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationDefault.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationDefault.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationElementValue.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationElementValue.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationElementValue.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationElementValue.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationEntry.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationEntry.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationEntry.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AnnotationEntry.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Annotations.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Annotations.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Annotations.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Annotations.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ArrayElementValue.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ArrayElementValue.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ArrayElementValue.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ArrayElementValue.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Attribute.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Attribute.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Attribute.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Attribute.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/BootstrapMethod.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/BootstrapMethod.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/BootstrapMethod.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/BootstrapMethod.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/BootstrapMethods.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/BootstrapMethods.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/BootstrapMethods.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/BootstrapMethods.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassElementValue.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassElementValue.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassElementValue.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassElementValue.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassParser.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassParser.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Code.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Code.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Code.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Code.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/CodeException.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/CodeException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/CodeException.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/CodeException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Constant.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Constant.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Constant.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Constant.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInvokeDynamic.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInvokeDynamic.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInvokeDynamic.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInvokeDynamic.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodHandle.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodHandle.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodHandle.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodHandle.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodType.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantString.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantString.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantString.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantString.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValue.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValue.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValue.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValue.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValuePair.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValuePair.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValuePair.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValuePair.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EnclosingMethod.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EnclosingMethod.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EnclosingMethod.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EnclosingMethod.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EnumElementValue.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EnumElementValue.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EnumElementValue.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EnumElementValue.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumber.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumber.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumber.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumber.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Method.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Method.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Method.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Method.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/MethodParameter.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/MethodParameter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/MethodParameter.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/MethodParameter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/MethodParameters.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/MethodParameters.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/MethodParameters.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/MethodParameters.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Node.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Node.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Node.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Node.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/PMGClass.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/PMGClass.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/PMGClass.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/PMGClass.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ParameterAnnotationEntry.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ParameterAnnotationEntry.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ParameterAnnotationEntry.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ParameterAnnotationEntry.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ParameterAnnotations.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ParameterAnnotations.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ParameterAnnotations.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ParameterAnnotations.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeInvisibleAnnotations.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeInvisibleAnnotations.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeInvisibleAnnotations.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeInvisibleAnnotations.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeInvisibleParameterAnnotations.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeInvisibleParameterAnnotations.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeInvisibleParameterAnnotations.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeInvisibleParameterAnnotations.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeVisibleAnnotations.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeVisibleAnnotations.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeVisibleAnnotations.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeVisibleAnnotations.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeVisibleParameterAnnotations.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeVisibleParameterAnnotations.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeVisibleParameterAnnotations.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/RuntimeVisibleParameterAnnotations.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Signature.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Signature.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Signature.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Signature.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/SimpleElementValue.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/SimpleElementValue.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/SimpleElementValue.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/SimpleElementValue.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/SourceFile.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/SourceFile.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/SourceFile.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/SourceFile.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMap.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMap.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMap.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMap.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapType.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Synthetic.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Synthetic.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Synthetic.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Synthetic.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Unknown.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Unknown.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Unknown.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Unknown.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/UnknownAttributeReader.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/UnknownAttributeReader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/UnknownAttributeReader.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/UnknownAttributeReader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Visitor.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Visitor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Visitor.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Visitor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/package.html b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/package.html rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AALOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AALOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AALOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ALOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ALOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ALOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARETURN.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARETURN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARETURN.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARETURN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AnnotationElementValueGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AnnotationElementValueGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AnnotationElementValueGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AnnotationElementValueGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AnnotationEntryGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AnnotationEntryGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AnnotationEntryGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AnnotationEntryGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayElementValueGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayElementValueGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayElementValueGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayElementValueGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BALOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BALOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BALOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassElementValueGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassElementValueGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassElementValueGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassElementValueGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2I.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2I.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2I.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2I.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DADD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DADD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DADD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DADD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DDIV.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DDIV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DDIV.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DDIV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DNEG.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DNEG.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DNEG.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DNEG.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ElementValueGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ElementValueGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ElementValueGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ElementValueGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ElementValuePairGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ElementValuePairGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ElementValuePairGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ElementValuePairGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EnumElementValueGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EnumElementValueGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EnumElementValueGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EnumElementValueGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FALOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FALOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FALOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FNEG.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FNEG.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FNEG.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FNEG.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FREM.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FREM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FREM.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FREM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FRETURN.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FRETURN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FRETURN.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FRETURN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETFIELD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETFIELD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETFIELD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETFIELD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2C.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2C.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2C.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2C.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2L.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2L.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2L.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2L.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2S.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2S.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2S.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2S.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IALOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IALOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IALOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGT.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGT.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGT.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGT.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNULL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNULL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNULL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNULL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMUL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMUL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMUL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMUL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEDYNAMIC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEDYNAMIC.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEDYNAMIC.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEDYNAMIC.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IUSHR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IUSHR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IUSHR.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IUSHR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConst.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConst.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConst.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConst.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2F.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2F.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2F.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2F.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LMUL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LMUL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LMUL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LMUL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LXOR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LXOR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LXOR.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LXOR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodObserver.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodObserver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodObserver.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodObserver.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEW.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEW.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEW.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEW.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NameSignatureInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NameSignatureInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NameSignatureInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NameSignatureInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUSH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUSH.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUSH.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUSH.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWAP.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWAP.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWAP.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWAP.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWITCH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWITCH.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWITCH.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWITCH.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SimpleElementValueGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SimpleElementValueGen.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SimpleElementValueGen.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SimpleElementValueGen.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Visitor.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Visitor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Visitor.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Visitor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/package.html b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/package.html rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/package.html b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/package.html rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/AttributeHTML.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/AttributeHTML.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/AttributeHTML.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/AttributeHTML.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELComparator.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELComparator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELComparator.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELComparator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELifier.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELifier.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELifier.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELifier.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ByteSequence.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ByteSequence.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ByteSequence.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ByteSequence.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Class2HTML.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Class2HTML.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Class2HTML.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Class2HTML.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassQueue.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassQueue.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassQueue.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassQueue.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassSet.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassSet.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassSet.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassSet.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassStack.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassStack.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassStack.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassStack.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/CodeHTML.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/CodeHTML.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/CodeHTML.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/CodeHTML.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ConstantHTML.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ConstantHTML.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ConstantHTML.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ConstantHTML.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/MethodHTML.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/MethodHTML.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/MethodHTML.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/MethodHTML.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Repository.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Repository.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Repository.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Repository.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/package.html b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/package.html rename to src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/XalanConstants.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/XalanConstants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/XalanConstants.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/XalanConstants.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/package.html b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltBase.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltBase.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltMath.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltMath.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltMath.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltMath.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltSets.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltSets.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltSets.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltSets.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/Extensions.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/Extensions.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/Extensions.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/Extensions.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/NodeInfo.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/NodeInfo.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/NodeInfo.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/NodeInfo.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/package.html b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/package.html b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/Constants.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/Constants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/Constants.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/Constants.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/package.html b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/package.html b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOM.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOM.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/TransletException.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/TransletException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/TransletException.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/TransletException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java rename to src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AbortException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AbortException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AbortException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AbortException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ChildNode.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ChildNode.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ChildNode.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ChildNode.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CommentImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CommentImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CommentImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CommentImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNode.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNode.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNode.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNode.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/LCount.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/LCount.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/LCount.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/LCount.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeListCache.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeListCache.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeListCache.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeListCache.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NotationImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NotationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NotationImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NotationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ParentNode.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ParentNode.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ParentNode.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ParentNode.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TextImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TextImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TextImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TextImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ConfigurableValidationState.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ConfigurableValidationState.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ConfigurableValidationState.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ConfigurableValidationState.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/PSVIErrorList.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/PSVIErrorList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/PSVIErrorList.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/PSVIErrorList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDeclHelper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDeclHelper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDeclHelper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDeclHelper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XS10TypeHelper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XS10TypeHelper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XS10TypeHelper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XS10TypeHelper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AttributesProxy.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AttributesProxy.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AttributesProxy.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AttributesProxy.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMInputSource.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMInputSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMInputSource.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMInputSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMUtil.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMUtil.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMUtil.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMUtil.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EncodingMap.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EncodingMap.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EncodingMap.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EncodingMap.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/FeatureState.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/FeatureState.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/FeatureState.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/FeatureState.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/IntStack.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/IntStack.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/IntStack.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/IntStack.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorProxy.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorProxy.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorProxy.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorProxy.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/MessageFormatter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/MessageFormatter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/MessageFormatter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/MessageFormatter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/PrimeNumberSequenceGenerator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/PrimeNumberSequenceGenerator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/PrimeNumberSequenceGenerator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/PrimeNumberSequenceGenerator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/PropertyState.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/PropertyState.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/PropertyState.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/PropertyState.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXInputSource.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXInputSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXInputSource.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXInputSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXInputSource.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXInputSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXInputSource.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXInputSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/Status.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/Status.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/Status.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/Status.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolTable.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolTable.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/URI.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/URI.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/URI.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/URI.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XML11Char.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XML11Char.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XML11Char.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XML11Char.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLChar.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLChar.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLChar.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLChar.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLSymbols.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLSymbols.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLSymbols.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLSymbols.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/QName.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/QName.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/QName.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/QName.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLLocator.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLLocator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLLocator.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLLocator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLString.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLString.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLString.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLString.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XNIException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XNIException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XNIException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XNIException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSConstants.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSConstants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSConstants.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSConstants.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSException.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSFacet.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSFacet.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSFacet.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSFacet.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSImplementation.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSImplementation.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSImplementation.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSImplementation.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSLoader.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSLoader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSLoader.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSLoader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModel.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModel.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModel.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModel.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObject.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObject.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObject.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObject.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSParticle.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSParticle.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSParticle.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSParticle.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTerm.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTerm.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTerm.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTerm.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSValue.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSValue.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSValue.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSValue.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSWildcard.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSWildcard.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSWildcard.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSWildcard.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/package.html b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/Axis.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/Axis.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/Axis.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/Axis.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTM.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTM.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMException.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMException.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMManager.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/ElementState.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/ElementState.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/ElementState.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/ElementState.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/LineSeparator.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/LineSeparator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/LineSeparator.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/LineSeparator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Method.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Method.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Method.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Method.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/OutputFormat.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/OutputFormat.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/OutputFormat.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/OutputFormat.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Printer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Printer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Printer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Printer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Serializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Serializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Serializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Serializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/TextSerializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/TextSerializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/TextSerializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/TextSerializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOM3Serializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOM3Serializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOM3Serializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOM3Serializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemContext.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemContext.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemContext.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemContext.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemDesc.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemDesc.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemDesc.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemDesc.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Method.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Method.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Method.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Method.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Serializer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Serializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Serializer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Serializer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextStream.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextStream.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextStream.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextStream.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TreeWalker.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TreeWalker.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TreeWalker.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TreeWalker.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Version.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Version.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Version.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Version.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterChain.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterChain.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterChain.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterChain.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3SerializerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3SerializerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3SerializerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3SerializerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMConstants.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMConstants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMConstants.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMConstants.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorHandlerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorHandlerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorHandlerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorHandlerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMLocatorImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMLocatorImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMLocatorImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMLocatorImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMOutputImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMOutputImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMOutputImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMOutputImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_text.properties b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_text.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_text.properties rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_text.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_unknown.properties b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_unknown.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_unknown.properties rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_unknown.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/package.html b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Utils.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Utils.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Utils.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Utils.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/AttList.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/AttList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/AttList.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/AttList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/BoolStack.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/BoolStack.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/BoolStack.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/BoolStack.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/CharKey.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/CharKey.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/CharKey.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/CharKey.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Constants.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Constants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Constants.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Constants.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOM2Helper.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOM2Helper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOM2Helper.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOM2Helper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ElemDesc.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ElemDesc.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ElemDesc.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ElemDesc.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntStack.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntStack.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntStack.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntStack.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntVector.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntVector.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntVector.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntVector.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NSInfo.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NSInfo.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NSInfo.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NSInfo.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NameSpace.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NameSpace.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NameSpace.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NameSpace.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeConsumer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeConsumer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeConsumer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeConsumer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeVector.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeVector.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeVector.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeVector.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectStack.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectStack.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectStack.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectStack.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectVector.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectVector.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectVector.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectVector.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolver.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolver.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolver.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SafeThread.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SafeThread.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SafeThread.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SafeThread.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StopParseException.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StopParseException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StopParseException.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StopParseException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringBufferPool.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringBufferPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringBufferPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringBufferPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToIntTable.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToIntTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToIntTable.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToIntTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTable.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTable.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringVector.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringVector.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringVector.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringVector.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/TreeWalker.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/TreeWalker.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/TreeWalker.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/TreeWalker.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Trie.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Trie.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Trie.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Trie.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/UnImplNode.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/UnImplNode.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/UnImplNode.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/UnImplNode.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrongParserException.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrongParserException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrongParserException.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrongParserException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XML11Char.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XML11Char.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XML11Char.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XML11Char.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLChar.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLChar.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLChar.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLChar.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLString.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLString.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLString.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLString.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/package.html b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_de.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_de.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_de.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_en.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_en.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_en.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_en.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_es.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_es.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_es.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_es.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_it.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_it.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_it.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_it.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java rename to src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Arg.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Arg.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Arg.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Arg.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/CachedXPathAPI.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/CachedXPathAPI.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/CachedXPathAPI.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/CachedXPathAPI.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionNode.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionNode.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionNode.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionNode.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionOwner.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionOwner.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionOwner.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionOwner.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/FoundIndex.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/FoundIndex.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/FoundIndex.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/FoundIndex.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSetDTM.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSetDTM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSetDTM.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSetDTM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTree.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTree.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTree.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTree.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathAPI.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathAPI.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathAPI.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathAPI.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathProcessorException.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathProcessorException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathProcessorException.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathProcessorException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitable.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitable.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitor.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitor.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PathComponent.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PathComponent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PathComponent.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PathComponent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/RTFIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/RTFIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/RTFIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/RTFIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SubContextList.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SubContextList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SubContextList.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SubContextList.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/package.html b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Compiler.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Compiler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Compiler.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Compiler.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Keywords.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Keywords.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Keywords.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Keywords.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpCodes.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpCodes.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpCodes.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpCodes.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/package.html b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncConcat.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncConcat.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncConcat.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncConcat.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncContains.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncContains.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncContains.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncContains.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCount.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCount.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCount.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCount.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFloor.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFloor.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFloor.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFloor.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncHere.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncHere.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncHere.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncHere.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncId.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncId.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncId.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncId.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLang.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLang.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLang.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLang.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNot.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNot.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNot.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNot.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNumber.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNumber.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNumber.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNumber.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncQname.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncQname.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncQname.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncQname.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncRound.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncRound.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncRound.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncRound.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncString.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncString.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncString.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncString.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSum.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSum.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSum.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSum.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/package.html b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImplUtil.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImplUtil.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImplUtil.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImplUtil.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathNodesImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathNodesImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathNodesImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathNodesImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathResultImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathResultImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathResultImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathResultImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBoolean.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBoolean.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBoolean.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBoolean.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNull.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNull.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNull.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNull.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNumber.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNumber.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNumber.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNumber.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XString.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XString.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XString.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XString.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForChars.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForChars.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForChars.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForChars.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/package.html b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/And.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/And.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/And.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/And.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Bool.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Bool.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Bool.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Bool.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Div.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Div.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Div.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Div.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Equals.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Equals.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Equals.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Equals.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gt.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gt.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gt.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gt.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gte.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gte.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gte.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gte.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lt.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lt.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lt.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lt.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lte.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lte.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lte.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lte.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Minus.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Minus.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Minus.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Minus.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mod.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mod.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mod.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mod.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mult.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mult.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mult.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mult.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Neg.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Neg.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Neg.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Neg.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/NotEquals.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/NotEquals.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/NotEquals.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/NotEquals.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Number.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Number.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Number.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Number.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Or.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Or.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Or.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Or.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Plus.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Plus.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Plus.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Plus.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Quo.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Quo.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Quo.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Quo.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/String.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/String.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/String.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/String.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/package.html b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/package.html b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/package.html b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHMessages.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHMessages.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHMessages.java rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHMessages.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/package.html b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/package.html similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/package.html rename to src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/package.html diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/Entity.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/Entity.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/Entity.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/Entity.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/EventFilterSupport.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/EventFilterSupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/EventFilterSupport.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/EventFilterSupport.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxErrorReporter.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxErrorReporter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxErrorReporter.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/StaxErrorReporter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxXMLInputSource.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxXMLInputSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxXMLInputSource.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/StaxXMLInputSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityReader.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityReader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityReader.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityReader.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEventReaderImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEventReaderImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEventReaderImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEventReaderImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLInputFactoryImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLInputFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLInputFactoryImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/XMLInputFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/AttributeImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/AttributeImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/AttributeImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/AttributeImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CharacterEvent.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CharacterEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CharacterEvent.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/CharacterEvent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CommentEvent.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CommentEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CommentEvent.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/CommentEvent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DummyEvent.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DummyEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DummyEvent.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/DummyEvent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndDocumentEvent.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndDocumentEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndDocumentEvent.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndDocumentEvent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndElementEvent.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndElementEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndElementEvent.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndElementEvent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityReferenceEvent.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityReferenceEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityReferenceEvent.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityReferenceEvent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamedEvent.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamedEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamedEvent.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamedEvent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartDocumentEvent.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartDocumentEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartDocumentEvent.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartDocumentEvent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/WriterUtility.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/WriterUtility.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/WriterUtility.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/writers/WriterUtility.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLOutputSource.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLOutputSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLOutputSource.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLOutputSource.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterBase.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterBase.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterBase.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLWriter.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLWriter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLWriter.java rename to src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLWriter.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java b/src/java.xml/share/classes/javax/xml/XMLConstants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java rename to src/java.xml/share/classes/javax/xml/XMLConstants.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/AltCatalog.java b/src/java.xml/share/classes/javax/xml/catalog/AltCatalog.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/AltCatalog.java rename to src/java.xml/share/classes/javax/xml/catalog/AltCatalog.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/BaseEntry.java b/src/java.xml/share/classes/javax/xml/catalog/BaseEntry.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/BaseEntry.java rename to src/java.xml/share/classes/javax/xml/catalog/BaseEntry.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/Catalog.java b/src/java.xml/share/classes/javax/xml/catalog/Catalog.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/Catalog.java rename to src/java.xml/share/classes/javax/xml/catalog/Catalog.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogEntry.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogEntry.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogEntry.java rename to src/java.xml/share/classes/javax/xml/catalog/CatalogEntry.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogException.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogException.java rename to src/java.xml/share/classes/javax/xml/catalog/CatalogException.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java rename to src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java rename to src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java rename to src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages.java rename to src/java.xml/share/classes/javax/xml/catalog/CatalogMessages.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages.properties rename to src/java.xml/share/classes/javax/xml/catalog/CatalogMessages.properties diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_de.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_de.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_de.properties rename to src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_de.properties diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_es.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_es.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_es.properties rename to src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_es.properties diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_fr.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_fr.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_fr.properties rename to src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_fr.properties diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_it.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_it.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_it.properties rename to src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_it.properties diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ja.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ja.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ja.properties rename to src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ja.properties diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ko.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ko.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ko.properties rename to src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ko.properties diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_pt_BR.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_pt_BR.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_pt_BR.properties rename to src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_pt_BR.properties diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_sv.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_sv.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_sv.properties rename to src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_sv.properties diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_CN.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_CN.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_CN.properties rename to src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_CN.properties diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_TW.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_TW.properties similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_TW.properties rename to src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_TW.properties diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java rename to src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java rename to src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogResolverImpl.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogResolverImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogResolverImpl.java rename to src/java.xml/share/classes/javax/xml/catalog/CatalogResolverImpl.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/DelegatePublic.java b/src/java.xml/share/classes/javax/xml/catalog/DelegatePublic.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/DelegatePublic.java rename to src/java.xml/share/classes/javax/xml/catalog/DelegatePublic.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/DelegateSystem.java b/src/java.xml/share/classes/javax/xml/catalog/DelegateSystem.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/DelegateSystem.java rename to src/java.xml/share/classes/javax/xml/catalog/DelegateSystem.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/DelegateUri.java b/src/java.xml/share/classes/javax/xml/catalog/DelegateUri.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/DelegateUri.java rename to src/java.xml/share/classes/javax/xml/catalog/DelegateUri.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java b/src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java rename to src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/NextCatalog.java b/src/java.xml/share/classes/javax/xml/catalog/NextCatalog.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/NextCatalog.java rename to src/java.xml/share/classes/javax/xml/catalog/NextCatalog.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/Normalizer.java b/src/java.xml/share/classes/javax/xml/catalog/Normalizer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/Normalizer.java rename to src/java.xml/share/classes/javax/xml/catalog/Normalizer.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/PublicEntry.java b/src/java.xml/share/classes/javax/xml/catalog/PublicEntry.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/PublicEntry.java rename to src/java.xml/share/classes/javax/xml/catalog/PublicEntry.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/RewriteSystem.java b/src/java.xml/share/classes/javax/xml/catalog/RewriteSystem.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/RewriteSystem.java rename to src/java.xml/share/classes/javax/xml/catalog/RewriteSystem.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/RewriteUri.java b/src/java.xml/share/classes/javax/xml/catalog/RewriteUri.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/RewriteUri.java rename to src/java.xml/share/classes/javax/xml/catalog/RewriteUri.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/SystemEntry.java b/src/java.xml/share/classes/javax/xml/catalog/SystemEntry.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/SystemEntry.java rename to src/java.xml/share/classes/javax/xml/catalog/SystemEntry.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/SystemSuffix.java b/src/java.xml/share/classes/javax/xml/catalog/SystemSuffix.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/SystemSuffix.java rename to src/java.xml/share/classes/javax/xml/catalog/SystemSuffix.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/UriEntry.java b/src/java.xml/share/classes/javax/xml/catalog/UriEntry.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/UriEntry.java rename to src/java.xml/share/classes/javax/xml/catalog/UriEntry.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/UriSuffix.java b/src/java.xml/share/classes/javax/xml/catalog/UriSuffix.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/UriSuffix.java rename to src/java.xml/share/classes/javax/xml/catalog/UriSuffix.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/Util.java b/src/java.xml/share/classes/javax/xml/catalog/Util.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/Util.java rename to src/java.xml/share/classes/javax/xml/catalog/Util.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/package-info.java b/src/java.xml/share/classes/javax/xml/catalog/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/catalog/package-info.java rename to src/java.xml/share/classes/javax/xml/catalog/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java b/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java rename to src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java b/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java rename to src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java b/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java rename to src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/Duration.java b/src/java.xml/share/classes/javax/xml/datatype/Duration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/datatype/Duration.java rename to src/java.xml/share/classes/javax/xml/datatype/Duration.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java b/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java rename to src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/SecuritySupport.java b/src/java.xml/share/classes/javax/xml/datatype/SecuritySupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/datatype/SecuritySupport.java rename to src/java.xml/share/classes/javax/xml/datatype/SecuritySupport.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java b/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java rename to src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/package-info.java b/src/java.xml/share/classes/javax/xml/datatype/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/datatype/package-info.java rename to src/java.xml/share/classes/javax/xml/datatype/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java b/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java rename to src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/namespace/QName.java b/src/java.xml/share/classes/javax/xml/namespace/QName.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/namespace/QName.java rename to src/java.xml/share/classes/javax/xml/namespace/QName.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/namespace/package-info.java b/src/java.xml/share/classes/javax/xml/namespace/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/namespace/package-info.java rename to src/java.xml/share/classes/javax/xml/namespace/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/package-info.java b/src/java.xml/share/classes/javax/xml/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/package-info.java rename to src/java.xml/share/classes/javax/xml/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java b/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java rename to src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java b/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java rename to src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java b/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java rename to src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java b/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java rename to src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java b/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java rename to src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java b/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java rename to src/java.xml/share/classes/javax/xml/parsers/SAXParser.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java b/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java rename to src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/parsers/SecuritySupport.java b/src/java.xml/share/classes/javax/xml/parsers/SecuritySupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/parsers/SecuritySupport.java rename to src/java.xml/share/classes/javax/xml/parsers/SecuritySupport.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/parsers/package-info.java b/src/java.xml/share/classes/javax/xml/parsers/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/parsers/package-info.java rename to src/java.xml/share/classes/javax/xml/parsers/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/EventFilter.java b/src/java.xml/share/classes/javax/xml/stream/EventFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/EventFilter.java rename to src/java.xml/share/classes/javax/xml/stream/EventFilter.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java b/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java rename to src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java b/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java rename to src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/Location.java b/src/java.xml/share/classes/javax/xml/stream/Location.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/Location.java rename to src/java.xml/share/classes/javax/xml/stream/Location.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/SecuritySupport.java b/src/java.xml/share/classes/javax/xml/stream/SecuritySupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/SecuritySupport.java rename to src/java.xml/share/classes/javax/xml/stream/SecuritySupport.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/StreamFilter.java b/src/java.xml/share/classes/javax/xml/stream/StreamFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/StreamFilter.java rename to src/java.xml/share/classes/javax/xml/stream/StreamFilter.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java b/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java rename to src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventReader.java b/src/java.xml/share/classes/javax/xml/stream/XMLEventReader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventReader.java rename to src/java.xml/share/classes/javax/xml/stream/XMLEventReader.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java b/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java rename to src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java b/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java rename to src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java b/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java rename to src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLReporter.java b/src/java.xml/share/classes/javax/xml/stream/XMLReporter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/XMLReporter.java rename to src/java.xml/share/classes/javax/xml/stream/XMLReporter.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLResolver.java b/src/java.xml/share/classes/javax/xml/stream/XMLResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/XMLResolver.java rename to src/java.xml/share/classes/javax/xml/stream/XMLResolver.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamConstants.java b/src/java.xml/share/classes/javax/xml/stream/XMLStreamConstants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamConstants.java rename to src/java.xml/share/classes/javax/xml/stream/XMLStreamConstants.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java b/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java rename to src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java b/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java rename to src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java b/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java rename to src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Attribute.java b/src/java.xml/share/classes/javax/xml/stream/events/Attribute.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/Attribute.java rename to src/java.xml/share/classes/javax/xml/stream/events/Attribute.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Characters.java b/src/java.xml/share/classes/javax/xml/stream/events/Characters.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/Characters.java rename to src/java.xml/share/classes/javax/xml/stream/events/Characters.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Comment.java b/src/java.xml/share/classes/javax/xml/stream/events/Comment.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/Comment.java rename to src/java.xml/share/classes/javax/xml/stream/events/Comment.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/DTD.java b/src/java.xml/share/classes/javax/xml/stream/events/DTD.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/DTD.java rename to src/java.xml/share/classes/javax/xml/stream/events/DTD.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndDocument.java b/src/java.xml/share/classes/javax/xml/stream/events/EndDocument.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndDocument.java rename to src/java.xml/share/classes/javax/xml/stream/events/EndDocument.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndElement.java b/src/java.xml/share/classes/javax/xml/stream/events/EndElement.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndElement.java rename to src/java.xml/share/classes/javax/xml/stream/events/EndElement.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityDeclaration.java b/src/java.xml/share/classes/javax/xml/stream/events/EntityDeclaration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityDeclaration.java rename to src/java.xml/share/classes/javax/xml/stream/events/EntityDeclaration.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityReference.java b/src/java.xml/share/classes/javax/xml/stream/events/EntityReference.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityReference.java rename to src/java.xml/share/classes/javax/xml/stream/events/EntityReference.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Namespace.java b/src/java.xml/share/classes/javax/xml/stream/events/Namespace.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/Namespace.java rename to src/java.xml/share/classes/javax/xml/stream/events/Namespace.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/NotationDeclaration.java b/src/java.xml/share/classes/javax/xml/stream/events/NotationDeclaration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/NotationDeclaration.java rename to src/java.xml/share/classes/javax/xml/stream/events/NotationDeclaration.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/ProcessingInstruction.java b/src/java.xml/share/classes/javax/xml/stream/events/ProcessingInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/ProcessingInstruction.java rename to src/java.xml/share/classes/javax/xml/stream/events/ProcessingInstruction.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartDocument.java b/src/java.xml/share/classes/javax/xml/stream/events/StartDocument.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartDocument.java rename to src/java.xml/share/classes/javax/xml/stream/events/StartDocument.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartElement.java b/src/java.xml/share/classes/javax/xml/stream/events/StartElement.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartElement.java rename to src/java.xml/share/classes/javax/xml/stream/events/StartElement.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/XMLEvent.java b/src/java.xml/share/classes/javax/xml/stream/events/XMLEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/XMLEvent.java rename to src/java.xml/share/classes/javax/xml/stream/events/XMLEvent.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/package-info.java b/src/java.xml/share/classes/javax/xml/stream/events/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/events/package-info.java rename to src/java.xml/share/classes/javax/xml/stream/events/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/package-info.java b/src/java.xml/share/classes/javax/xml/stream/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/package-info.java rename to src/java.xml/share/classes/javax/xml/stream/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/EventReaderDelegate.java b/src/java.xml/share/classes/javax/xml/stream/util/EventReaderDelegate.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/util/EventReaderDelegate.java rename to src/java.xml/share/classes/javax/xml/stream/util/EventReaderDelegate.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/StreamReaderDelegate.java b/src/java.xml/share/classes/javax/xml/stream/util/StreamReaderDelegate.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/util/StreamReaderDelegate.java rename to src/java.xml/share/classes/javax/xml/stream/util/StreamReaderDelegate.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventAllocator.java b/src/java.xml/share/classes/javax/xml/stream/util/XMLEventAllocator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventAllocator.java rename to src/java.xml/share/classes/javax/xml/stream/util/XMLEventAllocator.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventConsumer.java b/src/java.xml/share/classes/javax/xml/stream/util/XMLEventConsumer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventConsumer.java rename to src/java.xml/share/classes/javax/xml/stream/util/XMLEventConsumer.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/package-info.java b/src/java.xml/share/classes/javax/xml/stream/util/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/stream/util/package-info.java rename to src/java.xml/share/classes/javax/xml/stream/util/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/ErrorListener.java b/src/java.xml/share/classes/javax/xml/transform/ErrorListener.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/ErrorListener.java rename to src/java.xml/share/classes/javax/xml/transform/ErrorListener.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java b/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java rename to src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/OutputKeys.java b/src/java.xml/share/classes/javax/xml/transform/OutputKeys.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/OutputKeys.java rename to src/java.xml/share/classes/javax/xml/transform/OutputKeys.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/Result.java b/src/java.xml/share/classes/javax/xml/transform/Result.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/Result.java rename to src/java.xml/share/classes/javax/xml/transform/Result.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/SecuritySupport.java b/src/java.xml/share/classes/javax/xml/transform/SecuritySupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/SecuritySupport.java rename to src/java.xml/share/classes/javax/xml/transform/SecuritySupport.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/Source.java b/src/java.xml/share/classes/javax/xml/transform/Source.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/Source.java rename to src/java.xml/share/classes/javax/xml/transform/Source.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/SourceLocator.java b/src/java.xml/share/classes/javax/xml/transform/SourceLocator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/SourceLocator.java rename to src/java.xml/share/classes/javax/xml/transform/SourceLocator.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/Templates.java b/src/java.xml/share/classes/javax/xml/transform/Templates.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/Templates.java rename to src/java.xml/share/classes/javax/xml/transform/Templates.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/Transformer.java b/src/java.xml/share/classes/javax/xml/transform/Transformer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/Transformer.java rename to src/java.xml/share/classes/javax/xml/transform/Transformer.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerConfigurationException.java b/src/java.xml/share/classes/javax/xml/transform/TransformerConfigurationException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerConfigurationException.java rename to src/java.xml/share/classes/javax/xml/transform/TransformerConfigurationException.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerException.java b/src/java.xml/share/classes/javax/xml/transform/TransformerException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerException.java rename to src/java.xml/share/classes/javax/xml/transform/TransformerException.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java b/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java rename to src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactoryConfigurationError.java b/src/java.xml/share/classes/javax/xml/transform/TransformerFactoryConfigurationError.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactoryConfigurationError.java rename to src/java.xml/share/classes/javax/xml/transform/TransformerFactoryConfigurationError.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/URIResolver.java b/src/java.xml/share/classes/javax/xml/transform/URIResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/URIResolver.java rename to src/java.xml/share/classes/javax/xml/transform/URIResolver.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMLocator.java b/src/java.xml/share/classes/javax/xml/transform/dom/DOMLocator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMLocator.java rename to src/java.xml/share/classes/javax/xml/transform/dom/DOMLocator.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java b/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java rename to src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java b/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java rename to src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/dom/package-info.java b/src/java.xml/share/classes/javax/xml/transform/dom/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/dom/package-info.java rename to src/java.xml/share/classes/javax/xml/transform/dom/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/overview.html b/src/java.xml/share/classes/javax/xml/transform/overview.html similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/overview.html rename to src/java.xml/share/classes/javax/xml/transform/overview.html diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/package-info.java b/src/java.xml/share/classes/javax/xml/transform/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/package-info.java rename to src/java.xml/share/classes/javax/xml/transform/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java b/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java rename to src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java b/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java rename to src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXTransformerFactory.java b/src/java.xml/share/classes/javax/xml/transform/sax/SAXTransformerFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXTransformerFactory.java rename to src/java.xml/share/classes/javax/xml/transform/sax/SAXTransformerFactory.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/TemplatesHandler.java b/src/java.xml/share/classes/javax/xml/transform/sax/TemplatesHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/sax/TemplatesHandler.java rename to src/java.xml/share/classes/javax/xml/transform/sax/TemplatesHandler.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/TransformerHandler.java b/src/java.xml/share/classes/javax/xml/transform/sax/TransformerHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/sax/TransformerHandler.java rename to src/java.xml/share/classes/javax/xml/transform/sax/TransformerHandler.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/package-info.java b/src/java.xml/share/classes/javax/xml/transform/sax/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/sax/package-info.java rename to src/java.xml/share/classes/javax/xml/transform/sax/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java b/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java rename to src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java b/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java rename to src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/stax/package-info.java b/src/java.xml/share/classes/javax/xml/transform/stax/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/stax/package-info.java rename to src/java.xml/share/classes/javax/xml/transform/stax/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java b/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java rename to src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java b/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java rename to src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/stream/package-info.java b/src/java.xml/share/classes/javax/xml/transform/stream/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/transform/stream/package-info.java rename to src/java.xml/share/classes/javax/xml/transform/stream/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/Schema.java b/src/java.xml/share/classes/javax/xml/validation/Schema.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/validation/Schema.java rename to src/java.xml/share/classes/javax/xml/validation/Schema.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java b/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java rename to src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryConfigurationError.java b/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryConfigurationError.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryConfigurationError.java rename to src/java.xml/share/classes/javax/xml/validation/SchemaFactoryConfigurationError.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java b/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java rename to src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java b/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java rename to src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/SecuritySupport.java b/src/java.xml/share/classes/javax/xml/validation/SecuritySupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/validation/SecuritySupport.java rename to src/java.xml/share/classes/javax/xml/validation/SecuritySupport.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java b/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java rename to src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/Validator.java b/src/java.xml/share/classes/javax/xml/validation/Validator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/validation/Validator.java rename to src/java.xml/share/classes/javax/xml/validation/Validator.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java b/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java rename to src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/package-info.java b/src/java.xml/share/classes/javax/xml/validation/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/validation/package-info.java rename to src/java.xml/share/classes/javax/xml/validation/package-info.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/SecuritySupport.java b/src/java.xml/share/classes/javax/xml/xpath/SecuritySupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/SecuritySupport.java rename to src/java.xml/share/classes/javax/xml/xpath/SecuritySupport.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPath.java b/src/java.xml/share/classes/javax/xml/xpath/XPath.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPath.java rename to src/java.xml/share/classes/javax/xml/xpath/XPath.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java b/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathEvaluationResult.java b/src/java.xml/share/classes/javax/xml/xpath/XPathEvaluationResult.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathEvaluationResult.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathEvaluationResult.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathException.java b/src/java.xml/share/classes/javax/xml/xpath/XPathException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathException.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathException.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java b/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java b/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java b/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java b/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java b/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java b/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java b/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java b/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathNodes.java b/src/java.xml/share/classes/javax/xml/xpath/XPathNodes.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathNodes.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathNodes.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java b/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java rename to src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/package-info.java b/src/java.xml/share/classes/javax/xml/xpath/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/javax/xml/xpath/package-info.java rename to src/java.xml/share/classes/javax/xml/xpath/package-info.java diff --git a/jaxp/src/java.xml/share/classes/jdk/xml/internal/JdkXmlFeatures.java b/src/java.xml/share/classes/jdk/xml/internal/JdkXmlFeatures.java similarity index 100% rename from jaxp/src/java.xml/share/classes/jdk/xml/internal/JdkXmlFeatures.java rename to src/java.xml/share/classes/jdk/xml/internal/JdkXmlFeatures.java diff --git a/jaxp/src/java.xml/share/classes/jdk/xml/internal/JdkXmlUtils.java b/src/java.xml/share/classes/jdk/xml/internal/JdkXmlUtils.java similarity index 100% rename from jaxp/src/java.xml/share/classes/jdk/xml/internal/JdkXmlUtils.java rename to src/java.xml/share/classes/jdk/xml/internal/JdkXmlUtils.java diff --git a/jaxp/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java b/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java rename to src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java diff --git a/jaxp/src/java.xml/share/classes/module-info.java b/src/java.xml/share/classes/module-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/module-info.java rename to src/java.xml/share/classes/module-info.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/Attr.java b/src/java.xml/share/classes/org/w3c/dom/Attr.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/Attr.java rename to src/java.xml/share/classes/org/w3c/dom/Attr.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/CDATASection.java b/src/java.xml/share/classes/org/w3c/dom/CDATASection.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/CDATASection.java rename to src/java.xml/share/classes/org/w3c/dom/CDATASection.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/CharacterData.java b/src/java.xml/share/classes/org/w3c/dom/CharacterData.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/CharacterData.java rename to src/java.xml/share/classes/org/w3c/dom/CharacterData.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/Comment.java b/src/java.xml/share/classes/org/w3c/dom/Comment.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/Comment.java rename to src/java.xml/share/classes/org/w3c/dom/Comment.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMConfiguration.java b/src/java.xml/share/classes/org/w3c/dom/DOMConfiguration.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/DOMConfiguration.java rename to src/java.xml/share/classes/org/w3c/dom/DOMConfiguration.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMError.java b/src/java.xml/share/classes/org/w3c/dom/DOMError.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/DOMError.java rename to src/java.xml/share/classes/org/w3c/dom/DOMError.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMErrorHandler.java b/src/java.xml/share/classes/org/w3c/dom/DOMErrorHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/DOMErrorHandler.java rename to src/java.xml/share/classes/org/w3c/dom/DOMErrorHandler.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMException.java b/src/java.xml/share/classes/org/w3c/dom/DOMException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/DOMException.java rename to src/java.xml/share/classes/org/w3c/dom/DOMException.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementation.java b/src/java.xml/share/classes/org/w3c/dom/DOMImplementation.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementation.java rename to src/java.xml/share/classes/org/w3c/dom/DOMImplementation.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementationList.java b/src/java.xml/share/classes/org/w3c/dom/DOMImplementationList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementationList.java rename to src/java.xml/share/classes/org/w3c/dom/DOMImplementationList.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementationSource.java b/src/java.xml/share/classes/org/w3c/dom/DOMImplementationSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementationSource.java rename to src/java.xml/share/classes/org/w3c/dom/DOMImplementationSource.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMLocator.java b/src/java.xml/share/classes/org/w3c/dom/DOMLocator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/DOMLocator.java rename to src/java.xml/share/classes/org/w3c/dom/DOMLocator.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMStringList.java b/src/java.xml/share/classes/org/w3c/dom/DOMStringList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/DOMStringList.java rename to src/java.xml/share/classes/org/w3c/dom/DOMStringList.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/Document.java b/src/java.xml/share/classes/org/w3c/dom/Document.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/Document.java rename to src/java.xml/share/classes/org/w3c/dom/Document.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/DocumentFragment.java b/src/java.xml/share/classes/org/w3c/dom/DocumentFragment.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/DocumentFragment.java rename to src/java.xml/share/classes/org/w3c/dom/DocumentFragment.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/DocumentType.java b/src/java.xml/share/classes/org/w3c/dom/DocumentType.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/DocumentType.java rename to src/java.xml/share/classes/org/w3c/dom/DocumentType.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/Element.java b/src/java.xml/share/classes/org/w3c/dom/Element.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/Element.java rename to src/java.xml/share/classes/org/w3c/dom/Element.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ElementTraversal.java b/src/java.xml/share/classes/org/w3c/dom/ElementTraversal.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ElementTraversal.java rename to src/java.xml/share/classes/org/w3c/dom/ElementTraversal.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/Entity.java b/src/java.xml/share/classes/org/w3c/dom/Entity.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/Entity.java rename to src/java.xml/share/classes/org/w3c/dom/Entity.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/EntityReference.java b/src/java.xml/share/classes/org/w3c/dom/EntityReference.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/EntityReference.java rename to src/java.xml/share/classes/org/w3c/dom/EntityReference.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/NameList.java b/src/java.xml/share/classes/org/w3c/dom/NameList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/NameList.java rename to src/java.xml/share/classes/org/w3c/dom/NameList.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/NamedNodeMap.java b/src/java.xml/share/classes/org/w3c/dom/NamedNodeMap.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/NamedNodeMap.java rename to src/java.xml/share/classes/org/w3c/dom/NamedNodeMap.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/Node.java b/src/java.xml/share/classes/org/w3c/dom/Node.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/Node.java rename to src/java.xml/share/classes/org/w3c/dom/Node.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/NodeList.java b/src/java.xml/share/classes/org/w3c/dom/NodeList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/NodeList.java rename to src/java.xml/share/classes/org/w3c/dom/NodeList.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/Notation.java b/src/java.xml/share/classes/org/w3c/dom/Notation.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/Notation.java rename to src/java.xml/share/classes/org/w3c/dom/Notation.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ProcessingInstruction.java b/src/java.xml/share/classes/org/w3c/dom/ProcessingInstruction.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ProcessingInstruction.java rename to src/java.xml/share/classes/org/w3c/dom/ProcessingInstruction.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/Text.java b/src/java.xml/share/classes/org/w3c/dom/Text.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/Text.java rename to src/java.xml/share/classes/org/w3c/dom/Text.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/TypeInfo.java b/src/java.xml/share/classes/org/w3c/dom/TypeInfo.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/TypeInfo.java rename to src/java.xml/share/classes/org/w3c/dom/TypeInfo.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/UserDataHandler.java b/src/java.xml/share/classes/org/w3c/dom/UserDataHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/UserDataHandler.java rename to src/java.xml/share/classes/org/w3c/dom/UserDataHandler.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/bootstrap/DOMImplementationRegistry.java b/src/java.xml/share/classes/org/w3c/dom/bootstrap/DOMImplementationRegistry.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/bootstrap/DOMImplementationRegistry.java rename to src/java.xml/share/classes/org/w3c/dom/bootstrap/DOMImplementationRegistry.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/bootstrap/package-info.java b/src/java.xml/share/classes/org/w3c/dom/bootstrap/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/bootstrap/package-info.java rename to src/java.xml/share/classes/org/w3c/dom/bootstrap/package-info.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/events/DocumentEvent.java b/src/java.xml/share/classes/org/w3c/dom/events/DocumentEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/events/DocumentEvent.java rename to src/java.xml/share/classes/org/w3c/dom/events/DocumentEvent.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/events/Event.java b/src/java.xml/share/classes/org/w3c/dom/events/Event.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/events/Event.java rename to src/java.xml/share/classes/org/w3c/dom/events/Event.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventException.java b/src/java.xml/share/classes/org/w3c/dom/events/EventException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventException.java rename to src/java.xml/share/classes/org/w3c/dom/events/EventException.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventListener.java b/src/java.xml/share/classes/org/w3c/dom/events/EventListener.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventListener.java rename to src/java.xml/share/classes/org/w3c/dom/events/EventListener.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventTarget.java b/src/java.xml/share/classes/org/w3c/dom/events/EventTarget.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventTarget.java rename to src/java.xml/share/classes/org/w3c/dom/events/EventTarget.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/events/MouseEvent.java b/src/java.xml/share/classes/org/w3c/dom/events/MouseEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/events/MouseEvent.java rename to src/java.xml/share/classes/org/w3c/dom/events/MouseEvent.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/events/MutationEvent.java b/src/java.xml/share/classes/org/w3c/dom/events/MutationEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/events/MutationEvent.java rename to src/java.xml/share/classes/org/w3c/dom/events/MutationEvent.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/events/UIEvent.java b/src/java.xml/share/classes/org/w3c/dom/events/UIEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/events/UIEvent.java rename to src/java.xml/share/classes/org/w3c/dom/events/UIEvent.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/events/package-info.java b/src/java.xml/share/classes/org/w3c/dom/events/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/events/package-info.java rename to src/java.xml/share/classes/org/w3c/dom/events/package-info.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/DOMImplementationLS.java b/src/java.xml/share/classes/org/w3c/dom/ls/DOMImplementationLS.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ls/DOMImplementationLS.java rename to src/java.xml/share/classes/org/w3c/dom/ls/DOMImplementationLS.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java b/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java rename to src/java.xml/share/classes/org/w3c/dom/ls/LSException.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSInput.java b/src/java.xml/share/classes/org/w3c/dom/ls/LSInput.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSInput.java rename to src/java.xml/share/classes/org/w3c/dom/ls/LSInput.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSLoadEvent.java b/src/java.xml/share/classes/org/w3c/dom/ls/LSLoadEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSLoadEvent.java rename to src/java.xml/share/classes/org/w3c/dom/ls/LSLoadEvent.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSOutput.java b/src/java.xml/share/classes/org/w3c/dom/ls/LSOutput.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSOutput.java rename to src/java.xml/share/classes/org/w3c/dom/ls/LSOutput.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSParser.java b/src/java.xml/share/classes/org/w3c/dom/ls/LSParser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSParser.java rename to src/java.xml/share/classes/org/w3c/dom/ls/LSParser.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSParserFilter.java b/src/java.xml/share/classes/org/w3c/dom/ls/LSParserFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSParserFilter.java rename to src/java.xml/share/classes/org/w3c/dom/ls/LSParserFilter.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSProgressEvent.java b/src/java.xml/share/classes/org/w3c/dom/ls/LSProgressEvent.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSProgressEvent.java rename to src/java.xml/share/classes/org/w3c/dom/ls/LSProgressEvent.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSResourceResolver.java b/src/java.xml/share/classes/org/w3c/dom/ls/LSResourceResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSResourceResolver.java rename to src/java.xml/share/classes/org/w3c/dom/ls/LSResourceResolver.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializer.java b/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializer.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializer.java rename to src/java.xml/share/classes/org/w3c/dom/ls/LSSerializer.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializerFilter.java b/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializerFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializerFilter.java rename to src/java.xml/share/classes/org/w3c/dom/ls/LSSerializerFilter.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/package-info.java b/src/java.xml/share/classes/org/w3c/dom/ls/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ls/package-info.java rename to src/java.xml/share/classes/org/w3c/dom/ls/package-info.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/package-info.java b/src/java.xml/share/classes/org/w3c/dom/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/package-info.java rename to src/java.xml/share/classes/org/w3c/dom/package-info.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/DocumentRange.java b/src/java.xml/share/classes/org/w3c/dom/ranges/DocumentRange.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/DocumentRange.java rename to src/java.xml/share/classes/org/w3c/dom/ranges/DocumentRange.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/Range.java b/src/java.xml/share/classes/org/w3c/dom/ranges/Range.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/Range.java rename to src/java.xml/share/classes/org/w3c/dom/ranges/Range.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java b/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java rename to src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/package-info.java b/src/java.xml/share/classes/org/w3c/dom/ranges/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/package-info.java rename to src/java.xml/share/classes/org/w3c/dom/ranges/package-info.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/DocumentTraversal.java b/src/java.xml/share/classes/org/w3c/dom/traversal/DocumentTraversal.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/DocumentTraversal.java rename to src/java.xml/share/classes/org/w3c/dom/traversal/DocumentTraversal.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/NodeFilter.java b/src/java.xml/share/classes/org/w3c/dom/traversal/NodeFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/NodeFilter.java rename to src/java.xml/share/classes/org/w3c/dom/traversal/NodeFilter.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/NodeIterator.java b/src/java.xml/share/classes/org/w3c/dom/traversal/NodeIterator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/NodeIterator.java rename to src/java.xml/share/classes/org/w3c/dom/traversal/NodeIterator.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/TreeWalker.java b/src/java.xml/share/classes/org/w3c/dom/traversal/TreeWalker.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/TreeWalker.java rename to src/java.xml/share/classes/org/w3c/dom/traversal/TreeWalker.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/package-info.java b/src/java.xml/share/classes/org/w3c/dom/traversal/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/package-info.java rename to src/java.xml/share/classes/org/w3c/dom/traversal/package-info.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/views/AbstractView.java b/src/java.xml/share/classes/org/w3c/dom/views/AbstractView.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/views/AbstractView.java rename to src/java.xml/share/classes/org/w3c/dom/views/AbstractView.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/views/DocumentView.java b/src/java.xml/share/classes/org/w3c/dom/views/DocumentView.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/views/DocumentView.java rename to src/java.xml/share/classes/org/w3c/dom/views/DocumentView.java diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/views/package-info.java b/src/java.xml/share/classes/org/w3c/dom/views/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/w3c/dom/views/package-info.java rename to src/java.xml/share/classes/org/w3c/dom/views/package-info.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/AttributeList.java b/src/java.xml/share/classes/org/xml/sax/AttributeList.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/AttributeList.java rename to src/java.xml/share/classes/org/xml/sax/AttributeList.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/Attributes.java b/src/java.xml/share/classes/org/xml/sax/Attributes.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/Attributes.java rename to src/java.xml/share/classes/org/xml/sax/Attributes.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/ContentHandler.java b/src/java.xml/share/classes/org/xml/sax/ContentHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/ContentHandler.java rename to src/java.xml/share/classes/org/xml/sax/ContentHandler.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/DTDHandler.java b/src/java.xml/share/classes/org/xml/sax/DTDHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/DTDHandler.java rename to src/java.xml/share/classes/org/xml/sax/DTDHandler.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/DocumentHandler.java b/src/java.xml/share/classes/org/xml/sax/DocumentHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/DocumentHandler.java rename to src/java.xml/share/classes/org/xml/sax/DocumentHandler.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/EntityResolver.java b/src/java.xml/share/classes/org/xml/sax/EntityResolver.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/EntityResolver.java rename to src/java.xml/share/classes/org/xml/sax/EntityResolver.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/ErrorHandler.java b/src/java.xml/share/classes/org/xml/sax/ErrorHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/ErrorHandler.java rename to src/java.xml/share/classes/org/xml/sax/ErrorHandler.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/HandlerBase.java b/src/java.xml/share/classes/org/xml/sax/HandlerBase.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/HandlerBase.java rename to src/java.xml/share/classes/org/xml/sax/HandlerBase.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/InputSource.java b/src/java.xml/share/classes/org/xml/sax/InputSource.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/InputSource.java rename to src/java.xml/share/classes/org/xml/sax/InputSource.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/Locator.java b/src/java.xml/share/classes/org/xml/sax/Locator.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/Locator.java rename to src/java.xml/share/classes/org/xml/sax/Locator.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/Parser.java b/src/java.xml/share/classes/org/xml/sax/Parser.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/Parser.java rename to src/java.xml/share/classes/org/xml/sax/Parser.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/SAXException.java b/src/java.xml/share/classes/org/xml/sax/SAXException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/SAXException.java rename to src/java.xml/share/classes/org/xml/sax/SAXException.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/SAXNotRecognizedException.java b/src/java.xml/share/classes/org/xml/sax/SAXNotRecognizedException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/SAXNotRecognizedException.java rename to src/java.xml/share/classes/org/xml/sax/SAXNotRecognizedException.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/SAXNotSupportedException.java b/src/java.xml/share/classes/org/xml/sax/SAXNotSupportedException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/SAXNotSupportedException.java rename to src/java.xml/share/classes/org/xml/sax/SAXNotSupportedException.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/SAXParseException.java b/src/java.xml/share/classes/org/xml/sax/SAXParseException.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/SAXParseException.java rename to src/java.xml/share/classes/org/xml/sax/SAXParseException.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/XMLFilter.java b/src/java.xml/share/classes/org/xml/sax/XMLFilter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/XMLFilter.java rename to src/java.xml/share/classes/org/xml/sax/XMLFilter.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/XMLReader.java b/src/java.xml/share/classes/org/xml/sax/XMLReader.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/XMLReader.java rename to src/java.xml/share/classes/org/xml/sax/XMLReader.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/ext/Attributes2.java b/src/java.xml/share/classes/org/xml/sax/ext/Attributes2.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/ext/Attributes2.java rename to src/java.xml/share/classes/org/xml/sax/ext/Attributes2.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/ext/Attributes2Impl.java b/src/java.xml/share/classes/org/xml/sax/ext/Attributes2Impl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/ext/Attributes2Impl.java rename to src/java.xml/share/classes/org/xml/sax/ext/Attributes2Impl.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/ext/DeclHandler.java b/src/java.xml/share/classes/org/xml/sax/ext/DeclHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/ext/DeclHandler.java rename to src/java.xml/share/classes/org/xml/sax/ext/DeclHandler.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/ext/DefaultHandler2.java b/src/java.xml/share/classes/org/xml/sax/ext/DefaultHandler2.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/ext/DefaultHandler2.java rename to src/java.xml/share/classes/org/xml/sax/ext/DefaultHandler2.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/ext/EntityResolver2.java b/src/java.xml/share/classes/org/xml/sax/ext/EntityResolver2.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/ext/EntityResolver2.java rename to src/java.xml/share/classes/org/xml/sax/ext/EntityResolver2.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/ext/LexicalHandler.java b/src/java.xml/share/classes/org/xml/sax/ext/LexicalHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/ext/LexicalHandler.java rename to src/java.xml/share/classes/org/xml/sax/ext/LexicalHandler.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/ext/Locator2.java b/src/java.xml/share/classes/org/xml/sax/ext/Locator2.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/ext/Locator2.java rename to src/java.xml/share/classes/org/xml/sax/ext/Locator2.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/ext/Locator2Impl.java b/src/java.xml/share/classes/org/xml/sax/ext/Locator2Impl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/ext/Locator2Impl.java rename to src/java.xml/share/classes/org/xml/sax/ext/Locator2Impl.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/ext/package-info.java b/src/java.xml/share/classes/org/xml/sax/ext/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/ext/package-info.java rename to src/java.xml/share/classes/org/xml/sax/ext/package-info.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/AttributeListImpl.java b/src/java.xml/share/classes/org/xml/sax/helpers/AttributeListImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/AttributeListImpl.java rename to src/java.xml/share/classes/org/xml/sax/helpers/AttributeListImpl.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/AttributesImpl.java b/src/java.xml/share/classes/org/xml/sax/helpers/AttributesImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/AttributesImpl.java rename to src/java.xml/share/classes/org/xml/sax/helpers/AttributesImpl.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/DefaultHandler.java b/src/java.xml/share/classes/org/xml/sax/helpers/DefaultHandler.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/DefaultHandler.java rename to src/java.xml/share/classes/org/xml/sax/helpers/DefaultHandler.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/LocatorImpl.java b/src/java.xml/share/classes/org/xml/sax/helpers/LocatorImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/LocatorImpl.java rename to src/java.xml/share/classes/org/xml/sax/helpers/LocatorImpl.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NamespaceSupport.java b/src/java.xml/share/classes/org/xml/sax/helpers/NamespaceSupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NamespaceSupport.java rename to src/java.xml/share/classes/org/xml/sax/helpers/NamespaceSupport.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NewInstance.java b/src/java.xml/share/classes/org/xml/sax/helpers/NewInstance.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NewInstance.java rename to src/java.xml/share/classes/org/xml/sax/helpers/NewInstance.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserAdapter.java b/src/java.xml/share/classes/org/xml/sax/helpers/ParserAdapter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserAdapter.java rename to src/java.xml/share/classes/org/xml/sax/helpers/ParserAdapter.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserFactory.java b/src/java.xml/share/classes/org/xml/sax/helpers/ParserFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserFactory.java rename to src/java.xml/share/classes/org/xml/sax/helpers/ParserFactory.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/SecuritySupport.java b/src/java.xml/share/classes/org/xml/sax/helpers/SecuritySupport.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/SecuritySupport.java rename to src/java.xml/share/classes/org/xml/sax/helpers/SecuritySupport.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLFilterImpl.java b/src/java.xml/share/classes/org/xml/sax/helpers/XMLFilterImpl.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLFilterImpl.java rename to src/java.xml/share/classes/org/xml/sax/helpers/XMLFilterImpl.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderAdapter.java b/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderAdapter.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderAdapter.java rename to src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderAdapter.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderFactory.java b/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderFactory.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderFactory.java rename to src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderFactory.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/package-info.java b/src/java.xml/share/classes/org/xml/sax/helpers/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/helpers/package-info.java rename to src/java.xml/share/classes/org/xml/sax/helpers/package-info.java diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/package-info.java b/src/java.xml/share/classes/org/xml/sax/package-info.java similarity index 100% rename from jaxp/src/java.xml/share/classes/org/xml/sax/package-info.java rename to src/java.xml/share/classes/org/xml/sax/package-info.java diff --git a/jaxp/src/java.xml/share/legal/bcel.md b/src/java.xml/share/legal/bcel.md similarity index 100% rename from jaxp/src/java.xml/share/legal/bcel.md rename to src/java.xml/share/legal/bcel.md diff --git a/jaxp/src/java.xml/share/legal/dom.md b/src/java.xml/share/legal/dom.md similarity index 100% rename from jaxp/src/java.xml/share/legal/dom.md rename to src/java.xml/share/legal/dom.md diff --git a/jaxp/src/java.xml/share/legal/jcup.md b/src/java.xml/share/legal/jcup.md similarity index 100% rename from jaxp/src/java.xml/share/legal/jcup.md rename to src/java.xml/share/legal/jcup.md diff --git a/jaxp/src/java.xml/share/legal/xalan.md b/src/java.xml/share/legal/xalan.md similarity index 100% rename from jaxp/src/java.xml/share/legal/xalan.md rename to src/java.xml/share/legal/xalan.md diff --git a/jaxp/src/java.xml/share/legal/xerces.md b/src/java.xml/share/legal/xerces.md similarity index 100% rename from jaxp/src/java.xml/share/legal/xerces.md rename to src/java.xml/share/legal/xerces.md diff --git a/jaxp/src/java.xml/share/legal/xmlresolver.md b/src/java.xml/share/legal/xmlresolver.md similarity index 100% rename from jaxp/src/java.xml/share/legal/xmlresolver.md rename to src/java.xml/share/legal/xmlresolver.md diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityListenerList.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityListenerList.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityListenerList.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityListenerList.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventID.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventID.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventID.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventID.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventQueueMonitor.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventQueueMonitor.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventQueueMonitor.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventQueueMonitor.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/GUIInitializedListener.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/GUIInitializedListener.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/GUIInitializedListener.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/GUIInitializedListener.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/GUIInitializedMulticaster.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/GUIInitializedMulticaster.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/GUIInitializedMulticaster.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/GUIInitializedMulticaster.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/TopLevelWindowListener.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/TopLevelWindowListener.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/TopLevelWindowListener.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/TopLevelWindowListener.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/TopLevelWindowMulticaster.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/TopLevelWindowMulticaster.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/TopLevelWindowMulticaster.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/TopLevelWindowMulticaster.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/Translator.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/Translator.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/Translator.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/Translator.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/ButtonTranslator.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/ButtonTranslator.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/ButtonTranslator.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/ButtonTranslator.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/CheckboxTranslator.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/CheckboxTranslator.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/CheckboxTranslator.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/CheckboxTranslator.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/LabelTranslator.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/LabelTranslator.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/LabelTranslator.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/LabelTranslator.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/ListTranslator.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/ListTranslator.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/ListTranslator.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/ListTranslator.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/TextComponentTranslator.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/TextComponentTranslator.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/TextComponentTranslator.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/internal/TextComponentTranslator.java diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/package-info.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/package-info.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/package-info.java rename to src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/package-info.java diff --git a/jdk/src/jdk.accessibility/share/classes/module-info.java b/src/jdk.accessibility/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.accessibility/share/classes/module-info.java rename to src/jdk.accessibility/share/classes/module-info.java diff --git a/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java b/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java similarity index 100% rename from jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java rename to src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java diff --git a/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/ProviderImpl.java b/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/ProviderImpl.java similarity index 100% rename from jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/ProviderImpl.java rename to src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/ProviderImpl.java diff --git a/jdk/src/jdk.accessibility/windows/classes/module-info.java.extra b/src/jdk.accessibility/windows/classes/module-info.java.extra similarity index 100% rename from jdk/src/jdk.accessibility/windows/classes/module-info.java.extra rename to src/jdk.accessibility/windows/classes/module-info.java.extra diff --git a/jdk/src/jdk.accessibility/windows/native/bridge/AccessBridgeCalls.c b/src/jdk.accessibility/windows/native/bridge/AccessBridgeCalls.c similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/bridge/AccessBridgeCalls.c rename to src/jdk.accessibility/windows/native/bridge/AccessBridgeCalls.c diff --git a/jdk/src/jdk.accessibility/windows/native/common/AccessBridgeDebug.cpp b/src/jdk.accessibility/windows/native/common/AccessBridgeDebug.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/common/AccessBridgeDebug.cpp rename to src/jdk.accessibility/windows/native/common/AccessBridgeDebug.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/common/AccessBridgeDebug.h b/src/jdk.accessibility/windows/native/common/AccessBridgeDebug.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/common/AccessBridgeDebug.h rename to src/jdk.accessibility/windows/native/common/AccessBridgeDebug.h diff --git a/jdk/src/jdk.accessibility/windows/native/common/AccessBridgeMessages.cpp b/src/jdk.accessibility/windows/native/common/AccessBridgeMessages.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/common/AccessBridgeMessages.cpp rename to src/jdk.accessibility/windows/native/common/AccessBridgeMessages.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/common/AccessBridgeMessages.h b/src/jdk.accessibility/windows/native/common/AccessBridgeMessages.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/common/AccessBridgeMessages.h rename to src/jdk.accessibility/windows/native/common/AccessBridgeMessages.h diff --git a/jdk/src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC b/src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC rename to src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC diff --git a/jdk/src/jdk.accessibility/windows/native/common/accessBridgeResource.h b/src/jdk.accessibility/windows/native/common/accessBridgeResource.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/common/accessBridgeResource.h rename to src/jdk.accessibility/windows/native/common/accessBridgeResource.h diff --git a/jdk/src/jdk.accessibility/windows/native/common/resource.h b/src/jdk.accessibility/windows/native/common/resource.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/common/resource.h rename to src/jdk.accessibility/windows/native/common/resource.h diff --git a/jdk/src/jdk.accessibility/windows/native/include/bridge/AccessBridgeCallbacks.h b/src/jdk.accessibility/windows/native/include/bridge/AccessBridgeCallbacks.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/include/bridge/AccessBridgeCallbacks.h rename to src/jdk.accessibility/windows/native/include/bridge/AccessBridgeCallbacks.h diff --git a/jdk/src/jdk.accessibility/windows/native/include/bridge/AccessBridgeCalls.h b/src/jdk.accessibility/windows/native/include/bridge/AccessBridgeCalls.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/include/bridge/AccessBridgeCalls.h rename to src/jdk.accessibility/windows/native/include/bridge/AccessBridgeCalls.h diff --git a/jdk/src/jdk.accessibility/windows/native/include/bridge/AccessBridgePackages.h b/src/jdk.accessibility/windows/native/include/bridge/AccessBridgePackages.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/include/bridge/AccessBridgePackages.h rename to src/jdk.accessibility/windows/native/include/bridge/AccessBridgePackages.h diff --git a/jdk/src/jdk.accessibility/windows/native/jabswitch/jabswitch.cpp b/src/jdk.accessibility/windows/native/jabswitch/jabswitch.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/jabswitch/jabswitch.cpp rename to src/jdk.accessibility/windows/native/jabswitch/jabswitch.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/jabswitch/jabswitch.manifest b/src/jdk.accessibility/windows/native/jabswitch/jabswitch.manifest similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/jabswitch/jabswitch.manifest rename to src/jdk.accessibility/windows/native/jabswitch/jabswitch.manifest diff --git a/jdk/src/jdk.accessibility/windows/native/jaccessinspector/MessageHistory.cpp b/src/jdk.accessibility/windows/native/jaccessinspector/MessageHistory.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/jaccessinspector/MessageHistory.cpp rename to src/jdk.accessibility/windows/native/jaccessinspector/MessageHistory.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/jaccessinspector/MessageHistory.h b/src/jdk.accessibility/windows/native/jaccessinspector/MessageHistory.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/jaccessinspector/MessageHistory.h rename to src/jdk.accessibility/windows/native/jaccessinspector/MessageHistory.h diff --git a/jdk/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspector.cpp b/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspector.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspector.cpp rename to src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspector.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspector.h b/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspector.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspector.h rename to src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspector.h diff --git a/jdk/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorResource.h b/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorResource.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorResource.h rename to src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorResource.h diff --git a/jdk/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorWindow.rc b/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorWindow.rc similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorWindow.rc rename to src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorWindow.rc diff --git a/jdk/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalker.cpp b/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalker.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalker.cpp rename to src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalker.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalker.h b/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalker.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalker.h rename to src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalker.h diff --git a/jdk/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerResource.h b/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerResource.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerResource.h rename to src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerResource.h diff --git a/jdk/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerWindow.rc b/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerWindow.rc similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerWindow.rc rename to src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerWindow.rc diff --git a/jdk/src/jdk.accessibility/windows/native/libjabsysinfo/AccessBridgeSysInfo.cpp b/src/jdk.accessibility/windows/native/libjabsysinfo/AccessBridgeSysInfo.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libjabsysinfo/AccessBridgeSysInfo.cpp rename to src/jdk.accessibility/windows/native/libjabsysinfo/AccessBridgeSysInfo.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.cpp b/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.cpp rename to src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.h b/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.h rename to src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.h diff --git a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp b/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp rename to src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.h b/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.h rename to src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.h diff --git a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.cpp b/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.cpp rename to src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.h b/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.h rename to src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.h diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeEventHandler.cpp b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeEventHandler.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeEventHandler.cpp rename to src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeEventHandler.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeEventHandler.h b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeEventHandler.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeEventHandler.h rename to src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeEventHandler.h diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeJavaVMInstance.cpp b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeJavaVMInstance.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeJavaVMInstance.cpp rename to src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeJavaVMInstance.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeJavaVMInstance.h b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeJavaVMInstance.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeJavaVMInstance.h rename to src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeJavaVMInstance.h diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeMessageQueue.cpp b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeMessageQueue.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeMessageQueue.cpp rename to src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeMessageQueue.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeMessageQueue.h b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeMessageQueue.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeMessageQueue.h rename to src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeMessageQueue.h diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeWindowsEntryPoints.cpp b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeWindowsEntryPoints.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeWindowsEntryPoints.cpp rename to src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeWindowsEntryPoints.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeWindowsEntryPoints.h b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeWindowsEntryPoints.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeWindowsEntryPoints.h rename to src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeWindowsEntryPoints.h diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.DEF b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.DEF similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.DEF rename to src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.DEF diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp rename to src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.h b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.h rename to src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.h diff --git a/jdk/src/jdk.accessibility/windows/native/toolscommon/AccessInfo.cpp b/src/jdk.accessibility/windows/native/toolscommon/AccessInfo.cpp similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/toolscommon/AccessInfo.cpp rename to src/jdk.accessibility/windows/native/toolscommon/AccessInfo.cpp diff --git a/jdk/src/jdk.accessibility/windows/native/toolscommon/AccessInfo.h b/src/jdk.accessibility/windows/native/toolscommon/AccessInfo.h similarity index 100% rename from jdk/src/jdk.accessibility/windows/native/toolscommon/AccessInfo.h rename to src/jdk.accessibility/windows/native/toolscommon/AccessInfo.h diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/ByteContainer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/ByteContainer.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/ByteContainer.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/ByteContainer.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/CodeContainer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/CodeContainer.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/CodeContainer.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/CodeContainer.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Container.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Container.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Container.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Container.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/GotSymbol.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/GotSymbol.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/GotSymbol.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/GotSymbol.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/HeaderContainer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/HeaderContainer.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/HeaderContainer.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/HeaderContainer.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/NativeSymbol.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/NativeSymbol.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/NativeSymbol.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/NativeSymbol.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/ReadOnlyDataContainer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/ReadOnlyDataContainer.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/ReadOnlyDataContainer.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/ReadOnlyDataContainer.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Relocation.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Relocation.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Relocation.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Relocation.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Symbol.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Symbol.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Symbol.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/Symbol.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/SymbolTable.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/SymbolTable.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/SymbolTable.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/SymbolTable.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/Elf.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/Elf.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/Elf.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/Elf.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfByteBuffer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfByteBuffer.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfByteBuffer.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfByteBuffer.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfContainer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfContainer.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfContainer.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfContainer.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfHeader.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfHeader.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfHeader.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfHeader.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfRelocEntry.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfRelocEntry.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfRelocEntry.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfRelocEntry.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfRelocTable.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfRelocTable.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfRelocTable.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfRelocTable.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfSection.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfSection.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfSection.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfSection.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfSymbol.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfSymbol.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfSymbol.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfSymbol.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfSymtab.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfSymtab.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfSymtab.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfSymtab.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfTargetInfo.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfTargetInfo.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfTargetInfo.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/ElfTargetInfo.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/JELFRelocObject.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/JELFRelocObject.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/JELFRelocObject.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/elf/JELFRelocObject.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/JMachORelocObject.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/JMachORelocObject.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/JMachORelocObject.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/JMachORelocObject.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachO.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachO.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachO.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachO.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOByteBuffer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOByteBuffer.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOByteBuffer.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOByteBuffer.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOContainer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOContainer.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOContainer.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOContainer.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachODySymtab.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachODySymtab.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachODySymtab.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachODySymtab.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOHeader.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOHeader.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOHeader.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOHeader.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachORelocEntry.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachORelocEntry.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachORelocEntry.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachORelocEntry.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachORelocTable.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachORelocTable.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachORelocTable.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachORelocTable.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSection.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSection.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSection.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSection.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSegment.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSegment.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSegment.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSegment.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSymbol.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSymbol.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSymbol.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSymbol.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSymtab.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSymtab.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSymtab.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOSymtab.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOTargetInfo.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOTargetInfo.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOTargetInfo.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOTargetInfo.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOVersion.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOVersion.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOVersion.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/macho/MachOVersion.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/JPECoffRelocObject.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/JPECoffRelocObject.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/JPECoffRelocObject.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/JPECoffRelocObject.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoff.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoff.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoff.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoff.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffByteBuffer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffByteBuffer.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffByteBuffer.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffByteBuffer.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffContainer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffContainer.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffContainer.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffContainer.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffHeader.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffHeader.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffHeader.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffHeader.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffRelocEntry.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffRelocEntry.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffRelocEntry.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffRelocEntry.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffRelocTable.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffRelocTable.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffRelocTable.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffRelocTable.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSection.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSection.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSection.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSection.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSymbol.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSymbol.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSymbol.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSymbol.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSymtab.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSymtab.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSymtab.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSymtab.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffTargetInfo.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffTargetInfo.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffTargetInfo.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffTargetInfo.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTBackend.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTBackend.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTBackend.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTBackend.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompilationTask.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompilationTask.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompilationTask.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompilationTask.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompiledClass.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompiledClass.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompiledClass.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompiledClass.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompiler.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompiler.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompiler.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompiler.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTHotSpotResolvedJavaMethod.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTHotSpotResolvedJavaMethod.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTHotSpotResolvedJavaMethod.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTHotSpotResolvedJavaMethod.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTStub.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTStub.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTStub.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTStub.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallInfo.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallInfo.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallInfo.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallInfo.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallSiteRelocationInfo.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallSiteRelocationInfo.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallSiteRelocationInfo.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallSiteRelocationInfo.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallSiteRelocationSymbol.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallSiteRelocationSymbol.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallSiteRelocationSymbol.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallSiteRelocationSymbol.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeOffsets.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeOffsets.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeOffsets.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeOffsets.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeSectionProcessor.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeSectionProcessor.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeSectionProcessor.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeSectionProcessor.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Collector.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Collector.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Collector.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Collector.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CompilationSpec.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CompilationSpec.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CompilationSpec.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CompilationSpec.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CompiledMethodInfo.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CompiledMethodInfo.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CompiledMethodInfo.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CompiledMethodInfo.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/DataBuilder.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/DataBuilder.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/DataBuilder.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/DataBuilder.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/DataPatchProcessor.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/DataPatchProcessor.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/DataPatchProcessor.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/DataPatchProcessor.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ELFMacroAssembler.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ELFMacroAssembler.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ELFMacroAssembler.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ELFMacroAssembler.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ForeignCallSiteRelocationInfo.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ForeignCallSiteRelocationInfo.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ForeignCallSiteRelocationInfo.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ForeignCallSiteRelocationInfo.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ForeignCallSiteRelocationSymbol.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ForeignCallSiteRelocationSymbol.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ForeignCallSiteRelocationSymbol.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ForeignCallSiteRelocationSymbol.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ForeignGotCallSiteRelocationSymbol.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ForeignGotCallSiteRelocationSymbol.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ForeignGotCallSiteRelocationSymbol.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ForeignGotCallSiteRelocationSymbol.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/GraalFilters.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/GraalFilters.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/GraalFilters.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/GraalFilters.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/InfopointProcessor.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/InfopointProcessor.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/InfopointProcessor.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/InfopointProcessor.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/InstructionDecoder.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/InstructionDecoder.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/InstructionDecoder.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/InstructionDecoder.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaCallSiteRelocationInfo.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaCallSiteRelocationInfo.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaCallSiteRelocationInfo.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaCallSiteRelocationInfo.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaCallSiteRelocationSymbol.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaCallSiteRelocationSymbol.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaCallSiteRelocationSymbol.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaCallSiteRelocationSymbol.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaMethodInfo.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaMethodInfo.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaMethodInfo.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaMethodInfo.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Linker.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Linker.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Linker.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Linker.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/LoadedClass.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/LoadedClass.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/LoadedClass.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/LoadedClass.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/LogPrinter.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/LogPrinter.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/LogPrinter.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/LogPrinter.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkId.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkId.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkId.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkId.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkProcessor.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkProcessor.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkProcessor.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkProcessor.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MetadataBuilder.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MetadataBuilder.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MetadataBuilder.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MetadataBuilder.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Options.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Options.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Options.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Options.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/StubDirectCallSiteRelocationSymbol.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/StubDirectCallSiteRelocationSymbol.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/StubDirectCallSiteRelocationSymbol.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/StubDirectCallSiteRelocationSymbol.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/StubInformation.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/StubInformation.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/StubInformation.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/StubInformation.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Timer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Timer.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Timer.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Timer.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/amd64/AMD64ELFMacroAssembler.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/amd64/AMD64ELFMacroAssembler.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/amd64/AMD64ELFMacroAssembler.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/amd64/AMD64ELFMacroAssembler.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/amd64/AMD64InstructionDecoder.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/amd64/AMD64InstructionDecoder.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/amd64/AMD64InstructionDecoder.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/amd64/AMD64InstructionDecoder.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/ClassSearch.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/ClassSearch.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/ClassSearch.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/ClassSearch.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/ClassSource.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/ClassSource.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/ClassSource.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/ClassSource.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/FileSupport.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/FileSupport.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/FileSupport.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/FileSupport.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/FileSystemFinder.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/FileSystemFinder.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/FileSystemFinder.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/FileSystemFinder.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/SearchFor.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/SearchFor.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/SearchFor.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/SearchFor.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/SearchPath.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/SearchPath.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/SearchPath.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/SearchPath.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/SourceProvider.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/SourceProvider.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/SourceProvider.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/SourceProvider.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/classname/ClassNameSource.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/classname/ClassNameSource.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/classname/ClassNameSource.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/classname/ClassNameSource.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/classname/ClassNameSourceProvider.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/classname/ClassNameSourceProvider.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/classname/ClassNameSourceProvider.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/classname/ClassNameSourceProvider.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/directory/DirectorySource.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/directory/DirectorySource.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/directory/DirectorySource.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/directory/DirectorySource.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/directory/DirectorySourceProvider.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/directory/DirectorySourceProvider.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/directory/DirectorySourceProvider.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/directory/DirectorySourceProvider.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/jar/JarFileSource.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/jar/JarFileSource.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/jar/JarFileSource.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/jar/JarFileSource.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/jar/JarSourceProvider.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/jar/JarSourceProvider.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/jar/JarSourceProvider.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/jar/JarSourceProvider.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/module/ModuleSource.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/module/ModuleSource.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/module/ModuleSource.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/module/ModuleSource.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/module/ModuleSourceProvider.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/module/ModuleSourceProvider.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/module/ModuleSourceProvider.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/module/ModuleSourceProvider.java diff --git a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/utils/NativeOrderOutputStream.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/utils/NativeOrderOutputStream.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/utils/NativeOrderOutputStream.java rename to src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/utils/NativeOrderOutputStream.java diff --git a/hotspot/src/jdk.aot/share/classes/module-info.java b/src/jdk.aot/share/classes/module-info.java similarity index 100% rename from hotspot/src/jdk.aot/share/classes/module-info.java rename to src/jdk.aot/share/classes/module-info.java diff --git a/jdk/src/jdk.attach/aix/classes/sun/tools/attach/AttachProviderImpl.java b/src/jdk.attach/aix/classes/sun/tools/attach/AttachProviderImpl.java similarity index 100% rename from jdk/src/jdk.attach/aix/classes/sun/tools/attach/AttachProviderImpl.java rename to src/jdk.attach/aix/classes/sun/tools/attach/AttachProviderImpl.java diff --git a/jdk/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java similarity index 100% rename from jdk/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java rename to src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java diff --git a/jdk/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c similarity index 100% rename from jdk/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c rename to src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c diff --git a/jdk/src/jdk.attach/linux/classes/sun/tools/attach/AttachProviderImpl.java b/src/jdk.attach/linux/classes/sun/tools/attach/AttachProviderImpl.java similarity index 100% rename from jdk/src/jdk.attach/linux/classes/sun/tools/attach/AttachProviderImpl.java rename to src/jdk.attach/linux/classes/sun/tools/attach/AttachProviderImpl.java diff --git a/jdk/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java similarity index 100% rename from jdk/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java rename to src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java diff --git a/jdk/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c similarity index 100% rename from jdk/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c rename to src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c diff --git a/jdk/src/jdk.attach/macosx/classes/sun/tools/attach/AttachProviderImpl.java b/src/jdk.attach/macosx/classes/sun/tools/attach/AttachProviderImpl.java similarity index 100% rename from jdk/src/jdk.attach/macosx/classes/sun/tools/attach/AttachProviderImpl.java rename to src/jdk.attach/macosx/classes/sun/tools/attach/AttachProviderImpl.java diff --git a/jdk/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java similarity index 100% rename from jdk/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java rename to src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java diff --git a/jdk/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c similarity index 100% rename from jdk/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c rename to src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java b/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java rename to src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentLoadException.java b/src/jdk.attach/share/classes/com/sun/tools/attach/AgentLoadException.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentLoadException.java rename to src/jdk.attach/share/classes/com/sun/tools/attach/AgentLoadException.java diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java b/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java rename to src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java b/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java rename to src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java b/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java rename to src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java b/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java rename to src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java b/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java rename to src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java b/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java rename to src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java b/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java rename to src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/package-info.java b/src/jdk.attach/share/classes/com/sun/tools/attach/spi/package-info.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/package-info.java rename to src/jdk.attach/share/classes/com/sun/tools/attach/spi/package-info.java diff --git a/jdk/src/jdk.attach/share/classes/module-info.java b/src/jdk.attach/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/module-info.java rename to src/jdk.attach/share/classes/module-info.java diff --git a/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotAttachProvider.java b/src/jdk.attach/share/classes/sun/tools/attach/HotSpotAttachProvider.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotAttachProvider.java rename to src/jdk.attach/share/classes/sun/tools/attach/HotSpotAttachProvider.java diff --git a/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java b/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java similarity index 100% rename from jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java rename to src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java diff --git a/jdk/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java b/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java similarity index 100% rename from jdk/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java rename to src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java diff --git a/jdk/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java similarity index 100% rename from jdk/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java rename to src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java diff --git a/jdk/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c similarity index 100% rename from jdk/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c rename to src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c diff --git a/jdk/src/jdk.attach/windows/classes/sun/tools/attach/AttachProviderImpl.java b/src/jdk.attach/windows/classes/sun/tools/attach/AttachProviderImpl.java similarity index 100% rename from jdk/src/jdk.attach/windows/classes/sun/tools/attach/AttachProviderImpl.java rename to src/jdk.attach/windows/classes/sun/tools/attach/AttachProviderImpl.java diff --git a/jdk/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java similarity index 100% rename from jdk/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java rename to src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java diff --git a/jdk/src/jdk.attach/windows/native/libattach/AttachProviderImpl.c b/src/jdk.attach/windows/native/libattach/AttachProviderImpl.c similarity index 100% rename from jdk/src/jdk.attach/windows/native/libattach/AttachProviderImpl.c rename to src/jdk.attach/windows/native/libattach/AttachProviderImpl.c diff --git a/jdk/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c similarity index 100% rename from jdk/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c rename to src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c diff --git a/jdk/src/jdk.charsets/share/classes/module-info.java b/src/jdk.charsets/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/module-info.java rename to src/jdk.charsets/share/classes/module-info.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/AbstractCharsetProvider.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/AbstractCharsetProvider.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/AbstractCharsetProvider.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/AbstractCharsetProvider.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS.java.template b/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS.java.template similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS.java.template rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS.java.template diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_Solaris.java.template b/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_Solaris.java.template similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_Solaris.java.template rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_Solaris.java.template diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template b/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java.template b/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java.template similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java.template rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java.template diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_Open.java.template b/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_Open.java.template similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_Open.java.template rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP_Open.java.template diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_TW.java.template b/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_TW.java.template similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_TW.java.template rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_TW.java.template diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template b/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/GB18030.java.template b/src/jdk.charsets/share/classes/sun/nio/cs/ext/GB18030.java.template similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/GB18030.java.template rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/GB18030.java.template diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM33722.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM33722.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM33722.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM33722.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM834.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM834.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM834.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM834.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM949C.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM949C.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM949C.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM949C.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM964.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM964.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM964.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM964.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISCII91.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISCII91.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISCII91.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/ISCII91.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN_GB.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN_GB.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN_GB.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_CN_GB.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_JP.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_JP.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_JP.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_JP.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_KR.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_KR.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_KR.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/ISO2022_KR.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS50220.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS50220.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS50220.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/MS50220.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS50221.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS50221.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS50221.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/MS50221.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS932_0213.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS932_0213.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS932_0213.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/MS932_0213.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java.template b/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java.template similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java.template rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java.template diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MSISO2022JP.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/MSISO2022JP.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/MSISO2022JP.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/MSISO2022JP.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/SJIS_0213.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/SJIS_0213.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/SJIS_0213.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/SJIS_0213.java diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java similarity index 100% rename from jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java diff --git a/langtools/src/jdk.compiler/share/classes/META-INF/services/com.sun.tools.javac.platform.PlatformProvider b/src/jdk.compiler/share/classes/META-INF/services/com.sun.tools.javac.platform.PlatformProvider similarity index 100% rename from langtools/src/jdk.compiler/share/classes/META-INF/services/com.sun.tools.javac.platform.PlatformProvider rename to src/jdk.compiler/share/classes/META-INF/services/com.sun.tools.javac.platform.PlatformProvider diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/AttributeTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/AttributeTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/AttributeTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/AttributeTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/AuthorTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/AuthorTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/AuthorTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/AuthorTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/BlockTagTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/BlockTagTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/BlockTagTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/BlockTagTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/CommentTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/CommentTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/CommentTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/CommentTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DeprecatedTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/DeprecatedTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DeprecatedTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/DeprecatedTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocCommentTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocCommentTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocCommentTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/DocCommentTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocRootTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocRootTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocRootTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/DocRootTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/EndElementTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/EndElementTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/EndElementTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/EndElementTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/EntityTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/EntityTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/EntityTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/EntityTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ErroneousTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/ErroneousTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ErroneousTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/ErroneousTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/HiddenTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/HiddenTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/HiddenTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/HiddenTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/IdentifierTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/IdentifierTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/IdentifierTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/IdentifierTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/IndexTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/IndexTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/IndexTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/IndexTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/InlineTagTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/InlineTagTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/InlineTagTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/InlineTagTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/LinkTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/LinkTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/LinkTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/LinkTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/LiteralTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/LiteralTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/LiteralTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/LiteralTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ParamTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/ParamTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ParamTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/ParamTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ProvidesTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/ProvidesTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ProvidesTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/ProvidesTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ReferenceTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/ReferenceTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ReferenceTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/ReferenceTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ReturnTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/ReturnTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ReturnTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/ReturnTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SeeTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/SeeTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SeeTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/SeeTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialDataTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialDataTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialDataTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/SerialDataTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialFieldTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialFieldTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialFieldTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/SerialFieldTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SerialTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/SerialTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SinceTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/SinceTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SinceTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/SinceTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/StartElementTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/StartElementTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/StartElementTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/StartElementTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SummaryTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/SummaryTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SummaryTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/SummaryTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/TextTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/TextTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/TextTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/TextTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ThrowsTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/ThrowsTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ThrowsTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/ThrowsTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UsesTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/UsesTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UsesTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/UsesTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ValueTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/ValueTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ValueTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/ValueTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/VersionTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/VersionTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/VersionTree.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/VersionTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java rename to src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AnnotatedTypeTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/AnnotatedTypeTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AnnotatedTypeTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/AnnotatedTypeTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AnnotationTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/AnnotationTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AnnotationTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/AnnotationTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ArrayAccessTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ArrayAccessTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ArrayAccessTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ArrayAccessTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ArrayTypeTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ArrayTypeTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ArrayTypeTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ArrayTypeTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AssertTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/AssertTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AssertTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/AssertTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AssignmentTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/AssignmentTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/AssignmentTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/AssignmentTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/BinaryTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/BinaryTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/BinaryTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/BinaryTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/BlockTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/BlockTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/BlockTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/BlockTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/BreakTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/BreakTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/BreakTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/BreakTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CatchTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/CatchTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CatchTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/CatchTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CompilationUnitTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/CompilationUnitTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CompilationUnitTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/CompilationUnitTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CompoundAssignmentTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/CompoundAssignmentTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/CompoundAssignmentTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/CompoundAssignmentTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ConditionalExpressionTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ConditionalExpressionTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ConditionalExpressionTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ConditionalExpressionTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ContinueTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ContinueTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ContinueTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ContinueTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/DirectiveTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/DirectiveTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/DirectiveTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/DirectiveTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/DoWhileLoopTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/DoWhileLoopTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/DoWhileLoopTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/DoWhileLoopTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/EmptyStatementTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/EmptyStatementTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/EmptyStatementTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/EmptyStatementTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/EnhancedForLoopTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/EnhancedForLoopTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/EnhancedForLoopTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/EnhancedForLoopTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ErroneousTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ErroneousTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ErroneousTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ErroneousTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExportsTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ExportsTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExportsTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ExportsTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExpressionStatementTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ExpressionStatementTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExpressionStatementTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ExpressionStatementTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExpressionTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ExpressionTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExpressionTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ExpressionTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ForLoopTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ForLoopTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ForLoopTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ForLoopTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/IdentifierTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/IdentifierTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/IdentifierTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/IdentifierTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/IfTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/IfTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/IfTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/IfTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/IntersectionTypeTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/IntersectionTypeTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/IntersectionTypeTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/IntersectionTypeTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LabeledStatementTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/LabeledStatementTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LabeledStatementTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/LabeledStatementTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LambdaExpressionTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/LambdaExpressionTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LambdaExpressionTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/LambdaExpressionTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LineMap.java b/src/jdk.compiler/share/classes/com/sun/source/tree/LineMap.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LineMap.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/LineMap.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LiteralTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/LiteralTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/LiteralTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/LiteralTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MemberReferenceTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/MemberReferenceTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MemberReferenceTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/MemberReferenceTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MemberSelectTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/MemberSelectTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MemberSelectTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/MemberSelectTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MethodInvocationTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/MethodInvocationTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MethodInvocationTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/MethodInvocationTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MethodTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/MethodTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/MethodTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/MethodTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ModifiersTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ModifiersTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ModifiersTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ModifiersTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ModuleTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ModuleTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ModuleTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ModuleTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/NewArrayTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/NewArrayTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/NewArrayTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/NewArrayTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/NewClassTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/NewClassTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/NewClassTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/NewClassTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/OpensTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/OpensTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/OpensTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/OpensTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/PackageTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/PackageTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/PackageTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/PackageTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ParameterizedTypeTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ParameterizedTypeTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ParameterizedTypeTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ParameterizedTypeTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ParenthesizedTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ParenthesizedTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ParenthesizedTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ParenthesizedTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/PrimitiveTypeTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/PrimitiveTypeTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/PrimitiveTypeTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/PrimitiveTypeTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ProvidesTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ProvidesTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ProvidesTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ProvidesTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/RequiresTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/RequiresTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/RequiresTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/RequiresTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ReturnTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ReturnTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ReturnTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ReturnTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/Scope.java b/src/jdk.compiler/share/classes/com/sun/source/tree/Scope.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/Scope.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/Scope.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/StatementTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/StatementTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/StatementTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/StatementTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/SwitchTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/SynchronizedTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/SynchronizedTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/SynchronizedTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/SynchronizedTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ThrowTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ThrowTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ThrowTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/ThrowTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TryTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/TryTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TryTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/TryTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TypeCastTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/TypeCastTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TypeCastTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/TypeCastTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TypeParameterTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/TypeParameterTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TypeParameterTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/TypeParameterTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/UnaryTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/UnaryTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/UnaryTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/UnaryTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/UnionTypeTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/UnionTypeTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/UnionTypeTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/UnionTypeTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/UsesTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/UsesTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/UsesTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/UsesTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/WhileLoopTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/WhileLoopTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/WhileLoopTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/WhileLoopTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/WildcardTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/WildcardTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/WildcardTree.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/WildcardTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/package-info.java b/src/jdk.compiler/share/classes/com/sun/source/tree/package-info.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/tree/package-info.java rename to src/jdk.compiler/share/classes/com/sun/source/tree/package-info.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocSourcePositions.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocSourcePositions.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocSourcePositions.java rename to src/jdk.compiler/share/classes/com/sun/source/util/DocSourcePositions.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java rename to src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePath.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePath.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePath.java rename to src/jdk.compiler/share/classes/com/sun/source/util/DocTreePath.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePathScanner.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePathScanner.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePathScanner.java rename to src/jdk.compiler/share/classes/com/sun/source/util/DocTreePathScanner.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java rename to src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java rename to src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/JavacTask.java b/src/jdk.compiler/share/classes/com/sun/source/util/JavacTask.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/JavacTask.java rename to src/jdk.compiler/share/classes/com/sun/source/util/JavacTask.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java b/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java rename to src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java rename to src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java rename to src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SourcePositions.java b/src/jdk.compiler/share/classes/com/sun/source/util/SourcePositions.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/SourcePositions.java rename to src/jdk.compiler/share/classes/com/sun/source/util/SourcePositions.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TaskEvent.java b/src/jdk.compiler/share/classes/com/sun/source/util/TaskEvent.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/TaskEvent.java rename to src/jdk.compiler/share/classes/com/sun/source/util/TaskEvent.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TaskListener.java b/src/jdk.compiler/share/classes/com/sun/source/util/TaskListener.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/TaskListener.java rename to src/jdk.compiler/share/classes/com/sun/source/util/TaskListener.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreePath.java b/src/jdk.compiler/share/classes/com/sun/source/util/TreePath.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreePath.java rename to src/jdk.compiler/share/classes/com/sun/source/util/TreePath.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreePathScanner.java b/src/jdk.compiler/share/classes/com/sun/source/util/TreePathScanner.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreePathScanner.java rename to src/jdk.compiler/share/classes/com/sun/source/util/TreePathScanner.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java rename to src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/Trees.java b/src/jdk.compiler/share/classes/com/sun/source/util/Trees.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/Trees.java rename to src/jdk.compiler/share/classes/com/sun/source/util/Trees.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/package-info.java b/src/jdk.compiler/share/classes/com/sun/source/util/package-info.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/source/util/package-info.java rename to src/jdk.compiler/share/classes/com/sun/source/util/package-info.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java b/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java rename to src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java b/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java rename to src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Entity.java b/src/jdk.compiler/share/classes/com/sun/tools/doclint/Entity.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Entity.java rename to src/jdk.compiler/share/classes/com/sun/tools/doclint/Entity.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Env.java b/src/jdk.compiler/share/classes/com/sun/tools/doclint/Env.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Env.java rename to src/jdk.compiler/share/classes/com/sun/tools/doclint/Env.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlTag.java b/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlTag.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlTag.java rename to src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlTag.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlVersion.java b/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlVersion.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlVersion.java rename to src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlVersion.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Messages.java b/src/jdk.compiler/share/classes/com/sun/tools/doclint/Messages.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Messages.java rename to src/jdk.compiler/share/classes/com/sun/tools/doclint/Messages.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties b/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties rename to src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties rename to src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint_zh_CN.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint_zh_CN.properties rename to src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint_zh_CN.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/Formattable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/Formattable.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/Formattable.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/api/Formattable.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacScope.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacScope.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacScope.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacScope.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/Messages.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/Messages.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/Messages.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/api/Messages.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/MultiTaskListener.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/MultiTaskListener.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/MultiTaskListener.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/api/MultiTaskListener.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Attribute.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Attribute.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Attribute.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/Attribute.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/BoundKind.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/BoundKind.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/BoundKind.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/BoundKind.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Kinds.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Kinds.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Kinds.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/Kinds.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ModuleFinder.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ModuleFinder.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ModuleFinder.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/ModuleFinder.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Printer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Printer.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Printer.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/Printer.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TargetType.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TargetType.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TargetType.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/TargetType.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeMetadata.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeMetadata.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeMetadata.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeMetadata.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeTag.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeTag.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeTag.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeTag.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContext.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContext.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContext.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContext.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/CompileStates.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/CompileStates.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/CompileStates.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/CompileStates.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ConstFold.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ConstFold.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ConstFold.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ConstFold.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Env.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Env.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Env.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Env.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Operators.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Operators.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Operators.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Operators.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Todo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Todo.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Todo.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Todo.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnvs.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnvs.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnvs.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnvs.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/CacheFSInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/CacheFSInfo.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/CacheFSInfo.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/file/CacheFSInfo.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JRTIndex.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JRTIndex.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JRTIndex.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/file/JRTIndex.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/PathFileObject.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/PathFileObject.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/PathFileObject.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/file/PathFileObject.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/RelativePath.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/RelativePath.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/RelativePath.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/file/RelativePath.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ByteCodes.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ByteCodes.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ByteCodes.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ByteCodes.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTFlags.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTFlags.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTFlags.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTFlags.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/JNIWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/JNIWriter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/JNIWriter.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/JNIWriter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/UninitializedType.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/UninitializedType.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/UninitializedType.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/UninitializedType.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/CommandLine.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/CommandLine.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/CommandLine.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/main/CommandLine.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavacToolProvider.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavacToolProvider.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavacToolProvider.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavacToolProvider.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/FilteredMemberList.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/model/FilteredMemberList.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/FilteredMemberList.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/model/FilteredMemberList.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacTypes.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacTypes.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacTypes.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacTypes.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/package-info.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/package-info.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/package-info.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/package-info.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Lexer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Lexer.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Lexer.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Lexer.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Parser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Parser.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Parser.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Parser.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ReferenceParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ReferenceParser.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ReferenceParser.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ReferenceParser.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/UnicodeReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/UnicodeReader.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/UnicodeReader.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/parser/UnicodeReader.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/JDKPlatformProvider.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/JDKPlatformProvider.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/JDKPlatformProvider.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/platform/JDKPlatformProvider.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformDescription.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformDescription.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformDescription.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformDescription.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformProvider.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformProvider.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformProvider.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformProvider.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformUtils.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformUtils.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformUtils.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformUtils.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/package-info.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/package-info.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/package-info.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/platform/package-info.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacMessager.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacMessager.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacMessager.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacMessager.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/ServiceProxy.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/ServiceProxy.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/ServiceProxy.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/processing/ServiceProxy.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties rename to src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties rename to src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties rename to src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/ct.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/ct.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/ct.properties rename to src/jdk.compiler/share/classes/com/sun/tools/javac/resources/ct.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties rename to src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties rename to src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties rename to src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/legacy.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/legacy.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/legacy.properties rename to src/jdk.compiler/share/classes/com/sun/tools/javac/resources/legacy.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/version.properties-template b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/version.properties-template similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/version.properties-template rename to src/jdk.compiler/share/classes/com/sun/tools/javac/resources/version.properties-template diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool b/src/jdk.compiler/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool rename to src/jdk.compiler/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Abort.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Abort.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Abort.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Abort.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ArrayUtils.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ArrayUtils.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ArrayUtils.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/ArrayUtils.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Assert.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Assert.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Assert.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Assert.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Bits.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Bits.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Bits.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Bits.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ByteBuffer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ByteBuffer.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ByteBuffer.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/ByteBuffer.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ClientCodeException.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ClientCodeException.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ClientCodeException.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/ClientCodeException.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Constants.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Constants.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Constants.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Constants.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Context.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Context.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Context.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Context.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/DefinedBy.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/DefinedBy.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/DefinedBy.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/DefinedBy.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/DiagnosticSource.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/DiagnosticSource.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/DiagnosticSource.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/DiagnosticSource.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/FatalError.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/FatalError.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/FatalError.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/FatalError.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Filter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Filter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Filter.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Filter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/IntHashTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/IntHashTable.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/IntHashTable.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/IntHashTable.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Iterators.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Iterators.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Iterators.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Iterators.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/LayoutCharacters.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/LayoutCharacters.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/LayoutCharacters.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/LayoutCharacters.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ListBuffer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ListBuffer.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ListBuffer.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/ListBuffer.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MatchingUtils.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MatchingUtils.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MatchingUtils.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/MatchingUtils.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Name.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Name.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Name.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Name.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Pair.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Pair.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Pair.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Pair.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Position.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Position.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Position.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Position.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/SharedNameTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/SharedNameTable.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/SharedNameTable.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/SharedNameTable.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/StringUtils.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/StringUtils.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/StringUtils.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/StringUtils.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Warner.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Warner.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Warner.java rename to src/jdk.compiler/share/classes/com/sun/tools/javac/util/Warner.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Gen.java b/src/jdk.compiler/share/classes/com/sun/tools/javah/Gen.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Gen.java rename to src/jdk.compiler/share/classes/com/sun/tools/javah/Gen.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/InternalError.java b/src/jdk.compiler/share/classes/com/sun/tools/javah/InternalError.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/InternalError.java rename to src/jdk.compiler/share/classes/com/sun/tools/javah/InternalError.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JNI.java b/src/jdk.compiler/share/classes/com/sun/tools/javah/JNI.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JNI.java rename to src/jdk.compiler/share/classes/com/sun/tools/javah/JNI.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahFileManager.java b/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahFileManager.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahFileManager.java rename to src/jdk.compiler/share/classes/com/sun/tools/javah/JavahFileManager.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java b/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java rename to src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTool.java b/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTool.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTool.java rename to src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTool.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/LLNI.java b/src/jdk.compiler/share/classes/com/sun/tools/javah/LLNI.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/LLNI.java rename to src/jdk.compiler/share/classes/com/sun/tools/javah/LLNI.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Main.java b/src/jdk.compiler/share/classes/com/sun/tools/javah/Main.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Main.java rename to src/jdk.compiler/share/classes/com/sun/tools/javah/Main.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Mangle.java b/src/jdk.compiler/share/classes/com/sun/tools/javah/Mangle.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Mangle.java rename to src/jdk.compiler/share/classes/com/sun/tools/javah/Mangle.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/NativeHeaderTool.java b/src/jdk.compiler/share/classes/com/sun/tools/javah/NativeHeaderTool.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/NativeHeaderTool.java rename to src/jdk.compiler/share/classes/com/sun/tools/javah/NativeHeaderTool.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/TypeSignature.java b/src/jdk.compiler/share/classes/com/sun/tools/javah/TypeSignature.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/TypeSignature.java rename to src/jdk.compiler/share/classes/com/sun/tools/javah/TypeSignature.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java b/src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java rename to src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties b/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties rename to src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_ja.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_ja.properties rename to src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_ja.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties rename to src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/version.properties-template b/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/version.properties-template similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/version.properties-template rename to src/jdk.compiler/share/classes/com/sun/tools/javah/resources/version.properties-template diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/AutoFlushWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/AutoFlushWriter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/AutoFlushWriter.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/AutoFlushWriter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/BuildState.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/BuildState.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/BuildState.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/BuildState.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CleanProperties.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CleanProperties.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CleanProperties.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/CleanProperties.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileChunk.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileChunk.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileChunk.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileChunk.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileProperties.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileProperties.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileProperties.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileProperties.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CopyFile.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CopyFile.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CopyFile.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/CopyFile.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Log.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Log.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Log.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/Log.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Main.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Main.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Main.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/Main.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/ProblemException.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/ProblemException.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/ProblemException.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/ProblemException.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/PubApiExtractor.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/PubApiExtractor.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/PubApiExtractor.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/PubApiExtractor.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Source.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Source.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/Source.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/ClientMain.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/ClientMain.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/ClientMain.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/ClientMain.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/PortFileInaccessibleException.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/PortFileInaccessibleException.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/PortFileInaccessibleException.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/PortFileInaccessibleException.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/CompilationService.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/CompilationService.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/CompilationService.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/CompilationService.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/FileObjectWithLocation.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/FileObjectWithLocation.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/FileObjectWithLocation.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/FileObjectWithLocation.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaFileObjectWithLocation.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaFileObjectWithLocation.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaFileObjectWithLocation.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaFileObjectWithLocation.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PathAndPackageVerifier.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PathAndPackageVerifier.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PathAndPackageVerifier.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PathAndPackageVerifier.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PooledSjavac.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PooledSjavac.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PooledSjavac.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PooledSjavac.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubAPIs.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubAPIs.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubAPIs.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubAPIs.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacImpl.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacImpl.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacImpl.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacImpl.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/NewDependencyCollector.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/NewDependencyCollector.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/NewDependencyCollector.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/NewDependencyCollector.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/PublicApiCollector.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/PublicApiCollector.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/PublicApiCollector.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/PublicApiCollector.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/ArgumentIterator.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/ArgumentIterator.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/ArgumentIterator.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/ArgumentIterator.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/OptionHelper.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/OptionHelper.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/OptionHelper.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/OptionHelper.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/SourceLocation.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/SourceLocation.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/SourceLocation.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/SourceLocation.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ArrayTypeDesc.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ArrayTypeDesc.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ArrayTypeDesc.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ArrayTypeDesc.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PrimitiveTypeDesc.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PrimitiveTypeDesc.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PrimitiveTypeDesc.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PrimitiveTypeDesc.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApi.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApi.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApi.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApi.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApiTypeParam.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApiTypeParam.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApiTypeParam.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApiTypeParam.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubMethod.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubMethod.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubMethod.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubType.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubType.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubType.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubType.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubVar.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubVar.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubVar.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubVar.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ReferenceTypeDesc.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ReferenceTypeDesc.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ReferenceTypeDesc.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ReferenceTypeDesc.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeDesc.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeDesc.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeDesc.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeDesc.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeVarTypeDesc.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeVarTypeDesc.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeVarTypeDesc.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeVarTypeDesc.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilationSubResult.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilationSubResult.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilationSubResult.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilationSubResult.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/IdleResetSjavac.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/IdleResetSjavac.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/IdleResetSjavac.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/IdleResetSjavac.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFile.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFile.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFile.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFile.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFileMonitor.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFileMonitor.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFileMonitor.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFileMonitor.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/RequestHandler.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/RequestHandler.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/RequestHandler.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/RequestHandler.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/ServerMain.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/ServerMain.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/ServerMain.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/ServerMain.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Sjavac.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Sjavac.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Sjavac.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Sjavac.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SysInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SysInfo.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SysInfo.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SysInfo.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Terminable.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Terminable.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Terminable.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Terminable.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/log/LazyInitFileLog.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/log/LazyInitFileLog.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/log/LazyInitFileLog.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/log/LazyInitFileLog.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/log/LoggingOutputStream.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/log/LoggingOutputStream.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/log/LoggingOutputStream.java rename to src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/log/LoggingOutputStream.java diff --git a/langtools/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocFormatter.java b/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocFormatter.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocFormatter.java rename to src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocFormatter.java diff --git a/langtools/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java b/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java rename to src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java diff --git a/langtools/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/resources/javadocformatter.properties b/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/resources/javadocformatter.properties similarity index 100% rename from langtools/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/resources/javadocformatter.properties rename to src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/resources/javadocformatter.properties diff --git a/langtools/src/jdk.compiler/share/classes/module-info.java b/src/jdk.compiler/share/classes/module-info.java similarity index 100% rename from langtools/src/jdk.compiler/share/classes/module-info.java rename to src/jdk.compiler/share/classes/module-info.java diff --git a/jdk/src/jdk.compiler/share/classes/sun/tools/serialver/SerialVer.java b/src/jdk.compiler/share/classes/sun/tools/serialver/SerialVer.java similarity index 100% rename from jdk/src/jdk.compiler/share/classes/sun/tools/serialver/SerialVer.java rename to src/jdk.compiler/share/classes/sun/tools/serialver/SerialVer.java diff --git a/jdk/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver.properties b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver.properties similarity index 100% rename from jdk/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver.properties rename to src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver.properties diff --git a/jdk/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_ja.properties b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_ja.properties similarity index 100% rename from jdk/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_ja.properties rename to src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_ja.properties diff --git a/jdk/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties similarity index 100% rename from jdk/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties rename to src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/module-info.java b/src/jdk.crypto.cryptoki/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/module-info.java rename to src/jdk.crypto.cryptoki/share/classes/module-info.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/KeyCache.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/KeyCache.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/KeyCache.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/KeyCache.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11DHKeyFactory.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11DHKeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11DHKeyFactory.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11DHKeyFactory.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11ECKeyFactory.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11ECKeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11ECKeyFactory.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11ECKeyFactory.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyAgreement.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyAgreement.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyAgreement.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyAgreement.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyFactory.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyFactory.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyFactory.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyStore.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyStore.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyStore.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyStore.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11RSACipher.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11RSACipher.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11RSACipher.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11RSACipher.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecureRandom.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecureRandom.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecureRandom.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecureRandom.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Secmod.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Secmod.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Secmod.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Secmod.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Session.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Session.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Session.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Session.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SessionManager.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SessionManager.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SessionManager.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SessionManager.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/TemplateManager.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/TemplateManager.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/TemplateManager.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/TemplateManager.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/Constants.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/Constants.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/Constants.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/Constants.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/Functions.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/Functions.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/Functions.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/Functions.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java rename to src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java diff --git a/jdk/src/jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md b/src/jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md rename to src/jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md diff --git a/jdk/src/jdk.crypto.cryptoki/share/legal/pkcs11wrapper.md b/src/jdk.crypto.cryptoki/share/legal/pkcs11wrapper.md similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/legal/pkcs11wrapper.md rename to src/jdk.crypto.cryptoki/share/legal/pkcs11wrapper.md diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.h b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.h similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.h rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.h diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs-11v2-20a3.h b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs-11v2-20a3.h similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs-11v2-20a3.h rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs-11v2-20a3.h diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11.h b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11.h similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11.h rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11.h diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11f.h b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11f.h similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11f.h rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11f.h diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11t.h b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11t.h similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11t.h rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11t.h diff --git a/jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11wrapper.h b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11wrapper.h similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11wrapper.h rename to src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11wrapper.h diff --git a/jdk/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg b/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg rename to src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg diff --git a/jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c b/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c rename to src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c diff --git a/jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.h b/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.h similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.h rename to src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.h diff --git a/jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c b/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c rename to src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c diff --git a/jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.h b/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.h similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.h rename to src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.h diff --git a/jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.c b/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.c rename to src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.c diff --git a/jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.h b/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.h similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.h rename to src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.h diff --git a/jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.c b/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.c similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.c rename to src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.c diff --git a/jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.h b/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.h similarity index 100% rename from jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.h rename to src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.h diff --git a/jdk/src/jdk.crypto.ec/share/classes/module-info.java b/src/jdk.crypto.ec/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.crypto.ec/share/classes/module-info.java rename to src/jdk.crypto.ec/share/classes/module-info.java diff --git a/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java similarity index 100% rename from jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java rename to src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java diff --git a/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDSASignature.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDSASignature.java similarity index 100% rename from jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDSASignature.java rename to src/jdk.crypto.ec/share/classes/sun/security/ec/ECDSASignature.java diff --git a/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyFactory.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyFactory.java rename to src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyFactory.java diff --git a/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyPairGenerator.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyPairGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyPairGenerator.java rename to src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyPairGenerator.java diff --git a/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECPrivateKeyImpl.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/ECPrivateKeyImpl.java similarity index 100% rename from jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECPrivateKeyImpl.java rename to src/jdk.crypto.ec/share/classes/sun/security/ec/ECPrivateKeyImpl.java diff --git a/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECPublicKeyImpl.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/ECPublicKeyImpl.java similarity index 100% rename from jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/ECPublicKeyImpl.java rename to src/jdk.crypto.ec/share/classes/sun/security/ec/ECPublicKeyImpl.java diff --git a/jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java similarity index 100% rename from jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java rename to src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java diff --git a/jdk/src/jdk.crypto.ec/share/legal/ecc.md b/src/jdk.crypto.ec/share/legal/ecc.md similarity index 100% rename from jdk/src/jdk.crypto.ec/share/legal/ecc.md rename to src/jdk.crypto.ec/share/legal/ecc.md diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp b/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp rename to src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ec.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ec.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.h b/src/jdk.crypto.ec/share/native/libsunec/impl/ec.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/ec.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2.h b/src/jdk.crypto.ec/share/native/libsunec/impl/ec2.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/ec2.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_163.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_163.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_163.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ec2_163.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_193.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_193.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_193.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ec2_193.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_233.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_233.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_233.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ec2_233.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_mont.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_mont.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_mont.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ec2_mont.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec_naf.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ec_naf.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec_naf.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ec_naf.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecc_impl.h b/src/jdk.crypto.ec/share/native/libsunec/impl/ecc_impl.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecc_impl.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecc_impl.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-curve.h b/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-curve.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-curve.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecl-curve.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-exp.h b/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-exp.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-exp.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecl-exp.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-priv.h b/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-priv.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl-priv.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecl-priv.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecl.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.h b/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecl.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_curve.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_curve.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_curve.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecl_curve.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_gf.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_gf.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_gf.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecl_gf.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_mult.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_mult.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_mult.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecl_mult.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp.h b/src/jdk.crypto.ec/share/native/libsunec/impl/ecp.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecp.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_192.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_192.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_192.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecp_192.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_224.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_224.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_224.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecp_224.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_256.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_256.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_256.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecp_256.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_384.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_384.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_384.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecp_384.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_521.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_521.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_521.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecp_521.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_aff.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_aff.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_aff.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecp_aff.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jac.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jac.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jac.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jac.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jm.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jm.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jm.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jm.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_mont.c b/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_mont.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_mont.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/ecp_mont.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/logtab.h b/src/jdk.crypto.ec/share/native/libsunec/impl/logtab.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/logtab.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/logtab.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m-priv.h b/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m-priv.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m-priv.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m-priv.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.c b/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.h b/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi-config.h b/src/jdk.crypto.ec/share/native/libsunec/impl/mpi-config.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi-config.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/mpi-config.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi-priv.h b/src/jdk.crypto.ec/share/native/libsunec/impl/mpi-priv.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi-priv.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/mpi-priv.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.c b/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/mpi.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.h b/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/mpi.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.c b/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.h b/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpmontg.c b/src/jdk.crypto.ec/share/native/libsunec/impl/mpmontg.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpmontg.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/mpmontg.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpprime.h b/src/jdk.crypto.ec/share/native/libsunec/impl/mpprime.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpprime.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/mpprime.h diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/oid.c b/src/jdk.crypto.ec/share/native/libsunec/impl/oid.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/oid.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/oid.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secitem.c b/src/jdk.crypto.ec/share/native/libsunec/impl/secitem.c similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secitem.c rename to src/jdk.crypto.ec/share/native/libsunec/impl/secitem.c diff --git a/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secoidt.h b/src/jdk.crypto.ec/share/native/libsunec/impl/secoidt.h similarity index 100% rename from jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secoidt.h rename to src/jdk.crypto.ec/share/native/libsunec/impl/secoidt.h diff --git a/jdk/src/jdk.crypto.mscapi/windows/classes/module-info.java b/src/jdk.crypto.mscapi/windows/classes/module-info.java similarity index 100% rename from jdk/src/jdk.crypto.mscapi/windows/classes/module-info.java rename to src/jdk.crypto.mscapi/windows/classes/module-info.java diff --git a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/Key.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/Key.java similarity index 100% rename from jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/Key.java rename to src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/Key.java diff --git a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/KeyStore.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/KeyStore.java similarity index 100% rename from jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/KeyStore.java rename to src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/KeyStore.java diff --git a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/PRNG.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/PRNG.java similarity index 100% rename from jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/PRNG.java rename to src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/PRNG.java diff --git a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSACipher.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSACipher.java similarity index 100% rename from jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSACipher.java rename to src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSACipher.java diff --git a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPair.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPair.java similarity index 100% rename from jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPair.java rename to src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPair.java diff --git a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java rename to src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java diff --git a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPrivateKey.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPrivateKey.java similarity index 100% rename from jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPrivateKey.java rename to src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPrivateKey.java diff --git a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPublicKey.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPublicKey.java similarity index 100% rename from jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPublicKey.java rename to src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPublicKey.java diff --git a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSASignature.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSASignature.java similarity index 100% rename from jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSASignature.java rename to src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSASignature.java diff --git a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/SunMSCAPI.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/SunMSCAPI.java similarity index 100% rename from jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/SunMSCAPI.java rename to src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/SunMSCAPI.java diff --git a/jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp similarity index 100% rename from jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp rename to src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/CipherContextRef.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/CipherContextRef.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/CipherContextRef.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/CipherContextRef.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/Config.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/Config.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/Config.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/Config.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/GCMParameters.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/GCMParameters.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/GCMParameters.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/GCMParameters.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/LibMDMech.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/LibMDMech.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/LibMDMech.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/LibMDMech.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipher.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipher.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipher.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipher.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipherWithJavaPadding.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipherWithJavaPadding.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipherWithJavaPadding.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipherWithJavaPadding.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeDigest.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeDigest.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeDigest.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeDigest.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeDigestMD.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeDigestMD.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeDigestMD.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeDigestMD.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeKey.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeKey.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeKey.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeKey.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSAKeyFactory.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSAKeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSAKeyFactory.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSAKeyFactory.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSASignature.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSASignature.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSASignature.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSASignature.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/ServiceDesc.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/ServiceDesc.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/ServiceDesc.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/ServiceDesc.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoMech.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoMech.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoMech.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoMech.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoProvider.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoProvider.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoProvider.java rename to src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoProvider.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/module-info.java b/src/jdk.crypto.ucrypto/solaris/classes/module-info.java similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/classes/module-info.java rename to src/jdk.crypto.ucrypto/solaris/classes/module-info.java diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/conf/security/ucrypto-solaris.cfg b/src/jdk.crypto.ucrypto/solaris/conf/security/ucrypto-solaris.cfg similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/conf/security/ucrypto-solaris.cfg rename to src/jdk.crypto.ucrypto/solaris/conf/security/ucrypto-solaris.cfg diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c b/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c rename to src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.h b/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.h similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.h rename to src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.h diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCryptoMD.c b/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCryptoMD.c similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCryptoMD.c rename to src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCryptoMD.c diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeFunc.c b/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeFunc.c similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeFunc.c rename to src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeFunc.c diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeFunc.h b/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeFunc.h similarity index 100% rename from jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeFunc.h rename to src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeFunc.h diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/CallSiteDescriptor.java b/src/jdk.dynalink/share/classes/jdk/dynalink/CallSiteDescriptor.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/CallSiteDescriptor.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/CallSiteDescriptor.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/ClassMap.java b/src/jdk.dynalink/share/classes/jdk/dynalink/ClassMap.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/ClassMap.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/ClassMap.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinker.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinker.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinker.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinkerFactory.java b/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinkerFactory.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinkerFactory.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinkerFactory.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/LinkerServicesImpl.java b/src/jdk.dynalink/share/classes/jdk/dynalink/LinkerServicesImpl.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/LinkerServicesImpl.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/LinkerServicesImpl.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/NamedOperation.java b/src/jdk.dynalink/share/classes/jdk/dynalink/NamedOperation.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/NamedOperation.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/NamedOperation.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/Namespace.java b/src/jdk.dynalink/share/classes/jdk/dynalink/Namespace.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/Namespace.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/Namespace.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/NamespaceOperation.java b/src/jdk.dynalink/share/classes/jdk/dynalink/NamespaceOperation.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/NamespaceOperation.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/NamespaceOperation.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/NoSuchDynamicMethodException.java b/src/jdk.dynalink/share/classes/jdk/dynalink/NoSuchDynamicMethodException.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/NoSuchDynamicMethodException.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/NoSuchDynamicMethodException.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/Operation.java b/src/jdk.dynalink/share/classes/jdk/dynalink/Operation.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/Operation.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/Operation.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/RelinkableCallSite.java b/src/jdk.dynalink/share/classes/jdk/dynalink/RelinkableCallSite.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/RelinkableCallSite.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/RelinkableCallSite.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/SecureLookupSupplier.java b/src/jdk.dynalink/share/classes/jdk/dynalink/SecureLookupSupplier.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/SecureLookupSupplier.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/SecureLookupSupplier.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/StandardNamespace.java b/src/jdk.dynalink/share/classes/jdk/dynalink/StandardNamespace.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/StandardNamespace.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/StandardNamespace.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java b/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/TypeConverterFactory.java b/src/jdk.dynalink/share/classes/jdk/dynalink/TypeConverterFactory.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/TypeConverterFactory.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/TypeConverterFactory.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/AbstractJavaLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/AbstractJavaLinker.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/AbstractJavaLinker.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/AbstractJavaLinker.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/AccessibleMembersLookup.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/AccessibleMembersLookup.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/AccessibleMembersLookup.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/AccessibleMembersLookup.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ApplicableOverloadedMethods.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ApplicableOverloadedMethods.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ApplicableOverloadedMethods.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/ApplicableOverloadedMethods.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeanIntrospector.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeanIntrospector.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeanIntrospector.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeanIntrospector.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeanLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeanLinker.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeanLinker.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeanLinker.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeansLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeansLinker.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeansLinker.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeansLinker.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/CallerSensitiveDynamicMethod.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/CallerSensitiveDynamicMethod.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/CallerSensitiveDynamicMethod.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/CallerSensitiveDynamicMethod.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/CheckRestrictedPackage.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/CheckRestrictedPackage.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/CheckRestrictedPackage.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/CheckRestrictedPackage.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassString.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassString.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassString.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassString.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/DynamicMethod.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/DynamicMethod.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/DynamicMethod.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/DynamicMethod.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/DynamicMethodLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/DynamicMethodLinker.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/DynamicMethodLinker.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/DynamicMethodLinker.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/FacetIntrospector.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/FacetIntrospector.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/FacetIntrospector.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/FacetIntrospector.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/GuardedInvocationComponent.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/GuardedInvocationComponent.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/GuardedInvocationComponent.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/GuardedInvocationComponent.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/LinkerServicesWithMissingMemberHandlerFactory.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/LinkerServicesWithMissingMemberHandlerFactory.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/LinkerServicesWithMissingMemberHandlerFactory.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/LinkerServicesWithMissingMemberHandlerFactory.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/MaximallySpecific.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/MaximallySpecific.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/MaximallySpecific.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/MaximallySpecific.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/MissingMemberHandlerFactory.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/MissingMemberHandlerFactory.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/MissingMemberHandlerFactory.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/MissingMemberHandlerFactory.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedMethod.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedMethod.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedMethod.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedMethod.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/SimpleDynamicMethod.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/SimpleDynamicMethod.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/SimpleDynamicMethod.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/SimpleDynamicMethod.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/SingleDynamicMethod.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/SingleDynamicMethod.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/SingleDynamicMethod.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/SingleDynamicMethod.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClass.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClass.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClass.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClass.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClassIntrospector.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClassIntrospector.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClassIntrospector.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClassIntrospector.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClassLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClassLinker.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClassLinker.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClassLinker.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/package-info.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/package-info.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/package-info.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/beans/package-info.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/internal/AccessControlContextFactory.java b/src/jdk.dynalink/share/classes/jdk/dynalink/internal/AccessControlContextFactory.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/internal/AccessControlContextFactory.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/internal/AccessControlContextFactory.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/internal/InternalTypeUtilities.java b/src/jdk.dynalink/share/classes/jdk/dynalink/internal/InternalTypeUtilities.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/internal/InternalTypeUtilities.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/internal/InternalTypeUtilities.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/ConversionComparator.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/ConversionComparator.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/ConversionComparator.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/ConversionComparator.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocation.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocation.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocation.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocation.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocationTransformer.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocationTransformer.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocationTransformer.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocationTransformer.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinker.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinker.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinker.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinkerExporter.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinkerExporter.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinkerExporter.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinkerExporter.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingTypeConverterFactory.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingTypeConverterFactory.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingTypeConverterFactory.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingTypeConverterFactory.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkRequest.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkRequest.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkRequest.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkRequest.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkerServices.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkerServices.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkerServices.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkerServices.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodHandleTransformer.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodHandleTransformer.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodHandleTransformer.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodHandleTransformer.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodTypeConversionStrategy.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodTypeConversionStrategy.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodTypeConversionStrategy.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodTypeConversionStrategy.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/TypeBasedGuardingDynamicLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/TypeBasedGuardingDynamicLinker.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/TypeBasedGuardingDynamicLinker.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/TypeBasedGuardingDynamicLinker.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/package-info.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/package-info.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/package-info.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/package-info.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeGuardingDynamicLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeGuardingDynamicLinker.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeGuardingDynamicLinker.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeGuardingDynamicLinker.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeTypeBasedGuardingDynamicLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeTypeBasedGuardingDynamicLinker.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeTypeBasedGuardingDynamicLinker.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeTypeBasedGuardingDynamicLinker.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/DefaultInternalObjectFilter.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/DefaultInternalObjectFilter.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/DefaultInternalObjectFilter.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/DefaultInternalObjectFilter.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Guards.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Guards.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Guards.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Guards.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Lookup.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Lookup.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Lookup.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Lookup.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/SimpleLinkRequest.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/SimpleLinkRequest.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/SimpleLinkRequest.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/SimpleLinkRequest.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/TypeUtilities.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/TypeUtilities.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/TypeUtilities.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/TypeUtilities.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/package-info.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/package-info.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/package-info.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/package-info.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/package-info.java b/src/jdk.dynalink/share/classes/jdk/dynalink/package-info.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/package-info.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/package-info.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/AbstractRelinkableCallSite.java b/src/jdk.dynalink/share/classes/jdk/dynalink/support/AbstractRelinkableCallSite.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/AbstractRelinkableCallSite.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/support/AbstractRelinkableCallSite.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/ChainedCallSite.java b/src/jdk.dynalink/share/classes/jdk/dynalink/support/ChainedCallSite.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/ChainedCallSite.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/support/ChainedCallSite.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/SimpleRelinkableCallSite.java b/src/jdk.dynalink/share/classes/jdk/dynalink/support/SimpleRelinkableCallSite.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/SimpleRelinkableCallSite.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/support/SimpleRelinkableCallSite.java diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/messages.properties b/src/jdk.dynalink/share/classes/jdk/dynalink/support/messages.properties similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/messages.properties rename to src/jdk.dynalink/share/classes/jdk/dynalink/support/messages.properties diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/package-info.java b/src/jdk.dynalink/share/classes/jdk/dynalink/support/package-info.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/package-info.java rename to src/jdk.dynalink/share/classes/jdk/dynalink/support/package-info.java diff --git a/nashorn/src/jdk.dynalink/share/classes/module-info.java b/src/jdk.dynalink/share/classes/module-info.java similarity index 100% rename from nashorn/src/jdk.dynalink/share/classes/module-info.java rename to src/jdk.dynalink/share/classes/module-info.java diff --git a/nashorn/src/jdk.dynalink/share/legal/dynalink.md b/src/jdk.dynalink/share/legal/dynalink.md similarity index 100% rename from nashorn/src/jdk.dynalink/share/legal/dynalink.md rename to src/jdk.dynalink/share/legal/dynalink.md diff --git a/jdk/src/jdk.editpad/share/classes/jdk/editpad/EditPad.java b/src/jdk.editpad/share/classes/jdk/editpad/EditPad.java similarity index 100% rename from jdk/src/jdk.editpad/share/classes/jdk/editpad/EditPad.java rename to src/jdk.editpad/share/classes/jdk/editpad/EditPad.java diff --git a/jdk/src/jdk.editpad/share/classes/jdk/editpad/EditPadProvider.java b/src/jdk.editpad/share/classes/jdk/editpad/EditPadProvider.java similarity index 100% rename from jdk/src/jdk.editpad/share/classes/jdk/editpad/EditPadProvider.java rename to src/jdk.editpad/share/classes/jdk/editpad/EditPadProvider.java diff --git a/jdk/src/jdk.editpad/share/classes/jdk/editpad/resources/l10n.properties b/src/jdk.editpad/share/classes/jdk/editpad/resources/l10n.properties similarity index 100% rename from jdk/src/jdk.editpad/share/classes/jdk/editpad/resources/l10n.properties rename to src/jdk.editpad/share/classes/jdk/editpad/resources/l10n.properties diff --git a/jdk/src/jdk.editpad/share/classes/module-info.java b/src/jdk.editpad/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.editpad/share/classes/module-info.java rename to src/jdk.editpad/share/classes/module-info.java diff --git a/hotspot/src/jdk.hotspot.agent/doc/cireplay.html b/src/jdk.hotspot.agent/doc/cireplay.html similarity index 100% rename from hotspot/src/jdk.hotspot.agent/doc/cireplay.html rename to src/jdk.hotspot.agent/doc/cireplay.html diff --git a/hotspot/src/jdk.hotspot.agent/doc/clhsdb.html b/src/jdk.hotspot.agent/doc/clhsdb.html similarity index 100% rename from hotspot/src/jdk.hotspot.agent/doc/clhsdb.html rename to src/jdk.hotspot.agent/doc/clhsdb.html diff --git a/hotspot/src/jdk.hotspot.agent/doc/hsdb.html b/src/jdk.hotspot.agent/doc/hsdb.html similarity index 100% rename from hotspot/src/jdk.hotspot.agent/doc/hsdb.html rename to src/jdk.hotspot.agent/doc/hsdb.html diff --git a/hotspot/src/jdk.hotspot.agent/doc/index.html b/src/jdk.hotspot.agent/doc/index.html similarity index 100% rename from hotspot/src/jdk.hotspot.agent/doc/index.html rename to src/jdk.hotspot.agent/doc/index.html diff --git a/hotspot/src/jdk.hotspot.agent/doc/jsdb.html b/src/jdk.hotspot.agent/doc/jsdb.html similarity index 100% rename from hotspot/src/jdk.hotspot.agent/doc/jsdb.html rename to src/jdk.hotspot.agent/doc/jsdb.html diff --git a/hotspot/src/jdk.hotspot.agent/doc/transported_core.html b/src/jdk.hotspot.agent/doc/transported_core.html similarity index 100% rename from hotspot/src/jdk.hotspot.agent/doc/transported_core.html rename to src/jdk.hotspot.agent/doc/transported_core.html diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.c b/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.c rename to src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.c diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/elfmacros.h b/src/jdk.hotspot.agent/linux/native/libsaproc/elfmacros.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/elfmacros.h rename to src/jdk.hotspot.agent/linux/native/libsaproc/elfmacros.h diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h rename to src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c rename to src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.h b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.h rename to src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.h diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/proc_service.h b/src/jdk.hotspot.agent/linux/native/libsaproc/proc_service.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/proc_service.h rename to src/jdk.hotspot.agent/linux/native/libsaproc/proc_service.h diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c rename to src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c rename to src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/salibelf.c b/src/jdk.hotspot.agent/linux/native/libsaproc/salibelf.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/salibelf.c rename to src/jdk.hotspot.agent/linux/native/libsaproc/salibelf.c diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/salibelf.h b/src/jdk.hotspot.agent/linux/native/libsaproc/salibelf.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/salibelf.h rename to src/jdk.hotspot.agent/linux/native/libsaproc/salibelf.h diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c b/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c rename to src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.h b/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.h rename to src/jdk.hotspot.agent/linux/native/libsaproc/symtab.h diff --git a/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/test.c b/src/jdk.hotspot.agent/linux/native/libsaproc/test.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/test.c rename to src/jdk.hotspot.agent/linux/native/libsaproc/test.c diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/BsdDebuggerLocal.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/BsdDebuggerLocal.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/BsdDebuggerLocal.c rename to src/jdk.hotspot.agent/macosx/native/libsaproc/BsdDebuggerLocal.c diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/MacosxDebuggerLocal.m b/src/jdk.hotspot.agent/macosx/native/libsaproc/MacosxDebuggerLocal.m similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/MacosxDebuggerLocal.m rename to src/jdk.hotspot.agent/macosx/native/libsaproc/MacosxDebuggerLocal.m diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/StubDebuggerLocal.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/StubDebuggerLocal.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/StubDebuggerLocal.c rename to src/jdk.hotspot.agent/macosx/native/libsaproc/StubDebuggerLocal.c diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/elfmacros.h b/src/jdk.hotspot.agent/macosx/native/libsaproc/elfmacros.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/elfmacros.h rename to src/jdk.hotspot.agent/macosx/native/libsaproc/elfmacros.h diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc.h b/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc.h rename to src/jdk.hotspot.agent/macosx/native/libsaproc/libproc.h diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.c rename to src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.c diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.h b/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.h rename to src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.h diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c rename to src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_proc.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_proc.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_proc.c rename to src/jdk.hotspot.agent/macosx/native/libsaproc/ps_proc.c diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/salibelf.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/salibelf.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/salibelf.c rename to src/jdk.hotspot.agent/macosx/native/libsaproc/salibelf.c diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/salibelf.h b/src/jdk.hotspot.agent/macosx/native/libsaproc/salibelf.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/salibelf.h rename to src/jdk.hotspot.agent/macosx/native/libsaproc/salibelf.h diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.c rename to src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.c diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.h b/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.h rename to src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.h diff --git a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/test.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/test.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/test.c rename to src/jdk.hotspot.agent/macosx/native/libsaproc/test.c diff --git a/hotspot/src/jdk.hotspot.agent/scripts/README b/src/jdk.hotspot.agent/scripts/README similarity index 100% rename from hotspot/src/jdk.hotspot.agent/scripts/README rename to src/jdk.hotspot.agent/scripts/README diff --git a/hotspot/src/jdk.hotspot.agent/scripts/start-debug-server.bat b/src/jdk.hotspot.agent/scripts/start-debug-server.bat similarity index 100% rename from hotspot/src/jdk.hotspot.agent/scripts/start-debug-server.bat rename to src/jdk.hotspot.agent/scripts/start-debug-server.bat diff --git a/hotspot/src/jdk.hotspot.agent/scripts/start-debug-server.sh b/src/jdk.hotspot.agent/scripts/start-debug-server.sh similarity index 100% rename from hotspot/src/jdk.hotspot.agent/scripts/start-debug-server.sh rename to src/jdk.hotspot.agent/scripts/start-debug-server.sh diff --git a/hotspot/src/jdk.hotspot.agent/scripts/start-debug-server64.sh b/src/jdk.hotspot.agent/scripts/start-debug-server64.sh similarity index 100% rename from hotspot/src/jdk.hotspot.agent/scripts/start-debug-server64.sh rename to src/jdk.hotspot.agent/scripts/start-debug-server64.sh diff --git a/hotspot/src/jdk.hotspot.agent/scripts/start-rmiregistry.bat b/src/jdk.hotspot.agent/scripts/start-rmiregistry.bat similarity index 100% rename from hotspot/src/jdk.hotspot.agent/scripts/start-rmiregistry.bat rename to src/jdk.hotspot.agent/scripts/start-rmiregistry.bat diff --git a/hotspot/src/jdk.hotspot.agent/scripts/start-rmiregistry.sh b/src/jdk.hotspot.agent/scripts/start-rmiregistry.sh similarity index 100% rename from hotspot/src/jdk.hotspot.agent/scripts/start-rmiregistry.sh rename to src/jdk.hotspot.agent/scripts/start-rmiregistry.sh diff --git a/hotspot/src/jdk.hotspot.agent/scripts/start-rmiregistry64.sh b/src/jdk.hotspot.agent/scripts/start-rmiregistry64.sh similarity index 100% rename from hotspot/src/jdk.hotspot.agent/scripts/start-rmiregistry64.sh rename to src/jdk.hotspot.agent/scripts/start-rmiregistry64.sh diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/META-INF/services/com.sun.jdi.connect.Connector b/src/jdk.hotspot.agent/share/classes/META-INF/services/com.sun.jdi.connect.Connector similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/META-INF/services/com.sun.jdi.connect.Connector rename to src/jdk.hotspot.agent/share/classes/META-INF/services/com.sun.jdi.connect.Connector diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AboutAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AboutAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AboutAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AboutAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ActionManager.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ActionManager.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ActionManager.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ActionManager.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ActionUtilities.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ActionUtilities.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ActionUtilities.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ActionUtilities.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AlignCenterAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AlignCenterAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AlignCenterAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AlignCenterAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AlignLeftAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AlignLeftAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AlignLeftAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AlignLeftAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AlignRightAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AlignRightAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AlignRightAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/AlignRightAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ApplyAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ApplyAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ApplyAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ApplyAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/BackAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/BackAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/BackAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/BackAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/CancelAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/CancelAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/CancelAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/CancelAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/DelegateAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/DelegateAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/DelegateAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/DelegateAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ExitAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ExitAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ExitAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ExitAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/FileMenu.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/FileMenu.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/FileMenu.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/FileMenu.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/FinishAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/FinishAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/FinishAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/FinishAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/HelpAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/HelpAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/HelpAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/HelpAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/HelpMenu.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/HelpMenu.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/HelpMenu.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/HelpMenu.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/NewAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/NewAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/NewAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/NewAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/NextAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/NextAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/NextAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/NextAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/OkAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/OkAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/OkAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/OkAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/OpenAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/OpenAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/OpenAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/OpenAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/SaveAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/SaveAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/SaveAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/SaveAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/SaveAsAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/SaveAsAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/SaveAsAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/SaveAsAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/StateChangeAction.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/StateChangeAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/StateChangeAction.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/StateChangeAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ViewMenu.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ViewMenu.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ViewMenu.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ViewMenu.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonMenuBar.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonMenuBar.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonMenuBar.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonMenuBar.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonToolBar.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonToolBar.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonToolBar.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonToolBar.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonUI.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonUI.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonUI.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonUI.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/OkCancelButtonPanel.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/OkCancelButtonPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/OkCancelButtonPanel.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/OkCancelButtonPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/OkCancelDialog.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/OkCancelDialog.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/OkCancelDialog.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/OkCancelDialog.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/SplashScreen.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/SplashScreen.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/SplashScreen.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/SplashScreen.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/StatusBar.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/StatusBar.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/StatusBar.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/StatusBar.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/TabsDlg.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/TabsDlg.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/TabsDlg.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/TabsDlg.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/ToggleActionPropertyChangeListener.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/ToggleActionPropertyChangeListener.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/ToggleActionPropertyChangeListener.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/ToggleActionPropertyChangeListener.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/WizardDlg.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/WizardDlg.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/WizardDlg.java rename to src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/WizardDlg.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Save16.gif b/src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Save16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Save16.gif rename to src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Save16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/module-info.java b/src/jdk.hotspot.agent/share/classes/module-info.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/module-info.java rename to src/jdk.hotspot.agent/share/classes/module-info.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/BsdVtblAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/BsdVtblAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/BsdVtblAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/BsdVtblAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CLHSDB.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CLHSDB.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CLHSDB.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CLHSDB.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/DebugServer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/DebugServer.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/DebugServer.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/DebugServer.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HelloWorld.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HelloWorld.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HelloWorld.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HelloWorld.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ObjectHistogram.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ObjectHistogram.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ObjectHistogram.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ObjectHistogram.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/RMIHelper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/RMIHelper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/RMIHelper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/RMIHelper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SAGetopt.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SAGetopt.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SAGetopt.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SAGetopt.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SAGetoptException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SAGetoptException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SAGetoptException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SAGetoptException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncherLoader.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncherLoader.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncherLoader.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncherLoader.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/StackTrace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/StackTrace.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/StackTrace.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/StackTrace.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/Win32VtblAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/Win32VtblAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/Win32VtblAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/Win32VtblAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Disassembler.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Disassembler.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Disassembler.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Disassembler.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/DummySymbolFinder.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/DummySymbolFinder.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/DummySymbolFinder.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/DummySymbolFinder.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/ImmediateOrRegister.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/ImmediateOrRegister.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/ImmediateOrRegister.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/ImmediateOrRegister.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/InstructionVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/InstructionVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/InstructionVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/InstructionVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Operand.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Operand.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Operand.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Operand.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Register.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Register.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Register.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Register.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/SymbolFinder.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/SymbolFinder.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/SymbolFinder.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/SymbolFinder.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCArgument.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCArgument.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCArgument.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCArgument.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegister.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegister.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegister.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegister.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisters.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisters.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisters.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisters.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/c1/Runtime1.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/c1/Runtime1.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/c1/Runtime1.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/c1/Runtime1.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciBaseObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciBaseObject.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciBaseObject.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciBaseObject.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciConstant.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciConstant.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciConstant.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciConstant.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciEnv.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciEnv.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciEnv.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciEnv.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstance.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstance.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstance.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstance.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMetadata.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMetadata.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMetadata.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMetadata.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethod.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethod.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethod.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethodData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethodData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethodData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethodData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObject.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObject.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObject.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciSymbol.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciSymbol.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciSymbol.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciSymbol.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderDataGraph.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderDataGraph.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderDataGraph.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderDataGraph.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/AdapterBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/AdapterBlob.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/AdapterBlob.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/AdapterBlob.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/BufferBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/BufferBlob.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/BufferBlob.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/BufferBlob.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCacheVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCacheVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCacheVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCacheVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompiledMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompiledMethod.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompiledMethod.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompiledMethod.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompressedReadStream.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompressedReadStream.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompressedReadStream.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompressedReadStream.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompressedStream.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompressedStream.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompressedStream.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompressedStream.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompressedWriteStream.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompressedWriteStream.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompressedWriteStream.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CompressedWriteStream.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantDoubleValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantDoubleValue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantDoubleValue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantDoubleValue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantIntValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantIntValue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantIntValue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantIntValue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantLongValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantLongValue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantLongValue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantLongValue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantOopReadValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantOopReadValue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantOopReadValue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ConstantOopReadValue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DebugInformationRecorder.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DebugInformationRecorder.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DebugInformationRecorder.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DebugInformationRecorder.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/Location.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/Location.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/Location.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/Location.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/LocationValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/LocationValue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/LocationValue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/LocationValue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MonitorValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MonitorValue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MonitorValue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MonitorValue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectValue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectValue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectValue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/PCDesc.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/PCDesc.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/PCDesc.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/PCDesc.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeBlob.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeBlob.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeBlob.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeStub.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeStub.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeStub.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeStub.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SafepointBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SafepointBlob.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SafepointBlob.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SafepointBlob.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ScopeDesc.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ScopeDesc.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ScopeDesc.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ScopeDesc.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ScopeValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ScopeValue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ScopeValue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ScopeValue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SingletonBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SingletonBlob.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SingletonBlob.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SingletonBlob.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/Stub.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/Stub.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/Stub.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/Stub.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/StubQueue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/StubQueue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/StubQueue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/StubQueue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VMRegImpl.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VMRegImpl.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VMRegImpl.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VMRegImpl.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/CompileTask.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/CompileTask.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/CompileTask.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/CompileTask.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapPair.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapPair.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapPair.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapPair.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapSet.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapSet.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapSet.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapSet.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/OopMapStream.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/OopMapStream.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/OopMapStream.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/OopMapStream.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/OopMapValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/OopMapValue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/OopMapValue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/OopMapValue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/OopMapVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/OopMapVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/OopMapVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/OopMapVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Address.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Address.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Address.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Address.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/AddressException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/AddressException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/AddressException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/AddressException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DataSource.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DataSource.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DataSource.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DataSource.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Debugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Debugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Debugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Debugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerUtilities.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerUtilities.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerUtilities.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerUtilities.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/InputLexer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/InputLexer.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/InputLexer.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/InputLexer.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/JVMDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/JVMDebugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/JVMDebugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/JVMDebugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/LongHashMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/LongHashMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/LongHashMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/LongHashMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescription.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescription.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescription.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescription.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionAArch64.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionAArch64.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionAArch64.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionAArch64.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionAMD64.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionAMD64.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionAMD64.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionAMD64.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIntelX86.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIntelX86.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIntelX86.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIntelX86.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC32Bit.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC32Bit.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC32Bit.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC32Bit.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC64Bit.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC64Bit.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC64Bit.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC64Bit.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionTwosComplement.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionTwosComplement.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionTwosComplement.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionTwosComplement.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MappedByteBufferDataSource.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MappedByteBufferDataSource.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MappedByteBufferDataSource.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MappedByteBufferDataSource.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/NoSuchSymbolException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/NoSuchSymbolException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/NoSuchSymbolException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/NoSuchSymbolException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/NotInHeapException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/NotInHeapException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/NotInHeapException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/NotInHeapException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/OopHandle.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/OopHandle.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/OopHandle.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/OopHandle.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Page.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Page.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Page.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Page.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/PageCache.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/PageCache.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/PageCache.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/PageCache.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/PageFetcher.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/PageFetcher.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/PageFetcher.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/PageFetcher.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ProcessInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ProcessInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ProcessInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ProcessInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/RandomAccessFileDataSource.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/RandomAccessFileDataSource.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/RandomAccessFileDataSource.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/RandomAccessFileDataSource.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ReadResult.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ReadResult.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ReadResult.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ReadResult.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/SymbolLookup.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/SymbolLookup.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/SymbolLookup.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/SymbolLookup.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ThreadAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ThreadAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ThreadAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ThreadAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ThreadProxy.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ThreadProxy.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ThreadProxy.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ThreadProxy.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/UnalignedAddressException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/UnalignedAddressException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/UnalignedAddressException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/UnalignedAddressException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/UnmappedAddressException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/UnmappedAddressException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/UnmappedAddressException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/UnmappedAddressException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/aarch64/AARCH64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/aarch64/AARCH64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/aarch64/AARCH64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/aarch64/AARCH64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/amd64/AMD64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/amd64/AMD64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/amd64/AMD64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/amd64/AMD64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/AccessControl.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/AccessControl.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/AccessControl.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/AccessControl.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ArrayType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ArrayType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ArrayType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ArrayType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/BaseClass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/BaseClass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/BaseClass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/BaseClass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/BitType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/BitType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/BitType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/BitType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/BlockSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/BlockSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/BlockSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/BlockSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugInfoDataBase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugInfoDataBase.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugInfoDataBase.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugInfoDataBase.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CVAttributes.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CVAttributes.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CVAttributes.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CVAttributes.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ClosestSymbol.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ClosestSymbol.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ClosestSymbol.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ClosestSymbol.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CompoundType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CompoundType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CompoundType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CompoundType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/DebugEvent.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/DebugEvent.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/DebugEvent.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/DebugEvent.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/DefaultObjectVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/DefaultObjectVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/DefaultObjectVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/DefaultObjectVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/DoubleType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/DoubleType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/DoubleType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/DoubleType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/EnumType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/EnumType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/EnumType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/EnumType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/Field.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/Field.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/Field.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/Field.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FieldIdentifier.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FieldIdentifier.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FieldIdentifier.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FieldIdentifier.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FloatType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FloatType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FloatType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FloatType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/GlobalSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/GlobalSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/GlobalSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/GlobalSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/IndexableFieldIdentifier.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/IndexableFieldIdentifier.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/IndexableFieldIdentifier.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/IndexableFieldIdentifier.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/IntType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/IntType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/IntType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/IntType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObject.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObject.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObject.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObjectComparator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObjectComparator.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObjectComparator.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObjectComparator.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LocalSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LocalSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LocalSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/LocalSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/MemberFunctionType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/MemberFunctionType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/MemberFunctionType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/MemberFunctionType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/NamedFieldIdentifier.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/NamedFieldIdentifier.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/NamedFieldIdentifier.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/NamedFieldIdentifier.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ObjectVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ObjectVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ObjectVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ObjectVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/PointerType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/PointerType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/PointerType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/PointerType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ProcessControl.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ProcessControl.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ProcessControl.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/ProcessControl.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/RefType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/RefType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/RefType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/RefType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/Sym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/Sym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/Sym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/Sym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/TemplateType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/TemplateType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/TemplateType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/TemplateType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/Type.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/Type.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/Type.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/Type.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/TypeVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/TypeVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/TypeVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/TypeVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/VoidType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/VoidType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/VoidType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/VoidType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicArrayType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicArrayType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicArrayType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicArrayType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBaseClass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBaseClass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBaseClass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBaseClass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBitType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBitType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBitType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBitType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBlockSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBlockSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBlockSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBlockSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCDebugInfoDataBase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCDebugInfoDataBase.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCDebugInfoDataBase.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCDebugInfoDataBase.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCompoundType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCompoundType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCompoundType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCompoundType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDebugEvent.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDebugEvent.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDebugEvent.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDebugEvent.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDoubleType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDoubleType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDoubleType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDoubleType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicEnumType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicEnumType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicEnumType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicEnumType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFloatType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFloatType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFloatType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFloatType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicGlobalSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicGlobalSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicGlobalSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicGlobalSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIndexableFieldIdentifier.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIndexableFieldIdentifier.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIndexableFieldIdentifier.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIndexableFieldIdentifier.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIntType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIntType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIntType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIntType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberMapping.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberMapping.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberMapping.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberMapping.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLocalSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLocalSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLocalSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLocalSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicMemberFunctionType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicMemberFunctionType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicMemberFunctionType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicMemberFunctionType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicNamedFieldIdentifier.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicNamedFieldIdentifier.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicNamedFieldIdentifier.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicNamedFieldIdentifier.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicPointerType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicPointerType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicPointerType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicPointerType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicRefType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicRefType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicRefType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicRefType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicVoidType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicVoidType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicVoidType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicVoidType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/CompoundTypeKind.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/CompoundTypeKind.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/CompoundTypeKind.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/CompoundTypeKind.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyBlockSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyBlockSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyBlockSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyBlockSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/ResolveListener.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/ResolveListener.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/ResolveListener.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/ResolveListener.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyAddress.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyAddress.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyAddress.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyDebugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyDebugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyDebugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyOopHandle.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyOopHandle.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyOopHandle.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyOopHandle.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/SharedObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/SharedObject.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/SharedObject.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/SharedObject.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/aarch64/LinuxAARCH64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/aarch64/LinuxAARCH64CFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/aarch64/LinuxAARCH64CFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/aarch64/LinuxAARCH64CFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/aarch64/LinuxAARCH64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/aarch64/LinuxAARCH64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/aarch64/LinuxAARCH64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/aarch64/LinuxAARCH64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ppc64/LinuxPPC64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ppc64/LinuxPPC64CFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ppc64/LinuxPPC64CFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ppc64/LinuxPPC64CFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ppc64/LinuxPPC64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ppc64/LinuxPPC64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ppc64/LinuxPPC64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ppc64/LinuxPPC64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/sparc/LinuxSPARCCFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/sparc/LinuxSPARCCFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/sparc/LinuxSPARCCFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/sparc/LinuxSPARCCFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/sparc/LinuxSPARCThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/sparc/LinuxSPARCThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/sparc/LinuxSPARCThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/sparc/LinuxSPARCThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/AddressDataSource.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/AddressDataSource.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/AddressDataSource.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/AddressDataSource.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/DSO.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/DSO.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/DSO.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/DSO.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFile.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFile.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFile.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFile.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFileParser.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFileParser.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFileParser.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFileParser.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHashTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHashTable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHashTable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHashTable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFProgramHeader.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFProgramHeader.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFProgramHeader.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFProgramHeader.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSectionHeader.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSectionHeader.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSectionHeader.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSectionHeader.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFStringTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFStringTable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFStringTable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFStringTable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSymbol.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSymbol.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSymbol.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSymbol.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcAddress.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcAddress.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcAddress.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcCDebugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcCDebugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcCDebugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcCFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcCFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcCFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcCFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcOopHandle.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcOopHandle.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcOopHandle.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcOopHandle.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/SharedObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/SharedObject.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/SharedObject.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/SharedObject.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/aarch64/ProcAARCH64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/aarch64/ProcAARCH64Thread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/aarch64/ProcAARCH64Thread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/aarch64/ProcAARCH64Thread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/aarch64/ProcAARCH64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/aarch64/ProcAARCH64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/aarch64/ProcAARCH64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/aarch64/ProcAARCH64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/aarch64/ProcAARCH64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/aarch64/ProcAARCH64ThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/aarch64/ProcAARCH64ThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/aarch64/ProcAARCH64ThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64Thread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64Thread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64Thread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86Thread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86Thread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86Thread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteAddress.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteAddress.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteAddress.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerServer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerServer.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerServer.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerServer.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteOopHandle.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteOopHandle.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteOopHandle.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteOopHandle.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/aarch64/RemoteAARCH64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/aarch64/RemoteAARCH64Thread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/aarch64/RemoteAARCH64Thread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/aarch64/RemoteAARCH64Thread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/aarch64/RemoteAARCH64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/aarch64/RemoteAARCH64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/aarch64/RemoteAARCH64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/aarch64/RemoteAARCH64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/aarch64/RemoteAARCH64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/aarch64/RemoteAARCH64ThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/aarch64/RemoteAARCH64ThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/aarch64/RemoteAARCH64ThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64Thread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64Thread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64Thread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86Thread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86Thread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86Thread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/sparc/SPARCThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/sparc/SPARCThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/sparc/SPARCThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/sparc/SPARCThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxBfEfRecord.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxBfEfRecord.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxBfEfRecord.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxBfEfRecord.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFileRecord.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFileRecord.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFileRecord.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFileRecord.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFunctionDefinitionRecord.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFunctionDefinitionRecord.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFunctionDefinitionRecord.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFunctionDefinitionRecord.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSectionDefinitionsRecord.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSectionDefinitionsRecord.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSectionDefinitionsRecord.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSectionDefinitionsRecord.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSymbolRecord.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSymbolRecord.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSymbolRecord.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSymbolRecord.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxWeakExternalRecord.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxWeakExternalRecord.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxWeakExternalRecord.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxWeakExternalRecord.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFile.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFile.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFile.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFile.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFileParser.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFileParser.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFileParser.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFileParser.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFHeader.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFHeader.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFHeader.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFHeader.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFLineNumber.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFLineNumber.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFLineNumber.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFLineNumber.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFRelocation.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFRelocation.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFRelocation.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFRelocation.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbol.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbol.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbol.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbol.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbolConstants.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbolConstants.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbolConstants.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbolConstants.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COMDATSelectionTypes.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COMDATSelectionTypes.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COMDATSelectionTypes.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COMDATSelectionTypes.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/Characteristics.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/Characteristics.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/Characteristics.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/Characteristics.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DLLCharacteristics.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DLLCharacteristics.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DLLCharacteristics.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DLLCharacteristics.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DataDirectory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DataDirectory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DataDirectory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DataDirectory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectoryEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectoryEntry.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectoryEntry.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectoryEntry.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugTypes.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugTypes.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugTypes.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugTypes.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50MemberAttributes.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50MemberAttributes.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50MemberAttributes.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50MemberAttributes.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50ReservedTypes.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50ReservedTypes.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50ReservedTypes.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50ReservedTypes.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSAlignSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSAlignSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSAlignSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSAlignSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSFileIndex.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSFileIndex.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSFileIndex.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSFileIndex.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalPub.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalPub.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalPub.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalPub.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalTypes.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalTypes.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalTypes.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalTypes.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSLibraries.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSLibraries.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSLibraries.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSLibraries.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSMPC.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSMPC.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSMPC.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSMPC.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSModule.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSModule.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSModule.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSModule.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap16.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap16.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap16.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap16.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap32.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap32.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap32.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap32.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPreComp.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPreComp.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPreComp.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPreComp.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublic.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublic.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublic.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublic.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublicSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublicSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublicSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublicSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegName.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegName.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegName.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegName.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcLnSeg.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcLnSeg.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcLnSeg.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcLnSeg.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcModule.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcModule.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcModule.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcModule.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSStaticSym.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSStaticSym.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSStaticSym.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSStaticSym.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbolBase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbolBase.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbolBase.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbolBase.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbols.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbols.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbols.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbols.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSTypes.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSTypes.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSTypes.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSTypes.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDesc.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDesc.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDesc.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDesc.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDescEnums.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDescEnums.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDescEnums.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDescEnums.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModFileDesc.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModFileDesc.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModFileDesc.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModFileDesc.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModLineNumberMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModLineNumberMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModLineNumberMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModLineNumberMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50Subsection.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50Subsection.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50Subsection.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50Subsection.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionDirectory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionDirectory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionDirectory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionDirectory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionTypes.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionTypes.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionTypes.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionTypes.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolEnums.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolEnums.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolEnums.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolEnums.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolIterator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolIterator.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolIterator.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolIterator.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolTypes.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolTypes.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolTypes.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolTypes.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeEnums.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeEnums.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeEnums.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeEnums.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeIterator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeIterator.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeIterator.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeIterator.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeLeafIndices.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeLeafIndices.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeLeafIndices.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeLeafIndices.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50WrongNumericTypeException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50WrongNumericTypeException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50WrongNumericTypeException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50WrongNumericTypeException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DumpExports.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DumpExports.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DumpExports.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DumpExports.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/ExportDirectoryTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/ExportDirectoryTable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/ExportDirectoryTable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/ExportDirectoryTable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/MachineTypes.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/MachineTypes.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/MachineTypes.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/MachineTypes.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeader.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeader.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeader.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeader.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderDataDirectories.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderDataDirectories.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderDataDirectories.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderDataDirectories.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderStandardFields.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderStandardFields.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderStandardFields.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderStandardFields.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderWindowsSpecificFields.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderWindowsSpecificFields.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderWindowsSpecificFields.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderWindowsSpecificFields.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionFlags.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionFlags.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionFlags.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionFlags.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionHeader.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionHeader.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionHeader.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionHeader.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestDebugInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestDebugInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestDebugInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestDebugInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestParser.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestParser.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestParser.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestParser.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/TypeIndicators.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/TypeIndicators.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/TypeIndicators.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/TypeIndicators.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/WindowsNTSubsystem.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/WindowsNTSubsystem.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/WindowsNTSubsystem.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/WindowsNTSubsystem.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/AddressDataSource.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/AddressDataSource.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/AddressDataSource.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/AddressDataSource.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/DLL.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/DLL.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/DLL.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/DLL.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgAddress.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgAddress.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgAddress.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugInfoBuilder.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugInfoBuilder.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugInfoBuilder.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugInfoBuilder.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgOopHandle.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgOopHandle.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgOopHandle.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgOopHandle.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64Thread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64Thread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64Thread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64Thread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64Thread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64Thread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/amd64/WindowsAMD64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/amd64/WindowsAMD64CFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/amd64/WindowsAMD64CFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/amd64/WindowsAMD64CFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/x86/WindowsX86CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/x86/WindowsX86CFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/x86/WindowsX86CFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/x86/WindowsX86CFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/AdaptiveFreeList.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/AdaptiveFreeList.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/AdaptiveFreeList.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/AdaptiveFreeList.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CMSBitMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CMSBitMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CMSBitMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CMSBitMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CMSCollector.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CMSCollector.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CMSCollector.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CMSCollector.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/ConcurrentMarkSweepGeneration.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/ConcurrentMarkSweepGeneration.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/ConcurrentMarkSweepGeneration.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/ConcurrentMarkSweepGeneration.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/LinearAllocBlock.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/LinearAllocBlock.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/LinearAllocBlock.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/LinearAllocBlock.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/ParNewGeneration.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/ParNewGeneration.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/ParNewGeneration.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/ParNewGeneration.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegion.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegion.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegion.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegion.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionManager.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionManager.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionManager.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionManager.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetBase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetBase.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetBase.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetBase.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/ImmutableSpace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/ImmutableSpace.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/ImmutableSpace.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/ImmutableSpace.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/MutableSpace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/MutableSpace.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/MutableSpace.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/MutableSpace.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/PSOldGen.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/PSOldGen.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/PSOldGen.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/PSOldGen.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/PSYoungGen.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/PSYoungGen.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/PSYoungGen.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/PSYoungGen.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/ParallelScavengeHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/ParallelScavengeHeap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/ParallelScavengeHeap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/parallel/ParallelScavengeHeap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/DefNewGeneration.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/DefNewGeneration.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/DefNewGeneration.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/DefNewGeneration.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/TenuredGeneration.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/TenuredGeneration.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/TenuredGeneration.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/TenuredGeneration.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CardGeneration.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CardGeneration.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CardGeneration.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CardGeneration.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CompactibleSpace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CompactibleSpace.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CompactibleSpace.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CompactibleSpace.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/ContiguousSpace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/ContiguousSpace.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/ContiguousSpace.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/ContiguousSpace.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/G1HeapRegionType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/G1HeapRegionType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/G1HeapRegionType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/G1HeapRegionType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/G1YCType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/G1YCType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/G1YCType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/G1YCType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCName.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCName.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCName.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCName.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCWhen.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCWhen.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCWhen.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCWhen.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenCollectedHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenCollectedHeap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenCollectedHeap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenCollectedHeap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/Generation.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/Generation.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/Generation.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/Generation.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationIsInClosure.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationIsInClosure.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationIsInClosure.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationIsInClosure.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationSpec.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationSpec.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationSpec.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationSpec.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/OffsetTableContigSpace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/OffsetTableContigSpace.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/OffsetTableContigSpace.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/OffsetTableContigSpace.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/Space.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/Space.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/Space.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/Space.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/SpaceClosure.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/SpaceClosure.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/SpaceClosure.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/SpaceClosure.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/TenuredSpace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/TenuredSpace.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/TenuredSpace.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/TenuredSpace.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Bytecode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Bytecode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Bytecode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Bytecode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeANewArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeANewArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeANewArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeANewArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeBipush.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeBipush.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeBipush.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeBipush.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeCheckCast.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeCheckCast.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeCheckCast.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeCheckCast.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeDisassembler.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeDisassembler.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeDisassembler.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeDisassembler.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetPut.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetPut.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetPut.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetPut.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetStatic.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetStatic.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetStatic.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetStatic.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGoto.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGoto.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGoto.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGoto.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGotoW.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGotoW.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGotoW.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeGotoW.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeIf.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeIf.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeIf.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeIf.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeIinc.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeIinc.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeIinc.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeIinc.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeInstanceOf.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeInstanceOf.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeInstanceOf.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeInstanceOf.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeJmp.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeJmp.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeJmp.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeJmp.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsr.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsr.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsr.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsr.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsrW.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsrW.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsrW.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsrW.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoad.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoad.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoad.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoad.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadStore.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadStore.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadStore.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadStore.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLookupswitch.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLookupswitch.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLookupswitch.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeLookupswitch.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeMultiANewArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeMultiANewArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeMultiANewArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeMultiANewArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeNew.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeNew.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeNew.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeNew.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeNewArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeNewArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeNewArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeNewArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodePutField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodePutField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodePutField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodePutField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodePutStatic.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodePutStatic.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodePutStatic.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodePutStatic.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeRet.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeRet.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeRet.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeRet.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeSipush.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeSipush.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeSipush.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeSipush.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeStore.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeStore.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeStore.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeStore.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeStream.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeStream.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeStream.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeStream.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeTableswitch.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeTableswitch.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeTableswitch.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeTableswitch.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Interpreter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Interpreter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Interpreter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Interpreter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/InterpreterCodelet.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/InterpreterCodelet.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/InterpreterCodelet.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/InterpreterCodelet.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/LookupswitchPair.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/LookupswitchPair.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/LookupswitchPair.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/LookupswitchPair.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/MaskFillerForNative.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/MaskFillerForNative.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/MaskFillerForNative.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/MaskFillerForNative.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OffsetClosure.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OffsetClosure.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OffsetClosure.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OffsetClosure.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OopMapCacheEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OopMapCacheEntry.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OopMapCacheEntry.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OopMapCacheEntry.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OopMapForCacheEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OopMapForCacheEntry.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OopMapForCacheEntry.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OopMapForCacheEntry.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/AFLBinaryTreeDictionary.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/AFLBinaryTreeDictionary.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/AFLBinaryTreeDictionary.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/AFLBinaryTreeDictionary.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/AltHashing.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/AltHashing.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/AltHashing.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/AltHashing.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/CodeHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/CodeHeap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/CodeHeap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/CodeHeap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Dictionary.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Dictionary.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Dictionary.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Dictionary.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FreeChunk.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FreeChunk.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FreeChunk.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FreeChunk.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/HeapBlock.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/HeapBlock.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/HeapBlock.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/HeapBlock.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/MemRegion.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/MemRegion.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/MemRegion.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/MemRegion.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/ReferenceType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/ReferenceType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/ReferenceType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/ReferenceType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/StringTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/StringTable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/StringTable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/StringTable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SymbolTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SymbolTable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SymbolTable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SymbolTable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Universe.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Universe.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Universe.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Universe.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/UniverseExt.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/UniverseExt.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/UniverseExt.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/UniverseExt.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/VirtualSpace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/VirtualSpace.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/VirtualSpace.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/VirtualSpace.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/AccessFlags.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/AccessFlags.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/AccessFlags.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/AccessFlags.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArgInfoData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArgInfoData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArgInfoData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArgInfoData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Array.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Array.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Array.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Array.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArrayData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArrayData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArrayData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArrayData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BitData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BitData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BitData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BitData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BooleanField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BooleanField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BooleanField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BooleanField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BranchData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BranchData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BranchData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BranchData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BreakpointInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BreakpointInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BreakpointInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BreakpointInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ByteField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ByteField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ByteField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ByteField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CIntField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CIntField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CIntField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CIntField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeDataInterface.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeDataInterface.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeDataInterface.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeDataInterface.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CellTypeState.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CellTypeState.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CellTypeState.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CellTypeState.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CellTypeStateList.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CellTypeStateList.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CellTypeStateList.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CellTypeStateList.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CharField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CharField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CharField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CharField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CheckedExceptionElement.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CheckedExceptionElement.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CheckedExceptionElement.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CheckedExceptionElement.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CompiledICHolder.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CompiledICHolder.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CompiledICHolder.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CompiledICHolder.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CompressedLineNumberReadStream.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CompressedLineNumberReadStream.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CompressedLineNumberReadStream.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CompressedLineNumberReadStream.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstMethod.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstMethod.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstMethod.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CounterData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CounterData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CounterData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CounterData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DataLayout.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DataLayout.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DataLayout.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DataLayout.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DefaultHeapVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DefaultHeapVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DefaultHeapVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DefaultHeapVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DefaultMetadataVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DefaultMetadataVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DefaultMetadataVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DefaultMetadataVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DefaultOopVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DefaultOopVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DefaultOopVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DefaultOopVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DoubleField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DoubleField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DoubleField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DoubleField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ExceptionTableElement.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ExceptionTableElement.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ExceptionTableElement.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ExceptionTableElement.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Field.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Field.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Field.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Field.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FieldIdentifier.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FieldIdentifier.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FieldIdentifier.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FieldIdentifier.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FieldType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FieldType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FieldType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FieldType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FieldVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FieldVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FieldVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FieldVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FloatField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FloatField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FloatField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/FloatField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/HeapPrinter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/HeapPrinter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/HeapPrinter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/HeapPrinter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/HeapVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/HeapVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/HeapVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/HeapVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/IndexableFieldIdentifier.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/IndexableFieldIdentifier.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/IndexableFieldIdentifier.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/IndexableFieldIdentifier.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceClassLoaderKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceClassLoaderKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceClassLoaderKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceClassLoaderKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceMirrorKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceMirrorKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceMirrorKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceMirrorKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceRefKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceRefKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceRefKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceRefKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/IntField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/IntField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/IntField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/IntField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/JVMDIClassStatus.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/JVMDIClassStatus.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/JVMDIClassStatus.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/JVMDIClassStatus.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/JumpData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/JumpData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/JumpData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/JumpData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Klass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Klass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Klass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Klass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/LineNumberTableElement.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/LineNumberTableElement.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/LineNumberTableElement.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/LineNumberTableElement.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/LocalVariableTableElement.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/LocalVariableTableElement.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/LocalVariableTableElement.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/LocalVariableTableElement.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/LongField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/LongField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/LongField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/LongField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Mark.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Mark.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Mark.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Mark.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Metadata.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Metadata.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Metadata.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Metadata.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MetadataField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MetadataField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MetadataField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MetadataField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MetadataVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MetadataVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MetadataVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MetadataVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Method.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Method.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Method.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Method.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodCounters.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodCounters.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodCounters.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodCounters.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodDataInterface.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodDataInterface.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodDataInterface.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodDataInterface.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MutationException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MutationException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MutationException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MutationException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/NamedFieldIdentifier.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/NamedFieldIdentifier.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/NamedFieldIdentifier.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/NamedFieldIdentifier.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/NarrowKlassField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/NarrowKlassField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/NarrowKlassField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/NarrowKlassField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/NarrowOopField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/NarrowOopField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/NarrowOopField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/NarrowOopField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHistogram.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHistogram.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHistogram.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHistogram.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHistogramElement.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHistogramElement.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHistogramElement.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHistogramElement.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopPrinter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopPrinter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopPrinter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopPrinter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopUtilities.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopUtilities.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopUtilities.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopUtilities.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ParametersTypeData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ParametersTypeData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ParametersTypeData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ParametersTypeData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ProfileData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ProfileData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ProfileData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ProfileData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/RawHeapVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/RawHeapVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/RawHeapVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/RawHeapVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/RetData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/RetData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/RetData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/RetData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReturnTypeEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReturnTypeEntry.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReturnTypeEntry.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReturnTypeEntry.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ShortField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ShortField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ShortField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ShortField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/SpeculativeTrapData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/SpeculativeTrapData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/SpeculativeTrapData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/SpeculativeTrapData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Symbol.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Symbol.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Symbol.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Symbol.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeArrayKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeArrayKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeArrayKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeArrayKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntries.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntries.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntries.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntries.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntriesAtCall.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntriesAtCall.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntriesAtCall.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntriesAtCall.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeStackSlotEntries.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeStackSlotEntries.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeStackSlotEntries.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeStackSlotEntries.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/UnknownOopException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/UnknownOopException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/UnknownOopException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/UnknownOopException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallTypeData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallTypeData.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallTypeData.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallTypeData.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_Array.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_Array.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_Array.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_Array.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_List.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_List.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_List.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_List.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Compile.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Compile.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Compile.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Compile.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/HaltNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/HaltNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/HaltNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/HaltNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/InlineTree.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/InlineTree.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/InlineTree.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/InlineTree.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/JVMState.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/JVMState.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/JVMState.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/JVMState.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/LoopNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/LoopNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/LoopNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/LoopNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachIfNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachIfNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachIfNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachIfNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MultiNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MultiNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MultiNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MultiNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_Array.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_Array.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_Array.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_Array.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_List.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_List.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_List.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_List.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Phase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Phase.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Phase.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Phase.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseRegAlloc.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseRegAlloc.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseRegAlloc.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseRegAlloc.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhiNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhiNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhiNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhiNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/ProjNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/ProjNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/ProjNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/ProjNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RegionNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RegionNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RegionNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RegionNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RootNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RootNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RootNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RootNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/SafePointNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/SafePointNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/SafePointNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/SafePointNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/TypeNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/TypeNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/TypeNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/TypeNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/prims/JvmtiExport.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/prims/JvmtiExport.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/prims/JvmtiExport.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/prims/JvmtiExport.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/AddressVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/AddressVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/AddressVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/AddressVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ArgumentSizeComputer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ArgumentSizeComputer.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ArgumentSizeComputer.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ArgumentSizeComputer.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Arguments.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Arguments.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Arguments.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Arguments.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicLock.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicLock.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicLock.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicLock.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicObjectLock.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicObjectLock.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicObjectLock.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicObjectLock.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicTypeSize.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicTypeSize.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicTypeSize.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicTypeSize.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Bytes.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Bytes.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Bytes.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Bytes.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CodeCacheSweeperThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CodeCacheSweeperThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CodeCacheSweeperThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CodeCacheSweeperThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ConcurrentLocksPrinter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ConcurrentLocksPrinter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ConcurrentLocksPrinter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ConcurrentLocksPrinter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ConstructionException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ConstructionException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ConstructionException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ConstructionException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/DeadlockDetector.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/DeadlockDetector.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/DeadlockDetector.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/DeadlockDetector.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ExternalVFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ExternalVFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ExternalVFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ExternalVFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Flags.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Flags.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Flags.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Flags.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/InstanceConstructor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/InstanceConstructor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/InstanceConstructor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/InstanceConstructor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIHandleBlock.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIHandleBlock.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIHandleBlock.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIHandleBlock.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIHandles.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIHandles.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIHandles.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIHandles.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIid.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIid.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIid.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIid.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaCallWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaCallWrapper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaCallWrapper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaCallWrapper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThreadFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThreadFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThreadFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThreadState.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThreadState.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThreadState.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThreadState.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JvmtiAgentThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JvmtiAgentThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JvmtiAgentThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JvmtiAgentThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/MonitorInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/MonitorInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/MonitorInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/MonitorInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/NativeSignatureIterator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/NativeSignatureIterator.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/NativeSignatureIterator.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/NativeSignatureIterator.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/OSThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/OSThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/OSThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/OSThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/PerfDataEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/PerfDataEntry.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/PerfDataEntry.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/PerfDataEntry.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/PerfDataPrologue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/PerfDataPrologue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/PerfDataPrologue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/PerfDataPrologue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/PerfMemory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/PerfMemory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/PerfMemory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/PerfMemory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/RegisterMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/RegisterMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/RegisterMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/RegisterMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ResultTypeFinder.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ResultTypeFinder.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ResultTypeFinder.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ResultTypeFinder.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/SignatureConverter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/SignatureConverter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/SignatureConverter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/SignatureConverter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/SignatureInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/SignatureInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/SignatureInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/SignatureInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/SignatureIterator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/SignatureIterator.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/SignatureIterator.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/SignatureIterator.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackFrameInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackFrameInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackFrameInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackFrameInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackFrameStream.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackFrameStream.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackFrameStream.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackFrameStream.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StaticBaseConstructor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StaticBaseConstructor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StaticBaseConstructor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StaticBaseConstructor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StubRoutines.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StubRoutines.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StubRoutines.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StubRoutines.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadStackTrace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadStackTrace.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadStackTrace.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadStackTrace.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadState.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadState.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadState.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadState.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMObject.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMObject.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMObject.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMObjectFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMObjectFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMObjectFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMObjectFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMOps.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMOps.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMOps.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMOps.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMReg.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMReg.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMReg.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMReg.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMVersionMismatchException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMVersionMismatchException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMVersionMismatchException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMVersionMismatchException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VirtualBaseConstructor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VirtualBaseConstructor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VirtualBaseConstructor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VirtualBaseConstructor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/WatcherThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/WatcherThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/WatcherThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/WatcherThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64CurrentFrameGuess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64CurrentFrameGuess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64CurrentFrameGuess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64CurrentFrameGuess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64JavaCallWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64JavaCallWrapper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64JavaCallWrapper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64JavaCallWrapper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64RegisterMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64RegisterMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64RegisterMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64RegisterMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64JavaCallWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64JavaCallWrapper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64JavaCallWrapper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64JavaCallWrapper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux/LinuxSignals.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux/LinuxSignals.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux/LinuxSignals.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux/LinuxSignals.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_aarch64/LinuxAARCH64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_aarch64/LinuxAARCH64JavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_aarch64/LinuxAARCH64JavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_aarch64/LinuxAARCH64JavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_ppc64/LinuxPPC64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_ppc64/LinuxPPC64JavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_ppc64/LinuxPPC64JavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_ppc64/LinuxPPC64JavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_sparc/LinuxSPARCJavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_sparc/LinuxSPARCJavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_sparc/LinuxSPARCJavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_sparc/LinuxSPARCJavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxSignals.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxSignals.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxSignals.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxSignals.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxX86JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxX86JavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxX86JavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxX86JavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/posix/POSIXSignals.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/posix/POSIXSignals.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/posix/POSIXSignals.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/posix/POSIXSignals.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_sparc/SolarisSPARCJavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_sparc/SolarisSPARCJavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_sparc/SolarisSPARCJavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_sparc/SolarisSPARCJavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRegisterMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRegisterMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRegisterMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRegisterMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/vmSymbols.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/vmSymbols.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/vmSymbols.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/vmSymbols.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86CurrentFrameGuess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86CurrentFrameGuess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86CurrentFrameGuess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86CurrentFrameGuess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86JavaCallWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86JavaCallWrapper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86JavaCallWrapper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86JavaCallWrapper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86RegisterMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86RegisterMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86RegisterMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86RegisterMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/ClassLoaderStats.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/ClassLoaderStats.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/ClassLoaderStats.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/ClassLoaderStats.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/FlagDumper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/FlagDumper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/FlagDumper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/FlagDumper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapDumper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapDumper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapDumper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapDumper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JSnap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JSnap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JSnap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JSnap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JStack.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JStack.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JStack.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JStack.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/ObjectHistogram.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/ObjectHistogram.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/ObjectHistogram.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/ObjectHistogram.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/StackTrace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/StackTrace.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/StackTrace.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/StackTrace.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/Tool.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/Tool.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/Tool.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/Tool.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassFilter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassFilter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassFilter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassFilter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/NameFilter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/NameFilter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/NameFilter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/NameFilter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/PackageNameFilter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/PackageNameFilter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/PackageNameFilter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/PackageNameFilter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/AddressField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/AddressField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/AddressField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/AddressField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/CIntegerField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/CIntegerField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/CIntegerField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/CIntegerField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/CIntegerType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/CIntegerType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/CIntegerType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/CIntegerType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/Field.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/Field.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/Field.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/Field.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JBooleanField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JBooleanField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JBooleanField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JBooleanField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JByteField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JByteField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JByteField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JByteField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JCharField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JCharField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JCharField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JCharField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JDoubleField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JDoubleField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JDoubleField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JDoubleField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JFloatField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JFloatField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JFloatField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JFloatField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JIntField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JIntField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JIntField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JIntField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JLongField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JLongField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JLongField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JLongField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JShortField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JShortField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JShortField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/JShortField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/NarrowOopField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/NarrowOopField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/NarrowOopField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/NarrowOopField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/OopField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/OopField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/OopField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/OopField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/PointerType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/PointerType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/PointerType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/PointerType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/Type.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/Type.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/Type.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/Type.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/TypeDataBase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/TypeDataBase.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/TypeDataBase.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/TypeDataBase.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/WrongTypeException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/WrongTypeException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/WrongTypeException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/WrongTypeException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicAddressFieldWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicAddressFieldWrapper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicAddressFieldWrapper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicAddressFieldWrapper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicFieldWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicFieldWrapper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicFieldWrapper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicFieldWrapper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJBooleanField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJBooleanField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJBooleanField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJBooleanField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJByteField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJByteField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJByteField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJByteField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJCharField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJCharField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJCharField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJCharField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJDoubleField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJDoubleField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJDoubleField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJDoubleField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJFloatField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJFloatField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJFloatField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJFloatField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJIntField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJIntField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJIntField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJIntField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJLongField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJLongField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJLongField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJLongField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJShortField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJShortField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJShortField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicJShortField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicNarrowOopField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicNarrowOopField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicNarrowOopField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicNarrowOopField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicOopField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicOopField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicOopField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicOopField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicPointerType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicPointerType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicPointerType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicPointerType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicVtblAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicVtblAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicVtblAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicVtblAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/VtblAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/VtblAccess.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/VtblAccess.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/VtblAccess.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/Annotation.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/Annotation.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/Annotation.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/Annotation.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/DeadlockDetectionPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/DeadlockDetectionPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/DeadlockDetectionPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/DeadlockDetectionPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/DebuggerConsolePanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/DebuggerConsolePanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/DebuggerConsolePanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/DebuggerConsolePanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/EditableAtEndDocument.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/EditableAtEndDocument.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/EditableAtEndDocument.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/EditableAtEndDocument.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/Editor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/Editor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/Editor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/Editor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/EditorCommands.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/EditorCommands.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/EditorCommands.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/EditorCommands.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/EditorFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/EditorFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/EditorFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/EditorFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindByQueryPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindByQueryPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindByQueryPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindByQueryPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FrameWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FrameWrapper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FrameWrapper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FrameWrapper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/GraphicsUtilities.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/GraphicsUtilities.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/GraphicsUtilities.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/GraphicsUtilities.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/HeapParametersPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/HeapParametersPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/HeapParametersPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/HeapParametersPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/HighPrecisionJScrollBar.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/HighPrecisionJScrollBar.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/HighPrecisionJScrollBar.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/HighPrecisionJScrollBar.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/HistoryComboBox.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/HistoryComboBox.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/HistoryComboBox.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/HistoryComboBox.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/Inspector.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/Inspector.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/Inspector.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/Inspector.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JFrameWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JFrameWrapper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JFrameWrapper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JFrameWrapper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JInternalFrameWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JInternalFrameWrapper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JInternalFrameWrapper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JInternalFrameWrapper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JavaStackTracePanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JavaStackTracePanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JavaStackTracePanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JavaStackTracePanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JavaThreadsPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JavaThreadsPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JavaThreadsPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JavaThreadsPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MonitorCacheDumpPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MonitorCacheDumpPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MonitorCacheDumpPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MonitorCacheDumpPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ObjectListPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ObjectListPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ObjectListPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ObjectListPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ProcessListPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ProcessListPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ProcessListPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ProcessListPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ProgressBarPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ProgressBarPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ProgressBarPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ProgressBarPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SAEditorPane.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SAEditorPane.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SAEditorPane.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SAEditorPane.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SAListener.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SAListener.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SAListener.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SAListener.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SAPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SAPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SAPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SAPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SourceCodePanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SourceCodePanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SourceCodePanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SourceCodePanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/StringTransferable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/StringTransferable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/StringTransferable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/StringTransferable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SysPropsPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SysPropsPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SysPropsPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/SysPropsPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ThreadInfoPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ThreadInfoPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ThreadInfoPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ThreadInfoPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/VMFlagsPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/VMFlagsPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/VMFlagsPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/VMFlagsPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/VMVersionInfoPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/VMVersionInfoPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/VMVersionInfoPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/VMVersionInfoPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/FindAction.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/FindAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/FindAction.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/FindAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/FindClassesAction.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/FindClassesAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/FindClassesAction.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/FindClassesAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/FindCrashesAction.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/FindCrashesAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/FindCrashesAction.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/FindCrashesAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/HSDBActionManager.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/HSDBActionManager.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/HSDBActionManager.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/HSDBActionManager.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/InspectAction.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/InspectAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/InspectAction.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/InspectAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/JavaStackTraceAction.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/JavaStackTraceAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/JavaStackTraceAction.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/JavaStackTraceAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/MemoryAction.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/MemoryAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/MemoryAction.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/MemoryAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/ShowAction.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/ShowAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/ShowAction.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/ShowAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/ThreadInfoAction.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/ThreadInfoAction.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/ThreadInfoAction.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/action/ThreadInfoAction.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/ClassBrowserPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/ClassBrowserPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/ClassBrowserPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/ClassBrowserPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/CodeViewerPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/CodeViewerPanel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/CodeViewerPanel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/CodeViewerPanel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/resources/arrow.png b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/resources/arrow.png similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/resources/arrow.png rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/resources/arrow.png diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/resources/breakpoint.png b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/resources/breakpoint.png similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/resources/breakpoint.png rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/resources/breakpoint.png diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/resources/triangle.png b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/resources/triangle.png similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/resources/triangle.png rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/resources/triangle.png diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/LongCellRenderer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/LongCellRenderer.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/LongCellRenderer.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/LongCellRenderer.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/SortHeaderCellRenderer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/SortHeaderCellRenderer.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/SortHeaderCellRenderer.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/SortHeaderCellRenderer.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/SortHeaderMouseAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/SortHeaderMouseAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/SortHeaderMouseAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/SortHeaderMouseAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/SortableTableModel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/SortableTableModel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/SortableTableModel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/SortableTableModel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/TableModelComparator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/TableModelComparator.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/TableModelComparator.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/table/TableModelComparator.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/BadAddressTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/BadAddressTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/BadAddressTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/BadAddressTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/BooleanTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/BooleanTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/BooleanTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/BooleanTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CStringTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CStringTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CStringTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CStringTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CharTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CharTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CharTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CharTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/DoubleTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/DoubleTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/DoubleTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/DoubleTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/FieldTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/FieldTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/FieldTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/FieldTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/FloatTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/FloatTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/FloatTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/FloatTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/LongTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/LongTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/LongTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/LongTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/MetadataTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/MetadataTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/MetadataTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/MetadataTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/RevPtrsTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/RevPtrsTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/RevPtrsTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/RevPtrsTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/RootTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/RootTreeNodeAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/RootTreeNodeAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/RootTreeNodeAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeGroupNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeGroupNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeGroupNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeGroupNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeModel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeModel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeModel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeModel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/AbstractTreeTableModel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/AbstractTreeTableModel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/AbstractTreeTableModel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/AbstractTreeTableModel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/JTreeTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/JTreeTable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/JTreeTable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/JTreeTable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/SimpleTreeTableModel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/SimpleTreeTableModel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/SimpleTreeTableModel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/SimpleTreeTableModel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModel.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModel.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModel.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModelAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModelAdapter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModelAdapter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModelAdapter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AddressOps.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AddressOps.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AddressOps.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AddressOps.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AltPlatformInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AltPlatformInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AltPlatformInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AltPlatformInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Assert.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Assert.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Assert.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Assert.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AssertionFailure.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AssertionFailure.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AssertionFailure.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AssertionFailure.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BasicHashtable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BasicHashtable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BasicHashtable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BasicHashtable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BasicHashtableEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BasicHashtableEntry.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BasicHashtableEntry.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BasicHashtableEntry.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BitMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BitMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BitMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BitMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BitMapClosure.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BitMapClosure.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BitMapClosure.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/BitMapClosure.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Bits.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Bits.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Bits.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Bits.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CPPExpressions.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CPPExpressions.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CPPExpressions.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CPPExpressions.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CStringUtilities.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CStringUtilities.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CStringUtilities.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CStringUtilities.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ConstIterator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ConstIterator.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ConstIterator.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ConstIterator.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/FindObjectByType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/FindObjectByType.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/FindObjectByType.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/FindObjectByType.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/GenericArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/GenericArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/GenericArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/GenericArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/GenericGrowableArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/GenericGrowableArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/GenericGrowableArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/GenericGrowableArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/GrowableArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/GrowableArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/GrowableArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/GrowableArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Hashtable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Hashtable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Hashtable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Hashtable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HashtableBucket.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HashtableBucket.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HashtableBucket.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HashtableBucket.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapGraphWriter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapGraphWriter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapGraphWriter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapGraphWriter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapProgressThunk.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapProgressThunk.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapProgressThunk.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapProgressThunk.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntegerEnum.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntegerEnum.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntegerEnum.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntegerEnum.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Interval.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Interval.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Interval.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/Interval.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntervalNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntervalNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntervalNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntervalNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntervalTree.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntervalTree.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntervalTree.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/IntervalTree.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/KlassArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/KlassArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/KlassArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/KlassArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessPath.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessPath.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessPath.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessPath.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessPathElement.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessPathElement.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessPathElement.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessPathElement.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessPathList.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessPathList.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessPathList.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/LivenessPathList.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MarkBits.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MarkBits.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MarkBits.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MarkBits.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MessageQueue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MessageQueue.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MessageQueue.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MessageQueue.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MessageQueueBackend.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MessageQueueBackend.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MessageQueueBackend.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MessageQueueBackend.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MethodArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MethodArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MethodArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/MethodArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ObjectReader.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ObjectReader.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ObjectReader.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ObjectReader.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ProcImageClassLoader.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ProcImageClassLoader.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ProcImageClassLoader.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ProcImageClassLoader.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ProgressiveHeapVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ProgressiveHeapVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ProgressiveHeapVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ProgressiveHeapVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RBColor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RBColor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RBColor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RBColor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RBNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RBNode.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RBNode.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RBNode.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RBTree.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RBTree.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RBTree.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RBTree.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ReversePtrs.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ReversePtrs.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ReversePtrs.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ReversePtrs.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/SystemDictionaryHelper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/SystemDictionaryHelper.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/SystemDictionaryHelper.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/SystemDictionaryHelper.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/U1Array.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/U1Array.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/U1Array.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/U1Array.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/U2Array.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/U2Array.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/U2Array.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/U2Array.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/UnsupportedPlatformException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/UnsupportedPlatformException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/UnsupportedPlatformException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/UnsupportedPlatformException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/WorkerThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/WorkerThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/WorkerThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/WorkerThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedBoolean.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedBoolean.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedBoolean.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedBoolean.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedByte.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedByte.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedByte.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedByte.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedChar.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedChar.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedChar.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedChar.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedDouble.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedDouble.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedDouble.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedDouble.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedFloat.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedFloat.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedFloat.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedFloat.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedInt.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedInt.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedInt.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedInt.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedLong.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedLong.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedLong.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedLong.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedObject.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedObject.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedObject.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedShort.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedShort.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedShort.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedShort.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/Callable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/Callable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/Callable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/Callable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/DefaultScriptObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/DefaultScriptObject.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/DefaultScriptObject.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/DefaultScriptObject.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/InvocableCallable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/InvocableCallable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/InvocableCallable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/InvocableCallable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArrayKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArrayKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArrayKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArrayKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaClass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaClass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaClass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaClass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactory.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactory.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactory.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactoryImpl.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactoryImpl.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactoryImpl.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactoryImpl.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaField.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaField.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaField.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFrame.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFrame.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFrame.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaHeap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaHeap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaHeap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstance.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstance.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstance.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstance.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstanceKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstanceKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstanceKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstanceKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaMethod.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaMethod.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaMethod.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArrayKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArrayKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArrayKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArrayKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObject.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObject.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObject.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaScriptEngine.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaScriptEngine.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaScriptEngine.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaScriptEngine.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaString.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaString.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaString.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaString.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaThread.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaThread.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaThread.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArray.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArray.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArray.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArray.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArrayKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArrayKlass.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArrayKlass.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArrayKlass.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaVM.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaVM.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaVM.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaVM.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSList.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSList.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSList.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSList.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSMap.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSMap.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSMap.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSMetadata.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSMetadata.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSMetadata.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSMetadata.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/MapScriptObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/MapScriptObject.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/MapScriptObject.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/MapScriptObject.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/MethodCallable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/MethodCallable.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/MethodCallable.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/MethodCallable.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/ObjectVisitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/ObjectVisitor.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/ObjectVisitor.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/ObjectVisitor.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/SOQLEngine.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/SOQLEngine.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/SOQLEngine.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/SOQLEngine.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/SOQLException.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/SOQLException.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/SOQLException.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/SOQLException.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/SOQLQuery.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/SOQLQuery.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/SOQLQuery.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/SOQLQuery.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/ScriptObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/ScriptObject.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/ScriptObject.java rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/ScriptObject.java diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/sa.js b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/sa.js similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/sa.js rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/sa.js diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/development/Server16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/development/Server16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/development/Server16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/development/Server16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/development/Server24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/development/Server24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/development/Server24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/development/Server24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/About16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/About16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/About16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/About16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/About24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/About24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/About24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/About24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Delete16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Delete16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Delete16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Delete16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Delete24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Delete24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Delete24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Delete24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Find16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Find16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Find16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Find16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Help16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Help16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Help16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Help16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Help24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Help24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Help24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Help24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/History16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/History16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/History16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/History16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/History24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/History24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/History24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/History24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Information16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Information16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Information16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Information16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Information24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Information24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Information24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Information24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/New16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/New16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/New16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/New16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/New24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/New24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/New24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/New24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Open16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Open16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Open16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Open16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Open24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Open24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Open24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Open24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Save24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Save24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Save24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Save24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/SaveAs16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/SaveAs16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/SaveAs16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/SaveAs16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/SaveAs24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/SaveAs24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/SaveAs24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/SaveAs24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Zoom16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Zoom16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Zoom16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/Zoom16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/ZoomIn16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/ZoomIn16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/ZoomIn16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/ZoomIn16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/ZoomIn24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/ZoomIn24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/ZoomIn24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/general/ZoomIn24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/navigation/Down16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/navigation/Down16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/navigation/Down16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/navigation/Down16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/navigation/Up16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/navigation/Up16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/navigation/Up16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/navigation/Up16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignCenter16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignCenter16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignCenter16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignCenter16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignCenter24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignCenter24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignCenter24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignCenter24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignLeft16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignLeft16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignLeft16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignLeft16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignLeft24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignLeft24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignLeft24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignLeft24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignRight16.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignRight16.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignRight16.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignRight16.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignRight24.gif b/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignRight24.gif similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignRight24.gif rename to src/jdk.hotspot.agent/share/classes/toolbarButtonGraphics/text/AlignRight24.gif diff --git a/hotspot/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c b/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c similarity index 100% rename from hotspot/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c rename to src/jdk.hotspot.agent/share/native/libsaproc/sadis.c diff --git a/hotspot/src/jdk.hotspot.agent/solaris/native/libsaproc/libproc.h b/src/jdk.hotspot.agent/solaris/native/libsaproc/libproc.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/solaris/native/libsaproc/libproc.h rename to src/jdk.hotspot.agent/solaris/native/libsaproc/libproc.h diff --git a/hotspot/src/jdk.hotspot.agent/solaris/native/libsaproc/salibproc.h b/src/jdk.hotspot.agent/solaris/native/libsaproc/salibproc.h similarity index 100% rename from hotspot/src/jdk.hotspot.agent/solaris/native/libsaproc/salibproc.h rename to src/jdk.hotspot.agent/solaris/native/libsaproc/salibproc.h diff --git a/hotspot/src/jdk.hotspot.agent/solaris/native/libsaproc/saproc.cpp b/src/jdk.hotspot.agent/solaris/native/libsaproc/saproc.cpp similarity index 100% rename from hotspot/src/jdk.hotspot.agent/solaris/native/libsaproc/saproc.cpp rename to src/jdk.hotspot.agent/solaris/native/libsaproc/saproc.cpp diff --git a/hotspot/src/jdk.hotspot.agent/solaris/native/libsaproc/saproc_audit.cpp b/src/jdk.hotspot.agent/solaris/native/libsaproc/saproc_audit.cpp similarity index 100% rename from hotspot/src/jdk.hotspot.agent/solaris/native/libsaproc/saproc_audit.cpp rename to src/jdk.hotspot.agent/solaris/native/libsaproc/saproc_audit.cpp diff --git a/hotspot/src/jdk.hotspot.agent/test/libproc/LibprocClient.java b/src/jdk.hotspot.agent/test/libproc/LibprocClient.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/test/libproc/LibprocClient.java rename to src/jdk.hotspot.agent/test/libproc/LibprocClient.java diff --git a/hotspot/src/jdk.hotspot.agent/test/libproc/LibprocTest.java b/src/jdk.hotspot.agent/test/libproc/LibprocTest.java similarity index 100% rename from hotspot/src/jdk.hotspot.agent/test/libproc/LibprocTest.java rename to src/jdk.hotspot.agent/test/libproc/LibprocTest.java diff --git a/hotspot/src/jdk.hotspot.agent/test/libproc/Makefile b/src/jdk.hotspot.agent/test/libproc/Makefile similarity index 100% rename from hotspot/src/jdk.hotspot.agent/test/libproc/Makefile rename to src/jdk.hotspot.agent/test/libproc/Makefile diff --git a/hotspot/src/jdk.hotspot.agent/test/libproc/README b/src/jdk.hotspot.agent/test/libproc/README similarity index 100% rename from hotspot/src/jdk.hotspot.agent/test/libproc/README rename to src/jdk.hotspot.agent/test/libproc/README diff --git a/hotspot/src/jdk.hotspot.agent/test/libproc/libproctest.sh b/src/jdk.hotspot.agent/test/libproc/libproctest.sh similarity index 100% rename from hotspot/src/jdk.hotspot.agent/test/libproc/libproctest.sh rename to src/jdk.hotspot.agent/test/libproc/libproctest.sh diff --git a/hotspot/src/jdk.hotspot.agent/test/libproc/libproctest64.sh b/src/jdk.hotspot.agent/test/libproc/libproctest64.sh similarity index 100% rename from hotspot/src/jdk.hotspot.agent/test/libproc/libproctest64.sh rename to src/jdk.hotspot.agent/test/libproc/libproctest64.sh diff --git a/hotspot/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp b/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp similarity index 100% rename from hotspot/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp rename to src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpPrincipal.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpPrincipal.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpPrincipal.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpPrincipal.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsExchange.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsExchange.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsExchange.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsExchange.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsParameters.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsParameters.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsParameters.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsParameters.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/package-info.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/package-info.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/package-info.java rename to src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/package-info.java diff --git a/jdk/src/jdk.httpserver/share/classes/module-info.java b/src/jdk.httpserver/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/module-info.java rename to src/jdk.httpserver/share/classes/module-info.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedInputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedInputStream.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedInputStream.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedInputStream.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/Code.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/Code.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/Code.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/Code.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpConnection.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpConnection.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpConnection.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/HttpConnection.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpContextImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpContextImpl.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpContextImpl.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/HttpContextImpl.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpError.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpError.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpError.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/HttpError.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpExchangeImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpExchangeImpl.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpExchangeImpl.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/HttpExchangeImpl.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsExchangeImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsExchangeImpl.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsExchangeImpl.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsExchangeImpl.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/LeftOverInputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/LeftOverInputStream.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/LeftOverInputStream.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/LeftOverInputStream.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/SSLStreams.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/SSLStreams.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/SSLStreams.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/SSLStreams.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/StreamClosedException.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/StreamClosedException.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/StreamClosedException.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/StreamClosedException.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/TimeSource.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/TimeSource.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/TimeSource.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/TimeSource.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/UnmodifiableHeaders.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/UnmodifiableHeaders.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/UnmodifiableHeaders.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/UnmodifiableHeaders.java diff --git a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/WriteFinishedEvent.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/WriteFinishedEvent.java similarity index 100% rename from jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/WriteFinishedEvent.java rename to src/jdk.httpserver/share/classes/sun/net/httpserver/WriteFinishedEvent.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractAsyncSSLConnection.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractAsyncSSLConnection.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractAsyncSSLConnection.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractAsyncSSLConnection.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractPushPublisher.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractPushPublisher.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractPushPublisher.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractPushPublisher.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncConnection.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncConnection.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncConnection.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncConnection.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncEvent.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncEvent.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncEvent.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncEvent.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLConnection.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLConnection.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLConnection.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLConnection.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLDelegate.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLDelegate.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLDelegate.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLDelegate.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLTunnelConnection.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLTunnelConnection.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLTunnelConnection.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLTunnelConnection.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AuthenticationFilter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AuthenticationFilter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AuthenticationFilter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AuthenticationFilter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BlockingPushPublisher.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BlockingPushPublisher.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BlockingPushPublisher.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BlockingPushPublisher.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ConnectionPool.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ConnectionPool.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ConnectionPool.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ConnectionPool.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/CookieFilter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/CookieFilter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/CookieFilter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/CookieFilter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/DefaultPublisher.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/DefaultPublisher.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/DefaultPublisher.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/DefaultPublisher.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExecutorWrapper.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExecutorWrapper.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExecutorWrapper.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExecutorWrapper.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/FilterFactory.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/FilterFactory.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/FilterFactory.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/FilterFactory.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderFilter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderFilter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderFilter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderFilter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderParser.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderParser.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderParser.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderParser.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Exchange.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Exchange.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Exchange.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Exchange.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Request.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Request.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Request.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Request.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Response.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Response.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Response.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Response.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClient.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClient.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClient.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClient.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientBuilderImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientBuilderImpl.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientBuilderImpl.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientBuilderImpl.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientImpl.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientImpl.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientImpl.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpConnection.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpConnection.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpConnection.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpConnection.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpHeaders.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpHeaders.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpHeaders.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpHeaders.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestBuilderImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestBuilderImpl.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestBuilderImpl.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestBuilderImpl.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestImpl.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestImpl.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestImpl.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponseImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponseImpl.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponseImpl.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponseImpl.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpTimeoutException.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpTimeoutException.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpTimeoutException.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpTimeoutException.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ImmutableHeaders.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ImmutableHeaders.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ImmutableHeaders.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ImmutableHeaders.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiExchange.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiExchange.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiExchange.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiExchange.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiMapResult.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiMapResult.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiMapResult.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiMapResult.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainProxyConnection.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainProxyConnection.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainProxyConnection.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainProxyConnection.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainTunnelingConnection.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainTunnelingConnection.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainTunnelingConnection.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainTunnelingConnection.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PseudoPublisher.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PseudoPublisher.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PseudoPublisher.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PseudoPublisher.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PullPublisher.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PullPublisher.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PullPublisher.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PullPublisher.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushPublisher.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushPublisher.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushPublisher.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushPublisher.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RawChannelImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RawChannelImpl.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RawChannelImpl.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RawChannelImpl.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RedirectFilter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RedirectFilter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RedirectFilter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RedirectFilter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestProcessors.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestProcessors.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestProcessors.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestProcessors.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Response.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Response.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Response.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Response.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseHeaders.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseHeaders.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseHeaders.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseHeaders.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseProcessors.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseProcessors.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseProcessors.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseProcessors.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLConnection.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLConnection.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLConnection.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLConnection.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLDelegate.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLDelegate.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLDelegate.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLDelegate.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLTunnelConnection.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLTunnelConnection.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLTunnelConnection.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLTunnelConnection.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Stream.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Stream.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Stream.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Stream.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/TimeoutEvent.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/TimeoutEvent.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/TimeoutEvent.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/TimeoutEvent.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocket.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocket.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocket.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocket.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocketHandshakeException.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocketHandshakeException.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocketHandshakeException.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocketHandshakeException.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowController.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowController.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowController.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowController.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowUpdateSender.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowUpdateSender.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowUpdateSender.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowUpdateSender.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/AsyncDataReadQueue.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/AsyncDataReadQueue.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/AsyncDataReadQueue.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/AsyncDataReadQueue.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/AsyncWriteQueue.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/AsyncWriteQueue.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/AsyncWriteQueue.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/AsyncWriteQueue.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/BufferHandler.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/BufferHandler.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/BufferHandler.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/BufferHandler.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferPool.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferPool.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferPool.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferPool.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferReference.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferReference.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferReference.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferReference.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ExceptionallyCloseable.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ExceptionallyCloseable.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ExceptionallyCloseable.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ExceptionallyCloseable.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/HttpHeadersImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/HttpHeadersImpl.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/HttpHeadersImpl.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/HttpHeadersImpl.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Log.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Log.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Log.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Log.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/MinimalFuture.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/MinimalFuture.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/MinimalFuture.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/MinimalFuture.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Pair.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Pair.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Pair.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Pair.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Queue.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Queue.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Queue.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Queue.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Utils.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Utils.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Utils.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Utils.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ContinuationFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ContinuationFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ContinuationFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ContinuationFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/DataFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/DataFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/DataFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/DataFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ErrorFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ErrorFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ErrorFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ErrorFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesDecoder.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesDecoder.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesDecoder.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesDecoder.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesEncoder.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesEncoder.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesEncoder.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesEncoder.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/GoAwayFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/GoAwayFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/GoAwayFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/GoAwayFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeaderFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeaderFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeaderFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeaderFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeadersFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeadersFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeadersFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeadersFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/Http2Frame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/Http2Frame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/Http2Frame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/Http2Frame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/MalformedFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/MalformedFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/MalformedFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/MalformedFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/OutgoingHeaders.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/OutgoingHeaders.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/OutgoingHeaders.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/OutgoingHeaders.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PingFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PingFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PingFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PingFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PriorityFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PriorityFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PriorityFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PriorityFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PushPromiseFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PushPromiseFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PushPromiseFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PushPromiseFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ResetFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ResetFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ResetFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ResetFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/SettingsFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/SettingsFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/SettingsFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/SettingsFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/WindowUpdateFrame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/WindowUpdateFrame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/WindowUpdateFrame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/WindowUpdateFrame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BinaryRepresentationWriter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BinaryRepresentationWriter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BinaryRepresentationWriter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BinaryRepresentationWriter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BulkSizeUpdateWriter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BulkSizeUpdateWriter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BulkSizeUpdateWriter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BulkSizeUpdateWriter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Decoder.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Decoder.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Decoder.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Decoder.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/DecodingCallback.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/DecodingCallback.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/DecodingCallback.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/DecodingCallback.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Encoder.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Encoder.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Encoder.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Encoder.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HeaderTable.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HeaderTable.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HeaderTable.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HeaderTable.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Huffman.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Huffman.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Huffman.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Huffman.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/ISO_8859_1.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/ISO_8859_1.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/ISO_8859_1.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/ISO_8859_1.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexNameValueWriter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexNameValueWriter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexNameValueWriter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexNameValueWriter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexedWriter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexedWriter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexedWriter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexedWriter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerReader.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerReader.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerReader.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerReader.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerWriter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerWriter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerWriter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerWriter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralNeverIndexedWriter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralNeverIndexedWriter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralNeverIndexedWriter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralNeverIndexedWriter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWithIndexingWriter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWithIndexingWriter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWithIndexingWriter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWithIndexingWriter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWriter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWriter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWriter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWriter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/SizeUpdateWriter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/SizeUpdateWriter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/SizeUpdateWriter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/SizeUpdateWriter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringReader.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringReader.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringReader.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringReader.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringWriter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringWriter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringWriter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringWriter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/package-info.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/package-info.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/package-info.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/package-info.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/BuilderImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/BuilderImpl.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/BuilderImpl.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/BuilderImpl.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CheckFailedException.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CheckFailedException.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CheckFailedException.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CheckFailedException.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CooperativeHandler.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CooperativeHandler.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CooperativeHandler.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CooperativeHandler.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FailWebSocketException.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FailWebSocketException.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FailWebSocketException.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FailWebSocketException.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Frame.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Frame.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Frame.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Frame.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FrameConsumer.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FrameConsumer.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FrameConsumer.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FrameConsumer.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/MessageStreamConsumer.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/MessageStreamConsumer.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/MessageStreamConsumer.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/MessageStreamConsumer.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OpeningHandshake.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OpeningHandshake.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OpeningHandshake.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OpeningHandshake.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OutgoingMessage.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OutgoingMessage.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OutgoingMessage.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OutgoingMessage.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/RawChannel.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/RawChannel.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/RawChannel.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/RawChannel.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Receiver.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Receiver.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Receiver.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Receiver.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/StatusCodes.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/StatusCodes.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/StatusCodes.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/StatusCodes.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Transmitter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Transmitter.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Transmitter.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Transmitter.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/UTF8AccumulatingDecoder.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/UTF8AccumulatingDecoder.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/UTF8AccumulatingDecoder.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/UTF8AccumulatingDecoder.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketImpl.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketImpl.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketImpl.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketRequest.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketRequest.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketRequest.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketRequest.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/package-info.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/package-info.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/package-info.java rename to src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/package-info.java diff --git a/jdk/src/jdk.incubator.httpclient/share/classes/module-info.java b/src/jdk.incubator.httpclient/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.incubator.httpclient/share/classes/module-info.java rename to src/jdk.incubator.httpclient/share/classes/module-info.java diff --git a/jdk/src/jdk.internal.ed/share/classes/jdk/internal/editor/external/ExternalEditor.java b/src/jdk.internal.ed/share/classes/jdk/internal/editor/external/ExternalEditor.java similarity index 100% rename from jdk/src/jdk.internal.ed/share/classes/jdk/internal/editor/external/ExternalEditor.java rename to src/jdk.internal.ed/share/classes/jdk/internal/editor/external/ExternalEditor.java diff --git a/jdk/src/jdk.internal.ed/share/classes/jdk/internal/editor/spi/BuildInEditorProvider.java b/src/jdk.internal.ed/share/classes/jdk/internal/editor/spi/BuildInEditorProvider.java similarity index 100% rename from jdk/src/jdk.internal.ed/share/classes/jdk/internal/editor/spi/BuildInEditorProvider.java rename to src/jdk.internal.ed/share/classes/jdk/internal/editor/spi/BuildInEditorProvider.java diff --git a/jdk/src/jdk.internal.ed/share/classes/module-info.java b/src/jdk.internal.ed/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.internal.ed/share/classes/module-info.java rename to src/jdk.internal.ed/share/classes/module-info.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/module-info.java b/src/jdk.internal.jvmstat/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/module-info.java rename to src/jdk.internal.jvmstat/share/classes/module-info.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/AbstractMonitor.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/AbstractMonitor.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/AbstractMonitor.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/AbstractMonitor.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/BufferedMonitoredVm.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/BufferedMonitoredVm.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/BufferedMonitoredVm.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/BufferedMonitoredVm.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/ByteArrayMonitor.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/ByteArrayMonitor.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/ByteArrayMonitor.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/ByteArrayMonitor.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/HostIdentifier.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/HostIdentifier.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/HostIdentifier.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/HostIdentifier.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/IntegerMonitor.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/IntegerMonitor.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/IntegerMonitor.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/IntegerMonitor.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/LongMonitor.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/LongMonitor.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/LongMonitor.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/LongMonitor.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/Monitor.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/Monitor.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/Monitor.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/Monitor.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitorException.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitorException.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitorException.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitorException.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHost.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHost.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHost.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHost.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHostService.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHostService.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHostService.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHostService.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVm.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVm.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVm.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVm.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/StringMonitor.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/StringMonitor.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/StringMonitor.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/StringMonitor.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/Units.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/Units.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/Units.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/Units.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/Variability.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/Variability.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/Variability.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/Variability.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/VmIdentifier.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/VmIdentifier.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/VmIdentifier.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/VmIdentifier.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/HostEvent.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/HostEvent.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/HostEvent.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/HostEvent.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/HostListener.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/HostListener.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/HostListener.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/HostListener.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/VmEvent.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/VmEvent.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/VmEvent.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/VmEvent.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/VmListener.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/VmListener.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/VmListener.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/VmListener.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/package.html b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/package.html similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/package.html rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/event/package.html diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/package.html b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/package.html similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/package.html rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/package.html diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AliasFileParser.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AliasFileParser.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AliasFileParser.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AliasFileParser.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTask.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTask.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTask.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTask.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorDataException.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorDataException.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorDataException.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorDataException.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStatus.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStatus.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStatus.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStatus.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStructureException.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStructureException.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStructureException.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorStructureException.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/SyntaxException.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/SyntaxException.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/SyntaxException.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/SyntaxException.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/package.html b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/package.html similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/package.html rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/package.html diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostFileService.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostFileService.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostFileService.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostFileService.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostLocalService.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostLocalService.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostLocalService.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostLocalService.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java diff --git a/jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap similarity index 100% rename from jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap rename to src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/NoInterruptUnixTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/NoInterruptUnixTerminal.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/NoInterruptUnixTerminal.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/NoInterruptUnixTerminal.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/Terminal.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalFactory.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalFactory.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalFactory.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalFactory.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalSupport.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalSupport.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalSupport.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalSupport.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/UnixTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/UnixTerminal.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/UnixTerminal.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/UnixTerminal.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/UnsupportedTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/UnsupportedTerminal.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/UnsupportedTerminal.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/UnsupportedTerminal.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/WindowsTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/WindowsTerminal.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/WindowsTerminal.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/WindowsTerminal.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleKeys.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleKeys.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleKeys.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleKeys.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/CursorBuffer.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/CursorBuffer.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/CursorBuffer.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/CursorBuffer.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KeyMap.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KeyMap.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KeyMap.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/KeyMap.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KillRing.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KillRing.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/KillRing.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/KillRing.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/Operation.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/Operation.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/Operation.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/Operation.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/UserInterruptException.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/UserInterruptException.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/UserInterruptException.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/UserInterruptException.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AggregateCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AggregateCompleter.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AggregateCompleter.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/AggregateCompleter.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/ArgumentCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/ArgumentCompleter.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/ArgumentCompleter.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/ArgumentCompleter.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.properties b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.properties similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.properties rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CandidateListCompletionHandler.properties diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/Completer.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/Completer.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/Completer.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/Completer.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CompletionHandler.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CompletionHandler.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CompletionHandler.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/CompletionHandler.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/EnumCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/EnumCompleter.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/EnumCompleter.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/EnumCompleter.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/FileNameCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/FileNameCompleter.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/FileNameCompleter.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/FileNameCompleter.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/NullCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/NullCompleter.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/NullCompleter.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/NullCompleter.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/StringsCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/StringsCompleter.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/StringsCompleter.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/StringsCompleter.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/package-info.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/package-info.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/package-info.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/completer/package-info.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/FileHistory.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/FileHistory.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/FileHistory.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/FileHistory.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/History.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/History.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/History.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/History.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/MemoryHistory.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/MemoryHistory.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/MemoryHistory.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/MemoryHistory.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/PersistentHistory.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/PersistentHistory.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/PersistentHistory.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/PersistentHistory.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/package-info.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/package-info.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/package-info.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/history/package-info.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleReaderInputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleReaderInputStream.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleReaderInputStream.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleReaderInputStream.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleRunner.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleRunner.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleRunner.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/internal/ConsoleRunner.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/package-info.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/console/package-info.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/package-info.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/console/package-info.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/extra/EditingHistory.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/extra/EditingHistory.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/extra/EditingHistory.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/extra/EditingHistory.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Configuration.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Configuration.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Configuration.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Configuration.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InputStreamReader.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InputStreamReader.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InputStreamReader.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/internal/InputStreamReader.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Log.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Log.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Log.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Log.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/NonBlockingInputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/NonBlockingInputStream.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/NonBlockingInputStream.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/internal/NonBlockingInputStream.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Nullable.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Nullable.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Nullable.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Nullable.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Preconditions.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Preconditions.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Preconditions.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Preconditions.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/ShutdownHooks.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/ShutdownHooks.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/ShutdownHooks.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/internal/ShutdownHooks.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TerminalLineSettings.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TerminalLineSettings.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TerminalLineSettings.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TerminalLineSettings.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TestAccessible.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TestAccessible.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TestAccessible.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/internal/TestAccessible.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Urls.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Urls.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Urls.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/internal/Urls.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/package-info.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/package-info.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/internal/package-info.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/internal/package-info.java diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/package-info.java b/src/jdk.internal.le/share/classes/jdk/internal/jline/package-info.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/package-info.java rename to src/jdk.internal.le/share/classes/jdk/internal/jline/package-info.java diff --git a/jdk/src/jdk.internal.le/share/classes/module-info.java b/src/jdk.internal.le/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.internal.le/share/classes/module-info.java rename to src/jdk.internal.le/share/classes/module-info.java diff --git a/jdk/src/jdk.internal.le/share/legal/jline.md b/src/jdk.internal.le/share/legal/jline.md similarity index 100% rename from jdk/src/jdk.internal.le/share/legal/jline.md rename to src/jdk.internal.le/share/legal/jline.md diff --git a/jdk/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp b/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp similarity index 100% rename from jdk/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp rename to src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AbstractOptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AbstractOptionSpec.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AbstractOptionSpec.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AbstractOptionSpec.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AlternativeLongOptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AlternativeLongOptionSpec.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AlternativeLongOptionSpec.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/AlternativeLongOptionSpec.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentAcceptingOptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentAcceptingOptionSpec.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentAcceptingOptionSpec.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentAcceptingOptionSpec.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentList.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentList.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentList.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ArgumentList.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/BuiltinHelpFormatter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/BuiltinHelpFormatter.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/BuiltinHelpFormatter.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/BuiltinHelpFormatter.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/HelpFormatter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/HelpFormatter.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/HelpFormatter.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/HelpFormatter.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/IllegalOptionSpecificationException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/IllegalOptionSpecificationException.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/IllegalOptionSpecificationException.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/IllegalOptionSpecificationException.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionException.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionException.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionException.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MultipleArgumentsForOptionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MultipleArgumentsForOptionException.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MultipleArgumentsForOptionException.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MultipleArgumentsForOptionException.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NoArgumentOptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NoArgumentOptionSpec.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NoArgumentOptionSpec.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NoArgumentOptionSpec.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NonOptionArgumentSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NonOptionArgumentSpec.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NonOptionArgumentSpec.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/NonOptionArgumentSpec.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionArgumentConversionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionArgumentConversionException.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionArgumentConversionException.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionArgumentConversionException.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDeclarer.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDeclarer.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDeclarer.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDeclarer.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDescriptor.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDescriptor.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDescriptor.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionDescriptor.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionException.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionException.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionException.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionMissingRequiredArgumentException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionMissingRequiredArgumentException.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionMissingRequiredArgumentException.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionMissingRequiredArgumentException.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParser.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParser.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParser.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParser.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParserState.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParserState.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParserState.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionParserState.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSet.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSet.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSet.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSet.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpec.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpec.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpec.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecBuilder.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecBuilder.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecBuilder.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecBuilder.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecTokenizer.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecTokenizer.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecTokenizer.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionSpecTokenizer.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionalArgumentOptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionalArgumentOptionSpec.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionalArgumentOptionSpec.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/OptionalArgumentOptionSpec.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ParserRules.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ParserRules.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ParserRules.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ParserRules.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/README b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/README similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/README rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/README diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/RequiredArgumentOptionSpec.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/RequiredArgumentOptionSpec.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/RequiredArgumentOptionSpec.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/RequiredArgumentOptionSpec.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnacceptableNumberOfNonOptionsException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnacceptableNumberOfNonOptionsException.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnacceptableNumberOfNonOptionsException.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnacceptableNumberOfNonOptionsException.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnconfiguredOptionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnconfiguredOptionException.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnconfiguredOptionException.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnconfiguredOptionException.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnrecognizedOptionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnrecognizedOptionException.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnrecognizedOptionException.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnrecognizedOptionException.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConversionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConversionException.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConversionException.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConversionException.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConverter.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConverter.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ValueConverter.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/AbbreviationMap.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/AbbreviationMap.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/AbbreviationMap.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/AbbreviationMap.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Classes.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Classes.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Classes.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Classes.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Columns.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Columns.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Columns.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Columns.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ConstructorInvokingValueConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ConstructorInvokingValueConverter.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ConstructorInvokingValueConverter.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ConstructorInvokingValueConverter.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/MethodInvokingValueConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/MethodInvokingValueConverter.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/MethodInvokingValueConverter.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/MethodInvokingValueConverter.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Objects.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Objects.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Objects.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Objects.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Reflection.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Reflection.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Reflection.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Reflection.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ReflectionException.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ReflectionException.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ReflectionException.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/ReflectionException.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Row.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Row.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Row.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Row.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Rows.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Rows.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Rows.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Rows.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Strings.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Strings.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Strings.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Strings.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/DateConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/DateConverter.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/DateConverter.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/DateConverter.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/KeyValuePair.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/KeyValuePair.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/KeyValuePair.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/KeyValuePair.java diff --git a/jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/RegexMatcher.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/RegexMatcher.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/RegexMatcher.java rename to src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/RegexMatcher.java diff --git a/jdk/src/jdk.internal.opt/share/classes/module-info.java b/src/jdk.internal.opt/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.internal.opt/share/classes/module-info.java rename to src/jdk.internal.opt/share/classes/module-info.java diff --git a/jdk/src/jdk.internal.opt/share/legal/jopt-simple.md b/src/jdk.internal.opt/share/legal/jopt-simple.md similarity index 100% rename from jdk/src/jdk.internal.opt/share/legal/jopt-simple.md rename to src/jdk.internal.opt/share/legal/jopt-simple.md diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64Kind.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64Kind.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64Kind.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64Kind.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/overview.html b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/overview.html similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/overview.html rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/overview.html diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Architecture.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Architecture.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Architecture.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Architecture.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BailoutException.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BailoutException.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BailoutException.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BailoutException.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodePosition.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodePosition.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodePosition.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodePosition.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CallingConvention.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CallingConvention.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CallingConvention.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CallingConvention.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeCacheProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeCacheProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeCacheProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeCacheProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeUtil.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeUtil.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeUtil.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequest.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequest.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequest.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequestResult.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequestResult.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequestResult.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequestResult.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompiledCode.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompiledCode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompiledCode.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompiledCode.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/DebugInfo.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/DebugInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/DebugInfo.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/DebugInfo.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/InstalledCode.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/InstalledCode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/InstalledCode.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/InstalledCode.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/InvalidInstalledCodeException.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/InvalidInstalledCodeException.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/InvalidInstalledCodeException.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/InvalidInstalledCodeException.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Location.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Location.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Location.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Location.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ReferenceMap.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ReferenceMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ReferenceMap.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ReferenceMap.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterArray.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterArray.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterArray.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterArray.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterAttributes.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterAttributes.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterAttributes.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterAttributes.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterSaveLayout.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterSaveLayout.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterSaveLayout.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterSaveLayout.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterValue.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterValue.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterValue.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackLockValue.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackLockValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackLockValue.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackLockValue.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackSlot.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackSlot.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackSlot.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackSlot.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SuppressFBWarnings.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SuppressFBWarnings.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SuppressFBWarnings.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SuppressFBWarnings.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/TargetDescription.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/TargetDescription.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/TargetDescription.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/TargetDescription.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueKindFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueKindFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueKindFactory.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueKindFactory.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueUtil.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueUtil.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueUtil.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/VirtualObject.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/VirtualObject.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/VirtualObject.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/VirtualObject.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/package-info.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/package-info.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/package-info.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/package-info.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Call.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Call.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Call.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Call.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/ConstantReference.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/ConstantReference.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/ConstantReference.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/ConstantReference.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataPatch.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataPatch.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataPatch.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataPatch.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataSectionReference.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataSectionReference.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataSectionReference.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataSectionReference.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/ExceptionHandler.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/ExceptionHandler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/ExceptionHandler.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/ExceptionHandler.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Infopoint.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Infopoint.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Infopoint.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Infopoint.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/InfopointReason.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/InfopointReason.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/InfopointReason.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/InfopointReason.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Mark.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Mark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Mark.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Mark.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Reference.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Reference.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Reference.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Reference.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Site.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Site.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Site.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Site.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/InspectedFrame.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/InspectedFrame.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/InspectedFrame.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/InspectedFrame.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/InspectedFrameVisitor.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/InspectedFrameVisitor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/InspectedFrameVisitor.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/InspectedFrameVisitor.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/StackIntrospection.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/StackIntrospection.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/StackIntrospection.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/StackIntrospection.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/JVMCIError.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/JVMCIError.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/JVMCIError.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/JVMCIError.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/SuppressFBWarnings.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/SuppressFBWarnings.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/SuppressFBWarnings.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/SuppressFBWarnings.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotVMConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotVMConfig.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotVMConfig.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/EmptyEventProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/EmptyEventProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/EmptyEventProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/EmptyEventProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/EventProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/EventProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/EventProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/EventProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCallingConventionType.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCallingConventionType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCallingConventionType.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCallingConventionType.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequest.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequest.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequest.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequestResult.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequestResult.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequestResult.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequestResult.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledCode.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledCode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledCode.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledCode.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompressedNullConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompressedNullConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompressedNullConstant.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompressedNullConstant.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstant.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstant.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotForeignCallTarget.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotForeignCallTarget.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotForeignCallTarget.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotForeignCallTarget.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotInstalledCode.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotInstalledCode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotInstalledCode.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotInstalledCode.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIBackendFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIBackendFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIBackendFactory.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIBackendFactory.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerFactory.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerFactory.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJavaType.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJavaType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJavaType.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJavaType.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaData.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaData.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaData.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaData.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstant.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstant.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodData.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodData.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodData.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodData.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodDataAccessor.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodDataAccessor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodDataAccessor.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodDataAccessor.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodUnresolved.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodUnresolved.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodUnresolved.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodUnresolved.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotModifiers.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotModifiers.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotModifiers.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotModifiers.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotNmethod.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotNmethod.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotNmethod.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotNmethod.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstant.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstant.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotProfilingInfo.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotProfilingInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotProfilingInfo.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotProfilingInfo.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotReferenceMap.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotReferenceMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotReferenceMap.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotReferenceMap.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaField.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaField.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaField.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaField.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotRuntimeStub.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotRuntimeStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotRuntimeStub.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotRuntimeStub.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSentinelConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSentinelConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSentinelConstant.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSentinelConstant.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSignature.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSignature.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSignature.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSignature.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotStackFrameReference.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotStackFrameReference.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotStackFrameReference.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotStackFrameReference.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotStackIntrospection.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotStackIntrospection.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotStackIntrospection.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotStackIntrospection.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotUnresolvedField.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotUnresolvedField.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotUnresolvedField.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotUnresolvedField.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotUnresolvedJavaType.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotUnresolvedJavaType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotUnresolvedJavaType.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotUnresolvedJavaType.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigStore.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigStore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigStore.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigStore.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMEventListener.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMEventListener.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMEventListener.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMEventListener.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/MetaspaceWrapperObject.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/MetaspaceWrapperObject.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/MetaspaceWrapperObject.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/MetaspaceWrapperObject.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SuppressFBWarnings.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SuppressFBWarnings.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SuppressFBWarnings.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SuppressFBWarnings.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/UnsafeAccess.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/UnsafeAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/UnsafeAccess.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/UnsafeAccess.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMField.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMField.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMField.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMField.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMFlag.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMFlag.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMFlag.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMFlag.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMIntrinsicMethod.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMIntrinsicMethod.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMIntrinsicMethod.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMIntrinsicMethod.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/overview.html b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/overview.html similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/overview.html rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/overview.html diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractJavaProfile.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractJavaProfile.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractJavaProfile.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractJavaProfile.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractProfiledItem.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractProfiledItem.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractProfiledItem.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractProfiledItem.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AllocatableValue.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AllocatableValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AllocatableValue.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AllocatableValue.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Assumptions.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Assumptions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Assumptions.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Assumptions.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Constant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Constant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Constant.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Constant.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantPool.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantPool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantPool.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantPool.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantReflectionProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantReflectionProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantReflectionProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantReflectionProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DefaultProfilingInfo.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DefaultProfilingInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DefaultProfilingInfo.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DefaultProfilingInfo.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationAction.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationAction.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationAction.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationAction.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationReason.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationReason.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationReason.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationReason.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ExceptionHandler.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ExceptionHandler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ExceptionHandler.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ExceptionHandler.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/InvokeTarget.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/InvokeTarget.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/InvokeTarget.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/InvokeTarget.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaConstant.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaConstant.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaField.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaField.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaField.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaField.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaKind.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaKind.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaKind.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaKind.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaMethod.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaMethod.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaMethod.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaMethod.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaMethodProfile.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaMethodProfile.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaMethodProfile.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaMethodProfile.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaType.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaType.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaType.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaTypeProfile.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaTypeProfile.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaTypeProfile.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaTypeProfile.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaValue.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaValue.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaValue.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTable.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTable.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTable.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Local.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Local.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Local.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Local.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTable.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTable.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTable.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MemoryAccessProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MemoryAccessProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MemoryAccessProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MemoryAccessProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaAccessProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaAccessProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaAccessProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaAccessProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MethodHandleAccessProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MethodHandleAccessProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MethodHandleAccessProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MethodHandleAccessProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ModifiersProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ModifiersProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ModifiersProvider.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ModifiersProvider.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/NullConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/NullConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/NullConstant.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/NullConstant.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PlatformKind.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PlatformKind.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PlatformKind.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PlatformKind.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PrimitiveConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PrimitiveConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PrimitiveConstant.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PrimitiveConstant.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ProfilingInfo.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ProfilingInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ProfilingInfo.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ProfilingInfo.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/RawConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/RawConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/RawConstant.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/RawConstant.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SerializableConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SerializableConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SerializableConstant.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SerializableConstant.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Signature.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Signature.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Signature.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Signature.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SpeculationLog.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SpeculationLog.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SpeculationLog.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SpeculationLog.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SuppressFBWarnings.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SuppressFBWarnings.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SuppressFBWarnings.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SuppressFBWarnings.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/TriState.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/TriState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/TriState.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/TriState.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/VMConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/VMConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/VMConstant.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/VMConstant.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/package-info.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/package-info.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/package-info.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/package-info.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCI.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCI.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCI.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCI.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCIBackend.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCIBackend.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCIBackend.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCIBackend.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompiler.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompiler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompiler.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompiler.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompilerFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompilerFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompilerFactory.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompilerFactory.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCIRuntime.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCIRuntime.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCIRuntime.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCIRuntime.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/.checkstyle_checks.xml b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/.checkstyle_checks.xml similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/.checkstyle_checks.xml rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/.checkstyle_checks.xml diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/JVMCIPermission.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/JVMCIPermission.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/JVMCIPermission.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/JVMCIPermission.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/JVMCIServiceLocator.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/JVMCIServiceLocator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/JVMCIServiceLocator.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/JVMCIServiceLocator.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/internal/ReflectionAccessJDK.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/internal/ReflectionAccessJDK.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/internal/ReflectionAccessJDK.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/internal/ReflectionAccessJDK.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARC.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARC.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARC.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARC.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java rename to src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/module-info.java b/src/jdk.internal.vm.ci/share/classes/module-info.java similarity index 100% rename from hotspot/src/jdk.internal.vm.ci/share/classes/module-info.java rename to src/jdk.internal.vm.ci/share/classes/module-info.java diff --git a/hotspot/src/jdk.internal.vm.compiler/.mx.graal/.project b/src/jdk.internal.vm.compiler/.mx.graal/.project similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/.mx.graal/.project rename to src/jdk.internal.vm.compiler/.mx.graal/.project diff --git a/hotspot/src/jdk.internal.vm.compiler/.mx.graal/.pydevproject b/src/jdk.internal.vm.compiler/.mx.graal/.pydevproject similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/.mx.graal/.pydevproject rename to src/jdk.internal.vm.compiler/.mx.graal/.pydevproject diff --git a/hotspot/src/jdk.internal.vm.compiler/.mx.graal/eclipse-settings/org.eclipse.jdt.core.prefs b/src/jdk.internal.vm.compiler/.mx.graal/eclipse-settings/org.eclipse.jdt.core.prefs similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/.mx.graal/eclipse-settings/org.eclipse.jdt.core.prefs rename to src/jdk.internal.vm.compiler/.mx.graal/eclipse-settings/org.eclipse.jdt.core.prefs diff --git a/hotspot/src/jdk.internal.vm.compiler/.mx.graal/mx_graal.py b/src/jdk.internal.vm.compiler/.mx.graal/mx_graal.py similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/.mx.graal/mx_graal.py rename to src/jdk.internal.vm.compiler/.mx.graal/mx_graal.py diff --git a/hotspot/src/jdk.internal.vm.compiler/.mx.graal/mx_graal_9.py b/src/jdk.internal.vm.compiler/.mx.graal/mx_graal_9.py similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/.mx.graal/mx_graal_9.py rename to src/jdk.internal.vm.compiler/.mx.graal/mx_graal_9.py diff --git a/hotspot/src/jdk.internal.vm.compiler/.mx.graal/mx_graal_bench.py b/src/jdk.internal.vm.compiler/.mx.graal/mx_graal_bench.py similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/.mx.graal/mx_graal_bench.py rename to src/jdk.internal.vm.compiler/.mx.graal/mx_graal_bench.py diff --git a/hotspot/src/jdk.internal.vm.compiler/.mx.graal/outputparser.py b/src/jdk.internal.vm.compiler/.mx.graal/outputparser.py similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/.mx.graal/outputparser.py rename to src/jdk.internal.vm.compiler/.mx.graal/outputparser.py diff --git a/hotspot/src/jdk.internal.vm.compiler/.mx.graal/sanitycheck.py b/src/jdk.internal.vm.compiler/.mx.graal/sanitycheck.py similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/.mx.graal/sanitycheck.py rename to src/jdk.internal.vm.compiler/.mx.graal/sanitycheck.py diff --git a/hotspot/src/jdk.internal.vm.compiler/.mx.graal/suite.py b/src/jdk.internal.vm.compiler/.mx.graal/suite.py similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/.mx.graal/suite.py rename to src/jdk.internal.vm.compiler/.mx.graal/suite.py diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java b/src/jdk.internal.vm.compiler/share/classes/module-info.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java rename to src/jdk.internal.vm.compiler/share/classes/module-info.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/BlackholeDirectiveTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/BlackholeDirectiveTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/BlackholeDirectiveTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/BlackholeDirectiveTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/ControlFlowAnchorDirectiveTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/ControlFlowAnchorDirectiveTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/ControlFlowAnchorDirectiveTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/ControlFlowAnchorDirectiveTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/DeoptimizeDirectiveTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/DeoptimizeDirectiveTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/DeoptimizeDirectiveTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/DeoptimizeDirectiveTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/IterationDirectiveTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/IterationDirectiveTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/IterationDirectiveTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/IterationDirectiveTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/OpaqueDirectiveTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/OpaqueDirectiveTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/OpaqueDirectiveTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/OpaqueDirectiveTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives/src/org/graalvm/compiler/api/directives/GraalDirectives.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives/src/org/graalvm/compiler/api/directives/GraalDirectives.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives/src/org/graalvm/compiler/api/directives/GraalDirectives.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.directives/src/org/graalvm/compiler/api/directives/GraalDirectives.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/ClassSubstitution.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/ClassSubstitution.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/ClassSubstitution.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/ClassSubstitution.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/Fold.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/Fold.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/Fold.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/Fold.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitution.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitution.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitution.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitution.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitutionRegistry.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitutionRegistry.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitutionRegistry.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitutionRegistry.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/Snippet.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/Snippet.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/Snippet.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/Snippet.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/SnippetReflectionProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/SnippetReflectionProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/SnippetReflectionProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/SnippetReflectionProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/SnippetTemplateCache.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/SnippetTemplateCache.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/SnippetTemplateCache.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/SnippetTemplateCache.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.runtime/src/org/graalvm/compiler/api/runtime/GraalJVMCICompiler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.runtime/src/org/graalvm/compiler/api/runtime/GraalJVMCICompiler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.runtime/src/org/graalvm/compiler/api/runtime/GraalJVMCICompiler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.runtime/src/org/graalvm/compiler/api/runtime/GraalJVMCICompiler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.runtime/src/org/graalvm/compiler/api/runtime/GraalRuntime.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.runtime/src/org/graalvm/compiler/api/runtime/GraalRuntime.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.runtime/src/org/graalvm/compiler/api/runtime/GraalRuntime.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.runtime/src/org/graalvm/compiler/api/runtime/GraalRuntime.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/Graal.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/Graal.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/Graal.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/Graal.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/GraalAPITest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/GraalAPITest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/GraalAPITest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/GraalAPITest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64MacroAssemblerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64MacroAssemblerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64MacroAssemblerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64MacroAssemblerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Address.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Address.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Address.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Address.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64.test/src/org/graalvm/compiler/asm/amd64/test/BitOpsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64.test/src/org/graalvm/compiler/asm/amd64/test/BitOpsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64.test/src/org/graalvm/compiler/asm/amd64/test/BitOpsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64.test/src/org/graalvm/compiler/asm/amd64/test/BitOpsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64.test/src/org/graalvm/compiler/asm/amd64/test/IncrementDecrementMacroTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64.test/src/org/graalvm/compiler/asm/amd64/test/IncrementDecrementMacroTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64.test/src/org/graalvm/compiler/asm/amd64/test/IncrementDecrementMacroTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64.test/src/org/graalvm/compiler/asm/amd64/test/IncrementDecrementMacroTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64.test/src/org/graalvm/compiler/asm/amd64/test/SimpleAssemblerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64.test/src/org/graalvm/compiler/asm/amd64/test/SimpleAssemblerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64.test/src/org/graalvm/compiler/asm/amd64/test/SimpleAssemblerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64.test/src/org/graalvm/compiler/asm/amd64/test/SimpleAssemblerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Address.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Address.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Address.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Address.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64AsmOptions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64AsmOptions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64AsmOptions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64AsmOptions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64InstructionAttr.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64InstructionAttr.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64InstructionAttr.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64InstructionAttr.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64MacroAssembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64MacroAssembler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64MacroAssembler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64MacroAssembler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc.test/src/org/graalvm/compiler/asm/sparc/test/BitSpecTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc.test/src/org/graalvm/compiler/asm/sparc/test/BitSpecTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc.test/src/org/graalvm/compiler/asm/sparc/test/BitSpecTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc.test/src/org/graalvm/compiler/asm/sparc/test/BitSpecTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc.test/src/org/graalvm/compiler/asm/sparc/test/SPARCAssemblerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc.test/src/org/graalvm/compiler/asm/sparc/test/SPARCAssemblerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc.test/src/org/graalvm/compiler/asm/sparc/test/SPARCAssemblerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc.test/src/org/graalvm/compiler/asm/sparc/test/SPARCAssemblerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCAddress.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCAddress.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCAddress.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCAddress.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCAssembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCAssembler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCAssembler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCAssembler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCInstructionCounter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCInstructionCounter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCInstructionCounter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCInstructionCounter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCMacroAssembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCMacroAssembler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCMacroAssembler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCMacroAssembler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/AbstractAddress.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/AbstractAddress.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/AbstractAddress.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/AbstractAddress.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/AsmOptions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/AsmOptions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/AsmOptions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/AsmOptions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Assembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Assembler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Assembler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Assembler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Buffer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Buffer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Buffer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Buffer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Label.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Label.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Label.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Label.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BridgeMethodUtils.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BridgeMethodUtils.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BridgeMethodUtils.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BridgeMethodUtils.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytecode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytecode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytecode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytecode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeDisassembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeDisassembler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeDisassembler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeDisassembler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeLookupSwitch.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeLookupSwitch.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeLookupSwitch.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeLookupSwitch.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeStream.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeStream.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeStream.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeStream.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeSwitch.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeSwitch.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeSwitch.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeSwitch.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeTableSwitch.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeTableSwitch.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeTableSwitch.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/BytecodeTableSwitch.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytecodes.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytecodes.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytecodes.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytecodes.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytes.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytes.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytes.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/Bytes.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/ResolvedJavaMethodBytecode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/ResolvedJavaMethodBytecode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/ResolvedJavaMethodBytecode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/ResolvedJavaMethodBytecode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/ResolvedJavaMethodBytecodeProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/ResolvedJavaMethodBytecodeProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/ResolvedJavaMethodBytecodeProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.bytecode/src/org/graalvm/compiler/bytecode/ResolvedJavaMethodBytecodeProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/DataSection.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/DataSection.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/DataSection.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/DataSection.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/DisassemblerProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/DisassemblerProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/DisassemblerProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/DisassemblerProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFile.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFile.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFile.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFile.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/SourceMapping.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/SourceMapping.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/SourceMapping.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/SourceMapping.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/SourceStackTraceBailoutException.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/SourceStackTraceBailoutException.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/SourceStackTraceBailoutException.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/SourceStackTraceBailoutException.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64AddressLoweringByUse.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64AddressLoweringByUse.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64AddressLoweringByUse.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64AddressLoweringByUse.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64AddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64AddressNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64AddressNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64AddressNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64FloatConvertOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64FloatConvertOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64FloatConvertOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64FloatConvertOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRKindTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRKindTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRKindTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRKindTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64MoveFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64MoveFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64MoveFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64MoveFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeLIRBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeLIRBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeLIRBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeLIRBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64SuitesCreator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64SuitesCreator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64SuitesCreator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64SuitesCreator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/AMD64AllocatorTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/AMD64AllocatorTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/AMD64AllocatorTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/AMD64AllocatorTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/ConstantStackMoveTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/ConstantStackMoveTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/ConstantStackMoveTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/ConstantStackMoveTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/MatchRuleTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/MatchRuleTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/MatchRuleTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/MatchRuleTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/StackStoreTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/StackStoreTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/StackStoreTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/StackStoreTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64AddressLowering.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64AddressLowering.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64AddressLowering.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64AddressLowering.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64AddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64AddressNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64AddressNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64AddressNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRKindTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRKindTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRKindTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRKindTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64MoveFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64MoveFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64MoveFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64MoveFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64MoveFactoryBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64MoveFactoryBase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64MoveFactoryBase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64MoveFactoryBase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64NodeLIRBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64NodeLIRBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64NodeLIRBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64NodeLIRBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64NodeMatchRules.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64NodeMatchRules.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64NodeMatchRules.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64NodeMatchRules.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64SuitesCreator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64SuitesCreator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64SuitesCreator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64SuitesCreator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CancellationBailoutException.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CancellationBailoutException.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CancellationBailoutException.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CancellationBailoutException.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilationIdentifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilationIdentifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilationIdentifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilationIdentifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilationRequestIdentifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilationRequestIdentifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilationRequestIdentifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilationRequestIdentifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompressEncoding.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompressEncoding.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompressEncoding.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompressEncoding.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/FieldIntrospection.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/FieldIntrospection.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/FieldIntrospection.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/FieldIntrospection.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/Fields.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/Fields.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/Fields.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/Fields.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/FieldsScanner.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/FieldsScanner.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/FieldsScanner.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/FieldsScanner.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/LIRKind.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/LIRKind.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/LIRKind.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/LIRKind.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/NumUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/NumUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/NumUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/NumUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/PermanentBailoutException.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/PermanentBailoutException.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/PermanentBailoutException.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/PermanentBailoutException.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/RetryableBailoutException.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/RetryableBailoutException.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/RetryableBailoutException.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/RetryableBailoutException.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/SuppressFBWarnings.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/SuppressFBWarnings.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/SuppressFBWarnings.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/SuppressFBWarnings.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/UnsafeAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/UnsafeAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/UnsafeAccess.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/UnsafeAccess.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/BiDirectionalTraceBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/BiDirectionalTraceBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/BiDirectionalTraceBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/BiDirectionalTraceBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/ComputeBlockOrder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/ComputeBlockOrder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/ComputeBlockOrder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/ComputeBlockOrder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/RegisterAllocationConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/RegisterAllocationConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/RegisterAllocationConfig.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/RegisterAllocationConfig.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/SingleBlockTraceBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/SingleBlockTraceBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/SingleBlockTraceBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/SingleBlockTraceBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/Trace.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/Trace.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/Trace.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/Trace.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/TraceBuilderResult.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/TraceBuilderResult.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/TraceBuilderResult.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/TraceBuilderResult.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/TraceMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/TraceMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/TraceMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/TraceMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/TraceStatisticsPrinter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/TraceStatisticsPrinter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/TraceStatisticsPrinter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/TraceStatisticsPrinter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/UniDirectionalTraceBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/UniDirectionalTraceBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/UniDirectionalTraceBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/alloc/UniDirectionalTraceBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/Condition.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/Condition.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/Condition.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/Condition.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/FloatConvert.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/FloatConvert.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/FloatConvert.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/FloatConvert.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/FloatConvertCategory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/FloatConvertCategory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/FloatConvertCategory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/FloatConvertCategory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/UnsignedMath.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/UnsignedMath.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/UnsignedMath.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/UnsignedMath.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractBlockBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractBlockBase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractBlockBase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractBlockBase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractControlFlowGraph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractControlFlowGraph.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractControlFlowGraph.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractControlFlowGraph.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/BlockMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/BlockMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/BlockMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/BlockMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/CFGVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/CFGVerifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/CFGVerifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/CFGVerifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/DominatorOptimizationProblem.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/DominatorOptimizationProblem.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/DominatorOptimizationProblem.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/DominatorOptimizationProblem.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/Loop.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/Loop.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/Loop.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/Loop.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PrintableCFG.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PrintableCFG.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PrintableCFG.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PrintableCFG.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PrintableDominatorOptimizationProblem.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PrintableDominatorOptimizationProblem.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PrintableDominatorOptimizationProblem.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PrintableDominatorOptimizationProblem.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PropertyConsumable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PropertyConsumable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PropertyConsumable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PropertyConsumable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/CodeGenProviders.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/CodeGenProviders.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/CodeGenProviders.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/CodeGenProviders.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ConstantFieldProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ConstantFieldProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ConstantFieldProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ConstantFieldProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallDescriptor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallDescriptor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallDescriptor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallDescriptor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallLinkage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallLinkage.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallLinkage.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallLinkage.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallsProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallsProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallsProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/JavaConstantFieldProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/JavaConstantFieldProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/JavaConstantFieldProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/JavaConstantFieldProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/LIRKindTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/LIRKindTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/LIRKindTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/LIRKindTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/AbstractObjectStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/AbstractObjectStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/AbstractObjectStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/AbstractObjectStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/AbstractPointerStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/AbstractPointerStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/AbstractPointerStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/AbstractPointerStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ArithmeticOpTable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ArithmeticOpTable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ArithmeticOpTable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ArithmeticOpTable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ArithmeticStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ArithmeticStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ArithmeticStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ArithmeticStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/DataPointerConstant.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/DataPointerConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/DataPointerConstant.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/DataPointerConstant.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/FloatStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/FloatStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/FloatStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/FloatStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IllegalStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IllegalStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IllegalStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IllegalStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ObjectStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ObjectStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ObjectStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ObjectStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/RawPointerStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/RawPointerStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/RawPointerStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/RawPointerStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/Stamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/Stamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/Stamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/Stamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/StampFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/StampFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/StampFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/StampFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/StampPair.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/StampPair.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/StampPair.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/StampPair.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/TypeReference.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/TypeReference.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/TypeReference.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/TypeReference.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/VoidStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/VoidStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/VoidStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/VoidStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/BitMap2D.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/BitMap2D.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/BitMap2D.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/BitMap2D.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/CompilationAlarm.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/CompilationAlarm.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/CompilationAlarm.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/CompilationAlarm.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/FrequencyEncoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/FrequencyEncoder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/FrequencyEncoder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/FrequencyEncoder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/IntList.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/IntList.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/IntList.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/IntList.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/ModuleAPI.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/ModuleAPI.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/ModuleAPI.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/ModuleAPI.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/ReversedList.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/ReversedList.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/ReversedList.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/ReversedList.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/TypeConversion.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/TypeConversion.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/TypeConversion.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/TypeConversion.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/TypeReader.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/TypeReader.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/TypeReader.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/TypeReader.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/TypeWriter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/TypeWriter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/TypeWriter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/TypeWriter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeAccess.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeAccess.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeReader.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeReader.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeReader.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeReader.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeWriter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeWriter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeWriter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeWriter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/Util.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/Util.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/Util.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/Util.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/META-INF/services/javax.annotation.processing.Processor b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/META-INF/services/javax.annotation.processing.Processor rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/META-INF/services/javax.annotation.processing.Processor diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc.test/src/org/graalvm/compiler/core/sparc/test/SPARCAllocatorTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc.test/src/org/graalvm/compiler/core/sparc/test/SPARCAllocatorTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc.test/src/org/graalvm/compiler/core/sparc/test/SPARCAllocatorTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc.test/src/org/graalvm/compiler/core/sparc/test/SPARCAllocatorTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCAddressLowering.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCAddressLowering.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCAddressLowering.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCAddressLowering.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCArithmeticLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCArithmeticLIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCArithmeticLIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCArithmeticLIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCImmediateAddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCImmediateAddressNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCImmediateAddressNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCImmediateAddressNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCIndexedAddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCIndexedAddressNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCIndexedAddressNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCIndexedAddressNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCIntegerCompareCanonicalizationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCIntegerCompareCanonicalizationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCIntegerCompareCanonicalizationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCIntegerCompareCanonicalizationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCLIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCLIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCLIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCLIRKindTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCLIRKindTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCLIRKindTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCLIRKindTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCMoveFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCMoveFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCMoveFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCMoveFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeLIRBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeLIRBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeLIRBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeLIRBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeMatchRules.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeMatchRules.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeMatchRules.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeMatchRules.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCSuitesCreator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCSuitesCreator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCSuitesCreator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCSuitesCreator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/AllocSpy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/AllocSpy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/AllocSpy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/AllocSpy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ByteBufferTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ByteBufferTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ByteBufferTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ByteBufferTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CommonedConstantsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CommonedConstantsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CommonedConstantsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CommonedConstantsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConcreteSubtypeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConcreteSubtypeTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConcreteSubtypeTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConcreteSubtypeTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationMulTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationMulTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationMulTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationMulTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest10.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest10.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest10.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest10.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest11.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest11.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest11.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest11.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest12.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest12.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest12.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest12.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest13.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest13.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest13.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest13.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest4.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest4.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest4.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest4.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest5.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest5.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest5.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest5.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest6.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest6.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest6.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest6.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest7.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest7.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest7.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest7.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest8.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest8.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest8.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest8.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest9.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest9.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest9.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest9.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConstantArrayReadFoldingTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConstantArrayReadFoldingTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConstantArrayReadFoldingTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConstantArrayReadFoldingTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CooperativePhaseTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CooperativePhaseTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CooperativePhaseTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CooperativePhaseTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CopyOfVirtualizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CopyOfVirtualizationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CopyOfVirtualizationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CopyOfVirtualizationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DeMorganCanonicalizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DeMorganCanonicalizationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DeMorganCanonicalizationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DeMorganCanonicalizationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DegeneratedLoopsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DegeneratedLoopsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DegeneratedLoopsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DegeneratedLoopsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DirectByteBufferTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DirectByteBufferTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DirectByteBufferTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DirectByteBufferTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DontReuseArgumentSpaceTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DontReuseArgumentSpaceTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DontReuseArgumentSpaceTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DontReuseArgumentSpaceTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/EnumSwitchTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/EnumSwitchTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/EnumSwitchTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/EnumSwitchTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FindUniqueConcreteMethodBugTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FindUniqueConcreteMethodBugTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FindUniqueConcreteMethodBugTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FindUniqueConcreteMethodBugTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FindUniqueDefaultMethodTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FindUniqueDefaultMethodTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FindUniqueDefaultMethodTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FindUniqueDefaultMethodTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FloatOptimizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FloatOptimizationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FloatOptimizationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FloatOptimizationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FloatingReadTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FloatingReadTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FloatingReadTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FloatingReadTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerAssumptionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerAssumptionsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerAssumptionsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerAssumptionsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalDebugHandlersFactoryTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalDebugHandlersFactoryTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalDebugHandlersFactoryTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalDebugHandlersFactoryTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphResetDebugTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphResetDebugTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphResetDebugTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphResetDebugTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphScheduleTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphScheduleTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphScheduleTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphScheduleTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardedIntrinsicTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardedIntrinsicTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardedIntrinsicTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardedIntrinsicTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/HashCodeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/HashCodeTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/HashCodeTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/HashCodeTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfCanonicalizerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfCanonicalizerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfCanonicalizerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfReorderTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfReorderTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfReorderTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfReorderTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ImplicitNullCheckTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ImplicitNullCheckTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ImplicitNullCheckTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ImplicitNullCheckTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InstalledCodeInvalidationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InstalledCodeInvalidationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InstalledCodeInvalidationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InstalledCodeInvalidationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerEqualsCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerEqualsCanonicalizerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerEqualsCanonicalizerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerEqualsCanonicalizerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerStampMulFoldTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerStampMulFoldTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerStampMulFoldTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerStampMulFoldTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeExceptionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeExceptionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeExceptionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeHintsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeHintsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeHintsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeHintsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopFullUnrollTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopFullUnrollTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopFullUnrollTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopFullUnrollTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopUnswitchTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopUnswitchTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopUnswitchTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopUnswitchTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MarkUnsafeAccessTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MarkUnsafeAccessTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MarkUnsafeAccessTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MarkUnsafeAccessTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryArithmeticTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryArithmeticTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryArithmeticTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryArithmeticTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MergeCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MergeCanonicalizerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MergeCanonicalizerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MergeCanonicalizerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MethodHandleEagerResolution.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MethodHandleEagerResolution.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MethodHandleEagerResolution.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MethodHandleEagerResolution.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MonitorGraphTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MonitorGraphTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MonitorGraphTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MonitorGraphTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NarrowingReadTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NarrowingReadTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NarrowingReadTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NarrowingReadTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NestedLoopTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NestedLoopTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NestedLoopTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NestedLoopTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePosIteratorTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePosIteratorTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePosIteratorTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePosIteratorTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/OnStackReplacementTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/OnStackReplacementTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/OnStackReplacementTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/OnStackReplacementTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/OptionsVerifierTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/OptionsVerifierTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/OptionsVerifierTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/OptionsVerifierTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PhiCreationTests.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PhiCreationTests.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PhiCreationTests.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PhiCreationTests.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ProfilingInfoTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ProfilingInfoTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ProfilingInfoTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ProfilingInfoTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushNodesThroughPiTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushNodesThroughPiTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushNodesThroughPiTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushNodesThroughPiTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushThroughIfTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushThroughIfTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushThroughIfTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushThroughIfTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReadAfterCheckCastTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReadAfterCheckCastTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReadAfterCheckCastTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReadAfterCheckCastTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReassociateAndCanonicalTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReassociateAndCanonicalTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReassociateAndCanonicalTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReassociateAndCanonicalTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReentrantBlockIteratorTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReentrantBlockIteratorTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReentrantBlockIteratorTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReentrantBlockIteratorTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReferenceGetLoopTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReferenceGetLoopTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReferenceGetLoopTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReferenceGetLoopTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReflectionOptionDescriptors.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReflectionOptionDescriptors.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReflectionOptionDescriptors.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReflectionOptionDescriptors.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ScalarTypeSystemTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ScalarTypeSystemTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ScalarTypeSystemTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ScalarTypeSystemTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ShortCircuitNodeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ShortCircuitNodeTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ShortCircuitNodeTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ShortCircuitNodeTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampCanonicalizerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampCanonicalizerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampCanonicalizerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StaticInterfaceFieldTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StaticInterfaceFieldTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StaticInterfaceFieldTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StaticInterfaceFieldTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StraighteningTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StraighteningTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StraighteningTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StraighteningTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeWriterTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeWriterTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeWriterTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeWriterTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnbalancedMonitorsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnbalancedMonitorsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnbalancedMonitorsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnbalancedMonitorsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeReadEliminationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeReadEliminationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeReadEliminationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeReadEliminationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnusedArray.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnusedArray.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnusedArray.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnusedArray.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsageTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsageTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsageTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsageTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ZeroSignExtendTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ZeroSignExtendTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ZeroSignExtendTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ZeroSignExtendTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/backend/AllocatorTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/backend/AllocatorTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/backend/AllocatorTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/backend/AllocatorTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/backend/BackendTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/backend/BackendTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/backend/BackendTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/backend/BackendTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/CompiledMethodTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/CompiledMethodTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/CompiledMethodTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/CompiledMethodTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/MonitorDeoptTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/MonitorDeoptTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/MonitorDeoptTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/MonitorDeoptTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/RethrowDeoptMaterializeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/RethrowDeoptMaterializeTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/RethrowDeoptMaterializeTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/RethrowDeoptMaterializeTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/SafepointRethrowDeoptTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/SafepointRethrowDeoptTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/SafepointRethrowDeoptTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/SafepointRethrowDeoptTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/SynchronizedMethodDeoptimizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/SynchronizedMethodDeoptimizationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/SynchronizedMethodDeoptimizationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/SynchronizedMethodDeoptimizationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/CountUppercaseParallelTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/CountUppercaseParallelTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/CountUppercaseParallelTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/CountUppercaseParallelTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EAMergingTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EAMergingTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EAMergingTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EAMergingTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EarlyReadEliminationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EarlyReadEliminationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EarlyReadEliminationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EarlyReadEliminationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/NestedBoxingTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/NestedBoxingTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/NestedBoxingTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/NestedBoxingTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PEAAssertionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PEAAssertionsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PEAAssertionsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PEAAssertionsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PEAReadEliminationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PEAReadEliminationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PEAReadEliminationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PEAReadEliminationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PoorMansEATest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PoorMansEATest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PoorMansEATest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PoorMansEATest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/UnsafeEATest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/UnsafeEATest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/UnsafeEATest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/UnsafeEATest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/InliningTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/InliningTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/InliningTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/InliningTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/GraalTutorial.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/GraalTutorial.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/GraalTutorial.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/GraalTutorial.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysisTests.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysisTests.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysisTests.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysisTests.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationPrinter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationPrinter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationPrinter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationPrinter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationWrapper.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationWrapper.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationWrapper.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationWrapper.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilerThread.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilerThread.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilerThread.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilerThread.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilerThreadFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilerThreadFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilerThreadFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilerThreadFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompilerOptions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompilerOptions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompilerOptions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompilerOptions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/LIRGenerationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/LIRGenerationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/LIRGenerationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/LIRGenerationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/doc-files/CompilationBailoutActionHelp.txt b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/doc-files/CompilationBailoutActionHelp.txt similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/doc-files/CompilationBailoutActionHelp.txt rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/doc-files/CompilationBailoutActionHelp.txt diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/BytecodeParserTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/BytecodeParserTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/BytecodeParserTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/BytecodeParserTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/DebugInfoBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/DebugInfoBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/DebugInfoBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/DebugInfoBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/InstructionPrinter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/InstructionPrinter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/InstructionPrinter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/InstructionPrinter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/package-info.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/package-info.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/package-info.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/package-info.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/ComplexMatchResult.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/ComplexMatchResult.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/ComplexMatchResult.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/ComplexMatchResult.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/ComplexMatchValue.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/ComplexMatchValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/ComplexMatchValue.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/ComplexMatchValue.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchContext.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchContext.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchPattern.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchPattern.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchPattern.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchPattern.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRule.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRule.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRule.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRule.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRuleRegistry.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRuleRegistry.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRuleRegistry.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRuleRegistry.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRules.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRules.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRules.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRules.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchStatement.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchStatement.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchStatement.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchStatement.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchStatementSet.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchStatementSet.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchStatementSet.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchStatementSet.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchableNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchableNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchableNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchableNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchableNodes.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchableNodes.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchableNodes.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchableNodes.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/package-info.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/package-info.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/package-info.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/package-info.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/CoreCompilerConfiguration.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/CoreCompilerConfiguration.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/CoreCompilerConfiguration.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/CoreCompilerConfiguration.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyCompilerConfiguration.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyCompilerConfiguration.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyCompilerConfiguration.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyCompilerConfiguration.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyHighTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyHighTier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyHighTier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyHighTier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyLowTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyLowTier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyLowTier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyLowTier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyMidTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyMidTier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyMidTier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyMidTier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/GraphChangeMonitoringPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/GraphChangeMonitoringPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/GraphChangeMonitoringPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/GraphChangeMonitoringPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/target/Backend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/target/Backend.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/target/Backend.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/target/Backend.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/CSVUtilTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/CSVUtilTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/CSVUtilTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/CSVUtilTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.testLogging.input b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.testLogging.input similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.testLogging.input rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.testLogging.input diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/TimerKeyTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/TimerKeyTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/TimerKeyTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/TimerKeyTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/AbstractKey.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/AbstractKey.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/AbstractKey.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/AbstractKey.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/AccumulatedKey.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/AccumulatedKey.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/AccumulatedKey.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/AccumulatedKey.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Assertions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Assertions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Assertions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Assertions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CSVUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CSVUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CSVUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CSVUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CloseableCounter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CloseableCounter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CloseableCounter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CloseableCounter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CounterKey.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CounterKey.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CounterKey.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CounterKey.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CounterKeyImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CounterKeyImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CounterKeyImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CounterKeyImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugCloseable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugCloseable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugCloseable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugCloseable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfig.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfig.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfigImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfigImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfigImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfigImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugDumpHandler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugDumpHandler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugDumpHandler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugDumpHandler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugDumpScope.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugDumpScope.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugDumpScope.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugDumpScope.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugFilter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugFilter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugFilter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugFilter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugHandler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugHandler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugHandler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugHandler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugHandlersFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugHandlersFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugHandlersFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugHandlersFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugMemUseTracker.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugMemUseTracker.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugMemUseTracker.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugMemUseTracker.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugValueMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugValueMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugValueMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugValueMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugVerifyHandler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugVerifyHandler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugVerifyHandler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugVerifyHandler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/GlobalMetrics.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/GlobalMetrics.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/GlobalMetrics.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/GlobalMetrics.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/GraalError.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/GraalError.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/GraalError.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/GraalError.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Indent.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Indent.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Indent.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Indent.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/JavaMethodContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/JavaMethodContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/JavaMethodContext.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/JavaMethodContext.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/KeyRegistry.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/KeyRegistry.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/KeyRegistry.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/KeyRegistry.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/LogStream.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/LogStream.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/LogStream.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/LogStream.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Management.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Management.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Management.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Management.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MemUseTrackerKey.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MemUseTrackerKey.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MemUseTrackerKey.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MemUseTrackerKey.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MemUseTrackerKeyImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MemUseTrackerKeyImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MemUseTrackerKeyImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MemUseTrackerKeyImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MethodFilter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MethodFilter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MethodFilter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MethodFilter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MetricKey.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MetricKey.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MetricKey.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MetricKey.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/PathUtilities.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/PathUtilities.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/PathUtilities.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/PathUtilities.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/ScopeImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/ScopeImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/ScopeImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/ScopeImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TTY.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TTY.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TTY.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TTY.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TTYStreamProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TTYStreamProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TTYStreamProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TTYStreamProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TimeSource.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TimeSource.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TimeSource.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TimeSource.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TimerKey.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TimerKey.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TimerKey.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TimerKey.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TimerKeyImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TimerKeyImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TimerKeyImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/TimerKeyImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/DumpHelp.txt b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/DumpHelp.txt similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/DumpHelp.txt rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/DumpHelp.txt diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/MethodFilterHelp.txt b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/MethodFilterHelp.txt similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/MethodFilterHelp.txt rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/MethodFilterHelp.txt diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/MetricsFileHelp.txt b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/MetricsFileHelp.txt similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/MetricsFileHelp.txt rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/MetricsFileHelp.txt diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/GraphTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/GraphTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/GraphTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/GraphTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeBitMapTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeBitMapTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeBitMapTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeBitMapTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeMapTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeMapTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeMapTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeMapTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeUsagesTests.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeUsagesTests.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeUsagesTests.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeUsagesTests.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeValidationChecksTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeValidationChecksTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeValidationChecksTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeValidationChecksTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TestNodeInterface.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TestNodeInterface.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TestNodeInterface.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TestNodeInterface.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableContains.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableContains.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableContains.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableContains.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableCount.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableCount.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableCount.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableCount.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableIsEmpty.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableIsEmpty.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableIsEmpty.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableIsEmpty.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/.checkstyle_checks.xml b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/.checkstyle_checks.xml similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/.checkstyle_checks.xml rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/.checkstyle_checks.xml diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/CachedGraph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/CachedGraph.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/CachedGraph.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/CachedGraph.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Edges.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Edges.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Edges.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Edges.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/GraalGraphError.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/GraalGraphError.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/GraalGraphError.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/GraalGraphError.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/GraphNodeIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/GraphNodeIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/GraphNodeIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/GraphNodeIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/InputEdges.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/InputEdges.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/InputEdges.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/InputEdges.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/IterableNodeType.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/IterableNodeType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/IterableNodeType.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/IterableNodeType.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeBitMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeBitMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeBitMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeBitMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeFlood.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeFlood.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeFlood.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeFlood.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeIdAccessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeIdAccessor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeIdAccessor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeIdAccessor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInputList.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInputList.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInputList.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInputList.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInterface.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInterface.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInterface.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInterface.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeSourcePosition.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeSourcePosition.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeSourcePosition.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeSourcePosition.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeStack.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeStack.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeStack.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeStack.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeSuccessorList.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeSuccessorList.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeSuccessorList.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeSuccessorList.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUnionFind.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUnionFind.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUnionFind.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUnionFind.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUsageIterable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUsageIterable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUsageIterable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUsageIterable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUsageIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUsageIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUsageIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUsageIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUsageWithModCountIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUsageWithModCountIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUsageWithModCountIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeUsageWithModCountIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeWorkList.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeWorkList.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeWorkList.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeWorkList.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Position.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Position.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Position.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Position.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/SuccessorEdges.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/SuccessorEdges.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/SuccessorEdges.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/SuccessorEdges.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/TypedGraphNodeIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/TypedGraphNodeIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/TypedGraphNodeIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/TypedGraphNodeIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/UnsafeAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/UnsafeAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/UnsafeAccess.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/UnsafeAccess.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/VerificationError.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/VerificationError.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/VerificationError.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/VerificationError.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/FilteredNodeIterable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/FilteredNodeIterable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/FilteredNodeIterable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/FilteredNodeIterable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodeIterable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodeIterable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodeIterable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodeIterable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodeIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodeIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodeIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodeIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodePredicate.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodePredicate.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodePredicate.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodePredicate.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodePredicates.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodePredicates.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodePredicates.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/NodePredicates.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/PredicatedProxyNodeIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/PredicatedProxyNodeIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/PredicatedProxyNodeIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/iterators/PredicatedProxyNodeIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/package-info.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/package-info.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/package-info.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/package-info.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/Canonicalizable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/Canonicalizable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/Canonicalizable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/Canonicalizable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/CanonicalizerTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/CanonicalizerTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/CanonicalizerTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/CanonicalizerTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/Simplifiable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/Simplifiable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/Simplifiable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/Simplifiable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/SimplifierTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/SimplifierTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/SimplifierTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/SimplifierTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotEpilogueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotEpilogueOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotEpilogueOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotEpilogueOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMoveFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMoveFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMoveFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMoveFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotReturnOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotReturnOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotReturnOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotReturnOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSuitesProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSuitesProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSuitesProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSuitesProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotUnwindOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotUnwindOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotUnwindOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotUnwindOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/CompressedNullCheckTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/CompressedNullCheckTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/CompressedNullCheckTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/CompressedNullCheckTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/DataPatchInConstantsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/DataPatchInConstantsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/DataPatchInConstantsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/DataPatchInConstantsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/StubAVXTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/StubAVXTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/StubAVXTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/StubAVXTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64DeoptimizeOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64DeoptimizeOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64DeoptimizeOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64DeoptimizeOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotArithmeticLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotArithmeticLIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotArithmeticLIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotArithmeticLIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotConstantRetrievalOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotConstantRetrievalOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotConstantRetrievalOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotConstantRetrievalOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCounterOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCounterOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCounterOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCounterOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotEpilogueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotEpilogueOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotEpilogueOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotEpilogueOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLeaveCurrentStackFrameOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLeaveCurrentStackFrameOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLeaveCurrentStackFrameOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLeaveCurrentStackFrameOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLeaveDeoptimizedStackFrameOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLeaveDeoptimizedStackFrameOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLeaveDeoptimizedStackFrameOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLeaveDeoptimizedStackFrameOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadAddressOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadAddressOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadAddressOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadAddressOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMoveFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMoveFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMoveFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMoveFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotReturnOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotReturnOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotReturnOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotReturnOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSuitesCreator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSuitesCreator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSuitesCreator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSuitesCreator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotUnwindOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotUnwindOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotUnwindOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotUnwindOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64IndirectCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64IndirectCallOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64IndirectCallOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64IndirectCallOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64MathStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64MathStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64MathStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64MathStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64TailcallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64TailcallOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64TailcallOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64TailcallOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.lir.test/src/org/graalvm/compiler/hotspot/lir/test/ExceedMaxOopMapStackOffset.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.lir.test/src/org/graalvm/compiler/hotspot/lir/test/ExceedMaxOopMapStackOffset.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.lir.test/src/org/graalvm/compiler/hotspot/lir/test/ExceedMaxOopMapStackOffset.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.lir.test/src/org/graalvm/compiler/hotspot/lir/test/ExceedMaxOopMapStackOffset.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCDeoptimizeOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCDeoptimizeOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCDeoptimizeOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCDeoptimizeOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackend.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackend.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackend.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackendFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackendFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackendFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackendFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotCRuntimeCallEpilogueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotCRuntimeCallEpilogueOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotCRuntimeCallEpilogueOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotCRuntimeCallEpilogueOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotCRuntimeCallPrologueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotCRuntimeCallPrologueOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotCRuntimeCallPrologueOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotCRuntimeCallPrologueOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotCounterOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotCounterOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotCounterOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotCounterOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotDeoptimizeCallerOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotDeoptimizeCallerOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotDeoptimizeCallerOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotDeoptimizeCallerOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotEpilogueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotEpilogueOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotEpilogueOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotEpilogueOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotForeignCallsProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotForeignCallsProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotForeignCallsProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerInCallerOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerInCallerOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerInCallerOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerInCallerOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLeaveCurrentStackFrameOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLeaveCurrentStackFrameOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLeaveCurrentStackFrameOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLeaveCurrentStackFrameOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLeaveDeoptimizedStackFrameOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLeaveDeoptimizedStackFrameOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLeaveDeoptimizedStackFrameOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLeaveDeoptimizedStackFrameOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLoweringProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLoweringProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLoweringProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotMove.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotMove.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotMove.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotMove.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotMoveFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotMoveFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotMoveFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotMoveFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotNodeLIRBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotNodeLIRBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotNodeLIRBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotNodeLIRBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotPatchReturnAddressOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotPatchReturnAddressOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotPatchReturnAddressOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotPatchReturnAddressOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotPushInterpreterFrameOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotPushInterpreterFrameOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotPushInterpreterFrameOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotPushInterpreterFrameOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotRegisterAllocationConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotRegisterAllocationConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotRegisterAllocationConfig.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotRegisterAllocationConfig.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotReturnOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotReturnOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotReturnOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotReturnOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotSafepointOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotSafepointOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotSafepointOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotSafepointOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotStrategySwitchOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotStrategySwitchOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotStrategySwitchOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotStrategySwitchOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotUnwindOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotUnwindOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotUnwindOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotUnwindOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotspotDirectStaticCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotspotDirectStaticCallOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotspotDirectStaticCallOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotspotDirectStaticCallOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotspotDirectVirtualCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotspotDirectVirtualCallOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotspotDirectVirtualCallOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotspotDirectVirtualCallOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCIndirectCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCIndirectCallOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCIndirectCallOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCIndirectCallOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CRC32SubstitutionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CRC32SubstitutionsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CRC32SubstitutionsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CRC32SubstitutionsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ClassSubstitutionsTests.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ClassSubstitutionsTests.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ClassSubstitutionsTests.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ClassSubstitutionsTests.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorldTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorldTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorldTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorldTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompressedOopTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompressedOopTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompressedOopTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompressedOopTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/DataPatchTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/DataPatchTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/DataPatchTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/DataPatchTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/EliminateRedundantInitializationPhaseTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/EliminateRedundantInitializationPhaseTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/EliminateRedundantInitializationPhaseTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/EliminateRedundantInitializationPhaseTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ExplicitExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ExplicitExceptionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ExplicitExceptionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ExplicitExceptionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ForeignCallDeoptimizeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ForeignCallDeoptimizeTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ForeignCallDeoptimizeTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ForeignCallDeoptimizeTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRLockTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRLockTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRLockTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRLockTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTestBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTestBase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTestBase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTestBase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalMBeanTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalMBeanTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalMBeanTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalMBeanTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotMonitorValueTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotMonitorValueTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotMonitorValueTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotMonitorValueTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotNmethodTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotNmethodTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotNmethodTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotNmethodTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotNodeSubstitutionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotNodeSubstitutionsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotNodeSubstitutionsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotNodeSubstitutionsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedJavaFieldTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedJavaFieldTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedJavaFieldTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedJavaFieldTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedObjectTypeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedObjectTypeTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedObjectTypeTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedObjectTypeTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotStampMemoryAccessTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotStampMemoryAccessTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotStampMemoryAccessTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotStampMemoryAccessTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotUnsafeSubstitutionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotUnsafeSubstitutionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotUnsafeSubstitutionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotUnsafeSubstitutionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/InstalledCodeExecuteHelperTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/InstalledCodeExecuteHelperTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/InstalledCodeExecuteHelperTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/InstalledCodeExecuteHelperTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LoadJavaMirrorWithKlassTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LoadJavaMirrorWithKlassTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LoadJavaMirrorWithKlassTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LoadJavaMirrorWithKlassTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MemoryUsageBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MemoryUsageBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MemoryUsageBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MemoryUsageBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ObjectCloneTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ObjectCloneTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ObjectCloneTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ObjectCloneTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/OptionsInFileTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/OptionsInFileTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/OptionsInFileTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/OptionsInFileTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestIntrinsicCompiles.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestIntrinsicCompiles.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestIntrinsicCompiles.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestIntrinsicCompiles.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestSHASubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestSHASubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestSHASubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestSHASubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierVerificationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierVerificationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierVerificationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierVerificationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/AOTGraalHotSpotVMConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/AOTGraalHotSpotVMConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/AOTGraalHotSpotVMConfig.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/AOTGraalHotSpotVMConfig.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/BootstrapWatchDog.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/BootstrapWatchDog.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/BootstrapWatchDog.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/BootstrapWatchDog.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationCounters.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationCounters.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationCounters.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationCounters.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationStatistics.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationStatistics.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationStatistics.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationStatistics.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationTask.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationTask.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationTask.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationTask.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationWatchDog.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationWatchDog.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationWatchDog.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationWatchDog.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerConfigurationFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerConfigurationFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerConfigurationFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerConfigurationFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerRuntimeHotSpotVMConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerRuntimeHotSpotVMConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerRuntimeHotSpotVMConfig.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerRuntimeHotSpotVMConfig.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CoreCompilerConfigurationFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CoreCompilerConfigurationFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CoreCompilerConfigurationFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CoreCompilerConfigurationFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/EconomyCompilerConfigurationFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/EconomyCompilerConfigurationFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/EconomyCompilerConfigurationFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/EconomyCompilerConfigurationFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackendFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackendFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackendFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackendFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCodeCacheListener.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCodeCacheListener.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCodeCacheListener.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCodeCacheListener.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompilationIdentifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompilationIdentifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompilationIdentifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompilationIdentifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCounterOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCounterOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCounterOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCounterOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDataBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDataBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDataBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDataBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDebugInfoBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDebugInfoBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDebugInfoBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDebugInfoBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkage.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkage.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkage.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkageImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkageImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkageImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkageImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompilerFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompilerFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompilerFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompilerFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalMBean.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalMBean.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalMBean.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalMBean.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalOptionValues.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalOptionValues.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalOptionValues.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalOptionValues.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalVMEventListener.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalVMEventListener.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalVMEventListener.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalVMEventListener.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotInstructionProfiling.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotInstructionProfiling.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotInstructionProfiling.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotInstructionProfiling.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerationResult.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerationResult.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerationResult.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerationResult.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLockStack.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLockStack.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLockStack.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLockStack.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotNodeLIRBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotNodeLIRBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotNodeLIRBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotNodeLIRBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReferenceMapBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReferenceMapBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReferenceMapBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReferenceMapBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/NodeCostDumpUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/NodeCostDumpUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/NodeCostDumpUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/NodeCostDumpUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/PrintStreamOptionKey.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/PrintStreamOptionKey.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/PrintStreamOptionKey.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/PrintStreamOptionKey.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/debug/BenchmarkCounters.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/debug/BenchmarkCounters.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/debug/BenchmarkCounters.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/debug/BenchmarkCounters.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/lir/HotSpotZapRegistersPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/lir/HotSpotZapRegistersPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/lir/HotSpotZapRegistersPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/lir/HotSpotZapRegistersPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotAOTProfilingPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotAOTProfilingPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotAOTProfilingPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotAOTProfilingPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotClassInitializationPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotClassInitializationPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotClassInitializationPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotClassInitializationPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotConstantFieldProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotConstantFieldProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotConstantFieldProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotConstantFieldProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotConstantLoadAction.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotConstantLoadAction.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotConstantLoadAction.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotConstantLoadAction.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotDisassemblerProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotDisassemblerProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotDisassemblerProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotDisassemblerProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotLoweringProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotLoweringProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotLoweringProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProfilingPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProfilingPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProfilingPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProfilingPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProviders.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProviders.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProviders.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProviders.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotRegisters.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotRegisters.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotRegisters.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotRegisters.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotRegistersProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotRegistersProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotRegistersProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotRegistersProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSnippetReflectionProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSnippetReflectionProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSnippetReflectionProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSnippetReflectionProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotStampProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotStampProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotStampProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotStampProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotUnsafeSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotUnsafeSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotUnsafeSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotUnsafeSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/AcquiredCASLockNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/AcquiredCASLockNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/AcquiredCASLockNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/AcquiredCASLockNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/AllocaNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/AllocaNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/AllocaNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/AllocaNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ArrayRangeWriteBarrier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ArrayRangeWriteBarrier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ArrayRangeWriteBarrier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ArrayRangeWriteBarrier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/BeginLockScopeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/BeginLockScopeNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/BeginLockScopeNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/BeginLockScopeNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ComputeObjectAddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ComputeObjectAddressNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ComputeObjectAddressNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ComputeObjectAddressNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/CurrentJavaThreadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/CurrentJavaThreadNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/CurrentJavaThreadNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/CurrentJavaThreadNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/CurrentLockNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/CurrentLockNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/CurrentLockNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/CurrentLockNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DeoptimizeCallerNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DeoptimizeCallerNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DeoptimizeCallerNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DeoptimizeCallerNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DeoptimizingStubCall.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DeoptimizingStubCall.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DeoptimizingStubCall.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DeoptimizingStubCall.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DimensionsNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DimensionsNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DimensionsNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DimensionsNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/EndLockScopeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/EndLockScopeNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/EndLockScopeNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/EndLockScopeNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/FastAcquireBiasedLockNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/FastAcquireBiasedLockNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/FastAcquireBiasedLockNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/FastAcquireBiasedLockNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePostWriteBarrier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePostWriteBarrier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePostWriteBarrier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePostWriteBarrier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePreWriteBarrier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePreWriteBarrier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePreWriteBarrier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePreWriteBarrier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PostWriteBarrier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PostWriteBarrier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PostWriteBarrier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PostWriteBarrier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PreWriteBarrier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PreWriteBarrier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PreWriteBarrier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PreWriteBarrier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ReferentFieldReadBarrier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ReferentFieldReadBarrier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ReferentFieldReadBarrier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ReferentFieldReadBarrier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GetObjectAddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GetObjectAddressNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GetObjectAddressNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GetObjectAddressNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GraalHotSpotVMConfigNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GraalHotSpotVMConfigNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GraalHotSpotVMConfigNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GraalHotSpotVMConfigNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/HotSpotCompressionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/HotSpotCompressionNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/HotSpotCompressionNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/HotSpotCompressionNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/HotSpotDirectCallTargetNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/HotSpotDirectCallTargetNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/HotSpotDirectCallTargetNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/HotSpotDirectCallTargetNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/HotSpotIndirectCallTargetNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/HotSpotIndirectCallTargetNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/HotSpotIndirectCallTargetNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/HotSpotIndirectCallTargetNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/LoadIndexedPointerNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/LoadIndexedPointerNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/LoadIndexedPointerNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/LoadIndexedPointerNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/MonitorCounterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/MonitorCounterNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/MonitorCounterNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/MonitorCounterNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ObjectWriteBarrier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ObjectWriteBarrier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ObjectWriteBarrier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ObjectWriteBarrier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/PatchReturnAddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/PatchReturnAddressNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/PatchReturnAddressNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/PatchReturnAddressNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialArrayRangeWriteBarrier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialArrayRangeWriteBarrier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialArrayRangeWriteBarrier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialArrayRangeWriteBarrier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialWriteBarrier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialWriteBarrier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialWriteBarrier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialWriteBarrier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubStartNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubStartNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubStartNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubStartNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/VMErrorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/VMErrorNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/VMErrorNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/VMErrorNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/WriteBarrier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/WriteBarrier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/WriteBarrier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/WriteBarrier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/EncodedSymbolNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/EncodedSymbolNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/EncodedSymbolNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/EncodedSymbolNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassStubCall.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassStubCall.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassStubCall.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassStubCall.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyFixedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyFixedNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyFixedNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyFixedNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersIndirectlyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersIndirectlyNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersIndirectlyNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersIndirectlyNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantStubCall.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantStubCall.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantStubCall.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantStubCall.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersStubCall.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersStubCall.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersStubCall.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersStubCall.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileBranchNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileBranchNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileBranchNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileBranchNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileInvokeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileInvokeNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileInvokeNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileInvokeNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileWithNotificationNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileWithNotificationNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileWithNotificationNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileWithNotificationNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/RandomSeedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/RandomSeedNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/RandomSeedNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/RandomSeedNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/HotSpotNarrowOopStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/HotSpotNarrowOopStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/HotSpotNarrowOopStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/HotSpotNarrowOopStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/KlassPointerStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/KlassPointerStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/KlassPointerStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/KlassPointerStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/MetaspacePointerStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/MetaspacePointerStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/MetaspacePointerStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/MetaspacePointerStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/MethodCountersPointerStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/MethodCountersPointerStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/MethodCountersPointerStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/MethodCountersPointerStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/MethodPointerStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/MethodPointerStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/MethodPointerStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/MethodPointerStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/package-info.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/package-info.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/package-info.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/package-info.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/LoadJavaMirrorWithKlassPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/LoadJavaMirrorWithKlassPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/LoadJavaMirrorWithKlassPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/LoadJavaMirrorWithKlassPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierAdditionPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierAdditionPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierAdditionPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierAdditionPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierVerificationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierVerificationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierVerificationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierVerificationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/AOTInliningPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/AOTInliningPolicy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/AOTInliningPolicy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/AOTInliningPolicy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/EliminateRedundantInitializationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/EliminateRedundantInitializationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/EliminateRedundantInitializationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/EliminateRedundantInitializationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/profiling/FinalizeProfileNodesPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/profiling/FinalizeProfileNodesPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/profiling/FinalizeProfileNodesPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/profiling/FinalizeProfileNodesPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AssertionSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AssertionSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AssertionSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AssertionSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/BigIntegerSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/BigIntegerSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/BigIntegerSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/BigIntegerSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32Substitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32Substitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32Substitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32Substitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CipherBlockChainingSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CipherBlockChainingSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CipherBlockChainingSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CipherBlockChainingSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/EncodedSymbolConstant.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/EncodedSymbolConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/EncodedSymbolConstant.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/EncodedSymbolConstant.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HashCodeSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HashCodeSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HashCodeSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HashCodeSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotspotSnippetsOptions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotspotSnippetsOptions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotspotSnippetsOptions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotspotSnippetsOptions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/IdentityHashCodeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/IdentityHashCodeNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/IdentityHashCodeNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/IdentityHashCodeNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/KlassLayoutHelperNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/KlassLayoutHelperNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/KlassLayoutHelperNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/KlassLayoutHelperNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/MonitorSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/MonitorSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/MonitorSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/MonitorSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionGetCallerClassNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionGetCallerClassNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionGetCallerClassNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionGetCallerClassNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringToBytesSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringToBytesSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringToBytesSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringToBytesSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ThreadSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ThreadSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ThreadSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ThreadSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/TypeCheckSnippetUtils.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/TypeCheckSnippetUtils.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/TypeCheckSnippetUtils.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/TypeCheckSnippetUtils.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeAccess.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeAccess.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeLoadSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeLoadSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeLoadSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeLoadSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/WriteBarrierSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/WriteBarrierSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/WriteBarrierSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/WriteBarrierSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/aot/ResolveConstantSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/aot/ResolveConstantSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/aot/ResolveConstantSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/aot/ResolveConstantSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyCallNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyCallNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyCallNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopySlowPathNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopySlowPathNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopySlowPathNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopySlowPathNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopySnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopySnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopySnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopySnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyUnrollNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyUnrollNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyUnrollNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyUnrollNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopyNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopyNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopyNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopySnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopySnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopySnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopySnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProbabilisticProfileSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProbabilisticProfileSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProbabilisticProfileSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProbabilisticProfileSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProfileSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProfileSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProfileSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProfileSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ArrayStoreExceptionStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ArrayStoreExceptionStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ArrayStoreExceptionStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ArrayStoreExceptionStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ClassCastExceptionStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ClassCastExceptionStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ClassCastExceptionStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ClassCastExceptionStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/CreateExceptionStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/CreateExceptionStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/CreateExceptionStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/CreateExceptionStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ExceptionHandlerStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ExceptionHandlerStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ExceptionHandlerStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ExceptionHandlerStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewArrayStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewArrayStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewArrayStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewArrayStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewInstanceStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewInstanceStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewInstanceStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewInstanceStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NullPointerExceptionStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NullPointerExceptionStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NullPointerExceptionStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NullPointerExceptionStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubCompilationIdentifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubCompilationIdentifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubCompilationIdentifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubCompilationIdentifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubOptions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubOptions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubOptions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubOptions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/VerifyOopStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/VerifyOopStub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/VerifyOopStub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/VerifyOopStub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/HotSpotOperation.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/HotSpotOperation.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/HotSpotOperation.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/HotSpotOperation.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/HotSpotWordTypes.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/HotSpotWordTypes.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/HotSpotWordTypes.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/HotSpotWordTypes.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/KlassPointer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/KlassPointer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/KlassPointer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/KlassPointer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MetaspacePointer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MetaspacePointer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MetaspacePointer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MetaspacePointer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MethodCountersPointer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MethodCountersPointer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MethodCountersPointer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MethodCountersPointer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MethodPointer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MethodPointer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MethodPointer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MethodPointer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/PointerCastNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/PointerCastNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/PointerCastNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/PointerCastNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParserOptions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParserOptions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParserOptions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParserOptions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/ComputeLoopFrequenciesClosure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/ComputeLoopFrequenciesClosure.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/ComputeLoopFrequenciesClosure.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/ComputeLoopFrequenciesClosure.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/DefaultSuitesCreator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/DefaultSuitesCreator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/DefaultSuitesCreator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/DefaultSuitesCreator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/GraphBuilderPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/GraphBuilderPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/GraphBuilderPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/GraphBuilderPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/JsrNotSupportedBailout.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/JsrNotSupportedBailout.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/JsrNotSupportedBailout.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/JsrNotSupportedBailout.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/JsrScope.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/JsrScope.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/JsrScope.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/JsrScope.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LargeLocalLiveness.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LargeLocalLiveness.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LargeLocalLiveness.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LargeLocalLiveness.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LocalLiveness.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LocalLiveness.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LocalLiveness.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LocalLiveness.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/SmallLocalLiveness.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/SmallLocalLiveness.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/SmallLocalLiveness.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/SmallLocalLiveness.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/SuitesProviderBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/SuitesProviderBase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/SuitesProviderBase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/SuitesProviderBase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/JTTTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/JTTTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/JTTTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/JTTTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/ConstantPhiTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/ConstantPhiTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/ConstantPhiTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/ConstantPhiTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/EmptyMethodTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/EmptyMethodTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/EmptyMethodTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/EmptyMethodTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/LargeConstantSectionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/LargeConstantSectionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/LargeConstantSectionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/LargeConstantSectionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aaload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aaload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aaload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aaload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aaload_1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aaload_1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aaload_1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aaload_1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_0.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_0.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_0.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_0.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_aload_3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_anewarray.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_anewarray.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_anewarray.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_anewarray.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_areturn.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_areturn.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_areturn.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_areturn.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_arraylength.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_arraylength.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_arraylength.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_arraylength.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_athrow.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_athrow.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_athrow.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_athrow.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_baload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_baload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_baload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_baload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_bastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_bastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_bastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_bastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_caload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_caload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_caload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_caload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_castore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_castore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_castore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_castore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2f.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2f.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2f.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2f.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2i01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2i01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2i01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2i01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2i02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2i02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2i02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2i02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2l01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2l01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2l01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2l01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2l02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2l02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2l02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2l02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2l03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2l03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2l03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_d2l03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dadd.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dadd.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dadd.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dadd.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_daload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_daload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_daload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_daload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp06.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp06.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp06.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp06.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp07.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp07.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp07.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp07.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp08.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp08.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp08.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp08.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp09.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp09.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp09.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp09.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp10.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp10.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp10.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp10.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ddiv.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ddiv.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ddiv.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ddiv.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dmul.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dmul.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dmul.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dmul.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dneg.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dneg.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dneg.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dneg.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dneg2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dneg2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dneg2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dneg2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_double_base.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_double_base.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_double_base.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_double_base.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_drem.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_drem.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_drem.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_drem.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dreturn.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dreturn.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dreturn.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dreturn.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dsub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dsub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dsub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dsub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dsub2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dsub2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dsub2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_dsub2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2d.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2d.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2d.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2d.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2i01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2i01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2i01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2i01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2i02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2i02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2i02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2i02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2l01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2l01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2l01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2l01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2l02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2l02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2l02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_f2l02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fadd.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fadd.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fadd.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fadd.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_faload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_faload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_faload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_faload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp06.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp06.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp06.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp06.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp07.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp07.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp07.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp07.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp08.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp08.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp08.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp08.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp09.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp09.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp09.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp09.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp10.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp10.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp10.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp10.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fdiv.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fdiv.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fdiv.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fdiv.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fload_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fload_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fload_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fload_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_float_base.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_float_base.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_float_base.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_float_base.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fmul.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fmul.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fmul.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fmul.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fneg.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fneg.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fneg.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fneg.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_frem.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_frem.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_frem.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_frem.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_freturn.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_freturn.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_freturn.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_freturn.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fsub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fsub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fsub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_fsub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_b.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_b.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_b.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_b.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_c.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_c.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_c.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_c.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_d.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_d.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_d.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_d.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_f.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_f.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_f.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_f.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_i.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_i.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_i.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_i.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_l.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_l.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_l.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_l.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_o.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_o.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_o.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_o.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_s.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_s.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_s.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_s.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_z.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_z.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_z.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_z.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_b.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_b.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_b.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_b.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_c.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_c.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_c.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_c.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_d.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_d.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_d.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_d.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_f.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_f.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_f.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_f.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_i.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_i.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_i.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_i.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_l.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_l.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_l.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_l.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_s.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_s.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_s.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_s.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_z.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_z.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_z.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_z.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2b.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2b.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2b.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2b.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2c.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2c.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2c.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2c.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2d.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2d.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2d.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2d.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2f.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2f.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2f.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2f.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2l.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2l.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2l.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2l.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2s.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2s.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2s.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_i2s.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const0.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const0.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const0.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const0.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iaload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iaload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iaload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iaload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iand.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iand.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iand.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iand.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iconst.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iconst.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iconst.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iconst.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_idiv.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_idiv.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_idiv.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_idiv.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_idiv2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_idiv2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_idiv2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_idiv2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifge.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifge.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifge.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifge.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifgt.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifgt.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifgt.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifgt.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifle.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifle.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifle.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifle.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iflt.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iflt.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iflt.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iflt.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifne.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifne.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifne.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifne.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_4.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_4.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_4.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_4.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1_1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1_1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1_1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1_1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iload_3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_imul.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_imul.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_imul.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_imul.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ineg.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ineg.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ineg.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ineg.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokeinterface.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokeinterface.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokeinterface.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokeinterface.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokestatic.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokestatic.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokestatic.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokestatic.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokevirtual.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokevirtual.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokevirtual.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_invokevirtual.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ior.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ior.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ior.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ior.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_irem.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_irem.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_irem.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_irem.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_irem2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_irem2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_irem2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_irem2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_irem3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_irem3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_irem3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_irem3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ireturn.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ireturn.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ireturn.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ireturn.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ishl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ishl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ishl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ishl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ishr.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ishr.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ishr.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ishr.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_isub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_isub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_isub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_isub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iushr.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iushr.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iushr.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_iushr.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ixor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ixor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ixor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ixor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2d.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2d.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2d.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2d.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2f.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2f.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2f.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2f.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2i.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2i.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2i.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2i.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2i_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2i_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2i_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_l2i_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ladd.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ladd.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ladd.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ladd.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ladd2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ladd2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ladd2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ladd2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_laload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_laload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_laload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_laload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_land.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_land.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_land.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_land.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lcmp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lcmp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lcmp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lcmp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_06.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_06.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_06.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_06.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_0.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_0.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_0.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_0.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lload_3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lmul.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lmul.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lmul.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lmul.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lneg.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lneg.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lneg.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lneg.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lrem.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lrem.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lrem.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lrem.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lrem2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lrem2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lrem2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lrem2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lreturn.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lreturn.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lreturn.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lreturn.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lshl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lshl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lshl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lshl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lshr.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lshr.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lshr.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lshr.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lshr02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lshr02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lshr02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lshr02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lsub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lsub.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lsub.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lsub.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lushr.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lushr.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lushr.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lushr.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lxor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lxor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lxor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_lxor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_new.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_new.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_new.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_new.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_newarray.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_newarray.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_newarray.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_newarray.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_newarray_02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_newarray_02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_newarray_02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_newarray_02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putstatic.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putstatic.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putstatic.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_putstatic.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_saload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_saload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_saload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_saload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_sastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_sastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_sastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_sastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch4.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch4.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch4.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch4.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_wide01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_wide01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_wide01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_wide01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_wide02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_wide02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_wide02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_wide02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aaload0.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aaload0.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aaload0.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aaload0.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aaload1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aaload1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aaload1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aaload1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aastore0.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aastore0.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aastore0.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aastore0.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aastore1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aastore1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aastore1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_aastore1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_anewarray.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_anewarray.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_anewarray.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_anewarray.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_arraylength.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_arraylength.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_arraylength.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_arraylength.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow0.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow0.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow0.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow0.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_athrow3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_baload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_baload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_baload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_baload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_bastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_bastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_bastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_bastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_caload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_caload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_caload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_caload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_castore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_castore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_castore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_castore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast3.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast3.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast3.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast4.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast4.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast4.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast4.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast5.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast5.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast5.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast5.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast6.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast6.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast6.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_checkcast6.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_daload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_daload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_daload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_daload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_dastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_dastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_dastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_dastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_faload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_faload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_faload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_faload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_fastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_fastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_fastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_fastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_getfield.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_getfield.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_getfield.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_getfield.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_getfield1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_getfield1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_getfield1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_getfield1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_iaload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_iaload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_iaload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_iaload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_iastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_iastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_iastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_iastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_idiv.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_idiv.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_idiv.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_idiv.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_idiv2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_idiv2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_idiv2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_idiv2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_invokespecial01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_invokespecial01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_invokespecial01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_invokespecial01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_invokevirtual01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_invokevirtual01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_invokevirtual01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_invokevirtual01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_invokevirtual02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_invokevirtual02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_invokevirtual02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_invokevirtual02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_irem.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_irem.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_irem.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_irem.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_laload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_laload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_laload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_laload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_lastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_lastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_lastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_lastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_ldiv.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_ldiv.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_ldiv.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_ldiv.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_ldiv2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_ldiv2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_ldiv2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_ldiv2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_lrem.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_lrem.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_lrem.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_lrem.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_monitorenter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_monitorenter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_monitorenter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_monitorenter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_multianewarray.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_multianewarray.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_multianewarray.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_multianewarray.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_newarray.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_newarray.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_newarray.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_newarray.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_putfield.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_putfield.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_putfield.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_putfield.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_saload.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_saload.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_saload.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_saload.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_sastore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_sastore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_sastore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/BC_sastore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Loop01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Loop01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Loop01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Loop01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Loop02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Loop02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Loop02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Loop02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Loop03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Loop03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Loop03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Loop03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NASE_1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NASE_1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NASE_1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NASE_1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NASE_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NASE_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NASE_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NASE_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_00.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_00.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_00.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_00.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_06.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_06.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_06.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_06.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_07.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_07.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_07.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_07.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_08.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_08.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_08.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_08.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_09.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_09.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_09.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_09.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_10.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_10.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_10.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_10.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_11.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_11.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_11.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_NPE_11.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Two01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Two01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Two01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Two01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Two02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Two02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Two02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Two02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Two03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Two03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Two03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Two03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Catch_Unresolved03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Locals.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Locals.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Locals.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Locals.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Except_Synchronized05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Finally01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Finally01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Finally01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Finally01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Finally02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Finally02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Finally02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Finally02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_AIOOBE_00.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_AIOOBE_00.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_AIOOBE_00.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_AIOOBE_00.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_CCE_00.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_CCE_00.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_CCE_00.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_CCE_00.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_00.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_00.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_00.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_00.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InCatch01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InCatch01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InCatch01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InCatch01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InCatch02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InCatch02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InCatch02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InCatch02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InCatch03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InCatch03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InCatch03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InCatch03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InNested.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InNested.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InNested.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_InNested.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_NPE_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_NPE_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_NPE_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_NPE_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/Throw_Synchronized05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/UntrustedInterfaces.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/UntrustedInterfaces.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/UntrustedInterfaces.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/UntrustedInterfaces.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_allocate04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_array04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_control01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_control01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_control01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_control01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_control02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_control02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_control02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_control02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_convert01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_convert01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_convert01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_convert01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_count.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_count.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_count.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_count.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_dead01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_dead01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_dead01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_dead01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_demo01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_demo01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_demo01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_demo01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_field04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_idea.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_idea.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_idea.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_idea.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_inline01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_inline01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_inline01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_inline01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_inline02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_inline02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_inline02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_inline02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_invoke01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_invoke01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_invoke01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_invoke01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_life.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_life.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_life.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_life.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_nest01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_nest01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_nest01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_nest01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_nest02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_nest02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_nest02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_nest02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_scope01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_scope01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_scope01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_scope01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_scope02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_scope02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_scope02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_scope02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_series.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_series.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_series.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_series.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_trees01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_trees01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_trees01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotpath/HP_trees01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/NotOnDebug.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/NotOnDebug.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/NotOnDebug.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/NotOnDebug.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6186134.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6186134.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6186134.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6186134.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6196102.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6196102.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6196102.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6196102.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6753639.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6753639.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6753639.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6753639.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6823354.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6823354.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6823354.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6823354.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6850611.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6850611.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6850611.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6850611.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6959129.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6959129.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6959129.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6959129.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test7005594.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test7005594.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test7005594.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test7005594.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/CharacterBits.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/CharacterBits.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/CharacterBits.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/CharacterBits.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Class_getName.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Class_getName.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Class_getName.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Class_getName.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/DivideUnsigned.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/DivideUnsigned.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/DivideUnsigned.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/DivideUnsigned.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/EnumMap01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/EnumMap01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/EnumMap01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/EnumMap01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/EnumMap02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/EnumMap02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/EnumMap02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/EnumMap02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/IntegerBits.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/IntegerBits.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/IntegerBits.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/IntegerBits.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/LongBits.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/LongBits.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/LongBits.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/LongBits.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/ShortBits.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/ShortBits.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/ShortBits.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/ShortBits.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_nanoTime01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_nanoTime01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_nanoTime01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_nanoTime01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_nanoTime02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_nanoTime02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_nanoTime02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_nanoTime02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_setOut.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_setOut.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_setOut.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/System_setOut.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Thread_setName.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Thread_setName.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Thread_setName.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Thread_setName.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/UnsafeAccess01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/UnsafeAccess01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/UnsafeAccess01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/UnsafeAccess01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/UnsafeAllocateInstance01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/UnsafeAllocateInstance01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/UnsafeAllocateInstance01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/UnsafeAllocateInstance01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwapNullCheck.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwapNullCheck.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwapNullCheck.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwapNullCheck.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Boxed_TYPE_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Boxed_TYPE_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Boxed_TYPE_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Boxed_TYPE_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Bridge_method01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Bridge_method01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Bridge_method01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Bridge_method01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/ClassLoader_loadClass01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/ClassLoader_loadClass01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/ClassLoader_loadClass01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/ClassLoader_loadClass01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_Literal01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_Literal01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_Literal01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_Literal01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_asSubclass01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_asSubclass01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_asSubclass01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_asSubclass01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_cast01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_cast01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_cast01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_cast01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_cast02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_cast02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_cast02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_cast02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_forName05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getComponentType01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getComponentType01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getComponentType01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getComponentType01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getInterfaces01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getInterfaces01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getInterfaces01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getInterfaces01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getModifiers01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getModifiers01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getModifiers01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getModifiers01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getModifiers02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getModifiers02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getModifiers02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getModifiers02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getName01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getName01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getName01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getName01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getName02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getName02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getName02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getName02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getSuperClass01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getSuperClass01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getSuperClass01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_getSuperClass01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isArray01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isArray01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isArray01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isArray01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance06.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance06.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance06.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance06.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance07.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance07.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance07.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInstance07.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInterface01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInterface01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInterface01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isInterface01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isPrimitive01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isPrimitive01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isPrimitive01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Class_isPrimitive01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Double_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Double_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Double_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Double_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Double_conditional.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Double_conditional.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Double_conditional.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Double_conditional.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Double_toString.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Double_toString.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Double_toString.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Double_toString.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_conditional.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_conditional.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_conditional.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Float_conditional.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greater01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greater01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greater01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greater01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greater02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greater02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greater02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greater02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greater03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greater03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greater03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greater03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_less01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_less01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_less01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_less01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_less02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_less02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_less02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_less02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_less03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_less03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_less03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_less03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_lessEqual01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_lessEqual01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_lessEqual01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_lessEqual01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_lessEqual02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_lessEqual02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_lessEqual02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_lessEqual02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_lessEqual03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_lessEqual03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_lessEqual03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Int_lessEqual03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/LambdaEagerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/LambdaEagerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/LambdaEagerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/LambdaEagerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greater01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greater01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greater01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greater01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greater02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greater02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greater02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greater02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greater03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greater03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greater03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greater03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_less01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_less01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_less01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_less01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_less02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_less02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_less02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_less02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_less03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_less03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_less03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_less03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_lessEqual01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_lessEqual01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_lessEqual01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_lessEqual01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_lessEqual02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_lessEqual02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_lessEqual02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_lessEqual02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_lessEqual03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_lessEqual03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_lessEqual03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_lessEqual03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_abs.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_abs.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_abs.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_abs.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_cos.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_cos.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_cos.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_cos.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_exact.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_exact.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_exact.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_exact.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_exp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_exp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_exp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_exp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_log.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_log.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_log.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_log.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_log10.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_log10.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_log10.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_log10.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_pow.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_pow.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_pow.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_pow.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_round.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_round.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_round.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_round.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_sin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_sin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_sin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_sin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_sqrt.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_sqrt.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_sqrt.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_sqrt.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_tan.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_tan.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_tan.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Math_tan.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_clone01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_clone01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_clone01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_clone01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_clone02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_clone02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_clone02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_clone02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_equals01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_equals01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_equals01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_equals01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_getClass01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_getClass01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_getClass01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_getClass01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_hashCode01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_hashCode01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_hashCode01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_hashCode01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_hashCode02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_hashCode02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_hashCode02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_hashCode02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notify01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notify01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notify01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notify01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notify02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notify02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notify02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notify02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notifyAll01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notifyAll01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notifyAll01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notifyAll01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notifyAll02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notifyAll02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notifyAll02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_notifyAll02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_toString01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_toString01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_toString01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_toString01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_toString02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_toString02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_toString02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_toString02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_wait01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_wait01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_wait01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_wait01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_wait02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_wait02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_wait02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_wait02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_wait03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_wait03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_wait03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/Object_wait03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/ProcessEnvironment_init.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/ProcessEnvironment_init.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/ProcessEnvironment_init.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/ProcessEnvironment_init.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/StringCoding_Scale.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/StringCoding_Scale.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/StringCoding_Scale.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/StringCoding_Scale.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_intern01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_intern01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_intern01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_intern01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_intern02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_intern02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_intern02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_intern02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_intern03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_intern03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_intern03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_intern03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_valueOf01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_valueOf01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_valueOf01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/String_valueOf01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/System_identityHashCode01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/System_identityHashCode01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/System_identityHashCode01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/lang/System_identityHashCode01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/DegeneratedLoop.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/DegeneratedLoop.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/DegeneratedLoop.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/DegeneratedLoop.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop06.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop06.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop06.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop06.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop07.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop07.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop07.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop07.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop07_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop07_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop07_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop07_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop08.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop08.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop08.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop08.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop09.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop09.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop09.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop09.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop09_2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop09_2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop09_2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop09_2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop11.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop11.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop11.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop11.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop12.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop12.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop12.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop12.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop13.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop13.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop13.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop13.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop14.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop14.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop14.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop14.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop15.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop15.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop15.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop15.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop16.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop16.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop16.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop16.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop17.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop17.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop17.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/Loop17.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopEscape.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopEscape.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopEscape.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopEscape.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopInline.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopInline.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopInline.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopInline.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopLastIndexOf.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopLastIndexOf.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopLastIndexOf.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopLastIndexOf.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopNewInstance.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopNewInstance.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopNewInstance.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopNewInstance.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopParseLong.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopParseLong.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopParseLong.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopParseLong.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopPhi.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopPhi.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopPhi.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopPhi.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopPhiResolutionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopPhiResolutionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopPhiResolutionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopPhiResolutionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopSpilling.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopSpilling.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopSpilling.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopSpilling.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopSwitch01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopSwitch01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopSwitch01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopSwitch01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopUnroll.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopUnroll.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopUnroll.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/LoopUnroll.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/SpillLoopPhiVariableAtDefinition.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/SpillLoopPhiVariableAtDefinition.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/SpillLoopPhiVariableAtDefinition.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/loop/SpillLoopPhiVariableAtDefinition.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ArrayCompare01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ArrayCompare01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ArrayCompare01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ArrayCompare01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ArrayCompare02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ArrayCompare02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ArrayCompare02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ArrayCompare02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BC_invokevirtual2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BC_invokevirtual2.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BC_invokevirtual2.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BC_invokevirtual2.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigByteParams01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigByteParams01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigByteParams01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigByteParams01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigDoubleParams02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigDoubleParams02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigDoubleParams02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigDoubleParams02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigFloatParams01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigFloatParams01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigFloatParams01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigFloatParams01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigFloatParams02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigFloatParams02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigFloatParams02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigFloatParams02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigIntParams01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigIntParams01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigIntParams01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigIntParams01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigIntParams02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigIntParams02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigIntParams02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigIntParams02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigInterfaceParams01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigInterfaceParams01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigInterfaceParams01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigInterfaceParams01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigLongParams02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigLongParams02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigLongParams02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigLongParams02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigMixedParams04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigObjectParams01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigObjectParams01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigObjectParams01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigObjectParams01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigObjectParams02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigObjectParams02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigObjectParams02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigObjectParams02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigParamsAlignment.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigParamsAlignment.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigParamsAlignment.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigParamsAlignment.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigShortParams01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigShortParams01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigShortParams01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigShortParams01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigVirtualParams01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigVirtualParams01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigVirtualParams01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/BigVirtualParams01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/Bubblesort.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/Bubblesort.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/Bubblesort.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/Bubblesort.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ConstantLoadTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ConstantLoadTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ConstantLoadTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ConstantLoadTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/Fibonacci.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/Fibonacci.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/Fibonacci.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/Fibonacci.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/FloatingReads.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/FloatingReads.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/FloatingReads.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/FloatingReads.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeInterface_04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/Matrix01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/Matrix01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/Matrix01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/Matrix01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ReferenceMap01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ReferenceMap01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ReferenceMap01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/ReferenceMap01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/StrangeFrames.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/StrangeFrames.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/StrangeFrames.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/StrangeFrames.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/String_format01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/String_format01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/String_format01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/String_format01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/String_format02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/String_format02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/String_format02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/String_format02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_String01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_String01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_String01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_String01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_Unroll.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_Unroll.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_Unroll.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_Unroll.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_boolean01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_boolean01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_boolean01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_boolean01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_byte01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_byte01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_byte01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_byte01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_char01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_char01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_char01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_char01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_double01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_double01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_double01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_double01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_float01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_float01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_float01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_float01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_int01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_int01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_int01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_int01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_long01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_long01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_long01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_long01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_short01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_short01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_short01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/micro/VarArgs_short01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ABCE_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ABCE_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ABCE_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ABCE_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ABCE_02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ABCE_02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ABCE_02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ABCE_02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ABCE_03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ABCE_03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ABCE_03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ABCE_03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy06.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy06.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy06.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopy06.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopyGeneric.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopyGeneric.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopyGeneric.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayCopyGeneric.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayLength01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayLength01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayLength01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ArrayLength01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_idiv_16.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_idiv_16.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_idiv_16.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_idiv_16.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_idiv_4.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_idiv_4.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_idiv_4.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_idiv_4.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_imul_16.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_imul_16.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_imul_16.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_imul_16.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_imul_4.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_imul_4.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_imul_4.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_imul_4.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_16.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_16.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_16.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_16.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_4.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_4.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_4.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_4.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lmul_16.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lmul_16.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lmul_16.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lmul_16.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lmul_4.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lmul_4.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lmul_4.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lmul_4.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C16.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C16.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C16.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C16.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C24.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C24.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C24.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C24.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C32.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C32.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C32.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C32.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BlockSkip01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BlockSkip01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BlockSkip01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BlockSkip01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BoxingIdentity.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BoxingIdentity.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BoxingIdentity.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/BoxingIdentity.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Cmov01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Cmov01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Cmov01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Cmov01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Cmov02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Cmov02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Cmov02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Cmov02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Conditional01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Conditional01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Conditional01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Conditional01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ConvertCompare.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ConvertCompare.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ConvertCompare.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ConvertCompare.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/DeadCode01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/DeadCode01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/DeadCode01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/DeadCode01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/DeadCode02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/DeadCode02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/DeadCode02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/DeadCode02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Cast01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Cast01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Cast01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Cast01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Convert04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Double01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Double01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Double01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Double01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Double02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Double02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Double02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Double02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Double03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Double03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Double03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Double03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Float01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Float01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Float01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Float01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Float02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Float02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Float02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Float02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_InstanceOf01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_InstanceOf01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_InstanceOf01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_InstanceOf01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Int01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Int01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Int01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Int01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Int02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Int02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Int02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Int02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Long01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Long01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Long01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Long01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Long02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Long02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Long02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Long02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Math01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Math01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Math01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Fold_Math01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/GuardMovement.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/GuardMovement.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/GuardMovement.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/GuardMovement.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/InferStamp01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/InferStamp01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/InferStamp01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/InferStamp01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Inline01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Inline01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Inline01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Inline01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Inline02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Inline02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Inline02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Inline02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/LLE_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/LLE_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/LLE_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/LLE_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/List_reorder_bug.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/List_reorder_bug.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/List_reorder_bug.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/List_reorder_bug.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Logic0.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Logic0.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Logic0.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Logic0.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/LongToSomethingArray01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/LongToSomethingArray01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/LongToSomethingArray01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/LongToSomethingArray01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_byte01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_byte01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_byte01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_byte01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_byte02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_byte02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_byte02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_byte02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_byte03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_byte03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_byte03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_byte03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_char01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_char01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_char01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_char01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_char02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_char02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_char02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_char02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_char03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_char03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_char03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_char03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_short01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_short01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_short01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_short01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_short02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_short02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_short02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_short02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_short03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_short03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_short03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Narrow_short03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NestedLoop_EA.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NestedLoop_EA.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NestedLoop_EA.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NestedLoop_EA.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Phi01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Phi01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Phi01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Phi01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Phi02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Phi02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Phi02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Phi02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Phi03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Phi03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Phi03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Phi03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ReassociateConstants.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ReassociateConstants.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ReassociateConstants.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/ReassociateConstants.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Convert01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Convert01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Convert01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Convert01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Double01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Double01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Double01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Double01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Float01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Float01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Float01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Float01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Int04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_Long04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SchedulingBug_01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SchedulingBug_01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SchedulingBug_01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SchedulingBug_01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SignExtendShort.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SignExtendShort.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SignExtendShort.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SignExtendShort.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Switch01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Switch01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Switch01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Switch01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Switch02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Switch02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Switch02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/Switch02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/TypeCastElem.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/TypeCastElem.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/TypeCastElem.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/TypeCastElem.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/UnsafeDeopt.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/UnsafeDeopt.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/UnsafeDeopt.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/UnsafeDeopt.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Cast01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Cast01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Cast01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Cast01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Cast02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Cast02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Cast02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Cast02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Convert01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Convert01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Convert01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Convert01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Convert02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Convert02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Convert02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Convert02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Double01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Double01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Double01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Double01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Double02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Double02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Double02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Double02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Double03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Double03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Double03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Double03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Field01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Field01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Field01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Field01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Field02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Field02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Field02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Field02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Float01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Float01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Float01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Float01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Float02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Float02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Float02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Float02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Int01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Int01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Int01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Int01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Int02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Int02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Int02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Int02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Int03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Int03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Int03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Int03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Long01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Long01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Long01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Long01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Long02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Long02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Long02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Long02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Long03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Long03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Long03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Long03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Loop01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Loop01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Loop01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/VN_Loop01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_get01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_get01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_get01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_get01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_get02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_get02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_get02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_get02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_get03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_get03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_get03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_get03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getBoolean01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getBoolean01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getBoolean01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getBoolean01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getByte01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getByte01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getByte01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getByte01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getChar01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getChar01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getChar01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getChar01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getDouble01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getDouble01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getDouble01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getDouble01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getFloat01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getFloat01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getFloat01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getFloat01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getInt01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getInt01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getInt01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getInt01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getLength01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getLength01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getLength01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getLength01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getLong01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getLong01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getLong01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getLong01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getShort01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getShort01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getShort01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_getShort01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance06.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance06.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance06.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_newInstance06.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_set01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_set01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_set01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_set01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_set02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_set02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_set02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_set02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_set03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_set03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_set03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_set03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setBoolean01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setBoolean01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setBoolean01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setBoolean01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setByte01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setByte01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setByte01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setByte01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setChar01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setChar01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setChar01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setChar01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setDouble01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setDouble01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setDouble01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setDouble01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setFloat01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setFloat01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setFloat01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setFloat01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setInt01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setInt01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setInt01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setInt01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setLong01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setLong01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setLong01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setLong01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setShort01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setShort01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setShort01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Array_setShort01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredField01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredField01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredField01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredField01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredMethod01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredMethod01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredMethod01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredMethod01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getField01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getField01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getField01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getField01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getField02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getField02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getField02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getField02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getMethod01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getMethod01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getMethod01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getMethod01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getMethod02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getMethod02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getMethod02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_getMethod02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance06.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance06.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance06.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance06.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance07.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance07.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance07.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Class_newInstance07.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_get04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_getType01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_getType01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_getType01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_getType01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_set01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_set01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_set01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_set01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_set02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_set02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_set02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_set02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_set03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_set03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_set03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Field_set03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_except01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_except01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_except01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_except01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_main01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_main01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_main01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_main01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_main02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_main02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_main02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_main02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_main03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_main03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_main03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_main03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_virtual01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_virtual01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_virtual01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Invoke_virtual01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Method_getParameterTypes01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Method_getParameterTypes01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Method_getParameterTypes01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Method_getParameterTypes01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Method_getReturnType01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Method_getReturnType01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Method_getReturnType01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/reflect/Method_getReturnType01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitor_contended01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitor_contended01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitor_contended01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitor_contended01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitor_notowner01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitor_notowner01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitor_notowner01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitor_notowner01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/SynchronizedLoopExit01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/SynchronizedLoopExit01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/SynchronizedLoopExit01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/SynchronizedLoopExit01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/ThreadLocal01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/ThreadLocal01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/ThreadLocal01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/ThreadLocal01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/ThreadLocal02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/ThreadLocal02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/ThreadLocal02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/ThreadLocal02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/ThreadLocal03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/ThreadLocal03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/ThreadLocal03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/ThreadLocal03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_currentThread01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_currentThread01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_currentThread01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_currentThread01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_getState01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_getState01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_getState01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_getState01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_getState02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_getState02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_getState02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_getState02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_holdsLock01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_holdsLock01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_holdsLock01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_holdsLock01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isAlive01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isAlive01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isAlive01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isAlive01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted04.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted04.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted04.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted04.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted05.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted05.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted05.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted05.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_join01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_join01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_join01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_join01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_join02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_join02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_join02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_join02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_join03.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_join03.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_join03.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_join03.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_new01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_new01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_new01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_new01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_new02.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_new02.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_new02.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_new02.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_setPriority01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_setPriority01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_setPriority01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_setPriority01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_sleep01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_sleep01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_sleep01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_sleep01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_yield01.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_yield01.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_yield01.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Thread_yield01.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64AddressValue.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64AddressValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64AddressValue.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64AddressValue.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticLIRGeneratorTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticLIRGeneratorTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticLIRGeneratorTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticLIRGeneratorTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayEqualsOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayEqualsOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayEqualsOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayEqualsOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BitManipulationOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BitManipulationOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BitManipulationOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BitManipulationOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BlockEndOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BlockEndOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BlockEndOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BlockEndOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BreakpointOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BreakpointOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BreakpointOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BreakpointOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ByteSwapOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ByteSwapOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ByteSwapOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ByteSwapOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64CCall.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64CCall.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64CCall.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64CCall.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Compare.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Compare.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Compare.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Compare.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMapBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMapBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMapBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMapBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64LIRInstruction.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64LIRInstruction.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64LIRInstruction.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64LIRInstruction.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64PauseOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64PauseOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64PauseOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64PauseOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64PrefetchOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64PrefetchOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64PrefetchOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64PrefetchOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ReinterpretOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ReinterpretOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ReinterpretOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ReinterpretOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SignExtendOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SignExtendOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SignExtendOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SignExtendOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Unary.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Unary.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Unary.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Unary.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64AddressValue.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64AddressValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64AddressValue.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64AddressValue.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Arithmetic.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Arithmetic.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Arithmetic.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Arithmetic.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ArrayEqualsOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ArrayEqualsOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ArrayEqualsOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ArrayEqualsOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Binary.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Binary.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Binary.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Binary.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BinaryConsumer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BinaryConsumer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BinaryConsumer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BinaryConsumer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BlockEndOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BlockEndOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BlockEndOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BlockEndOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BreakpointOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BreakpointOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BreakpointOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BreakpointOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ByteSwapOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ByteSwapOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ByteSwapOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ByteSwapOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64CCall.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64CCall.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64CCall.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64CCall.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Call.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Call.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Call.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Call.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ClearRegisterOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ClearRegisterOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ClearRegisterOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ClearRegisterOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64FrameMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64FrameMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64FrameMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64FrameMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64FrameMapBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64FrameMapBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64FrameMapBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64FrameMapBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64LIRInstruction.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64LIRInstruction.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64LIRInstruction.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64LIRInstruction.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicBinaryOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicBinaryOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicBinaryOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicBinaryOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicUnaryOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicUnaryOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicUnaryOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicUnaryOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MulDivOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MulDivOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MulDivOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MulDivOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64PauseOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64PauseOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64PauseOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64PauseOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64PrefetchOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64PrefetchOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64PrefetchOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64PrefetchOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ReadTimestampCounter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ReadTimestampCounter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ReadTimestampCounter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ReadTimestampCounter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64RestoreRegistersOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64RestoreRegistersOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64RestoreRegistersOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64RestoreRegistersOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64SaveRegistersOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64SaveRegistersOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64SaveRegistersOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64SaveRegistersOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ShiftOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ShiftOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ShiftOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ShiftOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64SignExtendOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64SignExtendOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64SignExtendOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64SignExtendOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringIndexOfOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringIndexOfOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringIndexOfOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringIndexOfOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Unary.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Unary.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Unary.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Unary.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64VZeroUpper.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64VZeroUpper.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64VZeroUpper.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64VZeroUpper.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ZapRegistersOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ZapRegistersOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ZapRegistersOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ZapRegistersOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ZapStackOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ZapStackOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ZapStackOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ZapStackOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/phases/StackMoveOptimizationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/phases/StackMoveOptimizationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/phases/StackMoveOptimizationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/phases/StackMoveOptimizationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/ConstantStackCastTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/ConstantStackCastTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/ConstantStackCastTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/ConstantStackCastTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/LIRTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/LIRTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/LIRTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/LIRTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/LIRTestSpecification.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/LIRTestSpecification.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/LIRTestSpecification.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/LIRTestSpecification.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/LIRTestTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/LIRTestTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/LIRTestTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/LIRTestTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/SPARCBranchBailoutTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/SPARCBranchBailoutTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/SPARCBranchBailoutTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/SPARCBranchBailoutTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/StackMoveTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/StackMoveTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/StackMoveTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/StackMoveTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/StackStoreLoadTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/StackStoreLoadTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/StackStoreLoadTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/StackStoreLoadTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCAddressValue.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCAddressValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCAddressValue.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCAddressValue.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCArithmetic.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCArithmetic.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCArithmetic.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCArithmetic.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCArrayEqualsOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCArrayEqualsOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCArrayEqualsOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCArrayEqualsOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCBitManipulationOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCBitManipulationOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCBitManipulationOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCBitManipulationOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCBlockEndOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCBlockEndOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCBlockEndOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCBlockEndOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCBreakpointOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCBreakpointOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCBreakpointOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCBreakpointOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCByteSwapOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCByteSwapOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCByteSwapOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCByteSwapOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCCall.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCCall.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCCall.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCCall.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCControlFlow.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCControlFlow.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCControlFlow.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCControlFlow.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCDelayedControlTransfer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCDelayedControlTransfer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCDelayedControlTransfer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCDelayedControlTransfer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCFloatCompareOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCFloatCompareOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCFloatCompareOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCFloatCompareOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCFrameMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCFrameMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCFrameMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCFrameMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCFrameMapBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCFrameMapBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCFrameMapBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCFrameMapBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCImmediateAddressValue.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCImmediateAddressValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCImmediateAddressValue.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCImmediateAddressValue.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCIndexedAddressValue.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCIndexedAddressValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCIndexedAddressValue.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCIndexedAddressValue.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCJumpOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCJumpOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCJumpOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCJumpOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCLIRInstruction.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCLIRInstruction.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCLIRInstruction.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCLIRInstruction.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCLIRInstructionMixin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCLIRInstructionMixin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCLIRInstructionMixin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCLIRInstructionMixin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCLoadConstantTableBaseOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCLoadConstantTableBaseOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCLoadConstantTableBaseOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCLoadConstantTableBaseOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCMove.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCMove.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCMove.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCMove.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCOP3Op.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCOP3Op.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCOP3Op.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCOP3Op.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCOPFOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCOPFOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCOPFOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCOPFOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCPauseOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCPauseOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCPauseOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCPauseOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCPrefetchOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCPrefetchOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCPrefetchOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCPrefetchOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCSaveRegistersOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCSaveRegistersOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCSaveRegistersOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCSaveRegistersOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCTailDelayedLIRInstruction.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCTailDelayedLIRInstruction.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCTailDelayedLIRInstruction.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.sparc/src/org/graalvm/compiler/lir/sparc/SPARCTailDelayedLIRInstruction.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/CompositeValueReplacementTest1.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/CompositeValueReplacementTest1.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/CompositeValueReplacementTest1.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/CompositeValueReplacementTest1.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/GenericValueMapTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/GenericValueMapTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/GenericValueMapTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/GenericValueMapTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/alloc/trace/TraceGlobalMoveResolutionMappingTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/alloc/trace/TraceGlobalMoveResolutionMappingTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/alloc/trace/TraceGlobalMoveResolutionMappingTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.test/src/org/graalvm/compiler/lir/test/alloc/trace/TraceGlobalMoveResolutionMappingTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/BailoutAndRestartBackendException.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/BailoutAndRestartBackendException.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/BailoutAndRestartBackendException.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/BailoutAndRestartBackendException.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/CompositeValue.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/CompositeValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/CompositeValue.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/CompositeValue.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/CompositeValueClass.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/CompositeValueClass.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/CompositeValueClass.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/CompositeValueClass.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ConstantValue.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ConstantValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ConstantValue.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ConstantValue.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ControlFlowOptimizer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ControlFlowOptimizer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ControlFlowOptimizer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ControlFlowOptimizer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/EdgeMoveOptimizer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/EdgeMoveOptimizer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/EdgeMoveOptimizer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/EdgeMoveOptimizer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/FullInfopointOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/FullInfopointOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/FullInfopointOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/FullInfopointOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/InstructionStateProcedure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/InstructionStateProcedure.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/InstructionStateProcedure.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/InstructionStateProcedure.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/InstructionValueConsumer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/InstructionValueConsumer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/InstructionValueConsumer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/InstructionValueConsumer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/InstructionValueProcedure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/InstructionValueProcedure.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/InstructionValueProcedure.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/InstructionValueProcedure.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIR.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIR.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIR.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIR.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRFrameState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRFrameState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRFrameState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRFrameState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInsertionBuffer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInsertionBuffer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInsertionBuffer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInsertionBuffer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInstruction.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInstruction.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInstruction.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInstruction.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInstructionClass.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInstructionClass.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInstructionClass.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInstructionClass.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRIntrospection.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRIntrospection.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRIntrospection.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRIntrospection.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRValueUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRValueUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRValueUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRValueUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRVerifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRVerifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRVerifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LabelRef.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LabelRef.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LabelRef.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LabelRef.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/NullCheckOptimizer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/NullCheckOptimizer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/NullCheckOptimizer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/NullCheckOptimizer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/Opcode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/Opcode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/Opcode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/Opcode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/RedundantMoveElimination.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/RedundantMoveElimination.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/RedundantMoveElimination.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/RedundantMoveElimination.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/StandardOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/StandardOp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/StandardOp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/StandardOp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/StateProcedure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/StateProcedure.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/StateProcedure.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/StateProcedure.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/SwitchStrategy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/SwitchStrategy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/SwitchStrategy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/SwitchStrategy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ValueConsumer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ValueConsumer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ValueConsumer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ValueConsumer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ValueProcedure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ValueProcedure.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ValueProcedure.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ValueProcedure.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/Variable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/Variable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/Variable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/Variable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/VirtualStackSlot.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/VirtualStackSlot.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/VirtualStackSlot.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/VirtualStackSlot.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/AllocationStageVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/AllocationStageVerifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/AllocationStageVerifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/AllocationStageVerifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/OutOfRegistersException.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/OutOfRegistersException.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/OutOfRegistersException.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/OutOfRegistersException.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/SaveCalleeSaveRegisters.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/SaveCalleeSaveRegisters.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/SaveCalleeSaveRegisters.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/SaveCalleeSaveRegisters.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/Interval.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/Interval.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/Interval.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/Interval.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/IntervalWalker.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/IntervalWalker.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/IntervalWalker.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/IntervalWalker.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScan.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScan.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScan.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScan.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAssignLocationsPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAssignLocationsPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAssignLocationsPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAssignLocationsPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanIntervalDumper.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanIntervalDumper.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanIntervalDumper.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanIntervalDumper.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanWalker.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanWalker.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanWalker.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanWalker.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/MoveResolver.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/MoveResolver.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/MoveResolver.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/MoveResolver.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/OptimizingLinearScanWalker.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/OptimizingLinearScanWalker.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/OptimizingLinearScanWalker.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/OptimizingLinearScanWalker.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/Range.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/Range.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/Range.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/Range.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/RegisterVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/RegisterVerifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/RegisterVerifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/RegisterVerifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScan.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScan.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScan.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScan.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSAMoveResolver.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSAMoveResolver.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSAMoveResolver.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSAMoveResolver.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/DefaultTraceRegisterAllocationPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/DefaultTraceRegisterAllocationPolicy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/DefaultTraceRegisterAllocationPolicy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/DefaultTraceRegisterAllocationPolicy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/GlobalLivenessAnalysisPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/GlobalLivenessAnalysisPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/GlobalLivenessAnalysisPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/GlobalLivenessAnalysisPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/GlobalLivenessInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/GlobalLivenessInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/GlobalLivenessInfo.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/GlobalLivenessInfo.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/ShadowedRegisterValue.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/ShadowedRegisterValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/ShadowedRegisterValue.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/ShadowedRegisterValue.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceAllocationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceAllocationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceAllocationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceAllocationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceBuilderPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceBuilderPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceBuilderPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceBuilderPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceGlobalMoveResolutionPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceGlobalMoveResolutionPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceGlobalMoveResolutionPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceGlobalMoveResolutionPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceGlobalMoveResolver.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceGlobalMoveResolver.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceGlobalMoveResolver.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceGlobalMoveResolver.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceRegisterAllocationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceRegisterAllocationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceRegisterAllocationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceRegisterAllocationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceRegisterAllocationPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceRegisterAllocationPolicy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceRegisterAllocationPolicy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceRegisterAllocationPolicy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TraceUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TrivialTraceAllocator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TrivialTraceAllocator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TrivialTraceAllocator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/TrivialTraceAllocator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/bu/BottomUpAllocator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/bu/BottomUpAllocator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/bu/BottomUpAllocator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/bu/BottomUpAllocator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/FixedInterval.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/FixedInterval.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/FixedInterval.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/FixedInterval.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/FixedRange.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/FixedRange.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/FixedRange.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/FixedRange.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/IntervalHint.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/IntervalHint.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/IntervalHint.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/IntervalHint.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/RegisterVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/RegisterVerifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/RegisterVerifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/RegisterVerifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceInterval.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceInterval.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceInterval.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceInterval.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanAllocationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanAllocationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanAllocationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanAllocationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanAssignLocationsPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanAssignLocationsPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanAssignLocationsPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanAssignLocationsPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanEliminateSpillMovePhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanEliminateSpillMovePhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanEliminateSpillMovePhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanEliminateSpillMovePhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanLifetimeAnalysisPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanLifetimeAnalysisPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanLifetimeAnalysisPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanLifetimeAnalysisPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanRegisterAllocationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanRegisterAllocationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanRegisterAllocationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanRegisterAllocationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanResolveDataFlowPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanResolveDataFlowPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanResolveDataFlowPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanResolveDataFlowPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanWalker.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanWalker.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanWalker.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLinearScanWalker.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLocalMoveResolver.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLocalMoveResolver.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLocalMoveResolver.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/trace/lsra/TraceLocalMoveResolver.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/ArrayDataPointerConstant.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/ArrayDataPointerConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/ArrayDataPointerConstant.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/ArrayDataPointerConstant.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilderFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilderFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilderFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilderFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/DataBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/DataBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/DataBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/DataBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/FrameContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/FrameContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/FrameContext.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/FrameContext.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/ConstantLoadOptimization.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/ConstantLoadOptimization.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/ConstantLoadOptimization.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/ConstantLoadOptimization.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/ConstantTree.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/ConstantTree.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/ConstantTree.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/ConstantTree.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/ConstantTreeAnalyzer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/ConstantTreeAnalyzer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/ConstantTreeAnalyzer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/ConstantTreeAnalyzer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/DefUseTree.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/DefUseTree.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/DefUseTree.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/DefUseTree.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/UseEntry.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/UseEntry.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/UseEntry.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/UseEntry.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/VariableMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/VariableMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/VariableMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/constopt/VariableMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/debug/IntervalDumper.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/debug/IntervalDumper.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/debug/IntervalDumper.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/debug/IntervalDumper.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/debug/LIRGenerationDebugContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/debug/LIRGenerationDebugContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/debug/LIRGenerationDebugContext.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/debug/LIRGenerationDebugContext.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/LocationMarker.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/LocationMarker.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/LocationMarker.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/LocationMarker.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/LocationMarkerPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/LocationMarkerPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/LocationMarkerPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/LocationMarkerPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/MarkBasePointersPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/MarkBasePointersPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/MarkBasePointersPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/MarkBasePointersPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/RegStackValueSet.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/RegStackValueSet.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/RegStackValueSet.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/RegStackValueSet.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/UniqueWorkList.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/UniqueWorkList.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/UniqueWorkList.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/UniqueWorkList.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMapBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMapBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMapBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMapBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/ReferenceMapBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/ReferenceMapBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/ReferenceMapBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/ReferenceMapBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/SimpleVirtualStackSlot.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/SimpleVirtualStackSlot.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/SimpleVirtualStackSlot.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/SimpleVirtualStackSlot.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/VirtualStackSlotRange.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/VirtualStackSlotRange.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/VirtualStackSlotRange.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/framemap/VirtualStackSlotRange.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGeneratorTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGeneratorTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGeneratorTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGeneratorTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/BlockValueMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/BlockValueMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/BlockValueMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/BlockValueMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/DiagnosticLIRGeneratorTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/DiagnosticLIRGeneratorTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/DiagnosticLIRGeneratorTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/DiagnosticLIRGeneratorTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerationResult.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerationResult.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerationResult.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerationResult.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/PhiResolver.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/PhiResolver.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/PhiResolver.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/PhiResolver.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/VerifyingMoveFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/VerifyingMoveFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/VerifyingMoveFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/VerifyingMoveFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/AllocationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/AllocationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/AllocationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/AllocationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/AllocationStage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/AllocationStage.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/AllocationStage.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/AllocationStage.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/EconomyAllocationStage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/EconomyAllocationStage.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/EconomyAllocationStage.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/EconomyAllocationStage.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/EconomyPostAllocationOptimizationStage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/EconomyPostAllocationOptimizationStage.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/EconomyPostAllocationOptimizationStage.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/EconomyPostAllocationOptimizationStage.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/EconomyPreAllocationOptimizationStage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/EconomyPreAllocationOptimizationStage.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/EconomyPreAllocationOptimizationStage.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/EconomyPreAllocationOptimizationStage.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/GenericContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/GenericContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/GenericContext.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/GenericContext.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRPhaseSuite.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRPhaseSuite.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRPhaseSuite.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRPhaseSuite.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRSuites.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRSuites.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRSuites.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRSuites.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationStage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationStage.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationStage.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationStage.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationStage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationStage.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationStage.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationStage.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MethodProfilingPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MethodProfilingPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MethodProfilingPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MethodProfilingPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveProfiler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveProfiler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveProfiler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveProfiler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveProfilingPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveProfilingPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveProfilingPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveProfilingPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveType.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveType.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveType.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ssa/SSAUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ssa/SSAUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ssa/SSAUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ssa/SSAUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ssa/SSAVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ssa/SSAVerifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ssa/SSAVerifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ssa/SSAVerifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/FixPointIntervalBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/FixPointIntervalBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/FixPointIntervalBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/FixPointIntervalBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/LSStackSlotAllocator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/LSStackSlotAllocator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/LSStackSlotAllocator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/LSStackSlotAllocator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/SimpleStackSlotAllocator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/SimpleStackSlotAllocator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/SimpleStackSlotAllocator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/SimpleStackSlotAllocator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackInterval.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackInterval.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackInterval.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackInterval.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackIntervalDumper.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackIntervalDumper.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackIntervalDumper.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackIntervalDumper.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/GenericValueMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/GenericValueMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/GenericValueMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/GenericValueMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/IndexedValueMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/IndexedValueMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/IndexedValueMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/IndexedValueMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/RegisterMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/RegisterMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/RegisterMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/RegisterMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/ValueMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/ValueMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/ValueMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/ValueMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/ValueSet.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/ValueSet.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/ValueSet.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/ValueSet.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/VariableVirtualStackValueMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/VariableVirtualStackValueMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/VariableVirtualStackValueMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/util/VariableVirtualStackValueMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ContextlessLoopPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ContextlessLoopPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ContextlessLoopPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ContextlessLoopPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopFullUnrollPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopFullUnrollPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopFullUnrollPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopFullUnrollPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPartialUnrollPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPartialUnrollPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPartialUnrollPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPartialUnrollPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopSafepointEliminationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopSafepointEliminationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopSafepointEliminationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopSafepointEliminationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopUnswitchingPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopUnswitchingPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopUnswitchingPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopUnswitchingPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ReassociateInvariantPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ReassociateInvariantPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ReassociateInvariantPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ReassociateInvariantPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopsDataTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopsDataTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopsDataTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopsDataTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/BasicInductionVariable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/BasicInductionVariable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/BasicInductionVariable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/BasicInductionVariable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DefaultLoopPolicies.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DefaultLoopPolicies.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DefaultLoopPolicies.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DefaultLoopPolicies.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedConvertedInductionVariable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedConvertedInductionVariable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedConvertedInductionVariable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedConvertedInductionVariable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedInductionVariable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedInductionVariable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedInductionVariable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedInductionVariable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedOffsetInductionVariable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedOffsetInductionVariable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedOffsetInductionVariable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedOffsetInductionVariable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedScaledInductionVariable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedScaledInductionVariable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedScaledInductionVariable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedScaledInductionVariable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/InductionVariable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/InductionVariable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/InductionVariable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/InductionVariable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopEx.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopEx.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopEx.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopEx.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragment.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragment.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragment.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragment.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInsideBefore.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInsideBefore.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInsideBefore.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInsideBefore.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInsideFrom.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInsideFrom.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInsideFrom.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInsideFrom.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentWhole.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentWhole.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentWhole.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentWhole.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopPolicies.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopPolicies.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopPolicies.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopPolicies.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopsData.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopsData.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopsData.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopsData.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/ConditionalEliminationBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/ConditionalEliminationBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/ConditionalEliminationBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/ConditionalEliminationBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraphCopyBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraphCopyBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraphCopyBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraphCopyBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/NodeBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/NodeBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/NodeBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/NodeBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/TestJMHWhitebox.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/TestJMHWhitebox.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/TestJMHWhitebox.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/TestJMHWhitebox.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/MethodSpec.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/MethodSpec.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/MethodSpec.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/MethodSpec.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/NodesState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/NodesState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/NodesState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/NodesState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/ScheduleState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/ScheduleState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/ScheduleState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/ScheduleState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/CompileTimeBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/CompileTimeBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/CompileTimeBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/CompileTimeBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/ControlFlowGraphState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/ControlFlowGraphState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/ControlFlowGraphState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/ControlFlowGraphState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/TraceBuilderBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/TraceBuilderBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/TraceBuilderBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/TraceBuilderBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/TraceLSRAIntervalBuildingBench.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/TraceLSRAIntervalBuildingBench.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/TraceLSRAIntervalBuildingBench.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/trace/TraceLSRAIntervalBuildingBench.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/META-INF/services/javax.annotation.processing.Processor b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/META-INF/services/javax.annotation.processing.Processor rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/META-INF/services/javax.annotation.processing.Processor diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/ElementException.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/ElementException.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/ElementException.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/ElementException.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeProcessor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeProcessor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeProcessor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeVerifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeVerifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeVerifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/InputType.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/InputType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/InputType.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/InputType.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/NodeCycles.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/NodeCycles.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/NodeCycles.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/NodeCycles.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/NodeInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/NodeInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/NodeInfo.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/NodeInfo.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/NodeSize.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/NodeSize.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/NodeSize.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/NodeSize.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/StructuralInput.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/StructuralInput.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/StructuralInput.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/StructuralInput.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/Verbosity.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/Verbosity.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/Verbosity.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/Verbosity.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/AbstractObjectStampTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/AbstractObjectStampTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/AbstractObjectStampTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/AbstractObjectStampTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/AddNodeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/AddNodeTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/AddNodeTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/AddNodeTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IntegerStampTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IntegerStampTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IntegerStampTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IntegerStampTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/LoopLivenessTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/LoopLivenessTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/LoopLivenessTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/LoopLivenessTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/LoopPhiCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/LoopPhiCanonicalizerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/LoopPhiCanonicalizerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/LoopPhiCanonicalizerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/NegateNodeCanonicalizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/NegateNodeCanonicalizationTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/NegateNodeCanonicalizationTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/NegateNodeCanonicalizationTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ObjectStampJoinTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ObjectStampJoinTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ObjectStampJoinTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ObjectStampJoinTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ObjectStampMeetTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ObjectStampMeetTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ObjectStampMeetTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ObjectStampMeetTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ObjectStampTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ObjectStampTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ObjectStampTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ObjectStampTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampDoubleToLongTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampDoubleToLongTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampDoubleToLongTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampDoubleToLongTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampFloatToIntTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampFloatToIntTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampFloatToIntTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampFloatToIntTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampIntToFloatTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampIntToFloatTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampIntToFloatTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampIntToFloatTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampLongToDoubleTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampLongToDoubleTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampLongToDoubleTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampLongToDoubleTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/StaticFieldAccessTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/StaticFieldAccessTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/StaticFieldAccessTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/StaticFieldAccessTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractBeginNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractBeginNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractBeginNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractBeginNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractDeoptimizeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractDeoptimizeNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractDeoptimizeNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractDeoptimizeNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractEndNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractEndNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractEndNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractEndNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractLocalNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractLocalNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractLocalNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractLocalNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractMergeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractMergeNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractMergeNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractMergeNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractStateSplit.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractStateSplit.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractStateSplit.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractStateSplit.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ArithmeticOperation.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ArithmeticOperation.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ArithmeticOperation.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ArithmeticOperation.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BeginNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BeginNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BeginNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BeginNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BeginStateSplitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BeginStateSplitNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BeginStateSplitNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BeginStateSplitNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BinaryOpLogicNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BinaryOpLogicNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BinaryOpLogicNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BinaryOpLogicNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BreakpointNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BreakpointNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BreakpointNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/BreakpointNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CallTargetNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CallTargetNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CallTargetNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CallTargetNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Cancellable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Cancellable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Cancellable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Cancellable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CanonicalizableLocation.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CanonicalizableLocation.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CanonicalizableLocation.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CanonicalizableLocation.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CompressionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CompressionNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CompressionNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CompressionNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ConditionAnchorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ConditionAnchorNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ConditionAnchorNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ConditionAnchorNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ConstantNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ConstantNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ConstantNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ConstantNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ControlSinkNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ControlSinkNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ControlSinkNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ControlSinkNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ControlSplitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ControlSplitNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ControlSplitNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ControlSplitNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizeNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizeNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizeNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingFixedWithNextNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingFixedWithNextNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingFixedWithNextNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingFixedWithNextNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingGuard.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingGuard.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingGuard.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingGuard.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DirectCallTargetNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DirectCallTargetNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DirectCallTargetNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DirectCallTargetNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DynamicDeoptimizeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DynamicDeoptimizeNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DynamicDeoptimizeNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DynamicDeoptimizeNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DynamicPiNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DynamicPiNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DynamicPiNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DynamicPiNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EncodedGraph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EncodedGraph.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EncodedGraph.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EncodedGraph.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EndNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EndNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EndNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EndNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EntryMarkerNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EntryMarkerNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EntryMarkerNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EntryMarkerNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EntryProxyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EntryProxyNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EntryProxyNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EntryProxyNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FieldLocationIdentity.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FieldLocationIdentity.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FieldLocationIdentity.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FieldLocationIdentity.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedGuardNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedGuardNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedGuardNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedGuardNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNodeInterface.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNodeInterface.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNodeInterface.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNodeInterface.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedWithNextNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedWithNextNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedWithNextNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedWithNextNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FloatingAnchoredNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FloatingAnchoredNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FloatingAnchoredNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FloatingAnchoredNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FloatingGuardedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FloatingGuardedNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FloatingGuardedNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FloatingGuardedNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FullInfopointNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FullInfopointNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FullInfopointNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FullInfopointNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardPhiNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardPhiNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardPhiNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardPhiNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardProxyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardProxyNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardProxyNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardProxyNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardedValueNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardedValueNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardedValueNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardedValueNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IndirectCallTargetNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IndirectCallTargetNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IndirectCallTargetNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IndirectCallTargetNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invoke.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invoke.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invoke.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invoke.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicConstantNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicConstantNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicConstantNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicConstantNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNegationNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNegationNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNegationNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNegationNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopEndNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopEndNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopEndNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopEndNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopExitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopExitNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopExitNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopExitNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoweredCallTargetNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoweredCallTargetNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoweredCallTargetNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoweredCallTargetNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MergeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MergeNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MergeNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MergeNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/NamedLocationIdentity.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/NamedLocationIdentity.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/NamedLocationIdentity.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/NamedLocationIdentity.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ParameterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ParameterNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ParameterNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ParameterNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PauseNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PauseNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PauseNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PauseNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PhiNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PhiNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PhiNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PhiNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiArrayNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiArrayNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiArrayNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PrefetchAllocateNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PrefetchAllocateNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PrefetchAllocateNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PrefetchAllocateNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ProxyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ProxyNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ProxyNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ProxyNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ReturnNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ReturnNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ReturnNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ReturnNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SafepointNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SafepointNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SafepointNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SafepointNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SnippetAnchorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SnippetAnchorNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SnippetAnchorNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SnippetAnchorNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StartNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StartNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StartNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StartNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StateSplit.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StateSplit.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StateSplit.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StateSplit.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/TypeCheckHints.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/TypeCheckHints.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/TypeCheckHints.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/TypeCheckHints.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnaryOpLogicNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnaryOpLogicNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnaryOpLogicNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnaryOpLogicNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnwindNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnwindNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnwindNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnwindNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNodeInterface.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNodeInterface.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNodeInterface.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNodeInterface.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNodeUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNodeUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNodeUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNodeUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValuePhiNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValuePhiNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValuePhiNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValuePhiNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueProxyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueProxyNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueProxyNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueProxyNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/VirtualState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/VirtualState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/VirtualState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/VirtualState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AbsNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AbsNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AbsNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AbsNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AddNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AddNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AddNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AddNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AndNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AndNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AndNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AndNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/CompareNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/CompareNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/CompareNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/CompareNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ConditionalNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ConditionalNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ConditionalNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ConditionalNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ConvertNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ConvertNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ConvertNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ConvertNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/DivNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/DivNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/DivNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/DivNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FixedBinaryNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FixedBinaryNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FixedBinaryNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FixedBinaryNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatConvertNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatConvertNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatConvertNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatConvertNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatEqualsNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatEqualsNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatEqualsNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatEqualsNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatLessThanNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatLessThanNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatLessThanNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatLessThanNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatingNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatingNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatingNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatingNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerBelowNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerBelowNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerBelowNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerBelowNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerConvertNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerConvertNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerConvertNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerConvertNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerEqualsNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerEqualsNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerEqualsNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerEqualsNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerLessThanNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerLessThanNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerLessThanNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerLessThanNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerLowerThanNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerLowerThanNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerLowerThanNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerLowerThanNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerTestNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerTestNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerTestNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerTestNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IsNullNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IsNullNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IsNullNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IsNullNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/LeftShiftNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/LeftShiftNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/LeftShiftNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/LeftShiftNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/MulNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/MulNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/MulNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/MulNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NarrowNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NarrowNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NarrowNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NarrowNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NarrowableArithmeticNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NarrowableArithmeticNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NarrowableArithmeticNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NarrowableArithmeticNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NegateNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NegateNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NegateNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NegateNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NormalizeCompareNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NormalizeCompareNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NormalizeCompareNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NormalizeCompareNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NotNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NotNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NotNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NotNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ObjectEqualsNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ObjectEqualsNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ObjectEqualsNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ObjectEqualsNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/OrNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/OrNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/OrNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/OrNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/PointerEqualsNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/PointerEqualsNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/PointerEqualsNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/PointerEqualsNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ReinterpretNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ReinterpretNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ReinterpretNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ReinterpretNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RemNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RemNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RemNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RemNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ShiftNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ShiftNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ShiftNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ShiftNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignExtendNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignExtendNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignExtendNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignExtendNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SqrtNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SqrtNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SqrtNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SqrtNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SubNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SubNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SubNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SubNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnaryArithmeticNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnaryArithmeticNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnaryArithmeticNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnaryArithmeticNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnaryNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnaryNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnaryNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnaryNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedDivNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedDivNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedDivNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedDivNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRemNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRemNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRemNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRemNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/XorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/XorNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/XorNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/XorNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ZeroExtendNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ZeroExtendNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ZeroExtendNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ZeroExtendNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/HIRLoop.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/HIRLoop.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/HIRLoop.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/HIRLoop.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/LocationSet.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/LocationSet.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/LocationSet.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/LocationSet.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/BindToRegisterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/BindToRegisterNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/BindToRegisterNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/BindToRegisterNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/BlackholeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/BlackholeNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/BlackholeNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/BlackholeNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchorNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchorNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchorNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchored.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchored.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchored.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchored.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/DynamicCounterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/DynamicCounterNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/DynamicCounterNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/DynamicCounterNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/OpaqueNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/OpaqueNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/OpaqueNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/OpaqueNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/SpillRegistersNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/SpillRegistersNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/SpillRegistersNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/SpillRegistersNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/VerifyHeapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/VerifyHeapNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/VerifyHeapNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/VerifyHeapNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/WeakCounterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/WeakCounterNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/WeakCounterNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/WeakCounterNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/AnchoringNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/AnchoringNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/AnchoringNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/AnchoringNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ArrayRangeWriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ArrayRangeWriteNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ArrayRangeWriteNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ArrayRangeWriteNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BranchProbabilityNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BranchProbabilityNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BranchProbabilityNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BranchProbabilityNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/FixedValueAnchorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/FixedValueAnchorNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/FixedValueAnchorNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/FixedValueAnchorNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GetClassNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GetClassNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GetClassNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GetClassNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GuardedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GuardedNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GuardedNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GuardedNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GuardedUnsafeLoadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GuardedUnsafeLoadNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GuardedUnsafeLoadNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GuardedUnsafeLoadNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GuardingNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GuardingNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GuardingNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GuardingNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/IntegerSwitchNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/IntegerSwitchNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/IntegerSwitchNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/IntegerSwitchNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadMethodNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadMethodNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadMethodNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadMethodNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MembarNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MembarNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MembarNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MembarNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MonitorEnter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MonitorEnter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MonitorEnter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MonitorEnter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MonitorExit.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MonitorExit.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MonitorExit.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MonitorExit.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/NullCheckNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/NullCheckNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/NullCheckNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/NullCheckNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRLocalNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRLocalNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRLocalNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRLocalNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRLockNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRLockNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRLockNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRLockNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRMonitorEnterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRMonitorEnterNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRMonitorEnterNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRMonitorEnterNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRStartNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRStartNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRStartNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRStartNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StateSplitProxyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StateSplitProxyNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StateSplitProxyNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StateSplitProxyNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StoreHubNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StoreHubNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StoreHubNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StoreHubNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/SwitchNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/SwitchNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/SwitchNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/SwitchNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnboxNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnboxNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnboxNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnboxNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeCopyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeCopyNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeCopyNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeCopyNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryLoadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryLoadNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryLoadNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryLoadNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ValueAnchorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ValueAnchorNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ValueAnchorNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ValueAnchorNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ClassInitializationPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ClassInitializationPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ClassInitializationPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ClassInitializationPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InlineInvokePlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InlineInvokePlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InlineInvokePlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InlineInvokePlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/IntrinsicContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/IntrinsicContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/IntrinsicContext.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/IntrinsicContext.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/LoopExplosionPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/LoopExplosionPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/LoopExplosionPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/LoopExplosionPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/MethodSubstitutionPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/MethodSubstitutionPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/MethodSubstitutionPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/MethodSubstitutionPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodeIntrinsicPluginFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodeIntrinsicPluginFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodeIntrinsicPluginFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodeIntrinsicPluginFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ParameterPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ParameterPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ParameterPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ParameterPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ProfilingPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ProfilingPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ProfilingPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ProfilingPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/TypePlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/TypePlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/TypePlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/TypePlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewObjectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewObjectNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewObjectNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewObjectNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessArrayNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessArrayNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessArrayNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessFieldNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessFieldNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessFieldNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessFieldNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessMonitorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessMonitorNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessMonitorNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessMonitorNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/FinalFieldBarrierNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/FinalFieldBarrierNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/FinalFieldBarrierNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/FinalFieldBarrierNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ForeignCallDescriptors.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ForeignCallDescriptors.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ForeignCallDescriptors.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ForeignCallDescriptors.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfDynamicNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfDynamicNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfDynamicNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfDynamicNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadFieldNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadFieldNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadFieldNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadFieldNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LogicCompareAndSwapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LogicCompareAndSwapNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LogicCompareAndSwapNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LogicCompareAndSwapNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MethodCallTargetNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MethodCallTargetNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MethodCallTargetNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MethodCallTargetNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorIdNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorIdNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorIdNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorIdNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RawMonitorEnterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RawMonitorEnterNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RawMonitorEnterNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RawMonitorEnterNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RegisterFinalizerNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RegisterFinalizerNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RegisterFinalizerNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RegisterFinalizerNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreFieldNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreFieldNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreFieldNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreFieldNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/TypeSwitchNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/TypeSwitchNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/TypeSwitchNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/TypeSwitchNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndSwapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndSwapNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndSwapNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndSwapNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ValueCompareAndSwapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ValueCompareAndSwapNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ValueCompareAndSwapNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ValueCompareAndSwapNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/AbstractMemoryCheckpoint.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/AbstractMemoryCheckpoint.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/AbstractMemoryCheckpoint.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/AbstractMemoryCheckpoint.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/AbstractWriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/AbstractWriteNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/AbstractWriteNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/AbstractWriteNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/Access.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/Access.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/Access.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/Access.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FixedAccessNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FixedAccessNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FixedAccessNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FixedAccessNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FloatableAccessNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FloatableAccessNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FloatableAccessNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FloatableAccessNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FloatingAccessNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FloatingAccessNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FloatingAccessNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FloatingAccessNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FloatingReadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FloatingReadNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FloatingReadNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FloatingReadNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/HeapAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/HeapAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/HeapAccess.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/HeapAccess.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/LIRLowerableAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/LIRLowerableAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/LIRLowerableAccess.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/LIRLowerableAccess.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryAccess.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryAccess.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryAnchorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryAnchorNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryAnchorNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryAnchorNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryCheckpoint.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryCheckpoint.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryCheckpoint.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryCheckpoint.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryMapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryMapNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryMapNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryMapNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryPhiNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryPhiNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryPhiNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryPhiNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/ReadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/ReadNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/ReadNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/ReadNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/WriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/WriteNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/WriteNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/WriteNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/AddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/AddressNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/AddressNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/AddressNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/OffsetAddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/OffsetAddressNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/OffsetAddressNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/OffsetAddressNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/RawAddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/RawAddressNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/RawAddressNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/RawAddressNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ArithmeticLIRLowerable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ArithmeticLIRLowerable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ArithmeticLIRLowerable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ArithmeticLIRLowerable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ArrayLengthProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ArrayLengthProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ArrayLengthProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ArrayLengthProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LIRLowerable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LIRLowerable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LIRLowerable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LIRLowerable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LimitedValueProxy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LimitedValueProxy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LimitedValueProxy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LimitedValueProxy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Lowerable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Lowerable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Lowerable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Lowerable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/MemoryProxy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/MemoryProxy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/MemoryProxy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/MemoryProxy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeValueMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeValueMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeValueMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeValueMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeWithState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeWithState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeWithState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeWithState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Proxy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Proxy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Proxy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Proxy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/StampInverter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/StampInverter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/StampInverter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/StampInverter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/StampProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/StampProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/StampProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/StampProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/UncheckedInterfaceProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/UncheckedInterfaceProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/UncheckedInterfaceProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/UncheckedInterfaceProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ValueProxy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ValueProxy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ValueProxy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/ValueProxy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Virtualizable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Virtualizable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Virtualizable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Virtualizable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/VirtualizableAllocation.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/VirtualizableAllocation.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/VirtualizableAllocation.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/VirtualizableAllocation.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/VirtualizerTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/VirtualizerTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/VirtualizerTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/VirtualizerTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/type/NarrowOopStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/type/NarrowOopStamp.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/type/NarrowOopStamp.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/type/NarrowOopStamp.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/type/StampTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/type/StampTool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/type/StampTool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/type/StampTool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/ConstantFoldUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/ConstantFoldUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/ConstantFoldUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/ConstantFoldUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/CommitAllocationNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/CommitAllocationNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/CommitAllocationNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/CommitAllocationNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EnsureVirtualizedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EnsureVirtualizedNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EnsureVirtualizedNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EnsureVirtualizedNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EscapeObjectState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EscapeObjectState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EscapeObjectState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EscapeObjectState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/LockState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/LockState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/LockState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/LockState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualObjectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualObjectNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualObjectNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualObjectNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/META-INF/services/javax.annotation.processing.Processor b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/META-INF/services/javax.annotation.processing.Processor rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/META-INF/services/javax.annotation.processing.Processor diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.test/src/org/graalvm/compiler/options/test/NestedBooleanOptionKeyTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.test/src/org/graalvm/compiler/options/test/NestedBooleanOptionKeyTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.test/src/org/graalvm/compiler/options/test/NestedBooleanOptionKeyTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.test/src/org/graalvm/compiler/options/test/NestedBooleanOptionKeyTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.test/src/org/graalvm/compiler/options/test/TestOptionKey.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.test/src/org/graalvm/compiler/options/test/TestOptionKey.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.test/src/org/graalvm/compiler/options/test/TestOptionKey.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.test/src/org/graalvm/compiler/options/test/TestOptionKey.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/EnumOptionKey.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/EnumOptionKey.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/EnumOptionKey.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/EnumOptionKey.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/ModifiableOptionValues.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/ModifiableOptionValues.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/ModifiableOptionValues.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/ModifiableOptionValues.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/NestedBooleanOptionKey.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/NestedBooleanOptionKey.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/NestedBooleanOptionKey.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/NestedBooleanOptionKey.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/Option.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/Option.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/Option.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/Option.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionDescriptor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionDescriptor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionDescriptor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionDescriptor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionDescriptors.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionDescriptors.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionDescriptors.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionDescriptors.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionKey.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionKey.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionKey.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionKey.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionType.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionType.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionType.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionValues.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionValues.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionValues.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionValues.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionValuesAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionValuesAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionValuesAccess.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionValuesAccess.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common.test/src/org/graalvm/compiler/phases/common/test/StampFactoryTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common.test/src/org/graalvm/compiler/phases/common/test/StampFactoryTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common.test/src/org/graalvm/compiler/phases/common/test/StampFactoryTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common.test/src/org/graalvm/compiler/phases/common/test/StampFactoryTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/AbstractInliningPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/AbstractInliningPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/AbstractInliningPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/AbstractInliningPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/AddressLoweringByUsePhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/AddressLoweringByUsePhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/AddressLoweringByUsePhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/AddressLoweringByUsePhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/AddressLoweringPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/AddressLoweringPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/AddressLoweringPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/AddressLoweringPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/DeadCodeEliminationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/DeadCodeEliminationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/DeadCodeEliminationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/DeadCodeEliminationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/DeoptimizationGroupingPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/DeoptimizationGroupingPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/DeoptimizationGroupingPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/DeoptimizationGroupingPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ExpandLogicPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ExpandLogicPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ExpandLogicPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ExpandLogicPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FrameStateAssignmentPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FrameStateAssignmentPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FrameStateAssignmentPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FrameStateAssignmentPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/IncrementalCanonicalizerPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/IncrementalCanonicalizerPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/IncrementalCanonicalizerPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/IncrementalCanonicalizerPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/IterativeConditionalEliminationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/IterativeConditionalEliminationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/IterativeConditionalEliminationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/IterativeConditionalEliminationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LazyValue.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LazyValue.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LazyValue.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LazyValue.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LockEliminationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LockEliminationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LockEliminationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LockEliminationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoopSafepointInsertionPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoopSafepointInsertionPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoopSafepointInsertionPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoopSafepointInsertionPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/NonNullParametersPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/NonNullParametersPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/NonNullParametersPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/NonNullParametersPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/PropagateDeoptimizeProbabilityPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/PropagateDeoptimizeProbabilityPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/PropagateDeoptimizeProbabilityPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/PropagateDeoptimizeProbabilityPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/UseTrappingNullChecksPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/UseTrappingNullChecksPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/UseTrappingNullChecksPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/UseTrappingNullChecksPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/VerifyHeapAtReturnPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/VerifyHeapAtReturnPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/VerifyHeapAtReturnPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/VerifyHeapAtReturnPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/AbstractInlineInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/AbstractInlineInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/AbstractInlineInfo.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/AbstractInlineInfo.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/AssumptionInlineInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/AssumptionInlineInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/AssumptionInlineInfo.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/AssumptionInlineInfo.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/ExactInlineInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/ExactInlineInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/ExactInlineInfo.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/ExactInlineInfo.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/InlineInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/InlineInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/InlineInfo.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/InlineInfo.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/Inlineable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/Inlineable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/Inlineable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/Inlineable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/AbstractInliningPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/AbstractInliningPolicy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/AbstractInliningPolicy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/AbstractInliningPolicy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InliningPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InliningPolicy.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InliningPolicy.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InliningPolicy.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/MethodInvocation.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/MethodInvocation.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/MethodInvocation.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/MethodInvocation.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/util/HashSetNodeEventListener.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/util/HashSetNodeEventListener.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/util/HashSetNodeEventListener.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/util/HashSetNodeEventListener.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/BasePhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/BasePhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/BasePhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/BasePhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/ClassTypeSequence.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/ClassTypeSequence.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/ClassTypeSequence.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/ClassTypeSequence.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/LazyName.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/LazyName.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/LazyName.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/LazyName.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/OptimisticOptimizations.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/OptimisticOptimizations.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/OptimisticOptimizations.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/OptimisticOptimizations.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/Phase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/Phase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/Phase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/Phase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/PhaseSuite.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/PhaseSuite.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/PhaseSuite.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/PhaseSuite.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/VerifyPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/VerifyPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/VerifyPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/VerifyPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/PhaseSizeContract.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/PhaseSizeContract.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/PhaseSizeContract.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/PhaseSizeContract.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/VerifyNodeCosts.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/VerifyNodeCosts.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/VerifyNodeCosts.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/VerifyNodeCosts.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/FixedNodeProbabilityCache.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/FixedNodeProbabilityCache.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/FixedNodeProbabilityCache.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/FixedNodeProbabilityCache.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/InferStamps.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/InferStamps.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/InferStamps.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/InferStamps.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/MergeableState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/MergeableState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/MergeableState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/MergeableState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/PostOrderNodeIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/PostOrderNodeIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/PostOrderNodeIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/PostOrderNodeIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ReentrantBlockIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ReentrantBlockIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ReentrantBlockIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ReentrantBlockIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ReentrantNodeIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ReentrantNodeIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ReentrantNodeIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ReentrantNodeIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ScheduledNodeIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ScheduledNodeIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ScheduledNodeIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ScheduledNodeIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ScopedPostOrderNodeIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ScopedPostOrderNodeIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ScopedPostOrderNodeIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ScopedPostOrderNodeIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/SinglePassNodeIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/SinglePassNodeIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/SinglePassNodeIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/SinglePassNodeIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/StatelessPostOrderNodeIterator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/StatelessPostOrderNodeIterator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/StatelessPostOrderNodeIterator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/StatelessPostOrderNodeIterator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/package-info.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/package-info.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/package-info.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/package-info.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/package-info.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/package-info.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/package-info.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/package-info.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/BlockClosure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/BlockClosure.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/BlockClosure.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/BlockClosure.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/MemoryScheduleVerification.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/MemoryScheduleVerification.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/MemoryScheduleVerification.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/MemoryScheduleVerification.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/CompilerConfiguration.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/CompilerConfiguration.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/CompilerConfiguration.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/CompilerConfiguration.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/HighTierContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/HighTierContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/HighTierContext.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/HighTierContext.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/LowTierContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/LowTierContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/LowTierContext.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/LowTierContext.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/MidTierContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/MidTierContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/MidTierContext.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/MidTierContext.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/PhaseContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/PhaseContext.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/PhaseContext.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/PhaseContext.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/Suites.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/Suites.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/Suites.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/Suites.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/SuitesCreator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/SuitesCreator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/SuitesCreator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/SuitesCreator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/SuitesProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/SuitesProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/SuitesProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/SuitesProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/TargetProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/TargetProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/TargetProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/TargetProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/BlockWorkList.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/BlockWorkList.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/BlockWorkList.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/BlockWorkList.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/MethodDebugValueName.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/MethodDebugValueName.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/MethodDebugValueName.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/MethodDebugValueName.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/Providers.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/Providers.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/Providers.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/Providers.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/ValueMergeUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/ValueMergeUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/ValueMergeUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/ValueMergeUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyBailoutUsage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyBailoutUsage.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyBailoutUsage.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyBailoutUsage.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyCallerSensitiveMethods.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyCallerSensitiveMethods.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyCallerSensitiveMethods.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyCallerSensitiveMethods.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyDebugUsage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyDebugUsage.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyDebugUsage.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyDebugUsage.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyInstanceOfUsage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyInstanceOfUsage.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyInstanceOfUsage.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyInstanceOfUsage.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyUpdateUsages.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyUpdateUsages.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyUpdateUsages.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyUpdateUsages.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyUsageWithEquals.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyUsageWithEquals.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyUsageWithEquals.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyUsageWithEquals.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyVirtualizableUsage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyVirtualizableUsage.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyVirtualizableUsage.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/verify/VerifyVirtualizableUsage.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BasicIdealGraphPrinter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BasicIdealGraphPrinter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BasicIdealGraphPrinter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BasicIdealGraphPrinter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinterObserver.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinterObserver.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinterObserver.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinterObserver.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CanonicalStringGraphPrinter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CanonicalStringGraphPrinter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CanonicalStringGraphPrinter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CanonicalStringGraphPrinter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CompilationPrinter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CompilationPrinter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CompilationPrinter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CompilationPrinter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinterDumpHandler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinterDumpHandler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinterDumpHandler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinterDumpHandler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/IdealGraphPrinter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/IdealGraphPrinter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/IdealGraphPrinter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/IdealGraphPrinter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/NoDeadCodeVerifyHandler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/NoDeadCodeVerifyHandler.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/NoDeadCodeVerifyHandler.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/NoDeadCodeVerifyHandler.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64CountLeadingZerosNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64CountLeadingZerosNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64CountLeadingZerosNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64CountLeadingZerosNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64CountTrailingZerosNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64CountTrailingZerosNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64CountTrailingZerosNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64CountTrailingZerosNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64FloatArithmeticSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64FloatArithmeticSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64FloatArithmeticSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64FloatArithmeticSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64LongSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64LongSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64LongSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64LongSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64ReadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64ReadNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64ReadNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64ReadNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64ReadReplacementPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64ReadReplacementPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64ReadReplacementPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64ReadReplacementPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ConvertSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ConvertSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ConvertSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ConvertSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountLeadingZerosNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountLeadingZerosNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountLeadingZerosNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountLeadingZerosNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountTrailingZerosNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountTrailingZerosNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountTrailingZerosNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountTrailingZerosNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64FloatConvertNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64FloatConvertNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64FloatConvertNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64FloatConvertNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64MathSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64MathSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64MathSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64MathSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64RoundNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64RoundNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64RoundNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64RoundNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringIndexOfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringIndexOfNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringIndexOfNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringIndexOfNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.sparc/src/org/graalvm/compiler/replacements/sparc/SPARCGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.sparc/src/org/graalvm/compiler/replacements/sparc/SPARCGraphBuilderPlugins.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.sparc/src/org/graalvm/compiler/replacements/sparc/SPARCGraphBuilderPlugins.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.sparc/src/org/graalvm/compiler/replacements/sparc/SPARCGraphBuilderPlugins.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BytecodeExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BytecodeExceptionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BytecodeExceptionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BytecodeExceptionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ClassCastBytecodeExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ClassCastBytecodeExceptionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ClassCastBytecodeExceptionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ClassCastBytecodeExceptionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/CompiledExceptionHandlerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/CompiledExceptionHandlerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/CompiledExceptionHandlerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/CompiledExceptionHandlerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/CompiledNullPointerExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/CompiledNullPointerExceptionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/CompiledNullPointerExceptionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/CompiledNullPointerExceptionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnExceptionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnExceptionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnExceptionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnVolatileReadTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnVolatileReadTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnVolatileReadTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnVolatileReadTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DerivedOopTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DerivedOopTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DerivedOopTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DerivedOopTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DynamicNewArrayTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DynamicNewArrayTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DynamicNewArrayTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DynamicNewArrayTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/FloatArraysEqualsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/FloatArraysEqualsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/FloatArraysEqualsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/FloatArraysEqualsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/FoldTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/FoldTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/FoldTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/FoldTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IndexOobBytecodeExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IndexOobBytecodeExceptionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IndexOobBytecodeExceptionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IndexOobBytecodeExceptionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/InstanceOfDynamicTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/InstanceOfDynamicTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/InstanceOfDynamicTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/InstanceOfDynamicTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/InstanceOfTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/InstanceOfTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/InstanceOfTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/InstanceOfTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerSubOverflowsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerSubOverflowsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerSubOverflowsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerSubOverflowsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/InvokeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/InvokeTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/InvokeTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/InvokeTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MonitorTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MonitorTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MonitorTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MonitorTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NewArrayTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NewArrayTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NewArrayTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NewArrayTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NewInstanceTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NewInstanceTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NewInstanceTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NewInstanceTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NewMultiArrayTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NewMultiArrayTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NewMultiArrayTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NewMultiArrayTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NullBytecodeExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NullBytecodeExceptionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NullBytecodeExceptionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/NullBytecodeExceptionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ObjectAccessTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ObjectAccessTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ObjectAccessTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ObjectAccessTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTrackingTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTrackingTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTrackingTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTrackingTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SnippetsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SnippetsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SnippetsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SnippetsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringEqualsConstantTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringEqualsConstantTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringEqualsConstantTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringEqualsConstantTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringHashConstantTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringHashConstantTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringHashConstantTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringHashConstantTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfConstantTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfConstantTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfConstantTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfConstantTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SubstitutionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SubstitutionsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SubstitutionsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SubstitutionsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/TypeCheckTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/TypeCheckTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/TypeCheckTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/TypeCheckTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsafeBooleanAccessTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsafeBooleanAccessTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsafeBooleanAccessTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsafeBooleanAccessTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsafeSubstitutionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsafeSubstitutionsTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsafeSubstitutionsTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsafeSubstitutionsTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsignedIntegerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsignedIntegerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsignedIntegerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsignedIntegerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsignedMathTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsignedMathTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsignedMathTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsignedMathTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnwindExceptionToCallerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnwindExceptionToCallerTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnwindExceptionToCallerTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnwindExceptionToCallerTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/WordTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/WordTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/WordTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/WordTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/RedefineIntrinsicTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/RedefineIntrinsicTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/RedefineIntrinsicTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/RedefineIntrinsicTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/META-INF/services/javax.annotation.processing.Processor b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/META-INF/services/javax.annotation.processing.Processor rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/META-INF/services/javax.annotation.processing.Processor diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/APHotSpotSignature.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/APHotSpotSignature.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/APHotSpotSignature.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/APHotSpotSignature.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/AbstractVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/AbstractVerifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/AbstractVerifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/AbstractVerifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/ClassSubstitutionVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/ClassSubstitutionVerifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/ClassSubstitutionVerifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/ClassSubstitutionVerifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/FoldVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/FoldVerifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/FoldVerifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/FoldVerifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedFoldPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedFoldPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedFoldPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedFoldPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedNodeIntrinsicPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedNodeIntrinsicPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedNodeIntrinsicPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedNodeIntrinsicPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/InjectedDependencies.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/InjectedDependencies.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/InjectedDependencies.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/InjectedDependencies.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/MethodSubstitutionVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/MethodSubstitutionVerifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/MethodSubstitutionVerifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/MethodSubstitutionVerifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/NodeIntrinsicVerifier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/NodeIntrinsicVerifier.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/NodeIntrinsicVerifier.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/NodeIntrinsicVerifier.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/PluginGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/PluginGenerator.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/PluginGenerator.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/PluginGenerator.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/VerifierAnnotationProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/VerifierAnnotationProcessor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/VerifierAnnotationProcessor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/VerifierAnnotationProcessor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ArraySubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ArraySubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ArraySubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ArraySubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ArraysSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ArraysSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ArraysSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ArraysSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/BoxingSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/BoxingSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/BoxingSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/BoxingSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantBindingParameterPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantBindingParameterPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantBindingParameterPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantBindingParameterPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantStringIndexOfSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantStringIndexOfSnippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantStringIndexOfSnippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantStringIndexOfSnippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InlineDuringParsingPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InlineDuringParsingPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InlineDuringParsingPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InlineDuringParsingPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InstanceOfSnippetsTemplates.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InstanceOfSnippetsTemplates.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InstanceOfSnippetsTemplates.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InstanceOfSnippetsTemplates.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntegerSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntegerSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntegerSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntegerSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/JavacBug.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/JavacBug.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/JavacBug.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/JavacBug.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/Log.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/Log.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/Log.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/Log.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/LongSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/LongSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/LongSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/LongSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/MethodHandlePlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/MethodHandlePlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/MethodHandlePlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/MethodHandlePlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/NodeIntrinsificationProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/NodeIntrinsificationProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/NodeIntrinsificationProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/NodeIntrinsificationProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetCounter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetCounter.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetCounter.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetCounter.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetCounterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetCounterNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetCounterNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetCounterNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetLowerableMemoryNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetLowerableMemoryNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetLowerableMemoryNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetLowerableMemoryNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/Snippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/Snippets.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/Snippets.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/Snippets.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringIndexOfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringIndexOfNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringIndexOfNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringIndexOfNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringSubstitutions.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringSubstitutions.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringSubstitutions.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/UnsafeAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/UnsafeAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/UnsafeAccess.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/UnsafeAccess.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstantPool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstantPool.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstantPool.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstantPool.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitCountNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitCountNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitCountNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitCountNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanForwardNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanForwardNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanForwardNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanForwardNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanReverseNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanReverseNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanReverseNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanReverseNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/CStringConstant.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/CStringConstant.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/CStringConstant.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/CStringConstant.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/DirectStoreNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/DirectStoreNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/DirectStoreNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/DirectStoreNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ExplodeLoopNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ExplodeLoopNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ExplodeLoopNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ExplodeLoopNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/LoadSnippetVarargParameterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/LoadSnippetVarargParameterNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/LoadSnippetVarargParameterNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/LoadSnippetVarargParameterNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReadRegisterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReadRegisterNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReadRegisterNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReadRegisterNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ResolvedMethodHandleCallTargetNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ResolvedMethodHandleCallTargetNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ResolvedMethodHandleCallTargetNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ResolvedMethodHandleCallTargetNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReverseBytesNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReverseBytesNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReverseBytesNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReverseBytesNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/WriteRegisterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/WriteRegisterNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/WriteRegisterNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/WriteRegisterNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulHighNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulHighNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulHighNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulHighNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/UnsignedMulHighNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/UnsignedMulHighNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/UnsignedMulHighNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/UnsignedMulHighNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.runtime/src/org/graalvm/compiler/runtime/RuntimeProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.runtime/src/org/graalvm/compiler/runtime/RuntimeProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.runtime/src/org/graalvm/compiler/runtime/RuntimeProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.runtime/src/org/graalvm/compiler/runtime/RuntimeProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider.processor/src/META-INF/services/javax.annotation.processing.Processor b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider.processor/src/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider.processor/src/META-INF/services/javax.annotation.processing.Processor rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider.processor/src/META-INF/services/javax.annotation.processing.Processor diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider.processor/src/org/graalvm/compiler/serviceprovider/processor/ServiceProviderProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider.processor/src/org/graalvm/compiler/serviceprovider/processor/ServiceProviderProcessor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider.processor/src/org/graalvm/compiler/serviceprovider/processor/ServiceProviderProcessor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider.processor/src/org/graalvm/compiler/serviceprovider/processor/ServiceProviderProcessor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalServices.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalServices.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalServices.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalServices.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/JDK9Method.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/JDK9Method.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/JDK9Method.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/JDK9Method.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/ServiceProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/ServiceProvider.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/ServiceProvider.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/ServiceProvider.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/AddExports.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/AddExports.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/AddExports.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/AddExports.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ExportingClassLoader.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ExportingClassLoader.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ExportingClassLoader.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ExportingClassLoader.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/JLModule.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/JLModule.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/JLModule.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/JLModule.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual.bench/.checkstyle.exclude b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual.bench/.checkstyle.exclude similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual.bench/.checkstyle.exclude rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual.bench/.checkstyle.exclude diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual.bench/src/org/graalvm/compiler/virtual/bench/PartialEscapeBench.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual.bench/src/org/graalvm/compiler/virtual/bench/PartialEscapeBench.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual.bench/src/org/graalvm/compiler/virtual/bench/PartialEscapeBench.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual.bench/src/org/graalvm/compiler/virtual/bench/PartialEscapeBench.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/MaterializedObjectState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/MaterializedObjectState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/MaterializedObjectState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/MaterializedObjectState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/VirtualObjectState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/VirtualObjectState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/VirtualObjectState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/VirtualObjectState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EarlyReadEliminationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EarlyReadEliminationPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EarlyReadEliminationPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EarlyReadEliminationPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectList.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectList.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectList.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectList.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsBlockState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsBlockState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsBlockState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsBlockState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsClosure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsClosure.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsClosure.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsClosure.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationBlockState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationBlockState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationBlockState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationBlockState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeBlockState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeBlockState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeBlockState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeBlockState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapePhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapePhase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapePhase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapePhase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationBlockState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationBlockState.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationBlockState.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationBlockState.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/VirtualUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/VirtualUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/VirtualUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/VirtualUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/VirtualizerToolImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/VirtualizerToolImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/VirtualizerToolImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/VirtualizerToolImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/BarrieredAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/BarrieredAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/BarrieredAccess.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/BarrieredAccess.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/ObjectAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/ObjectAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/ObjectAccess.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/ObjectAccess.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/UnsafeAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/UnsafeAccess.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/UnsafeAccess.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/UnsafeAccess.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordCastNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordCastNode.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordCastNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordCastNode.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordOperationPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordOperationPlugin.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordOperationPlugin.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordOperationPlugin.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordTypes.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordTypes.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordTypes.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordTypes.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/DefaultGraphBlocks.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/DefaultGraphBlocks.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/DefaultGraphBlocks.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/DefaultGraphBlocks.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/DefaultGraphTypes.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/DefaultGraphTypes.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/DefaultGraphTypes.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/DefaultGraphTypes.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphBlocks.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphBlocks.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphBlocks.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphBlocks.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphElements.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphElements.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphElements.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphElements.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphOutput.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphOutput.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphOutput.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphOutput.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphStructure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphStructure.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphStructure.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphStructure.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphTypes.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphTypes.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphTypes.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphTypes.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/ProtocolImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/ProtocolImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/ProtocolImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/ProtocolImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayDuplicationBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayDuplicationBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayDuplicationBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayDuplicationBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayListBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayListBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayListBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayListBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BenchmarkBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BenchmarkBase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BenchmarkBase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BenchmarkBase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BoxingBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BoxingBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BoxingBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BoxingBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ConcurrentSkipListBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ConcurrentSkipListBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ConcurrentSkipListBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ConcurrentSkipListBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/GuardedIntrinsicBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/GuardedIntrinsicBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/GuardedIntrinsicBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/GuardedIntrinsicBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/HashBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/HashBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/HashBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/HashBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/MathFunctionBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/MathFunctionBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/MathFunctionBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/MathFunctionBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/SimpleSyncBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/SimpleSyncBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/SimpleSyncBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/SimpleSyncBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/StringBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/StringBenchmark.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/StringBenchmark.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/StringBenchmark.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/TestJMHBlackbox.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/TestJMHBlackbox.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/TestJMHBlackbox.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/TestJMHBlackbox.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/package-info.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/package-info.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/package-info.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/package-info.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionCategory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionCategory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionCategory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionCategory.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionDescriptor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionDescriptor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionDescriptor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionDescriptor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionDescriptors.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionDescriptors.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionDescriptors.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionDescriptors.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionKey.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionKey.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionKey.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionKey.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionType.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionType.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionType.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionType.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionValues.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionValues.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionValues.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionValues.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/package-info.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/package-info.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/package-info.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/package-info.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util.test/src/org/graalvm/util/test/CollectionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util.test/src/org/graalvm/util/test/CollectionTest.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util.test/src/org/graalvm/util/test/CollectionTest.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.util.test/src/org/graalvm/util/test/CollectionTest.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/CollectionsUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/CollectionsUtil.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/CollectionsUtil.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/CollectionsUtil.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/EconomicMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/EconomicMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/EconomicMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/EconomicMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/EconomicSet.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/EconomicSet.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/EconomicSet.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/EconomicSet.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/Equivalence.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/Equivalence.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/Equivalence.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/Equivalence.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/MapCursor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/MapCursor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/MapCursor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/MapCursor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/ObjectSizeEstimate.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/ObjectSizeEstimate.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/ObjectSizeEstimate.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/ObjectSizeEstimate.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/Pair.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/Pair.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/Pair.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/Pair.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableEconomicMap.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableEconomicMap.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableEconomicMap.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableEconomicMap.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableEconomicSet.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableEconomicSet.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableEconomicSet.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableEconomicSet.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableMapCursor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableMapCursor.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableMapCursor.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableMapCursor.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/impl/EconomicMapImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/impl/EconomicMapImpl.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/impl/EconomicMapImpl.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/impl/EconomicMapImpl.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/ComparableWord.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/ComparableWord.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/ComparableWord.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/ComparableWord.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/LocationIdentity.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/LocationIdentity.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/LocationIdentity.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/LocationIdentity.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/Pointer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/Pointer.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/Pointer.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/Pointer.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/PointerBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/PointerBase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/PointerBase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/PointerBase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/SignedWord.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/SignedWord.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/SignedWord.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/SignedWord.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/UnsignedWord.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/UnsignedWord.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/UnsignedWord.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/UnsignedWord.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/WordBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/WordBase.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/WordBase.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/WordBase.java diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/WordFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/WordFactory.java similarity index 100% rename from hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/WordFactory.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/WordFactory.java diff --git a/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSigner.java b/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSigner.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSigner.java rename to src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSigner.java diff --git a/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSignerParameters.java b/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSignerParameters.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSignerParameters.java rename to src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSignerParameters.java diff --git a/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java b/src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java rename to src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java diff --git a/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java b/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java rename to src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java diff --git a/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSignerException.java b/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSignerException.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSignerException.java rename to src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSignerException.java diff --git a/jdk/src/jdk.jartool/share/classes/module-info.java b/src/jdk.jartool/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/module-info.java rename to src/jdk.jartool/share/classes/module-info.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java rename to src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java rename to src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java rename to src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java rename to src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java rename to src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/CommandLine.java b/src/jdk.jartool/share/classes/sun/tools/jar/CommandLine.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/CommandLine.java rename to src/jdk.jartool/share/classes/sun/tools/jar/CommandLine.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java b/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java rename to src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java b/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java rename to src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/JarException.java b/src/jdk.jartool/share/classes/sun/tools/jar/JarException.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/JarException.java rename to src/jdk.jartool/share/classes/sun/tools/jar/JarException.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/JarToolProvider.java b/src/jdk.jartool/share/classes/sun/tools/jar/JarToolProvider.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/JarToolProvider.java rename to src/jdk.jartool/share/classes/sun/tools/jar/JarToolProvider.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java b/src/jdk.jartool/share/classes/sun/tools/jar/Main.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java rename to src/jdk.jartool/share/classes/sun/tools/jar/Main.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Manifest.java b/src/jdk.jartool/share/classes/sun/tools/jar/Manifest.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/Manifest.java rename to src/jdk.jartool/share/classes/sun/tools/jar/Manifest.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/SignatureFile.java b/src/jdk.jartool/share/classes/sun/tools/jar/SignatureFile.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/SignatureFile.java rename to src/jdk.jartool/share/classes/sun/tools/jar/SignatureFile.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java b/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java rename to src/jdk.jartool/share/classes/sun/tools/jar/Validator.java diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties rename to src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties rename to src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties rename to src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties rename to src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties rename to src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties rename to src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties rename to src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties rename to src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties rename to src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties rename to src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties similarity index 100% rename from jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties rename to src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotatedType.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotatedType.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotatedType.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotatedType.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationDesc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationDesc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationDesc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationDesc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeDoc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeDoc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeDoc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationValue.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationValue.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationValue.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationValue.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ConstructorDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/ConstructorDoc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ConstructorDoc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/ConstructorDoc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/DocErrorReporter.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/DocErrorReporter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/DocErrorReporter.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/DocErrorReporter.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doclet.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/Doclet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doclet.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/Doclet.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ExecutableMemberDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/ExecutableMemberDoc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ExecutableMemberDoc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/ExecutableMemberDoc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/FieldDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/FieldDoc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/FieldDoc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/FieldDoc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/LanguageVersion.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/LanguageVersion.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/LanguageVersion.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/LanguageVersion.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MemberDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/MemberDoc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MemberDoc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/MemberDoc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MethodDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/MethodDoc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MethodDoc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/MethodDoc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParamTag.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/ParamTag.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParamTag.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/ParamTag.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Parameter.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/Parameter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Parameter.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/Parameter.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParameterizedType.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/ParameterizedType.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParameterizedType.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/ParameterizedType.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ProgramElementDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/ProgramElementDoc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ProgramElementDoc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/ProgramElementDoc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/RootDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/RootDoc.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/RootDoc.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/RootDoc.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SeeTag.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/SeeTag.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SeeTag.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/SeeTag.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SerialFieldTag.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/SerialFieldTag.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SerialFieldTag.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/SerialFieldTag.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SourcePosition.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/SourcePosition.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SourcePosition.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/SourcePosition.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ThrowsTag.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/ThrowsTag.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ThrowsTag.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/ThrowsTag.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Type.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/Type.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Type.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/Type.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/TypeVariable.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/TypeVariable.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/TypeVariable.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/TypeVariable.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/WildcardType.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/WildcardType.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/WildcardType.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/WildcardType.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java rename to src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java b/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java rename to src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/package-info.java b/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/package-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/package-info.java rename to src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/package-info.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Main.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Main.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Main.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Main.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AbstractTypeImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AbstractTypeImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AbstractTypeImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AbstractTypeImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotatedTypeImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotatedTypeImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotatedTypeImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotatedTypeImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationDescImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationDescImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationDescImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationDescImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeDocImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeDocImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeDocImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeDocImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeElementDocImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeElementDocImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeElementDocImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeElementDocImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationValueImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationValueImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationValueImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationValueImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ClassDocImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ClassDocImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ClassDocImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ClassDocImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Comment.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Comment.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Comment.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Comment.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ConstructorDocImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ConstructorDocImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ConstructorDocImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ConstructorDocImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocEnv.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocEnv.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocEnv.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocEnv.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocLocale.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocLocale.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocLocale.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocLocale.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocletInvoker.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocletInvoker.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocletInvoker.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocletInvoker.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ExecutableMemberDocImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ExecutableMemberDocImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ExecutableMemberDocImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ExecutableMemberDocImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/FieldDocImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/FieldDocImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/FieldDocImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/FieldDocImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavaScriptScanner.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavaScriptScanner.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavaScriptScanner.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavaScriptScanner.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MemberDocImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MemberDocImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MemberDocImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MemberDocImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MethodDocImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MethodDocImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MethodDocImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MethodDocImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ModifierFilter.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ModifierFilter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ModifierFilter.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ModifierFilter.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PackageDocImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PackageDocImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PackageDocImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PackageDocImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParamTagImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParamTagImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParamTagImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParamTagImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterizedTypeImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterizedTypeImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterizedTypeImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterizedTypeImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PrimitiveType.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PrimitiveType.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PrimitiveType.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PrimitiveType.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ProgramElementDocImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ProgramElementDocImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ProgramElementDocImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ProgramElementDocImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/RootDocImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/RootDocImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/RootDocImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/RootDocImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SeeTagImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SeeTagImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SeeTagImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SeeTagImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerialFieldTagImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerialFieldTagImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerialFieldTagImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerialFieldTagImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerializedForm.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerializedForm.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerializedForm.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerializedForm.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SourcePositionImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SourcePositionImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SourcePositionImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SourcePositionImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TagImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TagImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TagImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TagImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ThrowsTagImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ThrowsTagImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ThrowsTagImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ThrowsTagImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeMaker.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeMaker.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeMaker.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeMaker.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeVariableImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeVariableImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeVariableImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeVariableImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/package-info.java b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/package-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/package-info.java rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/package-info.java diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties rename to src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Doclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Doclet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Doclet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Doclet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/DocletEnvironment.java b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/DocletEnvironment.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/DocletEnvironment.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/doclet/DocletEnvironment.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Reporter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Reporter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Reporter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Reporter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTaskImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTaskImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTaskImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTaskImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTool.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTool.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTool.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTool.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FrameOutputWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FrameOutputWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FrameOutputWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FrameOutputWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkInfoImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkInfoImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkInfoImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkInfoImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkOutputImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkOutputImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkOutputImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkOutputImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchIndexItem.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchIndexItem.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchIndexItem.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchIndexItem.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SectionName.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SectionName.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SectionName.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SectionName.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/WriterFactoryImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/WriterFactoryImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/WriterFactoryImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/WriterFactoryImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Comment.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Comment.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Comment.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Comment.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/DocType.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/DocType.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/DocType.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/DocType.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/FixedStringContent.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/FixedStringContent.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/FixedStringContent.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/FixedStringContent.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlConstants.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlConstants.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlConstants.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlConstants.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlVersion.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlVersion.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlVersion.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlVersion.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/StringContent.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/StringContent.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/StringContent.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/StringContent.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/package-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/package-info.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/package-info.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/package-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/package-info.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/package-info.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/glass.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/glass.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/glass.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/glass.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/external/jquery/jquery.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/external/jquery/jquery.js similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/external/jquery/jquery.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/external/jquery/jquery.js diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_flat_75_ffffff_40x100.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_flat_75_ffffff_40x100.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_65_ffffff_1x400.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_dadada_1x400.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_dadada_1x400.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_dadada_1x400.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_95_fef1ec_1x400.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_222222_256x240.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_222222_256x240.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_222222_256x240.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_222222_256x240.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_2e83ff_256x240.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_2e83ff_256x240.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_2e83ff_256x240.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_454545_256x240.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_454545_256x240.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_454545_256x240.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_454545_256x240.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_888888_256x240.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_888888_256x240.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_888888_256x240.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_888888_256x240.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_cd0a0a_256x240.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_cd0a0a_256x240.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_cd0a0a_256x240.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.10.2.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.10.2.js similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.10.2.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.10.2.js diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.css similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.css rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.css diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.js similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.js diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.css similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.css rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.css diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.js similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.js diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.css similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.css rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.css diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.min.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.min.css similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.min.css rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.min.css diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.js similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.js diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.min.js similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.min.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.min.js diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.js similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.js diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.min.js similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.min.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.min.js diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.js similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.js diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.min.js similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.min.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.min.js diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/x.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/x.png similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/x.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/x.png diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/package-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/package-info.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/package-info.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AbstractDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AbstractDoclet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AbstractDoclet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AbstractDoclet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeOptionalMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeOptionalMemberWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeOptionalMemberWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeOptionalMemberWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ClassWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ClassWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ClassWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstantsSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstantsSummaryWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstantsSummaryWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstantsSummaryWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/DocletException.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/DocletException.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/DocletException.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/DocletException.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Messages.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Messages.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Messages.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Messages.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ModuleSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ModuleSummaryWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ModuleSummaryWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ModuleSummaryWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/NestedClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/NestedClassWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/NestedClassWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/NestedClassWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/OverviewElement.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/OverviewElement.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/OverviewElement.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/OverviewElement.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Resources.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Resources.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Resources.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Resources.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WriterFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WriterFactory.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WriterFactory.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WriterFactory.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/BuilderFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/BuilderFactory.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/BuilderFactory.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/BuilderFactory.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/package-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/package-info.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/package-info.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/package-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/package-info.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/package-info.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseExecutableMemberTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseExecutableMemberTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseExecutableMemberTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseExecutableMemberTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseInlineTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseInlineTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseInlineTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseInlineTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BasePropertyTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BasePropertyTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BasePropertyTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BasePropertyTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/CodeTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/CodeTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/CodeTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/CodeTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/DeprecatedTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/DeprecatedTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/DeprecatedTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/DeprecatedTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/DocRootTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/DocRootTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/DocRootTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/DocRootTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/HiddenTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/HiddenTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/HiddenTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/HiddenTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/IndexTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/IndexTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/IndexTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/IndexTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritDocTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritDocTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritDocTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritDocTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritableTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritableTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritableTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritableTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/LiteralTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/LiteralTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/LiteralTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/LiteralTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertyGetterTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertyGetterTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertyGetterTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertyGetterTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertySetterTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertySetterTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertySetterTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertySetterTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ReturnTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ReturnTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ReturnTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ReturnTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SeeTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SeeTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SeeTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SeeTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SimpleTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SimpleTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SimpleTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SimpleTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SummaryTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SummaryTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SummaryTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SummaryTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/Taglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/Taglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/Taglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/Taglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/UserTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/UserTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/UserTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/UserTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ValueTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ValueTaglet.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ValueTaglet.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ValueTaglet.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/package-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/package-info.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/package-info.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassTree.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassTree.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassTree.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassTree.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassUseMapper.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassUseMapper.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassUseMapper.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassUseMapper.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFile.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFile.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFile.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFile.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileFactory.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileFactory.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileFactory.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileIOException.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileIOException.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileIOException.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileIOException.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocLink.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocLink.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocLink.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocLink.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPath.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPath.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPath.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPath.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocletConstants.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocletConstants.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocletConstants.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocletConstants.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Group.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Group.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Group.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Group.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ImplementedMethods.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ImplementedMethods.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ImplementedMethods.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ImplementedMethods.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexBuilder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexBuilder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexBuilder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/InternalException.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/InternalException.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/InternalException.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/InternalException.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/JavaScriptScanner.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/JavaScriptScanner.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/JavaScriptScanner.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/JavaScriptScanner.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MethodTypes.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MethodTypes.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MethodTypes.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MethodTypes.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ModulePackageTypes.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ModulePackageTypes.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ModulePackageTypes.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ModulePackageTypes.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PackageListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PackageListWriter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PackageListWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PackageListWriter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ResourceIOException.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ResourceIOException.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ResourceIOException.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ResourceIOException.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SimpleDocletException.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SimpleDocletException.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SimpleDocletException.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SimpleDocletException.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/StandardDocFileFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/StandardDocFileFactory.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/StandardDocFileFactory.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/StandardDocFileFactory.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TableTabTypes.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TableTabTypes.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TableTabTypes.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TableTabTypes.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TypeElementCatalog.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TypeElementCatalog.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TypeElementCatalog.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TypeElementCatalog.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/UncheckedDocletException.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/UncheckedDocletException.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/UncheckedDocletException.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/UncheckedDocletException.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberMap.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberMap.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberMap.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberMap.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkOutput.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkOutput.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkOutput.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkOutput.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/package-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/package-info.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/package-info.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/package-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/package-info.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/package-info.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/AccessKind.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/AccessKind.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/AccessKind.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/AccessKind.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/DocEnvImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/DocEnvImpl.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/DocEnvImpl.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/DocEnvImpl.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/IllegalOptionValue.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/IllegalOptionValue.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/IllegalOptionValue.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/IllegalOptionValue.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocClassFinder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocClassFinder.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocClassFinder.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocClassFinder.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocEnter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocEnter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocEnter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocEnter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTodo.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTodo.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTodo.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTodo.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocToolProvider.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocToolProvider.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocToolProvider.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocToolProvider.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Main.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Main.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Main.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Main.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Messager.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Messager.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Messager.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Messager.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/OptionException.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/OptionException.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/OptionException.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/OptionException.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolEnvironment.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolEnvironment.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolEnvironment.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolEnvironment.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolException.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolException.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolException.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolException.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties diff --git a/langtools/src/jdk.javadoc/share/classes/module-info.java b/src/jdk.javadoc/share/classes/module-info.java similarity index 100% rename from langtools/src/jdk.javadoc/share/classes/module-info.java rename to src/jdk.javadoc/share/classes/module-info.java diff --git a/langtools/src/jdk.javadoc/share/legal/jquery.md b/src/jdk.javadoc/share/legal/jquery.md similarity index 100% rename from langtools/src/jdk.javadoc/share/legal/jquery.md rename to src/jdk.javadoc/share/legal/jquery.md diff --git a/langtools/src/jdk.javadoc/share/legal/jszip.md b/src/jdk.javadoc/share/legal/jszip.md similarity index 100% rename from langtools/src/jdk.javadoc/share/legal/jszip.md rename to src/jdk.javadoc/share/legal/jszip.md diff --git a/langtools/src/jdk.javadoc/share/legal/pako.md b/src/jdk.javadoc/share/legal/pako.md similarity index 100% rename from langtools/src/jdk.javadoc/share/legal/pako.md rename to src/jdk.javadoc/share/legal/pako.md diff --git a/jdk/src/jdk.jcmd/share/classes/module-info.java b/src/jdk.jcmd/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/module-info.java rename to src/jdk.jcmd/share/classes/module-info.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/common/ProcessArgumentMatcher.java b/src/jdk.jcmd/share/classes/sun/tools/common/ProcessArgumentMatcher.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/common/ProcessArgumentMatcher.java rename to src/jdk.jcmd/share/classes/sun/tools/common/ProcessArgumentMatcher.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java b/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java rename to src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java b/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java rename to src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java b/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java rename to src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java b/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java rename to src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jps/Arguments.java b/src/jdk.jcmd/share/classes/sun/tools/jps/Arguments.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jps/Arguments.java rename to src/jdk.jcmd/share/classes/sun/tools/jps/Arguments.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jps/Jps.java b/src/jdk.jcmd/share/classes/sun/tools/jps/Jps.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jps/Jps.java rename to src/jdk.jcmd/share/classes/sun/tools/jps/Jps.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java b/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java rename to src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Alignment.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Alignment.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Alignment.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/Alignment.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/AscendingMonitorComparator.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/AscendingMonitorComparator.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/AscendingMonitorComparator.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/AscendingMonitorComparator.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Closure.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Closure.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Closure.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/Closure.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ColumnFormat.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/ColumnFormat.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ColumnFormat.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/ColumnFormat.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/DescendingMonitorComparator.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/DescendingMonitorComparator.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/DescendingMonitorComparator.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/DescendingMonitorComparator.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Expression.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Expression.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Expression.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/Expression.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionEvaluator.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionEvaluator.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionEvaluator.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionEvaluator.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/HeaderClosure.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/HeaderClosure.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/HeaderClosure.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/HeaderClosure.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Identifier.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Identifier.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Identifier.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/Identifier.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/JStatLogger.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/JStatLogger.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/JStatLogger.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/JStatLogger.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Jstat.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Jstat.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Jstat.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/Jstat.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Literal.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Literal.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Literal.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/Literal.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Operator.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Operator.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Operator.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/Operator.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionFinder.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionFinder.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionFinder.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/OptionFinder.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionFormat.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionFormat.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionFormat.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/OptionFormat.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionLister.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionLister.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionLister.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/OptionLister.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionOutputFormatter.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionOutputFormatter.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OptionOutputFormatter.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/OptionOutputFormatter.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OutputFormatter.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/OutputFormatter.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/OutputFormatter.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/OutputFormatter.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ParserException.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/ParserException.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/ParserException.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/ParserException.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/RawOutputFormatter.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/RawOutputFormatter.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/RawOutputFormatter.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/RawOutputFormatter.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/RowClosure.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/RowClosure.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/RowClosure.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/RowClosure.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Scale.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Scale.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Scale.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/Scale.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/SymbolResolutionClosure.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/SymbolResolutionClosure.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/SymbolResolutionClosure.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/SymbolResolutionClosure.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/SyntaxException.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/SyntaxException.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/SyntaxException.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/SyntaxException.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Token.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Token.java similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Token.java rename to src/jdk.jcmd/share/classes/sun/tools/jstat/Token.java diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options b/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options rename to src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_unsupported_options b/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_unsupported_options similarity index 100% rename from jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_unsupported_options rename to src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_unsupported_options diff --git a/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsoleContext.java b/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsoleContext.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsoleContext.java rename to src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsoleContext.java diff --git a/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsolePlugin.java b/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsolePlugin.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsolePlugin.java rename to src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsolePlugin.java diff --git a/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/package-info.java b/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/package-info.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/package-info.java rename to src/jdk.jconsole/share/classes/com/sun/tools/jconsole/package-info.java diff --git a/jdk/src/jdk.jconsole/share/classes/module-info.java b/src/jdk.jconsole/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/module-info.java rename to src/jdk.jconsole/share/classes/module-info.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/BorderedComponent.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/BorderedComponent.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/BorderedComponent.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/BorderedComponent.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ClassTab.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/ClassTab.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ClassTab.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/ClassTab.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ConnectDialog.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/ConnectDialog.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ConnectDialog.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/ConnectDialog.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/CreateMBeanDialog.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/CreateMBeanDialog.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/CreateMBeanDialog.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/CreateMBeanDialog.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ExceptionSafePlugin.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/ExceptionSafePlugin.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ExceptionSafePlugin.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/ExceptionSafePlugin.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Formatter.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/Formatter.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Formatter.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/Formatter.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/HTMLPane.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/HTMLPane.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/HTMLPane.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/HTMLPane.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/InternalDialog.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/InternalDialog.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/InternalDialog.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/InternalDialog.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/JConsole.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/JConsole.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/JConsole.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/JConsole.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/LabeledComponent.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/LabeledComponent.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/LabeledComponent.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/LabeledComponent.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/LocalVirtualMachine.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/LocalVirtualMachine.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/LocalVirtualMachine.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/LocalVirtualMachine.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MBeansTab.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/MBeansTab.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MBeansTab.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/MBeansTab.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryPoolProxy.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryPoolProxy.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryPoolProxy.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryPoolProxy.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryPoolStat.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryPoolStat.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryPoolStat.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryPoolStat.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryTab.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryTab.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryTab.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/MemoryTab.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Messages.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/Messages.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Messages.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/Messages.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/OutputViewer.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/OutputViewer.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/OutputViewer.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/OutputViewer.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/OverviewPanel.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/OverviewPanel.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/OverviewPanel.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/OverviewPanel.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/OverviewTab.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/OverviewTab.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/OverviewTab.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/OverviewTab.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Plotter.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/Plotter.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Plotter.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/Plotter.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/PlotterPanel.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/PlotterPanel.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/PlotterPanel.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/PlotterPanel.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ProxyClient.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/ProxyClient.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ProxyClient.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/ProxyClient.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Resources.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/Resources.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Resources.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/Resources.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/SheetDialog.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/SheetDialog.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/SheetDialog.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/SheetDialog.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/SummaryTab.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/SummaryTab.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/SummaryTab.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/SummaryTab.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Tab.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/Tab.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Tab.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/Tab.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ThreadTab.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/ThreadTab.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/ThreadTab.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/ThreadTab.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/TimeComboBox.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/TimeComboBox.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/TimeComboBox.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/TimeComboBox.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Utilities.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/Utilities.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Utilities.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/Utilities.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/VMInternalFrame.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/VMInternalFrame.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/VMInternalFrame.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/VMInternalFrame.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/VMPanel.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/VMPanel.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/VMPanel.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/VMPanel.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/VariableGridLayout.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/VariableGridLayout.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/VariableGridLayout.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/VariableGridLayout.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Version.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/Version.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Version.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/Version.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Worker.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/Worker.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/Worker.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/Worker.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/IconManager.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/IconManager.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/IconManager.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/IconManager.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/OperationEntry.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/OperationEntry.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/OperationEntry.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/OperationEntry.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/TableSorter.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/TableSorter.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/TableSorter.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/TableSorter.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/Utils.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/Utils.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/Utils.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/Utils.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XDataViewer.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XDataViewer.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XDataViewer.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XDataViewer.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBean.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBean.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBean.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBean.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanOperations.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanOperations.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanOperations.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XMBeanOperations.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XObject.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XObject.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XObject.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XObject.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOperations.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOperations.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOperations.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOperations.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XPlotter.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XPlotter.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XPlotter.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XPlotter.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XSheet.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XSheet.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XSheet.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XSheet.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTable.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTable.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTable.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTable.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTextField.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTextField.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTextField.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTextField.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTextFieldEditor.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTextFieldEditor.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTextFieldEditor.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTextFieldEditor.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTree.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTree.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTree.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTree.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTreeRenderer.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTreeRenderer.java similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTreeRenderer.java rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTreeRenderer.java diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/brandlogo.png b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/brandlogo.png similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/brandlogo.png rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/brandlogo.png diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/collapse-winlf.png b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/collapse-winlf.png similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/collapse-winlf.png rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/collapse-winlf.png diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/connected16.png b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/connected16.png similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/connected16.png rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/connected16.png diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/connected24.png b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/connected24.png similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/connected24.png rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/connected24.png diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/disconnected16.png b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/disconnected16.png similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/disconnected16.png rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/disconnected16.png diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/disconnected24.png b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/disconnected24.png similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/disconnected24.png rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/disconnected24.png diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/expand-winlf.png b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/expand-winlf.png similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/expand-winlf.png rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/expand-winlf.png diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/masthead-left.png b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/masthead-left.png similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/masthead-left.png rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/masthead-left.png diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/masthead-right.png b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/masthead-right.png similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/masthead-right.png rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/masthead-right.png diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/mbean.gif b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/mbean.gif similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/mbean.gif rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/mbean.gif diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages.properties similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages.properties rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages.properties diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_ja.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_ja.properties similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_ja.properties rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_ja.properties diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/xobject.gif b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/xobject.gif similarity index 100% rename from jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/xobject.gif rename to src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/xobject.gif diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/AccessFlags.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/AccessFlags.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/AccessFlags.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/AccessFlags.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Annotation.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Annotation.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Annotation.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Annotation.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/AttributeException.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/AttributeException.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/AttributeException.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/AttributeException.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attributes.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attributes.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attributes.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attributes.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassFile.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassFile.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassFile.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassFile.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassReader.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassReader.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassReader.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassReader.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassTranslator.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassTranslator.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassTranslator.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassTranslator.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Code_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Code_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Code_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Code_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/CompilationID_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/CompilationID_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/CompilationID_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/CompilationID_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPool.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPool.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPool.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPool.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPoolException.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPoolException.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPoolException.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPoolException.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/DefaultAttribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/DefaultAttribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/DefaultAttribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/DefaultAttribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependency.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependency.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependency.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependency.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Deprecated_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Deprecated_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Deprecated_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Deprecated_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Descriptor.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Descriptor.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Descriptor.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Descriptor.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/DescriptorException.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/DescriptorException.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/DescriptorException.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/DescriptorException.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Exceptions_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Exceptions_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Exceptions_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Exceptions_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Field.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Field.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Field.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Field.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Instruction.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Instruction.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Instruction.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Instruction.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Method.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Method.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Method.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Method.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleHashes_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleHashes_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleHashes_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleHashes_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleMainClass_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleMainClass_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleMainClass_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleMainClass_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModulePackages_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModulePackages_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModulePackages_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModulePackages_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleResolution_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleResolution_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleResolution_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleResolution_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleTarget_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleTarget_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleTarget_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleTarget_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Opcode.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Opcode.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Opcode.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Opcode.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ReferenceFinder.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ReferenceFinder.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ReferenceFinder.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/ReferenceFinder.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Signature.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Signature.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Signature.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Signature.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Signature_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Signature_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Signature_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Signature_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceFile_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceFile_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceFile_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceFile_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceID_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceID_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceID_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceID_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/StackMap_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/StackMap_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/StackMap_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/StackMap_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Synthetic_attribute.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Synthetic_attribute.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Synthetic_attribute.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Synthetic_attribute.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Type.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Type.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Type.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/Type.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/package-info.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/package-info.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/package-info.java rename to src/jdk.jdeps/share/classes/com/sun/tools/classfile/package-info.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AnnotationWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/AnnotationWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AnnotationWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/AnnotationWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/Context.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/Context.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/Context.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/Context.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/DisassemblerTool.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/DisassemblerTool.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/DisassemblerTool.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/DisassemblerTool.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/InstructionDetailWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/InstructionDetailWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/InstructionDetailWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/InstructionDetailWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/InternalError.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/InternalError.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/InternalError.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/InternalError.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapFileManager.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapFileManager.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapFileManager.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapFileManager.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/Main.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/Main.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/Main.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/Main.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/Messages.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/Messages.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/Messages.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/Messages.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/Options.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/Options.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/Options.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/Options.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/SourceWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/SourceWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/SourceWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/SourceWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/StackMapWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/StackMapWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/StackMapWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/StackMapWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/TryBlockWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/TryBlockWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/TryBlockWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/TryBlockWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/overview.html b/src/jdk.jdeps/share/classes/com/sun/tools/javap/overview.html similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/overview.html rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/overview.html diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/package-info.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/package-info.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/package-info.java rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/package-info.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/version.properties-template b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/version.properties-template similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/version.properties-template rename to src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/version.properties-template diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/CSV.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/CSV.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/CSV.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/CSV.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/CSVParseException.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/CSVParseException.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/CSVParseException.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/CSVParseException.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/DeprDB.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/DeprDB.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/DeprDB.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/DeprDB.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/DeprData.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/DeprData.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/DeprData.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/DeprData.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/LoadProc.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/LoadProc.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/LoadProc.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/LoadProc.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Messages.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Messages.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Messages.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Messages.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Pretty.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Pretty.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Pretty.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Pretty.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/TraverseProc.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/TraverseProc.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/TraverseProc.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/TraverseProc.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/internals.md b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/internals.md similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/internals.md rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/internals.md diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/readme.md b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/readme.md similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/readme.md rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/readme.md diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan.properties similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan.properties rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan.properties diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_ja.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_ja.properties similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_ja.properties rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_ja.properties diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_zh_CN.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_zh_CN.properties similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_zh_CN.properties rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_zh_CN.properties diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPEntries.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPEntries.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPEntries.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPEntries.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/ClassFinder.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/ClassFinder.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/ClassFinder.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/ClassFinder.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/MethodSig.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/MethodSig.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/MethodSig.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/MethodSig.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/InverseDepsAnalyzer.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/InverseDepsAnalyzer.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/InverseDepsAnalyzer.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/InverseDepsAnalyzer.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsWriter.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsWriter.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsWriter.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Main.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Main.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Main.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Main.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleDotGraph.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleDotGraph.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleDotGraph.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleDotGraph.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleGraphBuilder.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleGraphBuilder.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleGraphBuilder.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleGraphBuilder.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/MultiReleaseException.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/MultiReleaseException.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/MultiReleaseException.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/MultiReleaseException.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Profile.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Profile.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Profile.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Profile.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/VersionHelper.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/VersionHelper.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/VersionHelper.java rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/VersionHelper.java diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/version.properties-template b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/version.properties-template similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/version.properties-template rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/version.properties-template diff --git a/langtools/src/jdk.jdeps/share/classes/module-info.java b/src/jdk.jdeps/share/classes/module-info.java similarity index 100% rename from langtools/src/jdk.jdeps/share/classes/module-info.java rename to src/jdk.jdeps/share/classes/module-info.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java b/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java b/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java rename to src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ArrayReference.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayReference.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ArrayReference.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java b/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanType.java b/src/jdk.jdi/share/classes/com/sun/jdi/BooleanType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/BooleanType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanValue.java b/src/jdk.jdi/share/classes/com/sun/jdi/BooleanValue.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanValue.java rename to src/jdk.jdi/share/classes/com/sun/jdi/BooleanValue.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java b/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java rename to src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteType.java b/src/jdk.jdi/share/classes/com/sun/jdi/ByteType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ByteType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteValue.java b/src/jdk.jdi/share/classes/com/sun/jdi/ByteValue.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteValue.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ByteValue.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharType.java b/src/jdk.jdi/share/classes/com/sun/jdi/CharType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/CharType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharValue.java b/src/jdk.jdi/share/classes/com/sun/jdi/CharValue.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharValue.java rename to src/jdk.jdi/share/classes/com/sun/jdi/CharValue.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassLoaderReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ClassLoaderReference.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassLoaderReference.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ClassLoaderReference.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java b/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java b/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassObjectReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ClassObjectReference.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassObjectReference.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ClassObjectReference.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java b/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleType.java b/src/jdk.jdi/share/classes/com/sun/jdi/DoubleType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/DoubleType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleValue.java b/src/jdk.jdi/share/classes/com/sun/jdi/DoubleValue.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleValue.java rename to src/jdk.jdi/share/classes/com/sun/jdi/DoubleValue.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Field.java b/src/jdk.jdi/share/classes/com/sun/jdi/Field.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/Field.java rename to src/jdk.jdi/share/classes/com/sun/jdi/Field.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatType.java b/src/jdk.jdi/share/classes/com/sun/jdi/FloatType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/FloatType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatValue.java b/src/jdk.jdi/share/classes/com/sun/jdi/FloatValue.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatValue.java rename to src/jdk.jdi/share/classes/com/sun/jdi/FloatValue.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java b/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerType.java b/src/jdk.jdi/share/classes/com/sun/jdi/IntegerType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/IntegerType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerValue.java b/src/jdk.jdi/share/classes/com/sun/jdi/IntegerValue.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerValue.java rename to src/jdk.jdi/share/classes/com/sun/jdi/IntegerValue.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java b/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidModuleException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidModuleException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidModuleException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/InvalidModuleException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java b/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java rename to src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java b/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java rename to src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java b/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java rename to src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Location.java b/src/jdk.jdi/share/classes/com/sun/jdi/Location.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/Location.java rename to src/jdk.jdi/share/classes/com/sun/jdi/Location.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongType.java b/src/jdk.jdi/share/classes/com/sun/jdi/LongType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/LongType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongValue.java b/src/jdk.jdi/share/classes/com/sun/jdi/LongValue.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongValue.java rename to src/jdk.jdi/share/classes/com/sun/jdi/LongValue.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Method.java b/src/jdk.jdi/share/classes/com/sun/jdi/Method.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/Method.java rename to src/jdk.jdi/share/classes/com/sun/jdi/Method.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Mirror.java b/src/jdk.jdi/share/classes/com/sun/jdi/Mirror.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/Mirror.java rename to src/jdk.jdi/share/classes/com/sun/jdi/Mirror.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ModuleReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ModuleReference.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ModuleReference.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ModuleReference.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/MonitorInfo.java b/src/jdk.jdi/share/classes/com/sun/jdi/MonitorInfo.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/MonitorInfo.java rename to src/jdk.jdi/share/classes/com/sun/jdi/MonitorInfo.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java b/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java b/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java b/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java rename to src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveType.java b/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveValue.java b/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveValue.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveValue.java rename to src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveValue.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java b/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortType.java b/src/jdk.jdi/share/classes/com/sun/jdi/ShortType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ShortType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortValue.java b/src/jdk.jdi/share/classes/com/sun/jdi/ShortValue.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortValue.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ShortValue.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java b/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java rename to src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java rename to src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadGroupReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ThreadGroupReference.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadGroupReference.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ThreadGroupReference.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java rename to src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Type.java b/src/jdk.jdi/share/classes/com/sun/jdi/Type.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/Type.java rename to src/jdk.jdi/share/classes/com/sun/jdi/Type.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java b/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java b/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java b/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java b/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java b/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Value.java b/src/jdk.jdi/share/classes/com/sun/jdi/Value.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/Value.java rename to src/jdk.jdi/share/classes/com/sun/jdi/Value.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java rename to src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java rename to src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidType.java b/src/jdk.jdi/share/classes/com/sun/jdi/VoidType.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidType.java rename to src/jdk.jdi/share/classes/com/sun/jdi/VoidType.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidValue.java b/src/jdk.jdi/share/classes/com/sun/jdi/VoidValue.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidValue.java rename to src/jdk.jdi/share/classes/com/sun/jdi/VoidValue.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java rename to src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/doc-files/signature.html b/src/jdk.jdi/share/classes/com/sun/jdi/doc-files/signature.html similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/doc-files/signature.html rename to src/jdk.jdi/share/classes/com/sun/jdi/doc-files/signature.html diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/BreakpointEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/BreakpointEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/BreakpointEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/BreakpointEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassPrepareEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassPrepareEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassPrepareEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/ClassPrepareEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassUnloadEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassUnloadEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassUnloadEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/ClassUnloadEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/Event.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/Event.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/Event.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/Event.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventIterator.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/EventIterator.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventIterator.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/EventIterator.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventQueue.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/EventQueue.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventQueue.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/EventQueue.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventSet.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/EventSet.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventSet.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/EventSet.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ExceptionEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/ExceptionEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ExceptionEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/ExceptionEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/LocatableEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/LocatableEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/LocatableEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/LocatableEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodEntryEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodEntryEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodEntryEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/MethodEntryEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodExitEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodExitEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodExitEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/MethodExitEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/StepEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/StepEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/StepEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/StepEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadDeathEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadDeathEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadDeathEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadDeathEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadStartEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadStartEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadStartEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadStartEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDeathEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDeathEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDeathEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/VMDeathEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDisconnectEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDisconnectEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDisconnectEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/VMDisconnectEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMStartEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/VMStartEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMStartEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/VMStartEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/WatchpointEvent.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/WatchpointEvent.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/WatchpointEvent.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/WatchpointEvent.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java rename to src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java rename to src/jdk.jdi/share/classes/com/sun/jdi/package-info.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/BreakpointRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/BreakpointRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/BreakpointRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/BreakpointRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassPrepareRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassPrepareRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassPrepareRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/ClassPrepareRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassUnloadRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassUnloadRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassUnloadRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/ClassUnloadRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/DuplicateRequestException.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/DuplicateRequestException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/DuplicateRequestException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/DuplicateRequestException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ExceptionRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/ExceptionRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ExceptionRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/ExceptionRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/InvalidRequestStateException.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/InvalidRequestStateException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/InvalidRequestStateException.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/InvalidRequestStateException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodEntryRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodEntryRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodEntryRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/MethodEntryRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodExitRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodExitRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodExitRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/MethodExitRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/StepRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/StepRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/StepRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/StepRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/VMDeathRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/VMDeathRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/VMDeathRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/VMDeathRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/WatchpointRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/WatchpointRequest.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/WatchpointRequest.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/WatchpointRequest.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java rename to src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ASCII_UCodeESC_CharStream.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ASCII_UCodeESC_CharStream.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ASCII_UCodeESC_CharStream.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ASCII_UCodeESC_CharStream.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/Expr.jj b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/Expr.jj similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/Expr.jj rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/Expr.jj diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/JavaCharStream.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/JavaCharStream.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/JavaCharStream.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/JavaCharStream.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/LValue.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/LValue.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/LValue.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/LValue.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ParseException.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ParseException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ParseException.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/ParseException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/Token.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/Token.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/Token.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/Token.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Env.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Env.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Env.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Env.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/MessageOutput.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/MessageOutput.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/MessageOutput.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/MessageOutput.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMConnection.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMConnection.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMConnection.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMConnection.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java rename to src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/AbstractLauncher.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/AbstractLauncher.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/AbstractLauncher.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/AbstractLauncher.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/BaseLineInfo.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/BaseLineInfo.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/BaseLineInfo.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/BaseLineInfo.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/BooleanValueImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/BooleanValueImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/BooleanValueImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/BooleanValueImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ByteTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ByteTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ByteTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ByteTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ByteValueImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ByteValueImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ByteValueImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ByteValueImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/CharTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/CharTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/CharTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/CharTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/CharValueImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/CharValueImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/CharValueImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/CharValueImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassLoaderReferenceImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassLoaderReferenceImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassLoaderReferenceImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassLoaderReferenceImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassObjectReferenceImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassObjectReferenceImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassObjectReferenceImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassObjectReferenceImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/CommandSender.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/CommandSender.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/CommandSender.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/CommandSender.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ConnectorImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ConnectorImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ConnectorImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ConnectorImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/DoubleValueImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/DoubleValueImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/DoubleValueImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/DoubleValueImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventQueueImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventQueueImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventQueueImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/EventQueueImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/FieldImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/FieldImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/FieldImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/FieldImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/FloatTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/FloatTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/FloatTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/FloatTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/FloatValueImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/FloatValueImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/FloatValueImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/FloatValueImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericListeningConnector.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericListeningConnector.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericListeningConnector.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericListeningConnector.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/IntegerTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/IntegerTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/IntegerTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/IntegerTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/IntegerValueImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/IntegerValueImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/IntegerValueImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/IntegerValueImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InternalEventHandler.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/InternalEventHandler.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InternalEventHandler.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/InternalEventHandler.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/JDWPException.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/JDWPException.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/JDWPException.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/JDWPException.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/JNITypeParser.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/JNITypeParser.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/JNITypeParser.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/JNITypeParser.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LineInfo.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/LineInfo.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LineInfo.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/LineInfo.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LocalVariableImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/LocalVariableImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LocalVariableImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/LocalVariableImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LocationImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/LocationImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LocationImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/LocationImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LockObject.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/LockObject.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LockObject.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/LockObject.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LongTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/LongTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LongTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/LongTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LongValueImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/LongValueImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/LongValueImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/LongValueImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MirrorImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/MirrorImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MirrorImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/MirrorImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ModuleReferenceImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ModuleReferenceImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ModuleReferenceImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ModuleReferenceImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MonitorInfoImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/MonitorInfoImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MonitorInfoImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/MonitorInfoImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObsoleteMethodImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObsoleteMethodImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObsoleteMethodImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ObsoleteMethodImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/Packet.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/Packet.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/Packet.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/Packet.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/PacketStream.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/PacketStream.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/PacketStream.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/PacketStream.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/PrimitiveTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/PrimitiveTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/PrimitiveTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/PrimitiveTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SDE.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SDE.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SDE.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/SDE.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ShortTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ShortTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ShortTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ShortTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ShortValueImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ShortValueImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ShortValueImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ShortValueImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketConnection.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketConnection.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketConnection.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketConnection.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketListeningConnector.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketListeningConnector.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketListeningConnector.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketListeningConnector.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketTransportService.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketTransportService.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketTransportService.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketTransportService.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/StackFrameImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/StackFrameImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/StackFrameImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/StackFrameImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/StratumLineInfo.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/StratumLineInfo.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/StratumLineInfo.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/StratumLineInfo.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/StringReferenceImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/StringReferenceImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/StringReferenceImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/StringReferenceImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/TargetVM.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/TargetVM.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/TargetVM.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/TargetVM.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadAction.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadAction.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadAction.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadAction.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadListener.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadListener.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadListener.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadListener.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/TypeComponentImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/TypeComponentImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/TypeComponentImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/TypeComponentImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/TypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/TypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/TypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/TypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMAction.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMAction.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMAction.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/VMAction.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMListener.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMListener.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMListener.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/VMListener.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMModifiers.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMModifiers.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMModifiers.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/VMModifiers.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMState.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMState.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMState.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/VMState.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ValueContainer.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ValueContainer.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ValueContainer.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ValueContainer.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ValueImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ValueImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ValueImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/ValueImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VoidTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VoidTypeImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VoidTypeImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/VoidTypeImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VoidValueImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VoidValueImpl.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VoidValueImpl.java rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/VoidValueImpl.java diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi.properties b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi.properties similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi.properties rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi.properties diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties similarity index 100% rename from jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties rename to src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties diff --git a/jdk/src/jdk.jdi/share/classes/module-info.java b/src/jdk.jdi/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.jdi/share/classes/module-info.java rename to src/jdk.jdi/share/classes/module-info.java diff --git a/jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemory.h b/src/jdk.jdi/share/native/libdt_shmem/SharedMemory.h similarity index 100% rename from jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemory.h rename to src/jdk.jdi/share/native/libdt_shmem/SharedMemory.h diff --git a/jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryConnection.c b/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryConnection.c similarity index 100% rename from jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryConnection.c rename to src/jdk.jdi/share/native/libdt_shmem/SharedMemoryConnection.c diff --git a/jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryTransport.c b/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryTransport.c similarity index 100% rename from jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryTransport.c rename to src/jdk.jdi/share/native/libdt_shmem/SharedMemoryTransport.c diff --git a/jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c b/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c similarity index 100% rename from jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c rename to src/jdk.jdi/share/native/libdt_shmem/shmemBack.c diff --git a/jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.c b/src/jdk.jdi/share/native/libdt_shmem/shmemBase.c similarity index 100% rename from jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.c rename to src/jdk.jdi/share/native/libdt_shmem/shmemBase.c diff --git a/jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.h b/src/jdk.jdi/share/native/libdt_shmem/shmemBase.h similarity index 100% rename from jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.h rename to src/jdk.jdi/share/native/libdt_shmem/shmemBase.h diff --git a/jdk/src/jdk.jdi/share/native/libdt_shmem/sysShmem.h b/src/jdk.jdi/share/native/libdt_shmem/sysShmem.h similarity index 100% rename from jdk/src/jdk.jdi/share/native/libdt_shmem/sysShmem.h rename to src/jdk.jdi/share/native/libdt_shmem/sysShmem.h diff --git a/jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java b/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java similarity index 100% rename from jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java rename to src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java diff --git a/jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryConnection.java b/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryConnection.java similarity index 100% rename from jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryConnection.java rename to src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryConnection.java diff --git a/jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryListeningConnector.java b/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryListeningConnector.java similarity index 100% rename from jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryListeningConnector.java rename to src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryListeningConnector.java diff --git a/jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java b/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java similarity index 100% rename from jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java rename to src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java diff --git a/jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SunSDK.java b/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SunSDK.java similarity index 100% rename from jdk/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SunSDK.java rename to src/jdk.jdi/windows/classes/com/sun/tools/jdi/SunSDK.java diff --git a/jdk/src/jdk.jdi/windows/classes/module-info.java.extra b/src/jdk.jdi/windows/classes/module-info.java.extra similarity index 100% rename from jdk/src/jdk.jdi/windows/classes/module-info.java.extra rename to src/jdk.jdi/windows/classes/module-info.java.extra diff --git a/jdk/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c b/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c similarity index 100% rename from jdk/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c rename to src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c diff --git a/jdk/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.h b/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.h similarity index 100% rename from jdk/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.h rename to src/jdk.jdi/windows/native/libdt_shmem/shmem_md.h diff --git a/jdk/src/jdk.jdwp.agent/share/classes/module-info.java b/src/jdk.jdwp.agent/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/classes/module-info.java rename to src/jdk.jdwp.agent/share/classes/module-info.java diff --git a/jdk/src/jdk.jdwp.agent/share/native/include/jdwpTransport.h b/src/jdk.jdwp.agent/share/native/include/jdwpTransport.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/include/jdwpTransport.h rename to src/jdk.jdwp.agent/share/native/include/jdwpTransport.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c b/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c rename to src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.h b/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.h rename to src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libdt_socket/sysSocket.h b/src/jdk.jdwp.agent/share/native/libdt_socket/sysSocket.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libdt_socket/sysSocket.h rename to src/jdk.jdwp.agent/share/native/libdt_socket/sysSocket.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassLoaderReferenceImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/ClassLoaderReferenceImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassLoaderReferenceImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/ClassLoaderReferenceImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassLoaderReferenceImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/ClassLoaderReferenceImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassLoaderReferenceImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/ClassLoaderReferenceImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassObjectReferenceImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/ClassObjectReferenceImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassObjectReferenceImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/ClassObjectReferenceImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassObjectReferenceImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/ClassObjectReferenceImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassObjectReferenceImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/ClassObjectReferenceImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/FieldImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/FieldImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/FieldImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/FieldImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/FieldImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/FieldImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/FieldImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/FieldImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/FrameID.c b/src/jdk.jdwp.agent/share/native/libjdwp/FrameID.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/FrameID.c rename to src/jdk.jdwp.agent/share/native/libjdwp/FrameID.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/FrameID.h b/src/jdk.jdwp.agent/share/native/libjdwp/FrameID.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/FrameID.h rename to src/jdk.jdwp.agent/share/native/libjdwp/FrameID.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/InterfaceTypeImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/InterfaceTypeImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/InterfaceTypeImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/InterfaceTypeImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/InterfaceTypeImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/InterfaceTypeImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/InterfaceTypeImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/InterfaceTypeImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/JDWP.h b/src/jdk.jdwp.agent/share/native/libjdwp/JDWP.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/JDWP.h rename to src/jdk.jdwp.agent/share/native/libjdwp/JDWP.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/MethodImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/MethodImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/MethodImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/MethodImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/MethodImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/MethodImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/MethodImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/MethodImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ReferenceTypeImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/ReferenceTypeImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ReferenceTypeImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/ReferenceTypeImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ReferenceTypeImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/ReferenceTypeImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ReferenceTypeImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/ReferenceTypeImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c b/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c rename to src/jdk.jdwp.agent/share/native/libjdwp/SDE.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/SDE.h b/src/jdk.jdwp.agent/share/native/libjdwp/SDE.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/SDE.h rename to src/jdk.jdwp.agent/share/native/libjdwp/SDE.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/StackFrameImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/StackFrameImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/StackFrameImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/StackFrameImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/StackFrameImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/StackFrameImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/StackFrameImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/StackFrameImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/StringReferenceImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/StringReferenceImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/StringReferenceImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/StringReferenceImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/StringReferenceImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/StringReferenceImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/StringReferenceImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/StringReferenceImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadGroupReferenceImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/ThreadGroupReferenceImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadGroupReferenceImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/ThreadGroupReferenceImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadGroupReferenceImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/ThreadGroupReferenceImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadGroupReferenceImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/ThreadGroupReferenceImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadReferenceImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/ThreadReferenceImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadReferenceImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/ThreadReferenceImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadReferenceImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/ThreadReferenceImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/ThreadReferenceImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/ThreadReferenceImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.h b/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/bag.c b/src/jdk.jdwp.agent/share/native/libjdwp/bag.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/bag.c rename to src/jdk.jdwp.agent/share/native/libjdwp/bag.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/bag.h b/src/jdk.jdwp.agent/share/native/libjdwp/bag.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/bag.h rename to src/jdk.jdwp.agent/share/native/libjdwp/bag.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.c b/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.c rename to src/jdk.jdwp.agent/share/native/libjdwp/classTrack.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.h b/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.h rename to src/jdk.jdwp.agent/share/native/libjdwp/classTrack.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c b/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c rename to src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h b/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h rename to src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugDispatch.c b/src/jdk.jdwp.agent/share/native/libjdwp/debugDispatch.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugDispatch.c rename to src/jdk.jdwp.agent/share/native/libjdwp/debugDispatch.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugDispatch.h b/src/jdk.jdwp.agent/share/native/libjdwp/debugDispatch.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugDispatch.h rename to src/jdk.jdwp.agent/share/native/libjdwp/debugDispatch.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c rename to src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h rename to src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c b/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c rename to src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.h b/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.h rename to src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.c b/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.c rename to src/jdk.jdwp.agent/share/native/libjdwp/error_messages.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.h b/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.h rename to src/jdk.jdwp.agent/share/native/libjdwp/error_messages.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c b/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c rename to src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.h b/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.h rename to src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilterRestricted.h b/src/jdk.jdwp.agent/share/native/libjdwp/eventFilterRestricted.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilterRestricted.h rename to src/jdk.jdwp.agent/share/native/libjdwp/eventFilterRestricted.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c b/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c rename to src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.h b/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.h rename to src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHandlerRestricted.h b/src/jdk.jdwp.agent/share/native/libjdwp/eventHandlerRestricted.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHandlerRestricted.h rename to src/jdk.jdwp.agent/share/native/libjdwp/eventHandlerRestricted.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c b/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c rename to src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.h b/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.h rename to src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/export/sys.h b/src/jdk.jdwp.agent/share/native/libjdwp/export/sys.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/export/sys.h rename to src/jdk.jdwp.agent/share/native/libjdwp/export/sys.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/inStream.c b/src/jdk.jdwp.agent/share/native/libjdwp/inStream.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/inStream.c rename to src/jdk.jdwp.agent/share/native/libjdwp/inStream.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/inStream.h b/src/jdk.jdwp.agent/share/native/libjdwp/inStream.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/inStream.h rename to src/jdk.jdwp.agent/share/native/libjdwp/inStream.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c b/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c rename to src/jdk.jdwp.agent/share/native/libjdwp/invoker.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.h b/src/jdk.jdwp.agent/share/native/libjdwp/invoker.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.h rename to src/jdk.jdwp.agent/share/native/libjdwp/invoker.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.c b/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.c rename to src/jdk.jdwp.agent/share/native/libjdwp/log_messages.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.h b/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.h rename to src/jdk.jdwp.agent/share/native/libjdwp/log_messages.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/outStream.c b/src/jdk.jdwp.agent/share/native/libjdwp/outStream.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/outStream.c rename to src/jdk.jdwp.agent/share/native/libjdwp/outStream.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/outStream.h b/src/jdk.jdwp.agent/share/native/libjdwp/outStream.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/outStream.h rename to src/jdk.jdwp.agent/share/native/libjdwp/outStream.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/standardHandlers.c b/src/jdk.jdwp.agent/share/native/libjdwp/standardHandlers.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/standardHandlers.c rename to src/jdk.jdwp.agent/share/native/libjdwp/standardHandlers.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/standardHandlers.h b/src/jdk.jdwp.agent/share/native/libjdwp/standardHandlers.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/standardHandlers.h rename to src/jdk.jdwp.agent/share/native/libjdwp/standardHandlers.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.h b/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/stepControl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/stream.c b/src/jdk.jdwp.agent/share/native/libjdwp/stream.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/stream.c rename to src/jdk.jdwp.agent/share/native/libjdwp/stream.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/stream.h b/src/jdk.jdwp.agent/share/native/libjdwp/stream.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/stream.h rename to src/jdk.jdwp.agent/share/native/libjdwp/stream.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c rename to src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.h b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.h rename to src/jdk.jdwp.agent/share/native/libjdwp/threadControl.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/transport.c b/src/jdk.jdwp.agent/share/native/libjdwp/transport.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/transport.c rename to src/jdk.jdwp.agent/share/native/libjdwp/transport.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/transport.h b/src/jdk.jdwp.agent/share/native/libjdwp/transport.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/transport.h rename to src/jdk.jdwp.agent/share/native/libjdwp/transport.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c b/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c rename to src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.h b/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.h rename to src/jdk.jdwp.agent/share/native/libjdwp/utf_util.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/util.c b/src/jdk.jdwp.agent/share/native/libjdwp/util.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/util.c rename to src/jdk.jdwp.agent/share/native/libjdwp/util.c diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/util.h b/src/jdk.jdwp.agent/share/native/libjdwp/util.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/util.h rename to src/jdk.jdwp.agent/share/native/libjdwp/util.h diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/vm_interface.h b/src/jdk.jdwp.agent/share/native/libjdwp/vm_interface.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/share/native/libjdwp/vm_interface.h rename to src/jdk.jdwp.agent/share/native/libjdwp/vm_interface.h diff --git a/jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c b/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c rename to src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c diff --git a/jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.h b/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.h rename to src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.h diff --git a/jdk/src/jdk.jdwp.agent/unix/native/libjdwp/exec_md.c b/src/jdk.jdwp.agent/unix/native/libjdwp/exec_md.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/unix/native/libjdwp/exec_md.c rename to src/jdk.jdwp.agent/unix/native/libjdwp/exec_md.c diff --git a/jdk/src/jdk.jdwp.agent/unix/native/libjdwp/linker_md.c b/src/jdk.jdwp.agent/unix/native/libjdwp/linker_md.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/unix/native/libjdwp/linker_md.c rename to src/jdk.jdwp.agent/unix/native/libjdwp/linker_md.c diff --git a/jdk/src/jdk.jdwp.agent/unix/native/libjdwp/path_md.h b/src/jdk.jdwp.agent/unix/native/libjdwp/path_md.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/unix/native/libjdwp/path_md.h rename to src/jdk.jdwp.agent/unix/native/libjdwp/path_md.h diff --git a/jdk/src/jdk.jdwp.agent/unix/native/libjdwp/proc_md.h b/src/jdk.jdwp.agent/unix/native/libjdwp/proc_md.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/unix/native/libjdwp/proc_md.h rename to src/jdk.jdwp.agent/unix/native/libjdwp/proc_md.h diff --git a/jdk/src/jdk.jdwp.agent/unix/native/libjdwp/util_md.h b/src/jdk.jdwp.agent/unix/native/libjdwp/util_md.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/unix/native/libjdwp/util_md.h rename to src/jdk.jdwp.agent/unix/native/libjdwp/util_md.h diff --git a/jdk/src/jdk.jdwp.agent/windows/native/libdt_socket/socket_md.c b/src/jdk.jdwp.agent/windows/native/libdt_socket/socket_md.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/windows/native/libdt_socket/socket_md.c rename to src/jdk.jdwp.agent/windows/native/libdt_socket/socket_md.c diff --git a/jdk/src/jdk.jdwp.agent/windows/native/libdt_socket/socket_md.h b/src/jdk.jdwp.agent/windows/native/libdt_socket/socket_md.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/windows/native/libdt_socket/socket_md.h rename to src/jdk.jdwp.agent/windows/native/libdt_socket/socket_md.h diff --git a/jdk/src/jdk.jdwp.agent/windows/native/libjdwp/exec_md.c b/src/jdk.jdwp.agent/windows/native/libjdwp/exec_md.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/windows/native/libjdwp/exec_md.c rename to src/jdk.jdwp.agent/windows/native/libjdwp/exec_md.c diff --git a/jdk/src/jdk.jdwp.agent/windows/native/libjdwp/linker_md.c b/src/jdk.jdwp.agent/windows/native/libjdwp/linker_md.c similarity index 100% rename from jdk/src/jdk.jdwp.agent/windows/native/libjdwp/linker_md.c rename to src/jdk.jdwp.agent/windows/native/libjdwp/linker_md.c diff --git a/jdk/src/jdk.jdwp.agent/windows/native/libjdwp/mutex_md.h b/src/jdk.jdwp.agent/windows/native/libjdwp/mutex_md.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/windows/native/libjdwp/mutex_md.h rename to src/jdk.jdwp.agent/windows/native/libjdwp/mutex_md.h diff --git a/jdk/src/jdk.jdwp.agent/windows/native/libjdwp/path_md.h b/src/jdk.jdwp.agent/windows/native/libjdwp/path_md.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/windows/native/libjdwp/path_md.h rename to src/jdk.jdwp.agent/windows/native/libjdwp/path_md.h diff --git a/jdk/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h b/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h rename to src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h diff --git a/jdk/src/jdk.jdwp.agent/windows/native/libjdwp/util_md.h b/src/jdk.jdwp.agent/windows/native/libjdwp/util_md.h similarity index 100% rename from jdk/src/jdk.jdwp.agent/windows/native/libjdwp/util_md.h rename to src/jdk.jdwp.agent/windows/native/libjdwp/util_md.h diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java b/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java rename to src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jimage/Main.java b/src/jdk.jlink/share/classes/jdk/tools/jimage/Main.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jimage/Main.java rename to src/jdk.jlink/share/classes/jdk/tools/jimage/Main.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties b/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties rename to src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/ImageBuilder.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/ImageBuilder.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/ImageBuilder.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/builder/ImageBuilder.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/AbstractResourcePoolEntry.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/AbstractResourcePoolEntry.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/AbstractResourcePoolEntry.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/AbstractResourcePoolEntry.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Archive.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Archive.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Archive.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Archive.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ArchiveEntryResourcePoolEntry.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ArchiveEntryResourcePoolEntry.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ArchiveEntryResourcePoolEntry.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ArchiveEntryResourcePoolEntry.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/BasicImageWriter.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/BasicImageWriter.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/BasicImageWriter.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/BasicImageWriter.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ByteArrayResourcePoolEntry.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ByteArrayResourcePoolEntry.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ByteArrayResourcePoolEntry.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ByteArrayResourcePoolEntry.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/DirArchive.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/DirArchive.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/DirArchive.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/DirArchive.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ExecutableImage.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ExecutableImage.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ExecutableImage.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ExecutableImage.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageLocationWriter.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageLocationWriter.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageLocationWriter.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageLocationWriter.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginConfiguration.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginConfiguration.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginConfiguration.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginConfiguration.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageResourcesTree.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageResourcesTree.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageResourcesTree.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageResourcesTree.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageStringsWriter.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageStringsWriter.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageStringsWriter.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageStringsWriter.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JarArchive.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JarArchive.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JarArchive.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JarArchive.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Jlink.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Jlink.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Jlink.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Jlink.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkPermission.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkPermission.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkPermission.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkPermission.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JmodArchive.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JmodArchive.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JmodArchive.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JmodArchive.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Main.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Main.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Main.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Main.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModularJarArchive.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModularJarArchive.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModularJarArchive.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModularJarArchive.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleSorter.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleSorter.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleSorter.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleSorter.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PathResourcePoolEntry.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PathResourcePoolEntry.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PathResourcePoolEntry.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PathResourcePoolEntry.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PerfectHashBuilder.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PerfectHashBuilder.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PerfectHashBuilder.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PerfectHashBuilder.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Platform.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Platform.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Platform.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Platform.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PluginRepository.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PluginRepository.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PluginRepository.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PluginRepository.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PostProcessor.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PostProcessor.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PostProcessor.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PostProcessor.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolEntryFactory.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolEntryFactory.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolEntryFactory.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolEntryFactory.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePrevisitor.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePrevisitor.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePrevisitor.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePrevisitor.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/StringTable.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/StringTable.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/StringTable.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/StringTable.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/SymLinkResourcePoolEntry.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/SymLinkResourcePoolEntry.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/SymLinkResourcePoolEntry.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/SymLinkResourcePoolEntry.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Utils.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Utils.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Utils.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Utils.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ClassForNamePlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ClassForNamePlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ClassForNamePlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ClassForNamePlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/DefaultCompressPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/DefaultCompressPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/DefaultCompressPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/DefaultCompressPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeFilesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeFilesPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeFilesPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeFilesPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeJmodSectionPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeJmodSectionPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeJmodSectionPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeJmodSectionPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludePlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludePlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludePlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludePlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OrderResourcesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OrderResourcesPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OrderResourcesPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OrderResourcesPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/PluginsResourceBundle.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/PluginsResourceBundle.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/PluginsResourceBundle.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/PluginsResourceBundle.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ResourceFilter.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ResourceFilter.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ResourceFilter.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ResourceFilter.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StringSharingPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StringSharingPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StringSharingPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StringSharingPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripDebugPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripDebugPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripDebugPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripDebugPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripNativeCommandsPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripNativeCommandsPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripNativeCommandsPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripNativeCommandsPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ZipPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ZipPlugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ZipPlugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ZipPlugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Plugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Plugin.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Plugin.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Plugin.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/PluginException.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/PluginException.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/PluginException.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/PluginException.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePool.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePool.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePool.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePool.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolBuilder.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolBuilder.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolBuilder.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolBuilder.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolEntry.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolEntry.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolEntry.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolEntry.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolModule.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolModule.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolModule.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolModule.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolModuleView.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolModuleView.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolModuleView.java rename to src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolModuleView.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties rename to src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties rename to src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties rename to src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties rename to src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodOutputStream.java b/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodOutputStream.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodOutputStream.java rename to src/jdk.jlink/share/classes/jdk/tools/jmod/JmodOutputStream.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java b/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java rename to src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/Main.java b/src/jdk.jlink/share/classes/jdk/tools/jmod/Main.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/Main.java rename to src/jdk.jlink/share/classes/jdk/tools/jmod/Main.java diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties rename to src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties rename to src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties similarity index 100% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties rename to src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties diff --git a/jdk/src/jdk.jlink/share/classes/module-info.java b/src/jdk.jlink/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.jlink/share/classes/module-info.java rename to src/jdk.jlink/share/classes/module-info.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/debug/InternalDebugControl.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/debug/InternalDebugControl.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/debug/InternalDebugControl.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/debug/InternalDebugControl.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ArgTokenizer.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ArgTokenizer.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ArgTokenizer.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ArgTokenizer.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContextTestSupport.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContextTestSupport.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContextTestSupport.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContextTestSupport.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ContinuousCompletionProvider.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ContinuousCompletionProvider.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ContinuousCompletionProvider.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ContinuousCompletionProvider.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/IOContext.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/IOContext.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/IOContext.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/IOContext.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolBuilder.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolBuilder.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolBuilder.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolBuilder.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolProvider.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolProvider.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolProvider.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolProvider.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/MessageHandler.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/MessageHandler.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/MessageHandler.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/MessageHandler.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/PersistentStorage.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/PersistentStorage.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/PersistentStorage.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/PersistentStorage.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/StopDetectingInputStream.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/StopDetectingInputStream.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/StopDetectingInputStream.java rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/StopDetectingInputStream.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/version.properties-template b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/version.properties-template similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/version.properties-template rename to src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/version.properties-template diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ClassTracker.java b/src/jdk.jshell/share/classes/jdk/jshell/ClassTracker.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/ClassTracker.java rename to src/jdk.jshell/share/classes/jdk/jshell/ClassTracker.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java b/src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java rename to src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Corraller.java b/src/jdk.jshell/share/classes/jdk/jshell/Corraller.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/Corraller.java rename to src/jdk.jshell/share/classes/jdk/jshell/Corraller.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java rename to src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Diag.java b/src/jdk.jshell/share/classes/jdk/jshell/Diag.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/Diag.java rename to src/jdk.jshell/share/classes/jdk/jshell/Diag.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/DiagList.java b/src/jdk.jshell/share/classes/jdk/jshell/DiagList.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/DiagList.java rename to src/jdk.jshell/share/classes/jdk/jshell/DiagList.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ErroneousSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/ErroneousSnippet.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/ErroneousSnippet.java rename to src/jdk.jshell/share/classes/jdk/jshell/ErroneousSnippet.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Eval.java b/src/jdk.jshell/share/classes/jdk/jshell/Eval.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/Eval.java rename to src/jdk.jshell/share/classes/jdk/jshell/Eval.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/EvalException.java b/src/jdk.jshell/share/classes/jdk/jshell/EvalException.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/EvalException.java rename to src/jdk.jshell/share/classes/jdk/jshell/EvalException.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java rename to src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ExpressionToTypeInfo.java b/src/jdk.jshell/share/classes/jdk/jshell/ExpressionToTypeInfo.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/ExpressionToTypeInfo.java rename to src/jdk.jshell/share/classes/jdk/jshell/ExpressionToTypeInfo.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/GeneralWrap.java b/src/jdk.jshell/share/classes/jdk/jshell/GeneralWrap.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/GeneralWrap.java rename to src/jdk.jshell/share/classes/jdk/jshell/GeneralWrap.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ImportSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/ImportSnippet.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/ImportSnippet.java rename to src/jdk.jshell/share/classes/jdk/jshell/ImportSnippet.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/JShell.java b/src/jdk.jshell/share/classes/jdk/jshell/JShell.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/JShell.java rename to src/jdk.jshell/share/classes/jdk/jshell/JShell.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/JShellException.java b/src/jdk.jshell/share/classes/jdk/jshell/JShellException.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/JShellException.java rename to src/jdk.jshell/share/classes/jdk/jshell/JShellException.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Key.java b/src/jdk.jshell/share/classes/jdk/jshell/Key.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/Key.java rename to src/jdk.jshell/share/classes/jdk/jshell/Key.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/KeyMap.java b/src/jdk.jshell/share/classes/jdk/jshell/KeyMap.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/KeyMap.java rename to src/jdk.jshell/share/classes/jdk/jshell/KeyMap.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java b/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java rename to src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/MemoryFileManager.java b/src/jdk.jshell/share/classes/jdk/jshell/MemoryFileManager.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/MemoryFileManager.java rename to src/jdk.jshell/share/classes/jdk/jshell/MemoryFileManager.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/MethodSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/MethodSnippet.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/MethodSnippet.java rename to src/jdk.jshell/share/classes/jdk/jshell/MethodSnippet.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/OuterImportSnippetWrap.java b/src/jdk.jshell/share/classes/jdk/jshell/OuterImportSnippetWrap.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/OuterImportSnippetWrap.java rename to src/jdk.jshell/share/classes/jdk/jshell/OuterImportSnippetWrap.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/OuterSnippetsClassWrap.java b/src/jdk.jshell/share/classes/jdk/jshell/OuterSnippetsClassWrap.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/OuterSnippetsClassWrap.java rename to src/jdk.jshell/share/classes/jdk/jshell/OuterSnippetsClassWrap.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/OuterWrap.java b/src/jdk.jshell/share/classes/jdk/jshell/OuterWrap.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/OuterWrap.java rename to src/jdk.jshell/share/classes/jdk/jshell/OuterWrap.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/OuterWrapMap.java b/src/jdk.jshell/share/classes/jdk/jshell/OuterWrapMap.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/OuterWrapMap.java rename to src/jdk.jshell/share/classes/jdk/jshell/OuterWrapMap.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/PersistentSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/PersistentSnippet.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/PersistentSnippet.java rename to src/jdk.jshell/share/classes/jdk/jshell/PersistentSnippet.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java b/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java rename to src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplParserFactory.java b/src/jdk.jshell/share/classes/jdk/jshell/ReplParserFactory.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplParserFactory.java rename to src/jdk.jshell/share/classes/jdk/jshell/ReplParserFactory.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplResolve.java b/src/jdk.jshell/share/classes/jdk/jshell/ReplResolve.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplResolve.java rename to src/jdk.jshell/share/classes/jdk/jshell/ReplResolve.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java rename to src/jdk.jshell/share/classes/jdk/jshell/Snippet.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SnippetEvent.java b/src/jdk.jshell/share/classes/jdk/jshell/SnippetEvent.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/SnippetEvent.java rename to src/jdk.jshell/share/classes/jdk/jshell/SnippetEvent.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java b/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java rename to src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java rename to src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java rename to src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/StatementSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/StatementSnippet.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/StatementSnippet.java rename to src/jdk.jshell/share/classes/jdk/jshell/StatementSnippet.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java b/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java rename to src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/TreeDependencyScanner.java b/src/jdk.jshell/share/classes/jdk/jshell/TreeDependencyScanner.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/TreeDependencyScanner.java rename to src/jdk.jshell/share/classes/jdk/jshell/TreeDependencyScanner.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/TreeDissector.java b/src/jdk.jshell/share/classes/jdk/jshell/TreeDissector.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/TreeDissector.java rename to src/jdk.jshell/share/classes/jdk/jshell/TreeDissector.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/TypeDeclSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/TypeDeclSnippet.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/TypeDeclSnippet.java rename to src/jdk.jshell/share/classes/jdk/jshell/TypeDeclSnippet.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/TypePrinter.java b/src/jdk.jshell/share/classes/jdk/jshell/TypePrinter.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/TypePrinter.java rename to src/jdk.jshell/share/classes/jdk/jshell/TypePrinter.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Unit.java b/src/jdk.jshell/share/classes/jdk/jshell/Unit.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/Unit.java rename to src/jdk.jshell/share/classes/jdk/jshell/Unit.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/UnresolvedReferenceException.java b/src/jdk.jshell/share/classes/jdk/jshell/UnresolvedReferenceException.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/UnresolvedReferenceException.java rename to src/jdk.jshell/share/classes/jdk/jshell/UnresolvedReferenceException.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Util.java b/src/jdk.jshell/share/classes/jdk/jshell/Util.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/Util.java rename to src/jdk.jshell/share/classes/jdk/jshell/Util.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/VarSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/VarSnippet.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/VarSnippet.java rename to src/jdk.jshell/share/classes/jdk/jshell/VarSnippet.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/VarTypePrinter.java b/src/jdk.jshell/share/classes/jdk/jshell/VarTypePrinter.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/VarTypePrinter.java rename to src/jdk.jshell/share/classes/jdk/jshell/VarTypePrinter.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java b/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java rename to src/jdk.jshell/share/classes/jdk/jshell/Wrap.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/DefaultLoaderDelegate.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/DefaultLoaderDelegate.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/DefaultLoaderDelegate.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/DefaultLoaderDelegate.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/DemultiplexInput.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/DemultiplexInput.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/DemultiplexInput.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/DemultiplexInput.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/ExecutionControlForwarder.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/ExecutionControlForwarder.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/ExecutionControlForwarder.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/ExecutionControlForwarder.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/FailOverExecutionControlProvider.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/FailOverExecutionControlProvider.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/FailOverExecutionControlProvider.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/FailOverExecutionControlProvider.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiEventHandler.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiEventHandler.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiEventHandler.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/JdiEventHandler.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControl.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControl.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControl.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControlProvider.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControlProvider.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControlProvider.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControlProvider.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiInitiator.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiInitiator.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiInitiator.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/JdiInitiator.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/LoaderDelegate.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/LoaderDelegate.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/LoaderDelegate.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/LoaderDelegate.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControlProvider.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControlProvider.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControlProvider.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControlProvider.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/MultiplexingOutputStream.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/MultiplexingOutputStream.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/MultiplexingOutputStream.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/MultiplexingOutputStream.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/PipeInputStream.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/PipeInputStream.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/PipeInputStream.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/PipeInputStream.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteCodes.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteCodes.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteCodes.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteCodes.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteExecutionControl.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteExecutionControl.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteExecutionControl.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/StreamingExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/StreamingExecutionControl.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/StreamingExecutionControl.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/StreamingExecutionControl.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/Util.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/Util.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/Util.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/Util.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/package-info.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/package-info.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/package-info.java rename to src/jdk.jshell/share/classes/jdk/jshell/execution/package-info.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/package-info.java b/src/jdk.jshell/share/classes/jdk/jshell/package-info.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/package-info.java rename to src/jdk.jshell/share/classes/jdk/jshell/package-info.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n.properties similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n.properties rename to src/jdk.jshell/share/classes/jdk/jshell/resources/l10n.properties diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties rename to src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties rename to src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControl.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControl.java rename to src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControl.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControlProvider.java b/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControlProvider.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControlProvider.java rename to src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControlProvider.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionEnv.java b/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionEnv.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionEnv.java rename to src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionEnv.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/SPIResolutionException.java b/src/jdk.jshell/share/classes/jdk/jshell/spi/SPIResolutionException.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/SPIResolutionException.java rename to src/jdk.jshell/share/classes/jdk/jshell/spi/SPIResolutionException.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/package-info.java b/src/jdk.jshell/share/classes/jdk/jshell/spi/package-info.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/package-info.java rename to src/jdk.jshell/share/classes/jdk/jshell/spi/package-info.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/JavaShellToolBuilder.java b/src/jdk.jshell/share/classes/jdk/jshell/tool/JavaShellToolBuilder.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/JavaShellToolBuilder.java rename to src/jdk.jshell/share/classes/jdk/jshell/tool/JavaShellToolBuilder.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/package-info.java b/src/jdk.jshell/share/classes/jdk/jshell/tool/package-info.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/package-info.java rename to src/jdk.jshell/share/classes/jdk/jshell/tool/package-info.java diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/DEFAULT.jsh b/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/DEFAULT.jsh similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/DEFAULT.jsh rename to src/jdk.jshell/share/classes/jdk/jshell/tool/resources/DEFAULT.jsh diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/JAVASE.jsh b/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/JAVASE.jsh similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/JAVASE.jsh rename to src/jdk.jshell/share/classes/jdk/jshell/tool/resources/JAVASE.jsh diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/PRINTING.jsh b/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/PRINTING.jsh similarity index 100% rename from langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/PRINTING.jsh rename to src/jdk.jshell/share/classes/jdk/jshell/tool/resources/PRINTING.jsh diff --git a/langtools/src/jdk.jshell/share/classes/module-info.java b/src/jdk.jshell/share/classes/module-info.java similarity index 100% rename from langtools/src/jdk.jshell/share/classes/module-info.java rename to src/jdk.jshell/share/classes/module-info.java diff --git a/jdk/src/jdk.jsobject/share/classes/jdk/internal/netscape/javascript/spi/JSObjectProvider.java b/src/jdk.jsobject/share/classes/jdk/internal/netscape/javascript/spi/JSObjectProvider.java similarity index 100% rename from jdk/src/jdk.jsobject/share/classes/jdk/internal/netscape/javascript/spi/JSObjectProvider.java rename to src/jdk.jsobject/share/classes/jdk/internal/netscape/javascript/spi/JSObjectProvider.java diff --git a/jdk/src/jdk.jsobject/share/classes/module-info.java b/src/jdk.jsobject/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.jsobject/share/classes/module-info.java rename to src/jdk.jsobject/share/classes/module-info.java diff --git a/jdk/src/jdk.jsobject/share/classes/netscape/javascript/JSException.java b/src/jdk.jsobject/share/classes/netscape/javascript/JSException.java similarity index 100% rename from jdk/src/jdk.jsobject/share/classes/netscape/javascript/JSException.java rename to src/jdk.jsobject/share/classes/netscape/javascript/JSException.java diff --git a/jdk/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java b/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java similarity index 100% rename from jdk/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java rename to src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java diff --git a/jdk/src/jdk.jsobject/share/classes/netscape/javascript/package-info.java b/src/jdk.jsobject/share/classes/netscape/javascript/package-info.java similarity index 100% rename from jdk/src/jdk.jsobject/share/classes/netscape/javascript/package-info.java rename to src/jdk.jsobject/share/classes/netscape/javascript/package-info.java diff --git a/jdk/src/jdk.jstatd/share/classes/module-info.java b/src/jdk.jstatd/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/module-info.java rename to src/jdk.jstatd/share/classes/module-info.java diff --git a/jdk/src/jdk.jstatd/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java b/src/jdk.jstatd/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java rename to src/jdk.jstatd/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java diff --git a/jdk/src/jdk.jstatd/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java b/src/jdk.jstatd/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java rename to src/jdk.jstatd/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java diff --git a/jdk/src/jdk.jstatd/share/classes/sun/jvmstat/monitor/remote/package.html b/src/jdk.jstatd/share/classes/sun/jvmstat/monitor/remote/package.html similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/sun/jvmstat/monitor/remote/package.html rename to src/jdk.jstatd/share/classes/sun/jvmstat/monitor/remote/package.html diff --git a/jdk/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java b/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java rename to src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java diff --git a/jdk/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostRmiService.java b/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostRmiService.java similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostRmiService.java rename to src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostRmiService.java diff --git a/jdk/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java b/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java rename to src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java diff --git a/jdk/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java b/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java rename to src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java diff --git a/jdk/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java b/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java rename to src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java diff --git a/jdk/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html b/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html rename to src/jdk.jstatd/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html diff --git a/jdk/src/jdk.jstatd/share/classes/sun/tools/jstatd/Jstatd.java b/src/jdk.jstatd/share/classes/sun/tools/jstatd/Jstatd.java similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/sun/tools/jstatd/Jstatd.java rename to src/jdk.jstatd/share/classes/sun/tools/jstatd/Jstatd.java diff --git a/jdk/src/jdk.jstatd/share/classes/sun/tools/jstatd/RemoteHostImpl.java b/src/jdk.jstatd/share/classes/sun/tools/jstatd/RemoteHostImpl.java similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/sun/tools/jstatd/RemoteHostImpl.java rename to src/jdk.jstatd/share/classes/sun/tools/jstatd/RemoteHostImpl.java diff --git a/jdk/src/jdk.jstatd/share/classes/sun/tools/jstatd/RemoteVmImpl.java b/src/jdk.jstatd/share/classes/sun/tools/jstatd/RemoteVmImpl.java similarity index 100% rename from jdk/src/jdk.jstatd/share/classes/sun/tools/jstatd/RemoteVmImpl.java rename to src/jdk.jstatd/share/classes/sun/tools/jstatd/RemoteVmImpl.java diff --git a/jdk/src/jdk.localedata/share/classes/module-info.java b/src/jdk.localedata/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/module-info.java rename to src/jdk.localedata/share/classes/module-info.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorInfo_th.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorInfo_th.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorInfo_th.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorInfo_th.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorResources_th.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorResources_th.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorResources_th.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorResources_th.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorRules_th.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorRules_th.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorRules_th.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorRules_th.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ar.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ar.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ar.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ar.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_be.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_be.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_be.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_be.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_bg.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_bg.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_bg.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_bg.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ca.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ca.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ca.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ca.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_cs.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_cs.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_cs.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_cs.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_da.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_da.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_da.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_da.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_el.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_el.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_el.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_el.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_es.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_es.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_es.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_es.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_et.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_et.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_et.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_et.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_fi.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_fi.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_fi.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_fi.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_fr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_fr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_fr.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_fr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hi.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hi.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hi.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hi.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hr.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hu.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hu.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hu.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hu.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_is.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_is.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_is.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_is.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_iw.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_iw.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_iw.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_iw.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ja.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ja.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ja.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ja.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ko.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ko.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ko.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ko.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_lt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_lt.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_lt.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_lt.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_lv.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_lv.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_lv.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_lv.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_mk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_mk.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_mk.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_mk.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_no.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_no.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_no.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_no.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_pl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_pl.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_pl.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_pl.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ro.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ro.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ro.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ro.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ru.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ru.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ru.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ru.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sk.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sk.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sk.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sl.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sl.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sl.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sq.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sq.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sq.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sq.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sr.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sr_Latn.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sr_Latn.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sr_Latn.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sr_Latn.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sv.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sv.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sv.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sv.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_th.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_th.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_th.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_th.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_tr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_tr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_tr.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_tr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_uk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_uk.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_uk.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_uk.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_vi.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_vi.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_vi.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_vi.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh_HK.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh_HK.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh_HK.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh_HK.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh_TW.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh_TW.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh_TW.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh_TW.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be_BY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be_BY.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be_BY.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be_BY.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg_BG.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg_BG.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg_BG.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg_BG.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca_ES.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca_ES.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca_ES.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca_ES.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs_CZ.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs_CZ.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs_CZ.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs_CZ.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da_DK.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da_DK.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da_DK.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da_DK.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_AT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_AT.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_AT.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_AT.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_CH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_CH.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_CH.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_CH.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_DE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_DE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_DE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_DE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_LU.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_LU.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_LU.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_LU.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_CY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_CY.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_CY.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_CY.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_GR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_GR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_GR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_GR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_AU.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_AU.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_AU.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_AU.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_CA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_CA.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_CA.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_CA.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_GB.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_GB.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_GB.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_GB.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IN.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IN.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IN.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_MT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_MT.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_MT.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_MT.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_NZ.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_NZ.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_NZ.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_NZ.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_PH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_PH.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_PH.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_PH.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_SG.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_SG.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_SG.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_SG.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_ZA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_ZA.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_ZA.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_ZA.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_AR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_AR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_AR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_AR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_BO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_BO.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_BO.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_BO.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CL.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CL.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CL.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CL.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CO.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CO.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CO.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_DO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_DO.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_DO.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_DO.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_EC.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_EC.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_EC.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_EC.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_ES.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_ES.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_ES.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_ES.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_GT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_GT.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_GT.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_GT.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_HN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_HN.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_HN.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_HN.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_MX.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_MX.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_MX.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_MX.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_NI.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_NI.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_NI.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_NI.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PA.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PA.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PA.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PY.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PY.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PY.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_SV.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_SV.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_SV.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_SV.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_US.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_US.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_US.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_US.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_UY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_UY.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_UY.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_UY.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_VE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_VE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_VE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_VE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et_EE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et_EE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et_EE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_et_EE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi_FI.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi_FI.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi_FI.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fi_FI.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_BE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_BE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_BE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_BE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CA.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CA.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CA.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CH.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CH.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_CH.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_FR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_FR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_FR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_fr_FR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga_IE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga_IE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga_IE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ga_IE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hi_IN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hi_IN.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hi_IN.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hi_IN.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr_HR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr_HR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr_HR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hr_HR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu_HU.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu_HU.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu_HU.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_hu_HU.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_in.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_in.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_in.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_in.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_in_ID.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_in_ID.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_in_ID.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_in_ID.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is_IS.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is_IS.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is_IS.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_is_IS.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_CH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_CH.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_CH.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_CH.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_IT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_IT.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_IT.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_it_IT.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_iw.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_iw.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_iw.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_iw.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_iw_IL.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_iw_IL.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_iw_IL.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_iw_IL.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja_JP.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja_JP.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja_JP.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja_JP.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko_KR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko_KR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko_KR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ko_KR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt_LT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt_LT.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt_LT.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lt_LT.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv_LV.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv_LV.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv_LV.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_lv_LV.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk_MK.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk_MK.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk_MK.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mk_MK.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms_MY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms_MY.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms_MY.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ms_MY.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt_MT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt_MT.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt_MT.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_mt_MT.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_BE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_BE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_BE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_BE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_NL.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_NL.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_NL.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_nl_NL.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO_NY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO_NY.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO_NY.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_no_NO_NY.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl_PL.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl_PL.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl_PL.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pl_PL.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_BR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_BR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_BR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_BR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_PT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_PT.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_PT.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_pt_PT.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro_RO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro_RO.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro_RO.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ro_RO.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru_RU.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru_RU.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru_RU.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ru_RU.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk_SK.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk_SK.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk_SK.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sk_SK.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl_SI.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl_SI.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl_SI.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sl_SI.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq_AL.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq_AL.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq_AL.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sq_AL.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_BA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_BA.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_BA.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_BA.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_CS.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_CS.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_CS.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_CS.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn_ME.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn_ME.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn_ME.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_Latn_ME.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_ME.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_ME.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_ME.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_ME.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_RS.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_RS.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_RS.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sr_RS.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv_SE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv_SE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv_SE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_sv_SE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th_TH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th_TH.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th_TH.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_th_TH.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr_TR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr_TR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr_TR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_tr_TR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk_UA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk_UA.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk_UA.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_uk_UA.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi_VN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi_VN.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi_VN.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_vi_VN.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_CN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_CN.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_CN.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_CN.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_HK.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_HK.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_HK.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_HK.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_SG.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_SG.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_SG.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_SG.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_TW.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_TW.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_TW.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh_TW.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_JO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_JO.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_JO.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_JO.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_LB.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_LB.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_LB.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_LB.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_SY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_SY.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_SY.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar_SY.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de_AT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de_AT.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de_AT.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de_AT.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_CA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_CA.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_CA.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_CA.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IN.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IN.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IN.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_NZ.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_NZ.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_NZ.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_NZ.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_SG.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_SG.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_SG.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_SG.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_ZA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_ZA.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_ZA.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_ZA.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_AR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_AR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_AR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_AR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_BO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_BO.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_BO.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_BO.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_EC.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_EC.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_EC.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_EC.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_GT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_GT.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_GT.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_GT.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_HN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_HN.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_HN.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_HN.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PY.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PY.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PY.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_UY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_UY.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_UY.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_UY.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_BE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_BE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_BE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_BE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CH.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CH.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CH.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl_BE.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl_BE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl_BE.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl_BE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sk.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sk.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sk.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_BA.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_BA.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_BA.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_BA.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_Latn.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_Latn.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_Latn.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_Latn.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_th.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_th.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_th.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_th.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_tr.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_tr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_tr.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_tr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_uk.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_uk.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_uk.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_uk.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_vi.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_vi.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_vi.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_vi.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_HK.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_HK.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_HK.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_HK.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_SG.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_SG.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_SG.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_SG.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_TW.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_TW.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_TW.java rename to src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_TW.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/thai_dict b/src/jdk.localedata/share/classes/sun/text/resources/ext/thai_dict similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/thai_dict rename to src/jdk.localedata/share/classes/sun/text/resources/ext/thai_dict diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldml.dtd b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldml.dtd similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldml.dtd rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldml.dtd diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlSupplemental.dtd b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlSupplemental.dtd similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlSupplemental.dtd rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlSupplemental.dtd diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_NA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_NA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_NA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_NA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_ZA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_ZA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_ZA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_ZA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak_GH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak_GH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak_GH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak_GH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am_ET.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am_ET.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am_ET.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am_ET.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_001.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_001.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_001.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_001.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_AE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_AE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_AE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_AE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_BH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_BH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_BH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_BH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DJ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DJ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DJ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DJ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_ER.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_ER.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_ER.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_ER.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IQ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IQ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IQ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IQ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_JO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_JO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_JO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_JO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LB.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LB.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LB.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LB.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_OM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_OM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_OM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_OM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_PS.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_PS.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_PS.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_PS.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_QA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_QA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_QA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_QA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SS.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SS.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SS.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SS.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_YE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_YE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_YE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_YE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast_ES.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast_ES.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast_ES.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast_ES.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl_AZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl_AZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl_AZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl_AZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn_AZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn_AZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn_AZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn_AZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be_BY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be_BY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be_BY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be_BY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem_ZM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem_ZM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem_ZM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem_ZM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg_BG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg_BG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg_BG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg_BG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm_ML.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm_ML.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm_ML.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm_ML.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_BD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_BD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_BD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_BD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_CN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_CN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_CN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_CN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br_FR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br_FR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br_FR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br_FR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl_BA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl_BA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl_BA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl_BA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn_BA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn_BA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn_BA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn_BA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_AD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_AD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_AD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_AD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES_VALENCIA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES_VALENCIA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES_VALENCIA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES_VALENCIA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_FR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_FR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_FR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_FR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_IT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_IT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_IT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_IT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce_RU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce_RU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce_RU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce_RU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg_UG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg_UG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg_UG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg_UG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr_US.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr_US.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr_US.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr_US.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IQ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IQ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IQ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IQ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs_CZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs_CZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs_CZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs_CZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu_RU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu_RU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu_RU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu_RU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy_GB.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy_GB.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy_GB.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy_GB.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_DK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_DK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_DK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_DK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_GL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_GL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_GL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_GL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_AT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_AT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_AT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_AT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_BE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_BE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_BE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_BE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_CH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_CH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_CH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_CH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_DE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_DE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_DE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_DE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje_NE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje_NE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje_NE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje_NE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb_DE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb_DE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb_DE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb_DE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo_SN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo_SN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo_SN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo_SN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz_BT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz_BT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz_BT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz_BT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_GH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_GH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_GH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_GH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_TG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_TG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_TG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_TG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_CY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_CY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_CY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_CY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_GR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_GR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_GR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_GR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_001.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_001.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_001.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_001.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_150.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_150.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_150.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_150.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AS.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AS.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AS.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AS.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BB.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BB.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BB.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BB.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BS.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BS.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BS.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BS.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CC.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CC.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CC.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CC.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CX.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CX.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CX.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CX.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ER.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ER.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ER.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ER.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FJ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FJ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FJ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FJ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GB.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GB.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GB.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GB.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_HK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_HK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_HK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_HK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LC.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LC.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LC.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LC.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LS.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LS.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LS.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LS.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MP.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MP.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MP.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MP.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MS.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MS.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MS.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MS.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NF.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NF.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NF.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NF.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_RW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_RW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_RW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_RW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SB.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SB.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SB.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SB.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SC.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SC.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SC.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SC.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SS.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SS.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SS.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SS.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SX.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SX.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SX.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SX.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TC.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TC.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TC.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TC.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TV.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TV.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TV.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TV.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US_POSIX.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US_POSIX.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US_POSIX.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US_POSIX.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VC.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VC.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VC.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VC.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_WS.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_WS.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_WS.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_WS.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo_001.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo_001.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo_001.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo_001.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_419.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_419.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_419.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_419.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_AR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_AR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_AR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_AR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_DO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_DO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_DO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_DO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EC.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EC.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EC.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EC.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_ES.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_ES.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_ES.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_ES.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GQ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GQ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GQ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GQ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_HN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_HN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_HN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_HN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_IC.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_IC.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_IC.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_IC.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_MX.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_MX.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_MX.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_MX.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_NI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_NI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_NI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_NI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_SV.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_SV.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_SV.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_SV.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_US.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_US.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_US.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_US.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_UY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_UY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_UY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_UY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_VE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_VE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_VE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_VE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et_EE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et_EE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et_EE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et_EE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu_ES.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu_ES.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu_ES.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu_ES.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_AF.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_AF.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_AF.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_AF.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_IR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_IR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_IR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_IR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_GN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_GN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_GN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_GN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_MR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_MR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_MR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_MR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_SN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_SN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_SN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_SN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi_FI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi_FI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi_FI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi_FI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil_PH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil_PH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil_PH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil_PH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_DK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_DK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_DK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_DK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_FO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_FO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_FO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_FO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BF.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BF.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BF.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BF.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BJ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BJ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BJ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BJ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CF.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CF.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CF.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CF.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DJ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DJ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DJ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DJ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_FR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_FR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_FR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_FR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GF.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GF.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GF.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GF.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GP.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GP.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GP.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GP.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GQ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GQ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GQ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GQ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_HT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_HT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_HT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_HT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_KM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_KM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_KM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_KM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_LU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_LU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_LU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_LU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MC.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MC.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MC.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MC.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MF.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MF.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MF.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MF.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_ML.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_ML.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_ML.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_ML.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MQ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MQ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MQ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MQ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NC.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NC.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NC.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NC.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PF.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PF.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PF.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PF.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SC.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SC.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SC.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SC.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_VU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_VU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_VU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_VU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_WF.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_WF.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_WF.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_WF.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_YT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_YT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_YT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_YT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur_IT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur_IT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur_IT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur_IT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy_NL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy_NL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy_NL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy_NL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga_IE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga_IE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga_IE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga_IE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd_GB.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd_GB.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd_GB.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd_GB.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl_ES.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl_ES.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl_ES.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl_ES.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_CH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_CH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_CH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_CH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_FR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_FR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_FR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_FR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_LI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_LI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_LI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_LI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv_IM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv_IM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv_IM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv_IM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_GH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_GH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_GH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_GH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw_US.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw_US.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw_US.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw_US.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he_IL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he_IL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he_IL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he_IL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_BA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_BA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_BA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_BA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_HR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_HR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_HR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_HR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb_DE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb_DE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb_DE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb_DE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu_HU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu_HU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu_HU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu_HU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy_AM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy_AM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy_AM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy_AM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id_ID.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id_ID.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id_ID.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id_ID.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig_NG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig_NG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig_NG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig_NG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii_CN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii_CN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii_CN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii_CN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is_IS.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is_IS.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is_IS.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is_IS.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_CH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_CH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_CH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_CH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_IT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_IT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_IT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_IT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_SM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_SM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_SM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_SM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja_JP.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja_JP.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja_JP.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja_JP.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka_GE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka_GE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka_GE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka_GE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab_DZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab_DZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab_DZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab_DZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea_CV.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea_CV.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea_CV.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea_CV.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq_ML.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq_ML.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq_ML.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq_ML.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk_KZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk_KZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk_KZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk_KZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl_GL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl_GL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl_GL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl_GL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km_KH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km_KH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km_KH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km_KH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KP.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KP.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KP.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KP.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh_DE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh_DE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh_DE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh_DE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw_GB.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw_GB.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw_GB.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw_GB.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky_KG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky_KG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky_KG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky_KG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb_LU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb_LU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb_LU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb_LU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg_UG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg_UG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg_UG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg_UG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt_US.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt_US.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt_US.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt_US.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_AO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_AO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_AO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_AO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CF.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CF.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CF.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CF.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo_LA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo_LA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo_LA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo_LA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IQ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IQ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IQ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IQ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt_LT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt_LT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt_LT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt_LT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu_CD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu_CD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu_CD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu_CD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv_LV.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv_LV.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv_LV.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv_LV.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe_MU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe_MU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe_MU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe_MU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg_MG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg_MG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg_MG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg_MG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh_MZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh_MZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh_MZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh_MZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk_MK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk_MK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk_MK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk_MK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn_MN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn_MN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn_MN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn_MN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_BN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_BN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_BN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_BN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_MY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_MY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_MY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_MY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_SG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_SG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_SG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_SG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt_MT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt_MT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt_MT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt_MT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my_MM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my_MM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my_MM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my_MM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn_IR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn_IR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn_IR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn_IR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq_NA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq_NA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq_NA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq_NA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_NO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_NO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_NO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_NO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_SJ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_SJ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_SJ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_SJ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd_ZW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd_ZW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd_ZW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd_ZW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_NP.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_NP.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_NP.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_NP.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_AW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_AW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_AW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_AW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BQ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BQ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BQ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BQ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_CW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_CW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_CW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_CW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_NL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_NL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_NL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_NL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SX.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SX.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SX.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SX.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn_NO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn_NO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn_NO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn_NO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus_SS.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus_SS.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus_SS.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus_SS.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn_UG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn_UG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn_UG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn_UG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_ET.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_ET.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_ET.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_ET.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_GE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_GE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_GE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_GE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_RU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_RU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_RU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_RU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab_PK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab_PK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab_PK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab_PK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl_PL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl_PL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl_PL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl_PL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg_001.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg_001.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg_001.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg_001.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps_AF.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps_AF.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps_AF.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps_AF.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_AO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_AO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_AO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_AO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_BR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_BR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_BR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_BR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CV.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CV.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CV.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CV.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GQ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GQ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GQ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GQ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_LU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_LU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_LU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_LU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_PT.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_PT.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_PT.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_PT.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_ST.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_ST.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_ST.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_ST.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_TL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_TL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_TL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_TL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_BO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_BO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_BO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_BO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_EC.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_EC.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_EC.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_EC.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_PE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_PE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_PE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_PE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm_CH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm_CH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm_CH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm_CH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn_BI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn_BI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn_BI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn_BI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_MD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_MD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_MD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_MD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_RO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_RO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_RO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_RO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/root.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/root.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/root.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/root.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_BY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_BY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_BY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_BY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_MD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_MD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_MD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_MD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_RU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_RU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_RU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_RU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_UA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_UA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_UA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_UA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw_RW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw_RW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw_RW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw_RW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah_RU.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah_RU.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah_RU.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah_RU.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_FI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_FI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_FI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_FI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_NO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_NO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_NO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_NO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_SE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_SE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_SE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_SE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh_MZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh_MZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh_MZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh_MZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses_ML.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses_ML.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses_ML.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses_ML.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg_CF.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg_CF.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg_CF.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg_CF.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn_MA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn_MA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn_MA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn_MA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng_MA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng_MA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng_MA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng_MA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si_LK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si_LK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si_LK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si_LK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk_SK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk_SK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk_SK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk_SK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl_SI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl_SI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl_SI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl_SI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn_FI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn_FI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn_FI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn_FI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn_ZW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn_ZW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn_ZW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn_ZW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_DJ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_DJ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_DJ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_DJ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_ET.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_ET.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_ET.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_ET.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_SO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_SO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_SO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_SO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_AL.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_AL.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_AL.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_AL.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_MK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_MK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_MK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_MK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_XK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_XK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_XK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_XK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_BA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_BA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_BA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_BA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_ME.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_ME.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_ME.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_ME.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_RS.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_RS.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_RS.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_RS.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_XK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_XK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_XK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_XK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_BA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_BA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_BA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_BA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_ME.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_ME.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_ME.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_ME.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_RS.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_RS.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_RS.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_RS.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_XK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_XK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_XK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_XK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_AX.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_AX.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_AX.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_AX.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_FI.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_FI.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_FI.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_FI.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_SE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_SE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_SE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_SE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_CD.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_CD.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_CD.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_CD.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_UG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_UG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_UG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_UG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_LK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_LK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_LK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_LK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_MY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_MY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_MY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_MY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_SG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_SG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_SG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_SG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_KE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_KE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_KE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_KE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_UG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_UG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_UG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_UG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th_TH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th_TH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th_TH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th_TH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ER.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ER.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ER.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ER.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ET.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ET.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ET.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ET.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk_TM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk_TM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk_TM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk_TM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to_TO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to_TO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to_TO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to_TO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_CY.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_CY.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_CY.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_CY.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_TR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_TR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_TR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_TR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq_NE.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq_NE.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq_NE.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq_NE.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm_MA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm_MA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm_MA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm_MA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug_CN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug_CN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug_CN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug_CN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk_UA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk_UA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk_UA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk_UA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_IN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_IN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_IN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_IN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_PK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_PK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_PK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_PK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab_AF.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab_AF.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab_AF.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab_AF.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl_UZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl_UZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl_UZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl_UZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn_UZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn_UZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn_UZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn_UZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn_LR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn_LR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn_LR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn_LR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii_LR.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii_LR.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii_LR.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii_LR.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi_VN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi_VN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi_VN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi_VN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo_001.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo_001.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo_001.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo_001.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun_TZ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun_TZ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun_TZ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun_TZ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae_CH.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae_CH.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae_CH.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae_CH.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog_UG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog_UG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog_UG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog_UG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav_CM.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav_CM.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav_CM.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav_CM.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi_001.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi_001.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi_001.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi_001.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_BJ.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_BJ.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_BJ.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_BJ.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_NG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_NG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_NG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_NG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_HK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_HK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_HK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_HK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh_MA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh_MA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh_MA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh_MA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_CN.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_CN.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_CN.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_CN.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_HK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_HK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_HK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_HK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_MO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_MO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_MO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_MO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_SG.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_SG.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_SG.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_SG.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_HK.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_HK.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_HK.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_HK.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_MO.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_MO.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_MO.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_MO.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_TW.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_TW.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_TW.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_TW.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu_ZA.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu_ZA.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu_ZA.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu_ZA.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/attributeValueValidity.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/attributeValueValidity.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/attributeValueValidity.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/attributeValueValidity.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/characters.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/characters.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/characters.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/characters.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/coverageLevels.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/coverageLevels.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/coverageLevels.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/coverageLevels.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/dayPeriods.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/dayPeriods.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/dayPeriods.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/dayPeriods.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/genderList.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/genderList.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/genderList.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/genderList.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/languageInfo.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/languageInfo.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/languageInfo.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/languageInfo.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/likelySubtags.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/likelySubtags.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/likelySubtags.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/likelySubtags.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/metaZones.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/metaZones.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/metaZones.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/metaZones.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/numberingSystems.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/numberingSystems.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/numberingSystems.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/numberingSystems.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/ordinals.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/ordinals.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/ordinals.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/ordinals.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/pluralRanges.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/pluralRanges.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/pluralRanges.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/pluralRanges.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/plurals.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/plurals.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/plurals.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/plurals.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/rgScope.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/rgScope.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/rgScope.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/rgScope.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/subdivisions.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/subdivisions.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/subdivisions.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/subdivisions.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalData.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalData.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalData.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalData.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalMetadata.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalMetadata.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalMetadata.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalMetadata.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/telephoneCodeData.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/telephoneCodeData.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/telephoneCodeData.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/telephoneCodeData.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/windowsZones.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/windowsZones.xml similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/windowsZones.xml rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/windowsZones.xml diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/unicode-license.txt b/src/jdk.localedata/share/classes/sun/util/cldr/resources/unicode-license.txt similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/unicode-license.txt rename to src/jdk.localedata/share/classes/sun/util/cldr/resources/unicode-license.txt diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ar.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ar.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ar.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ar.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_be.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_be.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_be.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_be.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_bg.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_bg.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_bg.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_bg.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ca.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ca.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ca.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ca.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_cs.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_cs.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_cs.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_cs.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_da.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_da.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_da.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_da.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_de.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_de.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_de.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_de.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el_CY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el_CY.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el_CY.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_el_CY.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_GB.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_GB.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_GB.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_GB.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_IE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_IE.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_IE.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_IE.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_MT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_MT.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_MT.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_en_MT.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_ES.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_ES.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_ES.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_ES.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_US.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_US.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_US.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_es_US.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_et.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_et.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_et.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_et.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fi.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fi.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fi.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr_CA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr_CA.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr_CA.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_fr_CA.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hi.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hi.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hi.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hr.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hr.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hr.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hu.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hu.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hu.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_hu.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_in_ID.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_in_ID.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_in_ID.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_in_ID.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_is.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_is.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_is.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_is.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_it.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_it.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_it.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_it.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_iw.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_iw.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_iw.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_iw.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ja.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ja.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ja.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ja.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ko.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ko.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ko.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ko.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lt.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lt.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lt.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lv.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lv.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_lv.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mk.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mk.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mk.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ms_MY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ms_MY.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ms_MY.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ms_MY.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt_MT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt_MT.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt_MT.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_mt_MT.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_nl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_nl.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_nl.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_nl.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_no.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_no.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_no.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_no.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pl.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pl.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pl.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_BR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_BR.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_BR.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_BR.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_PT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_PT.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_PT.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_pt_PT.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ro.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ro.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ro.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ro.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ru.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ru.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ru.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_ru.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sk.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sk.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sk.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sl.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sl.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sl.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sq.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sq.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sq.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sq.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_BA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_BA.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_BA.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_BA.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_ME.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_ME.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_ME.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_ME.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_RS.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_RS.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_RS.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sr_Latn_RS.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sv.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sv.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_sv.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_th.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_th.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_th.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_th.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_tr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_tr.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_tr.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_tr.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_uk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_uk.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_uk.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_uk.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_vi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_vi.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_vi.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_vi.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_zh.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_zh.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_zh.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CalendarData_zh.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_AE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_AE.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_AE.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_AE.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_BH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_BH.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_BH.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_BH.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_DZ.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_DZ.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_DZ.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_DZ.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_EG.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_EG.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_EG.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_EG.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_IQ.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_IQ.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_IQ.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_IQ.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_JO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_JO.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_JO.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_JO.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_KW.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_KW.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_KW.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_KW.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LB.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LB.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LB.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LB.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LY.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LY.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LY.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_MA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_MA.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_MA.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_MA.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_OM.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_OM.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_OM.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_OM.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_QA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_QA.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_QA.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_QA.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SA.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SA.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SA.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SD.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SD.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SD.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SD.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SY.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SY.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SY.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_TN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_TN.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_TN.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_TN.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_YE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_YE.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_YE.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_YE.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_bg_BG.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_bg_BG.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_bg_BG.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_bg_BG.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ca_ES.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ca_ES.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ca_ES.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ca_ES.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_cs_CZ.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_cs_CZ.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_cs_CZ.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_cs_CZ.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_da_DK.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_da_DK.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_da_DK.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_da_DK.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_AT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_AT.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_AT.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_AT.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_CH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_CH.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_CH.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_CH.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_DE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_DE.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_DE.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_DE.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_LU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_LU.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_LU.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_LU.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_CY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_CY.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_CY.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_CY.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_GR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_GR.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_GR.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_GR.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_AU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_AU.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_AU.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_AU.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_CA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_CA.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_CA.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_CA.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_GB.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_GB.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_GB.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_GB.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IE.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IE.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IE.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IN.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IN.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IN.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_MT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_MT.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_MT.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_MT.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_NZ.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_NZ.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_NZ.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_NZ.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_PH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_PH.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_PH.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_PH.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_SG.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_SG.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_SG.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_SG.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_ZA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_ZA.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_ZA.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_ZA.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_AR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_AR.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_AR.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_AR.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_BO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_BO.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_BO.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_BO.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CL.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CL.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CL.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CO.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CO.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CO.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CR.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CR.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CR.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CU.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CU.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_CU.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_DO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_DO.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_DO.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_DO.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_EC.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_EC.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_EC.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_EC.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_ES.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_ES.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_ES.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_ES.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_GT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_GT.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_GT.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_GT.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_HN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_HN.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_HN.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_HN.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_MX.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_MX.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_MX.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_MX.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_NI.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_NI.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_NI.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_NI.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PA.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PA.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PA.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PE.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PE.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PE.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PR.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PR.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PR.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PY.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PY.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_PY.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_SV.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_SV.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_SV.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_SV.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_US.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_US.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_US.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_US.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_UY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_UY.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_UY.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_UY.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_VE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_VE.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_VE.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_VE.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_et_EE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_et_EE.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_et_EE.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_et_EE.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fi_FI.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fi_FI.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fi_FI.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fi_FI.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_BE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_BE.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_BE.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_BE.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CA.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CA.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CA.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CH.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CH.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_CH.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_FR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_FR.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_FR.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_FR.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_LU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_LU.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_LU.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_LU.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ga_IE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ga_IE.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ga_IE.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ga_IE.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hi_IN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hi_IN.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hi_IN.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hi_IN.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hu_HU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hu_HU.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hu_HU.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hu_HU.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_in_ID.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_in_ID.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_in_ID.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_in_ID.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_is_IS.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_is_IS.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_is_IS.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_is_IS.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_CH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_CH.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_CH.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_CH.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_IT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_IT.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_IT.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_IT.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_iw_IL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_iw_IL.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_iw_IL.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_iw_IL.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja_JP.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja_JP.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja_JP.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja_JP.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko_KR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko_KR.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko_KR.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko_KR.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lt_LT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lt_LT.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lt_LT.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lt_LT.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lv_LV.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lv_LV.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lv_LV.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lv_LV.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mk_MK.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mk_MK.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mk_MK.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mk_MK.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ms_MY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ms_MY.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ms_MY.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ms_MY.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mt_MT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mt_MT.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mt_MT.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mt_MT.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_BE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_BE.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_BE.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_BE.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_NL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_NL.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_NL.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_NL.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_no_NO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_no_NO.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_no_NO.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_no_NO.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pl_PL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pl_PL.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pl_PL.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pl_PL.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_BR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_BR.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_BR.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_BR.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_PT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_PT.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_PT.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_PT.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ro_RO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ro_RO.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ro_RO.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ro_RO.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ru_RU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ru_RU.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ru_RU.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ru_RU.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sk_SK.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sk_SK.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sk_SK.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sk_SK.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sl_SI.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sl_SI.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sl_SI.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sl_SI.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sq_AL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sq_AL.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sq_AL.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sq_AL.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_BA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_BA.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_BA.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_BA.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_CS.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_CS.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_CS.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_CS.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_BA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_BA.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_BA.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_BA.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_ME.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_ME.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_ME.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_ME.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_RS.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_RS.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_RS.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_RS.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_ME.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_ME.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_ME.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_ME.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_RS.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_RS.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_RS.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_RS.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv_SE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv_SE.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv_SE.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv_SE.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_th_TH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_th_TH.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_th_TH.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_th_TH.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_tr_TR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_tr_TR.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_tr_TR.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_tr_TR.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_uk_UA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_uk_UA.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_uk_UA.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_uk_UA.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_vi_VN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_vi_VN.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_vi_VN.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_vi_VN.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_HK.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_HK.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_HK.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_HK.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_SG.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_SG.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_SG.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_SG.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_TW.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_TW.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_TW.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_TW.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ar.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ar.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ar.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ar.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_be.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_be.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_be.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_be.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_bg.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_bg.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_bg.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_bg.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ca.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ca.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ca.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ca.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_cs.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_cs.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_cs.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_cs.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_da.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_da.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_da.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_da.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_de.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_de.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_de.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_de.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el_CY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el_CY.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el_CY.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el_CY.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_MT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_MT.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_MT.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_MT.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_PH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_PH.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_PH.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_PH.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_SG.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_SG.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_SG.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_en_SG.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es_US.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es_US.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es_US.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es_US.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_et.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_et.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_et.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_et.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fi.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fi.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fi.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fr.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fr.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fr.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ga.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ga.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ga.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ga.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hi.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hi.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hi.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hr.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hr.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hr.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hu.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hu.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hu.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hu.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_in.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_in.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_in.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_in.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_is.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_is.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_is.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_is.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_it.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_it.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_it.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_it.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_iw.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_iw.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_iw.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_iw.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ja.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ja.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ja.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ja.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ko.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ko.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ko.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ko.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lt.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lt.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lt.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lv.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lv.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lv.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mk.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mk.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mk.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ms.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ms.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ms.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ms.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mt.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mt.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mt.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_nl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_nl.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_nl.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_nl.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no_NO_NY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no_NO_NY.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no_NO_NY.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no_NO_NY.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pl.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pl.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pl.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_BR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_BR.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_BR.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_BR.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_PT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_PT.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_PT.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_PT.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ro.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ro.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ro.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ro.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ru.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ru.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ru.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ru.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sk.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sk.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sk.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sl.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sl.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sl.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sq.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sq.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sq.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sq.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr_Latn.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr_Latn.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr_Latn.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr_Latn.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sv.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sv.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sv.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_th.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_th.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_th.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_th.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_tr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_tr.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_tr.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_tr.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_uk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_uk.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_uk.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_uk.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_vi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_vi.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_vi.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_vi.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_HK.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_HK.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_HK.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_HK.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_SG.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_SG.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_SG.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_SG.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_TW.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_TW.properties similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_TW.properties rename to src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_TW.properties diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_CA.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_CA.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_CA.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_CA.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_GB.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_GB.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_GB.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_GB.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_IE.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_IE.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_IE.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_IE.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_hi.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_hi.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_hi.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_hi.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_HK.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_HK.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_HK.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_HK.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java rename to src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/provider/LocaleDataProvider.java b/src/jdk.localedata/share/classes/sun/util/resources/provider/LocaleDataProvider.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/provider/LocaleDataProvider.java rename to src/jdk.localedata/share/classes/sun/util/resources/provider/LocaleDataProvider.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/resources/provider/SupplementaryLocaleDataProvider.java b/src/jdk.localedata/share/classes/sun/util/resources/provider/SupplementaryLocaleDataProvider.java similarity index 100% rename from jdk/src/jdk.localedata/share/classes/sun/util/resources/provider/SupplementaryLocaleDataProvider.java rename to src/jdk.localedata/share/classes/sun/util/resources/provider/SupplementaryLocaleDataProvider.java diff --git a/jdk/src/jdk.localedata/share/legal/cldr.md b/src/jdk.localedata/share/legal/cldr.md similarity index 100% rename from jdk/src/jdk.localedata/share/legal/cldr.md rename to src/jdk.localedata/share/legal/cldr.md diff --git a/jdk/src/jdk.localedata/share/legal/thaidict.md b/src/jdk.localedata/share/legal/thaidict.md similarity index 100% rename from jdk/src/jdk.localedata/share/legal/thaidict.md rename to src/jdk.localedata/share/legal/thaidict.md diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java b/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java rename to src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/AgentConfigurationError.java b/src/jdk.management.agent/share/classes/jdk/internal/agent/AgentConfigurationError.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/AgentConfigurationError.java rename to src/jdk.management.agent/share/classes/jdk/internal/agent/AgentConfigurationError.java diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/ConnectorAddressLink.java b/src/jdk.management.agent/share/classes/jdk/internal/agent/ConnectorAddressLink.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/ConnectorAddressLink.java rename to src/jdk.management.agent/share/classes/jdk/internal/agent/ConnectorAddressLink.java diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/FileSystem.java b/src/jdk.management.agent/share/classes/jdk/internal/agent/FileSystem.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/FileSystem.java rename to src/jdk.management.agent/share/classes/jdk/internal/agent/FileSystem.java diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties rename to src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties rename to src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties rename to src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties rename to src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties rename to src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties rename to src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties rename to src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties rename to src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties rename to src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties rename to src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties rename to src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties diff --git a/jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/spi/AgentProvider.java b/src/jdk.management.agent/share/classes/jdk/internal/agent/spi/AgentProvider.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/spi/AgentProvider.java rename to src/jdk.management.agent/share/classes/jdk/internal/agent/spi/AgentProvider.java diff --git a/jdk/src/jdk.management.agent/share/classes/module-info.java b/src/jdk.management.agent/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/module-info.java rename to src/jdk.management.agent/share/classes/module-info.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpBroadcaster.java b/src/jdk.management.agent/share/classes/sun/management/jdp/JdpBroadcaster.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpBroadcaster.java rename to src/jdk.management.agent/share/classes/sun/management/jdp/JdpBroadcaster.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpController.java b/src/jdk.management.agent/share/classes/sun/management/jdp/JdpController.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpController.java rename to src/jdk.management.agent/share/classes/sun/management/jdp/JdpController.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpException.java b/src/jdk.management.agent/share/classes/sun/management/jdp/JdpException.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpException.java rename to src/jdk.management.agent/share/classes/sun/management/jdp/JdpException.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpGenericPacket.java b/src/jdk.management.agent/share/classes/sun/management/jdp/JdpGenericPacket.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpGenericPacket.java rename to src/jdk.management.agent/share/classes/sun/management/jdp/JdpGenericPacket.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpJmxPacket.java b/src/jdk.management.agent/share/classes/sun/management/jdp/JdpJmxPacket.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpJmxPacket.java rename to src/jdk.management.agent/share/classes/sun/management/jdp/JdpJmxPacket.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpPacket.java b/src/jdk.management.agent/share/classes/sun/management/jdp/JdpPacket.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpPacket.java rename to src/jdk.management.agent/share/classes/sun/management/jdp/JdpPacket.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpPacketReader.java b/src/jdk.management.agent/share/classes/sun/management/jdp/JdpPacketReader.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpPacketReader.java rename to src/jdk.management.agent/share/classes/sun/management/jdp/JdpPacketReader.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpPacketWriter.java b/src/jdk.management.agent/share/classes/sun/management/jdp/JdpPacketWriter.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jdp/JdpPacketWriter.java rename to src/jdk.management.agent/share/classes/sun/management/jdp/JdpPacketWriter.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jdp/package-info.java b/src/jdk.management.agent/share/classes/sun/management/jdp/package-info.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jdp/package-info.java rename to src/jdk.management.agent/share/classes/sun/management/jdp/package-info.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jmxremote/ConnectorBootstrap.java b/src/jdk.management.agent/share/classes/sun/management/jmxremote/ConnectorBootstrap.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jmxremote/ConnectorBootstrap.java rename to src/jdk.management.agent/share/classes/sun/management/jmxremote/ConnectorBootstrap.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java b/src/jdk.management.agent/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java rename to src/jdk.management.agent/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jmxremote/SingleEntryRegistry.java b/src/jdk.management.agent/share/classes/sun/management/jmxremote/SingleEntryRegistry.java similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jmxremote/SingleEntryRegistry.java rename to src/jdk.management.agent/share/classes/sun/management/jmxremote/SingleEntryRegistry.java diff --git a/jdk/src/jdk.management.agent/share/classes/sun/management/jmxremote/package.html b/src/jdk.management.agent/share/classes/sun/management/jmxremote/package.html similarity index 100% rename from jdk/src/jdk.management.agent/share/classes/sun/management/jmxremote/package.html rename to src/jdk.management.agent/share/classes/sun/management/jmxremote/package.html diff --git a/jdk/src/jdk.management.agent/share/conf/jmxremote.access b/src/jdk.management.agent/share/conf/jmxremote.access similarity index 100% rename from jdk/src/jdk.management.agent/share/conf/jmxremote.access rename to src/jdk.management.agent/share/conf/jmxremote.access diff --git a/jdk/src/jdk.management.agent/share/conf/jmxremote.password.template b/src/jdk.management.agent/share/conf/jmxremote.password.template similarity index 100% rename from jdk/src/jdk.management.agent/share/conf/jmxremote.password.template rename to src/jdk.management.agent/share/conf/jmxremote.password.template diff --git a/jdk/src/jdk.management.agent/share/conf/management.properties b/src/jdk.management.agent/share/conf/management.properties similarity index 100% rename from jdk/src/jdk.management.agent/share/conf/management.properties rename to src/jdk.management.agent/share/conf/management.properties diff --git a/jdk/src/jdk.management.agent/unix/classes/jdk/internal/agent/FileSystemImpl.java b/src/jdk.management.agent/unix/classes/jdk/internal/agent/FileSystemImpl.java similarity index 100% rename from jdk/src/jdk.management.agent/unix/classes/jdk/internal/agent/FileSystemImpl.java rename to src/jdk.management.agent/unix/classes/jdk/internal/agent/FileSystemImpl.java diff --git a/jdk/src/jdk.management.agent/unix/native/libmanagement_agent/FileSystemImpl.c b/src/jdk.management.agent/unix/native/libmanagement_agent/FileSystemImpl.c similarity index 100% rename from jdk/src/jdk.management.agent/unix/native/libmanagement_agent/FileSystemImpl.c rename to src/jdk.management.agent/unix/native/libmanagement_agent/FileSystemImpl.c diff --git a/jdk/src/jdk.management.agent/windows/classes/jdk/internal/agent/FileSystemImpl.java b/src/jdk.management.agent/windows/classes/jdk/internal/agent/FileSystemImpl.java similarity index 100% rename from jdk/src/jdk.management.agent/windows/classes/jdk/internal/agent/FileSystemImpl.java rename to src/jdk.management.agent/windows/classes/jdk/internal/agent/FileSystemImpl.java diff --git a/jdk/src/jdk.management.agent/windows/native/libmanagement_agent/FileSystemImpl.c b/src/jdk.management.agent/windows/native/libmanagement_agent/FileSystemImpl.c similarity index 100% rename from jdk/src/jdk.management.agent/windows/native/libmanagement_agent/FileSystemImpl.c rename to src/jdk.management.agent/windows/native/libmanagement_agent/FileSystemImpl.c diff --git a/jdk/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c b/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c similarity index 100% rename from jdk/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c rename to src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c diff --git a/jdk/src/jdk.management/linux/native/libmanagement_ext/UnixOperatingSystem.c b/src/jdk.management/linux/native/libmanagement_ext/UnixOperatingSystem.c similarity index 100% rename from jdk/src/jdk.management/linux/native/libmanagement_ext/UnixOperatingSystem.c rename to src/jdk.management/linux/native/libmanagement_ext/UnixOperatingSystem.c diff --git a/jdk/src/jdk.management/macosx/native/libmanagement_ext/UnixOperatingSystem.c b/src/jdk.management/macosx/native/libmanagement_ext/UnixOperatingSystem.c similarity index 100% rename from jdk/src/jdk.management/macosx/native/libmanagement_ext/UnixOperatingSystem.c rename to src/jdk.management/macosx/native/libmanagement_ext/UnixOperatingSystem.c diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java b/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java rename to src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java b/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java rename to src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java b/src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java rename to src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/GcInfo.java b/src/jdk.management/share/classes/com/sun/management/GcInfo.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/GcInfo.java rename to src/jdk.management/share/classes/com/sun/management/GcInfo.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java b/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java rename to src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java b/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java rename to src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java b/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java rename to src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java b/src/jdk.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java rename to src/jdk.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/VMOption.java b/src/jdk.management/share/classes/com/sun/management/VMOption.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/VMOption.java rename to src/jdk.management/share/classes/com/sun/management/VMOption.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandArgumentInfo.java b/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandArgumentInfo.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandArgumentInfo.java rename to src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandArgumentInfo.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandImpl.java b/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandImpl.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandImpl.java rename to src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandImpl.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandInfo.java b/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandInfo.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandInfo.java rename to src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandInfo.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/Flag.java b/src/jdk.management/share/classes/com/sun/management/internal/Flag.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/internal/Flag.java rename to src/jdk.management/share/classes/com/sun/management/internal/Flag.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotifInfoCompositeData.java b/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotifInfoCompositeData.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotifInfoCompositeData.java rename to src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotifInfoCompositeData.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectorExtImpl.java b/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectorExtImpl.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectorExtImpl.java rename to src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectorExtImpl.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java b/src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java rename to src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/GcInfoCompositeData.java b/src/jdk.management/share/classes/com/sun/management/internal/GcInfoCompositeData.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/internal/GcInfoCompositeData.java rename to src/jdk.management/share/classes/com/sun/management/internal/GcInfoCompositeData.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.java b/src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.java rename to src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/HotSpotThreadImpl.java b/src/jdk.management/share/classes/com/sun/management/internal/HotSpotThreadImpl.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/internal/HotSpotThreadImpl.java rename to src/jdk.management/share/classes/com/sun/management/internal/HotSpotThreadImpl.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java b/src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java rename to src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/VMOptionCompositeData.java b/src/jdk.management/share/classes/com/sun/management/internal/VMOptionCompositeData.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/internal/VMOptionCompositeData.java rename to src/jdk.management/share/classes/com/sun/management/internal/VMOptionCompositeData.java diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/package-info.java b/src/jdk.management/share/classes/com/sun/management/package-info.java similarity index 100% rename from jdk/src/jdk.management/share/classes/com/sun/management/package-info.java rename to src/jdk.management/share/classes/com/sun/management/package-info.java diff --git a/jdk/src/jdk.management/share/classes/module-info.java b/src/jdk.management/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.management/share/classes/module-info.java rename to src/jdk.management/share/classes/module-info.java diff --git a/jdk/src/jdk.management/share/native/libmanagement_ext/DiagnosticCommandImpl.c b/src/jdk.management/share/native/libmanagement_ext/DiagnosticCommandImpl.c similarity index 100% rename from jdk/src/jdk.management/share/native/libmanagement_ext/DiagnosticCommandImpl.c rename to src/jdk.management/share/native/libmanagement_ext/DiagnosticCommandImpl.c diff --git a/jdk/src/jdk.management/share/native/libmanagement_ext/Flag.c b/src/jdk.management/share/native/libmanagement_ext/Flag.c similarity index 100% rename from jdk/src/jdk.management/share/native/libmanagement_ext/Flag.c rename to src/jdk.management/share/native/libmanagement_ext/Flag.c diff --git a/jdk/src/jdk.management/share/native/libmanagement_ext/GarbageCollectorExtImpl.c b/src/jdk.management/share/native/libmanagement_ext/GarbageCollectorExtImpl.c similarity index 100% rename from jdk/src/jdk.management/share/native/libmanagement_ext/GarbageCollectorExtImpl.c rename to src/jdk.management/share/native/libmanagement_ext/GarbageCollectorExtImpl.c diff --git a/jdk/src/jdk.management/share/native/libmanagement_ext/GcInfoBuilder.c b/src/jdk.management/share/native/libmanagement_ext/GcInfoBuilder.c similarity index 100% rename from jdk/src/jdk.management/share/native/libmanagement_ext/GcInfoBuilder.c rename to src/jdk.management/share/native/libmanagement_ext/GcInfoBuilder.c diff --git a/jdk/src/jdk.management/share/native/libmanagement_ext/HotSpotDiagnostic.c b/src/jdk.management/share/native/libmanagement_ext/HotSpotDiagnostic.c similarity index 100% rename from jdk/src/jdk.management/share/native/libmanagement_ext/HotSpotDiagnostic.c rename to src/jdk.management/share/native/libmanagement_ext/HotSpotDiagnostic.c diff --git a/jdk/src/jdk.management/share/native/libmanagement_ext/management_ext.c b/src/jdk.management/share/native/libmanagement_ext/management_ext.c similarity index 100% rename from jdk/src/jdk.management/share/native/libmanagement_ext/management_ext.c rename to src/jdk.management/share/native/libmanagement_ext/management_ext.c diff --git a/jdk/src/jdk.management/share/native/libmanagement_ext/management_ext.h b/src/jdk.management/share/native/libmanagement_ext/management_ext.h similarity index 100% rename from jdk/src/jdk.management/share/native/libmanagement_ext/management_ext.h rename to src/jdk.management/share/native/libmanagement_ext/management_ext.h diff --git a/jdk/src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c b/src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c similarity index 100% rename from jdk/src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c rename to src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c diff --git a/jdk/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java b/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java similarity index 100% rename from jdk/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java rename to src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java diff --git a/jdk/src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c b/src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c similarity index 100% rename from jdk/src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c rename to src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c diff --git a/jdk/src/jdk.management/windows/classes/com/sun/management/internal/OperatingSystemImpl.java b/src/jdk.management/windows/classes/com/sun/management/internal/OperatingSystemImpl.java similarity index 100% rename from jdk/src/jdk.management/windows/classes/com/sun/management/internal/OperatingSystemImpl.java rename to src/jdk.management/windows/classes/com/sun/management/internal/OperatingSystemImpl.java diff --git a/jdk/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c b/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c similarity index 100% rename from jdk/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c rename to src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsClient.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsClient.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsClient.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsClient.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContextFactory.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContextFactory.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContextFactory.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContextFactory.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsName.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsName.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsName.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsName.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsNameParser.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsNameParser.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsNameParser.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsNameParser.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsUrl.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsUrl.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsUrl.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsUrl.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Header.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Header.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Header.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Header.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/NameNode.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/NameNode.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/NameNode.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/dns/NameNode.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Resolver.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Resolver.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Resolver.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/dns/Resolver.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecord.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecord.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecord.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecord.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecords.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecords.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecords.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecords.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ZoneNode.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ZoneNode.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ZoneNode.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ZoneNode.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns/dnsURLContext.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns/dnsURLContext.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns/dnsURLContext.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns/dnsURLContext.java diff --git a/jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns/dnsURLContextFactory.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns/dnsURLContextFactory.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns/dnsURLContextFactory.java rename to src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns/dnsURLContextFactory.java diff --git a/jdk/src/jdk.naming.dns/share/classes/module-info.java b/src/jdk.naming.dns/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.naming.dns/share/classes/module-info.java rename to src/jdk.naming.dns/share/classes/module-info.java diff --git a/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java similarity index 100% rename from jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java rename to src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java diff --git a/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java similarity index 100% rename from jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java rename to src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java diff --git a/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java similarity index 100% rename from jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java rename to src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java diff --git a/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java similarity index 100% rename from jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java rename to src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java diff --git a/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java similarity index 100% rename from jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java rename to src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java diff --git a/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java similarity index 100% rename from jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java rename to src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java diff --git a/jdk/src/jdk.naming.rmi/share/classes/module-info.java b/src/jdk.naming.rmi/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.naming.rmi/share/classes/module-info.java rename to src/jdk.naming.rmi/share/classes/module-info.java diff --git a/jdk/src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java b/src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java similarity index 100% rename from jdk/src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java rename to src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java diff --git a/jdk/src/jdk.net/share/classes/jdk/net/NetworkPermission.java b/src/jdk.net/share/classes/jdk/net/NetworkPermission.java similarity index 100% rename from jdk/src/jdk.net/share/classes/jdk/net/NetworkPermission.java rename to src/jdk.net/share/classes/jdk/net/NetworkPermission.java diff --git a/jdk/src/jdk.net/share/classes/jdk/net/SocketFlow.java b/src/jdk.net/share/classes/jdk/net/SocketFlow.java similarity index 100% rename from jdk/src/jdk.net/share/classes/jdk/net/SocketFlow.java rename to src/jdk.net/share/classes/jdk/net/SocketFlow.java diff --git a/jdk/src/jdk.net/share/classes/jdk/net/Sockets.java b/src/jdk.net/share/classes/jdk/net/Sockets.java similarity index 100% rename from jdk/src/jdk.net/share/classes/jdk/net/Sockets.java rename to src/jdk.net/share/classes/jdk/net/Sockets.java diff --git a/jdk/src/jdk.net/share/classes/jdk/net/package-info.java b/src/jdk.net/share/classes/jdk/net/package-info.java similarity index 100% rename from jdk/src/jdk.net/share/classes/jdk/net/package-info.java rename to src/jdk.net/share/classes/jdk/net/package-info.java diff --git a/jdk/src/jdk.net/share/classes/module-info.java b/src/jdk.net/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.net/share/classes/module-info.java rename to src/jdk.net/share/classes/module-info.java diff --git a/jdk/src/jdk.net/solaris/classes/jdk/net/SolarisSocketOptions.java b/src/jdk.net/solaris/classes/jdk/net/SolarisSocketOptions.java similarity index 100% rename from jdk/src/jdk.net/solaris/classes/jdk/net/SolarisSocketOptions.java rename to src/jdk.net/solaris/classes/jdk/net/SolarisSocketOptions.java diff --git a/jdk/src/jdk.net/solaris/native/libextnet/SolarisSocketOptions.c b/src/jdk.net/solaris/native/libextnet/SolarisSocketOptions.c similarity index 100% rename from jdk/src/jdk.net/solaris/native/libextnet/SolarisSocketOptions.c rename to src/jdk.net/solaris/native/libextnet/SolarisSocketOptions.c diff --git a/jdk/src/jdk.net/solaris/native/libextnet/SolarisSocketOptions.h b/src/jdk.net/solaris/native/libextnet/SolarisSocketOptions.h similarity index 100% rename from jdk/src/jdk.net/solaris/native/libextnet/SolarisSocketOptions.h rename to src/jdk.net/solaris/native/libextnet/SolarisSocketOptions.h diff --git a/jdk/src/jdk.pack/share/classes/module-info.java b/src/jdk.pack/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.pack/share/classes/module-info.java rename to src/jdk.pack/share/classes/module-info.java diff --git a/jdk/src/jdk.pack/share/native/common-unpack/bands.cpp b/src/jdk.pack/share/native/common-unpack/bands.cpp similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/bands.cpp rename to src/jdk.pack/share/native/common-unpack/bands.cpp diff --git a/jdk/src/jdk.pack/share/native/common-unpack/bands.h b/src/jdk.pack/share/native/common-unpack/bands.h similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/bands.h rename to src/jdk.pack/share/native/common-unpack/bands.h diff --git a/jdk/src/jdk.pack/share/native/common-unpack/bytes.cpp b/src/jdk.pack/share/native/common-unpack/bytes.cpp similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/bytes.cpp rename to src/jdk.pack/share/native/common-unpack/bytes.cpp diff --git a/jdk/src/jdk.pack/share/native/common-unpack/bytes.h b/src/jdk.pack/share/native/common-unpack/bytes.h similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/bytes.h rename to src/jdk.pack/share/native/common-unpack/bytes.h diff --git a/jdk/src/jdk.pack/share/native/common-unpack/coding.cpp b/src/jdk.pack/share/native/common-unpack/coding.cpp similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/coding.cpp rename to src/jdk.pack/share/native/common-unpack/coding.cpp diff --git a/jdk/src/jdk.pack/share/native/common-unpack/coding.h b/src/jdk.pack/share/native/common-unpack/coding.h similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/coding.h rename to src/jdk.pack/share/native/common-unpack/coding.h diff --git a/jdk/src/jdk.pack/share/native/common-unpack/constants.h b/src/jdk.pack/share/native/common-unpack/constants.h similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/constants.h rename to src/jdk.pack/share/native/common-unpack/constants.h diff --git a/jdk/src/jdk.pack/share/native/common-unpack/defines.h b/src/jdk.pack/share/native/common-unpack/defines.h similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/defines.h rename to src/jdk.pack/share/native/common-unpack/defines.h diff --git a/jdk/src/jdk.pack/share/native/common-unpack/unpack.cpp b/src/jdk.pack/share/native/common-unpack/unpack.cpp similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/unpack.cpp rename to src/jdk.pack/share/native/common-unpack/unpack.cpp diff --git a/jdk/src/jdk.pack/share/native/common-unpack/unpack.h b/src/jdk.pack/share/native/common-unpack/unpack.h similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/unpack.h rename to src/jdk.pack/share/native/common-unpack/unpack.h diff --git a/jdk/src/jdk.pack/share/native/common-unpack/utils.cpp b/src/jdk.pack/share/native/common-unpack/utils.cpp similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/utils.cpp rename to src/jdk.pack/share/native/common-unpack/utils.cpp diff --git a/jdk/src/jdk.pack/share/native/common-unpack/utils.h b/src/jdk.pack/share/native/common-unpack/utils.h similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/utils.h rename to src/jdk.pack/share/native/common-unpack/utils.h diff --git a/jdk/src/jdk.pack/share/native/common-unpack/zip.cpp b/src/jdk.pack/share/native/common-unpack/zip.cpp similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/zip.cpp rename to src/jdk.pack/share/native/common-unpack/zip.cpp diff --git a/jdk/src/jdk.pack/share/native/common-unpack/zip.h b/src/jdk.pack/share/native/common-unpack/zip.h similarity index 100% rename from jdk/src/jdk.pack/share/native/common-unpack/zip.h rename to src/jdk.pack/share/native/common-unpack/zip.h diff --git a/jdk/src/jdk.pack/share/native/libunpack/jni.cpp b/src/jdk.pack/share/native/libunpack/jni.cpp similarity index 100% rename from jdk/src/jdk.pack/share/native/libunpack/jni.cpp rename to src/jdk.pack/share/native/libunpack/jni.cpp diff --git a/jdk/src/jdk.pack/share/native/unpack200/main.cpp b/src/jdk.pack/share/native/unpack200/main.cpp similarity index 100% rename from jdk/src/jdk.pack/share/native/unpack200/main.cpp rename to src/jdk.pack/share/native/unpack200/main.cpp diff --git a/jdk/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest b/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest similarity index 100% rename from jdk/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest rename to src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest diff --git a/jdk/src/jdk.policytool/share/classes/module-info.java b/src/jdk.policytool/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/module-info.java rename to src/jdk.policytool/share/classes/module-info.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_de.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_de.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_de.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_de.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_es.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_es.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_es.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_es.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_fr.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_fr.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_fr.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_fr.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_it.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_it.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_it.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_it.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_ja.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_ja.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_ja.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_ja.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_ko.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_ko.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_ko.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_ko.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_pt_BR.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_pt_BR.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_pt_BR.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_pt_BR.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_sv.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_sv.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_sv.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_sv.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_CN.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_CN.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_CN.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_CN.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_HK.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_HK.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_HK.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_HK.java diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_TW.java b/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_TW.java similarity index 100% rename from jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_TW.java rename to src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_TW.java diff --git a/jdk/src/jdk.rmic/share/classes/module-info.java b/src/jdk.rmic/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/module-info.java rename to src/jdk.rmic/share/classes/module-info.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Constants.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/Constants.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Constants.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/Constants.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Generator.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/Generator.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Generator.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/Generator.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/IndentingWriter.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/IndentingWriter.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/IndentingWriter.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/IndentingWriter.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Names.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/Names.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Names.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/Names.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIConstants.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIConstants.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIConstants.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/RMIConstants.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIGenerator.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIGenerator.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIGenerator.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/RMIGenerator.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RemoteClass.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/RemoteClass.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RemoteClass.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/RemoteClass.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Util.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/Util.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/Util.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/Util.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/AbstractType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/AbstractType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/AbstractType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/AbstractType.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ArrayType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ArrayType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ArrayType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ArrayType.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/BatchEnvironment.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/BatchEnvironment.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/BatchEnvironment.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/BatchEnvironment.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ClassType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ClassType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ClassType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ClassType.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Constants.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Constants.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Constants.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Constants.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextElement.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextElement.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextElement.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextElement.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/DirectoryLoader.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/DirectoryLoader.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/DirectoryLoader.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/DirectoryLoader.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Generator.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Generator.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Generator.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Generator.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLNames.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLNames.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLNames.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLNames.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ImplementationType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ImplementationType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ImplementationType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ImplementationType.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/InterfaceType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/InterfaceType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/InterfaceType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/InterfaceType.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NCClassType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NCClassType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NCClassType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NCClassType.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NCInterfaceType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NCInterfaceType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NCInterfaceType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NCInterfaceType.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NameContext.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NameContext.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NameContext.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/NameContext.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/PrimitiveType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/PrimitiveType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/PrimitiveType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/PrimitiveType.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/PrintGenerator.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/PrintGenerator.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/PrintGenerator.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/PrintGenerator.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/RemoteType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/RemoteType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/RemoteType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/RemoteType.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/SpecialClassType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/SpecialClassType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/SpecialClassType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/SpecialClassType.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StaticStringsHash.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StaticStringsHash.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StaticStringsHash.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StaticStringsHash.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StubGenerator.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StubGenerator.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StubGenerator.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StubGenerator.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Util.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Util.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Util.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Util.java diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ValueType.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ValueType.java similarity index 100% rename from corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ValueType.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ValueType.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Constants.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Constants.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Constants.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Constants.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Generator.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Generator.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Generator.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Generator.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Main.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Main.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Main.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Main.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Resources.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Resources.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Resources.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Resources.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Util.java b/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Util.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Util.java rename to src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Util.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic.properties b/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic.properties similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic.properties rename to src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic.properties diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_ja.properties b/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_ja.properties similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_ja.properties rename to src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_ja.properties diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties b/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties rename to src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/ArrayData.java b/src/jdk.rmic/share/classes/sun/tools/asm/ArrayData.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/ArrayData.java rename to src/jdk.rmic/share/classes/sun/tools/asm/ArrayData.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/Assembler.java b/src/jdk.rmic/share/classes/sun/tools/asm/Assembler.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/Assembler.java rename to src/jdk.rmic/share/classes/sun/tools/asm/Assembler.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/CatchData.java b/src/jdk.rmic/share/classes/sun/tools/asm/CatchData.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/CatchData.java rename to src/jdk.rmic/share/classes/sun/tools/asm/CatchData.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/ClassConstantData.java b/src/jdk.rmic/share/classes/sun/tools/asm/ClassConstantData.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/ClassConstantData.java rename to src/jdk.rmic/share/classes/sun/tools/asm/ClassConstantData.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/ConstantPool.java b/src/jdk.rmic/share/classes/sun/tools/asm/ConstantPool.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/ConstantPool.java rename to src/jdk.rmic/share/classes/sun/tools/asm/ConstantPool.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/ConstantPoolData.java b/src/jdk.rmic/share/classes/sun/tools/asm/ConstantPoolData.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/ConstantPoolData.java rename to src/jdk.rmic/share/classes/sun/tools/asm/ConstantPoolData.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/Cover.java b/src/jdk.rmic/share/classes/sun/tools/asm/Cover.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/Cover.java rename to src/jdk.rmic/share/classes/sun/tools/asm/Cover.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/FieldConstantData.java b/src/jdk.rmic/share/classes/sun/tools/asm/FieldConstantData.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/FieldConstantData.java rename to src/jdk.rmic/share/classes/sun/tools/asm/FieldConstantData.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/Instruction.java b/src/jdk.rmic/share/classes/sun/tools/asm/Instruction.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/Instruction.java rename to src/jdk.rmic/share/classes/sun/tools/asm/Instruction.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/Label.java b/src/jdk.rmic/share/classes/sun/tools/asm/Label.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/Label.java rename to src/jdk.rmic/share/classes/sun/tools/asm/Label.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/LocalVariable.java b/src/jdk.rmic/share/classes/sun/tools/asm/LocalVariable.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/LocalVariable.java rename to src/jdk.rmic/share/classes/sun/tools/asm/LocalVariable.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/LocalVariableTable.java b/src/jdk.rmic/share/classes/sun/tools/asm/LocalVariableTable.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/LocalVariableTable.java rename to src/jdk.rmic/share/classes/sun/tools/asm/LocalVariableTable.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeConstantData.java b/src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeConstantData.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeConstantData.java rename to src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeConstantData.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeData.java b/src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeData.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeData.java rename to src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeData.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/NumberConstantData.java b/src/jdk.rmic/share/classes/sun/tools/asm/NumberConstantData.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/NumberConstantData.java rename to src/jdk.rmic/share/classes/sun/tools/asm/NumberConstantData.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/StringConstantData.java b/src/jdk.rmic/share/classes/sun/tools/asm/StringConstantData.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/StringConstantData.java rename to src/jdk.rmic/share/classes/sun/tools/asm/StringConstantData.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/StringExpressionConstantData.java b/src/jdk.rmic/share/classes/sun/tools/asm/StringExpressionConstantData.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/StringExpressionConstantData.java rename to src/jdk.rmic/share/classes/sun/tools/asm/StringExpressionConstantData.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/SwitchData.java b/src/jdk.rmic/share/classes/sun/tools/asm/SwitchData.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/SwitchData.java rename to src/jdk.rmic/share/classes/sun/tools/asm/SwitchData.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/asm/TryData.java b/src/jdk.rmic/share/classes/sun/tools/asm/TryData.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/asm/TryData.java rename to src/jdk.rmic/share/classes/sun/tools/asm/TryData.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/AmbiguousClass.java b/src/jdk.rmic/share/classes/sun/tools/java/AmbiguousClass.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/AmbiguousClass.java rename to src/jdk.rmic/share/classes/sun/tools/java/AmbiguousClass.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/AmbiguousMember.java b/src/jdk.rmic/share/classes/sun/tools/java/AmbiguousMember.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/AmbiguousMember.java rename to src/jdk.rmic/share/classes/sun/tools/java/AmbiguousMember.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/ArrayType.java b/src/jdk.rmic/share/classes/sun/tools/java/ArrayType.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/ArrayType.java rename to src/jdk.rmic/share/classes/sun/tools/java/ArrayType.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryAttribute.java b/src/jdk.rmic/share/classes/sun/tools/java/BinaryAttribute.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryAttribute.java rename to src/jdk.rmic/share/classes/sun/tools/java/BinaryAttribute.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java b/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java rename to src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryCode.java b/src/jdk.rmic/share/classes/sun/tools/java/BinaryCode.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryCode.java rename to src/jdk.rmic/share/classes/sun/tools/java/BinaryCode.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryConstantPool.java b/src/jdk.rmic/share/classes/sun/tools/java/BinaryConstantPool.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryConstantPool.java rename to src/jdk.rmic/share/classes/sun/tools/java/BinaryConstantPool.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryExceptionHandler.java b/src/jdk.rmic/share/classes/sun/tools/java/BinaryExceptionHandler.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryExceptionHandler.java rename to src/jdk.rmic/share/classes/sun/tools/java/BinaryExceptionHandler.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryMember.java b/src/jdk.rmic/share/classes/sun/tools/java/BinaryMember.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/BinaryMember.java rename to src/jdk.rmic/share/classes/sun/tools/java/BinaryMember.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassDeclaration.java b/src/jdk.rmic/share/classes/sun/tools/java/ClassDeclaration.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassDeclaration.java rename to src/jdk.rmic/share/classes/sun/tools/java/ClassDeclaration.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassDefinition.java b/src/jdk.rmic/share/classes/sun/tools/java/ClassDefinition.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassDefinition.java rename to src/jdk.rmic/share/classes/sun/tools/java/ClassDefinition.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassFile.java b/src/jdk.rmic/share/classes/sun/tools/java/ClassFile.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassFile.java rename to src/jdk.rmic/share/classes/sun/tools/java/ClassFile.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassNotFound.java b/src/jdk.rmic/share/classes/sun/tools/java/ClassNotFound.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassNotFound.java rename to src/jdk.rmic/share/classes/sun/tools/java/ClassNotFound.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassPath.java b/src/jdk.rmic/share/classes/sun/tools/java/ClassPath.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassPath.java rename to src/jdk.rmic/share/classes/sun/tools/java/ClassPath.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassType.java b/src/jdk.rmic/share/classes/sun/tools/java/ClassType.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/ClassType.java rename to src/jdk.rmic/share/classes/sun/tools/java/ClassType.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/CompilerError.java b/src/jdk.rmic/share/classes/sun/tools/java/CompilerError.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/CompilerError.java rename to src/jdk.rmic/share/classes/sun/tools/java/CompilerError.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/Constants.java b/src/jdk.rmic/share/classes/sun/tools/java/Constants.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/Constants.java rename to src/jdk.rmic/share/classes/sun/tools/java/Constants.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/Environment.java b/src/jdk.rmic/share/classes/sun/tools/java/Environment.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/Environment.java rename to src/jdk.rmic/share/classes/sun/tools/java/Environment.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/FileClassFile.java b/src/jdk.rmic/share/classes/sun/tools/java/FileClassFile.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/FileClassFile.java rename to src/jdk.rmic/share/classes/sun/tools/java/FileClassFile.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/Identifier.java b/src/jdk.rmic/share/classes/sun/tools/java/Identifier.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/Identifier.java rename to src/jdk.rmic/share/classes/sun/tools/java/Identifier.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/IdentifierToken.java b/src/jdk.rmic/share/classes/sun/tools/java/IdentifierToken.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/IdentifierToken.java rename to src/jdk.rmic/share/classes/sun/tools/java/IdentifierToken.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/Imports.java b/src/jdk.rmic/share/classes/sun/tools/java/Imports.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/Imports.java rename to src/jdk.rmic/share/classes/sun/tools/java/Imports.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/MemberDefinition.java b/src/jdk.rmic/share/classes/sun/tools/java/MemberDefinition.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/MemberDefinition.java rename to src/jdk.rmic/share/classes/sun/tools/java/MemberDefinition.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/MethodSet.java b/src/jdk.rmic/share/classes/sun/tools/java/MethodSet.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/MethodSet.java rename to src/jdk.rmic/share/classes/sun/tools/java/MethodSet.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/MethodType.java b/src/jdk.rmic/share/classes/sun/tools/java/MethodType.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/MethodType.java rename to src/jdk.rmic/share/classes/sun/tools/java/MethodType.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/Package.java b/src/jdk.rmic/share/classes/sun/tools/java/Package.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/Package.java rename to src/jdk.rmic/share/classes/sun/tools/java/Package.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/Parser.java b/src/jdk.rmic/share/classes/sun/tools/java/Parser.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/Parser.java rename to src/jdk.rmic/share/classes/sun/tools/java/Parser.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/ParserActions.java b/src/jdk.rmic/share/classes/sun/tools/java/ParserActions.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/ParserActions.java rename to src/jdk.rmic/share/classes/sun/tools/java/ParserActions.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/PathClassFile.java b/src/jdk.rmic/share/classes/sun/tools/java/PathClassFile.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/PathClassFile.java rename to src/jdk.rmic/share/classes/sun/tools/java/PathClassFile.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java b/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java rename to src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/Scanner.java b/src/jdk.rmic/share/classes/sun/tools/java/Scanner.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/Scanner.java rename to src/jdk.rmic/share/classes/sun/tools/java/Scanner.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/ScannerInputReader.java b/src/jdk.rmic/share/classes/sun/tools/java/ScannerInputReader.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/ScannerInputReader.java rename to src/jdk.rmic/share/classes/sun/tools/java/ScannerInputReader.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/SyntaxError.java b/src/jdk.rmic/share/classes/sun/tools/java/SyntaxError.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/SyntaxError.java rename to src/jdk.rmic/share/classes/sun/tools/java/SyntaxError.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/Type.java b/src/jdk.rmic/share/classes/sun/tools/java/Type.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/Type.java rename to src/jdk.rmic/share/classes/sun/tools/java/Type.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/java/ZipClassFile.java b/src/jdk.rmic/share/classes/sun/tools/java/ZipClassFile.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/java/ZipClassFile.java rename to src/jdk.rmic/share/classes/sun/tools/java/ZipClassFile.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/BatchEnvironment.java b/src/jdk.rmic/share/classes/sun/tools/javac/BatchEnvironment.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/javac/BatchEnvironment.java rename to src/jdk.rmic/share/classes/sun/tools/javac/BatchEnvironment.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/BatchParser.java b/src/jdk.rmic/share/classes/sun/tools/javac/BatchParser.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/javac/BatchParser.java rename to src/jdk.rmic/share/classes/sun/tools/javac/BatchParser.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/CompilerMember.java b/src/jdk.rmic/share/classes/sun/tools/javac/CompilerMember.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/javac/CompilerMember.java rename to src/jdk.rmic/share/classes/sun/tools/javac/CompilerMember.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/ErrorConsumer.java b/src/jdk.rmic/share/classes/sun/tools/javac/ErrorConsumer.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/javac/ErrorConsumer.java rename to src/jdk.rmic/share/classes/sun/tools/javac/ErrorConsumer.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/ErrorMessage.java b/src/jdk.rmic/share/classes/sun/tools/javac/ErrorMessage.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/javac/ErrorMessage.java rename to src/jdk.rmic/share/classes/sun/tools/javac/ErrorMessage.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/Main.java b/src/jdk.rmic/share/classes/sun/tools/javac/Main.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/javac/Main.java rename to src/jdk.rmic/share/classes/sun/tools/javac/Main.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/SourceClass.java b/src/jdk.rmic/share/classes/sun/tools/javac/SourceClass.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/javac/SourceClass.java rename to src/jdk.rmic/share/classes/sun/tools/javac/SourceClass.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/SourceMember.java b/src/jdk.rmic/share/classes/sun/tools/javac/SourceMember.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/javac/SourceMember.java rename to src/jdk.rmic/share/classes/sun/tools/javac/SourceMember.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties b/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties rename to src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_ja.properties b/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_ja.properties similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_ja.properties rename to src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_ja.properties diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_zh_CN.properties b/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_zh_CN.properties similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_zh_CN.properties rename to src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_zh_CN.properties diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AddExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AddExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AddExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AddExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AndExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AndExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AndExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AndExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ArrayAccessExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/ArrayAccessExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ArrayAccessExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ArrayAccessExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ArrayExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/ArrayExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ArrayExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ArrayExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignAddExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignAddExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignAddExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignAddExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitAndExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitAndExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitAndExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignBitAndExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitOrExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitOrExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitOrExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignBitOrExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitXorExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitXorExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignBitXorExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignBitXorExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignDivideExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignDivideExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignDivideExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignDivideExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignMultiplyExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignMultiplyExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignMultiplyExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignMultiplyExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignOpExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignOpExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignOpExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignOpExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignRemainderExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignRemainderExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignRemainderExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignRemainderExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftLeftExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftLeftExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftLeftExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftLeftExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftRightExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftRightExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftRightExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftRightExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignSubtractExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignSubtractExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignSubtractExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignSubtractExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryArithmeticExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BinaryArithmeticExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryArithmeticExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BinaryArithmeticExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryAssignExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BinaryAssignExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryAssignExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BinaryAssignExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryBitExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BinaryBitExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryBitExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BinaryBitExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryCompareExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BinaryCompareExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryCompareExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BinaryCompareExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryEqualityExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BinaryEqualityExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryEqualityExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BinaryEqualityExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BinaryExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BinaryExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryLogicalExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BinaryLogicalExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryLogicalExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BinaryLogicalExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryShiftExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BinaryShiftExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BinaryShiftExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BinaryShiftExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitAndExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BitAndExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitAndExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BitAndExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitNotExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BitNotExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitNotExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BitNotExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitOrExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BitOrExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitOrExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BitOrExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitXorExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BitXorExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BitXorExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BitXorExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BooleanExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/BooleanExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BooleanExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BooleanExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/BreakStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/BreakStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/BreakStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/BreakStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ByteExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/ByteExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ByteExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ByteExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CaseStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/CaseStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/CaseStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/CaseStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CastExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/CastExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/CastExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/CastExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CatchStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/CatchStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/CatchStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/CatchStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CharExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/CharExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/CharExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/CharExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CheckContext.java b/src/jdk.rmic/share/classes/sun/tools/tree/CheckContext.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/CheckContext.java rename to src/jdk.rmic/share/classes/sun/tools/tree/CheckContext.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CodeContext.java b/src/jdk.rmic/share/classes/sun/tools/tree/CodeContext.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/CodeContext.java rename to src/jdk.rmic/share/classes/sun/tools/tree/CodeContext.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CommaExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/CommaExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/CommaExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/CommaExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/CompoundStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/CompoundStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/CompoundStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/CompoundStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConditionVars.java b/src/jdk.rmic/share/classes/sun/tools/tree/ConditionVars.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConditionVars.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ConditionVars.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConditionalExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/ConditionalExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConditionalExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ConditionalExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConstantExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/ConstantExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConstantExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ConstantExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/Context.java b/src/jdk.rmic/share/classes/sun/tools/tree/Context.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/Context.java rename to src/jdk.rmic/share/classes/sun/tools/tree/Context.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ContinueStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/ContinueStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ContinueStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ContinueStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConvertExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/ConvertExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ConvertExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ConvertExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/DeclarationStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/DeclarationStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/DeclarationStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/DeclarationStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/DivRemExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/DivRemExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/DivRemExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/DivRemExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/DivideExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/DivideExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/DivideExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/DivideExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/DoStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/DoStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/DoStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/DoStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/DoubleExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/DoubleExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/DoubleExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/DoubleExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/EqualExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/EqualExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/EqualExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/EqualExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ExprExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/ExprExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ExprExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ExprExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/Expression.java b/src/jdk.rmic/share/classes/sun/tools/tree/Expression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/Expression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/Expression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ExpressionStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/ExpressionStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ExpressionStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ExpressionStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/FieldExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/FieldExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/FieldExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/FieldExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/FieldUpdater.java b/src/jdk.rmic/share/classes/sun/tools/tree/FieldUpdater.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/FieldUpdater.java rename to src/jdk.rmic/share/classes/sun/tools/tree/FieldUpdater.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/FinallyStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/FinallyStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/FinallyStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/FinallyStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/FloatExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/FloatExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/FloatExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/FloatExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ForStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/ForStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ForStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ForStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/GreaterExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/GreaterExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/GreaterExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/GreaterExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/GreaterOrEqualExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/GreaterOrEqualExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/GreaterOrEqualExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/GreaterOrEqualExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/IdentifierExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/IdentifierExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/IdentifierExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/IdentifierExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/IfStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/IfStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/IfStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/IfStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/IncDecExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/IncDecExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/IncDecExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/IncDecExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/InlineMethodExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/InlineMethodExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/InlineMethodExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/InlineMethodExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/InlineNewInstanceExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/InlineNewInstanceExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/InlineNewInstanceExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/InlineNewInstanceExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/InlineReturnStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/InlineReturnStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/InlineReturnStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/InlineReturnStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/InstanceOfExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/InstanceOfExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/InstanceOfExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/InstanceOfExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/IntExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/IntExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/IntExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/IntExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/IntegerExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/IntegerExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/IntegerExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/IntegerExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/LengthExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/LengthExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/LengthExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/LengthExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/LessExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/LessExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/LessExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/LessExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/LessOrEqualExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/LessOrEqualExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/LessOrEqualExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/LessOrEqualExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/LocalMember.java b/src/jdk.rmic/share/classes/sun/tools/tree/LocalMember.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/LocalMember.java rename to src/jdk.rmic/share/classes/sun/tools/tree/LocalMember.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/LongExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/LongExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/LongExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/LongExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/MethodExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/MethodExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/MethodExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/MethodExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/MultiplyExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/MultiplyExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/MultiplyExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/MultiplyExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NaryExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/NaryExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/NaryExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/NaryExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NegativeExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/NegativeExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/NegativeExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/NegativeExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NewArrayExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/NewArrayExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/NewArrayExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/NewArrayExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NewInstanceExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/NewInstanceExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/NewInstanceExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/NewInstanceExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/Node.java b/src/jdk.rmic/share/classes/sun/tools/tree/Node.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/Node.java rename to src/jdk.rmic/share/classes/sun/tools/tree/Node.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NotEqualExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/NotEqualExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/NotEqualExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/NotEqualExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NotExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/NotExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/NotExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/NotExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/NullExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/NullExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/NullExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/NullExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/OrExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/OrExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/OrExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/OrExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/PositiveExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/PositiveExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/PositiveExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/PositiveExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/PostDecExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/PostDecExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/PostDecExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/PostDecExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/PostIncExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/PostIncExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/PostIncExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/PostIncExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/PreDecExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/PreDecExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/PreDecExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/PreDecExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/PreIncExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/PreIncExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/PreIncExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/PreIncExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/RemainderExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/RemainderExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/RemainderExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/RemainderExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ReturnStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/ReturnStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ReturnStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ReturnStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ShiftLeftExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/ShiftLeftExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ShiftLeftExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ShiftLeftExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ShiftRightExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/ShiftRightExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ShiftRightExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ShiftRightExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ShortExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/ShortExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ShortExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ShortExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/Statement.java b/src/jdk.rmic/share/classes/sun/tools/tree/Statement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/Statement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/Statement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/StringExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/StringExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/StringExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/StringExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/SubtractExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/SubtractExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/SubtractExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/SubtractExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/SuperExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/SuperExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/SuperExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/SuperExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/SwitchStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/SwitchStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/SwitchStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/SwitchStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/SynchronizedStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/SynchronizedStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/SynchronizedStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/SynchronizedStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ThisExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/ThisExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ThisExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ThisExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/ThrowStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/ThrowStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/ThrowStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/ThrowStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/TryStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/TryStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/TryStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/TryStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/TypeExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/TypeExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/TypeExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/TypeExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/UnaryExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/UnaryExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/UnaryExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/UnaryExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java b/src/jdk.rmic/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java rename to src/jdk.rmic/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/UplevelReference.java b/src/jdk.rmic/share/classes/sun/tools/tree/UplevelReference.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/UplevelReference.java rename to src/jdk.rmic/share/classes/sun/tools/tree/UplevelReference.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/VarDeclarationStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/VarDeclarationStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/VarDeclarationStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/VarDeclarationStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/Vset.java b/src/jdk.rmic/share/classes/sun/tools/tree/Vset.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/Vset.java rename to src/jdk.rmic/share/classes/sun/tools/tree/Vset.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/tree/WhileStatement.java b/src/jdk.rmic/share/classes/sun/tools/tree/WhileStatement.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/tree/WhileStatement.java rename to src/jdk.rmic/share/classes/sun/tools/tree/WhileStatement.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/util/CommandLine.java b/src/jdk.rmic/share/classes/sun/tools/util/CommandLine.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/util/CommandLine.java rename to src/jdk.rmic/share/classes/sun/tools/util/CommandLine.java diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/util/ModifierFilter.java b/src/jdk.rmic/share/classes/sun/tools/util/ModifierFilter.java similarity index 100% rename from jdk/src/jdk.rmic/share/classes/sun/tools/util/ModifierFilter.java rename to src/jdk.rmic/share/classes/sun/tools/util/ModifierFilter.java diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java rename to src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/EditObject.java b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/EditObject.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/EditObject.java rename to src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/EditObject.java diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/ExternalEditor.java b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/ExternalEditor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/ExternalEditor.java rename to src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/ExternalEditor.java diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/HistoryObject.java b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/HistoryObject.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/HistoryObject.java rename to src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/HistoryObject.java diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java rename to src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/NashornCompleter.java b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/NashornCompleter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/NashornCompleter.java rename to src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/NashornCompleter.java diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java rename to src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PropertiesHelper.java b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PropertiesHelper.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PropertiesHelper.java rename to src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PropertiesHelper.java diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/module-info.java b/src/jdk.scripting.nashorn.shell/share/classes/module-info.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn.shell/share/classes/module-info.java rename to src/jdk.scripting.nashorn.shell/share/classes/module-info.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/linker/NashornLinkerExporter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/linker/NashornLinkerExporter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/linker/NashornLinkerExporter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/linker/NashornLinkerExporter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/DefaultValueImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/DefaultValueImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/DefaultValueImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/DefaultValueImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/Formatter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/Formatter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/Formatter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/Formatter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/resources/Messages.properties b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/resources/Messages.properties similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/resources/Messages.properties rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/resources/Messages.properties diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DestructuringDeclTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DestructuringDeclTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DestructuringDeclTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DestructuringDeclTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IRTranslator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IRTranslator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IRTranslator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IRTranslator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMapImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMapImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMapImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMapImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParserImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParserImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParserImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParserImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES6.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES6.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES6.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES6.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTree.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTree.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTree.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTree.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTreeImpl.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTreeImpl.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTreeImpl.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTreeImpl.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/AssertsEnabled.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/AssertsEnabled.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/AssertsEnabled.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/AssertsEnabled.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/IntDeque.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/IntDeque.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/IntDeque.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/IntDeque.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/WeakValueCache.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/WeakValueCache.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/WeakValueCache.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/WeakValueCache.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ApplySpecialization.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ApplySpecialization.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ApplySpecialization.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ApplySpecialization.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/BranchOptimizer.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/BranchOptimizer.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/BranchOptimizer.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/BranchOptimizer.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CacheAst.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CacheAst.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CacheAst.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CacheAst.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ClassEmitter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ClassEmitter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ClassEmitter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ClassEmitter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationException.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationException.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationException.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationException.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilerConstants.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilerConstants.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilerConstants.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilerConstants.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Condition.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Condition.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Condition.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Condition.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/DumpBytecode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/DumpBytecode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/DumpBytecode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/DumpBytecode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FieldObjectCreator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FieldObjectCreator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FieldObjectCreator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FieldObjectCreator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FoldConstants.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FoldConstants.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FoldConstants.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FoldConstants.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FunctionSignature.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FunctionSignature.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FunctionSignature.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FunctionSignature.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapTuple.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapTuple.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapTuple.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapTuple.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Namespace.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Namespace.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Namespace.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Namespace.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectCreator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectCreator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectCreator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectCreator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ProgramPoints.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ProgramPoints.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ProgramPoints.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ProgramPoints.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ReplaceCompileUnits.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ReplaceCompileUnits.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ReplaceCompileUnits.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ReplaceCompileUnits.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SharedScopeCall.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SharedScopeCall.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SharedScopeCall.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SharedScopeCall.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SpillObjectCreator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SpillObjectCreator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SpillObjectCreator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SpillObjectCreator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitIntoFunctions.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitIntoFunctions.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitIntoFunctions.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitIntoFunctions.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeMap.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeMap.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeMap.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeMap.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/WeighNodes.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/WeighNodes.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/WeighNodes.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/WeighNodes.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/anchor.properties b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/anchor.properties similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/anchor.properties rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/anchor.properties diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ArrayType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ArrayType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ArrayType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ArrayType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BitwiseType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BitwiseType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BitwiseType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BitwiseType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BooleanType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BooleanType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BooleanType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BooleanType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeOps.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeOps.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeOps.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeOps.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/LongType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/LongType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/LongType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/LongType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumberType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumberType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumberType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumberType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumericType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumericType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumericType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumericType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ObjectType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ObjectType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ObjectType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ObjectType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/AccessNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/AccessNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/AccessNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/AccessNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Assignment.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Assignment.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Assignment.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Assignment.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BaseNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BaseNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BaseNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BaseNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BinaryNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BinaryNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BinaryNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BinaryNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockLexicalContext.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockLexicalContext.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockLexicalContext.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockLexicalContext.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableStatement.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableStatement.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableStatement.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableStatement.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CaseNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CaseNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CaseNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CaseNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CatchNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CatchNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CatchNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CatchNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ClassNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ClassNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ClassNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ClassNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CompileUnitHolder.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CompileUnitHolder.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CompileUnitHolder.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CompileUnitHolder.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ContinueNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ContinueNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ContinueNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ContinueNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/DebuggerNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/DebuggerNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/DebuggerNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/DebuggerNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/EmptyNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/EmptyNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/EmptyNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/EmptyNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ErrorNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ErrorNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ErrorNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ErrorNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Expression.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Expression.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Expression.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Expression.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionList.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionList.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionList.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionList.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionStatement.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionStatement.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionStatement.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionStatement.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Flags.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Flags.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Flags.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Flags.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ForNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ForNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ForNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ForNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionCall.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionCall.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionCall.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionCall.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/GetSplitState.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/GetSplitState.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/GetSplitState.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/GetSplitState.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IdentNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IdentNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IdentNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IdentNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IfNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IfNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IfNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IfNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IndexNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IndexNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IndexNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IndexNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessorExpression.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessorExpression.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessorExpression.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessorExpression.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpStatement.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpStatement.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpStatement.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpStatement.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpToInlinedFinally.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpToInlinedFinally.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpToInlinedFinally.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpToInlinedFinally.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LabelNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LabelNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LabelNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LabelNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Labels.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Labels.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Labels.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Labels.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextExpression.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextExpression.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextExpression.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextExpression.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextStatement.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextStatement.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextStatement.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextStatement.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LocalVariableConversion.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LocalVariableConversion.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LocalVariableConversion.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LocalVariableConversion.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LoopNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LoopNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LoopNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LoopNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Module.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Module.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Module.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Module.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Optimistic.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Optimistic.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Optimistic.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Optimistic.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/OptimisticLexicalContext.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/OptimisticLexicalContext.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/OptimisticLexicalContext.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/OptimisticLexicalContext.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyKey.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyKey.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyKey.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyKey.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ReturnNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ReturnNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ReturnNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ReturnNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SetSplitState.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SetSplitState.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SetSplitState.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SetSplitState.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitReturn.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitReturn.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitReturn.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitReturn.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Splittable.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Splittable.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Splittable.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Splittable.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Statement.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Statement.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Statement.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Statement.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SwitchNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SwitchNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SwitchNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SwitchNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Symbol.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Symbol.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Symbol.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Symbol.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TemplateLiteral.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TemplateLiteral.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TemplateLiteral.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TemplateLiteral.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Terminal.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Terminal.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Terminal.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Terminal.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TernaryNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TernaryNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TernaryNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TernaryNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ThrowNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ThrowNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ThrowNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ThrowNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/UnaryNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/UnaryNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/UnaryNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/UnaryNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/VarNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/VarNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/VarNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/VarNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WhileNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WhileNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WhileNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WhileNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WithNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WithNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WithNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WithNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Ignore.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Ignore.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Ignore.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Ignore.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Immutable.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Immutable.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Immutable.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Immutable.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Reference.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Reference.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Reference.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Reference.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ASTWriter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ASTWriter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ASTWriter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ASTWriter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornClassReader.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornClassReader.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornClassReader.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornClassReader.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/PrintVisitor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/PrintVisitor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/PrintVisitor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/PrintVisitor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/SimpleNodeVisitor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/SimpleNodeVisitor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/SimpleNodeVisitor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/SimpleNodeVisitor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/Lookup.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/Lookup.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/Lookup.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/Lookup.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFactory.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFactory.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFactory.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFactory.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AbstractIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AbstractIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AbstractIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AbstractIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayBufferView.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayBufferView.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayBufferView.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayBufferView.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/DataPropertyDescriptor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/DataPropertyDescriptor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/DataPropertyDescriptor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/DataPropertyDescriptor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/IteratorResult.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/IteratorResult.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/IteratorResult.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/IteratorResult.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/LinkedMap.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/LinkedMap.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/LinkedMap.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/LinkedMap.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/MapIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/MapIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/MapIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/MapIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArguments.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArguments.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArguments.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArguments.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArray.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArray.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArray.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArray.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeBoolean.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeBoolean.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeBoolean.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeBoolean.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDate.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDate.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDate.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDate.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDebug.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDebug.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDebug.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDebug.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeError.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeError.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeError.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeError.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeEvalError.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeEvalError.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeEvalError.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeEvalError.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFunction.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFunction.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFunction.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFunction.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSAdapter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSAdapter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSAdapter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSAdapter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSON.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSON.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSON.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSON.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMap.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMap.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMap.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMap.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeNumber.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeNumber.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeNumber.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeNumber.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRangeError.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRangeError.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRangeError.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRangeError.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeReferenceError.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeReferenceError.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeReferenceError.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeReferenceError.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExp.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExp.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExp.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExp.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExpExecResult.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExpExecResult.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExpExecResult.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExpExecResult.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSet.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSet.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSet.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSet.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeStrictArguments.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeStrictArguments.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeStrictArguments.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeStrictArguments.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSymbol.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSymbol.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSymbol.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSymbol.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSyntaxError.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSyntaxError.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSyntaxError.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSyntaxError.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeTypeError.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeTypeError.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeTypeError.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeTypeError.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeURIError.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeURIError.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeURIError.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeURIError.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakMap.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakMap.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakMap.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakMap.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakSet.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakSet.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakSet.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakSet.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/SetIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/SetIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/SetIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/SetIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/StringIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/StringIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/StringIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/StringIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Attribute.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Attribute.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Attribute.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Attribute.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Constructor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Constructor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Constructor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Constructor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Function.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Function.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Function.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Function.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Getter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Getter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Getter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Getter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Property.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Property.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Property.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Property.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/ScriptClass.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/ScriptClass.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/ScriptClass.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/ScriptClass.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Setter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Setter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Setter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Setter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Where.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Where.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Where.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Where.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/package-info.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/package-info.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/package-info.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/package-info.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContext.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContext.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContext.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContext.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBaseNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBaseNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBaseNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBaseNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBlockNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBlockNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBlockNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBlockNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBreakableNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBreakableNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBreakableNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBreakableNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextFunctionNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextFunctionNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextFunctionNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextFunctionNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLabelNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLabelNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLabelNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLabelNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLoopNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLoopNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLoopNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLoopNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextModuleNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextModuleNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextModuleNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextModuleNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextSwitchNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextSwitchNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextSwitchNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextSwitchNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Scanner.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Scanner.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Scanner.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Scanner.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Token.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Token.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Token.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Token.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenKind.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenKind.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenKind.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenKind.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenLookup.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenLookup.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenLookup.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenLookup.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenStream.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenStream.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenStream.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenStream.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessControlContextFactory.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessControlContextFactory.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessControlContextFactory.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessControlContextFactory.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ArgumentSetter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ArgumentSetter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ArgumentSetter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ArgumentSetter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstDeserializer.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstDeserializer.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstDeserializer.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstDeserializer.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstSerializer.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstSerializer.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstSerializer.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstSerializer.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/BitVector.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/BitVector.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/BitVector.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/BitVector.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CommandExecutor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CommandExecutor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CommandExecutor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CommandExecutor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Debug.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Debug.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Debug.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Debug.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DebuggerSupport.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DebuggerSupport.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DebuggerSupport.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DebuggerSupport.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAException.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAException.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAException.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAException.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ErrorManager.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ErrorManager.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ErrorManager.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ErrorManager.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FindProperty.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FindProperty.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FindProperty.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FindProperty.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionDocumentation.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionDocumentation.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionDocumentation.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionDocumentation.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionInitializer.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionInitializer.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionInitializer.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionInitializer.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalConstants.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalConstants.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalConstants.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalConstants.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalFunctions.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalFunctions.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalFunctions.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalFunctions.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSErrorType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSErrorType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSErrorType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSErrorType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONFunctions.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONFunctions.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONFunctions.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONFunctions.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONListAdapter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONListAdapter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONListAdapter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONListAdapter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ListAdapter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ListAdapter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ListAdapter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ListAdapter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticBuiltins.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticBuiltins.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticBuiltins.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticBuiltins.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ParserException.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ParserException.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ParserException.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ParserException.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyAccess.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyAccess.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyAccess.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyAccess.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyDescriptor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyDescriptor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyDescriptor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyDescriptor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyHashMap.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyHashMap.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyHashMap.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyHashMap.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyListeners.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyListeners.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyListeners.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyListeners.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PrototypeObject.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PrototypeObject.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PrototypeObject.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PrototypeObject.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RewriteException.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RewriteException.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RewriteException.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RewriteException.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Scope.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Scope.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Scope.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Scope.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SharedPropertyMap.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SharedPropertyMap.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SharedPropertyMap.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SharedPropertyMap.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Specialization.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Specialization.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Specialization.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Specialization.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StoredScript.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StoredScript.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StoredScript.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StoredScript.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Symbol.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Symbol.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Symbol.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Symbol.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Timing.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Timing.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Timing.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Timing.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/URIUtils.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/URIUtils.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/URIUtils.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/URIUtils.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/AnyElements.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/AnyElements.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/AnyElements.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/AnyElements.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntElements.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntElements.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntElements.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntElements.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntOrLongElements.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntOrLongElements.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntOrLongElements.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntOrLongElements.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IteratorAction.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IteratorAction.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IteratorAction.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IteratorAction.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LengthNotWritableFilter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LengthNotWritableFilter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LengthNotWritableFilter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LengthNotWritableFilter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NonExtensibleArrayFilter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NonExtensibleArrayFilter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NonExtensibleArrayFilter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NonExtensibleArrayFilter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumericElements.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumericElements.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumericElements.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumericElements.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/Bignum.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/Bignum.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/Bignum.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/Bignum.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/BignumDtoa.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/BignumDtoa.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/BignumDtoa.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/BignumDtoa.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/CachedPowers.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/CachedPowers.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/CachedPowers.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/CachedPowers.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DiyFp.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DiyFp.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DiyFp.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DiyFp.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DoubleConversion.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DoubleConversion.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DoubleConversion.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DoubleConversion.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaBuffer.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaBuffer.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaBuffer.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaBuffer.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaMode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaMode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaMode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaMode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FastDtoa.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FastDtoa.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FastDtoa.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FastDtoa.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FixedDtoa.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FixedDtoa.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FixedDtoa.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FixedDtoa.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/IeeeDouble.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/IeeeDouble.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/IeeeDouble.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/IeeeDouble.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RecompilationEvent.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RecompilationEvent.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RecompilationEvent.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RecompilationEvent.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RuntimeEvent.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RuntimeEvent.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RuntimeEvent.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RuntimeEvent.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationException.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationException.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationException.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationException.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/Bootstrap.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/Bootstrap.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/Bootstrap.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/Bootstrap.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallable.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallable.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallable.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallable.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallableLinker.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallableLinker.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallableLinker.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallableLinker.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BrowserJSObjectLinker.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BrowserJSObjectLinker.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BrowserJSObjectLinker.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BrowserJSObjectLinker.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/InvokeByName.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/InvokeByName.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/InvokeByName.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/InvokeByName.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornGuards.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornGuards.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornGuards.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornGuards.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornLinker.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornLinker.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornLinker.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornLinker.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/DebugLogger.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/DebugLogger.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/DebugLogger.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/DebugLogger.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Loggable.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Loggable.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Loggable.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Loggable.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Logger.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Logger.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Logger.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Logger.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/KeyValueOption.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/KeyValueOption.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/KeyValueOption.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/KeyValueOption.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/LoggingOption.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/LoggingOption.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/LoggingOption.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/LoggingOption.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Option.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Option.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Option.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Option.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/OptionTemplate.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/OptionTemplate.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/OptionTemplate.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/OptionTemplate.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExp.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExp.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExp.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExp.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpResult.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpResult.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpResult.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpResult.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Option.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Option.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Option.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Option.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Parser.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Parser.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Parser.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Parser.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Regex.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Regex.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Regex.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Regex.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Region.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Region.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Region.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Region.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Token.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Token.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Token.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Token.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Functions.properties b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Functions.properties similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Functions.properties rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Functions.properties diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Options.properties b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Options.properties similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Options.properties rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Options.properties diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/controls.js b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/controls.js similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/controls.js rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/controls.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/fxml.js b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/fxml.js similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/fxml.js rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/fxml.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/graphics.js b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/graphics.js similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/graphics.js rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/graphics.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/media.js b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/media.js similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/media.js rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/media.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swing.js b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swing.js similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swing.js rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swing.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/web.js b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/web.js similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/web.js rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/web.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JD.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JD.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JD.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JD.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JO.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JO.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JO.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JO.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JS.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JS.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JS.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JS.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/ModuleGraphManipulator.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/ModuleGraphManipulator.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/ModuleGraphManipulator.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/ModuleGraphManipulator.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/PartialParser.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/PartialParser.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/PartialParser.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/PartialParser.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/ShellFunctions.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/ShellFunctions.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/ShellFunctions.java rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/ShellFunctions.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/Shell.properties b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/Shell.properties similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/Shell.properties rename to src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/Shell.properties diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/module-info.java b/src/jdk.scripting.nashorn/share/classes/module-info.java similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/classes/module-info.java rename to src/jdk.scripting.nashorn/share/classes/module-info.java diff --git a/nashorn/src/jdk.scripting.nashorn/share/legal/double-conversion.md b/src/jdk.scripting.nashorn/share/legal/double-conversion.md similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/legal/double-conversion.md rename to src/jdk.scripting.nashorn/share/legal/double-conversion.md diff --git a/nashorn/src/jdk.scripting.nashorn/share/legal/joni.md b/src/jdk.scripting.nashorn/share/legal/joni.md similarity index 100% rename from nashorn/src/jdk.scripting.nashorn/share/legal/joni.md rename to src/jdk.scripting.nashorn/share/legal/joni.md diff --git a/jdk/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpChannelImpl.java b/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpChannelImpl.java similarity index 100% rename from jdk/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpChannelImpl.java rename to src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpChannelImpl.java diff --git a/jdk/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java b/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java similarity index 100% rename from jdk/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java rename to src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java diff --git a/jdk/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java b/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java similarity index 100% rename from jdk/src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java rename to src/jdk.sctp/aix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java diff --git a/jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpChannelImpl.java b/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpChannelImpl.java similarity index 100% rename from jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpChannelImpl.java rename to src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpChannelImpl.java diff --git a/jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java b/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java similarity index 100% rename from jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java rename to src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java diff --git a/jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java b/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java similarity index 100% rename from jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java rename to src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/HandlerResult.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/HandlerResult.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/HandlerResult.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/HandlerResult.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalReceiveException.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalReceiveException.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalReceiveException.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalReceiveException.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalUnbindException.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalUnbindException.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalUnbindException.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalUnbindException.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/InvalidStreamException.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/InvalidStreamException.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/InvalidStreamException.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/InvalidStreamException.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/MessageInfo.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/MessageInfo.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/MessageInfo.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/MessageInfo.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Notification.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/Notification.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Notification.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/Notification.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpSocketOption.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpSocketOption.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpSocketOption.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpSocketOption.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SendFailedNotification.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/SendFailedNotification.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SendFailedNotification.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/SendFailedNotification.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/ShutdownNotification.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/ShutdownNotification.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/ShutdownNotification.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/ShutdownNotification.java diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java rename to src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java diff --git a/jdk/src/jdk.sctp/share/classes/module-info.java b/src/jdk.sctp/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/module-info.java rename to src/jdk.sctp/share/classes/module-info.java diff --git a/jdk/src/jdk.sctp/share/classes/sun/nio/ch/sctp/MessageInfoImpl.java b/src/jdk.sctp/share/classes/sun/nio/ch/sctp/MessageInfoImpl.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/sun/nio/ch/sctp/MessageInfoImpl.java rename to src/jdk.sctp/share/classes/sun/nio/ch/sctp/MessageInfoImpl.java diff --git a/jdk/src/jdk.sctp/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java b/src/jdk.sctp/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java similarity index 100% rename from jdk/src/jdk.sctp/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java rename to src/jdk.sctp/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java diff --git a/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java similarity index 100% rename from jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java rename to src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java diff --git a/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java similarity index 100% rename from jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java rename to src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java diff --git a/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java similarity index 100% rename from jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java rename to src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java diff --git a/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java similarity index 100% rename from jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java rename to src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java diff --git a/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java similarity index 100% rename from jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java rename to src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java diff --git a/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java similarity index 100% rename from jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java rename to src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java diff --git a/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java similarity index 100% rename from jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java rename to src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java diff --git a/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java similarity index 100% rename from jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java rename to src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java diff --git a/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java similarity index 100% rename from jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java rename to src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java diff --git a/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java similarity index 100% rename from jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java rename to src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java diff --git a/jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java similarity index 100% rename from jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java rename to src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java diff --git a/jdk/src/jdk.sctp/unix/native/libsctp/Sctp.h b/src/jdk.sctp/unix/native/libsctp/Sctp.h similarity index 100% rename from jdk/src/jdk.sctp/unix/native/libsctp/Sctp.h rename to src/jdk.sctp/unix/native/libsctp/Sctp.h diff --git a/jdk/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c b/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c similarity index 100% rename from jdk/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c rename to src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c diff --git a/jdk/src/jdk.sctp/unix/native/libsctp/SctpNet.c b/src/jdk.sctp/unix/native/libsctp/SctpNet.c similarity index 100% rename from jdk/src/jdk.sctp/unix/native/libsctp/SctpNet.c rename to src/jdk.sctp/unix/native/libsctp/SctpNet.c diff --git a/jdk/src/jdk.sctp/unix/native/libsctp/SctpServerChannelImpl.c b/src/jdk.sctp/unix/native/libsctp/SctpServerChannelImpl.c similarity index 100% rename from jdk/src/jdk.sctp/unix/native/libsctp/SctpServerChannelImpl.c rename to src/jdk.sctp/unix/native/libsctp/SctpServerChannelImpl.c diff --git a/jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpChannelImpl.java b/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpChannelImpl.java similarity index 100% rename from jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpChannelImpl.java rename to src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpChannelImpl.java diff --git a/jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java b/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java similarity index 100% rename from jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java rename to src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java diff --git a/jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java b/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java similarity index 100% rename from jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java rename to src/jdk.sctp/windows/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/LdapPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/LdapPrincipal.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/LdapPrincipal.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/LdapPrincipal.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UserPrincipal.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/UserPrincipal.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UserPrincipal.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/UserPrincipal.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/package-info.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/package-info.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/package-info.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/callback/package-info.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/package-info.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/login/package-info.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/package-info.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/login/package-info.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Crypt.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Crypt.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Crypt.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/module/Crypt.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/package-info.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/package-info.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/package-info.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/module/package-info.java diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/package-info.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/package-info.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/package-info.java rename to src/jdk.security.auth/share/classes/com/sun/security/auth/package-info.java diff --git a/jdk/src/jdk.security.auth/share/classes/module-info.java b/src/jdk.security.auth/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.security.auth/share/classes/module-info.java rename to src/jdk.security.auth/share/classes/module-info.java diff --git a/jdk/src/jdk.security.auth/unix/native/libjaas/Unix.c b/src/jdk.security.auth/unix/native/libjaas/Unix.c similarity index 100% rename from jdk/src/jdk.security.auth/unix/native/libjaas/Unix.c rename to src/jdk.security.auth/unix/native/libjaas/Unix.c diff --git a/jdk/src/jdk.security.auth/windows/native/libjaas/nt.c b/src/jdk.security.auth/windows/native/libjaas/nt.c similarity index 100% rename from jdk/src/jdk.security.auth/windows/native/libjaas/nt.c rename to src/jdk.security.auth/windows/native/libjaas/nt.c diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java rename to src/jdk.security.jgss/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java rename to src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContextImpl.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContextImpl.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContextImpl.java rename to src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContextImpl.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java rename to src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredentialImpl.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredentialImpl.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredentialImpl.java rename to src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredentialImpl.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/Extender.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/Extender.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/Extender.java rename to src/jdk.security.jgss/share/classes/com/sun/security/jgss/Extender.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java rename to src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java rename to src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireType.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireType.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireType.java rename to src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireType.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/package-info.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/package-info.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/package-info.java rename to src/jdk.security.jgss/share/classes/com/sun/security/jgss/package-info.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java b/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java rename to src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java b/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java rename to src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java b/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java rename to src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java b/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java rename to src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/JdkSASL.java b/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/JdkSASL.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/JdkSASL.java rename to src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/JdkSASL.java diff --git a/jdk/src/jdk.security.jgss/share/classes/module-info.java b/src/jdk.security.jgss/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.security.jgss/share/classes/module-info.java rename to src/jdk.security.jgss/share/classes/module-info.java diff --git a/jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedCopyOption.java b/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedCopyOption.java similarity index 100% rename from jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedCopyOption.java rename to src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedCopyOption.java diff --git a/jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedOpenOption.java b/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedOpenOption.java similarity index 100% rename from jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedOpenOption.java rename to src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedOpenOption.java diff --git a/jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java b/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java similarity index 100% rename from jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java rename to src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java diff --git a/jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java b/src/jdk.unsupported/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java similarity index 100% rename from jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java rename to src/jdk.unsupported/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java diff --git a/jdk/src/jdk.unsupported/share/classes/module-info.java b/src/jdk.unsupported/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.unsupported/share/classes/module-info.java rename to src/jdk.unsupported/share/classes/module-info.java diff --git a/jdk/src/jdk.unsupported/share/classes/sun/misc/Signal.java b/src/jdk.unsupported/share/classes/sun/misc/Signal.java similarity index 100% rename from jdk/src/jdk.unsupported/share/classes/sun/misc/Signal.java rename to src/jdk.unsupported/share/classes/sun/misc/Signal.java diff --git a/jdk/src/jdk.unsupported/share/classes/sun/misc/SignalHandler.java b/src/jdk.unsupported/share/classes/sun/misc/SignalHandler.java similarity index 100% rename from jdk/src/jdk.unsupported/share/classes/sun/misc/SignalHandler.java rename to src/jdk.unsupported/share/classes/sun/misc/SignalHandler.java diff --git a/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java b/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java similarity index 100% rename from jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java rename to src/jdk.unsupported/share/classes/sun/misc/Unsafe.java diff --git a/jdk/src/jdk.unsupported/share/classes/sun/reflect/Reflection.java b/src/jdk.unsupported/share/classes/sun/reflect/Reflection.java similarity index 100% rename from jdk/src/jdk.unsupported/share/classes/sun/reflect/Reflection.java rename to src/jdk.unsupported/share/classes/sun/reflect/Reflection.java diff --git a/jdk/src/jdk.unsupported/share/classes/sun/reflect/ReflectionFactory.java b/src/jdk.unsupported/share/classes/sun/reflect/ReflectionFactory.java similarity index 100% rename from jdk/src/jdk.unsupported/share/classes/sun/reflect/ReflectionFactory.java rename to src/jdk.unsupported/share/classes/sun/reflect/ReflectionFactory.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/META-INF/services/com.sun.tools.internal.xjc.Plugin b/src/jdk.xml.bind/share/classes/META-INF/services/com.sun.tools.internal.xjc.Plugin similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/META-INF/services/com.sun.tools.internal.xjc.Plugin rename to src/jdk.xml.bind/share/classes/META-INF/services/com.sun.tools.internal.xjc.Plugin diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/ClassType.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/ClassType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/ClassType.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/ClassType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/CodeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/CodeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/CodeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/CodeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotatable.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotatable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotatable.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotatable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationUse.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationUse.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationUse.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationUse.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationValue.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationValue.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationValue.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationValue.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnonymousClass.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnonymousClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnonymousClass.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnonymousClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArray.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArray.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArray.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArray.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArrayClass.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArrayClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArrayClass.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArrayClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArrayCompRef.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArrayCompRef.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArrayCompRef.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JArrayCompRef.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAssignment.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAssignment.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAssignment.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAssignment.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAtom.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAtom.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAtom.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAtom.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JBlock.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JBlock.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JBlock.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JBlock.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JBreak.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JBreak.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JBreak.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JBreak.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCase.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCase.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCase.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCase.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCast.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCast.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCast.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCast.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCatchBlock.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCatchBlock.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCatchBlock.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCatchBlock.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCommentPart.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCommentPart.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCommentPart.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCommentPart.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JContinue.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JContinue.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JContinue.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JContinue.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDeclaration.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDeclaration.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDeclaration.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDeclaration.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDefinedClass.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDefinedClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDefinedClass.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDefinedClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDirectClass.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDirectClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDirectClass.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDirectClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDoLoop.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDoLoop.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDoLoop.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDoLoop.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDocComment.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDocComment.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDocComment.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDocComment.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDocCommentable.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDocCommentable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDocCommentable.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDocCommentable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JEnumConstant.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JEnumConstant.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JEnumConstant.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JEnumConstant.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExportsDirective.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExportsDirective.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExportsDirective.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExportsDirective.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpr.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpr.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpr.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpr.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFieldRef.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFieldRef.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFieldRef.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFieldRef.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFieldVar.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFieldVar.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFieldVar.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFieldVar.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JForEach.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JForEach.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JForEach.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JForEach.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JForLoop.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JForLoop.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JForLoop.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JForLoop.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFormatter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFormatter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFormatter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JFormatter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerable.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerable.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerifiable.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerifiable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerifiable.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerifiable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerifiableImpl.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerifiableImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerifiableImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JGenerifiableImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JInvocation.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JInvocation.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JInvocation.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JInvocation.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JJavaName.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JJavaName.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JJavaName.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JJavaName.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JLabel.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JLabel.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JLabel.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JLabel.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMethod.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMethod.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMethod.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMethod.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMod.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMod.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMod.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMod.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMods.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMods.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMods.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMods.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModule.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModule.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModule.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModule.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModuleDirective.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModuleDirective.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModuleDirective.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModuleDirective.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JNarrowedClass.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JNarrowedClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JNarrowedClass.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JNarrowedClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JNullType.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JNullType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JNullType.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JNullType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPackage.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPackage.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPackage.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPackage.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JRequiresDirective.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JRequiresDirective.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JRequiresDirective.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JRequiresDirective.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JResourceFile.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JResourceFile.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JResourceFile.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JResourceFile.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JReturn.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JReturn.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JReturn.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JReturn.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JStatement.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JStatement.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JStatement.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JStatement.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JStringLiteral.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JStringLiteral.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JStringLiteral.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JStringLiteral.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JSwitch.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JSwitch.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JSwitch.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JSwitch.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JThrow.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JThrow.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JThrow.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JThrow.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTryBlock.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTryBlock.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTryBlock.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTryBlock.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTypeVar.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTypeVar.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTypeVar.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTypeVar.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTypeWildcard.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTypeWildcard.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTypeWildcard.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JTypeWildcard.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JVar.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JVar.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JVar.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JVar.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JWhileLoop.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JWhileLoop.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JWhileLoop.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JWhileLoop.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/SecureLoader.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/SecureLoader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/SecureLoader.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/SecureLoader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/SecureLoader.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/SecureLoader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/SecureLoader.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/SecureLoader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/OutputStreamCodeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/OutputStreamCodeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/OutputStreamCodeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/OutputStreamCodeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/DefaultAuthenticator.java b/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/DefaultAuthenticator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/DefaultAuthenticator.java rename to src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/DefaultAuthenticator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java b/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java rename to src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java b/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java rename to src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/SecureLoader.java b/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/SecureLoader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/SecureLoader.java rename to src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/SecureLoader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ConfigReader.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ConfigReader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ConfigReader.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ConfigReader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SecureLoader.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SecureLoader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SecureLoader.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SecureLoader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Const.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Const.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Const.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Const.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/ErrorReceiverImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/ErrorReceiverImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/ErrorReceiverImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/ErrorReceiverImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/InlineAnnotationReaderImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/InlineAnnotationReaderImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/InlineAnnotationReaderImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/InlineAnnotationReaderImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Options.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Options.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Options.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Options.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/SecureLoader.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/SecureLoader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/SecureLoader.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/SecureLoader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/JXC.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/JXC.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/JXC.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/JXC.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/impl/j2s/JAXBModelImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/impl/j2s/JAXBModelImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/impl/j2s/JAXBModelImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/impl/j2s/JAXBModelImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/impl/j2s/JavaCompilerImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/impl/j2s/JavaCompilerImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/impl/j2s/JavaCompilerImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/api/impl/j2s/JavaCompilerImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/AbortException.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/AbortException.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/AbortException.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/AbortException.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/BadCommandLineException.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/BadCommandLineException.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/BadCommandLineException.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/BadCommandLineException.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/CatalogUtil.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/CatalogUtil.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/CatalogUtil.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/CatalogUtil.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Driver.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Driver.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Driver.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Driver.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Language.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Language.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Language.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Language.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ModelLoader.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ModelLoader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ModelLoader.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ModelLoader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Plugin.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Plugin.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Plugin.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Plugin.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/SchemaCache.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/SchemaCache.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/SchemaCache.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/SchemaCache.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/SecureLoader.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/SecureLoader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/SecureLoader.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/SecureLoader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/XJCFacade.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/XJCFacade.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/XJCFacade.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/XJCFacade.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/XJCListener.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/XJCListener.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/XJCListener.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/XJCListener.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/accessors/PluginImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/accessors/PluginImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/accessors/PluginImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/accessors/PluginImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Mapping.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Mapping.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Mapping.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Mapping.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Property.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Property.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Property.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Property.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Reference.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Reference.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Reference.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Reference.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/XJC.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/XJC.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/XJC.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/XJC.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClass.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClass.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElement.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElement.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElement.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElement.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor2.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor2.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor2.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor2.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Constructor.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Constructor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Constructor.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Constructor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Model.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Model.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Model.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Model.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Populatable.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Populatable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Populatable.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Populatable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/Utils.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/Utils.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/Utils.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/Utils.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/CustomizableOutline.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/CustomizableOutline.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/CustomizableOutline.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/CustomizableOutline.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Outline.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Outline.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Outline.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Outline.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Const.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Const.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Const.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Const.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Ring.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Ring.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Ring.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Ring.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Util.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Util.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Util.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Util.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MultiWildcardComplexTypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MultiWildcardComplexTypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MultiWildcardComplexTypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MultiWildcardComplexTypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/package-info.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/package-info.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/package-info.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_de.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_de.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_de.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_de.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_es.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_es.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_es.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_es.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_fr.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_fr.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_fr.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_it.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_it.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_it.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_it.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_ko.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_ko.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_ko.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_pt_BR.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_pt_BR.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_pt_BR.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_CN.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_CN.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_CN.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_TW.properties b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_TW.properties rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MessageBundle_zh_TW.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/NullStream.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/NullStream.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/NullStream.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/NullStream.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/Util.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/Util.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/Util.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/util/Util.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/ExternalEntity.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/ExternalEntity.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/ExternalEntity.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/ExternalEntity.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InternalEntity.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InternalEntity.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InternalEntity.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InternalEntity.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/Resolver.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/Resolver.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/Resolver.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/Resolver.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlNames.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlNames.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlNames.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlNames.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/package.html b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/package.html similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/package.html rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/package.html diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/Datatype.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/Datatype.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/Datatype.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/Datatype.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeException.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeException.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeException.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeException.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeLibrary.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeLibrary.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeLibrary.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeLibrary.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeLibraryFactory.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeLibraryFactory.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeLibraryFactory.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeLibraryFactory.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeStreamingValidator.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeStreamingValidator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeStreamingValidator.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeStreamingValidator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/ValidationContext.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/ValidationContext.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/ValidationContext.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/ValidationContext.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/StreamingValidatorImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/StreamingValidatorImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/StreamingValidatorImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/StreamingValidatorImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Div.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Div.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Div.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Div.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Include.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Include.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Include.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Include.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Scope.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Scope.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Scope.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Scope.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/Location.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/Location.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/Location.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/Location.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/package.html b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/package.html similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/package.html rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/package.html diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DataPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DataPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DataPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DataPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Pattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Pattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Pattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/Pattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/PatternInterner.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/PatternInterner.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/PatternInterner.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/PatternInterner.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/StringPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/StringPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/StringPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/StringPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/TextPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/TextPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/TextPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/TextPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/Annotation.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/Annotation.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/Annotation.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/Annotation.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DAnnotation.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DAnnotation.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DAnnotation.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DAnnotation.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDefine.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDefine.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDefine.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDefine.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DElementPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DElementPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DElementPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DElementPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DListPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DListPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DListPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DListPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DRefPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DRefPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DRefPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DRefPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DTextPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DTextPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DTextPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DTextPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DValuePattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DValuePattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DValuePattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DValuePattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/Main.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/Main.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/Main.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/Main.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/PatternParseable.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/PatternParseable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/PatternParseable.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/PatternParseable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/package.html b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/package.html similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/package.html rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/package.html diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/package.html b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/package.html similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/package.html rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/dt/builtin/package.html diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NsNameClass.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NsNameClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NsNameClass.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NsNameClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NullNameClass.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NullNameClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NullNameClass.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NullNameClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Context.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Context.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Context.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Context.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/Token.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/Token.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/Token.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/Token.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Localizer.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Localizer.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Localizer.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Localizer.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Uri.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Uri.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Uri.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Uri.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Utf16.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Utf16.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Utf16.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/util/Utf16.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/SCD.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/SCD.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/SCD.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/SCD.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComplexType.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComplexType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComplexType.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComplexType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSContentType.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSContentType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSContentType.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSContentType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSFacet.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSFacet.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSFacet.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSFacet.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSNotation.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSNotation.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSNotation.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSNotation.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSParticle.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSParticle.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSParticle.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSParticle.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchema.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchema.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchema.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchema.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSTerm.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSTerm.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSTerm.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSTerm.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSVariety.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSVariety.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSVariety.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSVariety.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSWildcard.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSWildcard.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSWildcard.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSWildcard.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSXPath.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSXPath.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSXPath.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSXPath.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XmlString.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XmlString.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XmlString.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XmlString.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Const.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Const.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Const.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Const.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Ref.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Ref.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Ref.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Ref.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/UName.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/UName.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/UName.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/UName.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Util.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Util.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Util.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/Util.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/package.html b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/package.html similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/package.html rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/package.html diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/package.html b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/package.html similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/package.html rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/package.html diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Token.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Token.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Token.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Token.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/package.html b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/package.html similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/package.html rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/package.html diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/package.html b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/package.html similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/package.html rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/package.html diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/package.html b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/package.html similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/package.html rename to src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/visitor/package.html diff --git a/jaxws/src/jdk.xml.bind/share/classes/module-info.java b/src/jdk.xml.bind/share/classes/module-info.java similarity index 100% rename from jaxws/src/jdk.xml.bind/share/classes/module-info.java rename to src/jdk.xml.bind/share/classes/module-info.java diff --git a/jaxws/src/jdk.xml.bind/share/legal/freebxml.md b/src/jdk.xml.bind/share/legal/freebxml.md similarity index 100% rename from jaxws/src/jdk.xml.bind/share/legal/freebxml.md rename to src/jdk.xml.bind/share/legal/freebxml.md diff --git a/jaxws/src/jdk.xml.bind/share/legal/relaxngdatatype.md b/src/jdk.xml.bind/share/legal/relaxngdatatype.md similarity index 100% rename from jaxws/src/jdk.xml.bind/share/legal/relaxngdatatype.md rename to src/jdk.xml.bind/share/legal/relaxngdatatype.md diff --git a/jaxws/src/jdk.xml.bind/share/legal/rngom.md b/src/jdk.xml.bind/share/legal/rngom.md similarity index 100% rename from jaxws/src/jdk.xml.bind/share/legal/rngom.md rename to src/jdk.xml.bind/share/legal/rngom.md diff --git a/jaxws/src/jdk.xml.bind/share/legal/xmlresolver.md b/src/jdk.xml.bind/share/legal/xmlresolver.md similarity index 100% rename from jaxws/src/jdk.xml.bind/share/legal/xmlresolver.md rename to src/jdk.xml.bind/share/legal/xmlresolver.md diff --git a/jaxp/src/jdk.xml.dom/share/classes/module-info.java b/src/jdk.xml.dom/share/classes/module-info.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/module-info.java rename to src/jdk.xml.dom/share/classes/module-info.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSS2Properties.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSS2Properties.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSS2Properties.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSS2Properties.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSCharsetRule.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSCharsetRule.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSCharsetRule.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSCharsetRule.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSFontFaceRule.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSFontFaceRule.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSFontFaceRule.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSFontFaceRule.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSImportRule.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSImportRule.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSImportRule.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSImportRule.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSMediaRule.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSMediaRule.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSMediaRule.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSMediaRule.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSPageRule.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSPageRule.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSPageRule.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSPageRule.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSPrimitiveValue.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSPrimitiveValue.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSPrimitiveValue.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSPrimitiveValue.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSRule.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSRule.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSRule.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSRule.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSRuleList.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSRuleList.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSRuleList.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSRuleList.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSStyleDeclaration.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSStyleDeclaration.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSStyleDeclaration.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSStyleDeclaration.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSStyleRule.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSStyleRule.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSStyleRule.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSStyleRule.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSStyleSheet.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSStyleSheet.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSStyleSheet.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSStyleSheet.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSUnknownRule.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSUnknownRule.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSUnknownRule.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSUnknownRule.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSValue.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSValue.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSValue.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSValue.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSValueList.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSValueList.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSValueList.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/CSSValueList.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/Counter.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/Counter.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/Counter.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/Counter.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/DOMImplementationCSS.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/DOMImplementationCSS.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/DOMImplementationCSS.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/DOMImplementationCSS.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/DocumentCSS.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/DocumentCSS.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/DocumentCSS.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/DocumentCSS.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/ElementCSSInlineStyle.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/ElementCSSInlineStyle.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/ElementCSSInlineStyle.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/ElementCSSInlineStyle.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/RGBColor.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/RGBColor.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/RGBColor.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/RGBColor.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/Rect.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/Rect.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/Rect.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/Rect.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/ViewCSS.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/ViewCSS.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/ViewCSS.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/ViewCSS.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/package-info.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/css/package-info.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/package-info.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/css/package-info.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLAnchorElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLAnchorElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLAnchorElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLAnchorElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLAppletElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLAppletElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLAppletElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLAppletElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLAreaElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLAreaElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLAreaElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLAreaElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBRElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBRElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBRElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBRElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBaseElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBaseElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBaseElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBaseElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBaseFontElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBaseFontElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBaseFontElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBaseFontElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBodyElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBodyElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBodyElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLBodyElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLButtonElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLButtonElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLButtonElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLButtonElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLCollection.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLCollection.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLCollection.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLCollection.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDListElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDListElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDListElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDListElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDOMImplementation.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDOMImplementation.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDOMImplementation.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDOMImplementation.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDirectoryElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDirectoryElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDirectoryElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDirectoryElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDivElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDivElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDivElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDivElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDocument.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDocument.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDocument.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLDocument.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFieldSetElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFieldSetElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFieldSetElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFieldSetElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFontElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFontElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFontElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFontElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFormElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFormElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFormElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFormElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFrameElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFrameElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFrameElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFrameElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFrameSetElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFrameSetElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFrameSetElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLFrameSetElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHRElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHRElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHRElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHRElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHeadElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHeadElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHeadElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHeadElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHeadingElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHeadingElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHeadingElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHeadingElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHtmlElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHtmlElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHtmlElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLHtmlElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLIFrameElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLIFrameElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLIFrameElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLIFrameElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLImageElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLImageElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLImageElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLImageElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLInputElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLInputElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLInputElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLInputElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLIsIndexElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLIsIndexElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLIsIndexElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLIsIndexElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLIElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLIElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLIElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLIElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLabelElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLabelElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLabelElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLabelElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLegendElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLegendElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLegendElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLegendElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLinkElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLinkElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLinkElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLLinkElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLMapElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLMapElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLMapElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLMapElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLMenuElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLMenuElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLMenuElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLMenuElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLMetaElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLMetaElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLMetaElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLMetaElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLModElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLModElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLModElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLModElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLOListElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLOListElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLOListElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLOListElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLObjectElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLObjectElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLObjectElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLObjectElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLOptGroupElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLOptGroupElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLOptGroupElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLOptGroupElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLOptionElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLOptionElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLOptionElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLOptionElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLParagraphElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLParagraphElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLParagraphElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLParagraphElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLParamElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLParamElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLParamElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLParamElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLPreElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLPreElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLPreElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLPreElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLQuoteElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLQuoteElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLQuoteElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLQuoteElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLScriptElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLScriptElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLScriptElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLScriptElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLSelectElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLSelectElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLSelectElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLSelectElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLStyleElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLStyleElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLStyleElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLStyleElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableCaptionElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableCaptionElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableCaptionElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableCaptionElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableCellElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableCellElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableCellElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableCellElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableColElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableColElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableColElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableColElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableRowElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableRowElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableRowElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableRowElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableSectionElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableSectionElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableSectionElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTableSectionElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTextAreaElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTextAreaElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTextAreaElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTextAreaElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTitleElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTitleElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTitleElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLTitleElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLUListElement.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLUListElement.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLUListElement.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/HTMLUListElement.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/package-info.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/html/package-info.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/package-info.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/html/package-info.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/DocumentStyle.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/DocumentStyle.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/DocumentStyle.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/DocumentStyle.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/LinkStyle.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/LinkStyle.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/LinkStyle.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/LinkStyle.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/MediaList.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/MediaList.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/MediaList.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/MediaList.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/StyleSheet.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/StyleSheet.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/StyleSheet.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/StyleSheet.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/StyleSheetList.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/StyleSheetList.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/StyleSheetList.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/StyleSheetList.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/package-info.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/package-info.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/package-info.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/package-info.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/COPYRIGHT.html b/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/COPYRIGHT.html similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/COPYRIGHT.html rename to src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/COPYRIGHT.html diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathEvaluator.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathEvaluator.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathEvaluator.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathEvaluator.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathException.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathException.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathException.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathException.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathExpression.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathExpression.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathExpression.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathExpression.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathNSResolver.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathNSResolver.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathNSResolver.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathNSResolver.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathNamespace.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathNamespace.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathNamespace.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathNamespace.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathResult.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathResult.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathResult.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathResult.java diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/package-info.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/package-info.java similarity index 100% rename from jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/package-info.java rename to src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/package-info.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin b/src/jdk.xml.ws/share/classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin rename to src/jdk.xml.ws/share/classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/Invoker.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/Invoker.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/Invoker.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/Invoker.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/ToolVersion.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/ToolVersion.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/ToolVersion.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/ToolVersion.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/WsGen.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/WsGen.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/WsGen.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/WsGen.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/WsImport.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/WsImport.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/WsImport.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/WsImport.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/package-info.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/package-info.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/package-info.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/Names.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/Names.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/Names.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/Names.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AbstractType.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AbstractType.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AbstractType.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AbstractType.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Block.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Block.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Block.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Block.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Fault.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Fault.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Fault.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Fault.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Message.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Message.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Message.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Message.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Model.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Model.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Model.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Model.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelException.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelException.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelException.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelException.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelObject.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelObject.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelObject.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelObject.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Operation.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Operation.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Operation.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Operation.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Parameter.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Parameter.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Parameter.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Parameter.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Port.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Port.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Port.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Port.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Request.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Request.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Request.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Request.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Response.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Response.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Response.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Response.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Service.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Service.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Service.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/Service.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ContextClassloaderLocal.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ContextClassloaderLocal.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ContextClassloaderLocal.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ContextClassloaderLocalMessages.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ContextClassloaderLocalMessages.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ContextClassloaderLocalMessages.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ContextClassloaderLocalMessages.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_de.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_de.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_de.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_de.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_es.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_es.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_es.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_es.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_fr.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_fr.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_fr.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_it.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_it.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_it.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_it.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ja.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ja.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ja.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ko.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ko.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ko.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_pt_BR.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_pt_BR.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_pt_BR.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_CN.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_CN.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_CN.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_TW.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_TW.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_TW.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_de.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_de.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_de.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_de.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_es.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_es.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_es.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_es.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_fr.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_fr.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_fr.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_it.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_it.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_it.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_it.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_ja.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_ja.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_ja.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_ko.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_ko.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_ko.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_pt_BR.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_pt_BR.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_pt_BR.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_zh_CN.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_zh_CN.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_zh_CN.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_zh_TW.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_zh_TW.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/generator_zh_TW.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_de.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_de.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_de.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_de.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_es.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_es.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_es.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_es.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_fr.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_fr.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_fr.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_it.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_it.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_it.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_it.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_ja.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_ja.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_ja.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_ko.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_ko.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_ko.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_pt_BR.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_pt_BR.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_pt_BR.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_zh_CN.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_zh_CN.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_zh_CN.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_zh_TW.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_zh_TW.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/javacompiler_zh_TW.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_de.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_de.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_de.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_de.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_es.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_es.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_es.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_es.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_fr.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_fr.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_fr.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_it.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_it.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_it.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_it.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_ja.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_ja.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_ja.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_ko.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_ko.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_ko.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_pt_BR.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_pt_BR.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_pt_BR.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_zh_CN.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_zh_CN.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_zh_CN.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_zh_TW.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_zh_TW.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/model_zh_TW.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_de.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_de.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_de.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_de.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_es.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_es.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_es.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_es.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_fr.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_fr.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_fr.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_it.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_it.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_it.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_it.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_ja.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_ja.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_ja.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_ko.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_ko.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_ko.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_pt_BR.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_pt_BR.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_pt_BR.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_zh_CN.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_zh_CN.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_zh_CN.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_zh_TW.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_zh_TW.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/modeler_zh_TW.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_de.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_de.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_de.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_de.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_es.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_es.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_es.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_es.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_fr.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_fr.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_fr.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_it.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_it.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_it.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_it.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_ja.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_ja.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_ja.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_ko.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_ko.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_ko.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_pt_BR.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_pt_BR.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_pt_BR.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_zh_CN.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_zh_CN.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_zh_CN.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_zh_TW.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_zh_TW.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/processor_zh_TW.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_de.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_de.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_de.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_de.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_es.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_es.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_es.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_es.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_fr.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_fr.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_fr.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_it.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_it.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_it.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_it.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_ja.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_ja.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_ja.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_ko.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_ko.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_ko.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_pt_BR.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_pt_BR.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_pt_BR.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_zh_CN.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_zh_CN.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_zh_CN.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_zh_TW.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_zh_TW.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/util_zh_TW.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_de.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_de.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_de.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_de.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_es.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_es.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_es.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_es.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_fr.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_fr.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_fr.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_it.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_it.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_it.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_it.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_ja.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_ja.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_ja.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_ko.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_ko.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_ko.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_pt_BR.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_pt_BR.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_pt_BR.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_zh_CN.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_zh_CN.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_zh_CN.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_zh_TW.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_zh_TW.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/webserviceap_zh_TW.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_de.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_de.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_de.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_de.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_es.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_es.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_es.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_es.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_fr.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_fr.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_fr.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_fr.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_it.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_it.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_it.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_it.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_ja.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_ja.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_ja.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_ja.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_ko.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_ko.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_ko.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_ko.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_pt_BR.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_pt_BR.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_pt_BR.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_pt_BR.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_zh_CN.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_zh_CN.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_zh_CN.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_zh_CN.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_zh_TW.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_zh_TW.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_zh_TW.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wsdl_zh_TW.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/spi/package-info.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/spi/package-info.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/spi/package-info.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/spi/package-info.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/ClassNameInfo.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/ClassNameInfo.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/ClassNameInfo.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/ClassNameInfo.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLFetcher.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLFetcher.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLFetcher.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLFetcher.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Options.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Options.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Options.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Options.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Plugin.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Plugin.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Plugin.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Plugin.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/plugin/at_generated/PluginImpl.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/plugin/at_generated/PluginImpl.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/plugin/at_generated/PluginImpl.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/plugin/at_generated/PluginImpl.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Binding.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Binding.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Binding.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Binding.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Fault.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Fault.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Fault.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Fault.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Import.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Import.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Import.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Import.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Port.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Port.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Port.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Port.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/PortType.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/PortType.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/PortType.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/PortType.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Service.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Service.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Service.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Service.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Types.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Types.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Types.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/Types.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Policy12ExtensionHandler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Policy12ExtensionHandler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Policy12ExtensionHandler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Policy12ExtensionHandler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Policy15ExtensionHandler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Policy15ExtensionHandler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Policy15ExtensionHandler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Policy15ExtensionHandler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Util.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Util.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Util.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/Util.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingMetadataExtensionHandler.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingMetadataExtensionHandler.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingMetadataExtensionHandler.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingMetadataExtensionHandler.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java rename to src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java diff --git a/jaxws/src/jdk.xml.ws/share/classes/module-info.java b/src/jdk.xml.ws/share/classes/module-info.java similarity index 100% rename from jaxws/src/jdk.xml.ws/share/classes/module-info.java rename to src/jdk.xml.ws/share/classes/module-info.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystemProvider.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystemProvider.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystemProvider.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystemProvider.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipCoder.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipCoder.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipCoder.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipCoder.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipDirectoryStream.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipDirectoryStream.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipDirectoryStream.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipDirectoryStream.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributeView.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributeView.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributeView.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributeView.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributes.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributes.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributes.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributes.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileStore.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileStore.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileStore.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileStore.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystemProvider.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystemProvider.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystemProvider.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystemProvider.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipInfo.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipInfo.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipInfo.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipInfo.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipUtils.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipUtils.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipUtils.java rename to src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipUtils.java diff --git a/jdk/src/jdk.zipfs/share/classes/module-info.java b/src/jdk.zipfs/share/classes/module-info.java similarity index 100% rename from jdk/src/jdk.zipfs/share/classes/module-info.java rename to src/jdk.zipfs/share/classes/module-info.java diff --git a/jdk/src/linux/doc/man/DO_NOT_EDIT--GENERATED_FILES b/src/linux/doc/man/DO_NOT_EDIT--GENERATED_FILES similarity index 100% rename from jdk/src/linux/doc/man/DO_NOT_EDIT--GENERATED_FILES rename to src/linux/doc/man/DO_NOT_EDIT--GENERATED_FILES diff --git a/jdk/src/linux/doc/man/appletviewer.1 b/src/linux/doc/man/appletviewer.1 similarity index 100% rename from jdk/src/linux/doc/man/appletviewer.1 rename to src/linux/doc/man/appletviewer.1 diff --git a/jdk/src/linux/doc/man/idlj.1 b/src/linux/doc/man/idlj.1 similarity index 100% rename from jdk/src/linux/doc/man/idlj.1 rename to src/linux/doc/man/idlj.1 diff --git a/jdk/src/linux/doc/man/ja/appletviewer.1 b/src/linux/doc/man/ja/appletviewer.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/appletviewer.1 rename to src/linux/doc/man/ja/appletviewer.1 diff --git a/jdk/src/linux/doc/man/ja/idlj.1 b/src/linux/doc/man/ja/idlj.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/idlj.1 rename to src/linux/doc/man/ja/idlj.1 diff --git a/jdk/src/linux/doc/man/ja/jar.1 b/src/linux/doc/man/ja/jar.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jar.1 rename to src/linux/doc/man/ja/jar.1 diff --git a/jdk/src/linux/doc/man/ja/jarsigner.1 b/src/linux/doc/man/ja/jarsigner.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jarsigner.1 rename to src/linux/doc/man/ja/jarsigner.1 diff --git a/jdk/src/linux/doc/man/ja/java.1 b/src/linux/doc/man/ja/java.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/java.1 rename to src/linux/doc/man/ja/java.1 diff --git a/jdk/src/linux/doc/man/ja/javac.1 b/src/linux/doc/man/ja/javac.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/javac.1 rename to src/linux/doc/man/ja/javac.1 diff --git a/jdk/src/linux/doc/man/ja/javadoc.1 b/src/linux/doc/man/ja/javadoc.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/javadoc.1 rename to src/linux/doc/man/ja/javadoc.1 diff --git a/jdk/src/linux/doc/man/ja/javah.1 b/src/linux/doc/man/ja/javah.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/javah.1 rename to src/linux/doc/man/ja/javah.1 diff --git a/jdk/src/linux/doc/man/ja/javap.1 b/src/linux/doc/man/ja/javap.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/javap.1 rename to src/linux/doc/man/ja/javap.1 diff --git a/jdk/src/linux/doc/man/ja/javaws.1 b/src/linux/doc/man/ja/javaws.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/javaws.1 rename to src/linux/doc/man/ja/javaws.1 diff --git a/jdk/src/linux/doc/man/ja/jcmd.1 b/src/linux/doc/man/ja/jcmd.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jcmd.1 rename to src/linux/doc/man/ja/jcmd.1 diff --git a/jdk/src/linux/doc/man/ja/jconsole.1 b/src/linux/doc/man/ja/jconsole.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jconsole.1 rename to src/linux/doc/man/ja/jconsole.1 diff --git a/jdk/src/linux/doc/man/ja/jdb.1 b/src/linux/doc/man/ja/jdb.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jdb.1 rename to src/linux/doc/man/ja/jdb.1 diff --git a/jdk/src/linux/doc/man/ja/jdeps.1 b/src/linux/doc/man/ja/jdeps.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jdeps.1 rename to src/linux/doc/man/ja/jdeps.1 diff --git a/jdk/src/linux/doc/man/ja/jhat.1 b/src/linux/doc/man/ja/jhat.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jhat.1 rename to src/linux/doc/man/ja/jhat.1 diff --git a/jdk/src/linux/doc/man/ja/jinfo.1 b/src/linux/doc/man/ja/jinfo.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jinfo.1 rename to src/linux/doc/man/ja/jinfo.1 diff --git a/jdk/src/linux/doc/man/ja/jjs.1 b/src/linux/doc/man/ja/jjs.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jjs.1 rename to src/linux/doc/man/ja/jjs.1 diff --git a/jdk/src/linux/doc/man/ja/jmap.1 b/src/linux/doc/man/ja/jmap.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jmap.1 rename to src/linux/doc/man/ja/jmap.1 diff --git a/jdk/src/linux/doc/man/ja/jps.1 b/src/linux/doc/man/ja/jps.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jps.1 rename to src/linux/doc/man/ja/jps.1 diff --git a/jdk/src/linux/doc/man/ja/jrunscript.1 b/src/linux/doc/man/ja/jrunscript.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jrunscript.1 rename to src/linux/doc/man/ja/jrunscript.1 diff --git a/jdk/src/linux/doc/man/ja/jsadebugd.1 b/src/linux/doc/man/ja/jsadebugd.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jsadebugd.1 rename to src/linux/doc/man/ja/jsadebugd.1 diff --git a/jdk/src/linux/doc/man/ja/jstack.1 b/src/linux/doc/man/ja/jstack.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jstack.1 rename to src/linux/doc/man/ja/jstack.1 diff --git a/jdk/src/linux/doc/man/ja/jstat.1 b/src/linux/doc/man/ja/jstat.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jstat.1 rename to src/linux/doc/man/ja/jstat.1 diff --git a/jdk/src/linux/doc/man/ja/jstatd.1 b/src/linux/doc/man/ja/jstatd.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/jstatd.1 rename to src/linux/doc/man/ja/jstatd.1 diff --git a/jdk/src/linux/doc/man/ja/keytool.1 b/src/linux/doc/man/ja/keytool.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/keytool.1 rename to src/linux/doc/man/ja/keytool.1 diff --git a/jdk/src/linux/doc/man/ja/orbd.1 b/src/linux/doc/man/ja/orbd.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/orbd.1 rename to src/linux/doc/man/ja/orbd.1 diff --git a/jdk/src/linux/doc/man/ja/pack200.1 b/src/linux/doc/man/ja/pack200.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/pack200.1 rename to src/linux/doc/man/ja/pack200.1 diff --git a/jdk/src/linux/doc/man/ja/policytool.1 b/src/linux/doc/man/ja/policytool.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/policytool.1 rename to src/linux/doc/man/ja/policytool.1 diff --git a/jdk/src/linux/doc/man/ja/rmic.1 b/src/linux/doc/man/ja/rmic.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/rmic.1 rename to src/linux/doc/man/ja/rmic.1 diff --git a/jdk/src/linux/doc/man/ja/rmid.1 b/src/linux/doc/man/ja/rmid.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/rmid.1 rename to src/linux/doc/man/ja/rmid.1 diff --git a/jdk/src/linux/doc/man/ja/rmiregistry.1 b/src/linux/doc/man/ja/rmiregistry.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/rmiregistry.1 rename to src/linux/doc/man/ja/rmiregistry.1 diff --git a/jdk/src/linux/doc/man/ja/schemagen.1 b/src/linux/doc/man/ja/schemagen.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/schemagen.1 rename to src/linux/doc/man/ja/schemagen.1 diff --git a/jdk/src/linux/doc/man/ja/serialver.1 b/src/linux/doc/man/ja/serialver.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/serialver.1 rename to src/linux/doc/man/ja/serialver.1 diff --git a/jdk/src/linux/doc/man/ja/servertool.1 b/src/linux/doc/man/ja/servertool.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/servertool.1 rename to src/linux/doc/man/ja/servertool.1 diff --git a/jdk/src/linux/doc/man/ja/tnameserv.1 b/src/linux/doc/man/ja/tnameserv.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/tnameserv.1 rename to src/linux/doc/man/ja/tnameserv.1 diff --git a/jdk/src/linux/doc/man/ja/unpack200.1 b/src/linux/doc/man/ja/unpack200.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/unpack200.1 rename to src/linux/doc/man/ja/unpack200.1 diff --git a/jdk/src/linux/doc/man/ja/wsgen.1 b/src/linux/doc/man/ja/wsgen.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/wsgen.1 rename to src/linux/doc/man/ja/wsgen.1 diff --git a/jdk/src/linux/doc/man/ja/wsimport.1 b/src/linux/doc/man/ja/wsimport.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/wsimport.1 rename to src/linux/doc/man/ja/wsimport.1 diff --git a/jdk/src/linux/doc/man/ja/xjc.1 b/src/linux/doc/man/ja/xjc.1 similarity index 100% rename from jdk/src/linux/doc/man/ja/xjc.1 rename to src/linux/doc/man/ja/xjc.1 diff --git a/jdk/src/linux/doc/man/jar.1 b/src/linux/doc/man/jar.1 similarity index 100% rename from jdk/src/linux/doc/man/jar.1 rename to src/linux/doc/man/jar.1 diff --git a/jdk/src/linux/doc/man/jarsigner.1 b/src/linux/doc/man/jarsigner.1 similarity index 100% rename from jdk/src/linux/doc/man/jarsigner.1 rename to src/linux/doc/man/jarsigner.1 diff --git a/jdk/src/linux/doc/man/java.1 b/src/linux/doc/man/java.1 similarity index 100% rename from jdk/src/linux/doc/man/java.1 rename to src/linux/doc/man/java.1 diff --git a/jdk/src/linux/doc/man/javac.1 b/src/linux/doc/man/javac.1 similarity index 100% rename from jdk/src/linux/doc/man/javac.1 rename to src/linux/doc/man/javac.1 diff --git a/jdk/src/linux/doc/man/javadoc.1 b/src/linux/doc/man/javadoc.1 similarity index 100% rename from jdk/src/linux/doc/man/javadoc.1 rename to src/linux/doc/man/javadoc.1 diff --git a/jdk/src/linux/doc/man/javah.1 b/src/linux/doc/man/javah.1 similarity index 100% rename from jdk/src/linux/doc/man/javah.1 rename to src/linux/doc/man/javah.1 diff --git a/jdk/src/linux/doc/man/javap.1 b/src/linux/doc/man/javap.1 similarity index 100% rename from jdk/src/linux/doc/man/javap.1 rename to src/linux/doc/man/javap.1 diff --git a/jdk/src/linux/doc/man/javaws.1 b/src/linux/doc/man/javaws.1 similarity index 100% rename from jdk/src/linux/doc/man/javaws.1 rename to src/linux/doc/man/javaws.1 diff --git a/jdk/src/linux/doc/man/jcmd.1 b/src/linux/doc/man/jcmd.1 similarity index 100% rename from jdk/src/linux/doc/man/jcmd.1 rename to src/linux/doc/man/jcmd.1 diff --git a/jdk/src/linux/doc/man/jconsole.1 b/src/linux/doc/man/jconsole.1 similarity index 100% rename from jdk/src/linux/doc/man/jconsole.1 rename to src/linux/doc/man/jconsole.1 diff --git a/jdk/src/linux/doc/man/jdb.1 b/src/linux/doc/man/jdb.1 similarity index 100% rename from jdk/src/linux/doc/man/jdb.1 rename to src/linux/doc/man/jdb.1 diff --git a/jdk/src/linux/doc/man/jdeps.1 b/src/linux/doc/man/jdeps.1 similarity index 100% rename from jdk/src/linux/doc/man/jdeps.1 rename to src/linux/doc/man/jdeps.1 diff --git a/jdk/src/linux/doc/man/jhat.1 b/src/linux/doc/man/jhat.1 similarity index 100% rename from jdk/src/linux/doc/man/jhat.1 rename to src/linux/doc/man/jhat.1 diff --git a/jdk/src/linux/doc/man/jinfo.1 b/src/linux/doc/man/jinfo.1 similarity index 100% rename from jdk/src/linux/doc/man/jinfo.1 rename to src/linux/doc/man/jinfo.1 diff --git a/jdk/src/linux/doc/man/jjs.1 b/src/linux/doc/man/jjs.1 similarity index 100% rename from jdk/src/linux/doc/man/jjs.1 rename to src/linux/doc/man/jjs.1 diff --git a/jdk/src/linux/doc/man/jmap.1 b/src/linux/doc/man/jmap.1 similarity index 100% rename from jdk/src/linux/doc/man/jmap.1 rename to src/linux/doc/man/jmap.1 diff --git a/jdk/src/linux/doc/man/jps.1 b/src/linux/doc/man/jps.1 similarity index 100% rename from jdk/src/linux/doc/man/jps.1 rename to src/linux/doc/man/jps.1 diff --git a/jdk/src/linux/doc/man/jrunscript.1 b/src/linux/doc/man/jrunscript.1 similarity index 100% rename from jdk/src/linux/doc/man/jrunscript.1 rename to src/linux/doc/man/jrunscript.1 diff --git a/jdk/src/linux/doc/man/jsadebugd.1 b/src/linux/doc/man/jsadebugd.1 similarity index 100% rename from jdk/src/linux/doc/man/jsadebugd.1 rename to src/linux/doc/man/jsadebugd.1 diff --git a/jdk/src/linux/doc/man/jstack.1 b/src/linux/doc/man/jstack.1 similarity index 100% rename from jdk/src/linux/doc/man/jstack.1 rename to src/linux/doc/man/jstack.1 diff --git a/jdk/src/linux/doc/man/jstat.1 b/src/linux/doc/man/jstat.1 similarity index 100% rename from jdk/src/linux/doc/man/jstat.1 rename to src/linux/doc/man/jstat.1 diff --git a/jdk/src/linux/doc/man/jstatd.1 b/src/linux/doc/man/jstatd.1 similarity index 100% rename from jdk/src/linux/doc/man/jstatd.1 rename to src/linux/doc/man/jstatd.1 diff --git a/jdk/src/linux/doc/man/keytool.1 b/src/linux/doc/man/keytool.1 similarity index 100% rename from jdk/src/linux/doc/man/keytool.1 rename to src/linux/doc/man/keytool.1 diff --git a/jdk/src/linux/doc/man/orbd.1 b/src/linux/doc/man/orbd.1 similarity index 100% rename from jdk/src/linux/doc/man/orbd.1 rename to src/linux/doc/man/orbd.1 diff --git a/jdk/src/linux/doc/man/pack200.1 b/src/linux/doc/man/pack200.1 similarity index 100% rename from jdk/src/linux/doc/man/pack200.1 rename to src/linux/doc/man/pack200.1 diff --git a/jdk/src/linux/doc/man/policytool.1 b/src/linux/doc/man/policytool.1 similarity index 100% rename from jdk/src/linux/doc/man/policytool.1 rename to src/linux/doc/man/policytool.1 diff --git a/jdk/src/linux/doc/man/rmic.1 b/src/linux/doc/man/rmic.1 similarity index 100% rename from jdk/src/linux/doc/man/rmic.1 rename to src/linux/doc/man/rmic.1 diff --git a/jdk/src/linux/doc/man/rmid.1 b/src/linux/doc/man/rmid.1 similarity index 100% rename from jdk/src/linux/doc/man/rmid.1 rename to src/linux/doc/man/rmid.1 diff --git a/jdk/src/linux/doc/man/rmiregistry.1 b/src/linux/doc/man/rmiregistry.1 similarity index 100% rename from jdk/src/linux/doc/man/rmiregistry.1 rename to src/linux/doc/man/rmiregistry.1 diff --git a/jdk/src/linux/doc/man/schemagen.1 b/src/linux/doc/man/schemagen.1 similarity index 100% rename from jdk/src/linux/doc/man/schemagen.1 rename to src/linux/doc/man/schemagen.1 diff --git a/jdk/src/linux/doc/man/serialver.1 b/src/linux/doc/man/serialver.1 similarity index 100% rename from jdk/src/linux/doc/man/serialver.1 rename to src/linux/doc/man/serialver.1 diff --git a/jdk/src/linux/doc/man/servertool.1 b/src/linux/doc/man/servertool.1 similarity index 100% rename from jdk/src/linux/doc/man/servertool.1 rename to src/linux/doc/man/servertool.1 diff --git a/jdk/src/linux/doc/man/tnameserv.1 b/src/linux/doc/man/tnameserv.1 similarity index 100% rename from jdk/src/linux/doc/man/tnameserv.1 rename to src/linux/doc/man/tnameserv.1 diff --git a/jdk/src/linux/doc/man/unpack200.1 b/src/linux/doc/man/unpack200.1 similarity index 100% rename from jdk/src/linux/doc/man/unpack200.1 rename to src/linux/doc/man/unpack200.1 diff --git a/jdk/src/linux/doc/man/wsgen.1 b/src/linux/doc/man/wsgen.1 similarity index 100% rename from jdk/src/linux/doc/man/wsgen.1 rename to src/linux/doc/man/wsgen.1 diff --git a/jdk/src/linux/doc/man/wsimport.1 b/src/linux/doc/man/wsimport.1 similarity index 100% rename from jdk/src/linux/doc/man/wsimport.1 rename to src/linux/doc/man/wsimport.1 diff --git a/jdk/src/linux/doc/man/xjc.1 b/src/linux/doc/man/xjc.1 similarity index 100% rename from jdk/src/linux/doc/man/xjc.1 rename to src/linux/doc/man/xjc.1 diff --git a/nashorn/samples/BufferArray.java b/src/sample/nashorn/BufferArray.java similarity index 100% rename from nashorn/samples/BufferArray.java rename to src/sample/nashorn/BufferArray.java diff --git a/nashorn/samples/CastExample.java b/src/sample/nashorn/CastExample.java similarity index 100% rename from nashorn/samples/CastExample.java rename to src/sample/nashorn/CastExample.java diff --git a/nashorn/samples/EvalWithArbitraryThis.java b/src/sample/nashorn/EvalWithArbitraryThis.java similarity index 100% rename from nashorn/samples/EvalWithArbitraryThis.java rename to src/sample/nashorn/EvalWithArbitraryThis.java diff --git a/nashorn/samples/LambdaAsFunc.java b/src/sample/nashorn/LambdaAsFunc.java similarity index 100% rename from nashorn/samples/LambdaAsFunc.java rename to src/sample/nashorn/LambdaAsFunc.java diff --git a/nashorn/samples/Main.asm b/src/sample/nashorn/Main.asm similarity index 100% rename from nashorn/samples/Main.asm rename to src/sample/nashorn/Main.asm diff --git a/nashorn/samples/PrintToString.java b/src/sample/nashorn/PrintToString.java similarity index 100% rename from nashorn/samples/PrintToString.java rename to src/sample/nashorn/PrintToString.java diff --git a/nashorn/samples/README b/src/sample/nashorn/README similarity index 100% rename from nashorn/samples/README rename to src/sample/nashorn/README diff --git a/nashorn/samples/array_mapreduce.js b/src/sample/nashorn/array_mapreduce.js similarity index 100% rename from nashorn/samples/array_mapreduce.js rename to src/sample/nashorn/array_mapreduce.js diff --git a/nashorn/samples/array_removeif.js b/src/sample/nashorn/array_removeif.js similarity index 100% rename from nashorn/samples/array_removeif.js rename to src/sample/nashorn/array_removeif.js diff --git a/nashorn/samples/astviewer.js b/src/sample/nashorn/astviewer.js similarity index 100% rename from nashorn/samples/astviewer.js rename to src/sample/nashorn/astviewer.js diff --git a/nashorn/samples/autoimports.js b/src/sample/nashorn/autoimports.js similarity index 100% rename from nashorn/samples/autoimports.js rename to src/sample/nashorn/autoimports.js diff --git a/nashorn/samples/barchart_weather.js b/src/sample/nashorn/barchart_weather.js similarity index 100% rename from nashorn/samples/barchart_weather.js rename to src/sample/nashorn/barchart_weather.js diff --git a/nashorn/samples/bind_on_java.js b/src/sample/nashorn/bind_on_java.js similarity index 100% rename from nashorn/samples/bind_on_java.js rename to src/sample/nashorn/bind_on_java.js diff --git a/nashorn/samples/breakcontinue_in_tryfinally.js b/src/sample/nashorn/breakcontinue_in_tryfinally.js similarity index 100% rename from nashorn/samples/breakcontinue_in_tryfinally.js rename to src/sample/nashorn/breakcontinue_in_tryfinally.js diff --git a/nashorn/samples/browser_dom.js b/src/sample/nashorn/browser_dom.js similarity index 100% rename from nashorn/samples/browser_dom.js rename to src/sample/nashorn/browser_dom.js diff --git a/nashorn/samples/call_bind_java.js b/src/sample/nashorn/call_bind_java.js similarity index 100% rename from nashorn/samples/call_bind_java.js rename to src/sample/nashorn/call_bind_java.js diff --git a/nashorn/samples/call_lambda.js b/src/sample/nashorn/call_lambda.js similarity index 100% rename from nashorn/samples/call_lambda.js rename to src/sample/nashorn/call_lambda.js diff --git a/nashorn/samples/check_nashorn.js b/src/sample/nashorn/check_nashorn.js similarity index 100% rename from nashorn/samples/check_nashorn.js rename to src/sample/nashorn/check_nashorn.js diff --git a/nashorn/samples/checknames.js b/src/sample/nashorn/checknames.js similarity index 100% rename from nashorn/samples/checknames.js rename to src/sample/nashorn/checknames.js diff --git a/nashorn/samples/classes.js b/src/sample/nashorn/classes.js similarity index 100% rename from nashorn/samples/classes.js rename to src/sample/nashorn/classes.js diff --git a/nashorn/samples/clickcounter.fxml b/src/sample/nashorn/clickcounter.fxml similarity index 100% rename from nashorn/samples/clickcounter.fxml rename to src/sample/nashorn/clickcounter.fxml diff --git a/nashorn/samples/colorfulcircles.js b/src/sample/nashorn/colorfulcircles.js similarity index 100% rename from nashorn/samples/colorfulcircles.js rename to src/sample/nashorn/colorfulcircles.js diff --git a/nashorn/samples/colorpick.js b/src/sample/nashorn/colorpick.js similarity index 100% rename from nashorn/samples/colorpick.js rename to src/sample/nashorn/colorpick.js diff --git a/nashorn/samples/console.js b/src/sample/nashorn/console.js similarity index 100% rename from nashorn/samples/console.js rename to src/sample/nashorn/console.js diff --git a/nashorn/samples/consoleuse.js b/src/sample/nashorn/consoleuse.js similarity index 100% rename from nashorn/samples/consoleuse.js rename to src/sample/nashorn/consoleuse.js diff --git a/nashorn/samples/counters.js b/src/sample/nashorn/counters.js similarity index 100% rename from nashorn/samples/counters.js rename to src/sample/nashorn/counters.js diff --git a/nashorn/samples/cricket.js b/src/sample/nashorn/cricket.js similarity index 100% rename from nashorn/samples/cricket.js rename to src/sample/nashorn/cricket.js diff --git a/nashorn/samples/dateconversion.js b/src/sample/nashorn/dateconversion.js similarity index 100% rename from nashorn/samples/dateconversion.js rename to src/sample/nashorn/dateconversion.js diff --git a/nashorn/samples/datepick.js b/src/sample/nashorn/datepick.js similarity index 100% rename from nashorn/samples/datepick.js rename to src/sample/nashorn/datepick.js diff --git a/nashorn/samples/datetime.js b/src/sample/nashorn/datetime.js similarity index 100% rename from nashorn/samples/datetime.js rename to src/sample/nashorn/datetime.js diff --git a/nashorn/samples/defaults.js b/src/sample/nashorn/defaults.js similarity index 100% rename from nashorn/samples/defaults.js rename to src/sample/nashorn/defaults.js diff --git a/nashorn/samples/dirname.js b/src/sample/nashorn/dirname.js similarity index 100% rename from nashorn/samples/dirname.js rename to src/sample/nashorn/dirname.js diff --git a/nashorn/samples/disassemble.js b/src/sample/nashorn/disassemble.js similarity index 100% rename from nashorn/samples/disassemble.js rename to src/sample/nashorn/disassemble.js diff --git a/nashorn/samples/dynalink/ArrayStreamLinkerExporter.java b/src/sample/nashorn/dynalink/ArrayStreamLinkerExporter.java similarity index 100% rename from nashorn/samples/dynalink/ArrayStreamLinkerExporter.java rename to src/sample/nashorn/dynalink/ArrayStreamLinkerExporter.java diff --git a/nashorn/samples/dynalink/BufferIndexingLinkerExporter.java b/src/sample/nashorn/dynalink/BufferIndexingLinkerExporter.java similarity index 100% rename from nashorn/samples/dynalink/BufferIndexingLinkerExporter.java rename to src/sample/nashorn/dynalink/BufferIndexingLinkerExporter.java diff --git a/nashorn/samples/dynalink/DOMLinkerExporter.java b/src/sample/nashorn/dynalink/DOMLinkerExporter.java similarity index 100% rename from nashorn/samples/dynalink/DOMLinkerExporter.java rename to src/sample/nashorn/dynalink/DOMLinkerExporter.java diff --git a/nashorn/samples/dynalink/META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter b/src/sample/nashorn/dynalink/META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter similarity index 100% rename from nashorn/samples/dynalink/META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter rename to src/sample/nashorn/dynalink/META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter diff --git a/nashorn/samples/dynalink/MissingMethodExample.java b/src/sample/nashorn/dynalink/MissingMethodExample.java similarity index 100% rename from nashorn/samples/dynalink/MissingMethodExample.java rename to src/sample/nashorn/dynalink/MissingMethodExample.java diff --git a/nashorn/samples/dynalink/MissingMethodHandler.java b/src/sample/nashorn/dynalink/MissingMethodHandler.java similarity index 100% rename from nashorn/samples/dynalink/MissingMethodHandler.java rename to src/sample/nashorn/dynalink/MissingMethodHandler.java diff --git a/nashorn/samples/dynalink/MissingMethodLinkerExporter.java b/src/sample/nashorn/dynalink/MissingMethodLinkerExporter.java similarity index 100% rename from nashorn/samples/dynalink/MissingMethodLinkerExporter.java rename to src/sample/nashorn/dynalink/MissingMethodLinkerExporter.java diff --git a/nashorn/samples/dynalink/README b/src/sample/nashorn/dynalink/README similarity index 100% rename from nashorn/samples/dynalink/README rename to src/sample/nashorn/dynalink/README diff --git a/nashorn/samples/dynalink/UnderscoreNameLinkerExporter.java b/src/sample/nashorn/dynalink/UnderscoreNameLinkerExporter.java similarity index 100% rename from nashorn/samples/dynalink/UnderscoreNameLinkerExporter.java rename to src/sample/nashorn/dynalink/UnderscoreNameLinkerExporter.java diff --git a/nashorn/samples/dynalink/array_stream.js b/src/sample/nashorn/dynalink/array_stream.js similarity index 100% rename from nashorn/samples/dynalink/array_stream.js rename to src/sample/nashorn/dynalink/array_stream.js diff --git a/nashorn/samples/dynalink/array_stream_linker.js b/src/sample/nashorn/dynalink/array_stream_linker.js similarity index 100% rename from nashorn/samples/dynalink/array_stream_linker.js rename to src/sample/nashorn/dynalink/array_stream_linker.js diff --git a/nashorn/samples/dynalink/buffer_index.js b/src/sample/nashorn/dynalink/buffer_index.js similarity index 100% rename from nashorn/samples/dynalink/buffer_index.js rename to src/sample/nashorn/dynalink/buffer_index.js diff --git a/nashorn/samples/dynalink/buffer_indexing_linker.js b/src/sample/nashorn/dynalink/buffer_indexing_linker.js similarity index 100% rename from nashorn/samples/dynalink/buffer_indexing_linker.js rename to src/sample/nashorn/dynalink/buffer_indexing_linker.js diff --git a/nashorn/samples/dynalink/dom_linker.js b/src/sample/nashorn/dynalink/dom_linker.js similarity index 100% rename from nashorn/samples/dynalink/dom_linker.js rename to src/sample/nashorn/dynalink/dom_linker.js diff --git a/nashorn/samples/dynalink/dom_linker_gutenberg.js b/src/sample/nashorn/dynalink/dom_linker_gutenberg.js similarity index 100% rename from nashorn/samples/dynalink/dom_linker_gutenberg.js rename to src/sample/nashorn/dynalink/dom_linker_gutenberg.js diff --git a/nashorn/samples/dynalink/missing_method.js b/src/sample/nashorn/dynalink/missing_method.js similarity index 100% rename from nashorn/samples/dynalink/missing_method.js rename to src/sample/nashorn/dynalink/missing_method.js diff --git a/nashorn/samples/dynalink/missing_method_linker.js b/src/sample/nashorn/dynalink/missing_method_linker.js similarity index 100% rename from nashorn/samples/dynalink/missing_method_linker.js rename to src/sample/nashorn/dynalink/missing_method_linker.js diff --git a/nashorn/samples/dynalink/underscore.js b/src/sample/nashorn/dynalink/underscore.js similarity index 100% rename from nashorn/samples/dynalink/underscore.js rename to src/sample/nashorn/dynalink/underscore.js diff --git a/nashorn/samples/dynalink/underscore_linker.js b/src/sample/nashorn/dynalink/underscore_linker.js similarity index 100% rename from nashorn/samples/dynalink/underscore_linker.js rename to src/sample/nashorn/dynalink/underscore_linker.js diff --git a/nashorn/samples/engine/README b/src/sample/nashorn/engine/README similarity index 100% rename from nashorn/samples/engine/README rename to src/sample/nashorn/engine/README diff --git a/nashorn/samples/engine/accessvar.js b/src/sample/nashorn/engine/accessvar.js similarity index 100% rename from nashorn/samples/engine/accessvar.js rename to src/sample/nashorn/engine/accessvar.js diff --git a/nashorn/samples/engine/callfunc.js b/src/sample/nashorn/engine/callfunc.js similarity index 100% rename from nashorn/samples/engine/callfunc.js rename to src/sample/nashorn/engine/callfunc.js diff --git a/nashorn/samples/engine/callmethod.js b/src/sample/nashorn/engine/callmethod.js similarity index 100% rename from nashorn/samples/engine/callmethod.js rename to src/sample/nashorn/engine/callmethod.js diff --git a/nashorn/samples/engine/exposevar.js b/src/sample/nashorn/engine/exposevar.js similarity index 100% rename from nashorn/samples/engine/exposevar.js rename to src/sample/nashorn/engine/exposevar.js diff --git a/nashorn/samples/engine/foreignobject.js b/src/sample/nashorn/engine/foreignobject.js similarity index 100% rename from nashorn/samples/engine/foreignobject.js rename to src/sample/nashorn/engine/foreignobject.js diff --git a/nashorn/samples/engine/hello.js b/src/sample/nashorn/engine/hello.js similarity index 100% rename from nashorn/samples/engine/hello.js rename to src/sample/nashorn/engine/hello.js diff --git a/nashorn/samples/engine/interface.js b/src/sample/nashorn/engine/interface.js similarity index 100% rename from nashorn/samples/engine/interface.js rename to src/sample/nashorn/engine/interface.js diff --git a/nashorn/samples/engine/interface2.js b/src/sample/nashorn/engine/interface2.js similarity index 100% rename from nashorn/samples/engine/interface2.js rename to src/sample/nashorn/engine/interface2.js diff --git a/nashorn/samples/engine/lambda_as_func.js b/src/sample/nashorn/engine/lambda_as_func.js similarity index 100% rename from nashorn/samples/engine/lambda_as_func.js rename to src/sample/nashorn/engine/lambda_as_func.js diff --git a/nashorn/samples/env.js b/src/sample/nashorn/env.js similarity index 100% rename from nashorn/samples/env.js rename to src/sample/nashorn/env.js diff --git a/nashorn/samples/evalcheck.js b/src/sample/nashorn/evalcheck.js similarity index 100% rename from nashorn/samples/evalcheck.js rename to src/sample/nashorn/evalcheck.js diff --git a/nashorn/samples/exceptionswallow.js b/src/sample/nashorn/exceptionswallow.js similarity index 100% rename from nashorn/samples/exceptionswallow.js rename to src/sample/nashorn/exceptionswallow.js diff --git a/nashorn/samples/exec.js b/src/sample/nashorn/exec.js similarity index 100% rename from nashorn/samples/exec.js rename to src/sample/nashorn/exec.js diff --git a/nashorn/samples/expression_closure.js b/src/sample/nashorn/expression_closure.js similarity index 100% rename from nashorn/samples/expression_closure.js rename to src/sample/nashorn/expression_closure.js diff --git a/nashorn/samples/filebrowser.js b/src/sample/nashorn/filebrowser.js similarity index 100% rename from nashorn/samples/filebrowser.js rename to src/sample/nashorn/filebrowser.js diff --git a/nashorn/samples/fileline.js b/src/sample/nashorn/fileline.js similarity index 100% rename from nashorn/samples/fileline.js rename to src/sample/nashorn/fileline.js diff --git a/nashorn/samples/find_max_lines.js b/src/sample/nashorn/find_max_lines.js similarity index 100% rename from nashorn/samples/find_max_lines.js rename to src/sample/nashorn/find_max_lines.js diff --git a/nashorn/samples/find_nonfinals.js b/src/sample/nashorn/find_nonfinals.js similarity index 100% rename from nashorn/samples/find_nonfinals.js rename to src/sample/nashorn/find_nonfinals.js diff --git a/nashorn/samples/find_nonfinals2.js b/src/sample/nashorn/find_nonfinals2.js similarity index 100% rename from nashorn/samples/find_nonfinals2.js rename to src/sample/nashorn/find_nonfinals2.js diff --git a/nashorn/samples/find_underscores.js b/src/sample/nashorn/find_underscores.js similarity index 100% rename from nashorn/samples/find_underscores.js rename to src/sample/nashorn/find_underscores.js diff --git a/nashorn/samples/findproto.js b/src/sample/nashorn/findproto.js similarity index 100% rename from nashorn/samples/findproto.js rename to src/sample/nashorn/findproto.js diff --git a/nashorn/samples/findvardelete.js b/src/sample/nashorn/findvardelete.js similarity index 100% rename from nashorn/samples/findvardelete.js rename to src/sample/nashorn/findvardelete.js diff --git a/nashorn/samples/findwith.js b/src/sample/nashorn/findwith.js similarity index 100% rename from nashorn/samples/findwith.js rename to src/sample/nashorn/findwith.js diff --git a/nashorn/samples/fixed_point.js b/src/sample/nashorn/fixed_point.js similarity index 100% rename from nashorn/samples/fixed_point.js rename to src/sample/nashorn/fixed_point.js diff --git a/nashorn/samples/fizzbuzz.js b/src/sample/nashorn/fizzbuzz.js similarity index 100% rename from nashorn/samples/fizzbuzz.js rename to src/sample/nashorn/fizzbuzz.js diff --git a/nashorn/samples/fjson.js b/src/sample/nashorn/fjson.js similarity index 100% rename from nashorn/samples/fjson.js rename to src/sample/nashorn/fjson.js diff --git a/nashorn/samples/flexijson.js b/src/sample/nashorn/flexijson.js similarity index 100% rename from nashorn/samples/flexijson.js rename to src/sample/nashorn/flexijson.js diff --git a/nashorn/samples/for_each.js b/src/sample/nashorn/for_each.js similarity index 100% rename from nashorn/samples/for_each.js rename to src/sample/nashorn/for_each.js diff --git a/nashorn/samples/fxml_example.js b/src/sample/nashorn/fxml_example.js similarity index 100% rename from nashorn/samples/fxml_example.js rename to src/sample/nashorn/fxml_example.js diff --git a/nashorn/samples/fxmlrunner.js b/src/sample/nashorn/fxmlrunner.js similarity index 100% rename from nashorn/samples/fxmlrunner.js rename to src/sample/nashorn/fxmlrunner.js diff --git a/nashorn/samples/gaussian_random.js b/src/sample/nashorn/gaussian_random.js similarity index 100% rename from nashorn/samples/gaussian_random.js rename to src/sample/nashorn/gaussian_random.js diff --git a/nashorn/samples/gaussian_random_bind.js b/src/sample/nashorn/gaussian_random_bind.js similarity index 100% rename from nashorn/samples/gaussian_random_bind.js rename to src/sample/nashorn/gaussian_random_bind.js diff --git a/nashorn/samples/getclassnpe.js b/src/sample/nashorn/getclassnpe.js similarity index 100% rename from nashorn/samples/getclassnpe.js rename to src/sample/nashorn/getclassnpe.js diff --git a/nashorn/samples/gutenberg.js b/src/sample/nashorn/gutenberg.js similarity index 100% rename from nashorn/samples/gutenberg.js rename to src/sample/nashorn/gutenberg.js diff --git a/nashorn/samples/heredoc.js b/src/sample/nashorn/heredoc.js similarity index 100% rename from nashorn/samples/heredoc.js rename to src/sample/nashorn/heredoc.js diff --git a/nashorn/samples/importstatic.js b/src/sample/nashorn/importstatic.js similarity index 100% rename from nashorn/samples/importstatic.js rename to src/sample/nashorn/importstatic.js diff --git a/nashorn/samples/interface_impl.js b/src/sample/nashorn/interface_impl.js similarity index 100% rename from nashorn/samples/interface_impl.js rename to src/sample/nashorn/interface_impl.js diff --git a/nashorn/samples/java_completion.js b/src/sample/nashorn/java_completion.js similarity index 100% rename from nashorn/samples/java_completion.js rename to src/sample/nashorn/java_completion.js diff --git a/nashorn/samples/javaastviewer.js b/src/sample/nashorn/javaastviewer.js similarity index 100% rename from nashorn/samples/javaastviewer.js rename to src/sample/nashorn/javaastviewer.js diff --git a/nashorn/samples/javabind.js b/src/sample/nashorn/javabind.js similarity index 100% rename from nashorn/samples/javabind.js rename to src/sample/nashorn/javabind.js diff --git a/nashorn/samples/javacastcounter.js b/src/sample/nashorn/javacastcounter.js similarity index 100% rename from nashorn/samples/javacastcounter.js rename to src/sample/nashorn/javacastcounter.js diff --git a/nashorn/samples/javaconstructorbind.js b/src/sample/nashorn/javaconstructorbind.js similarity index 100% rename from nashorn/samples/javaconstructorbind.js rename to src/sample/nashorn/javaconstructorbind.js diff --git a/nashorn/samples/javafoovars.js b/src/sample/nashorn/javafoovars.js similarity index 100% rename from nashorn/samples/javafoovars.js rename to src/sample/nashorn/javafoovars.js diff --git a/nashorn/samples/javahelp.js b/src/sample/nashorn/javahelp.js similarity index 100% rename from nashorn/samples/javahelp.js rename to src/sample/nashorn/javahelp.js diff --git a/nashorn/samples/javaimporter.js b/src/sample/nashorn/javaimporter.js similarity index 100% rename from nashorn/samples/javaimporter.js rename to src/sample/nashorn/javaimporter.js diff --git a/nashorn/samples/javalist.js b/src/sample/nashorn/javalist.js similarity index 100% rename from nashorn/samples/javalist.js rename to src/sample/nashorn/javalist.js diff --git a/nashorn/samples/javamap.js b/src/sample/nashorn/javamap.js similarity index 100% rename from nashorn/samples/javamap.js rename to src/sample/nashorn/javamap.js diff --git a/nashorn/samples/javashell.js b/src/sample/nashorn/javashell.js similarity index 100% rename from nashorn/samples/javashell.js rename to src/sample/nashorn/javashell.js diff --git a/nashorn/samples/jd.js b/src/sample/nashorn/jd.js similarity index 100% rename from nashorn/samples/jd.js rename to src/sample/nashorn/jd.js diff --git a/nashorn/samples/jrtlist.js b/src/sample/nashorn/jrtlist.js similarity index 100% rename from nashorn/samples/jrtlist.js rename to src/sample/nashorn/jrtlist.js diff --git a/nashorn/samples/jsadapter-fallthrough.js b/src/sample/nashorn/jsadapter-fallthrough.js similarity index 100% rename from nashorn/samples/jsadapter-fallthrough.js rename to src/sample/nashorn/jsadapter-fallthrough.js diff --git a/nashorn/samples/jsadapter_dom.js b/src/sample/nashorn/jsadapter_dom.js similarity index 100% rename from nashorn/samples/jsadapter_dom.js rename to src/sample/nashorn/jsadapter_dom.js diff --git a/nashorn/samples/jsobj_example.js b/src/sample/nashorn/jsobj_example.js similarity index 100% rename from nashorn/samples/jsobj_example.js rename to src/sample/nashorn/jsobj_example.js diff --git a/nashorn/samples/jsobject.js b/src/sample/nashorn/jsobject.js similarity index 100% rename from nashorn/samples/jsobject.js rename to src/sample/nashorn/jsobject.js diff --git a/nashorn/samples/jsobject_mapreduce.js b/src/sample/nashorn/jsobject_mapreduce.js similarity index 100% rename from nashorn/samples/jsobject_mapreduce.js rename to src/sample/nashorn/jsobject_mapreduce.js diff --git a/nashorn/samples/jsonviewer.js b/src/sample/nashorn/jsonviewer.js similarity index 100% rename from nashorn/samples/jsonviewer.js rename to src/sample/nashorn/jsonviewer.js diff --git a/nashorn/samples/letter.js b/src/sample/nashorn/letter.js similarity index 100% rename from nashorn/samples/letter.js rename to src/sample/nashorn/letter.js diff --git a/nashorn/samples/lines.js b/src/sample/nashorn/lines.js similarity index 100% rename from nashorn/samples/lines.js rename to src/sample/nashorn/lines.js diff --git a/nashorn/samples/list_mapreduce.js b/src/sample/nashorn/list_mapreduce.js similarity index 100% rename from nashorn/samples/list_mapreduce.js rename to src/sample/nashorn/list_mapreduce.js diff --git a/nashorn/samples/locales.js b/src/sample/nashorn/locales.js similarity index 100% rename from nashorn/samples/locales.js rename to src/sample/nashorn/locales.js diff --git a/nashorn/samples/logisticmap.js b/src/sample/nashorn/logisticmap.js similarity index 100% rename from nashorn/samples/logisticmap.js rename to src/sample/nashorn/logisticmap.js diff --git a/nashorn/samples/mapwith.js b/src/sample/nashorn/mapwith.js similarity index 100% rename from nashorn/samples/mapwith.js rename to src/sample/nashorn/mapwith.js diff --git a/nashorn/samples/mothers_day.js b/src/sample/nashorn/mothers_day.js similarity index 100% rename from nashorn/samples/mothers_day.js rename to src/sample/nashorn/mothers_day.js diff --git a/nashorn/samples/nashornastviewer.js b/src/sample/nashorn/nashornastviewer.js similarity index 100% rename from nashorn/samples/nashornastviewer.js rename to src/sample/nashorn/nashornastviewer.js diff --git a/nashorn/samples/options.js b/src/sample/nashorn/options.js similarity index 100% rename from nashorn/samples/options.js rename to src/sample/nashorn/options.js diff --git a/nashorn/samples/parser.js b/src/sample/nashorn/parser.js similarity index 100% rename from nashorn/samples/parser.js rename to src/sample/nashorn/parser.js diff --git a/nashorn/samples/passwordgen.js b/src/sample/nashorn/passwordgen.js similarity index 100% rename from nashorn/samples/passwordgen.js rename to src/sample/nashorn/passwordgen.js diff --git a/nashorn/samples/prettyprinter.js b/src/sample/nashorn/prettyprinter.js similarity index 100% rename from nashorn/samples/prettyprinter.js rename to src/sample/nashorn/prettyprinter.js diff --git a/nashorn/samples/print_symlinks.js b/src/sample/nashorn/print_symlinks.js similarity index 100% rename from nashorn/samples/print_symlinks.js rename to src/sample/nashorn/print_symlinks.js diff --git a/nashorn/samples/readLine.js b/src/sample/nashorn/readLine.js similarity index 100% rename from nashorn/samples/readLine.js rename to src/sample/nashorn/readLine.js diff --git a/nashorn/samples/resourcetrysuggester.js b/src/sample/nashorn/resourcetrysuggester.js similarity index 100% rename from nashorn/samples/resourcetrysuggester.js rename to src/sample/nashorn/resourcetrysuggester.js diff --git a/nashorn/samples/sam_function.js b/src/sample/nashorn/sam_function.js similarity index 100% rename from nashorn/samples/sam_function.js rename to src/sample/nashorn/sam_function.js diff --git a/nashorn/samples/secondssince.js b/src/sample/nashorn/secondssince.js similarity index 100% rename from nashorn/samples/secondssince.js rename to src/sample/nashorn/secondssince.js diff --git a/nashorn/samples/shell.js b/src/sample/nashorn/shell.js similarity index 100% rename from nashorn/samples/shell.js rename to src/sample/nashorn/shell.js diff --git a/nashorn/samples/showenv.js b/src/sample/nashorn/showenv.js similarity index 100% rename from nashorn/samples/showenv.js rename to src/sample/nashorn/showenv.js diff --git a/nashorn/samples/showsysprops.js b/src/sample/nashorn/showsysprops.js similarity index 100% rename from nashorn/samples/showsysprops.js rename to src/sample/nashorn/showsysprops.js diff --git a/nashorn/samples/sort_by_java8.js b/src/sample/nashorn/sort_by_java8.js similarity index 100% rename from nashorn/samples/sort_by_java8.js rename to src/sample/nashorn/sort_by_java8.js diff --git a/nashorn/samples/stack.js b/src/sample/nashorn/stack.js similarity index 100% rename from nashorn/samples/stack.js rename to src/sample/nashorn/stack.js diff --git a/nashorn/samples/test.js b/src/sample/nashorn/test.js similarity index 100% rename from nashorn/samples/test.js rename to src/sample/nashorn/test.js diff --git a/nashorn/samples/this_for_eval.js b/src/sample/nashorn/this_for_eval.js similarity index 100% rename from nashorn/samples/this_for_eval.js rename to src/sample/nashorn/this_for_eval.js diff --git a/nashorn/samples/time_color.js b/src/sample/nashorn/time_color.js similarity index 100% rename from nashorn/samples/time_color.js rename to src/sample/nashorn/time_color.js diff --git a/nashorn/samples/try_with_resource.js b/src/sample/nashorn/try_with_resource.js similarity index 100% rename from nashorn/samples/try_with_resource.js rename to src/sample/nashorn/try_with_resource.js diff --git a/nashorn/samples/undefined_call.js b/src/sample/nashorn/undefined_call.js similarity index 100% rename from nashorn/samples/undefined_call.js rename to src/sample/nashorn/undefined_call.js diff --git a/nashorn/samples/uniform_random.js b/src/sample/nashorn/uniform_random.js similarity index 100% rename from nashorn/samples/uniform_random.js rename to src/sample/nashorn/uniform_random.js diff --git a/nashorn/samples/uniq.js b/src/sample/nashorn/uniq.js similarity index 100% rename from nashorn/samples/uniq.js rename to src/sample/nashorn/uniq.js diff --git a/nashorn/samples/uniqs.js b/src/sample/nashorn/uniqs.js similarity index 100% rename from nashorn/samples/uniqs.js rename to src/sample/nashorn/uniqs.js diff --git a/nashorn/samples/unzip.js b/src/sample/nashorn/unzip.js similarity index 100% rename from nashorn/samples/unzip.js rename to src/sample/nashorn/unzip.js diff --git a/nashorn/samples/weather.js b/src/sample/nashorn/weather.js similarity index 100% rename from nashorn/samples/weather.js rename to src/sample/nashorn/weather.js diff --git a/nashorn/samples/withcheck.js b/src/sample/nashorn/withcheck.js similarity index 100% rename from nashorn/samples/withcheck.js rename to src/sample/nashorn/withcheck.js diff --git a/nashorn/samples/word_histogram.js b/src/sample/nashorn/word_histogram.js similarity index 100% rename from nashorn/samples/word_histogram.js rename to src/sample/nashorn/word_histogram.js diff --git a/nashorn/samples/xmlviewer.js b/src/sample/nashorn/xmlviewer.js similarity index 100% rename from nashorn/samples/xmlviewer.js rename to src/sample/nashorn/xmlviewer.js diff --git a/nashorn/samples/zipfs.js b/src/sample/nashorn/zipfs.js similarity index 100% rename from nashorn/samples/zipfs.js rename to src/sample/nashorn/zipfs.js diff --git a/nashorn/samples/ziplist.js b/src/sample/nashorn/ziplist.js similarity index 100% rename from nashorn/samples/ziplist.js rename to src/sample/nashorn/ziplist.js diff --git a/jdk/src/sample/share/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg b/src/sample/share/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg similarity index 100% rename from jdk/src/sample/share/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg rename to src/sample/share/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg diff --git a/jdk/src/sample/share/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg b/src/sample/share/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg similarity index 100% rename from jdk/src/sample/share/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg rename to src/sample/share/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg diff --git a/jdk/src/sample/share/jmx/jmx-scandir/docfiles/connect-local.jpg b/src/sample/share/jmx/jmx-scandir/docfiles/connect-local.jpg similarity index 100% rename from jdk/src/sample/share/jmx/jmx-scandir/docfiles/connect-local.jpg rename to src/sample/share/jmx/jmx-scandir/docfiles/connect-local.jpg diff --git a/jdk/src/sample/share/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg b/src/sample/share/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg similarity index 100% rename from jdk/src/sample/share/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg rename to src/sample/share/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg diff --git a/jdk/src/sample/share/jmx/jmx-scandir/docfiles/remote-connection.jpg b/src/sample/share/jmx/jmx-scandir/docfiles/remote-connection.jpg similarity index 100% rename from jdk/src/sample/share/jmx/jmx-scandir/docfiles/remote-connection.jpg rename to src/sample/share/jmx/jmx-scandir/docfiles/remote-connection.jpg diff --git a/jdk/src/sample/share/jmx/jmx-scandir/docfiles/scandir-config.jpg b/src/sample/share/jmx/jmx-scandir/docfiles/scandir-config.jpg similarity index 100% rename from jdk/src/sample/share/jmx/jmx-scandir/docfiles/scandir-config.jpg rename to src/sample/share/jmx/jmx-scandir/docfiles/scandir-config.jpg diff --git a/jdk/src/sample/share/jmx/jmx-scandir/docfiles/scandir-result.jpg b/src/sample/share/jmx/jmx-scandir/docfiles/scandir-result.jpg similarity index 100% rename from jdk/src/sample/share/jmx/jmx-scandir/docfiles/scandir-result.jpg rename to src/sample/share/jmx/jmx-scandir/docfiles/scandir-result.jpg diff --git a/jdk/src/sample/share/jmx/jmx-scandir/docfiles/scandir-start.jpg b/src/sample/share/jmx/jmx-scandir/docfiles/scandir-start.jpg similarity index 100% rename from jdk/src/sample/share/jmx/jmx-scandir/docfiles/scandir-start.jpg rename to src/sample/share/jmx/jmx-scandir/docfiles/scandir-start.jpg diff --git a/jdk/src/sample/share/jmx/jmx-scandir/keystore b/src/sample/share/jmx/jmx-scandir/keystore similarity index 100% rename from jdk/src/sample/share/jmx/jmx-scandir/keystore rename to src/sample/share/jmx/jmx-scandir/keystore diff --git a/jdk/src/sample/share/jmx/jmx-scandir/truststore b/src/sample/share/jmx/jmx-scandir/truststore similarity index 100% rename from jdk/src/sample/share/jmx/jmx-scandir/truststore rename to src/sample/share/jmx/jmx-scandir/truststore diff --git a/jdk/src/solaris/doc/sun/man/man1/DO_NOT_EDIT--GENERATED_FILES b/src/solaris/doc/sun/man/man1/DO_NOT_EDIT--GENERATED_FILES similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/DO_NOT_EDIT--GENERATED_FILES rename to src/solaris/doc/sun/man/man1/DO_NOT_EDIT--GENERATED_FILES diff --git a/jdk/src/solaris/doc/sun/man/man1/appletviewer.1 b/src/solaris/doc/sun/man/man1/appletviewer.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/appletviewer.1 rename to src/solaris/doc/sun/man/man1/appletviewer.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/idlj.1 b/src/solaris/doc/sun/man/man1/idlj.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/idlj.1 rename to src/solaris/doc/sun/man/man1/idlj.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/appletviewer.1 b/src/solaris/doc/sun/man/man1/ja/appletviewer.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/appletviewer.1 rename to src/solaris/doc/sun/man/man1/ja/appletviewer.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/idlj.1 b/src/solaris/doc/sun/man/man1/ja/idlj.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/idlj.1 rename to src/solaris/doc/sun/man/man1/ja/idlj.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jar.1 b/src/solaris/doc/sun/man/man1/ja/jar.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jar.1 rename to src/solaris/doc/sun/man/man1/ja/jar.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 b/src/solaris/doc/sun/man/man1/ja/jarsigner.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 rename to src/solaris/doc/sun/man/man1/ja/jarsigner.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/java.1 b/src/solaris/doc/sun/man/man1/ja/java.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/java.1 rename to src/solaris/doc/sun/man/man1/ja/java.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/javac.1 b/src/solaris/doc/sun/man/man1/ja/javac.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/javac.1 rename to src/solaris/doc/sun/man/man1/ja/javac.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1 b/src/solaris/doc/sun/man/man1/ja/javadoc.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1 rename to src/solaris/doc/sun/man/man1/ja/javadoc.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/javah.1 b/src/solaris/doc/sun/man/man1/ja/javah.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/javah.1 rename to src/solaris/doc/sun/man/man1/ja/javah.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/javap.1 b/src/solaris/doc/sun/man/man1/ja/javap.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/javap.1 rename to src/solaris/doc/sun/man/man1/ja/javap.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jcmd.1 b/src/solaris/doc/sun/man/man1/ja/jcmd.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jcmd.1 rename to src/solaris/doc/sun/man/man1/ja/jcmd.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jconsole.1 b/src/solaris/doc/sun/man/man1/ja/jconsole.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jconsole.1 rename to src/solaris/doc/sun/man/man1/ja/jconsole.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jdb.1 b/src/solaris/doc/sun/man/man1/ja/jdb.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jdb.1 rename to src/solaris/doc/sun/man/man1/ja/jdb.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jdeps.1 b/src/solaris/doc/sun/man/man1/ja/jdeps.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jdeps.1 rename to src/solaris/doc/sun/man/man1/ja/jdeps.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jhat.1 b/src/solaris/doc/sun/man/man1/ja/jhat.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jhat.1 rename to src/solaris/doc/sun/man/man1/ja/jhat.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1 b/src/solaris/doc/sun/man/man1/ja/jinfo.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1 rename to src/solaris/doc/sun/man/man1/ja/jinfo.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jjs.1 b/src/solaris/doc/sun/man/man1/ja/jjs.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jjs.1 rename to src/solaris/doc/sun/man/man1/ja/jjs.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jmap.1 b/src/solaris/doc/sun/man/man1/ja/jmap.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jmap.1 rename to src/solaris/doc/sun/man/man1/ja/jmap.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jps.1 b/src/solaris/doc/sun/man/man1/ja/jps.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jps.1 rename to src/solaris/doc/sun/man/man1/ja/jps.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jrunscript.1 b/src/solaris/doc/sun/man/man1/ja/jrunscript.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jrunscript.1 rename to src/solaris/doc/sun/man/man1/ja/jrunscript.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jsadebugd.1 b/src/solaris/doc/sun/man/man1/ja/jsadebugd.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jsadebugd.1 rename to src/solaris/doc/sun/man/man1/ja/jsadebugd.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jstack.1 b/src/solaris/doc/sun/man/man1/ja/jstack.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jstack.1 rename to src/solaris/doc/sun/man/man1/ja/jstack.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jstat.1 b/src/solaris/doc/sun/man/man1/ja/jstat.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jstat.1 rename to src/solaris/doc/sun/man/man1/ja/jstat.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1 b/src/solaris/doc/sun/man/man1/ja/jstatd.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1 rename to src/solaris/doc/sun/man/man1/ja/jstatd.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/keytool.1 b/src/solaris/doc/sun/man/man1/ja/keytool.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/keytool.1 rename to src/solaris/doc/sun/man/man1/ja/keytool.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/orbd.1 b/src/solaris/doc/sun/man/man1/ja/orbd.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/orbd.1 rename to src/solaris/doc/sun/man/man1/ja/orbd.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/pack200.1 b/src/solaris/doc/sun/man/man1/ja/pack200.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/pack200.1 rename to src/solaris/doc/sun/man/man1/ja/pack200.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/policytool.1 b/src/solaris/doc/sun/man/man1/ja/policytool.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/policytool.1 rename to src/solaris/doc/sun/man/man1/ja/policytool.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/rmic.1 b/src/solaris/doc/sun/man/man1/ja/rmic.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/rmic.1 rename to src/solaris/doc/sun/man/man1/ja/rmic.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/rmid.1 b/src/solaris/doc/sun/man/man1/ja/rmid.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/rmid.1 rename to src/solaris/doc/sun/man/man1/ja/rmid.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/rmiregistry.1 b/src/solaris/doc/sun/man/man1/ja/rmiregistry.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/rmiregistry.1 rename to src/solaris/doc/sun/man/man1/ja/rmiregistry.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/schemagen.1 b/src/solaris/doc/sun/man/man1/ja/schemagen.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/schemagen.1 rename to src/solaris/doc/sun/man/man1/ja/schemagen.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/serialver.1 b/src/solaris/doc/sun/man/man1/ja/serialver.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/serialver.1 rename to src/solaris/doc/sun/man/man1/ja/serialver.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/servertool.1 b/src/solaris/doc/sun/man/man1/ja/servertool.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/servertool.1 rename to src/solaris/doc/sun/man/man1/ja/servertool.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/tnameserv.1 b/src/solaris/doc/sun/man/man1/ja/tnameserv.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/tnameserv.1 rename to src/solaris/doc/sun/man/man1/ja/tnameserv.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/unpack200.1 b/src/solaris/doc/sun/man/man1/ja/unpack200.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/unpack200.1 rename to src/solaris/doc/sun/man/man1/ja/unpack200.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1 b/src/solaris/doc/sun/man/man1/ja/wsgen.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1 rename to src/solaris/doc/sun/man/man1/ja/wsgen.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/wsimport.1 b/src/solaris/doc/sun/man/man1/ja/wsimport.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/wsimport.1 rename to src/solaris/doc/sun/man/man1/ja/wsimport.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/xjc.1 b/src/solaris/doc/sun/man/man1/ja/xjc.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/ja/xjc.1 rename to src/solaris/doc/sun/man/man1/ja/xjc.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jar.1 b/src/solaris/doc/sun/man/man1/jar.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jar.1 rename to src/solaris/doc/sun/man/man1/jar.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jarsigner.1 b/src/solaris/doc/sun/man/man1/jarsigner.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jarsigner.1 rename to src/solaris/doc/sun/man/man1/jarsigner.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/java.1 b/src/solaris/doc/sun/man/man1/java.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/java.1 rename to src/solaris/doc/sun/man/man1/java.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/javac.1 b/src/solaris/doc/sun/man/man1/javac.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/javac.1 rename to src/solaris/doc/sun/man/man1/javac.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/javadoc.1 b/src/solaris/doc/sun/man/man1/javadoc.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/javadoc.1 rename to src/solaris/doc/sun/man/man1/javadoc.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/javah.1 b/src/solaris/doc/sun/man/man1/javah.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/javah.1 rename to src/solaris/doc/sun/man/man1/javah.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/javap.1 b/src/solaris/doc/sun/man/man1/javap.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/javap.1 rename to src/solaris/doc/sun/man/man1/javap.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jcmd.1 b/src/solaris/doc/sun/man/man1/jcmd.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jcmd.1 rename to src/solaris/doc/sun/man/man1/jcmd.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jconsole.1 b/src/solaris/doc/sun/man/man1/jconsole.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jconsole.1 rename to src/solaris/doc/sun/man/man1/jconsole.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jdb.1 b/src/solaris/doc/sun/man/man1/jdb.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jdb.1 rename to src/solaris/doc/sun/man/man1/jdb.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jdeps.1 b/src/solaris/doc/sun/man/man1/jdeps.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jdeps.1 rename to src/solaris/doc/sun/man/man1/jdeps.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jhat.1 b/src/solaris/doc/sun/man/man1/jhat.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jhat.1 rename to src/solaris/doc/sun/man/man1/jhat.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jinfo.1 b/src/solaris/doc/sun/man/man1/jinfo.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jinfo.1 rename to src/solaris/doc/sun/man/man1/jinfo.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jjs.1 b/src/solaris/doc/sun/man/man1/jjs.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jjs.1 rename to src/solaris/doc/sun/man/man1/jjs.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jmap.1 b/src/solaris/doc/sun/man/man1/jmap.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jmap.1 rename to src/solaris/doc/sun/man/man1/jmap.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jps.1 b/src/solaris/doc/sun/man/man1/jps.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jps.1 rename to src/solaris/doc/sun/man/man1/jps.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jrunscript.1 b/src/solaris/doc/sun/man/man1/jrunscript.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jrunscript.1 rename to src/solaris/doc/sun/man/man1/jrunscript.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 b/src/solaris/doc/sun/man/man1/jsadebugd.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 rename to src/solaris/doc/sun/man/man1/jsadebugd.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jstack.1 b/src/solaris/doc/sun/man/man1/jstack.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jstack.1 rename to src/solaris/doc/sun/man/man1/jstack.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jstat.1 b/src/solaris/doc/sun/man/man1/jstat.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jstat.1 rename to src/solaris/doc/sun/man/man1/jstat.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/jstatd.1 b/src/solaris/doc/sun/man/man1/jstatd.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/jstatd.1 rename to src/solaris/doc/sun/man/man1/jstatd.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/keytool.1 b/src/solaris/doc/sun/man/man1/keytool.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/keytool.1 rename to src/solaris/doc/sun/man/man1/keytool.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/orbd.1 b/src/solaris/doc/sun/man/man1/orbd.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/orbd.1 rename to src/solaris/doc/sun/man/man1/orbd.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/pack200.1 b/src/solaris/doc/sun/man/man1/pack200.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/pack200.1 rename to src/solaris/doc/sun/man/man1/pack200.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/policytool.1 b/src/solaris/doc/sun/man/man1/policytool.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/policytool.1 rename to src/solaris/doc/sun/man/man1/policytool.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/rmic.1 b/src/solaris/doc/sun/man/man1/rmic.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/rmic.1 rename to src/solaris/doc/sun/man/man1/rmic.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/rmid.1 b/src/solaris/doc/sun/man/man1/rmid.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/rmid.1 rename to src/solaris/doc/sun/man/man1/rmid.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 b/src/solaris/doc/sun/man/man1/rmiregistry.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 rename to src/solaris/doc/sun/man/man1/rmiregistry.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/schemagen.1 b/src/solaris/doc/sun/man/man1/schemagen.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/schemagen.1 rename to src/solaris/doc/sun/man/man1/schemagen.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/serialver.1 b/src/solaris/doc/sun/man/man1/serialver.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/serialver.1 rename to src/solaris/doc/sun/man/man1/serialver.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/servertool.1 b/src/solaris/doc/sun/man/man1/servertool.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/servertool.1 rename to src/solaris/doc/sun/man/man1/servertool.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/tnameserv.1 b/src/solaris/doc/sun/man/man1/tnameserv.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/tnameserv.1 rename to src/solaris/doc/sun/man/man1/tnameserv.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/unpack200.1 b/src/solaris/doc/sun/man/man1/unpack200.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/unpack200.1 rename to src/solaris/doc/sun/man/man1/unpack200.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/wsgen.1 b/src/solaris/doc/sun/man/man1/wsgen.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/wsgen.1 rename to src/solaris/doc/sun/man/man1/wsgen.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/wsimport.1 b/src/solaris/doc/sun/man/man1/wsimport.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/wsimport.1 rename to src/solaris/doc/sun/man/man1/wsimport.1 diff --git a/jdk/src/solaris/doc/sun/man/man1/xjc.1 b/src/solaris/doc/sun/man/man1/xjc.1 similarity index 100% rename from jdk/src/solaris/doc/sun/man/man1/xjc.1 rename to src/solaris/doc/sun/man/man1/xjc.1 diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/build.xml b/src/utils/IdealGraphVisualizer/BatikSVGProxy/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/build.xml rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/manifest.mf b/src/utils/IdealGraphVisualizer/BatikSVGProxy/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/manifest.mf rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.properties b/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.xml b/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java b/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/Bundle.properties b/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/Bundle.properties rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/layer.xml b/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/layer.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/layer.xml rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/layer.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/package-info.java b/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/package-info.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/package-info.java rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/package-info.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/build.xml b/src/utils/IdealGraphVisualizer/Bytecodes/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/build.xml rename to src/utils/IdealGraphVisualizer/Bytecodes/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/manifest.mf b/src/utils/IdealGraphVisualizer/Bytecodes/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/manifest.mf rename to src/utils/IdealGraphVisualizer/Bytecodes/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/Bytecodes/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/Bytecodes/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/Bytecodes/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/Bytecodes/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/Bytecodes/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/Bytecodes/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/Bundle.properties b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/Bundle.properties rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentSettings.xml b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentSettings.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentSettings.xml rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentSettings.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentWstcref.xml b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentWstcref.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentWstcref.xml rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentWstcref.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesCookie.java b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesCookie.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesCookie.java rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesCookie.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/bytecode.png b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/bytecode.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/bytecode.png rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/bytecode.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/link.png b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/link.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/link.png rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/link.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/method.png b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/method.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/method.png rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/method.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/layer.xml b/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/layer.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/layer.xml rename to src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/layer.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/build.xml b/src/utils/IdealGraphVisualizer/ControlFlow/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/build.xml rename to src/utils/IdealGraphVisualizer/ControlFlow/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/manifest.mf b/src/utils/IdealGraphVisualizer/ControlFlow/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/manifest.mf rename to src/utils/IdealGraphVisualizer/ControlFlow/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/ControlFlow/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/project.properties b/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/ControlFlow/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/project.xml b/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/ControlFlow/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/ControlFlow/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/Bundle.properties b/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/Bundle.properties rename to src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowAction.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowAction.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form b/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form rename to src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml b/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml rename to src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml b/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml rename to src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/layer.xml b/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/layer.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/layer.xml rename to src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/layer.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/build.xml b/src/utils/IdealGraphVisualizer/Coordinator/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/build.xml rename to src/utils/IdealGraphVisualizer/Coordinator/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/manifest.mf b/src/utils/IdealGraphVisualizer/Coordinator/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/manifest.mf rename to src/utils/IdealGraphVisualizer/Coordinator/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Coordinator/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/Coordinator/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Coordinator/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/Coordinator/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Coordinator/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/Coordinator/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Coordinator/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/Coordinator/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Coordinator/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/Coordinator/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Coordinator/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/Coordinator/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.form b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.form similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.form rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.form diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentSettings.xml b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentSettings.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentSettings.xml rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentSettings.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardConfiguration.xml b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardConfiguration.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardConfiguration.xml rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardConfiguration.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/CloneGraphAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/CloneGraphAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/CloneGraphAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/CloneGraphAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphCloneCookie.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphCloneCookie.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphCloneCookie.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphCloneCookie.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphOpenCookie.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphOpenCookie.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphOpenCookie.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphOpenCookie.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphRemoveCookie.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphRemoveCookie.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphRemoveCookie.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphRemoveCookie.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveCookie.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveCookie.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveCookie.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveCookie.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/diff.png b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/diff.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/diff.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/diff.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/folder.png b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/folder.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/folder.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/folder.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/graph.png b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/graph.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/graph.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/graph.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/import.png b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/import.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/import.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/import.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/remove.png b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/remove.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/remove.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/remove.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/removeall.png b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/removeall.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/removeall.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/removeall.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/save.png b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/save.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/save.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/save.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/saveall.gif b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/saveall.gif similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/saveall.gif rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/saveall.gif diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structure.png b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structure.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structure.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structure.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structured.gif b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structured.gif similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structured.gif rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structured.gif diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml b/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml rename to src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/build.xml b/src/utils/IdealGraphVisualizer/Data/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/build.xml rename to src/utils/IdealGraphVisualizer/Data/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/manifest.mf b/src/utils/IdealGraphVisualizer/Data/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/manifest.mf rename to src/utils/IdealGraphVisualizer/Data/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Data/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/Data/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Data/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/Data/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Data/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/Data/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Data/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/Data/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Data/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/Data/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Data/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/Data/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Bundle.properties b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Bundle.properties rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEventProvider.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEventProvider.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEventProvider.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEventProvider.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedListener.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedListener.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedListener.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedListener.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ControllableChangedListener.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ControllableChangedListener.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ControllableChangedListener.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ControllableChangedListener.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Folder.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Folder.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Folder.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Folder.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/FolderElement.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/FolderElement.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/FolderElement.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/FolderElement.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/GraphDocument.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/GraphDocument.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/GraphDocument.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/GraphDocument.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlockEdge.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlockEdge.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlockEdge.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlockEdge.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBytecode.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBytecode.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBytecode.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBytecode.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputMethod.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputMethod.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputMethod.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputMethod.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputNode.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputNode.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputNode.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputNode.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Pair.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Pair.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Pair.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Pair.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Property.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Property.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Property.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Property.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Source.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Source.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Source.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Source.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/BinaryParser.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/BinaryParser.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/BinaryParser.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/BinaryParser.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/GraphParser.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/GraphParser.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/GraphParser.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/GraphParser.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/ParseMonitor.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/ParseMonitor.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/ParseMonitor.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/ParseMonitor.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/graphdocument.xsd b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/graphdocument.xsd similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/graphdocument.xsd rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/graphdocument.xsd diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GraphViewer.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GraphViewer.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GraphViewer.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GraphViewer.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupCallback.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupCallback.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupCallback.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupCallback.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/InputGraphProvider.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/InputGraphProvider.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/InputGraphProvider.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/InputGraphProvider.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/Scheduler.java b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/Scheduler.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/Scheduler.java rename to src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/Scheduler.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java b/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java rename to src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ControllableChangedListenerTest.java b/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ControllableChangedListenerTest.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ControllableChangedListenerTest.java rename to src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ControllableChangedListenerTest.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/GroupTest.java b/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/GroupTest.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/GroupTest.java rename to src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/GroupTest.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputGraphTest.java b/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputGraphTest.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputGraphTest.java rename to src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputGraphTest.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputMethodTest.java b/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputMethodTest.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputMethodTest.java rename to src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputMethodTest.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PairTest.java b/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PairTest.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PairTest.java rename to src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PairTest.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java b/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java rename to src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertyTest.java b/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertyTest.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertyTest.java rename to src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertyTest.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/SourceTest.java b/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/SourceTest.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/SourceTest.java rename to src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/SourceTest.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/Util.java b/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/Util.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/Util.java rename to src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/Util.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/serialization/ParserTest.java b/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/serialization/ParserTest.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/serialization/ParserTest.java rename to src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/serialization/ParserTest.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Difference/build.xml b/src/utils/IdealGraphVisualizer/Difference/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Difference/build.xml rename to src/utils/IdealGraphVisualizer/Difference/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Difference/manifest.mf b/src/utils/IdealGraphVisualizer/Difference/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Difference/manifest.mf rename to src/utils/IdealGraphVisualizer/Difference/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Difference/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Difference/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Difference/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/Difference/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Difference/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Difference/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Difference/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/Difference/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Difference/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Difference/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Difference/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/Difference/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Difference/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Difference/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Difference/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/Difference/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Difference/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Difference/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Difference/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/Difference/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Difference/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Difference/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Difference/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/Difference/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Bundle.properties b/src/utils/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Bundle.properties rename to src/utils/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java b/src/utils/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java rename to src/utils/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/build.xml b/src/utils/IdealGraphVisualizer/Filter/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/build.xml rename to src/utils/IdealGraphVisualizer/Filter/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/manifest.mf b/src/utils/IdealGraphVisualizer/Filter/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/manifest.mf rename to src/utils/IdealGraphVisualizer/Filter/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Filter/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/Filter/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Filter/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/Filter/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Filter/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/Filter/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Filter/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/Filter/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Filter/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/Filter/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Filter/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/Filter/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Bundle.properties b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Bundle.properties rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ColorFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ColorFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ColorFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ColorFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.form b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.form similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.form rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.form diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Filter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Filter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Filter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Filter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChainProvider.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChainProvider.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChainProvider.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChainProvider.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterSetting.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterSetting.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterSetting.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterSetting.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/GradientColorFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/GradientColorFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/GradientColorFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/GradientColorFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/helper.js b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/helper.js similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/helper.js rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/helper.js diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/layer.xml b/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/layer.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/layer.xml rename to src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/layer.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/build.xml b/src/utils/IdealGraphVisualizer/FilterWindow/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/build.xml rename to src/utils/IdealGraphVisualizer/FilterWindow/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/manifest.mf b/src/utils/IdealGraphVisualizer/FilterWindow/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/manifest.mf rename to src/utils/IdealGraphVisualizer/FilterWindow/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.properties b/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/FilterWindow/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.xml b/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/FilterWindow/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/FilterWindow/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/META-INF/services/com.sun.hotspot.igv.filter.FilterChainProvider b/src/utils/IdealGraphVisualizer/FilterWindow/src/META-INF/services/com.sun.hotspot.igv.filter.FilterChainProvider similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/META-INF/services/com.sun.hotspot.igv.filter.FilterChainProvider rename to src/utils/IdealGraphVisualizer/FilterWindow/src/META-INF/services/com.sun.hotspot.igv.filter.FilterChainProvider diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/Bundle.properties b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/Bundle.properties rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckListView.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckListView.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckListView.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckListView.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckRenderer.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckRenderer.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckRenderer.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckRenderer.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.form b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.form similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.form rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.form diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentWstcref.xml b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentWstcref.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentWstcref.xml rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentWstcref.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/add.png b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/add.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/add.png rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/add.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.png b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.png rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/down.png b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/down.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/down.png rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/down.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/minus.png b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/minus.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/minus.png rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/minus.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/plus.png b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/plus.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/plus.png rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/plus.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/up.png b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/up.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/up.png rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/up.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/layer.xml b/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/layer.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/layer.xml rename to src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/layer.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/build.xml b/src/utils/IdealGraphVisualizer/Graal/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/build.xml rename to src/utils/IdealGraphVisualizer/Graal/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/manifest.mf b/src/utils/IdealGraphVisualizer/Graal/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/manifest.mf rename to src/utils/IdealGraphVisualizer/Graal/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Graal/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/Graal/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Graal/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/Graal/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Graal/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/Graal/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Graal/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/Graal/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Graal/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/Graal/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/Bundle.properties b/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/Bundle.properties rename to src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java b/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java rename to src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java b/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java rename to src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java b/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java rename to src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/callgraph.filter b/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/callgraph.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/callgraph.filter rename to src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/callgraph.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/color.filter b/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/color.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/color.filter rename to src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/color.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/probability.filter b/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/probability.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/probability.filter rename to src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/probability.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/reduceEdges.filter b/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/reduceEdges.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/reduceEdges.filter rename to src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/reduceEdges.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/removeFloating.filter b/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/removeFloating.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/removeFloating.filter rename to src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/removeFloating.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/removeState.filter b/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/removeState.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/removeState.filter rename to src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/removeState.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/stampColor.filter b/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/stampColor.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/stampColor.filter rename to src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/stampColor.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/layer.xml b/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/layer.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/layer.xml rename to src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/layer.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/build.xml b/src/utils/IdealGraphVisualizer/Graph/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/build.xml rename to src/utils/IdealGraphVisualizer/Graph/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/manifest.mf b/src/utils/IdealGraphVisualizer/Graph/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/manifest.mf rename to src/utils/IdealGraphVisualizer/Graph/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Graph/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/Graph/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Graph/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/Graph/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Graph/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/Graph/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Graph/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/Graph/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Graph/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/Graph/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Graph/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/Graph/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Bundle.properties b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Bundle.properties rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OrSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OrSelector.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OrSelector.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OrSelector.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Selector.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Selector.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Selector.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Selector.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/services/DiagramProvider.java b/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/services/DiagramProvider.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/services/DiagramProvider.java rename to src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/services/DiagramProvider.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/build.xml b/src/utils/IdealGraphVisualizer/HierarchicalLayout/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/build.xml rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/manifest.mf b/src/utils/IdealGraphVisualizer/HierarchicalLayout/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/manifest.mf rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties b/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.xml b/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Edge.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Edge.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Edge.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Edge.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Graph.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Graph.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Graph.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Graph.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Node.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Node.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Node.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Node.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Timing.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Timing.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Timing.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Timing.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/build.xml b/src/utils/IdealGraphVisualizer/Layout/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/build.xml rename to src/utils/IdealGraphVisualizer/Layout/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/manifest.mf b/src/utils/IdealGraphVisualizer/Layout/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/manifest.mf rename to src/utils/IdealGraphVisualizer/Layout/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Layout/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/Layout/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Layout/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/Layout/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Layout/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/Layout/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Layout/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/Layout/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Layout/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/Layout/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Layout/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/Layout/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Bundle.properties b/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Bundle.properties rename to src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java b/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java rename to src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutGraph.java b/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutGraph.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutGraph.java rename to src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutGraph.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutManager.java b/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutManager.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutManager.java rename to src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutManager.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java b/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java rename to src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Port.java b/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Port.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Port.java rename to src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Port.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java b/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java rename to src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/build.xml b/src/utils/IdealGraphVisualizer/NetworkConnection/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/build.xml rename to src/utils/IdealGraphVisualizer/NetworkConnection/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/manifest.mf b/src/utils/IdealGraphVisualizer/NetworkConnection/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/manifest.mf rename to src/utils/IdealGraphVisualizer/NetworkConnection/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/project.properties b/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/project.xml b/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Bundle.properties b/src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Bundle.properties rename to src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java b/src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java rename to src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Server.java b/src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Server.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Server.java rename to src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Server.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/layer.xml b/src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/layer.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/layer.xml rename to src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/layer.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/README.md b/src/utils/IdealGraphVisualizer/README.md similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/README.md rename to src/utils/IdealGraphVisualizer/README.md diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/build.xml b/src/utils/IdealGraphVisualizer/SelectionCoordinator/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/build.xml rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/manifest.mf b/src/utils/IdealGraphVisualizer/SelectionCoordinator/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/manifest.mf rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.properties b/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.xml b/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/Bundle.properties b/src/utils/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/Bundle.properties rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/SelectionCoordinator.java b/src/utils/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/SelectionCoordinator.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/SelectionCoordinator.java rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/SelectionCoordinator.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/build.xml b/src/utils/IdealGraphVisualizer/ServerCompiler/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/build.xml rename to src/utils/IdealGraphVisualizer/ServerCompiler/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/manifest.mf b/src/utils/IdealGraphVisualizer/ServerCompiler/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/manifest.mf rename to src/utils/IdealGraphVisualizer/ServerCompiler/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/project.properties b/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/project.xml b/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler b/src/utils/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/Bundle.properties b/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/Bundle.properties rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java b/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/color.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/color.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/color.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/color.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/difference.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/difference.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/difference.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/difference.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/matchingFlags.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/matchingFlags.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/matchingFlags.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/matchingFlags.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/onlyControlFlow.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/onlyControlFlow.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/onlyControlFlow.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/onlyControlFlow.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/register.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/register.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/register.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/register.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/remove.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/remove.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/remove.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/remove.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/structural.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/structural.filter similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/structural.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/structural.filter diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/layer.xml b/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/layer.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/layer.xml rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/layer.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/build.xml b/src/utils/IdealGraphVisualizer/Settings/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/build.xml rename to src/utils/IdealGraphVisualizer/Settings/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/manifest.mf b/src/utils/IdealGraphVisualizer/Settings/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/manifest.mf rename to src/utils/IdealGraphVisualizer/Settings/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Settings/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/Settings/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Settings/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/Settings/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Settings/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/Settings/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Settings/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/Settings/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Settings/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/Settings/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Settings/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/Settings/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Bundle.properties b/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Bundle.properties rename to src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Settings.java b/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Settings.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Settings.java rename to src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Settings.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java b/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java rename to src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java b/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java rename to src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.form b/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.form similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.form rename to src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.form diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.java b/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.java rename to src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/layer.xml b/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/layer.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/layer.xml rename to src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/layer.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/settings.png b/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/settings.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/settings.png rename to src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/settings.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/build.xml b/src/utils/IdealGraphVisualizer/Util/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/build.xml rename to src/utils/IdealGraphVisualizer/Util/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/manifest.mf b/src/utils/IdealGraphVisualizer/Util/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/manifest.mf rename to src/utils/IdealGraphVisualizer/Util/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Util/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/Util/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Util/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/Util/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Util/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/Util/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Util/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/Util/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Util/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/Util/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Util/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/Util/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/BoundedZoomAction.java b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/BoundedZoomAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/BoundedZoomAction.java rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/BoundedZoomAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Bundle.properties b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Bundle.properties rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ColorIcon.java b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ColorIcon.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ColorIcon.java rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ColorIcon.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ContextAction.java b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ContextAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ContextAction.java rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ContextAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickAction.java b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickAction.java rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickHandler.java b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickHandler.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickHandler.java rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickHandler.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSelectAction.java b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSelectAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSelectAction.java rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSelectAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/PropertiesSheet.java b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/PropertiesSheet.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/PropertiesSheet.java rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/PropertiesSheet.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSlider.java b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSlider.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSlider.java rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSlider.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/StringUtils.java b/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/StringUtils.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/StringUtils.java rename to src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/StringUtils.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/build.xml b/src/utils/IdealGraphVisualizer/View/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/build.xml rename to src/utils/IdealGraphVisualizer/View/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/manifest.mf b/src/utils/IdealGraphVisualizer/View/manifest.mf similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/manifest.mf rename to src/utils/IdealGraphVisualizer/View/manifest.mf diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/View/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/View/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/View/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/View/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/View/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/View/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/nbproject/project.properties b/src/utils/IdealGraphVisualizer/View/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/View/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/nbproject/project.xml b/src/utils/IdealGraphVisualizer/View/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/View/nbproject/project.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/View/nbproject/suite.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/nbproject/suite.properties rename to src/utils/IdealGraphVisualizer/View/nbproject/suite.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer b/src/utils/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer rename to src/utils/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/BoundedZoomAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/BoundedZoomAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/BoundedZoomAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/BoundedZoomAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewer.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewer.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewer.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewer.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.form b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.form similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.form rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.form diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExportCookie.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExportCookie.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExportCookie.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExportCookie.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/Bundle.properties b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/Bundle.properties rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideDuplicatesAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideDuplicatesAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideDuplicatesAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideDuplicatesAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/MouseOverAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/MouseOverAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/MouseOverAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/MouseOverAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PanModeAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PanModeAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PanModeAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PanModeAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/SelectionModeAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/SelectionModeAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/SelectionModeAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/SelectionModeAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ShowAllAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ShowAllAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ShowAllAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ShowAllAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomInAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomInAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomInAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomInAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/blocks.gif b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/blocks.gif similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/blocks.gif rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/blocks.gif diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/expand.gif b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/expand.gif similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/expand.gif rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/expand.gif diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/export.png b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/export.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/export.png rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/export.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/extract.gif b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/extract.gif similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/extract.gif rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/extract.gif diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hide.gif b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hide.gif similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hide.gif rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hide.gif diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hideDuplicates.png b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hideDuplicates.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hideDuplicates.png rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hideDuplicates.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/next_diagram.png b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/next_diagram.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/next_diagram.png rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/next_diagram.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/overview.png b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/overview.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/overview.png rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/overview.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/pan_mode.png b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/pan_mode.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/pan_mode.png rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/pan_mode.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/predsucc.gif b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/predsucc.gif similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/predsucc.gif rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/predsucc.gif diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/prev_diagram.png b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/prev_diagram.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/prev_diagram.png rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/prev_diagram.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/selection_mode.png b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/selection_mode.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/selection_mode.png rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/selection_mode.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoom_in.png b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoom_in.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoom_in.png rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoom_in.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoom_out.png b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoom_out.png similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoom_out.png rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoom_out.png diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/propertiesWsmode.xml b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/propertiesWsmode.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/propertiesWsmode.xml rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/propertiesWsmode.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/propertiesWstcref.xml b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/propertiesWstcref.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/propertiesWstcref.xml rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/propertiesWstcref.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/BlockWidget.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/BlockWidget.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/BlockWidget.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/BlockWidget.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java b/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java rename to src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/branding.jnlp b/src/utils/IdealGraphVisualizer/branding.jnlp similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/branding.jnlp rename to src/utils/IdealGraphVisualizer/branding.jnlp diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties rename to src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame.gif b/src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame.gif similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame.gif rename to src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame.gif diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame32.gif b/src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame32.gif similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame32.gif rename to src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame32.gif diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame48.gif b/src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame48.gif similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame48.gif rename to src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame48.gif diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/splash.gif b/src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/splash.gif similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/splash.gif rename to src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/splash.gif diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/src/utils/IdealGraphVisualizer/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties rename to src/utils/IdealGraphVisualizer/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/build.xml b/src/utils/IdealGraphVisualizer/build.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/build.xml rename to src/utils/IdealGraphVisualizer/build.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/igv.sh b/src/utils/IdealGraphVisualizer/igv.sh similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/igv.sh rename to src/utils/IdealGraphVisualizer/igv.sh diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/master.jnlp b/src/utils/IdealGraphVisualizer/master.jnlp similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/master.jnlp rename to src/utils/IdealGraphVisualizer/master.jnlp diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/nbproject/build-impl.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml rename to src/utils/IdealGraphVisualizer/nbproject/build-impl.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/nbproject/genfiles.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties rename to src/utils/IdealGraphVisualizer/nbproject/genfiles.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/nbproject/platform.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/nbproject/platform.properties rename to src/utils/IdealGraphVisualizer/nbproject/platform.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/nbproject/platform.xml b/src/utils/IdealGraphVisualizer/nbproject/platform.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/nbproject/platform.xml rename to src/utils/IdealGraphVisualizer/nbproject/platform.xml diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/nbproject/project.properties b/src/utils/IdealGraphVisualizer/nbproject/project.properties similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/nbproject/project.properties rename to src/utils/IdealGraphVisualizer/nbproject/project.properties diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/nbproject/project.xml b/src/utils/IdealGraphVisualizer/nbproject/project.xml similarity index 100% rename from hotspot/src/share/tools/IdealGraphVisualizer/nbproject/project.xml rename to src/utils/IdealGraphVisualizer/nbproject/project.xml diff --git a/hotspot/src/share/tools/LogCompilation/Makefile b/src/utils/LogCompilation/Makefile similarity index 100% rename from hotspot/src/share/tools/LogCompilation/Makefile rename to src/utils/LogCompilation/Makefile diff --git a/hotspot/src/share/tools/LogCompilation/README b/src/utils/LogCompilation/README similarity index 100% rename from hotspot/src/share/tools/LogCompilation/README rename to src/utils/LogCompilation/README diff --git a/hotspot/src/share/tools/LogCompilation/manifest.mf b/src/utils/LogCompilation/manifest.mf similarity index 100% rename from hotspot/src/share/tools/LogCompilation/manifest.mf rename to src/utils/LogCompilation/manifest.mf diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Constants.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Constants.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Constants.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Constants.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrap.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrap.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrap.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrap.java diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java b/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java similarity index 100% rename from hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java rename to src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java diff --git a/hotspot/src/share/tools/hsdis/Makefile b/src/utils/hsdis/Makefile similarity index 100% rename from hotspot/src/share/tools/hsdis/Makefile rename to src/utils/hsdis/Makefile diff --git a/hotspot/src/share/tools/hsdis/README b/src/utils/hsdis/README similarity index 100% rename from hotspot/src/share/tools/hsdis/README rename to src/utils/hsdis/README diff --git a/hotspot/src/share/tools/hsdis/hsdis-demo.c b/src/utils/hsdis/hsdis-demo.c similarity index 100% rename from hotspot/src/share/tools/hsdis/hsdis-demo.c rename to src/utils/hsdis/hsdis-demo.c diff --git a/hotspot/src/share/tools/hsdis/hsdis.c b/src/utils/hsdis/hsdis.c similarity index 100% rename from hotspot/src/share/tools/hsdis/hsdis.c rename to src/utils/hsdis/hsdis.c diff --git a/hotspot/src/share/tools/hsdis/hsdis.h b/src/utils/hsdis/hsdis.h similarity index 100% rename from hotspot/src/share/tools/hsdis/hsdis.h rename to src/utils/hsdis/hsdis.h diff --git a/jdk/make/non-build-utils/reorder/Makefile b/src/utils/reorder/Makefile similarity index 100% rename from jdk/make/non-build-utils/reorder/Makefile rename to src/utils/reorder/Makefile diff --git a/jdk/make/non-build-utils/reorder/tests/Exit.java b/src/utils/reorder/tests/Exit.java similarity index 100% rename from jdk/make/non-build-utils/reorder/tests/Exit.java rename to src/utils/reorder/tests/Exit.java diff --git a/jdk/make/non-build-utils/reorder/tests/Hello.java b/src/utils/reorder/tests/Hello.java similarity index 100% rename from jdk/make/non-build-utils/reorder/tests/Hello.java rename to src/utils/reorder/tests/Hello.java diff --git a/jdk/make/non-build-utils/reorder/tests/IntToString.java b/src/utils/reorder/tests/IntToString.java similarity index 100% rename from jdk/make/non-build-utils/reorder/tests/IntToString.java rename to src/utils/reorder/tests/IntToString.java diff --git a/jdk/make/non-build-utils/reorder/tests/JHello.java b/src/utils/reorder/tests/JHello.java similarity index 100% rename from jdk/make/non-build-utils/reorder/tests/JHello.java rename to src/utils/reorder/tests/JHello.java diff --git a/jdk/make/non-build-utils/reorder/tests/LoadFrame.java b/src/utils/reorder/tests/LoadFrame.java similarity index 100% rename from jdk/make/non-build-utils/reorder/tests/LoadFrame.java rename to src/utils/reorder/tests/LoadFrame.java diff --git a/jdk/make/non-build-utils/reorder/tests/LoadJFrame.java b/src/utils/reorder/tests/LoadJFrame.java similarity index 100% rename from jdk/make/non-build-utils/reorder/tests/LoadJFrame.java rename to src/utils/reorder/tests/LoadJFrame.java diff --git a/jdk/make/non-build-utils/reorder/tests/LoadToolkit.java b/src/utils/reorder/tests/LoadToolkit.java similarity index 100% rename from jdk/make/non-build-utils/reorder/tests/LoadToolkit.java rename to src/utils/reorder/tests/LoadToolkit.java diff --git a/jdk/make/non-build-utils/reorder/tests/Null.java b/src/utils/reorder/tests/Null.java similarity index 100% rename from jdk/make/non-build-utils/reorder/tests/Null.java rename to src/utils/reorder/tests/Null.java diff --git a/jdk/make/non-build-utils/reorder/tests/Sleep.java b/src/utils/reorder/tests/Sleep.java similarity index 100% rename from jdk/make/non-build-utils/reorder/tests/Sleep.java rename to src/utils/reorder/tests/Sleep.java diff --git a/jdk/make/non-build-utils/reorder/tools/Combine.java b/src/utils/reorder/tools/Combine.java similarity index 100% rename from jdk/make/non-build-utils/reorder/tools/Combine.java rename to src/utils/reorder/tools/Combine.java diff --git a/jdk/make/non-build-utils/reorder/tools/MaxTime.java b/src/utils/reorder/tools/MaxTime.java similarity index 100% rename from jdk/make/non-build-utils/reorder/tools/MaxTime.java rename to src/utils/reorder/tools/MaxTime.java diff --git a/jdk/make/non-build-utils/reorder/tools/mcount.c b/src/utils/reorder/tools/mcount.c similarity index 100% rename from jdk/make/non-build-utils/reorder/tools/mcount.c rename to src/utils/reorder/tools/mcount.c diff --git a/jdk/make/non-build-utils/reorder/tools/remove_mcount.c b/src/utils/reorder/tools/remove_mcount.c similarity index 100% rename from jdk/make/non-build-utils/reorder/tools/remove_mcount.c rename to src/utils/reorder/tools/remove_mcount.c diff --git a/jdk/make/non-build-utils/reorder/tools/util-i586.il b/src/utils/reorder/tools/util-i586.il similarity index 100% rename from jdk/make/non-build-utils/reorder/tools/util-i586.il rename to src/utils/reorder/tools/util-i586.il diff --git a/jdk/make/non-build-utils/reorder/tools/util-sparc.il b/src/utils/reorder/tools/util-sparc.il similarity index 100% rename from jdk/make/non-build-utils/reorder/tools/util-sparc.il rename to src/utils/reorder/tools/util-sparc.il diff --git a/jdk/make/non-build-utils/reorder/tools/util-sparcv9.il b/src/utils/reorder/tools/util-sparcv9.il similarity index 100% rename from jdk/make/non-build-utils/reorder/tools/util-sparcv9.il rename to src/utils/reorder/tools/util-sparcv9.il diff --git a/jdk/make/non-build-utils/src/build/tools/commentchecker/CommentChecker.java b/src/utils/src/build/tools/commentchecker/CommentChecker.java similarity index 100% rename from jdk/make/non-build-utils/src/build/tools/commentchecker/CommentChecker.java rename to src/utils/src/build/tools/commentchecker/CommentChecker.java diff --git a/jdk/make/non-build-utils/src/build/tools/dirdiff/DirDiff.java b/src/utils/src/build/tools/dirdiff/DirDiff.java similarity index 100% rename from jdk/make/non-build-utils/src/build/tools/dirdiff/DirDiff.java rename to src/utils/src/build/tools/dirdiff/DirDiff.java diff --git a/hotspot/test/native/classfile/test_AltHashing.cpp b/test/hotspot/gtest/classfile/test_AltHashing.cpp similarity index 100% rename from hotspot/test/native/classfile/test_AltHashing.cpp rename to test/hotspot/gtest/classfile/test_AltHashing.cpp diff --git a/hotspot/test/native/classfile/test_symbolTable.cpp b/test/hotspot/gtest/classfile/test_symbolTable.cpp similarity index 100% rename from hotspot/test/native/classfile/test_symbolTable.cpp rename to test/hotspot/gtest/classfile/test_symbolTable.cpp diff --git a/hotspot/test/native/code/test_dependencyContext.cpp b/test/hotspot/gtest/code/test_dependencyContext.cpp similarity index 100% rename from hotspot/test/native/code/test_dependencyContext.cpp rename to test/hotspot/gtest/code/test_dependencyContext.cpp diff --git a/hotspot/test/native/gc/g1/test_bufferingOopClosure.cpp b/test/hotspot/gtest/gc/g1/test_bufferingOopClosure.cpp similarity index 100% rename from hotspot/test/native/gc/g1/test_bufferingOopClosure.cpp rename to test/hotspot/gtest/gc/g1/test_bufferingOopClosure.cpp diff --git a/hotspot/test/native/gc/g1/test_freeRegionList.cpp b/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp similarity index 100% rename from hotspot/test/native/gc/g1/test_freeRegionList.cpp rename to test/hotspot/gtest/gc/g1/test_freeRegionList.cpp diff --git a/hotspot/test/native/gc/g1/test_g1BiasedArray.cpp b/test/hotspot/gtest/gc/g1/test_g1BiasedArray.cpp similarity index 100% rename from hotspot/test/native/gc/g1/test_g1BiasedArray.cpp rename to test/hotspot/gtest/gc/g1/test_g1BiasedArray.cpp diff --git a/hotspot/test/native/gc/g1/test_g1CodeCacheRemSet.cpp b/test/hotspot/gtest/gc/g1/test_g1CodeCacheRemSet.cpp similarity index 100% rename from hotspot/test/native/gc/g1/test_g1CodeCacheRemSet.cpp rename to test/hotspot/gtest/gc/g1/test_g1CodeCacheRemSet.cpp diff --git a/hotspot/test/native/gc/g1/test_g1IHOPControl.cpp b/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp similarity index 100% rename from hotspot/test/native/gc/g1/test_g1IHOPControl.cpp rename to test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp diff --git a/hotspot/test/native/gc/g1/test_g1Predictions.cpp b/test/hotspot/gtest/gc/g1/test_g1Predictions.cpp similarity index 100% rename from hotspot/test/native/gc/g1/test_g1Predictions.cpp rename to test/hotspot/gtest/gc/g1/test_g1Predictions.cpp diff --git a/hotspot/test/native/gc/parallel/test_psAdaptiveSizePolicy.cpp b/test/hotspot/gtest/gc/parallel/test_psAdaptiveSizePolicy.cpp similarity index 100% rename from hotspot/test/native/gc/parallel/test_psAdaptiveSizePolicy.cpp rename to test/hotspot/gtest/gc/parallel/test_psAdaptiveSizePolicy.cpp diff --git a/hotspot/test/native/gc/parallel/test_psParallelCompact.cpp b/test/hotspot/gtest/gc/parallel/test_psParallelCompact.cpp similarity index 100% rename from hotspot/test/native/gc/parallel/test_psParallelCompact.cpp rename to test/hotspot/gtest/gc/parallel/test_psParallelCompact.cpp diff --git a/hotspot/test/native/gc/shared/test_collectedHeap.cpp b/test/hotspot/gtest/gc/shared/test_collectedHeap.cpp similarity index 100% rename from hotspot/test/native/gc/shared/test_collectedHeap.cpp rename to test/hotspot/gtest/gc/shared/test_collectedHeap.cpp diff --git a/hotspot/test/native/gc/shared/test_collectorPolicy.cpp b/test/hotspot/gtest/gc/shared/test_collectorPolicy.cpp similarity index 100% rename from hotspot/test/native/gc/shared/test_collectorPolicy.cpp rename to test/hotspot/gtest/gc/shared/test_collectorPolicy.cpp diff --git a/hotspot/test/native/gc/shared/test_memset_with_concurrent_readers.cpp b/test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp similarity index 100% rename from hotspot/test/native/gc/shared/test_memset_with_concurrent_readers.cpp rename to test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp diff --git a/hotspot/test/native/gc/shared/test_workerDataArray.cpp b/test/hotspot/gtest/gc/shared/test_workerDataArray.cpp similarity index 100% rename from hotspot/test/native/gc/shared/test_workerDataArray.cpp rename to test/hotspot/gtest/gc/shared/test_workerDataArray.cpp diff --git a/hotspot/test/native/gtestLauncher.cpp b/test/hotspot/gtest/gtestLauncher.cpp similarity index 100% rename from hotspot/test/native/gtestLauncher.cpp rename to test/hotspot/gtest/gtestLauncher.cpp diff --git a/hotspot/test/native/gtestMain.cpp b/test/hotspot/gtest/gtestMain.cpp similarity index 100% rename from hotspot/test/native/gtestMain.cpp rename to test/hotspot/gtest/gtestMain.cpp diff --git a/hotspot/test/native/logging/logTestFixture.cpp b/test/hotspot/gtest/logging/logTestFixture.cpp similarity index 100% rename from hotspot/test/native/logging/logTestFixture.cpp rename to test/hotspot/gtest/logging/logTestFixture.cpp diff --git a/hotspot/test/native/logging/logTestFixture.hpp b/test/hotspot/gtest/logging/logTestFixture.hpp similarity index 100% rename from hotspot/test/native/logging/logTestFixture.hpp rename to test/hotspot/gtest/logging/logTestFixture.hpp diff --git a/hotspot/test/native/logging/logTestUtils.inline.hpp b/test/hotspot/gtest/logging/logTestUtils.inline.hpp similarity index 100% rename from hotspot/test/native/logging/logTestUtils.inline.hpp rename to test/hotspot/gtest/logging/logTestUtils.inline.hpp diff --git a/hotspot/test/native/logging/test_gcTraceTime.cpp b/test/hotspot/gtest/logging/test_gcTraceTime.cpp similarity index 100% rename from hotspot/test/native/logging/test_gcTraceTime.cpp rename to test/hotspot/gtest/logging/test_gcTraceTime.cpp diff --git a/hotspot/test/native/logging/test_log.cpp b/test/hotspot/gtest/logging/test_log.cpp similarity index 100% rename from hotspot/test/native/logging/test_log.cpp rename to test/hotspot/gtest/logging/test_log.cpp diff --git a/hotspot/test/native/logging/test_logConfiguration.cpp b/test/hotspot/gtest/logging/test_logConfiguration.cpp similarity index 100% rename from hotspot/test/native/logging/test_logConfiguration.cpp rename to test/hotspot/gtest/logging/test_logConfiguration.cpp diff --git a/hotspot/test/native/logging/test_logDecorations.cpp b/test/hotspot/gtest/logging/test_logDecorations.cpp similarity index 100% rename from hotspot/test/native/logging/test_logDecorations.cpp rename to test/hotspot/gtest/logging/test_logDecorations.cpp diff --git a/hotspot/test/native/logging/test_logDecorators.cpp b/test/hotspot/gtest/logging/test_logDecorators.cpp similarity index 100% rename from hotspot/test/native/logging/test_logDecorators.cpp rename to test/hotspot/gtest/logging/test_logDecorators.cpp diff --git a/hotspot/test/native/logging/test_logFileOutput.cpp b/test/hotspot/gtest/logging/test_logFileOutput.cpp similarity index 100% rename from hotspot/test/native/logging/test_logFileOutput.cpp rename to test/hotspot/gtest/logging/test_logFileOutput.cpp diff --git a/hotspot/test/native/logging/test_logLevel.cpp b/test/hotspot/gtest/logging/test_logLevel.cpp similarity index 100% rename from hotspot/test/native/logging/test_logLevel.cpp rename to test/hotspot/gtest/logging/test_logLevel.cpp diff --git a/hotspot/test/native/logging/test_logMessageTest.cpp b/test/hotspot/gtest/logging/test_logMessageTest.cpp similarity index 100% rename from hotspot/test/native/logging/test_logMessageTest.cpp rename to test/hotspot/gtest/logging/test_logMessageTest.cpp diff --git a/hotspot/test/native/logging/test_logOutputList.cpp b/test/hotspot/gtest/logging/test_logOutputList.cpp similarity index 100% rename from hotspot/test/native/logging/test_logOutputList.cpp rename to test/hotspot/gtest/logging/test_logOutputList.cpp diff --git a/hotspot/test/native/logging/test_logStream.cpp b/test/hotspot/gtest/logging/test_logStream.cpp similarity index 100% rename from hotspot/test/native/logging/test_logStream.cpp rename to test/hotspot/gtest/logging/test_logStream.cpp diff --git a/hotspot/test/native/logging/test_logTag.cpp b/test/hotspot/gtest/logging/test_logTag.cpp similarity index 100% rename from hotspot/test/native/logging/test_logTag.cpp rename to test/hotspot/gtest/logging/test_logTag.cpp diff --git a/hotspot/test/native/logging/test_logTagLevelExpression.cpp b/test/hotspot/gtest/logging/test_logTagLevelExpression.cpp similarity index 100% rename from hotspot/test/native/logging/test_logTagLevelExpression.cpp rename to test/hotspot/gtest/logging/test_logTagLevelExpression.cpp diff --git a/hotspot/test/native/logging/test_logTagSet.cpp b/test/hotspot/gtest/logging/test_logTagSet.cpp similarity index 100% rename from hotspot/test/native/logging/test_logTagSet.cpp rename to test/hotspot/gtest/logging/test_logTagSet.cpp diff --git a/hotspot/test/native/logging/test_logTagSetDescriptions.cpp b/test/hotspot/gtest/logging/test_logTagSetDescriptions.cpp similarity index 100% rename from hotspot/test/native/logging/test_logTagSetDescriptions.cpp rename to test/hotspot/gtest/logging/test_logTagSetDescriptions.cpp diff --git a/hotspot/test/native/memory/test_chunkManager.cpp b/test/hotspot/gtest/memory/test_chunkManager.cpp similarity index 100% rename from hotspot/test/native/memory/test_chunkManager.cpp rename to test/hotspot/gtest/memory/test_chunkManager.cpp diff --git a/hotspot/test/native/memory/test_guardedMemory.cpp b/test/hotspot/gtest/memory/test_guardedMemory.cpp similarity index 100% rename from hotspot/test/native/memory/test_guardedMemory.cpp rename to test/hotspot/gtest/memory/test_guardedMemory.cpp diff --git a/hotspot/test/native/memory/test_metachunk.cpp b/test/hotspot/gtest/memory/test_metachunk.cpp similarity index 100% rename from hotspot/test/native/memory/test_metachunk.cpp rename to test/hotspot/gtest/memory/test_metachunk.cpp diff --git a/hotspot/test/native/memory/test_spaceManager.cpp b/test/hotspot/gtest/memory/test_spaceManager.cpp similarity index 100% rename from hotspot/test/native/memory/test_spaceManager.cpp rename to test/hotspot/gtest/memory/test_spaceManager.cpp diff --git a/hotspot/test/native/metaprogramming/test_conditional.cpp b/test/hotspot/gtest/metaprogramming/test_conditional.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_conditional.cpp rename to test/hotspot/gtest/metaprogramming/test_conditional.cpp diff --git a/hotspot/test/native/metaprogramming/test_decay.cpp b/test/hotspot/gtest/metaprogramming/test_decay.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_decay.cpp rename to test/hotspot/gtest/metaprogramming/test_decay.cpp diff --git a/hotspot/test/native/metaprogramming/test_enableIf.cpp b/test/hotspot/gtest/metaprogramming/test_enableIf.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_enableIf.cpp rename to test/hotspot/gtest/metaprogramming/test_enableIf.cpp diff --git a/hotspot/test/native/metaprogramming/test_isConst.cpp b/test/hotspot/gtest/metaprogramming/test_isConst.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_isConst.cpp rename to test/hotspot/gtest/metaprogramming/test_isConst.cpp diff --git a/hotspot/test/native/metaprogramming/test_isFloatingPoint.cpp b/test/hotspot/gtest/metaprogramming/test_isFloatingPoint.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_isFloatingPoint.cpp rename to test/hotspot/gtest/metaprogramming/test_isFloatingPoint.cpp diff --git a/hotspot/test/native/metaprogramming/test_isIntegral.cpp b/test/hotspot/gtest/metaprogramming/test_isIntegral.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_isIntegral.cpp rename to test/hotspot/gtest/metaprogramming/test_isIntegral.cpp diff --git a/hotspot/test/native/metaprogramming/test_isPointer.cpp b/test/hotspot/gtest/metaprogramming/test_isPointer.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_isPointer.cpp rename to test/hotspot/gtest/metaprogramming/test_isPointer.cpp diff --git a/hotspot/test/native/metaprogramming/test_isRegisteredEnum.cpp b/test/hotspot/gtest/metaprogramming/test_isRegisteredEnum.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_isRegisteredEnum.cpp rename to test/hotspot/gtest/metaprogramming/test_isRegisteredEnum.cpp diff --git a/hotspot/test/native/metaprogramming/test_isSame.cpp b/test/hotspot/gtest/metaprogramming/test_isSame.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_isSame.cpp rename to test/hotspot/gtest/metaprogramming/test_isSame.cpp diff --git a/hotspot/test/native/metaprogramming/test_isSigned.cpp b/test/hotspot/gtest/metaprogramming/test_isSigned.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_isSigned.cpp rename to test/hotspot/gtest/metaprogramming/test_isSigned.cpp diff --git a/hotspot/test/native/metaprogramming/test_isVolatile.cpp b/test/hotspot/gtest/metaprogramming/test_isVolatile.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_isVolatile.cpp rename to test/hotspot/gtest/metaprogramming/test_isVolatile.cpp diff --git a/hotspot/test/native/metaprogramming/test_primitiveConversions.cpp b/test/hotspot/gtest/metaprogramming/test_primitiveConversions.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_primitiveConversions.cpp rename to test/hotspot/gtest/metaprogramming/test_primitiveConversions.cpp diff --git a/hotspot/test/native/metaprogramming/test_removeCV.cpp b/test/hotspot/gtest/metaprogramming/test_removeCV.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_removeCV.cpp rename to test/hotspot/gtest/metaprogramming/test_removeCV.cpp diff --git a/hotspot/test/native/metaprogramming/test_removePointer.cpp b/test/hotspot/gtest/metaprogramming/test_removePointer.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_removePointer.cpp rename to test/hotspot/gtest/metaprogramming/test_removePointer.cpp diff --git a/hotspot/test/native/metaprogramming/test_removeReference.cpp b/test/hotspot/gtest/metaprogramming/test_removeReference.cpp similarity index 100% rename from hotspot/test/native/metaprogramming/test_removeReference.cpp rename to test/hotspot/gtest/metaprogramming/test_removeReference.cpp diff --git a/hotspot/test/native/oops/test_arrayOop.cpp b/test/hotspot/gtest/oops/test_arrayOop.cpp similarity index 100% rename from hotspot/test/native/oops/test_arrayOop.cpp rename to test/hotspot/gtest/oops/test_arrayOop.cpp diff --git a/hotspot/test/native/oops/test_instanceKlass.cpp b/test/hotspot/gtest/oops/test_instanceKlass.cpp similarity index 100% rename from hotspot/test/native/oops/test_instanceKlass.cpp rename to test/hotspot/gtest/oops/test_instanceKlass.cpp diff --git a/hotspot/test/native/runtime/test_arguments.cpp b/test/hotspot/gtest/runtime/test_arguments.cpp similarity index 100% rename from hotspot/test/native/runtime/test_arguments.cpp rename to test/hotspot/gtest/runtime/test_arguments.cpp diff --git a/hotspot/test/native/runtime/test_classLoader.cpp b/test/hotspot/gtest/runtime/test_classLoader.cpp similarity index 100% rename from hotspot/test/native/runtime/test_classLoader.cpp rename to test/hotspot/gtest/runtime/test_classLoader.cpp diff --git a/hotspot/test/native/runtime/test_globals.cpp b/test/hotspot/gtest/runtime/test_globals.cpp similarity index 100% rename from hotspot/test/native/runtime/test_globals.cpp rename to test/hotspot/gtest/runtime/test_globals.cpp diff --git a/hotspot/test/native/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp similarity index 100% rename from hotspot/test/native/runtime/test_os.cpp rename to test/hotspot/gtest/runtime/test_os.cpp diff --git a/hotspot/test/native/runtime/test_semaphore.cpp b/test/hotspot/gtest/runtime/test_semaphore.cpp similarity index 100% rename from hotspot/test/native/runtime/test_semaphore.cpp rename to test/hotspot/gtest/runtime/test_semaphore.cpp diff --git a/hotspot/test/native/runtime/test_vmStructs.cpp b/test/hotspot/gtest/runtime/test_vmStructs.cpp similarity index 100% rename from hotspot/test/native/runtime/test_vmStructs.cpp rename to test/hotspot/gtest/runtime/test_vmStructs.cpp diff --git a/hotspot/test/native/unittest.hpp b/test/hotspot/gtest/unittest.hpp similarity index 100% rename from hotspot/test/native/unittest.hpp rename to test/hotspot/gtest/unittest.hpp diff --git a/hotspot/test/native/utilities/test_align.cpp b/test/hotspot/gtest/utilities/test_align.cpp similarity index 100% rename from hotspot/test/native/utilities/test_align.cpp rename to test/hotspot/gtest/utilities/test_align.cpp diff --git a/hotspot/test/native/utilities/test_bitMap.cpp b/test/hotspot/gtest/utilities/test_bitMap.cpp similarity index 100% rename from hotspot/test/native/utilities/test_bitMap.cpp rename to test/hotspot/gtest/utilities/test_bitMap.cpp diff --git a/hotspot/test/native/utilities/test_bitMap_search.cpp b/test/hotspot/gtest/utilities/test_bitMap_search.cpp similarity index 100% rename from hotspot/test/native/utilities/test_bitMap_search.cpp rename to test/hotspot/gtest/utilities/test_bitMap_search.cpp diff --git a/hotspot/test/native/utilities/test_bitMap_setops.cpp b/test/hotspot/gtest/utilities/test_bitMap_setops.cpp similarity index 100% rename from hotspot/test/native/utilities/test_bitMap_setops.cpp rename to test/hotspot/gtest/utilities/test_bitMap_setops.cpp diff --git a/hotspot/test/native/utilities/test_chunkedList.cpp b/test/hotspot/gtest/utilities/test_chunkedList.cpp similarity index 100% rename from hotspot/test/native/utilities/test_chunkedList.cpp rename to test/hotspot/gtest/utilities/test_chunkedList.cpp diff --git a/hotspot/test/native/utilities/test_count_trailing_zeros.cpp b/test/hotspot/gtest/utilities/test_count_trailing_zeros.cpp similarity index 100% rename from hotspot/test/native/utilities/test_count_trailing_zeros.cpp rename to test/hotspot/gtest/utilities/test_count_trailing_zeros.cpp diff --git a/hotspot/test/native/utilities/test_globalDefinitions.cpp b/test/hotspot/gtest/utilities/test_globalDefinitions.cpp similarity index 100% rename from hotspot/test/native/utilities/test_globalDefinitions.cpp rename to test/hotspot/gtest/utilities/test_globalDefinitions.cpp diff --git a/hotspot/test/native/utilities/test_json.cpp b/test/hotspot/gtest/utilities/test_json.cpp similarity index 100% rename from hotspot/test/native/utilities/test_json.cpp rename to test/hotspot/gtest/utilities/test_json.cpp diff --git a/hotspot/test/native/utilities/test_linkedlist.cpp b/test/hotspot/gtest/utilities/test_linkedlist.cpp similarity index 100% rename from hotspot/test/native/utilities/test_linkedlist.cpp rename to test/hotspot/gtest/utilities/test_linkedlist.cpp diff --git a/hotspot/test/native/utilities/test_quicksort.cpp b/test/hotspot/gtest/utilities/test_quicksort.cpp similarity index 100% rename from hotspot/test/native/utilities/test_quicksort.cpp rename to test/hotspot/gtest/utilities/test_quicksort.cpp diff --git a/hotspot/test/native/utilities/test_resourceHash.cpp b/test/hotspot/gtest/utilities/test_resourceHash.cpp similarity index 100% rename from hotspot/test/native/utilities/test_resourceHash.cpp rename to test/hotspot/gtest/utilities/test_resourceHash.cpp diff --git a/hotspot/test/native/utilities/test_utf8.cpp b/test/hotspot/gtest/utilities/test_utf8.cpp similarity index 100% rename from hotspot/test/native/utilities/test_utf8.cpp rename to test/hotspot/gtest/utilities/test_utf8.cpp diff --git a/hotspot/test/Makefile b/test/hotspot/jtreg/Makefile similarity index 100% rename from hotspot/test/Makefile rename to test/hotspot/jtreg/Makefile diff --git a/hotspot/test/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt similarity index 100% rename from hotspot/test/ProblemList.txt rename to test/hotspot/jtreg/ProblemList.txt diff --git a/hotspot/test/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT similarity index 100% rename from hotspot/test/TEST.ROOT rename to test/hotspot/jtreg/TEST.ROOT diff --git a/hotspot/test/TEST.groups b/test/hotspot/jtreg/TEST.groups similarity index 100% rename from hotspot/test/TEST.groups rename to test/hotspot/jtreg/TEST.groups diff --git a/hotspot/test/applications/ctw/Modules.java b/test/hotspot/jtreg/applications/ctw/Modules.java similarity index 100% rename from hotspot/test/applications/ctw/Modules.java rename to test/hotspot/jtreg/applications/ctw/Modules.java diff --git a/hotspot/test/applications/jcstress/JcstressRunner.java b/test/hotspot/jtreg/applications/jcstress/JcstressRunner.java similarity index 100% rename from hotspot/test/applications/jcstress/JcstressRunner.java rename to test/hotspot/jtreg/applications/jcstress/JcstressRunner.java diff --git a/hotspot/test/applications/jcstress/README b/test/hotspot/jtreg/applications/jcstress/README similarity index 100% rename from hotspot/test/applications/jcstress/README rename to test/hotspot/jtreg/applications/jcstress/README diff --git a/hotspot/test/applications/jcstress/TEST.properties b/test/hotspot/jtreg/applications/jcstress/TEST.properties similarity index 100% rename from hotspot/test/applications/jcstress/TEST.properties rename to test/hotspot/jtreg/applications/jcstress/TEST.properties diff --git a/hotspot/test/applications/jcstress/TestGenerator.java b/test/hotspot/jtreg/applications/jcstress/TestGenerator.java similarity index 100% rename from hotspot/test/applications/jcstress/TestGenerator.java rename to test/hotspot/jtreg/applications/jcstress/TestGenerator.java diff --git a/hotspot/test/applications/jcstress/acqrel/Test.java b/test/hotspot/jtreg/applications/jcstress/acqrel/Test.java similarity index 100% rename from hotspot/test/applications/jcstress/acqrel/Test.java rename to test/hotspot/jtreg/applications/jcstress/acqrel/Test.java diff --git a/hotspot/test/applications/jcstress/atomicity/Test.java b/test/hotspot/jtreg/applications/jcstress/atomicity/Test.java similarity index 100% rename from hotspot/test/applications/jcstress/atomicity/Test.java rename to test/hotspot/jtreg/applications/jcstress/atomicity/Test.java diff --git a/hotspot/test/applications/jcstress/copy/Test.java b/test/hotspot/jtreg/applications/jcstress/copy/Test.java similarity index 100% rename from hotspot/test/applications/jcstress/copy/Test.java rename to test/hotspot/jtreg/applications/jcstress/copy/Test.java diff --git a/hotspot/test/applications/jcstress/fences/Test.java b/test/hotspot/jtreg/applications/jcstress/fences/Test.java similarity index 100% rename from hotspot/test/applications/jcstress/fences/Test.java rename to test/hotspot/jtreg/applications/jcstress/fences/Test.java diff --git a/hotspot/test/applications/jcstress/memeffects/Test.java b/test/hotspot/jtreg/applications/jcstress/memeffects/Test.java similarity index 100% rename from hotspot/test/applications/jcstress/memeffects/Test.java rename to test/hotspot/jtreg/applications/jcstress/memeffects/Test.java diff --git a/hotspot/test/applications/jcstress/other/Test.java b/test/hotspot/jtreg/applications/jcstress/other/Test.java similarity index 100% rename from hotspot/test/applications/jcstress/other/Test.java rename to test/hotspot/jtreg/applications/jcstress/other/Test.java diff --git a/hotspot/test/applications/jcstress/seqcst.sync/Test.java b/test/hotspot/jtreg/applications/jcstress/seqcst.sync/Test.java similarity index 100% rename from hotspot/test/applications/jcstress/seqcst.sync/Test.java rename to test/hotspot/jtreg/applications/jcstress/seqcst.sync/Test.java diff --git a/hotspot/test/applications/jcstress/seqcst.volatiles/Test.java b/test/hotspot/jtreg/applications/jcstress/seqcst.volatiles/Test.java similarity index 100% rename from hotspot/test/applications/jcstress/seqcst.volatiles/Test.java rename to test/hotspot/jtreg/applications/jcstress/seqcst.volatiles/Test.java diff --git a/hotspot/test/applications/scimark/Scimark.java b/test/hotspot/jtreg/applications/scimark/Scimark.java similarity index 100% rename from hotspot/test/applications/scimark/Scimark.java rename to test/hotspot/jtreg/applications/scimark/Scimark.java diff --git a/hotspot/test/compiler/aot/AotCompiler.java b/test/hotspot/jtreg/compiler/aot/AotCompiler.java similarity index 100% rename from hotspot/test/compiler/aot/AotCompiler.java rename to test/hotspot/jtreg/compiler/aot/AotCompiler.java diff --git a/hotspot/test/compiler/aot/DeoptimizationTest.java b/test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java similarity index 100% rename from hotspot/test/compiler/aot/DeoptimizationTest.java rename to test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java diff --git a/hotspot/test/compiler/aot/HelloWorldPrinter.java b/test/hotspot/jtreg/compiler/aot/HelloWorldPrinter.java similarity index 100% rename from hotspot/test/compiler/aot/HelloWorldPrinter.java rename to test/hotspot/jtreg/compiler/aot/HelloWorldPrinter.java diff --git a/hotspot/test/compiler/aot/RecompilationTest.java b/test/hotspot/jtreg/compiler/aot/RecompilationTest.java similarity index 100% rename from hotspot/test/compiler/aot/RecompilationTest.java rename to test/hotspot/jtreg/compiler/aot/RecompilationTest.java diff --git a/hotspot/test/compiler/aot/SharedUsageTest.java b/test/hotspot/jtreg/compiler/aot/SharedUsageTest.java similarity index 100% rename from hotspot/test/compiler/aot/SharedUsageTest.java rename to test/hotspot/jtreg/compiler/aot/SharedUsageTest.java diff --git a/hotspot/test/compiler/aot/TEST.properties b/test/hotspot/jtreg/compiler/aot/TEST.properties similarity index 100% rename from hotspot/test/compiler/aot/TEST.properties rename to test/hotspot/jtreg/compiler/aot/TEST.properties diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java diff --git a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java diff --git a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java diff --git a/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java similarity index 100% rename from hotspot/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java rename to test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java diff --git a/hotspot/test/compiler/aot/cli/AotLibraryNegativeBase.java b/test/hotspot/jtreg/compiler/aot/cli/AotLibraryNegativeBase.java similarity index 100% rename from hotspot/test/compiler/aot/cli/AotLibraryNegativeBase.java rename to test/hotspot/jtreg/compiler/aot/cli/AotLibraryNegativeBase.java diff --git a/hotspot/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java b/test/hotspot/jtreg/compiler/aot/cli/DisabledAOTWithLibraryTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java rename to test/hotspot/jtreg/compiler/aot/cli/DisabledAOTWithLibraryTest.java diff --git a/hotspot/test/compiler/aot/cli/IncorrectAOTLibraryTest.java b/test/hotspot/jtreg/compiler/aot/cli/IncorrectAOTLibraryTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/IncorrectAOTLibraryTest.java rename to test/hotspot/jtreg/compiler/aot/cli/IncorrectAOTLibraryTest.java diff --git a/hotspot/test/compiler/aot/cli/MultipleAOTLibraryTest.java b/test/hotspot/jtreg/compiler/aot/cli/MultipleAOTLibraryTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/MultipleAOTLibraryTest.java rename to test/hotspot/jtreg/compiler/aot/cli/MultipleAOTLibraryTest.java diff --git a/hotspot/test/compiler/aot/cli/NonExistingAOTLibraryTest.java b/test/hotspot/jtreg/compiler/aot/cli/NonExistingAOTLibraryTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/NonExistingAOTLibraryTest.java rename to test/hotspot/jtreg/compiler/aot/cli/NonExistingAOTLibraryTest.java diff --git a/hotspot/test/compiler/aot/cli/SingleAOTLibraryTest.java b/test/hotspot/jtreg/compiler/aot/cli/SingleAOTLibraryTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/SingleAOTLibraryTest.java rename to test/hotspot/jtreg/compiler/aot/cli/SingleAOTLibraryTest.java diff --git a/hotspot/test/compiler/aot/cli/SingleAOTOptionTest.java b/test/hotspot/jtreg/compiler/aot/cli/SingleAOTOptionTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/SingleAOTOptionTest.java rename to test/hotspot/jtreg/compiler/aot/cli/SingleAOTOptionTest.java diff --git a/hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java b/test/hotspot/jtreg/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java rename to test/hotspot/jtreg/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java diff --git a/hotspot/test/compiler/aot/cli/jaotc/CompileClassTest.java b/test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileClassTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/jaotc/CompileClassTest.java rename to test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileClassTest.java diff --git a/hotspot/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java b/test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileDirectoryTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java rename to test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileDirectoryTest.java diff --git a/hotspot/test/compiler/aot/cli/jaotc/CompileJarTest.java b/test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileJarTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/jaotc/CompileJarTest.java rename to test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileJarTest.java diff --git a/hotspot/test/compiler/aot/cli/jaotc/CompileModuleTest.java b/test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileModuleTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/jaotc/CompileModuleTest.java rename to test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileModuleTest.java diff --git a/hotspot/test/compiler/aot/cli/jaotc/JaotcTestHelper.java b/test/hotspot/jtreg/compiler/aot/cli/jaotc/JaotcTestHelper.java similarity index 100% rename from hotspot/test/compiler/aot/cli/jaotc/JaotcTestHelper.java rename to test/hotspot/jtreg/compiler/aot/cli/jaotc/JaotcTestHelper.java diff --git a/hotspot/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java b/test/hotspot/jtreg/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java rename to test/hotspot/jtreg/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java diff --git a/hotspot/test/compiler/aot/cli/jaotc/ListOptionTest.java b/test/hotspot/jtreg/compiler/aot/cli/jaotc/ListOptionTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/jaotc/ListOptionTest.java rename to test/hotspot/jtreg/compiler/aot/cli/jaotc/ListOptionTest.java diff --git a/hotspot/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java b/test/hotspot/jtreg/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java similarity index 100% rename from hotspot/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java rename to test/hotspot/jtreg/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java diff --git a/hotspot/test/compiler/aot/cli/jaotc/data/HelloWorldOne.java b/test/hotspot/jtreg/compiler/aot/cli/jaotc/data/HelloWorldOne.java similarity index 100% rename from hotspot/test/compiler/aot/cli/jaotc/data/HelloWorldOne.java rename to test/hotspot/jtreg/compiler/aot/cli/jaotc/data/HelloWorldOne.java diff --git a/hotspot/test/compiler/aot/cli/jaotc/data/HelloWorldTwo.java b/test/hotspot/jtreg/compiler/aot/cli/jaotc/data/HelloWorldTwo.java similarity index 100% rename from hotspot/test/compiler/aot/cli/jaotc/data/HelloWorldTwo.java rename to test/hotspot/jtreg/compiler/aot/cli/jaotc/data/HelloWorldTwo.java diff --git a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java b/test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java similarity index 100% rename from hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java rename to test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java diff --git a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSearchTest.java b/test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSearchTest.java similarity index 100% rename from hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSearchTest.java rename to test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSearchTest.java diff --git a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSourceTest.java b/test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSourceTest.java similarity index 100% rename from hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSourceTest.java rename to test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSourceTest.java diff --git a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/FakeFileSupport.java b/test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/FakeFileSupport.java similarity index 100% rename from hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/FakeFileSupport.java rename to test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/FakeFileSupport.java diff --git a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/FakeSearchPath.java b/test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/FakeSearchPath.java similarity index 100% rename from hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/FakeSearchPath.java rename to test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/FakeSearchPath.java diff --git a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/SearchPathTest.java b/test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/SearchPathTest.java similarity index 100% rename from hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/SearchPathTest.java rename to test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/SearchPathTest.java diff --git a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/Utils.java b/test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/Utils.java similarity index 100% rename from hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/Utils.java rename to test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/Utils.java diff --git a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/directory/DirectorySourceProviderTest.java b/test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/directory/DirectorySourceProviderTest.java similarity index 100% rename from hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/directory/DirectorySourceProviderTest.java rename to test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/directory/DirectorySourceProviderTest.java diff --git a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/jar/JarSourceProviderTest.java b/test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/jar/JarSourceProviderTest.java similarity index 100% rename from hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/jar/JarSourceProviderTest.java rename to test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/jar/JarSourceProviderTest.java diff --git a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/module/ModuleSourceProviderTest.java b/test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/module/ModuleSourceProviderTest.java similarity index 100% rename from hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/module/ModuleSourceProviderTest.java rename to test/hotspot/jtreg/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/module/ModuleSourceProviderTest.java diff --git a/hotspot/test/compiler/aot/scripts/HelloWorld.java b/test/hotspot/jtreg/compiler/aot/scripts/HelloWorld.java similarity index 100% rename from hotspot/test/compiler/aot/scripts/HelloWorld.java rename to test/hotspot/jtreg/compiler/aot/scripts/HelloWorld.java diff --git a/hotspot/test/compiler/aot/scripts/InitGraal.java b/test/hotspot/jtreg/compiler/aot/scripts/InitGraal.java similarity index 100% rename from hotspot/test/compiler/aot/scripts/InitGraal.java rename to test/hotspot/jtreg/compiler/aot/scripts/InitGraal.java diff --git a/hotspot/test/compiler/aot/scripts/README b/test/hotspot/jtreg/compiler/aot/scripts/README similarity index 100% rename from hotspot/test/compiler/aot/scripts/README rename to test/hotspot/jtreg/compiler/aot/scripts/README diff --git a/hotspot/test/compiler/aot/scripts/build-bootmodules.sh b/test/hotspot/jtreg/compiler/aot/scripts/build-bootmodules.sh similarity index 100% rename from hotspot/test/compiler/aot/scripts/build-bootmodules.sh rename to test/hotspot/jtreg/compiler/aot/scripts/build-bootmodules.sh diff --git a/hotspot/test/compiler/aot/scripts/build-jdk.vm-modules.sh b/test/hotspot/jtreg/compiler/aot/scripts/build-jdk.vm-modules.sh similarity index 100% rename from hotspot/test/compiler/aot/scripts/build-jdk.vm-modules.sh rename to test/hotspot/jtreg/compiler/aot/scripts/build-jdk.vm-modules.sh diff --git a/hotspot/test/compiler/aot/scripts/empty.js b/test/hotspot/jtreg/compiler/aot/scripts/empty.js similarity index 100% rename from hotspot/test/compiler/aot/scripts/empty.js rename to test/hotspot/jtreg/compiler/aot/scripts/empty.js diff --git a/hotspot/test/compiler/aot/scripts/java.base-list.txt b/test/hotspot/jtreg/compiler/aot/scripts/java.base-list.txt similarity index 100% rename from hotspot/test/compiler/aot/scripts/java.base-list.txt rename to test/hotspot/jtreg/compiler/aot/scripts/java.base-list.txt diff --git a/hotspot/test/compiler/aot/scripts/jdk.internal.vm.compiler-list.txt b/test/hotspot/jtreg/compiler/aot/scripts/jdk.internal.vm.compiler-list.txt similarity index 100% rename from hotspot/test/compiler/aot/scripts/jdk.internal.vm.compiler-list.txt rename to test/hotspot/jtreg/compiler/aot/scripts/jdk.internal.vm.compiler-list.txt diff --git a/hotspot/test/compiler/aot/scripts/jdk.scripting.nashorn-list.txt b/test/hotspot/jtreg/compiler/aot/scripts/jdk.scripting.nashorn-list.txt similarity index 100% rename from hotspot/test/compiler/aot/scripts/jdk.scripting.nashorn-list.txt rename to test/hotspot/jtreg/compiler/aot/scripts/jdk.scripting.nashorn-list.txt diff --git a/hotspot/test/compiler/aot/scripts/test-env.sh b/test/hotspot/jtreg/compiler/aot/scripts/test-env.sh similarity index 100% rename from hotspot/test/compiler/aot/scripts/test-env.sh rename to test/hotspot/jtreg/compiler/aot/scripts/test-env.sh diff --git a/hotspot/test/compiler/aot/scripts/test-graal.sh b/test/hotspot/jtreg/compiler/aot/scripts/test-graal.sh similarity index 100% rename from hotspot/test/compiler/aot/scripts/test-graal.sh rename to test/hotspot/jtreg/compiler/aot/scripts/test-graal.sh diff --git a/hotspot/test/compiler/aot/scripts/test-helloworld.sh b/test/hotspot/jtreg/compiler/aot/scripts/test-helloworld.sh similarity index 100% rename from hotspot/test/compiler/aot/scripts/test-helloworld.sh rename to test/hotspot/jtreg/compiler/aot/scripts/test-helloworld.sh diff --git a/hotspot/test/compiler/aot/scripts/test-jaotc.sh b/test/hotspot/jtreg/compiler/aot/scripts/test-jaotc.sh similarity index 100% rename from hotspot/test/compiler/aot/scripts/test-jaotc.sh rename to test/hotspot/jtreg/compiler/aot/scripts/test-jaotc.sh diff --git a/hotspot/test/compiler/aot/scripts/test-javac.sh b/test/hotspot/jtreg/compiler/aot/scripts/test-javac.sh similarity index 100% rename from hotspot/test/compiler/aot/scripts/test-javac.sh rename to test/hotspot/jtreg/compiler/aot/scripts/test-javac.sh diff --git a/hotspot/test/compiler/aot/scripts/test-nashorn.sh b/test/hotspot/jtreg/compiler/aot/scripts/test-nashorn.sh similarity index 100% rename from hotspot/test/compiler/aot/scripts/test-nashorn.sh rename to test/hotspot/jtreg/compiler/aot/scripts/test-nashorn.sh diff --git a/hotspot/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java b/test/hotspot/jtreg/compiler/aot/verification/ClassAndLibraryNotMatchTest.java similarity index 100% rename from hotspot/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java rename to test/hotspot/jtreg/compiler/aot/verification/ClassAndLibraryNotMatchTest.java diff --git a/hotspot/test/compiler/aot/verification/vmflags/BasicFlagsChange.java b/test/hotspot/jtreg/compiler/aot/verification/vmflags/BasicFlagsChange.java similarity index 100% rename from hotspot/test/compiler/aot/verification/vmflags/BasicFlagsChange.java rename to test/hotspot/jtreg/compiler/aot/verification/vmflags/BasicFlagsChange.java diff --git a/hotspot/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java b/test/hotspot/jtreg/compiler/aot/verification/vmflags/NotTrackedFlagTest.java similarity index 100% rename from hotspot/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java rename to test/hotspot/jtreg/compiler/aot/verification/vmflags/NotTrackedFlagTest.java diff --git a/hotspot/test/compiler/aot/verification/vmflags/TrackedFlagTest.java b/test/hotspot/jtreg/compiler/aot/verification/vmflags/TrackedFlagTest.java similarity index 100% rename from hotspot/test/compiler/aot/verification/vmflags/TrackedFlagTest.java rename to test/hotspot/jtreg/compiler/aot/verification/vmflags/TrackedFlagTest.java diff --git a/hotspot/test/compiler/arguments/BMICommandLineOptionTestBase.java b/test/hotspot/jtreg/compiler/arguments/BMICommandLineOptionTestBase.java similarity index 100% rename from hotspot/test/compiler/arguments/BMICommandLineOptionTestBase.java rename to test/hotspot/jtreg/compiler/arguments/BMICommandLineOptionTestBase.java diff --git a/hotspot/test/compiler/arguments/BMISupportedCPUTest.java b/test/hotspot/jtreg/compiler/arguments/BMISupportedCPUTest.java similarity index 100% rename from hotspot/test/compiler/arguments/BMISupportedCPUTest.java rename to test/hotspot/jtreg/compiler/arguments/BMISupportedCPUTest.java diff --git a/hotspot/test/compiler/arguments/BMIUnsupportedCPUTest.java b/test/hotspot/jtreg/compiler/arguments/BMIUnsupportedCPUTest.java similarity index 100% rename from hotspot/test/compiler/arguments/BMIUnsupportedCPUTest.java rename to test/hotspot/jtreg/compiler/arguments/BMIUnsupportedCPUTest.java diff --git a/hotspot/test/compiler/arguments/CheckCICompilerCount.java b/test/hotspot/jtreg/compiler/arguments/CheckCICompilerCount.java similarity index 100% rename from hotspot/test/compiler/arguments/CheckCICompilerCount.java rename to test/hotspot/jtreg/compiler/arguments/CheckCICompilerCount.java diff --git a/hotspot/test/compiler/arguments/CheckCompileThresholdScaling.java b/test/hotspot/jtreg/compiler/arguments/CheckCompileThresholdScaling.java similarity index 100% rename from hotspot/test/compiler/arguments/CheckCompileThresholdScaling.java rename to test/hotspot/jtreg/compiler/arguments/CheckCompileThresholdScaling.java diff --git a/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java b/test/hotspot/jtreg/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java similarity index 100% rename from hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java rename to test/hotspot/jtreg/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java diff --git a/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java similarity index 100% rename from hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java rename to test/hotspot/jtreg/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java diff --git a/hotspot/test/compiler/arguments/TestUseCompiler.java b/test/hotspot/jtreg/compiler/arguments/TestUseCompiler.java similarity index 100% rename from hotspot/test/compiler/arguments/TestUseCompiler.java rename to test/hotspot/jtreg/compiler/arguments/TestUseCompiler.java diff --git a/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java similarity index 100% rename from hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java rename to test/hotspot/jtreg/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java diff --git a/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java similarity index 100% rename from hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java rename to test/hotspot/jtreg/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java diff --git a/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java similarity index 100% rename from hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java rename to test/hotspot/jtreg/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java diff --git a/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java similarity index 100% rename from hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java rename to test/hotspot/jtreg/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java diff --git a/hotspot/test/compiler/arraycopy/TestACSameSrcDst.java b/test/hotspot/jtreg/compiler/arraycopy/TestACSameSrcDst.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestACSameSrcDst.java rename to test/hotspot/jtreg/compiler/arraycopy/TestACSameSrcDst.java diff --git a/hotspot/test/compiler/arraycopy/TestArrayCloneBadAssert.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCloneBadAssert.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArrayCloneBadAssert.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArrayCloneBadAssert.java diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyAsLoadsStores.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyAsLoadsStores.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArrayCopyAsLoadsStores.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyAsLoadsStores.java diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyBadReexec.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyBadReexec.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArrayCopyBadReexec.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyBadReexec.java diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyMacro.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyMacro.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArrayCopyMacro.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyMacro.java diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyNoInit.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyNoInit.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArrayCopyNoInit.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyNoInit.java diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyNoInitDeopt.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyNoInitDeopt.java diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyOfStopped.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyOfStopped.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArrayCopyOfStopped.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyOfStopped.java diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyOverflowArguments.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyOverflowArguments.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArrayCopyOverflowArguments.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyOverflowArguments.java diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyOverflowInBoundChecks.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyOverflowInBoundChecks.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArrayCopyOverflowInBoundChecks.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyOverflowInBoundChecks.java diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyStoppedAfterGuards.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyStoppedAfterGuards.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArrayCopyStoppedAfterGuards.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyStoppedAfterGuards.java diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyUNCBadMem.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyUNCBadMem.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArrayCopyUNCBadMem.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyUNCBadMem.java diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyUtils.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyUtils.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArrayCopyUtils.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyUtils.java diff --git a/hotspot/test/compiler/arraycopy/TestArraysCopyOfNoTypeCheck.java b/test/hotspot/jtreg/compiler/arraycopy/TestArraysCopyOfNoTypeCheck.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestArraysCopyOfNoTypeCheck.java rename to test/hotspot/jtreg/compiler/arraycopy/TestArraysCopyOfNoTypeCheck.java diff --git a/hotspot/test/compiler/arraycopy/TestDeadArrayCopyOnMemChain.java b/test/hotspot/jtreg/compiler/arraycopy/TestDeadArrayCopyOnMemChain.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestDeadArrayCopyOnMemChain.java rename to test/hotspot/jtreg/compiler/arraycopy/TestDeadArrayCopyOnMemChain.java diff --git a/hotspot/test/compiler/arraycopy/TestDefaultMethodArrayCloneDeoptC2.java b/test/hotspot/jtreg/compiler/arraycopy/TestDefaultMethodArrayCloneDeoptC2.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestDefaultMethodArrayCloneDeoptC2.java rename to test/hotspot/jtreg/compiler/arraycopy/TestDefaultMethodArrayCloneDeoptC2.java diff --git a/hotspot/test/compiler/arraycopy/TestEliminateArrayCopy.java b/test/hotspot/jtreg/compiler/arraycopy/TestEliminateArrayCopy.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestEliminateArrayCopy.java rename to test/hotspot/jtreg/compiler/arraycopy/TestEliminateArrayCopy.java diff --git a/hotspot/test/compiler/arraycopy/TestEliminatedArrayCopyDeopt.java b/test/hotspot/jtreg/compiler/arraycopy/TestEliminatedArrayCopyDeopt.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestEliminatedArrayCopyDeopt.java rename to test/hotspot/jtreg/compiler/arraycopy/TestEliminatedArrayCopyDeopt.java diff --git a/hotspot/test/compiler/arraycopy/TestEliminatedArrayCopyPhi.java b/test/hotspot/jtreg/compiler/arraycopy/TestEliminatedArrayCopyPhi.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestEliminatedArrayCopyPhi.java rename to test/hotspot/jtreg/compiler/arraycopy/TestEliminatedArrayCopyPhi.java diff --git a/hotspot/test/compiler/arraycopy/TestEliminatedArrayLoopPredicateCopyDeopt.java b/test/hotspot/jtreg/compiler/arraycopy/TestEliminatedArrayLoopPredicateCopyDeopt.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestEliminatedArrayLoopPredicateCopyDeopt.java rename to test/hotspot/jtreg/compiler/arraycopy/TestEliminatedArrayLoopPredicateCopyDeopt.java diff --git a/hotspot/test/compiler/arraycopy/TestEliminatedCloneBadMemEdge.java b/test/hotspot/jtreg/compiler/arraycopy/TestEliminatedCloneBadMemEdge.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestEliminatedCloneBadMemEdge.java rename to test/hotspot/jtreg/compiler/arraycopy/TestEliminatedCloneBadMemEdge.java diff --git a/hotspot/test/compiler/arraycopy/TestInitializingACLoadWithBadMem.java b/test/hotspot/jtreg/compiler/arraycopy/TestInitializingACLoadWithBadMem.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestInitializingACLoadWithBadMem.java rename to test/hotspot/jtreg/compiler/arraycopy/TestInitializingACLoadWithBadMem.java diff --git a/hotspot/test/compiler/arraycopy/TestInstanceCloneAsLoadsStores.java b/test/hotspot/jtreg/compiler/arraycopy/TestInstanceCloneAsLoadsStores.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestInstanceCloneAsLoadsStores.java rename to test/hotspot/jtreg/compiler/arraycopy/TestInstanceCloneAsLoadsStores.java diff --git a/hotspot/test/compiler/arraycopy/TestInstanceCloneUtils.java b/test/hotspot/jtreg/compiler/arraycopy/TestInstanceCloneUtils.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestInstanceCloneUtils.java rename to test/hotspot/jtreg/compiler/arraycopy/TestInstanceCloneUtils.java diff --git a/hotspot/test/compiler/arraycopy/TestLoadBypassACWithWrongMem.java b/test/hotspot/jtreg/compiler/arraycopy/TestLoadBypassACWithWrongMem.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestLoadBypassACWithWrongMem.java rename to test/hotspot/jtreg/compiler/arraycopy/TestLoadBypassACWithWrongMem.java diff --git a/hotspot/test/compiler/arraycopy/TestLoadBypassArrayCopy.java b/test/hotspot/jtreg/compiler/arraycopy/TestLoadBypassArrayCopy.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestLoadBypassArrayCopy.java rename to test/hotspot/jtreg/compiler/arraycopy/TestLoadBypassArrayCopy.java diff --git a/hotspot/test/compiler/arraycopy/TestMissingControl.java b/test/hotspot/jtreg/compiler/arraycopy/TestMissingControl.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestMissingControl.java rename to test/hotspot/jtreg/compiler/arraycopy/TestMissingControl.java diff --git a/hotspot/test/compiler/arraycopy/TestObjectArrayClone.java b/test/hotspot/jtreg/compiler/arraycopy/TestObjectArrayClone.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestObjectArrayClone.java rename to test/hotspot/jtreg/compiler/arraycopy/TestObjectArrayClone.java diff --git a/hotspot/test/compiler/arraycopy/TestObjectArrayCopy.java b/test/hotspot/jtreg/compiler/arraycopy/TestObjectArrayCopy.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestObjectArrayCopy.java rename to test/hotspot/jtreg/compiler/arraycopy/TestObjectArrayCopy.java diff --git a/hotspot/test/compiler/arraycopy/TestReduceBulkZeroingDisabled.java b/test/hotspot/jtreg/compiler/arraycopy/TestReduceBulkZeroingDisabled.java similarity index 100% rename from hotspot/test/compiler/arraycopy/TestReduceBulkZeroingDisabled.java rename to test/hotspot/jtreg/compiler/arraycopy/TestReduceBulkZeroingDisabled.java diff --git a/hotspot/test/compiler/c1/CanonicalizeArrayLength.java b/test/hotspot/jtreg/compiler/c1/CanonicalizeArrayLength.java similarity index 100% rename from hotspot/test/compiler/c1/CanonicalizeArrayLength.java rename to test/hotspot/jtreg/compiler/c1/CanonicalizeArrayLength.java diff --git a/hotspot/test/compiler/c1/MultiplyByMaxInt.java b/test/hotspot/jtreg/compiler/c1/MultiplyByMaxInt.java similarity index 100% rename from hotspot/test/compiler/c1/MultiplyByMaxInt.java rename to test/hotspot/jtreg/compiler/c1/MultiplyByMaxInt.java diff --git a/hotspot/test/compiler/c1/NullCheckTest.java b/test/hotspot/jtreg/compiler/c1/NullCheckTest.java similarity index 100% rename from hotspot/test/compiler/c1/NullCheckTest.java rename to test/hotspot/jtreg/compiler/c1/NullCheckTest.java diff --git a/hotspot/test/compiler/c1/Test6579789.java b/test/hotspot/jtreg/compiler/c1/Test6579789.java similarity index 100% rename from hotspot/test/compiler/c1/Test6579789.java rename to test/hotspot/jtreg/compiler/c1/Test6579789.java diff --git a/hotspot/test/compiler/c1/Test6756768.java b/test/hotspot/jtreg/compiler/c1/Test6756768.java similarity index 100% rename from hotspot/test/compiler/c1/Test6756768.java rename to test/hotspot/jtreg/compiler/c1/Test6756768.java diff --git a/hotspot/test/compiler/c1/Test6756768_2.java b/test/hotspot/jtreg/compiler/c1/Test6756768_2.java similarity index 100% rename from hotspot/test/compiler/c1/Test6756768_2.java rename to test/hotspot/jtreg/compiler/c1/Test6756768_2.java diff --git a/hotspot/test/compiler/c1/Test6757316.java b/test/hotspot/jtreg/compiler/c1/Test6757316.java similarity index 100% rename from hotspot/test/compiler/c1/Test6757316.java rename to test/hotspot/jtreg/compiler/c1/Test6757316.java diff --git a/hotspot/test/compiler/c1/Test6758234.java b/test/hotspot/jtreg/compiler/c1/Test6758234.java similarity index 100% rename from hotspot/test/compiler/c1/Test6758234.java rename to test/hotspot/jtreg/compiler/c1/Test6758234.java diff --git a/hotspot/test/compiler/c1/Test6795465.java b/test/hotspot/jtreg/compiler/c1/Test6795465.java similarity index 100% rename from hotspot/test/compiler/c1/Test6795465.java rename to test/hotspot/jtreg/compiler/c1/Test6795465.java diff --git a/hotspot/test/compiler/c1/Test6849574.java b/test/hotspot/jtreg/compiler/c1/Test6849574.java similarity index 100% rename from hotspot/test/compiler/c1/Test6849574.java rename to test/hotspot/jtreg/compiler/c1/Test6849574.java diff --git a/hotspot/test/compiler/c1/Test6855215.java b/test/hotspot/jtreg/compiler/c1/Test6855215.java similarity index 100% rename from hotspot/test/compiler/c1/Test6855215.java rename to test/hotspot/jtreg/compiler/c1/Test6855215.java diff --git a/hotspot/test/compiler/c1/Test6932496.java b/test/hotspot/jtreg/compiler/c1/Test6932496.java similarity index 100% rename from hotspot/test/compiler/c1/Test6932496.java rename to test/hotspot/jtreg/compiler/c1/Test6932496.java diff --git a/hotspot/test/compiler/c1/Test7042153.java b/test/hotspot/jtreg/compiler/c1/Test7042153.java similarity index 100% rename from hotspot/test/compiler/c1/Test7042153.java rename to test/hotspot/jtreg/compiler/c1/Test7042153.java diff --git a/hotspot/test/compiler/c1/Test7090976.java b/test/hotspot/jtreg/compiler/c1/Test7090976.java similarity index 100% rename from hotspot/test/compiler/c1/Test7090976.java rename to test/hotspot/jtreg/compiler/c1/Test7090976.java diff --git a/hotspot/test/compiler/c1/Test7103261.java b/test/hotspot/jtreg/compiler/c1/Test7103261.java similarity index 100% rename from hotspot/test/compiler/c1/Test7103261.java rename to test/hotspot/jtreg/compiler/c1/Test7103261.java diff --git a/hotspot/test/compiler/c1/Test7123108.java b/test/hotspot/jtreg/compiler/c1/Test7123108.java similarity index 100% rename from hotspot/test/compiler/c1/Test7123108.java rename to test/hotspot/jtreg/compiler/c1/Test7123108.java diff --git a/hotspot/test/compiler/c1/Test8004051.java b/test/hotspot/jtreg/compiler/c1/Test8004051.java similarity index 100% rename from hotspot/test/compiler/c1/Test8004051.java rename to test/hotspot/jtreg/compiler/c1/Test8004051.java diff --git a/hotspot/test/compiler/c1/Test8011706.java b/test/hotspot/jtreg/compiler/c1/Test8011706.java similarity index 100% rename from hotspot/test/compiler/c1/Test8011706.java rename to test/hotspot/jtreg/compiler/c1/Test8011706.java diff --git a/hotspot/test/compiler/c1/Test8011771.java b/test/hotspot/jtreg/compiler/c1/Test8011771.java similarity index 100% rename from hotspot/test/compiler/c1/Test8011771.java rename to test/hotspot/jtreg/compiler/c1/Test8011771.java diff --git a/hotspot/test/compiler/c1/Test8172751.java b/test/hotspot/jtreg/compiler/c1/Test8172751.java similarity index 100% rename from hotspot/test/compiler/c1/Test8172751.java rename to test/hotspot/jtreg/compiler/c1/Test8172751.java diff --git a/hotspot/test/compiler/c1/TestArrayCopy.java b/test/hotspot/jtreg/compiler/c1/TestArrayCopy.java similarity index 100% rename from hotspot/test/compiler/c1/TestArrayCopy.java rename to test/hotspot/jtreg/compiler/c1/TestArrayCopy.java diff --git a/hotspot/test/compiler/c1/TestArrayCopyToFromObject.java b/test/hotspot/jtreg/compiler/c1/TestArrayCopyToFromObject.java similarity index 100% rename from hotspot/test/compiler/c1/TestArrayCopyToFromObject.java rename to test/hotspot/jtreg/compiler/c1/TestArrayCopyToFromObject.java diff --git a/hotspot/test/compiler/c1/TestDeoptInt.java b/test/hotspot/jtreg/compiler/c1/TestDeoptInt.java similarity index 100% rename from hotspot/test/compiler/c1/TestDeoptInt.java rename to test/hotspot/jtreg/compiler/c1/TestDeoptInt.java diff --git a/hotspot/test/compiler/c1/TestPinnedIntrinsics.java b/test/hotspot/jtreg/compiler/c1/TestPinnedIntrinsics.java similarity index 100% rename from hotspot/test/compiler/c1/TestPinnedIntrinsics.java rename to test/hotspot/jtreg/compiler/c1/TestPinnedIntrinsics.java diff --git a/hotspot/test/compiler/c1/TestUnalignedLoad.java b/test/hotspot/jtreg/compiler/c1/TestUnalignedLoad.java similarity index 100% rename from hotspot/test/compiler/c1/TestUnalignedLoad.java rename to test/hotspot/jtreg/compiler/c1/TestUnalignedLoad.java diff --git a/hotspot/test/compiler/c1/TestUnresolvedField.jasm b/test/hotspot/jtreg/compiler/c1/TestUnresolvedField.jasm similarity index 100% rename from hotspot/test/compiler/c1/TestUnresolvedField.jasm rename to test/hotspot/jtreg/compiler/c1/TestUnresolvedField.jasm diff --git a/hotspot/test/compiler/c1/TestUnresolvedFieldMain.java b/test/hotspot/jtreg/compiler/c1/TestUnresolvedFieldMain.java similarity index 100% rename from hotspot/test/compiler/c1/TestUnresolvedFieldMain.java rename to test/hotspot/jtreg/compiler/c1/TestUnresolvedFieldMain.java diff --git a/hotspot/test/compiler/c1/UnsafeVolatileGuardTest.java b/test/hotspot/jtreg/compiler/c1/UnsafeVolatileGuardTest.java similarity index 100% rename from hotspot/test/compiler/c1/UnsafeVolatileGuardTest.java rename to test/hotspot/jtreg/compiler/c1/UnsafeVolatileGuardTest.java diff --git a/hotspot/test/compiler/c1/VolatileGuardTest.java b/test/hotspot/jtreg/compiler/c1/VolatileGuardTest.java similarity index 100% rename from hotspot/test/compiler/c1/VolatileGuardTest.java rename to test/hotspot/jtreg/compiler/c1/VolatileGuardTest.java diff --git a/hotspot/test/compiler/c2/FloatingPointFoldingTest.java b/test/hotspot/jtreg/compiler/c2/FloatingPointFoldingTest.java similarity index 100% rename from hotspot/test/compiler/c2/FloatingPointFoldingTest.java rename to test/hotspot/jtreg/compiler/c2/FloatingPointFoldingTest.java diff --git a/hotspot/test/compiler/c2/IVTest.java b/test/hotspot/jtreg/compiler/c2/IVTest.java similarity index 100% rename from hotspot/test/compiler/c2/IVTest.java rename to test/hotspot/jtreg/compiler/c2/IVTest.java diff --git a/hotspot/test/compiler/c2/InterruptedTest.java b/test/hotspot/jtreg/compiler/c2/InterruptedTest.java similarity index 100% rename from hotspot/test/compiler/c2/InterruptedTest.java rename to test/hotspot/jtreg/compiler/c2/InterruptedTest.java diff --git a/hotspot/test/compiler/c2/IsInstanceTest.java b/test/hotspot/jtreg/compiler/c2/IsInstanceTest.java similarity index 100% rename from hotspot/test/compiler/c2/IsInstanceTest.java rename to test/hotspot/jtreg/compiler/c2/IsInstanceTest.java diff --git a/hotspot/test/compiler/c2/PolynomialRoot.java b/test/hotspot/jtreg/compiler/c2/PolynomialRoot.java similarity index 100% rename from hotspot/test/compiler/c2/PolynomialRoot.java rename to test/hotspot/jtreg/compiler/c2/PolynomialRoot.java diff --git a/hotspot/test/compiler/c2/Test5057225.java b/test/hotspot/jtreg/compiler/c2/Test5057225.java similarity index 100% rename from hotspot/test/compiler/c2/Test5057225.java rename to test/hotspot/jtreg/compiler/c2/Test5057225.java diff --git a/hotspot/test/compiler/c2/Test5091921.java b/test/hotspot/jtreg/compiler/c2/Test5091921.java similarity index 100% rename from hotspot/test/compiler/c2/Test5091921.java rename to test/hotspot/jtreg/compiler/c2/Test5091921.java diff --git a/hotspot/test/compiler/c2/Test6186134.java b/test/hotspot/jtreg/compiler/c2/Test6186134.java similarity index 100% rename from hotspot/test/compiler/c2/Test6186134.java rename to test/hotspot/jtreg/compiler/c2/Test6186134.java diff --git a/hotspot/test/compiler/c2/Test6196102.java b/test/hotspot/jtreg/compiler/c2/Test6196102.java similarity index 100% rename from hotspot/test/compiler/c2/Test6196102.java rename to test/hotspot/jtreg/compiler/c2/Test6196102.java diff --git a/hotspot/test/compiler/c2/Test6357214.java b/test/hotspot/jtreg/compiler/c2/Test6357214.java similarity index 100% rename from hotspot/test/compiler/c2/Test6357214.java rename to test/hotspot/jtreg/compiler/c2/Test6357214.java diff --git a/hotspot/test/compiler/c2/Test6443505.java b/test/hotspot/jtreg/compiler/c2/Test6443505.java similarity index 100% rename from hotspot/test/compiler/c2/Test6443505.java rename to test/hotspot/jtreg/compiler/c2/Test6443505.java diff --git a/hotspot/test/compiler/c2/Test6559156.java b/test/hotspot/jtreg/compiler/c2/Test6559156.java similarity index 100% rename from hotspot/test/compiler/c2/Test6559156.java rename to test/hotspot/jtreg/compiler/c2/Test6559156.java diff --git a/hotspot/test/compiler/c2/Test6603011.java b/test/hotspot/jtreg/compiler/c2/Test6603011.java similarity index 100% rename from hotspot/test/compiler/c2/Test6603011.java rename to test/hotspot/jtreg/compiler/c2/Test6603011.java diff --git a/hotspot/test/compiler/c2/Test6636138_1.java b/test/hotspot/jtreg/compiler/c2/Test6636138_1.java similarity index 100% rename from hotspot/test/compiler/c2/Test6636138_1.java rename to test/hotspot/jtreg/compiler/c2/Test6636138_1.java diff --git a/hotspot/test/compiler/c2/Test6636138_2.java b/test/hotspot/jtreg/compiler/c2/Test6636138_2.java similarity index 100% rename from hotspot/test/compiler/c2/Test6636138_2.java rename to test/hotspot/jtreg/compiler/c2/Test6636138_2.java diff --git a/hotspot/test/compiler/c2/Test6646019.java b/test/hotspot/jtreg/compiler/c2/Test6646019.java similarity index 100% rename from hotspot/test/compiler/c2/Test6646019.java rename to test/hotspot/jtreg/compiler/c2/Test6646019.java diff --git a/hotspot/test/compiler/c2/Test6661247.java b/test/hotspot/jtreg/compiler/c2/Test6661247.java similarity index 100% rename from hotspot/test/compiler/c2/Test6661247.java rename to test/hotspot/jtreg/compiler/c2/Test6661247.java diff --git a/hotspot/test/compiler/c2/Test6695810.java b/test/hotspot/jtreg/compiler/c2/Test6695810.java similarity index 100% rename from hotspot/test/compiler/c2/Test6695810.java rename to test/hotspot/jtreg/compiler/c2/Test6695810.java diff --git a/hotspot/test/compiler/c2/Test6700047.java b/test/hotspot/jtreg/compiler/c2/Test6700047.java similarity index 100% rename from hotspot/test/compiler/c2/Test6700047.java rename to test/hotspot/jtreg/compiler/c2/Test6700047.java diff --git a/hotspot/test/compiler/c2/Test6711100.java b/test/hotspot/jtreg/compiler/c2/Test6711100.java similarity index 100% rename from hotspot/test/compiler/c2/Test6711100.java rename to test/hotspot/jtreg/compiler/c2/Test6711100.java diff --git a/hotspot/test/compiler/c2/Test6724218.java b/test/hotspot/jtreg/compiler/c2/Test6724218.java similarity index 100% rename from hotspot/test/compiler/c2/Test6724218.java rename to test/hotspot/jtreg/compiler/c2/Test6724218.java diff --git a/hotspot/test/compiler/c2/Test6732154.java b/test/hotspot/jtreg/compiler/c2/Test6732154.java similarity index 100% rename from hotspot/test/compiler/c2/Test6732154.java rename to test/hotspot/jtreg/compiler/c2/Test6732154.java diff --git a/hotspot/test/compiler/c2/Test6741738.java b/test/hotspot/jtreg/compiler/c2/Test6741738.java similarity index 100% rename from hotspot/test/compiler/c2/Test6741738.java rename to test/hotspot/jtreg/compiler/c2/Test6741738.java diff --git a/hotspot/test/compiler/c2/Test6753639.java b/test/hotspot/jtreg/compiler/c2/Test6753639.java similarity index 100% rename from hotspot/test/compiler/c2/Test6753639.java rename to test/hotspot/jtreg/compiler/c2/Test6753639.java diff --git a/hotspot/test/compiler/c2/Test6792161.java b/test/hotspot/jtreg/compiler/c2/Test6792161.java similarity index 100% rename from hotspot/test/compiler/c2/Test6792161.java rename to test/hotspot/jtreg/compiler/c2/Test6792161.java diff --git a/hotspot/test/compiler/c2/Test6795362.java b/test/hotspot/jtreg/compiler/c2/Test6795362.java similarity index 100% rename from hotspot/test/compiler/c2/Test6795362.java rename to test/hotspot/jtreg/compiler/c2/Test6795362.java diff --git a/hotspot/test/compiler/c2/Test6796786.java b/test/hotspot/jtreg/compiler/c2/Test6796786.java similarity index 100% rename from hotspot/test/compiler/c2/Test6796786.java rename to test/hotspot/jtreg/compiler/c2/Test6796786.java diff --git a/hotspot/test/compiler/c2/Test6799693.java b/test/hotspot/jtreg/compiler/c2/Test6799693.java similarity index 100% rename from hotspot/test/compiler/c2/Test6799693.java rename to test/hotspot/jtreg/compiler/c2/Test6799693.java diff --git a/hotspot/test/compiler/c2/Test6800154.java b/test/hotspot/jtreg/compiler/c2/Test6800154.java similarity index 100% rename from hotspot/test/compiler/c2/Test6800154.java rename to test/hotspot/jtreg/compiler/c2/Test6800154.java diff --git a/hotspot/test/compiler/c2/Test6805724.java b/test/hotspot/jtreg/compiler/c2/Test6805724.java similarity index 100% rename from hotspot/test/compiler/c2/Test6805724.java rename to test/hotspot/jtreg/compiler/c2/Test6805724.java diff --git a/hotspot/test/compiler/c2/Test6823453.java b/test/hotspot/jtreg/compiler/c2/Test6823453.java similarity index 100% rename from hotspot/test/compiler/c2/Test6823453.java rename to test/hotspot/jtreg/compiler/c2/Test6823453.java diff --git a/hotspot/test/compiler/c2/Test6832293.java b/test/hotspot/jtreg/compiler/c2/Test6832293.java similarity index 100% rename from hotspot/test/compiler/c2/Test6832293.java rename to test/hotspot/jtreg/compiler/c2/Test6832293.java diff --git a/hotspot/test/compiler/c2/Test6837011.java b/test/hotspot/jtreg/compiler/c2/Test6837011.java similarity index 100% rename from hotspot/test/compiler/c2/Test6837011.java rename to test/hotspot/jtreg/compiler/c2/Test6837011.java diff --git a/hotspot/test/compiler/c2/Test6837094.java b/test/hotspot/jtreg/compiler/c2/Test6837094.java similarity index 100% rename from hotspot/test/compiler/c2/Test6837094.java rename to test/hotspot/jtreg/compiler/c2/Test6837094.java diff --git a/hotspot/test/compiler/c2/Test6843752.java b/test/hotspot/jtreg/compiler/c2/Test6843752.java similarity index 100% rename from hotspot/test/compiler/c2/Test6843752.java rename to test/hotspot/jtreg/compiler/c2/Test6843752.java diff --git a/hotspot/test/compiler/c2/Test6850611.java b/test/hotspot/jtreg/compiler/c2/Test6850611.java similarity index 100% rename from hotspot/test/compiler/c2/Test6850611.java rename to test/hotspot/jtreg/compiler/c2/Test6850611.java diff --git a/hotspot/test/compiler/c2/Test6851282.java b/test/hotspot/jtreg/compiler/c2/Test6851282.java similarity index 100% rename from hotspot/test/compiler/c2/Test6851282.java rename to test/hotspot/jtreg/compiler/c2/Test6851282.java diff --git a/hotspot/test/compiler/c2/Test6852078.java b/test/hotspot/jtreg/compiler/c2/Test6852078.java similarity index 100% rename from hotspot/test/compiler/c2/Test6852078.java rename to test/hotspot/jtreg/compiler/c2/Test6852078.java diff --git a/hotspot/test/compiler/c2/Test6857159.java b/test/hotspot/jtreg/compiler/c2/Test6857159.java similarity index 100% rename from hotspot/test/compiler/c2/Test6857159.java rename to test/hotspot/jtreg/compiler/c2/Test6857159.java diff --git a/hotspot/test/compiler/c2/Test6863155.java b/test/hotspot/jtreg/compiler/c2/Test6863155.java similarity index 100% rename from hotspot/test/compiler/c2/Test6863155.java rename to test/hotspot/jtreg/compiler/c2/Test6863155.java diff --git a/hotspot/test/compiler/c2/Test6866651.java b/test/hotspot/jtreg/compiler/c2/Test6866651.java similarity index 100% rename from hotspot/test/compiler/c2/Test6866651.java rename to test/hotspot/jtreg/compiler/c2/Test6866651.java diff --git a/hotspot/test/compiler/c2/Test6877254.java b/test/hotspot/jtreg/compiler/c2/Test6877254.java similarity index 100% rename from hotspot/test/compiler/c2/Test6877254.java rename to test/hotspot/jtreg/compiler/c2/Test6877254.java diff --git a/hotspot/test/compiler/c2/Test6880034.java b/test/hotspot/jtreg/compiler/c2/Test6880034.java similarity index 100% rename from hotspot/test/compiler/c2/Test6880034.java rename to test/hotspot/jtreg/compiler/c2/Test6880034.java diff --git a/hotspot/test/compiler/c2/Test6885584.java b/test/hotspot/jtreg/compiler/c2/Test6885584.java similarity index 100% rename from hotspot/test/compiler/c2/Test6885584.java rename to test/hotspot/jtreg/compiler/c2/Test6885584.java diff --git a/hotspot/test/compiler/c2/Test6897150.java b/test/hotspot/jtreg/compiler/c2/Test6897150.java similarity index 100% rename from hotspot/test/compiler/c2/Test6897150.java rename to test/hotspot/jtreg/compiler/c2/Test6897150.java diff --git a/hotspot/test/compiler/c2/Test6901572.java b/test/hotspot/jtreg/compiler/c2/Test6901572.java similarity index 100% rename from hotspot/test/compiler/c2/Test6901572.java rename to test/hotspot/jtreg/compiler/c2/Test6901572.java diff --git a/hotspot/test/compiler/c2/Test6905845.java b/test/hotspot/jtreg/compiler/c2/Test6905845.java similarity index 100% rename from hotspot/test/compiler/c2/Test6905845.java rename to test/hotspot/jtreg/compiler/c2/Test6905845.java diff --git a/hotspot/test/compiler/c2/Test6910484.java b/test/hotspot/jtreg/compiler/c2/Test6910484.java similarity index 100% rename from hotspot/test/compiler/c2/Test6910484.java rename to test/hotspot/jtreg/compiler/c2/Test6910484.java diff --git a/hotspot/test/compiler/c2/Test6910605_1.java b/test/hotspot/jtreg/compiler/c2/Test6910605_1.java similarity index 100% rename from hotspot/test/compiler/c2/Test6910605_1.java rename to test/hotspot/jtreg/compiler/c2/Test6910605_1.java diff --git a/hotspot/test/compiler/c2/Test6910605_2.java b/test/hotspot/jtreg/compiler/c2/Test6910605_2.java similarity index 100% rename from hotspot/test/compiler/c2/Test6910605_2.java rename to test/hotspot/jtreg/compiler/c2/Test6910605_2.java diff --git a/hotspot/test/compiler/c2/Test6912517.java b/test/hotspot/jtreg/compiler/c2/Test6912517.java similarity index 100% rename from hotspot/test/compiler/c2/Test6912517.java rename to test/hotspot/jtreg/compiler/c2/Test6912517.java diff --git a/hotspot/test/compiler/c2/Test6916644.java b/test/hotspot/jtreg/compiler/c2/Test6916644.java similarity index 100% rename from hotspot/test/compiler/c2/Test6916644.java rename to test/hotspot/jtreg/compiler/c2/Test6916644.java diff --git a/hotspot/test/compiler/c2/Test6930043.java b/test/hotspot/jtreg/compiler/c2/Test6930043.java similarity index 100% rename from hotspot/test/compiler/c2/Test6930043.java rename to test/hotspot/jtreg/compiler/c2/Test6930043.java diff --git a/hotspot/test/compiler/c2/Test6931567.java b/test/hotspot/jtreg/compiler/c2/Test6931567.java similarity index 100% rename from hotspot/test/compiler/c2/Test6931567.java rename to test/hotspot/jtreg/compiler/c2/Test6931567.java diff --git a/hotspot/test/compiler/c2/Test6935022.java b/test/hotspot/jtreg/compiler/c2/Test6935022.java similarity index 100% rename from hotspot/test/compiler/c2/Test6935022.java rename to test/hotspot/jtreg/compiler/c2/Test6935022.java diff --git a/hotspot/test/compiler/c2/Test6956668.java b/test/hotspot/jtreg/compiler/c2/Test6956668.java similarity index 100% rename from hotspot/test/compiler/c2/Test6956668.java rename to test/hotspot/jtreg/compiler/c2/Test6956668.java diff --git a/hotspot/test/compiler/c2/Test6958485.java b/test/hotspot/jtreg/compiler/c2/Test6958485.java similarity index 100% rename from hotspot/test/compiler/c2/Test6958485.java rename to test/hotspot/jtreg/compiler/c2/Test6958485.java diff --git a/hotspot/test/compiler/c2/Test6959129.java b/test/hotspot/jtreg/compiler/c2/Test6959129.java similarity index 100% rename from hotspot/test/compiler/c2/Test6959129.java rename to test/hotspot/jtreg/compiler/c2/Test6959129.java diff --git a/hotspot/test/compiler/c2/Test6968348.java b/test/hotspot/jtreg/compiler/c2/Test6968348.java similarity index 100% rename from hotspot/test/compiler/c2/Test6968348.java rename to test/hotspot/jtreg/compiler/c2/Test6968348.java diff --git a/hotspot/test/compiler/c2/Test6973329.java b/test/hotspot/jtreg/compiler/c2/Test6973329.java similarity index 100% rename from hotspot/test/compiler/c2/Test6973329.java rename to test/hotspot/jtreg/compiler/c2/Test6973329.java diff --git a/hotspot/test/compiler/c2/Test6985295.java b/test/hotspot/jtreg/compiler/c2/Test6985295.java similarity index 100% rename from hotspot/test/compiler/c2/Test6985295.java rename to test/hotspot/jtreg/compiler/c2/Test6985295.java diff --git a/hotspot/test/compiler/c2/Test6992759.java b/test/hotspot/jtreg/compiler/c2/Test6992759.java similarity index 100% rename from hotspot/test/compiler/c2/Test6992759.java rename to test/hotspot/jtreg/compiler/c2/Test6992759.java diff --git a/hotspot/test/compiler/c2/Test7002666.java b/test/hotspot/jtreg/compiler/c2/Test7002666.java similarity index 100% rename from hotspot/test/compiler/c2/Test7002666.java rename to test/hotspot/jtreg/compiler/c2/Test7002666.java diff --git a/hotspot/test/compiler/c2/Test7005594.java b/test/hotspot/jtreg/compiler/c2/Test7005594.java similarity index 100% rename from hotspot/test/compiler/c2/Test7005594.java rename to test/hotspot/jtreg/compiler/c2/Test7005594.java diff --git a/hotspot/test/compiler/c2/Test7009359.java b/test/hotspot/jtreg/compiler/c2/Test7009359.java similarity index 100% rename from hotspot/test/compiler/c2/Test7009359.java rename to test/hotspot/jtreg/compiler/c2/Test7009359.java diff --git a/hotspot/test/compiler/c2/Test7017746.java b/test/hotspot/jtreg/compiler/c2/Test7017746.java similarity index 100% rename from hotspot/test/compiler/c2/Test7017746.java rename to test/hotspot/jtreg/compiler/c2/Test7017746.java diff --git a/hotspot/test/compiler/c2/Test7020614.java b/test/hotspot/jtreg/compiler/c2/Test7020614.java similarity index 100% rename from hotspot/test/compiler/c2/Test7020614.java rename to test/hotspot/jtreg/compiler/c2/Test7020614.java diff --git a/hotspot/test/compiler/c2/Test7024475.java b/test/hotspot/jtreg/compiler/c2/Test7024475.java similarity index 100% rename from hotspot/test/compiler/c2/Test7024475.java rename to test/hotspot/jtreg/compiler/c2/Test7024475.java diff --git a/hotspot/test/compiler/c2/Test7029152.java b/test/hotspot/jtreg/compiler/c2/Test7029152.java similarity index 100% rename from hotspot/test/compiler/c2/Test7029152.java rename to test/hotspot/jtreg/compiler/c2/Test7029152.java diff --git a/hotspot/test/compiler/c2/Test7041100.java b/test/hotspot/jtreg/compiler/c2/Test7041100.java similarity index 100% rename from hotspot/test/compiler/c2/Test7041100.java rename to test/hotspot/jtreg/compiler/c2/Test7041100.java diff --git a/hotspot/test/compiler/c2/Test7046096.java b/test/hotspot/jtreg/compiler/c2/Test7046096.java similarity index 100% rename from hotspot/test/compiler/c2/Test7046096.java rename to test/hotspot/jtreg/compiler/c2/Test7046096.java diff --git a/hotspot/test/compiler/c2/Test7047069.java b/test/hotspot/jtreg/compiler/c2/Test7047069.java similarity index 100% rename from hotspot/test/compiler/c2/Test7047069.java rename to test/hotspot/jtreg/compiler/c2/Test7047069.java diff --git a/hotspot/test/compiler/c2/Test7048332.java b/test/hotspot/jtreg/compiler/c2/Test7048332.java similarity index 100% rename from hotspot/test/compiler/c2/Test7048332.java rename to test/hotspot/jtreg/compiler/c2/Test7048332.java diff --git a/hotspot/test/compiler/c2/Test7068051.java b/test/hotspot/jtreg/compiler/c2/Test7068051.java similarity index 100% rename from hotspot/test/compiler/c2/Test7068051.java rename to test/hotspot/jtreg/compiler/c2/Test7068051.java diff --git a/hotspot/test/compiler/c2/Test7110586.java b/test/hotspot/jtreg/compiler/c2/Test7110586.java similarity index 100% rename from hotspot/test/compiler/c2/Test7110586.java rename to test/hotspot/jtreg/compiler/c2/Test7110586.java diff --git a/hotspot/test/compiler/c2/Test7125879.java b/test/hotspot/jtreg/compiler/c2/Test7125879.java similarity index 100% rename from hotspot/test/compiler/c2/Test7125879.java rename to test/hotspot/jtreg/compiler/c2/Test7125879.java diff --git a/hotspot/test/compiler/c2/Test7160610.java b/test/hotspot/jtreg/compiler/c2/Test7160610.java similarity index 100% rename from hotspot/test/compiler/c2/Test7160610.java rename to test/hotspot/jtreg/compiler/c2/Test7160610.java diff --git a/hotspot/test/compiler/c2/Test7169782.java b/test/hotspot/jtreg/compiler/c2/Test7169782.java similarity index 100% rename from hotspot/test/compiler/c2/Test7169782.java rename to test/hotspot/jtreg/compiler/c2/Test7169782.java diff --git a/hotspot/test/compiler/c2/Test7174363.java b/test/hotspot/jtreg/compiler/c2/Test7174363.java similarity index 100% rename from hotspot/test/compiler/c2/Test7174363.java rename to test/hotspot/jtreg/compiler/c2/Test7174363.java diff --git a/hotspot/test/compiler/c2/Test7177917.java b/test/hotspot/jtreg/compiler/c2/Test7177917.java similarity index 100% rename from hotspot/test/compiler/c2/Test7177917.java rename to test/hotspot/jtreg/compiler/c2/Test7177917.java diff --git a/hotspot/test/compiler/c2/Test7179138_1.java b/test/hotspot/jtreg/compiler/c2/Test7179138_1.java similarity index 100% rename from hotspot/test/compiler/c2/Test7179138_1.java rename to test/hotspot/jtreg/compiler/c2/Test7179138_1.java diff --git a/hotspot/test/compiler/c2/Test7179138_2.java b/test/hotspot/jtreg/compiler/c2/Test7179138_2.java similarity index 100% rename from hotspot/test/compiler/c2/Test7179138_2.java rename to test/hotspot/jtreg/compiler/c2/Test7179138_2.java diff --git a/hotspot/test/compiler/c2/Test7190310.java b/test/hotspot/jtreg/compiler/c2/Test7190310.java similarity index 100% rename from hotspot/test/compiler/c2/Test7190310.java rename to test/hotspot/jtreg/compiler/c2/Test7190310.java diff --git a/hotspot/test/compiler/c2/Test7190310_unsafe.java b/test/hotspot/jtreg/compiler/c2/Test7190310_unsafe.java similarity index 100% rename from hotspot/test/compiler/c2/Test7190310_unsafe.java rename to test/hotspot/jtreg/compiler/c2/Test7190310_unsafe.java diff --git a/hotspot/test/compiler/c2/Test7199742.java b/test/hotspot/jtreg/compiler/c2/Test7199742.java similarity index 100% rename from hotspot/test/compiler/c2/Test7199742.java rename to test/hotspot/jtreg/compiler/c2/Test7199742.java diff --git a/hotspot/test/compiler/c2/Test8000805.java b/test/hotspot/jtreg/compiler/c2/Test8000805.java similarity index 100% rename from hotspot/test/compiler/c2/Test8000805.java rename to test/hotspot/jtreg/compiler/c2/Test8000805.java diff --git a/hotspot/test/compiler/c2/Test8002069.java b/test/hotspot/jtreg/compiler/c2/Test8002069.java similarity index 100% rename from hotspot/test/compiler/c2/Test8002069.java rename to test/hotspot/jtreg/compiler/c2/Test8002069.java diff --git a/hotspot/test/compiler/c2/Test8004741.java b/test/hotspot/jtreg/compiler/c2/Test8004741.java similarity index 100% rename from hotspot/test/compiler/c2/Test8004741.java rename to test/hotspot/jtreg/compiler/c2/Test8004741.java diff --git a/hotspot/test/compiler/c2/Test8007294.java b/test/hotspot/jtreg/compiler/c2/Test8007294.java similarity index 100% rename from hotspot/test/compiler/c2/Test8007294.java rename to test/hotspot/jtreg/compiler/c2/Test8007294.java diff --git a/hotspot/test/compiler/c2/Test8007722.java b/test/hotspot/jtreg/compiler/c2/Test8007722.java similarity index 100% rename from hotspot/test/compiler/c2/Test8007722.java rename to test/hotspot/jtreg/compiler/c2/Test8007722.java diff --git a/hotspot/test/compiler/c2/TestCharShortByteSwap.java b/test/hotspot/jtreg/compiler/c2/TestCharShortByteSwap.java similarity index 100% rename from hotspot/test/compiler/c2/TestCharShortByteSwap.java rename to test/hotspot/jtreg/compiler/c2/TestCharShortByteSwap.java diff --git a/hotspot/test/compiler/c2/TestDominatingDeadCheckCast.java b/test/hotspot/jtreg/compiler/c2/TestDominatingDeadCheckCast.java similarity index 100% rename from hotspot/test/compiler/c2/TestDominatingDeadCheckCast.java rename to test/hotspot/jtreg/compiler/c2/TestDominatingDeadCheckCast.java diff --git a/hotspot/test/compiler/c2/TestMultiplyLongHiZero.java b/test/hotspot/jtreg/compiler/c2/TestMultiplyLongHiZero.java similarity index 100% rename from hotspot/test/compiler/c2/TestMultiplyLongHiZero.java rename to test/hotspot/jtreg/compiler/c2/TestMultiplyLongHiZero.java diff --git a/hotspot/test/compiler/c2/TestNPEHeapBased.java b/test/hotspot/jtreg/compiler/c2/TestNPEHeapBased.java similarity index 100% rename from hotspot/test/compiler/c2/TestNPEHeapBased.java rename to test/hotspot/jtreg/compiler/c2/TestNPEHeapBased.java diff --git a/hotspot/test/compiler/c2/TestReplacedNodesOSR.java b/test/hotspot/jtreg/compiler/c2/TestReplacedNodesOSR.java similarity index 100% rename from hotspot/test/compiler/c2/TestReplacedNodesOSR.java rename to test/hotspot/jtreg/compiler/c2/TestReplacedNodesOSR.java diff --git a/hotspot/test/compiler/c2/cr6340864/TestByteVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestByteVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr6340864/TestByteVect.java rename to test/hotspot/jtreg/compiler/c2/cr6340864/TestByteVect.java diff --git a/hotspot/test/compiler/c2/cr6340864/TestDoubleVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestDoubleVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr6340864/TestDoubleVect.java rename to test/hotspot/jtreg/compiler/c2/cr6340864/TestDoubleVect.java diff --git a/hotspot/test/compiler/c2/cr6340864/TestFloatVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestFloatVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr6340864/TestFloatVect.java rename to test/hotspot/jtreg/compiler/c2/cr6340864/TestFloatVect.java diff --git a/hotspot/test/compiler/c2/cr6340864/TestIntVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestIntVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr6340864/TestIntVect.java rename to test/hotspot/jtreg/compiler/c2/cr6340864/TestIntVect.java diff --git a/hotspot/test/compiler/c2/cr6340864/TestLongVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestLongVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr6340864/TestLongVect.java rename to test/hotspot/jtreg/compiler/c2/cr6340864/TestLongVect.java diff --git a/hotspot/test/compiler/c2/cr6340864/TestShortVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestShortVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr6340864/TestShortVect.java rename to test/hotspot/jtreg/compiler/c2/cr6340864/TestShortVect.java diff --git a/hotspot/test/compiler/c2/cr6589834/InlinedArrayCloneTestCase.java b/test/hotspot/jtreg/compiler/c2/cr6589834/InlinedArrayCloneTestCase.java similarity index 100% rename from hotspot/test/compiler/c2/cr6589834/InlinedArrayCloneTestCase.java rename to test/hotspot/jtreg/compiler/c2/cr6589834/InlinedArrayCloneTestCase.java diff --git a/hotspot/test/compiler/c2/cr6589834/Test_ia32.java b/test/hotspot/jtreg/compiler/c2/cr6589834/Test_ia32.java similarity index 100% rename from hotspot/test/compiler/c2/cr6589834/Test_ia32.java rename to test/hotspot/jtreg/compiler/c2/cr6589834/Test_ia32.java diff --git a/hotspot/test/compiler/c2/cr6646020/Tester.java b/test/hotspot/jtreg/compiler/c2/cr6646020/Tester.java similarity index 100% rename from hotspot/test/compiler/c2/cr6646020/Tester.java rename to test/hotspot/jtreg/compiler/c2/cr6646020/Tester.java diff --git a/hotspot/test/compiler/c2/cr6663848/Tester.java b/test/hotspot/jtreg/compiler/c2/cr6663848/Tester.java similarity index 100% rename from hotspot/test/compiler/c2/cr6663848/Tester.java rename to test/hotspot/jtreg/compiler/c2/cr6663848/Tester.java diff --git a/hotspot/test/compiler/c2/cr6663854/Test6663854.java b/test/hotspot/jtreg/compiler/c2/cr6663854/Test6663854.java similarity index 100% rename from hotspot/test/compiler/c2/cr6663854/Test6663854.java rename to test/hotspot/jtreg/compiler/c2/cr6663854/Test6663854.java diff --git a/hotspot/test/compiler/c2/cr6711117/Test.java b/test/hotspot/jtreg/compiler/c2/cr6711117/Test.java similarity index 100% rename from hotspot/test/compiler/c2/cr6711117/Test.java rename to test/hotspot/jtreg/compiler/c2/cr6711117/Test.java diff --git a/hotspot/test/compiler/c2/cr6712835/Test6712835.java b/test/hotspot/jtreg/compiler/c2/cr6712835/Test6712835.java similarity index 100% rename from hotspot/test/compiler/c2/cr6712835/Test6712835.java rename to test/hotspot/jtreg/compiler/c2/cr6712835/Test6712835.java diff --git a/hotspot/test/compiler/c2/cr6714694/Tester.java b/test/hotspot/jtreg/compiler/c2/cr6714694/Tester.java similarity index 100% rename from hotspot/test/compiler/c2/cr6714694/Tester.java rename to test/hotspot/jtreg/compiler/c2/cr6714694/Tester.java diff --git a/hotspot/test/compiler/c2/cr6865031/Test.java b/test/hotspot/jtreg/compiler/c2/cr6865031/Test.java similarity index 100% rename from hotspot/test/compiler/c2/cr6865031/Test.java rename to test/hotspot/jtreg/compiler/c2/cr6865031/Test.java diff --git a/hotspot/test/compiler/c2/cr6890943/Test6890943.java b/test/hotspot/jtreg/compiler/c2/cr6890943/Test6890943.java similarity index 100% rename from hotspot/test/compiler/c2/cr6890943/Test6890943.java rename to test/hotspot/jtreg/compiler/c2/cr6890943/Test6890943.java diff --git a/hotspot/test/compiler/c2/cr6890943/input6890943.txt b/test/hotspot/jtreg/compiler/c2/cr6890943/input6890943.txt similarity index 100% rename from hotspot/test/compiler/c2/cr6890943/input6890943.txt rename to test/hotspot/jtreg/compiler/c2/cr6890943/input6890943.txt diff --git a/hotspot/test/compiler/c2/cr6890943/output6890943.txt b/test/hotspot/jtreg/compiler/c2/cr6890943/output6890943.txt similarity index 100% rename from hotspot/test/compiler/c2/cr6890943/output6890943.txt rename to test/hotspot/jtreg/compiler/c2/cr6890943/output6890943.txt diff --git a/hotspot/test/compiler/c2/cr7192963/TestByteVect.java b/test/hotspot/jtreg/compiler/c2/cr7192963/TestByteVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr7192963/TestByteVect.java rename to test/hotspot/jtreg/compiler/c2/cr7192963/TestByteVect.java diff --git a/hotspot/test/compiler/c2/cr7192963/TestDoubleVect.java b/test/hotspot/jtreg/compiler/c2/cr7192963/TestDoubleVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr7192963/TestDoubleVect.java rename to test/hotspot/jtreg/compiler/c2/cr7192963/TestDoubleVect.java diff --git a/hotspot/test/compiler/c2/cr7192963/TestFloatVect.java b/test/hotspot/jtreg/compiler/c2/cr7192963/TestFloatVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr7192963/TestFloatVect.java rename to test/hotspot/jtreg/compiler/c2/cr7192963/TestFloatVect.java diff --git a/hotspot/test/compiler/c2/cr7192963/TestIntVect.java b/test/hotspot/jtreg/compiler/c2/cr7192963/TestIntVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr7192963/TestIntVect.java rename to test/hotspot/jtreg/compiler/c2/cr7192963/TestIntVect.java diff --git a/hotspot/test/compiler/c2/cr7192963/TestLongVect.java b/test/hotspot/jtreg/compiler/c2/cr7192963/TestLongVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr7192963/TestLongVect.java rename to test/hotspot/jtreg/compiler/c2/cr7192963/TestLongVect.java diff --git a/hotspot/test/compiler/c2/cr7192963/TestShortVect.java b/test/hotspot/jtreg/compiler/c2/cr7192963/TestShortVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr7192963/TestShortVect.java rename to test/hotspot/jtreg/compiler/c2/cr7192963/TestShortVect.java diff --git a/hotspot/test/compiler/c2/cr7200264/TestDriver.java b/test/hotspot/jtreg/compiler/c2/cr7200264/TestDriver.java similarity index 100% rename from hotspot/test/compiler/c2/cr7200264/TestDriver.java rename to test/hotspot/jtreg/compiler/c2/cr7200264/TestDriver.java diff --git a/hotspot/test/compiler/c2/cr7200264/TestIntVect.java b/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr7200264/TestIntVect.java rename to test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java diff --git a/hotspot/test/compiler/c2/cr7200264/TestSSE2IntVect.java b/test/hotspot/jtreg/compiler/c2/cr7200264/TestSSE2IntVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr7200264/TestSSE2IntVect.java rename to test/hotspot/jtreg/compiler/c2/cr7200264/TestSSE2IntVect.java diff --git a/hotspot/test/compiler/c2/cr7200264/TestSSE4IntVect.java b/test/hotspot/jtreg/compiler/c2/cr7200264/TestSSE4IntVect.java similarity index 100% rename from hotspot/test/compiler/c2/cr7200264/TestSSE4IntVect.java rename to test/hotspot/jtreg/compiler/c2/cr7200264/TestSSE4IntVect.java diff --git a/hotspot/test/compiler/c2/cr8004867/TestIntAtomicCAS.java b/test/hotspot/jtreg/compiler/c2/cr8004867/TestIntAtomicCAS.java similarity index 100% rename from hotspot/test/compiler/c2/cr8004867/TestIntAtomicCAS.java rename to test/hotspot/jtreg/compiler/c2/cr8004867/TestIntAtomicCAS.java diff --git a/hotspot/test/compiler/c2/cr8004867/TestIntAtomicOrdered.java b/test/hotspot/jtreg/compiler/c2/cr8004867/TestIntAtomicOrdered.java similarity index 100% rename from hotspot/test/compiler/c2/cr8004867/TestIntAtomicOrdered.java rename to test/hotspot/jtreg/compiler/c2/cr8004867/TestIntAtomicOrdered.java diff --git a/hotspot/test/compiler/c2/cr8004867/TestIntAtomicVolatile.java b/test/hotspot/jtreg/compiler/c2/cr8004867/TestIntAtomicVolatile.java similarity index 100% rename from hotspot/test/compiler/c2/cr8004867/TestIntAtomicVolatile.java rename to test/hotspot/jtreg/compiler/c2/cr8004867/TestIntAtomicVolatile.java diff --git a/hotspot/test/compiler/c2/cr8004867/TestIntUnsafeCAS.java b/test/hotspot/jtreg/compiler/c2/cr8004867/TestIntUnsafeCAS.java similarity index 100% rename from hotspot/test/compiler/c2/cr8004867/TestIntUnsafeCAS.java rename to test/hotspot/jtreg/compiler/c2/cr8004867/TestIntUnsafeCAS.java diff --git a/hotspot/test/compiler/c2/cr8004867/TestIntUnsafeOrdered.java b/test/hotspot/jtreg/compiler/c2/cr8004867/TestIntUnsafeOrdered.java similarity index 100% rename from hotspot/test/compiler/c2/cr8004867/TestIntUnsafeOrdered.java rename to test/hotspot/jtreg/compiler/c2/cr8004867/TestIntUnsafeOrdered.java diff --git a/hotspot/test/compiler/c2/cr8004867/TestIntUnsafeVolatile.java b/test/hotspot/jtreg/compiler/c2/cr8004867/TestIntUnsafeVolatile.java similarity index 100% rename from hotspot/test/compiler/c2/cr8004867/TestIntUnsafeVolatile.java rename to test/hotspot/jtreg/compiler/c2/cr8004867/TestIntUnsafeVolatile.java diff --git a/hotspot/test/compiler/c2/stemmer/Stemmer.java b/test/hotspot/jtreg/compiler/c2/stemmer/Stemmer.java similarity index 100% rename from hotspot/test/compiler/c2/stemmer/Stemmer.java rename to test/hotspot/jtreg/compiler/c2/stemmer/Stemmer.java diff --git a/hotspot/test/compiler/c2/stemmer/words b/test/hotspot/jtreg/compiler/c2/stemmer/words similarity index 100% rename from hotspot/test/compiler/c2/stemmer/words rename to test/hotspot/jtreg/compiler/c2/stemmer/words diff --git a/hotspot/test/compiler/calls/TestDirtyInt.java b/test/hotspot/jtreg/compiler/calls/TestDirtyInt.java similarity index 100% rename from hotspot/test/compiler/calls/TestDirtyInt.java rename to test/hotspot/jtreg/compiler/calls/TestDirtyInt.java diff --git a/hotspot/test/compiler/calls/common/CallInterface.java b/test/hotspot/jtreg/compiler/calls/common/CallInterface.java similarity index 100% rename from hotspot/test/compiler/calls/common/CallInterface.java rename to test/hotspot/jtreg/compiler/calls/common/CallInterface.java diff --git a/hotspot/test/compiler/calls/common/CallsBase.java b/test/hotspot/jtreg/compiler/calls/common/CallsBase.java similarity index 100% rename from hotspot/test/compiler/calls/common/CallsBase.java rename to test/hotspot/jtreg/compiler/calls/common/CallsBase.java diff --git a/hotspot/test/compiler/calls/common/InvokeDynamic.java b/test/hotspot/jtreg/compiler/calls/common/InvokeDynamic.java similarity index 100% rename from hotspot/test/compiler/calls/common/InvokeDynamic.java rename to test/hotspot/jtreg/compiler/calls/common/InvokeDynamic.java diff --git a/hotspot/test/compiler/calls/common/InvokeDynamicPatcher.java b/test/hotspot/jtreg/compiler/calls/common/InvokeDynamicPatcher.java similarity index 100% rename from hotspot/test/compiler/calls/common/InvokeDynamicPatcher.java rename to test/hotspot/jtreg/compiler/calls/common/InvokeDynamicPatcher.java diff --git a/hotspot/test/compiler/calls/common/InvokeInterface.java b/test/hotspot/jtreg/compiler/calls/common/InvokeInterface.java similarity index 100% rename from hotspot/test/compiler/calls/common/InvokeInterface.java rename to test/hotspot/jtreg/compiler/calls/common/InvokeInterface.java diff --git a/hotspot/test/compiler/calls/common/InvokeSpecial.java b/test/hotspot/jtreg/compiler/calls/common/InvokeSpecial.java similarity index 100% rename from hotspot/test/compiler/calls/common/InvokeSpecial.java rename to test/hotspot/jtreg/compiler/calls/common/InvokeSpecial.java diff --git a/hotspot/test/compiler/calls/common/InvokeStatic.java b/test/hotspot/jtreg/compiler/calls/common/InvokeStatic.java similarity index 100% rename from hotspot/test/compiler/calls/common/InvokeStatic.java rename to test/hotspot/jtreg/compiler/calls/common/InvokeStatic.java diff --git a/hotspot/test/compiler/calls/common/InvokeVirtual.java b/test/hotspot/jtreg/compiler/calls/common/InvokeVirtual.java similarity index 100% rename from hotspot/test/compiler/calls/common/InvokeVirtual.java rename to test/hotspot/jtreg/compiler/calls/common/InvokeVirtual.java diff --git a/hotspot/test/compiler/calls/common/libCallsNative.c b/test/hotspot/jtreg/compiler/calls/common/libCallsNative.c similarity index 100% rename from hotspot/test/compiler/calls/common/libCallsNative.c rename to test/hotspot/jtreg/compiler/calls/common/libCallsNative.c diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeInterface2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeInterface2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeInterface2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeInterface2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeInterface2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeInterface2NativeTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeSpecial2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeSpecial2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeSpecial2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeSpecial2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeSpecial2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeSpecial2NativeTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeStatic2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeStatic2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeStatic2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeStatic2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeStatic2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeStatic2NativeTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeVirtual2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeVirtual2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeVirtual2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeVirtual2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeVirtual2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeVirtual2NativeTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeInterface2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeInterface2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeInterface2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeInterface2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeInterface2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeInterface2NativeTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2NativeTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeStatic2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeStatic2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeStatic2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeStatic2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeStatic2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeStatic2NativeTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2NativeTest.java diff --git a/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeSpecial2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeSpecial2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeSpecial2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeSpecial2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeSpecial2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeSpecial2NativeTest.java diff --git a/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeStatic2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeStatic2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeStatic2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeStatic2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeStatic2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeStatic2NativeTest.java diff --git a/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeVirtual2CompiledTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2CompiledTest.java rename to test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeVirtual2CompiledTest.java diff --git a/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeVirtual2InterpretedTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2InterpretedTest.java rename to test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeVirtual2InterpretedTest.java diff --git a/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeVirtual2NativeTest.java similarity index 100% rename from hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2NativeTest.java rename to test/hotspot/jtreg/compiler/calls/fromNative/NativeInvokeVirtual2NativeTest.java diff --git a/hotspot/test/compiler/calls/libTestDirtyInt.c b/test/hotspot/jtreg/compiler/calls/libTestDirtyInt.c similarity index 100% rename from hotspot/test/compiler/calls/libTestDirtyInt.c rename to test/hotspot/jtreg/compiler/calls/libTestDirtyInt.c diff --git a/hotspot/test/compiler/ciReplay/CiReplayBase.java b/test/hotspot/jtreg/compiler/ciReplay/CiReplayBase.java similarity index 100% rename from hotspot/test/compiler/ciReplay/CiReplayBase.java rename to test/hotspot/jtreg/compiler/ciReplay/CiReplayBase.java diff --git a/hotspot/test/compiler/ciReplay/SABase.java b/test/hotspot/jtreg/compiler/ciReplay/SABase.java similarity index 100% rename from hotspot/test/compiler/ciReplay/SABase.java rename to test/hotspot/jtreg/compiler/ciReplay/SABase.java diff --git a/hotspot/test/compiler/ciReplay/TestClientVM.java b/test/hotspot/jtreg/compiler/ciReplay/TestClientVM.java similarity index 100% rename from hotspot/test/compiler/ciReplay/TestClientVM.java rename to test/hotspot/jtreg/compiler/ciReplay/TestClientVM.java diff --git a/hotspot/test/compiler/ciReplay/TestSAClient.java b/test/hotspot/jtreg/compiler/ciReplay/TestSAClient.java similarity index 100% rename from hotspot/test/compiler/ciReplay/TestSAClient.java rename to test/hotspot/jtreg/compiler/ciReplay/TestSAClient.java diff --git a/hotspot/test/compiler/ciReplay/TestSAServer.java b/test/hotspot/jtreg/compiler/ciReplay/TestSAServer.java similarity index 100% rename from hotspot/test/compiler/ciReplay/TestSAServer.java rename to test/hotspot/jtreg/compiler/ciReplay/TestSAServer.java diff --git a/hotspot/test/compiler/ciReplay/TestServerVM.java b/test/hotspot/jtreg/compiler/ciReplay/TestServerVM.java similarity index 100% rename from hotspot/test/compiler/ciReplay/TestServerVM.java rename to test/hotspot/jtreg/compiler/ciReplay/TestServerVM.java diff --git a/hotspot/test/compiler/ciReplay/TestVMNoCompLevel.java b/test/hotspot/jtreg/compiler/ciReplay/TestVMNoCompLevel.java similarity index 100% rename from hotspot/test/compiler/ciReplay/TestVMNoCompLevel.java rename to test/hotspot/jtreg/compiler/ciReplay/TestVMNoCompLevel.java diff --git a/hotspot/test/compiler/ciReplay/VMBase.java b/test/hotspot/jtreg/compiler/ciReplay/VMBase.java similarity index 100% rename from hotspot/test/compiler/ciReplay/VMBase.java rename to test/hotspot/jtreg/compiler/ciReplay/VMBase.java diff --git a/hotspot/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java b/test/hotspot/jtreg/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java similarity index 100% rename from hotspot/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java rename to test/hotspot/jtreg/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java diff --git a/hotspot/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java b/test/hotspot/jtreg/compiler/classUnloading/methodUnloading/TestMethodUnloading.java similarity index 100% rename from hotspot/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java rename to test/hotspot/jtreg/compiler/classUnloading/methodUnloading/TestMethodUnloading.java diff --git a/hotspot/test/compiler/classUnloading/methodUnloading/WorkerClass.java b/test/hotspot/jtreg/compiler/classUnloading/methodUnloading/WorkerClass.java similarity index 100% rename from hotspot/test/compiler/classUnloading/methodUnloading/WorkerClass.java rename to test/hotspot/jtreg/compiler/classUnloading/methodUnloading/WorkerClass.java diff --git a/hotspot/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java b/test/hotspot/jtreg/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java similarity index 100% rename from hotspot/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java rename to test/hotspot/jtreg/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java diff --git a/hotspot/test/compiler/codecache/CheckSegmentedCodeCache.java b/test/hotspot/jtreg/compiler/codecache/CheckSegmentedCodeCache.java similarity index 100% rename from hotspot/test/compiler/codecache/CheckSegmentedCodeCache.java rename to test/hotspot/jtreg/compiler/codecache/CheckSegmentedCodeCache.java diff --git a/hotspot/test/compiler/codecache/CheckUpperLimit.java b/test/hotspot/jtreg/compiler/codecache/CheckUpperLimit.java similarity index 100% rename from hotspot/test/compiler/codecache/CheckUpperLimit.java rename to test/hotspot/jtreg/compiler/codecache/CheckUpperLimit.java diff --git a/hotspot/test/compiler/codecache/OverflowCodeCacheTest.java b/test/hotspot/jtreg/compiler/codecache/OverflowCodeCacheTest.java similarity index 100% rename from hotspot/test/compiler/codecache/OverflowCodeCacheTest.java rename to test/hotspot/jtreg/compiler/codecache/OverflowCodeCacheTest.java diff --git a/hotspot/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java b/test/hotspot/jtreg/compiler/codecache/cli/TestSegmentedCodeCacheOption.java similarity index 100% rename from hotspot/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java rename to test/hotspot/jtreg/compiler/codecache/cli/TestSegmentedCodeCacheOption.java diff --git a/hotspot/test/compiler/codecache/cli/codeheapsize/CodeCacheFreeSpaceRunner.java b/test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/CodeCacheFreeSpaceRunner.java similarity index 100% rename from hotspot/test/compiler/codecache/cli/codeheapsize/CodeCacheFreeSpaceRunner.java rename to test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/CodeCacheFreeSpaceRunner.java diff --git a/hotspot/test/compiler/codecache/cli/codeheapsize/GenericCodeHeapSizeRunner.java b/test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/GenericCodeHeapSizeRunner.java similarity index 100% rename from hotspot/test/compiler/codecache/cli/codeheapsize/GenericCodeHeapSizeRunner.java rename to test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/GenericCodeHeapSizeRunner.java diff --git a/hotspot/test/compiler/codecache/cli/codeheapsize/JVMStartupRunner.java b/test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/JVMStartupRunner.java similarity index 100% rename from hotspot/test/compiler/codecache/cli/codeheapsize/JVMStartupRunner.java rename to test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/JVMStartupRunner.java diff --git a/hotspot/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java b/test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java similarity index 100% rename from hotspot/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java rename to test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java diff --git a/hotspot/test/compiler/codecache/cli/common/CodeCacheCLITestBase.java b/test/hotspot/jtreg/compiler/codecache/cli/common/CodeCacheCLITestBase.java similarity index 100% rename from hotspot/test/compiler/codecache/cli/common/CodeCacheCLITestBase.java rename to test/hotspot/jtreg/compiler/codecache/cli/common/CodeCacheCLITestBase.java diff --git a/hotspot/test/compiler/codecache/cli/common/CodeCacheCLITestCase.java b/test/hotspot/jtreg/compiler/codecache/cli/common/CodeCacheCLITestCase.java similarity index 100% rename from hotspot/test/compiler/codecache/cli/common/CodeCacheCLITestCase.java rename to test/hotspot/jtreg/compiler/codecache/cli/common/CodeCacheCLITestCase.java diff --git a/hotspot/test/compiler/codecache/cli/common/CodeCacheInfoFormatter.java b/test/hotspot/jtreg/compiler/codecache/cli/common/CodeCacheInfoFormatter.java similarity index 100% rename from hotspot/test/compiler/codecache/cli/common/CodeCacheInfoFormatter.java rename to test/hotspot/jtreg/compiler/codecache/cli/common/CodeCacheInfoFormatter.java diff --git a/hotspot/test/compiler/codecache/cli/common/CodeCacheOptions.java b/test/hotspot/jtreg/compiler/codecache/cli/common/CodeCacheOptions.java similarity index 100% rename from hotspot/test/compiler/codecache/cli/common/CodeCacheOptions.java rename to test/hotspot/jtreg/compiler/codecache/cli/common/CodeCacheOptions.java diff --git a/hotspot/test/compiler/codecache/cli/printcodecache/PrintCodeCacheRunner.java b/test/hotspot/jtreg/compiler/codecache/cli/printcodecache/PrintCodeCacheRunner.java similarity index 100% rename from hotspot/test/compiler/codecache/cli/printcodecache/PrintCodeCacheRunner.java rename to test/hotspot/jtreg/compiler/codecache/cli/printcodecache/PrintCodeCacheRunner.java diff --git a/hotspot/test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java b/test/hotspot/jtreg/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java similarity index 100% rename from hotspot/test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java rename to test/hotspot/jtreg/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java diff --git a/hotspot/test/compiler/codecache/dtrace/DtraceResultsAnalyzer.java b/test/hotspot/jtreg/compiler/codecache/dtrace/DtraceResultsAnalyzer.java similarity index 100% rename from hotspot/test/compiler/codecache/dtrace/DtraceResultsAnalyzer.java rename to test/hotspot/jtreg/compiler/codecache/dtrace/DtraceResultsAnalyzer.java diff --git a/hotspot/test/compiler/codecache/dtrace/DtraceRunner.java b/test/hotspot/jtreg/compiler/codecache/dtrace/DtraceRunner.java similarity index 100% rename from hotspot/test/compiler/codecache/dtrace/DtraceRunner.java rename to test/hotspot/jtreg/compiler/codecache/dtrace/DtraceRunner.java diff --git a/hotspot/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java b/test/hotspot/jtreg/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java similarity index 100% rename from hotspot/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java rename to test/hotspot/jtreg/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java diff --git a/hotspot/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTestScript.d b/test/hotspot/jtreg/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTestScript.d similarity index 100% rename from hotspot/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTestScript.d rename to test/hotspot/jtreg/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTestScript.d diff --git a/hotspot/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTestWorker.java b/test/hotspot/jtreg/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTestWorker.java similarity index 100% rename from hotspot/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTestWorker.java rename to test/hotspot/jtreg/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTestWorker.java diff --git a/hotspot/test/compiler/codecache/jmx/BeanTypeTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/BeanTypeTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/BeanTypeTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/BeanTypeTest.java diff --git a/hotspot/test/compiler/codecache/jmx/CodeCacheUtils.java b/test/hotspot/jtreg/compiler/codecache/jmx/CodeCacheUtils.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/CodeCacheUtils.java rename to test/hotspot/jtreg/compiler/codecache/jmx/CodeCacheUtils.java diff --git a/hotspot/test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java diff --git a/hotspot/test/compiler/codecache/jmx/GetUsageTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/GetUsageTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/GetUsageTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/GetUsageTest.java diff --git a/hotspot/test/compiler/codecache/jmx/InitialAndMaxUsageTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/InitialAndMaxUsageTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/InitialAndMaxUsageTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/InitialAndMaxUsageTest.java diff --git a/hotspot/test/compiler/codecache/jmx/ManagerNamesTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/ManagerNamesTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/ManagerNamesTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/ManagerNamesTest.java diff --git a/hotspot/test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/MemoryPoolsPresenceTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/MemoryPoolsPresenceTest.java diff --git a/hotspot/test/compiler/codecache/jmx/PeakUsageTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/PeakUsageTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/PeakUsageTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/PeakUsageTest.java diff --git a/hotspot/test/compiler/codecache/jmx/PoolsIndependenceTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/PoolsIndependenceTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/PoolsIndependenceTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/PoolsIndependenceTest.java diff --git a/hotspot/test/compiler/codecache/jmx/ThresholdNotificationsTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/ThresholdNotificationsTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/ThresholdNotificationsTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/ThresholdNotificationsTest.java diff --git a/hotspot/test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java diff --git a/hotspot/test/compiler/codecache/jmx/UsageThresholdExceededTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/UsageThresholdExceededTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/UsageThresholdExceededTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/UsageThresholdExceededTest.java diff --git a/hotspot/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/UsageThresholdIncreasedTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/UsageThresholdIncreasedTest.java diff --git a/hotspot/test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java b/test/hotspot/jtreg/compiler/codecache/jmx/UsageThresholdNotExceededTest.java similarity index 100% rename from hotspot/test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java rename to test/hotspot/jtreg/compiler/codecache/jmx/UsageThresholdNotExceededTest.java diff --git a/hotspot/test/compiler/codecache/stress/CodeCacheStressRunner.java b/test/hotspot/jtreg/compiler/codecache/stress/CodeCacheStressRunner.java similarity index 100% rename from hotspot/test/compiler/codecache/stress/CodeCacheStressRunner.java rename to test/hotspot/jtreg/compiler/codecache/stress/CodeCacheStressRunner.java diff --git a/hotspot/test/compiler/codecache/stress/Helper.java b/test/hotspot/jtreg/compiler/codecache/stress/Helper.java similarity index 100% rename from hotspot/test/compiler/codecache/stress/Helper.java rename to test/hotspot/jtreg/compiler/codecache/stress/Helper.java diff --git a/hotspot/test/compiler/codecache/stress/OverloadCompileQueueTest.java b/test/hotspot/jtreg/compiler/codecache/stress/OverloadCompileQueueTest.java similarity index 100% rename from hotspot/test/compiler/codecache/stress/OverloadCompileQueueTest.java rename to test/hotspot/jtreg/compiler/codecache/stress/OverloadCompileQueueTest.java diff --git a/hotspot/test/compiler/codecache/stress/RandomAllocationTest.java b/test/hotspot/jtreg/compiler/codecache/stress/RandomAllocationTest.java similarity index 100% rename from hotspot/test/compiler/codecache/stress/RandomAllocationTest.java rename to test/hotspot/jtreg/compiler/codecache/stress/RandomAllocationTest.java diff --git a/hotspot/test/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java b/test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java similarity index 100% rename from hotspot/test/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java rename to test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java diff --git a/hotspot/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java b/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java similarity index 100% rename from hotspot/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java rename to test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java diff --git a/hotspot/test/compiler/codegen/BMI1.java b/test/hotspot/jtreg/compiler/codegen/BMI1.java similarity index 100% rename from hotspot/test/compiler/codegen/BMI1.java rename to test/hotspot/jtreg/compiler/codegen/BMI1.java diff --git a/hotspot/test/compiler/codegen/BitTests.java b/test/hotspot/jtreg/compiler/codegen/BitTests.java similarity index 100% rename from hotspot/test/compiler/codegen/BitTests.java rename to test/hotspot/jtreg/compiler/codegen/BitTests.java diff --git a/hotspot/test/compiler/codegen/C1NullCheckOfNullStore.java b/test/hotspot/jtreg/compiler/codegen/C1NullCheckOfNullStore.java similarity index 100% rename from hotspot/test/compiler/codegen/C1NullCheckOfNullStore.java rename to test/hotspot/jtreg/compiler/codegen/C1NullCheckOfNullStore.java diff --git a/hotspot/test/compiler/codegen/CRCTest.java b/test/hotspot/jtreg/compiler/codegen/CRCTest.java similarity index 100% rename from hotspot/test/compiler/codegen/CRCTest.java rename to test/hotspot/jtreg/compiler/codegen/CRCTest.java diff --git a/hotspot/test/compiler/codegen/IntRotateWithImmediate.java b/test/hotspot/jtreg/compiler/codegen/IntRotateWithImmediate.java similarity index 100% rename from hotspot/test/compiler/codegen/IntRotateWithImmediate.java rename to test/hotspot/jtreg/compiler/codegen/IntRotateWithImmediate.java diff --git a/hotspot/test/compiler/codegen/LoadWithMask.java b/test/hotspot/jtreg/compiler/codegen/LoadWithMask.java similarity index 100% rename from hotspot/test/compiler/codegen/LoadWithMask.java rename to test/hotspot/jtreg/compiler/codegen/LoadWithMask.java diff --git a/hotspot/test/compiler/codegen/LoadWithMask2.java b/test/hotspot/jtreg/compiler/codegen/LoadWithMask2.java similarity index 100% rename from hotspot/test/compiler/codegen/LoadWithMask2.java rename to test/hotspot/jtreg/compiler/codegen/LoadWithMask2.java diff --git a/hotspot/test/compiler/codegen/Test6378821.java b/test/hotspot/jtreg/compiler/codegen/Test6378821.java similarity index 100% rename from hotspot/test/compiler/codegen/Test6378821.java rename to test/hotspot/jtreg/compiler/codegen/Test6378821.java diff --git a/hotspot/test/compiler/codegen/Test6431242.java b/test/hotspot/jtreg/compiler/codegen/Test6431242.java similarity index 100% rename from hotspot/test/compiler/codegen/Test6431242.java rename to test/hotspot/jtreg/compiler/codegen/Test6431242.java diff --git a/hotspot/test/compiler/codegen/Test6797305.java b/test/hotspot/jtreg/compiler/codegen/Test6797305.java similarity index 100% rename from hotspot/test/compiler/codegen/Test6797305.java rename to test/hotspot/jtreg/compiler/codegen/Test6797305.java diff --git a/hotspot/test/compiler/codegen/Test6814842.java b/test/hotspot/jtreg/compiler/codegen/Test6814842.java similarity index 100% rename from hotspot/test/compiler/codegen/Test6814842.java rename to test/hotspot/jtreg/compiler/codegen/Test6814842.java diff --git a/hotspot/test/compiler/codegen/Test6823354.java b/test/hotspot/jtreg/compiler/codegen/Test6823354.java similarity index 100% rename from hotspot/test/compiler/codegen/Test6823354.java rename to test/hotspot/jtreg/compiler/codegen/Test6823354.java diff --git a/hotspot/test/compiler/codegen/Test6875866.java b/test/hotspot/jtreg/compiler/codegen/Test6875866.java similarity index 100% rename from hotspot/test/compiler/codegen/Test6875866.java rename to test/hotspot/jtreg/compiler/codegen/Test6875866.java diff --git a/hotspot/test/compiler/codegen/Test6879902.java b/test/hotspot/jtreg/compiler/codegen/Test6879902.java similarity index 100% rename from hotspot/test/compiler/codegen/Test6879902.java rename to test/hotspot/jtreg/compiler/codegen/Test6879902.java diff --git a/hotspot/test/compiler/codegen/Test6896617.java b/test/hotspot/jtreg/compiler/codegen/Test6896617.java similarity index 100% rename from hotspot/test/compiler/codegen/Test6896617.java rename to test/hotspot/jtreg/compiler/codegen/Test6896617.java diff --git a/hotspot/test/compiler/codegen/Test6909839.java b/test/hotspot/jtreg/compiler/codegen/Test6909839.java similarity index 100% rename from hotspot/test/compiler/codegen/Test6909839.java rename to test/hotspot/jtreg/compiler/codegen/Test6909839.java diff --git a/hotspot/test/compiler/codegen/Test6935535.java b/test/hotspot/jtreg/compiler/codegen/Test6935535.java similarity index 100% rename from hotspot/test/compiler/codegen/Test6935535.java rename to test/hotspot/jtreg/compiler/codegen/Test6935535.java diff --git a/hotspot/test/compiler/codegen/Test6942326.java b/test/hotspot/jtreg/compiler/codegen/Test6942326.java similarity index 100% rename from hotspot/test/compiler/codegen/Test6942326.java rename to test/hotspot/jtreg/compiler/codegen/Test6942326.java diff --git a/hotspot/test/compiler/codegen/Test7009231.java b/test/hotspot/jtreg/compiler/codegen/Test7009231.java similarity index 100% rename from hotspot/test/compiler/codegen/Test7009231.java rename to test/hotspot/jtreg/compiler/codegen/Test7009231.java diff --git a/hotspot/test/compiler/codegen/Test7100757.java b/test/hotspot/jtreg/compiler/codegen/Test7100757.java similarity index 100% rename from hotspot/test/compiler/codegen/Test7100757.java rename to test/hotspot/jtreg/compiler/codegen/Test7100757.java diff --git a/hotspot/test/compiler/codegen/Test8005033.java b/test/hotspot/jtreg/compiler/codegen/Test8005033.java similarity index 100% rename from hotspot/test/compiler/codegen/Test8005033.java rename to test/hotspot/jtreg/compiler/codegen/Test8005033.java diff --git a/hotspot/test/compiler/codegen/Test8011901.java b/test/hotspot/jtreg/compiler/codegen/Test8011901.java similarity index 100% rename from hotspot/test/compiler/codegen/Test8011901.java rename to test/hotspot/jtreg/compiler/codegen/Test8011901.java diff --git a/hotspot/test/compiler/codegen/TestBooleanVect.java b/test/hotspot/jtreg/compiler/codegen/TestBooleanVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestBooleanVect.java rename to test/hotspot/jtreg/compiler/codegen/TestBooleanVect.java diff --git a/hotspot/test/compiler/codegen/TestByteDoubleVect.java b/test/hotspot/jtreg/compiler/codegen/TestByteDoubleVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestByteDoubleVect.java rename to test/hotspot/jtreg/compiler/codegen/TestByteDoubleVect.java diff --git a/hotspot/test/compiler/codegen/TestByteFloatVect.java b/test/hotspot/jtreg/compiler/codegen/TestByteFloatVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestByteFloatVect.java rename to test/hotspot/jtreg/compiler/codegen/TestByteFloatVect.java diff --git a/hotspot/test/compiler/codegen/TestByteIntVect.java b/test/hotspot/jtreg/compiler/codegen/TestByteIntVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestByteIntVect.java rename to test/hotspot/jtreg/compiler/codegen/TestByteIntVect.java diff --git a/hotspot/test/compiler/codegen/TestByteLongVect.java b/test/hotspot/jtreg/compiler/codegen/TestByteLongVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestByteLongVect.java rename to test/hotspot/jtreg/compiler/codegen/TestByteLongVect.java diff --git a/hotspot/test/compiler/codegen/TestByteShortVect.java b/test/hotspot/jtreg/compiler/codegen/TestByteShortVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestByteShortVect.java rename to test/hotspot/jtreg/compiler/codegen/TestByteShortVect.java diff --git a/hotspot/test/compiler/codegen/TestByteVect.java b/test/hotspot/jtreg/compiler/codegen/TestByteVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestByteVect.java rename to test/hotspot/jtreg/compiler/codegen/TestByteVect.java diff --git a/hotspot/test/compiler/codegen/TestCharShortVect.java b/test/hotspot/jtreg/compiler/codegen/TestCharShortVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestCharShortVect.java rename to test/hotspot/jtreg/compiler/codegen/TestCharShortVect.java diff --git a/hotspot/test/compiler/codegen/TestCharVect.java b/test/hotspot/jtreg/compiler/codegen/TestCharVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestCharVect.java rename to test/hotspot/jtreg/compiler/codegen/TestCharVect.java diff --git a/hotspot/test/compiler/codegen/TestCharVect2.java b/test/hotspot/jtreg/compiler/codegen/TestCharVect2.java similarity index 100% rename from hotspot/test/compiler/codegen/TestCharVect2.java rename to test/hotspot/jtreg/compiler/codegen/TestCharVect2.java diff --git a/hotspot/test/compiler/codegen/TestDoubleVect.java b/test/hotspot/jtreg/compiler/codegen/TestDoubleVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestDoubleVect.java rename to test/hotspot/jtreg/compiler/codegen/TestDoubleVect.java diff --git a/hotspot/test/compiler/codegen/TestFloatDoubleVect.java b/test/hotspot/jtreg/compiler/codegen/TestFloatDoubleVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestFloatDoubleVect.java rename to test/hotspot/jtreg/compiler/codegen/TestFloatDoubleVect.java diff --git a/hotspot/test/compiler/codegen/TestFloatVect.java b/test/hotspot/jtreg/compiler/codegen/TestFloatVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestFloatVect.java rename to test/hotspot/jtreg/compiler/codegen/TestFloatVect.java diff --git a/hotspot/test/compiler/codegen/TestIntDoubleVect.java b/test/hotspot/jtreg/compiler/codegen/TestIntDoubleVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestIntDoubleVect.java rename to test/hotspot/jtreg/compiler/codegen/TestIntDoubleVect.java diff --git a/hotspot/test/compiler/codegen/TestIntFloatVect.java b/test/hotspot/jtreg/compiler/codegen/TestIntFloatVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestIntFloatVect.java rename to test/hotspot/jtreg/compiler/codegen/TestIntFloatVect.java diff --git a/hotspot/test/compiler/codegen/TestIntLongVect.java b/test/hotspot/jtreg/compiler/codegen/TestIntLongVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestIntLongVect.java rename to test/hotspot/jtreg/compiler/codegen/TestIntLongVect.java diff --git a/hotspot/test/compiler/codegen/TestIntVect.java b/test/hotspot/jtreg/compiler/codegen/TestIntVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestIntVect.java rename to test/hotspot/jtreg/compiler/codegen/TestIntVect.java diff --git a/hotspot/test/compiler/codegen/TestLongDoubleVect.java b/test/hotspot/jtreg/compiler/codegen/TestLongDoubleVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestLongDoubleVect.java rename to test/hotspot/jtreg/compiler/codegen/TestLongDoubleVect.java diff --git a/hotspot/test/compiler/codegen/TestLongFloatVect.java b/test/hotspot/jtreg/compiler/codegen/TestLongFloatVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestLongFloatVect.java rename to test/hotspot/jtreg/compiler/codegen/TestLongFloatVect.java diff --git a/hotspot/test/compiler/codegen/TestLongVect.java b/test/hotspot/jtreg/compiler/codegen/TestLongVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestLongVect.java rename to test/hotspot/jtreg/compiler/codegen/TestLongVect.java diff --git a/hotspot/test/compiler/codegen/TestShortDoubleVect.java b/test/hotspot/jtreg/compiler/codegen/TestShortDoubleVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestShortDoubleVect.java rename to test/hotspot/jtreg/compiler/codegen/TestShortDoubleVect.java diff --git a/hotspot/test/compiler/codegen/TestShortFloatVect.java b/test/hotspot/jtreg/compiler/codegen/TestShortFloatVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestShortFloatVect.java rename to test/hotspot/jtreg/compiler/codegen/TestShortFloatVect.java diff --git a/hotspot/test/compiler/codegen/TestShortIntVect.java b/test/hotspot/jtreg/compiler/codegen/TestShortIntVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestShortIntVect.java rename to test/hotspot/jtreg/compiler/codegen/TestShortIntVect.java diff --git a/hotspot/test/compiler/codegen/TestShortLongVect.java b/test/hotspot/jtreg/compiler/codegen/TestShortLongVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestShortLongVect.java rename to test/hotspot/jtreg/compiler/codegen/TestShortLongVect.java diff --git a/hotspot/test/compiler/codegen/TestShortVect.java b/test/hotspot/jtreg/compiler/codegen/TestShortVect.java similarity index 100% rename from hotspot/test/compiler/codegen/TestShortVect.java rename to test/hotspot/jtreg/compiler/codegen/TestShortVect.java diff --git a/hotspot/test/compiler/codegen/aes/TestAESBase.java b/test/hotspot/jtreg/compiler/codegen/aes/TestAESBase.java similarity index 100% rename from hotspot/test/compiler/codegen/aes/TestAESBase.java rename to test/hotspot/jtreg/compiler/codegen/aes/TestAESBase.java diff --git a/hotspot/test/compiler/codegen/aes/TestAESDecode.java b/test/hotspot/jtreg/compiler/codegen/aes/TestAESDecode.java similarity index 100% rename from hotspot/test/compiler/codegen/aes/TestAESDecode.java rename to test/hotspot/jtreg/compiler/codegen/aes/TestAESDecode.java diff --git a/hotspot/test/compiler/codegen/aes/TestAESEncode.java b/test/hotspot/jtreg/compiler/codegen/aes/TestAESEncode.java similarity index 100% rename from hotspot/test/compiler/codegen/aes/TestAESEncode.java rename to test/hotspot/jtreg/compiler/codegen/aes/TestAESEncode.java diff --git a/hotspot/test/compiler/codegen/aes/TestAESMain.java b/test/hotspot/jtreg/compiler/codegen/aes/TestAESMain.java similarity index 100% rename from hotspot/test/compiler/codegen/aes/TestAESMain.java rename to test/hotspot/jtreg/compiler/codegen/aes/TestAESMain.java diff --git a/hotspot/test/compiler/compilercontrol/InlineMatcherTest.java b/test/hotspot/jtreg/compiler/compilercontrol/InlineMatcherTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/InlineMatcherTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/InlineMatcherTest.java diff --git a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java b/test/hotspot/jtreg/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java rename to test/hotspot/jtreg/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java diff --git a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java b/test/hotspot/jtreg/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java rename to test/hotspot/jtreg/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java diff --git a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java b/test/hotspot/jtreg/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java rename to test/hotspot/jtreg/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java diff --git a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java b/test/hotspot/jtreg/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java rename to test/hotspot/jtreg/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java diff --git a/hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commandfile/CompileOnlyTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/commandfile/CompileOnlyTest.java diff --git a/hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commandfile/ExcludeTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/commandfile/ExcludeTest.java diff --git a/hotspot/test/compiler/compilercontrol/commandfile/LogTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commandfile/LogTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/commandfile/LogTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/commandfile/LogTest.java diff --git a/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commandfile/PrintTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/commandfile/PrintTest.java diff --git a/hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commands/CompileOnlyTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/commands/CompileOnlyTest.java diff --git a/hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commands/ExcludeTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/commands/ExcludeTest.java diff --git a/hotspot/test/compiler/compilercontrol/commands/LogTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commands/LogTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/commands/LogTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/commands/LogTest.java diff --git a/hotspot/test/compiler/compilercontrol/commands/PrintTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commands/PrintTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/commands/PrintTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/commands/PrintTest.java diff --git a/hotspot/test/compiler/compilercontrol/control_off.txt b/test/hotspot/jtreg/compiler/compilercontrol/control_off.txt similarity index 100% rename from hotspot/test/compiler/compilercontrol/control_off.txt rename to test/hotspot/jtreg/compiler/compilercontrol/control_off.txt diff --git a/hotspot/test/compiler/compilercontrol/control_on.txt b/test/hotspot/jtreg/compiler/compilercontrol/control_on.txt similarity index 100% rename from hotspot/test/compiler/compilercontrol/control_on.txt rename to test/hotspot/jtreg/compiler/compilercontrol/control_on.txt diff --git a/hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java b/test/hotspot/jtreg/compiler/compilercontrol/directives/CompileOnlyTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/directives/CompileOnlyTest.java diff --git a/hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java b/test/hotspot/jtreg/compiler/compilercontrol/directives/ExcludeTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/directives/ExcludeTest.java diff --git a/hotspot/test/compiler/compilercontrol/directives/LogTest.java b/test/hotspot/jtreg/compiler/compilercontrol/directives/LogTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/directives/LogTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/directives/LogTest.java diff --git a/hotspot/test/compiler/compilercontrol/directives/PrintTest.java b/test/hotspot/jtreg/compiler/compilercontrol/directives/PrintTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/directives/PrintTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/directives/PrintTest.java diff --git a/hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java b/test/hotspot/jtreg/compiler/compilercontrol/jcmd/AddAndRemoveTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/jcmd/AddAndRemoveTest.java diff --git a/hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java b/test/hotspot/jtreg/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java diff --git a/hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java b/test/hotspot/jtreg/compiler/compilercontrol/jcmd/AddExcludeTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/jcmd/AddExcludeTest.java diff --git a/hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java b/test/hotspot/jtreg/compiler/compilercontrol/jcmd/AddLogTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/jcmd/AddLogTest.java diff --git a/hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java b/test/hotspot/jtreg/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java diff --git a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java b/test/hotspot/jtreg/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java diff --git a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java b/test/hotspot/jtreg/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java diff --git a/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java b/test/hotspot/jtreg/compiler/compilercontrol/jcmd/PrintDirectivesTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/jcmd/PrintDirectivesTest.java diff --git a/hotspot/test/compiler/compilercontrol/jcmd/StressAddJcmdBase.java b/test/hotspot/jtreg/compiler/compilercontrol/jcmd/StressAddJcmdBase.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/jcmd/StressAddJcmdBase.java rename to test/hotspot/jtreg/compiler/compilercontrol/jcmd/StressAddJcmdBase.java diff --git a/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java b/test/hotspot/jtreg/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java diff --git a/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java b/test/hotspot/jtreg/compiler/compilercontrol/logcompilation/LogTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/logcompilation/LogTest.java diff --git a/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java b/test/hotspot/jtreg/compiler/compilercontrol/matcher/MethodMatcherTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/matcher/MethodMatcherTest.java diff --git a/hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java b/test/hotspot/jtreg/compiler/compilercontrol/mixed/RandomCommandsTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/mixed/RandomCommandsTest.java diff --git a/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java b/test/hotspot/jtreg/compiler/compilercontrol/mixed/RandomValidCommandsTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/mixed/RandomValidCommandsTest.java diff --git a/hotspot/test/compiler/compilercontrol/parser/DirectiveParserTest.java b/test/hotspot/jtreg/compiler/compilercontrol/parser/DirectiveParserTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/parser/DirectiveParserTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/parser/DirectiveParserTest.java diff --git a/hotspot/test/compiler/compilercontrol/parser/DirectiveStressTest.java b/test/hotspot/jtreg/compiler/compilercontrol/parser/DirectiveStressTest.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/parser/DirectiveStressTest.java rename to test/hotspot/jtreg/compiler/compilercontrol/parser/DirectiveStressTest.java diff --git a/hotspot/test/compiler/compilercontrol/parser/HugeDirectiveUtil.java b/test/hotspot/jtreg/compiler/compilercontrol/parser/HugeDirectiveUtil.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/parser/HugeDirectiveUtil.java rename to test/hotspot/jtreg/compiler/compilercontrol/parser/HugeDirectiveUtil.java diff --git a/hotspot/test/compiler/compilercontrol/share/AbstractTestBase.java b/test/hotspot/jtreg/compiler/compilercontrol/share/AbstractTestBase.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/AbstractTestBase.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/AbstractTestBase.java diff --git a/hotspot/test/compiler/compilercontrol/share/JSONFile.java b/test/hotspot/jtreg/compiler/compilercontrol/share/JSONFile.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/JSONFile.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/JSONFile.java diff --git a/hotspot/test/compiler/compilercontrol/share/MultiCommand.java b/test/hotspot/jtreg/compiler/compilercontrol/share/MultiCommand.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/MultiCommand.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/MultiCommand.java diff --git a/hotspot/test/compiler/compilercontrol/share/SingleCommand.java b/test/hotspot/jtreg/compiler/compilercontrol/share/SingleCommand.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/SingleCommand.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/SingleCommand.java diff --git a/hotspot/test/compiler/compilercontrol/share/actions/BaseAction.java b/test/hotspot/jtreg/compiler/compilercontrol/share/actions/BaseAction.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/actions/BaseAction.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/actions/BaseAction.java diff --git a/hotspot/test/compiler/compilercontrol/share/actions/CompileAction.java b/test/hotspot/jtreg/compiler/compilercontrol/share/actions/CompileAction.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/actions/CompileAction.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/actions/CompileAction.java diff --git a/hotspot/test/compiler/compilercontrol/share/method/ClassType.java b/test/hotspot/jtreg/compiler/compilercontrol/share/method/ClassType.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/method/ClassType.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/method/ClassType.java diff --git a/hotspot/test/compiler/compilercontrol/share/method/MethodDescriptor.java b/test/hotspot/jtreg/compiler/compilercontrol/share/method/MethodDescriptor.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/method/MethodDescriptor.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/method/MethodDescriptor.java diff --git a/hotspot/test/compiler/compilercontrol/share/method/MethodElementType.java b/test/hotspot/jtreg/compiler/compilercontrol/share/method/MethodElementType.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/method/MethodElementType.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/method/MethodElementType.java diff --git a/hotspot/test/compiler/compilercontrol/share/method/MethodGenerator.java b/test/hotspot/jtreg/compiler/compilercontrol/share/method/MethodGenerator.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/method/MethodGenerator.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/method/MethodGenerator.java diff --git a/hotspot/test/compiler/compilercontrol/share/method/MethodType.java b/test/hotspot/jtreg/compiler/compilercontrol/share/method/MethodType.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/method/MethodType.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/method/MethodType.java diff --git a/hotspot/test/compiler/compilercontrol/share/method/SignatureType.java b/test/hotspot/jtreg/compiler/compilercontrol/share/method/SignatureType.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/method/SignatureType.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/method/SignatureType.java diff --git a/hotspot/test/compiler/compilercontrol/share/pool/MethodHolder.java b/test/hotspot/jtreg/compiler/compilercontrol/share/pool/MethodHolder.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/pool/MethodHolder.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/pool/MethodHolder.java diff --git a/hotspot/test/compiler/compilercontrol/share/pool/PoolHelper.java b/test/hotspot/jtreg/compiler/compilercontrol/share/pool/PoolHelper.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/pool/PoolHelper.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/pool/PoolHelper.java diff --git a/hotspot/test/compiler/compilercontrol/share/pool/SubMethodHolder.java b/test/hotspot/jtreg/compiler/compilercontrol/share/pool/SubMethodHolder.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/pool/SubMethodHolder.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/pool/SubMethodHolder.java diff --git a/hotspot/test/compiler/compilercontrol/share/pool/sub/Klass.java b/test/hotspot/jtreg/compiler/compilercontrol/share/pool/sub/Klass.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/pool/sub/Klass.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/pool/sub/Klass.java diff --git a/hotspot/test/compiler/compilercontrol/share/pool/sub/KlassDup.java b/test/hotspot/jtreg/compiler/compilercontrol/share/pool/sub/KlassDup.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/pool/sub/KlassDup.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/pool/sub/KlassDup.java diff --git a/hotspot/test/compiler/compilercontrol/share/pool/subpack/Klass.java b/test/hotspot/jtreg/compiler/compilercontrol/share/pool/subpack/Klass.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/pool/subpack/Klass.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/pool/subpack/Klass.java diff --git a/hotspot/test/compiler/compilercontrol/share/pool/subpack/KlassDup.java b/test/hotspot/jtreg/compiler/compilercontrol/share/pool/subpack/KlassDup.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/pool/subpack/KlassDup.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/pool/subpack/KlassDup.java diff --git a/hotspot/test/compiler/compilercontrol/share/processors/CommandProcessor.java b/test/hotspot/jtreg/compiler/compilercontrol/share/processors/CommandProcessor.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/processors/CommandProcessor.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/processors/CommandProcessor.java diff --git a/hotspot/test/compiler/compilercontrol/share/processors/LogProcessor.java b/test/hotspot/jtreg/compiler/compilercontrol/share/processors/LogProcessor.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/processors/LogProcessor.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/processors/LogProcessor.java diff --git a/hotspot/test/compiler/compilercontrol/share/processors/PrintDirectivesProcessor.java b/test/hotspot/jtreg/compiler/compilercontrol/share/processors/PrintDirectivesProcessor.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/processors/PrintDirectivesProcessor.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/processors/PrintDirectivesProcessor.java diff --git a/hotspot/test/compiler/compilercontrol/share/processors/PrintProcessor.java b/test/hotspot/jtreg/compiler/compilercontrol/share/processors/PrintProcessor.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/processors/PrintProcessor.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/processors/PrintProcessor.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/AbstractCommandBuilder.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/AbstractCommandBuilder.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/AbstractCommandBuilder.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/AbstractCommandBuilder.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/Command.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Command.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/Command.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Command.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/CommandFileBuilder.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/CommandFileBuilder.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/CommandFileBuilder.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/CommandFileBuilder.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/CommandGenerator.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/CommandGenerator.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/CommandGenerator.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/CommandGenerator.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/CommandOptionsBuilder.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/CommandOptionsBuilder.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/CommandOptionsBuilder.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/CommandOptionsBuilder.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/CompileCommand.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/CompileCommand.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/CompileCommand.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/CompileCommand.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/DirectiveBuilder.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/DirectiveBuilder.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/DirectiveBuilder.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/DirectiveBuilder.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/DirectiveWriter.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/DirectiveWriter.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/DirectiveWriter.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/DirectiveWriter.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/Executor.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Executor.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/Executor.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Executor.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/JcmdCommand.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/JcmdCommand.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/JcmdCommand.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/JcmdCommand.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/JcmdStateBuilder.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/JcmdStateBuilder.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/JcmdStateBuilder.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/JcmdStateBuilder.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/Scenario.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Scenario.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/Scenario.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Scenario.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/State.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/State.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/State.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/State.java diff --git a/hotspot/test/compiler/compilercontrol/share/scenario/StateBuilder.java b/test/hotspot/jtreg/compiler/compilercontrol/share/scenario/StateBuilder.java similarity index 100% rename from hotspot/test/compiler/compilercontrol/share/scenario/StateBuilder.java rename to test/hotspot/jtreg/compiler/compilercontrol/share/scenario/StateBuilder.java diff --git a/hotspot/test/compiler/controldependency/TestEliminatedCastPPAtPhi.java b/test/hotspot/jtreg/compiler/controldependency/TestEliminatedCastPPAtPhi.java similarity index 100% rename from hotspot/test/compiler/controldependency/TestEliminatedCastPPAtPhi.java rename to test/hotspot/jtreg/compiler/controldependency/TestEliminatedCastPPAtPhi.java diff --git a/hotspot/test/compiler/cpuflags/AESIntrinsicsBase.java b/test/hotspot/jtreg/compiler/cpuflags/AESIntrinsicsBase.java similarity index 100% rename from hotspot/test/compiler/cpuflags/AESIntrinsicsBase.java rename to test/hotspot/jtreg/compiler/cpuflags/AESIntrinsicsBase.java diff --git a/hotspot/test/compiler/cpuflags/RestoreMXCSR.java b/test/hotspot/jtreg/compiler/cpuflags/RestoreMXCSR.java similarity index 100% rename from hotspot/test/compiler/cpuflags/RestoreMXCSR.java rename to test/hotspot/jtreg/compiler/cpuflags/RestoreMXCSR.java diff --git a/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java similarity index 100% rename from hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java rename to test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java diff --git a/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java similarity index 100% rename from hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java rename to test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java diff --git a/hotspot/test/compiler/cpuflags/TestSSE4Disabled.java b/test/hotspot/jtreg/compiler/cpuflags/TestSSE4Disabled.java similarity index 100% rename from hotspot/test/compiler/cpuflags/TestSSE4Disabled.java rename to test/hotspot/jtreg/compiler/cpuflags/TestSSE4Disabled.java diff --git a/hotspot/test/compiler/debug/TraceIterativeGVN.java b/test/hotspot/jtreg/compiler/debug/TraceIterativeGVN.java similarity index 100% rename from hotspot/test/compiler/debug/TraceIterativeGVN.java rename to test/hotspot/jtreg/compiler/debug/TraceIterativeGVN.java diff --git a/hotspot/test/compiler/debug/VerifyAdapterSharing.java b/test/hotspot/jtreg/compiler/debug/VerifyAdapterSharing.java similarity index 100% rename from hotspot/test/compiler/debug/VerifyAdapterSharing.java rename to test/hotspot/jtreg/compiler/debug/VerifyAdapterSharing.java diff --git a/hotspot/test/compiler/dependencies/MonomorphicObjectCall/TestMonomorphicObjectCall.java b/test/hotspot/jtreg/compiler/dependencies/MonomorphicObjectCall/TestMonomorphicObjectCall.java similarity index 100% rename from hotspot/test/compiler/dependencies/MonomorphicObjectCall/TestMonomorphicObjectCall.java rename to test/hotspot/jtreg/compiler/dependencies/MonomorphicObjectCall/TestMonomorphicObjectCall.java diff --git a/hotspot/test/compiler/dependencies/MonomorphicObjectCall/java.base/java/lang/Object.java b/test/hotspot/jtreg/compiler/dependencies/MonomorphicObjectCall/java.base/java/lang/Object.java similarity index 100% rename from hotspot/test/compiler/dependencies/MonomorphicObjectCall/java.base/java/lang/Object.java rename to test/hotspot/jtreg/compiler/dependencies/MonomorphicObjectCall/java.base/java/lang/Object.java diff --git a/hotspot/test/compiler/eliminateAutobox/TestByteBoxing.java b/test/hotspot/jtreg/compiler/eliminateAutobox/TestByteBoxing.java similarity index 100% rename from hotspot/test/compiler/eliminateAutobox/TestByteBoxing.java rename to test/hotspot/jtreg/compiler/eliminateAutobox/TestByteBoxing.java diff --git a/hotspot/test/compiler/eliminateAutobox/TestDoubleBoxing.java b/test/hotspot/jtreg/compiler/eliminateAutobox/TestDoubleBoxing.java similarity index 100% rename from hotspot/test/compiler/eliminateAutobox/TestDoubleBoxing.java rename to test/hotspot/jtreg/compiler/eliminateAutobox/TestDoubleBoxing.java diff --git a/hotspot/test/compiler/eliminateAutobox/TestFloatBoxing.java b/test/hotspot/jtreg/compiler/eliminateAutobox/TestFloatBoxing.java similarity index 100% rename from hotspot/test/compiler/eliminateAutobox/TestFloatBoxing.java rename to test/hotspot/jtreg/compiler/eliminateAutobox/TestFloatBoxing.java diff --git a/hotspot/test/compiler/eliminateAutobox/TestIntBoxing.java b/test/hotspot/jtreg/compiler/eliminateAutobox/TestIntBoxing.java similarity index 100% rename from hotspot/test/compiler/eliminateAutobox/TestIntBoxing.java rename to test/hotspot/jtreg/compiler/eliminateAutobox/TestIntBoxing.java diff --git a/hotspot/test/compiler/eliminateAutobox/TestLongBoxing.java b/test/hotspot/jtreg/compiler/eliminateAutobox/TestLongBoxing.java similarity index 100% rename from hotspot/test/compiler/eliminateAutobox/TestLongBoxing.java rename to test/hotspot/jtreg/compiler/eliminateAutobox/TestLongBoxing.java diff --git a/hotspot/test/compiler/eliminateAutobox/TestShortBoxing.java b/test/hotspot/jtreg/compiler/eliminateAutobox/TestShortBoxing.java similarity index 100% rename from hotspot/test/compiler/eliminateAutobox/TestShortBoxing.java rename to test/hotspot/jtreg/compiler/eliminateAutobox/TestShortBoxing.java diff --git a/hotspot/test/compiler/eliminateAutobox/UnsignedLoads.java b/test/hotspot/jtreg/compiler/eliminateAutobox/UnsignedLoads.java similarity index 100% rename from hotspot/test/compiler/eliminateAutobox/UnsignedLoads.java rename to test/hotspot/jtreg/compiler/eliminateAutobox/UnsignedLoads.java diff --git a/hotspot/test/compiler/escapeAnalysis/Test6689060.java b/test/hotspot/jtreg/compiler/escapeAnalysis/Test6689060.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/Test6689060.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/Test6689060.java diff --git a/hotspot/test/compiler/escapeAnalysis/Test6726999.java b/test/hotspot/jtreg/compiler/escapeAnalysis/Test6726999.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/Test6726999.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/Test6726999.java diff --git a/hotspot/test/compiler/escapeAnalysis/Test6775880.java b/test/hotspot/jtreg/compiler/escapeAnalysis/Test6775880.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/Test6775880.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/Test6775880.java diff --git a/hotspot/test/compiler/escapeAnalysis/Test6895383.java b/test/hotspot/jtreg/compiler/escapeAnalysis/Test6895383.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/Test6895383.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/Test6895383.java diff --git a/hotspot/test/compiler/escapeAnalysis/Test6896727.java b/test/hotspot/jtreg/compiler/escapeAnalysis/Test6896727.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/Test6896727.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/Test6896727.java diff --git a/hotspot/test/compiler/escapeAnalysis/Test8020215.java b/test/hotspot/jtreg/compiler/escapeAnalysis/Test8020215.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/Test8020215.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/Test8020215.java diff --git a/hotspot/test/compiler/escapeAnalysis/TestAllocatedEscapesPtrComparison.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestAllocatedEscapesPtrComparison.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/TestAllocatedEscapesPtrComparison.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/TestAllocatedEscapesPtrComparison.java diff --git a/hotspot/test/compiler/escapeAnalysis/TestArrayCopy.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestArrayCopy.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/TestArrayCopy.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/TestArrayCopy.java diff --git a/hotspot/test/compiler/escapeAnalysis/TestEABadMergeMem.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestEABadMergeMem.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/TestEABadMergeMem.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/TestEABadMergeMem.java diff --git a/hotspot/test/compiler/escapeAnalysis/TestEscapeThroughInvoke.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestEscapeThroughInvoke.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/TestEscapeThroughInvoke.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/TestEscapeThroughInvoke.java diff --git a/hotspot/test/compiler/escapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java diff --git a/hotspot/test/compiler/escapeAnalysis/cr6716441/Tester.java b/test/hotspot/jtreg/compiler/escapeAnalysis/cr6716441/Tester.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/cr6716441/Tester.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/cr6716441/Tester.java diff --git a/hotspot/test/compiler/escapeAnalysis/cr6795161/Test.java b/test/hotspot/jtreg/compiler/escapeAnalysis/cr6795161/Test.java similarity index 100% rename from hotspot/test/compiler/escapeAnalysis/cr6795161/Test.java rename to test/hotspot/jtreg/compiler/escapeAnalysis/cr6795161/Test.java diff --git a/hotspot/test/compiler/exceptions/CatchInlineExceptions.java b/test/hotspot/jtreg/compiler/exceptions/CatchInlineExceptions.java similarity index 100% rename from hotspot/test/compiler/exceptions/CatchInlineExceptions.java rename to test/hotspot/jtreg/compiler/exceptions/CatchInlineExceptions.java diff --git a/hotspot/test/compiler/exceptions/SumTest.java b/test/hotspot/jtreg/compiler/exceptions/SumTest.java similarity index 100% rename from hotspot/test/compiler/exceptions/SumTest.java rename to test/hotspot/jtreg/compiler/exceptions/SumTest.java diff --git a/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java b/test/hotspot/jtreg/compiler/exceptions/TestRecursiveReplacedException.java similarity index 100% rename from hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java rename to test/hotspot/jtreg/compiler/exceptions/TestRecursiveReplacedException.java diff --git a/hotspot/test/compiler/floatingpoint/ModNaN.java b/test/hotspot/jtreg/compiler/floatingpoint/ModNaN.java similarity index 100% rename from hotspot/test/compiler/floatingpoint/ModNaN.java rename to test/hotspot/jtreg/compiler/floatingpoint/ModNaN.java diff --git a/hotspot/test/compiler/floatingpoint/NaNTest.java b/test/hotspot/jtreg/compiler/floatingpoint/NaNTest.java similarity index 100% rename from hotspot/test/compiler/floatingpoint/NaNTest.java rename to test/hotspot/jtreg/compiler/floatingpoint/NaNTest.java diff --git a/hotspot/test/compiler/floatingpoint/TestFMA.java b/test/hotspot/jtreg/compiler/floatingpoint/TestFMA.java similarity index 100% rename from hotspot/test/compiler/floatingpoint/TestFMA.java rename to test/hotspot/jtreg/compiler/floatingpoint/TestFMA.java diff --git a/hotspot/test/compiler/floatingpoint/TestFMABrokenC1RegAlloc.java b/test/hotspot/jtreg/compiler/floatingpoint/TestFMABrokenC1RegAlloc.java similarity index 100% rename from hotspot/test/compiler/floatingpoint/TestFMABrokenC1RegAlloc.java rename to test/hotspot/jtreg/compiler/floatingpoint/TestFMABrokenC1RegAlloc.java diff --git a/hotspot/test/compiler/floatingpoint/TestFloatJNIArgs.java b/test/hotspot/jtreg/compiler/floatingpoint/TestFloatJNIArgs.java similarity index 100% rename from hotspot/test/compiler/floatingpoint/TestFloatJNIArgs.java rename to test/hotspot/jtreg/compiler/floatingpoint/TestFloatJNIArgs.java diff --git a/hotspot/test/compiler/floatingpoint/TestPow2.java b/test/hotspot/jtreg/compiler/floatingpoint/TestPow2.java similarity index 100% rename from hotspot/test/compiler/floatingpoint/TestPow2.java rename to test/hotspot/jtreg/compiler/floatingpoint/TestPow2.java diff --git a/hotspot/test/compiler/floatingpoint/TestRound.java b/test/hotspot/jtreg/compiler/floatingpoint/TestRound.java similarity index 100% rename from hotspot/test/compiler/floatingpoint/TestRound.java rename to test/hotspot/jtreg/compiler/floatingpoint/TestRound.java diff --git a/hotspot/test/compiler/floatingpoint/libTestFloatJNIArgs.c b/test/hotspot/jtreg/compiler/floatingpoint/libTestFloatJNIArgs.c similarity index 100% rename from hotspot/test/compiler/floatingpoint/libTestFloatJNIArgs.c rename to test/hotspot/jtreg/compiler/floatingpoint/libTestFloatJNIArgs.c diff --git a/hotspot/test/compiler/gcbarriers/G1CrashTest.java b/test/hotspot/jtreg/compiler/gcbarriers/G1CrashTest.java similarity index 100% rename from hotspot/test/compiler/gcbarriers/G1CrashTest.java rename to test/hotspot/jtreg/compiler/gcbarriers/G1CrashTest.java diff --git a/hotspot/test/compiler/gcbarriers/PreserveFPRegistersTest.java b/test/hotspot/jtreg/compiler/gcbarriers/PreserveFPRegistersTest.java similarity index 100% rename from hotspot/test/compiler/gcbarriers/PreserveFPRegistersTest.java rename to test/hotspot/jtreg/compiler/gcbarriers/PreserveFPRegistersTest.java diff --git a/hotspot/test/compiler/gcbarriers/TestMembarDependencies.java b/test/hotspot/jtreg/compiler/gcbarriers/TestMembarDependencies.java similarity index 100% rename from hotspot/test/compiler/gcbarriers/TestMembarDependencies.java rename to test/hotspot/jtreg/compiler/gcbarriers/TestMembarDependencies.java diff --git a/hotspot/test/compiler/inlining/DefaultAndConcreteMethodsCHA.java b/test/hotspot/jtreg/compiler/inlining/DefaultAndConcreteMethodsCHA.java similarity index 100% rename from hotspot/test/compiler/inlining/DefaultAndConcreteMethodsCHA.java rename to test/hotspot/jtreg/compiler/inlining/DefaultAndConcreteMethodsCHA.java diff --git a/hotspot/test/compiler/inlining/DefaultMethodsDependencies.java b/test/hotspot/jtreg/compiler/inlining/DefaultMethodsDependencies.java similarity index 100% rename from hotspot/test/compiler/inlining/DefaultMethodsDependencies.java rename to test/hotspot/jtreg/compiler/inlining/DefaultMethodsDependencies.java diff --git a/hotspot/test/compiler/inlining/InlineAccessors.java b/test/hotspot/jtreg/compiler/inlining/InlineAccessors.java similarity index 100% rename from hotspot/test/compiler/inlining/InlineAccessors.java rename to test/hotspot/jtreg/compiler/inlining/InlineAccessors.java diff --git a/hotspot/test/compiler/inlining/InlineDefaultMethod.java b/test/hotspot/jtreg/compiler/inlining/InlineDefaultMethod.java similarity index 100% rename from hotspot/test/compiler/inlining/InlineDefaultMethod.java rename to test/hotspot/jtreg/compiler/inlining/InlineDefaultMethod.java diff --git a/hotspot/test/compiler/inlining/InlineDefaultMethod1.java b/test/hotspot/jtreg/compiler/inlining/InlineDefaultMethod1.java similarity index 100% rename from hotspot/test/compiler/inlining/InlineDefaultMethod1.java rename to test/hotspot/jtreg/compiler/inlining/InlineDefaultMethod1.java diff --git a/hotspot/test/compiler/integerArithmetic/TestIntegerComparison.java b/test/hotspot/jtreg/compiler/integerArithmetic/TestIntegerComparison.java similarity index 100% rename from hotspot/test/compiler/integerArithmetic/TestIntegerComparison.java rename to test/hotspot/jtreg/compiler/integerArithmetic/TestIntegerComparison.java diff --git a/hotspot/test/compiler/interpreter/DisableOSRTest.java b/test/hotspot/jtreg/compiler/interpreter/DisableOSRTest.java similarity index 100% rename from hotspot/test/compiler/interpreter/DisableOSRTest.java rename to test/hotspot/jtreg/compiler/interpreter/DisableOSRTest.java diff --git a/hotspot/test/compiler/interpreter/Test6539464.java b/test/hotspot/jtreg/compiler/interpreter/Test6539464.java similarity index 100% rename from hotspot/test/compiler/interpreter/Test6539464.java rename to test/hotspot/jtreg/compiler/interpreter/Test6539464.java diff --git a/hotspot/test/compiler/interpreter/Test6833129.java b/test/hotspot/jtreg/compiler/interpreter/Test6833129.java similarity index 100% rename from hotspot/test/compiler/interpreter/Test6833129.java rename to test/hotspot/jtreg/compiler/interpreter/Test6833129.java diff --git a/hotspot/test/compiler/interpreter/cr7116216/LargeFrame.java b/test/hotspot/jtreg/compiler/interpreter/cr7116216/LargeFrame.java similarity index 100% rename from hotspot/test/compiler/interpreter/cr7116216/LargeFrame.java rename to test/hotspot/jtreg/compiler/interpreter/cr7116216/LargeFrame.java diff --git a/hotspot/test/compiler/interpreter/cr7116216/StackOverflow.java b/test/hotspot/jtreg/compiler/interpreter/cr7116216/StackOverflow.java similarity index 100% rename from hotspot/test/compiler/interpreter/cr7116216/StackOverflow.java rename to test/hotspot/jtreg/compiler/interpreter/cr7116216/StackOverflow.java diff --git a/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java b/test/hotspot/jtreg/compiler/intrinsics/IntrinsicAvailableTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java rename to test/hotspot/jtreg/compiler/intrinsics/IntrinsicAvailableTest.java diff --git a/hotspot/test/compiler/intrinsics/IntrinsicDisabledTest.java b/test/hotspot/jtreg/compiler/intrinsics/IntrinsicDisabledTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/IntrinsicDisabledTest.java rename to test/hotspot/jtreg/compiler/intrinsics/IntrinsicDisabledTest.java diff --git a/hotspot/test/compiler/intrinsics/Test6982370.java b/test/hotspot/jtreg/compiler/intrinsics/Test6982370.java similarity index 100% rename from hotspot/test/compiler/intrinsics/Test6982370.java rename to test/hotspot/jtreg/compiler/intrinsics/Test6982370.java diff --git a/hotspot/test/compiler/intrinsics/Test8005419.java b/test/hotspot/jtreg/compiler/intrinsics/Test8005419.java similarity index 100% rename from hotspot/test/compiler/intrinsics/Test8005419.java rename to test/hotspot/jtreg/compiler/intrinsics/Test8005419.java diff --git a/hotspot/test/compiler/intrinsics/bigInteger/MontgomeryMultiplyTest.java b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/MontgomeryMultiplyTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bigInteger/MontgomeryMultiplyTest.java rename to test/hotspot/jtreg/compiler/intrinsics/bigInteger/MontgomeryMultiplyTest.java diff --git a/hotspot/test/compiler/intrinsics/bigInteger/TestMulAdd.java b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMulAdd.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bigInteger/TestMulAdd.java rename to test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMulAdd.java diff --git a/hotspot/test/compiler/intrinsics/bigInteger/TestMultiplyToLen.java b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMultiplyToLen.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bigInteger/TestMultiplyToLen.java rename to test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMultiplyToLen.java diff --git a/hotspot/test/compiler/intrinsics/bigInteger/TestMultiplyToLenReturnProfile.java b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMultiplyToLenReturnProfile.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bigInteger/TestMultiplyToLenReturnProfile.java rename to test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMultiplyToLenReturnProfile.java diff --git a/hotspot/test/compiler/intrinsics/bigInteger/TestSquareToLen.java b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestSquareToLen.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bigInteger/TestSquareToLen.java rename to test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestSquareToLen.java diff --git a/hotspot/test/compiler/intrinsics/bmi/BMITestRunner.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/BMITestRunner.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/BMITestRunner.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/BMITestRunner.java diff --git a/hotspot/test/compiler/intrinsics/bmi/Expr.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/Expr.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/Expr.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/Expr.java diff --git a/hotspot/test/compiler/intrinsics/bmi/TestAndnI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/TestAndnI.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/TestAndnI.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/TestAndnI.java diff --git a/hotspot/test/compiler/intrinsics/bmi/TestAndnL.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/TestAndnL.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/TestAndnL.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/TestAndnL.java diff --git a/hotspot/test/compiler/intrinsics/bmi/TestBlsiI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/TestBlsiI.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/TestBlsiI.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/TestBlsiI.java diff --git a/hotspot/test/compiler/intrinsics/bmi/TestBlsiL.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/TestBlsiL.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/TestBlsiL.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/TestBlsiL.java diff --git a/hotspot/test/compiler/intrinsics/bmi/TestBlsmskI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/TestBlsmskI.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/TestBlsmskI.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/TestBlsmskI.java diff --git a/hotspot/test/compiler/intrinsics/bmi/TestBlsmskL.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/TestBlsmskL.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/TestBlsmskL.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/TestBlsmskL.java diff --git a/hotspot/test/compiler/intrinsics/bmi/TestBlsrI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/TestBlsrI.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/TestBlsrI.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/TestBlsrI.java diff --git a/hotspot/test/compiler/intrinsics/bmi/TestBlsrL.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/TestBlsrL.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/TestBlsrL.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/TestBlsrL.java diff --git a/hotspot/test/compiler/intrinsics/bmi/TestLzcntI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/TestLzcntI.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/TestLzcntI.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/TestLzcntI.java diff --git a/hotspot/test/compiler/intrinsics/bmi/TestLzcntL.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/TestLzcntL.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/TestLzcntL.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/TestLzcntL.java diff --git a/hotspot/test/compiler/intrinsics/bmi/TestTzcntI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/TestTzcntI.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/TestTzcntI.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/TestTzcntI.java diff --git a/hotspot/test/compiler/intrinsics/bmi/TestTzcntL.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/TestTzcntL.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/TestTzcntL.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/TestTzcntL.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/AndnTestI.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/AndnTestI.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/AndnTestL.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/AndnTestL.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsiTestI.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsiTestI.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsiTestL.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsiTestL.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsrTestI.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsrTestI.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsrTestL.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsrTestL.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BmiIntrinsicBase.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BmiIntrinsicBase.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/BmiIntrinsicBase.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BmiIntrinsicBase.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/LZcntTestI.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/LZcntTestI.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/LZcntTestL.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/LZcntTestL.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/TZcntTestI.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/TZcntTestI.java diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/TZcntTestL.java similarity index 100% rename from hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java rename to test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/TZcntTestL.java diff --git a/hotspot/test/compiler/intrinsics/klass/CastNullCheckDroppingsTest.java b/test/hotspot/jtreg/compiler/intrinsics/klass/CastNullCheckDroppingsTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/klass/CastNullCheckDroppingsTest.java rename to test/hotspot/jtreg/compiler/intrinsics/klass/CastNullCheckDroppingsTest.java diff --git a/hotspot/test/compiler/intrinsics/klass/TestIsPrimitive.java b/test/hotspot/jtreg/compiler/intrinsics/klass/TestIsPrimitive.java similarity index 100% rename from hotspot/test/compiler/intrinsics/klass/TestIsPrimitive.java rename to test/hotspot/jtreg/compiler/intrinsics/klass/TestIsPrimitive.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/AddExactICondTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactICondTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/AddExactICondTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactICondTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/AddExactIConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactIConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/AddExactIConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactIConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/AddExactILoadTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactILoadTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/AddExactILoadTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactILoadTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/AddExactILoopDependentTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactILoopDependentTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/AddExactILoopDependentTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactILoopDependentTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/AddExactINonConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactINonConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/AddExactINonConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactINonConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/AddExactIRepeatTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactIRepeatTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/AddExactIRepeatTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactIRepeatTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/AddExactLConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactLConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/AddExactLConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactLConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/AddExactLNonConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactLNonConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/AddExactLNonConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/AddExactLNonConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/CompareTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/CompareTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/CompareTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/CompareTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/DecExactITest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/DecExactITest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/DecExactITest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/DecExactITest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/DecExactLTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/DecExactLTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/DecExactLTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/DecExactLTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/GVNTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/GVNTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/GVNTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/GVNTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/IncExactITest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/IncExactITest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/IncExactITest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/IncExactITest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/IncExactLTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/IncExactLTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/IncExactLTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/IncExactLTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/MulExactICondTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactICondTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/MulExactICondTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactICondTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/MulExactIConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactIConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/MulExactIConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactIConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/MulExactILoadTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactILoadTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/MulExactILoadTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactILoadTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/MulExactILoopDependentTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactILoopDependentTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/MulExactILoopDependentTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactILoopDependentTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/MulExactINonConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactINonConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/MulExactINonConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactINonConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/MulExactIRepeatTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactIRepeatTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/MulExactIRepeatTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactIRepeatTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/MulExactLConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactLConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/MulExactLConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactLConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/MulExactLNonConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactLNonConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/MulExactLNonConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/MulExactLNonConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/NegExactIConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/NegExactIConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/NegExactIConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/NegExactIConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/NegExactILoadTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/NegExactILoadTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/NegExactILoadTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/NegExactILoadTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/NegExactILoopDependentTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/NegExactILoopDependentTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/NegExactILoopDependentTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/NegExactILoopDependentTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/NegExactINonConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/NegExactINonConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/NegExactINonConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/NegExactINonConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/NegExactLConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/NegExactLConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/NegExactLConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/NegExactLConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/NegExactLNonConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/NegExactLNonConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/NegExactLNonConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/NegExactLNonConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/NestedMathExactTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/NestedMathExactTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/NestedMathExactTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/NestedMathExactTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/SplitThruPhiTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/SplitThruPhiTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/SplitThruPhiTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/SplitThruPhiTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/SubExactICondTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactICondTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/SubExactICondTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactICondTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/SubExactIConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactIConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/SubExactIConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactIConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/SubExactILoadTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactILoadTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/SubExactILoadTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactILoadTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/SubExactILoopDependentTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactILoopDependentTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/SubExactILoopDependentTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactILoopDependentTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/SubExactINonConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactINonConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/SubExactINonConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactINonConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/SubExactIRepeatTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactIRepeatTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/SubExactIRepeatTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactIRepeatTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactLConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactLConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/Verify.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/Verify.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/Verify.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/Verify.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/MathIntrinsic.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/MathIntrinsic.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/MathIntrinsic.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/MathIntrinsic.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java b/test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java rename to test/hotspot/jtreg/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java diff --git a/hotspot/test/compiler/intrinsics/object/TestClone.java b/test/hotspot/jtreg/compiler/intrinsics/object/TestClone.java similarity index 100% rename from hotspot/test/compiler/intrinsics/object/TestClone.java rename to test/hotspot/jtreg/compiler/intrinsics/object/TestClone.java diff --git a/hotspot/test/compiler/intrinsics/object/TestHashCode.java b/test/hotspot/jtreg/compiler/intrinsics/object/TestHashCode.java similarity index 100% rename from hotspot/test/compiler/intrinsics/object/TestHashCode.java rename to test/hotspot/jtreg/compiler/intrinsics/object/TestHashCode.java diff --git a/hotspot/test/compiler/intrinsics/sha/TestSHA.java b/test/hotspot/jtreg/compiler/intrinsics/sha/TestSHA.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/TestSHA.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/TestSHA.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/SHAOptionsBase.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/SHAOptionsBase.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/SHAOptionsBase.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/SHAOptionsBase.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedAArch64CPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedAArch64CPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedAArch64CPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedAArch64CPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedSparcCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedSparcCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedSparcCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedSparcCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedX86CPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedX86CPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedX86CPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedX86CPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/SHASanityTestBase.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/SHASanityTestBase.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/sanity/SHASanityTestBase.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/sanity/SHASanityTestBase.java diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java similarity index 100% rename from hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java diff --git a/hotspot/test/compiler/intrinsics/string/TestHasNegatives.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestHasNegatives.java similarity index 100% rename from hotspot/test/compiler/intrinsics/string/TestHasNegatives.java rename to test/hotspot/jtreg/compiler/intrinsics/string/TestHasNegatives.java diff --git a/hotspot/test/compiler/intrinsics/string/TestStringConstruction.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringConstruction.java similarity index 100% rename from hotspot/test/compiler/intrinsics/string/TestStringConstruction.java rename to test/hotspot/jtreg/compiler/intrinsics/string/TestStringConstruction.java diff --git a/hotspot/test/compiler/intrinsics/string/TestStringEqualsBadLength.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringEqualsBadLength.java similarity index 100% rename from hotspot/test/compiler/intrinsics/string/TestStringEqualsBadLength.java rename to test/hotspot/jtreg/compiler/intrinsics/string/TestStringEqualsBadLength.java diff --git a/hotspot/test/compiler/intrinsics/string/TestStringIntrinsicMemoryFlow.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsicMemoryFlow.java similarity index 100% rename from hotspot/test/compiler/intrinsics/string/TestStringIntrinsicMemoryFlow.java rename to test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsicMemoryFlow.java diff --git a/hotspot/test/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java similarity index 100% rename from hotspot/test/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java rename to test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java diff --git a/hotspot/test/compiler/intrinsics/string/TestStringIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java similarity index 100% rename from hotspot/test/compiler/intrinsics/string/TestStringIntrinsics.java rename to test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java diff --git a/hotspot/test/compiler/intrinsics/string/TestStringIntrinsics2.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics2.java similarity index 100% rename from hotspot/test/compiler/intrinsics/string/TestStringIntrinsics2.java rename to test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics2.java diff --git a/hotspot/test/compiler/intrinsics/string/TestStringUTF16IntrinsicRangeChecks.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringUTF16IntrinsicRangeChecks.java similarity index 100% rename from hotspot/test/compiler/intrinsics/string/TestStringUTF16IntrinsicRangeChecks.java rename to test/hotspot/jtreg/compiler/intrinsics/string/TestStringUTF16IntrinsicRangeChecks.java diff --git a/hotspot/test/compiler/intrinsics/unsafe/AllocateUninitializedArray.java b/test/hotspot/jtreg/compiler/intrinsics/unsafe/AllocateUninitializedArray.java similarity index 100% rename from hotspot/test/compiler/intrinsics/unsafe/AllocateUninitializedArray.java rename to test/hotspot/jtreg/compiler/intrinsics/unsafe/AllocateUninitializedArray.java diff --git a/hotspot/test/compiler/intrinsics/unsafe/ByteBufferTest.java b/test/hotspot/jtreg/compiler/intrinsics/unsafe/ByteBufferTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/unsafe/ByteBufferTest.java rename to test/hotspot/jtreg/compiler/intrinsics/unsafe/ByteBufferTest.java diff --git a/hotspot/test/compiler/intrinsics/unsafe/DirectByteBufferTest.java b/test/hotspot/jtreg/compiler/intrinsics/unsafe/DirectByteBufferTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/unsafe/DirectByteBufferTest.java rename to test/hotspot/jtreg/compiler/intrinsics/unsafe/DirectByteBufferTest.java diff --git a/hotspot/test/compiler/intrinsics/unsafe/HeapByteBufferTest.java b/test/hotspot/jtreg/compiler/intrinsics/unsafe/HeapByteBufferTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/unsafe/HeapByteBufferTest.java rename to test/hotspot/jtreg/compiler/intrinsics/unsafe/HeapByteBufferTest.java diff --git a/hotspot/test/compiler/intrinsics/unsafe/TestCAEAntiDep.java b/test/hotspot/jtreg/compiler/intrinsics/unsafe/TestCAEAntiDep.java similarity index 100% rename from hotspot/test/compiler/intrinsics/unsafe/TestCAEAntiDep.java rename to test/hotspot/jtreg/compiler/intrinsics/unsafe/TestCAEAntiDep.java diff --git a/hotspot/test/compiler/intrinsics/unsafe/TestUnsafeMismatchedArrayFieldAccess.java b/test/hotspot/jtreg/compiler/intrinsics/unsafe/TestUnsafeMismatchedArrayFieldAccess.java similarity index 100% rename from hotspot/test/compiler/intrinsics/unsafe/TestUnsafeMismatchedArrayFieldAccess.java rename to test/hotspot/jtreg/compiler/intrinsics/unsafe/TestUnsafeMismatchedArrayFieldAccess.java diff --git a/hotspot/test/compiler/intrinsics/unsafe/TestUnsafeUnalignedMismatchedAccesses.java b/test/hotspot/jtreg/compiler/intrinsics/unsafe/TestUnsafeUnalignedMismatchedAccesses.java similarity index 100% rename from hotspot/test/compiler/intrinsics/unsafe/TestUnsafeUnalignedMismatchedAccesses.java rename to test/hotspot/jtreg/compiler/intrinsics/unsafe/TestUnsafeUnalignedMismatchedAccesses.java diff --git a/hotspot/test/compiler/intrinsics/unsafe/UnsafeGetAddressTest.java b/test/hotspot/jtreg/compiler/intrinsics/unsafe/UnsafeGetAddressTest.java similarity index 100% rename from hotspot/test/compiler/intrinsics/unsafe/UnsafeGetAddressTest.java rename to test/hotspot/jtreg/compiler/intrinsics/unsafe/UnsafeGetAddressTest.java diff --git a/hotspot/test/compiler/intrinsics/unsafe/UnsafeTwoCASLong.java b/test/hotspot/jtreg/compiler/intrinsics/unsafe/UnsafeTwoCASLong.java similarity index 100% rename from hotspot/test/compiler/intrinsics/unsafe/UnsafeTwoCASLong.java rename to test/hotspot/jtreg/compiler/intrinsics/unsafe/UnsafeTwoCASLong.java diff --git a/hotspot/test/compiler/intrinsics/zip/TestAdler32.java b/test/hotspot/jtreg/compiler/intrinsics/zip/TestAdler32.java similarity index 100% rename from hotspot/test/compiler/intrinsics/zip/TestAdler32.java rename to test/hotspot/jtreg/compiler/intrinsics/zip/TestAdler32.java diff --git a/hotspot/test/compiler/intrinsics/zip/TestCRC32.java b/test/hotspot/jtreg/compiler/intrinsics/zip/TestCRC32.java similarity index 100% rename from hotspot/test/compiler/intrinsics/zip/TestCRC32.java rename to test/hotspot/jtreg/compiler/intrinsics/zip/TestCRC32.java diff --git a/hotspot/test/compiler/intrinsics/zip/TestCRC32C.java b/test/hotspot/jtreg/compiler/intrinsics/zip/TestCRC32C.java similarity index 100% rename from hotspot/test/compiler/intrinsics/zip/TestCRC32C.java rename to test/hotspot/jtreg/compiler/intrinsics/zip/TestCRC32C.java diff --git a/hotspot/test/compiler/jsr292/CallSiteDepContextTest.java b/test/hotspot/jtreg/compiler/jsr292/CallSiteDepContextTest.java similarity index 100% rename from hotspot/test/compiler/jsr292/CallSiteDepContextTest.java rename to test/hotspot/jtreg/compiler/jsr292/CallSiteDepContextTest.java diff --git a/hotspot/test/compiler/jsr292/ConcurrentClassLoadingTest.java b/test/hotspot/jtreg/compiler/jsr292/ConcurrentClassLoadingTest.java similarity index 100% rename from hotspot/test/compiler/jsr292/ConcurrentClassLoadingTest.java rename to test/hotspot/jtreg/compiler/jsr292/ConcurrentClassLoadingTest.java diff --git a/hotspot/test/compiler/jsr292/ContinuousCallSiteTargetChange.java b/test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java similarity index 100% rename from hotspot/test/compiler/jsr292/ContinuousCallSiteTargetChange.java rename to test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java diff --git a/hotspot/test/compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java b/test/hotspot/jtreg/compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java similarity index 100% rename from hotspot/test/compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java rename to test/hotspot/jtreg/compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java diff --git a/hotspot/test/compiler/jsr292/InvokerGC.java b/test/hotspot/jtreg/compiler/jsr292/InvokerGC.java similarity index 100% rename from hotspot/test/compiler/jsr292/InvokerGC.java rename to test/hotspot/jtreg/compiler/jsr292/InvokerGC.java diff --git a/hotspot/test/compiler/jsr292/InvokerSignatureMismatch.java b/test/hotspot/jtreg/compiler/jsr292/InvokerSignatureMismatch.java similarity index 100% rename from hotspot/test/compiler/jsr292/InvokerSignatureMismatch.java rename to test/hotspot/jtreg/compiler/jsr292/InvokerSignatureMismatch.java diff --git a/hotspot/test/compiler/jsr292/LongReferenceCastingTest.java b/test/hotspot/jtreg/compiler/jsr292/LongReferenceCastingTest.java similarity index 100% rename from hotspot/test/compiler/jsr292/LongReferenceCastingTest.java rename to test/hotspot/jtreg/compiler/jsr292/LongReferenceCastingTest.java diff --git a/hotspot/test/compiler/jsr292/MHInlineTest.java b/test/hotspot/jtreg/compiler/jsr292/MHInlineTest.java similarity index 100% rename from hotspot/test/compiler/jsr292/MHInlineTest.java rename to test/hotspot/jtreg/compiler/jsr292/MHInlineTest.java diff --git a/hotspot/test/compiler/jsr292/NonInlinedCall/Agent.java b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/Agent.java similarity index 100% rename from hotspot/test/compiler/jsr292/NonInlinedCall/Agent.java rename to test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/Agent.java diff --git a/hotspot/test/compiler/jsr292/NonInlinedCall/GCTest.java b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/GCTest.java similarity index 100% rename from hotspot/test/compiler/jsr292/NonInlinedCall/GCTest.java rename to test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/GCTest.java diff --git a/hotspot/test/compiler/jsr292/NonInlinedCall/InvokeTest.java b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/InvokeTest.java similarity index 100% rename from hotspot/test/compiler/jsr292/NonInlinedCall/InvokeTest.java rename to test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/InvokeTest.java diff --git a/hotspot/test/compiler/jsr292/NonInlinedCall/RedefineTest.java b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/RedefineTest.java similarity index 100% rename from hotspot/test/compiler/jsr292/NonInlinedCall/RedefineTest.java rename to test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/RedefineTest.java diff --git a/hotspot/test/compiler/jsr292/NullConstantReceiver.java b/test/hotspot/jtreg/compiler/jsr292/NullConstantReceiver.java similarity index 100% rename from hotspot/test/compiler/jsr292/NullConstantReceiver.java rename to test/hotspot/jtreg/compiler/jsr292/NullConstantReceiver.java diff --git a/hotspot/test/compiler/jsr292/PollutedTrapCounts.java b/test/hotspot/jtreg/compiler/jsr292/PollutedTrapCounts.java similarity index 100% rename from hotspot/test/compiler/jsr292/PollutedTrapCounts.java rename to test/hotspot/jtreg/compiler/jsr292/PollutedTrapCounts.java diff --git a/hotspot/test/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java b/test/hotspot/jtreg/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java similarity index 100% rename from hotspot/test/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java rename to test/hotspot/jtreg/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java diff --git a/hotspot/test/compiler/jsr292/Test7082949.java b/test/hotspot/jtreg/compiler/jsr292/Test7082949.java similarity index 100% rename from hotspot/test/compiler/jsr292/Test7082949.java rename to test/hotspot/jtreg/compiler/jsr292/Test7082949.java diff --git a/hotspot/test/compiler/jsr292/TestArrayReturnType.java b/test/hotspot/jtreg/compiler/jsr292/TestArrayReturnType.java similarity index 100% rename from hotspot/test/compiler/jsr292/TestArrayReturnType.java rename to test/hotspot/jtreg/compiler/jsr292/TestArrayReturnType.java diff --git a/hotspot/test/compiler/jsr292/VMAnonymousClasses.java b/test/hotspot/jtreg/compiler/jsr292/VMAnonymousClasses.java similarity index 100% rename from hotspot/test/compiler/jsr292/VMAnonymousClasses.java rename to test/hotspot/jtreg/compiler/jsr292/VMAnonymousClasses.java diff --git a/hotspot/test/compiler/jsr292/cr6990212/Test6990212.java b/test/hotspot/jtreg/compiler/jsr292/cr6990212/Test6990212.java similarity index 100% rename from hotspot/test/compiler/jsr292/cr6990212/Test6990212.java rename to test/hotspot/jtreg/compiler/jsr292/cr6990212/Test6990212.java diff --git a/hotspot/test/compiler/jsr292/createsInterfaceDotEqualsCallInfo.js b/test/hotspot/jtreg/compiler/jsr292/createsInterfaceDotEqualsCallInfo.js similarity index 100% rename from hotspot/test/compiler/jsr292/createsInterfaceDotEqualsCallInfo.js rename to test/hotspot/jtreg/compiler/jsr292/createsInterfaceDotEqualsCallInfo.js diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/ByteClassLoader.java b/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/ByteClassLoader.java similarity index 100% rename from hotspot/test/compiler/jsr292/methodHandleExceptions/ByteClassLoader.java rename to test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/ByteClassLoader.java diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java b/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java similarity index 100% rename from hotspot/test/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java rename to test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/C.java b/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/C.java similarity index 100% rename from hotspot/test/compiler/jsr292/methodHandleExceptions/p/C.java rename to test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/C.java diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Dok.java b/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/Dok.java similarity index 100% rename from hotspot/test/compiler/jsr292/methodHandleExceptions/p/Dok.java rename to test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/Dok.java diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/E.java b/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/E.java similarity index 100% rename from hotspot/test/compiler/jsr292/methodHandleExceptions/p/E.java rename to test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/E.java diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/F.java b/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/F.java similarity index 100% rename from hotspot/test/compiler/jsr292/methodHandleExceptions/p/F.java rename to test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/F.java diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/I.java b/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/I.java similarity index 100% rename from hotspot/test/compiler/jsr292/methodHandleExceptions/p/I.java rename to test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/I.java diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Tdirect.java b/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/Tdirect.java similarity index 100% rename from hotspot/test/compiler/jsr292/methodHandleExceptions/p/Tdirect.java rename to test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/Tdirect.java diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Treflect.java b/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/Treflect.java similarity index 100% rename from hotspot/test/compiler/jsr292/methodHandleExceptions/p/Treflect.java rename to test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/p/Treflect.java diff --git a/hotspot/test/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java b/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java similarity index 100% rename from hotspot/test/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java rename to test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java diff --git a/hotspot/test/compiler/jvmci/JVM_GetJVMCIRuntimeTest.java b/test/hotspot/jtreg/compiler/jvmci/JVM_GetJVMCIRuntimeTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/JVM_GetJVMCIRuntimeTest.java rename to test/hotspot/jtreg/compiler/jvmci/JVM_GetJVMCIRuntimeTest.java diff --git a/hotspot/test/compiler/jvmci/SecurityRestrictionsTest.java b/test/hotspot/jtreg/compiler/jvmci/SecurityRestrictionsTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/SecurityRestrictionsTest.java rename to test/hotspot/jtreg/compiler/jvmci/SecurityRestrictionsTest.java diff --git a/hotspot/test/compiler/jvmci/TestJVMCIPrintProperties.java b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java similarity index 100% rename from hotspot/test/compiler/jvmci/TestJVMCIPrintProperties.java rename to test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java diff --git a/hotspot/test/compiler/jvmci/TestValidateModules.java b/test/hotspot/jtreg/compiler/jvmci/TestValidateModules.java similarity index 100% rename from hotspot/test/compiler/jvmci/TestValidateModules.java rename to test/hotspot/jtreg/compiler/jvmci/TestValidateModules.java diff --git a/hotspot/test/compiler/jvmci/common/CTVMUtilities.java b/test/hotspot/jtreg/compiler/jvmci/common/CTVMUtilities.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/CTVMUtilities.java rename to test/hotspot/jtreg/compiler/jvmci/common/CTVMUtilities.java diff --git a/hotspot/test/compiler/jvmci/common/JVMCIHelpers.java b/test/hotspot/jtreg/compiler/jvmci/common/JVMCIHelpers.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/JVMCIHelpers.java rename to test/hotspot/jtreg/compiler/jvmci/common/JVMCIHelpers.java diff --git a/hotspot/test/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java b/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java rename to test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java diff --git a/hotspot/test/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/MetaAccessWrapper.java b/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/MetaAccessWrapper.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/MetaAccessWrapper.java rename to test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/MetaAccessWrapper.java diff --git a/hotspot/test/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/PublicMetaspaceWrapperObject.java b/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/PublicMetaspaceWrapperObject.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/PublicMetaspaceWrapperObject.java rename to test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/PublicMetaspaceWrapperObject.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/AbstractClass.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/AbstractClass.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/AbstractClass.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/AbstractClass.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/AbstractClassExtender.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/AbstractClassExtender.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/AbstractClassExtender.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/AbstractClassExtender.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/AnotherSingleImplementer.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/AnotherSingleImplementer.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/AnotherSingleImplementer.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/AnotherSingleImplementer.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/AnotherSingleImplementerInterface.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/AnotherSingleImplementerInterface.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/AnotherSingleImplementerInterface.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/AnotherSingleImplementerInterface.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/DoNotExtendClass.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/DoNotExtendClass.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/DoNotExtendClass.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/DoNotExtendClass.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/DoNotImplementInterface.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/DoNotImplementInterface.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/DoNotImplementInterface.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/DoNotImplementInterface.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/DuplicateSimpleSingleImplementerInterface.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/DuplicateSimpleSingleImplementerInterface.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/DuplicateSimpleSingleImplementerInterface.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/DuplicateSimpleSingleImplementerInterface.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/MultiSubclassedClass.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/MultiSubclassedClass.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/MultiSubclassedClass.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/MultiSubclassedClass.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/MultiSubclassedClassSubclass1.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/MultiSubclassedClassSubclass1.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/MultiSubclassedClassSubclass1.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/MultiSubclassedClassSubclass1.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/MultiSubclassedClassSubclass2.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/MultiSubclassedClassSubclass2.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/MultiSubclassedClassSubclass2.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/MultiSubclassedClassSubclass2.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/MultipleAbstractImplementer.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/MultipleAbstractImplementer.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/MultipleAbstractImplementer.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/MultipleAbstractImplementer.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/MultipleImplementer1.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/MultipleImplementer1.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/MultipleImplementer1.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/MultipleImplementer1.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/MultipleImplementer2.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/MultipleImplementer2.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/MultipleImplementer2.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/MultipleImplementer2.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/MultipleImplementersInterface.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/MultipleImplementersInterface.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/MultipleImplementersInterface.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/MultipleImplementersInterface.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/MultipleImplementersInterfaceExtender.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/MultipleImplementersInterfaceExtender.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/MultipleImplementersInterfaceExtender.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/MultipleImplementersInterfaceExtender.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/MultipleSuperImplementers.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/MultipleSuperImplementers.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/MultipleSuperImplementers.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/MultipleSuperImplementers.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/PackagePrivateClass.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/PackagePrivateClass.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/PackagePrivateClass.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/PackagePrivateClass.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/SimpleClass.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/SimpleClass.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/SimpleClass.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/SimpleClass.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/SimpleSingleImplementerInterface.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/SimpleSingleImplementerInterface.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/SimpleSingleImplementerInterface.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/SimpleSingleImplementerInterface.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/SingleImplementer.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/SingleImplementer.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/SingleImplementer.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/SingleImplementer.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/SingleImplementerInterface.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/SingleImplementerInterface.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/SingleImplementerInterface.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/SingleImplementerInterface.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/SingleSubclass.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/SingleSubclass.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/SingleSubclass.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/SingleSubclass.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/SingleSubclassedClass.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/SingleSubclassedClass.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/SingleSubclassedClass.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/SingleSubclassedClass.java diff --git a/hotspot/test/compiler/jvmci/common/testcases/TestCase.java b/test/hotspot/jtreg/compiler/jvmci/common/testcases/TestCase.java similarity index 100% rename from hotspot/test/compiler/jvmci/common/testcases/TestCase.java rename to test/hotspot/jtreg/compiler/jvmci/common/testcases/TestCase.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/AsResolvedJavaMethodTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/AsResolvedJavaMethodTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/AsResolvedJavaMethodTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/AsResolvedJavaMethodTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/CollectCountersTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/CollectCountersTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/CollectCountersTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/CollectCountersTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/CompileCodeTestCase.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/CompileCodeTestCase.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/CompileCodeTestCase.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/CompileCodeTestCase.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ConstantPoolTestCase.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestCase.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/ConstantPoolTestCase.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestCase.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/DebugOutputTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DebugOutputTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/DebugOutputTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/DebugOutputTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/DummyAbstractClass.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DummyAbstractClass.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/DummyAbstractClass.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/DummyAbstractClass.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/DummyClass.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DummyClass.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/DummyClass.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/DummyClass.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/DummyInterface.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DummyInterface.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/DummyInterface.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/DummyInterface.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetBytecodeTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetBytecodeTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetClassInitializerTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetClassInitializerTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetConstantPoolTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetConstantPoolTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetExceptionTableTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetExceptionTableTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetFlagValueTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetFlagValueTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetFlagValueTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetFlagValueTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetImplementorTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetImplementorTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetImplementorTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetImplementorTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetSymbolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetSymbolTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetSymbolTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetSymbolTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/HasNeverInlineDirectiveTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasNeverInlineDirectiveTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/HasNeverInlineDirectiveTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasNeverInlineDirectiveTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/IsCompilableTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/IsCompilableTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/IsMatureTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsMatureTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/IsMatureTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsMatureTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/IsMatureVsReprofileTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsMatureVsReprofileTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/IsMatureVsReprofileTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsMatureVsReprofileTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupTypeTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupTypeTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/LookupTypeTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupTypeTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ReadConfigurationTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ReadConfigurationTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/ReadConfigurationTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/ReadConfigurationTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ReprofileTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ReprofileTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/ReprofileTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/ReprofileTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveMethodTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveMethodTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java rename to test/hotspot/jtreg/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java diff --git a/hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java b/test/hotspot/jtreg/compiler/jvmci/errors/CodeInstallerTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java rename to test/hotspot/jtreg/compiler/jvmci/errors/CodeInstallerTest.java diff --git a/hotspot/test/compiler/jvmci/errors/TestInvalidCompilationResult.java b/test/hotspot/jtreg/compiler/jvmci/errors/TestInvalidCompilationResult.java similarity index 100% rename from hotspot/test/compiler/jvmci/errors/TestInvalidCompilationResult.java rename to test/hotspot/jtreg/compiler/jvmci/errors/TestInvalidCompilationResult.java diff --git a/hotspot/test/compiler/jvmci/errors/TestInvalidDebugInfo.java b/test/hotspot/jtreg/compiler/jvmci/errors/TestInvalidDebugInfo.java similarity index 100% rename from hotspot/test/compiler/jvmci/errors/TestInvalidDebugInfo.java rename to test/hotspot/jtreg/compiler/jvmci/errors/TestInvalidDebugInfo.java diff --git a/hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java b/test/hotspot/jtreg/compiler/jvmci/errors/TestInvalidOopMap.java similarity index 100% rename from hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java rename to test/hotspot/jtreg/compiler/jvmci/errors/TestInvalidOopMap.java diff --git a/hotspot/test/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.config b/test/hotspot/jtreg/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.config similarity index 100% rename from hotspot/test/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.config rename to test/hotspot/jtreg/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.config diff --git a/hotspot/test/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.config b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.config similarity index 100% rename from hotspot/test/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.config rename to test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.config diff --git a/hotspot/test/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java rename to test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java diff --git a/hotspot/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.config b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.config similarity index 100% rename from hotspot/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.config rename to test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.config diff --git a/hotspot/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java rename to test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.java diff --git a/hotspot/test/compiler/jvmci/events/JvmciShutdownEventListener.java b/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventListener.java similarity index 100% rename from hotspot/test/compiler/jvmci/events/JvmciShutdownEventListener.java rename to test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventListener.java diff --git a/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.config b/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.config similarity index 100% rename from hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.config rename to test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.config diff --git a/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java b/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java rename to test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/libNativeCallTest.c b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/libNativeCallTest.c similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/libNativeCallTest.c rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/libNativeCallTest.c diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DebugInfoTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DebugInfoTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DebugInfoTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DebugInfoTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/AsJavaTypeDataProvider.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/AsJavaTypeDataProvider.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/AsJavaTypeDataProvider.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/AsJavaTypeDataProvider.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/BoxPrimitiveDataProvider.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/BoxPrimitiveDataProvider.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/BoxPrimitiveDataProvider.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/BoxPrimitiveDataProvider.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ConstantEqualsDataProvider.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ConstantEqualsDataProvider.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ConstantEqualsDataProvider.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ConstantEqualsDataProvider.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/DummyClass.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/DummyClass.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/DummyClass.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/DummyClass.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForObjectDataProvider.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForObjectDataProvider.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForObjectDataProvider.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForObjectDataProvider.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForStringDataProvider.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForStringDataProvider.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForStringDataProvider.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForStringDataProvider.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/IsEmbeddableDataProvider.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/IsEmbeddableDataProvider.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/IsEmbeddableDataProvider.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/IsEmbeddableDataProvider.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderData.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderData.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderData.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderData.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadArrayElementDataProvider.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadArrayElementDataProvider.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadArrayElementDataProvider.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadArrayElementDataProvider.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadArrayLengthDataProvider.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadArrayLengthDataProvider.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadArrayLengthDataProvider.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadArrayLengthDataProvider.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadFieldValueDataProvider.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadFieldValueDataProvider.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadFieldValueDataProvider.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadFieldValueDataProvider.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHelper.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHelper.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHelper.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHelper.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/UnboxPrimitiveDataProvider.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/UnboxPrimitiveDataProvider.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/UnboxPrimitiveDataProvider.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/UnboxPrimitiveDataProvider.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/FieldUniverse.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/FieldUniverse.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/FieldUniverse.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/FieldUniverse.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/MethodUniverse.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/MethodUniverse.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/MethodUniverse.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/MethodUniverse.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/NameAndSignature.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/NameAndSignature.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/NameAndSignature.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/NameAndSignature.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveConcreteMethodTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveConcreteMethodTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveConcreteMethodTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveConcreteMethodTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveMethodTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveMethodTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveMethodTest.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveMethodTest.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestConstantReflectionProvider.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestConstantReflectionProvider.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestConstantReflectionProvider.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestConstantReflectionProvider.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaField.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaField.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaField.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaField.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaMethod.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaMethod.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaMethod.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaMethod.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaType.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaType.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaType.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaType.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java similarity index 100% rename from hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java rename to test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java diff --git a/hotspot/test/compiler/jvmci/meta/StableFieldTest.java b/test/hotspot/jtreg/compiler/jvmci/meta/StableFieldTest.java similarity index 100% rename from hotspot/test/compiler/jvmci/meta/StableFieldTest.java rename to test/hotspot/jtreg/compiler/jvmci/meta/StableFieldTest.java diff --git a/hotspot/test/compiler/linkage/CallSites.jasm b/test/hotspot/jtreg/compiler/linkage/CallSites.jasm similarity index 100% rename from hotspot/test/compiler/linkage/CallSites.jasm rename to test/hotspot/jtreg/compiler/linkage/CallSites.jasm diff --git a/hotspot/test/compiler/linkage/LinkageErrors.java b/test/hotspot/jtreg/compiler/linkage/LinkageErrors.java similarity index 100% rename from hotspot/test/compiler/linkage/LinkageErrors.java rename to test/hotspot/jtreg/compiler/linkage/LinkageErrors.java diff --git a/hotspot/test/compiler/loopopts/BadPredicateAfterPartialPeel.java b/test/hotspot/jtreg/compiler/loopopts/BadPredicateAfterPartialPeel.java similarity index 100% rename from hotspot/test/compiler/loopopts/BadPredicateAfterPartialPeel.java rename to test/hotspot/jtreg/compiler/loopopts/BadPredicateAfterPartialPeel.java diff --git a/hotspot/test/compiler/loopopts/ConstFPVectorization.java b/test/hotspot/jtreg/compiler/loopopts/ConstFPVectorization.java similarity index 100% rename from hotspot/test/compiler/loopopts/ConstFPVectorization.java rename to test/hotspot/jtreg/compiler/loopopts/ConstFPVectorization.java diff --git a/hotspot/test/compiler/loopopts/CountedLoopProblem.java b/test/hotspot/jtreg/compiler/loopopts/CountedLoopProblem.java similarity index 100% rename from hotspot/test/compiler/loopopts/CountedLoopProblem.java rename to test/hotspot/jtreg/compiler/loopopts/CountedLoopProblem.java diff --git a/hotspot/test/compiler/loopopts/Test6659207.java b/test/hotspot/jtreg/compiler/loopopts/Test6659207.java similarity index 100% rename from hotspot/test/compiler/loopopts/Test6659207.java rename to test/hotspot/jtreg/compiler/loopopts/Test6659207.java diff --git a/hotspot/test/compiler/loopopts/Test6855164.java b/test/hotspot/jtreg/compiler/loopopts/Test6855164.java similarity index 100% rename from hotspot/test/compiler/loopopts/Test6855164.java rename to test/hotspot/jtreg/compiler/loopopts/Test6855164.java diff --git a/hotspot/test/compiler/loopopts/Test6860469.java b/test/hotspot/jtreg/compiler/loopopts/Test6860469.java similarity index 100% rename from hotspot/test/compiler/loopopts/Test6860469.java rename to test/hotspot/jtreg/compiler/loopopts/Test6860469.java diff --git a/hotspot/test/compiler/loopopts/Test7044738.java b/test/hotspot/jtreg/compiler/loopopts/Test7044738.java similarity index 100% rename from hotspot/test/compiler/loopopts/Test7044738.java rename to test/hotspot/jtreg/compiler/loopopts/Test7044738.java diff --git a/hotspot/test/compiler/loopopts/Test7052494.java b/test/hotspot/jtreg/compiler/loopopts/Test7052494.java similarity index 100% rename from hotspot/test/compiler/loopopts/Test7052494.java rename to test/hotspot/jtreg/compiler/loopopts/Test7052494.java diff --git a/hotspot/test/compiler/loopopts/TestArraysFillDeadControl.java b/test/hotspot/jtreg/compiler/loopopts/TestArraysFillDeadControl.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestArraysFillDeadControl.java rename to test/hotspot/jtreg/compiler/loopopts/TestArraysFillDeadControl.java diff --git a/hotspot/test/compiler/loopopts/TestCastIINoLoopLimitCheck.java b/test/hotspot/jtreg/compiler/loopopts/TestCastIINoLoopLimitCheck.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestCastIINoLoopLimitCheck.java rename to test/hotspot/jtreg/compiler/loopopts/TestCastIINoLoopLimitCheck.java diff --git a/hotspot/test/compiler/loopopts/TestCountedLoopSafepointBackedge.java b/test/hotspot/jtreg/compiler/loopopts/TestCountedLoopSafepointBackedge.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestCountedLoopSafepointBackedge.java rename to test/hotspot/jtreg/compiler/loopopts/TestCountedLoopSafepointBackedge.java diff --git a/hotspot/test/compiler/loopopts/TestDeadBackbranchArrayAccess.java b/test/hotspot/jtreg/compiler/loopopts/TestDeadBackbranchArrayAccess.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestDeadBackbranchArrayAccess.java rename to test/hotspot/jtreg/compiler/loopopts/TestDeadBackbranchArrayAccess.java diff --git a/hotspot/test/compiler/loopopts/TestImpossibleIV.java b/test/hotspot/jtreg/compiler/loopopts/TestImpossibleIV.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestImpossibleIV.java rename to test/hotspot/jtreg/compiler/loopopts/TestImpossibleIV.java diff --git a/hotspot/test/compiler/loopopts/TestLogSum.java b/test/hotspot/jtreg/compiler/loopopts/TestLogSum.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestLogSum.java rename to test/hotspot/jtreg/compiler/loopopts/TestLogSum.java diff --git a/hotspot/test/compiler/loopopts/TestLoopPeeling.java b/test/hotspot/jtreg/compiler/loopopts/TestLoopPeeling.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestLoopPeeling.java rename to test/hotspot/jtreg/compiler/loopopts/TestLoopPeeling.java diff --git a/hotspot/test/compiler/loopopts/TestMoveStoresOutOfLoops.java b/test/hotspot/jtreg/compiler/loopopts/TestMoveStoresOutOfLoops.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestMoveStoresOutOfLoops.java rename to test/hotspot/jtreg/compiler/loopopts/TestMoveStoresOutOfLoops.java diff --git a/hotspot/test/compiler/loopopts/TestMoveStoresOutOfLoopsStoreNoCtrl.java b/test/hotspot/jtreg/compiler/loopopts/TestMoveStoresOutOfLoopsStoreNoCtrl.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestMoveStoresOutOfLoopsStoreNoCtrl.java rename to test/hotspot/jtreg/compiler/loopopts/TestMoveStoresOutOfLoopsStoreNoCtrl.java diff --git a/hotspot/test/compiler/loopopts/TestOverunrolling.java b/test/hotspot/jtreg/compiler/loopopts/TestOverunrolling.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestOverunrolling.java rename to test/hotspot/jtreg/compiler/loopopts/TestOverunrolling.java diff --git a/hotspot/test/compiler/loopopts/TestPredicateLostDependency.java b/test/hotspot/jtreg/compiler/loopopts/TestPredicateLostDependency.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestPredicateLostDependency.java rename to test/hotspot/jtreg/compiler/loopopts/TestPredicateLostDependency.java diff --git a/hotspot/test/compiler/loopopts/TestSplitIfBlocksDisabled.java b/test/hotspot/jtreg/compiler/loopopts/TestSplitIfBlocksDisabled.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestSplitIfBlocksDisabled.java rename to test/hotspot/jtreg/compiler/loopopts/TestSplitIfBlocksDisabled.java diff --git a/hotspot/test/compiler/loopopts/TestSplitIfUnswitchedLoopsEliminated.java b/test/hotspot/jtreg/compiler/loopopts/TestSplitIfUnswitchedLoopsEliminated.java similarity index 100% rename from hotspot/test/compiler/loopopts/TestSplitIfUnswitchedLoopsEliminated.java rename to test/hotspot/jtreg/compiler/loopopts/TestSplitIfUnswitchedLoopsEliminated.java diff --git a/hotspot/test/compiler/loopopts/UseCountedLoopSafepoints.java b/test/hotspot/jtreg/compiler/loopopts/UseCountedLoopSafepoints.java similarity index 100% rename from hotspot/test/compiler/loopopts/UseCountedLoopSafepoints.java rename to test/hotspot/jtreg/compiler/loopopts/UseCountedLoopSafepoints.java diff --git a/hotspot/test/compiler/loopopts/UseCountedLoopSafepointsTest.java b/test/hotspot/jtreg/compiler/loopopts/UseCountedLoopSafepointsTest.java similarity index 100% rename from hotspot/test/compiler/loopopts/UseCountedLoopSafepointsTest.java rename to test/hotspot/jtreg/compiler/loopopts/UseCountedLoopSafepointsTest.java diff --git a/hotspot/test/compiler/loopopts/superword/ProdRed_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/ProdRed_Double.java rename to test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java diff --git a/hotspot/test/compiler/loopopts/superword/ProdRed_Float.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/ProdRed_Float.java rename to test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java diff --git a/hotspot/test/compiler/loopopts/superword/ProdRed_Int.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/ProdRed_Int.java rename to test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java diff --git a/hotspot/test/compiler/loopopts/superword/ReductionPerf.java b/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/ReductionPerf.java rename to test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java diff --git a/hotspot/test/compiler/loopopts/superword/SumRedAbsNeg_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Double.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/SumRedAbsNeg_Double.java rename to test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Double.java diff --git a/hotspot/test/compiler/loopopts/superword/SumRedAbsNeg_Float.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Float.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/SumRedAbsNeg_Float.java rename to test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Float.java diff --git a/hotspot/test/compiler/loopopts/superword/SumRedSqrt_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedSqrt_Double.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/SumRedSqrt_Double.java rename to test/hotspot/jtreg/compiler/loopopts/superword/SumRedSqrt_Double.java diff --git a/hotspot/test/compiler/loopopts/superword/SumRed_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Double.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/SumRed_Double.java rename to test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Double.java diff --git a/hotspot/test/compiler/loopopts/superword/SumRed_Float.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Float.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/SumRed_Float.java rename to test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Float.java diff --git a/hotspot/test/compiler/loopopts/superword/SumRed_Int.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Int.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/SumRed_Int.java rename to test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Int.java diff --git a/hotspot/test/compiler/loopopts/superword/SumRed_Long.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Long.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/SumRed_Long.java rename to test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Long.java diff --git a/hotspot/test/compiler/loopopts/superword/TestBestAlign.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestBestAlign.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/TestBestAlign.java rename to test/hotspot/jtreg/compiler/loopopts/superword/TestBestAlign.java diff --git a/hotspot/test/compiler/loopopts/superword/TestReductionWithLoopVariantUse.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestReductionWithLoopVariantUse.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/TestReductionWithLoopVariantUse.java rename to test/hotspot/jtreg/compiler/loopopts/superword/TestReductionWithLoopVariantUse.java diff --git a/hotspot/test/compiler/loopopts/superword/TestVectorizationWithInvariant.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestVectorizationWithInvariant.java similarity index 100% rename from hotspot/test/compiler/loopopts/superword/TestVectorizationWithInvariant.java rename to test/hotspot/jtreg/compiler/loopopts/superword/TestVectorizationWithInvariant.java diff --git a/hotspot/test/compiler/macronodes/TestEliminateAllocationPhi.java b/test/hotspot/jtreg/compiler/macronodes/TestEliminateAllocationPhi.java similarity index 100% rename from hotspot/test/compiler/macronodes/TestEliminateAllocationPhi.java rename to test/hotspot/jtreg/compiler/macronodes/TestEliminateAllocationPhi.java diff --git a/hotspot/test/compiler/membars/DekkerTest.java b/test/hotspot/jtreg/compiler/membars/DekkerTest.java similarity index 100% rename from hotspot/test/compiler/membars/DekkerTest.java rename to test/hotspot/jtreg/compiler/membars/DekkerTest.java diff --git a/hotspot/test/compiler/membars/TestMemBarAcquire.java b/test/hotspot/jtreg/compiler/membars/TestMemBarAcquire.java similarity index 100% rename from hotspot/test/compiler/membars/TestMemBarAcquire.java rename to test/hotspot/jtreg/compiler/membars/TestMemBarAcquire.java diff --git a/hotspot/test/compiler/memoryinitialization/ZeroTLABTest.java b/test/hotspot/jtreg/compiler/memoryinitialization/ZeroTLABTest.java similarity index 100% rename from hotspot/test/compiler/memoryinitialization/ZeroTLABTest.java rename to test/hotspot/jtreg/compiler/memoryinitialization/ZeroTLABTest.java diff --git a/hotspot/test/compiler/onSpinWait/TestOnSpinWait.java b/test/hotspot/jtreg/compiler/onSpinWait/TestOnSpinWait.java similarity index 100% rename from hotspot/test/compiler/onSpinWait/TestOnSpinWait.java rename to test/hotspot/jtreg/compiler/onSpinWait/TestOnSpinWait.java diff --git a/hotspot/test/compiler/onSpinWait/TestOnSpinWaitEnableDisable.java b/test/hotspot/jtreg/compiler/onSpinWait/TestOnSpinWaitEnableDisable.java similarity index 100% rename from hotspot/test/compiler/onSpinWait/TestOnSpinWaitEnableDisable.java rename to test/hotspot/jtreg/compiler/onSpinWait/TestOnSpinWaitEnableDisable.java diff --git a/hotspot/test/compiler/oracle/CheckCompileCommandOption.java b/test/hotspot/jtreg/compiler/oracle/CheckCompileCommandOption.java similarity index 100% rename from hotspot/test/compiler/oracle/CheckCompileCommandOption.java rename to test/hotspot/jtreg/compiler/oracle/CheckCompileCommandOption.java diff --git a/hotspot/test/compiler/oracle/GetMethodOptionTest.java b/test/hotspot/jtreg/compiler/oracle/GetMethodOptionTest.java similarity index 100% rename from hotspot/test/compiler/oracle/GetMethodOptionTest.java rename to test/hotspot/jtreg/compiler/oracle/GetMethodOptionTest.java diff --git a/hotspot/test/compiler/oracle/MethodMatcherTest.java b/test/hotspot/jtreg/compiler/oracle/MethodMatcherTest.java similarity index 100% rename from hotspot/test/compiler/oracle/MethodMatcherTest.java rename to test/hotspot/jtreg/compiler/oracle/MethodMatcherTest.java diff --git a/hotspot/test/compiler/oracle/TestCompileCommand.java b/test/hotspot/jtreg/compiler/oracle/TestCompileCommand.java similarity index 100% rename from hotspot/test/compiler/oracle/TestCompileCommand.java rename to test/hotspot/jtreg/compiler/oracle/TestCompileCommand.java diff --git a/hotspot/test/compiler/oracle/command1.txt b/test/hotspot/jtreg/compiler/oracle/command1.txt similarity index 100% rename from hotspot/test/compiler/oracle/command1.txt rename to test/hotspot/jtreg/compiler/oracle/command1.txt diff --git a/hotspot/test/compiler/oracle/command2.txt b/test/hotspot/jtreg/compiler/oracle/command2.txt similarity index 100% rename from hotspot/test/compiler/oracle/command2.txt rename to test/hotspot/jtreg/compiler/oracle/command2.txt diff --git a/hotspot/test/compiler/osr/TestOSRWithNonEmptyStack.java b/test/hotspot/jtreg/compiler/osr/TestOSRWithNonEmptyStack.java similarity index 100% rename from hotspot/test/compiler/osr/TestOSRWithNonEmptyStack.java rename to test/hotspot/jtreg/compiler/osr/TestOSRWithNonEmptyStack.java diff --git a/hotspot/test/compiler/osr/TestRangeCheck.java b/test/hotspot/jtreg/compiler/osr/TestRangeCheck.java similarity index 100% rename from hotspot/test/compiler/osr/TestRangeCheck.java rename to test/hotspot/jtreg/compiler/osr/TestRangeCheck.java diff --git a/hotspot/test/compiler/patches/java.base/java/lang/Helper.java b/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java similarity index 100% rename from hotspot/test/compiler/patches/java.base/java/lang/Helper.java rename to test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java diff --git a/hotspot/test/compiler/print/PrintInlining.java b/test/hotspot/jtreg/compiler/print/PrintInlining.java similarity index 100% rename from hotspot/test/compiler/print/PrintInlining.java rename to test/hotspot/jtreg/compiler/print/PrintInlining.java diff --git a/hotspot/test/compiler/print/TestProfileReturnTypePrinting.java b/test/hotspot/jtreg/compiler/print/TestProfileReturnTypePrinting.java similarity index 100% rename from hotspot/test/compiler/print/TestProfileReturnTypePrinting.java rename to test/hotspot/jtreg/compiler/print/TestProfileReturnTypePrinting.java diff --git a/hotspot/test/compiler/profiling/TestMethodHandleInvokesIntrinsic.java b/test/hotspot/jtreg/compiler/profiling/TestMethodHandleInvokesIntrinsic.java similarity index 100% rename from hotspot/test/compiler/profiling/TestMethodHandleInvokesIntrinsic.java rename to test/hotspot/jtreg/compiler/profiling/TestMethodHandleInvokesIntrinsic.java diff --git a/hotspot/test/compiler/profiling/TestSpecTrapClassUnloading.java b/test/hotspot/jtreg/compiler/profiling/TestSpecTrapClassUnloading.java similarity index 100% rename from hotspot/test/compiler/profiling/TestSpecTrapClassUnloading.java rename to test/hotspot/jtreg/compiler/profiling/TestSpecTrapClassUnloading.java diff --git a/hotspot/test/compiler/profiling/TestUnexpectedProfilingMismatch.java b/test/hotspot/jtreg/compiler/profiling/TestUnexpectedProfilingMismatch.java similarity index 100% rename from hotspot/test/compiler/profiling/TestUnexpectedProfilingMismatch.java rename to test/hotspot/jtreg/compiler/profiling/TestUnexpectedProfilingMismatch.java diff --git a/hotspot/test/compiler/profiling/UnsafeAccess.java b/test/hotspot/jtreg/compiler/profiling/UnsafeAccess.java similarity index 100% rename from hotspot/test/compiler/profiling/UnsafeAccess.java rename to test/hotspot/jtreg/compiler/profiling/UnsafeAccess.java diff --git a/hotspot/test/compiler/profiling/spectrapredefineclass/Agent.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Agent.java similarity index 100% rename from hotspot/test/compiler/profiling/spectrapredefineclass/Agent.java rename to test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Agent.java diff --git a/hotspot/test/compiler/profiling/spectrapredefineclass/Launcher.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java similarity index 100% rename from hotspot/test/compiler/profiling/spectrapredefineclass/Launcher.java rename to test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java diff --git a/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/A.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/A.java similarity index 100% rename from hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/A.java rename to test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/A.java diff --git a/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Agent.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Agent.java similarity index 100% rename from hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Agent.java rename to test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Agent.java diff --git a/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/B.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/B.java similarity index 100% rename from hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/B.java rename to test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/B.java diff --git a/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java similarity index 100% rename from hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java rename to test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java diff --git a/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Test.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Test.java similarity index 100% rename from hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Test.java rename to test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Test.java diff --git a/hotspot/test/compiler/profiling/unloadingconflict/B.java b/test/hotspot/jtreg/compiler/profiling/unloadingconflict/B.java similarity index 100% rename from hotspot/test/compiler/profiling/unloadingconflict/B.java rename to test/hotspot/jtreg/compiler/profiling/unloadingconflict/B.java diff --git a/hotspot/test/compiler/profiling/unloadingconflict/TestProfileConflictClassUnloading.java b/test/hotspot/jtreg/compiler/profiling/unloadingconflict/TestProfileConflictClassUnloading.java similarity index 100% rename from hotspot/test/compiler/profiling/unloadingconflict/TestProfileConflictClassUnloading.java rename to test/hotspot/jtreg/compiler/profiling/unloadingconflict/TestProfileConflictClassUnloading.java diff --git a/hotspot/test/compiler/rangechecks/PowerOf2SizedArraysChecks.java b/test/hotspot/jtreg/compiler/rangechecks/PowerOf2SizedArraysChecks.java similarity index 100% rename from hotspot/test/compiler/rangechecks/PowerOf2SizedArraysChecks.java rename to test/hotspot/jtreg/compiler/rangechecks/PowerOf2SizedArraysChecks.java diff --git a/hotspot/test/compiler/rangechecks/TestBadFoldCompare.java b/test/hotspot/jtreg/compiler/rangechecks/TestBadFoldCompare.java similarity index 100% rename from hotspot/test/compiler/rangechecks/TestBadFoldCompare.java rename to test/hotspot/jtreg/compiler/rangechecks/TestBadFoldCompare.java diff --git a/hotspot/test/compiler/rangechecks/TestExplicitRangeChecks.java b/test/hotspot/jtreg/compiler/rangechecks/TestExplicitRangeChecks.java similarity index 100% rename from hotspot/test/compiler/rangechecks/TestExplicitRangeChecks.java rename to test/hotspot/jtreg/compiler/rangechecks/TestExplicitRangeChecks.java diff --git a/hotspot/test/compiler/rangechecks/TestRangeCheckEliminationDisabled.java b/test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckEliminationDisabled.java similarity index 100% rename from hotspot/test/compiler/rangechecks/TestRangeCheckEliminationDisabled.java rename to test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckEliminationDisabled.java diff --git a/hotspot/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm b/test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm similarity index 100% rename from hotspot/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm rename to test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckExceptionHandlerLoop.jasm diff --git a/hotspot/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java b/test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java similarity index 100% rename from hotspot/test/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java rename to test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckExceptionHandlerLoopMain.java diff --git a/hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java b/test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckSmearing.java similarity index 100% rename from hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java rename to test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckSmearing.java diff --git a/hotspot/test/compiler/rangechecks/TestRangeCheckSmearingLoopOpts.java b/test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckSmearingLoopOpts.java similarity index 100% rename from hotspot/test/compiler/rangechecks/TestRangeCheckSmearingLoopOpts.java rename to test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckSmearingLoopOpts.java diff --git a/hotspot/test/compiler/rangechecks/TestUncommonTrapMerging.java b/test/hotspot/jtreg/compiler/rangechecks/TestUncommonTrapMerging.java similarity index 100% rename from hotspot/test/compiler/rangechecks/TestUncommonTrapMerging.java rename to test/hotspot/jtreg/compiler/rangechecks/TestUncommonTrapMerging.java diff --git a/hotspot/test/compiler/reflection/ArrayNewInstanceOfVoid.java b/test/hotspot/jtreg/compiler/reflection/ArrayNewInstanceOfVoid.java similarity index 100% rename from hotspot/test/compiler/reflection/ArrayNewInstanceOfVoid.java rename to test/hotspot/jtreg/compiler/reflection/ArrayNewInstanceOfVoid.java diff --git a/hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java b/test/hotspot/jtreg/compiler/regalloc/C1ObjectSpillInLogicOp.java similarity index 100% rename from hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java rename to test/hotspot/jtreg/compiler/regalloc/C1ObjectSpillInLogicOp.java diff --git a/hotspot/test/compiler/regalloc/TestVectorRegAlloc.java b/test/hotspot/jtreg/compiler/regalloc/TestVectorRegAlloc.java similarity index 100% rename from hotspot/test/compiler/regalloc/TestVectorRegAlloc.java rename to test/hotspot/jtreg/compiler/regalloc/TestVectorRegAlloc.java diff --git a/hotspot/test/compiler/relocations/TestPrintRelocations.java b/test/hotspot/jtreg/compiler/relocations/TestPrintRelocations.java similarity index 100% rename from hotspot/test/compiler/relocations/TestPrintRelocations.java rename to test/hotspot/jtreg/compiler/relocations/TestPrintRelocations.java diff --git a/hotspot/test/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java b/test/hotspot/jtreg/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java rename to test/hotspot/jtreg/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java diff --git a/hotspot/test/compiler/rtm/cli/RTMLockingAwareTest.java b/test/hotspot/jtreg/compiler/rtm/cli/RTMLockingAwareTest.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/RTMLockingAwareTest.java rename to test/hotspot/jtreg/compiler/rtm/cli/RTMLockingAwareTest.java diff --git a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsBase.java b/test/hotspot/jtreg/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsBase.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsBase.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsBase.java diff --git a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java b/test/hotspot/jtreg/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java diff --git a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java b/test/hotspot/jtreg/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java diff --git a/hotspot/test/compiler/rtm/cli/TestRTMAbortThresholdOption.java b/test/hotspot/jtreg/compiler/rtm/cli/TestRTMAbortThresholdOption.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestRTMAbortThresholdOption.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestRTMAbortThresholdOption.java diff --git a/hotspot/test/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java b/test/hotspot/jtreg/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java diff --git a/hotspot/test/compiler/rtm/cli/TestRTMLockingThresholdOption.java b/test/hotspot/jtreg/compiler/rtm/cli/TestRTMLockingThresholdOption.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestRTMLockingThresholdOption.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestRTMLockingThresholdOption.java diff --git a/hotspot/test/compiler/rtm/cli/TestRTMRetryCountOption.java b/test/hotspot/jtreg/compiler/rtm/cli/TestRTMRetryCountOption.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestRTMRetryCountOption.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestRTMRetryCountOption.java diff --git a/hotspot/test/compiler/rtm/cli/TestRTMSpinLoopCountOption.java b/test/hotspot/jtreg/compiler/rtm/cli/TestRTMSpinLoopCountOption.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestRTMSpinLoopCountOption.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestRTMSpinLoopCountOption.java diff --git a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java b/test/hotspot/jtreg/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java similarity index 100% rename from hotspot/test/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java rename to test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java diff --git a/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortRatio.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortRatio.java diff --git a/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortThreshold.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortThreshold.java diff --git a/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java diff --git a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java diff --git a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java diff --git a/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingCalculationDelay.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingCalculationDelay.java diff --git a/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingThreshold.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingThreshold.java diff --git a/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMRetryCount.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestRTMRetryCount.java diff --git a/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMSpinLoopCount.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestRTMSpinLoopCount.java diff --git a/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java b/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMAfterLockInflation.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMAfterLockInflation.java diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java b/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMDeopt.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMDeopt.java diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java b/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMForInflatedLocks.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMForInflatedLocks.java diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java b/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMForStackLocks.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMForStackLocks.java diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java b/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMXendForLockBusy.java similarity index 100% rename from hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java rename to test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMXendForLockBusy.java diff --git a/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java b/test/hotspot/jtreg/compiler/rtm/method_options/TestNoRTMLockElidingOption.java similarity index 100% rename from hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java rename to test/hotspot/jtreg/compiler/rtm/method_options/TestNoRTMLockElidingOption.java diff --git a/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java b/test/hotspot/jtreg/compiler/rtm/method_options/TestUseRTMLockElidingOption.java similarity index 100% rename from hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java rename to test/hotspot/jtreg/compiler/rtm/method_options/TestUseRTMLockElidingOption.java diff --git a/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java b/test/hotspot/jtreg/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java similarity index 100% rename from hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java rename to test/hotspot/jtreg/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java diff --git a/hotspot/test/compiler/runtime/SpreadNullArg.java b/test/hotspot/jtreg/compiler/runtime/SpreadNullArg.java similarity index 100% rename from hotspot/test/compiler/runtime/SpreadNullArg.java rename to test/hotspot/jtreg/compiler/runtime/SpreadNullArg.java diff --git a/hotspot/test/compiler/runtime/StackOverflowBug.java b/test/hotspot/jtreg/compiler/runtime/StackOverflowBug.java similarity index 100% rename from hotspot/test/compiler/runtime/StackOverflowBug.java rename to test/hotspot/jtreg/compiler/runtime/StackOverflowBug.java diff --git a/hotspot/test/compiler/runtime/Test6778657.java b/test/hotspot/jtreg/compiler/runtime/Test6778657.java similarity index 100% rename from hotspot/test/compiler/runtime/Test6778657.java rename to test/hotspot/jtreg/compiler/runtime/Test6778657.java diff --git a/hotspot/test/compiler/runtime/Test6826736.java b/test/hotspot/jtreg/compiler/runtime/Test6826736.java similarity index 100% rename from hotspot/test/compiler/runtime/Test6826736.java rename to test/hotspot/jtreg/compiler/runtime/Test6826736.java diff --git a/hotspot/test/compiler/runtime/Test6859338.java b/test/hotspot/jtreg/compiler/runtime/Test6859338.java similarity index 100% rename from hotspot/test/compiler/runtime/Test6859338.java rename to test/hotspot/jtreg/compiler/runtime/Test6859338.java diff --git a/hotspot/test/compiler/runtime/Test6863420.java b/test/hotspot/jtreg/compiler/runtime/Test6863420.java similarity index 100% rename from hotspot/test/compiler/runtime/Test6863420.java rename to test/hotspot/jtreg/compiler/runtime/Test6863420.java diff --git a/hotspot/test/compiler/runtime/Test6892265.java b/test/hotspot/jtreg/compiler/runtime/Test6892265.java similarity index 100% rename from hotspot/test/compiler/runtime/Test6892265.java rename to test/hotspot/jtreg/compiler/runtime/Test6892265.java diff --git a/hotspot/test/compiler/runtime/Test7088020.java b/test/hotspot/jtreg/compiler/runtime/Test7088020.java similarity index 100% rename from hotspot/test/compiler/runtime/Test7088020.java rename to test/hotspot/jtreg/compiler/runtime/Test7088020.java diff --git a/hotspot/test/compiler/runtime/Test7196199.java b/test/hotspot/jtreg/compiler/runtime/Test7196199.java similarity index 100% rename from hotspot/test/compiler/runtime/Test7196199.java rename to test/hotspot/jtreg/compiler/runtime/Test7196199.java diff --git a/hotspot/test/compiler/runtime/Test8010927.java b/test/hotspot/jtreg/compiler/runtime/Test8010927.java similarity index 100% rename from hotspot/test/compiler/runtime/Test8010927.java rename to test/hotspot/jtreg/compiler/runtime/Test8010927.java diff --git a/hotspot/test/compiler/runtime/cr6891750/Test6891750.java b/test/hotspot/jtreg/compiler/runtime/cr6891750/Test6891750.java similarity index 100% rename from hotspot/test/compiler/runtime/cr6891750/Test6891750.java rename to test/hotspot/jtreg/compiler/runtime/cr6891750/Test6891750.java diff --git a/hotspot/test/compiler/runtime/cr8015436/Driver8015436.java b/test/hotspot/jtreg/compiler/runtime/cr8015436/Driver8015436.java similarity index 100% rename from hotspot/test/compiler/runtime/cr8015436/Driver8015436.java rename to test/hotspot/jtreg/compiler/runtime/cr8015436/Driver8015436.java diff --git a/hotspot/test/compiler/runtime/cr8015436/Test8015436.java b/test/hotspot/jtreg/compiler/runtime/cr8015436/Test8015436.java similarity index 100% rename from hotspot/test/compiler/runtime/cr8015436/Test8015436.java rename to test/hotspot/jtreg/compiler/runtime/cr8015436/Test8015436.java diff --git a/hotspot/test/compiler/runtime/safepoints/TestRegisterRestoring.java b/test/hotspot/jtreg/compiler/runtime/safepoints/TestRegisterRestoring.java similarity index 100% rename from hotspot/test/compiler/runtime/safepoints/TestRegisterRestoring.java rename to test/hotspot/jtreg/compiler/runtime/safepoints/TestRegisterRestoring.java diff --git a/hotspot/test/compiler/stable/StableConfiguration.java b/test/hotspot/jtreg/compiler/stable/StableConfiguration.java similarity index 100% rename from hotspot/test/compiler/stable/StableConfiguration.java rename to test/hotspot/jtreg/compiler/stable/StableConfiguration.java diff --git a/hotspot/test/compiler/stable/TestStableBoolean.java b/test/hotspot/jtreg/compiler/stable/TestStableBoolean.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableBoolean.java rename to test/hotspot/jtreg/compiler/stable/TestStableBoolean.java diff --git a/hotspot/test/compiler/stable/TestStableByte.java b/test/hotspot/jtreg/compiler/stable/TestStableByte.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableByte.java rename to test/hotspot/jtreg/compiler/stable/TestStableByte.java diff --git a/hotspot/test/compiler/stable/TestStableChar.java b/test/hotspot/jtreg/compiler/stable/TestStableChar.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableChar.java rename to test/hotspot/jtreg/compiler/stable/TestStableChar.java diff --git a/hotspot/test/compiler/stable/TestStableDouble.java b/test/hotspot/jtreg/compiler/stable/TestStableDouble.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableDouble.java rename to test/hotspot/jtreg/compiler/stable/TestStableDouble.java diff --git a/hotspot/test/compiler/stable/TestStableFloat.java b/test/hotspot/jtreg/compiler/stable/TestStableFloat.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableFloat.java rename to test/hotspot/jtreg/compiler/stable/TestStableFloat.java diff --git a/hotspot/test/compiler/stable/TestStableInt.java b/test/hotspot/jtreg/compiler/stable/TestStableInt.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableInt.java rename to test/hotspot/jtreg/compiler/stable/TestStableInt.java diff --git a/hotspot/test/compiler/stable/TestStableLong.java b/test/hotspot/jtreg/compiler/stable/TestStableLong.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableLong.java rename to test/hotspot/jtreg/compiler/stable/TestStableLong.java diff --git a/hotspot/test/compiler/stable/TestStableMemoryBarrier.java b/test/hotspot/jtreg/compiler/stable/TestStableMemoryBarrier.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableMemoryBarrier.java rename to test/hotspot/jtreg/compiler/stable/TestStableMemoryBarrier.java diff --git a/hotspot/test/compiler/stable/TestStableMismatched.java b/test/hotspot/jtreg/compiler/stable/TestStableMismatched.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableMismatched.java rename to test/hotspot/jtreg/compiler/stable/TestStableMismatched.java diff --git a/hotspot/test/compiler/stable/TestStableObject.java b/test/hotspot/jtreg/compiler/stable/TestStableObject.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableObject.java rename to test/hotspot/jtreg/compiler/stable/TestStableObject.java diff --git a/hotspot/test/compiler/stable/TestStableShort.java b/test/hotspot/jtreg/compiler/stable/TestStableShort.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableShort.java rename to test/hotspot/jtreg/compiler/stable/TestStableShort.java diff --git a/hotspot/test/compiler/stable/TestStableUByte.java b/test/hotspot/jtreg/compiler/stable/TestStableUByte.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableUByte.java rename to test/hotspot/jtreg/compiler/stable/TestStableUByte.java diff --git a/hotspot/test/compiler/stable/TestStableUShort.java b/test/hotspot/jtreg/compiler/stable/TestStableUShort.java similarity index 100% rename from hotspot/test/compiler/stable/TestStableUShort.java rename to test/hotspot/jtreg/compiler/stable/TestStableUShort.java diff --git a/hotspot/test/compiler/startup/NumCompilerThreadsCheck.java b/test/hotspot/jtreg/compiler/startup/NumCompilerThreadsCheck.java similarity index 100% rename from hotspot/test/compiler/startup/NumCompilerThreadsCheck.java rename to test/hotspot/jtreg/compiler/startup/NumCompilerThreadsCheck.java diff --git a/hotspot/test/compiler/startup/SmallCodeCacheStartup.java b/test/hotspot/jtreg/compiler/startup/SmallCodeCacheStartup.java similarity index 100% rename from hotspot/test/compiler/startup/SmallCodeCacheStartup.java rename to test/hotspot/jtreg/compiler/startup/SmallCodeCacheStartup.java diff --git a/hotspot/test/compiler/startup/StartupOutput.java b/test/hotspot/jtreg/compiler/startup/StartupOutput.java similarity index 100% rename from hotspot/test/compiler/startup/StartupOutput.java rename to test/hotspot/jtreg/compiler/startup/StartupOutput.java diff --git a/hotspot/test/compiler/startup/TieredStopAtLevel0SanityTest.java b/test/hotspot/jtreg/compiler/startup/TieredStopAtLevel0SanityTest.java similarity index 100% rename from hotspot/test/compiler/startup/TieredStopAtLevel0SanityTest.java rename to test/hotspot/jtreg/compiler/startup/TieredStopAtLevel0SanityTest.java diff --git a/hotspot/test/compiler/stringopts/TestOptimizeStringConcat.java b/test/hotspot/jtreg/compiler/stringopts/TestOptimizeStringConcat.java similarity index 100% rename from hotspot/test/compiler/stringopts/TestOptimizeStringConcat.java rename to test/hotspot/jtreg/compiler/stringopts/TestOptimizeStringConcat.java diff --git a/hotspot/test/compiler/stringopts/TestStringObjectInitialization.java b/test/hotspot/jtreg/compiler/stringopts/TestStringObjectInitialization.java similarity index 100% rename from hotspot/test/compiler/stringopts/TestStringObjectInitialization.java rename to test/hotspot/jtreg/compiler/stringopts/TestStringObjectInitialization.java diff --git a/hotspot/test/compiler/testlibrary/CompilerUtils.java b/test/hotspot/jtreg/compiler/testlibrary/CompilerUtils.java similarity index 100% rename from hotspot/test/compiler/testlibrary/CompilerUtils.java rename to test/hotspot/jtreg/compiler/testlibrary/CompilerUtils.java diff --git a/hotspot/test/compiler/testlibrary/intrinsics/Verifier.java b/test/hotspot/jtreg/compiler/testlibrary/intrinsics/Verifier.java similarity index 100% rename from hotspot/test/compiler/testlibrary/intrinsics/Verifier.java rename to test/hotspot/jtreg/compiler/testlibrary/intrinsics/Verifier.java diff --git a/hotspot/test/compiler/testlibrary/rtm/AbortProvoker.java b/test/hotspot/jtreg/compiler/testlibrary/rtm/AbortProvoker.java similarity index 100% rename from hotspot/test/compiler/testlibrary/rtm/AbortProvoker.java rename to test/hotspot/jtreg/compiler/testlibrary/rtm/AbortProvoker.java diff --git a/hotspot/test/compiler/testlibrary/rtm/AbortType.java b/test/hotspot/jtreg/compiler/testlibrary/rtm/AbortType.java similarity index 100% rename from hotspot/test/compiler/testlibrary/rtm/AbortType.java rename to test/hotspot/jtreg/compiler/testlibrary/rtm/AbortType.java diff --git a/hotspot/test/compiler/testlibrary/rtm/BufferOverflowProvoker.java b/test/hotspot/jtreg/compiler/testlibrary/rtm/BufferOverflowProvoker.java similarity index 100% rename from hotspot/test/compiler/testlibrary/rtm/BufferOverflowProvoker.java rename to test/hotspot/jtreg/compiler/testlibrary/rtm/BufferOverflowProvoker.java diff --git a/hotspot/test/compiler/testlibrary/rtm/BusyLock.java b/test/hotspot/jtreg/compiler/testlibrary/rtm/BusyLock.java similarity index 100% rename from hotspot/test/compiler/testlibrary/rtm/BusyLock.java rename to test/hotspot/jtreg/compiler/testlibrary/rtm/BusyLock.java diff --git a/hotspot/test/compiler/testlibrary/rtm/CompilableTest.java b/test/hotspot/jtreg/compiler/testlibrary/rtm/CompilableTest.java similarity index 100% rename from hotspot/test/compiler/testlibrary/rtm/CompilableTest.java rename to test/hotspot/jtreg/compiler/testlibrary/rtm/CompilableTest.java diff --git a/hotspot/test/compiler/testlibrary/rtm/MemoryConflictProvoker.java b/test/hotspot/jtreg/compiler/testlibrary/rtm/MemoryConflictProvoker.java similarity index 100% rename from hotspot/test/compiler/testlibrary/rtm/MemoryConflictProvoker.java rename to test/hotspot/jtreg/compiler/testlibrary/rtm/MemoryConflictProvoker.java diff --git a/hotspot/test/compiler/testlibrary/rtm/NestedAbortProvoker.java b/test/hotspot/jtreg/compiler/testlibrary/rtm/NestedAbortProvoker.java similarity index 100% rename from hotspot/test/compiler/testlibrary/rtm/NestedAbortProvoker.java rename to test/hotspot/jtreg/compiler/testlibrary/rtm/NestedAbortProvoker.java diff --git a/hotspot/test/compiler/testlibrary/rtm/RTMLockingStatistics.java b/test/hotspot/jtreg/compiler/testlibrary/rtm/RTMLockingStatistics.java similarity index 100% rename from hotspot/test/compiler/testlibrary/rtm/RTMLockingStatistics.java rename to test/hotspot/jtreg/compiler/testlibrary/rtm/RTMLockingStatistics.java diff --git a/hotspot/test/compiler/testlibrary/rtm/RTMTestBase.java b/test/hotspot/jtreg/compiler/testlibrary/rtm/RTMTestBase.java similarity index 100% rename from hotspot/test/compiler/testlibrary/rtm/RTMTestBase.java rename to test/hotspot/jtreg/compiler/testlibrary/rtm/RTMTestBase.java diff --git a/hotspot/test/compiler/testlibrary/rtm/XAbortProvoker.java b/test/hotspot/jtreg/compiler/testlibrary/rtm/XAbortProvoker.java similarity index 100% rename from hotspot/test/compiler/testlibrary/rtm/XAbortProvoker.java rename to test/hotspot/jtreg/compiler/testlibrary/rtm/XAbortProvoker.java diff --git a/hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java b/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java similarity index 100% rename from hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java rename to test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java diff --git a/hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java b/test/hotspot/jtreg/compiler/testlibrary/uncommontrap/Verifier.java similarity index 100% rename from hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java rename to test/hotspot/jtreg/compiler/testlibrary/uncommontrap/Verifier.java diff --git a/hotspot/test/compiler/tiered/CompLevelsTest.java b/test/hotspot/jtreg/compiler/tiered/CompLevelsTest.java similarity index 100% rename from hotspot/test/compiler/tiered/CompLevelsTest.java rename to test/hotspot/jtreg/compiler/tiered/CompLevelsTest.java diff --git a/hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java b/test/hotspot/jtreg/compiler/tiered/ConstantGettersTransitionsTest.java similarity index 100% rename from hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java rename to test/hotspot/jtreg/compiler/tiered/ConstantGettersTransitionsTest.java diff --git a/hotspot/test/compiler/tiered/LevelTransitionTest.java b/test/hotspot/jtreg/compiler/tiered/LevelTransitionTest.java similarity index 100% rename from hotspot/test/compiler/tiered/LevelTransitionTest.java rename to test/hotspot/jtreg/compiler/tiered/LevelTransitionTest.java diff --git a/hotspot/test/compiler/tiered/NonTieredLevelsTest.java b/test/hotspot/jtreg/compiler/tiered/NonTieredLevelsTest.java similarity index 100% rename from hotspot/test/compiler/tiered/NonTieredLevelsTest.java rename to test/hotspot/jtreg/compiler/tiered/NonTieredLevelsTest.java diff --git a/hotspot/test/compiler/tiered/TieredLevelsTest.java b/test/hotspot/jtreg/compiler/tiered/TieredLevelsTest.java similarity index 100% rename from hotspot/test/compiler/tiered/TieredLevelsTest.java rename to test/hotspot/jtreg/compiler/tiered/TieredLevelsTest.java diff --git a/hotspot/test/compiler/tiered/TransitionsTestExecutor.java b/test/hotspot/jtreg/compiler/tiered/TransitionsTestExecutor.java similarity index 100% rename from hotspot/test/compiler/tiered/TransitionsTestExecutor.java rename to test/hotspot/jtreg/compiler/tiered/TransitionsTestExecutor.java diff --git a/hotspot/test/compiler/types/TestMeetExactConstantArrays.java b/test/hotspot/jtreg/compiler/types/TestMeetExactConstantArrays.java similarity index 100% rename from hotspot/test/compiler/types/TestMeetExactConstantArrays.java rename to test/hotspot/jtreg/compiler/types/TestMeetExactConstantArrays.java diff --git a/hotspot/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java b/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java similarity index 100% rename from hotspot/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java rename to test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java diff --git a/hotspot/test/compiler/types/TestMeetTopArrayExactConstantArray.java b/test/hotspot/jtreg/compiler/types/TestMeetTopArrayExactConstantArray.java similarity index 100% rename from hotspot/test/compiler/types/TestMeetTopArrayExactConstantArray.java rename to test/hotspot/jtreg/compiler/types/TestMeetTopArrayExactConstantArray.java diff --git a/hotspot/test/compiler/types/TestPhiElimination.java b/test/hotspot/jtreg/compiler/types/TestPhiElimination.java similarity index 100% rename from hotspot/test/compiler/types/TestPhiElimination.java rename to test/hotspot/jtreg/compiler/types/TestPhiElimination.java diff --git a/hotspot/test/compiler/types/TestSpeculationFailedHigherEqual.java b/test/hotspot/jtreg/compiler/types/TestSpeculationFailedHigherEqual.java similarity index 100% rename from hotspot/test/compiler/types/TestSpeculationFailedHigherEqual.java rename to test/hotspot/jtreg/compiler/types/TestSpeculationFailedHigherEqual.java diff --git a/hotspot/test/compiler/types/TestTypePropagationToCmpU.java b/test/hotspot/jtreg/compiler/types/TestTypePropagationToCmpU.java similarity index 100% rename from hotspot/test/compiler/types/TestTypePropagationToCmpU.java rename to test/hotspot/jtreg/compiler/types/TestTypePropagationToCmpU.java diff --git a/hotspot/test/compiler/types/TypeSpeculation.java b/test/hotspot/jtreg/compiler/types/TypeSpeculation.java similarity index 100% rename from hotspot/test/compiler/types/TypeSpeculation.java rename to test/hotspot/jtreg/compiler/types/TypeSpeculation.java diff --git a/hotspot/test/compiler/types/correctness/CorrectnessTest.java b/test/hotspot/jtreg/compiler/types/correctness/CorrectnessTest.java similarity index 100% rename from hotspot/test/compiler/types/correctness/CorrectnessTest.java rename to test/hotspot/jtreg/compiler/types/correctness/CorrectnessTest.java diff --git a/hotspot/test/compiler/types/correctness/OffTest.java b/test/hotspot/jtreg/compiler/types/correctness/OffTest.java similarity index 100% rename from hotspot/test/compiler/types/correctness/OffTest.java rename to test/hotspot/jtreg/compiler/types/correctness/OffTest.java diff --git a/hotspot/test/compiler/types/correctness/execution/Execution.java b/test/hotspot/jtreg/compiler/types/correctness/execution/Execution.java similarity index 100% rename from hotspot/test/compiler/types/correctness/execution/Execution.java rename to test/hotspot/jtreg/compiler/types/correctness/execution/Execution.java diff --git a/hotspot/test/compiler/types/correctness/execution/MethodHandleDelegate.java b/test/hotspot/jtreg/compiler/types/correctness/execution/MethodHandleDelegate.java similarity index 100% rename from hotspot/test/compiler/types/correctness/execution/MethodHandleDelegate.java rename to test/hotspot/jtreg/compiler/types/correctness/execution/MethodHandleDelegate.java diff --git a/hotspot/test/compiler/types/correctness/execution/TypeConflict.java b/test/hotspot/jtreg/compiler/types/correctness/execution/TypeConflict.java similarity index 100% rename from hotspot/test/compiler/types/correctness/execution/TypeConflict.java rename to test/hotspot/jtreg/compiler/types/correctness/execution/TypeConflict.java diff --git a/hotspot/test/compiler/types/correctness/execution/TypeProfile.java b/test/hotspot/jtreg/compiler/types/correctness/execution/TypeProfile.java similarity index 100% rename from hotspot/test/compiler/types/correctness/execution/TypeProfile.java rename to test/hotspot/jtreg/compiler/types/correctness/execution/TypeProfile.java diff --git a/hotspot/test/compiler/types/correctness/hierarchies/DefaultMethodInterface.java b/test/hotspot/jtreg/compiler/types/correctness/hierarchies/DefaultMethodInterface.java similarity index 100% rename from hotspot/test/compiler/types/correctness/hierarchies/DefaultMethodInterface.java rename to test/hotspot/jtreg/compiler/types/correctness/hierarchies/DefaultMethodInterface.java diff --git a/hotspot/test/compiler/types/correctness/hierarchies/DefaultMethodInterface2.java b/test/hotspot/jtreg/compiler/types/correctness/hierarchies/DefaultMethodInterface2.java similarity index 100% rename from hotspot/test/compiler/types/correctness/hierarchies/DefaultMethodInterface2.java rename to test/hotspot/jtreg/compiler/types/correctness/hierarchies/DefaultMethodInterface2.java diff --git a/hotspot/test/compiler/types/correctness/hierarchies/Linear.java b/test/hotspot/jtreg/compiler/types/correctness/hierarchies/Linear.java similarity index 100% rename from hotspot/test/compiler/types/correctness/hierarchies/Linear.java rename to test/hotspot/jtreg/compiler/types/correctness/hierarchies/Linear.java diff --git a/hotspot/test/compiler/types/correctness/hierarchies/Linear2.java b/test/hotspot/jtreg/compiler/types/correctness/hierarchies/Linear2.java similarity index 100% rename from hotspot/test/compiler/types/correctness/hierarchies/Linear2.java rename to test/hotspot/jtreg/compiler/types/correctness/hierarchies/Linear2.java diff --git a/hotspot/test/compiler/types/correctness/hierarchies/NullableType.java b/test/hotspot/jtreg/compiler/types/correctness/hierarchies/NullableType.java similarity index 100% rename from hotspot/test/compiler/types/correctness/hierarchies/NullableType.java rename to test/hotspot/jtreg/compiler/types/correctness/hierarchies/NullableType.java diff --git a/hotspot/test/compiler/types/correctness/hierarchies/OneRank.java b/test/hotspot/jtreg/compiler/types/correctness/hierarchies/OneRank.java similarity index 100% rename from hotspot/test/compiler/types/correctness/hierarchies/OneRank.java rename to test/hotspot/jtreg/compiler/types/correctness/hierarchies/OneRank.java diff --git a/hotspot/test/compiler/types/correctness/hierarchies/TypeHierarchy.java b/test/hotspot/jtreg/compiler/types/correctness/hierarchies/TypeHierarchy.java similarity index 100% rename from hotspot/test/compiler/types/correctness/hierarchies/TypeHierarchy.java rename to test/hotspot/jtreg/compiler/types/correctness/hierarchies/TypeHierarchy.java diff --git a/hotspot/test/compiler/types/correctness/scenarios/ArrayCopy.java b/test/hotspot/jtreg/compiler/types/correctness/scenarios/ArrayCopy.java similarity index 100% rename from hotspot/test/compiler/types/correctness/scenarios/ArrayCopy.java rename to test/hotspot/jtreg/compiler/types/correctness/scenarios/ArrayCopy.java diff --git a/hotspot/test/compiler/types/correctness/scenarios/ArrayReferenceStore.java b/test/hotspot/jtreg/compiler/types/correctness/scenarios/ArrayReferenceStore.java similarity index 100% rename from hotspot/test/compiler/types/correctness/scenarios/ArrayReferenceStore.java rename to test/hotspot/jtreg/compiler/types/correctness/scenarios/ArrayReferenceStore.java diff --git a/hotspot/test/compiler/types/correctness/scenarios/ArrayScenario.java b/test/hotspot/jtreg/compiler/types/correctness/scenarios/ArrayScenario.java similarity index 100% rename from hotspot/test/compiler/types/correctness/scenarios/ArrayScenario.java rename to test/hotspot/jtreg/compiler/types/correctness/scenarios/ArrayScenario.java diff --git a/hotspot/test/compiler/types/correctness/scenarios/CheckCast.java b/test/hotspot/jtreg/compiler/types/correctness/scenarios/CheckCast.java similarity index 100% rename from hotspot/test/compiler/types/correctness/scenarios/CheckCast.java rename to test/hotspot/jtreg/compiler/types/correctness/scenarios/CheckCast.java diff --git a/hotspot/test/compiler/types/correctness/scenarios/ClassIdentity.java b/test/hotspot/jtreg/compiler/types/correctness/scenarios/ClassIdentity.java similarity index 100% rename from hotspot/test/compiler/types/correctness/scenarios/ClassIdentity.java rename to test/hotspot/jtreg/compiler/types/correctness/scenarios/ClassIdentity.java diff --git a/hotspot/test/compiler/types/correctness/scenarios/ClassInstanceOf.java b/test/hotspot/jtreg/compiler/types/correctness/scenarios/ClassInstanceOf.java similarity index 100% rename from hotspot/test/compiler/types/correctness/scenarios/ClassInstanceOf.java rename to test/hotspot/jtreg/compiler/types/correctness/scenarios/ClassInstanceOf.java diff --git a/hotspot/test/compiler/types/correctness/scenarios/ClassIsInstance.java b/test/hotspot/jtreg/compiler/types/correctness/scenarios/ClassIsInstance.java similarity index 100% rename from hotspot/test/compiler/types/correctness/scenarios/ClassIsInstance.java rename to test/hotspot/jtreg/compiler/types/correctness/scenarios/ClassIsInstance.java diff --git a/hotspot/test/compiler/types/correctness/scenarios/ProfilingType.java b/test/hotspot/jtreg/compiler/types/correctness/scenarios/ProfilingType.java similarity index 100% rename from hotspot/test/compiler/types/correctness/scenarios/ProfilingType.java rename to test/hotspot/jtreg/compiler/types/correctness/scenarios/ProfilingType.java diff --git a/hotspot/test/compiler/types/correctness/scenarios/ReceiverAtInvokes.java b/test/hotspot/jtreg/compiler/types/correctness/scenarios/ReceiverAtInvokes.java similarity index 100% rename from hotspot/test/compiler/types/correctness/scenarios/ReceiverAtInvokes.java rename to test/hotspot/jtreg/compiler/types/correctness/scenarios/ReceiverAtInvokes.java diff --git a/hotspot/test/compiler/types/correctness/scenarios/Scenario.java b/test/hotspot/jtreg/compiler/types/correctness/scenarios/Scenario.java similarity index 100% rename from hotspot/test/compiler/types/correctness/scenarios/Scenario.java rename to test/hotspot/jtreg/compiler/types/correctness/scenarios/Scenario.java diff --git a/hotspot/test/compiler/uncommontrap/DeoptReallocFailure.java b/test/hotspot/jtreg/compiler/uncommontrap/DeoptReallocFailure.java similarity index 100% rename from hotspot/test/compiler/uncommontrap/DeoptReallocFailure.java rename to test/hotspot/jtreg/compiler/uncommontrap/DeoptReallocFailure.java diff --git a/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java b/test/hotspot/jtreg/compiler/uncommontrap/StackOverflowGuardPagesOff.java similarity index 100% rename from hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java rename to test/hotspot/jtreg/compiler/uncommontrap/StackOverflowGuardPagesOff.java diff --git a/hotspot/test/compiler/uncommontrap/Test8009761.java b/test/hotspot/jtreg/compiler/uncommontrap/Test8009761.java similarity index 100% rename from hotspot/test/compiler/uncommontrap/Test8009761.java rename to test/hotspot/jtreg/compiler/uncommontrap/Test8009761.java diff --git a/hotspot/test/compiler/uncommontrap/TestDeoptOOM.java b/test/hotspot/jtreg/compiler/uncommontrap/TestDeoptOOM.java similarity index 100% rename from hotspot/test/compiler/uncommontrap/TestDeoptOOM.java rename to test/hotspot/jtreg/compiler/uncommontrap/TestDeoptOOM.java diff --git a/hotspot/test/compiler/uncommontrap/TestLockEliminatedAtDeopt.java b/test/hotspot/jtreg/compiler/uncommontrap/TestLockEliminatedAtDeopt.java similarity index 100% rename from hotspot/test/compiler/uncommontrap/TestLockEliminatedAtDeopt.java rename to test/hotspot/jtreg/compiler/uncommontrap/TestLockEliminatedAtDeopt.java diff --git a/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java b/test/hotspot/jtreg/compiler/uncommontrap/TestStackBangMonitorOwned.java similarity index 100% rename from hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java rename to test/hotspot/jtreg/compiler/uncommontrap/TestStackBangMonitorOwned.java diff --git a/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java b/test/hotspot/jtreg/compiler/uncommontrap/TestStackBangRbp.java similarity index 100% rename from hotspot/test/compiler/uncommontrap/TestStackBangRbp.java rename to test/hotspot/jtreg/compiler/uncommontrap/TestStackBangRbp.java diff --git a/hotspot/test/compiler/uncommontrap/TestUnstableIfTrap.java b/test/hotspot/jtreg/compiler/uncommontrap/TestUnstableIfTrap.java similarity index 100% rename from hotspot/test/compiler/uncommontrap/TestUnstableIfTrap.java rename to test/hotspot/jtreg/compiler/uncommontrap/TestUnstableIfTrap.java diff --git a/hotspot/test/compiler/uncommontrap/TraceDeoptimizationNoRealloc.java b/test/hotspot/jtreg/compiler/uncommontrap/TraceDeoptimizationNoRealloc.java similarity index 100% rename from hotspot/test/compiler/uncommontrap/TraceDeoptimizationNoRealloc.java rename to test/hotspot/jtreg/compiler/uncommontrap/TraceDeoptimizationNoRealloc.java diff --git a/hotspot/test/compiler/uncommontrap/UncommonTrapStackBang.java b/test/hotspot/jtreg/compiler/uncommontrap/UncommonTrapStackBang.java similarity index 100% rename from hotspot/test/compiler/uncommontrap/UncommonTrapStackBang.java rename to test/hotspot/jtreg/compiler/uncommontrap/UncommonTrapStackBang.java diff --git a/hotspot/test/compiler/unsafe/GetUnsafeObjectG1PreBarrier.java b/test/hotspot/jtreg/compiler/unsafe/GetUnsafeObjectG1PreBarrier.java similarity index 100% rename from hotspot/test/compiler/unsafe/GetUnsafeObjectG1PreBarrier.java rename to test/hotspot/jtreg/compiler/unsafe/GetUnsafeObjectG1PreBarrier.java diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestBoolean.java b/test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestBoolean.java similarity index 100% rename from hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestBoolean.java rename to test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestBoolean.java diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestByte.java b/test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestByte.java similarity index 100% rename from hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestByte.java rename to test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestByte.java diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java b/test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java similarity index 100% rename from hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java rename to test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestDouble.java b/test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestDouble.java similarity index 100% rename from hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestDouble.java rename to test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestDouble.java diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestFloat.java b/test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestFloat.java similarity index 100% rename from hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestFloat.java rename to test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestFloat.java diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestInt.java b/test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestInt.java similarity index 100% rename from hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestInt.java rename to test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestInt.java diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestLong.java b/test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestLong.java similarity index 100% rename from hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestLong.java rename to test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestLong.java diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestObject.java b/test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestObject.java similarity index 100% rename from hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestObject.java rename to test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestObject.java diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestShort.java b/test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestShort.java similarity index 100% rename from hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestShort.java rename to test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestShort.java diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java b/test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java similarity index 100% rename from hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java rename to test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java diff --git a/hotspot/test/compiler/unsafe/MixedUnsafeStoreObject.java b/test/hotspot/jtreg/compiler/unsafe/MixedUnsafeStoreObject.java similarity index 100% rename from hotspot/test/compiler/unsafe/MixedUnsafeStoreObject.java rename to test/hotspot/jtreg/compiler/unsafe/MixedUnsafeStoreObject.java diff --git a/hotspot/test/compiler/unsafe/OpaqueAccesses.java b/test/hotspot/jtreg/compiler/unsafe/OpaqueAccesses.java similarity index 100% rename from hotspot/test/compiler/unsafe/OpaqueAccesses.java rename to test/hotspot/jtreg/compiler/unsafe/OpaqueAccesses.java diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestBoolean.java b/test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestBoolean.java similarity index 100% rename from hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestBoolean.java rename to test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestBoolean.java diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestByte.java b/test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestByte.java similarity index 100% rename from hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestByte.java rename to test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestByte.java diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestChar.java b/test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestChar.java similarity index 100% rename from hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestChar.java rename to test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestChar.java diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestDouble.java b/test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestDouble.java similarity index 100% rename from hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestDouble.java rename to test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestDouble.java diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestFloat.java b/test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestFloat.java similarity index 100% rename from hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestFloat.java rename to test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestFloat.java diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestInt.java b/test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestInt.java similarity index 100% rename from hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestInt.java rename to test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestInt.java diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestLong.java b/test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestLong.java similarity index 100% rename from hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestLong.java rename to test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestLong.java diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestObject.java b/test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestObject.java similarity index 100% rename from hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestObject.java rename to test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestObject.java diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestShort.java b/test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestShort.java similarity index 100% rename from hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestShort.java rename to test/hotspot/jtreg/compiler/unsafe/SunMiscUnsafeAccessTestShort.java diff --git a/hotspot/test/compiler/unsafe/TestMaybeNullUnsafeAccess.java b/test/hotspot/jtreg/compiler/unsafe/TestMaybeNullUnsafeAccess.java similarity index 100% rename from hotspot/test/compiler/unsafe/TestMaybeNullUnsafeAccess.java rename to test/hotspot/jtreg/compiler/unsafe/TestMaybeNullUnsafeAccess.java diff --git a/hotspot/test/compiler/unsafe/TestRawAliasing.java b/test/hotspot/jtreg/compiler/unsafe/TestRawAliasing.java similarity index 100% rename from hotspot/test/compiler/unsafe/TestRawAliasing.java rename to test/hotspot/jtreg/compiler/unsafe/TestRawAliasing.java diff --git a/hotspot/test/compiler/unsafe/TestUnsafeLoadControl.java b/test/hotspot/jtreg/compiler/unsafe/TestUnsafeLoadControl.java similarity index 100% rename from hotspot/test/compiler/unsafe/TestUnsafeLoadControl.java rename to test/hotspot/jtreg/compiler/unsafe/TestUnsafeLoadControl.java diff --git a/hotspot/test/compiler/unsafe/UnsafeGetConstantField.java b/test/hotspot/jtreg/compiler/unsafe/UnsafeGetConstantField.java similarity index 100% rename from hotspot/test/compiler/unsafe/UnsafeGetConstantField.java rename to test/hotspot/jtreg/compiler/unsafe/UnsafeGetConstantField.java diff --git a/hotspot/test/compiler/unsafe/UnsafeGetStableArrayElement.java b/test/hotspot/jtreg/compiler/unsafe/UnsafeGetStableArrayElement.java similarity index 100% rename from hotspot/test/compiler/unsafe/UnsafeGetStableArrayElement.java rename to test/hotspot/jtreg/compiler/unsafe/UnsafeGetStableArrayElement.java diff --git a/hotspot/test/compiler/unsafe/UnsafeOffHeapBooleanTest.java b/test/hotspot/jtreg/compiler/unsafe/UnsafeOffHeapBooleanTest.java similarity index 100% rename from hotspot/test/compiler/unsafe/UnsafeOffHeapBooleanTest.java rename to test/hotspot/jtreg/compiler/unsafe/UnsafeOffHeapBooleanTest.java diff --git a/hotspot/test/compiler/unsafe/UnsafeOnHeapBooleanTest.java b/test/hotspot/jtreg/compiler/unsafe/UnsafeOnHeapBooleanTest.java similarity index 100% rename from hotspot/test/compiler/unsafe/UnsafeOnHeapBooleanTest.java rename to test/hotspot/jtreg/compiler/unsafe/UnsafeOnHeapBooleanTest.java diff --git a/hotspot/test/compiler/unsafe/UnsafeRaw.java b/test/hotspot/jtreg/compiler/unsafe/UnsafeRaw.java similarity index 100% rename from hotspot/test/compiler/unsafe/UnsafeRaw.java rename to test/hotspot/jtreg/compiler/unsafe/UnsafeRaw.java diff --git a/hotspot/test/compiler/unsafe/UnsafeSmallOffsetBooleanAccessTest.java b/test/hotspot/jtreg/compiler/unsafe/UnsafeSmallOffsetBooleanAccessTest.java similarity index 100% rename from hotspot/test/compiler/unsafe/UnsafeSmallOffsetBooleanAccessTest.java rename to test/hotspot/jtreg/compiler/unsafe/UnsafeSmallOffsetBooleanAccessTest.java diff --git a/hotspot/test/compiler/unsafe/X-UnsafeAccessTest.java.template b/test/hotspot/jtreg/compiler/unsafe/X-UnsafeAccessTest.java.template similarity index 100% rename from hotspot/test/compiler/unsafe/X-UnsafeAccessTest.java.template rename to test/hotspot/jtreg/compiler/unsafe/X-UnsafeAccessTest.java.template diff --git a/hotspot/test/compiler/unsafe/generate-unsafe-access-tests.sh b/test/hotspot/jtreg/compiler/unsafe/generate-unsafe-access-tests.sh similarity index 100% rename from hotspot/test/compiler/unsafe/generate-unsafe-access-tests.sh rename to test/hotspot/jtreg/compiler/unsafe/generate-unsafe-access-tests.sh diff --git a/hotspot/test/compiler/vectorization/TestNaNVector.java b/test/hotspot/jtreg/compiler/vectorization/TestNaNVector.java similarity index 100% rename from hotspot/test/compiler/vectorization/TestNaNVector.java rename to test/hotspot/jtreg/compiler/vectorization/TestNaNVector.java diff --git a/hotspot/test/compiler/vectorization/TestVectorUnalignedOffset.java b/test/hotspot/jtreg/compiler/vectorization/TestVectorUnalignedOffset.java similarity index 100% rename from hotspot/test/compiler/vectorization/TestVectorUnalignedOffset.java rename to test/hotspot/jtreg/compiler/vectorization/TestVectorUnalignedOffset.java diff --git a/hotspot/test/compiler/whitebox/AllocationCodeBlobTest.java b/test/hotspot/jtreg/compiler/whitebox/AllocationCodeBlobTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/AllocationCodeBlobTest.java rename to test/hotspot/jtreg/compiler/whitebox/AllocationCodeBlobTest.java diff --git a/hotspot/test/compiler/whitebox/BlockingCompilation.java b/test/hotspot/jtreg/compiler/whitebox/BlockingCompilation.java similarity index 100% rename from hotspot/test/compiler/whitebox/BlockingCompilation.java rename to test/hotspot/jtreg/compiler/whitebox/BlockingCompilation.java diff --git a/hotspot/test/compiler/whitebox/ClearMethodStateTest.java b/test/hotspot/jtreg/compiler/whitebox/ClearMethodStateTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/ClearMethodStateTest.java rename to test/hotspot/jtreg/compiler/whitebox/ClearMethodStateTest.java diff --git a/hotspot/test/compiler/whitebox/CompilerWhiteBoxTest.java b/test/hotspot/jtreg/compiler/whitebox/CompilerWhiteBoxTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/CompilerWhiteBoxTest.java rename to test/hotspot/jtreg/compiler/whitebox/CompilerWhiteBoxTest.java diff --git a/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java b/test/hotspot/jtreg/compiler/whitebox/DeoptimizeAllTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/DeoptimizeAllTest.java rename to test/hotspot/jtreg/compiler/whitebox/DeoptimizeAllTest.java diff --git a/hotspot/test/compiler/whitebox/DeoptimizeFramesTest.java b/test/hotspot/jtreg/compiler/whitebox/DeoptimizeFramesTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/DeoptimizeFramesTest.java rename to test/hotspot/jtreg/compiler/whitebox/DeoptimizeFramesTest.java diff --git a/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java b/test/hotspot/jtreg/compiler/whitebox/DeoptimizeMethodTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java rename to test/hotspot/jtreg/compiler/whitebox/DeoptimizeMethodTest.java diff --git a/hotspot/test/compiler/whitebox/DeoptimizeMultipleOSRTest.java b/test/hotspot/jtreg/compiler/whitebox/DeoptimizeMultipleOSRTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/DeoptimizeMultipleOSRTest.java rename to test/hotspot/jtreg/compiler/whitebox/DeoptimizeMultipleOSRTest.java diff --git a/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java b/test/hotspot/jtreg/compiler/whitebox/EnqueueMethodForCompilationTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java rename to test/hotspot/jtreg/compiler/whitebox/EnqueueMethodForCompilationTest.java diff --git a/hotspot/test/compiler/whitebox/ForceNMethodSweepTest.java b/test/hotspot/jtreg/compiler/whitebox/ForceNMethodSweepTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/ForceNMethodSweepTest.java rename to test/hotspot/jtreg/compiler/whitebox/ForceNMethodSweepTest.java diff --git a/hotspot/test/compiler/whitebox/GetCodeHeapEntriesTest.java b/test/hotspot/jtreg/compiler/whitebox/GetCodeHeapEntriesTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/GetCodeHeapEntriesTest.java rename to test/hotspot/jtreg/compiler/whitebox/GetCodeHeapEntriesTest.java diff --git a/hotspot/test/compiler/whitebox/GetNMethodTest.java b/test/hotspot/jtreg/compiler/whitebox/GetNMethodTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/GetNMethodTest.java rename to test/hotspot/jtreg/compiler/whitebox/GetNMethodTest.java diff --git a/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java b/test/hotspot/jtreg/compiler/whitebox/IsMethodCompilableTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/IsMethodCompilableTest.java rename to test/hotspot/jtreg/compiler/whitebox/IsMethodCompilableTest.java diff --git a/hotspot/test/compiler/whitebox/LockCompilationTest.java b/test/hotspot/jtreg/compiler/whitebox/LockCompilationTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/LockCompilationTest.java rename to test/hotspot/jtreg/compiler/whitebox/LockCompilationTest.java diff --git a/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java b/test/hotspot/jtreg/compiler/whitebox/MakeMethodNotCompilableTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java rename to test/hotspot/jtreg/compiler/whitebox/MakeMethodNotCompilableTest.java diff --git a/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java b/test/hotspot/jtreg/compiler/whitebox/SetDontInlineMethodTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java rename to test/hotspot/jtreg/compiler/whitebox/SetDontInlineMethodTest.java diff --git a/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java b/test/hotspot/jtreg/compiler/whitebox/SetForceInlineMethodTest.java similarity index 100% rename from hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java rename to test/hotspot/jtreg/compiler/whitebox/SetForceInlineMethodTest.java diff --git a/hotspot/test/compiler/whitebox/SimpleTestCase.java b/test/hotspot/jtreg/compiler/whitebox/SimpleTestCase.java similarity index 100% rename from hotspot/test/compiler/whitebox/SimpleTestCase.java rename to test/hotspot/jtreg/compiler/whitebox/SimpleTestCase.java diff --git a/hotspot/test/gc/CondCardMark/Basic.java b/test/hotspot/jtreg/gc/CondCardMark/Basic.java similarity index 100% rename from hotspot/test/gc/CondCardMark/Basic.java rename to test/hotspot/jtreg/gc/CondCardMark/Basic.java diff --git a/hotspot/test/gc/TestAgeOutput.java b/test/hotspot/jtreg/gc/TestAgeOutput.java similarity index 100% rename from hotspot/test/gc/TestAgeOutput.java rename to test/hotspot/jtreg/gc/TestAgeOutput.java diff --git a/hotspot/test/gc/TestBigObj.java b/test/hotspot/jtreg/gc/TestBigObj.java similarity index 100% rename from hotspot/test/gc/TestBigObj.java rename to test/hotspot/jtreg/gc/TestBigObj.java diff --git a/hotspot/test/gc/TestCardTablePageCommits.java b/test/hotspot/jtreg/gc/TestCardTablePageCommits.java similarity index 100% rename from hotspot/test/gc/TestCardTablePageCommits.java rename to test/hotspot/jtreg/gc/TestCardTablePageCommits.java diff --git a/hotspot/test/gc/TestDisableExplicitGC.java b/test/hotspot/jtreg/gc/TestDisableExplicitGC.java similarity index 100% rename from hotspot/test/gc/TestDisableExplicitGC.java rename to test/hotspot/jtreg/gc/TestDisableExplicitGC.java diff --git a/hotspot/test/gc/TestFullGCALot.java b/test/hotspot/jtreg/gc/TestFullGCALot.java similarity index 100% rename from hotspot/test/gc/TestFullGCALot.java rename to test/hotspot/jtreg/gc/TestFullGCALot.java diff --git a/hotspot/test/gc/TestFullGCCount.java b/test/hotspot/jtreg/gc/TestFullGCCount.java similarity index 100% rename from hotspot/test/gc/TestFullGCCount.java rename to test/hotspot/jtreg/gc/TestFullGCCount.java diff --git a/hotspot/test/gc/TestHumongousReferenceObject.java b/test/hotspot/jtreg/gc/TestHumongousReferenceObject.java similarity index 100% rename from hotspot/test/gc/TestHumongousReferenceObject.java rename to test/hotspot/jtreg/gc/TestHumongousReferenceObject.java diff --git a/hotspot/test/gc/TestMemoryInitialization.java b/test/hotspot/jtreg/gc/TestMemoryInitialization.java similarity index 100% rename from hotspot/test/gc/TestMemoryInitialization.java rename to test/hotspot/jtreg/gc/TestMemoryInitialization.java diff --git a/hotspot/test/gc/TestMemoryInitializationWithCMS.java b/test/hotspot/jtreg/gc/TestMemoryInitializationWithCMS.java similarity index 100% rename from hotspot/test/gc/TestMemoryInitializationWithCMS.java rename to test/hotspot/jtreg/gc/TestMemoryInitializationWithCMS.java diff --git a/hotspot/test/gc/TestMemoryInitializationWithSerial.java b/test/hotspot/jtreg/gc/TestMemoryInitializationWithSerial.java similarity index 100% rename from hotspot/test/gc/TestMemoryInitializationWithSerial.java rename to test/hotspot/jtreg/gc/TestMemoryInitializationWithSerial.java diff --git a/hotspot/test/gc/TestNUMAPageSize.java b/test/hotspot/jtreg/gc/TestNUMAPageSize.java similarity index 100% rename from hotspot/test/gc/TestNUMAPageSize.java rename to test/hotspot/jtreg/gc/TestNUMAPageSize.java diff --git a/hotspot/test/gc/TestNumWorkerOutput.java b/test/hotspot/jtreg/gc/TestNumWorkerOutput.java similarity index 100% rename from hotspot/test/gc/TestNumWorkerOutput.java rename to test/hotspot/jtreg/gc/TestNumWorkerOutput.java diff --git a/hotspot/test/gc/TestObjectAlignment.java b/test/hotspot/jtreg/gc/TestObjectAlignment.java similarity index 100% rename from hotspot/test/gc/TestObjectAlignment.java rename to test/hotspot/jtreg/gc/TestObjectAlignment.java diff --git a/hotspot/test/gc/TestSmallHeap.java b/test/hotspot/jtreg/gc/TestSmallHeap.java similarity index 100% rename from hotspot/test/gc/TestSmallHeap.java rename to test/hotspot/jtreg/gc/TestSmallHeap.java diff --git a/hotspot/test/gc/TestSoftReferencesBehaviorOnOOME.java b/test/hotspot/jtreg/gc/TestSoftReferencesBehaviorOnOOME.java similarity index 100% rename from hotspot/test/gc/TestSoftReferencesBehaviorOnOOME.java rename to test/hotspot/jtreg/gc/TestSoftReferencesBehaviorOnOOME.java diff --git a/hotspot/test/gc/TestStackOverflow.java b/test/hotspot/jtreg/gc/TestStackOverflow.java similarity index 100% rename from hotspot/test/gc/TestStackOverflow.java rename to test/hotspot/jtreg/gc/TestStackOverflow.java diff --git a/hotspot/test/gc/TestSystemGC.java b/test/hotspot/jtreg/gc/TestSystemGC.java similarity index 100% rename from hotspot/test/gc/TestSystemGC.java rename to test/hotspot/jtreg/gc/TestSystemGC.java diff --git a/hotspot/test/gc/TestVerifyDuringStartup.java b/test/hotspot/jtreg/gc/TestVerifyDuringStartup.java similarity index 100% rename from hotspot/test/gc/TestVerifyDuringStartup.java rename to test/hotspot/jtreg/gc/TestVerifyDuringStartup.java diff --git a/hotspot/test/gc/TestVerifySilently.java b/test/hotspot/jtreg/gc/TestVerifySilently.java similarity index 100% rename from hotspot/test/gc/TestVerifySilently.java rename to test/hotspot/jtreg/gc/TestVerifySilently.java diff --git a/hotspot/test/gc/TestVerifySubSet.java b/test/hotspot/jtreg/gc/TestVerifySubSet.java similarity index 100% rename from hotspot/test/gc/TestVerifySubSet.java rename to test/hotspot/jtreg/gc/TestVerifySubSet.java diff --git a/hotspot/test/gc/arguments/AllocationHelper.java b/test/hotspot/jtreg/gc/arguments/AllocationHelper.java similarity index 100% rename from hotspot/test/gc/arguments/AllocationHelper.java rename to test/hotspot/jtreg/gc/arguments/AllocationHelper.java diff --git a/hotspot/test/gc/arguments/FlagsValue.java b/test/hotspot/jtreg/gc/arguments/FlagsValue.java similarity index 100% rename from hotspot/test/gc/arguments/FlagsValue.java rename to test/hotspot/jtreg/gc/arguments/FlagsValue.java diff --git a/hotspot/test/gc/arguments/GCTypes.java b/test/hotspot/jtreg/gc/arguments/GCTypes.java similarity index 100% rename from hotspot/test/gc/arguments/GCTypes.java rename to test/hotspot/jtreg/gc/arguments/GCTypes.java diff --git a/hotspot/test/gc/arguments/HeapRegionUsageTool.java b/test/hotspot/jtreg/gc/arguments/HeapRegionUsageTool.java similarity index 100% rename from hotspot/test/gc/arguments/HeapRegionUsageTool.java rename to test/hotspot/jtreg/gc/arguments/HeapRegionUsageTool.java diff --git a/hotspot/test/gc/arguments/TestAggressiveHeap.java b/test/hotspot/jtreg/gc/arguments/TestAggressiveHeap.java similarity index 100% rename from hotspot/test/gc/arguments/TestAggressiveHeap.java rename to test/hotspot/jtreg/gc/arguments/TestAggressiveHeap.java diff --git a/hotspot/test/gc/arguments/TestAlignmentToUseLargePages.java b/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java similarity index 100% rename from hotspot/test/gc/arguments/TestAlignmentToUseLargePages.java rename to test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java diff --git a/hotspot/test/gc/arguments/TestArrayAllocatorMallocLimit.java b/test/hotspot/jtreg/gc/arguments/TestArrayAllocatorMallocLimit.java similarity index 100% rename from hotspot/test/gc/arguments/TestArrayAllocatorMallocLimit.java rename to test/hotspot/jtreg/gc/arguments/TestArrayAllocatorMallocLimit.java diff --git a/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java b/test/hotspot/jtreg/gc/arguments/TestCMSHeapSizeFlags.java similarity index 100% rename from hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java rename to test/hotspot/jtreg/gc/arguments/TestCMSHeapSizeFlags.java diff --git a/hotspot/test/gc/arguments/TestCompressedClassFlags.java b/test/hotspot/jtreg/gc/arguments/TestCompressedClassFlags.java similarity index 100% rename from hotspot/test/gc/arguments/TestCompressedClassFlags.java rename to test/hotspot/jtreg/gc/arguments/TestCompressedClassFlags.java diff --git a/hotspot/test/gc/arguments/TestDisableDefaultGC.java b/test/hotspot/jtreg/gc/arguments/TestDisableDefaultGC.java similarity index 100% rename from hotspot/test/gc/arguments/TestDisableDefaultGC.java rename to test/hotspot/jtreg/gc/arguments/TestDisableDefaultGC.java diff --git a/hotspot/test/gc/arguments/TestDynMaxHeapFreeRatio.java b/test/hotspot/jtreg/gc/arguments/TestDynMaxHeapFreeRatio.java similarity index 100% rename from hotspot/test/gc/arguments/TestDynMaxHeapFreeRatio.java rename to test/hotspot/jtreg/gc/arguments/TestDynMaxHeapFreeRatio.java diff --git a/hotspot/test/gc/arguments/TestDynMinHeapFreeRatio.java b/test/hotspot/jtreg/gc/arguments/TestDynMinHeapFreeRatio.java similarity index 100% rename from hotspot/test/gc/arguments/TestDynMinHeapFreeRatio.java rename to test/hotspot/jtreg/gc/arguments/TestDynMinHeapFreeRatio.java diff --git a/hotspot/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java b/test/hotspot/jtreg/gc/arguments/TestG1ConcMarkStepDurationMillis.java similarity index 100% rename from hotspot/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java rename to test/hotspot/jtreg/gc/arguments/TestG1ConcMarkStepDurationMillis.java diff --git a/hotspot/test/gc/arguments/TestG1ConcRefinementThreads.java b/test/hotspot/jtreg/gc/arguments/TestG1ConcRefinementThreads.java similarity index 100% rename from hotspot/test/gc/arguments/TestG1ConcRefinementThreads.java rename to test/hotspot/jtreg/gc/arguments/TestG1ConcRefinementThreads.java diff --git a/hotspot/test/gc/arguments/TestG1HeapRegionSize.java b/test/hotspot/jtreg/gc/arguments/TestG1HeapRegionSize.java similarity index 100% rename from hotspot/test/gc/arguments/TestG1HeapRegionSize.java rename to test/hotspot/jtreg/gc/arguments/TestG1HeapRegionSize.java diff --git a/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java b/test/hotspot/jtreg/gc/arguments/TestG1HeapSizeFlags.java similarity index 100% rename from hotspot/test/gc/arguments/TestG1HeapSizeFlags.java rename to test/hotspot/jtreg/gc/arguments/TestG1HeapSizeFlags.java diff --git a/hotspot/test/gc/arguments/TestG1PercentageOptions.java b/test/hotspot/jtreg/gc/arguments/TestG1PercentageOptions.java similarity index 100% rename from hotspot/test/gc/arguments/TestG1PercentageOptions.java rename to test/hotspot/jtreg/gc/arguments/TestG1PercentageOptions.java diff --git a/hotspot/test/gc/arguments/TestHeapFreeRatio.java b/test/hotspot/jtreg/gc/arguments/TestHeapFreeRatio.java similarity index 100% rename from hotspot/test/gc/arguments/TestHeapFreeRatio.java rename to test/hotspot/jtreg/gc/arguments/TestHeapFreeRatio.java diff --git a/hotspot/test/gc/arguments/TestInitialTenuringThreshold.java b/test/hotspot/jtreg/gc/arguments/TestInitialTenuringThreshold.java similarity index 100% rename from hotspot/test/gc/arguments/TestInitialTenuringThreshold.java rename to test/hotspot/jtreg/gc/arguments/TestInitialTenuringThreshold.java diff --git a/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java b/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java similarity index 100% rename from hotspot/test/gc/arguments/TestMaxHeapSizeTools.java rename to test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java diff --git a/hotspot/test/gc/arguments/TestMaxMinHeapFreeRatioFlags.java b/test/hotspot/jtreg/gc/arguments/TestMaxMinHeapFreeRatioFlags.java similarity index 100% rename from hotspot/test/gc/arguments/TestMaxMinHeapFreeRatioFlags.java rename to test/hotspot/jtreg/gc/arguments/TestMaxMinHeapFreeRatioFlags.java diff --git a/hotspot/test/gc/arguments/TestMaxNewSize.java b/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java similarity index 100% rename from hotspot/test/gc/arguments/TestMaxNewSize.java rename to test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java diff --git a/hotspot/test/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java b/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java similarity index 100% rename from hotspot/test/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java rename to test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java diff --git a/hotspot/test/gc/arguments/TestMinInitialErgonomics.java b/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java similarity index 100% rename from hotspot/test/gc/arguments/TestMinInitialErgonomics.java rename to test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java diff --git a/hotspot/test/gc/arguments/TestNewRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java similarity index 100% rename from hotspot/test/gc/arguments/TestNewRatioFlag.java rename to test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java diff --git a/hotspot/test/gc/arguments/TestNewSizeFlags.java b/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java similarity index 100% rename from hotspot/test/gc/arguments/TestNewSizeFlags.java rename to test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java diff --git a/hotspot/test/gc/arguments/TestNewSizeThreadIncrease.java b/test/hotspot/jtreg/gc/arguments/TestNewSizeThreadIncrease.java similarity index 100% rename from hotspot/test/gc/arguments/TestNewSizeThreadIncrease.java rename to test/hotspot/jtreg/gc/arguments/TestNewSizeThreadIncrease.java diff --git a/hotspot/test/gc/arguments/TestObjectTenuringFlags.java b/test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java similarity index 100% rename from hotspot/test/gc/arguments/TestObjectTenuringFlags.java rename to test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java diff --git a/hotspot/test/gc/arguments/TestParallelGCThreads.java b/test/hotspot/jtreg/gc/arguments/TestParallelGCThreads.java similarity index 100% rename from hotspot/test/gc/arguments/TestParallelGCThreads.java rename to test/hotspot/jtreg/gc/arguments/TestParallelGCThreads.java diff --git a/hotspot/test/gc/arguments/TestParallelHeapSizeFlags.java b/test/hotspot/jtreg/gc/arguments/TestParallelHeapSizeFlags.java similarity index 100% rename from hotspot/test/gc/arguments/TestParallelHeapSizeFlags.java rename to test/hotspot/jtreg/gc/arguments/TestParallelHeapSizeFlags.java diff --git a/hotspot/test/gc/arguments/TestSelectDefaultGC.java b/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java similarity index 100% rename from hotspot/test/gc/arguments/TestSelectDefaultGC.java rename to test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java diff --git a/hotspot/test/gc/arguments/TestSerialHeapSizeFlags.java b/test/hotspot/jtreg/gc/arguments/TestSerialHeapSizeFlags.java similarity index 100% rename from hotspot/test/gc/arguments/TestSerialHeapSizeFlags.java rename to test/hotspot/jtreg/gc/arguments/TestSerialHeapSizeFlags.java diff --git a/hotspot/test/gc/arguments/TestShrinkHeapInSteps.java b/test/hotspot/jtreg/gc/arguments/TestShrinkHeapInSteps.java similarity index 100% rename from hotspot/test/gc/arguments/TestShrinkHeapInSteps.java rename to test/hotspot/jtreg/gc/arguments/TestShrinkHeapInSteps.java diff --git a/hotspot/test/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java b/test/hotspot/jtreg/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java similarity index 100% rename from hotspot/test/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java rename to test/hotspot/jtreg/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java diff --git a/hotspot/test/gc/arguments/TestSurvivorAlignmentInBytesOption.java b/test/hotspot/jtreg/gc/arguments/TestSurvivorAlignmentInBytesOption.java similarity index 100% rename from hotspot/test/gc/arguments/TestSurvivorAlignmentInBytesOption.java rename to test/hotspot/jtreg/gc/arguments/TestSurvivorAlignmentInBytesOption.java diff --git a/hotspot/test/gc/arguments/TestSurvivorRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java similarity index 100% rename from hotspot/test/gc/arguments/TestSurvivorRatioFlag.java rename to test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java diff --git a/hotspot/test/gc/arguments/TestTargetSurvivorRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java similarity index 100% rename from hotspot/test/gc/arguments/TestTargetSurvivorRatioFlag.java rename to test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java diff --git a/hotspot/test/gc/arguments/TestUnrecognizedVMOptionsHandling.java b/test/hotspot/jtreg/gc/arguments/TestUnrecognizedVMOptionsHandling.java similarity index 100% rename from hotspot/test/gc/arguments/TestUnrecognizedVMOptionsHandling.java rename to test/hotspot/jtreg/gc/arguments/TestUnrecognizedVMOptionsHandling.java diff --git a/hotspot/test/gc/arguments/TestUseCompressedOopsErgo.java b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java similarity index 100% rename from hotspot/test/gc/arguments/TestUseCompressedOopsErgo.java rename to test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java diff --git a/hotspot/test/gc/arguments/TestUseCompressedOopsErgoTools.java b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgoTools.java similarity index 100% rename from hotspot/test/gc/arguments/TestUseCompressedOopsErgoTools.java rename to test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgoTools.java diff --git a/hotspot/test/gc/arguments/TestUseNUMAInterleaving.java b/test/hotspot/jtreg/gc/arguments/TestUseNUMAInterleaving.java similarity index 100% rename from hotspot/test/gc/arguments/TestUseNUMAInterleaving.java rename to test/hotspot/jtreg/gc/arguments/TestUseNUMAInterleaving.java diff --git a/hotspot/test/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java b/test/hotspot/jtreg/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java similarity index 100% rename from hotspot/test/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java rename to test/hotspot/jtreg/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java diff --git a/hotspot/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java b/test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java similarity index 100% rename from hotspot/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java rename to test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java diff --git a/hotspot/test/gc/class_unloading/TestClassUnloadingDisabled.java b/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java similarity index 100% rename from hotspot/test/gc/class_unloading/TestClassUnloadingDisabled.java rename to test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java diff --git a/hotspot/test/gc/class_unloading/TestG1ClassUnloadingHWM.java b/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java similarity index 100% rename from hotspot/test/gc/class_unloading/TestG1ClassUnloadingHWM.java rename to test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java diff --git a/hotspot/test/gc/cms/DisableResizePLAB.java b/test/hotspot/jtreg/gc/cms/DisableResizePLAB.java similarity index 100% rename from hotspot/test/gc/cms/DisableResizePLAB.java rename to test/hotspot/jtreg/gc/cms/DisableResizePLAB.java diff --git a/hotspot/test/gc/cms/GuardShrinkWarning.java b/test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java similarity index 100% rename from hotspot/test/gc/cms/GuardShrinkWarning.java rename to test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java diff --git a/hotspot/test/gc/cms/TestBubbleUpRef.java b/test/hotspot/jtreg/gc/cms/TestBubbleUpRef.java similarity index 100% rename from hotspot/test/gc/cms/TestBubbleUpRef.java rename to test/hotspot/jtreg/gc/cms/TestBubbleUpRef.java diff --git a/hotspot/test/gc/cms/TestCMSScavengeBeforeRemark.java b/test/hotspot/jtreg/gc/cms/TestCMSScavengeBeforeRemark.java similarity index 100% rename from hotspot/test/gc/cms/TestCMSScavengeBeforeRemark.java rename to test/hotspot/jtreg/gc/cms/TestCMSScavengeBeforeRemark.java diff --git a/hotspot/test/gc/cms/TestMBeanCMS.java b/test/hotspot/jtreg/gc/cms/TestMBeanCMS.java similarity index 100% rename from hotspot/test/gc/cms/TestMBeanCMS.java rename to test/hotspot/jtreg/gc/cms/TestMBeanCMS.java diff --git a/hotspot/test/gc/concurrent_phase_control/CheckControl.java b/test/hotspot/jtreg/gc/concurrent_phase_control/CheckControl.java similarity index 100% rename from hotspot/test/gc/concurrent_phase_control/CheckControl.java rename to test/hotspot/jtreg/gc/concurrent_phase_control/CheckControl.java diff --git a/hotspot/test/gc/concurrent_phase_control/CheckSupported.java b/test/hotspot/jtreg/gc/concurrent_phase_control/CheckSupported.java similarity index 100% rename from hotspot/test/gc/concurrent_phase_control/CheckSupported.java rename to test/hotspot/jtreg/gc/concurrent_phase_control/CheckSupported.java diff --git a/hotspot/test/gc/concurrent_phase_control/CheckUnsupported.java b/test/hotspot/jtreg/gc/concurrent_phase_control/CheckUnsupported.java similarity index 100% rename from hotspot/test/gc/concurrent_phase_control/CheckUnsupported.java rename to test/hotspot/jtreg/gc/concurrent_phase_control/CheckUnsupported.java diff --git a/hotspot/test/gc/concurrent_phase_control/TestConcurrentPhaseControlCMS.java b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlCMS.java similarity index 100% rename from hotspot/test/gc/concurrent_phase_control/TestConcurrentPhaseControlCMS.java rename to test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlCMS.java diff --git a/hotspot/test/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java similarity index 100% rename from hotspot/test/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java rename to test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java diff --git a/hotspot/test/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java similarity index 100% rename from hotspot/test/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java rename to test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java diff --git a/hotspot/test/gc/concurrent_phase_control/TestConcurrentPhaseControlParallel.java b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlParallel.java similarity index 100% rename from hotspot/test/gc/concurrent_phase_control/TestConcurrentPhaseControlParallel.java rename to test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlParallel.java diff --git a/hotspot/test/gc/concurrent_phase_control/TestConcurrentPhaseControlSerial.java b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlSerial.java similarity index 100% rename from hotspot/test/gc/concurrent_phase_control/TestConcurrentPhaseControlSerial.java rename to test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlSerial.java diff --git a/hotspot/test/gc/cslocker/TestCSLocker.java b/test/hotspot/jtreg/gc/cslocker/TestCSLocker.java similarity index 100% rename from hotspot/test/gc/cslocker/TestCSLocker.java rename to test/hotspot/jtreg/gc/cslocker/TestCSLocker.java diff --git a/hotspot/test/gc/cslocker/libTestCSLocker.c b/test/hotspot/jtreg/gc/cslocker/libTestCSLocker.c similarity index 100% rename from hotspot/test/gc/cslocker/libTestCSLocker.c rename to test/hotspot/jtreg/gc/cslocker/libTestCSLocker.c diff --git a/hotspot/test/gc/ergonomics/TestDynamicNumberOfGCThreads.java b/test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java similarity index 100% rename from hotspot/test/gc/ergonomics/TestDynamicNumberOfGCThreads.java rename to test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java diff --git a/hotspot/test/gc/ergonomics/TestInitialGCThreadLogging.java b/test/hotspot/jtreg/gc/ergonomics/TestInitialGCThreadLogging.java similarity index 100% rename from hotspot/test/gc/ergonomics/TestInitialGCThreadLogging.java rename to test/hotspot/jtreg/gc/ergonomics/TestInitialGCThreadLogging.java diff --git a/hotspot/test/gc/g1/Test2GbHeap.java b/test/hotspot/jtreg/gc/g1/Test2GbHeap.java similarity index 100% rename from hotspot/test/gc/g1/Test2GbHeap.java rename to test/hotspot/jtreg/gc/g1/Test2GbHeap.java diff --git a/hotspot/test/gc/g1/TestEagerReclaimHumongousRegions.java b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegions.java similarity index 100% rename from hotspot/test/gc/g1/TestEagerReclaimHumongousRegions.java rename to test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegions.java diff --git a/hotspot/test/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java similarity index 100% rename from hotspot/test/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java rename to test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java diff --git a/hotspot/test/gc/g1/TestEagerReclaimHumongousRegionsLog.java b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsLog.java similarity index 100% rename from hotspot/test/gc/g1/TestEagerReclaimHumongousRegionsLog.java rename to test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsLog.java diff --git a/hotspot/test/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java similarity index 100% rename from hotspot/test/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java rename to test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java diff --git a/hotspot/test/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java b/test/hotspot/jtreg/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java similarity index 100% rename from hotspot/test/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java rename to test/hotspot/jtreg/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java diff --git a/hotspot/test/gc/g1/TestGCLogMessages.java b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java similarity index 100% rename from hotspot/test/gc/g1/TestGCLogMessages.java rename to test/hotspot/jtreg/gc/g1/TestGCLogMessages.java diff --git a/hotspot/test/gc/g1/TestGreyReclaimedHumongousObjects.java b/test/hotspot/jtreg/gc/g1/TestGreyReclaimedHumongousObjects.java similarity index 100% rename from hotspot/test/gc/g1/TestGreyReclaimedHumongousObjects.java rename to test/hotspot/jtreg/gc/g1/TestGreyReclaimedHumongousObjects.java diff --git a/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java b/test/hotspot/jtreg/gc/g1/TestHumongousAllocInitialMark.java similarity index 100% rename from hotspot/test/gc/g1/TestHumongousAllocInitialMark.java rename to test/hotspot/jtreg/gc/g1/TestHumongousAllocInitialMark.java diff --git a/hotspot/test/gc/g1/TestHumongousAllocNearlyFullRegion.java b/test/hotspot/jtreg/gc/g1/TestHumongousAllocNearlyFullRegion.java similarity index 100% rename from hotspot/test/gc/g1/TestHumongousAllocNearlyFullRegion.java rename to test/hotspot/jtreg/gc/g1/TestHumongousAllocNearlyFullRegion.java diff --git a/hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java b/test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java similarity index 100% rename from hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java rename to test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java diff --git a/hotspot/test/gc/g1/TestHumongousShrinkHeap.java b/test/hotspot/jtreg/gc/g1/TestHumongousShrinkHeap.java similarity index 100% rename from hotspot/test/gc/g1/TestHumongousShrinkHeap.java rename to test/hotspot/jtreg/gc/g1/TestHumongousShrinkHeap.java diff --git a/hotspot/test/gc/g1/TestJNIWeakG1/TestJNIWeakG1.java b/test/hotspot/jtreg/gc/g1/TestJNIWeakG1/TestJNIWeakG1.java similarity index 100% rename from hotspot/test/gc/g1/TestJNIWeakG1/TestJNIWeakG1.java rename to test/hotspot/jtreg/gc/g1/TestJNIWeakG1/TestJNIWeakG1.java diff --git a/hotspot/test/gc/g1/TestJNIWeakG1/libTestJNIWeakG1.c b/test/hotspot/jtreg/gc/g1/TestJNIWeakG1/libTestJNIWeakG1.c similarity index 100% rename from hotspot/test/gc/g1/TestJNIWeakG1/libTestJNIWeakG1.c rename to test/hotspot/jtreg/gc/g1/TestJNIWeakG1/libTestJNIWeakG1.c diff --git a/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java b/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java similarity index 100% rename from hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java rename to test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java diff --git a/hotspot/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java b/test/hotspot/jtreg/gc/g1/TestNoEagerReclaimOfHumongousRegions.java similarity index 100% rename from hotspot/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java rename to test/hotspot/jtreg/gc/g1/TestNoEagerReclaimOfHumongousRegions.java diff --git a/hotspot/test/gc/g1/TestPLABOutput.java b/test/hotspot/jtreg/gc/g1/TestPLABOutput.java similarity index 100% rename from hotspot/test/gc/g1/TestPLABOutput.java rename to test/hotspot/jtreg/gc/g1/TestPLABOutput.java diff --git a/hotspot/test/gc/g1/TestPLABSizeBounds.java b/test/hotspot/jtreg/gc/g1/TestPLABSizeBounds.java similarity index 100% rename from hotspot/test/gc/g1/TestPLABSizeBounds.java rename to test/hotspot/jtreg/gc/g1/TestPLABSizeBounds.java diff --git a/hotspot/test/gc/g1/TestParallelAlwaysPreTouch.java b/test/hotspot/jtreg/gc/g1/TestParallelAlwaysPreTouch.java similarity index 100% rename from hotspot/test/gc/g1/TestParallelAlwaysPreTouch.java rename to test/hotspot/jtreg/gc/g1/TestParallelAlwaysPreTouch.java diff --git a/hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java b/test/hotspot/jtreg/gc/g1/TestPrintRegionRememberedSetInfo.java similarity index 100% rename from hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java rename to test/hotspot/jtreg/gc/g1/TestPrintRegionRememberedSetInfo.java diff --git a/hotspot/test/gc/g1/TestRegionAlignment.java b/test/hotspot/jtreg/gc/g1/TestRegionAlignment.java similarity index 100% rename from hotspot/test/gc/g1/TestRegionAlignment.java rename to test/hotspot/jtreg/gc/g1/TestRegionAlignment.java diff --git a/hotspot/test/gc/g1/TestRegionLivenessPrint.java b/test/hotspot/jtreg/gc/g1/TestRegionLivenessPrint.java similarity index 100% rename from hotspot/test/gc/g1/TestRegionLivenessPrint.java rename to test/hotspot/jtreg/gc/g1/TestRegionLivenessPrint.java diff --git a/hotspot/test/gc/g1/TestRemsetLogging.java b/test/hotspot/jtreg/gc/g1/TestRemsetLogging.java similarity index 100% rename from hotspot/test/gc/g1/TestRemsetLogging.java rename to test/hotspot/jtreg/gc/g1/TestRemsetLogging.java diff --git a/hotspot/test/gc/g1/TestRemsetLoggingPerRegion.java b/test/hotspot/jtreg/gc/g1/TestRemsetLoggingPerRegion.java similarity index 100% rename from hotspot/test/gc/g1/TestRemsetLoggingPerRegion.java rename to test/hotspot/jtreg/gc/g1/TestRemsetLoggingPerRegion.java diff --git a/hotspot/test/gc/g1/TestRemsetLoggingThreads.java b/test/hotspot/jtreg/gc/g1/TestRemsetLoggingThreads.java similarity index 100% rename from hotspot/test/gc/g1/TestRemsetLoggingThreads.java rename to test/hotspot/jtreg/gc/g1/TestRemsetLoggingThreads.java diff --git a/hotspot/test/gc/g1/TestRemsetLoggingTools.java b/test/hotspot/jtreg/gc/g1/TestRemsetLoggingTools.java similarity index 100% rename from hotspot/test/gc/g1/TestRemsetLoggingTools.java rename to test/hotspot/jtreg/gc/g1/TestRemsetLoggingTools.java diff --git a/hotspot/test/gc/g1/TestSharedArchiveWithPreTouch.java b/test/hotspot/jtreg/gc/g1/TestSharedArchiveWithPreTouch.java similarity index 100% rename from hotspot/test/gc/g1/TestSharedArchiveWithPreTouch.java rename to test/hotspot/jtreg/gc/g1/TestSharedArchiveWithPreTouch.java diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData.java b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData.java similarity index 100% rename from hotspot/test/gc/g1/TestShrinkAuxiliaryData.java rename to test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData.java diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData00.java similarity index 100% rename from hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java rename to test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData00.java diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData05.java similarity index 100% rename from hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java rename to test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData05.java diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData10.java similarity index 100% rename from hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java rename to test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData10.java diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData15.java similarity index 100% rename from hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java rename to test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData15.java diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData20.java similarity index 100% rename from hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java rename to test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData20.java diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData25.java similarity index 100% rename from hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java rename to test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData25.java diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java similarity index 100% rename from hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java rename to test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java diff --git a/hotspot/test/gc/g1/TestShrinkDefragmentedHeap.java b/test/hotspot/jtreg/gc/g1/TestShrinkDefragmentedHeap.java similarity index 100% rename from hotspot/test/gc/g1/TestShrinkDefragmentedHeap.java rename to test/hotspot/jtreg/gc/g1/TestShrinkDefragmentedHeap.java diff --git a/hotspot/test/gc/g1/TestShrinkToOneRegion.java b/test/hotspot/jtreg/gc/g1/TestShrinkToOneRegion.java similarity index 100% rename from hotspot/test/gc/g1/TestShrinkToOneRegion.java rename to test/hotspot/jtreg/gc/g1/TestShrinkToOneRegion.java diff --git a/hotspot/test/gc/g1/TestStringDeduplicationAgeThreshold.java b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationAgeThreshold.java similarity index 100% rename from hotspot/test/gc/g1/TestStringDeduplicationAgeThreshold.java rename to test/hotspot/jtreg/gc/g1/TestStringDeduplicationAgeThreshold.java diff --git a/hotspot/test/gc/g1/TestStringDeduplicationFullGC.java b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationFullGC.java similarity index 100% rename from hotspot/test/gc/g1/TestStringDeduplicationFullGC.java rename to test/hotspot/jtreg/gc/g1/TestStringDeduplicationFullGC.java diff --git a/hotspot/test/gc/g1/TestStringDeduplicationInterned.java b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationInterned.java similarity index 100% rename from hotspot/test/gc/g1/TestStringDeduplicationInterned.java rename to test/hotspot/jtreg/gc/g1/TestStringDeduplicationInterned.java diff --git a/hotspot/test/gc/g1/TestStringDeduplicationPrintOptions.java b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationPrintOptions.java similarity index 100% rename from hotspot/test/gc/g1/TestStringDeduplicationPrintOptions.java rename to test/hotspot/jtreg/gc/g1/TestStringDeduplicationPrintOptions.java diff --git a/hotspot/test/gc/g1/TestStringDeduplicationTableRehash.java b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationTableRehash.java similarity index 100% rename from hotspot/test/gc/g1/TestStringDeduplicationTableRehash.java rename to test/hotspot/jtreg/gc/g1/TestStringDeduplicationTableRehash.java diff --git a/hotspot/test/gc/g1/TestStringDeduplicationTableResize.java b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationTableResize.java similarity index 100% rename from hotspot/test/gc/g1/TestStringDeduplicationTableResize.java rename to test/hotspot/jtreg/gc/g1/TestStringDeduplicationTableResize.java diff --git a/hotspot/test/gc/g1/TestStringDeduplicationTools.java b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationTools.java similarity index 100% rename from hotspot/test/gc/g1/TestStringDeduplicationTools.java rename to test/hotspot/jtreg/gc/g1/TestStringDeduplicationTools.java diff --git a/hotspot/test/gc/g1/TestStringDeduplicationYoungGC.java b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationYoungGC.java similarity index 100% rename from hotspot/test/gc/g1/TestStringDeduplicationYoungGC.java rename to test/hotspot/jtreg/gc/g1/TestStringDeduplicationYoungGC.java diff --git a/hotspot/test/gc/g1/TestStringSymbolTableStats.java b/test/hotspot/jtreg/gc/g1/TestStringSymbolTableStats.java similarity index 100% rename from hotspot/test/gc/g1/TestStringSymbolTableStats.java rename to test/hotspot/jtreg/gc/g1/TestStringSymbolTableStats.java diff --git a/hotspot/test/gc/g1/humongousObjects/ClassLoaderGenerator.java b/test/hotspot/jtreg/gc/g1/humongousObjects/ClassLoaderGenerator.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/ClassLoaderGenerator.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/ClassLoaderGenerator.java diff --git a/hotspot/test/gc/g1/humongousObjects/G1SampleClass.java b/test/hotspot/jtreg/gc/g1/humongousObjects/G1SampleClass.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/G1SampleClass.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/G1SampleClass.java diff --git a/hotspot/test/gc/g1/humongousObjects/TestHeapCounters.java b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHeapCounters.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/TestHeapCounters.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/TestHeapCounters.java diff --git a/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousClassLoader.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousClassLoader.java diff --git a/hotspot/test/gc/g1/humongousObjects/TestHumongousMovement.java b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousMovement.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/TestHumongousMovement.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousMovement.java diff --git a/hotspot/test/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java diff --git a/hotspot/test/gc/g1/humongousObjects/TestHumongousThreshold.java b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousThreshold.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/TestHumongousThreshold.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousThreshold.java diff --git a/hotspot/test/gc/g1/humongousObjects/TestNoAllocationsInHRegions.java b/test/hotspot/jtreg/gc/g1/humongousObjects/TestNoAllocationsInHRegions.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/TestNoAllocationsInHRegions.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/TestNoAllocationsInHRegions.java diff --git a/hotspot/test/gc/g1/humongousObjects/TestObjectCollected.java b/test/hotspot/jtreg/gc/g1/humongousObjects/TestObjectCollected.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/TestObjectCollected.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/TestObjectCollected.java diff --git a/hotspot/test/gc/g1/humongousObjects/objectGraphTest/GC.java b/test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/GC.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/objectGraphTest/GC.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/GC.java diff --git a/hotspot/test/gc/g1/humongousObjects/objectGraphTest/GCTokens.java b/test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/GCTokens.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/objectGraphTest/GCTokens.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/GCTokens.java diff --git a/hotspot/test/gc/g1/humongousObjects/objectGraphTest/ObjectGraph.java b/test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/ObjectGraph.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/objectGraphTest/ObjectGraph.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/ObjectGraph.java diff --git a/hotspot/test/gc/g1/humongousObjects/objectGraphTest/README b/test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/README similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/objectGraphTest/README rename to test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/README diff --git a/hotspot/test/gc/g1/humongousObjects/objectGraphTest/ReferenceInfo.java b/test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/ReferenceInfo.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/objectGraphTest/ReferenceInfo.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/ReferenceInfo.java diff --git a/hotspot/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java b/test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java diff --git a/hotspot/test/gc/g1/humongousObjects/objectGraphTest/TestcaseData.java b/test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/TestcaseData.java similarity index 100% rename from hotspot/test/gc/g1/humongousObjects/objectGraphTest/TestcaseData.java rename to test/hotspot/jtreg/gc/g1/humongousObjects/objectGraphTest/TestcaseData.java diff --git a/hotspot/test/gc/g1/ihop/TestIHOPErgo.java b/test/hotspot/jtreg/gc/g1/ihop/TestIHOPErgo.java similarity index 100% rename from hotspot/test/gc/g1/ihop/TestIHOPErgo.java rename to test/hotspot/jtreg/gc/g1/ihop/TestIHOPErgo.java diff --git a/hotspot/test/gc/g1/ihop/TestIHOPStatic.java b/test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java similarity index 100% rename from hotspot/test/gc/g1/ihop/TestIHOPStatic.java rename to test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java diff --git a/hotspot/test/gc/g1/ihop/lib/IhopUtils.java b/test/hotspot/jtreg/gc/g1/ihop/lib/IhopUtils.java similarity index 100% rename from hotspot/test/gc/g1/ihop/lib/IhopUtils.java rename to test/hotspot/jtreg/gc/g1/ihop/lib/IhopUtils.java diff --git a/hotspot/test/gc/g1/logging/TestG1LoggingFailure.java b/test/hotspot/jtreg/gc/g1/logging/TestG1LoggingFailure.java similarity index 100% rename from hotspot/test/gc/g1/logging/TestG1LoggingFailure.java rename to test/hotspot/jtreg/gc/g1/logging/TestG1LoggingFailure.java diff --git a/hotspot/test/gc/g1/mixedgc/TestLogging.java b/test/hotspot/jtreg/gc/g1/mixedgc/TestLogging.java similarity index 100% rename from hotspot/test/gc/g1/mixedgc/TestLogging.java rename to test/hotspot/jtreg/gc/g1/mixedgc/TestLogging.java diff --git a/hotspot/test/gc/g1/plab/TestPLABEvacuationFailure.java b/test/hotspot/jtreg/gc/g1/plab/TestPLABEvacuationFailure.java similarity index 100% rename from hotspot/test/gc/g1/plab/TestPLABEvacuationFailure.java rename to test/hotspot/jtreg/gc/g1/plab/TestPLABEvacuationFailure.java diff --git a/hotspot/test/gc/g1/plab/TestPLABPromotion.java b/test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java similarity index 100% rename from hotspot/test/gc/g1/plab/TestPLABPromotion.java rename to test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java diff --git a/hotspot/test/gc/g1/plab/TestPLABResize.java b/test/hotspot/jtreg/gc/g1/plab/TestPLABResize.java similarity index 100% rename from hotspot/test/gc/g1/plab/TestPLABResize.java rename to test/hotspot/jtreg/gc/g1/plab/TestPLABResize.java diff --git a/hotspot/test/gc/g1/plab/lib/AppPLABEvacuationFailure.java b/test/hotspot/jtreg/gc/g1/plab/lib/AppPLABEvacuationFailure.java similarity index 100% rename from hotspot/test/gc/g1/plab/lib/AppPLABEvacuationFailure.java rename to test/hotspot/jtreg/gc/g1/plab/lib/AppPLABEvacuationFailure.java diff --git a/hotspot/test/gc/g1/plab/lib/AppPLABPromotion.java b/test/hotspot/jtreg/gc/g1/plab/lib/AppPLABPromotion.java similarity index 100% rename from hotspot/test/gc/g1/plab/lib/AppPLABPromotion.java rename to test/hotspot/jtreg/gc/g1/plab/lib/AppPLABPromotion.java diff --git a/hotspot/test/gc/g1/plab/lib/AppPLABResize.java b/test/hotspot/jtreg/gc/g1/plab/lib/AppPLABResize.java similarity index 100% rename from hotspot/test/gc/g1/plab/lib/AppPLABResize.java rename to test/hotspot/jtreg/gc/g1/plab/lib/AppPLABResize.java diff --git a/hotspot/test/gc/g1/plab/lib/LogParser.java b/test/hotspot/jtreg/gc/g1/plab/lib/LogParser.java similarity index 100% rename from hotspot/test/gc/g1/plab/lib/LogParser.java rename to test/hotspot/jtreg/gc/g1/plab/lib/LogParser.java diff --git a/hotspot/test/gc/g1/plab/lib/MemoryConsumer.java b/test/hotspot/jtreg/gc/g1/plab/lib/MemoryConsumer.java similarity index 100% rename from hotspot/test/gc/g1/plab/lib/MemoryConsumer.java rename to test/hotspot/jtreg/gc/g1/plab/lib/MemoryConsumer.java diff --git a/hotspot/test/gc/g1/plab/lib/PLABUtils.java b/test/hotspot/jtreg/gc/g1/plab/lib/PLABUtils.java similarity index 100% rename from hotspot/test/gc/g1/plab/lib/PLABUtils.java rename to test/hotspot/jtreg/gc/g1/plab/lib/PLABUtils.java diff --git a/hotspot/test/gc/g1/plab/lib/PlabGCStatistics.java b/test/hotspot/jtreg/gc/g1/plab/lib/PlabGCStatistics.java similarity index 100% rename from hotspot/test/gc/g1/plab/lib/PlabGCStatistics.java rename to test/hotspot/jtreg/gc/g1/plab/lib/PlabGCStatistics.java diff --git a/hotspot/test/gc/g1/plab/lib/PlabInfo.java b/test/hotspot/jtreg/gc/g1/plab/lib/PlabInfo.java similarity index 100% rename from hotspot/test/gc/g1/plab/lib/PlabInfo.java rename to test/hotspot/jtreg/gc/g1/plab/lib/PlabInfo.java diff --git a/hotspot/test/gc/g1/plab/lib/PlabReport.java b/test/hotspot/jtreg/gc/g1/plab/lib/PlabReport.java similarity index 100% rename from hotspot/test/gc/g1/plab/lib/PlabReport.java rename to test/hotspot/jtreg/gc/g1/plab/lib/PlabReport.java diff --git a/hotspot/test/gc/logging/TestDeprecatedPrintFlags.java b/test/hotspot/jtreg/gc/logging/TestDeprecatedPrintFlags.java similarity index 100% rename from hotspot/test/gc/logging/TestDeprecatedPrintFlags.java rename to test/hotspot/jtreg/gc/logging/TestDeprecatedPrintFlags.java diff --git a/hotspot/test/gc/logging/TestGCId.java b/test/hotspot/jtreg/gc/logging/TestGCId.java similarity index 100% rename from hotspot/test/gc/logging/TestGCId.java rename to test/hotspot/jtreg/gc/logging/TestGCId.java diff --git a/hotspot/test/gc/logging/TestPrintReferences.java b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java similarity index 100% rename from hotspot/test/gc/logging/TestPrintReferences.java rename to test/hotspot/jtreg/gc/logging/TestPrintReferences.java diff --git a/hotspot/test/gc/logging/TestUnifiedLoggingSwitchStress.java b/test/hotspot/jtreg/gc/logging/TestUnifiedLoggingSwitchStress.java similarity index 100% rename from hotspot/test/gc/logging/TestUnifiedLoggingSwitchStress.java rename to test/hotspot/jtreg/gc/logging/TestUnifiedLoggingSwitchStress.java diff --git a/hotspot/test/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java b/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java similarity index 100% rename from hotspot/test/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java rename to test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java diff --git a/hotspot/test/gc/metaspace/G1AddMetaspaceDependency.java b/test/hotspot/jtreg/gc/metaspace/G1AddMetaspaceDependency.java similarity index 100% rename from hotspot/test/gc/metaspace/G1AddMetaspaceDependency.java rename to test/hotspot/jtreg/gc/metaspace/G1AddMetaspaceDependency.java diff --git a/hotspot/test/gc/metaspace/InputArguments.java b/test/hotspot/jtreg/gc/metaspace/InputArguments.java similarity index 100% rename from hotspot/test/gc/metaspace/InputArguments.java rename to test/hotspot/jtreg/gc/metaspace/InputArguments.java diff --git a/hotspot/test/gc/metaspace/PerfCounter.java b/test/hotspot/jtreg/gc/metaspace/PerfCounter.java similarity index 100% rename from hotspot/test/gc/metaspace/PerfCounter.java rename to test/hotspot/jtreg/gc/metaspace/PerfCounter.java diff --git a/hotspot/test/gc/metaspace/PerfCounters.java b/test/hotspot/jtreg/gc/metaspace/PerfCounters.java similarity index 100% rename from hotspot/test/gc/metaspace/PerfCounters.java rename to test/hotspot/jtreg/gc/metaspace/PerfCounters.java diff --git a/hotspot/test/gc/metaspace/TestCapacityUntilGCWrapAround.java b/test/hotspot/jtreg/gc/metaspace/TestCapacityUntilGCWrapAround.java similarity index 100% rename from hotspot/test/gc/metaspace/TestCapacityUntilGCWrapAround.java rename to test/hotspot/jtreg/gc/metaspace/TestCapacityUntilGCWrapAround.java diff --git a/hotspot/test/gc/metaspace/TestMetaspaceCMSCancel.java b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceCMSCancel.java similarity index 100% rename from hotspot/test/gc/metaspace/TestMetaspaceCMSCancel.java rename to test/hotspot/jtreg/gc/metaspace/TestMetaspaceCMSCancel.java diff --git a/hotspot/test/gc/metaspace/TestMetaspaceInitialization.java b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceInitialization.java similarity index 100% rename from hotspot/test/gc/metaspace/TestMetaspaceInitialization.java rename to test/hotspot/jtreg/gc/metaspace/TestMetaspaceInitialization.java diff --git a/hotspot/test/gc/metaspace/TestMetaspaceMemoryPool.java b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceMemoryPool.java similarity index 100% rename from hotspot/test/gc/metaspace/TestMetaspaceMemoryPool.java rename to test/hotspot/jtreg/gc/metaspace/TestMetaspaceMemoryPool.java diff --git a/hotspot/test/gc/metaspace/TestMetaspacePerfCounters.java b/test/hotspot/jtreg/gc/metaspace/TestMetaspacePerfCounters.java similarity index 100% rename from hotspot/test/gc/metaspace/TestMetaspacePerfCounters.java rename to test/hotspot/jtreg/gc/metaspace/TestMetaspacePerfCounters.java diff --git a/hotspot/test/gc/metaspace/TestMetaspaceSizeFlags.java b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceSizeFlags.java similarity index 100% rename from hotspot/test/gc/metaspace/TestMetaspaceSizeFlags.java rename to test/hotspot/jtreg/gc/metaspace/TestMetaspaceSizeFlags.java diff --git a/hotspot/test/gc/metaspace/TestPerfCountersAndMemoryPools.java b/test/hotspot/jtreg/gc/metaspace/TestPerfCountersAndMemoryPools.java similarity index 100% rename from hotspot/test/gc/metaspace/TestPerfCountersAndMemoryPools.java rename to test/hotspot/jtreg/gc/metaspace/TestPerfCountersAndMemoryPools.java diff --git a/hotspot/test/gc/parallel/AdaptiveGCBoundary.java b/test/hotspot/jtreg/gc/parallel/AdaptiveGCBoundary.java similarity index 100% rename from hotspot/test/gc/parallel/AdaptiveGCBoundary.java rename to test/hotspot/jtreg/gc/parallel/AdaptiveGCBoundary.java diff --git a/hotspot/test/gc/parallel/TestDynShrinkHeap.java b/test/hotspot/jtreg/gc/parallel/TestDynShrinkHeap.java similarity index 100% rename from hotspot/test/gc/parallel/TestDynShrinkHeap.java rename to test/hotspot/jtreg/gc/parallel/TestDynShrinkHeap.java diff --git a/hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java b/test/hotspot/jtreg/gc/parallel/TestPrintGCDetailsVerbose.java similarity index 100% rename from hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java rename to test/hotspot/jtreg/gc/parallel/TestPrintGCDetailsVerbose.java diff --git a/hotspot/test/gc/serial/HeapChangeLogging.java b/test/hotspot/jtreg/gc/serial/HeapChangeLogging.java similarity index 100% rename from hotspot/test/gc/serial/HeapChangeLogging.java rename to test/hotspot/jtreg/gc/serial/HeapChangeLogging.java diff --git a/hotspot/test/gc/startup_warnings/TestCMS.java b/test/hotspot/jtreg/gc/startup_warnings/TestCMS.java similarity index 100% rename from hotspot/test/gc/startup_warnings/TestCMS.java rename to test/hotspot/jtreg/gc/startup_warnings/TestCMS.java diff --git a/hotspot/test/gc/startup_warnings/TestG1.java b/test/hotspot/jtreg/gc/startup_warnings/TestG1.java similarity index 100% rename from hotspot/test/gc/startup_warnings/TestG1.java rename to test/hotspot/jtreg/gc/startup_warnings/TestG1.java diff --git a/hotspot/test/gc/startup_warnings/TestParallelGC.java b/test/hotspot/jtreg/gc/startup_warnings/TestParallelGC.java similarity index 100% rename from hotspot/test/gc/startup_warnings/TestParallelGC.java rename to test/hotspot/jtreg/gc/startup_warnings/TestParallelGC.java diff --git a/hotspot/test/gc/startup_warnings/TestParallelScavengeSerialOld.java b/test/hotspot/jtreg/gc/startup_warnings/TestParallelScavengeSerialOld.java similarity index 100% rename from hotspot/test/gc/startup_warnings/TestParallelScavengeSerialOld.java rename to test/hotspot/jtreg/gc/startup_warnings/TestParallelScavengeSerialOld.java diff --git a/hotspot/test/gc/startup_warnings/TestSerialGC.java b/test/hotspot/jtreg/gc/startup_warnings/TestSerialGC.java similarity index 100% rename from hotspot/test/gc/startup_warnings/TestSerialGC.java rename to test/hotspot/jtreg/gc/startup_warnings/TestSerialGC.java diff --git a/hotspot/test/gc/stress/TestMultiThreadStressRSet.java b/test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java similarity index 100% rename from hotspot/test/gc/stress/TestMultiThreadStressRSet.java rename to test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java diff --git a/hotspot/test/gc/stress/TestStressG1Humongous.java b/test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java similarity index 100% rename from hotspot/test/gc/stress/TestStressG1Humongous.java rename to test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java diff --git a/hotspot/test/gc/stress/TestStressIHOPMultiThread.java b/test/hotspot/jtreg/gc/stress/TestStressIHOPMultiThread.java similarity index 100% rename from hotspot/test/gc/stress/TestStressIHOPMultiThread.java rename to test/hotspot/jtreg/gc/stress/TestStressIHOPMultiThread.java diff --git a/hotspot/test/gc/stress/TestStressRSetCoarsening.java b/test/hotspot/jtreg/gc/stress/TestStressRSetCoarsening.java similarity index 100% rename from hotspot/test/gc/stress/TestStressRSetCoarsening.java rename to test/hotspot/jtreg/gc/stress/TestStressRSetCoarsening.java diff --git a/hotspot/test/gc/stress/gcbasher/ByteCursor.java b/test/hotspot/jtreg/gc/stress/gcbasher/ByteCursor.java similarity index 100% rename from hotspot/test/gc/stress/gcbasher/ByteCursor.java rename to test/hotspot/jtreg/gc/stress/gcbasher/ByteCursor.java diff --git a/hotspot/test/gc/stress/gcbasher/Bytecode.java b/test/hotspot/jtreg/gc/stress/gcbasher/Bytecode.java similarity index 100% rename from hotspot/test/gc/stress/gcbasher/Bytecode.java rename to test/hotspot/jtreg/gc/stress/gcbasher/Bytecode.java diff --git a/hotspot/test/gc/stress/gcbasher/ClassInfo.java b/test/hotspot/jtreg/gc/stress/gcbasher/ClassInfo.java similarity index 100% rename from hotspot/test/gc/stress/gcbasher/ClassInfo.java rename to test/hotspot/jtreg/gc/stress/gcbasher/ClassInfo.java diff --git a/hotspot/test/gc/stress/gcbasher/ConstantPoolEntry.java b/test/hotspot/jtreg/gc/stress/gcbasher/ConstantPoolEntry.java similarity index 100% rename from hotspot/test/gc/stress/gcbasher/ConstantPoolEntry.java rename to test/hotspot/jtreg/gc/stress/gcbasher/ConstantPoolEntry.java diff --git a/hotspot/test/gc/stress/gcbasher/Decompiler.java b/test/hotspot/jtreg/gc/stress/gcbasher/Decompiler.java similarity index 100% rename from hotspot/test/gc/stress/gcbasher/Decompiler.java rename to test/hotspot/jtreg/gc/stress/gcbasher/Decompiler.java diff --git a/hotspot/test/gc/stress/gcbasher/Dependency.java b/test/hotspot/jtreg/gc/stress/gcbasher/Dependency.java similarity index 100% rename from hotspot/test/gc/stress/gcbasher/Dependency.java rename to test/hotspot/jtreg/gc/stress/gcbasher/Dependency.java diff --git a/hotspot/test/gc/stress/gcbasher/MethodInfo.java b/test/hotspot/jtreg/gc/stress/gcbasher/MethodInfo.java similarity index 100% rename from hotspot/test/gc/stress/gcbasher/MethodInfo.java rename to test/hotspot/jtreg/gc/stress/gcbasher/MethodInfo.java diff --git a/hotspot/test/gc/stress/gcbasher/TestGCBasher.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasher.java similarity index 100% rename from hotspot/test/gc/stress/gcbasher/TestGCBasher.java rename to test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasher.java diff --git a/hotspot/test/gc/stress/gcbasher/TestGCBasherWithCMS.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithCMS.java similarity index 100% rename from hotspot/test/gc/stress/gcbasher/TestGCBasherWithCMS.java rename to test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithCMS.java diff --git a/hotspot/test/gc/stress/gcbasher/TestGCBasherWithG1.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java similarity index 100% rename from hotspot/test/gc/stress/gcbasher/TestGCBasherWithG1.java rename to test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java diff --git a/hotspot/test/gc/stress/gcbasher/TestGCBasherWithParallel.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java similarity index 100% rename from hotspot/test/gc/stress/gcbasher/TestGCBasherWithParallel.java rename to test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java diff --git a/hotspot/test/gc/stress/gcbasher/TestGCBasherWithSerial.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java similarity index 100% rename from hotspot/test/gc/stress/gcbasher/TestGCBasherWithSerial.java rename to test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java diff --git a/hotspot/test/gc/stress/gclocker/TestGCLocker.java b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLocker.java similarity index 100% rename from hotspot/test/gc/stress/gclocker/TestGCLocker.java rename to test/hotspot/jtreg/gc/stress/gclocker/TestGCLocker.java diff --git a/hotspot/test/gc/stress/gclocker/TestGCLockerWithCMS.java b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithCMS.java similarity index 100% rename from hotspot/test/gc/stress/gclocker/TestGCLockerWithCMS.java rename to test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithCMS.java diff --git a/hotspot/test/gc/stress/gclocker/TestGCLockerWithG1.java b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithG1.java similarity index 100% rename from hotspot/test/gc/stress/gclocker/TestGCLockerWithG1.java rename to test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithG1.java diff --git a/hotspot/test/gc/stress/gclocker/TestGCLockerWithParallel.java b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithParallel.java similarity index 100% rename from hotspot/test/gc/stress/gclocker/TestGCLockerWithParallel.java rename to test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithParallel.java diff --git a/hotspot/test/gc/stress/gclocker/TestGCLockerWithSerial.java b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithSerial.java similarity index 100% rename from hotspot/test/gc/stress/gclocker/TestGCLockerWithSerial.java rename to test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithSerial.java diff --git a/hotspot/test/gc/stress/gclocker/libTestGCLocker.c b/test/hotspot/jtreg/gc/stress/gclocker/libTestGCLocker.c similarity index 100% rename from hotspot/test/gc/stress/gclocker/libTestGCLocker.c rename to test/hotspot/jtreg/gc/stress/gclocker/libTestGCLocker.c diff --git a/hotspot/test/gc/stress/gcold/TestGCOld.java b/test/hotspot/jtreg/gc/stress/gcold/TestGCOld.java similarity index 100% rename from hotspot/test/gc/stress/gcold/TestGCOld.java rename to test/hotspot/jtreg/gc/stress/gcold/TestGCOld.java diff --git a/hotspot/test/gc/stress/gcold/TestGCOldWithCMS.java b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithCMS.java similarity index 100% rename from hotspot/test/gc/stress/gcold/TestGCOldWithCMS.java rename to test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithCMS.java diff --git a/hotspot/test/gc/stress/gcold/TestGCOldWithG1.java b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithG1.java similarity index 100% rename from hotspot/test/gc/stress/gcold/TestGCOldWithG1.java rename to test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithG1.java diff --git a/hotspot/test/gc/stress/gcold/TestGCOldWithParallel.java b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithParallel.java similarity index 100% rename from hotspot/test/gc/stress/gcold/TestGCOldWithParallel.java rename to test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithParallel.java diff --git a/hotspot/test/gc/stress/gcold/TestGCOldWithSerial.java b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithSerial.java similarity index 100% rename from hotspot/test/gc/stress/gcold/TestGCOldWithSerial.java rename to test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithSerial.java diff --git a/hotspot/test/gc/stress/systemgc/TestSystemGC.java b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGC.java similarity index 100% rename from hotspot/test/gc/stress/systemgc/TestSystemGC.java rename to test/hotspot/jtreg/gc/stress/systemgc/TestSystemGC.java diff --git a/hotspot/test/gc/stress/systemgc/TestSystemGCWithCMS.java b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithCMS.java similarity index 100% rename from hotspot/test/gc/stress/systemgc/TestSystemGCWithCMS.java rename to test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithCMS.java diff --git a/hotspot/test/gc/stress/systemgc/TestSystemGCWithG1.java b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithG1.java similarity index 100% rename from hotspot/test/gc/stress/systemgc/TestSystemGCWithG1.java rename to test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithG1.java diff --git a/hotspot/test/gc/stress/systemgc/TestSystemGCWithParallel.java b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithParallel.java similarity index 100% rename from hotspot/test/gc/stress/systemgc/TestSystemGCWithParallel.java rename to test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithParallel.java diff --git a/hotspot/test/gc/stress/systemgc/TestSystemGCWithSerial.java b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithSerial.java similarity index 100% rename from hotspot/test/gc/stress/systemgc/TestSystemGCWithSerial.java rename to test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithSerial.java diff --git a/hotspot/test/gc/survivorAlignment/AlignmentHelper.java b/test/hotspot/jtreg/gc/survivorAlignment/AlignmentHelper.java similarity index 100% rename from hotspot/test/gc/survivorAlignment/AlignmentHelper.java rename to test/hotspot/jtreg/gc/survivorAlignment/AlignmentHelper.java diff --git a/hotspot/test/gc/survivorAlignment/SurvivorAlignmentTestMain.java b/test/hotspot/jtreg/gc/survivorAlignment/SurvivorAlignmentTestMain.java similarity index 100% rename from hotspot/test/gc/survivorAlignment/SurvivorAlignmentTestMain.java rename to test/hotspot/jtreg/gc/survivorAlignment/SurvivorAlignmentTestMain.java diff --git a/hotspot/test/gc/survivorAlignment/TestAllocationInEden.java b/test/hotspot/jtreg/gc/survivorAlignment/TestAllocationInEden.java similarity index 100% rename from hotspot/test/gc/survivorAlignment/TestAllocationInEden.java rename to test/hotspot/jtreg/gc/survivorAlignment/TestAllocationInEden.java diff --git a/hotspot/test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromEdenToTenured.java similarity index 100% rename from hotspot/test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java rename to test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromEdenToTenured.java diff --git a/hotspot/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java similarity index 100% rename from hotspot/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java rename to test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java diff --git a/hotspot/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java similarity index 100% rename from hotspot/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java rename to test/hotspot/jtreg/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java diff --git a/hotspot/test/gc/survivorAlignment/TestPromotionLABLargeSurvivorAlignment.java b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionLABLargeSurvivorAlignment.java similarity index 100% rename from hotspot/test/gc/survivorAlignment/TestPromotionLABLargeSurvivorAlignment.java rename to test/hotspot/jtreg/gc/survivorAlignment/TestPromotionLABLargeSurvivorAlignment.java diff --git a/hotspot/test/gc/survivorAlignment/TestPromotionToSurvivor.java b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionToSurvivor.java similarity index 100% rename from hotspot/test/gc/survivorAlignment/TestPromotionToSurvivor.java rename to test/hotspot/jtreg/gc/survivorAlignment/TestPromotionToSurvivor.java diff --git a/hotspot/test/gc/testlibrary/Helpers.java b/test/hotspot/jtreg/gc/testlibrary/Helpers.java similarity index 100% rename from hotspot/test/gc/testlibrary/Helpers.java rename to test/hotspot/jtreg/gc/testlibrary/Helpers.java diff --git a/hotspot/test/gc/whitebox/TestConcMarkCycleWB.java b/test/hotspot/jtreg/gc/whitebox/TestConcMarkCycleWB.java similarity index 100% rename from hotspot/test/gc/whitebox/TestConcMarkCycleWB.java rename to test/hotspot/jtreg/gc/whitebox/TestConcMarkCycleWB.java diff --git a/hotspot/test/gc/whitebox/TestWBGC.java b/test/hotspot/jtreg/gc/whitebox/TestWBGC.java similarity index 100% rename from hotspot/test/gc/whitebox/TestWBGC.java rename to test/hotspot/jtreg/gc/whitebox/TestWBGC.java diff --git a/hotspot/test/native/GTestWrapper.java b/test/hotspot/jtreg/gtest/GTestWrapper.java similarity index 100% rename from hotspot/test/native/GTestWrapper.java rename to test/hotspot/jtreg/gtest/GTestWrapper.java diff --git a/hotspot/test/jprt.config b/test/hotspot/jtreg/jprt.config similarity index 100% rename from hotspot/test/jprt.config rename to test/hotspot/jtreg/jprt.config diff --git a/hotspot/test/native_sanity/JniVersion.java b/test/hotspot/jtreg/native_sanity/JniVersion.java similarity index 100% rename from hotspot/test/native_sanity/JniVersion.java rename to test/hotspot/jtreg/native_sanity/JniVersion.java diff --git a/hotspot/test/native_sanity/libJniVersion.c b/test/hotspot/jtreg/native_sanity/libJniVersion.c similarity index 100% rename from hotspot/test/native_sanity/libJniVersion.c rename to test/hotspot/jtreg/native_sanity/libJniVersion.c diff --git a/hotspot/test/runtime/6294277/SourceDebugExtension.java b/test/hotspot/jtreg/runtime/6294277/SourceDebugExtension.java similarity index 100% rename from hotspot/test/runtime/6294277/SourceDebugExtension.java rename to test/hotspot/jtreg/runtime/6294277/SourceDebugExtension.java diff --git a/hotspot/test/runtime/6626217/IFace.java b/test/hotspot/jtreg/runtime/6626217/IFace.java similarity index 100% rename from hotspot/test/runtime/6626217/IFace.java rename to test/hotspot/jtreg/runtime/6626217/IFace.java diff --git a/hotspot/test/runtime/6626217/Loader2.java b/test/hotspot/jtreg/runtime/6626217/Loader2.java similarity index 100% rename from hotspot/test/runtime/6626217/Loader2.java rename to test/hotspot/jtreg/runtime/6626217/Loader2.java diff --git a/hotspot/test/runtime/6626217/Test6626217.sh b/test/hotspot/jtreg/runtime/6626217/Test6626217.sh similarity index 100% rename from hotspot/test/runtime/6626217/Test6626217.sh rename to test/hotspot/jtreg/runtime/6626217/Test6626217.sh diff --git a/hotspot/test/runtime/6626217/You_Have_Been_P0wned.java b/test/hotspot/jtreg/runtime/6626217/You_Have_Been_P0wned.java similarity index 100% rename from hotspot/test/runtime/6626217/You_Have_Been_P0wned.java rename to test/hotspot/jtreg/runtime/6626217/You_Have_Been_P0wned.java diff --git a/hotspot/test/runtime/6626217/bug_21227.java b/test/hotspot/jtreg/runtime/6626217/bug_21227.java similarity index 100% rename from hotspot/test/runtime/6626217/bug_21227.java rename to test/hotspot/jtreg/runtime/6626217/bug_21227.java diff --git a/hotspot/test/runtime/6626217/from_loader2.java b/test/hotspot/jtreg/runtime/6626217/from_loader2.java similarity index 100% rename from hotspot/test/runtime/6626217/from_loader2.java rename to test/hotspot/jtreg/runtime/6626217/from_loader2.java diff --git a/hotspot/test/runtime/6626217/many_loader1.java.foo b/test/hotspot/jtreg/runtime/6626217/many_loader1.java.foo similarity index 100% rename from hotspot/test/runtime/6626217/many_loader1.java.foo rename to test/hotspot/jtreg/runtime/6626217/many_loader1.java.foo diff --git a/hotspot/test/runtime/6626217/many_loader2.java.foo b/test/hotspot/jtreg/runtime/6626217/many_loader2.java.foo similarity index 100% rename from hotspot/test/runtime/6626217/many_loader2.java.foo rename to test/hotspot/jtreg/runtime/6626217/many_loader2.java.foo diff --git a/hotspot/test/runtime/6819213/TestBootNativeLibraryPath.java b/test/hotspot/jtreg/runtime/6819213/TestBootNativeLibraryPath.java similarity index 100% rename from hotspot/test/runtime/6819213/TestBootNativeLibraryPath.java rename to test/hotspot/jtreg/runtime/6819213/TestBootNativeLibraryPath.java diff --git a/hotspot/test/runtime/6981737/Test6981737.java b/test/hotspot/jtreg/runtime/6981737/Test6981737.java similarity index 100% rename from hotspot/test/runtime/6981737/Test6981737.java rename to test/hotspot/jtreg/runtime/6981737/Test6981737.java diff --git a/hotspot/test/runtime/7100935/TestConjointAtomicArraycopy.java b/test/hotspot/jtreg/runtime/7100935/TestConjointAtomicArraycopy.java similarity index 100% rename from hotspot/test/runtime/7100935/TestConjointAtomicArraycopy.java rename to test/hotspot/jtreg/runtime/7100935/TestConjointAtomicArraycopy.java diff --git a/hotspot/test/runtime/7100935/TestShortArraycopy.java b/test/hotspot/jtreg/runtime/7100935/TestShortArraycopy.java similarity index 100% rename from hotspot/test/runtime/7100935/TestShortArraycopy.java rename to test/hotspot/jtreg/runtime/7100935/TestShortArraycopy.java diff --git a/hotspot/test/runtime/7116786/Test7116786.java b/test/hotspot/jtreg/runtime/7116786/Test7116786.java similarity index 100% rename from hotspot/test/runtime/7116786/Test7116786.java rename to test/hotspot/jtreg/runtime/7116786/Test7116786.java diff --git a/hotspot/test/runtime/7116786/testcases.jar b/test/hotspot/jtreg/runtime/7116786/testcases.jar similarity index 100% rename from hotspot/test/runtime/7116786/testcases.jar rename to test/hotspot/jtreg/runtime/7116786/testcases.jar diff --git a/hotspot/test/runtime/7158988/FieldMonitor.java b/test/hotspot/jtreg/runtime/7158988/FieldMonitor.java similarity index 100% rename from hotspot/test/runtime/7158988/FieldMonitor.java rename to test/hotspot/jtreg/runtime/7158988/FieldMonitor.java diff --git a/hotspot/test/runtime/7158988/TestPostFieldModification.java b/test/hotspot/jtreg/runtime/7158988/TestPostFieldModification.java similarity index 100% rename from hotspot/test/runtime/7158988/TestPostFieldModification.java rename to test/hotspot/jtreg/runtime/7158988/TestPostFieldModification.java diff --git a/hotspot/test/runtime/7160757/Test7160757.java b/test/hotspot/jtreg/runtime/7160757/Test7160757.java similarity index 100% rename from hotspot/test/runtime/7160757/Test7160757.java rename to test/hotspot/jtreg/runtime/7160757/Test7160757.java diff --git a/hotspot/test/runtime/7162488/Test7162488.sh b/test/hotspot/jtreg/runtime/7162488/Test7162488.sh similarity index 100% rename from hotspot/test/runtime/7162488/Test7162488.sh rename to test/hotspot/jtreg/runtime/7162488/Test7162488.sh diff --git a/hotspot/test/runtime/7167069/PrintAsFlag.java b/test/hotspot/jtreg/runtime/7167069/PrintAsFlag.java similarity index 100% rename from hotspot/test/runtime/7167069/PrintAsFlag.java rename to test/hotspot/jtreg/runtime/7167069/PrintAsFlag.java diff --git a/hotspot/test/runtime/8007320/ConstMethodTest.java b/test/hotspot/jtreg/runtime/8007320/ConstMethodTest.java similarity index 100% rename from hotspot/test/runtime/8007320/ConstMethodTest.java rename to test/hotspot/jtreg/runtime/8007320/ConstMethodTest.java diff --git a/hotspot/test/runtime/8007475/StackMapFrameTest.java b/test/hotspot/jtreg/runtime/8007475/StackMapFrameTest.java similarity index 100% rename from hotspot/test/runtime/8007475/StackMapFrameTest.java rename to test/hotspot/jtreg/runtime/8007475/StackMapFrameTest.java diff --git a/hotspot/test/runtime/8010389/VMThreadDlopen.java b/test/hotspot/jtreg/runtime/8010389/VMThreadDlopen.java similarity index 100% rename from hotspot/test/runtime/8010389/VMThreadDlopen.java rename to test/hotspot/jtreg/runtime/8010389/VMThreadDlopen.java diff --git a/hotspot/test/runtime/8024804/RegisterNatives.java b/test/hotspot/jtreg/runtime/8024804/RegisterNatives.java similarity index 100% rename from hotspot/test/runtime/8024804/RegisterNatives.java rename to test/hotspot/jtreg/runtime/8024804/RegisterNatives.java diff --git a/hotspot/test/runtime/8026365/InvokeSpecialAnonTest.java b/test/hotspot/jtreg/runtime/8026365/InvokeSpecialAnonTest.java similarity index 100% rename from hotspot/test/runtime/8026365/InvokeSpecialAnonTest.java rename to test/hotspot/jtreg/runtime/8026365/InvokeSpecialAnonTest.java diff --git a/hotspot/test/runtime/8026394/InterfaceObjectTest.java b/test/hotspot/jtreg/runtime/8026394/InterfaceObjectTest.java similarity index 100% rename from hotspot/test/runtime/8026394/InterfaceObjectTest.java rename to test/hotspot/jtreg/runtime/8026394/InterfaceObjectTest.java diff --git a/hotspot/test/runtime/Annotations/TestAnnotatedStringEncoding.java b/test/hotspot/jtreg/runtime/Annotations/TestAnnotatedStringEncoding.java similarity index 100% rename from hotspot/test/runtime/Annotations/TestAnnotatedStringEncoding.java rename to test/hotspot/jtreg/runtime/Annotations/TestAnnotatedStringEncoding.java diff --git a/hotspot/test/runtime/BadObjectClass/BootstrapRedefine.java b/test/hotspot/jtreg/runtime/BadObjectClass/BootstrapRedefine.java similarity index 100% rename from hotspot/test/runtime/BadObjectClass/BootstrapRedefine.java rename to test/hotspot/jtreg/runtime/BadObjectClass/BootstrapRedefine.java diff --git a/hotspot/test/runtime/BoolReturn/BoolConstructor.java b/test/hotspot/jtreg/runtime/BoolReturn/BoolConstructor.java similarity index 100% rename from hotspot/test/runtime/BoolReturn/BoolConstructor.java rename to test/hotspot/jtreg/runtime/BoolReturn/BoolConstructor.java diff --git a/hotspot/test/runtime/BoolReturn/NativeSmallIntCallsTest.java b/test/hotspot/jtreg/runtime/BoolReturn/NativeSmallIntCallsTest.java similarity index 100% rename from hotspot/test/runtime/BoolReturn/NativeSmallIntCallsTest.java rename to test/hotspot/jtreg/runtime/BoolReturn/NativeSmallIntCallsTest.java diff --git a/hotspot/test/runtime/BoolReturn/libNativeSmallIntCalls.c b/test/hotspot/jtreg/runtime/BoolReturn/libNativeSmallIntCalls.c similarity index 100% rename from hotspot/test/runtime/BoolReturn/libNativeSmallIntCalls.c rename to test/hotspot/jtreg/runtime/BoolReturn/libNativeSmallIntCalls.c diff --git a/hotspot/test/runtime/BootClassAppendProp/BootClassPathAppend.java b/test/hotspot/jtreg/runtime/BootClassAppendProp/BootClassPathAppend.java similarity index 100% rename from hotspot/test/runtime/BootClassAppendProp/BootClassPathAppend.java rename to test/hotspot/jtreg/runtime/BootClassAppendProp/BootClassPathAppend.java diff --git a/hotspot/test/runtime/BootClassAppendProp/BootClassPathAppendProp.java b/test/hotspot/jtreg/runtime/BootClassAppendProp/BootClassPathAppendProp.java similarity index 100% rename from hotspot/test/runtime/BootClassAppendProp/BootClassPathAppendProp.java rename to test/hotspot/jtreg/runtime/BootClassAppendProp/BootClassPathAppendProp.java diff --git a/hotspot/test/runtime/BootClassAppendProp/SunBootClassPath.java b/test/hotspot/jtreg/runtime/BootClassAppendProp/SunBootClassPath.java similarity index 100% rename from hotspot/test/runtime/BootClassAppendProp/SunBootClassPath.java rename to test/hotspot/jtreg/runtime/BootClassAppendProp/SunBootClassPath.java diff --git a/hotspot/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java b/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java similarity index 100% rename from hotspot/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java rename to test/hotspot/jtreg/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java diff --git a/hotspot/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java b/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java similarity index 100% rename from hotspot/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java rename to test/hotspot/jtreg/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java diff --git a/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java b/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java similarity index 100% rename from hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java rename to test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java diff --git a/hotspot/test/runtime/ClassFile/BadHelloWorld.jcod b/test/hotspot/jtreg/runtime/ClassFile/BadHelloWorld.jcod similarity index 100% rename from hotspot/test/runtime/ClassFile/BadHelloWorld.jcod rename to test/hotspot/jtreg/runtime/ClassFile/BadHelloWorld.jcod diff --git a/hotspot/test/runtime/ClassFile/FormatCheckingTest.java b/test/hotspot/jtreg/runtime/ClassFile/FormatCheckingTest.java similarity index 100% rename from hotspot/test/runtime/ClassFile/FormatCheckingTest.java rename to test/hotspot/jtreg/runtime/ClassFile/FormatCheckingTest.java diff --git a/hotspot/test/runtime/ClassFile/JsrRewriting.java b/test/hotspot/jtreg/runtime/ClassFile/JsrRewriting.java similarity index 100% rename from hotspot/test/runtime/ClassFile/JsrRewriting.java rename to test/hotspot/jtreg/runtime/ClassFile/JsrRewriting.java diff --git a/hotspot/test/runtime/ClassFile/JsrRewritingTestCase.jar b/test/hotspot/jtreg/runtime/ClassFile/JsrRewritingTestCase.jar similarity index 100% rename from hotspot/test/runtime/ClassFile/JsrRewritingTestCase.jar rename to test/hotspot/jtreg/runtime/ClassFile/JsrRewritingTestCase.jar diff --git a/hotspot/test/runtime/ClassFile/OomWhileParsingRepeatedJsr.java b/test/hotspot/jtreg/runtime/ClassFile/OomWhileParsingRepeatedJsr.java similarity index 100% rename from hotspot/test/runtime/ClassFile/OomWhileParsingRepeatedJsr.java rename to test/hotspot/jtreg/runtime/ClassFile/OomWhileParsingRepeatedJsr.java diff --git a/hotspot/test/runtime/ClassFile/UnsupportedClassFileVersion.java b/test/hotspot/jtreg/runtime/ClassFile/UnsupportedClassFileVersion.java similarity index 100% rename from hotspot/test/runtime/ClassFile/UnsupportedClassFileVersion.java rename to test/hotspot/jtreg/runtime/ClassFile/UnsupportedClassFileVersion.java diff --git a/hotspot/test/runtime/ClassFile/testcase.jar b/test/hotspot/jtreg/runtime/ClassFile/testcase.jar similarity index 100% rename from hotspot/test/runtime/ClassFile/testcase.jar rename to test/hotspot/jtreg/runtime/ClassFile/testcase.jar diff --git a/hotspot/test/runtime/ClassResolutionFail/Property.java b/test/hotspot/jtreg/runtime/ClassResolutionFail/Property.java similarity index 100% rename from hotspot/test/runtime/ClassResolutionFail/Property.java rename to test/hotspot/jtreg/runtime/ClassResolutionFail/Property.java diff --git a/hotspot/test/runtime/ClassResolutionFail/PropertySuper.java b/test/hotspot/jtreg/runtime/ClassResolutionFail/PropertySuper.java similarity index 100% rename from hotspot/test/runtime/ClassResolutionFail/PropertySuper.java rename to test/hotspot/jtreg/runtime/ClassResolutionFail/PropertySuper.java diff --git a/hotspot/test/runtime/ClassResolutionFail/TestClassResolutionFail.java b/test/hotspot/jtreg/runtime/ClassResolutionFail/TestClassResolutionFail.java similarity index 100% rename from hotspot/test/runtime/ClassResolutionFail/TestClassResolutionFail.java rename to test/hotspot/jtreg/runtime/ClassResolutionFail/TestClassResolutionFail.java diff --git a/hotspot/test/runtime/ClassUnload/KeepAliveClass.java b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClass.java similarity index 100% rename from hotspot/test/runtime/ClassUnload/KeepAliveClass.java rename to test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClass.java diff --git a/hotspot/test/runtime/ClassUnload/KeepAliveClassLoader.java b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClassLoader.java similarity index 100% rename from hotspot/test/runtime/ClassUnload/KeepAliveClassLoader.java rename to test/hotspot/jtreg/runtime/ClassUnload/KeepAliveClassLoader.java diff --git a/hotspot/test/runtime/ClassUnload/KeepAliveObject.java b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveObject.java similarity index 100% rename from hotspot/test/runtime/ClassUnload/KeepAliveObject.java rename to test/hotspot/jtreg/runtime/ClassUnload/KeepAliveObject.java diff --git a/hotspot/test/runtime/ClassUnload/KeepAliveSoftReference.java b/test/hotspot/jtreg/runtime/ClassUnload/KeepAliveSoftReference.java similarity index 100% rename from hotspot/test/runtime/ClassUnload/KeepAliveSoftReference.java rename to test/hotspot/jtreg/runtime/ClassUnload/KeepAliveSoftReference.java diff --git a/hotspot/test/runtime/ClassUnload/UnloadTest.java b/test/hotspot/jtreg/runtime/ClassUnload/UnloadTest.java similarity index 100% rename from hotspot/test/runtime/ClassUnload/UnloadTest.java rename to test/hotspot/jtreg/runtime/ClassUnload/UnloadTest.java diff --git a/hotspot/test/runtime/ClassUnload/classes/test/Empty.java b/test/hotspot/jtreg/runtime/ClassUnload/classes/test/Empty.java similarity index 100% rename from hotspot/test/runtime/ClassUnload/classes/test/Empty.java rename to test/hotspot/jtreg/runtime/ClassUnload/classes/test/Empty.java diff --git a/hotspot/test/runtime/CommandLine/BooleanFlagWithInvalidValue.java b/test/hotspot/jtreg/runtime/CommandLine/BooleanFlagWithInvalidValue.java similarity index 100% rename from hotspot/test/runtime/CommandLine/BooleanFlagWithInvalidValue.java rename to test/hotspot/jtreg/runtime/CommandLine/BooleanFlagWithInvalidValue.java diff --git a/hotspot/test/runtime/CommandLine/CompilerConfigFileWarning.java b/test/hotspot/jtreg/runtime/CommandLine/CompilerConfigFileWarning.java similarity index 100% rename from hotspot/test/runtime/CommandLine/CompilerConfigFileWarning.java rename to test/hotspot/jtreg/runtime/CommandLine/CompilerConfigFileWarning.java diff --git a/hotspot/test/runtime/CommandLine/ConfigFileParsing.java b/test/hotspot/jtreg/runtime/CommandLine/ConfigFileParsing.java similarity index 100% rename from hotspot/test/runtime/CommandLine/ConfigFileParsing.java rename to test/hotspot/jtreg/runtime/CommandLine/ConfigFileParsing.java diff --git a/hotspot/test/runtime/CommandLine/ConfigFileWarning.java b/test/hotspot/jtreg/runtime/CommandLine/ConfigFileWarning.java similarity index 100% rename from hotspot/test/runtime/CommandLine/ConfigFileWarning.java rename to test/hotspot/jtreg/runtime/CommandLine/ConfigFileWarning.java diff --git a/hotspot/test/runtime/CommandLine/DoubleFlagWithIntegerValue.java b/test/hotspot/jtreg/runtime/CommandLine/DoubleFlagWithIntegerValue.java similarity index 100% rename from hotspot/test/runtime/CommandLine/DoubleFlagWithIntegerValue.java rename to test/hotspot/jtreg/runtime/CommandLine/DoubleFlagWithIntegerValue.java diff --git a/hotspot/test/runtime/CommandLine/FlagWithInvalidValue.java b/test/hotspot/jtreg/runtime/CommandLine/FlagWithInvalidValue.java similarity index 100% rename from hotspot/test/runtime/CommandLine/FlagWithInvalidValue.java rename to test/hotspot/jtreg/runtime/CommandLine/FlagWithInvalidValue.java diff --git a/hotspot/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java b/test/hotspot/jtreg/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java similarity index 100% rename from hotspot/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java rename to test/hotspot/jtreg/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java diff --git a/hotspot/test/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java b/test/hotspot/jtreg/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java similarity index 100% rename from hotspot/test/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java rename to test/hotspot/jtreg/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java diff --git a/hotspot/test/runtime/CommandLine/ObsoleteFlagErrorMessage.java b/test/hotspot/jtreg/runtime/CommandLine/ObsoleteFlagErrorMessage.java similarity index 100% rename from hotspot/test/runtime/CommandLine/ObsoleteFlagErrorMessage.java rename to test/hotspot/jtreg/runtime/CommandLine/ObsoleteFlagErrorMessage.java diff --git a/hotspot/test/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java similarity index 100% rename from hotspot/test/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java rename to test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java diff --git a/hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java similarity index 100% rename from hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java rename to test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java diff --git a/hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java similarity index 100% rename from hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java rename to test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java diff --git a/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/DoubleJVMOption.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/DoubleJVMOption.java similarity index 100% rename from hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/DoubleJVMOption.java rename to test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/DoubleJVMOption.java diff --git a/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/IntJVMOption.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/IntJVMOption.java similarity index 100% rename from hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/IntJVMOption.java rename to test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/IntJVMOption.java diff --git a/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java similarity index 100% rename from hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java rename to test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java diff --git a/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java similarity index 100% rename from hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java rename to test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java diff --git a/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMStartup.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMStartup.java similarity index 100% rename from hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMStartup.java rename to test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMStartup.java diff --git a/hotspot/test/runtime/CommandLine/PermGenFlagsTest.java b/test/hotspot/jtreg/runtime/CommandLine/PermGenFlagsTest.java similarity index 100% rename from hotspot/test/runtime/CommandLine/PermGenFlagsTest.java rename to test/hotspot/jtreg/runtime/CommandLine/PermGenFlagsTest.java diff --git a/hotspot/test/runtime/CommandLine/PrintGCApplicationConcurrentTime.java b/test/hotspot/jtreg/runtime/CommandLine/PrintGCApplicationConcurrentTime.java similarity index 100% rename from hotspot/test/runtime/CommandLine/PrintGCApplicationConcurrentTime.java rename to test/hotspot/jtreg/runtime/CommandLine/PrintGCApplicationConcurrentTime.java diff --git a/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java b/test/hotspot/jtreg/runtime/CommandLine/PrintTouchedMethods.java similarity index 100% rename from hotspot/test/runtime/CommandLine/PrintTouchedMethods.java rename to test/hotspot/jtreg/runtime/CommandLine/PrintTouchedMethods.java diff --git a/hotspot/test/runtime/CommandLine/TestHexArguments.java b/test/hotspot/jtreg/runtime/CommandLine/TestHexArguments.java similarity index 100% rename from hotspot/test/runtime/CommandLine/TestHexArguments.java rename to test/hotspot/jtreg/runtime/CommandLine/TestHexArguments.java diff --git a/hotspot/test/runtime/CommandLine/TestLogTouchedMethods.java b/test/hotspot/jtreg/runtime/CommandLine/TestLogTouchedMethods.java similarity index 100% rename from hotspot/test/runtime/CommandLine/TestLogTouchedMethods.java rename to test/hotspot/jtreg/runtime/CommandLine/TestLogTouchedMethods.java diff --git a/hotspot/test/runtime/CommandLine/TestLongUnrecognizedVMOption.java b/test/hotspot/jtreg/runtime/CommandLine/TestLongUnrecognizedVMOption.java similarity index 100% rename from hotspot/test/runtime/CommandLine/TestLongUnrecognizedVMOption.java rename to test/hotspot/jtreg/runtime/CommandLine/TestLongUnrecognizedVMOption.java diff --git a/hotspot/test/runtime/CommandLine/TestNullTerminatedFlags.java b/test/hotspot/jtreg/runtime/CommandLine/TestNullTerminatedFlags.java similarity index 100% rename from hotspot/test/runtime/CommandLine/TestNullTerminatedFlags.java rename to test/hotspot/jtreg/runtime/CommandLine/TestNullTerminatedFlags.java diff --git a/hotspot/test/runtime/CommandLine/TestVMOptions.java b/test/hotspot/jtreg/runtime/CommandLine/TestVMOptions.java similarity index 100% rename from hotspot/test/runtime/CommandLine/TestVMOptions.java rename to test/hotspot/jtreg/runtime/CommandLine/TestVMOptions.java diff --git a/hotspot/test/runtime/CommandLine/TraceExceptionsTest.java b/test/hotspot/jtreg/runtime/CommandLine/TraceExceptionsTest.java similarity index 100% rename from hotspot/test/runtime/CommandLine/TraceExceptionsTest.java rename to test/hotspot/jtreg/runtime/CommandLine/TraceExceptionsTest.java diff --git a/hotspot/test/runtime/CommandLine/UnrecognizedVMOption.java b/test/hotspot/jtreg/runtime/CommandLine/UnrecognizedVMOption.java similarity index 100% rename from hotspot/test/runtime/CommandLine/UnrecognizedVMOption.java rename to test/hotspot/jtreg/runtime/CommandLine/UnrecognizedVMOption.java diff --git a/hotspot/test/runtime/CommandLine/VMAliasOptions.java b/test/hotspot/jtreg/runtime/CommandLine/VMAliasOptions.java similarity index 100% rename from hotspot/test/runtime/CommandLine/VMAliasOptions.java rename to test/hotspot/jtreg/runtime/CommandLine/VMAliasOptions.java diff --git a/hotspot/test/runtime/CommandLine/VMDeprecatedOptions.java b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java similarity index 100% rename from hotspot/test/runtime/CommandLine/VMDeprecatedOptions.java rename to test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java diff --git a/hotspot/test/runtime/CommandLine/VMOptionWarning.java b/test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java similarity index 100% rename from hotspot/test/runtime/CommandLine/VMOptionWarning.java rename to test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java diff --git a/hotspot/test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java b/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java similarity index 100% rename from hotspot/test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java rename to test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java diff --git a/hotspot/test/runtime/CommandLine/VMOptionsFile/flags_file b/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/flags_file similarity index 100% rename from hotspot/test/runtime/CommandLine/VMOptionsFile/flags_file rename to test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/flags_file diff --git a/hotspot/test/runtime/CommandLine/VMOptionsFile/optionFILE_2 b/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionFILE_2 similarity index 100% rename from hotspot/test/runtime/CommandLine/VMOptionsFile/optionFILE_2 rename to test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionFILE_2 diff --git a/hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_1 b/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_1 similarity index 100% rename from hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_1 rename to test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_1 diff --git a/hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_3 b/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_3 similarity index 100% rename from hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_3 rename to test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_3 diff --git a/hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_bad_option b/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_bad_option similarity index 100% rename from hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_bad_option rename to test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_bad_option diff --git a/hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_lot_of_options_quote b/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_lot_of_options_quote similarity index 100% rename from hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_lot_of_options_quote rename to test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_lot_of_options_quote diff --git a/hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_only_tabsandspaces b/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_only_tabsandspaces similarity index 100% rename from hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_only_tabsandspaces rename to test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_only_tabsandspaces diff --git a/hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_quote b/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_quote similarity index 100% rename from hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_quote rename to test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_quote diff --git a/hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_unmatched_quote_1 b/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_unmatched_quote_1 similarity index 100% rename from hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_unmatched_quote_1 rename to test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_unmatched_quote_1 diff --git a/hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_unmatched_quote_2 b/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_unmatched_quote_2 similarity index 100% rename from hotspot/test/runtime/CommandLine/VMOptionsFile/optionfile_unmatched_quote_2 rename to test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/optionfile_unmatched_quote_2 diff --git a/hotspot/test/runtime/CommandLine/flagfile.txt b/test/hotspot/jtreg/runtime/CommandLine/flagfile.txt similarity index 100% rename from hotspot/test/runtime/CommandLine/flagfile.txt rename to test/hotspot/jtreg/runtime/CommandLine/flagfile.txt diff --git a/hotspot/test/runtime/CompactStrings/TestMethodNames.java b/test/hotspot/jtreg/runtime/CompactStrings/TestMethodNames.java similarity index 100% rename from hotspot/test/runtime/CompactStrings/TestMethodNames.java rename to test/hotspot/jtreg/runtime/CompactStrings/TestMethodNames.java diff --git a/hotspot/test/runtime/CompressedOops/CompressedClassPointers.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java similarity index 100% rename from hotspot/test/runtime/CompressedOops/CompressedClassPointers.java rename to test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java diff --git a/hotspot/test/runtime/CompressedOops/CompressedClassSpaceSize.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassSpaceSize.java similarity index 100% rename from hotspot/test/runtime/CompressedOops/CompressedClassSpaceSize.java rename to test/hotspot/jtreg/runtime/CompressedOops/CompressedClassSpaceSize.java diff --git a/hotspot/test/runtime/CompressedOops/CompressedKlassPointerAndOops.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedKlassPointerAndOops.java similarity index 100% rename from hotspot/test/runtime/CompressedOops/CompressedKlassPointerAndOops.java rename to test/hotspot/jtreg/runtime/CompressedOops/CompressedKlassPointerAndOops.java diff --git a/hotspot/test/runtime/CompressedOops/ObjectAlignment.java b/test/hotspot/jtreg/runtime/CompressedOops/ObjectAlignment.java similarity index 100% rename from hotspot/test/runtime/CompressedOops/ObjectAlignment.java rename to test/hotspot/jtreg/runtime/CompressedOops/ObjectAlignment.java diff --git a/hotspot/test/runtime/CompressedOops/UseCompressedOops.java b/test/hotspot/jtreg/runtime/CompressedOops/UseCompressedOops.java similarity index 100% rename from hotspot/test/runtime/CompressedOops/UseCompressedOops.java rename to test/hotspot/jtreg/runtime/CompressedOops/UseCompressedOops.java diff --git a/hotspot/test/runtime/ConstantPool/BadMethodHandles.java b/test/hotspot/jtreg/runtime/ConstantPool/BadMethodHandles.java similarity index 100% rename from hotspot/test/runtime/ConstantPool/BadMethodHandles.java rename to test/hotspot/jtreg/runtime/ConstantPool/BadMethodHandles.java diff --git a/hotspot/test/runtime/ConstantPool/IntfMethod.java b/test/hotspot/jtreg/runtime/ConstantPool/IntfMethod.java similarity index 100% rename from hotspot/test/runtime/ConstantPool/IntfMethod.java rename to test/hotspot/jtreg/runtime/ConstantPool/IntfMethod.java diff --git a/hotspot/test/runtime/ConstantPool/TestMethodHandleConstant.java b/test/hotspot/jtreg/runtime/ConstantPool/TestMethodHandleConstant.java similarity index 100% rename from hotspot/test/runtime/ConstantPool/TestMethodHandleConstant.java rename to test/hotspot/jtreg/runtime/ConstantPool/TestMethodHandleConstant.java diff --git a/hotspot/test/runtime/ConstantPool/WithConfiguration.jcod b/test/hotspot/jtreg/runtime/ConstantPool/WithConfiguration.jcod similarity index 100% rename from hotspot/test/runtime/ConstantPool/WithConfiguration.jcod rename to test/hotspot/jtreg/runtime/ConstantPool/WithConfiguration.jcod diff --git a/hotspot/test/runtime/CreateMirror/ArraysNewInstanceBug.java b/test/hotspot/jtreg/runtime/CreateMirror/ArraysNewInstanceBug.java similarity index 100% rename from hotspot/test/runtime/CreateMirror/ArraysNewInstanceBug.java rename to test/hotspot/jtreg/runtime/CreateMirror/ArraysNewInstanceBug.java diff --git a/hotspot/test/runtime/EnclosingMethodAttr/EnclMethTest.jcod b/test/hotspot/jtreg/runtime/EnclosingMethodAttr/EnclMethTest.jcod similarity index 100% rename from hotspot/test/runtime/EnclosingMethodAttr/EnclMethTest.jcod rename to test/hotspot/jtreg/runtime/EnclosingMethodAttr/EnclMethTest.jcod diff --git a/hotspot/test/runtime/EnclosingMethodAttr/EnclMethodAttr.java b/test/hotspot/jtreg/runtime/EnclosingMethodAttr/EnclMethodAttr.java similarity index 100% rename from hotspot/test/runtime/EnclosingMethodAttr/EnclMethodAttr.java rename to test/hotspot/jtreg/runtime/EnclosingMethodAttr/EnclMethodAttr.java diff --git a/hotspot/test/runtime/EnclosingMethodAttr/enclMethodAttr.jar b/test/hotspot/jtreg/runtime/EnclosingMethodAttr/enclMethodAttr.jar similarity index 100% rename from hotspot/test/runtime/EnclosingMethodAttr/enclMethodAttr.jar rename to test/hotspot/jtreg/runtime/EnclosingMethodAttr/enclMethodAttr.jar diff --git a/hotspot/test/runtime/ErrorHandling/CreateCoredumpOnCrash.java b/test/hotspot/jtreg/runtime/ErrorHandling/CreateCoredumpOnCrash.java similarity index 100% rename from hotspot/test/runtime/ErrorHandling/CreateCoredumpOnCrash.java rename to test/hotspot/jtreg/runtime/ErrorHandling/CreateCoredumpOnCrash.java diff --git a/hotspot/test/runtime/ErrorHandling/ErrorHandler.java b/test/hotspot/jtreg/runtime/ErrorHandling/ErrorHandler.java similarity index 100% rename from hotspot/test/runtime/ErrorHandling/ErrorHandler.java rename to test/hotspot/jtreg/runtime/ErrorHandling/ErrorHandler.java diff --git a/hotspot/test/runtime/ErrorHandling/ProblematicFrameTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ProblematicFrameTest.java similarity index 100% rename from hotspot/test/runtime/ErrorHandling/ProblematicFrameTest.java rename to test/hotspot/jtreg/runtime/ErrorHandling/ProblematicFrameTest.java diff --git a/hotspot/test/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java similarity index 100% rename from hotspot/test/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java rename to test/hotspot/jtreg/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java diff --git a/hotspot/test/runtime/ErrorHandling/SecondaryErrorTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java similarity index 100% rename from hotspot/test/runtime/ErrorHandling/SecondaryErrorTest.java rename to test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java diff --git a/hotspot/test/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java similarity index 100% rename from hotspot/test/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java rename to test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java diff --git a/hotspot/test/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java similarity index 100% rename from hotspot/test/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java rename to test/hotspot/jtreg/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java diff --git a/hotspot/test/runtime/ErrorHandling/TestOnError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestOnError.java similarity index 100% rename from hotspot/test/runtime/ErrorHandling/TestOnError.java rename to test/hotspot/jtreg/runtime/ErrorHandling/TestOnError.java diff --git a/hotspot/test/runtime/ErrorHandling/TestOnOutOfMemoryError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestOnOutOfMemoryError.java similarity index 100% rename from hotspot/test/runtime/ErrorHandling/TestOnOutOfMemoryError.java rename to test/hotspot/jtreg/runtime/ErrorHandling/TestOnOutOfMemoryError.java diff --git a/hotspot/test/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java similarity index 100% rename from hotspot/test/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java rename to test/hotspot/jtreg/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java diff --git a/hotspot/test/runtime/Final/Bad.jasm b/test/hotspot/jtreg/runtime/Final/Bad.jasm similarity index 100% rename from hotspot/test/runtime/Final/Bad.jasm rename to test/hotspot/jtreg/runtime/Final/Bad.jasm diff --git a/hotspot/test/runtime/Final/PutfieldError.java b/test/hotspot/jtreg/runtime/Final/PutfieldError.java similarity index 100% rename from hotspot/test/runtime/Final/PutfieldError.java rename to test/hotspot/jtreg/runtime/Final/PutfieldError.java diff --git a/hotspot/test/runtime/Final/TestPutField.jasm b/test/hotspot/jtreg/runtime/Final/TestPutField.jasm similarity index 100% rename from hotspot/test/runtime/Final/TestPutField.jasm rename to test/hotspot/jtreg/runtime/Final/TestPutField.jasm diff --git a/hotspot/test/runtime/Final/TestPutMain.java b/test/hotspot/jtreg/runtime/Final/TestPutMain.java similarity index 100% rename from hotspot/test/runtime/Final/TestPutMain.java rename to test/hotspot/jtreg/runtime/Final/TestPutMain.java diff --git a/hotspot/test/runtime/Final/TestPutStatic.jasm b/test/hotspot/jtreg/runtime/Final/TestPutStatic.jasm similarity index 100% rename from hotspot/test/runtime/Final/TestPutStatic.jasm rename to test/hotspot/jtreg/runtime/Final/TestPutStatic.jasm diff --git a/hotspot/test/runtime/InternalApi/ThreadCpuTimesDeadlock.java b/test/hotspot/jtreg/runtime/InternalApi/ThreadCpuTimesDeadlock.java similarity index 100% rename from hotspot/test/runtime/InternalApi/ThreadCpuTimesDeadlock.java rename to test/hotspot/jtreg/runtime/InternalApi/ThreadCpuTimesDeadlock.java diff --git a/hotspot/test/runtime/JVMDoPrivileged/DoPrivRunAbstract$VoidPrivActRunAbstract.jasm b/test/hotspot/jtreg/runtime/JVMDoPrivileged/DoPrivRunAbstract$VoidPrivActRunAbstract.jasm similarity index 100% rename from hotspot/test/runtime/JVMDoPrivileged/DoPrivRunAbstract$VoidPrivActRunAbstract.jasm rename to test/hotspot/jtreg/runtime/JVMDoPrivileged/DoPrivRunAbstract$VoidPrivActRunAbstract.jasm diff --git a/hotspot/test/runtime/JVMDoPrivileged/DoPrivRunAbstract.jasm b/test/hotspot/jtreg/runtime/JVMDoPrivileged/DoPrivRunAbstract.jasm similarity index 100% rename from hotspot/test/runtime/JVMDoPrivileged/DoPrivRunAbstract.jasm rename to test/hotspot/jtreg/runtime/JVMDoPrivileged/DoPrivRunAbstract.jasm diff --git a/hotspot/test/runtime/JVMDoPrivileged/DoPrivileged.java b/test/hotspot/jtreg/runtime/JVMDoPrivileged/DoPrivileged.java similarity index 100% rename from hotspot/test/runtime/JVMDoPrivileged/DoPrivileged.java rename to test/hotspot/jtreg/runtime/JVMDoPrivileged/DoPrivileged.java diff --git a/hotspot/test/runtime/LoadClass/LoadClassNegative.java b/test/hotspot/jtreg/runtime/LoadClass/LoadClassNegative.java similarity index 100% rename from hotspot/test/runtime/LoadClass/LoadClassNegative.java rename to test/hotspot/jtreg/runtime/LoadClass/LoadClassNegative.java diff --git a/hotspot/test/runtime/LoadClass/ShowClassLoader.java b/test/hotspot/jtreg/runtime/LoadClass/ShowClassLoader.java similarity index 100% rename from hotspot/test/runtime/LoadClass/ShowClassLoader.java rename to test/hotspot/jtreg/runtime/LoadClass/ShowClassLoader.java diff --git a/hotspot/test/runtime/LoadClass/TestForName.java b/test/hotspot/jtreg/runtime/LoadClass/TestForName.java similarity index 100% rename from hotspot/test/runtime/LoadClass/TestForName.java rename to test/hotspot/jtreg/runtime/LoadClass/TestForName.java diff --git a/hotspot/test/runtime/LoadClass/dummy.jar b/test/hotspot/jtreg/runtime/LoadClass/dummy.jar similarity index 100% rename from hotspot/test/runtime/LoadClass/dummy.jar rename to test/hotspot/jtreg/runtime/LoadClass/dummy.jar diff --git a/hotspot/test/runtime/LocalLong/LocalLongHelper.java b/test/hotspot/jtreg/runtime/LocalLong/LocalLongHelper.java similarity index 100% rename from hotspot/test/runtime/LocalLong/LocalLongHelper.java rename to test/hotspot/jtreg/runtime/LocalLong/LocalLongHelper.java diff --git a/hotspot/test/runtime/LocalLong/LocalLongTest.java b/test/hotspot/jtreg/runtime/LocalLong/LocalLongTest.java similarity index 100% rename from hotspot/test/runtime/LocalLong/LocalLongTest.java rename to test/hotspot/jtreg/runtime/LocalLong/LocalLongTest.java diff --git a/hotspot/test/runtime/LocalVariableTable/DuplicateLVT.cod b/test/hotspot/jtreg/runtime/LocalVariableTable/DuplicateLVT.cod similarity index 100% rename from hotspot/test/runtime/LocalVariableTable/DuplicateLVT.cod rename to test/hotspot/jtreg/runtime/LocalVariableTable/DuplicateLVT.cod diff --git a/hotspot/test/runtime/LocalVariableTable/DuplicateLVTT.cod b/test/hotspot/jtreg/runtime/LocalVariableTable/DuplicateLVTT.cod similarity index 100% rename from hotspot/test/runtime/LocalVariableTable/DuplicateLVTT.cod rename to test/hotspot/jtreg/runtime/LocalVariableTable/DuplicateLVTT.cod diff --git a/hotspot/test/runtime/LocalVariableTable/NotFoundLVTT.cod b/test/hotspot/jtreg/runtime/LocalVariableTable/NotFoundLVTT.cod similarity index 100% rename from hotspot/test/runtime/LocalVariableTable/NotFoundLVTT.cod rename to test/hotspot/jtreg/runtime/LocalVariableTable/NotFoundLVTT.cod diff --git a/hotspot/test/runtime/LocalVariableTable/TestLVT.java b/test/hotspot/jtreg/runtime/LocalVariableTable/TestLVT.java similarity index 100% rename from hotspot/test/runtime/LocalVariableTable/TestLVT.java rename to test/hotspot/jtreg/runtime/LocalVariableTable/TestLVT.java diff --git a/hotspot/test/runtime/LocalVariableTable/testcase.jar b/test/hotspot/jtreg/runtime/LocalVariableTable/testcase.jar similarity index 100% rename from hotspot/test/runtime/LocalVariableTable/testcase.jar rename to test/hotspot/jtreg/runtime/LocalVariableTable/testcase.jar diff --git a/hotspot/test/runtime/MemberName/MemberNameLeak.java b/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java similarity index 100% rename from hotspot/test/runtime/MemberName/MemberNameLeak.java rename to test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java diff --git a/hotspot/test/runtime/Metaspace/DefineClass.java b/test/hotspot/jtreg/runtime/Metaspace/DefineClass.java similarity index 100% rename from hotspot/test/runtime/Metaspace/DefineClass.java rename to test/hotspot/jtreg/runtime/Metaspace/DefineClass.java diff --git a/hotspot/test/runtime/Metaspace/FragmentMetaspace.java b/test/hotspot/jtreg/runtime/Metaspace/FragmentMetaspace.java similarity index 100% rename from hotspot/test/runtime/Metaspace/FragmentMetaspace.java rename to test/hotspot/jtreg/runtime/Metaspace/FragmentMetaspace.java diff --git a/hotspot/test/runtime/Metaspace/FragmentMetaspaceSimple.java b/test/hotspot/jtreg/runtime/Metaspace/FragmentMetaspaceSimple.java similarity index 100% rename from hotspot/test/runtime/Metaspace/FragmentMetaspaceSimple.java rename to test/hotspot/jtreg/runtime/Metaspace/FragmentMetaspaceSimple.java diff --git a/hotspot/test/runtime/Metaspace/classes/test/Empty.java b/test/hotspot/jtreg/runtime/Metaspace/classes/test/Empty.java similarity index 100% rename from hotspot/test/runtime/Metaspace/classes/test/Empty.java rename to test/hotspot/jtreg/runtime/Metaspace/classes/test/Empty.java diff --git a/hotspot/test/runtime/MinimalVM/CDS.java b/test/hotspot/jtreg/runtime/MinimalVM/CDS.java similarity index 100% rename from hotspot/test/runtime/MinimalVM/CDS.java rename to test/hotspot/jtreg/runtime/MinimalVM/CDS.java diff --git a/hotspot/test/runtime/MinimalVM/CheckJNI.java b/test/hotspot/jtreg/runtime/MinimalVM/CheckJNI.java similarity index 100% rename from hotspot/test/runtime/MinimalVM/CheckJNI.java rename to test/hotspot/jtreg/runtime/MinimalVM/CheckJNI.java diff --git a/hotspot/test/runtime/MinimalVM/Instrumentation.java b/test/hotspot/jtreg/runtime/MinimalVM/Instrumentation.java similarity index 100% rename from hotspot/test/runtime/MinimalVM/Instrumentation.java rename to test/hotspot/jtreg/runtime/MinimalVM/Instrumentation.java diff --git a/hotspot/test/runtime/MinimalVM/JMX.java b/test/hotspot/jtreg/runtime/MinimalVM/JMX.java similarity index 100% rename from hotspot/test/runtime/MinimalVM/JMX.java rename to test/hotspot/jtreg/runtime/MinimalVM/JMX.java diff --git a/hotspot/test/runtime/MinimalVM/JVMTI.java b/test/hotspot/jtreg/runtime/MinimalVM/JVMTI.java similarity index 100% rename from hotspot/test/runtime/MinimalVM/JVMTI.java rename to test/hotspot/jtreg/runtime/MinimalVM/JVMTI.java diff --git a/hotspot/test/runtime/MinimalVM/NMT.java b/test/hotspot/jtreg/runtime/MinimalVM/NMT.java similarity index 100% rename from hotspot/test/runtime/MinimalVM/NMT.java rename to test/hotspot/jtreg/runtime/MinimalVM/NMT.java diff --git a/hotspot/test/runtime/MirrorFrame/Asmator.java b/test/hotspot/jtreg/runtime/MirrorFrame/Asmator.java similarity index 100% rename from hotspot/test/runtime/MirrorFrame/Asmator.java rename to test/hotspot/jtreg/runtime/MirrorFrame/Asmator.java diff --git a/hotspot/test/runtime/MirrorFrame/Test8003720.java b/test/hotspot/jtreg/runtime/MirrorFrame/Test8003720.java similarity index 100% rename from hotspot/test/runtime/MirrorFrame/Test8003720.java rename to test/hotspot/jtreg/runtime/MirrorFrame/Test8003720.java diff --git a/hotspot/test/runtime/MirrorFrame/Victim.java b/test/hotspot/jtreg/runtime/MirrorFrame/Victim.java similarity index 100% rename from hotspot/test/runtime/MirrorFrame/Victim.java rename to test/hotspot/jtreg/runtime/MirrorFrame/Victim.java diff --git a/hotspot/test/runtime/MirrorFrame/VictimClassLoader.java b/test/hotspot/jtreg/runtime/MirrorFrame/VictimClassLoader.java similarity index 100% rename from hotspot/test/runtime/MirrorFrame/VictimClassLoader.java rename to test/hotspot/jtreg/runtime/MirrorFrame/VictimClassLoader.java diff --git a/hotspot/test/runtime/NMT/BaselineWithParameter.java b/test/hotspot/jtreg/runtime/NMT/BaselineWithParameter.java similarity index 100% rename from hotspot/test/runtime/NMT/BaselineWithParameter.java rename to test/hotspot/jtreg/runtime/NMT/BaselineWithParameter.java diff --git a/hotspot/test/runtime/NMT/ChangeTrackingLevel.java b/test/hotspot/jtreg/runtime/NMT/ChangeTrackingLevel.java similarity index 100% rename from hotspot/test/runtime/NMT/ChangeTrackingLevel.java rename to test/hotspot/jtreg/runtime/NMT/ChangeTrackingLevel.java diff --git a/hotspot/test/runtime/NMT/CheckForProperDetailStackTrace.java b/test/hotspot/jtreg/runtime/NMT/CheckForProperDetailStackTrace.java similarity index 100% rename from hotspot/test/runtime/NMT/CheckForProperDetailStackTrace.java rename to test/hotspot/jtreg/runtime/NMT/CheckForProperDetailStackTrace.java diff --git a/hotspot/test/runtime/NMT/CommandLineDetail.java b/test/hotspot/jtreg/runtime/NMT/CommandLineDetail.java similarity index 100% rename from hotspot/test/runtime/NMT/CommandLineDetail.java rename to test/hotspot/jtreg/runtime/NMT/CommandLineDetail.java diff --git a/hotspot/test/runtime/NMT/CommandLineEmptyArgument.java b/test/hotspot/jtreg/runtime/NMT/CommandLineEmptyArgument.java similarity index 100% rename from hotspot/test/runtime/NMT/CommandLineEmptyArgument.java rename to test/hotspot/jtreg/runtime/NMT/CommandLineEmptyArgument.java diff --git a/hotspot/test/runtime/NMT/CommandLineInvalidArgument.java b/test/hotspot/jtreg/runtime/NMT/CommandLineInvalidArgument.java similarity index 100% rename from hotspot/test/runtime/NMT/CommandLineInvalidArgument.java rename to test/hotspot/jtreg/runtime/NMT/CommandLineInvalidArgument.java diff --git a/hotspot/test/runtime/NMT/CommandLineSummary.java b/test/hotspot/jtreg/runtime/NMT/CommandLineSummary.java similarity index 100% rename from hotspot/test/runtime/NMT/CommandLineSummary.java rename to test/hotspot/jtreg/runtime/NMT/CommandLineSummary.java diff --git a/hotspot/test/runtime/NMT/CommandLineTurnOffNMT.java b/test/hotspot/jtreg/runtime/NMT/CommandLineTurnOffNMT.java similarity index 100% rename from hotspot/test/runtime/NMT/CommandLineTurnOffNMT.java rename to test/hotspot/jtreg/runtime/NMT/CommandLineTurnOffNMT.java diff --git a/hotspot/test/runtime/NMT/CommitOverlappingRegions.java b/test/hotspot/jtreg/runtime/NMT/CommitOverlappingRegions.java similarity index 100% rename from hotspot/test/runtime/NMT/CommitOverlappingRegions.java rename to test/hotspot/jtreg/runtime/NMT/CommitOverlappingRegions.java diff --git a/hotspot/test/runtime/NMT/JcmdBaselineDetail.java b/test/hotspot/jtreg/runtime/NMT/JcmdBaselineDetail.java similarity index 100% rename from hotspot/test/runtime/NMT/JcmdBaselineDetail.java rename to test/hotspot/jtreg/runtime/NMT/JcmdBaselineDetail.java diff --git a/hotspot/test/runtime/NMT/JcmdDetailDiff.java b/test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java similarity index 100% rename from hotspot/test/runtime/NMT/JcmdDetailDiff.java rename to test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java diff --git a/hotspot/test/runtime/NMT/JcmdScale.java b/test/hotspot/jtreg/runtime/NMT/JcmdScale.java similarity index 100% rename from hotspot/test/runtime/NMT/JcmdScale.java rename to test/hotspot/jtreg/runtime/NMT/JcmdScale.java diff --git a/hotspot/test/runtime/NMT/JcmdScaleDetail.java b/test/hotspot/jtreg/runtime/NMT/JcmdScaleDetail.java similarity index 100% rename from hotspot/test/runtime/NMT/JcmdScaleDetail.java rename to test/hotspot/jtreg/runtime/NMT/JcmdScaleDetail.java diff --git a/hotspot/test/runtime/NMT/JcmdSummaryDiff.java b/test/hotspot/jtreg/runtime/NMT/JcmdSummaryDiff.java similarity index 100% rename from hotspot/test/runtime/NMT/JcmdSummaryDiff.java rename to test/hotspot/jtreg/runtime/NMT/JcmdSummaryDiff.java diff --git a/hotspot/test/runtime/NMT/JcmdWithNMTDisabled.java b/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java similarity index 100% rename from hotspot/test/runtime/NMT/JcmdWithNMTDisabled.java rename to test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java diff --git a/hotspot/test/runtime/NMT/MallocRoundingReportTest.java b/test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java similarity index 100% rename from hotspot/test/runtime/NMT/MallocRoundingReportTest.java rename to test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java diff --git a/hotspot/test/runtime/NMT/MallocSiteHashOverflow.java b/test/hotspot/jtreg/runtime/NMT/MallocSiteHashOverflow.java similarity index 100% rename from hotspot/test/runtime/NMT/MallocSiteHashOverflow.java rename to test/hotspot/jtreg/runtime/NMT/MallocSiteHashOverflow.java diff --git a/hotspot/test/runtime/NMT/MallocStressTest.java b/test/hotspot/jtreg/runtime/NMT/MallocStressTest.java similarity index 100% rename from hotspot/test/runtime/NMT/MallocStressTest.java rename to test/hotspot/jtreg/runtime/NMT/MallocStressTest.java diff --git a/hotspot/test/runtime/NMT/MallocTestType.java b/test/hotspot/jtreg/runtime/NMT/MallocTestType.java similarity index 100% rename from hotspot/test/runtime/NMT/MallocTestType.java rename to test/hotspot/jtreg/runtime/NMT/MallocTestType.java diff --git a/hotspot/test/runtime/NMT/MallocTrackingVerify.java b/test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java similarity index 100% rename from hotspot/test/runtime/NMT/MallocTrackingVerify.java rename to test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java diff --git a/hotspot/test/runtime/NMT/NMTWithCDS.java b/test/hotspot/jtreg/runtime/NMT/NMTWithCDS.java similarity index 100% rename from hotspot/test/runtime/NMT/NMTWithCDS.java rename to test/hotspot/jtreg/runtime/NMT/NMTWithCDS.java diff --git a/hotspot/test/runtime/NMT/PrintNMTStatistics.java b/test/hotspot/jtreg/runtime/NMT/PrintNMTStatistics.java similarity index 100% rename from hotspot/test/runtime/NMT/PrintNMTStatistics.java rename to test/hotspot/jtreg/runtime/NMT/PrintNMTStatistics.java diff --git a/hotspot/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java b/test/hotspot/jtreg/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java similarity index 100% rename from hotspot/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java rename to test/hotspot/jtreg/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java diff --git a/hotspot/test/runtime/NMT/ReleaseCommittedMemory.java b/test/hotspot/jtreg/runtime/NMT/ReleaseCommittedMemory.java similarity index 100% rename from hotspot/test/runtime/NMT/ReleaseCommittedMemory.java rename to test/hotspot/jtreg/runtime/NMT/ReleaseCommittedMemory.java diff --git a/hotspot/test/runtime/NMT/ReleaseNoCommit.java b/test/hotspot/jtreg/runtime/NMT/ReleaseNoCommit.java similarity index 100% rename from hotspot/test/runtime/NMT/ReleaseNoCommit.java rename to test/hotspot/jtreg/runtime/NMT/ReleaseNoCommit.java diff --git a/hotspot/test/runtime/NMT/ShutdownTwice.java b/test/hotspot/jtreg/runtime/NMT/ShutdownTwice.java similarity index 100% rename from hotspot/test/runtime/NMT/ShutdownTwice.java rename to test/hotspot/jtreg/runtime/NMT/ShutdownTwice.java diff --git a/hotspot/test/runtime/NMT/SummaryAfterShutdown.java b/test/hotspot/jtreg/runtime/NMT/SummaryAfterShutdown.java similarity index 100% rename from hotspot/test/runtime/NMT/SummaryAfterShutdown.java rename to test/hotspot/jtreg/runtime/NMT/SummaryAfterShutdown.java diff --git a/hotspot/test/runtime/NMT/SummarySanityCheck.java b/test/hotspot/jtreg/runtime/NMT/SummarySanityCheck.java similarity index 100% rename from hotspot/test/runtime/NMT/SummarySanityCheck.java rename to test/hotspot/jtreg/runtime/NMT/SummarySanityCheck.java diff --git a/hotspot/test/runtime/NMT/ThreadedMallocTestType.java b/test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java similarity index 100% rename from hotspot/test/runtime/NMT/ThreadedMallocTestType.java rename to test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java diff --git a/hotspot/test/runtime/NMT/ThreadedVirtualAllocTestType.java b/test/hotspot/jtreg/runtime/NMT/ThreadedVirtualAllocTestType.java similarity index 100% rename from hotspot/test/runtime/NMT/ThreadedVirtualAllocTestType.java rename to test/hotspot/jtreg/runtime/NMT/ThreadedVirtualAllocTestType.java diff --git a/hotspot/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java b/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitUncommitRecommit.java similarity index 100% rename from hotspot/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java rename to test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitUncommitRecommit.java diff --git a/hotspot/test/runtime/NMT/VirtualAllocTestType.java b/test/hotspot/jtreg/runtime/NMT/VirtualAllocTestType.java similarity index 100% rename from hotspot/test/runtime/NMT/VirtualAllocTestType.java rename to test/hotspot/jtreg/runtime/NMT/VirtualAllocTestType.java diff --git a/hotspot/test/runtime/PerfMemDestroy/PerfMemDestroy.java b/test/hotspot/jtreg/runtime/PerfMemDestroy/PerfMemDestroy.java similarity index 100% rename from hotspot/test/runtime/PerfMemDestroy/PerfMemDestroy.java rename to test/hotspot/jtreg/runtime/PerfMemDestroy/PerfMemDestroy.java diff --git a/hotspot/test/runtime/RedefineObject/Agent.java b/test/hotspot/jtreg/runtime/RedefineObject/Agent.java similarity index 100% rename from hotspot/test/runtime/RedefineObject/Agent.java rename to test/hotspot/jtreg/runtime/RedefineObject/Agent.java diff --git a/hotspot/test/runtime/RedefineObject/TestRedefineObject.java b/test/hotspot/jtreg/runtime/RedefineObject/TestRedefineObject.java similarity index 100% rename from hotspot/test/runtime/RedefineObject/TestRedefineObject.java rename to test/hotspot/jtreg/runtime/RedefineObject/TestRedefineObject.java diff --git a/hotspot/test/runtime/RedefineObject/WalkThroughInvoke.java b/test/hotspot/jtreg/runtime/RedefineObject/WalkThroughInvoke.java similarity index 100% rename from hotspot/test/runtime/RedefineObject/WalkThroughInvoke.java rename to test/hotspot/jtreg/runtime/RedefineObject/WalkThroughInvoke.java diff --git a/hotspot/test/runtime/RedefineTests/ModifyAnonymous.java b/test/hotspot/jtreg/runtime/RedefineTests/ModifyAnonymous.java similarity index 100% rename from hotspot/test/runtime/RedefineTests/ModifyAnonymous.java rename to test/hotspot/jtreg/runtime/RedefineTests/ModifyAnonymous.java diff --git a/hotspot/test/runtime/RedefineTests/RedefineAnnotations.java b/test/hotspot/jtreg/runtime/RedefineTests/RedefineAnnotations.java similarity index 100% rename from hotspot/test/runtime/RedefineTests/RedefineAnnotations.java rename to test/hotspot/jtreg/runtime/RedefineTests/RedefineAnnotations.java diff --git a/hotspot/test/runtime/RedefineTests/RedefineFinalizer.java b/test/hotspot/jtreg/runtime/RedefineTests/RedefineFinalizer.java similarity index 100% rename from hotspot/test/runtime/RedefineTests/RedefineFinalizer.java rename to test/hotspot/jtreg/runtime/RedefineTests/RedefineFinalizer.java diff --git a/hotspot/test/runtime/RedefineTests/RedefineInterfaceMethods.java b/test/hotspot/jtreg/runtime/RedefineTests/RedefineInterfaceMethods.java similarity index 100% rename from hotspot/test/runtime/RedefineTests/RedefineInterfaceMethods.java rename to test/hotspot/jtreg/runtime/RedefineTests/RedefineInterfaceMethods.java diff --git a/hotspot/test/runtime/RedefineTests/RedefineLeak.java b/test/hotspot/jtreg/runtime/RedefineTests/RedefineLeak.java similarity index 100% rename from hotspot/test/runtime/RedefineTests/RedefineLeak.java rename to test/hotspot/jtreg/runtime/RedefineTests/RedefineLeak.java diff --git a/hotspot/test/runtime/RedefineTests/RedefinePreviousVersions.java b/test/hotspot/jtreg/runtime/RedefineTests/RedefinePreviousVersions.java similarity index 100% rename from hotspot/test/runtime/RedefineTests/RedefinePreviousVersions.java rename to test/hotspot/jtreg/runtime/RedefineTests/RedefinePreviousVersions.java diff --git a/hotspot/test/runtime/RedefineTests/RedefineRunningMethods.java b/test/hotspot/jtreg/runtime/RedefineTests/RedefineRunningMethods.java similarity index 100% rename from hotspot/test/runtime/RedefineTests/RedefineRunningMethods.java rename to test/hotspot/jtreg/runtime/RedefineTests/RedefineRunningMethods.java diff --git a/hotspot/test/runtime/RedefineTests/RedefineRunningMethodsWithBacktrace.java b/test/hotspot/jtreg/runtime/RedefineTests/RedefineRunningMethodsWithBacktrace.java similarity index 100% rename from hotspot/test/runtime/RedefineTests/RedefineRunningMethodsWithBacktrace.java rename to test/hotspot/jtreg/runtime/RedefineTests/RedefineRunningMethodsWithBacktrace.java diff --git a/hotspot/test/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java b/test/hotspot/jtreg/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java similarity index 100% rename from hotspot/test/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java rename to test/hotspot/jtreg/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java diff --git a/hotspot/test/runtime/ReservedStack/ReservedStackTest.java b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java similarity index 100% rename from hotspot/test/runtime/ReservedStack/ReservedStackTest.java rename to test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java diff --git a/hotspot/test/runtime/ReservedStack/ReservedStackTestCompiler.java b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTestCompiler.java similarity index 100% rename from hotspot/test/runtime/ReservedStack/ReservedStackTestCompiler.java rename to test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTestCompiler.java diff --git a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java b/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency1.java similarity index 100% rename from hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java rename to test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency1.java diff --git a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java b/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency2.java similarity index 100% rename from hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java rename to test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency2.java diff --git a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java b/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency3.java similarity index 100% rename from hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java rename to test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency3.java diff --git a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java b/test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency4.java similarity index 100% rename from hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java rename to test/hotspot/jtreg/runtime/Safepoint/AssertSafepointCheckConsistency4.java diff --git a/hotspot/test/runtime/SameObject/SameObject.java b/test/hotspot/jtreg/runtime/SameObject/SameObject.java similarity index 100% rename from hotspot/test/runtime/SameObject/SameObject.java rename to test/hotspot/jtreg/runtime/SameObject/SameObject.java diff --git a/hotspot/test/runtime/SameObject/libSameObject.c b/test/hotspot/jtreg/runtime/SameObject/libSameObject.c similarity index 100% rename from hotspot/test/runtime/SameObject/libSameObject.c rename to test/hotspot/jtreg/runtime/SameObject/libSameObject.c diff --git a/hotspot/test/runtime/SelectionResolution/AbstractMethodErrorTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/AbstractMethodErrorTest.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/AbstractMethodErrorTest.java rename to test/hotspot/jtreg/runtime/SelectionResolution/AbstractMethodErrorTest.java diff --git a/hotspot/test/runtime/SelectionResolution/IllegalAccessErrorTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/IllegalAccessErrorTest.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/IllegalAccessErrorTest.java rename to test/hotspot/jtreg/runtime/SelectionResolution/IllegalAccessErrorTest.java diff --git a/hotspot/test/runtime/SelectionResolution/InvokeInterfaceICCE.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/InvokeInterfaceICCE.java rename to test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java diff --git a/hotspot/test/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java rename to test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java diff --git a/hotspot/test/runtime/SelectionResolution/InvokeSpecialICCE.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeSpecialICCE.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/InvokeSpecialICCE.java rename to test/hotspot/jtreg/runtime/SelectionResolution/InvokeSpecialICCE.java diff --git a/hotspot/test/runtime/SelectionResolution/InvokeSpecialSuccessTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeSpecialSuccessTest.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/InvokeSpecialSuccessTest.java rename to test/hotspot/jtreg/runtime/SelectionResolution/InvokeSpecialSuccessTest.java diff --git a/hotspot/test/runtime/SelectionResolution/InvokeStaticICCE.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeStaticICCE.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/InvokeStaticICCE.java rename to test/hotspot/jtreg/runtime/SelectionResolution/InvokeStaticICCE.java diff --git a/hotspot/test/runtime/SelectionResolution/InvokeStaticSuccessTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeStaticSuccessTest.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/InvokeStaticSuccessTest.java rename to test/hotspot/jtreg/runtime/SelectionResolution/InvokeStaticSuccessTest.java diff --git a/hotspot/test/runtime/SelectionResolution/InvokeVirtualICCE.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/InvokeVirtualICCE.java rename to test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java diff --git a/hotspot/test/runtime/SelectionResolution/InvokeVirtualSuccessTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/InvokeVirtualSuccessTest.java rename to test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java diff --git a/hotspot/test/runtime/SelectionResolution/NoSuchMethodErrorTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/NoSuchMethodErrorTest.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/NoSuchMethodErrorTest.java rename to test/hotspot/jtreg/runtime/SelectionResolution/NoSuchMethodErrorTest.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Builder.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Builder.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Builder.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Builder.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/ByteCodeClassLoader.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ByteCodeClassLoader.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/ByteCodeClassLoader.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ByteCodeClassLoader.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/ClassBuilder.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassBuilder.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/ClassBuilder.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassBuilder.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/ClassConstruct.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassConstruct.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/ClassConstruct.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassConstruct.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/ClassData.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassData.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/ClassData.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassData.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Clazz.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Clazz.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Clazz.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Clazz.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/HierarchyShape.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/HierarchyShape.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/HierarchyShape.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/HierarchyShape.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Interface.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Interface.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Interface.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Interface.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Method.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Method.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Method.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Method.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/MethodData.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/MethodData.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/MethodData.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/MethodData.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Result.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Result.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Result.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Result.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/SelectionResolutionTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/SelectionResolutionTest.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/SelectionResolutionTest.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/SelectionResolutionTest.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/SelectionResolutionTestCase.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/SelectionResolutionTestCase.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/SelectionResolutionTestCase.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/SelectionResolutionTestCase.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Template.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Template.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Template.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Template.java diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java similarity index 100% rename from hotspot/test/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java rename to test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java diff --git a/hotspot/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/ArchiveDoesNotExist.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/ArchiveDoesNotExist.java diff --git a/hotspot/test/runtime/SharedArchiveFile/BootAppendTests.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/BootAppendTests.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java diff --git a/hotspot/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java diff --git a/hotspot/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java diff --git a/hotspot/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/CdsSameObjectAlignment.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/CdsSameObjectAlignment.java diff --git a/hotspot/test/runtime/SharedArchiveFile/DefaultUseWithClient.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/DefaultUseWithClient.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/DefaultUseWithClient.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/DefaultUseWithClient.java diff --git a/hotspot/test/runtime/SharedArchiveFile/DumpSharedDictionary.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/DumpSharedDictionary.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/DumpSharedDictionary.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/DumpSharedDictionary.java diff --git a/hotspot/test/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java diff --git a/hotspot/test/runtime/SharedArchiveFile/LoadClass.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/LoadClass.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/LoadClass.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/LoadClass.java diff --git a/hotspot/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.java diff --git a/hotspot/test/runtime/SharedArchiveFile/NonBootLoaderClasses.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/NonBootLoaderClasses.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/NonBootLoaderClasses.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/NonBootLoaderClasses.java diff --git a/hotspot/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java diff --git a/hotspot/test/runtime/SharedArchiveFile/SASymbolTableTest.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/SASymbolTableTest.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/SASymbolTableTest.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/SASymbolTableTest.java diff --git a/hotspot/test/runtime/SharedArchiveFile/SASymbolTableTestAgent.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/SASymbolTableTestAgent.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/SASymbolTableTestAgent.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/SASymbolTableTestAgent.java diff --git a/hotspot/test/runtime/SharedArchiveFile/SharedArchiveFile.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedArchiveFile.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/SharedArchiveFile.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/SharedArchiveFile.java diff --git a/hotspot/test/runtime/SharedArchiveFile/SharedBaseAddress.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedBaseAddress.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/SharedBaseAddress.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/SharedBaseAddress.java diff --git a/hotspot/test/runtime/SharedArchiveFile/SharedStrings.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStrings.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/SharedStrings.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStrings.java diff --git a/hotspot/test/runtime/SharedArchiveFile/SharedStringsDedup.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsDedup.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/SharedStringsDedup.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsDedup.java diff --git a/hotspot/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsRunAuto.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsRunAuto.java diff --git a/hotspot/test/runtime/SharedArchiveFile/SharedStringsWb.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsWb.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/SharedStringsWb.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsWb.java diff --git a/hotspot/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java diff --git a/hotspot/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/SpaceUtilizationCheck.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/SpaceUtilizationCheck.java diff --git a/hotspot/test/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java diff --git a/hotspot/test/runtime/SharedArchiveFile/javax/sound/sampled/MyClass.jasm b/test/hotspot/jtreg/runtime/SharedArchiveFile/javax/sound/sampled/MyClass.jasm similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/javax/sound/sampled/MyClass.jasm rename to test/hotspot/jtreg/runtime/SharedArchiveFile/javax/sound/sampled/MyClass.jasm diff --git a/hotspot/test/runtime/SharedArchiveFile/nonjdk/myPackage/MyClass.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/nonjdk/myPackage/MyClass.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/nonjdk/myPackage/MyClass.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/nonjdk/myPackage/MyClass.java diff --git a/hotspot/test/runtime/SharedArchiveFile/org/omg/CORBA/Context.jasm b/test/hotspot/jtreg/runtime/SharedArchiveFile/org/omg/CORBA/Context.jasm similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/org/omg/CORBA/Context.jasm rename to test/hotspot/jtreg/runtime/SharedArchiveFile/org/omg/CORBA/Context.jasm diff --git a/hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Implementor.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Implementor.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Implementor.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Implementor.java diff --git a/hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Interface.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Interface.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Interface.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Interface.java diff --git a/hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SubClass.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SubClass.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SubClass.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SubClass.java diff --git a/hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SuperClazz.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SuperClazz.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SuperClazz.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SuperClazz.java diff --git a/hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TestEntry.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TestEntry.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TestEntry.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TestEntry.java diff --git a/hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java diff --git a/hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformRelatedClasses.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformRelatedClasses.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformRelatedClasses.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformRelatedClasses.java diff --git a/hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java diff --git a/hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java diff --git a/hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformTestCommon.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformTestCommon.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformTestCommon.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformTestCommon.java diff --git a/hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg1/SuperClazz.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg1/SuperClazz.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg1/SuperClazz.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg1/SuperClazz.java diff --git a/hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg2/SubClass.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg2/SubClass.java similarity index 100% rename from hotspot/test/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg2/SubClass.java rename to test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg2/SubClass.java diff --git a/hotspot/test/runtime/StackGuardPages/DoOverflow.java b/test/hotspot/jtreg/runtime/StackGuardPages/DoOverflow.java similarity index 100% rename from hotspot/test/runtime/StackGuardPages/DoOverflow.java rename to test/hotspot/jtreg/runtime/StackGuardPages/DoOverflow.java diff --git a/hotspot/test/runtime/StackGuardPages/exeinvoke.c b/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c similarity index 100% rename from hotspot/test/runtime/StackGuardPages/exeinvoke.c rename to test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c diff --git a/hotspot/test/runtime/StackGuardPages/testme.sh b/test/hotspot/jtreg/runtime/StackGuardPages/testme.sh similarity index 100% rename from hotspot/test/runtime/StackGuardPages/testme.sh rename to test/hotspot/jtreg/runtime/StackGuardPages/testme.sh diff --git a/hotspot/test/runtime/Thread/CancellableThreadTest.java b/test/hotspot/jtreg/runtime/Thread/CancellableThreadTest.java similarity index 100% rename from hotspot/test/runtime/Thread/CancellableThreadTest.java rename to test/hotspot/jtreg/runtime/Thread/CancellableThreadTest.java diff --git a/hotspot/test/runtime/Thread/Fibonacci.java b/test/hotspot/jtreg/runtime/Thread/Fibonacci.java similarity index 100% rename from hotspot/test/runtime/Thread/Fibonacci.java rename to test/hotspot/jtreg/runtime/Thread/Fibonacci.java diff --git a/hotspot/test/runtime/Thread/TestThreadDumpMonitorContention.java b/test/hotspot/jtreg/runtime/Thread/TestThreadDumpMonitorContention.java similarity index 100% rename from hotspot/test/runtime/Thread/TestThreadDumpMonitorContention.java rename to test/hotspot/jtreg/runtime/Thread/TestThreadDumpMonitorContention.java diff --git a/hotspot/test/runtime/Thread/TestThreadStackSizes.java b/test/hotspot/jtreg/runtime/Thread/TestThreadStackSizes.java similarity index 100% rename from hotspot/test/runtime/Thread/TestThreadStackSizes.java rename to test/hotspot/jtreg/runtime/Thread/TestThreadStackSizes.java diff --git a/hotspot/test/runtime/Thread/ThreadPriorities.java b/test/hotspot/jtreg/runtime/Thread/ThreadPriorities.java similarity index 100% rename from hotspot/test/runtime/Thread/ThreadPriorities.java rename to test/hotspot/jtreg/runtime/Thread/ThreadPriorities.java diff --git a/hotspot/test/runtime/Thread/TooSmallStackSize.java b/test/hotspot/jtreg/runtime/Thread/TooSmallStackSize.java similarity index 100% rename from hotspot/test/runtime/Thread/TooSmallStackSize.java rename to test/hotspot/jtreg/runtime/Thread/TooSmallStackSize.java diff --git a/hotspot/test/runtime/ThreadSignalMask/Prog.java b/test/hotspot/jtreg/runtime/ThreadSignalMask/Prog.java similarity index 100% rename from hotspot/test/runtime/ThreadSignalMask/Prog.java rename to test/hotspot/jtreg/runtime/ThreadSignalMask/Prog.java diff --git a/hotspot/test/runtime/ThreadSignalMask/ThreadSignalMask.java b/test/hotspot/jtreg/runtime/ThreadSignalMask/ThreadSignalMask.java similarity index 100% rename from hotspot/test/runtime/ThreadSignalMask/ThreadSignalMask.java rename to test/hotspot/jtreg/runtime/ThreadSignalMask/ThreadSignalMask.java diff --git a/hotspot/test/runtime/ThreadSignalMask/exeThreadSignalMask.c b/test/hotspot/jtreg/runtime/ThreadSignalMask/exeThreadSignalMask.c similarity index 100% rename from hotspot/test/runtime/ThreadSignalMask/exeThreadSignalMask.c rename to test/hotspot/jtreg/runtime/ThreadSignalMask/exeThreadSignalMask.c diff --git a/hotspot/test/runtime/Throwable/StackTraceLogging.java b/test/hotspot/jtreg/runtime/Throwable/StackTraceLogging.java similarity index 100% rename from hotspot/test/runtime/Throwable/StackTraceLogging.java rename to test/hotspot/jtreg/runtime/Throwable/StackTraceLogging.java diff --git a/hotspot/test/runtime/Throwable/TestThrowable.java b/test/hotspot/jtreg/runtime/Throwable/TestThrowable.java similarity index 100% rename from hotspot/test/runtime/Throwable/TestThrowable.java rename to test/hotspot/jtreg/runtime/Throwable/TestThrowable.java diff --git a/hotspot/test/runtime/Throwable/ThrowableIntrospectionSegfault.java b/test/hotspot/jtreg/runtime/Throwable/ThrowableIntrospectionSegfault.java similarity index 100% rename from hotspot/test/runtime/Throwable/ThrowableIntrospectionSegfault.java rename to test/hotspot/jtreg/runtime/Throwable/ThrowableIntrospectionSegfault.java diff --git a/hotspot/test/runtime/TransitiveOverrideCFV50/TransitiveOverrideCFV50.java b/test/hotspot/jtreg/runtime/TransitiveOverrideCFV50/TransitiveOverrideCFV50.java similarity index 100% rename from hotspot/test/runtime/TransitiveOverrideCFV50/TransitiveOverrideCFV50.java rename to test/hotspot/jtreg/runtime/TransitiveOverrideCFV50/TransitiveOverrideCFV50.java diff --git a/hotspot/test/runtime/Unsafe/AllocateInstance.java b/test/hotspot/jtreg/runtime/Unsafe/AllocateInstance.java similarity index 100% rename from hotspot/test/runtime/Unsafe/AllocateInstance.java rename to test/hotspot/jtreg/runtime/Unsafe/AllocateInstance.java diff --git a/hotspot/test/runtime/Unsafe/AllocateMemory.java b/test/hotspot/jtreg/runtime/Unsafe/AllocateMemory.java similarity index 100% rename from hotspot/test/runtime/Unsafe/AllocateMemory.java rename to test/hotspot/jtreg/runtime/Unsafe/AllocateMemory.java diff --git a/hotspot/test/runtime/Unsafe/CopyMemory.java b/test/hotspot/jtreg/runtime/Unsafe/CopyMemory.java similarity index 100% rename from hotspot/test/runtime/Unsafe/CopyMemory.java rename to test/hotspot/jtreg/runtime/Unsafe/CopyMemory.java diff --git a/hotspot/test/runtime/Unsafe/DefineClass.java b/test/hotspot/jtreg/runtime/Unsafe/DefineClass.java similarity index 100% rename from hotspot/test/runtime/Unsafe/DefineClass.java rename to test/hotspot/jtreg/runtime/Unsafe/DefineClass.java diff --git a/hotspot/test/runtime/Unsafe/FieldOffset.java b/test/hotspot/jtreg/runtime/Unsafe/FieldOffset.java similarity index 100% rename from hotspot/test/runtime/Unsafe/FieldOffset.java rename to test/hotspot/jtreg/runtime/Unsafe/FieldOffset.java diff --git a/hotspot/test/runtime/Unsafe/GetField.java b/test/hotspot/jtreg/runtime/Unsafe/GetField.java similarity index 100% rename from hotspot/test/runtime/Unsafe/GetField.java rename to test/hotspot/jtreg/runtime/Unsafe/GetField.java diff --git a/hotspot/test/runtime/Unsafe/GetPutAddress.java b/test/hotspot/jtreg/runtime/Unsafe/GetPutAddress.java similarity index 100% rename from hotspot/test/runtime/Unsafe/GetPutAddress.java rename to test/hotspot/jtreg/runtime/Unsafe/GetPutAddress.java diff --git a/hotspot/test/runtime/Unsafe/GetPutBoolean.java b/test/hotspot/jtreg/runtime/Unsafe/GetPutBoolean.java similarity index 100% rename from hotspot/test/runtime/Unsafe/GetPutBoolean.java rename to test/hotspot/jtreg/runtime/Unsafe/GetPutBoolean.java diff --git a/hotspot/test/runtime/Unsafe/GetPutByte.java b/test/hotspot/jtreg/runtime/Unsafe/GetPutByte.java similarity index 100% rename from hotspot/test/runtime/Unsafe/GetPutByte.java rename to test/hotspot/jtreg/runtime/Unsafe/GetPutByte.java diff --git a/hotspot/test/runtime/Unsafe/GetPutChar.java b/test/hotspot/jtreg/runtime/Unsafe/GetPutChar.java similarity index 100% rename from hotspot/test/runtime/Unsafe/GetPutChar.java rename to test/hotspot/jtreg/runtime/Unsafe/GetPutChar.java diff --git a/hotspot/test/runtime/Unsafe/GetPutDouble.java b/test/hotspot/jtreg/runtime/Unsafe/GetPutDouble.java similarity index 100% rename from hotspot/test/runtime/Unsafe/GetPutDouble.java rename to test/hotspot/jtreg/runtime/Unsafe/GetPutDouble.java diff --git a/hotspot/test/runtime/Unsafe/GetPutFloat.java b/test/hotspot/jtreg/runtime/Unsafe/GetPutFloat.java similarity index 100% rename from hotspot/test/runtime/Unsafe/GetPutFloat.java rename to test/hotspot/jtreg/runtime/Unsafe/GetPutFloat.java diff --git a/hotspot/test/runtime/Unsafe/GetPutInt.java b/test/hotspot/jtreg/runtime/Unsafe/GetPutInt.java similarity index 100% rename from hotspot/test/runtime/Unsafe/GetPutInt.java rename to test/hotspot/jtreg/runtime/Unsafe/GetPutInt.java diff --git a/hotspot/test/runtime/Unsafe/GetPutLong.java b/test/hotspot/jtreg/runtime/Unsafe/GetPutLong.java similarity index 100% rename from hotspot/test/runtime/Unsafe/GetPutLong.java rename to test/hotspot/jtreg/runtime/Unsafe/GetPutLong.java diff --git a/hotspot/test/runtime/Unsafe/GetPutObject.java b/test/hotspot/jtreg/runtime/Unsafe/GetPutObject.java similarity index 100% rename from hotspot/test/runtime/Unsafe/GetPutObject.java rename to test/hotspot/jtreg/runtime/Unsafe/GetPutObject.java diff --git a/hotspot/test/runtime/Unsafe/GetPutShort.java b/test/hotspot/jtreg/runtime/Unsafe/GetPutShort.java similarity index 100% rename from hotspot/test/runtime/Unsafe/GetPutShort.java rename to test/hotspot/jtreg/runtime/Unsafe/GetPutShort.java diff --git a/hotspot/test/runtime/Unsafe/GetUncompressedObject.java b/test/hotspot/jtreg/runtime/Unsafe/GetUncompressedObject.java similarity index 100% rename from hotspot/test/runtime/Unsafe/GetUncompressedObject.java rename to test/hotspot/jtreg/runtime/Unsafe/GetUncompressedObject.java diff --git a/hotspot/test/runtime/Unsafe/NestedUnsafe.java b/test/hotspot/jtreg/runtime/Unsafe/NestedUnsafe.java similarity index 100% rename from hotspot/test/runtime/Unsafe/NestedUnsafe.java rename to test/hotspot/jtreg/runtime/Unsafe/NestedUnsafe.java diff --git a/hotspot/test/runtime/Unsafe/PageSize.java b/test/hotspot/jtreg/runtime/Unsafe/PageSize.java similarity index 100% rename from hotspot/test/runtime/Unsafe/PageSize.java rename to test/hotspot/jtreg/runtime/Unsafe/PageSize.java diff --git a/hotspot/test/runtime/Unsafe/PrimitiveHostClass.java b/test/hotspot/jtreg/runtime/Unsafe/PrimitiveHostClass.java similarity index 100% rename from hotspot/test/runtime/Unsafe/PrimitiveHostClass.java rename to test/hotspot/jtreg/runtime/Unsafe/PrimitiveHostClass.java diff --git a/hotspot/test/runtime/Unsafe/RangeCheck.java b/test/hotspot/jtreg/runtime/Unsafe/RangeCheck.java similarity index 100% rename from hotspot/test/runtime/Unsafe/RangeCheck.java rename to test/hotspot/jtreg/runtime/Unsafe/RangeCheck.java diff --git a/hotspot/test/runtime/Unsafe/Reallocate.java b/test/hotspot/jtreg/runtime/Unsafe/Reallocate.java similarity index 100% rename from hotspot/test/runtime/Unsafe/Reallocate.java rename to test/hotspot/jtreg/runtime/Unsafe/Reallocate.java diff --git a/hotspot/test/runtime/Unsafe/SetMemory.java b/test/hotspot/jtreg/runtime/Unsafe/SetMemory.java similarity index 100% rename from hotspot/test/runtime/Unsafe/SetMemory.java rename to test/hotspot/jtreg/runtime/Unsafe/SetMemory.java diff --git a/hotspot/test/runtime/Unsafe/ThrowException.java b/test/hotspot/jtreg/runtime/Unsafe/ThrowException.java similarity index 100% rename from hotspot/test/runtime/Unsafe/ThrowException.java rename to test/hotspot/jtreg/runtime/Unsafe/ThrowException.java diff --git a/hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java b/test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java similarity index 100% rename from hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java rename to test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java diff --git a/hotspot/test/runtime/classFileParserBug/AccModuleTest.java b/test/hotspot/jtreg/runtime/classFileParserBug/AccModuleTest.java similarity index 100% rename from hotspot/test/runtime/classFileParserBug/AccModuleTest.java rename to test/hotspot/jtreg/runtime/classFileParserBug/AccModuleTest.java diff --git a/hotspot/test/runtime/classFileParserBug/AnnotationTag.java b/test/hotspot/jtreg/runtime/classFileParserBug/AnnotationTag.java similarity index 100% rename from hotspot/test/runtime/classFileParserBug/AnnotationTag.java rename to test/hotspot/jtreg/runtime/classFileParserBug/AnnotationTag.java diff --git a/hotspot/test/runtime/classFileParserBug/BadAccModInrClss.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/BadAccModInrClss.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/BadAccModInrClss.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/BadAccModInrClss.jcod diff --git a/hotspot/test/runtime/classFileParserBug/BadAccModule.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/BadAccModule.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/BadAccModule.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/BadAccModule.jcod diff --git a/hotspot/test/runtime/classFileParserBug/BadInitMethod.java b/test/hotspot/jtreg/runtime/classFileParserBug/BadInitMethod.java similarity index 100% rename from hotspot/test/runtime/classFileParserBug/BadInitMethod.java rename to test/hotspot/jtreg/runtime/classFileParserBug/BadInitMethod.java diff --git a/hotspot/test/runtime/classFileParserBug/BadNameAndType.java b/test/hotspot/jtreg/runtime/classFileParserBug/BadNameAndType.java similarity index 100% rename from hotspot/test/runtime/classFileParserBug/BadNameAndType.java rename to test/hotspot/jtreg/runtime/classFileParserBug/BadNameAndType.java diff --git a/hotspot/test/runtime/classFileParserBug/Class53.jasm b/test/hotspot/jtreg/runtime/classFileParserBug/Class53.jasm similarity index 100% rename from hotspot/test/runtime/classFileParserBug/Class53.jasm rename to test/hotspot/jtreg/runtime/classFileParserBug/Class53.jasm diff --git a/hotspot/test/runtime/classFileParserBug/ClassFileParserBug.java b/test/hotspot/jtreg/runtime/classFileParserBug/ClassFileParserBug.java similarity index 100% rename from hotspot/test/runtime/classFileParserBug/ClassFileParserBug.java rename to test/hotspot/jtreg/runtime/classFileParserBug/ClassFileParserBug.java diff --git a/hotspot/test/runtime/classFileParserBug/EnclosingMethod.java b/test/hotspot/jtreg/runtime/classFileParserBug/EnclosingMethod.java similarity index 100% rename from hotspot/test/runtime/classFileParserBug/EnclosingMethod.java rename to test/hotspot/jtreg/runtime/classFileParserBug/EnclosingMethod.java diff --git a/hotspot/test/runtime/classFileParserBug/FakeMethodAcc.java b/test/hotspot/jtreg/runtime/classFileParserBug/FakeMethodAcc.java similarity index 100% rename from hotspot/test/runtime/classFileParserBug/FakeMethodAcc.java rename to test/hotspot/jtreg/runtime/classFileParserBug/FakeMethodAcc.java diff --git a/hotspot/test/runtime/classFileParserBug/InitInInterface.java b/test/hotspot/jtreg/runtime/classFileParserBug/InitInInterface.java similarity index 100% rename from hotspot/test/runtime/classFileParserBug/InitInInterface.java rename to test/hotspot/jtreg/runtime/classFileParserBug/InitInInterface.java diff --git a/hotspot/test/runtime/classFileParserBug/LambdaMath.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/LambdaMath.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/LambdaMath.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/LambdaMath.jcod diff --git a/hotspot/test/runtime/classFileParserBug/TestBadClassName.java b/test/hotspot/jtreg/runtime/classFileParserBug/TestBadClassName.java similarity index 100% rename from hotspot/test/runtime/classFileParserBug/TestBadClassName.java rename to test/hotspot/jtreg/runtime/classFileParserBug/TestBadClassName.java diff --git a/hotspot/test/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java b/test/hotspot/jtreg/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java similarity index 100% rename from hotspot/test/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java rename to test/hotspot/jtreg/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java diff --git a/hotspot/test/runtime/classFileParserBug/UseBadInterface1.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/UseBadInterface1.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/UseBadInterface1.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/UseBadInterface1.jcod diff --git a/hotspot/test/runtime/classFileParserBug/UseBadInterface2.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/UseBadInterface2.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/UseBadInterface2.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/UseBadInterface2.jcod diff --git a/hotspot/test/runtime/classFileParserBug/badAnnotTag.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/badAnnotTag.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/badAnnotTag.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/badAnnotTag.jcod diff --git a/hotspot/test/runtime/classFileParserBug/badEnclMthd.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/badEnclMthd.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/badEnclMthd.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/badEnclMthd.jcod diff --git a/hotspot/test/runtime/classFileParserBug/badInit.jasm b/test/hotspot/jtreg/runtime/classFileParserBug/badInit.jasm similarity index 100% rename from hotspot/test/runtime/classFileParserBug/badInit.jasm rename to test/hotspot/jtreg/runtime/classFileParserBug/badInit.jasm diff --git a/hotspot/test/runtime/classFileParserBug/clinitArg.jasm b/test/hotspot/jtreg/runtime/classFileParserBug/clinitArg.jasm similarity index 100% rename from hotspot/test/runtime/classFileParserBug/clinitArg.jasm rename to test/hotspot/jtreg/runtime/classFileParserBug/clinitArg.jasm diff --git a/hotspot/test/runtime/classFileParserBug/clinitArg51.jasm b/test/hotspot/jtreg/runtime/classFileParserBug/clinitArg51.jasm similarity index 100% rename from hotspot/test/runtime/classFileParserBug/clinitArg51.jasm rename to test/hotspot/jtreg/runtime/classFileParserBug/clinitArg51.jasm diff --git a/hotspot/test/runtime/classFileParserBug/clinitNonStatic.jasm b/test/hotspot/jtreg/runtime/classFileParserBug/clinitNonStatic.jasm similarity index 100% rename from hotspot/test/runtime/classFileParserBug/clinitNonStatic.jasm rename to test/hotspot/jtreg/runtime/classFileParserBug/clinitNonStatic.jasm diff --git a/hotspot/test/runtime/classFileParserBug/emptyNameUtf8.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/emptyNameUtf8.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/emptyNameUtf8.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/emptyNameUtf8.jcod diff --git a/hotspot/test/runtime/classFileParserBug/emptySigUtf8.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/emptySigUtf8.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/emptySigUtf8.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/emptySigUtf8.jcod diff --git a/hotspot/test/runtime/classFileParserBug/emptynumbootstrapmethods.jar b/test/hotspot/jtreg/runtime/classFileParserBug/emptynumbootstrapmethods.jar similarity index 100% rename from hotspot/test/runtime/classFileParserBug/emptynumbootstrapmethods.jar rename to test/hotspot/jtreg/runtime/classFileParserBug/emptynumbootstrapmethods.jar diff --git a/hotspot/test/runtime/classFileParserBug/emptynumbootstrapmethods1.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/emptynumbootstrapmethods1.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/emptynumbootstrapmethods1.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/emptynumbootstrapmethods1.jcod diff --git a/hotspot/test/runtime/classFileParserBug/emptynumbootstrapmethods2.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/emptynumbootstrapmethods2.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/emptynumbootstrapmethods2.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/emptynumbootstrapmethods2.jcod diff --git a/hotspot/test/runtime/classFileParserBug/fakeMethodAccessor.jasm b/test/hotspot/jtreg/runtime/classFileParserBug/fakeMethodAccessor.jasm similarity index 100% rename from hotspot/test/runtime/classFileParserBug/fakeMethodAccessor.jasm rename to test/hotspot/jtreg/runtime/classFileParserBug/fakeMethodAccessor.jasm diff --git a/hotspot/test/runtime/classFileParserBug/nonvoidClinit.jasm b/test/hotspot/jtreg/runtime/classFileParserBug/nonvoidClinit.jasm similarity index 100% rename from hotspot/test/runtime/classFileParserBug/nonvoidClinit.jasm rename to test/hotspot/jtreg/runtime/classFileParserBug/nonvoidClinit.jasm diff --git a/hotspot/test/runtime/classFileParserBug/nonvoidinit.jasm b/test/hotspot/jtreg/runtime/classFileParserBug/nonvoidinit.jasm similarity index 100% rename from hotspot/test/runtime/classFileParserBug/nonvoidinit.jasm rename to test/hotspot/jtreg/runtime/classFileParserBug/nonvoidinit.jasm diff --git a/hotspot/test/runtime/classFileParserBug/p1/BadInterface1.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/p1/BadInterface1.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/p1/BadInterface1.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/p1/BadInterface1.jcod diff --git a/hotspot/test/runtime/classFileParserBug/p1/BadInterface2.jcod b/test/hotspot/jtreg/runtime/classFileParserBug/p1/BadInterface2.jcod similarity index 100% rename from hotspot/test/runtime/classFileParserBug/p1/BadInterface2.jcod rename to test/hotspot/jtreg/runtime/classFileParserBug/p1/BadInterface2.jcod diff --git a/hotspot/test/runtime/classFileParserBug/test.jar b/test/hotspot/jtreg/runtime/classFileParserBug/test.jar similarity index 100% rename from hotspot/test/runtime/classFileParserBug/test.jar rename to test/hotspot/jtreg/runtime/classFileParserBug/test.jar diff --git a/hotspot/test/runtime/classFileParserBug/voidinit.jasm b/test/hotspot/jtreg/runtime/classFileParserBug/voidinit.jasm similarity index 100% rename from hotspot/test/runtime/classFileParserBug/voidinit.jasm rename to test/hotspot/jtreg/runtime/classFileParserBug/voidinit.jasm diff --git a/hotspot/test/runtime/constantPool/ACCModule52.java b/test/hotspot/jtreg/runtime/constantPool/ACCModule52.java similarity index 100% rename from hotspot/test/runtime/constantPool/ACCModule52.java rename to test/hotspot/jtreg/runtime/constantPool/ACCModule52.java diff --git a/hotspot/test/runtime/constantPool/ConstModule.java b/test/hotspot/jtreg/runtime/constantPool/ConstModule.java similarity index 100% rename from hotspot/test/runtime/constantPool/ConstModule.java rename to test/hotspot/jtreg/runtime/constantPool/ConstModule.java diff --git a/hotspot/test/runtime/contended/Basic.java b/test/hotspot/jtreg/runtime/contended/Basic.java similarity index 100% rename from hotspot/test/runtime/contended/Basic.java rename to test/hotspot/jtreg/runtime/contended/Basic.java diff --git a/hotspot/test/runtime/contended/DefaultValue.java b/test/hotspot/jtreg/runtime/contended/DefaultValue.java similarity index 100% rename from hotspot/test/runtime/contended/DefaultValue.java rename to test/hotspot/jtreg/runtime/contended/DefaultValue.java diff --git a/hotspot/test/runtime/contended/HasNonStatic.java b/test/hotspot/jtreg/runtime/contended/HasNonStatic.java similarity index 100% rename from hotspot/test/runtime/contended/HasNonStatic.java rename to test/hotspot/jtreg/runtime/contended/HasNonStatic.java diff --git a/hotspot/test/runtime/contended/Inheritance1.java b/test/hotspot/jtreg/runtime/contended/Inheritance1.java similarity index 100% rename from hotspot/test/runtime/contended/Inheritance1.java rename to test/hotspot/jtreg/runtime/contended/Inheritance1.java diff --git a/hotspot/test/runtime/contended/OopMaps.java b/test/hotspot/jtreg/runtime/contended/OopMaps.java similarity index 100% rename from hotspot/test/runtime/contended/OopMaps.java rename to test/hotspot/jtreg/runtime/contended/OopMaps.java diff --git a/hotspot/test/runtime/contended/OopMapsSameGroup.java b/test/hotspot/jtreg/runtime/contended/OopMapsSameGroup.java similarity index 100% rename from hotspot/test/runtime/contended/OopMapsSameGroup.java rename to test/hotspot/jtreg/runtime/contended/OopMapsSameGroup.java diff --git a/hotspot/test/runtime/contended/Options.java b/test/hotspot/jtreg/runtime/contended/Options.java similarity index 100% rename from hotspot/test/runtime/contended/Options.java rename to test/hotspot/jtreg/runtime/contended/Options.java diff --git a/hotspot/test/runtime/defineAnonClass/DefineAnon.java b/test/hotspot/jtreg/runtime/defineAnonClass/DefineAnon.java similarity index 100% rename from hotspot/test/runtime/defineAnonClass/DefineAnon.java rename to test/hotspot/jtreg/runtime/defineAnonClass/DefineAnon.java diff --git a/hotspot/test/runtime/defineAnonClass/NestedUnsafe.java b/test/hotspot/jtreg/runtime/defineAnonClass/NestedUnsafe.java similarity index 100% rename from hotspot/test/runtime/defineAnonClass/NestedUnsafe.java rename to test/hotspot/jtreg/runtime/defineAnonClass/NestedUnsafe.java diff --git a/hotspot/test/runtime/defineAnonClass/NestedUnsafe2.java b/test/hotspot/jtreg/runtime/defineAnonClass/NestedUnsafe2.java similarity index 100% rename from hotspot/test/runtime/defineAnonClass/NestedUnsafe2.java rename to test/hotspot/jtreg/runtime/defineAnonClass/NestedUnsafe2.java diff --git a/hotspot/test/runtime/duplAttributes/DupSignatureAttrs.jcod b/test/hotspot/jtreg/runtime/duplAttributes/DupSignatureAttrs.jcod similarity index 100% rename from hotspot/test/runtime/duplAttributes/DupSignatureAttrs.jcod rename to test/hotspot/jtreg/runtime/duplAttributes/DupSignatureAttrs.jcod diff --git a/hotspot/test/runtime/duplAttributes/DuplAttributes.jcod b/test/hotspot/jtreg/runtime/duplAttributes/DuplAttributes.jcod similarity index 100% rename from hotspot/test/runtime/duplAttributes/DuplAttributes.jcod rename to test/hotspot/jtreg/runtime/duplAttributes/DuplAttributes.jcod diff --git a/hotspot/test/runtime/duplAttributes/DuplAttributesTest.java b/test/hotspot/jtreg/runtime/duplAttributes/DuplAttributesTest.java similarity index 100% rename from hotspot/test/runtime/duplAttributes/DuplAttributesTest.java rename to test/hotspot/jtreg/runtime/duplAttributes/DuplAttributesTest.java diff --git a/hotspot/test/runtime/duplAttributes/TestDupSignatureAttr.java b/test/hotspot/jtreg/runtime/duplAttributes/TestDupSignatureAttr.java similarity index 100% rename from hotspot/test/runtime/duplAttributes/TestDupSignatureAttr.java rename to test/hotspot/jtreg/runtime/duplAttributes/TestDupSignatureAttr.java diff --git a/hotspot/test/runtime/duplAttributes/test.jar b/test/hotspot/jtreg/runtime/duplAttributes/test.jar similarity index 100% rename from hotspot/test/runtime/duplAttributes/test.jar rename to test/hotspot/jtreg/runtime/duplAttributes/test.jar diff --git a/hotspot/test/runtime/execstack/Test.java b/test/hotspot/jtreg/runtime/execstack/Test.java similarity index 100% rename from hotspot/test/runtime/execstack/Test.java rename to test/hotspot/jtreg/runtime/execstack/Test.java diff --git a/hotspot/test/runtime/execstack/TestMT.java b/test/hotspot/jtreg/runtime/execstack/TestMT.java similarity index 100% rename from hotspot/test/runtime/execstack/TestMT.java rename to test/hotspot/jtreg/runtime/execstack/TestMT.java diff --git a/hotspot/test/runtime/execstack/Testexecstack.java b/test/hotspot/jtreg/runtime/execstack/Testexecstack.java similarity index 100% rename from hotspot/test/runtime/execstack/Testexecstack.java rename to test/hotspot/jtreg/runtime/execstack/Testexecstack.java diff --git a/hotspot/test/runtime/execstack/libtest-rw.c b/test/hotspot/jtreg/runtime/execstack/libtest-rw.c similarity index 100% rename from hotspot/test/runtime/execstack/libtest-rw.c rename to test/hotspot/jtreg/runtime/execstack/libtest-rw.c diff --git a/hotspot/test/runtime/execstack/libtest-rwx.c b/test/hotspot/jtreg/runtime/execstack/libtest-rwx.c similarity index 100% rename from hotspot/test/runtime/execstack/libtest-rwx.c rename to test/hotspot/jtreg/runtime/execstack/libtest-rwx.c diff --git a/hotspot/test/runtime/finalStatic/FinalStatic.java b/test/hotspot/jtreg/runtime/finalStatic/FinalStatic.java similarity index 100% rename from hotspot/test/runtime/finalStatic/FinalStatic.java rename to test/hotspot/jtreg/runtime/finalStatic/FinalStatic.java diff --git a/hotspot/test/runtime/getSysPackage/GetSysPkgTest.java b/test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java similarity index 100% rename from hotspot/test/runtime/getSysPackage/GetSysPkgTest.java rename to test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java diff --git a/hotspot/test/runtime/handlerInTry/HandlerInTry.jasm b/test/hotspot/jtreg/runtime/handlerInTry/HandlerInTry.jasm similarity index 100% rename from hotspot/test/runtime/handlerInTry/HandlerInTry.jasm rename to test/hotspot/jtreg/runtime/handlerInTry/HandlerInTry.jasm diff --git a/hotspot/test/runtime/handlerInTry/IsolatedHandlerInTry.jasm b/test/hotspot/jtreg/runtime/handlerInTry/IsolatedHandlerInTry.jasm similarity index 100% rename from hotspot/test/runtime/handlerInTry/IsolatedHandlerInTry.jasm rename to test/hotspot/jtreg/runtime/handlerInTry/IsolatedHandlerInTry.jasm diff --git a/hotspot/test/runtime/handlerInTry/LoadHandlerInTry.java b/test/hotspot/jtreg/runtime/handlerInTry/LoadHandlerInTry.java similarity index 100% rename from hotspot/test/runtime/handlerInTry/LoadHandlerInTry.java rename to test/hotspot/jtreg/runtime/handlerInTry/LoadHandlerInTry.java diff --git a/hotspot/test/runtime/interned/SanityTest.java b/test/hotspot/jtreg/runtime/interned/SanityTest.java similarity index 100% rename from hotspot/test/runtime/interned/SanityTest.java rename to test/hotspot/jtreg/runtime/interned/SanityTest.java diff --git a/hotspot/test/runtime/invokedynamic/BootstrapMethodErrorTest.java b/test/hotspot/jtreg/runtime/invokedynamic/BootstrapMethodErrorTest.java similarity index 100% rename from hotspot/test/runtime/invokedynamic/BootstrapMethodErrorTest.java rename to test/hotspot/jtreg/runtime/invokedynamic/BootstrapMethodErrorTest.java diff --git a/hotspot/test/runtime/jni/8025979/UninitializedStrings.java b/test/hotspot/jtreg/runtime/jni/8025979/UninitializedStrings.java similarity index 100% rename from hotspot/test/runtime/jni/8025979/UninitializedStrings.java rename to test/hotspot/jtreg/runtime/jni/8025979/UninitializedStrings.java diff --git a/hotspot/test/runtime/jni/8025979/libUninitializedStrings.c b/test/hotspot/jtreg/runtime/jni/8025979/libUninitializedStrings.c similarity index 100% rename from hotspot/test/runtime/jni/8025979/libUninitializedStrings.c rename to test/hotspot/jtreg/runtime/jni/8025979/libUninitializedStrings.c diff --git a/hotspot/test/runtime/jni/8033445/DefaultMethods.java b/test/hotspot/jtreg/runtime/jni/8033445/DefaultMethods.java similarity index 100% rename from hotspot/test/runtime/jni/8033445/DefaultMethods.java rename to test/hotspot/jtreg/runtime/jni/8033445/DefaultMethods.java diff --git a/hotspot/test/runtime/jni/8033445/libDefaultMethods.c b/test/hotspot/jtreg/runtime/jni/8033445/libDefaultMethods.c similarity index 100% rename from hotspot/test/runtime/jni/8033445/libDefaultMethods.c rename to test/hotspot/jtreg/runtime/jni/8033445/libDefaultMethods.c diff --git a/hotspot/test/runtime/jni/CallWithJNIWeak/CallWithJNIWeak.java b/test/hotspot/jtreg/runtime/jni/CallWithJNIWeak/CallWithJNIWeak.java similarity index 100% rename from hotspot/test/runtime/jni/CallWithJNIWeak/CallWithJNIWeak.java rename to test/hotspot/jtreg/runtime/jni/CallWithJNIWeak/CallWithJNIWeak.java diff --git a/hotspot/test/runtime/jni/CallWithJNIWeak/libCallWithJNIWeak.c b/test/hotspot/jtreg/runtime/jni/CallWithJNIWeak/libCallWithJNIWeak.c similarity index 100% rename from hotspot/test/runtime/jni/CallWithJNIWeak/libCallWithJNIWeak.c rename to test/hotspot/jtreg/runtime/jni/CallWithJNIWeak/libCallWithJNIWeak.c diff --git a/hotspot/test/runtime/jni/CalleeSavedRegisters/FPRegs.java b/test/hotspot/jtreg/runtime/jni/CalleeSavedRegisters/FPRegs.java similarity index 100% rename from hotspot/test/runtime/jni/CalleeSavedRegisters/FPRegs.java rename to test/hotspot/jtreg/runtime/jni/CalleeSavedRegisters/FPRegs.java diff --git a/hotspot/test/runtime/jni/CalleeSavedRegisters/exeFPRegs.c b/test/hotspot/jtreg/runtime/jni/CalleeSavedRegisters/exeFPRegs.c similarity index 100% rename from hotspot/test/runtime/jni/CalleeSavedRegisters/exeFPRegs.c rename to test/hotspot/jtreg/runtime/jni/CalleeSavedRegisters/exeFPRegs.c diff --git a/hotspot/test/runtime/jni/PrivateInterfaceMethods/PrivateInterfaceMethods.java b/test/hotspot/jtreg/runtime/jni/PrivateInterfaceMethods/PrivateInterfaceMethods.java similarity index 100% rename from hotspot/test/runtime/jni/PrivateInterfaceMethods/PrivateInterfaceMethods.java rename to test/hotspot/jtreg/runtime/jni/PrivateInterfaceMethods/PrivateInterfaceMethods.java diff --git a/hotspot/test/runtime/jni/PrivateInterfaceMethods/libPrivateInterfaceMethods.c b/test/hotspot/jtreg/runtime/jni/PrivateInterfaceMethods/libPrivateInterfaceMethods.c similarity index 100% rename from hotspot/test/runtime/jni/PrivateInterfaceMethods/libPrivateInterfaceMethods.c rename to test/hotspot/jtreg/runtime/jni/PrivateInterfaceMethods/libPrivateInterfaceMethods.c diff --git a/hotspot/test/runtime/jni/ReturnJNIWeak/ReturnJNIWeak.java b/test/hotspot/jtreg/runtime/jni/ReturnJNIWeak/ReturnJNIWeak.java similarity index 100% rename from hotspot/test/runtime/jni/ReturnJNIWeak/ReturnJNIWeak.java rename to test/hotspot/jtreg/runtime/jni/ReturnJNIWeak/ReturnJNIWeak.java diff --git a/hotspot/test/runtime/jni/ReturnJNIWeak/libReturnJNIWeak.c b/test/hotspot/jtreg/runtime/jni/ReturnJNIWeak/libReturnJNIWeak.c similarity index 100% rename from hotspot/test/runtime/jni/ReturnJNIWeak/libReturnJNIWeak.c rename to test/hotspot/jtreg/runtime/jni/ReturnJNIWeak/libReturnJNIWeak.c diff --git a/hotspot/test/runtime/jni/ToStringInInterfaceTest/ImplementationOfWithToString.java b/test/hotspot/jtreg/runtime/jni/ToStringInInterfaceTest/ImplementationOfWithToString.java similarity index 100% rename from hotspot/test/runtime/jni/ToStringInInterfaceTest/ImplementationOfWithToString.java rename to test/hotspot/jtreg/runtime/jni/ToStringInInterfaceTest/ImplementationOfWithToString.java diff --git a/hotspot/test/runtime/jni/ToStringInInterfaceTest/InterfaceWithToString.java b/test/hotspot/jtreg/runtime/jni/ToStringInInterfaceTest/InterfaceWithToString.java similarity index 100% rename from hotspot/test/runtime/jni/ToStringInInterfaceTest/InterfaceWithToString.java rename to test/hotspot/jtreg/runtime/jni/ToStringInInterfaceTest/InterfaceWithToString.java diff --git a/hotspot/test/runtime/jni/ToStringInInterfaceTest/ToStringTest.java b/test/hotspot/jtreg/runtime/jni/ToStringInInterfaceTest/ToStringTest.java similarity index 100% rename from hotspot/test/runtime/jni/ToStringInInterfaceTest/ToStringTest.java rename to test/hotspot/jtreg/runtime/jni/ToStringInInterfaceTest/ToStringTest.java diff --git a/hotspot/test/runtime/jni/ToStringInInterfaceTest/libToStringTest.c b/test/hotspot/jtreg/runtime/jni/ToStringInInterfaceTest/libToStringTest.c similarity index 100% rename from hotspot/test/runtime/jni/ToStringInInterfaceTest/libToStringTest.c rename to test/hotspot/jtreg/runtime/jni/ToStringInInterfaceTest/libToStringTest.c diff --git a/hotspot/test/runtime/jni/checked/TestCheckedJniExceptionCheck.java b/test/hotspot/jtreg/runtime/jni/checked/TestCheckedJniExceptionCheck.java similarity index 100% rename from hotspot/test/runtime/jni/checked/TestCheckedJniExceptionCheck.java rename to test/hotspot/jtreg/runtime/jni/checked/TestCheckedJniExceptionCheck.java diff --git a/hotspot/test/runtime/jni/checked/libTestCheckedJniExceptionCheck.c b/test/hotspot/jtreg/runtime/jni/checked/libTestCheckedJniExceptionCheck.c similarity index 100% rename from hotspot/test/runtime/jni/checked/libTestCheckedJniExceptionCheck.c rename to test/hotspot/jtreg/runtime/jni/checked/libTestCheckedJniExceptionCheck.c diff --git a/hotspot/test/runtime/jsig/TestJNI.java b/test/hotspot/jtreg/runtime/jsig/TestJNI.java similarity index 100% rename from hotspot/test/runtime/jsig/TestJNI.java rename to test/hotspot/jtreg/runtime/jsig/TestJNI.java diff --git a/hotspot/test/runtime/jsig/libTestJNI.c b/test/hotspot/jtreg/runtime/jsig/libTestJNI.c similarity index 100% rename from hotspot/test/runtime/jsig/libTestJNI.c rename to test/hotspot/jtreg/runtime/jsig/libTestJNI.c diff --git a/hotspot/test/runtime/lambda-features/CyclicInterfaceInit.java b/test/hotspot/jtreg/runtime/lambda-features/CyclicInterfaceInit.java similarity index 100% rename from hotspot/test/runtime/lambda-features/CyclicInterfaceInit.java rename to test/hotspot/jtreg/runtime/lambda-features/CyclicInterfaceInit.java diff --git a/hotspot/test/runtime/lambda-features/InterfaceInitializationStates.java b/test/hotspot/jtreg/runtime/lambda-features/InterfaceInitializationStates.java similarity index 100% rename from hotspot/test/runtime/lambda-features/InterfaceInitializationStates.java rename to test/hotspot/jtreg/runtime/lambda-features/InterfaceInitializationStates.java diff --git a/hotspot/test/runtime/lambda-features/InvokespecialInterface.java b/test/hotspot/jtreg/runtime/lambda-features/InvokespecialInterface.java similarity index 100% rename from hotspot/test/runtime/lambda-features/InvokespecialInterface.java rename to test/hotspot/jtreg/runtime/lambda-features/InvokespecialInterface.java diff --git a/hotspot/test/runtime/lambda-features/PublicStaticInterfaceMethodHandling.java b/test/hotspot/jtreg/runtime/lambda-features/PublicStaticInterfaceMethodHandling.java similarity index 100% rename from hotspot/test/runtime/lambda-features/PublicStaticInterfaceMethodHandling.java rename to test/hotspot/jtreg/runtime/lambda-features/PublicStaticInterfaceMethodHandling.java diff --git a/hotspot/test/runtime/lambda-features/TestConcreteClassWithAbstractMethod.java b/test/hotspot/jtreg/runtime/lambda-features/TestConcreteClassWithAbstractMethod.java similarity index 100% rename from hotspot/test/runtime/lambda-features/TestConcreteClassWithAbstractMethod.java rename to test/hotspot/jtreg/runtime/lambda-features/TestConcreteClassWithAbstractMethod.java diff --git a/hotspot/test/runtime/lambda-features/TestInterfaceInit.java b/test/hotspot/jtreg/runtime/lambda-features/TestInterfaceInit.java similarity index 100% rename from hotspot/test/runtime/lambda-features/TestInterfaceInit.java rename to test/hotspot/jtreg/runtime/lambda-features/TestInterfaceInit.java diff --git a/hotspot/test/runtime/lambda-features/TestInterfaceOrder.java b/test/hotspot/jtreg/runtime/lambda-features/TestInterfaceOrder.java similarity index 100% rename from hotspot/test/runtime/lambda-features/TestInterfaceOrder.java rename to test/hotspot/jtreg/runtime/lambda-features/TestInterfaceOrder.java diff --git a/hotspot/test/runtime/lambda-features/TestStaticandInstance.java b/test/hotspot/jtreg/runtime/lambda-features/TestStaticandInstance.java similarity index 100% rename from hotspot/test/runtime/lambda-features/TestStaticandInstance.java rename to test/hotspot/jtreg/runtime/lambda-features/TestStaticandInstance.java diff --git a/hotspot/test/runtime/libadimalloc.solaris.sparc/SEGVOverflow.java b/test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc/SEGVOverflow.java similarity index 100% rename from hotspot/test/runtime/libadimalloc.solaris.sparc/SEGVOverflow.java rename to test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc/SEGVOverflow.java diff --git a/hotspot/test/runtime/libadimalloc.solaris.sparc/Testlibadimalloc.java b/test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc/Testlibadimalloc.java similarity index 100% rename from hotspot/test/runtime/libadimalloc.solaris.sparc/Testlibadimalloc.java rename to test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc/Testlibadimalloc.java diff --git a/hotspot/test/runtime/libadimalloc.solaris.sparc/liboverflow.c b/test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc/liboverflow.c similarity index 100% rename from hotspot/test/runtime/libadimalloc.solaris.sparc/liboverflow.c rename to test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc/liboverflow.c diff --git a/hotspot/test/runtime/logging/BadMap50.jasm b/test/hotspot/jtreg/runtime/logging/BadMap50.jasm similarity index 100% rename from hotspot/test/runtime/logging/BadMap50.jasm rename to test/hotspot/jtreg/runtime/logging/BadMap50.jasm diff --git a/hotspot/test/runtime/logging/BiasedLockingTest.java b/test/hotspot/jtreg/runtime/logging/BiasedLockingTest.java similarity index 100% rename from hotspot/test/runtime/logging/BiasedLockingTest.java rename to test/hotspot/jtreg/runtime/logging/BiasedLockingTest.java diff --git a/hotspot/test/runtime/logging/ClassB.java b/test/hotspot/jtreg/runtime/logging/ClassB.java similarity index 100% rename from hotspot/test/runtime/logging/ClassB.java rename to test/hotspot/jtreg/runtime/logging/ClassB.java diff --git a/hotspot/test/runtime/logging/ClassInitializationTest.java b/test/hotspot/jtreg/runtime/logging/ClassInitializationTest.java similarity index 100% rename from hotspot/test/runtime/logging/ClassInitializationTest.java rename to test/hotspot/jtreg/runtime/logging/ClassInitializationTest.java diff --git a/hotspot/test/runtime/logging/ClassLoadUnloadTest.java b/test/hotspot/jtreg/runtime/logging/ClassLoadUnloadTest.java similarity index 100% rename from hotspot/test/runtime/logging/ClassLoadUnloadTest.java rename to test/hotspot/jtreg/runtime/logging/ClassLoadUnloadTest.java diff --git a/hotspot/test/runtime/logging/ClassResolutionTest.java b/test/hotspot/jtreg/runtime/logging/ClassResolutionTest.java similarity index 100% rename from hotspot/test/runtime/logging/ClassResolutionTest.java rename to test/hotspot/jtreg/runtime/logging/ClassResolutionTest.java diff --git a/hotspot/test/runtime/logging/CompressedOopsTest.java b/test/hotspot/jtreg/runtime/logging/CompressedOopsTest.java similarity index 100% rename from hotspot/test/runtime/logging/CompressedOopsTest.java rename to test/hotspot/jtreg/runtime/logging/CompressedOopsTest.java diff --git a/hotspot/test/runtime/logging/DefaultMethodsTest.java b/test/hotspot/jtreg/runtime/logging/DefaultMethodsTest.java similarity index 100% rename from hotspot/test/runtime/logging/DefaultMethodsTest.java rename to test/hotspot/jtreg/runtime/logging/DefaultMethodsTest.java diff --git a/hotspot/test/runtime/logging/ExceptionsTest.java b/test/hotspot/jtreg/runtime/logging/ExceptionsTest.java similarity index 100% rename from hotspot/test/runtime/logging/ExceptionsTest.java rename to test/hotspot/jtreg/runtime/logging/ExceptionsTest.java diff --git a/hotspot/test/runtime/logging/ExceptionsTest_options_file b/test/hotspot/jtreg/runtime/logging/ExceptionsTest_options_file similarity index 100% rename from hotspot/test/runtime/logging/ExceptionsTest_options_file rename to test/hotspot/jtreg/runtime/logging/ExceptionsTest_options_file diff --git a/hotspot/test/runtime/logging/ItablesTest.java b/test/hotspot/jtreg/runtime/logging/ItablesTest.java similarity index 100% rename from hotspot/test/runtime/logging/ItablesTest.java rename to test/hotspot/jtreg/runtime/logging/ItablesTest.java diff --git a/hotspot/test/runtime/logging/ItablesVtableTest.java b/test/hotspot/jtreg/runtime/logging/ItablesVtableTest.java similarity index 100% rename from hotspot/test/runtime/logging/ItablesVtableTest.java rename to test/hotspot/jtreg/runtime/logging/ItablesVtableTest.java diff --git a/hotspot/test/runtime/logging/LoaderConstraintsTest.java b/test/hotspot/jtreg/runtime/logging/LoaderConstraintsTest.java similarity index 100% rename from hotspot/test/runtime/logging/LoaderConstraintsTest.java rename to test/hotspot/jtreg/runtime/logging/LoaderConstraintsTest.java diff --git a/hotspot/test/runtime/logging/ModulesTest.java b/test/hotspot/jtreg/runtime/logging/ModulesTest.java similarity index 100% rename from hotspot/test/runtime/logging/ModulesTest.java rename to test/hotspot/jtreg/runtime/logging/ModulesTest.java diff --git a/hotspot/test/runtime/logging/MonitorInflationTest.java b/test/hotspot/jtreg/runtime/logging/MonitorInflationTest.java similarity index 100% rename from hotspot/test/runtime/logging/MonitorInflationTest.java rename to test/hotspot/jtreg/runtime/logging/MonitorInflationTest.java diff --git a/hotspot/test/runtime/logging/MonitorMismatchHelper.jasm b/test/hotspot/jtreg/runtime/logging/MonitorMismatchHelper.jasm similarity index 100% rename from hotspot/test/runtime/logging/MonitorMismatchHelper.jasm rename to test/hotspot/jtreg/runtime/logging/MonitorMismatchHelper.jasm diff --git a/hotspot/test/runtime/logging/MonitorMismatchTest.java b/test/hotspot/jtreg/runtime/logging/MonitorMismatchTest.java similarity index 100% rename from hotspot/test/runtime/logging/MonitorMismatchTest.java rename to test/hotspot/jtreg/runtime/logging/MonitorMismatchTest.java diff --git a/hotspot/test/runtime/logging/OsCpuLoggingTest.java b/test/hotspot/jtreg/runtime/logging/OsCpuLoggingTest.java similarity index 100% rename from hotspot/test/runtime/logging/OsCpuLoggingTest.java rename to test/hotspot/jtreg/runtime/logging/OsCpuLoggingTest.java diff --git a/hotspot/test/runtime/logging/ProtectionDomainVerificationTest.java b/test/hotspot/jtreg/runtime/logging/ProtectionDomainVerificationTest.java similarity index 100% rename from hotspot/test/runtime/logging/ProtectionDomainVerificationTest.java rename to test/hotspot/jtreg/runtime/logging/ProtectionDomainVerificationTest.java diff --git a/hotspot/test/runtime/logging/RemovedDevelopFlagsTest.java b/test/hotspot/jtreg/runtime/logging/RemovedDevelopFlagsTest.java similarity index 100% rename from hotspot/test/runtime/logging/RemovedDevelopFlagsTest.java rename to test/hotspot/jtreg/runtime/logging/RemovedDevelopFlagsTest.java diff --git a/hotspot/test/runtime/logging/SafepointCleanupTest.java b/test/hotspot/jtreg/runtime/logging/SafepointCleanupTest.java similarity index 100% rename from hotspot/test/runtime/logging/SafepointCleanupTest.java rename to test/hotspot/jtreg/runtime/logging/SafepointCleanupTest.java diff --git a/hotspot/test/runtime/logging/SafepointTest.java b/test/hotspot/jtreg/runtime/logging/SafepointTest.java similarity index 100% rename from hotspot/test/runtime/logging/SafepointTest.java rename to test/hotspot/jtreg/runtime/logging/SafepointTest.java diff --git a/hotspot/test/runtime/logging/StackWalkTest.java b/test/hotspot/jtreg/runtime/logging/StackWalkTest.java similarity index 100% rename from hotspot/test/runtime/logging/StackWalkTest.java rename to test/hotspot/jtreg/runtime/logging/StackWalkTest.java diff --git a/hotspot/test/runtime/logging/StartupTimeTest.java b/test/hotspot/jtreg/runtime/logging/StartupTimeTest.java similarity index 100% rename from hotspot/test/runtime/logging/StartupTimeTest.java rename to test/hotspot/jtreg/runtime/logging/StartupTimeTest.java diff --git a/hotspot/test/runtime/logging/ThreadLoggingTest.java b/test/hotspot/jtreg/runtime/logging/ThreadLoggingTest.java similarity index 100% rename from hotspot/test/runtime/logging/ThreadLoggingTest.java rename to test/hotspot/jtreg/runtime/logging/ThreadLoggingTest.java diff --git a/hotspot/test/runtime/logging/VMOperationTest.java b/test/hotspot/jtreg/runtime/logging/VMOperationTest.java similarity index 100% rename from hotspot/test/runtime/logging/VMOperationTest.java rename to test/hotspot/jtreg/runtime/logging/VMOperationTest.java diff --git a/hotspot/test/runtime/logging/VerificationTest.java b/test/hotspot/jtreg/runtime/logging/VerificationTest.java similarity index 100% rename from hotspot/test/runtime/logging/VerificationTest.java rename to test/hotspot/jtreg/runtime/logging/VerificationTest.java diff --git a/hotspot/test/runtime/logging/VtablesTest.java b/test/hotspot/jtreg/runtime/logging/VtablesTest.java similarity index 100% rename from hotspot/test/runtime/logging/VtablesTest.java rename to test/hotspot/jtreg/runtime/logging/VtablesTest.java diff --git a/hotspot/test/runtime/logging/classes/test/Empty.java b/test/hotspot/jtreg/runtime/logging/classes/test/Empty.java similarity index 100% rename from hotspot/test/runtime/logging/classes/test/Empty.java rename to test/hotspot/jtreg/runtime/logging/classes/test/Empty.java diff --git a/hotspot/test/runtime/logging/p1/A.java b/test/hotspot/jtreg/runtime/logging/p1/A.java similarity index 100% rename from hotspot/test/runtime/logging/p1/A.java rename to test/hotspot/jtreg/runtime/logging/p1/A.java diff --git a/hotspot/test/runtime/logging/p1/C.java b/test/hotspot/jtreg/runtime/logging/p1/C.java similarity index 100% rename from hotspot/test/runtime/logging/p1/C.java rename to test/hotspot/jtreg/runtime/logging/p1/C.java diff --git a/hotspot/test/runtime/logging/p2/B.jcod b/test/hotspot/jtreg/runtime/logging/p2/B.jcod similarity index 100% rename from hotspot/test/runtime/logging/p2/B.jcod rename to test/hotspot/jtreg/runtime/logging/p2/B.jcod diff --git a/hotspot/test/runtime/logging/p2/D.java b/test/hotspot/jtreg/runtime/logging/p2/D.java similarity index 100% rename from hotspot/test/runtime/logging/p2/D.java rename to test/hotspot/jtreg/runtime/logging/p2/D.java diff --git a/hotspot/test/runtime/memory/LargePages/TestLargePageSizeInBytes.java b/test/hotspot/jtreg/runtime/memory/LargePages/TestLargePageSizeInBytes.java similarity index 100% rename from hotspot/test/runtime/memory/LargePages/TestLargePageSizeInBytes.java rename to test/hotspot/jtreg/runtime/memory/LargePages/TestLargePageSizeInBytes.java diff --git a/hotspot/test/runtime/memory/LargePages/TestLargePagesFlags.java b/test/hotspot/jtreg/runtime/memory/LargePages/TestLargePagesFlags.java similarity index 100% rename from hotspot/test/runtime/memory/LargePages/TestLargePagesFlags.java rename to test/hotspot/jtreg/runtime/memory/LargePages/TestLargePagesFlags.java diff --git a/hotspot/test/runtime/memory/MultiAllocateNullCheck.java b/test/hotspot/jtreg/runtime/memory/MultiAllocateNullCheck.java similarity index 100% rename from hotspot/test/runtime/memory/MultiAllocateNullCheck.java rename to test/hotspot/jtreg/runtime/memory/MultiAllocateNullCheck.java diff --git a/hotspot/test/runtime/memory/ReadFromNoaccessArea.java b/test/hotspot/jtreg/runtime/memory/ReadFromNoaccessArea.java similarity index 100% rename from hotspot/test/runtime/memory/ReadFromNoaccessArea.java rename to test/hotspot/jtreg/runtime/memory/ReadFromNoaccessArea.java diff --git a/hotspot/test/runtime/memory/ReadVMPageSize.java b/test/hotspot/jtreg/runtime/memory/ReadVMPageSize.java similarity index 100% rename from hotspot/test/runtime/memory/ReadVMPageSize.java rename to test/hotspot/jtreg/runtime/memory/ReadVMPageSize.java diff --git a/hotspot/test/runtime/memory/ReserveMemory.java b/test/hotspot/jtreg/runtime/memory/ReserveMemory.java similarity index 100% rename from hotspot/test/runtime/memory/ReserveMemory.java rename to test/hotspot/jtreg/runtime/memory/ReserveMemory.java diff --git a/hotspot/test/runtime/memory/RunUnitTestsConcurrently.java b/test/hotspot/jtreg/runtime/memory/RunUnitTestsConcurrently.java similarity index 100% rename from hotspot/test/runtime/memory/RunUnitTestsConcurrently.java rename to test/hotspot/jtreg/runtime/memory/RunUnitTestsConcurrently.java diff --git a/hotspot/test/runtime/memory/StressVirtualSpaceResize.java b/test/hotspot/jtreg/runtime/memory/StressVirtualSpaceResize.java similarity index 100% rename from hotspot/test/runtime/memory/StressVirtualSpaceResize.java rename to test/hotspot/jtreg/runtime/memory/StressVirtualSpaceResize.java diff --git a/hotspot/test/runtime/modules/AccModuleTest.java b/test/hotspot/jtreg/runtime/modules/AccModuleTest.java similarity index 100% rename from hotspot/test/runtime/modules/AccModuleTest.java rename to test/hotspot/jtreg/runtime/modules/AccModuleTest.java diff --git a/hotspot/test/runtime/modules/AccessCheck/AccessExportTwice.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/AccessExportTwice.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/AccessExportTwice.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/AccessExportTwice.java diff --git a/hotspot/test/runtime/modules/AccessCheck/AccessReadTwice.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/AccessReadTwice.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/AccessReadTwice.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/AccessReadTwice.java diff --git a/hotspot/test/runtime/modules/AccessCheck/CheckRead.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/CheckRead.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/CheckRead.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/CheckRead.java diff --git a/hotspot/test/runtime/modules/AccessCheck/DiffCL_CheckRead.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_CheckRead.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/DiffCL_CheckRead.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_CheckRead.java diff --git a/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java diff --git a/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java diff --git a/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java diff --git a/hotspot/test/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java diff --git a/hotspot/test/runtime/modules/AccessCheck/DiffCL_Umod.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_Umod.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/DiffCL_Umod.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_Umod.java diff --git a/hotspot/test/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java diff --git a/hotspot/test/runtime/modules/AccessCheck/ExpQualOther.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/ExpQualOther.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/ExpQualOther.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/ExpQualOther.java diff --git a/hotspot/test/runtime/modules/AccessCheck/ExpQualToM1.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/ExpQualToM1.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/ExpQualToM1.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/ExpQualToM1.java diff --git a/hotspot/test/runtime/modules/AccessCheck/ExpUnqual.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/ExpUnqual.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/ExpUnqual.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/ExpUnqual.java diff --git a/hotspot/test/runtime/modules/AccessCheck/ExportAllUnnamed.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/ExportAllUnnamed.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/ExportAllUnnamed.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/ExportAllUnnamed.java diff --git a/hotspot/test/runtime/modules/AccessCheck/ModuleLibrary.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/ModuleLibrary.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/ModuleLibrary.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/ModuleLibrary.java diff --git a/hotspot/test/runtime/modules/AccessCheck/PkgNotExp.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/PkgNotExp.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/PkgNotExp.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/PkgNotExp.java diff --git a/hotspot/test/runtime/modules/AccessCheck/Umod.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/Umod.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/Umod.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/Umod.java diff --git a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java diff --git a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java diff --git a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java diff --git a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_Umod.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/UmodDiffCL_Umod.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_Umod.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/UmodDiffCL_Umod.java diff --git a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_UmodUpkg.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/UmodDiffCL_UmodUpkg.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_UmodUpkg.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/UmodDiffCL_UmodUpkg.java diff --git a/hotspot/test/runtime/modules/AccessCheck/UmodUPkg.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUPkg.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/UmodUPkg.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUPkg.java diff --git a/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java diff --git a/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java diff --git a/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_Umod.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUpkgDiffCL_Umod.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_Umod.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUpkgDiffCL_Umod.java diff --git a/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java diff --git a/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_NotExp.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUpkg_NotExp.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/UmodUpkg_NotExp.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUpkg_NotExp.java diff --git a/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_Umod.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUpkg_Umod.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/UmodUpkg_Umod.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/UmodUpkg_Umod.java diff --git a/hotspot/test/runtime/modules/AccessCheck/Umod_ExpQualOther.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/Umod_ExpQualOther.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/Umod_ExpQualOther.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/Umod_ExpQualOther.java diff --git a/hotspot/test/runtime/modules/AccessCheck/Umod_ExpUnqual.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/Umod_ExpUnqual.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/Umod_ExpUnqual.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/Umod_ExpUnqual.java diff --git a/hotspot/test/runtime/modules/AccessCheck/Umod_PkgNotExp.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/Umod_PkgNotExp.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/Umod_PkgNotExp.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/Umod_PkgNotExp.java diff --git a/hotspot/test/runtime/modules/AccessCheck/Umod_UmodUpkg.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/Umod_UmodUpkg.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/Umod_UmodUpkg.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/Umod_UmodUpkg.java diff --git a/hotspot/test/runtime/modules/AccessCheck/c4.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/c4.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/c4.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/c4.java diff --git a/hotspot/test/runtime/modules/AccessCheck/c5.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/c5.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/c5.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/c5.java diff --git a/hotspot/test/runtime/modules/AccessCheck/myloaders/MyDiffClassLoader.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/myloaders/MyDiffClassLoader.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/myloaders/MyDiffClassLoader.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/myloaders/MyDiffClassLoader.java diff --git a/hotspot/test/runtime/modules/AccessCheck/myloaders/MySameClassLoader.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/myloaders/MySameClassLoader.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/myloaders/MySameClassLoader.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/myloaders/MySameClassLoader.java diff --git a/hotspot/test/runtime/modules/AccessCheck/p1/c1.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/p1/c1.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/p1/c1.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/p1/c1.java diff --git a/hotspot/test/runtime/modules/AccessCheck/p1/c1Loose.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/p1/c1Loose.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/p1/c1Loose.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/p1/c1Loose.java diff --git a/hotspot/test/runtime/modules/AccessCheck/p1/c1ReadEdge.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/p1/c1ReadEdge.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/p1/c1ReadEdge.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/p1/c1ReadEdge.java diff --git a/hotspot/test/runtime/modules/AccessCheck/p1/c1ReadEdgeDiffLoader.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/p1/c1ReadEdgeDiffLoader.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/p1/c1ReadEdgeDiffLoader.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/p1/c1ReadEdgeDiffLoader.java diff --git a/hotspot/test/runtime/modules/AccessCheck/p2/c2.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/p2/c2.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/p2/c2.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/p2/c2.java diff --git a/hotspot/test/runtime/modules/AccessCheck/p3/c3.jcod b/test/hotspot/jtreg/runtime/modules/AccessCheck/p3/c3.jcod similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/p3/c3.jcod rename to test/hotspot/jtreg/runtime/modules/AccessCheck/p3/c3.jcod diff --git a/hotspot/test/runtime/modules/AccessCheck/p3/c3ReadEdge.jcod b/test/hotspot/jtreg/runtime/modules/AccessCheck/p3/c3ReadEdge.jcod similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/p3/c3ReadEdge.jcod rename to test/hotspot/jtreg/runtime/modules/AccessCheck/p3/c3ReadEdge.jcod diff --git a/hotspot/test/runtime/modules/AccessCheck/p3/c3ReadEdgeDiffLoader.jcod b/test/hotspot/jtreg/runtime/modules/AccessCheck/p3/c3ReadEdgeDiffLoader.jcod similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/p3/c3ReadEdgeDiffLoader.jcod rename to test/hotspot/jtreg/runtime/modules/AccessCheck/p3/c3ReadEdgeDiffLoader.jcod diff --git a/hotspot/test/runtime/modules/AccessCheck/p4/c4.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/p4/c4.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/p4/c4.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/p4/c4.java diff --git a/hotspot/test/runtime/modules/AccessCheck/p6/c6.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/p6/c6.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheck/p6/c6.java rename to test/hotspot/jtreg/runtime/modules/AccessCheck/p6/c6.java diff --git a/hotspot/test/runtime/modules/AccessCheckAllUnnamed.java b/test/hotspot/jtreg/runtime/modules/AccessCheckAllUnnamed.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheckAllUnnamed.java rename to test/hotspot/jtreg/runtime/modules/AccessCheckAllUnnamed.java diff --git a/hotspot/test/runtime/modules/AccessCheckExp.java b/test/hotspot/jtreg/runtime/modules/AccessCheckExp.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheckExp.java rename to test/hotspot/jtreg/runtime/modules/AccessCheckExp.java diff --git a/hotspot/test/runtime/modules/AccessCheckJavaBase.java b/test/hotspot/jtreg/runtime/modules/AccessCheckJavaBase.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheckJavaBase.java rename to test/hotspot/jtreg/runtime/modules/AccessCheckJavaBase.java diff --git a/hotspot/test/runtime/modules/AccessCheckOpen.java b/test/hotspot/jtreg/runtime/modules/AccessCheckOpen.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheckOpen.java rename to test/hotspot/jtreg/runtime/modules/AccessCheckOpen.java diff --git a/hotspot/test/runtime/modules/AccessCheckRead.java b/test/hotspot/jtreg/runtime/modules/AccessCheckRead.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheckRead.java rename to test/hotspot/jtreg/runtime/modules/AccessCheckRead.java diff --git a/hotspot/test/runtime/modules/AccessCheckSuper.java b/test/hotspot/jtreg/runtime/modules/AccessCheckSuper.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheckSuper.java rename to test/hotspot/jtreg/runtime/modules/AccessCheckSuper.java diff --git a/hotspot/test/runtime/modules/AccessCheckUnnamed.java b/test/hotspot/jtreg/runtime/modules/AccessCheckUnnamed.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheckUnnamed.java rename to test/hotspot/jtreg/runtime/modules/AccessCheckUnnamed.java diff --git a/hotspot/test/runtime/modules/AccessCheckWorks.java b/test/hotspot/jtreg/runtime/modules/AccessCheckWorks.java similarity index 100% rename from hotspot/test/runtime/modules/AccessCheckWorks.java rename to test/hotspot/jtreg/runtime/modules/AccessCheckWorks.java diff --git a/hotspot/test/runtime/modules/CCE_module_msg.java b/test/hotspot/jtreg/runtime/modules/CCE_module_msg.java similarity index 100% rename from hotspot/test/runtime/modules/CCE_module_msg.java rename to test/hotspot/jtreg/runtime/modules/CCE_module_msg.java diff --git a/hotspot/test/runtime/modules/CompilerUtils.java b/test/hotspot/jtreg/runtime/modules/CompilerUtils.java similarity index 100% rename from hotspot/test/runtime/modules/CompilerUtils.java rename to test/hotspot/jtreg/runtime/modules/CompilerUtils.java diff --git a/hotspot/test/runtime/modules/ExportTwice.java b/test/hotspot/jtreg/runtime/modules/ExportTwice.java similarity index 100% rename from hotspot/test/runtime/modules/ExportTwice.java rename to test/hotspot/jtreg/runtime/modules/ExportTwice.java diff --git a/hotspot/test/runtime/modules/IgnoreModulePropertiesTest.java b/test/hotspot/jtreg/runtime/modules/IgnoreModulePropertiesTest.java similarity index 100% rename from hotspot/test/runtime/modules/IgnoreModulePropertiesTest.java rename to test/hotspot/jtreg/runtime/modules/IgnoreModulePropertiesTest.java diff --git a/hotspot/test/runtime/modules/JVMAddModuleExportToAllUnnamed.java b/test/hotspot/jtreg/runtime/modules/JVMAddModuleExportToAllUnnamed.java similarity index 100% rename from hotspot/test/runtime/modules/JVMAddModuleExportToAllUnnamed.java rename to test/hotspot/jtreg/runtime/modules/JVMAddModuleExportToAllUnnamed.java diff --git a/hotspot/test/runtime/modules/JVMAddModuleExports.java b/test/hotspot/jtreg/runtime/modules/JVMAddModuleExports.java similarity index 100% rename from hotspot/test/runtime/modules/JVMAddModuleExports.java rename to test/hotspot/jtreg/runtime/modules/JVMAddModuleExports.java diff --git a/hotspot/test/runtime/modules/JVMAddModuleExportsToAll.java b/test/hotspot/jtreg/runtime/modules/JVMAddModuleExportsToAll.java similarity index 100% rename from hotspot/test/runtime/modules/JVMAddModuleExportsToAll.java rename to test/hotspot/jtreg/runtime/modules/JVMAddModuleExportsToAll.java diff --git a/hotspot/test/runtime/modules/JVMAddReadsModule.java b/test/hotspot/jtreg/runtime/modules/JVMAddReadsModule.java similarity index 100% rename from hotspot/test/runtime/modules/JVMAddReadsModule.java rename to test/hotspot/jtreg/runtime/modules/JVMAddReadsModule.java diff --git a/hotspot/test/runtime/modules/JVMDefineModule.java b/test/hotspot/jtreg/runtime/modules/JVMDefineModule.java similarity index 100% rename from hotspot/test/runtime/modules/JVMDefineModule.java rename to test/hotspot/jtreg/runtime/modules/JVMDefineModule.java diff --git a/hotspot/test/runtime/modules/LoadUnloadModuleStress.java b/test/hotspot/jtreg/runtime/modules/LoadUnloadModuleStress.java similarity index 100% rename from hotspot/test/runtime/modules/LoadUnloadModuleStress.java rename to test/hotspot/jtreg/runtime/modules/LoadUnloadModuleStress.java diff --git a/hotspot/test/runtime/modules/ModuleHelper.java b/test/hotspot/jtreg/runtime/modules/ModuleHelper.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleHelper.java rename to test/hotspot/jtreg/runtime/modules/ModuleHelper.java diff --git a/hotspot/test/runtime/modules/ModuleOptionsTest.java b/test/hotspot/jtreg/runtime/modules/ModuleOptionsTest.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleOptionsTest.java rename to test/hotspot/jtreg/runtime/modules/ModuleOptionsTest.java diff --git a/hotspot/test/runtime/modules/ModuleOptionsWarn.java b/test/hotspot/jtreg/runtime/modules/ModuleOptionsWarn.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleOptionsWarn.java rename to test/hotspot/jtreg/runtime/modules/ModuleOptionsWarn.java diff --git a/hotspot/test/runtime/modules/ModuleStress/CustomSystemClassLoader.java b/test/hotspot/jtreg/runtime/modules/ModuleStress/CustomSystemClassLoader.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleStress/CustomSystemClassLoader.java rename to test/hotspot/jtreg/runtime/modules/ModuleStress/CustomSystemClassLoader.java diff --git a/hotspot/test/runtime/modules/ModuleStress/ExportModuleStressTest.java b/test/hotspot/jtreg/runtime/modules/ModuleStress/ExportModuleStressTest.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleStress/ExportModuleStressTest.java rename to test/hotspot/jtreg/runtime/modules/ModuleStress/ExportModuleStressTest.java diff --git a/hotspot/test/runtime/modules/ModuleStress/ModuleNonBuiltinCLMain.java b/test/hotspot/jtreg/runtime/modules/ModuleStress/ModuleNonBuiltinCLMain.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleStress/ModuleNonBuiltinCLMain.java rename to test/hotspot/jtreg/runtime/modules/ModuleStress/ModuleNonBuiltinCLMain.java diff --git a/hotspot/test/runtime/modules/ModuleStress/ModuleSameCLMain.java b/test/hotspot/jtreg/runtime/modules/ModuleStress/ModuleSameCLMain.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleStress/ModuleSameCLMain.java rename to test/hotspot/jtreg/runtime/modules/ModuleStress/ModuleSameCLMain.java diff --git a/hotspot/test/runtime/modules/ModuleStress/ModuleStress.java b/test/hotspot/jtreg/runtime/modules/ModuleStress/ModuleStress.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleStress/ModuleStress.java rename to test/hotspot/jtreg/runtime/modules/ModuleStress/ModuleStress.java diff --git a/hotspot/test/runtime/modules/ModuleStress/ModuleStressGC.java b/test/hotspot/jtreg/runtime/modules/ModuleStress/ModuleStressGC.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleStress/ModuleStressGC.java rename to test/hotspot/jtreg/runtime/modules/ModuleStress/ModuleStressGC.java diff --git a/hotspot/test/runtime/modules/ModuleStress/src/jdk.test/module-info.java b/test/hotspot/jtreg/runtime/modules/ModuleStress/src/jdk.test/module-info.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleStress/src/jdk.test/module-info.java rename to test/hotspot/jtreg/runtime/modules/ModuleStress/src/jdk.test/module-info.java diff --git a/hotspot/test/runtime/modules/ModuleStress/src/jdk.test/test/Main.java b/test/hotspot/jtreg/runtime/modules/ModuleStress/src/jdk.test/test/Main.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleStress/src/jdk.test/test/Main.java rename to test/hotspot/jtreg/runtime/modules/ModuleStress/src/jdk.test/test/Main.java diff --git a/hotspot/test/runtime/modules/ModuleStress/src/jdk.test/test/MainGC.java b/test/hotspot/jtreg/runtime/modules/ModuleStress/src/jdk.test/test/MainGC.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleStress/src/jdk.test/test/MainGC.java rename to test/hotspot/jtreg/runtime/modules/ModuleStress/src/jdk.test/test/MainGC.java diff --git a/hotspot/test/runtime/modules/ModuleStress/src/jdk.translet/module-info.java b/test/hotspot/jtreg/runtime/modules/ModuleStress/src/jdk.translet/module-info.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleStress/src/jdk.translet/module-info.java rename to test/hotspot/jtreg/runtime/modules/ModuleStress/src/jdk.translet/module-info.java diff --git a/hotspot/test/runtime/modules/ModuleStress/src/jdk.translet/translet/Main.java b/test/hotspot/jtreg/runtime/modules/ModuleStress/src/jdk.translet/translet/Main.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleStress/src/jdk.translet/translet/Main.java rename to test/hotspot/jtreg/runtime/modules/ModuleStress/src/jdk.translet/translet/Main.java diff --git a/hotspot/test/runtime/modules/ModuleStress/src/jdk.translet/translet/MainGC.java b/test/hotspot/jtreg/runtime/modules/ModuleStress/src/jdk.translet/translet/MainGC.java similarity index 100% rename from hotspot/test/runtime/modules/ModuleStress/src/jdk.translet/translet/MainGC.java rename to test/hotspot/jtreg/runtime/modules/ModuleStress/src/jdk.translet/translet/MainGC.java diff --git a/hotspot/test/runtime/modules/PatchModule/BasicJarBuilder.java b/test/hotspot/jtreg/runtime/modules/PatchModule/BasicJarBuilder.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/BasicJarBuilder.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/BasicJarBuilder.java diff --git a/hotspot/test/runtime/modules/PatchModule/PatchModule2Dirs.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModule2Dirs.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/PatchModule2Dirs.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/PatchModule2Dirs.java diff --git a/hotspot/test/runtime/modules/PatchModule/PatchModule2DirsMain.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModule2DirsMain.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/PatchModule2DirsMain.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/PatchModule2DirsMain.java diff --git a/hotspot/test/runtime/modules/PatchModule/PatchModuleCDS.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleCDS.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/PatchModuleCDS.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleCDS.java diff --git a/hotspot/test/runtime/modules/PatchModule/PatchModuleClassList.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleClassList.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/PatchModuleClassList.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleClassList.java diff --git a/hotspot/test/runtime/modules/PatchModule/PatchModuleDupJavaBase.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleDupJavaBase.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/PatchModuleDupJavaBase.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleDupJavaBase.java diff --git a/hotspot/test/runtime/modules/PatchModule/PatchModuleDupModule.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleDupModule.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/PatchModuleDupModule.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleDupModule.java diff --git a/hotspot/test/runtime/modules/PatchModule/PatchModuleJavaBase.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleJavaBase.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/PatchModuleJavaBase.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleJavaBase.java diff --git a/hotspot/test/runtime/modules/PatchModule/PatchModuleMain.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleMain.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/PatchModuleMain.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleMain.java diff --git a/hotspot/test/runtime/modules/PatchModule/PatchModuleTest.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTest.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/PatchModuleTest.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTest.java diff --git a/hotspot/test/runtime/modules/PatchModule/PatchModuleTestJar.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTestJar.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/PatchModuleTestJar.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTestJar.java diff --git a/hotspot/test/runtime/modules/PatchModule/PatchModuleTestJarDir.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTestJarDir.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/PatchModuleTestJarDir.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTestJarDir.java diff --git a/hotspot/test/runtime/modules/PatchModule/PatchModuleTraceCL.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTraceCL.java similarity index 100% rename from hotspot/test/runtime/modules/PatchModule/PatchModuleTraceCL.java rename to test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTraceCL.java diff --git a/hotspot/test/runtime/modules/Visibility/PatchModuleVisibility.java b/test/hotspot/jtreg/runtime/modules/Visibility/PatchModuleVisibility.java similarity index 100% rename from hotspot/test/runtime/modules/Visibility/PatchModuleVisibility.java rename to test/hotspot/jtreg/runtime/modules/Visibility/PatchModuleVisibility.java diff --git a/hotspot/test/runtime/modules/Visibility/XbootcpNoVisibility.java b/test/hotspot/jtreg/runtime/modules/Visibility/XbootcpNoVisibility.java similarity index 100% rename from hotspot/test/runtime/modules/Visibility/XbootcpNoVisibility.java rename to test/hotspot/jtreg/runtime/modules/Visibility/XbootcpNoVisibility.java diff --git a/hotspot/test/runtime/modules/Visibility/XbootcpVisibility.java b/test/hotspot/jtreg/runtime/modules/Visibility/XbootcpVisibility.java similarity index 100% rename from hotspot/test/runtime/modules/Visibility/XbootcpVisibility.java rename to test/hotspot/jtreg/runtime/modules/Visibility/XbootcpVisibility.java diff --git a/hotspot/test/runtime/modules/acc_module.jcod b/test/hotspot/jtreg/runtime/modules/acc_module.jcod similarity index 100% rename from hotspot/test/runtime/modules/acc_module.jcod rename to test/hotspot/jtreg/runtime/modules/acc_module.jcod diff --git a/hotspot/test/runtime/modules/getModuleJNI/GetModule.java b/test/hotspot/jtreg/runtime/modules/getModuleJNI/GetModule.java similarity index 100% rename from hotspot/test/runtime/modules/getModuleJNI/GetModule.java rename to test/hotspot/jtreg/runtime/modules/getModuleJNI/GetModule.java diff --git a/hotspot/test/runtime/modules/getModuleJNI/libGetModule.c b/test/hotspot/jtreg/runtime/modules/getModuleJNI/libGetModule.c similarity index 100% rename from hotspot/test/runtime/modules/getModuleJNI/libGetModule.c rename to test/hotspot/jtreg/runtime/modules/getModuleJNI/libGetModule.c diff --git a/hotspot/test/runtime/modules/java.base/java/lang/ModuleHelper.java b/test/hotspot/jtreg/runtime/modules/java.base/java/lang/ModuleHelper.java similarity index 100% rename from hotspot/test/runtime/modules/java.base/java/lang/ModuleHelper.java rename to test/hotspot/jtreg/runtime/modules/java.base/java/lang/ModuleHelper.java diff --git a/hotspot/test/runtime/modules/p1/c1.java b/test/hotspot/jtreg/runtime/modules/p1/c1.java similarity index 100% rename from hotspot/test/runtime/modules/p1/c1.java rename to test/hotspot/jtreg/runtime/modules/p1/c1.java diff --git a/hotspot/test/runtime/modules/p2/c2.java b/test/hotspot/jtreg/runtime/modules/p2/c2.java similarity index 100% rename from hotspot/test/runtime/modules/p2/c2.java rename to test/hotspot/jtreg/runtime/modules/p2/c2.java diff --git a/hotspot/test/runtime/modules/p3/c3.java b/test/hotspot/jtreg/runtime/modules/p3/c3.java similarity index 100% rename from hotspot/test/runtime/modules/p3/c3.java rename to test/hotspot/jtreg/runtime/modules/p3/c3.java diff --git a/hotspot/test/runtime/modules/p4/c4.java b/test/hotspot/jtreg/runtime/modules/p4/c4.java similarity index 100% rename from hotspot/test/runtime/modules/p4/c4.java rename to test/hotspot/jtreg/runtime/modules/p4/c4.java diff --git a/hotspot/test/runtime/noClassDefFoundMsg/NoClassDefFoundMsg.java b/test/hotspot/jtreg/runtime/noClassDefFoundMsg/NoClassDefFoundMsg.java similarity index 100% rename from hotspot/test/runtime/noClassDefFoundMsg/NoClassDefFoundMsg.java rename to test/hotspot/jtreg/runtime/noClassDefFoundMsg/NoClassDefFoundMsg.java diff --git a/hotspot/test/runtime/noClassDefFoundMsg/libNoClassDefFoundMsg.c b/test/hotspot/jtreg/runtime/noClassDefFoundMsg/libNoClassDefFoundMsg.c similarity index 100% rename from hotspot/test/runtime/noClassDefFoundMsg/libNoClassDefFoundMsg.c rename to test/hotspot/jtreg/runtime/noClassDefFoundMsg/libNoClassDefFoundMsg.c diff --git a/hotspot/test/runtime/os/AvailableProcessors.java b/test/hotspot/jtreg/runtime/os/AvailableProcessors.java similarity index 100% rename from hotspot/test/runtime/os/AvailableProcessors.java rename to test/hotspot/jtreg/runtime/os/AvailableProcessors.java diff --git a/hotspot/test/runtime/reflect/ArrayGetIntException.java b/test/hotspot/jtreg/runtime/reflect/ArrayGetIntException.java similarity index 100% rename from hotspot/test/runtime/reflect/ArrayGetIntException.java rename to test/hotspot/jtreg/runtime/reflect/ArrayGetIntException.java diff --git a/hotspot/test/runtime/stackMapCheck/BadMap.jasm b/test/hotspot/jtreg/runtime/stackMapCheck/BadMap.jasm similarity index 100% rename from hotspot/test/runtime/stackMapCheck/BadMap.jasm rename to test/hotspot/jtreg/runtime/stackMapCheck/BadMap.jasm diff --git a/hotspot/test/runtime/stackMapCheck/BadMapDstore.jasm b/test/hotspot/jtreg/runtime/stackMapCheck/BadMapDstore.jasm similarity index 100% rename from hotspot/test/runtime/stackMapCheck/BadMapDstore.jasm rename to test/hotspot/jtreg/runtime/stackMapCheck/BadMapDstore.jasm diff --git a/hotspot/test/runtime/stackMapCheck/BadMapIstore.jasm b/test/hotspot/jtreg/runtime/stackMapCheck/BadMapIstore.jasm similarity index 100% rename from hotspot/test/runtime/stackMapCheck/BadMapIstore.jasm rename to test/hotspot/jtreg/runtime/stackMapCheck/BadMapIstore.jasm diff --git a/hotspot/test/runtime/stackMapCheck/StackMapCheck.java b/test/hotspot/jtreg/runtime/stackMapCheck/StackMapCheck.java similarity index 100% rename from hotspot/test/runtime/stackMapCheck/StackMapCheck.java rename to test/hotspot/jtreg/runtime/stackMapCheck/StackMapCheck.java diff --git a/hotspot/test/runtime/testlibrary/ClassUnloadCommon.java b/test/hotspot/jtreg/runtime/testlibrary/ClassUnloadCommon.java similarity index 100% rename from hotspot/test/runtime/testlibrary/ClassUnloadCommon.java rename to test/hotspot/jtreg/runtime/testlibrary/ClassUnloadCommon.java diff --git a/hotspot/test/runtime/testlibrary/GeneratedClassLoader.java b/test/hotspot/jtreg/runtime/testlibrary/GeneratedClassLoader.java similarity index 100% rename from hotspot/test/runtime/testlibrary/GeneratedClassLoader.java rename to test/hotspot/jtreg/runtime/testlibrary/GeneratedClassLoader.java diff --git a/hotspot/test/runtime/verifier/OverriderMsg.java b/test/hotspot/jtreg/runtime/verifier/OverriderMsg.java similarity index 100% rename from hotspot/test/runtime/verifier/OverriderMsg.java rename to test/hotspot/jtreg/runtime/verifier/OverriderMsg.java diff --git a/hotspot/test/runtime/verifier/PrimIntArray.java b/test/hotspot/jtreg/runtime/verifier/PrimIntArray.java similarity index 100% rename from hotspot/test/runtime/verifier/PrimIntArray.java rename to test/hotspot/jtreg/runtime/verifier/PrimIntArray.java diff --git a/hotspot/test/runtime/verifier/TestANewArray.java b/test/hotspot/jtreg/runtime/verifier/TestANewArray.java similarity index 100% rename from hotspot/test/runtime/verifier/TestANewArray.java rename to test/hotspot/jtreg/runtime/verifier/TestANewArray.java diff --git a/hotspot/test/runtime/verifier/TestMultiANewArray.java b/test/hotspot/jtreg/runtime/verifier/TestMultiANewArray.java similarity index 100% rename from hotspot/test/runtime/verifier/TestMultiANewArray.java rename to test/hotspot/jtreg/runtime/verifier/TestMultiANewArray.java diff --git a/hotspot/test/runtime/verifier/TraceClassRes.java b/test/hotspot/jtreg/runtime/verifier/TraceClassRes.java similarity index 100% rename from hotspot/test/runtime/verifier/TraceClassRes.java rename to test/hotspot/jtreg/runtime/verifier/TraceClassRes.java diff --git a/hotspot/test/runtime/verifier/popTopTests/PopDupTop.java b/test/hotspot/jtreg/runtime/verifier/popTopTests/PopDupTop.java similarity index 100% rename from hotspot/test/runtime/verifier/popTopTests/PopDupTop.java rename to test/hotspot/jtreg/runtime/verifier/popTopTests/PopDupTop.java diff --git a/hotspot/test/runtime/verifier/popTopTests/popDupSwapTests.jasm b/test/hotspot/jtreg/runtime/verifier/popTopTests/popDupSwapTests.jasm similarity index 100% rename from hotspot/test/runtime/verifier/popTopTests/popDupSwapTests.jasm rename to test/hotspot/jtreg/runtime/verifier/popTopTests/popDupSwapTests.jasm diff --git a/hotspot/test/runtime/verifier/primArray.jasm b/test/hotspot/jtreg/runtime/verifier/primArray.jasm similarity index 100% rename from hotspot/test/runtime/verifier/primArray.jasm rename to test/hotspot/jtreg/runtime/verifier/primArray.jasm diff --git a/hotspot/test/runtime/verifier/primArray49.jasm b/test/hotspot/jtreg/runtime/verifier/primArray49.jasm similarity index 100% rename from hotspot/test/runtime/verifier/primArray49.jasm rename to test/hotspot/jtreg/runtime/verifier/primArray49.jasm diff --git a/hotspot/test/runtime/whitebox/WBStackSize.java b/test/hotspot/jtreg/runtime/whitebox/WBStackSize.java similarity index 100% rename from hotspot/test/runtime/whitebox/WBStackSize.java rename to test/hotspot/jtreg/runtime/whitebox/WBStackSize.java diff --git a/hotspot/test/sanity/BasicVMTest.java b/test/hotspot/jtreg/sanity/BasicVMTest.java similarity index 100% rename from hotspot/test/sanity/BasicVMTest.java rename to test/hotspot/jtreg/sanity/BasicVMTest.java diff --git a/hotspot/test/sanity/ExecuteInternalVMTests.java b/test/hotspot/jtreg/sanity/ExecuteInternalVMTests.java similarity index 100% rename from hotspot/test/sanity/ExecuteInternalVMTests.java rename to test/hotspot/jtreg/sanity/ExecuteInternalVMTests.java diff --git a/hotspot/test/sanity/MismatchedWhiteBox/WhiteBox.java b/test/hotspot/jtreg/sanity/MismatchedWhiteBox/WhiteBox.java similarity index 100% rename from hotspot/test/sanity/MismatchedWhiteBox/WhiteBox.java rename to test/hotspot/jtreg/sanity/MismatchedWhiteBox/WhiteBox.java diff --git a/hotspot/test/sanity/WBApi.java b/test/hotspot/jtreg/sanity/WBApi.java similarity index 100% rename from hotspot/test/sanity/WBApi.java rename to test/hotspot/jtreg/sanity/WBApi.java diff --git a/hotspot/test/serviceability/7170638/SDTProbesGNULinuxTest.sh b/test/hotspot/jtreg/serviceability/7170638/SDTProbesGNULinuxTest.sh similarity index 100% rename from hotspot/test/serviceability/7170638/SDTProbesGNULinuxTest.sh rename to test/hotspot/jtreg/serviceability/7170638/SDTProbesGNULinuxTest.sh diff --git a/hotspot/test/serviceability/ParserTest.java b/test/hotspot/jtreg/serviceability/ParserTest.java similarity index 100% rename from hotspot/test/serviceability/ParserTest.java rename to test/hotspot/jtreg/serviceability/ParserTest.java diff --git a/hotspot/test/serviceability/attach/AttachSetGetFlag.java b/test/hotspot/jtreg/serviceability/attach/AttachSetGetFlag.java similarity index 100% rename from hotspot/test/serviceability/attach/AttachSetGetFlag.java rename to test/hotspot/jtreg/serviceability/attach/AttachSetGetFlag.java diff --git a/hotspot/test/serviceability/attach/AttachWithStalePidFile.java b/test/hotspot/jtreg/serviceability/attach/AttachWithStalePidFile.java similarity index 100% rename from hotspot/test/serviceability/attach/AttachWithStalePidFile.java rename to test/hotspot/jtreg/serviceability/attach/AttachWithStalePidFile.java diff --git a/hotspot/test/serviceability/attach/AttachWithStalePidFileTarget.java b/test/hotspot/jtreg/serviceability/attach/AttachWithStalePidFileTarget.java similarity index 100% rename from hotspot/test/serviceability/attach/AttachWithStalePidFileTarget.java rename to test/hotspot/jtreg/serviceability/attach/AttachWithStalePidFileTarget.java diff --git a/hotspot/test/serviceability/dcmd/compiler/CodeCacheTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeCacheTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/compiler/CodeCacheTest.java rename to test/hotspot/jtreg/serviceability/dcmd/compiler/CodeCacheTest.java diff --git a/hotspot/test/serviceability/dcmd/compiler/CodelistTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CodelistTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/compiler/CodelistTest.java rename to test/hotspot/jtreg/serviceability/dcmd/compiler/CodelistTest.java diff --git a/hotspot/test/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java rename to test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java diff --git a/hotspot/test/serviceability/dcmd/compiler/CompilerQueueTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerQueueTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/compiler/CompilerQueueTest.java rename to test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerQueueTest.java diff --git a/hotspot/test/serviceability/dcmd/compiler/MethodIdentifierParser.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/MethodIdentifierParser.java similarity index 100% rename from hotspot/test/serviceability/dcmd/compiler/MethodIdentifierParser.java rename to test/hotspot/jtreg/serviceability/dcmd/compiler/MethodIdentifierParser.java diff --git a/hotspot/test/serviceability/dcmd/compiler/control1.txt b/test/hotspot/jtreg/serviceability/dcmd/compiler/control1.txt similarity index 100% rename from hotspot/test/serviceability/dcmd/compiler/control1.txt rename to test/hotspot/jtreg/serviceability/dcmd/compiler/control1.txt diff --git a/hotspot/test/serviceability/dcmd/compiler/control2.txt b/test/hotspot/jtreg/serviceability/dcmd/compiler/control2.txt similarity index 100% rename from hotspot/test/serviceability/dcmd/compiler/control2.txt rename to test/hotspot/jtreg/serviceability/dcmd/compiler/control2.txt diff --git a/hotspot/test/serviceability/dcmd/framework/HelpTest.java b/test/hotspot/jtreg/serviceability/dcmd/framework/HelpTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/framework/HelpTest.java rename to test/hotspot/jtreg/serviceability/dcmd/framework/HelpTest.java diff --git a/hotspot/test/serviceability/dcmd/framework/InvalidCommandTest.java b/test/hotspot/jtreg/serviceability/dcmd/framework/InvalidCommandTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/framework/InvalidCommandTest.java rename to test/hotspot/jtreg/serviceability/dcmd/framework/InvalidCommandTest.java diff --git a/hotspot/test/serviceability/dcmd/framework/VMVersionTest.java b/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/framework/VMVersionTest.java rename to test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java diff --git a/hotspot/test/serviceability/dcmd/gc/ClassHistogramAllTest.java b/test/hotspot/jtreg/serviceability/dcmd/gc/ClassHistogramAllTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/gc/ClassHistogramAllTest.java rename to test/hotspot/jtreg/serviceability/dcmd/gc/ClassHistogramAllTest.java diff --git a/hotspot/test/serviceability/dcmd/gc/ClassHistogramTest.java b/test/hotspot/jtreg/serviceability/dcmd/gc/ClassHistogramTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/gc/ClassHistogramTest.java rename to test/hotspot/jtreg/serviceability/dcmd/gc/ClassHistogramTest.java diff --git a/hotspot/test/serviceability/dcmd/gc/FinalizationRunner.java b/test/hotspot/jtreg/serviceability/dcmd/gc/FinalizationRunner.java similarity index 100% rename from hotspot/test/serviceability/dcmd/gc/FinalizationRunner.java rename to test/hotspot/jtreg/serviceability/dcmd/gc/FinalizationRunner.java diff --git a/hotspot/test/serviceability/dcmd/gc/FinalizerInfoTest.java b/test/hotspot/jtreg/serviceability/dcmd/gc/FinalizerInfoTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/gc/FinalizerInfoTest.java rename to test/hotspot/jtreg/serviceability/dcmd/gc/FinalizerInfoTest.java diff --git a/hotspot/test/serviceability/dcmd/gc/HeapDumpAllTest.java b/test/hotspot/jtreg/serviceability/dcmd/gc/HeapDumpAllTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/gc/HeapDumpAllTest.java rename to test/hotspot/jtreg/serviceability/dcmd/gc/HeapDumpAllTest.java diff --git a/hotspot/test/serviceability/dcmd/gc/HeapDumpTest.java b/test/hotspot/jtreg/serviceability/dcmd/gc/HeapDumpTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/gc/HeapDumpTest.java rename to test/hotspot/jtreg/serviceability/dcmd/gc/HeapDumpTest.java diff --git a/hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java b/test/hotspot/jtreg/serviceability/dcmd/gc/HeapInfoTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java rename to test/hotspot/jtreg/serviceability/dcmd/gc/HeapInfoTest.java diff --git a/hotspot/test/serviceability/dcmd/gc/RunFinalizationTest.java b/test/hotspot/jtreg/serviceability/dcmd/gc/RunFinalizationTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/gc/RunFinalizationTest.java rename to test/hotspot/jtreg/serviceability/dcmd/gc/RunFinalizationTest.java diff --git a/hotspot/test/serviceability/dcmd/gc/RunGCTest.java b/test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/gc/RunGCTest.java rename to test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java diff --git a/hotspot/test/serviceability/dcmd/jvmti/DataDumpDcmdTest.java b/test/hotspot/jtreg/serviceability/dcmd/jvmti/DataDumpDcmdTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/jvmti/DataDumpDcmdTest.java rename to test/hotspot/jtreg/serviceability/dcmd/jvmti/DataDumpDcmdTest.java diff --git a/hotspot/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java b/test/hotspot/jtreg/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java rename to test/hotspot/jtreg/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java diff --git a/hotspot/test/serviceability/dcmd/jvmti/SimpleJvmtiAgent.java b/test/hotspot/jtreg/serviceability/dcmd/jvmti/SimpleJvmtiAgent.java similarity index 100% rename from hotspot/test/serviceability/dcmd/jvmti/SimpleJvmtiAgent.java rename to test/hotspot/jtreg/serviceability/dcmd/jvmti/SimpleJvmtiAgent.java diff --git a/hotspot/test/serviceability/dcmd/thread/PrintConcurrentLocksTest.java b/test/hotspot/jtreg/serviceability/dcmd/thread/PrintConcurrentLocksTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/thread/PrintConcurrentLocksTest.java rename to test/hotspot/jtreg/serviceability/dcmd/thread/PrintConcurrentLocksTest.java diff --git a/hotspot/test/serviceability/dcmd/thread/PrintTest.java b/test/hotspot/jtreg/serviceability/dcmd/thread/PrintTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/thread/PrintTest.java rename to test/hotspot/jtreg/serviceability/dcmd/thread/PrintTest.java diff --git a/hotspot/test/serviceability/dcmd/vm/ClassHierarchyTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/ClassHierarchyTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/vm/ClassHierarchyTest.java rename to test/hotspot/jtreg/serviceability/dcmd/vm/ClassHierarchyTest.java diff --git a/hotspot/test/serviceability/dcmd/vm/ClassLoaderStatsTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderStatsTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/vm/ClassLoaderStatsTest.java rename to test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderStatsTest.java diff --git a/hotspot/test/serviceability/dcmd/vm/CommandLineTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/CommandLineTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/vm/CommandLineTest.java rename to test/hotspot/jtreg/serviceability/dcmd/vm/CommandLineTest.java diff --git a/hotspot/test/serviceability/dcmd/vm/DynLibsTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/DynLibsTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/vm/DynLibsTest.java rename to test/hotspot/jtreg/serviceability/dcmd/vm/DynLibsTest.java diff --git a/hotspot/test/serviceability/dcmd/vm/FlagsTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/FlagsTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/vm/FlagsTest.java rename to test/hotspot/jtreg/serviceability/dcmd/vm/FlagsTest.java diff --git a/hotspot/test/serviceability/dcmd/vm/SetVMFlagTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/SetVMFlagTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/vm/SetVMFlagTest.java rename to test/hotspot/jtreg/serviceability/dcmd/vm/SetVMFlagTest.java diff --git a/hotspot/test/serviceability/dcmd/vm/SystemPropertiesTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemPropertiesTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/vm/SystemPropertiesTest.java rename to test/hotspot/jtreg/serviceability/dcmd/vm/SystemPropertiesTest.java diff --git a/hotspot/test/serviceability/dcmd/vm/UptimeTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/UptimeTest.java similarity index 100% rename from hotspot/test/serviceability/dcmd/vm/UptimeTest.java rename to test/hotspot/jtreg/serviceability/dcmd/vm/UptimeTest.java diff --git a/hotspot/test/serviceability/jdwp/AllModulesCommandTest.java b/test/hotspot/jtreg/serviceability/jdwp/AllModulesCommandTest.java similarity index 100% rename from hotspot/test/serviceability/jdwp/AllModulesCommandTest.java rename to test/hotspot/jtreg/serviceability/jdwp/AllModulesCommandTest.java diff --git a/hotspot/test/serviceability/jdwp/AllModulesCommandTestDebuggee.java b/test/hotspot/jtreg/serviceability/jdwp/AllModulesCommandTestDebuggee.java similarity index 100% rename from hotspot/test/serviceability/jdwp/AllModulesCommandTestDebuggee.java rename to test/hotspot/jtreg/serviceability/jdwp/AllModulesCommandTestDebuggee.java diff --git a/hotspot/test/serviceability/jdwp/DebuggeeLauncher.java b/test/hotspot/jtreg/serviceability/jdwp/DebuggeeLauncher.java similarity index 100% rename from hotspot/test/serviceability/jdwp/DebuggeeLauncher.java rename to test/hotspot/jtreg/serviceability/jdwp/DebuggeeLauncher.java diff --git a/hotspot/test/serviceability/jdwp/JdwpAllModulesCmd.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpAllModulesCmd.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpAllModulesCmd.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpAllModulesCmd.java diff --git a/hotspot/test/serviceability/jdwp/JdwpAllModulesReply.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpAllModulesReply.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpAllModulesReply.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpAllModulesReply.java diff --git a/hotspot/test/serviceability/jdwp/JdwpChannel.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpChannel.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpChannel.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpChannel.java diff --git a/hotspot/test/serviceability/jdwp/JdwpClassLoaderCmd.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpClassLoaderCmd.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpClassLoaderCmd.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpClassLoaderCmd.java diff --git a/hotspot/test/serviceability/jdwp/JdwpClassLoaderReply.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpClassLoaderReply.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpClassLoaderReply.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpClassLoaderReply.java diff --git a/hotspot/test/serviceability/jdwp/JdwpCmd.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpCmd.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpCmd.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpCmd.java diff --git a/hotspot/test/serviceability/jdwp/JdwpExitCmd.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpExitCmd.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpExitCmd.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpExitCmd.java diff --git a/hotspot/test/serviceability/jdwp/JdwpModNameCmd.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpModNameCmd.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpModNameCmd.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpModNameCmd.java diff --git a/hotspot/test/serviceability/jdwp/JdwpModNameReply.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpModNameReply.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpModNameReply.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpModNameReply.java diff --git a/hotspot/test/serviceability/jdwp/JdwpModuleCmd.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpModuleCmd.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpModuleCmd.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpModuleCmd.java diff --git a/hotspot/test/serviceability/jdwp/JdwpModuleReply.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpModuleReply.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpModuleReply.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpModuleReply.java diff --git a/hotspot/test/serviceability/jdwp/JdwpReply.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpReply.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpReply.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpReply.java diff --git a/hotspot/test/serviceability/jdwp/JdwpVisibleClassesCmd.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpVisibleClassesCmd.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpVisibleClassesCmd.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpVisibleClassesCmd.java diff --git a/hotspot/test/serviceability/jdwp/JdwpVisibleClassesReply.java b/test/hotspot/jtreg/serviceability/jdwp/JdwpVisibleClassesReply.java similarity index 100% rename from hotspot/test/serviceability/jdwp/JdwpVisibleClassesReply.java rename to test/hotspot/jtreg/serviceability/jdwp/JdwpVisibleClassesReply.java diff --git a/hotspot/test/serviceability/jdwp/StreamHandler.java b/test/hotspot/jtreg/serviceability/jdwp/StreamHandler.java similarity index 100% rename from hotspot/test/serviceability/jdwp/StreamHandler.java rename to test/hotspot/jtreg/serviceability/jdwp/StreamHandler.java diff --git a/hotspot/test/serviceability/jvmti/8036666/GetObjectLockCount.java b/test/hotspot/jtreg/serviceability/jvmti/8036666/GetObjectLockCount.java similarity index 100% rename from hotspot/test/serviceability/jvmti/8036666/GetObjectLockCount.java rename to test/hotspot/jtreg/serviceability/jvmti/8036666/GetObjectLockCount.java diff --git a/hotspot/test/serviceability/jvmti/8036666/RecursiveObjectLock.java b/test/hotspot/jtreg/serviceability/jvmti/8036666/RecursiveObjectLock.java similarity index 100% rename from hotspot/test/serviceability/jvmti/8036666/RecursiveObjectLock.java rename to test/hotspot/jtreg/serviceability/jvmti/8036666/RecursiveObjectLock.java diff --git a/hotspot/test/serviceability/jvmti/AddModuleExportsAndOpens/MyPackage/AddModuleExportsAndOpensTest.java b/test/hotspot/jtreg/serviceability/jvmti/AddModuleExportsAndOpens/MyPackage/AddModuleExportsAndOpensTest.java similarity index 100% rename from hotspot/test/serviceability/jvmti/AddModuleExportsAndOpens/MyPackage/AddModuleExportsAndOpensTest.java rename to test/hotspot/jtreg/serviceability/jvmti/AddModuleExportsAndOpens/MyPackage/AddModuleExportsAndOpensTest.java diff --git a/hotspot/test/serviceability/jvmti/AddModuleExportsAndOpens/libAddModuleExportsAndOpensTest.c b/test/hotspot/jtreg/serviceability/jvmti/AddModuleExportsAndOpens/libAddModuleExportsAndOpensTest.c similarity index 100% rename from hotspot/test/serviceability/jvmti/AddModuleExportsAndOpens/libAddModuleExportsAndOpensTest.c rename to test/hotspot/jtreg/serviceability/jvmti/AddModuleExportsAndOpens/libAddModuleExportsAndOpensTest.c diff --git a/hotspot/test/serviceability/jvmti/AddModuleReads/MyPackage/AddModuleReadsTest.java b/test/hotspot/jtreg/serviceability/jvmti/AddModuleReads/MyPackage/AddModuleReadsTest.java similarity index 100% rename from hotspot/test/serviceability/jvmti/AddModuleReads/MyPackage/AddModuleReadsTest.java rename to test/hotspot/jtreg/serviceability/jvmti/AddModuleReads/MyPackage/AddModuleReadsTest.java diff --git a/hotspot/test/serviceability/jvmti/AddModuleReads/libAddModuleReadsTest.c b/test/hotspot/jtreg/serviceability/jvmti/AddModuleReads/libAddModuleReadsTest.c similarity index 100% rename from hotspot/test/serviceability/jvmti/AddModuleReads/libAddModuleReadsTest.c rename to test/hotspot/jtreg/serviceability/jvmti/AddModuleReads/libAddModuleReadsTest.c diff --git a/hotspot/test/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/AddModuleUsesAndProvidesTest.java b/test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/AddModuleUsesAndProvidesTest.java similarity index 100% rename from hotspot/test/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/AddModuleUsesAndProvidesTest.java rename to test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/AddModuleUsesAndProvidesTest.java diff --git a/hotspot/test/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/java.base/java/lang/TestProvider.java b/test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/java.base/java/lang/TestProvider.java similarity index 100% rename from hotspot/test/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/java.base/java/lang/TestProvider.java rename to test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/java.base/java/lang/TestProvider.java diff --git a/hotspot/test/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/java.base/jdk/internal/test/TestProviderImpl.java b/test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/java.base/jdk/internal/test/TestProviderImpl.java similarity index 100% rename from hotspot/test/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/java.base/jdk/internal/test/TestProviderImpl.java rename to test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/java.base/jdk/internal/test/TestProviderImpl.java diff --git a/hotspot/test/serviceability/jvmti/AddModuleUsesAndProvides/libAddModuleUsesAndProvidesTest.c b/test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/libAddModuleUsesAndProvidesTest.c similarity index 100% rename from hotspot/test/serviceability/jvmti/AddModuleUsesAndProvides/libAddModuleUsesAndProvidesTest.c rename to test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/libAddModuleUsesAndProvidesTest.c diff --git a/hotspot/test/serviceability/jvmti/GetModulesInfo/JvmtiGetAllModulesTest.java b/test/hotspot/jtreg/serviceability/jvmti/GetModulesInfo/JvmtiGetAllModulesTest.java similarity index 100% rename from hotspot/test/serviceability/jvmti/GetModulesInfo/JvmtiGetAllModulesTest.java rename to test/hotspot/jtreg/serviceability/jvmti/GetModulesInfo/JvmtiGetAllModulesTest.java diff --git a/hotspot/test/serviceability/jvmti/GetModulesInfo/libJvmtiGetAllModulesTest.c b/test/hotspot/jtreg/serviceability/jvmti/GetModulesInfo/libJvmtiGetAllModulesTest.c similarity index 100% rename from hotspot/test/serviceability/jvmti/GetModulesInfo/libJvmtiGetAllModulesTest.c rename to test/hotspot/jtreg/serviceability/jvmti/GetModulesInfo/libJvmtiGetAllModulesTest.c diff --git a/hotspot/test/serviceability/jvmti/GetNamedModule/MyPackage/GetNamedModuleTest.java b/test/hotspot/jtreg/serviceability/jvmti/GetNamedModule/MyPackage/GetNamedModuleTest.java similarity index 100% rename from hotspot/test/serviceability/jvmti/GetNamedModule/MyPackage/GetNamedModuleTest.java rename to test/hotspot/jtreg/serviceability/jvmti/GetNamedModule/MyPackage/GetNamedModuleTest.java diff --git a/hotspot/test/serviceability/jvmti/GetNamedModule/libGetNamedModuleTest.c b/test/hotspot/jtreg/serviceability/jvmti/GetNamedModule/libGetNamedModuleTest.c similarity index 100% rename from hotspot/test/serviceability/jvmti/GetNamedModule/libGetNamedModuleTest.c rename to test/hotspot/jtreg/serviceability/jvmti/GetNamedModule/libGetNamedModuleTest.c diff --git a/hotspot/test/serviceability/jvmti/GetObjectSizeClass.java b/test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeClass.java similarity index 100% rename from hotspot/test/serviceability/jvmti/GetObjectSizeClass.java rename to test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeClass.java diff --git a/hotspot/test/serviceability/jvmti/GetObjectSizeClassAgent.java b/test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeClassAgent.java similarity index 100% rename from hotspot/test/serviceability/jvmti/GetObjectSizeClassAgent.java rename to test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeClassAgent.java diff --git a/hotspot/test/serviceability/jvmti/GetObjectSizeOverflow.java b/test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeOverflow.java similarity index 100% rename from hotspot/test/serviceability/jvmti/GetObjectSizeOverflow.java rename to test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeOverflow.java diff --git a/hotspot/test/serviceability/jvmti/GetObjectSizeOverflowAgent.java b/test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeOverflowAgent.java similarity index 100% rename from hotspot/test/serviceability/jvmti/GetObjectSizeOverflowAgent.java rename to test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeOverflowAgent.java diff --git a/hotspot/test/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java b/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java similarity index 100% rename from hotspot/test/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java rename to test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java diff --git a/hotspot/test/serviceability/jvmti/GetOwnedMonitorInfo/libGetOwnedMonitorInfoTest.c b/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/libGetOwnedMonitorInfoTest.c similarity index 100% rename from hotspot/test/serviceability/jvmti/GetOwnedMonitorInfo/libGetOwnedMonitorInfoTest.c rename to test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/libGetOwnedMonitorInfoTest.c diff --git a/hotspot/test/serviceability/jvmti/IsModifiableModule/MyPackage/IsModifiableModuleTest.java b/test/hotspot/jtreg/serviceability/jvmti/IsModifiableModule/MyPackage/IsModifiableModuleTest.java similarity index 100% rename from hotspot/test/serviceability/jvmti/IsModifiableModule/MyPackage/IsModifiableModuleTest.java rename to test/hotspot/jtreg/serviceability/jvmti/IsModifiableModule/MyPackage/IsModifiableModuleTest.java diff --git a/hotspot/test/serviceability/jvmti/IsModifiableModule/libIsModifiableModuleTest.c b/test/hotspot/jtreg/serviceability/jvmti/IsModifiableModule/libIsModifiableModuleTest.c similarity index 100% rename from hotspot/test/serviceability/jvmti/IsModifiableModule/libIsModifiableModuleTest.c rename to test/hotspot/jtreg/serviceability/jvmti/IsModifiableModule/libIsModifiableModuleTest.c diff --git a/hotspot/test/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook/MAAClassFileLoadHook.java b/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook/MAAClassFileLoadHook.java similarity index 100% rename from hotspot/test/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook/MAAClassFileLoadHook.java rename to test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook/MAAClassFileLoadHook.java diff --git a/hotspot/test/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook/libMAAClassFileLoadHook.c b/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook/libMAAClassFileLoadHook.c similarity index 100% rename from hotspot/test/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook/libMAAClassFileLoadHook.c rename to test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook/libMAAClassFileLoadHook.c diff --git a/hotspot/test/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare/MAAClassLoadPrepare.java b/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare/MAAClassLoadPrepare.java similarity index 100% rename from hotspot/test/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare/MAAClassLoadPrepare.java rename to test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare/MAAClassLoadPrepare.java diff --git a/hotspot/test/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare/libMAAClassLoadPrepare.c b/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare/libMAAClassLoadPrepare.c similarity index 100% rename from hotspot/test/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare/libMAAClassLoadPrepare.c rename to test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare/libMAAClassLoadPrepare.c diff --git a/hotspot/test/serviceability/jvmti/ModuleAwareAgents/ThreadStart/MAAThreadStart.java b/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ThreadStart/MAAThreadStart.java similarity index 100% rename from hotspot/test/serviceability/jvmti/ModuleAwareAgents/ThreadStart/MAAThreadStart.java rename to test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ThreadStart/MAAThreadStart.java diff --git a/hotspot/test/serviceability/jvmti/ModuleAwareAgents/ThreadStart/libMAAThreadStart.c b/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ThreadStart/libMAAThreadStart.c similarity index 100% rename from hotspot/test/serviceability/jvmti/ModuleAwareAgents/ThreadStart/libMAAThreadStart.c rename to test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ThreadStart/libMAAThreadStart.c diff --git a/hotspot/test/serviceability/jvmti/StartPhase/AllowedFunctions/AllowedFunctions.java b/test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions/AllowedFunctions.java similarity index 100% rename from hotspot/test/serviceability/jvmti/StartPhase/AllowedFunctions/AllowedFunctions.java rename to test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions/AllowedFunctions.java diff --git a/hotspot/test/serviceability/jvmti/StartPhase/AllowedFunctions/libAllowedFunctions.c b/test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions/libAllowedFunctions.c similarity index 100% rename from hotspot/test/serviceability/jvmti/StartPhase/AllowedFunctions/libAllowedFunctions.c rename to test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions/libAllowedFunctions.c diff --git a/hotspot/test/serviceability/jvmti/TestLambdaFormRetransformation.java b/test/hotspot/jtreg/serviceability/jvmti/TestLambdaFormRetransformation.java similarity index 100% rename from hotspot/test/serviceability/jvmti/TestLambdaFormRetransformation.java rename to test/hotspot/jtreg/serviceability/jvmti/TestLambdaFormRetransformation.java diff --git a/hotspot/test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java b/test/hotspot/jtreg/serviceability/jvmti/TestRedefineWithUnresolvedClass.java similarity index 100% rename from hotspot/test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java rename to test/hotspot/jtreg/serviceability/jvmti/TestRedefineWithUnresolvedClass.java diff --git a/hotspot/test/serviceability/jvmti/UnresolvedClassAgent.java b/test/hotspot/jtreg/serviceability/jvmti/UnresolvedClassAgent.java similarity index 100% rename from hotspot/test/serviceability/jvmti/UnresolvedClassAgent.java rename to test/hotspot/jtreg/serviceability/jvmti/UnresolvedClassAgent.java diff --git a/hotspot/test/serviceability/jvmti/UnresolvedClassAgent.mf b/test/hotspot/jtreg/serviceability/jvmti/UnresolvedClassAgent.mf similarity index 100% rename from hotspot/test/serviceability/jvmti/UnresolvedClassAgent.mf rename to test/hotspot/jtreg/serviceability/jvmti/UnresolvedClassAgent.mf diff --git a/hotspot/test/serviceability/logging/TestBasicLogOutput.java b/test/hotspot/jtreg/serviceability/logging/TestBasicLogOutput.java similarity index 100% rename from hotspot/test/serviceability/logging/TestBasicLogOutput.java rename to test/hotspot/jtreg/serviceability/logging/TestBasicLogOutput.java diff --git a/hotspot/test/serviceability/logging/TestDefaultLogOutput.java b/test/hotspot/jtreg/serviceability/logging/TestDefaultLogOutput.java similarity index 100% rename from hotspot/test/serviceability/logging/TestDefaultLogOutput.java rename to test/hotspot/jtreg/serviceability/logging/TestDefaultLogOutput.java diff --git a/hotspot/test/serviceability/logging/TestLogRotation.java b/test/hotspot/jtreg/serviceability/logging/TestLogRotation.java similarity index 100% rename from hotspot/test/serviceability/logging/TestLogRotation.java rename to test/hotspot/jtreg/serviceability/logging/TestLogRotation.java diff --git a/hotspot/test/serviceability/logging/TestMultipleXlogArgs.java b/test/hotspot/jtreg/serviceability/logging/TestMultipleXlogArgs.java similarity index 100% rename from hotspot/test/serviceability/logging/TestMultipleXlogArgs.java rename to test/hotspot/jtreg/serviceability/logging/TestMultipleXlogArgs.java diff --git a/hotspot/test/serviceability/logging/TestQuotedLogOutputs.java b/test/hotspot/jtreg/serviceability/logging/TestQuotedLogOutputs.java similarity index 100% rename from hotspot/test/serviceability/logging/TestQuotedLogOutputs.java rename to test/hotspot/jtreg/serviceability/logging/TestQuotedLogOutputs.java diff --git a/hotspot/test/serviceability/sa/DeadlockDetectionTest.java b/test/hotspot/jtreg/serviceability/sa/DeadlockDetectionTest.java similarity index 100% rename from hotspot/test/serviceability/sa/DeadlockDetectionTest.java rename to test/hotspot/jtreg/serviceability/sa/DeadlockDetectionTest.java diff --git a/hotspot/test/serviceability/sa/JhsdbThreadInfoTest.java b/test/hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java similarity index 100% rename from hotspot/test/serviceability/sa/JhsdbThreadInfoTest.java rename to test/hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java diff --git a/hotspot/test/serviceability/sa/LingeredAppWithDefaultMethods.java b/test/hotspot/jtreg/serviceability/sa/LingeredAppWithDefaultMethods.java similarity index 100% rename from hotspot/test/serviceability/sa/LingeredAppWithDefaultMethods.java rename to test/hotspot/jtreg/serviceability/sa/LingeredAppWithDefaultMethods.java diff --git a/hotspot/test/serviceability/sa/LingeredAppWithInterface.java b/test/hotspot/jtreg/serviceability/sa/LingeredAppWithInterface.java similarity index 100% rename from hotspot/test/serviceability/sa/LingeredAppWithInterface.java rename to test/hotspot/jtreg/serviceability/sa/LingeredAppWithInterface.java diff --git a/hotspot/test/serviceability/sa/LingeredAppWithInvokeDynamic.java b/test/hotspot/jtreg/serviceability/sa/LingeredAppWithInvokeDynamic.java similarity index 100% rename from hotspot/test/serviceability/sa/LingeredAppWithInvokeDynamic.java rename to test/hotspot/jtreg/serviceability/sa/LingeredAppWithInvokeDynamic.java diff --git a/hotspot/test/serviceability/sa/LingeredAppWithLargeArray.java b/test/hotspot/jtreg/serviceability/sa/LingeredAppWithLargeArray.java similarity index 100% rename from hotspot/test/serviceability/sa/LingeredAppWithLargeArray.java rename to test/hotspot/jtreg/serviceability/sa/LingeredAppWithLargeArray.java diff --git a/hotspot/test/serviceability/sa/TestCpoolForInvokeDynamic.java b/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java similarity index 100% rename from hotspot/test/serviceability/sa/TestCpoolForInvokeDynamic.java rename to test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java diff --git a/hotspot/test/serviceability/sa/TestDefaultMethods.java b/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java similarity index 100% rename from hotspot/test/serviceability/sa/TestDefaultMethods.java rename to test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java diff --git a/hotspot/test/serviceability/sa/TestHeapDumpForInvokeDynamic.java b/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java similarity index 100% rename from hotspot/test/serviceability/sa/TestHeapDumpForInvokeDynamic.java rename to test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java diff --git a/hotspot/test/serviceability/sa/TestHeapDumpForLargeArray.java b/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForLargeArray.java similarity index 100% rename from hotspot/test/serviceability/sa/TestHeapDumpForLargeArray.java rename to test/hotspot/jtreg/serviceability/sa/TestHeapDumpForLargeArray.java diff --git a/hotspot/test/serviceability/sa/TestInstanceKlassSize.java b/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java similarity index 100% rename from hotspot/test/serviceability/sa/TestInstanceKlassSize.java rename to test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java diff --git a/hotspot/test/serviceability/sa/TestInstanceKlassSizeForInterface.java b/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java similarity index 100% rename from hotspot/test/serviceability/sa/TestInstanceKlassSizeForInterface.java rename to test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java diff --git a/hotspot/test/serviceability/sa/TestPrintMdo.java b/test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java similarity index 100% rename from hotspot/test/serviceability/sa/TestPrintMdo.java rename to test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java diff --git a/hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapProc.java b/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapProc.java similarity index 100% rename from hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapProc.java rename to test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapProc.java diff --git a/hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java b/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java similarity index 100% rename from hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java rename to test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java diff --git a/hotspot/test/serviceability/sa/sadebugd/SADebugDTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java similarity index 100% rename from hotspot/test/serviceability/sa/sadebugd/SADebugDTest.java rename to test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java diff --git a/hotspot/test/serviceability/threads/TestFalseDeadLock.java b/test/hotspot/jtreg/serviceability/threads/TestFalseDeadLock.java similarity index 100% rename from hotspot/test/serviceability/threads/TestFalseDeadLock.java rename to test/hotspot/jtreg/serviceability/threads/TestFalseDeadLock.java diff --git a/hotspot/test/serviceability/tmtools/jstack/DaemonThreadTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/DaemonThreadTest.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/DaemonThreadTest.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/DaemonThreadTest.java diff --git a/hotspot/test/serviceability/tmtools/jstack/JstackThreadTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/JstackThreadTest.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/JstackThreadTest.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/JstackThreadTest.java diff --git a/hotspot/test/serviceability/tmtools/jstack/JstackTool.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/JstackTool.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/JstackTool.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/JstackTool.java diff --git a/hotspot/test/serviceability/tmtools/jstack/SpreadLockTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/SpreadLockTest.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/SpreadLockTest.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/SpreadLockTest.java diff --git a/hotspot/test/serviceability/tmtools/jstack/ThreadNamesTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/ThreadNamesTest.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/ThreadNamesTest.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/ThreadNamesTest.java diff --git a/hotspot/test/serviceability/tmtools/jstack/TraveledLockTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/TraveledLockTest.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/TraveledLockTest.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/TraveledLockTest.java diff --git a/hotspot/test/serviceability/tmtools/jstack/WaitNotifyThreadTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/WaitNotifyThreadTest.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/WaitNotifyThreadTest.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/WaitNotifyThreadTest.java diff --git a/hotspot/test/serviceability/tmtools/jstack/utils/Consts.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/utils/Consts.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/utils/Consts.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/utils/Consts.java diff --git a/hotspot/test/serviceability/tmtools/jstack/utils/DefaultFormat.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/utils/DefaultFormat.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/utils/DefaultFormat.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/utils/DefaultFormat.java diff --git a/hotspot/test/serviceability/tmtools/jstack/utils/Format.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/utils/Format.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/utils/Format.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/utils/Format.java diff --git a/hotspot/test/serviceability/tmtools/jstack/utils/JStack.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/utils/JStack.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/utils/JStack.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/utils/JStack.java diff --git a/hotspot/test/serviceability/tmtools/jstack/utils/LockInfo.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/utils/LockInfo.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/utils/LockInfo.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/utils/LockInfo.java diff --git a/hotspot/test/serviceability/tmtools/jstack/utils/MethodInfo.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/utils/MethodInfo.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/utils/MethodInfo.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/utils/MethodInfo.java diff --git a/hotspot/test/serviceability/tmtools/jstack/utils/MonitorInfo.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/utils/MonitorInfo.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/utils/MonitorInfo.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/utils/MonitorInfo.java diff --git a/hotspot/test/serviceability/tmtools/jstack/utils/ThreadStack.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/utils/ThreadStack.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/utils/ThreadStack.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/utils/ThreadStack.java diff --git a/hotspot/test/serviceability/tmtools/jstack/utils/Utils.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/utils/Utils.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstack/utils/Utils.java rename to test/hotspot/jtreg/serviceability/tmtools/jstack/utils/Utils.java diff --git a/hotspot/test/serviceability/tmtools/jstat/GarbageProducerTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GarbageProducerTest.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/GarbageProducerTest.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/GarbageProducerTest.java diff --git a/hotspot/test/serviceability/tmtools/jstat/GcCapacityTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCapacityTest.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/GcCapacityTest.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/GcCapacityTest.java diff --git a/hotspot/test/serviceability/tmtools/jstat/GcCauseTest01.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest01.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/GcCauseTest01.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest01.java diff --git a/hotspot/test/serviceability/tmtools/jstat/GcCauseTest02.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest02.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/GcCauseTest02.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest02.java diff --git a/hotspot/test/serviceability/tmtools/jstat/GcCauseTest03.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest03.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/GcCauseTest03.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/GcCauseTest03.java diff --git a/hotspot/test/serviceability/tmtools/jstat/GcNewTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcNewTest.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/GcNewTest.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/GcNewTest.java diff --git a/hotspot/test/serviceability/tmtools/jstat/GcTest01.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcTest01.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/GcTest01.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/GcTest01.java diff --git a/hotspot/test/serviceability/tmtools/jstat/GcTest02.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/GcTest02.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/GcTest02.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/GcTest02.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/ClassLoadUtils.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/ClassLoadUtils.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/ClassLoadUtils.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/ClassLoadUtils.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/GarbageProducer.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/GarbageProducer.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/GarbageProducer.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/GarbageProducer.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/GcProvoker.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/GcProvoker.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/GcProvoker.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/GcProvoker.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/GeneratedClassProducer.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/GeneratedClassProducer.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/GeneratedClassProducer.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/GeneratedClassProducer.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/GeneratingClassLoader.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/GeneratingClassLoader.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/GeneratingClassLoader.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/GeneratingClassLoader.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/JstatGcCapacityResults.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCapacityResults.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/JstatGcCapacityResults.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCapacityResults.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/JstatGcCapacityTool.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCapacityTool.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/JstatGcCapacityTool.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCapacityTool.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/JstatGcCauseResults.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCauseResults.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/JstatGcCauseResults.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCauseResults.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/JstatGcCauseTool.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCauseTool.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/JstatGcCauseTool.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCauseTool.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/JstatGcNewResults.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcNewResults.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/JstatGcNewResults.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcNewResults.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/JstatGcNewTool.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcNewTool.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/JstatGcNewTool.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcNewTool.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/JstatGcResults.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcResults.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/JstatGcResults.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcResults.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/JstatGcTool.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcTool.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/JstatGcTool.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcTool.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/JstatResults.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatResults.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/JstatResults.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatResults.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/Pools.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/Pools.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/Pools.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/Pools.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/StringOfValues.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/StringOfValues.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/StringOfValues.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/StringOfValues.java diff --git a/hotspot/test/serviceability/tmtools/jstat/utils/TemplateClass.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/TemplateClass.java similarity index 100% rename from hotspot/test/serviceability/tmtools/jstat/utils/TemplateClass.java rename to test/hotspot/jtreg/serviceability/tmtools/jstat/utils/TemplateClass.java diff --git a/hotspot/test/serviceability/tmtools/share/common/TmTool.java b/test/hotspot/jtreg/serviceability/tmtools/share/common/TmTool.java similarity index 100% rename from hotspot/test/serviceability/tmtools/share/common/TmTool.java rename to test/hotspot/jtreg/serviceability/tmtools/share/common/TmTool.java diff --git a/hotspot/test/serviceability/tmtools/share/common/ToolResults.java b/test/hotspot/jtreg/serviceability/tmtools/share/common/ToolResults.java similarity index 100% rename from hotspot/test/serviceability/tmtools/share/common/ToolResults.java rename to test/hotspot/jtreg/serviceability/tmtools/share/common/ToolResults.java diff --git a/hotspot/test/serviceability/tmtools/share/common/ToolRunner.java b/test/hotspot/jtreg/serviceability/tmtools/share/common/ToolRunner.java similarity index 100% rename from hotspot/test/serviceability/tmtools/share/common/ToolRunner.java rename to test/hotspot/jtreg/serviceability/tmtools/share/common/ToolRunner.java diff --git a/hotspot/test/test_env.sh b/test/hotspot/jtreg/test_env.sh similarity index 100% rename from hotspot/test/test_env.sh rename to test/hotspot/jtreg/test_env.sh diff --git a/hotspot/test/testlibrary/ctw/Makefile b/test/hotspot/jtreg/testlibrary/ctw/Makefile similarity index 100% rename from hotspot/test/testlibrary/ctw/Makefile rename to test/hotspot/jtreg/testlibrary/ctw/Makefile diff --git a/hotspot/test/testlibrary/ctw/README b/test/hotspot/jtreg/testlibrary/ctw/README similarity index 100% rename from hotspot/test/testlibrary/ctw/README rename to test/hotspot/jtreg/testlibrary/ctw/README diff --git a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathDirEntry.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathDirEntry.java similarity index 100% rename from hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathDirEntry.java rename to test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathDirEntry.java diff --git a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarEntry.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarEntry.java similarity index 100% rename from hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarEntry.java rename to test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarEntry.java diff --git a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarInDirEntry.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarInDirEntry.java similarity index 100% rename from hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarInDirEntry.java rename to test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarInDirEntry.java diff --git a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJimageEntry.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJimageEntry.java similarity index 100% rename from hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJimageEntry.java rename to test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJimageEntry.java diff --git a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassesListInFile.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassesListInFile.java similarity index 100% rename from hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassesListInFile.java rename to test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassesListInFile.java diff --git a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java similarity index 100% rename from hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java rename to test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java diff --git a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java similarity index 100% rename from hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java rename to test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java diff --git a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java similarity index 100% rename from hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java rename to test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java diff --git a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java similarity index 100% rename from hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java rename to test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java diff --git a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java similarity index 100% rename from hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java rename to test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java diff --git a/hotspot/test/testlibrary/jittester/Makefile b/test/hotspot/jtreg/testlibrary/jittester/Makefile similarity index 100% rename from hotspot/test/testlibrary/jittester/Makefile rename to test/hotspot/jtreg/testlibrary/jittester/Makefile diff --git a/hotspot/test/testlibrary/jittester/conf/classes.lst b/test/hotspot/jtreg/testlibrary/jittester/conf/classes.lst similarity index 100% rename from hotspot/test/testlibrary/jittester/conf/classes.lst rename to test/hotspot/jtreg/testlibrary/jittester/conf/classes.lst diff --git a/hotspot/test/testlibrary/jittester/conf/default.properties b/test/hotspot/jtreg/testlibrary/jittester/conf/default.properties similarity index 100% rename from hotspot/test/testlibrary/jittester/conf/default.properties rename to test/hotspot/jtreg/testlibrary/jittester/conf/default.properties diff --git a/hotspot/test/testlibrary/jittester/conf/exclude.methods.lst b/test/hotspot/jtreg/testlibrary/jittester/conf/exclude.methods.lst similarity index 100% rename from hotspot/test/testlibrary/jittester/conf/exclude.methods.lst rename to test/hotspot/jtreg/testlibrary/jittester/conf/exclude.methods.lst diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/AotTestGeneratorsFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/AotTestGeneratorsFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/AotTestGeneratorsFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/AotTestGeneratorsFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Automatic.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Automatic.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Automatic.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Automatic.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/BinaryOperator.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/BinaryOperator.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/BinaryOperator.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/BinaryOperator.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Block.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Block.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Block.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Block.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Break.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Break.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Break.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Break.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/BuiltInType.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/BuiltInType.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/BuiltInType.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/BuiltInType.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/CastOperator.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/CastOperator.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/CastOperator.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/CastOperator.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/CatchBlock.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/CatchBlock.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/CatchBlock.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/CatchBlock.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Continue.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Continue.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Continue.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Continue.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Declaration.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Declaration.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Declaration.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Declaration.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/IRNode.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/IRNode.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/IRNode.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/IRNode.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/If.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/If.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/If.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/If.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Initialization.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Initialization.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Initialization.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Initialization.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/JavaCodeGenerator.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/JavaCodeGenerator.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/JavaCodeGenerator.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/JavaCodeGenerator.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Literal.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Literal.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Literal.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Literal.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/LiteralInitializer.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/LiteralInitializer.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/LiteralInitializer.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/LiteralInitializer.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/LocalVariable.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/LocalVariable.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/LocalVariable.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/LocalVariable.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/NonStaticMemberVariable.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/NonStaticMemberVariable.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/NonStaticMemberVariable.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/NonStaticMemberVariable.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Nothing.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Nothing.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Nothing.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Nothing.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Operator.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Operator.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Operator.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Operator.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/OperatorKind.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/OperatorKind.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/OperatorKind.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/OperatorKind.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/PrintVariables.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/PrintVariables.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/PrintVariables.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/PrintVariables.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionFailedException.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionFailedException.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionFailedException.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionFailedException.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionLimiter.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionLimiter.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionLimiter.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionLimiter.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionParams.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionParams.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionParams.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionParams.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Rule.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Rule.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Rule.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Rule.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Statement.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Statement.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Statement.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Statement.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/StaticMemberVariable.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/StaticMemberVariable.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/StaticMemberVariable.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/StaticMemberVariable.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Switch.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Switch.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Switch.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Switch.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Symbol.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Symbol.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Symbol.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Symbol.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/SymbolTable.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/SymbolTable.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/SymbolTable.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/SymbolTable.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TernaryOperator.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TernaryOperator.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TernaryOperator.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TernaryOperator.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TestGeneratorsFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TestGeneratorsFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TestGeneratorsFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TestGeneratorsFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TestsGenerator.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TestsGenerator.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TestsGenerator.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TestsGenerator.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Throw.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Throw.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Throw.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Throw.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TryCatchBlock.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TryCatchBlock.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TryCatchBlock.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TryCatchBlock.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Type.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Type.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Type.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/Type.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypeList.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TypeList.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypeList.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TypeList.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypesParser.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TypesParser.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypesParser.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/TypesParser.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/UnaryOperator.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/UnaryOperator.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/UnaryOperator.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/UnaryOperator.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableBase.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/VariableBase.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableBase.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/VariableBase.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclaration.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclaration.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclaration.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclaration.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclarationBlock.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclarationBlock.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclarationBlock.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclarationBlock.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableInfo.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/VariableInfo.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableInfo.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/VariableInfo.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableInitialization.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/VariableInitialization.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableInitialization.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/VariableInitialization.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayCreation.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayCreation.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayCreation.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayCreation.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayElement.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayElement.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayElement.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayElement.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayExtraction.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayExtraction.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayExtraction.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayExtraction.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/ClassDefinitionBlock.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/classes/ClassDefinitionBlock.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/ClassDefinitionBlock.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/classes/ClassDefinitionBlock.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Interface.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Interface.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Interface.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Interface.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Klass.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Klass.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Klass.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Klass.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/MainKlass.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/classes/MainKlass.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/MainKlass.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/classes/MainKlass.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArgumentDeclarationFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArgumentDeclarationFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArgumentDeclarationFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArgumentDeclarationFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArithmeticOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArithmeticOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArithmeticOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArithmeticOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayCreationFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayCreationFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayCreationFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayCreationFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayElementFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayElementFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayElementFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayElementFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayExtractionFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayExtractionFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayExtractionFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayExtractionFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorImplFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorImplFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorImplFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorImplFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryArithmeticOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryArithmeticOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryArithmeticOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryArithmeticOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryBitwiseOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryBitwiseOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryBitwiseOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryBitwiseOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryEqualityOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryEqualityOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryEqualityOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryEqualityOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryShiftOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryShiftOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryShiftOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryShiftOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryStringPlusFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryStringPlusFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryStringPlusFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryStringPlusFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseInversionOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseInversionOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseInversionOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseInversionOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BlockFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BlockFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BlockFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BlockFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BreakFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BreakFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BreakFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BreakFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CastOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CastOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CastOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CastOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ClassDefinitionBlockFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ClassDefinitionBlockFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ClassDefinitionBlockFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ClassDefinitionBlockFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundArithmeticAssignmentOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundArithmeticAssignmentOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundArithmeticAssignmentOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundArithmeticAssignmentOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundBitwiseAssignmentOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundBitwiseAssignmentOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundBitwiseAssignmentOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundBitwiseAssignmentOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundShiftAssignmentOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundShiftAssignmentOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundShiftAssignmentOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundShiftAssignmentOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionBlockFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionBlockFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionBlockFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionBlockFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ContinueFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ContinueFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ContinueFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ContinueFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterInitializerFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterInitializerFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterInitializerFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterInitializerFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterManipulatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterManipulatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterManipulatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterManipulatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DeclarationFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DeclarationFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DeclarationFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DeclarationFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DoWhileFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DoWhileFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DoWhileFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DoWhileFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ExpressionFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ExpressionFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ExpressionFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ExpressionFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/Factory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/Factory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/Factory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/Factory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ForFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ForFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ForFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ForFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationBlockFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationBlockFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationBlockFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationBlockFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionBlockFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionBlockFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionBlockFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionBlockFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionBlockFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionBlockFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionBlockFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionBlockFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IRNodeBuilder.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IRNodeBuilder.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IRNodeBuilder.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IRNodeBuilder.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IfFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IfFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IfFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IfFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IncDecOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IncDecOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IncDecOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IncDecOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/InterfaceFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/InterfaceFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/InterfaceFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/InterfaceFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/KlassFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/KlassFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/KlassFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/KlassFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LimitedExpressionFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LimitedExpressionFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LimitedExpressionFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LimitedExpressionFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LiteralFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LiteralFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LiteralFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LiteralFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LocalVariableFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LocalVariableFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LocalVariableFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LocalVariableFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicalInversionOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicalInversionOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicalInversionOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicalInversionOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LoopingConditionFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LoopingConditionFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LoopingConditionFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LoopingConditionFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/MainKlassFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/MainKlassFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/MainKlassFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/MainKlassFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NonStaticMemberVariableFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NonStaticMemberVariableFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NonStaticMemberVariableFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NonStaticMemberVariableFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NothingFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NothingFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NothingFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NothingFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/OperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/OperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/OperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/OperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/PrintVariablesFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/PrintVariablesFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/PrintVariablesFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/PrintVariablesFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ReturnFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ReturnFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ReturnFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ReturnFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SafeFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SafeFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SafeFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SafeFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StatementFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StatementFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StatementFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StatementFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticConstructorDefinitionFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticConstructorDefinitionFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticConstructorDefinitionFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticConstructorDefinitionFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticMemberVariableFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticMemberVariableFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticMemberVariableFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticMemberVariableFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SwitchFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SwitchFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SwitchFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SwitchFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TernaryOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TernaryOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TernaryOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TernaryOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ThrowFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ThrowFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ThrowFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ThrowFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TryCatchBlockFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TryCatchBlockFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TryCatchBlockFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TryCatchBlockFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryPlusMinusOperatorFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryPlusMinusOperatorFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryPlusMinusOperatorFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryPlusMinusOperatorFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationBlockFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationBlockFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationBlockFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationBlockFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableInitializationFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableInitializationFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableInitializationFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableInitializationFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/WhileFactory.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/WhileFactory.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/WhileFactory.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/factories/WhileFactory.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ArgumentDeclaration.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ArgumentDeclaration.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ArgumentDeclaration.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ArgumentDeclaration.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinition.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinition.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinition.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinition.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinitionBlock.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinitionBlock.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinitionBlock.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinitionBlock.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Function.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Function.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Function.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Function.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclaration.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclaration.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclaration.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclaration.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclarationBlock.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclarationBlock.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclarationBlock.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclarationBlock.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinition.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinition.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinition.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinition.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinitionBlock.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinitionBlock.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinitionBlock.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinitionBlock.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionInfo.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionInfo.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionInfo.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionInfo.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinition.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinition.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinition.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinition.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinitionBlock.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinitionBlock.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinitionBlock.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinitionBlock.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Return.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Return.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Return.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Return.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/StaticConstructorDefinition.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/StaticConstructorDefinition.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/StaticConstructorDefinition.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/functions/StaticConstructorDefinition.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/Printer.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/Printer.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/Printer.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/Printer.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/CounterInitializer.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/CounterInitializer.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/CounterInitializer.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/CounterInitializer.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/CounterManipulator.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/CounterManipulator.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/CounterManipulator.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/CounterManipulator.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/DoWhile.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/DoWhile.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/DoWhile.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/DoWhile.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/For.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/For.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/For.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/For.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/Loop.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/Loop.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/Loop.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/Loop.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/LoopingCondition.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/LoopingCondition.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/LoopingCondition.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/LoopingCondition.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/While.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/While.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/While.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/loops/While.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeArray.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeArray.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeArray.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeArray.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeBoolean.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeBoolean.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeBoolean.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeBoolean.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeByte.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeByte.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeByte.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeByte.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeChar.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeChar.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeChar.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeChar.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeDouble.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeDouble.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeDouble.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeDouble.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeFloat.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeFloat.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeFloat.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeFloat.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeInt.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeInt.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeInt.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeInt.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeKlass.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeKlass.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeKlass.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeKlass.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeLong.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeLong.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeLong.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeLong.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeShort.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeShort.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeShort.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeShort.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeVoid.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeVoid.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeVoid.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeVoid.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/OptionResolver.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/utils/OptionResolver.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/OptionResolver.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/utils/OptionResolver.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/PrintingUtils.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/utils/PrintingUtils.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/PrintingUtils.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/utils/PrintingUtils.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/PseudoRandom.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/utils/PseudoRandom.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/PseudoRandom.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/utils/PseudoRandom.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/TypeUtil.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/utils/TypeUtil.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/TypeUtil.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/utils/TypeUtil.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/JavaCodeVisitor.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/JavaCodeVisitor.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/JavaCodeVisitor.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/JavaCodeVisitor.java diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/Visitor.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/Visitor.java similarity index 100% rename from hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/Visitor.java rename to test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/Visitor.java diff --git a/hotspot/test/testlibrary/jvmti/TransformUtil.java b/test/hotspot/jtreg/testlibrary/jvmti/TransformUtil.java similarity index 100% rename from hotspot/test/testlibrary/jvmti/TransformUtil.java rename to test/hotspot/jtreg/testlibrary/jvmti/TransformUtil.java diff --git a/hotspot/test/testlibrary/jvmti/TransformerAgent.java b/test/hotspot/jtreg/testlibrary/jvmti/TransformerAgent.java similarity index 100% rename from hotspot/test/testlibrary/jvmti/TransformerAgent.java rename to test/hotspot/jtreg/testlibrary/jvmti/TransformerAgent.java diff --git a/hotspot/test/testlibrary/jvmti/TransformerAgent.mf b/test/hotspot/jtreg/testlibrary/jvmti/TransformerAgent.mf similarity index 100% rename from hotspot/test/testlibrary/jvmti/TransformerAgent.mf rename to test/hotspot/jtreg/testlibrary/jvmti/TransformerAgent.mf diff --git a/hotspot/test/testlibrary/jvmti/libSimpleClassFileLoadHook.c b/test/hotspot/jtreg/testlibrary/jvmti/libSimpleClassFileLoadHook.c similarity index 100% rename from hotspot/test/testlibrary/jvmti/libSimpleClassFileLoadHook.c rename to test/hotspot/jtreg/testlibrary/jvmti/libSimpleClassFileLoadHook.c diff --git a/hotspot/test/testlibrary_tests/AssertsTest.java b/test/hotspot/jtreg/testlibrary_tests/AssertsTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/AssertsTest.java rename to test/hotspot/jtreg/testlibrary_tests/AssertsTest.java diff --git a/hotspot/test/testlibrary_tests/OutputAnalyzerReportingTest.java b/test/hotspot/jtreg/testlibrary_tests/OutputAnalyzerReportingTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/OutputAnalyzerReportingTest.java rename to test/hotspot/jtreg/testlibrary_tests/OutputAnalyzerReportingTest.java diff --git a/hotspot/test/testlibrary_tests/OutputAnalyzerTest.java b/test/hotspot/jtreg/testlibrary_tests/OutputAnalyzerTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/OutputAnalyzerTest.java rename to test/hotspot/jtreg/testlibrary_tests/OutputAnalyzerTest.java diff --git a/hotspot/test/testlibrary_tests/RandomGeneratorTest.java b/test/hotspot/jtreg/testlibrary_tests/RandomGeneratorTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/RandomGeneratorTest.java rename to test/hotspot/jtreg/testlibrary_tests/RandomGeneratorTest.java diff --git a/hotspot/test/testlibrary_tests/RedefineClassTest.java b/test/hotspot/jtreg/testlibrary_tests/RedefineClassTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/RedefineClassTest.java rename to test/hotspot/jtreg/testlibrary_tests/RedefineClassTest.java diff --git a/hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java b/test/hotspot/jtreg/testlibrary_tests/SimpleClassFileLoadHookTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java rename to test/hotspot/jtreg/testlibrary_tests/SimpleClassFileLoadHookTest.java diff --git a/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java b/test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java similarity index 100% rename from hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java rename to test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java diff --git a/hotspot/test/testlibrary_tests/TestPlatformIsTieredSupported.java b/test/hotspot/jtreg/testlibrary_tests/TestPlatformIsTieredSupported.java similarity index 100% rename from hotspot/test/testlibrary_tests/TestPlatformIsTieredSupported.java rename to test/hotspot/jtreg/testlibrary_tests/TestPlatformIsTieredSupported.java diff --git a/hotspot/test/testlibrary_tests/ctw/Bar.java b/test/hotspot/jtreg/testlibrary_tests/ctw/Bar.java similarity index 100% rename from hotspot/test/testlibrary_tests/ctw/Bar.java rename to test/hotspot/jtreg/testlibrary_tests/ctw/Bar.java diff --git a/hotspot/test/testlibrary_tests/ctw/ClassesDirTest.java b/test/hotspot/jtreg/testlibrary_tests/ctw/ClassesDirTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/ctw/ClassesDirTest.java rename to test/hotspot/jtreg/testlibrary_tests/ctw/ClassesDirTest.java diff --git a/hotspot/test/testlibrary_tests/ctw/ClassesListTest.java b/test/hotspot/jtreg/testlibrary_tests/ctw/ClassesListTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/ctw/ClassesListTest.java rename to test/hotspot/jtreg/testlibrary_tests/ctw/ClassesListTest.java diff --git a/hotspot/test/testlibrary_tests/ctw/CtwTest.java b/test/hotspot/jtreg/testlibrary_tests/ctw/CtwTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/ctw/CtwTest.java rename to test/hotspot/jtreg/testlibrary_tests/ctw/CtwTest.java diff --git a/hotspot/test/testlibrary_tests/ctw/Foo.java b/test/hotspot/jtreg/testlibrary_tests/ctw/Foo.java similarity index 100% rename from hotspot/test/testlibrary_tests/ctw/Foo.java rename to test/hotspot/jtreg/testlibrary_tests/ctw/Foo.java diff --git a/hotspot/test/testlibrary_tests/ctw/JarDirTest.java b/test/hotspot/jtreg/testlibrary_tests/ctw/JarDirTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/ctw/JarDirTest.java rename to test/hotspot/jtreg/testlibrary_tests/ctw/JarDirTest.java diff --git a/hotspot/test/testlibrary_tests/ctw/JarsTest.java b/test/hotspot/jtreg/testlibrary_tests/ctw/JarsTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/ctw/JarsTest.java rename to test/hotspot/jtreg/testlibrary_tests/ctw/JarsTest.java diff --git a/hotspot/test/testlibrary_tests/ctw/classes.lst b/test/hotspot/jtreg/testlibrary_tests/ctw/classes.lst similarity index 100% rename from hotspot/test/testlibrary_tests/ctw/classes.lst rename to test/hotspot/jtreg/testlibrary_tests/ctw/classes.lst diff --git a/hotspot/test/testlibrary_tests/whitebox/BlobSanityTest.java b/test/hotspot/jtreg/testlibrary_tests/whitebox/BlobSanityTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/whitebox/BlobSanityTest.java rename to test/hotspot/jtreg/testlibrary_tests/whitebox/BlobSanityTest.java diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/BooleanTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java rename to test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/BooleanTest.java diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/DoubleTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java rename to test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/DoubleTest.java diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/IntxTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java rename to test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/IntxTest.java diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/SizeTTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java rename to test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/SizeTTest.java diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/StringTest.java b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/StringTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/whitebox/vm_flags/StringTest.java rename to test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/StringTest.java diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/Uint64Test.java similarity index 100% rename from hotspot/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java rename to test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/Uint64Test.java diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/UintxTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java rename to test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/UintxTest.java diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/VmFlagTest.java b/test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/VmFlagTest.java similarity index 100% rename from hotspot/test/testlibrary_tests/whitebox/vm_flags/VmFlagTest.java rename to test/hotspot/jtreg/testlibrary_tests/whitebox/vm_flags/VmFlagTest.java diff --git a/jaxp/test/Makefile b/test/jaxp/Makefile similarity index 100% rename from jaxp/test/Makefile rename to test/jaxp/Makefile diff --git a/jaxp/test/ProblemList.txt b/test/jaxp/ProblemList.txt similarity index 100% rename from jaxp/test/ProblemList.txt rename to test/jaxp/ProblemList.txt diff --git a/jaxp/test/TEST.ROOT b/test/jaxp/TEST.ROOT similarity index 100% rename from jaxp/test/TEST.ROOT rename to test/jaxp/TEST.ROOT diff --git a/jaxp/test/TEST.groups b/test/jaxp/TEST.groups similarity index 100% rename from jaxp/test/TEST.groups rename to test/jaxp/TEST.groups diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/DelegateUriTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/DelegateUriTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/DelegateUriTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/DelegateUriTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/GroupTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/GroupTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/GroupTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/GroupTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/NextCatalogTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/NextCatalogTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/NextCatalogTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/NextCatalogTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/NormalizationTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/NormalizationTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/NormalizationTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/NormalizationTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/PreferTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/PreferTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/PreferTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/PreferTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/PublicTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/PublicTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/PublicTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/PublicTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/RewriteUriTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/RewriteUriTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/RewriteUriTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/RewriteUriTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/SystemTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/SystemTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/SystemTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/SystemTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/UriFamilyTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/UriFamilyTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/UriFamilyTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/UriFamilyTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/UriSuffixTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/UriSuffixTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/UriSuffixTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/UriSuffixTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/UriTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/UriTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/UriTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/UriTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java rename to test/jaxp/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/catalogReferCircle-itself.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/catalogReferCircle-itself.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/catalogReferCircle-itself.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/catalogReferCircle-itself.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/catalogReferCircle-left.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/catalogReferCircle-left.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/catalogReferCircle-left.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/catalogReferCircle-left.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/catalogReferCircle-right.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/catalogReferCircle-right.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/catalogReferCircle-right.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/catalogReferCircle-right.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/deferFeature.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/deferFeature.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/deferFeature.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/deferFeature.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic-alice.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic-alice.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic-alice.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic-alice.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic-bob.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic-bob.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic-bob.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic-bob.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic-carl.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic-carl.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic-carl.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic-carl.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegatePublic.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem-alice.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem-alice.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem-alice.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem-alice.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem-bob.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem-bob.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem-bob.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem-bob.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem-carl.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem-carl.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem-carl.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem-carl.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateSystem.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri-alice.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri-alice.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri-alice.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri-alice.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri-bob.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri-bob.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri-bob.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri-bob.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri-carl.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri-carl.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri-carl.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri-carl.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/delegateUri.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/dummy.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/dummy.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/dummy.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/dummy.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/group.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/group.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/group.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/group.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/loadCatalogFiles.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/loadCatalogFiles.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/loadCatalogFiles.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/loadCatalogFiles.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-left.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-left.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-left.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-left.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-leftAlice.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-leftAlice.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-leftAlice.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-leftAlice.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-leftBob.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-leftBob.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-leftBob.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-leftBob.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-leftCarl.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-leftCarl.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-leftCarl.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-leftCarl.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-right.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-right.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-right.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-right.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-rightAlice.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-rightAlice.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-rightAlice.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-rightAlice.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-rightBob.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-rightBob.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-rightBob.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/nextCatalog-rightBob.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/normalization.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/normalization.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/normalization.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/normalization.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/prefer.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/prefer.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/prefer.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/prefer.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/preferFeature.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/preferFeature.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/preferFeature.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/preferFeature.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/public.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/public.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/public.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/public.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/publicFamily.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/publicFamily.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/publicFamily.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/publicFamily.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/rewriteSystem.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/rewriteSystem.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/rewriteSystem.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/rewriteSystem.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/rewriteUri.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/rewriteUri.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/rewriteUri.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/rewriteUri.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/specifyCatalog-api.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/specifyCatalog-api.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/specifyCatalog-api.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/specifyCatalog-api.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/specifyCatalog-feature.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/specifyCatalog-feature.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/specifyCatalog-feature.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/specifyCatalog-feature.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/specifyCatalog-sysProps.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/specifyCatalog-sysProps.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/specifyCatalog-sysProps.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/specifyCatalog-sysProps.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/system.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/system.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/system.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/system.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/systemFamily.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/systemFamily.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/systemFamily.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/systemFamily.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/systemSuffix.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/systemSuffix.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/systemSuffix.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/systemSuffix.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/uri.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/uri.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/uri.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/uri.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/uriFamily.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/uriFamily.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/uriFamily.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/uriFamily.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/uriSuffix.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/uriSuffix.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/uriSuffix.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/uriSuffix.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/urnUnwrapping.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/urnUnwrapping.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/urnUnwrapping.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/urnUnwrapping.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/validateCatalog-malformed.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/validateCatalog-malformed.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/validateCatalog-malformed.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/validateCatalog-malformed.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/validateCatalog-noNamingSpace.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/validateCatalog-noNamingSpace.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/validateCatalog-noNamingSpace.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/validateCatalog-noNamingSpace.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/validateCatalog-wrongRoot.xml b/test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/validateCatalog-wrongRoot.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/catalog/catalogFiles/validateCatalog-wrongRoot.xml rename to test/jaxp/javax/xml/jaxp/functional/catalog/catalogFiles/validateCatalog-wrongRoot.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory01.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory01.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory01.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory02.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory02.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory02.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory02.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory03.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory03.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory03.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory03.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory04.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory04.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory04.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory04.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory05.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory05.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory05.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory05.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory06.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory06.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory06.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory06.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory07.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory07.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory07.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory07.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory08.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory08.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory08.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderFactory08.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderImpl01.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderImpl01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderImpl01.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderImpl01.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderImpl02.dtd b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderImpl02.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderImpl02.dtd rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderImpl02.dtd diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderImpl02.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderImpl02.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderImpl02.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/DocumentBuilderImpl02.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/correct.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/correct.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/correct.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/correct.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10.xsl b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10.xsl rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10import.xsl b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10import.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10import.xsl rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10import.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10include.xsl b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10include.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10include.xsl rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/dbf10include.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/firstdtd.dtd b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/firstdtd.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/firstdtd.dtd rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/firstdtd.dtd diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/invalid.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/invalid.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/invalid.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/invalid.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/invalidns.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/invalidns.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/invalidns.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/invalidns.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/namespace1.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/namespace1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/namespace1.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/namespace1.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/ns4.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/ns4.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/ns4.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/ns4.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/out/dbfactory02GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/out/dbfactory02GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/out/dbfactory02GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/out/dbfactory02GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/out/dbfnstest01GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/out/dbfnstest01GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/out/dbfnstest01GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/out/dbfnstest01GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/out/dbfnstest02GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/out/dbfnstest02GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/out/dbfnstest02GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/out/dbfnstest02GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/parsertest.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/parsertest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/parsertest.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/parsertest.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/test.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/test.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/test.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/test.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/test.xsd b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/test.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/test.xsd rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/test.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/test1.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/test1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/test1.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/test1.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/valid.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/valid.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/valid.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/valid.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/validns.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/validns.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/validns.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/xmlfiles/validns.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLOutputFactoryNewInstanceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLOutputFactoryNewInstanceTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLOutputFactoryNewInstanceTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLOutputFactoryNewInstanceTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/TransformerFactoryTest.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/TransformerFactoryTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/TransformerFactoryTest.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/TransformerFactoryTest.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/TransformerFactoryTest.xsl b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/TransformerFactoryTest.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/TransformerFactoryTest.xsl rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/TransformerFactoryTest.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/cities.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/cities.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/cities.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/cities.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/cities.xsl b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/cities.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/cities.xsl rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/cities.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/citiesimport.xsl b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/citiesimport.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/citiesimport.xsl rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/citiesimport.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/citiesinclude.xsl b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/citiesinclude.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/citiesinclude.xsl rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/citiesinclude.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/dataentry.xsl b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/dataentry.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/dataentry.xsl rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/dataentry.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/doctest.xsl b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/doctest.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/doctest.xsl rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/doctest.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/invalid.xsl b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/invalid.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/invalid.xsl rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/invalid.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/lexical.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/lexical.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/lexical.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/lexical.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/myFake.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/myFake.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/myFake.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/myFake.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/doctypeGF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/doctypeGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/doctypeGF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/doctypeGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/domresult01GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/domresult01GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/domresult01GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/domresult01GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/lexicalGF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/lexicalGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/lexicalGF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/lexicalGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf001GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf001GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf001GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf001GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf002GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf002GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf002GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf002GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf003GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf003GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf003GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf003GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf005GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf005GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf005GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf005GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf006GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf006GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf006GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf006GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf008GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf008GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf008GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf008GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf009GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf009GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf009GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf009GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf010GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf010GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf010GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf010GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf011GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf011GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf011GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf011GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf012GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf012GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf012GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf012GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf013GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf013GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf013GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf013GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/tfactory01GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/tfactory01GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/tfactory01GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/tfactory01GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/tfactory02GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/tfactory02GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/tfactory02GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/tfactory02GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/transformer02GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/transformer02GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/transformer02GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/transformer02GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/transformer03GF.out b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/transformer03GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/transformer03GF.out rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/transformer03GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/publish2.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/publish2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/publish2.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/publish2.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/temp/cities.xsl b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/temp/cities.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/temp/cities.xsl rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/temp/cities.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/temp/colors.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/temp/colors.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/temp/colors.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/temp/colors.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/test.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/test.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/test.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/test.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xsd b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xsd rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xsd b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xsd rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/test.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/test.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/test.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/test.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/test.xsd b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/test.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/test.xsd rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/test.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/test1.xsd b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/test1.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/test1.xsd rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/test1.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/xmlfiles/widgets.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/xmlfiles/widgets.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/xmlfiles/widgets.xml rename to test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/xmlfiles/widgets.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AbstractCharacterDataTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/AbstractCharacterDataTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AbstractCharacterDataTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/AbstractCharacterDataTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Attr01.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Attr01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Attr01.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Attr01.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Attr2.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Attr2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Attr2.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Attr2.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Attr3.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Attr3.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Attr3.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Attr3.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Comment01.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Comment01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Comment01.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Comment01.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentBuilderImpl02.dtd b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentBuilderImpl02.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentBuilderImpl02.dtd rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentBuilderImpl02.dtd diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentTest01.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentTest01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentTest01.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentTest01.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType01.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType01.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType01.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType03.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType03.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType03.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType03.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType05.dtd b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType05.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType05.dtd rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType05.dtd diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType05.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType05.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType05.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/DocumentType05.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample01.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample01.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample01.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample02.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample02.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample02.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample02.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample03.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample03.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample03.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample03.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample04.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample04.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample04.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ElementSample04.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/NamedNodeMap01.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/NamedNodeMap01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/NamedNodeMap01.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/NamedNodeMap01.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/NamedNodeMap03.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/NamedNodeMap03.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/NamedNodeMap03.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/NamedNodeMap03.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node01.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node01.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node01.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node02.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node02.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node02.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node02.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node04.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node04.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node04.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node04.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node05.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node05.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node05.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Node05.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Notation01.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Notation01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Notation01.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Notation01.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/PITest01.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/PITest01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/PITest01.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/PITest01.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Text01.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Text01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Text01.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/Text01.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ee.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ee.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ee.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/ee.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/entitychild.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/entitychild.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/entitychild.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/entitychild.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/nodelist.xml b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/nodelist.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/nodelist.xml rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/nodelist.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/out/InsertBeforeGF.out b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/out/InsertBeforeGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/out/InsertBeforeGF.out rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/out/InsertBeforeGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/out/ReplaceChild3GF.out b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/out/ReplaceChild3GF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/out/ReplaceChild3GF.out rename to test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/xmlfiles/out/ReplaceChild3GF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/correct.xml b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/correct.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/correct.xml rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/correct.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/correct2.xml b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/correct2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/correct2.xml rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/correct2.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/family.xml b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/family.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/family.xml rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/family.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/familytree.dtd b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/familytree.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/familytree.dtd rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/familytree.dtd diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/firstdtd.dtd b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/firstdtd.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/firstdtd.dtd rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/firstdtd.dtd diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/invalid.xml b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/invalid.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/invalid.xml rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/invalid.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/namespace1.xml b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/namespace1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/namespace1.xml rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/namespace1.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/ns4.xml b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/ns4.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/ns4.xml rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/ns4.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/AttributesGF.out b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/AttributesGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/AttributesGF.out rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/AttributesGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/AttributesNSGF.out b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/AttributesNSGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/AttributesNSGF.out rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/AttributesNSGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/ContentGF.out b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/ContentGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/ContentGF.out rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/ContentGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/DTDHandlerGF.out b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/DTDHandlerGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/DTDHandlerGF.out rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/DTDHandlerGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/DefaultHandlerGF.out b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/DefaultHandlerGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/DefaultHandlerGF.out rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/DefaultHandlerGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/EHFatalGF.out b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/EHFatalGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/EHFatalGF.out rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/EHFatalGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/EntityResolverGF.out b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/EntityResolverGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/EntityResolverGF.out rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/EntityResolverGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableFTGF.out b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableFTGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableFTGF.out rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableFTGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableTFGF.out b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableTFGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableTFGF.out rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableTFGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableTTGF.out b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableTTGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableTTGF.out rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableTTGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/XMLFilterGF.out b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/XMLFilterGF.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/XMLFilterGF.out rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/XMLFilterGF.out diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/parsertest.xml b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/parsertest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/parsertest.xml rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/parsertest.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publish.xml b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publish.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publish.xml rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publish.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publishers.dtd b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publishers.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publishers.dtd rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publishers.dtd diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/valid.xml b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/valid.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/valid.xml rename to test/jaxp/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/valid.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java b/test/jaxp/javax/xml/jaxp/functional/test/astro/AstroTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java rename to test/jaxp/javax/xml/jaxp/functional/test/astro/AstroTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java b/test/jaxp/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java rename to test/jaxp/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java b/test/jaxp/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java rename to test/jaxp/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/SAX201Test.java b/test/jaxp/javax/xml/jaxp/functional/test/astro/SAX201Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/SAX201Test.java rename to test/jaxp/javax/xml/jaxp/functional/test/astro/SAX201Test.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java b/test/jaxp/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java rename to test/jaxp/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/XPathAPITest.java b/test/jaxp/javax/xml/jaxp/functional/test/astro/XPathAPITest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/XPathAPITest.java rename to test/jaxp/javax/xml/jaxp/functional/test/astro/XPathAPITest.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/catalog.xml b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/catalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/catalog.xml rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/catalog.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/catalog.xml.bak b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/catalog.xml.bak similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/catalog.xml.bak rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/catalog.xml.bak diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/catalog.xsd b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/catalog.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/catalog.xsd rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/catalog.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query1.out b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query1.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query1.out rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query1.out diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query2.out b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query2.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query2.out rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query2.out diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query3.out b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query3.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query3.out rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query3.out diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query4.out b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query4.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query4.out rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query4.out diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/dec-ent.xsl b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/dec-ent.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/dec-ent.xsl rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/dec-ent.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/dec.xsl b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/dec.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/dec.xsl rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/dec.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/dec_frag.xsl b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/dec_frag.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/dec_frag.xsl rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/dec_frag.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/html.xsl b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/html.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/html.xsl rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/html.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra-ent.xsl b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra-ent.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra-ent.xsl rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra-ent.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra-uri.xsl b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra-uri.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra-uri.xsl rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra-uri.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra.xsl b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra.xsl rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra_frag.xsl b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra_frag.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra_frag.xsl rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/ra_frag.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/radec.xsl b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/radec.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/radec.xsl rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/radec.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/stellartype.xsl b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/stellartype.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/stellartype.xsl rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/stellartype.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/toptemplate.xsl b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/toptemplate.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/toptemplate.xsl rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/toptemplate.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/toptemplateinc.xsl b/test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/toptemplateinc.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/toptemplateinc.xsl rename to test/jaxp/javax/xml/jaxp/functional/test/astro/xmlfiles/xsl/toptemplateinc.xsl diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/UserController.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/UserController.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/accountInfo.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/accountInfo.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/accountInfo.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/accountInfo.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/accountInfo.xsd b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/accountInfo.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/accountInfo.xsd rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/accountInfo.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/activity.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/activity.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/activity.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/activity.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/bookInfo.dtd b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/bookInfo.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/bookInfo.dtd rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/bookInfo.dtd diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/bookInfo.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/bookInfo.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/bookInfo.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/bookInfo.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/coins.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/coins.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/coins.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/coins.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/coins.xsd b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/coins.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/coins.xsd rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/coins.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/coinsImportMe.xsd b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/coinsImportMe.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/coinsImportMe.xsd rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/coinsImportMe.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/data.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/data.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/data.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/data.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/doc_fallback.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/doc_fallback.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/doc_fallback.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/doc_fallback.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/doc_fallback_text.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/doc_fallback_text.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/doc_fallback_text.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/doc_fallback_text.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/doc_xinc_loops.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/doc_xinc_loops.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/doc_xinc_loops.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/doc_xinc_loops.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/doc_xinclude.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/doc_xinclude.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/doc_xinclude.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/doc_xinclude.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/doc_xpointer.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/doc_xpointer.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/doc_xpointer.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/doc_xpointer.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/doc_xpointer_element.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/doc_xpointer_element.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/doc_xpointer_element.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/doc_xpointer_element.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/document_xinclude.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/document_xinclude.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/document_xinclude.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/document_xinclude.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/entity.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/entity.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/entity.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/entity.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/fallback.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/fallback.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/fallback.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/fallback.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/fallback_text.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/fallback_text.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/fallback_text.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/fallback_text.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/inclusion.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/inclusion.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/inclusion.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/inclusion.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/itemsDuration.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/itemsDuration.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/itemsDuration.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/itemsDuration.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/movies.xml.data b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/movies.xml.data similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/movies.xml.data rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/movies.xml.data diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/novels.xsd b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/novels.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/novels.xsd rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/novels.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/novelsInvalid.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/novelsInvalid.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/novelsInvalid.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/novelsInvalid.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/schedule.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/schedule.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/schedule.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/schedule.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/screenName.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/screenName.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/screenName.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/screenName.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/tasks.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/tasks.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/tasks.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/tasks.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/toys.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/toys.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/toys.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/toys.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/toys.xsd b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/toys.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/toys.xsd rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/toys.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/userAddress.xsd b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/userAddress.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/userAddress.xsd rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/userAddress.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/userDetails.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/userDetails.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/userDetails.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/userDetails.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/userDetails.xsd b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/userDetails.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/userDetails.xsd rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/userDetails.xsd diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/userInfo.dtd b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/userInfo.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/userInfo.dtd rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/userInfo.dtd diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/userInfo.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/userInfo.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/content/userInfo.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/content/userInfo.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/doc_fallbackGold.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/doc_fallbackGold.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/doc_fallbackGold.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/doc_fallbackGold.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/doc_fallback_textGold.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/doc_fallback_textGold.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/doc_fallback_textGold.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/doc_fallback_textGold.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/doc_xinc_loopGold.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/doc_xinc_loopGold.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/doc_xinc_loopGold.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/doc_xinc_loopGold.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/doc_xincludeGold.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/doc_xincludeGold.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/doc_xincludeGold.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/doc_xincludeGold.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/doc_xpointerGold.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/doc_xpointerGold.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/doc_xpointerGold.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/doc_xpointerGold.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/scheduleGold.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/scheduleGold.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/scheduleGold.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/scheduleGold.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/screenNameGold.xml b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/screenNameGold.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/auctionportal/golden/screenNameGold.xml rename to test/jaxp/javax/xml/jaxp/functional/test/auctionportal/golden/screenNameGold.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/Bug4693341.dtd b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/Bug4693341.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/Bug4693341.dtd rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/Bug4693341.dtd diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/Bug4693341.xml b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/Bug4693341.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/Bug4693341.xml rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/Bug4693341.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/Bug4848653.xml b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/Bug4848653.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/Bug4848653.xml rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/Bug4848653.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/certificate.xml b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/certificate.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/certificate.xml rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/certificate.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/out/Bug4693341.dtd b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/out/Bug4693341.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/out/Bug4693341.dtd rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/out/Bug4693341.dtd diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/out/Bug4693341.xml b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/out/Bug4693341.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/out/Bug4693341.xml rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/out/Bug4693341.xml diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/out/Bug4858685.txt b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/out/Bug4858685.txt similarity index 100% rename from jaxp/test/javax/xml/jaxp/functional/test/gaptest/xmlfiles/out/Bug4858685.txt rename to test/jaxp/javax/xml/jaxp/functional/test/gaptest/xmlfiles/out/Bug4858685.txt diff --git a/jaxp/test/javax/xml/jaxp/isolatedjdk/IsolatedJDK.sh b/test/jaxp/javax/xml/jaxp/isolatedjdk/IsolatedJDK.sh similarity index 100% rename from jaxp/test/javax/xml/jaxp/isolatedjdk/IsolatedJDK.sh rename to test/jaxp/javax/xml/jaxp/isolatedjdk/IsolatedJDK.sh diff --git a/jaxp/test/javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.java b/test/jaxp/javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.java rename to test/jaxp/javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.java diff --git a/jaxp/test/javax/xml/jaxp/isolatedjdk/catalog/catalogFiles/properties.xml b/test/jaxp/javax/xml/jaxp/isolatedjdk/catalog/catalogFiles/properties.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/isolatedjdk/catalog/catalogFiles/properties.xml rename to test/jaxp/javax/xml/jaxp/isolatedjdk/catalog/catalogFiles/properties.xml diff --git a/jaxp/test/javax/xml/jaxp/libs/catalog/CatalogTestUtils.java b/test/jaxp/javax/xml/jaxp/libs/catalog/CatalogTestUtils.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/catalog/CatalogTestUtils.java rename to test/jaxp/javax/xml/jaxp/libs/catalog/CatalogTestUtils.java diff --git a/jaxp/test/javax/xml/jaxp/libs/catalog/ResolutionChecker.java b/test/jaxp/javax/xml/jaxp/libs/catalog/ResolutionChecker.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/catalog/ResolutionChecker.java rename to test/jaxp/javax/xml/jaxp/libs/catalog/ResolutionChecker.java diff --git a/jaxp/test/javax/xml/jaxp/libs/javax/xml/parsers/ptests/MyCHandler.java b/test/jaxp/javax/xml/jaxp/libs/javax/xml/parsers/ptests/MyCHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/javax/xml/parsers/ptests/MyCHandler.java rename to test/jaxp/javax/xml/jaxp/libs/javax/xml/parsers/ptests/MyCHandler.java diff --git a/jaxp/test/javax/xml/jaxp/libs/javax/xml/parsers/ptests/MyErrorHandler.java b/test/jaxp/javax/xml/jaxp/libs/javax/xml/parsers/ptests/MyErrorHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/javax/xml/parsers/ptests/MyErrorHandler.java rename to test/jaxp/javax/xml/jaxp/libs/javax/xml/parsers/ptests/MyErrorHandler.java diff --git a/jaxp/test/javax/xml/jaxp/libs/javax/xml/parsers/ptests/ParserTestConst.java b/test/jaxp/javax/xml/jaxp/libs/javax/xml/parsers/ptests/ParserTestConst.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/javax/xml/parsers/ptests/ParserTestConst.java rename to test/jaxp/javax/xml/jaxp/libs/javax/xml/parsers/ptests/ParserTestConst.java diff --git a/jaxp/test/javax/xml/jaxp/libs/javax/xml/transform/ptests/MyContentHandler.java b/test/jaxp/javax/xml/jaxp/libs/javax/xml/transform/ptests/MyContentHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/javax/xml/transform/ptests/MyContentHandler.java rename to test/jaxp/javax/xml/jaxp/libs/javax/xml/transform/ptests/MyContentHandler.java diff --git a/jaxp/test/javax/xml/jaxp/libs/javax/xml/transform/ptests/TransformerTestConst.java b/test/jaxp/javax/xml/jaxp/libs/javax/xml/transform/ptests/TransformerTestConst.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/javax/xml/transform/ptests/TransformerTestConst.java rename to test/jaxp/javax/xml/jaxp/libs/javax/xml/transform/ptests/TransformerTestConst.java diff --git a/jaxp/test/javax/xml/jaxp/libs/javax/xml/validation/ptests/MyErrorHandler.java b/test/jaxp/javax/xml/jaxp/libs/javax/xml/validation/ptests/MyErrorHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/javax/xml/validation/ptests/MyErrorHandler.java rename to test/jaxp/javax/xml/jaxp/libs/javax/xml/validation/ptests/MyErrorHandler.java diff --git a/jaxp/test/javax/xml/jaxp/libs/javax/xml/validation/ptests/ValidationTestConst.java b/test/jaxp/javax/xml/jaxp/libs/javax/xml/validation/ptests/ValidationTestConst.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/javax/xml/validation/ptests/ValidationTestConst.java rename to test/jaxp/javax/xml/jaxp/libs/javax/xml/validation/ptests/ValidationTestConst.java diff --git a/jaxp/test/javax/xml/jaxp/libs/javax/xml/xpath/ptests/XPathTestConst.java b/test/jaxp/javax/xml/jaxp/libs/javax/xml/xpath/ptests/XPathTestConst.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/javax/xml/xpath/ptests/XPathTestConst.java rename to test/jaxp/javax/xml/jaxp/libs/javax/xml/xpath/ptests/XPathTestConst.java diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java rename to test/jaxp/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/FilePolicy.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/FilePolicy.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/jaxp/library/FilePolicy.java rename to test/jaxp/javax/xml/jaxp/libs/jaxp/library/FilePolicy.java diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/InternalAPIPolicy.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/InternalAPIPolicy.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/jaxp/library/InternalAPIPolicy.java rename to test/jaxp/javax/xml/jaxp/libs/jaxp/library/InternalAPIPolicy.java diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPDataProvider.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPDataProvider.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPDataProvider.java rename to test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPDataProvider.java diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPPolicyManager.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPPolicyManager.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPPolicyManager.java rename to test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPPolicyManager.java diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java rename to test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JarUtils.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JarUtils.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/jaxp/library/JarUtils.java rename to test/jaxp/javax/xml/jaxp/libs/jaxp/library/JarUtils.java diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/NetAccessPolicy.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/NetAccessPolicy.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/jaxp/library/NetAccessPolicy.java rename to test/jaxp/javax/xml/jaxp/libs/jaxp/library/NetAccessPolicy.java diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/SimpleHttpServer.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/SimpleHttpServer.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/jaxp/library/SimpleHttpServer.java rename to test/jaxp/javax/xml/jaxp/libs/jaxp/library/SimpleHttpServer.java diff --git a/jaxp/test/javax/xml/jaxp/libs/org/w3c/dom/ptests/DOMTestUtil.java b/test/jaxp/javax/xml/jaxp/libs/org/w3c/dom/ptests/DOMTestUtil.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/org/w3c/dom/ptests/DOMTestUtil.java rename to test/jaxp/javax/xml/jaxp/libs/org/w3c/dom/ptests/DOMTestUtil.java diff --git a/jaxp/test/javax/xml/jaxp/libs/org/xml/sax/ptests/MyAttrCHandler.java b/test/jaxp/javax/xml/jaxp/libs/org/xml/sax/ptests/MyAttrCHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/org/xml/sax/ptests/MyAttrCHandler.java rename to test/jaxp/javax/xml/jaxp/libs/org/xml/sax/ptests/MyAttrCHandler.java diff --git a/jaxp/test/javax/xml/jaxp/libs/org/xml/sax/ptests/MyNSContentHandler.java b/test/jaxp/javax/xml/jaxp/libs/org/xml/sax/ptests/MyNSContentHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/org/xml/sax/ptests/MyNSContentHandler.java rename to test/jaxp/javax/xml/jaxp/libs/org/xml/sax/ptests/MyNSContentHandler.java diff --git a/jaxp/test/javax/xml/jaxp/libs/org/xml/sax/ptests/SAXTestConst.java b/test/jaxp/javax/xml/jaxp/libs/org/xml/sax/ptests/SAXTestConst.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/org/xml/sax/ptests/SAXTestConst.java rename to test/jaxp/javax/xml/jaxp/libs/org/xml/sax/ptests/SAXTestConst.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/AbstractFilterFactory.java b/test/jaxp/javax/xml/jaxp/libs/test/astro/AbstractFilterFactory.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/astro/AbstractFilterFactory.java rename to test/jaxp/javax/xml/jaxp/libs/test/astro/AbstractFilterFactory.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/AstroConstants.java b/test/jaxp/javax/xml/jaxp/libs/test/astro/AstroConstants.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/astro/AstroConstants.java rename to test/jaxp/javax/xml/jaxp/libs/test/astro/AstroConstants.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/AstroProcessor.java b/test/jaxp/javax/xml/jaxp/libs/test/astro/AstroProcessor.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/astro/AstroProcessor.java rename to test/jaxp/javax/xml/jaxp/libs/test/astro/AstroProcessor.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/DOMFilterFactoryImpl.java b/test/jaxp/javax/xml/jaxp/libs/test/astro/DOMFilterFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/astro/DOMFilterFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/libs/test/astro/DOMFilterFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/DOML3InputSourceFactoryImpl.java b/test/jaxp/javax/xml/jaxp/libs/test/astro/DOML3InputSourceFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/astro/DOML3InputSourceFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/libs/test/astro/DOML3InputSourceFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/FilterFactory.java b/test/jaxp/javax/xml/jaxp/libs/test/astro/FilterFactory.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/astro/FilterFactory.java rename to test/jaxp/javax/xml/jaxp/libs/test/astro/FilterFactory.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/InputSourceFactory.java b/test/jaxp/javax/xml/jaxp/libs/test/astro/InputSourceFactory.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/astro/InputSourceFactory.java rename to test/jaxp/javax/xml/jaxp/libs/test/astro/InputSourceFactory.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/InputSourceFactoryImpl.java b/test/jaxp/javax/xml/jaxp/libs/test/astro/InputSourceFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/astro/InputSourceFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/libs/test/astro/InputSourceFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/SAXFilterFactoryImpl.java b/test/jaxp/javax/xml/jaxp/libs/test/astro/SAXFilterFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/astro/SAXFilterFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/libs/test/astro/SAXFilterFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/SourceFilterFactory.java b/test/jaxp/javax/xml/jaxp/libs/test/astro/SourceFilterFactory.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/astro/SourceFilterFactory.java rename to test/jaxp/javax/xml/jaxp/libs/test/astro/SourceFilterFactory.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/StreamFilterFactoryImpl.java b/test/jaxp/javax/xml/jaxp/libs/test/astro/StreamFilterFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/astro/StreamFilterFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/libs/test/astro/StreamFilterFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/TemplatesFilterFactoryImpl.java b/test/jaxp/javax/xml/jaxp/libs/test/astro/TemplatesFilterFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/astro/TemplatesFilterFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/libs/test/astro/TemplatesFilterFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/auctionportal/HiBidConstants.java b/test/jaxp/javax/xml/jaxp/libs/test/auctionportal/HiBidConstants.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/auctionportal/HiBidConstants.java rename to test/jaxp/javax/xml/jaxp/libs/test/auctionportal/HiBidConstants.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/auctionportal/MyDOMErrorHandler.java b/test/jaxp/javax/xml/jaxp/libs/test/auctionportal/MyDOMErrorHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/auctionportal/MyDOMErrorHandler.java rename to test/jaxp/javax/xml/jaxp/libs/test/auctionportal/MyDOMErrorHandler.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/auctionportal/MyDOMOutput.java b/test/jaxp/javax/xml/jaxp/libs/test/auctionportal/MyDOMOutput.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/auctionportal/MyDOMOutput.java rename to test/jaxp/javax/xml/jaxp/libs/test/auctionportal/MyDOMOutput.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/auctionportal/MyErrorHandler.java b/test/jaxp/javax/xml/jaxp/libs/test/auctionportal/MyErrorHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/auctionportal/MyErrorHandler.java rename to test/jaxp/javax/xml/jaxp/libs/test/auctionportal/MyErrorHandler.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/auctionportal/XInclHandler.java b/test/jaxp/javax/xml/jaxp/libs/test/auctionportal/XInclHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/auctionportal/XInclHandler.java rename to test/jaxp/javax/xml/jaxp/libs/test/auctionportal/XInclHandler.java diff --git a/jaxp/test/javax/xml/jaxp/libs/test/gaptest/GapTestConst.java b/test/jaxp/javax/xml/jaxp/libs/test/gaptest/GapTestConst.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/libs/test/gaptest/GapTestConst.java rename to test/jaxp/javax/xml/jaxp/libs/test/gaptest/GapTestConst.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/BasicModularXMLParserTest.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/BasicModularXMLParserTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/BasicModularXMLParserTest.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/BasicModularXMLParserTest.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/DefaultFactoryWrapperTest.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/DefaultFactoryWrapperTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/DefaultFactoryWrapperTest.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/DefaultFactoryWrapperTest.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/LayerModularXMLParserTest.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/LayerModularXMLParserTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/LayerModularXMLParserTest.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/LayerModularXMLParserTest.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/XMLReaderFactoryTest.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/XMLReaderFactoryTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/XMLReaderFactoryTest.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/XMLReaderFactoryTest.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/module-info.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/module-info.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/module-info.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/module-info.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/DatatypeFactoryWrapper.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/DatatypeFactoryWrapper.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/DatatypeFactoryWrapper.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/DatatypeFactoryWrapper.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/DocumentBuilderFactoryWrapper.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/DocumentBuilderFactoryWrapper.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/DocumentBuilderFactoryWrapper.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/DocumentBuilderFactoryWrapper.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/SAXParserFactoryWrapper.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/SAXParserFactoryWrapper.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/SAXParserFactoryWrapper.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/SAXParserFactoryWrapper.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/SchemaFactoryWrapper.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/SchemaFactoryWrapper.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/SchemaFactoryWrapper.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/SchemaFactoryWrapper.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/TransformerFactoryWrapper.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/TransformerFactoryWrapper.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/TransformerFactoryWrapper.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/TransformerFactoryWrapper.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XMLEventFactoryWrapper.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XMLEventFactoryWrapper.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XMLEventFactoryWrapper.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XMLEventFactoryWrapper.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XMLInputFactoryWrapper.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XMLInputFactoryWrapper.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XMLInputFactoryWrapper.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XMLInputFactoryWrapper.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XMLOutputFactoryWrapper.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XMLOutputFactoryWrapper.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XMLOutputFactoryWrapper.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XMLOutputFactoryWrapper.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XPathFactoryWrapper.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XPathFactoryWrapper.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XPathFactoryWrapper.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/DefaultFactoryWrapperTest/xmlwrapperprovider/xwp/XPathFactoryWrapper.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/test/module-info.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/test/module-info.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/test/module-info.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/test/module-info.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/test/test/XMLFactoryHelper.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/test/test/XMLFactoryHelper.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/test/test/XMLFactoryHelper.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/test/test/XMLFactoryHelper.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/unnamed/Main.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/unnamed/Main.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/unnamed/Main.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/unnamed/Main.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/module-info.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/module-info.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/module-info.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/module-info.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/DocumentBuilderFactoryImpl.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/DocumentBuilderFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/DocumentBuilderFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/DocumentBuilderFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/SAXParserFactoryImpl.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/SAXParserFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/SAXParserFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/SAXParserFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/SchemaFactoryImpl.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/SchemaFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/SchemaFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/SchemaFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/TransformerFactoryImpl.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/TransformerFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/TransformerFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/TransformerFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/XMLInputFactoryImpl.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/XMLInputFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/XMLInputFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/XMLInputFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/XMLOutputFactoryImpl.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/XMLOutputFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/XMLOutputFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/XMLOutputFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/XPathFactoryImpl.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/XPathFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/XPathFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/xp1/XPathFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/module-info.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/module-info.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/module-info.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/module-info.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/xp2/DatatypeFactoryImpl.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/xp2/DatatypeFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/xp2/DatatypeFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/xp2/DatatypeFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/xp2/XMLEventFactoryImpl.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/xp2/XMLEventFactoryImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/xp2/XMLEventFactoryImpl.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/xp2/XMLEventFactoryImpl.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/xp2/XMLReaderImpl.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/xp2/XMLReaderImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/xp2/XMLReaderImpl.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/xp2/XMLReaderImpl.java diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider3/legacy/META-INF/services/org.xml.sax.driver b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider3/legacy/META-INF/services/org.xml.sax.driver similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider3/legacy/META-INF/services/org.xml.sax.driver rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider3/legacy/META-INF/services/org.xml.sax.driver diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider3/service/META-INF/services/org.xml.sax.XMLReader b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider3/service/META-INF/services/org.xml.sax.XMLReader similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider3/service/META-INF/services/org.xml.sax.XMLReader rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider3/service/META-INF/services/org.xml.sax.XMLReader diff --git a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider3/xp3/XMLReaderImpl.java b/test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider3/xp3/XMLReaderImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider3/xp3/XMLReaderImpl.java rename to test/jaxp/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider3/xp3/XMLReaderImpl.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/TEST.properties b/test/jaxp/javax/xml/jaxp/unittest/TEST.properties similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/TEST.properties rename to test/jaxp/javax/xml/jaxp/unittest/TEST.properties diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogAccessTest.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogAccessTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogAccessTest.java rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogAccessTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogFileInputTest.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogFileInputTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogFileInputTest.java rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogFileInputTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport.java rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport5.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport5.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport5.java rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport5.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupportBase.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupportBase.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupportBase.java rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupportBase.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport_bogus.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport_bogus.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport_bogus.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport_bogus.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport_uri.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport_uri.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport_uri.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport_uri.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java rename to test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/DocFunc.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/DocFunc.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/DocFunc.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/DocFunc.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/DocFunc.xsl b/test/jaxp/javax/xml/jaxp/unittest/catalog/DocFunc.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/DocFunc.xsl rename to test/jaxp/javax/xml/jaxp/unittest/catalog/DocFunc.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/DocFunc2.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/DocFunc2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/DocFunc2.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/DocFunc2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/DocFuncCatalog.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/DocFuncCatalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/DocFuncCatalog.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/DocFuncCatalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/JDK8146237_catalog.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/JDK8146237_catalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/JDK8146237_catalog.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/JDK8146237_catalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XI_red.dtd b/test/jaxp/javax/xml/jaxp/unittest/catalog/XI_red.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XI_red.dtd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XI_red.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XI_simple.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/XI_simple.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XI_simple.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XI_simple.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XI_simple4Catalog.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/XI_simple4Catalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XI_simple4Catalog.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XI_simple4Catalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XI_test2.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/XI_test2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XI_test2.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XI_test2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XI_test2Catalog.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/XI_test2Catalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XI_test2Catalog.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XI_test2Catalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XI_utf8.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/XI_utf8.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XI_utf8.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XI_utf8.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XI_utf8Catalog.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/XI_utf8Catalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XI_utf8Catalog.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XI_utf8Catalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XMLSchema.dtd b/test/jaxp/javax/xml/jaxp/unittest/catalog/XMLSchema.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XMLSchema.dtd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XMLSchema.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XMLSchema.xsd b/test/jaxp/javax/xml/jaxp/unittest/catalog/XMLSchema.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XMLSchema.xsd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XMLSchema.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XSDInclude_company.xsd b/test/jaxp/javax/xml/jaxp/unittest/catalog/XSDInclude_company.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XSDInclude_company.xsd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XSDInclude_company.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XSDInclude_person.xsd b/test/jaxp/javax/xml/jaxp/unittest/catalog/XSDInclude_person.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XSDInclude_person.xsd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XSDInclude_person.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XSDInclude_product.xsd b/test/jaxp/javax/xml/jaxp/unittest/catalog/XSDInclude_product.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XSDInclude_product.xsd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XSDInclude_product.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XSLDTD.dtd b/test/jaxp/javax/xml/jaxp/unittest/catalog/XSLDTD.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XSLDTD.dtd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XSLDTD.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XSLDTD.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/XSLDTD.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XSLDTD.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XSLDTD.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XSLImport_html.xsl b/test/jaxp/javax/xml/jaxp/unittest/catalog/XSLImport_html.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XSLImport_html.xsl rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XSLImport_html.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XSLInclude_footer.xsl b/test/jaxp/javax/xml/jaxp/unittest/catalog/XSLInclude_footer.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XSLInclude_footer.xsl rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XSLInclude_footer.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/XSLInclude_header.xsl b/test/jaxp/javax/xml/jaxp/unittest/catalog/XSLInclude_header.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/XSLInclude_header.xsl rename to test/jaxp/javax/xml/jaxp/unittest/catalog/XSLInclude_header.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/bad_cat.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/bad_cat.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/bad_cat.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/bad_cat.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/catalog.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/catalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/catalog.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/catalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/catalog_invalid.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/catalog_invalid.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/catalog_invalid.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/catalog_invalid.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/catalog_uri.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/catalog_uri.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/catalog_uri.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/catalog_uri.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/datatypes.dtd b/test/jaxp/javax/xml/jaxp/unittest/catalog/datatypes.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/datatypes.dtd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/datatypes.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/defer_del_false.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/defer_del_false.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/defer_del_false.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/defer_del_false.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/defer_false_2.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/defer_false_2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/defer_false_2.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/defer_false_2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/delegatepublic.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/delegatepublic.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/delegatepublic.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/delegatepublic.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/delegatesystem.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/delegatesystem.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/delegatesystem.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/delegatesystem.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/delegateuri.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/delegateuri.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/delegateuri.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/delegateuri.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/files/delegatecatalog.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/files/delegatecatalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/files/delegatecatalog.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/files/delegatecatalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/files/delegatecatalog_uri.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/files/delegatecatalog_uri.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/files/delegatecatalog_uri.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/files/delegatecatalog_uri.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/files/delegatepublic.dtd b/test/jaxp/javax/xml/jaxp/unittest/catalog/files/delegatepublic.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/files/delegatepublic.dtd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/files/delegatepublic.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/files/delegatesystem.dtd b/test/jaxp/javax/xml/jaxp/unittest/catalog/files/delegatesystem.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/files/delegatesystem.dtd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/files/delegatesystem.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/files/delegateuri.dtd b/test/jaxp/javax/xml/jaxp/unittest/catalog/files/delegateuri.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/files/delegateuri.dtd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/files/delegateuri.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/files/rewritesystem.dtd b/test/jaxp/javax/xml/jaxp/unittest/catalog/files/rewritesystem.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/files/rewritesystem.dtd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/files/rewritesystem.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/files/systemsuffix.dtd b/test/jaxp/javax/xml/jaxp/unittest/catalog/files/systemsuffix.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/files/systemsuffix.dtd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/files/systemsuffix.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/first_cat.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/first_cat.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/first_cat.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/first_cat.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/include.dtd b/test/jaxp/javax/xml/jaxp/unittest/catalog/include.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/include.dtd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/include.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/jar/META-INF/MANIFEST.MF b/test/jaxp/javax/xml/jaxp/unittest/catalog/jar/META-INF/MANIFEST.MF similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/jar/META-INF/MANIFEST.MF rename to test/jaxp/javax/xml/jaxp/unittest/catalog/jar/META-INF/MANIFEST.MF diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/jar/META-INF/catalog/ws-addr.xsd b/test/jaxp/javax/xml/jaxp/unittest/catalog/jar/META-INF/catalog/ws-addr.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/jar/META-INF/catalog/ws-addr.xsd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/jar/META-INF/catalog/ws-addr.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/jar/META-INF/jax-ws-catalog.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/jar/META-INF/jax-ws-catalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/jar/META-INF/jax-ws-catalog.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/jar/META-INF/jax-ws-catalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/next_cat.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/next_cat.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/next_cat.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/next_cat.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/pubOnly.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/pubOnly.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/pubOnly.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/pubOnly.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/public.dtd b/test/jaxp/javax/xml/jaxp/unittest/catalog/public.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/public.dtd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/public.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/public.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/public.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/public.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/public.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/rewriteCatalog.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/rewriteCatalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/rewriteCatalog.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/rewriteCatalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/rewriteSystem_id.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/rewriteSystem_id.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/rewriteSystem_id.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/rewriteSystem_id.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/rewritesystem.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/rewritesystem.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/rewritesystem.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/rewritesystem.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/rewritesystem1.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/rewritesystem1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/rewritesystem1.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/rewritesystem1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/second_cat.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/second_cat.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/second_cat.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/second_cat.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/sysAndPub.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/sysAndPub.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/sysAndPub.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/sysAndPub.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/sysOnly.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/sysOnly.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/sysOnly.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/sysOnly.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/system.dtd b/test/jaxp/javax/xml/jaxp/unittest/catalog/system.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/system.dtd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/system.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/system.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/system.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/system.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/system.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/systemsuffix.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/systemsuffix.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/systemsuffix.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/systemsuffix.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/uri.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/uri.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/uri.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/uri.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/val_test.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/val_test.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/val_test.xml rename to test/jaxp/javax/xml/jaxp/unittest/catalog/val_test.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/val_test.xsd b/test/jaxp/javax/xml/jaxp/unittest/catalog/val_test.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/val_test.xsd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/val_test.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/xml.xsd b/test/jaxp/javax/xml/jaxp/unittest/catalog/xml.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/catalog/xml.xsd rename to test/jaxp/javax/xml/jaxp/unittest/catalog/xml.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java b/test/jaxp/javax/xml/jaxp/unittest/common/Bug6350682.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java rename to test/jaxp/javax/xml/jaxp/unittest/common/Bug6350682.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java b/test/jaxp/javax/xml/jaxp/unittest/common/Bug6723276Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java rename to test/jaxp/javax/xml/jaxp/unittest/common/Bug6723276Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xml b/test/jaxp/javax/xml/jaxp/unittest/common/Bug6941169.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/Bug6941169.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xsd b/test/jaxp/javax/xml/jaxp/unittest/common/Bug6941169.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xsd rename to test/jaxp/javax/xml/jaxp/unittest/common/Bug6941169.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java b/test/jaxp/javax/xml/jaxp/unittest/common/Bug6941169Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java rename to test/jaxp/javax/xml/jaxp/unittest/common/Bug6941169Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java b/test/jaxp/javax/xml/jaxp/unittest/common/Bug7143711Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java rename to test/jaxp/javax/xml/jaxp/unittest/common/Bug7143711Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/CDataChunkSizeTest.java b/test/jaxp/javax/xml/jaxp/unittest/common/CDataChunkSizeTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/CDataChunkSizeTest.java rename to test/jaxp/javax/xml/jaxp/unittest/common/CDataChunkSizeTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/Sources.java b/test/jaxp/javax/xml/jaxp/unittest/common/Sources.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/Sources.java rename to test/jaxp/javax/xml/jaxp/unittest/common/Sources.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/TestSAXDriver.java b/test/jaxp/javax/xml/jaxp/unittest/common/TestSAXDriver.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/TestSAXDriver.java rename to test/jaxp/javax/xml/jaxp/unittest/common/TestSAXDriver.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java b/test/jaxp/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java rename to test/jaxp/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java b/test/jaxp/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java rename to test/jaxp/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/WarningsTestBase.java b/test/jaxp/javax/xml/jaxp/unittest/common/WarningsTestBase.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/WarningsTestBase.java rename to test/jaxp/javax/xml/jaxp/unittest/common/WarningsTestBase.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/generate-catalog.xsl b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/generate-catalog.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/generate-catalog.xsl rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/generate-catalog.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest7.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest7.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest7.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest7.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest7.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest7.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest7.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/htmltest7.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.txt b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.txt similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.txt rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.txt diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest2.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/nodetest2.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest2.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/nodetest2.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest2ls.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/nodetest2ls.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest2ls.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/nodetest2ls.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/simple-entity-resolver-config-transformed.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/simple-entity-resolver-config-transformed.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/simple-entity-resolver-config-transformed.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/simple-entity-resolver-config-transformed.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/simple-entity-resolver-config.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/simple-entity-resolver-config.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/simple-entity-resolver-config.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/simple-entity-resolver-config.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest5.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest5.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5ls.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest5ls.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5ls.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest5ls.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5xslt.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest5xslt.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5xslt.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest5xslt.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest7.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest7.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7ls.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest7ls.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7ls.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest7ls.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7xslt.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest7xslt.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7xslt.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest7xslt.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.out b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.out rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.xml b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.xml rename to test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6320118.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java rename to test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6320118.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java rename to test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java rename to test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java rename to test/jaxp/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java rename to test/jaxp/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/DurationTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java rename to test/jaxp/javax/xml/jaxp/unittest/datatype/DurationTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java rename to test/jaxp/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java rename to test/jaxp/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java rename to test/jaxp/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4915524.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug4915524.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4915748.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug4915748.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966082.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966082.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.xml b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966082.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.xml rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966082.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966138.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966138.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966142.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966142.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xml b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966142.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xml rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966142.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xsd b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966142.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xsd rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966142.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966143.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966143.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xml b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966143.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xml rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966143.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xsd b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966143.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xsd rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966143.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6339023.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug6339023.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6355326.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug6355326.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6367542.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug6367542.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6520131.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug6520131.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6521260.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug6521260.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545.xml b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6582545.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545.xml rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug6582545.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6582545Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug6582545Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614.xml b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6879614.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614.xml rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug6879614.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6879614Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/Bug6879614Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/CR6333993Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/CR6333993Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/CR6517707Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/CR6517707Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/CR6517717Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/CR6517717Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/CR6909336Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/CR6909336Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.xsd b/test/jaxp/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.xsd rename to test/jaxp/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/DOMXPathTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/DOMXPathTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ElementTraversal.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/ElementTraversal.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.xml b/test/jaxp/javax/xml/jaxp/unittest/dom/ElementTraversal.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.xml rename to test/jaxp/javax/xml/jaxp/unittest/dom/ElementTraversal.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java rename to test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/note_in_dtd.xml b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/note_in_dtd.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/ls/note_in_dtd.xml rename to test/jaxp/javax/xml/jaxp/unittest/dom/ls/note_in_dtd.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/test.xml b/test/jaxp/javax/xml/jaxp/unittest/dom/test.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/test.xml rename to test/jaxp/javax/xml/jaxp/unittest/dom/test.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/test.xsd b/test/jaxp/javax/xml/jaxp/unittest/dom/test.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/dom/test.xsd rename to test/jaxp/javax/xml/jaxp/unittest/dom/test.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xsd b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xsd rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4934208.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4934208.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4967002.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4967002.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4985486.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4985486.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4985486.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4985486.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991020.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991020.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991020.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991020.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xsd b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991020.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xsd rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991020.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991946.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991946.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991946.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991946.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xsd b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991946.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xsd rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991946.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5010072.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5010072.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.xsd b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5010072.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.xsd rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5010072.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5025825.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5025825.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6309988.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6309988.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6341770.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6341770.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6361283.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6361283.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6518733.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6518733.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6518733.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6518733.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6564400.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6564400.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6564400.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6564400.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xsd b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6564400.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xsd rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6564400.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6573786.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6573786.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6594813.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6594813.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.dtd b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6608841.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.dtd rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6608841.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6608841.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6608841.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6608841.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6608841.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841_xhtml11-flat.dtd b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6608841_xhtml11-flat.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841_xhtml11-flat.dtd rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6608841_xhtml11-flat.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6690015.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6690015.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6760982.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6760982.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.dtd b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7157608.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.dtd rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7157608.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7157608.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7157608.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608_1.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7157608_1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608_1.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7157608_1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147TestClass.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8003147TestClass.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147TestClass.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8003147TestClass.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8073385.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8073385.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/DosTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/DosTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest3.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/DosTest3.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest3.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/DosTest3.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/HandleError.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/HandleError.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/HandleError.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/HandleError.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/bug6690015.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/bug6690015.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/bug6690015.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/bug6690015.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/bug6760982.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/bug6760982.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/bug6760982.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/bug6760982.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/catalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/catalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xsd b/test/jaxp/javax/xml/jaxp/unittest/parsers/catalog.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xsd rename to test/jaxp/javax/xml/jaxp/unittest/parsers/catalog.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/entity.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/entity.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/entity.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/entity.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/entity64K.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/entity64K.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/entity64K.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/entity64K.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/test.xsd b/test/jaxp/javax/xml/jaxp/unittest/parsers/test.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/test.xsd rename to test/jaxp/javax/xml/jaxp/unittest/parsers/test.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/test1.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/test1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/test1.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/test1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/test2.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/test2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/test2.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/test2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/toys.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/toys.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xsd b/test/jaxp/javax/xml/jaxp/unittest/parsers/toys.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xsd rename to test/jaxp/javax/xml/jaxp/unittest/parsers/toys.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/toys3002.xsd b/test/jaxp/javax/xml/jaxp/unittest/parsers/toys3002.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/toys3002.xsd rename to test/jaxp/javax/xml/jaxp/unittest/parsers/toys3002.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java rename to test/jaxp/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test1.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/xinclude/test1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test1.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/xinclude/test1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test2.xml b/test/jaxp/javax/xml/jaxp/unittest/parsers/xinclude/test2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test2.xml rename to test/jaxp/javax/xml/jaxp/unittest/parsers/xinclude/test2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java b/test/jaxp/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6889654Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/Bug6889654Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6925410Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/Bug6925410Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6949607Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/Bug6949607Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6992561Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/Bug6992561Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778.xml b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug7057778.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778.xml rename to test/jaxp/javax/xml/jaxp/unittest/sax/Bug7057778.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug7057778Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/Bug7057778Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java b/test/jaxp/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java b/test/jaxp/javax/xml/jaxp/unittest/sax/NSSupportTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/NSSupportTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java b/test/jaxp/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/SymbolTableResetTest.java b/test/jaxp/javax/xml/jaxp/unittest/sax/SymbolTableResetTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/SymbolTableResetTest.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/SymbolTableResetTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/XMLReaderTest.java b/test/jaxp/javax/xml/jaxp/unittest/sax/XMLReaderTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/XMLReaderTest.java rename to test/jaxp/javax/xml/jaxp/unittest/sax/XMLReaderTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/externalDTD.dtd b/test/jaxp/javax/xml/jaxp/unittest/sax/externalDTD.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/externalDTD.dtd rename to test/jaxp/javax/xml/jaxp/unittest/sax/externalDTD.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/toys.xml b/test/jaxp/javax/xml/jaxp/unittest/sax/toys.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/toys.xml rename to test/jaxp/javax/xml/jaxp/unittest/sax/toys.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/toys_error.xml b/test/jaxp/javax/xml/jaxp/unittest/sax/toys_error.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/sax/toys_error.xml rename to test/jaxp/javax/xml/jaxp/unittest/sax/toys_error.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6370703.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/Bug6370703.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6378422.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/Bug6378422.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6380870.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/Bug6380870.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6489502.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/Bug6489502.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6509774.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/Bug6509774.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6688002Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/Bug6688002Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6976938.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/Bug6976938.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6976938Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/Bug6976938Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/coalesce.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/CoalesceTest/coalesce.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/coalesce.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/CoalesceTest/coalesce.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml.output b/test/jaxp/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml.output similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml.output rename to test/jaxp/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml.output diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/EventFilterSupportTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/EventFilterSupportTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/EventFilterSupportTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/EventFilterSupportTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/FactoryFindTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/FactoryFindTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.policy b/test/jaxp/javax/xml/jaxp/unittest/stream/FactoryFindTest.policy similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.policy rename to test/jaxp/javax/xml/jaxp/unittest/stream/FactoryFindTest.policy diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/bug6613059.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/bug6613059.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/bug6613059.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/bug6613059.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play2.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play2.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/sgml.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/sgml.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/sgml.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/sgml.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-1.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-1.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-2.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-2.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/replace1.txt b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/replace1.txt similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/replace1.txt rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/replace1.txt diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/play.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/play.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/play.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/play.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace1.txt b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace1.txt similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace1.txt rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace1.txt diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace2.txt b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace2.txt similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace2.txt rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace2.txt diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug8167340_1-0.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug8167340_1-0.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug8167340_1-0.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug8167340_1-0.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug8167340_1-1.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug8167340_1-1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug8167340_1-1.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug8167340_1-1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.dtd b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.dtd rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Hello.wsdl.data b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Hello.wsdl.data similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Hello.wsdl.data rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Hello.wsdl.data diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF8-BOM.xml.data b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF8-BOM.xml.data similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF8-BOM.xml.data rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF8-BOM.xml.data diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.dtd b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.dtd rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.xsd b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.xsd rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/datatypes.dtd b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/datatypes.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/datatypes.dtd rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/datatypes.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/report.dtd b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/report.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/report.dtd rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/report.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/sgml.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/sgml.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/sgml.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/sgml.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/voicexml.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/voicexml.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/voicexml.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/voicexml.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/vxml.dtd b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/vxml.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/vxml.dtd rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/vxml.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/xml11.xml.data b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/xml11.xml.data similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/xml11.xml.data rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/xml11.xml.data diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/message_12.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/message_12.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/message_12.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/message_12.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testEight.xml.org b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testEight.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testEight.xml.org rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testEight.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFive.xml.org b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFive.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFive.xml.org rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFive.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFour.xml.org b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFour.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFour.xml.org rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFour.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testOne.xml.org b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testOne.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testOne.xml.org rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testOne.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSeven.xml.org b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSeven.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSeven.xml.org rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSeven.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSix.xml.org b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSix.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSix.xml.org rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSix.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testThree.xml.org b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testThree.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testThree.xml.org rename to test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testThree.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/basic-form.vxml b/test/jaxp/javax/xml/jaxp/unittest/stream/basic-form.vxml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/basic-form.vxml rename to test/jaxp/javax/xml/jaxp/unittest/stream/basic-form.vxml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/report.dtd b/test/jaxp/javax/xml/jaxp/unittest/stream/report.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/report.dtd rename to test/jaxp/javax/xml/jaxp/unittest/stream/report.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/sgml-bad-systemId.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/sgml-bad-systemId.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/sgml-bad-systemId.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/sgml-bad-systemId.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/sgml.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/sgml.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/sgml.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/sgml.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/sgml_Bug6509774.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/sgml_Bug6509774.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/sgml_Bug6509774.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/sgml_Bug6509774.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/testfile1.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/testfile1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/testfile1.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/testfile1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/testfile2.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/testfile2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/testfile2.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/testfile2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/testfile3.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/testfile3.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/testfile3.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/testfile3.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/testfile4.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/testfile4.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/testfile4.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/testfile4.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/toys.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/toys.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/toys.xml rename to test/jaxp/javax/xml/jaxp/unittest/stream/toys.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/vxml.dtd b/test/jaxp/javax/xml/jaxp/unittest/stream/vxml.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/stream/vxml.dtd rename to test/jaxp/javax/xml/jaxp/unittest/stream/vxml.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/5368141.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/5368141.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/5368141.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/5368141.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.dtd b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug4693341.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.dtd rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug4693341.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug4693341.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug4693341.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug4693341Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug4693341Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug4892774.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug4892774.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug5073477.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug5073477.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug5073477.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug5073477.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6175602.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6175602.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6206491.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6206491.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6206491.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6206491.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6206491.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6206491.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491_2.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6206491_2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491_2.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6206491_2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6216226Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6216226Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6311448.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6311448.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6384805.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6384805.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6465722.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6465722.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6467808.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6467808.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6490380.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6490380.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6490921.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6490921.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6513892.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6513892.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6537167.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6537167.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6540545.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6540545.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6551616.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6551616.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6551616.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6551616.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6559595.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6559595.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6565260.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6565260.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6940416.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug6940416.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug8150704-1.ref b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug8150704-1.ref similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug8150704-1.ref rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug8150704-1.ref diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug8150704-1.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug8150704-1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug8150704-1.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug8150704-1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug8150704-1.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug8150704-1.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug8150704-1.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug8150704-1.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug8150704-2.ref b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug8150704-2.ref similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug8150704-2.ref rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug8150704-2.ref diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug8150704-2.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug8150704-2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug8150704-2.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug8150704-2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug8150704-2.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug8150704-2.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug8150704-2.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug8150704-2.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug8169112.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug8169112.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Bug8169112.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/Bug8169112.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/BugDB12665704.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/BugDB12665704.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/BugDB12665704.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/BugDB12665704.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CLITest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CLITest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CLITest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/CLITest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6551600Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6551600Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6577667.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6577667.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6577667Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6577667Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6652519Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6652519Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6689809Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6689809Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6905829.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6905829.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6905829.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6905829.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Inc.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6905829Inc.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Inc.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6905829Inc.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6905829Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6905829Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6935697.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6935697.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6935697.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6935697.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6935697Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6935697Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6941869.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6941869.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6941869.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6941869.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6941869Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6941869Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6957215.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6957215.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6957215.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6957215.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6957215Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR6957215Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/CR7098746.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR7098746.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/CR7098746.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR7098746.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR7098746Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/CR7098746Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/DOMResultTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/DOMResultTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java b/test/jaxp/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/FactoryFindTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/FactoryFindTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2204.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/Issue2204.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2204.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/Issue2204.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2204Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Issue2204Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2290.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/Issue2290.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2290Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/Issue2290Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data b/test/jaxp/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data rename to test/jaxp/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/NCAA_Conference_Schedule_XML.dtd b/test/jaxp/javax/xml/jaxp/unittest/transform/NCAA_Conference_Schedule_XML.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/NCAA_Conference_Schedule_XML.dtd rename to test/jaxp/javax/xml/jaxp/unittest/transform/NCAA_Conference_Schedule_XML.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/NamespacePrefixTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/NamespacePrefixTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/NamespacePrefixTest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/NamespacePrefixTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/ProcessXSLT.java b/test/jaxp/javax/xml/jaxp/unittest/transform/ProcessXSLT.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/ProcessXSLT.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/ProcessXSLT.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/SAX2DOMTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/SAX2DOMTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/SourceTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/SourceTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/SourceTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/SourceTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/SourceTest.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/SourceTest.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/StAXSourceTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/StAXSourceTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/StylesheetTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/StylesheetTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/StylesheetTest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/StylesheetTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/TemplatesTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/TemplatesTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/TemplatesTest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/TemplatesTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/TransformerTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/TransformerTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java b/test/jaxp/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java b/test/jaxp/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java b/test/jaxp/javax/xml/jaxp/unittest/transform/VersionEventWriter.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/VersionEventWriter.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/ViewEditor1.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/ViewEditor1.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/ViewEditor1.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/ViewEditor1.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/XSLImport.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/XSLImport.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/XSLImport.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/XSLImport.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/XSLInclude_footer.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/XSLInclude_footer.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/XSLInclude_footer.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/XSLInclude_footer.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/XSLInclude_header.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/XSLInclude_header.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/XSLInclude_header.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/XSLInclude_header.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/XSLInclude_main.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/XSLInclude_main.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/XSLInclude_main.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/XSLInclude_main.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/attribset27.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/attribset27.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/attribset27.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/attribset27.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/catalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/catalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xsd b/test/jaxp/javax/xml/jaxp/unittest/transform/catalog.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xsd rename to test/jaxp/javax/xml/jaxp/unittest/transform/catalog.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/catalog_10.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/catalog_10.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/catalog_10.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/catalog_10.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/config.dtd b/test/jaxp/javax/xml/jaxp/unittest/transform/config.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/config.dtd rename to test/jaxp/javax/xml/jaxp/unittest/transform/config.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/config.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/config.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/config.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/config.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/default-layout.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/default-layout.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/default-layout.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/default-layout.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/global-variables.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/global-variables.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/global-variables.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/global-variables.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/global.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/global.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/global.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/global.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/home.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/home.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/home.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/home.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/in.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/in.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/in.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/in.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/inner.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/inner.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/inner.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/inner.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/logon.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/logon.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/logon.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/logon.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/maps.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/maps.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/maps.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/maps.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/msgAttach.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/msgAttach.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/msgAttach.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/msgAttach.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/numbering63.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/numbering63.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/numbering63.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/numbering63.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/outer.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/outer.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/outer.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/outer.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/redirect.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/redirect.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/redirect.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/redirect.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java b/test/jaxp/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/src.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/src.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/src.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/src.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/template.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/template.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/template.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/template.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/tigertest-in.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/tigertest-in.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/tigertest-in.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/tigertest-in.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/tigertest.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/tigertest.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/tigertest.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/tigertest.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/tmp.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/tmp.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/tmp.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/tmp.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/toys.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/toys.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/toys.xml rename to test/jaxp/javax/xml/jaxp/unittest/transform/toys.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/transform.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/transform.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/transform.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/transform.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/upload-media-form.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/upload-media-form.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/upload-media-form.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/upload-media-form.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/upload-media.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/upload-media.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/upload-media.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/upload-media.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/util.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/util.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/util.xsl rename to test/jaxp/javax/xml/jaxp/unittest/transform/util.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java b/test/jaxp/javax/xml/jaxp/unittest/transform/util/DOMUtil.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/util/DOMUtil.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java b/test/jaxp/javax/xml/jaxp/unittest/transform/util/SAXUtil.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/util/SAXUtil.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java b/test/jaxp/javax/xml/jaxp/unittest/transform/util/StAXUtil.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/util/StAXUtil.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java b/test/jaxp/javax/xml/jaxp/unittest/transform/util/StreamUtil.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/util/StreamUtil.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerTestTemplate.java b/test/jaxp/javax/xml/jaxp/unittest/transform/util/TransformerTestTemplate.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerTestTemplate.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/util/TransformerTestTemplate.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java b/test/jaxp/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java rename to test/jaxp/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java b/test/jaxp/javax/xml/jaxp/unittest/util/BOMInputStream.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java rename to test/jaxp/javax/xml/jaxp/unittest/util/BOMInputStream.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java b/test/jaxp/javax/xml/jaxp/unittest/util/BaseStAXUT.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java rename to test/jaxp/javax/xml/jaxp/unittest/util/BaseStAXUT.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java b/test/jaxp/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java rename to test/jaxp/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/AnyElementTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/AnyElementTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966232.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966232.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966254.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966254.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966254.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966254.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966254.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966254.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969042.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969042.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969089.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969089.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969110.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969110.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969689.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969689.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969692.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969692.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969693.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969693.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969695.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969695.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969732.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969732.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970380.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970380.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970383.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970383.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970400.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970400.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970402.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970402.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970951.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970951.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4971605.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4971605.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4971607.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4971607.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4972882.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4972882.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4986844.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4986844.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4986844.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4986844.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4987574.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4987574.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988267.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988267.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988267.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988267.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988268.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988268.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988268.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988268.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988387.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988387.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988387.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988387.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4996446.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4996446.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4996446.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4996446.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4997818.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug4997818.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug5011500.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug5011500.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug5072946.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug5072946.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug5072946.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug5072946.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug5072946.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug5072946.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6378043.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6378043.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6449797.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6449797.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6449797.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6449797.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6457662.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6457662.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6467424.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6467424.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6467424.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6467424.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6467424Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6467424Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6483188.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6483188.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6493687.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6493687.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6493687.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6493687.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6493687.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6493687.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6509668.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6509668.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6526547.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6526547.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6526547.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6526547.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6526547.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6526547.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6531160.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6531160.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6695843.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6695843.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6695843.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6695843.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6695843Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6695843Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_1.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_1.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_10.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_10.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_10.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_10.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_11.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_11.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_11.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_11.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_12.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_12.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_12.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_12.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_13.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_13.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_13.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_13.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_14.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_14.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_14.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_14.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_15.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_15.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_15.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_15.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_16.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_16.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_16.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_16.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_17.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_17.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_17.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_17.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_18.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_18.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_18.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_18.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_19.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_19.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_19.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_19.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_2.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_2.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_20.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_20.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_20.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_20.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_21.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_21.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_21.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_21.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_22.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_22.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_22.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_22.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_23.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_23.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_23.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_23.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_24.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_24.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_24.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_24.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_25.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_25.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_25.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_25.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_3.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_3.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_3.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_3.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_4.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_4.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_4.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_4.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_5.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_5.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_5.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_5.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_6.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_6.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_6.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_6.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_7.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_7.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_7.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_7.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_8.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_8.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_8.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_8.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_9.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_9.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_9.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_9.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6859210.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6859210.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6925531Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6925531Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6946312.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6946312.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6946312Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6946312Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6954738.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6954738.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6954738.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6954738.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug8149915.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug8149915.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Bug8149915.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Bug8149915.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/CR6708840Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/CR6708840Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java b/test/jaxp/javax/xml/jaxp/unittest/validation/CR6740048.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/CR6740048.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/CR6740048.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/CR6740048.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/CR6740048.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/CR6740048.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/CREMAS01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/CREMAS01.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/CREMAS01.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/CREMAS01.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java b/test/jaxp/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/Issue682.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/Issue682.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/Issue682.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/Issue682.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Issue682Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/Issue682Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java b/test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue49.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue49.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue49.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue49.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/MultiOccursTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/MultiOccursTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/OccursTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/OccursTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java b/test/jaxp/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-lax-error.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/ProcessContents-lax-error.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-lax-error.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/ProcessContents-lax-error.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/ProcessContents-ok.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-ok.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/ProcessContents-ok.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/ProcessContents.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/ProcessContents.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/SchemaTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/SchemaTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/SchemaTest.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/SchemaTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/ValidatorTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/ValidatorTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java b/test/jaxp/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java b/test/jaxp/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/gMonths.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/gMonths.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/gMonths.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/gMonths.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/groupA008.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/groupA008.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/groupA008.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/groupA008.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/groupA008ea.red b/test/jaxp/javax/xml/jaxp/unittest/validation/groupA008ea.red similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/groupA008ea.red rename to test/jaxp/javax/xml/jaxp/unittest/validation/groupA008ea.red diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/groupA008eb.red b/test/jaxp/javax/xml/jaxp/unittest/validation/groupA008eb.red similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/groupA008eb.red rename to test/jaxp/javax/xml/jaxp/unittest/validation/groupA008eb.red diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/hello_literal.wsdl b/test/jaxp/javax/xml/jaxp/unittest/validation/hello_literal.wsdl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/hello_literal.wsdl rename to test/jaxp/javax/xml/jaxp/unittest/validation/hello_literal.wsdl diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/idI009.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/idI009.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/idI009.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/idI009.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/idIimp.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/idIimp.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/idIimp.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/idIimp.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/idIxpns.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/idIxpns.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/idIxpns.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/idIxpns.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/idIxpns1.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/idIxpns1.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/idIxpns1.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/idIxpns1.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/mgG014.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/mgG014.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/mgG014.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/mgG014.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/mgJ014.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/mgJ014.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/mgJ014.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/mgJ014.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-max.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-max.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-max.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-max.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-min-max.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-min-max.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-min-max.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-min-max.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-min.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-min.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-min.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-min.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-ok.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-ok.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-ok.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-error-min.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-error-min.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-error-min.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-error-min.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-ok.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-ok.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-ok.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-max.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-max.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-max.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-max.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-min-max.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-min-max.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-min-max.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-min-max.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-min.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-min.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-min.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-min.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-ok.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/occurs-ok.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/occurs-ok.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded-error-min.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded-error-min.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded-error-min.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded-error-min.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded-ok.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded-ok.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded-ok.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-wildcard-unbounded.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-wildcard-unbounded.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/occurs-wildcard-unbounded.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/occurs-wildcard-unbounded.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-wildcard.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-wildcard.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/occurs-wildcard.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/occurs-wildcard.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/occurs.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/occurs.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/occurs.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/particlesId005.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/particlesId005.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/particlesId005.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/particlesId005.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/particlesId005.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/particlesId005.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/particlesId005.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/particlesId005.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/particlesIe003.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/particlesIe003.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/particlesIe003.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/particlesIe003.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/particlesIg004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/particlesIg004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/particlesIg004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/particlesIg004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/particlesOptimize.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/particlesOptimize.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/particlesOptimize.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/particlesOptimize.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/particlesQ013.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/particlesQ013.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/particlesQ013.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/particlesQ013.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/particlesQ013.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/particlesQ013.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/particlesQ013.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/particlesQ013.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/particlesR005.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/particlesR005.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/particlesR005.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/particlesR005.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/targetNS00101m2.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/targetNS00101m2.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2a.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/targetNS00101m2a.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2a.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/targetNS00101m2a.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963124.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963124.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6964720.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6964720.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/RegexTest_1258.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214/RegexTest_1258.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/RegexTest_1258.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214/RegexTest_1258.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD10.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD10.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD10.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD10.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD11.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD11.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD11.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD11.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD12.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD12.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD12.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD12.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reE9.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reE9.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reE9.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reE9.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6970890.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6970890.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890_1.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6970890_1.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890_1.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6970890_1.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF025.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF025.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF025.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF025.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF037.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF037.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF037.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF037.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF041.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF041.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF041.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF041.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF045.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF045.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF045.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF045.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF049.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF049.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF049.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF049.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug7014246.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug7014246.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/RegexWord.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/RegexWord.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/RegexWord.java rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/RegexWord.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/reZ003.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/reZ003.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/reZ003.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/reZ003.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/reZ003vExc23082309.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/reZ003vExc23082309.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/reZ003vExc23082309.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/reZ003vExc23082309.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/upa01.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/upa01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/upa01.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/upa01.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/upa01.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/upa01.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/tck/upa01.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/tck/upa01.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/test-element.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/test-element.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/test-element.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/test-element.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/test-sequence.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/test-sequence.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/test-sequence.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/test-sequence.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/test.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/test.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/test.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/test.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/toys.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/toys.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/toys.xml rename to test/jaxp/javax/xml/jaxp/unittest/validation/toys.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/toys.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/toys.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/toys.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/toys.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/types.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/types.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/validation/types.xsd rename to test/jaxp/javax/xml/jaxp/unittest/validation/types.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4991857.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java rename to test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4991857.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4991939.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java rename to test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4991939.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992788.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java rename to test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992788.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992793.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java rename to test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992793.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992805.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java rename to test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992805.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java rename to test/jaxp/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/MyClassLoader.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java rename to test/jaxp/javax/xml/jaxp/unittest/xpath/MyClassLoader.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java rename to test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.xml b/test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.xml rename to test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java rename to test/jaxp/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java rename to test/jaxp/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTest.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathTest.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTest.java rename to test/jaxp/javax/xml/jaxp/unittest/xpath/XPathTest.java diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTestBase.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathTestBase.java similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTestBase.java rename to test/jaxp/javax/xml/jaxp/unittest/xpath/XPathTestBase.java diff --git a/jdk/test/Makefile b/test/jdk/Makefile similarity index 100% rename from jdk/test/Makefile rename to test/jdk/Makefile diff --git a/jdk/test/ProblemList.txt b/test/jdk/ProblemList.txt similarity index 100% rename from jdk/test/ProblemList.txt rename to test/jdk/ProblemList.txt diff --git a/jdk/test/TEST.ROOT b/test/jdk/TEST.ROOT similarity index 100% rename from jdk/test/TEST.ROOT rename to test/jdk/TEST.ROOT diff --git a/jdk/test/TEST.groups b/test/jdk/TEST.groups similarity index 100% rename from jdk/test/TEST.groups rename to test/jdk/TEST.groups diff --git a/jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java b/test/jdk/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java similarity index 100% rename from jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java rename to test/jdk/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java diff --git a/jdk/test/com/apple/eawt/TEST.properties b/test/jdk/com/apple/eawt/TEST.properties similarity index 100% rename from jdk/test/com/apple/eawt/TEST.properties rename to test/jdk/com/apple/eawt/TEST.properties diff --git a/jdk/test/com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java b/test/jdk/com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java similarity index 100% rename from jdk/test/com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java rename to test/jdk/com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java diff --git a/jdk/test/com/apple/laf/TEST.properties b/test/jdk/com/apple/laf/TEST.properties similarity index 100% rename from jdk/test/com/apple/laf/TEST.properties rename to test/jdk/com/apple/laf/TEST.properties diff --git a/jdk/test/com/oracle/security/ucrypto/CipherSignNotSupported.java b/test/jdk/com/oracle/security/ucrypto/CipherSignNotSupported.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/CipherSignNotSupported.java rename to test/jdk/com/oracle/security/ucrypto/CipherSignNotSupported.java diff --git a/jdk/test/com/oracle/security/ucrypto/ReadConfInUTF16Env.java b/test/jdk/com/oracle/security/ucrypto/ReadConfInUTF16Env.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/ReadConfInUTF16Env.java rename to test/jdk/com/oracle/security/ucrypto/ReadConfInUTF16Env.java diff --git a/jdk/test/com/oracle/security/ucrypto/ReadConfInUTF16Env.sh b/test/jdk/com/oracle/security/ucrypto/ReadConfInUTF16Env.sh similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/ReadConfInUTF16Env.sh rename to test/jdk/com/oracle/security/ucrypto/ReadConfInUTF16Env.sh diff --git a/jdk/test/com/oracle/security/ucrypto/Test8004873.java b/test/jdk/com/oracle/security/ucrypto/Test8004873.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/Test8004873.java rename to test/jdk/com/oracle/security/ucrypto/Test8004873.java diff --git a/jdk/test/com/oracle/security/ucrypto/TestAES.java b/test/jdk/com/oracle/security/ucrypto/TestAES.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/TestAES.java rename to test/jdk/com/oracle/security/ucrypto/TestAES.java diff --git a/jdk/test/com/oracle/security/ucrypto/TestAlias.java b/test/jdk/com/oracle/security/ucrypto/TestAlias.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/TestAlias.java rename to test/jdk/com/oracle/security/ucrypto/TestAlias.java diff --git a/jdk/test/com/oracle/security/ucrypto/TestCICOWithGCM.java b/test/jdk/com/oracle/security/ucrypto/TestCICOWithGCM.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/TestCICOWithGCM.java rename to test/jdk/com/oracle/security/ucrypto/TestCICOWithGCM.java diff --git a/jdk/test/com/oracle/security/ucrypto/TestCICOWithGCMAndAAD.java b/test/jdk/com/oracle/security/ucrypto/TestCICOWithGCMAndAAD.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/TestCICOWithGCMAndAAD.java rename to test/jdk/com/oracle/security/ucrypto/TestCICOWithGCMAndAAD.java diff --git a/jdk/test/com/oracle/security/ucrypto/TestDigest.java b/test/jdk/com/oracle/security/ucrypto/TestDigest.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/TestDigest.java rename to test/jdk/com/oracle/security/ucrypto/TestDigest.java diff --git a/jdk/test/com/oracle/security/ucrypto/TestGCMKeyAndIvCheck.java b/test/jdk/com/oracle/security/ucrypto/TestGCMKeyAndIvCheck.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/TestGCMKeyAndIvCheck.java rename to test/jdk/com/oracle/security/ucrypto/TestGCMKeyAndIvCheck.java diff --git a/jdk/test/com/oracle/security/ucrypto/TestGCMKeyWrap.java b/test/jdk/com/oracle/security/ucrypto/TestGCMKeyWrap.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/TestGCMKeyWrap.java rename to test/jdk/com/oracle/security/ucrypto/TestGCMKeyWrap.java diff --git a/jdk/test/com/oracle/security/ucrypto/TestGCMWithSBE.java b/test/jdk/com/oracle/security/ucrypto/TestGCMWithSBE.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/TestGCMWithSBE.java rename to test/jdk/com/oracle/security/ucrypto/TestGCMWithSBE.java diff --git a/jdk/test/com/oracle/security/ucrypto/TestKATForGCM.java b/test/jdk/com/oracle/security/ucrypto/TestKATForGCM.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/TestKATForGCM.java rename to test/jdk/com/oracle/security/ucrypto/TestKATForGCM.java diff --git a/jdk/test/com/oracle/security/ucrypto/TestMalformedRSA.java b/test/jdk/com/oracle/security/ucrypto/TestMalformedRSA.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/TestMalformedRSA.java rename to test/jdk/com/oracle/security/ucrypto/TestMalformedRSA.java diff --git a/jdk/test/com/oracle/security/ucrypto/TestRSA.java b/test/jdk/com/oracle/security/ucrypto/TestRSA.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/TestRSA.java rename to test/jdk/com/oracle/security/ucrypto/TestRSA.java diff --git a/jdk/test/com/oracle/security/ucrypto/UcryptoTest.java b/test/jdk/com/oracle/security/ucrypto/UcryptoTest.java similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/UcryptoTest.java rename to test/jdk/com/oracle/security/ucrypto/UcryptoTest.java diff --git a/jdk/test/com/oracle/security/ucrypto/empty.policy b/test/jdk/com/oracle/security/ucrypto/empty.policy similarity index 100% rename from jdk/test/com/oracle/security/ucrypto/empty.policy rename to test/jdk/com/oracle/security/ucrypto/empty.policy diff --git a/jdk/test/com/sun/awt/SecurityWarning/CustomSecurityManager.java b/test/jdk/com/sun/awt/SecurityWarning/CustomSecurityManager.java similarity index 100% rename from jdk/test/com/sun/awt/SecurityWarning/CustomSecurityManager.java rename to test/jdk/com/sun/awt/SecurityWarning/CustomSecurityManager.java diff --git a/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java b/test/jdk/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java similarity index 100% rename from jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java rename to test/jdk/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java diff --git a/jdk/test/com/sun/awt/TEST.properties b/test/jdk/com/sun/awt/TEST.properties similarity index 100% rename from jdk/test/com/sun/awt/TEST.properties rename to test/jdk/com/sun/awt/TEST.properties diff --git a/jdk/test/com/sun/awt/Translucency/WindowOpacity.java b/test/jdk/com/sun/awt/Translucency/WindowOpacity.java similarity index 100% rename from jdk/test/com/sun/awt/Translucency/WindowOpacity.java rename to test/jdk/com/sun/awt/Translucency/WindowOpacity.java diff --git a/jdk/test/com/sun/corba/5036554/JavaBug.java b/test/jdk/com/sun/corba/5036554/JavaBug.java similarity index 100% rename from jdk/test/com/sun/corba/5036554/JavaBug.java rename to test/jdk/com/sun/corba/5036554/JavaBug.java diff --git a/jdk/test/com/sun/corba/5036554/README b/test/jdk/com/sun/corba/5036554/README similarity index 100% rename from jdk/test/com/sun/corba/5036554/README rename to test/jdk/com/sun/corba/5036554/README diff --git a/jdk/test/com/sun/corba/5036554/TestCorbaBug.sh b/test/jdk/com/sun/corba/5036554/TestCorbaBug.sh similarity index 100% rename from jdk/test/com/sun/corba/5036554/TestCorbaBug.sh rename to test/jdk/com/sun/corba/5036554/TestCorbaBug.sh diff --git a/jdk/test/com/sun/corba/5036554/bug.idl b/test/jdk/com/sun/corba/5036554/bug.idl similarity index 100% rename from jdk/test/com/sun/corba/5036554/bug.idl rename to test/jdk/com/sun/corba/5036554/bug.idl diff --git a/jdk/test/com/sun/corba/7130985/CorbaExceptionsCompileTest.java b/test/jdk/com/sun/corba/7130985/CorbaExceptionsCompileTest.java similarity index 100% rename from jdk/test/com/sun/corba/7130985/CorbaExceptionsCompileTest.java rename to test/jdk/com/sun/corba/7130985/CorbaExceptionsCompileTest.java diff --git a/jdk/test/com/sun/corba/7130985/CorbaExceptionsTest.java b/test/jdk/com/sun/corba/7130985/CorbaExceptionsTest.java similarity index 100% rename from jdk/test/com/sun/corba/7130985/CorbaExceptionsTest.java rename to test/jdk/com/sun/corba/7130985/CorbaExceptionsTest.java diff --git a/jdk/test/com/sun/corba/cachedSocket/7056731.sh b/test/jdk/com/sun/corba/cachedSocket/7056731.sh similarity index 100% rename from jdk/test/com/sun/corba/cachedSocket/7056731.sh rename to test/jdk/com/sun/corba/cachedSocket/7056731.sh diff --git a/jdk/test/com/sun/corba/cachedSocket/Hello.idl b/test/jdk/com/sun/corba/cachedSocket/Hello.idl similarity index 100% rename from jdk/test/com/sun/corba/cachedSocket/Hello.idl rename to test/jdk/com/sun/corba/cachedSocket/Hello.idl diff --git a/jdk/test/com/sun/corba/cachedSocket/HelloClient.java b/test/jdk/com/sun/corba/cachedSocket/HelloClient.java similarity index 100% rename from jdk/test/com/sun/corba/cachedSocket/HelloClient.java rename to test/jdk/com/sun/corba/cachedSocket/HelloClient.java diff --git a/jdk/test/com/sun/corba/cachedSocket/HelloServer.java b/test/jdk/com/sun/corba/cachedSocket/HelloServer.java similarity index 100% rename from jdk/test/com/sun/corba/cachedSocket/HelloServer.java rename to test/jdk/com/sun/corba/cachedSocket/HelloServer.java diff --git a/jdk/test/com/sun/corba/se/impl/io/CustomOutputStream.java b/test/jdk/com/sun/corba/se/impl/io/CustomOutputStream.java similarity index 100% rename from jdk/test/com/sun/corba/se/impl/io/CustomOutputStream.java rename to test/jdk/com/sun/corba/se/impl/io/CustomOutputStream.java diff --git a/jdk/test/com/sun/corba/se/impl/io/HookPutFieldsTest.java b/test/jdk/com/sun/corba/se/impl/io/HookPutFieldsTest.java similarity index 100% rename from jdk/test/com/sun/corba/se/impl/io/HookPutFieldsTest.java rename to test/jdk/com/sun/corba/se/impl/io/HookPutFieldsTest.java diff --git a/jdk/test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java b/test/jdk/com/sun/corba/se/impl/orb/SetDefaultORBTest.java similarity index 100% rename from jdk/test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java rename to test/jdk/com/sun/corba/se/impl/orb/SetDefaultORBTest.java diff --git a/jdk/test/com/sun/corba/serialization/ObjectStreamTest$_Echo_Stub.java b/test/jdk/com/sun/corba/serialization/ObjectStreamTest$_Echo_Stub.java similarity index 100% rename from jdk/test/com/sun/corba/serialization/ObjectStreamTest$_Echo_Stub.java rename to test/jdk/com/sun/corba/serialization/ObjectStreamTest$_Echo_Stub.java diff --git a/jdk/test/com/sun/corba/serialization/ObjectStreamTest$_Server_Tie.java b/test/jdk/com/sun/corba/serialization/ObjectStreamTest$_Server_Tie.java similarity index 100% rename from jdk/test/com/sun/corba/serialization/ObjectStreamTest$_Server_Tie.java rename to test/jdk/com/sun/corba/serialization/ObjectStreamTest$_Server_Tie.java diff --git a/jdk/test/com/sun/corba/serialization/ObjectStreamTest.java b/test/jdk/com/sun/corba/serialization/ObjectStreamTest.java similarity index 100% rename from jdk/test/com/sun/corba/serialization/ObjectStreamTest.java rename to test/jdk/com/sun/corba/serialization/ObjectStreamTest.java diff --git a/jdk/test/com/sun/corba/serialization/security.policy b/test/jdk/com/sun/corba/serialization/security.policy similarity index 100% rename from jdk/test/com/sun/corba/serialization/security.policy rename to test/jdk/com/sun/corba/serialization/security.policy diff --git a/jdk/test/com/sun/corba/transport/KeepAliveSockets.java b/test/jdk/com/sun/corba/transport/KeepAliveSockets.java similarity index 100% rename from jdk/test/com/sun/corba/transport/KeepAliveSockets.java rename to test/jdk/com/sun/corba/transport/KeepAliveSockets.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/CICOChainingTest.java b/test/jdk/com/sun/crypto/provider/CICO/CICOChainingTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/CICOChainingTest.java rename to test/jdk/com/sun/crypto/provider/CICO/CICOChainingTest.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/CICODESFuncTest.java b/test/jdk/com/sun/crypto/provider/CICO/CICODESFuncTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/CICODESFuncTest.java rename to test/jdk/com/sun/crypto/provider/CICO/CICODESFuncTest.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/CICOSkipTest.java b/test/jdk/com/sun/crypto/provider/CICO/CICOSkipTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/CICOSkipTest.java rename to test/jdk/com/sun/crypto/provider/CICO/CICOSkipTest.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/PBEFunc/AESPBEWrapper.java b/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/AESPBEWrapper.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/PBEFunc/AESPBEWrapper.java rename to test/jdk/com/sun/crypto/provider/CICO/PBEFunc/AESPBEWrapper.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/PBEFunc/AbstractPBEWrapper.java b/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/AbstractPBEWrapper.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/PBEFunc/AbstractPBEWrapper.java rename to test/jdk/com/sun/crypto/provider/CICO/PBEFunc/AbstractPBEWrapper.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/PBEFunc/CICOPBEFuncTest.java b/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/CICOPBEFuncTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/PBEFunc/CICOPBEFuncTest.java rename to test/jdk/com/sun/crypto/provider/CICO/PBEFunc/CICOPBEFuncTest.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/PBEFunc/CICO_PBE_RW_Test.java b/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/CICO_PBE_RW_Test.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/PBEFunc/CICO_PBE_RW_Test.java rename to test/jdk/com/sun/crypto/provider/CICO/PBEFunc/CICO_PBE_RW_Test.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/PBEFunc/CICO_PBE_SKIP_Test.java b/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/CICO_PBE_SKIP_Test.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/PBEFunc/CICO_PBE_SKIP_Test.java rename to test/jdk/com/sun/crypto/provider/CICO/PBEFunc/CICO_PBE_SKIP_Test.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/PBEFunc/CICO_PBE_Test.java b/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/CICO_PBE_Test.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/PBEFunc/CICO_PBE_Test.java rename to test/jdk/com/sun/crypto/provider/CICO/PBEFunc/CICO_PBE_Test.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/PBEFunc/CipherNCFuncTest.java b/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/CipherNCFuncTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/PBEFunc/CipherNCFuncTest.java rename to test/jdk/com/sun/crypto/provider/CICO/PBEFunc/CipherNCFuncTest.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/PBEFunc/DefaultPBEWrapper.java b/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/DefaultPBEWrapper.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/PBEFunc/DefaultPBEWrapper.java rename to test/jdk/com/sun/crypto/provider/CICO/PBEFunc/DefaultPBEWrapper.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/PBEFunc/PBEAlgorithm.java b/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/PBEAlgorithm.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/PBEFunc/PBEAlgorithm.java rename to test/jdk/com/sun/crypto/provider/CICO/PBEFunc/PBEAlgorithm.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/PBEFunc/PBKDF2Wrapper.java b/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/PBKDF2Wrapper.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/PBEFunc/PBKDF2Wrapper.java rename to test/jdk/com/sun/crypto/provider/CICO/PBEFunc/PBKDF2Wrapper.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/ReadModel.java b/test/jdk/com/sun/crypto/provider/CICO/ReadModel.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/ReadModel.java rename to test/jdk/com/sun/crypto/provider/CICO/ReadModel.java diff --git a/jdk/test/com/sun/crypto/provider/CICO/TestUtilities.java b/test/jdk/com/sun/crypto/provider/CICO/TestUtilities.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/CICO/TestUtilities.java rename to test/jdk/com/sun/crypto/provider/CICO/TestUtilities.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/Encrypt.java b/test/jdk/com/sun/crypto/provider/Cipher/AEAD/Encrypt.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AEAD/Encrypt.java rename to test/jdk/com/sun/crypto/provider/Cipher/AEAD/Encrypt.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/GCMParameterSpecTest.java b/test/jdk/com/sun/crypto/provider/Cipher/AEAD/GCMParameterSpecTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AEAD/GCMParameterSpecTest.java rename to test/jdk/com/sun/crypto/provider/Cipher/AEAD/GCMParameterSpecTest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/Helper.java b/test/jdk/com/sun/crypto/provider/Cipher/AEAD/Helper.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AEAD/Helper.java rename to test/jdk/com/sun/crypto/provider/Cipher/AEAD/Helper.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/KeyWrapper.java b/test/jdk/com/sun/crypto/provider/Cipher/AEAD/KeyWrapper.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AEAD/KeyWrapper.java rename to test/jdk/com/sun/crypto/provider/Cipher/AEAD/KeyWrapper.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/ReadWriteSkip.java b/test/jdk/com/sun/crypto/provider/Cipher/AEAD/ReadWriteSkip.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AEAD/ReadWriteSkip.java rename to test/jdk/com/sun/crypto/provider/Cipher/AEAD/ReadWriteSkip.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/SameBuffer.java b/test/jdk/com/sun/crypto/provider/Cipher/AEAD/SameBuffer.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AEAD/SameBuffer.java rename to test/jdk/com/sun/crypto/provider/Cipher/AEAD/SameBuffer.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/SealedObjectTest.java b/test/jdk/com/sun/crypto/provider/Cipher/AEAD/SealedObjectTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AEAD/SealedObjectTest.java rename to test/jdk/com/sun/crypto/provider/Cipher/AEAD/SealedObjectTest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/WrongAAD.java b/test/jdk/com/sun/crypto/provider/Cipher/AEAD/WrongAAD.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AEAD/WrongAAD.java rename to test/jdk/com/sun/crypto/provider/Cipher/AEAD/WrongAAD.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/CICO.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/CICO.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/CICO.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/CICO.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/CTR.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/CTR.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/CTR.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/CTR.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Padding.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/Padding.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/Padding.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/Padding.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4511676.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/Test4511676.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/Test4511676.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/Test4511676.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4512524.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/Test4512524.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/Test4512524.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/Test4512524.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4512704.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/Test4512704.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/Test4512704.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/Test4512704.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4513830.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/Test4513830.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/Test4513830.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/Test4513830.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4517355.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/Test4517355.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/Test4517355.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/Test4517355.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4626070.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/Test4626070.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/Test4626070.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/Test4626070.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCipher.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCipher.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCipher.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCipher.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/Dynamic.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/Dynamic.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/Dynamic.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/Dynamic.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithDefaultProvider.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithDefaultProvider.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithDefaultProvider.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithDefaultProvider.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/testAES.policy b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/testAES.policy similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/testAES.policy rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/testAES.policy diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCM.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCM.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCM.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCM.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCMAndAAD.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCMAndAAD.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCMAndAAD.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCMAndAAD.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestCopySafe.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestCopySafe.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestCopySafe.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestCopySafe.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestGCMKeyAndIvCheck.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestGCMKeyAndIvCheck.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestGCMKeyAndIvCheck.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestGCMKeyAndIvCheck.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestGHASH.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestGHASH.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestGHASH.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestGHASH.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestISO10126Padding.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestISO10126Padding.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestISO10126Padding.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestISO10126Padding.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VK.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VK.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VK.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VK.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VT.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VT.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VT.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VT.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForGCM.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestKATForGCM.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForGCM.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestKATForGCM.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestNonexpanding.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestNonexpanding.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestNonexpanding.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestNonexpanding.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestSameBuffer.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestSameBuffer.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestSameBuffer.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestSameBuffer.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestShortBuffer.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestShortBuffer.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/AES/TestShortBuffer.java rename to test/jdk/com/sun/crypto/provider/Cipher/AES/TestShortBuffer.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java b/test/jdk/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java rename to test/jdk/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/Blowfish/TestCipherBlowfish.java b/test/jdk/com/sun/crypto/provider/Cipher/Blowfish/TestCipherBlowfish.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/Blowfish/TestCipherBlowfish.java rename to test/jdk/com/sun/crypto/provider/Cipher/Blowfish/TestCipherBlowfish.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/CTR/CounterMode.java b/test/jdk/com/sun/crypto/provider/Cipher/CTR/CounterMode.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/CTR/CounterMode.java rename to test/jdk/com/sun/crypto/provider/Cipher/CTR/CounterMode.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/CTS/CTSMode.java b/test/jdk/com/sun/crypto/provider/Cipher/CTS/CTSMode.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/CTS/CTSMode.java rename to test/jdk/com/sun/crypto/provider/Cipher/CTS/CTSMode.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/DESKeyCleanupTest.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/DESKeyCleanupTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/DESKeyCleanupTest.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/DESKeyCleanupTest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/DESSecretKeySpec.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/DESSecretKeySpec.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/DESSecretKeySpec.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/DESSecretKeySpec.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/DesAPITest.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/DesAPITest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/DesAPITest.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/DesAPITest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/FlushBug.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/FlushBug.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/FlushBug.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/FlushBug.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/KeyWrapping.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/KeyWrapping.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/KeyWrapping.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/KeyWrapping.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/PaddingTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/PaddingTest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/Sealtest.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/Sealtest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/Sealtest.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/Sealtest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/TestCipherDES.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/TestCipherDES.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/TestCipherDES.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/TestCipherDES.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/TestCipherDESede.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/TestCipherDESede.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/TestCipherDESede.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/TestCipherDESede.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/TestUtility.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/TestUtility.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/TestUtility.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/TestUtility.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/TextPKCS5PaddingTest.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/TextPKCS5PaddingTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/TextPKCS5PaddingTest.java rename to test/jdk/com/sun/crypto/provider/Cipher/DES/TextPKCS5PaddingTest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain0.txt b/test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain0.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain0.txt rename to test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain0.txt diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain1.txt b/test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain1.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain1.txt rename to test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain1.txt diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain10.txt b/test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain10.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain10.txt rename to test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain10.txt diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain2.txt b/test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain2.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain2.txt rename to test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain2.txt diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain3.txt b/test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain3.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain3.txt rename to test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain3.txt diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain4.txt b/test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain4.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain4.txt rename to test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain4.txt diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain5.txt b/test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain5.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain5.txt rename to test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain5.txt diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain6.txt b/test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain6.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain6.txt rename to test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain6.txt diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain7.txt b/test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain7.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain7.txt rename to test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain7.txt diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain8.txt b/test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain8.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain8.txt rename to test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain8.txt diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain9.txt b/test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain9.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/DES/inputData/plain9.txt rename to test/jdk/com/sun/crypto/provider/Cipher/DES/inputData/plain9.txt diff --git a/jdk/test/com/sun/crypto/provider/Cipher/JCE/Bugs/4686632/Empty.java b/test/jdk/com/sun/crypto/provider/Cipher/JCE/Bugs/4686632/Empty.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/JCE/Bugs/4686632/Empty.java rename to test/jdk/com/sun/crypto/provider/Cipher/JCE/Bugs/4686632/Empty.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/KeyWrap/NISTWrapKAT.java b/test/jdk/com/sun/crypto/provider/Cipher/KeyWrap/NISTWrapKAT.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/KeyWrap/NISTWrapKAT.java rename to test/jdk/com/sun/crypto/provider/Cipher/KeyWrap/NISTWrapKAT.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/KeyWrap/TestCipherKeyWrapperTest.java b/test/jdk/com/sun/crypto/provider/Cipher/KeyWrap/TestCipherKeyWrapperTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/KeyWrap/TestCipherKeyWrapperTest.java rename to test/jdk/com/sun/crypto/provider/Cipher/KeyWrap/TestCipherKeyWrapperTest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java b/test/jdk/com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java rename to test/jdk/com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/CheckPBEKeySize.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/CheckPBEKeySize.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/CheckPBEKeySize.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/CheckPBEKeySize.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/DecryptWithoutParameters.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/DecryptWithoutParameters.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/DecryptWithoutParameters.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/DecryptWithoutParameters.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/NegativeLength.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/NegativeLength.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/NegativeLength.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/NegativeLength.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBEInvalidParamsTest.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBEInvalidParamsTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBEInvalidParamsTest.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBEInvalidParamsTest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBEKeyCleanupTest.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBEKeyCleanupTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBEKeyCleanupTest.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBEKeyCleanupTest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBEKeyTest.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBEKeyTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBEKeyTest.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBEKeyTest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBEKeysAlgorithmNames.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBEKeysAlgorithmNames.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBEKeysAlgorithmNames.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBEKeysAlgorithmNames.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBEParametersTest.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBEParametersTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBEParametersTest.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBEParametersTest.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBES2Test.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBES2Test.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBES2Test.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBES2Test.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/AESPBEWrapper.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/AESPBEWrapper.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/AESPBEWrapper.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/AESPBEWrapper.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBECipherWrapper.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBECipherWrapper.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBECipherWrapper.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBECipherWrapper.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBESameBuffer.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBESameBuffer.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBESameBuffer.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBESameBuffer.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBEWrapper.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBEWrapper.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBEWrapper.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBEWrapper.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBEWrapperCreator.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBEWrapperCreator.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBEWrapperCreator.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBEWrapperCreator.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBKDF2Wrapper.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBKDF2Wrapper.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBKDF2Wrapper.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBKDF2Wrapper.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESealedObject.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESealedObject.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBESealedObject.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBESealedObject.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBKDF2Translate.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBKDF2Translate.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBKDF2Translate.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBKDF2Translate.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBMacBuffer.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBMacBuffer.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBMacBuffer.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBMacBuffer.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PBMacDoFinalVsUpdate.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PBMacDoFinalVsUpdate.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PBMacDoFinalVsUpdate.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PBMacDoFinalVsUpdate.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Cipher.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PKCS12Cipher.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Cipher.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PKCS12Cipher.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PKCS12CipherKAT.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PKCS12CipherKAT.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PKCS12CipherKAT.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PKCS12CipherKAT.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Oid.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/PKCS12Oid.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Oid.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/PKCS12Oid.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/TestCipherKeyWrapperPBEKey.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/TestCipherKeyWrapperPBEKey.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/TestCipherKeyWrapperPBEKey.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/TestCipherKeyWrapperPBEKey.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/TestCipherPBE.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/TestCipherPBE.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/TestCipherPBE.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/TestCipherPBE.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/PBE/TestCipherPBECons.java b/test/jdk/com/sun/crypto/provider/Cipher/PBE/TestCipherPBECons.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/PBE/TestCipherPBECons.java rename to test/jdk/com/sun/crypto/provider/Cipher/PBE/TestCipherPBECons.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/RC2ArcFour/CipherKAT.java b/test/jdk/com/sun/crypto/provider/Cipher/RC2ArcFour/CipherKAT.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/RC2ArcFour/CipherKAT.java rename to test/jdk/com/sun/crypto/provider/Cipher/RC2ArcFour/CipherKAT.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/RSA/TestOAEP.java b/test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEP.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/RSA/TestOAEP.java rename to test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEP.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPPadding.java b/test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEPPadding.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPPadding.java rename to test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEPPadding.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPParameterSpec.java b/test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEPParameterSpec.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPParameterSpec.java rename to test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEPParameterSpec.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPWithParams.java b/test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEPWithParams.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPWithParams.java rename to test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEPWithParams.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/RSA/TestOAEP_KAT.java b/test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEP_KAT.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/RSA/TestOAEP_KAT.java rename to test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEP_KAT.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/RSA/TestRSA.java b/test/jdk/com/sun/crypto/provider/Cipher/RSA/TestRSA.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/RSA/TestRSA.java rename to test/jdk/com/sun/crypto/provider/Cipher/RSA/TestRSA.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/RSA/oaep-vect.txt b/test/jdk/com/sun/crypto/provider/Cipher/RSA/oaep-vect.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/RSA/oaep-vect.txt rename to test/jdk/com/sun/crypto/provider/Cipher/RSA/oaep-vect.txt diff --git a/jdk/test/com/sun/crypto/provider/Cipher/TestCipher.java b/test/jdk/com/sun/crypto/provider/Cipher/TestCipher.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/TestCipher.java rename to test/jdk/com/sun/crypto/provider/Cipher/TestCipher.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/TextLength/DESCipherWrapper.java b/test/jdk/com/sun/crypto/provider/Cipher/TextLength/DESCipherWrapper.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/TextLength/DESCipherWrapper.java rename to test/jdk/com/sun/crypto/provider/Cipher/TextLength/DESCipherWrapper.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/TextLength/PBECipherWrapper.java b/test/jdk/com/sun/crypto/provider/Cipher/TextLength/PBECipherWrapper.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/TextLength/PBECipherWrapper.java rename to test/jdk/com/sun/crypto/provider/Cipher/TextLength/PBECipherWrapper.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/TextLength/TestCipherTextLength.java b/test/jdk/com/sun/crypto/provider/Cipher/TextLength/TestCipherTextLength.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/TextLength/TestCipherTextLength.java rename to test/jdk/com/sun/crypto/provider/Cipher/TextLength/TestCipherTextLength.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/UTIL/StrongOrUnlimited.java b/test/jdk/com/sun/crypto/provider/Cipher/UTIL/StrongOrUnlimited.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/UTIL/StrongOrUnlimited.java rename to test/jdk/com/sun/crypto/provider/Cipher/UTIL/StrongOrUnlimited.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/UTIL/SunJCEGetInstance.java b/test/jdk/com/sun/crypto/provider/Cipher/UTIL/SunJCEGetInstance.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/UTIL/SunJCEGetInstance.java rename to test/jdk/com/sun/crypto/provider/Cipher/UTIL/SunJCEGetInstance.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java b/test/jdk/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java rename to test/jdk/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHGenSecretKey.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHGenSecretKey.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyAgreement/DHGenSecretKey.java rename to test/jdk/com/sun/crypto/provider/KeyAgreement/DHGenSecretKey.java diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java rename to test/jdk/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java rename to test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java rename to test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java rename to test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyGenSpeed.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyGenSpeed.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyGenSpeed.java rename to test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyGenSpeed.java diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/SameDHKeyStressTest.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/SameDHKeyStressTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyAgreement/SameDHKeyStressTest.java rename to test/jdk/com/sun/crypto/provider/KeyAgreement/SameDHKeyStressTest.java diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/SupportedDHKeys.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/SupportedDHKeys.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyAgreement/SupportedDHKeys.java rename to test/jdk/com/sun/crypto/provider/KeyAgreement/SupportedDHKeys.java diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/SupportedDHParamGens.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/SupportedDHParamGens.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyAgreement/SupportedDHParamGens.java rename to test/jdk/com/sun/crypto/provider/KeyAgreement/SupportedDHParamGens.java diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java rename to test/jdk/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/UnsupportedDHKeys.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/UnsupportedDHKeys.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyAgreement/UnsupportedDHKeys.java rename to test/jdk/com/sun/crypto/provider/KeyAgreement/UnsupportedDHKeys.java diff --git a/jdk/test/com/sun/crypto/provider/KeyFactory/PBKDF2HmacSHA1FactoryTest.java b/test/jdk/com/sun/crypto/provider/KeyFactory/PBKDF2HmacSHA1FactoryTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyFactory/PBKDF2HmacSHA1FactoryTest.java rename to test/jdk/com/sun/crypto/provider/KeyFactory/PBKDF2HmacSHA1FactoryTest.java diff --git a/jdk/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java b/test/jdk/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java rename to test/jdk/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java diff --git a/jdk/test/com/sun/crypto/provider/KeyGenerator/Test4628062.java b/test/jdk/com/sun/crypto/provider/KeyGenerator/Test4628062.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyGenerator/Test4628062.java rename to test/jdk/com/sun/crypto/provider/KeyGenerator/Test4628062.java diff --git a/jdk/test/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java b/test/jdk/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java rename to test/jdk/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java diff --git a/jdk/test/com/sun/crypto/provider/Mac/EmptyByteBufferTest.java b/test/jdk/com/sun/crypto/provider/Mac/EmptyByteBufferTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Mac/EmptyByteBufferTest.java rename to test/jdk/com/sun/crypto/provider/Mac/EmptyByteBufferTest.java diff --git a/jdk/test/com/sun/crypto/provider/Mac/HmacMD5.java b/test/jdk/com/sun/crypto/provider/Mac/HmacMD5.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Mac/HmacMD5.java rename to test/jdk/com/sun/crypto/provider/Mac/HmacMD5.java diff --git a/jdk/test/com/sun/crypto/provider/Mac/HmacPBESHA1.java b/test/jdk/com/sun/crypto/provider/Mac/HmacPBESHA1.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Mac/HmacPBESHA1.java rename to test/jdk/com/sun/crypto/provider/Mac/HmacPBESHA1.java diff --git a/jdk/test/com/sun/crypto/provider/Mac/HmacSHA512.java b/test/jdk/com/sun/crypto/provider/Mac/HmacSHA512.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Mac/HmacSHA512.java rename to test/jdk/com/sun/crypto/provider/Mac/HmacSHA512.java diff --git a/jdk/test/com/sun/crypto/provider/Mac/HmacSaltLengths.java b/test/jdk/com/sun/crypto/provider/Mac/HmacSaltLengths.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Mac/HmacSaltLengths.java rename to test/jdk/com/sun/crypto/provider/Mac/HmacSaltLengths.java diff --git a/jdk/test/com/sun/crypto/provider/Mac/LargeByteBufferTest.java b/test/jdk/com/sun/crypto/provider/Mac/LargeByteBufferTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Mac/LargeByteBufferTest.java rename to test/jdk/com/sun/crypto/provider/Mac/LargeByteBufferTest.java diff --git a/jdk/test/com/sun/crypto/provider/Mac/MacClone.java b/test/jdk/com/sun/crypto/provider/Mac/MacClone.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Mac/MacClone.java rename to test/jdk/com/sun/crypto/provider/Mac/MacClone.java diff --git a/jdk/test/com/sun/crypto/provider/Mac/MacKAT.java b/test/jdk/com/sun/crypto/provider/Mac/MacKAT.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Mac/MacKAT.java rename to test/jdk/com/sun/crypto/provider/Mac/MacKAT.java diff --git a/jdk/test/com/sun/crypto/provider/Mac/MacSameTest.java b/test/jdk/com/sun/crypto/provider/Mac/MacSameTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Mac/MacSameTest.java rename to test/jdk/com/sun/crypto/provider/Mac/MacSameTest.java diff --git a/jdk/test/com/sun/crypto/provider/Mac/NullByteBufferTest.java b/test/jdk/com/sun/crypto/provider/Mac/NullByteBufferTest.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Mac/NullByteBufferTest.java rename to test/jdk/com/sun/crypto/provider/Mac/NullByteBufferTest.java diff --git a/jdk/test/com/sun/crypto/provider/Mac/Utils.java b/test/jdk/com/sun/crypto/provider/Mac/Utils.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/Mac/Utils.java rename to test/jdk/com/sun/crypto/provider/Mac/Utils.java diff --git a/jdk/test/com/sun/crypto/provider/NSASuiteB/TestAESOids.java b/test/jdk/com/sun/crypto/provider/NSASuiteB/TestAESOids.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/NSASuiteB/TestAESOids.java rename to test/jdk/com/sun/crypto/provider/NSASuiteB/TestAESOids.java diff --git a/jdk/test/com/sun/crypto/provider/NSASuiteB/TestAESWrapOids.java b/test/jdk/com/sun/crypto/provider/NSASuiteB/TestAESWrapOids.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/NSASuiteB/TestAESWrapOids.java rename to test/jdk/com/sun/crypto/provider/NSASuiteB/TestAESWrapOids.java diff --git a/jdk/test/com/sun/crypto/provider/NSASuiteB/TestHmacSHAOids.java b/test/jdk/com/sun/crypto/provider/NSASuiteB/TestHmacSHAOids.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/NSASuiteB/TestHmacSHAOids.java rename to test/jdk/com/sun/crypto/provider/NSASuiteB/TestHmacSHAOids.java diff --git a/jdk/test/com/sun/crypto/provider/TLS/TestKeyMaterial.java b/test/jdk/com/sun/crypto/provider/TLS/TestKeyMaterial.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/TLS/TestKeyMaterial.java rename to test/jdk/com/sun/crypto/provider/TLS/TestKeyMaterial.java diff --git a/jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java b/test/jdk/com/sun/crypto/provider/TLS/TestLeadingZeroes.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java rename to test/jdk/com/sun/crypto/provider/TLS/TestLeadingZeroes.java diff --git a/jdk/test/com/sun/crypto/provider/TLS/TestMasterSecret.java b/test/jdk/com/sun/crypto/provider/TLS/TestMasterSecret.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/TLS/TestMasterSecret.java rename to test/jdk/com/sun/crypto/provider/TLS/TestMasterSecret.java diff --git a/jdk/test/com/sun/crypto/provider/TLS/TestPRF.java b/test/jdk/com/sun/crypto/provider/TLS/TestPRF.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/TLS/TestPRF.java rename to test/jdk/com/sun/crypto/provider/TLS/TestPRF.java diff --git a/jdk/test/com/sun/crypto/provider/TLS/TestPRF12.java b/test/jdk/com/sun/crypto/provider/TLS/TestPRF12.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/TLS/TestPRF12.java rename to test/jdk/com/sun/crypto/provider/TLS/TestPRF12.java diff --git a/jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java b/test/jdk/com/sun/crypto/provider/TLS/TestPremaster.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java rename to test/jdk/com/sun/crypto/provider/TLS/TestPremaster.java diff --git a/jdk/test/com/sun/crypto/provider/TLS/Utils.java b/test/jdk/com/sun/crypto/provider/TLS/Utils.java similarity index 100% rename from jdk/test/com/sun/crypto/provider/TLS/Utils.java rename to test/jdk/com/sun/crypto/provider/TLS/Utils.java diff --git a/jdk/test/com/sun/crypto/provider/TLS/keymatdata.txt b/test/jdk/com/sun/crypto/provider/TLS/keymatdata.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/TLS/keymatdata.txt rename to test/jdk/com/sun/crypto/provider/TLS/keymatdata.txt diff --git a/jdk/test/com/sun/crypto/provider/TLS/masterdata.txt b/test/jdk/com/sun/crypto/provider/TLS/masterdata.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/TLS/masterdata.txt rename to test/jdk/com/sun/crypto/provider/TLS/masterdata.txt diff --git a/jdk/test/com/sun/crypto/provider/TLS/prf12data.txt b/test/jdk/com/sun/crypto/provider/TLS/prf12data.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/TLS/prf12data.txt rename to test/jdk/com/sun/crypto/provider/TLS/prf12data.txt diff --git a/jdk/test/com/sun/crypto/provider/TLS/prfdata.txt b/test/jdk/com/sun/crypto/provider/TLS/prfdata.txt similarity index 100% rename from jdk/test/com/sun/crypto/provider/TLS/prfdata.txt rename to test/jdk/com/sun/crypto/provider/TLS/prfdata.txt diff --git a/jdk/test/com/sun/jarsigner/DefaultMethod.java b/test/jdk/com/sun/jarsigner/DefaultMethod.java similarity index 100% rename from jdk/test/com/sun/jarsigner/DefaultMethod.java rename to test/jdk/com/sun/jarsigner/DefaultMethod.java diff --git a/jdk/test/com/sun/java/accessibility/util/8051626/Bug8051626.java b/test/jdk/com/sun/java/accessibility/util/8051626/Bug8051626.java similarity index 100% rename from jdk/test/com/sun/java/accessibility/util/8051626/Bug8051626.java rename to test/jdk/com/sun/java/accessibility/util/8051626/Bug8051626.java diff --git a/jdk/test/com/sun/java/swing/TEST.properties b/test/jdk/com/sun/java/swing/TEST.properties similarity index 100% rename from jdk/test/com/sun/java/swing/TEST.properties rename to test/jdk/com/sun/java/swing/TEST.properties diff --git a/jdk/test/com/sun/java/swing/plaf/gtk/4928019/bug4928019.java b/test/jdk/com/sun/java/swing/plaf/gtk/4928019/bug4928019.java similarity index 100% rename from jdk/test/com/sun/java/swing/plaf/gtk/4928019/bug4928019.java rename to test/jdk/com/sun/java/swing/plaf/gtk/4928019/bug4928019.java diff --git a/jdk/test/com/sun/java/swing/plaf/gtk/Test6635110.java b/test/jdk/com/sun/java/swing/plaf/gtk/Test6635110.java similarity index 100% rename from jdk/test/com/sun/java/swing/plaf/gtk/Test6635110.java rename to test/jdk/com/sun/java/swing/plaf/gtk/Test6635110.java diff --git a/jdk/test/com/sun/java/swing/plaf/gtk/Test6963870.java b/test/jdk/com/sun/java/swing/plaf/gtk/Test6963870.java similarity index 100% rename from jdk/test/com/sun/java/swing/plaf/gtk/Test6963870.java rename to test/jdk/com/sun/java/swing/plaf/gtk/Test6963870.java diff --git a/jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java b/test/jdk/com/sun/java/swing/plaf/windows/8016551/bug8016551.java similarity index 100% rename from jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java rename to test/jdk/com/sun/java/swing/plaf/windows/8016551/bug8016551.java diff --git a/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java b/test/jdk/com/sun/java/swing/plaf/windows/Test6824600.java similarity index 100% rename from jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java rename to test/jdk/com/sun/java/swing/plaf/windows/Test6824600.java diff --git a/jdk/test/com/sun/java/swing/plaf/windows/Test8173145.java b/test/jdk/com/sun/java/swing/plaf/windows/Test8173145.java similarity index 100% rename from jdk/test/com/sun/java/swing/plaf/windows/Test8173145.java rename to test/jdk/com/sun/java/swing/plaf/windows/Test8173145.java diff --git a/jdk/test/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java b/test/jdk/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java similarity index 100% rename from jdk/test/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java rename to test/jdk/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java diff --git a/jdk/test/com/sun/jdi/AcceptTimeout.java b/test/jdk/com/sun/jdi/AcceptTimeout.java similarity index 100% rename from jdk/test/com/sun/jdi/AcceptTimeout.java rename to test/jdk/com/sun/jdi/AcceptTimeout.java diff --git a/jdk/test/com/sun/jdi/AccessSpecifierTest.java b/test/jdk/com/sun/jdi/AccessSpecifierTest.java similarity index 100% rename from jdk/test/com/sun/jdi/AccessSpecifierTest.java rename to test/jdk/com/sun/jdi/AccessSpecifierTest.java diff --git a/jdk/test/com/sun/jdi/AfterThreadDeathTest.java b/test/jdk/com/sun/jdi/AfterThreadDeathTest.java similarity index 100% rename from jdk/test/com/sun/jdi/AfterThreadDeathTest.java rename to test/jdk/com/sun/jdi/AfterThreadDeathTest.java diff --git a/jdk/test/com/sun/jdi/AllLineLocations.java b/test/jdk/com/sun/jdi/AllLineLocations.java similarity index 100% rename from jdk/test/com/sun/jdi/AllLineLocations.java rename to test/jdk/com/sun/jdi/AllLineLocations.java diff --git a/jdk/test/com/sun/jdi/AnyDebuggeeTest.java b/test/jdk/com/sun/jdi/AnyDebuggeeTest.java similarity index 100% rename from jdk/test/com/sun/jdi/AnyDebuggeeTest.java rename to test/jdk/com/sun/jdi/AnyDebuggeeTest.java diff --git a/jdk/test/com/sun/jdi/ArgumentValuesTest.java b/test/jdk/com/sun/jdi/ArgumentValuesTest.java similarity index 100% rename from jdk/test/com/sun/jdi/ArgumentValuesTest.java rename to test/jdk/com/sun/jdi/ArgumentValuesTest.java diff --git a/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh b/test/jdk/com/sun/jdi/ArrayLengthDumpTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh rename to test/jdk/com/sun/jdi/ArrayLengthDumpTest.sh diff --git a/jdk/test/com/sun/jdi/ArrayRangeTest.java b/test/jdk/com/sun/jdi/ArrayRangeTest.java similarity index 100% rename from jdk/test/com/sun/jdi/ArrayRangeTest.java rename to test/jdk/com/sun/jdi/ArrayRangeTest.java diff --git a/jdk/test/com/sun/jdi/BacktraceFieldTest.java b/test/jdk/com/sun/jdi/BacktraceFieldTest.java similarity index 100% rename from jdk/test/com/sun/jdi/BacktraceFieldTest.java rename to test/jdk/com/sun/jdi/BacktraceFieldTest.java diff --git a/jdk/test/com/sun/jdi/BadAgentPath.java b/test/jdk/com/sun/jdi/BadAgentPath.java similarity index 100% rename from jdk/test/com/sun/jdi/BadAgentPath.java rename to test/jdk/com/sun/jdi/BadAgentPath.java diff --git a/jdk/test/com/sun/jdi/BadHandshakeTest.java b/test/jdk/com/sun/jdi/BadHandshakeTest.java similarity index 100% rename from jdk/test/com/sun/jdi/BadHandshakeTest.java rename to test/jdk/com/sun/jdi/BadHandshakeTest.java diff --git a/jdk/test/com/sun/jdi/BasicJDWPConnectionTest.java b/test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java similarity index 100% rename from jdk/test/com/sun/jdi/BasicJDWPConnectionTest.java rename to test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java diff --git a/jdk/test/com/sun/jdi/BreakpointTest.java b/test/jdk/com/sun/jdi/BreakpointTest.java similarity index 100% rename from jdk/test/com/sun/jdi/BreakpointTest.java rename to test/jdk/com/sun/jdi/BreakpointTest.java diff --git a/jdk/test/com/sun/jdi/BreakpointWithFullGC.sh b/test/jdk/com/sun/jdi/BreakpointWithFullGC.sh similarity index 100% rename from jdk/test/com/sun/jdi/BreakpointWithFullGC.sh rename to test/jdk/com/sun/jdi/BreakpointWithFullGC.sh diff --git a/jdk/test/com/sun/jdi/CatchAllTest.sh b/test/jdk/com/sun/jdi/CatchAllTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/CatchAllTest.sh rename to test/jdk/com/sun/jdi/CatchAllTest.sh diff --git a/jdk/test/com/sun/jdi/CatchCaughtTest.sh b/test/jdk/com/sun/jdi/CatchCaughtTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/CatchCaughtTest.sh rename to test/jdk/com/sun/jdi/CatchCaughtTest.sh diff --git a/jdk/test/com/sun/jdi/CatchPatternTest.sh b/test/jdk/com/sun/jdi/CatchPatternTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/CatchPatternTest.sh rename to test/jdk/com/sun/jdi/CatchPatternTest.sh diff --git a/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java b/test/jdk/com/sun/jdi/ClassLoaderClassesTest.java similarity index 100% rename from jdk/test/com/sun/jdi/ClassLoaderClassesTest.java rename to test/jdk/com/sun/jdi/ClassLoaderClassesTest.java diff --git a/jdk/test/com/sun/jdi/ClassLoaderTarg.java b/test/jdk/com/sun/jdi/ClassLoaderTarg.java similarity index 100% rename from jdk/test/com/sun/jdi/ClassLoaderTarg.java rename to test/jdk/com/sun/jdi/ClassLoaderTarg.java diff --git a/jdk/test/com/sun/jdi/ClassesByName.java b/test/jdk/com/sun/jdi/ClassesByName.java similarity index 100% rename from jdk/test/com/sun/jdi/ClassesByName.java rename to test/jdk/com/sun/jdi/ClassesByName.java diff --git a/jdk/test/com/sun/jdi/ClassesByName2Test.java b/test/jdk/com/sun/jdi/ClassesByName2Test.java similarity index 100% rename from jdk/test/com/sun/jdi/ClassesByName2Test.java rename to test/jdk/com/sun/jdi/ClassesByName2Test.java diff --git a/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh b/test/jdk/com/sun/jdi/CommandCommentDelimiter.sh similarity index 100% rename from jdk/test/com/sun/jdi/CommandCommentDelimiter.sh rename to test/jdk/com/sun/jdi/CommandCommentDelimiter.sh diff --git a/jdk/test/com/sun/jdi/CompatibleConnectors.java b/test/jdk/com/sun/jdi/CompatibleConnectors.java similarity index 100% rename from jdk/test/com/sun/jdi/CompatibleConnectors.java rename to test/jdk/com/sun/jdi/CompatibleConnectors.java diff --git a/jdk/test/com/sun/jdi/ConnectedVMs.java b/test/jdk/com/sun/jdi/ConnectedVMs.java similarity index 100% rename from jdk/test/com/sun/jdi/ConnectedVMs.java rename to test/jdk/com/sun/jdi/ConnectedVMs.java diff --git a/jdk/test/com/sun/jdi/ConstantPoolInfo.java b/test/jdk/com/sun/jdi/ConstantPoolInfo.java similarity index 100% rename from jdk/test/com/sun/jdi/ConstantPoolInfo.java rename to test/jdk/com/sun/jdi/ConstantPoolInfo.java diff --git a/jdk/test/com/sun/jdi/ConstantPoolInfoGC.java b/test/jdk/com/sun/jdi/ConstantPoolInfoGC.java similarity index 100% rename from jdk/test/com/sun/jdi/ConstantPoolInfoGC.java rename to test/jdk/com/sun/jdi/ConstantPoolInfoGC.java diff --git a/jdk/test/com/sun/jdi/ControlFlow.java b/test/jdk/com/sun/jdi/ControlFlow.java similarity index 100% rename from jdk/test/com/sun/jdi/ControlFlow.java rename to test/jdk/com/sun/jdi/ControlFlow.java diff --git a/jdk/test/com/sun/jdi/CountEvent.java b/test/jdk/com/sun/jdi/CountEvent.java similarity index 100% rename from jdk/test/com/sun/jdi/CountEvent.java rename to test/jdk/com/sun/jdi/CountEvent.java diff --git a/jdk/test/com/sun/jdi/CountFilterTest.java b/test/jdk/com/sun/jdi/CountFilterTest.java similarity index 100% rename from jdk/test/com/sun/jdi/CountFilterTest.java rename to test/jdk/com/sun/jdi/CountFilterTest.java diff --git a/jdk/test/com/sun/jdi/DataModelTest.java b/test/jdk/com/sun/jdi/DataModelTest.java similarity index 100% rename from jdk/test/com/sun/jdi/DataModelTest.java rename to test/jdk/com/sun/jdi/DataModelTest.java diff --git a/jdk/test/com/sun/jdi/DebuggerThreadTest.java b/test/jdk/com/sun/jdi/DebuggerThreadTest.java similarity index 100% rename from jdk/test/com/sun/jdi/DebuggerThreadTest.java rename to test/jdk/com/sun/jdi/DebuggerThreadTest.java diff --git a/jdk/test/com/sun/jdi/DeferredStepTest.sh b/test/jdk/com/sun/jdi/DeferredStepTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/DeferredStepTest.sh rename to test/jdk/com/sun/jdi/DeferredStepTest.sh diff --git a/jdk/test/com/sun/jdi/DeleteAllBkptsTest.java b/test/jdk/com/sun/jdi/DeleteAllBkptsTest.java similarity index 100% rename from jdk/test/com/sun/jdi/DeleteAllBkptsTest.java rename to test/jdk/com/sun/jdi/DeleteAllBkptsTest.java diff --git a/jdk/test/com/sun/jdi/DeleteEventRequestsTest.java b/test/jdk/com/sun/jdi/DeleteEventRequestsTest.java similarity index 100% rename from jdk/test/com/sun/jdi/DeleteEventRequestsTest.java rename to test/jdk/com/sun/jdi/DeleteEventRequestsTest.java diff --git a/jdk/test/com/sun/jdi/DeoptimizeWalk.sh b/test/jdk/com/sun/jdi/DeoptimizeWalk.sh similarity index 100% rename from jdk/test/com/sun/jdi/DeoptimizeWalk.sh rename to test/jdk/com/sun/jdi/DeoptimizeWalk.sh diff --git a/jdk/test/com/sun/jdi/DoubleAgentTest.java b/test/jdk/com/sun/jdi/DoubleAgentTest.java similarity index 100% rename from jdk/test/com/sun/jdi/DoubleAgentTest.java rename to test/jdk/com/sun/jdi/DoubleAgentTest.java diff --git a/jdk/test/com/sun/jdi/EarlyReturnNegativeTest.java b/test/jdk/com/sun/jdi/EarlyReturnNegativeTest.java similarity index 100% rename from jdk/test/com/sun/jdi/EarlyReturnNegativeTest.java rename to test/jdk/com/sun/jdi/EarlyReturnNegativeTest.java diff --git a/jdk/test/com/sun/jdi/EarlyReturnTest.java b/test/jdk/com/sun/jdi/EarlyReturnTest.java similarity index 100% rename from jdk/test/com/sun/jdi/EarlyReturnTest.java rename to test/jdk/com/sun/jdi/EarlyReturnTest.java diff --git a/jdk/test/com/sun/jdi/EnumTest.java b/test/jdk/com/sun/jdi/EnumTest.java similarity index 100% rename from jdk/test/com/sun/jdi/EnumTest.java rename to test/jdk/com/sun/jdi/EnumTest.java diff --git a/jdk/test/com/sun/jdi/EvalArgs.sh b/test/jdk/com/sun/jdi/EvalArgs.sh similarity index 100% rename from jdk/test/com/sun/jdi/EvalArgs.sh rename to test/jdk/com/sun/jdi/EvalArgs.sh diff --git a/jdk/test/com/sun/jdi/EvalArraysAsList.sh b/test/jdk/com/sun/jdi/EvalArraysAsList.sh similarity index 100% rename from jdk/test/com/sun/jdi/EvalArraysAsList.sh rename to test/jdk/com/sun/jdi/EvalArraysAsList.sh diff --git a/jdk/test/com/sun/jdi/EvalInterfaceStatic.sh b/test/jdk/com/sun/jdi/EvalInterfaceStatic.sh similarity index 100% rename from jdk/test/com/sun/jdi/EvalInterfaceStatic.sh rename to test/jdk/com/sun/jdi/EvalInterfaceStatic.sh diff --git a/jdk/test/com/sun/jdi/EventQueueDisconnectTest.java b/test/jdk/com/sun/jdi/EventQueueDisconnectTest.java similarity index 100% rename from jdk/test/com/sun/jdi/EventQueueDisconnectTest.java rename to test/jdk/com/sun/jdi/EventQueueDisconnectTest.java diff --git a/jdk/test/com/sun/jdi/ExceptionEvents.java b/test/jdk/com/sun/jdi/ExceptionEvents.java similarity index 100% rename from jdk/test/com/sun/jdi/ExceptionEvents.java rename to test/jdk/com/sun/jdi/ExceptionEvents.java diff --git a/jdk/test/com/sun/jdi/ExclusiveBind.java b/test/jdk/com/sun/jdi/ExclusiveBind.java similarity index 100% rename from jdk/test/com/sun/jdi/ExclusiveBind.java rename to test/jdk/com/sun/jdi/ExclusiveBind.java diff --git a/jdk/test/com/sun/jdi/Exit0.java b/test/jdk/com/sun/jdi/Exit0.java similarity index 100% rename from jdk/test/com/sun/jdi/Exit0.java rename to test/jdk/com/sun/jdi/Exit0.java diff --git a/jdk/test/com/sun/jdi/ExpiredRequestDeletionTest.java b/test/jdk/com/sun/jdi/ExpiredRequestDeletionTest.java similarity index 100% rename from jdk/test/com/sun/jdi/ExpiredRequestDeletionTest.java rename to test/jdk/com/sun/jdi/ExpiredRequestDeletionTest.java diff --git a/jdk/test/com/sun/jdi/FetchLocals.java b/test/jdk/com/sun/jdi/FetchLocals.java similarity index 100% rename from jdk/test/com/sun/jdi/FetchLocals.java rename to test/jdk/com/sun/jdi/FetchLocals.java diff --git a/jdk/test/com/sun/jdi/FieldWatchpoints.java b/test/jdk/com/sun/jdi/FieldWatchpoints.java similarity index 100% rename from jdk/test/com/sun/jdi/FieldWatchpoints.java rename to test/jdk/com/sun/jdi/FieldWatchpoints.java diff --git a/jdk/test/com/sun/jdi/FilterMatch.java b/test/jdk/com/sun/jdi/FilterMatch.java similarity index 100% rename from jdk/test/com/sun/jdi/FilterMatch.java rename to test/jdk/com/sun/jdi/FilterMatch.java diff --git a/jdk/test/com/sun/jdi/FilterNoMatch.java b/test/jdk/com/sun/jdi/FilterNoMatch.java similarity index 100% rename from jdk/test/com/sun/jdi/FilterNoMatch.java rename to test/jdk/com/sun/jdi/FilterNoMatch.java diff --git a/jdk/test/com/sun/jdi/FinalLocalsTest.java b/test/jdk/com/sun/jdi/FinalLocalsTest.java similarity index 100% rename from jdk/test/com/sun/jdi/FinalLocalsTest.java rename to test/jdk/com/sun/jdi/FinalLocalsTest.java diff --git a/jdk/test/com/sun/jdi/FinalizerTest.java b/test/jdk/com/sun/jdi/FinalizerTest.java similarity index 100% rename from jdk/test/com/sun/jdi/FinalizerTest.java rename to test/jdk/com/sun/jdi/FinalizerTest.java diff --git a/jdk/test/com/sun/jdi/FramesTest.java b/test/jdk/com/sun/jdi/FramesTest.java similarity index 100% rename from jdk/test/com/sun/jdi/FramesTest.java rename to test/jdk/com/sun/jdi/FramesTest.java diff --git a/jdk/test/com/sun/jdi/GenericsTest.java b/test/jdk/com/sun/jdi/GenericsTest.java similarity index 100% rename from jdk/test/com/sun/jdi/GenericsTest.java rename to test/jdk/com/sun/jdi/GenericsTest.java diff --git a/jdk/test/com/sun/jdi/GetLocalVariables.java b/test/jdk/com/sun/jdi/GetLocalVariables.java similarity index 100% rename from jdk/test/com/sun/jdi/GetLocalVariables.java rename to test/jdk/com/sun/jdi/GetLocalVariables.java diff --git a/jdk/test/com/sun/jdi/GetLocalVariables2Test.java b/test/jdk/com/sun/jdi/GetLocalVariables2Test.java similarity index 100% rename from jdk/test/com/sun/jdi/GetLocalVariables2Test.java rename to test/jdk/com/sun/jdi/GetLocalVariables2Test.java diff --git a/jdk/test/com/sun/jdi/GetLocalVariables3Test.sh b/test/jdk/com/sun/jdi/GetLocalVariables3Test.sh similarity index 100% rename from jdk/test/com/sun/jdi/GetLocalVariables3Test.sh rename to test/jdk/com/sun/jdi/GetLocalVariables3Test.sh diff --git a/jdk/test/com/sun/jdi/GetLocalVariables4Test.sh b/test/jdk/com/sun/jdi/GetLocalVariables4Test.sh similarity index 100% rename from jdk/test/com/sun/jdi/GetLocalVariables4Test.sh rename to test/jdk/com/sun/jdi/GetLocalVariables4Test.sh diff --git a/jdk/test/com/sun/jdi/GetSetLocalTest.java b/test/jdk/com/sun/jdi/GetSetLocalTest.java similarity index 100% rename from jdk/test/com/sun/jdi/GetSetLocalTest.java rename to test/jdk/com/sun/jdi/GetSetLocalTest.java diff --git a/jdk/test/com/sun/jdi/GetUninitializedStringValue.java b/test/jdk/com/sun/jdi/GetUninitializedStringValue.java similarity index 100% rename from jdk/test/com/sun/jdi/GetUninitializedStringValue.java rename to test/jdk/com/sun/jdi/GetUninitializedStringValue.java diff --git a/jdk/test/com/sun/jdi/HelloWorld.java b/test/jdk/com/sun/jdi/HelloWorld.java similarity index 100% rename from jdk/test/com/sun/jdi/HelloWorld.java rename to test/jdk/com/sun/jdi/HelloWorld.java diff --git a/jdk/test/com/sun/jdi/HomeTest.java b/test/jdk/com/sun/jdi/HomeTest.java similarity index 100% rename from jdk/test/com/sun/jdi/HomeTest.java rename to test/jdk/com/sun/jdi/HomeTest.java diff --git a/jdk/test/com/sun/jdi/ImmutableResourceTest.java b/test/jdk/com/sun/jdi/ImmutableResourceTest.java similarity index 100% rename from jdk/test/com/sun/jdi/ImmutableResourceTest.java rename to test/jdk/com/sun/jdi/ImmutableResourceTest.java diff --git a/jdk/test/com/sun/jdi/ImmutableResourceTest.sh b/test/jdk/com/sun/jdi/ImmutableResourceTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/ImmutableResourceTest.sh rename to test/jdk/com/sun/jdi/ImmutableResourceTest.sh diff --git a/jdk/test/com/sun/jdi/InnerTarg.java b/test/jdk/com/sun/jdi/InnerTarg.java similarity index 100% rename from jdk/test/com/sun/jdi/InnerTarg.java rename to test/jdk/com/sun/jdi/InnerTarg.java diff --git a/jdk/test/com/sun/jdi/InstTarg.java b/test/jdk/com/sun/jdi/InstTarg.java similarity index 100% rename from jdk/test/com/sun/jdi/InstTarg.java rename to test/jdk/com/sun/jdi/InstTarg.java diff --git a/jdk/test/com/sun/jdi/InstanceFilter.java b/test/jdk/com/sun/jdi/InstanceFilter.java similarity index 100% rename from jdk/test/com/sun/jdi/InstanceFilter.java rename to test/jdk/com/sun/jdi/InstanceFilter.java diff --git a/jdk/test/com/sun/jdi/InstancesTest.java b/test/jdk/com/sun/jdi/InstancesTest.java similarity index 100% rename from jdk/test/com/sun/jdi/InstancesTest.java rename to test/jdk/com/sun/jdi/InstancesTest.java diff --git a/jdk/test/com/sun/jdi/InterfaceMethodsTest.java b/test/jdk/com/sun/jdi/InterfaceMethodsTest.java similarity index 100% rename from jdk/test/com/sun/jdi/InterfaceMethodsTest.java rename to test/jdk/com/sun/jdi/InterfaceMethodsTest.java diff --git a/jdk/test/com/sun/jdi/InterruptHangTest.java b/test/jdk/com/sun/jdi/InterruptHangTest.java similarity index 100% rename from jdk/test/com/sun/jdi/InterruptHangTest.java rename to test/jdk/com/sun/jdi/InterruptHangTest.java diff --git a/jdk/test/com/sun/jdi/InvokeHangTest.java b/test/jdk/com/sun/jdi/InvokeHangTest.java similarity index 100% rename from jdk/test/com/sun/jdi/InvokeHangTest.java rename to test/jdk/com/sun/jdi/InvokeHangTest.java diff --git a/jdk/test/com/sun/jdi/InvokeTest.java b/test/jdk/com/sun/jdi/InvokeTest.java similarity index 100% rename from jdk/test/com/sun/jdi/InvokeTest.java rename to test/jdk/com/sun/jdi/InvokeTest.java diff --git a/jdk/test/com/sun/jdi/InvokeVarArgs.java b/test/jdk/com/sun/jdi/InvokeVarArgs.java similarity index 100% rename from jdk/test/com/sun/jdi/InvokeVarArgs.java rename to test/jdk/com/sun/jdi/InvokeVarArgs.java diff --git a/jdk/test/com/sun/jdi/JDIScaffold.java b/test/jdk/com/sun/jdi/JDIScaffold.java similarity index 100% rename from jdk/test/com/sun/jdi/JDIScaffold.java rename to test/jdk/com/sun/jdi/JDIScaffold.java diff --git a/jdk/test/com/sun/jdi/JITDebug.java b/test/jdk/com/sun/jdi/JITDebug.java similarity index 100% rename from jdk/test/com/sun/jdi/JITDebug.java rename to test/jdk/com/sun/jdi/JITDebug.java diff --git a/jdk/test/com/sun/jdi/JITDebug.sh b/test/jdk/com/sun/jdi/JITDebug.sh similarity index 100% rename from jdk/test/com/sun/jdi/JITDebug.sh rename to test/jdk/com/sun/jdi/JITDebug.sh diff --git a/jdk/test/com/sun/jdi/Java_gTest.java b/test/jdk/com/sun/jdi/Java_gTest.java similarity index 100% rename from jdk/test/com/sun/jdi/Java_gTest.java rename to test/jdk/com/sun/jdi/Java_gTest.java diff --git a/jdk/test/com/sun/jdi/JdbArgTest.sh b/test/jdk/com/sun/jdi/JdbArgTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/JdbArgTest.sh rename to test/jdk/com/sun/jdi/JdbArgTest.sh diff --git a/jdk/test/com/sun/jdi/JdbExprTest.sh b/test/jdk/com/sun/jdi/JdbExprTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/JdbExprTest.sh rename to test/jdk/com/sun/jdi/JdbExprTest.sh diff --git a/jdk/test/com/sun/jdi/JdbLockTest.sh b/test/jdk/com/sun/jdi/JdbLockTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/JdbLockTest.sh rename to test/jdk/com/sun/jdi/JdbLockTest.sh diff --git a/jdk/test/com/sun/jdi/JdbMethodExitTest.sh b/test/jdk/com/sun/jdi/JdbMethodExitTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/JdbMethodExitTest.sh rename to test/jdk/com/sun/jdi/JdbMethodExitTest.sh diff --git a/jdk/test/com/sun/jdi/JdbMissStep.sh b/test/jdk/com/sun/jdi/JdbMissStep.sh similarity index 100% rename from jdk/test/com/sun/jdi/JdbMissStep.sh rename to test/jdk/com/sun/jdi/JdbMissStep.sh diff --git a/jdk/test/com/sun/jdi/JdbReadTwiceTest.sh b/test/jdk/com/sun/jdi/JdbReadTwiceTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/JdbReadTwiceTest.sh rename to test/jdk/com/sun/jdi/JdbReadTwiceTest.sh diff --git a/jdk/test/com/sun/jdi/JdbVarargsTest.sh b/test/jdk/com/sun/jdi/JdbVarargsTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/JdbVarargsTest.sh rename to test/jdk/com/sun/jdi/JdbVarargsTest.sh diff --git a/jdk/test/com/sun/jdi/LambdaBreakpointTest.java b/test/jdk/com/sun/jdi/LambdaBreakpointTest.java similarity index 100% rename from jdk/test/com/sun/jdi/LambdaBreakpointTest.java rename to test/jdk/com/sun/jdi/LambdaBreakpointTest.java diff --git a/jdk/test/com/sun/jdi/LambdaStepTest.java b/test/jdk/com/sun/jdi/LambdaStepTest.java similarity index 100% rename from jdk/test/com/sun/jdi/LambdaStepTest.java rename to test/jdk/com/sun/jdi/LambdaStepTest.java diff --git a/jdk/test/com/sun/jdi/LaunchCommandLine.java b/test/jdk/com/sun/jdi/LaunchCommandLine.java similarity index 100% rename from jdk/test/com/sun/jdi/LaunchCommandLine.java rename to test/jdk/com/sun/jdi/LaunchCommandLine.java diff --git a/jdk/test/com/sun/jdi/LineNumberInfo.java b/test/jdk/com/sun/jdi/LineNumberInfo.java similarity index 100% rename from jdk/test/com/sun/jdi/LineNumberInfo.java rename to test/jdk/com/sun/jdi/LineNumberInfo.java diff --git a/jdk/test/com/sun/jdi/LineNumberOnBraceTest.java b/test/jdk/com/sun/jdi/LineNumberOnBraceTest.java similarity index 100% rename from jdk/test/com/sun/jdi/LineNumberOnBraceTest.java rename to test/jdk/com/sun/jdi/LineNumberOnBraceTest.java diff --git a/jdk/test/com/sun/jdi/ListenAddress.java b/test/jdk/com/sun/jdi/ListenAddress.java similarity index 100% rename from jdk/test/com/sun/jdi/ListenAddress.java rename to test/jdk/com/sun/jdi/ListenAddress.java diff --git a/jdk/test/com/sun/jdi/LocalVariableEqual.java b/test/jdk/com/sun/jdi/LocalVariableEqual.java similarity index 100% rename from jdk/test/com/sun/jdi/LocalVariableEqual.java rename to test/jdk/com/sun/jdi/LocalVariableEqual.java diff --git a/jdk/test/com/sun/jdi/LocationTest.java b/test/jdk/com/sun/jdi/LocationTest.java similarity index 100% rename from jdk/test/com/sun/jdi/LocationTest.java rename to test/jdk/com/sun/jdi/LocationTest.java diff --git a/jdk/test/com/sun/jdi/MethodCalls.java b/test/jdk/com/sun/jdi/MethodCalls.java similarity index 100% rename from jdk/test/com/sun/jdi/MethodCalls.java rename to test/jdk/com/sun/jdi/MethodCalls.java diff --git a/jdk/test/com/sun/jdi/MethodCallsReflection.java b/test/jdk/com/sun/jdi/MethodCallsReflection.java similarity index 100% rename from jdk/test/com/sun/jdi/MethodCallsReflection.java rename to test/jdk/com/sun/jdi/MethodCallsReflection.java diff --git a/jdk/test/com/sun/jdi/MethodEntryExitEvents.java b/test/jdk/com/sun/jdi/MethodEntryExitEvents.java similarity index 100% rename from jdk/test/com/sun/jdi/MethodEntryExitEvents.java rename to test/jdk/com/sun/jdi/MethodEntryExitEvents.java diff --git a/jdk/test/com/sun/jdi/MethodExitReturnValuesTest.java b/test/jdk/com/sun/jdi/MethodExitReturnValuesTest.java similarity index 100% rename from jdk/test/com/sun/jdi/MethodExitReturnValuesTest.java rename to test/jdk/com/sun/jdi/MethodExitReturnValuesTest.java diff --git a/jdk/test/com/sun/jdi/MixedSuspendTest.sh b/test/jdk/com/sun/jdi/MixedSuspendTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/MixedSuspendTest.sh rename to test/jdk/com/sun/jdi/MixedSuspendTest.sh diff --git a/jdk/test/com/sun/jdi/ModificationWatchpoints.java b/test/jdk/com/sun/jdi/ModificationWatchpoints.java similarity index 100% rename from jdk/test/com/sun/jdi/ModificationWatchpoints.java rename to test/jdk/com/sun/jdi/ModificationWatchpoints.java diff --git a/jdk/test/com/sun/jdi/ModulesTest.java b/test/jdk/com/sun/jdi/ModulesTest.java similarity index 100% rename from jdk/test/com/sun/jdi/ModulesTest.java rename to test/jdk/com/sun/jdi/ModulesTest.java diff --git a/jdk/test/com/sun/jdi/MonitorEventTest.java b/test/jdk/com/sun/jdi/MonitorEventTest.java similarity index 100% rename from jdk/test/com/sun/jdi/MonitorEventTest.java rename to test/jdk/com/sun/jdi/MonitorEventTest.java diff --git a/jdk/test/com/sun/jdi/MonitorFrameInfo.java b/test/jdk/com/sun/jdi/MonitorFrameInfo.java similarity index 100% rename from jdk/test/com/sun/jdi/MonitorFrameInfo.java rename to test/jdk/com/sun/jdi/MonitorFrameInfo.java diff --git a/jdk/test/com/sun/jdi/MultiBreakpointsTest.java b/test/jdk/com/sun/jdi/MultiBreakpointsTest.java similarity index 100% rename from jdk/test/com/sun/jdi/MultiBreakpointsTest.java rename to test/jdk/com/sun/jdi/MultiBreakpointsTest.java diff --git a/jdk/test/com/sun/jdi/NativeInstanceFilter.java b/test/jdk/com/sun/jdi/NativeInstanceFilter.java similarity index 100% rename from jdk/test/com/sun/jdi/NativeInstanceFilter.java rename to test/jdk/com/sun/jdi/NativeInstanceFilter.java diff --git a/jdk/test/com/sun/jdi/NativeInstanceFilterTarg.java b/test/jdk/com/sun/jdi/NativeInstanceFilterTarg.java similarity index 100% rename from jdk/test/com/sun/jdi/NativeInstanceFilterTarg.java rename to test/jdk/com/sun/jdi/NativeInstanceFilterTarg.java diff --git a/jdk/test/com/sun/jdi/NewInstanceTest.java b/test/jdk/com/sun/jdi/NewInstanceTest.java similarity index 100% rename from jdk/test/com/sun/jdi/NewInstanceTest.java rename to test/jdk/com/sun/jdi/NewInstanceTest.java diff --git a/jdk/test/com/sun/jdi/NoLaunchOptionTest.java b/test/jdk/com/sun/jdi/NoLaunchOptionTest.java similarity index 100% rename from jdk/test/com/sun/jdi/NoLaunchOptionTest.java rename to test/jdk/com/sun/jdi/NoLaunchOptionTest.java diff --git a/jdk/test/com/sun/jdi/NoLocInfoTest.java b/test/jdk/com/sun/jdi/NoLocInfoTest.java similarity index 100% rename from jdk/test/com/sun/jdi/NoLocInfoTest.java rename to test/jdk/com/sun/jdi/NoLocInfoTest.java diff --git a/jdk/test/com/sun/jdi/NotAField.sh b/test/jdk/com/sun/jdi/NotAField.sh similarity index 100% rename from jdk/test/com/sun/jdi/NotAField.sh rename to test/jdk/com/sun/jdi/NotAField.sh diff --git a/jdk/test/com/sun/jdi/NullLocalVariable.sh b/test/jdk/com/sun/jdi/NullLocalVariable.sh similarity index 100% rename from jdk/test/com/sun/jdi/NullLocalVariable.sh rename to test/jdk/com/sun/jdi/NullLocalVariable.sh diff --git a/jdk/test/com/sun/jdi/NullThreadGroupNameTest.java b/test/jdk/com/sun/jdi/NullThreadGroupNameTest.java similarity index 100% rename from jdk/test/com/sun/jdi/NullThreadGroupNameTest.java rename to test/jdk/com/sun/jdi/NullThreadGroupNameTest.java diff --git a/jdk/test/com/sun/jdi/OnThrowTarget.java b/test/jdk/com/sun/jdi/OnThrowTarget.java similarity index 100% rename from jdk/test/com/sun/jdi/OnThrowTarget.java rename to test/jdk/com/sun/jdi/OnThrowTarget.java diff --git a/jdk/test/com/sun/jdi/OnThrowTest.java b/test/jdk/com/sun/jdi/OnThrowTest.java similarity index 100% rename from jdk/test/com/sun/jdi/OnThrowTest.java rename to test/jdk/com/sun/jdi/OnThrowTest.java diff --git a/jdk/test/com/sun/jdi/OomDebugTest.java b/test/jdk/com/sun/jdi/OomDebugTest.java similarity index 100% rename from jdk/test/com/sun/jdi/OomDebugTest.java rename to test/jdk/com/sun/jdi/OomDebugTest.java diff --git a/jdk/test/com/sun/jdi/OptionTest.java b/test/jdk/com/sun/jdi/OptionTest.java similarity index 100% rename from jdk/test/com/sun/jdi/OptionTest.java rename to test/jdk/com/sun/jdi/OptionTest.java diff --git a/jdk/test/com/sun/jdi/PopAndInvokeTest.java b/test/jdk/com/sun/jdi/PopAndInvokeTest.java similarity index 100% rename from jdk/test/com/sun/jdi/PopAndInvokeTest.java rename to test/jdk/com/sun/jdi/PopAndInvokeTest.java diff --git a/jdk/test/com/sun/jdi/PopAndStepTest.java b/test/jdk/com/sun/jdi/PopAndStepTest.java similarity index 100% rename from jdk/test/com/sun/jdi/PopAndStepTest.java rename to test/jdk/com/sun/jdi/PopAndStepTest.java diff --git a/jdk/test/com/sun/jdi/PopAsynchronousTest.java b/test/jdk/com/sun/jdi/PopAsynchronousTest.java similarity index 100% rename from jdk/test/com/sun/jdi/PopAsynchronousTest.java rename to test/jdk/com/sun/jdi/PopAsynchronousTest.java diff --git a/jdk/test/com/sun/jdi/PopSynchronousTest.java b/test/jdk/com/sun/jdi/PopSynchronousTest.java similarity index 100% rename from jdk/test/com/sun/jdi/PopSynchronousTest.java rename to test/jdk/com/sun/jdi/PopSynchronousTest.java diff --git a/jdk/test/com/sun/jdi/PrivateTransportTest.sh b/test/jdk/com/sun/jdi/PrivateTransportTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/PrivateTransportTest.sh rename to test/jdk/com/sun/jdi/PrivateTransportTest.sh diff --git a/jdk/test/com/sun/jdi/ProcessAttachTest.java b/test/jdk/com/sun/jdi/ProcessAttachTest.java similarity index 100% rename from jdk/test/com/sun/jdi/ProcessAttachTest.java rename to test/jdk/com/sun/jdi/ProcessAttachTest.java diff --git a/jdk/test/com/sun/jdi/Redefine-g.sh b/test/jdk/com/sun/jdi/Redefine-g.sh similarity index 100% rename from jdk/test/com/sun/jdi/Redefine-g.sh rename to test/jdk/com/sun/jdi/Redefine-g.sh diff --git a/jdk/test/com/sun/jdi/RedefineAbstractClass.sh b/test/jdk/com/sun/jdi/RedefineAbstractClass.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineAbstractClass.sh rename to test/jdk/com/sun/jdi/RedefineAbstractClass.sh diff --git a/jdk/test/com/sun/jdi/RedefineAddPrivateMethod.sh b/test/jdk/com/sun/jdi/RedefineAddPrivateMethod.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineAddPrivateMethod.sh rename to test/jdk/com/sun/jdi/RedefineAddPrivateMethod.sh diff --git a/jdk/test/com/sun/jdi/RedefineAnnotation.sh b/test/jdk/com/sun/jdi/RedefineAnnotation.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineAnnotation.sh rename to test/jdk/com/sun/jdi/RedefineAnnotation.sh diff --git a/jdk/test/com/sun/jdi/RedefineChangeClassOrder.sh b/test/jdk/com/sun/jdi/RedefineChangeClassOrder.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineChangeClassOrder.sh rename to test/jdk/com/sun/jdi/RedefineChangeClassOrder.sh diff --git a/jdk/test/com/sun/jdi/RedefineClasses.sh b/test/jdk/com/sun/jdi/RedefineClasses.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineClasses.sh rename to test/jdk/com/sun/jdi/RedefineClasses.sh diff --git a/jdk/test/com/sun/jdi/RedefineClearBreakpoint.sh b/test/jdk/com/sun/jdi/RedefineClearBreakpoint.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineClearBreakpoint.sh rename to test/jdk/com/sun/jdi/RedefineClearBreakpoint.sh diff --git a/jdk/test/com/sun/jdi/RedefineCrossEvent.java b/test/jdk/com/sun/jdi/RedefineCrossEvent.java similarity index 100% rename from jdk/test/com/sun/jdi/RedefineCrossEvent.java rename to test/jdk/com/sun/jdi/RedefineCrossEvent.java diff --git a/jdk/test/com/sun/jdi/RedefineCrossStart.java b/test/jdk/com/sun/jdi/RedefineCrossStart.java similarity index 100% rename from jdk/test/com/sun/jdi/RedefineCrossStart.java rename to test/jdk/com/sun/jdi/RedefineCrossStart.java diff --git a/jdk/test/com/sun/jdi/RedefineException.sh b/test/jdk/com/sun/jdi/RedefineException.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineException.sh rename to test/jdk/com/sun/jdi/RedefineException.sh diff --git a/jdk/test/com/sun/jdi/RedefineFinal.sh b/test/jdk/com/sun/jdi/RedefineFinal.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineFinal.sh rename to test/jdk/com/sun/jdi/RedefineFinal.sh diff --git a/jdk/test/com/sun/jdi/RedefineImplementor.sh b/test/jdk/com/sun/jdi/RedefineImplementor.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineImplementor.sh rename to test/jdk/com/sun/jdi/RedefineImplementor.sh diff --git a/jdk/test/com/sun/jdi/RedefineIntConstantToLong.sh b/test/jdk/com/sun/jdi/RedefineIntConstantToLong.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineIntConstantToLong.sh rename to test/jdk/com/sun/jdi/RedefineIntConstantToLong.sh diff --git a/jdk/test/com/sun/jdi/RedefineMulti.sh b/test/jdk/com/sun/jdi/RedefineMulti.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineMulti.sh rename to test/jdk/com/sun/jdi/RedefineMulti.sh diff --git a/jdk/test/com/sun/jdi/RedefinePop.sh b/test/jdk/com/sun/jdi/RedefinePop.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefinePop.sh rename to test/jdk/com/sun/jdi/RedefinePop.sh diff --git a/jdk/test/com/sun/jdi/RedefineStep.sh b/test/jdk/com/sun/jdi/RedefineStep.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineStep.sh rename to test/jdk/com/sun/jdi/RedefineStep.sh diff --git a/jdk/test/com/sun/jdi/RedefineTTYLineNumber.sh b/test/jdk/com/sun/jdi/RedefineTTYLineNumber.sh similarity index 100% rename from jdk/test/com/sun/jdi/RedefineTTYLineNumber.sh rename to test/jdk/com/sun/jdi/RedefineTTYLineNumber.sh diff --git a/jdk/test/com/sun/jdi/RefTypes.java b/test/jdk/com/sun/jdi/RefTypes.java similarity index 100% rename from jdk/test/com/sun/jdi/RefTypes.java rename to test/jdk/com/sun/jdi/RefTypes.java diff --git a/jdk/test/com/sun/jdi/ReferrersTest.java b/test/jdk/com/sun/jdi/ReferrersTest.java similarity index 100% rename from jdk/test/com/sun/jdi/ReferrersTest.java rename to test/jdk/com/sun/jdi/ReferrersTest.java diff --git a/jdk/test/com/sun/jdi/RepStep.java b/test/jdk/com/sun/jdi/RepStep.java similarity index 100% rename from jdk/test/com/sun/jdi/RepStep.java rename to test/jdk/com/sun/jdi/RepStep.java diff --git a/jdk/test/com/sun/jdi/RepStepTarg.java b/test/jdk/com/sun/jdi/RepStepTarg.java similarity index 100% rename from jdk/test/com/sun/jdi/RepStepTarg.java rename to test/jdk/com/sun/jdi/RepStepTarg.java diff --git a/jdk/test/com/sun/jdi/RequestReflectionTest.java b/test/jdk/com/sun/jdi/RequestReflectionTest.java similarity index 100% rename from jdk/test/com/sun/jdi/RequestReflectionTest.java rename to test/jdk/com/sun/jdi/RequestReflectionTest.java diff --git a/jdk/test/com/sun/jdi/ResumeOneThreadTest.java b/test/jdk/com/sun/jdi/ResumeOneThreadTest.java similarity index 100% rename from jdk/test/com/sun/jdi/ResumeOneThreadTest.java rename to test/jdk/com/sun/jdi/ResumeOneThreadTest.java diff --git a/jdk/test/com/sun/jdi/RunToExit.java b/test/jdk/com/sun/jdi/RunToExit.java similarity index 100% rename from jdk/test/com/sun/jdi/RunToExit.java rename to test/jdk/com/sun/jdi/RunToExit.java diff --git a/jdk/test/com/sun/jdi/SDENullTest.java b/test/jdk/com/sun/jdi/SDENullTest.java similarity index 100% rename from jdk/test/com/sun/jdi/SDENullTest.java rename to test/jdk/com/sun/jdi/SDENullTest.java diff --git a/jdk/test/com/sun/jdi/ShellScaffold.sh b/test/jdk/com/sun/jdi/ShellScaffold.sh similarity index 100% rename from jdk/test/com/sun/jdi/ShellScaffold.sh rename to test/jdk/com/sun/jdi/ShellScaffold.sh diff --git a/jdk/test/com/sun/jdi/SimulResumerTest.java b/test/jdk/com/sun/jdi/SimulResumerTest.java similarity index 100% rename from jdk/test/com/sun/jdi/SimulResumerTest.java rename to test/jdk/com/sun/jdi/SimulResumerTest.java diff --git a/jdk/test/com/sun/jdi/SourceNameFilterTest.java b/test/jdk/com/sun/jdi/SourceNameFilterTest.java similarity index 100% rename from jdk/test/com/sun/jdi/SourceNameFilterTest.java rename to test/jdk/com/sun/jdi/SourceNameFilterTest.java diff --git a/jdk/test/com/sun/jdi/StepTest.java b/test/jdk/com/sun/jdi/StepTest.java similarity index 100% rename from jdk/test/com/sun/jdi/StepTest.java rename to test/jdk/com/sun/jdi/StepTest.java diff --git a/jdk/test/com/sun/jdi/StringConvertTest.sh b/test/jdk/com/sun/jdi/StringConvertTest.sh similarity index 100% rename from jdk/test/com/sun/jdi/StringConvertTest.sh rename to test/jdk/com/sun/jdi/StringConvertTest.sh diff --git a/jdk/test/com/sun/jdi/SunBootClassPathEmptyTest.java b/test/jdk/com/sun/jdi/SunBootClassPathEmptyTest.java similarity index 100% rename from jdk/test/com/sun/jdi/SunBootClassPathEmptyTest.java rename to test/jdk/com/sun/jdi/SunBootClassPathEmptyTest.java diff --git a/jdk/test/com/sun/jdi/SuspendNoFlagTest.java b/test/jdk/com/sun/jdi/SuspendNoFlagTest.java similarity index 100% rename from jdk/test/com/sun/jdi/SuspendNoFlagTest.java rename to test/jdk/com/sun/jdi/SuspendNoFlagTest.java diff --git a/jdk/test/com/sun/jdi/SuspendThreadTest.java b/test/jdk/com/sun/jdi/SuspendThreadTest.java similarity index 100% rename from jdk/test/com/sun/jdi/SuspendThreadTest.java rename to test/jdk/com/sun/jdi/SuspendThreadTest.java diff --git a/jdk/test/com/sun/jdi/TEST.properties b/test/jdk/com/sun/jdi/TEST.properties similarity index 100% rename from jdk/test/com/sun/jdi/TEST.properties rename to test/jdk/com/sun/jdi/TEST.properties diff --git a/jdk/test/com/sun/jdi/TargetAdapter.java b/test/jdk/com/sun/jdi/TargetAdapter.java similarity index 100% rename from jdk/test/com/sun/jdi/TargetAdapter.java rename to test/jdk/com/sun/jdi/TargetAdapter.java diff --git a/jdk/test/com/sun/jdi/TargetListener.java b/test/jdk/com/sun/jdi/TargetListener.java similarity index 100% rename from jdk/test/com/sun/jdi/TargetListener.java rename to test/jdk/com/sun/jdi/TargetListener.java diff --git a/jdk/test/com/sun/jdi/TemplateTest.java b/test/jdk/com/sun/jdi/TemplateTest.java similarity index 100% rename from jdk/test/com/sun/jdi/TemplateTest.java rename to test/jdk/com/sun/jdi/TemplateTest.java diff --git a/jdk/test/com/sun/jdi/TestClass.java b/test/jdk/com/sun/jdi/TestClass.java similarity index 100% rename from jdk/test/com/sun/jdi/TestClass.java rename to test/jdk/com/sun/jdi/TestClass.java diff --git a/jdk/test/com/sun/jdi/TestScaffold.java b/test/jdk/com/sun/jdi/TestScaffold.java similarity index 100% rename from jdk/test/com/sun/jdi/TestScaffold.java rename to test/jdk/com/sun/jdi/TestScaffold.java diff --git a/jdk/test/com/sun/jdi/ThreadGroupTest.java b/test/jdk/com/sun/jdi/ThreadGroupTest.java similarity index 100% rename from jdk/test/com/sun/jdi/ThreadGroupTest.java rename to test/jdk/com/sun/jdi/ThreadGroupTest.java diff --git a/jdk/test/com/sun/jdi/TwoThreadsTest.java b/test/jdk/com/sun/jdi/TwoThreadsTest.java similarity index 100% rename from jdk/test/com/sun/jdi/TwoThreadsTest.java rename to test/jdk/com/sun/jdi/TwoThreadsTest.java diff --git a/jdk/test/com/sun/jdi/UTF8Test.java b/test/jdk/com/sun/jdi/UTF8Test.java similarity index 100% rename from jdk/test/com/sun/jdi/UTF8Test.java rename to test/jdk/com/sun/jdi/UTF8Test.java diff --git a/jdk/test/com/sun/jdi/Unload1Targ.java b/test/jdk/com/sun/jdi/Unload1Targ.java similarity index 100% rename from jdk/test/com/sun/jdi/Unload1Targ.java rename to test/jdk/com/sun/jdi/Unload1Targ.java diff --git a/jdk/test/com/sun/jdi/Unload2Targ.java b/test/jdk/com/sun/jdi/Unload2Targ.java similarity index 100% rename from jdk/test/com/sun/jdi/Unload2Targ.java rename to test/jdk/com/sun/jdi/Unload2Targ.java diff --git a/jdk/test/com/sun/jdi/UnloadEventTarg.java b/test/jdk/com/sun/jdi/UnloadEventTarg.java similarity index 100% rename from jdk/test/com/sun/jdi/UnloadEventTarg.java rename to test/jdk/com/sun/jdi/UnloadEventTarg.java diff --git a/jdk/test/com/sun/jdi/UnpreparedByName.java b/test/jdk/com/sun/jdi/UnpreparedByName.java similarity index 100% rename from jdk/test/com/sun/jdi/UnpreparedByName.java rename to test/jdk/com/sun/jdi/UnpreparedByName.java diff --git a/jdk/test/com/sun/jdi/UnpreparedClasses.java b/test/jdk/com/sun/jdi/UnpreparedClasses.java similarity index 100% rename from jdk/test/com/sun/jdi/UnpreparedClasses.java rename to test/jdk/com/sun/jdi/UnpreparedClasses.java diff --git a/jdk/test/com/sun/jdi/VMConnection.java b/test/jdk/com/sun/jdi/VMConnection.java similarity index 100% rename from jdk/test/com/sun/jdi/VMConnection.java rename to test/jdk/com/sun/jdi/VMConnection.java diff --git a/jdk/test/com/sun/jdi/VMDeathLastTest.java b/test/jdk/com/sun/jdi/VMDeathLastTest.java similarity index 100% rename from jdk/test/com/sun/jdi/VMDeathLastTest.java rename to test/jdk/com/sun/jdi/VMDeathLastTest.java diff --git a/jdk/test/com/sun/jdi/VMDeathRequestTest.java b/test/jdk/com/sun/jdi/VMDeathRequestTest.java similarity index 100% rename from jdk/test/com/sun/jdi/VMDeathRequestTest.java rename to test/jdk/com/sun/jdi/VMDeathRequestTest.java diff --git a/jdk/test/com/sun/jdi/VarargsTest.java b/test/jdk/com/sun/jdi/VarargsTest.java similarity index 100% rename from jdk/test/com/sun/jdi/VarargsTest.java rename to test/jdk/com/sun/jdi/VarargsTest.java diff --git a/jdk/test/com/sun/jdi/Vars.java b/test/jdk/com/sun/jdi/Vars.java similarity index 100% rename from jdk/test/com/sun/jdi/Vars.java rename to test/jdk/com/sun/jdi/Vars.java diff --git a/jdk/test/com/sun/jdi/VisibleMethods.java b/test/jdk/com/sun/jdi/VisibleMethods.java similarity index 100% rename from jdk/test/com/sun/jdi/VisibleMethods.java rename to test/jdk/com/sun/jdi/VisibleMethods.java diff --git a/jdk/test/com/sun/jdi/WatchFramePop.sh b/test/jdk/com/sun/jdi/WatchFramePop.sh similarity index 100% rename from jdk/test/com/sun/jdi/WatchFramePop.sh rename to test/jdk/com/sun/jdi/WatchFramePop.sh diff --git a/jdk/test/com/sun/jdi/ZZZcleanup.sh b/test/jdk/com/sun/jdi/ZZZcleanup.sh similarity index 100% rename from jdk/test/com/sun/jdi/ZZZcleanup.sh rename to test/jdk/com/sun/jdi/ZZZcleanup.sh diff --git a/jdk/test/com/sun/jdi/cds/CDSBreakpointTest.java b/test/jdk/com/sun/jdi/cds/CDSBreakpointTest.java similarity index 100% rename from jdk/test/com/sun/jdi/cds/CDSBreakpointTest.java rename to test/jdk/com/sun/jdi/cds/CDSBreakpointTest.java diff --git a/jdk/test/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java b/test/jdk/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java similarity index 100% rename from jdk/test/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java rename to test/jdk/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java diff --git a/jdk/test/com/sun/jdi/cds/CDSFieldWatchpoints.java b/test/jdk/com/sun/jdi/cds/CDSFieldWatchpoints.java similarity index 100% rename from jdk/test/com/sun/jdi/cds/CDSFieldWatchpoints.java rename to test/jdk/com/sun/jdi/cds/CDSFieldWatchpoints.java diff --git a/jdk/test/com/sun/jdi/cds/CDSJDITest.java b/test/jdk/com/sun/jdi/cds/CDSJDITest.java similarity index 100% rename from jdk/test/com/sun/jdi/cds/CDSJDITest.java rename to test/jdk/com/sun/jdi/cds/CDSJDITest.java diff --git a/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java b/test/jdk/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java similarity index 100% rename from jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java rename to test/jdk/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java diff --git a/jdk/test/com/sun/jdi/connect/spi/Foo.java b/test/jdk/com/sun/jdi/connect/spi/Foo.java similarity index 100% rename from jdk/test/com/sun/jdi/connect/spi/Foo.java rename to test/jdk/com/sun/jdi/connect/spi/Foo.java diff --git a/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java b/test/jdk/com/sun/jdi/connect/spi/GeneratedConnectors.java similarity index 100% rename from jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java rename to test/jdk/com/sun/jdi/connect/spi/GeneratedConnectors.java diff --git a/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.java b/test/jdk/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.java similarity index 100% rename from jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.java rename to test/jdk/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.java diff --git a/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh b/test/jdk/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh similarity index 100% rename from jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh rename to test/jdk/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh diff --git a/jdk/test/com/sun/jdi/connect/spi/ListConnectors.java b/test/jdk/com/sun/jdi/connect/spi/ListConnectors.java similarity index 100% rename from jdk/test/com/sun/jdi/connect/spi/ListConnectors.java rename to test/jdk/com/sun/jdi/connect/spi/ListConnectors.java diff --git a/jdk/test/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.Connector b/test/jdk/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.Connector similarity index 100% rename from jdk/test/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.Connector rename to test/jdk/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.Connector diff --git a/jdk/test/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.spi.TransportService b/test/jdk/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.spi.TransportService similarity index 100% rename from jdk/test/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.spi.TransportService rename to test/jdk/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.spi.TransportService diff --git a/jdk/test/com/sun/jdi/connect/spi/NullTransportService.java b/test/jdk/com/sun/jdi/connect/spi/NullTransportService.java similarity index 100% rename from jdk/test/com/sun/jdi/connect/spi/NullTransportService.java rename to test/jdk/com/sun/jdi/connect/spi/NullTransportService.java diff --git a/jdk/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java b/test/jdk/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java similarity index 100% rename from jdk/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java rename to test/jdk/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java diff --git a/jdk/test/com/sun/jdi/redefine/Different_RedefineSubTarg.java b/test/jdk/com/sun/jdi/redefine/Different_RedefineSubTarg.java similarity index 100% rename from jdk/test/com/sun/jdi/redefine/Different_RedefineSubTarg.java rename to test/jdk/com/sun/jdi/redefine/Different_RedefineSubTarg.java diff --git a/jdk/test/com/sun/jdi/redefine/RedefineSetUp.sh b/test/jdk/com/sun/jdi/redefine/RedefineSetUp.sh similarity index 100% rename from jdk/test/com/sun/jdi/redefine/RedefineSetUp.sh rename to test/jdk/com/sun/jdi/redefine/RedefineSetUp.sh diff --git a/jdk/test/com/sun/jdi/redefine/RedefineSubTarg.java b/test/jdk/com/sun/jdi/redefine/RedefineSubTarg.java similarity index 100% rename from jdk/test/com/sun/jdi/redefine/RedefineSubTarg.java rename to test/jdk/com/sun/jdi/redefine/RedefineSubTarg.java diff --git a/jdk/test/com/sun/jdi/redefine/RedefineTest.java b/test/jdk/com/sun/jdi/redefine/RedefineTest.java similarity index 100% rename from jdk/test/com/sun/jdi/redefine/RedefineTest.java rename to test/jdk/com/sun/jdi/redefine/RedefineTest.java diff --git a/jdk/test/com/sun/jdi/redefine/SchemaChange_RedefineSubTarg.java b/test/jdk/com/sun/jdi/redefine/SchemaChange_RedefineSubTarg.java similarity index 100% rename from jdk/test/com/sun/jdi/redefine/SchemaChange_RedefineSubTarg.java rename to test/jdk/com/sun/jdi/redefine/SchemaChange_RedefineSubTarg.java diff --git a/jdk/test/com/sun/jdi/redefineMethod/Different_RedefineSubTarg.java b/test/jdk/com/sun/jdi/redefineMethod/Different_RedefineSubTarg.java similarity index 100% rename from jdk/test/com/sun/jdi/redefineMethod/Different_RedefineSubTarg.java rename to test/jdk/com/sun/jdi/redefineMethod/Different_RedefineSubTarg.java diff --git a/jdk/test/com/sun/jdi/redefineMethod/RedefineSetUp.sh b/test/jdk/com/sun/jdi/redefineMethod/RedefineSetUp.sh similarity index 100% rename from jdk/test/com/sun/jdi/redefineMethod/RedefineSetUp.sh rename to test/jdk/com/sun/jdi/redefineMethod/RedefineSetUp.sh diff --git a/jdk/test/com/sun/jdi/redefineMethod/RedefineSubTarg.java b/test/jdk/com/sun/jdi/redefineMethod/RedefineSubTarg.java similarity index 100% rename from jdk/test/com/sun/jdi/redefineMethod/RedefineSubTarg.java rename to test/jdk/com/sun/jdi/redefineMethod/RedefineSubTarg.java diff --git a/jdk/test/com/sun/jdi/redefineMethod/RedefineTest.java b/test/jdk/com/sun/jdi/redefineMethod/RedefineTest.java similarity index 100% rename from jdk/test/com/sun/jdi/redefineMethod/RedefineTest.java rename to test/jdk/com/sun/jdi/redefineMethod/RedefineTest.java diff --git a/jdk/test/com/sun/jdi/sde/FilterMangleTest.java b/test/jdk/com/sun/jdi/sde/FilterMangleTest.java similarity index 100% rename from jdk/test/com/sun/jdi/sde/FilterMangleTest.java rename to test/jdk/com/sun/jdi/sde/FilterMangleTest.java diff --git a/jdk/test/com/sun/jdi/sde/HelloWorld.java b/test/jdk/com/sun/jdi/sde/HelloWorld.java similarity index 100% rename from jdk/test/com/sun/jdi/sde/HelloWorld.java rename to test/jdk/com/sun/jdi/sde/HelloWorld.java diff --git a/jdk/test/com/sun/jdi/sde/InstallSDE.java b/test/jdk/com/sun/jdi/sde/InstallSDE.java similarity index 100% rename from jdk/test/com/sun/jdi/sde/InstallSDE.java rename to test/jdk/com/sun/jdi/sde/InstallSDE.java diff --git a/jdk/test/com/sun/jdi/sde/Mangle.sde b/test/jdk/com/sun/jdi/sde/Mangle.sde similarity index 100% rename from jdk/test/com/sun/jdi/sde/Mangle.sde rename to test/jdk/com/sun/jdi/sde/Mangle.sde diff --git a/jdk/test/com/sun/jdi/sde/MangleStepTest.java b/test/jdk/com/sun/jdi/sde/MangleStepTest.java similarity index 100% rename from jdk/test/com/sun/jdi/sde/MangleStepTest.java rename to test/jdk/com/sun/jdi/sde/MangleStepTest.java diff --git a/jdk/test/com/sun/jdi/sde/MangleTest.java b/test/jdk/com/sun/jdi/sde/MangleTest.java similarity index 100% rename from jdk/test/com/sun/jdi/sde/MangleTest.java rename to test/jdk/com/sun/jdi/sde/MangleTest.java diff --git a/jdk/test/com/sun/jdi/sde/SourceDebugExtensionTarg.java b/test/jdk/com/sun/jdi/sde/SourceDebugExtensionTarg.java similarity index 100% rename from jdk/test/com/sun/jdi/sde/SourceDebugExtensionTarg.java rename to test/jdk/com/sun/jdi/sde/SourceDebugExtensionTarg.java diff --git a/jdk/test/com/sun/jdi/sde/SourceDebugExtensionTest.java b/test/jdk/com/sun/jdi/sde/SourceDebugExtensionTest.java similarity index 100% rename from jdk/test/com/sun/jdi/sde/SourceDebugExtensionTest.java rename to test/jdk/com/sun/jdi/sde/SourceDebugExtensionTest.java diff --git a/jdk/test/com/sun/jdi/sde/TemperatureTable.jsp b/test/jdk/com/sun/jdi/sde/TemperatureTable.jsp similarity index 100% rename from jdk/test/com/sun/jdi/sde/TemperatureTable.jsp rename to test/jdk/com/sun/jdi/sde/TemperatureTable.jsp diff --git a/jdk/test/com/sun/jdi/sde/TemperatureTable.sde b/test/jdk/com/sun/jdi/sde/TemperatureTable.sde similarity index 100% rename from jdk/test/com/sun/jdi/sde/TemperatureTable.sde rename to test/jdk/com/sun/jdi/sde/TemperatureTable.sde diff --git a/jdk/test/com/sun/jdi/sde/TemperatureTableServlet.java b/test/jdk/com/sun/jdi/sde/TemperatureTableServlet.java similarity index 100% rename from jdk/test/com/sun/jdi/sde/TemperatureTableServlet.java rename to test/jdk/com/sun/jdi/sde/TemperatureTableServlet.java diff --git a/jdk/test/com/sun/jdi/sde/TemperatureTableTest.java b/test/jdk/com/sun/jdi/sde/TemperatureTableTest.java similarity index 100% rename from jdk/test/com/sun/jdi/sde/TemperatureTableTest.java rename to test/jdk/com/sun/jdi/sde/TemperatureTableTest.java diff --git a/jdk/test/com/sun/jdi/sde/onion/pickle/Mangle.java b/test/jdk/com/sun/jdi/sde/onion/pickle/Mangle.java similarity index 100% rename from jdk/test/com/sun/jdi/sde/onion/pickle/Mangle.java rename to test/jdk/com/sun/jdi/sde/onion/pickle/Mangle.java diff --git a/jdk/test/com/sun/jdi/sde/testString b/test/jdk/com/sun/jdi/sde/testString similarity index 100% rename from jdk/test/com/sun/jdi/sde/testString rename to test/jdk/com/sun/jdi/sde/testString diff --git a/jdk/test/com/sun/jmx/mbeanserver/introspector/BeanClass.java b/test/jdk/com/sun/jmx/mbeanserver/introspector/BeanClass.java similarity index 100% rename from jdk/test/com/sun/jmx/mbeanserver/introspector/BeanClass.java rename to test/jdk/com/sun/jmx/mbeanserver/introspector/BeanClass.java diff --git a/jdk/test/com/sun/jmx/mbeanserver/introspector/SimpleIntrospectorTest.java b/test/jdk/com/sun/jmx/mbeanserver/introspector/SimpleIntrospectorTest.java similarity index 100% rename from jdk/test/com/sun/jmx/mbeanserver/introspector/SimpleIntrospectorTest.java rename to test/jdk/com/sun/jmx/mbeanserver/introspector/SimpleIntrospectorTest.java diff --git a/jdk/test/com/sun/jmx/remote/CCAdminReconnectTest.java b/test/jdk/com/sun/jmx/remote/CCAdminReconnectTest.java similarity index 100% rename from jdk/test/com/sun/jmx/remote/CCAdminReconnectTest.java rename to test/jdk/com/sun/jmx/remote/CCAdminReconnectTest.java diff --git a/jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Client/Client.java b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Client/Client.java similarity index 100% rename from jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Client/Client.java rename to test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Client/Client.java diff --git a/jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Client/ConfigKey.java b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Client/ConfigKey.java similarity index 100% rename from jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Client/ConfigKey.java rename to test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Client/ConfigKey.java diff --git a/jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Client/TestNotification.java b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Client/TestNotification.java similarity index 100% rename from jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Client/TestNotification.java rename to test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Client/TestNotification.java diff --git a/jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Server/ConfigKey.java b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Server/ConfigKey.java similarity index 100% rename from jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Server/ConfigKey.java rename to test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Server/ConfigKey.java diff --git a/jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Server/Server.java b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Server/Server.java similarity index 100% rename from jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Server/Server.java rename to test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Server/Server.java diff --git a/jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Server/Ste.java b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Server/Ste.java similarity index 100% rename from jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Server/Ste.java rename to test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Server/Ste.java diff --git a/jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Server/SteMBean.java b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Server/SteMBean.java similarity index 100% rename from jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Server/SteMBean.java rename to test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Server/SteMBean.java diff --git a/jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Server/TestNotification.java b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Server/TestNotification.java similarity index 100% rename from jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/Server/TestNotification.java rename to test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Server/TestNotification.java diff --git a/jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java similarity index 100% rename from jdk/test/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java rename to test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java diff --git a/jdk/test/com/sun/jndi/cosnaming/CNNameParser.java b/test/jdk/com/sun/jndi/cosnaming/CNNameParser.java similarity index 100% rename from jdk/test/com/sun/jndi/cosnaming/CNNameParser.java rename to test/jdk/com/sun/jndi/cosnaming/CNNameParser.java diff --git a/jdk/test/com/sun/jndi/cosnaming/IiopUrlIPv6.java b/test/jdk/com/sun/jndi/cosnaming/IiopUrlIPv6.java similarity index 100% rename from jdk/test/com/sun/jndi/cosnaming/IiopUrlIPv6.java rename to test/jdk/com/sun/jndi/cosnaming/IiopUrlIPv6.java diff --git a/jdk/test/com/sun/jndi/dns/CheckAccess.java b/test/jdk/com/sun/jndi/dns/CheckAccess.java similarity index 100% rename from jdk/test/com/sun/jndi/dns/CheckAccess.java rename to test/jdk/com/sun/jndi/dns/CheckAccess.java diff --git a/jdk/test/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java b/test/jdk/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java similarity index 100% rename from jdk/test/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java rename to test/jdk/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java diff --git a/jdk/test/com/sun/jndi/dns/Parser.java b/test/jdk/com/sun/jndi/dns/Parser.java similarity index 100% rename from jdk/test/com/sun/jndi/dns/Parser.java rename to test/jdk/com/sun/jndi/dns/Parser.java diff --git a/jdk/test/com/sun/jndi/dns/Test6991580.java b/test/jdk/com/sun/jndi/dns/Test6991580.java similarity index 100% rename from jdk/test/com/sun/jndi/dns/Test6991580.java rename to test/jdk/com/sun/jndi/dns/Test6991580.java diff --git a/jdk/test/com/sun/jndi/ldap/BalancedParentheses.java b/test/jdk/com/sun/jndi/ldap/BalancedParentheses.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/BalancedParentheses.java rename to test/jdk/com/sun/jndi/ldap/BalancedParentheses.java diff --git a/jdk/test/com/sun/jndi/ldap/Base64Test.java b/test/jdk/com/sun/jndi/ldap/Base64Test.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/Base64Test.java rename to test/jdk/com/sun/jndi/ldap/Base64Test.java diff --git a/jdk/test/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java b/test/jdk/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java rename to test/jdk/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java diff --git a/jdk/test/com/sun/jndi/ldap/InvalidLdapFilters.java b/test/jdk/com/sun/jndi/ldap/InvalidLdapFilters.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/InvalidLdapFilters.java rename to test/jdk/com/sun/jndi/ldap/InvalidLdapFilters.java diff --git a/jdk/test/com/sun/jndi/ldap/LdapName/Case.java b/test/jdk/com/sun/jndi/ldap/LdapName/Case.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/LdapName/Case.java rename to test/jdk/com/sun/jndi/ldap/LdapName/Case.java diff --git a/jdk/test/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java b/test/jdk/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java rename to test/jdk/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java diff --git a/jdk/test/com/sun/jndi/ldap/LdapName/UnescapeTest.java b/test/jdk/com/sun/jndi/ldap/LdapName/UnescapeTest.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/LdapName/UnescapeTest.java rename to test/jdk/com/sun/jndi/ldap/LdapName/UnescapeTest.java diff --git a/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java b/test/jdk/com/sun/jndi/ldap/LdapTimeoutTest.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java rename to test/jdk/com/sun/jndi/ldap/LdapTimeoutTest.java diff --git a/jdk/test/com/sun/jndi/ldap/LdapURLOptionalFields.java b/test/jdk/com/sun/jndi/ldap/LdapURLOptionalFields.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/LdapURLOptionalFields.java rename to test/jdk/com/sun/jndi/ldap/LdapURLOptionalFields.java diff --git a/jdk/test/com/sun/jndi/ldap/LdapUnicodeURL.java b/test/jdk/com/sun/jndi/ldap/LdapUnicodeURL.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/LdapUnicodeURL.java rename to test/jdk/com/sun/jndi/ldap/LdapUnicodeURL.java diff --git a/jdk/test/com/sun/jndi/ldap/NoWaitForReplyTest.java b/test/jdk/com/sun/jndi/ldap/NoWaitForReplyTest.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/NoWaitForReplyTest.java rename to test/jdk/com/sun/jndi/ldap/NoWaitForReplyTest.java diff --git a/jdk/test/com/sun/jndi/ldap/RemoveNamingListenerTest.java b/test/jdk/com/sun/jndi/ldap/RemoveNamingListenerTest.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/RemoveNamingListenerTest.java rename to test/jdk/com/sun/jndi/ldap/RemoveNamingListenerTest.java diff --git a/jdk/test/com/sun/jndi/ldap/SimpleClientIdHashCode.java b/test/jdk/com/sun/jndi/ldap/SimpleClientIdHashCode.java similarity index 100% rename from jdk/test/com/sun/jndi/ldap/SimpleClientIdHashCode.java rename to test/jdk/com/sun/jndi/ldap/SimpleClientIdHashCode.java diff --git a/jdk/test/com/sun/jndi/ldap/TEST.properties b/test/jdk/com/sun/jndi/ldap/TEST.properties similarity index 100% rename from jdk/test/com/sun/jndi/ldap/TEST.properties rename to test/jdk/com/sun/jndi/ldap/TEST.properties diff --git a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java b/test/jdk/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java similarity index 100% rename from jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java rename to test/jdk/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java diff --git a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java b/test/jdk/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java similarity index 100% rename from jdk/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java rename to test/jdk/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java diff --git a/jdk/test/com/sun/management/CheckSomeMXBeanImplPackage.java b/test/jdk/com/sun/management/CheckSomeMXBeanImplPackage.java similarity index 100% rename from jdk/test/com/sun/management/CheckSomeMXBeanImplPackage.java rename to test/jdk/com/sun/management/CheckSomeMXBeanImplPackage.java diff --git a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java b/test/jdk/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java similarity index 100% rename from jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java rename to test/jdk/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java diff --git a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java b/test/jdk/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java similarity index 100% rename from jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java rename to test/jdk/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java diff --git a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java b/test/jdk/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java similarity index 100% rename from jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java rename to test/jdk/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java diff --git a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java b/test/jdk/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java similarity index 100% rename from jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java rename to test/jdk/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java diff --git a/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java b/test/jdk/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java similarity index 100% rename from jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java rename to test/jdk/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java diff --git a/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java b/test/jdk/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java similarity index 100% rename from jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java rename to test/jdk/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java diff --git a/jdk/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java b/test/jdk/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java similarity index 100% rename from jdk/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java rename to test/jdk/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java diff --git a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java similarity index 100% rename from jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java rename to test/jdk/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java diff --git a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java similarity index 100% rename from jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java rename to test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java diff --git a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java similarity index 100% rename from jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java rename to test/jdk/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java diff --git a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java similarity index 100% rename from jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java rename to test/jdk/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java diff --git a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java similarity index 100% rename from jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java rename to test/jdk/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java diff --git a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java similarity index 100% rename from jdk/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java rename to test/jdk/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java diff --git a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java similarity index 100% rename from jdk/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java rename to test/jdk/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java diff --git a/jdk/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java similarity index 100% rename from jdk/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java rename to test/jdk/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java diff --git a/jdk/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java similarity index 100% rename from jdk/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java rename to test/jdk/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java diff --git a/jdk/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java similarity index 100% rename from jdk/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java rename to test/jdk/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java diff --git a/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java similarity index 100% rename from jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java rename to test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java diff --git a/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java similarity index 100% rename from jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java rename to test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java diff --git a/jdk/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java similarity index 100% rename from jdk/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java rename to test/jdk/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java diff --git a/jdk/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java similarity index 100% rename from jdk/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java rename to test/jdk/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java diff --git a/jdk/test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java b/test/jdk/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java similarity index 100% rename from jdk/test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java rename to test/jdk/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java diff --git a/jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java b/test/jdk/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java similarity index 100% rename from jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java rename to test/jdk/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java diff --git a/jdk/test/com/sun/management/TEST.properties b/test/jdk/com/sun/management/TEST.properties similarity index 100% rename from jdk/test/com/sun/management/TEST.properties rename to test/jdk/com/sun/management/TEST.properties diff --git a/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java b/test/jdk/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java similarity index 100% rename from jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java rename to test/jdk/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java diff --git a/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java b/test/jdk/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java similarity index 100% rename from jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java rename to test/jdk/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java diff --git a/jdk/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java b/test/jdk/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java similarity index 100% rename from jdk/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java rename to test/jdk/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java diff --git a/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.java b/test/jdk/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.java similarity index 100% rename from jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.java rename to test/jdk/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.java diff --git a/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh b/test/jdk/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh similarity index 100% rename from jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh rename to test/jdk/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh diff --git a/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.java b/test/jdk/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.java similarity index 100% rename from jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.java rename to test/jdk/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.java diff --git a/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh b/test/jdk/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh similarity index 100% rename from jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh rename to test/jdk/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh diff --git a/jdk/test/com/sun/management/VMOptionOpenDataTest.java b/test/jdk/com/sun/management/VMOptionOpenDataTest.java similarity index 100% rename from jdk/test/com/sun/management/VMOptionOpenDataTest.java rename to test/jdk/com/sun/management/VMOptionOpenDataTest.java diff --git a/jdk/test/com/sun/net/httpserver/DummyVerifier.java b/test/jdk/com/sun/net/httpserver/DummyVerifier.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/DummyVerifier.java rename to test/jdk/com/sun/net/httpserver/DummyVerifier.java diff --git a/jdk/test/com/sun/net/httpserver/EchoHandler.java b/test/jdk/com/sun/net/httpserver/EchoHandler.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/EchoHandler.java rename to test/jdk/com/sun/net/httpserver/EchoHandler.java diff --git a/jdk/test/com/sun/net/httpserver/FileServerHandler.java b/test/jdk/com/sun/net/httpserver/FileServerHandler.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/FileServerHandler.java rename to test/jdk/com/sun/net/httpserver/FileServerHandler.java diff --git a/jdk/test/com/sun/net/httpserver/LogFilter.java b/test/jdk/com/sun/net/httpserver/LogFilter.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/LogFilter.java rename to test/jdk/com/sun/net/httpserver/LogFilter.java diff --git a/jdk/test/com/sun/net/httpserver/MissingTrailingSpace.java b/test/jdk/com/sun/net/httpserver/MissingTrailingSpace.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/MissingTrailingSpace.java rename to test/jdk/com/sun/net/httpserver/MissingTrailingSpace.java diff --git a/jdk/test/com/sun/net/httpserver/SelCacheTest.java b/test/jdk/com/sun/net/httpserver/SelCacheTest.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/SelCacheTest.java rename to test/jdk/com/sun/net/httpserver/SelCacheTest.java diff --git a/jdk/test/com/sun/net/httpserver/SimpleFileServer.java b/test/jdk/com/sun/net/httpserver/SimpleFileServer.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/SimpleFileServer.java rename to test/jdk/com/sun/net/httpserver/SimpleFileServer.java diff --git a/jdk/test/com/sun/net/httpserver/SimpleHttpServerTest.java b/test/jdk/com/sun/net/httpserver/SimpleHttpServerTest.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/SimpleHttpServerTest.java rename to test/jdk/com/sun/net/httpserver/SimpleHttpServerTest.java diff --git a/jdk/test/com/sun/net/httpserver/StopNoStartTest.java b/test/jdk/com/sun/net/httpserver/StopNoStartTest.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/StopNoStartTest.java rename to test/jdk/com/sun/net/httpserver/StopNoStartTest.java diff --git a/jdk/test/com/sun/net/httpserver/TEST.properties b/test/jdk/com/sun/net/httpserver/TEST.properties similarity index 100% rename from jdk/test/com/sun/net/httpserver/TEST.properties rename to test/jdk/com/sun/net/httpserver/TEST.properties diff --git a/jdk/test/com/sun/net/httpserver/Test.java b/test/jdk/com/sun/net/httpserver/Test.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test.java rename to test/jdk/com/sun/net/httpserver/Test.java diff --git a/jdk/test/com/sun/net/httpserver/Test1.java b/test/jdk/com/sun/net/httpserver/Test1.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test1.java rename to test/jdk/com/sun/net/httpserver/Test1.java diff --git a/jdk/test/com/sun/net/httpserver/Test10.java b/test/jdk/com/sun/net/httpserver/Test10.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test10.java rename to test/jdk/com/sun/net/httpserver/Test10.java diff --git a/jdk/test/com/sun/net/httpserver/Test11.java b/test/jdk/com/sun/net/httpserver/Test11.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test11.java rename to test/jdk/com/sun/net/httpserver/Test11.java diff --git a/jdk/test/com/sun/net/httpserver/Test12.java b/test/jdk/com/sun/net/httpserver/Test12.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test12.java rename to test/jdk/com/sun/net/httpserver/Test12.java diff --git a/jdk/test/com/sun/net/httpserver/Test13.java b/test/jdk/com/sun/net/httpserver/Test13.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test13.java rename to test/jdk/com/sun/net/httpserver/Test13.java diff --git a/jdk/test/com/sun/net/httpserver/Test14.java b/test/jdk/com/sun/net/httpserver/Test14.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test14.java rename to test/jdk/com/sun/net/httpserver/Test14.java diff --git a/jdk/test/com/sun/net/httpserver/Test2.java b/test/jdk/com/sun/net/httpserver/Test2.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test2.java rename to test/jdk/com/sun/net/httpserver/Test2.java diff --git a/jdk/test/com/sun/net/httpserver/Test3.java b/test/jdk/com/sun/net/httpserver/Test3.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test3.java rename to test/jdk/com/sun/net/httpserver/Test3.java diff --git a/jdk/test/com/sun/net/httpserver/Test4.java b/test/jdk/com/sun/net/httpserver/Test4.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test4.java rename to test/jdk/com/sun/net/httpserver/Test4.java diff --git a/jdk/test/com/sun/net/httpserver/Test5.java b/test/jdk/com/sun/net/httpserver/Test5.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test5.java rename to test/jdk/com/sun/net/httpserver/Test5.java diff --git a/jdk/test/com/sun/net/httpserver/Test6.java b/test/jdk/com/sun/net/httpserver/Test6.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test6.java rename to test/jdk/com/sun/net/httpserver/Test6.java diff --git a/jdk/test/com/sun/net/httpserver/Test6a.java b/test/jdk/com/sun/net/httpserver/Test6a.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test6a.java rename to test/jdk/com/sun/net/httpserver/Test6a.java diff --git a/jdk/test/com/sun/net/httpserver/Test7.java b/test/jdk/com/sun/net/httpserver/Test7.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test7.java rename to test/jdk/com/sun/net/httpserver/Test7.java diff --git a/jdk/test/com/sun/net/httpserver/Test7a.java b/test/jdk/com/sun/net/httpserver/Test7a.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test7a.java rename to test/jdk/com/sun/net/httpserver/Test7a.java diff --git a/jdk/test/com/sun/net/httpserver/Test8.java b/test/jdk/com/sun/net/httpserver/Test8.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test8.java rename to test/jdk/com/sun/net/httpserver/Test8.java diff --git a/jdk/test/com/sun/net/httpserver/Test8a.java b/test/jdk/com/sun/net/httpserver/Test8a.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test8a.java rename to test/jdk/com/sun/net/httpserver/Test8a.java diff --git a/jdk/test/com/sun/net/httpserver/Test9.java b/test/jdk/com/sun/net/httpserver/Test9.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test9.java rename to test/jdk/com/sun/net/httpserver/Test9.java diff --git a/jdk/test/com/sun/net/httpserver/Test9a.java b/test/jdk/com/sun/net/httpserver/Test9a.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/Test9a.java rename to test/jdk/com/sun/net/httpserver/Test9a.java diff --git a/jdk/test/com/sun/net/httpserver/TestLogging.java b/test/jdk/com/sun/net/httpserver/TestLogging.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/TestLogging.java rename to test/jdk/com/sun/net/httpserver/TestLogging.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/6725892/Test.java b/test/jdk/com/sun/net/httpserver/bugs/6725892/Test.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/6725892/Test.java rename to test/jdk/com/sun/net/httpserver/bugs/6725892/Test.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6339483.java b/test/jdk/com/sun/net/httpserver/bugs/B6339483.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6339483.java rename to test/jdk/com/sun/net/httpserver/bugs/B6339483.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6341616.java b/test/jdk/com/sun/net/httpserver/bugs/B6341616.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6341616.java rename to test/jdk/com/sun/net/httpserver/bugs/B6341616.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6361557.java b/test/jdk/com/sun/net/httpserver/bugs/B6361557.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6361557.java rename to test/jdk/com/sun/net/httpserver/bugs/B6361557.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6373555.java b/test/jdk/com/sun/net/httpserver/bugs/B6373555.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6373555.java rename to test/jdk/com/sun/net/httpserver/bugs/B6373555.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6393710.java b/test/jdk/com/sun/net/httpserver/bugs/B6393710.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6393710.java rename to test/jdk/com/sun/net/httpserver/bugs/B6393710.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6401598.java b/test/jdk/com/sun/net/httpserver/bugs/B6401598.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6401598.java rename to test/jdk/com/sun/net/httpserver/bugs/B6401598.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6421581.java b/test/jdk/com/sun/net/httpserver/bugs/B6421581.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6421581.java rename to test/jdk/com/sun/net/httpserver/bugs/B6421581.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6424196.java b/test/jdk/com/sun/net/httpserver/bugs/B6424196.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6424196.java rename to test/jdk/com/sun/net/httpserver/bugs/B6424196.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6431193.java b/test/jdk/com/sun/net/httpserver/bugs/B6431193.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6431193.java rename to test/jdk/com/sun/net/httpserver/bugs/B6431193.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6433018.java b/test/jdk/com/sun/net/httpserver/bugs/B6433018.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6433018.java rename to test/jdk/com/sun/net/httpserver/bugs/B6433018.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6526158.java b/test/jdk/com/sun/net/httpserver/bugs/B6526158.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6526158.java rename to test/jdk/com/sun/net/httpserver/bugs/B6526158.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6526913.java b/test/jdk/com/sun/net/httpserver/bugs/B6526913.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6526913.java rename to test/jdk/com/sun/net/httpserver/bugs/B6526913.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6529200.java b/test/jdk/com/sun/net/httpserver/bugs/B6529200.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6529200.java rename to test/jdk/com/sun/net/httpserver/bugs/B6529200.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6744329.java b/test/jdk/com/sun/net/httpserver/bugs/B6744329.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6744329.java rename to test/jdk/com/sun/net/httpserver/bugs/B6744329.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/B6886436.java b/test/jdk/com/sun/net/httpserver/bugs/B6886436.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/B6886436.java rename to test/jdk/com/sun/net/httpserver/bugs/B6886436.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/FixedLengthInputStream.java b/test/jdk/com/sun/net/httpserver/bugs/FixedLengthInputStream.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/FixedLengthInputStream.java rename to test/jdk/com/sun/net/httpserver/bugs/FixedLengthInputStream.java diff --git a/jdk/test/com/sun/net/httpserver/bugs/HeadTest.java b/test/jdk/com/sun/net/httpserver/bugs/HeadTest.java similarity index 100% rename from jdk/test/com/sun/net/httpserver/bugs/HeadTest.java rename to test/jdk/com/sun/net/httpserver/bugs/HeadTest.java diff --git a/jdk/test/com/sun/net/httpserver/docs/test1/largefile.txt b/test/jdk/com/sun/net/httpserver/docs/test1/largefile.txt similarity index 100% rename from jdk/test/com/sun/net/httpserver/docs/test1/largefile.txt rename to test/jdk/com/sun/net/httpserver/docs/test1/largefile.txt diff --git a/jdk/test/com/sun/net/httpserver/docs/test1/smallfile.txt b/test/jdk/com/sun/net/httpserver/docs/test1/smallfile.txt similarity index 100% rename from jdk/test/com/sun/net/httpserver/docs/test1/smallfile.txt rename to test/jdk/com/sun/net/httpserver/docs/test1/smallfile.txt diff --git a/jdk/test/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java b/test/jdk/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java similarity index 100% rename from jdk/test/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java rename to test/jdk/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java diff --git a/jdk/test/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java b/test/jdk/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java similarity index 100% rename from jdk/test/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java rename to test/jdk/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java diff --git a/jdk/test/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java b/test/jdk/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java similarity index 100% rename from jdk/test/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java rename to test/jdk/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java diff --git a/jdk/test/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java b/test/jdk/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java similarity index 100% rename from jdk/test/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java rename to test/jdk/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java diff --git a/jdk/test/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java b/test/jdk/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java similarity index 100% rename from jdk/test/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java rename to test/jdk/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java diff --git a/jdk/test/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java b/test/jdk/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java similarity index 100% rename from jdk/test/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java rename to test/jdk/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java diff --git a/jdk/test/com/sun/net/ssl/SSLSecurity/ProviderTest.java b/test/jdk/com/sun/net/ssl/SSLSecurity/ProviderTest.java similarity index 100% rename from jdk/test/com/sun/net/ssl/SSLSecurity/ProviderTest.java rename to test/jdk/com/sun/net/ssl/SSLSecurity/ProviderTest.java diff --git a/jdk/test/com/sun/net/ssl/SSLSecurity/TruncateArray.java b/test/jdk/com/sun/net/ssl/SSLSecurity/TruncateArray.java similarity index 100% rename from jdk/test/com/sun/net/ssl/SSLSecurity/TruncateArray.java rename to test/jdk/com/sun/net/ssl/SSLSecurity/TruncateArray.java diff --git a/jdk/test/com/sun/nio/sctp/MessageInfoTests.java b/test/jdk/com/sun/nio/sctp/MessageInfoTests.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/MessageInfoTests.java rename to test/jdk/com/sun/nio/sctp/MessageInfoTests.java diff --git a/jdk/test/com/sun/nio/sctp/SctpChannel/Bind.java b/test/jdk/com/sun/nio/sctp/SctpChannel/Bind.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpChannel/Bind.java rename to test/jdk/com/sun/nio/sctp/SctpChannel/Bind.java diff --git a/jdk/test/com/sun/nio/sctp/SctpChannel/CommUp.java b/test/jdk/com/sun/nio/sctp/SctpChannel/CommUp.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpChannel/CommUp.java rename to test/jdk/com/sun/nio/sctp/SctpChannel/CommUp.java diff --git a/jdk/test/com/sun/nio/sctp/SctpChannel/Connect.java b/test/jdk/com/sun/nio/sctp/SctpChannel/Connect.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpChannel/Connect.java rename to test/jdk/com/sun/nio/sctp/SctpChannel/Connect.java diff --git a/jdk/test/com/sun/nio/sctp/SctpChannel/Receive.java b/test/jdk/com/sun/nio/sctp/SctpChannel/Receive.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpChannel/Receive.java rename to test/jdk/com/sun/nio/sctp/SctpChannel/Receive.java diff --git a/jdk/test/com/sun/nio/sctp/SctpChannel/ReceiveIntoDirect.java b/test/jdk/com/sun/nio/sctp/SctpChannel/ReceiveIntoDirect.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpChannel/ReceiveIntoDirect.java rename to test/jdk/com/sun/nio/sctp/SctpChannel/ReceiveIntoDirect.java diff --git a/jdk/test/com/sun/nio/sctp/SctpChannel/Send.java b/test/jdk/com/sun/nio/sctp/SctpChannel/Send.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpChannel/Send.java rename to test/jdk/com/sun/nio/sctp/SctpChannel/Send.java diff --git a/jdk/test/com/sun/nio/sctp/SctpChannel/Shutdown.java b/test/jdk/com/sun/nio/sctp/SctpChannel/Shutdown.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpChannel/Shutdown.java rename to test/jdk/com/sun/nio/sctp/SctpChannel/Shutdown.java diff --git a/jdk/test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java b/test/jdk/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java rename to test/jdk/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java diff --git a/jdk/test/com/sun/nio/sctp/SctpChannel/Util.java b/test/jdk/com/sun/nio/sctp/SctpChannel/Util.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpChannel/Util.java rename to test/jdk/com/sun/nio/sctp/SctpChannel/Util.java diff --git a/jdk/test/com/sun/nio/sctp/SctpMultiChannel/Branch.java b/test/jdk/com/sun/nio/sctp/SctpMultiChannel/Branch.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpMultiChannel/Branch.java rename to test/jdk/com/sun/nio/sctp/SctpMultiChannel/Branch.java diff --git a/jdk/test/com/sun/nio/sctp/SctpMultiChannel/Send.java b/test/jdk/com/sun/nio/sctp/SctpMultiChannel/Send.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpMultiChannel/Send.java rename to test/jdk/com/sun/nio/sctp/SctpMultiChannel/Send.java diff --git a/jdk/test/com/sun/nio/sctp/SctpMultiChannel/SendFailed.java b/test/jdk/com/sun/nio/sctp/SctpMultiChannel/SendFailed.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpMultiChannel/SendFailed.java rename to test/jdk/com/sun/nio/sctp/SctpMultiChannel/SendFailed.java diff --git a/jdk/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java b/test/jdk/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java rename to test/jdk/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java diff --git a/jdk/test/com/sun/nio/sctp/SctpMultiChannel/Util.java b/test/jdk/com/sun/nio/sctp/SctpMultiChannel/Util.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpMultiChannel/Util.java rename to test/jdk/com/sun/nio/sctp/SctpMultiChannel/Util.java diff --git a/jdk/test/com/sun/nio/sctp/SctpServerChannel/Accept.java b/test/jdk/com/sun/nio/sctp/SctpServerChannel/Accept.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpServerChannel/Accept.java rename to test/jdk/com/sun/nio/sctp/SctpServerChannel/Accept.java diff --git a/jdk/test/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java b/test/jdk/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java rename to test/jdk/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java diff --git a/jdk/test/com/sun/nio/sctp/SctpServerChannel/Util.java b/test/jdk/com/sun/nio/sctp/SctpServerChannel/Util.java similarity index 100% rename from jdk/test/com/sun/nio/sctp/SctpServerChannel/Util.java rename to test/jdk/com/sun/nio/sctp/SctpServerChannel/Util.java diff --git a/jdk/test/com/sun/nio/sctp/TEST.properties b/test/jdk/com/sun/nio/sctp/TEST.properties similarity index 100% rename from jdk/test/com/sun/nio/sctp/TEST.properties rename to test/jdk/com/sun/nio/sctp/TEST.properties diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java b/test/jdk/com/sun/org/apache/xml/internal/security/TruncateHMAC.java similarity index 100% rename from jdk/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java rename to test/jdk/com/sun/org/apache/xml/internal/security/TruncateHMAC.java diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java b/test/jdk/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java similarity index 100% rename from jdk/test/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java rename to test/jdk/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-0-attack.xml b/test/jdk/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-0-attack.xml similarity index 100% rename from jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-0-attack.xml rename to test/jdk/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-0-attack.xml diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-8-attack.xml b/test/jdk/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-8-attack.xml similarity index 100% rename from jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-8-attack.xml rename to test/jdk/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-8-attack.xml diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1.xml b/test/jdk/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1.xml similarity index 100% rename from jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1.xml rename to test/jdk/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1.xml diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java b/test/jdk/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java similarity index 100% rename from jdk/test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java rename to test/jdk/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java b/test/jdk/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java similarity index 100% rename from jdk/test/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java rename to test/jdk/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java b/test/jdk/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java similarity index 100% rename from jdk/test/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java rename to test/jdk/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java diff --git a/jdk/test/com/sun/security/auth/CreateLdapPrincipals.java b/test/jdk/com/sun/security/auth/CreateLdapPrincipals.java similarity index 100% rename from jdk/test/com/sun/security/auth/CreateLdapPrincipals.java rename to test/jdk/com/sun/security/auth/CreateLdapPrincipals.java diff --git a/jdk/test/com/sun/security/auth/TEST.properties b/test/jdk/com/sun/security/auth/TEST.properties similarity index 100% rename from jdk/test/com/sun/security/auth/TEST.properties rename to test/jdk/com/sun/security/auth/TEST.properties diff --git a/jdk/test/com/sun/security/auth/callback/TextCallbackHandler/Confirm.java b/test/jdk/com/sun/security/auth/callback/TextCallbackHandler/Confirm.java similarity index 100% rename from jdk/test/com/sun/security/auth/callback/TextCallbackHandler/Confirm.java rename to test/jdk/com/sun/security/auth/callback/TextCallbackHandler/Confirm.java diff --git a/jdk/test/com/sun/security/auth/callback/TextCallbackHandler/Default.java b/test/jdk/com/sun/security/auth/callback/TextCallbackHandler/Default.java similarity index 100% rename from jdk/test/com/sun/security/auth/callback/TextCallbackHandler/Default.java rename to test/jdk/com/sun/security/auth/callback/TextCallbackHandler/Default.java diff --git a/jdk/test/com/sun/security/auth/callback/TextCallbackHandler/NPE.java b/test/jdk/com/sun/security/auth/callback/TextCallbackHandler/NPE.java similarity index 100% rename from jdk/test/com/sun/security/auth/callback/TextCallbackHandler/NPE.java rename to test/jdk/com/sun/security/auth/callback/TextCallbackHandler/NPE.java diff --git a/jdk/test/com/sun/security/auth/callback/TextCallbackHandler/Password.java b/test/jdk/com/sun/security/auth/callback/TextCallbackHandler/Password.java similarity index 100% rename from jdk/test/com/sun/security/auth/callback/TextCallbackHandler/Password.java rename to test/jdk/com/sun/security/auth/callback/TextCallbackHandler/Password.java diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/EmptyOption.config b/test/jdk/com/sun/security/auth/login/ConfigFile/EmptyOption.config similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/EmptyOption.config rename to test/jdk/com/sun/security/auth/login/ConfigFile/EmptyOption.config diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/EmptyOption.java b/test/jdk/com/sun/security/auth/login/ConfigFile/EmptyOption.java similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/EmptyOption.java rename to test/jdk/com/sun/security/auth/login/ConfigFile/EmptyOption.java diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/IllegalURL.java b/test/jdk/com/sun/security/auth/login/ConfigFile/IllegalURL.java similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/IllegalURL.java rename to test/jdk/com/sun/security/auth/login/ConfigFile/IllegalURL.java diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/InconsistentError.config b/test/jdk/com/sun/security/auth/login/ConfigFile/InconsistentError.config similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/InconsistentError.config rename to test/jdk/com/sun/security/auth/login/ConfigFile/InconsistentError.config diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/InconsistentError.java b/test/jdk/com/sun/security/auth/login/ConfigFile/InconsistentError.java similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/InconsistentError.java rename to test/jdk/com/sun/security/auth/login/ConfigFile/InconsistentError.java diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.config b/test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.config similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.config rename to test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.config diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.java b/test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.java similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.java rename to test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.java diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.policy b/test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.policy similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.policy rename to test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.policy diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/Override.bad.config b/test/jdk/com/sun/security/auth/login/ConfigFile/Override.bad.config similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/Override.bad.config rename to test/jdk/com/sun/security/auth/login/ConfigFile/Override.bad.config diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/Override.good.config b/test/jdk/com/sun/security/auth/login/ConfigFile/Override.good.config similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/Override.good.config rename to test/jdk/com/sun/security/auth/login/ConfigFile/Override.good.config diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/Override.java b/test/jdk/com/sun/security/auth/login/ConfigFile/Override.java similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/Override.java rename to test/jdk/com/sun/security/auth/login/ConfigFile/Override.java diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/Override.props b/test/jdk/com/sun/security/auth/login/ConfigFile/Override.props similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/Override.props rename to test/jdk/com/sun/security/auth/login/ConfigFile/Override.props diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.config b/test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.config similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.config rename to test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.config diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java b/test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java rename to test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java diff --git a/jdk/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy b/test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy similarity index 100% rename from jdk/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy rename to test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy diff --git a/jdk/test/com/sun/security/auth/module/AllPlatforms.java b/test/jdk/com/sun/security/auth/module/AllPlatforms.java similarity index 100% rename from jdk/test/com/sun/security/auth/module/AllPlatforms.java rename to test/jdk/com/sun/security/auth/module/AllPlatforms.java diff --git a/jdk/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java b/test/jdk/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java similarity index 100% rename from jdk/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java rename to test/jdk/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java diff --git a/jdk/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keyPass b/test/jdk/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keyPass similarity index 100% rename from jdk/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keyPass rename to test/jdk/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keyPass diff --git a/jdk/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keystore b/test/jdk/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keystore similarity index 100% rename from jdk/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keystore rename to test/jdk/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keystore diff --git a/jdk/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.storePass b/test/jdk/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.storePass similarity index 100% rename from jdk/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.storePass rename to test/jdk/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.storePass diff --git a/jdk/test/com/sun/security/auth/module/KeyStoreLoginModule/ReadOnly.java b/test/jdk/com/sun/security/auth/module/KeyStoreLoginModule/ReadOnly.java similarity index 100% rename from jdk/test/com/sun/security/auth/module/KeyStoreLoginModule/ReadOnly.java rename to test/jdk/com/sun/security/auth/module/KeyStoreLoginModule/ReadOnly.java diff --git a/jdk/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java b/test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java similarity index 100% rename from jdk/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java rename to test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java diff --git a/jdk/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy b/test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy similarity index 100% rename from jdk/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy rename to test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy diff --git a/jdk/test/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java b/test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java similarity index 100% rename from jdk/test/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java rename to test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java diff --git a/jdk/test/com/sun/security/jgss/InquireSecContextPermissionCheck.java b/test/jdk/com/sun/security/jgss/InquireSecContextPermissionCheck.java similarity index 100% rename from jdk/test/com/sun/security/jgss/InquireSecContextPermissionCheck.java rename to test/jdk/com/sun/security/jgss/InquireSecContextPermissionCheck.java diff --git a/jdk/test/com/sun/security/sasl/ClientCallbackHandler.java b/test/jdk/com/sun/security/sasl/ClientCallbackHandler.java similarity index 100% rename from jdk/test/com/sun/security/sasl/ClientCallbackHandler.java rename to test/jdk/com/sun/security/sasl/ClientCallbackHandler.java diff --git a/jdk/test/com/sun/security/sasl/Cram.java b/test/jdk/com/sun/security/sasl/Cram.java similarity index 100% rename from jdk/test/com/sun/security/sasl/Cram.java rename to test/jdk/com/sun/security/sasl/Cram.java diff --git a/jdk/test/com/sun/security/sasl/PropertiesFileCallbackHandler.java b/test/jdk/com/sun/security/sasl/PropertiesFileCallbackHandler.java similarity index 100% rename from jdk/test/com/sun/security/sasl/PropertiesFileCallbackHandler.java rename to test/jdk/com/sun/security/sasl/PropertiesFileCallbackHandler.java diff --git a/jdk/test/com/sun/security/sasl/TEST.properties b/test/jdk/com/sun/security/sasl/TEST.properties similarity index 100% rename from jdk/test/com/sun/security/sasl/TEST.properties rename to test/jdk/com/sun/security/sasl/TEST.properties diff --git a/jdk/test/com/sun/security/sasl/digest/AuthNoUtf8.java b/test/jdk/com/sun/security/sasl/digest/AuthNoUtf8.java similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/AuthNoUtf8.java rename to test/jdk/com/sun/security/sasl/digest/AuthNoUtf8.java diff --git a/jdk/test/com/sun/security/sasl/digest/AuthOnly.java b/test/jdk/com/sun/security/sasl/digest/AuthOnly.java similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/AuthOnly.java rename to test/jdk/com/sun/security/sasl/digest/AuthOnly.java diff --git a/jdk/test/com/sun/security/sasl/digest/AuthRealmChoices.java b/test/jdk/com/sun/security/sasl/digest/AuthRealmChoices.java similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/AuthRealmChoices.java rename to test/jdk/com/sun/security/sasl/digest/AuthRealmChoices.java diff --git a/jdk/test/com/sun/security/sasl/digest/AuthRealms.java b/test/jdk/com/sun/security/sasl/digest/AuthRealms.java similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/AuthRealms.java rename to test/jdk/com/sun/security/sasl/digest/AuthRealms.java diff --git a/jdk/test/com/sun/security/sasl/digest/CheckNegotiatedQOPs.java b/test/jdk/com/sun/security/sasl/digest/CheckNegotiatedQOPs.java similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/CheckNegotiatedQOPs.java rename to test/jdk/com/sun/security/sasl/digest/CheckNegotiatedQOPs.java diff --git a/jdk/test/com/sun/security/sasl/digest/ClientCallbackHandler.java b/test/jdk/com/sun/security/sasl/digest/ClientCallbackHandler.java similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/ClientCallbackHandler.java rename to test/jdk/com/sun/security/sasl/digest/ClientCallbackHandler.java diff --git a/jdk/test/com/sun/security/sasl/digest/Integrity.java b/test/jdk/com/sun/security/sasl/digest/Integrity.java similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/Integrity.java rename to test/jdk/com/sun/security/sasl/digest/Integrity.java diff --git a/jdk/test/com/sun/security/sasl/digest/NoQuoteParams.java b/test/jdk/com/sun/security/sasl/digest/NoQuoteParams.java similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/NoQuoteParams.java rename to test/jdk/com/sun/security/sasl/digest/NoQuoteParams.java diff --git a/jdk/test/com/sun/security/sasl/digest/Privacy.java b/test/jdk/com/sun/security/sasl/digest/Privacy.java similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/Privacy.java rename to test/jdk/com/sun/security/sasl/digest/Privacy.java diff --git a/jdk/test/com/sun/security/sasl/digest/PrivacyRc4.java b/test/jdk/com/sun/security/sasl/digest/PrivacyRc4.java similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/PrivacyRc4.java rename to test/jdk/com/sun/security/sasl/digest/PrivacyRc4.java diff --git a/jdk/test/com/sun/security/sasl/digest/PropertiesFileCallbackHandler.java b/test/jdk/com/sun/security/sasl/digest/PropertiesFileCallbackHandler.java similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/PropertiesFileCallbackHandler.java rename to test/jdk/com/sun/security/sasl/digest/PropertiesFileCallbackHandler.java diff --git a/jdk/test/com/sun/security/sasl/digest/TEST.properties b/test/jdk/com/sun/security/sasl/digest/TEST.properties similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/TEST.properties rename to test/jdk/com/sun/security/sasl/digest/TEST.properties diff --git a/jdk/test/com/sun/security/sasl/digest/Unbound.java b/test/jdk/com/sun/security/sasl/digest/Unbound.java similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/Unbound.java rename to test/jdk/com/sun/security/sasl/digest/Unbound.java diff --git a/jdk/test/com/sun/security/sasl/digest/log.properties b/test/jdk/com/sun/security/sasl/digest/log.properties similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/log.properties rename to test/jdk/com/sun/security/sasl/digest/log.properties diff --git a/jdk/test/com/sun/security/sasl/digest/names.properties b/test/jdk/com/sun/security/sasl/digest/names.properties similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/names.properties rename to test/jdk/com/sun/security/sasl/digest/names.properties diff --git a/jdk/test/com/sun/security/sasl/digest/pw.properties b/test/jdk/com/sun/security/sasl/digest/pw.properties similarity index 100% rename from jdk/test/com/sun/security/sasl/digest/pw.properties rename to test/jdk/com/sun/security/sasl/digest/pw.properties diff --git a/jdk/test/com/sun/security/sasl/gsskerb/AuthOnly.java b/test/jdk/com/sun/security/sasl/gsskerb/AuthOnly.java similarity index 100% rename from jdk/test/com/sun/security/sasl/gsskerb/AuthOnly.java rename to test/jdk/com/sun/security/sasl/gsskerb/AuthOnly.java diff --git a/jdk/test/com/sun/security/sasl/gsskerb/ConfSecurityLayer.java b/test/jdk/com/sun/security/sasl/gsskerb/ConfSecurityLayer.java similarity index 100% rename from jdk/test/com/sun/security/sasl/gsskerb/ConfSecurityLayer.java rename to test/jdk/com/sun/security/sasl/gsskerb/ConfSecurityLayer.java diff --git a/jdk/test/com/sun/security/sasl/gsskerb/NoSecurityLayer.java b/test/jdk/com/sun/security/sasl/gsskerb/NoSecurityLayer.java similarity index 100% rename from jdk/test/com/sun/security/sasl/gsskerb/NoSecurityLayer.java rename to test/jdk/com/sun/security/sasl/gsskerb/NoSecurityLayer.java diff --git a/jdk/test/com/sun/security/sasl/gsskerb/PropertiesFileCallbackHandler.java b/test/jdk/com/sun/security/sasl/gsskerb/PropertiesFileCallbackHandler.java similarity index 100% rename from jdk/test/com/sun/security/sasl/gsskerb/PropertiesFileCallbackHandler.java rename to test/jdk/com/sun/security/sasl/gsskerb/PropertiesFileCallbackHandler.java diff --git a/jdk/test/com/sun/security/sasl/gsskerb/gsseg_jaas.conf b/test/jdk/com/sun/security/sasl/gsskerb/gsseg_jaas.conf similarity index 100% rename from jdk/test/com/sun/security/sasl/gsskerb/gsseg_jaas.conf rename to test/jdk/com/sun/security/sasl/gsskerb/gsseg_jaas.conf diff --git a/jdk/test/com/sun/security/sasl/gsskerb/log.properties b/test/jdk/com/sun/security/sasl/gsskerb/log.properties similarity index 100% rename from jdk/test/com/sun/security/sasl/gsskerb/log.properties rename to test/jdk/com/sun/security/sasl/gsskerb/log.properties diff --git a/jdk/test/com/sun/security/sasl/gsskerb/run-conf-wjaas.csh b/test/jdk/com/sun/security/sasl/gsskerb/run-conf-wjaas.csh similarity index 100% rename from jdk/test/com/sun/security/sasl/gsskerb/run-conf-wjaas.csh rename to test/jdk/com/sun/security/sasl/gsskerb/run-conf-wjaas.csh diff --git a/jdk/test/com/sun/security/sasl/gsskerb/run-nosec-wjaas.csh b/test/jdk/com/sun/security/sasl/gsskerb/run-nosec-wjaas.csh similarity index 100% rename from jdk/test/com/sun/security/sasl/gsskerb/run-nosec-wjaas.csh rename to test/jdk/com/sun/security/sasl/gsskerb/run-nosec-wjaas.csh diff --git a/jdk/test/com/sun/security/sasl/gsskerb/runwjaas.csh b/test/jdk/com/sun/security/sasl/gsskerb/runwjaas.csh similarity index 100% rename from jdk/test/com/sun/security/sasl/gsskerb/runwjaas.csh rename to test/jdk/com/sun/security/sasl/gsskerb/runwjaas.csh diff --git a/jdk/test/com/sun/security/sasl/log.properties b/test/jdk/com/sun/security/sasl/log.properties similarity index 100% rename from jdk/test/com/sun/security/sasl/log.properties rename to test/jdk/com/sun/security/sasl/log.properties diff --git a/jdk/test/com/sun/security/sasl/names.properties b/test/jdk/com/sun/security/sasl/names.properties similarity index 100% rename from jdk/test/com/sun/security/sasl/names.properties rename to test/jdk/com/sun/security/sasl/names.properties diff --git a/jdk/test/com/sun/security/sasl/ntlm/Conformance.java b/test/jdk/com/sun/security/sasl/ntlm/Conformance.java similarity index 100% rename from jdk/test/com/sun/security/sasl/ntlm/Conformance.java rename to test/jdk/com/sun/security/sasl/ntlm/Conformance.java diff --git a/jdk/test/com/sun/security/sasl/ntlm/NTLMTest.java b/test/jdk/com/sun/security/sasl/ntlm/NTLMTest.java similarity index 100% rename from jdk/test/com/sun/security/sasl/ntlm/NTLMTest.java rename to test/jdk/com/sun/security/sasl/ntlm/NTLMTest.java diff --git a/jdk/test/com/sun/security/sasl/pw.properties b/test/jdk/com/sun/security/sasl/pw.properties similarity index 100% rename from jdk/test/com/sun/security/sasl/pw.properties rename to test/jdk/com/sun/security/sasl/pw.properties diff --git a/jdk/test/com/sun/security/sasl/util/CheckAccess.java b/test/jdk/com/sun/security/sasl/util/CheckAccess.java similarity index 100% rename from jdk/test/com/sun/security/sasl/util/CheckAccess.java rename to test/jdk/com/sun/security/sasl/util/CheckAccess.java diff --git a/jdk/test/com/sun/tools/attach/Agent.java b/test/jdk/com/sun/tools/attach/Agent.java similarity index 100% rename from jdk/test/com/sun/tools/attach/Agent.java rename to test/jdk/com/sun/tools/attach/Agent.java diff --git a/jdk/test/com/sun/tools/attach/Application.java b/test/jdk/com/sun/tools/attach/Application.java similarity index 100% rename from jdk/test/com/sun/tools/attach/Application.java rename to test/jdk/com/sun/tools/attach/Application.java diff --git a/jdk/test/com/sun/tools/attach/AttachSelf.java b/test/jdk/com/sun/tools/attach/AttachSelf.java similarity index 100% rename from jdk/test/com/sun/tools/attach/AttachSelf.java rename to test/jdk/com/sun/tools/attach/AttachSelf.java diff --git a/jdk/test/com/sun/tools/attach/BadAgent.java b/test/jdk/com/sun/tools/attach/BadAgent.java similarity index 100% rename from jdk/test/com/sun/tools/attach/BadAgent.java rename to test/jdk/com/sun/tools/attach/BadAgent.java diff --git a/jdk/test/com/sun/tools/attach/BasicTests.java b/test/jdk/com/sun/tools/attach/BasicTests.java similarity index 100% rename from jdk/test/com/sun/tools/attach/BasicTests.java rename to test/jdk/com/sun/tools/attach/BasicTests.java diff --git a/jdk/test/com/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider b/test/jdk/com/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider similarity index 100% rename from jdk/test/com/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider rename to test/jdk/com/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider diff --git a/jdk/test/com/sun/tools/attach/PermissionTest.java b/test/jdk/com/sun/tools/attach/PermissionTest.java similarity index 100% rename from jdk/test/com/sun/tools/attach/PermissionTest.java rename to test/jdk/com/sun/tools/attach/PermissionTest.java diff --git a/jdk/test/com/sun/tools/attach/ProviderTest.java b/test/jdk/com/sun/tools/attach/ProviderTest.java similarity index 100% rename from jdk/test/com/sun/tools/attach/ProviderTest.java rename to test/jdk/com/sun/tools/attach/ProviderTest.java diff --git a/jdk/test/com/sun/tools/attach/RedefineAgent.java b/test/jdk/com/sun/tools/attach/RedefineAgent.java similarity index 100% rename from jdk/test/com/sun/tools/attach/RedefineAgent.java rename to test/jdk/com/sun/tools/attach/RedefineAgent.java diff --git a/jdk/test/com/sun/tools/attach/RedefineDummy.java b/test/jdk/com/sun/tools/attach/RedefineDummy.java similarity index 100% rename from jdk/test/com/sun/tools/attach/RedefineDummy.java rename to test/jdk/com/sun/tools/attach/RedefineDummy.java diff --git a/jdk/test/com/sun/tools/attach/RunnerUtil.java b/test/jdk/com/sun/tools/attach/RunnerUtil.java similarity index 100% rename from jdk/test/com/sun/tools/attach/RunnerUtil.java rename to test/jdk/com/sun/tools/attach/RunnerUtil.java diff --git a/jdk/test/com/sun/tools/attach/SimpleProvider.java b/test/jdk/com/sun/tools/attach/SimpleProvider.java similarity index 100% rename from jdk/test/com/sun/tools/attach/SimpleProvider.java rename to test/jdk/com/sun/tools/attach/SimpleProvider.java diff --git a/jdk/test/com/sun/tools/attach/StartManagementAgent.java b/test/jdk/com/sun/tools/attach/StartManagementAgent.java similarity index 100% rename from jdk/test/com/sun/tools/attach/StartManagementAgent.java rename to test/jdk/com/sun/tools/attach/StartManagementAgent.java diff --git a/jdk/test/com/sun/tools/attach/TempDirTest.java b/test/jdk/com/sun/tools/attach/TempDirTest.java similarity index 100% rename from jdk/test/com/sun/tools/attach/TempDirTest.java rename to test/jdk/com/sun/tools/attach/TempDirTest.java diff --git a/jdk/test/com/sun/tools/attach/agent.mf b/test/jdk/com/sun/tools/attach/agent.mf similarity index 100% rename from jdk/test/com/sun/tools/attach/agent.mf rename to test/jdk/com/sun/tools/attach/agent.mf diff --git a/jdk/test/com/sun/tools/attach/application.mf b/test/jdk/com/sun/tools/attach/application.mf similarity index 100% rename from jdk/test/com/sun/tools/attach/application.mf rename to test/jdk/com/sun/tools/attach/application.mf diff --git a/jdk/test/com/sun/tools/attach/badagent.mf b/test/jdk/com/sun/tools/attach/badagent.mf similarity index 100% rename from jdk/test/com/sun/tools/attach/badagent.mf rename to test/jdk/com/sun/tools/attach/badagent.mf diff --git a/jdk/test/com/sun/tools/attach/java.policy.allow b/test/jdk/com/sun/tools/attach/java.policy.allow similarity index 100% rename from jdk/test/com/sun/tools/attach/java.policy.allow rename to test/jdk/com/sun/tools/attach/java.policy.allow diff --git a/jdk/test/com/sun/tools/attach/java.policy.deny b/test/jdk/com/sun/tools/attach/java.policy.deny similarity index 100% rename from jdk/test/com/sun/tools/attach/java.policy.deny rename to test/jdk/com/sun/tools/attach/java.policy.deny diff --git a/jdk/test/com/sun/tools/attach/modules/Agent.java b/test/jdk/com/sun/tools/attach/modules/Agent.java similarity index 100% rename from jdk/test/com/sun/tools/attach/modules/Agent.java rename to test/jdk/com/sun/tools/attach/modules/Agent.java diff --git a/jdk/test/com/sun/tools/attach/modules/Driver.java b/test/jdk/com/sun/tools/attach/modules/Driver.java similarity index 100% rename from jdk/test/com/sun/tools/attach/modules/Driver.java rename to test/jdk/com/sun/tools/attach/modules/Driver.java diff --git a/jdk/test/com/sun/tools/attach/modules/m/module-info.java b/test/jdk/com/sun/tools/attach/modules/m/module-info.java similarity index 100% rename from jdk/test/com/sun/tools/attach/modules/m/module-info.java rename to test/jdk/com/sun/tools/attach/modules/m/module-info.java diff --git a/jdk/test/com/sun/tools/attach/modules/m/p/Main.java b/test/jdk/com/sun/tools/attach/modules/m/p/Main.java similarity index 100% rename from jdk/test/com/sun/tools/attach/modules/m/p/Main.java rename to test/jdk/com/sun/tools/attach/modules/m/p/Main.java diff --git a/jdk/test/com/sun/tools/attach/redefineagent.mf b/test/jdk/com/sun/tools/attach/redefineagent.mf similarity index 100% rename from jdk/test/com/sun/tools/attach/redefineagent.mf rename to test/jdk/com/sun/tools/attach/redefineagent.mf diff --git a/jdk/test/java/awt/AlphaComposite/HeadlessAlphaComposite.java b/test/jdk/java/awt/AlphaComposite/HeadlessAlphaComposite.java similarity index 100% rename from jdk/test/java/awt/AlphaComposite/HeadlessAlphaComposite.java rename to test/jdk/java/awt/AlphaComposite/HeadlessAlphaComposite.java diff --git a/jdk/test/java/awt/AlphaComposite/TestAlphaCompositeForNaN.java b/test/jdk/java/awt/AlphaComposite/TestAlphaCompositeForNaN.java similarity index 100% rename from jdk/test/java/awt/AlphaComposite/TestAlphaCompositeForNaN.java rename to test/jdk/java/awt/AlphaComposite/TestAlphaCompositeForNaN.java diff --git a/jdk/test/java/awt/AppContext/ApplicationThreadsStop/ApplicationThreadsStop.java b/test/jdk/java/awt/AppContext/ApplicationThreadsStop/ApplicationThreadsStop.java similarity index 100% rename from jdk/test/java/awt/AppContext/ApplicationThreadsStop/ApplicationThreadsStop.java rename to test/jdk/java/awt/AppContext/ApplicationThreadsStop/ApplicationThreadsStop.java diff --git a/jdk/test/java/awt/AppContext/ApplicationThreadsStop/java.policy b/test/jdk/java/awt/AppContext/ApplicationThreadsStop/java.policy similarity index 100% rename from jdk/test/java/awt/AppContext/ApplicationThreadsStop/java.policy rename to test/jdk/java/awt/AppContext/ApplicationThreadsStop/java.policy diff --git a/jdk/test/java/awt/BasicStroke/DashStrokeTest.java b/test/jdk/java/awt/BasicStroke/DashStrokeTest.java similarity index 100% rename from jdk/test/java/awt/BasicStroke/DashStrokeTest.java rename to test/jdk/java/awt/BasicStroke/DashStrokeTest.java diff --git a/jdk/test/java/awt/Button/ActionEventTest/ActionEventTest.java b/test/jdk/java/awt/Button/ActionEventTest/ActionEventTest.java similarity index 100% rename from jdk/test/java/awt/Button/ActionEventTest/ActionEventTest.java rename to test/jdk/java/awt/Button/ActionEventTest/ActionEventTest.java diff --git a/jdk/test/java/awt/Checkbox/SetStateExcessEvent/SetStateExcessEvent.java b/test/jdk/java/awt/Checkbox/SetStateExcessEvent/SetStateExcessEvent.java similarity index 100% rename from jdk/test/java/awt/Checkbox/SetStateExcessEvent/SetStateExcessEvent.java rename to test/jdk/java/awt/Checkbox/SetStateExcessEvent/SetStateExcessEvent.java diff --git a/jdk/test/java/awt/Choice/ChoiceHiDpi/ChoiceTest.java b/test/jdk/java/awt/Choice/ChoiceHiDpi/ChoiceTest.java similarity index 100% rename from jdk/test/java/awt/Choice/ChoiceHiDpi/ChoiceTest.java rename to test/jdk/java/awt/Choice/ChoiceHiDpi/ChoiceTest.java diff --git a/jdk/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html b/test/jdk/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html similarity index 100% rename from jdk/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html rename to test/jdk/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html diff --git a/jdk/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.java b/test/jdk/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.java similarity index 100% rename from jdk/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.java rename to test/jdk/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.java diff --git a/jdk/test/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java b/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java similarity index 100% rename from jdk/test/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java rename to test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java diff --git a/jdk/test/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java b/test/jdk/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java similarity index 100% rename from jdk/test/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java rename to test/jdk/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java diff --git a/jdk/test/java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java b/test/jdk/java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java similarity index 100% rename from jdk/test/java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java rename to test/jdk/java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java diff --git a/jdk/test/java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java b/test/jdk/java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java similarity index 100% rename from jdk/test/java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java rename to test/jdk/java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java diff --git a/jdk/test/java/awt/Choice/GetSizeTest/GetSizeTest.java b/test/jdk/java/awt/Choice/GetSizeTest/GetSizeTest.java similarity index 100% rename from jdk/test/java/awt/Choice/GetSizeTest/GetSizeTest.java rename to test/jdk/java/awt/Choice/GetSizeTest/GetSizeTest.java diff --git a/jdk/test/java/awt/Choice/GrabLockTest/GrabLockTest.java b/test/jdk/java/awt/Choice/GrabLockTest/GrabLockTest.java similarity index 100% rename from jdk/test/java/awt/Choice/GrabLockTest/GrabLockTest.java rename to test/jdk/java/awt/Choice/GrabLockTest/GrabLockTest.java diff --git a/jdk/test/java/awt/Choice/ItemStateChangeTest/ItemStateChangeTest.java b/test/jdk/java/awt/Choice/ItemStateChangeTest/ItemStateChangeTest.java similarity index 100% rename from jdk/test/java/awt/Choice/ItemStateChangeTest/ItemStateChangeTest.java rename to test/jdk/java/awt/Choice/ItemStateChangeTest/ItemStateChangeTest.java diff --git a/jdk/test/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.html b/test/jdk/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.html similarity index 100% rename from jdk/test/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.html rename to test/jdk/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.html diff --git a/jdk/test/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.java b/test/jdk/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.java similarity index 100% rename from jdk/test/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.java rename to test/jdk/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.java diff --git a/jdk/test/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.html b/test/jdk/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.html similarity index 100% rename from jdk/test/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.html rename to test/jdk/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.html diff --git a/jdk/test/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.java b/test/jdk/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.java similarity index 100% rename from jdk/test/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.java rename to test/jdk/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.java diff --git a/jdk/test/java/awt/Choice/PopupPosTest/PopupPosTest.html b/test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.html similarity index 100% rename from jdk/test/java/awt/Choice/PopupPosTest/PopupPosTest.html rename to test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.html diff --git a/jdk/test/java/awt/Choice/PopupPosTest/PopupPosTest.java b/test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.java similarity index 100% rename from jdk/test/java/awt/Choice/PopupPosTest/PopupPosTest.java rename to test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.java diff --git a/jdk/test/java/awt/Choice/RemoveAllShrinkTest/RemoveAllShrinkTest.java b/test/jdk/java/awt/Choice/RemoveAllShrinkTest/RemoveAllShrinkTest.java similarity index 100% rename from jdk/test/java/awt/Choice/RemoveAllShrinkTest/RemoveAllShrinkTest.java rename to test/jdk/java/awt/Choice/RemoveAllShrinkTest/RemoveAllShrinkTest.java diff --git a/jdk/test/java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java b/test/jdk/java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java similarity index 100% rename from jdk/test/java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java rename to test/jdk/java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java diff --git a/jdk/test/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.html b/test/jdk/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.html similarity index 100% rename from jdk/test/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.html rename to test/jdk/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.html diff --git a/jdk/test/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.java b/test/jdk/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.java similarity index 100% rename from jdk/test/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.java rename to test/jdk/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.java diff --git a/jdk/test/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java b/test/jdk/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java similarity index 100% rename from jdk/test/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java rename to test/jdk/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java diff --git a/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java b/test/jdk/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java similarity index 100% rename from jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java rename to test/jdk/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java diff --git a/jdk/test/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html b/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html similarity index 100% rename from jdk/test/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html rename to test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html diff --git a/jdk/test/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java b/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java similarity index 100% rename from jdk/test/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java rename to test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java diff --git a/jdk/test/java/awt/Color/GetMinMaxValue_ICC_ColorSpace.java b/test/jdk/java/awt/Color/GetMinMaxValue_ICC_ColorSpace.java similarity index 100% rename from jdk/test/java/awt/Color/GetMinMaxValue_ICC_ColorSpace.java rename to test/jdk/java/awt/Color/GetMinMaxValue_ICC_ColorSpace.java diff --git a/jdk/test/java/awt/Color/HeadlessColor.java b/test/jdk/java/awt/Color/HeadlessColor.java similarity index 100% rename from jdk/test/java/awt/Color/HeadlessColor.java rename to test/jdk/java/awt/Color/HeadlessColor.java diff --git a/jdk/test/java/awt/Color/LoadProfileWithSM.java b/test/jdk/java/awt/Color/LoadProfileWithSM.java similarity index 100% rename from jdk/test/java/awt/Color/LoadProfileWithSM.java rename to test/jdk/java/awt/Color/LoadProfileWithSM.java diff --git a/jdk/test/java/awt/Color/LoadStandardProfilesTest.java b/test/jdk/java/awt/Color/LoadStandardProfilesTest.java similarity index 100% rename from jdk/test/java/awt/Color/LoadStandardProfilesTest.java rename to test/jdk/java/awt/Color/LoadStandardProfilesTest.java diff --git a/jdk/test/java/awt/Color/OpacityChange/OpacityChange.java b/test/jdk/java/awt/Color/OpacityChange/OpacityChange.java similarity index 100% rename from jdk/test/java/awt/Color/OpacityChange/OpacityChange.java rename to test/jdk/java/awt/Color/OpacityChange/OpacityChange.java diff --git a/jdk/test/java/awt/Component/7097771/bug7097771.java b/test/jdk/java/awt/Component/7097771/bug7097771.java similarity index 100% rename from jdk/test/java/awt/Component/7097771/bug7097771.java rename to test/jdk/java/awt/Component/7097771/bug7097771.java diff --git a/jdk/test/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java b/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java similarity index 100% rename from jdk/test/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java rename to test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java diff --git a/jdk/test/java/awt/Component/CreateImage/CreateImage.java b/test/jdk/java/awt/Component/CreateImage/CreateImage.java similarity index 100% rename from jdk/test/java/awt/Component/CreateImage/CreateImage.java rename to test/jdk/java/awt/Component/CreateImage/CreateImage.java diff --git a/jdk/test/java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java b/test/jdk/java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java similarity index 100% rename from jdk/test/java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java rename to test/jdk/java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java diff --git a/jdk/test/java/awt/Component/F10TopToplevel/F10TopToplevel.html b/test/jdk/java/awt/Component/F10TopToplevel/F10TopToplevel.html similarity index 100% rename from jdk/test/java/awt/Component/F10TopToplevel/F10TopToplevel.html rename to test/jdk/java/awt/Component/F10TopToplevel/F10TopToplevel.html diff --git a/jdk/test/java/awt/Component/F10TopToplevel/F10TopToplevel.java b/test/jdk/java/awt/Component/F10TopToplevel/F10TopToplevel.java similarity index 100% rename from jdk/test/java/awt/Component/F10TopToplevel/F10TopToplevel.java rename to test/jdk/java/awt/Component/F10TopToplevel/F10TopToplevel.java diff --git a/jdk/test/java/awt/Component/GetScreenLocTest/GetScreenLocTest.java b/test/jdk/java/awt/Component/GetScreenLocTest/GetScreenLocTest.java similarity index 100% rename from jdk/test/java/awt/Component/GetScreenLocTest/GetScreenLocTest.java rename to test/jdk/java/awt/Component/GetScreenLocTest/GetScreenLocTest.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessButton.java b/test/jdk/java/awt/Component/Headless/HeadlessButton.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessButton.java rename to test/jdk/java/awt/Component/Headless/HeadlessButton.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessCanvas.java b/test/jdk/java/awt/Component/Headless/HeadlessCanvas.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessCanvas.java rename to test/jdk/java/awt/Component/Headless/HeadlessCanvas.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessCheckbox.java b/test/jdk/java/awt/Component/Headless/HeadlessCheckbox.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessCheckbox.java rename to test/jdk/java/awt/Component/Headless/HeadlessCheckbox.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessChoice.java b/test/jdk/java/awt/Component/Headless/HeadlessChoice.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessChoice.java rename to test/jdk/java/awt/Component/Headless/HeadlessChoice.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessComponent.java b/test/jdk/java/awt/Component/Headless/HeadlessComponent.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessComponent.java rename to test/jdk/java/awt/Component/Headless/HeadlessComponent.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessContainer.java b/test/jdk/java/awt/Component/Headless/HeadlessContainer.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessContainer.java rename to test/jdk/java/awt/Component/Headless/HeadlessContainer.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessDialog.java b/test/jdk/java/awt/Component/Headless/HeadlessDialog.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessDialog.java rename to test/jdk/java/awt/Component/Headless/HeadlessDialog.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessFileDialog.java b/test/jdk/java/awt/Component/Headless/HeadlessFileDialog.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessFileDialog.java rename to test/jdk/java/awt/Component/Headless/HeadlessFileDialog.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessFrame.java b/test/jdk/java/awt/Component/Headless/HeadlessFrame.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessFrame.java rename to test/jdk/java/awt/Component/Headless/HeadlessFrame.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessLabel.java b/test/jdk/java/awt/Component/Headless/HeadlessLabel.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessLabel.java rename to test/jdk/java/awt/Component/Headless/HeadlessLabel.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessList.java b/test/jdk/java/awt/Component/Headless/HeadlessList.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessList.java rename to test/jdk/java/awt/Component/Headless/HeadlessList.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessPanel.java b/test/jdk/java/awt/Component/Headless/HeadlessPanel.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessPanel.java rename to test/jdk/java/awt/Component/Headless/HeadlessPanel.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessScrollPane.java b/test/jdk/java/awt/Component/Headless/HeadlessScrollPane.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessScrollPane.java rename to test/jdk/java/awt/Component/Headless/HeadlessScrollPane.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessScrollbar.java b/test/jdk/java/awt/Component/Headless/HeadlessScrollbar.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessScrollbar.java rename to test/jdk/java/awt/Component/Headless/HeadlessScrollbar.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessTextArea.java b/test/jdk/java/awt/Component/Headless/HeadlessTextArea.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessTextArea.java rename to test/jdk/java/awt/Component/Headless/HeadlessTextArea.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessTextField.java b/test/jdk/java/awt/Component/Headless/HeadlessTextField.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessTextField.java rename to test/jdk/java/awt/Component/Headless/HeadlessTextField.java diff --git a/jdk/test/java/awt/Component/Headless/HeadlessWindow.java b/test/jdk/java/awt/Component/Headless/HeadlessWindow.java similarity index 100% rename from jdk/test/java/awt/Component/Headless/HeadlessWindow.java rename to test/jdk/java/awt/Component/Headless/HeadlessWindow.java diff --git a/jdk/test/java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java b/test/jdk/java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java similarity index 100% rename from jdk/test/java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java rename to test/jdk/java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java diff --git a/jdk/test/java/awt/Component/NativeInLightShow/NativeInLightShow.java b/test/jdk/java/awt/Component/NativeInLightShow/NativeInLightShow.java similarity index 100% rename from jdk/test/java/awt/Component/NativeInLightShow/NativeInLightShow.java rename to test/jdk/java/awt/Component/NativeInLightShow/NativeInLightShow.java diff --git a/jdk/test/java/awt/Component/NoUpdateUponShow/NoUpdateUponShow.java b/test/jdk/java/awt/Component/NoUpdateUponShow/NoUpdateUponShow.java similarity index 100% rename from jdk/test/java/awt/Component/NoUpdateUponShow/NoUpdateUponShow.java rename to test/jdk/java/awt/Component/NoUpdateUponShow/NoUpdateUponShow.java diff --git a/jdk/test/java/awt/Component/PaintAll/PaintAll.java b/test/jdk/java/awt/Component/PaintAll/PaintAll.java similarity index 100% rename from jdk/test/java/awt/Component/PaintAll/PaintAll.java rename to test/jdk/java/awt/Component/PaintAll/PaintAll.java diff --git a/jdk/test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java b/test/jdk/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java similarity index 100% rename from jdk/test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java rename to test/jdk/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java diff --git a/jdk/test/java/awt/Component/Revalidate/Revalidate.java b/test/jdk/java/awt/Component/Revalidate/Revalidate.java similarity index 100% rename from jdk/test/java/awt/Component/Revalidate/Revalidate.java rename to test/jdk/java/awt/Component/Revalidate/Revalidate.java diff --git a/jdk/test/java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java b/test/jdk/java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java similarity index 100% rename from jdk/test/java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java rename to test/jdk/java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java diff --git a/jdk/test/java/awt/Component/TreeLockDeadlock/TreeLockDeadlock.java b/test/jdk/java/awt/Component/TreeLockDeadlock/TreeLockDeadlock.java similarity index 100% rename from jdk/test/java/awt/Component/TreeLockDeadlock/TreeLockDeadlock.java rename to test/jdk/java/awt/Component/TreeLockDeadlock/TreeLockDeadlock.java diff --git a/jdk/test/java/awt/Component/UpdatingBootTime/UpdatingBootTime.html b/test/jdk/java/awt/Component/UpdatingBootTime/UpdatingBootTime.html similarity index 100% rename from jdk/test/java/awt/Component/UpdatingBootTime/UpdatingBootTime.html rename to test/jdk/java/awt/Component/UpdatingBootTime/UpdatingBootTime.html diff --git a/jdk/test/java/awt/Component/UpdatingBootTime/UpdatingBootTime.java b/test/jdk/java/awt/Component/UpdatingBootTime/UpdatingBootTime.java similarity index 100% rename from jdk/test/java/awt/Component/UpdatingBootTime/UpdatingBootTime.java rename to test/jdk/java/awt/Component/UpdatingBootTime/UpdatingBootTime.java diff --git a/jdk/test/java/awt/Component/isLightweightCrash/IsLightweightCrash.java b/test/jdk/java/awt/Component/isLightweightCrash/IsLightweightCrash.java similarity index 100% rename from jdk/test/java/awt/Component/isLightweightCrash/IsLightweightCrash.java rename to test/jdk/java/awt/Component/isLightweightCrash/IsLightweightCrash.java diff --git a/jdk/test/java/awt/ComponentOrientation/BasicTest.java b/test/jdk/java/awt/ComponentOrientation/BasicTest.java similarity index 100% rename from jdk/test/java/awt/ComponentOrientation/BasicTest.java rename to test/jdk/java/awt/ComponentOrientation/BasicTest.java diff --git a/jdk/test/java/awt/ComponentOrientation/BorderTest.java b/test/jdk/java/awt/ComponentOrientation/BorderTest.java similarity index 100% rename from jdk/test/java/awt/ComponentOrientation/BorderTest.java rename to test/jdk/java/awt/ComponentOrientation/BorderTest.java diff --git a/jdk/test/java/awt/ComponentOrientation/FlowTest.java b/test/jdk/java/awt/ComponentOrientation/FlowTest.java similarity index 100% rename from jdk/test/java/awt/ComponentOrientation/FlowTest.java rename to test/jdk/java/awt/ComponentOrientation/FlowTest.java diff --git a/jdk/test/java/awt/ComponentOrientation/TestBundle.java b/test/jdk/java/awt/ComponentOrientation/TestBundle.java similarity index 100% rename from jdk/test/java/awt/ComponentOrientation/TestBundle.java rename to test/jdk/java/awt/ComponentOrientation/TestBundle.java diff --git a/jdk/test/java/awt/ComponentOrientation/TestBundle1.java b/test/jdk/java/awt/ComponentOrientation/TestBundle1.java similarity index 100% rename from jdk/test/java/awt/ComponentOrientation/TestBundle1.java rename to test/jdk/java/awt/ComponentOrientation/TestBundle1.java diff --git a/jdk/test/java/awt/ComponentOrientation/TestBundle1_ar.java b/test/jdk/java/awt/ComponentOrientation/TestBundle1_ar.java similarity index 100% rename from jdk/test/java/awt/ComponentOrientation/TestBundle1_ar.java rename to test/jdk/java/awt/ComponentOrientation/TestBundle1_ar.java diff --git a/jdk/test/java/awt/ComponentOrientation/TestBundle_es.java b/test/jdk/java/awt/ComponentOrientation/TestBundle_es.java similarity index 100% rename from jdk/test/java/awt/ComponentOrientation/TestBundle_es.java rename to test/jdk/java/awt/ComponentOrientation/TestBundle_es.java diff --git a/jdk/test/java/awt/ComponentOrientation/TestBundle_iw.java b/test/jdk/java/awt/ComponentOrientation/TestBundle_iw.java similarity index 100% rename from jdk/test/java/awt/ComponentOrientation/TestBundle_iw.java rename to test/jdk/java/awt/ComponentOrientation/TestBundle_iw.java diff --git a/jdk/test/java/awt/ComponentOrientation/WindowTest.java b/test/jdk/java/awt/ComponentOrientation/WindowTest.java similarity index 100% rename from jdk/test/java/awt/ComponentOrientation/WindowTest.java rename to test/jdk/java/awt/ComponentOrientation/WindowTest.java diff --git a/jdk/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java b/test/jdk/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java similarity index 100% rename from jdk/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java rename to test/jdk/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java diff --git a/jdk/test/java/awt/Container/ContainerAIOOBE/ContainerAIOOBE.java b/test/jdk/java/awt/Container/ContainerAIOOBE/ContainerAIOOBE.java similarity index 100% rename from jdk/test/java/awt/Container/ContainerAIOOBE/ContainerAIOOBE.java rename to test/jdk/java/awt/Container/ContainerAIOOBE/ContainerAIOOBE.java diff --git a/jdk/test/java/awt/Container/MoveToOtherScreenTest/MoveToOtherScreenTest.java b/test/jdk/java/awt/Container/MoveToOtherScreenTest/MoveToOtherScreenTest.java similarity index 100% rename from jdk/test/java/awt/Container/MoveToOtherScreenTest/MoveToOtherScreenTest.java rename to test/jdk/java/awt/Container/MoveToOtherScreenTest/MoveToOtherScreenTest.java diff --git a/jdk/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java b/test/jdk/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java similarity index 100% rename from jdk/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java rename to test/jdk/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java diff --git a/jdk/test/java/awt/Container/isRemoveNotifyNeeded/JInternalFrameTest.java b/test/jdk/java/awt/Container/isRemoveNotifyNeeded/JInternalFrameTest.java similarity index 100% rename from jdk/test/java/awt/Container/isRemoveNotifyNeeded/JInternalFrameTest.java rename to test/jdk/java/awt/Container/isRemoveNotifyNeeded/JInternalFrameTest.java diff --git a/jdk/test/java/awt/Cursor/CursorOverlappedPanelsTest/CursorOverlappedPanelsTest.html b/test/jdk/java/awt/Cursor/CursorOverlappedPanelsTest/CursorOverlappedPanelsTest.html similarity index 100% rename from jdk/test/java/awt/Cursor/CursorOverlappedPanelsTest/CursorOverlappedPanelsTest.html rename to test/jdk/java/awt/Cursor/CursorOverlappedPanelsTest/CursorOverlappedPanelsTest.html diff --git a/jdk/test/java/awt/Cursor/CursorOverlappedPanelsTest/CursorOverlappedPanelsTest.java b/test/jdk/java/awt/Cursor/CursorOverlappedPanelsTest/CursorOverlappedPanelsTest.java similarity index 100% rename from jdk/test/java/awt/Cursor/CursorOverlappedPanelsTest/CursorOverlappedPanelsTest.java rename to test/jdk/java/awt/Cursor/CursorOverlappedPanelsTest/CursorOverlappedPanelsTest.java diff --git a/jdk/test/java/awt/Cursor/GetSystemCustomCursor/GetSystemCustomCursor.java b/test/jdk/java/awt/Cursor/GetSystemCustomCursor/GetSystemCustomCursor.java similarity index 100% rename from jdk/test/java/awt/Cursor/GetSystemCustomCursor/GetSystemCustomCursor.java rename to test/jdk/java/awt/Cursor/GetSystemCustomCursor/GetSystemCustomCursor.java diff --git a/jdk/test/java/awt/Cursor/HeadlessCursor.java b/test/jdk/java/awt/Cursor/HeadlessCursor.java similarity index 100% rename from jdk/test/java/awt/Cursor/HeadlessCursor.java rename to test/jdk/java/awt/Cursor/HeadlessCursor.java diff --git a/jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.html b/test/jdk/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.html similarity index 100% rename from jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.html rename to test/jdk/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.html diff --git a/jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java b/test/jdk/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java similarity index 100% rename from jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java rename to test/jdk/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java diff --git a/jdk/test/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java b/test/jdk/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java similarity index 100% rename from jdk/test/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java rename to test/jdk/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java diff --git a/jdk/test/java/awt/Debug/DumpOnKey/DumpOnKey.java b/test/jdk/java/awt/Debug/DumpOnKey/DumpOnKey.java similarity index 100% rename from jdk/test/java/awt/Debug/DumpOnKey/DumpOnKey.java rename to test/jdk/java/awt/Debug/DumpOnKey/DumpOnKey.java diff --git a/jdk/test/java/awt/Debug/DumpOnKey/dump.policy b/test/jdk/java/awt/Debug/DumpOnKey/dump.policy similarity index 100% rename from jdk/test/java/awt/Debug/DumpOnKey/dump.policy rename to test/jdk/java/awt/Debug/DumpOnKey/dump.policy diff --git a/jdk/test/java/awt/Desktop/8064934/bug8064934.java b/test/jdk/java/awt/Desktop/8064934/bug8064934.java similarity index 100% rename from jdk/test/java/awt/Desktop/8064934/bug8064934.java rename to test/jdk/java/awt/Desktop/8064934/bug8064934.java diff --git a/jdk/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java b/test/jdk/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java similarity index 100% rename from jdk/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java rename to test/jdk/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java diff --git a/jdk/test/java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java b/test/jdk/java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java similarity index 100% rename from jdk/test/java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java rename to test/jdk/java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java diff --git a/jdk/test/java/awt/Dialog/ChildProperties/ChildDialogProperties.java b/test/jdk/java/awt/Dialog/ChildProperties/ChildDialogProperties.java similarity index 100% rename from jdk/test/java/awt/Dialog/ChildProperties/ChildDialogProperties.java rename to test/jdk/java/awt/Dialog/ChildProperties/ChildDialogProperties.java diff --git a/jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java b/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java similarity index 100% rename from jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java rename to test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java diff --git a/jdk/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java b/test/jdk/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java similarity index 100% rename from jdk/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java rename to test/jdk/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java diff --git a/jdk/test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java b/test/jdk/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java similarity index 100% rename from jdk/test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java rename to test/jdk/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java diff --git a/jdk/test/java/awt/Dialog/DialogOverflowSizeTest/DialogSizeOverflowTest.java b/test/jdk/java/awt/Dialog/DialogOverflowSizeTest/DialogSizeOverflowTest.java similarity index 100% rename from jdk/test/java/awt/Dialog/DialogOverflowSizeTest/DialogSizeOverflowTest.java rename to test/jdk/java/awt/Dialog/DialogOverflowSizeTest/DialogSizeOverflowTest.java diff --git a/jdk/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java b/test/jdk/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java similarity index 100% rename from jdk/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java rename to test/jdk/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java diff --git a/jdk/test/java/awt/Dialog/ModalDialogPermission/ModalDialogPermission.java b/test/jdk/java/awt/Dialog/ModalDialogPermission/ModalDialogPermission.java similarity index 100% rename from jdk/test/java/awt/Dialog/ModalDialogPermission/ModalDialogPermission.java rename to test/jdk/java/awt/Dialog/ModalDialogPermission/ModalDialogPermission.java diff --git a/jdk/test/java/awt/Dialog/ModalDialogPermission/java.policy b/test/jdk/java/awt/Dialog/ModalDialogPermission/java.policy similarity index 100% rename from jdk/test/java/awt/Dialog/ModalDialogPermission/java.policy rename to test/jdk/java/awt/Dialog/ModalDialogPermission/java.policy diff --git a/jdk/test/java/awt/Dialog/NestedDialogs/Modal/NestedModalDialogTest.java b/test/jdk/java/awt/Dialog/NestedDialogs/Modal/NestedModalDialogTest.java similarity index 100% rename from jdk/test/java/awt/Dialog/NestedDialogs/Modal/NestedModalDialogTest.java rename to test/jdk/java/awt/Dialog/NestedDialogs/Modal/NestedModalDialogTest.java diff --git a/jdk/test/java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java b/test/jdk/java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java similarity index 100% rename from jdk/test/java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java rename to test/jdk/java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java diff --git a/jdk/test/java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java b/test/jdk/java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java similarity index 100% rename from jdk/test/java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java rename to test/jdk/java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java diff --git a/jdk/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java b/test/jdk/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java similarity index 100% rename from jdk/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java rename to test/jdk/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java diff --git a/jdk/test/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java b/test/jdk/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java similarity index 100% rename from jdk/test/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java rename to test/jdk/java/awt/EmbeddedFrame/DisplayChangedTest/DisplayChangedTest.java diff --git a/jdk/test/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java b/test/jdk/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java similarity index 100% rename from jdk/test/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java rename to test/jdk/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java diff --git a/jdk/test/java/awt/EmbeddedFrame/GraphicsConfigTest/GraphicsConfigTest.java b/test/jdk/java/awt/EmbeddedFrame/GraphicsConfigTest/GraphicsConfigTest.java similarity index 100% rename from jdk/test/java/awt/EmbeddedFrame/GraphicsConfigTest/GraphicsConfigTest.java rename to test/jdk/java/awt/EmbeddedFrame/GraphicsConfigTest/GraphicsConfigTest.java diff --git a/jdk/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java b/test/jdk/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java similarity index 100% rename from jdk/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java rename to test/jdk/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java diff --git a/jdk/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java b/test/jdk/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java similarity index 100% rename from jdk/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java rename to test/jdk/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java diff --git a/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html b/test/jdk/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html similarity index 100% rename from jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html rename to test/jdk/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html diff --git a/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java b/test/jdk/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java similarity index 100% rename from jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java rename to test/jdk/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java diff --git a/jdk/test/java/awt/EventDispatchThread/PreserveDispathThread/PreserveDispatchThread.java b/test/jdk/java/awt/EventDispatchThread/PreserveDispathThread/PreserveDispatchThread.java similarity index 100% rename from jdk/test/java/awt/EventDispatchThread/PreserveDispathThread/PreserveDispatchThread.java rename to test/jdk/java/awt/EventDispatchThread/PreserveDispathThread/PreserveDispatchThread.java diff --git a/jdk/test/java/awt/EventDispatchThread/PropertyPermissionOnEDT/PropertyPermissionOnEDT.java b/test/jdk/java/awt/EventDispatchThread/PropertyPermissionOnEDT/PropertyPermissionOnEDT.java similarity index 100% rename from jdk/test/java/awt/EventDispatchThread/PropertyPermissionOnEDT/PropertyPermissionOnEDT.java rename to test/jdk/java/awt/EventDispatchThread/PropertyPermissionOnEDT/PropertyPermissionOnEDT.java diff --git a/jdk/test/java/awt/EventDispatchThread/PropertyPermissionOnEDT/java.policy b/test/jdk/java/awt/EventDispatchThread/PropertyPermissionOnEDT/java.policy similarity index 100% rename from jdk/test/java/awt/EventDispatchThread/PropertyPermissionOnEDT/java.policy rename to test/jdk/java/awt/EventDispatchThread/PropertyPermissionOnEDT/java.policy diff --git a/jdk/test/java/awt/EventQueue/6980209/bug6980209.java b/test/jdk/java/awt/EventQueue/6980209/bug6980209.java similarity index 100% rename from jdk/test/java/awt/EventQueue/6980209/bug6980209.java rename to test/jdk/java/awt/EventQueue/6980209/bug6980209.java diff --git a/jdk/test/java/awt/EventQueue/HeadlessEventQueue.java b/test/jdk/java/awt/EventQueue/HeadlessEventQueue.java similarity index 100% rename from jdk/test/java/awt/EventQueue/HeadlessEventQueue.java rename to test/jdk/java/awt/EventQueue/HeadlessEventQueue.java diff --git a/jdk/test/java/awt/EventQueue/InvocationEventTest/InvocationEventTest.java b/test/jdk/java/awt/EventQueue/InvocationEventTest/InvocationEventTest.java similarity index 100% rename from jdk/test/java/awt/EventQueue/InvocationEventTest/InvocationEventTest.java rename to test/jdk/java/awt/EventQueue/InvocationEventTest/InvocationEventTest.java diff --git a/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java b/test/jdk/java/awt/EventQueue/MainAppContext/MainAppContext.java similarity index 100% rename from jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java rename to test/jdk/java/awt/EventQueue/MainAppContext/MainAppContext.java diff --git a/jdk/test/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java b/test/jdk/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java similarity index 100% rename from jdk/test/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java rename to test/jdk/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java diff --git a/jdk/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java b/test/jdk/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java similarity index 100% rename from jdk/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java rename to test/jdk/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java diff --git a/jdk/test/java/awt/EventQueue/SecondaryLoopTest/SecondaryLoopTest.java b/test/jdk/java/awt/EventQueue/SecondaryLoopTest/SecondaryLoopTest.java similarity index 100% rename from jdk/test/java/awt/EventQueue/SecondaryLoopTest/SecondaryLoopTest.java rename to test/jdk/java/awt/EventQueue/SecondaryLoopTest/SecondaryLoopTest.java diff --git a/jdk/test/java/awt/FileDialog/8003399/bug8003399.java b/test/jdk/java/awt/FileDialog/8003399/bug8003399.java similarity index 100% rename from jdk/test/java/awt/FileDialog/8003399/bug8003399.java rename to test/jdk/java/awt/FileDialog/8003399/bug8003399.java diff --git a/jdk/test/java/awt/FileDialog/8017487/bug8017487.java b/test/jdk/java/awt/FileDialog/8017487/bug8017487.java similarity index 100% rename from jdk/test/java/awt/FileDialog/8017487/bug8017487.java rename to test/jdk/java/awt/FileDialog/8017487/bug8017487.java diff --git a/jdk/test/java/awt/FileDialog/DefaultFocusOwner/DefaultFocusOwner.java b/test/jdk/java/awt/FileDialog/DefaultFocusOwner/DefaultFocusOwner.java similarity index 100% rename from jdk/test/java/awt/FileDialog/DefaultFocusOwner/DefaultFocusOwner.java rename to test/jdk/java/awt/FileDialog/DefaultFocusOwner/DefaultFocusOwner.java diff --git a/jdk/test/java/awt/FileDialog/DeleteInsideFileDialog/DeleteInsideFileDialogTest.java b/test/jdk/java/awt/FileDialog/DeleteInsideFileDialog/DeleteInsideFileDialogTest.java similarity index 100% rename from jdk/test/java/awt/FileDialog/DeleteInsideFileDialog/DeleteInsideFileDialogTest.java rename to test/jdk/java/awt/FileDialog/DeleteInsideFileDialog/DeleteInsideFileDialogTest.java diff --git a/jdk/test/java/awt/FileDialog/FileDialogForDirectories/FileDialogForDirectories.html b/test/jdk/java/awt/FileDialog/FileDialogForDirectories/FileDialogForDirectories.html similarity index 100% rename from jdk/test/java/awt/FileDialog/FileDialogForDirectories/FileDialogForDirectories.html rename to test/jdk/java/awt/FileDialog/FileDialogForDirectories/FileDialogForDirectories.html diff --git a/jdk/test/java/awt/FileDialog/FileDialogForDirectories/FileDialogForDirectories.java b/test/jdk/java/awt/FileDialog/FileDialogForDirectories/FileDialogForDirectories.java similarity index 100% rename from jdk/test/java/awt/FileDialog/FileDialogForDirectories/FileDialogForDirectories.java rename to test/jdk/java/awt/FileDialog/FileDialogForDirectories/FileDialogForDirectories.java diff --git a/jdk/test/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.html b/test/jdk/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.html similarity index 100% rename from jdk/test/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.html rename to test/jdk/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.html diff --git a/jdk/test/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.java b/test/jdk/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.java similarity index 100% rename from jdk/test/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.java rename to test/jdk/java/awt/FileDialog/FileDialogForPackages/FileDialogForPackages.java diff --git a/jdk/test/java/awt/FileDialog/FileDialogIconTest/FileDialogIconTest.java b/test/jdk/java/awt/FileDialog/FileDialogIconTest/FileDialogIconTest.java similarity index 100% rename from jdk/test/java/awt/FileDialog/FileDialogIconTest/FileDialogIconTest.java rename to test/jdk/java/awt/FileDialog/FileDialogIconTest/FileDialogIconTest.java diff --git a/jdk/test/java/awt/FileDialog/FileDialogOpenDirTest/FileDialogOpenDirTest.html b/test/jdk/java/awt/FileDialog/FileDialogOpenDirTest/FileDialogOpenDirTest.html similarity index 100% rename from jdk/test/java/awt/FileDialog/FileDialogOpenDirTest/FileDialogOpenDirTest.html rename to test/jdk/java/awt/FileDialog/FileDialogOpenDirTest/FileDialogOpenDirTest.html diff --git a/jdk/test/java/awt/FileDialog/FileDialogOpenDirTest/FileDialogOpenDirTest.java b/test/jdk/java/awt/FileDialog/FileDialogOpenDirTest/FileDialogOpenDirTest.java similarity index 100% rename from jdk/test/java/awt/FileDialog/FileDialogOpenDirTest/FileDialogOpenDirTest.java rename to test/jdk/java/awt/FileDialog/FileDialogOpenDirTest/FileDialogOpenDirTest.java diff --git a/jdk/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.html b/test/jdk/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.html similarity index 100% rename from jdk/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.html rename to test/jdk/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.html diff --git a/jdk/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.java b/test/jdk/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.java similarity index 100% rename from jdk/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.java rename to test/jdk/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.java diff --git a/jdk/test/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.html b/test/jdk/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.html similarity index 100% rename from jdk/test/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.html rename to test/jdk/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.html diff --git a/jdk/test/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.java b/test/jdk/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.java similarity index 100% rename from jdk/test/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.java rename to test/jdk/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.java diff --git a/jdk/test/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html b/test/jdk/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html similarity index 100% rename from jdk/test/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html rename to test/jdk/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html diff --git a/jdk/test/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java b/test/jdk/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java similarity index 100% rename from jdk/test/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java rename to test/jdk/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java diff --git a/jdk/test/java/awt/FileDialog/ISCthrownByFileListTest/ISCthrownByFileListTest.java b/test/jdk/java/awt/FileDialog/ISCthrownByFileListTest/ISCthrownByFileListTest.java similarity index 100% rename from jdk/test/java/awt/FileDialog/ISCthrownByFileListTest/ISCthrownByFileListTest.java rename to test/jdk/java/awt/FileDialog/ISCthrownByFileListTest/ISCthrownByFileListTest.java diff --git a/jdk/test/java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java b/test/jdk/java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java similarity index 100% rename from jdk/test/java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java rename to test/jdk/java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java diff --git a/jdk/test/java/awt/FileDialog/MultipleMode/MultipleMode.html b/test/jdk/java/awt/FileDialog/MultipleMode/MultipleMode.html similarity index 100% rename from jdk/test/java/awt/FileDialog/MultipleMode/MultipleMode.html rename to test/jdk/java/awt/FileDialog/MultipleMode/MultipleMode.html diff --git a/jdk/test/java/awt/FileDialog/MultipleMode/MultipleMode.java b/test/jdk/java/awt/FileDialog/MultipleMode/MultipleMode.java similarity index 100% rename from jdk/test/java/awt/FileDialog/MultipleMode/MultipleMode.java rename to test/jdk/java/awt/FileDialog/MultipleMode/MultipleMode.java diff --git a/jdk/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.html b/test/jdk/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.html similarity index 100% rename from jdk/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.html rename to test/jdk/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.html diff --git a/jdk/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.java b/test/jdk/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.java similarity index 100% rename from jdk/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.java rename to test/jdk/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.java diff --git a/jdk/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.html b/test/jdk/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.html similarity index 100% rename from jdk/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.html rename to test/jdk/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.html diff --git a/jdk/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java b/test/jdk/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java similarity index 100% rename from jdk/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java rename to test/jdk/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java diff --git a/jdk/test/java/awt/Focus/6378278/InputVerifierTest.java b/test/jdk/java/awt/Focus/6378278/InputVerifierTest.java similarity index 100% rename from jdk/test/java/awt/Focus/6378278/InputVerifierTest.java rename to test/jdk/java/awt/Focus/6378278/InputVerifierTest.java diff --git a/jdk/test/java/awt/Focus/6382144/EndlessLoopTest.java b/test/jdk/java/awt/Focus/6382144/EndlessLoopTest.java similarity index 100% rename from jdk/test/java/awt/Focus/6382144/EndlessLoopTest.java rename to test/jdk/java/awt/Focus/6382144/EndlessLoopTest.java diff --git a/jdk/test/java/awt/Focus/6401036/InputVerifierTest2.java b/test/jdk/java/awt/Focus/6401036/InputVerifierTest2.java similarity index 100% rename from jdk/test/java/awt/Focus/6401036/InputVerifierTest2.java rename to test/jdk/java/awt/Focus/6401036/InputVerifierTest2.java diff --git a/jdk/test/java/awt/Focus/6981400/Test1.java b/test/jdk/java/awt/Focus/6981400/Test1.java similarity index 100% rename from jdk/test/java/awt/Focus/6981400/Test1.java rename to test/jdk/java/awt/Focus/6981400/Test1.java diff --git a/jdk/test/java/awt/Focus/6981400/Test2.java b/test/jdk/java/awt/Focus/6981400/Test2.java similarity index 100% rename from jdk/test/java/awt/Focus/6981400/Test2.java rename to test/jdk/java/awt/Focus/6981400/Test2.java diff --git a/jdk/test/java/awt/Focus/6981400/Test3.java b/test/jdk/java/awt/Focus/6981400/Test3.java similarity index 100% rename from jdk/test/java/awt/Focus/6981400/Test3.java rename to test/jdk/java/awt/Focus/6981400/Test3.java diff --git a/jdk/test/java/awt/Focus/8013611/JDK8013611.java b/test/jdk/java/awt/Focus/8013611/JDK8013611.java similarity index 100% rename from jdk/test/java/awt/Focus/8013611/JDK8013611.java rename to test/jdk/java/awt/Focus/8013611/JDK8013611.java diff --git a/jdk/test/java/awt/Focus/8044614/TestApplet.java b/test/jdk/java/awt/Focus/8044614/TestApplet.java similarity index 100% rename from jdk/test/java/awt/Focus/8044614/TestApplet.java rename to test/jdk/java/awt/Focus/8044614/TestApplet.java diff --git a/jdk/test/java/awt/Focus/8044614/applet1.html b/test/jdk/java/awt/Focus/8044614/applet1.html similarity index 100% rename from jdk/test/java/awt/Focus/8044614/applet1.html rename to test/jdk/java/awt/Focus/8044614/applet1.html diff --git a/jdk/test/java/awt/Focus/8044614/applet2.html b/test/jdk/java/awt/Focus/8044614/applet2.html similarity index 100% rename from jdk/test/java/awt/Focus/8044614/applet2.html rename to test/jdk/java/awt/Focus/8044614/applet2.html diff --git a/jdk/test/java/awt/Focus/8044614/bug8044614.html b/test/jdk/java/awt/Focus/8044614/bug8044614.html similarity index 100% rename from jdk/test/java/awt/Focus/8044614/bug8044614.html rename to test/jdk/java/awt/Focus/8044614/bug8044614.html diff --git a/jdk/test/java/awt/Focus/8044614/bug8044614.java b/test/jdk/java/awt/Focus/8044614/bug8044614.java similarity index 100% rename from jdk/test/java/awt/Focus/8044614/bug8044614.java rename to test/jdk/java/awt/Focus/8044614/bug8044614.java diff --git a/jdk/test/java/awt/Focus/8044614/main.html b/test/jdk/java/awt/Focus/8044614/main.html similarity index 100% rename from jdk/test/java/awt/Focus/8044614/main.html rename to test/jdk/java/awt/Focus/8044614/main.html diff --git a/jdk/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java b/test/jdk/java/awt/Focus/8073453/AWTFocusTransitionTest.java similarity index 100% rename from jdk/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java rename to test/jdk/java/awt/Focus/8073453/AWTFocusTransitionTest.java diff --git a/jdk/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java b/test/jdk/java/awt/Focus/8073453/SwingFocusTransitionTest.java similarity index 100% rename from jdk/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java rename to test/jdk/java/awt/Focus/8073453/SwingFocusTransitionTest.java diff --git a/jdk/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java b/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java similarity index 100% rename from jdk/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java rename to test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java diff --git a/jdk/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java b/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java similarity index 100% rename from jdk/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java rename to test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java diff --git a/jdk/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html b/test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html similarity index 100% rename from jdk/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html rename to test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html diff --git a/jdk/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java b/test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java similarity index 100% rename from jdk/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java rename to test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java diff --git a/jdk/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html b/test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html similarity index 100% rename from jdk/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html rename to test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html diff --git a/jdk/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java b/test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java similarity index 100% rename from jdk/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java rename to test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java diff --git a/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java b/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java similarity index 100% rename from jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java rename to test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java diff --git a/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java b/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java similarity index 100% rename from jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java rename to test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java diff --git a/jdk/test/java/awt/Focus/AutoRequestFocusTest/TestHelper.java b/test/jdk/java/awt/Focus/AutoRequestFocusTest/TestHelper.java similarity index 100% rename from jdk/test/java/awt/Focus/AutoRequestFocusTest/TestHelper.java rename to test/jdk/java/awt/Focus/AutoRequestFocusTest/TestHelper.java diff --git a/jdk/test/java/awt/Focus/Cause/FocusCauseTest.java b/test/jdk/java/awt/Focus/Cause/FocusCauseTest.java similarity index 100% rename from jdk/test/java/awt/Focus/Cause/FocusCauseTest.java rename to test/jdk/java/awt/Focus/Cause/FocusCauseTest.java diff --git a/jdk/test/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.html b/test/jdk/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.html similarity index 100% rename from jdk/test/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.html rename to test/jdk/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.html diff --git a/jdk/test/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.java b/test/jdk/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.java similarity index 100% rename from jdk/test/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.java rename to test/jdk/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.java diff --git a/jdk/test/java/awt/Focus/ChoiceFocus/ChoiceFocus.java b/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java similarity index 100% rename from jdk/test/java/awt/Focus/ChoiceFocus/ChoiceFocus.java rename to test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java diff --git a/jdk/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java b/test/jdk/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java similarity index 100% rename from jdk/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java rename to test/jdk/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java diff --git a/jdk/test/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java b/test/jdk/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java similarity index 100% rename from jdk/test/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java rename to test/jdk/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java diff --git a/jdk/test/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java b/test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java similarity index 100% rename from jdk/test/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java rename to test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java diff --git a/jdk/test/java/awt/Focus/CloseDialogActivateOwnerTest/java.policy b/test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/java.policy similarity index 100% rename from jdk/test/java/awt/Focus/CloseDialogActivateOwnerTest/java.policy rename to test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/java.policy diff --git a/jdk/test/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java b/test/jdk/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java similarity index 100% rename from jdk/test/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java rename to test/jdk/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java diff --git a/jdk/test/java/awt/Focus/ContainerFocusAutoTransferTest/ContainerFocusAutoTransferTest.java b/test/jdk/java/awt/Focus/ContainerFocusAutoTransferTest/ContainerFocusAutoTransferTest.java similarity index 100% rename from jdk/test/java/awt/Focus/ContainerFocusAutoTransferTest/ContainerFocusAutoTransferTest.java rename to test/jdk/java/awt/Focus/ContainerFocusAutoTransferTest/ContainerFocusAutoTransferTest.java diff --git a/jdk/test/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html b/test/jdk/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html similarity index 100% rename from jdk/test/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html rename to test/jdk/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html diff --git a/jdk/test/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.java b/test/jdk/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.java similarity index 100% rename from jdk/test/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.java rename to test/jdk/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.java diff --git a/jdk/test/java/awt/Focus/DisposedWindow/DisposeDialogNotActivateOwnerTest/DisposeDialogNotActivateOwnerTest.java b/test/jdk/java/awt/Focus/DisposedWindow/DisposeDialogNotActivateOwnerTest/DisposeDialogNotActivateOwnerTest.java similarity index 100% rename from jdk/test/java/awt/Focus/DisposedWindow/DisposeDialogNotActivateOwnerTest/DisposeDialogNotActivateOwnerTest.java rename to test/jdk/java/awt/Focus/DisposedWindow/DisposeDialogNotActivateOwnerTest/DisposeDialogNotActivateOwnerTest.java diff --git a/jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java b/test/jdk/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java similarity index 100% rename from jdk/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java rename to test/jdk/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java diff --git a/jdk/test/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java b/test/jdk/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java similarity index 100% rename from jdk/test/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java rename to test/jdk/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java diff --git a/jdk/test/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.html b/test/jdk/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.html similarity index 100% rename from jdk/test/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.html rename to test/jdk/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.html diff --git a/jdk/test/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.java b/test/jdk/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.java similarity index 100% rename from jdk/test/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.java rename to test/jdk/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.java diff --git a/jdk/test/java/awt/Focus/FocusTraversalPolicy/ButtonGroupLayoutTraversal/ButtonGroupLayoutTraversalTest.java b/test/jdk/java/awt/Focus/FocusTraversalPolicy/ButtonGroupLayoutTraversal/ButtonGroupLayoutTraversalTest.java similarity index 100% rename from jdk/test/java/awt/Focus/FocusTraversalPolicy/ButtonGroupLayoutTraversal/ButtonGroupLayoutTraversalTest.java rename to test/jdk/java/awt/Focus/FocusTraversalPolicy/ButtonGroupLayoutTraversal/ButtonGroupLayoutTraversalTest.java diff --git a/jdk/test/java/awt/Focus/FocusTraversalPolicy/ContainerOrderFTPTest.java b/test/jdk/java/awt/Focus/FocusTraversalPolicy/ContainerOrderFTPTest.java similarity index 100% rename from jdk/test/java/awt/Focus/FocusTraversalPolicy/ContainerOrderFTPTest.java rename to test/jdk/java/awt/Focus/FocusTraversalPolicy/ContainerOrderFTPTest.java diff --git a/jdk/test/java/awt/Focus/FocusTraversalPolicy/DefaultFTPTest.java b/test/jdk/java/awt/Focus/FocusTraversalPolicy/DefaultFTPTest.java similarity index 100% rename from jdk/test/java/awt/Focus/FocusTraversalPolicy/DefaultFTPTest.java rename to test/jdk/java/awt/Focus/FocusTraversalPolicy/DefaultFTPTest.java diff --git a/jdk/test/java/awt/Focus/FocusTraversalPolicy/InitialFTP.java b/test/jdk/java/awt/Focus/FocusTraversalPolicy/InitialFTP.java similarity index 100% rename from jdk/test/java/awt/Focus/FocusTraversalPolicy/InitialFTP.java rename to test/jdk/java/awt/Focus/FocusTraversalPolicy/InitialFTP.java diff --git a/jdk/test/java/awt/Focus/FocusTraversalPolicy/InitialFTP_AWT.java b/test/jdk/java/awt/Focus/FocusTraversalPolicy/InitialFTP_AWT.java similarity index 100% rename from jdk/test/java/awt/Focus/FocusTraversalPolicy/InitialFTP_AWT.java rename to test/jdk/java/awt/Focus/FocusTraversalPolicy/InitialFTP_AWT.java diff --git a/jdk/test/java/awt/Focus/FocusTraversalPolicy/InitialFTP_Swing.java b/test/jdk/java/awt/Focus/FocusTraversalPolicy/InitialFTP_Swing.java similarity index 100% rename from jdk/test/java/awt/Focus/FocusTraversalPolicy/InitialFTP_Swing.java rename to test/jdk/java/awt/Focus/FocusTraversalPolicy/InitialFTP_Swing.java diff --git a/jdk/test/java/awt/Focus/FocusTraversalPolicy/LayoutFTPTest.java b/test/jdk/java/awt/Focus/FocusTraversalPolicy/LayoutFTPTest.java similarity index 100% rename from jdk/test/java/awt/Focus/FocusTraversalPolicy/LayoutFTPTest.java rename to test/jdk/java/awt/Focus/FocusTraversalPolicy/LayoutFTPTest.java diff --git a/jdk/test/java/awt/Focus/FrameJumpingToMouse/FrameJumpingToMouse.java b/test/jdk/java/awt/Focus/FrameJumpingToMouse/FrameJumpingToMouse.java similarity index 100% rename from jdk/test/java/awt/Focus/FrameJumpingToMouse/FrameJumpingToMouse.java rename to test/jdk/java/awt/Focus/FrameJumpingToMouse/FrameJumpingToMouse.java diff --git a/jdk/test/java/awt/Focus/FrameMinimizeTest/FrameMinimizeTest.java b/test/jdk/java/awt/Focus/FrameMinimizeTest/FrameMinimizeTest.java similarity index 100% rename from jdk/test/java/awt/Focus/FrameMinimizeTest/FrameMinimizeTest.java rename to test/jdk/java/awt/Focus/FrameMinimizeTest/FrameMinimizeTest.java diff --git a/jdk/test/java/awt/Focus/Headless/HeadlessContainerOrderFocusTraversalPolicy.java b/test/jdk/java/awt/Focus/Headless/HeadlessContainerOrderFocusTraversalPolicy.java similarity index 100% rename from jdk/test/java/awt/Focus/Headless/HeadlessContainerOrderFocusTraversalPolicy.java rename to test/jdk/java/awt/Focus/Headless/HeadlessContainerOrderFocusTraversalPolicy.java diff --git a/jdk/test/java/awt/Focus/Headless/HeadlessDefaultFocusTraversalPolicy.java b/test/jdk/java/awt/Focus/Headless/HeadlessDefaultFocusTraversalPolicy.java similarity index 100% rename from jdk/test/java/awt/Focus/Headless/HeadlessDefaultFocusTraversalPolicy.java rename to test/jdk/java/awt/Focus/Headless/HeadlessDefaultFocusTraversalPolicy.java diff --git a/jdk/test/java/awt/Focus/Headless/HeadlessDefaultKeyboardFocusManager.java b/test/jdk/java/awt/Focus/Headless/HeadlessDefaultKeyboardFocusManager.java similarity index 100% rename from jdk/test/java/awt/Focus/Headless/HeadlessDefaultKeyboardFocusManager.java rename to test/jdk/java/awt/Focus/Headless/HeadlessDefaultKeyboardFocusManager.java diff --git a/jdk/test/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java b/test/jdk/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java similarity index 100% rename from jdk/test/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java rename to test/jdk/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java diff --git a/jdk/test/java/awt/Focus/InputVerifierTest3/InputVerifierTest3.java b/test/jdk/java/awt/Focus/InputVerifierTest3/InputVerifierTest3.java similarity index 100% rename from jdk/test/java/awt/Focus/InputVerifierTest3/InputVerifierTest3.java rename to test/jdk/java/awt/Focus/InputVerifierTest3/InputVerifierTest3.java diff --git a/jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java b/test/jdk/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java similarity index 100% rename from jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java rename to test/jdk/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java diff --git a/jdk/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.html b/test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.html similarity index 100% rename from jdk/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.html rename to test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.html diff --git a/jdk/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java b/test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java similarity index 100% rename from jdk/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java rename to test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java diff --git a/jdk/test/java/awt/Focus/ModalDialogActivationTest/ModalDialogActivationTest.java b/test/jdk/java/awt/Focus/ModalDialogActivationTest/ModalDialogActivationTest.java similarity index 100% rename from jdk/test/java/awt/Focus/ModalDialogActivationTest/ModalDialogActivationTest.java rename to test/jdk/java/awt/Focus/ModalDialogActivationTest/ModalDialogActivationTest.java diff --git a/jdk/test/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.html b/test/jdk/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.html similarity index 100% rename from jdk/test/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.html rename to test/jdk/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.html diff --git a/jdk/test/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.java b/test/jdk/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.java similarity index 100% rename from jdk/test/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.java rename to test/jdk/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.java diff --git a/jdk/test/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html b/test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html similarity index 100% rename from jdk/test/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html rename to test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html diff --git a/jdk/test/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java b/test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java similarity index 100% rename from jdk/test/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java rename to test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java diff --git a/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java b/test/jdk/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java similarity index 100% rename from jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java rename to test/jdk/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java diff --git a/jdk/test/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java b/test/jdk/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java similarity index 100% rename from jdk/test/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java rename to test/jdk/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java diff --git a/jdk/test/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html b/test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html similarity index 100% rename from jdk/test/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html rename to test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html diff --git a/jdk/test/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java b/test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java similarity index 100% rename from jdk/test/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java rename to test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java diff --git a/jdk/test/java/awt/Focus/NonFocusableResizableTooSmall/NonFocusableResizableTooSmall.java b/test/jdk/java/awt/Focus/NonFocusableResizableTooSmall/NonFocusableResizableTooSmall.java similarity index 100% rename from jdk/test/java/awt/Focus/NonFocusableResizableTooSmall/NonFocusableResizableTooSmall.java rename to test/jdk/java/awt/Focus/NonFocusableResizableTooSmall/NonFocusableResizableTooSmall.java diff --git a/jdk/test/java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java b/test/jdk/java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java similarity index 100% rename from jdk/test/java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java rename to test/jdk/java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java diff --git a/jdk/test/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java b/test/jdk/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java similarity index 100% rename from jdk/test/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java rename to test/jdk/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java diff --git a/jdk/test/java/awt/Focus/OwnedWindowFocusIMECrashTest/OwnedWindowFocusIMECrashTest.java b/test/jdk/java/awt/Focus/OwnedWindowFocusIMECrashTest/OwnedWindowFocusIMECrashTest.java similarity index 100% rename from jdk/test/java/awt/Focus/OwnedWindowFocusIMECrashTest/OwnedWindowFocusIMECrashTest.java rename to test/jdk/java/awt/Focus/OwnedWindowFocusIMECrashTest/OwnedWindowFocusIMECrashTest.java diff --git a/jdk/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java b/test/jdk/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java similarity index 100% rename from jdk/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java rename to test/jdk/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java diff --git a/jdk/test/java/awt/Focus/RequestFocusAndHideTest/RequestFocusAndHideTest.java b/test/jdk/java/awt/Focus/RequestFocusAndHideTest/RequestFocusAndHideTest.java similarity index 100% rename from jdk/test/java/awt/Focus/RequestFocusAndHideTest/RequestFocusAndHideTest.java rename to test/jdk/java/awt/Focus/RequestFocusAndHideTest/RequestFocusAndHideTest.java diff --git a/jdk/test/java/awt/Focus/RequestFocusByCause/RequestFocusByCauseTest.java b/test/jdk/java/awt/Focus/RequestFocusByCause/RequestFocusByCauseTest.java similarity index 100% rename from jdk/test/java/awt/Focus/RequestFocusByCause/RequestFocusByCauseTest.java rename to test/jdk/java/awt/Focus/RequestFocusByCause/RequestFocusByCauseTest.java diff --git a/jdk/test/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java b/test/jdk/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java similarity index 100% rename from jdk/test/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java rename to test/jdk/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java diff --git a/jdk/test/java/awt/Focus/RequestOnCompWithNullParent/RequestOnCompWithNullParent1.java b/test/jdk/java/awt/Focus/RequestOnCompWithNullParent/RequestOnCompWithNullParent1.java similarity index 100% rename from jdk/test/java/awt/Focus/RequestOnCompWithNullParent/RequestOnCompWithNullParent1.java rename to test/jdk/java/awt/Focus/RequestOnCompWithNullParent/RequestOnCompWithNullParent1.java diff --git a/jdk/test/java/awt/Focus/ResetMostRecentFocusOwnerTest/ResetMostRecentFocusOwnerTest.java b/test/jdk/java/awt/Focus/ResetMostRecentFocusOwnerTest/ResetMostRecentFocusOwnerTest.java similarity index 100% rename from jdk/test/java/awt/Focus/ResetMostRecentFocusOwnerTest/ResetMostRecentFocusOwnerTest.java rename to test/jdk/java/awt/Focus/ResetMostRecentFocusOwnerTest/ResetMostRecentFocusOwnerTest.java diff --git a/jdk/test/java/awt/Focus/RestoreFocusOnDisabledComponentTest/RestoreFocusOnDisabledComponentTest.java b/test/jdk/java/awt/Focus/RestoreFocusOnDisabledComponentTest/RestoreFocusOnDisabledComponentTest.java similarity index 100% rename from jdk/test/java/awt/Focus/RestoreFocusOnDisabledComponentTest/RestoreFocusOnDisabledComponentTest.java rename to test/jdk/java/awt/Focus/RestoreFocusOnDisabledComponentTest/RestoreFocusOnDisabledComponentTest.java diff --git a/jdk/test/java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java b/test/jdk/java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java similarity index 100% rename from jdk/test/java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java rename to test/jdk/java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java diff --git a/jdk/test/java/awt/Focus/ShowFrameCheckForegroundTest/ShowFrameCheckForegroundTest.java b/test/jdk/java/awt/Focus/ShowFrameCheckForegroundTest/ShowFrameCheckForegroundTest.java similarity index 100% rename from jdk/test/java/awt/Focus/ShowFrameCheckForegroundTest/ShowFrameCheckForegroundTest.java rename to test/jdk/java/awt/Focus/ShowFrameCheckForegroundTest/ShowFrameCheckForegroundTest.java diff --git a/jdk/test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java b/test/jdk/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java similarity index 100% rename from jdk/test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java rename to test/jdk/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java diff --git a/jdk/test/java/awt/Focus/SortingFPT/JDK8048887.java b/test/jdk/java/awt/Focus/SortingFPT/JDK8048887.java similarity index 100% rename from jdk/test/java/awt/Focus/SortingFPT/JDK8048887.java rename to test/jdk/java/awt/Focus/SortingFPT/JDK8048887.java diff --git a/jdk/test/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html b/test/jdk/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html similarity index 100% rename from jdk/test/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html rename to test/jdk/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html diff --git a/jdk/test/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.java b/test/jdk/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.java similarity index 100% rename from jdk/test/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.java rename to test/jdk/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.java diff --git a/jdk/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java b/test/jdk/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java similarity index 100% rename from jdk/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java rename to test/jdk/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java diff --git a/jdk/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java b/test/jdk/java/awt/Focus/TypeAhead/TestFocusFreeze.java similarity index 100% rename from jdk/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java rename to test/jdk/java/awt/Focus/TypeAhead/TestFocusFreeze.java diff --git a/jdk/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html b/test/jdk/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html similarity index 100% rename from jdk/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html rename to test/jdk/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html diff --git a/jdk/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.java b/test/jdk/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.java similarity index 100% rename from jdk/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.java rename to test/jdk/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.java diff --git a/jdk/test/java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java b/test/jdk/java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java similarity index 100% rename from jdk/test/java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java rename to test/jdk/java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java diff --git a/jdk/test/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html b/test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html similarity index 100% rename from jdk/test/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html rename to test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html diff --git a/jdk/test/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java b/test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java similarity index 100% rename from jdk/test/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java rename to test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java diff --git a/jdk/test/java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java b/test/jdk/java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java similarity index 100% rename from jdk/test/java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java rename to test/jdk/java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java diff --git a/jdk/test/java/awt/FontClass/AppleFontNameTest.java b/test/jdk/java/awt/FontClass/AppleFontNameTest.java similarity index 100% rename from jdk/test/java/awt/FontClass/AppleFontNameTest.java rename to test/jdk/java/awt/FontClass/AppleFontNameTest.java diff --git a/jdk/test/java/awt/FontClass/BigMetrics.java b/test/jdk/java/awt/FontClass/BigMetrics.java similarity index 100% rename from jdk/test/java/awt/FontClass/BigMetrics.java rename to test/jdk/java/awt/FontClass/BigMetrics.java diff --git a/jdk/test/java/awt/FontClass/CreateFont/A.ttf b/test/jdk/java/awt/FontClass/CreateFont/A.ttf similarity index 100% rename from jdk/test/java/awt/FontClass/CreateFont/A.ttf rename to test/jdk/java/awt/FontClass/CreateFont/A.ttf diff --git a/jdk/test/java/awt/FontClass/CreateFont/BigFont.java b/test/jdk/java/awt/FontClass/CreateFont/BigFont.java similarity index 100% rename from jdk/test/java/awt/FontClass/CreateFont/BigFont.java rename to test/jdk/java/awt/FontClass/CreateFont/BigFont.java diff --git a/jdk/test/java/awt/FontClass/CreateFont/CreateFontArrayTest.java b/test/jdk/java/awt/FontClass/CreateFont/CreateFontArrayTest.java similarity index 100% rename from jdk/test/java/awt/FontClass/CreateFont/CreateFontArrayTest.java rename to test/jdk/java/awt/FontClass/CreateFont/CreateFontArrayTest.java diff --git a/jdk/test/java/awt/FontClass/CreateFont/DeleteFont.java b/test/jdk/java/awt/FontClass/CreateFont/DeleteFont.java similarity index 100% rename from jdk/test/java/awt/FontClass/CreateFont/DeleteFont.java rename to test/jdk/java/awt/FontClass/CreateFont/DeleteFont.java diff --git a/jdk/test/java/awt/FontClass/CreateFont/DeleteFont.sh b/test/jdk/java/awt/FontClass/CreateFont/DeleteFont.sh similarity index 100% rename from jdk/test/java/awt/FontClass/CreateFont/DeleteFont.sh rename to test/jdk/java/awt/FontClass/CreateFont/DeleteFont.sh diff --git a/jdk/test/java/awt/FontClass/CreateFont/bigfont.html b/test/jdk/java/awt/FontClass/CreateFont/bigfont.html similarity index 100% rename from jdk/test/java/awt/FontClass/CreateFont/bigfont.html rename to test/jdk/java/awt/FontClass/CreateFont/bigfont.html diff --git a/jdk/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java b/test/jdk/java/awt/FontClass/CreateFont/fileaccess/FontFile.java similarity index 100% rename from jdk/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java rename to test/jdk/java/awt/FontClass/CreateFont/fileaccess/FontFile.java diff --git a/jdk/test/java/awt/FontClass/CreateFont/fileaccess/TestFontFile.sh b/test/jdk/java/awt/FontClass/CreateFont/fileaccess/TestFontFile.sh similarity index 100% rename from jdk/test/java/awt/FontClass/CreateFont/fileaccess/TestFontFile.sh rename to test/jdk/java/awt/FontClass/CreateFont/fileaccess/TestFontFile.sh diff --git a/jdk/test/java/awt/FontClass/DebugFonts.java b/test/jdk/java/awt/FontClass/DebugFonts.java similarity index 100% rename from jdk/test/java/awt/FontClass/DebugFonts.java rename to test/jdk/java/awt/FontClass/DebugFonts.java diff --git a/jdk/test/java/awt/FontClass/DrawStringWithInfiniteXform.java b/test/jdk/java/awt/FontClass/DrawStringWithInfiniteXform.java similarity index 100% rename from jdk/test/java/awt/FontClass/DrawStringWithInfiniteXform.java rename to test/jdk/java/awt/FontClass/DrawStringWithInfiniteXform.java diff --git a/jdk/test/java/awt/FontClass/FontAccess.java b/test/jdk/java/awt/FontClass/FontAccess.java similarity index 100% rename from jdk/test/java/awt/FontClass/FontAccess.java rename to test/jdk/java/awt/FontClass/FontAccess.java diff --git a/jdk/test/java/awt/FontClass/FontDisposer/FontDisposeTest.java b/test/jdk/java/awt/FontClass/FontDisposer/FontDisposeTest.java similarity index 100% rename from jdk/test/java/awt/FontClass/FontDisposer/FontDisposeTest.java rename to test/jdk/java/awt/FontClass/FontDisposer/FontDisposeTest.java diff --git a/jdk/test/java/awt/FontClass/FontPrivilege.java b/test/jdk/java/awt/FontClass/FontPrivilege.java similarity index 100% rename from jdk/test/java/awt/FontClass/FontPrivilege.java rename to test/jdk/java/awt/FontClass/FontPrivilege.java diff --git a/jdk/test/java/awt/FontClass/HeadlessFont.java b/test/jdk/java/awt/FontClass/HeadlessFont.java similarity index 100% rename from jdk/test/java/awt/FontClass/HeadlessFont.java rename to test/jdk/java/awt/FontClass/HeadlessFont.java diff --git a/jdk/test/java/awt/FontClass/HelvLtOblTest.java b/test/jdk/java/awt/FontClass/HelvLtOblTest.java similarity index 100% rename from jdk/test/java/awt/FontClass/HelvLtOblTest.java rename to test/jdk/java/awt/FontClass/HelvLtOblTest.java diff --git a/jdk/test/java/awt/FontClass/LCDScale.java b/test/jdk/java/awt/FontClass/LCDScale.java similarity index 100% rename from jdk/test/java/awt/FontClass/LCDScale.java rename to test/jdk/java/awt/FontClass/LCDScale.java diff --git a/jdk/test/java/awt/FontClass/NaNTransform.java b/test/jdk/java/awt/FontClass/NaNTransform.java similarity index 100% rename from jdk/test/java/awt/FontClass/NaNTransform.java rename to test/jdk/java/awt/FontClass/NaNTransform.java diff --git a/jdk/test/java/awt/FontClass/SurrogateTest/SuppCharDrawTest.java b/test/jdk/java/awt/FontClass/SurrogateTest/SuppCharDrawTest.java similarity index 100% rename from jdk/test/java/awt/FontClass/SurrogateTest/SuppCharDrawTest.java rename to test/jdk/java/awt/FontClass/SurrogateTest/SuppCharDrawTest.java diff --git a/jdk/test/java/awt/FontClass/SurrogateTest/SuppCharTest.java b/test/jdk/java/awt/FontClass/SurrogateTest/SuppCharTest.java similarity index 100% rename from jdk/test/java/awt/FontClass/SurrogateTest/SuppCharTest.java rename to test/jdk/java/awt/FontClass/SurrogateTest/SuppCharTest.java diff --git a/jdk/test/java/awt/FontClass/SurrogateTest/SupplementaryCanDisplayUpToTest.java b/test/jdk/java/awt/FontClass/SurrogateTest/SupplementaryCanDisplayUpToTest.java similarity index 100% rename from jdk/test/java/awt/FontClass/SurrogateTest/SupplementaryCanDisplayUpToTest.java rename to test/jdk/java/awt/FontClass/SurrogateTest/SupplementaryCanDisplayUpToTest.java diff --git a/jdk/test/java/awt/FontClass/TextRequiresLayoutTest.java b/test/jdk/java/awt/FontClass/TextRequiresLayoutTest.java similarity index 100% rename from jdk/test/java/awt/FontClass/TextRequiresLayoutTest.java rename to test/jdk/java/awt/FontClass/TextRequiresLayoutTest.java diff --git a/jdk/test/java/awt/FontClass/X11FontPathCrashTest.java b/test/jdk/java/awt/FontClass/X11FontPathCrashTest.java similarity index 100% rename from jdk/test/java/awt/FontClass/X11FontPathCrashTest.java rename to test/jdk/java/awt/FontClass/X11FontPathCrashTest.java diff --git a/jdk/test/java/awt/FontMetrics/FontCrash.java b/test/jdk/java/awt/FontMetrics/FontCrash.java similarity index 100% rename from jdk/test/java/awt/FontMetrics/FontCrash.java rename to test/jdk/java/awt/FontMetrics/FontCrash.java diff --git a/jdk/test/java/awt/FontMetrics/StyledSpaceAdvance.java b/test/jdk/java/awt/FontMetrics/StyledSpaceAdvance.java similarity index 100% rename from jdk/test/java/awt/FontMetrics/StyledSpaceAdvance.java rename to test/jdk/java/awt/FontMetrics/StyledSpaceAdvance.java diff --git a/jdk/test/java/awt/Frame/7024749/bug7024749.java b/test/jdk/java/awt/Frame/7024749/bug7024749.java similarity index 100% rename from jdk/test/java/awt/Frame/7024749/bug7024749.java rename to test/jdk/java/awt/Frame/7024749/bug7024749.java diff --git a/jdk/test/java/awt/Frame/8158918/SetExtendedState.java b/test/jdk/java/awt/Frame/8158918/SetExtendedState.java similarity index 100% rename from jdk/test/java/awt/Frame/8158918/SetExtendedState.java rename to test/jdk/java/awt/Frame/8158918/SetExtendedState.java diff --git a/jdk/test/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java b/test/jdk/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java similarity index 100% rename from jdk/test/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java rename to test/jdk/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java diff --git a/jdk/test/java/awt/Frame/DecoratedFrameInsets/DecoratedFrameInsetsTest.java b/test/jdk/java/awt/Frame/DecoratedFrameInsets/DecoratedFrameInsetsTest.java similarity index 100% rename from jdk/test/java/awt/Frame/DecoratedFrameInsets/DecoratedFrameInsetsTest.java rename to test/jdk/java/awt/Frame/DecoratedFrameInsets/DecoratedFrameInsetsTest.java diff --git a/jdk/test/java/awt/Frame/DisposeParentGC/DisposeParentGC.java b/test/jdk/java/awt/Frame/DisposeParentGC/DisposeParentGC.java similarity index 100% rename from jdk/test/java/awt/Frame/DisposeParentGC/DisposeParentGC.java rename to test/jdk/java/awt/Frame/DisposeParentGC/DisposeParentGC.java diff --git a/jdk/test/java/awt/Frame/DisposeStressTest/DisposeStressTest.html b/test/jdk/java/awt/Frame/DisposeStressTest/DisposeStressTest.html similarity index 100% rename from jdk/test/java/awt/Frame/DisposeStressTest/DisposeStressTest.html rename to test/jdk/java/awt/Frame/DisposeStressTest/DisposeStressTest.html diff --git a/jdk/test/java/awt/Frame/DisposeStressTest/DisposeStressTest.java b/test/jdk/java/awt/Frame/DisposeStressTest/DisposeStressTest.java similarity index 100% rename from jdk/test/java/awt/Frame/DisposeStressTest/DisposeStressTest.java rename to test/jdk/java/awt/Frame/DisposeStressTest/DisposeStressTest.java diff --git a/jdk/test/java/awt/Frame/DynamicLayout/DynamicLayout.java b/test/jdk/java/awt/Frame/DynamicLayout/DynamicLayout.java similarity index 100% rename from jdk/test/java/awt/Frame/DynamicLayout/DynamicLayout.java rename to test/jdk/java/awt/Frame/DynamicLayout/DynamicLayout.java diff --git a/jdk/test/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java b/test/jdk/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java similarity index 100% rename from jdk/test/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java rename to test/jdk/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java diff --git a/jdk/test/java/awt/Frame/FrameLocation/FrameLocation.java b/test/jdk/java/awt/Frame/FrameLocation/FrameLocation.java similarity index 100% rename from jdk/test/java/awt/Frame/FrameLocation/FrameLocation.java rename to test/jdk/java/awt/Frame/FrameLocation/FrameLocation.java diff --git a/jdk/test/java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java b/test/jdk/java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java similarity index 100% rename from jdk/test/java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java rename to test/jdk/java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java diff --git a/jdk/test/java/awt/Frame/FrameSetSizeStressTest/FrameSetSizeStressTest.java b/test/jdk/java/awt/Frame/FrameSetSizeStressTest/FrameSetSizeStressTest.java similarity index 100% rename from jdk/test/java/awt/Frame/FrameSetSizeStressTest/FrameSetSizeStressTest.java rename to test/jdk/java/awt/Frame/FrameSetSizeStressTest/FrameSetSizeStressTest.java diff --git a/jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java b/test/jdk/java/awt/Frame/FrameSize/TestFrameSize.java similarity index 100% rename from jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java rename to test/jdk/java/awt/Frame/FrameSize/TestFrameSize.java diff --git a/jdk/test/java/awt/Frame/FrameStateTest/FrameStateTest.html b/test/jdk/java/awt/Frame/FrameStateTest/FrameStateTest.html similarity index 100% rename from jdk/test/java/awt/Frame/FrameStateTest/FrameStateTest.html rename to test/jdk/java/awt/Frame/FrameStateTest/FrameStateTest.html diff --git a/jdk/test/java/awt/Frame/FrameStateTest/FrameStateTest.java b/test/jdk/java/awt/Frame/FrameStateTest/FrameStateTest.java similarity index 100% rename from jdk/test/java/awt/Frame/FrameStateTest/FrameStateTest.java rename to test/jdk/java/awt/Frame/FrameStateTest/FrameStateTest.java diff --git a/jdk/test/java/awt/Frame/FramesGC/FramesGC.java b/test/jdk/java/awt/Frame/FramesGC/FramesGC.java similarity index 100% rename from jdk/test/java/awt/Frame/FramesGC/FramesGC.java rename to test/jdk/java/awt/Frame/FramesGC/FramesGC.java diff --git a/jdk/test/java/awt/Frame/GetBoundsResizeTest/GetBoundsResizeTest.java b/test/jdk/java/awt/Frame/GetBoundsResizeTest/GetBoundsResizeTest.java similarity index 100% rename from jdk/test/java/awt/Frame/GetBoundsResizeTest/GetBoundsResizeTest.java rename to test/jdk/java/awt/Frame/GetBoundsResizeTest/GetBoundsResizeTest.java diff --git a/jdk/test/java/awt/Frame/HideMaximized/HideMaximized.java b/test/jdk/java/awt/Frame/HideMaximized/HideMaximized.java similarity index 100% rename from jdk/test/java/awt/Frame/HideMaximized/HideMaximized.java rename to test/jdk/java/awt/Frame/HideMaximized/HideMaximized.java diff --git a/jdk/test/java/awt/Frame/HugeFrame/HugeFrame.java b/test/jdk/java/awt/Frame/HugeFrame/HugeFrame.java similarity index 100% rename from jdk/test/java/awt/Frame/HugeFrame/HugeFrame.java rename to test/jdk/java/awt/Frame/HugeFrame/HugeFrame.java diff --git a/jdk/test/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.html b/test/jdk/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.html similarity index 100% rename from jdk/test/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.html rename to test/jdk/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.html diff --git a/jdk/test/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.java b/test/jdk/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.java similarity index 100% rename from jdk/test/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.java rename to test/jdk/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.java diff --git a/jdk/test/java/awt/Frame/InvisibleOwner/InvisibleOwner.java b/test/jdk/java/awt/Frame/InvisibleOwner/InvisibleOwner.java similarity index 100% rename from jdk/test/java/awt/Frame/InvisibleOwner/InvisibleOwner.java rename to test/jdk/java/awt/Frame/InvisibleOwner/InvisibleOwner.java diff --git a/jdk/test/java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java b/test/jdk/java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java similarity index 100% rename from jdk/test/java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java rename to test/jdk/java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java diff --git a/jdk/test/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java b/test/jdk/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java similarity index 100% rename from jdk/test/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java rename to test/jdk/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java diff --git a/jdk/test/java/awt/Frame/MaximizedNormalBoundsUndecoratedTest/MaximizedNormalBoundsUndecoratedTest.java b/test/jdk/java/awt/Frame/MaximizedNormalBoundsUndecoratedTest/MaximizedNormalBoundsUndecoratedTest.java similarity index 100% rename from jdk/test/java/awt/Frame/MaximizedNormalBoundsUndecoratedTest/MaximizedNormalBoundsUndecoratedTest.java rename to test/jdk/java/awt/Frame/MaximizedNormalBoundsUndecoratedTest/MaximizedNormalBoundsUndecoratedTest.java diff --git a/jdk/test/java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java b/test/jdk/java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java similarity index 100% rename from jdk/test/java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java rename to test/jdk/java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java diff --git a/jdk/test/java/awt/Frame/MaximizedToMaximized/MaximizedToMaximized.java b/test/jdk/java/awt/Frame/MaximizedToMaximized/MaximizedToMaximized.java similarity index 100% rename from jdk/test/java/awt/Frame/MaximizedToMaximized/MaximizedToMaximized.java rename to test/jdk/java/awt/Frame/MaximizedToMaximized/MaximizedToMaximized.java diff --git a/jdk/test/java/awt/Frame/MaximizedToUnmaximized/MaximizedToUnmaximized.java b/test/jdk/java/awt/Frame/MaximizedToUnmaximized/MaximizedToUnmaximized.java similarity index 100% rename from jdk/test/java/awt/Frame/MaximizedToUnmaximized/MaximizedToUnmaximized.java rename to test/jdk/java/awt/Frame/MaximizedToUnmaximized/MaximizedToUnmaximized.java diff --git a/jdk/test/java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java b/test/jdk/java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java similarity index 100% rename from jdk/test/java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java rename to test/jdk/java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java b/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java similarity index 100% rename from jdk/test/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java rename to test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java b/test/jdk/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java similarity index 100% rename from jdk/test/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java rename to test/jdk/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/FrameCloseTest.java b/test/jdk/java/awt/Frame/MiscUndecorated/FrameCloseTest.java similarity index 100% rename from jdk/test/java/awt/Frame/MiscUndecorated/FrameCloseTest.java rename to test/jdk/java/awt/Frame/MiscUndecorated/FrameCloseTest.java diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/RepaintTest.java b/test/jdk/java/awt/Frame/MiscUndecorated/RepaintTest.java similarity index 100% rename from jdk/test/java/awt/Frame/MiscUndecorated/RepaintTest.java rename to test/jdk/java/awt/Frame/MiscUndecorated/RepaintTest.java diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/UndecoratedInitiallyIconified.java b/test/jdk/java/awt/Frame/MiscUndecorated/UndecoratedInitiallyIconified.java similarity index 100% rename from jdk/test/java/awt/Frame/MiscUndecorated/UndecoratedInitiallyIconified.java rename to test/jdk/java/awt/Frame/MiscUndecorated/UndecoratedInitiallyIconified.java diff --git a/jdk/test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.html b/test/jdk/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.html similarity index 100% rename from jdk/test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.html rename to test/jdk/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.html diff --git a/jdk/test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.java b/test/jdk/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.java similarity index 100% rename from jdk/test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.java rename to test/jdk/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.java diff --git a/jdk/test/java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java b/test/jdk/java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java similarity index 100% rename from jdk/test/java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java rename to test/jdk/java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java diff --git a/jdk/test/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java b/test/jdk/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java similarity index 100% rename from jdk/test/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java rename to test/jdk/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java diff --git a/jdk/test/java/awt/Frame/ResizeAfterSetFont/ResizeAfterSetFont.java b/test/jdk/java/awt/Frame/ResizeAfterSetFont/ResizeAfterSetFont.java similarity index 100% rename from jdk/test/java/awt/Frame/ResizeAfterSetFont/ResizeAfterSetFont.java rename to test/jdk/java/awt/Frame/ResizeAfterSetFont/ResizeAfterSetFont.java diff --git a/jdk/test/java/awt/Frame/SetIconImagesCrashTest/SetIconImagesCrashTest.java b/test/jdk/java/awt/Frame/SetIconImagesCrashTest/SetIconImagesCrashTest.java similarity index 100% rename from jdk/test/java/awt/Frame/SetIconImagesCrashTest/SetIconImagesCrashTest.java rename to test/jdk/java/awt/Frame/SetIconImagesCrashTest/SetIconImagesCrashTest.java diff --git a/jdk/test/java/awt/Frame/SetMaximizedBounds/MaximizedMovedWindow.java b/test/jdk/java/awt/Frame/SetMaximizedBounds/MaximizedMovedWindow.java similarity index 100% rename from jdk/test/java/awt/Frame/SetMaximizedBounds/MaximizedMovedWindow.java rename to test/jdk/java/awt/Frame/SetMaximizedBounds/MaximizedMovedWindow.java diff --git a/jdk/test/java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java b/test/jdk/java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java similarity index 100% rename from jdk/test/java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java rename to test/jdk/java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java diff --git a/jdk/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java b/test/jdk/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java similarity index 100% rename from jdk/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java rename to test/jdk/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java diff --git a/jdk/test/java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java b/test/jdk/java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java similarity index 100% rename from jdk/test/java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java rename to test/jdk/java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java diff --git a/jdk/test/java/awt/Frame/ShownOnPack/ShownOnPack.html b/test/jdk/java/awt/Frame/ShownOnPack/ShownOnPack.html similarity index 100% rename from jdk/test/java/awt/Frame/ShownOnPack/ShownOnPack.html rename to test/jdk/java/awt/Frame/ShownOnPack/ShownOnPack.html diff --git a/jdk/test/java/awt/Frame/ShownOnPack/ShownOnPack.java b/test/jdk/java/awt/Frame/ShownOnPack/ShownOnPack.java similarity index 100% rename from jdk/test/java/awt/Frame/ShownOnPack/ShownOnPack.java rename to test/jdk/java/awt/Frame/ShownOnPack/ShownOnPack.java diff --git a/jdk/test/java/awt/Frame/SlideNotResizableTest/SlideNotResizableTest.java b/test/jdk/java/awt/Frame/SlideNotResizableTest/SlideNotResizableTest.java similarity index 100% rename from jdk/test/java/awt/Frame/SlideNotResizableTest/SlideNotResizableTest.java rename to test/jdk/java/awt/Frame/SlideNotResizableTest/SlideNotResizableTest.java diff --git a/jdk/test/java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java b/test/jdk/java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java similarity index 100% rename from jdk/test/java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java rename to test/jdk/java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java diff --git a/jdk/test/java/awt/Frame/WindowDragTest/WindowDragTest.java b/test/jdk/java/awt/Frame/WindowDragTest/WindowDragTest.java similarity index 100% rename from jdk/test/java/awt/Frame/WindowDragTest/WindowDragTest.java rename to test/jdk/java/awt/Frame/WindowDragTest/WindowDragTest.java diff --git a/jdk/test/java/awt/FullScreen/8013581/bug8013581.java b/test/jdk/java/awt/FullScreen/8013581/bug8013581.java similarity index 100% rename from jdk/test/java/awt/FullScreen/8013581/bug8013581.java rename to test/jdk/java/awt/FullScreen/8013581/bug8013581.java diff --git a/jdk/test/java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java b/test/jdk/java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java similarity index 100% rename from jdk/test/java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java rename to test/jdk/java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java diff --git a/jdk/test/java/awt/FullScreen/BufferStrategyExceptionTest/BufferStrategyExceptionTest.java b/test/jdk/java/awt/FullScreen/BufferStrategyExceptionTest/BufferStrategyExceptionTest.java similarity index 100% rename from jdk/test/java/awt/FullScreen/BufferStrategyExceptionTest/BufferStrategyExceptionTest.java rename to test/jdk/java/awt/FullScreen/BufferStrategyExceptionTest/BufferStrategyExceptionTest.java diff --git a/jdk/test/java/awt/FullScreen/CurrentDisplayModeTest/CurrentDisplayModeTest.java b/test/jdk/java/awt/FullScreen/CurrentDisplayModeTest/CurrentDisplayModeTest.java similarity index 100% rename from jdk/test/java/awt/FullScreen/CurrentDisplayModeTest/CurrentDisplayModeTest.java rename to test/jdk/java/awt/FullScreen/CurrentDisplayModeTest/CurrentDisplayModeTest.java diff --git a/jdk/test/java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java b/test/jdk/java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java similarity index 100% rename from jdk/test/java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java rename to test/jdk/java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java diff --git a/jdk/test/java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java b/test/jdk/java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java similarity index 100% rename from jdk/test/java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java rename to test/jdk/java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java diff --git a/jdk/test/java/awt/FullScreen/MultimonFullscreenTest/MultimonDeadlockTest.java b/test/jdk/java/awt/FullScreen/MultimonFullscreenTest/MultimonDeadlockTest.java similarity index 100% rename from jdk/test/java/awt/FullScreen/MultimonFullscreenTest/MultimonDeadlockTest.java rename to test/jdk/java/awt/FullScreen/MultimonFullscreenTest/MultimonDeadlockTest.java diff --git a/jdk/test/java/awt/FullScreen/MultimonFullscreenTest/MultimonFullscreenTest.java b/test/jdk/java/awt/FullScreen/MultimonFullscreenTest/MultimonFullscreenTest.java similarity index 100% rename from jdk/test/java/awt/FullScreen/MultimonFullscreenTest/MultimonFullscreenTest.java rename to test/jdk/java/awt/FullScreen/MultimonFullscreenTest/MultimonFullscreenTest.java diff --git a/jdk/test/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java b/test/jdk/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java similarity index 100% rename from jdk/test/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java rename to test/jdk/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java diff --git a/jdk/test/java/awt/FullScreen/NonExistentDisplayModeTest/NonExistentDisplayModeTest.java b/test/jdk/java/awt/FullScreen/NonExistentDisplayModeTest/NonExistentDisplayModeTest.java similarity index 100% rename from jdk/test/java/awt/FullScreen/NonExistentDisplayModeTest/NonExistentDisplayModeTest.java rename to test/jdk/java/awt/FullScreen/NonExistentDisplayModeTest/NonExistentDisplayModeTest.java diff --git a/jdk/test/java/awt/FullScreen/SetFSWindow/FSFrame.java b/test/jdk/java/awt/FullScreen/SetFSWindow/FSFrame.java similarity index 100% rename from jdk/test/java/awt/FullScreen/SetFSWindow/FSFrame.java rename to test/jdk/java/awt/FullScreen/SetFSWindow/FSFrame.java diff --git a/jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java b/test/jdk/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java similarity index 100% rename from jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java rename to test/jdk/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java diff --git a/jdk/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/DisplayModeChanger.java b/test/jdk/java/awt/FullScreen/UninitializedDisplayModeChangeTest/DisplayModeChanger.java similarity index 100% rename from jdk/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/DisplayModeChanger.java rename to test/jdk/java/awt/FullScreen/UninitializedDisplayModeChangeTest/DisplayModeChanger.java diff --git a/jdk/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java b/test/jdk/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java similarity index 100% rename from jdk/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java rename to test/jdk/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java diff --git a/jdk/test/java/awt/GradientPaint/GradientTransformTest.java b/test/jdk/java/awt/GradientPaint/GradientTransformTest.java similarity index 100% rename from jdk/test/java/awt/GradientPaint/GradientTransformTest.java rename to test/jdk/java/awt/GradientPaint/GradientTransformTest.java diff --git a/jdk/test/java/awt/GradientPaint/HeadlessGradientPaint.java b/test/jdk/java/awt/GradientPaint/HeadlessGradientPaint.java similarity index 100% rename from jdk/test/java/awt/GradientPaint/HeadlessGradientPaint.java rename to test/jdk/java/awt/GradientPaint/HeadlessGradientPaint.java diff --git a/jdk/test/java/awt/GradientPaint/LinearColorSpaceGradientTest.java b/test/jdk/java/awt/GradientPaint/LinearColorSpaceGradientTest.java similarity index 100% rename from jdk/test/java/awt/GradientPaint/LinearColorSpaceGradientTest.java rename to test/jdk/java/awt/GradientPaint/LinearColorSpaceGradientTest.java diff --git a/jdk/test/java/awt/Graphics/CopyScaledArea/CopyScaledAreaTest.java b/test/jdk/java/awt/Graphics/CopyScaledArea/CopyScaledAreaTest.java similarity index 100% rename from jdk/test/java/awt/Graphics/CopyScaledArea/CopyScaledAreaTest.java rename to test/jdk/java/awt/Graphics/CopyScaledArea/CopyScaledAreaTest.java diff --git a/jdk/test/java/awt/Graphics/DrawImageBG/SystemBgColorTest.java b/test/jdk/java/awt/Graphics/DrawImageBG/SystemBgColorTest.java similarity index 100% rename from jdk/test/java/awt/Graphics/DrawImageBG/SystemBgColorTest.java rename to test/jdk/java/awt/Graphics/DrawImageBG/SystemBgColorTest.java diff --git a/jdk/test/java/awt/Graphics/IncorrectFractionalClip/IncorrectFractionalClip.java b/test/jdk/java/awt/Graphics/IncorrectFractionalClip/IncorrectFractionalClip.java similarity index 100% rename from jdk/test/java/awt/Graphics/IncorrectFractionalClip/IncorrectFractionalClip.java rename to test/jdk/java/awt/Graphics/IncorrectFractionalClip/IncorrectFractionalClip.java diff --git a/jdk/test/java/awt/Graphics/LCDTextAndGraphicsState.java b/test/jdk/java/awt/Graphics/LCDTextAndGraphicsState.java similarity index 100% rename from jdk/test/java/awt/Graphics/LCDTextAndGraphicsState.java rename to test/jdk/java/awt/Graphics/LCDTextAndGraphicsState.java diff --git a/jdk/test/java/awt/Graphics/LineClipTest.java b/test/jdk/java/awt/Graphics/LineClipTest.java similarity index 100% rename from jdk/test/java/awt/Graphics/LineClipTest.java rename to test/jdk/java/awt/Graphics/LineClipTest.java diff --git a/jdk/test/java/awt/Graphics/TextAAHintsTest.java b/test/jdk/java/awt/Graphics/TextAAHintsTest.java similarity index 100% rename from jdk/test/java/awt/Graphics/TextAAHintsTest.java rename to test/jdk/java/awt/Graphics/TextAAHintsTest.java diff --git a/jdk/test/java/awt/Graphics2D/DeviceBounds.java b/test/jdk/java/awt/Graphics2D/DeviceBounds.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DeviceBounds.java rename to test/jdk/java/awt/Graphics2D/DeviceBounds.java diff --git a/jdk/test/java/awt/Graphics2D/DrawString/AlphaSurfaceText.java b/test/jdk/java/awt/Graphics2D/DrawString/AlphaSurfaceText.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DrawString/AlphaSurfaceText.java rename to test/jdk/java/awt/Graphics2D/DrawString/AlphaSurfaceText.java diff --git a/jdk/test/java/awt/Graphics2D/DrawString/AntialiasedTextArtifact.java b/test/jdk/java/awt/Graphics2D/DrawString/AntialiasedTextArtifact.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DrawString/AntialiasedTextArtifact.java rename to test/jdk/java/awt/Graphics2D/DrawString/AntialiasedTextArtifact.java diff --git a/jdk/test/java/awt/Graphics2D/DrawString/DrawRotatedString.java b/test/jdk/java/awt/Graphics2D/DrawString/DrawRotatedString.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DrawString/DrawRotatedString.java rename to test/jdk/java/awt/Graphics2D/DrawString/DrawRotatedString.java diff --git a/jdk/test/java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java b/test/jdk/java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java rename to test/jdk/java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java diff --git a/jdk/test/java/awt/Graphics2D/DrawString/DrawStrSuper.java b/test/jdk/java/awt/Graphics2D/DrawString/DrawStrSuper.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DrawString/DrawStrSuper.java rename to test/jdk/java/awt/Graphics2D/DrawString/DrawStrSuper.java diff --git a/jdk/test/java/awt/Graphics2D/DrawString/DrawStringCrash.java b/test/jdk/java/awt/Graphics2D/DrawString/DrawStringCrash.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DrawString/DrawStringCrash.java rename to test/jdk/java/awt/Graphics2D/DrawString/DrawStringCrash.java diff --git a/jdk/test/java/awt/Graphics2D/DrawString/EmptyAttrString.java b/test/jdk/java/awt/Graphics2D/DrawString/EmptyAttrString.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DrawString/EmptyAttrString.java rename to test/jdk/java/awt/Graphics2D/DrawString/EmptyAttrString.java diff --git a/jdk/test/java/awt/Graphics2D/DrawString/LCDTextSrcEa.java b/test/jdk/java/awt/Graphics2D/DrawString/LCDTextSrcEa.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DrawString/LCDTextSrcEa.java rename to test/jdk/java/awt/Graphics2D/DrawString/LCDTextSrcEa.java diff --git a/jdk/test/java/awt/Graphics2D/DrawString/RotTransText.java b/test/jdk/java/awt/Graphics2D/DrawString/RotTransText.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DrawString/RotTransText.java rename to test/jdk/java/awt/Graphics2D/DrawString/RotTransText.java diff --git a/jdk/test/java/awt/Graphics2D/DrawString/ScaledLCDTextMetrics.java b/test/jdk/java/awt/Graphics2D/DrawString/ScaledLCDTextMetrics.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DrawString/ScaledLCDTextMetrics.java rename to test/jdk/java/awt/Graphics2D/DrawString/ScaledLCDTextMetrics.java diff --git a/jdk/test/java/awt/Graphics2D/DrawString/TextRenderingTest.java b/test/jdk/java/awt/Graphics2D/DrawString/TextRenderingTest.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DrawString/TextRenderingTest.java rename to test/jdk/java/awt/Graphics2D/DrawString/TextRenderingTest.java diff --git a/jdk/test/java/awt/Graphics2D/DrawString/XRenderElt254TextTest.java b/test/jdk/java/awt/Graphics2D/DrawString/XRenderElt254TextTest.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/DrawString/XRenderElt254TextTest.java rename to test/jdk/java/awt/Graphics2D/DrawString/XRenderElt254TextTest.java diff --git a/jdk/test/java/awt/Graphics2D/FillTexturePaint/FillTexturePaint.java b/test/jdk/java/awt/Graphics2D/FillTexturePaint/FillTexturePaint.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/FillTexturePaint/FillTexturePaint.java rename to test/jdk/java/awt/Graphics2D/FillTexturePaint/FillTexturePaint.java diff --git a/jdk/test/java/awt/Graphics2D/FlipDrawImage/FlipDrawImage.java b/test/jdk/java/awt/Graphics2D/FlipDrawImage/FlipDrawImage.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/FlipDrawImage/FlipDrawImage.java rename to test/jdk/java/awt/Graphics2D/FlipDrawImage/FlipDrawImage.java diff --git a/jdk/test/java/awt/Graphics2D/Headless/HeadlessPoint.java b/test/jdk/java/awt/Graphics2D/Headless/HeadlessPoint.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/Headless/HeadlessPoint.java rename to test/jdk/java/awt/Graphics2D/Headless/HeadlessPoint.java diff --git a/jdk/test/java/awt/Graphics2D/Headless/HeadlessPolygon.java b/test/jdk/java/awt/Graphics2D/Headless/HeadlessPolygon.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/Headless/HeadlessPolygon.java rename to test/jdk/java/awt/Graphics2D/Headless/HeadlessPolygon.java diff --git a/jdk/test/java/awt/Graphics2D/Headless/HeadlessRectangle.java b/test/jdk/java/awt/Graphics2D/Headless/HeadlessRectangle.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/Headless/HeadlessRectangle.java rename to test/jdk/java/awt/Graphics2D/Headless/HeadlessRectangle.java diff --git a/jdk/test/java/awt/Graphics2D/IncorrectTextSize/IncorrectTextSize.java b/test/jdk/java/awt/Graphics2D/IncorrectTextSize/IncorrectTextSize.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/IncorrectTextSize/IncorrectTextSize.java rename to test/jdk/java/awt/Graphics2D/IncorrectTextSize/IncorrectTextSize.java diff --git a/jdk/test/java/awt/Graphics2D/MTGraphicsAccessTest/MTGraphicsAccessTest.java b/test/jdk/java/awt/Graphics2D/MTGraphicsAccessTest/MTGraphicsAccessTest.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/MTGraphicsAccessTest/MTGraphicsAccessTest.java rename to test/jdk/java/awt/Graphics2D/MTGraphicsAccessTest/MTGraphicsAccessTest.java diff --git a/jdk/test/java/awt/Graphics2D/RenderClipTest/6766342.tests b/test/jdk/java/awt/Graphics2D/RenderClipTest/6766342.tests similarity index 100% rename from jdk/test/java/awt/Graphics2D/RenderClipTest/6766342.tests rename to test/jdk/java/awt/Graphics2D/RenderClipTest/6766342.tests diff --git a/jdk/test/java/awt/Graphics2D/RenderClipTest/RenderClipTest.java b/test/jdk/java/awt/Graphics2D/RenderClipTest/RenderClipTest.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/RenderClipTest/RenderClipTest.java rename to test/jdk/java/awt/Graphics2D/RenderClipTest/RenderClipTest.java diff --git a/jdk/test/java/awt/Graphics2D/ScaledCopyArea/ScaledCopyArea.java b/test/jdk/java/awt/Graphics2D/ScaledCopyArea/ScaledCopyArea.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/ScaledCopyArea/ScaledCopyArea.java rename to test/jdk/java/awt/Graphics2D/ScaledCopyArea/ScaledCopyArea.java diff --git a/jdk/test/java/awt/Graphics2D/ScaledTransform/ScaledTransform.java b/test/jdk/java/awt/Graphics2D/ScaledTransform/ScaledTransform.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/ScaledTransform/ScaledTransform.java rename to test/jdk/java/awt/Graphics2D/ScaledTransform/ScaledTransform.java diff --git a/jdk/test/java/awt/Graphics2D/Test8004859/Test8004859.java b/test/jdk/java/awt/Graphics2D/Test8004859/Test8004859.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/Test8004859/Test8004859.java rename to test/jdk/java/awt/Graphics2D/Test8004859/Test8004859.java diff --git a/jdk/test/java/awt/Graphics2D/TransformSetGet/TransformSetGet.java b/test/jdk/java/awt/Graphics2D/TransformSetGet/TransformSetGet.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/TransformSetGet/TransformSetGet.java rename to test/jdk/java/awt/Graphics2D/TransformSetGet/TransformSetGet.java diff --git a/jdk/test/java/awt/Graphics2D/WhiteTextColorTest.java b/test/jdk/java/awt/Graphics2D/WhiteTextColorTest.java similarity index 100% rename from jdk/test/java/awt/Graphics2D/WhiteTextColorTest.java rename to test/jdk/java/awt/Graphics2D/WhiteTextColorTest.java diff --git a/jdk/test/java/awt/GraphicsConfiguration/HeadlessGraphicsConfiguration.java b/test/jdk/java/awt/GraphicsConfiguration/HeadlessGraphicsConfiguration.java similarity index 100% rename from jdk/test/java/awt/GraphicsConfiguration/HeadlessGraphicsConfiguration.java rename to test/jdk/java/awt/GraphicsConfiguration/HeadlessGraphicsConfiguration.java diff --git a/jdk/test/java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java b/test/jdk/java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java similarity index 100% rename from jdk/test/java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java rename to test/jdk/java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java diff --git a/jdk/test/java/awt/GraphicsDevice/CheckDisplayModes.java b/test/jdk/java/awt/GraphicsDevice/CheckDisplayModes.java similarity index 100% rename from jdk/test/java/awt/GraphicsDevice/CheckDisplayModes.java rename to test/jdk/java/awt/GraphicsDevice/CheckDisplayModes.java diff --git a/jdk/test/java/awt/GraphicsDevice/CloneConfigsTest.java b/test/jdk/java/awt/GraphicsDevice/CloneConfigsTest.java similarity index 100% rename from jdk/test/java/awt/GraphicsDevice/CloneConfigsTest.java rename to test/jdk/java/awt/GraphicsDevice/CloneConfigsTest.java diff --git a/jdk/test/java/awt/GraphicsDevice/DisplayModes/CompareToXrandrTest.java b/test/jdk/java/awt/GraphicsDevice/DisplayModes/CompareToXrandrTest.java similarity index 100% rename from jdk/test/java/awt/GraphicsDevice/DisplayModes/CompareToXrandrTest.java rename to test/jdk/java/awt/GraphicsDevice/DisplayModes/CompareToXrandrTest.java diff --git a/jdk/test/java/awt/GraphicsDevice/HeadlessGraphicsDevice.java b/test/jdk/java/awt/GraphicsDevice/HeadlessGraphicsDevice.java similarity index 100% rename from jdk/test/java/awt/GraphicsDevice/HeadlessGraphicsDevice.java rename to test/jdk/java/awt/GraphicsDevice/HeadlessGraphicsDevice.java diff --git a/jdk/test/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java b/test/jdk/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java similarity index 100% rename from jdk/test/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java rename to test/jdk/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java diff --git a/jdk/test/java/awt/GraphicsEnvironment/HeadlessGraphicsEnvironment.java b/test/jdk/java/awt/GraphicsEnvironment/HeadlessGraphicsEnvironment.java similarity index 100% rename from jdk/test/java/awt/GraphicsEnvironment/HeadlessGraphicsEnvironment.java rename to test/jdk/java/awt/GraphicsEnvironment/HeadlessGraphicsEnvironment.java diff --git a/jdk/test/java/awt/GraphicsEnvironment/LoadLock/GE_init1.java b/test/jdk/java/awt/GraphicsEnvironment/LoadLock/GE_init1.java similarity index 100% rename from jdk/test/java/awt/GraphicsEnvironment/LoadLock/GE_init1.java rename to test/jdk/java/awt/GraphicsEnvironment/LoadLock/GE_init1.java diff --git a/jdk/test/java/awt/GraphicsEnvironment/LoadLock/GE_init2.java b/test/jdk/java/awt/GraphicsEnvironment/LoadLock/GE_init2.java similarity index 100% rename from jdk/test/java/awt/GraphicsEnvironment/LoadLock/GE_init2.java rename to test/jdk/java/awt/GraphicsEnvironment/LoadLock/GE_init2.java diff --git a/jdk/test/java/awt/GraphicsEnvironment/LoadLock/GE_init3.java b/test/jdk/java/awt/GraphicsEnvironment/LoadLock/GE_init3.java similarity index 100% rename from jdk/test/java/awt/GraphicsEnvironment/LoadLock/GE_init3.java rename to test/jdk/java/awt/GraphicsEnvironment/LoadLock/GE_init3.java diff --git a/jdk/test/java/awt/GraphicsEnvironment/LoadLock/GE_init4.java b/test/jdk/java/awt/GraphicsEnvironment/LoadLock/GE_init4.java similarity index 100% rename from jdk/test/java/awt/GraphicsEnvironment/LoadLock/GE_init4.java rename to test/jdk/java/awt/GraphicsEnvironment/LoadLock/GE_init4.java diff --git a/jdk/test/java/awt/GraphicsEnvironment/LoadLock/GE_init5.java b/test/jdk/java/awt/GraphicsEnvironment/LoadLock/GE_init5.java similarity index 100% rename from jdk/test/java/awt/GraphicsEnvironment/LoadLock/GE_init5.java rename to test/jdk/java/awt/GraphicsEnvironment/LoadLock/GE_init5.java diff --git a/jdk/test/java/awt/GraphicsEnvironment/LoadLock/GE_init6.java b/test/jdk/java/awt/GraphicsEnvironment/LoadLock/GE_init6.java similarity index 100% rename from jdk/test/java/awt/GraphicsEnvironment/LoadLock/GE_init6.java rename to test/jdk/java/awt/GraphicsEnvironment/LoadLock/GE_init6.java diff --git a/jdk/test/java/awt/GraphicsEnvironment/PreferLocaleFonts.java b/test/jdk/java/awt/GraphicsEnvironment/PreferLocaleFonts.java similarity index 100% rename from jdk/test/java/awt/GraphicsEnvironment/PreferLocaleFonts.java rename to test/jdk/java/awt/GraphicsEnvironment/PreferLocaleFonts.java diff --git a/jdk/test/java/awt/GraphicsEnvironment/TestDetectHeadless/TestDetectHeadless.java b/test/jdk/java/awt/GraphicsEnvironment/TestDetectHeadless/TestDetectHeadless.java similarity index 100% rename from jdk/test/java/awt/GraphicsEnvironment/TestDetectHeadless/TestDetectHeadless.java rename to test/jdk/java/awt/GraphicsEnvironment/TestDetectHeadless/TestDetectHeadless.java diff --git a/jdk/test/java/awt/GraphicsEnvironment/TestDetectHeadless/TestDetectHeadless.sh b/test/jdk/java/awt/GraphicsEnvironment/TestDetectHeadless/TestDetectHeadless.sh similarity index 100% rename from jdk/test/java/awt/GraphicsEnvironment/TestDetectHeadless/TestDetectHeadless.sh rename to test/jdk/java/awt/GraphicsEnvironment/TestDetectHeadless/TestDetectHeadless.sh diff --git a/jdk/test/java/awt/GraphicsEnvironment/TestGetDefScreenDevice.java b/test/jdk/java/awt/GraphicsEnvironment/TestGetDefScreenDevice.java similarity index 100% rename from jdk/test/java/awt/GraphicsEnvironment/TestGetDefScreenDevice.java rename to test/jdk/java/awt/GraphicsEnvironment/TestGetDefScreenDevice.java diff --git a/jdk/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.html b/test/jdk/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.html similarity index 100% rename from jdk/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.html rename to test/jdk/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.html diff --git a/jdk/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java b/test/jdk/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java similarity index 100% rename from jdk/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java rename to test/jdk/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java diff --git a/jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java b/test/jdk/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java similarity index 100% rename from jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java rename to test/jdk/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java diff --git a/jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java b/test/jdk/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java similarity index 100% rename from jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java rename to test/jdk/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java diff --git a/jdk/test/java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java b/test/jdk/java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java similarity index 100% rename from jdk/test/java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java rename to test/jdk/java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java diff --git a/jdk/test/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java b/test/jdk/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java similarity index 100% rename from jdk/test/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java rename to test/jdk/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java diff --git a/jdk/test/java/awt/Headless/HeadlessAWTEventMulticaster.java b/test/jdk/java/awt/Headless/HeadlessAWTEventMulticaster.java similarity index 100% rename from jdk/test/java/awt/Headless/HeadlessAWTEventMulticaster.java rename to test/jdk/java/awt/Headless/HeadlessAWTEventMulticaster.java diff --git a/jdk/test/java/awt/Headless/HeadlessAWTException.java b/test/jdk/java/awt/Headless/HeadlessAWTException.java similarity index 100% rename from jdk/test/java/awt/Headless/HeadlessAWTException.java rename to test/jdk/java/awt/Headless/HeadlessAWTException.java diff --git a/jdk/test/java/awt/Headless/HeadlessBasicStroke.java b/test/jdk/java/awt/Headless/HeadlessBasicStroke.java similarity index 100% rename from jdk/test/java/awt/Headless/HeadlessBasicStroke.java rename to test/jdk/java/awt/Headless/HeadlessBasicStroke.java diff --git a/jdk/test/java/awt/Headless/HeadlessBorderLayout.java b/test/jdk/java/awt/Headless/HeadlessBorderLayout.java similarity index 100% rename from jdk/test/java/awt/Headless/HeadlessBorderLayout.java rename to test/jdk/java/awt/Headless/HeadlessBorderLayout.java diff --git a/jdk/test/java/awt/Headless/HeadlessCardLayout.java b/test/jdk/java/awt/Headless/HeadlessCardLayout.java similarity index 100% rename from jdk/test/java/awt/Headless/HeadlessCardLayout.java rename to test/jdk/java/awt/Headless/HeadlessCardLayout.java diff --git a/jdk/test/java/awt/Headless/HeadlessCheckboxGroup.java b/test/jdk/java/awt/Headless/HeadlessCheckboxGroup.java similarity index 100% rename from jdk/test/java/awt/Headless/HeadlessCheckboxGroup.java rename to test/jdk/java/awt/Headless/HeadlessCheckboxGroup.java diff --git a/jdk/test/java/awt/Headless/HeadlessCheckboxMenuItem.java b/test/jdk/java/awt/Headless/HeadlessCheckboxMenuItem.java similarity index 100% rename from jdk/test/java/awt/Headless/HeadlessCheckboxMenuItem.java rename to test/jdk/java/awt/Headless/HeadlessCheckboxMenuItem.java diff --git a/jdk/test/java/awt/Headless/HeadlessComponentOrientation.java b/test/jdk/java/awt/Headless/HeadlessComponentOrientation.java similarity index 100% rename from jdk/test/java/awt/Headless/HeadlessComponentOrientation.java rename to test/jdk/java/awt/Headless/HeadlessComponentOrientation.java diff --git a/jdk/test/java/awt/Headless/HeadlessDimension.java b/test/jdk/java/awt/Headless/HeadlessDimension.java similarity index 100% rename from jdk/test/java/awt/Headless/HeadlessDimension.java rename to test/jdk/java/awt/Headless/HeadlessDimension.java diff --git a/jdk/test/java/awt/Headless/HeadlessFlowLayout.java b/test/jdk/java/awt/Headless/HeadlessFlowLayout.java similarity index 100% rename from jdk/test/java/awt/Headless/HeadlessFlowLayout.java rename to test/jdk/java/awt/Headless/HeadlessFlowLayout.java diff --git a/jdk/test/java/awt/Headless/HeadlessMediaTracker.java b/test/jdk/java/awt/Headless/HeadlessMediaTracker.java similarity index 100% rename from jdk/test/java/awt/Headless/HeadlessMediaTracker.java rename to test/jdk/java/awt/Headless/HeadlessMediaTracker.java diff --git a/jdk/test/java/awt/Headless/HeadlessPopupMenu.java b/test/jdk/java/awt/Headless/HeadlessPopupMenu.java similarity index 100% rename from jdk/test/java/awt/Headless/HeadlessPopupMenu.java rename to test/jdk/java/awt/Headless/HeadlessPopupMenu.java diff --git a/jdk/test/java/awt/Headless/ThemeReaderCrashTest.java b/test/jdk/java/awt/Headless/ThemeReaderCrashTest.java similarity index 100% rename from jdk/test/java/awt/Headless/ThemeReaderCrashTest.java rename to test/jdk/java/awt/Headless/ThemeReaderCrashTest.java diff --git a/jdk/test/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.html b/test/jdk/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.html similarity index 100% rename from jdk/test/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.html rename to test/jdk/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.html diff --git a/jdk/test/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.java b/test/jdk/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.java similarity index 100% rename from jdk/test/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.java rename to test/jdk/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.java diff --git a/jdk/test/java/awt/InputMethods/InputMethodKeyEventsTest/InputMethodKeyEventsTest.java b/test/jdk/java/awt/InputMethods/InputMethodKeyEventsTest/InputMethodKeyEventsTest.java similarity index 100% rename from jdk/test/java/awt/InputMethods/InputMethodKeyEventsTest/InputMethodKeyEventsTest.java rename to test/jdk/java/awt/InputMethods/InputMethodKeyEventsTest/InputMethodKeyEventsTest.java diff --git a/jdk/test/java/awt/InputMethods/InputMethodsTest/InputMethodsTest.html b/test/jdk/java/awt/InputMethods/InputMethodsTest/InputMethodsTest.html similarity index 100% rename from jdk/test/java/awt/InputMethods/InputMethodsTest/InputMethodsTest.html rename to test/jdk/java/awt/InputMethods/InputMethodsTest/InputMethodsTest.html diff --git a/jdk/test/java/awt/InputMethods/InputMethodsTest/InputMethodsTest.java b/test/jdk/java/awt/InputMethods/InputMethodsTest/InputMethodsTest.java similarity index 100% rename from jdk/test/java/awt/InputMethods/InputMethodsTest/InputMethodsTest.java rename to test/jdk/java/awt/InputMethods/InputMethodsTest/InputMethodsTest.java diff --git a/jdk/test/java/awt/InputMethods/SpanishDiacriticsTest/SpanishDiacriticsTest.html b/test/jdk/java/awt/InputMethods/SpanishDiacriticsTest/SpanishDiacriticsTest.html similarity index 100% rename from jdk/test/java/awt/InputMethods/SpanishDiacriticsTest/SpanishDiacriticsTest.html rename to test/jdk/java/awt/InputMethods/SpanishDiacriticsTest/SpanishDiacriticsTest.html diff --git a/jdk/test/java/awt/InputMethods/SpanishDiacriticsTest/SpanishDiacriticsTest.java b/test/jdk/java/awt/InputMethods/SpanishDiacriticsTest/SpanishDiacriticsTest.java similarity index 100% rename from jdk/test/java/awt/InputMethods/SpanishDiacriticsTest/SpanishDiacriticsTest.java rename to test/jdk/java/awt/InputMethods/SpanishDiacriticsTest/SpanishDiacriticsTest.java diff --git a/jdk/test/java/awt/Insets/CombinedTestApp1.java b/test/jdk/java/awt/Insets/CombinedTestApp1.java similarity index 100% rename from jdk/test/java/awt/Insets/CombinedTestApp1.java rename to test/jdk/java/awt/Insets/CombinedTestApp1.java diff --git a/jdk/test/java/awt/Insets/HeadlessInsets.java b/test/jdk/java/awt/Insets/HeadlessInsets.java similarity index 100% rename from jdk/test/java/awt/Insets/HeadlessInsets.java rename to test/jdk/java/awt/Insets/HeadlessInsets.java diff --git a/jdk/test/java/awt/JAWT/JAWT.sh b/test/jdk/java/awt/JAWT/JAWT.sh similarity index 100% rename from jdk/test/java/awt/JAWT/JAWT.sh rename to test/jdk/java/awt/JAWT/JAWT.sh diff --git a/jdk/test/java/awt/JAWT/Makefile.cygwin b/test/jdk/java/awt/JAWT/Makefile.cygwin similarity index 100% rename from jdk/test/java/awt/JAWT/Makefile.cygwin rename to test/jdk/java/awt/JAWT/Makefile.cygwin diff --git a/jdk/test/java/awt/JAWT/Makefile.unix b/test/jdk/java/awt/JAWT/Makefile.unix similarity index 100% rename from jdk/test/java/awt/JAWT/Makefile.unix rename to test/jdk/java/awt/JAWT/Makefile.unix diff --git a/jdk/test/java/awt/JAWT/Makefile.win b/test/jdk/java/awt/JAWT/Makefile.win similarity index 100% rename from jdk/test/java/awt/JAWT/Makefile.win rename to test/jdk/java/awt/JAWT/Makefile.win diff --git a/jdk/test/java/awt/JAWT/MyCanvas.java b/test/jdk/java/awt/JAWT/MyCanvas.java similarity index 100% rename from jdk/test/java/awt/JAWT/MyCanvas.java rename to test/jdk/java/awt/JAWT/MyCanvas.java diff --git a/jdk/test/java/awt/JAWT/myfile.c b/test/jdk/java/awt/JAWT/myfile.c similarity index 100% rename from jdk/test/java/awt/JAWT/myfile.c rename to test/jdk/java/awt/JAWT/myfile.c diff --git a/jdk/test/java/awt/JAWT/myfile.cpp b/test/jdk/java/awt/JAWT/myfile.cpp similarity index 100% rename from jdk/test/java/awt/JAWT/myfile.cpp rename to test/jdk/java/awt/JAWT/myfile.cpp diff --git a/jdk/test/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.html b/test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.html similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.html rename to test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.html diff --git a/jdk/test/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.java b/test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.java similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.java rename to test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.java diff --git a/jdk/test/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.html b/test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.html similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.html rename to test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.html diff --git a/jdk/test/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.java b/test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.java similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.java rename to test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.java diff --git a/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_AWT.java b/test/jdk/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_AWT.java similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_AWT.java rename to test/jdk/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_AWT.java diff --git a/jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java b/test/jdk/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java rename to test/jdk/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java diff --git a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html rename to test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html diff --git a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java rename to test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java diff --git a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogButtonTest/EnqueueWithDialogButtonTest.java b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogButtonTest/EnqueueWithDialogButtonTest.java similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogButtonTest/EnqueueWithDialogButtonTest.java rename to test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogButtonTest/EnqueueWithDialogButtonTest.java diff --git a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogTest.java b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogTest.java similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogTest.java rename to test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogTest.java diff --git a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/FreezeTest/FreezeTest.java b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/FreezeTest/FreezeTest.java similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/FreezeTest/FreezeTest.java rename to test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/FreezeTest/FreezeTest.java diff --git a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html rename to test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html diff --git a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java rename to test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java diff --git a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html rename to test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html diff --git a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java rename to test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java diff --git a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html rename to test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html diff --git a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java similarity index 100% rename from jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java rename to test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java diff --git a/jdk/test/java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java b/test/jdk/java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java similarity index 100% rename from jdk/test/java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java rename to test/jdk/java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java diff --git a/jdk/test/java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java b/test/jdk/java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java similarity index 100% rename from jdk/test/java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java rename to test/jdk/java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java diff --git a/jdk/test/java/awt/List/ActionAfterRemove/ActionAfterRemove.java b/test/jdk/java/awt/List/ActionAfterRemove/ActionAfterRemove.java similarity index 100% rename from jdk/test/java/awt/List/ActionAfterRemove/ActionAfterRemove.java rename to test/jdk/java/awt/List/ActionAfterRemove/ActionAfterRemove.java diff --git a/jdk/test/java/awt/List/ActionEventTest/ActionEventTest.java b/test/jdk/java/awt/List/ActionEventTest/ActionEventTest.java similarity index 100% rename from jdk/test/java/awt/List/ActionEventTest/ActionEventTest.java rename to test/jdk/java/awt/List/ActionEventTest/ActionEventTest.java diff --git a/jdk/test/java/awt/List/EmptyListEventTest/EmptyListEventTest.java b/test/jdk/java/awt/List/EmptyListEventTest/EmptyListEventTest.java similarity index 100% rename from jdk/test/java/awt/List/EmptyListEventTest/EmptyListEventTest.java rename to test/jdk/java/awt/List/EmptyListEventTest/EmptyListEventTest.java diff --git a/jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html b/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html similarity index 100% rename from jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html rename to test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html diff --git a/jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java b/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java similarity index 100% rename from jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java rename to test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java diff --git a/jdk/test/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.html b/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.html similarity index 100% rename from jdk/test/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.html rename to test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.html diff --git a/jdk/test/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java b/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java similarity index 100% rename from jdk/test/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java rename to test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java diff --git a/jdk/test/java/awt/List/ItemEventTest/ItemEventTest.java b/test/jdk/java/awt/List/ItemEventTest/ItemEventTest.java similarity index 100% rename from jdk/test/java/awt/List/ItemEventTest/ItemEventTest.java rename to test/jdk/java/awt/List/ItemEventTest/ItemEventTest.java diff --git a/jdk/test/java/awt/List/KeyEventsTest/KeyEventsTest.html b/test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.html similarity index 100% rename from jdk/test/java/awt/List/KeyEventsTest/KeyEventsTest.html rename to test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.html diff --git a/jdk/test/java/awt/List/KeyEventsTest/KeyEventsTest.java b/test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.java similarity index 100% rename from jdk/test/java/awt/List/KeyEventsTest/KeyEventsTest.java rename to test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.java diff --git a/jdk/test/java/awt/List/ListFlickers/ListFlickers.java b/test/jdk/java/awt/List/ListFlickers/ListFlickers.java similarity index 100% rename from jdk/test/java/awt/List/ListFlickers/ListFlickers.java rename to test/jdk/java/awt/List/ListFlickers/ListFlickers.java diff --git a/jdk/test/java/awt/List/ListGarbageCollectionTest/AwtListGarbageCollectionTest.java b/test/jdk/java/awt/List/ListGarbageCollectionTest/AwtListGarbageCollectionTest.java similarity index 100% rename from jdk/test/java/awt/List/ListGarbageCollectionTest/AwtListGarbageCollectionTest.java rename to test/jdk/java/awt/List/ListGarbageCollectionTest/AwtListGarbageCollectionTest.java diff --git a/jdk/test/java/awt/List/ListPeer/R2303044ListSelection.java b/test/jdk/java/awt/List/ListPeer/R2303044ListSelection.java similarity index 100% rename from jdk/test/java/awt/List/ListPeer/R2303044ListSelection.java rename to test/jdk/java/awt/List/ListPeer/R2303044ListSelection.java diff --git a/jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.html b/test/jdk/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.html similarity index 100% rename from jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.html rename to test/jdk/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.html diff --git a/jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.java b/test/jdk/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.java similarity index 100% rename from jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.java rename to test/jdk/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.java diff --git a/jdk/test/java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java b/test/jdk/java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java similarity index 100% rename from jdk/test/java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java rename to test/jdk/java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java diff --git a/jdk/test/java/awt/List/ScrollOutside/ScrollOut.java b/test/jdk/java/awt/List/ScrollOutside/ScrollOut.java similarity index 100% rename from jdk/test/java/awt/List/ScrollOutside/ScrollOut.java rename to test/jdk/java/awt/List/ScrollOutside/ScrollOut.java diff --git a/jdk/test/java/awt/List/SetBackgroundTest/SetBackgroundTest.java b/test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java similarity index 100% rename from jdk/test/java/awt/List/SetBackgroundTest/SetBackgroundTest.java rename to test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java diff --git a/jdk/test/java/awt/List/SetFontTest/SetFontTest.html b/test/jdk/java/awt/List/SetFontTest/SetFontTest.html similarity index 100% rename from jdk/test/java/awt/List/SetFontTest/SetFontTest.html rename to test/jdk/java/awt/List/SetFontTest/SetFontTest.html diff --git a/jdk/test/java/awt/List/SetFontTest/SetFontTest.java b/test/jdk/java/awt/List/SetFontTest/SetFontTest.java similarity index 100% rename from jdk/test/java/awt/List/SetFontTest/SetFontTest.java rename to test/jdk/java/awt/List/SetFontTest/SetFontTest.java diff --git a/jdk/test/java/awt/List/SingleModeDeselect/SingleModeDeselect.java b/test/jdk/java/awt/List/SingleModeDeselect/SingleModeDeselect.java similarity index 100% rename from jdk/test/java/awt/List/SingleModeDeselect/SingleModeDeselect.java rename to test/jdk/java/awt/List/SingleModeDeselect/SingleModeDeselect.java diff --git a/jdk/test/java/awt/Menu/Headless/HeadlessMenu.java b/test/jdk/java/awt/Menu/Headless/HeadlessMenu.java similarity index 100% rename from jdk/test/java/awt/Menu/Headless/HeadlessMenu.java rename to test/jdk/java/awt/Menu/Headless/HeadlessMenu.java diff --git a/jdk/test/java/awt/Menu/Headless/HeadlessMenuItem.java b/test/jdk/java/awt/Menu/Headless/HeadlessMenuItem.java similarity index 100% rename from jdk/test/java/awt/Menu/Headless/HeadlessMenuItem.java rename to test/jdk/java/awt/Menu/Headless/HeadlessMenuItem.java diff --git a/jdk/test/java/awt/Menu/Headless/HeadlessMenuShortcut.java b/test/jdk/java/awt/Menu/Headless/HeadlessMenuShortcut.java similarity index 100% rename from jdk/test/java/awt/Menu/Headless/HeadlessMenuShortcut.java rename to test/jdk/java/awt/Menu/Headless/HeadlessMenuShortcut.java diff --git a/jdk/test/java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java b/test/jdk/java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java similarity index 100% rename from jdk/test/java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java rename to test/jdk/java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java diff --git a/jdk/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java b/test/jdk/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java similarity index 100% rename from jdk/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java rename to test/jdk/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java diff --git a/jdk/test/java/awt/Menu/WrongParentAfterRemoveMenu/WrongParentAfterRemoveMenu.java b/test/jdk/java/awt/Menu/WrongParentAfterRemoveMenu/WrongParentAfterRemoveMenu.java similarity index 100% rename from jdk/test/java/awt/Menu/WrongParentAfterRemoveMenu/WrongParentAfterRemoveMenu.java rename to test/jdk/java/awt/Menu/WrongParentAfterRemoveMenu/WrongParentAfterRemoveMenu.java diff --git a/jdk/test/java/awt/MenuBar/8007006/bug8007006.java b/test/jdk/java/awt/MenuBar/8007006/bug8007006.java similarity index 100% rename from jdk/test/java/awt/MenuBar/8007006/bug8007006.java rename to test/jdk/java/awt/MenuBar/8007006/bug8007006.java diff --git a/jdk/test/java/awt/MenuBar/ActionEventTest/ActionEventTest.java b/test/jdk/java/awt/MenuBar/ActionEventTest/ActionEventTest.java similarity index 100% rename from jdk/test/java/awt/MenuBar/ActionEventTest/ActionEventTest.java rename to test/jdk/java/awt/MenuBar/ActionEventTest/ActionEventTest.java diff --git a/jdk/test/java/awt/MenuBar/DeadlockTest1/DeadlockTest1.java b/test/jdk/java/awt/MenuBar/DeadlockTest1/DeadlockTest1.java similarity index 100% rename from jdk/test/java/awt/MenuBar/DeadlockTest1/DeadlockTest1.java rename to test/jdk/java/awt/MenuBar/DeadlockTest1/DeadlockTest1.java diff --git a/jdk/test/java/awt/MenuBar/HeadlessMenuBar.java b/test/jdk/java/awt/MenuBar/HeadlessMenuBar.java similarity index 100% rename from jdk/test/java/awt/MenuBar/HeadlessMenuBar.java rename to test/jdk/java/awt/MenuBar/HeadlessMenuBar.java diff --git a/jdk/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java b/test/jdk/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java similarity index 100% rename from jdk/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java rename to test/jdk/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java diff --git a/jdk/test/java/awt/MenuBar/RemoveHelpMenu/RemoveHelpMenu.java b/test/jdk/java/awt/MenuBar/RemoveHelpMenu/RemoveHelpMenu.java similarity index 100% rename from jdk/test/java/awt/MenuBar/RemoveHelpMenu/RemoveHelpMenu.java rename to test/jdk/java/awt/MenuBar/RemoveHelpMenu/RemoveHelpMenu.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/FrameBorderCounter.java b/test/jdk/java/awt/Mixing/AWT_Mixing/FrameBorderCounter.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/FrameBorderCounter.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/FrameBorderCounter.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java b/test/jdk/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java b/test/jdk/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JListOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JListOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java b/test/jdk/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java b/test/jdk/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java b/test/jdk/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java b/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java b/test/jdk/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java similarity index 100% rename from jdk/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java rename to test/jdk/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java diff --git a/jdk/test/java/awt/Mixing/HWDisappear.java b/test/jdk/java/awt/Mixing/HWDisappear.java similarity index 100% rename from jdk/test/java/awt/Mixing/HWDisappear.java rename to test/jdk/java/awt/Mixing/HWDisappear.java diff --git a/jdk/test/java/awt/Mixing/JButtonInGlassPane.java b/test/jdk/java/awt/Mixing/JButtonInGlassPane.java similarity index 100% rename from jdk/test/java/awt/Mixing/JButtonInGlassPane.java rename to test/jdk/java/awt/Mixing/JButtonInGlassPane.java diff --git a/jdk/test/java/awt/Mixing/LWComboBox.java b/test/jdk/java/awt/Mixing/LWComboBox.java similarity index 100% rename from jdk/test/java/awt/Mixing/LWComboBox.java rename to test/jdk/java/awt/Mixing/LWComboBox.java diff --git a/jdk/test/java/awt/Mixing/LWPopupMenu.java b/test/jdk/java/awt/Mixing/LWPopupMenu.java similarity index 100% rename from jdk/test/java/awt/Mixing/LWPopupMenu.java rename to test/jdk/java/awt/Mixing/LWPopupMenu.java diff --git a/jdk/test/java/awt/Mixing/MixingInHwPanel.java b/test/jdk/java/awt/Mixing/MixingInHwPanel.java similarity index 100% rename from jdk/test/java/awt/Mixing/MixingInHwPanel.java rename to test/jdk/java/awt/Mixing/MixingInHwPanel.java diff --git a/jdk/test/java/awt/Mixing/MixingOnDialog.java b/test/jdk/java/awt/Mixing/MixingOnDialog.java similarity index 100% rename from jdk/test/java/awt/Mixing/MixingOnDialog.java rename to test/jdk/java/awt/Mixing/MixingOnDialog.java diff --git a/jdk/test/java/awt/Mixing/MixingOnShrinkingHWButton.java b/test/jdk/java/awt/Mixing/MixingOnShrinkingHWButton.java similarity index 100% rename from jdk/test/java/awt/Mixing/MixingOnShrinkingHWButton.java rename to test/jdk/java/awt/Mixing/MixingOnShrinkingHWButton.java diff --git a/jdk/test/java/awt/Mixing/NonOpaqueInternalFrame.java b/test/jdk/java/awt/Mixing/NonOpaqueInternalFrame.java similarity index 100% rename from jdk/test/java/awt/Mixing/NonOpaqueInternalFrame.java rename to test/jdk/java/awt/Mixing/NonOpaqueInternalFrame.java diff --git a/jdk/test/java/awt/Mixing/OpaqueTest.java b/test/jdk/java/awt/Mixing/OpaqueTest.java similarity index 100% rename from jdk/test/java/awt/Mixing/OpaqueTest.java rename to test/jdk/java/awt/Mixing/OpaqueTest.java diff --git a/jdk/test/java/awt/Mixing/OverlappingButtons.java b/test/jdk/java/awt/Mixing/OverlappingButtons.java similarity index 100% rename from jdk/test/java/awt/Mixing/OverlappingButtons.java rename to test/jdk/java/awt/Mixing/OverlappingButtons.java diff --git a/jdk/test/java/awt/Mixing/ValidBounds.java b/test/jdk/java/awt/Mixing/ValidBounds.java similarity index 100% rename from jdk/test/java/awt/Mixing/ValidBounds.java rename to test/jdk/java/awt/Mixing/ValidBounds.java diff --git a/jdk/test/java/awt/Mixing/Validating.java b/test/jdk/java/awt/Mixing/Validating.java similarity index 100% rename from jdk/test/java/awt/Mixing/Validating.java rename to test/jdk/java/awt/Mixing/Validating.java diff --git a/jdk/test/java/awt/Mixing/setComponentZOrder.java b/test/jdk/java/awt/Mixing/setComponentZOrder.java similarity index 100% rename from jdk/test/java/awt/Mixing/setComponentZOrder.java rename to test/jdk/java/awt/Mixing/setComponentZOrder.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDWDTest.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDWDTest.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogDWDTest.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogDWDTest.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogFWDTest.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogFWDTest.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogFWDTest.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogFWDTest.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal1Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogModal1Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal2Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogModal2Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal3Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogModal3Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal4Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogModal4Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal5Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogModal5Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal6Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogModal6Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModalityTest.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModalityTest.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogModalityTest.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogModalityTest.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java similarity index 100% rename from jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java rename to test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java diff --git a/jdk/test/java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java b/test/jdk/java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java similarity index 100% rename from jdk/test/java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java rename to test/jdk/java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java diff --git a/jdk/test/java/awt/Modal/LWModalTest/LWModalTest.java b/test/jdk/java/awt/Modal/LWModalTest/LWModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/LWModalTest/LWModalTest.java rename to test/jdk/java/awt/Modal/LWModalTest/LWModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java rename to test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalDialogMultiscreenTest/ModalDialogMultiscreenTest.java b/test/jdk/java/awt/Modal/ModalDialogMultiscreenTest/ModalDialogMultiscreenTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalDialogMultiscreenTest/ModalDialogMultiscreenTest.java rename to test/jdk/java/awt/Modal/ModalDialogMultiscreenTest/ModalDialogMultiscreenTest.java diff --git a/jdk/test/java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java b/test/jdk/java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java rename to test/jdk/java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ExcludeDialogTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeDialogTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ExcludeDialogTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeDialogTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ExcludeFrameTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeFrameTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ExcludeFrameTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeFrameTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java rename to test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDTest.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFTest.java rename to test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFTest.java diff --git a/jdk/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java b/test/jdk/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java rename to test/jdk/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java diff --git a/jdk/test/java/awt/Modal/ModalitySettingsTest/ModalitySettingsTest.java b/test/jdk/java/awt/Modal/ModalitySettingsTest/ModalitySettingsTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ModalitySettingsTest/ModalitySettingsTest.java rename to test/jdk/java/awt/Modal/ModalitySettingsTest/ModalitySettingsTest.java diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java rename to test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java rename to test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java rename to test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java rename to test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java rename to test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java diff --git a/jdk/test/java/awt/Modal/NpeOnClose/NpeOnCloseTest.java b/test/jdk/java/awt/Modal/NpeOnClose/NpeOnCloseTest.java similarity index 100% rename from jdk/test/java/awt/Modal/NpeOnClose/NpeOnCloseTest.java rename to test/jdk/java/awt/Modal/NpeOnClose/NpeOnCloseTest.java diff --git a/jdk/test/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java b/test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java similarity index 100% rename from jdk/test/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java rename to test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDDFTest.java b/test/jdk/java/awt/Modal/OnTop/OnTopDDFTest.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopDDFTest.java rename to test/jdk/java/awt/Modal/OnTop/OnTopDDFTest.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopFDFTest.java b/test/jdk/java/awt/Modal/OnTop/OnTopFDFTest.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopFDFTest.java rename to test/jdk/java/awt/Modal/OnTop/OnTopFDFTest.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java rename to test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java diff --git a/jdk/test/java/awt/Modal/PrintDialogsTest/PrintDialogsTest.html b/test/jdk/java/awt/Modal/PrintDialogsTest/PrintDialogsTest.html similarity index 100% rename from jdk/test/java/awt/Modal/PrintDialogsTest/PrintDialogsTest.html rename to test/jdk/java/awt/Modal/PrintDialogsTest/PrintDialogsTest.html diff --git a/jdk/test/java/awt/Modal/PrintDialogsTest/PrintDialogsTest.java b/test/jdk/java/awt/Modal/PrintDialogsTest/PrintDialogsTest.java similarity index 100% rename from jdk/test/java/awt/Modal/PrintDialogsTest/PrintDialogsTest.java rename to test/jdk/java/awt/Modal/PrintDialogsTest/PrintDialogsTest.java diff --git a/jdk/test/java/awt/Modal/PrintDialogsTest/Test.java b/test/jdk/java/awt/Modal/PrintDialogsTest/Test.java similarity index 100% rename from jdk/test/java/awt/Modal/PrintDialogsTest/Test.java rename to test/jdk/java/awt/Modal/PrintDialogsTest/Test.java diff --git a/jdk/test/java/awt/Modal/SupportedTest/SupportedTest.java b/test/jdk/java/awt/Modal/SupportedTest/SupportedTest.java similarity index 100% rename from jdk/test/java/awt/Modal/SupportedTest/SupportedTest.java rename to test/jdk/java/awt/Modal/SupportedTest/SupportedTest.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal1Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackAppModal1Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackAppModal1Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal2Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackAppModal2Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackAppModal2Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal3Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackAppModal3Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackAppModal3Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal4Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackAppModal4Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackAppModal4Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackAppModal5Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackAppModal5Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackAppModal6Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDDFTest.java b/test/jdk/java/awt/Modal/ToBack/ToBackDDFTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackDDFTest.java rename to test/jdk/java/awt/Modal/ToBack/ToBackDDFTest.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal1Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackDocModal1Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackDocModal1Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal2Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackDocModal2Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackDocModal2Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal3Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackDocModal3Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackDocModal3Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal4Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackDocModal4Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackDocModal4Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackDocModal5Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackDocModal5Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackDocModal6Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackFDFTest.java b/test/jdk/java/awt/Modal/ToBack/ToBackFDFTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackFDFTest.java rename to test/jdk/java/awt/Modal/ToBack/ToBackFDFTest.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal1Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackModal1Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackModal1Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal2Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackModal2Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackModal2Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal3Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackModal3Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackModal3Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal4Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackModal4Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackModal4Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackModal5Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackModal6Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless1Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackModeless1Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackModeless1Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless2Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackModeless2Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackModeless2Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless3Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackModeless3Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackModeless3Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless4Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackModeless4Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackModeless4Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackModeless5Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackModeless5Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackModeless6Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal1Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackNonModal1Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackNonModal1Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal2Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackNonModal2Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackNonModal2Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal3Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackNonModal3Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackNonModal3Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal4Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackNonModal4Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackNonModal4Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackNonModal5Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackNonModal5Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackNonModal6Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal1Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackTKModal1Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackTKModal1Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal2Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackTKModal2Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackTKModal2Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal3Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackTKModal3Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackTKModal3Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal4Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackTKModal4Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackTKModal4Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackTKModal5Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackTKModal5Test.java diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToBack/ToBackTKModal6Test.java rename to test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java rename to test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java rename to test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalBlockedTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalBlockedTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/DialogToFrontModalBlockedTest.java rename to test/jdk/java/awt/Modal/ToFront/DialogToFrontModalBlockedTest.java diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java rename to test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java rename to test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModelessTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModelessTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/DialogToFrontModelessTest.java rename to test/jdk/java/awt/Modal/ToFront/DialogToFrontModelessTest.java diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java rename to test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java rename to test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModalBlockedTest.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModalBlockedTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontModalBlockedTest.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontModalBlockedTest.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModelessTest.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModelessTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontModelessTest.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontModelessTest.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java similarity index 100% rename from jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java rename to test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java diff --git a/jdk/test/java/awt/Modal/WsDisabledStyle/CloseBlocker/CloseBlocker.java b/test/jdk/java/awt/Modal/WsDisabledStyle/CloseBlocker/CloseBlocker.java similarity index 100% rename from jdk/test/java/awt/Modal/WsDisabledStyle/CloseBlocker/CloseBlocker.java rename to test/jdk/java/awt/Modal/WsDisabledStyle/CloseBlocker/CloseBlocker.java diff --git a/jdk/test/java/awt/Modal/WsDisabledStyle/OverBlocker/OverBlocker.java b/test/jdk/java/awt/Modal/WsDisabledStyle/OverBlocker/OverBlocker.java similarity index 100% rename from jdk/test/java/awt/Modal/WsDisabledStyle/OverBlocker/OverBlocker.java rename to test/jdk/java/awt/Modal/WsDisabledStyle/OverBlocker/OverBlocker.java diff --git a/jdk/test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java b/test/jdk/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java similarity index 100% rename from jdk/test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java rename to test/jdk/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java diff --git a/jdk/test/java/awt/Modal/helpers/Flag.java b/test/jdk/java/awt/Modal/helpers/Flag.java similarity index 100% rename from jdk/test/java/awt/Modal/helpers/Flag.java rename to test/jdk/java/awt/Modal/helpers/Flag.java diff --git a/jdk/test/java/awt/Modal/helpers/TestDialog.java b/test/jdk/java/awt/Modal/helpers/TestDialog.java similarity index 100% rename from jdk/test/java/awt/Modal/helpers/TestDialog.java rename to test/jdk/java/awt/Modal/helpers/TestDialog.java diff --git a/jdk/test/java/awt/Modal/helpers/TestFrame.java b/test/jdk/java/awt/Modal/helpers/TestFrame.java similarity index 100% rename from jdk/test/java/awt/Modal/helpers/TestFrame.java rename to test/jdk/java/awt/Modal/helpers/TestFrame.java diff --git a/jdk/test/java/awt/Modal/helpers/TestWindow.java b/test/jdk/java/awt/Modal/helpers/TestWindow.java similarity index 100% rename from jdk/test/java/awt/Modal/helpers/TestWindow.java rename to test/jdk/java/awt/Modal/helpers/TestWindow.java diff --git a/jdk/test/java/awt/Mouse/8158205/MouseHandCursorTest.java b/test/jdk/java/awt/Mouse/8158205/MouseHandCursorTest.java similarity index 100% rename from jdk/test/java/awt/Mouse/8158205/MouseHandCursorTest.java rename to test/jdk/java/awt/Mouse/8158205/MouseHandCursorTest.java diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java b/test/jdk/java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java similarity index 100% rename from jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java rename to test/jdk/java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java b/test/jdk/java/awt/Mouse/EnterExitEvents/DragWindowTest.java similarity index 100% rename from jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java rename to test/jdk/java/awt/Mouse/EnterExitEvents/DragWindowTest.java diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java b/test/jdk/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java similarity index 100% rename from jdk/test/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java rename to test/jdk/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java b/test/jdk/java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java similarity index 100% rename from jdk/test/java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java rename to test/jdk/java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java b/test/jdk/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java similarity index 100% rename from jdk/test/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java rename to test/jdk/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java diff --git a/jdk/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.html b/test/jdk/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.html similarity index 100% rename from jdk/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.html rename to test/jdk/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.html diff --git a/jdk/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java b/test/jdk/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java similarity index 100% rename from jdk/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java rename to test/jdk/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java diff --git a/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java similarity index 100% rename from jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java rename to test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java diff --git a/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java similarity index 100% rename from jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java rename to test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java diff --git a/jdk/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.java b/test/jdk/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.java similarity index 100% rename from jdk/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.java rename to test/jdk/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.java diff --git a/jdk/test/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java b/test/jdk/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java similarity index 100% rename from jdk/test/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java rename to test/jdk/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java diff --git a/jdk/test/java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java b/test/jdk/java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java similarity index 100% rename from jdk/test/java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java rename to test/jdk/java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java diff --git a/jdk/test/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java b/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java similarity index 100% rename from jdk/test/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java rename to test/jdk/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java diff --git a/jdk/test/java/awt/Mouse/MouseModifiersUnitTest/ModifierPermutation.java b/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/ModifierPermutation.java similarity index 100% rename from jdk/test/java/awt/Mouse/MouseModifiersUnitTest/ModifierPermutation.java rename to test/jdk/java/awt/Mouse/MouseModifiersUnitTest/ModifierPermutation.java diff --git a/jdk/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java b/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java similarity index 100% rename from jdk/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java rename to test/jdk/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java diff --git a/jdk/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Extra.java b/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Extra.java similarity index 100% rename from jdk/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Extra.java rename to test/jdk/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Extra.java diff --git a/jdk/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java b/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java similarity index 100% rename from jdk/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java rename to test/jdk/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java diff --git a/jdk/test/java/awt/Mouse/MouseWheelAbsXY/MouseWheelAbsXY.java b/test/jdk/java/awt/Mouse/MouseWheelAbsXY/MouseWheelAbsXY.java similarity index 100% rename from jdk/test/java/awt/Mouse/MouseWheelAbsXY/MouseWheelAbsXY.java rename to test/jdk/java/awt/Mouse/MouseWheelAbsXY/MouseWheelAbsXY.java diff --git a/jdk/test/java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java b/test/jdk/java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java similarity index 100% rename from jdk/test/java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java rename to test/jdk/java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java diff --git a/jdk/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html b/test/jdk/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html similarity index 100% rename from jdk/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html rename to test/jdk/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html diff --git a/jdk/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java b/test/jdk/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java similarity index 100% rename from jdk/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java rename to test/jdk/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java diff --git a/jdk/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java b/test/jdk/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java similarity index 100% rename from jdk/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java rename to test/jdk/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java diff --git a/jdk/test/java/awt/MouseInfo/ComponentMousePositionTest.java b/test/jdk/java/awt/MouseInfo/ComponentMousePositionTest.java similarity index 100% rename from jdk/test/java/awt/MouseInfo/ComponentMousePositionTest.java rename to test/jdk/java/awt/MouseInfo/ComponentMousePositionTest.java diff --git a/jdk/test/java/awt/MouseInfo/GetPointerInfoTest.java b/test/jdk/java/awt/MouseInfo/GetPointerInfoTest.java similarity index 100% rename from jdk/test/java/awt/MouseInfo/GetPointerInfoTest.java rename to test/jdk/java/awt/MouseInfo/GetPointerInfoTest.java diff --git a/jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java b/test/jdk/java/awt/MouseInfo/JContainerMousePositionTest.java similarity index 100% rename from jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java rename to test/jdk/java/awt/MouseInfo/JContainerMousePositionTest.java diff --git a/jdk/test/java/awt/MouseInfo/MultiscreenPointerInfo.java b/test/jdk/java/awt/MouseInfo/MultiscreenPointerInfo.java similarity index 100% rename from jdk/test/java/awt/MouseInfo/MultiscreenPointerInfo.java rename to test/jdk/java/awt/MouseInfo/MultiscreenPointerInfo.java diff --git a/jdk/test/java/awt/MouseInfo/PointerInfoCrashTest.java b/test/jdk/java/awt/MouseInfo/PointerInfoCrashTest.java similarity index 100% rename from jdk/test/java/awt/MouseInfo/PointerInfoCrashTest.java rename to test/jdk/java/awt/MouseInfo/PointerInfoCrashTest.java diff --git a/jdk/test/java/awt/MultipleGradientPaint/MultiGradientTest.java b/test/jdk/java/awt/MultipleGradientPaint/MultiGradientTest.java similarity index 100% rename from jdk/test/java/awt/MultipleGradientPaint/MultiGradientTest.java rename to test/jdk/java/awt/MultipleGradientPaint/MultiGradientTest.java diff --git a/jdk/test/java/awt/Multiscreen/DeviceIdentificationTest/DeviceIdentificationTest.java b/test/jdk/java/awt/Multiscreen/DeviceIdentificationTest/DeviceIdentificationTest.java similarity index 100% rename from jdk/test/java/awt/Multiscreen/DeviceIdentificationTest/DeviceIdentificationTest.java rename to test/jdk/java/awt/Multiscreen/DeviceIdentificationTest/DeviceIdentificationTest.java diff --git a/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java b/test/jdk/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java similarity index 100% rename from jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java rename to test/jdk/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java diff --git a/jdk/test/java/awt/Multiscreen/MouseEventTest/MouseEventTest.java b/test/jdk/java/awt/Multiscreen/MouseEventTest/MouseEventTest.java similarity index 100% rename from jdk/test/java/awt/Multiscreen/MouseEventTest/MouseEventTest.java rename to test/jdk/java/awt/Multiscreen/MouseEventTest/MouseEventTest.java diff --git a/jdk/test/java/awt/Multiscreen/MultiScreenInsetsTest/MultiScreenInsetsTest.java b/test/jdk/java/awt/Multiscreen/MultiScreenInsetsTest/MultiScreenInsetsTest.java similarity index 100% rename from jdk/test/java/awt/Multiscreen/MultiScreenInsetsTest/MultiScreenInsetsTest.java rename to test/jdk/java/awt/Multiscreen/MultiScreenInsetsTest/MultiScreenInsetsTest.java diff --git a/jdk/test/java/awt/Multiscreen/MultiScreenLocationTest/MultiScreenLocationTest.java b/test/jdk/java/awt/Multiscreen/MultiScreenLocationTest/MultiScreenLocationTest.java similarity index 100% rename from jdk/test/java/awt/Multiscreen/MultiScreenLocationTest/MultiScreenLocationTest.java rename to test/jdk/java/awt/Multiscreen/MultiScreenLocationTest/MultiScreenLocationTest.java diff --git a/jdk/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java b/test/jdk/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java similarity index 100% rename from jdk/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java rename to test/jdk/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java diff --git a/jdk/test/java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java b/test/jdk/java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java similarity index 100% rename from jdk/test/java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java rename to test/jdk/java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java diff --git a/jdk/test/java/awt/Multiscreen/WPanelPeerPerf/WPanelPeerPerf.java b/test/jdk/java/awt/Multiscreen/WPanelPeerPerf/WPanelPeerPerf.java similarity index 100% rename from jdk/test/java/awt/Multiscreen/WPanelPeerPerf/WPanelPeerPerf.java rename to test/jdk/java/awt/Multiscreen/WPanelPeerPerf/WPanelPeerPerf.java diff --git a/jdk/test/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html b/test/jdk/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html similarity index 100% rename from jdk/test/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html rename to test/jdk/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html diff --git a/jdk/test/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.java b/test/jdk/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.java similarity index 100% rename from jdk/test/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.java rename to test/jdk/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.java diff --git a/jdk/test/java/awt/Paint/ButtonRepaint.java b/test/jdk/java/awt/Paint/ButtonRepaint.java similarity index 100% rename from jdk/test/java/awt/Paint/ButtonRepaint.java rename to test/jdk/java/awt/Paint/ButtonRepaint.java diff --git a/jdk/test/java/awt/Paint/CheckboxRepaint.java b/test/jdk/java/awt/Paint/CheckboxRepaint.java similarity index 100% rename from jdk/test/java/awt/Paint/CheckboxRepaint.java rename to test/jdk/java/awt/Paint/CheckboxRepaint.java diff --git a/jdk/test/java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java b/test/jdk/java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java similarity index 100% rename from jdk/test/java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java rename to test/jdk/java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java diff --git a/jdk/test/java/awt/Paint/ExposeOnEDT.java b/test/jdk/java/awt/Paint/ExposeOnEDT.java similarity index 100% rename from jdk/test/java/awt/Paint/ExposeOnEDT.java rename to test/jdk/java/awt/Paint/ExposeOnEDT.java diff --git a/jdk/test/java/awt/Paint/LabelRepaint.java b/test/jdk/java/awt/Paint/LabelRepaint.java similarity index 100% rename from jdk/test/java/awt/Paint/LabelRepaint.java rename to test/jdk/java/awt/Paint/LabelRepaint.java diff --git a/jdk/test/java/awt/Paint/ListRepaint.java b/test/jdk/java/awt/Paint/ListRepaint.java similarity index 100% rename from jdk/test/java/awt/Paint/ListRepaint.java rename to test/jdk/java/awt/Paint/ListRepaint.java diff --git a/jdk/test/java/awt/Paint/PaintNativeOnUpdate.java b/test/jdk/java/awt/Paint/PaintNativeOnUpdate.java similarity index 100% rename from jdk/test/java/awt/Paint/PaintNativeOnUpdate.java rename to test/jdk/java/awt/Paint/PaintNativeOnUpdate.java diff --git a/jdk/test/java/awt/Paint/PgramUserBoundsTest.java b/test/jdk/java/awt/Paint/PgramUserBoundsTest.java similarity index 100% rename from jdk/test/java/awt/Paint/PgramUserBoundsTest.java rename to test/jdk/java/awt/Paint/PgramUserBoundsTest.java diff --git a/jdk/test/java/awt/Paint/bug8024864.java b/test/jdk/java/awt/Paint/bug8024864.java similarity index 100% rename from jdk/test/java/awt/Paint/bug8024864.java rename to test/jdk/java/awt/Paint/bug8024864.java diff --git a/jdk/test/java/awt/PopupMenu/PopupMenuLocation.java b/test/jdk/java/awt/PopupMenu/PopupMenuLocation.java similarity index 100% rename from jdk/test/java/awt/PopupMenu/PopupMenuLocation.java rename to test/jdk/java/awt/PopupMenu/PopupMenuLocation.java diff --git a/jdk/test/java/awt/PrintJob/ConstrainedPrintingTest/ConstrainedPrintingTest.java b/test/jdk/java/awt/PrintJob/ConstrainedPrintingTest/ConstrainedPrintingTest.java similarity index 100% rename from jdk/test/java/awt/PrintJob/ConstrainedPrintingTest/ConstrainedPrintingTest.java rename to test/jdk/java/awt/PrintJob/ConstrainedPrintingTest/ConstrainedPrintingTest.java diff --git a/jdk/test/java/awt/PrintJob/EdgeTest/EdgeTest.java b/test/jdk/java/awt/PrintJob/EdgeTest/EdgeTest.java similarity index 100% rename from jdk/test/java/awt/PrintJob/EdgeTest/EdgeTest.java rename to test/jdk/java/awt/PrintJob/EdgeTest/EdgeTest.java diff --git a/jdk/test/java/awt/PrintJob/HighResTest.java b/test/jdk/java/awt/PrintJob/HighResTest.java similarity index 100% rename from jdk/test/java/awt/PrintJob/HighResTest.java rename to test/jdk/java/awt/PrintJob/HighResTest.java diff --git a/jdk/test/java/awt/PrintJob/JobAttrUpdateTest.java b/test/jdk/java/awt/PrintJob/JobAttrUpdateTest.java similarity index 100% rename from jdk/test/java/awt/PrintJob/JobAttrUpdateTest.java rename to test/jdk/java/awt/PrintJob/JobAttrUpdateTest.java diff --git a/jdk/test/java/awt/PrintJob/MultipleEnd/MultipleEnd.java b/test/jdk/java/awt/PrintJob/MultipleEnd/MultipleEnd.java similarity index 100% rename from jdk/test/java/awt/PrintJob/MultipleEnd/MultipleEnd.java rename to test/jdk/java/awt/PrintJob/MultipleEnd/MultipleEnd.java diff --git a/jdk/test/java/awt/PrintJob/NullFrameTest.java b/test/jdk/java/awt/PrintJob/NullFrameTest.java similarity index 100% rename from jdk/test/java/awt/PrintJob/NullFrameTest.java rename to test/jdk/java/awt/PrintJob/NullFrameTest.java diff --git a/jdk/test/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java b/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java similarity index 100% rename from jdk/test/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java rename to test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java diff --git a/jdk/test/java/awt/PrintJob/PrintArcTest/PrintArcTest.java b/test/jdk/java/awt/PrintJob/PrintArcTest/PrintArcTest.java similarity index 100% rename from jdk/test/java/awt/PrintJob/PrintArcTest/PrintArcTest.java rename to test/jdk/java/awt/PrintJob/PrintArcTest/PrintArcTest.java diff --git a/jdk/test/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java b/test/jdk/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java similarity index 100% rename from jdk/test/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java rename to test/jdk/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java diff --git a/jdk/test/java/awt/PrintJob/PrinterException.java b/test/jdk/java/awt/PrintJob/PrinterException.java similarity index 100% rename from jdk/test/java/awt/PrintJob/PrinterException.java rename to test/jdk/java/awt/PrintJob/PrinterException.java diff --git a/jdk/test/java/awt/PrintJob/QuoteAndBackslashTest/QuoteAndBackslashTest.java b/test/jdk/java/awt/PrintJob/QuoteAndBackslashTest/QuoteAndBackslashTest.java similarity index 100% rename from jdk/test/java/awt/PrintJob/QuoteAndBackslashTest/QuoteAndBackslashTest.java rename to test/jdk/java/awt/PrintJob/QuoteAndBackslashTest/QuoteAndBackslashTest.java diff --git a/jdk/test/java/awt/PrintJob/RoundedRectTest/RoundedRectTest.java b/test/jdk/java/awt/PrintJob/RoundedRectTest/RoundedRectTest.java similarity index 100% rename from jdk/test/java/awt/PrintJob/RoundedRectTest/RoundedRectTest.java rename to test/jdk/java/awt/PrintJob/RoundedRectTest/RoundedRectTest.java diff --git a/jdk/test/java/awt/PrintJob/SaveDialogTitleTest.java b/test/jdk/java/awt/PrintJob/SaveDialogTitleTest.java similarity index 100% rename from jdk/test/java/awt/PrintJob/SaveDialogTitleTest.java rename to test/jdk/java/awt/PrintJob/SaveDialogTitleTest.java diff --git a/jdk/test/java/awt/PrintJob/Security/SecurityDialogTest.java b/test/jdk/java/awt/PrintJob/Security/SecurityDialogTest.java similarity index 100% rename from jdk/test/java/awt/PrintJob/Security/SecurityDialogTest.java rename to test/jdk/java/awt/PrintJob/Security/SecurityDialogTest.java diff --git a/jdk/test/java/awt/PrintJob/Security/policy b/test/jdk/java/awt/PrintJob/Security/policy similarity index 100% rename from jdk/test/java/awt/PrintJob/Security/policy rename to test/jdk/java/awt/PrintJob/Security/policy diff --git a/jdk/test/java/awt/PrintJob/TestPrintJobFrameAssociation.java b/test/jdk/java/awt/PrintJob/TestPrintJobFrameAssociation.java similarity index 100% rename from jdk/test/java/awt/PrintJob/TestPrintJobFrameAssociation.java rename to test/jdk/java/awt/PrintJob/TestPrintJobFrameAssociation.java diff --git a/jdk/test/java/awt/PrintJob/Text/StringWidth.java b/test/jdk/java/awt/PrintJob/Text/StringWidth.java similarity index 100% rename from jdk/test/java/awt/PrintJob/Text/StringWidth.java rename to test/jdk/java/awt/PrintJob/Text/StringWidth.java diff --git a/jdk/test/java/awt/PrintJob/Text/stringwidth.sh b/test/jdk/java/awt/PrintJob/Text/stringwidth.sh similarity index 100% rename from jdk/test/java/awt/PrintJob/Text/stringwidth.sh rename to test/jdk/java/awt/PrintJob/Text/stringwidth.sh diff --git a/jdk/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java b/test/jdk/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java similarity index 100% rename from jdk/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java rename to test/jdk/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java diff --git a/jdk/test/java/awt/Robot/CtorTest/CtorTest.java b/test/jdk/java/awt/Robot/CtorTest/CtorTest.java similarity index 100% rename from jdk/test/java/awt/Robot/CtorTest/CtorTest.java rename to test/jdk/java/awt/Robot/CtorTest/CtorTest.java diff --git a/jdk/test/java/awt/Robot/HiDPIMouseClick/HiDPIRobotMouseClick.java b/test/jdk/java/awt/Robot/HiDPIMouseClick/HiDPIRobotMouseClick.java similarity index 100% rename from jdk/test/java/awt/Robot/HiDPIMouseClick/HiDPIRobotMouseClick.java rename to test/jdk/java/awt/Robot/HiDPIMouseClick/HiDPIRobotMouseClick.java diff --git a/jdk/test/java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java b/test/jdk/java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java similarity index 100% rename from jdk/test/java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java rename to test/jdk/java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java diff --git a/jdk/test/java/awt/Robot/HiDPIScreenCapture/RobotMultiDPIScreenTest.java b/test/jdk/java/awt/Robot/HiDPIScreenCapture/RobotMultiDPIScreenTest.java similarity index 100% rename from jdk/test/java/awt/Robot/HiDPIScreenCapture/RobotMultiDPIScreenTest.java rename to test/jdk/java/awt/Robot/HiDPIScreenCapture/RobotMultiDPIScreenTest.java diff --git a/jdk/test/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureResolutionTest.java b/test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureResolutionTest.java similarity index 100% rename from jdk/test/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureResolutionTest.java rename to test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureResolutionTest.java diff --git a/jdk/test/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java b/test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java similarity index 100% rename from jdk/test/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java rename to test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java diff --git a/jdk/test/java/awt/Robot/ManualInstructions/ManualInstructions.java b/test/jdk/java/awt/Robot/ManualInstructions/ManualInstructions.java similarity index 100% rename from jdk/test/java/awt/Robot/ManualInstructions/ManualInstructions.java rename to test/jdk/java/awt/Robot/ManualInstructions/ManualInstructions.java diff --git a/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java b/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java similarity index 100% rename from jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java rename to test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java diff --git a/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java b/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java similarity index 100% rename from jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java rename to test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java diff --git a/jdk/test/java/awt/Robot/MultiScreenRobotPosition/MultiScreenRobotPosition.java b/test/jdk/java/awt/Robot/MultiScreenRobotPosition/MultiScreenRobotPosition.java similarity index 100% rename from jdk/test/java/awt/Robot/MultiScreenRobotPosition/MultiScreenRobotPosition.java rename to test/jdk/java/awt/Robot/MultiScreenRobotPosition/MultiScreenRobotPosition.java diff --git a/jdk/test/java/awt/Robot/RobotExtraButton/RobotExtraButton.java b/test/jdk/java/awt/Robot/RobotExtraButton/RobotExtraButton.java similarity index 100% rename from jdk/test/java/awt/Robot/RobotExtraButton/RobotExtraButton.java rename to test/jdk/java/awt/Robot/RobotExtraButton/RobotExtraButton.java diff --git a/jdk/test/java/awt/Robot/RobotWheelTest/RobotWheelTest.java b/test/jdk/java/awt/Robot/RobotWheelTest/RobotWheelTest.java similarity index 100% rename from jdk/test/java/awt/Robot/RobotWheelTest/RobotWheelTest.java rename to test/jdk/java/awt/Robot/RobotWheelTest/RobotWheelTest.java diff --git a/jdk/test/java/awt/Robot/SpuriousMouseEvents/SpuriousMouseEvents.java b/test/jdk/java/awt/Robot/SpuriousMouseEvents/SpuriousMouseEvents.java similarity index 100% rename from jdk/test/java/awt/Robot/SpuriousMouseEvents/SpuriousMouseEvents.java rename to test/jdk/java/awt/Robot/SpuriousMouseEvents/SpuriousMouseEvents.java diff --git a/jdk/test/java/awt/Robot/WaitForIdleSyncroizedOnString/WaitForIdleSyncroizedOnString.java b/test/jdk/java/awt/Robot/WaitForIdleSyncroizedOnString/WaitForIdleSyncroizedOnString.java similarity index 100% rename from jdk/test/java/awt/Robot/WaitForIdleSyncroizedOnString/WaitForIdleSyncroizedOnString.java rename to test/jdk/java/awt/Robot/WaitForIdleSyncroizedOnString/WaitForIdleSyncroizedOnString.java diff --git a/jdk/test/java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java b/test/jdk/java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java similarity index 100% rename from jdk/test/java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java rename to test/jdk/java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java diff --git a/jdk/test/java/awt/ScrollPane/bug8077409Test.java b/test/jdk/java/awt/ScrollPane/bug8077409Test.java similarity index 100% rename from jdk/test/java/awt/ScrollPane/bug8077409Test.java rename to test/jdk/java/awt/ScrollPane/bug8077409Test.java diff --git a/jdk/test/java/awt/Scrollbar/ScrollbarMouseWheelTest/ScrollbarMouseWheelTest.java b/test/jdk/java/awt/Scrollbar/ScrollbarMouseWheelTest/ScrollbarMouseWheelTest.java similarity index 100% rename from jdk/test/java/awt/Scrollbar/ScrollbarMouseWheelTest/ScrollbarMouseWheelTest.java rename to test/jdk/java/awt/Scrollbar/ScrollbarMouseWheelTest/ScrollbarMouseWheelTest.java diff --git a/jdk/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java b/test/jdk/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java similarity index 100% rename from jdk/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java rename to test/jdk/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java diff --git a/jdk/test/java/awt/SplashScreen/GenerateTestImage.java b/test/jdk/java/awt/SplashScreen/GenerateTestImage.java similarity index 100% rename from jdk/test/java/awt/SplashScreen/GenerateTestImage.java rename to test/jdk/java/awt/SplashScreen/GenerateTestImage.java diff --git a/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java b/test/jdk/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java similarity index 100% rename from jdk/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java rename to test/jdk/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java diff --git a/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java b/test/jdk/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java similarity index 100% rename from jdk/test/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java rename to test/jdk/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java diff --git a/jdk/test/java/awt/TEST.properties b/test/jdk/java/awt/TEST.properties similarity index 100% rename from jdk/test/java/awt/TEST.properties rename to test/jdk/java/awt/TEST.properties diff --git a/jdk/test/java/awt/TextArea/AutoScrollOnSelectAndAppend/AutoScrollOnSelectAndAppend.java b/test/jdk/java/awt/TextArea/AutoScrollOnSelectAndAppend/AutoScrollOnSelectAndAppend.java similarity index 100% rename from jdk/test/java/awt/TextArea/AutoScrollOnSelectAndAppend/AutoScrollOnSelectAndAppend.java rename to test/jdk/java/awt/TextArea/AutoScrollOnSelectAndAppend/AutoScrollOnSelectAndAppend.java diff --git a/jdk/test/java/awt/TextArea/DisposeTest/TestDispose.java b/test/jdk/java/awt/TextArea/DisposeTest/TestDispose.java similarity index 100% rename from jdk/test/java/awt/TextArea/DisposeTest/TestDispose.java rename to test/jdk/java/awt/TextArea/DisposeTest/TestDispose.java diff --git a/jdk/test/java/awt/TextArea/Mixing/TextAreaMixing.java b/test/jdk/java/awt/TextArea/Mixing/TextAreaMixing.java similarity index 100% rename from jdk/test/java/awt/TextArea/Mixing/TextAreaMixing.java rename to test/jdk/java/awt/TextArea/Mixing/TextAreaMixing.java diff --git a/jdk/test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test.java b/test/jdk/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test.java similarity index 100% rename from jdk/test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test.java rename to test/jdk/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test.java diff --git a/jdk/test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test1.java b/test/jdk/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test1.java similarity index 100% rename from jdk/test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test1.java rename to test/jdk/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test1.java diff --git a/jdk/test/java/awt/TextArea/OverScrollTest/OverScrollTest.java b/test/jdk/java/awt/TextArea/OverScrollTest/OverScrollTest.java similarity index 100% rename from jdk/test/java/awt/TextArea/OverScrollTest/OverScrollTest.java rename to test/jdk/java/awt/TextArea/OverScrollTest/OverScrollTest.java diff --git a/jdk/test/java/awt/TextArea/ScrollbarIntersectionTest/ScrollbarIntersectionTest.java b/test/jdk/java/awt/TextArea/ScrollbarIntersectionTest/ScrollbarIntersectionTest.java similarity index 100% rename from jdk/test/java/awt/TextArea/ScrollbarIntersectionTest/ScrollbarIntersectionTest.java rename to test/jdk/java/awt/TextArea/ScrollbarIntersectionTest/ScrollbarIntersectionTest.java diff --git a/jdk/test/java/awt/TextArea/SelectionVisible/SelectionVisible.html b/test/jdk/java/awt/TextArea/SelectionVisible/SelectionVisible.html similarity index 100% rename from jdk/test/java/awt/TextArea/SelectionVisible/SelectionVisible.html rename to test/jdk/java/awt/TextArea/SelectionVisible/SelectionVisible.html diff --git a/jdk/test/java/awt/TextArea/SelectionVisible/SelectionVisible.java b/test/jdk/java/awt/TextArea/SelectionVisible/SelectionVisible.java similarity index 100% rename from jdk/test/java/awt/TextArea/SelectionVisible/SelectionVisible.java rename to test/jdk/java/awt/TextArea/SelectionVisible/SelectionVisible.java diff --git a/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java b/test/jdk/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java similarity index 100% rename from jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java rename to test/jdk/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java diff --git a/jdk/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html b/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html similarity index 100% rename from jdk/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html rename to test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html diff --git a/jdk/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java b/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java similarity index 100% rename from jdk/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java rename to test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java diff --git a/jdk/test/java/awt/TextArea/TextAreaEditing/TextAreaEditing.java b/test/jdk/java/awt/TextArea/TextAreaEditing/TextAreaEditing.java similarity index 100% rename from jdk/test/java/awt/TextArea/TextAreaEditing/TextAreaEditing.java rename to test/jdk/java/awt/TextArea/TextAreaEditing/TextAreaEditing.java diff --git a/jdk/test/java/awt/TextArea/TextAreaScrolling/TextAreaScrolling.java b/test/jdk/java/awt/TextArea/TextAreaScrolling/TextAreaScrolling.java similarity index 100% rename from jdk/test/java/awt/TextArea/TextAreaScrolling/TextAreaScrolling.java rename to test/jdk/java/awt/TextArea/TextAreaScrolling/TextAreaScrolling.java diff --git a/jdk/test/java/awt/TextArea/TextAreaTwicePack/TextAreaTwicePack.java b/test/jdk/java/awt/TextArea/TextAreaTwicePack/TextAreaTwicePack.java similarity index 100% rename from jdk/test/java/awt/TextArea/TextAreaTwicePack/TextAreaTwicePack.java rename to test/jdk/java/awt/TextArea/TextAreaTwicePack/TextAreaTwicePack.java diff --git a/jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java b/test/jdk/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java similarity index 100% rename from jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java rename to test/jdk/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java diff --git a/jdk/test/java/awt/TextField/DisabledUndoTest/DisabledUndoTest.java b/test/jdk/java/awt/TextField/DisabledUndoTest/DisabledUndoTest.java similarity index 100% rename from jdk/test/java/awt/TextField/DisabledUndoTest/DisabledUndoTest.java rename to test/jdk/java/awt/TextField/DisabledUndoTest/DisabledUndoTest.java diff --git a/jdk/test/java/awt/TextField/DisposeTest/TestDispose.java b/test/jdk/java/awt/TextField/DisposeTest/TestDispose.java similarity index 100% rename from jdk/test/java/awt/TextField/DisposeTest/TestDispose.java rename to test/jdk/java/awt/TextField/DisposeTest/TestDispose.java diff --git a/jdk/test/java/awt/TextField/EOLTest/EOLTest.java b/test/jdk/java/awt/TextField/EOLTest/EOLTest.java similarity index 100% rename from jdk/test/java/awt/TextField/EOLTest/EOLTest.java rename to test/jdk/java/awt/TextField/EOLTest/EOLTest.java diff --git a/jdk/test/java/awt/TextField/OverScrollTest/OverScrollTest.java b/test/jdk/java/awt/TextField/OverScrollTest/OverScrollTest.java similarity index 100% rename from jdk/test/java/awt/TextField/OverScrollTest/OverScrollTest.java rename to test/jdk/java/awt/TextField/OverScrollTest/OverScrollTest.java diff --git a/jdk/test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.java b/test/jdk/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.java similarity index 100% rename from jdk/test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.java rename to test/jdk/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.java diff --git a/jdk/test/java/awt/TextField/SelectionInvisibleTest/SelectionInvisibleTest.java b/test/jdk/java/awt/TextField/SelectionInvisibleTest/SelectionInvisibleTest.java similarity index 100% rename from jdk/test/java/awt/TextField/SelectionInvisibleTest/SelectionInvisibleTest.java rename to test/jdk/java/awt/TextField/SelectionInvisibleTest/SelectionInvisibleTest.java diff --git a/jdk/test/java/awt/TextField/SelectionVisible/SelectionVisible.html b/test/jdk/java/awt/TextField/SelectionVisible/SelectionVisible.html similarity index 100% rename from jdk/test/java/awt/TextField/SelectionVisible/SelectionVisible.html rename to test/jdk/java/awt/TextField/SelectionVisible/SelectionVisible.html diff --git a/jdk/test/java/awt/TextField/SelectionVisible/SelectionVisible.java b/test/jdk/java/awt/TextField/SelectionVisible/SelectionVisible.java similarity index 100% rename from jdk/test/java/awt/TextField/SelectionVisible/SelectionVisible.java rename to test/jdk/java/awt/TextField/SelectionVisible/SelectionVisible.java diff --git a/jdk/test/java/awt/TextField/TextFieldEditing/TextFieldEditing.java b/test/jdk/java/awt/TextField/TextFieldEditing/TextFieldEditing.java similarity index 100% rename from jdk/test/java/awt/TextField/TextFieldEditing/TextFieldEditing.java rename to test/jdk/java/awt/TextField/TextFieldEditing/TextFieldEditing.java diff --git a/jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.java b/test/jdk/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.java similarity index 100% rename from jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.java rename to test/jdk/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.java diff --git a/jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.sh b/test/jdk/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.sh similarity index 100% rename from jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.sh rename to test/jdk/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.sh diff --git a/jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.java b/test/jdk/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.java similarity index 100% rename from jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.java rename to test/jdk/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.java diff --git a/jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh b/test/jdk/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh similarity index 100% rename from jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh rename to test/jdk/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh diff --git a/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.java b/test/jdk/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.java similarity index 100% rename from jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.java rename to test/jdk/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.java diff --git a/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh b/test/jdk/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh similarity index 100% rename from jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh rename to test/jdk/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh diff --git a/jdk/test/java/awt/Toolkit/DesktopProperties/rfe4758438.java b/test/jdk/java/awt/Toolkit/DesktopProperties/rfe4758438.java similarity index 100% rename from jdk/test/java/awt/Toolkit/DesktopProperties/rfe4758438.java rename to test/jdk/java/awt/Toolkit/DesktopProperties/rfe4758438.java diff --git a/jdk/test/java/awt/Toolkit/DesktopProperties/rfe4758438.sh b/test/jdk/java/awt/Toolkit/DesktopProperties/rfe4758438.sh similarity index 100% rename from jdk/test/java/awt/Toolkit/DesktopProperties/rfe4758438.sh rename to test/jdk/java/awt/Toolkit/DesktopProperties/rfe4758438.sh diff --git a/jdk/test/java/awt/Toolkit/DynamicLayout/bug7172833.java b/test/jdk/java/awt/Toolkit/DynamicLayout/bug7172833.java similarity index 100% rename from jdk/test/java/awt/Toolkit/DynamicLayout/bug7172833.java rename to test/jdk/java/awt/Toolkit/DynamicLayout/bug7172833.java diff --git a/jdk/test/java/awt/Toolkit/GetImage/bug8078165.java b/test/jdk/java/awt/Toolkit/GetImage/bug8078165.java similarity index 100% rename from jdk/test/java/awt/Toolkit/GetImage/bug8078165.java rename to test/jdk/java/awt/Toolkit/GetImage/bug8078165.java diff --git a/jdk/test/java/awt/Toolkit/GetSizeTest/GetScreenSizeTest.java b/test/jdk/java/awt/Toolkit/GetSizeTest/GetScreenSizeTest.java similarity index 100% rename from jdk/test/java/awt/Toolkit/GetSizeTest/GetScreenSizeTest.java rename to test/jdk/java/awt/Toolkit/GetSizeTest/GetScreenSizeTest.java diff --git a/jdk/test/java/awt/Toolkit/Headless/AWTEventListener/AWTListener.java b/test/jdk/java/awt/Toolkit/Headless/AWTEventListener/AWTListener.java similarity index 100% rename from jdk/test/java/awt/Toolkit/Headless/AWTEventListener/AWTListener.java rename to test/jdk/java/awt/Toolkit/Headless/AWTEventListener/AWTListener.java diff --git a/jdk/test/java/awt/Toolkit/Headless/ExceptionContract/ExceptionContract.java b/test/jdk/java/awt/Toolkit/Headless/ExceptionContract/ExceptionContract.java similarity index 100% rename from jdk/test/java/awt/Toolkit/Headless/ExceptionContract/ExceptionContract.java rename to test/jdk/java/awt/Toolkit/Headless/ExceptionContract/ExceptionContract.java diff --git a/jdk/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJob.java b/test/jdk/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJob.java similarity index 100% rename from jdk/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJob.java rename to test/jdk/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJob.java diff --git a/jdk/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJobHeadless.java b/test/jdk/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJobHeadless.java similarity index 100% rename from jdk/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJobHeadless.java rename to test/jdk/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJobHeadless.java diff --git a/jdk/test/java/awt/Toolkit/Headless/HeadlessToolkit.java b/test/jdk/java/awt/Toolkit/Headless/HeadlessToolkit.java similarity index 100% rename from jdk/test/java/awt/Toolkit/Headless/HeadlessToolkit.java rename to test/jdk/java/awt/Toolkit/Headless/HeadlessToolkit.java diff --git a/jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/TestWrapped.java b/test/jdk/java/awt/Toolkit/Headless/WrappedToolkitTest/TestWrapped.java similarity index 100% rename from jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/TestWrapped.java rename to test/jdk/java/awt/Toolkit/Headless/WrappedToolkitTest/TestWrapped.java diff --git a/jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh b/test/jdk/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh similarity index 100% rename from jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh rename to test/jdk/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh diff --git a/jdk/test/java/awt/Toolkit/HeadlessTray/HeadlessTray.java b/test/jdk/java/awt/Toolkit/HeadlessTray/HeadlessTray.java similarity index 100% rename from jdk/test/java/awt/Toolkit/HeadlessTray/HeadlessTray.java rename to test/jdk/java/awt/Toolkit/HeadlessTray/HeadlessTray.java diff --git a/jdk/test/java/awt/Toolkit/IsToolkitUseTheMainScreen/IsToolkitUseTheMainScreen.java b/test/jdk/java/awt/Toolkit/IsToolkitUseTheMainScreen/IsToolkitUseTheMainScreen.java similarity index 100% rename from jdk/test/java/awt/Toolkit/IsToolkitUseTheMainScreen/IsToolkitUseTheMainScreen.java rename to test/jdk/java/awt/Toolkit/IsToolkitUseTheMainScreen/IsToolkitUseTheMainScreen.java diff --git a/jdk/test/java/awt/Toolkit/LoadAWTCrashTest/LoadAWTCrashTest.java b/test/jdk/java/awt/Toolkit/LoadAWTCrashTest/LoadAWTCrashTest.java similarity index 100% rename from jdk/test/java/awt/Toolkit/LoadAWTCrashTest/LoadAWTCrashTest.java rename to test/jdk/java/awt/Toolkit/LoadAWTCrashTest/LoadAWTCrashTest.java diff --git a/jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java b/test/jdk/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java similarity index 100% rename from jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java rename to test/jdk/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java diff --git a/jdk/test/java/awt/Toolkit/RealSync/RealSyncOnEDT.java b/test/jdk/java/awt/Toolkit/RealSync/RealSyncOnEDT.java similarity index 100% rename from jdk/test/java/awt/Toolkit/RealSync/RealSyncOnEDT.java rename to test/jdk/java/awt/Toolkit/RealSync/RealSyncOnEDT.java diff --git a/jdk/test/java/awt/Toolkit/RealSync/Test.java b/test/jdk/java/awt/Toolkit/RealSync/Test.java similarity index 100% rename from jdk/test/java/awt/Toolkit/RealSync/Test.java rename to test/jdk/java/awt/Toolkit/RealSync/Test.java diff --git a/jdk/test/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java b/test/jdk/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java similarity index 100% rename from jdk/test/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java rename to test/jdk/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java diff --git a/jdk/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java b/test/jdk/java/awt/Toolkit/SecurityTest/SecurityTest2.java similarity index 100% rename from jdk/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java rename to test/jdk/java/awt/Toolkit/SecurityTest/SecurityTest2.java diff --git a/jdk/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_1.java b/test/jdk/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_1.java similarity index 100% rename from jdk/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_1.java rename to test/jdk/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_1.java diff --git a/jdk/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_2.java b/test/jdk/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_2.java similarity index 100% rename from jdk/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_2.java rename to test/jdk/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_2.java diff --git a/jdk/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_3.java b/test/jdk/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_3.java similarity index 100% rename from jdk/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_3.java rename to test/jdk/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_3.java diff --git a/jdk/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_4.java b/test/jdk/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_4.java similarity index 100% rename from jdk/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_4.java rename to test/jdk/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_4.java diff --git a/jdk/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_5.java b/test/jdk/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_5.java similarity index 100% rename from jdk/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_5.java rename to test/jdk/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_5.java diff --git a/jdk/test/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Disable.java b/test/jdk/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Disable.java similarity index 100% rename from jdk/test/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Disable.java rename to test/jdk/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Disable.java diff --git a/jdk/test/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java b/test/jdk/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java similarity index 100% rename from jdk/test/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java rename to test/jdk/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java diff --git a/jdk/test/java/awt/Toolkit/ToolkitPropertyTest/bug7129133.java b/test/jdk/java/awt/Toolkit/ToolkitPropertyTest/bug7129133.java similarity index 100% rename from jdk/test/java/awt/Toolkit/ToolkitPropertyTest/bug7129133.java rename to test/jdk/java/awt/Toolkit/ToolkitPropertyTest/bug7129133.java diff --git a/jdk/test/java/awt/TrayIcon/8072769/bug8072769.java b/test/jdk/java/awt/TrayIcon/8072769/bug8072769.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/8072769/bug8072769.java rename to test/jdk/java/awt/TrayIcon/8072769/bug8072769.java diff --git a/jdk/test/java/awt/TrayIcon/ActionCommand/ActionCommand.java b/test/jdk/java/awt/TrayIcon/ActionCommand/ActionCommand.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/ActionCommand/ActionCommand.java rename to test/jdk/java/awt/TrayIcon/ActionCommand/ActionCommand.java diff --git a/jdk/test/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java b/test/jdk/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java rename to test/jdk/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java diff --git a/jdk/test/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java b/test/jdk/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java rename to test/jdk/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java diff --git a/jdk/test/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.html b/test/jdk/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.html similarity index 100% rename from jdk/test/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.html rename to test/jdk/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.html diff --git a/jdk/test/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.java b/test/jdk/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.java rename to test/jdk/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.java diff --git a/jdk/test/java/awt/TrayIcon/CtorTest/CtorTest.java b/test/jdk/java/awt/TrayIcon/CtorTest/CtorTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/CtorTest/CtorTest.java rename to test/jdk/java/awt/TrayIcon/CtorTest/CtorTest.java diff --git a/jdk/test/java/awt/TrayIcon/DblClickActionEventTest/DblClickActionEventTest.html b/test/jdk/java/awt/TrayIcon/DblClickActionEventTest/DblClickActionEventTest.html similarity index 100% rename from jdk/test/java/awt/TrayIcon/DblClickActionEventTest/DblClickActionEventTest.html rename to test/jdk/java/awt/TrayIcon/DblClickActionEventTest/DblClickActionEventTest.html diff --git a/jdk/test/java/awt/TrayIcon/DblClickActionEventTest/DblClickActionEventTest.java b/test/jdk/java/awt/TrayIcon/DblClickActionEventTest/DblClickActionEventTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/DblClickActionEventTest/DblClickActionEventTest.java rename to test/jdk/java/awt/TrayIcon/DblClickActionEventTest/DblClickActionEventTest.java diff --git a/jdk/test/java/awt/TrayIcon/DisposeInActionEventTest/DisposeInActionEventTest.html b/test/jdk/java/awt/TrayIcon/DisposeInActionEventTest/DisposeInActionEventTest.html similarity index 100% rename from jdk/test/java/awt/TrayIcon/DisposeInActionEventTest/DisposeInActionEventTest.html rename to test/jdk/java/awt/TrayIcon/DisposeInActionEventTest/DisposeInActionEventTest.html diff --git a/jdk/test/java/awt/TrayIcon/DisposeInActionEventTest/DisposeInActionEventTest.java b/test/jdk/java/awt/TrayIcon/DisposeInActionEventTest/DisposeInActionEventTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/DisposeInActionEventTest/DisposeInActionEventTest.java rename to test/jdk/java/awt/TrayIcon/DisposeInActionEventTest/DisposeInActionEventTest.java diff --git a/jdk/test/java/awt/TrayIcon/DragEventSource/DragEventSource.java b/test/jdk/java/awt/TrayIcon/DragEventSource/DragEventSource.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/DragEventSource/DragEventSource.java rename to test/jdk/java/awt/TrayIcon/DragEventSource/DragEventSource.java diff --git a/jdk/test/java/awt/TrayIcon/GetTrayIconsTest/GetTrayIcons.java b/test/jdk/java/awt/TrayIcon/GetTrayIconsTest/GetTrayIcons.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/GetTrayIconsTest/GetTrayIcons.java rename to test/jdk/java/awt/TrayIcon/GetTrayIconsTest/GetTrayIcons.java diff --git a/jdk/test/java/awt/TrayIcon/InterJVMTest/InterJVM.java b/test/jdk/java/awt/TrayIcon/InterJVMTest/InterJVM.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/InterJVMTest/InterJVM.java rename to test/jdk/java/awt/TrayIcon/InterJVMTest/InterJVM.java diff --git a/jdk/test/java/awt/TrayIcon/ModalityTest/ModalityTest.java b/test/jdk/java/awt/TrayIcon/ModalityTest/ModalityTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/ModalityTest/ModalityTest.java rename to test/jdk/java/awt/TrayIcon/ModalityTest/ModalityTest.java diff --git a/jdk/test/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java b/test/jdk/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java rename to test/jdk/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java diff --git a/jdk/test/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java b/test/jdk/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java rename to test/jdk/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java diff --git a/jdk/test/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java b/test/jdk/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java rename to test/jdk/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java diff --git a/jdk/test/java/awt/TrayIcon/PropertyChangeListenerTest.java b/test/jdk/java/awt/TrayIcon/PropertyChangeListenerTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/PropertyChangeListenerTest.java rename to test/jdk/java/awt/TrayIcon/PropertyChangeListenerTest.java diff --git a/jdk/test/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java b/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java rename to test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java diff --git a/jdk/test/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/tray.policy b/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/tray.policy similarity index 100% rename from jdk/test/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/tray.policy rename to test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/tray.policy diff --git a/jdk/test/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/NoPermissionTest.java b/test/jdk/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/NoPermissionTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/NoPermissionTest.java rename to test/jdk/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/NoPermissionTest.java diff --git a/jdk/test/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/tray.policy b/test/jdk/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/tray.policy similarity index 100% rename from jdk/test/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/tray.policy rename to test/jdk/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/tray.policy diff --git a/jdk/test/java/awt/TrayIcon/SecurityCheck/PermissionTest/PermissionTest.java b/test/jdk/java/awt/TrayIcon/SecurityCheck/PermissionTest/PermissionTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/SecurityCheck/PermissionTest/PermissionTest.java rename to test/jdk/java/awt/TrayIcon/SecurityCheck/PermissionTest/PermissionTest.java diff --git a/jdk/test/java/awt/TrayIcon/SecurityCheck/PermissionTest/tray.policy b/test/jdk/java/awt/TrayIcon/SecurityCheck/PermissionTest/tray.policy similarity index 100% rename from jdk/test/java/awt/TrayIcon/SecurityCheck/PermissionTest/tray.policy rename to test/jdk/java/awt/TrayIcon/SecurityCheck/PermissionTest/tray.policy diff --git a/jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.html b/test/jdk/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.html similarity index 100% rename from jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.html rename to test/jdk/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.html diff --git a/jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.java b/test/jdk/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.java rename to test/jdk/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.java diff --git a/jdk/test/java/awt/TrayIcon/SystemTrayIconHelper.java b/test/jdk/java/awt/TrayIcon/SystemTrayIconHelper.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/SystemTrayIconHelper.java rename to test/jdk/java/awt/TrayIcon/SystemTrayIconHelper.java diff --git a/jdk/test/java/awt/TrayIcon/SystemTrayInstance/SystemTrayInstanceTest.java b/test/jdk/java/awt/TrayIcon/SystemTrayInstance/SystemTrayInstanceTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/SystemTrayInstance/SystemTrayInstanceTest.java rename to test/jdk/java/awt/TrayIcon/SystemTrayInstance/SystemTrayInstanceTest.java diff --git a/jdk/test/java/awt/TrayIcon/TrayIconAddTest/TrayIconAddTest.java b/test/jdk/java/awt/TrayIcon/TrayIconAddTest/TrayIconAddTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/TrayIconAddTest/TrayIconAddTest.java rename to test/jdk/java/awt/TrayIcon/TrayIconAddTest/TrayIconAddTest.java diff --git a/jdk/test/java/awt/TrayIcon/TrayIconEventModifiers/TrayIconEventModifiersTest.java b/test/jdk/java/awt/TrayIcon/TrayIconEventModifiers/TrayIconEventModifiersTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/TrayIconEventModifiers/TrayIconEventModifiersTest.java rename to test/jdk/java/awt/TrayIcon/TrayIconEventModifiers/TrayIconEventModifiersTest.java diff --git a/jdk/test/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java b/test/jdk/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java rename to test/jdk/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java diff --git a/jdk/test/java/awt/TrayIcon/TrayIconMethodsTest/TrayIconMethodsTest.java b/test/jdk/java/awt/TrayIcon/TrayIconMethodsTest/TrayIconMethodsTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/TrayIconMethodsTest/TrayIconMethodsTest.java rename to test/jdk/java/awt/TrayIcon/TrayIconMethodsTest/TrayIconMethodsTest.java diff --git a/jdk/test/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java b/test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java rename to test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java diff --git a/jdk/test/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java b/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java rename to test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java diff --git a/jdk/test/java/awt/TrayIcon/TrayIconRemoveTest/TrayIconRemoveTest.java b/test/jdk/java/awt/TrayIcon/TrayIconRemoveTest/TrayIconRemoveTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/TrayIconRemoveTest/TrayIconRemoveTest.java rename to test/jdk/java/awt/TrayIcon/TrayIconRemoveTest/TrayIconRemoveTest.java diff --git a/jdk/test/java/awt/TrayIcon/TrayIconSizeTest/TrayIconSizeTest.java b/test/jdk/java/awt/TrayIcon/TrayIconSizeTest/TrayIconSizeTest.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/TrayIconSizeTest/TrayIconSizeTest.java rename to test/jdk/java/awt/TrayIcon/TrayIconSizeTest/TrayIconSizeTest.java diff --git a/jdk/test/java/awt/TrayIcon/UpdatePopupMenu/UpdatePopupMenu.java b/test/jdk/java/awt/TrayIcon/UpdatePopupMenu/UpdatePopupMenu.java similarity index 100% rename from jdk/test/java/awt/TrayIcon/UpdatePopupMenu/UpdatePopupMenu.java rename to test/jdk/java/awt/TrayIcon/UpdatePopupMenu/UpdatePopupMenu.java diff --git a/jdk/test/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java b/test/jdk/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java similarity index 100% rename from jdk/test/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java rename to test/jdk/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java diff --git a/jdk/test/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java b/test/jdk/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java similarity index 100% rename from jdk/test/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java rename to test/jdk/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java diff --git a/jdk/test/java/awt/Window/8027025/Test8027025.java b/test/jdk/java/awt/Window/8027025/Test8027025.java similarity index 100% rename from jdk/test/java/awt/Window/8027025/Test8027025.java rename to test/jdk/java/awt/Window/8027025/Test8027025.java diff --git a/jdk/test/java/awt/Window/8159168/SetShapeTest.java b/test/jdk/java/awt/Window/8159168/SetShapeTest.java similarity index 100% rename from jdk/test/java/awt/Window/8159168/SetShapeTest.java rename to test/jdk/java/awt/Window/8159168/SetShapeTest.java diff --git a/jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java b/test/jdk/java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java similarity index 100% rename from jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java rename to test/jdk/java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java diff --git a/jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java b/test/jdk/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java similarity index 100% rename from jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java rename to test/jdk/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java diff --git a/jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java b/test/jdk/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java similarity index 100% rename from jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java rename to test/jdk/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java diff --git a/jdk/test/java/awt/Window/AlwaysOnTop/SyncAlwaysOnTopFieldTest.java b/test/jdk/java/awt/Window/AlwaysOnTop/SyncAlwaysOnTopFieldTest.java similarity index 100% rename from jdk/test/java/awt/Window/AlwaysOnTop/SyncAlwaysOnTopFieldTest.java rename to test/jdk/java/awt/Window/AlwaysOnTop/SyncAlwaysOnTopFieldTest.java diff --git a/jdk/test/java/awt/Window/AlwaysOnTop/TestAlwaysOnTopBeforeShow.java b/test/jdk/java/awt/Window/AlwaysOnTop/TestAlwaysOnTopBeforeShow.java similarity index 100% rename from jdk/test/java/awt/Window/AlwaysOnTop/TestAlwaysOnTopBeforeShow.java rename to test/jdk/java/awt/Window/AlwaysOnTop/TestAlwaysOnTopBeforeShow.java diff --git a/jdk/test/java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java b/test/jdk/java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java similarity index 100% rename from jdk/test/java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java rename to test/jdk/java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java diff --git a/jdk/test/java/awt/Window/ChangeWindowResizabilty/ChangeWindowResizabiltyTest.java b/test/jdk/java/awt/Window/ChangeWindowResizabilty/ChangeWindowResizabiltyTest.java similarity index 100% rename from jdk/test/java/awt/Window/ChangeWindowResizabilty/ChangeWindowResizabiltyTest.java rename to test/jdk/java/awt/Window/ChangeWindowResizabilty/ChangeWindowResizabiltyTest.java diff --git a/jdk/test/java/awt/Window/ChildProperties/ChildWindowProperties.java b/test/jdk/java/awt/Window/ChildProperties/ChildWindowProperties.java similarity index 100% rename from jdk/test/java/awt/Window/ChildProperties/ChildWindowProperties.java rename to test/jdk/java/awt/Window/ChildProperties/ChildWindowProperties.java diff --git a/jdk/test/java/awt/Window/FindOwner/FindOwnerTest.html b/test/jdk/java/awt/Window/FindOwner/FindOwnerTest.html similarity index 100% rename from jdk/test/java/awt/Window/FindOwner/FindOwnerTest.html rename to test/jdk/java/awt/Window/FindOwner/FindOwnerTest.html diff --git a/jdk/test/java/awt/Window/FindOwner/FindOwnerTest.java b/test/jdk/java/awt/Window/FindOwner/FindOwnerTest.java similarity index 100% rename from jdk/test/java/awt/Window/FindOwner/FindOwnerTest.java rename to test/jdk/java/awt/Window/FindOwner/FindOwnerTest.java diff --git a/jdk/test/java/awt/Window/GetScreenLocation/GetScreenLocationTest.java b/test/jdk/java/awt/Window/GetScreenLocation/GetScreenLocationTest.java similarity index 100% rename from jdk/test/java/awt/Window/GetScreenLocation/GetScreenLocationTest.java rename to test/jdk/java/awt/Window/GetScreenLocation/GetScreenLocationTest.java diff --git a/jdk/test/java/awt/Window/GetWindowsTest/GetWindowsTest.java b/test/jdk/java/awt/Window/GetWindowsTest/GetWindowsTest.java similarity index 100% rename from jdk/test/java/awt/Window/GetWindowsTest/GetWindowsTest.java rename to test/jdk/java/awt/Window/GetWindowsTest/GetWindowsTest.java diff --git a/jdk/test/java/awt/Window/Grab/GrabTest.java b/test/jdk/java/awt/Window/Grab/GrabTest.java similarity index 100% rename from jdk/test/java/awt/Window/Grab/GrabTest.java rename to test/jdk/java/awt/Window/Grab/GrabTest.java diff --git a/jdk/test/java/awt/Window/GrabSequence/GrabSequence.java b/test/jdk/java/awt/Window/GrabSequence/GrabSequence.java similarity index 100% rename from jdk/test/java/awt/Window/GrabSequence/GrabSequence.java rename to test/jdk/java/awt/Window/GrabSequence/GrabSequence.java diff --git a/jdk/test/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.html b/test/jdk/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.html similarity index 100% rename from jdk/test/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.html rename to test/jdk/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.html diff --git a/jdk/test/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.java b/test/jdk/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.java similarity index 100% rename from jdk/test/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.java rename to test/jdk/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.java diff --git a/jdk/test/java/awt/Window/LocationByPlatform/LocationByPlatformTest.java b/test/jdk/java/awt/Window/LocationByPlatform/LocationByPlatformTest.java similarity index 100% rename from jdk/test/java/awt/Window/LocationByPlatform/LocationByPlatformTest.java rename to test/jdk/java/awt/Window/LocationByPlatform/LocationByPlatformTest.java diff --git a/jdk/test/java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java b/test/jdk/java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java similarity index 100% rename from jdk/test/java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java rename to test/jdk/java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java diff --git a/jdk/test/java/awt/Window/MultiWindowApp/ChildAlwaysOnTopTest.java b/test/jdk/java/awt/Window/MultiWindowApp/ChildAlwaysOnTopTest.java similarity index 100% rename from jdk/test/java/awt/Window/MultiWindowApp/ChildAlwaysOnTopTest.java rename to test/jdk/java/awt/Window/MultiWindowApp/ChildAlwaysOnTopTest.java diff --git a/jdk/test/java/awt/Window/MultiWindowApp/MultiWindowAppTest.java b/test/jdk/java/awt/Window/MultiWindowApp/MultiWindowAppTest.java similarity index 100% rename from jdk/test/java/awt/Window/MultiWindowApp/MultiWindowAppTest.java rename to test/jdk/java/awt/Window/MultiWindowApp/MultiWindowAppTest.java diff --git a/jdk/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java b/test/jdk/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java similarity index 100% rename from jdk/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java rename to test/jdk/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java diff --git a/jdk/test/java/awt/Window/OwnedWindowsSerialization/OwnedWindowsSerialization.java b/test/jdk/java/awt/Window/OwnedWindowsSerialization/OwnedWindowsSerialization.java similarity index 100% rename from jdk/test/java/awt/Window/OwnedWindowsSerialization/OwnedWindowsSerialization.java rename to test/jdk/java/awt/Window/OwnedWindowsSerialization/OwnedWindowsSerialization.java diff --git a/jdk/test/java/awt/Window/PropertyChangeListenerLockSerialization/PropertyChangeListenerLockSerialization.java b/test/jdk/java/awt/Window/PropertyChangeListenerLockSerialization/PropertyChangeListenerLockSerialization.java similarity index 100% rename from jdk/test/java/awt/Window/PropertyChangeListenerLockSerialization/PropertyChangeListenerLockSerialization.java rename to test/jdk/java/awt/Window/PropertyChangeListenerLockSerialization/PropertyChangeListenerLockSerialization.java diff --git a/jdk/test/java/awt/Window/ScreenLocation/ScreenLocationTest.java b/test/jdk/java/awt/Window/ScreenLocation/ScreenLocationTest.java similarity index 100% rename from jdk/test/java/awt/Window/ScreenLocation/ScreenLocationTest.java rename to test/jdk/java/awt/Window/ScreenLocation/ScreenLocationTest.java diff --git a/jdk/test/java/awt/Window/SetBackgroundNPE/SetBackgroundNPE.java b/test/jdk/java/awt/Window/SetBackgroundNPE/SetBackgroundNPE.java similarity index 100% rename from jdk/test/java/awt/Window/SetBackgroundNPE/SetBackgroundNPE.java rename to test/jdk/java/awt/Window/SetBackgroundNPE/SetBackgroundNPE.java diff --git a/jdk/test/java/awt/Window/SetWindowLocationByPlatformTest/SetWindowLocationByPlatformTest.java b/test/jdk/java/awt/Window/SetWindowLocationByPlatformTest/SetWindowLocationByPlatformTest.java similarity index 100% rename from jdk/test/java/awt/Window/SetWindowLocationByPlatformTest/SetWindowLocationByPlatformTest.java rename to test/jdk/java/awt/Window/SetWindowLocationByPlatformTest/SetWindowLocationByPlatformTest.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/Common.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/Common.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/Common.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/Common.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/FocusAWTTest.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/FocusAWTTest.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/FocusAWTTest.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/FocusAWTTest.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/SetShape.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShape.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/SetShape.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShape.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/SetShapeAndClick.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShapeAndClick.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/SetShapeAndClick.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShapeAndClick.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/SetShapeDynamicallyAndClick.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShapeDynamicallyAndClick.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/SetShapeDynamicallyAndClick.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShapeDynamicallyAndClick.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/Shaped.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/Shaped.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/Shaped.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/Shaped.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/ShapedByAPI.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedByAPI.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/ShapedByAPI.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedByAPI.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucent.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucent.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucent.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucent.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/StaticallyShaped.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/StaticallyShaped.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/StaticallyShaped.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/StaticallyShaped.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/Translucent.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/Translucent.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/Translucent.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/Translucent.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/TranslucentChoice.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/TranslucentChoice.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/TranslucentChoice.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/TranslucentChoice.java diff --git a/jdk/test/java/awt/Window/ShapedAndTranslucentWindows/TranslucentWindowClick.java b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/TranslucentWindowClick.java similarity index 100% rename from jdk/test/java/awt/Window/ShapedAndTranslucentWindows/TranslucentWindowClick.java rename to test/jdk/java/awt/Window/ShapedAndTranslucentWindows/TranslucentWindowClick.java diff --git a/jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java b/test/jdk/java/awt/Window/TopLevelLocation/TopLevelLocation.java similarity index 100% rename from jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java rename to test/jdk/java/awt/Window/TopLevelLocation/TopLevelLocation.java diff --git a/jdk/test/java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java b/test/jdk/java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java similarity index 100% rename from jdk/test/java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java rename to test/jdk/java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java diff --git a/jdk/test/java/awt/Window/TranslucentShapedFrameTest/TSFrame.java b/test/jdk/java/awt/Window/TranslucentShapedFrameTest/TSFrame.java similarity index 100% rename from jdk/test/java/awt/Window/TranslucentShapedFrameTest/TSFrame.java rename to test/jdk/java/awt/Window/TranslucentShapedFrameTest/TSFrame.java diff --git a/jdk/test/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form b/test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form similarity index 100% rename from jdk/test/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form rename to test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form diff --git a/jdk/test/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java b/test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java similarity index 100% rename from jdk/test/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java rename to test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java diff --git a/jdk/test/java/awt/Window/WindowClosedEvents/WindowClosedEventOnDispose.java b/test/jdk/java/awt/Window/WindowClosedEvents/WindowClosedEventOnDispose.java similarity index 100% rename from jdk/test/java/awt/Window/WindowClosedEvents/WindowClosedEventOnDispose.java rename to test/jdk/java/awt/Window/WindowClosedEvents/WindowClosedEventOnDispose.java diff --git a/jdk/test/java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java b/test/jdk/java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java similarity index 100% rename from jdk/test/java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java rename to test/jdk/java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java diff --git a/jdk/test/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java b/test/jdk/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java similarity index 100% rename from jdk/test/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java rename to test/jdk/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java diff --git a/jdk/test/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java b/test/jdk/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java similarity index 100% rename from jdk/test/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java rename to test/jdk/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java diff --git a/jdk/test/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnDPIChangingTest.java b/test/jdk/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnDPIChangingTest.java similarity index 100% rename from jdk/test/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnDPIChangingTest.java rename to test/jdk/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnDPIChangingTest.java diff --git a/jdk/test/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnMovingToAnotherDisplay.java b/test/jdk/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnMovingToAnotherDisplay.java similarity index 100% rename from jdk/test/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnMovingToAnotherDisplay.java rename to test/jdk/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnMovingToAnotherDisplay.java diff --git a/jdk/test/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnSetLocationTest.java b/test/jdk/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnSetLocationTest.java similarity index 100% rename from jdk/test/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnSetLocationTest.java rename to test/jdk/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnSetLocationTest.java diff --git a/jdk/test/java/awt/Window/WindowType/WindowType.java b/test/jdk/java/awt/Window/WindowType/WindowType.java similarity index 100% rename from jdk/test/java/awt/Window/WindowType/WindowType.java rename to test/jdk/java/awt/Window/WindowType/WindowType.java diff --git a/jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java b/test/jdk/java/awt/Window/WindowsLeak/WindowsLeak.java similarity index 100% rename from jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java rename to test/jdk/java/awt/Window/WindowsLeak/WindowsLeak.java diff --git a/jdk/test/java/awt/Window/setLocRelativeTo/SetLocationRelativeToTest.java b/test/jdk/java/awt/Window/setLocRelativeTo/SetLocationRelativeToTest.java similarity index 100% rename from jdk/test/java/awt/Window/setLocRelativeTo/SetLocationRelativeToTest.java rename to test/jdk/java/awt/Window/setLocRelativeTo/SetLocationRelativeToTest.java diff --git a/jdk/test/java/awt/applet/Applet/AppletFlipBuffer.java b/test/jdk/java/awt/applet/Applet/AppletFlipBuffer.java similarity index 100% rename from jdk/test/java/awt/applet/Applet/AppletFlipBuffer.java rename to test/jdk/java/awt/applet/Applet/AppletFlipBuffer.java diff --git a/jdk/test/java/awt/applet/Applet/HeadlessApplet.java b/test/jdk/java/awt/applet/Applet/HeadlessApplet.java similarity index 100% rename from jdk/test/java/awt/applet/Applet/HeadlessApplet.java rename to test/jdk/java/awt/applet/Applet/HeadlessApplet.java diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java b/test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java similarity index 100% rename from jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java rename to test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh b/test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh similarity index 100% rename from jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh rename to test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh diff --git a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html b/test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html similarity index 100% rename from jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html rename to test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html diff --git a/jdk/test/java/awt/datatransfer/Clipboard/BasicClipboardTest.java b/test/jdk/java/awt/datatransfer/Clipboard/BasicClipboardTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/Clipboard/BasicClipboardTest.java rename to test/jdk/java/awt/datatransfer/Clipboard/BasicClipboardTest.java diff --git a/jdk/test/java/awt/datatransfer/Clipboard/GetContentsInterruptedTest.java b/test/jdk/java/awt/datatransfer/Clipboard/GetContentsInterruptedTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/Clipboard/GetContentsInterruptedTest.java rename to test/jdk/java/awt/datatransfer/Clipboard/GetContentsInterruptedTest.java diff --git a/jdk/test/java/awt/datatransfer/ClipboardInterVMTest/ClipboardInterVMTest.java b/test/jdk/java/awt/datatransfer/ClipboardInterVMTest/ClipboardInterVMTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/ClipboardInterVMTest/ClipboardInterVMTest.java rename to test/jdk/java/awt/datatransfer/ClipboardInterVMTest/ClipboardInterVMTest.java diff --git a/jdk/test/java/awt/datatransfer/ConstructFlavoredObjectTest/ConstructFlavoredObjectTest.java b/test/jdk/java/awt/datatransfer/ConstructFlavoredObjectTest/ConstructFlavoredObjectTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/ConstructFlavoredObjectTest/ConstructFlavoredObjectTest.java rename to test/jdk/java/awt/datatransfer/ConstructFlavoredObjectTest/ConstructFlavoredObjectTest.java diff --git a/jdk/test/java/awt/datatransfer/CustomClassLoaderTransferTest/AnotherInterface.java b/test/jdk/java/awt/datatransfer/CustomClassLoaderTransferTest/AnotherInterface.java similarity index 100% rename from jdk/test/java/awt/datatransfer/CustomClassLoaderTransferTest/AnotherInterface.java rename to test/jdk/java/awt/datatransfer/CustomClassLoaderTransferTest/AnotherInterface.java diff --git a/jdk/test/java/awt/datatransfer/CustomClassLoaderTransferTest/CustomClassLoaderTransferTest.java b/test/jdk/java/awt/datatransfer/CustomClassLoaderTransferTest/CustomClassLoaderTransferTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/CustomClassLoaderTransferTest/CustomClassLoaderTransferTest.java rename to test/jdk/java/awt/datatransfer/CustomClassLoaderTransferTest/CustomClassLoaderTransferTest.java diff --git a/jdk/test/java/awt/datatransfer/CustomClassLoaderTransferTest/TransferableList.java b/test/jdk/java/awt/datatransfer/CustomClassLoaderTransferTest/TransferableList.java similarity index 100% rename from jdk/test/java/awt/datatransfer/CustomClassLoaderTransferTest/TransferableList.java rename to test/jdk/java/awt/datatransfer/CustomClassLoaderTransferTest/TransferableList.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorCloneTest/DataFlavorCloneTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorCloneTest/DataFlavorCloneTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorCloneTest/DataFlavorCloneTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorCloneTest/DataFlavorCloneTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsNullTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorEqualsNullTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsNullTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorEqualsNullTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorEqualsTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorEqualsTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorFileListTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorFileListTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorFileListTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorFileListTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorRemoteTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorRemoteTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorRemoteTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorRemoteTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorSerializedTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorSerializedTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorSerializedTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorSerializedTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/DefaultMatchTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/DefaultMatchTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/DefaultMatchTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/DefaultMatchTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/EqualHashCodeTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/EqualHashCodeTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/EqualHashCodeTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/EqualHashCodeTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/EqualsHashCodeSymmetryTest/EqualsHashCodeSymmetryTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/EqualsHashCodeSymmetryTest/EqualsHashCodeSymmetryTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/EqualsHashCodeSymmetryTest/EqualsHashCodeSymmetryTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/EqualsHashCodeSymmetryTest/EqualsHashCodeSymmetryTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/ExternalizeTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/ExternalizeTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/ExternalizeTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/ExternalizeTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java b/test/jdk/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/MacOsXFileAndMultipleFileCopingTest/MacOsXFileAndMultipleFileCopingTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/MacOsXFileAndMultipleFileCopingTest/MacOsXFileAndMultipleFileCopingTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/MacOsXFileAndMultipleFileCopingTest/MacOsXFileAndMultipleFileCopingTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/MacOsXFileAndMultipleFileCopingTest/MacOsXFileAndMultipleFileCopingTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java b/test/jdk/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java rename to test/jdk/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/NullDataFlavorTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/NullDataFlavorTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/NullDataFlavorTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/NullDataFlavorTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java b/test/jdk/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java rename to test/jdk/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java b/test/jdk/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java b/test/jdk/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java rename to test/jdk/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java diff --git a/jdk/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java b/test/jdk/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java rename to test/jdk/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java diff --git a/jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/AbsoluteComponentCenterCalculator.java b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/AbsoluteComponentCenterCalculator.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/AbsoluteComponentCenterCalculator.java rename to test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/AbsoluteComponentCenterCalculator.java diff --git a/jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.html b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.html similarity index 100% rename from jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.html rename to test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.html diff --git a/jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java rename to test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java diff --git a/jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/FileListTransferable.java b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/FileListTransferable.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/FileListTransferable.java rename to test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/FileListTransferable.java diff --git a/jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/InterprocessMessages.java b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/InterprocessMessages.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/InterprocessMessages.java rename to test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/InterprocessMessages.java diff --git a/jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/NextFramePositionCalculator.java b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/NextFramePositionCalculator.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/NextFramePositionCalculator.java rename to test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/NextFramePositionCalculator.java diff --git a/jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/SourcePanel.java b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/SourcePanel.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/SourcePanel.java rename to test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/SourcePanel.java diff --git a/jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/TargetPanel.java b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/TargetPanel.java similarity index 100% rename from jdk/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/TargetPanel.java rename to test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/TargetPanel.java diff --git a/jdk/test/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java b/test/jdk/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java rename to test/jdk/java/awt/datatransfer/HTMLDataFlavors/HTMLDataFlavorTest.java diff --git a/jdk/test/java/awt/datatransfer/HTMLDataFlavors/HtmlTransferable.java b/test/jdk/java/awt/datatransfer/HTMLDataFlavors/HtmlTransferable.java similarity index 100% rename from jdk/test/java/awt/datatransfer/HTMLDataFlavors/HtmlTransferable.java rename to test/jdk/java/awt/datatransfer/HTMLDataFlavors/HtmlTransferable.java diff --git a/jdk/test/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.html b/test/jdk/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.html similarity index 100% rename from jdk/test/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.html rename to test/jdk/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.html diff --git a/jdk/test/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.java b/test/jdk/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.java rename to test/jdk/java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.java diff --git a/jdk/test/java/awt/datatransfer/HTMLDataFlavors/PutAllHtmlFlavorsOnClipboard.java b/test/jdk/java/awt/datatransfer/HTMLDataFlavors/PutAllHtmlFlavorsOnClipboard.java similarity index 100% rename from jdk/test/java/awt/datatransfer/HTMLDataFlavors/PutAllHtmlFlavorsOnClipboard.java rename to test/jdk/java/awt/datatransfer/HTMLDataFlavors/PutAllHtmlFlavorsOnClipboard.java diff --git a/jdk/test/java/awt/datatransfer/HTMLDataFlavors/PutOnlyAllHtmlFlavorOnClipboard.java b/test/jdk/java/awt/datatransfer/HTMLDataFlavors/PutOnlyAllHtmlFlavorOnClipboard.java similarity index 100% rename from jdk/test/java/awt/datatransfer/HTMLDataFlavors/PutOnlyAllHtmlFlavorOnClipboard.java rename to test/jdk/java/awt/datatransfer/HTMLDataFlavors/PutOnlyAllHtmlFlavorOnClipboard.java diff --git a/jdk/test/java/awt/datatransfer/HTMLDataFlavors/PutSelectionAndFragmentHtmlFlavorsOnClipboard.java b/test/jdk/java/awt/datatransfer/HTMLDataFlavors/PutSelectionAndFragmentHtmlFlavorsOnClipboard.java similarity index 100% rename from jdk/test/java/awt/datatransfer/HTMLDataFlavors/PutSelectionAndFragmentHtmlFlavorsOnClipboard.java rename to test/jdk/java/awt/datatransfer/HTMLDataFlavors/PutSelectionAndFragmentHtmlFlavorsOnClipboard.java diff --git a/jdk/test/java/awt/datatransfer/Headless/HeadlessClipboard.java b/test/jdk/java/awt/datatransfer/Headless/HeadlessClipboard.java similarity index 100% rename from jdk/test/java/awt/datatransfer/Headless/HeadlessClipboard.java rename to test/jdk/java/awt/datatransfer/Headless/HeadlessClipboard.java diff --git a/jdk/test/java/awt/datatransfer/Headless/HeadlessDataFlavor.java b/test/jdk/java/awt/datatransfer/Headless/HeadlessDataFlavor.java similarity index 100% rename from jdk/test/java/awt/datatransfer/Headless/HeadlessDataFlavor.java rename to test/jdk/java/awt/datatransfer/Headless/HeadlessDataFlavor.java diff --git a/jdk/test/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java b/test/jdk/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java similarity index 100% rename from jdk/test/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java rename to test/jdk/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java diff --git a/jdk/test/java/awt/datatransfer/ImageTransfer/ImageTransferTest.java b/test/jdk/java/awt/datatransfer/ImageTransfer/ImageTransferTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/ImageTransfer/ImageTransferTest.java rename to test/jdk/java/awt/datatransfer/ImageTransfer/ImageTransferTest.java diff --git a/jdk/test/java/awt/datatransfer/Independence/IndependenceAWTTest.java b/test/jdk/java/awt/datatransfer/Independence/IndependenceAWTTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/Independence/IndependenceAWTTest.java rename to test/jdk/java/awt/datatransfer/Independence/IndependenceAWTTest.java diff --git a/jdk/test/java/awt/datatransfer/Independence/IndependenceSwingTest.java b/test/jdk/java/awt/datatransfer/Independence/IndependenceSwingTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/Independence/IndependenceSwingTest.java rename to test/jdk/java/awt/datatransfer/Independence/IndependenceSwingTest.java diff --git a/jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/AbsoluteComponentCenterCalculator.java b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/AbsoluteComponentCenterCalculator.java similarity index 100% rename from jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/AbsoluteComponentCenterCalculator.java rename to test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/AbsoluteComponentCenterCalculator.java diff --git a/jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/DataFlavorSearcher.java b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/DataFlavorSearcher.java similarity index 100% rename from jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/DataFlavorSearcher.java rename to test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/DataFlavorSearcher.java diff --git a/jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/InterprocessMessages.java b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/InterprocessMessages.java similarity index 100% rename from jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/InterprocessMessages.java rename to test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/InterprocessMessages.java diff --git a/jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html similarity index 100% rename from jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html rename to test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html diff --git a/jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java similarity index 100% rename from jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java rename to test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java diff --git a/jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/MyTransferable.java b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MyTransferable.java similarity index 100% rename from jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/MyTransferable.java rename to test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MyTransferable.java diff --git a/jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/NextFramePositionCalculator.java b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/NextFramePositionCalculator.java similarity index 100% rename from jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/NextFramePositionCalculator.java rename to test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/NextFramePositionCalculator.java diff --git a/jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/SourcePanel.java b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/SourcePanel.java similarity index 100% rename from jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/SourcePanel.java rename to test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/SourcePanel.java diff --git a/jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/TargetPanel.java b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/TargetPanel.java similarity index 100% rename from jdk/test/java/awt/datatransfer/MissedHtmlAndRtfBug/TargetPanel.java rename to test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/TargetPanel.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java b/test/jdk/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java rename to test/jdk/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java b/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java rename to test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java diff --git a/jdk/test/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java b/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java rename to test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java diff --git a/jdk/test/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java b/test/jdk/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java similarity index 100% rename from jdk/test/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java rename to test/jdk/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java diff --git a/jdk/test/java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java b/test/jdk/java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java similarity index 100% rename from jdk/test/java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java rename to test/jdk/java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java diff --git a/jdk/test/java/awt/dnd/BadSerializaionTest/BadSerializationTest.java b/test/jdk/java/awt/dnd/BadSerializaionTest/BadSerializationTest.java similarity index 100% rename from jdk/test/java/awt/dnd/BadSerializaionTest/BadSerializationTest.java rename to test/jdk/java/awt/dnd/BadSerializaionTest/BadSerializationTest.java diff --git a/jdk/test/java/awt/dnd/BadSerializaionTest/badAction b/test/jdk/java/awt/dnd/BadSerializaionTest/badAction similarity index 100% rename from jdk/test/java/awt/dnd/BadSerializaionTest/badAction rename to test/jdk/java/awt/dnd/BadSerializaionTest/badAction diff --git a/jdk/test/java/awt/dnd/BadSerializaionTest/good b/test/jdk/java/awt/dnd/BadSerializaionTest/good similarity index 100% rename from jdk/test/java/awt/dnd/BadSerializaionTest/good rename to test/jdk/java/awt/dnd/BadSerializaionTest/good diff --git a/jdk/test/java/awt/dnd/BadSerializaionTest/noEvents b/test/jdk/java/awt/dnd/BadSerializaionTest/noEvents similarity index 100% rename from jdk/test/java/awt/dnd/BadSerializaionTest/noEvents rename to test/jdk/java/awt/dnd/BadSerializaionTest/noEvents diff --git a/jdk/test/java/awt/dnd/BadSerializaionTest/nullComponent b/test/jdk/java/awt/dnd/BadSerializaionTest/nullComponent similarity index 100% rename from jdk/test/java/awt/dnd/BadSerializaionTest/nullComponent rename to test/jdk/java/awt/dnd/BadSerializaionTest/nullComponent diff --git a/jdk/test/java/awt/dnd/BadSerializaionTest/nullDragSource b/test/jdk/java/awt/dnd/BadSerializaionTest/nullDragSource similarity index 100% rename from jdk/test/java/awt/dnd/BadSerializaionTest/nullDragSource rename to test/jdk/java/awt/dnd/BadSerializaionTest/nullDragSource diff --git a/jdk/test/java/awt/dnd/BadSerializaionTest/nullOrigin b/test/jdk/java/awt/dnd/BadSerializaionTest/nullOrigin similarity index 100% rename from jdk/test/java/awt/dnd/BadSerializaionTest/nullOrigin rename to test/jdk/java/awt/dnd/BadSerializaionTest/nullOrigin diff --git a/jdk/test/java/awt/dnd/Button2DragTest/Button2DragTest.java b/test/jdk/java/awt/dnd/Button2DragTest/Button2DragTest.java similarity index 100% rename from jdk/test/java/awt/dnd/Button2DragTest/Button2DragTest.java rename to test/jdk/java/awt/dnd/Button2DragTest/Button2DragTest.java diff --git a/jdk/test/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java b/test/jdk/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java similarity index 100% rename from jdk/test/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java rename to test/jdk/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java diff --git a/jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.html b/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.html similarity index 100% rename from jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.html rename to test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.html diff --git a/jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java b/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java similarity index 100% rename from jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java rename to test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java diff --git a/jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDTarget.java b/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDTarget.java similarity index 100% rename from jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDTarget.java rename to test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDTarget.java diff --git a/jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html b/test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html similarity index 100% rename from jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html rename to test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html diff --git a/jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java b/test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java similarity index 100% rename from jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java rename to test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java diff --git a/jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorFrame.java b/test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorFrame.java similarity index 100% rename from jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorFrame.java rename to test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorFrame.java diff --git a/jdk/test/java/awt/dnd/DragInterceptorAppletTest/InterprocessMessages.java b/test/jdk/java/awt/dnd/DragInterceptorAppletTest/InterprocessMessages.java similarity index 100% rename from jdk/test/java/awt/dnd/DragInterceptorAppletTest/InterprocessMessages.java rename to test/jdk/java/awt/dnd/DragInterceptorAppletTest/InterprocessMessages.java diff --git a/jdk/test/java/awt/dnd/DragInterceptorAppletTest/SourceFrame.java b/test/jdk/java/awt/dnd/DragInterceptorAppletTest/SourceFrame.java similarity index 100% rename from jdk/test/java/awt/dnd/DragInterceptorAppletTest/SourceFrame.java rename to test/jdk/java/awt/dnd/DragInterceptorAppletTest/SourceFrame.java diff --git a/jdk/test/java/awt/dnd/DragSourceListenerSerializationTest/DragSourceListenerSerializationTest.java b/test/jdk/java/awt/dnd/DragSourceListenerSerializationTest/DragSourceListenerSerializationTest.java similarity index 100% rename from jdk/test/java/awt/dnd/DragSourceListenerSerializationTest/DragSourceListenerSerializationTest.java rename to test/jdk/java/awt/dnd/DragSourceListenerSerializationTest/DragSourceListenerSerializationTest.java diff --git a/jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java b/test/jdk/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java similarity index 100% rename from jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java rename to test/jdk/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java diff --git a/jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java b/test/jdk/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java similarity index 100% rename from jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java rename to test/jdk/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java diff --git a/jdk/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html similarity index 100% rename from jdk/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html rename to test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html diff --git a/jdk/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java similarity index 100% rename from jdk/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java rename to test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java diff --git a/jdk/test/java/awt/dnd/FileListBetweenJVMsTest/FileListTransferable.java b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListTransferable.java similarity index 100% rename from jdk/test/java/awt/dnd/FileListBetweenJVMsTest/FileListTransferable.java rename to test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListTransferable.java diff --git a/jdk/test/java/awt/dnd/FileListBetweenJVMsTest/InterprocessMessages.java b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/InterprocessMessages.java similarity index 100% rename from jdk/test/java/awt/dnd/FileListBetweenJVMsTest/InterprocessMessages.java rename to test/jdk/java/awt/dnd/FileListBetweenJVMsTest/InterprocessMessages.java diff --git a/jdk/test/java/awt/dnd/FileListBetweenJVMsTest/SourceFileListFrame.java b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/SourceFileListFrame.java similarity index 100% rename from jdk/test/java/awt/dnd/FileListBetweenJVMsTest/SourceFileListFrame.java rename to test/jdk/java/awt/dnd/FileListBetweenJVMsTest/SourceFileListFrame.java diff --git a/jdk/test/java/awt/dnd/FileListBetweenJVMsTest/TargetFileListFrame.java b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/TargetFileListFrame.java similarity index 100% rename from jdk/test/java/awt/dnd/FileListBetweenJVMsTest/TargetFileListFrame.java rename to test/jdk/java/awt/dnd/FileListBetweenJVMsTest/TargetFileListFrame.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnD/DnDSource.java b/test/jdk/java/awt/dnd/ImageDecoratedDnD/DnDSource.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnD/DnDSource.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnD/DnDSource.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnD/DnDTarget.java b/test/jdk/java/awt/dnd/ImageDecoratedDnD/DnDTarget.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnD/DnDTarget.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnD/DnDTarget.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.html b/test/jdk/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.html similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.html rename to test/jdk/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.html diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.java b/test/jdk/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnD/ImageGenerator.java b/test/jdk/java/awt/dnd/ImageDecoratedDnD/ImageGenerator.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnD/ImageGenerator.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnD/ImageGenerator.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnD/MyCursor.java b/test/jdk/java/awt/dnd/ImageDecoratedDnD/MyCursor.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnD/MyCursor.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnD/MyCursor.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnDInOut/DnDSource.java b/test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/DnDSource.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnDInOut/DnDSource.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/DnDSource.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnDInOut/DnDTarget.java b/test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/DnDTarget.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnDInOut/DnDTarget.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/DnDTarget.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html b/test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html rename to test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.java b/test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageGenerator.java b/test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/ImageGenerator.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageGenerator.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/ImageGenerator.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnDInOut/MyCursor.java b/test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/MyCursor.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnDInOut/MyCursor.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/MyCursor.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnDNegative/DnDSource.java b/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/DnDSource.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnDNegative/DnDSource.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/DnDSource.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnDNegative/DnDTarget.java b/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/DnDTarget.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnDNegative/DnDTarget.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/DnDTarget.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html b/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html rename to test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.java b/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageGenerator.java b/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/ImageGenerator.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageGenerator.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/ImageGenerator.java diff --git a/jdk/test/java/awt/dnd/ImageDecoratedDnDNegative/MyCursor.java b/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/MyCursor.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageDecoratedDnDNegative/MyCursor.java rename to test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/MyCursor.java diff --git a/jdk/test/java/awt/dnd/ImageTransferTest/ImageTransferTest.java b/test/jdk/java/awt/dnd/ImageTransferTest/ImageTransferTest.java similarity index 100% rename from jdk/test/java/awt/dnd/ImageTransferTest/ImageTransferTest.java rename to test/jdk/java/awt/dnd/ImageTransferTest/ImageTransferTest.java diff --git a/jdk/test/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html b/test/jdk/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html similarity index 100% rename from jdk/test/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html rename to test/jdk/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html diff --git a/jdk/test/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.java b/test/jdk/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.java similarity index 100% rename from jdk/test/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.java rename to test/jdk/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.java diff --git a/jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java b/test/jdk/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java similarity index 100% rename from jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java rename to test/jdk/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java diff --git a/jdk/test/java/awt/dnd/MissingEventsOnModalDialog/MissingEventsOnModalDialogTest.java b/test/jdk/java/awt/dnd/MissingEventsOnModalDialog/MissingEventsOnModalDialogTest.java similarity index 100% rename from jdk/test/java/awt/dnd/MissingEventsOnModalDialog/MissingEventsOnModalDialogTest.java rename to test/jdk/java/awt/dnd/MissingEventsOnModalDialog/MissingEventsOnModalDialogTest.java diff --git a/jdk/test/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html b/test/jdk/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html similarity index 100% rename from jdk/test/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html rename to test/jdk/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html diff --git a/jdk/test/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java b/test/jdk/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java similarity index 100% rename from jdk/test/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java rename to test/jdk/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java diff --git a/jdk/test/java/awt/dnd/RemoveDropTargetCrashTest/RemoveDropTargetCrashTest.java b/test/jdk/java/awt/dnd/RemoveDropTargetCrashTest/RemoveDropTargetCrashTest.java similarity index 100% rename from jdk/test/java/awt/dnd/RemoveDropTargetCrashTest/RemoveDropTargetCrashTest.java rename to test/jdk/java/awt/dnd/RemoveDropTargetCrashTest/RemoveDropTargetCrashTest.java diff --git a/jdk/test/java/awt/dnd/URIListBetweenJVMsTest/FileListTransferable.java b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/FileListTransferable.java similarity index 100% rename from jdk/test/java/awt/dnd/URIListBetweenJVMsTest/FileListTransferable.java rename to test/jdk/java/awt/dnd/URIListBetweenJVMsTest/FileListTransferable.java diff --git a/jdk/test/java/awt/dnd/URIListBetweenJVMsTest/InterprocessMessages.java b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/InterprocessMessages.java similarity index 100% rename from jdk/test/java/awt/dnd/URIListBetweenJVMsTest/InterprocessMessages.java rename to test/jdk/java/awt/dnd/URIListBetweenJVMsTest/InterprocessMessages.java diff --git a/jdk/test/java/awt/dnd/URIListBetweenJVMsTest/SourceFileListFrame.java b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/SourceFileListFrame.java similarity index 100% rename from jdk/test/java/awt/dnd/URIListBetweenJVMsTest/SourceFileListFrame.java rename to test/jdk/java/awt/dnd/URIListBetweenJVMsTest/SourceFileListFrame.java diff --git a/jdk/test/java/awt/dnd/URIListBetweenJVMsTest/TargetFileListFrame.java b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/TargetFileListFrame.java similarity index 100% rename from jdk/test/java/awt/dnd/URIListBetweenJVMsTest/TargetFileListFrame.java rename to test/jdk/java/awt/dnd/URIListBetweenJVMsTest/TargetFileListFrame.java diff --git a/jdk/test/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html similarity index 100% rename from jdk/test/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html rename to test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html diff --git a/jdk/test/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java similarity index 100% rename from jdk/test/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java rename to test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java diff --git a/jdk/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/InterprocessMessages.java b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/InterprocessMessages.java similarity index 100% rename from jdk/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/InterprocessMessages.java rename to test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/InterprocessMessages.java diff --git a/jdk/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/SourceFileListFrame.java b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/SourceFileListFrame.java similarity index 100% rename from jdk/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/SourceFileListFrame.java rename to test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/SourceFileListFrame.java diff --git a/jdk/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/TargetFileListFrame.java b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/TargetFileListFrame.java similarity index 100% rename from jdk/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/TargetFileListFrame.java rename to test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/TargetFileListFrame.java diff --git a/jdk/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.html b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.html similarity index 100% rename from jdk/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.html rename to test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.html diff --git a/jdk/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java similarity index 100% rename from jdk/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java rename to test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java diff --git a/jdk/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListTransferable.java b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListTransferable.java similarity index 100% rename from jdk/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListTransferable.java rename to test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListTransferable.java diff --git a/jdk/test/java/awt/dnd/URLDragTest/DragLinkFromBrowser.java b/test/jdk/java/awt/dnd/URLDragTest/DragLinkFromBrowser.java similarity index 100% rename from jdk/test/java/awt/dnd/URLDragTest/DragLinkFromBrowser.java rename to test/jdk/java/awt/dnd/URLDragTest/DragLinkFromBrowser.java diff --git a/jdk/test/java/awt/dnd/URLDragTest/URLDragTest.html b/test/jdk/java/awt/dnd/URLDragTest/URLDragTest.html similarity index 100% rename from jdk/test/java/awt/dnd/URLDragTest/URLDragTest.html rename to test/jdk/java/awt/dnd/URLDragTest/URLDragTest.html diff --git a/jdk/test/java/awt/dnd/URLDragTest/URLDragTest.java b/test/jdk/java/awt/dnd/URLDragTest/URLDragTest.java similarity index 100% rename from jdk/test/java/awt/dnd/URLDragTest/URLDragTest.java rename to test/jdk/java/awt/dnd/URLDragTest/URLDragTest.java diff --git a/jdk/test/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html b/test/jdk/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html similarity index 100% rename from jdk/test/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html rename to test/jdk/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html diff --git a/jdk/test/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.java b/test/jdk/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.java similarity index 100% rename from jdk/test/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.java rename to test/jdk/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.java diff --git a/jdk/test/java/awt/event/ComponentEvent/MovedResizedTwiceTest/MovedResizedTwiceTest.java b/test/jdk/java/awt/event/ComponentEvent/MovedResizedTwiceTest/MovedResizedTwiceTest.java similarity index 100% rename from jdk/test/java/awt/event/ComponentEvent/MovedResizedTwiceTest/MovedResizedTwiceTest.java rename to test/jdk/java/awt/event/ComponentEvent/MovedResizedTwiceTest/MovedResizedTwiceTest.java diff --git a/jdk/test/java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java b/test/jdk/java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java similarity index 100% rename from jdk/test/java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java rename to test/jdk/java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java diff --git a/jdk/test/java/awt/event/InputEvent/ButtonArraysEquality/ButtonArraysEquality.java b/test/jdk/java/awt/event/InputEvent/ButtonArraysEquality/ButtonArraysEquality.java similarity index 100% rename from jdk/test/java/awt/event/InputEvent/ButtonArraysEquality/ButtonArraysEquality.java rename to test/jdk/java/awt/event/InputEvent/ButtonArraysEquality/ButtonArraysEquality.java diff --git a/jdk/test/java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java b/test/jdk/java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java similarity index 100% rename from jdk/test/java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java rename to test/jdk/java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java diff --git a/jdk/test/java/awt/event/InvocationEvent/InvocationEventTest.java b/test/jdk/java/awt/event/InvocationEvent/InvocationEventTest.java similarity index 100% rename from jdk/test/java/awt/event/InvocationEvent/InvocationEventTest.java rename to test/jdk/java/awt/event/InvocationEvent/InvocationEventTest.java diff --git a/jdk/test/java/awt/event/KeyEvent/8020209/bug8020209.java b/test/jdk/java/awt/event/KeyEvent/8020209/bug8020209.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/8020209/bug8020209.java rename to test/jdk/java/awt/event/KeyEvent/8020209/bug8020209.java diff --git a/jdk/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.html b/test/jdk/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.html similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.html rename to test/jdk/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.html diff --git a/jdk/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.java b/test/jdk/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.java rename to test/jdk/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.java diff --git a/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java b/test/jdk/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java rename to test/jdk/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java diff --git a/jdk/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java b/test/jdk/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java rename to test/jdk/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java diff --git a/jdk/test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java b/test/jdk/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java rename to test/jdk/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java diff --git a/jdk/test/java/awt/event/KeyEvent/DeadKey/DeadKeySystemAssertionDialog.java b/test/jdk/java/awt/event/KeyEvent/DeadKey/DeadKeySystemAssertionDialog.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/DeadKey/DeadKeySystemAssertionDialog.java rename to test/jdk/java/awt/event/KeyEvent/DeadKey/DeadKeySystemAssertionDialog.java diff --git a/jdk/test/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java b/test/jdk/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java rename to test/jdk/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java diff --git a/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java b/test/jdk/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java rename to test/jdk/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java diff --git a/jdk/test/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java b/test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java rename to test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java diff --git a/jdk/test/java/awt/event/KeyEvent/KeyChar/KeyCharTest.java b/test/jdk/java/awt/event/KeyEvent/KeyChar/KeyCharTest.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/KeyChar/KeyCharTest.java rename to test/jdk/java/awt/event/KeyEvent/KeyChar/KeyCharTest.java diff --git a/jdk/test/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java b/test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java rename to test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java diff --git a/jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.html b/test/jdk/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.html similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.html rename to test/jdk/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.html diff --git a/jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java b/test/jdk/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java rename to test/jdk/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java diff --git a/jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/TestApplet.java b/test/jdk/java/awt/event/KeyEvent/KeyReleasedInAppletTest/TestApplet.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/TestApplet.java rename to test/jdk/java/awt/event/KeyEvent/KeyReleasedInAppletTest/TestApplet.java diff --git a/jdk/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html b/test/jdk/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html rename to test/jdk/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html diff --git a/jdk/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java b/test/jdk/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java rename to test/jdk/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java diff --git a/jdk/test/java/awt/event/KeyEvent/RegisterKeyStroke/TestAWTKeyStroke.java b/test/jdk/java/awt/event/KeyEvent/RegisterKeyStroke/TestAWTKeyStroke.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/RegisterKeyStroke/TestAWTKeyStroke.java rename to test/jdk/java/awt/event/KeyEvent/RegisterKeyStroke/TestAWTKeyStroke.java diff --git a/jdk/test/java/awt/event/KeyEvent/RegisterKeyStroke/policy b/test/jdk/java/awt/event/KeyEvent/RegisterKeyStroke/policy similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/RegisterKeyStroke/policy rename to test/jdk/java/awt/event/KeyEvent/RegisterKeyStroke/policy diff --git a/jdk/test/java/awt/event/KeyEvent/RobotCrash/RobotCrash.java b/test/jdk/java/awt/event/KeyEvent/RobotCrash/RobotCrash.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/RobotCrash/RobotCrash.java rename to test/jdk/java/awt/event/KeyEvent/RobotCrash/RobotCrash.java diff --git a/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java b/test/jdk/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java similarity index 100% rename from jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java rename to test/jdk/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java diff --git a/jdk/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.html b/test/jdk/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.html similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.html rename to test/jdk/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.html diff --git a/jdk/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.java b/test/jdk/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.java rename to test/jdk/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.java diff --git a/jdk/test/java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java b/test/jdk/java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java rename to test/jdk/java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java diff --git a/jdk/test/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java b/test/jdk/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java rename to test/jdk/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java diff --git a/jdk/test/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions.java b/test/jdk/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions.java rename to test/jdk/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions.java diff --git a/jdk/test/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions_Disable.java b/test/jdk/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions_Disable.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions_Disable.java rename to test/jdk/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions_Disable.java diff --git a/jdk/test/java/awt/event/MouseEvent/CheckGetMaskForButton/CheckGetMaskForButton.java b/test/jdk/java/awt/event/MouseEvent/CheckGetMaskForButton/CheckGetMaskForButton.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/CheckGetMaskForButton/CheckGetMaskForButton.java rename to test/jdk/java/awt/event/MouseEvent/CheckGetMaskForButton/CheckGetMaskForButton.java diff --git a/jdk/test/java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKeypress.java b/test/jdk/java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKeypress.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKeypress.java rename to test/jdk/java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKeypress.java diff --git a/jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java b/test/jdk/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java rename to test/jdk/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java diff --git a/jdk/test/java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java b/test/jdk/java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java rename to test/jdk/java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java diff --git a/jdk/test/java/awt/event/MouseEvent/EventTimeInFuture/EventTimeInFuture.java b/test/jdk/java/awt/event/MouseEvent/EventTimeInFuture/EventTimeInFuture.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/EventTimeInFuture/EventTimeInFuture.java rename to test/jdk/java/awt/event/MouseEvent/EventTimeInFuture/EventTimeInFuture.java diff --git a/jdk/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.html b/test/jdk/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.html similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.html rename to test/jdk/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.html diff --git a/jdk/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java b/test/jdk/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java rename to test/jdk/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java diff --git a/jdk/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html b/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html rename to test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html diff --git a/jdk/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java b/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java rename to test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java diff --git a/jdk/test/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java b/test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java rename to test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java diff --git a/jdk/test/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java b/test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java rename to test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java diff --git a/jdk/test/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html b/test/jdk/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html rename to test/jdk/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html diff --git a/jdk/test/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java b/test/jdk/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java rename to test/jdk/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java diff --git a/jdk/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html b/test/jdk/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html rename to test/jdk/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html diff --git a/jdk/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java b/test/jdk/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java rename to test/jdk/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java diff --git a/jdk/test/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java b/test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java rename to test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java diff --git a/jdk/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.html b/test/jdk/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.html similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.html rename to test/jdk/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.html diff --git a/jdk/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java b/test/jdk/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java rename to test/jdk/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java diff --git a/jdk/test/java/awt/event/MouseEvent/SmoothWheel/SmoothWheel.java b/test/jdk/java/awt/event/MouseEvent/SmoothWheel/SmoothWheel.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/SmoothWheel/SmoothWheel.java rename to test/jdk/java/awt/event/MouseEvent/SmoothWheel/SmoothWheel.java diff --git a/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter.java b/test/jdk/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter.java rename to test/jdk/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter.java diff --git a/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_1.java b/test/jdk/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_1.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_1.java rename to test/jdk/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_1.java diff --git a/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_2.java b/test/jdk/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_2.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_2.java rename to test/jdk/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_2.java diff --git a/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java b/test/jdk/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java similarity index 100% rename from jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java rename to test/jdk/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java diff --git a/jdk/test/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java b/test/jdk/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java similarity index 100% rename from jdk/test/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java rename to test/jdk/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java similarity index 100% rename from jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java rename to test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java similarity index 100% rename from jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java rename to test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.html b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.html similarity index 100% rename from jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.html rename to test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.html diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java similarity index 100% rename from jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java rename to test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.html b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.html similarity index 100% rename from jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.html rename to test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.html diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java similarity index 100% rename from jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java rename to test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java similarity index 100% rename from jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java rename to test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java diff --git a/jdk/test/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java b/test/jdk/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java similarity index 100% rename from jdk/test/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java rename to test/jdk/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java diff --git a/jdk/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java b/test/jdk/java/awt/event/OtherEvents/UngrabID/UngrabID.java similarity index 100% rename from jdk/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java rename to test/jdk/java/awt/event/OtherEvents/UngrabID/UngrabID.java diff --git a/jdk/test/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java b/test/jdk/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java similarity index 100% rename from jdk/test/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java rename to test/jdk/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java diff --git a/jdk/test/java/awt/event/helpers/lwcomponents/LWButton.java b/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java similarity index 100% rename from jdk/test/java/awt/event/helpers/lwcomponents/LWButton.java rename to test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java diff --git a/jdk/test/java/awt/event/helpers/lwcomponents/LWComponent.java b/test/jdk/java/awt/event/helpers/lwcomponents/LWComponent.java similarity index 100% rename from jdk/test/java/awt/event/helpers/lwcomponents/LWComponent.java rename to test/jdk/java/awt/event/helpers/lwcomponents/LWComponent.java diff --git a/jdk/test/java/awt/event/helpers/lwcomponents/LWList.java b/test/jdk/java/awt/event/helpers/lwcomponents/LWList.java similarity index 100% rename from jdk/test/java/awt/event/helpers/lwcomponents/LWList.java rename to test/jdk/java/awt/event/helpers/lwcomponents/LWList.java diff --git a/jdk/test/java/awt/font/Fallback/MissingGlyphTest.java b/test/jdk/java/awt/font/Fallback/MissingGlyphTest.java similarity index 100% rename from jdk/test/java/awt/font/Fallback/MissingGlyphTest.java rename to test/jdk/java/awt/font/Fallback/MissingGlyphTest.java diff --git a/jdk/test/java/awt/font/Fallback/SurrogatesFallbackTest.java b/test/jdk/java/awt/font/Fallback/SurrogatesFallbackTest.java similarity index 100% rename from jdk/test/java/awt/font/Fallback/SurrogatesFallbackTest.java rename to test/jdk/java/awt/font/Fallback/SurrogatesFallbackTest.java diff --git a/jdk/test/java/awt/font/FontNames/GetLCIDFromLocale.java b/test/jdk/java/awt/font/FontNames/GetLCIDFromLocale.java similarity index 100% rename from jdk/test/java/awt/font/FontNames/GetLCIDFromLocale.java rename to test/jdk/java/awt/font/FontNames/GetLCIDFromLocale.java diff --git a/jdk/test/java/awt/font/FontNames/LocaleFamilyNames.java b/test/jdk/java/awt/font/FontNames/LocaleFamilyNames.java similarity index 100% rename from jdk/test/java/awt/font/FontNames/LocaleFamilyNames.java rename to test/jdk/java/awt/font/FontNames/LocaleFamilyNames.java diff --git a/jdk/test/java/awt/font/FontNames/TrueTypeFontLocaleNameTest.java b/test/jdk/java/awt/font/FontNames/TrueTypeFontLocaleNameTest.java similarity index 100% rename from jdk/test/java/awt/font/FontNames/TrueTypeFontLocaleNameTest.java rename to test/jdk/java/awt/font/FontNames/TrueTypeFontLocaleNameTest.java diff --git a/jdk/test/java/awt/font/FontScaling/FontScalingTest.java b/test/jdk/java/awt/font/FontScaling/FontScalingTest.java similarity index 100% rename from jdk/test/java/awt/font/FontScaling/FontScalingTest.java rename to test/jdk/java/awt/font/FontScaling/FontScalingTest.java diff --git a/jdk/test/java/awt/font/GlyphVector/GetGlyphCharIndexTest.java b/test/jdk/java/awt/font/GlyphVector/GetGlyphCharIndexTest.java similarity index 100% rename from jdk/test/java/awt/font/GlyphVector/GetGlyphCharIndexTest.java rename to test/jdk/java/awt/font/GlyphVector/GetGlyphCharIndexTest.java diff --git a/jdk/test/java/awt/font/GlyphVector/GlyphVectorOutline.java b/test/jdk/java/awt/font/GlyphVector/GlyphVectorOutline.java similarity index 100% rename from jdk/test/java/awt/font/GlyphVector/GlyphVectorOutline.java rename to test/jdk/java/awt/font/GlyphVector/GlyphVectorOutline.java diff --git a/jdk/test/java/awt/font/GlyphVector/TestLayoutFlags.java b/test/jdk/java/awt/font/GlyphVector/TestLayoutFlags.java similarity index 100% rename from jdk/test/java/awt/font/GlyphVector/TestLayoutFlags.java rename to test/jdk/java/awt/font/GlyphVector/TestLayoutFlags.java diff --git a/jdk/test/java/awt/font/GlyphVector/TestStandardGlyphVectorBug.java b/test/jdk/java/awt/font/GlyphVector/TestStandardGlyphVectorBug.java similarity index 100% rename from jdk/test/java/awt/font/GlyphVector/TestStandardGlyphVectorBug.java rename to test/jdk/java/awt/font/GlyphVector/TestStandardGlyphVectorBug.java diff --git a/jdk/test/java/awt/font/GlyphVector/VisualBounds.java b/test/jdk/java/awt/font/GlyphVector/VisualBounds.java similarity index 100% rename from jdk/test/java/awt/font/GlyphVector/VisualBounds.java rename to test/jdk/java/awt/font/GlyphVector/VisualBounds.java diff --git a/jdk/test/java/awt/font/JNICheck/JNICheck.java b/test/jdk/java/awt/font/JNICheck/JNICheck.java similarity index 100% rename from jdk/test/java/awt/font/JNICheck/JNICheck.java rename to test/jdk/java/awt/font/JNICheck/JNICheck.java diff --git a/jdk/test/java/awt/font/JNICheck/JNICheck.sh b/test/jdk/java/awt/font/JNICheck/JNICheck.sh similarity index 100% rename from jdk/test/java/awt/font/JNICheck/JNICheck.sh rename to test/jdk/java/awt/font/JNICheck/JNICheck.sh diff --git a/jdk/test/java/awt/font/JNICheck/LoadFontsJNICheck.java b/test/jdk/java/awt/font/JNICheck/LoadFontsJNICheck.java similarity index 100% rename from jdk/test/java/awt/font/JNICheck/LoadFontsJNICheck.java rename to test/jdk/java/awt/font/JNICheck/LoadFontsJNICheck.java diff --git a/jdk/test/java/awt/font/JNICheck/LoadFontsJNICheck.sh b/test/jdk/java/awt/font/JNICheck/LoadFontsJNICheck.sh similarity index 100% rename from jdk/test/java/awt/font/JNICheck/LoadFontsJNICheck.sh rename to test/jdk/java/awt/font/JNICheck/LoadFontsJNICheck.sh diff --git a/jdk/test/java/awt/font/LineBreakMeasurer/AllFontsLBM.java b/test/jdk/java/awt/font/LineBreakMeasurer/AllFontsLBM.java similarity index 100% rename from jdk/test/java/awt/font/LineBreakMeasurer/AllFontsLBM.java rename to test/jdk/java/awt/font/LineBreakMeasurer/AllFontsLBM.java diff --git a/jdk/test/java/awt/font/LineBreakMeasurer/FRCTest.java b/test/jdk/java/awt/font/LineBreakMeasurer/FRCTest.java similarity index 100% rename from jdk/test/java/awt/font/LineBreakMeasurer/FRCTest.java rename to test/jdk/java/awt/font/LineBreakMeasurer/FRCTest.java diff --git a/jdk/test/java/awt/font/LineBreakMeasurer/TestLineBreakWithFontSub.java b/test/jdk/java/awt/font/LineBreakMeasurer/TestLineBreakWithFontSub.java similarity index 100% rename from jdk/test/java/awt/font/LineBreakMeasurer/TestLineBreakWithFontSub.java rename to test/jdk/java/awt/font/LineBreakMeasurer/TestLineBreakWithFontSub.java diff --git a/jdk/test/java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java b/test/jdk/java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java similarity index 100% rename from jdk/test/java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java rename to test/jdk/java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java diff --git a/jdk/test/java/awt/font/NumericShaper/EasternArabicTest.java b/test/jdk/java/awt/font/NumericShaper/EasternArabicTest.java similarity index 100% rename from jdk/test/java/awt/font/NumericShaper/EasternArabicTest.java rename to test/jdk/java/awt/font/NumericShaper/EasternArabicTest.java diff --git a/jdk/test/java/awt/font/NumericShaper/EqualsTest.java b/test/jdk/java/awt/font/NumericShaper/EqualsTest.java similarity index 100% rename from jdk/test/java/awt/font/NumericShaper/EqualsTest.java rename to test/jdk/java/awt/font/NumericShaper/EqualsTest.java diff --git a/jdk/test/java/awt/font/NumericShaper/MTTest.java b/test/jdk/java/awt/font/NumericShaper/MTTest.java similarity index 100% rename from jdk/test/java/awt/font/NumericShaper/MTTest.java rename to test/jdk/java/awt/font/NumericShaper/MTTest.java diff --git a/jdk/test/java/awt/font/NumericShaper/ShapingTest.java b/test/jdk/java/awt/font/NumericShaper/ShapingTest.java similarity index 100% rename from jdk/test/java/awt/font/NumericShaper/ShapingTest.java rename to test/jdk/java/awt/font/NumericShaper/ShapingTest.java diff --git a/jdk/test/java/awt/font/OpenType/OpticalBoundsTagTest.java b/test/jdk/java/awt/font/OpenType/OpticalBoundsTagTest.java similarity index 100% rename from jdk/test/java/awt/font/OpenType/OpticalBoundsTagTest.java rename to test/jdk/java/awt/font/OpenType/OpticalBoundsTagTest.java diff --git a/jdk/test/java/awt/font/Rotate/Shear.java b/test/jdk/java/awt/font/Rotate/Shear.java similarity index 100% rename from jdk/test/java/awt/font/Rotate/Shear.java rename to test/jdk/java/awt/font/Rotate/Shear.java diff --git a/jdk/test/java/awt/font/Rotate/TestTransform.java b/test/jdk/java/awt/font/Rotate/TestTransform.java similarity index 100% rename from jdk/test/java/awt/font/Rotate/TestTransform.java rename to test/jdk/java/awt/font/Rotate/TestTransform.java diff --git a/jdk/test/java/awt/font/Rotate/TranslatedOutlineTest.java b/test/jdk/java/awt/font/Rotate/TranslatedOutlineTest.java similarity index 100% rename from jdk/test/java/awt/font/Rotate/TranslatedOutlineTest.java rename to test/jdk/java/awt/font/Rotate/TranslatedOutlineTest.java diff --git a/jdk/test/java/awt/font/StyledMetrics/BoldSpace.java b/test/jdk/java/awt/font/StyledMetrics/BoldSpace.java similarity index 100% rename from jdk/test/java/awt/font/StyledMetrics/BoldSpace.java rename to test/jdk/java/awt/font/StyledMetrics/BoldSpace.java diff --git a/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java b/test/jdk/java/awt/font/TextLayout/ArabicDiacriticTest.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java rename to test/jdk/java/awt/font/TextLayout/ArabicDiacriticTest.java diff --git a/jdk/test/java/awt/font/TextLayout/AttributeValuesCastTest.java b/test/jdk/java/awt/font/TextLayout/AttributeValuesCastTest.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/AttributeValuesCastTest.java rename to test/jdk/java/awt/font/TextLayout/AttributeValuesCastTest.java diff --git a/jdk/test/java/awt/font/TextLayout/CombiningPerf.java b/test/jdk/java/awt/font/TextLayout/CombiningPerf.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/CombiningPerf.java rename to test/jdk/java/awt/font/TextLayout/CombiningPerf.java diff --git a/jdk/test/java/awt/font/TextLayout/DecorationBoundsTest.java b/test/jdk/java/awt/font/TextLayout/DecorationBoundsTest.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/DecorationBoundsTest.java rename to test/jdk/java/awt/font/TextLayout/DecorationBoundsTest.java diff --git a/jdk/test/java/awt/font/TextLayout/DiacriticsDrawingTest.java b/test/jdk/java/awt/font/TextLayout/DiacriticsDrawingTest.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/DiacriticsDrawingTest.java rename to test/jdk/java/awt/font/TextLayout/DiacriticsDrawingTest.java diff --git a/jdk/test/java/awt/font/TextLayout/HitTest.java b/test/jdk/java/awt/font/TextLayout/HitTest.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/HitTest.java rename to test/jdk/java/awt/font/TextLayout/HitTest.java diff --git a/jdk/test/java/awt/font/TextLayout/KernCrash.java b/test/jdk/java/awt/font/TextLayout/KernCrash.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/KernCrash.java rename to test/jdk/java/awt/font/TextLayout/KernCrash.java diff --git a/jdk/test/java/awt/font/TextLayout/KerningLeak.java b/test/jdk/java/awt/font/TextLayout/KerningLeak.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/KerningLeak.java rename to test/jdk/java/awt/font/TextLayout/KerningLeak.java diff --git a/jdk/test/java/awt/font/TextLayout/LigatureCaretTest.java b/test/jdk/java/awt/font/TextLayout/LigatureCaretTest.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/LigatureCaretTest.java rename to test/jdk/java/awt/font/TextLayout/LigatureCaretTest.java diff --git a/jdk/test/java/awt/font/TextLayout/MissingCodePointLayoutTest.java b/test/jdk/java/awt/font/TextLayout/MissingCodePointLayoutTest.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/MissingCodePointLayoutTest.java rename to test/jdk/java/awt/font/TextLayout/MissingCodePointLayoutTest.java diff --git a/jdk/test/java/awt/font/TextLayout/OSXLigatureTest.java b/test/jdk/java/awt/font/TextLayout/OSXLigatureTest.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/OSXLigatureTest.java rename to test/jdk/java/awt/font/TextLayout/OSXLigatureTest.java diff --git a/jdk/test/java/awt/font/TextLayout/StyledFontLayoutTest.java b/test/jdk/java/awt/font/TextLayout/StyledFontLayoutTest.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/StyledFontLayoutTest.java rename to test/jdk/java/awt/font/TextLayout/StyledFontLayoutTest.java diff --git a/jdk/test/java/awt/font/TextLayout/TestAATMorxFont.java b/test/jdk/java/awt/font/TextLayout/TestAATMorxFont.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/TestAATMorxFont.java rename to test/jdk/java/awt/font/TextLayout/TestAATMorxFont.java diff --git a/jdk/test/java/awt/font/TextLayout/TestGetPixelBounds.java b/test/jdk/java/awt/font/TextLayout/TestGetPixelBounds.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/TestGetPixelBounds.java rename to test/jdk/java/awt/font/TextLayout/TestGetPixelBounds.java diff --git a/jdk/test/java/awt/font/TextLayout/TestHebrewMark.java b/test/jdk/java/awt/font/TextLayout/TestHebrewMark.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/TestHebrewMark.java rename to test/jdk/java/awt/font/TextLayout/TestHebrewMark.java diff --git a/jdk/test/java/awt/font/TextLayout/TestJustification.html b/test/jdk/java/awt/font/TextLayout/TestJustification.html similarity index 100% rename from jdk/test/java/awt/font/TextLayout/TestJustification.html rename to test/jdk/java/awt/font/TextLayout/TestJustification.html diff --git a/jdk/test/java/awt/font/TextLayout/TestJustification.java b/test/jdk/java/awt/font/TextLayout/TestJustification.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/TestJustification.java rename to test/jdk/java/awt/font/TextLayout/TestJustification.java diff --git a/jdk/test/java/awt/font/TextLayout/TestLayoutVsICU.java b/test/jdk/java/awt/font/TextLayout/TestLayoutVsICU.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/TestLayoutVsICU.java rename to test/jdk/java/awt/font/TextLayout/TestLayoutVsICU.java diff --git a/jdk/test/java/awt/font/TextLayout/TestLayoutVsICU_jdkbase.xml b/test/jdk/java/awt/font/TextLayout/TestLayoutVsICU_jdkbase.xml similarity index 100% rename from jdk/test/java/awt/font/TextLayout/TestLayoutVsICU_jdkbase.xml rename to test/jdk/java/awt/font/TextLayout/TestLayoutVsICU_jdkbase.xml diff --git a/jdk/test/java/awt/font/TextLayout/TestOldHangul.java b/test/jdk/java/awt/font/TextLayout/TestOldHangul.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/TestOldHangul.java rename to test/jdk/java/awt/font/TextLayout/TestOldHangul.java diff --git a/jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java b/test/jdk/java/awt/font/TextLayout/TestSinhalaChar.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java rename to test/jdk/java/awt/font/TextLayout/TestSinhalaChar.java diff --git a/jdk/test/java/awt/font/TextLayout/TestTibetan.java b/test/jdk/java/awt/font/TextLayout/TestTibetan.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/TestTibetan.java rename to test/jdk/java/awt/font/TextLayout/TestTibetan.java diff --git a/jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java b/test/jdk/java/awt/font/TextLayout/TextLayoutBounds.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java rename to test/jdk/java/awt/font/TextLayout/TextLayoutBounds.java diff --git a/jdk/test/java/awt/font/TextLayout/TextLayoutEqualsTest.java b/test/jdk/java/awt/font/TextLayout/TextLayoutEqualsTest.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/TextLayoutEqualsTest.java rename to test/jdk/java/awt/font/TextLayout/TextLayoutEqualsTest.java diff --git a/jdk/test/java/awt/font/TextLayout/UnderlinePositionTest.java b/test/jdk/java/awt/font/TextLayout/UnderlinePositionTest.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/UnderlinePositionTest.java rename to test/jdk/java/awt/font/TextLayout/UnderlinePositionTest.java diff --git a/jdk/test/java/awt/font/TextLayout/VisibleAdvance.java b/test/jdk/java/awt/font/TextLayout/VisibleAdvance.java similarity index 100% rename from jdk/test/java/awt/font/TextLayout/VisibleAdvance.java rename to test/jdk/java/awt/font/TextLayout/VisibleAdvance.java diff --git a/jdk/test/java/awt/font/Threads/FontThread.java b/test/jdk/java/awt/font/Threads/FontThread.java similarity index 100% rename from jdk/test/java/awt/font/Threads/FontThread.java rename to test/jdk/java/awt/font/Threads/FontThread.java diff --git a/jdk/test/java/awt/font/TransformAttribute/TransformEqualityTest.java b/test/jdk/java/awt/font/TransformAttribute/TransformEqualityTest.java similarity index 100% rename from jdk/test/java/awt/font/TransformAttribute/TransformEqualityTest.java rename to test/jdk/java/awt/font/TransformAttribute/TransformEqualityTest.java diff --git a/jdk/test/java/awt/font/Underline/UnderlineTest.java b/test/jdk/java/awt/font/Underline/UnderlineTest.java similarity index 100% rename from jdk/test/java/awt/font/Underline/UnderlineTest.java rename to test/jdk/java/awt/font/Underline/UnderlineTest.java diff --git a/jdk/test/java/awt/geom/AffineTransform/GetTypeOptimization.java b/test/jdk/java/awt/geom/AffineTransform/GetTypeOptimization.java similarity index 100% rename from jdk/test/java/awt/geom/AffineTransform/GetTypeOptimization.java rename to test/jdk/java/awt/geom/AffineTransform/GetTypeOptimization.java diff --git a/jdk/test/java/awt/geom/AffineTransform/InvalidTransformParameterTest.java b/test/jdk/java/awt/geom/AffineTransform/InvalidTransformParameterTest.java similarity index 100% rename from jdk/test/java/awt/geom/AffineTransform/InvalidTransformParameterTest.java rename to test/jdk/java/awt/geom/AffineTransform/InvalidTransformParameterTest.java diff --git a/jdk/test/java/awt/geom/AffineTransform/TestInvertMethods.java b/test/jdk/java/awt/geom/AffineTransform/TestInvertMethods.java similarity index 100% rename from jdk/test/java/awt/geom/AffineTransform/TestInvertMethods.java rename to test/jdk/java/awt/geom/AffineTransform/TestInvertMethods.java diff --git a/jdk/test/java/awt/geom/AffineTransform/TestRotateMethods.java b/test/jdk/java/awt/geom/AffineTransform/TestRotateMethods.java similarity index 100% rename from jdk/test/java/awt/geom/AffineTransform/TestRotateMethods.java rename to test/jdk/java/awt/geom/AffineTransform/TestRotateMethods.java diff --git a/jdk/test/java/awt/geom/AffineTransform/TestSerialization.java b/test/jdk/java/awt/geom/AffineTransform/TestSerialization.java similarity index 100% rename from jdk/test/java/awt/geom/AffineTransform/TestSerialization.java rename to test/jdk/java/awt/geom/AffineTransform/TestSerialization.java diff --git a/jdk/test/java/awt/geom/AffineTransform/serial.1.2 b/test/jdk/java/awt/geom/AffineTransform/serial.1.2 similarity index 100% rename from jdk/test/java/awt/geom/AffineTransform/serial.1.2 rename to test/jdk/java/awt/geom/AffineTransform/serial.1.2 diff --git a/jdk/test/java/awt/geom/Arc2D/SerializationTest.java b/test/jdk/java/awt/geom/Arc2D/SerializationTest.java similarity index 100% rename from jdk/test/java/awt/geom/Arc2D/SerializationTest.java rename to test/jdk/java/awt/geom/Arc2D/SerializationTest.java diff --git a/jdk/test/java/awt/geom/CubicCurve2D/ContainsTest.java b/test/jdk/java/awt/geom/CubicCurve2D/ContainsTest.java similarity index 100% rename from jdk/test/java/awt/geom/CubicCurve2D/ContainsTest.java rename to test/jdk/java/awt/geom/CubicCurve2D/ContainsTest.java diff --git a/jdk/test/java/awt/geom/CubicCurve2D/IntersectsTest.java b/test/jdk/java/awt/geom/CubicCurve2D/IntersectsTest.java similarity index 100% rename from jdk/test/java/awt/geom/CubicCurve2D/IntersectsTest.java rename to test/jdk/java/awt/geom/CubicCurve2D/IntersectsTest.java diff --git a/jdk/test/java/awt/geom/CubicCurve2D/SolveCubicTest.java b/test/jdk/java/awt/geom/CubicCurve2D/SolveCubicTest.java similarity index 100% rename from jdk/test/java/awt/geom/CubicCurve2D/SolveCubicTest.java rename to test/jdk/java/awt/geom/CubicCurve2D/SolveCubicTest.java diff --git a/jdk/test/java/awt/geom/Path2D/EmptyCapacity.java b/test/jdk/java/awt/geom/Path2D/EmptyCapacity.java similarity index 100% rename from jdk/test/java/awt/geom/Path2D/EmptyCapacity.java rename to test/jdk/java/awt/geom/Path2D/EmptyCapacity.java diff --git a/jdk/test/java/awt/geom/Path2D/FillPPathTest.java b/test/jdk/java/awt/geom/Path2D/FillPPathTest.java similarity index 100% rename from jdk/test/java/awt/geom/Path2D/FillPPathTest.java rename to test/jdk/java/awt/geom/Path2D/FillPPathTest.java diff --git a/jdk/test/java/awt/geom/Path2D/Path2DCopyConstructor.java b/test/jdk/java/awt/geom/Path2D/Path2DCopyConstructor.java similarity index 100% rename from jdk/test/java/awt/geom/Path2D/Path2DCopyConstructor.java rename to test/jdk/java/awt/geom/Path2D/Path2DCopyConstructor.java diff --git a/jdk/test/java/awt/geom/Path2D/Path2DGrow.java b/test/jdk/java/awt/geom/Path2D/Path2DGrow.java similarity index 100% rename from jdk/test/java/awt/geom/Path2D/Path2DGrow.java rename to test/jdk/java/awt/geom/Path2D/Path2DGrow.java diff --git a/jdk/test/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java b/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java similarity index 100% rename from jdk/test/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java rename to test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java diff --git a/jdk/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java b/test/jdk/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java similarity index 100% rename from jdk/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java rename to test/jdk/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java diff --git a/jdk/test/java/awt/grab/MenuDragEvents/MenuDragEvents.html b/test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.html similarity index 100% rename from jdk/test/java/awt/grab/MenuDragEvents/MenuDragEvents.html rename to test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.html diff --git a/jdk/test/java/awt/grab/MenuDragEvents/MenuDragEvents.java b/test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.java similarity index 100% rename from jdk/test/java/awt/grab/MenuDragEvents/MenuDragEvents.java rename to test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.java diff --git a/jdk/test/java/awt/hidpi/properties/HiDPIPropertiesUnixTest.java b/test/jdk/java/awt/hidpi/properties/HiDPIPropertiesUnixTest.java similarity index 100% rename from jdk/test/java/awt/hidpi/properties/HiDPIPropertiesUnixTest.java rename to test/jdk/java/awt/hidpi/properties/HiDPIPropertiesUnixTest.java diff --git a/jdk/test/java/awt/hidpi/properties/HiDPIPropertiesWindowsTest.java b/test/jdk/java/awt/hidpi/properties/HiDPIPropertiesWindowsTest.java similarity index 100% rename from jdk/test/java/awt/hidpi/properties/HiDPIPropertiesWindowsTest.java rename to test/jdk/java/awt/hidpi/properties/HiDPIPropertiesWindowsTest.java diff --git a/jdk/test/java/awt/im/4490692/bug4490692.html b/test/jdk/java/awt/im/4490692/bug4490692.html similarity index 100% rename from jdk/test/java/awt/im/4490692/bug4490692.html rename to test/jdk/java/awt/im/4490692/bug4490692.html diff --git a/jdk/test/java/awt/im/4490692/bug4490692.java b/test/jdk/java/awt/im/4490692/bug4490692.java similarity index 100% rename from jdk/test/java/awt/im/4490692/bug4490692.java rename to test/jdk/java/awt/im/4490692/bug4490692.java diff --git a/jdk/test/java/awt/im/4959409/bug4959409.html b/test/jdk/java/awt/im/4959409/bug4959409.html similarity index 100% rename from jdk/test/java/awt/im/4959409/bug4959409.html rename to test/jdk/java/awt/im/4959409/bug4959409.html diff --git a/jdk/test/java/awt/im/4959409/bug4959409.java b/test/jdk/java/awt/im/4959409/bug4959409.java similarity index 100% rename from jdk/test/java/awt/im/4959409/bug4959409.java rename to test/jdk/java/awt/im/4959409/bug4959409.java diff --git a/jdk/test/java/awt/im/6396526/IMLookAndFeel.java b/test/jdk/java/awt/im/6396526/IMLookAndFeel.java similarity index 100% rename from jdk/test/java/awt/im/6396526/IMLookAndFeel.java rename to test/jdk/java/awt/im/6396526/IMLookAndFeel.java diff --git a/jdk/test/java/awt/im/8041990/bug8041990.java b/test/jdk/java/awt/im/8041990/bug8041990.java similarity index 100% rename from jdk/test/java/awt/im/8041990/bug8041990.java rename to test/jdk/java/awt/im/8041990/bug8041990.java diff --git a/jdk/test/java/awt/im/8132503/bug8132503.html b/test/jdk/java/awt/im/8132503/bug8132503.html similarity index 100% rename from jdk/test/java/awt/im/8132503/bug8132503.html rename to test/jdk/java/awt/im/8132503/bug8132503.html diff --git a/jdk/test/java/awt/im/8132503/bug8132503.java b/test/jdk/java/awt/im/8132503/bug8132503.java similarity index 100% rename from jdk/test/java/awt/im/8132503/bug8132503.java rename to test/jdk/java/awt/im/8132503/bug8132503.java diff --git a/jdk/test/java/awt/im/8148984/bug8148984.html b/test/jdk/java/awt/im/8148984/bug8148984.html similarity index 100% rename from jdk/test/java/awt/im/8148984/bug8148984.html rename to test/jdk/java/awt/im/8148984/bug8148984.html diff --git a/jdk/test/java/awt/im/8148984/bug8148984.java b/test/jdk/java/awt/im/8148984/bug8148984.java similarity index 100% rename from jdk/test/java/awt/im/8148984/bug8148984.java rename to test/jdk/java/awt/im/8148984/bug8148984.java diff --git a/jdk/test/java/awt/im/8154816/bug8154816.html b/test/jdk/java/awt/im/8154816/bug8154816.html similarity index 100% rename from jdk/test/java/awt/im/8154816/bug8154816.html rename to test/jdk/java/awt/im/8154816/bug8154816.html diff --git a/jdk/test/java/awt/im/8154816/bug8154816.java b/test/jdk/java/awt/im/8154816/bug8154816.java similarity index 100% rename from jdk/test/java/awt/im/8154816/bug8154816.java rename to test/jdk/java/awt/im/8154816/bug8154816.java diff --git a/jdk/test/java/awt/im/Headless/HeadlessInputContext.java b/test/jdk/java/awt/im/Headless/HeadlessInputContext.java similarity index 100% rename from jdk/test/java/awt/im/Headless/HeadlessInputContext.java rename to test/jdk/java/awt/im/Headless/HeadlessInputContext.java diff --git a/jdk/test/java/awt/im/Headless/HeadlessInputMethodHighlight.java b/test/jdk/java/awt/im/Headless/HeadlessInputMethodHighlight.java similarity index 100% rename from jdk/test/java/awt/im/Headless/HeadlessInputMethodHighlight.java rename to test/jdk/java/awt/im/Headless/HeadlessInputMethodHighlight.java diff --git a/jdk/test/java/awt/im/InputContext/InputContextTest.java b/test/jdk/java/awt/im/InputContext/InputContextTest.java similarity index 100% rename from jdk/test/java/awt/im/InputContext/InputContextTest.java rename to test/jdk/java/awt/im/InputContext/InputContextTest.java diff --git a/jdk/test/java/awt/im/InputContext/bug4625203.java b/test/jdk/java/awt/im/InputContext/bug4625203.java similarity index 100% rename from jdk/test/java/awt/im/InputContext/bug4625203.java rename to test/jdk/java/awt/im/InputContext/bug4625203.java diff --git a/jdk/test/java/awt/im/JTextFieldTest.html b/test/jdk/java/awt/im/JTextFieldTest.html similarity index 100% rename from jdk/test/java/awt/im/JTextFieldTest.html rename to test/jdk/java/awt/im/JTextFieldTest.html diff --git a/jdk/test/java/awt/im/JTextFieldTest.java b/test/jdk/java/awt/im/JTextFieldTest.java similarity index 100% rename from jdk/test/java/awt/im/JTextFieldTest.java rename to test/jdk/java/awt/im/JTextFieldTest.java diff --git a/jdk/test/java/awt/im/memoryleak/InputContextMemoryLeakTest.java b/test/jdk/java/awt/im/memoryleak/InputContextMemoryLeakTest.java similarity index 100% rename from jdk/test/java/awt/im/memoryleak/InputContextMemoryLeakTest.java rename to test/jdk/java/awt/im/memoryleak/InputContextMemoryLeakTest.java diff --git a/jdk/test/java/awt/image/BufferedImage/GetPropertyNames.java b/test/jdk/java/awt/image/BufferedImage/GetPropertyNames.java similarity index 100% rename from jdk/test/java/awt/image/BufferedImage/GetPropertyNames.java rename to test/jdk/java/awt/image/BufferedImage/GetPropertyNames.java diff --git a/jdk/test/java/awt/image/BufferedImage/TinyScale.java b/test/jdk/java/awt/image/BufferedImage/TinyScale.java similarity index 100% rename from jdk/test/java/awt/image/BufferedImage/TinyScale.java rename to test/jdk/java/awt/image/BufferedImage/TinyScale.java diff --git a/jdk/test/java/awt/image/ColorModel/EqualsTest.java b/test/jdk/java/awt/image/ColorModel/EqualsTest.java similarity index 100% rename from jdk/test/java/awt/image/ColorModel/EqualsTest.java rename to test/jdk/java/awt/image/ColorModel/EqualsTest.java diff --git a/jdk/test/java/awt/image/ComponentColorModel/ComponentColorModelEqualsTest.java b/test/jdk/java/awt/image/ComponentColorModel/ComponentColorModelEqualsTest.java similarity index 100% rename from jdk/test/java/awt/image/ComponentColorModel/ComponentColorModelEqualsTest.java rename to test/jdk/java/awt/image/ComponentColorModel/ComponentColorModelEqualsTest.java diff --git a/jdk/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java b/test/jdk/java/awt/image/ConvolveOp/EdgeNoOpCrash.java similarity index 100% rename from jdk/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java rename to test/jdk/java/awt/image/ConvolveOp/EdgeNoOpCrash.java diff --git a/jdk/test/java/awt/image/ConvolveOp/OpCompatibleImageTest.java b/test/jdk/java/awt/image/ConvolveOp/OpCompatibleImageTest.java similarity index 100% rename from jdk/test/java/awt/image/ConvolveOp/OpCompatibleImageTest.java rename to test/jdk/java/awt/image/ConvolveOp/OpCompatibleImageTest.java diff --git a/jdk/test/java/awt/image/DrawImage/DrawImageCoordsTest.java b/test/jdk/java/awt/image/DrawImage/DrawImageCoordsTest.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/DrawImageCoordsTest.java rename to test/jdk/java/awt/image/DrawImage/DrawImageCoordsTest.java diff --git a/jdk/test/java/awt/image/DrawImage/EABlitTest.java b/test/jdk/java/awt/image/DrawImage/EABlitTest.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/EABlitTest.java rename to test/jdk/java/awt/image/DrawImage/EABlitTest.java diff --git a/jdk/test/java/awt/image/DrawImage/IncorrectAlphaConversionBicubic.java b/test/jdk/java/awt/image/DrawImage/IncorrectAlphaConversionBicubic.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/IncorrectAlphaConversionBicubic.java rename to test/jdk/java/awt/image/DrawImage/IncorrectAlphaConversionBicubic.java diff --git a/jdk/test/java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java b/test/jdk/java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java rename to test/jdk/java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java diff --git a/jdk/test/java/awt/image/DrawImage/IncorrectBounds.java b/test/jdk/java/awt/image/DrawImage/IncorrectBounds.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/IncorrectBounds.java rename to test/jdk/java/awt/image/DrawImage/IncorrectBounds.java diff --git a/jdk/test/java/awt/image/DrawImage/IncorrectClipSurface2SW.java b/test/jdk/java/awt/image/DrawImage/IncorrectClipSurface2SW.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/IncorrectClipSurface2SW.java rename to test/jdk/java/awt/image/DrawImage/IncorrectClipSurface2SW.java diff --git a/jdk/test/java/awt/image/DrawImage/IncorrectClipXorModeSW2Surface.java b/test/jdk/java/awt/image/DrawImage/IncorrectClipXorModeSW2Surface.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/IncorrectClipXorModeSW2Surface.java rename to test/jdk/java/awt/image/DrawImage/IncorrectClipXorModeSW2Surface.java diff --git a/jdk/test/java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java b/test/jdk/java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java rename to test/jdk/java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java diff --git a/jdk/test/java/awt/image/DrawImage/IncorrectDestinationOffset.java b/test/jdk/java/awt/image/DrawImage/IncorrectDestinationOffset.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/IncorrectDestinationOffset.java rename to test/jdk/java/awt/image/DrawImage/IncorrectDestinationOffset.java diff --git a/jdk/test/java/awt/image/DrawImage/IncorrectOffset.java b/test/jdk/java/awt/image/DrawImage/IncorrectOffset.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/IncorrectOffset.java rename to test/jdk/java/awt/image/DrawImage/IncorrectOffset.java diff --git a/jdk/test/java/awt/image/DrawImage/IncorrectSourceOffset.java b/test/jdk/java/awt/image/DrawImage/IncorrectSourceOffset.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/IncorrectSourceOffset.java rename to test/jdk/java/awt/image/DrawImage/IncorrectSourceOffset.java diff --git a/jdk/test/java/awt/image/DrawImage/IncorrectUnmanagedImageRotatedClip.java b/test/jdk/java/awt/image/DrawImage/IncorrectUnmanagedImageRotatedClip.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/IncorrectUnmanagedImageRotatedClip.java rename to test/jdk/java/awt/image/DrawImage/IncorrectUnmanagedImageRotatedClip.java diff --git a/jdk/test/java/awt/image/DrawImage/IncorrectUnmanagedImageSourceOffset.java b/test/jdk/java/awt/image/DrawImage/IncorrectUnmanagedImageSourceOffset.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/IncorrectUnmanagedImageSourceOffset.java rename to test/jdk/java/awt/image/DrawImage/IncorrectUnmanagedImageSourceOffset.java diff --git a/jdk/test/java/awt/image/DrawImage/ScaledImageAlphaTest.java b/test/jdk/java/awt/image/DrawImage/ScaledImageAlphaTest.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/ScaledImageAlphaTest.java rename to test/jdk/java/awt/image/DrawImage/ScaledImageAlphaTest.java diff --git a/jdk/test/java/awt/image/DrawImage/UnmanagedDrawImagePerformance.java b/test/jdk/java/awt/image/DrawImage/UnmanagedDrawImagePerformance.java similarity index 100% rename from jdk/test/java/awt/image/DrawImage/UnmanagedDrawImagePerformance.java rename to test/jdk/java/awt/image/DrawImage/UnmanagedDrawImagePerformance.java diff --git a/jdk/test/java/awt/image/GetDataElementsTest.java b/test/jdk/java/awt/image/GetDataElementsTest.java similarity index 100% rename from jdk/test/java/awt/image/GetDataElementsTest.java rename to test/jdk/java/awt/image/GetDataElementsTest.java diff --git a/jdk/test/java/awt/image/GetSamplesTest.java b/test/jdk/java/awt/image/GetSamplesTest.java similarity index 100% rename from jdk/test/java/awt/image/GetSamplesTest.java rename to test/jdk/java/awt/image/GetSamplesTest.java diff --git a/jdk/test/java/awt/image/Headless/HeadlessAffineTransformOp.java b/test/jdk/java/awt/image/Headless/HeadlessAffineTransformOp.java similarity index 100% rename from jdk/test/java/awt/image/Headless/HeadlessAffineTransformOp.java rename to test/jdk/java/awt/image/Headless/HeadlessAffineTransformOp.java diff --git a/jdk/test/java/awt/image/Headless/HeadlessAreaAveragingScaleFilter.java b/test/jdk/java/awt/image/Headless/HeadlessAreaAveragingScaleFilter.java similarity index 100% rename from jdk/test/java/awt/image/Headless/HeadlessAreaAveragingScaleFilter.java rename to test/jdk/java/awt/image/Headless/HeadlessAreaAveragingScaleFilter.java diff --git a/jdk/test/java/awt/image/Headless/HeadlessBufferedImage.java b/test/jdk/java/awt/image/Headless/HeadlessBufferedImage.java similarity index 100% rename from jdk/test/java/awt/image/Headless/HeadlessBufferedImage.java rename to test/jdk/java/awt/image/Headless/HeadlessBufferedImage.java diff --git a/jdk/test/java/awt/image/Headless/HeadlessBufferedImageFilter.java b/test/jdk/java/awt/image/Headless/HeadlessBufferedImageFilter.java similarity index 100% rename from jdk/test/java/awt/image/Headless/HeadlessBufferedImageFilter.java rename to test/jdk/java/awt/image/Headless/HeadlessBufferedImageFilter.java diff --git a/jdk/test/java/awt/image/Headless/HeadlessColorModel.java b/test/jdk/java/awt/image/Headless/HeadlessColorModel.java similarity index 100% rename from jdk/test/java/awt/image/Headless/HeadlessColorModel.java rename to test/jdk/java/awt/image/Headless/HeadlessColorModel.java diff --git a/jdk/test/java/awt/image/Headless/HeadlessCropImageFilter.java b/test/jdk/java/awt/image/Headless/HeadlessCropImageFilter.java similarity index 100% rename from jdk/test/java/awt/image/Headless/HeadlessCropImageFilter.java rename to test/jdk/java/awt/image/Headless/HeadlessCropImageFilter.java diff --git a/jdk/test/java/awt/image/Headless/HeadlessImageFilter.java b/test/jdk/java/awt/image/Headless/HeadlessImageFilter.java similarity index 100% rename from jdk/test/java/awt/image/Headless/HeadlessImageFilter.java rename to test/jdk/java/awt/image/Headless/HeadlessImageFilter.java diff --git a/jdk/test/java/awt/image/Headless/HeadlessIndexColorModel.java b/test/jdk/java/awt/image/Headless/HeadlessIndexColorModel.java similarity index 100% rename from jdk/test/java/awt/image/Headless/HeadlessIndexColorModel.java rename to test/jdk/java/awt/image/Headless/HeadlessIndexColorModel.java diff --git a/jdk/test/java/awt/image/Headless/HeadlessRGBImageFilter.java b/test/jdk/java/awt/image/Headless/HeadlessRGBImageFilter.java similarity index 100% rename from jdk/test/java/awt/image/Headless/HeadlessRGBImageFilter.java rename to test/jdk/java/awt/image/Headless/HeadlessRGBImageFilter.java diff --git a/jdk/test/java/awt/image/Headless/HeadlessReplicateScaleFilter.java b/test/jdk/java/awt/image/Headless/HeadlessReplicateScaleFilter.java similarity index 100% rename from jdk/test/java/awt/image/Headless/HeadlessReplicateScaleFilter.java rename to test/jdk/java/awt/image/Headless/HeadlessReplicateScaleFilter.java diff --git a/jdk/test/java/awt/image/ImageIconHang.java b/test/jdk/java/awt/image/ImageIconHang.java similarity index 100% rename from jdk/test/java/awt/image/ImageIconHang.java rename to test/jdk/java/awt/image/ImageIconHang.java diff --git a/jdk/test/java/awt/image/ImagingOpsNoExceptionsTest/ImagingOpsNoExceptionsTest.java b/test/jdk/java/awt/image/ImagingOpsNoExceptionsTest/ImagingOpsNoExceptionsTest.java similarity index 100% rename from jdk/test/java/awt/image/ImagingOpsNoExceptionsTest/ImagingOpsNoExceptionsTest.java rename to test/jdk/java/awt/image/ImagingOpsNoExceptionsTest/ImagingOpsNoExceptionsTest.java diff --git a/jdk/test/java/awt/image/IncorrectSampleMaskTest.java b/test/jdk/java/awt/image/IncorrectSampleMaskTest.java similarity index 100% rename from jdk/test/java/awt/image/IncorrectSampleMaskTest.java rename to test/jdk/java/awt/image/IncorrectSampleMaskTest.java diff --git a/jdk/test/java/awt/image/IndexColorModel/IndexColorModelEqualsTest.java b/test/jdk/java/awt/image/IndexColorModel/IndexColorModelEqualsTest.java similarity index 100% rename from jdk/test/java/awt/image/IndexColorModel/IndexColorModelEqualsTest.java rename to test/jdk/java/awt/image/IndexColorModel/IndexColorModelEqualsTest.java diff --git a/jdk/test/java/awt/image/LookupOp/IntImageReverseTest.java b/test/jdk/java/awt/image/LookupOp/IntImageReverseTest.java similarity index 100% rename from jdk/test/java/awt/image/LookupOp/IntImageReverseTest.java rename to test/jdk/java/awt/image/LookupOp/IntImageReverseTest.java diff --git a/jdk/test/java/awt/image/LookupOp/RasterOpNullDestinationRasterTest.java b/test/jdk/java/awt/image/LookupOp/RasterOpNullDestinationRasterTest.java similarity index 100% rename from jdk/test/java/awt/image/LookupOp/RasterOpNullDestinationRasterTest.java rename to test/jdk/java/awt/image/LookupOp/RasterOpNullDestinationRasterTest.java diff --git a/jdk/test/java/awt/image/LookupOp/SingleArrayTest.java b/test/jdk/java/awt/image/LookupOp/SingleArrayTest.java similarity index 100% rename from jdk/test/java/awt/image/LookupOp/SingleArrayTest.java rename to test/jdk/java/awt/image/LookupOp/SingleArrayTest.java diff --git a/jdk/test/java/awt/image/MemoryLeakTest/MemoryLeakTest.java b/test/jdk/java/awt/image/MemoryLeakTest/MemoryLeakTest.java similarity index 100% rename from jdk/test/java/awt/image/MemoryLeakTest/MemoryLeakTest.java rename to test/jdk/java/awt/image/MemoryLeakTest/MemoryLeakTest.java diff --git a/jdk/test/java/awt/image/MultiResolutionImage/MultiResolutionDisabledImageTest.java b/test/jdk/java/awt/image/MultiResolutionImage/MultiResolutionDisabledImageTest.java similarity index 100% rename from jdk/test/java/awt/image/MultiResolutionImage/MultiResolutionDisabledImageTest.java rename to test/jdk/java/awt/image/MultiResolutionImage/MultiResolutionDisabledImageTest.java diff --git a/jdk/test/java/awt/image/MultiResolutionImage/MultiResolutionDrawImageWithTransformTest.java b/test/jdk/java/awt/image/MultiResolutionImage/MultiResolutionDrawImageWithTransformTest.java similarity index 100% rename from jdk/test/java/awt/image/MultiResolutionImage/MultiResolutionDrawImageWithTransformTest.java rename to test/jdk/java/awt/image/MultiResolutionImage/MultiResolutionDrawImageWithTransformTest.java diff --git a/jdk/test/java/awt/image/MultiResolutionImage/MultiResolutionImageObserverTest.java b/test/jdk/java/awt/image/MultiResolutionImage/MultiResolutionImageObserverTest.java similarity index 100% rename from jdk/test/java/awt/image/MultiResolutionImage/MultiResolutionImageObserverTest.java rename to test/jdk/java/awt/image/MultiResolutionImage/MultiResolutionImageObserverTest.java diff --git a/jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java b/test/jdk/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java similarity index 100% rename from jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java rename to test/jdk/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java diff --git a/jdk/test/java/awt/image/MultiResolutionImageCommonTest.java b/test/jdk/java/awt/image/MultiResolutionImageCommonTest.java similarity index 100% rename from jdk/test/java/awt/image/MultiResolutionImageCommonTest.java rename to test/jdk/java/awt/image/MultiResolutionImageCommonTest.java diff --git a/jdk/test/java/awt/image/MultiResolutionImageTest.java b/test/jdk/java/awt/image/MultiResolutionImageTest.java similarity index 100% rename from jdk/test/java/awt/image/MultiResolutionImageTest.java rename to test/jdk/java/awt/image/MultiResolutionImageTest.java diff --git a/jdk/test/java/awt/image/OpaquePNGToGIFTest.java b/test/jdk/java/awt/image/OpaquePNGToGIFTest.java similarity index 100% rename from jdk/test/java/awt/image/OpaquePNGToGIFTest.java rename to test/jdk/java/awt/image/OpaquePNGToGIFTest.java diff --git a/jdk/test/java/awt/image/PackedColorModel/PackedColorModelEqualsTest.java b/test/jdk/java/awt/image/PackedColorModel/PackedColorModelEqualsTest.java similarity index 100% rename from jdk/test/java/awt/image/PackedColorModel/PackedColorModelEqualsTest.java rename to test/jdk/java/awt/image/PackedColorModel/PackedColorModelEqualsTest.java diff --git a/jdk/test/java/awt/image/Raster/TestChildRasterOp.java b/test/jdk/java/awt/image/Raster/TestChildRasterOp.java similarity index 100% rename from jdk/test/java/awt/image/Raster/TestChildRasterOp.java rename to test/jdk/java/awt/image/Raster/TestChildRasterOp.java diff --git a/jdk/test/java/awt/image/RasterCreationTest.java b/test/jdk/java/awt/image/RasterCreationTest.java similarity index 100% rename from jdk/test/java/awt/image/RasterCreationTest.java rename to test/jdk/java/awt/image/RasterCreationTest.java diff --git a/jdk/test/java/awt/image/RescaleOp/ImageRescaleOpTest.java b/test/jdk/java/awt/image/RescaleOp/ImageRescaleOpTest.java similarity index 100% rename from jdk/test/java/awt/image/RescaleOp/ImageRescaleOpTest.java rename to test/jdk/java/awt/image/RescaleOp/ImageRescaleOpTest.java diff --git a/jdk/test/java/awt/image/RescaleOp/RescaleAlphaTest.java b/test/jdk/java/awt/image/RescaleOp/RescaleAlphaTest.java similarity index 100% rename from jdk/test/java/awt/image/RescaleOp/RescaleAlphaTest.java rename to test/jdk/java/awt/image/RescaleOp/RescaleAlphaTest.java diff --git a/jdk/test/java/awt/image/SampleModelConstructorTest.java b/test/jdk/java/awt/image/SampleModelConstructorTest.java similarity index 100% rename from jdk/test/java/awt/image/SampleModelConstructorTest.java rename to test/jdk/java/awt/image/SampleModelConstructorTest.java diff --git a/jdk/test/java/awt/image/VolatileImage/BitmaskVolatileImage.java b/test/jdk/java/awt/image/VolatileImage/BitmaskVolatileImage.java similarity index 100% rename from jdk/test/java/awt/image/VolatileImage/BitmaskVolatileImage.java rename to test/jdk/java/awt/image/VolatileImage/BitmaskVolatileImage.java diff --git a/jdk/test/java/awt/image/VolatileImage/TransparentVImage.java b/test/jdk/java/awt/image/VolatileImage/TransparentVImage.java similarity index 100% rename from jdk/test/java/awt/image/VolatileImage/TransparentVImage.java rename to test/jdk/java/awt/image/VolatileImage/TransparentVImage.java diff --git a/jdk/test/java/awt/image/VolatileImage/VolatileImageBug.java b/test/jdk/java/awt/image/VolatileImage/VolatileImageBug.java similarity index 100% rename from jdk/test/java/awt/image/VolatileImage/VolatileImageBug.java rename to test/jdk/java/awt/image/VolatileImage/VolatileImageBug.java diff --git a/jdk/test/java/awt/image/VolatileImage/VolatileImageConfigurationTest.java b/test/jdk/java/awt/image/VolatileImage/VolatileImageConfigurationTest.java similarity index 100% rename from jdk/test/java/awt/image/VolatileImage/VolatileImageConfigurationTest.java rename to test/jdk/java/awt/image/VolatileImage/VolatileImageConfigurationTest.java diff --git a/jdk/test/java/awt/image/VolatileImage/duke.gif b/test/jdk/java/awt/image/VolatileImage/duke.gif similarity index 100% rename from jdk/test/java/awt/image/VolatileImage/duke.gif rename to test/jdk/java/awt/image/VolatileImage/duke.gif diff --git a/jdk/test/java/awt/image/mlib/MlibOpsTest.java b/test/jdk/java/awt/image/mlib/MlibOpsTest.java similarity index 100% rename from jdk/test/java/awt/image/mlib/MlibOpsTest.java rename to test/jdk/java/awt/image/mlib/MlibOpsTest.java diff --git a/jdk/test/java/awt/image/mlib/mlib.security.policy b/test/jdk/java/awt/image/mlib/mlib.security.policy similarity index 100% rename from jdk/test/java/awt/image/mlib/mlib.security.policy rename to test/jdk/java/awt/image/mlib/mlib.security.policy diff --git a/jdk/test/java/awt/image/multiresolution/BaseMultiResolutionImageTest.java b/test/jdk/java/awt/image/multiresolution/BaseMultiResolutionImageTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/BaseMultiResolutionImageTest.java rename to test/jdk/java/awt/image/multiresolution/BaseMultiResolutionImageTest.java diff --git a/jdk/test/java/awt/image/multiresolution/Corrupted2XImageTest.java b/test/jdk/java/awt/image/multiresolution/Corrupted2XImageTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/Corrupted2XImageTest.java rename to test/jdk/java/awt/image/multiresolution/Corrupted2XImageTest.java diff --git a/jdk/test/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java b/test/jdk/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java rename to test/jdk/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java diff --git a/jdk/test/java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.html b/test/jdk/java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.html similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.html rename to test/jdk/java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.html diff --git a/jdk/test/java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.java b/test/jdk/java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.java rename to test/jdk/java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.java diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionCachedImageTest.java b/test/jdk/java/awt/image/multiresolution/MultiResolutionCachedImageTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MultiResolutionCachedImageTest.java rename to test/jdk/java/awt/image/multiresolution/MultiResolutionCachedImageTest.java diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionIcon/IconTest.java b/test/jdk/java/awt/image/multiresolution/MultiResolutionIcon/IconTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MultiResolutionIcon/IconTest.java rename to test/jdk/java/awt/image/multiresolution/MultiResolutionIcon/IconTest.java diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionIcon/MultiResIconTest.java b/test/jdk/java/awt/image/multiresolution/MultiResolutionIcon/MultiResIconTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MultiResolutionIcon/MultiResIconTest.java rename to test/jdk/java/awt/image/multiresolution/MultiResolutionIcon/MultiResIconTest.java diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionImagePropertiesTest.java b/test/jdk/java/awt/image/multiresolution/MultiResolutionImagePropertiesTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MultiResolutionImagePropertiesTest.java rename to test/jdk/java/awt/image/multiresolution/MultiResolutionImagePropertiesTest.java diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java b/test/jdk/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java rename to test/jdk/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionRenderingHintsTest.java b/test/jdk/java/awt/image/multiresolution/MultiResolutionRenderingHintsTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MultiResolutionRenderingHintsTest.java rename to test/jdk/java/awt/image/multiresolution/MultiResolutionRenderingHintsTest.java diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java b/test/jdk/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java rename to test/jdk/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionTrayIconTest/MultiResolutionTrayIconTest.java b/test/jdk/java/awt/image/multiresolution/MultiResolutionTrayIconTest/MultiResolutionTrayIconTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MultiResolutionTrayIconTest/MultiResolutionTrayIconTest.java rename to test/jdk/java/awt/image/multiresolution/MultiResolutionTrayIconTest/MultiResolutionTrayIconTest.java diff --git a/jdk/test/java/awt/image/multiresolution/MultiresolutionIconTest.java b/test/jdk/java/awt/image/multiresolution/MultiresolutionIconTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MultiresolutionIconTest.java rename to test/jdk/java/awt/image/multiresolution/MultiresolutionIconTest.java diff --git a/jdk/test/java/awt/image/multiresolution/MultiresolutionSourceTest.java b/test/jdk/java/awt/image/multiresolution/MultiresolutionSourceTest.java similarity index 100% rename from jdk/test/java/awt/image/multiresolution/MultiresolutionSourceTest.java rename to test/jdk/java/awt/image/multiresolution/MultiresolutionSourceTest.java diff --git a/jdk/test/java/awt/image/opaque_input.png b/test/jdk/java/awt/image/opaque_input.png similarity index 100% rename from jdk/test/java/awt/image/opaque_input.png rename to test/jdk/java/awt/image/opaque_input.png diff --git a/jdk/test/java/awt/keyboard/AllKeyCode/AllKeyCode.java b/test/jdk/java/awt/keyboard/AllKeyCode/AllKeyCode.java similarity index 100% rename from jdk/test/java/awt/keyboard/AllKeyCode/AllKeyCode.java rename to test/jdk/java/awt/keyboard/AllKeyCode/AllKeyCode.java diff --git a/jdk/test/java/awt/keyboard/AltPlusNumberKeyCombinationsTest/AltPlusNumberKeyCombinationsTest.java b/test/jdk/java/awt/keyboard/AltPlusNumberKeyCombinationsTest/AltPlusNumberKeyCombinationsTest.java similarity index 100% rename from jdk/test/java/awt/keyboard/AltPlusNumberKeyCombinationsTest/AltPlusNumberKeyCombinationsTest.java rename to test/jdk/java/awt/keyboard/AltPlusNumberKeyCombinationsTest/AltPlusNumberKeyCombinationsTest.java diff --git a/jdk/test/java/awt/keyboard/Bug8158478/Test8158478.java b/test/jdk/java/awt/keyboard/Bug8158478/Test8158478.java similarity index 100% rename from jdk/test/java/awt/keyboard/Bug8158478/Test8158478.java rename to test/jdk/java/awt/keyboard/Bug8158478/Test8158478.java diff --git a/jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java b/test/jdk/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java similarity index 100% rename from jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java rename to test/jdk/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java diff --git a/jdk/test/java/awt/patchlib/java.desktop/java/awt/Helper.java b/test/jdk/java/awt/patchlib/java.desktop/java/awt/Helper.java similarity index 100% rename from jdk/test/java/awt/patchlib/java.desktop/java/awt/Helper.java rename to test/jdk/java/awt/patchlib/java.desktop/java/awt/Helper.java diff --git a/jdk/test/java/awt/print/Dialog/DestinationTest.java b/test/jdk/java/awt/print/Dialog/DestinationTest.java similarity index 100% rename from jdk/test/java/awt/print/Dialog/DestinationTest.java rename to test/jdk/java/awt/print/Dialog/DestinationTest.java diff --git a/jdk/test/java/awt/print/Dialog/DialogCopies.java b/test/jdk/java/awt/print/Dialog/DialogCopies.java similarity index 100% rename from jdk/test/java/awt/print/Dialog/DialogCopies.java rename to test/jdk/java/awt/print/Dialog/DialogCopies.java diff --git a/jdk/test/java/awt/print/Dialog/DialogOrient.java b/test/jdk/java/awt/print/Dialog/DialogOrient.java similarity index 100% rename from jdk/test/java/awt/print/Dialog/DialogOrient.java rename to test/jdk/java/awt/print/Dialog/DialogOrient.java diff --git a/jdk/test/java/awt/print/Dialog/DialogType.java b/test/jdk/java/awt/print/Dialog/DialogType.java similarity index 100% rename from jdk/test/java/awt/print/Dialog/DialogType.java rename to test/jdk/java/awt/print/Dialog/DialogType.java diff --git a/jdk/test/java/awt/print/Dialog/MediaInPrintable.java b/test/jdk/java/awt/print/Dialog/MediaInPrintable.java similarity index 100% rename from jdk/test/java/awt/print/Dialog/MediaInPrintable.java rename to test/jdk/java/awt/print/Dialog/MediaInPrintable.java diff --git a/jdk/test/java/awt/print/Dialog/PaperSizeError.java b/test/jdk/java/awt/print/Dialog/PaperSizeError.java similarity index 100% rename from jdk/test/java/awt/print/Dialog/PaperSizeError.java rename to test/jdk/java/awt/print/Dialog/PaperSizeError.java diff --git a/jdk/test/java/awt/print/Dialog/PrintApplet.html b/test/jdk/java/awt/print/Dialog/PrintApplet.html similarity index 100% rename from jdk/test/java/awt/print/Dialog/PrintApplet.html rename to test/jdk/java/awt/print/Dialog/PrintApplet.html diff --git a/jdk/test/java/awt/print/Dialog/PrintApplet.java b/test/jdk/java/awt/print/Dialog/PrintApplet.java similarity index 100% rename from jdk/test/java/awt/print/Dialog/PrintApplet.java rename to test/jdk/java/awt/print/Dialog/PrintApplet.java diff --git a/jdk/test/java/awt/print/Dialog/PrintDialog.java b/test/jdk/java/awt/print/Dialog/PrintDialog.java similarity index 100% rename from jdk/test/java/awt/print/Dialog/PrintDialog.java rename to test/jdk/java/awt/print/Dialog/PrintDialog.java diff --git a/jdk/test/java/awt/print/Dialog/PrintDlgApp.java b/test/jdk/java/awt/print/Dialog/PrintDlgApp.java similarity index 100% rename from jdk/test/java/awt/print/Dialog/PrintDlgApp.java rename to test/jdk/java/awt/print/Dialog/PrintDlgApp.java diff --git a/jdk/test/java/awt/print/Dialog/PrintDlgPageable.java b/test/jdk/java/awt/print/Dialog/PrintDlgPageable.java similarity index 100% rename from jdk/test/java/awt/print/Dialog/PrintDlgPageable.java rename to test/jdk/java/awt/print/Dialog/PrintDlgPageable.java diff --git a/jdk/test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.java b/test/jdk/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.java similarity index 100% rename from jdk/test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.java rename to test/jdk/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.java diff --git a/jdk/test/java/awt/print/Headless/HeadlessBook.java b/test/jdk/java/awt/print/Headless/HeadlessBook.java similarity index 100% rename from jdk/test/java/awt/print/Headless/HeadlessBook.java rename to test/jdk/java/awt/print/Headless/HeadlessBook.java diff --git a/jdk/test/java/awt/print/Headless/HeadlessPageFormat.java b/test/jdk/java/awt/print/Headless/HeadlessPageFormat.java similarity index 100% rename from jdk/test/java/awt/print/Headless/HeadlessPageFormat.java rename to test/jdk/java/awt/print/Headless/HeadlessPageFormat.java diff --git a/jdk/test/java/awt/print/Headless/HeadlessPaper.java b/test/jdk/java/awt/print/Headless/HeadlessPaper.java similarity index 100% rename from jdk/test/java/awt/print/Headless/HeadlessPaper.java rename to test/jdk/java/awt/print/Headless/HeadlessPaper.java diff --git a/jdk/test/java/awt/print/Headless/HeadlessPrinterJob.java b/test/jdk/java/awt/print/Headless/HeadlessPrinterJob.java similarity index 100% rename from jdk/test/java/awt/print/Headless/HeadlessPrinterJob.java rename to test/jdk/java/awt/print/Headless/HeadlessPrinterJob.java diff --git a/jdk/test/java/awt/print/PageFormat/CustomPaper.java b/test/jdk/java/awt/print/PageFormat/CustomPaper.java similarity index 100% rename from jdk/test/java/awt/print/PageFormat/CustomPaper.java rename to test/jdk/java/awt/print/PageFormat/CustomPaper.java diff --git a/jdk/test/java/awt/print/PageFormat/ImageableAreaTest.java b/test/jdk/java/awt/print/PageFormat/ImageableAreaTest.java similarity index 100% rename from jdk/test/java/awt/print/PageFormat/ImageableAreaTest.java rename to test/jdk/java/awt/print/PageFormat/ImageableAreaTest.java diff --git a/jdk/test/java/awt/print/PageFormat/NullPaper.java b/test/jdk/java/awt/print/PageFormat/NullPaper.java similarity index 100% rename from jdk/test/java/awt/print/PageFormat/NullPaper.java rename to test/jdk/java/awt/print/PageFormat/NullPaper.java diff --git a/jdk/test/java/awt/print/PageFormat/Orient.java b/test/jdk/java/awt/print/PageFormat/Orient.java similarity index 100% rename from jdk/test/java/awt/print/PageFormat/Orient.java rename to test/jdk/java/awt/print/PageFormat/Orient.java diff --git a/jdk/test/java/awt/print/PageFormat/PDialogTest.java b/test/jdk/java/awt/print/PageFormat/PDialogTest.java similarity index 100% rename from jdk/test/java/awt/print/PageFormat/PDialogTest.java rename to test/jdk/java/awt/print/PageFormat/PDialogTest.java diff --git a/jdk/test/java/awt/print/PageFormat/PageFormatFromAttributes.java b/test/jdk/java/awt/print/PageFormat/PageFormatFromAttributes.java similarity index 100% rename from jdk/test/java/awt/print/PageFormat/PageFormatFromAttributes.java rename to test/jdk/java/awt/print/PageFormat/PageFormatFromAttributes.java diff --git a/jdk/test/java/awt/print/PageFormat/PageSetupDialog.java b/test/jdk/java/awt/print/PageFormat/PageSetupDialog.java similarity index 100% rename from jdk/test/java/awt/print/PageFormat/PageSetupDialog.java rename to test/jdk/java/awt/print/PageFormat/PageSetupDialog.java diff --git a/jdk/test/java/awt/print/PageFormat/ReverseLandscapeTest.java b/test/jdk/java/awt/print/PageFormat/ReverseLandscapeTest.java similarity index 100% rename from jdk/test/java/awt/print/PageFormat/ReverseLandscapeTest.java rename to test/jdk/java/awt/print/PageFormat/ReverseLandscapeTest.java diff --git a/jdk/test/java/awt/print/PageFormat/SetOrient.html b/test/jdk/java/awt/print/PageFormat/SetOrient.html similarity index 100% rename from jdk/test/java/awt/print/PageFormat/SetOrient.html rename to test/jdk/java/awt/print/PageFormat/SetOrient.html diff --git a/jdk/test/java/awt/print/PageFormat/SetOrient.java b/test/jdk/java/awt/print/PageFormat/SetOrient.java similarity index 100% rename from jdk/test/java/awt/print/PageFormat/SetOrient.java rename to test/jdk/java/awt/print/PageFormat/SetOrient.java diff --git a/jdk/test/java/awt/print/PageFormat/SmallPaperPrinting.java b/test/jdk/java/awt/print/PageFormat/SmallPaperPrinting.java similarity index 100% rename from jdk/test/java/awt/print/PageFormat/SmallPaperPrinting.java rename to test/jdk/java/awt/print/PageFormat/SmallPaperPrinting.java diff --git a/jdk/test/java/awt/print/PageFormat/ValidateCustom.java b/test/jdk/java/awt/print/PageFormat/ValidateCustom.java similarity index 100% rename from jdk/test/java/awt/print/PageFormat/ValidateCustom.java rename to test/jdk/java/awt/print/PageFormat/ValidateCustom.java diff --git a/jdk/test/java/awt/print/PageFormat/WrongPaperPrintingTest.java b/test/jdk/java/awt/print/PageFormat/WrongPaperPrintingTest.java similarity index 100% rename from jdk/test/java/awt/print/PageFormat/WrongPaperPrintingTest.java rename to test/jdk/java/awt/print/PageFormat/WrongPaperPrintingTest.java diff --git a/jdk/test/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java b/test/jdk/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java similarity index 100% rename from jdk/test/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java rename to test/jdk/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java diff --git a/jdk/test/java/awt/print/PrinterJob/BannerTest.java b/test/jdk/java/awt/print/PrinterJob/BannerTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/BannerTest.java rename to test/jdk/java/awt/print/PrinterJob/BannerTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/Cancel/PrinterJobCancel.java b/test/jdk/java/awt/print/PrinterJob/Cancel/PrinterJobCancel.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/Cancel/PrinterJobCancel.java rename to test/jdk/java/awt/print/PrinterJob/Cancel/PrinterJobCancel.java diff --git a/jdk/test/java/awt/print/PrinterJob/CheckAccess.java b/test/jdk/java/awt/print/PrinterJob/CheckAccess.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/CheckAccess.java rename to test/jdk/java/awt/print/PrinterJob/CheckAccess.java diff --git a/jdk/test/java/awt/print/PrinterJob/CheckPrivilege.java b/test/jdk/java/awt/print/PrinterJob/CheckPrivilege.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/CheckPrivilege.java rename to test/jdk/java/awt/print/PrinterJob/CheckPrivilege.java diff --git a/jdk/test/java/awt/print/PrinterJob/Collate2DPrintingTest.java b/test/jdk/java/awt/print/PrinterJob/Collate2DPrintingTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/Collate2DPrintingTest.java rename to test/jdk/java/awt/print/PrinterJob/Collate2DPrintingTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/CompareImageable.java b/test/jdk/java/awt/print/PrinterJob/CompareImageable.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/CompareImageable.java rename to test/jdk/java/awt/print/PrinterJob/CompareImageable.java diff --git a/jdk/test/java/awt/print/PrinterJob/CustomFont/A.ttf b/test/jdk/java/awt/print/PrinterJob/CustomFont/A.ttf similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/CustomFont/A.ttf rename to test/jdk/java/awt/print/PrinterJob/CustomFont/A.ttf diff --git a/jdk/test/java/awt/print/PrinterJob/CustomFont/CustomFont.java b/test/jdk/java/awt/print/PrinterJob/CustomFont/CustomFont.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/CustomFont/CustomFont.java rename to test/jdk/java/awt/print/PrinterJob/CustomFont/CustomFont.java diff --git a/jdk/test/java/awt/print/PrinterJob/CustomPrintService/PrintDialog.java b/test/jdk/java/awt/print/PrinterJob/CustomPrintService/PrintDialog.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/CustomPrintService/PrintDialog.java rename to test/jdk/java/awt/print/PrinterJob/CustomPrintService/PrintDialog.java diff --git a/jdk/test/java/awt/print/PrinterJob/CustomPrintService/PrintServiceStub.java b/test/jdk/java/awt/print/PrinterJob/CustomPrintService/PrintServiceStub.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/CustomPrintService/PrintServiceStub.java rename to test/jdk/java/awt/print/PrinterJob/CustomPrintService/PrintServiceStub.java diff --git a/jdk/test/java/awt/print/PrinterJob/CustomPrintService/SetPrintServiceTest.java b/test/jdk/java/awt/print/PrinterJob/CustomPrintService/SetPrintServiceTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/CustomPrintService/SetPrintServiceTest.java rename to test/jdk/java/awt/print/PrinterJob/CustomPrintService/SetPrintServiceTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/DeviceScale.java b/test/jdk/java/awt/print/PrinterJob/DeviceScale.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/DeviceScale.java rename to test/jdk/java/awt/print/PrinterJob/DeviceScale.java diff --git a/jdk/test/java/awt/print/PrinterJob/DlgAttrsBug.java b/test/jdk/java/awt/print/PrinterJob/DlgAttrsBug.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/DlgAttrsBug.java rename to test/jdk/java/awt/print/PrinterJob/DlgAttrsBug.java diff --git a/jdk/test/java/awt/print/PrinterJob/DrawImage.java b/test/jdk/java/awt/print/PrinterJob/DrawImage.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/DrawImage.java rename to test/jdk/java/awt/print/PrinterJob/DrawImage.java diff --git a/jdk/test/java/awt/print/PrinterJob/DrawStringMethods.java b/test/jdk/java/awt/print/PrinterJob/DrawStringMethods.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/DrawStringMethods.java rename to test/jdk/java/awt/print/PrinterJob/DrawStringMethods.java diff --git a/jdk/test/java/awt/print/PrinterJob/DummyPrintTest.java b/test/jdk/java/awt/print/PrinterJob/DummyPrintTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/DummyPrintTest.java rename to test/jdk/java/awt/print/PrinterJob/DummyPrintTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/EmptyFill.java b/test/jdk/java/awt/print/PrinterJob/EmptyFill.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/EmptyFill.java rename to test/jdk/java/awt/print/PrinterJob/EmptyFill.java diff --git a/jdk/test/java/awt/print/PrinterJob/ExceptionTest.java b/test/jdk/java/awt/print/PrinterJob/ExceptionTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/ExceptionTest.java rename to test/jdk/java/awt/print/PrinterJob/ExceptionTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/GetMediasTest.java b/test/jdk/java/awt/print/PrinterJob/GetMediasTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/GetMediasTest.java rename to test/jdk/java/awt/print/PrinterJob/GetMediasTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/GetUserNameTest.java b/test/jdk/java/awt/print/PrinterJob/GetUserNameTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/GetUserNameTest.java rename to test/jdk/java/awt/print/PrinterJob/GetUserNameTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/GetUserNameTest.policy b/test/jdk/java/awt/print/PrinterJob/GetUserNameTest.policy similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/GetUserNameTest.policy rename to test/jdk/java/awt/print/PrinterJob/GetUserNameTest.policy diff --git a/jdk/test/java/awt/print/PrinterJob/GlyphPositions.java b/test/jdk/java/awt/print/PrinterJob/GlyphPositions.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/GlyphPositions.java rename to test/jdk/java/awt/print/PrinterJob/GlyphPositions.java diff --git a/jdk/test/java/awt/print/PrinterJob/HeadlessPrintingTest.java b/test/jdk/java/awt/print/PrinterJob/HeadlessPrintingTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/HeadlessPrintingTest.java rename to test/jdk/java/awt/print/PrinterJob/HeadlessPrintingTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/ImagePrinting/ClippedImages.java b/test/jdk/java/awt/print/PrinterJob/ImagePrinting/ClippedImages.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/ImagePrinting/ClippedImages.java rename to test/jdk/java/awt/print/PrinterJob/ImagePrinting/ClippedImages.java diff --git a/jdk/test/java/awt/print/PrinterJob/ImagePrinting/ImageTypes.java b/test/jdk/java/awt/print/PrinterJob/ImagePrinting/ImageTypes.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/ImagePrinting/ImageTypes.java rename to test/jdk/java/awt/print/PrinterJob/ImagePrinting/ImageTypes.java diff --git a/jdk/test/java/awt/print/PrinterJob/ImagePrinting/NullClipARGB.java b/test/jdk/java/awt/print/PrinterJob/ImagePrinting/NullClipARGB.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/ImagePrinting/NullClipARGB.java rename to test/jdk/java/awt/print/PrinterJob/ImagePrinting/NullClipARGB.java diff --git a/jdk/test/java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java b/test/jdk/java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java rename to test/jdk/java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java diff --git a/jdk/test/java/awt/print/PrinterJob/InitToBlack.java b/test/jdk/java/awt/print/PrinterJob/InitToBlack.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/InitToBlack.java rename to test/jdk/java/awt/print/PrinterJob/InitToBlack.java diff --git a/jdk/test/java/awt/print/PrinterJob/InvalidPage.java b/test/jdk/java/awt/print/PrinterJob/InvalidPage.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/InvalidPage.java rename to test/jdk/java/awt/print/PrinterJob/InvalidPage.java diff --git a/jdk/test/java/awt/print/PrinterJob/JobName/PrinterJobName.java b/test/jdk/java/awt/print/PrinterJob/JobName/PrinterJobName.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/JobName/PrinterJobName.java rename to test/jdk/java/awt/print/PrinterJob/JobName/PrinterJobName.java diff --git a/jdk/test/java/awt/print/PrinterJob/LandscapeStackOverflow.java b/test/jdk/java/awt/print/PrinterJob/LandscapeStackOverflow.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/LandscapeStackOverflow.java rename to test/jdk/java/awt/print/PrinterJob/LandscapeStackOverflow.java diff --git a/jdk/test/java/awt/print/PrinterJob/Legal/PrintTest.java b/test/jdk/java/awt/print/PrinterJob/Legal/PrintTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/Legal/PrintTest.java rename to test/jdk/java/awt/print/PrinterJob/Legal/PrintTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/LinearGradientPrintingTest.java b/test/jdk/java/awt/print/PrinterJob/LinearGradientPrintingTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/LinearGradientPrintingTest.java rename to test/jdk/java/awt/print/PrinterJob/LinearGradientPrintingTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/Margins.java b/test/jdk/java/awt/print/PrinterJob/Margins.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/Margins.java rename to test/jdk/java/awt/print/PrinterJob/Margins.java diff --git a/jdk/test/java/awt/print/PrinterJob/MultiMonPrintDlgTest.java b/test/jdk/java/awt/print/PrinterJob/MultiMonPrintDlgTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/MultiMonPrintDlgTest.java rename to test/jdk/java/awt/print/PrinterJob/MultiMonPrintDlgTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/MultiThread/MultiThreadTest.java b/test/jdk/java/awt/print/PrinterJob/MultiThread/MultiThreadTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/MultiThread/MultiThreadTest.java rename to test/jdk/java/awt/print/PrinterJob/MultiThread/MultiThreadTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/NullGetName.java b/test/jdk/java/awt/print/PrinterJob/NullGetName.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/NullGetName.java rename to test/jdk/java/awt/print/PrinterJob/NullGetName.java diff --git a/jdk/test/java/awt/print/PrinterJob/NumCopies.java b/test/jdk/java/awt/print/PrinterJob/NumCopies.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/NumCopies.java rename to test/jdk/java/awt/print/PrinterJob/NumCopies.java diff --git a/jdk/test/java/awt/print/PrinterJob/PSQuestionMark.java b/test/jdk/java/awt/print/PrinterJob/PSQuestionMark.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PSQuestionMark.java rename to test/jdk/java/awt/print/PrinterJob/PSQuestionMark.java diff --git a/jdk/test/java/awt/print/PrinterJob/PSWindingRule.java b/test/jdk/java/awt/print/PrinterJob/PSWindingRule.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PSWindingRule.java rename to test/jdk/java/awt/print/PrinterJob/PSWindingRule.java diff --git a/jdk/test/java/awt/print/PrinterJob/PageDialogMarginTest.java b/test/jdk/java/awt/print/PrinterJob/PageDialogMarginTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PageDialogMarginTest.java rename to test/jdk/java/awt/print/PrinterJob/PageDialogMarginTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PageDialogMarginValidation.java b/test/jdk/java/awt/print/PrinterJob/PageDialogMarginValidation.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PageDialogMarginValidation.java rename to test/jdk/java/awt/print/PrinterJob/PageDialogMarginValidation.java diff --git a/jdk/test/java/awt/print/PrinterJob/PageDialogTest.java b/test/jdk/java/awt/print/PrinterJob/PageDialogTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PageDialogTest.java rename to test/jdk/java/awt/print/PrinterJob/PageDialogTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PageDlgApp.java b/test/jdk/java/awt/print/PrinterJob/PageDlgApp.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PageDlgApp.java rename to test/jdk/java/awt/print/PrinterJob/PageDlgApp.java diff --git a/jdk/test/java/awt/print/PrinterJob/PageDlgPrnButton.java b/test/jdk/java/awt/print/PrinterJob/PageDlgPrnButton.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PageDlgPrnButton.java rename to test/jdk/java/awt/print/PrinterJob/PageDlgPrnButton.java diff --git a/jdk/test/java/awt/print/PrinterJob/PageDlgStackOverflowTest.java b/test/jdk/java/awt/print/PrinterJob/PageDlgStackOverflowTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PageDlgStackOverflowTest.java rename to test/jdk/java/awt/print/PrinterJob/PageDlgStackOverflowTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PageFormatChange.java b/test/jdk/java/awt/print/PrinterJob/PageFormatChange.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PageFormatChange.java rename to test/jdk/java/awt/print/PrinterJob/PageFormatChange.java diff --git a/jdk/test/java/awt/print/PrinterJob/PageRanges.java b/test/jdk/java/awt/print/PrinterJob/PageRanges.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PageRanges.java rename to test/jdk/java/awt/print/PrinterJob/PageRanges.java diff --git a/jdk/test/java/awt/print/PrinterJob/PageRangesDlgTest.java b/test/jdk/java/awt/print/PrinterJob/PageRangesDlgTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PageRangesDlgTest.java rename to test/jdk/java/awt/print/PrinterJob/PageRangesDlgTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PaintText.java b/test/jdk/java/awt/print/PrinterJob/PaintText.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PaintText.java rename to test/jdk/java/awt/print/PrinterJob/PaintText.java diff --git a/jdk/test/java/awt/print/PrinterJob/PolylinePrintingTest.java b/test/jdk/java/awt/print/PrinterJob/PolylinePrintingTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PolylinePrintingTest.java rename to test/jdk/java/awt/print/PrinterJob/PolylinePrintingTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintAWTImage.java b/test/jdk/java/awt/print/PrinterJob/PrintAWTImage.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintAWTImage.java rename to test/jdk/java/awt/print/PrinterJob/PrintAWTImage.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintAllFonts.java b/test/jdk/java/awt/print/PrinterJob/PrintAllFonts.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintAllFonts.java rename to test/jdk/java/awt/print/PrinterJob/PrintAllFonts.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintAttributeUpdateTest.java b/test/jdk/java/awt/print/PrinterJob/PrintAttributeUpdateTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintAttributeUpdateTest.java rename to test/jdk/java/awt/print/PrinterJob/PrintAttributeUpdateTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintBadImage.java b/test/jdk/java/awt/print/PrinterJob/PrintBadImage.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintBadImage.java rename to test/jdk/java/awt/print/PrinterJob/PrintBadImage.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintCompoundString.java b/test/jdk/java/awt/print/PrinterJob/PrintCompoundString.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintCompoundString.java rename to test/jdk/java/awt/print/PrinterJob/PrintCompoundString.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintCrashTest.java b/test/jdk/java/awt/print/PrinterJob/PrintCrashTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintCrashTest.java rename to test/jdk/java/awt/print/PrinterJob/PrintCrashTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintDialog.java b/test/jdk/java/awt/print/PrinterJob/PrintDialog.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintDialog.java rename to test/jdk/java/awt/print/PrinterJob/PrintDialog.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintDialogCancel.java b/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintDialogCancel.java rename to test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintDlgPageable.java b/test/jdk/java/awt/print/PrinterJob/PrintDlgPageable.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintDlgPageable.java rename to test/jdk/java/awt/print/PrinterJob/PrintDlgPageable.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintDlgSelectionAttribTest.java b/test/jdk/java/awt/print/PrinterJob/PrintDlgSelectionAttribTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintDlgSelectionAttribTest.java rename to test/jdk/java/awt/print/PrinterJob/PrintDlgSelectionAttribTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintFontStyle.java b/test/jdk/java/awt/print/PrinterJob/PrintFontStyle.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintFontStyle.java rename to test/jdk/java/awt/print/PrinterJob/PrintFontStyle.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintGlyphVectorTest.java b/test/jdk/java/awt/print/PrinterJob/PrintGlyphVectorTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintGlyphVectorTest.java rename to test/jdk/java/awt/print/PrinterJob/PrintGlyphVectorTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintImage.java b/test/jdk/java/awt/print/PrinterJob/PrintImage.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintImage.java rename to test/jdk/java/awt/print/PrinterJob/PrintImage.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintLatinCJKTest.java b/test/jdk/java/awt/print/PrinterJob/PrintLatinCJKTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintLatinCJKTest.java rename to test/jdk/java/awt/print/PrinterJob/PrintLatinCJKTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintNullString.java b/test/jdk/java/awt/print/PrinterJob/PrintNullString.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintNullString.java rename to test/jdk/java/awt/print/PrinterJob/PrintNullString.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintParenString.java b/test/jdk/java/awt/print/PrinterJob/PrintParenString.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintParenString.java rename to test/jdk/java/awt/print/PrinterJob/PrintParenString.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintRotatedText.java b/test/jdk/java/awt/print/PrinterJob/PrintRotatedText.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintRotatedText.java rename to test/jdk/java/awt/print/PrinterJob/PrintRotatedText.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintTest.java b/test/jdk/java/awt/print/PrinterJob/PrintTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintTest.java rename to test/jdk/java/awt/print/PrinterJob/PrintTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintTestLexmarkIQ.java b/test/jdk/java/awt/print/PrinterJob/PrintTestLexmarkIQ.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintTestLexmarkIQ.java rename to test/jdk/java/awt/print/PrinterJob/PrintTestLexmarkIQ.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintTextLayout.java b/test/jdk/java/awt/print/PrinterJob/PrintTextLayout.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintTextLayout.java rename to test/jdk/java/awt/print/PrinterJob/PrintTextLayout.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintTextPane.java b/test/jdk/java/awt/print/PrinterJob/PrintTextPane.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintTextPane.java rename to test/jdk/java/awt/print/PrinterJob/PrintTextPane.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintTextTest.java b/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintTextTest.java rename to test/jdk/java/awt/print/PrinterJob/PrintTextTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintToDir.java b/test/jdk/java/awt/print/PrinterJob/PrintToDir.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintToDir.java rename to test/jdk/java/awt/print/PrinterJob/PrintToDir.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintTranslatedFont.java b/test/jdk/java/awt/print/PrinterJob/PrintTranslatedFont.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintTranslatedFont.java rename to test/jdk/java/awt/print/PrinterJob/PrintTranslatedFont.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrintVolatileImage.java b/test/jdk/java/awt/print/PrinterJob/PrintVolatileImage.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrintVolatileImage.java rename to test/jdk/java/awt/print/PrinterJob/PrintVolatileImage.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrinterDevice.java b/test/jdk/java/awt/print/PrinterJob/PrinterDevice.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrinterDevice.java rename to test/jdk/java/awt/print/PrinterJob/PrinterDevice.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.html b/test/jdk/java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.html similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.html rename to test/jdk/java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.html diff --git a/jdk/test/java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.java b/test/jdk/java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.java rename to test/jdk/java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrinterJobDialogBugDemo.java b/test/jdk/java/awt/print/PrinterJob/PrinterJobDialogBugDemo.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrinterJobDialogBugDemo.java rename to test/jdk/java/awt/print/PrinterJob/PrinterJobDialogBugDemo.java diff --git a/jdk/test/java/awt/print/PrinterJob/PrtException.java b/test/jdk/java/awt/print/PrinterJob/PrtException.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/PrtException.java rename to test/jdk/java/awt/print/PrinterJob/PrtException.java diff --git a/jdk/test/java/awt/print/PrinterJob/RadialGradientPrintingTest.java b/test/jdk/java/awt/print/PrinterJob/RadialGradientPrintingTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/RadialGradientPrintingTest.java rename to test/jdk/java/awt/print/PrinterJob/RadialGradientPrintingTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/RemoveListener.java b/test/jdk/java/awt/print/PrinterJob/RemoveListener.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/RemoveListener.java rename to test/jdk/java/awt/print/PrinterJob/RemoveListener.java diff --git a/jdk/test/java/awt/print/PrinterJob/SameService.java b/test/jdk/java/awt/print/PrinterJob/SameService.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/SameService.java rename to test/jdk/java/awt/print/PrinterJob/SameService.java diff --git a/jdk/test/java/awt/print/PrinterJob/ScaledText/ScaledText.java b/test/jdk/java/awt/print/PrinterJob/ScaledText/ScaledText.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/ScaledText/ScaledText.java rename to test/jdk/java/awt/print/PrinterJob/ScaledText/ScaledText.java diff --git a/jdk/test/java/awt/print/PrinterJob/SecurityDialogTest.java b/test/jdk/java/awt/print/PrinterJob/SecurityDialogTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/SecurityDialogTest.java rename to test/jdk/java/awt/print/PrinterJob/SecurityDialogTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/SetCopies/Test.java b/test/jdk/java/awt/print/PrinterJob/SetCopies/Test.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/SetCopies/Test.java rename to test/jdk/java/awt/print/PrinterJob/SetCopies/Test.java diff --git a/jdk/test/java/awt/print/PrinterJob/SwingUIText.java b/test/jdk/java/awt/print/PrinterJob/SwingUIText.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/SwingUIText.java rename to test/jdk/java/awt/print/PrinterJob/SwingUIText.java diff --git a/jdk/test/java/awt/print/PrinterJob/TestCheckSystemDefaultBannerOption.java b/test/jdk/java/awt/print/PrinterJob/TestCheckSystemDefaultBannerOption.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/TestCheckSystemDefaultBannerOption.java rename to test/jdk/java/awt/print/PrinterJob/TestCheckSystemDefaultBannerOption.java diff --git a/jdk/test/java/awt/print/PrinterJob/TestMediaTraySelection.java b/test/jdk/java/awt/print/PrinterJob/TestMediaTraySelection.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/TestMediaTraySelection.java rename to test/jdk/java/awt/print/PrinterJob/TestMediaTraySelection.java diff --git a/jdk/test/java/awt/print/PrinterJob/TestPageDlgFrameAssociation.java b/test/jdk/java/awt/print/PrinterJob/TestPageDlgFrameAssociation.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/TestPageDlgFrameAssociation.java rename to test/jdk/java/awt/print/PrinterJob/TestPageDlgFrameAssociation.java diff --git a/jdk/test/java/awt/print/PrinterJob/TestPgfmtSetMPA.java b/test/jdk/java/awt/print/PrinterJob/TestPgfmtSetMPA.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/TestPgfmtSetMPA.java rename to test/jdk/java/awt/print/PrinterJob/TestPgfmtSetMPA.java diff --git a/jdk/test/java/awt/print/PrinterJob/TestPrintDlgFrameAssociation.java b/test/jdk/java/awt/print/PrinterJob/TestPrintDlgFrameAssociation.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/TestPrintDlgFrameAssociation.java rename to test/jdk/java/awt/print/PrinterJob/TestPrintDlgFrameAssociation.java diff --git a/jdk/test/java/awt/print/PrinterJob/TexturePaintPrintingTest.java b/test/jdk/java/awt/print/PrinterJob/TexturePaintPrintingTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/TexturePaintPrintingTest.java rename to test/jdk/java/awt/print/PrinterJob/TexturePaintPrintingTest.java diff --git a/jdk/test/java/awt/print/PrinterJob/ThinLines.java b/test/jdk/java/awt/print/PrinterJob/ThinLines.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/ThinLines.java rename to test/jdk/java/awt/print/PrinterJob/ThinLines.java diff --git a/jdk/test/java/awt/print/PrinterJob/ValidatePage/ValidatePage.java b/test/jdk/java/awt/print/PrinterJob/ValidatePage/ValidatePage.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/ValidatePage/ValidatePage.java rename to test/jdk/java/awt/print/PrinterJob/ValidatePage/ValidatePage.java diff --git a/jdk/test/java/awt/print/PrinterJob/XparColor.java b/test/jdk/java/awt/print/PrinterJob/XparColor.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/XparColor.java rename to test/jdk/java/awt/print/PrinterJob/XparColor.java diff --git a/jdk/test/java/awt/print/PrinterJob/duke.gif b/test/jdk/java/awt/print/PrinterJob/duke.gif similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/duke.gif rename to test/jdk/java/awt/print/PrinterJob/duke.gif diff --git a/jdk/test/java/awt/print/PrinterJob/raster/RasterTest.java b/test/jdk/java/awt/print/PrinterJob/raster/RasterTest.java similarity index 100% rename from jdk/test/java/awt/print/PrinterJob/raster/RasterTest.java rename to test/jdk/java/awt/print/PrinterJob/raster/RasterTest.java diff --git a/jdk/test/java/awt/print/bug8023392/bug8023392.html b/test/jdk/java/awt/print/bug8023392/bug8023392.html similarity index 100% rename from jdk/test/java/awt/print/bug8023392/bug8023392.html rename to test/jdk/java/awt/print/bug8023392/bug8023392.html diff --git a/jdk/test/java/awt/print/bug8023392/bug8023392.java b/test/jdk/java/awt/print/bug8023392/bug8023392.java similarity index 100% rename from jdk/test/java/awt/print/bug8023392/bug8023392.java rename to test/jdk/java/awt/print/bug8023392/bug8023392.java diff --git a/jdk/test/java/awt/regtesthelpers/AbstractPolicyTest.java b/test/jdk/java/awt/regtesthelpers/AbstractPolicyTest.java similarity index 100% rename from jdk/test/java/awt/regtesthelpers/AbstractPolicyTest.java rename to test/jdk/java/awt/regtesthelpers/AbstractPolicyTest.java diff --git a/jdk/test/java/awt/regtesthelpers/AbstractTest.java b/test/jdk/java/awt/regtesthelpers/AbstractTest.java similarity index 100% rename from jdk/test/java/awt/regtesthelpers/AbstractTest.java rename to test/jdk/java/awt/regtesthelpers/AbstractTest.java diff --git a/jdk/test/java/awt/regtesthelpers/CopyClassFile.java b/test/jdk/java/awt/regtesthelpers/CopyClassFile.java similarity index 100% rename from jdk/test/java/awt/regtesthelpers/CopyClassFile.java rename to test/jdk/java/awt/regtesthelpers/CopyClassFile.java diff --git a/jdk/test/java/awt/regtesthelpers/Sysout.java b/test/jdk/java/awt/regtesthelpers/Sysout.java similarity index 100% rename from jdk/test/java/awt/regtesthelpers/Sysout.java rename to test/jdk/java/awt/regtesthelpers/Sysout.java diff --git a/jdk/test/java/awt/regtesthelpers/Util.java b/test/jdk/java/awt/regtesthelpers/Util.java similarity index 100% rename from jdk/test/java/awt/regtesthelpers/Util.java rename to test/jdk/java/awt/regtesthelpers/Util.java diff --git a/jdk/test/java/awt/regtesthelpers/UtilInternal.java b/test/jdk/java/awt/regtesthelpers/UtilInternal.java similarity index 100% rename from jdk/test/java/awt/regtesthelpers/UtilInternal.java rename to test/jdk/java/awt/regtesthelpers/UtilInternal.java diff --git a/jdk/test/java/awt/regtesthelpers/VisibilityValidator.java b/test/jdk/java/awt/regtesthelpers/VisibilityValidator.java similarity index 100% rename from jdk/test/java/awt/regtesthelpers/VisibilityValidator.java rename to test/jdk/java/awt/regtesthelpers/VisibilityValidator.java diff --git a/jdk/test/java/awt/regtesthelpers/Waypoint.java b/test/jdk/java/awt/regtesthelpers/Waypoint.java similarity index 100% rename from jdk/test/java/awt/regtesthelpers/Waypoint.java rename to test/jdk/java/awt/regtesthelpers/Waypoint.java diff --git a/jdk/test/java/awt/regtesthelpers/process/ProcessCommunicator.java b/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java similarity index 100% rename from jdk/test/java/awt/regtesthelpers/process/ProcessCommunicator.java rename to test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java diff --git a/jdk/test/java/awt/regtesthelpers/process/ProcessResults.java b/test/jdk/java/awt/regtesthelpers/process/ProcessResults.java similarity index 100% rename from jdk/test/java/awt/regtesthelpers/process/ProcessResults.java rename to test/jdk/java/awt/regtesthelpers/process/ProcessResults.java diff --git a/jdk/test/java/awt/security/Permissions.java b/test/jdk/java/awt/security/Permissions.java similarity index 100% rename from jdk/test/java/awt/security/Permissions.java rename to test/jdk/java/awt/security/Permissions.java diff --git a/jdk/test/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeCrashTest.java b/test/jdk/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeCrashTest.java similarity index 100% rename from jdk/test/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeCrashTest.java rename to test/jdk/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeCrashTest.java diff --git a/jdk/test/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeTest.java b/test/jdk/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeTest.java similarity index 100% rename from jdk/test/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeTest.java rename to test/jdk/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeTest.java diff --git a/jdk/test/java/awt/security/WarningWindowDisposeTest/policy b/test/jdk/java/awt/security/WarningWindowDisposeTest/policy similarity index 100% rename from jdk/test/java/awt/security/WarningWindowDisposeTest/policy rename to test/jdk/java/awt/security/WarningWindowDisposeTest/policy diff --git a/jdk/test/java/awt/xembed/server/JavaClient.java b/test/jdk/java/awt/xembed/server/JavaClient.java similarity index 100% rename from jdk/test/java/awt/xembed/server/JavaClient.java rename to test/jdk/java/awt/xembed/server/JavaClient.java diff --git a/jdk/test/java/awt/xembed/server/RunTestXEmbed.java b/test/jdk/java/awt/xembed/server/RunTestXEmbed.java similarity index 100% rename from jdk/test/java/awt/xembed/server/RunTestXEmbed.java rename to test/jdk/java/awt/xembed/server/RunTestXEmbed.java diff --git a/jdk/test/java/awt/xembed/server/TestXEmbedServer.java b/test/jdk/java/awt/xembed/server/TestXEmbedServer.java similarity index 100% rename from jdk/test/java/awt/xembed/server/TestXEmbedServer.java rename to test/jdk/java/awt/xembed/server/TestXEmbedServer.java diff --git a/jdk/test/java/awt/xembed/server/TestXEmbedServerJava.java b/test/jdk/java/awt/xembed/server/TestXEmbedServerJava.java similarity index 100% rename from jdk/test/java/awt/xembed/server/TestXEmbedServerJava.java rename to test/jdk/java/awt/xembed/server/TestXEmbedServerJava.java diff --git a/jdk/test/java/awt/xembed/server/TesterClient.java b/test/jdk/java/awt/xembed/server/TesterClient.java similarity index 100% rename from jdk/test/java/awt/xembed/server/TesterClient.java rename to test/jdk/java/awt/xembed/server/TesterClient.java diff --git a/jdk/test/java/beans/Beans/6669869/TestDesignTime.java b/test/jdk/java/beans/Beans/6669869/TestDesignTime.java similarity index 100% rename from jdk/test/java/beans/Beans/6669869/TestDesignTime.java rename to test/jdk/java/beans/Beans/6669869/TestDesignTime.java diff --git a/jdk/test/java/beans/Beans/6669869/TestGuiAvailable.java b/test/jdk/java/beans/Beans/6669869/TestGuiAvailable.java similarity index 100% rename from jdk/test/java/beans/Beans/6669869/TestGuiAvailable.java rename to test/jdk/java/beans/Beans/6669869/TestGuiAvailable.java diff --git a/jdk/test/java/beans/Beans/Test4067824.java b/test/jdk/java/beans/Beans/Test4067824.java similarity index 100% rename from jdk/test/java/beans/Beans/Test4067824.java rename to test/jdk/java/beans/Beans/Test4067824.java diff --git a/jdk/test/java/beans/Beans/Test4080522.java b/test/jdk/java/beans/Beans/Test4080522.java similarity index 100% rename from jdk/test/java/beans/Beans/Test4080522.java rename to test/jdk/java/beans/Beans/Test4080522.java diff --git a/jdk/test/java/beans/Beans/Test4343723.java b/test/jdk/java/beans/Beans/Test4343723.java similarity index 100% rename from jdk/test/java/beans/Beans/Test4343723.java rename to test/jdk/java/beans/Beans/Test4343723.java diff --git a/jdk/test/java/beans/EventHandler/Test6179222.java b/test/jdk/java/beans/EventHandler/Test6179222.java similarity index 100% rename from jdk/test/java/beans/EventHandler/Test6179222.java rename to test/jdk/java/beans/EventHandler/Test6179222.java diff --git a/jdk/test/java/beans/EventHandler/Test6277246.java b/test/jdk/java/beans/EventHandler/Test6277246.java similarity index 100% rename from jdk/test/java/beans/EventHandler/Test6277246.java rename to test/jdk/java/beans/EventHandler/Test6277246.java diff --git a/jdk/test/java/beans/EventHandler/Test6277266.java b/test/jdk/java/beans/EventHandler/Test6277266.java similarity index 100% rename from jdk/test/java/beans/EventHandler/Test6277266.java rename to test/jdk/java/beans/EventHandler/Test6277266.java diff --git a/jdk/test/java/beans/EventHandler/Test6788531.java b/test/jdk/java/beans/EventHandler/Test6788531.java similarity index 100% rename from jdk/test/java/beans/EventHandler/Test6788531.java rename to test/jdk/java/beans/EventHandler/Test6788531.java diff --git a/jdk/test/java/beans/Introspector/4058433/TestBeanInfoPriority.java b/test/jdk/java/beans/Introspector/4058433/TestBeanInfoPriority.java similarity index 100% rename from jdk/test/java/beans/Introspector/4058433/TestBeanInfoPriority.java rename to test/jdk/java/beans/Introspector/4058433/TestBeanInfoPriority.java diff --git a/jdk/test/java/beans/Introspector/4058433/TestBeanProperty.java b/test/jdk/java/beans/Introspector/4058433/TestBeanProperty.java similarity index 100% rename from jdk/test/java/beans/Introspector/4058433/TestBeanProperty.java rename to test/jdk/java/beans/Introspector/4058433/TestBeanProperty.java diff --git a/jdk/test/java/beans/Introspector/4058433/TestJavaBean.java b/test/jdk/java/beans/Introspector/4058433/TestJavaBean.java similarity index 100% rename from jdk/test/java/beans/Introspector/4058433/TestJavaBean.java rename to test/jdk/java/beans/Introspector/4058433/TestJavaBean.java diff --git a/jdk/test/java/beans/Introspector/4058433/TestSwingContainer.java b/test/jdk/java/beans/Introspector/4058433/TestSwingContainer.java similarity index 100% rename from jdk/test/java/beans/Introspector/4058433/TestSwingContainer.java rename to test/jdk/java/beans/Introspector/4058433/TestSwingContainer.java diff --git a/jdk/test/java/beans/Introspector/4168475/Test4168475.java b/test/jdk/java/beans/Introspector/4168475/Test4168475.java similarity index 100% rename from jdk/test/java/beans/Introspector/4168475/Test4168475.java rename to test/jdk/java/beans/Introspector/4168475/Test4168475.java diff --git a/jdk/test/java/beans/Introspector/4168475/infos/ComponentBeanInfo.java b/test/jdk/java/beans/Introspector/4168475/infos/ComponentBeanInfo.java similarity index 100% rename from jdk/test/java/beans/Introspector/4168475/infos/ComponentBeanInfo.java rename to test/jdk/java/beans/Introspector/4168475/infos/ComponentBeanInfo.java diff --git a/jdk/test/java/beans/Introspector/4520754/Foo.java b/test/jdk/java/beans/Introspector/4520754/Foo.java similarity index 100% rename from jdk/test/java/beans/Introspector/4520754/Foo.java rename to test/jdk/java/beans/Introspector/4520754/Foo.java diff --git a/jdk/test/java/beans/Introspector/4520754/FooBar.java b/test/jdk/java/beans/Introspector/4520754/FooBar.java similarity index 100% rename from jdk/test/java/beans/Introspector/4520754/FooBar.java rename to test/jdk/java/beans/Introspector/4520754/FooBar.java diff --git a/jdk/test/java/beans/Introspector/4520754/FooBarBeanInfo.java b/test/jdk/java/beans/Introspector/4520754/FooBarBeanInfo.java similarity index 100% rename from jdk/test/java/beans/Introspector/4520754/FooBarBeanInfo.java rename to test/jdk/java/beans/Introspector/4520754/FooBarBeanInfo.java diff --git a/jdk/test/java/beans/Introspector/4520754/Test4520754.java b/test/jdk/java/beans/Introspector/4520754/Test4520754.java similarity index 100% rename from jdk/test/java/beans/Introspector/4520754/Test4520754.java rename to test/jdk/java/beans/Introspector/4520754/Test4520754.java diff --git a/jdk/test/java/beans/Introspector/4520754/Wombat.java b/test/jdk/java/beans/Introspector/4520754/Wombat.java similarity index 100% rename from jdk/test/java/beans/Introspector/4520754/Wombat.java rename to test/jdk/java/beans/Introspector/4520754/Wombat.java diff --git a/jdk/test/java/beans/Introspector/4520754/WombatBeanInfo.java b/test/jdk/java/beans/Introspector/4520754/WombatBeanInfo.java similarity index 100% rename from jdk/test/java/beans/Introspector/4520754/WombatBeanInfo.java rename to test/jdk/java/beans/Introspector/4520754/WombatBeanInfo.java diff --git a/jdk/test/java/beans/Introspector/4520754/infos/ComponentBeanInfo.java b/test/jdk/java/beans/Introspector/4520754/infos/ComponentBeanInfo.java similarity index 100% rename from jdk/test/java/beans/Introspector/4520754/infos/ComponentBeanInfo.java rename to test/jdk/java/beans/Introspector/4520754/infos/ComponentBeanInfo.java diff --git a/jdk/test/java/beans/Introspector/4750368/Test4750368.java b/test/jdk/java/beans/Introspector/4750368/Test4750368.java similarity index 100% rename from jdk/test/java/beans/Introspector/4750368/Test4750368.java rename to test/jdk/java/beans/Introspector/4750368/Test4750368.java diff --git a/jdk/test/java/beans/Introspector/4750368/com/foo/test/Component.java b/test/jdk/java/beans/Introspector/4750368/com/foo/test/Component.java similarity index 100% rename from jdk/test/java/beans/Introspector/4750368/com/foo/test/Component.java rename to test/jdk/java/beans/Introspector/4750368/com/foo/test/Component.java diff --git a/jdk/test/java/beans/Introspector/6380849/TestBeanInfo.java b/test/jdk/java/beans/Introspector/6380849/TestBeanInfo.java similarity index 100% rename from jdk/test/java/beans/Introspector/6380849/TestBeanInfo.java rename to test/jdk/java/beans/Introspector/6380849/TestBeanInfo.java diff --git a/jdk/test/java/beans/Introspector/6380849/beans/FirstBean.java b/test/jdk/java/beans/Introspector/6380849/beans/FirstBean.java similarity index 100% rename from jdk/test/java/beans/Introspector/6380849/beans/FirstBean.java rename to test/jdk/java/beans/Introspector/6380849/beans/FirstBean.java diff --git a/jdk/test/java/beans/Introspector/6380849/beans/FirstBeanBeanInfo.java b/test/jdk/java/beans/Introspector/6380849/beans/FirstBeanBeanInfo.java similarity index 100% rename from jdk/test/java/beans/Introspector/6380849/beans/FirstBeanBeanInfo.java rename to test/jdk/java/beans/Introspector/6380849/beans/FirstBeanBeanInfo.java diff --git a/jdk/test/java/beans/Introspector/6380849/beans/SecondBean.java b/test/jdk/java/beans/Introspector/6380849/beans/SecondBean.java similarity index 100% rename from jdk/test/java/beans/Introspector/6380849/beans/SecondBean.java rename to test/jdk/java/beans/Introspector/6380849/beans/SecondBean.java diff --git a/jdk/test/java/beans/Introspector/6380849/beans/ThirdBean.java b/test/jdk/java/beans/Introspector/6380849/beans/ThirdBean.java similarity index 100% rename from jdk/test/java/beans/Introspector/6380849/beans/ThirdBean.java rename to test/jdk/java/beans/Introspector/6380849/beans/ThirdBean.java diff --git a/jdk/test/java/beans/Introspector/6380849/infos/SecondBeanBeanInfo.java b/test/jdk/java/beans/Introspector/6380849/infos/SecondBeanBeanInfo.java similarity index 100% rename from jdk/test/java/beans/Introspector/6380849/infos/SecondBeanBeanInfo.java rename to test/jdk/java/beans/Introspector/6380849/infos/SecondBeanBeanInfo.java diff --git a/jdk/test/java/beans/Introspector/6380849/infos/ThirdBeanBeanInfo.java b/test/jdk/java/beans/Introspector/6380849/infos/ThirdBeanBeanInfo.java similarity index 100% rename from jdk/test/java/beans/Introspector/6380849/infos/ThirdBeanBeanInfo.java rename to test/jdk/java/beans/Introspector/6380849/infos/ThirdBeanBeanInfo.java diff --git a/jdk/test/java/beans/Introspector/6976577/Test6976577.java b/test/jdk/java/beans/Introspector/6976577/Test6976577.java similarity index 100% rename from jdk/test/java/beans/Introspector/6976577/Test6976577.java rename to test/jdk/java/beans/Introspector/6976577/Test6976577.java diff --git a/jdk/test/java/beans/Introspector/6976577/test/Accessor.java b/test/jdk/java/beans/Introspector/6976577/test/Accessor.java similarity index 100% rename from jdk/test/java/beans/Introspector/6976577/test/Accessor.java rename to test/jdk/java/beans/Introspector/6976577/test/Accessor.java diff --git a/jdk/test/java/beans/Introspector/7064279/Test7064279.java b/test/jdk/java/beans/Introspector/7064279/Test7064279.java similarity index 100% rename from jdk/test/java/beans/Introspector/7064279/Test7064279.java rename to test/jdk/java/beans/Introspector/7064279/Test7064279.java diff --git a/jdk/test/java/beans/Introspector/7064279/test.jar b/test/jdk/java/beans/Introspector/7064279/test.jar similarity index 100% rename from jdk/test/java/beans/Introspector/7064279/test.jar rename to test/jdk/java/beans/Introspector/7064279/test.jar diff --git a/jdk/test/java/beans/Introspector/7084904/Test7084904.java b/test/jdk/java/beans/Introspector/7084904/Test7084904.java similarity index 100% rename from jdk/test/java/beans/Introspector/7084904/Test7084904.java rename to test/jdk/java/beans/Introspector/7084904/Test7084904.java diff --git a/jdk/test/java/beans/Introspector/7084904/bean/Base.java b/test/jdk/java/beans/Introspector/7084904/bean/Base.java similarity index 100% rename from jdk/test/java/beans/Introspector/7084904/bean/Base.java rename to test/jdk/java/beans/Introspector/7084904/bean/Base.java diff --git a/jdk/test/java/beans/Introspector/7084904/bean/Derived.java b/test/jdk/java/beans/Introspector/7084904/bean/Derived.java similarity index 100% rename from jdk/test/java/beans/Introspector/7084904/bean/Derived.java rename to test/jdk/java/beans/Introspector/7084904/bean/Derived.java diff --git a/jdk/test/java/beans/Introspector/7122138/Test7122138.java b/test/jdk/java/beans/Introspector/7122138/Test7122138.java similarity index 100% rename from jdk/test/java/beans/Introspector/7122138/Test7122138.java rename to test/jdk/java/beans/Introspector/7122138/Test7122138.java diff --git a/jdk/test/java/beans/Introspector/7122138/pack/Sub.java b/test/jdk/java/beans/Introspector/7122138/pack/Sub.java similarity index 100% rename from jdk/test/java/beans/Introspector/7122138/pack/Sub.java rename to test/jdk/java/beans/Introspector/7122138/pack/Sub.java diff --git a/jdk/test/java/beans/Introspector/7122138/pack/Super.java b/test/jdk/java/beans/Introspector/7122138/pack/Super.java similarity index 100% rename from jdk/test/java/beans/Introspector/7122138/pack/Super.java rename to test/jdk/java/beans/Introspector/7122138/pack/Super.java diff --git a/jdk/test/java/beans/Introspector/8130937/TestBooleanBeanProperties.java b/test/jdk/java/beans/Introspector/8130937/TestBooleanBeanProperties.java similarity index 100% rename from jdk/test/java/beans/Introspector/8130937/TestBooleanBeanProperties.java rename to test/jdk/java/beans/Introspector/8130937/TestBooleanBeanProperties.java diff --git a/jdk/test/java/beans/Introspector/8132566/CBase.java b/test/jdk/java/beans/Introspector/8132566/CBase.java similarity index 100% rename from jdk/test/java/beans/Introspector/8132566/CBase.java rename to test/jdk/java/beans/Introspector/8132566/CBase.java diff --git a/jdk/test/java/beans/Introspector/8132566/Checker.java b/test/jdk/java/beans/Introspector/8132566/Checker.java similarity index 100% rename from jdk/test/java/beans/Introspector/8132566/Checker.java rename to test/jdk/java/beans/Introspector/8132566/Checker.java diff --git a/jdk/test/java/beans/Introspector/8132566/InheritPropertyInfoTest.java b/test/jdk/java/beans/Introspector/8132566/InheritPropertyInfoTest.java similarity index 100% rename from jdk/test/java/beans/Introspector/8132566/InheritPropertyInfoTest.java rename to test/jdk/java/beans/Introspector/8132566/InheritPropertyInfoTest.java diff --git a/jdk/test/java/beans/Introspector/8132566/OverridePropertyInfoTest.java b/test/jdk/java/beans/Introspector/8132566/OverridePropertyInfoTest.java similarity index 100% rename from jdk/test/java/beans/Introspector/8132566/OverridePropertyInfoTest.java rename to test/jdk/java/beans/Introspector/8132566/OverridePropertyInfoTest.java diff --git a/jdk/test/java/beans/Introspector/8132566/OverrideUserDefPropertyInfoTest.java b/test/jdk/java/beans/Introspector/8132566/OverrideUserDefPropertyInfoTest.java similarity index 100% rename from jdk/test/java/beans/Introspector/8132566/OverrideUserDefPropertyInfoTest.java rename to test/jdk/java/beans/Introspector/8132566/OverrideUserDefPropertyInfoTest.java diff --git a/jdk/test/java/beans/Introspector/8159696/UnloadClassBeanInfo.java b/test/jdk/java/beans/Introspector/8159696/UnloadClassBeanInfo.java similarity index 100% rename from jdk/test/java/beans/Introspector/8159696/UnloadClassBeanInfo.java rename to test/jdk/java/beans/Introspector/8159696/UnloadClassBeanInfo.java diff --git a/jdk/test/java/beans/Introspector/8159696/stub/Stub.java b/test/jdk/java/beans/Introspector/8159696/stub/Stub.java similarity index 100% rename from jdk/test/java/beans/Introspector/8159696/stub/Stub.java rename to test/jdk/java/beans/Introspector/8159696/stub/Stub.java diff --git a/jdk/test/java/beans/Introspector/AnonymousClassBeanPropertyTest.java b/test/jdk/java/beans/Introspector/AnonymousClassBeanPropertyTest.java similarity index 100% rename from jdk/test/java/beans/Introspector/AnonymousClassBeanPropertyTest.java rename to test/jdk/java/beans/Introspector/AnonymousClassBeanPropertyTest.java diff --git a/jdk/test/java/beans/Introspector/BeanPropertyTest.java b/test/jdk/java/beans/Introspector/BeanPropertyTest.java similarity index 100% rename from jdk/test/java/beans/Introspector/BeanPropertyTest.java rename to test/jdk/java/beans/Introspector/BeanPropertyTest.java diff --git a/jdk/test/java/beans/Introspector/BeanUtils.java b/test/jdk/java/beans/Introspector/BeanUtils.java similarity index 100% rename from jdk/test/java/beans/Introspector/BeanUtils.java rename to test/jdk/java/beans/Introspector/BeanUtils.java diff --git a/jdk/test/java/beans/Introspector/InheritanceBeanPropertyTest.java b/test/jdk/java/beans/Introspector/InheritanceBeanPropertyTest.java similarity index 100% rename from jdk/test/java/beans/Introspector/InheritanceBeanPropertyTest.java rename to test/jdk/java/beans/Introspector/InheritanceBeanPropertyTest.java diff --git a/jdk/test/java/beans/Introspector/Test4072197.java b/test/jdk/java/beans/Introspector/Test4072197.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4072197.java rename to test/jdk/java/beans/Introspector/Test4072197.java diff --git a/jdk/test/java/beans/Introspector/Test4144543.java b/test/jdk/java/beans/Introspector/Test4144543.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4144543.java rename to test/jdk/java/beans/Introspector/Test4144543.java diff --git a/jdk/test/java/beans/Introspector/Test4168833.java b/test/jdk/java/beans/Introspector/Test4168833.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4168833.java rename to test/jdk/java/beans/Introspector/Test4168833.java diff --git a/jdk/test/java/beans/Introspector/Test4274639.java b/test/jdk/java/beans/Introspector/Test4274639.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4274639.java rename to test/jdk/java/beans/Introspector/Test4274639.java diff --git a/jdk/test/java/beans/Introspector/Test4498236.java b/test/jdk/java/beans/Introspector/Test4498236.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4498236.java rename to test/jdk/java/beans/Introspector/Test4498236.java diff --git a/jdk/test/java/beans/Introspector/Test4619536.java b/test/jdk/java/beans/Introspector/Test4619536.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4619536.java rename to test/jdk/java/beans/Introspector/Test4619536.java diff --git a/jdk/test/java/beans/Introspector/Test4619792.java b/test/jdk/java/beans/Introspector/Test4619792.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4619792.java rename to test/jdk/java/beans/Introspector/Test4619792.java diff --git a/jdk/test/java/beans/Introspector/Test4634390.java b/test/jdk/java/beans/Introspector/Test4634390.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4634390.java rename to test/jdk/java/beans/Introspector/Test4634390.java diff --git a/jdk/test/java/beans/Introspector/Test4683761.java b/test/jdk/java/beans/Introspector/Test4683761.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4683761.java rename to test/jdk/java/beans/Introspector/Test4683761.java diff --git a/jdk/test/java/beans/Introspector/Test4896879.java b/test/jdk/java/beans/Introspector/Test4896879.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4896879.java rename to test/jdk/java/beans/Introspector/Test4896879.java diff --git a/jdk/test/java/beans/Introspector/Test4918902.java b/test/jdk/java/beans/Introspector/Test4918902.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4918902.java rename to test/jdk/java/beans/Introspector/Test4918902.java diff --git a/jdk/test/java/beans/Introspector/Test4935607.java b/test/jdk/java/beans/Introspector/Test4935607.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4935607.java rename to test/jdk/java/beans/Introspector/Test4935607.java diff --git a/jdk/test/java/beans/Introspector/Test4948761.java b/test/jdk/java/beans/Introspector/Test4948761.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4948761.java rename to test/jdk/java/beans/Introspector/Test4948761.java diff --git a/jdk/test/java/beans/Introspector/Test4984912.java b/test/jdk/java/beans/Introspector/Test4984912.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test4984912.java rename to test/jdk/java/beans/Introspector/Test4984912.java diff --git a/jdk/test/java/beans/Introspector/Test5063390.java b/test/jdk/java/beans/Introspector/Test5063390.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test5063390.java rename to test/jdk/java/beans/Introspector/Test5063390.java diff --git a/jdk/test/java/beans/Introspector/Test5102804.java b/test/jdk/java/beans/Introspector/Test5102804.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test5102804.java rename to test/jdk/java/beans/Introspector/Test5102804.java diff --git a/jdk/test/java/beans/Introspector/Test6194788.java b/test/jdk/java/beans/Introspector/Test6194788.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test6194788.java rename to test/jdk/java/beans/Introspector/Test6194788.java diff --git a/jdk/test/java/beans/Introspector/Test6277246.java b/test/jdk/java/beans/Introspector/Test6277246.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test6277246.java rename to test/jdk/java/beans/Introspector/Test6277246.java diff --git a/jdk/test/java/beans/Introspector/Test6311051.java b/test/jdk/java/beans/Introspector/Test6311051.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test6311051.java rename to test/jdk/java/beans/Introspector/Test6311051.java diff --git a/jdk/test/java/beans/Introspector/Test6422403.java b/test/jdk/java/beans/Introspector/Test6422403.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test6422403.java rename to test/jdk/java/beans/Introspector/Test6422403.java diff --git a/jdk/test/java/beans/Introspector/Test6447751.java b/test/jdk/java/beans/Introspector/Test6447751.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test6447751.java rename to test/jdk/java/beans/Introspector/Test6447751.java diff --git a/jdk/test/java/beans/Introspector/Test6528714.java b/test/jdk/java/beans/Introspector/Test6528714.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test6528714.java rename to test/jdk/java/beans/Introspector/Test6528714.java diff --git a/jdk/test/java/beans/Introspector/Test6660539.java b/test/jdk/java/beans/Introspector/Test6660539.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test6660539.java rename to test/jdk/java/beans/Introspector/Test6660539.java diff --git a/jdk/test/java/beans/Introspector/Test6707231.java b/test/jdk/java/beans/Introspector/Test6707231.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test6707231.java rename to test/jdk/java/beans/Introspector/Test6707231.java diff --git a/jdk/test/java/beans/Introspector/Test6707234.java b/test/jdk/java/beans/Introspector/Test6707234.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test6707234.java rename to test/jdk/java/beans/Introspector/Test6707234.java diff --git a/jdk/test/java/beans/Introspector/Test6723447.java b/test/jdk/java/beans/Introspector/Test6723447.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test6723447.java rename to test/jdk/java/beans/Introspector/Test6723447.java diff --git a/jdk/test/java/beans/Introspector/Test6868189.java b/test/jdk/java/beans/Introspector/Test6868189.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test6868189.java rename to test/jdk/java/beans/Introspector/Test6868189.java diff --git a/jdk/test/java/beans/Introspector/Test6963811.java b/test/jdk/java/beans/Introspector/Test6963811.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test6963811.java rename to test/jdk/java/beans/Introspector/Test6963811.java diff --git a/jdk/test/java/beans/Introspector/Test7172865.java b/test/jdk/java/beans/Introspector/Test7172865.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test7172865.java rename to test/jdk/java/beans/Introspector/Test7172865.java diff --git a/jdk/test/java/beans/Introspector/Test7186794.java b/test/jdk/java/beans/Introspector/Test7186794.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test7186794.java rename to test/jdk/java/beans/Introspector/Test7186794.java diff --git a/jdk/test/java/beans/Introspector/Test7189112.java b/test/jdk/java/beans/Introspector/Test7189112.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test7189112.java rename to test/jdk/java/beans/Introspector/Test7189112.java diff --git a/jdk/test/java/beans/Introspector/Test7192955.java b/test/jdk/java/beans/Introspector/Test7192955.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test7192955.java rename to test/jdk/java/beans/Introspector/Test7192955.java diff --git a/jdk/test/java/beans/Introspector/Test7193977.java b/test/jdk/java/beans/Introspector/Test7193977.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test7193977.java rename to test/jdk/java/beans/Introspector/Test7193977.java diff --git a/jdk/test/java/beans/Introspector/Test7195106.java b/test/jdk/java/beans/Introspector/Test7195106.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test7195106.java rename to test/jdk/java/beans/Introspector/Test7195106.java diff --git a/jdk/test/java/beans/Introspector/Test8005065.java b/test/jdk/java/beans/Introspector/Test8005065.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test8005065.java rename to test/jdk/java/beans/Introspector/Test8005065.java diff --git a/jdk/test/java/beans/Introspector/Test8027648.java b/test/jdk/java/beans/Introspector/Test8027648.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test8027648.java rename to test/jdk/java/beans/Introspector/Test8027648.java diff --git a/jdk/test/java/beans/Introspector/Test8027905.java b/test/jdk/java/beans/Introspector/Test8027905.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test8027905.java rename to test/jdk/java/beans/Introspector/Test8027905.java diff --git a/jdk/test/java/beans/Introspector/Test8034085.java b/test/jdk/java/beans/Introspector/Test8034085.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test8034085.java rename to test/jdk/java/beans/Introspector/Test8034085.java diff --git a/jdk/test/java/beans/Introspector/Test8034164.java b/test/jdk/java/beans/Introspector/Test8034164.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test8034164.java rename to test/jdk/java/beans/Introspector/Test8034164.java diff --git a/jdk/test/java/beans/Introspector/Test8039776.java b/test/jdk/java/beans/Introspector/Test8039776.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test8039776.java rename to test/jdk/java/beans/Introspector/Test8039776.java diff --git a/jdk/test/java/beans/Introspector/Test8040656.java b/test/jdk/java/beans/Introspector/Test8040656.java similarity index 100% rename from jdk/test/java/beans/Introspector/Test8040656.java rename to test/jdk/java/beans/Introspector/Test8040656.java diff --git a/jdk/test/java/beans/Introspector/TestCacheRecursion.java b/test/jdk/java/beans/Introspector/TestCacheRecursion.java similarity index 100% rename from jdk/test/java/beans/Introspector/TestCacheRecursion.java rename to test/jdk/java/beans/Introspector/TestCacheRecursion.java diff --git a/jdk/test/java/beans/Introspector/TestMethodOrderDependence.java b/test/jdk/java/beans/Introspector/TestMethodOrderDependence.java similarity index 100% rename from jdk/test/java/beans/Introspector/TestMethodOrderDependence.java rename to test/jdk/java/beans/Introspector/TestMethodOrderDependence.java diff --git a/jdk/test/java/beans/Introspector/TestTypeResolver.java b/test/jdk/java/beans/Introspector/TestTypeResolver.java similarity index 100% rename from jdk/test/java/beans/Introspector/TestTypeResolver.java rename to test/jdk/java/beans/Introspector/TestTypeResolver.java diff --git a/jdk/test/java/beans/Introspector/memory/Bean.java b/test/jdk/java/beans/Introspector/memory/Bean.java similarity index 100% rename from jdk/test/java/beans/Introspector/memory/Bean.java rename to test/jdk/java/beans/Introspector/memory/Bean.java diff --git a/jdk/test/java/beans/Introspector/memory/Bean2.java b/test/jdk/java/beans/Introspector/memory/Bean2.java similarity index 100% rename from jdk/test/java/beans/Introspector/memory/Bean2.java rename to test/jdk/java/beans/Introspector/memory/Bean2.java diff --git a/jdk/test/java/beans/Introspector/memory/Bean3.java b/test/jdk/java/beans/Introspector/memory/Bean3.java similarity index 100% rename from jdk/test/java/beans/Introspector/memory/Bean3.java rename to test/jdk/java/beans/Introspector/memory/Bean3.java diff --git a/jdk/test/java/beans/Introspector/memory/Bean4.java b/test/jdk/java/beans/Introspector/memory/Bean4.java similarity index 100% rename from jdk/test/java/beans/Introspector/memory/Bean4.java rename to test/jdk/java/beans/Introspector/memory/Bean4.java diff --git a/jdk/test/java/beans/Introspector/memory/SimpleClassLoader.java b/test/jdk/java/beans/Introspector/memory/SimpleClassLoader.java similarity index 100% rename from jdk/test/java/beans/Introspector/memory/SimpleClassLoader.java rename to test/jdk/java/beans/Introspector/memory/SimpleClassLoader.java diff --git a/jdk/test/java/beans/Introspector/memory/Test4508780.java b/test/jdk/java/beans/Introspector/memory/Test4508780.java similarity index 100% rename from jdk/test/java/beans/Introspector/memory/Test4508780.java rename to test/jdk/java/beans/Introspector/memory/Test4508780.java diff --git a/jdk/test/java/beans/Introspector/memory/Test4809008.java b/test/jdk/java/beans/Introspector/memory/Test4809008.java similarity index 100% rename from jdk/test/java/beans/Introspector/memory/Test4809008.java rename to test/jdk/java/beans/Introspector/memory/Test4809008.java diff --git a/jdk/test/java/beans/Performance/Test4058433.java b/test/jdk/java/beans/Performance/Test4058433.java similarity index 100% rename from jdk/test/java/beans/Performance/Test4058433.java rename to test/jdk/java/beans/Performance/Test4058433.java diff --git a/jdk/test/java/beans/Performance/Test7122740.java b/test/jdk/java/beans/Performance/Test7122740.java similarity index 100% rename from jdk/test/java/beans/Performance/Test7122740.java rename to test/jdk/java/beans/Performance/Test7122740.java diff --git a/jdk/test/java/beans/Performance/Test7184799.java b/test/jdk/java/beans/Performance/Test7184799.java similarity index 100% rename from jdk/test/java/beans/Performance/Test7184799.java rename to test/jdk/java/beans/Performance/Test7184799.java diff --git a/jdk/test/java/beans/Performance/TestIntrospector.java b/test/jdk/java/beans/Performance/TestIntrospector.java similarity index 100% rename from jdk/test/java/beans/Performance/TestIntrospector.java rename to test/jdk/java/beans/Performance/TestIntrospector.java diff --git a/jdk/test/java/beans/Performance/TestPropertyChangeSupport.java b/test/jdk/java/beans/Performance/TestPropertyChangeSupport.java similarity index 100% rename from jdk/test/java/beans/Performance/TestPropertyChangeSupport.java rename to test/jdk/java/beans/Performance/TestPropertyChangeSupport.java diff --git a/jdk/test/java/beans/Performance/TestVetoableChangeSupport.java b/test/jdk/java/beans/Performance/TestVetoableChangeSupport.java similarity index 100% rename from jdk/test/java/beans/Performance/TestVetoableChangeSupport.java rename to test/jdk/java/beans/Performance/TestVetoableChangeSupport.java diff --git a/jdk/test/java/beans/PropertyChangeSupport/1.5.0_10.ser b/test/jdk/java/beans/PropertyChangeSupport/1.5.0_10.ser similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/1.5.0_10.ser rename to test/jdk/java/beans/PropertyChangeSupport/1.5.0_10.ser diff --git a/jdk/test/java/beans/PropertyChangeSupport/1.6.0.ser b/test/jdk/java/beans/PropertyChangeSupport/1.6.0.ser similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/1.6.0.ser rename to test/jdk/java/beans/PropertyChangeSupport/1.6.0.ser diff --git a/jdk/test/java/beans/PropertyChangeSupport/Test4092905.java b/test/jdk/java/beans/PropertyChangeSupport/Test4092905.java similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/Test4092905.java rename to test/jdk/java/beans/PropertyChangeSupport/Test4092905.java diff --git a/jdk/test/java/beans/PropertyChangeSupport/Test4353056.java b/test/jdk/java/beans/PropertyChangeSupport/Test4353056.java similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/Test4353056.java rename to test/jdk/java/beans/PropertyChangeSupport/Test4353056.java diff --git a/jdk/test/java/beans/PropertyChangeSupport/Test4682386.java b/test/jdk/java/beans/PropertyChangeSupport/Test4682386.java similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/Test4682386.java rename to test/jdk/java/beans/PropertyChangeSupport/Test4682386.java diff --git a/jdk/test/java/beans/PropertyChangeSupport/Test4985020.java b/test/jdk/java/beans/PropertyChangeSupport/Test4985020.java similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/Test4985020.java rename to test/jdk/java/beans/PropertyChangeSupport/Test4985020.java diff --git a/jdk/test/java/beans/PropertyChangeSupport/Test7087429.java b/test/jdk/java/beans/PropertyChangeSupport/Test7087429.java similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/Test7087429.java rename to test/jdk/java/beans/PropertyChangeSupport/Test7087429.java diff --git a/jdk/test/java/beans/PropertyChangeSupport/Test7148143.java b/test/jdk/java/beans/PropertyChangeSupport/Test7148143.java similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/Test7148143.java rename to test/jdk/java/beans/PropertyChangeSupport/Test7148143.java diff --git a/jdk/test/java/beans/PropertyChangeSupport/TestEquals.java b/test/jdk/java/beans/PropertyChangeSupport/TestEquals.java similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/TestEquals.java rename to test/jdk/java/beans/PropertyChangeSupport/TestEquals.java diff --git a/jdk/test/java/beans/PropertyChangeSupport/TestListeners.java b/test/jdk/java/beans/PropertyChangeSupport/TestListeners.java similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/TestListeners.java rename to test/jdk/java/beans/PropertyChangeSupport/TestListeners.java diff --git a/jdk/test/java/beans/PropertyChangeSupport/TestMethods.java b/test/jdk/java/beans/PropertyChangeSupport/TestMethods.java similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/TestMethods.java rename to test/jdk/java/beans/PropertyChangeSupport/TestMethods.java diff --git a/jdk/test/java/beans/PropertyChangeSupport/TestSerialization.java b/test/jdk/java/beans/PropertyChangeSupport/TestSerialization.java similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/TestSerialization.java rename to test/jdk/java/beans/PropertyChangeSupport/TestSerialization.java diff --git a/jdk/test/java/beans/PropertyChangeSupport/TestSynchronization.java b/test/jdk/java/beans/PropertyChangeSupport/TestSynchronization.java similarity index 100% rename from jdk/test/java/beans/PropertyChangeSupport/TestSynchronization.java rename to test/jdk/java/beans/PropertyChangeSupport/TestSynchronization.java diff --git a/jdk/test/java/beans/PropertyEditor/6380849/FirstBean.java b/test/jdk/java/beans/PropertyEditor/6380849/FirstBean.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/6380849/FirstBean.java rename to test/jdk/java/beans/PropertyEditor/6380849/FirstBean.java diff --git a/jdk/test/java/beans/PropertyEditor/6380849/FirstBeanEditor.java b/test/jdk/java/beans/PropertyEditor/6380849/FirstBeanEditor.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/6380849/FirstBeanEditor.java rename to test/jdk/java/beans/PropertyEditor/6380849/FirstBeanEditor.java diff --git a/jdk/test/java/beans/PropertyEditor/6380849/SecondBean.java b/test/jdk/java/beans/PropertyEditor/6380849/SecondBean.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/6380849/SecondBean.java rename to test/jdk/java/beans/PropertyEditor/6380849/SecondBean.java diff --git a/jdk/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java b/test/jdk/java/beans/PropertyEditor/6380849/TestPropertyEditor.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java rename to test/jdk/java/beans/PropertyEditor/6380849/TestPropertyEditor.java diff --git a/jdk/test/java/beans/PropertyEditor/6380849/ThirdBean.java b/test/jdk/java/beans/PropertyEditor/6380849/ThirdBean.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/6380849/ThirdBean.java rename to test/jdk/java/beans/PropertyEditor/6380849/ThirdBean.java diff --git a/jdk/test/java/beans/PropertyEditor/6380849/editors/SecondBeanEditor.java b/test/jdk/java/beans/PropertyEditor/6380849/editors/SecondBeanEditor.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/6380849/editors/SecondBeanEditor.java rename to test/jdk/java/beans/PropertyEditor/6380849/editors/SecondBeanEditor.java diff --git a/jdk/test/java/beans/PropertyEditor/6380849/editors/ThirdBeanEditor.java b/test/jdk/java/beans/PropertyEditor/6380849/editors/ThirdBeanEditor.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/6380849/editors/ThirdBeanEditor.java rename to test/jdk/java/beans/PropertyEditor/6380849/editors/ThirdBeanEditor.java diff --git a/jdk/test/java/beans/PropertyEditor/MemoryClassLoader.java b/test/jdk/java/beans/PropertyEditor/MemoryClassLoader.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/MemoryClassLoader.java rename to test/jdk/java/beans/PropertyEditor/MemoryClassLoader.java diff --git a/jdk/test/java/beans/PropertyEditor/Test4968709.java b/test/jdk/java/beans/PropertyEditor/Test4968709.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/Test4968709.java rename to test/jdk/java/beans/PropertyEditor/Test4968709.java diff --git a/jdk/test/java/beans/PropertyEditor/Test6397609.java b/test/jdk/java/beans/PropertyEditor/Test6397609.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/Test6397609.java rename to test/jdk/java/beans/PropertyEditor/Test6397609.java diff --git a/jdk/test/java/beans/PropertyEditor/Test6963811.java b/test/jdk/java/beans/PropertyEditor/Test6963811.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/Test6963811.java rename to test/jdk/java/beans/PropertyEditor/Test6963811.java diff --git a/jdk/test/java/beans/PropertyEditor/Test7087876.java b/test/jdk/java/beans/PropertyEditor/Test7087876.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/Test7087876.java rename to test/jdk/java/beans/PropertyEditor/Test7087876.java diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanClass.java b/test/jdk/java/beans/PropertyEditor/TestBooleanClass.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestBooleanClass.java rename to test/jdk/java/beans/PropertyEditor/TestBooleanClass.java diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanClassJava.java b/test/jdk/java/beans/PropertyEditor/TestBooleanClassJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestBooleanClassJava.java rename to test/jdk/java/beans/PropertyEditor/TestBooleanClassJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanClassNull.java b/test/jdk/java/beans/PropertyEditor/TestBooleanClassNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestBooleanClassNull.java rename to test/jdk/java/beans/PropertyEditor/TestBooleanClassNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanClassValue.java b/test/jdk/java/beans/PropertyEditor/TestBooleanClassValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestBooleanClassValue.java rename to test/jdk/java/beans/PropertyEditor/TestBooleanClassValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanType.java b/test/jdk/java/beans/PropertyEditor/TestBooleanType.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestBooleanType.java rename to test/jdk/java/beans/PropertyEditor/TestBooleanType.java diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanTypeJava.java b/test/jdk/java/beans/PropertyEditor/TestBooleanTypeJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestBooleanTypeJava.java rename to test/jdk/java/beans/PropertyEditor/TestBooleanTypeJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanTypeNull.java b/test/jdk/java/beans/PropertyEditor/TestBooleanTypeNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestBooleanTypeNull.java rename to test/jdk/java/beans/PropertyEditor/TestBooleanTypeNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanTypeValue.java b/test/jdk/java/beans/PropertyEditor/TestBooleanTypeValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestBooleanTypeValue.java rename to test/jdk/java/beans/PropertyEditor/TestBooleanTypeValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestByteClass.java b/test/jdk/java/beans/PropertyEditor/TestByteClass.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestByteClass.java rename to test/jdk/java/beans/PropertyEditor/TestByteClass.java diff --git a/jdk/test/java/beans/PropertyEditor/TestByteClassJava.java b/test/jdk/java/beans/PropertyEditor/TestByteClassJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestByteClassJava.java rename to test/jdk/java/beans/PropertyEditor/TestByteClassJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestByteClassNull.java b/test/jdk/java/beans/PropertyEditor/TestByteClassNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestByteClassNull.java rename to test/jdk/java/beans/PropertyEditor/TestByteClassNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestByteClassValue.java b/test/jdk/java/beans/PropertyEditor/TestByteClassValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestByteClassValue.java rename to test/jdk/java/beans/PropertyEditor/TestByteClassValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestByteType.java b/test/jdk/java/beans/PropertyEditor/TestByteType.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestByteType.java rename to test/jdk/java/beans/PropertyEditor/TestByteType.java diff --git a/jdk/test/java/beans/PropertyEditor/TestByteTypeJava.java b/test/jdk/java/beans/PropertyEditor/TestByteTypeJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestByteTypeJava.java rename to test/jdk/java/beans/PropertyEditor/TestByteTypeJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestByteTypeNull.java b/test/jdk/java/beans/PropertyEditor/TestByteTypeNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestByteTypeNull.java rename to test/jdk/java/beans/PropertyEditor/TestByteTypeNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestByteTypeValue.java b/test/jdk/java/beans/PropertyEditor/TestByteTypeValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestByteTypeValue.java rename to test/jdk/java/beans/PropertyEditor/TestByteTypeValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestColorClass.java b/test/jdk/java/beans/PropertyEditor/TestColorClass.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestColorClass.java rename to test/jdk/java/beans/PropertyEditor/TestColorClass.java diff --git a/jdk/test/java/beans/PropertyEditor/TestColorClassJava.java b/test/jdk/java/beans/PropertyEditor/TestColorClassJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestColorClassJava.java rename to test/jdk/java/beans/PropertyEditor/TestColorClassJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestColorClassNull.java b/test/jdk/java/beans/PropertyEditor/TestColorClassNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestColorClassNull.java rename to test/jdk/java/beans/PropertyEditor/TestColorClassNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestColorClassValue.java b/test/jdk/java/beans/PropertyEditor/TestColorClassValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestColorClassValue.java rename to test/jdk/java/beans/PropertyEditor/TestColorClassValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleClass.java b/test/jdk/java/beans/PropertyEditor/TestDoubleClass.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestDoubleClass.java rename to test/jdk/java/beans/PropertyEditor/TestDoubleClass.java diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleClassJava.java b/test/jdk/java/beans/PropertyEditor/TestDoubleClassJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestDoubleClassJava.java rename to test/jdk/java/beans/PropertyEditor/TestDoubleClassJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleClassNull.java b/test/jdk/java/beans/PropertyEditor/TestDoubleClassNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestDoubleClassNull.java rename to test/jdk/java/beans/PropertyEditor/TestDoubleClassNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleClassValue.java b/test/jdk/java/beans/PropertyEditor/TestDoubleClassValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestDoubleClassValue.java rename to test/jdk/java/beans/PropertyEditor/TestDoubleClassValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleType.java b/test/jdk/java/beans/PropertyEditor/TestDoubleType.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestDoubleType.java rename to test/jdk/java/beans/PropertyEditor/TestDoubleType.java diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleTypeJava.java b/test/jdk/java/beans/PropertyEditor/TestDoubleTypeJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestDoubleTypeJava.java rename to test/jdk/java/beans/PropertyEditor/TestDoubleTypeJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleTypeNull.java b/test/jdk/java/beans/PropertyEditor/TestDoubleTypeNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestDoubleTypeNull.java rename to test/jdk/java/beans/PropertyEditor/TestDoubleTypeNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleTypeValue.java b/test/jdk/java/beans/PropertyEditor/TestDoubleTypeValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestDoubleTypeValue.java rename to test/jdk/java/beans/PropertyEditor/TestDoubleTypeValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestEditor.java b/test/jdk/java/beans/PropertyEditor/TestEditor.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestEditor.java rename to test/jdk/java/beans/PropertyEditor/TestEditor.java diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumClass.java b/test/jdk/java/beans/PropertyEditor/TestEnumClass.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestEnumClass.java rename to test/jdk/java/beans/PropertyEditor/TestEnumClass.java diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumClassJava.java b/test/jdk/java/beans/PropertyEditor/TestEnumClassJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestEnumClassJava.java rename to test/jdk/java/beans/PropertyEditor/TestEnumClassJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumClassNull.java b/test/jdk/java/beans/PropertyEditor/TestEnumClassNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestEnumClassNull.java rename to test/jdk/java/beans/PropertyEditor/TestEnumClassNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumClassValue.java b/test/jdk/java/beans/PropertyEditor/TestEnumClassValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestEnumClassValue.java rename to test/jdk/java/beans/PropertyEditor/TestEnumClassValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumSubclass.java b/test/jdk/java/beans/PropertyEditor/TestEnumSubclass.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestEnumSubclass.java rename to test/jdk/java/beans/PropertyEditor/TestEnumSubclass.java diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumSubclassJava.java b/test/jdk/java/beans/PropertyEditor/TestEnumSubclassJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestEnumSubclassJava.java rename to test/jdk/java/beans/PropertyEditor/TestEnumSubclassJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumSubclassNull.java b/test/jdk/java/beans/PropertyEditor/TestEnumSubclassNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestEnumSubclassNull.java rename to test/jdk/java/beans/PropertyEditor/TestEnumSubclassNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumSubclassValue.java b/test/jdk/java/beans/PropertyEditor/TestEnumSubclassValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestEnumSubclassValue.java rename to test/jdk/java/beans/PropertyEditor/TestEnumSubclassValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatClass.java b/test/jdk/java/beans/PropertyEditor/TestFloatClass.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestFloatClass.java rename to test/jdk/java/beans/PropertyEditor/TestFloatClass.java diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatClassJava.java b/test/jdk/java/beans/PropertyEditor/TestFloatClassJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestFloatClassJava.java rename to test/jdk/java/beans/PropertyEditor/TestFloatClassJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatClassNull.java b/test/jdk/java/beans/PropertyEditor/TestFloatClassNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestFloatClassNull.java rename to test/jdk/java/beans/PropertyEditor/TestFloatClassNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatClassValue.java b/test/jdk/java/beans/PropertyEditor/TestFloatClassValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestFloatClassValue.java rename to test/jdk/java/beans/PropertyEditor/TestFloatClassValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatType.java b/test/jdk/java/beans/PropertyEditor/TestFloatType.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestFloatType.java rename to test/jdk/java/beans/PropertyEditor/TestFloatType.java diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatTypeJava.java b/test/jdk/java/beans/PropertyEditor/TestFloatTypeJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestFloatTypeJava.java rename to test/jdk/java/beans/PropertyEditor/TestFloatTypeJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatTypeNull.java b/test/jdk/java/beans/PropertyEditor/TestFloatTypeNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestFloatTypeNull.java rename to test/jdk/java/beans/PropertyEditor/TestFloatTypeNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatTypeValue.java b/test/jdk/java/beans/PropertyEditor/TestFloatTypeValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestFloatTypeValue.java rename to test/jdk/java/beans/PropertyEditor/TestFloatTypeValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestFontClass.java b/test/jdk/java/beans/PropertyEditor/TestFontClass.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestFontClass.java rename to test/jdk/java/beans/PropertyEditor/TestFontClass.java diff --git a/jdk/test/java/beans/PropertyEditor/TestFontClassJava.java b/test/jdk/java/beans/PropertyEditor/TestFontClassJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestFontClassJava.java rename to test/jdk/java/beans/PropertyEditor/TestFontClassJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestFontClassNull.java b/test/jdk/java/beans/PropertyEditor/TestFontClassNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestFontClassNull.java rename to test/jdk/java/beans/PropertyEditor/TestFontClassNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestFontClassValue.java b/test/jdk/java/beans/PropertyEditor/TestFontClassValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestFontClassValue.java rename to test/jdk/java/beans/PropertyEditor/TestFontClassValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerClass.java b/test/jdk/java/beans/PropertyEditor/TestIntegerClass.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestIntegerClass.java rename to test/jdk/java/beans/PropertyEditor/TestIntegerClass.java diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerClassJava.java b/test/jdk/java/beans/PropertyEditor/TestIntegerClassJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestIntegerClassJava.java rename to test/jdk/java/beans/PropertyEditor/TestIntegerClassJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerClassNull.java b/test/jdk/java/beans/PropertyEditor/TestIntegerClassNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestIntegerClassNull.java rename to test/jdk/java/beans/PropertyEditor/TestIntegerClassNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerClassValue.java b/test/jdk/java/beans/PropertyEditor/TestIntegerClassValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestIntegerClassValue.java rename to test/jdk/java/beans/PropertyEditor/TestIntegerClassValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerType.java b/test/jdk/java/beans/PropertyEditor/TestIntegerType.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestIntegerType.java rename to test/jdk/java/beans/PropertyEditor/TestIntegerType.java diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerTypeJava.java b/test/jdk/java/beans/PropertyEditor/TestIntegerTypeJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestIntegerTypeJava.java rename to test/jdk/java/beans/PropertyEditor/TestIntegerTypeJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerTypeNull.java b/test/jdk/java/beans/PropertyEditor/TestIntegerTypeNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestIntegerTypeNull.java rename to test/jdk/java/beans/PropertyEditor/TestIntegerTypeNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerTypeValue.java b/test/jdk/java/beans/PropertyEditor/TestIntegerTypeValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestIntegerTypeValue.java rename to test/jdk/java/beans/PropertyEditor/TestIntegerTypeValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestLongClass.java b/test/jdk/java/beans/PropertyEditor/TestLongClass.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestLongClass.java rename to test/jdk/java/beans/PropertyEditor/TestLongClass.java diff --git a/jdk/test/java/beans/PropertyEditor/TestLongClassJava.java b/test/jdk/java/beans/PropertyEditor/TestLongClassJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestLongClassJava.java rename to test/jdk/java/beans/PropertyEditor/TestLongClassJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestLongClassNull.java b/test/jdk/java/beans/PropertyEditor/TestLongClassNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestLongClassNull.java rename to test/jdk/java/beans/PropertyEditor/TestLongClassNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestLongClassValue.java b/test/jdk/java/beans/PropertyEditor/TestLongClassValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestLongClassValue.java rename to test/jdk/java/beans/PropertyEditor/TestLongClassValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestLongType.java b/test/jdk/java/beans/PropertyEditor/TestLongType.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestLongType.java rename to test/jdk/java/beans/PropertyEditor/TestLongType.java diff --git a/jdk/test/java/beans/PropertyEditor/TestLongTypeJava.java b/test/jdk/java/beans/PropertyEditor/TestLongTypeJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestLongTypeJava.java rename to test/jdk/java/beans/PropertyEditor/TestLongTypeJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestLongTypeNull.java b/test/jdk/java/beans/PropertyEditor/TestLongTypeNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestLongTypeNull.java rename to test/jdk/java/beans/PropertyEditor/TestLongTypeNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestLongTypeValue.java b/test/jdk/java/beans/PropertyEditor/TestLongTypeValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestLongTypeValue.java rename to test/jdk/java/beans/PropertyEditor/TestLongTypeValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestShortClass.java b/test/jdk/java/beans/PropertyEditor/TestShortClass.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestShortClass.java rename to test/jdk/java/beans/PropertyEditor/TestShortClass.java diff --git a/jdk/test/java/beans/PropertyEditor/TestShortClassJava.java b/test/jdk/java/beans/PropertyEditor/TestShortClassJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestShortClassJava.java rename to test/jdk/java/beans/PropertyEditor/TestShortClassJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestShortClassNull.java b/test/jdk/java/beans/PropertyEditor/TestShortClassNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestShortClassNull.java rename to test/jdk/java/beans/PropertyEditor/TestShortClassNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestShortClassValue.java b/test/jdk/java/beans/PropertyEditor/TestShortClassValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestShortClassValue.java rename to test/jdk/java/beans/PropertyEditor/TestShortClassValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestShortType.java b/test/jdk/java/beans/PropertyEditor/TestShortType.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestShortType.java rename to test/jdk/java/beans/PropertyEditor/TestShortType.java diff --git a/jdk/test/java/beans/PropertyEditor/TestShortTypeJava.java b/test/jdk/java/beans/PropertyEditor/TestShortTypeJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestShortTypeJava.java rename to test/jdk/java/beans/PropertyEditor/TestShortTypeJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestShortTypeNull.java b/test/jdk/java/beans/PropertyEditor/TestShortTypeNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestShortTypeNull.java rename to test/jdk/java/beans/PropertyEditor/TestShortTypeNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestShortTypeValue.java b/test/jdk/java/beans/PropertyEditor/TestShortTypeValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestShortTypeValue.java rename to test/jdk/java/beans/PropertyEditor/TestShortTypeValue.java diff --git a/jdk/test/java/beans/PropertyEditor/TestStringClass.java b/test/jdk/java/beans/PropertyEditor/TestStringClass.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestStringClass.java rename to test/jdk/java/beans/PropertyEditor/TestStringClass.java diff --git a/jdk/test/java/beans/PropertyEditor/TestStringClassJava.java b/test/jdk/java/beans/PropertyEditor/TestStringClassJava.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestStringClassJava.java rename to test/jdk/java/beans/PropertyEditor/TestStringClassJava.java diff --git a/jdk/test/java/beans/PropertyEditor/TestStringClassNull.java b/test/jdk/java/beans/PropertyEditor/TestStringClassNull.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestStringClassNull.java rename to test/jdk/java/beans/PropertyEditor/TestStringClassNull.java diff --git a/jdk/test/java/beans/PropertyEditor/TestStringClassValue.java b/test/jdk/java/beans/PropertyEditor/TestStringClassValue.java similarity index 100% rename from jdk/test/java/beans/PropertyEditor/TestStringClassValue.java rename to test/jdk/java/beans/PropertyEditor/TestStringClassValue.java diff --git a/jdk/test/java/beans/README b/test/jdk/java/beans/README similarity index 100% rename from jdk/test/java/beans/README rename to test/jdk/java/beans/README diff --git a/jdk/test/java/beans/SimpleBeanInfo/LoadingStandardIcons/LoadingStandardIcons.java b/test/jdk/java/beans/SimpleBeanInfo/LoadingStandardIcons/LoadingStandardIcons.java similarity index 100% rename from jdk/test/java/beans/SimpleBeanInfo/LoadingStandardIcons/LoadingStandardIcons.java rename to test/jdk/java/beans/SimpleBeanInfo/LoadingStandardIcons/LoadingStandardIcons.java diff --git a/jdk/test/java/beans/SimpleBeanInfo/LoadingStandardIcons/java.policy b/test/jdk/java/beans/SimpleBeanInfo/LoadingStandardIcons/java.policy similarity index 100% rename from jdk/test/java/beans/SimpleBeanInfo/LoadingStandardIcons/java.policy rename to test/jdk/java/beans/SimpleBeanInfo/LoadingStandardIcons/java.policy diff --git a/jdk/test/java/beans/Statement/ClassForName/ClassForName.java b/test/jdk/java/beans/Statement/ClassForName/ClassForName.java similarity index 100% rename from jdk/test/java/beans/Statement/ClassForName/ClassForName.java rename to test/jdk/java/beans/Statement/ClassForName/ClassForName.java diff --git a/jdk/test/java/beans/Statement/ClassForName/java.policy b/test/jdk/java/beans/Statement/ClassForName/java.policy similarity index 100% rename from jdk/test/java/beans/Statement/ClassForName/java.policy rename to test/jdk/java/beans/Statement/ClassForName/java.policy diff --git a/jdk/test/java/beans/Statement/Test4530962.java b/test/jdk/java/beans/Statement/Test4530962.java similarity index 100% rename from jdk/test/java/beans/Statement/Test4530962.java rename to test/jdk/java/beans/Statement/Test4530962.java diff --git a/jdk/test/java/beans/Statement/Test4653179.java b/test/jdk/java/beans/Statement/Test4653179.java similarity index 100% rename from jdk/test/java/beans/Statement/Test4653179.java rename to test/jdk/java/beans/Statement/Test4653179.java diff --git a/jdk/test/java/beans/Statement/Test6224433.java b/test/jdk/java/beans/Statement/Test6224433.java similarity index 100% rename from jdk/test/java/beans/Statement/Test6224433.java rename to test/jdk/java/beans/Statement/Test6224433.java diff --git a/jdk/test/java/beans/Statement/Test6707226.java b/test/jdk/java/beans/Statement/Test6707226.java similarity index 100% rename from jdk/test/java/beans/Statement/Test6707226.java rename to test/jdk/java/beans/Statement/Test6707226.java diff --git a/jdk/test/java/beans/Statement/Test6788531.java b/test/jdk/java/beans/Statement/Test6788531.java similarity index 100% rename from jdk/test/java/beans/Statement/Test6788531.java rename to test/jdk/java/beans/Statement/Test6788531.java diff --git a/jdk/test/java/beans/TEST.properties b/test/jdk/java/beans/TEST.properties similarity index 100% rename from jdk/test/java/beans/TEST.properties rename to test/jdk/java/beans/TEST.properties diff --git a/jdk/test/java/beans/VetoableChangeSupport/1.5.0_10.ser b/test/jdk/java/beans/VetoableChangeSupport/1.5.0_10.ser similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/1.5.0_10.ser rename to test/jdk/java/beans/VetoableChangeSupport/1.5.0_10.ser diff --git a/jdk/test/java/beans/VetoableChangeSupport/1.6.0.ser b/test/jdk/java/beans/VetoableChangeSupport/1.6.0.ser similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/1.6.0.ser rename to test/jdk/java/beans/VetoableChangeSupport/1.6.0.ser diff --git a/jdk/test/java/beans/VetoableChangeSupport/Test4076065.java b/test/jdk/java/beans/VetoableChangeSupport/Test4076065.java similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/Test4076065.java rename to test/jdk/java/beans/VetoableChangeSupport/Test4076065.java diff --git a/jdk/test/java/beans/VetoableChangeSupport/Test4092906.java b/test/jdk/java/beans/VetoableChangeSupport/Test4092906.java similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/Test4092906.java rename to test/jdk/java/beans/VetoableChangeSupport/Test4092906.java diff --git a/jdk/test/java/beans/VetoableChangeSupport/Test4425885.java b/test/jdk/java/beans/VetoableChangeSupport/Test4425885.java similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/Test4425885.java rename to test/jdk/java/beans/VetoableChangeSupport/Test4425885.java diff --git a/jdk/test/java/beans/VetoableChangeSupport/Test4994635.java b/test/jdk/java/beans/VetoableChangeSupport/Test4994635.java similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/Test4994635.java rename to test/jdk/java/beans/VetoableChangeSupport/Test4994635.java diff --git a/jdk/test/java/beans/VetoableChangeSupport/Test6630275.java b/test/jdk/java/beans/VetoableChangeSupport/Test6630275.java similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/Test6630275.java rename to test/jdk/java/beans/VetoableChangeSupport/Test6630275.java diff --git a/jdk/test/java/beans/VetoableChangeSupport/Test7148143.java b/test/jdk/java/beans/VetoableChangeSupport/Test7148143.java similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/Test7148143.java rename to test/jdk/java/beans/VetoableChangeSupport/Test7148143.java diff --git a/jdk/test/java/beans/VetoableChangeSupport/TestEquals.java b/test/jdk/java/beans/VetoableChangeSupport/TestEquals.java similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/TestEquals.java rename to test/jdk/java/beans/VetoableChangeSupport/TestEquals.java diff --git a/jdk/test/java/beans/VetoableChangeSupport/TestListeners.java b/test/jdk/java/beans/VetoableChangeSupport/TestListeners.java similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/TestListeners.java rename to test/jdk/java/beans/VetoableChangeSupport/TestListeners.java diff --git a/jdk/test/java/beans/VetoableChangeSupport/TestMethods.java b/test/jdk/java/beans/VetoableChangeSupport/TestMethods.java similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/TestMethods.java rename to test/jdk/java/beans/VetoableChangeSupport/TestMethods.java diff --git a/jdk/test/java/beans/VetoableChangeSupport/TestSerialization.java b/test/jdk/java/beans/VetoableChangeSupport/TestSerialization.java similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/TestSerialization.java rename to test/jdk/java/beans/VetoableChangeSupport/TestSerialization.java diff --git a/jdk/test/java/beans/VetoableChangeSupport/TestSynchronization.java b/test/jdk/java/beans/VetoableChangeSupport/TestSynchronization.java similarity index 100% rename from jdk/test/java/beans/VetoableChangeSupport/TestSynchronization.java rename to test/jdk/java/beans/VetoableChangeSupport/TestSynchronization.java diff --git a/jdk/test/java/beans/XMLDecoder/4676532/Test4676532.java b/test/jdk/java/beans/XMLDecoder/4676532/Test4676532.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/4676532/Test4676532.java rename to test/jdk/java/beans/XMLDecoder/4676532/Test4676532.java diff --git a/jdk/test/java/beans/XMLDecoder/4676532/test.jar b/test/jdk/java/beans/XMLDecoder/4676532/test.jar similarity index 100% rename from jdk/test/java/beans/XMLDecoder/4676532/test.jar rename to test/jdk/java/beans/XMLDecoder/4676532/test.jar diff --git a/jdk/test/java/beans/XMLDecoder/8028054/Task.java b/test/jdk/java/beans/XMLDecoder/8028054/Task.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/8028054/Task.java rename to test/jdk/java/beans/XMLDecoder/8028054/Task.java diff --git a/jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java b/test/jdk/java/beans/XMLDecoder/8028054/TestConstructorFinder.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java rename to test/jdk/java/beans/XMLDecoder/8028054/TestConstructorFinder.java diff --git a/jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java b/test/jdk/java/beans/XMLDecoder/8028054/TestMethodFinder.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java rename to test/jdk/java/beans/XMLDecoder/8028054/TestMethodFinder.java diff --git a/jdk/test/java/beans/XMLDecoder/Test4864117.java b/test/jdk/java/beans/XMLDecoder/Test4864117.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/Test4864117.java rename to test/jdk/java/beans/XMLDecoder/Test4864117.java diff --git a/jdk/test/java/beans/XMLDecoder/Test6338070.java b/test/jdk/java/beans/XMLDecoder/Test6338070.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/Test6338070.java rename to test/jdk/java/beans/XMLDecoder/Test6338070.java diff --git a/jdk/test/java/beans/XMLDecoder/Test6341798.java b/test/jdk/java/beans/XMLDecoder/Test6341798.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/Test6341798.java rename to test/jdk/java/beans/XMLDecoder/Test6341798.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/AbstractTest.java b/test/jdk/java/beans/XMLDecoder/spec/AbstractTest.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/AbstractTest.java rename to test/jdk/java/beans/XMLDecoder/spec/AbstractTest.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestArray.java b/test/jdk/java/beans/XMLDecoder/spec/TestArray.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestArray.java rename to test/jdk/java/beans/XMLDecoder/spec/TestArray.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestBoolean.java b/test/jdk/java/beans/XMLDecoder/spec/TestBoolean.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestBoolean.java rename to test/jdk/java/beans/XMLDecoder/spec/TestBoolean.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestByte.java b/test/jdk/java/beans/XMLDecoder/spec/TestByte.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestByte.java rename to test/jdk/java/beans/XMLDecoder/spec/TestByte.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestChar.java b/test/jdk/java/beans/XMLDecoder/spec/TestChar.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestChar.java rename to test/jdk/java/beans/XMLDecoder/spec/TestChar.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestClass.java b/test/jdk/java/beans/XMLDecoder/spec/TestClass.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestClass.java rename to test/jdk/java/beans/XMLDecoder/spec/TestClass.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestDouble.java b/test/jdk/java/beans/XMLDecoder/spec/TestDouble.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestDouble.java rename to test/jdk/java/beans/XMLDecoder/spec/TestDouble.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestFalse.java b/test/jdk/java/beans/XMLDecoder/spec/TestFalse.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestFalse.java rename to test/jdk/java/beans/XMLDecoder/spec/TestFalse.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestField.java b/test/jdk/java/beans/XMLDecoder/spec/TestField.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestField.java rename to test/jdk/java/beans/XMLDecoder/spec/TestField.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestFloat.java b/test/jdk/java/beans/XMLDecoder/spec/TestFloat.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestFloat.java rename to test/jdk/java/beans/XMLDecoder/spec/TestFloat.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestInt.java b/test/jdk/java/beans/XMLDecoder/spec/TestInt.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestInt.java rename to test/jdk/java/beans/XMLDecoder/spec/TestInt.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestJava.java b/test/jdk/java/beans/XMLDecoder/spec/TestJava.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestJava.java rename to test/jdk/java/beans/XMLDecoder/spec/TestJava.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestLong.java b/test/jdk/java/beans/XMLDecoder/spec/TestLong.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestLong.java rename to test/jdk/java/beans/XMLDecoder/spec/TestLong.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestMethod.java b/test/jdk/java/beans/XMLDecoder/spec/TestMethod.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestMethod.java rename to test/jdk/java/beans/XMLDecoder/spec/TestMethod.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestNew.java b/test/jdk/java/beans/XMLDecoder/spec/TestNew.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestNew.java rename to test/jdk/java/beans/XMLDecoder/spec/TestNew.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestNull.java b/test/jdk/java/beans/XMLDecoder/spec/TestNull.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestNull.java rename to test/jdk/java/beans/XMLDecoder/spec/TestNull.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestObject.java b/test/jdk/java/beans/XMLDecoder/spec/TestObject.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestObject.java rename to test/jdk/java/beans/XMLDecoder/spec/TestObject.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestProperty.java b/test/jdk/java/beans/XMLDecoder/spec/TestProperty.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestProperty.java rename to test/jdk/java/beans/XMLDecoder/spec/TestProperty.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestShort.java b/test/jdk/java/beans/XMLDecoder/spec/TestShort.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestShort.java rename to test/jdk/java/beans/XMLDecoder/spec/TestShort.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestString.java b/test/jdk/java/beans/XMLDecoder/spec/TestString.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestString.java rename to test/jdk/java/beans/XMLDecoder/spec/TestString.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestTrue.java b/test/jdk/java/beans/XMLDecoder/spec/TestTrue.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestTrue.java rename to test/jdk/java/beans/XMLDecoder/spec/TestTrue.java diff --git a/jdk/test/java/beans/XMLDecoder/spec/TestVar.java b/test/jdk/java/beans/XMLDecoder/spec/TestVar.java similarity index 100% rename from jdk/test/java/beans/XMLDecoder/spec/TestVar.java rename to test/jdk/java/beans/XMLDecoder/spec/TestVar.java diff --git a/jdk/test/java/beans/XMLEncoder/4741757/AbstractTest.java b/test/jdk/java/beans/XMLEncoder/4741757/AbstractTest.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/4741757/AbstractTest.java rename to test/jdk/java/beans/XMLEncoder/4741757/AbstractTest.java diff --git a/jdk/test/java/beans/XMLEncoder/4741757/TestFieldAccess.java b/test/jdk/java/beans/XMLEncoder/4741757/TestFieldAccess.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/4741757/TestFieldAccess.java rename to test/jdk/java/beans/XMLEncoder/4741757/TestFieldAccess.java diff --git a/jdk/test/java/beans/XMLEncoder/4741757/TestSecurityManager.java b/test/jdk/java/beans/XMLEncoder/4741757/TestSecurityManager.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/4741757/TestSecurityManager.java rename to test/jdk/java/beans/XMLEncoder/4741757/TestSecurityManager.java diff --git a/jdk/test/java/beans/XMLEncoder/4741757/TestStackOverflow.java b/test/jdk/java/beans/XMLEncoder/4741757/TestStackOverflow.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/4741757/TestStackOverflow.java rename to test/jdk/java/beans/XMLEncoder/4741757/TestStackOverflow.java diff --git a/jdk/test/java/beans/XMLEncoder/6329581/Test6329581.java b/test/jdk/java/beans/XMLEncoder/6329581/Test6329581.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6329581/Test6329581.java rename to test/jdk/java/beans/XMLEncoder/6329581/Test6329581.java diff --git a/jdk/test/java/beans/XMLEncoder/6380849/Bean.java b/test/jdk/java/beans/XMLEncoder/6380849/Bean.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6380849/Bean.java rename to test/jdk/java/beans/XMLEncoder/6380849/Bean.java diff --git a/jdk/test/java/beans/XMLEncoder/6380849/BeanPersistenceDelegate.java b/test/jdk/java/beans/XMLEncoder/6380849/BeanPersistenceDelegate.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6380849/BeanPersistenceDelegate.java rename to test/jdk/java/beans/XMLEncoder/6380849/BeanPersistenceDelegate.java diff --git a/jdk/test/java/beans/XMLEncoder/6380849/TestPersistenceDelegate.java b/test/jdk/java/beans/XMLEncoder/6380849/TestPersistenceDelegate.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6380849/TestPersistenceDelegate.java rename to test/jdk/java/beans/XMLEncoder/6380849/TestPersistenceDelegate.java diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestBox.java b/test/jdk/java/beans/XMLEncoder/6777487/TestBox.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6777487/TestBox.java rename to test/jdk/java/beans/XMLEncoder/6777487/TestBox.java diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedCollection.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedCollection.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6777487/TestCheckedCollection.java rename to test/jdk/java/beans/XMLEncoder/6777487/TestCheckedCollection.java diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedList.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedList.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6777487/TestCheckedList.java rename to test/jdk/java/beans/XMLEncoder/6777487/TestCheckedList.java diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedMap.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedMap.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6777487/TestCheckedMap.java rename to test/jdk/java/beans/XMLEncoder/6777487/TestCheckedMap.java diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java rename to test/jdk/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSet.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSet.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSet.java rename to test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSet.java diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java rename to test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java rename to test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestEncoder.java b/test/jdk/java/beans/XMLEncoder/6777487/TestEncoder.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6777487/TestEncoder.java rename to test/jdk/java/beans/XMLEncoder/6777487/TestEncoder.java diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestEnumMap.java b/test/jdk/java/beans/XMLEncoder/6777487/TestEnumMap.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6777487/TestEnumMap.java rename to test/jdk/java/beans/XMLEncoder/6777487/TestEnumMap.java diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestEnumSet.java b/test/jdk/java/beans/XMLEncoder/6777487/TestEnumSet.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/6777487/TestEnumSet.java rename to test/jdk/java/beans/XMLEncoder/6777487/TestEnumSet.java diff --git a/jdk/test/java/beans/XMLEncoder/AbstractTest.java b/test/jdk/java/beans/XMLEncoder/AbstractTest.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/AbstractTest.java rename to test/jdk/java/beans/XMLEncoder/AbstractTest.java diff --git a/jdk/test/java/beans/XMLEncoder/Bean.java b/test/jdk/java/beans/XMLEncoder/Bean.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Bean.java rename to test/jdk/java/beans/XMLEncoder/Bean.java diff --git a/jdk/test/java/beans/XMLEncoder/BeanValidator.java b/test/jdk/java/beans/XMLEncoder/BeanValidator.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/BeanValidator.java rename to test/jdk/java/beans/XMLEncoder/BeanValidator.java diff --git a/jdk/test/java/beans/XMLEncoder/ReferenceToNonStaticField.java b/test/jdk/java/beans/XMLEncoder/ReferenceToNonStaticField.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/ReferenceToNonStaticField.java rename to test/jdk/java/beans/XMLEncoder/ReferenceToNonStaticField.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4625418.java b/test/jdk/java/beans/XMLEncoder/Test4625418.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4625418.java rename to test/jdk/java/beans/XMLEncoder/Test4625418.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4631471.java b/test/jdk/java/beans/XMLEncoder/Test4631471.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4631471.java rename to test/jdk/java/beans/XMLEncoder/Test4631471.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4646747.java b/test/jdk/java/beans/XMLEncoder/Test4646747.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4646747.java rename to test/jdk/java/beans/XMLEncoder/Test4646747.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4652928.java b/test/jdk/java/beans/XMLEncoder/Test4652928.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4652928.java rename to test/jdk/java/beans/XMLEncoder/Test4652928.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4679556.java b/test/jdk/java/beans/XMLEncoder/Test4679556.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4679556.java rename to test/jdk/java/beans/XMLEncoder/Test4679556.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4822050.java b/test/jdk/java/beans/XMLEncoder/Test4822050.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4822050.java rename to test/jdk/java/beans/XMLEncoder/Test4822050.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4880633.java b/test/jdk/java/beans/XMLEncoder/Test4880633.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4880633.java rename to test/jdk/java/beans/XMLEncoder/Test4880633.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4903007.java b/test/jdk/java/beans/XMLEncoder/Test4903007.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4903007.java rename to test/jdk/java/beans/XMLEncoder/Test4903007.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4935607.java b/test/jdk/java/beans/XMLEncoder/Test4935607.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4935607.java rename to test/jdk/java/beans/XMLEncoder/Test4935607.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4936682.java b/test/jdk/java/beans/XMLEncoder/Test4936682.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4936682.java rename to test/jdk/java/beans/XMLEncoder/Test4936682.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4950122.java b/test/jdk/java/beans/XMLEncoder/Test4950122.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4950122.java rename to test/jdk/java/beans/XMLEncoder/Test4950122.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4968523.java b/test/jdk/java/beans/XMLEncoder/Test4968523.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4968523.java rename to test/jdk/java/beans/XMLEncoder/Test4968523.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4993777.java b/test/jdk/java/beans/XMLEncoder/Test4993777.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4993777.java rename to test/jdk/java/beans/XMLEncoder/Test4993777.java diff --git a/jdk/test/java/beans/XMLEncoder/Test4994637.java b/test/jdk/java/beans/XMLEncoder/Test4994637.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test4994637.java rename to test/jdk/java/beans/XMLEncoder/Test4994637.java diff --git a/jdk/test/java/beans/XMLEncoder/Test5023550.java b/test/jdk/java/beans/XMLEncoder/Test5023550.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test5023550.java rename to test/jdk/java/beans/XMLEncoder/Test5023550.java diff --git a/jdk/test/java/beans/XMLEncoder/Test5023552.java b/test/jdk/java/beans/XMLEncoder/Test5023552.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test5023552.java rename to test/jdk/java/beans/XMLEncoder/Test5023552.java diff --git a/jdk/test/java/beans/XMLEncoder/Test5023557.java b/test/jdk/java/beans/XMLEncoder/Test5023557.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test5023557.java rename to test/jdk/java/beans/XMLEncoder/Test5023557.java diff --git a/jdk/test/java/beans/XMLEncoder/Test5023559.java b/test/jdk/java/beans/XMLEncoder/Test5023559.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test5023559.java rename to test/jdk/java/beans/XMLEncoder/Test5023559.java diff --git a/jdk/test/java/beans/XMLEncoder/Test6176120.java b/test/jdk/java/beans/XMLEncoder/Test6176120.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test6176120.java rename to test/jdk/java/beans/XMLEncoder/Test6176120.java diff --git a/jdk/test/java/beans/XMLEncoder/Test6187118.java b/test/jdk/java/beans/XMLEncoder/Test6187118.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test6187118.java rename to test/jdk/java/beans/XMLEncoder/Test6187118.java diff --git a/jdk/test/java/beans/XMLEncoder/Test6256805.java b/test/jdk/java/beans/XMLEncoder/Test6256805.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test6256805.java rename to test/jdk/java/beans/XMLEncoder/Test6256805.java diff --git a/jdk/test/java/beans/XMLEncoder/Test6437265.java b/test/jdk/java/beans/XMLEncoder/Test6437265.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test6437265.java rename to test/jdk/java/beans/XMLEncoder/Test6437265.java diff --git a/jdk/test/java/beans/XMLEncoder/Test6501431.java b/test/jdk/java/beans/XMLEncoder/Test6501431.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test6501431.java rename to test/jdk/java/beans/XMLEncoder/Test6501431.java diff --git a/jdk/test/java/beans/XMLEncoder/Test6505888.java b/test/jdk/java/beans/XMLEncoder/Test6505888.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test6505888.java rename to test/jdk/java/beans/XMLEncoder/Test6505888.java diff --git a/jdk/test/java/beans/XMLEncoder/Test6531597.java b/test/jdk/java/beans/XMLEncoder/Test6531597.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test6531597.java rename to test/jdk/java/beans/XMLEncoder/Test6531597.java diff --git a/jdk/test/java/beans/XMLEncoder/Test6570354.java b/test/jdk/java/beans/XMLEncoder/Test6570354.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test6570354.java rename to test/jdk/java/beans/XMLEncoder/Test6570354.java diff --git a/jdk/test/java/beans/XMLEncoder/Test6852574.java b/test/jdk/java/beans/XMLEncoder/Test6852574.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test6852574.java rename to test/jdk/java/beans/XMLEncoder/Test6852574.java diff --git a/jdk/test/java/beans/XMLEncoder/Test6921644.java b/test/jdk/java/beans/XMLEncoder/Test6921644.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test6921644.java rename to test/jdk/java/beans/XMLEncoder/Test6921644.java diff --git a/jdk/test/java/beans/XMLEncoder/Test6963811.java b/test/jdk/java/beans/XMLEncoder/Test6963811.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test6963811.java rename to test/jdk/java/beans/XMLEncoder/Test6963811.java diff --git a/jdk/test/java/beans/XMLEncoder/Test6989223.java b/test/jdk/java/beans/XMLEncoder/Test6989223.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test6989223.java rename to test/jdk/java/beans/XMLEncoder/Test6989223.java diff --git a/jdk/test/java/beans/XMLEncoder/Test7080156.java b/test/jdk/java/beans/XMLEncoder/Test7080156.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test7080156.java rename to test/jdk/java/beans/XMLEncoder/Test7080156.java diff --git a/jdk/test/java/beans/XMLEncoder/Test7092744.java b/test/jdk/java/beans/XMLEncoder/Test7092744.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test7092744.java rename to test/jdk/java/beans/XMLEncoder/Test7092744.java diff --git a/jdk/test/java/beans/XMLEncoder/Test7169395.java b/test/jdk/java/beans/XMLEncoder/Test7169395.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test7169395.java rename to test/jdk/java/beans/XMLEncoder/Test7169395.java diff --git a/jdk/test/java/beans/XMLEncoder/Test8013416.java b/test/jdk/java/beans/XMLEncoder/Test8013416.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test8013416.java rename to test/jdk/java/beans/XMLEncoder/Test8013416.java diff --git a/jdk/test/java/beans/XMLEncoder/Test8013557.java b/test/jdk/java/beans/XMLEncoder/Test8013557.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test8013557.java rename to test/jdk/java/beans/XMLEncoder/Test8013557.java diff --git a/jdk/test/java/beans/XMLEncoder/Test8016545.java b/test/jdk/java/beans/XMLEncoder/Test8016545.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test8016545.java rename to test/jdk/java/beans/XMLEncoder/Test8016545.java diff --git a/jdk/test/java/beans/XMLEncoder/Test8027066.java b/test/jdk/java/beans/XMLEncoder/Test8027066.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/Test8027066.java rename to test/jdk/java/beans/XMLEncoder/Test8027066.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_AWTKeyStroke.java b/test/jdk/java/beans/XMLEncoder/java_awt_AWTKeyStroke.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_AWTKeyStroke.java rename to test/jdk/java/beans/XMLEncoder/java_awt_AWTKeyStroke.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_BasicStroke.java b/test/jdk/java/beans/XMLEncoder/java_awt_BasicStroke.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_BasicStroke.java rename to test/jdk/java/beans/XMLEncoder/java_awt_BasicStroke.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_BorderLayout.java b/test/jdk/java/beans/XMLEncoder/java_awt_BorderLayout.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_BorderLayout.java rename to test/jdk/java/beans/XMLEncoder/java_awt_BorderLayout.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_CardLayout.java b/test/jdk/java/beans/XMLEncoder/java_awt_CardLayout.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_CardLayout.java rename to test/jdk/java/beans/XMLEncoder/java_awt_CardLayout.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_Color.java b/test/jdk/java/beans/XMLEncoder/java_awt_Color.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_Color.java rename to test/jdk/java/beans/XMLEncoder/java_awt_Color.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_Component.java b/test/jdk/java/beans/XMLEncoder/java_awt_Component.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_Component.java rename to test/jdk/java/beans/XMLEncoder/java_awt_Component.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_Cursor.java b/test/jdk/java/beans/XMLEncoder/java_awt_Cursor.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_Cursor.java rename to test/jdk/java/beans/XMLEncoder/java_awt_Cursor.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_Dimension.java b/test/jdk/java/beans/XMLEncoder/java_awt_Dimension.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_Dimension.java rename to test/jdk/java/beans/XMLEncoder/java_awt_Dimension.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_Font.java b/test/jdk/java/beans/XMLEncoder/java_awt_Font.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_Font.java rename to test/jdk/java/beans/XMLEncoder/java_awt_Font.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_GradientPaint.java b/test/jdk/java/beans/XMLEncoder/java_awt_GradientPaint.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_GradientPaint.java rename to test/jdk/java/beans/XMLEncoder/java_awt_GradientPaint.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_GridBagConstraints.java b/test/jdk/java/beans/XMLEncoder/java_awt_GridBagConstraints.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_GridBagConstraints.java rename to test/jdk/java/beans/XMLEncoder/java_awt_GridBagConstraints.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_GridBagLayout.java b/test/jdk/java/beans/XMLEncoder/java_awt_GridBagLayout.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_GridBagLayout.java rename to test/jdk/java/beans/XMLEncoder/java_awt_GridBagLayout.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_Insets.java b/test/jdk/java/beans/XMLEncoder/java_awt_Insets.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_Insets.java rename to test/jdk/java/beans/XMLEncoder/java_awt_Insets.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_LinearGradientPaint.java b/test/jdk/java/beans/XMLEncoder/java_awt_LinearGradientPaint.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_LinearGradientPaint.java rename to test/jdk/java/beans/XMLEncoder/java_awt_LinearGradientPaint.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_MenuShortcut.java b/test/jdk/java/beans/XMLEncoder/java_awt_MenuShortcut.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_MenuShortcut.java rename to test/jdk/java/beans/XMLEncoder/java_awt_MenuShortcut.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_Point.java b/test/jdk/java/beans/XMLEncoder/java_awt_Point.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_Point.java rename to test/jdk/java/beans/XMLEncoder/java_awt_Point.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_RadialGradientPaint.java b/test/jdk/java/beans/XMLEncoder/java_awt_RadialGradientPaint.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_RadialGradientPaint.java rename to test/jdk/java/beans/XMLEncoder/java_awt_RadialGradientPaint.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_Rectangle.java b/test/jdk/java/beans/XMLEncoder/java_awt_Rectangle.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_Rectangle.java rename to test/jdk/java/beans/XMLEncoder/java_awt_Rectangle.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_ScrollPane.java b/test/jdk/java/beans/XMLEncoder/java_awt_ScrollPane.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_ScrollPane.java rename to test/jdk/java/beans/XMLEncoder/java_awt_ScrollPane.java diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_geom_AffineTransform.java b/test/jdk/java/beans/XMLEncoder/java_awt_geom_AffineTransform.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_awt_geom_AffineTransform.java rename to test/jdk/java/beans/XMLEncoder/java_awt_geom_AffineTransform.java diff --git a/jdk/test/java/beans/XMLEncoder/java_beans_EventHandler.java b/test/jdk/java/beans/XMLEncoder/java_beans_EventHandler.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_beans_EventHandler.java rename to test/jdk/java/beans/XMLEncoder/java_beans_EventHandler.java diff --git a/jdk/test/java/beans/XMLEncoder/java_beans_Expression.java b/test/jdk/java/beans/XMLEncoder/java_beans_Expression.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_beans_Expression.java rename to test/jdk/java/beans/XMLEncoder/java_beans_Expression.java diff --git a/jdk/test/java/beans/XMLEncoder/java_beans_Statement.java b/test/jdk/java/beans/XMLEncoder/java_beans_Statement.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_beans_Statement.java rename to test/jdk/java/beans/XMLEncoder/java_beans_Statement.java diff --git a/jdk/test/java/beans/XMLEncoder/java_lang_Character.java b/test/jdk/java/beans/XMLEncoder/java_lang_Character.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_lang_Character.java rename to test/jdk/java/beans/XMLEncoder/java_lang_Character.java diff --git a/jdk/test/java/beans/XMLEncoder/java_lang_Class.java b/test/jdk/java/beans/XMLEncoder/java_lang_Class.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_lang_Class.java rename to test/jdk/java/beans/XMLEncoder/java_lang_Class.java diff --git a/jdk/test/java/beans/XMLEncoder/java_lang_Enum.java b/test/jdk/java/beans/XMLEncoder/java_lang_Enum.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_lang_Enum.java rename to test/jdk/java/beans/XMLEncoder/java_lang_Enum.java diff --git a/jdk/test/java/beans/XMLEncoder/java_lang_String.java b/test/jdk/java/beans/XMLEncoder/java_lang_String.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_lang_String.java rename to test/jdk/java/beans/XMLEncoder/java_lang_String.java diff --git a/jdk/test/java/beans/XMLEncoder/java_lang_reflect_Field.java b/test/jdk/java/beans/XMLEncoder/java_lang_reflect_Field.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_lang_reflect_Field.java rename to test/jdk/java/beans/XMLEncoder/java_lang_reflect_Field.java diff --git a/jdk/test/java/beans/XMLEncoder/java_lang_reflect_Method.java b/test/jdk/java/beans/XMLEncoder/java_lang_reflect_Method.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_lang_reflect_Method.java rename to test/jdk/java/beans/XMLEncoder/java_lang_reflect_Method.java diff --git a/jdk/test/java/beans/XMLEncoder/java_net_URI.java b/test/jdk/java/beans/XMLEncoder/java_net_URI.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_net_URI.java rename to test/jdk/java/beans/XMLEncoder/java_net_URI.java diff --git a/jdk/test/java/beans/XMLEncoder/java_sql_Date.java b/test/jdk/java/beans/XMLEncoder/java_sql_Date.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_sql_Date.java rename to test/jdk/java/beans/XMLEncoder/java_sql_Date.java diff --git a/jdk/test/java/beans/XMLEncoder/java_sql_Time.java b/test/jdk/java/beans/XMLEncoder/java_sql_Time.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_sql_Time.java rename to test/jdk/java/beans/XMLEncoder/java_sql_Time.java diff --git a/jdk/test/java/beans/XMLEncoder/java_sql_Timestamp.java b/test/jdk/java/beans/XMLEncoder/java_sql_Timestamp.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_sql_Timestamp.java rename to test/jdk/java/beans/XMLEncoder/java_sql_Timestamp.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_ArrayList.java b/test/jdk/java/beans/XMLEncoder/java_util_ArrayList.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_ArrayList.java rename to test/jdk/java/beans/XMLEncoder/java_util_ArrayList.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_EmptyList.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptyList.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_EmptyList.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptyList.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_EmptyMap.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptyMap.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_EmptyMap.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptyMap.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_EmptySet.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptySet.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_EmptySet.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptySet.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_SingletonList.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonList.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_SingletonList.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonList.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_SingletonMap.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonMap.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_SingletonMap.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonMap.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_SingletonSet.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonSet.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_SingletonSet.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonSet.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedCollection.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedCollection.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedCollection.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedCollection.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedMap.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedMap.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedMap.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedMap.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedRandomAccessList.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedRandomAccessList.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedRandomAccessList.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedRandomAccessList.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedSet.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedSet.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedSet.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedSet.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableList.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableList.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableList.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableList.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSet.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSet.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSet.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSet.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedMap.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedMap.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedMap.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedMap.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedSet.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedSet.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedSet.java rename to test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedSet.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_Date.java b/test/jdk/java/beans/XMLEncoder/java_util_Date.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_Date.java rename to test/jdk/java/beans/XMLEncoder/java_util_Date.java diff --git a/jdk/test/java/beans/XMLEncoder/java_util_HashMap.java b/test/jdk/java/beans/XMLEncoder/java_util_HashMap.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/java_util_HashMap.java rename to test/jdk/java/beans/XMLEncoder/java_util_HashMap.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_Box.java b/test/jdk/java/beans/XMLEncoder/javax_swing_Box.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_Box.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_Box.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_BoxLayout.java b/test/jdk/java/beans/XMLEncoder/javax_swing_BoxLayout.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_BoxLayout.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_BoxLayout.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_Box_Filler.java b/test/jdk/java/beans/XMLEncoder/javax_swing_Box_Filler.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_Box_Filler.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_Box_Filler.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java b/test/jdk/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_JButton.java b/test/jdk/java/beans/XMLEncoder/javax_swing_JButton.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_JButton.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_JButton.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_JComponent.java b/test/jdk/java/beans/XMLEncoder/javax_swing_JComponent.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_JComponent.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_JComponent.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_JLayeredPane.java b/test/jdk/java/beans/XMLEncoder/javax_swing_JLayeredPane.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_JLayeredPane.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_JLayeredPane.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_JSplitPane.java b/test/jdk/java/beans/XMLEncoder/javax_swing_JSplitPane.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_JSplitPane.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_JSplitPane.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_JTree.java b/test/jdk/java/beans/XMLEncoder/javax_swing_JTree.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_JTree.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_JTree.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_KeyStroke.java b/test/jdk/java/beans/XMLEncoder/javax_swing_KeyStroke.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_KeyStroke.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_KeyStroke.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_OverlayLayout.java b/test/jdk/java/beans/XMLEncoder/javax_swing_OverlayLayout.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_OverlayLayout.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_OverlayLayout.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_border_CompoundBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_CompoundBorder.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_border_CompoundBorder.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_border_CompoundBorder.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_border_EmptyBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_EmptyBorder.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_border_EmptyBorder.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_border_EmptyBorder.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_border_LineBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_LineBorder.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_border_LineBorder.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_border_LineBorder.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_border_MatteBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_MatteBorder.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_border_MatteBorder.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_border_MatteBorder.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_border_SoftBevelBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_SoftBevelBorder.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_border_SoftBevelBorder.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_border_SoftBevelBorder.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_border_StrokeBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_StrokeBorder.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_border_StrokeBorder.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_border_StrokeBorder.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_BevelBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_BevelBorderUIResource.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_BevelBorderUIResource.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_BevelBorderUIResource.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EmptyBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EmptyBorderUIResource.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EmptyBorderUIResource.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EmptyBorderUIResource.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EtchedBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EtchedBorderUIResource.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EtchedBorderUIResource.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EtchedBorderUIResource.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_LineBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_LineBorderUIResource.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_LineBorderUIResource.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_LineBorderUIResource.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_TitledBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_TitledBorderUIResource.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_TitledBorderUIResource.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_TitledBorderUIResource.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_plaf_ColorUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_ColorUIResource.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_plaf_ColorUIResource.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_plaf_ColorUIResource.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_tree_DefaultTreeModel.java b/test/jdk/java/beans/XMLEncoder/javax_swing_tree_DefaultTreeModel.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_tree_DefaultTreeModel.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_tree_DefaultTreeModel.java diff --git a/jdk/test/java/beans/XMLEncoder/javax_swing_tree_TreePath.java b/test/jdk/java/beans/XMLEncoder/javax_swing_tree_TreePath.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/javax_swing_tree_TreePath.java rename to test/jdk/java/beans/XMLEncoder/javax_swing_tree_TreePath.java diff --git a/jdk/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java b/test/jdk/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java similarity index 100% rename from jdk/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java rename to test/jdk/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java diff --git a/jdk/test/java/beans/beancontext/Test4132698.java b/test/jdk/java/beans/beancontext/Test4132698.java similarity index 100% rename from jdk/test/java/beans/beancontext/Test4132698.java rename to test/jdk/java/beans/beancontext/Test4132698.java diff --git a/jdk/test/java/beans/beancontext/Test4233980.java b/test/jdk/java/beans/beancontext/Test4233980.java similarity index 100% rename from jdk/test/java/beans/beancontext/Test4233980.java rename to test/jdk/java/beans/beancontext/Test4233980.java diff --git a/jdk/test/java/beans/beancontext/Test4328406.java b/test/jdk/java/beans/beancontext/Test4328406.java similarity index 100% rename from jdk/test/java/beans/beancontext/Test4328406.java rename to test/jdk/java/beans/beancontext/Test4328406.java diff --git a/jdk/test/java/io/BufferedInputStream/CloseStream.java b/test/jdk/java/io/BufferedInputStream/CloseStream.java similarity index 100% rename from jdk/test/java/io/BufferedInputStream/CloseStream.java rename to test/jdk/java/io/BufferedInputStream/CloseStream.java diff --git a/jdk/test/java/io/BufferedInputStream/CountUpdate.java b/test/jdk/java/io/BufferedInputStream/CountUpdate.java similarity index 100% rename from jdk/test/java/io/BufferedInputStream/CountUpdate.java rename to test/jdk/java/io/BufferedInputStream/CountUpdate.java diff --git a/jdk/test/java/io/BufferedInputStream/Fill.java b/test/jdk/java/io/BufferedInputStream/Fill.java similarity index 100% rename from jdk/test/java/io/BufferedInputStream/Fill.java rename to test/jdk/java/io/BufferedInputStream/Fill.java diff --git a/jdk/test/java/io/BufferedInputStream/LargeCopyWithMark.java b/test/jdk/java/io/BufferedInputStream/LargeCopyWithMark.java similarity index 100% rename from jdk/test/java/io/BufferedInputStream/LargeCopyWithMark.java rename to test/jdk/java/io/BufferedInputStream/LargeCopyWithMark.java diff --git a/jdk/test/java/io/BufferedInputStream/ReadAfterClose.java b/test/jdk/java/io/BufferedInputStream/ReadAfterClose.java similarity index 100% rename from jdk/test/java/io/BufferedInputStream/ReadAfterClose.java rename to test/jdk/java/io/BufferedInputStream/ReadAfterClose.java diff --git a/jdk/test/java/io/BufferedInputStream/ReadZeroBytes.java b/test/jdk/java/io/BufferedInputStream/ReadZeroBytes.java similarity index 100% rename from jdk/test/java/io/BufferedInputStream/ReadZeroBytes.java rename to test/jdk/java/io/BufferedInputStream/ReadZeroBytes.java diff --git a/jdk/test/java/io/BufferedInputStream/SkipTest.java b/test/jdk/java/io/BufferedInputStream/SkipTest.java similarity index 100% rename from jdk/test/java/io/BufferedInputStream/SkipTest.java rename to test/jdk/java/io/BufferedInputStream/SkipTest.java diff --git a/jdk/test/java/io/BufferedReader/BigMark.java b/test/jdk/java/io/BufferedReader/BigMark.java similarity index 100% rename from jdk/test/java/io/BufferedReader/BigMark.java rename to test/jdk/java/io/BufferedReader/BigMark.java diff --git a/jdk/test/java/io/BufferedReader/EOL.java b/test/jdk/java/io/BufferedReader/EOL.java similarity index 100% rename from jdk/test/java/io/BufferedReader/EOL.java rename to test/jdk/java/io/BufferedReader/EOL.java diff --git a/jdk/test/java/io/BufferedReader/Fill.java b/test/jdk/java/io/BufferedReader/Fill.java similarity index 100% rename from jdk/test/java/io/BufferedReader/Fill.java rename to test/jdk/java/io/BufferedReader/Fill.java diff --git a/jdk/test/java/io/BufferedReader/Lines.java b/test/jdk/java/io/BufferedReader/Lines.java similarity index 100% rename from jdk/test/java/io/BufferedReader/Lines.java rename to test/jdk/java/io/BufferedReader/Lines.java diff --git a/jdk/test/java/io/BufferedReader/MarkedFillAtEOF.java b/test/jdk/java/io/BufferedReader/MarkedFillAtEOF.java similarity index 100% rename from jdk/test/java/io/BufferedReader/MarkedFillAtEOF.java rename to test/jdk/java/io/BufferedReader/MarkedFillAtEOF.java diff --git a/jdk/test/java/io/BufferedReader/ReadLine.java b/test/jdk/java/io/BufferedReader/ReadLine.java similarity index 100% rename from jdk/test/java/io/BufferedReader/ReadLine.java rename to test/jdk/java/io/BufferedReader/ReadLine.java diff --git a/jdk/test/java/io/BufferedReader/ReadLineSync.java b/test/jdk/java/io/BufferedReader/ReadLineSync.java similarity index 100% rename from jdk/test/java/io/BufferedReader/ReadLineSync.java rename to test/jdk/java/io/BufferedReader/ReadLineSync.java diff --git a/jdk/test/java/io/BufferedReader/Ready.java b/test/jdk/java/io/BufferedReader/Ready.java similarity index 100% rename from jdk/test/java/io/BufferedReader/Ready.java rename to test/jdk/java/io/BufferedReader/Ready.java diff --git a/jdk/test/java/io/BufferedReader/SkipNegative.java b/test/jdk/java/io/BufferedReader/SkipNegative.java similarity index 100% rename from jdk/test/java/io/BufferedReader/SkipNegative.java rename to test/jdk/java/io/BufferedReader/SkipNegative.java diff --git a/jdk/test/java/io/BufferedWriter/Cleanup.java b/test/jdk/java/io/BufferedWriter/Cleanup.java similarity index 100% rename from jdk/test/java/io/BufferedWriter/Cleanup.java rename to test/jdk/java/io/BufferedWriter/Cleanup.java diff --git a/jdk/test/java/io/ByteArrayInputStream/Skip.java b/test/jdk/java/io/ByteArrayInputStream/Skip.java similarity index 100% rename from jdk/test/java/io/ByteArrayInputStream/Skip.java rename to test/jdk/java/io/ByteArrayInputStream/Skip.java diff --git a/jdk/test/java/io/ByteArrayOutputStream/MaxCapacity.java b/test/jdk/java/io/ByteArrayOutputStream/MaxCapacity.java similarity index 100% rename from jdk/test/java/io/ByteArrayOutputStream/MaxCapacity.java rename to test/jdk/java/io/ByteArrayOutputStream/MaxCapacity.java diff --git a/jdk/test/java/io/ByteArrayOutputStream/ToString.java b/test/jdk/java/io/ByteArrayOutputStream/ToString.java similarity index 100% rename from jdk/test/java/io/ByteArrayOutputStream/ToString.java rename to test/jdk/java/io/ByteArrayOutputStream/ToString.java diff --git a/jdk/test/java/io/ByteArrayOutputStream/WriteBounds.java b/test/jdk/java/io/ByteArrayOutputStream/WriteBounds.java similarity index 100% rename from jdk/test/java/io/ByteArrayOutputStream/WriteBounds.java rename to test/jdk/java/io/ByteArrayOutputStream/WriteBounds.java diff --git a/jdk/test/java/io/CharArrayReader/Constructor.java b/test/jdk/java/io/CharArrayReader/Constructor.java similarity index 100% rename from jdk/test/java/io/CharArrayReader/Constructor.java rename to test/jdk/java/io/CharArrayReader/Constructor.java diff --git a/jdk/test/java/io/CharArrayReader/OverflowInRead.java b/test/jdk/java/io/CharArrayReader/OverflowInRead.java similarity index 100% rename from jdk/test/java/io/CharArrayReader/OverflowInRead.java rename to test/jdk/java/io/CharArrayReader/OverflowInRead.java diff --git a/jdk/test/java/io/CharArrayReader/OverflowInSkip.java b/test/jdk/java/io/CharArrayReader/OverflowInSkip.java similarity index 100% rename from jdk/test/java/io/CharArrayReader/OverflowInSkip.java rename to test/jdk/java/io/CharArrayReader/OverflowInSkip.java diff --git a/jdk/test/java/io/DataInputStream/OpsAfterClose.java b/test/jdk/java/io/DataInputStream/OpsAfterClose.java similarity index 100% rename from jdk/test/java/io/DataInputStream/OpsAfterClose.java rename to test/jdk/java/io/DataInputStream/OpsAfterClose.java diff --git a/jdk/test/java/io/DataInputStream/ReadFully.java b/test/jdk/java/io/DataInputStream/ReadFully.java similarity index 100% rename from jdk/test/java/io/DataInputStream/ReadFully.java rename to test/jdk/java/io/DataInputStream/ReadFully.java diff --git a/jdk/test/java/io/DataInputStream/ReadLinePushback.java b/test/jdk/java/io/DataInputStream/ReadLinePushback.java similarity index 100% rename from jdk/test/java/io/DataInputStream/ReadLinePushback.java rename to test/jdk/java/io/DataInputStream/ReadLinePushback.java diff --git a/jdk/test/java/io/DataInputStream/ReadUTF.java b/test/jdk/java/io/DataInputStream/ReadUTF.java similarity index 100% rename from jdk/test/java/io/DataInputStream/ReadUTF.java rename to test/jdk/java/io/DataInputStream/ReadUTF.java diff --git a/jdk/test/java/io/DataInputStream/SkipBytes.java b/test/jdk/java/io/DataInputStream/SkipBytes.java similarity index 100% rename from jdk/test/java/io/DataInputStream/SkipBytes.java rename to test/jdk/java/io/DataInputStream/SkipBytes.java diff --git a/jdk/test/java/io/DataOutputStream/CounterOverflow.java b/test/jdk/java/io/DataOutputStream/CounterOverflow.java similarity index 100% rename from jdk/test/java/io/DataOutputStream/CounterOverflow.java rename to test/jdk/java/io/DataOutputStream/CounterOverflow.java diff --git a/jdk/test/java/io/DataOutputStream/WriteUTF.java b/test/jdk/java/io/DataOutputStream/WriteUTF.java similarity index 100% rename from jdk/test/java/io/DataOutputStream/WriteUTF.java rename to test/jdk/java/io/DataOutputStream/WriteUTF.java diff --git a/jdk/test/java/io/Externalizable/compatibility/ExternalizableBlockData.java b/test/jdk/java/io/Externalizable/compatibility/ExternalizableBlockData.java similarity index 100% rename from jdk/test/java/io/Externalizable/compatibility/ExternalizableBlockData.java rename to test/jdk/java/io/Externalizable/compatibility/ExternalizableBlockData.java diff --git a/jdk/test/java/io/Externalizable/compatibility/old.ser b/test/jdk/java/io/Externalizable/compatibility/old.ser similarity index 100% rename from jdk/test/java/io/Externalizable/compatibility/old.ser rename to test/jdk/java/io/Externalizable/compatibility/old.ser diff --git a/jdk/test/java/io/Externalizable/definesWriteObject/DefinesWriteObject.java b/test/jdk/java/io/Externalizable/definesWriteObject/DefinesWriteObject.java similarity index 100% rename from jdk/test/java/io/Externalizable/definesWriteObject/DefinesWriteObject.java rename to test/jdk/java/io/Externalizable/definesWriteObject/DefinesWriteObject.java diff --git a/jdk/test/java/io/File/AccessDenied.java b/test/jdk/java/io/File/AccessDenied.java similarity index 100% rename from jdk/test/java/io/File/AccessDenied.java rename to test/jdk/java/io/File/AccessDenied.java diff --git a/jdk/test/java/io/File/Basic.java b/test/jdk/java/io/File/Basic.java similarity index 100% rename from jdk/test/java/io/File/Basic.java rename to test/jdk/java/io/File/Basic.java diff --git a/jdk/test/java/io/File/CheckPermission.java b/test/jdk/java/io/File/CheckPermission.java similarity index 100% rename from jdk/test/java/io/File/CheckPermission.java rename to test/jdk/java/io/File/CheckPermission.java diff --git a/jdk/test/java/io/File/CheckTempDir.java b/test/jdk/java/io/File/CheckTempDir.java similarity index 100% rename from jdk/test/java/io/File/CheckTempDir.java rename to test/jdk/java/io/File/CheckTempDir.java diff --git a/jdk/test/java/io/File/CompareTo.java b/test/jdk/java/io/File/CompareTo.java similarity index 100% rename from jdk/test/java/io/File/CompareTo.java rename to test/jdk/java/io/File/CompareTo.java diff --git a/jdk/test/java/io/File/Cons.java b/test/jdk/java/io/File/Cons.java similarity index 100% rename from jdk/test/java/io/File/Cons.java rename to test/jdk/java/io/File/Cons.java diff --git a/jdk/test/java/io/File/Create.java b/test/jdk/java/io/File/Create.java similarity index 100% rename from jdk/test/java/io/File/Create.java rename to test/jdk/java/io/File/Create.java diff --git a/jdk/test/java/io/File/CreateNewFile.java b/test/jdk/java/io/File/CreateNewFile.java similarity index 100% rename from jdk/test/java/io/File/CreateNewFile.java rename to test/jdk/java/io/File/CreateNewFile.java diff --git a/jdk/test/java/io/File/DeleteOnExit.java b/test/jdk/java/io/File/DeleteOnExit.java similarity index 100% rename from jdk/test/java/io/File/DeleteOnExit.java rename to test/jdk/java/io/File/DeleteOnExit.java diff --git a/jdk/test/java/io/File/DeleteOnExitLong.java b/test/jdk/java/io/File/DeleteOnExitLong.java similarity index 100% rename from jdk/test/java/io/File/DeleteOnExitLong.java rename to test/jdk/java/io/File/DeleteOnExitLong.java diff --git a/jdk/test/java/io/File/DeleteOnExitNPE.java b/test/jdk/java/io/File/DeleteOnExitNPE.java similarity index 100% rename from jdk/test/java/io/File/DeleteOnExitNPE.java rename to test/jdk/java/io/File/DeleteOnExitNPE.java diff --git a/jdk/test/java/io/File/EmptyPath.java b/test/jdk/java/io/File/EmptyPath.java similarity index 100% rename from jdk/test/java/io/File/EmptyPath.java rename to test/jdk/java/io/File/EmptyPath.java diff --git a/jdk/test/java/io/File/FileMethods.java b/test/jdk/java/io/File/FileMethods.java similarity index 100% rename from jdk/test/java/io/File/FileMethods.java rename to test/jdk/java/io/File/FileMethods.java diff --git a/jdk/test/java/io/File/GetAbsolutePath.java b/test/jdk/java/io/File/GetAbsolutePath.java similarity index 100% rename from jdk/test/java/io/File/GetAbsolutePath.java rename to test/jdk/java/io/File/GetAbsolutePath.java diff --git a/jdk/test/java/io/File/GetCanonicalPath.java b/test/jdk/java/io/File/GetCanonicalPath.java similarity index 100% rename from jdk/test/java/io/File/GetCanonicalPath.java rename to test/jdk/java/io/File/GetCanonicalPath.java diff --git a/jdk/test/java/io/File/GetParent.java b/test/jdk/java/io/File/GetParent.java similarity index 100% rename from jdk/test/java/io/File/GetParent.java rename to test/jdk/java/io/File/GetParent.java diff --git a/jdk/test/java/io/File/GetXSpace.java b/test/jdk/java/io/File/GetXSpace.java similarity index 100% rename from jdk/test/java/io/File/GetXSpace.java rename to test/jdk/java/io/File/GetXSpace.java diff --git a/jdk/test/java/io/File/GetXSpace.sh b/test/jdk/java/io/File/GetXSpace.sh similarity index 100% rename from jdk/test/java/io/File/GetXSpace.sh rename to test/jdk/java/io/File/GetXSpace.sh diff --git a/jdk/test/java/io/File/HashCodeEquals.java b/test/jdk/java/io/File/HashCodeEquals.java similarity index 100% rename from jdk/test/java/io/File/HashCodeEquals.java rename to test/jdk/java/io/File/HashCodeEquals.java diff --git a/jdk/test/java/io/File/IsAbsolute.java b/test/jdk/java/io/File/IsAbsolute.java similarity index 100% rename from jdk/test/java/io/File/IsAbsolute.java rename to test/jdk/java/io/File/IsAbsolute.java diff --git a/jdk/test/java/io/File/IsHidden.java b/test/jdk/java/io/File/IsHidden.java similarity index 100% rename from jdk/test/java/io/File/IsHidden.java rename to test/jdk/java/io/File/IsHidden.java diff --git a/jdk/test/java/io/File/ListNull.java b/test/jdk/java/io/File/ListNull.java similarity index 100% rename from jdk/test/java/io/File/ListNull.java rename to test/jdk/java/io/File/ListNull.java diff --git a/jdk/test/java/io/File/ListRoots.java b/test/jdk/java/io/File/ListRoots.java similarity index 100% rename from jdk/test/java/io/File/ListRoots.java rename to test/jdk/java/io/File/ListRoots.java diff --git a/jdk/test/java/io/File/ListSpace.java b/test/jdk/java/io/File/ListSpace.java similarity index 100% rename from jdk/test/java/io/File/ListSpace.java rename to test/jdk/java/io/File/ListSpace.java diff --git a/jdk/test/java/io/File/MacPath.java b/test/jdk/java/io/File/MacPath.java similarity index 100% rename from jdk/test/java/io/File/MacPath.java rename to test/jdk/java/io/File/MacPath.java diff --git a/jdk/test/java/io/File/MacPathTest.java b/test/jdk/java/io/File/MacPathTest.java similarity index 100% rename from jdk/test/java/io/File/MacPathTest.java rename to test/jdk/java/io/File/MacPathTest.java diff --git a/jdk/test/java/io/File/MaxPath.java b/test/jdk/java/io/File/MaxPath.java similarity index 100% rename from jdk/test/java/io/File/MaxPath.java rename to test/jdk/java/io/File/MaxPath.java diff --git a/jdk/test/java/io/File/MaxPathLength.java b/test/jdk/java/io/File/MaxPathLength.java similarity index 100% rename from jdk/test/java/io/File/MaxPathLength.java rename to test/jdk/java/io/File/MaxPathLength.java diff --git a/jdk/test/java/io/File/Mkdir.java b/test/jdk/java/io/File/Mkdir.java similarity index 100% rename from jdk/test/java/io/File/Mkdir.java rename to test/jdk/java/io/File/Mkdir.java diff --git a/jdk/test/java/io/File/NulFile.java b/test/jdk/java/io/File/NulFile.java similarity index 100% rename from jdk/test/java/io/File/NulFile.java rename to test/jdk/java/io/File/NulFile.java diff --git a/jdk/test/java/io/File/NullArgs.java b/test/jdk/java/io/File/NullArgs.java similarity index 100% rename from jdk/test/java/io/File/NullArgs.java rename to test/jdk/java/io/File/NullArgs.java diff --git a/jdk/test/java/io/File/SetAccess.java b/test/jdk/java/io/File/SetAccess.java similarity index 100% rename from jdk/test/java/io/File/SetAccess.java rename to test/jdk/java/io/File/SetAccess.java diff --git a/jdk/test/java/io/File/SetLastModified.java b/test/jdk/java/io/File/SetLastModified.java similarity index 100% rename from jdk/test/java/io/File/SetLastModified.java rename to test/jdk/java/io/File/SetLastModified.java diff --git a/jdk/test/java/io/File/SetReadOnly.java b/test/jdk/java/io/File/SetReadOnly.java similarity index 100% rename from jdk/test/java/io/File/SetReadOnly.java rename to test/jdk/java/io/File/SetReadOnly.java diff --git a/jdk/test/java/io/File/SymLinks.java b/test/jdk/java/io/File/SymLinks.java similarity index 100% rename from jdk/test/java/io/File/SymLinks.java rename to test/jdk/java/io/File/SymLinks.java diff --git a/jdk/test/java/io/File/TimeZoneLastModified.java b/test/jdk/java/io/File/TimeZoneLastModified.java similarity index 100% rename from jdk/test/java/io/File/TimeZoneLastModified.java rename to test/jdk/java/io/File/TimeZoneLastModified.java diff --git a/jdk/test/java/io/File/ToURI.java b/test/jdk/java/io/File/ToURI.java similarity index 100% rename from jdk/test/java/io/File/ToURI.java rename to test/jdk/java/io/File/ToURI.java diff --git a/jdk/test/java/io/File/ToURL.java b/test/jdk/java/io/File/ToURL.java similarity index 100% rename from jdk/test/java/io/File/ToURL.java rename to test/jdk/java/io/File/ToURL.java diff --git a/jdk/test/java/io/File/Unicode.java b/test/jdk/java/io/File/Unicode.java similarity index 100% rename from jdk/test/java/io/File/Unicode.java rename to test/jdk/java/io/File/Unicode.java diff --git a/jdk/test/java/io/File/Util.java b/test/jdk/java/io/File/Util.java similarity index 100% rename from jdk/test/java/io/File/Util.java rename to test/jdk/java/io/File/Util.java diff --git a/jdk/test/java/io/File/WinDeviceName.java b/test/jdk/java/io/File/WinDeviceName.java similarity index 100% rename from jdk/test/java/io/File/WinDeviceName.java rename to test/jdk/java/io/File/WinDeviceName.java diff --git a/jdk/test/java/io/File/WinDirRelative.java b/test/jdk/java/io/File/WinDirRelative.java similarity index 100% rename from jdk/test/java/io/File/WinDirRelative.java rename to test/jdk/java/io/File/WinDirRelative.java diff --git a/jdk/test/java/io/File/WinMaxPath.java b/test/jdk/java/io/File/WinMaxPath.java similarity index 100% rename from jdk/test/java/io/File/WinMaxPath.java rename to test/jdk/java/io/File/WinMaxPath.java diff --git a/jdk/test/java/io/File/WinSpecialFiles.java b/test/jdk/java/io/File/WinSpecialFiles.java similarity index 100% rename from jdk/test/java/io/File/WinSpecialFiles.java rename to test/jdk/java/io/File/WinSpecialFiles.java diff --git a/jdk/test/java/io/File/createTempFile/NameTooLong.java b/test/jdk/java/io/File/createTempFile/NameTooLong.java similarity index 100% rename from jdk/test/java/io/File/createTempFile/NameTooLong.java rename to test/jdk/java/io/File/createTempFile/NameTooLong.java diff --git a/jdk/test/java/io/File/createTempFile/Patterns.java b/test/jdk/java/io/File/createTempFile/Patterns.java similarity index 100% rename from jdk/test/java/io/File/createTempFile/Patterns.java rename to test/jdk/java/io/File/createTempFile/Patterns.java diff --git a/jdk/test/java/io/File/createTempFile/SecurityTest.java b/test/jdk/java/io/File/createTempFile/SecurityTest.java similarity index 100% rename from jdk/test/java/io/File/createTempFile/SecurityTest.java rename to test/jdk/java/io/File/createTempFile/SecurityTest.java diff --git a/jdk/test/java/io/File/createTempFile/SpecialTempFile.java b/test/jdk/java/io/File/createTempFile/SpecialTempFile.java similarity index 100% rename from jdk/test/java/io/File/createTempFile/SpecialTempFile.java rename to test/jdk/java/io/File/createTempFile/SpecialTempFile.java diff --git a/jdk/test/java/io/File/createTempFile/java.policy b/test/jdk/java/io/File/createTempFile/java.policy similarity index 100% rename from jdk/test/java/io/File/createTempFile/java.policy rename to test/jdk/java/io/File/createTempFile/java.policy diff --git a/jdk/test/java/io/FileDescriptor/Finalize.java b/test/jdk/java/io/FileDescriptor/Finalize.java similarity index 100% rename from jdk/test/java/io/FileDescriptor/Finalize.java rename to test/jdk/java/io/FileDescriptor/Finalize.java diff --git a/jdk/test/java/io/FileDescriptor/RememberAppend.java b/test/jdk/java/io/FileDescriptor/RememberAppend.java similarity index 100% rename from jdk/test/java/io/FileDescriptor/RememberAppend.java rename to test/jdk/java/io/FileDescriptor/RememberAppend.java diff --git a/jdk/test/java/io/FileDescriptor/Sharing.java b/test/jdk/java/io/FileDescriptor/Sharing.java similarity index 100% rename from jdk/test/java/io/FileDescriptor/Sharing.java rename to test/jdk/java/io/FileDescriptor/Sharing.java diff --git a/jdk/test/java/io/FileInputStream/Available.java b/test/jdk/java/io/FileInputStream/Available.java similarity index 100% rename from jdk/test/java/io/FileInputStream/Available.java rename to test/jdk/java/io/FileInputStream/Available.java diff --git a/jdk/test/java/io/FileInputStream/FinalizeShdCallClose.java b/test/jdk/java/io/FileInputStream/FinalizeShdCallClose.java similarity index 100% rename from jdk/test/java/io/FileInputStream/FinalizeShdCallClose.java rename to test/jdk/java/io/FileInputStream/FinalizeShdCallClose.java diff --git a/jdk/test/java/io/FileInputStream/LargeFileAvailable.java b/test/jdk/java/io/FileInputStream/LargeFileAvailable.java similarity index 100% rename from jdk/test/java/io/FileInputStream/LargeFileAvailable.java rename to test/jdk/java/io/FileInputStream/LargeFileAvailable.java diff --git a/jdk/test/java/io/FileInputStream/LeadingSlash.java b/test/jdk/java/io/FileInputStream/LeadingSlash.java similarity index 100% rename from jdk/test/java/io/FileInputStream/LeadingSlash.java rename to test/jdk/java/io/FileInputStream/LeadingSlash.java diff --git a/jdk/test/java/io/FileInputStream/NegativeAvailable.java b/test/jdk/java/io/FileInputStream/NegativeAvailable.java similarity index 100% rename from jdk/test/java/io/FileInputStream/NegativeAvailable.java rename to test/jdk/java/io/FileInputStream/NegativeAvailable.java diff --git a/jdk/test/java/io/FileInputStream/OpenDir.java b/test/jdk/java/io/FileInputStream/OpenDir.java similarity index 100% rename from jdk/test/java/io/FileInputStream/OpenDir.java rename to test/jdk/java/io/FileInputStream/OpenDir.java diff --git a/jdk/test/java/io/FileInputStream/OpsAfterClose.java b/test/jdk/java/io/FileInputStream/OpsAfterClose.java similarity index 100% rename from jdk/test/java/io/FileInputStream/OpsAfterClose.java rename to test/jdk/java/io/FileInputStream/OpsAfterClose.java diff --git a/jdk/test/java/io/FileOutputStream/AtomicAppend.java b/test/jdk/java/io/FileOutputStream/AtomicAppend.java similarity index 100% rename from jdk/test/java/io/FileOutputStream/AtomicAppend.java rename to test/jdk/java/io/FileOutputStream/AtomicAppend.java diff --git a/jdk/test/java/io/FileOutputStream/FileOpenTest.java b/test/jdk/java/io/FileOutputStream/FileOpenTest.java similarity index 100% rename from jdk/test/java/io/FileOutputStream/FileOpenTest.java rename to test/jdk/java/io/FileOutputStream/FileOpenTest.java diff --git a/jdk/test/java/io/FileOutputStream/FinalizeShdCallClose.java b/test/jdk/java/io/FileOutputStream/FinalizeShdCallClose.java similarity index 100% rename from jdk/test/java/io/FileOutputStream/FinalizeShdCallClose.java rename to test/jdk/java/io/FileOutputStream/FinalizeShdCallClose.java diff --git a/jdk/test/java/io/FileOutputStream/ManyFiles.java b/test/jdk/java/io/FileOutputStream/ManyFiles.java similarity index 100% rename from jdk/test/java/io/FileOutputStream/ManyFiles.java rename to test/jdk/java/io/FileOutputStream/ManyFiles.java diff --git a/jdk/test/java/io/FileOutputStream/OpsAfterClose.java b/test/jdk/java/io/FileOutputStream/OpsAfterClose.java similarity index 100% rename from jdk/test/java/io/FileOutputStream/OpsAfterClose.java rename to test/jdk/java/io/FileOutputStream/OpsAfterClose.java diff --git a/jdk/test/java/io/FilePermission/Correctness.java b/test/jdk/java/io/FilePermission/Correctness.java similarity index 100% rename from jdk/test/java/io/FilePermission/Correctness.java rename to test/jdk/java/io/FilePermission/Correctness.java diff --git a/jdk/test/java/io/FilePermission/FilePermissionCollection.java b/test/jdk/java/io/FilePermission/FilePermissionCollection.java similarity index 100% rename from jdk/test/java/io/FilePermission/FilePermissionCollection.java rename to test/jdk/java/io/FilePermission/FilePermissionCollection.java diff --git a/jdk/test/java/io/FilePermission/FilePermissionCollectionMerge.java b/test/jdk/java/io/FilePermission/FilePermissionCollectionMerge.java similarity index 100% rename from jdk/test/java/io/FilePermission/FilePermissionCollectionMerge.java rename to test/jdk/java/io/FilePermission/FilePermissionCollectionMerge.java diff --git a/jdk/test/java/io/FilePermission/FilePermissionTest.java b/test/jdk/java/io/FilePermission/FilePermissionTest.java similarity index 100% rename from jdk/test/java/io/FilePermission/FilePermissionTest.java rename to test/jdk/java/io/FilePermission/FilePermissionTest.java diff --git a/jdk/test/java/io/FilePermission/Invalid.java b/test/jdk/java/io/FilePermission/Invalid.java similarity index 100% rename from jdk/test/java/io/FilePermission/Invalid.java rename to test/jdk/java/io/FilePermission/Invalid.java diff --git a/jdk/test/java/io/FilePermission/MergeName.java b/test/jdk/java/io/FilePermission/MergeName.java similarity index 100% rename from jdk/test/java/io/FilePermission/MergeName.java rename to test/jdk/java/io/FilePermission/MergeName.java diff --git a/jdk/test/java/io/FilePermission/ReadFileOnPath.java b/test/jdk/java/io/FilePermission/ReadFileOnPath.java similarity index 100% rename from jdk/test/java/io/FilePermission/ReadFileOnPath.java rename to test/jdk/java/io/FilePermission/ReadFileOnPath.java diff --git a/jdk/test/java/io/FilePermission/SpecTests.java b/test/jdk/java/io/FilePermission/SpecTests.java similarity index 100% rename from jdk/test/java/io/FilePermission/SpecTests.java rename to test/jdk/java/io/FilePermission/SpecTests.java diff --git a/jdk/test/java/io/FilePermission/m/module-info.java b/test/jdk/java/io/FilePermission/m/module-info.java similarity index 100% rename from jdk/test/java/io/FilePermission/m/module-info.java rename to test/jdk/java/io/FilePermission/m/module-info.java diff --git a/jdk/test/java/io/FilePermission/m/p/App.java b/test/jdk/java/io/FilePermission/m/p/App.java similarity index 100% rename from jdk/test/java/io/FilePermission/m/p/App.java rename to test/jdk/java/io/FilePermission/m/p/App.java diff --git a/jdk/test/java/io/FilterOutputStream/BoundsCheck.java b/test/jdk/java/io/FilterOutputStream/BoundsCheck.java similarity index 100% rename from jdk/test/java/io/FilterOutputStream/BoundsCheck.java rename to test/jdk/java/io/FilterOutputStream/BoundsCheck.java diff --git a/jdk/test/java/io/FilterOutputStream/SuppressedException.java b/test/jdk/java/io/FilterOutputStream/SuppressedException.java similarity index 100% rename from jdk/test/java/io/FilterOutputStream/SuppressedException.java rename to test/jdk/java/io/FilterOutputStream/SuppressedException.java diff --git a/jdk/test/java/io/FilterOutputStream/Write.java b/test/jdk/java/io/FilterOutputStream/Write.java similarity index 100% rename from jdk/test/java/io/FilterOutputStream/Write.java rename to test/jdk/java/io/FilterOutputStream/Write.java diff --git a/jdk/test/java/io/IOException/LastErrorString.java b/test/jdk/java/io/IOException/LastErrorString.java similarity index 100% rename from jdk/test/java/io/IOException/LastErrorString.java rename to test/jdk/java/io/IOException/LastErrorString.java diff --git a/jdk/test/java/io/InputStream/OpsAfterClose.java b/test/jdk/java/io/InputStream/OpsAfterClose.java similarity index 100% rename from jdk/test/java/io/InputStream/OpsAfterClose.java rename to test/jdk/java/io/InputStream/OpsAfterClose.java diff --git a/jdk/test/java/io/InputStream/ReadAllBytes.java b/test/jdk/java/io/InputStream/ReadAllBytes.java similarity index 100% rename from jdk/test/java/io/InputStream/ReadAllBytes.java rename to test/jdk/java/io/InputStream/ReadAllBytes.java diff --git a/jdk/test/java/io/InputStream/ReadNBytes.java b/test/jdk/java/io/InputStream/ReadNBytes.java similarity index 100% rename from jdk/test/java/io/InputStream/ReadNBytes.java rename to test/jdk/java/io/InputStream/ReadNBytes.java diff --git a/jdk/test/java/io/InputStream/ReadParams.java b/test/jdk/java/io/InputStream/ReadParams.java similarity index 100% rename from jdk/test/java/io/InputStream/ReadParams.java rename to test/jdk/java/io/InputStream/ReadParams.java diff --git a/jdk/test/java/io/InputStream/Skip.java b/test/jdk/java/io/InputStream/Skip.java similarity index 100% rename from jdk/test/java/io/InputStream/Skip.java rename to test/jdk/java/io/InputStream/Skip.java diff --git a/jdk/test/java/io/InputStream/TransferTo.java b/test/jdk/java/io/InputStream/TransferTo.java similarity index 100% rename from jdk/test/java/io/InputStream/TransferTo.java rename to test/jdk/java/io/InputStream/TransferTo.java diff --git a/jdk/test/java/io/InputStreamReader/GrowAfterEOF.java b/test/jdk/java/io/InputStreamReader/GrowAfterEOF.java similarity index 100% rename from jdk/test/java/io/InputStreamReader/GrowAfterEOF.java rename to test/jdk/java/io/InputStreamReader/GrowAfterEOF.java diff --git a/jdk/test/java/io/InputStreamReader/NullCreate.java b/test/jdk/java/io/InputStreamReader/NullCreate.java similarity index 100% rename from jdk/test/java/io/InputStreamReader/NullCreate.java rename to test/jdk/java/io/InputStreamReader/NullCreate.java diff --git a/jdk/test/java/io/InputStreamReader/One.java b/test/jdk/java/io/InputStreamReader/One.java similarity index 100% rename from jdk/test/java/io/InputStreamReader/One.java rename to test/jdk/java/io/InputStreamReader/One.java diff --git a/jdk/test/java/io/InputStreamReader/ReadOffset.java b/test/jdk/java/io/InputStreamReader/ReadOffset.java similarity index 100% rename from jdk/test/java/io/InputStreamReader/ReadOffset.java rename to test/jdk/java/io/InputStreamReader/ReadOffset.java diff --git a/jdk/test/java/io/LineNumberInputStream/Available.java b/test/jdk/java/io/LineNumberInputStream/Available.java similarity index 100% rename from jdk/test/java/io/LineNumberInputStream/Available.java rename to test/jdk/java/io/LineNumberInputStream/Available.java diff --git a/jdk/test/java/io/LineNumberInputStream/MarkReset.java b/test/jdk/java/io/LineNumberInputStream/MarkReset.java similarity index 100% rename from jdk/test/java/io/LineNumberInputStream/MarkReset.java rename to test/jdk/java/io/LineNumberInputStream/MarkReset.java diff --git a/jdk/test/java/io/LineNumberInputStream/Skip.java b/test/jdk/java/io/LineNumberInputStream/Skip.java similarity index 100% rename from jdk/test/java/io/LineNumberInputStream/Skip.java rename to test/jdk/java/io/LineNumberInputStream/Skip.java diff --git a/jdk/test/java/io/LineNumberInputStream/SkipEOL.java b/test/jdk/java/io/LineNumberInputStream/SkipEOL.java similarity index 100% rename from jdk/test/java/io/LineNumberInputStream/SkipEOL.java rename to test/jdk/java/io/LineNumberInputStream/SkipEOL.java diff --git a/jdk/test/java/io/LineNumberReader/MarkReset.java b/test/jdk/java/io/LineNumberReader/MarkReset.java similarity index 100% rename from jdk/test/java/io/LineNumberReader/MarkReset.java rename to test/jdk/java/io/LineNumberReader/MarkReset.java diff --git a/jdk/test/java/io/LineNumberReader/Read.java b/test/jdk/java/io/LineNumberReader/Read.java similarity index 100% rename from jdk/test/java/io/LineNumberReader/Read.java rename to test/jdk/java/io/LineNumberReader/Read.java diff --git a/jdk/test/java/io/LineNumberReader/ReadReadLine.java b/test/jdk/java/io/LineNumberReader/ReadReadLine.java similarity index 100% rename from jdk/test/java/io/LineNumberReader/ReadReadLine.java rename to test/jdk/java/io/LineNumberReader/ReadReadLine.java diff --git a/jdk/test/java/io/LineNumberReader/Skip.java b/test/jdk/java/io/LineNumberReader/Skip.java similarity index 100% rename from jdk/test/java/io/LineNumberReader/Skip.java rename to test/jdk/java/io/LineNumberReader/Skip.java diff --git a/jdk/test/java/io/LineNumberReader/SkipInput.txt b/test/jdk/java/io/LineNumberReader/SkipInput.txt similarity index 100% rename from jdk/test/java/io/LineNumberReader/SkipInput.txt rename to test/jdk/java/io/LineNumberReader/SkipInput.txt diff --git a/jdk/test/java/io/NegativeInitSize.java b/test/jdk/java/io/NegativeInitSize.java similarity index 100% rename from jdk/test/java/io/NegativeInitSize.java rename to test/jdk/java/io/NegativeInitSize.java diff --git a/jdk/test/java/io/ObjectInputStream/PeekInputStreamTest.java b/test/jdk/java/io/ObjectInputStream/PeekInputStreamTest.java similarity index 100% rename from jdk/test/java/io/ObjectInputStream/PeekInputStreamTest.java rename to test/jdk/java/io/ObjectInputStream/PeekInputStreamTest.java diff --git a/jdk/test/java/io/ObjectInputStream/ResolveProxyClass.java b/test/jdk/java/io/ObjectInputStream/ResolveProxyClass.java similarity index 100% rename from jdk/test/java/io/ObjectInputStream/ResolveProxyClass.java rename to test/jdk/java/io/ObjectInputStream/ResolveProxyClass.java diff --git a/jdk/test/java/io/ObjectInputStream/TestObjectStreamClass.java b/test/jdk/java/io/ObjectInputStream/TestObjectStreamClass.java similarity index 100% rename from jdk/test/java/io/ObjectInputStream/TestObjectStreamClass.java rename to test/jdk/java/io/ObjectInputStream/TestObjectStreamClass.java diff --git a/jdk/test/java/io/OutputStream/WriteParams.java b/test/jdk/java/io/OutputStream/WriteParams.java similarity index 100% rename from jdk/test/java/io/OutputStream/WriteParams.java rename to test/jdk/java/io/OutputStream/WriteParams.java diff --git a/jdk/test/java/io/OutputStreamWriter/BoundsCheck.java b/test/jdk/java/io/OutputStreamWriter/BoundsCheck.java similarity index 100% rename from jdk/test/java/io/OutputStreamWriter/BoundsCheck.java rename to test/jdk/java/io/OutputStreamWriter/BoundsCheck.java diff --git a/jdk/test/java/io/OutputStreamWriter/Encode.java b/test/jdk/java/io/OutputStreamWriter/Encode.java similarity index 100% rename from jdk/test/java/io/OutputStreamWriter/Encode.java rename to test/jdk/java/io/OutputStreamWriter/Encode.java diff --git a/jdk/test/java/io/OutputStreamWriter/NullCreate.java b/test/jdk/java/io/OutputStreamWriter/NullCreate.java similarity index 100% rename from jdk/test/java/io/OutputStreamWriter/NullCreate.java rename to test/jdk/java/io/OutputStreamWriter/NullCreate.java diff --git a/jdk/test/java/io/OutputStreamWriter/TestWrite.java b/test/jdk/java/io/OutputStreamWriter/TestWrite.java similarity index 100% rename from jdk/test/java/io/OutputStreamWriter/TestWrite.java rename to test/jdk/java/io/OutputStreamWriter/TestWrite.java diff --git a/jdk/test/java/io/OutputStreamWriter/WriteAfterClose.java b/test/jdk/java/io/OutputStreamWriter/WriteAfterClose.java similarity index 100% rename from jdk/test/java/io/OutputStreamWriter/WriteAfterClose.java rename to test/jdk/java/io/OutputStreamWriter/WriteAfterClose.java diff --git a/jdk/test/java/io/PipedInputStream/CloseAndAvailableRC.java b/test/jdk/java/io/PipedInputStream/CloseAndAvailableRC.java similarity index 100% rename from jdk/test/java/io/PipedInputStream/CloseAndAvailableRC.java rename to test/jdk/java/io/PipedInputStream/CloseAndAvailableRC.java diff --git a/jdk/test/java/io/PipedInputStream/ClosedWriter.java b/test/jdk/java/io/PipedInputStream/ClosedWriter.java similarity index 100% rename from jdk/test/java/io/PipedInputStream/ClosedWriter.java rename to test/jdk/java/io/PipedInputStream/ClosedWriter.java diff --git a/jdk/test/java/io/PipedInputStream/Constructors.java b/test/jdk/java/io/PipedInputStream/Constructors.java similarity index 100% rename from jdk/test/java/io/PipedInputStream/Constructors.java rename to test/jdk/java/io/PipedInputStream/Constructors.java diff --git a/jdk/test/java/io/PipedInputStream/FasterWriter.java b/test/jdk/java/io/PipedInputStream/FasterWriter.java similarity index 100% rename from jdk/test/java/io/PipedInputStream/FasterWriter.java rename to test/jdk/java/io/PipedInputStream/FasterWriter.java diff --git a/jdk/test/java/io/PipedInputStream/WriterLoop.java b/test/jdk/java/io/PipedInputStream/WriterLoop.java similarity index 100% rename from jdk/test/java/io/PipedInputStream/WriterLoop.java rename to test/jdk/java/io/PipedInputStream/WriterLoop.java diff --git a/jdk/test/java/io/PipedOutputStream/ClosedWrite.java b/test/jdk/java/io/PipedOutputStream/ClosedWrite.java similarity index 100% rename from jdk/test/java/io/PipedOutputStream/ClosedWrite.java rename to test/jdk/java/io/PipedOutputStream/ClosedWrite.java diff --git a/jdk/test/java/io/PipedOutputStream/DeadReader.java b/test/jdk/java/io/PipedOutputStream/DeadReader.java similarity index 100% rename from jdk/test/java/io/PipedOutputStream/DeadReader.java rename to test/jdk/java/io/PipedOutputStream/DeadReader.java diff --git a/jdk/test/java/io/PipedOutputStream/MultipleConnect.java b/test/jdk/java/io/PipedOutputStream/MultipleConnect.java similarity index 100% rename from jdk/test/java/io/PipedOutputStream/MultipleConnect.java rename to test/jdk/java/io/PipedOutputStream/MultipleConnect.java diff --git a/jdk/test/java/io/PipedOutputStream/NotConnected.java b/test/jdk/java/io/PipedOutputStream/NotConnected.java similarity index 100% rename from jdk/test/java/io/PipedOutputStream/NotConnected.java rename to test/jdk/java/io/PipedOutputStream/NotConnected.java diff --git a/jdk/test/java/io/PipedOutputStream/WriteAfterClose.java b/test/jdk/java/io/PipedOutputStream/WriteAfterClose.java similarity index 100% rename from jdk/test/java/io/PipedOutputStream/WriteAfterClose.java rename to test/jdk/java/io/PipedOutputStream/WriteAfterClose.java diff --git a/jdk/test/java/io/PipedReader/Constructors.java b/test/jdk/java/io/PipedReader/Constructors.java similarity index 100% rename from jdk/test/java/io/PipedReader/Constructors.java rename to test/jdk/java/io/PipedReader/Constructors.java diff --git a/jdk/test/java/io/PipedReader/ReadToArray.java b/test/jdk/java/io/PipedReader/ReadToArray.java similarity index 100% rename from jdk/test/java/io/PipedReader/ReadToArray.java rename to test/jdk/java/io/PipedReader/ReadToArray.java diff --git a/jdk/test/java/io/PipedReader/Ready.java b/test/jdk/java/io/PipedReader/Ready.java similarity index 100% rename from jdk/test/java/io/PipedReader/Ready.java rename to test/jdk/java/io/PipedReader/Ready.java diff --git a/jdk/test/java/io/PipedWriter/ConnectAfterReaderClose.java b/test/jdk/java/io/PipedWriter/ConnectAfterReaderClose.java similarity index 100% rename from jdk/test/java/io/PipedWriter/ConnectAfterReaderClose.java rename to test/jdk/java/io/PipedWriter/ConnectAfterReaderClose.java diff --git a/jdk/test/java/io/PipedWriter/FlushAfterClose.java b/test/jdk/java/io/PipedWriter/FlushAfterClose.java similarity index 100% rename from jdk/test/java/io/PipedWriter/FlushAfterClose.java rename to test/jdk/java/io/PipedWriter/FlushAfterClose.java diff --git a/jdk/test/java/io/PipedWriter/WriteAfterReaderClose.java b/test/jdk/java/io/PipedWriter/WriteAfterReaderClose.java similarity index 100% rename from jdk/test/java/io/PipedWriter/WriteAfterReaderClose.java rename to test/jdk/java/io/PipedWriter/WriteAfterReaderClose.java diff --git a/jdk/test/java/io/PrintStream/CheckError.java b/test/jdk/java/io/PrintStream/CheckError.java similarity index 100% rename from jdk/test/java/io/PrintStream/CheckError.java rename to test/jdk/java/io/PrintStream/CheckError.java diff --git a/jdk/test/java/io/PrintStream/ClearErrorStream.java b/test/jdk/java/io/PrintStream/ClearErrorStream.java similarity index 100% rename from jdk/test/java/io/PrintStream/ClearErrorStream.java rename to test/jdk/java/io/PrintStream/ClearErrorStream.java diff --git a/jdk/test/java/io/PrintStream/EncodingConstructor.java b/test/jdk/java/io/PrintStream/EncodingConstructor.java similarity index 100% rename from jdk/test/java/io/PrintStream/EncodingConstructor.java rename to test/jdk/java/io/PrintStream/EncodingConstructor.java diff --git a/jdk/test/java/io/PrintStream/FailingConstructors.java b/test/jdk/java/io/PrintStream/FailingConstructors.java similarity index 100% rename from jdk/test/java/io/PrintStream/FailingConstructors.java rename to test/jdk/java/io/PrintStream/FailingConstructors.java diff --git a/jdk/test/java/io/PrintStream/FormatLocale.java b/test/jdk/java/io/PrintStream/FormatLocale.java similarity index 100% rename from jdk/test/java/io/PrintStream/FormatLocale.java rename to test/jdk/java/io/PrintStream/FormatLocale.java diff --git a/jdk/test/java/io/PrintStream/NullConstructor.java b/test/jdk/java/io/PrintStream/NullConstructor.java similarity index 100% rename from jdk/test/java/io/PrintStream/NullConstructor.java rename to test/jdk/java/io/PrintStream/NullConstructor.java diff --git a/jdk/test/java/io/PrintStream/OversynchronizedTest.java b/test/jdk/java/io/PrintStream/OversynchronizedTest.java similarity index 100% rename from jdk/test/java/io/PrintStream/OversynchronizedTest.java rename to test/jdk/java/io/PrintStream/OversynchronizedTest.java diff --git a/jdk/test/java/io/PrintWriter/CheckError.java b/test/jdk/java/io/PrintWriter/CheckError.java similarity index 100% rename from jdk/test/java/io/PrintWriter/CheckError.java rename to test/jdk/java/io/PrintWriter/CheckError.java diff --git a/jdk/test/java/io/PrintWriter/ClearErrorWriter.java b/test/jdk/java/io/PrintWriter/ClearErrorWriter.java similarity index 100% rename from jdk/test/java/io/PrintWriter/ClearErrorWriter.java rename to test/jdk/java/io/PrintWriter/ClearErrorWriter.java diff --git a/jdk/test/java/io/PrintWriter/FailingConstructors.java b/test/jdk/java/io/PrintWriter/FailingConstructors.java similarity index 100% rename from jdk/test/java/io/PrintWriter/FailingConstructors.java rename to test/jdk/java/io/PrintWriter/FailingConstructors.java diff --git a/jdk/test/java/io/PrintWriter/OpsAfterClose.java b/test/jdk/java/io/PrintWriter/OpsAfterClose.java similarity index 100% rename from jdk/test/java/io/PrintWriter/OpsAfterClose.java rename to test/jdk/java/io/PrintWriter/OpsAfterClose.java diff --git a/jdk/test/java/io/PrintWriter/OversynchronizedTest.java b/test/jdk/java/io/PrintWriter/OversynchronizedTest.java similarity index 100% rename from jdk/test/java/io/PrintWriter/OversynchronizedTest.java rename to test/jdk/java/io/PrintWriter/OversynchronizedTest.java diff --git a/jdk/test/java/io/PrintWriter/SubClass.java b/test/jdk/java/io/PrintWriter/SubClass.java similarity index 100% rename from jdk/test/java/io/PrintWriter/SubClass.java rename to test/jdk/java/io/PrintWriter/SubClass.java diff --git a/jdk/test/java/io/PushbackInputStream/Available.java b/test/jdk/java/io/PushbackInputStream/Available.java similarity index 100% rename from jdk/test/java/io/PushbackInputStream/Available.java rename to test/jdk/java/io/PushbackInputStream/Available.java diff --git a/jdk/test/java/io/PushbackInputStream/ClosedStream.java b/test/jdk/java/io/PushbackInputStream/ClosedStream.java similarity index 100% rename from jdk/test/java/io/PushbackInputStream/ClosedStream.java rename to test/jdk/java/io/PushbackInputStream/ClosedStream.java diff --git a/jdk/test/java/io/PushbackInputStream/MarkReset.java b/test/jdk/java/io/PushbackInputStream/MarkReset.java similarity index 100% rename from jdk/test/java/io/PushbackInputStream/MarkReset.java rename to test/jdk/java/io/PushbackInputStream/MarkReset.java diff --git a/jdk/test/java/io/PushbackInputStream/Skip.java b/test/jdk/java/io/PushbackInputStream/Skip.java similarity index 100% rename from jdk/test/java/io/PushbackInputStream/Skip.java rename to test/jdk/java/io/PushbackInputStream/Skip.java diff --git a/jdk/test/java/io/PushbackReader/MarkReset.java b/test/jdk/java/io/PushbackReader/MarkReset.java similarity index 100% rename from jdk/test/java/io/PushbackReader/MarkReset.java rename to test/jdk/java/io/PushbackReader/MarkReset.java diff --git a/jdk/test/java/io/PushbackReader/ReadCloseRaceNPE.java b/test/jdk/java/io/PushbackReader/ReadCloseRaceNPE.java similarity index 100% rename from jdk/test/java/io/PushbackReader/ReadCloseRaceNPE.java rename to test/jdk/java/io/PushbackReader/ReadCloseRaceNPE.java diff --git a/jdk/test/java/io/PushbackReader/Skip.java b/test/jdk/java/io/PushbackReader/Skip.java similarity index 100% rename from jdk/test/java/io/PushbackReader/Skip.java rename to test/jdk/java/io/PushbackReader/Skip.java diff --git a/jdk/test/java/io/RandomAccessFile/Close.java b/test/jdk/java/io/RandomAccessFile/Close.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/Close.java rename to test/jdk/java/io/RandomAccessFile/Close.java diff --git a/jdk/test/java/io/RandomAccessFile/EOF.java b/test/jdk/java/io/RandomAccessFile/EOF.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/EOF.java rename to test/jdk/java/io/RandomAccessFile/EOF.java diff --git a/jdk/test/java/io/RandomAccessFile/FileLengthTest.java b/test/jdk/java/io/RandomAccessFile/FileLengthTest.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/FileLengthTest.java rename to test/jdk/java/io/RandomAccessFile/FileLengthTest.java diff --git a/jdk/test/java/io/RandomAccessFile/OpenSync.java b/test/jdk/java/io/RandomAccessFile/OpenSync.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/OpenSync.java rename to test/jdk/java/io/RandomAccessFile/OpenSync.java diff --git a/jdk/test/java/io/RandomAccessFile/OpsAfterClose.java b/test/jdk/java/io/RandomAccessFile/OpsAfterClose.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/OpsAfterClose.java rename to test/jdk/java/io/RandomAccessFile/OpsAfterClose.java diff --git a/jdk/test/java/io/RandomAccessFile/ParameterCheck.java b/test/jdk/java/io/RandomAccessFile/ParameterCheck.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/ParameterCheck.java rename to test/jdk/java/io/RandomAccessFile/ParameterCheck.java diff --git a/jdk/test/java/io/RandomAccessFile/ReadLine.java b/test/jdk/java/io/RandomAccessFile/ReadLine.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/ReadLine.java rename to test/jdk/java/io/RandomAccessFile/ReadLine.java diff --git a/jdk/test/java/io/RandomAccessFile/ReadWritePrimitives.java b/test/jdk/java/io/RandomAccessFile/ReadWritePrimitives.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/ReadWritePrimitives.java rename to test/jdk/java/io/RandomAccessFile/ReadWritePrimitives.java diff --git a/jdk/test/java/io/RandomAccessFile/Seek.java b/test/jdk/java/io/RandomAccessFile/Seek.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/Seek.java rename to test/jdk/java/io/RandomAccessFile/Seek.java diff --git a/jdk/test/java/io/RandomAccessFile/SetLength.java b/test/jdk/java/io/RandomAccessFile/SetLength.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/SetLength.java rename to test/jdk/java/io/RandomAccessFile/SetLength.java diff --git a/jdk/test/java/io/RandomAccessFile/WriteBytesChars.java b/test/jdk/java/io/RandomAccessFile/WriteBytesChars.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/WriteBytesChars.java rename to test/jdk/java/io/RandomAccessFile/WriteBytesChars.java diff --git a/jdk/test/java/io/RandomAccessFile/WriteUTF.java b/test/jdk/java/io/RandomAccessFile/WriteUTF.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/WriteUTF.java rename to test/jdk/java/io/RandomAccessFile/WriteUTF.java diff --git a/jdk/test/java/io/RandomAccessFile/skipBytes/SkipBytes.java b/test/jdk/java/io/RandomAccessFile/skipBytes/SkipBytes.java similarity index 100% rename from jdk/test/java/io/RandomAccessFile/skipBytes/SkipBytes.java rename to test/jdk/java/io/RandomAccessFile/skipBytes/SkipBytes.java diff --git a/jdk/test/java/io/RandomAccessFile/skipBytes/input.txt b/test/jdk/java/io/RandomAccessFile/skipBytes/input.txt similarity index 100% rename from jdk/test/java/io/RandomAccessFile/skipBytes/input.txt rename to test/jdk/java/io/RandomAccessFile/skipBytes/input.txt diff --git a/jdk/test/java/io/Reader/NullLock.java b/test/jdk/java/io/Reader/NullLock.java similarity index 100% rename from jdk/test/java/io/Reader/NullLock.java rename to test/jdk/java/io/Reader/NullLock.java diff --git a/jdk/test/java/io/Reader/OpsAfterClose.java b/test/jdk/java/io/Reader/OpsAfterClose.java similarity index 100% rename from jdk/test/java/io/Reader/OpsAfterClose.java rename to test/jdk/java/io/Reader/OpsAfterClose.java diff --git a/jdk/test/java/io/Reader/ReadParams.java b/test/jdk/java/io/Reader/ReadParams.java similarity index 100% rename from jdk/test/java/io/Reader/ReadParams.java rename to test/jdk/java/io/Reader/ReadParams.java diff --git a/jdk/test/java/io/Reader/ReaderBulkReadContract.java b/test/jdk/java/io/Reader/ReaderBulkReadContract.java similarity index 100% rename from jdk/test/java/io/Reader/ReaderBulkReadContract.java rename to test/jdk/java/io/Reader/ReaderBulkReadContract.java diff --git a/jdk/test/java/io/Reader/Skip.java b/test/jdk/java/io/Reader/Skip.java similarity index 100% rename from jdk/test/java/io/Reader/Skip.java rename to test/jdk/java/io/Reader/Skip.java diff --git a/jdk/test/java/io/Reader/SkipInput.txt b/test/jdk/java/io/Reader/SkipInput.txt similarity index 100% rename from jdk/test/java/io/Reader/SkipInput.txt rename to test/jdk/java/io/Reader/SkipInput.txt diff --git a/jdk/test/java/io/Reader/SkipNegative.java b/test/jdk/java/io/Reader/SkipNegative.java similarity index 100% rename from jdk/test/java/io/Reader/SkipNegative.java rename to test/jdk/java/io/Reader/SkipNegative.java diff --git a/jdk/test/java/io/SequenceInputStream/ConstructorNull.java b/test/jdk/java/io/SequenceInputStream/ConstructorNull.java similarity index 100% rename from jdk/test/java/io/SequenceInputStream/ConstructorNull.java rename to test/jdk/java/io/SequenceInputStream/ConstructorNull.java diff --git a/jdk/test/java/io/SequenceInputStream/LotsOfStreams.java b/test/jdk/java/io/SequenceInputStream/LotsOfStreams.java similarity index 100% rename from jdk/test/java/io/SequenceInputStream/LotsOfStreams.java rename to test/jdk/java/io/SequenceInputStream/LotsOfStreams.java diff --git a/jdk/test/java/io/Serializable/ClassCastExceptionDetail/Read.java b/test/jdk/java/io/Serializable/ClassCastExceptionDetail/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/ClassCastExceptionDetail/Read.java rename to test/jdk/java/io/Serializable/ClassCastExceptionDetail/Read.java diff --git a/jdk/test/java/io/Serializable/ClassCastExceptionDetail/Write.java b/test/jdk/java/io/Serializable/ClassCastExceptionDetail/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/ClassCastExceptionDetail/Write.java rename to test/jdk/java/io/Serializable/ClassCastExceptionDetail/Write.java diff --git a/jdk/test/java/io/Serializable/GetField/Read.java b/test/jdk/java/io/Serializable/GetField/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/GetField/Read.java rename to test/jdk/java/io/Serializable/GetField/Read.java diff --git a/jdk/test/java/io/Serializable/GetField/Read2.java b/test/jdk/java/io/Serializable/GetField/Read2.java similarity index 100% rename from jdk/test/java/io/Serializable/GetField/Read2.java rename to test/jdk/java/io/Serializable/GetField/Read2.java diff --git a/jdk/test/java/io/Serializable/GetField/Write.java b/test/jdk/java/io/Serializable/GetField/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/GetField/Write.java rename to test/jdk/java/io/Serializable/GetField/Write.java diff --git a/jdk/test/java/io/Serializable/InvalidClassException/noargctor/DefaultPackage.java b/test/jdk/java/io/Serializable/InvalidClassException/noargctor/DefaultPackage.java similarity index 100% rename from jdk/test/java/io/Serializable/InvalidClassException/noargctor/DefaultPackage.java rename to test/jdk/java/io/Serializable/InvalidClassException/noargctor/DefaultPackage.java diff --git a/jdk/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PackageCtor.java b/test/jdk/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PackageCtor.java similarity index 100% rename from jdk/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PackageCtor.java rename to test/jdk/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PackageCtor.java diff --git a/jdk/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PrivateCtor.java b/test/jdk/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PrivateCtor.java similarity index 100% rename from jdk/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PrivateCtor.java rename to test/jdk/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PrivateCtor.java diff --git a/jdk/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/ProtectedCtor.java b/test/jdk/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/ProtectedCtor.java similarity index 100% rename from jdk/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/ProtectedCtor.java rename to test/jdk/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/ProtectedCtor.java diff --git a/jdk/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PublicCtor.java b/test/jdk/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PublicCtor.java similarity index 100% rename from jdk/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PublicCtor.java rename to test/jdk/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PublicCtor.java diff --git a/jdk/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SamePackageCtor.java b/test/jdk/java/io/Serializable/InvalidClassException/noargctor/Serialize/SamePackageCtor.java similarity index 100% rename from jdk/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SamePackageCtor.java rename to test/jdk/java/io/Serializable/InvalidClassException/noargctor/Serialize/SamePackageCtor.java diff --git a/jdk/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SubclassAcrossPackage.java b/test/jdk/java/io/Serializable/InvalidClassException/noargctor/Serialize/SubclassAcrossPackage.java similarity index 100% rename from jdk/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SubclassAcrossPackage.java rename to test/jdk/java/io/Serializable/InvalidClassException/noargctor/Serialize/SubclassAcrossPackage.java diff --git a/jdk/test/java/io/Serializable/InvalidClassException/noargctor/Test.java b/test/jdk/java/io/Serializable/InvalidClassException/noargctor/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/InvalidClassException/noargctor/Test.java rename to test/jdk/java/io/Serializable/InvalidClassException/noargctor/Test.java diff --git a/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java b/test/jdk/java/io/Serializable/NPEProvoker/NPEProvoker.java similarity index 100% rename from jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java rename to test/jdk/java/io/Serializable/NPEProvoker/NPEProvoker.java diff --git a/jdk/test/java/io/Serializable/NoClassDefFoundErrorTrap/NoClassDefFoundErrorTrap.java b/test/jdk/java/io/Serializable/NoClassDefFoundErrorTrap/NoClassDefFoundErrorTrap.java similarity index 100% rename from jdk/test/java/io/Serializable/NoClassDefFoundErrorTrap/NoClassDefFoundErrorTrap.java rename to test/jdk/java/io/Serializable/NoClassDefFoundErrorTrap/NoClassDefFoundErrorTrap.java diff --git a/jdk/test/java/io/Serializable/PutField/Read.java b/test/jdk/java/io/Serializable/PutField/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/PutField/Read.java rename to test/jdk/java/io/Serializable/PutField/Read.java diff --git a/jdk/test/java/io/Serializable/PutField/Read2.java b/test/jdk/java/io/Serializable/PutField/Read2.java similarity index 100% rename from jdk/test/java/io/Serializable/PutField/Read2.java rename to test/jdk/java/io/Serializable/PutField/Read2.java diff --git a/jdk/test/java/io/Serializable/PutField/Write.java b/test/jdk/java/io/Serializable/PutField/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/PutField/Write.java rename to test/jdk/java/io/Serializable/PutField/Write.java diff --git a/jdk/test/java/io/Serializable/PutField/Write2.java b/test/jdk/java/io/Serializable/PutField/Write2.java similarity index 100% rename from jdk/test/java/io/Serializable/PutField/Write2.java rename to test/jdk/java/io/Serializable/PutField/Write2.java diff --git a/jdk/test/java/io/Serializable/arraySuidConflict/Foo.java b/test/jdk/java/io/Serializable/arraySuidConflict/Foo.java similarity index 100% rename from jdk/test/java/io/Serializable/arraySuidConflict/Foo.java rename to test/jdk/java/io/Serializable/arraySuidConflict/Foo.java diff --git a/jdk/test/java/io/Serializable/arraySuidConflict/Read.java b/test/jdk/java/io/Serializable/arraySuidConflict/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/arraySuidConflict/Read.java rename to test/jdk/java/io/Serializable/arraySuidConflict/Read.java diff --git a/jdk/test/java/io/Serializable/arraySuidConflict/Write.java b/test/jdk/java/io/Serializable/arraySuidConflict/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/arraySuidConflict/Write.java rename to test/jdk/java/io/Serializable/arraySuidConflict/Write.java diff --git a/jdk/test/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java b/test/jdk/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java similarity index 100% rename from jdk/test/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java rename to test/jdk/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java diff --git a/jdk/test/java/io/Serializable/available/Available.java b/test/jdk/java/io/Serializable/available/Available.java similarity index 100% rename from jdk/test/java/io/Serializable/available/Available.java rename to test/jdk/java/io/Serializable/available/Available.java diff --git a/jdk/test/java/io/Serializable/backRefCNFException/Read.java b/test/jdk/java/io/Serializable/backRefCNFException/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/backRefCNFException/Read.java rename to test/jdk/java/io/Serializable/backRefCNFException/Read.java diff --git a/jdk/test/java/io/Serializable/backRefCNFException/Write.java b/test/jdk/java/io/Serializable/backRefCNFException/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/backRefCNFException/Write.java rename to test/jdk/java/io/Serializable/backRefCNFException/Write.java diff --git a/jdk/test/java/io/Serializable/badSerialPersistentField/BadSerialPersistentField.java b/test/jdk/java/io/Serializable/badSerialPersistentField/BadSerialPersistentField.java similarity index 100% rename from jdk/test/java/io/Serializable/badSerialPersistentField/BadSerialPersistentField.java rename to test/jdk/java/io/Serializable/badSerialPersistentField/BadSerialPersistentField.java diff --git a/jdk/test/java/io/Serializable/badSerialVersionUID/BadSerialVersionUID.java b/test/jdk/java/io/Serializable/badSerialVersionUID/BadSerialVersionUID.java similarity index 100% rename from jdk/test/java/io/Serializable/badSerialVersionUID/BadSerialVersionUID.java rename to test/jdk/java/io/Serializable/badSerialVersionUID/BadSerialVersionUID.java diff --git a/jdk/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java b/test/jdk/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java similarity index 100% rename from jdk/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java rename to test/jdk/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java diff --git a/jdk/test/java/io/Serializable/checkModifiers/CheckModifiers.java b/test/jdk/java/io/Serializable/checkModifiers/CheckModifiers.java similarity index 100% rename from jdk/test/java/io/Serializable/checkModifiers/CheckModifiers.java rename to test/jdk/java/io/Serializable/checkModifiers/CheckModifiers.java diff --git a/jdk/test/java/io/Serializable/class/NonSerialA_1/A.java b/test/jdk/java/io/Serializable/class/NonSerialA_1/A.java similarity index 100% rename from jdk/test/java/io/Serializable/class/NonSerialA_1/A.java rename to test/jdk/java/io/Serializable/class/NonSerialA_1/A.java diff --git a/jdk/test/java/io/Serializable/class/NonSerialA_2/A.java b/test/jdk/java/io/Serializable/class/NonSerialA_2/A.java similarity index 100% rename from jdk/test/java/io/Serializable/class/NonSerialA_2/A.java rename to test/jdk/java/io/Serializable/class/NonSerialA_2/A.java diff --git a/jdk/test/java/io/Serializable/class/NonSerializableTest.java b/test/jdk/java/io/Serializable/class/NonSerializableTest.java similarity index 100% rename from jdk/test/java/io/Serializable/class/NonSerializableTest.java rename to test/jdk/java/io/Serializable/class/NonSerializableTest.java diff --git a/jdk/test/java/io/Serializable/class/SerialA_1/A.java b/test/jdk/java/io/Serializable/class/SerialA_1/A.java similarity index 100% rename from jdk/test/java/io/Serializable/class/SerialA_1/A.java rename to test/jdk/java/io/Serializable/class/SerialA_1/A.java diff --git a/jdk/test/java/io/Serializable/class/SerialA_2/A.java b/test/jdk/java/io/Serializable/class/SerialA_2/A.java similarity index 100% rename from jdk/test/java/io/Serializable/class/SerialA_2/A.java rename to test/jdk/java/io/Serializable/class/SerialA_2/A.java diff --git a/jdk/test/java/io/Serializable/class/SerialA_3/A.java b/test/jdk/java/io/Serializable/class/SerialA_3/A.java similarity index 100% rename from jdk/test/java/io/Serializable/class/SerialA_3/A.java rename to test/jdk/java/io/Serializable/class/SerialA_3/A.java diff --git a/jdk/test/java/io/Serializable/class/TestEntry.java b/test/jdk/java/io/Serializable/class/TestEntry.java similarity index 100% rename from jdk/test/java/io/Serializable/class/TestEntry.java rename to test/jdk/java/io/Serializable/class/TestEntry.java diff --git a/jdk/test/java/io/Serializable/classDescFlagConflict/Foo.java b/test/jdk/java/io/Serializable/classDescFlagConflict/Foo.java similarity index 100% rename from jdk/test/java/io/Serializable/classDescFlagConflict/Foo.java rename to test/jdk/java/io/Serializable/classDescFlagConflict/Foo.java diff --git a/jdk/test/java/io/Serializable/classDescFlagConflict/Foo.ser b/test/jdk/java/io/Serializable/classDescFlagConflict/Foo.ser similarity index 100% rename from jdk/test/java/io/Serializable/classDescFlagConflict/Foo.ser rename to test/jdk/java/io/Serializable/classDescFlagConflict/Foo.ser diff --git a/jdk/test/java/io/Serializable/classDescFlagConflict/Read.java b/test/jdk/java/io/Serializable/classDescFlagConflict/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/classDescFlagConflict/Read.java rename to test/jdk/java/io/Serializable/classDescFlagConflict/Read.java diff --git a/jdk/test/java/io/Serializable/classDescGetField/GetField.java b/test/jdk/java/io/Serializable/classDescGetField/GetField.java similarity index 100% rename from jdk/test/java/io/Serializable/classDescGetField/GetField.java rename to test/jdk/java/io/Serializable/classDescGetField/GetField.java diff --git a/jdk/test/java/io/Serializable/classDescHooks/CNFException.java b/test/jdk/java/io/Serializable/classDescHooks/CNFException.java similarity index 100% rename from jdk/test/java/io/Serializable/classDescHooks/CNFException.java rename to test/jdk/java/io/Serializable/classDescHooks/CNFException.java diff --git a/jdk/test/java/io/Serializable/classDescHooks/ClassDescHooks.java b/test/jdk/java/io/Serializable/classDescHooks/ClassDescHooks.java similarity index 100% rename from jdk/test/java/io/Serializable/classDescHooks/ClassDescHooks.java rename to test/jdk/java/io/Serializable/classDescHooks/ClassDescHooks.java diff --git a/jdk/test/java/io/Serializable/classDescHooks/ExternLoopback.java b/test/jdk/java/io/Serializable/classDescHooks/ExternLoopback.java similarity index 100% rename from jdk/test/java/io/Serializable/classDescHooks/ExternLoopback.java rename to test/jdk/java/io/Serializable/classDescHooks/ExternLoopback.java diff --git a/jdk/test/java/io/Serializable/classDescHooks/Foo.ser b/test/jdk/java/io/Serializable/classDescHooks/Foo.ser similarity index 100% rename from jdk/test/java/io/Serializable/classDescHooks/Foo.ser rename to test/jdk/java/io/Serializable/classDescHooks/Foo.ser diff --git a/jdk/test/java/io/Serializable/classDescHooks/Loopback.java b/test/jdk/java/io/Serializable/classDescHooks/Loopback.java similarity index 100% rename from jdk/test/java/io/Serializable/classDescHooks/Loopback.java rename to test/jdk/java/io/Serializable/classDescHooks/Loopback.java diff --git a/jdk/test/java/io/Serializable/clearHandleTable/ClearHandleTable.java b/test/jdk/java/io/Serializable/clearHandleTable/ClearHandleTable.java similarity index 100% rename from jdk/test/java/io/Serializable/clearHandleTable/ClearHandleTable.java rename to test/jdk/java/io/Serializable/clearHandleTable/ClearHandleTable.java diff --git a/jdk/test/java/io/Serializable/cloneArray/CloneArray.java b/test/jdk/java/io/Serializable/cloneArray/CloneArray.java similarity index 100% rename from jdk/test/java/io/Serializable/cloneArray/CloneArray.java rename to test/jdk/java/io/Serializable/cloneArray/CloneArray.java diff --git a/jdk/test/java/io/Serializable/concurrentClassDescLookup/ConcurrentClassDescLookup.java b/test/jdk/java/io/Serializable/concurrentClassDescLookup/ConcurrentClassDescLookup.java similarity index 100% rename from jdk/test/java/io/Serializable/concurrentClassDescLookup/ConcurrentClassDescLookup.java rename to test/jdk/java/io/Serializable/concurrentClassDescLookup/ConcurrentClassDescLookup.java diff --git a/jdk/test/java/io/Serializable/corruptedUTFConsumption/CorruptedUTFConsumption.java b/test/jdk/java/io/Serializable/corruptedUTFConsumption/CorruptedUTFConsumption.java similarity index 100% rename from jdk/test/java/io/Serializable/corruptedUTFConsumption/CorruptedUTFConsumption.java rename to test/jdk/java/io/Serializable/corruptedUTFConsumption/CorruptedUTFConsumption.java diff --git a/jdk/test/java/io/Serializable/defaultDataEnd/DefaultDataEnd.java b/test/jdk/java/io/Serializable/defaultDataEnd/DefaultDataEnd.java similarity index 100% rename from jdk/test/java/io/Serializable/defaultDataEnd/DefaultDataEnd.java rename to test/jdk/java/io/Serializable/defaultDataEnd/DefaultDataEnd.java diff --git a/jdk/test/java/io/Serializable/defaultReadObjectCNFException/DefaultReadObjectCNFException.java b/test/jdk/java/io/Serializable/defaultReadObjectCNFException/DefaultReadObjectCNFException.java similarity index 100% rename from jdk/test/java/io/Serializable/defaultReadObjectCNFException/DefaultReadObjectCNFException.java rename to test/jdk/java/io/Serializable/defaultReadObjectCNFException/DefaultReadObjectCNFException.java diff --git a/jdk/test/java/io/Serializable/defaulted/GetFieldRead.java b/test/jdk/java/io/Serializable/defaulted/GetFieldRead.java similarity index 100% rename from jdk/test/java/io/Serializable/defaulted/GetFieldRead.java rename to test/jdk/java/io/Serializable/defaulted/GetFieldRead.java diff --git a/jdk/test/java/io/Serializable/defaulted/GetFieldWrite.java b/test/jdk/java/io/Serializable/defaulted/GetFieldWrite.java similarity index 100% rename from jdk/test/java/io/Serializable/defaulted/GetFieldWrite.java rename to test/jdk/java/io/Serializable/defaulted/GetFieldWrite.java diff --git a/jdk/test/java/io/Serializable/duplicateSerialFields/Setup.java b/test/jdk/java/io/Serializable/duplicateSerialFields/Setup.java similarity index 100% rename from jdk/test/java/io/Serializable/duplicateSerialFields/Setup.java rename to test/jdk/java/io/Serializable/duplicateSerialFields/Setup.java diff --git a/jdk/test/java/io/Serializable/duplicateSerialFields/Test.java b/test/jdk/java/io/Serializable/duplicateSerialFields/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/duplicateSerialFields/Test.java rename to test/jdk/java/io/Serializable/duplicateSerialFields/Test.java diff --git a/jdk/test/java/io/Serializable/enum/array/Test.java b/test/jdk/java/io/Serializable/enum/array/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/array/Test.java rename to test/jdk/java/io/Serializable/enum/array/Test.java diff --git a/jdk/test/java/io/Serializable/enum/badResolve/Read.java b/test/jdk/java/io/Serializable/enum/badResolve/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/badResolve/Read.java rename to test/jdk/java/io/Serializable/enum/badResolve/Read.java diff --git a/jdk/test/java/io/Serializable/enum/badResolve/Write.java b/test/jdk/java/io/Serializable/enum/badResolve/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/badResolve/Write.java rename to test/jdk/java/io/Serializable/enum/badResolve/Write.java diff --git a/jdk/test/java/io/Serializable/enum/basic/Test.java b/test/jdk/java/io/Serializable/enum/basic/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/basic/Test.java rename to test/jdk/java/io/Serializable/enum/basic/Test.java diff --git a/jdk/test/java/io/Serializable/enum/classObject/Test.java b/test/jdk/java/io/Serializable/enum/classObject/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/classObject/Test.java rename to test/jdk/java/io/Serializable/enum/classObject/Test.java diff --git a/jdk/test/java/io/Serializable/enum/constantSubclasses/Read.java b/test/jdk/java/io/Serializable/enum/constantSubclasses/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/constantSubclasses/Read.java rename to test/jdk/java/io/Serializable/enum/constantSubclasses/Read.java diff --git a/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java b/test/jdk/java/io/Serializable/enum/constantSubclasses/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java rename to test/jdk/java/io/Serializable/enum/constantSubclasses/Write.java diff --git a/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java b/test/jdk/java/io/Serializable/enum/ignoreSerializationFields/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java rename to test/jdk/java/io/Serializable/enum/ignoreSerializationFields/Test.java diff --git a/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java b/test/jdk/java/io/Serializable/enum/ignoreSerializationMethods/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java rename to test/jdk/java/io/Serializable/enum/ignoreSerializationMethods/Test.java diff --git a/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java b/test/jdk/java/io/Serializable/enum/mismatchedTypecode/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java rename to test/jdk/java/io/Serializable/enum/mismatchedTypecode/Test.java diff --git a/jdk/test/java/io/Serializable/enum/missingConstant/Read.java b/test/jdk/java/io/Serializable/enum/missingConstant/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/missingConstant/Read.java rename to test/jdk/java/io/Serializable/enum/missingConstant/Read.java diff --git a/jdk/test/java/io/Serializable/enum/missingConstant/Write.java b/test/jdk/java/io/Serializable/enum/missingConstant/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/missingConstant/Write.java rename to test/jdk/java/io/Serializable/enum/missingConstant/Write.java diff --git a/jdk/test/java/io/Serializable/enum/unshared/Test.java b/test/jdk/java/io/Serializable/enum/unshared/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/enum/unshared/Test.java rename to test/jdk/java/io/Serializable/enum/unshared/Test.java diff --git a/jdk/test/java/io/Serializable/evolution/AddedExternField/ReadAddedField.java b/test/jdk/java/io/Serializable/evolution/AddedExternField/ReadAddedField.java similarity index 100% rename from jdk/test/java/io/Serializable/evolution/AddedExternField/ReadAddedField.java rename to test/jdk/java/io/Serializable/evolution/AddedExternField/ReadAddedField.java diff --git a/jdk/test/java/io/Serializable/evolution/AddedExternField/WriteAddedField.java b/test/jdk/java/io/Serializable/evolution/AddedExternField/WriteAddedField.java similarity index 100% rename from jdk/test/java/io/Serializable/evolution/AddedExternField/WriteAddedField.java rename to test/jdk/java/io/Serializable/evolution/AddedExternField/WriteAddedField.java diff --git a/jdk/test/java/io/Serializable/evolution/AddedField/ReadAddedField.java b/test/jdk/java/io/Serializable/evolution/AddedField/ReadAddedField.java similarity index 100% rename from jdk/test/java/io/Serializable/evolution/AddedField/ReadAddedField.java rename to test/jdk/java/io/Serializable/evolution/AddedField/ReadAddedField.java diff --git a/jdk/test/java/io/Serializable/evolution/AddedField/WriteAddedField.java b/test/jdk/java/io/Serializable/evolution/AddedField/WriteAddedField.java similarity index 100% rename from jdk/test/java/io/Serializable/evolution/AddedField/WriteAddedField.java rename to test/jdk/java/io/Serializable/evolution/AddedField/WriteAddedField.java diff --git a/jdk/test/java/io/Serializable/evolution/AddedField/run b/test/jdk/java/io/Serializable/evolution/AddedField/run similarity index 100% rename from jdk/test/java/io/Serializable/evolution/AddedField/run rename to test/jdk/java/io/Serializable/evolution/AddedField/run diff --git a/jdk/test/java/io/Serializable/evolution/AddedSuperClass/README b/test/jdk/java/io/Serializable/evolution/AddedSuperClass/README similarity index 100% rename from jdk/test/java/io/Serializable/evolution/AddedSuperClass/README rename to test/jdk/java/io/Serializable/evolution/AddedSuperClass/README diff --git a/jdk/test/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass.java b/test/jdk/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass.java similarity index 100% rename from jdk/test/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass.java rename to test/jdk/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass.java diff --git a/jdk/test/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass2.java b/test/jdk/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass2.java similarity index 100% rename from jdk/test/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass2.java rename to test/jdk/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass2.java diff --git a/jdk/test/java/io/Serializable/evolution/AddedSuperClass/WriteAddedSuperClass.java b/test/jdk/java/io/Serializable/evolution/AddedSuperClass/WriteAddedSuperClass.java similarity index 100% rename from jdk/test/java/io/Serializable/evolution/AddedSuperClass/WriteAddedSuperClass.java rename to test/jdk/java/io/Serializable/evolution/AddedSuperClass/WriteAddedSuperClass.java diff --git a/jdk/test/java/io/Serializable/evolution/RenamePackage/RenamePackageTest.java b/test/jdk/java/io/Serializable/evolution/RenamePackage/RenamePackageTest.java similarity index 100% rename from jdk/test/java/io/Serializable/evolution/RenamePackage/RenamePackageTest.java rename to test/jdk/java/io/Serializable/evolution/RenamePackage/RenamePackageTest.java diff --git a/jdk/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java b/test/jdk/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java similarity index 100% rename from jdk/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java rename to test/jdk/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java diff --git a/jdk/test/java/io/Serializable/evolution/RenamePackage/install/SerialDriver.java b/test/jdk/java/io/Serializable/evolution/RenamePackage/install/SerialDriver.java similarity index 100% rename from jdk/test/java/io/Serializable/evolution/RenamePackage/install/SerialDriver.java rename to test/jdk/java/io/Serializable/evolution/RenamePackage/install/SerialDriver.java diff --git a/jdk/test/java/io/Serializable/evolution/RenamePackage/test/SerialDriver.java b/test/jdk/java/io/Serializable/evolution/RenamePackage/test/SerialDriver.java similarity index 100% rename from jdk/test/java/io/Serializable/evolution/RenamePackage/test/SerialDriver.java rename to test/jdk/java/io/Serializable/evolution/RenamePackage/test/SerialDriver.java diff --git a/jdk/test/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java b/test/jdk/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java similarity index 100% rename from jdk/test/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java rename to test/jdk/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java diff --git a/jdk/test/java/io/Serializable/explicitCNFException/ExplicitCNFException.java b/test/jdk/java/io/Serializable/explicitCNFException/ExplicitCNFException.java similarity index 100% rename from jdk/test/java/io/Serializable/explicitCNFException/ExplicitCNFException.java rename to test/jdk/java/io/Serializable/explicitCNFException/ExplicitCNFException.java diff --git a/jdk/test/java/io/Serializable/failureAtomicity/Bar.template b/test/jdk/java/io/Serializable/failureAtomicity/Bar.template similarity index 100% rename from jdk/test/java/io/Serializable/failureAtomicity/Bar.template rename to test/jdk/java/io/Serializable/failureAtomicity/Bar.template diff --git a/jdk/test/java/io/Serializable/failureAtomicity/FailureAtomicity.java b/test/jdk/java/io/Serializable/failureAtomicity/FailureAtomicity.java similarity index 100% rename from jdk/test/java/io/Serializable/failureAtomicity/FailureAtomicity.java rename to test/jdk/java/io/Serializable/failureAtomicity/FailureAtomicity.java diff --git a/jdk/test/java/io/Serializable/failureAtomicity/Foo.template b/test/jdk/java/io/Serializable/failureAtomicity/Foo.template similarity index 100% rename from jdk/test/java/io/Serializable/failureAtomicity/Foo.template rename to test/jdk/java/io/Serializable/failureAtomicity/Foo.template diff --git a/jdk/test/java/io/Serializable/failureAtomicity/SerialRef.java b/test/jdk/java/io/Serializable/failureAtomicity/SerialRef.java similarity index 100% rename from jdk/test/java/io/Serializable/failureAtomicity/SerialRef.java rename to test/jdk/java/io/Serializable/failureAtomicity/SerialRef.java diff --git a/jdk/test/java/io/Serializable/fieldTypeString/Read.java b/test/jdk/java/io/Serializable/fieldTypeString/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/fieldTypeString/Read.java rename to test/jdk/java/io/Serializable/fieldTypeString/Read.java diff --git a/jdk/test/java/io/Serializable/fieldTypeString/Write.java b/test/jdk/java/io/Serializable/fieldTypeString/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/fieldTypeString/Write.java rename to test/jdk/java/io/Serializable/fieldTypeString/Write.java diff --git a/jdk/test/java/io/Serializable/finalFields/FinalFields.java b/test/jdk/java/io/Serializable/finalFields/FinalFields.java similarity index 100% rename from jdk/test/java/io/Serializable/finalFields/FinalFields.java rename to test/jdk/java/io/Serializable/finalFields/FinalFields.java diff --git a/jdk/test/java/io/Serializable/getSuidClinitError/GetSuidClinitError.java b/test/jdk/java/io/Serializable/getSuidClinitError/GetSuidClinitError.java similarity index 100% rename from jdk/test/java/io/Serializable/getSuidClinitError/GetSuidClinitError.java rename to test/jdk/java/io/Serializable/getSuidClinitError/GetSuidClinitError.java diff --git a/jdk/test/java/io/Serializable/illegalHandle/Test.java b/test/jdk/java/io/Serializable/illegalHandle/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/illegalHandle/Test.java rename to test/jdk/java/io/Serializable/illegalHandle/Test.java diff --git a/jdk/test/java/io/Serializable/illegalHandle/negativeHandle.ser b/test/jdk/java/io/Serializable/illegalHandle/negativeHandle.ser similarity index 100% rename from jdk/test/java/io/Serializable/illegalHandle/negativeHandle.ser rename to test/jdk/java/io/Serializable/illegalHandle/negativeHandle.ser diff --git a/jdk/test/java/io/Serializable/illegalHandle/tooHighHandle.ser b/test/jdk/java/io/Serializable/illegalHandle/tooHighHandle.ser similarity index 100% rename from jdk/test/java/io/Serializable/illegalHandle/tooHighHandle.ser rename to test/jdk/java/io/Serializable/illegalHandle/tooHighHandle.ser diff --git a/jdk/test/java/io/Serializable/inactiveRegistration/InactiveRegistration.java b/test/jdk/java/io/Serializable/inactiveRegistration/InactiveRegistration.java similarity index 100% rename from jdk/test/java/io/Serializable/inactiveRegistration/InactiveRegistration.java rename to test/jdk/java/io/Serializable/inactiveRegistration/InactiveRegistration.java diff --git a/jdk/test/java/io/Serializable/longString/LongString.java b/test/jdk/java/io/Serializable/longString/LongString.java similarity index 100% rename from jdk/test/java/io/Serializable/longString/LongString.java rename to test/jdk/java/io/Serializable/longString/LongString.java diff --git a/jdk/test/java/io/Serializable/longString/mesg.ser b/test/jdk/java/io/Serializable/longString/mesg.ser similarity index 100% rename from jdk/test/java/io/Serializable/longString/mesg.ser rename to test/jdk/java/io/Serializable/longString/mesg.ser diff --git a/jdk/test/java/io/Serializable/lookupAnyInvocation/LookupAnyInvocation.java b/test/jdk/java/io/Serializable/lookupAnyInvocation/LookupAnyInvocation.java similarity index 100% rename from jdk/test/java/io/Serializable/lookupAnyInvocation/LookupAnyInvocation.java rename to test/jdk/java/io/Serializable/lookupAnyInvocation/LookupAnyInvocation.java diff --git a/jdk/test/java/io/Serializable/lookupInterfaceDesc/LookupInterfaceDesc.java b/test/jdk/java/io/Serializable/lookupInterfaceDesc/LookupInterfaceDesc.java similarity index 100% rename from jdk/test/java/io/Serializable/lookupInterfaceDesc/LookupInterfaceDesc.java rename to test/jdk/java/io/Serializable/lookupInterfaceDesc/LookupInterfaceDesc.java diff --git a/jdk/test/java/io/Serializable/maskSyntheticModifier/Foo.class b/test/jdk/java/io/Serializable/maskSyntheticModifier/Foo.class similarity index 100% rename from jdk/test/java/io/Serializable/maskSyntheticModifier/Foo.class rename to test/jdk/java/io/Serializable/maskSyntheticModifier/Foo.class diff --git a/jdk/test/java/io/Serializable/maskSyntheticModifier/Foo.java b/test/jdk/java/io/Serializable/maskSyntheticModifier/Foo.java similarity index 100% rename from jdk/test/java/io/Serializable/maskSyntheticModifier/Foo.java rename to test/jdk/java/io/Serializable/maskSyntheticModifier/Foo.java diff --git a/jdk/test/java/io/Serializable/maskSyntheticModifier/MaskSyntheticModifierTest.java b/test/jdk/java/io/Serializable/maskSyntheticModifier/MaskSyntheticModifierTest.java similarity index 100% rename from jdk/test/java/io/Serializable/maskSyntheticModifier/MaskSyntheticModifierTest.java rename to test/jdk/java/io/Serializable/maskSyntheticModifier/MaskSyntheticModifierTest.java diff --git a/jdk/test/java/io/Serializable/misplacedArrayClassDesc/MisplacedArrayClassDesc.java b/test/jdk/java/io/Serializable/misplacedArrayClassDesc/MisplacedArrayClassDesc.java similarity index 100% rename from jdk/test/java/io/Serializable/misplacedArrayClassDesc/MisplacedArrayClassDesc.java rename to test/jdk/java/io/Serializable/misplacedArrayClassDesc/MisplacedArrayClassDesc.java diff --git a/jdk/test/java/io/Serializable/modifyStaticFields/ModifyStaticFields.java b/test/jdk/java/io/Serializable/modifyStaticFields/ModifyStaticFields.java similarity index 100% rename from jdk/test/java/io/Serializable/modifyStaticFields/ModifyStaticFields.java rename to test/jdk/java/io/Serializable/modifyStaticFields/ModifyStaticFields.java diff --git a/jdk/test/java/io/Serializable/nestedReplace/NestedReplace.java b/test/jdk/java/io/Serializable/nestedReplace/NestedReplace.java similarity index 100% rename from jdk/test/java/io/Serializable/nestedReplace/NestedReplace.java rename to test/jdk/java/io/Serializable/nestedReplace/NestedReplace.java diff --git a/jdk/test/java/io/Serializable/noSuchFieldClarification/NoSuchFieldClarification.java b/test/jdk/java/io/Serializable/noSuchFieldClarification/NoSuchFieldClarification.java similarity index 100% rename from jdk/test/java/io/Serializable/noSuchFieldClarification/NoSuchFieldClarification.java rename to test/jdk/java/io/Serializable/noSuchFieldClarification/NoSuchFieldClarification.java diff --git a/jdk/test/java/io/Serializable/nonserializable/ExceptionDetail.java b/test/jdk/java/io/Serializable/nonserializable/ExceptionDetail.java similarity index 100% rename from jdk/test/java/io/Serializable/nonserializable/ExceptionDetail.java rename to test/jdk/java/io/Serializable/nonserializable/ExceptionDetail.java diff --git a/jdk/test/java/io/Serializable/notAvailable/NotAvailable.java b/test/jdk/java/io/Serializable/notAvailable/NotAvailable.java similarity index 100% rename from jdk/test/java/io/Serializable/notAvailable/NotAvailable.java rename to test/jdk/java/io/Serializable/notAvailable/NotAvailable.java diff --git a/jdk/test/java/io/Serializable/nullArgExceptionOrder/Test.java b/test/jdk/java/io/Serializable/nullArgExceptionOrder/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/nullArgExceptionOrder/Test.java rename to test/jdk/java/io/Serializable/nullArgExceptionOrder/Test.java diff --git a/jdk/test/java/io/Serializable/oldTests/AnnotateClass.java b/test/jdk/java/io/Serializable/oldTests/AnnotateClass.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/AnnotateClass.java rename to test/jdk/java/io/Serializable/oldTests/AnnotateClass.java diff --git a/jdk/test/java/io/Serializable/oldTests/ArrayFields.java b/test/jdk/java/io/Serializable/oldTests/ArrayFields.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/ArrayFields.java rename to test/jdk/java/io/Serializable/oldTests/ArrayFields.java diff --git a/jdk/test/java/io/Serializable/oldTests/ArrayOpsTest.java b/test/jdk/java/io/Serializable/oldTests/ArrayOpsTest.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/ArrayOpsTest.java rename to test/jdk/java/io/Serializable/oldTests/ArrayOpsTest.java diff --git a/jdk/test/java/io/Serializable/oldTests/ArrayTest.java b/test/jdk/java/io/Serializable/oldTests/ArrayTest.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/ArrayTest.java rename to test/jdk/java/io/Serializable/oldTests/ArrayTest.java diff --git a/jdk/test/java/io/Serializable/oldTests/ArraysOfArrays.java b/test/jdk/java/io/Serializable/oldTests/ArraysOfArrays.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/ArraysOfArrays.java rename to test/jdk/java/io/Serializable/oldTests/ArraysOfArrays.java diff --git a/jdk/test/java/io/Serializable/oldTests/BinaryTree.java b/test/jdk/java/io/Serializable/oldTests/BinaryTree.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/BinaryTree.java rename to test/jdk/java/io/Serializable/oldTests/BinaryTree.java diff --git a/jdk/test/java/io/Serializable/oldTests/CheckForException.java b/test/jdk/java/io/Serializable/oldTests/CheckForException.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/CheckForException.java rename to test/jdk/java/io/Serializable/oldTests/CheckForException.java diff --git a/jdk/test/java/io/Serializable/oldTests/CheckingEquality.java b/test/jdk/java/io/Serializable/oldTests/CheckingEquality.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/CheckingEquality.java rename to test/jdk/java/io/Serializable/oldTests/CheckingEquality.java diff --git a/jdk/test/java/io/Serializable/oldTests/CircularList.java b/test/jdk/java/io/Serializable/oldTests/CircularList.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/CircularList.java rename to test/jdk/java/io/Serializable/oldTests/CircularList.java diff --git a/jdk/test/java/io/Serializable/oldTests/PrimitivesTest.java b/test/jdk/java/io/Serializable/oldTests/PrimitivesTest.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/PrimitivesTest.java rename to test/jdk/java/io/Serializable/oldTests/PrimitivesTest.java diff --git a/jdk/test/java/io/Serializable/oldTests/SerializeWithException.java b/test/jdk/java/io/Serializable/oldTests/SerializeWithException.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/SerializeWithException.java rename to test/jdk/java/io/Serializable/oldTests/SerializeWithException.java diff --git a/jdk/test/java/io/Serializable/oldTests/SimpleArrays.java b/test/jdk/java/io/Serializable/oldTests/SimpleArrays.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/SimpleArrays.java rename to test/jdk/java/io/Serializable/oldTests/SimpleArrays.java diff --git a/jdk/test/java/io/Serializable/oldTests/ValidateClass.java b/test/jdk/java/io/Serializable/oldTests/ValidateClass.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/ValidateClass.java rename to test/jdk/java/io/Serializable/oldTests/ValidateClass.java diff --git a/jdk/test/java/io/Serializable/oldTests/WritePrimitive.java b/test/jdk/java/io/Serializable/oldTests/WritePrimitive.java similarity index 100% rename from jdk/test/java/io/Serializable/oldTests/WritePrimitive.java rename to test/jdk/java/io/Serializable/oldTests/WritePrimitive.java diff --git a/jdk/test/java/io/Serializable/optionalDataEnd/OptionalDataEnd.java b/test/jdk/java/io/Serializable/optionalDataEnd/OptionalDataEnd.java similarity index 100% rename from jdk/test/java/io/Serializable/optionalDataEnd/OptionalDataEnd.java rename to test/jdk/java/io/Serializable/optionalDataEnd/OptionalDataEnd.java diff --git a/jdk/test/java/io/Serializable/packageAccess/A.java b/test/jdk/java/io/Serializable/packageAccess/A.java similarity index 100% rename from jdk/test/java/io/Serializable/packageAccess/A.java rename to test/jdk/java/io/Serializable/packageAccess/A.java diff --git a/jdk/test/java/io/Serializable/packageAccess/B.java b/test/jdk/java/io/Serializable/packageAccess/B.java similarity index 100% rename from jdk/test/java/io/Serializable/packageAccess/B.java rename to test/jdk/java/io/Serializable/packageAccess/B.java diff --git a/jdk/test/java/io/Serializable/packageAccess/C.java b/test/jdk/java/io/Serializable/packageAccess/C.java similarity index 100% rename from jdk/test/java/io/Serializable/packageAccess/C.java rename to test/jdk/java/io/Serializable/packageAccess/C.java diff --git a/jdk/test/java/io/Serializable/packageAccess/D.java b/test/jdk/java/io/Serializable/packageAccess/D.java similarity index 100% rename from jdk/test/java/io/Serializable/packageAccess/D.java rename to test/jdk/java/io/Serializable/packageAccess/D.java diff --git a/jdk/test/java/io/Serializable/packageAccess/PackageAccessTest.java b/test/jdk/java/io/Serializable/packageAccess/PackageAccessTest.java similarity index 100% rename from jdk/test/java/io/Serializable/packageAccess/PackageAccessTest.java rename to test/jdk/java/io/Serializable/packageAccess/PackageAccessTest.java diff --git a/jdk/test/java/io/Serializable/parents/EvolvedClass.java b/test/jdk/java/io/Serializable/parents/EvolvedClass.java similarity index 100% rename from jdk/test/java/io/Serializable/parents/EvolvedClass.java rename to test/jdk/java/io/Serializable/parents/EvolvedClass.java diff --git a/jdk/test/java/io/Serializable/parents/OriginalClass.java b/test/jdk/java/io/Serializable/parents/OriginalClass.java similarity index 100% rename from jdk/test/java/io/Serializable/parents/OriginalClass.java rename to test/jdk/java/io/Serializable/parents/OriginalClass.java diff --git a/jdk/test/java/io/Serializable/partialClassDesc/PartialClassDesc.java b/test/jdk/java/io/Serializable/partialClassDesc/PartialClassDesc.java similarity index 100% rename from jdk/test/java/io/Serializable/partialClassDesc/PartialClassDesc.java rename to test/jdk/java/io/Serializable/partialClassDesc/PartialClassDesc.java diff --git a/jdk/test/java/io/Serializable/primitiveClasses/PrimitiveClasses.java b/test/jdk/java/io/Serializable/primitiveClasses/PrimitiveClasses.java similarity index 100% rename from jdk/test/java/io/Serializable/primitiveClasses/PrimitiveClasses.java rename to test/jdk/java/io/Serializable/primitiveClasses/PrimitiveClasses.java diff --git a/jdk/test/java/io/Serializable/proxy/Basic.java b/test/jdk/java/io/Serializable/proxy/Basic.java similarity index 100% rename from jdk/test/java/io/Serializable/proxy/Basic.java rename to test/jdk/java/io/Serializable/proxy/Basic.java diff --git a/jdk/test/java/io/Serializable/proxy/replace/ReadResolve.java b/test/jdk/java/io/Serializable/proxy/replace/ReadResolve.java similarity index 100% rename from jdk/test/java/io/Serializable/proxy/replace/ReadResolve.java rename to test/jdk/java/io/Serializable/proxy/replace/ReadResolve.java diff --git a/jdk/test/java/io/Serializable/proxy/replace/Resolved.java b/test/jdk/java/io/Serializable/proxy/replace/Resolved.java similarity index 100% rename from jdk/test/java/io/Serializable/proxy/replace/Resolved.java rename to test/jdk/java/io/Serializable/proxy/replace/Resolved.java diff --git a/jdk/test/java/io/Serializable/proxy/replace/Test.java b/test/jdk/java/io/Serializable/proxy/replace/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/proxy/replace/Test.java rename to test/jdk/java/io/Serializable/proxy/replace/Test.java diff --git a/jdk/test/java/io/Serializable/proxy/replace/WriteReplace.java b/test/jdk/java/io/Serializable/proxy/replace/WriteReplace.java similarity index 100% rename from jdk/test/java/io/Serializable/proxy/replace/WriteReplace.java rename to test/jdk/java/io/Serializable/proxy/replace/WriteReplace.java diff --git a/jdk/test/java/io/Serializable/proxy/skipMissing/Handler.java b/test/jdk/java/io/Serializable/proxy/skipMissing/Handler.java similarity index 100% rename from jdk/test/java/io/Serializable/proxy/skipMissing/Handler.java rename to test/jdk/java/io/Serializable/proxy/skipMissing/Handler.java diff --git a/jdk/test/java/io/Serializable/proxy/skipMissing/Read.java b/test/jdk/java/io/Serializable/proxy/skipMissing/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/proxy/skipMissing/Read.java rename to test/jdk/java/io/Serializable/proxy/skipMissing/Read.java diff --git a/jdk/test/java/io/Serializable/proxy/skipMissing/Write.java b/test/jdk/java/io/Serializable/proxy/skipMissing/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/proxy/skipMissing/Write.java rename to test/jdk/java/io/Serializable/proxy/skipMissing/Write.java diff --git a/jdk/test/java/io/Serializable/readObjectNoData/Read.java b/test/jdk/java/io/Serializable/readObjectNoData/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/readObjectNoData/Read.java rename to test/jdk/java/io/Serializable/readObjectNoData/Read.java diff --git a/jdk/test/java/io/Serializable/readObjectNoData/Write.java b/test/jdk/java/io/Serializable/readObjectNoData/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/readObjectNoData/Write.java rename to test/jdk/java/io/Serializable/readObjectNoData/Write.java diff --git a/jdk/test/java/io/Serializable/readPastObject/ReadPastObject.java b/test/jdk/java/io/Serializable/readPastObject/ReadPastObject.java similarity index 100% rename from jdk/test/java/io/Serializable/readPastObject/ReadPastObject.java rename to test/jdk/java/io/Serializable/readPastObject/ReadPastObject.java diff --git a/jdk/test/java/io/Serializable/recursiveClassDescLookup/Test.java b/test/jdk/java/io/Serializable/recursiveClassDescLookup/Test.java similarity index 100% rename from jdk/test/java/io/Serializable/recursiveClassDescLookup/Test.java rename to test/jdk/java/io/Serializable/recursiveClassDescLookup/Test.java diff --git a/jdk/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java b/test/jdk/java/io/Serializable/replaceStringArray/ReplaceStringArray.java similarity index 100% rename from jdk/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java rename to test/jdk/java/io/Serializable/replaceStringArray/ReplaceStringArray.java diff --git a/jdk/test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java b/test/jdk/java/io/Serializable/replaceWithNull/ReplaceWithNull.java similarity index 100% rename from jdk/test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java rename to test/jdk/java/io/Serializable/replaceWithNull/ReplaceWithNull.java diff --git a/jdk/test/java/io/Serializable/resolveClass/MethodTest.java b/test/jdk/java/io/Serializable/resolveClass/MethodTest.java similarity index 100% rename from jdk/test/java/io/Serializable/resolveClass/MethodTest.java rename to test/jdk/java/io/Serializable/resolveClass/MethodTest.java diff --git a/jdk/test/java/io/Serializable/resolveClass/consTest/Boot.java b/test/jdk/java/io/Serializable/resolveClass/consTest/Boot.java similarity index 100% rename from jdk/test/java/io/Serializable/resolveClass/consTest/Boot.java rename to test/jdk/java/io/Serializable/resolveClass/consTest/Boot.java diff --git a/jdk/test/java/io/Serializable/resolveClass/consTest/ConsTest.java b/test/jdk/java/io/Serializable/resolveClass/consTest/ConsTest.java similarity index 100% rename from jdk/test/java/io/Serializable/resolveClass/consTest/ConsTest.java rename to test/jdk/java/io/Serializable/resolveClass/consTest/ConsTest.java diff --git a/jdk/test/java/io/Serializable/resolveClass/consTest/SetupJar.java b/test/jdk/java/io/Serializable/resolveClass/consTest/SetupJar.java similarity index 100% rename from jdk/test/java/io/Serializable/resolveClass/consTest/SetupJar.java rename to test/jdk/java/io/Serializable/resolveClass/consTest/SetupJar.java diff --git a/jdk/test/java/io/Serializable/resolveClass/deserializeButton/DeserializeButtonTest.java b/test/jdk/java/io/Serializable/resolveClass/deserializeButton/DeserializeButtonTest.java similarity index 100% rename from jdk/test/java/io/Serializable/resolveClass/deserializeButton/DeserializeButtonTest.java rename to test/jdk/java/io/Serializable/resolveClass/deserializeButton/DeserializeButtonTest.java diff --git a/jdk/test/java/io/Serializable/resolveClass/deserializeButton/Foo.java b/test/jdk/java/io/Serializable/resolveClass/deserializeButton/Foo.java similarity index 100% rename from jdk/test/java/io/Serializable/resolveClass/deserializeButton/Foo.java rename to test/jdk/java/io/Serializable/resolveClass/deserializeButton/Foo.java diff --git a/jdk/test/java/io/Serializable/resolveClassException/ResolveClassException.java b/test/jdk/java/io/Serializable/resolveClassException/ResolveClassException.java similarity index 100% rename from jdk/test/java/io/Serializable/resolveClassException/ResolveClassException.java rename to test/jdk/java/io/Serializable/resolveClassException/ResolveClassException.java diff --git a/jdk/test/java/io/Serializable/resolveProxyClass/NonPublicInterface.java b/test/jdk/java/io/Serializable/resolveProxyClass/NonPublicInterface.java similarity index 100% rename from jdk/test/java/io/Serializable/resolveProxyClass/NonPublicInterface.java rename to test/jdk/java/io/Serializable/resolveProxyClass/NonPublicInterface.java diff --git a/jdk/test/java/io/Serializable/sanityCheck/SanityCheck.java b/test/jdk/java/io/Serializable/sanityCheck/SanityCheck.java similarity index 100% rename from jdk/test/java/io/Serializable/sanityCheck/SanityCheck.java rename to test/jdk/java/io/Serializable/sanityCheck/SanityCheck.java diff --git a/jdk/test/java/io/Serializable/serialFilter/CheckInputOrderTest.java b/test/jdk/java/io/Serializable/serialFilter/CheckInputOrderTest.java similarity index 100% rename from jdk/test/java/io/Serializable/serialFilter/CheckInputOrderTest.java rename to test/jdk/java/io/Serializable/serialFilter/CheckInputOrderTest.java diff --git a/jdk/test/java/io/Serializable/serialFilter/FilterWithSecurityManagerTest.java b/test/jdk/java/io/Serializable/serialFilter/FilterWithSecurityManagerTest.java similarity index 100% rename from jdk/test/java/io/Serializable/serialFilter/FilterWithSecurityManagerTest.java rename to test/jdk/java/io/Serializable/serialFilter/FilterWithSecurityManagerTest.java diff --git a/jdk/test/java/io/Serializable/serialFilter/GlobalFilterTest.java b/test/jdk/java/io/Serializable/serialFilter/GlobalFilterTest.java similarity index 100% rename from jdk/test/java/io/Serializable/serialFilter/GlobalFilterTest.java rename to test/jdk/java/io/Serializable/serialFilter/GlobalFilterTest.java diff --git a/jdk/test/java/io/Serializable/serialFilter/MixedFiltersTest.java b/test/jdk/java/io/Serializable/serialFilter/MixedFiltersTest.java similarity index 100% rename from jdk/test/java/io/Serializable/serialFilter/MixedFiltersTest.java rename to test/jdk/java/io/Serializable/serialFilter/MixedFiltersTest.java diff --git a/jdk/test/java/io/Serializable/serialFilter/SerialFilterTest.java b/test/jdk/java/io/Serializable/serialFilter/SerialFilterTest.java similarity index 100% rename from jdk/test/java/io/Serializable/serialFilter/SerialFilterTest.java rename to test/jdk/java/io/Serializable/serialFilter/SerialFilterTest.java diff --git a/jdk/test/java/io/Serializable/serialFilter/java.security-extra1 b/test/jdk/java/io/Serializable/serialFilter/java.security-extra1 similarity index 100% rename from jdk/test/java/io/Serializable/serialFilter/java.security-extra1 rename to test/jdk/java/io/Serializable/serialFilter/java.security-extra1 diff --git a/jdk/test/java/io/Serializable/serialFilter/security.policy b/test/jdk/java/io/Serializable/serialFilter/security.policy similarity index 100% rename from jdk/test/java/io/Serializable/serialFilter/security.policy rename to test/jdk/java/io/Serializable/serialFilter/security.policy diff --git a/jdk/test/java/io/Serializable/serialFilter/security.policy.without.globalFilter b/test/jdk/java/io/Serializable/serialFilter/security.policy.without.globalFilter similarity index 100% rename from jdk/test/java/io/Serializable/serialFilter/security.policy.without.globalFilter rename to test/jdk/java/io/Serializable/serialFilter/security.policy.without.globalFilter diff --git a/jdk/test/java/io/Serializable/serialver/classpath/ClasspathTest.java b/test/jdk/java/io/Serializable/serialver/classpath/ClasspathTest.java similarity index 100% rename from jdk/test/java/io/Serializable/serialver/classpath/ClasspathTest.java rename to test/jdk/java/io/Serializable/serialver/classpath/ClasspathTest.java diff --git a/jdk/test/java/io/Serializable/serialver/nested/NestedTest.java b/test/jdk/java/io/Serializable/serialver/nested/NestedTest.java similarity index 100% rename from jdk/test/java/io/Serializable/serialver/nested/NestedTest.java rename to test/jdk/java/io/Serializable/serialver/nested/NestedTest.java diff --git a/jdk/test/java/io/Serializable/skipToEndOfBlockData/SkipToEndOfBlockData.java b/test/jdk/java/io/Serializable/skipToEndOfBlockData/SkipToEndOfBlockData.java similarity index 100% rename from jdk/test/java/io/Serializable/skipToEndOfBlockData/SkipToEndOfBlockData.java rename to test/jdk/java/io/Serializable/skipToEndOfBlockData/SkipToEndOfBlockData.java diff --git a/jdk/test/java/io/Serializable/skipWriteObject/Read.java b/test/jdk/java/io/Serializable/skipWriteObject/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/skipWriteObject/Read.java rename to test/jdk/java/io/Serializable/skipWriteObject/Read.java diff --git a/jdk/test/java/io/Serializable/skipWriteObject/Write.java b/test/jdk/java/io/Serializable/skipWriteObject/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/skipWriteObject/Write.java rename to test/jdk/java/io/Serializable/skipWriteObject/Write.java diff --git a/jdk/test/java/io/Serializable/skippedObjCNFException/Read.java b/test/jdk/java/io/Serializable/skippedObjCNFException/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/skippedObjCNFException/Read.java rename to test/jdk/java/io/Serializable/skippedObjCNFException/Read.java diff --git a/jdk/test/java/io/Serializable/skippedObjCNFException/Write.java b/test/jdk/java/io/Serializable/skippedObjCNFException/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/skippedObjCNFException/Write.java rename to test/jdk/java/io/Serializable/skippedObjCNFException/Write.java diff --git a/jdk/test/java/io/Serializable/stopCustomDeserialization/Read.java b/test/jdk/java/io/Serializable/stopCustomDeserialization/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/stopCustomDeserialization/Read.java rename to test/jdk/java/io/Serializable/stopCustomDeserialization/Read.java diff --git a/jdk/test/java/io/Serializable/stopCustomDeserialization/Write.java b/test/jdk/java/io/Serializable/stopCustomDeserialization/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/stopCustomDeserialization/Write.java rename to test/jdk/java/io/Serializable/stopCustomDeserialization/Write.java diff --git a/jdk/test/java/io/Serializable/subclass/AbstractObjectInputStream.java b/test/jdk/java/io/Serializable/subclass/AbstractObjectInputStream.java similarity index 100% rename from jdk/test/java/io/Serializable/subclass/AbstractObjectInputStream.java rename to test/jdk/java/io/Serializable/subclass/AbstractObjectInputStream.java diff --git a/jdk/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java b/test/jdk/java/io/Serializable/subclass/AbstractObjectOutputStream.java similarity index 100% rename from jdk/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java rename to test/jdk/java/io/Serializable/subclass/AbstractObjectOutputStream.java diff --git a/jdk/test/java/io/Serializable/subclass/Allow.policy b/test/jdk/java/io/Serializable/subclass/Allow.policy similarity index 100% rename from jdk/test/java/io/Serializable/subclass/Allow.policy rename to test/jdk/java/io/Serializable/subclass/Allow.policy diff --git a/jdk/test/java/io/Serializable/subclass/SubclassTest.java b/test/jdk/java/io/Serializable/subclass/SubclassTest.java similarity index 100% rename from jdk/test/java/io/Serializable/subclass/SubclassTest.java rename to test/jdk/java/io/Serializable/subclass/SubclassTest.java diff --git a/jdk/test/java/io/Serializable/subclass/XObjectInputStream.java b/test/jdk/java/io/Serializable/subclass/XObjectInputStream.java similarity index 100% rename from jdk/test/java/io/Serializable/subclass/XObjectInputStream.java rename to test/jdk/java/io/Serializable/subclass/XObjectInputStream.java diff --git a/jdk/test/java/io/Serializable/subclass/XObjectOutputStream.java b/test/jdk/java/io/Serializable/subclass/XObjectOutputStream.java similarity index 100% rename from jdk/test/java/io/Serializable/subclass/XObjectOutputStream.java rename to test/jdk/java/io/Serializable/subclass/XObjectOutputStream.java diff --git a/jdk/test/java/io/Serializable/subclassGC/SubclassGC.java b/test/jdk/java/io/Serializable/subclassGC/SubclassGC.java similarity index 100% rename from jdk/test/java/io/Serializable/subclassGC/SubclassGC.java rename to test/jdk/java/io/Serializable/subclassGC/SubclassGC.java diff --git a/jdk/test/java/io/Serializable/subclassGC/SubclassOfOOS.java b/test/jdk/java/io/Serializable/subclassGC/SubclassOfOOS.java similarity index 100% rename from jdk/test/java/io/Serializable/subclassGC/SubclassOfOOS.java rename to test/jdk/java/io/Serializable/subclassGC/SubclassOfOOS.java diff --git a/jdk/test/java/io/Serializable/subclassGC/security.policy b/test/jdk/java/io/Serializable/subclassGC/security.policy similarity index 100% rename from jdk/test/java/io/Serializable/subclassGC/security.policy rename to test/jdk/java/io/Serializable/subclassGC/security.policy diff --git a/jdk/test/java/io/Serializable/superclassDataLoss/A.java b/test/jdk/java/io/Serializable/superclassDataLoss/A.java similarity index 100% rename from jdk/test/java/io/Serializable/superclassDataLoss/A.java rename to test/jdk/java/io/Serializable/superclassDataLoss/A.java diff --git a/jdk/test/java/io/Serializable/superclassDataLoss/B.java b/test/jdk/java/io/Serializable/superclassDataLoss/B.java similarity index 100% rename from jdk/test/java/io/Serializable/superclassDataLoss/B.java rename to test/jdk/java/io/Serializable/superclassDataLoss/B.java diff --git a/jdk/test/java/io/Serializable/superclassDataLoss/SuperclassDataLossTest.java b/test/jdk/java/io/Serializable/superclassDataLoss/SuperclassDataLossTest.java similarity index 100% rename from jdk/test/java/io/Serializable/superclassDataLoss/SuperclassDataLossTest.java rename to test/jdk/java/io/Serializable/superclassDataLoss/SuperclassDataLossTest.java diff --git a/jdk/test/java/io/Serializable/survivePrematureClose/SurvivePrematureClose.java b/test/jdk/java/io/Serializable/survivePrematureClose/SurvivePrematureClose.java similarity index 100% rename from jdk/test/java/io/Serializable/survivePrematureClose/SurvivePrematureClose.java rename to test/jdk/java/io/Serializable/survivePrematureClose/SurvivePrematureClose.java diff --git a/jdk/test/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java b/test/jdk/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java similarity index 100% rename from jdk/test/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java rename to test/jdk/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java diff --git a/jdk/test/java/io/Serializable/typeStringBackRef/TypeStringBackRef.java b/test/jdk/java/io/Serializable/typeStringBackRef/TypeStringBackRef.java similarity index 100% rename from jdk/test/java/io/Serializable/typeStringBackRef/TypeStringBackRef.java rename to test/jdk/java/io/Serializable/typeStringBackRef/TypeStringBackRef.java diff --git a/jdk/test/java/io/Serializable/underlyingOutputStreamException/UnderlyingOutputStreamException.java b/test/jdk/java/io/Serializable/underlyingOutputStreamException/UnderlyingOutputStreamException.java similarity index 100% rename from jdk/test/java/io/Serializable/underlyingOutputStreamException/UnderlyingOutputStreamException.java rename to test/jdk/java/io/Serializable/underlyingOutputStreamException/UnderlyingOutputStreamException.java diff --git a/jdk/test/java/io/Serializable/unnamedPackageSwitch/A.java b/test/jdk/java/io/Serializable/unnamedPackageSwitch/A.java similarity index 100% rename from jdk/test/java/io/Serializable/unnamedPackageSwitch/A.java rename to test/jdk/java/io/Serializable/unnamedPackageSwitch/A.java diff --git a/jdk/test/java/io/Serializable/unnamedPackageSwitch/UnnamedPackageSwitchTest.java b/test/jdk/java/io/Serializable/unnamedPackageSwitch/UnnamedPackageSwitchTest.java similarity index 100% rename from jdk/test/java/io/Serializable/unnamedPackageSwitch/UnnamedPackageSwitchTest.java rename to test/jdk/java/io/Serializable/unnamedPackageSwitch/UnnamedPackageSwitchTest.java diff --git a/jdk/test/java/io/Serializable/unresolvableObjectStreamClass/UnresolvableObjectStreamClass.java b/test/jdk/java/io/Serializable/unresolvableObjectStreamClass/UnresolvableObjectStreamClass.java similarity index 100% rename from jdk/test/java/io/Serializable/unresolvableObjectStreamClass/UnresolvableObjectStreamClass.java rename to test/jdk/java/io/Serializable/unresolvableObjectStreamClass/UnresolvableObjectStreamClass.java diff --git a/jdk/test/java/io/Serializable/unresolvedClassDesc/Foo.java b/test/jdk/java/io/Serializable/unresolvedClassDesc/Foo.java similarity index 100% rename from jdk/test/java/io/Serializable/unresolvedClassDesc/Foo.java rename to test/jdk/java/io/Serializable/unresolvedClassDesc/Foo.java diff --git a/jdk/test/java/io/Serializable/unresolvedClassDesc/Read.java b/test/jdk/java/io/Serializable/unresolvedClassDesc/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/unresolvedClassDesc/Read.java rename to test/jdk/java/io/Serializable/unresolvedClassDesc/Read.java diff --git a/jdk/test/java/io/Serializable/unresolvedClassDesc/Write.java b/test/jdk/java/io/Serializable/unresolvedClassDesc/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/unresolvedClassDesc/Write.java rename to test/jdk/java/io/Serializable/unresolvedClassDesc/Write.java diff --git a/jdk/test/java/io/Serializable/unshared/Read.java b/test/jdk/java/io/Serializable/unshared/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/unshared/Read.java rename to test/jdk/java/io/Serializable/unshared/Read.java diff --git a/jdk/test/java/io/Serializable/unshared/Write.java b/test/jdk/java/io/Serializable/unshared/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/unshared/Write.java rename to test/jdk/java/io/Serializable/unshared/Write.java diff --git a/jdk/test/java/io/Serializable/userRWObjError/UserRWObjError.java b/test/jdk/java/io/Serializable/userRWObjError/UserRWObjError.java similarity index 100% rename from jdk/test/java/io/Serializable/userRWObjError/UserRWObjError.java rename to test/jdk/java/io/Serializable/userRWObjError/UserRWObjError.java diff --git a/jdk/test/java/io/Serializable/validate/Validate.java b/test/jdk/java/io/Serializable/validate/Validate.java similarity index 100% rename from jdk/test/java/io/Serializable/validate/Validate.java rename to test/jdk/java/io/Serializable/validate/Validate.java diff --git a/jdk/test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java b/test/jdk/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java similarity index 100% rename from jdk/test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java rename to test/jdk/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java diff --git a/jdk/test/java/io/Serializable/writeObjectMemory/WriteObjectMemory.java b/test/jdk/java/io/Serializable/writeObjectMemory/WriteObjectMemory.java similarity index 100% rename from jdk/test/java/io/Serializable/writeObjectMemory/WriteObjectMemory.java rename to test/jdk/java/io/Serializable/writeObjectMemory/WriteObjectMemory.java diff --git a/jdk/test/java/io/Serializable/writeReplace/WriteReplace.java b/test/jdk/java/io/Serializable/writeReplace/WriteReplace.java similarity index 100% rename from jdk/test/java/io/Serializable/writeReplace/WriteReplace.java rename to test/jdk/java/io/Serializable/writeReplace/WriteReplace.java diff --git a/jdk/test/java/io/Serializable/wrongReturnTypes/Read.java b/test/jdk/java/io/Serializable/wrongReturnTypes/Read.java similarity index 100% rename from jdk/test/java/io/Serializable/wrongReturnTypes/Read.java rename to test/jdk/java/io/Serializable/wrongReturnTypes/Read.java diff --git a/jdk/test/java/io/Serializable/wrongReturnTypes/Write.java b/test/jdk/java/io/Serializable/wrongReturnTypes/Write.java similarity index 100% rename from jdk/test/java/io/Serializable/wrongReturnTypes/Write.java rename to test/jdk/java/io/Serializable/wrongReturnTypes/Write.java diff --git a/jdk/test/java/io/StreamTokenizer/Comment.java b/test/jdk/java/io/StreamTokenizer/Comment.java similarity index 100% rename from jdk/test/java/io/StreamTokenizer/Comment.java rename to test/jdk/java/io/StreamTokenizer/Comment.java diff --git a/jdk/test/java/io/StreamTokenizer/NullConstruct.java b/test/jdk/java/io/StreamTokenizer/NullConstruct.java similarity index 100% rename from jdk/test/java/io/StreamTokenizer/NullConstruct.java rename to test/jdk/java/io/StreamTokenizer/NullConstruct.java diff --git a/jdk/test/java/io/StreamTokenizer/QuoteTest.java b/test/jdk/java/io/StreamTokenizer/QuoteTest.java similarity index 100% rename from jdk/test/java/io/StreamTokenizer/QuoteTest.java rename to test/jdk/java/io/StreamTokenizer/QuoteTest.java diff --git a/jdk/test/java/io/StreamTokenizer/ReadAhead.java b/test/jdk/java/io/StreamTokenizer/ReadAhead.java similarity index 100% rename from jdk/test/java/io/StreamTokenizer/ReadAhead.java rename to test/jdk/java/io/StreamTokenizer/ReadAhead.java diff --git a/jdk/test/java/io/StreamTokenizer/Reset.java b/test/jdk/java/io/StreamTokenizer/Reset.java similarity index 100% rename from jdk/test/java/io/StreamTokenizer/Reset.java rename to test/jdk/java/io/StreamTokenizer/Reset.java diff --git a/jdk/test/java/io/StreamTokenizer/input.txt b/test/jdk/java/io/StreamTokenizer/input.txt similarity index 100% rename from jdk/test/java/io/StreamTokenizer/input.txt rename to test/jdk/java/io/StreamTokenizer/input.txt diff --git a/jdk/test/java/io/StringBufferInputStream/OverflowInRead.java b/test/jdk/java/io/StringBufferInputStream/OverflowInRead.java similarity index 100% rename from jdk/test/java/io/StringBufferInputStream/OverflowInRead.java rename to test/jdk/java/io/StringBufferInputStream/OverflowInRead.java diff --git a/jdk/test/java/io/StringReader/ClosedReady.java b/test/jdk/java/io/StringReader/ClosedReady.java similarity index 100% rename from jdk/test/java/io/StringReader/ClosedReady.java rename to test/jdk/java/io/StringReader/ClosedReady.java diff --git a/jdk/test/java/io/StringReader/NegativeMarkLimit.java b/test/jdk/java/io/StringReader/NegativeMarkLimit.java similarity index 100% rename from jdk/test/java/io/StringReader/NegativeMarkLimit.java rename to test/jdk/java/io/StringReader/NegativeMarkLimit.java diff --git a/jdk/test/java/io/StringReader/Skip.java b/test/jdk/java/io/StringReader/Skip.java similarity index 100% rename from jdk/test/java/io/StringReader/Skip.java rename to test/jdk/java/io/StringReader/Skip.java diff --git a/jdk/test/java/io/StringWriter/NegativeBufferSize.java b/test/jdk/java/io/StringWriter/NegativeBufferSize.java similarity index 100% rename from jdk/test/java/io/StringWriter/NegativeBufferSize.java rename to test/jdk/java/io/StringWriter/NegativeBufferSize.java diff --git a/jdk/test/java/io/SystemInAvailable.java b/test/jdk/java/io/SystemInAvailable.java similarity index 100% rename from jdk/test/java/io/SystemInAvailable.java rename to test/jdk/java/io/SystemInAvailable.java diff --git a/jdk/test/java/io/Unicode.java b/test/jdk/java/io/Unicode.java similarity index 100% rename from jdk/test/java/io/Unicode.java rename to test/jdk/java/io/Unicode.java diff --git a/jdk/test/java/io/Writer/Append.java b/test/jdk/java/io/Writer/Append.java similarity index 100% rename from jdk/test/java/io/Writer/Append.java rename to test/jdk/java/io/Writer/Append.java diff --git a/jdk/test/java/io/Writer/Bug6856817.java b/test/jdk/java/io/Writer/Bug6856817.java similarity index 100% rename from jdk/test/java/io/Writer/Bug6856817.java rename to test/jdk/java/io/Writer/Bug6856817.java diff --git a/jdk/test/java/io/Writer/WriteFromString.java b/test/jdk/java/io/Writer/WriteFromString.java similarity index 100% rename from jdk/test/java/io/Writer/WriteFromString.java rename to test/jdk/java/io/Writer/WriteFromString.java diff --git a/jdk/test/java/io/Writer/WriteParams.java b/test/jdk/java/io/Writer/WriteParams.java similarity index 100% rename from jdk/test/java/io/Writer/WriteParams.java rename to test/jdk/java/io/Writer/WriteParams.java diff --git a/jdk/test/java/io/charStreams/ABCInputStream.java b/test/jdk/java/io/charStreams/ABCInputStream.java similarity index 100% rename from jdk/test/java/io/charStreams/ABCInputStream.java rename to test/jdk/java/io/charStreams/ABCInputStream.java diff --git a/jdk/test/java/io/charStreams/ABCOutputStream.java b/test/jdk/java/io/charStreams/ABCOutputStream.java similarity index 100% rename from jdk/test/java/io/charStreams/ABCOutputStream.java rename to test/jdk/java/io/charStreams/ABCOutputStream.java diff --git a/jdk/test/java/io/charStreams/ABCReader.java b/test/jdk/java/io/charStreams/ABCReader.java similarity index 100% rename from jdk/test/java/io/charStreams/ABCReader.java rename to test/jdk/java/io/charStreams/ABCReader.java diff --git a/jdk/test/java/io/charStreams/BCat.java b/test/jdk/java/io/charStreams/BCat.java similarity index 100% rename from jdk/test/java/io/charStreams/BCat.java rename to test/jdk/java/io/charStreams/BCat.java diff --git a/jdk/test/java/io/charStreams/BufferSizes.java b/test/jdk/java/io/charStreams/BufferSizes.java similarity index 100% rename from jdk/test/java/io/charStreams/BufferSizes.java rename to test/jdk/java/io/charStreams/BufferSizes.java diff --git a/jdk/test/java/io/charStreams/BufferedReaderMark.java b/test/jdk/java/io/charStreams/BufferedReaderMark.java similarity index 100% rename from jdk/test/java/io/charStreams/BufferedReaderMark.java rename to test/jdk/java/io/charStreams/BufferedReaderMark.java diff --git a/jdk/test/java/io/charStreams/Cat.java b/test/jdk/java/io/charStreams/Cat.java similarity index 100% rename from jdk/test/java/io/charStreams/Cat.java rename to test/jdk/java/io/charStreams/Cat.java diff --git a/jdk/test/java/io/charStreams/CharGenerator.java b/test/jdk/java/io/charStreams/CharGenerator.java similarity index 100% rename from jdk/test/java/io/charStreams/CharGenerator.java rename to test/jdk/java/io/charStreams/CharGenerator.java diff --git a/jdk/test/java/io/charStreams/IntGenerator.java b/test/jdk/java/io/charStreams/IntGenerator.java similarity index 100% rename from jdk/test/java/io/charStreams/IntGenerator.java rename to test/jdk/java/io/charStreams/IntGenerator.java diff --git a/jdk/test/java/io/charStreams/LineGenerator.java b/test/jdk/java/io/charStreams/LineGenerator.java similarity index 100% rename from jdk/test/java/io/charStreams/LineGenerator.java rename to test/jdk/java/io/charStreams/LineGenerator.java diff --git a/jdk/test/java/io/charStreams/LineLengths.java b/test/jdk/java/io/charStreams/LineLengths.java similarity index 100% rename from jdk/test/java/io/charStreams/LineLengths.java rename to test/jdk/java/io/charStreams/LineLengths.java diff --git a/jdk/test/java/io/charStreams/LineLengthsSource.java b/test/jdk/java/io/charStreams/LineLengthsSource.java similarity index 100% rename from jdk/test/java/io/charStreams/LineLengthsSource.java rename to test/jdk/java/io/charStreams/LineLengthsSource.java diff --git a/jdk/test/java/io/charStreams/LineNumbers.java b/test/jdk/java/io/charStreams/LineNumbers.java similarity index 100% rename from jdk/test/java/io/charStreams/LineNumbers.java rename to test/jdk/java/io/charStreams/LineNumbers.java diff --git a/jdk/test/java/io/charStreams/LineSink.java b/test/jdk/java/io/charStreams/LineSink.java similarity index 100% rename from jdk/test/java/io/charStreams/LineSink.java rename to test/jdk/java/io/charStreams/LineSink.java diff --git a/jdk/test/java/io/charStreams/RandomLineSource.java b/test/jdk/java/io/charStreams/RandomLineSource.java similarity index 100% rename from jdk/test/java/io/charStreams/RandomLineSource.java rename to test/jdk/java/io/charStreams/RandomLineSource.java diff --git a/jdk/test/java/io/charStreams/RandomLines.java b/test/jdk/java/io/charStreams/RandomLines.java similarity index 100% rename from jdk/test/java/io/charStreams/RandomLines.java rename to test/jdk/java/io/charStreams/RandomLines.java diff --git a/jdk/test/java/io/charStreams/SmallReads.java b/test/jdk/java/io/charStreams/SmallReads.java similarity index 100% rename from jdk/test/java/io/charStreams/SmallReads.java rename to test/jdk/java/io/charStreams/SmallReads.java diff --git a/jdk/test/java/io/charStreams/StringConvert.java b/test/jdk/java/io/charStreams/StringConvert.java similarity index 100% rename from jdk/test/java/io/charStreams/StringConvert.java rename to test/jdk/java/io/charStreams/StringConvert.java diff --git a/jdk/test/java/io/charStreams/StringGenerator.java b/test/jdk/java/io/charStreams/StringGenerator.java similarity index 100% rename from jdk/test/java/io/charStreams/StringGenerator.java rename to test/jdk/java/io/charStreams/StringGenerator.java diff --git a/jdk/test/java/io/charStreams/UTF16.java b/test/jdk/java/io/charStreams/UTF16.java similarity index 100% rename from jdk/test/java/io/charStreams/UTF16.java rename to test/jdk/java/io/charStreams/UTF16.java diff --git a/jdk/test/java/io/charStreams/UTF8.java b/test/jdk/java/io/charStreams/UTF8.java similarity index 100% rename from jdk/test/java/io/charStreams/UTF8.java rename to test/jdk/java/io/charStreams/UTF8.java diff --git a/jdk/test/java/io/charStreams/WriteLengths.java b/test/jdk/java/io/charStreams/WriteLengths.java similarity index 100% rename from jdk/test/java/io/charStreams/WriteLengths.java rename to test/jdk/java/io/charStreams/WriteLengths.java diff --git a/jdk/test/java/io/etc/FailingFlushAndClose.java b/test/jdk/java/io/etc/FailingFlushAndClose.java similarity index 100% rename from jdk/test/java/io/etc/FailingFlushAndClose.java rename to test/jdk/java/io/etc/FailingFlushAndClose.java diff --git a/jdk/test/java/io/pathNames/General.java b/test/jdk/java/io/pathNames/General.java similarity index 100% rename from jdk/test/java/io/pathNames/General.java rename to test/jdk/java/io/pathNames/General.java diff --git a/jdk/test/java/io/pathNames/GeneralSolaris.java b/test/jdk/java/io/pathNames/GeneralSolaris.java similarity index 100% rename from jdk/test/java/io/pathNames/GeneralSolaris.java rename to test/jdk/java/io/pathNames/GeneralSolaris.java diff --git a/jdk/test/java/io/pathNames/GeneralWin32.java b/test/jdk/java/io/pathNames/GeneralWin32.java similarity index 100% rename from jdk/test/java/io/pathNames/GeneralWin32.java rename to test/jdk/java/io/pathNames/GeneralWin32.java diff --git a/jdk/test/java/io/pathNames/unix/TrailingSlash.java b/test/jdk/java/io/pathNames/unix/TrailingSlash.java similarity index 100% rename from jdk/test/java/io/pathNames/unix/TrailingSlash.java rename to test/jdk/java/io/pathNames/unix/TrailingSlash.java diff --git a/jdk/test/java/io/pathNames/win32/BadDriveLetter.java b/test/jdk/java/io/pathNames/win32/BadDriveLetter.java similarity index 100% rename from jdk/test/java/io/pathNames/win32/BadDriveLetter.java rename to test/jdk/java/io/pathNames/win32/BadDriveLetter.java diff --git a/jdk/test/java/io/pathNames/win32/DriveOnly.java b/test/jdk/java/io/pathNames/win32/DriveOnly.java similarity index 100% rename from jdk/test/java/io/pathNames/win32/DriveOnly.java rename to test/jdk/java/io/pathNames/win32/DriveOnly.java diff --git a/jdk/test/java/io/pathNames/win32/DriveRelativePath.java b/test/jdk/java/io/pathNames/win32/DriveRelativePath.java similarity index 100% rename from jdk/test/java/io/pathNames/win32/DriveRelativePath.java rename to test/jdk/java/io/pathNames/win32/DriveRelativePath.java diff --git a/jdk/test/java/io/pathNames/win32/DriveSlash.java b/test/jdk/java/io/pathNames/win32/DriveSlash.java similarity index 100% rename from jdk/test/java/io/pathNames/win32/DriveSlash.java rename to test/jdk/java/io/pathNames/win32/DriveSlash.java diff --git a/jdk/test/java/io/pathNames/win32/RenameDelete.java b/test/jdk/java/io/pathNames/win32/RenameDelete.java similarity index 100% rename from jdk/test/java/io/pathNames/win32/RenameDelete.java rename to test/jdk/java/io/pathNames/win32/RenameDelete.java diff --git a/jdk/test/java/io/pathNames/win32/SJIS.java b/test/jdk/java/io/pathNames/win32/SJIS.java similarity index 100% rename from jdk/test/java/io/pathNames/win32/SJIS.java rename to test/jdk/java/io/pathNames/win32/SJIS.java diff --git a/jdk/test/java/io/pathNames/win32/bug6344646.java b/test/jdk/java/io/pathNames/win32/bug6344646.java similarity index 100% rename from jdk/test/java/io/pathNames/win32/bug6344646.java rename to test/jdk/java/io/pathNames/win32/bug6344646.java diff --git a/jdk/test/java/io/readBytes/MemoryLeak.java b/test/jdk/java/io/readBytes/MemoryLeak.java similarity index 100% rename from jdk/test/java/io/readBytes/MemoryLeak.java rename to test/jdk/java/io/readBytes/MemoryLeak.java diff --git a/jdk/test/java/io/readBytes/ReadBytesBounds.java b/test/jdk/java/io/readBytes/ReadBytesBounds.java similarity index 100% rename from jdk/test/java/io/readBytes/ReadBytesBounds.java rename to test/jdk/java/io/readBytes/ReadBytesBounds.java diff --git a/jdk/test/java/io/readBytes/input.txt b/test/jdk/java/io/readBytes/input.txt similarity index 100% rename from jdk/test/java/io/readBytes/input.txt rename to test/jdk/java/io/readBytes/input.txt diff --git a/jdk/test/java/lang/Appendable/Basic.java b/test/jdk/java/lang/Appendable/Basic.java similarity index 100% rename from jdk/test/java/lang/Appendable/Basic.java rename to test/jdk/java/lang/Appendable/Basic.java diff --git a/jdk/test/java/lang/AssertionError/Cause.java b/test/jdk/java/lang/AssertionError/Cause.java similarity index 100% rename from jdk/test/java/lang/AssertionError/Cause.java rename to test/jdk/java/lang/AssertionError/Cause.java diff --git a/jdk/test/java/lang/Boolean/Factory.java b/test/jdk/java/lang/Boolean/Factory.java similarity index 100% rename from jdk/test/java/lang/Boolean/Factory.java rename to test/jdk/java/lang/Boolean/Factory.java diff --git a/jdk/test/java/lang/Boolean/GetBoolean.java b/test/jdk/java/lang/Boolean/GetBoolean.java similarity index 100% rename from jdk/test/java/lang/Boolean/GetBoolean.java rename to test/jdk/java/lang/Boolean/GetBoolean.java diff --git a/jdk/test/java/lang/Boolean/MakeBooleanComparable.java b/test/jdk/java/lang/Boolean/MakeBooleanComparable.java similarity index 100% rename from jdk/test/java/lang/Boolean/MakeBooleanComparable.java rename to test/jdk/java/lang/Boolean/MakeBooleanComparable.java diff --git a/jdk/test/java/lang/Boolean/ParseBoolean.java b/test/jdk/java/lang/Boolean/ParseBoolean.java similarity index 100% rename from jdk/test/java/lang/Boolean/ParseBoolean.java rename to test/jdk/java/lang/Boolean/ParseBoolean.java diff --git a/jdk/test/java/lang/Byte/Decode.java b/test/jdk/java/lang/Byte/Decode.java similarity index 100% rename from jdk/test/java/lang/Byte/Decode.java rename to test/jdk/java/lang/Byte/Decode.java diff --git a/jdk/test/java/lang/Character/CharacterName.java b/test/jdk/java/lang/Character/CharacterName.java similarity index 100% rename from jdk/test/java/lang/Character/CharacterName.java rename to test/jdk/java/lang/Character/CharacterName.java diff --git a/jdk/test/java/lang/Character/CheckProp.java b/test/jdk/java/lang/Character/CheckProp.java similarity index 100% rename from jdk/test/java/lang/Character/CheckProp.java rename to test/jdk/java/lang/Character/CheckProp.java diff --git a/jdk/test/java/lang/Character/CheckScript.java b/test/jdk/java/lang/Character/CheckScript.java similarity index 100% rename from jdk/test/java/lang/Character/CheckScript.java rename to test/jdk/java/lang/Character/CheckScript.java diff --git a/jdk/test/java/lang/Character/PropList.txt b/test/jdk/java/lang/Character/PropList.txt similarity index 100% rename from jdk/test/java/lang/Character/PropList.txt rename to test/jdk/java/lang/Character/PropList.txt diff --git a/jdk/test/java/lang/Character/PropertyValueAliases.txt b/test/jdk/java/lang/Character/PropertyValueAliases.txt similarity index 100% rename from jdk/test/java/lang/Character/PropertyValueAliases.txt rename to test/jdk/java/lang/Character/PropertyValueAliases.txt diff --git a/jdk/test/java/lang/Character/Scripts.txt b/test/jdk/java/lang/Character/Scripts.txt similarity index 100% rename from jdk/test/java/lang/Character/Scripts.txt rename to test/jdk/java/lang/Character/Scripts.txt diff --git a/jdk/test/java/lang/Character/UnicodeBlock/OptimalMapSize.java b/test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java similarity index 100% rename from jdk/test/java/lang/Character/UnicodeBlock/OptimalMapSize.java rename to test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java diff --git a/jdk/test/java/lang/Class/ArrayMethods.java b/test/jdk/java/lang/Class/ArrayMethods.java similarity index 100% rename from jdk/test/java/lang/Class/ArrayMethods.java rename to test/jdk/java/lang/Class/ArrayMethods.java diff --git a/jdk/test/java/lang/Class/Cast.java b/test/jdk/java/lang/Class/Cast.java similarity index 100% rename from jdk/test/java/lang/Class/Cast.java rename to test/jdk/java/lang/Class/Cast.java diff --git a/jdk/test/java/lang/Class/EnumPoseur.class b/test/jdk/java/lang/Class/EnumPoseur.class similarity index 100% rename from jdk/test/java/lang/Class/EnumPoseur.class rename to test/jdk/java/lang/Class/EnumPoseur.class diff --git a/jdk/test/java/lang/Class/EnumPoseur.java.src b/test/jdk/java/lang/Class/EnumPoseur.java.src similarity index 100% rename from jdk/test/java/lang/Class/EnumPoseur.java.src rename to test/jdk/java/lang/Class/EnumPoseur.java.src diff --git a/jdk/test/java/lang/Class/Foo.java b/test/jdk/java/lang/Class/Foo.java similarity index 100% rename from jdk/test/java/lang/Class/Foo.java rename to test/jdk/java/lang/Class/Foo.java diff --git a/jdk/test/java/lang/Class/GenericStringTest.java b/test/jdk/java/lang/Class/GenericStringTest.java similarity index 100% rename from jdk/test/java/lang/Class/GenericStringTest.java rename to test/jdk/java/lang/Class/GenericStringTest.java diff --git a/jdk/test/java/lang/Class/GetModuleTest.java b/test/jdk/java/lang/Class/GetModuleTest.java similarity index 100% rename from jdk/test/java/lang/Class/GetModuleTest.java rename to test/jdk/java/lang/Class/GetModuleTest.java diff --git a/jdk/test/java/lang/Class/GetPackageTest.java b/test/jdk/java/lang/Class/GetPackageTest.java similarity index 100% rename from jdk/test/java/lang/Class/GetPackageTest.java rename to test/jdk/java/lang/Class/GetPackageTest.java diff --git a/jdk/test/java/lang/Class/IsAnnotationType.java b/test/jdk/java/lang/Class/IsAnnotationType.java similarity index 100% rename from jdk/test/java/lang/Class/IsAnnotationType.java rename to test/jdk/java/lang/Class/IsAnnotationType.java diff --git a/jdk/test/java/lang/Class/IsEnum.java b/test/jdk/java/lang/Class/IsEnum.java similarity index 100% rename from jdk/test/java/lang/Class/IsEnum.java rename to test/jdk/java/lang/Class/IsEnum.java diff --git a/jdk/test/java/lang/Class/IsSynthetic.java b/test/jdk/java/lang/Class/IsSynthetic.java similarity index 100% rename from jdk/test/java/lang/Class/IsSynthetic.java rename to test/jdk/java/lang/Class/IsSynthetic.java diff --git a/jdk/test/java/lang/Class/TypeCheckMicroBenchmark.java b/test/jdk/java/lang/Class/TypeCheckMicroBenchmark.java similarity index 100% rename from jdk/test/java/lang/Class/TypeCheckMicroBenchmark.java rename to test/jdk/java/lang/Class/TypeCheckMicroBenchmark.java diff --git a/jdk/test/java/lang/Class/asSubclass/BasicUnit.java b/test/jdk/java/lang/Class/asSubclass/BasicUnit.java similarity index 100% rename from jdk/test/java/lang/Class/asSubclass/BasicUnit.java rename to test/jdk/java/lang/Class/asSubclass/BasicUnit.java diff --git a/jdk/test/java/lang/Class/attributes/ClassAttributesTest.java b/test/jdk/java/lang/Class/attributes/ClassAttributesTest.java similarity index 100% rename from jdk/test/java/lang/Class/attributes/ClassAttributesTest.java rename to test/jdk/java/lang/Class/attributes/ClassAttributesTest.java diff --git a/jdk/test/java/lang/Class/forName/InitArg.java b/test/jdk/java/lang/Class/forName/InitArg.java similarity index 100% rename from jdk/test/java/lang/Class/forName/InitArg.java rename to test/jdk/java/lang/Class/forName/InitArg.java diff --git a/jdk/test/java/lang/Class/forName/InvalidNameWithSlash.java b/test/jdk/java/lang/Class/forName/InvalidNameWithSlash.java similarity index 100% rename from jdk/test/java/lang/Class/forName/InvalidNameWithSlash.java rename to test/jdk/java/lang/Class/forName/InvalidNameWithSlash.java diff --git a/jdk/test/java/lang/Class/forName/NonJavaNames.java b/test/jdk/java/lang/Class/forName/NonJavaNames.java similarity index 100% rename from jdk/test/java/lang/Class/forName/NonJavaNames.java rename to test/jdk/java/lang/Class/forName/NonJavaNames.java diff --git a/jdk/test/java/lang/Class/forName/NonJavaNames.sh b/test/jdk/java/lang/Class/forName/NonJavaNames.sh similarity index 100% rename from jdk/test/java/lang/Class/forName/NonJavaNames.sh rename to test/jdk/java/lang/Class/forName/NonJavaNames.sh diff --git a/jdk/test/java/lang/Class/forName/Z.java b/test/jdk/java/lang/Class/forName/Z.java similarity index 100% rename from jdk/test/java/lang/Class/forName/Z.java rename to test/jdk/java/lang/Class/forName/Z.java diff --git a/jdk/test/java/lang/Class/forName/arrayClass/Class1.java b/test/jdk/java/lang/Class/forName/arrayClass/Class1.java similarity index 100% rename from jdk/test/java/lang/Class/forName/arrayClass/Class1.java rename to test/jdk/java/lang/Class/forName/arrayClass/Class1.java diff --git a/jdk/test/java/lang/Class/forName/arrayClass/Class2.java b/test/jdk/java/lang/Class/forName/arrayClass/Class2.java similarity index 100% rename from jdk/test/java/lang/Class/forName/arrayClass/Class2.java rename to test/jdk/java/lang/Class/forName/arrayClass/Class2.java diff --git a/jdk/test/java/lang/Class/forName/arrayClass/Class3.java b/test/jdk/java/lang/Class/forName/arrayClass/Class3.java similarity index 100% rename from jdk/test/java/lang/Class/forName/arrayClass/Class3.java rename to test/jdk/java/lang/Class/forName/arrayClass/Class3.java diff --git a/jdk/test/java/lang/Class/forName/arrayClass/Class4.java b/test/jdk/java/lang/Class/forName/arrayClass/Class4.java similarity index 100% rename from jdk/test/java/lang/Class/forName/arrayClass/Class4.java rename to test/jdk/java/lang/Class/forName/arrayClass/Class4.java diff --git a/jdk/test/java/lang/Class/forName/arrayClass/ExceedMaxDim.java b/test/jdk/java/lang/Class/forName/arrayClass/ExceedMaxDim.java similarity index 100% rename from jdk/test/java/lang/Class/forName/arrayClass/ExceedMaxDim.java rename to test/jdk/java/lang/Class/forName/arrayClass/ExceedMaxDim.java diff --git a/jdk/test/java/lang/Class/forName/classes/0.class b/test/jdk/java/lang/Class/forName/classes/0.class similarity index 100% rename from jdk/test/java/lang/Class/forName/classes/0.class rename to test/jdk/java/lang/Class/forName/classes/0.class diff --git a/jdk/test/java/lang/Class/forName/classes/3.class b/test/jdk/java/lang/Class/forName/classes/3.class similarity index 100% rename from jdk/test/java/lang/Class/forName/classes/3.class rename to test/jdk/java/lang/Class/forName/classes/3.class diff --git a/jdk/test/java/lang/Class/forName/classes/Z.class b/test/jdk/java/lang/Class/forName/classes/Z.class similarity index 100% rename from jdk/test/java/lang/Class/forName/classes/Z.class rename to test/jdk/java/lang/Class/forName/classes/Z.class diff --git a/jdk/test/java/lang/Class/forName/classes/comma.class b/test/jdk/java/lang/Class/forName/classes/comma.class similarity index 100% rename from jdk/test/java/lang/Class/forName/classes/comma.class rename to test/jdk/java/lang/Class/forName/classes/comma.class diff --git a/jdk/test/java/lang/Class/forName/classes/hyphen.class b/test/jdk/java/lang/Class/forName/classes/hyphen.class similarity index 100% rename from jdk/test/java/lang/Class/forName/classes/hyphen.class rename to test/jdk/java/lang/Class/forName/classes/hyphen.class diff --git a/jdk/test/java/lang/Class/forName/classes/left-square.class b/test/jdk/java/lang/Class/forName/classes/left-square.class similarity index 100% rename from jdk/test/java/lang/Class/forName/classes/left-square.class rename to test/jdk/java/lang/Class/forName/classes/left-square.class diff --git a/jdk/test/java/lang/Class/forName/classes/period.class b/test/jdk/java/lang/Class/forName/classes/period.class similarity index 100% rename from jdk/test/java/lang/Class/forName/classes/period.class rename to test/jdk/java/lang/Class/forName/classes/period.class diff --git a/jdk/test/java/lang/Class/forName/classes/plus.class b/test/jdk/java/lang/Class/forName/classes/plus.class similarity index 100% rename from jdk/test/java/lang/Class/forName/classes/plus.class rename to test/jdk/java/lang/Class/forName/classes/plus.class diff --git a/jdk/test/java/lang/Class/forName/classes/right-square.class b/test/jdk/java/lang/Class/forName/classes/right-square.class similarity index 100% rename from jdk/test/java/lang/Class/forName/classes/right-square.class rename to test/jdk/java/lang/Class/forName/classes/right-square.class diff --git a/jdk/test/java/lang/Class/forName/classes/semicolon.class b/test/jdk/java/lang/Class/forName/classes/semicolon.class similarity index 100% rename from jdk/test/java/lang/Class/forName/classes/semicolon.class rename to test/jdk/java/lang/Class/forName/classes/semicolon.class diff --git a/jdk/test/java/lang/Class/forName/modules/TestDriver.java b/test/jdk/java/lang/Class/forName/modules/TestDriver.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/TestDriver.java rename to test/jdk/java/lang/Class/forName/modules/TestDriver.java diff --git a/jdk/test/java/lang/Class/forName/modules/TestLayer.java b/test/jdk/java/lang/Class/forName/modules/TestLayer.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/TestLayer.java rename to test/jdk/java/lang/Class/forName/modules/TestLayer.java diff --git a/jdk/test/java/lang/Class/forName/modules/TestMain.java b/test/jdk/java/lang/Class/forName/modules/TestMain.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/TestMain.java rename to test/jdk/java/lang/Class/forName/modules/TestMain.java diff --git a/jdk/test/java/lang/Class/forName/modules/policy b/test/jdk/java/lang/Class/forName/modules/policy similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/policy rename to test/jdk/java/lang/Class/forName/modules/policy diff --git a/jdk/test/java/lang/Class/forName/modules/policy.denied b/test/jdk/java/lang/Class/forName/modules/policy.denied similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/policy.denied rename to test/jdk/java/lang/Class/forName/modules/policy.denied diff --git a/jdk/test/java/lang/Class/forName/modules/src/m1/module-info.java b/test/jdk/java/lang/Class/forName/modules/src/m1/module-info.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/src/m1/module-info.java rename to test/jdk/java/lang/Class/forName/modules/src/m1/module-info.java diff --git a/jdk/test/java/lang/Class/forName/modules/src/m1/p1/A.java b/test/jdk/java/lang/Class/forName/modules/src/m1/p1/A.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/src/m1/p1/A.java rename to test/jdk/java/lang/Class/forName/modules/src/m1/p1/A.java diff --git a/jdk/test/java/lang/Class/forName/modules/src/m1/p1/Initializer.java b/test/jdk/java/lang/Class/forName/modules/src/m1/p1/Initializer.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/src/m1/p1/Initializer.java rename to test/jdk/java/lang/Class/forName/modules/src/m1/p1/Initializer.java diff --git a/jdk/test/java/lang/Class/forName/modules/src/m1/p1/internal/B.java b/test/jdk/java/lang/Class/forName/modules/src/m1/p1/internal/B.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/src/m1/p1/internal/B.java rename to test/jdk/java/lang/Class/forName/modules/src/m1/p1/internal/B.java diff --git a/jdk/test/java/lang/Class/forName/modules/src/m2/module-info.java b/test/jdk/java/lang/Class/forName/modules/src/m2/module-info.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/src/m2/module-info.java rename to test/jdk/java/lang/Class/forName/modules/src/m2/module-info.java diff --git a/jdk/test/java/lang/Class/forName/modules/src/m2/p2/C.java b/test/jdk/java/lang/Class/forName/modules/src/m2/p2/C.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/src/m2/p2/C.java rename to test/jdk/java/lang/Class/forName/modules/src/m2/p2/C.java diff --git a/jdk/test/java/lang/Class/forName/modules/src/m2/p2/test/Main.java b/test/jdk/java/lang/Class/forName/modules/src/m2/p2/test/Main.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/src/m2/p2/test/Main.java rename to test/jdk/java/lang/Class/forName/modules/src/m2/p2/test/Main.java diff --git a/jdk/test/java/lang/Class/forName/modules/src/m3/module-info.java b/test/jdk/java/lang/Class/forName/modules/src/m3/module-info.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/src/m3/module-info.java rename to test/jdk/java/lang/Class/forName/modules/src/m3/module-info.java diff --git a/jdk/test/java/lang/Class/forName/modules/src/m3/p3/NoAccess.java b/test/jdk/java/lang/Class/forName/modules/src/m3/p3/NoAccess.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/src/m3/p3/NoAccess.java rename to test/jdk/java/lang/Class/forName/modules/src/m3/p3/NoAccess.java diff --git a/jdk/test/java/lang/Class/forName/modules/src/m3/p3/NoGetClassLoaderAccess.java b/test/jdk/java/lang/Class/forName/modules/src/m3/p3/NoGetClassLoaderAccess.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/src/m3/p3/NoGetClassLoaderAccess.java rename to test/jdk/java/lang/Class/forName/modules/src/m3/p3/NoGetClassLoaderAccess.java diff --git a/jdk/test/java/lang/Class/forName/modules/src/m3/p3/internal/Foo.java b/test/jdk/java/lang/Class/forName/modules/src/m3/p3/internal/Foo.java similarity index 100% rename from jdk/test/java/lang/Class/forName/modules/src/m3/p3/internal/Foo.java rename to test/jdk/java/lang/Class/forName/modules/src/m3/p3/internal/Foo.java diff --git a/jdk/test/java/lang/Class/getClasses/Sanity.java b/test/jdk/java/lang/Class/getClasses/Sanity.java similarity index 100% rename from jdk/test/java/lang/Class/getClasses/Sanity.java rename to test/jdk/java/lang/Class/getClasses/Sanity.java diff --git a/jdk/test/java/lang/Class/getDeclaredClasses/Sanity.java b/test/jdk/java/lang/Class/getDeclaredClasses/Sanity.java similarity index 100% rename from jdk/test/java/lang/Class/getDeclaredClasses/Sanity.java rename to test/jdk/java/lang/Class/getDeclaredClasses/Sanity.java diff --git a/jdk/test/java/lang/Class/getDeclaredClasses/TypeTag.java b/test/jdk/java/lang/Class/getDeclaredClasses/TypeTag.java similarity index 100% rename from jdk/test/java/lang/Class/getDeclaredClasses/TypeTag.java rename to test/jdk/java/lang/Class/getDeclaredClasses/TypeTag.java diff --git a/jdk/test/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java b/test/jdk/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java similarity index 100% rename from jdk/test/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java rename to test/jdk/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java diff --git a/jdk/test/java/lang/Class/getDeclaredField/Exceptions.java b/test/jdk/java/lang/Class/getDeclaredField/Exceptions.java similarity index 100% rename from jdk/test/java/lang/Class/getDeclaredField/Exceptions.java rename to test/jdk/java/lang/Class/getDeclaredField/Exceptions.java diff --git a/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java b/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java similarity index 100% rename from jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java rename to test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java diff --git a/jdk/test/java/lang/Class/getDeclaredMethod/Exceptions.java b/test/jdk/java/lang/Class/getDeclaredMethod/Exceptions.java similarity index 100% rename from jdk/test/java/lang/Class/getDeclaredMethod/Exceptions.java rename to test/jdk/java/lang/Class/getDeclaredMethod/Exceptions.java diff --git a/jdk/test/java/lang/Class/getDeclaringClass/Sanity.java b/test/jdk/java/lang/Class/getDeclaringClass/Sanity.java similarity index 100% rename from jdk/test/java/lang/Class/getDeclaringClass/Sanity.java rename to test/jdk/java/lang/Class/getDeclaringClass/Sanity.java diff --git a/jdk/test/java/lang/Class/getEnclosingClass/EnclosingClass.java b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java similarity index 100% rename from jdk/test/java/lang/Class/getEnclosingClass/EnclosingClass.java rename to test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java diff --git a/jdk/test/java/lang/Class/getEnclosingClass/EnclosingClassTest.java b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java similarity index 100% rename from jdk/test/java/lang/Class/getEnclosingClass/EnclosingClassTest.java rename to test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java diff --git a/jdk/test/java/lang/Class/getEnclosingClass/T4992170.java b/test/jdk/java/lang/Class/getEnclosingClass/T4992170.java similarity index 100% rename from jdk/test/java/lang/Class/getEnclosingClass/T4992170.java rename to test/jdk/java/lang/Class/getEnclosingClass/T4992170.java diff --git a/jdk/test/java/lang/Class/getEnclosingClass/build.sh b/test/jdk/java/lang/Class/getEnclosingClass/build.sh similarity index 100% rename from jdk/test/java/lang/Class/getEnclosingClass/build.sh rename to test/jdk/java/lang/Class/getEnclosingClass/build.sh diff --git a/jdk/test/java/lang/Class/getEnclosingClass/common/TestMe.java b/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java similarity index 100% rename from jdk/test/java/lang/Class/getEnclosingClass/common/TestMe.java rename to test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java diff --git a/jdk/test/java/lang/Class/getEnclosingClass/make_src.sh b/test/jdk/java/lang/Class/getEnclosingClass/make_src.sh similarity index 100% rename from jdk/test/java/lang/Class/getEnclosingClass/make_src.sh rename to test/jdk/java/lang/Class/getEnclosingClass/make_src.sh diff --git a/jdk/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java b/test/jdk/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java similarity index 100% rename from jdk/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java rename to test/jdk/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java diff --git a/jdk/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorWithSecurityManager.java b/test/jdk/java/lang/Class/getEnclosingConstructor/EnclosingConstructorWithSecurityManager.java similarity index 100% rename from jdk/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorWithSecurityManager.java rename to test/jdk/java/lang/Class/getEnclosingConstructor/EnclosingConstructorWithSecurityManager.java diff --git a/jdk/test/java/lang/Class/getEnclosingMethod/EnclosingMethodTests.java b/test/jdk/java/lang/Class/getEnclosingMethod/EnclosingMethodTests.java similarity index 100% rename from jdk/test/java/lang/Class/getEnclosingMethod/EnclosingMethodTests.java rename to test/jdk/java/lang/Class/getEnclosingMethod/EnclosingMethodTests.java diff --git a/jdk/test/java/lang/Class/getEnclosingMethod/EnclosingMethodWithSecurityManager.java b/test/jdk/java/lang/Class/getEnclosingMethod/EnclosingMethodWithSecurityManager.java similarity index 100% rename from jdk/test/java/lang/Class/getEnclosingMethod/EnclosingMethodWithSecurityManager.java rename to test/jdk/java/lang/Class/getEnclosingMethod/EnclosingMethodWithSecurityManager.java diff --git a/jdk/test/java/lang/Class/getField/ArrayLength.java b/test/jdk/java/lang/Class/getField/ArrayLength.java similarity index 100% rename from jdk/test/java/lang/Class/getField/ArrayLength.java rename to test/jdk/java/lang/Class/getField/ArrayLength.java diff --git a/jdk/test/java/lang/Class/getField/Exceptions.java b/test/jdk/java/lang/Class/getField/Exceptions.java similarity index 100% rename from jdk/test/java/lang/Class/getField/Exceptions.java rename to test/jdk/java/lang/Class/getField/Exceptions.java diff --git a/jdk/test/java/lang/Class/getFields/Sanity.java b/test/jdk/java/lang/Class/getFields/Sanity.java similarity index 100% rename from jdk/test/java/lang/Class/getFields/Sanity.java rename to test/jdk/java/lang/Class/getFields/Sanity.java diff --git a/jdk/test/java/lang/Class/getMethod/Exceptions.java b/test/jdk/java/lang/Class/getMethod/Exceptions.java similarity index 100% rename from jdk/test/java/lang/Class/getMethod/Exceptions.java rename to test/jdk/java/lang/Class/getMethod/Exceptions.java diff --git a/jdk/test/java/lang/Class/getMethod/NullInParamList.java b/test/jdk/java/lang/Class/getMethod/NullInParamList.java similarity index 100% rename from jdk/test/java/lang/Class/getMethod/NullInParamList.java rename to test/jdk/java/lang/Class/getMethod/NullInParamList.java diff --git a/jdk/test/java/lang/Class/getMethods/NonPublicStaticInitializer.java b/test/jdk/java/lang/Class/getMethods/NonPublicStaticInitializer.java similarity index 100% rename from jdk/test/java/lang/Class/getMethods/NonPublicStaticInitializer.java rename to test/jdk/java/lang/Class/getMethods/NonPublicStaticInitializer.java diff --git a/jdk/test/java/lang/Class/getMethods/StarInheritance.java b/test/jdk/java/lang/Class/getMethods/StarInheritance.java similarity index 100% rename from jdk/test/java/lang/Class/getMethods/StarInheritance.java rename to test/jdk/java/lang/Class/getMethods/StarInheritance.java diff --git a/jdk/test/java/lang/Class/getModifiers/ForInnerClass.java b/test/jdk/java/lang/Class/getModifiers/ForInnerClass.java similarity index 100% rename from jdk/test/java/lang/Class/getModifiers/ForInnerClass.java rename to test/jdk/java/lang/Class/getModifiers/ForInnerClass.java diff --git a/jdk/test/java/lang/Class/getModifiers/ForStaticInnerClass.java b/test/jdk/java/lang/Class/getModifiers/ForStaticInnerClass.java similarity index 100% rename from jdk/test/java/lang/Class/getModifiers/ForStaticInnerClass.java rename to test/jdk/java/lang/Class/getModifiers/ForStaticInnerClass.java diff --git a/jdk/test/java/lang/Class/getModifiers/ResolveFrom.java b/test/jdk/java/lang/Class/getModifiers/ResolveFrom.java similarity index 100% rename from jdk/test/java/lang/Class/getModifiers/ResolveFrom.java rename to test/jdk/java/lang/Class/getModifiers/ResolveFrom.java diff --git a/jdk/test/java/lang/Class/getModifiers/StripACC_SUPER.java b/test/jdk/java/lang/Class/getModifiers/StripACC_SUPER.java similarity index 100% rename from jdk/test/java/lang/Class/getModifiers/StripACC_SUPER.java rename to test/jdk/java/lang/Class/getModifiers/StripACC_SUPER.java diff --git a/jdk/test/java/lang/Class/getPackageName/Basic.java b/test/jdk/java/lang/Class/getPackageName/Basic.java similarity index 100% rename from jdk/test/java/lang/Class/getPackageName/Basic.java rename to test/jdk/java/lang/Class/getPackageName/Basic.java diff --git a/jdk/test/java/lang/Class/getResource/Main.java b/test/jdk/java/lang/Class/getResource/Main.java similarity index 100% rename from jdk/test/java/lang/Class/getResource/Main.java rename to test/jdk/java/lang/Class/getResource/Main.java diff --git a/jdk/test/java/lang/Class/getResource/ResourcesTest.java b/test/jdk/java/lang/Class/getResource/ResourcesTest.java similarity index 100% rename from jdk/test/java/lang/Class/getResource/ResourcesTest.java rename to test/jdk/java/lang/Class/getResource/ResourcesTest.java diff --git a/jdk/test/java/lang/Class/getResource/src/m1/module-info.java b/test/jdk/java/lang/Class/getResource/src/m1/module-info.java similarity index 100% rename from jdk/test/java/lang/Class/getResource/src/m1/module-info.java rename to test/jdk/java/lang/Class/getResource/src/m1/module-info.java diff --git a/jdk/test/java/lang/Class/getResource/src/m1/p1/Main.java b/test/jdk/java/lang/Class/getResource/src/m1/p1/Main.java similarity index 100% rename from jdk/test/java/lang/Class/getResource/src/m1/p1/Main.java rename to test/jdk/java/lang/Class/getResource/src/m1/p1/Main.java diff --git a/jdk/test/java/lang/Class/getResource/src/m1/p1/impl/Type.java b/test/jdk/java/lang/Class/getResource/src/m1/p1/impl/Type.java similarity index 100% rename from jdk/test/java/lang/Class/getResource/src/m1/p1/impl/Type.java rename to test/jdk/java/lang/Class/getResource/src/m1/p1/impl/Type.java diff --git a/jdk/test/java/lang/Class/getResource/src/m1/p1/resources/Type.java b/test/jdk/java/lang/Class/getResource/src/m1/p1/resources/Type.java similarity index 100% rename from jdk/test/java/lang/Class/getResource/src/m1/p1/resources/Type.java rename to test/jdk/java/lang/Class/getResource/src/m1/p1/resources/Type.java diff --git a/jdk/test/java/lang/Class/getResource/src/m2/module-info.java b/test/jdk/java/lang/Class/getResource/src/m2/module-info.java similarity index 100% rename from jdk/test/java/lang/Class/getResource/src/m2/module-info.java rename to test/jdk/java/lang/Class/getResource/src/m2/module-info.java diff --git a/jdk/test/java/lang/Class/getResource/src/m2/p2/Main.java b/test/jdk/java/lang/Class/getResource/src/m2/p2/Main.java similarity index 100% rename from jdk/test/java/lang/Class/getResource/src/m2/p2/Main.java rename to test/jdk/java/lang/Class/getResource/src/m2/p2/Main.java diff --git a/jdk/test/java/lang/Class/getResource/src/m2/p2/impl/Type.java b/test/jdk/java/lang/Class/getResource/src/m2/p2/impl/Type.java similarity index 100% rename from jdk/test/java/lang/Class/getResource/src/m2/p2/impl/Type.java rename to test/jdk/java/lang/Class/getResource/src/m2/p2/impl/Type.java diff --git a/jdk/test/java/lang/Class/getResource/src/m2/p2/resources/Type.java b/test/jdk/java/lang/Class/getResource/src/m2/p2/resources/Type.java similarity index 100% rename from jdk/test/java/lang/Class/getResource/src/m2/p2/resources/Type.java rename to test/jdk/java/lang/Class/getResource/src/m2/p2/resources/Type.java diff --git a/jdk/test/java/lang/Class/getSimpleName/GetSimpleNameTest.java b/test/jdk/java/lang/Class/getSimpleName/GetSimpleNameTest.java similarity index 100% rename from jdk/test/java/lang/Class/getSimpleName/GetSimpleNameTest.java rename to test/jdk/java/lang/Class/getSimpleName/GetSimpleNameTest.java diff --git a/jdk/test/java/lang/ClassLoader/Assert.java b/test/jdk/java/lang/ClassLoader/Assert.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/Assert.java rename to test/jdk/java/lang/ClassLoader/Assert.java diff --git a/jdk/test/java/lang/ClassLoader/CustomSystemLoader/CustomLoader.java b/test/jdk/java/lang/ClassLoader/CustomSystemLoader/CustomLoader.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/CustomSystemLoader/CustomLoader.java rename to test/jdk/java/lang/ClassLoader/CustomSystemLoader/CustomLoader.java diff --git a/jdk/test/java/lang/ClassLoader/CustomSystemLoader/InitSystemLoaderTest.java b/test/jdk/java/lang/ClassLoader/CustomSystemLoader/InitSystemLoaderTest.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/CustomSystemLoader/InitSystemLoaderTest.java rename to test/jdk/java/lang/ClassLoader/CustomSystemLoader/InitSystemLoaderTest.java diff --git a/jdk/test/java/lang/ClassLoader/EndorsedDirs.java b/test/jdk/java/lang/ClassLoader/EndorsedDirs.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/EndorsedDirs.java rename to test/jdk/java/lang/ClassLoader/EndorsedDirs.java diff --git a/jdk/test/java/lang/ClassLoader/ExceptionHidingLoader.java b/test/jdk/java/lang/ClassLoader/ExceptionHidingLoader.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/ExceptionHidingLoader.java rename to test/jdk/java/lang/ClassLoader/ExceptionHidingLoader.java diff --git a/jdk/test/java/lang/ClassLoader/ExtDirs.java b/test/jdk/java/lang/ClassLoader/ExtDirs.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/ExtDirs.java rename to test/jdk/java/lang/ClassLoader/ExtDirs.java diff --git a/jdk/test/java/lang/ClassLoader/GetDefinedPackage.java b/test/jdk/java/lang/ClassLoader/GetDefinedPackage.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/GetDefinedPackage.java rename to test/jdk/java/lang/ClassLoader/GetDefinedPackage.java diff --git a/jdk/test/java/lang/ClassLoader/GetDotResource.java b/test/jdk/java/lang/ClassLoader/GetDotResource.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/GetDotResource.java rename to test/jdk/java/lang/ClassLoader/GetDotResource.java diff --git a/jdk/test/java/lang/ClassLoader/GetPackage.java b/test/jdk/java/lang/ClassLoader/GetPackage.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/GetPackage.java rename to test/jdk/java/lang/ClassLoader/GetPackage.java diff --git a/jdk/test/java/lang/ClassLoader/GetResourceNullArg.java b/test/jdk/java/lang/ClassLoader/GetResourceNullArg.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/GetResourceNullArg.java rename to test/jdk/java/lang/ClassLoader/GetResourceNullArg.java diff --git a/jdk/test/java/lang/ClassLoader/GetSystemPackage.java b/test/jdk/java/lang/ClassLoader/GetSystemPackage.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/GetSystemPackage.java rename to test/jdk/java/lang/ClassLoader/GetSystemPackage.java diff --git a/jdk/test/java/lang/ClassLoader/IsParallelCapable.java b/test/jdk/java/lang/ClassLoader/IsParallelCapable.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/IsParallelCapable.java rename to test/jdk/java/lang/ClassLoader/IsParallelCapable.java diff --git a/jdk/test/java/lang/ClassLoader/LibraryPathProperty.java b/test/jdk/java/lang/ClassLoader/LibraryPathProperty.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/LibraryPathProperty.java rename to test/jdk/java/lang/ClassLoader/LibraryPathProperty.java diff --git a/jdk/test/java/lang/ClassLoader/LoadNullClass.java b/test/jdk/java/lang/ClassLoader/LoadNullClass.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/LoadNullClass.java rename to test/jdk/java/lang/ClassLoader/LoadNullClass.java diff --git a/jdk/test/java/lang/ClassLoader/ResourcesStreamTest.java b/test/jdk/java/lang/ClassLoader/ResourcesStreamTest.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/ResourcesStreamTest.java rename to test/jdk/java/lang/ClassLoader/ResourcesStreamTest.java diff --git a/jdk/test/java/lang/ClassLoader/UninitializedParent.java b/test/jdk/java/lang/ClassLoader/UninitializedParent.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/UninitializedParent.java rename to test/jdk/java/lang/ClassLoader/UninitializedParent.java diff --git a/jdk/test/java/lang/ClassLoader/deadlock/DelegateTest.java b/test/jdk/java/lang/ClassLoader/deadlock/DelegateTest.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/deadlock/DelegateTest.java rename to test/jdk/java/lang/ClassLoader/deadlock/DelegateTest.java diff --git a/jdk/test/java/lang/ClassLoader/deadlock/DelegatingLoader.java b/test/jdk/java/lang/ClassLoader/deadlock/DelegatingLoader.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/deadlock/DelegatingLoader.java rename to test/jdk/java/lang/ClassLoader/deadlock/DelegatingLoader.java diff --git a/jdk/test/java/lang/ClassLoader/deadlock/GetResource.java b/test/jdk/java/lang/ClassLoader/deadlock/GetResource.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/deadlock/GetResource.java rename to test/jdk/java/lang/ClassLoader/deadlock/GetResource.java diff --git a/jdk/test/java/lang/ClassLoader/deadlock/src/comSA/Alice.java b/test/jdk/java/lang/ClassLoader/deadlock/src/comSA/Alice.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/deadlock/src/comSA/Alice.java rename to test/jdk/java/lang/ClassLoader/deadlock/src/comSA/Alice.java diff --git a/jdk/test/java/lang/ClassLoader/deadlock/src/comSA/SupBob.java b/test/jdk/java/lang/ClassLoader/deadlock/src/comSA/SupBob.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/deadlock/src/comSA/SupBob.java rename to test/jdk/java/lang/ClassLoader/deadlock/src/comSA/SupBob.java diff --git a/jdk/test/java/lang/ClassLoader/deadlock/src/comSB/Bob.java b/test/jdk/java/lang/ClassLoader/deadlock/src/comSB/Bob.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/deadlock/src/comSB/Bob.java rename to test/jdk/java/lang/ClassLoader/deadlock/src/comSB/Bob.java diff --git a/jdk/test/java/lang/ClassLoader/deadlock/src/comSB/SupAlice.java b/test/jdk/java/lang/ClassLoader/deadlock/src/comSB/SupAlice.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/deadlock/src/comSB/SupAlice.java rename to test/jdk/java/lang/ClassLoader/deadlock/src/comSB/SupAlice.java diff --git a/jdk/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java b/test/jdk/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java rename to test/jdk/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java diff --git a/jdk/test/java/lang/ClassLoader/defineClass/TestClass.java b/test/jdk/java/lang/ClassLoader/defineClass/TestClass.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/defineClass/TestClass.java rename to test/jdk/java/lang/ClassLoader/defineClass/TestClass.java diff --git a/jdk/test/java/lang/ClassLoader/findSystemClass/Loadee.classfile b/test/jdk/java/lang/ClassLoader/findSystemClass/Loadee.classfile similarity index 100% rename from jdk/test/java/lang/ClassLoader/findSystemClass/Loadee.classfile rename to test/jdk/java/lang/ClassLoader/findSystemClass/Loadee.classfile diff --git a/jdk/test/java/lang/ClassLoader/findSystemClass/Loadee.java b/test/jdk/java/lang/ClassLoader/findSystemClass/Loadee.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/findSystemClass/Loadee.java rename to test/jdk/java/lang/ClassLoader/findSystemClass/Loadee.java diff --git a/jdk/test/java/lang/ClassLoader/findSystemClass/Loadee.resource b/test/jdk/java/lang/ClassLoader/findSystemClass/Loadee.resource similarity index 100% rename from jdk/test/java/lang/ClassLoader/findSystemClass/Loadee.resource rename to test/jdk/java/lang/ClassLoader/findSystemClass/Loadee.resource diff --git a/jdk/test/java/lang/ClassLoader/findSystemClass/Loader.java b/test/jdk/java/lang/ClassLoader/findSystemClass/Loader.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/findSystemClass/Loader.java rename to test/jdk/java/lang/ClassLoader/findSystemClass/Loader.java diff --git a/jdk/test/java/lang/ClassLoader/findSystemClass/java/lang/Object.class b/test/jdk/java/lang/ClassLoader/findSystemClass/java/lang/Object.class similarity index 100% rename from jdk/test/java/lang/ClassLoader/findSystemClass/java/lang/Object.class rename to test/jdk/java/lang/ClassLoader/findSystemClass/java/lang/Object.class diff --git a/jdk/test/java/lang/ClassLoader/forNameLeak/ClassForName.java b/test/jdk/java/lang/ClassLoader/forNameLeak/ClassForName.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/forNameLeak/ClassForName.java rename to test/jdk/java/lang/ClassLoader/forNameLeak/ClassForName.java diff --git a/jdk/test/java/lang/ClassLoader/forNameLeak/ClassForNameLeak.java b/test/jdk/java/lang/ClassLoader/forNameLeak/ClassForNameLeak.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/forNameLeak/ClassForNameLeak.java rename to test/jdk/java/lang/ClassLoader/forNameLeak/ClassForNameLeak.java diff --git a/jdk/test/java/lang/ClassLoader/forNameLeak/test.policy b/test/jdk/java/lang/ClassLoader/forNameLeak/test.policy similarity index 100% rename from jdk/test/java/lang/ClassLoader/forNameLeak/test.policy rename to test/jdk/java/lang/ClassLoader/forNameLeak/test.policy diff --git a/jdk/test/java/lang/ClassLoader/getResource/GetResource.java b/test/jdk/java/lang/ClassLoader/getResource/GetResource.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/GetResource.java rename to test/jdk/java/lang/ClassLoader/getResource/GetResource.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/automaticmodules/Driver.java b/test/jdk/java/lang/ClassLoader/getResource/automaticmodules/Driver.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/automaticmodules/Driver.java rename to test/jdk/java/lang/ClassLoader/getResource/automaticmodules/Driver.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/automaticmodules/Main.java b/test/jdk/java/lang/ClassLoader/getResource/automaticmodules/Main.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/automaticmodules/Main.java rename to test/jdk/java/lang/ClassLoader/getResource/automaticmodules/Main.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/modules/Main.java b/test/jdk/java/lang/ClassLoader/getResource/modules/Main.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/modules/Main.java rename to test/jdk/java/lang/ClassLoader/getResource/modules/Main.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/modules/ResourcesTest.java b/test/jdk/java/lang/ClassLoader/getResource/modules/ResourcesTest.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/modules/ResourcesTest.java rename to test/jdk/java/lang/ClassLoader/getResource/modules/ResourcesTest.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/modules/src/m1/module-info.java b/test/jdk/java/lang/ClassLoader/getResource/modules/src/m1/module-info.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/modules/src/m1/module-info.java rename to test/jdk/java/lang/ClassLoader/getResource/modules/src/m1/module-info.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/modules/src/m1/p1/Main.java b/test/jdk/java/lang/ClassLoader/getResource/modules/src/m1/p1/Main.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/modules/src/m1/p1/Main.java rename to test/jdk/java/lang/ClassLoader/getResource/modules/src/m1/p1/Main.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/modules/src/m1/p1/impl/Type.java b/test/jdk/java/lang/ClassLoader/getResource/modules/src/m1/p1/impl/Type.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/modules/src/m1/p1/impl/Type.java rename to test/jdk/java/lang/ClassLoader/getResource/modules/src/m1/p1/impl/Type.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/modules/src/m1/p1/resources/Type.java b/test/jdk/java/lang/ClassLoader/getResource/modules/src/m1/p1/resources/Type.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/modules/src/m1/p1/resources/Type.java rename to test/jdk/java/lang/ClassLoader/getResource/modules/src/m1/p1/resources/Type.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/modules/src/m2/module-info.java b/test/jdk/java/lang/ClassLoader/getResource/modules/src/m2/module-info.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/modules/src/m2/module-info.java rename to test/jdk/java/lang/ClassLoader/getResource/modules/src/m2/module-info.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/modules/src/m2/p2/Main.java b/test/jdk/java/lang/ClassLoader/getResource/modules/src/m2/p2/Main.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/modules/src/m2/p2/Main.java rename to test/jdk/java/lang/ClassLoader/getResource/modules/src/m2/p2/Main.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/modules/src/m2/p2/impl/Type.java b/test/jdk/java/lang/ClassLoader/getResource/modules/src/m2/p2/impl/Type.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/modules/src/m2/p2/impl/Type.java rename to test/jdk/java/lang/ClassLoader/getResource/modules/src/m2/p2/impl/Type.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/modules/src/m2/p2/resources/Type.java b/test/jdk/java/lang/ClassLoader/getResource/modules/src/m2/p2/resources/Type.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/modules/src/m2/p2/resources/Type.java rename to test/jdk/java/lang/ClassLoader/getResource/modules/src/m2/p2/resources/Type.java diff --git a/jdk/test/java/lang/ClassLoader/getResource/test.properties b/test/jdk/java/lang/ClassLoader/getResource/test.properties similarity index 100% rename from jdk/test/java/lang/ClassLoader/getResource/test.properties rename to test/jdk/java/lang/ClassLoader/getResource/test.properties diff --git a/jdk/test/java/lang/ClassLoader/getdotresource.sh b/test/jdk/java/lang/ClassLoader/getdotresource.sh similarity index 100% rename from jdk/test/java/lang/ClassLoader/getdotresource.sh rename to test/jdk/java/lang/ClassLoader/getdotresource.sh diff --git a/jdk/test/java/lang/ClassLoader/package1/Class1.java b/test/jdk/java/lang/ClassLoader/package1/Class1.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/package1/Class1.java rename to test/jdk/java/lang/ClassLoader/package1/Class1.java diff --git a/jdk/test/java/lang/ClassLoader/package1/package3/Class3.java b/test/jdk/java/lang/ClassLoader/package1/package3/Class3.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/package1/package3/Class3.java rename to test/jdk/java/lang/ClassLoader/package1/package3/Class3.java diff --git a/jdk/test/java/lang/ClassLoader/package2/Class2.java b/test/jdk/java/lang/ClassLoader/package2/Class2.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/package2/Class2.java rename to test/jdk/java/lang/ClassLoader/package2/Class2.java diff --git a/jdk/test/java/lang/ClassLoader/platformClassLoader/DefinePlatformClass.java b/test/jdk/java/lang/ClassLoader/platformClassLoader/DefinePlatformClass.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/platformClassLoader/DefinePlatformClass.java rename to test/jdk/java/lang/ClassLoader/platformClassLoader/DefinePlatformClass.java diff --git a/jdk/test/java/lang/ClassLoader/platformClassLoader/jdk.zipfs/java/fake/Fake.java b/test/jdk/java/lang/ClassLoader/platformClassLoader/jdk.zipfs/java/fake/Fake.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/platformClassLoader/jdk.zipfs/java/fake/Fake.java rename to test/jdk/java/lang/ClassLoader/platformClassLoader/jdk.zipfs/java/fake/Fake.java diff --git a/jdk/test/java/lang/ClassLoader/resource.jar b/test/jdk/java/lang/ClassLoader/resource.jar similarity index 100% rename from jdk/test/java/lang/ClassLoader/resource.jar rename to test/jdk/java/lang/ClassLoader/resource.jar diff --git a/jdk/test/java/lang/ClassLoader/securityManager/ClassLoaderTest.java b/test/jdk/java/lang/ClassLoader/securityManager/ClassLoaderTest.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/securityManager/ClassLoaderTest.java rename to test/jdk/java/lang/ClassLoader/securityManager/ClassLoaderTest.java diff --git a/jdk/test/java/lang/ClassLoader/securityManager/TestClassLoader.java b/test/jdk/java/lang/ClassLoader/securityManager/TestClassLoader.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/securityManager/TestClassLoader.java rename to test/jdk/java/lang/ClassLoader/securityManager/TestClassLoader.java diff --git a/jdk/test/java/lang/ClassLoader/securityManager/TestClient.java b/test/jdk/java/lang/ClassLoader/securityManager/TestClient.java similarity index 100% rename from jdk/test/java/lang/ClassLoader/securityManager/TestClient.java rename to test/jdk/java/lang/ClassLoader/securityManager/TestClient.java diff --git a/jdk/test/java/lang/ClassLoader/securityManager/malformed.policy b/test/jdk/java/lang/ClassLoader/securityManager/malformed.policy similarity index 100% rename from jdk/test/java/lang/ClassLoader/securityManager/malformed.policy rename to test/jdk/java/lang/ClassLoader/securityManager/malformed.policy diff --git a/jdk/test/java/lang/ClassLoader/securityManager/valid.policy b/test/jdk/java/lang/ClassLoader/securityManager/valid.policy similarity index 100% rename from jdk/test/java/lang/ClassLoader/securityManager/valid.policy rename to test/jdk/java/lang/ClassLoader/securityManager/valid.policy diff --git a/jdk/test/java/lang/Compare.java b/test/jdk/java/lang/Compare.java similarity index 100% rename from jdk/test/java/lang/Compare.java rename to test/jdk/java/lang/Compare.java diff --git a/jdk/test/java/lang/Double/BitwiseConversion.java b/test/jdk/java/lang/Double/BitwiseConversion.java similarity index 100% rename from jdk/test/java/lang/Double/BitwiseConversion.java rename to test/jdk/java/lang/Double/BitwiseConversion.java diff --git a/jdk/test/java/lang/Double/Constants.java b/test/jdk/java/lang/Double/Constants.java similarity index 100% rename from jdk/test/java/lang/Double/Constants.java rename to test/jdk/java/lang/Double/Constants.java diff --git a/jdk/test/java/lang/Double/Extrema.java b/test/jdk/java/lang/Double/Extrema.java similarity index 100% rename from jdk/test/java/lang/Double/Extrema.java rename to test/jdk/java/lang/Double/Extrema.java diff --git a/jdk/test/java/lang/Double/NaNInfinityParsing.java b/test/jdk/java/lang/Double/NaNInfinityParsing.java similarity index 100% rename from jdk/test/java/lang/Double/NaNInfinityParsing.java rename to test/jdk/java/lang/Double/NaNInfinityParsing.java diff --git a/jdk/test/java/lang/Double/ParseDouble.java b/test/jdk/java/lang/Double/ParseDouble.java similarity index 100% rename from jdk/test/java/lang/Double/ParseDouble.java rename to test/jdk/java/lang/Double/ParseDouble.java diff --git a/jdk/test/java/lang/Double/ParseHexFloatingPoint.java b/test/jdk/java/lang/Double/ParseHexFloatingPoint.java similarity index 100% rename from jdk/test/java/lang/Double/ParseHexFloatingPoint.java rename to test/jdk/java/lang/Double/ParseHexFloatingPoint.java diff --git a/jdk/test/java/lang/Double/ToHexString.java b/test/jdk/java/lang/Double/ToHexString.java similarity index 100% rename from jdk/test/java/lang/Double/ToHexString.java rename to test/jdk/java/lang/Double/ToHexString.java diff --git a/jdk/test/java/lang/Double/ToString.java b/test/jdk/java/lang/Double/ToString.java similarity index 100% rename from jdk/test/java/lang/Double/ToString.java rename to test/jdk/java/lang/Double/ToString.java diff --git a/jdk/test/java/lang/Enum/ValueOf.java b/test/jdk/java/lang/Enum/ValueOf.java similarity index 100% rename from jdk/test/java/lang/Enum/ValueOf.java rename to test/jdk/java/lang/Enum/ValueOf.java diff --git a/jdk/test/java/lang/Float/BitwiseConversion.java b/test/jdk/java/lang/Float/BitwiseConversion.java similarity index 100% rename from jdk/test/java/lang/Float/BitwiseConversion.java rename to test/jdk/java/lang/Float/BitwiseConversion.java diff --git a/jdk/test/java/lang/Float/Constants.java b/test/jdk/java/lang/Float/Constants.java similarity index 100% rename from jdk/test/java/lang/Float/Constants.java rename to test/jdk/java/lang/Float/Constants.java diff --git a/jdk/test/java/lang/Float/Extrema.java b/test/jdk/java/lang/Float/Extrema.java similarity index 100% rename from jdk/test/java/lang/Float/Extrema.java rename to test/jdk/java/lang/Float/Extrema.java diff --git a/jdk/test/java/lang/Float/NaNInfinityParsing.java b/test/jdk/java/lang/Float/NaNInfinityParsing.java similarity index 100% rename from jdk/test/java/lang/Float/NaNInfinityParsing.java rename to test/jdk/java/lang/Float/NaNInfinityParsing.java diff --git a/jdk/test/java/lang/Float/ParseFloat.java b/test/jdk/java/lang/Float/ParseFloat.java similarity index 100% rename from jdk/test/java/lang/Float/ParseFloat.java rename to test/jdk/java/lang/Float/ParseFloat.java diff --git a/jdk/test/java/lang/HashCode.java b/test/jdk/java/lang/HashCode.java similarity index 100% rename from jdk/test/java/lang/HashCode.java rename to test/jdk/java/lang/HashCode.java diff --git a/jdk/test/java/lang/InheritableThreadLocal/Basic.java b/test/jdk/java/lang/InheritableThreadLocal/Basic.java similarity index 100% rename from jdk/test/java/lang/InheritableThreadLocal/Basic.java rename to test/jdk/java/lang/InheritableThreadLocal/Basic.java diff --git a/jdk/test/java/lang/InheritableThreadLocal/ITLRemoveTest.java b/test/jdk/java/lang/InheritableThreadLocal/ITLRemoveTest.java similarity index 100% rename from jdk/test/java/lang/InheritableThreadLocal/ITLRemoveTest.java rename to test/jdk/java/lang/InheritableThreadLocal/ITLRemoveTest.java diff --git a/jdk/test/java/lang/Integer/BitTwiddle.java b/test/jdk/java/lang/Integer/BitTwiddle.java similarity index 100% rename from jdk/test/java/lang/Integer/BitTwiddle.java rename to test/jdk/java/lang/Integer/BitTwiddle.java diff --git a/jdk/test/java/lang/Integer/Decode.java b/test/jdk/java/lang/Integer/Decode.java similarity index 100% rename from jdk/test/java/lang/Integer/Decode.java rename to test/jdk/java/lang/Integer/Decode.java diff --git a/jdk/test/java/lang/Integer/GetInteger.java b/test/jdk/java/lang/Integer/GetInteger.java similarity index 100% rename from jdk/test/java/lang/Integer/GetInteger.java rename to test/jdk/java/lang/Integer/GetInteger.java diff --git a/jdk/test/java/lang/Integer/ParsingTest.java b/test/jdk/java/lang/Integer/ParsingTest.java similarity index 100% rename from jdk/test/java/lang/Integer/ParsingTest.java rename to test/jdk/java/lang/Integer/ParsingTest.java diff --git a/jdk/test/java/lang/Integer/ToString.java b/test/jdk/java/lang/Integer/ToString.java similarity index 100% rename from jdk/test/java/lang/Integer/ToString.java rename to test/jdk/java/lang/Integer/ToString.java diff --git a/jdk/test/java/lang/Integer/Unsigned.java b/test/jdk/java/lang/Integer/Unsigned.java similarity index 100% rename from jdk/test/java/lang/Integer/Unsigned.java rename to test/jdk/java/lang/Integer/Unsigned.java diff --git a/jdk/test/java/lang/Integer/ValueOf.java b/test/jdk/java/lang/Integer/ValueOf.java similarity index 100% rename from jdk/test/java/lang/Integer/ValueOf.java rename to test/jdk/java/lang/Integer/ValueOf.java diff --git a/jdk/test/java/lang/IntegralPrimitiveToString.java b/test/jdk/java/lang/IntegralPrimitiveToString.java similarity index 100% rename from jdk/test/java/lang/IntegralPrimitiveToString.java rename to test/jdk/java/lang/IntegralPrimitiveToString.java diff --git a/jdk/test/java/lang/Long/BitTwiddle.java b/test/jdk/java/lang/Long/BitTwiddle.java similarity index 100% rename from jdk/test/java/lang/Long/BitTwiddle.java rename to test/jdk/java/lang/Long/BitTwiddle.java diff --git a/jdk/test/java/lang/Long/Decode.java b/test/jdk/java/lang/Long/Decode.java similarity index 100% rename from jdk/test/java/lang/Long/Decode.java rename to test/jdk/java/lang/Long/Decode.java diff --git a/jdk/test/java/lang/Long/GetLong.java b/test/jdk/java/lang/Long/GetLong.java similarity index 100% rename from jdk/test/java/lang/Long/GetLong.java rename to test/jdk/java/lang/Long/GetLong.java diff --git a/jdk/test/java/lang/Long/ParsingTest.java b/test/jdk/java/lang/Long/ParsingTest.java similarity index 100% rename from jdk/test/java/lang/Long/ParsingTest.java rename to test/jdk/java/lang/Long/ParsingTest.java diff --git a/jdk/test/java/lang/Long/ToString.java b/test/jdk/java/lang/Long/ToString.java similarity index 100% rename from jdk/test/java/lang/Long/ToString.java rename to test/jdk/java/lang/Long/ToString.java diff --git a/jdk/test/java/lang/Long/Unsigned.java b/test/jdk/java/lang/Long/Unsigned.java similarity index 100% rename from jdk/test/java/lang/Long/Unsigned.java rename to test/jdk/java/lang/Long/Unsigned.java diff --git a/jdk/test/java/lang/Math/AbsPositiveZero.java b/test/jdk/java/lang/Math/AbsPositiveZero.java similarity index 100% rename from jdk/test/java/lang/Math/AbsPositiveZero.java rename to test/jdk/java/lang/Math/AbsPositiveZero.java diff --git a/jdk/test/java/lang/Math/Atan2Tests.java b/test/jdk/java/lang/Math/Atan2Tests.java similarity index 100% rename from jdk/test/java/lang/Math/Atan2Tests.java rename to test/jdk/java/lang/Math/Atan2Tests.java diff --git a/jdk/test/java/lang/Math/CeilAndFloorTests.java b/test/jdk/java/lang/Math/CeilAndFloorTests.java similarity index 100% rename from jdk/test/java/lang/Math/CeilAndFloorTests.java rename to test/jdk/java/lang/Math/CeilAndFloorTests.java diff --git a/jdk/test/java/lang/Math/CubeRootTests.java b/test/jdk/java/lang/Math/CubeRootTests.java similarity index 100% rename from jdk/test/java/lang/Math/CubeRootTests.java rename to test/jdk/java/lang/Math/CubeRootTests.java diff --git a/jdk/test/java/lang/Math/DivModTests.java b/test/jdk/java/lang/Math/DivModTests.java similarity index 100% rename from jdk/test/java/lang/Math/DivModTests.java rename to test/jdk/java/lang/Math/DivModTests.java diff --git a/jdk/test/java/lang/Math/DoubleConsts.java b/test/jdk/java/lang/Math/DoubleConsts.java similarity index 100% rename from jdk/test/java/lang/Math/DoubleConsts.java rename to test/jdk/java/lang/Math/DoubleConsts.java diff --git a/jdk/test/java/lang/Math/ExactArithTests.java b/test/jdk/java/lang/Math/ExactArithTests.java similarity index 100% rename from jdk/test/java/lang/Math/ExactArithTests.java rename to test/jdk/java/lang/Math/ExactArithTests.java diff --git a/jdk/test/java/lang/Math/Expm1Tests.java b/test/jdk/java/lang/Math/Expm1Tests.java similarity index 100% rename from jdk/test/java/lang/Math/Expm1Tests.java rename to test/jdk/java/lang/Math/Expm1Tests.java diff --git a/jdk/test/java/lang/Math/FloatConsts.java b/test/jdk/java/lang/Math/FloatConsts.java similarity index 100% rename from jdk/test/java/lang/Math/FloatConsts.java rename to test/jdk/java/lang/Math/FloatConsts.java diff --git a/jdk/test/java/lang/Math/FusedMultiplyAddTests.java b/test/jdk/java/lang/Math/FusedMultiplyAddTests.java similarity index 100% rename from jdk/test/java/lang/Math/FusedMultiplyAddTests.java rename to test/jdk/java/lang/Math/FusedMultiplyAddTests.java diff --git a/jdk/test/java/lang/Math/HyperbolicTests.java b/test/jdk/java/lang/Math/HyperbolicTests.java similarity index 100% rename from jdk/test/java/lang/Math/HyperbolicTests.java rename to test/jdk/java/lang/Math/HyperbolicTests.java diff --git a/jdk/test/java/lang/Math/HypotTests.java b/test/jdk/java/lang/Math/HypotTests.java similarity index 100% rename from jdk/test/java/lang/Math/HypotTests.java rename to test/jdk/java/lang/Math/HypotTests.java diff --git a/jdk/test/java/lang/Math/IeeeRecommendedTests.java b/test/jdk/java/lang/Math/IeeeRecommendedTests.java similarity index 100% rename from jdk/test/java/lang/Math/IeeeRecommendedTests.java rename to test/jdk/java/lang/Math/IeeeRecommendedTests.java diff --git a/jdk/test/java/lang/Math/Log10Tests.java b/test/jdk/java/lang/Math/Log10Tests.java similarity index 100% rename from jdk/test/java/lang/Math/Log10Tests.java rename to test/jdk/java/lang/Math/Log10Tests.java diff --git a/jdk/test/java/lang/Math/Log1pTests.java b/test/jdk/java/lang/Math/Log1pTests.java similarity index 100% rename from jdk/test/java/lang/Math/Log1pTests.java rename to test/jdk/java/lang/Math/Log1pTests.java diff --git a/jdk/test/java/lang/Math/MinMax.java b/test/jdk/java/lang/Math/MinMax.java similarity index 100% rename from jdk/test/java/lang/Math/MinMax.java rename to test/jdk/java/lang/Math/MinMax.java diff --git a/jdk/test/java/lang/Math/MultiplicationTests.java b/test/jdk/java/lang/Math/MultiplicationTests.java similarity index 100% rename from jdk/test/java/lang/Math/MultiplicationTests.java rename to test/jdk/java/lang/Math/MultiplicationTests.java diff --git a/jdk/test/java/lang/Math/PowTests.java b/test/jdk/java/lang/Math/PowTests.java similarity index 100% rename from jdk/test/java/lang/Math/PowTests.java rename to test/jdk/java/lang/Math/PowTests.java diff --git a/jdk/test/java/lang/Math/Rint.java b/test/jdk/java/lang/Math/Rint.java similarity index 100% rename from jdk/test/java/lang/Math/Rint.java rename to test/jdk/java/lang/Math/Rint.java diff --git a/jdk/test/java/lang/Math/RoundTests.java b/test/jdk/java/lang/Math/RoundTests.java similarity index 100% rename from jdk/test/java/lang/Math/RoundTests.java rename to test/jdk/java/lang/Math/RoundTests.java diff --git a/jdk/test/java/lang/Math/SinCosCornerCasesTests.java b/test/jdk/java/lang/Math/SinCosCornerCasesTests.java similarity index 100% rename from jdk/test/java/lang/Math/SinCosCornerCasesTests.java rename to test/jdk/java/lang/Math/SinCosCornerCasesTests.java diff --git a/jdk/test/java/lang/Math/TanTests.java b/test/jdk/java/lang/Math/TanTests.java similarity index 100% rename from jdk/test/java/lang/Math/TanTests.java rename to test/jdk/java/lang/Math/TanTests.java diff --git a/jdk/test/java/lang/Math/Tests.java b/test/jdk/java/lang/Math/Tests.java similarity index 100% rename from jdk/test/java/lang/Math/Tests.java rename to test/jdk/java/lang/Math/Tests.java diff --git a/jdk/test/java/lang/Math/WorstCaseTests.java b/test/jdk/java/lang/Math/WorstCaseTests.java similarity index 100% rename from jdk/test/java/lang/Math/WorstCaseTests.java rename to test/jdk/java/lang/Math/WorstCaseTests.java diff --git a/jdk/test/java/lang/ModuleLayer/BasicLayerTest.java b/test/jdk/java/lang/ModuleLayer/BasicLayerTest.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/BasicLayerTest.java rename to test/jdk/java/lang/ModuleLayer/BasicLayerTest.java diff --git a/jdk/test/java/lang/ModuleLayer/LayerAndLoadersTest.java b/test/jdk/java/lang/ModuleLayer/LayerAndLoadersTest.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/LayerAndLoadersTest.java rename to test/jdk/java/lang/ModuleLayer/LayerAndLoadersTest.java diff --git a/jdk/test/java/lang/ModuleLayer/LayerControllerTest.java b/test/jdk/java/lang/ModuleLayer/LayerControllerTest.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/LayerControllerTest.java rename to test/jdk/java/lang/ModuleLayer/LayerControllerTest.java diff --git a/jdk/test/java/lang/ModuleLayer/layertest/Test.java b/test/jdk/java/lang/ModuleLayer/layertest/Test.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/layertest/Test.java rename to test/jdk/java/lang/ModuleLayer/layertest/Test.java diff --git a/jdk/test/java/lang/ModuleLayer/src/m1/module-info.java b/test/jdk/java/lang/ModuleLayer/src/m1/module-info.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/src/m1/module-info.java rename to test/jdk/java/lang/ModuleLayer/src/m1/module-info.java diff --git a/jdk/test/java/lang/ModuleLayer/src/m1/p/Main.java b/test/jdk/java/lang/ModuleLayer/src/m1/p/Main.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/src/m1/p/Main.java rename to test/jdk/java/lang/ModuleLayer/src/m1/p/Main.java diff --git a/jdk/test/java/lang/ModuleLayer/src/m1/p/Service.java b/test/jdk/java/lang/ModuleLayer/src/m1/p/Service.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/src/m1/p/Service.java rename to test/jdk/java/lang/ModuleLayer/src/m1/p/Service.java diff --git a/jdk/test/java/lang/ModuleLayer/src/m2/module-info.java b/test/jdk/java/lang/ModuleLayer/src/m2/module-info.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/src/m2/module-info.java rename to test/jdk/java/lang/ModuleLayer/src/m2/module-info.java diff --git a/jdk/test/java/lang/ModuleLayer/src/m2/q/Hello.java b/test/jdk/java/lang/ModuleLayer/src/m2/q/Hello.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/src/m2/q/Hello.java rename to test/jdk/java/lang/ModuleLayer/src/m2/q/Hello.java diff --git a/jdk/test/java/lang/ModuleLayer/src/m3/module-info.java b/test/jdk/java/lang/ModuleLayer/src/m3/module-info.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/src/m3/module-info.java rename to test/jdk/java/lang/ModuleLayer/src/m3/module-info.java diff --git a/jdk/test/java/lang/ModuleLayer/src/m3/w/Hello.java b/test/jdk/java/lang/ModuleLayer/src/m3/w/Hello.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/src/m3/w/Hello.java rename to test/jdk/java/lang/ModuleLayer/src/m3/w/Hello.java diff --git a/jdk/test/java/lang/ModuleLayer/src/m4/impl/ServiceImpl.java b/test/jdk/java/lang/ModuleLayer/src/m4/impl/ServiceImpl.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/src/m4/impl/ServiceImpl.java rename to test/jdk/java/lang/ModuleLayer/src/m4/impl/ServiceImpl.java diff --git a/jdk/test/java/lang/ModuleLayer/src/m4/module-info.java b/test/jdk/java/lang/ModuleLayer/src/m4/module-info.java similarity index 100% rename from jdk/test/java/lang/ModuleLayer/src/m4/module-info.java rename to test/jdk/java/lang/ModuleLayer/src/m4/module-info.java diff --git a/jdk/test/java/lang/ModuleTests/AddExportsTest.java b/test/jdk/java/lang/ModuleTests/AddExportsTest.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/AddExportsTest.java rename to test/jdk/java/lang/ModuleTests/AddExportsTest.java diff --git a/jdk/test/java/lang/ModuleTests/AnnotationsTest.java b/test/jdk/java/lang/ModuleTests/AnnotationsTest.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/AnnotationsTest.java rename to test/jdk/java/lang/ModuleTests/AnnotationsTest.java diff --git a/jdk/test/java/lang/ModuleTests/BasicModuleTest.java b/test/jdk/java/lang/ModuleTests/BasicModuleTest.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/BasicModuleTest.java rename to test/jdk/java/lang/ModuleTests/BasicModuleTest.java diff --git a/jdk/test/java/lang/ModuleTests/WithSecurityManager.java b/test/jdk/java/lang/ModuleTests/WithSecurityManager.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/WithSecurityManager.java rename to test/jdk/java/lang/ModuleTests/WithSecurityManager.java diff --git a/jdk/test/java/lang/ModuleTests/access/AccessTest.java b/test/jdk/java/lang/ModuleTests/access/AccessTest.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/access/AccessTest.java rename to test/jdk/java/lang/ModuleTests/access/AccessTest.java diff --git a/jdk/test/java/lang/ModuleTests/access/src/target/module-info.java b/test/jdk/java/lang/ModuleTests/access/src/target/module-info.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/access/src/target/module-info.java rename to test/jdk/java/lang/ModuleTests/access/src/target/module-info.java diff --git a/jdk/test/java/lang/ModuleTests/access/src/target/p1/Helper.java b/test/jdk/java/lang/ModuleTests/access/src/target/p1/Helper.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/access/src/target/p1/Helper.java rename to test/jdk/java/lang/ModuleTests/access/src/target/p1/Helper.java diff --git a/jdk/test/java/lang/ModuleTests/access/src/target/p1/Public.java b/test/jdk/java/lang/ModuleTests/access/src/target/p1/Public.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/access/src/target/p1/Public.java rename to test/jdk/java/lang/ModuleTests/access/src/target/p1/Public.java diff --git a/jdk/test/java/lang/ModuleTests/access/src/target/p2/NonPublic.java b/test/jdk/java/lang/ModuleTests/access/src/target/p2/NonPublic.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/access/src/target/p2/NonPublic.java rename to test/jdk/java/lang/ModuleTests/access/src/target/p2/NonPublic.java diff --git a/jdk/test/java/lang/ModuleTests/access/src/target/q1/Public.java b/test/jdk/java/lang/ModuleTests/access/src/target/q1/Public.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/access/src/target/q1/Public.java rename to test/jdk/java/lang/ModuleTests/access/src/target/q1/Public.java diff --git a/jdk/test/java/lang/ModuleTests/access/src/target/q2/NonPublic.java b/test/jdk/java/lang/ModuleTests/access/src/target/q2/NonPublic.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/access/src/target/q2/NonPublic.java rename to test/jdk/java/lang/ModuleTests/access/src/target/q2/NonPublic.java diff --git a/jdk/test/java/lang/ModuleTests/access/src/test/module-info.java b/test/jdk/java/lang/ModuleTests/access/src/test/module-info.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/access/src/test/module-info.java rename to test/jdk/java/lang/ModuleTests/access/src/test/module-info.java diff --git a/jdk/test/java/lang/ModuleTests/access/src/test/test/Main.java b/test/jdk/java/lang/ModuleTests/access/src/test/test/Main.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/access/src/test/test/Main.java rename to test/jdk/java/lang/ModuleTests/access/src/test/test/Main.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/Driver.java b/test/jdk/java/lang/ModuleTests/addXXX/Driver.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/Driver.java rename to test/jdk/java/lang/ModuleTests/addXXX/Driver.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/m1/module-info.java b/test/jdk/java/lang/ModuleTests/addXXX/m1/module-info.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/m1/module-info.java rename to test/jdk/java/lang/ModuleTests/addXXX/m1/module-info.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/m1/p1/C.java b/test/jdk/java/lang/ModuleTests/addXXX/m1/p1/C.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/m1/p1/C.java rename to test/jdk/java/lang/ModuleTests/addXXX/m1/p1/C.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/m2/module-info.java b/test/jdk/java/lang/ModuleTests/addXXX/m2/module-info.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/m2/module-info.java rename to test/jdk/java/lang/ModuleTests/addXXX/m2/module-info.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/m2/p2/C.java b/test/jdk/java/lang/ModuleTests/addXXX/m2/p2/C.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/m2/p2/C.java rename to test/jdk/java/lang/ModuleTests/addXXX/m2/p2/C.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/m2/p2/internal/C.java b/test/jdk/java/lang/ModuleTests/addXXX/m2/p2/internal/C.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/m2/p2/internal/C.java rename to test/jdk/java/lang/ModuleTests/addXXX/m2/p2/internal/C.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/m3/module-info.java b/test/jdk/java/lang/ModuleTests/addXXX/m3/module-info.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/m3/module-info.java rename to test/jdk/java/lang/ModuleTests/addXXX/m3/module-info.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/m3/p3/C.java b/test/jdk/java/lang/ModuleTests/addXXX/m3/p3/C.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/m3/p3/C.java rename to test/jdk/java/lang/ModuleTests/addXXX/m3/p3/C.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/m4/module-info.java b/test/jdk/java/lang/ModuleTests/addXXX/m4/module-info.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/m4/module-info.java rename to test/jdk/java/lang/ModuleTests/addXXX/m4/module-info.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/m4/p4/C.java b/test/jdk/java/lang/ModuleTests/addXXX/m4/p4/C.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/m4/p4/C.java rename to test/jdk/java/lang/ModuleTests/addXXX/m4/p4/C.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/test/module-info.java b/test/jdk/java/lang/ModuleTests/addXXX/test/module-info.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/test/module-info.java rename to test/jdk/java/lang/ModuleTests/addXXX/test/module-info.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/test/test/C.java b/test/jdk/java/lang/ModuleTests/addXXX/test/test/C.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/test/test/C.java rename to test/jdk/java/lang/ModuleTests/addXXX/test/test/C.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/test/test/Main.java b/test/jdk/java/lang/ModuleTests/addXXX/test/test/Main.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/test/test/Main.java rename to test/jdk/java/lang/ModuleTests/addXXX/test/test/Main.java diff --git a/jdk/test/java/lang/ModuleTests/addXXX/test/test/Service.java b/test/jdk/java/lang/ModuleTests/addXXX/test/test/Service.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/addXXX/test/test/Service.java rename to test/jdk/java/lang/ModuleTests/addXXX/test/test/Service.java diff --git a/jdk/test/java/lang/ModuleTests/allow.policy b/test/jdk/java/lang/ModuleTests/allow.policy similarity index 100% rename from jdk/test/java/lang/ModuleTests/allow.policy rename to test/jdk/java/lang/ModuleTests/allow.policy diff --git a/jdk/test/java/lang/ModuleTests/annotation/Basic.java b/test/jdk/java/lang/ModuleTests/annotation/Basic.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/annotation/Basic.java rename to test/jdk/java/lang/ModuleTests/annotation/Basic.java diff --git a/jdk/test/java/lang/ModuleTests/annotation/src/m/module-info.java b/test/jdk/java/lang/ModuleTests/annotation/src/m/module-info.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/annotation/src/m/module-info.java rename to test/jdk/java/lang/ModuleTests/annotation/src/m/module-info.java diff --git a/jdk/test/java/lang/ModuleTests/annotation/src/m/p/annotation/Bar.java b/test/jdk/java/lang/ModuleTests/annotation/src/m/p/annotation/Bar.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/annotation/src/m/p/annotation/Bar.java rename to test/jdk/java/lang/ModuleTests/annotation/src/m/p/annotation/Bar.java diff --git a/jdk/test/java/lang/ModuleTests/annotation/src/m/p/annotation/Baz.java b/test/jdk/java/lang/ModuleTests/annotation/src/m/p/annotation/Baz.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/annotation/src/m/p/annotation/Baz.java rename to test/jdk/java/lang/ModuleTests/annotation/src/m/p/annotation/Baz.java diff --git a/jdk/test/java/lang/ModuleTests/annotation/src/m/p/annotation/Foo.java b/test/jdk/java/lang/ModuleTests/annotation/src/m/p/annotation/Foo.java similarity index 100% rename from jdk/test/java/lang/ModuleTests/annotation/src/m/p/annotation/Foo.java rename to test/jdk/java/lang/ModuleTests/annotation/src/m/p/annotation/Foo.java diff --git a/jdk/test/java/lang/Package/Foo.java b/test/jdk/java/lang/Package/Foo.java similarity index 100% rename from jdk/test/java/lang/Package/Foo.java rename to test/jdk/java/lang/Package/Foo.java diff --git a/jdk/test/java/lang/Package/GetPackages.java b/test/jdk/java/lang/Package/GetPackages.java similarity index 100% rename from jdk/test/java/lang/Package/GetPackages.java rename to test/jdk/java/lang/Package/GetPackages.java diff --git a/jdk/test/java/lang/Package/annotation/PackageInfoTest.java b/test/jdk/java/lang/Package/annotation/PackageInfoTest.java similarity index 100% rename from jdk/test/java/lang/Package/annotation/PackageInfoTest.java rename to test/jdk/java/lang/Package/annotation/PackageInfoTest.java diff --git a/jdk/test/java/lang/Package/annotation/jdk.xml.dom/org/w3c/dom/css/Fake.java b/test/jdk/java/lang/Package/annotation/jdk.xml.dom/org/w3c/dom/css/Fake.java similarity index 100% rename from jdk/test/java/lang/Package/annotation/jdk.xml.dom/org/w3c/dom/css/Fake.java rename to test/jdk/java/lang/Package/annotation/jdk.xml.dom/org/w3c/dom/css/Fake.java diff --git a/jdk/test/java/lang/Package/annotation/jdk.xml.dom/org/w3c/dom/css/FakePackage.java b/test/jdk/java/lang/Package/annotation/jdk.xml.dom/org/w3c/dom/css/FakePackage.java similarity index 100% rename from jdk/test/java/lang/Package/annotation/jdk.xml.dom/org/w3c/dom/css/FakePackage.java rename to test/jdk/java/lang/Package/annotation/jdk.xml.dom/org/w3c/dom/css/FakePackage.java diff --git a/jdk/test/java/lang/Package/annotation/jdk.xml.dom/org/w3c/dom/css/package-info.java b/test/jdk/java/lang/Package/annotation/jdk.xml.dom/org/w3c/dom/css/package-info.java similarity index 100% rename from jdk/test/java/lang/Package/annotation/jdk.xml.dom/org/w3c/dom/css/package-info.java rename to test/jdk/java/lang/Package/annotation/jdk.xml.dom/org/w3c/dom/css/package-info.java diff --git a/jdk/test/java/lang/Package/annotation/package-info.java b/test/jdk/java/lang/Package/annotation/package-info.java similarity index 100% rename from jdk/test/java/lang/Package/annotation/package-info.java rename to test/jdk/java/lang/Package/annotation/package-info.java diff --git a/jdk/test/java/lang/Package/annotation/src/p/Bar.java b/test/jdk/java/lang/Package/annotation/src/p/Bar.java similarity index 100% rename from jdk/test/java/lang/Package/annotation/src/p/Bar.java rename to test/jdk/java/lang/Package/annotation/src/p/Bar.java diff --git a/jdk/test/java/lang/Package/annotation/src/p/Duplicate.java b/test/jdk/java/lang/Package/annotation/src/p/Duplicate.java similarity index 100% rename from jdk/test/java/lang/Package/annotation/src/p/Duplicate.java rename to test/jdk/java/lang/Package/annotation/src/p/Duplicate.java diff --git a/jdk/test/java/lang/Package/annotation/src/p/package-info.java b/test/jdk/java/lang/Package/annotation/src/p/package-info.java similarity index 100% rename from jdk/test/java/lang/Package/annotation/src/p/package-info.java rename to test/jdk/java/lang/Package/annotation/src/p/package-info.java diff --git a/jdk/test/java/lang/PrimitiveSumMinMaxTest.java b/test/jdk/java/lang/PrimitiveSumMinMaxTest.java similarity index 100% rename from jdk/test/java/lang/PrimitiveSumMinMaxTest.java rename to test/jdk/java/lang/PrimitiveSumMinMaxTest.java diff --git a/jdk/test/java/lang/ProcessBuilder/Basic.java b/test/jdk/java/lang/ProcessBuilder/Basic.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/Basic.java rename to test/jdk/java/lang/ProcessBuilder/Basic.java diff --git a/jdk/test/java/lang/ProcessBuilder/BigFork.java b/test/jdk/java/lang/ProcessBuilder/BigFork.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/BigFork.java rename to test/jdk/java/lang/ProcessBuilder/BigFork.java diff --git a/jdk/test/java/lang/ProcessBuilder/CloseRace.java b/test/jdk/java/lang/ProcessBuilder/CloseRace.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/CloseRace.java rename to test/jdk/java/lang/ProcessBuilder/CloseRace.java diff --git a/jdk/test/java/lang/ProcessBuilder/DestroyTest.java b/test/jdk/java/lang/ProcessBuilder/DestroyTest.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/DestroyTest.java rename to test/jdk/java/lang/ProcessBuilder/DestroyTest.java diff --git a/jdk/test/java/lang/ProcessBuilder/FeelingLucky.java b/test/jdk/java/lang/ProcessBuilder/FeelingLucky.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/FeelingLucky.java rename to test/jdk/java/lang/ProcessBuilder/FeelingLucky.java diff --git a/jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.java b/test/jdk/java/lang/ProcessBuilder/InheritIO/InheritIO.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.java rename to test/jdk/java/lang/ProcessBuilder/InheritIO/InheritIO.java diff --git a/jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh b/test/jdk/java/lang/ProcessBuilder/InheritIO/InheritIO.sh similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh rename to test/jdk/java/lang/ProcessBuilder/InheritIO/InheritIO.sh diff --git a/jdk/test/java/lang/ProcessBuilder/InheritIOEHandle.java b/test/jdk/java/lang/ProcessBuilder/InheritIOEHandle.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/InheritIOEHandle.java rename to test/jdk/java/lang/ProcessBuilder/InheritIOEHandle.java diff --git a/jdk/test/java/lang/ProcessBuilder/PipelineTest.java b/test/jdk/java/lang/ProcessBuilder/PipelineTest.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/PipelineTest.java rename to test/jdk/java/lang/ProcessBuilder/PipelineTest.java diff --git a/jdk/test/java/lang/ProcessBuilder/RedirectWithLongFilename.java b/test/jdk/java/lang/ProcessBuilder/RedirectWithLongFilename.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/RedirectWithLongFilename.java rename to test/jdk/java/lang/ProcessBuilder/RedirectWithLongFilename.java diff --git a/jdk/test/java/lang/ProcessBuilder/SecurityManagerClinit.java b/test/jdk/java/lang/ProcessBuilder/SecurityManagerClinit.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/SecurityManagerClinit.java rename to test/jdk/java/lang/ProcessBuilder/SecurityManagerClinit.java diff --git a/jdk/test/java/lang/ProcessBuilder/SiblingIOEHandle.java b/test/jdk/java/lang/ProcessBuilder/SiblingIOEHandle.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/SiblingIOEHandle.java rename to test/jdk/java/lang/ProcessBuilder/SiblingIOEHandle.java diff --git a/jdk/test/java/lang/ProcessBuilder/SkipTest.java b/test/jdk/java/lang/ProcessBuilder/SkipTest.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/SkipTest.java rename to test/jdk/java/lang/ProcessBuilder/SkipTest.java diff --git a/jdk/test/java/lang/ProcessBuilder/Zombies.java b/test/jdk/java/lang/ProcessBuilder/Zombies.java similarity index 100% rename from jdk/test/java/lang/ProcessBuilder/Zombies.java rename to test/jdk/java/lang/ProcessBuilder/Zombies.java diff --git a/jdk/test/java/lang/ProcessHandle/Basic.java b/test/jdk/java/lang/ProcessHandle/Basic.java similarity index 100% rename from jdk/test/java/lang/ProcessHandle/Basic.java rename to test/jdk/java/lang/ProcessHandle/Basic.java diff --git a/jdk/test/java/lang/ProcessHandle/InfoTest.java b/test/jdk/java/lang/ProcessHandle/InfoTest.java similarity index 100% rename from jdk/test/java/lang/ProcessHandle/InfoTest.java rename to test/jdk/java/lang/ProcessHandle/InfoTest.java diff --git a/jdk/test/java/lang/ProcessHandle/JavaChild.java b/test/jdk/java/lang/ProcessHandle/JavaChild.java similarity index 100% rename from jdk/test/java/lang/ProcessHandle/JavaChild.java rename to test/jdk/java/lang/ProcessHandle/JavaChild.java diff --git a/jdk/test/java/lang/ProcessHandle/OnExitTest.java b/test/jdk/java/lang/ProcessHandle/OnExitTest.java similarity index 100% rename from jdk/test/java/lang/ProcessHandle/OnExitTest.java rename to test/jdk/java/lang/ProcessHandle/OnExitTest.java diff --git a/jdk/test/java/lang/ProcessHandle/PermissionTest.java b/test/jdk/java/lang/ProcessHandle/PermissionTest.java similarity index 100% rename from jdk/test/java/lang/ProcessHandle/PermissionTest.java rename to test/jdk/java/lang/ProcessHandle/PermissionTest.java diff --git a/jdk/test/java/lang/ProcessHandle/ProcessUtil.java b/test/jdk/java/lang/ProcessHandle/ProcessUtil.java similarity index 100% rename from jdk/test/java/lang/ProcessHandle/ProcessUtil.java rename to test/jdk/java/lang/ProcessHandle/ProcessUtil.java diff --git a/jdk/test/java/lang/ProcessHandle/TreeTest.java b/test/jdk/java/lang/ProcessHandle/TreeTest.java similarity index 100% rename from jdk/test/java/lang/ProcessHandle/TreeTest.java rename to test/jdk/java/lang/ProcessHandle/TreeTest.java diff --git a/jdk/test/java/lang/Runtime/Version/Basic.java b/test/jdk/java/lang/Runtime/Version/Basic.java similarity index 100% rename from jdk/test/java/lang/Runtime/Version/Basic.java rename to test/jdk/java/lang/Runtime/Version/Basic.java diff --git a/jdk/test/java/lang/Runtime/Version/VersionProps.java b/test/jdk/java/lang/Runtime/Version/VersionProps.java similarity index 100% rename from jdk/test/java/lang/Runtime/Version/VersionProps.java rename to test/jdk/java/lang/Runtime/Version/VersionProps.java diff --git a/jdk/test/java/lang/Runtime/exec/ArgWithSpaceAndFinalBackslash.java b/test/jdk/java/lang/Runtime/exec/ArgWithSpaceAndFinalBackslash.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/ArgWithSpaceAndFinalBackslash.java rename to test/jdk/java/lang/Runtime/exec/ArgWithSpaceAndFinalBackslash.java diff --git a/jdk/test/java/lang/Runtime/exec/BadEnvp.java b/test/jdk/java/lang/Runtime/exec/BadEnvp.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/BadEnvp.java rename to test/jdk/java/lang/Runtime/exec/BadEnvp.java diff --git a/jdk/test/java/lang/Runtime/exec/ConcurrentRead.java b/test/jdk/java/lang/Runtime/exec/ConcurrentRead.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/ConcurrentRead.java rename to test/jdk/java/lang/Runtime/exec/ConcurrentRead.java diff --git a/jdk/test/java/lang/Runtime/exec/Duped.java b/test/jdk/java/lang/Runtime/exec/Duped.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/Duped.java rename to test/jdk/java/lang/Runtime/exec/Duped.java diff --git a/jdk/test/java/lang/Runtime/exec/ExecCommand.java b/test/jdk/java/lang/Runtime/exec/ExecCommand.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/ExecCommand.java rename to test/jdk/java/lang/Runtime/exec/ExecCommand.java diff --git a/jdk/test/java/lang/Runtime/exec/ExecEmptyString.java b/test/jdk/java/lang/Runtime/exec/ExecEmptyString.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/ExecEmptyString.java rename to test/jdk/java/lang/Runtime/exec/ExecEmptyString.java diff --git a/jdk/test/java/lang/Runtime/exec/ExecWithDir.java b/test/jdk/java/lang/Runtime/exec/ExecWithDir.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/ExecWithDir.java rename to test/jdk/java/lang/Runtime/exec/ExecWithDir.java diff --git a/jdk/test/java/lang/Runtime/exec/ExecWithInput.java b/test/jdk/java/lang/Runtime/exec/ExecWithInput.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/ExecWithInput.java rename to test/jdk/java/lang/Runtime/exec/ExecWithInput.java diff --git a/jdk/test/java/lang/Runtime/exec/ExecWithLotsOfArgs.java b/test/jdk/java/lang/Runtime/exec/ExecWithLotsOfArgs.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/ExecWithLotsOfArgs.java rename to test/jdk/java/lang/Runtime/exec/ExecWithLotsOfArgs.java diff --git a/jdk/test/java/lang/Runtime/exec/ExitValue.java b/test/jdk/java/lang/Runtime/exec/ExitValue.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/ExitValue.java rename to test/jdk/java/lang/Runtime/exec/ExitValue.java diff --git a/jdk/test/java/lang/Runtime/exec/LotsOfDestroys.java b/test/jdk/java/lang/Runtime/exec/LotsOfDestroys.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/LotsOfDestroys.java rename to test/jdk/java/lang/Runtime/exec/LotsOfDestroys.java diff --git a/jdk/test/java/lang/Runtime/exec/LotsOfOutput.java b/test/jdk/java/lang/Runtime/exec/LotsOfOutput.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/LotsOfOutput.java rename to test/jdk/java/lang/Runtime/exec/LotsOfOutput.java diff --git a/jdk/test/java/lang/Runtime/exec/SetCwd.java b/test/jdk/java/lang/Runtime/exec/SetCwd.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/SetCwd.java rename to test/jdk/java/lang/Runtime/exec/SetCwd.java diff --git a/jdk/test/java/lang/Runtime/exec/SleepyCat.java b/test/jdk/java/lang/Runtime/exec/SleepyCat.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/SleepyCat.java rename to test/jdk/java/lang/Runtime/exec/SleepyCat.java diff --git a/jdk/test/java/lang/Runtime/exec/Space.java b/test/jdk/java/lang/Runtime/exec/Space.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/Space.java rename to test/jdk/java/lang/Runtime/exec/Space.java diff --git a/jdk/test/java/lang/Runtime/exec/Status.java b/test/jdk/java/lang/Runtime/exec/Status.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/Status.java rename to test/jdk/java/lang/Runtime/exec/Status.java diff --git a/jdk/test/java/lang/Runtime/exec/StreamsSurviveDestroy.java b/test/jdk/java/lang/Runtime/exec/StreamsSurviveDestroy.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/StreamsSurviveDestroy.java rename to test/jdk/java/lang/Runtime/exec/StreamsSurviveDestroy.java diff --git a/jdk/test/java/lang/Runtime/exec/UnixCommands.java b/test/jdk/java/lang/Runtime/exec/UnixCommands.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/UnixCommands.java rename to test/jdk/java/lang/Runtime/exec/UnixCommands.java diff --git a/jdk/test/java/lang/Runtime/exec/WinCommand.java b/test/jdk/java/lang/Runtime/exec/WinCommand.java similarity index 100% rename from jdk/test/java/lang/Runtime/exec/WinCommand.java rename to test/jdk/java/lang/Runtime/exec/WinCommand.java diff --git a/jdk/test/java/lang/Runtime/exec/setcwd.sh b/test/jdk/java/lang/Runtime/exec/setcwd.sh similarity index 100% rename from jdk/test/java/lang/Runtime/exec/setcwd.sh rename to test/jdk/java/lang/Runtime/exec/setcwd.sh diff --git a/jdk/test/java/lang/Runtime/shutdown/ShutdownHooks.java b/test/jdk/java/lang/Runtime/shutdown/ShutdownHooks.java similarity index 100% rename from jdk/test/java/lang/Runtime/shutdown/ShutdownHooks.java rename to test/jdk/java/lang/Runtime/shutdown/ShutdownHooks.java diff --git a/jdk/test/java/lang/Runtime/shutdown/ShutdownHooks.sh b/test/jdk/java/lang/Runtime/shutdown/ShutdownHooks.sh similarity index 100% rename from jdk/test/java/lang/Runtime/shutdown/ShutdownHooks.sh rename to test/jdk/java/lang/Runtime/shutdown/ShutdownHooks.sh diff --git a/jdk/test/java/lang/Runtime/shutdown/ShutdownInterruptedMain.java b/test/jdk/java/lang/Runtime/shutdown/ShutdownInterruptedMain.java similarity index 100% rename from jdk/test/java/lang/Runtime/shutdown/ShutdownInterruptedMain.java rename to test/jdk/java/lang/Runtime/shutdown/ShutdownInterruptedMain.java diff --git a/jdk/test/java/lang/RuntimePermission/ExitVM.java b/test/jdk/java/lang/RuntimePermission/ExitVM.java similarity index 100% rename from jdk/test/java/lang/RuntimePermission/ExitVM.java rename to test/jdk/java/lang/RuntimePermission/ExitVM.java diff --git a/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java b/test/jdk/java/lang/SecurityManager/CheckPackageAccess.java similarity index 100% rename from jdk/test/java/lang/SecurityManager/CheckPackageAccess.java rename to test/jdk/java/lang/SecurityManager/CheckPackageAccess.java diff --git a/jdk/test/java/lang/SecurityManager/CheckPackageMatching.java b/test/jdk/java/lang/SecurityManager/CheckPackageMatching.java similarity index 100% rename from jdk/test/java/lang/SecurityManager/CheckPackageMatching.java rename to test/jdk/java/lang/SecurityManager/CheckPackageMatching.java diff --git a/jdk/test/java/lang/SecurityManager/CheckSecurityProvider.java b/test/jdk/java/lang/SecurityManager/CheckSecurityProvider.java similarity index 100% rename from jdk/test/java/lang/SecurityManager/CheckSecurityProvider.java rename to test/jdk/java/lang/SecurityManager/CheckSecurityProvider.java diff --git a/jdk/test/java/lang/SecurityManager/NoAWT.java b/test/jdk/java/lang/SecurityManager/NoAWT.java similarity index 100% rename from jdk/test/java/lang/SecurityManager/NoAWT.java rename to test/jdk/java/lang/SecurityManager/NoAWT.java diff --git a/jdk/test/java/lang/SecurityManager/modules/CustomSecurityManager.sh b/test/jdk/java/lang/SecurityManager/modules/CustomSecurityManager.sh similarity index 100% rename from jdk/test/java/lang/SecurityManager/modules/CustomSecurityManager.sh rename to test/jdk/java/lang/SecurityManager/modules/CustomSecurityManager.sh diff --git a/jdk/test/java/lang/SecurityManager/modules/Test.java b/test/jdk/java/lang/SecurityManager/modules/Test.java similarity index 100% rename from jdk/test/java/lang/SecurityManager/modules/Test.java rename to test/jdk/java/lang/SecurityManager/modules/Test.java diff --git a/jdk/test/java/lang/SecurityManager/modules/m/module-info.java b/test/jdk/java/lang/SecurityManager/modules/m/module-info.java similarity index 100% rename from jdk/test/java/lang/SecurityManager/modules/m/module-info.java rename to test/jdk/java/lang/SecurityManager/modules/m/module-info.java diff --git a/jdk/test/java/lang/SecurityManager/modules/m/p/CustomSecurityManager.java b/test/jdk/java/lang/SecurityManager/modules/m/p/CustomSecurityManager.java similarity index 100% rename from jdk/test/java/lang/SecurityManager/modules/m/p/CustomSecurityManager.java rename to test/jdk/java/lang/SecurityManager/modules/m/p/CustomSecurityManager.java diff --git a/jdk/test/java/lang/SecurityManager/modules/test.policy b/test/jdk/java/lang/SecurityManager/modules/test.policy similarity index 100% rename from jdk/test/java/lang/SecurityManager/modules/test.policy rename to test/jdk/java/lang/SecurityManager/modules/test.policy diff --git a/jdk/test/java/lang/Short/ByteSwap.java b/test/jdk/java/lang/Short/ByteSwap.java similarity index 100% rename from jdk/test/java/lang/Short/ByteSwap.java rename to test/jdk/java/lang/Short/ByteSwap.java diff --git a/jdk/test/java/lang/Short/Decode.java b/test/jdk/java/lang/Short/Decode.java similarity index 100% rename from jdk/test/java/lang/Short/Decode.java rename to test/jdk/java/lang/Short/Decode.java diff --git a/jdk/test/java/lang/StackTraceElement/ModuleFrames.java b/test/jdk/java/lang/StackTraceElement/ModuleFrames.java similarity index 100% rename from jdk/test/java/lang/StackTraceElement/ModuleFrames.java rename to test/jdk/java/lang/StackTraceElement/ModuleFrames.java diff --git a/jdk/test/java/lang/StackTraceElement/PublicConstructor.java b/test/jdk/java/lang/StackTraceElement/PublicConstructor.java similarity index 100% rename from jdk/test/java/lang/StackTraceElement/PublicConstructor.java rename to test/jdk/java/lang/StackTraceElement/PublicConstructor.java diff --git a/jdk/test/java/lang/StackTraceElement/SerialTest.java b/test/jdk/java/lang/StackTraceElement/SerialTest.java similarity index 100% rename from jdk/test/java/lang/StackTraceElement/SerialTest.java rename to test/jdk/java/lang/StackTraceElement/SerialTest.java diff --git a/jdk/test/java/lang/StackTraceElement/WithClassLoaderName.java b/test/jdk/java/lang/StackTraceElement/WithClassLoaderName.java similarity index 100% rename from jdk/test/java/lang/StackTraceElement/WithClassLoaderName.java rename to test/jdk/java/lang/StackTraceElement/WithClassLoaderName.java diff --git a/jdk/test/java/lang/StackTraceElement/lib/m1/com/app/Main.java b/test/jdk/java/lang/StackTraceElement/lib/m1/com/app/Main.java similarity index 100% rename from jdk/test/java/lang/StackTraceElement/lib/m1/com/app/Main.java rename to test/jdk/java/lang/StackTraceElement/lib/m1/com/app/Main.java diff --git a/jdk/test/java/lang/StackTraceElement/lib/m1/com/app/Utils.java b/test/jdk/java/lang/StackTraceElement/lib/m1/com/app/Utils.java similarity index 100% rename from jdk/test/java/lang/StackTraceElement/lib/m1/com/app/Utils.java rename to test/jdk/java/lang/StackTraceElement/lib/m1/com/app/Utils.java diff --git a/jdk/test/java/lang/StackTraceElement/lib/m1/module-info.java b/test/jdk/java/lang/StackTraceElement/lib/m1/module-info.java similarity index 100% rename from jdk/test/java/lang/StackTraceElement/lib/m1/module-info.java rename to test/jdk/java/lang/StackTraceElement/lib/m1/module-info.java diff --git a/jdk/test/java/lang/StackTraceElement/src/p/ThrowException.java b/test/jdk/java/lang/StackTraceElement/src/p/ThrowException.java similarity index 100% rename from jdk/test/java/lang/StackTraceElement/src/p/ThrowException.java rename to test/jdk/java/lang/StackTraceElement/src/p/ThrowException.java diff --git a/jdk/test/java/lang/StackWalker/AcrossThreads.java b/test/jdk/java/lang/StackWalker/AcrossThreads.java similarity index 100% rename from jdk/test/java/lang/StackWalker/AcrossThreads.java rename to test/jdk/java/lang/StackWalker/AcrossThreads.java diff --git a/jdk/test/java/lang/StackWalker/Basic.java b/test/jdk/java/lang/StackWalker/Basic.java similarity index 100% rename from jdk/test/java/lang/StackWalker/Basic.java rename to test/jdk/java/lang/StackWalker/Basic.java diff --git a/jdk/test/java/lang/StackWalker/CallerFromMain.java b/test/jdk/java/lang/StackWalker/CallerFromMain.java similarity index 100% rename from jdk/test/java/lang/StackWalker/CallerFromMain.java rename to test/jdk/java/lang/StackWalker/CallerFromMain.java diff --git a/jdk/test/java/lang/StackWalker/CallerSensitiveMethod/Main.java b/test/jdk/java/lang/StackWalker/CallerSensitiveMethod/Main.java similarity index 100% rename from jdk/test/java/lang/StackWalker/CallerSensitiveMethod/Main.java rename to test/jdk/java/lang/StackWalker/CallerSensitiveMethod/Main.java diff --git a/jdk/test/java/lang/StackWalker/CallerSensitiveMethod/csm/jdk/test/CallerSensitiveTest.java b/test/jdk/java/lang/StackWalker/CallerSensitiveMethod/csm/jdk/test/CallerSensitiveTest.java similarity index 100% rename from jdk/test/java/lang/StackWalker/CallerSensitiveMethod/csm/jdk/test/CallerSensitiveTest.java rename to test/jdk/java/lang/StackWalker/CallerSensitiveMethod/csm/jdk/test/CallerSensitiveTest.java diff --git a/jdk/test/java/lang/StackWalker/CallerSensitiveMethod/csm/module-info.java b/test/jdk/java/lang/StackWalker/CallerSensitiveMethod/csm/module-info.java similarity index 100% rename from jdk/test/java/lang/StackWalker/CallerSensitiveMethod/csm/module-info.java rename to test/jdk/java/lang/StackWalker/CallerSensitiveMethod/csm/module-info.java diff --git a/jdk/test/java/lang/StackWalker/CallerSensitiveMethod/src/java.base/java/util/CSM.java b/test/jdk/java/lang/StackWalker/CallerSensitiveMethod/src/java.base/java/util/CSM.java similarity index 100% rename from jdk/test/java/lang/StackWalker/CallerSensitiveMethod/src/java.base/java/util/CSM.java rename to test/jdk/java/lang/StackWalker/CallerSensitiveMethod/src/java.base/java/util/CSM.java diff --git a/jdk/test/java/lang/StackWalker/DumpStackTest.java b/test/jdk/java/lang/StackWalker/DumpStackTest.java similarity index 100% rename from jdk/test/java/lang/StackWalker/DumpStackTest.java rename to test/jdk/java/lang/StackWalker/DumpStackTest.java diff --git a/jdk/test/java/lang/StackWalker/EmbeddedStackWalkTest.java b/test/jdk/java/lang/StackWalker/EmbeddedStackWalkTest.java similarity index 100% rename from jdk/test/java/lang/StackWalker/EmbeddedStackWalkTest.java rename to test/jdk/java/lang/StackWalker/EmbeddedStackWalkTest.java diff --git a/jdk/test/java/lang/StackWalker/GetCallerClassTest.java b/test/jdk/java/lang/StackWalker/GetCallerClassTest.java similarity index 100% rename from jdk/test/java/lang/StackWalker/GetCallerClassTest.java rename to test/jdk/java/lang/StackWalker/GetCallerClassTest.java diff --git a/jdk/test/java/lang/StackWalker/HiddenFrames.java b/test/jdk/java/lang/StackWalker/HiddenFrames.java similarity index 100% rename from jdk/test/java/lang/StackWalker/HiddenFrames.java rename to test/jdk/java/lang/StackWalker/HiddenFrames.java diff --git a/jdk/test/java/lang/StackWalker/LocalsAndOperands.java b/test/jdk/java/lang/StackWalker/LocalsAndOperands.java similarity index 100% rename from jdk/test/java/lang/StackWalker/LocalsAndOperands.java rename to test/jdk/java/lang/StackWalker/LocalsAndOperands.java diff --git a/jdk/test/java/lang/StackWalker/MultiThreadStackWalk.java b/test/jdk/java/lang/StackWalker/MultiThreadStackWalk.java similarity index 100% rename from jdk/test/java/lang/StackWalker/MultiThreadStackWalk.java rename to test/jdk/java/lang/StackWalker/MultiThreadStackWalk.java diff --git a/jdk/test/java/lang/StackWalker/NativeMethod.java b/test/jdk/java/lang/StackWalker/NativeMethod.java similarity index 100% rename from jdk/test/java/lang/StackWalker/NativeMethod.java rename to test/jdk/java/lang/StackWalker/NativeMethod.java diff --git a/jdk/test/java/lang/StackWalker/ReflectionFrames.java b/test/jdk/java/lang/StackWalker/ReflectionFrames.java similarity index 100% rename from jdk/test/java/lang/StackWalker/ReflectionFrames.java rename to test/jdk/java/lang/StackWalker/ReflectionFrames.java diff --git a/jdk/test/java/lang/StackWalker/SanityTest.java b/test/jdk/java/lang/StackWalker/SanityTest.java similarity index 100% rename from jdk/test/java/lang/StackWalker/SanityTest.java rename to test/jdk/java/lang/StackWalker/SanityTest.java diff --git a/jdk/test/java/lang/StackWalker/SecurityExceptions.java b/test/jdk/java/lang/StackWalker/SecurityExceptions.java similarity index 100% rename from jdk/test/java/lang/StackWalker/SecurityExceptions.java rename to test/jdk/java/lang/StackWalker/SecurityExceptions.java diff --git a/jdk/test/java/lang/StackWalker/StackRecorderUtil.java b/test/jdk/java/lang/StackWalker/StackRecorderUtil.java similarity index 100% rename from jdk/test/java/lang/StackWalker/StackRecorderUtil.java rename to test/jdk/java/lang/StackWalker/StackRecorderUtil.java diff --git a/jdk/test/java/lang/StackWalker/StackStreamState.java b/test/jdk/java/lang/StackWalker/StackStreamState.java similarity index 100% rename from jdk/test/java/lang/StackWalker/StackStreamState.java rename to test/jdk/java/lang/StackWalker/StackStreamState.java diff --git a/jdk/test/java/lang/StackWalker/StackStreamTest.java b/test/jdk/java/lang/StackWalker/StackStreamTest.java similarity index 100% rename from jdk/test/java/lang/StackWalker/StackStreamTest.java rename to test/jdk/java/lang/StackWalker/StackStreamTest.java diff --git a/jdk/test/java/lang/StackWalker/StackWalkTest.java b/test/jdk/java/lang/StackWalker/StackWalkTest.java similarity index 100% rename from jdk/test/java/lang/StackWalker/StackWalkTest.java rename to test/jdk/java/lang/StackWalker/StackWalkTest.java diff --git a/jdk/test/java/lang/StackWalker/TestBCI.java b/test/jdk/java/lang/StackWalker/TestBCI.java similarity index 100% rename from jdk/test/java/lang/StackWalker/TestBCI.java rename to test/jdk/java/lang/StackWalker/TestBCI.java diff --git a/jdk/test/java/lang/StackWalker/VerifyStackTrace.java b/test/jdk/java/lang/StackWalker/VerifyStackTrace.java similarity index 100% rename from jdk/test/java/lang/StackWalker/VerifyStackTrace.java rename to test/jdk/java/lang/StackWalker/VerifyStackTrace.java diff --git a/jdk/test/java/lang/StackWalker/WalkFunction.java b/test/jdk/java/lang/StackWalker/WalkFunction.java similarity index 100% rename from jdk/test/java/lang/StackWalker/WalkFunction.java rename to test/jdk/java/lang/StackWalker/WalkFunction.java diff --git a/jdk/test/java/lang/StackWalker/noperms.policy b/test/jdk/java/lang/StackWalker/noperms.policy similarity index 100% rename from jdk/test/java/lang/StackWalker/noperms.policy rename to test/jdk/java/lang/StackWalker/noperms.policy diff --git a/jdk/test/java/lang/StackWalker/stackwalk.policy b/test/jdk/java/lang/StackWalker/stackwalk.policy similarity index 100% rename from jdk/test/java/lang/StackWalker/stackwalk.policy rename to test/jdk/java/lang/StackWalker/stackwalk.policy diff --git a/jdk/test/java/lang/StackWalker/stackwalktest.policy b/test/jdk/java/lang/StackWalker/stackwalktest.policy similarity index 100% rename from jdk/test/java/lang/StackWalker/stackwalktest.policy rename to test/jdk/java/lang/StackWalker/stackwalktest.policy diff --git a/jdk/test/java/lang/StrictMath/CubeRootTests.java b/test/jdk/java/lang/StrictMath/CubeRootTests.java similarity index 100% rename from jdk/test/java/lang/StrictMath/CubeRootTests.java rename to test/jdk/java/lang/StrictMath/CubeRootTests.java diff --git a/jdk/test/java/lang/StrictMath/ExactArithTests.java b/test/jdk/java/lang/StrictMath/ExactArithTests.java similarity index 100% rename from jdk/test/java/lang/StrictMath/ExactArithTests.java rename to test/jdk/java/lang/StrictMath/ExactArithTests.java diff --git a/jdk/test/java/lang/StrictMath/ExpTests.java b/test/jdk/java/lang/StrictMath/ExpTests.java similarity index 100% rename from jdk/test/java/lang/StrictMath/ExpTests.java rename to test/jdk/java/lang/StrictMath/ExpTests.java diff --git a/jdk/test/java/lang/StrictMath/Expm1Tests.java b/test/jdk/java/lang/StrictMath/Expm1Tests.java similarity index 100% rename from jdk/test/java/lang/StrictMath/Expm1Tests.java rename to test/jdk/java/lang/StrictMath/Expm1Tests.java diff --git a/jdk/test/java/lang/StrictMath/FdlibmTranslit.java b/test/jdk/java/lang/StrictMath/FdlibmTranslit.java similarity index 100% rename from jdk/test/java/lang/StrictMath/FdlibmTranslit.java rename to test/jdk/java/lang/StrictMath/FdlibmTranslit.java diff --git a/jdk/test/java/lang/StrictMath/HyperbolicTests.java b/test/jdk/java/lang/StrictMath/HyperbolicTests.java similarity index 100% rename from jdk/test/java/lang/StrictMath/HyperbolicTests.java rename to test/jdk/java/lang/StrictMath/HyperbolicTests.java diff --git a/jdk/test/java/lang/StrictMath/HypotTests.java b/test/jdk/java/lang/StrictMath/HypotTests.java similarity index 100% rename from jdk/test/java/lang/StrictMath/HypotTests.java rename to test/jdk/java/lang/StrictMath/HypotTests.java diff --git a/jdk/test/java/lang/StrictMath/Log10Tests.java b/test/jdk/java/lang/StrictMath/Log10Tests.java similarity index 100% rename from jdk/test/java/lang/StrictMath/Log10Tests.java rename to test/jdk/java/lang/StrictMath/Log10Tests.java diff --git a/jdk/test/java/lang/StrictMath/Log1pTests.java b/test/jdk/java/lang/StrictMath/Log1pTests.java similarity index 100% rename from jdk/test/java/lang/StrictMath/Log1pTests.java rename to test/jdk/java/lang/StrictMath/Log1pTests.java diff --git a/jdk/test/java/lang/StrictMath/PowTests.java b/test/jdk/java/lang/StrictMath/PowTests.java similarity index 100% rename from jdk/test/java/lang/StrictMath/PowTests.java rename to test/jdk/java/lang/StrictMath/PowTests.java diff --git a/jdk/test/java/lang/StrictMath/Tests.java b/test/jdk/java/lang/StrictMath/Tests.java similarity index 100% rename from jdk/test/java/lang/StrictMath/Tests.java rename to test/jdk/java/lang/StrictMath/Tests.java diff --git a/jdk/test/java/lang/String/CaseConvertSameInstance.java b/test/jdk/java/lang/String/CaseConvertSameInstance.java similarity index 100% rename from jdk/test/java/lang/String/CaseConvertSameInstance.java rename to test/jdk/java/lang/String/CaseConvertSameInstance.java diff --git a/jdk/test/java/lang/String/CaseInsensitiveComparator.java b/test/jdk/java/lang/String/CaseInsensitiveComparator.java similarity index 100% rename from jdk/test/java/lang/String/CaseInsensitiveComparator.java rename to test/jdk/java/lang/String/CaseInsensitiveComparator.java diff --git a/jdk/test/java/lang/String/Chars.java b/test/jdk/java/lang/String/Chars.java similarity index 100% rename from jdk/test/java/lang/String/Chars.java rename to test/jdk/java/lang/String/Chars.java diff --git a/jdk/test/java/lang/String/CompactString/CharAt.java b/test/jdk/java/lang/String/CompactString/CharAt.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/CharAt.java rename to test/jdk/java/lang/String/CompactString/CharAt.java diff --git a/jdk/test/java/lang/String/CompactString/CodePointAt.java b/test/jdk/java/lang/String/CompactString/CodePointAt.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/CodePointAt.java rename to test/jdk/java/lang/String/CompactString/CodePointAt.java diff --git a/jdk/test/java/lang/String/CompactString/CodePointBefore.java b/test/jdk/java/lang/String/CompactString/CodePointBefore.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/CodePointBefore.java rename to test/jdk/java/lang/String/CompactString/CodePointBefore.java diff --git a/jdk/test/java/lang/String/CompactString/CodePointCount.java b/test/jdk/java/lang/String/CompactString/CodePointCount.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/CodePointCount.java rename to test/jdk/java/lang/String/CompactString/CodePointCount.java diff --git a/jdk/test/java/lang/String/CompactString/CompactString.java b/test/jdk/java/lang/String/CompactString/CompactString.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/CompactString.java rename to test/jdk/java/lang/String/CompactString/CompactString.java diff --git a/jdk/test/java/lang/String/CompactString/CompareTo.java b/test/jdk/java/lang/String/CompactString/CompareTo.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/CompareTo.java rename to test/jdk/java/lang/String/CompactString/CompareTo.java diff --git a/jdk/test/java/lang/String/CompactString/CompareToIgnoreCase.java b/test/jdk/java/lang/String/CompactString/CompareToIgnoreCase.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/CompareToIgnoreCase.java rename to test/jdk/java/lang/String/CompactString/CompareToIgnoreCase.java diff --git a/jdk/test/java/lang/String/CompactString/Concat.java b/test/jdk/java/lang/String/CompactString/Concat.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/Concat.java rename to test/jdk/java/lang/String/CompactString/Concat.java diff --git a/jdk/test/java/lang/String/CompactString/Contains.java b/test/jdk/java/lang/String/CompactString/Contains.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/Contains.java rename to test/jdk/java/lang/String/CompactString/Contains.java diff --git a/jdk/test/java/lang/String/CompactString/EndsWith.java b/test/jdk/java/lang/String/CompactString/EndsWith.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/EndsWith.java rename to test/jdk/java/lang/String/CompactString/EndsWith.java diff --git a/jdk/test/java/lang/String/CompactString/Equals.java b/test/jdk/java/lang/String/CompactString/Equals.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/Equals.java rename to test/jdk/java/lang/String/CompactString/Equals.java diff --git a/jdk/test/java/lang/String/CompactString/EqualsIgnoreCase.java b/test/jdk/java/lang/String/CompactString/EqualsIgnoreCase.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/EqualsIgnoreCase.java rename to test/jdk/java/lang/String/CompactString/EqualsIgnoreCase.java diff --git a/jdk/test/java/lang/String/CompactString/GetChars.java b/test/jdk/java/lang/String/CompactString/GetChars.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/GetChars.java rename to test/jdk/java/lang/String/CompactString/GetChars.java diff --git a/jdk/test/java/lang/String/CompactString/IndexOf.java b/test/jdk/java/lang/String/CompactString/IndexOf.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/IndexOf.java rename to test/jdk/java/lang/String/CompactString/IndexOf.java diff --git a/jdk/test/java/lang/String/CompactString/Intern.java b/test/jdk/java/lang/String/CompactString/Intern.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/Intern.java rename to test/jdk/java/lang/String/CompactString/Intern.java diff --git a/jdk/test/java/lang/String/CompactString/LastIndexOf.java b/test/jdk/java/lang/String/CompactString/LastIndexOf.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/LastIndexOf.java rename to test/jdk/java/lang/String/CompactString/LastIndexOf.java diff --git a/jdk/test/java/lang/String/CompactString/Length.java b/test/jdk/java/lang/String/CompactString/Length.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/Length.java rename to test/jdk/java/lang/String/CompactString/Length.java diff --git a/jdk/test/java/lang/String/CompactString/Numbers.java b/test/jdk/java/lang/String/CompactString/Numbers.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/Numbers.java rename to test/jdk/java/lang/String/CompactString/Numbers.java diff --git a/jdk/test/java/lang/String/CompactString/OffsetByCodePoints.java b/test/jdk/java/lang/String/CompactString/OffsetByCodePoints.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/OffsetByCodePoints.java rename to test/jdk/java/lang/String/CompactString/OffsetByCodePoints.java diff --git a/jdk/test/java/lang/String/CompactString/RegionMatches.java b/test/jdk/java/lang/String/CompactString/RegionMatches.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/RegionMatches.java rename to test/jdk/java/lang/String/CompactString/RegionMatches.java diff --git a/jdk/test/java/lang/String/CompactString/Replace.java b/test/jdk/java/lang/String/CompactString/Replace.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/Replace.java rename to test/jdk/java/lang/String/CompactString/Replace.java diff --git a/jdk/test/java/lang/String/CompactString/SerializationTest.java b/test/jdk/java/lang/String/CompactString/SerializationTest.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/SerializationTest.java rename to test/jdk/java/lang/String/CompactString/SerializationTest.java diff --git a/jdk/test/java/lang/String/CompactString/Split.java b/test/jdk/java/lang/String/CompactString/Split.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/Split.java rename to test/jdk/java/lang/String/CompactString/Split.java diff --git a/jdk/test/java/lang/String/CompactString/StartsWith.java b/test/jdk/java/lang/String/CompactString/StartsWith.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/StartsWith.java rename to test/jdk/java/lang/String/CompactString/StartsWith.java diff --git a/jdk/test/java/lang/String/CompactString/SubString.java b/test/jdk/java/lang/String/CompactString/SubString.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/SubString.java rename to test/jdk/java/lang/String/CompactString/SubString.java diff --git a/jdk/test/java/lang/String/CompactString/ToCharArray.java b/test/jdk/java/lang/String/CompactString/ToCharArray.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/ToCharArray.java rename to test/jdk/java/lang/String/CompactString/ToCharArray.java diff --git a/jdk/test/java/lang/String/CompactString/ToLowerCase.java b/test/jdk/java/lang/String/CompactString/ToLowerCase.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/ToLowerCase.java rename to test/jdk/java/lang/String/CompactString/ToLowerCase.java diff --git a/jdk/test/java/lang/String/CompactString/ToUpperCase.java b/test/jdk/java/lang/String/CompactString/ToUpperCase.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/ToUpperCase.java rename to test/jdk/java/lang/String/CompactString/ToUpperCase.java diff --git a/jdk/test/java/lang/String/CompactString/Trim.java b/test/jdk/java/lang/String/CompactString/Trim.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/Trim.java rename to test/jdk/java/lang/String/CompactString/Trim.java diff --git a/jdk/test/java/lang/String/CompactString/VMOptionsTest.java b/test/jdk/java/lang/String/CompactString/VMOptionsTest.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/VMOptionsTest.java rename to test/jdk/java/lang/String/CompactString/VMOptionsTest.java diff --git a/jdk/test/java/lang/String/CompactString/ValueOf.java b/test/jdk/java/lang/String/CompactString/ValueOf.java similarity index 100% rename from jdk/test/java/lang/String/CompactString/ValueOf.java rename to test/jdk/java/lang/String/CompactString/ValueOf.java diff --git a/jdk/test/java/lang/String/CompareIC.java b/test/jdk/java/lang/String/CompareIC.java similarity index 100% rename from jdk/test/java/lang/String/CompareIC.java rename to test/jdk/java/lang/String/CompareIC.java diff --git a/jdk/test/java/lang/String/ContentEquals.java b/test/jdk/java/lang/String/ContentEquals.java similarity index 100% rename from jdk/test/java/lang/String/ContentEquals.java rename to test/jdk/java/lang/String/ContentEquals.java diff --git a/jdk/test/java/lang/String/Encodings.java b/test/jdk/java/lang/String/Encodings.java similarity index 100% rename from jdk/test/java/lang/String/Encodings.java rename to test/jdk/java/lang/String/Encodings.java diff --git a/jdk/test/java/lang/String/EqualsIgnoreCase.java b/test/jdk/java/lang/String/EqualsIgnoreCase.java similarity index 100% rename from jdk/test/java/lang/String/EqualsIgnoreCase.java rename to test/jdk/java/lang/String/EqualsIgnoreCase.java diff --git a/jdk/test/java/lang/String/Exceptions.java b/test/jdk/java/lang/String/Exceptions.java similarity index 100% rename from jdk/test/java/lang/String/Exceptions.java rename to test/jdk/java/lang/String/Exceptions.java diff --git a/jdk/test/java/lang/String/ICCBasher.java b/test/jdk/java/lang/String/ICCBasher.java similarity index 100% rename from jdk/test/java/lang/String/ICCBasher.java rename to test/jdk/java/lang/String/ICCBasher.java diff --git a/jdk/test/java/lang/String/IndexOfEmptyInEmpty.java b/test/jdk/java/lang/String/IndexOfEmptyInEmpty.java similarity index 100% rename from jdk/test/java/lang/String/IndexOfEmptyInEmpty.java rename to test/jdk/java/lang/String/IndexOfEmptyInEmpty.java diff --git a/jdk/test/java/lang/String/IsEmpty.java b/test/jdk/java/lang/String/IsEmpty.java similarity index 100% rename from jdk/test/java/lang/String/IsEmpty.java rename to test/jdk/java/lang/String/IsEmpty.java diff --git a/jdk/test/java/lang/String/LiteralReplace.java b/test/jdk/java/lang/String/LiteralReplace.java similarity index 100% rename from jdk/test/java/lang/String/LiteralReplace.java rename to test/jdk/java/lang/String/LiteralReplace.java diff --git a/jdk/test/java/lang/String/NonCharacterMapping.java b/test/jdk/java/lang/String/NonCharacterMapping.java similarity index 100% rename from jdk/test/java/lang/String/NonCharacterMapping.java rename to test/jdk/java/lang/String/NonCharacterMapping.java diff --git a/jdk/test/java/lang/String/Regex.java b/test/jdk/java/lang/String/Regex.java similarity index 100% rename from jdk/test/java/lang/String/Regex.java rename to test/jdk/java/lang/String/Regex.java diff --git a/jdk/test/java/lang/String/RegionMatches.java b/test/jdk/java/lang/String/RegionMatches.java similarity index 100% rename from jdk/test/java/lang/String/RegionMatches.java rename to test/jdk/java/lang/String/RegionMatches.java diff --git a/jdk/test/java/lang/String/SBConstructor.java b/test/jdk/java/lang/String/SBConstructor.java similarity index 100% rename from jdk/test/java/lang/String/SBConstructor.java rename to test/jdk/java/lang/String/SBConstructor.java diff --git a/jdk/test/java/lang/String/Split.java b/test/jdk/java/lang/String/Split.java similarity index 100% rename from jdk/test/java/lang/String/Split.java rename to test/jdk/java/lang/String/Split.java diff --git a/jdk/test/java/lang/String/StringContentEqualsBug.java b/test/jdk/java/lang/String/StringContentEqualsBug.java similarity index 100% rename from jdk/test/java/lang/String/StringContentEqualsBug.java rename to test/jdk/java/lang/String/StringContentEqualsBug.java diff --git a/jdk/test/java/lang/String/StringJoinTest.java b/test/jdk/java/lang/String/StringJoinTest.java similarity index 100% rename from jdk/test/java/lang/String/StringJoinTest.java rename to test/jdk/java/lang/String/StringJoinTest.java diff --git a/jdk/test/java/lang/String/Supplementary.java b/test/jdk/java/lang/String/Supplementary.java similarity index 100% rename from jdk/test/java/lang/String/Supplementary.java rename to test/jdk/java/lang/String/Supplementary.java diff --git a/jdk/test/java/lang/String/ToLowerCase.java b/test/jdk/java/lang/String/ToLowerCase.java similarity index 100% rename from jdk/test/java/lang/String/ToLowerCase.java rename to test/jdk/java/lang/String/ToLowerCase.java diff --git a/jdk/test/java/lang/String/ToUpperCase.java b/test/jdk/java/lang/String/ToUpperCase.java similarity index 100% rename from jdk/test/java/lang/String/ToUpperCase.java rename to test/jdk/java/lang/String/ToUpperCase.java diff --git a/jdk/test/java/lang/String/concat/CompactStringsInitialCoder.java b/test/jdk/java/lang/String/concat/CompactStringsInitialCoder.java similarity index 100% rename from jdk/test/java/lang/String/concat/CompactStringsInitialCoder.java rename to test/jdk/java/lang/String/concat/CompactStringsInitialCoder.java diff --git a/jdk/test/java/lang/String/concat/ImplicitStringConcat.java b/test/jdk/java/lang/String/concat/ImplicitStringConcat.java similarity index 100% rename from jdk/test/java/lang/String/concat/ImplicitStringConcat.java rename to test/jdk/java/lang/String/concat/ImplicitStringConcat.java diff --git a/jdk/test/java/lang/String/concat/ImplicitStringConcatArgCount.java b/test/jdk/java/lang/String/concat/ImplicitStringConcatArgCount.java similarity index 100% rename from jdk/test/java/lang/String/concat/ImplicitStringConcatArgCount.java rename to test/jdk/java/lang/String/concat/ImplicitStringConcatArgCount.java diff --git a/jdk/test/java/lang/String/concat/ImplicitStringConcatBoundaries.java b/test/jdk/java/lang/String/concat/ImplicitStringConcatBoundaries.java similarity index 100% rename from jdk/test/java/lang/String/concat/ImplicitStringConcatBoundaries.java rename to test/jdk/java/lang/String/concat/ImplicitStringConcatBoundaries.java diff --git a/jdk/test/java/lang/String/concat/ImplicitStringConcatMany.java b/test/jdk/java/lang/String/concat/ImplicitStringConcatMany.java similarity index 100% rename from jdk/test/java/lang/String/concat/ImplicitStringConcatMany.java rename to test/jdk/java/lang/String/concat/ImplicitStringConcatMany.java diff --git a/jdk/test/java/lang/String/concat/ImplicitStringConcatManyLongs.java b/test/jdk/java/lang/String/concat/ImplicitStringConcatManyLongs.java similarity index 100% rename from jdk/test/java/lang/String/concat/ImplicitStringConcatManyLongs.java rename to test/jdk/java/lang/String/concat/ImplicitStringConcatManyLongs.java diff --git a/jdk/test/java/lang/String/concat/ImplicitStringConcatShapes-head.template b/test/jdk/java/lang/String/concat/ImplicitStringConcatShapes-head.template similarity index 100% rename from jdk/test/java/lang/String/concat/ImplicitStringConcatShapes-head.template rename to test/jdk/java/lang/String/concat/ImplicitStringConcatShapes-head.template diff --git a/jdk/test/java/lang/String/concat/ImplicitStringConcatShapes.java b/test/jdk/java/lang/String/concat/ImplicitStringConcatShapes.java similarity index 100% rename from jdk/test/java/lang/String/concat/ImplicitStringConcatShapes.java rename to test/jdk/java/lang/String/concat/ImplicitStringConcatShapes.java diff --git a/jdk/test/java/lang/String/concat/ImplicitStringConcatShapesTestGen.java b/test/jdk/java/lang/String/concat/ImplicitStringConcatShapesTestGen.java similarity index 100% rename from jdk/test/java/lang/String/concat/ImplicitStringConcatShapesTestGen.java rename to test/jdk/java/lang/String/concat/ImplicitStringConcatShapesTestGen.java diff --git a/jdk/test/java/lang/String/concat/StringConcatFactoryEmptyMethods.java b/test/jdk/java/lang/String/concat/StringConcatFactoryEmptyMethods.java similarity index 100% rename from jdk/test/java/lang/String/concat/StringConcatFactoryEmptyMethods.java rename to test/jdk/java/lang/String/concat/StringConcatFactoryEmptyMethods.java diff --git a/jdk/test/java/lang/String/concat/StringConcatFactoryInvariants.java b/test/jdk/java/lang/String/concat/StringConcatFactoryInvariants.java similarity index 100% rename from jdk/test/java/lang/String/concat/StringConcatFactoryInvariants.java rename to test/jdk/java/lang/String/concat/StringConcatFactoryInvariants.java diff --git a/jdk/test/java/lang/String/concat/WithSecurityManager.java b/test/jdk/java/lang/String/concat/WithSecurityManager.java similarity index 100% rename from jdk/test/java/lang/String/concat/WithSecurityManager.java rename to test/jdk/java/lang/String/concat/WithSecurityManager.java diff --git a/jdk/test/java/lang/String/concat/update-tests.sh b/test/jdk/java/lang/String/concat/update-tests.sh similarity index 100% rename from jdk/test/java/lang/String/concat/update-tests.sh rename to test/jdk/java/lang/String/concat/update-tests.sh diff --git a/jdk/test/java/lang/String/nativeEncoding/StringPlatformChars.java b/test/jdk/java/lang/String/nativeEncoding/StringPlatformChars.java similarity index 100% rename from jdk/test/java/lang/String/nativeEncoding/StringPlatformChars.java rename to test/jdk/java/lang/String/nativeEncoding/StringPlatformChars.java diff --git a/jdk/test/java/lang/String/nativeEncoding/libstringPlatformChars.c b/test/jdk/java/lang/String/nativeEncoding/libstringPlatformChars.c similarity index 100% rename from jdk/test/java/lang/String/nativeEncoding/libstringPlatformChars.c rename to test/jdk/java/lang/String/nativeEncoding/libstringPlatformChars.c diff --git a/jdk/test/java/lang/StringBuffer/AppendCharSequence.java b/test/jdk/java/lang/StringBuffer/AppendCharSequence.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/AppendCharSequence.java rename to test/jdk/java/lang/StringBuffer/AppendCharSequence.java diff --git a/jdk/test/java/lang/StringBuffer/AppendSB.java b/test/jdk/java/lang/StringBuffer/AppendSB.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/AppendSB.java rename to test/jdk/java/lang/StringBuffer/AppendSB.java diff --git a/jdk/test/java/lang/StringBuffer/AppendStringBuilder.java b/test/jdk/java/lang/StringBuffer/AppendStringBuilder.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/AppendStringBuilder.java rename to test/jdk/java/lang/StringBuffer/AppendStringBuilder.java diff --git a/jdk/test/java/lang/StringBuffer/BufferForwarding.java b/test/jdk/java/lang/StringBuffer/BufferForwarding.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/BufferForwarding.java rename to test/jdk/java/lang/StringBuffer/BufferForwarding.java diff --git a/jdk/test/java/lang/StringBuffer/Capacity.java b/test/jdk/java/lang/StringBuffer/Capacity.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/Capacity.java rename to test/jdk/java/lang/StringBuffer/Capacity.java diff --git a/jdk/test/java/lang/StringBuffer/CompactStringBuffer.java b/test/jdk/java/lang/StringBuffer/CompactStringBuffer.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/CompactStringBuffer.java rename to test/jdk/java/lang/StringBuffer/CompactStringBuffer.java diff --git a/jdk/test/java/lang/StringBuffer/CompactStringBufferSerialization.java b/test/jdk/java/lang/StringBuffer/CompactStringBufferSerialization.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/CompactStringBufferSerialization.java rename to test/jdk/java/lang/StringBuffer/CompactStringBufferSerialization.java diff --git a/jdk/test/java/lang/StringBuffer/Exceptions.java b/test/jdk/java/lang/StringBuffer/Exceptions.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/Exceptions.java rename to test/jdk/java/lang/StringBuffer/Exceptions.java diff --git a/jdk/test/java/lang/StringBuffer/GetCharsOverLength.java b/test/jdk/java/lang/StringBuffer/GetCharsOverLength.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/GetCharsOverLength.java rename to test/jdk/java/lang/StringBuffer/GetCharsOverLength.java diff --git a/jdk/test/java/lang/StringBuffer/GetCharsSrcEndLarger.java b/test/jdk/java/lang/StringBuffer/GetCharsSrcEndLarger.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/GetCharsSrcEndLarger.java rename to test/jdk/java/lang/StringBuffer/GetCharsSrcEndLarger.java diff --git a/jdk/test/java/lang/StringBuffer/IndexOf.java b/test/jdk/java/lang/StringBuffer/IndexOf.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/IndexOf.java rename to test/jdk/java/lang/StringBuffer/IndexOf.java diff --git a/jdk/test/java/lang/StringBuffer/InsertMaxValue.java b/test/jdk/java/lang/StringBuffer/InsertMaxValue.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/InsertMaxValue.java rename to test/jdk/java/lang/StringBuffer/InsertMaxValue.java diff --git a/jdk/test/java/lang/StringBuffer/InsertNullString.java b/test/jdk/java/lang/StringBuffer/InsertNullString.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/InsertNullString.java rename to test/jdk/java/lang/StringBuffer/InsertNullString.java diff --git a/jdk/test/java/lang/StringBuffer/Replace.java b/test/jdk/java/lang/StringBuffer/Replace.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/Replace.java rename to test/jdk/java/lang/StringBuffer/Replace.java diff --git a/jdk/test/java/lang/StringBuffer/SBBasher.java b/test/jdk/java/lang/StringBuffer/SBBasher.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/SBBasher.java rename to test/jdk/java/lang/StringBuffer/SBBasher.java diff --git a/jdk/test/java/lang/StringBuffer/SetLength.java b/test/jdk/java/lang/StringBuffer/SetLength.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/SetLength.java rename to test/jdk/java/lang/StringBuffer/SetLength.java diff --git a/jdk/test/java/lang/StringBuffer/Substring.java b/test/jdk/java/lang/StringBuffer/Substring.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/Substring.java rename to test/jdk/java/lang/StringBuffer/Substring.java diff --git a/jdk/test/java/lang/StringBuffer/Supplementary.java b/test/jdk/java/lang/StringBuffer/Supplementary.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/Supplementary.java rename to test/jdk/java/lang/StringBuffer/Supplementary.java diff --git a/jdk/test/java/lang/StringBuffer/TestSynchronization.java b/test/jdk/java/lang/StringBuffer/TestSynchronization.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/TestSynchronization.java rename to test/jdk/java/lang/StringBuffer/TestSynchronization.java diff --git a/jdk/test/java/lang/StringBuffer/ToStringCache.java b/test/jdk/java/lang/StringBuffer/ToStringCache.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/ToStringCache.java rename to test/jdk/java/lang/StringBuffer/ToStringCache.java diff --git a/jdk/test/java/lang/StringBuffer/Trim.java b/test/jdk/java/lang/StringBuffer/Trim.java similarity index 100% rename from jdk/test/java/lang/StringBuffer/Trim.java rename to test/jdk/java/lang/StringBuffer/Trim.java diff --git a/jdk/test/java/lang/StringBuilder/AppendStringBuffer.java b/test/jdk/java/lang/StringBuilder/AppendStringBuffer.java similarity index 100% rename from jdk/test/java/lang/StringBuilder/AppendStringBuffer.java rename to test/jdk/java/lang/StringBuilder/AppendStringBuffer.java diff --git a/jdk/test/java/lang/StringBuilder/BuilderForwarding.java b/test/jdk/java/lang/StringBuilder/BuilderForwarding.java similarity index 100% rename from jdk/test/java/lang/StringBuilder/BuilderForwarding.java rename to test/jdk/java/lang/StringBuilder/BuilderForwarding.java diff --git a/jdk/test/java/lang/StringBuilder/Capacity.java b/test/jdk/java/lang/StringBuilder/Capacity.java similarity index 100% rename from jdk/test/java/lang/StringBuilder/Capacity.java rename to test/jdk/java/lang/StringBuilder/Capacity.java diff --git a/jdk/test/java/lang/StringBuilder/CompactStringBuilder.java b/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java similarity index 100% rename from jdk/test/java/lang/StringBuilder/CompactStringBuilder.java rename to test/jdk/java/lang/StringBuilder/CompactStringBuilder.java diff --git a/jdk/test/java/lang/StringBuilder/CompactStringBuilderSerialization.java b/test/jdk/java/lang/StringBuilder/CompactStringBuilderSerialization.java similarity index 100% rename from jdk/test/java/lang/StringBuilder/CompactStringBuilderSerialization.java rename to test/jdk/java/lang/StringBuilder/CompactStringBuilderSerialization.java diff --git a/jdk/test/java/lang/StringBuilder/EnsureCapacity.java b/test/jdk/java/lang/StringBuilder/EnsureCapacity.java similarity index 100% rename from jdk/test/java/lang/StringBuilder/EnsureCapacity.java rename to test/jdk/java/lang/StringBuilder/EnsureCapacity.java diff --git a/jdk/test/java/lang/StringBuilder/Exceptions.java b/test/jdk/java/lang/StringBuilder/Exceptions.java similarity index 100% rename from jdk/test/java/lang/StringBuilder/Exceptions.java rename to test/jdk/java/lang/StringBuilder/Exceptions.java diff --git a/jdk/test/java/lang/StringBuilder/HugeCapacity.java b/test/jdk/java/lang/StringBuilder/HugeCapacity.java similarity index 100% rename from jdk/test/java/lang/StringBuilder/HugeCapacity.java rename to test/jdk/java/lang/StringBuilder/HugeCapacity.java diff --git a/jdk/test/java/lang/StringBuilder/Insert.java b/test/jdk/java/lang/StringBuilder/Insert.java similarity index 100% rename from jdk/test/java/lang/StringBuilder/Insert.java rename to test/jdk/java/lang/StringBuilder/Insert.java diff --git a/jdk/test/java/lang/StringBuilder/Supplementary.java b/test/jdk/java/lang/StringBuilder/Supplementary.java similarity index 100% rename from jdk/test/java/lang/StringBuilder/Supplementary.java rename to test/jdk/java/lang/StringBuilder/Supplementary.java diff --git a/jdk/test/java/lang/StringCoding/CheckEncodings.sh b/test/jdk/java/lang/StringCoding/CheckEncodings.sh similarity index 100% rename from jdk/test/java/lang/StringCoding/CheckEncodings.sh rename to test/jdk/java/lang/StringCoding/CheckEncodings.sh diff --git a/jdk/test/java/lang/StringCoding/Enormous.java b/test/jdk/java/lang/StringCoding/Enormous.java similarity index 100% rename from jdk/test/java/lang/StringCoding/Enormous.java rename to test/jdk/java/lang/StringCoding/Enormous.java diff --git a/jdk/test/java/lang/StringCoding/locales.txt b/test/jdk/java/lang/StringCoding/locales.txt similarity index 100% rename from jdk/test/java/lang/StringCoding/locales.txt rename to test/jdk/java/lang/StringCoding/locales.txt diff --git a/jdk/test/java/lang/System/Available.java b/test/jdk/java/lang/System/Available.java similarity index 100% rename from jdk/test/java/lang/System/Available.java rename to test/jdk/java/lang/System/Available.java diff --git a/jdk/test/java/lang/System/ExitFinalizersAndJIT.java b/test/jdk/java/lang/System/ExitFinalizersAndJIT.java similarity index 100% rename from jdk/test/java/lang/System/ExitFinalizersAndJIT.java rename to test/jdk/java/lang/System/ExitFinalizersAndJIT.java diff --git a/jdk/test/java/lang/System/IHashCode.java b/test/jdk/java/lang/System/IHashCode.java similarity index 100% rename from jdk/test/java/lang/System/IHashCode.java rename to test/jdk/java/lang/System/IHashCode.java diff --git a/jdk/test/java/lang/System/IgnoreNullSecurityManager.java b/test/jdk/java/lang/System/IgnoreNullSecurityManager.java similarity index 100% rename from jdk/test/java/lang/System/IgnoreNullSecurityManager.java rename to test/jdk/java/lang/System/IgnoreNullSecurityManager.java diff --git a/jdk/test/java/lang/System/Logger/Level/LoggerLevelTest.java b/test/jdk/java/lang/System/Logger/Level/LoggerLevelTest.java similarity index 100% rename from jdk/test/java/lang/System/Logger/Level/LoggerLevelTest.java rename to test/jdk/java/lang/System/Logger/Level/LoggerLevelTest.java diff --git a/jdk/test/java/lang/System/Logger/custom/AccessSystemLogger.java b/test/jdk/java/lang/System/Logger/custom/AccessSystemLogger.java similarity index 100% rename from jdk/test/java/lang/System/Logger/custom/AccessSystemLogger.java rename to test/jdk/java/lang/System/Logger/custom/AccessSystemLogger.java diff --git a/jdk/test/java/lang/System/Logger/custom/CustomLoggerTest.java b/test/jdk/java/lang/System/Logger/custom/CustomLoggerTest.java similarity index 100% rename from jdk/test/java/lang/System/Logger/custom/CustomLoggerTest.java rename to test/jdk/java/lang/System/Logger/custom/CustomLoggerTest.java diff --git a/jdk/test/java/lang/System/Logger/custom/META-INF/services/java.lang.System$LoggerFinder b/test/jdk/java/lang/System/Logger/custom/META-INF/services/java.lang.System$LoggerFinder similarity index 100% rename from jdk/test/java/lang/System/Logger/custom/META-INF/services/java.lang.System$LoggerFinder rename to test/jdk/java/lang/System/Logger/custom/META-INF/services/java.lang.System$LoggerFinder diff --git a/jdk/test/java/lang/System/Logger/default/AccessSystemLogger.java b/test/jdk/java/lang/System/Logger/default/AccessSystemLogger.java similarity index 100% rename from jdk/test/java/lang/System/Logger/default/AccessSystemLogger.java rename to test/jdk/java/lang/System/Logger/default/AccessSystemLogger.java diff --git a/jdk/test/java/lang/System/Logger/default/DefaultLoggerTest.java b/test/jdk/java/lang/System/Logger/default/DefaultLoggerTest.java similarity index 100% rename from jdk/test/java/lang/System/Logger/default/DefaultLoggerTest.java rename to test/jdk/java/lang/System/Logger/default/DefaultLoggerTest.java diff --git a/jdk/test/java/lang/System/Logger/interface/LoggerInterfaceTest.java b/test/jdk/java/lang/System/Logger/interface/LoggerInterfaceTest.java similarity index 100% rename from jdk/test/java/lang/System/Logger/interface/LoggerInterfaceTest.java rename to test/jdk/java/lang/System/Logger/interface/LoggerInterfaceTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/AccessSystemLogger.java b/test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/AccessSystemLogger.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/AccessSystemLogger.java rename to test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/AccessSystemLogger.java diff --git a/jdk/test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinder.java b/test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinder.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinder.java rename to test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinder.java diff --git a/jdk/test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinderTest.java b/test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinderTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinderTest.java rename to test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinderTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/CustomSystemClassLoader.java b/test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/CustomSystemClassLoader.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/CustomSystemClassLoader.java rename to test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/CustomSystemClassLoader.java diff --git a/jdk/test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/META-INF/services/java.lang.System$LoggerFinder b/test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/META-INF/services/java.lang.System$LoggerFinder similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/META-INF/services/java.lang.System$LoggerFinder rename to test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/META-INF/services/java.lang.System$LoggerFinder diff --git a/jdk/test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/TestLoggerFinder.java b/test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/TestLoggerFinder.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/BaseLoggerFinderTest/TestLoggerFinder.java rename to test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/TestLoggerFinder.java diff --git a/jdk/test/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/AccessSystemLogger.java b/test/jdk/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/AccessSystemLogger.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/AccessSystemLogger.java rename to test/jdk/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/AccessSystemLogger.java diff --git a/jdk/test/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/DefaultLoggerFinderTest.java b/test/jdk/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/DefaultLoggerFinderTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/DefaultLoggerFinderTest.java rename to test/jdk/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/DefaultLoggerFinderTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/LoggerFinderAPI/LoggerFinderAPI.java b/test/jdk/java/lang/System/LoggerFinder/LoggerFinderAPI/LoggerFinderAPI.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/LoggerFinderAPI/LoggerFinderAPI.java rename to test/jdk/java/lang/System/LoggerFinder/LoggerFinderAPI/LoggerFinderAPI.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/AccessSystemLogger.java b/test/jdk/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/AccessSystemLogger.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/AccessSystemLogger.java rename to test/jdk/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/AccessSystemLogger.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/BaseDefaultLoggerFinderTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/BaseDefaultLoggerFinderTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/BaseDefaultLoggerFinderTest.java rename to test/jdk/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/BaseDefaultLoggerFinderTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/CustomSystemClassLoader.java b/test/jdk/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/CustomSystemClassLoader.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/CustomSystemClassLoader.java rename to test/jdk/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/CustomSystemClassLoader.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/META-INF/services/java.lang.System$LoggerFinder b/test/jdk/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/META-INF/services/java.lang.System$LoggerFinder similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/META-INF/services/java.lang.System$LoggerFinder rename to test/jdk/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/META-INF/services/java.lang.System$LoggerFinder diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/BaseLoggerBridgeTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/BaseLoggerBridgeTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/BaseLoggerBridgeTest.java rename to test/jdk/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/BaseLoggerBridgeTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/CustomSystemClassLoader.java b/test/jdk/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/CustomSystemClassLoader.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/CustomSystemClassLoader.java rename to test/jdk/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/CustomSystemClassLoader.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/META-INF/services/java.lang.System$LoggerFinder b/test/jdk/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/META-INF/services/java.lang.System$LoggerFinder similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/META-INF/services/java.lang.System$LoggerFinder rename to test/jdk/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/META-INF/services/java.lang.System$LoggerFinder diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/BasePlatformLoggerTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/BasePlatformLoggerTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/BasePlatformLoggerTest.java rename to test/jdk/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/BasePlatformLoggerTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/CustomSystemClassLoader.java b/test/jdk/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/CustomSystemClassLoader.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/CustomSystemClassLoader.java rename to test/jdk/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/CustomSystemClassLoader.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/META-INF/services/java.lang.System$LoggerFinder b/test/jdk/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/META-INF/services/java.lang.System$LoggerFinder similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/META-INF/services/java.lang.System$LoggerFinder rename to test/jdk/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/META-INF/services/java.lang.System$LoggerFinder diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerAPIsTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerAPIsTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerAPIsTest.java rename to test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerAPIsTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java rename to test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerUtils.java b/test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerUtils.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerUtils.java rename to test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerUtils.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/BootstrapLogger/LogStream.java b/test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/LogStream.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/BootstrapLogger/LogStream.java rename to test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/LogStream.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/CustomSystemClassLoader.java b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/CustomSystemClassLoader.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/CustomSystemClassLoader.java rename to test/jdk/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/CustomSystemClassLoader.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/LoggerBridgeTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/LoggerBridgeTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/LoggerBridgeTest.java rename to test/jdk/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/LoggerBridgeTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/META-INF/services/java.lang.System$LoggerFinder b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/META-INF/services/java.lang.System$LoggerFinder similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/META-INF/services/java.lang.System$LoggerFinder rename to test/jdk/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/META-INF/services/java.lang.System$LoggerFinder diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/AccessSystemLogger.java b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/AccessSystemLogger.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/AccessSystemLogger.java rename to test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/AccessSystemLogger.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/CustomSystemClassLoader.java b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/CustomSystemClassLoader.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/CustomSystemClassLoader.java rename to test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/CustomSystemClassLoader.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java rename to test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/META-INF/services/java.lang.System$LoggerFinder b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/META-INF/services/java.lang.System$LoggerFinder similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/META-INF/services/java.lang.System$LoggerFinder rename to test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/META-INF/services/java.lang.System$LoggerFinder diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/CustomSystemClassLoader.java b/test/jdk/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/CustomSystemClassLoader.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/CustomSystemClassLoader.java rename to test/jdk/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/CustomSystemClassLoader.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/META-INF/services/java.lang.System$LoggerFinder b/test/jdk/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/META-INF/services/java.lang.System$LoggerFinder similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/META-INF/services/java.lang.System$LoggerFinder rename to test/jdk/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/META-INF/services/java.lang.System$LoggerFinder diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/PlatformLoggerBridgeTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/PlatformLoggerBridgeTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/PlatformLoggerBridgeTest.java rename to test/jdk/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/PlatformLoggerBridgeTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/SimpleConsoleLoggerTest/SimpleConsoleLoggerTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/SimpleConsoleLoggerTest/SimpleConsoleLoggerTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/SimpleConsoleLoggerTest/SimpleConsoleLoggerTest.java rename to test/jdk/java/lang/System/LoggerFinder/internal/SimpleConsoleLoggerTest/SimpleConsoleLoggerTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/SystemLoggerInPlatformLoader/SystemLoggerInPlatformLoader.java b/test/jdk/java/lang/System/LoggerFinder/internal/SystemLoggerInPlatformLoader/SystemLoggerInPlatformLoader.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/SystemLoggerInPlatformLoader/SystemLoggerInPlatformLoader.java rename to test/jdk/java/lang/System/LoggerFinder/internal/SystemLoggerInPlatformLoader/SystemLoggerInPlatformLoader.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/SystemLoggerInPlatformLoader/systempkg/log/SystemLoggerAccessor.java b/test/jdk/java/lang/System/LoggerFinder/internal/SystemLoggerInPlatformLoader/systempkg/log/SystemLoggerAccessor.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/SystemLoggerInPlatformLoader/systempkg/log/SystemLoggerAccessor.java rename to test/jdk/java/lang/System/LoggerFinder/internal/SystemLoggerInPlatformLoader/systempkg/log/SystemLoggerAccessor.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/api/LoggerFinderAPITest.java b/test/jdk/java/lang/System/LoggerFinder/internal/api/LoggerFinderAPITest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/api/LoggerFinderAPITest.java rename to test/jdk/java/lang/System/LoggerFinder/internal/api/LoggerFinderAPITest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/backend/LoggerFinderBackendTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/backend/LoggerFinderBackendTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/backend/LoggerFinderBackendTest.java rename to test/jdk/java/lang/System/LoggerFinder/internal/backend/LoggerFinderBackendTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/backend/META-INF/services/java.lang.System$LoggerFinder b/test/jdk/java/lang/System/LoggerFinder/internal/backend/META-INF/services/java.lang.System$LoggerFinder similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/backend/META-INF/services/java.lang.System$LoggerFinder rename to test/jdk/java/lang/System/LoggerFinder/internal/backend/META-INF/services/java.lang.System$LoggerFinder diff --git a/jdk/test/java/lang/System/LoggerFinder/internal/backend/SystemClassLoader.java b/test/jdk/java/lang/System/LoggerFinder/internal/backend/SystemClassLoader.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/internal/backend/SystemClassLoader.java rename to test/jdk/java/lang/System/LoggerFinder/internal/backend/SystemClassLoader.java diff --git a/jdk/test/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java b/test/jdk/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java rename to test/jdk/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java b/test/jdk/java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java rename to test/jdk/java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/Base.java b/test/jdk/java/lang/System/LoggerFinder/modules/Base.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/Base.java rename to test/jdk/java/lang/System/LoggerFinder/modules/Base.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/JDKLoggerForImageTest.java b/test/jdk/java/lang/System/LoggerFinder/modules/JDKLoggerForImageTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/JDKLoggerForImageTest.java rename to test/jdk/java/lang/System/LoggerFinder/modules/JDKLoggerForImageTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/JDKLoggerForJDKTest.java b/test/jdk/java/lang/System/LoggerFinder/modules/JDKLoggerForJDKTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/JDKLoggerForJDKTest.java rename to test/jdk/java/lang/System/LoggerFinder/modules/JDKLoggerForJDKTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/LoggerInImageTest.java b/test/jdk/java/lang/System/LoggerFinder/modules/LoggerInImageTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/LoggerInImageTest.java rename to test/jdk/java/lang/System/LoggerFinder/modules/LoggerInImageTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/NamedLoggerForImageTest.java b/test/jdk/java/lang/System/LoggerFinder/modules/NamedLoggerForImageTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/NamedLoggerForImageTest.java rename to test/jdk/java/lang/System/LoggerFinder/modules/NamedLoggerForImageTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/NamedLoggerForJDKTest.java b/test/jdk/java/lang/System/LoggerFinder/modules/NamedLoggerForJDKTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/NamedLoggerForJDKTest.java rename to test/jdk/java/lang/System/LoggerFinder/modules/NamedLoggerForJDKTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/UnnamedLoggerForImageTest.java b/test/jdk/java/lang/System/LoggerFinder/modules/UnnamedLoggerForImageTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/UnnamedLoggerForImageTest.java rename to test/jdk/java/lang/System/LoggerFinder/modules/UnnamedLoggerForImageTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/UnnamedLoggerForJDKTest.java b/test/jdk/java/lang/System/LoggerFinder/modules/UnnamedLoggerForJDKTest.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/UnnamedLoggerForJDKTest.java rename to test/jdk/java/lang/System/LoggerFinder/modules/UnnamedLoggerForJDKTest.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/boot_client/BootClient.java b/test/jdk/java/lang/System/LoggerFinder/modules/boot_client/BootClient.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/boot_client/BootClient.java rename to test/jdk/java/lang/System/LoggerFinder/modules/boot_client/BootClient.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/boot_usage/BootUsage.java b/test/jdk/java/lang/System/LoggerFinder/modules/boot_usage/BootUsage.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/boot_usage/BootUsage.java rename to test/jdk/java/lang/System/LoggerFinder/modules/boot_usage/BootUsage.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/named_client/m.t.a/module-info.java b/test/jdk/java/lang/System/LoggerFinder/modules/named_client/m.t.a/module-info.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/named_client/m.t.a/module-info.java rename to test/jdk/java/lang/System/LoggerFinder/modules/named_client/m.t.a/module-info.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/named_client/m.t.a/pkg/a/t/TestA.java b/test/jdk/java/lang/System/LoggerFinder/modules/named_client/m.t.a/pkg/a/t/TestA.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/named_client/m.t.a/pkg/a/t/TestA.java rename to test/jdk/java/lang/System/LoggerFinder/modules/named_client/m.t.a/pkg/a/t/TestA.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/named_logger/m.l.a/module-info.java b/test/jdk/java/lang/System/LoggerFinder/modules/named_logger/m.l.a/module-info.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/named_logger/m.l.a/module-info.java rename to test/jdk/java/lang/System/LoggerFinder/modules/named_logger/m.l.a/module-info.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/named_logger/m.l.a/pkg/a/l/LoggerA.java b/test/jdk/java/lang/System/LoggerFinder/modules/named_logger/m.l.a/pkg/a/l/LoggerA.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/named_logger/m.l.a/pkg/a/l/LoggerA.java rename to test/jdk/java/lang/System/LoggerFinder/modules/named_logger/m.l.a/pkg/a/l/LoggerA.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/named_logger/m.l.a/pkg/a/p/LoggerFinderA.java b/test/jdk/java/lang/System/LoggerFinder/modules/named_logger/m.l.a/pkg/a/p/LoggerFinderA.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/named_logger/m.l.a/pkg/a/p/LoggerFinderA.java rename to test/jdk/java/lang/System/LoggerFinder/modules/named_logger/m.l.a/pkg/a/p/LoggerFinderA.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/patched_client/PatchedClient.java b/test/jdk/java/lang/System/LoggerFinder/modules/patched_client/PatchedClient.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/patched_client/PatchedClient.java rename to test/jdk/java/lang/System/LoggerFinder/modules/patched_client/PatchedClient.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/patched_usage/java.base/java/lang/PatchedUsage.java b/test/jdk/java/lang/System/LoggerFinder/modules/patched_usage/java.base/java/lang/PatchedUsage.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/patched_usage/java.base/java/lang/PatchedUsage.java rename to test/jdk/java/lang/System/LoggerFinder/modules/patched_usage/java.base/java/lang/PatchedUsage.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/unnamed_client/pkg/b/t/TestB.java b/test/jdk/java/lang/System/LoggerFinder/modules/unnamed_client/pkg/b/t/TestB.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/unnamed_client/pkg/b/t/TestB.java rename to test/jdk/java/lang/System/LoggerFinder/modules/unnamed_client/pkg/b/t/TestB.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/unnamed_logger/META-INF/services/java.lang.System$LoggerFinder b/test/jdk/java/lang/System/LoggerFinder/modules/unnamed_logger/META-INF/services/java.lang.System$LoggerFinder similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/unnamed_logger/META-INF/services/java.lang.System$LoggerFinder rename to test/jdk/java/lang/System/LoggerFinder/modules/unnamed_logger/META-INF/services/java.lang.System$LoggerFinder diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/unnamed_logger/pkg/b/l/LoggerB.java b/test/jdk/java/lang/System/LoggerFinder/modules/unnamed_logger/pkg/b/l/LoggerB.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/unnamed_logger/pkg/b/l/LoggerB.java rename to test/jdk/java/lang/System/LoggerFinder/modules/unnamed_logger/pkg/b/l/LoggerB.java diff --git a/jdk/test/java/lang/System/LoggerFinder/modules/unnamed_logger/pkg/b/p/LoggerFinderB.java b/test/jdk/java/lang/System/LoggerFinder/modules/unnamed_logger/pkg/b/p/LoggerFinderB.java similarity index 100% rename from jdk/test/java/lang/System/LoggerFinder/modules/unnamed_logger/pkg/b/p/LoggerFinderB.java rename to test/jdk/java/lang/System/LoggerFinder/modules/unnamed_logger/pkg/b/p/LoggerFinderB.java diff --git a/jdk/test/java/lang/System/MacEncoding/ExpectedEncoding.java b/test/jdk/java/lang/System/MacEncoding/ExpectedEncoding.java similarity index 100% rename from jdk/test/java/lang/System/MacEncoding/ExpectedEncoding.java rename to test/jdk/java/lang/System/MacEncoding/ExpectedEncoding.java diff --git a/jdk/test/java/lang/System/MacEncoding/MacJNUEncoding.java b/test/jdk/java/lang/System/MacEncoding/MacJNUEncoding.java similarity index 100% rename from jdk/test/java/lang/System/MacEncoding/MacJNUEncoding.java rename to test/jdk/java/lang/System/MacEncoding/MacJNUEncoding.java diff --git a/jdk/test/java/lang/System/MacEncoding/TestFileEncoding.java b/test/jdk/java/lang/System/MacEncoding/TestFileEncoding.java similarity index 100% rename from jdk/test/java/lang/System/MacEncoding/TestFileEncoding.java rename to test/jdk/java/lang/System/MacEncoding/TestFileEncoding.java diff --git a/jdk/test/java/lang/System/OsVersionTest.java b/test/jdk/java/lang/System/OsVersionTest.java similarity index 100% rename from jdk/test/java/lang/System/OsVersionTest.java rename to test/jdk/java/lang/System/OsVersionTest.java diff --git a/jdk/test/java/lang/System/SecurityRace.java b/test/jdk/java/lang/System/SecurityRace.java similarity index 100% rename from jdk/test/java/lang/System/SecurityRace.java rename to test/jdk/java/lang/System/SecurityRace.java diff --git a/jdk/test/java/lang/System/SetPropertiesNull.java b/test/jdk/java/lang/System/SetPropertiesNull.java similarity index 100% rename from jdk/test/java/lang/System/SetPropertiesNull.java rename to test/jdk/java/lang/System/SetPropertiesNull.java diff --git a/jdk/test/java/lang/System/System.policy b/test/jdk/java/lang/System/System.policy similarity index 100% rename from jdk/test/java/lang/System/System.policy rename to test/jdk/java/lang/System/System.policy diff --git a/jdk/test/java/lang/System/Versions.java b/test/jdk/java/lang/System/Versions.java similarity index 100% rename from jdk/test/java/lang/System/Versions.java rename to test/jdk/java/lang/System/Versions.java diff --git a/jdk/test/java/lang/System/finalization/FinExit.java b/test/jdk/java/lang/System/finalization/FinExit.java similarity index 100% rename from jdk/test/java/lang/System/finalization/FinExit.java rename to test/jdk/java/lang/System/finalization/FinExit.java diff --git a/jdk/test/java/lang/System/finalization/FinExit.sh b/test/jdk/java/lang/System/finalization/FinExit.sh similarity index 100% rename from jdk/test/java/lang/System/finalization/FinExit.sh rename to test/jdk/java/lang/System/finalization/FinExit.sh diff --git a/jdk/test/java/lang/System/finalization/FinInterrupt.java b/test/jdk/java/lang/System/finalization/FinInterrupt.java similarity index 100% rename from jdk/test/java/lang/System/finalization/FinInterrupt.java rename to test/jdk/java/lang/System/finalization/FinInterrupt.java diff --git a/jdk/test/java/lang/System/finalization/FinThreads.java b/test/jdk/java/lang/System/finalization/FinThreads.java similarity index 100% rename from jdk/test/java/lang/System/finalization/FinThreads.java rename to test/jdk/java/lang/System/finalization/FinThreads.java diff --git a/jdk/test/java/lang/Thread/GenerifyStackTraces.java b/test/jdk/java/lang/Thread/GenerifyStackTraces.java similarity index 100% rename from jdk/test/java/lang/Thread/GenerifyStackTraces.java rename to test/jdk/java/lang/Thread/GenerifyStackTraces.java diff --git a/jdk/test/java/lang/Thread/HoldsLock.java b/test/jdk/java/lang/Thread/HoldsLock.java similarity index 100% rename from jdk/test/java/lang/Thread/HoldsLock.java rename to test/jdk/java/lang/Thread/HoldsLock.java diff --git a/jdk/test/java/lang/Thread/ITLConstructor.java b/test/jdk/java/lang/Thread/ITLConstructor.java similarity index 100% rename from jdk/test/java/lang/Thread/ITLConstructor.java rename to test/jdk/java/lang/Thread/ITLConstructor.java diff --git a/jdk/test/java/lang/Thread/MainThreadTest.java b/test/jdk/java/lang/Thread/MainThreadTest.java similarity index 100% rename from jdk/test/java/lang/Thread/MainThreadTest.java rename to test/jdk/java/lang/Thread/MainThreadTest.java diff --git a/jdk/test/java/lang/Thread/NullStackTrace.java b/test/jdk/java/lang/Thread/NullStackTrace.java similarity index 100% rename from jdk/test/java/lang/Thread/NullStackTrace.java rename to test/jdk/java/lang/Thread/NullStackTrace.java diff --git a/jdk/test/java/lang/Thread/StartOOMTest.java b/test/jdk/java/lang/Thread/StartOOMTest.java similarity index 100% rename from jdk/test/java/lang/Thread/StartOOMTest.java rename to test/jdk/java/lang/Thread/StartOOMTest.java diff --git a/jdk/test/java/lang/Thread/StopThrowable.java b/test/jdk/java/lang/Thread/StopThrowable.java similarity index 100% rename from jdk/test/java/lang/Thread/StopThrowable.java rename to test/jdk/java/lang/Thread/StopThrowable.java diff --git a/jdk/test/java/lang/Thread/ThreadStateController.java b/test/jdk/java/lang/Thread/ThreadStateController.java similarity index 100% rename from jdk/test/java/lang/Thread/ThreadStateController.java rename to test/jdk/java/lang/Thread/ThreadStateController.java diff --git a/jdk/test/java/lang/Thread/ThreadStateTest.java b/test/jdk/java/lang/Thread/ThreadStateTest.java similarity index 100% rename from jdk/test/java/lang/Thread/ThreadStateTest.java rename to test/jdk/java/lang/Thread/ThreadStateTest.java diff --git a/jdk/test/java/lang/Thread/UncaughtExceptions.sh b/test/jdk/java/lang/Thread/UncaughtExceptions.sh similarity index 100% rename from jdk/test/java/lang/Thread/UncaughtExceptions.sh rename to test/jdk/java/lang/Thread/UncaughtExceptions.sh diff --git a/jdk/test/java/lang/ThreadGroup/Daemon.java b/test/jdk/java/lang/ThreadGroup/Daemon.java similarity index 100% rename from jdk/test/java/lang/ThreadGroup/Daemon.java rename to test/jdk/java/lang/ThreadGroup/Daemon.java diff --git a/jdk/test/java/lang/ThreadGroup/NullThreadName.java b/test/jdk/java/lang/ThreadGroup/NullThreadName.java similarity index 100% rename from jdk/test/java/lang/ThreadGroup/NullThreadName.java rename to test/jdk/java/lang/ThreadGroup/NullThreadName.java diff --git a/jdk/test/java/lang/ThreadGroup/SetMaxPriority.java b/test/jdk/java/lang/ThreadGroup/SetMaxPriority.java similarity index 100% rename from jdk/test/java/lang/ThreadGroup/SetMaxPriority.java rename to test/jdk/java/lang/ThreadGroup/SetMaxPriority.java diff --git a/jdk/test/java/lang/ThreadGroup/Stop.java b/test/jdk/java/lang/ThreadGroup/Stop.java similarity index 100% rename from jdk/test/java/lang/ThreadGroup/Stop.java rename to test/jdk/java/lang/ThreadGroup/Stop.java diff --git a/jdk/test/java/lang/ThreadGroup/Suspend.java b/test/jdk/java/lang/ThreadGroup/Suspend.java similarity index 100% rename from jdk/test/java/lang/ThreadGroup/Suspend.java rename to test/jdk/java/lang/ThreadGroup/Suspend.java diff --git a/jdk/test/java/lang/ThreadLocal/Basic.java b/test/jdk/java/lang/ThreadLocal/Basic.java similarity index 100% rename from jdk/test/java/lang/ThreadLocal/Basic.java rename to test/jdk/java/lang/ThreadLocal/Basic.java diff --git a/jdk/test/java/lang/ThreadLocal/ImmutableLocal.java b/test/jdk/java/lang/ThreadLocal/ImmutableLocal.java similarity index 100% rename from jdk/test/java/lang/ThreadLocal/ImmutableLocal.java rename to test/jdk/java/lang/ThreadLocal/ImmutableLocal.java diff --git a/jdk/test/java/lang/ThreadLocal/InitialValue.java b/test/jdk/java/lang/ThreadLocal/InitialValue.java similarity index 100% rename from jdk/test/java/lang/ThreadLocal/InitialValue.java rename to test/jdk/java/lang/ThreadLocal/InitialValue.java diff --git a/jdk/test/java/lang/ThreadLocal/MemoryLeak.java b/test/jdk/java/lang/ThreadLocal/MemoryLeak.java similarity index 100% rename from jdk/test/java/lang/ThreadLocal/MemoryLeak.java rename to test/jdk/java/lang/ThreadLocal/MemoryLeak.java diff --git a/jdk/test/java/lang/ThreadLocal/TLRemoveTest.java b/test/jdk/java/lang/ThreadLocal/TLRemoveTest.java similarity index 100% rename from jdk/test/java/lang/ThreadLocal/TLRemoveTest.java rename to test/jdk/java/lang/ThreadLocal/TLRemoveTest.java diff --git a/jdk/test/java/lang/ThreadLocal/TestThreadId.java b/test/jdk/java/lang/ThreadLocal/TestThreadId.java similarity index 100% rename from jdk/test/java/lang/ThreadLocal/TestThreadId.java rename to test/jdk/java/lang/ThreadLocal/TestThreadId.java diff --git a/jdk/test/java/lang/ThreadLocal/ThreadId.java b/test/jdk/java/lang/ThreadLocal/ThreadId.java similarity index 100% rename from jdk/test/java/lang/ThreadLocal/ThreadId.java rename to test/jdk/java/lang/ThreadLocal/ThreadId.java diff --git a/jdk/test/java/lang/ThreadLocal/ThreadLocalSupplierTest.java b/test/jdk/java/lang/ThreadLocal/ThreadLocalSupplierTest.java similarity index 100% rename from jdk/test/java/lang/ThreadLocal/ThreadLocalSupplierTest.java rename to test/jdk/java/lang/ThreadLocal/ThreadLocalSupplierTest.java diff --git a/jdk/test/java/lang/Throwable/ChainedExceptions.java b/test/jdk/java/lang/Throwable/ChainedExceptions.java similarity index 100% rename from jdk/test/java/lang/Throwable/ChainedExceptions.java rename to test/jdk/java/lang/Throwable/ChainedExceptions.java diff --git a/jdk/test/java/lang/Throwable/LegacyChainedExceptionSerialization.java b/test/jdk/java/lang/Throwable/LegacyChainedExceptionSerialization.java similarity index 100% rename from jdk/test/java/lang/Throwable/LegacyChainedExceptionSerialization.java rename to test/jdk/java/lang/Throwable/LegacyChainedExceptionSerialization.java diff --git a/jdk/test/java/lang/Throwable/LocalizedMessage.java b/test/jdk/java/lang/Throwable/LocalizedMessage.java similarity index 100% rename from jdk/test/java/lang/Throwable/LocalizedMessage.java rename to test/jdk/java/lang/Throwable/LocalizedMessage.java diff --git a/jdk/test/java/lang/Throwable/NewChainedExceptions.java b/test/jdk/java/lang/Throwable/NewChainedExceptions.java similarity index 100% rename from jdk/test/java/lang/Throwable/NewChainedExceptions.java rename to test/jdk/java/lang/Throwable/NewChainedExceptions.java diff --git a/jdk/test/java/lang/Throwable/StackTraceSerialization.java b/test/jdk/java/lang/Throwable/StackTraceSerialization.java similarity index 100% rename from jdk/test/java/lang/Throwable/StackTraceSerialization.java rename to test/jdk/java/lang/Throwable/StackTraceSerialization.java diff --git a/jdk/test/java/lang/Throwable/SuppressedExceptions.java b/test/jdk/java/lang/Throwable/SuppressedExceptions.java similarity index 100% rename from jdk/test/java/lang/Throwable/SuppressedExceptions.java rename to test/jdk/java/lang/Throwable/SuppressedExceptions.java diff --git a/jdk/test/java/lang/ToString.java b/test/jdk/java/lang/ToString.java similarity index 100% rename from jdk/test/java/lang/ToString.java rename to test/jdk/java/lang/ToString.java diff --git a/jdk/test/java/lang/WeakPairMap/Driver.java b/test/jdk/java/lang/WeakPairMap/Driver.java similarity index 100% rename from jdk/test/java/lang/WeakPairMap/Driver.java rename to test/jdk/java/lang/WeakPairMap/Driver.java diff --git a/jdk/test/java/lang/WeakPairMap/java.base/java/lang/WeakPairMapTest.java b/test/jdk/java/lang/WeakPairMap/java.base/java/lang/WeakPairMapTest.java similarity index 100% rename from jdk/test/java/lang/WeakPairMap/java.base/java/lang/WeakPairMapTest.java rename to test/jdk/java/lang/WeakPairMap/java.base/java/lang/WeakPairMapTest.java diff --git a/jdk/test/java/lang/annotation/AnnotationToStringTest.java b/test/jdk/java/lang/annotation/AnnotationToStringTest.java similarity index 100% rename from jdk/test/java/lang/annotation/AnnotationToStringTest.java rename to test/jdk/java/lang/annotation/AnnotationToStringTest.java diff --git a/jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java b/test/jdk/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java similarity index 100% rename from jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java rename to test/jdk/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java diff --git a/jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeRuntimeAssumptionTest.java b/test/jdk/java/lang/annotation/AnnotationType/AnnotationTypeRuntimeAssumptionTest.java similarity index 100% rename from jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeRuntimeAssumptionTest.java rename to test/jdk/java/lang/annotation/AnnotationType/AnnotationTypeRuntimeAssumptionTest.java diff --git a/jdk/test/java/lang/annotation/AnnotationTypeMismatchException/FoundType.java b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/FoundType.java similarity index 100% rename from jdk/test/java/lang/annotation/AnnotationTypeMismatchException/FoundType.java rename to test/jdk/java/lang/annotation/AnnotationTypeMismatchException/FoundType.java diff --git a/jdk/test/java/lang/annotation/AnnotationVerifier.java b/test/jdk/java/lang/annotation/AnnotationVerifier.java similarity index 100% rename from jdk/test/java/lang/annotation/AnnotationVerifier.java rename to test/jdk/java/lang/annotation/AnnotationVerifier.java diff --git a/jdk/test/java/lang/annotation/AnnotationWithLambda.java b/test/jdk/java/lang/annotation/AnnotationWithLambda.java similarity index 100% rename from jdk/test/java/lang/annotation/AnnotationWithLambda.java rename to test/jdk/java/lang/annotation/AnnotationWithLambda.java diff --git a/jdk/test/java/lang/annotation/AnnotationsInheritanceOrderRedefinitionTest.java b/test/jdk/java/lang/annotation/AnnotationsInheritanceOrderRedefinitionTest.java similarity index 100% rename from jdk/test/java/lang/annotation/AnnotationsInheritanceOrderRedefinitionTest.java rename to test/jdk/java/lang/annotation/AnnotationsInheritanceOrderRedefinitionTest.java diff --git a/jdk/test/java/lang/annotation/ClassFileGenerator.java b/test/jdk/java/lang/annotation/ClassFileGenerator.java similarity index 100% rename from jdk/test/java/lang/annotation/ClassFileGenerator.java rename to test/jdk/java/lang/annotation/ClassFileGenerator.java diff --git a/jdk/test/java/lang/annotation/EqualityTest.java b/test/jdk/java/lang/annotation/EqualityTest.java similarity index 100% rename from jdk/test/java/lang/annotation/EqualityTest.java rename to test/jdk/java/lang/annotation/EqualityTest.java diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/AnnotationHost.java b/test/jdk/java/lang/annotation/ExceptionalToString/AnnotationHost.java similarity index 100% rename from jdk/test/java/lang/annotation/ExceptionalToString/AnnotationHost.java rename to test/jdk/java/lang/annotation/ExceptionalToString/AnnotationHost.java diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java b/test/jdk/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java similarity index 100% rename from jdk/test/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java rename to test/jdk/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java b/test/jdk/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java similarity index 100% rename from jdk/test/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java rename to test/jdk/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version1/Fleeting.java b/test/jdk/java/lang/annotation/ExceptionalToString/version1/Fleeting.java similarity index 100% rename from jdk/test/java/lang/annotation/ExceptionalToString/version1/Fleeting.java rename to test/jdk/java/lang/annotation/ExceptionalToString/version1/Fleeting.java diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version1/Utopia.java b/test/jdk/java/lang/annotation/ExceptionalToString/version1/Utopia.java similarity index 100% rename from jdk/test/java/lang/annotation/ExceptionalToString/version1/Utopia.java rename to test/jdk/java/lang/annotation/ExceptionalToString/version1/Utopia.java diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java b/test/jdk/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java similarity index 100% rename from jdk/test/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java rename to test/jdk/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version2/Utopia.java b/test/jdk/java/lang/annotation/ExceptionalToString/version2/Utopia.java similarity index 100% rename from jdk/test/java/lang/annotation/ExceptionalToString/version2/Utopia.java rename to test/jdk/java/lang/annotation/ExceptionalToString/version2/Utopia.java diff --git a/jdk/test/java/lang/annotation/GoodAnnotation.java b/test/jdk/java/lang/annotation/GoodAnnotation.java similarity index 100% rename from jdk/test/java/lang/annotation/GoodAnnotation.java rename to test/jdk/java/lang/annotation/GoodAnnotation.java diff --git a/jdk/test/java/lang/annotation/Missing/A.java b/test/jdk/java/lang/annotation/Missing/A.java similarity index 100% rename from jdk/test/java/lang/annotation/Missing/A.java rename to test/jdk/java/lang/annotation/Missing/A.java diff --git a/jdk/test/java/lang/annotation/Missing/B.java b/test/jdk/java/lang/annotation/Missing/B.java similarity index 100% rename from jdk/test/java/lang/annotation/Missing/B.java rename to test/jdk/java/lang/annotation/Missing/B.java diff --git a/jdk/test/java/lang/annotation/Missing/C.java b/test/jdk/java/lang/annotation/Missing/C.java similarity index 100% rename from jdk/test/java/lang/annotation/Missing/C.java rename to test/jdk/java/lang/annotation/Missing/C.java diff --git a/jdk/test/java/lang/annotation/Missing/D.java b/test/jdk/java/lang/annotation/Missing/D.java similarity index 100% rename from jdk/test/java/lang/annotation/Missing/D.java rename to test/jdk/java/lang/annotation/Missing/D.java diff --git a/jdk/test/java/lang/annotation/Missing/Marker.java b/test/jdk/java/lang/annotation/Missing/Marker.java similarity index 100% rename from jdk/test/java/lang/annotation/Missing/Marker.java rename to test/jdk/java/lang/annotation/Missing/Marker.java diff --git a/jdk/test/java/lang/annotation/Missing/Missing.java b/test/jdk/java/lang/annotation/Missing/Missing.java similarity index 100% rename from jdk/test/java/lang/annotation/Missing/Missing.java rename to test/jdk/java/lang/annotation/Missing/Missing.java diff --git a/jdk/test/java/lang/annotation/Missing/MissingDefault.java b/test/jdk/java/lang/annotation/Missing/MissingDefault.java similarity index 100% rename from jdk/test/java/lang/annotation/Missing/MissingDefault.java rename to test/jdk/java/lang/annotation/Missing/MissingDefault.java diff --git a/jdk/test/java/lang/annotation/Missing/MissingTest.java b/test/jdk/java/lang/annotation/Missing/MissingTest.java similarity index 100% rename from jdk/test/java/lang/annotation/Missing/MissingTest.java rename to test/jdk/java/lang/annotation/Missing/MissingTest.java diff --git a/jdk/test/java/lang/annotation/Missing/MissingWrapper.java b/test/jdk/java/lang/annotation/Missing/MissingWrapper.java similarity index 100% rename from jdk/test/java/lang/annotation/Missing/MissingWrapper.java rename to test/jdk/java/lang/annotation/Missing/MissingWrapper.java diff --git a/jdk/test/java/lang/annotation/PackageMain.java b/test/jdk/java/lang/annotation/PackageMain.java similarity index 100% rename from jdk/test/java/lang/annotation/PackageMain.java rename to test/jdk/java/lang/annotation/PackageMain.java diff --git a/jdk/test/java/lang/annotation/ParameterAnnotations.java b/test/jdk/java/lang/annotation/ParameterAnnotations.java similarity index 100% rename from jdk/test/java/lang/annotation/ParameterAnnotations.java rename to test/jdk/java/lang/annotation/ParameterAnnotations.java diff --git a/jdk/test/java/lang/annotation/RecursiveAnnotation.java b/test/jdk/java/lang/annotation/RecursiveAnnotation.java similarity index 100% rename from jdk/test/java/lang/annotation/RecursiveAnnotation.java rename to test/jdk/java/lang/annotation/RecursiveAnnotation.java diff --git a/jdk/test/java/lang/annotation/TestConstructorParameterAnnotations.java b/test/jdk/java/lang/annotation/TestConstructorParameterAnnotations.java similarity index 100% rename from jdk/test/java/lang/annotation/TestConstructorParameterAnnotations.java rename to test/jdk/java/lang/annotation/TestConstructorParameterAnnotations.java diff --git a/jdk/test/java/lang/annotation/TestIncompleteAnnotationExceptionNPE.java b/test/jdk/java/lang/annotation/TestIncompleteAnnotationExceptionNPE.java similarity index 100% rename from jdk/test/java/lang/annotation/TestIncompleteAnnotationExceptionNPE.java rename to test/jdk/java/lang/annotation/TestIncompleteAnnotationExceptionNPE.java diff --git a/jdk/test/java/lang/annotation/TypeAnnotationReflection.java b/test/jdk/java/lang/annotation/TypeAnnotationReflection.java similarity index 100% rename from jdk/test/java/lang/annotation/TypeAnnotationReflection.java rename to test/jdk/java/lang/annotation/TypeAnnotationReflection.java diff --git a/jdk/test/java/lang/annotation/TypeParamAnnotation.java b/test/jdk/java/lang/annotation/TypeParamAnnotation.java similarity index 100% rename from jdk/test/java/lang/annotation/TypeParamAnnotation.java rename to test/jdk/java/lang/annotation/TypeParamAnnotation.java diff --git a/jdk/test/java/lang/annotation/TypeVariableBounds.java b/test/jdk/java/lang/annotation/TypeVariableBounds.java similarity index 100% rename from jdk/test/java/lang/annotation/TypeVariableBounds.java rename to test/jdk/java/lang/annotation/TypeVariableBounds.java diff --git a/jdk/test/java/lang/annotation/UnitTest.java b/test/jdk/java/lang/annotation/UnitTest.java similarity index 100% rename from jdk/test/java/lang/annotation/UnitTest.java rename to test/jdk/java/lang/annotation/UnitTest.java diff --git a/jdk/test/java/lang/annotation/loaderLeak/A.java b/test/jdk/java/lang/annotation/loaderLeak/A.java similarity index 100% rename from jdk/test/java/lang/annotation/loaderLeak/A.java rename to test/jdk/java/lang/annotation/loaderLeak/A.java diff --git a/jdk/test/java/lang/annotation/loaderLeak/B.java b/test/jdk/java/lang/annotation/loaderLeak/B.java similarity index 100% rename from jdk/test/java/lang/annotation/loaderLeak/B.java rename to test/jdk/java/lang/annotation/loaderLeak/B.java diff --git a/jdk/test/java/lang/annotation/loaderLeak/C.java b/test/jdk/java/lang/annotation/loaderLeak/C.java similarity index 100% rename from jdk/test/java/lang/annotation/loaderLeak/C.java rename to test/jdk/java/lang/annotation/loaderLeak/C.java diff --git a/jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh b/test/jdk/java/lang/annotation/loaderLeak/LoaderLeak.sh similarity index 100% rename from jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh rename to test/jdk/java/lang/annotation/loaderLeak/LoaderLeak.sh diff --git a/jdk/test/java/lang/annotation/loaderLeak/Main.java b/test/jdk/java/lang/annotation/loaderLeak/Main.java similarity index 100% rename from jdk/test/java/lang/annotation/loaderLeak/Main.java rename to test/jdk/java/lang/annotation/loaderLeak/Main.java diff --git a/jdk/test/java/lang/annotation/package-info.java b/test/jdk/java/lang/annotation/package-info.java similarity index 100% rename from jdk/test/java/lang/annotation/package-info.java rename to test/jdk/java/lang/annotation/package-info.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/CustomRepeatingWithSecurityManager.java b/test/jdk/java/lang/annotation/repeatingAnnotations/CustomRepeatingWithSecurityManager.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/CustomRepeatingWithSecurityManager.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/CustomRepeatingWithSecurityManager.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/InheritedAssociatedAnnotations.java b/test/jdk/java/lang/annotation/repeatingAnnotations/InheritedAssociatedAnnotations.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/InheritedAssociatedAnnotations.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/InheritedAssociatedAnnotations.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/NonInheritableContainee.java b/test/jdk/java/lang/annotation/repeatingAnnotations/NonInheritableContainee.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/NonInheritableContainee.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/NonInheritableContainee.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/OrderUnitTest.java b/test/jdk/java/lang/annotation/repeatingAnnotations/OrderUnitTest.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/OrderUnitTest.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/OrderUnitTest.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/RepeatedUnitTest.java b/test/jdk/java/lang/annotation/repeatingAnnotations/RepeatedUnitTest.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/RepeatedUnitTest.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/RepeatedUnitTest.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/RepeatingWithSecurityManager.java b/test/jdk/java/lang/annotation/repeatingAnnotations/RepeatingWithSecurityManager.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/RepeatingWithSecurityManager.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/RepeatingWithSecurityManager.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/Containee.java b/test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/Containee.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/Containee.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/Containee.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/Container.java b/test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/Container.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/Container.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/Container.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainee.java b/test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainee.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainee.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainee.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainer.java b/test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainer.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainer.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainer.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedNonRepeated.java b/test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/InheritedNonRepeated.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedNonRepeated.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/InheritedNonRepeated.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/NonRepeated.java b/test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/NonRepeated.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/NonRepeated.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/NonRepeated.java diff --git a/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/package-info.java b/test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/package-info.java similarity index 100% rename from jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/package-info.java rename to test/jdk/java/lang/annotation/repeatingAnnotations/subpackage/package-info.java diff --git a/jdk/test/java/lang/annotation/typeAnnotations/BadCPIndex.java b/test/jdk/java/lang/annotation/typeAnnotations/BadCPIndex.java similarity index 100% rename from jdk/test/java/lang/annotation/typeAnnotations/BadCPIndex.java rename to test/jdk/java/lang/annotation/typeAnnotations/BadCPIndex.java diff --git a/jdk/test/java/lang/annotation/typeAnnotations/ConstructorReceiverTest.java b/test/jdk/java/lang/annotation/typeAnnotations/ConstructorReceiverTest.java similarity index 100% rename from jdk/test/java/lang/annotation/typeAnnotations/ConstructorReceiverTest.java rename to test/jdk/java/lang/annotation/typeAnnotations/ConstructorReceiverTest.java diff --git a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedInterfaces.java b/test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedInterfaces.java similarity index 100% rename from jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedInterfaces.java rename to test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedInterfaces.java diff --git a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedOwnerType.java b/test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedOwnerType.java similarity index 100% rename from jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedOwnerType.java rename to test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedOwnerType.java diff --git a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java b/test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java similarity index 100% rename from jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java rename to test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java diff --git a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedSuperclass.java b/test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedSuperclass.java similarity index 100% rename from jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedSuperclass.java rename to test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedSuperclass.java diff --git a/jdk/test/java/lang/annotation/typeAnnotations/MissingAnnotation.java b/test/jdk/java/lang/annotation/typeAnnotations/MissingAnnotation.java similarity index 100% rename from jdk/test/java/lang/annotation/typeAnnotations/MissingAnnotation.java rename to test/jdk/java/lang/annotation/typeAnnotations/MissingAnnotation.java diff --git a/jdk/test/java/lang/annotation/typeAnnotations/NoNpeOnMissingAnnotation.java b/test/jdk/java/lang/annotation/typeAnnotations/NoNpeOnMissingAnnotation.java similarity index 100% rename from jdk/test/java/lang/annotation/typeAnnotations/NoNpeOnMissingAnnotation.java rename to test/jdk/java/lang/annotation/typeAnnotations/NoNpeOnMissingAnnotation.java diff --git a/jdk/test/java/lang/annotation/typeAnnotations/TestConstructorParameterTypeAnnotations.java b/test/jdk/java/lang/annotation/typeAnnotations/TestConstructorParameterTypeAnnotations.java similarity index 100% rename from jdk/test/java/lang/annotation/typeAnnotations/TestConstructorParameterTypeAnnotations.java rename to test/jdk/java/lang/annotation/typeAnnotations/TestConstructorParameterTypeAnnotations.java diff --git a/jdk/test/java/lang/annotation/typeAnnotations/TestExecutableGetAnnotatedType.java b/test/jdk/java/lang/annotation/typeAnnotations/TestExecutableGetAnnotatedType.java similarity index 100% rename from jdk/test/java/lang/annotation/typeAnnotations/TestExecutableGetAnnotatedType.java rename to test/jdk/java/lang/annotation/typeAnnotations/TestExecutableGetAnnotatedType.java diff --git a/jdk/test/java/lang/instrument/AInstrumentationTestCase.java b/test/jdk/java/lang/instrument/AInstrumentationTestCase.java similarity index 100% rename from jdk/test/java/lang/instrument/AInstrumentationTestCase.java rename to test/jdk/java/lang/instrument/AInstrumentationTestCase.java diff --git a/jdk/test/java/lang/instrument/ASimpleInstrumentationTestCase.java b/test/jdk/java/lang/instrument/ASimpleInstrumentationTestCase.java similarity index 100% rename from jdk/test/java/lang/instrument/ASimpleInstrumentationTestCase.java rename to test/jdk/java/lang/instrument/ASimpleInstrumentationTestCase.java diff --git a/jdk/test/java/lang/instrument/ATestCaseScaffold.java b/test/jdk/java/lang/instrument/ATestCaseScaffold.java similarity index 100% rename from jdk/test/java/lang/instrument/ATestCaseScaffold.java rename to test/jdk/java/lang/instrument/ATestCaseScaffold.java diff --git a/jdk/test/java/lang/instrument/ATransformerManagementTestCase.java b/test/jdk/java/lang/instrument/ATransformerManagementTestCase.java similarity index 100% rename from jdk/test/java/lang/instrument/ATransformerManagementTestCase.java rename to test/jdk/java/lang/instrument/ATransformerManagementTestCase.java diff --git a/jdk/test/java/lang/instrument/AddTransformerTest.java b/test/jdk/java/lang/instrument/AddTransformerTest.java similarity index 100% rename from jdk/test/java/lang/instrument/AddTransformerTest.java rename to test/jdk/java/lang/instrument/AddTransformerTest.java diff --git a/jdk/test/java/lang/instrument/AppendToBootstrapClassPathSetUp.sh b/test/jdk/java/lang/instrument/AppendToBootstrapClassPathSetUp.sh similarity index 100% rename from jdk/test/java/lang/instrument/AppendToBootstrapClassPathSetUp.sh rename to test/jdk/java/lang/instrument/AppendToBootstrapClassPathSetUp.sh diff --git a/jdk/test/java/lang/instrument/AppendToBootstrapClassPathTest.java b/test/jdk/java/lang/instrument/AppendToBootstrapClassPathTest.java similarity index 100% rename from jdk/test/java/lang/instrument/AppendToBootstrapClassPathTest.java rename to test/jdk/java/lang/instrument/AppendToBootstrapClassPathTest.java diff --git a/jdk/test/java/lang/instrument/AppendToClassPathSetUp.sh b/test/jdk/java/lang/instrument/AppendToClassPathSetUp.sh similarity index 100% rename from jdk/test/java/lang/instrument/AppendToClassPathSetUp.sh rename to test/jdk/java/lang/instrument/AppendToClassPathSetUp.sh diff --git a/jdk/test/java/lang/instrument/AppendToClassPathTest.java b/test/jdk/java/lang/instrument/AppendToClassPathTest.java similarity index 100% rename from jdk/test/java/lang/instrument/AppendToClassPathTest.java rename to test/jdk/java/lang/instrument/AppendToClassPathTest.java diff --git a/jdk/test/java/lang/instrument/BigClass.java b/test/jdk/java/lang/instrument/BigClass.java similarity index 100% rename from jdk/test/java/lang/instrument/BigClass.java rename to test/jdk/java/lang/instrument/BigClass.java diff --git a/jdk/test/java/lang/instrument/BootClassPath/Agent.java b/test/jdk/java/lang/instrument/BootClassPath/Agent.java similarity index 100% rename from jdk/test/java/lang/instrument/BootClassPath/Agent.java rename to test/jdk/java/lang/instrument/BootClassPath/Agent.java diff --git a/jdk/test/java/lang/instrument/BootClassPath/AgentSupport.java b/test/jdk/java/lang/instrument/BootClassPath/AgentSupport.java similarity index 100% rename from jdk/test/java/lang/instrument/BootClassPath/AgentSupport.java rename to test/jdk/java/lang/instrument/BootClassPath/AgentSupport.java diff --git a/jdk/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh b/test/jdk/java/lang/instrument/BootClassPath/BootClassPathTest.sh similarity index 100% rename from jdk/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh rename to test/jdk/java/lang/instrument/BootClassPath/BootClassPathTest.sh diff --git a/jdk/test/java/lang/instrument/BootClassPath/Cleanup.java b/test/jdk/java/lang/instrument/BootClassPath/Cleanup.java similarity index 100% rename from jdk/test/java/lang/instrument/BootClassPath/Cleanup.java rename to test/jdk/java/lang/instrument/BootClassPath/Cleanup.java diff --git a/jdk/test/java/lang/instrument/BootClassPath/DummyMain.java b/test/jdk/java/lang/instrument/BootClassPath/DummyMain.java similarity index 100% rename from jdk/test/java/lang/instrument/BootClassPath/DummyMain.java rename to test/jdk/java/lang/instrument/BootClassPath/DummyMain.java diff --git a/jdk/test/java/lang/instrument/BootClassPath/Setup.java b/test/jdk/java/lang/instrument/BootClassPath/Setup.java similarity index 100% rename from jdk/test/java/lang/instrument/BootClassPath/Setup.java rename to test/jdk/java/lang/instrument/BootClassPath/Setup.java diff --git a/jdk/test/java/lang/instrument/BootstrapClassPathAgent.java b/test/jdk/java/lang/instrument/BootstrapClassPathAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/BootstrapClassPathAgent.java rename to test/jdk/java/lang/instrument/BootstrapClassPathAgent.java diff --git a/jdk/test/java/lang/instrument/BootstrapClassPathSetUp.sh b/test/jdk/java/lang/instrument/BootstrapClassPathSetUp.sh similarity index 100% rename from jdk/test/java/lang/instrument/BootstrapClassPathSetUp.sh rename to test/jdk/java/lang/instrument/BootstrapClassPathSetUp.sh diff --git a/jdk/test/java/lang/instrument/BootstrapClassPathTest.java b/test/jdk/java/lang/instrument/BootstrapClassPathTest.java similarity index 100% rename from jdk/test/java/lang/instrument/BootstrapClassPathTest.java rename to test/jdk/java/lang/instrument/BootstrapClassPathTest.java diff --git a/jdk/test/java/lang/instrument/BufferClassLoader.java b/test/jdk/java/lang/instrument/BufferClassLoader.java similarity index 100% rename from jdk/test/java/lang/instrument/BufferClassLoader.java rename to test/jdk/java/lang/instrument/BufferClassLoader.java diff --git a/jdk/test/java/lang/instrument/Counter.java b/test/jdk/java/lang/instrument/Counter.java similarity index 100% rename from jdk/test/java/lang/instrument/Counter.java rename to test/jdk/java/lang/instrument/Counter.java diff --git a/jdk/test/java/lang/instrument/CustomSystemLoader/Agent.java b/test/jdk/java/lang/instrument/CustomSystemLoader/Agent.java similarity index 100% rename from jdk/test/java/lang/instrument/CustomSystemLoader/Agent.java rename to test/jdk/java/lang/instrument/CustomSystemLoader/Agent.java diff --git a/jdk/test/java/lang/instrument/CustomSystemLoader/App.java b/test/jdk/java/lang/instrument/CustomSystemLoader/App.java similarity index 100% rename from jdk/test/java/lang/instrument/CustomSystemLoader/App.java rename to test/jdk/java/lang/instrument/CustomSystemLoader/App.java diff --git a/jdk/test/java/lang/instrument/CustomSystemLoader/CustomLoader.java b/test/jdk/java/lang/instrument/CustomSystemLoader/CustomLoader.java similarity index 100% rename from jdk/test/java/lang/instrument/CustomSystemLoader/CustomLoader.java rename to test/jdk/java/lang/instrument/CustomSystemLoader/CustomLoader.java diff --git a/jdk/test/java/lang/instrument/DaemonThread/DummyAgent.java b/test/jdk/java/lang/instrument/DaemonThread/DummyAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/DaemonThread/DummyAgent.java rename to test/jdk/java/lang/instrument/DaemonThread/DummyAgent.java diff --git a/jdk/test/java/lang/instrument/DaemonThread/DummyClass.java b/test/jdk/java/lang/instrument/DaemonThread/DummyClass.java similarity index 100% rename from jdk/test/java/lang/instrument/DaemonThread/DummyClass.java rename to test/jdk/java/lang/instrument/DaemonThread/DummyClass.java diff --git a/jdk/test/java/lang/instrument/DaemonThread/TestDaemonThread.java b/test/jdk/java/lang/instrument/DaemonThread/TestDaemonThread.java similarity index 100% rename from jdk/test/java/lang/instrument/DaemonThread/TestDaemonThread.java rename to test/jdk/java/lang/instrument/DaemonThread/TestDaemonThread.java diff --git a/jdk/test/java/lang/instrument/DaemonThread/TestDaemonThreadLauncher.java b/test/jdk/java/lang/instrument/DaemonThread/TestDaemonThreadLauncher.java similarity index 100% rename from jdk/test/java/lang/instrument/DaemonThread/TestDaemonThreadLauncher.java rename to test/jdk/java/lang/instrument/DaemonThread/TestDaemonThreadLauncher.java diff --git a/jdk/test/java/lang/instrument/Different_ExampleRedefine.java b/test/jdk/java/lang/instrument/Different_ExampleRedefine.java similarity index 100% rename from jdk/test/java/lang/instrument/Different_ExampleRedefine.java rename to test/jdk/java/lang/instrument/Different_ExampleRedefine.java diff --git a/jdk/test/java/lang/instrument/DummyClass.java b/test/jdk/java/lang/instrument/DummyClass.java similarity index 100% rename from jdk/test/java/lang/instrument/DummyClass.java rename to test/jdk/java/lang/instrument/DummyClass.java diff --git a/jdk/test/java/lang/instrument/DummyClassWithLVT.java b/test/jdk/java/lang/instrument/DummyClassWithLVT.java similarity index 100% rename from jdk/test/java/lang/instrument/DummyClassWithLVT.java rename to test/jdk/java/lang/instrument/DummyClassWithLVT.java diff --git a/jdk/test/java/lang/instrument/ExampleForBootClassPath.java b/test/jdk/java/lang/instrument/ExampleForBootClassPath.java similarity index 100% rename from jdk/test/java/lang/instrument/ExampleForBootClassPath.java rename to test/jdk/java/lang/instrument/ExampleForBootClassPath.java diff --git a/jdk/test/java/lang/instrument/ExampleForClassPath.java b/test/jdk/java/lang/instrument/ExampleForClassPath.java similarity index 100% rename from jdk/test/java/lang/instrument/ExampleForClassPath.java rename to test/jdk/java/lang/instrument/ExampleForClassPath.java diff --git a/jdk/test/java/lang/instrument/ExampleRedefine.java b/test/jdk/java/lang/instrument/ExampleRedefine.java similarity index 100% rename from jdk/test/java/lang/instrument/ExampleRedefine.java rename to test/jdk/java/lang/instrument/ExampleRedefine.java diff --git a/jdk/test/java/lang/instrument/FakeTestDriver.java b/test/jdk/java/lang/instrument/FakeTestDriver.java similarity index 100% rename from jdk/test/java/lang/instrument/FakeTestDriver.java rename to test/jdk/java/lang/instrument/FakeTestDriver.java diff --git a/jdk/test/java/lang/instrument/FromShutdownHook.java b/test/jdk/java/lang/instrument/FromShutdownHook.java similarity index 100% rename from jdk/test/java/lang/instrument/FromShutdownHook.java rename to test/jdk/java/lang/instrument/FromShutdownHook.java diff --git a/jdk/test/java/lang/instrument/GetAllLoadedClassesTest.java b/test/jdk/java/lang/instrument/GetAllLoadedClassesTest.java similarity index 100% rename from jdk/test/java/lang/instrument/GetAllLoadedClassesTest.java rename to test/jdk/java/lang/instrument/GetAllLoadedClassesTest.java diff --git a/jdk/test/java/lang/instrument/GetInitiatedClassesTest.java b/test/jdk/java/lang/instrument/GetInitiatedClassesTest.java similarity index 100% rename from jdk/test/java/lang/instrument/GetInitiatedClassesTest.java rename to test/jdk/java/lang/instrument/GetInitiatedClassesTest.java diff --git a/jdk/test/java/lang/instrument/GetObjectSizeTest.java b/test/jdk/java/lang/instrument/GetObjectSizeTest.java similarity index 100% rename from jdk/test/java/lang/instrument/GetObjectSizeTest.java rename to test/jdk/java/lang/instrument/GetObjectSizeTest.java diff --git a/jdk/test/java/lang/instrument/InstrumentationHandoff.java b/test/jdk/java/lang/instrument/InstrumentationHandoff.java similarity index 100% rename from jdk/test/java/lang/instrument/InstrumentationHandoff.java rename to test/jdk/java/lang/instrument/InstrumentationHandoff.java diff --git a/jdk/test/java/lang/instrument/IsModifiableClassAgent.java b/test/jdk/java/lang/instrument/IsModifiableClassAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/IsModifiableClassAgent.java rename to test/jdk/java/lang/instrument/IsModifiableClassAgent.java diff --git a/jdk/test/java/lang/instrument/IsModifiableClassApp.java b/test/jdk/java/lang/instrument/IsModifiableClassApp.java similarity index 100% rename from jdk/test/java/lang/instrument/IsModifiableClassApp.java rename to test/jdk/java/lang/instrument/IsModifiableClassApp.java diff --git a/jdk/test/java/lang/instrument/MakeJAR.sh b/test/jdk/java/lang/instrument/MakeJAR.sh similarity index 100% rename from jdk/test/java/lang/instrument/MakeJAR.sh rename to test/jdk/java/lang/instrument/MakeJAR.sh diff --git a/jdk/test/java/lang/instrument/MakeJAR2.sh b/test/jdk/java/lang/instrument/MakeJAR2.sh similarity index 100% rename from jdk/test/java/lang/instrument/MakeJAR2.sh rename to test/jdk/java/lang/instrument/MakeJAR2.sh diff --git a/jdk/test/java/lang/instrument/MakeJAR3.sh b/test/jdk/java/lang/instrument/MakeJAR3.sh similarity index 100% rename from jdk/test/java/lang/instrument/MakeJAR3.sh rename to test/jdk/java/lang/instrument/MakeJAR3.sh diff --git a/jdk/test/java/lang/instrument/MakeJAR4.sh b/test/jdk/java/lang/instrument/MakeJAR4.sh similarity index 100% rename from jdk/test/java/lang/instrument/MakeJAR4.sh rename to test/jdk/java/lang/instrument/MakeJAR4.sh diff --git a/jdk/test/java/lang/instrument/ManifestTest.sh b/test/jdk/java/lang/instrument/ManifestTest.sh similarity index 100% rename from jdk/test/java/lang/instrument/ManifestTest.sh rename to test/jdk/java/lang/instrument/ManifestTest.sh diff --git a/jdk/test/java/lang/instrument/ManifestTestAgent.java b/test/jdk/java/lang/instrument/ManifestTestAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/ManifestTestAgent.java rename to test/jdk/java/lang/instrument/ManifestTestAgent.java diff --git a/jdk/test/java/lang/instrument/ManifestTestApp.java b/test/jdk/java/lang/instrument/ManifestTestApp.java similarity index 100% rename from jdk/test/java/lang/instrument/ManifestTestApp.java rename to test/jdk/java/lang/instrument/ManifestTestApp.java diff --git a/jdk/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java b/test/jdk/java/lang/instrument/ManyMethodsBenchmarkAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java rename to test/jdk/java/lang/instrument/ManyMethodsBenchmarkAgent.java diff --git a/jdk/test/java/lang/instrument/ManyMethodsBenchmarkApp.java b/test/jdk/java/lang/instrument/ManyMethodsBenchmarkApp.java similarity index 100% rename from jdk/test/java/lang/instrument/ManyMethodsBenchmarkApp.java rename to test/jdk/java/lang/instrument/ManyMethodsBenchmarkApp.java diff --git a/jdk/test/java/lang/instrument/NMTHelper.java b/test/jdk/java/lang/instrument/NMTHelper.java similarity index 100% rename from jdk/test/java/lang/instrument/NMTHelper.java rename to test/jdk/java/lang/instrument/NMTHelper.java diff --git a/jdk/test/java/lang/instrument/NamedBuffer.java b/test/jdk/java/lang/instrument/NamedBuffer.java similarity index 100% rename from jdk/test/java/lang/instrument/NamedBuffer.java rename to test/jdk/java/lang/instrument/NamedBuffer.java diff --git a/jdk/test/java/lang/instrument/NativeMethodPrefixAgent.java b/test/jdk/java/lang/instrument/NativeMethodPrefixAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/NativeMethodPrefixAgent.java rename to test/jdk/java/lang/instrument/NativeMethodPrefixAgent.java diff --git a/jdk/test/java/lang/instrument/NativeMethodPrefixApp.java b/test/jdk/java/lang/instrument/NativeMethodPrefixApp.java similarity index 100% rename from jdk/test/java/lang/instrument/NativeMethodPrefixApp.java rename to test/jdk/java/lang/instrument/NativeMethodPrefixApp.java diff --git a/jdk/test/java/lang/instrument/NoTransformerAddedTest.java b/test/jdk/java/lang/instrument/NoTransformerAddedTest.java similarity index 100% rename from jdk/test/java/lang/instrument/NoTransformerAddedTest.java rename to test/jdk/java/lang/instrument/NoTransformerAddedTest.java diff --git a/jdk/test/java/lang/instrument/NullGetObjectSizeTest.java b/test/jdk/java/lang/instrument/NullGetObjectSizeTest.java similarity index 100% rename from jdk/test/java/lang/instrument/NullGetObjectSizeTest.java rename to test/jdk/java/lang/instrument/NullGetObjectSizeTest.java diff --git a/jdk/test/java/lang/instrument/NullRedefineClassesTests.java b/test/jdk/java/lang/instrument/NullRedefineClassesTests.java similarity index 100% rename from jdk/test/java/lang/instrument/NullRedefineClassesTests.java rename to test/jdk/java/lang/instrument/NullRedefineClassesTests.java diff --git a/jdk/test/java/lang/instrument/NullTransformerAddTest.java b/test/jdk/java/lang/instrument/NullTransformerAddTest.java similarity index 100% rename from jdk/test/java/lang/instrument/NullTransformerAddTest.java rename to test/jdk/java/lang/instrument/NullTransformerAddTest.java diff --git a/jdk/test/java/lang/instrument/NullTransformerRemoveTest.java b/test/jdk/java/lang/instrument/NullTransformerRemoveTest.java similarity index 100% rename from jdk/test/java/lang/instrument/NullTransformerRemoveTest.java rename to test/jdk/java/lang/instrument/NullTransformerRemoveTest.java diff --git a/jdk/test/java/lang/instrument/ParallelTransformerLoader.sh b/test/jdk/java/lang/instrument/ParallelTransformerLoader.sh similarity index 100% rename from jdk/test/java/lang/instrument/ParallelTransformerLoader.sh rename to test/jdk/java/lang/instrument/ParallelTransformerLoader.sh diff --git a/jdk/test/java/lang/instrument/ParallelTransformerLoaderAgent.java b/test/jdk/java/lang/instrument/ParallelTransformerLoaderAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/ParallelTransformerLoaderAgent.java rename to test/jdk/java/lang/instrument/ParallelTransformerLoaderAgent.java diff --git a/jdk/test/java/lang/instrument/ParallelTransformerLoaderApp.java b/test/jdk/java/lang/instrument/ParallelTransformerLoaderApp.java similarity index 100% rename from jdk/test/java/lang/instrument/ParallelTransformerLoaderApp.java rename to test/jdk/java/lang/instrument/ParallelTransformerLoaderApp.java diff --git a/jdk/test/java/lang/instrument/PremainClass/Agent.jar b/test/jdk/java/lang/instrument/PremainClass/Agent.jar similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/Agent.jar rename to test/jdk/java/lang/instrument/PremainClass/Agent.jar diff --git a/jdk/test/java/lang/instrument/PremainClass/CreateFiles.java b/test/jdk/java/lang/instrument/PremainClass/CreateFiles.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/CreateFiles.java rename to test/jdk/java/lang/instrument/PremainClass/CreateFiles.java diff --git a/jdk/test/java/lang/instrument/PremainClass/DummyMain.java b/test/jdk/java/lang/instrument/PremainClass/DummyMain.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/DummyMain.java rename to test/jdk/java/lang/instrument/PremainClass/DummyMain.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0001.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent0001.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent0001.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent0001.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0010.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent0010.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent0010.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent0010.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0011.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent0011.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent0011.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent0011.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0100.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent0100.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent0100.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent0100.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0101.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent0101.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent0101.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent0101.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0110.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent0110.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent0110.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent0110.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0111.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent0111.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent0111.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent0111.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1000.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent1000.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent1000.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent1000.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1001.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent1001.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent1001.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent1001.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1010.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent1010.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent1010.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent1010.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1011.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent1011.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent1011.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent1011.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1100.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent1100.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent1100.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent1100.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1101.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent1101.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent1101.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent1101.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1110.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent1110.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent1110.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent1110.java diff --git a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1111.java b/test/jdk/java/lang/instrument/PremainClass/InheritAgent1111.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/InheritAgent1111.java rename to test/jdk/java/lang/instrument/PremainClass/InheritAgent1111.java diff --git a/jdk/test/java/lang/instrument/PremainClass/NoPremainAgent.java b/test/jdk/java/lang/instrument/PremainClass/NoPremainAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/NoPremainAgent.java rename to test/jdk/java/lang/instrument/PremainClass/NoPremainAgent.java diff --git a/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java b/test/jdk/java/lang/instrument/PremainClass/NoPremainAgentTest.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java rename to test/jdk/java/lang/instrument/PremainClass/NoPremainAgentTest.java diff --git a/jdk/test/java/lang/instrument/PremainClass/PremainClassTest.java b/test/jdk/java/lang/instrument/PremainClass/PremainClassTest.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/PremainClassTest.java rename to test/jdk/java/lang/instrument/PremainClass/PremainClassTest.java diff --git a/jdk/test/java/lang/instrument/PremainClass/README b/test/jdk/java/lang/instrument/PremainClass/README similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/README rename to test/jdk/java/lang/instrument/PremainClass/README diff --git a/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgent.java b/test/jdk/java/lang/instrument/PremainClass/ZeroArgPremainAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgent.java rename to test/jdk/java/lang/instrument/PremainClass/ZeroArgPremainAgent.java diff --git a/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java b/test/jdk/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java similarity index 100% rename from jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java rename to test/jdk/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java diff --git a/jdk/test/java/lang/instrument/RedefineBigClass.sh b/test/jdk/java/lang/instrument/RedefineBigClass.sh similarity index 100% rename from jdk/test/java/lang/instrument/RedefineBigClass.sh rename to test/jdk/java/lang/instrument/RedefineBigClass.sh diff --git a/jdk/test/java/lang/instrument/RedefineBigClassAgent.java b/test/jdk/java/lang/instrument/RedefineBigClassAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineBigClassAgent.java rename to test/jdk/java/lang/instrument/RedefineBigClassAgent.java diff --git a/jdk/test/java/lang/instrument/RedefineBigClassApp.java b/test/jdk/java/lang/instrument/RedefineBigClassApp.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineBigClassApp.java rename to test/jdk/java/lang/instrument/RedefineBigClassApp.java diff --git a/jdk/test/java/lang/instrument/RedefineClassWithNativeMethod.sh b/test/jdk/java/lang/instrument/RedefineClassWithNativeMethod.sh similarity index 100% rename from jdk/test/java/lang/instrument/RedefineClassWithNativeMethod.sh rename to test/jdk/java/lang/instrument/RedefineClassWithNativeMethod.sh diff --git a/jdk/test/java/lang/instrument/RedefineClassWithNativeMethodAgent.java b/test/jdk/java/lang/instrument/RedefineClassWithNativeMethodAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineClassWithNativeMethodAgent.java rename to test/jdk/java/lang/instrument/RedefineClassWithNativeMethodAgent.java diff --git a/jdk/test/java/lang/instrument/RedefineClassWithNativeMethodApp.java b/test/jdk/java/lang/instrument/RedefineClassWithNativeMethodApp.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineClassWithNativeMethodApp.java rename to test/jdk/java/lang/instrument/RedefineClassWithNativeMethodApp.java diff --git a/jdk/test/java/lang/instrument/RedefineClassesDisabledTest.java b/test/jdk/java/lang/instrument/RedefineClassesDisabledTest.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineClassesDisabledTest.java rename to test/jdk/java/lang/instrument/RedefineClassesDisabledTest.java diff --git a/jdk/test/java/lang/instrument/RedefineClassesTests.java b/test/jdk/java/lang/instrument/RedefineClassesTests.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineClassesTests.java rename to test/jdk/java/lang/instrument/RedefineClassesTests.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodAddInvoke.sh b/test/jdk/java/lang/instrument/RedefineMethodAddInvoke.sh similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodAddInvoke.sh rename to test/jdk/java/lang/instrument/RedefineMethodAddInvoke.sh diff --git a/jdk/test/java/lang/instrument/RedefineMethodAddInvokeAgent.java b/test/jdk/java/lang/instrument/RedefineMethodAddInvokeAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodAddInvokeAgent.java rename to test/jdk/java/lang/instrument/RedefineMethodAddInvokeAgent.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodAddInvokeApp.java b/test/jdk/java/lang/instrument/RedefineMethodAddInvokeApp.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodAddInvokeApp.java rename to test/jdk/java/lang/instrument/RedefineMethodAddInvokeApp.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodAddInvokeTarget.java b/test/jdk/java/lang/instrument/RedefineMethodAddInvokeTarget.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodAddInvokeTarget.java rename to test/jdk/java/lang/instrument/RedefineMethodAddInvokeTarget.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodAddInvokeTarget_1.java b/test/jdk/java/lang/instrument/RedefineMethodAddInvokeTarget_1.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodAddInvokeTarget_1.java rename to test/jdk/java/lang/instrument/RedefineMethodAddInvokeTarget_1.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodAddInvokeTarget_2.java b/test/jdk/java/lang/instrument/RedefineMethodAddInvokeTarget_2.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodAddInvokeTarget_2.java rename to test/jdk/java/lang/instrument/RedefineMethodAddInvokeTarget_2.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodDelInvoke.sh b/test/jdk/java/lang/instrument/RedefineMethodDelInvoke.sh similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodDelInvoke.sh rename to test/jdk/java/lang/instrument/RedefineMethodDelInvoke.sh diff --git a/jdk/test/java/lang/instrument/RedefineMethodDelInvokeAgent.java b/test/jdk/java/lang/instrument/RedefineMethodDelInvokeAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodDelInvokeAgent.java rename to test/jdk/java/lang/instrument/RedefineMethodDelInvokeAgent.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodDelInvokeApp.java b/test/jdk/java/lang/instrument/RedefineMethodDelInvokeApp.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodDelInvokeApp.java rename to test/jdk/java/lang/instrument/RedefineMethodDelInvokeApp.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodDelInvokeTarget.java b/test/jdk/java/lang/instrument/RedefineMethodDelInvokeTarget.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodDelInvokeTarget.java rename to test/jdk/java/lang/instrument/RedefineMethodDelInvokeTarget.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodDelInvokeTarget_1.java b/test/jdk/java/lang/instrument/RedefineMethodDelInvokeTarget_1.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodDelInvokeTarget_1.java rename to test/jdk/java/lang/instrument/RedefineMethodDelInvokeTarget_1.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodDelInvokeTarget_2.java b/test/jdk/java/lang/instrument/RedefineMethodDelInvokeTarget_2.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodDelInvokeTarget_2.java rename to test/jdk/java/lang/instrument/RedefineMethodDelInvokeTarget_2.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodInBacktrace.sh b/test/jdk/java/lang/instrument/RedefineMethodInBacktrace.sh similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodInBacktrace.sh rename to test/jdk/java/lang/instrument/RedefineMethodInBacktrace.sh diff --git a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceAgent.java b/test/jdk/java/lang/instrument/RedefineMethodInBacktraceAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodInBacktraceAgent.java rename to test/jdk/java/lang/instrument/RedefineMethodInBacktraceAgent.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceApp.java b/test/jdk/java/lang/instrument/RedefineMethodInBacktraceApp.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodInBacktraceApp.java rename to test/jdk/java/lang/instrument/RedefineMethodInBacktraceApp.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget.java b/test/jdk/java/lang/instrument/RedefineMethodInBacktraceTarget.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget.java rename to test/jdk/java/lang/instrument/RedefineMethodInBacktraceTarget.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTargetB.java b/test/jdk/java/lang/instrument/RedefineMethodInBacktraceTargetB.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodInBacktraceTargetB.java rename to test/jdk/java/lang/instrument/RedefineMethodInBacktraceTargetB.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTargetB_2.java b/test/jdk/java/lang/instrument/RedefineMethodInBacktraceTargetB_2.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodInBacktraceTargetB_2.java rename to test/jdk/java/lang/instrument/RedefineMethodInBacktraceTargetB_2.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget_2.java b/test/jdk/java/lang/instrument/RedefineMethodInBacktraceTarget_2.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget_2.java rename to test/jdk/java/lang/instrument/RedefineMethodInBacktraceTarget_2.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh b/test/jdk/java/lang/instrument/RedefineMethodWithAnnotations.sh similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh rename to test/jdk/java/lang/instrument/RedefineMethodWithAnnotations.sh diff --git a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAgent.java b/test/jdk/java/lang/instrument/RedefineMethodWithAnnotationsAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAgent.java rename to test/jdk/java/lang/instrument/RedefineMethodWithAnnotationsAgent.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAnnotations.java b/test/jdk/java/lang/instrument/RedefineMethodWithAnnotationsAnnotations.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAnnotations.java rename to test/jdk/java/lang/instrument/RedefineMethodWithAnnotationsAnnotations.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsApp.java b/test/jdk/java/lang/instrument/RedefineMethodWithAnnotationsApp.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsApp.java rename to test/jdk/java/lang/instrument/RedefineMethodWithAnnotationsApp.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java b/test/jdk/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java rename to test/jdk/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java diff --git a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java b/test/jdk/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java rename to test/jdk/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java diff --git a/jdk/test/java/lang/instrument/RedefineModuleAgent.java b/test/jdk/java/lang/instrument/RedefineModuleAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineModuleAgent.java rename to test/jdk/java/lang/instrument/RedefineModuleAgent.java diff --git a/jdk/test/java/lang/instrument/RedefineModuleTest.java b/test/jdk/java/lang/instrument/RedefineModuleTest.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineModuleTest.java rename to test/jdk/java/lang/instrument/RedefineModuleTest.java diff --git a/jdk/test/java/lang/instrument/RedefineSetUp.sh b/test/jdk/java/lang/instrument/RedefineSetUp.sh similarity index 100% rename from jdk/test/java/lang/instrument/RedefineSetUp.sh rename to test/jdk/java/lang/instrument/RedefineSetUp.sh diff --git a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh b/test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh similarity index 100% rename from jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh rename to test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh diff --git a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesAgent.java b/test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesAgent.java rename to test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesAgent.java diff --git a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesApp.java b/test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesApp.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesApp.java rename to test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesApp.java diff --git a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesImpl.java b/test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesImpl.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesImpl.java rename to test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesImpl.java diff --git a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesImpl_1.java b/test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesImpl_1.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesImpl_1.java rename to test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesImpl_1.java diff --git a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesIntf1.java b/test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesIntf1.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesIntf1.java rename to test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesIntf1.java diff --git a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesIntf2.java b/test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesIntf2.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesIntf2.java rename to test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesIntf2.java diff --git a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesRemote.java b/test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesRemote.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesRemote.java rename to test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesRemote.java diff --git a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesTarget.java b/test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesTarget.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesTarget.java rename to test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesTarget.java diff --git a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesTarget_1.java b/test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesTarget_1.java similarity index 100% rename from jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfacesTarget_1.java rename to test/jdk/java/lang/instrument/RedefineSubclassWithTwoInterfacesTarget_1.java diff --git a/jdk/test/java/lang/instrument/RemoveAbsentTransformerTest.java b/test/jdk/java/lang/instrument/RemoveAbsentTransformerTest.java similarity index 100% rename from jdk/test/java/lang/instrument/RemoveAbsentTransformerTest.java rename to test/jdk/java/lang/instrument/RemoveAbsentTransformerTest.java diff --git a/jdk/test/java/lang/instrument/RemoveTransformerTest.java b/test/jdk/java/lang/instrument/RemoveTransformerTest.java similarity index 100% rename from jdk/test/java/lang/instrument/RemoveTransformerTest.java rename to test/jdk/java/lang/instrument/RemoveTransformerTest.java diff --git a/jdk/test/java/lang/instrument/RetransformAgent.java b/test/jdk/java/lang/instrument/RetransformAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/RetransformAgent.java rename to test/jdk/java/lang/instrument/RetransformAgent.java diff --git a/jdk/test/java/lang/instrument/RetransformApp.java b/test/jdk/java/lang/instrument/RetransformApp.java similarity index 100% rename from jdk/test/java/lang/instrument/RetransformApp.java rename to test/jdk/java/lang/instrument/RetransformApp.java diff --git a/jdk/test/java/lang/instrument/RetransformBigClass.sh b/test/jdk/java/lang/instrument/RetransformBigClass.sh similarity index 100% rename from jdk/test/java/lang/instrument/RetransformBigClass.sh rename to test/jdk/java/lang/instrument/RetransformBigClass.sh diff --git a/jdk/test/java/lang/instrument/RetransformBigClassAgent.java b/test/jdk/java/lang/instrument/RetransformBigClassAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/RetransformBigClassAgent.java rename to test/jdk/java/lang/instrument/RetransformBigClassAgent.java diff --git a/jdk/test/java/lang/instrument/RetransformBigClassApp.java b/test/jdk/java/lang/instrument/RetransformBigClassApp.java similarity index 100% rename from jdk/test/java/lang/instrument/RetransformBigClassApp.java rename to test/jdk/java/lang/instrument/RetransformBigClassApp.java diff --git a/jdk/test/java/lang/instrument/RuntimeConstants.java b/test/jdk/java/lang/instrument/RuntimeConstants.java similarity index 100% rename from jdk/test/java/lang/instrument/RuntimeConstants.java rename to test/jdk/java/lang/instrument/RuntimeConstants.java diff --git a/jdk/test/java/lang/instrument/SimpleAgent.java b/test/jdk/java/lang/instrument/SimpleAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/SimpleAgent.java rename to test/jdk/java/lang/instrument/SimpleAgent.java diff --git a/jdk/test/java/lang/instrument/SimpleIdentityTransformer.java b/test/jdk/java/lang/instrument/SimpleIdentityTransformer.java similarity index 100% rename from jdk/test/java/lang/instrument/SimpleIdentityTransformer.java rename to test/jdk/java/lang/instrument/SimpleIdentityTransformer.java diff --git a/jdk/test/java/lang/instrument/SingleTransformerTest.java b/test/jdk/java/lang/instrument/SingleTransformerTest.java similarity index 100% rename from jdk/test/java/lang/instrument/SingleTransformerTest.java rename to test/jdk/java/lang/instrument/SingleTransformerTest.java diff --git a/jdk/test/java/lang/instrument/StressGetObjectSizeApp.java b/test/jdk/java/lang/instrument/StressGetObjectSizeApp.java similarity index 100% rename from jdk/test/java/lang/instrument/StressGetObjectSizeApp.java rename to test/jdk/java/lang/instrument/StressGetObjectSizeApp.java diff --git a/jdk/test/java/lang/instrument/StressGetObjectSizeTest.sh b/test/jdk/java/lang/instrument/StressGetObjectSizeTest.sh similarity index 100% rename from jdk/test/java/lang/instrument/StressGetObjectSizeTest.sh rename to test/jdk/java/lang/instrument/StressGetObjectSizeTest.sh diff --git a/jdk/test/java/lang/instrument/TEST.properties b/test/jdk/java/lang/instrument/TEST.properties similarity index 100% rename from jdk/test/java/lang/instrument/TEST.properties rename to test/jdk/java/lang/instrument/TEST.properties diff --git a/jdk/test/java/lang/instrument/TestAgentWithLimitMods.java b/test/jdk/java/lang/instrument/TestAgentWithLimitMods.java similarity index 100% rename from jdk/test/java/lang/instrument/TestAgentWithLimitMods.java rename to test/jdk/java/lang/instrument/TestAgentWithLimitMods.java diff --git a/jdk/test/java/lang/instrument/TestClass1.java b/test/jdk/java/lang/instrument/TestClass1.java similarity index 100% rename from jdk/test/java/lang/instrument/TestClass1.java rename to test/jdk/java/lang/instrument/TestClass1.java diff --git a/jdk/test/java/lang/instrument/TestClass2.java b/test/jdk/java/lang/instrument/TestClass2.java similarity index 100% rename from jdk/test/java/lang/instrument/TestClass2.java rename to test/jdk/java/lang/instrument/TestClass2.java diff --git a/jdk/test/java/lang/instrument/TestClass3.java b/test/jdk/java/lang/instrument/TestClass3.java similarity index 100% rename from jdk/test/java/lang/instrument/TestClass3.java rename to test/jdk/java/lang/instrument/TestClass3.java diff --git a/jdk/test/java/lang/instrument/TransformMethodTest.java b/test/jdk/java/lang/instrument/TransformMethodTest.java similarity index 100% rename from jdk/test/java/lang/instrument/TransformMethodTest.java rename to test/jdk/java/lang/instrument/TransformMethodTest.java diff --git a/jdk/test/java/lang/instrument/TransformerManagementThreadAddTests.java b/test/jdk/java/lang/instrument/TransformerManagementThreadAddTests.java similarity index 100% rename from jdk/test/java/lang/instrument/TransformerManagementThreadAddTests.java rename to test/jdk/java/lang/instrument/TransformerManagementThreadAddTests.java diff --git a/jdk/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java b/test/jdk/java/lang/instrument/TransformerManagementThreadRemoveTests.java similarity index 100% rename from jdk/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java rename to test/jdk/java/lang/instrument/TransformerManagementThreadRemoveTests.java diff --git a/jdk/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.java b/test/jdk/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.java similarity index 100% rename from jdk/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.java rename to test/jdk/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.java diff --git a/jdk/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh b/test/jdk/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh similarity index 100% rename from jdk/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh rename to test/jdk/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/A.1 b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/A.1 similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/A.1 rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/A.1 diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/A.2 b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/A.2 similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/A.2 rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/A.2 diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/Agent.java b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/Agent.java similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/Agent.java rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/Agent.java diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/AgentSupport.java b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/AgentSupport.java similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/AgentSupport.java rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/AgentSupport.java diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/Application.java b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/Application.java similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/Application.java rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/Application.java diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/B.1 b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/B.1 similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/B.1 rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/B.1 diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/B.2 b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/B.2 similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/B.2 rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/B.2 diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/BasicTest.java b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/BasicTest.java similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/BasicTest.java rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/BasicTest.java diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/BootSupport.java b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/BootSupport.java similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/BootSupport.java rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/BootSupport.java diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.java b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.java similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.java rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.java diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.java b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.java similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.java rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.java diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/DynamicTest.java b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/DynamicTest.java similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/DynamicTest.java rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/DynamicTest.java diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/InstrumentedApplication.java b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/InstrumentedApplication.java similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/InstrumentedApplication.java rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/InstrumentedApplication.java diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/PrematureLoadTest.java b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/PrematureLoadTest.java similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/PrematureLoadTest.java rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/PrematureLoadTest.java diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/Tracer.java b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/Tracer.java similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/Tracer.java rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/Tracer.java diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/manifest.mf b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/manifest.mf similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/manifest.mf rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/manifest.mf diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh similarity index 100% rename from jdk/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh rename to test/jdk/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh diff --git a/jdk/test/java/lang/instrument/asmlib/Instrumentor.java b/test/jdk/java/lang/instrument/asmlib/Instrumentor.java similarity index 100% rename from jdk/test/java/lang/instrument/asmlib/Instrumentor.java rename to test/jdk/java/lang/instrument/asmlib/Instrumentor.java diff --git a/jdk/test/java/lang/instrument/basicAgent.mf b/test/jdk/java/lang/instrument/basicAgent.mf similarity index 100% rename from jdk/test/java/lang/instrument/basicAgent.mf rename to test/jdk/java/lang/instrument/basicAgent.mf diff --git a/jdk/test/java/lang/instrument/bootclasspathAgent.mf b/test/jdk/java/lang/instrument/bootclasspathAgent.mf similarity index 100% rename from jdk/test/java/lang/instrument/bootclasspathAgent.mf rename to test/jdk/java/lang/instrument/bootclasspathAgent.mf diff --git a/jdk/test/java/lang/instrument/bootreporter/StringIdCallback.java b/test/jdk/java/lang/instrument/bootreporter/StringIdCallback.java similarity index 100% rename from jdk/test/java/lang/instrument/bootreporter/StringIdCallback.java rename to test/jdk/java/lang/instrument/bootreporter/StringIdCallback.java diff --git a/jdk/test/java/lang/instrument/bootreporter/StringIdCallbackReporter.java b/test/jdk/java/lang/instrument/bootreporter/StringIdCallbackReporter.java similarity index 100% rename from jdk/test/java/lang/instrument/bootreporter/StringIdCallbackReporter.java rename to test/jdk/java/lang/instrument/bootreporter/StringIdCallbackReporter.java diff --git a/jdk/test/java/lang/instrument/classpathAgent.mf b/test/jdk/java/lang/instrument/classpathAgent.mf similarity index 100% rename from jdk/test/java/lang/instrument/classpathAgent.mf rename to test/jdk/java/lang/instrument/classpathAgent.mf diff --git a/jdk/test/java/lang/instrument/executableJAR/Agent.java b/test/jdk/java/lang/instrument/executableJAR/Agent.java similarity index 100% rename from jdk/test/java/lang/instrument/executableJAR/Agent.java rename to test/jdk/java/lang/instrument/executableJAR/Agent.java diff --git a/jdk/test/java/lang/instrument/executableJAR/AgentHelper.java b/test/jdk/java/lang/instrument/executableJAR/AgentHelper.java similarity index 100% rename from jdk/test/java/lang/instrument/executableJAR/AgentHelper.java rename to test/jdk/java/lang/instrument/executableJAR/AgentHelper.java diff --git a/jdk/test/java/lang/instrument/executableJAR/ExecJarWithAgent.java b/test/jdk/java/lang/instrument/executableJAR/ExecJarWithAgent.java similarity index 100% rename from jdk/test/java/lang/instrument/executableJAR/ExecJarWithAgent.java rename to test/jdk/java/lang/instrument/executableJAR/ExecJarWithAgent.java diff --git a/jdk/test/java/lang/instrument/executableJAR/Main.java b/test/jdk/java/lang/instrument/executableJAR/Main.java similarity index 100% rename from jdk/test/java/lang/instrument/executableJAR/Main.java rename to test/jdk/java/lang/instrument/executableJAR/Main.java diff --git a/jdk/test/java/lang/instrument/java.base/java/lang/TestProvider.java b/test/jdk/java/lang/instrument/java.base/java/lang/TestProvider.java similarity index 100% rename from jdk/test/java/lang/instrument/java.base/java/lang/TestProvider.java rename to test/jdk/java/lang/instrument/java.base/java/lang/TestProvider.java diff --git a/jdk/test/java/lang/instrument/java.base/jdk/internal/test/TestProviderImpl1.java b/test/jdk/java/lang/instrument/java.base/jdk/internal/test/TestProviderImpl1.java similarity index 100% rename from jdk/test/java/lang/instrument/java.base/jdk/internal/test/TestProviderImpl1.java rename to test/jdk/java/lang/instrument/java.base/jdk/internal/test/TestProviderImpl1.java diff --git a/jdk/test/java/lang/instrument/java.base/jdk/internal/test/TestProviderImpl2.java b/test/jdk/java/lang/instrument/java.base/jdk/internal/test/TestProviderImpl2.java similarity index 100% rename from jdk/test/java/lang/instrument/java.base/jdk/internal/test/TestProviderImpl2.java rename to test/jdk/java/lang/instrument/java.base/jdk/internal/test/TestProviderImpl2.java diff --git a/jdk/test/java/lang/instrument/modules/AppendToClassPathModuleTest.java b/test/jdk/java/lang/instrument/modules/AppendToClassPathModuleTest.java similarity index 100% rename from jdk/test/java/lang/instrument/modules/AppendToClassPathModuleTest.java rename to test/jdk/java/lang/instrument/modules/AppendToClassPathModuleTest.java diff --git a/jdk/test/java/lang/instrument/modules/AppendToClassPathModuleTest.sh b/test/jdk/java/lang/instrument/modules/AppendToClassPathModuleTest.sh similarity index 100% rename from jdk/test/java/lang/instrument/modules/AppendToClassPathModuleTest.sh rename to test/jdk/java/lang/instrument/modules/AppendToClassPathModuleTest.sh diff --git a/jdk/test/java/lang/instrument/modules/src/test/jdk/test/Main.java b/test/jdk/java/lang/instrument/modules/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/java/lang/instrument/modules/src/test/jdk/test/Main.java rename to test/jdk/java/lang/instrument/modules/src/test/jdk/test/Main.java diff --git a/jdk/test/java/lang/instrument/modules/src/test/module-info.java b/test/jdk/java/lang/instrument/modules/src/test/module-info.java similarity index 100% rename from jdk/test/java/lang/instrument/modules/src/test/module-info.java rename to test/jdk/java/lang/instrument/modules/src/test/module-info.java diff --git a/jdk/test/java/lang/instrument/redefineAgent.mf b/test/jdk/java/lang/instrument/redefineAgent.mf similarity index 100% rename from jdk/test/java/lang/instrument/redefineAgent.mf rename to test/jdk/java/lang/instrument/redefineAgent.mf diff --git a/jdk/test/java/lang/instrument/retransformAgent.mf b/test/jdk/java/lang/instrument/retransformAgent.mf similarity index 100% rename from jdk/test/java/lang/instrument/retransformAgent.mf rename to test/jdk/java/lang/instrument/retransformAgent.mf diff --git a/jdk/test/java/lang/invoke/6987555/Test6987555.java b/test/jdk/java/lang/invoke/6987555/Test6987555.java similarity index 100% rename from jdk/test/java/lang/invoke/6987555/Test6987555.java rename to test/jdk/java/lang/invoke/6987555/Test6987555.java diff --git a/jdk/test/java/lang/invoke/6991596/Test6991596.java b/test/jdk/java/lang/invoke/6991596/Test6991596.java similarity index 100% rename from jdk/test/java/lang/invoke/6991596/Test6991596.java rename to test/jdk/java/lang/invoke/6991596/Test6991596.java diff --git a/jdk/test/java/lang/invoke/6998541/Test6998541.java b/test/jdk/java/lang/invoke/6998541/Test6998541.java similarity index 100% rename from jdk/test/java/lang/invoke/6998541/Test6998541.java rename to test/jdk/java/lang/invoke/6998541/Test6998541.java diff --git a/jdk/test/java/lang/invoke/7087570/Test7087570.java b/test/jdk/java/lang/invoke/7087570/Test7087570.java similarity index 100% rename from jdk/test/java/lang/invoke/7087570/Test7087570.java rename to test/jdk/java/lang/invoke/7087570/Test7087570.java diff --git a/jdk/test/java/lang/invoke/7157574/Test7157574.java b/test/jdk/java/lang/invoke/7157574/Test7157574.java similarity index 100% rename from jdk/test/java/lang/invoke/7157574/Test7157574.java rename to test/jdk/java/lang/invoke/7157574/Test7157574.java diff --git a/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java b/test/jdk/java/lang/invoke/7196190/ClassForNameTest.java similarity index 100% rename from jdk/test/java/lang/invoke/7196190/ClassForNameTest.java rename to test/jdk/java/lang/invoke/7196190/ClassForNameTest.java diff --git a/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java b/test/jdk/java/lang/invoke/7196190/GetUnsafeTest.java similarity index 100% rename from jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java rename to test/jdk/java/lang/invoke/7196190/GetUnsafeTest.java diff --git a/jdk/test/java/lang/invoke/7196190/jtreg.security.policy b/test/jdk/java/lang/invoke/7196190/jtreg.security.policy similarity index 100% rename from jdk/test/java/lang/invoke/7196190/jtreg.security.policy rename to test/jdk/java/lang/invoke/7196190/jtreg.security.policy diff --git a/jdk/test/java/lang/invoke/8009222/Test8009222.java b/test/jdk/java/lang/invoke/8009222/Test8009222.java similarity index 100% rename from jdk/test/java/lang/invoke/8009222/Test8009222.java rename to test/jdk/java/lang/invoke/8009222/Test8009222.java diff --git a/jdk/test/java/lang/invoke/8022701/BogoLoader.java b/test/jdk/java/lang/invoke/8022701/BogoLoader.java similarity index 100% rename from jdk/test/java/lang/invoke/8022701/BogoLoader.java rename to test/jdk/java/lang/invoke/8022701/BogoLoader.java diff --git a/jdk/test/java/lang/invoke/8022701/InvokeSeveralWays.java b/test/jdk/java/lang/invoke/8022701/InvokeSeveralWays.java similarity index 100% rename from jdk/test/java/lang/invoke/8022701/InvokeSeveralWays.java rename to test/jdk/java/lang/invoke/8022701/InvokeSeveralWays.java diff --git a/jdk/test/java/lang/invoke/8022701/Invoker.java b/test/jdk/java/lang/invoke/8022701/Invoker.java similarity index 100% rename from jdk/test/java/lang/invoke/8022701/Invoker.java rename to test/jdk/java/lang/invoke/8022701/Invoker.java diff --git a/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java b/test/jdk/java/lang/invoke/8022701/MHIllegalAccess.java similarity index 100% rename from jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java rename to test/jdk/java/lang/invoke/8022701/MHIllegalAccess.java diff --git a/jdk/test/java/lang/invoke/8022701/MethodSupplier.java b/test/jdk/java/lang/invoke/8022701/MethodSupplier.java similarity index 100% rename from jdk/test/java/lang/invoke/8022701/MethodSupplier.java rename to test/jdk/java/lang/invoke/8022701/MethodSupplier.java diff --git a/jdk/test/java/lang/invoke/8076596/Test8076596.java b/test/jdk/java/lang/invoke/8076596/Test8076596.java similarity index 100% rename from jdk/test/java/lang/invoke/8076596/Test8076596.java rename to test/jdk/java/lang/invoke/8076596/Test8076596.java diff --git a/jdk/test/java/lang/invoke/8076596/Test8076596.security.policy b/test/jdk/java/lang/invoke/8076596/Test8076596.security.policy similarity index 100% rename from jdk/test/java/lang/invoke/8076596/Test8076596.security.policy rename to test/jdk/java/lang/invoke/8076596/Test8076596.security.policy diff --git a/jdk/test/java/lang/invoke/8147078/Test8147078.java b/test/jdk/java/lang/invoke/8147078/Test8147078.java similarity index 100% rename from jdk/test/java/lang/invoke/8147078/Test8147078.java rename to test/jdk/java/lang/invoke/8147078/Test8147078.java diff --git a/jdk/test/java/lang/invoke/8177146/TestMethodHandleBind.java b/test/jdk/java/lang/invoke/8177146/TestMethodHandleBind.java similarity index 100% rename from jdk/test/java/lang/invoke/8177146/TestMethodHandleBind.java rename to test/jdk/java/lang/invoke/8177146/TestMethodHandleBind.java diff --git a/jdk/test/java/lang/invoke/8177146/pkg/A.java b/test/jdk/java/lang/invoke/8177146/pkg/A.java similarity index 100% rename from jdk/test/java/lang/invoke/8177146/pkg/A.java rename to test/jdk/java/lang/invoke/8177146/pkg/A.java diff --git a/jdk/test/java/lang/invoke/AccessControlTest.java b/test/jdk/java/lang/invoke/AccessControlTest.java similarity index 100% rename from jdk/test/java/lang/invoke/AccessControlTest.java rename to test/jdk/java/lang/invoke/AccessControlTest.java diff --git a/jdk/test/java/lang/invoke/AccessControlTest_subpkg/Acquaintance_remote.java b/test/jdk/java/lang/invoke/AccessControlTest_subpkg/Acquaintance_remote.java similarity index 100% rename from jdk/test/java/lang/invoke/AccessControlTest_subpkg/Acquaintance_remote.java rename to test/jdk/java/lang/invoke/AccessControlTest_subpkg/Acquaintance_remote.java diff --git a/jdk/test/java/lang/invoke/ArrayConstructorTest.java b/test/jdk/java/lang/invoke/ArrayConstructorTest.java similarity index 100% rename from jdk/test/java/lang/invoke/ArrayConstructorTest.java rename to test/jdk/java/lang/invoke/ArrayConstructorTest.java diff --git a/jdk/test/java/lang/invoke/ArrayLengthTest.java b/test/jdk/java/lang/invoke/ArrayLengthTest.java similarity index 100% rename from jdk/test/java/lang/invoke/ArrayLengthTest.java rename to test/jdk/java/lang/invoke/ArrayLengthTest.java diff --git a/jdk/test/java/lang/invoke/BigArityTest.java b/test/jdk/java/lang/invoke/BigArityTest.java similarity index 100% rename from jdk/test/java/lang/invoke/BigArityTest.java rename to test/jdk/java/lang/invoke/BigArityTest.java diff --git a/jdk/test/java/lang/invoke/CallSiteTest.java b/test/jdk/java/lang/invoke/CallSiteTest.java similarity index 100% rename from jdk/test/java/lang/invoke/CallSiteTest.java rename to test/jdk/java/lang/invoke/CallSiteTest.java diff --git a/jdk/test/java/lang/invoke/CallStaticInitOrder.java b/test/jdk/java/lang/invoke/CallStaticInitOrder.java similarity index 100% rename from jdk/test/java/lang/invoke/CallStaticInitOrder.java rename to test/jdk/java/lang/invoke/CallStaticInitOrder.java diff --git a/jdk/test/java/lang/invoke/ClassValueTest.java b/test/jdk/java/lang/invoke/ClassValueTest.java similarity index 100% rename from jdk/test/java/lang/invoke/ClassValueTest.java rename to test/jdk/java/lang/invoke/ClassValueTest.java diff --git a/jdk/test/java/lang/invoke/CompileThresholdBootstrapTest.java b/test/jdk/java/lang/invoke/CompileThresholdBootstrapTest.java similarity index 100% rename from jdk/test/java/lang/invoke/CompileThresholdBootstrapTest.java rename to test/jdk/java/lang/invoke/CompileThresholdBootstrapTest.java diff --git a/jdk/test/java/lang/invoke/ConstantIdentityMHTest.java b/test/jdk/java/lang/invoke/ConstantIdentityMHTest.java similarity index 100% rename from jdk/test/java/lang/invoke/ConstantIdentityMHTest.java rename to test/jdk/java/lang/invoke/ConstantIdentityMHTest.java diff --git a/jdk/test/java/lang/invoke/CountedLoopIterationCountsTest.java b/test/jdk/java/lang/invoke/CountedLoopIterationCountsTest.java similarity index 100% rename from jdk/test/java/lang/invoke/CountedLoopIterationCountsTest.java rename to test/jdk/java/lang/invoke/CountedLoopIterationCountsTest.java diff --git a/jdk/test/java/lang/invoke/CustomizedLambdaFormTest.java b/test/jdk/java/lang/invoke/CustomizedLambdaFormTest.java similarity index 100% rename from jdk/test/java/lang/invoke/CustomizedLambdaFormTest.java rename to test/jdk/java/lang/invoke/CustomizedLambdaFormTest.java diff --git a/jdk/test/java/lang/invoke/DefineClassTest.java b/test/jdk/java/lang/invoke/DefineClassTest.java similarity index 100% rename from jdk/test/java/lang/invoke/DefineClassTest.java rename to test/jdk/java/lang/invoke/DefineClassTest.java diff --git a/jdk/test/java/lang/invoke/DropArgumentsTest.java b/test/jdk/java/lang/invoke/DropArgumentsTest.java similarity index 100% rename from jdk/test/java/lang/invoke/DropArgumentsTest.java rename to test/jdk/java/lang/invoke/DropArgumentsTest.java diff --git a/jdk/test/java/lang/invoke/DropLookupModeTest.java b/test/jdk/java/lang/invoke/DropLookupModeTest.java similarity index 100% rename from jdk/test/java/lang/invoke/DropLookupModeTest.java rename to test/jdk/java/lang/invoke/DropLookupModeTest.java diff --git a/jdk/test/java/lang/invoke/ExplicitCastArgumentsTest.java b/test/jdk/java/lang/invoke/ExplicitCastArgumentsTest.java similarity index 100% rename from jdk/test/java/lang/invoke/ExplicitCastArgumentsTest.java rename to test/jdk/java/lang/invoke/ExplicitCastArgumentsTest.java diff --git a/jdk/test/java/lang/invoke/FindAccessTest.java b/test/jdk/java/lang/invoke/FindAccessTest.java similarity index 100% rename from jdk/test/java/lang/invoke/FindAccessTest.java rename to test/jdk/java/lang/invoke/FindAccessTest.java diff --git a/jdk/test/java/lang/invoke/FindClassSecurityManager.java b/test/jdk/java/lang/invoke/FindClassSecurityManager.java similarity index 100% rename from jdk/test/java/lang/invoke/FindClassSecurityManager.java rename to test/jdk/java/lang/invoke/FindClassSecurityManager.java diff --git a/jdk/test/java/lang/invoke/FoldTest.java b/test/jdk/java/lang/invoke/FoldTest.java similarity index 100% rename from jdk/test/java/lang/invoke/FoldTest.java rename to test/jdk/java/lang/invoke/FoldTest.java diff --git a/jdk/test/java/lang/invoke/InvokeDynamicPrintArgs.java b/test/jdk/java/lang/invoke/InvokeDynamicPrintArgs.java similarity index 100% rename from jdk/test/java/lang/invoke/InvokeDynamicPrintArgs.java rename to test/jdk/java/lang/invoke/InvokeDynamicPrintArgs.java diff --git a/jdk/test/java/lang/invoke/InvokeGenericTest.java b/test/jdk/java/lang/invoke/InvokeGenericTest.java similarity index 100% rename from jdk/test/java/lang/invoke/InvokeGenericTest.java rename to test/jdk/java/lang/invoke/InvokeGenericTest.java diff --git a/jdk/test/java/lang/invoke/JavaDocExamplesTest.java b/test/jdk/java/lang/invoke/JavaDocExamplesTest.java similarity index 100% rename from jdk/test/java/lang/invoke/JavaDocExamplesTest.java rename to test/jdk/java/lang/invoke/JavaDocExamplesTest.java diff --git a/jdk/test/java/lang/invoke/JavaUtilConcurrentLookupTest.java b/test/jdk/java/lang/invoke/JavaUtilConcurrentLookupTest.java similarity index 100% rename from jdk/test/java/lang/invoke/JavaUtilConcurrentLookupTest.java rename to test/jdk/java/lang/invoke/JavaUtilConcurrentLookupTest.java diff --git a/jdk/test/java/lang/invoke/LFCaching/LFCachingTestCase.java b/test/jdk/java/lang/invoke/LFCaching/LFCachingTestCase.java similarity index 100% rename from jdk/test/java/lang/invoke/LFCaching/LFCachingTestCase.java rename to test/jdk/java/lang/invoke/LFCaching/LFCachingTestCase.java diff --git a/jdk/test/java/lang/invoke/LFCaching/LFGarbageCollectedTest.java b/test/jdk/java/lang/invoke/LFCaching/LFGarbageCollectedTest.java similarity index 100% rename from jdk/test/java/lang/invoke/LFCaching/LFGarbageCollectedTest.java rename to test/jdk/java/lang/invoke/LFCaching/LFGarbageCollectedTest.java diff --git a/jdk/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java b/test/jdk/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java similarity index 100% rename from jdk/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java rename to test/jdk/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java diff --git a/jdk/test/java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java b/test/jdk/java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java similarity index 100% rename from jdk/test/java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java rename to test/jdk/java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java diff --git a/jdk/test/java/lang/invoke/LFCaching/LambdaFormTestCase.java b/test/jdk/java/lang/invoke/LFCaching/LambdaFormTestCase.java similarity index 100% rename from jdk/test/java/lang/invoke/LFCaching/LambdaFormTestCase.java rename to test/jdk/java/lang/invoke/LFCaching/LambdaFormTestCase.java diff --git a/jdk/test/java/lang/invoke/LFCaching/TestMethods.java b/test/jdk/java/lang/invoke/LFCaching/TestMethods.java similarity index 100% rename from jdk/test/java/lang/invoke/LFCaching/TestMethods.java rename to test/jdk/java/lang/invoke/LFCaching/TestMethods.java diff --git a/jdk/test/java/lang/invoke/LambdaFormTest.java b/test/jdk/java/lang/invoke/LambdaFormTest.java similarity index 100% rename from jdk/test/java/lang/invoke/LambdaFormTest.java rename to test/jdk/java/lang/invoke/LambdaFormTest.java diff --git a/jdk/test/java/lang/invoke/LoopCombinatorLongSignatureTest.java b/test/jdk/java/lang/invoke/LoopCombinatorLongSignatureTest.java similarity index 100% rename from jdk/test/java/lang/invoke/LoopCombinatorLongSignatureTest.java rename to test/jdk/java/lang/invoke/LoopCombinatorLongSignatureTest.java diff --git a/jdk/test/java/lang/invoke/LoopCombinatorTest.java b/test/jdk/java/lang/invoke/LoopCombinatorTest.java similarity index 100% rename from jdk/test/java/lang/invoke/LoopCombinatorTest.java rename to test/jdk/java/lang/invoke/LoopCombinatorTest.java diff --git a/jdk/test/java/lang/invoke/MethodHandleConstants.java b/test/jdk/java/lang/invoke/MethodHandleConstants.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandleConstants.java rename to test/jdk/java/lang/invoke/MethodHandleConstants.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java b/test/jdk/java/lang/invoke/MethodHandles/CatchExceptionTest.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java rename to test/jdk/java/lang/invoke/MethodHandles/CatchExceptionTest.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/TestCatchException.java b/test/jdk/java/lang/invoke/MethodHandles/TestCatchException.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/TestCatchException.java rename to test/jdk/java/lang/invoke/MethodHandles/TestCatchException.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/Driver.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/Driver.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/Driver.java rename to test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/Driver.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/Unnamed.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/Unnamed.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/Unnamed.java rename to test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/Unnamed.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/m1/module-info.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/m1/module-info.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/m1/module-info.java rename to test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/m1/module-info.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/m1/p1/Type.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/m1/p1/Type.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/m1/p1/Type.java rename to test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/m1/p1/Type.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/m2/module-info.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/m2/module-info.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/m2/module-info.java rename to test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/m2/module-info.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/m2/p2/Type.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/m2/p2/Type.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/m2/p2/Type.java rename to test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/m2/p2/Type.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/m3/module-info.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/m3/module-info.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/m3/module-info.java rename to test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/m3/module-info.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/m3/p3/Type.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/m3/p3/Type.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/m3/p3/Type.java rename to test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/m3/p3/Type.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/module-info.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/module-info.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/module-info.java rename to test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/module-info.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java rename to test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/internal/NonPublicType.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/p/internal/NonPublicType.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/internal/NonPublicType.java rename to test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/p/internal/NonPublicType.java diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/internal/PublicType.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/p/internal/PublicType.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/internal/PublicType.java rename to test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/p/internal/PublicType.java diff --git a/jdk/test/java/lang/invoke/MethodHandlesTest.java b/test/jdk/java/lang/invoke/MethodHandlesTest.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodHandlesTest.java rename to test/jdk/java/lang/invoke/MethodHandlesTest.java diff --git a/jdk/test/java/lang/invoke/MethodTypeTest.java b/test/jdk/java/lang/invoke/MethodTypeTest.java similarity index 100% rename from jdk/test/java/lang/invoke/MethodTypeTest.java rename to test/jdk/java/lang/invoke/MethodTypeTest.java diff --git a/jdk/test/java/lang/invoke/ObjectMethodInInterfaceTest.java b/test/jdk/java/lang/invoke/ObjectMethodInInterfaceTest.java similarity index 100% rename from jdk/test/java/lang/invoke/ObjectMethodInInterfaceTest.java rename to test/jdk/java/lang/invoke/ObjectMethodInInterfaceTest.java diff --git a/jdk/test/java/lang/invoke/PermuteArgsReturnVoidTest.java b/test/jdk/java/lang/invoke/PermuteArgsReturnVoidTest.java similarity index 100% rename from jdk/test/java/lang/invoke/PermuteArgsReturnVoidTest.java rename to test/jdk/java/lang/invoke/PermuteArgsReturnVoidTest.java diff --git a/jdk/test/java/lang/invoke/PermuteArgsTest.java b/test/jdk/java/lang/invoke/PermuteArgsTest.java similarity index 100% rename from jdk/test/java/lang/invoke/PermuteArgsTest.java rename to test/jdk/java/lang/invoke/PermuteArgsTest.java diff --git a/jdk/test/java/lang/invoke/PrivateInvokeTest.java b/test/jdk/java/lang/invoke/PrivateInvokeTest.java similarity index 100% rename from jdk/test/java/lang/invoke/PrivateInvokeTest.java rename to test/jdk/java/lang/invoke/PrivateInvokeTest.java diff --git a/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java b/test/jdk/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java similarity index 100% rename from jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java rename to test/jdk/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java diff --git a/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java b/test/jdk/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java similarity index 100% rename from jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java rename to test/jdk/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java diff --git a/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java b/test/jdk/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java similarity index 100% rename from jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java rename to test/jdk/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java diff --git a/jdk/test/java/lang/invoke/RevealDirectTest.java b/test/jdk/java/lang/invoke/RevealDirectTest.java similarity index 100% rename from jdk/test/java/lang/invoke/RevealDirectTest.java rename to test/jdk/java/lang/invoke/RevealDirectTest.java diff --git a/jdk/test/java/lang/invoke/RicochetTest.java b/test/jdk/java/lang/invoke/RicochetTest.java similarity index 100% rename from jdk/test/java/lang/invoke/RicochetTest.java rename to test/jdk/java/lang/invoke/RicochetTest.java diff --git a/jdk/test/java/lang/invoke/SpreadCollectTest.java b/test/jdk/java/lang/invoke/SpreadCollectTest.java similarity index 100% rename from jdk/test/java/lang/invoke/SpreadCollectTest.java rename to test/jdk/java/lang/invoke/SpreadCollectTest.java diff --git a/jdk/test/java/lang/invoke/TestCatchExceptionWithVarargs.java b/test/jdk/java/lang/invoke/TestCatchExceptionWithVarargs.java similarity index 100% rename from jdk/test/java/lang/invoke/TestCatchExceptionWithVarargs.java rename to test/jdk/java/lang/invoke/TestCatchExceptionWithVarargs.java diff --git a/jdk/test/java/lang/invoke/TestPrivateMember.java b/test/jdk/java/lang/invoke/TestPrivateMember.java similarity index 100% rename from jdk/test/java/lang/invoke/TestPrivateMember.java rename to test/jdk/java/lang/invoke/TestPrivateMember.java diff --git a/jdk/test/java/lang/invoke/ThrowExceptionsTest.java b/test/jdk/java/lang/invoke/ThrowExceptionsTest.java similarity index 100% rename from jdk/test/java/lang/invoke/ThrowExceptionsTest.java rename to test/jdk/java/lang/invoke/ThrowExceptionsTest.java diff --git a/jdk/test/java/lang/invoke/TryFinallyTest.java b/test/jdk/java/lang/invoke/TryFinallyTest.java similarity index 100% rename from jdk/test/java/lang/invoke/TryFinallyTest.java rename to test/jdk/java/lang/invoke/TryFinallyTest.java diff --git a/jdk/test/java/lang/invoke/VMAnonymousClass.java b/test/jdk/java/lang/invoke/VMAnonymousClass.java similarity index 100% rename from jdk/test/java/lang/invoke/VMAnonymousClass.java rename to test/jdk/java/lang/invoke/VMAnonymousClass.java diff --git a/jdk/test/java/lang/invoke/VarArgsTest.java b/test/jdk/java/lang/invoke/VarArgsTest.java similarity index 100% rename from jdk/test/java/lang/invoke/VarArgsTest.java rename to test/jdk/java/lang/invoke/VarArgsTest.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleBaseTest.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseTest.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleBaseTest.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleBaseTest.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessModeMethodNames.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessModeMethodNames.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessModeMethodNames.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessModeMethodNames.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestReflection.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestReflection.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/VarHandleTestReflection.java rename to test/jdk/java/lang/invoke/VarHandles/VarHandleTestReflection.java diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template rename to test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template rename to test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template rename to test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template rename to test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template diff --git a/jdk/test/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java b/test/jdk/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java rename to test/jdk/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java diff --git a/jdk/test/java/lang/invoke/VarHandles/accessibility/pkg/A.java b/test/jdk/java/lang/invoke/VarHandles/accessibility/pkg/A.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/accessibility/pkg/A.java rename to test/jdk/java/lang/invoke/VarHandles/accessibility/pkg/A.java diff --git a/jdk/test/java/lang/invoke/VarHandles/accessibility/pkg/B_extends_A.java b/test/jdk/java/lang/invoke/VarHandles/accessibility/pkg/B_extends_A.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/accessibility/pkg/B_extends_A.java rename to test/jdk/java/lang/invoke/VarHandles/accessibility/pkg/B_extends_A.java diff --git a/jdk/test/java/lang/invoke/VarHandles/accessibility/pkg/C.java b/test/jdk/java/lang/invoke/VarHandles/accessibility/pkg/C.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/accessibility/pkg/C.java rename to test/jdk/java/lang/invoke/VarHandles/accessibility/pkg/C.java diff --git a/jdk/test/java/lang/invoke/VarHandles/accessibility/pkg/subpkg/B_extends_A.java b/test/jdk/java/lang/invoke/VarHandles/accessibility/pkg/subpkg/B_extends_A.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/accessibility/pkg/subpkg/B_extends_A.java rename to test/jdk/java/lang/invoke/VarHandles/accessibility/pkg/subpkg/B_extends_A.java diff --git a/jdk/test/java/lang/invoke/VarHandles/accessibility/pkg/subpkg/C.java b/test/jdk/java/lang/invoke/VarHandles/accessibility/pkg/subpkg/C.java similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/accessibility/pkg/subpkg/C.java rename to test/jdk/java/lang/invoke/VarHandles/accessibility/pkg/subpkg/C.java diff --git a/jdk/test/java/lang/invoke/VarHandles/generate-vh-tests.sh b/test/jdk/java/lang/invoke/VarHandles/generate-vh-tests.sh similarity index 100% rename from jdk/test/java/lang/invoke/VarHandles/generate-vh-tests.sh rename to test/jdk/java/lang/invoke/VarHandles/generate-vh-tests.sh diff --git a/jdk/test/java/lang/invoke/VarargsArrayTest.java b/test/jdk/java/lang/invoke/VarargsArrayTest.java similarity index 100% rename from jdk/test/java/lang/invoke/VarargsArrayTest.java rename to test/jdk/java/lang/invoke/VarargsArrayTest.java diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/BogoLoader.java b/test/jdk/java/lang/invoke/accessProtectedSuper/BogoLoader.java similarity index 100% rename from jdk/test/java/lang/invoke/accessProtectedSuper/BogoLoader.java rename to test/jdk/java/lang/invoke/accessProtectedSuper/BogoLoader.java diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/MethodInvoker.java b/test/jdk/java/lang/invoke/accessProtectedSuper/MethodInvoker.java similarity index 100% rename from jdk/test/java/lang/invoke/accessProtectedSuper/MethodInvoker.java rename to test/jdk/java/lang/invoke/accessProtectedSuper/MethodInvoker.java diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java b/test/jdk/java/lang/invoke/accessProtectedSuper/Test.java similarity index 100% rename from jdk/test/java/lang/invoke/accessProtectedSuper/Test.java rename to test/jdk/java/lang/invoke/accessProtectedSuper/Test.java diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java b/test/jdk/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java similarity index 100% rename from jdk/test/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java rename to test/jdk/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java diff --git a/jdk/test/java/lang/invoke/common/test/java/lang/invoke/lib/CodeCacheOverflowProcessor.java b/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/CodeCacheOverflowProcessor.java similarity index 100% rename from jdk/test/java/lang/invoke/common/test/java/lang/invoke/lib/CodeCacheOverflowProcessor.java rename to test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/CodeCacheOverflowProcessor.java diff --git a/jdk/test/java/lang/invoke/common/test/java/lang/invoke/lib/Helper.java b/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/Helper.java similarity index 100% rename from jdk/test/java/lang/invoke/common/test/java/lang/invoke/lib/Helper.java rename to test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/Helper.java diff --git a/jdk/test/java/lang/invoke/findclass.security.policy b/test/jdk/java/lang/invoke/findclass.security.policy similarity index 100% rename from jdk/test/java/lang/invoke/findclass.security.policy rename to test/jdk/java/lang/invoke/findclass.security.policy diff --git a/jdk/test/java/lang/invoke/indify/Indify.java b/test/jdk/java/lang/invoke/indify/Indify.java similarity index 100% rename from jdk/test/java/lang/invoke/indify/Indify.java rename to test/jdk/java/lang/invoke/indify/Indify.java diff --git a/jdk/test/java/lang/invoke/java.base/java/lang/invoke/MethodHandleHelper.java b/test/jdk/java/lang/invoke/java.base/java/lang/invoke/MethodHandleHelper.java similarity index 100% rename from jdk/test/java/lang/invoke/java.base/java/lang/invoke/MethodHandleHelper.java rename to test/jdk/java/lang/invoke/java.base/java/lang/invoke/MethodHandleHelper.java diff --git a/jdk/test/java/lang/invoke/java.base/java/util/concurrent/LookupTester.java b/test/jdk/java/lang/invoke/java.base/java/util/concurrent/LookupTester.java similarity index 100% rename from jdk/test/java/lang/invoke/java.base/java/util/concurrent/LookupTester.java rename to test/jdk/java/lang/invoke/java.base/java/util/concurrent/LookupTester.java diff --git a/jdk/test/java/lang/invoke/jtreg.security.policy b/test/jdk/java/lang/invoke/jtreg.security.policy similarity index 100% rename from jdk/test/java/lang/invoke/jtreg.security.policy rename to test/jdk/java/lang/invoke/jtreg.security.policy diff --git a/jdk/test/java/lang/invoke/lambda/DupIntf.java b/test/jdk/java/lang/invoke/lambda/DupIntf.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/DupIntf.java rename to test/jdk/java/lang/invoke/lambda/DupIntf.java diff --git a/jdk/test/java/lang/invoke/lambda/InheritedMethodTest.java b/test/jdk/java/lang/invoke/lambda/InheritedMethodTest.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/InheritedMethodTest.java rename to test/jdk/java/lang/invoke/lambda/InheritedMethodTest.java diff --git a/jdk/test/java/lang/invoke/lambda/LUtils.java b/test/jdk/java/lang/invoke/lambda/LUtils.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LUtils.java rename to test/jdk/java/lang/invoke/lambda/LUtils.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java b/test/jdk/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java rename to test/jdk/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlTest.java b/test/jdk/java/lang/invoke/lambda/LambdaAccessControlTest.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaAccessControlTest.java rename to test/jdk/java/lang/invoke/lambda/LambdaAccessControlTest.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaAsm.java b/test/jdk/java/lang/invoke/lambda/LambdaAsm.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaAsm.java rename to test/jdk/java/lang/invoke/lambda/LambdaAsm.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaClassFinal.java b/test/jdk/java/lang/invoke/lambda/LambdaClassFinal.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaClassFinal.java rename to test/jdk/java/lang/invoke/lambda/LambdaClassFinal.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaClassLoaderSerialization.java b/test/jdk/java/lang/invoke/lambda/LambdaClassLoaderSerialization.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaClassLoaderSerialization.java rename to test/jdk/java/lang/invoke/lambda/LambdaClassLoaderSerialization.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaClassSynthetic.java b/test/jdk/java/lang/invoke/lambda/LambdaClassSynthetic.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaClassSynthetic.java rename to test/jdk/java/lang/invoke/lambda/LambdaClassSynthetic.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaConstructorMethodHandleUnbox.java b/test/jdk/java/lang/invoke/lambda/LambdaConstructorMethodHandleUnbox.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaConstructorMethodHandleUnbox.java rename to test/jdk/java/lang/invoke/lambda/LambdaConstructorMethodHandleUnbox.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaReceiver.java b/test/jdk/java/lang/invoke/lambda/LambdaReceiver.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaReceiver.java rename to test/jdk/java/lang/invoke/lambda/LambdaReceiver.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaReceiverBridge.java b/test/jdk/java/lang/invoke/lambda/LambdaReceiverBridge.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaReceiverBridge.java rename to test/jdk/java/lang/invoke/lambda/LambdaReceiverBridge.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaReceiver_anotherpkg/LambdaReceiver_A.java b/test/jdk/java/lang/invoke/lambda/LambdaReceiver_anotherpkg/LambdaReceiver_A.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaReceiver_anotherpkg/LambdaReceiver_A.java rename to test/jdk/java/lang/invoke/lambda/LambdaReceiver_anotherpkg/LambdaReceiver_A.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaReturn.java b/test/jdk/java/lang/invoke/lambda/LambdaReturn.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaReturn.java rename to test/jdk/java/lang/invoke/lambda/LambdaReturn.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java b/test/jdk/java/lang/invoke/lambda/LambdaSerialization.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaSerialization.java rename to test/jdk/java/lang/invoke/lambda/LambdaSerialization.java diff --git a/jdk/test/java/lang/invoke/lambda/LambdaStackTrace.java b/test/jdk/java/lang/invoke/lambda/LambdaStackTrace.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LambdaStackTrace.java rename to test/jdk/java/lang/invoke/lambda/LambdaStackTrace.java diff --git a/jdk/test/java/lang/invoke/lambda/LogGeneratedClassesTest.java b/test/jdk/java/lang/invoke/lambda/LogGeneratedClassesTest.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/LogGeneratedClassesTest.java rename to test/jdk/java/lang/invoke/lambda/LogGeneratedClassesTest.java diff --git a/jdk/test/java/lang/invoke/lambda/MetafactoryArityTest.java b/test/jdk/java/lang/invoke/lambda/MetafactoryArityTest.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/MetafactoryArityTest.java rename to test/jdk/java/lang/invoke/lambda/MetafactoryArityTest.java diff --git a/jdk/test/java/lang/invoke/lambda/MetafactoryDescriptorTest.java b/test/jdk/java/lang/invoke/lambda/MetafactoryDescriptorTest.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/MetafactoryDescriptorTest.java rename to test/jdk/java/lang/invoke/lambda/MetafactoryDescriptorTest.java diff --git a/jdk/test/java/lang/invoke/lambda/MetafactoryMethodNameTest.java b/test/jdk/java/lang/invoke/lambda/MetafactoryMethodNameTest.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/MetafactoryMethodNameTest.java rename to test/jdk/java/lang/invoke/lambda/MetafactoryMethodNameTest.java diff --git a/jdk/test/java/lang/invoke/lambda/MetafactoryParameterCastTest.java b/test/jdk/java/lang/invoke/lambda/MetafactoryParameterCastTest.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/MetafactoryParameterCastTest.java rename to test/jdk/java/lang/invoke/lambda/MetafactoryParameterCastTest.java diff --git a/jdk/test/java/lang/invoke/lambda/RepetitiveLambdaSerialization.java b/test/jdk/java/lang/invoke/lambda/RepetitiveLambdaSerialization.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/RepetitiveLambdaSerialization.java rename to test/jdk/java/lang/invoke/lambda/RepetitiveLambdaSerialization.java diff --git a/jdk/test/java/lang/invoke/lambda/T8032697.java b/test/jdk/java/lang/invoke/lambda/T8032697.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/T8032697.java rename to test/jdk/java/lang/invoke/lambda/T8032697.java diff --git a/jdk/test/java/lang/invoke/lambda/T8032697_anotherpkg/T8032697_A.java b/test/jdk/java/lang/invoke/lambda/T8032697_anotherpkg/T8032697_A.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/T8032697_anotherpkg/T8032697_A.java rename to test/jdk/java/lang/invoke/lambda/T8032697_anotherpkg/T8032697_A.java diff --git a/jdk/test/java/lang/invoke/lambda/T8032704.java b/test/jdk/java/lang/invoke/lambda/T8032704.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/T8032704.java rename to test/jdk/java/lang/invoke/lambda/T8032704.java diff --git a/jdk/test/java/lang/invoke/lambda/T8032711.java b/test/jdk/java/lang/invoke/lambda/T8032711.java similarity index 100% rename from jdk/test/java/lang/invoke/lambda/T8032711.java rename to test/jdk/java/lang/invoke/lambda/T8032711.java diff --git a/jdk/test/java/lang/invoke/lookup/ReflectiveLookupTest.java b/test/jdk/java/lang/invoke/lookup/ReflectiveLookupTest.java similarity index 100% rename from jdk/test/java/lang/invoke/lookup/ReflectiveLookupTest.java rename to test/jdk/java/lang/invoke/lookup/ReflectiveLookupTest.java diff --git a/jdk/test/java/lang/invoke/lookup/SpecialStatic.java b/test/jdk/java/lang/invoke/lookup/SpecialStatic.java similarity index 100% rename from jdk/test/java/lang/invoke/lookup/SpecialStatic.java rename to test/jdk/java/lang/invoke/lookup/SpecialStatic.java diff --git a/jdk/test/java/lang/invoke/lookup/java.base/java/lang/LookupTest.java b/test/jdk/java/lang/invoke/lookup/java.base/java/lang/LookupTest.java similarity index 100% rename from jdk/test/java/lang/invoke/lookup/java.base/java/lang/LookupTest.java rename to test/jdk/java/lang/invoke/lookup/java.base/java/lang/LookupTest.java diff --git a/jdk/test/java/lang/invoke/modules/Driver.java b/test/jdk/java/lang/invoke/modules/Driver.java similarity index 100% rename from jdk/test/java/lang/invoke/modules/Driver.java rename to test/jdk/java/lang/invoke/modules/Driver.java diff --git a/jdk/test/java/lang/invoke/modules/Unnamed.java b/test/jdk/java/lang/invoke/modules/Unnamed.java similarity index 100% rename from jdk/test/java/lang/invoke/modules/Unnamed.java rename to test/jdk/java/lang/invoke/modules/Unnamed.java diff --git a/jdk/test/java/lang/invoke/modules/m1/module-info.java b/test/jdk/java/lang/invoke/modules/m1/module-info.java similarity index 100% rename from jdk/test/java/lang/invoke/modules/m1/module-info.java rename to test/jdk/java/lang/invoke/modules/m1/module-info.java diff --git a/jdk/test/java/lang/invoke/modules/m1/p1/Main.java b/test/jdk/java/lang/invoke/modules/m1/p1/Main.java similarity index 100% rename from jdk/test/java/lang/invoke/modules/m1/p1/Main.java rename to test/jdk/java/lang/invoke/modules/m1/p1/Main.java diff --git a/jdk/test/java/lang/invoke/modules/m1/p1/Type1.java b/test/jdk/java/lang/invoke/modules/m1/p1/Type1.java similarity index 100% rename from jdk/test/java/lang/invoke/modules/m1/p1/Type1.java rename to test/jdk/java/lang/invoke/modules/m1/p1/Type1.java diff --git a/jdk/test/java/lang/invoke/modules/m1/p2/Type2.java b/test/jdk/java/lang/invoke/modules/m1/p2/Type2.java similarity index 100% rename from jdk/test/java/lang/invoke/modules/m1/p2/Type2.java rename to test/jdk/java/lang/invoke/modules/m1/p2/Type2.java diff --git a/jdk/test/java/lang/invoke/modules/m2/module-info.java b/test/jdk/java/lang/invoke/modules/m2/module-info.java similarity index 100% rename from jdk/test/java/lang/invoke/modules/m2/module-info.java rename to test/jdk/java/lang/invoke/modules/m2/module-info.java diff --git a/jdk/test/java/lang/invoke/modules/m2/q1/Type1.java b/test/jdk/java/lang/invoke/modules/m2/q1/Type1.java similarity index 100% rename from jdk/test/java/lang/invoke/modules/m2/q1/Type1.java rename to test/jdk/java/lang/invoke/modules/m2/q1/Type1.java diff --git a/jdk/test/java/lang/invoke/modules/m2/q2/Type2.java b/test/jdk/java/lang/invoke/modules/m2/q2/Type2.java similarity index 100% rename from jdk/test/java/lang/invoke/modules/m2/q2/Type2.java rename to test/jdk/java/lang/invoke/modules/m2/q2/Type2.java diff --git a/jdk/test/java/lang/invoke/remote/RemoteExample.java b/test/jdk/java/lang/invoke/remote/RemoteExample.java similarity index 100% rename from jdk/test/java/lang/invoke/remote/RemoteExample.java rename to test/jdk/java/lang/invoke/remote/RemoteExample.java diff --git a/jdk/test/java/lang/invoke/t8150782/TestAccessClass.java b/test/jdk/java/lang/invoke/t8150782/TestAccessClass.java similarity index 100% rename from jdk/test/java/lang/invoke/t8150782/TestAccessClass.java rename to test/jdk/java/lang/invoke/t8150782/TestAccessClass.java diff --git a/jdk/test/java/lang/invoke/t8150782/TestCls.java b/test/jdk/java/lang/invoke/t8150782/TestCls.java similarity index 100% rename from jdk/test/java/lang/invoke/t8150782/TestCls.java rename to test/jdk/java/lang/invoke/t8150782/TestCls.java diff --git a/jdk/test/java/lang/invoke/t8150782/TestFindClass.java b/test/jdk/java/lang/invoke/t8150782/TestFindClass.java similarity index 100% rename from jdk/test/java/lang/invoke/t8150782/TestFindClass.java rename to test/jdk/java/lang/invoke/t8150782/TestFindClass.java diff --git a/jdk/test/java/lang/invoke/t8150782/TestLookup.java b/test/jdk/java/lang/invoke/t8150782/TestLookup.java similarity index 100% rename from jdk/test/java/lang/invoke/t8150782/TestLookup.java rename to test/jdk/java/lang/invoke/t8150782/TestLookup.java diff --git a/jdk/test/java/lang/management/BufferPoolMXBean/Basic.java b/test/jdk/java/lang/management/BufferPoolMXBean/Basic.java similarity index 100% rename from jdk/test/java/lang/management/BufferPoolMXBean/Basic.java rename to test/jdk/java/lang/management/BufferPoolMXBean/Basic.java diff --git a/jdk/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java b/test/jdk/java/lang/management/ClassLoadingMXBean/LoadCounts.java similarity index 100% rename from jdk/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java rename to test/jdk/java/lang/management/ClassLoadingMXBean/LoadCounts.java diff --git a/jdk/test/java/lang/management/CompilationMXBean/Basic.java b/test/jdk/java/lang/management/CompilationMXBean/Basic.java similarity index 100% rename from jdk/test/java/lang/management/CompilationMXBean/Basic.java rename to test/jdk/java/lang/management/CompilationMXBean/Basic.java diff --git a/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java b/test/jdk/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java similarity index 100% rename from jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java rename to test/jdk/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java diff --git a/jdk/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java b/test/jdk/java/lang/management/CompositeData/MemoryUsageCompositeData.java similarity index 100% rename from jdk/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java rename to test/jdk/java/lang/management/CompositeData/MemoryUsageCompositeData.java diff --git a/jdk/test/java/lang/management/CompositeData/OpenTypeConverter.java b/test/jdk/java/lang/management/CompositeData/OpenTypeConverter.java similarity index 100% rename from jdk/test/java/lang/management/CompositeData/OpenTypeConverter.java rename to test/jdk/java/lang/management/CompositeData/OpenTypeConverter.java diff --git a/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java b/test/jdk/java/lang/management/CompositeData/ThreadInfoCompositeData.java similarity index 100% rename from jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java rename to test/jdk/java/lang/management/CompositeData/ThreadInfoCompositeData.java diff --git a/jdk/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java b/test/jdk/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java similarity index 100% rename from jdk/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java rename to test/jdk/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java diff --git a/jdk/test/java/lang/management/MXBean/MXBeanBehavior.java b/test/jdk/java/lang/management/MXBean/MXBeanBehavior.java similarity index 100% rename from jdk/test/java/lang/management/MXBean/MXBeanBehavior.java rename to test/jdk/java/lang/management/MXBean/MXBeanBehavior.java diff --git a/jdk/test/java/lang/management/ManagementFactory/DefaultManagementProviderTest.java b/test/jdk/java/lang/management/ManagementFactory/DefaultManagementProviderTest.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/DefaultManagementProviderTest.java rename to test/jdk/java/lang/management/ManagementFactory/DefaultManagementProviderTest.java diff --git a/jdk/test/java/lang/management/ManagementFactory/GetObjectName.java b/test/jdk/java/lang/management/ManagementFactory/GetObjectName.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/GetObjectName.java rename to test/jdk/java/lang/management/ManagementFactory/GetObjectName.java diff --git a/jdk/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java b/test/jdk/java/lang/management/ManagementFactory/GetPlatformMXBeans.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java rename to test/jdk/java/lang/management/ManagementFactory/GetPlatformMXBeans.java diff --git a/jdk/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java b/test/jdk/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java rename to test/jdk/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java diff --git a/jdk/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java b/test/jdk/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java rename to test/jdk/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java diff --git a/jdk/test/java/lang/management/ManagementFactory/MXBeanException.java b/test/jdk/java/lang/management/ManagementFactory/MXBeanException.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/MXBeanException.java rename to test/jdk/java/lang/management/ManagementFactory/MXBeanException.java diff --git a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java b/test/jdk/java/lang/management/ManagementFactory/MXBeanProxyTest.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java rename to test/jdk/java/lang/management/ManagementFactory/MXBeanProxyTest.java diff --git a/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java b/test/jdk/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java rename to test/jdk/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java diff --git a/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java b/test/jdk/java/lang/management/ManagementFactory/ProxyExceptions.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java rename to test/jdk/java/lang/management/ManagementFactory/ProxyExceptions.java diff --git a/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java b/test/jdk/java/lang/management/ManagementFactory/ProxyTypeMapping.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java rename to test/jdk/java/lang/management/ManagementFactory/ProxyTypeMapping.java diff --git a/jdk/test/java/lang/management/ManagementFactory/StateTest.java b/test/jdk/java/lang/management/ManagementFactory/StateTest.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/StateTest.java rename to test/jdk/java/lang/management/ManagementFactory/StateTest.java diff --git a/jdk/test/java/lang/management/ManagementFactory/StateTestMBean.java b/test/jdk/java/lang/management/ManagementFactory/StateTestMBean.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/StateTestMBean.java rename to test/jdk/java/lang/management/ManagementFactory/StateTestMBean.java diff --git a/jdk/test/java/lang/management/ManagementFactory/TEST.properties b/test/jdk/java/lang/management/ManagementFactory/TEST.properties similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/TEST.properties rename to test/jdk/java/lang/management/ManagementFactory/TEST.properties diff --git a/jdk/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java b/test/jdk/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java rename to test/jdk/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java diff --git a/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java b/test/jdk/java/lang/management/ManagementFactory/ValidateOpenTypes.java similarity index 100% rename from jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java rename to test/jdk/java/lang/management/ManagementFactory/ValidateOpenTypes.java diff --git a/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java b/test/jdk/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java rename to test/jdk/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java diff --git a/jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java b/test/jdk/java/lang/management/MemoryMXBean/GetMBeanInfo.java similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java rename to test/jdk/java/lang/management/MemoryMXBean/GetMBeanInfo.java diff --git a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java b/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest.java similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java rename to test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest.java diff --git a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.java b/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest2.java similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.java rename to test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest2.java diff --git a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh b/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest2.sh similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh rename to test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest2.sh diff --git a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java b/test/jdk/java/lang/management/MemoryMXBean/MemoryManagement.java similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java rename to test/jdk/java/lang/management/MemoryMXBean/MemoryManagement.java diff --git a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh b/test/jdk/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh rename to test/jdk/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh diff --git a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh b/test/jdk/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh rename to test/jdk/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh diff --git a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh b/test/jdk/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh rename to test/jdk/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh diff --git a/jdk/test/java/lang/management/MemoryMXBean/MemoryTest.java b/test/jdk/java/lang/management/MemoryMXBean/MemoryTest.java similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/MemoryTest.java rename to test/jdk/java/lang/management/MemoryMXBean/MemoryTest.java diff --git a/jdk/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh b/test/jdk/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh rename to test/jdk/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh diff --git a/jdk/test/java/lang/management/MemoryMXBean/MemoryUtil.java b/test/jdk/java/lang/management/MemoryMXBean/MemoryUtil.java similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/MemoryUtil.java rename to test/jdk/java/lang/management/MemoryMXBean/MemoryUtil.java diff --git a/jdk/test/java/lang/management/MemoryMXBean/Pending.java b/test/jdk/java/lang/management/MemoryMXBean/Pending.java similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/Pending.java rename to test/jdk/java/lang/management/MemoryMXBean/Pending.java diff --git a/jdk/test/java/lang/management/MemoryMXBean/PendingAllGC.sh b/test/jdk/java/lang/management/MemoryMXBean/PendingAllGC.sh similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/PendingAllGC.sh rename to test/jdk/java/lang/management/MemoryMXBean/PendingAllGC.sh diff --git a/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java b/test/jdk/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java rename to test/jdk/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java diff --git a/jdk/test/java/lang/management/MemoryMXBean/RunUtil.java b/test/jdk/java/lang/management/MemoryMXBean/RunUtil.java similarity index 100% rename from jdk/test/java/lang/management/MemoryMXBean/RunUtil.java rename to test/jdk/java/lang/management/MemoryMXBean/RunUtil.java diff --git a/jdk/test/java/lang/management/MemoryPoolMXBean/LargeHeapThresholdTest.java b/test/jdk/java/lang/management/MemoryPoolMXBean/LargeHeapThresholdTest.java similarity index 100% rename from jdk/test/java/lang/management/MemoryPoolMXBean/LargeHeapThresholdTest.java rename to test/jdk/java/lang/management/MemoryPoolMXBean/LargeHeapThresholdTest.java diff --git a/jdk/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java b/test/jdk/java/lang/management/MemoryPoolMXBean/ThresholdTest.java similarity index 100% rename from jdk/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java rename to test/jdk/java/lang/management/MemoryPoolMXBean/ThresholdTest.java diff --git a/jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java b/test/jdk/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java similarity index 100% rename from jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java rename to test/jdk/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java diff --git a/jdk/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java b/test/jdk/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java similarity index 100% rename from jdk/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java rename to test/jdk/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java diff --git a/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh b/test/jdk/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh similarity index 100% rename from jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh rename to test/jdk/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh diff --git a/jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java b/test/jdk/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java similarity index 100% rename from jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java rename to test/jdk/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java diff --git a/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java b/test/jdk/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java similarity index 100% rename from jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java rename to test/jdk/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java diff --git a/jdk/test/java/lang/management/PlatformLoggingMXBean/TEST.properties b/test/jdk/java/lang/management/PlatformLoggingMXBean/TEST.properties similarity index 100% rename from jdk/test/java/lang/management/PlatformLoggingMXBean/TEST.properties rename to test/jdk/java/lang/management/PlatformLoggingMXBean/TEST.properties diff --git a/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java b/test/jdk/java/lang/management/RuntimeMXBean/GetSystemProperties.java similarity index 100% rename from jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java rename to test/jdk/java/lang/management/RuntimeMXBean/GetSystemProperties.java diff --git a/jdk/test/java/lang/management/RuntimeMXBean/InputArgument.java b/test/jdk/java/lang/management/RuntimeMXBean/InputArgument.java similarity index 100% rename from jdk/test/java/lang/management/RuntimeMXBean/InputArgument.java rename to test/jdk/java/lang/management/RuntimeMXBean/InputArgument.java diff --git a/jdk/test/java/lang/management/RuntimeMXBean/PropertiesTest.java b/test/jdk/java/lang/management/RuntimeMXBean/PropertiesTest.java similarity index 100% rename from jdk/test/java/lang/management/RuntimeMXBean/PropertiesTest.java rename to test/jdk/java/lang/management/RuntimeMXBean/PropertiesTest.java diff --git a/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh b/test/jdk/java/lang/management/RuntimeMXBean/TestInputArgument.sh similarity index 100% rename from jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh rename to test/jdk/java/lang/management/RuntimeMXBean/TestInputArgument.sh diff --git a/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java b/test/jdk/java/lang/management/RuntimeMXBean/UpTime.java similarity index 100% rename from jdk/test/java/lang/management/RuntimeMXBean/UpTime.java rename to test/jdk/java/lang/management/RuntimeMXBean/UpTime.java diff --git a/jdk/test/java/lang/management/TEST.properties b/test/jdk/java/lang/management/TEST.properties similarity index 100% rename from jdk/test/java/lang/management/TEST.properties rename to test/jdk/java/lang/management/TEST.properties diff --git a/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java b/test/jdk/java/lang/management/ThreadMXBean/AllThreadIds.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java rename to test/jdk/java/lang/management/ThreadMXBean/AllThreadIds.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/Barrier.java b/test/jdk/java/lang/management/ThreadMXBean/Barrier.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/Barrier.java rename to test/jdk/java/lang/management/ThreadMXBean/Barrier.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/DisableTest.java b/test/jdk/java/lang/management/ThreadMXBean/DisableTest.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/DisableTest.java rename to test/jdk/java/lang/management/ThreadMXBean/DisableTest.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/EnableTest.java b/test/jdk/java/lang/management/ThreadMXBean/EnableTest.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/EnableTest.java rename to test/jdk/java/lang/management/ThreadMXBean/EnableTest.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java b/test/jdk/java/lang/management/ThreadMXBean/FindDeadlocks.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java rename to test/jdk/java/lang/management/ThreadMXBean/FindDeadlocks.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java b/test/jdk/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java rename to test/jdk/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/InvalidThreadID.java b/test/jdk/java/lang/management/ThreadMXBean/InvalidThreadID.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/InvalidThreadID.java rename to test/jdk/java/lang/management/ThreadMXBean/InvalidThreadID.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/LockedMonitors.java b/test/jdk/java/lang/management/ThreadMXBean/LockedMonitors.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/LockedMonitors.java rename to test/jdk/java/lang/management/ThreadMXBean/LockedMonitors.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java b/test/jdk/java/lang/management/ThreadMXBean/LockedSynchronizers.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java rename to test/jdk/java/lang/management/ThreadMXBean/LockedSynchronizers.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/LockingThread.java b/test/jdk/java/lang/management/ThreadMXBean/LockingThread.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/LockingThread.java rename to test/jdk/java/lang/management/ThreadMXBean/LockingThread.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/Locks.java b/test/jdk/java/lang/management/ThreadMXBean/Locks.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/Locks.java rename to test/jdk/java/lang/management/ThreadMXBean/Locks.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java b/test/jdk/java/lang/management/ThreadMXBean/MonitorDeadlock.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java rename to test/jdk/java/lang/management/ThreadMXBean/MonitorDeadlock.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java b/test/jdk/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java rename to test/jdk/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java b/test/jdk/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java rename to test/jdk/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java b/test/jdk/java/lang/management/ThreadMXBean/SharedSynchronizer.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java rename to test/jdk/java/lang/management/ThreadMXBean/SharedSynchronizer.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java b/test/jdk/java/lang/management/ThreadMXBean/SynchronizationStatistics.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java rename to test/jdk/java/lang/management/ThreadMXBean/SynchronizationStatistics.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/SynchronizerDeadlock.java b/test/jdk/java/lang/management/ThreadMXBean/SynchronizerDeadlock.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/SynchronizerDeadlock.java rename to test/jdk/java/lang/management/ThreadMXBean/SynchronizerDeadlock.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/SynchronizerLockingThread.java b/test/jdk/java/lang/management/ThreadMXBean/SynchronizerLockingThread.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/SynchronizerLockingThread.java rename to test/jdk/java/lang/management/ThreadMXBean/SynchronizerLockingThread.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java b/test/jdk/java/lang/management/ThreadMXBean/ThreadBlockedCount.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java rename to test/jdk/java/lang/management/ThreadMXBean/ThreadBlockedCount.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java b/test/jdk/java/lang/management/ThreadMXBean/ThreadCounts.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java rename to test/jdk/java/lang/management/ThreadMXBean/ThreadCounts.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java b/test/jdk/java/lang/management/ThreadMXBean/ThreadCpuTime.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java rename to test/jdk/java/lang/management/ThreadMXBean/ThreadCpuTime.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java b/test/jdk/java/lang/management/ThreadMXBean/ThreadDaemonTest.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java rename to test/jdk/java/lang/management/ThreadMXBean/ThreadDaemonTest.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/ThreadDump.java b/test/jdk/java/lang/management/ThreadMXBean/ThreadDump.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/ThreadDump.java rename to test/jdk/java/lang/management/ThreadMXBean/ThreadDump.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java b/test/jdk/java/lang/management/ThreadMXBean/ThreadInfoArray.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java rename to test/jdk/java/lang/management/ThreadMXBean/ThreadInfoArray.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/ThreadLists.java b/test/jdk/java/lang/management/ThreadMXBean/ThreadLists.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/ThreadLists.java rename to test/jdk/java/lang/management/ThreadMXBean/ThreadLists.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java b/test/jdk/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java rename to test/jdk/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java b/test/jdk/java/lang/management/ThreadMXBean/ThreadStackTrace.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java rename to test/jdk/java/lang/management/ThreadMXBean/ThreadStackTrace.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/ThreadUserTime.java b/test/jdk/java/lang/management/ThreadMXBean/ThreadUserTime.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/ThreadUserTime.java rename to test/jdk/java/lang/management/ThreadMXBean/ThreadUserTime.java diff --git a/jdk/test/java/lang/management/ThreadMXBean/Utils.java b/test/jdk/java/lang/management/ThreadMXBean/Utils.java similarity index 100% rename from jdk/test/java/lang/management/ThreadMXBean/Utils.java rename to test/jdk/java/lang/management/ThreadMXBean/Utils.java diff --git a/jdk/test/java/lang/module/AutomaticModulesTest.java b/test/jdk/java/lang/module/AutomaticModulesTest.java similarity index 100% rename from jdk/test/java/lang/module/AutomaticModulesTest.java rename to test/jdk/java/lang/module/AutomaticModulesTest.java diff --git a/jdk/test/java/lang/module/ConfigurationTest.java b/test/jdk/java/lang/module/ConfigurationTest.java similarity index 100% rename from jdk/test/java/lang/module/ConfigurationTest.java rename to test/jdk/java/lang/module/ConfigurationTest.java diff --git a/jdk/test/java/lang/module/ModuleDescriptorTest.java b/test/jdk/java/lang/module/ModuleDescriptorTest.java similarity index 100% rename from jdk/test/java/lang/module/ModuleDescriptorTest.java rename to test/jdk/java/lang/module/ModuleDescriptorTest.java diff --git a/jdk/test/java/lang/module/ModuleFinderTest.java b/test/jdk/java/lang/module/ModuleFinderTest.java similarity index 100% rename from jdk/test/java/lang/module/ModuleFinderTest.java rename to test/jdk/java/lang/module/ModuleFinderTest.java diff --git a/jdk/test/java/lang/module/ModuleFinderWithSecurityManager.java b/test/jdk/java/lang/module/ModuleFinderWithSecurityManager.java similarity index 100% rename from jdk/test/java/lang/module/ModuleFinderWithSecurityManager.java rename to test/jdk/java/lang/module/ModuleFinderWithSecurityManager.java diff --git a/jdk/test/java/lang/module/ModuleNamesTest.java b/test/jdk/java/lang/module/ModuleNamesTest.java similarity index 100% rename from jdk/test/java/lang/module/ModuleNamesTest.java rename to test/jdk/java/lang/module/ModuleNamesTest.java diff --git a/jdk/test/java/lang/module/ModuleReader/ModuleReaderTest.java b/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java similarity index 100% rename from jdk/test/java/lang/module/ModuleReader/ModuleReaderTest.java rename to test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java diff --git a/jdk/test/java/lang/module/ModuleReader/src/m/module-info.java b/test/jdk/java/lang/module/ModuleReader/src/m/module-info.java similarity index 100% rename from jdk/test/java/lang/module/ModuleReader/src/m/module-info.java rename to test/jdk/java/lang/module/ModuleReader/src/m/module-info.java diff --git a/jdk/test/java/lang/module/ModuleReader/src/m/p/Main.java b/test/jdk/java/lang/module/ModuleReader/src/m/p/Main.java similarity index 100% rename from jdk/test/java/lang/module/ModuleReader/src/m/p/Main.java rename to test/jdk/java/lang/module/ModuleReader/src/m/p/Main.java diff --git a/jdk/test/java/lang/module/ModuleReferenceTest.java b/test/jdk/java/lang/module/ModuleReferenceTest.java similarity index 100% rename from jdk/test/java/lang/module/ModuleReferenceTest.java rename to test/jdk/java/lang/module/ModuleReferenceTest.java diff --git a/jdk/test/java/lang/module/MultiReleaseJarTest.java b/test/jdk/java/lang/module/MultiReleaseJarTest.java similarity index 100% rename from jdk/test/java/lang/module/MultiReleaseJarTest.java rename to test/jdk/java/lang/module/MultiReleaseJarTest.java diff --git a/jdk/test/java/lang/module/VersionTest.java b/test/jdk/java/lang/module/VersionTest.java similarity index 100% rename from jdk/test/java/lang/module/VersionTest.java rename to test/jdk/java/lang/module/VersionTest.java diff --git a/jdk/test/java/lang/module/customfs/ModulesInCustomFileSystem.java b/test/jdk/java/lang/module/customfs/ModulesInCustomFileSystem.java similarity index 100% rename from jdk/test/java/lang/module/customfs/ModulesInCustomFileSystem.java rename to test/jdk/java/lang/module/customfs/ModulesInCustomFileSystem.java diff --git a/jdk/test/java/lang/module/customfs/m1/module-info.java b/test/jdk/java/lang/module/customfs/m1/module-info.java similarity index 100% rename from jdk/test/java/lang/module/customfs/m1/module-info.java rename to test/jdk/java/lang/module/customfs/m1/module-info.java diff --git a/jdk/test/java/lang/module/customfs/m1/p/Main.java b/test/jdk/java/lang/module/customfs/m1/p/Main.java similarity index 100% rename from jdk/test/java/lang/module/customfs/m1/p/Main.java rename to test/jdk/java/lang/module/customfs/m1/p/Main.java diff --git a/jdk/test/java/lang/module/customfs/m2/module-info.java b/test/jdk/java/lang/module/customfs/m2/module-info.java similarity index 100% rename from jdk/test/java/lang/module/customfs/m2/module-info.java rename to test/jdk/java/lang/module/customfs/m2/module-info.java diff --git a/jdk/test/java/lang/module/customfs/m2/q/Hello.java b/test/jdk/java/lang/module/customfs/m2/q/Hello.java similarity index 100% rename from jdk/test/java/lang/module/customfs/m2/q/Hello.java rename to test/jdk/java/lang/module/customfs/m2/q/Hello.java diff --git a/jdk/test/java/lang/module/java.policy b/test/jdk/java/lang/module/java.policy similarity index 100% rename from jdk/test/java/lang/module/java.policy rename to test/jdk/java/lang/module/java.policy diff --git a/jdk/test/java/lang/ref/Basic.java b/test/jdk/java/lang/ref/Basic.java similarity index 100% rename from jdk/test/java/lang/ref/Basic.java rename to test/jdk/java/lang/ref/Basic.java diff --git a/jdk/test/java/lang/ref/CleanerTest.java b/test/jdk/java/lang/ref/CleanerTest.java similarity index 100% rename from jdk/test/java/lang/ref/CleanerTest.java rename to test/jdk/java/lang/ref/CleanerTest.java diff --git a/jdk/test/java/lang/ref/EarlyTimeout.java b/test/jdk/java/lang/ref/EarlyTimeout.java similarity index 100% rename from jdk/test/java/lang/ref/EarlyTimeout.java rename to test/jdk/java/lang/ref/EarlyTimeout.java diff --git a/jdk/test/java/lang/ref/EnqueueNullRef.java b/test/jdk/java/lang/ref/EnqueueNullRef.java similarity index 100% rename from jdk/test/java/lang/ref/EnqueueNullRef.java rename to test/jdk/java/lang/ref/EnqueueNullRef.java diff --git a/jdk/test/java/lang/ref/EnqueuePollRace.java b/test/jdk/java/lang/ref/EnqueuePollRace.java similarity index 100% rename from jdk/test/java/lang/ref/EnqueuePollRace.java rename to test/jdk/java/lang/ref/EnqueuePollRace.java diff --git a/jdk/test/java/lang/ref/FinalizeOverride.java b/test/jdk/java/lang/ref/FinalizeOverride.java similarity index 100% rename from jdk/test/java/lang/ref/FinalizeOverride.java rename to test/jdk/java/lang/ref/FinalizeOverride.java diff --git a/jdk/test/java/lang/ref/FinalizerHistogramTest.java b/test/jdk/java/lang/ref/FinalizerHistogramTest.java similarity index 100% rename from jdk/test/java/lang/ref/FinalizerHistogramTest.java rename to test/jdk/java/lang/ref/FinalizerHistogramTest.java diff --git a/jdk/test/java/lang/ref/NullQueue.java b/test/jdk/java/lang/ref/NullQueue.java similarity index 100% rename from jdk/test/java/lang/ref/NullQueue.java rename to test/jdk/java/lang/ref/NullQueue.java diff --git a/jdk/test/java/lang/ref/OOMEInReferenceHandler.java b/test/jdk/java/lang/ref/OOMEInReferenceHandler.java similarity index 100% rename from jdk/test/java/lang/ref/OOMEInReferenceHandler.java rename to test/jdk/java/lang/ref/OOMEInReferenceHandler.java diff --git a/jdk/test/java/lang/ref/PhantomReferentClearing.java b/test/jdk/java/lang/ref/PhantomReferentClearing.java similarity index 100% rename from jdk/test/java/lang/ref/PhantomReferentClearing.java rename to test/jdk/java/lang/ref/PhantomReferentClearing.java diff --git a/jdk/test/java/lang/ref/ReachabilityFenceTest.java b/test/jdk/java/lang/ref/ReachabilityFenceTest.java similarity index 100% rename from jdk/test/java/lang/ref/ReachabilityFenceTest.java rename to test/jdk/java/lang/ref/ReachabilityFenceTest.java diff --git a/jdk/test/java/lang/ref/ReferenceEnqueue.java b/test/jdk/java/lang/ref/ReferenceEnqueue.java similarity index 100% rename from jdk/test/java/lang/ref/ReferenceEnqueue.java rename to test/jdk/java/lang/ref/ReferenceEnqueue.java diff --git a/jdk/test/java/lang/ref/ReferenceEnqueuePending.java b/test/jdk/java/lang/ref/ReferenceEnqueuePending.java similarity index 100% rename from jdk/test/java/lang/ref/ReferenceEnqueuePending.java rename to test/jdk/java/lang/ref/ReferenceEnqueuePending.java diff --git a/jdk/test/java/lang/ref/SoftReference/Bash.java b/test/jdk/java/lang/ref/SoftReference/Bash.java similarity index 100% rename from jdk/test/java/lang/ref/SoftReference/Bash.java rename to test/jdk/java/lang/ref/SoftReference/Bash.java diff --git a/jdk/test/java/lang/ref/SoftReference/Pin.java b/test/jdk/java/lang/ref/SoftReference/Pin.java similarity index 100% rename from jdk/test/java/lang/ref/SoftReference/Pin.java rename to test/jdk/java/lang/ref/SoftReference/Pin.java diff --git a/jdk/test/java/lang/reflect/AccessControl/AccessControlTest.java b/test/jdk/java/lang/reflect/AccessControl/AccessControlTest.java similarity index 100% rename from jdk/test/java/lang/reflect/AccessControl/AccessControlTest.java rename to test/jdk/java/lang/reflect/AccessControl/AccessControlTest.java diff --git a/jdk/test/java/lang/reflect/AccessControl/a/Package.java b/test/jdk/java/lang/reflect/AccessControl/a/Package.java similarity index 100% rename from jdk/test/java/lang/reflect/AccessControl/a/Package.java rename to test/jdk/java/lang/reflect/AccessControl/a/Package.java diff --git a/jdk/test/java/lang/reflect/AccessControl/a/PublicSuper.java b/test/jdk/java/lang/reflect/AccessControl/a/PublicSuper.java similarity index 100% rename from jdk/test/java/lang/reflect/AccessControl/a/PublicSuper.java rename to test/jdk/java/lang/reflect/AccessControl/a/PublicSuper.java diff --git a/jdk/test/java/lang/reflect/AccessControl/b/Package.java b/test/jdk/java/lang/reflect/AccessControl/b/Package.java similarity index 100% rename from jdk/test/java/lang/reflect/AccessControl/b/Package.java rename to test/jdk/java/lang/reflect/AccessControl/b/Package.java diff --git a/jdk/test/java/lang/reflect/AccessControl/b/PublicSub.java b/test/jdk/java/lang/reflect/AccessControl/b/PublicSub.java similarity index 100% rename from jdk/test/java/lang/reflect/AccessControl/b/PublicSub.java rename to test/jdk/java/lang/reflect/AccessControl/b/PublicSub.java diff --git a/jdk/test/java/lang/reflect/AccessControl/util/ClassSupplier.java b/test/jdk/java/lang/reflect/AccessControl/util/ClassSupplier.java similarity index 100% rename from jdk/test/java/lang/reflect/AccessControl/util/ClassSupplier.java rename to test/jdk/java/lang/reflect/AccessControl/util/ClassSupplier.java diff --git a/jdk/test/java/lang/reflect/AccessControl/util/MemberFactory.java b/test/jdk/java/lang/reflect/AccessControl/util/MemberFactory.java similarity index 100% rename from jdk/test/java/lang/reflect/AccessControl/util/MemberFactory.java rename to test/jdk/java/lang/reflect/AccessControl/util/MemberFactory.java diff --git a/jdk/test/java/lang/reflect/AccessibleObject/CanAccessTest.java b/test/jdk/java/lang/reflect/AccessibleObject/CanAccessTest.java similarity index 100% rename from jdk/test/java/lang/reflect/AccessibleObject/CanAccessTest.java rename to test/jdk/java/lang/reflect/AccessibleObject/CanAccessTest.java diff --git a/jdk/test/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java b/test/jdk/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java similarity index 100% rename from jdk/test/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java rename to test/jdk/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java diff --git a/jdk/test/java/lang/reflect/AccessibleObject/TrySetAccessibleTest.java b/test/jdk/java/lang/reflect/AccessibleObject/TrySetAccessibleTest.java similarity index 100% rename from jdk/test/java/lang/reflect/AccessibleObject/TrySetAccessibleTest.java rename to test/jdk/java/lang/reflect/AccessibleObject/TrySetAccessibleTest.java diff --git a/jdk/test/java/lang/reflect/AnnotatedElement/TestAnnotatedElementDefaults.java b/test/jdk/java/lang/reflect/AnnotatedElement/TestAnnotatedElementDefaults.java similarity index 100% rename from jdk/test/java/lang/reflect/AnnotatedElement/TestAnnotatedElementDefaults.java rename to test/jdk/java/lang/reflect/AnnotatedElement/TestAnnotatedElementDefaults.java diff --git a/jdk/test/java/lang/reflect/Array/ExceedMaxDim.java b/test/jdk/java/lang/reflect/Array/ExceedMaxDim.java similarity index 100% rename from jdk/test/java/lang/reflect/Array/ExceedMaxDim.java rename to test/jdk/java/lang/reflect/Array/ExceedMaxDim.java diff --git a/jdk/test/java/lang/reflect/Assignment/ArrayAssignment.java b/test/jdk/java/lang/reflect/Assignment/ArrayAssignment.java similarity index 100% rename from jdk/test/java/lang/reflect/Assignment/ArrayAssignment.java rename to test/jdk/java/lang/reflect/Assignment/ArrayAssignment.java diff --git a/jdk/test/java/lang/reflect/Constructor/Equals.java b/test/jdk/java/lang/reflect/Constructor/Equals.java similarity index 100% rename from jdk/test/java/lang/reflect/Constructor/Equals.java rename to test/jdk/java/lang/reflect/Constructor/Equals.java diff --git a/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java b/test/jdk/java/lang/reflect/Constructor/GenericStringTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Constructor/GenericStringTest.java rename to test/jdk/java/lang/reflect/Constructor/GenericStringTest.java diff --git a/jdk/test/java/lang/reflect/Constructor/TestParameterAnnotations.java b/test/jdk/java/lang/reflect/Constructor/TestParameterAnnotations.java similarity index 100% rename from jdk/test/java/lang/reflect/Constructor/TestParameterAnnotations.java rename to test/jdk/java/lang/reflect/Constructor/TestParameterAnnotations.java diff --git a/jdk/test/java/lang/reflect/DefaultAccessibility.java b/test/jdk/java/lang/reflect/DefaultAccessibility.java similarity index 100% rename from jdk/test/java/lang/reflect/DefaultAccessibility.java rename to test/jdk/java/lang/reflect/DefaultAccessibility.java diff --git a/jdk/test/java/lang/reflect/DefaultMethodMembers/FilterNotMostSpecific.java b/test/jdk/java/lang/reflect/DefaultMethodMembers/FilterNotMostSpecific.java similarity index 100% rename from jdk/test/java/lang/reflect/DefaultMethodMembers/FilterNotMostSpecific.java rename to test/jdk/java/lang/reflect/DefaultMethodMembers/FilterNotMostSpecific.java diff --git a/jdk/test/java/lang/reflect/DefaultStaticTest/DefaultStaticInvokeTest.java b/test/jdk/java/lang/reflect/DefaultStaticTest/DefaultStaticInvokeTest.java similarity index 100% rename from jdk/test/java/lang/reflect/DefaultStaticTest/DefaultStaticInvokeTest.java rename to test/jdk/java/lang/reflect/DefaultStaticTest/DefaultStaticInvokeTest.java diff --git a/jdk/test/java/lang/reflect/DefaultStaticTest/DefaultStaticTestData.java b/test/jdk/java/lang/reflect/DefaultStaticTest/DefaultStaticTestData.java similarity index 100% rename from jdk/test/java/lang/reflect/DefaultStaticTest/DefaultStaticTestData.java rename to test/jdk/java/lang/reflect/DefaultStaticTest/DefaultStaticTestData.java diff --git a/jdk/test/java/lang/reflect/DefaultStaticTest/helper/Declared.java b/test/jdk/java/lang/reflect/DefaultStaticTest/helper/Declared.java similarity index 100% rename from jdk/test/java/lang/reflect/DefaultStaticTest/helper/Declared.java rename to test/jdk/java/lang/reflect/DefaultStaticTest/helper/Declared.java diff --git a/jdk/test/java/lang/reflect/DefaultStaticTest/helper/Mod.java b/test/jdk/java/lang/reflect/DefaultStaticTest/helper/Mod.java similarity index 100% rename from jdk/test/java/lang/reflect/DefaultStaticTest/helper/Mod.java rename to test/jdk/java/lang/reflect/DefaultStaticTest/helper/Mod.java diff --git a/jdk/test/java/lang/reflect/Field/4490864/StaticFieldTest.java b/test/jdk/java/lang/reflect/Field/4490864/StaticFieldTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Field/4490864/StaticFieldTest.java rename to test/jdk/java/lang/reflect/Field/4490864/StaticFieldTest.java diff --git a/jdk/test/java/lang/reflect/Field/4498653/StaticInitializerTest.java b/test/jdk/java/lang/reflect/Field/4498653/StaticInitializerTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Field/4498653/StaticInitializerTest.java rename to test/jdk/java/lang/reflect/Field/4498653/StaticInitializerTest.java diff --git a/jdk/test/java/lang/reflect/Field/GenericStringTest.java b/test/jdk/java/lang/reflect/Field/GenericStringTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Field/GenericStringTest.java rename to test/jdk/java/lang/reflect/Field/GenericStringTest.java diff --git a/jdk/test/java/lang/reflect/Field/Set.java b/test/jdk/java/lang/reflect/Field/Set.java similarity index 100% rename from jdk/test/java/lang/reflect/Field/Set.java rename to test/jdk/java/lang/reflect/Field/Set.java diff --git a/jdk/test/java/lang/reflect/Field/TestFieldReflectValueOf.java b/test/jdk/java/lang/reflect/Field/TestFieldReflectValueOf.java similarity index 100% rename from jdk/test/java/lang/reflect/Field/TestFieldReflectValueOf.java rename to test/jdk/java/lang/reflect/Field/TestFieldReflectValueOf.java diff --git a/jdk/test/java/lang/reflect/Generics/HashCodeTest.java b/test/jdk/java/lang/reflect/Generics/HashCodeTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/HashCodeTest.java rename to test/jdk/java/lang/reflect/Generics/HashCodeTest.java diff --git a/jdk/test/java/lang/reflect/Generics/Probe.java b/test/jdk/java/lang/reflect/Generics/Probe.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/Probe.java rename to test/jdk/java/lang/reflect/Generics/Probe.java diff --git a/jdk/test/java/lang/reflect/Generics/SignatureTest.java b/test/jdk/java/lang/reflect/Generics/SignatureTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/SignatureTest.java rename to test/jdk/java/lang/reflect/Generics/SignatureTest.java diff --git a/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java b/test/jdk/java/lang/reflect/Generics/StringsAndBounds.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/StringsAndBounds.java rename to test/jdk/java/lang/reflect/Generics/StringsAndBounds.java diff --git a/jdk/test/java/lang/reflect/Generics/TestBadSignatures.java b/test/jdk/java/lang/reflect/Generics/TestBadSignatures.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/TestBadSignatures.java rename to test/jdk/java/lang/reflect/Generics/TestBadSignatures.java diff --git a/jdk/test/java/lang/reflect/Generics/TestC1.java b/test/jdk/java/lang/reflect/Generics/TestC1.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/TestC1.java rename to test/jdk/java/lang/reflect/Generics/TestC1.java diff --git a/jdk/test/java/lang/reflect/Generics/TestC2.java b/test/jdk/java/lang/reflect/Generics/TestC2.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/TestC2.java rename to test/jdk/java/lang/reflect/Generics/TestC2.java diff --git a/jdk/test/java/lang/reflect/Generics/TestGenericReturnTypeToString.java b/test/jdk/java/lang/reflect/Generics/TestGenericReturnTypeToString.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/TestGenericReturnTypeToString.java rename to test/jdk/java/lang/reflect/Generics/TestGenericReturnTypeToString.java diff --git a/jdk/test/java/lang/reflect/Generics/TestN1.java b/test/jdk/java/lang/reflect/Generics/TestN1.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/TestN1.java rename to test/jdk/java/lang/reflect/Generics/TestN1.java diff --git a/jdk/test/java/lang/reflect/Generics/TestParameterizedType.java b/test/jdk/java/lang/reflect/Generics/TestParameterizedType.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/TestParameterizedType.java rename to test/jdk/java/lang/reflect/Generics/TestParameterizedType.java diff --git a/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java b/test/jdk/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java rename to test/jdk/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java diff --git a/jdk/test/java/lang/reflect/Generics/ThreadSafety.java b/test/jdk/java/lang/reflect/Generics/ThreadSafety.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/ThreadSafety.java rename to test/jdk/java/lang/reflect/Generics/ThreadSafety.java diff --git a/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java b/test/jdk/java/lang/reflect/Generics/exceptionCauseTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java rename to test/jdk/java/lang/reflect/Generics/exceptionCauseTest.java diff --git a/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java b/test/jdk/java/lang/reflect/Generics/getAnnotationTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Generics/getAnnotationTest.java rename to test/jdk/java/lang/reflect/Generics/getAnnotationTest.java diff --git a/jdk/test/java/lang/reflect/Method/Equals.java b/test/jdk/java/lang/reflect/Method/Equals.java similarity index 100% rename from jdk/test/java/lang/reflect/Method/Equals.java rename to test/jdk/java/lang/reflect/Method/Equals.java diff --git a/jdk/test/java/lang/reflect/Method/GenericStringTest.java b/test/jdk/java/lang/reflect/Method/GenericStringTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Method/GenericStringTest.java rename to test/jdk/java/lang/reflect/Method/GenericStringTest.java diff --git a/jdk/test/java/lang/reflect/Method/InheritedInterfaceMethods.java b/test/jdk/java/lang/reflect/Method/InheritedInterfaceMethods.java similarity index 100% rename from jdk/test/java/lang/reflect/Method/InheritedInterfaceMethods.java rename to test/jdk/java/lang/reflect/Method/InheritedInterfaceMethods.java diff --git a/jdk/test/java/lang/reflect/Method/InheritedMethods.java b/test/jdk/java/lang/reflect/Method/InheritedMethods.java similarity index 100% rename from jdk/test/java/lang/reflect/Method/InheritedMethods.java rename to test/jdk/java/lang/reflect/Method/InheritedMethods.java diff --git a/jdk/test/java/lang/reflect/Method/InterfaceStatic/StaticInterfaceMethodInWayOfDefault.java b/test/jdk/java/lang/reflect/Method/InterfaceStatic/StaticInterfaceMethodInWayOfDefault.java similarity index 100% rename from jdk/test/java/lang/reflect/Method/InterfaceStatic/StaticInterfaceMethodInWayOfDefault.java rename to test/jdk/java/lang/reflect/Method/InterfaceStatic/StaticInterfaceMethodInWayOfDefault.java diff --git a/jdk/test/java/lang/reflect/Method/IsDefaultTest.java b/test/jdk/java/lang/reflect/Method/IsDefaultTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Method/IsDefaultTest.java rename to test/jdk/java/lang/reflect/Method/IsDefaultTest.java diff --git a/jdk/test/java/lang/reflect/Method/defaultMethodModeling/DefaultMethodModeling.java b/test/jdk/java/lang/reflect/Method/defaultMethodModeling/DefaultMethodModeling.java similarity index 100% rename from jdk/test/java/lang/reflect/Method/defaultMethodModeling/DefaultMethodModeling.java rename to test/jdk/java/lang/reflect/Method/defaultMethodModeling/DefaultMethodModeling.java diff --git a/jdk/test/java/lang/reflect/Method/invoke/ErrorInInvoke.java b/test/jdk/java/lang/reflect/Method/invoke/ErrorInInvoke.java similarity index 100% rename from jdk/test/java/lang/reflect/Method/invoke/ErrorInInvoke.java rename to test/jdk/java/lang/reflect/Method/invoke/ErrorInInvoke.java diff --git a/jdk/test/java/lang/reflect/Method/invoke/IllegalAccessInInvoke.java b/test/jdk/java/lang/reflect/Method/invoke/IllegalAccessInInvoke.java similarity index 100% rename from jdk/test/java/lang/reflect/Method/invoke/IllegalAccessInInvoke.java rename to test/jdk/java/lang/reflect/Method/invoke/IllegalAccessInInvoke.java diff --git a/jdk/test/java/lang/reflect/Method/invoke/TestMethodReflectValueOf.java b/test/jdk/java/lang/reflect/Method/invoke/TestMethodReflectValueOf.java similarity index 100% rename from jdk/test/java/lang/reflect/Method/invoke/TestMethodReflectValueOf.java rename to test/jdk/java/lang/reflect/Method/invoke/TestMethodReflectValueOf.java diff --git a/jdk/test/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java b/test/jdk/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java similarity index 100% rename from jdk/test/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java rename to test/jdk/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java diff --git a/jdk/test/java/lang/reflect/Modifier/toStringTest.java b/test/jdk/java/lang/reflect/Modifier/toStringTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Modifier/toStringTest.java rename to test/jdk/java/lang/reflect/Modifier/toStringTest.java diff --git a/jdk/test/java/lang/reflect/OldenCompilingWithDefaults.java b/test/jdk/java/lang/reflect/OldenCompilingWithDefaults.java similarity index 100% rename from jdk/test/java/lang/reflect/OldenCompilingWithDefaults.java rename to test/jdk/java/lang/reflect/OldenCompilingWithDefaults.java diff --git a/jdk/test/java/lang/reflect/Parameter/BadClassFiles.java b/test/jdk/java/lang/reflect/Parameter/BadClassFiles.java similarity index 100% rename from jdk/test/java/lang/reflect/Parameter/BadClassFiles.java rename to test/jdk/java/lang/reflect/Parameter/BadClassFiles.java diff --git a/jdk/test/java/lang/reflect/Parameter/GetAnnotatedTypeTest.java b/test/jdk/java/lang/reflect/Parameter/GetAnnotatedTypeTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Parameter/GetAnnotatedTypeTest.java rename to test/jdk/java/lang/reflect/Parameter/GetAnnotatedTypeTest.java diff --git a/jdk/test/java/lang/reflect/Parameter/InnerClassToString.java b/test/jdk/java/lang/reflect/Parameter/InnerClassToString.java similarity index 100% rename from jdk/test/java/lang/reflect/Parameter/InnerClassToString.java rename to test/jdk/java/lang/reflect/Parameter/InnerClassToString.java diff --git a/jdk/test/java/lang/reflect/Parameter/NoName.java b/test/jdk/java/lang/reflect/Parameter/NoName.java similarity index 100% rename from jdk/test/java/lang/reflect/Parameter/NoName.java rename to test/jdk/java/lang/reflect/Parameter/NoName.java diff --git a/jdk/test/java/lang/reflect/Parameter/WithParameters.java b/test/jdk/java/lang/reflect/Parameter/WithParameters.java similarity index 100% rename from jdk/test/java/lang/reflect/Parameter/WithParameters.java rename to test/jdk/java/lang/reflect/Parameter/WithParameters.java diff --git a/jdk/test/java/lang/reflect/Parameter/WithoutParameters.java b/test/jdk/java/lang/reflect/Parameter/WithoutParameters.java similarity index 100% rename from jdk/test/java/lang/reflect/Parameter/WithoutParameters.java rename to test/jdk/java/lang/reflect/Parameter/WithoutParameters.java diff --git a/jdk/test/java/lang/reflect/Proxy/Basic1.java b/test/jdk/java/lang/reflect/Proxy/Basic1.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/Basic1.java rename to test/jdk/java/lang/reflect/Proxy/Basic1.java diff --git a/jdk/test/java/lang/reflect/Proxy/Boxing.java b/test/jdk/java/lang/reflect/Proxy/Boxing.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/Boxing.java rename to test/jdk/java/lang/reflect/Proxy/Boxing.java diff --git a/jdk/test/java/lang/reflect/Proxy/CharType.java b/test/jdk/java/lang/reflect/Proxy/CharType.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/CharType.java rename to test/jdk/java/lang/reflect/Proxy/CharType.java diff --git a/jdk/test/java/lang/reflect/Proxy/ClassRestrictions.java b/test/jdk/java/lang/reflect/Proxy/ClassRestrictions.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/ClassRestrictions.java rename to test/jdk/java/lang/reflect/Proxy/ClassRestrictions.java diff --git a/jdk/test/java/lang/reflect/Proxy/NullClassLoader.java b/test/jdk/java/lang/reflect/Proxy/NullClassLoader.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/NullClassLoader.java rename to test/jdk/java/lang/reflect/Proxy/NullClassLoader.java diff --git a/jdk/test/java/lang/reflect/Proxy/ProxyClassAccessTest.java b/test/jdk/java/lang/reflect/Proxy/ProxyClassAccessTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/ProxyClassAccessTest.java rename to test/jdk/java/lang/reflect/Proxy/ProxyClassAccessTest.java diff --git a/jdk/test/java/lang/reflect/Proxy/ProxyForMethodHandle.java b/test/jdk/java/lang/reflect/Proxy/ProxyForMethodHandle.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/ProxyForMethodHandle.java rename to test/jdk/java/lang/reflect/Proxy/ProxyForMethodHandle.java diff --git a/jdk/test/java/lang/reflect/Proxy/ProxyLayerTest.java b/test/jdk/java/lang/reflect/Proxy/ProxyLayerTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/ProxyLayerTest.java rename to test/jdk/java/lang/reflect/Proxy/ProxyLayerTest.java diff --git a/jdk/test/java/lang/reflect/Proxy/ProxyModuleMapping.java b/test/jdk/java/lang/reflect/Proxy/ProxyModuleMapping.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/ProxyModuleMapping.java rename to test/jdk/java/lang/reflect/Proxy/ProxyModuleMapping.java diff --git a/jdk/test/java/lang/reflect/Proxy/ProxyTest.java b/test/jdk/java/lang/reflect/Proxy/ProxyTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/ProxyTest.java rename to test/jdk/java/lang/reflect/Proxy/ProxyTest.java diff --git a/jdk/test/java/lang/reflect/Proxy/nonJavaNames/Test.java b/test/jdk/java/lang/reflect/Proxy/nonJavaNames/Test.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/nonJavaNames/Test.java rename to test/jdk/java/lang/reflect/Proxy/nonJavaNames/Test.java diff --git a/jdk/test/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java b/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java rename to test/jdk/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java diff --git a/jdk/test/java/lang/reflect/Proxy/nonPublicProxy/SimpleProxy.java b/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/SimpleProxy.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/nonPublicProxy/SimpleProxy.java rename to test/jdk/java/lang/reflect/Proxy/nonPublicProxy/SimpleProxy.java diff --git a/jdk/test/java/lang/reflect/Proxy/nonPublicProxy/p/Bar.java b/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/p/Bar.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/nonPublicProxy/p/Bar.java rename to test/jdk/java/lang/reflect/Proxy/nonPublicProxy/p/Bar.java diff --git a/jdk/test/java/lang/reflect/Proxy/nonPublicProxy/p/Foo.java b/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/p/Foo.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/nonPublicProxy/p/Foo.java rename to test/jdk/java/lang/reflect/Proxy/nonPublicProxy/p/Foo.java diff --git a/jdk/test/java/lang/reflect/Proxy/q/NP.java b/test/jdk/java/lang/reflect/Proxy/q/NP.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/q/NP.java rename to test/jdk/java/lang/reflect/Proxy/q/NP.java diff --git a/jdk/test/java/lang/reflect/Proxy/q/U.java b/test/jdk/java/lang/reflect/Proxy/q/U.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/q/U.java rename to test/jdk/java/lang/reflect/Proxy/q/U.java diff --git a/jdk/test/java/lang/reflect/Proxy/returnTypes/GetArray.java b/test/jdk/java/lang/reflect/Proxy/returnTypes/GetArray.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/returnTypes/GetArray.java rename to test/jdk/java/lang/reflect/Proxy/returnTypes/GetArray.java diff --git a/jdk/test/java/lang/reflect/Proxy/returnTypes/GetCloneable.java b/test/jdk/java/lang/reflect/Proxy/returnTypes/GetCloneable.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/returnTypes/GetCloneable.java rename to test/jdk/java/lang/reflect/Proxy/returnTypes/GetCloneable.java diff --git a/jdk/test/java/lang/reflect/Proxy/returnTypes/GetObject.java b/test/jdk/java/lang/reflect/Proxy/returnTypes/GetObject.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/returnTypes/GetObject.java rename to test/jdk/java/lang/reflect/Proxy/returnTypes/GetObject.java diff --git a/jdk/test/java/lang/reflect/Proxy/returnTypes/GetSerializable.java b/test/jdk/java/lang/reflect/Proxy/returnTypes/GetSerializable.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/returnTypes/GetSerializable.java rename to test/jdk/java/lang/reflect/Proxy/returnTypes/GetSerializable.java diff --git a/jdk/test/java/lang/reflect/Proxy/returnTypes/Test.java b/test/jdk/java/lang/reflect/Proxy/returnTypes/Test.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/returnTypes/Test.java rename to test/jdk/java/lang/reflect/Proxy/returnTypes/Test.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/m1/module-info.java b/test/jdk/java/lang/reflect/Proxy/src/m1/module-info.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/m1/module-info.java rename to test/jdk/java/lang/reflect/Proxy/src/m1/module-info.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/m1/p/one/I.java b/test/jdk/java/lang/reflect/Proxy/src/m1/p/one/I.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/m1/p/one/I.java rename to test/jdk/java/lang/reflect/Proxy/src/m1/p/one/I.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/m1/p/one/internal/J.java b/test/jdk/java/lang/reflect/Proxy/src/m1/p/one/internal/J.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/m1/p/one/internal/J.java rename to test/jdk/java/lang/reflect/Proxy/src/m1/p/one/internal/J.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/m2/module-info.java b/test/jdk/java/lang/reflect/Proxy/src/m2/module-info.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/m2/module-info.java rename to test/jdk/java/lang/reflect/Proxy/src/m2/module-info.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/m2/p/two/A.java b/test/jdk/java/lang/reflect/Proxy/src/m2/p/two/A.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/m2/p/two/A.java rename to test/jdk/java/lang/reflect/Proxy/src/m2/p/two/A.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/m2/p/two/B.java b/test/jdk/java/lang/reflect/Proxy/src/m2/p/two/B.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/m2/p/two/B.java rename to test/jdk/java/lang/reflect/Proxy/src/m2/p/two/B.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/m2/p/two/Bar.java b/test/jdk/java/lang/reflect/Proxy/src/m2/p/two/Bar.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/m2/p/two/Bar.java rename to test/jdk/java/lang/reflect/Proxy/src/m2/p/two/Bar.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/m2/p/two/internal/C.java b/test/jdk/java/lang/reflect/Proxy/src/m2/p/two/internal/C.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/m2/p/two/internal/C.java rename to test/jdk/java/lang/reflect/Proxy/src/m2/p/two/internal/C.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/m3/module-info.java b/test/jdk/java/lang/reflect/Proxy/src/m3/module-info.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/m3/module-info.java rename to test/jdk/java/lang/reflect/Proxy/src/m3/module-info.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/m3/p/three/P.java b/test/jdk/java/lang/reflect/Proxy/src/m3/p/three/P.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/m3/p/three/P.java rename to test/jdk/java/lang/reflect/Proxy/src/m3/p/three/P.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/m3/p/three/internal/Q.java b/test/jdk/java/lang/reflect/Proxy/src/m3/p/three/internal/Q.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/m3/p/three/internal/Q.java rename to test/jdk/java/lang/reflect/Proxy/src/m3/p/three/internal/Q.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/Main.java b/test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/Main.java rename to test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/Main.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/NP.java b/test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/NP.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/NP.java rename to test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/NP.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/ProxyClassAccess.java b/test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/ProxyClassAccess.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/ProxyClassAccess.java rename to test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/ProxyClassAccess.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/ProxyTest.java b/test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/ProxyTest.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/ProxyTest.java rename to test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/ProxyTest.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/internal/R.java b/test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/internal/R.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/internal/R.java rename to test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/internal/R.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/internal/RImpl.java b/test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/internal/RImpl.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/internal/RImpl.java rename to test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/internal/RImpl.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/internal/foo/Foo.java b/test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/internal/foo/Foo.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/internal/foo/Foo.java rename to test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/internal/foo/Foo.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/internal/foo/FooException.java b/test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/internal/foo/FooException.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/test/jdk/test/internal/foo/FooException.java rename to test/jdk/java/lang/reflect/Proxy/src/test/jdk/test/internal/foo/FooException.java diff --git a/jdk/test/java/lang/reflect/Proxy/src/test/module-info.java b/test/jdk/java/lang/reflect/Proxy/src/test/module-info.java similarity index 100% rename from jdk/test/java/lang/reflect/Proxy/src/test/module-info.java rename to test/jdk/java/lang/reflect/Proxy/src/test/module-info.java diff --git a/jdk/test/java/lang/reflect/PublicMethods/Case1.results b/test/jdk/java/lang/reflect/PublicMethods/Case1.results similarity index 100% rename from jdk/test/java/lang/reflect/PublicMethods/Case1.results rename to test/jdk/java/lang/reflect/PublicMethods/Case1.results diff --git a/jdk/test/java/lang/reflect/PublicMethods/PublicMethodsTest.java b/test/jdk/java/lang/reflect/PublicMethods/PublicMethodsTest.java similarity index 100% rename from jdk/test/java/lang/reflect/PublicMethods/PublicMethodsTest.java rename to test/jdk/java/lang/reflect/PublicMethods/PublicMethodsTest.java diff --git a/jdk/test/java/lang/reflect/ReflectPermission/Exceptions.java b/test/jdk/java/lang/reflect/ReflectPermission/Exceptions.java similarity index 100% rename from jdk/test/java/lang/reflect/ReflectPermission/Exceptions.java rename to test/jdk/java/lang/reflect/ReflectPermission/Exceptions.java diff --git a/jdk/test/java/lang/reflect/TypeVariable/TestAnnotatedElement.java b/test/jdk/java/lang/reflect/TypeVariable/TestAnnotatedElement.java similarity index 100% rename from jdk/test/java/lang/reflect/TypeVariable/TestAnnotatedElement.java rename to test/jdk/java/lang/reflect/TypeVariable/TestAnnotatedElement.java diff --git a/jdk/test/java/lang/reflect/annotationSharing/AnnotationSharing.java b/test/jdk/java/lang/reflect/annotationSharing/AnnotationSharing.java similarity index 100% rename from jdk/test/java/lang/reflect/annotationSharing/AnnotationSharing.java rename to test/jdk/java/lang/reflect/annotationSharing/AnnotationSharing.java diff --git a/jdk/test/java/math/BigDecimal/AddTests.java b/test/jdk/java/math/BigDecimal/AddTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/AddTests.java rename to test/jdk/java/math/BigDecimal/AddTests.java diff --git a/jdk/test/java/math/BigDecimal/CompareToTests.java b/test/jdk/java/math/BigDecimal/CompareToTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/CompareToTests.java rename to test/jdk/java/math/BigDecimal/CompareToTests.java diff --git a/jdk/test/java/math/BigDecimal/Constructor.java b/test/jdk/java/math/BigDecimal/Constructor.java similarity index 100% rename from jdk/test/java/math/BigDecimal/Constructor.java rename to test/jdk/java/math/BigDecimal/Constructor.java diff --git a/jdk/test/java/math/BigDecimal/DivideMcTests.java b/test/jdk/java/math/BigDecimal/DivideMcTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/DivideMcTests.java rename to test/jdk/java/math/BigDecimal/DivideMcTests.java diff --git a/jdk/test/java/math/BigDecimal/DivideTests.java b/test/jdk/java/math/BigDecimal/DivideTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/DivideTests.java rename to test/jdk/java/math/BigDecimal/DivideTests.java diff --git a/jdk/test/java/math/BigDecimal/EqualsTests.java b/test/jdk/java/math/BigDecimal/EqualsTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/EqualsTests.java rename to test/jdk/java/math/BigDecimal/EqualsTests.java diff --git a/jdk/test/java/math/BigDecimal/FloatDoubleValueTests.java b/test/jdk/java/math/BigDecimal/FloatDoubleValueTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/FloatDoubleValueTests.java rename to test/jdk/java/math/BigDecimal/FloatDoubleValueTests.java diff --git a/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java b/test/jdk/java/math/BigDecimal/IntegralDivisionTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/IntegralDivisionTests.java rename to test/jdk/java/math/BigDecimal/IntegralDivisionTests.java diff --git a/jdk/test/java/math/BigDecimal/LongValueExactTests.java b/test/jdk/java/math/BigDecimal/LongValueExactTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/LongValueExactTests.java rename to test/jdk/java/math/BigDecimal/LongValueExactTests.java diff --git a/jdk/test/java/math/BigDecimal/MultiplyTests.java b/test/jdk/java/math/BigDecimal/MultiplyTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/MultiplyTests.java rename to test/jdk/java/math/BigDecimal/MultiplyTests.java diff --git a/jdk/test/java/math/BigDecimal/NegateTests.java b/test/jdk/java/math/BigDecimal/NegateTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/NegateTests.java rename to test/jdk/java/math/BigDecimal/NegateTests.java diff --git a/jdk/test/java/math/BigDecimal/PowTests.java b/test/jdk/java/math/BigDecimal/PowTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/PowTests.java rename to test/jdk/java/math/BigDecimal/PowTests.java diff --git a/jdk/test/java/math/BigDecimal/PrecisionTests.java b/test/jdk/java/math/BigDecimal/PrecisionTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/PrecisionTests.java rename to test/jdk/java/math/BigDecimal/PrecisionTests.java diff --git a/jdk/test/java/math/BigDecimal/RangeTests.java b/test/jdk/java/math/BigDecimal/RangeTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/RangeTests.java rename to test/jdk/java/math/BigDecimal/RangeTests.java diff --git a/jdk/test/java/math/BigDecimal/RoundingTests.java b/test/jdk/java/math/BigDecimal/RoundingTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/RoundingTests.java rename to test/jdk/java/math/BigDecimal/RoundingTests.java diff --git a/jdk/test/java/math/BigDecimal/ScaleByPowerOfTenTests.java b/test/jdk/java/math/BigDecimal/ScaleByPowerOfTenTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/ScaleByPowerOfTenTests.java rename to test/jdk/java/math/BigDecimal/ScaleByPowerOfTenTests.java diff --git a/jdk/test/java/math/BigDecimal/SerializationTests.java b/test/jdk/java/math/BigDecimal/SerializationTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/SerializationTests.java rename to test/jdk/java/math/BigDecimal/SerializationTests.java diff --git a/jdk/test/java/math/BigDecimal/SquareRootTests.java b/test/jdk/java/math/BigDecimal/SquareRootTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/SquareRootTests.java rename to test/jdk/java/math/BigDecimal/SquareRootTests.java diff --git a/jdk/test/java/math/BigDecimal/StringConstructor.java b/test/jdk/java/math/BigDecimal/StringConstructor.java similarity index 100% rename from jdk/test/java/math/BigDecimal/StringConstructor.java rename to test/jdk/java/math/BigDecimal/StringConstructor.java diff --git a/jdk/test/java/math/BigDecimal/StrippingZerosTest.java b/test/jdk/java/math/BigDecimal/StrippingZerosTest.java similarity index 100% rename from jdk/test/java/math/BigDecimal/StrippingZerosTest.java rename to test/jdk/java/math/BigDecimal/StrippingZerosTest.java diff --git a/jdk/test/java/math/BigDecimal/ToPlainStringTests.java b/test/jdk/java/math/BigDecimal/ToPlainStringTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/ToPlainStringTests.java rename to test/jdk/java/math/BigDecimal/ToPlainStringTests.java diff --git a/jdk/test/java/math/BigDecimal/ZeroScalingTests.java b/test/jdk/java/math/BigDecimal/ZeroScalingTests.java similarity index 100% rename from jdk/test/java/math/BigDecimal/ZeroScalingTests.java rename to test/jdk/java/math/BigDecimal/ZeroScalingTests.java diff --git a/jdk/test/java/math/BigInteger/BigIntegerTest.java b/test/jdk/java/math/BigInteger/BigIntegerTest.java similarity index 100% rename from jdk/test/java/math/BigInteger/BigIntegerTest.java rename to test/jdk/java/math/BigInteger/BigIntegerTest.java diff --git a/jdk/test/java/math/BigInteger/BitLengthOverflow.java b/test/jdk/java/math/BigInteger/BitLengthOverflow.java similarity index 100% rename from jdk/test/java/math/BigInteger/BitLengthOverflow.java rename to test/jdk/java/math/BigInteger/BitLengthOverflow.java diff --git a/jdk/test/java/math/BigInteger/CompareToTests.java b/test/jdk/java/math/BigInteger/CompareToTests.java similarity index 100% rename from jdk/test/java/math/BigInteger/CompareToTests.java rename to test/jdk/java/math/BigInteger/CompareToTests.java diff --git a/jdk/test/java/math/BigInteger/DivisionOverflow.java b/test/jdk/java/math/BigInteger/DivisionOverflow.java similarity index 100% rename from jdk/test/java/math/BigInteger/DivisionOverflow.java rename to test/jdk/java/math/BigInteger/DivisionOverflow.java diff --git a/jdk/test/java/math/BigInteger/DoubleValueOverflow.java b/test/jdk/java/math/BigInteger/DoubleValueOverflow.java similarity index 100% rename from jdk/test/java/math/BigInteger/DoubleValueOverflow.java rename to test/jdk/java/math/BigInteger/DoubleValueOverflow.java diff --git a/jdk/test/java/math/BigInteger/ExtremeShiftingTests.java b/test/jdk/java/math/BigInteger/ExtremeShiftingTests.java similarity index 100% rename from jdk/test/java/math/BigInteger/ExtremeShiftingTests.java rename to test/jdk/java/math/BigInteger/ExtremeShiftingTests.java diff --git a/jdk/test/java/math/BigInteger/ModPow.java b/test/jdk/java/math/BigInteger/ModPow.java similarity index 100% rename from jdk/test/java/math/BigInteger/ModPow.java rename to test/jdk/java/math/BigInteger/ModPow.java diff --git a/jdk/test/java/math/BigInteger/ModPow65537.java b/test/jdk/java/math/BigInteger/ModPow65537.java similarity index 100% rename from jdk/test/java/math/BigInteger/ModPow65537.java rename to test/jdk/java/math/BigInteger/ModPow65537.java diff --git a/jdk/test/java/math/BigInteger/ModPowPowersof2.java b/test/jdk/java/math/BigInteger/ModPowPowersof2.java similarity index 100% rename from jdk/test/java/math/BigInteger/ModPowPowersof2.java rename to test/jdk/java/math/BigInteger/ModPowPowersof2.java diff --git a/jdk/test/java/math/BigInteger/OperatorNpeTests.java b/test/jdk/java/math/BigInteger/OperatorNpeTests.java similarity index 100% rename from jdk/test/java/math/BigInteger/OperatorNpeTests.java rename to test/jdk/java/math/BigInteger/OperatorNpeTests.java diff --git a/jdk/test/java/math/BigInteger/PrimeTest.java b/test/jdk/java/math/BigInteger/PrimeTest.java similarity index 100% rename from jdk/test/java/math/BigInteger/PrimeTest.java rename to test/jdk/java/math/BigInteger/PrimeTest.java diff --git a/jdk/test/java/math/BigInteger/PrimitiveConversionTests.java b/test/jdk/java/math/BigInteger/PrimitiveConversionTests.java similarity index 100% rename from jdk/test/java/math/BigInteger/PrimitiveConversionTests.java rename to test/jdk/java/math/BigInteger/PrimitiveConversionTests.java diff --git a/jdk/test/java/math/BigInteger/ProbablePrime.java b/test/jdk/java/math/BigInteger/ProbablePrime.java similarity index 100% rename from jdk/test/java/math/BigInteger/ProbablePrime.java rename to test/jdk/java/math/BigInteger/ProbablePrime.java diff --git a/jdk/test/java/math/BigInteger/StringConstructor.java b/test/jdk/java/math/BigInteger/StringConstructor.java similarity index 100% rename from jdk/test/java/math/BigInteger/StringConstructor.java rename to test/jdk/java/math/BigInteger/StringConstructor.java diff --git a/jdk/test/java/math/BigInteger/StringConstructorOverflow.java b/test/jdk/java/math/BigInteger/StringConstructorOverflow.java similarity index 100% rename from jdk/test/java/math/BigInteger/StringConstructorOverflow.java rename to test/jdk/java/math/BigInteger/StringConstructorOverflow.java diff --git a/jdk/test/java/math/BigInteger/SymmetricRangeTests.java b/test/jdk/java/math/BigInteger/SymmetricRangeTests.java similarity index 100% rename from jdk/test/java/math/BigInteger/SymmetricRangeTests.java rename to test/jdk/java/math/BigInteger/SymmetricRangeTests.java diff --git a/jdk/test/java/math/BigInteger/TestValueExact.java b/test/jdk/java/math/BigInteger/TestValueExact.java similarity index 100% rename from jdk/test/java/math/BigInteger/TestValueExact.java rename to test/jdk/java/math/BigInteger/TestValueExact.java diff --git a/jdk/test/java/math/BigInteger/UnicodeConstructor.java b/test/jdk/java/math/BigInteger/UnicodeConstructor.java similarity index 100% rename from jdk/test/java/math/BigInteger/UnicodeConstructor.java rename to test/jdk/java/math/BigInteger/UnicodeConstructor.java diff --git a/jdk/test/java/math/RoundingMode/RoundingModeTests.java b/test/jdk/java/math/RoundingMode/RoundingModeTests.java similarity index 100% rename from jdk/test/java/math/RoundingMode/RoundingModeTests.java rename to test/jdk/java/math/RoundingMode/RoundingModeTests.java diff --git a/jdk/test/java/net/Authenticator/AuthNPETest.java b/test/jdk/java/net/Authenticator/AuthNPETest.java similarity index 100% rename from jdk/test/java/net/Authenticator/AuthNPETest.java rename to test/jdk/java/net/Authenticator/AuthNPETest.java diff --git a/jdk/test/java/net/Authenticator/B4678055.java b/test/jdk/java/net/Authenticator/B4678055.java similarity index 100% rename from jdk/test/java/net/Authenticator/B4678055.java rename to test/jdk/java/net/Authenticator/B4678055.java diff --git a/jdk/test/java/net/Authenticator/B4722333.java b/test/jdk/java/net/Authenticator/B4722333.java similarity index 100% rename from jdk/test/java/net/Authenticator/B4722333.java rename to test/jdk/java/net/Authenticator/B4722333.java diff --git a/jdk/test/java/net/Authenticator/B4759514.java b/test/jdk/java/net/Authenticator/B4759514.java similarity index 100% rename from jdk/test/java/net/Authenticator/B4759514.java rename to test/jdk/java/net/Authenticator/B4759514.java diff --git a/jdk/test/java/net/Authenticator/B4769350.java b/test/jdk/java/net/Authenticator/B4769350.java similarity index 100% rename from jdk/test/java/net/Authenticator/B4769350.java rename to test/jdk/java/net/Authenticator/B4769350.java diff --git a/jdk/test/java/net/Authenticator/B4921848.java b/test/jdk/java/net/Authenticator/B4921848.java similarity index 100% rename from jdk/test/java/net/Authenticator/B4921848.java rename to test/jdk/java/net/Authenticator/B4921848.java diff --git a/jdk/test/java/net/Authenticator/B4933582.java b/test/jdk/java/net/Authenticator/B4933582.java similarity index 100% rename from jdk/test/java/net/Authenticator/B4933582.java rename to test/jdk/java/net/Authenticator/B4933582.java diff --git a/jdk/test/java/net/Authenticator/B4962064.java b/test/jdk/java/net/Authenticator/B4962064.java similarity index 100% rename from jdk/test/java/net/Authenticator/B4962064.java rename to test/jdk/java/net/Authenticator/B4962064.java diff --git a/jdk/test/java/net/Authenticator/B6870935.java b/test/jdk/java/net/Authenticator/B6870935.java similarity index 100% rename from jdk/test/java/net/Authenticator/B6870935.java rename to test/jdk/java/net/Authenticator/B6870935.java diff --git a/jdk/test/java/net/Authenticator/B8034170.java b/test/jdk/java/net/Authenticator/B8034170.java similarity index 100% rename from jdk/test/java/net/Authenticator/B8034170.java rename to test/jdk/java/net/Authenticator/B8034170.java diff --git a/jdk/test/java/net/Authenticator/BasicTest.java b/test/jdk/java/net/Authenticator/BasicTest.java similarity index 100% rename from jdk/test/java/net/Authenticator/BasicTest.java rename to test/jdk/java/net/Authenticator/BasicTest.java diff --git a/jdk/test/java/net/Authenticator/BasicTest3.java b/test/jdk/java/net/Authenticator/BasicTest3.java similarity index 100% rename from jdk/test/java/net/Authenticator/BasicTest3.java rename to test/jdk/java/net/Authenticator/BasicTest3.java diff --git a/jdk/test/java/net/Authenticator/BasicTest4.java b/test/jdk/java/net/Authenticator/BasicTest4.java similarity index 100% rename from jdk/test/java/net/Authenticator/BasicTest4.java rename to test/jdk/java/net/Authenticator/BasicTest4.java diff --git a/jdk/test/java/net/Authenticator/Deadlock.java b/test/jdk/java/net/Authenticator/Deadlock.java similarity index 100% rename from jdk/test/java/net/Authenticator/Deadlock.java rename to test/jdk/java/net/Authenticator/Deadlock.java diff --git a/jdk/test/java/net/Authenticator/GetAuthenticatorTest.java b/test/jdk/java/net/Authenticator/GetAuthenticatorTest.java similarity index 100% rename from jdk/test/java/net/Authenticator/GetAuthenticatorTest.java rename to test/jdk/java/net/Authenticator/GetAuthenticatorTest.java diff --git a/jdk/test/java/net/B6499348.java b/test/jdk/java/net/B6499348.java similarity index 100% rename from jdk/test/java/net/B6499348.java rename to test/jdk/java/net/B6499348.java diff --git a/jdk/test/java/net/BindException/Test.java b/test/jdk/java/net/BindException/Test.java similarity index 100% rename from jdk/test/java/net/BindException/Test.java rename to test/jdk/java/net/BindException/Test.java diff --git a/jdk/test/java/net/CookieHandler/B6277794.java b/test/jdk/java/net/CookieHandler/B6277794.java similarity index 100% rename from jdk/test/java/net/CookieHandler/B6277794.java rename to test/jdk/java/net/CookieHandler/B6277794.java diff --git a/jdk/test/java/net/CookieHandler/B6644726.java b/test/jdk/java/net/CookieHandler/B6644726.java similarity index 100% rename from jdk/test/java/net/CookieHandler/B6644726.java rename to test/jdk/java/net/CookieHandler/B6644726.java diff --git a/jdk/test/java/net/CookieHandler/B6791927.java b/test/jdk/java/net/CookieHandler/B6791927.java similarity index 100% rename from jdk/test/java/net/CookieHandler/B6791927.java rename to test/jdk/java/net/CookieHandler/B6791927.java diff --git a/jdk/test/java/net/CookieHandler/CookieHandlerTest.java b/test/jdk/java/net/CookieHandler/CookieHandlerTest.java similarity index 100% rename from jdk/test/java/net/CookieHandler/CookieHandlerTest.java rename to test/jdk/java/net/CookieHandler/CookieHandlerTest.java diff --git a/jdk/test/java/net/CookieHandler/CookieManagerTest.java b/test/jdk/java/net/CookieHandler/CookieManagerTest.java similarity index 100% rename from jdk/test/java/net/CookieHandler/CookieManagerTest.java rename to test/jdk/java/net/CookieHandler/CookieManagerTest.java diff --git a/jdk/test/java/net/CookieHandler/EmptyCookieHeader.java b/test/jdk/java/net/CookieHandler/EmptyCookieHeader.java similarity index 100% rename from jdk/test/java/net/CookieHandler/EmptyCookieHeader.java rename to test/jdk/java/net/CookieHandler/EmptyCookieHeader.java diff --git a/jdk/test/java/net/CookieHandler/LocalHostCookie.java b/test/jdk/java/net/CookieHandler/LocalHostCookie.java similarity index 100% rename from jdk/test/java/net/CookieHandler/LocalHostCookie.java rename to test/jdk/java/net/CookieHandler/LocalHostCookie.java diff --git a/jdk/test/java/net/CookieHandler/NullUriCookieTest.java b/test/jdk/java/net/CookieHandler/NullUriCookieTest.java similarity index 100% rename from jdk/test/java/net/CookieHandler/NullUriCookieTest.java rename to test/jdk/java/net/CookieHandler/NullUriCookieTest.java diff --git a/jdk/test/java/net/CookieHandler/TestHttpCookie.java b/test/jdk/java/net/CookieHandler/TestHttpCookie.java similarity index 100% rename from jdk/test/java/net/CookieHandler/TestHttpCookie.java rename to test/jdk/java/net/CookieHandler/TestHttpCookie.java diff --git a/jdk/test/java/net/DatagramPacket/CheckBoundaries.java b/test/jdk/java/net/DatagramPacket/CheckBoundaries.java similarity index 100% rename from jdk/test/java/net/DatagramPacket/CheckBoundaries.java rename to test/jdk/java/net/DatagramPacket/CheckBoundaries.java diff --git a/jdk/test/java/net/DatagramPacket/Constructor.java b/test/jdk/java/net/DatagramPacket/Constructor.java similarity index 100% rename from jdk/test/java/net/DatagramPacket/Constructor.java rename to test/jdk/java/net/DatagramPacket/Constructor.java diff --git a/jdk/test/java/net/DatagramPacket/Offset.java b/test/jdk/java/net/DatagramPacket/Offset.java similarity index 100% rename from jdk/test/java/net/DatagramPacket/Offset.java rename to test/jdk/java/net/DatagramPacket/Offset.java diff --git a/jdk/test/java/net/DatagramPacket/ReuseBuf.java b/test/jdk/java/net/DatagramPacket/ReuseBuf.java similarity index 100% rename from jdk/test/java/net/DatagramPacket/ReuseBuf.java rename to test/jdk/java/net/DatagramPacket/ReuseBuf.java diff --git a/jdk/test/java/net/DatagramPacket/Unresolved.java b/test/jdk/java/net/DatagramPacket/Unresolved.java similarity index 100% rename from jdk/test/java/net/DatagramPacket/Unresolved.java rename to test/jdk/java/net/DatagramPacket/Unresolved.java diff --git a/jdk/test/java/net/DatagramSocket/B6411513.java b/test/jdk/java/net/DatagramSocket/B6411513.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/B6411513.java rename to test/jdk/java/net/DatagramSocket/B6411513.java diff --git a/jdk/test/java/net/DatagramSocket/B8035653.java b/test/jdk/java/net/DatagramSocket/B8035653.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/B8035653.java rename to test/jdk/java/net/DatagramSocket/B8035653.java diff --git a/jdk/test/java/net/DatagramSocket/BindFailTest.java b/test/jdk/java/net/DatagramSocket/BindFailTest.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/BindFailTest.java rename to test/jdk/java/net/DatagramSocket/BindFailTest.java diff --git a/jdk/test/java/net/DatagramSocket/DatagramTimeout.java b/test/jdk/java/net/DatagramSocket/DatagramTimeout.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/DatagramTimeout.java rename to test/jdk/java/net/DatagramSocket/DatagramTimeout.java diff --git a/jdk/test/java/net/DatagramSocket/ImplicitBind.java b/test/jdk/java/net/DatagramSocket/ImplicitBind.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/ImplicitBind.java rename to test/jdk/java/net/DatagramSocket/ImplicitBind.java diff --git a/jdk/test/java/net/DatagramSocket/InheritHandle.java b/test/jdk/java/net/DatagramSocket/InheritHandle.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/InheritHandle.java rename to test/jdk/java/net/DatagramSocket/InheritHandle.java diff --git a/jdk/test/java/net/DatagramSocket/LocalSocketAddress.java b/test/jdk/java/net/DatagramSocket/LocalSocketAddress.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/LocalSocketAddress.java rename to test/jdk/java/net/DatagramSocket/LocalSocketAddress.java diff --git a/jdk/test/java/net/DatagramSocket/PortUnreachable.java b/test/jdk/java/net/DatagramSocket/PortUnreachable.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/PortUnreachable.java rename to test/jdk/java/net/DatagramSocket/PortUnreachable.java diff --git a/jdk/test/java/net/DatagramSocket/ReportSocketClosed.java b/test/jdk/java/net/DatagramSocket/ReportSocketClosed.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/ReportSocketClosed.java rename to test/jdk/java/net/DatagramSocket/ReportSocketClosed.java diff --git a/jdk/test/java/net/DatagramSocket/ReuseAddressTest.java b/test/jdk/java/net/DatagramSocket/ReuseAddressTest.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/ReuseAddressTest.java rename to test/jdk/java/net/DatagramSocket/ReuseAddressTest.java diff --git a/jdk/test/java/net/DatagramSocket/Send12k.java b/test/jdk/java/net/DatagramSocket/Send12k.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/Send12k.java rename to test/jdk/java/net/DatagramSocket/Send12k.java diff --git a/jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java b/test/jdk/java/net/DatagramSocket/SendDatagramToBadAddress.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java rename to test/jdk/java/net/DatagramSocket/SendDatagramToBadAddress.java diff --git a/jdk/test/java/net/DatagramSocket/SendSize.java b/test/jdk/java/net/DatagramSocket/SendSize.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/SendSize.java rename to test/jdk/java/net/DatagramSocket/SendSize.java diff --git a/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.java b/test/jdk/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.java rename to test/jdk/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.java diff --git a/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/java.base/java/net/MyDatagramSocketImplFactory.java b/test/jdk/java/net/DatagramSocket/SetDatagramSocketImplFactory/java.base/java/net/MyDatagramSocketImplFactory.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/java.base/java/net/MyDatagramSocketImplFactory.java rename to test/jdk/java/net/DatagramSocket/SetDatagramSocketImplFactory/java.base/java/net/MyDatagramSocketImplFactory.java diff --git a/jdk/test/java/net/DatagramSocket/SetReceiveBufferSize.java b/test/jdk/java/net/DatagramSocket/SetReceiveBufferSize.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/SetReceiveBufferSize.java rename to test/jdk/java/net/DatagramSocket/SetReceiveBufferSize.java diff --git a/jdk/test/java/net/DatagramSocket/TestAfterClose.java b/test/jdk/java/net/DatagramSocket/TestAfterClose.java similarity index 100% rename from jdk/test/java/net/DatagramSocket/TestAfterClose.java rename to test/jdk/java/net/DatagramSocket/TestAfterClose.java diff --git a/jdk/test/java/net/DatagramSocketImpl/CheckDiscard.java b/test/jdk/java/net/DatagramSocketImpl/CheckDiscard.java similarity index 100% rename from jdk/test/java/net/DatagramSocketImpl/CheckDiscard.java rename to test/jdk/java/net/DatagramSocketImpl/CheckDiscard.java diff --git a/jdk/test/java/net/HttpCookie/CookieNegativeMaxAge.java b/test/jdk/java/net/HttpCookie/CookieNegativeMaxAge.java similarity index 100% rename from jdk/test/java/net/HttpCookie/CookieNegativeMaxAge.java rename to test/jdk/java/net/HttpCookie/CookieNegativeMaxAge.java diff --git a/jdk/test/java/net/HttpCookie/ExpiredCookieTest.java b/test/jdk/java/net/HttpCookie/ExpiredCookieTest.java similarity index 100% rename from jdk/test/java/net/HttpCookie/ExpiredCookieTest.java rename to test/jdk/java/net/HttpCookie/ExpiredCookieTest.java diff --git a/jdk/test/java/net/HttpCookie/IllegalCookieNameTest.java b/test/jdk/java/net/HttpCookie/IllegalCookieNameTest.java similarity index 100% rename from jdk/test/java/net/HttpCookie/IllegalCookieNameTest.java rename to test/jdk/java/net/HttpCookie/IllegalCookieNameTest.java diff --git a/jdk/test/java/net/HttpURLConnection/HttpResponseCode.java b/test/jdk/java/net/HttpURLConnection/HttpResponseCode.java similarity index 100% rename from jdk/test/java/net/HttpURLConnection/HttpResponseCode.java rename to test/jdk/java/net/HttpURLConnection/HttpResponseCode.java diff --git a/jdk/test/java/net/HttpURLConnection/HttpURLConWithProxy.java b/test/jdk/java/net/HttpURLConnection/HttpURLConWithProxy.java similarity index 100% rename from jdk/test/java/net/HttpURLConnection/HttpURLConWithProxy.java rename to test/jdk/java/net/HttpURLConnection/HttpURLConWithProxy.java diff --git a/jdk/test/java/net/HttpURLConnection/NoProxyTest.java b/test/jdk/java/net/HttpURLConnection/NoProxyTest.java similarity index 100% rename from jdk/test/java/net/HttpURLConnection/NoProxyTest.java rename to test/jdk/java/net/HttpURLConnection/NoProxyTest.java diff --git a/jdk/test/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java similarity index 100% rename from jdk/test/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java rename to test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java diff --git a/jdk/test/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java similarity index 100% rename from jdk/test/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java rename to test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java diff --git a/jdk/test/java/net/HttpURLConnection/SetAuthenticator/HTTPTestClient.java b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestClient.java similarity index 100% rename from jdk/test/java/net/HttpURLConnection/SetAuthenticator/HTTPTestClient.java rename to test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestClient.java diff --git a/jdk/test/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java similarity index 100% rename from jdk/test/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java rename to test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java diff --git a/jdk/test/java/net/HttpURLConnection/UnmodifiableMaps.java b/test/jdk/java/net/HttpURLConnection/UnmodifiableMaps.java similarity index 100% rename from jdk/test/java/net/HttpURLConnection/UnmodifiableMaps.java rename to test/jdk/java/net/HttpURLConnection/UnmodifiableMaps.java diff --git a/jdk/test/java/net/HttpURLConnection/getResponseCode.java b/test/jdk/java/net/HttpURLConnection/getResponseCode.java similarity index 100% rename from jdk/test/java/net/HttpURLConnection/getResponseCode.java rename to test/jdk/java/net/HttpURLConnection/getResponseCode.java diff --git a/jdk/test/java/net/IDN/IllegalArg.java b/test/jdk/java/net/IDN/IllegalArg.java similarity index 100% rename from jdk/test/java/net/IDN/IllegalArg.java rename to test/jdk/java/net/IDN/IllegalArg.java diff --git a/jdk/test/java/net/IDN/UseSTD3ASCIIRules.java b/test/jdk/java/net/IDN/UseSTD3ASCIIRules.java similarity index 100% rename from jdk/test/java/net/IDN/UseSTD3ASCIIRules.java rename to test/jdk/java/net/IDN/UseSTD3ASCIIRules.java diff --git a/jdk/test/java/net/Inet4Address/PingThis.java b/test/jdk/java/net/Inet4Address/PingThis.java similarity index 100% rename from jdk/test/java/net/Inet4Address/PingThis.java rename to test/jdk/java/net/Inet4Address/PingThis.java diff --git a/jdk/test/java/net/Inet4Address/TestToNumericFormatHosts b/test/jdk/java/net/Inet4Address/TestToNumericFormatHosts similarity index 100% rename from jdk/test/java/net/Inet4Address/TestToNumericFormatHosts rename to test/jdk/java/net/Inet4Address/TestToNumericFormatHosts diff --git a/jdk/test/java/net/Inet4Address/isSiteLocalAddress.java b/test/jdk/java/net/Inet4Address/isSiteLocalAddress.java similarity index 100% rename from jdk/test/java/net/Inet4Address/isSiteLocalAddress.java rename to test/jdk/java/net/Inet4Address/isSiteLocalAddress.java diff --git a/jdk/test/java/net/Inet4Address/textToNumericFormat.java b/test/jdk/java/net/Inet4Address/textToNumericFormat.java similarity index 100% rename from jdk/test/java/net/Inet4Address/textToNumericFormat.java rename to test/jdk/java/net/Inet4Address/textToNumericFormat.java diff --git a/jdk/test/java/net/Inet6Address/B4923906.java b/test/jdk/java/net/Inet6Address/B4923906.java similarity index 100% rename from jdk/test/java/net/Inet6Address/B4923906.java rename to test/jdk/java/net/Inet6Address/B4923906.java diff --git a/jdk/test/java/net/Inet6Address/B6206527.java b/test/jdk/java/net/Inet6Address/B6206527.java similarity index 100% rename from jdk/test/java/net/Inet6Address/B6206527.java rename to test/jdk/java/net/Inet6Address/B6206527.java diff --git a/jdk/test/java/net/Inet6Address/B6214234.java b/test/jdk/java/net/Inet6Address/B6214234.java similarity index 100% rename from jdk/test/java/net/Inet6Address/B6214234.java rename to test/jdk/java/net/Inet6Address/B6214234.java diff --git a/jdk/test/java/net/Inet6Address/B6558853.java b/test/jdk/java/net/Inet6Address/B6558853.java similarity index 100% rename from jdk/test/java/net/Inet6Address/B6558853.java rename to test/jdk/java/net/Inet6Address/B6558853.java diff --git a/jdk/test/java/net/Inet6Address/IPv6AddressTypes.java b/test/jdk/java/net/Inet6Address/IPv6AddressTypes.java similarity index 100% rename from jdk/test/java/net/Inet6Address/IPv6AddressTypes.java rename to test/jdk/java/net/Inet6Address/IPv6AddressTypes.java diff --git a/jdk/test/java/net/Inet6Address/IPv6Numeric.java b/test/jdk/java/net/Inet6Address/IPv6Numeric.java similarity index 100% rename from jdk/test/java/net/Inet6Address/IPv6Numeric.java rename to test/jdk/java/net/Inet6Address/IPv6Numeric.java diff --git a/jdk/test/java/net/Inet6Address/PreferIPv6AddressesTest.java b/test/jdk/java/net/Inet6Address/PreferIPv6AddressesTest.java similarity index 100% rename from jdk/test/java/net/Inet6Address/PreferIPv6AddressesTest.java rename to test/jdk/java/net/Inet6Address/PreferIPv6AddressesTest.java diff --git a/jdk/test/java/net/Inet6Address/StringScope.java b/test/jdk/java/net/Inet6Address/StringScope.java similarity index 100% rename from jdk/test/java/net/Inet6Address/StringScope.java rename to test/jdk/java/net/Inet6Address/StringScope.java diff --git a/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java b/test/jdk/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java similarity index 100% rename from jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java rename to test/jdk/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java diff --git a/jdk/test/java/net/Inet6Address/serialize/Readme.txt b/test/jdk/java/net/Inet6Address/serialize/Readme.txt similarity index 100% rename from jdk/test/java/net/Inet6Address/serialize/Readme.txt rename to test/jdk/java/net/Inet6Address/serialize/Readme.txt diff --git a/jdk/test/java/net/Inet6Address/serialize/Serialize.java b/test/jdk/java/net/Inet6Address/serialize/Serialize.java similarity index 100% rename from jdk/test/java/net/Inet6Address/serialize/Serialize.java rename to test/jdk/java/net/Inet6Address/serialize/Serialize.java diff --git a/jdk/test/java/net/Inet6Address/serialize/serial-bge0.ser b/test/jdk/java/net/Inet6Address/serialize/serial-bge0.ser similarity index 100% rename from jdk/test/java/net/Inet6Address/serialize/serial-bge0.ser rename to test/jdk/java/net/Inet6Address/serialize/serial-bge0.ser diff --git a/jdk/test/java/net/Inet6Address/serialize/serial1.4.2.ser b/test/jdk/java/net/Inet6Address/serialize/serial1.4.2.ser similarity index 100% rename from jdk/test/java/net/Inet6Address/serialize/serial1.4.2.ser rename to test/jdk/java/net/Inet6Address/serialize/serial1.4.2.ser diff --git a/jdk/test/java/net/InetAddress/B5087907.java b/test/jdk/java/net/InetAddress/B5087907.java similarity index 100% rename from jdk/test/java/net/InetAddress/B5087907.java rename to test/jdk/java/net/InetAddress/B5087907.java diff --git a/jdk/test/java/net/InetAddress/B6246242.java b/test/jdk/java/net/InetAddress/B6246242.java similarity index 100% rename from jdk/test/java/net/InetAddress/B6246242.java rename to test/jdk/java/net/InetAddress/B6246242.java diff --git a/jdk/test/java/net/InetAddress/B6296240.java b/test/jdk/java/net/InetAddress/B6296240.java similarity index 100% rename from jdk/test/java/net/InetAddress/B6296240.java rename to test/jdk/java/net/InetAddress/B6296240.java diff --git a/jdk/test/java/net/InetAddress/BadDottedIPAddress.java b/test/jdk/java/net/InetAddress/BadDottedIPAddress.java similarity index 100% rename from jdk/test/java/net/InetAddress/BadDottedIPAddress.java rename to test/jdk/java/net/InetAddress/BadDottedIPAddress.java diff --git a/jdk/test/java/net/InetAddress/CachedUnknownHostName.java b/test/jdk/java/net/InetAddress/CachedUnknownHostName.java similarity index 100% rename from jdk/test/java/net/InetAddress/CachedUnknownHostName.java rename to test/jdk/java/net/InetAddress/CachedUnknownHostName.java diff --git a/jdk/test/java/net/InetAddress/CheckJNI.java b/test/jdk/java/net/InetAddress/CheckJNI.java similarity index 100% rename from jdk/test/java/net/InetAddress/CheckJNI.java rename to test/jdk/java/net/InetAddress/CheckJNI.java diff --git a/jdk/test/java/net/InetAddress/GetLocalHostWithSM.java b/test/jdk/java/net/InetAddress/GetLocalHostWithSM.java similarity index 100% rename from jdk/test/java/net/InetAddress/GetLocalHostWithSM.java rename to test/jdk/java/net/InetAddress/GetLocalHostWithSM.java diff --git a/jdk/test/java/net/InetAddress/GetLoopbackAddress.java b/test/jdk/java/net/InetAddress/GetLoopbackAddress.java similarity index 100% rename from jdk/test/java/net/InetAddress/GetLoopbackAddress.java rename to test/jdk/java/net/InetAddress/GetLoopbackAddress.java diff --git a/jdk/test/java/net/InetAddress/HashSpread.java b/test/jdk/java/net/InetAddress/HashSpread.java similarity index 100% rename from jdk/test/java/net/InetAddress/HashSpread.java rename to test/jdk/java/net/InetAddress/HashSpread.java diff --git a/jdk/test/java/net/InetAddress/IPv4Formats.java b/test/jdk/java/net/InetAddress/IPv4Formats.java similarity index 100% rename from jdk/test/java/net/InetAddress/IPv4Formats.java rename to test/jdk/java/net/InetAddress/IPv4Formats.java diff --git a/jdk/test/java/net/InetAddress/InternalNameServiceTest.java b/test/jdk/java/net/InetAddress/InternalNameServiceTest.java similarity index 100% rename from jdk/test/java/net/InetAddress/InternalNameServiceTest.java rename to test/jdk/java/net/InetAddress/InternalNameServiceTest.java diff --git a/jdk/test/java/net/InetAddress/InternalNameServiceWithHostsFileTest.java b/test/jdk/java/net/InetAddress/InternalNameServiceWithHostsFileTest.java similarity index 100% rename from jdk/test/java/net/InetAddress/InternalNameServiceWithHostsFileTest.java rename to test/jdk/java/net/InetAddress/InternalNameServiceWithHostsFileTest.java diff --git a/jdk/test/java/net/InetAddress/InternalNameServiceWithNoHostsFileTest.java b/test/jdk/java/net/InetAddress/InternalNameServiceWithNoHostsFileTest.java similarity index 100% rename from jdk/test/java/net/InetAddress/InternalNameServiceWithNoHostsFileTest.java rename to test/jdk/java/net/InetAddress/InternalNameServiceWithNoHostsFileTest.java diff --git a/jdk/test/java/net/InetAddress/IsHostReachableBug.java b/test/jdk/java/net/InetAddress/IsHostReachableBug.java similarity index 100% rename from jdk/test/java/net/InetAddress/IsHostReachableBug.java rename to test/jdk/java/net/InetAddress/IsHostReachableBug.java diff --git a/jdk/test/java/net/InetAddress/IsReachable.java b/test/jdk/java/net/InetAddress/IsReachable.java similarity index 100% rename from jdk/test/java/net/InetAddress/IsReachable.java rename to test/jdk/java/net/InetAddress/IsReachable.java diff --git a/jdk/test/java/net/InetAddress/IsReachableViaLoopbackTest.java b/test/jdk/java/net/InetAddress/IsReachableViaLoopbackTest.java similarity index 100% rename from jdk/test/java/net/InetAddress/IsReachableViaLoopbackTest.java rename to test/jdk/java/net/InetAddress/IsReachableViaLoopbackTest.java diff --git a/jdk/test/java/net/InetAddress/MyPrincipal.java b/test/jdk/java/net/InetAddress/MyPrincipal.java similarity index 100% rename from jdk/test/java/net/InetAddress/MyPrincipal.java rename to test/jdk/java/net/InetAddress/MyPrincipal.java diff --git a/jdk/test/java/net/InetAddress/TestHosts b/test/jdk/java/net/InetAddress/TestHosts similarity index 100% rename from jdk/test/java/net/InetAddress/TestHosts rename to test/jdk/java/net/InetAddress/TestHosts diff --git a/jdk/test/java/net/InetAddress/TestHosts-III b/test/jdk/java/net/InetAddress/TestHosts-III similarity index 100% rename from jdk/test/java/net/InetAddress/TestHosts-III rename to test/jdk/java/net/InetAddress/TestHosts-III diff --git a/jdk/test/java/net/InetAddress/WhiteSpaceHostTest.java b/test/jdk/java/net/InetAddress/WhiteSpaceHostTest.java similarity index 100% rename from jdk/test/java/net/InetAddress/WhiteSpaceHostTest.java rename to test/jdk/java/net/InetAddress/WhiteSpaceHostTest.java diff --git a/jdk/test/java/net/InetAddress/getOriginalHostName.java b/test/jdk/java/net/InetAddress/getOriginalHostName.java similarity index 100% rename from jdk/test/java/net/InetAddress/getOriginalHostName.java rename to test/jdk/java/net/InetAddress/getOriginalHostName.java diff --git a/jdk/test/java/net/InetAddress/policy.file b/test/jdk/java/net/InetAddress/policy.file similarity index 100% rename from jdk/test/java/net/InetAddress/policy.file rename to test/jdk/java/net/InetAddress/policy.file diff --git a/jdk/test/java/net/InetAddress/ptr/Lookup.java b/test/jdk/java/net/InetAddress/ptr/Lookup.java similarity index 100% rename from jdk/test/java/net/InetAddress/ptr/Lookup.java rename to test/jdk/java/net/InetAddress/ptr/Lookup.java diff --git a/jdk/test/java/net/InetSocketAddress/B4849451.java b/test/jdk/java/net/InetSocketAddress/B4849451.java similarity index 100% rename from jdk/test/java/net/InetSocketAddress/B4849451.java rename to test/jdk/java/net/InetSocketAddress/B4849451.java diff --git a/jdk/test/java/net/InetSocketAddress/B6469803.java b/test/jdk/java/net/InetSocketAddress/B6469803.java similarity index 100% rename from jdk/test/java/net/InetSocketAddress/B6469803.java rename to test/jdk/java/net/InetSocketAddress/B6469803.java diff --git a/jdk/test/java/net/InetSocketAddress/CreateUnresolved.java b/test/jdk/java/net/InetSocketAddress/CreateUnresolved.java similarity index 100% rename from jdk/test/java/net/InetSocketAddress/CreateUnresolved.java rename to test/jdk/java/net/InetSocketAddress/CreateUnresolved.java diff --git a/jdk/test/java/net/InetSocketAddress/ToString.java b/test/jdk/java/net/InetSocketAddress/ToString.java similarity index 100% rename from jdk/test/java/net/InetSocketAddress/ToString.java rename to test/jdk/java/net/InetSocketAddress/ToString.java diff --git a/jdk/test/java/net/InterfaceAddress/Equals.java b/test/jdk/java/net/InterfaceAddress/Equals.java similarity index 100% rename from jdk/test/java/net/InterfaceAddress/Equals.java rename to test/jdk/java/net/InterfaceAddress/Equals.java diff --git a/jdk/test/java/net/InterfaceAddress/NetworkPrefixLength.java b/test/jdk/java/net/InterfaceAddress/NetworkPrefixLength.java similarity index 100% rename from jdk/test/java/net/InterfaceAddress/NetworkPrefixLength.java rename to test/jdk/java/net/InterfaceAddress/NetworkPrefixLength.java diff --git a/jdk/test/java/net/MulticastSocket/B6425815.java b/test/jdk/java/net/MulticastSocket/B6425815.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/B6425815.java rename to test/jdk/java/net/MulticastSocket/B6425815.java diff --git a/jdk/test/java/net/MulticastSocket/B6427403.java b/test/jdk/java/net/MulticastSocket/B6427403.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/B6427403.java rename to test/jdk/java/net/MulticastSocket/B6427403.java diff --git a/jdk/test/java/net/MulticastSocket/JoinLeave.java b/test/jdk/java/net/MulticastSocket/JoinLeave.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/JoinLeave.java rename to test/jdk/java/net/MulticastSocket/JoinLeave.java diff --git a/jdk/test/java/net/MulticastSocket/MultiDead.java b/test/jdk/java/net/MulticastSocket/MultiDead.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/MultiDead.java rename to test/jdk/java/net/MulticastSocket/MultiDead.java diff --git a/jdk/test/java/net/MulticastSocket/MulticastAddresses.java b/test/jdk/java/net/MulticastSocket/MulticastAddresses.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/MulticastAddresses.java rename to test/jdk/java/net/MulticastSocket/MulticastAddresses.java diff --git a/jdk/test/java/net/MulticastSocket/MulticastTTL.java b/test/jdk/java/net/MulticastSocket/MulticastTTL.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/MulticastTTL.java rename to test/jdk/java/net/MulticastSocket/MulticastTTL.java diff --git a/jdk/test/java/net/MulticastSocket/NetworkInterfaceEmptyGetInetAddressesTest.java b/test/jdk/java/net/MulticastSocket/NetworkInterfaceEmptyGetInetAddressesTest.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/NetworkInterfaceEmptyGetInetAddressesTest.java rename to test/jdk/java/net/MulticastSocket/NetworkInterfaceEmptyGetInetAddressesTest.java diff --git a/jdk/test/java/net/MulticastSocket/NoLoopbackPackets.java b/test/jdk/java/net/MulticastSocket/NoLoopbackPackets.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/NoLoopbackPackets.java rename to test/jdk/java/net/MulticastSocket/NoLoopbackPackets.java diff --git a/jdk/test/java/net/MulticastSocket/Promiscuous.java b/test/jdk/java/net/MulticastSocket/Promiscuous.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/Promiscuous.java rename to test/jdk/java/net/MulticastSocket/Promiscuous.java diff --git a/jdk/test/java/net/MulticastSocket/Reuse.java b/test/jdk/java/net/MulticastSocket/Reuse.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/Reuse.java rename to test/jdk/java/net/MulticastSocket/Reuse.java diff --git a/jdk/test/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java b/test/jdk/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java rename to test/jdk/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java diff --git a/jdk/test/java/net/MulticastSocket/SetLoopbackMode.java b/test/jdk/java/net/MulticastSocket/SetLoopbackMode.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/SetLoopbackMode.java rename to test/jdk/java/net/MulticastSocket/SetLoopbackMode.java diff --git a/jdk/test/java/net/MulticastSocket/SetOutgoingIf.java b/test/jdk/java/net/MulticastSocket/SetOutgoingIf.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/SetOutgoingIf.java rename to test/jdk/java/net/MulticastSocket/SetOutgoingIf.java diff --git a/jdk/test/java/net/MulticastSocket/SetTTLAndGetTTL.java b/test/jdk/java/net/MulticastSocket/SetTTLAndGetTTL.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/SetTTLAndGetTTL.java rename to test/jdk/java/net/MulticastSocket/SetTTLAndGetTTL.java diff --git a/jdk/test/java/net/MulticastSocket/SetTTLTo0.java b/test/jdk/java/net/MulticastSocket/SetTTLTo0.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/SetTTLTo0.java rename to test/jdk/java/net/MulticastSocket/SetTTLTo0.java diff --git a/jdk/test/java/net/MulticastSocket/Test.java b/test/jdk/java/net/MulticastSocket/Test.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/Test.java rename to test/jdk/java/net/MulticastSocket/Test.java diff --git a/jdk/test/java/net/MulticastSocket/TestDefaults.java b/test/jdk/java/net/MulticastSocket/TestDefaults.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/TestDefaults.java rename to test/jdk/java/net/MulticastSocket/TestDefaults.java diff --git a/jdk/test/java/net/MulticastSocket/TestInterfaces.java b/test/jdk/java/net/MulticastSocket/TestInterfaces.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/TestInterfaces.java rename to test/jdk/java/net/MulticastSocket/TestInterfaces.java diff --git a/jdk/test/java/net/MulticastSocket/TimeToLive.java b/test/jdk/java/net/MulticastSocket/TimeToLive.java similarity index 100% rename from jdk/test/java/net/MulticastSocket/TimeToLive.java rename to test/jdk/java/net/MulticastSocket/TimeToLive.java diff --git a/jdk/test/java/net/NetworkConfigurationProbe.java b/test/jdk/java/net/NetworkConfigurationProbe.java similarity index 100% rename from jdk/test/java/net/NetworkConfigurationProbe.java rename to test/jdk/java/net/NetworkConfigurationProbe.java diff --git a/jdk/test/java/net/NetworkInterface/Equals.java b/test/jdk/java/net/NetworkInterface/Equals.java similarity index 100% rename from jdk/test/java/net/NetworkInterface/Equals.java rename to test/jdk/java/net/NetworkInterface/Equals.java diff --git a/jdk/test/java/net/NetworkInterface/GetMacAddress.java b/test/jdk/java/net/NetworkInterface/GetMacAddress.java similarity index 100% rename from jdk/test/java/net/NetworkInterface/GetMacAddress.java rename to test/jdk/java/net/NetworkInterface/GetMacAddress.java diff --git a/jdk/test/java/net/NetworkInterface/IPv4Only.java b/test/jdk/java/net/NetworkInterface/IPv4Only.java similarity index 100% rename from jdk/test/java/net/NetworkInterface/IPv4Only.java rename to test/jdk/java/net/NetworkInterface/IPv4Only.java diff --git a/jdk/test/java/net/NetworkInterface/IndexTest.java b/test/jdk/java/net/NetworkInterface/IndexTest.java similarity index 100% rename from jdk/test/java/net/NetworkInterface/IndexTest.java rename to test/jdk/java/net/NetworkInterface/IndexTest.java diff --git a/jdk/test/java/net/NetworkInterface/NetParamsTest.java b/test/jdk/java/net/NetworkInterface/NetParamsTest.java similarity index 100% rename from jdk/test/java/net/NetworkInterface/NetParamsTest.java rename to test/jdk/java/net/NetworkInterface/NetParamsTest.java diff --git a/jdk/test/java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java b/test/jdk/java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java similarity index 100% rename from jdk/test/java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java rename to test/jdk/java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java diff --git a/jdk/test/java/net/NetworkInterface/NetworkInterfaceStreamTest.java b/test/jdk/java/net/NetworkInterface/NetworkInterfaceStreamTest.java similarity index 100% rename from jdk/test/java/net/NetworkInterface/NetworkInterfaceStreamTest.java rename to test/jdk/java/net/NetworkInterface/NetworkInterfaceStreamTest.java diff --git a/jdk/test/java/net/NetworkInterface/SubNetworkInterfaceTest.java b/test/jdk/java/net/NetworkInterface/SubNetworkInterfaceTest.java similarity index 100% rename from jdk/test/java/net/NetworkInterface/SubNetworkInterfaceTest.java rename to test/jdk/java/net/NetworkInterface/SubNetworkInterfaceTest.java diff --git a/jdk/test/java/net/NetworkInterface/Test.java b/test/jdk/java/net/NetworkInterface/Test.java similarity index 100% rename from jdk/test/java/net/NetworkInterface/Test.java rename to test/jdk/java/net/NetworkInterface/Test.java diff --git a/jdk/test/java/net/NetworkInterface/UniqueMacAddressesTest.java b/test/jdk/java/net/NetworkInterface/UniqueMacAddressesTest.java similarity index 100% rename from jdk/test/java/net/NetworkInterface/UniqueMacAddressesTest.java rename to test/jdk/java/net/NetworkInterface/UniqueMacAddressesTest.java diff --git a/jdk/test/java/net/PlainSocketImpl/BigBacklog.java b/test/jdk/java/net/PlainSocketImpl/BigBacklog.java similarity index 100% rename from jdk/test/java/net/PlainSocketImpl/BigBacklog.java rename to test/jdk/java/net/PlainSocketImpl/BigBacklog.java diff --git a/jdk/test/java/net/PlainSocketImpl/CustomSocketImplFactory.java b/test/jdk/java/net/PlainSocketImpl/CustomSocketImplFactory.java similarity index 100% rename from jdk/test/java/net/PlainSocketImpl/CustomSocketImplFactory.java rename to test/jdk/java/net/PlainSocketImpl/CustomSocketImplFactory.java diff --git a/jdk/test/java/net/PlainSocketImpl/SetBufferSize.java b/test/jdk/java/net/PlainSocketImpl/SetBufferSize.java similarity index 100% rename from jdk/test/java/net/PlainSocketImpl/SetBufferSize.java rename to test/jdk/java/net/PlainSocketImpl/SetBufferSize.java diff --git a/jdk/test/java/net/PlainSocketImpl/SetOption.java b/test/jdk/java/net/PlainSocketImpl/SetOption.java similarity index 100% rename from jdk/test/java/net/PlainSocketImpl/SetOption.java rename to test/jdk/java/net/PlainSocketImpl/SetOption.java diff --git a/jdk/test/java/net/PortUnreachableException/Concurrent.java b/test/jdk/java/net/PortUnreachableException/Concurrent.java similarity index 100% rename from jdk/test/java/net/PortUnreachableException/Concurrent.java rename to test/jdk/java/net/PortUnreachableException/Concurrent.java diff --git a/jdk/test/java/net/PortUnreachableException/OneExceptionOnly.java b/test/jdk/java/net/PortUnreachableException/OneExceptionOnly.java similarity index 100% rename from jdk/test/java/net/PortUnreachableException/OneExceptionOnly.java rename to test/jdk/java/net/PortUnreachableException/OneExceptionOnly.java diff --git a/jdk/test/java/net/PortUnreachableException/Test.java b/test/jdk/java/net/PortUnreachableException/Test.java similarity index 100% rename from jdk/test/java/net/PortUnreachableException/Test.java rename to test/jdk/java/net/PortUnreachableException/Test.java diff --git a/jdk/test/java/net/ProxySelector/B6563259.java b/test/jdk/java/net/ProxySelector/B6563259.java similarity index 100% rename from jdk/test/java/net/ProxySelector/B6563259.java rename to test/jdk/java/net/ProxySelector/B6563259.java diff --git a/jdk/test/java/net/ProxySelector/B6737819.java b/test/jdk/java/net/ProxySelector/B6737819.java similarity index 100% rename from jdk/test/java/net/ProxySelector/B6737819.java rename to test/jdk/java/net/ProxySelector/B6737819.java diff --git a/jdk/test/java/net/ProxySelector/B8035158.java b/test/jdk/java/net/ProxySelector/B8035158.java similarity index 100% rename from jdk/test/java/net/ProxySelector/B8035158.java rename to test/jdk/java/net/ProxySelector/B8035158.java diff --git a/jdk/test/java/net/ProxySelector/LoopbackAddresses.java b/test/jdk/java/net/ProxySelector/LoopbackAddresses.java similarity index 100% rename from jdk/test/java/net/ProxySelector/LoopbackAddresses.java rename to test/jdk/java/net/ProxySelector/LoopbackAddresses.java diff --git a/jdk/test/java/net/ProxySelector/MultiThreadedSystemProxies.java b/test/jdk/java/net/ProxySelector/MultiThreadedSystemProxies.java similarity index 100% rename from jdk/test/java/net/ProxySelector/MultiThreadedSystemProxies.java rename to test/jdk/java/net/ProxySelector/MultiThreadedSystemProxies.java diff --git a/jdk/test/java/net/ProxySelector/NullArguments.java b/test/jdk/java/net/ProxySelector/NullArguments.java similarity index 100% rename from jdk/test/java/net/ProxySelector/NullArguments.java rename to test/jdk/java/net/ProxySelector/NullArguments.java diff --git a/jdk/test/java/net/ProxySelector/NullSelector.java b/test/jdk/java/net/ProxySelector/NullSelector.java similarity index 100% rename from jdk/test/java/net/ProxySelector/NullSelector.java rename to test/jdk/java/net/ProxySelector/NullSelector.java diff --git a/jdk/test/java/net/ProxySelector/ProxyTest.java b/test/jdk/java/net/ProxySelector/ProxyTest.java similarity index 100% rename from jdk/test/java/net/ProxySelector/ProxyTest.java rename to test/jdk/java/net/ProxySelector/ProxyTest.java diff --git a/jdk/test/java/net/ProxySelector/SystemProxies.java b/test/jdk/java/net/ProxySelector/SystemProxies.java similarity index 100% rename from jdk/test/java/net/ProxySelector/SystemProxies.java rename to test/jdk/java/net/ProxySelector/SystemProxies.java diff --git a/jdk/test/java/net/ResponseCache/B6181108.java b/test/jdk/java/net/ResponseCache/B6181108.java similarity index 100% rename from jdk/test/java/net/ResponseCache/B6181108.java rename to test/jdk/java/net/ResponseCache/B6181108.java diff --git a/jdk/test/java/net/ResponseCache/ResponseCacheTest.java b/test/jdk/java/net/ResponseCache/ResponseCacheTest.java similarity index 100% rename from jdk/test/java/net/ResponseCache/ResponseCacheTest.java rename to test/jdk/java/net/ResponseCache/ResponseCacheTest.java diff --git a/jdk/test/java/net/ResponseCache/Test.java b/test/jdk/java/net/ResponseCache/Test.java similarity index 100% rename from jdk/test/java/net/ResponseCache/Test.java rename to test/jdk/java/net/ResponseCache/Test.java diff --git a/jdk/test/java/net/ResponseCache/Test2.java b/test/jdk/java/net/ResponseCache/Test2.java similarity index 100% rename from jdk/test/java/net/ResponseCache/Test2.java rename to test/jdk/java/net/ResponseCache/Test2.java diff --git a/jdk/test/java/net/ResponseCache/file1.cache b/test/jdk/java/net/ResponseCache/file1.cache similarity index 100% rename from jdk/test/java/net/ResponseCache/file1.cache rename to test/jdk/java/net/ResponseCache/file1.cache diff --git a/jdk/test/java/net/ResponseCache/file2.1 b/test/jdk/java/net/ResponseCache/file2.1 similarity index 100% rename from jdk/test/java/net/ResponseCache/file2.1 rename to test/jdk/java/net/ResponseCache/file2.1 diff --git a/jdk/test/java/net/ResponseCache/getResponseCode.java b/test/jdk/java/net/ResponseCache/getResponseCode.java similarity index 100% rename from jdk/test/java/net/ResponseCache/getResponseCode.java rename to test/jdk/java/net/ResponseCache/getResponseCode.java diff --git a/jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java b/test/jdk/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java similarity index 100% rename from jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java rename to test/jdk/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java diff --git a/jdk/test/java/net/ServerSocket/AcceptInheritHandle.java b/test/jdk/java/net/ServerSocket/AcceptInheritHandle.java similarity index 100% rename from jdk/test/java/net/ServerSocket/AcceptInheritHandle.java rename to test/jdk/java/net/ServerSocket/AcceptInheritHandle.java diff --git a/jdk/test/java/net/ServerSocket/AnotherSelectFdsLimit.java b/test/jdk/java/net/ServerSocket/AnotherSelectFdsLimit.java similarity index 100% rename from jdk/test/java/net/ServerSocket/AnotherSelectFdsLimit.java rename to test/jdk/java/net/ServerSocket/AnotherSelectFdsLimit.java diff --git a/jdk/test/java/net/ServerSocket/SelectFdsLimit.java b/test/jdk/java/net/ServerSocket/SelectFdsLimit.java similarity index 100% rename from jdk/test/java/net/ServerSocket/SelectFdsLimit.java rename to test/jdk/java/net/ServerSocket/SelectFdsLimit.java diff --git a/jdk/test/java/net/ServerSocket/TestAfterClose.java b/test/jdk/java/net/ServerSocket/TestAfterClose.java similarity index 100% rename from jdk/test/java/net/ServerSocket/TestAfterClose.java rename to test/jdk/java/net/ServerSocket/TestAfterClose.java diff --git a/jdk/test/java/net/ServerSocket/ThreadStop.java b/test/jdk/java/net/ServerSocket/ThreadStop.java similarity index 100% rename from jdk/test/java/net/ServerSocket/ThreadStop.java rename to test/jdk/java/net/ServerSocket/ThreadStop.java diff --git a/jdk/test/java/net/SetFactoryPermission/SetFactoryPermission.java b/test/jdk/java/net/SetFactoryPermission/SetFactoryPermission.java similarity index 100% rename from jdk/test/java/net/SetFactoryPermission/SetFactoryPermission.java rename to test/jdk/java/net/SetFactoryPermission/SetFactoryPermission.java diff --git a/jdk/test/java/net/SetFactoryPermission/policy.fail b/test/jdk/java/net/SetFactoryPermission/policy.fail similarity index 100% rename from jdk/test/java/net/SetFactoryPermission/policy.fail rename to test/jdk/java/net/SetFactoryPermission/policy.fail diff --git a/jdk/test/java/net/SetFactoryPermission/policy.success b/test/jdk/java/net/SetFactoryPermission/policy.success similarity index 100% rename from jdk/test/java/net/SetFactoryPermission/policy.success rename to test/jdk/java/net/SetFactoryPermission/policy.success diff --git a/jdk/test/java/net/Socket/AddressTest.java b/test/jdk/java/net/Socket/AddressTest.java similarity index 100% rename from jdk/test/java/net/Socket/AddressTest.java rename to test/jdk/java/net/Socket/AddressTest.java diff --git a/jdk/test/java/net/Socket/B6210227.java b/test/jdk/java/net/Socket/B6210227.java similarity index 100% rename from jdk/test/java/net/Socket/B6210227.java rename to test/jdk/java/net/Socket/B6210227.java diff --git a/jdk/test/java/net/Socket/CloseAvailable.java b/test/jdk/java/net/Socket/CloseAvailable.java similarity index 100% rename from jdk/test/java/net/Socket/CloseAvailable.java rename to test/jdk/java/net/Socket/CloseAvailable.java diff --git a/jdk/test/java/net/Socket/DeadlockTest.java b/test/jdk/java/net/Socket/DeadlockTest.java similarity index 100% rename from jdk/test/java/net/Socket/DeadlockTest.java rename to test/jdk/java/net/Socket/DeadlockTest.java diff --git a/jdk/test/java/net/Socket/GetLocalAddress.java b/test/jdk/java/net/Socket/GetLocalAddress.java similarity index 100% rename from jdk/test/java/net/Socket/GetLocalAddress.java rename to test/jdk/java/net/Socket/GetLocalAddress.java diff --git a/jdk/test/java/net/Socket/HttpProxy.java b/test/jdk/java/net/Socket/HttpProxy.java similarity index 100% rename from jdk/test/java/net/Socket/HttpProxy.java rename to test/jdk/java/net/Socket/HttpProxy.java diff --git a/jdk/test/java/net/Socket/IDNTest.java b/test/jdk/java/net/Socket/IDNTest.java similarity index 100% rename from jdk/test/java/net/Socket/IDNTest.java rename to test/jdk/java/net/Socket/IDNTest.java diff --git a/jdk/test/java/net/Socket/InheritHandle.java b/test/jdk/java/net/Socket/InheritHandle.java similarity index 100% rename from jdk/test/java/net/Socket/InheritHandle.java rename to test/jdk/java/net/Socket/InheritHandle.java diff --git a/jdk/test/java/net/Socket/InheritTimeout.java b/test/jdk/java/net/Socket/InheritTimeout.java similarity index 100% rename from jdk/test/java/net/Socket/InheritTimeout.java rename to test/jdk/java/net/Socket/InheritTimeout.java diff --git a/jdk/test/java/net/Socket/LingerTest.java b/test/jdk/java/net/Socket/LingerTest.java similarity index 100% rename from jdk/test/java/net/Socket/LingerTest.java rename to test/jdk/java/net/Socket/LingerTest.java diff --git a/jdk/test/java/net/Socket/LinkLocal.java b/test/jdk/java/net/Socket/LinkLocal.java similarity index 100% rename from jdk/test/java/net/Socket/LinkLocal.java rename to test/jdk/java/net/Socket/LinkLocal.java diff --git a/jdk/test/java/net/Socket/NullHost.java b/test/jdk/java/net/Socket/NullHost.java similarity index 100% rename from jdk/test/java/net/Socket/NullHost.java rename to test/jdk/java/net/Socket/NullHost.java diff --git a/jdk/test/java/net/Socket/OldImpl.java b/test/jdk/java/net/Socket/OldImpl.java similarity index 100% rename from jdk/test/java/net/Socket/OldImpl.java rename to test/jdk/java/net/Socket/OldImpl.java diff --git a/jdk/test/java/net/Socket/OldSocketImpl.jar b/test/jdk/java/net/Socket/OldSocketImpl.jar similarity index 100% rename from jdk/test/java/net/Socket/OldSocketImpl.jar rename to test/jdk/java/net/Socket/OldSocketImpl.jar diff --git a/jdk/test/java/net/Socket/OldSocketImpl.java b/test/jdk/java/net/Socket/OldSocketImpl.java similarity index 100% rename from jdk/test/java/net/Socket/OldSocketImpl.java rename to test/jdk/java/net/Socket/OldSocketImpl.java diff --git a/jdk/test/java/net/Socket/OldSocketImplTestDriver.java b/test/jdk/java/net/Socket/OldSocketImplTestDriver.java similarity index 100% rename from jdk/test/java/net/Socket/OldSocketImplTestDriver.java rename to test/jdk/java/net/Socket/OldSocketImplTestDriver.java diff --git a/jdk/test/java/net/Socket/ProxyCons.java b/test/jdk/java/net/Socket/ProxyCons.java similarity index 100% rename from jdk/test/java/net/Socket/ProxyCons.java rename to test/jdk/java/net/Socket/ProxyCons.java diff --git a/jdk/test/java/net/Socket/RST.java b/test/jdk/java/net/Socket/RST.java similarity index 100% rename from jdk/test/java/net/Socket/RST.java rename to test/jdk/java/net/Socket/RST.java diff --git a/jdk/test/java/net/Socket/ReadTimeout.java b/test/jdk/java/net/Socket/ReadTimeout.java similarity index 100% rename from jdk/test/java/net/Socket/ReadTimeout.java rename to test/jdk/java/net/Socket/ReadTimeout.java diff --git a/jdk/test/java/net/Socket/SetReceiveBufferSize.java b/test/jdk/java/net/Socket/SetReceiveBufferSize.java similarity index 100% rename from jdk/test/java/net/Socket/SetReceiveBufferSize.java rename to test/jdk/java/net/Socket/SetReceiveBufferSize.java diff --git a/jdk/test/java/net/Socket/SetSoLinger.java b/test/jdk/java/net/Socket/SetSoLinger.java similarity index 100% rename from jdk/test/java/net/Socket/SetSoLinger.java rename to test/jdk/java/net/Socket/SetSoLinger.java diff --git a/jdk/test/java/net/Socket/ShutdownBoth.java b/test/jdk/java/net/Socket/ShutdownBoth.java similarity index 100% rename from jdk/test/java/net/Socket/ShutdownBoth.java rename to test/jdk/java/net/Socket/ShutdownBoth.java diff --git a/jdk/test/java/net/Socket/ShutdownInput.java b/test/jdk/java/net/Socket/ShutdownInput.java similarity index 100% rename from jdk/test/java/net/Socket/ShutdownInput.java rename to test/jdk/java/net/Socket/ShutdownInput.java diff --git a/jdk/test/java/net/Socket/SoTimeout.java b/test/jdk/java/net/Socket/SoTimeout.java similarity index 100% rename from jdk/test/java/net/Socket/SoTimeout.java rename to test/jdk/java/net/Socket/SoTimeout.java diff --git a/jdk/test/java/net/Socket/SocketGrowth.java b/test/jdk/java/net/Socket/SocketGrowth.java similarity index 100% rename from jdk/test/java/net/Socket/SocketGrowth.java rename to test/jdk/java/net/Socket/SocketGrowth.java diff --git a/jdk/test/java/net/Socket/SocketImplTest.java b/test/jdk/java/net/Socket/SocketImplTest.java similarity index 100% rename from jdk/test/java/net/Socket/SocketImplTest.java rename to test/jdk/java/net/Socket/SocketImplTest.java diff --git a/jdk/test/java/net/Socket/SocksConnectTimeout.java b/test/jdk/java/net/Socket/SocksConnectTimeout.java similarity index 100% rename from jdk/test/java/net/Socket/SocksConnectTimeout.java rename to test/jdk/java/net/Socket/SocksConnectTimeout.java diff --git a/jdk/test/java/net/Socket/Streams.java b/test/jdk/java/net/Socket/Streams.java similarity index 100% rename from jdk/test/java/net/Socket/Streams.java rename to test/jdk/java/net/Socket/Streams.java diff --git a/jdk/test/java/net/Socket/TestAfterClose.java b/test/jdk/java/net/Socket/TestAfterClose.java similarity index 100% rename from jdk/test/java/net/Socket/TestAfterClose.java rename to test/jdk/java/net/Socket/TestAfterClose.java diff --git a/jdk/test/java/net/Socket/TestClose.java b/test/jdk/java/net/Socket/TestClose.java similarity index 100% rename from jdk/test/java/net/Socket/TestClose.java rename to test/jdk/java/net/Socket/TestClose.java diff --git a/jdk/test/java/net/Socket/TestTcpNoDelay.java b/test/jdk/java/net/Socket/TestTcpNoDelay.java similarity index 100% rename from jdk/test/java/net/Socket/TestTcpNoDelay.java rename to test/jdk/java/net/Socket/TestTcpNoDelay.java diff --git a/jdk/test/java/net/Socket/Timeout.java b/test/jdk/java/net/Socket/Timeout.java similarity index 100% rename from jdk/test/java/net/Socket/Timeout.java rename to test/jdk/java/net/Socket/Timeout.java diff --git a/jdk/test/java/net/Socket/TrafficClass.java b/test/jdk/java/net/Socket/TrafficClass.java similarity index 100% rename from jdk/test/java/net/Socket/TrafficClass.java rename to test/jdk/java/net/Socket/TrafficClass.java diff --git a/jdk/test/java/net/Socket/UrgentDataTest.java b/test/jdk/java/net/Socket/UrgentDataTest.java similarity index 100% rename from jdk/test/java/net/Socket/UrgentDataTest.java rename to test/jdk/java/net/Socket/UrgentDataTest.java diff --git a/jdk/test/java/net/Socket/asyncClose/AsyncClose.java b/test/jdk/java/net/Socket/asyncClose/AsyncClose.java similarity index 100% rename from jdk/test/java/net/Socket/asyncClose/AsyncClose.java rename to test/jdk/java/net/Socket/asyncClose/AsyncClose.java diff --git a/jdk/test/java/net/Socket/asyncClose/AsyncCloseTest.java b/test/jdk/java/net/Socket/asyncClose/AsyncCloseTest.java similarity index 100% rename from jdk/test/java/net/Socket/asyncClose/AsyncCloseTest.java rename to test/jdk/java/net/Socket/asyncClose/AsyncCloseTest.java diff --git a/jdk/test/java/net/Socket/asyncClose/BrokenPipe.java b/test/jdk/java/net/Socket/asyncClose/BrokenPipe.java similarity index 100% rename from jdk/test/java/net/Socket/asyncClose/BrokenPipe.java rename to test/jdk/java/net/Socket/asyncClose/BrokenPipe.java diff --git a/jdk/test/java/net/Socket/asyncClose/DatagramSocket_receive.java b/test/jdk/java/net/Socket/asyncClose/DatagramSocket_receive.java similarity index 100% rename from jdk/test/java/net/Socket/asyncClose/DatagramSocket_receive.java rename to test/jdk/java/net/Socket/asyncClose/DatagramSocket_receive.java diff --git a/jdk/test/java/net/Socket/asyncClose/Race.java b/test/jdk/java/net/Socket/asyncClose/Race.java similarity index 100% rename from jdk/test/java/net/Socket/asyncClose/Race.java rename to test/jdk/java/net/Socket/asyncClose/Race.java diff --git a/jdk/test/java/net/Socket/asyncClose/ServerSocket_accept.java b/test/jdk/java/net/Socket/asyncClose/ServerSocket_accept.java similarity index 100% rename from jdk/test/java/net/Socket/asyncClose/ServerSocket_accept.java rename to test/jdk/java/net/Socket/asyncClose/ServerSocket_accept.java diff --git a/jdk/test/java/net/Socket/asyncClose/Socket_getInputStream_read.java b/test/jdk/java/net/Socket/asyncClose/Socket_getInputStream_read.java similarity index 100% rename from jdk/test/java/net/Socket/asyncClose/Socket_getInputStream_read.java rename to test/jdk/java/net/Socket/asyncClose/Socket_getInputStream_read.java diff --git a/jdk/test/java/net/Socket/asyncClose/Socket_getOutputStream_write.java b/test/jdk/java/net/Socket/asyncClose/Socket_getOutputStream_write.java similarity index 100% rename from jdk/test/java/net/Socket/asyncClose/Socket_getOutputStream_write.java rename to test/jdk/java/net/Socket/asyncClose/Socket_getOutputStream_write.java diff --git a/jdk/test/java/net/Socket/reset/Test.java b/test/jdk/java/net/Socket/reset/Test.java similarity index 100% rename from jdk/test/java/net/Socket/reset/Test.java rename to test/jdk/java/net/Socket/reset/Test.java diff --git a/jdk/test/java/net/Socket/setReuseAddress/Basic.java b/test/jdk/java/net/Socket/setReuseAddress/Basic.java similarity index 100% rename from jdk/test/java/net/Socket/setReuseAddress/Basic.java rename to test/jdk/java/net/Socket/setReuseAddress/Basic.java diff --git a/jdk/test/java/net/Socket/setReuseAddress/Restart.java b/test/jdk/java/net/Socket/setReuseAddress/Restart.java similarity index 100% rename from jdk/test/java/net/Socket/setReuseAddress/Restart.java rename to test/jdk/java/net/Socket/setReuseAddress/Restart.java diff --git a/jdk/test/java/net/SocketInputStream/SocketClosedException.java b/test/jdk/java/net/SocketInputStream/SocketClosedException.java similarity index 100% rename from jdk/test/java/net/SocketInputStream/SocketClosedException.java rename to test/jdk/java/net/SocketInputStream/SocketClosedException.java diff --git a/jdk/test/java/net/SocketInputStream/SocketTimeout.java b/test/jdk/java/net/SocketInputStream/SocketTimeout.java similarity index 100% rename from jdk/test/java/net/SocketInputStream/SocketTimeout.java rename to test/jdk/java/net/SocketInputStream/SocketTimeout.java diff --git a/jdk/test/java/net/SocketOption/ImmutableOptions.java b/test/jdk/java/net/SocketOption/ImmutableOptions.java similarity index 100% rename from jdk/test/java/net/SocketOption/ImmutableOptions.java rename to test/jdk/java/net/SocketOption/ImmutableOptions.java diff --git a/jdk/test/java/net/SocketOption/MinimumRcvBufferSize.java b/test/jdk/java/net/SocketOption/MinimumRcvBufferSize.java similarity index 100% rename from jdk/test/java/net/SocketOption/MinimumRcvBufferSize.java rename to test/jdk/java/net/SocketOption/MinimumRcvBufferSize.java diff --git a/jdk/test/java/net/SocketOption/OptionsTest.java b/test/jdk/java/net/SocketOption/OptionsTest.java similarity index 100% rename from jdk/test/java/net/SocketOption/OptionsTest.java rename to test/jdk/java/net/SocketOption/OptionsTest.java diff --git a/jdk/test/java/net/SocketOption/SupportedOptionsSet.java b/test/jdk/java/net/SocketOption/SupportedOptionsSet.java similarity index 100% rename from jdk/test/java/net/SocketOption/SupportedOptionsSet.java rename to test/jdk/java/net/SocketOption/SupportedOptionsSet.java diff --git a/jdk/test/java/net/SocketOption/UnsupportedOptionsTest.java b/test/jdk/java/net/SocketOption/UnsupportedOptionsTest.java similarity index 100% rename from jdk/test/java/net/SocketOption/UnsupportedOptionsTest.java rename to test/jdk/java/net/SocketOption/UnsupportedOptionsTest.java diff --git a/jdk/test/java/net/SocketPermission/ActionSpace.java b/test/jdk/java/net/SocketPermission/ActionSpace.java similarity index 100% rename from jdk/test/java/net/SocketPermission/ActionSpace.java rename to test/jdk/java/net/SocketPermission/ActionSpace.java diff --git a/jdk/test/java/net/SocketPermission/B4414825.java b/test/jdk/java/net/SocketPermission/B4414825.java similarity index 100% rename from jdk/test/java/net/SocketPermission/B4414825.java rename to test/jdk/java/net/SocketPermission/B4414825.java diff --git a/jdk/test/java/net/SocketPermission/Ctor.java b/test/jdk/java/net/SocketPermission/Ctor.java similarity index 100% rename from jdk/test/java/net/SocketPermission/Ctor.java rename to test/jdk/java/net/SocketPermission/Ctor.java diff --git a/jdk/test/java/net/SocketPermission/Equals.java b/test/jdk/java/net/SocketPermission/Equals.java similarity index 100% rename from jdk/test/java/net/SocketPermission/Equals.java rename to test/jdk/java/net/SocketPermission/Equals.java diff --git a/jdk/test/java/net/SocketPermission/NoAction.java b/test/jdk/java/net/SocketPermission/NoAction.java similarity index 100% rename from jdk/test/java/net/SocketPermission/NoAction.java rename to test/jdk/java/net/SocketPermission/NoAction.java diff --git a/jdk/test/java/net/SocketPermission/SocketPermissionCollection.java b/test/jdk/java/net/SocketPermission/SocketPermissionCollection.java similarity index 100% rename from jdk/test/java/net/SocketPermission/SocketPermissionCollection.java rename to test/jdk/java/net/SocketPermission/SocketPermissionCollection.java diff --git a/jdk/test/java/net/SocketPermission/SocketPermissionTest.java b/test/jdk/java/net/SocketPermission/SocketPermissionTest.java similarity index 100% rename from jdk/test/java/net/SocketPermission/SocketPermissionTest.java rename to test/jdk/java/net/SocketPermission/SocketPermissionTest.java diff --git a/jdk/test/java/net/SocketPermission/Wildcard.java b/test/jdk/java/net/SocketPermission/Wildcard.java similarity index 100% rename from jdk/test/java/net/SocketPermission/Wildcard.java rename to test/jdk/java/net/SocketPermission/Wildcard.java diff --git a/jdk/test/java/net/Socks/BadProxySelector.java b/test/jdk/java/net/Socks/BadProxySelector.java similarity index 100% rename from jdk/test/java/net/Socks/BadProxySelector.java rename to test/jdk/java/net/Socks/BadProxySelector.java diff --git a/jdk/test/java/net/Socks/SocksIPv6Test.java b/test/jdk/java/net/Socks/SocksIPv6Test.java similarity index 100% rename from jdk/test/java/net/Socks/SocksIPv6Test.java rename to test/jdk/java/net/Socks/SocksIPv6Test.java diff --git a/jdk/test/java/net/Socks/SocksProxyVersion.java b/test/jdk/java/net/Socks/SocksProxyVersion.java similarity index 100% rename from jdk/test/java/net/Socks/SocksProxyVersion.java rename to test/jdk/java/net/Socks/SocksProxyVersion.java diff --git a/jdk/test/java/net/Socks/SocksServer.java b/test/jdk/java/net/Socks/SocksServer.java similarity index 100% rename from jdk/test/java/net/Socks/SocksServer.java rename to test/jdk/java/net/Socks/SocksServer.java diff --git a/jdk/test/java/net/Socks/SocksV4Test.java b/test/jdk/java/net/Socks/SocksV4Test.java similarity index 100% rename from jdk/test/java/net/Socks/SocksV4Test.java rename to test/jdk/java/net/Socks/SocksV4Test.java diff --git a/jdk/test/java/net/URI/RelativeEncoding.java b/test/jdk/java/net/URI/RelativeEncoding.java similarity index 100% rename from jdk/test/java/net/URI/RelativeEncoding.java rename to test/jdk/java/net/URI/RelativeEncoding.java diff --git a/jdk/test/java/net/URI/Test.java b/test/jdk/java/net/URI/Test.java similarity index 100% rename from jdk/test/java/net/URI/Test.java rename to test/jdk/java/net/URI/Test.java diff --git a/jdk/test/java/net/URI/URItoURLTest.java b/test/jdk/java/net/URI/URItoURLTest.java similarity index 100% rename from jdk/test/java/net/URI/URItoURLTest.java rename to test/jdk/java/net/URI/URItoURLTest.java diff --git a/jdk/test/java/net/URL/B4148751.java b/test/jdk/java/net/URL/B4148751.java similarity index 100% rename from jdk/test/java/net/URL/B4148751.java rename to test/jdk/java/net/URL/B4148751.java diff --git a/jdk/test/java/net/URL/B5086147.java b/test/jdk/java/net/URL/B5086147.java similarity index 100% rename from jdk/test/java/net/URL/B5086147.java rename to test/jdk/java/net/URL/B5086147.java diff --git a/jdk/test/java/net/URL/B6529759.java b/test/jdk/java/net/URL/B6529759.java similarity index 100% rename from jdk/test/java/net/URL/B6529759.java rename to test/jdk/java/net/URL/B6529759.java diff --git a/jdk/test/java/net/URL/Constructor.java b/test/jdk/java/net/URL/Constructor.java similarity index 100% rename from jdk/test/java/net/URL/Constructor.java rename to test/jdk/java/net/URL/Constructor.java diff --git a/jdk/test/java/net/URL/Equals.java b/test/jdk/java/net/URL/Equals.java similarity index 100% rename from jdk/test/java/net/URL/Equals.java rename to test/jdk/java/net/URL/Equals.java diff --git a/jdk/test/java/net/URL/GetContent.java b/test/jdk/java/net/URL/GetContent.java similarity index 100% rename from jdk/test/java/net/URL/GetContent.java rename to test/jdk/java/net/URL/GetContent.java diff --git a/jdk/test/java/net/URL/GetDefaultPort.java b/test/jdk/java/net/URL/GetDefaultPort.java similarity index 100% rename from jdk/test/java/net/URL/GetDefaultPort.java rename to test/jdk/java/net/URL/GetDefaultPort.java diff --git a/jdk/test/java/net/URL/HandlerLoop.java b/test/jdk/java/net/URL/HandlerLoop.java similarity index 100% rename from jdk/test/java/net/URL/HandlerLoop.java rename to test/jdk/java/net/URL/HandlerLoop.java diff --git a/jdk/test/java/net/URL/HandlersPkgPrefix/HandlersPkgPrefix.java b/test/jdk/java/net/URL/HandlersPkgPrefix/HandlersPkgPrefix.java similarity index 100% rename from jdk/test/java/net/URL/HandlersPkgPrefix/HandlersPkgPrefix.java rename to test/jdk/java/net/URL/HandlersPkgPrefix/HandlersPkgPrefix.java diff --git a/jdk/test/java/net/URL/HandlersPkgPrefix/handlers/bar/Handler.java b/test/jdk/java/net/URL/HandlersPkgPrefix/handlers/bar/Handler.java similarity index 100% rename from jdk/test/java/net/URL/HandlersPkgPrefix/handlers/bar/Handler.java rename to test/jdk/java/net/URL/HandlersPkgPrefix/handlers/bar/Handler.java diff --git a/jdk/test/java/net/URL/HandlersPkgPrefix/handlers/foo/Handler.java b/test/jdk/java/net/URL/HandlersPkgPrefix/handlers/foo/Handler.java similarity index 100% rename from jdk/test/java/net/URL/HandlersPkgPrefix/handlers/foo/Handler.java rename to test/jdk/java/net/URL/HandlersPkgPrefix/handlers/foo/Handler.java diff --git a/jdk/test/java/net/URL/HashCode.java b/test/jdk/java/net/URL/HashCode.java similarity index 100% rename from jdk/test/java/net/URL/HashCode.java rename to test/jdk/java/net/URL/HashCode.java diff --git a/jdk/test/java/net/URL/JarHandlerPkgPrefix/JarHandlerPkgPrefix.java b/test/jdk/java/net/URL/JarHandlerPkgPrefix/JarHandlerPkgPrefix.java similarity index 100% rename from jdk/test/java/net/URL/JarHandlerPkgPrefix/JarHandlerPkgPrefix.java rename to test/jdk/java/net/URL/JarHandlerPkgPrefix/JarHandlerPkgPrefix.java diff --git a/jdk/test/java/net/URL/JarHandlerPkgPrefix/handlers/jar/Handler.java b/test/jdk/java/net/URL/JarHandlerPkgPrefix/handlers/jar/Handler.java similarity index 100% rename from jdk/test/java/net/URL/JarHandlerPkgPrefix/handlers/jar/Handler.java rename to test/jdk/java/net/URL/JarHandlerPkgPrefix/handlers/jar/Handler.java diff --git a/jdk/test/java/net/URL/LocaleDependentURLTest.java b/test/jdk/java/net/URL/LocaleDependentURLTest.java similarity index 100% rename from jdk/test/java/net/URL/LocaleDependentURLTest.java rename to test/jdk/java/net/URL/LocaleDependentURLTest.java diff --git a/jdk/test/java/net/URL/OpenConnection.java b/test/jdk/java/net/URL/OpenConnection.java similarity index 100% rename from jdk/test/java/net/URL/OpenConnection.java rename to test/jdk/java/net/URL/OpenConnection.java diff --git a/jdk/test/java/net/URL/OpenStream.java b/test/jdk/java/net/URL/OpenStream.java similarity index 100% rename from jdk/test/java/net/URL/OpenStream.java rename to test/jdk/java/net/URL/OpenStream.java diff --git a/jdk/test/java/net/URL/ParseAuthority.java b/test/jdk/java/net/URL/ParseAuthority.java similarity index 100% rename from jdk/test/java/net/URL/ParseAuthority.java rename to test/jdk/java/net/URL/ParseAuthority.java diff --git a/jdk/test/java/net/URL/ParseURL.java b/test/jdk/java/net/URL/ParseURL.java similarity index 100% rename from jdk/test/java/net/URL/ParseURL.java rename to test/jdk/java/net/URL/ParseURL.java diff --git a/jdk/test/java/net/URL/PerConnectionProxy.java b/test/jdk/java/net/URL/PerConnectionProxy.java similarity index 100% rename from jdk/test/java/net/URL/PerConnectionProxy.java rename to test/jdk/java/net/URL/PerConnectionProxy.java diff --git a/jdk/test/java/net/URL/Protocol.java b/test/jdk/java/net/URL/Protocol.java similarity index 100% rename from jdk/test/java/net/URL/Protocol.java rename to test/jdk/java/net/URL/Protocol.java diff --git a/jdk/test/java/net/URL/RelativePath.java b/test/jdk/java/net/URL/RelativePath.java similarity index 100% rename from jdk/test/java/net/URL/RelativePath.java rename to test/jdk/java/net/URL/RelativePath.java diff --git a/jdk/test/java/net/URL/RelativeURL.java b/test/jdk/java/net/URL/RelativeURL.java similarity index 100% rename from jdk/test/java/net/URL/RelativeURL.java rename to test/jdk/java/net/URL/RelativeURL.java diff --git a/jdk/test/java/net/URL/RelativeURLTest.java b/test/jdk/java/net/URL/RelativeURLTest.java similarity index 100% rename from jdk/test/java/net/URL/RelativeURLTest.java rename to test/jdk/java/net/URL/RelativeURLTest.java diff --git a/jdk/test/java/net/URL/RestoreURL.java b/test/jdk/java/net/URL/RestoreURL.java similarity index 100% rename from jdk/test/java/net/URL/RestoreURL.java rename to test/jdk/java/net/URL/RestoreURL.java diff --git a/jdk/test/java/net/URL/SpecifyHandler.java b/test/jdk/java/net/URL/SpecifyHandler.java similarity index 100% rename from jdk/test/java/net/URL/SpecifyHandler.java rename to test/jdk/java/net/URL/SpecifyHandler.java diff --git a/jdk/test/java/net/URL/Test.java b/test/jdk/java/net/URL/Test.java similarity index 100% rename from jdk/test/java/net/URL/Test.java rename to test/jdk/java/net/URL/Test.java diff --git a/jdk/test/java/net/URL/TestIPv6Addresses.java b/test/jdk/java/net/URL/TestIPv6Addresses.java similarity index 100% rename from jdk/test/java/net/URL/TestIPv6Addresses.java rename to test/jdk/java/net/URL/TestIPv6Addresses.java diff --git a/jdk/test/java/net/URL/TestPort.java b/test/jdk/java/net/URL/TestPort.java similarity index 100% rename from jdk/test/java/net/URL/TestPort.java rename to test/jdk/java/net/URL/TestPort.java diff --git a/jdk/test/java/net/URL/TestRFC2732.java b/test/jdk/java/net/URL/TestRFC2732.java similarity index 100% rename from jdk/test/java/net/URL/TestRFC2732.java rename to test/jdk/java/net/URL/TestRFC2732.java diff --git a/jdk/test/java/net/URL/URIToURLTest.java b/test/jdk/java/net/URL/URIToURLTest.java similarity index 100% rename from jdk/test/java/net/URL/URIToURLTest.java rename to test/jdk/java/net/URL/URIToURLTest.java diff --git a/jdk/test/java/net/URL/UppercaseScheme.java b/test/jdk/java/net/URL/UppercaseScheme.java similarity index 100% rename from jdk/test/java/net/URL/UppercaseScheme.java rename to test/jdk/java/net/URL/UppercaseScheme.java diff --git a/jdk/test/java/net/URLClassLoader/AddURLTest.java b/test/jdk/java/net/URLClassLoader/AddURLTest.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/AddURLTest.java rename to test/jdk/java/net/URLClassLoader/AddURLTest.java diff --git a/jdk/test/java/net/URLClassLoader/B6827999.java b/test/jdk/java/net/URLClassLoader/B6827999.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/B6827999.java rename to test/jdk/java/net/URLClassLoader/B6827999.java diff --git a/jdk/test/java/net/URLClassLoader/B6896088.java b/test/jdk/java/net/URLClassLoader/B6896088.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/B6896088.java rename to test/jdk/java/net/URLClassLoader/B6896088.java diff --git a/jdk/test/java/net/URLClassLoader/B7050028.java b/test/jdk/java/net/URLClassLoader/B7050028.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/B7050028.java rename to test/jdk/java/net/URLClassLoader/B7050028.java diff --git a/jdk/test/java/net/URLClassLoader/ClassLoad.java b/test/jdk/java/net/URLClassLoader/ClassLoad.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/ClassLoad.java rename to test/jdk/java/net/URLClassLoader/ClassLoad.java diff --git a/jdk/test/java/net/URLClassLoader/ClassPathTest.java b/test/jdk/java/net/URLClassLoader/ClassPathTest.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/ClassPathTest.java rename to test/jdk/java/net/URLClassLoader/ClassPathTest.java diff --git a/jdk/test/java/net/URLClassLoader/GetURLsTest.java b/test/jdk/java/net/URLClassLoader/GetURLsTest.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/GetURLsTest.java rename to test/jdk/java/net/URLClassLoader/GetURLsTest.java diff --git a/jdk/test/java/net/URLClassLoader/HttpTest.java b/test/jdk/java/net/URLClassLoader/HttpTest.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/HttpTest.java rename to test/jdk/java/net/URLClassLoader/HttpTest.java diff --git a/jdk/test/java/net/URLClassLoader/NullURLTest.java b/test/jdk/java/net/URLClassLoader/NullURLTest.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/NullURLTest.java rename to test/jdk/java/net/URLClassLoader/NullURLTest.java diff --git a/jdk/test/java/net/URLClassLoader/URLParsing.java b/test/jdk/java/net/URLClassLoader/URLParsing.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/URLParsing.java rename to test/jdk/java/net/URLClassLoader/URLParsing.java diff --git a/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java b/test/jdk/java/net/URLClassLoader/closetest/CloseTest.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/CloseTest.java rename to test/jdk/java/net/URLClassLoader/closetest/CloseTest.java diff --git a/jdk/test/java/net/URLClassLoader/closetest/Common.java b/test/jdk/java/net/URLClassLoader/closetest/Common.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/Common.java rename to test/jdk/java/net/URLClassLoader/closetest/Common.java diff --git a/jdk/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java b/test/jdk/java/net/URLClassLoader/closetest/GetResourceAsStream.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java rename to test/jdk/java/net/URLClassLoader/closetest/GetResourceAsStream.java diff --git a/jdk/test/java/net/URLClassLoader/closetest/README b/test/jdk/java/net/URLClassLoader/closetest/README similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/README rename to test/jdk/java/net/URLClassLoader/closetest/README diff --git a/jdk/test/java/net/URLClassLoader/closetest/serverRoot/Test.java b/test/jdk/java/net/URLClassLoader/closetest/serverRoot/Test.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/serverRoot/Test.java rename to test/jdk/java/net/URLClassLoader/closetest/serverRoot/Test.java diff --git a/jdk/test/java/net/URLClassLoader/closetest/test1/com/foo/Resource1 b/test/jdk/java/net/URLClassLoader/closetest/test1/com/foo/Resource1 similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/test1/com/foo/Resource1 rename to test/jdk/java/net/URLClassLoader/closetest/test1/com/foo/Resource1 diff --git a/jdk/test/java/net/URLClassLoader/closetest/test1/com/foo/Resource2 b/test/jdk/java/net/URLClassLoader/closetest/test1/com/foo/Resource2 similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/test1/com/foo/Resource2 rename to test/jdk/java/net/URLClassLoader/closetest/test1/com/foo/Resource2 diff --git a/jdk/test/java/net/URLClassLoader/closetest/test1/com/foo/TestClass.java b/test/jdk/java/net/URLClassLoader/closetest/test1/com/foo/TestClass.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/test1/com/foo/TestClass.java rename to test/jdk/java/net/URLClassLoader/closetest/test1/com/foo/TestClass.java diff --git a/jdk/test/java/net/URLClassLoader/closetest/test1/com/foo/TestClass1.java b/test/jdk/java/net/URLClassLoader/closetest/test1/com/foo/TestClass1.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/test1/com/foo/TestClass1.java rename to test/jdk/java/net/URLClassLoader/closetest/test1/com/foo/TestClass1.java diff --git a/jdk/test/java/net/URLClassLoader/closetest/test2/com/foo/Resource1 b/test/jdk/java/net/URLClassLoader/closetest/test2/com/foo/Resource1 similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/test2/com/foo/Resource1 rename to test/jdk/java/net/URLClassLoader/closetest/test2/com/foo/Resource1 diff --git a/jdk/test/java/net/URLClassLoader/closetest/test2/com/foo/Resource2 b/test/jdk/java/net/URLClassLoader/closetest/test2/com/foo/Resource2 similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/test2/com/foo/Resource2 rename to test/jdk/java/net/URLClassLoader/closetest/test2/com/foo/Resource2 diff --git a/jdk/test/java/net/URLClassLoader/closetest/test2/com/foo/TestClass.java b/test/jdk/java/net/URLClassLoader/closetest/test2/com/foo/TestClass.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/test2/com/foo/TestClass.java rename to test/jdk/java/net/URLClassLoader/closetest/test2/com/foo/TestClass.java diff --git a/jdk/test/java/net/URLClassLoader/closetest/test2/com/foo/TestClass1.java b/test/jdk/java/net/URLClassLoader/closetest/test2/com/foo/TestClass1.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/closetest/test2/com/foo/TestClass1.java rename to test/jdk/java/net/URLClassLoader/closetest/test2/com/foo/TestClass1.java diff --git a/jdk/test/java/net/URLClassLoader/definePackage/SplitPackage.java b/test/jdk/java/net/URLClassLoader/definePackage/SplitPackage.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/definePackage/SplitPackage.java rename to test/jdk/java/net/URLClassLoader/definePackage/SplitPackage.java diff --git a/jdk/test/java/net/URLClassLoader/definePackage/p/Bar.java b/test/jdk/java/net/URLClassLoader/definePackage/p/Bar.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/definePackage/p/Bar.java rename to test/jdk/java/net/URLClassLoader/definePackage/p/Bar.java diff --git a/jdk/test/java/net/URLClassLoader/definePackage/p/Baz.java b/test/jdk/java/net/URLClassLoader/definePackage/p/Baz.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/definePackage/p/Baz.java rename to test/jdk/java/net/URLClassLoader/definePackage/p/Baz.java diff --git a/jdk/test/java/net/URLClassLoader/definePackage/p/Foo.java b/test/jdk/java/net/URLClassLoader/definePackage/p/Foo.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/definePackage/p/Foo.java rename to test/jdk/java/net/URLClassLoader/definePackage/p/Foo.java diff --git a/jdk/test/java/net/URLClassLoader/extdir/extention.jar b/test/jdk/java/net/URLClassLoader/extdir/extention.jar similarity index 100% rename from jdk/test/java/net/URLClassLoader/extdir/extention.jar rename to test/jdk/java/net/URLClassLoader/extdir/extention.jar diff --git a/jdk/test/java/net/URLClassLoader/getresourceasstream/Test.java b/test/jdk/java/net/URLClassLoader/getresourceasstream/Test.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/getresourceasstream/Test.java rename to test/jdk/java/net/URLClassLoader/getresourceasstream/Test.java diff --git a/jdk/test/java/net/URLClassLoader/getresourceasstream/TestDriver.java b/test/jdk/java/net/URLClassLoader/getresourceasstream/TestDriver.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/getresourceasstream/TestDriver.java rename to test/jdk/java/net/URLClassLoader/getresourceasstream/TestDriver.java diff --git a/jdk/test/java/net/URLClassLoader/getresourceasstream/policy b/test/jdk/java/net/URLClassLoader/getresourceasstream/policy similarity index 100% rename from jdk/test/java/net/URLClassLoader/getresourceasstream/policy rename to test/jdk/java/net/URLClassLoader/getresourceasstream/policy diff --git a/jdk/test/java/net/URLClassLoader/getresourceasstream/test.jar b/test/jdk/java/net/URLClassLoader/getresourceasstream/test.jar similarity index 100% rename from jdk/test/java/net/URLClassLoader/getresourceasstream/test.jar rename to test/jdk/java/net/URLClassLoader/getresourceasstream/test.jar diff --git a/jdk/test/java/net/URLClassLoader/jars/class_path_test.jar b/test/jdk/java/net/URLClassLoader/jars/class_path_test.jar similarity index 100% rename from jdk/test/java/net/URLClassLoader/jars/class_path_test.jar rename to test/jdk/java/net/URLClassLoader/jars/class_path_test.jar diff --git a/jdk/test/java/net/URLClassLoader/jars/class_path_test_classpath.jar b/test/jdk/java/net/URLClassLoader/jars/class_path_test_classpath.jar similarity index 100% rename from jdk/test/java/net/URLClassLoader/jars/class_path_test_classpath.jar rename to test/jdk/java/net/URLClassLoader/jars/class_path_test_classpath.jar diff --git a/jdk/test/java/net/URLClassLoader/sealing/CheckSealed.java b/test/jdk/java/net/URLClassLoader/sealing/CheckSealed.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/sealing/CheckSealed.java rename to test/jdk/java/net/URLClassLoader/sealing/CheckSealed.java diff --git a/jdk/test/java/net/URLClassLoader/sealing/CheckSealedTest.java b/test/jdk/java/net/URLClassLoader/sealing/CheckSealedTest.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/sealing/CheckSealedTest.java rename to test/jdk/java/net/URLClassLoader/sealing/CheckSealedTest.java diff --git a/jdk/test/java/net/URLClassLoader/sealing/Makefile b/test/jdk/java/net/URLClassLoader/sealing/Makefile similarity index 100% rename from jdk/test/java/net/URLClassLoader/sealing/Makefile rename to test/jdk/java/net/URLClassLoader/sealing/Makefile diff --git a/jdk/test/java/net/URLClassLoader/sealing/a/p/A.java b/test/jdk/java/net/URLClassLoader/sealing/a/p/A.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/sealing/a/p/A.java rename to test/jdk/java/net/URLClassLoader/sealing/a/p/A.java diff --git a/jdk/test/java/net/URLClassLoader/sealing/b.jar b/test/jdk/java/net/URLClassLoader/sealing/b.jar similarity index 100% rename from jdk/test/java/net/URLClassLoader/sealing/b.jar rename to test/jdk/java/net/URLClassLoader/sealing/b.jar diff --git a/jdk/test/java/net/URLClassLoader/sealing/b/p/B.java b/test/jdk/java/net/URLClassLoader/sealing/b/p/B.java similarity index 100% rename from jdk/test/java/net/URLClassLoader/sealing/b/p/B.java rename to test/jdk/java/net/URLClassLoader/sealing/b/p/B.java diff --git a/jdk/test/java/net/URLClassLoader/sealing/manifest b/test/jdk/java/net/URLClassLoader/sealing/manifest similarity index 100% rename from jdk/test/java/net/URLClassLoader/sealing/manifest rename to test/jdk/java/net/URLClassLoader/sealing/manifest diff --git a/jdk/test/java/net/URLConnection/6212146/Test.java b/test/jdk/java/net/URLConnection/6212146/Test.java similarity index 100% rename from jdk/test/java/net/URLConnection/6212146/Test.java rename to test/jdk/java/net/URLConnection/6212146/Test.java diff --git a/jdk/test/java/net/URLConnection/6212146/TestDriver.java b/test/jdk/java/net/URLConnection/6212146/TestDriver.java similarity index 100% rename from jdk/test/java/net/URLConnection/6212146/TestDriver.java rename to test/jdk/java/net/URLConnection/6212146/TestDriver.java diff --git a/jdk/test/java/net/URLConnection/6212146/test.jar b/test/jdk/java/net/URLConnection/6212146/test.jar similarity index 100% rename from jdk/test/java/net/URLConnection/6212146/test.jar rename to test/jdk/java/net/URLConnection/6212146/test.jar diff --git a/jdk/test/java/net/URLConnection/B5052093.java b/test/jdk/java/net/URLConnection/B5052093.java similarity index 100% rename from jdk/test/java/net/URLConnection/B5052093.java rename to test/jdk/java/net/URLConnection/B5052093.java diff --git a/jdk/test/java/net/URLConnection/ChunkedEncoding.java b/test/jdk/java/net/URLConnection/ChunkedEncoding.java similarity index 100% rename from jdk/test/java/net/URLConnection/ChunkedEncoding.java rename to test/jdk/java/net/URLConnection/ChunkedEncoding.java diff --git a/jdk/test/java/net/URLConnection/Connect.java b/test/jdk/java/net/URLConnection/Connect.java similarity index 100% rename from jdk/test/java/net/URLConnection/Connect.java rename to test/jdk/java/net/URLConnection/Connect.java diff --git a/jdk/test/java/net/URLConnection/ContentHandlers/ContentHandlersTest.java b/test/jdk/java/net/URLConnection/ContentHandlers/ContentHandlersTest.java similarity index 100% rename from jdk/test/java/net/URLConnection/ContentHandlers/ContentHandlersTest.java rename to test/jdk/java/net/URLConnection/ContentHandlers/ContentHandlersTest.java diff --git a/jdk/test/java/net/URLConnection/ContentHandlers/broken_constructor_factory.template b/test/jdk/java/net/URLConnection/ContentHandlers/broken_constructor_factory.template similarity index 100% rename from jdk/test/java/net/URLConnection/ContentHandlers/broken_constructor_factory.template rename to test/jdk/java/net/URLConnection/ContentHandlers/broken_constructor_factory.template diff --git a/jdk/test/java/net/URLConnection/ContentHandlers/broken_factory.template b/test/jdk/java/net/URLConnection/ContentHandlers/broken_factory.template similarity index 100% rename from jdk/test/java/net/URLConnection/ContentHandlers/broken_factory.template rename to test/jdk/java/net/URLConnection/ContentHandlers/broken_factory.template diff --git a/jdk/test/java/net/URLConnection/ContentHandlers/plain.template b/test/jdk/java/net/URLConnection/ContentHandlers/plain.template similarity index 100% rename from jdk/test/java/net/URLConnection/ContentHandlers/plain.template rename to test/jdk/java/net/URLConnection/ContentHandlers/plain.template diff --git a/jdk/test/java/net/URLConnection/ContentHandlers/test.template b/test/jdk/java/net/URLConnection/ContentHandlers/test.template similarity index 100% rename from jdk/test/java/net/URLConnection/ContentHandlers/test.template rename to test/jdk/java/net/URLConnection/ContentHandlers/test.template diff --git a/jdk/test/java/net/URLConnection/DisconnectAfterEOF.java b/test/jdk/java/net/URLConnection/DisconnectAfterEOF.java similarity index 100% rename from jdk/test/java/net/URLConnection/DisconnectAfterEOF.java rename to test/jdk/java/net/URLConnection/DisconnectAfterEOF.java diff --git a/jdk/test/java/net/URLConnection/ExifContentGuesser.java b/test/jdk/java/net/URLConnection/ExifContentGuesser.java similarity index 100% rename from jdk/test/java/net/URLConnection/ExifContentGuesser.java rename to test/jdk/java/net/URLConnection/ExifContentGuesser.java diff --git a/jdk/test/java/net/URLConnection/GetContentType.java b/test/jdk/java/net/URLConnection/GetContentType.java similarity index 100% rename from jdk/test/java/net/URLConnection/GetContentType.java rename to test/jdk/java/net/URLConnection/GetContentType.java diff --git a/jdk/test/java/net/URLConnection/GetFileNameMap.java b/test/jdk/java/net/URLConnection/GetFileNameMap.java similarity index 100% rename from jdk/test/java/net/URLConnection/GetFileNameMap.java rename to test/jdk/java/net/URLConnection/GetFileNameMap.java diff --git a/jdk/test/java/net/URLConnection/GetLastModified.java b/test/jdk/java/net/URLConnection/GetLastModified.java similarity index 100% rename from jdk/test/java/net/URLConnection/GetLastModified.java rename to test/jdk/java/net/URLConnection/GetLastModified.java diff --git a/jdk/test/java/net/URLConnection/GetResponseCode.java b/test/jdk/java/net/URLConnection/GetResponseCode.java similarity index 100% rename from jdk/test/java/net/URLConnection/GetResponseCode.java rename to test/jdk/java/net/URLConnection/GetResponseCode.java diff --git a/jdk/test/java/net/URLConnection/GetXmlContentType.java b/test/jdk/java/net/URLConnection/GetXmlContentType.java similarity index 100% rename from jdk/test/java/net/URLConnection/GetXmlContentType.java rename to test/jdk/java/net/URLConnection/GetXmlContentType.java diff --git a/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java b/test/jdk/java/net/URLConnection/HandleContentTypeWithAttrs.java similarity index 100% rename from jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java rename to test/jdk/java/net/URLConnection/HandleContentTypeWithAttrs.java diff --git a/jdk/test/java/net/URLConnection/HttpContinueStackOverflow.java b/test/jdk/java/net/URLConnection/HttpContinueStackOverflow.java similarity index 100% rename from jdk/test/java/net/URLConnection/HttpContinueStackOverflow.java rename to test/jdk/java/net/URLConnection/HttpContinueStackOverflow.java diff --git a/jdk/test/java/net/URLConnection/Redirect307Test.java b/test/jdk/java/net/URLConnection/Redirect307Test.java similarity index 100% rename from jdk/test/java/net/URLConnection/Redirect307Test.java rename to test/jdk/java/net/URLConnection/Redirect307Test.java diff --git a/jdk/test/java/net/URLConnection/RedirectLimit.java b/test/jdk/java/net/URLConnection/RedirectLimit.java similarity index 100% rename from jdk/test/java/net/URLConnection/RedirectLimit.java rename to test/jdk/java/net/URLConnection/RedirectLimit.java diff --git a/jdk/test/java/net/URLConnection/RequestProperties.java b/test/jdk/java/net/URLConnection/RequestProperties.java similarity index 100% rename from jdk/test/java/net/URLConnection/RequestProperties.java rename to test/jdk/java/net/URLConnection/RequestProperties.java diff --git a/jdk/test/java/net/URLConnection/RequestPropertyValues.java b/test/jdk/java/net/URLConnection/RequestPropertyValues.java similarity index 100% rename from jdk/test/java/net/URLConnection/RequestPropertyValues.java rename to test/jdk/java/net/URLConnection/RequestPropertyValues.java diff --git a/jdk/test/java/net/URLConnection/ResendPostBody.java b/test/jdk/java/net/URLConnection/ResendPostBody.java similarity index 100% rename from jdk/test/java/net/URLConnection/ResendPostBody.java rename to test/jdk/java/net/URLConnection/ResendPostBody.java diff --git a/jdk/test/java/net/URLConnection/Responses.java b/test/jdk/java/net/URLConnection/Responses.java similarity index 100% rename from jdk/test/java/net/URLConnection/Responses.java rename to test/jdk/java/net/URLConnection/Responses.java diff --git a/jdk/test/java/net/URLConnection/SetDefaultUseCaches.java b/test/jdk/java/net/URLConnection/SetDefaultUseCaches.java similarity index 100% rename from jdk/test/java/net/URLConnection/SetDefaultUseCaches.java rename to test/jdk/java/net/URLConnection/SetDefaultUseCaches.java diff --git a/jdk/test/java/net/URLConnection/SetIfModifiedSince.java b/test/jdk/java/net/URLConnection/SetIfModifiedSince.java similarity index 100% rename from jdk/test/java/net/URLConnection/SetIfModifiedSince.java rename to test/jdk/java/net/URLConnection/SetIfModifiedSince.java diff --git a/jdk/test/java/net/URLConnection/TIFFContentGuesser.java b/test/jdk/java/net/URLConnection/TIFFContentGuesser.java similarity index 100% rename from jdk/test/java/net/URLConnection/TIFFContentGuesser.java rename to test/jdk/java/net/URLConnection/TIFFContentGuesser.java diff --git a/jdk/test/java/net/URLConnection/TimeoutTest.java b/test/jdk/java/net/URLConnection/TimeoutTest.java similarity index 100% rename from jdk/test/java/net/URLConnection/TimeoutTest.java rename to test/jdk/java/net/URLConnection/TimeoutTest.java diff --git a/jdk/test/java/net/URLConnection/UNCTest.java b/test/jdk/java/net/URLConnection/UNCTest.java similarity index 100% rename from jdk/test/java/net/URLConnection/UNCTest.java rename to test/jdk/java/net/URLConnection/UNCTest.java diff --git a/jdk/test/java/net/URLConnection/URLConnectionHeaders.java b/test/jdk/java/net/URLConnection/URLConnectionHeaders.java similarity index 100% rename from jdk/test/java/net/URLConnection/URLConnectionHeaders.java rename to test/jdk/java/net/URLConnection/URLConnectionHeaders.java diff --git a/jdk/test/java/net/URLConnection/UnknownContentType.java b/test/jdk/java/net/URLConnection/UnknownContentType.java similarity index 100% rename from jdk/test/java/net/URLConnection/UnknownContentType.java rename to test/jdk/java/net/URLConnection/UnknownContentType.java diff --git a/jdk/test/java/net/URLConnection/ZeroContentLength.java b/test/jdk/java/net/URLConnection/ZeroContentLength.java similarity index 100% rename from jdk/test/java/net/URLConnection/ZeroContentLength.java rename to test/jdk/java/net/URLConnection/ZeroContentLength.java diff --git a/jdk/test/java/net/URLConnection/contentHandler/COM/foo/content/text/plain.java b/test/jdk/java/net/URLConnection/contentHandler/COM/foo/content/text/plain.java similarity index 100% rename from jdk/test/java/net/URLConnection/contentHandler/COM/foo/content/text/plain.java rename to test/jdk/java/net/URLConnection/contentHandler/COM/foo/content/text/plain.java diff --git a/jdk/test/java/net/URLConnection/contentHandler/UserContentHandler.java b/test/jdk/java/net/URLConnection/contentHandler/UserContentHandler.java similarity index 100% rename from jdk/test/java/net/URLConnection/contentHandler/UserContentHandler.java rename to test/jdk/java/net/URLConnection/contentHandler/UserContentHandler.java diff --git a/jdk/test/java/net/URLConnection/jars/test.jar b/test/jdk/java/net/URLConnection/jars/test.jar similarity index 100% rename from jdk/test/java/net/URLConnection/jars/test.jar rename to test/jdk/java/net/URLConnection/jars/test.jar diff --git a/jdk/test/java/net/URLConnection/olympus.jpg b/test/jdk/java/net/URLConnection/olympus.jpg similarity index 100% rename from jdk/test/java/net/URLConnection/olympus.jpg rename to test/jdk/java/net/URLConnection/olympus.jpg diff --git a/jdk/test/java/net/URLConnection/xml/not-xml1 b/test/jdk/java/net/URLConnection/xml/not-xml1 similarity index 100% rename from jdk/test/java/net/URLConnection/xml/not-xml1 rename to test/jdk/java/net/URLConnection/xml/not-xml1 diff --git a/jdk/test/java/net/URLConnection/xml/not-xml2 b/test/jdk/java/net/URLConnection/xml/not-xml2 similarity index 100% rename from jdk/test/java/net/URLConnection/xml/not-xml2 rename to test/jdk/java/net/URLConnection/xml/not-xml2 diff --git a/jdk/test/java/net/URLConnection/xml/xml1 b/test/jdk/java/net/URLConnection/xml/xml1 similarity index 100% rename from jdk/test/java/net/URLConnection/xml/xml1 rename to test/jdk/java/net/URLConnection/xml/xml1 diff --git a/jdk/test/java/net/URLConnection/xml/xml2.xml b/test/jdk/java/net/URLConnection/xml/xml2.xml similarity index 100% rename from jdk/test/java/net/URLConnection/xml/xml2.xml rename to test/jdk/java/net/URLConnection/xml/xml2.xml diff --git a/jdk/test/java/net/URLConnection/xml/xml3 b/test/jdk/java/net/URLConnection/xml/xml3 similarity index 100% rename from jdk/test/java/net/URLConnection/xml/xml3 rename to test/jdk/java/net/URLConnection/xml/xml3 diff --git a/jdk/test/java/net/URLConnection/xml/xml4 b/test/jdk/java/net/URLConnection/xml/xml4 similarity index 100% rename from jdk/test/java/net/URLConnection/xml/xml4 rename to test/jdk/java/net/URLConnection/xml/xml4 diff --git a/jdk/test/java/net/URLDecoder/B6463990.java b/test/jdk/java/net/URLDecoder/B6463990.java similarity index 100% rename from jdk/test/java/net/URLDecoder/B6463990.java rename to test/jdk/java/net/URLDecoder/B6463990.java diff --git a/jdk/test/java/net/URLDecoder/EncodeDecode.java b/test/jdk/java/net/URLDecoder/EncodeDecode.java similarity index 100% rename from jdk/test/java/net/URLDecoder/EncodeDecode.java rename to test/jdk/java/net/URLDecoder/EncodeDecode.java diff --git a/jdk/test/java/net/URLDecoder/URLDecoderArgs.java b/test/jdk/java/net/URLDecoder/URLDecoderArgs.java similarity index 100% rename from jdk/test/java/net/URLDecoder/URLDecoderArgs.java rename to test/jdk/java/net/URLDecoder/URLDecoderArgs.java diff --git a/jdk/test/java/net/URLEncoder/DecodeNonEncoded.java b/test/jdk/java/net/URLEncoder/DecodeNonEncoded.java similarity index 100% rename from jdk/test/java/net/URLEncoder/DecodeNonEncoded.java rename to test/jdk/java/net/URLEncoder/DecodeNonEncoded.java diff --git a/jdk/test/java/net/URLEncoder/Decoder.java b/test/jdk/java/net/URLEncoder/Decoder.java similarity index 100% rename from jdk/test/java/net/URLEncoder/Decoder.java rename to test/jdk/java/net/URLEncoder/Decoder.java diff --git a/jdk/test/java/net/URLEncoder/SurrogatePairs.java b/test/jdk/java/net/URLEncoder/SurrogatePairs.java similarity index 100% rename from jdk/test/java/net/URLEncoder/SurrogatePairs.java rename to test/jdk/java/net/URLEncoder/SurrogatePairs.java diff --git a/jdk/test/java/net/URLEncoder/URLEncodeDecode.java b/test/jdk/java/net/URLEncoder/URLEncodeDecode.java similarity index 100% rename from jdk/test/java/net/URLEncoder/URLEncodeDecode.java rename to test/jdk/java/net/URLEncoder/URLEncodeDecode.java diff --git a/jdk/test/java/net/URLEncoder/URLEncoderEncodeArgs.java b/test/jdk/java/net/URLEncoder/URLEncoderEncodeArgs.java similarity index 100% rename from jdk/test/java/net/URLEncoder/URLEncoderEncodeArgs.java rename to test/jdk/java/net/URLEncoder/URLEncoderEncodeArgs.java diff --git a/jdk/test/java/net/URLPermission/OpenURL.java b/test/jdk/java/net/URLPermission/OpenURL.java similarity index 100% rename from jdk/test/java/net/URLPermission/OpenURL.java rename to test/jdk/java/net/URLPermission/OpenURL.java diff --git a/jdk/test/java/net/URLPermission/URLPermissionTest.java b/test/jdk/java/net/URLPermission/URLPermissionTest.java similarity index 100% rename from jdk/test/java/net/URLPermission/URLPermissionTest.java rename to test/jdk/java/net/URLPermission/URLPermissionTest.java diff --git a/jdk/test/java/net/URLPermission/URLTest.java b/test/jdk/java/net/URLPermission/URLTest.java similarity index 100% rename from jdk/test/java/net/URLPermission/URLTest.java rename to test/jdk/java/net/URLPermission/URLTest.java diff --git a/jdk/test/java/net/URLPermission/nstest/LookupTest.java b/test/jdk/java/net/URLPermission/nstest/LookupTest.java similarity index 100% rename from jdk/test/java/net/URLPermission/nstest/LookupTest.java rename to test/jdk/java/net/URLPermission/nstest/LookupTest.java diff --git a/jdk/test/java/net/httpclient/APIErrors.java b/test/jdk/java/net/httpclient/APIErrors.java similarity index 100% rename from jdk/test/java/net/httpclient/APIErrors.java rename to test/jdk/java/net/httpclient/APIErrors.java diff --git a/jdk/test/java/net/httpclient/BasicAuthTest.java b/test/jdk/java/net/httpclient/BasicAuthTest.java similarity index 100% rename from jdk/test/java/net/httpclient/BasicAuthTest.java rename to test/jdk/java/net/httpclient/BasicAuthTest.java diff --git a/jdk/test/java/net/httpclient/EchoHandler.java b/test/jdk/java/net/httpclient/EchoHandler.java similarity index 100% rename from jdk/test/java/net/httpclient/EchoHandler.java rename to test/jdk/java/net/httpclient/EchoHandler.java diff --git a/jdk/test/java/net/httpclient/HeadersTest.java b/test/jdk/java/net/httpclient/HeadersTest.java similarity index 100% rename from jdk/test/java/net/httpclient/HeadersTest.java rename to test/jdk/java/net/httpclient/HeadersTest.java diff --git a/jdk/test/java/net/httpclient/HeadersTest1.java b/test/jdk/java/net/httpclient/HeadersTest1.java similarity index 100% rename from jdk/test/java/net/httpclient/HeadersTest1.java rename to test/jdk/java/net/httpclient/HeadersTest1.java diff --git a/jdk/test/java/net/httpclient/HttpEchoHandler.java b/test/jdk/java/net/httpclient/HttpEchoHandler.java similarity index 100% rename from jdk/test/java/net/httpclient/HttpEchoHandler.java rename to test/jdk/java/net/httpclient/HttpEchoHandler.java diff --git a/jdk/test/java/net/httpclient/HttpInputStreamTest.java b/test/jdk/java/net/httpclient/HttpInputStreamTest.java similarity index 100% rename from jdk/test/java/net/httpclient/HttpInputStreamTest.java rename to test/jdk/java/net/httpclient/HttpInputStreamTest.java diff --git a/jdk/test/java/net/httpclient/HttpRequestBuilderTest.java b/test/jdk/java/net/httpclient/HttpRequestBuilderTest.java similarity index 100% rename from jdk/test/java/net/httpclient/HttpRequestBuilderTest.java rename to test/jdk/java/net/httpclient/HttpRequestBuilderTest.java diff --git a/jdk/test/java/net/httpclient/ImmutableHeaders.java b/test/jdk/java/net/httpclient/ImmutableHeaders.java similarity index 100% rename from jdk/test/java/net/httpclient/ImmutableHeaders.java rename to test/jdk/java/net/httpclient/ImmutableHeaders.java diff --git a/jdk/test/java/net/httpclient/LightWeightHttpServer.java b/test/jdk/java/net/httpclient/LightWeightHttpServer.java similarity index 100% rename from jdk/test/java/net/httpclient/LightWeightHttpServer.java rename to test/jdk/java/net/httpclient/LightWeightHttpServer.java diff --git a/jdk/test/java/net/httpclient/ManyRequests.java b/test/jdk/java/net/httpclient/ManyRequests.java similarity index 100% rename from jdk/test/java/net/httpclient/ManyRequests.java rename to test/jdk/java/net/httpclient/ManyRequests.java diff --git a/jdk/test/java/net/httpclient/ManyRequests2.java b/test/jdk/java/net/httpclient/ManyRequests2.java similarity index 100% rename from jdk/test/java/net/httpclient/ManyRequests2.java rename to test/jdk/java/net/httpclient/ManyRequests2.java diff --git a/jdk/test/java/net/httpclient/MessageHeadersTest.java b/test/jdk/java/net/httpclient/MessageHeadersTest.java similarity index 100% rename from jdk/test/java/net/httpclient/MessageHeadersTest.java rename to test/jdk/java/net/httpclient/MessageHeadersTest.java diff --git a/jdk/test/java/net/httpclient/MultiAuthTest.java b/test/jdk/java/net/httpclient/MultiAuthTest.java similarity index 100% rename from jdk/test/java/net/httpclient/MultiAuthTest.java rename to test/jdk/java/net/httpclient/MultiAuthTest.java diff --git a/jdk/test/java/net/httpclient/ProxyAuthTest.java b/test/jdk/java/net/httpclient/ProxyAuthTest.java similarity index 100% rename from jdk/test/java/net/httpclient/ProxyAuthTest.java rename to test/jdk/java/net/httpclient/ProxyAuthTest.java diff --git a/jdk/test/java/net/httpclient/ProxyServer.java b/test/jdk/java/net/httpclient/ProxyServer.java similarity index 100% rename from jdk/test/java/net/httpclient/ProxyServer.java rename to test/jdk/java/net/httpclient/ProxyServer.java diff --git a/jdk/test/java/net/httpclient/ProxyTest.java b/test/jdk/java/net/httpclient/ProxyTest.java similarity index 100% rename from jdk/test/java/net/httpclient/ProxyTest.java rename to test/jdk/java/net/httpclient/ProxyTest.java diff --git a/jdk/test/java/net/httpclient/RequestBodyTest.java b/test/jdk/java/net/httpclient/RequestBodyTest.java similarity index 100% rename from jdk/test/java/net/httpclient/RequestBodyTest.java rename to test/jdk/java/net/httpclient/RequestBodyTest.java diff --git a/jdk/test/java/net/httpclient/Server.java b/test/jdk/java/net/httpclient/Server.java similarity index 100% rename from jdk/test/java/net/httpclient/Server.java rename to test/jdk/java/net/httpclient/Server.java diff --git a/jdk/test/java/net/httpclient/ShortRequestBody.java b/test/jdk/java/net/httpclient/ShortRequestBody.java similarity index 100% rename from jdk/test/java/net/httpclient/ShortRequestBody.java rename to test/jdk/java/net/httpclient/ShortRequestBody.java diff --git a/jdk/test/java/net/httpclient/SmallTimeout.java b/test/jdk/java/net/httpclient/SmallTimeout.java similarity index 100% rename from jdk/test/java/net/httpclient/SmallTimeout.java rename to test/jdk/java/net/httpclient/SmallTimeout.java diff --git a/jdk/test/java/net/httpclient/SmokeTest.java b/test/jdk/java/net/httpclient/SmokeTest.java similarity index 100% rename from jdk/test/java/net/httpclient/SmokeTest.java rename to test/jdk/java/net/httpclient/SmokeTest.java diff --git a/jdk/test/java/net/httpclient/SplitResponse.java b/test/jdk/java/net/httpclient/SplitResponse.java similarity index 100% rename from jdk/test/java/net/httpclient/SplitResponse.java rename to test/jdk/java/net/httpclient/SplitResponse.java diff --git a/jdk/test/java/net/httpclient/TEST.properties b/test/jdk/java/net/httpclient/TEST.properties similarity index 100% rename from jdk/test/java/net/httpclient/TEST.properties rename to test/jdk/java/net/httpclient/TEST.properties diff --git a/jdk/test/java/net/httpclient/TestKit.java b/test/jdk/java/net/httpclient/TestKit.java similarity index 100% rename from jdk/test/java/net/httpclient/TestKit.java rename to test/jdk/java/net/httpclient/TestKit.java diff --git a/jdk/test/java/net/httpclient/TestKitTest.java b/test/jdk/java/net/httpclient/TestKitTest.java similarity index 100% rename from jdk/test/java/net/httpclient/TestKitTest.java rename to test/jdk/java/net/httpclient/TestKitTest.java diff --git a/jdk/test/java/net/httpclient/TimeoutBasic.java b/test/jdk/java/net/httpclient/TimeoutBasic.java similarity index 100% rename from jdk/test/java/net/httpclient/TimeoutBasic.java rename to test/jdk/java/net/httpclient/TimeoutBasic.java diff --git a/jdk/test/java/net/httpclient/TimeoutOrdering.java b/test/jdk/java/net/httpclient/TimeoutOrdering.java similarity index 100% rename from jdk/test/java/net/httpclient/TimeoutOrdering.java rename to test/jdk/java/net/httpclient/TimeoutOrdering.java diff --git a/jdk/test/java/net/httpclient/VersionTest.java b/test/jdk/java/net/httpclient/VersionTest.java similarity index 100% rename from jdk/test/java/net/httpclient/VersionTest.java rename to test/jdk/java/net/httpclient/VersionTest.java diff --git a/jdk/test/java/net/httpclient/docs/files/foo.txt b/test/jdk/java/net/httpclient/docs/files/foo.txt similarity index 100% rename from jdk/test/java/net/httpclient/docs/files/foo.txt rename to test/jdk/java/net/httpclient/docs/files/foo.txt diff --git a/jdk/test/java/net/httpclient/docs/files/notsobigfile.txt b/test/jdk/java/net/httpclient/docs/files/notsobigfile.txt similarity index 100% rename from jdk/test/java/net/httpclient/docs/files/notsobigfile.txt rename to test/jdk/java/net/httpclient/docs/files/notsobigfile.txt diff --git a/jdk/test/java/net/httpclient/docs/files/smallfile.txt b/test/jdk/java/net/httpclient/docs/files/smallfile.txt similarity index 100% rename from jdk/test/java/net/httpclient/docs/files/smallfile.txt rename to test/jdk/java/net/httpclient/docs/files/smallfile.txt diff --git a/jdk/test/java/net/httpclient/examples/WebSocketExample.java b/test/jdk/java/net/httpclient/examples/WebSocketExample.java similarity index 100% rename from jdk/test/java/net/httpclient/examples/WebSocketExample.java rename to test/jdk/java/net/httpclient/examples/WebSocketExample.java diff --git a/jdk/test/java/net/httpclient/http2/BasicTest.java b/test/jdk/java/net/httpclient/http2/BasicTest.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/BasicTest.java rename to test/jdk/java/net/httpclient/http2/BasicTest.java diff --git a/jdk/test/java/net/httpclient/http2/ErrorTest.java b/test/jdk/java/net/httpclient/http2/ErrorTest.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/ErrorTest.java rename to test/jdk/java/net/httpclient/http2/ErrorTest.java diff --git a/jdk/test/java/net/httpclient/http2/FixedThreadPoolTest.java b/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/FixedThreadPoolTest.java rename to test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java diff --git a/jdk/test/java/net/httpclient/http2/HpackDriver.java b/test/jdk/java/net/httpclient/http2/HpackDriver.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/HpackDriver.java rename to test/jdk/java/net/httpclient/http2/HpackDriver.java diff --git a/jdk/test/java/net/httpclient/http2/HpackDriverHeaderTable.java b/test/jdk/java/net/httpclient/http2/HpackDriverHeaderTable.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/HpackDriverHeaderTable.java rename to test/jdk/java/net/httpclient/http2/HpackDriverHeaderTable.java diff --git a/jdk/test/java/net/httpclient/http2/NoBody.java b/test/jdk/java/net/httpclient/http2/NoBody.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/NoBody.java rename to test/jdk/java/net/httpclient/http2/NoBody.java diff --git a/jdk/test/java/net/httpclient/http2/ProxyTest2.java b/test/jdk/java/net/httpclient/http2/ProxyTest2.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/ProxyTest2.java rename to test/jdk/java/net/httpclient/http2/ProxyTest2.java diff --git a/jdk/test/java/net/httpclient/http2/RedirectTest.java b/test/jdk/java/net/httpclient/http2/RedirectTest.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/RedirectTest.java rename to test/jdk/java/net/httpclient/http2/RedirectTest.java diff --git a/jdk/test/java/net/httpclient/http2/ServerPush.java b/test/jdk/java/net/httpclient/http2/ServerPush.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/ServerPush.java rename to test/jdk/java/net/httpclient/http2/ServerPush.java diff --git a/jdk/test/java/net/httpclient/http2/TLSConnection.java b/test/jdk/java/net/httpclient/http2/TLSConnection.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/TLSConnection.java rename to test/jdk/java/net/httpclient/http2/TLSConnection.java diff --git a/jdk/test/java/net/httpclient/http2/Timeout.java b/test/jdk/java/net/httpclient/http2/Timeout.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/Timeout.java rename to test/jdk/java/net/httpclient/http2/Timeout.java diff --git a/jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BinaryPrimitivesTest.java b/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BinaryPrimitivesTest.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BinaryPrimitivesTest.java rename to test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BinaryPrimitivesTest.java diff --git a/jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BuffersTestingKit.java b/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BuffersTestingKit.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BuffersTestingKit.java rename to test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BuffersTestingKit.java diff --git a/jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/CircularBufferTest.java b/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/CircularBufferTest.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/CircularBufferTest.java rename to test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/CircularBufferTest.java diff --git a/jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/DecoderTest.java b/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/DecoderTest.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/DecoderTest.java rename to test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/DecoderTest.java diff --git a/jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/EncoderTest.java b/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/EncoderTest.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/EncoderTest.java rename to test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/EncoderTest.java diff --git a/jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HeaderTableTest.java b/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HeaderTableTest.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HeaderTableTest.java rename to test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HeaderTableTest.java diff --git a/jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HuffmanTest.java b/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HuffmanTest.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HuffmanTest.java rename to test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HuffmanTest.java diff --git a/jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/SpecHelper.java b/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/SpecHelper.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/SpecHelper.java rename to test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/SpecHelper.java diff --git a/jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/TestHelper.java b/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/TestHelper.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/TestHelper.java rename to test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/TestHelper.java diff --git a/jdk/test/java/net/httpclient/http2/keystore.p12 b/test/jdk/java/net/httpclient/http2/keystore.p12 similarity index 100% rename from jdk/test/java/net/httpclient/http2/keystore.p12 rename to test/jdk/java/net/httpclient/http2/keystore.p12 diff --git a/jdk/test/java/net/httpclient/http2/server/BodyInputStream.java b/test/jdk/java/net/httpclient/http2/server/BodyInputStream.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/BodyInputStream.java rename to test/jdk/java/net/httpclient/http2/server/BodyInputStream.java diff --git a/jdk/test/java/net/httpclient/http2/server/BodyOutputStream.java b/test/jdk/java/net/httpclient/http2/server/BodyOutputStream.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/BodyOutputStream.java rename to test/jdk/java/net/httpclient/http2/server/BodyOutputStream.java diff --git a/jdk/test/java/net/httpclient/http2/server/EchoHandler.java b/test/jdk/java/net/httpclient/http2/server/EchoHandler.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/EchoHandler.java rename to test/jdk/java/net/httpclient/http2/server/EchoHandler.java diff --git a/jdk/test/java/net/httpclient/http2/server/Http2EchoHandler.java b/test/jdk/java/net/httpclient/http2/server/Http2EchoHandler.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/Http2EchoHandler.java rename to test/jdk/java/net/httpclient/http2/server/Http2EchoHandler.java diff --git a/jdk/test/java/net/httpclient/http2/server/Http2Handler.java b/test/jdk/java/net/httpclient/http2/server/Http2Handler.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/Http2Handler.java rename to test/jdk/java/net/httpclient/http2/server/Http2Handler.java diff --git a/jdk/test/java/net/httpclient/http2/server/Http2TestExchange.java b/test/jdk/java/net/httpclient/http2/server/Http2TestExchange.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/Http2TestExchange.java rename to test/jdk/java/net/httpclient/http2/server/Http2TestExchange.java diff --git a/jdk/test/java/net/httpclient/http2/server/Http2TestServer.java b/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/Http2TestServer.java rename to test/jdk/java/net/httpclient/http2/server/Http2TestServer.java diff --git a/jdk/test/java/net/httpclient/http2/server/Http2TestServerConnection.java b/test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/Http2TestServerConnection.java rename to test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java diff --git a/jdk/test/java/net/httpclient/http2/server/NoBodyHandler.java b/test/jdk/java/net/httpclient/http2/server/NoBodyHandler.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/NoBodyHandler.java rename to test/jdk/java/net/httpclient/http2/server/NoBodyHandler.java diff --git a/jdk/test/java/net/httpclient/http2/server/OutgoingPushPromise.java b/test/jdk/java/net/httpclient/http2/server/OutgoingPushPromise.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/OutgoingPushPromise.java rename to test/jdk/java/net/httpclient/http2/server/OutgoingPushPromise.java diff --git a/jdk/test/java/net/httpclient/http2/server/PushHandler.java b/test/jdk/java/net/httpclient/http2/server/PushHandler.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/PushHandler.java rename to test/jdk/java/net/httpclient/http2/server/PushHandler.java diff --git a/jdk/test/java/net/httpclient/http2/server/RedirectHandler.java b/test/jdk/java/net/httpclient/http2/server/RedirectHandler.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/RedirectHandler.java rename to test/jdk/java/net/httpclient/http2/server/RedirectHandler.java diff --git a/jdk/test/java/net/httpclient/http2/server/TestUtil.java b/test/jdk/java/net/httpclient/http2/server/TestUtil.java similarity index 100% rename from jdk/test/java/net/httpclient/http2/server/TestUtil.java rename to test/jdk/java/net/httpclient/http2/server/TestUtil.java diff --git a/jdk/test/java/net/httpclient/security/0.policy b/test/jdk/java/net/httpclient/security/0.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/0.policy rename to test/jdk/java/net/httpclient/security/0.policy diff --git a/jdk/test/java/net/httpclient/security/1.policy b/test/jdk/java/net/httpclient/security/1.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/1.policy rename to test/jdk/java/net/httpclient/security/1.policy diff --git a/jdk/test/java/net/httpclient/security/10.policy b/test/jdk/java/net/httpclient/security/10.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/10.policy rename to test/jdk/java/net/httpclient/security/10.policy diff --git a/jdk/test/java/net/httpclient/security/11.policy b/test/jdk/java/net/httpclient/security/11.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/11.policy rename to test/jdk/java/net/httpclient/security/11.policy diff --git a/jdk/test/java/net/httpclient/security/12.policy b/test/jdk/java/net/httpclient/security/12.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/12.policy rename to test/jdk/java/net/httpclient/security/12.policy diff --git a/jdk/test/java/net/httpclient/security/14.policy b/test/jdk/java/net/httpclient/security/14.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/14.policy rename to test/jdk/java/net/httpclient/security/14.policy diff --git a/jdk/test/java/net/httpclient/security/15.policy b/test/jdk/java/net/httpclient/security/15.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/15.policy rename to test/jdk/java/net/httpclient/security/15.policy diff --git a/jdk/test/java/net/httpclient/security/2.policy b/test/jdk/java/net/httpclient/security/2.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/2.policy rename to test/jdk/java/net/httpclient/security/2.policy diff --git a/jdk/test/java/net/httpclient/security/3.policy b/test/jdk/java/net/httpclient/security/3.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/3.policy rename to test/jdk/java/net/httpclient/security/3.policy diff --git a/jdk/test/java/net/httpclient/security/4.policy b/test/jdk/java/net/httpclient/security/4.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/4.policy rename to test/jdk/java/net/httpclient/security/4.policy diff --git a/jdk/test/java/net/httpclient/security/5.policy b/test/jdk/java/net/httpclient/security/5.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/5.policy rename to test/jdk/java/net/httpclient/security/5.policy diff --git a/jdk/test/java/net/httpclient/security/6.policy b/test/jdk/java/net/httpclient/security/6.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/6.policy rename to test/jdk/java/net/httpclient/security/6.policy diff --git a/jdk/test/java/net/httpclient/security/7.policy b/test/jdk/java/net/httpclient/security/7.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/7.policy rename to test/jdk/java/net/httpclient/security/7.policy diff --git a/jdk/test/java/net/httpclient/security/8.policy b/test/jdk/java/net/httpclient/security/8.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/8.policy rename to test/jdk/java/net/httpclient/security/8.policy diff --git a/jdk/test/java/net/httpclient/security/9.policy b/test/jdk/java/net/httpclient/security/9.policy similarity index 100% rename from jdk/test/java/net/httpclient/security/9.policy rename to test/jdk/java/net/httpclient/security/9.policy diff --git a/jdk/test/java/net/httpclient/security/Driver.java b/test/jdk/java/net/httpclient/security/Driver.java similarity index 100% rename from jdk/test/java/net/httpclient/security/Driver.java rename to test/jdk/java/net/httpclient/security/Driver.java diff --git a/jdk/test/java/net/httpclient/security/Security.java b/test/jdk/java/net/httpclient/security/Security.java similarity index 100% rename from jdk/test/java/net/httpclient/security/Security.java rename to test/jdk/java/net/httpclient/security/Security.java diff --git a/jdk/test/java/net/httpclient/websocket/ConnectionHandover.java b/test/jdk/java/net/httpclient/websocket/ConnectionHandover.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/ConnectionHandover.java rename to test/jdk/java/net/httpclient/websocket/ConnectionHandover.java diff --git a/jdk/test/java/net/httpclient/websocket/DummyWebSocketServer.java b/test/jdk/java/net/httpclient/websocket/DummyWebSocketServer.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/DummyWebSocketServer.java rename to test/jdk/java/net/httpclient/websocket/DummyWebSocketServer.java diff --git a/jdk/test/java/net/httpclient/websocket/LoggingHelper.java b/test/jdk/java/net/httpclient/websocket/LoggingHelper.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/LoggingHelper.java rename to test/jdk/java/net/httpclient/websocket/LoggingHelper.java diff --git a/jdk/test/java/net/httpclient/websocket/WSDriver.java b/test/jdk/java/net/httpclient/websocket/WSDriver.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/WSDriver.java rename to test/jdk/java/net/httpclient/websocket/WSDriver.java diff --git a/jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/BuildingWebSocketTest.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/BuildingWebSocketTest.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/BuildingWebSocketTest.java rename to test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/BuildingWebSocketTest.java diff --git a/jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/CloseTest.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/CloseTest.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/CloseTest.java rename to test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/CloseTest.java diff --git a/jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/DataProviders.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/DataProviders.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/DataProviders.java rename to test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/DataProviders.java diff --git a/jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/HeaderWriterTest.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/HeaderWriterTest.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/HeaderWriterTest.java rename to test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/HeaderWriterTest.java diff --git a/jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MaskerTest.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MaskerTest.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MaskerTest.java rename to test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MaskerTest.java diff --git a/jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockChannel.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockChannel.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockChannel.java rename to test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockChannel.java diff --git a/jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockChannelTest.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockChannelTest.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockChannelTest.java rename to test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockChannelTest.java diff --git a/jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListener.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListener.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListener.java rename to test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListener.java diff --git a/jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListenerTest.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListenerTest.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListenerTest.java rename to test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListenerTest.java diff --git a/jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/PingTest.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/PingTest.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/PingTest.java rename to test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/PingTest.java diff --git a/jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReaderTest.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReaderTest.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReaderTest.java rename to test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReaderTest.java diff --git a/jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/TestSupport.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/TestSupport.java similarity index 100% rename from jdk/test/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/TestSupport.java rename to test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/TestSupport.java diff --git a/jdk/test/java/net/httpclient/websocket/logging.properties b/test/jdk/java/net/httpclient/websocket/logging.properties similarity index 100% rename from jdk/test/java/net/httpclient/websocket/logging.properties rename to test/jdk/java/net/httpclient/websocket/logging.properties diff --git a/jdk/test/java/net/httpclient/whitebox/Driver.java b/test/jdk/java/net/httpclient/whitebox/Driver.java similarity index 100% rename from jdk/test/java/net/httpclient/whitebox/Driver.java rename to test/jdk/java/net/httpclient/whitebox/Driver.java diff --git a/jdk/test/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ConnectionPoolTest.java b/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ConnectionPoolTest.java similarity index 100% rename from jdk/test/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ConnectionPoolTest.java rename to test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ConnectionPoolTest.java diff --git a/jdk/test/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/RawChannelTest.java b/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/RawChannelTest.java similarity index 100% rename from jdk/test/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/RawChannelTest.java rename to test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/RawChannelTest.java diff --git a/jdk/test/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ResponseHeadersTest.java b/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ResponseHeadersTest.java similarity index 100% rename from jdk/test/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ResponseHeadersTest.java rename to test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ResponseHeadersTest.java diff --git a/jdk/test/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SelectorTest.java b/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SelectorTest.java similarity index 100% rename from jdk/test/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SelectorTest.java rename to test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SelectorTest.java diff --git a/jdk/test/java/net/ipv6tests/B6521014.java b/test/jdk/java/net/ipv6tests/B6521014.java similarity index 100% rename from jdk/test/java/net/ipv6tests/B6521014.java rename to test/jdk/java/net/ipv6tests/B6521014.java diff --git a/jdk/test/java/net/ipv6tests/BadIPv6Addresses.java b/test/jdk/java/net/ipv6tests/BadIPv6Addresses.java similarity index 100% rename from jdk/test/java/net/ipv6tests/BadIPv6Addresses.java rename to test/jdk/java/net/ipv6tests/BadIPv6Addresses.java diff --git a/jdk/test/java/net/ipv6tests/ScopeTests.java b/test/jdk/java/net/ipv6tests/ScopeTests.java similarity index 100% rename from jdk/test/java/net/ipv6tests/ScopeTests.java rename to test/jdk/java/net/ipv6tests/ScopeTests.java diff --git a/jdk/test/java/net/ipv6tests/TcpTest.java b/test/jdk/java/net/ipv6tests/TcpTest.java similarity index 100% rename from jdk/test/java/net/ipv6tests/TcpTest.java rename to test/jdk/java/net/ipv6tests/TcpTest.java diff --git a/jdk/test/java/net/ipv6tests/Tests.java b/test/jdk/java/net/ipv6tests/Tests.java similarity index 100% rename from jdk/test/java/net/ipv6tests/Tests.java rename to test/jdk/java/net/ipv6tests/Tests.java diff --git a/jdk/test/java/net/ipv6tests/UdpTest.java b/test/jdk/java/net/ipv6tests/UdpTest.java similarity index 100% rename from jdk/test/java/net/ipv6tests/UdpTest.java rename to test/jdk/java/net/ipv6tests/UdpTest.java diff --git a/jdk/test/java/net/spi/URLStreamHandlerProvider/Basic.java b/test/jdk/java/net/spi/URLStreamHandlerProvider/Basic.java similarity index 100% rename from jdk/test/java/net/spi/URLStreamHandlerProvider/Basic.java rename to test/jdk/java/net/spi/URLStreamHandlerProvider/Basic.java diff --git a/jdk/test/java/net/spi/URLStreamHandlerProvider/Child.java b/test/jdk/java/net/spi/URLStreamHandlerProvider/Child.java similarity index 100% rename from jdk/test/java/net/spi/URLStreamHandlerProvider/Child.java rename to test/jdk/java/net/spi/URLStreamHandlerProvider/Child.java diff --git a/jdk/test/java/net/spi/URLStreamHandlerProvider/bad.provider.template b/test/jdk/java/net/spi/URLStreamHandlerProvider/bad.provider.template similarity index 100% rename from jdk/test/java/net/spi/URLStreamHandlerProvider/bad.provider.template rename to test/jdk/java/net/spi/URLStreamHandlerProvider/bad.provider.template diff --git a/jdk/test/java/net/spi/URLStreamHandlerProvider/basic.policy b/test/jdk/java/net/spi/URLStreamHandlerProvider/basic.policy similarity index 100% rename from jdk/test/java/net/spi/URLStreamHandlerProvider/basic.policy rename to test/jdk/java/net/spi/URLStreamHandlerProvider/basic.policy diff --git a/jdk/test/java/net/spi/URLStreamHandlerProvider/provider.template b/test/jdk/java/net/spi/URLStreamHandlerProvider/provider.template similarity index 100% rename from jdk/test/java/net/spi/URLStreamHandlerProvider/provider.template rename to test/jdk/java/net/spi/URLStreamHandlerProvider/provider.template diff --git a/jdk/test/java/nio/Buffer/AllocateDirectInit.java b/test/jdk/java/nio/Buffer/AllocateDirectInit.java similarity index 100% rename from jdk/test/java/nio/Buffer/AllocateDirectInit.java rename to test/jdk/java/nio/Buffer/AllocateDirectInit.java diff --git a/jdk/test/java/nio/Buffer/Basic-X.java.template b/test/jdk/java/nio/Buffer/Basic-X.java.template similarity index 100% rename from jdk/test/java/nio/Buffer/Basic-X.java.template rename to test/jdk/java/nio/Buffer/Basic-X.java.template diff --git a/jdk/test/java/nio/Buffer/Basic.java b/test/jdk/java/nio/Buffer/Basic.java similarity index 100% rename from jdk/test/java/nio/Buffer/Basic.java rename to test/jdk/java/nio/Buffer/Basic.java diff --git a/jdk/test/java/nio/Buffer/BasicByte.java b/test/jdk/java/nio/Buffer/BasicByte.java similarity index 100% rename from jdk/test/java/nio/Buffer/BasicByte.java rename to test/jdk/java/nio/Buffer/BasicByte.java diff --git a/jdk/test/java/nio/Buffer/BasicChar.java b/test/jdk/java/nio/Buffer/BasicChar.java similarity index 100% rename from jdk/test/java/nio/Buffer/BasicChar.java rename to test/jdk/java/nio/Buffer/BasicChar.java diff --git a/jdk/test/java/nio/Buffer/BasicDouble.java b/test/jdk/java/nio/Buffer/BasicDouble.java similarity index 100% rename from jdk/test/java/nio/Buffer/BasicDouble.java rename to test/jdk/java/nio/Buffer/BasicDouble.java diff --git a/jdk/test/java/nio/Buffer/BasicFloat.java b/test/jdk/java/nio/Buffer/BasicFloat.java similarity index 100% rename from jdk/test/java/nio/Buffer/BasicFloat.java rename to test/jdk/java/nio/Buffer/BasicFloat.java diff --git a/jdk/test/java/nio/Buffer/BasicInt.java b/test/jdk/java/nio/Buffer/BasicInt.java similarity index 100% rename from jdk/test/java/nio/Buffer/BasicInt.java rename to test/jdk/java/nio/Buffer/BasicInt.java diff --git a/jdk/test/java/nio/Buffer/BasicLong.java b/test/jdk/java/nio/Buffer/BasicLong.java similarity index 100% rename from jdk/test/java/nio/Buffer/BasicLong.java rename to test/jdk/java/nio/Buffer/BasicLong.java diff --git a/jdk/test/java/nio/Buffer/BasicShort.java b/test/jdk/java/nio/Buffer/BasicShort.java similarity index 100% rename from jdk/test/java/nio/Buffer/BasicShort.java rename to test/jdk/java/nio/Buffer/BasicShort.java diff --git a/jdk/test/java/nio/Buffer/ByteBufferViews.java b/test/jdk/java/nio/Buffer/ByteBufferViews.java similarity index 100% rename from jdk/test/java/nio/Buffer/ByteBufferViews.java rename to test/jdk/java/nio/Buffer/ByteBufferViews.java diff --git a/jdk/test/java/nio/Buffer/CharAt.java b/test/jdk/java/nio/Buffer/CharAt.java similarity index 100% rename from jdk/test/java/nio/Buffer/CharAt.java rename to test/jdk/java/nio/Buffer/CharAt.java diff --git a/jdk/test/java/nio/Buffer/Chars.java b/test/jdk/java/nio/Buffer/Chars.java similarity index 100% rename from jdk/test/java/nio/Buffer/Chars.java rename to test/jdk/java/nio/Buffer/Chars.java diff --git a/jdk/test/java/nio/Buffer/Chew.java b/test/jdk/java/nio/Buffer/Chew.java similarity index 100% rename from jdk/test/java/nio/Buffer/Chew.java rename to test/jdk/java/nio/Buffer/Chew.java diff --git a/jdk/test/java/nio/Buffer/CopyDirect-X-Memory.java.template b/test/jdk/java/nio/Buffer/CopyDirect-X-Memory.java.template similarity index 100% rename from jdk/test/java/nio/Buffer/CopyDirect-X-Memory.java.template rename to test/jdk/java/nio/Buffer/CopyDirect-X-Memory.java.template diff --git a/jdk/test/java/nio/Buffer/CopyDirectByteMemory.java b/test/jdk/java/nio/Buffer/CopyDirectByteMemory.java similarity index 100% rename from jdk/test/java/nio/Buffer/CopyDirectByteMemory.java rename to test/jdk/java/nio/Buffer/CopyDirectByteMemory.java diff --git a/jdk/test/java/nio/Buffer/CopyDirectCharMemory.java b/test/jdk/java/nio/Buffer/CopyDirectCharMemory.java similarity index 100% rename from jdk/test/java/nio/Buffer/CopyDirectCharMemory.java rename to test/jdk/java/nio/Buffer/CopyDirectCharMemory.java diff --git a/jdk/test/java/nio/Buffer/CopyDirectDoubleMemory.java b/test/jdk/java/nio/Buffer/CopyDirectDoubleMemory.java similarity index 100% rename from jdk/test/java/nio/Buffer/CopyDirectDoubleMemory.java rename to test/jdk/java/nio/Buffer/CopyDirectDoubleMemory.java diff --git a/jdk/test/java/nio/Buffer/CopyDirectFloatMemory.java b/test/jdk/java/nio/Buffer/CopyDirectFloatMemory.java similarity index 100% rename from jdk/test/java/nio/Buffer/CopyDirectFloatMemory.java rename to test/jdk/java/nio/Buffer/CopyDirectFloatMemory.java diff --git a/jdk/test/java/nio/Buffer/CopyDirectIntMemory.java b/test/jdk/java/nio/Buffer/CopyDirectIntMemory.java similarity index 100% rename from jdk/test/java/nio/Buffer/CopyDirectIntMemory.java rename to test/jdk/java/nio/Buffer/CopyDirectIntMemory.java diff --git a/jdk/test/java/nio/Buffer/CopyDirectLongMemory.java b/test/jdk/java/nio/Buffer/CopyDirectLongMemory.java similarity index 100% rename from jdk/test/java/nio/Buffer/CopyDirectLongMemory.java rename to test/jdk/java/nio/Buffer/CopyDirectLongMemory.java diff --git a/jdk/test/java/nio/Buffer/CopyDirectMemory.java b/test/jdk/java/nio/Buffer/CopyDirectMemory.java similarity index 100% rename from jdk/test/java/nio/Buffer/CopyDirectMemory.java rename to test/jdk/java/nio/Buffer/CopyDirectMemory.java diff --git a/jdk/test/java/nio/Buffer/CopyDirectShortMemory.java b/test/jdk/java/nio/Buffer/CopyDirectShortMemory.java similarity index 100% rename from jdk/test/java/nio/Buffer/CopyDirectShortMemory.java rename to test/jdk/java/nio/Buffer/CopyDirectShortMemory.java diff --git a/jdk/test/java/nio/Buffer/DirectBufferAllocTest.java b/test/jdk/java/nio/Buffer/DirectBufferAllocTest.java similarity index 100% rename from jdk/test/java/nio/Buffer/DirectBufferAllocTest.java rename to test/jdk/java/nio/Buffer/DirectBufferAllocTest.java diff --git a/jdk/test/java/nio/Buffer/LimitDirectMemory.java b/test/jdk/java/nio/Buffer/LimitDirectMemory.java similarity index 100% rename from jdk/test/java/nio/Buffer/LimitDirectMemory.java rename to test/jdk/java/nio/Buffer/LimitDirectMemory.java diff --git a/jdk/test/java/nio/Buffer/LimitDirectMemoryNegativeTest.java b/test/jdk/java/nio/Buffer/LimitDirectMemoryNegativeTest.java similarity index 100% rename from jdk/test/java/nio/Buffer/LimitDirectMemoryNegativeTest.java rename to test/jdk/java/nio/Buffer/LimitDirectMemoryNegativeTest.java diff --git a/jdk/test/java/nio/Buffer/Order-X.java.template b/test/jdk/java/nio/Buffer/Order-X.java.template similarity index 100% rename from jdk/test/java/nio/Buffer/Order-X.java.template rename to test/jdk/java/nio/Buffer/Order-X.java.template diff --git a/jdk/test/java/nio/Buffer/Order.java b/test/jdk/java/nio/Buffer/Order.java similarity index 100% rename from jdk/test/java/nio/Buffer/Order.java rename to test/jdk/java/nio/Buffer/Order.java diff --git a/jdk/test/java/nio/Buffer/OrderChar.java b/test/jdk/java/nio/Buffer/OrderChar.java similarity index 100% rename from jdk/test/java/nio/Buffer/OrderChar.java rename to test/jdk/java/nio/Buffer/OrderChar.java diff --git a/jdk/test/java/nio/Buffer/OrderDouble.java b/test/jdk/java/nio/Buffer/OrderDouble.java similarity index 100% rename from jdk/test/java/nio/Buffer/OrderDouble.java rename to test/jdk/java/nio/Buffer/OrderDouble.java diff --git a/jdk/test/java/nio/Buffer/OrderFloat.java b/test/jdk/java/nio/Buffer/OrderFloat.java similarity index 100% rename from jdk/test/java/nio/Buffer/OrderFloat.java rename to test/jdk/java/nio/Buffer/OrderFloat.java diff --git a/jdk/test/java/nio/Buffer/OrderInt.java b/test/jdk/java/nio/Buffer/OrderInt.java similarity index 100% rename from jdk/test/java/nio/Buffer/OrderInt.java rename to test/jdk/java/nio/Buffer/OrderInt.java diff --git a/jdk/test/java/nio/Buffer/OrderLong.java b/test/jdk/java/nio/Buffer/OrderLong.java similarity index 100% rename from jdk/test/java/nio/Buffer/OrderLong.java rename to test/jdk/java/nio/Buffer/OrderLong.java diff --git a/jdk/test/java/nio/Buffer/OrderShort.java b/test/jdk/java/nio/Buffer/OrderShort.java similarity index 100% rename from jdk/test/java/nio/Buffer/OrderShort.java rename to test/jdk/java/nio/Buffer/OrderShort.java diff --git a/jdk/test/java/nio/Buffer/StringCharBufferSliceTest.java b/test/jdk/java/nio/Buffer/StringCharBufferSliceTest.java similarity index 100% rename from jdk/test/java/nio/Buffer/StringCharBufferSliceTest.java rename to test/jdk/java/nio/Buffer/StringCharBufferSliceTest.java diff --git a/jdk/test/java/nio/Buffer/SwapMicroBenchmark.java b/test/jdk/java/nio/Buffer/SwapMicroBenchmark.java similarity index 100% rename from jdk/test/java/nio/Buffer/SwapMicroBenchmark.java rename to test/jdk/java/nio/Buffer/SwapMicroBenchmark.java diff --git a/jdk/test/java/nio/Buffer/genBasic.sh b/test/jdk/java/nio/Buffer/genBasic.sh similarity index 100% rename from jdk/test/java/nio/Buffer/genBasic.sh rename to test/jdk/java/nio/Buffer/genBasic.sh diff --git a/jdk/test/java/nio/Buffer/genCopyDirectMemory.sh b/test/jdk/java/nio/Buffer/genCopyDirectMemory.sh similarity index 100% rename from jdk/test/java/nio/Buffer/genCopyDirectMemory.sh rename to test/jdk/java/nio/Buffer/genCopyDirectMemory.sh diff --git a/jdk/test/java/nio/Buffer/genOrder.sh b/test/jdk/java/nio/Buffer/genOrder.sh similarity index 100% rename from jdk/test/java/nio/Buffer/genOrder.sh rename to test/jdk/java/nio/Buffer/genOrder.sh diff --git a/jdk/test/java/nio/ByteOrder/NativeOrder.java b/test/jdk/java/nio/ByteOrder/NativeOrder.java similarity index 100% rename from jdk/test/java/nio/ByteOrder/NativeOrder.java rename to test/jdk/java/nio/ByteOrder/NativeOrder.java diff --git a/jdk/test/java/nio/MappedByteBuffer/Basic.java b/test/jdk/java/nio/MappedByteBuffer/Basic.java similarity index 100% rename from jdk/test/java/nio/MappedByteBuffer/Basic.java rename to test/jdk/java/nio/MappedByteBuffer/Basic.java diff --git a/jdk/test/java/nio/MappedByteBuffer/Force.java b/test/jdk/java/nio/MappedByteBuffer/Force.java similarity index 100% rename from jdk/test/java/nio/MappedByteBuffer/Force.java rename to test/jdk/java/nio/MappedByteBuffer/Force.java diff --git a/jdk/test/java/nio/MappedByteBuffer/Truncate.java b/test/jdk/java/nio/MappedByteBuffer/Truncate.java similarity index 100% rename from jdk/test/java/nio/MappedByteBuffer/Truncate.java rename to test/jdk/java/nio/MappedByteBuffer/Truncate.java diff --git a/jdk/test/java/nio/MappedByteBuffer/ZeroMap.java b/test/jdk/java/nio/MappedByteBuffer/ZeroMap.java similarity index 100% rename from jdk/test/java/nio/MappedByteBuffer/ZeroMap.java rename to test/jdk/java/nio/MappedByteBuffer/ZeroMap.java diff --git a/jdk/test/java/nio/channels/AsyncCloseAndInterrupt.java b/test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java similarity index 100% rename from jdk/test/java/nio/channels/AsyncCloseAndInterrupt.java rename to test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java rename to test/jdk/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/BadProperties.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/BadProperties.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousChannelGroup/BadProperties.java rename to test/jdk/java/nio/channels/AsynchronousChannelGroup/BadProperties.java diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Basic.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/Basic.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousChannelGroup/Basic.java rename to test/jdk/java/nio/channels/AsynchronousChannelGroup/Basic.java diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java rename to test/jdk/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Identity.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/Identity.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousChannelGroup/Identity.java rename to test/jdk/java/nio/channels/AsynchronousChannelGroup/Identity.java diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Restart.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/Restart.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousChannelGroup/Restart.java rename to test/jdk/java/nio/channels/AsynchronousChannelGroup/Restart.java diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/SetupJar.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/SetupJar.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousChannelGroup/SetupJar.java rename to test/jdk/java/nio/channels/AsynchronousChannelGroup/SetupJar.java diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/Unbounded.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java rename to test/jdk/java/nio/channels/AsynchronousChannelGroup/Unbounded.java diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/bootlib/Attack.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/bootlib/Attack.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousChannelGroup/bootlib/Attack.java rename to test/jdk/java/nio/channels/AsynchronousChannelGroup/bootlib/Attack.java diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/bootlib/PrivilegedThreadFactory.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/bootlib/PrivilegedThreadFactory.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousChannelGroup/bootlib/PrivilegedThreadFactory.java rename to test/jdk/java/nio/channels/AsynchronousChannelGroup/bootlib/PrivilegedThreadFactory.java diff --git a/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java b/test/jdk/java/nio/channels/AsynchronousFileChannel/Basic.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java rename to test/jdk/java/nio/channels/AsynchronousFileChannel/Basic.java diff --git a/jdk/test/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java b/test/jdk/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java rename to test/jdk/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java diff --git a/jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java b/test/jdk/java/nio/channels/AsynchronousFileChannel/Lock.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java rename to test/jdk/java/nio/channels/AsynchronousFileChannel/Lock.java diff --git a/jdk/test/java/nio/channels/AsynchronousFileChannel/LotsOfWrites.java b/test/jdk/java/nio/channels/AsynchronousFileChannel/LotsOfWrites.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousFileChannel/LotsOfWrites.java rename to test/jdk/java/nio/channels/AsynchronousFileChannel/LotsOfWrites.java diff --git a/jdk/test/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java b/test/jdk/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java rename to test/jdk/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java diff --git a/jdk/test/java/nio/channels/AsynchronousServerSocketChannel/Basic.java b/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/Basic.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousServerSocketChannel/Basic.java rename to test/jdk/java/nio/channels/AsynchronousServerSocketChannel/Basic.java diff --git a/jdk/test/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java b/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java rename to test/jdk/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java diff --git a/jdk/test/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow b/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow rename to test/jdk/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow diff --git a/jdk/test/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny b/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny rename to test/jdk/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny diff --git a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java b/test/jdk/java/nio/channels/AsynchronousSocketChannel/Basic.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java rename to test/jdk/java/nio/channels/AsynchronousSocketChannel/Basic.java diff --git a/jdk/test/java/nio/channels/AsynchronousSocketChannel/DieBeforeComplete.java b/test/jdk/java/nio/channels/AsynchronousSocketChannel/DieBeforeComplete.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousSocketChannel/DieBeforeComplete.java rename to test/jdk/java/nio/channels/AsynchronousSocketChannel/DieBeforeComplete.java diff --git a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Leaky.java b/test/jdk/java/nio/channels/AsynchronousSocketChannel/Leaky.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousSocketChannel/Leaky.java rename to test/jdk/java/nio/channels/AsynchronousSocketChannel/Leaky.java diff --git a/jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java b/test/jdk/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java similarity index 100% rename from jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java rename to test/jdk/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java diff --git a/jdk/test/java/nio/channels/Channels/Basic.java b/test/jdk/java/nio/channels/Channels/Basic.java similarity index 100% rename from jdk/test/java/nio/channels/Channels/Basic.java rename to test/jdk/java/nio/channels/Channels/Basic.java diff --git a/jdk/test/java/nio/channels/Channels/Basic2.java b/test/jdk/java/nio/channels/Channels/Basic2.java similarity index 100% rename from jdk/test/java/nio/channels/Channels/Basic2.java rename to test/jdk/java/nio/channels/Channels/Basic2.java diff --git a/jdk/test/java/nio/channels/Channels/ReadByte.java b/test/jdk/java/nio/channels/Channels/ReadByte.java similarity index 100% rename from jdk/test/java/nio/channels/Channels/ReadByte.java rename to test/jdk/java/nio/channels/Channels/ReadByte.java diff --git a/jdk/test/java/nio/channels/Channels/ReadOffset.java b/test/jdk/java/nio/channels/Channels/ReadOffset.java similarity index 100% rename from jdk/test/java/nio/channels/Channels/ReadOffset.java rename to test/jdk/java/nio/channels/Channels/ReadOffset.java diff --git a/jdk/test/java/nio/channels/Channels/ShortWrite.java b/test/jdk/java/nio/channels/Channels/ShortWrite.java similarity index 100% rename from jdk/test/java/nio/channels/Channels/ShortWrite.java rename to test/jdk/java/nio/channels/Channels/ShortWrite.java diff --git a/jdk/test/java/nio/channels/Channels/TinyBuffers.java b/test/jdk/java/nio/channels/Channels/TinyBuffers.java similarity index 100% rename from jdk/test/java/nio/channels/Channels/TinyBuffers.java rename to test/jdk/java/nio/channels/Channels/TinyBuffers.java diff --git a/jdk/test/java/nio/channels/Channels/Write.java b/test/jdk/java/nio/channels/Channels/Write.java similarity index 100% rename from jdk/test/java/nio/channels/Channels/Write.java rename to test/jdk/java/nio/channels/Channels/Write.java diff --git a/jdk/test/java/nio/channels/ConfigureBlocking.java b/test/jdk/java/nio/channels/ConfigureBlocking.java similarity index 100% rename from jdk/test/java/nio/channels/ConfigureBlocking.java rename to test/jdk/java/nio/channels/ConfigureBlocking.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java b/test/jdk/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java rename to test/jdk/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java b/test/jdk/java/nio/channels/DatagramChannel/BasicMulticastTests.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java rename to test/jdk/java/nio/channels/DatagramChannel/BasicMulticastTests.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/BindNull.java b/test/jdk/java/nio/channels/DatagramChannel/BindNull.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/BindNull.java rename to test/jdk/java/nio/channels/DatagramChannel/BindNull.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/ChangingAddress.java b/test/jdk/java/nio/channels/DatagramChannel/ChangingAddress.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/ChangingAddress.java rename to test/jdk/java/nio/channels/DatagramChannel/ChangingAddress.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/Connect.java b/test/jdk/java/nio/channels/DatagramChannel/Connect.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/Connect.java rename to test/jdk/java/nio/channels/DatagramChannel/Connect.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/ConnectedSend.java b/test/jdk/java/nio/channels/DatagramChannel/ConnectedSend.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/ConnectedSend.java rename to test/jdk/java/nio/channels/DatagramChannel/ConnectedSend.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/Disconnect.java b/test/jdk/java/nio/channels/DatagramChannel/Disconnect.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/Disconnect.java rename to test/jdk/java/nio/channels/DatagramChannel/Disconnect.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/EmptyBuffer.java b/test/jdk/java/nio/channels/DatagramChannel/EmptyBuffer.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/EmptyBuffer.java rename to test/jdk/java/nio/channels/DatagramChannel/EmptyBuffer.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/IsBound.java b/test/jdk/java/nio/channels/DatagramChannel/IsBound.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/IsBound.java rename to test/jdk/java/nio/channels/DatagramChannel/IsBound.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/IsConnected.java b/test/jdk/java/nio/channels/DatagramChannel/IsConnected.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/IsConnected.java rename to test/jdk/java/nio/channels/DatagramChannel/IsConnected.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java b/test/jdk/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java rename to test/jdk/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/NoSender.java b/test/jdk/java/nio/channels/DatagramChannel/NoSender.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/NoSender.java rename to test/jdk/java/nio/channels/DatagramChannel/NoSender.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/NotBound.java b/test/jdk/java/nio/channels/DatagramChannel/NotBound.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/NotBound.java rename to test/jdk/java/nio/channels/DatagramChannel/NotBound.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/Promiscuous.java b/test/jdk/java/nio/channels/DatagramChannel/Promiscuous.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/Promiscuous.java rename to test/jdk/java/nio/channels/DatagramChannel/Promiscuous.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/Receive.java b/test/jdk/java/nio/channels/DatagramChannel/Receive.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/Receive.java rename to test/jdk/java/nio/channels/DatagramChannel/Receive.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/ReceiveISA.java b/test/jdk/java/nio/channels/DatagramChannel/ReceiveISA.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/ReceiveISA.java rename to test/jdk/java/nio/channels/DatagramChannel/ReceiveISA.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/Refused.java b/test/jdk/java/nio/channels/DatagramChannel/Refused.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/Refused.java rename to test/jdk/java/nio/channels/DatagramChannel/Refused.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/SRTest.java b/test/jdk/java/nio/channels/DatagramChannel/SRTest.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/SRTest.java rename to test/jdk/java/nio/channels/DatagramChannel/SRTest.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/SelectWhenRefused.java b/test/jdk/java/nio/channels/DatagramChannel/SelectWhenRefused.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/SelectWhenRefused.java rename to test/jdk/java/nio/channels/DatagramChannel/SelectWhenRefused.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/SendToUnresolved.java b/test/jdk/java/nio/channels/DatagramChannel/SendToUnresolved.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/SendToUnresolved.java rename to test/jdk/java/nio/channels/DatagramChannel/SendToUnresolved.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/Sender.java b/test/jdk/java/nio/channels/DatagramChannel/Sender.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/Sender.java rename to test/jdk/java/nio/channels/DatagramChannel/Sender.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/SocketOptionTests.java b/test/jdk/java/nio/channels/DatagramChannel/SocketOptionTests.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/SocketOptionTests.java rename to test/jdk/java/nio/channels/DatagramChannel/SocketOptionTests.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/StressNativeSignal.java b/test/jdk/java/nio/channels/DatagramChannel/StressNativeSignal.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/StressNativeSignal.java rename to test/jdk/java/nio/channels/DatagramChannel/StressNativeSignal.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/ThereCanBeOnlyOne.java b/test/jdk/java/nio/channels/DatagramChannel/ThereCanBeOnlyOne.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/ThereCanBeOnlyOne.java rename to test/jdk/java/nio/channels/DatagramChannel/ThereCanBeOnlyOne.java diff --git a/jdk/test/java/nio/channels/DatagramChannel/UseDGWithIPv6.java b/test/jdk/java/nio/channels/DatagramChannel/UseDGWithIPv6.java similarity index 100% rename from jdk/test/java/nio/channels/DatagramChannel/UseDGWithIPv6.java rename to test/jdk/java/nio/channels/DatagramChannel/UseDGWithIPv6.java diff --git a/jdk/test/java/nio/channels/FileChannel/Args.java b/test/jdk/java/nio/channels/FileChannel/Args.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Args.java rename to test/jdk/java/nio/channels/FileChannel/Args.java diff --git a/jdk/test/java/nio/channels/FileChannel/AtomicAppend.java b/test/jdk/java/nio/channels/FileChannel/AtomicAppend.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/AtomicAppend.java rename to test/jdk/java/nio/channels/FileChannel/AtomicAppend.java diff --git a/jdk/test/java/nio/channels/FileChannel/BlockDeviceSize.java b/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/BlockDeviceSize.java rename to test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java diff --git a/jdk/test/java/nio/channels/FileChannel/ClosedByInterrupt.java b/test/jdk/java/nio/channels/FileChannel/ClosedByInterrupt.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/ClosedByInterrupt.java rename to test/jdk/java/nio/channels/FileChannel/ClosedByInterrupt.java diff --git a/jdk/test/java/nio/channels/FileChannel/ClosedChannelTransfer.java b/test/jdk/java/nio/channels/FileChannel/ClosedChannelTransfer.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/ClosedChannelTransfer.java rename to test/jdk/java/nio/channels/FileChannel/ClosedChannelTransfer.java diff --git a/jdk/test/java/nio/channels/FileChannel/ExpandingMap.java b/test/jdk/java/nio/channels/FileChannel/ExpandingMap.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/ExpandingMap.java rename to test/jdk/java/nio/channels/FileChannel/ExpandingMap.java diff --git a/jdk/test/java/nio/channels/FileChannel/FileExtensionAndMap.java b/test/jdk/java/nio/channels/FileChannel/FileExtensionAndMap.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/FileExtensionAndMap.java rename to test/jdk/java/nio/channels/FileChannel/FileExtensionAndMap.java diff --git a/jdk/test/java/nio/channels/FileChannel/Force.java b/test/jdk/java/nio/channels/FileChannel/Force.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Force.java rename to test/jdk/java/nio/channels/FileChannel/Force.java diff --git a/jdk/test/java/nio/channels/FileChannel/GetClosedChannel.java b/test/jdk/java/nio/channels/FileChannel/GetClosedChannel.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/GetClosedChannel.java rename to test/jdk/java/nio/channels/FileChannel/GetClosedChannel.java diff --git a/jdk/test/java/nio/channels/FileChannel/InterruptDeadlock.java b/test/jdk/java/nio/channels/FileChannel/InterruptDeadlock.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/InterruptDeadlock.java rename to test/jdk/java/nio/channels/FileChannel/InterruptDeadlock.java diff --git a/jdk/test/java/nio/channels/FileChannel/InterruptMapDeadlock.java b/test/jdk/java/nio/channels/FileChannel/InterruptMapDeadlock.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/InterruptMapDeadlock.java rename to test/jdk/java/nio/channels/FileChannel/InterruptMapDeadlock.java diff --git a/jdk/test/java/nio/channels/FileChannel/Lock.java b/test/jdk/java/nio/channels/FileChannel/Lock.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Lock.java rename to test/jdk/java/nio/channels/FileChannel/Lock.java diff --git a/jdk/test/java/nio/channels/FileChannel/LongTransferTest.java b/test/jdk/java/nio/channels/FileChannel/LongTransferTest.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/LongTransferTest.java rename to test/jdk/java/nio/channels/FileChannel/LongTransferTest.java diff --git a/jdk/test/java/nio/channels/FileChannel/LoopingTruncate.java b/test/jdk/java/nio/channels/FileChannel/LoopingTruncate.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/LoopingTruncate.java rename to test/jdk/java/nio/channels/FileChannel/LoopingTruncate.java diff --git a/jdk/test/java/nio/channels/FileChannel/MapAssertions.java b/test/jdk/java/nio/channels/FileChannel/MapAssertions.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/MapAssertions.java rename to test/jdk/java/nio/channels/FileChannel/MapAssertions.java diff --git a/jdk/test/java/nio/channels/FileChannel/MapOverEnd.java b/test/jdk/java/nio/channels/FileChannel/MapOverEnd.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/MapOverEnd.java rename to test/jdk/java/nio/channels/FileChannel/MapOverEnd.java diff --git a/jdk/test/java/nio/channels/FileChannel/MapReadOnly.java b/test/jdk/java/nio/channels/FileChannel/MapReadOnly.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/MapReadOnly.java rename to test/jdk/java/nio/channels/FileChannel/MapReadOnly.java diff --git a/jdk/test/java/nio/channels/FileChannel/MapTest.java b/test/jdk/java/nio/channels/FileChannel/MapTest.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/MapTest.java rename to test/jdk/java/nio/channels/FileChannel/MapTest.java diff --git a/jdk/test/java/nio/channels/FileChannel/Mode.java b/test/jdk/java/nio/channels/FileChannel/Mode.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Mode.java rename to test/jdk/java/nio/channels/FileChannel/Mode.java diff --git a/jdk/test/java/nio/channels/FileChannel/Position.java b/test/jdk/java/nio/channels/FileChannel/Position.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Position.java rename to test/jdk/java/nio/channels/FileChannel/Position.java diff --git a/jdk/test/java/nio/channels/FileChannel/Pread.java b/test/jdk/java/nio/channels/FileChannel/Pread.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Pread.java rename to test/jdk/java/nio/channels/FileChannel/Pread.java diff --git a/jdk/test/java/nio/channels/FileChannel/Pwrite.java b/test/jdk/java/nio/channels/FileChannel/Pwrite.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Pwrite.java rename to test/jdk/java/nio/channels/FileChannel/Pwrite.java diff --git a/jdk/test/java/nio/channels/FileChannel/Read.java b/test/jdk/java/nio/channels/FileChannel/Read.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Read.java rename to test/jdk/java/nio/channels/FileChannel/Read.java diff --git a/jdk/test/java/nio/channels/FileChannel/ReadFull.java b/test/jdk/java/nio/channels/FileChannel/ReadFull.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/ReadFull.java rename to test/jdk/java/nio/channels/FileChannel/ReadFull.java diff --git a/jdk/test/java/nio/channels/FileChannel/ReadToLimit.java b/test/jdk/java/nio/channels/FileChannel/ReadToLimit.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/ReadToLimit.java rename to test/jdk/java/nio/channels/FileChannel/ReadToLimit.java diff --git a/jdk/test/java/nio/channels/FileChannel/Release.java b/test/jdk/java/nio/channels/FileChannel/Release.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Release.java rename to test/jdk/java/nio/channels/FileChannel/Release.java diff --git a/jdk/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java b/test/jdk/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java rename to test/jdk/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java diff --git a/jdk/test/java/nio/channels/FileChannel/ScatteringRead.java b/test/jdk/java/nio/channels/FileChannel/ScatteringRead.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/ScatteringRead.java rename to test/jdk/java/nio/channels/FileChannel/ScatteringRead.java diff --git a/jdk/test/java/nio/channels/FileChannel/Size.java b/test/jdk/java/nio/channels/FileChannel/Size.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Size.java rename to test/jdk/java/nio/channels/FileChannel/Size.java diff --git a/jdk/test/java/nio/channels/FileChannel/Transfer.java b/test/jdk/java/nio/channels/FileChannel/Transfer.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Transfer.java rename to test/jdk/java/nio/channels/FileChannel/Transfer.java diff --git a/jdk/test/java/nio/channels/FileChannel/Transfer4GBFile.java b/test/jdk/java/nio/channels/FileChannel/Transfer4GBFile.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Transfer4GBFile.java rename to test/jdk/java/nio/channels/FileChannel/Transfer4GBFile.java diff --git a/jdk/test/java/nio/channels/FileChannel/TransferTo6GBFile.java b/test/jdk/java/nio/channels/FileChannel/TransferTo6GBFile.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/TransferTo6GBFile.java rename to test/jdk/java/nio/channels/FileChannel/TransferTo6GBFile.java diff --git a/jdk/test/java/nio/channels/FileChannel/TransferToChannel.java b/test/jdk/java/nio/channels/FileChannel/TransferToChannel.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/TransferToChannel.java rename to test/jdk/java/nio/channels/FileChannel/TransferToChannel.java diff --git a/jdk/test/java/nio/channels/FileChannel/TransferToNonWritable.java b/test/jdk/java/nio/channels/FileChannel/TransferToNonWritable.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/TransferToNonWritable.java rename to test/jdk/java/nio/channels/FileChannel/TransferToNonWritable.java diff --git a/jdk/test/java/nio/channels/FileChannel/Transfers.java b/test/jdk/java/nio/channels/FileChannel/Transfers.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Transfers.java rename to test/jdk/java/nio/channels/FileChannel/Transfers.java diff --git a/jdk/test/java/nio/channels/FileChannel/Truncate.java b/test/jdk/java/nio/channels/FileChannel/Truncate.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Truncate.java rename to test/jdk/java/nio/channels/FileChannel/Truncate.java diff --git a/jdk/test/java/nio/channels/FileChannel/TryLock.java b/test/jdk/java/nio/channels/FileChannel/TryLock.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/TryLock.java rename to test/jdk/java/nio/channels/FileChannel/TryLock.java diff --git a/jdk/test/java/nio/channels/FileChannel/Write.java b/test/jdk/java/nio/channels/FileChannel/Write.java similarity index 100% rename from jdk/test/java/nio/channels/FileChannel/Write.java rename to test/jdk/java/nio/channels/FileChannel/Write.java diff --git a/jdk/test/java/nio/channels/FileLock/FileLockConstructor.java b/test/jdk/java/nio/channels/FileLock/FileLockConstructor.java similarity index 100% rename from jdk/test/java/nio/channels/FileLock/FileLockConstructor.java rename to test/jdk/java/nio/channels/FileLock/FileLockConstructor.java diff --git a/jdk/test/java/nio/channels/Pipe/EmptyRead.java b/test/jdk/java/nio/channels/Pipe/EmptyRead.java similarity index 100% rename from jdk/test/java/nio/channels/Pipe/EmptyRead.java rename to test/jdk/java/nio/channels/Pipe/EmptyRead.java diff --git a/jdk/test/java/nio/channels/Pipe/NonBlocking.java b/test/jdk/java/nio/channels/Pipe/NonBlocking.java similarity index 100% rename from jdk/test/java/nio/channels/Pipe/NonBlocking.java rename to test/jdk/java/nio/channels/Pipe/NonBlocking.java diff --git a/jdk/test/java/nio/channels/Pipe/PipeChannel.java b/test/jdk/java/nio/channels/Pipe/PipeChannel.java similarity index 100% rename from jdk/test/java/nio/channels/Pipe/PipeChannel.java rename to test/jdk/java/nio/channels/Pipe/PipeChannel.java diff --git a/jdk/test/java/nio/channels/Pipe/PipeInterrupt.java b/test/jdk/java/nio/channels/Pipe/PipeInterrupt.java similarity index 100% rename from jdk/test/java/nio/channels/Pipe/PipeInterrupt.java rename to test/jdk/java/nio/channels/Pipe/PipeInterrupt.java diff --git a/jdk/test/java/nio/channels/Pipe/ScatteringRead.java b/test/jdk/java/nio/channels/Pipe/ScatteringRead.java similarity index 100% rename from jdk/test/java/nio/channels/Pipe/ScatteringRead.java rename to test/jdk/java/nio/channels/Pipe/ScatteringRead.java diff --git a/jdk/test/java/nio/channels/Pipe/SelectPipe.java b/test/jdk/java/nio/channels/Pipe/SelectPipe.java similarity index 100% rename from jdk/test/java/nio/channels/Pipe/SelectPipe.java rename to test/jdk/java/nio/channels/Pipe/SelectPipe.java diff --git a/jdk/test/java/nio/channels/SelectionKey/AtomicAttachTest.java b/test/jdk/java/nio/channels/SelectionKey/AtomicAttachTest.java similarity index 100% rename from jdk/test/java/nio/channels/SelectionKey/AtomicAttachTest.java rename to test/jdk/java/nio/channels/SelectionKey/AtomicAttachTest.java diff --git a/jdk/test/java/nio/channels/SelectionKey/RacyRegister.java b/test/jdk/java/nio/channels/SelectionKey/RacyRegister.java similarity index 100% rename from jdk/test/java/nio/channels/SelectionKey/RacyRegister.java rename to test/jdk/java/nio/channels/SelectionKey/RacyRegister.java diff --git a/jdk/test/java/nio/channels/Selector/Alias.java b/test/jdk/java/nio/channels/Selector/Alias.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/Alias.java rename to test/jdk/java/nio/channels/Selector/Alias.java diff --git a/jdk/test/java/nio/channels/Selector/BasicAccept.java b/test/jdk/java/nio/channels/Selector/BasicAccept.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/BasicAccept.java rename to test/jdk/java/nio/channels/Selector/BasicAccept.java diff --git a/jdk/test/java/nio/channels/Selector/BasicConnect.java b/test/jdk/java/nio/channels/Selector/BasicConnect.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/BasicConnect.java rename to test/jdk/java/nio/channels/Selector/BasicConnect.java diff --git a/jdk/test/java/nio/channels/Selector/ByteServer.java b/test/jdk/java/nio/channels/Selector/ByteServer.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/ByteServer.java rename to test/jdk/java/nio/channels/Selector/ByteServer.java diff --git a/jdk/test/java/nio/channels/Selector/ChangingInterests.java b/test/jdk/java/nio/channels/Selector/ChangingInterests.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/ChangingInterests.java rename to test/jdk/java/nio/channels/Selector/ChangingInterests.java diff --git a/jdk/test/java/nio/channels/Selector/CheckLocking.java b/test/jdk/java/nio/channels/Selector/CheckLocking.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/CheckLocking.java rename to test/jdk/java/nio/channels/Selector/CheckLocking.java diff --git a/jdk/test/java/nio/channels/Selector/Close.java b/test/jdk/java/nio/channels/Selector/Close.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/Close.java rename to test/jdk/java/nio/channels/Selector/Close.java diff --git a/jdk/test/java/nio/channels/Selector/CloseInvalidatesKeys.java b/test/jdk/java/nio/channels/Selector/CloseInvalidatesKeys.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/CloseInvalidatesKeys.java rename to test/jdk/java/nio/channels/Selector/CloseInvalidatesKeys.java diff --git a/jdk/test/java/nio/channels/Selector/CloseThenRegister.java b/test/jdk/java/nio/channels/Selector/CloseThenRegister.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/CloseThenRegister.java rename to test/jdk/java/nio/channels/Selector/CloseThenRegister.java diff --git a/jdk/test/java/nio/channels/Selector/CloseWhenKeyIdle.java b/test/jdk/java/nio/channels/Selector/CloseWhenKeyIdle.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/CloseWhenKeyIdle.java rename to test/jdk/java/nio/channels/Selector/CloseWhenKeyIdle.java diff --git a/jdk/test/java/nio/channels/Selector/Connect.java b/test/jdk/java/nio/channels/Selector/Connect.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/Connect.java rename to test/jdk/java/nio/channels/Selector/Connect.java diff --git a/jdk/test/java/nio/channels/Selector/ConnectWrite.java b/test/jdk/java/nio/channels/Selector/ConnectWrite.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/ConnectWrite.java rename to test/jdk/java/nio/channels/Selector/ConnectWrite.java diff --git a/jdk/test/java/nio/channels/Selector/HelperSlowToDie.java b/test/jdk/java/nio/channels/Selector/HelperSlowToDie.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/HelperSlowToDie.java rename to test/jdk/java/nio/channels/Selector/HelperSlowToDie.java diff --git a/jdk/test/java/nio/channels/Selector/KeySets.java b/test/jdk/java/nio/channels/Selector/KeySets.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/KeySets.java rename to test/jdk/java/nio/channels/Selector/KeySets.java diff --git a/jdk/test/java/nio/channels/Selector/KeysReady.java b/test/jdk/java/nio/channels/Selector/KeysReady.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/KeysReady.java rename to test/jdk/java/nio/channels/Selector/KeysReady.java diff --git a/jdk/test/java/nio/channels/Selector/LotsOfCancels.java b/test/jdk/java/nio/channels/Selector/LotsOfCancels.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/LotsOfCancels.java rename to test/jdk/java/nio/channels/Selector/LotsOfCancels.java diff --git a/jdk/test/java/nio/channels/Selector/LotsOfChannels.java b/test/jdk/java/nio/channels/Selector/LotsOfChannels.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/LotsOfChannels.java rename to test/jdk/java/nio/channels/Selector/LotsOfChannels.java diff --git a/jdk/test/java/nio/channels/Selector/LotsOfUpdates.java b/test/jdk/java/nio/channels/Selector/LotsOfUpdates.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/LotsOfUpdates.java rename to test/jdk/java/nio/channels/Selector/LotsOfUpdates.java diff --git a/jdk/test/java/nio/channels/Selector/LotsOfUpdatesTest.java b/test/jdk/java/nio/channels/Selector/LotsOfUpdatesTest.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/LotsOfUpdatesTest.java rename to test/jdk/java/nio/channels/Selector/LotsOfUpdatesTest.java diff --git a/jdk/test/java/nio/channels/Selector/OpRead.java b/test/jdk/java/nio/channels/Selector/OpRead.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/OpRead.java rename to test/jdk/java/nio/channels/Selector/OpRead.java diff --git a/jdk/test/java/nio/channels/Selector/OutOfBand.java b/test/jdk/java/nio/channels/Selector/OutOfBand.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/OutOfBand.java rename to test/jdk/java/nio/channels/Selector/OutOfBand.java diff --git a/jdk/test/java/nio/channels/Selector/RacyDeregister.java b/test/jdk/java/nio/channels/Selector/RacyDeregister.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/RacyDeregister.java rename to test/jdk/java/nio/channels/Selector/RacyDeregister.java diff --git a/jdk/test/java/nio/channels/Selector/ReadAfterConnect.java b/test/jdk/java/nio/channels/Selector/ReadAfterConnect.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/ReadAfterConnect.java rename to test/jdk/java/nio/channels/Selector/ReadAfterConnect.java diff --git a/jdk/test/java/nio/channels/Selector/RegAfterPreClose.java b/test/jdk/java/nio/channels/Selector/RegAfterPreClose.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/RegAfterPreClose.java rename to test/jdk/java/nio/channels/Selector/RegAfterPreClose.java diff --git a/jdk/test/java/nio/channels/Selector/SelectAfterRead.java b/test/jdk/java/nio/channels/Selector/SelectAfterRead.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/SelectAfterRead.java rename to test/jdk/java/nio/channels/Selector/SelectAfterRead.java diff --git a/jdk/test/java/nio/channels/Selector/SelectAndCancel.java b/test/jdk/java/nio/channels/Selector/SelectAndCancel.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/SelectAndCancel.java rename to test/jdk/java/nio/channels/Selector/SelectAndCancel.java diff --git a/jdk/test/java/nio/channels/Selector/SelectAndClose.java b/test/jdk/java/nio/channels/Selector/SelectAndClose.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/SelectAndClose.java rename to test/jdk/java/nio/channels/Selector/SelectAndClose.java diff --git a/jdk/test/java/nio/channels/Selector/SelectNowWhenEmpty.java b/test/jdk/java/nio/channels/Selector/SelectNowWhenEmpty.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/SelectNowWhenEmpty.java rename to test/jdk/java/nio/channels/Selector/SelectNowWhenEmpty.java diff --git a/jdk/test/java/nio/channels/Selector/SelectTimeout.java b/test/jdk/java/nio/channels/Selector/SelectTimeout.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/SelectTimeout.java rename to test/jdk/java/nio/channels/Selector/SelectTimeout.java diff --git a/jdk/test/java/nio/channels/Selector/SelectWrite.java b/test/jdk/java/nio/channels/Selector/SelectWrite.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/SelectWrite.java rename to test/jdk/java/nio/channels/Selector/SelectWrite.java diff --git a/jdk/test/java/nio/channels/Selector/SelectorLimit.java b/test/jdk/java/nio/channels/Selector/SelectorLimit.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/SelectorLimit.java rename to test/jdk/java/nio/channels/Selector/SelectorLimit.java diff --git a/jdk/test/java/nio/channels/Selector/SelectorTest.java b/test/jdk/java/nio/channels/Selector/SelectorTest.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/SelectorTest.java rename to test/jdk/java/nio/channels/Selector/SelectorTest.java diff --git a/jdk/test/java/nio/channels/Selector/TemporarySelector.java b/test/jdk/java/nio/channels/Selector/TemporarySelector.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/TemporarySelector.java rename to test/jdk/java/nio/channels/Selector/TemporarySelector.java diff --git a/jdk/test/java/nio/channels/Selector/Wakeup.java b/test/jdk/java/nio/channels/Selector/Wakeup.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/Wakeup.java rename to test/jdk/java/nio/channels/Selector/Wakeup.java diff --git a/jdk/test/java/nio/channels/Selector/WakeupAfterClose.java b/test/jdk/java/nio/channels/Selector/WakeupAfterClose.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/WakeupAfterClose.java rename to test/jdk/java/nio/channels/Selector/WakeupAfterClose.java diff --git a/jdk/test/java/nio/channels/Selector/WakeupEmpty.java b/test/jdk/java/nio/channels/Selector/WakeupEmpty.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/WakeupEmpty.java rename to test/jdk/java/nio/channels/Selector/WakeupEmpty.java diff --git a/jdk/test/java/nio/channels/Selector/WakeupNow.java b/test/jdk/java/nio/channels/Selector/WakeupNow.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/WakeupNow.java rename to test/jdk/java/nio/channels/Selector/WakeupNow.java diff --git a/jdk/test/java/nio/channels/Selector/WakeupOverflow.java b/test/jdk/java/nio/channels/Selector/WakeupOverflow.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/WakeupOverflow.java rename to test/jdk/java/nio/channels/Selector/WakeupOverflow.java diff --git a/jdk/test/java/nio/channels/Selector/WakeupSpeed.java b/test/jdk/java/nio/channels/Selector/WakeupSpeed.java similarity index 100% rename from jdk/test/java/nio/channels/Selector/WakeupSpeed.java rename to test/jdk/java/nio/channels/Selector/WakeupSpeed.java diff --git a/jdk/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java b/test/jdk/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java similarity index 100% rename from jdk/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java rename to test/jdk/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java diff --git a/jdk/test/java/nio/channels/ServerSocketChannel/Basic.java b/test/jdk/java/nio/channels/ServerSocketChannel/Basic.java similarity index 100% rename from jdk/test/java/nio/channels/ServerSocketChannel/Basic.java rename to test/jdk/java/nio/channels/ServerSocketChannel/Basic.java diff --git a/jdk/test/java/nio/channels/ServerSocketChannel/NonBlockingAccept.java b/test/jdk/java/nio/channels/ServerSocketChannel/NonBlockingAccept.java similarity index 100% rename from jdk/test/java/nio/channels/ServerSocketChannel/NonBlockingAccept.java rename to test/jdk/java/nio/channels/ServerSocketChannel/NonBlockingAccept.java diff --git a/jdk/test/java/nio/channels/ServerSocketChannel/Open.java b/test/jdk/java/nio/channels/ServerSocketChannel/Open.java similarity index 100% rename from jdk/test/java/nio/channels/ServerSocketChannel/Open.java rename to test/jdk/java/nio/channels/ServerSocketChannel/Open.java diff --git a/jdk/test/java/nio/channels/ServerSocketChannel/SocketOptionTests.java b/test/jdk/java/nio/channels/ServerSocketChannel/SocketOptionTests.java similarity index 100% rename from jdk/test/java/nio/channels/ServerSocketChannel/SocketOptionTests.java rename to test/jdk/java/nio/channels/ServerSocketChannel/SocketOptionTests.java diff --git a/jdk/test/java/nio/channels/SocketChannel/AdaptSocket.java b/test/jdk/java/nio/channels/SocketChannel/AdaptSocket.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/AdaptSocket.java rename to test/jdk/java/nio/channels/SocketChannel/AdaptSocket.java diff --git a/jdk/test/java/nio/channels/SocketChannel/AsyncCloseChannel.java b/test/jdk/java/nio/channels/SocketChannel/AsyncCloseChannel.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/AsyncCloseChannel.java rename to test/jdk/java/nio/channels/SocketChannel/AsyncCloseChannel.java diff --git a/jdk/test/java/nio/channels/SocketChannel/Basic.java b/test/jdk/java/nio/channels/SocketChannel/Basic.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/Basic.java rename to test/jdk/java/nio/channels/SocketChannel/Basic.java diff --git a/jdk/test/java/nio/channels/SocketChannel/BigReadWrite.java b/test/jdk/java/nio/channels/SocketChannel/BigReadWrite.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/BigReadWrite.java rename to test/jdk/java/nio/channels/SocketChannel/BigReadWrite.java diff --git a/jdk/test/java/nio/channels/SocketChannel/Bind.java b/test/jdk/java/nio/channels/SocketChannel/Bind.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/Bind.java rename to test/jdk/java/nio/channels/SocketChannel/Bind.java diff --git a/jdk/test/java/nio/channels/SocketChannel/BufferSize.java b/test/jdk/java/nio/channels/SocketChannel/BufferSize.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/BufferSize.java rename to test/jdk/java/nio/channels/SocketChannel/BufferSize.java diff --git a/jdk/test/java/nio/channels/SocketChannel/Close.java b/test/jdk/java/nio/channels/SocketChannel/Close.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/Close.java rename to test/jdk/java/nio/channels/SocketChannel/Close.java diff --git a/jdk/test/java/nio/channels/SocketChannel/CloseAfterConnect.java b/test/jdk/java/nio/channels/SocketChannel/CloseAfterConnect.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/CloseAfterConnect.java rename to test/jdk/java/nio/channels/SocketChannel/CloseAfterConnect.java diff --git a/jdk/test/java/nio/channels/SocketChannel/CloseDuringWrite.java b/test/jdk/java/nio/channels/SocketChannel/CloseDuringWrite.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/CloseDuringWrite.java rename to test/jdk/java/nio/channels/SocketChannel/CloseDuringWrite.java diff --git a/jdk/test/java/nio/channels/SocketChannel/CloseRegisteredChannel.java b/test/jdk/java/nio/channels/SocketChannel/CloseRegisteredChannel.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/CloseRegisteredChannel.java rename to test/jdk/java/nio/channels/SocketChannel/CloseRegisteredChannel.java diff --git a/jdk/test/java/nio/channels/SocketChannel/CloseTimeoutChannel.java b/test/jdk/java/nio/channels/SocketChannel/CloseTimeoutChannel.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/CloseTimeoutChannel.java rename to test/jdk/java/nio/channels/SocketChannel/CloseTimeoutChannel.java diff --git a/jdk/test/java/nio/channels/SocketChannel/Connect.java b/test/jdk/java/nio/channels/SocketChannel/Connect.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/Connect.java rename to test/jdk/java/nio/channels/SocketChannel/Connect.java diff --git a/jdk/test/java/nio/channels/SocketChannel/ConnectState.java b/test/jdk/java/nio/channels/SocketChannel/ConnectState.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/ConnectState.java rename to test/jdk/java/nio/channels/SocketChannel/ConnectState.java diff --git a/jdk/test/java/nio/channels/SocketChannel/ExceptionTranslation.java b/test/jdk/java/nio/channels/SocketChannel/ExceptionTranslation.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/ExceptionTranslation.java rename to test/jdk/java/nio/channels/SocketChannel/ExceptionTranslation.java diff --git a/jdk/test/java/nio/channels/SocketChannel/FinishConnect.java b/test/jdk/java/nio/channels/SocketChannel/FinishConnect.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/FinishConnect.java rename to test/jdk/java/nio/channels/SocketChannel/FinishConnect.java diff --git a/jdk/test/java/nio/channels/SocketChannel/GetChannel.java b/test/jdk/java/nio/channels/SocketChannel/GetChannel.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/GetChannel.java rename to test/jdk/java/nio/channels/SocketChannel/GetChannel.java diff --git a/jdk/test/java/nio/channels/SocketChannel/Hangup.java b/test/jdk/java/nio/channels/SocketChannel/Hangup.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/Hangup.java rename to test/jdk/java/nio/channels/SocketChannel/Hangup.java diff --git a/jdk/test/java/nio/channels/SocketChannel/IsConnectable.java b/test/jdk/java/nio/channels/SocketChannel/IsConnectable.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/IsConnectable.java rename to test/jdk/java/nio/channels/SocketChannel/IsConnectable.java diff --git a/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java b/test/jdk/java/nio/channels/SocketChannel/LocalAddress.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/LocalAddress.java rename to test/jdk/java/nio/channels/SocketChannel/LocalAddress.java diff --git a/jdk/test/java/nio/channels/SocketChannel/Open.java b/test/jdk/java/nio/channels/SocketChannel/Open.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/Open.java rename to test/jdk/java/nio/channels/SocketChannel/Open.java diff --git a/jdk/test/java/nio/channels/SocketChannel/OpenLeak.java b/test/jdk/java/nio/channels/SocketChannel/OpenLeak.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/OpenLeak.java rename to test/jdk/java/nio/channels/SocketChannel/OpenLeak.java diff --git a/jdk/test/java/nio/channels/SocketChannel/OpenSocketChannelTest.java b/test/jdk/java/nio/channels/SocketChannel/OpenSocketChannelTest.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/OpenSocketChannelTest.java rename to test/jdk/java/nio/channels/SocketChannel/OpenSocketChannelTest.java diff --git a/jdk/test/java/nio/channels/SocketChannel/OutOfBand.java b/test/jdk/java/nio/channels/SocketChannel/OutOfBand.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/OutOfBand.java rename to test/jdk/java/nio/channels/SocketChannel/OutOfBand.java diff --git a/jdk/test/java/nio/channels/SocketChannel/SendUrgentData.java b/test/jdk/java/nio/channels/SocketChannel/SendUrgentData.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/SendUrgentData.java rename to test/jdk/java/nio/channels/SocketChannel/SendUrgentData.java diff --git a/jdk/test/java/nio/channels/SocketChannel/ShortWrite.java b/test/jdk/java/nio/channels/SocketChannel/ShortWrite.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/ShortWrite.java rename to test/jdk/java/nio/channels/SocketChannel/ShortWrite.java diff --git a/jdk/test/java/nio/channels/SocketChannel/Shutdown.java b/test/jdk/java/nio/channels/SocketChannel/Shutdown.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/Shutdown.java rename to test/jdk/java/nio/channels/SocketChannel/Shutdown.java diff --git a/jdk/test/java/nio/channels/SocketChannel/SocketInheritance.java b/test/jdk/java/nio/channels/SocketChannel/SocketInheritance.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/SocketInheritance.java rename to test/jdk/java/nio/channels/SocketChannel/SocketInheritance.java diff --git a/jdk/test/java/nio/channels/SocketChannel/SocketOptionTests.java b/test/jdk/java/nio/channels/SocketChannel/SocketOptionTests.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/SocketOptionTests.java rename to test/jdk/java/nio/channels/SocketChannel/SocketOptionTests.java diff --git a/jdk/test/java/nio/channels/SocketChannel/Stream.java b/test/jdk/java/nio/channels/SocketChannel/Stream.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/Stream.java rename to test/jdk/java/nio/channels/SocketChannel/Stream.java diff --git a/jdk/test/java/nio/channels/SocketChannel/Trivial.java b/test/jdk/java/nio/channels/SocketChannel/Trivial.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/Trivial.java rename to test/jdk/java/nio/channels/SocketChannel/Trivial.java diff --git a/jdk/test/java/nio/channels/SocketChannel/UnboundSocketTests.java b/test/jdk/java/nio/channels/SocketChannel/UnboundSocketTests.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/UnboundSocketTests.java rename to test/jdk/java/nio/channels/SocketChannel/UnboundSocketTests.java diff --git a/jdk/test/java/nio/channels/SocketChannel/VectorIO.java b/test/jdk/java/nio/channels/SocketChannel/VectorIO.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/VectorIO.java rename to test/jdk/java/nio/channels/SocketChannel/VectorIO.java diff --git a/jdk/test/java/nio/channels/SocketChannel/VectorParams.java b/test/jdk/java/nio/channels/SocketChannel/VectorParams.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/VectorParams.java rename to test/jdk/java/nio/channels/SocketChannel/VectorParams.java diff --git a/jdk/test/java/nio/channels/SocketChannel/Write.java b/test/jdk/java/nio/channels/SocketChannel/Write.java similarity index 100% rename from jdk/test/java/nio/channels/SocketChannel/Write.java rename to test/jdk/java/nio/channels/SocketChannel/Write.java diff --git a/jdk/test/java/nio/channels/TestServers.java b/test/jdk/java/nio/channels/TestServers.java similarity index 100% rename from jdk/test/java/nio/channels/TestServers.java rename to test/jdk/java/nio/channels/TestServers.java diff --git a/jdk/test/java/nio/channels/TestThread.java b/test/jdk/java/nio/channels/TestThread.java similarity index 100% rename from jdk/test/java/nio/channels/TestThread.java rename to test/jdk/java/nio/channels/TestThread.java diff --git a/jdk/test/java/nio/channels/TestUtil.java b/test/jdk/java/nio/channels/TestUtil.java similarity index 100% rename from jdk/test/java/nio/channels/TestUtil.java rename to test/jdk/java/nio/channels/TestUtil.java diff --git a/jdk/test/java/nio/channels/etc/AdaptorCloseAndInterrupt.java b/test/jdk/java/nio/channels/etc/AdaptorCloseAndInterrupt.java similarity index 100% rename from jdk/test/java/nio/channels/etc/AdaptorCloseAndInterrupt.java rename to test/jdk/java/nio/channels/etc/AdaptorCloseAndInterrupt.java diff --git a/jdk/test/java/nio/channels/etc/NetworkChannelTests.java b/test/jdk/java/nio/channels/etc/NetworkChannelTests.java similarity index 100% rename from jdk/test/java/nio/channels/etc/NetworkChannelTests.java rename to test/jdk/java/nio/channels/etc/NetworkChannelTests.java diff --git a/jdk/test/java/nio/channels/etc/Shadow.java b/test/jdk/java/nio/channels/etc/Shadow.java similarity index 100% rename from jdk/test/java/nio/channels/etc/Shadow.java rename to test/jdk/java/nio/channels/etc/Shadow.java diff --git a/jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java b/test/jdk/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java similarity index 100% rename from jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java rename to test/jdk/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java diff --git a/jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider b/test/jdk/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider similarity index 100% rename from jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider rename to test/jdk/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider diff --git a/jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java b/test/jdk/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java similarity index 100% rename from jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java rename to test/jdk/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java diff --git a/jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java b/test/jdk/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java similarity index 100% rename from jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java rename to test/jdk/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/CloseTest.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/CloseTest.java similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/CloseTest.java rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/CloseTest.java diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/ClosedStreams.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/ClosedStreams.java similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/ClosedStreams.java rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/ClosedStreams.java diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoService.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoService.java similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoService.java rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoService.java diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoTest.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoTest.java similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoTest.java rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoTest.java diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/NullTest.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/NullTest.java similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/NullTest.java rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/NullTest.java diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/README b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/README similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/README rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/README diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTest.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTest.java similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTest.java rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTest.java diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Util.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Util.java similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Util.java rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Util.java diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.fail b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.fail similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.fail rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.fail diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.pass b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.pass similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.pass rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.pass diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so diff --git a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so similarity index 100% rename from jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so rename to test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so diff --git a/jdk/test/java/nio/charset/Charset/AvailableCharsetNames.java b/test/jdk/java/nio/charset/Charset/AvailableCharsetNames.java similarity index 100% rename from jdk/test/java/nio/charset/Charset/AvailableCharsetNames.java rename to test/jdk/java/nio/charset/Charset/AvailableCharsetNames.java diff --git a/jdk/test/java/nio/charset/Charset/CharsetContainmentTest.java b/test/jdk/java/nio/charset/Charset/CharsetContainmentTest.java similarity index 100% rename from jdk/test/java/nio/charset/Charset/CharsetContainmentTest.java rename to test/jdk/java/nio/charset/Charset/CharsetContainmentTest.java diff --git a/jdk/test/java/nio/charset/Charset/Contains.java b/test/jdk/java/nio/charset/Charset/Contains.java similarity index 100% rename from jdk/test/java/nio/charset/Charset/Contains.java rename to test/jdk/java/nio/charset/Charset/Contains.java diff --git a/jdk/test/java/nio/charset/Charset/Default.java b/test/jdk/java/nio/charset/Charset/Default.java similarity index 100% rename from jdk/test/java/nio/charset/Charset/Default.java rename to test/jdk/java/nio/charset/Charset/Default.java diff --git a/jdk/test/java/nio/charset/Charset/DefaultCharsetTest.java b/test/jdk/java/nio/charset/Charset/DefaultCharsetTest.java similarity index 100% rename from jdk/test/java/nio/charset/Charset/DefaultCharsetTest.java rename to test/jdk/java/nio/charset/Charset/DefaultCharsetTest.java diff --git a/jdk/test/java/nio/charset/Charset/EmptyCharsetName.java b/test/jdk/java/nio/charset/Charset/EmptyCharsetName.java similarity index 100% rename from jdk/test/java/nio/charset/Charset/EmptyCharsetName.java rename to test/jdk/java/nio/charset/Charset/EmptyCharsetName.java diff --git a/jdk/test/java/nio/charset/Charset/EncDec.java b/test/jdk/java/nio/charset/Charset/EncDec.java similarity index 100% rename from jdk/test/java/nio/charset/Charset/EncDec.java rename to test/jdk/java/nio/charset/Charset/EncDec.java diff --git a/jdk/test/java/nio/charset/Charset/IllegalCharsetName.java b/test/jdk/java/nio/charset/Charset/IllegalCharsetName.java similarity index 100% rename from jdk/test/java/nio/charset/Charset/IllegalCharsetName.java rename to test/jdk/java/nio/charset/Charset/IllegalCharsetName.java diff --git a/jdk/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java b/test/jdk/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java similarity index 100% rename from jdk/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java rename to test/jdk/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java diff --git a/jdk/test/java/nio/charset/Charset/NullCharsetName.java b/test/jdk/java/nio/charset/Charset/NullCharsetName.java similarity index 100% rename from jdk/test/java/nio/charset/Charset/NullCharsetName.java rename to test/jdk/java/nio/charset/Charset/NullCharsetName.java diff --git a/jdk/test/java/nio/charset/Charset/RegisteredCharsets.java b/test/jdk/java/nio/charset/Charset/RegisteredCharsets.java similarity index 100% rename from jdk/test/java/nio/charset/Charset/RegisteredCharsets.java rename to test/jdk/java/nio/charset/Charset/RegisteredCharsets.java diff --git a/jdk/test/java/nio/charset/CharsetDecoder/AverageMax.java b/test/jdk/java/nio/charset/CharsetDecoder/AverageMax.java similarity index 100% rename from jdk/test/java/nio/charset/CharsetDecoder/AverageMax.java rename to test/jdk/java/nio/charset/CharsetDecoder/AverageMax.java diff --git a/jdk/test/java/nio/charset/CharsetDecoder/EmptyInput.java b/test/jdk/java/nio/charset/CharsetDecoder/EmptyInput.java similarity index 100% rename from jdk/test/java/nio/charset/CharsetDecoder/EmptyInput.java rename to test/jdk/java/nio/charset/CharsetDecoder/EmptyInput.java diff --git a/jdk/test/java/nio/charset/CharsetEncoder/CanEncode.java b/test/jdk/java/nio/charset/CharsetEncoder/CanEncode.java similarity index 100% rename from jdk/test/java/nio/charset/CharsetEncoder/CanEncode.java rename to test/jdk/java/nio/charset/CharsetEncoder/CanEncode.java diff --git a/jdk/test/java/nio/charset/CharsetEncoder/Flush.java b/test/jdk/java/nio/charset/CharsetEncoder/Flush.java similarity index 100% rename from jdk/test/java/nio/charset/CharsetEncoder/Flush.java rename to test/jdk/java/nio/charset/CharsetEncoder/Flush.java diff --git a/jdk/test/java/nio/charset/RemovingSunIO/SunioAlias.java b/test/jdk/java/nio/charset/RemovingSunIO/SunioAlias.java similarity index 100% rename from jdk/test/java/nio/charset/RemovingSunIO/SunioAlias.java rename to test/jdk/java/nio/charset/RemovingSunIO/SunioAlias.java diff --git a/jdk/test/java/nio/charset/RemovingSunIO/TestCOMP.java b/test/jdk/java/nio/charset/RemovingSunIO/TestCOMP.java similarity index 100% rename from jdk/test/java/nio/charset/RemovingSunIO/TestCOMP.java rename to test/jdk/java/nio/charset/RemovingSunIO/TestCOMP.java diff --git a/jdk/test/java/nio/charset/RemovingSunIO/TestUnmappableForLength.java b/test/jdk/java/nio/charset/RemovingSunIO/TestUnmappableForLength.java similarity index 100% rename from jdk/test/java/nio/charset/RemovingSunIO/TestUnmappableForLength.java rename to test/jdk/java/nio/charset/RemovingSunIO/TestUnmappableForLength.java diff --git a/jdk/test/java/nio/charset/StandardCharsets/Standard.java b/test/jdk/java/nio/charset/StandardCharsets/Standard.java similarity index 100% rename from jdk/test/java/nio/charset/StandardCharsets/Standard.java rename to test/jdk/java/nio/charset/StandardCharsets/Standard.java diff --git a/jdk/test/java/nio/charset/coders/BashCache.java b/test/jdk/java/nio/charset/coders/BashCache.java similarity index 100% rename from jdk/test/java/nio/charset/coders/BashCache.java rename to test/jdk/java/nio/charset/coders/BashCache.java diff --git a/jdk/test/java/nio/charset/coders/BashStreams.java b/test/jdk/java/nio/charset/coders/BashStreams.java similarity index 100% rename from jdk/test/java/nio/charset/coders/BashStreams.java rename to test/jdk/java/nio/charset/coders/BashStreams.java diff --git a/jdk/test/java/nio/charset/coders/Check.java b/test/jdk/java/nio/charset/coders/Check.java similarity index 100% rename from jdk/test/java/nio/charset/coders/Check.java rename to test/jdk/java/nio/charset/coders/Check.java diff --git a/jdk/test/java/nio/charset/coders/Errors.java b/test/jdk/java/nio/charset/coders/Errors.java similarity index 100% rename from jdk/test/java/nio/charset/coders/Errors.java rename to test/jdk/java/nio/charset/coders/Errors.java diff --git a/jdk/test/java/nio/charset/coders/FullRead.java b/test/jdk/java/nio/charset/coders/FullRead.java similarity index 100% rename from jdk/test/java/nio/charset/coders/FullRead.java rename to test/jdk/java/nio/charset/coders/FullRead.java diff --git a/jdk/test/java/nio/charset/coders/IOCoders.java b/test/jdk/java/nio/charset/coders/IOCoders.java similarity index 100% rename from jdk/test/java/nio/charset/coders/IOCoders.java rename to test/jdk/java/nio/charset/coders/IOCoders.java diff --git a/jdk/test/java/nio/charset/coders/IsLegalReplacement.java b/test/jdk/java/nio/charset/coders/IsLegalReplacement.java similarity index 100% rename from jdk/test/java/nio/charset/coders/IsLegalReplacement.java rename to test/jdk/java/nio/charset/coders/IsLegalReplacement.java diff --git a/jdk/test/java/nio/charset/coders/ResetISO2022JP.java b/test/jdk/java/nio/charset/coders/ResetISO2022JP.java similarity index 100% rename from jdk/test/java/nio/charset/coders/ResetISO2022JP.java rename to test/jdk/java/nio/charset/coders/ResetISO2022JP.java diff --git a/jdk/test/java/nio/charset/coders/SJISMappingPropTest.java b/test/jdk/java/nio/charset/coders/SJISMappingPropTest.java similarity index 100% rename from jdk/test/java/nio/charset/coders/SJISMappingPropTest.java rename to test/jdk/java/nio/charset/coders/SJISMappingPropTest.java diff --git a/jdk/test/java/nio/charset/coders/SJISPropTest.java b/test/jdk/java/nio/charset/coders/SJISPropTest.java similarity index 100% rename from jdk/test/java/nio/charset/coders/SJISPropTest.java rename to test/jdk/java/nio/charset/coders/SJISPropTest.java diff --git a/jdk/test/java/nio/charset/coders/StreamTimeout.java b/test/jdk/java/nio/charset/coders/StreamTimeout.java similarity index 100% rename from jdk/test/java/nio/charset/coders/StreamTimeout.java rename to test/jdk/java/nio/charset/coders/StreamTimeout.java diff --git a/jdk/test/java/nio/charset/coders/Surrogates.java b/test/jdk/java/nio/charset/coders/Surrogates.java similarity index 100% rename from jdk/test/java/nio/charset/coders/Surrogates.java rename to test/jdk/java/nio/charset/coders/Surrogates.java diff --git a/jdk/test/java/nio/charset/coders/Util.java b/test/jdk/java/nio/charset/coders/Util.java similarity index 100% rename from jdk/test/java/nio/charset/coders/Util.java rename to test/jdk/java/nio/charset/coders/Util.java diff --git a/jdk/test/java/nio/charset/coders/ref.shift_jis b/test/jdk/java/nio/charset/coders/ref.shift_jis similarity index 100% rename from jdk/test/java/nio/charset/coders/ref.shift_jis rename to test/jdk/java/nio/charset/coders/ref.shift_jis diff --git a/jdk/test/java/nio/charset/coders/ref.windows-31j b/test/jdk/java/nio/charset/coders/ref.windows-31j similarity index 100% rename from jdk/test/java/nio/charset/coders/ref.windows-31j rename to test/jdk/java/nio/charset/coders/ref.windows-31j diff --git a/jdk/test/java/nio/charset/spi/CharsetProviderBasicTest.java b/test/jdk/java/nio/charset/spi/CharsetProviderBasicTest.java similarity index 100% rename from jdk/test/java/nio/charset/spi/CharsetProviderBasicTest.java rename to test/jdk/java/nio/charset/spi/CharsetProviderBasicTest.java diff --git a/jdk/test/java/nio/charset/spi/CharsetTest.java b/test/jdk/java/nio/charset/spi/CharsetTest.java similarity index 100% rename from jdk/test/java/nio/charset/spi/CharsetTest.java rename to test/jdk/java/nio/charset/spi/CharsetTest.java diff --git a/jdk/test/java/nio/charset/spi/FooCharset.java b/test/jdk/java/nio/charset/spi/FooCharset.java similarity index 100% rename from jdk/test/java/nio/charset/spi/FooCharset.java rename to test/jdk/java/nio/charset/spi/FooCharset.java diff --git a/jdk/test/java/nio/charset/spi/FooProvider.java b/test/jdk/java/nio/charset/spi/FooProvider.java similarity index 100% rename from jdk/test/java/nio/charset/spi/FooProvider.java rename to test/jdk/java/nio/charset/spi/FooProvider.java diff --git a/jdk/test/java/nio/charset/spi/SetupJar.java b/test/jdk/java/nio/charset/spi/SetupJar.java similarity index 100% rename from jdk/test/java/nio/charset/spi/SetupJar.java rename to test/jdk/java/nio/charset/spi/SetupJar.java diff --git a/jdk/test/java/nio/charset/spi/charsetProvider.sp b/test/jdk/java/nio/charset/spi/charsetProvider.sp similarity index 100% rename from jdk/test/java/nio/charset/spi/charsetProvider.sp rename to test/jdk/java/nio/charset/spi/charsetProvider.sp diff --git a/jdk/test/java/nio/charset/spi/default-pol b/test/jdk/java/nio/charset/spi/default-pol similarity index 100% rename from jdk/test/java/nio/charset/spi/default-pol rename to test/jdk/java/nio/charset/spi/default-pol diff --git a/jdk/test/java/nio/file/DirectoryStream/Basic.java b/test/jdk/java/nio/file/DirectoryStream/Basic.java similarity index 100% rename from jdk/test/java/nio/file/DirectoryStream/Basic.java rename to test/jdk/java/nio/file/DirectoryStream/Basic.java diff --git a/jdk/test/java/nio/file/DirectoryStream/DriveLetter.java b/test/jdk/java/nio/file/DirectoryStream/DriveLetter.java similarity index 100% rename from jdk/test/java/nio/file/DirectoryStream/DriveLetter.java rename to test/jdk/java/nio/file/DirectoryStream/DriveLetter.java diff --git a/jdk/test/java/nio/file/DirectoryStream/SecureDS.java b/test/jdk/java/nio/file/DirectoryStream/SecureDS.java similarity index 100% rename from jdk/test/java/nio/file/DirectoryStream/SecureDS.java rename to test/jdk/java/nio/file/DirectoryStream/SecureDS.java diff --git a/jdk/test/java/nio/file/FileStore/Basic.java b/test/jdk/java/nio/file/FileStore/Basic.java similarity index 100% rename from jdk/test/java/nio/file/FileStore/Basic.java rename to test/jdk/java/nio/file/FileStore/Basic.java diff --git a/jdk/test/java/nio/file/FileSystem/Basic.java b/test/jdk/java/nio/file/FileSystem/Basic.java similarity index 100% rename from jdk/test/java/nio/file/FileSystem/Basic.java rename to test/jdk/java/nio/file/FileSystem/Basic.java diff --git a/jdk/test/java/nio/file/Files/BytesAndLines.java b/test/jdk/java/nio/file/Files/BytesAndLines.java similarity index 100% rename from jdk/test/java/nio/file/Files/BytesAndLines.java rename to test/jdk/java/nio/file/Files/BytesAndLines.java diff --git a/jdk/test/java/nio/file/Files/CheckPermissions.java b/test/jdk/java/nio/file/Files/CheckPermissions.java similarity index 100% rename from jdk/test/java/nio/file/Files/CheckPermissions.java rename to test/jdk/java/nio/file/Files/CheckPermissions.java diff --git a/jdk/test/java/nio/file/Files/CopyAndMove.java b/test/jdk/java/nio/file/Files/CopyAndMove.java similarity index 100% rename from jdk/test/java/nio/file/Files/CopyAndMove.java rename to test/jdk/java/nio/file/Files/CopyAndMove.java diff --git a/jdk/test/java/nio/file/Files/CustomOptions.java b/test/jdk/java/nio/file/Files/CustomOptions.java similarity index 100% rename from jdk/test/java/nio/file/Files/CustomOptions.java rename to test/jdk/java/nio/file/Files/CustomOptions.java diff --git a/jdk/test/java/nio/file/Files/DeleteOnClose.java b/test/jdk/java/nio/file/Files/DeleteOnClose.java similarity index 100% rename from jdk/test/java/nio/file/Files/DeleteOnClose.java rename to test/jdk/java/nio/file/Files/DeleteOnClose.java diff --git a/jdk/test/java/nio/file/Files/FaultyFileSystem.java b/test/jdk/java/nio/file/Files/FaultyFileSystem.java similarity index 100% rename from jdk/test/java/nio/file/Files/FaultyFileSystem.java rename to test/jdk/java/nio/file/Files/FaultyFileSystem.java diff --git a/jdk/test/java/nio/file/Files/FileAttributes.java b/test/jdk/java/nio/file/Files/FileAttributes.java similarity index 100% rename from jdk/test/java/nio/file/Files/FileAttributes.java rename to test/jdk/java/nio/file/Files/FileAttributes.java diff --git a/jdk/test/java/nio/file/Files/InterruptCopy.java b/test/jdk/java/nio/file/Files/InterruptCopy.java similarity index 100% rename from jdk/test/java/nio/file/Files/InterruptCopy.java rename to test/jdk/java/nio/file/Files/InterruptCopy.java diff --git a/jdk/test/java/nio/file/Files/Links.java b/test/jdk/java/nio/file/Files/Links.java similarity index 100% rename from jdk/test/java/nio/file/Files/Links.java rename to test/jdk/java/nio/file/Files/Links.java diff --git a/jdk/test/java/nio/file/Files/Misc.java b/test/jdk/java/nio/file/Files/Misc.java similarity index 100% rename from jdk/test/java/nio/file/Files/Misc.java rename to test/jdk/java/nio/file/Files/Misc.java diff --git a/jdk/test/java/nio/file/Files/NameLimits.java b/test/jdk/java/nio/file/Files/NameLimits.java similarity index 100% rename from jdk/test/java/nio/file/Files/NameLimits.java rename to test/jdk/java/nio/file/Files/NameLimits.java diff --git a/jdk/test/java/nio/file/Files/PassThroughFileSystem.java b/test/jdk/java/nio/file/Files/PassThroughFileSystem.java similarity index 100% rename from jdk/test/java/nio/file/Files/PassThroughFileSystem.java rename to test/jdk/java/nio/file/Files/PassThroughFileSystem.java diff --git a/jdk/test/java/nio/file/Files/SBC.java b/test/jdk/java/nio/file/Files/SBC.java similarity index 100% rename from jdk/test/java/nio/file/Files/SBC.java rename to test/jdk/java/nio/file/Files/SBC.java diff --git a/jdk/test/java/nio/file/Files/SetLastModifiedTime.java b/test/jdk/java/nio/file/Files/SetLastModifiedTime.java similarity index 100% rename from jdk/test/java/nio/file/Files/SetLastModifiedTime.java rename to test/jdk/java/nio/file/Files/SetLastModifiedTime.java diff --git a/jdk/test/java/nio/file/Files/StreamLinesTest.java b/test/jdk/java/nio/file/Files/StreamLinesTest.java similarity index 100% rename from jdk/test/java/nio/file/Files/StreamLinesTest.java rename to test/jdk/java/nio/file/Files/StreamLinesTest.java diff --git a/jdk/test/java/nio/file/Files/StreamTest.java b/test/jdk/java/nio/file/Files/StreamTest.java similarity index 100% rename from jdk/test/java/nio/file/Files/StreamTest.java rename to test/jdk/java/nio/file/Files/StreamTest.java diff --git a/jdk/test/java/nio/file/Files/TemporaryFiles.java b/test/jdk/java/nio/file/Files/TemporaryFiles.java similarity index 100% rename from jdk/test/java/nio/file/Files/TemporaryFiles.java rename to test/jdk/java/nio/file/Files/TemporaryFiles.java diff --git a/jdk/test/java/nio/file/Files/probeContentType/Basic.java b/test/jdk/java/nio/file/Files/probeContentType/Basic.java similarity index 100% rename from jdk/test/java/nio/file/Files/probeContentType/Basic.java rename to test/jdk/java/nio/file/Files/probeContentType/Basic.java diff --git a/jdk/test/java/nio/file/Files/probeContentType/ForceLoad.java b/test/jdk/java/nio/file/Files/probeContentType/ForceLoad.java similarity index 100% rename from jdk/test/java/nio/file/Files/probeContentType/ForceLoad.java rename to test/jdk/java/nio/file/Files/probeContentType/ForceLoad.java diff --git a/jdk/test/java/nio/file/Files/probeContentType/META-INF/services/java.nio.file.spi.FileTypeDetector b/test/jdk/java/nio/file/Files/probeContentType/META-INF/services/java.nio.file.spi.FileTypeDetector similarity index 100% rename from jdk/test/java/nio/file/Files/probeContentType/META-INF/services/java.nio.file.spi.FileTypeDetector rename to test/jdk/java/nio/file/Files/probeContentType/META-INF/services/java.nio.file.spi.FileTypeDetector diff --git a/jdk/test/java/nio/file/Files/probeContentType/ParallelProbes.java b/test/jdk/java/nio/file/Files/probeContentType/ParallelProbes.java similarity index 100% rename from jdk/test/java/nio/file/Files/probeContentType/ParallelProbes.java rename to test/jdk/java/nio/file/Files/probeContentType/ParallelProbes.java diff --git a/jdk/test/java/nio/file/Files/probeContentType/SimpleFileTypeDetector.java b/test/jdk/java/nio/file/Files/probeContentType/SimpleFileTypeDetector.java similarity index 100% rename from jdk/test/java/nio/file/Files/probeContentType/SimpleFileTypeDetector.java rename to test/jdk/java/nio/file/Files/probeContentType/SimpleFileTypeDetector.java diff --git a/jdk/test/java/nio/file/Files/walkFileTree/CreateFileTree.java b/test/jdk/java/nio/file/Files/walkFileTree/CreateFileTree.java similarity index 100% rename from jdk/test/java/nio/file/Files/walkFileTree/CreateFileTree.java rename to test/jdk/java/nio/file/Files/walkFileTree/CreateFileTree.java diff --git a/jdk/test/java/nio/file/Files/walkFileTree/FindTest.java b/test/jdk/java/nio/file/Files/walkFileTree/FindTest.java similarity index 100% rename from jdk/test/java/nio/file/Files/walkFileTree/FindTest.java rename to test/jdk/java/nio/file/Files/walkFileTree/FindTest.java diff --git a/jdk/test/java/nio/file/Files/walkFileTree/MaxDepth.java b/test/jdk/java/nio/file/Files/walkFileTree/MaxDepth.java similarity index 100% rename from jdk/test/java/nio/file/Files/walkFileTree/MaxDepth.java rename to test/jdk/java/nio/file/Files/walkFileTree/MaxDepth.java diff --git a/jdk/test/java/nio/file/Files/walkFileTree/Nulls.java b/test/jdk/java/nio/file/Files/walkFileTree/Nulls.java similarity index 100% rename from jdk/test/java/nio/file/Files/walkFileTree/Nulls.java rename to test/jdk/java/nio/file/Files/walkFileTree/Nulls.java diff --git a/jdk/test/java/nio/file/Files/walkFileTree/SkipSiblings.java b/test/jdk/java/nio/file/Files/walkFileTree/SkipSiblings.java similarity index 100% rename from jdk/test/java/nio/file/Files/walkFileTree/SkipSiblings.java rename to test/jdk/java/nio/file/Files/walkFileTree/SkipSiblings.java diff --git a/jdk/test/java/nio/file/Files/walkFileTree/SkipSubtree.java b/test/jdk/java/nio/file/Files/walkFileTree/SkipSubtree.java similarity index 100% rename from jdk/test/java/nio/file/Files/walkFileTree/SkipSubtree.java rename to test/jdk/java/nio/file/Files/walkFileTree/SkipSubtree.java diff --git a/jdk/test/java/nio/file/Files/walkFileTree/TerminateWalk.java b/test/jdk/java/nio/file/Files/walkFileTree/TerminateWalk.java similarity index 100% rename from jdk/test/java/nio/file/Files/walkFileTree/TerminateWalk.java rename to test/jdk/java/nio/file/Files/walkFileTree/TerminateWalk.java diff --git a/jdk/test/java/nio/file/Files/walkFileTree/WalkWithSecurity.java b/test/jdk/java/nio/file/Files/walkFileTree/WalkWithSecurity.java similarity index 100% rename from jdk/test/java/nio/file/Files/walkFileTree/WalkWithSecurity.java rename to test/jdk/java/nio/file/Files/walkFileTree/WalkWithSecurity.java diff --git a/jdk/test/java/nio/file/Files/walkFileTree/denyAll.policy b/test/jdk/java/nio/file/Files/walkFileTree/denyAll.policy similarity index 100% rename from jdk/test/java/nio/file/Files/walkFileTree/denyAll.policy rename to test/jdk/java/nio/file/Files/walkFileTree/denyAll.policy diff --git a/jdk/test/java/nio/file/Files/walkFileTree/grantAll.policy b/test/jdk/java/nio/file/Files/walkFileTree/grantAll.policy similarity index 100% rename from jdk/test/java/nio/file/Files/walkFileTree/grantAll.policy rename to test/jdk/java/nio/file/Files/walkFileTree/grantAll.policy diff --git a/jdk/test/java/nio/file/Files/walkFileTree/grantTopOnly.policy b/test/jdk/java/nio/file/Files/walkFileTree/grantTopOnly.policy similarity index 100% rename from jdk/test/java/nio/file/Files/walkFileTree/grantTopOnly.policy rename to test/jdk/java/nio/file/Files/walkFileTree/grantTopOnly.policy diff --git a/jdk/test/java/nio/file/Path/MacPath.java b/test/jdk/java/nio/file/Path/MacPath.java similarity index 100% rename from jdk/test/java/nio/file/Path/MacPath.java rename to test/jdk/java/nio/file/Path/MacPath.java diff --git a/jdk/test/java/nio/file/Path/MacPathTest.java b/test/jdk/java/nio/file/Path/MacPathTest.java similarity index 100% rename from jdk/test/java/nio/file/Path/MacPathTest.java rename to test/jdk/java/nio/file/Path/MacPathTest.java diff --git a/jdk/test/java/nio/file/Path/Misc.java b/test/jdk/java/nio/file/Path/Misc.java similarity index 100% rename from jdk/test/java/nio/file/Path/Misc.java rename to test/jdk/java/nio/file/Path/Misc.java diff --git a/jdk/test/java/nio/file/Path/PathOps.java b/test/jdk/java/nio/file/Path/PathOps.java similarity index 100% rename from jdk/test/java/nio/file/Path/PathOps.java rename to test/jdk/java/nio/file/Path/PathOps.java diff --git a/jdk/test/java/nio/file/Path/UriImportExport.java b/test/jdk/java/nio/file/Path/UriImportExport.java similarity index 100% rename from jdk/test/java/nio/file/Path/UriImportExport.java rename to test/jdk/java/nio/file/Path/UriImportExport.java diff --git a/jdk/test/java/nio/file/PathMatcher/Basic.java b/test/jdk/java/nio/file/PathMatcher/Basic.java similarity index 100% rename from jdk/test/java/nio/file/PathMatcher/Basic.java rename to test/jdk/java/nio/file/PathMatcher/Basic.java diff --git a/jdk/test/java/nio/file/TestUtil.java b/test/jdk/java/nio/file/TestUtil.java similarity index 100% rename from jdk/test/java/nio/file/TestUtil.java rename to test/jdk/java/nio/file/TestUtil.java diff --git a/jdk/test/java/nio/file/WatchService/Basic.java b/test/jdk/java/nio/file/WatchService/Basic.java similarity index 100% rename from jdk/test/java/nio/file/WatchService/Basic.java rename to test/jdk/java/nio/file/WatchService/Basic.java diff --git a/jdk/test/java/nio/file/WatchService/DeleteInterference.java b/test/jdk/java/nio/file/WatchService/DeleteInterference.java similarity index 100% rename from jdk/test/java/nio/file/WatchService/DeleteInterference.java rename to test/jdk/java/nio/file/WatchService/DeleteInterference.java diff --git a/jdk/test/java/nio/file/WatchService/FileTreeModifier.java b/test/jdk/java/nio/file/WatchService/FileTreeModifier.java similarity index 100% rename from jdk/test/java/nio/file/WatchService/FileTreeModifier.java rename to test/jdk/java/nio/file/WatchService/FileTreeModifier.java diff --git a/jdk/test/java/nio/file/WatchService/LotsOfCancels.java b/test/jdk/java/nio/file/WatchService/LotsOfCancels.java similarity index 100% rename from jdk/test/java/nio/file/WatchService/LotsOfCancels.java rename to test/jdk/java/nio/file/WatchService/LotsOfCancels.java diff --git a/jdk/test/java/nio/file/WatchService/LotsOfCloses.java b/test/jdk/java/nio/file/WatchService/LotsOfCloses.java similarity index 100% rename from jdk/test/java/nio/file/WatchService/LotsOfCloses.java rename to test/jdk/java/nio/file/WatchService/LotsOfCloses.java diff --git a/jdk/test/java/nio/file/WatchService/LotsOfEvents.java b/test/jdk/java/nio/file/WatchService/LotsOfEvents.java similarity index 100% rename from jdk/test/java/nio/file/WatchService/LotsOfEvents.java rename to test/jdk/java/nio/file/WatchService/LotsOfEvents.java diff --git a/jdk/test/java/nio/file/WatchService/MayFlies.java b/test/jdk/java/nio/file/WatchService/MayFlies.java similarity index 100% rename from jdk/test/java/nio/file/WatchService/MayFlies.java rename to test/jdk/java/nio/file/WatchService/MayFlies.java diff --git a/jdk/test/java/nio/file/WatchService/SensitivityModifier.java b/test/jdk/java/nio/file/WatchService/SensitivityModifier.java similarity index 100% rename from jdk/test/java/nio/file/WatchService/SensitivityModifier.java rename to test/jdk/java/nio/file/WatchService/SensitivityModifier.java diff --git a/jdk/test/java/nio/file/WatchService/UpdateInterference.java b/test/jdk/java/nio/file/WatchService/UpdateInterference.java similarity index 100% rename from jdk/test/java/nio/file/WatchService/UpdateInterference.java rename to test/jdk/java/nio/file/WatchService/UpdateInterference.java diff --git a/jdk/test/java/nio/file/WatchService/WithSecurityManager.java b/test/jdk/java/nio/file/WatchService/WithSecurityManager.java similarity index 100% rename from jdk/test/java/nio/file/WatchService/WithSecurityManager.java rename to test/jdk/java/nio/file/WatchService/WithSecurityManager.java diff --git a/jdk/test/java/nio/file/WatchService/denyAll.policy b/test/jdk/java/nio/file/WatchService/denyAll.policy similarity index 100% rename from jdk/test/java/nio/file/WatchService/denyAll.policy rename to test/jdk/java/nio/file/WatchService/denyAll.policy diff --git a/jdk/test/java/nio/file/WatchService/grantDirAndOneLevel.policy b/test/jdk/java/nio/file/WatchService/grantDirAndOneLevel.policy similarity index 100% rename from jdk/test/java/nio/file/WatchService/grantDirAndOneLevel.policy rename to test/jdk/java/nio/file/WatchService/grantDirAndOneLevel.policy diff --git a/jdk/test/java/nio/file/WatchService/grantDirAndTree.policy b/test/jdk/java/nio/file/WatchService/grantDirAndTree.policy similarity index 100% rename from jdk/test/java/nio/file/WatchService/grantDirAndTree.policy rename to test/jdk/java/nio/file/WatchService/grantDirAndTree.policy diff --git a/jdk/test/java/nio/file/WatchService/grantDirOnly.policy b/test/jdk/java/nio/file/WatchService/grantDirOnly.policy similarity index 100% rename from jdk/test/java/nio/file/WatchService/grantDirOnly.policy rename to test/jdk/java/nio/file/WatchService/grantDirOnly.policy diff --git a/jdk/test/java/nio/file/attribute/AclEntry/EmptySet.java b/test/jdk/java/nio/file/attribute/AclEntry/EmptySet.java similarity index 100% rename from jdk/test/java/nio/file/attribute/AclEntry/EmptySet.java rename to test/jdk/java/nio/file/attribute/AclEntry/EmptySet.java diff --git a/jdk/test/java/nio/file/attribute/AclFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/AclFileAttributeView/Basic.java similarity index 100% rename from jdk/test/java/nio/file/attribute/AclFileAttributeView/Basic.java rename to test/jdk/java/nio/file/attribute/AclFileAttributeView/Basic.java diff --git a/jdk/test/java/nio/file/attribute/BasicFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/BasicFileAttributeView/Basic.java similarity index 100% rename from jdk/test/java/nio/file/attribute/BasicFileAttributeView/Basic.java rename to test/jdk/java/nio/file/attribute/BasicFileAttributeView/Basic.java diff --git a/jdk/test/java/nio/file/attribute/BasicFileAttributeView/CreationTime.java b/test/jdk/java/nio/file/attribute/BasicFileAttributeView/CreationTime.java similarity index 100% rename from jdk/test/java/nio/file/attribute/BasicFileAttributeView/CreationTime.java rename to test/jdk/java/nio/file/attribute/BasicFileAttributeView/CreationTime.java diff --git a/jdk/test/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java b/test/jdk/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java similarity index 100% rename from jdk/test/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java rename to test/jdk/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java diff --git a/jdk/test/java/nio/file/attribute/DosFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/DosFileAttributeView/Basic.java similarity index 100% rename from jdk/test/java/nio/file/attribute/DosFileAttributeView/Basic.java rename to test/jdk/java/nio/file/attribute/DosFileAttributeView/Basic.java diff --git a/jdk/test/java/nio/file/attribute/FileTime/Basic.java b/test/jdk/java/nio/file/attribute/FileTime/Basic.java similarity index 100% rename from jdk/test/java/nio/file/attribute/FileTime/Basic.java rename to test/jdk/java/nio/file/attribute/FileTime/Basic.java diff --git a/jdk/test/java/nio/file/attribute/PosixFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/PosixFileAttributeView/Basic.java similarity index 100% rename from jdk/test/java/nio/file/attribute/PosixFileAttributeView/Basic.java rename to test/jdk/java/nio/file/attribute/PosixFileAttributeView/Basic.java diff --git a/jdk/test/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java similarity index 100% rename from jdk/test/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java rename to test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java diff --git a/jdk/test/java/nio/file/etc/Exceptions.java b/test/jdk/java/nio/file/etc/Exceptions.java similarity index 100% rename from jdk/test/java/nio/file/etc/Exceptions.java rename to test/jdk/java/nio/file/etc/Exceptions.java diff --git a/jdk/test/java/nio/file/spi/SetDefaultProvider.java b/test/jdk/java/nio/file/spi/SetDefaultProvider.java similarity index 100% rename from jdk/test/java/nio/file/spi/SetDefaultProvider.java rename to test/jdk/java/nio/file/spi/SetDefaultProvider.java diff --git a/jdk/test/java/nio/file/spi/TestProvider.java b/test/jdk/java/nio/file/spi/TestProvider.java similarity index 100% rename from jdk/test/java/nio/file/spi/TestProvider.java rename to test/jdk/java/nio/file/spi/TestProvider.java diff --git a/jdk/test/java/nio/file/spi/m/module-info.java b/test/jdk/java/nio/file/spi/m/module-info.java similarity index 100% rename from jdk/test/java/nio/file/spi/m/module-info.java rename to test/jdk/java/nio/file/spi/m/module-info.java diff --git a/jdk/test/java/nio/file/spi/m/p/Main.java b/test/jdk/java/nio/file/spi/m/p/Main.java similarity index 100% rename from jdk/test/java/nio/file/spi/m/p/Main.java rename to test/jdk/java/nio/file/spi/m/p/Main.java diff --git a/jdk/test/java/rmi/MarshalledObject/MOFilterTest.java b/test/jdk/java/rmi/MarshalledObject/MOFilterTest.java similarity index 100% rename from jdk/test/java/rmi/MarshalledObject/MOFilterTest.java rename to test/jdk/java/rmi/MarshalledObject/MOFilterTest.java diff --git a/jdk/test/java/rmi/MarshalledObject/compare/Compare.java b/test/jdk/java/rmi/MarshalledObject/compare/Compare.java similarity index 100% rename from jdk/test/java/rmi/MarshalledObject/compare/Compare.java rename to test/jdk/java/rmi/MarshalledObject/compare/Compare.java diff --git a/jdk/test/java/rmi/MarshalledObject/compare/HashCode.java b/test/jdk/java/rmi/MarshalledObject/compare/HashCode.java similarity index 100% rename from jdk/test/java/rmi/MarshalledObject/compare/HashCode.java rename to test/jdk/java/rmi/MarshalledObject/compare/HashCode.java diff --git a/jdk/test/java/rmi/MarshalledObject/compare/NullReference.java b/test/jdk/java/rmi/MarshalledObject/compare/NullReference.java similarity index 100% rename from jdk/test/java/rmi/MarshalledObject/compare/NullReference.java rename to test/jdk/java/rmi/MarshalledObject/compare/NullReference.java diff --git a/jdk/test/java/rmi/MarshalledObject/compare/annotatedRef b/test/jdk/java/rmi/MarshalledObject/compare/annotatedRef similarity index 100% rename from jdk/test/java/rmi/MarshalledObject/compare/annotatedRef rename to test/jdk/java/rmi/MarshalledObject/compare/annotatedRef diff --git a/jdk/test/java/rmi/MarshalledObject/compare/makeAnnotatedRef b/test/jdk/java/rmi/MarshalledObject/compare/makeAnnotatedRef similarity index 100% rename from jdk/test/java/rmi/MarshalledObject/compare/makeAnnotatedRef rename to test/jdk/java/rmi/MarshalledObject/compare/makeAnnotatedRef diff --git a/jdk/test/java/rmi/Naming/DefaultRegistryPort.java b/test/jdk/java/rmi/Naming/DefaultRegistryPort.java similarity index 100% rename from jdk/test/java/rmi/Naming/DefaultRegistryPort.java rename to test/jdk/java/rmi/Naming/DefaultRegistryPort.java diff --git a/jdk/test/java/rmi/Naming/LookupIPv6.java b/test/jdk/java/rmi/Naming/LookupIPv6.java similarity index 100% rename from jdk/test/java/rmi/Naming/LookupIPv6.java rename to test/jdk/java/rmi/Naming/LookupIPv6.java diff --git a/jdk/test/java/rmi/Naming/LookupNameWithColon.java b/test/jdk/java/rmi/Naming/LookupNameWithColon.java similarity index 100% rename from jdk/test/java/rmi/Naming/LookupNameWithColon.java rename to test/jdk/java/rmi/Naming/LookupNameWithColon.java diff --git a/jdk/test/java/rmi/Naming/RmiIsNoScheme.java b/test/jdk/java/rmi/Naming/RmiIsNoScheme.java similarity index 100% rename from jdk/test/java/rmi/Naming/RmiIsNoScheme.java rename to test/jdk/java/rmi/Naming/RmiIsNoScheme.java diff --git a/jdk/test/java/rmi/Naming/UnderscoreHost.java b/test/jdk/java/rmi/Naming/UnderscoreHost.java similarity index 100% rename from jdk/test/java/rmi/Naming/UnderscoreHost.java rename to test/jdk/java/rmi/Naming/UnderscoreHost.java diff --git a/jdk/test/java/rmi/Naming/UnderscoreHost_Stub.java b/test/jdk/java/rmi/Naming/UnderscoreHost_Stub.java similarity index 100% rename from jdk/test/java/rmi/Naming/UnderscoreHost_Stub.java rename to test/jdk/java/rmi/Naming/UnderscoreHost_Stub.java diff --git a/jdk/test/java/rmi/Naming/legalRegistryNames/Legal.java b/test/jdk/java/rmi/Naming/legalRegistryNames/Legal.java similarity index 100% rename from jdk/test/java/rmi/Naming/legalRegistryNames/Legal.java rename to test/jdk/java/rmi/Naming/legalRegistryNames/Legal.java diff --git a/jdk/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java b/test/jdk/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java similarity index 100% rename from jdk/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java rename to test/jdk/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java diff --git a/jdk/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames_Stub.java b/test/jdk/java/rmi/Naming/legalRegistryNames/LegalRegistryNames_Stub.java similarity index 100% rename from jdk/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames_Stub.java rename to test/jdk/java/rmi/Naming/legalRegistryNames/LegalRegistryNames_Stub.java diff --git a/jdk/test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java b/test/jdk/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java similarity index 100% rename from jdk/test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java rename to test/jdk/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java diff --git a/jdk/test/java/rmi/RemoteException/chaining/Chaining.java b/test/jdk/java/rmi/RemoteException/chaining/Chaining.java similarity index 100% rename from jdk/test/java/rmi/RemoteException/chaining/Chaining.java rename to test/jdk/java/rmi/RemoteException/chaining/Chaining.java diff --git a/jdk/test/java/rmi/TEST.properties b/test/jdk/java/rmi/TEST.properties similarity index 100% rename from jdk/test/java/rmi/TEST.properties rename to test/jdk/java/rmi/TEST.properties diff --git a/jdk/test/java/rmi/activation/Activatable/checkActivateRef/ActivateMe.java b/test/jdk/java/rmi/activation/Activatable/checkActivateRef/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkActivateRef/ActivateMe.java rename to test/jdk/java/rmi/activation/Activatable/checkActivateRef/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java b/test/jdk/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java rename to test/jdk/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef_Stub.java b/test/jdk/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef_Stub.java rename to test/jdk/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkActivateRef/group.security.policy b/test/jdk/java/rmi/activation/Activatable/checkActivateRef/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkActivateRef/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/checkActivateRef/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/checkActivateRef/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/checkActivateRef/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkActivateRef/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/checkActivateRef/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/checkActivateRef/security.policy b/test/jdk/java/rmi/activation/Activatable/checkActivateRef/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkActivateRef/security.policy rename to test/jdk/java/rmi/activation/Activatable/checkActivateRef/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java b/test/jdk/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java rename to test/jdk/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations_Stub.java b/test/jdk/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations_Stub.java rename to test/jdk/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkAnnotations/MyRMI.java b/test/jdk/java/rmi/activation/Activatable/checkAnnotations/MyRMI.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkAnnotations/MyRMI.java rename to test/jdk/java/rmi/activation/Activatable/checkAnnotations/MyRMI.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkAnnotations/group.security.policy b/test/jdk/java/rmi/activation/Activatable/checkAnnotations/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkAnnotations/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/checkAnnotations/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/checkAnnotations/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/checkAnnotations/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkAnnotations/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/checkAnnotations/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/checkAnnotations/security.policy b/test/jdk/java/rmi/activation/Activatable/checkAnnotations/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkAnnotations/security.policy rename to test/jdk/java/rmi/activation/Activatable/checkAnnotations/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl.java b/test/jdk/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl.java rename to test/jdk/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl_Stub.java b/test/jdk/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl_Stub.java rename to test/jdk/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java b/test/jdk/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java rename to test/jdk/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/MyRMI.java b/test/jdk/java/rmi/activation/Activatable/checkImplClassLoader/MyRMI.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/MyRMI.java rename to test/jdk/java/rmi/activation/Activatable/checkImplClassLoader/MyRMI.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/checkImplClassLoader/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/checkImplClassLoader/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy b/test/jdk/java/rmi/activation/Activatable/checkImplClassLoader/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy rename to test/jdk/java/rmi/activation/Activatable/checkImplClassLoader/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/ActivateMe.java b/test/jdk/java/rmi/activation/Activatable/checkRegisterInLog/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/ActivateMe.java rename to test/jdk/java/rmi/activation/Activatable/checkRegisterInLog/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java b/test/jdk/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java rename to test/jdk/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog_Stub.java b/test/jdk/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog_Stub.java rename to test/jdk/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/group.security.policy b/test/jdk/java/rmi/activation/Activatable/checkRegisterInLog/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/checkRegisterInLog/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/checkRegisterInLog/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/checkRegisterInLog/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy b/test/jdk/java/rmi/activation/Activatable/checkRegisterInLog/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy rename to test/jdk/java/rmi/activation/Activatable/checkRegisterInLog/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/ActivateMe.java b/test/jdk/java/rmi/activation/Activatable/createPrivateActivable/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/createPrivateActivable/ActivateMe.java rename to test/jdk/java/rmi/activation/Activatable/createPrivateActivable/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java b/test/jdk/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java rename to test/jdk/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java diff --git a/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy b/test/jdk/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/createPrivateActivable/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/createPrivateActivable/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/createPrivateActivable/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/security.policy b/test/jdk/java/rmi/activation/Activatable/createPrivateActivable/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/createPrivateActivable/security.policy rename to test/jdk/java/rmi/activation/Activatable/createPrivateActivable/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/Bar.java b/test/jdk/java/rmi/activation/Activatable/downloadParameterClass/Bar.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/downloadParameterClass/Bar.java rename to test/jdk/java/rmi/activation/Activatable/downloadParameterClass/Bar.java diff --git a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java b/test/jdk/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java rename to test/jdk/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java diff --git a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/Foo.java b/test/jdk/java/rmi/activation/Activatable/downloadParameterClass/Foo.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/downloadParameterClass/Foo.java rename to test/jdk/java/rmi/activation/Activatable/downloadParameterClass/Foo.java diff --git a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl.java b/test/jdk/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl.java rename to test/jdk/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl.java diff --git a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl_Stub.java b/test/jdk/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl_Stub.java rename to test/jdk/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy b/test/jdk/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/manual.security.policy b/test/jdk/java/rmi/activation/Activatable/downloadParameterClass/manual.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/downloadParameterClass/manual.security.policy rename to test/jdk/java/rmi/activation/Activatable/downloadParameterClass/manual.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/downloadParameterClass/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/downloadParameterClass/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/downloadParameterClass/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy b/test/jdk/java/rmi/activation/Activatable/downloadParameterClass/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy rename to test/jdk/java/rmi/activation/Activatable/downloadParameterClass/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ActivateMe.java b/test/jdk/java/rmi/activation/Activatable/elucidateNoSuchMethod/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ActivateMe.java rename to test/jdk/java/rmi/activation/Activatable/elucidateNoSuchMethod/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java b/test/jdk/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java rename to test/jdk/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java diff --git a/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod_Stub.java b/test/jdk/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod_Stub.java rename to test/jdk/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy b/test/jdk/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/elucidateNoSuchMethod/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/elucidateNoSuchMethod/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy b/test/jdk/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy rename to test/jdk/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/CheckLoader.java b/test/jdk/java/rmi/activation/Activatable/extLoadedImpl/CheckLoader.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/extLoadedImpl/CheckLoader.java rename to test/jdk/java/rmi/activation/Activatable/extLoadedImpl/CheckLoader.java diff --git a/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl.java b/test/jdk/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl.java rename to test/jdk/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl.java diff --git a/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java b/test/jdk/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java rename to test/jdk/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java diff --git a/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl_Stub.java b/test/jdk/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl_Stub.java rename to test/jdk/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh b/test/jdk/java/rmi/activation/Activatable/extLoadedImpl/ext.sh similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh rename to test/jdk/java/rmi/activation/Activatable/extLoadedImpl/ext.sh diff --git a/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/group.security.policy b/test/jdk/java/rmi/activation/Activatable/extLoadedImpl/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/extLoadedImpl/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/extLoadedImpl/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/extLoadedImpl/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/extLoadedImpl/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/extLoadedImpl/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy b/test/jdk/java/rmi/activation/Activatable/extLoadedImpl/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy rename to test/jdk/java/rmi/activation/Activatable/extLoadedImpl/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ActivateMe.java b/test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ActivateMe.java rename to test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java b/test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java rename to test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java diff --git a/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Skel.java b/test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Skel.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Skel.java rename to test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Skel.java diff --git a/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Stub.java b/test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Stub.java rename to test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy b/test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy b/test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy rename to test/jdk/java/rmi/activation/Activatable/forceLogSnapshot/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/inactiveGroup/ActivateMe.java b/test/jdk/java/rmi/activation/Activatable/inactiveGroup/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/inactiveGroup/ActivateMe.java rename to test/jdk/java/rmi/activation/Activatable/inactiveGroup/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java b/test/jdk/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java rename to test/jdk/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java diff --git a/jdk/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup_Stub.java b/test/jdk/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup_Stub.java rename to test/jdk/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/inactiveGroup/group.security.policy b/test/jdk/java/rmi/activation/Activatable/inactiveGroup/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/inactiveGroup/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/inactiveGroup/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/inactiveGroup/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/inactiveGroup/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/inactiveGroup/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/inactiveGroup/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/inactiveGroup/security.policy b/test/jdk/java/rmi/activation/Activatable/inactiveGroup/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/inactiveGroup/security.policy rename to test/jdk/java/rmi/activation/Activatable/inactiveGroup/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java b/test/jdk/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java rename to test/jdk/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java diff --git a/jdk/test/java/rmi/activation/Activatable/lookupActivationSystem/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/lookupActivationSystem/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/lookupActivationSystem/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/lookupActivationSystem/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/nestedActivate/ActivateMe.java b/test/jdk/java/rmi/activation/Activatable/nestedActivate/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/nestedActivate/ActivateMe.java rename to test/jdk/java/rmi/activation/Activatable/nestedActivate/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java b/test/jdk/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java rename to test/jdk/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java diff --git a/jdk/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate_Stub.java b/test/jdk/java/rmi/activation/Activatable/nestedActivate/NestedActivate_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate_Stub.java rename to test/jdk/java/rmi/activation/Activatable/nestedActivate/NestedActivate_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/nestedActivate/group.security.policy b/test/jdk/java/rmi/activation/Activatable/nestedActivate/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/nestedActivate/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/nestedActivate/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/nestedActivate/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/nestedActivate/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/nestedActivate/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/nestedActivate/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/nestedActivate/security.policy b/test/jdk/java/rmi/activation/Activatable/nestedActivate/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/nestedActivate/security.policy rename to test/jdk/java/rmi/activation/Activatable/nestedActivate/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/ActivateMe.java b/test/jdk/java/rmi/activation/Activatable/nonExistentActivatable/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/ActivateMe.java rename to test/jdk/java/rmi/activation/Activatable/nonExistentActivatable/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java b/test/jdk/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java rename to test/jdk/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java diff --git a/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable_Stub.java b/test/jdk/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable_Stub.java rename to test/jdk/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy b/test/jdk/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/nonExistentActivatable/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/nonExistentActivatable/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy b/test/jdk/java/rmi/activation/Activatable/nonExistentActivatable/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy rename to test/jdk/java/rmi/activation/Activatable/nonExistentActivatable/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/notSerializable/NotSerializable.java b/test/jdk/java/rmi/activation/Activatable/notSerializable/NotSerializable.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/notSerializable/NotSerializable.java rename to test/jdk/java/rmi/activation/Activatable/notSerializable/NotSerializable.java diff --git a/jdk/test/java/rmi/activation/Activatable/restartCrashedService/ActivateMe.java b/test/jdk/java/rmi/activation/Activatable/restartCrashedService/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartCrashedService/ActivateMe.java rename to test/jdk/java/rmi/activation/Activatable/restartCrashedService/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java b/test/jdk/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java rename to test/jdk/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java diff --git a/jdk/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService_Stub.java b/test/jdk/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService_Stub.java rename to test/jdk/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/restartCrashedService/group.security.policy b/test/jdk/java/rmi/activation/Activatable/restartCrashedService/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartCrashedService/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/restartCrashedService/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/restartCrashedService/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/restartCrashedService/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartCrashedService/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/restartCrashedService/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/restartCrashedService/security.policy b/test/jdk/java/rmi/activation/Activatable/restartCrashedService/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartCrashedService/security.policy rename to test/jdk/java/rmi/activation/Activatable/restartCrashedService/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java b/test/jdk/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java rename to test/jdk/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java diff --git a/jdk/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer_Stub.java b/test/jdk/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer_Stub.java rename to test/jdk/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/restartLatecomer/group.security.policy b/test/jdk/java/rmi/activation/Activatable/restartLatecomer/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartLatecomer/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/restartLatecomer/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/restartLatecomer/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/restartLatecomer/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartLatecomer/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/restartLatecomer/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/restartLatecomer/security.policy b/test/jdk/java/rmi/activation/Activatable/restartLatecomer/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartLatecomer/security.policy rename to test/jdk/java/rmi/activation/Activatable/restartLatecomer/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/restartService/ActivateMe.java b/test/jdk/java/rmi/activation/Activatable/restartService/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartService/ActivateMe.java rename to test/jdk/java/rmi/activation/Activatable/restartService/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java b/test/jdk/java/rmi/activation/Activatable/restartService/RestartService.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java rename to test/jdk/java/rmi/activation/Activatable/restartService/RestartService.java diff --git a/jdk/test/java/rmi/activation/Activatable/restartService/RestartService_Stub.java b/test/jdk/java/rmi/activation/Activatable/restartService/RestartService_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartService/RestartService_Stub.java rename to test/jdk/java/rmi/activation/Activatable/restartService/RestartService_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/restartService/group.security.policy b/test/jdk/java/rmi/activation/Activatable/restartService/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartService/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/restartService/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/restartService/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/restartService/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartService/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/restartService/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/restartService/security.policy b/test/jdk/java/rmi/activation/Activatable/restartService/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/restartService/security.policy rename to test/jdk/java/rmi/activation/Activatable/restartService/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/RegisteringActivatable.java b/test/jdk/java/rmi/activation/Activatable/shutdownGracefully/RegisteringActivatable.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/shutdownGracefully/RegisteringActivatable.java rename to test/jdk/java/rmi/activation/Activatable/shutdownGracefully/RegisteringActivatable.java diff --git a/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java b/test/jdk/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java rename to test/jdk/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java diff --git a/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully_Stub.java b/test/jdk/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully_Stub.java rename to test/jdk/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/TestSecurityManager.java b/test/jdk/java/rmi/activation/Activatable/shutdownGracefully/TestSecurityManager.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/shutdownGracefully/TestSecurityManager.java rename to test/jdk/java/rmi/activation/Activatable/shutdownGracefully/TestSecurityManager.java diff --git a/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/group.security.policy b/test/jdk/java/rmi/activation/Activatable/shutdownGracefully/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/shutdownGracefully/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/shutdownGracefully/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/shutdownGracefully/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/shutdownGracefully/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/shutdownGracefully/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/security.policy b/test/jdk/java/rmi/activation/Activatable/shutdownGracefully/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/shutdownGracefully/security.policy rename to test/jdk/java/rmi/activation/Activatable/shutdownGracefully/security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/unregisterInactive/ActivateMe.java b/test/jdk/java/rmi/activation/Activatable/unregisterInactive/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/unregisterInactive/ActivateMe.java rename to test/jdk/java/rmi/activation/Activatable/unregisterInactive/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java b/test/jdk/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java rename to test/jdk/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java diff --git a/jdk/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive_Stub.java b/test/jdk/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive_Stub.java rename to test/jdk/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive_Stub.java diff --git a/jdk/test/java/rmi/activation/Activatable/unregisterInactive/group.security.policy b/test/jdk/java/rmi/activation/Activatable/unregisterInactive/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/unregisterInactive/group.security.policy rename to test/jdk/java/rmi/activation/Activatable/unregisterInactive/group.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/unregisterInactive/rmid.security.policy b/test/jdk/java/rmi/activation/Activatable/unregisterInactive/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/unregisterInactive/rmid.security.policy rename to test/jdk/java/rmi/activation/Activatable/unregisterInactive/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/Activatable/unregisterInactive/security.policy b/test/jdk/java/rmi/activation/Activatable/unregisterInactive/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/Activatable/unregisterInactive/security.policy rename to test/jdk/java/rmi/activation/Activatable/unregisterInactive/security.policy diff --git a/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java b/test/jdk/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java rename to test/jdk/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java diff --git a/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails_Stub.java b/test/jdk/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails_Stub.java rename to test/jdk/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails_Stub.java diff --git a/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateMe.java b/test/jdk/java/rmi/activation/ActivateFailedException/activateFails/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateMe.java rename to test/jdk/java/rmi/activation/ActivateFailedException/activateFails/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ShutdownThread.java b/test/jdk/java/rmi/activation/ActivateFailedException/activateFails/ShutdownThread.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ShutdownThread.java rename to test/jdk/java/rmi/activation/ActivateFailedException/activateFails/ShutdownThread.java diff --git a/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy b/test/jdk/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy rename to test/jdk/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy diff --git a/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/rmid.security.policy b/test/jdk/java/rmi/activation/ActivateFailedException/activateFails/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivateFailedException/activateFails/rmid.security.policy rename to test/jdk/java/rmi/activation/ActivateFailedException/activateFails/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/security.policy b/test/jdk/java/rmi/activation/ActivateFailedException/activateFails/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivateFailedException/activateFails/security.policy rename to test/jdk/java/rmi/activation/ActivateFailedException/activateFails/security.policy diff --git a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java b/test/jdk/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java rename to test/jdk/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java diff --git a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup_Stub.java b/test/jdk/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup_Stub.java rename to test/jdk/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup_Stub.java diff --git a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/MyActivationGroupImpl.java b/test/jdk/java/rmi/activation/ActivationGroup/downloadActivationGroup/MyActivationGroupImpl.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/MyActivationGroupImpl.java rename to test/jdk/java/rmi/activation/ActivationGroup/downloadActivationGroup/MyActivationGroupImpl.java diff --git a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy b/test/jdk/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy rename to test/jdk/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy diff --git a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/rmid.security.policy b/test/jdk/java/rmi/activation/ActivationGroup/downloadActivationGroup/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/rmid.security.policy rename to test/jdk/java/rmi/activation/ActivationGroup/downloadActivationGroup/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/security.policy b/test/jdk/java/rmi/activation/ActivationGroup/downloadActivationGroup/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/security.policy rename to test/jdk/java/rmi/activation/ActivationGroup/downloadActivationGroup/security.policy diff --git a/jdk/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java b/test/jdk/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java rename to test/jdk/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java diff --git a/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java b/test/jdk/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java rename to test/jdk/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java diff --git a/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/rmid.security.policy b/test/jdk/java/rmi/activation/ActivationSystem/activeGroup/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/activeGroup/rmid.security.policy rename to test/jdk/java/rmi/activation/ActivationSystem/activeGroup/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy b/test/jdk/java/rmi/activation/ActivationSystem/activeGroup/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy rename to test/jdk/java/rmi/activation/ActivationSystem/activeGroup/security.policy diff --git a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ActivateMe.java b/test/jdk/java/rmi/activation/ActivationSystem/modifyDescriptor/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ActivateMe.java rename to test/jdk/java/rmi/activation/ActivationSystem/modifyDescriptor/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java b/test/jdk/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java rename to test/jdk/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java diff --git a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor_Stub.java b/test/jdk/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor_Stub.java rename to test/jdk/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor_Stub.java diff --git a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy b/test/jdk/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy rename to test/jdk/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy diff --git a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/rmid.security.policy b/test/jdk/java/rmi/activation/ActivationSystem/modifyDescriptor/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/rmid.security.policy rename to test/jdk/java/rmi/activation/ActivationSystem/modifyDescriptor/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy b/test/jdk/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy rename to test/jdk/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy diff --git a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/CanCreateStubs.java b/test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/CanCreateStubs.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/CanCreateStubs.java rename to test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/CanCreateStubs.java diff --git a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java b/test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java rename to test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java diff --git a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted_Stub.java b/test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted_Stub.java rename to test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted_Stub.java diff --git a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/group.security.policy b/test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/group.security.policy rename to test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/group.security.policy diff --git a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/rmid.security.policy b/test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/rmid.security.policy rename to test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy b/test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy rename to test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy diff --git a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/ActivateMe.java b/test/jdk/java/rmi/activation/ActivationSystem/unregisterGroup/ActivateMe.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/ActivateMe.java rename to test/jdk/java/rmi/activation/ActivationSystem/unregisterGroup/ActivateMe.java diff --git a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java b/test/jdk/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java rename to test/jdk/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java diff --git a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/group.security.policy b/test/jdk/java/rmi/activation/ActivationSystem/unregisterGroup/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/group.security.policy rename to test/jdk/java/rmi/activation/ActivationSystem/unregisterGroup/group.security.policy diff --git a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy b/test/jdk/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy rename to test/jdk/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy b/test/jdk/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy rename to test/jdk/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy diff --git a/jdk/test/java/rmi/activation/CommandEnvironment/Doctor.java b/test/jdk/java/rmi/activation/CommandEnvironment/Doctor.java similarity index 100% rename from jdk/test/java/rmi/activation/CommandEnvironment/Doctor.java rename to test/jdk/java/rmi/activation/CommandEnvironment/Doctor.java diff --git a/jdk/test/java/rmi/activation/CommandEnvironment/Doctor_Stub.java b/test/jdk/java/rmi/activation/CommandEnvironment/Doctor_Stub.java similarity index 100% rename from jdk/test/java/rmi/activation/CommandEnvironment/Doctor_Stub.java rename to test/jdk/java/rmi/activation/CommandEnvironment/Doctor_Stub.java diff --git a/jdk/test/java/rmi/activation/CommandEnvironment/Eliza.java b/test/jdk/java/rmi/activation/CommandEnvironment/Eliza.java similarity index 100% rename from jdk/test/java/rmi/activation/CommandEnvironment/Eliza.java rename to test/jdk/java/rmi/activation/CommandEnvironment/Eliza.java diff --git a/jdk/test/java/rmi/activation/CommandEnvironment/NullOptions.java b/test/jdk/java/rmi/activation/CommandEnvironment/NullOptions.java similarity index 100% rename from jdk/test/java/rmi/activation/CommandEnvironment/NullOptions.java rename to test/jdk/java/rmi/activation/CommandEnvironment/NullOptions.java diff --git a/jdk/test/java/rmi/activation/CommandEnvironment/Retireable.java b/test/jdk/java/rmi/activation/CommandEnvironment/Retireable.java similarity index 100% rename from jdk/test/java/rmi/activation/CommandEnvironment/Retireable.java rename to test/jdk/java/rmi/activation/CommandEnvironment/Retireable.java diff --git a/jdk/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java b/test/jdk/java/rmi/activation/CommandEnvironment/SetChildEnv.java similarity index 100% rename from jdk/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java rename to test/jdk/java/rmi/activation/CommandEnvironment/SetChildEnv.java diff --git a/jdk/test/java/rmi/activation/CommandEnvironment/group.security.policy b/test/jdk/java/rmi/activation/CommandEnvironment/group.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/CommandEnvironment/group.security.policy rename to test/jdk/java/rmi/activation/CommandEnvironment/group.security.policy diff --git a/jdk/test/java/rmi/activation/CommandEnvironment/rmid.security.policy b/test/jdk/java/rmi/activation/CommandEnvironment/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/CommandEnvironment/rmid.security.policy rename to test/jdk/java/rmi/activation/CommandEnvironment/rmid.security.policy diff --git a/jdk/test/java/rmi/activation/CommandEnvironment/security.policy b/test/jdk/java/rmi/activation/CommandEnvironment/security.policy similarity index 100% rename from jdk/test/java/rmi/activation/CommandEnvironment/security.policy rename to test/jdk/java/rmi/activation/CommandEnvironment/security.policy diff --git a/jdk/test/java/rmi/activation/log/LogTest.java b/test/jdk/java/rmi/activation/log/LogTest.java similarity index 100% rename from jdk/test/java/rmi/activation/log/LogTest.java rename to test/jdk/java/rmi/activation/log/LogTest.java diff --git a/jdk/test/java/rmi/activation/nonLocalActivation/NonLocalActivationTest.java b/test/jdk/java/rmi/activation/nonLocalActivation/NonLocalActivationTest.java similarity index 100% rename from jdk/test/java/rmi/activation/nonLocalActivation/NonLocalActivationTest.java rename to test/jdk/java/rmi/activation/nonLocalActivation/NonLocalActivationTest.java diff --git a/jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java b/test/jdk/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java similarity index 100% rename from jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java rename to test/jdk/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java diff --git a/jdk/test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy b/test/jdk/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy rename to test/jdk/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy diff --git a/jdk/test/java/rmi/dgc/VMID/CheckVMID.java b/test/jdk/java/rmi/dgc/VMID/CheckVMID.java similarity index 100% rename from jdk/test/java/rmi/dgc/VMID/CheckVMID.java rename to test/jdk/java/rmi/dgc/VMID/CheckVMID.java diff --git a/jdk/test/java/rmi/dgc/VMID/security.policy b/test/jdk/java/rmi/dgc/VMID/security.policy similarity index 100% rename from jdk/test/java/rmi/dgc/VMID/security.policy rename to test/jdk/java/rmi/dgc/VMID/security.policy diff --git a/jdk/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java b/test/jdk/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java similarity index 100% rename from jdk/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java rename to test/jdk/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java diff --git a/jdk/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure_Stub.java b/test/jdk/java/rmi/dgc/dgcAckFailure/DGCAckFailure_Stub.java similarity index 100% rename from jdk/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure_Stub.java rename to test/jdk/java/rmi/dgc/dgcAckFailure/DGCAckFailure_Stub.java diff --git a/jdk/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java b/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java similarity index 100% rename from jdk/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java rename to test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java diff --git a/jdk/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation_Stub.java b/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation_Stub.java similarity index 100% rename from jdk/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation_Stub.java rename to test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation_Stub.java diff --git a/jdk/test/java/rmi/dgc/dgcImplInsulation/security.policy b/test/jdk/java/rmi/dgc/dgcImplInsulation/security.policy similarity index 100% rename from jdk/test/java/rmi/dgc/dgcImplInsulation/security.policy rename to test/jdk/java/rmi/dgc/dgcImplInsulation/security.policy diff --git a/jdk/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java b/test/jdk/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java similarity index 100% rename from jdk/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java rename to test/jdk/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java diff --git a/jdk/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls_Stub.java b/test/jdk/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls_Stub.java similarity index 100% rename from jdk/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls_Stub.java rename to test/jdk/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls_Stub.java diff --git a/jdk/test/java/rmi/invalidName/InvalidName.java b/test/jdk/java/rmi/invalidName/InvalidName.java similarity index 100% rename from jdk/test/java/rmi/invalidName/InvalidName.java rename to test/jdk/java/rmi/invalidName/InvalidName.java diff --git a/jdk/test/java/rmi/module/ModuleTest.java b/test/jdk/java/rmi/module/ModuleTest.java similarity index 100% rename from jdk/test/java/rmi/module/ModuleTest.java rename to test/jdk/java/rmi/module/ModuleTest.java diff --git a/jdk/test/java/rmi/module/src/mclient/clientpkg/Client.java b/test/jdk/java/rmi/module/src/mclient/clientpkg/Client.java similarity index 100% rename from jdk/test/java/rmi/module/src/mclient/clientpkg/Client.java rename to test/jdk/java/rmi/module/src/mclient/clientpkg/Client.java diff --git a/jdk/test/java/rmi/module/src/mserver/serverpkg/Hello.java b/test/jdk/java/rmi/module/src/mserver/serverpkg/Hello.java similarity index 100% rename from jdk/test/java/rmi/module/src/mserver/serverpkg/Hello.java rename to test/jdk/java/rmi/module/src/mserver/serverpkg/Hello.java diff --git a/jdk/test/java/rmi/module/src/mserver/serverpkg/Server.java b/test/jdk/java/rmi/module/src/mserver/serverpkg/Server.java similarity index 100% rename from jdk/test/java/rmi/module/src/mserver/serverpkg/Server.java rename to test/jdk/java/rmi/module/src/mserver/serverpkg/Server.java diff --git a/jdk/test/java/rmi/module/src/mtest/testpkg/DummyApp.java b/test/jdk/java/rmi/module/src/mtest/testpkg/DummyApp.java similarity index 100% rename from jdk/test/java/rmi/module/src/mtest/testpkg/DummyApp.java rename to test/jdk/java/rmi/module/src/mtest/testpkg/DummyApp.java diff --git a/jdk/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java b/test/jdk/java/rmi/registry/altSecurityManager/AltSecurityManager.java similarity index 100% rename from jdk/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java rename to test/jdk/java/rmi/registry/altSecurityManager/AltSecurityManager.java diff --git a/jdk/test/java/rmi/registry/altSecurityManager/TestSecurityManager.java b/test/jdk/java/rmi/registry/altSecurityManager/TestSecurityManager.java similarity index 100% rename from jdk/test/java/rmi/registry/altSecurityManager/TestSecurityManager.java rename to test/jdk/java/rmi/registry/altSecurityManager/TestSecurityManager.java diff --git a/jdk/test/java/rmi/registry/altSecurityManager/registry.security.policy b/test/jdk/java/rmi/registry/altSecurityManager/registry.security.policy similarity index 100% rename from jdk/test/java/rmi/registry/altSecurityManager/registry.security.policy rename to test/jdk/java/rmi/registry/altSecurityManager/registry.security.policy diff --git a/jdk/test/java/rmi/registry/altSecurityManager/rmid.security.policy b/test/jdk/java/rmi/registry/altSecurityManager/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/registry/altSecurityManager/rmid.security.policy rename to test/jdk/java/rmi/registry/altSecurityManager/rmid.security.policy diff --git a/jdk/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java b/test/jdk/java/rmi/registry/classPathCodebase/ClassPathCodebase.java similarity index 100% rename from jdk/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java rename to test/jdk/java/rmi/registry/classPathCodebase/ClassPathCodebase.java diff --git a/jdk/test/java/rmi/registry/classPathCodebase/Dummy.java b/test/jdk/java/rmi/registry/classPathCodebase/Dummy.java similarity index 100% rename from jdk/test/java/rmi/registry/classPathCodebase/Dummy.java rename to test/jdk/java/rmi/registry/classPathCodebase/Dummy.java diff --git a/jdk/test/java/rmi/registry/classPathCodebase/registry.security.policy b/test/jdk/java/rmi/registry/classPathCodebase/registry.security.policy similarity index 100% rename from jdk/test/java/rmi/registry/classPathCodebase/registry.security.policy rename to test/jdk/java/rmi/registry/classPathCodebase/registry.security.policy diff --git a/jdk/test/java/rmi/registry/classPathCodebase/security.policy b/test/jdk/java/rmi/registry/classPathCodebase/security.policy similarity index 100% rename from jdk/test/java/rmi/registry/classPathCodebase/security.policy rename to test/jdk/java/rmi/registry/classPathCodebase/security.policy diff --git a/jdk/test/java/rmi/registry/emptyName/EmptyName.java b/test/jdk/java/rmi/registry/emptyName/EmptyName.java similarity index 100% rename from jdk/test/java/rmi/registry/emptyName/EmptyName.java rename to test/jdk/java/rmi/registry/emptyName/EmptyName.java diff --git a/jdk/test/java/rmi/registry/interfaceHash/InterfaceHash.java b/test/jdk/java/rmi/registry/interfaceHash/InterfaceHash.java similarity index 100% rename from jdk/test/java/rmi/registry/interfaceHash/InterfaceHash.java rename to test/jdk/java/rmi/registry/interfaceHash/InterfaceHash.java diff --git a/jdk/test/java/rmi/registry/interfaceHash/ReferenceRegistryStub.java b/test/jdk/java/rmi/registry/interfaceHash/ReferenceRegistryStub.java similarity index 100% rename from jdk/test/java/rmi/registry/interfaceHash/ReferenceRegistryStub.java rename to test/jdk/java/rmi/registry/interfaceHash/ReferenceRegistryStub.java diff --git a/jdk/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java b/test/jdk/java/rmi/registry/multipleRegistries/MultipleRegistries.java similarity index 100% rename from jdk/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java rename to test/jdk/java/rmi/registry/multipleRegistries/MultipleRegistries.java diff --git a/jdk/test/java/rmi/registry/nonLocalRegistry/NonLocalRegistryTest.java b/test/jdk/java/rmi/registry/nonLocalRegistry/NonLocalRegistryTest.java similarity index 100% rename from jdk/test/java/rmi/registry/nonLocalRegistry/NonLocalRegistryTest.java rename to test/jdk/java/rmi/registry/nonLocalRegistry/NonLocalRegistryTest.java diff --git a/jdk/test/java/rmi/registry/readTest/CodebaseTest.java b/test/jdk/java/rmi/registry/readTest/CodebaseTest.java similarity index 100% rename from jdk/test/java/rmi/registry/readTest/CodebaseTest.java rename to test/jdk/java/rmi/registry/readTest/CodebaseTest.java diff --git a/jdk/test/java/rmi/registry/readTest/RegistryLookup.java b/test/jdk/java/rmi/registry/readTest/RegistryLookup.java similarity index 100% rename from jdk/test/java/rmi/registry/readTest/RegistryLookup.java rename to test/jdk/java/rmi/registry/readTest/RegistryLookup.java diff --git a/jdk/test/java/rmi/registry/readTest/registry.security.policy b/test/jdk/java/rmi/registry/readTest/registry.security.policy similarity index 100% rename from jdk/test/java/rmi/registry/readTest/registry.security.policy rename to test/jdk/java/rmi/registry/readTest/registry.security.policy diff --git a/jdk/test/java/rmi/registry/readTest/testPkg/Client.java b/test/jdk/java/rmi/registry/readTest/testPkg/Client.java similarity index 100% rename from jdk/test/java/rmi/registry/readTest/testPkg/Client.java rename to test/jdk/java/rmi/registry/readTest/testPkg/Client.java diff --git a/jdk/test/java/rmi/registry/readTest/testPkg/Hello.java b/test/jdk/java/rmi/registry/readTest/testPkg/Hello.java similarity index 100% rename from jdk/test/java/rmi/registry/readTest/testPkg/Hello.java rename to test/jdk/java/rmi/registry/readTest/testPkg/Hello.java diff --git a/jdk/test/java/rmi/registry/readTest/testPkg/Server.java b/test/jdk/java/rmi/registry/readTest/testPkg/Server.java similarity index 100% rename from jdk/test/java/rmi/registry/readTest/testPkg/Server.java rename to test/jdk/java/rmi/registry/readTest/testPkg/Server.java diff --git a/jdk/test/java/rmi/registry/reexport/Reexport.java b/test/jdk/java/rmi/registry/reexport/Reexport.java similarity index 100% rename from jdk/test/java/rmi/registry/reexport/Reexport.java rename to test/jdk/java/rmi/registry/reexport/Reexport.java diff --git a/jdk/test/java/rmi/registry/serialFilter/RegistryFilterTest.java b/test/jdk/java/rmi/registry/serialFilter/RegistryFilterTest.java similarity index 100% rename from jdk/test/java/rmi/registry/serialFilter/RegistryFilterTest.java rename to test/jdk/java/rmi/registry/serialFilter/RegistryFilterTest.java diff --git a/jdk/test/java/rmi/registry/serialFilter/java.security-extra1 b/test/jdk/java/rmi/registry/serialFilter/java.security-extra1 similarity index 100% rename from jdk/test/java/rmi/registry/serialFilter/java.security-extra1 rename to test/jdk/java/rmi/registry/serialFilter/java.security-extra1 diff --git a/jdk/test/java/rmi/registry/serialFilter/security.policy b/test/jdk/java/rmi/registry/serialFilter/security.policy similarity index 100% rename from jdk/test/java/rmi/registry/serialFilter/security.policy rename to test/jdk/java/rmi/registry/serialFilter/security.policy diff --git a/jdk/test/java/rmi/reliability/README b/test/jdk/java/rmi/reliability/README similarity index 100% rename from jdk/test/java/rmi/reliability/README rename to test/jdk/java/rmi/reliability/README diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/BenchInfo.java b/test/jdk/java/rmi/reliability/benchmark/bench/BenchInfo.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/BenchInfo.java rename to test/jdk/java/rmi/reliability/benchmark/bench/BenchInfo.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/Benchmark.java b/test/jdk/java/rmi/reliability/benchmark/bench/Benchmark.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/Benchmark.java rename to test/jdk/java/rmi/reliability/benchmark/bench/Benchmark.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/ConfigFormatException.java b/test/jdk/java/rmi/reliability/benchmark/bench/ConfigFormatException.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/ConfigFormatException.java rename to test/jdk/java/rmi/reliability/benchmark/bench/ConfigFormatException.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/Harness.java b/test/jdk/java/rmi/reliability/benchmark/bench/Harness.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/Harness.java rename to test/jdk/java/rmi/reliability/benchmark/bench/Harness.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/HtmlReporter.java b/test/jdk/java/rmi/reliability/benchmark/bench/HtmlReporter.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/HtmlReporter.java rename to test/jdk/java/rmi/reliability/benchmark/bench/HtmlReporter.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/Makefile b/test/jdk/java/rmi/reliability/benchmark/bench/Makefile similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/Makefile rename to test/jdk/java/rmi/reliability/benchmark/bench/Makefile diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/Reporter.java b/test/jdk/java/rmi/reliability/benchmark/bench/Reporter.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/Reporter.java rename to test/jdk/java/rmi/reliability/benchmark/bench/Reporter.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/TextReporter.java b/test/jdk/java/rmi/reliability/benchmark/bench/TextReporter.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/TextReporter.java rename to test/jdk/java/rmi/reliability/benchmark/bench/TextReporter.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/Util.java b/test/jdk/java/rmi/reliability/benchmark/bench/Util.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/Util.java rename to test/jdk/java/rmi/reliability/benchmark/bench/Util.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/XmlReporter.java b/test/jdk/java/rmi/reliability/benchmark/bench/XmlReporter.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/XmlReporter.java rename to test/jdk/java/rmi/reliability/benchmark/bench/XmlReporter.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/BenchServer.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/BenchServer.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/BenchServer.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/BenchServer.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/BenchServerImpl.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/BenchServerImpl.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/BenchServerImpl.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/BenchServerImpl.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/BooleanArrayCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/BooleanArrayCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/BooleanArrayCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/BooleanArrayCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/BooleanCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/BooleanCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/BooleanCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/BooleanCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/ByteArrayCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/ByteArrayCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/ByteArrayCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/ByteArrayCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/ByteCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/ByteCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/ByteCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/ByteCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/CharArrayCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/CharArrayCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/CharArrayCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/CharArrayCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/CharCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/CharCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/CharCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/CharCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/ClassLoading.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/ClassLoading.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/ClassLoading.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/ClassLoading.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/DoubleArrayCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/DoubleArrayCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/DoubleArrayCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/DoubleArrayCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/DoubleCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/DoubleCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/DoubleCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/DoubleCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/ExceptionCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/ExceptionCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/ExceptionCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/ExceptionCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/ExportObjs.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/ExportObjs.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/ExportObjs.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/ExportObjs.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/FloatArrayCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/FloatArrayCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/FloatArrayCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/FloatArrayCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/FloatCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/FloatCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/FloatCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/FloatCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/IntArrayCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/IntArrayCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/IntArrayCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/IntArrayCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/IntCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/IntCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/IntCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/IntCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/LongArrayCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/LongArrayCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/LongArrayCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/LongArrayCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/LongCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/LongCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/LongCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/LongCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/Main.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/Main.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/Main.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/Main.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/Makefile b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/Makefile similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/Makefile rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/Makefile diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/NullCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/NullCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/NullCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/NullCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/ObjArrayCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/ObjArrayCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/ObjArrayCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/ObjArrayCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/ObjTreeCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/ObjTreeCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/ObjTreeCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/ObjTreeCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/ProxyArrayCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/ProxyArrayCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/ProxyArrayCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/ProxyArrayCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/RemoteObjArrayCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/RemoteObjArrayCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/RemoteObjArrayCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/RemoteObjArrayCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/ShortArrayCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/ShortArrayCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/ShortArrayCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/ShortArrayCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/ShortCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/ShortCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/ShortCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/ShortCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/SmallObjTreeCalls.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/SmallObjTreeCalls.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/SmallObjTreeCalls.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/SmallObjTreeCalls.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/altroot/Node.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/altroot/Node.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/altroot/Node.java rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/altroot/Node.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/config b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/config similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/config rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/config diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/manifest b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/manifest similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/manifest rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/manifest diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/policy.all b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/policy.all similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/rmi/policy.all rename to test/jdk/java/rmi/reliability/benchmark/bench/rmi/policy.all diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/BooleanArrays.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/BooleanArrays.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/BooleanArrays.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/BooleanArrays.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/Booleans.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/Booleans.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/Booleans.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/Booleans.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/ByteArrays.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/ByteArrays.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/ByteArrays.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/ByteArrays.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/Bytes.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/Bytes.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/Bytes.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/Bytes.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/CharArrays.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/CharArrays.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/CharArrays.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/CharArrays.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/Chars.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/Chars.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/Chars.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/Chars.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/ClassDesc.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/ClassDesc.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/ClassDesc.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/ClassDesc.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/Cons.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/Cons.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/Cons.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/Cons.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/CustomDefaultObjTrees.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/CustomDefaultObjTrees.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/CustomDefaultObjTrees.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/CustomDefaultObjTrees.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/CustomObjTrees.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/CustomObjTrees.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/CustomObjTrees.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/CustomObjTrees.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/DoubleArrays.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/DoubleArrays.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/DoubleArrays.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/DoubleArrays.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/Doubles.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/Doubles.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/Doubles.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/Doubles.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/ExternObjTrees.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/ExternObjTrees.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/ExternObjTrees.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/ExternObjTrees.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/FloatArrays.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/FloatArrays.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/FloatArrays.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/FloatArrays.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/Floats.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/Floats.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/Floats.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/Floats.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/GetPutFieldTrees.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/GetPutFieldTrees.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/GetPutFieldTrees.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/GetPutFieldTrees.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/IntArrays.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/IntArrays.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/IntArrays.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/IntArrays.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/Ints.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/Ints.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/Ints.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/Ints.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/LongArrays.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/LongArrays.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/LongArrays.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/LongArrays.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/Longs.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/Longs.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/Longs.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/Longs.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/Main.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/Main.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/Main.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/Main.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/ObjArrays.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/ObjArrays.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/ObjArrays.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/ObjArrays.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/ObjTrees.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/ObjTrees.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/ObjTrees.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/ObjTrees.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/ProxyArrays.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/ProxyArrays.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/ProxyArrays.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/ProxyArrays.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/ProxyClassDesc.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/ProxyClassDesc.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/ProxyClassDesc.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/ProxyClassDesc.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/RepeatObjs.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/RepeatObjs.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/RepeatObjs.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/RepeatObjs.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/ReplaceTrees.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/ReplaceTrees.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/ReplaceTrees.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/ReplaceTrees.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/ShortArrays.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/ShortArrays.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/ShortArrays.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/ShortArrays.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/Shorts.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/Shorts.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/Shorts.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/Shorts.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/SmallObjTrees.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/SmallObjTrees.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/SmallObjTrees.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/SmallObjTrees.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/StreamBuffer.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/StreamBuffer.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/StreamBuffer.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/StreamBuffer.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/Strings.java b/test/jdk/java/rmi/reliability/benchmark/bench/serial/Strings.java similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/Strings.java rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/Strings.java diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/config b/test/jdk/java/rmi/reliability/benchmark/bench/serial/config similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/config rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/config diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/jtreg-config b/test/jdk/java/rmi/reliability/benchmark/bench/serial/jtreg-config similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/jtreg-config rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/jtreg-config diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/serial/manifest b/test/jdk/java/rmi/reliability/benchmark/bench/serial/manifest similarity index 100% rename from jdk/test/java/rmi/reliability/benchmark/bench/serial/manifest rename to test/jdk/java/rmi/reliability/benchmark/bench/serial/manifest diff --git a/jdk/test/java/rmi/reliability/juicer/Apple.java b/test/jdk/java/rmi/reliability/juicer/Apple.java similarity index 100% rename from jdk/test/java/rmi/reliability/juicer/Apple.java rename to test/jdk/java/rmi/reliability/juicer/Apple.java diff --git a/jdk/test/java/rmi/reliability/juicer/AppleEvent.java b/test/jdk/java/rmi/reliability/juicer/AppleEvent.java similarity index 100% rename from jdk/test/java/rmi/reliability/juicer/AppleEvent.java rename to test/jdk/java/rmi/reliability/juicer/AppleEvent.java diff --git a/jdk/test/java/rmi/reliability/juicer/AppleImpl.java b/test/jdk/java/rmi/reliability/juicer/AppleImpl.java similarity index 100% rename from jdk/test/java/rmi/reliability/juicer/AppleImpl.java rename to test/jdk/java/rmi/reliability/juicer/AppleImpl.java diff --git a/jdk/test/java/rmi/reliability/juicer/AppleUser.java b/test/jdk/java/rmi/reliability/juicer/AppleUser.java similarity index 100% rename from jdk/test/java/rmi/reliability/juicer/AppleUser.java rename to test/jdk/java/rmi/reliability/juicer/AppleUser.java diff --git a/jdk/test/java/rmi/reliability/juicer/AppleUserImpl.java b/test/jdk/java/rmi/reliability/juicer/AppleUserImpl.java similarity index 100% rename from jdk/test/java/rmi/reliability/juicer/AppleUserImpl.java rename to test/jdk/java/rmi/reliability/juicer/AppleUserImpl.java diff --git a/jdk/test/java/rmi/reliability/juicer/ApplicationServer.java b/test/jdk/java/rmi/reliability/juicer/ApplicationServer.java similarity index 100% rename from jdk/test/java/rmi/reliability/juicer/ApplicationServer.java rename to test/jdk/java/rmi/reliability/juicer/ApplicationServer.java diff --git a/jdk/test/java/rmi/reliability/juicer/Orange.java b/test/jdk/java/rmi/reliability/juicer/Orange.java similarity index 100% rename from jdk/test/java/rmi/reliability/juicer/Orange.java rename to test/jdk/java/rmi/reliability/juicer/Orange.java diff --git a/jdk/test/java/rmi/reliability/juicer/OrangeEcho.java b/test/jdk/java/rmi/reliability/juicer/OrangeEcho.java similarity index 100% rename from jdk/test/java/rmi/reliability/juicer/OrangeEcho.java rename to test/jdk/java/rmi/reliability/juicer/OrangeEcho.java diff --git a/jdk/test/java/rmi/reliability/juicer/OrangeEchoImpl.java b/test/jdk/java/rmi/reliability/juicer/OrangeEchoImpl.java similarity index 100% rename from jdk/test/java/rmi/reliability/juicer/OrangeEchoImpl.java rename to test/jdk/java/rmi/reliability/juicer/OrangeEchoImpl.java diff --git a/jdk/test/java/rmi/reliability/juicer/OrangeImpl.java b/test/jdk/java/rmi/reliability/juicer/OrangeImpl.java similarity index 100% rename from jdk/test/java/rmi/reliability/juicer/OrangeImpl.java rename to test/jdk/java/rmi/reliability/juicer/OrangeImpl.java diff --git a/jdk/test/java/rmi/reliability/juicer/security.policy b/test/jdk/java/rmi/reliability/juicer/security.policy similarity index 100% rename from jdk/test/java/rmi/reliability/juicer/security.policy rename to test/jdk/java/rmi/reliability/juicer/security.policy diff --git a/jdk/test/java/rmi/reliability/launch_reliability.ksh b/test/jdk/java/rmi/reliability/launch_reliability.ksh similarity index 100% rename from jdk/test/java/rmi/reliability/launch_reliability.ksh rename to test/jdk/java/rmi/reliability/launch_reliability.ksh diff --git a/jdk/test/java/rmi/reliability/scripts/create_benchmark_jars.ksh b/test/jdk/java/rmi/reliability/scripts/create_benchmark_jars.ksh similarity index 100% rename from jdk/test/java/rmi/reliability/scripts/create_benchmark_jars.ksh rename to test/jdk/java/rmi/reliability/scripts/create_benchmark_jars.ksh diff --git a/jdk/test/java/rmi/reliability/scripts/run_juicer.ksh b/test/jdk/java/rmi/reliability/scripts/run_juicer.ksh similarity index 100% rename from jdk/test/java/rmi/reliability/scripts/run_juicer.ksh rename to test/jdk/java/rmi/reliability/scripts/run_juicer.ksh diff --git a/jdk/test/java/rmi/reliability/scripts/run_rmibench.ksh b/test/jdk/java/rmi/reliability/scripts/run_rmibench.ksh similarity index 100% rename from jdk/test/java/rmi/reliability/scripts/run_rmibench.ksh rename to test/jdk/java/rmi/reliability/scripts/run_rmibench.ksh diff --git a/jdk/test/java/rmi/reliability/scripts/run_serialbench.ksh b/test/jdk/java/rmi/reliability/scripts/run_serialbench.ksh similarity index 100% rename from jdk/test/java/rmi/reliability/scripts/run_serialbench.ksh rename to test/jdk/java/rmi/reliability/scripts/run_serialbench.ksh diff --git a/jdk/test/java/rmi/server/ObjID/randomIDs/RandomIDs.java b/test/jdk/java/rmi/server/ObjID/randomIDs/RandomIDs.java similarity index 100% rename from jdk/test/java/rmi/server/ObjID/randomIDs/RandomIDs.java rename to test/jdk/java/rmi/server/ObjID/randomIDs/RandomIDs.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java b/test/jdk/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java rename to test/jdk/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/Foo.java b/test/jdk/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/Foo.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/Foo.java rename to test/jdk/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/Foo.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java b/test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java rename to test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/Dummy.java b/test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/Dummy.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/Dummy.java rename to test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/Dummy.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy rename to test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy diff --git a/jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java b/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java rename to test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass_Stub.java b/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass_Stub.java rename to test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass_Stub.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Foo.java b/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/Foo.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Foo.java rename to test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/Foo.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java b/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java rename to test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy rename to test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy diff --git a/jdk/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java b/test/jdk/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java rename to test/jdk/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/getClassLoader/Foo.java b/test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/Foo.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/getClassLoader/Foo.java rename to test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/Foo.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java b/test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java rename to test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/getClassLoader/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/getClassLoader/security.policy rename to test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/security.policy diff --git a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnClass.java b/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnClass.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnClass.java rename to test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnClass.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnUnmarshal.java b/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnUnmarshal.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnUnmarshal.java rename to test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnUnmarshal.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java b/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java rename to test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface.java b/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface.java rename to test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface1.java b/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface1.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface1.java rename to test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface1.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface.java b/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface.java rename to test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface1.java b/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface1.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface1.java rename to test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface1.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy rename to test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy diff --git a/jdk/test/java/rmi/server/RMIClassLoader/noSecurityManager/Dummy.java b/test/jdk/java/rmi/server/RMIClassLoader/noSecurityManager/Dummy.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/noSecurityManager/Dummy.java rename to test/jdk/java/rmi/server/RMIClassLoader/noSecurityManager/Dummy.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/noSecurityManager/LocalDummy.java b/test/jdk/java/rmi/server/RMIClassLoader/noSecurityManager/LocalDummy.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/noSecurityManager/LocalDummy.java rename to test/jdk/java/rmi/server/RMIClassLoader/noSecurityManager/LocalDummy.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java b/test/jdk/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java rename to test/jdk/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java rename to test/jdk/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java rename to test/jdk/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/Foo.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/Foo.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/spi/Foo.java rename to test/jdk/java/rmi/server/RMIClassLoader/spi/Foo.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/Installed.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/Installed.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/spi/Installed.java rename to test/jdk/java/rmi/server/RMIClassLoader/spi/Installed.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java rename to test/jdk/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/Property.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/Property.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/spi/Property.java rename to test/jdk/java/rmi/server/RMIClassLoader/spi/Property.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/ServiceConfiguration.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/ServiceConfiguration.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/spi/ServiceConfiguration.java rename to test/jdk/java/rmi/server/RMIClassLoader/spi/ServiceConfiguration.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/TestProvider.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/TestProvider.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/spi/TestProvider.java rename to test/jdk/java/rmi/server/RMIClassLoader/spi/TestProvider.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/TestProvider2.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/TestProvider2.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/spi/TestProvider2.java rename to test/jdk/java/rmi/server/RMIClassLoader/spi/TestProvider2.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/java.rmi.server.RMIClassLoaderSpi b/test/jdk/java/rmi/server/RMIClassLoader/spi/java.rmi.server.RMIClassLoaderSpi similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/spi/java.rmi.server.RMIClassLoaderSpi rename to test/jdk/java/rmi/server/RMIClassLoader/spi/java.rmi.server.RMIClassLoaderSpi diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/spi/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/spi/security.policy rename to test/jdk/java/rmi/server/RMIClassLoader/spi/security.policy diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Bar.java b/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/Bar.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Bar.java rename to test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/Bar.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Foo.java b/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/Foo.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Foo.java rename to test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/Foo.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Receiver.java b/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/Receiver.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Receiver.java rename to test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/Receiver.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java b/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java rename to test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly_Stub.java b/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly_Stub.java rename to test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly_Stub.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy rename to test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnlyDefault/UseCodebaseOnlyDefault.java b/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnlyDefault/UseCodebaseOnlyDefault.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnlyDefault/UseCodebaseOnlyDefault.java rename to test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnlyDefault/UseCodebaseOnlyDefault.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useGetURLs/Dummy.java b/test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/Dummy.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/useGetURLs/Dummy.java rename to test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/Dummy.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java b/test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java rename to test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useGetURLs/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RMIClassLoader/useGetURLs/security.policy rename to test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/security.policy diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressConstants.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressConstants.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressConstants.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressConstants.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressInputStream.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressInputStream.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressInputStream.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressInputStream.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressOutputStream.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressOutputStream.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressOutputStream.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressOutputStream.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/Echo.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/Echo.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/Echo.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/Echo.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl_Stub.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl_Stub.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl_Stub.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/MultiSocketFactory.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/MultiSocketFactory.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/MultiSocketFactory.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/MultiSocketFactory.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/group.security.policy b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/group.security.policy similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/group.security.policy rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/group.security.policy diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/rmid.security.policy b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/rmid.security.policy similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/rmid.security.policy rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/rmid.security.policy diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Compress.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Compress.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Compress.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Compress.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Hello.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Hello.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Hello.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Hello.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl_Stub.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl_Stub.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl_Stub.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressConstants.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressConstants.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressConstants.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressConstants.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressInputStream.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressInputStream.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressInputStream.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressInputStream.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressOutputStream.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressOutputStream.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressOutputStream.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressOutputStream.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/Echo.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/Echo.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/Echo.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/Echo.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl_Stub.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl_Stub.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl_Stub.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/MultiSocketFactory.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/MultiSocketFactory.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/MultiSocketFactory.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/MultiSocketFactory.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy rename to test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy diff --git a/jdk/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java b/test/jdk/java/rmi/server/RemoteObject/notExtending/NotExtending.java similarity index 100% rename from jdk/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java rename to test/jdk/java/rmi/server/RemoteObject/notExtending/NotExtending.java diff --git a/jdk/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Skel.java b/test/jdk/java/rmi/server/RemoteObject/notExtending/NotExtending_Skel.java similarity index 100% rename from jdk/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Skel.java rename to test/jdk/java/rmi/server/RemoteObject/notExtending/NotExtending_Skel.java diff --git a/jdk/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Stub.java b/test/jdk/java/rmi/server/RemoteObject/notExtending/NotExtending_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Stub.java rename to test/jdk/java/rmi/server/RemoteObject/notExtending/NotExtending_Stub.java diff --git a/jdk/test/java/rmi/server/RemoteObject/toStub/ToStub.java b/test/jdk/java/rmi/server/RemoteObject/toStub/ToStub.java similarity index 100% rename from jdk/test/java/rmi/server/RemoteObject/toStub/ToStub.java rename to test/jdk/java/rmi/server/RemoteObject/toStub/ToStub.java diff --git a/jdk/test/java/rmi/server/RemoteObject/toStub/ToStub_Stub.java b/test/jdk/java/rmi/server/RemoteObject/toStub/ToStub_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/RemoteObject/toStub/ToStub_Stub.java rename to test/jdk/java/rmi/server/RemoteObject/toStub/ToStub_Stub.java diff --git a/jdk/test/java/rmi/server/RemoteObject/toStub/security.policy b/test/jdk/java/rmi/server/RemoteObject/toStub/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RemoteObject/toStub/security.policy rename to test/jdk/java/rmi/server/RemoteObject/toStub/security.policy diff --git a/jdk/test/java/rmi/server/RemoteObject/unrecognizedRefType/UnrecognizedRefType.java b/test/jdk/java/rmi/server/RemoteObject/unrecognizedRefType/UnrecognizedRefType.java similarity index 100% rename from jdk/test/java/rmi/server/RemoteObject/unrecognizedRefType/UnrecognizedRefType.java rename to test/jdk/java/rmi/server/RemoteObject/unrecognizedRefType/UnrecognizedRefType.java diff --git a/jdk/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java b/test/jdk/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java similarity index 100% rename from jdk/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java rename to test/jdk/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java diff --git a/jdk/test/java/rmi/server/RemoteServer/AddrInUse.java b/test/jdk/java/rmi/server/RemoteServer/AddrInUse.java similarity index 100% rename from jdk/test/java/rmi/server/RemoteServer/AddrInUse.java rename to test/jdk/java/rmi/server/RemoteServer/AddrInUse.java diff --git a/jdk/test/java/rmi/server/RemoteServer/SetLogNull.java b/test/jdk/java/rmi/server/RemoteServer/SetLogNull.java similarity index 100% rename from jdk/test/java/rmi/server/RemoteServer/SetLogNull.java rename to test/jdk/java/rmi/server/RemoteServer/SetLogNull.java diff --git a/jdk/test/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java b/test/jdk/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java similarity index 100% rename from jdk/test/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java rename to test/jdk/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java diff --git a/jdk/test/java/rmi/server/RemoteServer/setLogPermission/security.policy b/test/jdk/java/rmi/server/RemoteServer/setLogPermission/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RemoteServer/setLogPermission/security.policy rename to test/jdk/java/rmi/server/RemoteServer/setLogPermission/security.policy diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java b/test/jdk/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName_Stub.java b/test/jdk/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName_Stub.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName_Stub.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java b/test/jdk/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java b/test/jdk/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall_Stub.java b/test/jdk/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall_Stub.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall_Stub.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/Shutdown.java b/test/jdk/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/Shutdown.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/Shutdown.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/Shutdown.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl.java b/test/jdk/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl_Stub.java b/test/jdk/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl_Stub.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl_Stub.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownMonitor.java b/test/jdk/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownMonitor.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownMonitor.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownMonitor.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java b/test/jdk/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java b/test/jdk/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2_Stub.java b/test/jdk/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2_Stub.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2_Stub.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport_Stub.java b/test/jdk/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport_Stub.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport_Stub.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/serialFilter/FilterUROTest.java b/test/jdk/java/rmi/server/UnicastRemoteObject/serialFilter/FilterUROTest.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/serialFilter/FilterUROTest.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/serialFilter/FilterUROTest.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/Ping.java b/test/jdk/java/rmi/server/UnicastRemoteObject/unexportObject/Ping.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/Ping.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/unexportObject/Ping.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java b/test/jdk/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak_Stub.java b/test/jdk/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak_Stub.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak_Stub.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies.java b/test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies_Stub.java b/test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies_Stub.java rename to test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies_Stub.java diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/security.policy b/test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/security.policy similarity index 100% rename from jdk/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/security.policy rename to test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/security.policy diff --git a/jdk/test/java/rmi/server/Unmarshal/PrimitiveClasses.java b/test/jdk/java/rmi/server/Unmarshal/PrimitiveClasses.java similarity index 100% rename from jdk/test/java/rmi/server/Unmarshal/PrimitiveClasses.java rename to test/jdk/java/rmi/server/Unmarshal/PrimitiveClasses.java diff --git a/jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshal.java b/test/jdk/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshal.java similarity index 100% rename from jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshal.java rename to test/jdk/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshal.java diff --git a/jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java b/test/jdk/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java similarity index 100% rename from jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java rename to test/jdk/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java diff --git a/jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread_Stub.java b/test/jdk/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread_Stub.java rename to test/jdk/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread_Stub.java diff --git a/jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/PoisonPill.java b/test/jdk/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/PoisonPill.java similarity index 100% rename from jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/PoisonPill.java rename to test/jdk/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/PoisonPill.java diff --git a/jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/RuntimeExceptionParameter.java b/test/jdk/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/RuntimeExceptionParameter.java similarity index 100% rename from jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/RuntimeExceptionParameter.java rename to test/jdk/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/RuntimeExceptionParameter.java diff --git a/jdk/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java b/test/jdk/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java similarity index 100% rename from jdk/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java rename to test/jdk/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java diff --git a/jdk/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency_Stub.java b/test/jdk/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency_Stub.java rename to test/jdk/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency_Stub.java diff --git a/jdk/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java b/test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java similarity index 100% rename from jdk/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java rename to test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java diff --git a/jdk/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval_Stub.java b/test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval_Stub.java rename to test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval_Stub.java diff --git a/jdk/test/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java b/test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java similarity index 100% rename from jdk/test/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java rename to test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java diff --git a/jdk/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java b/test/jdk/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java similarity index 100% rename from jdk/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java rename to test/jdk/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java diff --git a/jdk/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet_Stub.java b/test/jdk/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet_Stub.java rename to test/jdk/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet_Stub.java diff --git a/jdk/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java b/test/jdk/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java similarity index 100% rename from jdk/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java rename to test/jdk/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java diff --git a/jdk/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext_Stub.java b/test/jdk/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext_Stub.java rename to test/jdk/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext_Stub.java diff --git a/jdk/test/java/rmi/server/clientStackTrace/ClientStackTrace.java b/test/jdk/java/rmi/server/clientStackTrace/ClientStackTrace.java similarity index 100% rename from jdk/test/java/rmi/server/clientStackTrace/ClientStackTrace.java rename to test/jdk/java/rmi/server/clientStackTrace/ClientStackTrace.java diff --git a/jdk/test/java/rmi/server/clientStackTrace/MyRemoteObject_Stub.java b/test/jdk/java/rmi/server/clientStackTrace/MyRemoteObject_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/clientStackTrace/MyRemoteObject_Stub.java rename to test/jdk/java/rmi/server/clientStackTrace/MyRemoteObject_Stub.java diff --git a/jdk/test/java/rmi/server/clientStackTrace/security.policy b/test/jdk/java/rmi/server/clientStackTrace/security.policy similarity index 100% rename from jdk/test/java/rmi/server/clientStackTrace/security.policy rename to test/jdk/java/rmi/server/clientStackTrace/security.policy diff --git a/jdk/test/java/rmi/server/getRemoteClass/GetRemoteClass.java b/test/jdk/java/rmi/server/getRemoteClass/GetRemoteClass.java similarity index 100% rename from jdk/test/java/rmi/server/getRemoteClass/GetRemoteClass.java rename to test/jdk/java/rmi/server/getRemoteClass/GetRemoteClass.java diff --git a/jdk/test/java/rmi/server/serverStackTrace/Impl1_Skel.java b/test/jdk/java/rmi/server/serverStackTrace/Impl1_Skel.java similarity index 100% rename from jdk/test/java/rmi/server/serverStackTrace/Impl1_Skel.java rename to test/jdk/java/rmi/server/serverStackTrace/Impl1_Skel.java diff --git a/jdk/test/java/rmi/server/serverStackTrace/Impl1_Stub.java b/test/jdk/java/rmi/server/serverStackTrace/Impl1_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/serverStackTrace/Impl1_Stub.java rename to test/jdk/java/rmi/server/serverStackTrace/Impl1_Stub.java diff --git a/jdk/test/java/rmi/server/serverStackTrace/Impl2_Stub.java b/test/jdk/java/rmi/server/serverStackTrace/Impl2_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/serverStackTrace/Impl2_Stub.java rename to test/jdk/java/rmi/server/serverStackTrace/Impl2_Stub.java diff --git a/jdk/test/java/rmi/server/serverStackTrace/ServerStackTrace.java b/test/jdk/java/rmi/server/serverStackTrace/ServerStackTrace.java similarity index 100% rename from jdk/test/java/rmi/server/serverStackTrace/ServerStackTrace.java rename to test/jdk/java/rmi/server/serverStackTrace/ServerStackTrace.java diff --git a/jdk/test/java/rmi/server/serverStackTrace/ServerStackTrace_Stub.java b/test/jdk/java/rmi/server/serverStackTrace/ServerStackTrace_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/serverStackTrace/ServerStackTrace_Stub.java rename to test/jdk/java/rmi/server/serverStackTrace/ServerStackTrace_Stub.java diff --git a/jdk/test/java/rmi/server/serverStackTrace/SuppressStackTraces.java b/test/jdk/java/rmi/server/serverStackTrace/SuppressStackTraces.java similarity index 100% rename from jdk/test/java/rmi/server/serverStackTrace/SuppressStackTraces.java rename to test/jdk/java/rmi/server/serverStackTrace/SuppressStackTraces.java diff --git a/jdk/test/java/rmi/server/useCustomRef/Ping.java b/test/jdk/java/rmi/server/useCustomRef/Ping.java similarity index 100% rename from jdk/test/java/rmi/server/useCustomRef/Ping.java rename to test/jdk/java/rmi/server/useCustomRef/Ping.java diff --git a/jdk/test/java/rmi/server/useCustomRef/UseCustomRef.java b/test/jdk/java/rmi/server/useCustomRef/UseCustomRef.java similarity index 100% rename from jdk/test/java/rmi/server/useCustomRef/UseCustomRef.java rename to test/jdk/java/rmi/server/useCustomRef/UseCustomRef.java diff --git a/jdk/test/java/rmi/server/useCustomRef/UseCustomRef_Skel.java b/test/jdk/java/rmi/server/useCustomRef/UseCustomRef_Skel.java similarity index 100% rename from jdk/test/java/rmi/server/useCustomRef/UseCustomRef_Skel.java rename to test/jdk/java/rmi/server/useCustomRef/UseCustomRef_Skel.java diff --git a/jdk/test/java/rmi/server/useCustomRef/UseCustomRef_Stub.java b/test/jdk/java/rmi/server/useCustomRef/UseCustomRef_Stub.java similarity index 100% rename from jdk/test/java/rmi/server/useCustomRef/UseCustomRef_Stub.java rename to test/jdk/java/rmi/server/useCustomRef/UseCustomRef_Stub.java diff --git a/jdk/test/java/rmi/server/useCustomRef/security.policy b/test/jdk/java/rmi/server/useCustomRef/security.policy similarity index 100% rename from jdk/test/java/rmi/server/useCustomRef/security.policy rename to test/jdk/java/rmi/server/useCustomRef/security.policy diff --git a/jdk/test/java/rmi/testlibrary/ActivationLibrary.java b/test/jdk/java/rmi/testlibrary/ActivationLibrary.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/ActivationLibrary.java rename to test/jdk/java/rmi/testlibrary/ActivationLibrary.java diff --git a/jdk/test/java/rmi/testlibrary/JavaVM.java b/test/jdk/java/rmi/testlibrary/JavaVM.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/JavaVM.java rename to test/jdk/java/rmi/testlibrary/JavaVM.java diff --git a/jdk/test/java/rmi/testlibrary/README.jcov b/test/jdk/java/rmi/testlibrary/README.jcov similarity index 100% rename from jdk/test/java/rmi/testlibrary/README.jcov rename to test/jdk/java/rmi/testlibrary/README.jcov diff --git a/jdk/test/java/rmi/testlibrary/RMID.java b/test/jdk/java/rmi/testlibrary/RMID.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/RMID.java rename to test/jdk/java/rmi/testlibrary/RMID.java diff --git a/jdk/test/java/rmi/testlibrary/RMIDSelectorProvider.java b/test/jdk/java/rmi/testlibrary/RMIDSelectorProvider.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/RMIDSelectorProvider.java rename to test/jdk/java/rmi/testlibrary/RMIDSelectorProvider.java diff --git a/jdk/test/java/rmi/testlibrary/RMIRegistryRunner.java b/test/jdk/java/rmi/testlibrary/RMIRegistryRunner.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/RMIRegistryRunner.java rename to test/jdk/java/rmi/testlibrary/RMIRegistryRunner.java diff --git a/jdk/test/java/rmi/testlibrary/RegistryRunner.java b/test/jdk/java/rmi/testlibrary/RegistryRunner.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/RegistryRunner.java rename to test/jdk/java/rmi/testlibrary/RegistryRunner.java diff --git a/jdk/test/java/rmi/testlibrary/RegistryVM.java b/test/jdk/java/rmi/testlibrary/RegistryVM.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/RegistryVM.java rename to test/jdk/java/rmi/testlibrary/RegistryVM.java diff --git a/jdk/test/java/rmi/testlibrary/RemoteExiter.java b/test/jdk/java/rmi/testlibrary/RemoteExiter.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/RemoteExiter.java rename to test/jdk/java/rmi/testlibrary/RemoteExiter.java diff --git a/jdk/test/java/rmi/testlibrary/StreamPipe.java b/test/jdk/java/rmi/testlibrary/StreamPipe.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/StreamPipe.java rename to test/jdk/java/rmi/testlibrary/StreamPipe.java diff --git a/jdk/test/java/rmi/testlibrary/TestFailedException.java b/test/jdk/java/rmi/testlibrary/TestFailedException.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/TestFailedException.java rename to test/jdk/java/rmi/testlibrary/TestFailedException.java diff --git a/jdk/test/java/rmi/testlibrary/TestLibrary.java b/test/jdk/java/rmi/testlibrary/TestLibrary.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/TestLibrary.java rename to test/jdk/java/rmi/testlibrary/TestLibrary.java diff --git a/jdk/test/java/rmi/testlibrary/TestParams.java b/test/jdk/java/rmi/testlibrary/TestParams.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/TestParams.java rename to test/jdk/java/rmi/testlibrary/TestParams.java diff --git a/jdk/test/java/rmi/testlibrary/TestSocketFactory.java b/test/jdk/java/rmi/testlibrary/TestSocketFactory.java similarity index 100% rename from jdk/test/java/rmi/testlibrary/TestSocketFactory.java rename to test/jdk/java/rmi/testlibrary/TestSocketFactory.java diff --git a/jdk/test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java b/test/jdk/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java similarity index 100% rename from jdk/test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java rename to test/jdk/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java diff --git a/jdk/test/java/rmi/transport/checkFQDN/CheckFQDN.java b/test/jdk/java/rmi/transport/checkFQDN/CheckFQDN.java similarity index 100% rename from jdk/test/java/rmi/transport/checkFQDN/CheckFQDN.java rename to test/jdk/java/rmi/transport/checkFQDN/CheckFQDN.java diff --git a/jdk/test/java/rmi/transport/checkFQDN/CheckFQDNClient.java b/test/jdk/java/rmi/transport/checkFQDN/CheckFQDNClient.java similarity index 100% rename from jdk/test/java/rmi/transport/checkFQDN/CheckFQDNClient.java rename to test/jdk/java/rmi/transport/checkFQDN/CheckFQDNClient.java diff --git a/jdk/test/java/rmi/transport/checkFQDN/CheckFQDN_Stub.java b/test/jdk/java/rmi/transport/checkFQDN/CheckFQDN_Stub.java similarity index 100% rename from jdk/test/java/rmi/transport/checkFQDN/CheckFQDN_Stub.java rename to test/jdk/java/rmi/transport/checkFQDN/CheckFQDN_Stub.java diff --git a/jdk/test/java/rmi/transport/checkFQDN/TellServerName.java b/test/jdk/java/rmi/transport/checkFQDN/TellServerName.java similarity index 100% rename from jdk/test/java/rmi/transport/checkFQDN/TellServerName.java rename to test/jdk/java/rmi/transport/checkFQDN/TellServerName.java diff --git a/jdk/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java b/test/jdk/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java similarity index 100% rename from jdk/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java rename to test/jdk/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java diff --git a/jdk/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak_Stub.java b/test/jdk/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak_Stub.java similarity index 100% rename from jdk/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak_Stub.java rename to test/jdk/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak_Stub.java diff --git a/jdk/test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeak.java b/test/jdk/java/rmi/transport/checkLeaseInfoLeak/LeaseLeak.java similarity index 100% rename from jdk/test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeak.java rename to test/jdk/java/rmi/transport/checkLeaseInfoLeak/LeaseLeak.java diff --git a/jdk/test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeakClient.java b/test/jdk/java/rmi/transport/checkLeaseInfoLeak/LeaseLeakClient.java similarity index 100% rename from jdk/test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeakClient.java rename to test/jdk/java/rmi/transport/checkLeaseInfoLeak/LeaseLeakClient.java diff --git a/jdk/test/java/rmi/transport/checkLeaseInfoLeak/security.policy b/test/jdk/java/rmi/transport/checkLeaseInfoLeak/security.policy similarity index 100% rename from jdk/test/java/rmi/transport/checkLeaseInfoLeak/security.policy rename to test/jdk/java/rmi/transport/checkLeaseInfoLeak/security.policy diff --git a/jdk/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java b/test/jdk/java/rmi/transport/closeServerSocket/CloseServerSocket.java similarity index 100% rename from jdk/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java rename to test/jdk/java/rmi/transport/closeServerSocket/CloseServerSocket.java diff --git a/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java b/test/jdk/java/rmi/transport/dgcDeadLock/DGCDeadLock.java similarity index 100% rename from jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java rename to test/jdk/java/rmi/transport/dgcDeadLock/DGCDeadLock.java diff --git a/jdk/test/java/rmi/transport/dgcDeadLock/Test.java b/test/jdk/java/rmi/transport/dgcDeadLock/Test.java similarity index 100% rename from jdk/test/java/rmi/transport/dgcDeadLock/Test.java rename to test/jdk/java/rmi/transport/dgcDeadLock/Test.java diff --git a/jdk/test/java/rmi/transport/dgcDeadLock/TestImpl.java b/test/jdk/java/rmi/transport/dgcDeadLock/TestImpl.java similarity index 100% rename from jdk/test/java/rmi/transport/dgcDeadLock/TestImpl.java rename to test/jdk/java/rmi/transport/dgcDeadLock/TestImpl.java diff --git a/jdk/test/java/rmi/transport/dgcDeadLock/TestImpl_Stub.java b/test/jdk/java/rmi/transport/dgcDeadLock/TestImpl_Stub.java similarity index 100% rename from jdk/test/java/rmi/transport/dgcDeadLock/TestImpl_Stub.java rename to test/jdk/java/rmi/transport/dgcDeadLock/TestImpl_Stub.java diff --git a/jdk/test/java/rmi/transport/dgcDeadLock/registry.security.policy b/test/jdk/java/rmi/transport/dgcDeadLock/registry.security.policy similarity index 100% rename from jdk/test/java/rmi/transport/dgcDeadLock/registry.security.policy rename to test/jdk/java/rmi/transport/dgcDeadLock/registry.security.policy diff --git a/jdk/test/java/rmi/transport/dgcDeadLock/security.policy b/test/jdk/java/rmi/transport/dgcDeadLock/security.policy similarity index 100% rename from jdk/test/java/rmi/transport/dgcDeadLock/security.policy rename to test/jdk/java/rmi/transport/dgcDeadLock/security.policy diff --git a/jdk/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java b/test/jdk/java/rmi/transport/handshakeFailure/HandshakeFailure.java similarity index 100% rename from jdk/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java rename to test/jdk/java/rmi/transport/handshakeFailure/HandshakeFailure.java diff --git a/jdk/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java b/test/jdk/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java similarity index 100% rename from jdk/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java rename to test/jdk/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java diff --git a/jdk/test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java b/test/jdk/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java similarity index 100% rename from jdk/test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java rename to test/jdk/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java diff --git a/jdk/test/java/rmi/transport/pinLastArguments/PinLastArguments.java b/test/jdk/java/rmi/transport/pinLastArguments/PinLastArguments.java similarity index 100% rename from jdk/test/java/rmi/transport/pinLastArguments/PinLastArguments.java rename to test/jdk/java/rmi/transport/pinLastArguments/PinLastArguments.java diff --git a/jdk/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java b/test/jdk/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java similarity index 100% rename from jdk/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java rename to test/jdk/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java diff --git a/jdk/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java b/test/jdk/java/rmi/transport/readTimeout/ReadTimeoutTest.java similarity index 100% rename from jdk/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java rename to test/jdk/java/rmi/transport/readTimeout/ReadTimeoutTest.java diff --git a/jdk/test/java/rmi/transport/readTimeout/TestIface.java b/test/jdk/java/rmi/transport/readTimeout/TestIface.java similarity index 100% rename from jdk/test/java/rmi/transport/readTimeout/TestIface.java rename to test/jdk/java/rmi/transport/readTimeout/TestIface.java diff --git a/jdk/test/java/rmi/transport/readTimeout/TestImpl.java b/test/jdk/java/rmi/transport/readTimeout/TestImpl.java similarity index 100% rename from jdk/test/java/rmi/transport/readTimeout/TestImpl.java rename to test/jdk/java/rmi/transport/readTimeout/TestImpl.java diff --git a/jdk/test/java/rmi/transport/readTimeout/TestImpl_Stub.java b/test/jdk/java/rmi/transport/readTimeout/TestImpl_Stub.java similarity index 100% rename from jdk/test/java/rmi/transport/readTimeout/TestImpl_Stub.java rename to test/jdk/java/rmi/transport/readTimeout/TestImpl_Stub.java diff --git a/jdk/test/java/rmi/transport/readTimeout/security.policy b/test/jdk/java/rmi/transport/readTimeout/security.policy similarity index 100% rename from jdk/test/java/rmi/transport/readTimeout/security.policy rename to test/jdk/java/rmi/transport/readTimeout/security.policy diff --git a/jdk/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java b/test/jdk/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java similarity index 100% rename from jdk/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java rename to test/jdk/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java diff --git a/jdk/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java b/test/jdk/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java similarity index 100% rename from jdk/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java rename to test/jdk/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java diff --git a/jdk/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak_Stub.java b/test/jdk/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak_Stub.java similarity index 100% rename from jdk/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak_Stub.java rename to test/jdk/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak_Stub.java diff --git a/jdk/test/java/security/AccessControlContext/CheckCtor.java b/test/jdk/java/security/AccessControlContext/CheckCtor.java similarity index 100% rename from jdk/test/java/security/AccessControlContext/CheckCtor.java rename to test/jdk/java/security/AccessControlContext/CheckCtor.java diff --git a/jdk/test/java/security/AccessControlContext/CheckNullPermission.java b/test/jdk/java/security/AccessControlContext/CheckNullPermission.java similarity index 100% rename from jdk/test/java/security/AccessControlContext/CheckNullPermission.java rename to test/jdk/java/security/AccessControlContext/CheckNullPermission.java diff --git a/jdk/test/java/security/AccessControlContext/FailureDebugOption.java b/test/jdk/java/security/AccessControlContext/FailureDebugOption.java similarity index 100% rename from jdk/test/java/security/AccessControlContext/FailureDebugOption.java rename to test/jdk/java/security/AccessControlContext/FailureDebugOption.java diff --git a/jdk/test/java/security/AccessControlContext/NullCombinerEquals.java b/test/jdk/java/security/AccessControlContext/NullCombinerEquals.java similarity index 100% rename from jdk/test/java/security/AccessControlContext/NullCombinerEquals.java rename to test/jdk/java/security/AccessControlContext/NullCombinerEquals.java diff --git a/jdk/test/java/security/AccessController/DoPrivAccomplice.java b/test/jdk/java/security/AccessController/DoPrivAccomplice.java similarity index 100% rename from jdk/test/java/security/AccessController/DoPrivAccomplice.java rename to test/jdk/java/security/AccessController/DoPrivAccomplice.java diff --git a/jdk/test/java/security/AccessController/DoPrivAccompliceTest.java b/test/jdk/java/security/AccessController/DoPrivAccompliceTest.java similarity index 100% rename from jdk/test/java/security/AccessController/DoPrivAccompliceTest.java rename to test/jdk/java/security/AccessController/DoPrivAccompliceTest.java diff --git a/jdk/test/java/security/AccessController/DoPrivTest.java b/test/jdk/java/security/AccessController/DoPrivTest.java similarity index 100% rename from jdk/test/java/security/AccessController/DoPrivTest.java rename to test/jdk/java/security/AccessController/DoPrivTest.java diff --git a/jdk/test/java/security/AccessController/LimitedDoPrivileged.java b/test/jdk/java/security/AccessController/LimitedDoPrivileged.java similarity index 100% rename from jdk/test/java/security/AccessController/LimitedDoPrivileged.java rename to test/jdk/java/security/AccessController/LimitedDoPrivileged.java diff --git a/jdk/test/java/security/AccessController/LimitedDoPrivilegedWithNullPerms.java b/test/jdk/java/security/AccessController/LimitedDoPrivilegedWithNullPerms.java similarity index 100% rename from jdk/test/java/security/AccessController/LimitedDoPrivilegedWithNullPerms.java rename to test/jdk/java/security/AccessController/LimitedDoPrivilegedWithNullPerms.java diff --git a/jdk/test/java/security/AccessController/LimitedDoPrivilegedWithThread.java b/test/jdk/java/security/AccessController/LimitedDoPrivilegedWithThread.java similarity index 100% rename from jdk/test/java/security/AccessController/LimitedDoPrivilegedWithThread.java rename to test/jdk/java/security/AccessController/LimitedDoPrivilegedWithThread.java diff --git a/jdk/test/java/security/AccessController/PreserveCombiner.java b/test/jdk/java/security/AccessController/PreserveCombiner.java similarity index 100% rename from jdk/test/java/security/AccessController/PreserveCombiner.java rename to test/jdk/java/security/AccessController/PreserveCombiner.java diff --git a/jdk/test/java/security/AccessController/policy b/test/jdk/java/security/AccessController/policy similarity index 100% rename from jdk/test/java/security/AccessController/policy rename to test/jdk/java/security/AccessController/policy diff --git a/jdk/test/java/security/BasicPermission/BasicPermissionCollection.java b/test/jdk/java/security/BasicPermission/BasicPermissionCollection.java similarity index 100% rename from jdk/test/java/security/BasicPermission/BasicPermissionCollection.java rename to test/jdk/java/security/BasicPermission/BasicPermissionCollection.java diff --git a/jdk/test/java/security/BasicPermission/EqualsImplies.java b/test/jdk/java/security/BasicPermission/EqualsImplies.java similarity index 100% rename from jdk/test/java/security/BasicPermission/EqualsImplies.java rename to test/jdk/java/security/BasicPermission/EqualsImplies.java diff --git a/jdk/test/java/security/BasicPermission/ExitVMEquals.java b/test/jdk/java/security/BasicPermission/ExitVMEquals.java similarity index 100% rename from jdk/test/java/security/BasicPermission/ExitVMEquals.java rename to test/jdk/java/security/BasicPermission/ExitVMEquals.java diff --git a/jdk/test/java/security/BasicPermission/Homogeneity.java b/test/jdk/java/security/BasicPermission/Homogeneity.java similarity index 100% rename from jdk/test/java/security/BasicPermission/Homogeneity.java rename to test/jdk/java/security/BasicPermission/Homogeneity.java diff --git a/jdk/test/java/security/BasicPermission/MixedBasicPermissions.java b/test/jdk/java/security/BasicPermission/MixedBasicPermissions.java similarity index 100% rename from jdk/test/java/security/BasicPermission/MixedBasicPermissions.java rename to test/jdk/java/security/BasicPermission/MixedBasicPermissions.java diff --git a/jdk/test/java/security/BasicPermission/NullOrEmptyName.java b/test/jdk/java/security/BasicPermission/NullOrEmptyName.java similarity index 100% rename from jdk/test/java/security/BasicPermission/NullOrEmptyName.java rename to test/jdk/java/security/BasicPermission/NullOrEmptyName.java diff --git a/jdk/test/java/security/BasicPermission/PermClass.1.2.1 b/test/jdk/java/security/BasicPermission/PermClass.1.2.1 similarity index 100% rename from jdk/test/java/security/BasicPermission/PermClass.1.2.1 rename to test/jdk/java/security/BasicPermission/PermClass.1.2.1 diff --git a/jdk/test/java/security/BasicPermission/PermClass.1.3.1 b/test/jdk/java/security/BasicPermission/PermClass.1.3.1 similarity index 100% rename from jdk/test/java/security/BasicPermission/PermClass.1.3.1 rename to test/jdk/java/security/BasicPermission/PermClass.1.3.1 diff --git a/jdk/test/java/security/BasicPermission/PermClass.1.4 b/test/jdk/java/security/BasicPermission/PermClass.1.4 similarity index 100% rename from jdk/test/java/security/BasicPermission/PermClass.1.4 rename to test/jdk/java/security/BasicPermission/PermClass.1.4 diff --git a/jdk/test/java/security/BasicPermission/PermClass.java b/test/jdk/java/security/BasicPermission/PermClass.java similarity index 100% rename from jdk/test/java/security/BasicPermission/PermClass.java rename to test/jdk/java/security/BasicPermission/PermClass.java diff --git a/jdk/test/java/security/BasicPermission/SerialVersion.1.2.1 b/test/jdk/java/security/BasicPermission/SerialVersion.1.2.1 similarity index 100% rename from jdk/test/java/security/BasicPermission/SerialVersion.1.2.1 rename to test/jdk/java/security/BasicPermission/SerialVersion.1.2.1 diff --git a/jdk/test/java/security/BasicPermission/SerialVersion.1.3.1 b/test/jdk/java/security/BasicPermission/SerialVersion.1.3.1 similarity index 100% rename from jdk/test/java/security/BasicPermission/SerialVersion.1.3.1 rename to test/jdk/java/security/BasicPermission/SerialVersion.1.3.1 diff --git a/jdk/test/java/security/BasicPermission/SerialVersion.1.4 b/test/jdk/java/security/BasicPermission/SerialVersion.1.4 similarity index 100% rename from jdk/test/java/security/BasicPermission/SerialVersion.1.4 rename to test/jdk/java/security/BasicPermission/SerialVersion.1.4 diff --git a/jdk/test/java/security/BasicPermission/SerialVersion.java b/test/jdk/java/security/BasicPermission/SerialVersion.java similarity index 100% rename from jdk/test/java/security/BasicPermission/SerialVersion.java rename to test/jdk/java/security/BasicPermission/SerialVersion.java diff --git a/jdk/test/java/security/BasicPermission/Wildcard.java b/test/jdk/java/security/BasicPermission/Wildcard.java similarity index 100% rename from jdk/test/java/security/BasicPermission/Wildcard.java rename to test/jdk/java/security/BasicPermission/Wildcard.java diff --git a/jdk/test/java/security/CodeSigner/Serialize.java b/test/jdk/java/security/CodeSigner/Serialize.java similarity index 100% rename from jdk/test/java/security/CodeSigner/Serialize.java rename to test/jdk/java/security/CodeSigner/Serialize.java diff --git a/jdk/test/java/security/CodeSigner/cert_file b/test/jdk/java/security/CodeSigner/cert_file similarity index 100% rename from jdk/test/java/security/CodeSigner/cert_file rename to test/jdk/java/security/CodeSigner/cert_file diff --git a/jdk/test/java/security/CodeSource/Implies.java b/test/jdk/java/security/CodeSource/Implies.java similarity index 100% rename from jdk/test/java/security/CodeSource/Implies.java rename to test/jdk/java/security/CodeSource/Implies.java diff --git a/jdk/test/java/security/Exceptions/ChainingConstructors.java b/test/jdk/java/security/Exceptions/ChainingConstructors.java similarity index 100% rename from jdk/test/java/security/Exceptions/ChainingConstructors.java rename to test/jdk/java/security/Exceptions/ChainingConstructors.java diff --git a/jdk/test/java/security/Identity/EqualsHashCodeContract.java b/test/jdk/java/security/Identity/EqualsHashCodeContract.java similarity index 100% rename from jdk/test/java/security/Identity/EqualsHashCodeContract.java rename to test/jdk/java/security/Identity/EqualsHashCodeContract.java diff --git a/jdk/test/java/security/IdentityScope/NoDefaultSystemScope.java b/test/jdk/java/security/IdentityScope/NoDefaultSystemScope.java similarity index 100% rename from jdk/test/java/security/IdentityScope/NoDefaultSystemScope.java rename to test/jdk/java/security/IdentityScope/NoDefaultSystemScope.java diff --git a/jdk/test/java/security/KeyFactory/Failover.java b/test/jdk/java/security/KeyFactory/Failover.java similarity index 100% rename from jdk/test/java/security/KeyFactory/Failover.java rename to test/jdk/java/security/KeyFactory/Failover.java diff --git a/jdk/test/java/security/KeyFactory/GenerateRSAPrivateCrtKey.java b/test/jdk/java/security/KeyFactory/GenerateRSAPrivateCrtKey.java similarity index 100% rename from jdk/test/java/security/KeyFactory/GenerateRSAPrivateCrtKey.java rename to test/jdk/java/security/KeyFactory/GenerateRSAPrivateCrtKey.java diff --git a/jdk/test/java/security/KeyPairGenerator/Failover.java b/test/jdk/java/security/KeyPairGenerator/Failover.java similarity index 100% rename from jdk/test/java/security/KeyPairGenerator/Failover.java rename to test/jdk/java/security/KeyPairGenerator/Failover.java diff --git a/jdk/test/java/security/KeyPairGenerator/FinalizeHalf.java b/test/jdk/java/security/KeyPairGenerator/FinalizeHalf.java similarity index 100% rename from jdk/test/java/security/KeyPairGenerator/FinalizeHalf.java rename to test/jdk/java/security/KeyPairGenerator/FinalizeHalf.java diff --git a/jdk/test/java/security/KeyPairGenerator/GenerateKeypair.java b/test/jdk/java/security/KeyPairGenerator/GenerateKeypair.java similarity index 100% rename from jdk/test/java/security/KeyPairGenerator/GenerateKeypair.java rename to test/jdk/java/security/KeyPairGenerator/GenerateKeypair.java diff --git a/jdk/test/java/security/KeyPairGenerator/GenerateRSAKeyPair.java b/test/jdk/java/security/KeyPairGenerator/GenerateRSAKeyPair.java similarity index 100% rename from jdk/test/java/security/KeyPairGenerator/GenerateRSAKeyPair.java rename to test/jdk/java/security/KeyPairGenerator/GenerateRSAKeyPair.java diff --git a/jdk/test/java/security/KeyPairGenerator/SolarisShortDSA.java b/test/jdk/java/security/KeyPairGenerator/SolarisShortDSA.java similarity index 100% rename from jdk/test/java/security/KeyPairGenerator/SolarisShortDSA.java rename to test/jdk/java/security/KeyPairGenerator/SolarisShortDSA.java diff --git a/jdk/test/java/security/KeyRep/AES.pre.1.5.key b/test/jdk/java/security/KeyRep/AES.pre.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/AES.pre.1.5.key rename to test/jdk/java/security/KeyRep/AES.pre.1.5.key diff --git a/jdk/test/java/security/KeyRep/Blowfish.pre.1.5.key b/test/jdk/java/security/KeyRep/Blowfish.pre.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/Blowfish.pre.1.5.key rename to test/jdk/java/security/KeyRep/Blowfish.pre.1.5.key diff --git a/jdk/test/java/security/KeyRep/DES.pre.1.5.key b/test/jdk/java/security/KeyRep/DES.pre.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/DES.pre.1.5.key rename to test/jdk/java/security/KeyRep/DES.pre.1.5.key diff --git a/jdk/test/java/security/KeyRep/DESede.pre.1.5.key b/test/jdk/java/security/KeyRep/DESede.pre.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/DESede.pre.1.5.key rename to test/jdk/java/security/KeyRep/DESede.pre.1.5.key diff --git a/jdk/test/java/security/KeyRep/DH.pre.1.5.key b/test/jdk/java/security/KeyRep/DH.pre.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/DH.pre.1.5.key rename to test/jdk/java/security/KeyRep/DH.pre.1.5.key diff --git a/jdk/test/java/security/KeyRep/DSA.1.5.key b/test/jdk/java/security/KeyRep/DSA.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/DSA.1.5.key rename to test/jdk/java/security/KeyRep/DSA.1.5.key diff --git a/jdk/test/java/security/KeyRep/DSA.pre.1.5.key b/test/jdk/java/security/KeyRep/DSA.pre.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/DSA.pre.1.5.key rename to test/jdk/java/security/KeyRep/DSA.pre.1.5.key diff --git a/jdk/test/java/security/KeyRep/HmacMD5.pre.1.5.key b/test/jdk/java/security/KeyRep/HmacMD5.pre.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/HmacMD5.pre.1.5.key rename to test/jdk/java/security/KeyRep/HmacMD5.pre.1.5.key diff --git a/jdk/test/java/security/KeyRep/HmacSHA1.pre.1.5.key b/test/jdk/java/security/KeyRep/HmacSHA1.pre.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/HmacSHA1.pre.1.5.key rename to test/jdk/java/security/KeyRep/HmacSHA1.pre.1.5.key diff --git a/jdk/test/java/security/KeyRep/PBE.pre.1.5.key b/test/jdk/java/security/KeyRep/PBE.pre.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/PBE.pre.1.5.key rename to test/jdk/java/security/KeyRep/PBE.pre.1.5.key diff --git a/jdk/test/java/security/KeyRep/RC5.pre.1.5.key b/test/jdk/java/security/KeyRep/RC5.pre.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/RC5.pre.1.5.key rename to test/jdk/java/security/KeyRep/RC5.pre.1.5.key diff --git a/jdk/test/java/security/KeyRep/RSA.1.5.key b/test/jdk/java/security/KeyRep/RSA.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/RSA.1.5.key rename to test/jdk/java/security/KeyRep/RSA.1.5.key diff --git a/jdk/test/java/security/KeyRep/RSA.pre.1.5.key b/test/jdk/java/security/KeyRep/RSA.pre.1.5.key similarity index 100% rename from jdk/test/java/security/KeyRep/RSA.pre.1.5.key rename to test/jdk/java/security/KeyRep/RSA.pre.1.5.key diff --git a/jdk/test/java/security/KeyRep/Serial.java b/test/jdk/java/security/KeyRep/Serial.java similarity index 100% rename from jdk/test/java/security/KeyRep/Serial.java rename to test/jdk/java/security/KeyRep/Serial.java diff --git a/jdk/test/java/security/KeyRep/Serial.policy b/test/jdk/java/security/KeyRep/Serial.policy similarity index 100% rename from jdk/test/java/security/KeyRep/Serial.policy rename to test/jdk/java/security/KeyRep/Serial.policy diff --git a/jdk/test/java/security/KeyRep/SerialDSAPubKey.java b/test/jdk/java/security/KeyRep/SerialDSAPubKey.java similarity index 100% rename from jdk/test/java/security/KeyRep/SerialDSAPubKey.java rename to test/jdk/java/security/KeyRep/SerialDSAPubKey.java diff --git a/jdk/test/java/security/KeyRep/SerialDSAPubKey.policy b/test/jdk/java/security/KeyRep/SerialDSAPubKey.policy similarity index 100% rename from jdk/test/java/security/KeyRep/SerialDSAPubKey.policy rename to test/jdk/java/security/KeyRep/SerialDSAPubKey.policy diff --git a/jdk/test/java/security/KeyRep/SerialOld.java b/test/jdk/java/security/KeyRep/SerialOld.java similarity index 100% rename from jdk/test/java/security/KeyRep/SerialOld.java rename to test/jdk/java/security/KeyRep/SerialOld.java diff --git a/jdk/test/java/security/KeyRep/SerialOld.policy b/test/jdk/java/security/KeyRep/SerialOld.policy similarity index 100% rename from jdk/test/java/security/KeyRep/SerialOld.policy rename to test/jdk/java/security/KeyRep/SerialOld.policy diff --git a/jdk/test/java/security/KeyStore/CheckInputStream.java b/test/jdk/java/security/KeyStore/CheckInputStream.java similarity index 100% rename from jdk/test/java/security/KeyStore/CheckInputStream.java rename to test/jdk/java/security/KeyStore/CheckInputStream.java diff --git a/jdk/test/java/security/KeyStore/DefaultEntryType.java b/test/jdk/java/security/KeyStore/DefaultEntryType.java similarity index 100% rename from jdk/test/java/security/KeyStore/DefaultEntryType.java rename to test/jdk/java/security/KeyStore/DefaultEntryType.java diff --git a/jdk/test/java/security/KeyStore/EntryMethods.java b/test/jdk/java/security/KeyStore/EntryMethods.java similarity index 100% rename from jdk/test/java/security/KeyStore/EntryMethods.java rename to test/jdk/java/security/KeyStore/EntryMethods.java diff --git a/jdk/test/java/security/KeyStore/EntryMethods.pre15.keystore b/test/jdk/java/security/KeyStore/EntryMethods.pre15.keystore similarity index 100% rename from jdk/test/java/security/KeyStore/EntryMethods.pre15.keystore rename to test/jdk/java/security/KeyStore/EntryMethods.pre15.keystore diff --git a/jdk/test/java/security/KeyStore/KeyStoreBuilder.java b/test/jdk/java/security/KeyStore/KeyStoreBuilder.java similarity index 100% rename from jdk/test/java/security/KeyStore/KeyStoreBuilder.java rename to test/jdk/java/security/KeyStore/KeyStoreBuilder.java diff --git a/jdk/test/java/security/KeyStore/PBETest.java b/test/jdk/java/security/KeyStore/PBETest.java similarity index 100% rename from jdk/test/java/security/KeyStore/PBETest.java rename to test/jdk/java/security/KeyStore/PBETest.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/CheckDefaults.java b/test/jdk/java/security/KeyStore/PKCS12/CheckDefaults.java similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/CheckDefaults.java rename to test/jdk/java/security/KeyStore/PKCS12/CheckDefaults.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/ConvertP12Test.java b/test/jdk/java/security/KeyStore/PKCS12/ConvertP12Test.java similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/ConvertP12Test.java rename to test/jdk/java/security/KeyStore/PKCS12/ConvertP12Test.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/EntryProtectionTest.java b/test/jdk/java/security/KeyStore/PKCS12/EntryProtectionTest.java similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/EntryProtectionTest.java rename to test/jdk/java/security/KeyStore/PKCS12/EntryProtectionTest.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/KeytoolReaderP12Test.java b/test/jdk/java/security/KeyStore/PKCS12/KeytoolReaderP12Test.java similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/KeytoolReaderP12Test.java rename to test/jdk/java/security/KeyStore/PKCS12/KeytoolReaderP12Test.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/KeytoolWriteP12Test.java b/test/jdk/java/security/KeyStore/PKCS12/KeytoolWriteP12Test.java similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/KeytoolWriteP12Test.java rename to test/jdk/java/security/KeyStore/PKCS12/KeytoolWriteP12Test.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/MetadataEmptyTest.java b/test/jdk/java/security/KeyStore/PKCS12/MetadataEmptyTest.java similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/MetadataEmptyTest.java rename to test/jdk/java/security/KeyStore/PKCS12/MetadataEmptyTest.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/MetadataStoreLoadTest.java b/test/jdk/java/security/KeyStore/PKCS12/MetadataStoreLoadTest.java similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/MetadataStoreLoadTest.java rename to test/jdk/java/security/KeyStore/PKCS12/MetadataStoreLoadTest.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/README b/test/jdk/java/security/KeyStore/PKCS12/README similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/README rename to test/jdk/java/security/KeyStore/PKCS12/README diff --git a/jdk/test/java/security/KeyStore/PKCS12/ReadP12Test.java b/test/jdk/java/security/KeyStore/PKCS12/ReadP12Test.java similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/ReadP12Test.java rename to test/jdk/java/security/KeyStore/PKCS12/ReadP12Test.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/StoreTrustedCertAPITest.java b/test/jdk/java/security/KeyStore/PKCS12/StoreTrustedCertAPITest.java similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/StoreTrustedCertAPITest.java rename to test/jdk/java/security/KeyStore/PKCS12/StoreTrustedCertAPITest.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/StoreTrustedCertKeytool.java b/test/jdk/java/security/KeyStore/PKCS12/StoreTrustedCertKeytool.java similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/StoreTrustedCertKeytool.java rename to test/jdk/java/security/KeyStore/PKCS12/StoreTrustedCertKeytool.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/Utils.java b/test/jdk/java/security/KeyStore/PKCS12/Utils.java similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/Utils.java rename to test/jdk/java/security/KeyStore/PKCS12/Utils.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/WriteP12Test.java b/test/jdk/java/security/KeyStore/PKCS12/WriteP12Test.java similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/WriteP12Test.java rename to test/jdk/java/security/KeyStore/PKCS12/WriteP12Test.java diff --git a/jdk/test/java/security/KeyStore/PKCS12/api_cert_chain.p12.data b/test/jdk/java/security/KeyStore/PKCS12/api_cert_chain.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/api_cert_chain.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/api_cert_chain.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/api_cert_chain.p12_expected.data b/test/jdk/java/security/KeyStore/PKCS12/api_cert_chain.p12_expected.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/api_cert_chain.p12_expected.data rename to test/jdk/java/security/KeyStore/PKCS12/api_cert_chain.p12_expected.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/api_private_key.p12.data b/test/jdk/java/security/KeyStore/PKCS12/api_private_key.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/api_private_key.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/api_private_key.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/api_private_key.p12_expected.data b/test/jdk/java/security/KeyStore/PKCS12/api_private_key.p12_expected.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/api_private_key.p12_expected.data rename to test/jdk/java/security/KeyStore/PKCS12/api_private_key.p12_expected.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/api_private_key_not_match.p12.data b/test/jdk/java/security/KeyStore/PKCS12/api_private_key_not_match.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/api_private_key_not_match.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/api_private_key_not_match.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/api_private_key_not_match.p12_expected.data b/test/jdk/java/security/KeyStore/PKCS12/api_private_key_not_match.p12_expected.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/api_private_key_not_match.p12_expected.data rename to test/jdk/java/security/KeyStore/PKCS12/api_private_key_not_match.p12_expected.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/api_two_pass.p12.data b/test/jdk/java/security/KeyStore/PKCS12/api_two_pass.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/api_two_pass.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/api_two_pass.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/api_two_pass.p12_expected.data b/test/jdk/java/security/KeyStore/PKCS12/api_two_pass.p12_expected.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/api_two_pass.p12_expected.data rename to test/jdk/java/security/KeyStore/PKCS12/api_two_pass.p12_expected.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/ie_jceks_chain.pfx.data b/test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/ie_jceks_chain.pfx.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/ie_jceks_chain.pfx.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/ie_jceks_chain.pfx.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/ie_jks_chain.pfx.data b/test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/ie_jks_chain.pfx.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/ie_jks_chain.pfx.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/ie_jks_chain.pfx.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jceks_selfsigned.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jceks_selfsigned.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jceks_selfsigned.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jceks_selfsigned.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jceks_twoentry.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jceks_twoentry.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jceks_twoentry.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jceks_twoentry.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jceks_twopass.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jceks_twopass.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jceks_twopass.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jceks_twopass.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jks_selfsigned.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jks_selfsigned.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jks_selfsigned.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jks_selfsigned.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jks_twoentry.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jks_twoentry.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jks_twoentry.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jks_twoentry.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jks_twopass.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jks_twopass.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jks_twopass.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/jdk_jks_twopass.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/keystoreCA.jceks.data b/test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/keystoreCA.jceks.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/convertP12/keystoreCA.jceks.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/convertP12/keystoreCA.jceks.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/readP12/ie_chain.pfx.data b/test/jdk/java/security/KeyStore/PKCS12/certs/readP12/ie_chain.pfx.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/readP12/ie_chain.pfx.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/readP12/ie_chain.pfx.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/readP12/ie_self.pfx.data b/test/jdk/java/security/KeyStore/PKCS12/certs/readP12/ie_self.pfx.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/readP12/ie_self.pfx.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/readP12/ie_self.pfx.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/readP12/jdk_chain.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/readP12/jdk_chain.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/readP12/jdk_chain.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/readP12/jdk_chain.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/readP12/jdk_self.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/readP12/jdk_self.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/readP12/jdk_self.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/readP12/jdk_self.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/readP12/mozilla_chain.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/readP12/mozilla_chain.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/readP12/mozilla_chain.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/readP12/mozilla_chain.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/readP12/mozilla_self.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/readP12/mozilla_self.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/readP12/mozilla_self.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/readP12/mozilla_self.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/readP12/mozilla_twoentries.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/readP12/mozilla_twoentries.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/readP12/mozilla_twoentries.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/readP12/mozilla_twoentries.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/readP12/netscape_chain.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/readP12/netscape_chain.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/readP12/netscape_chain.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/readP12/netscape_chain.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/readP12/netscape_self.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/readP12/netscape_self.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/readP12/netscape_self.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/readP12/netscape_self.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/readP12/netscape_twoentries.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/readP12/netscape_twoentries.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/readP12/netscape_twoentries.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/readP12/netscape_twoentries.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/readP12/openssl.p12.data b/test/jdk/java/security/KeyStore/PKCS12/certs/readP12/openssl.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/readP12/openssl.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/readP12/openssl.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/writeP12/keystoreCA.jks.data b/test/jdk/java/security/KeyStore/PKCS12/certs/writeP12/keystoreCA.jks.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/writeP12/keystoreCA.jks.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/writeP12/keystoreCA.jks.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/certs/writeP12/keystoreEU.jks.data b/test/jdk/java/security/KeyStore/PKCS12/certs/writeP12/keystoreEU.jks.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/certs/writeP12/keystoreEU.jks.data rename to test/jdk/java/security/KeyStore/PKCS12/certs/writeP12/keystoreEU.jks.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/ie_chain.pfx.data b/test/jdk/java/security/KeyStore/PKCS12/ie_chain.pfx.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/ie_chain.pfx.data rename to test/jdk/java/security/KeyStore/PKCS12/ie_chain.pfx.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/ie_chain.pfx.pem b/test/jdk/java/security/KeyStore/PKCS12/ie_chain.pfx.pem similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/ie_chain.pfx.pem rename to test/jdk/java/security/KeyStore/PKCS12/ie_chain.pfx.pem diff --git a/jdk/test/java/security/KeyStore/PKCS12/ie_self.pfx.data b/test/jdk/java/security/KeyStore/PKCS12/ie_self.pfx.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/ie_self.pfx.data rename to test/jdk/java/security/KeyStore/PKCS12/ie_self.pfx.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/ie_self.pfx.pem b/test/jdk/java/security/KeyStore/PKCS12/ie_self.pfx.pem similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/ie_self.pfx.pem rename to test/jdk/java/security/KeyStore/PKCS12/ie_self.pfx.pem diff --git a/jdk/test/java/security/KeyStore/PKCS12/mozilla_self.p12.data b/test/jdk/java/security/KeyStore/PKCS12/mozilla_self.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/mozilla_self.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/mozilla_self.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/mozilla_self.p12.pem b/test/jdk/java/security/KeyStore/PKCS12/mozilla_self.p12.pem similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/mozilla_self.p12.pem rename to test/jdk/java/security/KeyStore/PKCS12/mozilla_self.p12.pem diff --git a/jdk/test/java/security/KeyStore/PKCS12/netscape_self.p12.data b/test/jdk/java/security/KeyStore/PKCS12/netscape_self.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/netscape_self.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/netscape_self.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/netscape_self.p12.pem b/test/jdk/java/security/KeyStore/PKCS12/netscape_self.p12.pem similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/netscape_self.p12.pem rename to test/jdk/java/security/KeyStore/PKCS12/netscape_self.p12.pem diff --git a/jdk/test/java/security/KeyStore/PKCS12/openssl.p12.data b/test/jdk/java/security/KeyStore/PKCS12/openssl.p12.data similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/openssl.p12.data rename to test/jdk/java/security/KeyStore/PKCS12/openssl.p12.data diff --git a/jdk/test/java/security/KeyStore/PKCS12/openssl.p12.pem b/test/jdk/java/security/KeyStore/PKCS12/openssl.p12.pem similarity index 100% rename from jdk/test/java/security/KeyStore/PKCS12/openssl.p12.pem rename to test/jdk/java/security/KeyStore/PKCS12/openssl.p12.pem diff --git a/jdk/test/java/security/KeyStore/ProbeKeystores.java b/test/jdk/java/security/KeyStore/ProbeKeystores.java similarity index 100% rename from jdk/test/java/security/KeyStore/ProbeKeystores.java rename to test/jdk/java/security/KeyStore/ProbeKeystores.java diff --git a/jdk/test/java/security/KeyStore/TestKeyStoreBasic.java b/test/jdk/java/security/KeyStore/TestKeyStoreBasic.java similarity index 100% rename from jdk/test/java/security/KeyStore/TestKeyStoreBasic.java rename to test/jdk/java/security/KeyStore/TestKeyStoreBasic.java diff --git a/jdk/test/java/security/KeyStore/TestKeyStoreEntry.java b/test/jdk/java/security/KeyStore/TestKeyStoreEntry.java similarity index 100% rename from jdk/test/java/security/KeyStore/TestKeyStoreEntry.java rename to test/jdk/java/security/KeyStore/TestKeyStoreEntry.java diff --git a/jdk/test/java/security/KeyStore/keystore.jks b/test/jdk/java/security/KeyStore/keystore.jks similarity index 100% rename from jdk/test/java/security/KeyStore/keystore.jks rename to test/jdk/java/security/KeyStore/keystore.jks diff --git a/jdk/test/java/security/KeyStore/trusted.pem b/test/jdk/java/security/KeyStore/trusted.pem similarity index 100% rename from jdk/test/java/security/KeyStore/trusted.pem rename to test/jdk/java/security/KeyStore/trusted.pem diff --git a/jdk/test/java/security/MessageDigest/ArgumentSanity.java b/test/jdk/java/security/MessageDigest/ArgumentSanity.java similarity index 100% rename from jdk/test/java/security/MessageDigest/ArgumentSanity.java rename to test/jdk/java/security/MessageDigest/ArgumentSanity.java diff --git a/jdk/test/java/security/MessageDigest/ByteBuffers.java b/test/jdk/java/security/MessageDigest/ByteBuffers.java similarity index 100% rename from jdk/test/java/security/MessageDigest/ByteBuffers.java rename to test/jdk/java/security/MessageDigest/ByteBuffers.java diff --git a/jdk/test/java/security/MessageDigest/TestDigestIOStream.java b/test/jdk/java/security/MessageDigest/TestDigestIOStream.java similarity index 100% rename from jdk/test/java/security/MessageDigest/TestDigestIOStream.java rename to test/jdk/java/security/MessageDigest/TestDigestIOStream.java diff --git a/jdk/test/java/security/MessageDigest/TestSameLength.java b/test/jdk/java/security/MessageDigest/TestSameLength.java similarity index 100% rename from jdk/test/java/security/MessageDigest/TestSameLength.java rename to test/jdk/java/security/MessageDigest/TestSameLength.java diff --git a/jdk/test/java/security/MessageDigest/TestSameValue.java b/test/jdk/java/security/MessageDigest/TestSameValue.java similarity index 100% rename from jdk/test/java/security/MessageDigest/TestSameValue.java rename to test/jdk/java/security/MessageDigest/TestSameValue.java diff --git a/jdk/test/java/security/MessageDigest/UnsupportedProvider.java b/test/jdk/java/security/MessageDigest/UnsupportedProvider.java similarity index 100% rename from jdk/test/java/security/MessageDigest/UnsupportedProvider.java rename to test/jdk/java/security/MessageDigest/UnsupportedProvider.java diff --git a/jdk/test/java/security/Permission/NullName.java b/test/jdk/java/security/Permission/NullName.java similarity index 100% rename from jdk/test/java/security/Permission/NullName.java rename to test/jdk/java/security/Permission/NullName.java diff --git a/jdk/test/java/security/Permission/ToString.java b/test/jdk/java/security/Permission/ToString.java similarity index 100% rename from jdk/test/java/security/Permission/ToString.java rename to test/jdk/java/security/Permission/ToString.java diff --git a/jdk/test/java/security/PermissionCollection/AddToReadOnlyPermissionCollection.java b/test/jdk/java/security/PermissionCollection/AddToReadOnlyPermissionCollection.java similarity index 100% rename from jdk/test/java/security/PermissionCollection/AddToReadOnlyPermissionCollection.java rename to test/jdk/java/security/PermissionCollection/AddToReadOnlyPermissionCollection.java diff --git a/jdk/test/java/security/PermissionCollection/Concurrent.java b/test/jdk/java/security/PermissionCollection/Concurrent.java similarity index 100% rename from jdk/test/java/security/PermissionCollection/Concurrent.java rename to test/jdk/java/security/PermissionCollection/Concurrent.java diff --git a/jdk/test/java/security/PermissionCollection/PermissionCollectionStreamTest.java b/test/jdk/java/security/PermissionCollection/PermissionCollectionStreamTest.java similarity index 100% rename from jdk/test/java/security/PermissionCollection/PermissionCollectionStreamTest.java rename to test/jdk/java/security/PermissionCollection/PermissionCollectionStreamTest.java diff --git a/jdk/test/java/security/Policy/Dynamic/DynamicPolicy.java b/test/jdk/java/security/Policy/Dynamic/DynamicPolicy.java similarity index 100% rename from jdk/test/java/security/Policy/Dynamic/DynamicPolicy.java rename to test/jdk/java/security/Policy/Dynamic/DynamicPolicy.java diff --git a/jdk/test/java/security/Policy/Dynamic/TestDynamicPolicy.java b/test/jdk/java/security/Policy/Dynamic/TestDynamicPolicy.java similarity index 100% rename from jdk/test/java/security/Policy/Dynamic/TestDynamicPolicy.java rename to test/jdk/java/security/Policy/Dynamic/TestDynamicPolicy.java diff --git a/jdk/test/java/security/Policy/Dynamic/setpolicy.jp b/test/jdk/java/security/Policy/Dynamic/setpolicy.jp similarity index 100% rename from jdk/test/java/security/Policy/Dynamic/setpolicy.jp rename to test/jdk/java/security/Policy/Dynamic/setpolicy.jp diff --git a/jdk/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest.java b/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest.java similarity index 100% rename from jdk/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest.java rename to test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest.java diff --git a/jdk/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest1.policy b/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest1.policy similarity index 100% rename from jdk/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest1.policy rename to test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest1.policy diff --git a/jdk/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest2.policy b/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest2.policy similarity index 100% rename from jdk/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest2.policy rename to test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest2.policy diff --git a/jdk/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest3.policy b/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest3.policy similarity index 100% rename from jdk/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest3.policy rename to test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest3.policy diff --git a/jdk/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java b/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java similarity index 100% rename from jdk/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java rename to test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java diff --git a/jdk/test/java/security/Policy/ExtensiblePolicy/TVJar/TVPermission.java b/test/jdk/java/security/Policy/ExtensiblePolicy/TVJar/TVPermission.java similarity index 100% rename from jdk/test/java/security/Policy/ExtensiblePolicy/TVJar/TVPermission.java rename to test/jdk/java/security/Policy/ExtensiblePolicy/TVJar/TVPermission.java diff --git a/jdk/test/java/security/Policy/GetInstance/GetInstance.java b/test/jdk/java/security/Policy/GetInstance/GetInstance.java similarity index 100% rename from jdk/test/java/security/Policy/GetInstance/GetInstance.java rename to test/jdk/java/security/Policy/GetInstance/GetInstance.java diff --git a/jdk/test/java/security/Policy/GetInstance/GetInstance.policy b/test/jdk/java/security/Policy/GetInstance/GetInstance.policy similarity index 100% rename from jdk/test/java/security/Policy/GetInstance/GetInstance.policy rename to test/jdk/java/security/Policy/GetInstance/GetInstance.policy diff --git a/jdk/test/java/security/Policy/GetInstance/GetInstance.policyURL b/test/jdk/java/security/Policy/GetInstance/GetInstance.policyURL similarity index 100% rename from jdk/test/java/security/Policy/GetInstance/GetInstance.policyURL rename to test/jdk/java/security/Policy/GetInstance/GetInstance.policyURL diff --git a/jdk/test/java/security/Policy/GetInstance/GetInstancePolicySpi.java b/test/jdk/java/security/Policy/GetInstance/GetInstancePolicySpi.java similarity index 100% rename from jdk/test/java/security/Policy/GetInstance/GetInstancePolicySpi.java rename to test/jdk/java/security/Policy/GetInstance/GetInstancePolicySpi.java diff --git a/jdk/test/java/security/Policy/GetInstance/GetInstanceProvider.java b/test/jdk/java/security/Policy/GetInstance/GetInstanceProvider.java similarity index 100% rename from jdk/test/java/security/Policy/GetInstance/GetInstanceProvider.java rename to test/jdk/java/security/Policy/GetInstance/GetInstanceProvider.java diff --git a/jdk/test/java/security/Policy/GetInstance/GetInstanceSecurity.java b/test/jdk/java/security/Policy/GetInstance/GetInstanceSecurity.java similarity index 100% rename from jdk/test/java/security/Policy/GetInstance/GetInstanceSecurity.java rename to test/jdk/java/security/Policy/GetInstance/GetInstanceSecurity.java diff --git a/jdk/test/java/security/Policy/GetInstance/GetInstanceSecurity.policy b/test/jdk/java/security/Policy/GetInstance/GetInstanceSecurity.policy similarity index 100% rename from jdk/test/java/security/Policy/GetInstance/GetInstanceSecurity.policy rename to test/jdk/java/security/Policy/GetInstance/GetInstanceSecurity.policy diff --git a/jdk/test/java/security/Policy/GetPermissions/JarURL.java b/test/jdk/java/security/Policy/GetPermissions/JarURL.java similarity index 100% rename from jdk/test/java/security/Policy/GetPermissions/JarURL.java rename to test/jdk/java/security/Policy/GetPermissions/JarURL.java diff --git a/jdk/test/java/security/Policy/GetPermissions/JarURL.policy b/test/jdk/java/security/Policy/GetPermissions/JarURL.policy similarity index 100% rename from jdk/test/java/security/Policy/GetPermissions/JarURL.policy rename to test/jdk/java/security/Policy/GetPermissions/JarURL.policy diff --git a/jdk/test/java/security/Policy/PolicyProvider/CustomPolicy.java b/test/jdk/java/security/Policy/PolicyProvider/CustomPolicy.java similarity index 100% rename from jdk/test/java/security/Policy/PolicyProvider/CustomPolicy.java rename to test/jdk/java/security/Policy/PolicyProvider/CustomPolicy.java diff --git a/jdk/test/java/security/Policy/PolicyProvider/UseSystemClassLoader.java b/test/jdk/java/security/Policy/PolicyProvider/UseSystemClassLoader.java similarity index 100% rename from jdk/test/java/security/Policy/PolicyProvider/UseSystemClassLoader.java rename to test/jdk/java/security/Policy/PolicyProvider/UseSystemClassLoader.java diff --git a/jdk/test/java/security/Policy/PolicyProvider/test.policy b/test/jdk/java/security/Policy/PolicyProvider/test.policy similarity index 100% rename from jdk/test/java/security/Policy/PolicyProvider/test.policy rename to test/jdk/java/security/Policy/PolicyProvider/test.policy diff --git a/jdk/test/java/security/Policy/Root/Root.java b/test/jdk/java/security/Policy/Root/Root.java similarity index 100% rename from jdk/test/java/security/Policy/Root/Root.java rename to test/jdk/java/security/Policy/Root/Root.java diff --git a/jdk/test/java/security/Policy/Root/Root.policy b/test/jdk/java/security/Policy/Root/Root.policy similarity index 100% rename from jdk/test/java/security/Policy/Root/Root.policy rename to test/jdk/java/security/Policy/Root/Root.policy diff --git a/jdk/test/java/security/Policy/SignedJar/SignedJarTest.java b/test/jdk/java/security/Policy/SignedJar/SignedJarTest.java similarity index 100% rename from jdk/test/java/security/Policy/SignedJar/SignedJarTest.java rename to test/jdk/java/security/Policy/SignedJar/SignedJarTest.java diff --git a/jdk/test/java/security/Policy/SignedJar/SignedJarTest_1.policy b/test/jdk/java/security/Policy/SignedJar/SignedJarTest_1.policy similarity index 100% rename from jdk/test/java/security/Policy/SignedJar/SignedJarTest_1.policy rename to test/jdk/java/security/Policy/SignedJar/SignedJarTest_1.policy diff --git a/jdk/test/java/security/Policy/SignedJar/SignedJarTest_2.policy b/test/jdk/java/security/Policy/SignedJar/SignedJarTest_2.policy similarity index 100% rename from jdk/test/java/security/Policy/SignedJar/SignedJarTest_2.policy rename to test/jdk/java/security/Policy/SignedJar/SignedJarTest_2.policy diff --git a/jdk/test/java/security/Policy/SignedJar/keypass b/test/jdk/java/security/Policy/SignedJar/keypass similarity index 100% rename from jdk/test/java/security/Policy/SignedJar/keypass rename to test/jdk/java/security/Policy/SignedJar/keypass diff --git a/jdk/test/java/security/Principal/Implies.java b/test/jdk/java/security/Principal/Implies.java similarity index 100% rename from jdk/test/java/security/Principal/Implies.java rename to test/jdk/java/security/Principal/Implies.java diff --git a/jdk/test/java/security/PrivilegedActionException/PrintWrappedException.java b/test/jdk/java/security/PrivilegedActionException/PrintWrappedException.java similarity index 100% rename from jdk/test/java/security/PrivilegedActionException/PrintWrappedException.java rename to test/jdk/java/security/PrivilegedActionException/PrintWrappedException.java diff --git a/jdk/test/java/security/ProtectionDomain/AllPerm.jar b/test/jdk/java/security/ProtectionDomain/AllPerm.jar similarity index 100% rename from jdk/test/java/security/ProtectionDomain/AllPerm.jar rename to test/jdk/java/security/ProtectionDomain/AllPerm.jar diff --git a/jdk/test/java/security/ProtectionDomain/AllPerm.java b/test/jdk/java/security/ProtectionDomain/AllPerm.java similarity index 100% rename from jdk/test/java/security/ProtectionDomain/AllPerm.java rename to test/jdk/java/security/ProtectionDomain/AllPerm.java diff --git a/jdk/test/java/security/ProtectionDomain/CheckWhatYouGet.java b/test/jdk/java/security/ProtectionDomain/CheckWhatYouGet.java similarity index 100% rename from jdk/test/java/security/ProtectionDomain/CheckWhatYouGet.java rename to test/jdk/java/security/ProtectionDomain/CheckWhatYouGet.java diff --git a/jdk/test/java/security/ProtectionDomain/NullGetActions.java b/test/jdk/java/security/ProtectionDomain/NullGetActions.java similarity index 100% rename from jdk/test/java/security/ProtectionDomain/NullGetActions.java rename to test/jdk/java/security/ProtectionDomain/NullGetActions.java diff --git a/jdk/test/java/security/ProtectionDomain/NullGetActions.policy b/test/jdk/java/security/ProtectionDomain/NullGetActions.policy similarity index 100% rename from jdk/test/java/security/ProtectionDomain/NullGetActions.policy rename to test/jdk/java/security/ProtectionDomain/NullGetActions.policy diff --git a/jdk/test/java/security/ProtectionDomain/NullPerms.java b/test/jdk/java/security/ProtectionDomain/NullPerms.java similarity index 100% rename from jdk/test/java/security/ProtectionDomain/NullPerms.java rename to test/jdk/java/security/ProtectionDomain/NullPerms.java diff --git a/jdk/test/java/security/ProtectionDomain/PreserveCombinerTest.java b/test/jdk/java/security/ProtectionDomain/PreserveCombinerTest.java similarity index 100% rename from jdk/test/java/security/ProtectionDomain/PreserveCombinerTest.java rename to test/jdk/java/security/ProtectionDomain/PreserveCombinerTest.java diff --git a/jdk/test/java/security/ProtectionDomain/Recursion.java b/test/jdk/java/security/ProtectionDomain/Recursion.java similarity index 100% rename from jdk/test/java/security/ProtectionDomain/Recursion.java rename to test/jdk/java/security/ProtectionDomain/Recursion.java diff --git a/jdk/test/java/security/ProtectionDomain/Recursion.policy b/test/jdk/java/security/ProtectionDomain/Recursion.policy similarity index 100% rename from jdk/test/java/security/ProtectionDomain/Recursion.policy rename to test/jdk/java/security/ProtectionDomain/Recursion.policy diff --git a/jdk/test/java/security/ProtectionDomain/RecursionDebug.java b/test/jdk/java/security/ProtectionDomain/RecursionDebug.java similarity index 100% rename from jdk/test/java/security/ProtectionDomain/RecursionDebug.java rename to test/jdk/java/security/ProtectionDomain/RecursionDebug.java diff --git a/jdk/test/java/security/Provider/CaseSensitiveServices.java b/test/jdk/java/security/Provider/CaseSensitiveServices.java similarity index 100% rename from jdk/test/java/security/Provider/CaseSensitiveServices.java rename to test/jdk/java/security/Provider/CaseSensitiveServices.java diff --git a/jdk/test/java/security/Provider/CertStoreConstructorParam.java b/test/jdk/java/security/Provider/CertStoreConstructorParam.java similarity index 100% rename from jdk/test/java/security/Provider/CertStoreConstructorParam.java rename to test/jdk/java/security/Provider/CertStoreConstructorParam.java diff --git a/jdk/test/java/security/Provider/ChangeProviders.java b/test/jdk/java/security/Provider/ChangeProviders.java similarity index 100% rename from jdk/test/java/security/Provider/ChangeProviders.java rename to test/jdk/java/security/Provider/ChangeProviders.java diff --git a/jdk/test/java/security/Provider/DefaultPKCS11.java b/test/jdk/java/security/Provider/DefaultPKCS11.java similarity index 100% rename from jdk/test/java/security/Provider/DefaultPKCS11.java rename to test/jdk/java/security/Provider/DefaultPKCS11.java diff --git a/jdk/test/java/security/Provider/DefaultProviderList.java b/test/jdk/java/security/Provider/DefaultProviderList.java similarity index 100% rename from jdk/test/java/security/Provider/DefaultProviderList.java rename to test/jdk/java/security/Provider/DefaultProviderList.java diff --git a/jdk/test/java/security/Provider/Equals.java b/test/jdk/java/security/Provider/Equals.java similarity index 100% rename from jdk/test/java/security/Provider/Equals.java rename to test/jdk/java/security/Provider/Equals.java diff --git a/jdk/test/java/security/Provider/GetInstance.java b/test/jdk/java/security/Provider/GetInstance.java similarity index 100% rename from jdk/test/java/security/Provider/GetInstance.java rename to test/jdk/java/security/Provider/GetInstance.java diff --git a/jdk/test/java/security/Provider/NewInstance.java b/test/jdk/java/security/Provider/NewInstance.java similarity index 100% rename from jdk/test/java/security/Provider/NewInstance.java rename to test/jdk/java/security/Provider/NewInstance.java diff --git a/jdk/test/java/security/Provider/ProviderInfoCheck.java b/test/jdk/java/security/Provider/ProviderInfoCheck.java similarity index 100% rename from jdk/test/java/security/Provider/ProviderInfoCheck.java rename to test/jdk/java/security/Provider/ProviderInfoCheck.java diff --git a/jdk/test/java/security/Provider/ProviderVersionCheck.java b/test/jdk/java/security/Provider/ProviderVersionCheck.java similarity index 100% rename from jdk/test/java/security/Provider/ProviderVersionCheck.java rename to test/jdk/java/security/Provider/ProviderVersionCheck.java diff --git a/jdk/test/java/security/Provider/RemoveProvider.java b/test/jdk/java/security/Provider/RemoveProvider.java similarity index 100% rename from jdk/test/java/security/Provider/RemoveProvider.java rename to test/jdk/java/security/Provider/RemoveProvider.java diff --git a/jdk/test/java/security/Provider/SecurityProviderModularTest.java b/test/jdk/java/security/Provider/SecurityProviderModularTest.java similarity index 100% rename from jdk/test/java/security/Provider/SecurityProviderModularTest.java rename to test/jdk/java/security/Provider/SecurityProviderModularTest.java diff --git a/jdk/test/java/security/Provider/SupportsParameter.java b/test/jdk/java/security/Provider/SupportsParameter.java similarity index 100% rename from jdk/test/java/security/Provider/SupportsParameter.java rename to test/jdk/java/security/Provider/SupportsParameter.java diff --git a/jdk/test/java/security/Provider/TestClient.java b/test/jdk/java/security/Provider/TestClient.java similarity index 100% rename from jdk/test/java/security/Provider/TestClient.java rename to test/jdk/java/security/Provider/TestClient.java diff --git a/jdk/test/java/security/Provider/TestProvider.java b/test/jdk/java/security/Provider/TestProvider.java similarity index 100% rename from jdk/test/java/security/Provider/TestProvider.java rename to test/jdk/java/security/Provider/TestProvider.java diff --git a/jdk/test/java/security/Provider/Turkish.java b/test/jdk/java/security/Provider/Turkish.java similarity index 100% rename from jdk/test/java/security/Provider/Turkish.java rename to test/jdk/java/security/Provider/Turkish.java diff --git a/jdk/test/java/security/SecureClassLoader/DefineClass.java b/test/jdk/java/security/SecureClassLoader/DefineClass.java similarity index 100% rename from jdk/test/java/security/SecureClassLoader/DefineClass.java rename to test/jdk/java/security/SecureClassLoader/DefineClass.java diff --git a/jdk/test/java/security/SecureClassLoader/DefineClass.policy b/test/jdk/java/security/SecureClassLoader/DefineClass.policy similarity index 100% rename from jdk/test/java/security/SecureClassLoader/DefineClass.policy rename to test/jdk/java/security/SecureClassLoader/DefineClass.policy diff --git a/jdk/test/java/security/SecureClassLoader/DefineClassByteBuffer.java b/test/jdk/java/security/SecureClassLoader/DefineClassByteBuffer.java similarity index 100% rename from jdk/test/java/security/SecureClassLoader/DefineClassByteBuffer.java rename to test/jdk/java/security/SecureClassLoader/DefineClassByteBuffer.java diff --git a/jdk/test/java/security/SecureClassLoader/TestClass.java b/test/jdk/java/security/SecureClassLoader/TestClass.java similarity index 100% rename from jdk/test/java/security/SecureClassLoader/TestClass.java rename to test/jdk/java/security/SecureClassLoader/TestClass.java diff --git a/jdk/test/java/security/SecureRandom/ApiTest.java b/test/jdk/java/security/SecureRandom/ApiTest.java similarity index 100% rename from jdk/test/java/security/SecureRandom/ApiTest.java rename to test/jdk/java/security/SecureRandom/ApiTest.java diff --git a/jdk/test/java/security/SecureRandom/DefaultProvider.java b/test/jdk/java/security/SecureRandom/DefaultProvider.java similarity index 100% rename from jdk/test/java/security/SecureRandom/DefaultProvider.java rename to test/jdk/java/security/SecureRandom/DefaultProvider.java diff --git a/jdk/test/java/security/SecureRandom/DrbgParametersSpec.java b/test/jdk/java/security/SecureRandom/DrbgParametersSpec.java similarity index 100% rename from jdk/test/java/security/SecureRandom/DrbgParametersSpec.java rename to test/jdk/java/security/SecureRandom/DrbgParametersSpec.java diff --git a/jdk/test/java/security/SecureRandom/EnoughSeedTest.java b/test/jdk/java/security/SecureRandom/EnoughSeedTest.java similarity index 100% rename from jdk/test/java/security/SecureRandom/EnoughSeedTest.java rename to test/jdk/java/security/SecureRandom/EnoughSeedTest.java diff --git a/jdk/test/java/security/SecureRandom/GetAlgorithm.java b/test/jdk/java/security/SecureRandom/GetAlgorithm.java similarity index 100% rename from jdk/test/java/security/SecureRandom/GetAlgorithm.java rename to test/jdk/java/security/SecureRandom/GetAlgorithm.java diff --git a/jdk/test/java/security/SecureRandom/GetInstanceTest.java b/test/jdk/java/security/SecureRandom/GetInstanceTest.java similarity index 100% rename from jdk/test/java/security/SecureRandom/GetInstanceTest.java rename to test/jdk/java/security/SecureRandom/GetInstanceTest.java diff --git a/jdk/test/java/security/SecureRandom/MacNativePRNGSetSeed.java b/test/jdk/java/security/SecureRandom/MacNativePRNGSetSeed.java similarity index 100% rename from jdk/test/java/security/SecureRandom/MacNativePRNGSetSeed.java rename to test/jdk/java/security/SecureRandom/MacNativePRNGSetSeed.java diff --git a/jdk/test/java/security/SecureRandom/MultiThreadTest.java b/test/jdk/java/security/SecureRandom/MultiThreadTest.java similarity index 100% rename from jdk/test/java/security/SecureRandom/MultiThreadTest.java rename to test/jdk/java/security/SecureRandom/MultiThreadTest.java diff --git a/jdk/test/java/security/SecureRandom/NoSync.java b/test/jdk/java/security/SecureRandom/NoSync.java similarity index 100% rename from jdk/test/java/security/SecureRandom/NoSync.java rename to test/jdk/java/security/SecureRandom/NoSync.java diff --git a/jdk/test/java/security/SecureRandom/Serialize.java b/test/jdk/java/security/SecureRandom/Serialize.java similarity index 100% rename from jdk/test/java/security/SecureRandom/Serialize.java rename to test/jdk/java/security/SecureRandom/Serialize.java diff --git a/jdk/test/java/security/SecureRandom/SerializedSeedTest.java b/test/jdk/java/security/SecureRandom/SerializedSeedTest.java similarity index 100% rename from jdk/test/java/security/SecureRandom/SerializedSeedTest.java rename to test/jdk/java/security/SecureRandom/SerializedSeedTest.java diff --git a/jdk/test/java/security/SecureRandom/ThreadSafe.java b/test/jdk/java/security/SecureRandom/ThreadSafe.java similarity index 100% rename from jdk/test/java/security/SecureRandom/ThreadSafe.java rename to test/jdk/java/security/SecureRandom/ThreadSafe.java diff --git a/jdk/test/java/security/SecureRandom/sha1prng-new.bin b/test/jdk/java/security/SecureRandom/sha1prng-new.bin similarity index 100% rename from jdk/test/java/security/SecureRandom/sha1prng-new.bin rename to test/jdk/java/security/SecureRandom/sha1prng-new.bin diff --git a/jdk/test/java/security/SecureRandom/sha1prng-old.bin b/test/jdk/java/security/SecureRandom/sha1prng-old.bin similarity index 100% rename from jdk/test/java/security/SecureRandom/sha1prng-old.bin rename to test/jdk/java/security/SecureRandom/sha1prng-old.bin diff --git a/jdk/test/java/security/Security/AddProvider.java b/test/jdk/java/security/Security/AddProvider.java similarity index 100% rename from jdk/test/java/security/Security/AddProvider.java rename to test/jdk/java/security/Security/AddProvider.java diff --git a/jdk/test/java/security/Security/AddProvider.policy.1 b/test/jdk/java/security/Security/AddProvider.policy.1 similarity index 100% rename from jdk/test/java/security/Security/AddProvider.policy.1 rename to test/jdk/java/security/Security/AddProvider.policy.1 diff --git a/jdk/test/java/security/Security/AddProvider.policy.2 b/test/jdk/java/security/Security/AddProvider.policy.2 similarity index 100% rename from jdk/test/java/security/Security/AddProvider.policy.2 rename to test/jdk/java/security/Security/AddProvider.policy.2 diff --git a/jdk/test/java/security/Security/AddProvider.policy.3 b/test/jdk/java/security/Security/AddProvider.policy.3 similarity index 100% rename from jdk/test/java/security/Security/AddProvider.policy.3 rename to test/jdk/java/security/Security/AddProvider.policy.3 diff --git a/jdk/test/java/security/Security/CaseInsensitiveAlgNames.java b/test/jdk/java/security/Security/CaseInsensitiveAlgNames.java similarity index 100% rename from jdk/test/java/security/Security/CaseInsensitiveAlgNames.java rename to test/jdk/java/security/Security/CaseInsensitiveAlgNames.java diff --git a/jdk/test/java/security/Security/ClassLoader/DeprivilegedModuleLoaderTest.java b/test/jdk/java/security/Security/ClassLoader/DeprivilegedModuleLoaderTest.java similarity index 100% rename from jdk/test/java/security/Security/ClassLoader/DeprivilegedModuleLoaderTest.java rename to test/jdk/java/security/Security/ClassLoader/DeprivilegedModuleLoaderTest.java diff --git a/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java b/test/jdk/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java similarity index 100% rename from jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java rename to test/jdk/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java diff --git a/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh b/test/jdk/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh similarity index 100% rename from jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh rename to test/jdk/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh diff --git a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.jar b/test/jdk/java/security/Security/ClassLoaderDeadlock/Deadlock.jar similarity index 100% rename from jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.jar rename to test/jdk/java/security/Security/ClassLoaderDeadlock/Deadlock.jar diff --git a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.java b/test/jdk/java/security/Security/ClassLoaderDeadlock/Deadlock.java similarity index 100% rename from jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.java rename to test/jdk/java/security/Security/ClassLoaderDeadlock/Deadlock.java diff --git a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh b/test/jdk/java/security/Security/ClassLoaderDeadlock/Deadlock.sh similarity index 100% rename from jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh rename to test/jdk/java/security/Security/ClassLoaderDeadlock/Deadlock.sh diff --git a/jdk/test/java/security/Security/ClassLoaderDeadlock/provider/HashProvider.java b/test/jdk/java/security/Security/ClassLoaderDeadlock/provider/HashProvider.java similarity index 100% rename from jdk/test/java/security/Security/ClassLoaderDeadlock/provider/HashProvider.java rename to test/jdk/java/security/Security/ClassLoaderDeadlock/provider/HashProvider.java diff --git a/jdk/test/java/security/Security/NoInstalledProviders.java b/test/jdk/java/security/Security/NoInstalledProviders.java similarity index 100% rename from jdk/test/java/security/Security/NoInstalledProviders.java rename to test/jdk/java/security/Security/NoInstalledProviders.java diff --git a/jdk/test/java/security/Security/Nulls.java b/test/jdk/java/security/Security/Nulls.java similarity index 100% rename from jdk/test/java/security/Security/Nulls.java rename to test/jdk/java/security/Security/Nulls.java diff --git a/jdk/test/java/security/Security/SecurityPropFile/SecurityPropFile.file b/test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.file similarity index 100% rename from jdk/test/java/security/Security/SecurityPropFile/SecurityPropFile.file rename to test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.file diff --git a/jdk/test/java/security/Security/SecurityPropFile/SecurityPropFile.java b/test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.java similarity index 100% rename from jdk/test/java/security/Security/SecurityPropFile/SecurityPropFile.java rename to test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.java diff --git a/jdk/test/java/security/Security/SecurityPropFile/SecurityPropFile.policy b/test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.policy similarity index 100% rename from jdk/test/java/security/Security/SecurityPropFile/SecurityPropFile.policy rename to test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.policy diff --git a/jdk/test/java/security/Security/SynchronizedAccess.java b/test/jdk/java/security/Security/SynchronizedAccess.java similarity index 100% rename from jdk/test/java/security/Security/SynchronizedAccess.java rename to test/jdk/java/security/Security/SynchronizedAccess.java diff --git a/jdk/test/java/security/Security/removing/RemoveProviderByIdentity.java b/test/jdk/java/security/Security/removing/RemoveProviderByIdentity.java similarity index 100% rename from jdk/test/java/security/Security/removing/RemoveProviderByIdentity.java rename to test/jdk/java/security/Security/removing/RemoveProviderByIdentity.java diff --git a/jdk/test/java/security/Security/removing/RemoveProviders.java b/test/jdk/java/security/Security/removing/RemoveProviders.java similarity index 100% rename from jdk/test/java/security/Security/removing/RemoveProviders.java rename to test/jdk/java/security/Security/removing/RemoveProviders.java diff --git a/jdk/test/java/security/Security/removing/RemoveStaticProvider.java b/test/jdk/java/security/Security/removing/RemoveStaticProvider.java similarity index 100% rename from jdk/test/java/security/Security/removing/RemoveStaticProvider.java rename to test/jdk/java/security/Security/removing/RemoveStaticProvider.java diff --git a/jdk/test/java/security/Security/removing/RemoveStaticProvider.policy b/test/jdk/java/security/Security/removing/RemoveStaticProvider.policy similarity index 100% rename from jdk/test/java/security/Security/removing/RemoveStaticProvider.policy rename to test/jdk/java/security/Security/removing/RemoveStaticProvider.policy diff --git a/jdk/test/java/security/Security/signedfirst/Dyn.sh b/test/jdk/java/security/Security/signedfirst/Dyn.sh similarity index 100% rename from jdk/test/java/security/Security/signedfirst/Dyn.sh rename to test/jdk/java/security/Security/signedfirst/Dyn.sh diff --git a/jdk/test/java/security/Security/signedfirst/DynSignedProvFirst.java b/test/jdk/java/security/Security/signedfirst/DynSignedProvFirst.java similarity index 100% rename from jdk/test/java/security/Security/signedfirst/DynSignedProvFirst.java rename to test/jdk/java/security/Security/signedfirst/DynSignedProvFirst.java diff --git a/jdk/test/java/security/Security/signedfirst/Static.props b/test/jdk/java/security/Security/signedfirst/Static.props similarity index 100% rename from jdk/test/java/security/Security/signedfirst/Static.props rename to test/jdk/java/security/Security/signedfirst/Static.props diff --git a/jdk/test/java/security/Security/signedfirst/Static.sh b/test/jdk/java/security/Security/signedfirst/Static.sh similarity index 100% rename from jdk/test/java/security/Security/signedfirst/Static.sh rename to test/jdk/java/security/Security/signedfirst/Static.sh diff --git a/jdk/test/java/security/Security/signedfirst/StaticSignedProvFirst.java b/test/jdk/java/security/Security/signedfirst/StaticSignedProvFirst.java similarity index 100% rename from jdk/test/java/security/Security/signedfirst/StaticSignedProvFirst.java rename to test/jdk/java/security/Security/signedfirst/StaticSignedProvFirst.java diff --git a/jdk/test/java/security/Security/signedfirst/exp.jar b/test/jdk/java/security/Security/signedfirst/exp.jar similarity index 100% rename from jdk/test/java/security/Security/signedfirst/exp.jar rename to test/jdk/java/security/Security/signedfirst/exp.jar diff --git a/jdk/test/java/security/Security/signedfirst/keystore.jks b/test/jdk/java/security/Security/signedfirst/keystore.jks similarity index 100% rename from jdk/test/java/security/Security/signedfirst/keystore.jks rename to test/jdk/java/security/Security/signedfirst/keystore.jks diff --git a/jdk/test/java/security/Signature/ByteBuffers.java b/test/jdk/java/security/Signature/ByteBuffers.java similarity index 100% rename from jdk/test/java/security/Signature/ByteBuffers.java rename to test/jdk/java/security/Signature/ByteBuffers.java diff --git a/jdk/test/java/security/Signature/NONEwithRSA.java b/test/jdk/java/security/Signature/NONEwithRSA.java similarity index 100% rename from jdk/test/java/security/Signature/NONEwithRSA.java rename to test/jdk/java/security/Signature/NONEwithRSA.java diff --git a/jdk/test/java/security/Signature/NoProvider.java b/test/jdk/java/security/Signature/NoProvider.java similarity index 100% rename from jdk/test/java/security/Signature/NoProvider.java rename to test/jdk/java/security/Signature/NoProvider.java diff --git a/jdk/test/java/security/Signature/Offsets.java b/test/jdk/java/security/Signature/Offsets.java similarity index 100% rename from jdk/test/java/security/Signature/Offsets.java rename to test/jdk/java/security/Signature/Offsets.java diff --git a/jdk/test/java/security/Signature/ResetAfterException.java b/test/jdk/java/security/Signature/ResetAfterException.java similarity index 100% rename from jdk/test/java/security/Signature/ResetAfterException.java rename to test/jdk/java/security/Signature/ResetAfterException.java diff --git a/jdk/test/java/security/Signature/SignWithOutputBuffer.java b/test/jdk/java/security/Signature/SignWithOutputBuffer.java similarity index 100% rename from jdk/test/java/security/Signature/SignWithOutputBuffer.java rename to test/jdk/java/security/Signature/SignWithOutputBuffer.java diff --git a/jdk/test/java/security/Signature/SignatureGetAlgorithm.java b/test/jdk/java/security/Signature/SignatureGetAlgorithm.java similarity index 100% rename from jdk/test/java/security/Signature/SignatureGetAlgorithm.java rename to test/jdk/java/security/Signature/SignatureGetAlgorithm.java diff --git a/jdk/test/java/security/Signature/SignatureLength.java b/test/jdk/java/security/Signature/SignatureLength.java similarity index 100% rename from jdk/test/java/security/Signature/SignatureLength.java rename to test/jdk/java/security/Signature/SignatureLength.java diff --git a/jdk/test/java/security/Signature/TestInitSignWithMyOwnRandom.java b/test/jdk/java/security/Signature/TestInitSignWithMyOwnRandom.java similarity index 100% rename from jdk/test/java/security/Signature/TestInitSignWithMyOwnRandom.java rename to test/jdk/java/security/Signature/TestInitSignWithMyOwnRandom.java diff --git a/jdk/test/java/security/Signature/VerifyRangeCheckOverflow.java b/test/jdk/java/security/Signature/VerifyRangeCheckOverflow.java similarity index 100% rename from jdk/test/java/security/Signature/VerifyRangeCheckOverflow.java rename to test/jdk/java/security/Signature/VerifyRangeCheckOverflow.java diff --git a/jdk/test/java/security/SignedObject/Chain.java b/test/jdk/java/security/SignedObject/Chain.java similarity index 100% rename from jdk/test/java/security/SignedObject/Chain.java rename to test/jdk/java/security/SignedObject/Chain.java diff --git a/jdk/test/java/security/SignedObject/Copy.java b/test/jdk/java/security/SignedObject/Copy.java similarity index 100% rename from jdk/test/java/security/SignedObject/Copy.java rename to test/jdk/java/security/SignedObject/Copy.java diff --git a/jdk/test/java/security/SignedObject/Correctness.java b/test/jdk/java/security/SignedObject/Correctness.java similarity index 100% rename from jdk/test/java/security/SignedObject/Correctness.java rename to test/jdk/java/security/SignedObject/Correctness.java diff --git a/jdk/test/java/security/UnresolvedPermission/AccessorMethods.ca b/test/jdk/java/security/UnresolvedPermission/AccessorMethods.ca similarity index 100% rename from jdk/test/java/security/UnresolvedPermission/AccessorMethods.ca rename to test/jdk/java/security/UnresolvedPermission/AccessorMethods.ca diff --git a/jdk/test/java/security/UnresolvedPermission/AccessorMethods.java b/test/jdk/java/security/UnresolvedPermission/AccessorMethods.java similarity index 100% rename from jdk/test/java/security/UnresolvedPermission/AccessorMethods.java rename to test/jdk/java/security/UnresolvedPermission/AccessorMethods.java diff --git a/jdk/test/java/security/UnresolvedPermission/AccessorMethods.signer1 b/test/jdk/java/security/UnresolvedPermission/AccessorMethods.signer1 similarity index 100% rename from jdk/test/java/security/UnresolvedPermission/AccessorMethods.signer1 rename to test/jdk/java/security/UnresolvedPermission/AccessorMethods.signer1 diff --git a/jdk/test/java/security/UnresolvedPermission/AccessorMethods.signer2 b/test/jdk/java/security/UnresolvedPermission/AccessorMethods.signer2 similarity index 100% rename from jdk/test/java/security/UnresolvedPermission/AccessorMethods.signer2 rename to test/jdk/java/security/UnresolvedPermission/AccessorMethods.signer2 diff --git a/jdk/test/java/security/UnresolvedPermission/Debug.java b/test/jdk/java/security/UnresolvedPermission/Debug.java similarity index 100% rename from jdk/test/java/security/UnresolvedPermission/Debug.java rename to test/jdk/java/security/UnresolvedPermission/Debug.java diff --git a/jdk/test/java/security/UnresolvedPermission/Debug.policy b/test/jdk/java/security/UnresolvedPermission/Debug.policy similarity index 100% rename from jdk/test/java/security/UnresolvedPermission/Debug.policy rename to test/jdk/java/security/UnresolvedPermission/Debug.policy diff --git a/jdk/test/java/security/UnresolvedPermission/DebugPermission0.java b/test/jdk/java/security/UnresolvedPermission/DebugPermission0.java similarity index 100% rename from jdk/test/java/security/UnresolvedPermission/DebugPermission0.java rename to test/jdk/java/security/UnresolvedPermission/DebugPermission0.java diff --git a/jdk/test/java/security/UnresolvedPermission/DebugPermission1.java b/test/jdk/java/security/UnresolvedPermission/DebugPermission1.java similarity index 100% rename from jdk/test/java/security/UnresolvedPermission/DebugPermission1.java rename to test/jdk/java/security/UnresolvedPermission/DebugPermission1.java diff --git a/jdk/test/java/security/UnresolvedPermission/DebugPermission2.java b/test/jdk/java/security/UnresolvedPermission/DebugPermission2.java similarity index 100% rename from jdk/test/java/security/UnresolvedPermission/DebugPermission2.java rename to test/jdk/java/security/UnresolvedPermission/DebugPermission2.java diff --git a/jdk/test/java/security/UnresolvedPermission/DebugPermissionBad.java b/test/jdk/java/security/UnresolvedPermission/DebugPermissionBad.java similarity index 100% rename from jdk/test/java/security/UnresolvedPermission/DebugPermissionBad.java rename to test/jdk/java/security/UnresolvedPermission/DebugPermissionBad.java diff --git a/jdk/test/java/security/UnresolvedPermission/Equals.java b/test/jdk/java/security/UnresolvedPermission/Equals.java similarity index 100% rename from jdk/test/java/security/UnresolvedPermission/Equals.java rename to test/jdk/java/security/UnresolvedPermission/Equals.java diff --git a/jdk/test/java/security/UnresolvedPermission/Equals.policy b/test/jdk/java/security/UnresolvedPermission/Equals.policy similarity index 100% rename from jdk/test/java/security/UnresolvedPermission/Equals.policy rename to test/jdk/java/security/UnresolvedPermission/Equals.policy diff --git a/jdk/test/java/security/cert/CertPath/Serialize.java b/test/jdk/java/security/cert/CertPath/Serialize.java similarity index 100% rename from jdk/test/java/security/cert/CertPath/Serialize.java rename to test/jdk/java/security/cert/CertPath/Serialize.java diff --git a/jdk/test/java/security/cert/CertPath/cert_file b/test/jdk/java/security/cert/CertPath/cert_file similarity index 100% rename from jdk/test/java/security/cert/CertPath/cert_file rename to test/jdk/java/security/cert/CertPath/cert_file diff --git a/jdk/test/java/security/cert/CertPathBuilder/GetInstance.java b/test/jdk/java/security/cert/CertPathBuilder/GetInstance.java similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/GetInstance.java rename to test/jdk/java/security/cert/CertPathBuilder/GetInstance.java diff --git a/jdk/test/java/security/cert/CertPathBuilder/NoExtensions.java b/test/jdk/java/security/cert/CertPathBuilder/NoExtensions.java similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/NoExtensions.java rename to test/jdk/java/security/cert/CertPathBuilder/NoExtensions.java diff --git a/jdk/test/java/security/cert/CertPathBuilder/StubProvider.java b/test/jdk/java/security/cert/CertPathBuilder/StubProvider.java similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/StubProvider.java rename to test/jdk/java/security/cert/CertPathBuilder/StubProvider.java diff --git a/jdk/test/java/security/cert/CertPathBuilder/StubProviderImpl.java b/test/jdk/java/security/cert/CertPathBuilder/StubProviderImpl.java similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/StubProviderImpl.java rename to test/jdk/java/security/cert/CertPathBuilder/StubProviderImpl.java diff --git a/jdk/test/java/security/cert/CertPathBuilder/akiExt/AKISerialNumber.java b/test/jdk/java/security/cert/CertPathBuilder/akiExt/AKISerialNumber.java similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/akiExt/AKISerialNumber.java rename to test/jdk/java/security/cert/CertPathBuilder/akiExt/AKISerialNumber.java diff --git a/jdk/test/java/security/cert/CertPathBuilder/provider.policy b/test/jdk/java/security/cert/CertPathBuilder/provider.policy similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/provider.policy rename to test/jdk/java/security/cert/CertPathBuilder/provider.policy diff --git a/jdk/test/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java b/test/jdk/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java rename to test/jdk/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java diff --git a/jdk/test/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java b/test/jdk/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java rename to test/jdk/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java diff --git a/jdk/test/java/security/cert/CertPathBuilder/selfIssued/README b/test/jdk/java/security/cert/CertPathBuilder/selfIssued/README similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/selfIssued/README rename to test/jdk/java/security/cert/CertPathBuilder/selfIssued/README diff --git a/jdk/test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java b/test/jdk/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java rename to test/jdk/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java diff --git a/jdk/test/java/security/cert/CertPathBuilder/selfIssued/generate.sh b/test/jdk/java/security/cert/CertPathBuilder/selfIssued/generate.sh similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/selfIssued/generate.sh rename to test/jdk/java/security/cert/CertPathBuilder/selfIssued/generate.sh diff --git a/jdk/test/java/security/cert/CertPathBuilder/selfIssued/openssl.cnf b/test/jdk/java/security/cert/CertPathBuilder/selfIssued/openssl.cnf similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/selfIssued/openssl.cnf rename to test/jdk/java/security/cert/CertPathBuilder/selfIssued/openssl.cnf diff --git a/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java b/test/jdk/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java rename to test/jdk/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java diff --git a/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/BuildOddSel.java b/test/jdk/java/security/cert/CertPathBuilder/targetConstraints/BuildOddSel.java similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/targetConstraints/BuildOddSel.java rename to test/jdk/java/security/cert/CertPathBuilder/targetConstraints/BuildOddSel.java diff --git a/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/anchor.cer b/test/jdk/java/security/cert/CertPathBuilder/targetConstraints/anchor.cer similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/targetConstraints/anchor.cer rename to test/jdk/java/security/cert/CertPathBuilder/targetConstraints/anchor.cer diff --git a/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/ca.cer b/test/jdk/java/security/cert/CertPathBuilder/targetConstraints/ca.cer similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/targetConstraints/ca.cer rename to test/jdk/java/security/cert/CertPathBuilder/targetConstraints/ca.cer diff --git a/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/ee.cer b/test/jdk/java/security/cert/CertPathBuilder/targetConstraints/ee.cer similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/targetConstraints/ee.cer rename to test/jdk/java/security/cert/CertPathBuilder/targetConstraints/ee.cer diff --git a/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/sun.cer b/test/jdk/java/security/cert/CertPathBuilder/targetConstraints/sun.cer similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/targetConstraints/sun.cer rename to test/jdk/java/security/cert/CertPathBuilder/targetConstraints/sun.cer diff --git a/jdk/test/java/security/cert/CertPathBuilder/zeroLengthPath/ZeroLengthPath.java b/test/jdk/java/security/cert/CertPathBuilder/zeroLengthPath/ZeroLengthPath.java similarity index 100% rename from jdk/test/java/security/cert/CertPathBuilder/zeroLengthPath/ZeroLengthPath.java rename to test/jdk/java/security/cert/CertPathBuilder/zeroLengthPath/ZeroLengthPath.java diff --git a/jdk/test/java/security/cert/CertPathEncodingTest.java b/test/jdk/java/security/cert/CertPathEncodingTest.java similarity index 100% rename from jdk/test/java/security/cert/CertPathEncodingTest.java rename to test/jdk/java/security/cert/CertPathEncodingTest.java diff --git a/jdk/test/java/security/cert/CertPathValidator/OCSP/AIACert.pem b/test/jdk/java/security/cert/CertPathValidator/OCSP/AIACert.pem similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/OCSP/AIACert.pem rename to test/jdk/java/security/cert/CertPathValidator/OCSP/AIACert.pem diff --git a/jdk/test/java/security/cert/CertPathValidator/OCSP/AIACheck.java b/test/jdk/java/security/cert/CertPathValidator/OCSP/AIACheck.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/OCSP/AIACheck.java rename to test/jdk/java/security/cert/CertPathValidator/OCSP/AIACheck.java diff --git a/jdk/test/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java b/test/jdk/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java rename to test/jdk/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java diff --git a/jdk/test/java/security/cert/CertPathValidator/OCSP/RootCert.pem b/test/jdk/java/security/cert/CertPathValidator/OCSP/RootCert.pem similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/OCSP/RootCert.pem rename to test/jdk/java/security/cert/CertPathValidator/OCSP/RootCert.pem diff --git a/jdk/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevel.java b/test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevel.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevel.java rename to test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevel.java diff --git a/jdk/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java b/test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java rename to test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java diff --git a/jdk/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevel.java b/test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevel.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevel.java rename to test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevel.java diff --git a/jdk/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevelRevoked.java b/test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevelRevoked.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevelRevoked.java rename to test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevelRevoked.java diff --git a/jdk/test/java/security/cert/CertPathValidator/indirectCRL/README b/test/jdk/java/security/cert/CertPathValidator/indirectCRL/README similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/indirectCRL/README rename to test/jdk/java/security/cert/CertPathValidator/indirectCRL/README diff --git a/jdk/test/java/security/cert/CertPathValidator/indirectCRL/generate.sh b/test/jdk/java/security/cert/CertPathValidator/indirectCRL/generate.sh similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/indirectCRL/generate.sh rename to test/jdk/java/security/cert/CertPathValidator/indirectCRL/generate.sh diff --git a/jdk/test/java/security/cert/CertPathValidator/indirectCRL/openssl.cnf b/test/jdk/java/security/cert/CertPathValidator/indirectCRL/openssl.cnf similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/indirectCRL/openssl.cnf rename to test/jdk/java/security/cert/CertPathValidator/indirectCRL/openssl.cnf diff --git a/jdk/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithRID.java b/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithRID.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithRID.java rename to test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithRID.java diff --git a/jdk/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java b/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java rename to test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java diff --git a/jdk/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithoutRID.java b/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithoutRID.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithoutRID.java rename to test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithoutRID.java diff --git a/jdk/test/java/security/cert/CertPathValidator/nameConstraints/generate.sh b/test/jdk/java/security/cert/CertPathValidator/nameConstraints/generate.sh similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/nameConstraints/generate.sh rename to test/jdk/java/security/cert/CertPathValidator/nameConstraints/generate.sh diff --git a/jdk/test/java/security/cert/CertPathValidator/nameConstraints/openssl.cnf b/test/jdk/java/security/cert/CertPathValidator/nameConstraints/openssl.cnf similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/nameConstraints/openssl.cnf rename to test/jdk/java/security/cert/CertPathValidator/nameConstraints/openssl.cnf diff --git a/jdk/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/ValidateCertPath.java b/test/jdk/java/security/cert/CertPathValidator/nameConstraintsRFC822/ValidateCertPath.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/ValidateCertPath.java rename to test/jdk/java/security/cert/CertPathValidator/nameConstraintsRFC822/ValidateCertPath.java diff --git a/jdk/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2jane.cer b/test/jdk/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2jane.cer similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2jane.cer rename to test/jdk/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2jane.cer diff --git a/jdk/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2steve.cer b/test/jdk/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2steve.cer similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2steve.cer rename to test/jdk/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2steve.cer diff --git a/jdk/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/steve2tom.cer b/test/jdk/java/security/cert/CertPathValidator/nameConstraintsRFC822/steve2tom.cer similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/steve2tom.cer rename to test/jdk/java/security/cert/CertPathValidator/nameConstraintsRFC822/steve2tom.cer diff --git a/jdk/test/java/security/cert/CertPathValidator/targetConstraints/ValidateTargetConstraints.java b/test/jdk/java/security/cert/CertPathValidator/targetConstraints/ValidateTargetConstraints.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/targetConstraints/ValidateTargetConstraints.java rename to test/jdk/java/security/cert/CertPathValidator/targetConstraints/ValidateTargetConstraints.java diff --git a/jdk/test/java/security/cert/CertPathValidator/targetConstraints/sun.cer b/test/jdk/java/security/cert/CertPathValidator/targetConstraints/sun.cer similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/targetConstraints/sun.cer rename to test/jdk/java/security/cert/CertPathValidator/targetConstraints/sun.cer diff --git a/jdk/test/java/security/cert/CertPathValidator/targetConstraints/sun2labs1.cer b/test/jdk/java/security/cert/CertPathValidator/targetConstraints/sun2labs1.cer similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/targetConstraints/sun2labs1.cer rename to test/jdk/java/security/cert/CertPathValidator/targetConstraints/sun2labs1.cer diff --git a/jdk/test/java/security/cert/CertPathValidator/trustAnchor/ValWithAnchorByName.java b/test/jdk/java/security/cert/CertPathValidator/trustAnchor/ValWithAnchorByName.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/trustAnchor/ValWithAnchorByName.java rename to test/jdk/java/security/cert/CertPathValidator/trustAnchor/ValWithAnchorByName.java diff --git a/jdk/test/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java b/test/jdk/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java rename to test/jdk/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java diff --git a/jdk/test/java/security/cert/CertPathValidator/trustAnchor/labs2isrg2.cer b/test/jdk/java/security/cert/CertPathValidator/trustAnchor/labs2isrg2.cer similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/trustAnchor/labs2isrg2.cer rename to test/jdk/java/security/cert/CertPathValidator/trustAnchor/labs2isrg2.cer diff --git a/jdk/test/java/security/cert/CertPathValidator/trustAnchor/sun2labs2.cer b/test/jdk/java/security/cert/CertPathValidator/trustAnchor/sun2labs2.cer similarity index 100% rename from jdk/test/java/security/cert/CertPathValidator/trustAnchor/sun2labs2.cer rename to test/jdk/java/security/cert/CertPathValidator/trustAnchor/sun2labs2.cer diff --git a/jdk/test/java/security/cert/CertPathValidatorException/GetMessage.java b/test/jdk/java/security/cert/CertPathValidatorException/GetMessage.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidatorException/GetMessage.java rename to test/jdk/java/security/cert/CertPathValidatorException/GetMessage.java diff --git a/jdk/test/java/security/cert/CertPathValidatorException/ReasonTest.java b/test/jdk/java/security/cert/CertPathValidatorException/ReasonTest.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidatorException/ReasonTest.java rename to test/jdk/java/security/cert/CertPathValidatorException/ReasonTest.java diff --git a/jdk/test/java/security/cert/CertPathValidatorException/Serial.java b/test/jdk/java/security/cert/CertPathValidatorException/Serial.java similarity index 100% rename from jdk/test/java/security/cert/CertPathValidatorException/Serial.java rename to test/jdk/java/security/cert/CertPathValidatorException/Serial.java diff --git a/jdk/test/java/security/cert/CertPathValidatorException/cert_file b/test/jdk/java/security/cert/CertPathValidatorException/cert_file similarity index 100% rename from jdk/test/java/security/cert/CertPathValidatorException/cert_file rename to test/jdk/java/security/cert/CertPathValidatorException/cert_file diff --git a/jdk/test/java/security/cert/CertPathValidatorException/jdk6.serial b/test/jdk/java/security/cert/CertPathValidatorException/jdk6.serial similarity index 100% rename from jdk/test/java/security/cert/CertPathValidatorException/jdk6.serial rename to test/jdk/java/security/cert/CertPathValidatorException/jdk6.serial diff --git a/jdk/test/java/security/cert/CertStore/NoLDAP.java b/test/jdk/java/security/cert/CertStore/NoLDAP.java similarity index 100% rename from jdk/test/java/security/cert/CertStore/NoLDAP.java rename to test/jdk/java/security/cert/CertStore/NoLDAP.java diff --git a/jdk/test/java/security/cert/CertificateFactory/BadX509CertData.java b/test/jdk/java/security/cert/CertificateFactory/BadX509CertData.java similarity index 100% rename from jdk/test/java/security/cert/CertificateFactory/BadX509CertData.java rename to test/jdk/java/security/cert/CertificateFactory/BadX509CertData.java diff --git a/jdk/test/java/security/cert/CertificateFactory/GenerateCertificatesEmptyCollection.java b/test/jdk/java/security/cert/CertificateFactory/GenerateCertificatesEmptyCollection.java similarity index 100% rename from jdk/test/java/security/cert/CertificateFactory/GenerateCertificatesEmptyCollection.java rename to test/jdk/java/security/cert/CertificateFactory/GenerateCertificatesEmptyCollection.java diff --git a/jdk/test/java/security/cert/CertificateFactory/ReturnStream.java b/test/jdk/java/security/cert/CertificateFactory/ReturnStream.java similarity index 100% rename from jdk/test/java/security/cert/CertificateFactory/ReturnStream.java rename to test/jdk/java/security/cert/CertificateFactory/ReturnStream.java diff --git a/jdk/test/java/security/cert/CertificateFactory/SlowStream.java b/test/jdk/java/security/cert/CertificateFactory/SlowStream.java similarity index 100% rename from jdk/test/java/security/cert/CertificateFactory/SlowStream.java rename to test/jdk/java/security/cert/CertificateFactory/SlowStream.java diff --git a/jdk/test/java/security/cert/CertificateFactory/invalidEncodedCerts/DetectInvalidEncoding.java b/test/jdk/java/security/cert/CertificateFactory/invalidEncodedCerts/DetectInvalidEncoding.java similarity index 100% rename from jdk/test/java/security/cert/CertificateFactory/invalidEncodedCerts/DetectInvalidEncoding.java rename to test/jdk/java/security/cert/CertificateFactory/invalidEncodedCerts/DetectInvalidEncoding.java diff --git a/jdk/test/java/security/cert/CertificateFactory/openssl/BadFooter.java b/test/jdk/java/security/cert/CertificateFactory/openssl/BadFooter.java similarity index 100% rename from jdk/test/java/security/cert/CertificateFactory/openssl/BadFooter.java rename to test/jdk/java/security/cert/CertificateFactory/openssl/BadFooter.java diff --git a/jdk/test/java/security/cert/CertificateFactory/openssl/OpenSSLCert.java b/test/jdk/java/security/cert/CertificateFactory/openssl/OpenSSLCert.java similarity index 100% rename from jdk/test/java/security/cert/CertificateFactory/openssl/OpenSSLCert.java rename to test/jdk/java/security/cert/CertificateFactory/openssl/OpenSSLCert.java diff --git a/jdk/test/java/security/cert/CertificateFactory/openssl/open b/test/jdk/java/security/cert/CertificateFactory/openssl/open similarity index 100% rename from jdk/test/java/security/cert/CertificateFactory/openssl/open rename to test/jdk/java/security/cert/CertificateFactory/openssl/open diff --git a/jdk/test/java/security/cert/CertificateFactory/openssl/pem b/test/jdk/java/security/cert/CertificateFactory/openssl/pem similarity index 100% rename from jdk/test/java/security/cert/CertificateFactory/openssl/pem rename to test/jdk/java/security/cert/CertificateFactory/openssl/pem diff --git a/jdk/test/java/security/cert/CertificateFactory/slowstream.sh b/test/jdk/java/security/cert/CertificateFactory/slowstream.sh similarity index 100% rename from jdk/test/java/security/cert/CertificateFactory/slowstream.sh rename to test/jdk/java/security/cert/CertificateFactory/slowstream.sh diff --git a/jdk/test/java/security/cert/CertificateRevokedException/Basic.java b/test/jdk/java/security/cert/CertificateRevokedException/Basic.java similarity index 100% rename from jdk/test/java/security/cert/CertificateRevokedException/Basic.java rename to test/jdk/java/security/cert/CertificateRevokedException/Basic.java diff --git a/jdk/test/java/security/cert/GetInstance.java b/test/jdk/java/security/cert/GetInstance.java similarity index 100% rename from jdk/test/java/security/cert/GetInstance.java rename to test/jdk/java/security/cert/GetInstance.java diff --git a/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java b/test/jdk/java/security/cert/PKIXBuilderParameters/InvalidParameters.java similarity index 100% rename from jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java rename to test/jdk/java/security/cert/PKIXBuilderParameters/InvalidParameters.java diff --git a/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java b/test/jdk/java/security/cert/PKIXParameters/InvalidParameters.java similarity index 100% rename from jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java rename to test/jdk/java/security/cert/PKIXParameters/InvalidParameters.java diff --git a/jdk/test/java/security/cert/PKIXRevocationChecker/OcspUnauthorized.java b/test/jdk/java/security/cert/PKIXRevocationChecker/OcspUnauthorized.java similarity index 100% rename from jdk/test/java/security/cert/PKIXRevocationChecker/OcspUnauthorized.java rename to test/jdk/java/security/cert/PKIXRevocationChecker/OcspUnauthorized.java diff --git a/jdk/test/java/security/cert/PKIXRevocationChecker/UnitTest.java b/test/jdk/java/security/cert/PKIXRevocationChecker/UnitTest.java similarity index 100% rename from jdk/test/java/security/cert/PKIXRevocationChecker/UnitTest.java rename to test/jdk/java/security/cert/PKIXRevocationChecker/UnitTest.java diff --git a/jdk/test/java/security/cert/PolicyNode/GetPolicyQualifiers.java b/test/jdk/java/security/cert/PolicyNode/GetPolicyQualifiers.java similarity index 100% rename from jdk/test/java/security/cert/PolicyNode/GetPolicyQualifiers.java rename to test/jdk/java/security/cert/PolicyNode/GetPolicyQualifiers.java diff --git a/jdk/test/java/security/cert/PolicyNode/speech2eve b/test/jdk/java/security/cert/PolicyNode/speech2eve similarity index 100% rename from jdk/test/java/security/cert/PolicyNode/speech2eve rename to test/jdk/java/security/cert/PolicyNode/speech2eve diff --git a/jdk/test/java/security/cert/PolicyNode/speech2speech b/test/jdk/java/security/cert/PolicyNode/speech2speech similarity index 100% rename from jdk/test/java/security/cert/PolicyNode/speech2speech rename to test/jdk/java/security/cert/PolicyNode/speech2speech diff --git a/jdk/test/java/security/cert/URICertStoreParameters/TestBasic.java b/test/jdk/java/security/cert/URICertStoreParameters/TestBasic.java similarity index 100% rename from jdk/test/java/security/cert/URICertStoreParameters/TestBasic.java rename to test/jdk/java/security/cert/URICertStoreParameters/TestBasic.java diff --git a/jdk/test/java/security/cert/X509CRL/VerifyDefault.java b/test/jdk/java/security/cert/X509CRL/VerifyDefault.java similarity index 100% rename from jdk/test/java/security/cert/X509CRL/VerifyDefault.java rename to test/jdk/java/security/cert/X509CRL/VerifyDefault.java diff --git a/jdk/test/java/security/cert/X509CertSelector/SetNameConstraintsEmptySequence.java b/test/jdk/java/security/cert/X509CertSelector/SetNameConstraintsEmptySequence.java similarity index 100% rename from jdk/test/java/security/cert/X509CertSelector/SetNameConstraintsEmptySequence.java rename to test/jdk/java/security/cert/X509CertSelector/SetNameConstraintsEmptySequence.java diff --git a/jdk/test/java/security/cert/X509CertSelectorTest.java b/test/jdk/java/security/cert/X509CertSelectorTest.java similarity index 100% rename from jdk/test/java/security/cert/X509CertSelectorTest.java rename to test/jdk/java/security/cert/X509CertSelectorTest.java diff --git a/jdk/test/java/security/cert/X509Certificate/EmptySubject.java b/test/jdk/java/security/cert/X509Certificate/EmptySubject.java similarity index 100% rename from jdk/test/java/security/cert/X509Certificate/EmptySubject.java rename to test/jdk/java/security/cert/X509Certificate/EmptySubject.java diff --git a/jdk/test/java/security/cert/X509Certificate/ExtKeyUsage.java b/test/jdk/java/security/cert/X509Certificate/ExtKeyUsage.java similarity index 100% rename from jdk/test/java/security/cert/X509Certificate/ExtKeyUsage.java rename to test/jdk/java/security/cert/X509Certificate/ExtKeyUsage.java diff --git a/jdk/test/java/security/cert/X509Certificate/VerifyDefault.java b/test/jdk/java/security/cert/X509Certificate/VerifyDefault.java similarity index 100% rename from jdk/test/java/security/cert/X509Certificate/VerifyDefault.java rename to test/jdk/java/security/cert/X509Certificate/VerifyDefault.java diff --git a/jdk/test/java/security/cert/X509Certificate/X509BadCertificate.java b/test/jdk/java/security/cert/X509Certificate/X509BadCertificate.java similarity index 100% rename from jdk/test/java/security/cert/X509Certificate/X509BadCertificate.java rename to test/jdk/java/security/cert/X509Certificate/X509BadCertificate.java diff --git a/jdk/test/java/security/cert/X509Certificate/bad-cert-1.pem b/test/jdk/java/security/cert/X509Certificate/bad-cert-1.pem similarity index 100% rename from jdk/test/java/security/cert/X509Certificate/bad-cert-1.pem rename to test/jdk/java/security/cert/X509Certificate/bad-cert-1.pem diff --git a/jdk/test/java/security/cert/X509Certificate/bad-cert-2.pem b/test/jdk/java/security/cert/X509Certificate/bad-cert-2.pem similarity index 100% rename from jdk/test/java/security/cert/X509Certificate/bad-cert-2.pem rename to test/jdk/java/security/cert/X509Certificate/bad-cert-2.pem diff --git a/jdk/test/java/security/cert/X509Certificate/certextkeyusage b/test/jdk/java/security/cert/X509Certificate/certextkeyusage similarity index 100% rename from jdk/test/java/security/cert/X509Certificate/certextkeyusage rename to test/jdk/java/security/cert/X509Certificate/certextkeyusage diff --git a/jdk/test/java/security/cert/X509Certificate/emptyIssuerCert b/test/jdk/java/security/cert/X509Certificate/emptyIssuerCert similarity index 100% rename from jdk/test/java/security/cert/X509Certificate/emptyIssuerCert rename to test/jdk/java/security/cert/X509Certificate/emptyIssuerCert diff --git a/jdk/test/java/security/cert/X509Certificate/emptySubjectCert b/test/jdk/java/security/cert/X509Certificate/emptySubjectCert similarity index 100% rename from jdk/test/java/security/cert/X509Certificate/emptySubjectCert rename to test/jdk/java/security/cert/X509Certificate/emptySubjectCert diff --git a/jdk/test/java/security/cert/pkix/nameConstraintsMinMax/VerifyNameConstraints.java b/test/jdk/java/security/cert/pkix/nameConstraintsMinMax/VerifyNameConstraints.java similarity index 100% rename from jdk/test/java/security/cert/pkix/nameConstraintsMinMax/VerifyNameConstraints.java rename to test/jdk/java/security/cert/pkix/nameConstraintsMinMax/VerifyNameConstraints.java diff --git a/jdk/test/java/security/cert/pkix/nameConstraintsMinMax/labs2isrg2.cer b/test/jdk/java/security/cert/pkix/nameConstraintsMinMax/labs2isrg2.cer similarity index 100% rename from jdk/test/java/security/cert/pkix/nameConstraintsMinMax/labs2isrg2.cer rename to test/jdk/java/security/cert/pkix/nameConstraintsMinMax/labs2isrg2.cer diff --git a/jdk/test/java/security/cert/pkix/nameConstraintsMinMax/sun.cer b/test/jdk/java/security/cert/pkix/nameConstraintsMinMax/sun.cer similarity index 100% rename from jdk/test/java/security/cert/pkix/nameConstraintsMinMax/sun.cer rename to test/jdk/java/security/cert/pkix/nameConstraintsMinMax/sun.cer diff --git a/jdk/test/java/security/cert/pkix/nameConstraintsMinMax/sun2labs2.cer b/test/jdk/java/security/cert/pkix/nameConstraintsMinMax/sun2labs2.cer similarity index 100% rename from jdk/test/java/security/cert/pkix/nameConstraintsMinMax/sun2labs2.cer rename to test/jdk/java/security/cert/pkix/nameConstraintsMinMax/sun2labs2.cer diff --git a/jdk/test/java/security/cert/pkix/policyChanges/TestPolicy.java b/test/jdk/java/security/cert/pkix/policyChanges/TestPolicy.java similarity index 100% rename from jdk/test/java/security/cert/pkix/policyChanges/TestPolicy.java rename to test/jdk/java/security/cert/pkix/policyChanges/TestPolicy.java diff --git a/jdk/test/java/security/cert/pkix/policyChanges/anchor.cer b/test/jdk/java/security/cert/pkix/policyChanges/anchor.cer similarity index 100% rename from jdk/test/java/security/cert/pkix/policyChanges/anchor.cer rename to test/jdk/java/security/cert/pkix/policyChanges/anchor.cer diff --git a/jdk/test/java/security/cert/pkix/policyChanges/ca.cer b/test/jdk/java/security/cert/pkix/policyChanges/ca.cer similarity index 100% rename from jdk/test/java/security/cert/pkix/policyChanges/ca.cer rename to test/jdk/java/security/cert/pkix/policyChanges/ca.cer diff --git a/jdk/test/java/security/cert/pkix/policyChanges/ee.cer b/test/jdk/java/security/cert/pkix/policyChanges/ee.cer similarity index 100% rename from jdk/test/java/security/cert/pkix/policyChanges/ee.cer rename to test/jdk/java/security/cert/pkix/policyChanges/ee.cer diff --git a/jdk/test/java/security/misc/GetInstanceNullsEmpties.java b/test/jdk/java/security/misc/GetInstanceNullsEmpties.java similarity index 100% rename from jdk/test/java/security/misc/GetInstanceNullsEmpties.java rename to test/jdk/java/security/misc/GetInstanceNullsEmpties.java diff --git a/jdk/test/java/security/spec/ECCBasic.java b/test/jdk/java/security/spec/ECCBasic.java similarity index 100% rename from jdk/test/java/security/spec/ECCBasic.java rename to test/jdk/java/security/spec/ECCBasic.java diff --git a/jdk/test/java/security/spec/EllipticCurveMatch.java b/test/jdk/java/security/spec/EllipticCurveMatch.java similarity index 100% rename from jdk/test/java/security/spec/EllipticCurveMatch.java rename to test/jdk/java/security/spec/EllipticCurveMatch.java diff --git a/jdk/test/java/security/spec/PKCS8EncodedKeySpec/Algorithm.java b/test/jdk/java/security/spec/PKCS8EncodedKeySpec/Algorithm.java similarity index 100% rename from jdk/test/java/security/spec/PKCS8EncodedKeySpec/Algorithm.java rename to test/jdk/java/security/spec/PKCS8EncodedKeySpec/Algorithm.java diff --git a/jdk/test/java/security/testlibrary/CertUtils.java b/test/jdk/java/security/testlibrary/CertUtils.java similarity index 100% rename from jdk/test/java/security/testlibrary/CertUtils.java rename to test/jdk/java/security/testlibrary/CertUtils.java diff --git a/jdk/test/java/security/testlibrary/CertificateBuilder.java b/test/jdk/java/security/testlibrary/CertificateBuilder.java similarity index 100% rename from jdk/test/java/security/testlibrary/CertificateBuilder.java rename to test/jdk/java/security/testlibrary/CertificateBuilder.java diff --git a/jdk/test/java/security/testlibrary/Proc.java b/test/jdk/java/security/testlibrary/Proc.java similarity index 100% rename from jdk/test/java/security/testlibrary/Proc.java rename to test/jdk/java/security/testlibrary/Proc.java diff --git a/jdk/test/java/security/testlibrary/Providers.java b/test/jdk/java/security/testlibrary/Providers.java similarity index 100% rename from jdk/test/java/security/testlibrary/Providers.java rename to test/jdk/java/security/testlibrary/Providers.java diff --git a/jdk/test/java/security/testlibrary/ProvidersSnapshot.java b/test/jdk/java/security/testlibrary/ProvidersSnapshot.java similarity index 100% rename from jdk/test/java/security/testlibrary/ProvidersSnapshot.java rename to test/jdk/java/security/testlibrary/ProvidersSnapshot.java diff --git a/jdk/test/java/security/testlibrary/SimpleOCSPServer.java b/test/jdk/java/security/testlibrary/SimpleOCSPServer.java similarity index 100% rename from jdk/test/java/security/testlibrary/SimpleOCSPServer.java rename to test/jdk/java/security/testlibrary/SimpleOCSPServer.java diff --git a/jdk/test/java/sql/JavatimeTest.java b/test/jdk/java/sql/JavatimeTest.java similarity index 100% rename from jdk/test/java/sql/JavatimeTest.java rename to test/jdk/java/sql/JavatimeTest.java diff --git a/jdk/test/java/sql/TEST.properties b/test/jdk/java/sql/TEST.properties similarity index 100% rename from jdk/test/java/sql/TEST.properties rename to test/jdk/java/sql/TEST.properties diff --git a/jdk/test/java/sql/driverModuleTests/DriverManagerModuleTests.java b/test/jdk/java/sql/driverModuleTests/DriverManagerModuleTests.java similarity index 100% rename from jdk/test/java/sql/driverModuleTests/DriverManagerModuleTests.java rename to test/jdk/java/sql/driverModuleTests/DriverManagerModuleTests.java diff --git a/jdk/test/java/sql/modules/luckydogdriver/luckydogtennis/LuckyDogDriver.java b/test/jdk/java/sql/modules/luckydogdriver/luckydogtennis/LuckyDogDriver.java similarity index 100% rename from jdk/test/java/sql/modules/luckydogdriver/luckydogtennis/LuckyDogDriver.java rename to test/jdk/java/sql/modules/luckydogdriver/luckydogtennis/LuckyDogDriver.java diff --git a/jdk/test/java/sql/modules/luckydogdriver/luckydogtennis/StubConnection.java b/test/jdk/java/sql/modules/luckydogdriver/luckydogtennis/StubConnection.java similarity index 100% rename from jdk/test/java/sql/modules/luckydogdriver/luckydogtennis/StubConnection.java rename to test/jdk/java/sql/modules/luckydogdriver/luckydogtennis/StubConnection.java diff --git a/jdk/test/java/sql/modules/luckydogdriver/module-info.java b/test/jdk/java/sql/modules/luckydogdriver/module-info.java similarity index 100% rename from jdk/test/java/sql/modules/luckydogdriver/module-info.java rename to test/jdk/java/sql/modules/luckydogdriver/module-info.java diff --git a/jdk/test/java/sql/modules/mystubdriver/com/luckydogtennis/StubConnection.java b/test/jdk/java/sql/modules/mystubdriver/com/luckydogtennis/StubConnection.java similarity index 100% rename from jdk/test/java/sql/modules/mystubdriver/com/luckydogtennis/StubConnection.java rename to test/jdk/java/sql/modules/mystubdriver/com/luckydogtennis/StubConnection.java diff --git a/jdk/test/java/sql/modules/mystubdriver/com/luckydogtennis/StubDriver.java b/test/jdk/java/sql/modules/mystubdriver/com/luckydogtennis/StubDriver.java similarity index 100% rename from jdk/test/java/sql/modules/mystubdriver/com/luckydogtennis/StubDriver.java rename to test/jdk/java/sql/modules/mystubdriver/com/luckydogtennis/StubDriver.java diff --git a/jdk/test/java/sql/modules/mystubdriver/module-info.java b/test/jdk/java/sql/modules/mystubdriver/module-info.java similarity index 100% rename from jdk/test/java/sql/modules/mystubdriver/module-info.java rename to test/jdk/java/sql/modules/mystubdriver/module-info.java diff --git a/jdk/test/java/sql/testng/TEST.properties b/test/jdk/java/sql/testng/TEST.properties similarity index 100% rename from jdk/test/java/sql/testng/TEST.properties rename to test/jdk/java/sql/testng/TEST.properties diff --git a/jdk/test/java/sql/testng/test/sql/BatchUpdateExceptionTests.java b/test/jdk/java/sql/testng/test/sql/BatchUpdateExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/BatchUpdateExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/BatchUpdateExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/CallableStatementTests.java b/test/jdk/java/sql/testng/test/sql/CallableStatementTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/CallableStatementTests.java rename to test/jdk/java/sql/testng/test/sql/CallableStatementTests.java diff --git a/jdk/test/java/sql/testng/test/sql/DataTruncationTests.java b/test/jdk/java/sql/testng/test/sql/DataTruncationTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/DataTruncationTests.java rename to test/jdk/java/sql/testng/test/sql/DataTruncationTests.java diff --git a/jdk/test/java/sql/testng/test/sql/DateTests.java b/test/jdk/java/sql/testng/test/sql/DateTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/DateTests.java rename to test/jdk/java/sql/testng/test/sql/DateTests.java diff --git a/jdk/test/java/sql/testng/test/sql/DriverManagerPermissionsTests.java b/test/jdk/java/sql/testng/test/sql/DriverManagerPermissionsTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/DriverManagerPermissionsTests.java rename to test/jdk/java/sql/testng/test/sql/DriverManagerPermissionsTests.java diff --git a/jdk/test/java/sql/testng/test/sql/DriverManagerTests.java b/test/jdk/java/sql/testng/test/sql/DriverManagerTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/DriverManagerTests.java rename to test/jdk/java/sql/testng/test/sql/DriverManagerTests.java diff --git a/jdk/test/java/sql/testng/test/sql/PreparedStatementTests.java b/test/jdk/java/sql/testng/test/sql/PreparedStatementTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/PreparedStatementTests.java rename to test/jdk/java/sql/testng/test/sql/PreparedStatementTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLClientInfoExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLClientInfoExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLClientInfoExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLClientInfoExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLDataExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLDataExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLDataExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLDataExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLFeatureNotSupportedExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLFeatureNotSupportedExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLFeatureNotSupportedExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLFeatureNotSupportedExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLIntegrityConstraintViolationExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLIntegrityConstraintViolationExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLIntegrityConstraintViolationExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLIntegrityConstraintViolationExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLNonTransientConnectionExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLNonTransientConnectionExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLNonTransientConnectionExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLNonTransientConnectionExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLNonTransientExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLNonTransientExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLNonTransientExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLNonTransientExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLRecoverableExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLRecoverableExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLRecoverableExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLRecoverableExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLSyntaxErrorExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLSyntaxErrorExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLSyntaxErrorExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLSyntaxErrorExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLTimeoutExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLTimeoutExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLTimeoutExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLTimeoutExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLTransactionRollbackExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLTransactionRollbackExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLTransactionRollbackExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLTransactionRollbackExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLTransientConnectionExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLTransientConnectionExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLTransientConnectionExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLTransientConnectionExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLTransientExceptionTests.java b/test/jdk/java/sql/testng/test/sql/SQLTransientExceptionTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLTransientExceptionTests.java rename to test/jdk/java/sql/testng/test/sql/SQLTransientExceptionTests.java diff --git a/jdk/test/java/sql/testng/test/sql/SQLWarningTests.java b/test/jdk/java/sql/testng/test/sql/SQLWarningTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/SQLWarningTests.java rename to test/jdk/java/sql/testng/test/sql/SQLWarningTests.java diff --git a/jdk/test/java/sql/testng/test/sql/StatementTests.java b/test/jdk/java/sql/testng/test/sql/StatementTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/StatementTests.java rename to test/jdk/java/sql/testng/test/sql/StatementTests.java diff --git a/jdk/test/java/sql/testng/test/sql/TimeTests.java b/test/jdk/java/sql/testng/test/sql/TimeTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/TimeTests.java rename to test/jdk/java/sql/testng/test/sql/TimeTests.java diff --git a/jdk/test/java/sql/testng/test/sql/TimestampTests.java b/test/jdk/java/sql/testng/test/sql/TimestampTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/TimestampTests.java rename to test/jdk/java/sql/testng/test/sql/TimestampTests.java diff --git a/jdk/test/java/sql/testng/test/sql/othervm/DriverManagerInitTests.java b/test/jdk/java/sql/testng/test/sql/othervm/DriverManagerInitTests.java similarity index 100% rename from jdk/test/java/sql/testng/test/sql/othervm/DriverManagerInitTests.java rename to test/jdk/java/sql/testng/test/sql/othervm/DriverManagerInitTests.java diff --git a/jdk/test/java/sql/testng/util/BaseTest.java b/test/jdk/java/sql/testng/util/BaseTest.java similarity index 100% rename from jdk/test/java/sql/testng/util/BaseTest.java rename to test/jdk/java/sql/testng/util/BaseTest.java diff --git a/jdk/test/java/sql/testng/util/DriverActionImpl.java b/test/jdk/java/sql/testng/util/DriverActionImpl.java similarity index 100% rename from jdk/test/java/sql/testng/util/DriverActionImpl.java rename to test/jdk/java/sql/testng/util/DriverActionImpl.java diff --git a/jdk/test/java/sql/testng/util/SerializedBatchUpdateException.java b/test/jdk/java/sql/testng/util/SerializedBatchUpdateException.java similarity index 100% rename from jdk/test/java/sql/testng/util/SerializedBatchUpdateException.java rename to test/jdk/java/sql/testng/util/SerializedBatchUpdateException.java diff --git a/jdk/test/java/sql/testng/util/StubCallableStatement.java b/test/jdk/java/sql/testng/util/StubCallableStatement.java similarity index 100% rename from jdk/test/java/sql/testng/util/StubCallableStatement.java rename to test/jdk/java/sql/testng/util/StubCallableStatement.java diff --git a/jdk/test/java/sql/testng/util/StubConnection.java b/test/jdk/java/sql/testng/util/StubConnection.java similarity index 100% rename from jdk/test/java/sql/testng/util/StubConnection.java rename to test/jdk/java/sql/testng/util/StubConnection.java diff --git a/jdk/test/java/sql/testng/util/StubDriver.java b/test/jdk/java/sql/testng/util/StubDriver.java similarity index 100% rename from jdk/test/java/sql/testng/util/StubDriver.java rename to test/jdk/java/sql/testng/util/StubDriver.java diff --git a/jdk/test/java/sql/testng/util/StubDriverDA.java b/test/jdk/java/sql/testng/util/StubDriverDA.java similarity index 100% rename from jdk/test/java/sql/testng/util/StubDriverDA.java rename to test/jdk/java/sql/testng/util/StubDriverDA.java diff --git a/jdk/test/java/sql/testng/util/StubPreparedStatement.java b/test/jdk/java/sql/testng/util/StubPreparedStatement.java similarity index 100% rename from jdk/test/java/sql/testng/util/StubPreparedStatement.java rename to test/jdk/java/sql/testng/util/StubPreparedStatement.java diff --git a/jdk/test/java/sql/testng/util/StubStatement.java b/test/jdk/java/sql/testng/util/StubStatement.java similarity index 100% rename from jdk/test/java/sql/testng/util/StubStatement.java rename to test/jdk/java/sql/testng/util/StubStatement.java diff --git a/jdk/test/java/sql/testng/util/TestPolicy.java b/test/jdk/java/sql/testng/util/TestPolicy.java similarity index 100% rename from jdk/test/java/sql/testng/util/TestPolicy.java rename to test/jdk/java/sql/testng/util/TestPolicy.java diff --git a/jdk/test/java/text/AttributedCharacterIterator/Attribute/ReadResolve.java b/test/jdk/java/text/AttributedCharacterIterator/Attribute/ReadResolve.java similarity index 100% rename from jdk/test/java/text/AttributedCharacterIterator/Attribute/ReadResolve.java rename to test/jdk/java/text/AttributedCharacterIterator/Attribute/ReadResolve.java diff --git a/jdk/test/java/text/AttributedString/AttributedStringTest.java b/test/jdk/java/text/AttributedString/AttributedStringTest.java similarity index 100% rename from jdk/test/java/text/AttributedString/AttributedStringTest.java rename to test/jdk/java/text/AttributedString/AttributedStringTest.java diff --git a/jdk/test/java/text/AttributedString/TestAttributedStringCtor.java b/test/jdk/java/text/AttributedString/TestAttributedStringCtor.java similarity index 100% rename from jdk/test/java/text/AttributedString/TestAttributedStringCtor.java rename to test/jdk/java/text/AttributedString/TestAttributedStringCtor.java diff --git a/jdk/test/java/text/AttributedString/getRunStartLimitTest.java b/test/jdk/java/text/AttributedString/getRunStartLimitTest.java similarity index 100% rename from jdk/test/java/text/AttributedString/getRunStartLimitTest.java rename to test/jdk/java/text/AttributedString/getRunStartLimitTest.java diff --git a/jdk/test/java/text/Bidi/BidiBug.java b/test/jdk/java/text/Bidi/BidiBug.java similarity index 100% rename from jdk/test/java/text/Bidi/BidiBug.java rename to test/jdk/java/text/Bidi/BidiBug.java diff --git a/jdk/test/java/text/Bidi/BidiConformance.java b/test/jdk/java/text/Bidi/BidiConformance.java similarity index 100% rename from jdk/test/java/text/Bidi/BidiConformance.java rename to test/jdk/java/text/Bidi/BidiConformance.java diff --git a/jdk/test/java/text/Bidi/BidiEmbeddingTest.java b/test/jdk/java/text/Bidi/BidiEmbeddingTest.java similarity index 100% rename from jdk/test/java/text/Bidi/BidiEmbeddingTest.java rename to test/jdk/java/text/Bidi/BidiEmbeddingTest.java diff --git a/jdk/test/java/text/Bidi/BidiSurrogateTest.java b/test/jdk/java/text/Bidi/BidiSurrogateTest.java similarity index 100% rename from jdk/test/java/text/Bidi/BidiSurrogateTest.java rename to test/jdk/java/text/Bidi/BidiSurrogateTest.java diff --git a/jdk/test/java/text/Bidi/Bug6850113.java b/test/jdk/java/text/Bidi/Bug6850113.java similarity index 100% rename from jdk/test/java/text/Bidi/Bug6850113.java rename to test/jdk/java/text/Bidi/Bug6850113.java diff --git a/jdk/test/java/text/Bidi/Bug7002398.java b/test/jdk/java/text/Bidi/Bug7002398.java similarity index 100% rename from jdk/test/java/text/Bidi/Bug7002398.java rename to test/jdk/java/text/Bidi/Bug7002398.java diff --git a/jdk/test/java/text/Bidi/Bug7041232.java b/test/jdk/java/text/Bidi/Bug7041232.java similarity index 100% rename from jdk/test/java/text/Bidi/Bug7041232.java rename to test/jdk/java/text/Bidi/Bug7041232.java diff --git a/jdk/test/java/text/Bidi/Bug7042148.java b/test/jdk/java/text/Bidi/Bug7042148.java similarity index 100% rename from jdk/test/java/text/Bidi/Bug7042148.java rename to test/jdk/java/text/Bidi/Bug7042148.java diff --git a/jdk/test/java/text/Bidi/Bug7051769.java b/test/jdk/java/text/Bidi/Bug7051769.java similarity index 100% rename from jdk/test/java/text/Bidi/Bug7051769.java rename to test/jdk/java/text/Bidi/Bug7051769.java diff --git a/jdk/test/java/text/Bidi/Bug8005277.java b/test/jdk/java/text/Bidi/Bug8005277.java similarity index 100% rename from jdk/test/java/text/Bidi/Bug8005277.java rename to test/jdk/java/text/Bidi/Bug8005277.java diff --git a/jdk/test/java/text/BreakIterator/BreakIteratorTest.java b/test/jdk/java/text/BreakIterator/BreakIteratorTest.java similarity index 100% rename from jdk/test/java/text/BreakIterator/BreakIteratorTest.java rename to test/jdk/java/text/BreakIterator/BreakIteratorTest.java diff --git a/jdk/test/java/text/BreakIterator/Bug4533872.java b/test/jdk/java/text/BreakIterator/Bug4533872.java similarity index 100% rename from jdk/test/java/text/BreakIterator/Bug4533872.java rename to test/jdk/java/text/BreakIterator/Bug4533872.java diff --git a/jdk/test/java/text/BreakIterator/Bug4740757.java b/test/jdk/java/text/BreakIterator/Bug4740757.java similarity index 100% rename from jdk/test/java/text/BreakIterator/Bug4740757.java rename to test/jdk/java/text/BreakIterator/Bug4740757.java diff --git a/jdk/test/java/text/BreakIterator/Bug4912404.java b/test/jdk/java/text/BreakIterator/Bug4912404.java similarity index 100% rename from jdk/test/java/text/BreakIterator/Bug4912404.java rename to test/jdk/java/text/BreakIterator/Bug4912404.java diff --git a/jdk/test/java/text/BreakIterator/Bug4932583.java b/test/jdk/java/text/BreakIterator/Bug4932583.java similarity index 100% rename from jdk/test/java/text/BreakIterator/Bug4932583.java rename to test/jdk/java/text/BreakIterator/Bug4932583.java diff --git a/jdk/test/java/text/BreakIterator/Bug6513074.java b/test/jdk/java/text/BreakIterator/Bug6513074.java similarity index 100% rename from jdk/test/java/text/BreakIterator/Bug6513074.java rename to test/jdk/java/text/BreakIterator/Bug6513074.java diff --git a/jdk/test/java/text/BreakIterator/Bug7104012.java b/test/jdk/java/text/BreakIterator/Bug7104012.java similarity index 100% rename from jdk/test/java/text/BreakIterator/Bug7104012.java rename to test/jdk/java/text/BreakIterator/Bug7104012.java diff --git a/jdk/test/java/text/BreakIterator/Bug8032446.java b/test/jdk/java/text/BreakIterator/Bug8032446.java similarity index 100% rename from jdk/test/java/text/BreakIterator/Bug8032446.java rename to test/jdk/java/text/BreakIterator/Bug8032446.java diff --git a/jdk/test/java/text/BreakIterator/ExceptionTest.java b/test/jdk/java/text/BreakIterator/ExceptionTest.java similarity index 100% rename from jdk/test/java/text/BreakIterator/ExceptionTest.java rename to test/jdk/java/text/BreakIterator/ExceptionTest.java diff --git a/jdk/test/java/text/BreakIterator/MirroredBreakIterator.java b/test/jdk/java/text/BreakIterator/MirroredBreakIterator.java similarity index 100% rename from jdk/test/java/text/BreakIterator/MirroredBreakIterator.java rename to test/jdk/java/text/BreakIterator/MirroredBreakIterator.java diff --git a/jdk/test/java/text/BreakIterator/NewVSOld_th_TH.java b/test/jdk/java/text/BreakIterator/NewVSOld_th_TH.java similarity index 100% rename from jdk/test/java/text/BreakIterator/NewVSOld_th_TH.java rename to test/jdk/java/text/BreakIterator/NewVSOld_th_TH.java diff --git a/jdk/test/java/text/BreakIterator/broken_th_TH.txt b/test/jdk/java/text/BreakIterator/broken_th_TH.txt similarity index 100% rename from jdk/test/java/text/BreakIterator/broken_th_TH.txt rename to test/jdk/java/text/BreakIterator/broken_th_TH.txt diff --git a/jdk/test/java/text/BreakIterator/test_th_TH.txt b/test/jdk/java/text/BreakIterator/test_th_TH.txt similarity index 100% rename from jdk/test/java/text/BreakIterator/test_th_TH.txt rename to test/jdk/java/text/BreakIterator/test_th_TH.txt diff --git a/jdk/test/java/text/CharacterIterator/CharacterIteratorTest.java b/test/jdk/java/text/CharacterIterator/CharacterIteratorTest.java similarity index 100% rename from jdk/test/java/text/CharacterIterator/CharacterIteratorTest.java rename to test/jdk/java/text/CharacterIterator/CharacterIteratorTest.java diff --git a/jdk/test/java/text/Collator/APITest.java b/test/jdk/java/text/Collator/APITest.java similarity index 100% rename from jdk/test/java/text/Collator/APITest.java rename to test/jdk/java/text/Collator/APITest.java diff --git a/jdk/test/java/text/Collator/Bug5047314.java b/test/jdk/java/text/Collator/Bug5047314.java similarity index 100% rename from jdk/test/java/text/Collator/Bug5047314.java rename to test/jdk/java/text/Collator/Bug5047314.java diff --git a/jdk/test/java/text/Collator/Bug6271411.java b/test/jdk/java/text/Collator/Bug6271411.java similarity index 100% rename from jdk/test/java/text/Collator/Bug6271411.java rename to test/jdk/java/text/Collator/Bug6271411.java diff --git a/jdk/test/java/text/Collator/Bug6970930.java b/test/jdk/java/text/Collator/Bug6970930.java similarity index 100% rename from jdk/test/java/text/Collator/Bug6970930.java rename to test/jdk/java/text/Collator/Bug6970930.java diff --git a/jdk/test/java/text/Collator/Bug7200119.java b/test/jdk/java/text/Collator/Bug7200119.java similarity index 100% rename from jdk/test/java/text/Collator/Bug7200119.java rename to test/jdk/java/text/Collator/Bug7200119.java diff --git a/jdk/test/java/text/Collator/CollationKeyTest.java b/test/jdk/java/text/Collator/CollationKeyTest.java similarity index 100% rename from jdk/test/java/text/Collator/CollationKeyTest.java rename to test/jdk/java/text/Collator/CollationKeyTest.java diff --git a/jdk/test/java/text/Collator/CollationKeyTestImpl.java b/test/jdk/java/text/Collator/CollationKeyTestImpl.java similarity index 100% rename from jdk/test/java/text/Collator/CollationKeyTestImpl.java rename to test/jdk/java/text/Collator/CollationKeyTestImpl.java diff --git a/jdk/test/java/text/Collator/CollatorTest.java b/test/jdk/java/text/Collator/CollatorTest.java similarity index 100% rename from jdk/test/java/text/Collator/CollatorTest.java rename to test/jdk/java/text/Collator/CollatorTest.java diff --git a/jdk/test/java/text/Collator/CurrencyCollate.java b/test/jdk/java/text/Collator/CurrencyCollate.java similarity index 100% rename from jdk/test/java/text/Collator/CurrencyCollate.java rename to test/jdk/java/text/Collator/CurrencyCollate.java diff --git a/jdk/test/java/text/Collator/DanishTest.java b/test/jdk/java/text/Collator/DanishTest.java similarity index 100% rename from jdk/test/java/text/Collator/DanishTest.java rename to test/jdk/java/text/Collator/DanishTest.java diff --git a/jdk/test/java/text/Collator/DummyTest.java b/test/jdk/java/text/Collator/DummyTest.java similarity index 100% rename from jdk/test/java/text/Collator/DummyTest.java rename to test/jdk/java/text/Collator/DummyTest.java diff --git a/jdk/test/java/text/Collator/EnglishTest.java b/test/jdk/java/text/Collator/EnglishTest.java similarity index 100% rename from jdk/test/java/text/Collator/EnglishTest.java rename to test/jdk/java/text/Collator/EnglishTest.java diff --git a/jdk/test/java/text/Collator/FinnishTest.java b/test/jdk/java/text/Collator/FinnishTest.java similarity index 100% rename from jdk/test/java/text/Collator/FinnishTest.java rename to test/jdk/java/text/Collator/FinnishTest.java diff --git a/jdk/test/java/text/Collator/FrenchTest.java b/test/jdk/java/text/Collator/FrenchTest.java similarity index 100% rename from jdk/test/java/text/Collator/FrenchTest.java rename to test/jdk/java/text/Collator/FrenchTest.java diff --git a/jdk/test/java/text/Collator/G7Test.java b/test/jdk/java/text/Collator/G7Test.java similarity index 100% rename from jdk/test/java/text/Collator/G7Test.java rename to test/jdk/java/text/Collator/G7Test.java diff --git a/jdk/test/java/text/Collator/GermanTest.java b/test/jdk/java/text/Collator/GermanTest.java similarity index 100% rename from jdk/test/java/text/Collator/GermanTest.java rename to test/jdk/java/text/Collator/GermanTest.java diff --git a/jdk/test/java/text/Collator/IteratorTest.java b/test/jdk/java/text/Collator/IteratorTest.java similarity index 100% rename from jdk/test/java/text/Collator/IteratorTest.java rename to test/jdk/java/text/Collator/IteratorTest.java diff --git a/jdk/test/java/text/Collator/JapaneseTest.java b/test/jdk/java/text/Collator/JapaneseTest.java similarity index 100% rename from jdk/test/java/text/Collator/JapaneseTest.java rename to test/jdk/java/text/Collator/JapaneseTest.java diff --git a/jdk/test/java/text/Collator/KoreanTest.java b/test/jdk/java/text/Collator/KoreanTest.java similarity index 100% rename from jdk/test/java/text/Collator/KoreanTest.java rename to test/jdk/java/text/Collator/KoreanTest.java diff --git a/jdk/test/java/text/Collator/MonkeyTest.java b/test/jdk/java/text/Collator/MonkeyTest.java similarity index 100% rename from jdk/test/java/text/Collator/MonkeyTest.java rename to test/jdk/java/text/Collator/MonkeyTest.java diff --git a/jdk/test/java/text/Collator/Regression.java b/test/jdk/java/text/Collator/Regression.java similarity index 100% rename from jdk/test/java/text/Collator/Regression.java rename to test/jdk/java/text/Collator/Regression.java diff --git a/jdk/test/java/text/Collator/SpanishTest.java b/test/jdk/java/text/Collator/SpanishTest.java similarity index 100% rename from jdk/test/java/text/Collator/SpanishTest.java rename to test/jdk/java/text/Collator/SpanishTest.java diff --git a/jdk/test/java/text/Collator/SurrogatesTest.java b/test/jdk/java/text/Collator/SurrogatesTest.java similarity index 100% rename from jdk/test/java/text/Collator/SurrogatesTest.java rename to test/jdk/java/text/Collator/SurrogatesTest.java diff --git a/jdk/test/java/text/Collator/Test4401726.java b/test/jdk/java/text/Collator/Test4401726.java similarity index 100% rename from jdk/test/java/text/Collator/Test4401726.java rename to test/jdk/java/text/Collator/Test4401726.java diff --git a/jdk/test/java/text/Collator/ThaiTest.java b/test/jdk/java/text/Collator/ThaiTest.java similarity index 100% rename from jdk/test/java/text/Collator/ThaiTest.java rename to test/jdk/java/text/Collator/ThaiTest.java diff --git a/jdk/test/java/text/Collator/TurkishTest.java b/test/jdk/java/text/Collator/TurkishTest.java similarity index 100% rename from jdk/test/java/text/Collator/TurkishTest.java rename to test/jdk/java/text/Collator/TurkishTest.java diff --git a/jdk/test/java/text/Collator/VietnameseTest.java b/test/jdk/java/text/Collator/VietnameseTest.java similarity index 100% rename from jdk/test/java/text/Collator/VietnameseTest.java rename to test/jdk/java/text/Collator/VietnameseTest.java diff --git a/jdk/test/java/text/Format/ChoiceFormat/Bug4185732.ser.txt b/test/jdk/java/text/Format/ChoiceFormat/Bug4185732.ser.txt similarity index 100% rename from jdk/test/java/text/Format/ChoiceFormat/Bug4185732.ser.txt rename to test/jdk/java/text/Format/ChoiceFormat/Bug4185732.ser.txt diff --git a/jdk/test/java/text/Format/ChoiceFormat/Bug4185732Test.java b/test/jdk/java/text/Format/ChoiceFormat/Bug4185732Test.java similarity index 100% rename from jdk/test/java/text/Format/ChoiceFormat/Bug4185732Test.java rename to test/jdk/java/text/Format/ChoiceFormat/Bug4185732Test.java diff --git a/jdk/test/java/text/Format/ChoiceFormat/Bug4387255.java b/test/jdk/java/text/Format/ChoiceFormat/Bug4387255.java similarity index 100% rename from jdk/test/java/text/Format/ChoiceFormat/Bug4387255.java rename to test/jdk/java/text/Format/ChoiceFormat/Bug4387255.java diff --git a/jdk/test/java/text/Format/ChoiceFormat/Bug8001209.java b/test/jdk/java/text/Format/ChoiceFormat/Bug8001209.java similarity index 100% rename from jdk/test/java/text/Format/ChoiceFormat/Bug8001209.java rename to test/jdk/java/text/Format/ChoiceFormat/Bug8001209.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug4322313.java b/test/jdk/java/text/Format/DateFormat/Bug4322313.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug4322313.java rename to test/jdk/java/text/Format/DateFormat/Bug4322313.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug4396385.java b/test/jdk/java/text/Format/DateFormat/Bug4396385.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug4396385.java rename to test/jdk/java/text/Format/DateFormat/Bug4396385.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug4407042.java b/test/jdk/java/text/Format/DateFormat/Bug4407042.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug4407042.java rename to test/jdk/java/text/Format/DateFormat/Bug4407042.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug4736959.java b/test/jdk/java/text/Format/DateFormat/Bug4736959.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug4736959.java rename to test/jdk/java/text/Format/DateFormat/Bug4736959.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug4823811.java b/test/jdk/java/text/Format/DateFormat/Bug4823811.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug4823811.java rename to test/jdk/java/text/Format/DateFormat/Bug4823811.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug4845901.java b/test/jdk/java/text/Format/DateFormat/Bug4845901.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug4845901.java rename to test/jdk/java/text/Format/DateFormat/Bug4845901.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug6251817.java b/test/jdk/java/text/Format/DateFormat/Bug6251817.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug6251817.java rename to test/jdk/java/text/Format/DateFormat/Bug6251817.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug6335238.java b/test/jdk/java/text/Format/DateFormat/Bug6335238.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug6335238.java rename to test/jdk/java/text/Format/DateFormat/Bug6335238.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug6530336.java b/test/jdk/java/text/Format/DateFormat/Bug6530336.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug6530336.java rename to test/jdk/java/text/Format/DateFormat/Bug6530336.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug6609750.java b/test/jdk/java/text/Format/DateFormat/Bug6609750.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug6609750.java rename to test/jdk/java/text/Format/DateFormat/Bug6609750.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug6645292.java b/test/jdk/java/text/Format/DateFormat/Bug6645292.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug6645292.java rename to test/jdk/java/text/Format/DateFormat/Bug6645292.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug6683975.java b/test/jdk/java/text/Format/DateFormat/Bug6683975.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug6683975.java rename to test/jdk/java/text/Format/DateFormat/Bug6683975.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug7130335.java b/test/jdk/java/text/Format/DateFormat/Bug7130335.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug7130335.java rename to test/jdk/java/text/Format/DateFormat/Bug7130335.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug7177315.java b/test/jdk/java/text/Format/DateFormat/Bug7177315.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug7177315.java rename to test/jdk/java/text/Format/DateFormat/Bug7177315.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug8072099.java b/test/jdk/java/text/Format/DateFormat/Bug8072099.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug8072099.java rename to test/jdk/java/text/Format/DateFormat/Bug8072099.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug8081794.java b/test/jdk/java/text/Format/DateFormat/Bug8081794.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug8081794.java rename to test/jdk/java/text/Format/DateFormat/Bug8081794.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug8139572.java b/test/jdk/java/text/Format/DateFormat/Bug8139572.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug8139572.java rename to test/jdk/java/text/Format/DateFormat/Bug8139572.java diff --git a/jdk/test/java/text/Format/DateFormat/Bug8141243.java b/test/jdk/java/text/Format/DateFormat/Bug8141243.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/Bug8141243.java rename to test/jdk/java/text/Format/DateFormat/Bug8141243.java diff --git a/jdk/test/java/text/Format/DateFormat/ContextMonthNamesTest.java b/test/jdk/java/text/Format/DateFormat/ContextMonthNamesTest.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/ContextMonthNamesTest.java rename to test/jdk/java/text/Format/DateFormat/ContextMonthNamesTest.java diff --git a/jdk/test/java/text/Format/DateFormat/DateFormatRegression.java b/test/jdk/java/text/Format/DateFormat/DateFormatRegression.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/DateFormatRegression.java rename to test/jdk/java/text/Format/DateFormat/DateFormatRegression.java diff --git a/jdk/test/java/text/Format/DateFormat/DateFormatRoundTripTest.java b/test/jdk/java/text/Format/DateFormat/DateFormatRoundTripTest.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/DateFormatRoundTripTest.java rename to test/jdk/java/text/Format/DateFormat/DateFormatRoundTripTest.java diff --git a/jdk/test/java/text/Format/DateFormat/DateFormatSymbolsCloneTest.java b/test/jdk/java/text/Format/DateFormat/DateFormatSymbolsCloneTest.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/DateFormatSymbolsCloneTest.java rename to test/jdk/java/text/Format/DateFormat/DateFormatSymbolsCloneTest.java diff --git a/jdk/test/java/text/Format/DateFormat/DateFormatSymbolsSerializationTest.java b/test/jdk/java/text/Format/DateFormat/DateFormatSymbolsSerializationTest.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/DateFormatSymbolsSerializationTest.java rename to test/jdk/java/text/Format/DateFormat/DateFormatSymbolsSerializationTest.java diff --git a/jdk/test/java/text/Format/DateFormat/DateFormatTest.java b/test/jdk/java/text/Format/DateFormat/DateFormatTest.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/DateFormatTest.java rename to test/jdk/java/text/Format/DateFormat/DateFormatTest.java diff --git a/jdk/test/java/text/Format/DateFormat/ISO8601ZoneTest.java b/test/jdk/java/text/Format/DateFormat/ISO8601ZoneTest.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/ISO8601ZoneTest.java rename to test/jdk/java/text/Format/DateFormat/ISO8601ZoneTest.java diff --git a/jdk/test/java/text/Format/DateFormat/IntlTestDateFormat.java b/test/jdk/java/text/Format/DateFormat/IntlTestDateFormat.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/IntlTestDateFormat.java rename to test/jdk/java/text/Format/DateFormat/IntlTestDateFormat.java diff --git a/jdk/test/java/text/Format/DateFormat/IntlTestDateFormatAPI.java b/test/jdk/java/text/Format/DateFormat/IntlTestDateFormatAPI.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/IntlTestDateFormatAPI.java rename to test/jdk/java/text/Format/DateFormat/IntlTestDateFormatAPI.java diff --git a/jdk/test/java/text/Format/DateFormat/IntlTestDateFormatSymbols.java b/test/jdk/java/text/Format/DateFormat/IntlTestDateFormatSymbols.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/IntlTestDateFormatSymbols.java rename to test/jdk/java/text/Format/DateFormat/IntlTestDateFormatSymbols.java diff --git a/jdk/test/java/text/Format/DateFormat/IntlTestSimpleDateFormatAPI.java b/test/jdk/java/text/Format/DateFormat/IntlTestSimpleDateFormatAPI.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/IntlTestSimpleDateFormatAPI.java rename to test/jdk/java/text/Format/DateFormat/IntlTestSimpleDateFormatAPI.java diff --git a/jdk/test/java/text/Format/DateFormat/LocaleDateFormats.java b/test/jdk/java/text/Format/DateFormat/LocaleDateFormats.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/LocaleDateFormats.java rename to test/jdk/java/text/Format/DateFormat/LocaleDateFormats.java diff --git a/jdk/test/java/text/Format/DateFormat/NonGregorianFormatTest.java b/test/jdk/java/text/Format/DateFormat/NonGregorianFormatTest.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/NonGregorianFormatTest.java rename to test/jdk/java/text/Format/DateFormat/NonGregorianFormatTest.java diff --git a/jdk/test/java/text/Format/DateFormat/SDFserialized.ser.txt b/test/jdk/java/text/Format/DateFormat/SDFserialized.ser.txt similarity index 100% rename from jdk/test/java/text/Format/DateFormat/SDFserialized.ser.txt rename to test/jdk/java/text/Format/DateFormat/SDFserialized.ser.txt diff --git a/jdk/test/java/text/Format/DateFormat/TimeZoneNameTest.java b/test/jdk/java/text/Format/DateFormat/TimeZoneNameTest.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/TimeZoneNameTest.java rename to test/jdk/java/text/Format/DateFormat/TimeZoneNameTest.java diff --git a/jdk/test/java/text/Format/DateFormat/WeekDateTest.java b/test/jdk/java/text/Format/DateFormat/WeekDateTest.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/WeekDateTest.java rename to test/jdk/java/text/Format/DateFormat/WeekDateTest.java diff --git a/jdk/test/java/text/Format/DateFormat/bug4097450.java b/test/jdk/java/text/Format/DateFormat/bug4097450.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/bug4097450.java rename to test/jdk/java/text/Format/DateFormat/bug4097450.java diff --git a/jdk/test/java/text/Format/DateFormat/bug4099975.java b/test/jdk/java/text/Format/DateFormat/bug4099975.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/bug4099975.java rename to test/jdk/java/text/Format/DateFormat/bug4099975.java diff --git a/jdk/test/java/text/Format/DateFormat/bug4117335.java b/test/jdk/java/text/Format/DateFormat/bug4117335.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/bug4117335.java rename to test/jdk/java/text/Format/DateFormat/bug4117335.java diff --git a/jdk/test/java/text/Format/DateFormat/bug4358730.java b/test/jdk/java/text/Format/DateFormat/bug4358730.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/bug4358730.java rename to test/jdk/java/text/Format/DateFormat/bug4358730.java diff --git a/jdk/test/java/text/Format/DateFormat/bug6271375.java b/test/jdk/java/text/Format/DateFormat/bug6271375.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/bug6271375.java rename to test/jdk/java/text/Format/DateFormat/bug6271375.java diff --git a/jdk/test/java/text/Format/DateFormat/bug6317072.java b/test/jdk/java/text/Format/DateFormat/bug6317072.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/bug6317072.java rename to test/jdk/java/text/Format/DateFormat/bug6317072.java diff --git a/jdk/test/java/text/Format/DateFormat/bug6412896.java b/test/jdk/java/text/Format/DateFormat/bug6412896.java similarity index 100% rename from jdk/test/java/text/Format/DateFormat/bug6412896.java rename to test/jdk/java/text/Format/DateFormat/bug6412896.java diff --git a/jdk/test/java/text/Format/DecimalFormat/Bug6609740.java b/test/jdk/java/text/Format/DecimalFormat/Bug6609740.java similarity index 100% rename from jdk/test/java/text/Format/DecimalFormat/Bug6609740.java rename to test/jdk/java/text/Format/DecimalFormat/Bug6609740.java diff --git a/jdk/test/java/text/Format/DecimalFormat/Bug7196316.java b/test/jdk/java/text/Format/DecimalFormat/Bug7196316.java similarity index 100% rename from jdk/test/java/text/Format/DecimalFormat/Bug7196316.java rename to test/jdk/java/text/Format/DecimalFormat/Bug7196316.java diff --git a/jdk/test/java/text/Format/DecimalFormat/Bug8165466.java b/test/jdk/java/text/Format/DecimalFormat/Bug8165466.java similarity index 100% rename from jdk/test/java/text/Format/DecimalFormat/Bug8165466.java rename to test/jdk/java/text/Format/DecimalFormat/Bug8165466.java diff --git a/jdk/test/java/text/Format/DecimalFormat/FormatMicroBenchmark.java b/test/jdk/java/text/Format/DecimalFormat/FormatMicroBenchmark.java similarity index 100% rename from jdk/test/java/text/Format/DecimalFormat/FormatMicroBenchmark.java rename to test/jdk/java/text/Format/DecimalFormat/FormatMicroBenchmark.java diff --git a/jdk/test/java/text/Format/DecimalFormat/GoldenDoubleValues.java b/test/jdk/java/text/Format/DecimalFormat/GoldenDoubleValues.java similarity index 100% rename from jdk/test/java/text/Format/DecimalFormat/GoldenDoubleValues.java rename to test/jdk/java/text/Format/DecimalFormat/GoldenDoubleValues.java diff --git a/jdk/test/java/text/Format/DecimalFormat/GoldenFormattedValues.java b/test/jdk/java/text/Format/DecimalFormat/GoldenFormattedValues.java similarity index 100% rename from jdk/test/java/text/Format/DecimalFormat/GoldenFormattedValues.java rename to test/jdk/java/text/Format/DecimalFormat/GoldenFormattedValues.java diff --git a/jdk/test/java/text/Format/DecimalFormat/RoundingAndPropertyTest.java b/test/jdk/java/text/Format/DecimalFormat/RoundingAndPropertyTest.java similarity index 100% rename from jdk/test/java/text/Format/DecimalFormat/RoundingAndPropertyTest.java rename to test/jdk/java/text/Format/DecimalFormat/RoundingAndPropertyTest.java diff --git a/jdk/test/java/text/Format/DecimalFormat/TieRoundingTest.java b/test/jdk/java/text/Format/DecimalFormat/TieRoundingTest.java similarity index 100% rename from jdk/test/java/text/Format/DecimalFormat/TieRoundingTest.java rename to test/jdk/java/text/Format/DecimalFormat/TieRoundingTest.java diff --git a/jdk/test/java/text/Format/MessageFormat/Bug4185816.ser.txt b/test/jdk/java/text/Format/MessageFormat/Bug4185816.ser.txt similarity index 100% rename from jdk/test/java/text/Format/MessageFormat/Bug4185816.ser.txt rename to test/jdk/java/text/Format/MessageFormat/Bug4185816.ser.txt diff --git a/jdk/test/java/text/Format/MessageFormat/Bug4185816Corrupt.ser.txt b/test/jdk/java/text/Format/MessageFormat/Bug4185816Corrupt.ser.txt similarity index 100% rename from jdk/test/java/text/Format/MessageFormat/Bug4185816Corrupt.ser.txt rename to test/jdk/java/text/Format/MessageFormat/Bug4185816Corrupt.ser.txt diff --git a/jdk/test/java/text/Format/MessageFormat/Bug4185816Test.java b/test/jdk/java/text/Format/MessageFormat/Bug4185816Test.java similarity index 100% rename from jdk/test/java/text/Format/MessageFormat/Bug4185816Test.java rename to test/jdk/java/text/Format/MessageFormat/Bug4185816Test.java diff --git a/jdk/test/java/text/Format/MessageFormat/Bug6481179.java b/test/jdk/java/text/Format/MessageFormat/Bug6481179.java similarity index 100% rename from jdk/test/java/text/Format/MessageFormat/Bug6481179.java rename to test/jdk/java/text/Format/MessageFormat/Bug6481179.java diff --git a/jdk/test/java/text/Format/MessageFormat/Bug7003643.java b/test/jdk/java/text/Format/MessageFormat/Bug7003643.java similarity index 100% rename from jdk/test/java/text/Format/MessageFormat/Bug7003643.java rename to test/jdk/java/text/Format/MessageFormat/Bug7003643.java diff --git a/jdk/test/java/text/Format/MessageFormat/LargeMessageFormat.java b/test/jdk/java/text/Format/MessageFormat/LargeMessageFormat.java similarity index 100% rename from jdk/test/java/text/Format/MessageFormat/LargeMessageFormat.java rename to test/jdk/java/text/Format/MessageFormat/LargeMessageFormat.java diff --git a/jdk/test/java/text/Format/MessageFormat/MessageFormatsByArgumentIndex.java b/test/jdk/java/text/Format/MessageFormat/MessageFormatsByArgumentIndex.java similarity index 100% rename from jdk/test/java/text/Format/MessageFormat/MessageFormatsByArgumentIndex.java rename to test/jdk/java/text/Format/MessageFormat/MessageFormatsByArgumentIndex.java diff --git a/jdk/test/java/text/Format/MessageFormat/MessageRegression.java b/test/jdk/java/text/Format/MessageFormat/MessageRegression.java similarity index 100% rename from jdk/test/java/text/Format/MessageFormat/MessageRegression.java rename to test/jdk/java/text/Format/MessageFormat/MessageRegression.java diff --git a/jdk/test/java/text/Format/MessageFormat/MessageTest.java b/test/jdk/java/text/Format/MessageFormat/MessageTest.java similarity index 100% rename from jdk/test/java/text/Format/MessageFormat/MessageTest.java rename to test/jdk/java/text/Format/MessageFormat/MessageTest.java diff --git a/jdk/test/java/text/Format/MessageFormat/bug4492719.java b/test/jdk/java/text/Format/MessageFormat/bug4492719.java similarity index 100% rename from jdk/test/java/text/Format/MessageFormat/bug4492719.java rename to test/jdk/java/text/Format/MessageFormat/bug4492719.java diff --git a/jdk/test/java/text/Format/NumberFormat/BigDecimalCompatibilityTest.java b/test/jdk/java/text/Format/NumberFormat/BigDecimalCompatibilityTest.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/BigDecimalCompatibilityTest.java rename to test/jdk/java/text/Format/NumberFormat/BigDecimalCompatibilityTest.java diff --git a/jdk/test/java/text/Format/NumberFormat/BigDecimalFormat.java b/test/jdk/java/text/Format/NumberFormat/BigDecimalFormat.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/BigDecimalFormat.java rename to test/jdk/java/text/Format/NumberFormat/BigDecimalFormat.java diff --git a/jdk/test/java/text/Format/NumberFormat/BigDecimalParse.java b/test/jdk/java/text/Format/NumberFormat/BigDecimalParse.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/BigDecimalParse.java rename to test/jdk/java/text/Format/NumberFormat/BigDecimalParse.java diff --git a/jdk/test/java/text/Format/NumberFormat/Bug4208135.java b/test/jdk/java/text/Format/NumberFormat/Bug4208135.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/Bug4208135.java rename to test/jdk/java/text/Format/NumberFormat/Bug4208135.java diff --git a/jdk/test/java/text/Format/NumberFormat/Bug4833877.java b/test/jdk/java/text/Format/NumberFormat/Bug4833877.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/Bug4833877.java rename to test/jdk/java/text/Format/NumberFormat/Bug4833877.java diff --git a/jdk/test/java/text/Format/NumberFormat/Bug4838107.java b/test/jdk/java/text/Format/NumberFormat/Bug4838107.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/Bug4838107.java rename to test/jdk/java/text/Format/NumberFormat/Bug4838107.java diff --git a/jdk/test/java/text/Format/NumberFormat/Bug4944439.java b/test/jdk/java/text/Format/NumberFormat/Bug4944439.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/Bug4944439.java rename to test/jdk/java/text/Format/NumberFormat/Bug4944439.java diff --git a/jdk/test/java/text/Format/NumberFormat/Bug4990596.java b/test/jdk/java/text/Format/NumberFormat/Bug4990596.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/Bug4990596.java rename to test/jdk/java/text/Format/NumberFormat/Bug4990596.java diff --git a/jdk/test/java/text/Format/NumberFormat/Bug6278616.java b/test/jdk/java/text/Format/NumberFormat/Bug6278616.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/Bug6278616.java rename to test/jdk/java/text/Format/NumberFormat/Bug6278616.java diff --git a/jdk/test/java/text/Format/NumberFormat/Bug8132125.java b/test/jdk/java/text/Format/NumberFormat/Bug8132125.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/Bug8132125.java rename to test/jdk/java/text/Format/NumberFormat/Bug8132125.java diff --git a/jdk/test/java/text/Format/NumberFormat/CurrencyFormat.java b/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/CurrencyFormat.java rename to test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java diff --git a/jdk/test/java/text/Format/NumberFormat/CurrencySymbols.properties b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/CurrencySymbols.properties rename to test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties diff --git a/jdk/test/java/text/Format/NumberFormat/DFSDeserialization142.java b/test/jdk/java/text/Format/NumberFormat/DFSDeserialization142.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/DFSDeserialization142.java rename to test/jdk/java/text/Format/NumberFormat/DFSDeserialization142.java diff --git a/jdk/test/java/text/Format/NumberFormat/DFSExponential.java b/test/jdk/java/text/Format/NumberFormat/DFSExponential.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/DFSExponential.java rename to test/jdk/java/text/Format/NumberFormat/DFSExponential.java diff --git a/jdk/test/java/text/Format/NumberFormat/DFSSerialization.java b/test/jdk/java/text/Format/NumberFormat/DFSSerialization.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/DFSSerialization.java rename to test/jdk/java/text/Format/NumberFormat/DFSSerialization.java diff --git a/jdk/test/java/text/Format/NumberFormat/DFSSerialization142.java b/test/jdk/java/text/Format/NumberFormat/DFSSerialization142.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/DFSSerialization142.java rename to test/jdk/java/text/Format/NumberFormat/DFSSerialization142.java diff --git a/jdk/test/java/text/Format/NumberFormat/DecimalFormat.114.txt b/test/jdk/java/text/Format/NumberFormat/DecimalFormat.114.txt similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/DecimalFormat.114.txt rename to test/jdk/java/text/Format/NumberFormat/DecimalFormat.114.txt diff --git a/jdk/test/java/text/Format/NumberFormat/DecimalFormatSymbols.114.txt b/test/jdk/java/text/Format/NumberFormat/DecimalFormatSymbols.114.txt similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/DecimalFormatSymbols.114.txt rename to test/jdk/java/text/Format/NumberFormat/DecimalFormatSymbols.114.txt diff --git a/jdk/test/java/text/Format/NumberFormat/DecimalFormatSymbols.142.txt b/test/jdk/java/text/Format/NumberFormat/DecimalFormatSymbols.142.txt similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/DecimalFormatSymbols.142.txt rename to test/jdk/java/text/Format/NumberFormat/DecimalFormatSymbols.142.txt diff --git a/jdk/test/java/text/Format/NumberFormat/IntlTestDecimalFormatAPI.java b/test/jdk/java/text/Format/NumberFormat/IntlTestDecimalFormatAPI.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/IntlTestDecimalFormatAPI.java rename to test/jdk/java/text/Format/NumberFormat/IntlTestDecimalFormatAPI.java diff --git a/jdk/test/java/text/Format/NumberFormat/IntlTestDecimalFormatSymbols.java b/test/jdk/java/text/Format/NumberFormat/IntlTestDecimalFormatSymbols.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/IntlTestDecimalFormatSymbols.java rename to test/jdk/java/text/Format/NumberFormat/IntlTestDecimalFormatSymbols.java diff --git a/jdk/test/java/text/Format/NumberFormat/IntlTestNumberFormatAPI.java b/test/jdk/java/text/Format/NumberFormat/IntlTestNumberFormatAPI.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/IntlTestNumberFormatAPI.java rename to test/jdk/java/text/Format/NumberFormat/IntlTestNumberFormatAPI.java diff --git a/jdk/test/java/text/Format/NumberFormat/MultipleNumberScriptTest.java b/test/jdk/java/text/Format/NumberFormat/MultipleNumberScriptTest.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/MultipleNumberScriptTest.java rename to test/jdk/java/text/Format/NumberFormat/MultipleNumberScriptTest.java diff --git a/jdk/test/java/text/Format/NumberFormat/NumberFormat4185761a.ser.txt b/test/jdk/java/text/Format/NumberFormat/NumberFormat4185761a.ser.txt similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/NumberFormat4185761a.ser.txt rename to test/jdk/java/text/Format/NumberFormat/NumberFormat4185761a.ser.txt diff --git a/jdk/test/java/text/Format/NumberFormat/NumberFormat4185761b.ser.txt b/test/jdk/java/text/Format/NumberFormat/NumberFormat4185761b.ser.txt similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/NumberFormat4185761b.ser.txt rename to test/jdk/java/text/Format/NumberFormat/NumberFormat4185761b.ser.txt diff --git a/jdk/test/java/text/Format/NumberFormat/NumberFormatRounding.java b/test/jdk/java/text/Format/NumberFormat/NumberFormatRounding.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/NumberFormatRounding.java rename to test/jdk/java/text/Format/NumberFormat/NumberFormatRounding.java diff --git a/jdk/test/java/text/Format/NumberFormat/NumberRegression.java b/test/jdk/java/text/Format/NumberFormat/NumberRegression.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/NumberRegression.java rename to test/jdk/java/text/Format/NumberFormat/NumberRegression.java diff --git a/jdk/test/java/text/Format/NumberFormat/NumberRoundTrip.java b/test/jdk/java/text/Format/NumberFormat/NumberRoundTrip.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/NumberRoundTrip.java rename to test/jdk/java/text/Format/NumberFormat/NumberRoundTrip.java diff --git a/jdk/test/java/text/Format/NumberFormat/NumberTest.java b/test/jdk/java/text/Format/NumberFormat/NumberTest.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/NumberTest.java rename to test/jdk/java/text/Format/NumberFormat/NumberTest.java diff --git a/jdk/test/java/text/Format/NumberFormat/PositionTest.java b/test/jdk/java/text/Format/NumberFormat/PositionTest.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/PositionTest.java rename to test/jdk/java/text/Format/NumberFormat/PositionTest.java diff --git a/jdk/test/java/text/Format/NumberFormat/SerializationLoadTest.java b/test/jdk/java/text/Format/NumberFormat/SerializationLoadTest.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/SerializationLoadTest.java rename to test/jdk/java/text/Format/NumberFormat/SerializationLoadTest.java diff --git a/jdk/test/java/text/Format/NumberFormat/SerializationSaveTest.java b/test/jdk/java/text/Format/NumberFormat/SerializationSaveTest.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/SerializationSaveTest.java rename to test/jdk/java/text/Format/NumberFormat/SerializationSaveTest.java diff --git a/jdk/test/java/text/Format/NumberFormat/TestgetPatternSeparator_ja.java b/test/jdk/java/text/Format/NumberFormat/TestgetPatternSeparator_ja.java similarity index 100% rename from jdk/test/java/text/Format/NumberFormat/TestgetPatternSeparator_ja.java rename to test/jdk/java/text/Format/NumberFormat/TestgetPatternSeparator_ja.java diff --git a/jdk/test/java/text/Format/common/Bug4769840.java b/test/jdk/java/text/Format/common/Bug4769840.java similarity index 100% rename from jdk/test/java/text/Format/common/Bug4769840.java rename to test/jdk/java/text/Format/common/Bug4769840.java diff --git a/jdk/test/java/text/Format/common/Bug6215962.java b/test/jdk/java/text/Format/common/Bug6215962.java similarity index 100% rename from jdk/test/java/text/Format/common/Bug6215962.java rename to test/jdk/java/text/Format/common/Bug6215962.java diff --git a/jdk/test/java/text/Format/common/ChoiceFormat.ser.txt b/test/jdk/java/text/Format/common/ChoiceFormat.ser.txt similarity index 100% rename from jdk/test/java/text/Format/common/ChoiceFormat.ser.txt rename to test/jdk/java/text/Format/common/ChoiceFormat.ser.txt diff --git a/jdk/test/java/text/Format/common/DateFormat.Field.ser.txt b/test/jdk/java/text/Format/common/DateFormat.Field.ser.txt similarity index 100% rename from jdk/test/java/text/Format/common/DateFormat.Field.ser.txt rename to test/jdk/java/text/Format/common/DateFormat.Field.ser.txt diff --git a/jdk/test/java/text/Format/common/FormatIteratorTest.java b/test/jdk/java/text/Format/common/FormatIteratorTest.java similarity index 100% rename from jdk/test/java/text/Format/common/FormatIteratorTest.java rename to test/jdk/java/text/Format/common/FormatIteratorTest.java diff --git a/jdk/test/java/text/Format/common/MessageFormat.Field.ser.txt b/test/jdk/java/text/Format/common/MessageFormat.Field.ser.txt similarity index 100% rename from jdk/test/java/text/Format/common/MessageFormat.Field.ser.txt rename to test/jdk/java/text/Format/common/MessageFormat.Field.ser.txt diff --git a/jdk/test/java/text/Format/common/NumberFormat.Field.ser.txt b/test/jdk/java/text/Format/common/NumberFormat.Field.ser.txt similarity index 100% rename from jdk/test/java/text/Format/common/NumberFormat.Field.ser.txt rename to test/jdk/java/text/Format/common/NumberFormat.Field.ser.txt diff --git a/jdk/test/java/text/Format/common/PParser.java b/test/jdk/java/text/Format/common/PParser.java similarity index 100% rename from jdk/test/java/text/Format/common/PParser.java rename to test/jdk/java/text/Format/common/PParser.java diff --git a/jdk/test/java/text/Format/common/dateFormat.props b/test/jdk/java/text/Format/common/dateFormat.props similarity index 100% rename from jdk/test/java/text/Format/common/dateFormat.props rename to test/jdk/java/text/Format/common/dateFormat.props diff --git a/jdk/test/java/text/Format/common/decimalFormat.props b/test/jdk/java/text/Format/common/decimalFormat.props similarity index 100% rename from jdk/test/java/text/Format/common/decimalFormat.props rename to test/jdk/java/text/Format/common/decimalFormat.props diff --git a/jdk/test/java/text/Format/common/messageFormat.props b/test/jdk/java/text/Format/common/messageFormat.props similarity index 100% rename from jdk/test/java/text/Format/common/messageFormat.props rename to test/jdk/java/text/Format/common/messageFormat.props diff --git a/jdk/test/java/text/testlib/HexDumpReader.java b/test/jdk/java/text/testlib/HexDumpReader.java similarity index 100% rename from jdk/test/java/text/testlib/HexDumpReader.java rename to test/jdk/java/text/testlib/HexDumpReader.java diff --git a/jdk/test/java/text/testlib/IntlTest.java b/test/jdk/java/text/testlib/IntlTest.java similarity index 100% rename from jdk/test/java/text/testlib/IntlTest.java rename to test/jdk/java/text/testlib/IntlTest.java diff --git a/jdk/test/java/text/testlib/TestUtils.java b/test/jdk/java/text/testlib/TestUtils.java similarity index 100% rename from jdk/test/java/text/testlib/TestUtils.java rename to test/jdk/java/text/testlib/TestUtils.java diff --git a/jdk/test/java/time/META-INF/services/java.time.chrono.Chronology b/test/jdk/java/time/META-INF/services/java.time.chrono.Chronology similarity index 100% rename from jdk/test/java/time/META-INF/services/java.time.chrono.Chronology rename to test/jdk/java/time/META-INF/services/java.time.chrono.Chronology diff --git a/jdk/test/java/time/nontestng/java/time/chrono/Bug8178823.java b/test/jdk/java/time/nontestng/java/time/chrono/Bug8178823.java similarity index 100% rename from jdk/test/java/time/nontestng/java/time/chrono/Bug8178823.java rename to test/jdk/java/time/nontestng/java/time/chrono/Bug8178823.java diff --git a/jdk/test/java/time/nontestng/java/time/chrono/bug8178823.policy b/test/jdk/java/time/nontestng/java/time/chrono/bug8178823.policy similarity index 100% rename from jdk/test/java/time/nontestng/java/time/chrono/bug8178823.policy rename to test/jdk/java/time/nontestng/java/time/chrono/bug8178823.policy diff --git a/jdk/test/java/time/tck/TEST.properties b/test/jdk/java/time/tck/TEST.properties similarity index 100% rename from jdk/test/java/time/tck/TEST.properties rename to test/jdk/java/time/tck/TEST.properties diff --git a/jdk/test/java/time/tck/java/time/AbstractDateTimeTest.java b/test/jdk/java/time/tck/java/time/AbstractDateTimeTest.java similarity index 100% rename from jdk/test/java/time/tck/java/time/AbstractDateTimeTest.java rename to test/jdk/java/time/tck/java/time/AbstractDateTimeTest.java diff --git a/jdk/test/java/time/tck/java/time/AbstractTCKTest.java b/test/jdk/java/time/tck/java/time/AbstractTCKTest.java similarity index 100% rename from jdk/test/java/time/tck/java/time/AbstractTCKTest.java rename to test/jdk/java/time/tck/java/time/AbstractTCKTest.java diff --git a/jdk/test/java/time/tck/java/time/MockSimplePeriod.java b/test/jdk/java/time/tck/java/time/MockSimplePeriod.java similarity index 100% rename from jdk/test/java/time/tck/java/time/MockSimplePeriod.java rename to test/jdk/java/time/tck/java/time/MockSimplePeriod.java diff --git a/jdk/test/java/time/tck/java/time/TCKClock.java b/test/jdk/java/time/tck/java/time/TCKClock.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKClock.java rename to test/jdk/java/time/tck/java/time/TCKClock.java diff --git a/jdk/test/java/time/tck/java/time/TCKClock_Fixed.java b/test/jdk/java/time/tck/java/time/TCKClock_Fixed.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKClock_Fixed.java rename to test/jdk/java/time/tck/java/time/TCKClock_Fixed.java diff --git a/jdk/test/java/time/tck/java/time/TCKClock_Offset.java b/test/jdk/java/time/tck/java/time/TCKClock_Offset.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKClock_Offset.java rename to test/jdk/java/time/tck/java/time/TCKClock_Offset.java diff --git a/jdk/test/java/time/tck/java/time/TCKClock_System.java b/test/jdk/java/time/tck/java/time/TCKClock_System.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKClock_System.java rename to test/jdk/java/time/tck/java/time/TCKClock_System.java diff --git a/jdk/test/java/time/tck/java/time/TCKClock_Tick.java b/test/jdk/java/time/tck/java/time/TCKClock_Tick.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKClock_Tick.java rename to test/jdk/java/time/tck/java/time/TCKClock_Tick.java diff --git a/jdk/test/java/time/tck/java/time/TCKDayOfWeek.java b/test/jdk/java/time/tck/java/time/TCKDayOfWeek.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKDayOfWeek.java rename to test/jdk/java/time/tck/java/time/TCKDayOfWeek.java diff --git a/jdk/test/java/time/tck/java/time/TCKDuration.java b/test/jdk/java/time/tck/java/time/TCKDuration.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKDuration.java rename to test/jdk/java/time/tck/java/time/TCKDuration.java diff --git a/jdk/test/java/time/tck/java/time/TCKInstant.java b/test/jdk/java/time/tck/java/time/TCKInstant.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKInstant.java rename to test/jdk/java/time/tck/java/time/TCKInstant.java diff --git a/jdk/test/java/time/tck/java/time/TCKLocalDate.java b/test/jdk/java/time/tck/java/time/TCKLocalDate.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKLocalDate.java rename to test/jdk/java/time/tck/java/time/TCKLocalDate.java diff --git a/jdk/test/java/time/tck/java/time/TCKLocalDateTime.java b/test/jdk/java/time/tck/java/time/TCKLocalDateTime.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKLocalDateTime.java rename to test/jdk/java/time/tck/java/time/TCKLocalDateTime.java diff --git a/jdk/test/java/time/tck/java/time/TCKLocalTime.java b/test/jdk/java/time/tck/java/time/TCKLocalTime.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKLocalTime.java rename to test/jdk/java/time/tck/java/time/TCKLocalTime.java diff --git a/jdk/test/java/time/tck/java/time/TCKMonth.java b/test/jdk/java/time/tck/java/time/TCKMonth.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKMonth.java rename to test/jdk/java/time/tck/java/time/TCKMonth.java diff --git a/jdk/test/java/time/tck/java/time/TCKMonthDay.java b/test/jdk/java/time/tck/java/time/TCKMonthDay.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKMonthDay.java rename to test/jdk/java/time/tck/java/time/TCKMonthDay.java diff --git a/jdk/test/java/time/tck/java/time/TCKOffsetDateTime.java b/test/jdk/java/time/tck/java/time/TCKOffsetDateTime.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKOffsetDateTime.java rename to test/jdk/java/time/tck/java/time/TCKOffsetDateTime.java diff --git a/jdk/test/java/time/tck/java/time/TCKOffsetTime.java b/test/jdk/java/time/tck/java/time/TCKOffsetTime.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKOffsetTime.java rename to test/jdk/java/time/tck/java/time/TCKOffsetTime.java diff --git a/jdk/test/java/time/tck/java/time/TCKPeriod.java b/test/jdk/java/time/tck/java/time/TCKPeriod.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKPeriod.java rename to test/jdk/java/time/tck/java/time/TCKPeriod.java diff --git a/jdk/test/java/time/tck/java/time/TCKYear.java b/test/jdk/java/time/tck/java/time/TCKYear.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKYear.java rename to test/jdk/java/time/tck/java/time/TCKYear.java diff --git a/jdk/test/java/time/tck/java/time/TCKYearMonth.java b/test/jdk/java/time/tck/java/time/TCKYearMonth.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKYearMonth.java rename to test/jdk/java/time/tck/java/time/TCKYearMonth.java diff --git a/jdk/test/java/time/tck/java/time/TCKZoneId.java b/test/jdk/java/time/tck/java/time/TCKZoneId.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKZoneId.java rename to test/jdk/java/time/tck/java/time/TCKZoneId.java diff --git a/jdk/test/java/time/tck/java/time/TCKZoneOffset.java b/test/jdk/java/time/tck/java/time/TCKZoneOffset.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKZoneOffset.java rename to test/jdk/java/time/tck/java/time/TCKZoneOffset.java diff --git a/jdk/test/java/time/tck/java/time/TCKZonedDateTime.java b/test/jdk/java/time/tck/java/time/TCKZonedDateTime.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TCKZonedDateTime.java rename to test/jdk/java/time/tck/java/time/TCKZonedDateTime.java diff --git a/jdk/test/java/time/tck/java/time/TestIsoChronology.java b/test/jdk/java/time/tck/java/time/TestIsoChronology.java similarity index 100% rename from jdk/test/java/time/tck/java/time/TestIsoChronology.java rename to test/jdk/java/time/tck/java/time/TestIsoChronology.java diff --git a/jdk/test/java/time/tck/java/time/chrono/CopticChronology.java b/test/jdk/java/time/tck/java/time/chrono/CopticChronology.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/CopticChronology.java rename to test/jdk/java/time/tck/java/time/chrono/CopticChronology.java diff --git a/jdk/test/java/time/tck/java/time/chrono/CopticDate.java b/test/jdk/java/time/tck/java/time/chrono/CopticDate.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/CopticDate.java rename to test/jdk/java/time/tck/java/time/chrono/CopticDate.java diff --git a/jdk/test/java/time/tck/java/time/chrono/CopticEra.java b/test/jdk/java/time/tck/java/time/chrono/CopticEra.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/CopticEra.java rename to test/jdk/java/time/tck/java/time/chrono/CopticEra.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDate.java b/test/jdk/java/time/tck/java/time/chrono/TCKChronoLocalDate.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDate.java rename to test/jdk/java/time/tck/java/time/chrono/TCKChronoLocalDate.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java b/test/jdk/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java rename to test/jdk/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKChronoPeriod.java b/test/jdk/java/time/tck/java/time/chrono/TCKChronoPeriod.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKChronoPeriod.java rename to test/jdk/java/time/tck/java/time/chrono/TCKChronoPeriod.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java b/test/jdk/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java rename to test/jdk/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKChronology.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKChronology.java rename to test/jdk/java/time/tck/java/time/chrono/TCKChronology.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKHijrahChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKHijrahChronology.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKHijrahChronology.java rename to test/jdk/java/time/tck/java/time/chrono/TCKHijrahChronology.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKHijrahEra.java b/test/jdk/java/time/tck/java/time/chrono/TCKHijrahEra.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKHijrahEra.java rename to test/jdk/java/time/tck/java/time/chrono/TCKHijrahEra.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKIsoChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKIsoChronology.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKIsoChronology.java rename to test/jdk/java/time/tck/java/time/chrono/TCKIsoChronology.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKIsoEra.java b/test/jdk/java/time/tck/java/time/chrono/TCKIsoEra.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKIsoEra.java rename to test/jdk/java/time/tck/java/time/chrono/TCKIsoEra.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java rename to test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseEra.java b/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseEra.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKJapaneseEra.java rename to test/jdk/java/time/tck/java/time/chrono/TCKJapaneseEra.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKMinguoChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKMinguoChronology.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKMinguoChronology.java rename to test/jdk/java/time/tck/java/time/chrono/TCKMinguoChronology.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKMinguoEra.java b/test/jdk/java/time/tck/java/time/chrono/TCKMinguoEra.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKMinguoEra.java rename to test/jdk/java/time/tck/java/time/chrono/TCKMinguoEra.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKTestServiceLoader.java b/test/jdk/java/time/tck/java/time/chrono/TCKTestServiceLoader.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKTestServiceLoader.java rename to test/jdk/java/time/tck/java/time/chrono/TCKTestServiceLoader.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java rename to test/jdk/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKThaiBuddhistEra.java b/test/jdk/java/time/tck/java/time/chrono/TCKThaiBuddhistEra.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/TCKThaiBuddhistEra.java rename to test/jdk/java/time/tck/java/time/chrono/TCKThaiBuddhistEra.java diff --git a/jdk/test/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateSerialization.java b/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateSerialization.java rename to test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateSerialization.java diff --git a/jdk/test/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateTimeSerialization.java b/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateTimeSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateTimeSerialization.java rename to test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateTimeSerialization.java diff --git a/jdk/test/java/time/tck/java/time/chrono/serial/TCKChronoZonedDateTimeSerialization.java b/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoZonedDateTimeSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/serial/TCKChronoZonedDateTimeSerialization.java rename to test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoZonedDateTimeSerialization.java diff --git a/jdk/test/java/time/tck/java/time/chrono/serial/TCKChronologySerialization.java b/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronologySerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/serial/TCKChronologySerialization.java rename to test/jdk/java/time/tck/java/time/chrono/serial/TCKChronologySerialization.java diff --git a/jdk/test/java/time/tck/java/time/chrono/serial/TCKCopticSerialization.java b/test/jdk/java/time/tck/java/time/chrono/serial/TCKCopticSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/serial/TCKCopticSerialization.java rename to test/jdk/java/time/tck/java/time/chrono/serial/TCKCopticSerialization.java diff --git a/jdk/test/java/time/tck/java/time/chrono/serial/TCKEraSerialization.java b/test/jdk/java/time/tck/java/time/chrono/serial/TCKEraSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/chrono/serial/TCKEraSerialization.java rename to test/jdk/java/time/tck/java/time/chrono/serial/TCKEraSerialization.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKChronoPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKChronoPrinterParser.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKChronoPrinterParser.java rename to test/jdk/java/time/tck/java/time/format/TCKChronoPrinterParser.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKDTFParsedInstant.java b/test/jdk/java/time/tck/java/time/format/TCKDTFParsedInstant.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKDTFParsedInstant.java rename to test/jdk/java/time/tck/java/time/format/TCKDTFParsedInstant.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatter.java b/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatter.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatter.java rename to test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatter.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java b/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java rename to test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatters.java b/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatters.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatters.java rename to test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatters.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKDateTimeParseResolver.java b/test/jdk/java/time/tck/java/time/format/TCKDateTimeParseResolver.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKDateTimeParseResolver.java rename to test/jdk/java/time/tck/java/time/format/TCKDateTimeParseResolver.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKDateTimeTextPrinting.java b/test/jdk/java/time/tck/java/time/format/TCKDateTimeTextPrinting.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKDateTimeTextPrinting.java rename to test/jdk/java/time/tck/java/time/format/TCKDateTimeTextPrinting.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKDecimalStyle.java b/test/jdk/java/time/tck/java/time/format/TCKDecimalStyle.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKDecimalStyle.java rename to test/jdk/java/time/tck/java/time/format/TCKDecimalStyle.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKFormatStyle.java b/test/jdk/java/time/tck/java/time/format/TCKFormatStyle.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKFormatStyle.java rename to test/jdk/java/time/tck/java/time/format/TCKFormatStyle.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKInstantPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKInstantPrinterParser.java rename to test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKLocalizedFieldParser.java b/test/jdk/java/time/tck/java/time/format/TCKLocalizedFieldParser.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKLocalizedFieldParser.java rename to test/jdk/java/time/tck/java/time/format/TCKLocalizedFieldParser.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKLocalizedFieldPrinter.java b/test/jdk/java/time/tck/java/time/format/TCKLocalizedFieldPrinter.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKLocalizedFieldPrinter.java rename to test/jdk/java/time/tck/java/time/format/TCKLocalizedFieldPrinter.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKLocalizedOffsetIdPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKLocalizedOffsetIdPrinterParser.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKLocalizedOffsetIdPrinterParser.java rename to test/jdk/java/time/tck/java/time/format/TCKLocalizedOffsetIdPrinterParser.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java rename to test/jdk/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKOffsetPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKOffsetPrinterParser.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKOffsetPrinterParser.java rename to test/jdk/java/time/tck/java/time/format/TCKOffsetPrinterParser.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKPadPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKPadPrinterParser.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKPadPrinterParser.java rename to test/jdk/java/time/tck/java/time/format/TCKPadPrinterParser.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKResolverStyle.java b/test/jdk/java/time/tck/java/time/format/TCKResolverStyle.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKResolverStyle.java rename to test/jdk/java/time/tck/java/time/format/TCKResolverStyle.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKSignStyle.java b/test/jdk/java/time/tck/java/time/format/TCKSignStyle.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKSignStyle.java rename to test/jdk/java/time/tck/java/time/format/TCKSignStyle.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKTextStyle.java b/test/jdk/java/time/tck/java/time/format/TCKTextStyle.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKTextStyle.java rename to test/jdk/java/time/tck/java/time/format/TCKTextStyle.java diff --git a/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java similarity index 100% rename from jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java rename to test/jdk/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKClockSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKClockSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKClockSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKClockSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKDurationSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKDurationSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKDurationSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKDurationSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKInstantSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKInstantSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKInstantSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKInstantSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKLocalDateSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKLocalDateSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKLocalDateSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKLocalDateSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKLocalDateTimeSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKLocalDateTimeSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKLocalDateTimeSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKLocalDateTimeSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKLocalTimeSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKLocalTimeSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKLocalTimeSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKLocalTimeSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKMonthDaySerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKMonthDaySerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKMonthDaySerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKMonthDaySerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKOffsetDateTimeSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKOffsetDateTimeSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKOffsetDateTimeSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKOffsetDateTimeSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKOffsetTimeSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKOffsetTimeSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKOffsetTimeSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKOffsetTimeSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKPeriodSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKPeriodSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKPeriodSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKPeriodSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKYearMonthSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKYearMonthSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKYearMonthSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKYearMonthSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKYearSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKYearSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKYearSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKYearSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKZoneIdSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKZoneIdSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKZoneIdSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKZoneIdSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKZoneOffsetSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKZoneOffsetSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKZoneOffsetSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKZoneOffsetSerialization.java diff --git a/jdk/test/java/time/tck/java/time/serial/TCKZonedDateTimeSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKZonedDateTimeSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/serial/TCKZonedDateTimeSerialization.java rename to test/jdk/java/time/tck/java/time/serial/TCKZonedDateTimeSerialization.java diff --git a/jdk/test/java/time/tck/java/time/temporal/TCKChronoField.java b/test/jdk/java/time/tck/java/time/temporal/TCKChronoField.java similarity index 100% rename from jdk/test/java/time/tck/java/time/temporal/TCKChronoField.java rename to test/jdk/java/time/tck/java/time/temporal/TCKChronoField.java diff --git a/jdk/test/java/time/tck/java/time/temporal/TCKChronoUnit.java b/test/jdk/java/time/tck/java/time/temporal/TCKChronoUnit.java similarity index 100% rename from jdk/test/java/time/tck/java/time/temporal/TCKChronoUnit.java rename to test/jdk/java/time/tck/java/time/temporal/TCKChronoUnit.java diff --git a/jdk/test/java/time/tck/java/time/temporal/TCKIsoFields.java b/test/jdk/java/time/tck/java/time/temporal/TCKIsoFields.java similarity index 100% rename from jdk/test/java/time/tck/java/time/temporal/TCKIsoFields.java rename to test/jdk/java/time/tck/java/time/temporal/TCKIsoFields.java diff --git a/jdk/test/java/time/tck/java/time/temporal/TCKJulianFields.java b/test/jdk/java/time/tck/java/time/temporal/TCKJulianFields.java similarity index 100% rename from jdk/test/java/time/tck/java/time/temporal/TCKJulianFields.java rename to test/jdk/java/time/tck/java/time/temporal/TCKJulianFields.java diff --git a/jdk/test/java/time/tck/java/time/temporal/TCKTemporalAdjusters.java b/test/jdk/java/time/tck/java/time/temporal/TCKTemporalAdjusters.java similarity index 100% rename from jdk/test/java/time/tck/java/time/temporal/TCKTemporalAdjusters.java rename to test/jdk/java/time/tck/java/time/temporal/TCKTemporalAdjusters.java diff --git a/jdk/test/java/time/tck/java/time/temporal/TCKWeekFields.java b/test/jdk/java/time/tck/java/time/temporal/TCKWeekFields.java similarity index 100% rename from jdk/test/java/time/tck/java/time/temporal/TCKWeekFields.java rename to test/jdk/java/time/tck/java/time/temporal/TCKWeekFields.java diff --git a/jdk/test/java/time/tck/java/time/temporal/serial/TCKChronoFieldSerialization.java b/test/jdk/java/time/tck/java/time/temporal/serial/TCKChronoFieldSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/temporal/serial/TCKChronoFieldSerialization.java rename to test/jdk/java/time/tck/java/time/temporal/serial/TCKChronoFieldSerialization.java diff --git a/jdk/test/java/time/tck/java/time/temporal/serial/TCKChronoUnitSerialization.java b/test/jdk/java/time/tck/java/time/temporal/serial/TCKChronoUnitSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/temporal/serial/TCKChronoUnitSerialization.java rename to test/jdk/java/time/tck/java/time/temporal/serial/TCKChronoUnitSerialization.java diff --git a/jdk/test/java/time/tck/java/time/temporal/serial/TCKJulianFieldsSerialization.java b/test/jdk/java/time/tck/java/time/temporal/serial/TCKJulianFieldsSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/temporal/serial/TCKJulianFieldsSerialization.java rename to test/jdk/java/time/tck/java/time/temporal/serial/TCKJulianFieldsSerialization.java diff --git a/jdk/test/java/time/tck/java/time/temporal/serial/TCKValueRangeSerialization.java b/test/jdk/java/time/tck/java/time/temporal/serial/TCKValueRangeSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/temporal/serial/TCKValueRangeSerialization.java rename to test/jdk/java/time/tck/java/time/temporal/serial/TCKValueRangeSerialization.java diff --git a/jdk/test/java/time/tck/java/time/temporal/serial/TCKWeekFieldsSerialization.java b/test/jdk/java/time/tck/java/time/temporal/serial/TCKWeekFieldsSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/temporal/serial/TCKWeekFieldsSerialization.java rename to test/jdk/java/time/tck/java/time/temporal/serial/TCKWeekFieldsSerialization.java diff --git a/jdk/test/java/time/tck/java/time/zone/TCKFixedZoneRules.java b/test/jdk/java/time/tck/java/time/zone/TCKFixedZoneRules.java similarity index 100% rename from jdk/test/java/time/tck/java/time/zone/TCKFixedZoneRules.java rename to test/jdk/java/time/tck/java/time/zone/TCKFixedZoneRules.java diff --git a/jdk/test/java/time/tck/java/time/zone/TCKZoneOffsetTransition.java b/test/jdk/java/time/tck/java/time/zone/TCKZoneOffsetTransition.java similarity index 100% rename from jdk/test/java/time/tck/java/time/zone/TCKZoneOffsetTransition.java rename to test/jdk/java/time/tck/java/time/zone/TCKZoneOffsetTransition.java diff --git a/jdk/test/java/time/tck/java/time/zone/TCKZoneOffsetTransitionRule.java b/test/jdk/java/time/tck/java/time/zone/TCKZoneOffsetTransitionRule.java similarity index 100% rename from jdk/test/java/time/tck/java/time/zone/TCKZoneOffsetTransitionRule.java rename to test/jdk/java/time/tck/java/time/zone/TCKZoneOffsetTransitionRule.java diff --git a/jdk/test/java/time/tck/java/time/zone/TCKZoneRules.java b/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java similarity index 100% rename from jdk/test/java/time/tck/java/time/zone/TCKZoneRules.java rename to test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java diff --git a/jdk/test/java/time/tck/java/time/zone/TCKZoneRulesProvider.java b/test/jdk/java/time/tck/java/time/zone/TCKZoneRulesProvider.java similarity index 100% rename from jdk/test/java/time/tck/java/time/zone/TCKZoneRulesProvider.java rename to test/jdk/java/time/tck/java/time/zone/TCKZoneRulesProvider.java diff --git a/jdk/test/java/time/tck/java/time/zone/serial/TCKFixedZoneRulesSerialization.java b/test/jdk/java/time/tck/java/time/zone/serial/TCKFixedZoneRulesSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/zone/serial/TCKFixedZoneRulesSerialization.java rename to test/jdk/java/time/tck/java/time/zone/serial/TCKFixedZoneRulesSerialization.java diff --git a/jdk/test/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionRuleSerialization.java b/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionRuleSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionRuleSerialization.java rename to test/jdk/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionRuleSerialization.java diff --git a/jdk/test/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionSerialization.java b/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionSerialization.java rename to test/jdk/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionSerialization.java diff --git a/jdk/test/java/time/tck/java/time/zone/serial/TCKZoneRulesSerialization.java b/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneRulesSerialization.java similarity index 100% rename from jdk/test/java/time/tck/java/time/zone/serial/TCKZoneRulesSerialization.java rename to test/jdk/java/time/tck/java/time/zone/serial/TCKZoneRulesSerialization.java diff --git a/jdk/test/java/time/test/TEST.properties b/test/jdk/java/time/test/TEST.properties similarity index 100% rename from jdk/test/java/time/test/TEST.properties rename to test/jdk/java/time/test/TEST.properties diff --git a/jdk/test/java/time/test/java/time/AbstractTest.java b/test/jdk/java/time/test/java/time/AbstractTest.java similarity index 100% rename from jdk/test/java/time/test/java/time/AbstractTest.java rename to test/jdk/java/time/test/java/time/AbstractTest.java diff --git a/jdk/test/java/time/test/java/time/MockSimplePeriod.java b/test/jdk/java/time/test/java/time/MockSimplePeriod.java similarity index 100% rename from jdk/test/java/time/test/java/time/MockSimplePeriod.java rename to test/jdk/java/time/test/java/time/MockSimplePeriod.java diff --git a/jdk/test/java/time/test/java/time/TEST.properties b/test/jdk/java/time/test/java/time/TEST.properties similarity index 100% rename from jdk/test/java/time/test/java/time/TEST.properties rename to test/jdk/java/time/test/java/time/TEST.properties diff --git a/jdk/test/java/time/test/java/time/TestClock_Fixed.java b/test/jdk/java/time/test/java/time/TestClock_Fixed.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestClock_Fixed.java rename to test/jdk/java/time/test/java/time/TestClock_Fixed.java diff --git a/jdk/test/java/time/test/java/time/TestClock_Offset.java b/test/jdk/java/time/test/java/time/TestClock_Offset.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestClock_Offset.java rename to test/jdk/java/time/test/java/time/TestClock_Offset.java diff --git a/jdk/test/java/time/test/java/time/TestClock_System.java b/test/jdk/java/time/test/java/time/TestClock_System.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestClock_System.java rename to test/jdk/java/time/test/java/time/TestClock_System.java diff --git a/jdk/test/java/time/test/java/time/TestClock_Tick.java b/test/jdk/java/time/test/java/time/TestClock_Tick.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestClock_Tick.java rename to test/jdk/java/time/test/java/time/TestClock_Tick.java diff --git a/jdk/test/java/time/test/java/time/TestDuration.java b/test/jdk/java/time/test/java/time/TestDuration.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestDuration.java rename to test/jdk/java/time/test/java/time/TestDuration.java diff --git a/jdk/test/java/time/test/java/time/TestInstant.java b/test/jdk/java/time/test/java/time/TestInstant.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestInstant.java rename to test/jdk/java/time/test/java/time/TestInstant.java diff --git a/jdk/test/java/time/test/java/time/TestLocalDate.java b/test/jdk/java/time/test/java/time/TestLocalDate.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestLocalDate.java rename to test/jdk/java/time/test/java/time/TestLocalDate.java diff --git a/jdk/test/java/time/test/java/time/TestLocalDateTime.java b/test/jdk/java/time/test/java/time/TestLocalDateTime.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestLocalDateTime.java rename to test/jdk/java/time/test/java/time/TestLocalDateTime.java diff --git a/jdk/test/java/time/test/java/time/TestLocalTime.java b/test/jdk/java/time/test/java/time/TestLocalTime.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestLocalTime.java rename to test/jdk/java/time/test/java/time/TestLocalTime.java diff --git a/jdk/test/java/time/test/java/time/TestMonthDay.java b/test/jdk/java/time/test/java/time/TestMonthDay.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestMonthDay.java rename to test/jdk/java/time/test/java/time/TestMonthDay.java diff --git a/jdk/test/java/time/test/java/time/TestOffsetDateTime.java b/test/jdk/java/time/test/java/time/TestOffsetDateTime.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestOffsetDateTime.java rename to test/jdk/java/time/test/java/time/TestOffsetDateTime.java diff --git a/jdk/test/java/time/test/java/time/TestOffsetDateTime_instants.java b/test/jdk/java/time/test/java/time/TestOffsetDateTime_instants.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestOffsetDateTime_instants.java rename to test/jdk/java/time/test/java/time/TestOffsetDateTime_instants.java diff --git a/jdk/test/java/time/test/java/time/TestOffsetTime.java b/test/jdk/java/time/test/java/time/TestOffsetTime.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestOffsetTime.java rename to test/jdk/java/time/test/java/time/TestOffsetTime.java diff --git a/jdk/test/java/time/test/java/time/TestPeriod.java b/test/jdk/java/time/test/java/time/TestPeriod.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestPeriod.java rename to test/jdk/java/time/test/java/time/TestPeriod.java diff --git a/jdk/test/java/time/test/java/time/TestYear.java b/test/jdk/java/time/test/java/time/TestYear.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestYear.java rename to test/jdk/java/time/test/java/time/TestYear.java diff --git a/jdk/test/java/time/test/java/time/TestYearMonth.java b/test/jdk/java/time/test/java/time/TestYearMonth.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestYearMonth.java rename to test/jdk/java/time/test/java/time/TestYearMonth.java diff --git a/jdk/test/java/time/test/java/time/TestZoneId.java b/test/jdk/java/time/test/java/time/TestZoneId.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestZoneId.java rename to test/jdk/java/time/test/java/time/TestZoneId.java diff --git a/jdk/test/java/time/test/java/time/TestZoneOffset.java b/test/jdk/java/time/test/java/time/TestZoneOffset.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestZoneOffset.java rename to test/jdk/java/time/test/java/time/TestZoneOffset.java diff --git a/jdk/test/java/time/test/java/time/TestZonedDateTime.java b/test/jdk/java/time/test/java/time/TestZonedDateTime.java similarity index 100% rename from jdk/test/java/time/test/java/time/TestZonedDateTime.java rename to test/jdk/java/time/test/java/time/TestZonedDateTime.java diff --git a/jdk/test/java/time/test/java/time/chrono/TestChronoLocalDate.java b/test/jdk/java/time/test/java/time/chrono/TestChronoLocalDate.java similarity index 100% rename from jdk/test/java/time/test/java/time/chrono/TestChronoLocalDate.java rename to test/jdk/java/time/test/java/time/chrono/TestChronoLocalDate.java diff --git a/jdk/test/java/time/test/java/time/chrono/TestChronologyPerf.java b/test/jdk/java/time/test/java/time/chrono/TestChronologyPerf.java similarity index 100% rename from jdk/test/java/time/test/java/time/chrono/TestChronologyPerf.java rename to test/jdk/java/time/test/java/time/chrono/TestChronologyPerf.java diff --git a/jdk/test/java/time/test/java/time/chrono/TestEraDisplayName.java b/test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java similarity index 100% rename from jdk/test/java/time/test/java/time/chrono/TestEraDisplayName.java rename to test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java diff --git a/jdk/test/java/time/test/java/time/chrono/TestExampleCode.java b/test/jdk/java/time/test/java/time/chrono/TestExampleCode.java similarity index 100% rename from jdk/test/java/time/test/java/time/chrono/TestExampleCode.java rename to test/jdk/java/time/test/java/time/chrono/TestExampleCode.java diff --git a/jdk/test/java/time/test/java/time/chrono/TestIsoChronoImpl.java b/test/jdk/java/time/test/java/time/chrono/TestIsoChronoImpl.java similarity index 100% rename from jdk/test/java/time/test/java/time/chrono/TestIsoChronoImpl.java rename to test/jdk/java/time/test/java/time/chrono/TestIsoChronoImpl.java diff --git a/jdk/test/java/time/test/java/time/chrono/TestJapaneseChronoImpl.java b/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronoImpl.java similarity index 100% rename from jdk/test/java/time/test/java/time/chrono/TestJapaneseChronoImpl.java rename to test/jdk/java/time/test/java/time/chrono/TestJapaneseChronoImpl.java diff --git a/jdk/test/java/time/test/java/time/chrono/TestJapaneseChronology.java b/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java similarity index 100% rename from jdk/test/java/time/test/java/time/chrono/TestJapaneseChronology.java rename to test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java diff --git a/jdk/test/java/time/test/java/time/chrono/TestServiceLoader.java b/test/jdk/java/time/test/java/time/chrono/TestServiceLoader.java similarity index 100% rename from jdk/test/java/time/test/java/time/chrono/TestServiceLoader.java rename to test/jdk/java/time/test/java/time/chrono/TestServiceLoader.java diff --git a/jdk/test/java/time/test/java/time/chrono/TestThaiBuddhistChronoImpl.java b/test/jdk/java/time/test/java/time/chrono/TestThaiBuddhistChronoImpl.java similarity index 100% rename from jdk/test/java/time/test/java/time/chrono/TestThaiBuddhistChronoImpl.java rename to test/jdk/java/time/test/java/time/chrono/TestThaiBuddhistChronoImpl.java diff --git a/jdk/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java b/test/jdk/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java similarity index 100% rename from jdk/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java rename to test/jdk/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java diff --git a/jdk/test/java/time/test/java/time/format/AbstractTestPrinterParser.java b/test/jdk/java/time/test/java/time/format/AbstractTestPrinterParser.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/AbstractTestPrinterParser.java rename to test/jdk/java/time/test/java/time/format/AbstractTestPrinterParser.java diff --git a/jdk/test/java/time/test/java/time/format/MockIOExceptionAppendable.java b/test/jdk/java/time/test/java/time/format/MockIOExceptionAppendable.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/MockIOExceptionAppendable.java rename to test/jdk/java/time/test/java/time/format/MockIOExceptionAppendable.java diff --git a/jdk/test/java/time/test/java/time/format/TestCharLiteralParser.java b/test/jdk/java/time/test/java/time/format/TestCharLiteralParser.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestCharLiteralParser.java rename to test/jdk/java/time/test/java/time/format/TestCharLiteralParser.java diff --git a/jdk/test/java/time/test/java/time/format/TestCharLiteralPrinter.java b/test/jdk/java/time/test/java/time/format/TestCharLiteralPrinter.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestCharLiteralPrinter.java rename to test/jdk/java/time/test/java/time/format/TestCharLiteralPrinter.java diff --git a/jdk/test/java/time/test/java/time/format/TestDateTimeFormatter.java b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatter.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestDateTimeFormatter.java rename to test/jdk/java/time/test/java/time/format/TestDateTimeFormatter.java diff --git a/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java rename to test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java diff --git a/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java rename to test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java diff --git a/jdk/test/java/time/test/java/time/format/TestDateTimeParsing.java b/test/jdk/java/time/test/java/time/format/TestDateTimeParsing.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestDateTimeParsing.java rename to test/jdk/java/time/test/java/time/format/TestDateTimeParsing.java diff --git a/jdk/test/java/time/test/java/time/format/TestDateTimeTextProvider.java b/test/jdk/java/time/test/java/time/format/TestDateTimeTextProvider.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestDateTimeTextProvider.java rename to test/jdk/java/time/test/java/time/format/TestDateTimeTextProvider.java diff --git a/jdk/test/java/time/test/java/time/format/TestDateTimeTextProviderWithLocale.java b/test/jdk/java/time/test/java/time/format/TestDateTimeTextProviderWithLocale.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestDateTimeTextProviderWithLocale.java rename to test/jdk/java/time/test/java/time/format/TestDateTimeTextProviderWithLocale.java diff --git a/jdk/test/java/time/test/java/time/format/TestDecimalStyle.java b/test/jdk/java/time/test/java/time/format/TestDecimalStyle.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestDecimalStyle.java rename to test/jdk/java/time/test/java/time/format/TestDecimalStyle.java diff --git a/jdk/test/java/time/test/java/time/format/TestFractionPrinterParser.java b/test/jdk/java/time/test/java/time/format/TestFractionPrinterParser.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestFractionPrinterParser.java rename to test/jdk/java/time/test/java/time/format/TestFractionPrinterParser.java diff --git a/jdk/test/java/time/test/java/time/format/TestNarrowMonthNamesAndDayNames.java b/test/jdk/java/time/test/java/time/format/TestNarrowMonthNamesAndDayNames.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestNarrowMonthNamesAndDayNames.java rename to test/jdk/java/time/test/java/time/format/TestNarrowMonthNamesAndDayNames.java diff --git a/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java b/test/jdk/java/time/test/java/time/format/TestNonIsoFormatter.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java rename to test/jdk/java/time/test/java/time/format/TestNonIsoFormatter.java diff --git a/jdk/test/java/time/test/java/time/format/TestNumberParser.java b/test/jdk/java/time/test/java/time/format/TestNumberParser.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestNumberParser.java rename to test/jdk/java/time/test/java/time/format/TestNumberParser.java diff --git a/jdk/test/java/time/test/java/time/format/TestNumberPrinter.java b/test/jdk/java/time/test/java/time/format/TestNumberPrinter.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestNumberPrinter.java rename to test/jdk/java/time/test/java/time/format/TestNumberPrinter.java diff --git a/jdk/test/java/time/test/java/time/format/TestPadPrinterDecorator.java b/test/jdk/java/time/test/java/time/format/TestPadPrinterDecorator.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestPadPrinterDecorator.java rename to test/jdk/java/time/test/java/time/format/TestPadPrinterDecorator.java diff --git a/jdk/test/java/time/test/java/time/format/TestReducedParser.java b/test/jdk/java/time/test/java/time/format/TestReducedParser.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestReducedParser.java rename to test/jdk/java/time/test/java/time/format/TestReducedParser.java diff --git a/jdk/test/java/time/test/java/time/format/TestReducedPrinter.java b/test/jdk/java/time/test/java/time/format/TestReducedPrinter.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestReducedPrinter.java rename to test/jdk/java/time/test/java/time/format/TestReducedPrinter.java diff --git a/jdk/test/java/time/test/java/time/format/TestSettingsParser.java b/test/jdk/java/time/test/java/time/format/TestSettingsParser.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestSettingsParser.java rename to test/jdk/java/time/test/java/time/format/TestSettingsParser.java diff --git a/jdk/test/java/time/test/java/time/format/TestStringLiteralParser.java b/test/jdk/java/time/test/java/time/format/TestStringLiteralParser.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestStringLiteralParser.java rename to test/jdk/java/time/test/java/time/format/TestStringLiteralParser.java diff --git a/jdk/test/java/time/test/java/time/format/TestStringLiteralPrinter.java b/test/jdk/java/time/test/java/time/format/TestStringLiteralPrinter.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestStringLiteralPrinter.java rename to test/jdk/java/time/test/java/time/format/TestStringLiteralPrinter.java diff --git a/jdk/test/java/time/test/java/time/format/TestTextParser.java b/test/jdk/java/time/test/java/time/format/TestTextParser.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestTextParser.java rename to test/jdk/java/time/test/java/time/format/TestTextParser.java diff --git a/jdk/test/java/time/test/java/time/format/TestTextParserWithLocale.java b/test/jdk/java/time/test/java/time/format/TestTextParserWithLocale.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestTextParserWithLocale.java rename to test/jdk/java/time/test/java/time/format/TestTextParserWithLocale.java diff --git a/jdk/test/java/time/test/java/time/format/TestTextPrinter.java b/test/jdk/java/time/test/java/time/format/TestTextPrinter.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestTextPrinter.java rename to test/jdk/java/time/test/java/time/format/TestTextPrinter.java diff --git a/jdk/test/java/time/test/java/time/format/TestTextPrinterWithLocale.java b/test/jdk/java/time/test/java/time/format/TestTextPrinterWithLocale.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestTextPrinterWithLocale.java rename to test/jdk/java/time/test/java/time/format/TestTextPrinterWithLocale.java diff --git a/jdk/test/java/time/test/java/time/format/TestZoneOffsetParser.java b/test/jdk/java/time/test/java/time/format/TestZoneOffsetParser.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestZoneOffsetParser.java rename to test/jdk/java/time/test/java/time/format/TestZoneOffsetParser.java diff --git a/jdk/test/java/time/test/java/time/format/TestZoneOffsetPrinter.java b/test/jdk/java/time/test/java/time/format/TestZoneOffsetPrinter.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestZoneOffsetPrinter.java rename to test/jdk/java/time/test/java/time/format/TestZoneOffsetPrinter.java diff --git a/jdk/test/java/time/test/java/time/format/TestZoneTextPrinterParser.java b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/TestZoneTextPrinterParser.java rename to test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java diff --git a/jdk/test/java/time/test/java/time/format/ZoneName.java b/test/jdk/java/time/test/java/time/format/ZoneName.java similarity index 100% rename from jdk/test/java/time/test/java/time/format/ZoneName.java rename to test/jdk/java/time/test/java/time/format/ZoneName.java diff --git a/jdk/test/java/time/test/java/time/temporal/MockFieldNoValue.java b/test/jdk/java/time/test/java/time/temporal/MockFieldNoValue.java similarity index 100% rename from jdk/test/java/time/test/java/time/temporal/MockFieldNoValue.java rename to test/jdk/java/time/test/java/time/temporal/MockFieldNoValue.java diff --git a/jdk/test/java/time/test/java/time/temporal/MockFieldValue.java b/test/jdk/java/time/test/java/time/temporal/MockFieldValue.java similarity index 100% rename from jdk/test/java/time/test/java/time/temporal/MockFieldValue.java rename to test/jdk/java/time/test/java/time/temporal/MockFieldValue.java diff --git a/jdk/test/java/time/test/java/time/temporal/TestChronoField.java b/test/jdk/java/time/test/java/time/temporal/TestChronoField.java similarity index 100% rename from jdk/test/java/time/test/java/time/temporal/TestChronoField.java rename to test/jdk/java/time/test/java/time/temporal/TestChronoField.java diff --git a/jdk/test/java/time/test/java/time/temporal/TestChronoUnit.java b/test/jdk/java/time/test/java/time/temporal/TestChronoUnit.java similarity index 100% rename from jdk/test/java/time/test/java/time/temporal/TestChronoUnit.java rename to test/jdk/java/time/test/java/time/temporal/TestChronoUnit.java diff --git a/jdk/test/java/time/test/java/time/temporal/TestDateTimeBuilderCombinations.java b/test/jdk/java/time/test/java/time/temporal/TestDateTimeBuilderCombinations.java similarity index 100% rename from jdk/test/java/time/test/java/time/temporal/TestDateTimeBuilderCombinations.java rename to test/jdk/java/time/test/java/time/temporal/TestDateTimeBuilderCombinations.java diff --git a/jdk/test/java/time/test/java/time/temporal/TestDateTimeValueRange.java b/test/jdk/java/time/test/java/time/temporal/TestDateTimeValueRange.java similarity index 100% rename from jdk/test/java/time/test/java/time/temporal/TestDateTimeValueRange.java rename to test/jdk/java/time/test/java/time/temporal/TestDateTimeValueRange.java diff --git a/jdk/test/java/time/test/java/time/temporal/TestIsoWeekFields.java b/test/jdk/java/time/test/java/time/temporal/TestIsoWeekFields.java similarity index 100% rename from jdk/test/java/time/test/java/time/temporal/TestIsoWeekFields.java rename to test/jdk/java/time/test/java/time/temporal/TestIsoWeekFields.java diff --git a/jdk/test/java/time/test/java/time/temporal/TestJulianFields.java b/test/jdk/java/time/test/java/time/temporal/TestJulianFields.java similarity index 100% rename from jdk/test/java/time/test/java/time/temporal/TestJulianFields.java rename to test/jdk/java/time/test/java/time/temporal/TestJulianFields.java diff --git a/jdk/test/java/time/test/java/time/zone/TestFixedZoneRules.java b/test/jdk/java/time/test/java/time/zone/TestFixedZoneRules.java similarity index 100% rename from jdk/test/java/time/test/java/time/zone/TestFixedZoneRules.java rename to test/jdk/java/time/test/java/time/zone/TestFixedZoneRules.java diff --git a/jdk/test/java/time/test/java/util/TestFormatter.java b/test/jdk/java/time/test/java/util/TestFormatter.java similarity index 100% rename from jdk/test/java/time/test/java/util/TestFormatter.java rename to test/jdk/java/time/test/java/util/TestFormatter.java diff --git a/jdk/test/java/util/AbstractCollection/ToArrayTest.java b/test/jdk/java/util/AbstractCollection/ToArrayTest.java similarity index 100% rename from jdk/test/java/util/AbstractCollection/ToArrayTest.java rename to test/jdk/java/util/AbstractCollection/ToArrayTest.java diff --git a/jdk/test/java/util/AbstractCollection/ToString.java b/test/jdk/java/util/AbstractCollection/ToString.java similarity index 100% rename from jdk/test/java/util/AbstractCollection/ToString.java rename to test/jdk/java/util/AbstractCollection/ToString.java diff --git a/jdk/test/java/util/AbstractList/CheckForComodification.java b/test/jdk/java/util/AbstractList/CheckForComodification.java similarity index 100% rename from jdk/test/java/util/AbstractList/CheckForComodification.java rename to test/jdk/java/util/AbstractList/CheckForComodification.java diff --git a/jdk/test/java/util/AbstractList/FailFastIterator.java b/test/jdk/java/util/AbstractList/FailFastIterator.java similarity index 100% rename from jdk/test/java/util/AbstractList/FailFastIterator.java rename to test/jdk/java/util/AbstractList/FailFastIterator.java diff --git a/jdk/test/java/util/AbstractList/HasNextAfterException.java b/test/jdk/java/util/AbstractList/HasNextAfterException.java similarity index 100% rename from jdk/test/java/util/AbstractList/HasNextAfterException.java rename to test/jdk/java/util/AbstractList/HasNextAfterException.java diff --git a/jdk/test/java/util/AbstractMap/AbstractMapClone.java b/test/jdk/java/util/AbstractMap/AbstractMapClone.java similarity index 100% rename from jdk/test/java/util/AbstractMap/AbstractMapClone.java rename to test/jdk/java/util/AbstractMap/AbstractMapClone.java diff --git a/jdk/test/java/util/AbstractMap/Equals.java b/test/jdk/java/util/AbstractMap/Equals.java similarity index 100% rename from jdk/test/java/util/AbstractMap/Equals.java rename to test/jdk/java/util/AbstractMap/Equals.java diff --git a/jdk/test/java/util/AbstractMap/SimpleEntries.java b/test/jdk/java/util/AbstractMap/SimpleEntries.java similarity index 100% rename from jdk/test/java/util/AbstractMap/SimpleEntries.java rename to test/jdk/java/util/AbstractMap/SimpleEntries.java diff --git a/jdk/test/java/util/AbstractMap/ToString.java b/test/jdk/java/util/AbstractMap/ToString.java similarity index 100% rename from jdk/test/java/util/AbstractMap/ToString.java rename to test/jdk/java/util/AbstractMap/ToString.java diff --git a/jdk/test/java/util/AbstractSequentialList/AddAll.java b/test/jdk/java/util/AbstractSequentialList/AddAll.java similarity index 100% rename from jdk/test/java/util/AbstractSequentialList/AddAll.java rename to test/jdk/java/util/AbstractSequentialList/AddAll.java diff --git a/jdk/test/java/util/ArrayList/AddAll.java b/test/jdk/java/util/ArrayList/AddAll.java similarity index 100% rename from jdk/test/java/util/ArrayList/AddAll.java rename to test/jdk/java/util/ArrayList/AddAll.java diff --git a/jdk/test/java/util/ArrayList/ArrayManagement.java b/test/jdk/java/util/ArrayList/ArrayManagement.java similarity index 100% rename from jdk/test/java/util/ArrayList/ArrayManagement.java rename to test/jdk/java/util/ArrayList/ArrayManagement.java diff --git a/jdk/test/java/util/ArrayList/Bug6533203.java b/test/jdk/java/util/ArrayList/Bug6533203.java similarity index 100% rename from jdk/test/java/util/ArrayList/Bug6533203.java rename to test/jdk/java/util/ArrayList/Bug6533203.java diff --git a/jdk/test/java/util/ArrayList/Bug8146568.java b/test/jdk/java/util/ArrayList/Bug8146568.java similarity index 100% rename from jdk/test/java/util/ArrayList/Bug8146568.java rename to test/jdk/java/util/ArrayList/Bug8146568.java diff --git a/jdk/test/java/util/ArrayList/EnsureCapacity.java b/test/jdk/java/util/ArrayList/EnsureCapacity.java similarity index 100% rename from jdk/test/java/util/ArrayList/EnsureCapacity.java rename to test/jdk/java/util/ArrayList/EnsureCapacity.java diff --git a/jdk/test/java/util/ArrayList/IteratorMicroBenchmark.java b/test/jdk/java/util/ArrayList/IteratorMicroBenchmark.java similarity index 100% rename from jdk/test/java/util/ArrayList/IteratorMicroBenchmark.java rename to test/jdk/java/util/ArrayList/IteratorMicroBenchmark.java diff --git a/jdk/test/java/util/ArrayList/RangeCheckMicroBenchmark.java b/test/jdk/java/util/ArrayList/RangeCheckMicroBenchmark.java similarity index 100% rename from jdk/test/java/util/ArrayList/RangeCheckMicroBenchmark.java rename to test/jdk/java/util/ArrayList/RangeCheckMicroBenchmark.java diff --git a/jdk/test/java/util/Arrays/ArrayObjectMethods.java b/test/jdk/java/util/Arrays/ArrayObjectMethods.java similarity index 100% rename from jdk/test/java/util/Arrays/ArrayObjectMethods.java rename to test/jdk/java/util/Arrays/ArrayObjectMethods.java diff --git a/jdk/test/java/util/Arrays/ArraysEqCmpTest.java b/test/jdk/java/util/Arrays/ArraysEqCmpTest.java similarity index 100% rename from jdk/test/java/util/Arrays/ArraysEqCmpTest.java rename to test/jdk/java/util/Arrays/ArraysEqCmpTest.java diff --git a/jdk/test/java/util/Arrays/AsList.java b/test/jdk/java/util/Arrays/AsList.java similarity index 100% rename from jdk/test/java/util/Arrays/AsList.java rename to test/jdk/java/util/Arrays/AsList.java diff --git a/jdk/test/java/util/Arrays/Big.java b/test/jdk/java/util/Arrays/Big.java similarity index 100% rename from jdk/test/java/util/Arrays/Big.java rename to test/jdk/java/util/Arrays/Big.java diff --git a/jdk/test/java/util/Arrays/CopyMethods.java b/test/jdk/java/util/Arrays/CopyMethods.java similarity index 100% rename from jdk/test/java/util/Arrays/CopyMethods.java rename to test/jdk/java/util/Arrays/CopyMethods.java diff --git a/jdk/test/java/util/Arrays/Correct.java b/test/jdk/java/util/Arrays/Correct.java similarity index 100% rename from jdk/test/java/util/Arrays/Correct.java rename to test/jdk/java/util/Arrays/Correct.java diff --git a/jdk/test/java/util/Arrays/Fill.java b/test/jdk/java/util/Arrays/Fill.java similarity index 100% rename from jdk/test/java/util/Arrays/Fill.java rename to test/jdk/java/util/Arrays/Fill.java diff --git a/jdk/test/java/util/Arrays/FloatDoubleOrder.java b/test/jdk/java/util/Arrays/FloatDoubleOrder.java similarity index 100% rename from jdk/test/java/util/Arrays/FloatDoubleOrder.java rename to test/jdk/java/util/Arrays/FloatDoubleOrder.java diff --git a/jdk/test/java/util/Arrays/ParallelSorting.java b/test/jdk/java/util/Arrays/ParallelSorting.java similarity index 100% rename from jdk/test/java/util/Arrays/ParallelSorting.java rename to test/jdk/java/util/Arrays/ParallelSorting.java diff --git a/jdk/test/java/util/Arrays/SetAllTest.java b/test/jdk/java/util/Arrays/SetAllTest.java similarity index 100% rename from jdk/test/java/util/Arrays/SetAllTest.java rename to test/jdk/java/util/Arrays/SetAllTest.java diff --git a/jdk/test/java/util/Arrays/Sorting.java b/test/jdk/java/util/Arrays/Sorting.java similarity index 100% rename from jdk/test/java/util/Arrays/Sorting.java rename to test/jdk/java/util/Arrays/Sorting.java diff --git a/jdk/test/java/util/Arrays/SortingIntBenchmarkTestJMH.java b/test/jdk/java/util/Arrays/SortingIntBenchmarkTestJMH.java similarity index 100% rename from jdk/test/java/util/Arrays/SortingIntBenchmarkTestJMH.java rename to test/jdk/java/util/Arrays/SortingIntBenchmarkTestJMH.java diff --git a/jdk/test/java/util/Arrays/SortingLongBenchmarkTestJMH.java b/test/jdk/java/util/Arrays/SortingLongBenchmarkTestJMH.java similarity index 100% rename from jdk/test/java/util/Arrays/SortingLongBenchmarkTestJMH.java rename to test/jdk/java/util/Arrays/SortingLongBenchmarkTestJMH.java diff --git a/jdk/test/java/util/Arrays/SortingNearlySortedPrimitive.java b/test/jdk/java/util/Arrays/SortingNearlySortedPrimitive.java similarity index 100% rename from jdk/test/java/util/Arrays/SortingNearlySortedPrimitive.java rename to test/jdk/java/util/Arrays/SortingNearlySortedPrimitive.java diff --git a/jdk/test/java/util/Arrays/StreamAndSpliterator.java b/test/jdk/java/util/Arrays/StreamAndSpliterator.java similarity index 100% rename from jdk/test/java/util/Arrays/StreamAndSpliterator.java rename to test/jdk/java/util/Arrays/StreamAndSpliterator.java diff --git a/jdk/test/java/util/Arrays/TimSortStackSize.java b/test/jdk/java/util/Arrays/TimSortStackSize.java similarity index 100% rename from jdk/test/java/util/Arrays/TimSortStackSize.java rename to test/jdk/java/util/Arrays/TimSortStackSize.java diff --git a/jdk/test/java/util/Arrays/TimSortStackSize2.java b/test/jdk/java/util/Arrays/TimSortStackSize2.java similarity index 100% rename from jdk/test/java/util/Arrays/TimSortStackSize2.java rename to test/jdk/java/util/Arrays/TimSortStackSize2.java diff --git a/jdk/test/java/util/Arrays/largeMemory/ParallelPrefix.java b/test/jdk/java/util/Arrays/largeMemory/ParallelPrefix.java similarity index 100% rename from jdk/test/java/util/Arrays/largeMemory/ParallelPrefix.java rename to test/jdk/java/util/Arrays/largeMemory/ParallelPrefix.java diff --git a/jdk/test/java/util/Base64/Base64GetEncoderTest.java b/test/jdk/java/util/Base64/Base64GetEncoderTest.java similarity index 100% rename from jdk/test/java/util/Base64/Base64GetEncoderTest.java rename to test/jdk/java/util/Base64/Base64GetEncoderTest.java diff --git a/jdk/test/java/util/Base64/TestBase64.java b/test/jdk/java/util/Base64/TestBase64.java similarity index 100% rename from jdk/test/java/util/Base64/TestBase64.java rename to test/jdk/java/util/Base64/TestBase64.java diff --git a/jdk/test/java/util/Base64/TestBase64Golden.java b/test/jdk/java/util/Base64/TestBase64Golden.java similarity index 100% rename from jdk/test/java/util/Base64/TestBase64Golden.java rename to test/jdk/java/util/Base64/TestBase64Golden.java diff --git a/jdk/test/java/util/Base64/baseEncode.txt b/test/jdk/java/util/Base64/baseEncode.txt similarity index 100% rename from jdk/test/java/util/Base64/baseEncode.txt rename to test/jdk/java/util/Base64/baseEncode.txt diff --git a/jdk/test/java/util/Base64/mimeEncode.txt b/test/jdk/java/util/Base64/mimeEncode.txt similarity index 100% rename from jdk/test/java/util/Base64/mimeEncode.txt rename to test/jdk/java/util/Base64/mimeEncode.txt diff --git a/jdk/test/java/util/Base64/plain.txt b/test/jdk/java/util/Base64/plain.txt similarity index 100% rename from jdk/test/java/util/Base64/plain.txt rename to test/jdk/java/util/Base64/plain.txt diff --git a/jdk/test/java/util/Base64/urlEncode.txt b/test/jdk/java/util/Base64/urlEncode.txt similarity index 100% rename from jdk/test/java/util/Base64/urlEncode.txt rename to test/jdk/java/util/Base64/urlEncode.txt diff --git a/jdk/test/java/util/BitSet/And.java b/test/jdk/java/util/BitSet/And.java similarity index 100% rename from jdk/test/java/util/BitSet/And.java rename to test/jdk/java/util/BitSet/And.java diff --git a/jdk/test/java/util/BitSet/BSMethods.java b/test/jdk/java/util/BitSet/BSMethods.java similarity index 100% rename from jdk/test/java/util/BitSet/BSMethods.java rename to test/jdk/java/util/BitSet/BSMethods.java diff --git a/jdk/test/java/util/BitSet/ImportExport.java b/test/jdk/java/util/BitSet/ImportExport.java similarity index 100% rename from jdk/test/java/util/BitSet/ImportExport.java rename to test/jdk/java/util/BitSet/ImportExport.java diff --git a/jdk/test/java/util/BitSet/MemoryLeak.java b/test/jdk/java/util/BitSet/MemoryLeak.java similarity index 100% rename from jdk/test/java/util/BitSet/MemoryLeak.java rename to test/jdk/java/util/BitSet/MemoryLeak.java diff --git a/jdk/test/java/util/BitSet/PreviousBits.java b/test/jdk/java/util/BitSet/PreviousBits.java similarity index 100% rename from jdk/test/java/util/BitSet/PreviousBits.java rename to test/jdk/java/util/BitSet/PreviousBits.java diff --git a/jdk/test/java/util/BitSet/StickySize.java b/test/jdk/java/util/BitSet/StickySize.java similarity index 100% rename from jdk/test/java/util/BitSet/StickySize.java rename to test/jdk/java/util/BitSet/StickySize.java diff --git a/jdk/test/java/util/BitSet/stream/BitSetStreamTest.java b/test/jdk/java/util/BitSet/stream/BitSetStreamTest.java similarity index 100% rename from jdk/test/java/util/BitSet/stream/BitSetStreamTest.java rename to test/jdk/java/util/BitSet/stream/BitSetStreamTest.java diff --git a/jdk/test/java/util/Calendar/BuddhistCalendarTest.java b/test/jdk/java/util/Calendar/BuddhistCalendarTest.java similarity index 100% rename from jdk/test/java/util/Calendar/BuddhistCalendarTest.java rename to test/jdk/java/util/Calendar/BuddhistCalendarTest.java diff --git a/jdk/test/java/util/Calendar/Bug4302966.java b/test/jdk/java/util/Calendar/Bug4302966.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug4302966.java rename to test/jdk/java/util/Calendar/Bug4302966.java diff --git a/jdk/test/java/util/Calendar/Bug4766302.java b/test/jdk/java/util/Calendar/Bug4766302.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug4766302.java rename to test/jdk/java/util/Calendar/Bug4766302.java diff --git a/jdk/test/java/util/Calendar/Bug4851640.java b/test/jdk/java/util/Calendar/Bug4851640.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug4851640.java rename to test/jdk/java/util/Calendar/Bug4851640.java diff --git a/jdk/test/java/util/Calendar/Bug4958050.java b/test/jdk/java/util/Calendar/Bug4958050.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug4958050.java rename to test/jdk/java/util/Calendar/Bug4958050.java diff --git a/jdk/test/java/util/Calendar/Bug5078053.java b/test/jdk/java/util/Calendar/Bug5078053.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug5078053.java rename to test/jdk/java/util/Calendar/Bug5078053.java diff --git a/jdk/test/java/util/Calendar/Bug6178071.java b/test/jdk/java/util/Calendar/Bug6178071.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug6178071.java rename to test/jdk/java/util/Calendar/Bug6178071.java diff --git a/jdk/test/java/util/Calendar/Bug6234795.java b/test/jdk/java/util/Calendar/Bug6234795.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug6234795.java rename to test/jdk/java/util/Calendar/Bug6234795.java diff --git a/jdk/test/java/util/Calendar/Bug6448234.java b/test/jdk/java/util/Calendar/Bug6448234.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug6448234.java rename to test/jdk/java/util/Calendar/Bug6448234.java diff --git a/jdk/test/java/util/Calendar/Bug6645263.java b/test/jdk/java/util/Calendar/Bug6645263.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug6645263.java rename to test/jdk/java/util/Calendar/Bug6645263.java diff --git a/jdk/test/java/util/Calendar/Bug6902861.java b/test/jdk/java/util/Calendar/Bug6902861.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug6902861.java rename to test/jdk/java/util/Calendar/Bug6902861.java diff --git a/jdk/test/java/util/Calendar/Bug7017458.java b/test/jdk/java/util/Calendar/Bug7017458.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug7017458.java rename to test/jdk/java/util/Calendar/Bug7017458.java diff --git a/jdk/test/java/util/Calendar/Bug8007038.java b/test/jdk/java/util/Calendar/Bug8007038.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug8007038.java rename to test/jdk/java/util/Calendar/Bug8007038.java diff --git a/jdk/test/java/util/Calendar/Bug8075548.java b/test/jdk/java/util/Calendar/Bug8075548.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug8075548.java rename to test/jdk/java/util/Calendar/Bug8075548.java diff --git a/jdk/test/java/util/Calendar/Bug8152077.java b/test/jdk/java/util/Calendar/Bug8152077.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug8152077.java rename to test/jdk/java/util/Calendar/Bug8152077.java diff --git a/jdk/test/java/util/Calendar/Bug8167273.java b/test/jdk/java/util/Calendar/Bug8167273.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug8167273.java rename to test/jdk/java/util/Calendar/Bug8167273.java diff --git a/jdk/test/java/util/Calendar/Bug8176847.java b/test/jdk/java/util/Calendar/Bug8176847.java similarity index 100% rename from jdk/test/java/util/Calendar/Bug8176847.java rename to test/jdk/java/util/Calendar/Bug8176847.java diff --git a/jdk/test/java/util/Calendar/Builder/BuilderTest.java b/test/jdk/java/util/Calendar/Builder/BuilderTest.java similarity index 100% rename from jdk/test/java/util/Calendar/Builder/BuilderTest.java rename to test/jdk/java/util/Calendar/Builder/BuilderTest.java diff --git a/jdk/test/java/util/Calendar/CalendarLimitTest.java b/test/jdk/java/util/Calendar/CalendarLimitTest.java similarity index 100% rename from jdk/test/java/util/Calendar/CalendarLimitTest.java rename to test/jdk/java/util/Calendar/CalendarLimitTest.java diff --git a/jdk/test/java/util/Calendar/CalendarRegression.java b/test/jdk/java/util/Calendar/CalendarRegression.java similarity index 100% rename from jdk/test/java/util/Calendar/CalendarRegression.java rename to test/jdk/java/util/Calendar/CalendarRegression.java diff --git a/jdk/test/java/util/Calendar/CalendarTest.java b/test/jdk/java/util/Calendar/CalendarTest.java similarity index 100% rename from jdk/test/java/util/Calendar/CalendarTest.java rename to test/jdk/java/util/Calendar/CalendarTest.java diff --git a/jdk/test/java/util/Calendar/CalendarTypeTest.java b/test/jdk/java/util/Calendar/CalendarTypeTest.java similarity index 100% rename from jdk/test/java/util/Calendar/CalendarTypeTest.java rename to test/jdk/java/util/Calendar/CalendarTypeTest.java diff --git a/jdk/test/java/util/Calendar/CldrFormatNamesTest.java b/test/jdk/java/util/Calendar/CldrFormatNamesTest.java similarity index 100% rename from jdk/test/java/util/Calendar/CldrFormatNamesTest.java rename to test/jdk/java/util/Calendar/CldrFormatNamesTest.java diff --git a/jdk/test/java/util/Calendar/FieldStateTest.java b/test/jdk/java/util/Calendar/FieldStateTest.java similarity index 100% rename from jdk/test/java/util/Calendar/FieldStateTest.java rename to test/jdk/java/util/Calendar/FieldStateTest.java diff --git a/jdk/test/java/util/Calendar/GenericTimeZoneNamesTest.java b/test/jdk/java/util/Calendar/GenericTimeZoneNamesTest.java similarity index 100% rename from jdk/test/java/util/Calendar/GenericTimeZoneNamesTest.java rename to test/jdk/java/util/Calendar/GenericTimeZoneNamesTest.java diff --git a/jdk/test/java/util/Calendar/GenericTimeZoneNamesTest.sh b/test/jdk/java/util/Calendar/GenericTimeZoneNamesTest.sh similarity index 100% rename from jdk/test/java/util/Calendar/GenericTimeZoneNamesTest.sh rename to test/jdk/java/util/Calendar/GenericTimeZoneNamesTest.sh diff --git a/jdk/test/java/util/Calendar/GregorianCutoverTest.java b/test/jdk/java/util/Calendar/GregorianCutoverTest.java similarity index 100% rename from jdk/test/java/util/Calendar/GregorianCutoverTest.java rename to test/jdk/java/util/Calendar/GregorianCutoverTest.java diff --git a/jdk/test/java/util/Calendar/JavatimeTest.java b/test/jdk/java/util/Calendar/JavatimeTest.java similarity index 100% rename from jdk/test/java/util/Calendar/JavatimeTest.java rename to test/jdk/java/util/Calendar/JavatimeTest.java diff --git a/jdk/test/java/util/Calendar/JulianTest.java b/test/jdk/java/util/Calendar/JulianTest.java similarity index 100% rename from jdk/test/java/util/Calendar/JulianTest.java rename to test/jdk/java/util/Calendar/JulianTest.java diff --git a/jdk/test/java/util/Calendar/Koyomi.java b/test/jdk/java/util/Calendar/Koyomi.java similarity index 100% rename from jdk/test/java/util/Calendar/Koyomi.java rename to test/jdk/java/util/Calendar/Koyomi.java diff --git a/jdk/test/java/util/Calendar/Limit.java b/test/jdk/java/util/Calendar/Limit.java similarity index 100% rename from jdk/test/java/util/Calendar/Limit.java rename to test/jdk/java/util/Calendar/Limit.java diff --git a/jdk/test/java/util/Calendar/NarrowNamesTest.java b/test/jdk/java/util/Calendar/NarrowNamesTest.java similarity index 100% rename from jdk/test/java/util/Calendar/NarrowNamesTest.java rename to test/jdk/java/util/Calendar/NarrowNamesTest.java diff --git a/jdk/test/java/util/Calendar/NarrowNamesTest.sh b/test/jdk/java/util/Calendar/NarrowNamesTest.sh similarity index 100% rename from jdk/test/java/util/Calendar/NarrowNamesTest.sh rename to test/jdk/java/util/Calendar/NarrowNamesTest.sh diff --git a/jdk/test/java/util/Calendar/NonLenientTest.java b/test/jdk/java/util/Calendar/NonLenientTest.java similarity index 100% rename from jdk/test/java/util/Calendar/NonLenientTest.java rename to test/jdk/java/util/Calendar/NonLenientTest.java diff --git a/jdk/test/java/util/Calendar/ResolutionTest.java b/test/jdk/java/util/Calendar/ResolutionTest.java similarity index 100% rename from jdk/test/java/util/Calendar/ResolutionTest.java rename to test/jdk/java/util/Calendar/ResolutionTest.java diff --git a/jdk/test/java/util/Calendar/RollDayOfWeekTest.java b/test/jdk/java/util/Calendar/RollDayOfWeekTest.java similarity index 100% rename from jdk/test/java/util/Calendar/RollDayOfWeekTest.java rename to test/jdk/java/util/Calendar/RollDayOfWeekTest.java diff --git a/jdk/test/java/util/Calendar/StampOverflow.java b/test/jdk/java/util/Calendar/StampOverflow.java similarity index 100% rename from jdk/test/java/util/Calendar/StampOverflow.java rename to test/jdk/java/util/Calendar/StampOverflow.java diff --git a/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.java b/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.java similarity index 100% rename from jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.java rename to test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.java diff --git a/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.sh b/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.sh similarity index 100% rename from jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.sh rename to test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.sh diff --git a/jdk/test/java/util/Calendar/WeekDateTest.java b/test/jdk/java/util/Calendar/WeekDateTest.java similarity index 100% rename from jdk/test/java/util/Calendar/WeekDateTest.java rename to test/jdk/java/util/Calendar/WeekDateTest.java diff --git a/jdk/test/java/util/Calendar/ZoneOffsets.java b/test/jdk/java/util/Calendar/ZoneOffsets.java similarity index 100% rename from jdk/test/java/util/Calendar/ZoneOffsets.java rename to test/jdk/java/util/Calendar/ZoneOffsets.java diff --git a/jdk/test/java/util/Calendar/bug4028518.java b/test/jdk/java/util/Calendar/bug4028518.java similarity index 100% rename from jdk/test/java/util/Calendar/bug4028518.java rename to test/jdk/java/util/Calendar/bug4028518.java diff --git a/jdk/test/java/util/Calendar/bug4100311.java b/test/jdk/java/util/Calendar/bug4100311.java similarity index 100% rename from jdk/test/java/util/Calendar/bug4100311.java rename to test/jdk/java/util/Calendar/bug4100311.java diff --git a/jdk/test/java/util/Calendar/bug4243802.java b/test/jdk/java/util/Calendar/bug4243802.java similarity index 100% rename from jdk/test/java/util/Calendar/bug4243802.java rename to test/jdk/java/util/Calendar/bug4243802.java diff --git a/jdk/test/java/util/Calendar/bug4316678.java b/test/jdk/java/util/Calendar/bug4316678.java similarity index 100% rename from jdk/test/java/util/Calendar/bug4316678.java rename to test/jdk/java/util/Calendar/bug4316678.java diff --git a/jdk/test/java/util/Calendar/bug4372743.java b/test/jdk/java/util/Calendar/bug4372743.java similarity index 100% rename from jdk/test/java/util/Calendar/bug4372743.java rename to test/jdk/java/util/Calendar/bug4372743.java diff --git a/jdk/test/java/util/Calendar/bug4401223.java b/test/jdk/java/util/Calendar/bug4401223.java similarity index 100% rename from jdk/test/java/util/Calendar/bug4401223.java rename to test/jdk/java/util/Calendar/bug4401223.java diff --git a/jdk/test/java/util/Calendar/bug4409072.java b/test/jdk/java/util/Calendar/bug4409072.java similarity index 100% rename from jdk/test/java/util/Calendar/bug4409072.java rename to test/jdk/java/util/Calendar/bug4409072.java diff --git a/jdk/test/java/util/Calendar/bug4514831.java b/test/jdk/java/util/Calendar/bug4514831.java similarity index 100% rename from jdk/test/java/util/Calendar/bug4514831.java rename to test/jdk/java/util/Calendar/bug4514831.java diff --git a/jdk/test/java/util/Collection/BiggernYours.java b/test/jdk/java/util/Collection/BiggernYours.java similarity index 100% rename from jdk/test/java/util/Collection/BiggernYours.java rename to test/jdk/java/util/Collection/BiggernYours.java diff --git a/jdk/test/java/util/Collection/CollectionDefaults.java b/test/jdk/java/util/Collection/CollectionDefaults.java similarity index 100% rename from jdk/test/java/util/Collection/CollectionDefaults.java rename to test/jdk/java/util/Collection/CollectionDefaults.java diff --git a/jdk/test/java/util/Collection/HotPotatoes.java b/test/jdk/java/util/Collection/HotPotatoes.java similarity index 100% rename from jdk/test/java/util/Collection/HotPotatoes.java rename to test/jdk/java/util/Collection/HotPotatoes.java diff --git a/jdk/test/java/util/Collection/IteratorAtEnd.java b/test/jdk/java/util/Collection/IteratorAtEnd.java similarity index 100% rename from jdk/test/java/util/Collection/IteratorAtEnd.java rename to test/jdk/java/util/Collection/IteratorAtEnd.java diff --git a/jdk/test/java/util/Collection/IteratorMicroBenchmark.java b/test/jdk/java/util/Collection/IteratorMicroBenchmark.java similarity index 100% rename from jdk/test/java/util/Collection/IteratorMicroBenchmark.java rename to test/jdk/java/util/Collection/IteratorMicroBenchmark.java diff --git a/jdk/test/java/util/Collection/MOAT.java b/test/jdk/java/util/Collection/MOAT.java similarity index 100% rename from jdk/test/java/util/Collection/MOAT.java rename to test/jdk/java/util/Collection/MOAT.java diff --git a/jdk/test/java/util/Collection/RemoveMicroBenchmark.java b/test/jdk/java/util/Collection/RemoveMicroBenchmark.java similarity index 100% rename from jdk/test/java/util/Collection/RemoveMicroBenchmark.java rename to test/jdk/java/util/Collection/RemoveMicroBenchmark.java diff --git a/jdk/test/java/util/Collection/SetFactories.java b/test/jdk/java/util/Collection/SetFactories.java similarity index 100% rename from jdk/test/java/util/Collection/SetFactories.java rename to test/jdk/java/util/Collection/SetFactories.java diff --git a/jdk/test/java/util/Collection/testlibrary/CollectionAsserts.java b/test/jdk/java/util/Collection/testlibrary/CollectionAsserts.java similarity index 100% rename from jdk/test/java/util/Collection/testlibrary/CollectionAsserts.java rename to test/jdk/java/util/Collection/testlibrary/CollectionAsserts.java diff --git a/jdk/test/java/util/Collection/testlibrary/CollectionSupplier.java b/test/jdk/java/util/Collection/testlibrary/CollectionSupplier.java similarity index 100% rename from jdk/test/java/util/Collection/testlibrary/CollectionSupplier.java rename to test/jdk/java/util/Collection/testlibrary/CollectionSupplier.java diff --git a/jdk/test/java/util/Collection/testlibrary/ExtendsAbstractCollection.java b/test/jdk/java/util/Collection/testlibrary/ExtendsAbstractCollection.java similarity index 100% rename from jdk/test/java/util/Collection/testlibrary/ExtendsAbstractCollection.java rename to test/jdk/java/util/Collection/testlibrary/ExtendsAbstractCollection.java diff --git a/jdk/test/java/util/Collection/testlibrary/ExtendsAbstractList.java b/test/jdk/java/util/Collection/testlibrary/ExtendsAbstractList.java similarity index 100% rename from jdk/test/java/util/Collection/testlibrary/ExtendsAbstractList.java rename to test/jdk/java/util/Collection/testlibrary/ExtendsAbstractList.java diff --git a/jdk/test/java/util/Collection/testlibrary/ExtendsAbstractSet.java b/test/jdk/java/util/Collection/testlibrary/ExtendsAbstractSet.java similarity index 100% rename from jdk/test/java/util/Collection/testlibrary/ExtendsAbstractSet.java rename to test/jdk/java/util/Collection/testlibrary/ExtendsAbstractSet.java diff --git a/jdk/test/java/util/Collections/AddAll.java b/test/jdk/java/util/Collections/AddAll.java similarity index 100% rename from jdk/test/java/util/Collections/AddAll.java rename to test/jdk/java/util/Collections/AddAll.java diff --git a/jdk/test/java/util/Collections/AsLifoQueue.java b/test/jdk/java/util/Collections/AsLifoQueue.java similarity index 100% rename from jdk/test/java/util/Collections/AsLifoQueue.java rename to test/jdk/java/util/Collections/AsLifoQueue.java diff --git a/jdk/test/java/util/Collections/BigBinarySearch.java b/test/jdk/java/util/Collections/BigBinarySearch.java similarity index 100% rename from jdk/test/java/util/Collections/BigBinarySearch.java rename to test/jdk/java/util/Collections/BigBinarySearch.java diff --git a/jdk/test/java/util/Collections/BinarySearchNullComparator.java b/test/jdk/java/util/Collections/BinarySearchNullComparator.java similarity index 100% rename from jdk/test/java/util/Collections/BinarySearchNullComparator.java rename to test/jdk/java/util/Collections/BinarySearchNullComparator.java diff --git a/jdk/test/java/util/Collections/CheckedIdentityMap.java b/test/jdk/java/util/Collections/CheckedIdentityMap.java similarity index 100% rename from jdk/test/java/util/Collections/CheckedIdentityMap.java rename to test/jdk/java/util/Collections/CheckedIdentityMap.java diff --git a/jdk/test/java/util/Collections/CheckedListBash.java b/test/jdk/java/util/Collections/CheckedListBash.java similarity index 100% rename from jdk/test/java/util/Collections/CheckedListBash.java rename to test/jdk/java/util/Collections/CheckedListBash.java diff --git a/jdk/test/java/util/Collections/CheckedListReplaceAll.java b/test/jdk/java/util/Collections/CheckedListReplaceAll.java similarity index 100% rename from jdk/test/java/util/Collections/CheckedListReplaceAll.java rename to test/jdk/java/util/Collections/CheckedListReplaceAll.java diff --git a/jdk/test/java/util/Collections/CheckedMapBash.java b/test/jdk/java/util/Collections/CheckedMapBash.java similarity index 100% rename from jdk/test/java/util/Collections/CheckedMapBash.java rename to test/jdk/java/util/Collections/CheckedMapBash.java diff --git a/jdk/test/java/util/Collections/CheckedMapReplaceAll.java b/test/jdk/java/util/Collections/CheckedMapReplaceAll.java similarity index 100% rename from jdk/test/java/util/Collections/CheckedMapReplaceAll.java rename to test/jdk/java/util/Collections/CheckedMapReplaceAll.java diff --git a/jdk/test/java/util/Collections/CheckedNull.java b/test/jdk/java/util/Collections/CheckedNull.java similarity index 100% rename from jdk/test/java/util/Collections/CheckedNull.java rename to test/jdk/java/util/Collections/CheckedNull.java diff --git a/jdk/test/java/util/Collections/CheckedQueue.java b/test/jdk/java/util/Collections/CheckedQueue.java similarity index 100% rename from jdk/test/java/util/Collections/CheckedQueue.java rename to test/jdk/java/util/Collections/CheckedQueue.java diff --git a/jdk/test/java/util/Collections/CheckedSetBash.java b/test/jdk/java/util/Collections/CheckedSetBash.java similarity index 100% rename from jdk/test/java/util/Collections/CheckedSetBash.java rename to test/jdk/java/util/Collections/CheckedSetBash.java diff --git a/jdk/test/java/util/Collections/Disjoint.java b/test/jdk/java/util/Collections/Disjoint.java similarity index 100% rename from jdk/test/java/util/Collections/Disjoint.java rename to test/jdk/java/util/Collections/Disjoint.java diff --git a/jdk/test/java/util/Collections/EmptyCollectionSerialization.java b/test/jdk/java/util/Collections/EmptyCollectionSerialization.java similarity index 100% rename from jdk/test/java/util/Collections/EmptyCollectionSerialization.java rename to test/jdk/java/util/Collections/EmptyCollectionSerialization.java diff --git a/jdk/test/java/util/Collections/EmptyIterator.java b/test/jdk/java/util/Collections/EmptyIterator.java similarity index 100% rename from jdk/test/java/util/Collections/EmptyIterator.java rename to test/jdk/java/util/Collections/EmptyIterator.java diff --git a/jdk/test/java/util/Collections/EmptyNavigableMap.java b/test/jdk/java/util/Collections/EmptyNavigableMap.java similarity index 100% rename from jdk/test/java/util/Collections/EmptyNavigableMap.java rename to test/jdk/java/util/Collections/EmptyNavigableMap.java diff --git a/jdk/test/java/util/Collections/EmptyNavigableSet.java b/test/jdk/java/util/Collections/EmptyNavigableSet.java similarity index 100% rename from jdk/test/java/util/Collections/EmptyNavigableSet.java rename to test/jdk/java/util/Collections/EmptyNavigableSet.java diff --git a/jdk/test/java/util/Collections/Enum.java b/test/jdk/java/util/Collections/Enum.java similarity index 100% rename from jdk/test/java/util/Collections/Enum.java rename to test/jdk/java/util/Collections/Enum.java diff --git a/jdk/test/java/util/Collections/EnumerationAsIterator.java b/test/jdk/java/util/Collections/EnumerationAsIterator.java similarity index 100% rename from jdk/test/java/util/Collections/EnumerationAsIterator.java rename to test/jdk/java/util/Collections/EnumerationAsIterator.java diff --git a/jdk/test/java/util/Collections/EqualsTest.java b/test/jdk/java/util/Collections/EqualsTest.java similarity index 100% rename from jdk/test/java/util/Collections/EqualsTest.java rename to test/jdk/java/util/Collections/EqualsTest.java diff --git a/jdk/test/java/util/Collections/FindSubList.java b/test/jdk/java/util/Collections/FindSubList.java similarity index 100% rename from jdk/test/java/util/Collections/FindSubList.java rename to test/jdk/java/util/Collections/FindSubList.java diff --git a/jdk/test/java/util/Collections/Frequency.java b/test/jdk/java/util/Collections/Frequency.java similarity index 100% rename from jdk/test/java/util/Collections/Frequency.java rename to test/jdk/java/util/Collections/Frequency.java diff --git a/jdk/test/java/util/Collections/MinMax.java b/test/jdk/java/util/Collections/MinMax.java similarity index 100% rename from jdk/test/java/util/Collections/MinMax.java rename to test/jdk/java/util/Collections/MinMax.java diff --git a/jdk/test/java/util/Collections/NCopies.java b/test/jdk/java/util/Collections/NCopies.java similarity index 100% rename from jdk/test/java/util/Collections/NCopies.java rename to test/jdk/java/util/Collections/NCopies.java diff --git a/jdk/test/java/util/Collections/NullComparator.java b/test/jdk/java/util/Collections/NullComparator.java similarity index 100% rename from jdk/test/java/util/Collections/NullComparator.java rename to test/jdk/java/util/Collections/NullComparator.java diff --git a/jdk/test/java/util/Collections/RacingCollections.java b/test/jdk/java/util/Collections/RacingCollections.java similarity index 100% rename from jdk/test/java/util/Collections/RacingCollections.java rename to test/jdk/java/util/Collections/RacingCollections.java diff --git a/jdk/test/java/util/Collections/ReplaceAll.java b/test/jdk/java/util/Collections/ReplaceAll.java similarity index 100% rename from jdk/test/java/util/Collections/ReplaceAll.java rename to test/jdk/java/util/Collections/ReplaceAll.java diff --git a/jdk/test/java/util/Collections/ReverseOrder.java b/test/jdk/java/util/Collections/ReverseOrder.java similarity index 100% rename from jdk/test/java/util/Collections/ReverseOrder.java rename to test/jdk/java/util/Collections/ReverseOrder.java diff --git a/jdk/test/java/util/Collections/ReverseOrder2.java b/test/jdk/java/util/Collections/ReverseOrder2.java similarity index 100% rename from jdk/test/java/util/Collections/ReverseOrder2.java rename to test/jdk/java/util/Collections/ReverseOrder2.java diff --git a/jdk/test/java/util/Collections/Rotate.java b/test/jdk/java/util/Collections/Rotate.java similarity index 100% rename from jdk/test/java/util/Collections/Rotate.java rename to test/jdk/java/util/Collections/Rotate.java diff --git a/jdk/test/java/util/Collections/RotateEmpty.java b/test/jdk/java/util/Collections/RotateEmpty.java similarity index 100% rename from jdk/test/java/util/Collections/RotateEmpty.java rename to test/jdk/java/util/Collections/RotateEmpty.java diff --git a/jdk/test/java/util/Collections/Ser.java b/test/jdk/java/util/Collections/Ser.java similarity index 100% rename from jdk/test/java/util/Collections/Ser.java rename to test/jdk/java/util/Collections/Ser.java diff --git a/jdk/test/java/util/Collections/SetFromMap.java b/test/jdk/java/util/Collections/SetFromMap.java similarity index 100% rename from jdk/test/java/util/Collections/SetFromMap.java rename to test/jdk/java/util/Collections/SetFromMap.java diff --git a/jdk/test/java/util/Collections/SingletonIterator.java b/test/jdk/java/util/Collections/SingletonIterator.java similarity index 100% rename from jdk/test/java/util/Collections/SingletonIterator.java rename to test/jdk/java/util/Collections/SingletonIterator.java diff --git a/jdk/test/java/util/Collections/Swap.java b/test/jdk/java/util/Collections/Swap.java similarity index 100% rename from jdk/test/java/util/Collections/Swap.java rename to test/jdk/java/util/Collections/Swap.java diff --git a/jdk/test/java/util/Collections/SyncSubMutexes.java b/test/jdk/java/util/Collections/SyncSubMutexes.java similarity index 100% rename from jdk/test/java/util/Collections/SyncSubMutexes.java rename to test/jdk/java/util/Collections/SyncSubMutexes.java diff --git a/jdk/test/java/util/Collections/T5078378.java b/test/jdk/java/util/Collections/T5078378.java similarity index 100% rename from jdk/test/java/util/Collections/T5078378.java rename to test/jdk/java/util/Collections/T5078378.java diff --git a/jdk/test/java/util/Collections/T6433170.java b/test/jdk/java/util/Collections/T6433170.java similarity index 100% rename from jdk/test/java/util/Collections/T6433170.java rename to test/jdk/java/util/Collections/T6433170.java diff --git a/jdk/test/java/util/Collections/UnmodifiableMapEntrySet.java b/test/jdk/java/util/Collections/UnmodifiableMapEntrySet.java similarity index 100% rename from jdk/test/java/util/Collections/UnmodifiableMapEntrySet.java rename to test/jdk/java/util/Collections/UnmodifiableMapEntrySet.java diff --git a/jdk/test/java/util/Collections/ViewSynch.java b/test/jdk/java/util/Collections/ViewSynch.java similarity index 100% rename from jdk/test/java/util/Collections/ViewSynch.java rename to test/jdk/java/util/Collections/ViewSynch.java diff --git a/jdk/test/java/util/Collections/WrappedNull.java b/test/jdk/java/util/Collections/WrappedNull.java similarity index 100% rename from jdk/test/java/util/Collections/WrappedNull.java rename to test/jdk/java/util/Collections/WrappedNull.java diff --git a/jdk/test/java/util/Collections/Wrappers.java b/test/jdk/java/util/Collections/Wrappers.java similarity index 100% rename from jdk/test/java/util/Collections/Wrappers.java rename to test/jdk/java/util/Collections/Wrappers.java diff --git a/jdk/test/java/util/Comparator/BasicTest.java b/test/jdk/java/util/Comparator/BasicTest.java similarity index 100% rename from jdk/test/java/util/Comparator/BasicTest.java rename to test/jdk/java/util/Comparator/BasicTest.java diff --git a/jdk/test/java/util/Comparator/TypeTest.java b/test/jdk/java/util/Comparator/TypeTest.java similarity index 100% rename from jdk/test/java/util/Comparator/TypeTest.java rename to test/jdk/java/util/Comparator/TypeTest.java diff --git a/jdk/test/java/util/Currency/Bug4512215.java b/test/jdk/java/util/Currency/Bug4512215.java similarity index 100% rename from jdk/test/java/util/Currency/Bug4512215.java rename to test/jdk/java/util/Currency/Bug4512215.java diff --git a/jdk/test/java/util/Currency/Bug6807534.java b/test/jdk/java/util/Currency/Bug6807534.java similarity index 100% rename from jdk/test/java/util/Currency/Bug6807534.java rename to test/jdk/java/util/Currency/Bug6807534.java diff --git a/jdk/test/java/util/Currency/Bug8154295.java b/test/jdk/java/util/Currency/Bug8154295.java similarity index 100% rename from jdk/test/java/util/Currency/Bug8154295.java rename to test/jdk/java/util/Currency/Bug8154295.java diff --git a/jdk/test/java/util/Currency/CheckDataVersion.java b/test/jdk/java/util/Currency/CheckDataVersion.java similarity index 100% rename from jdk/test/java/util/Currency/CheckDataVersion.java rename to test/jdk/java/util/Currency/CheckDataVersion.java diff --git a/jdk/test/java/util/Currency/CurrencyTest.java b/test/jdk/java/util/Currency/CurrencyTest.java similarity index 100% rename from jdk/test/java/util/Currency/CurrencyTest.java rename to test/jdk/java/util/Currency/CurrencyTest.java diff --git a/jdk/test/java/util/Currency/PropertiesTest.java b/test/jdk/java/util/Currency/PropertiesTest.java similarity index 100% rename from jdk/test/java/util/Currency/PropertiesTest.java rename to test/jdk/java/util/Currency/PropertiesTest.java diff --git a/jdk/test/java/util/Currency/PropertiesTest.sh b/test/jdk/java/util/Currency/PropertiesTest.sh similarity index 100% rename from jdk/test/java/util/Currency/PropertiesTest.sh rename to test/jdk/java/util/Currency/PropertiesTest.sh diff --git a/jdk/test/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java similarity index 100% rename from jdk/test/java/util/Currency/ValidateISO4217.java rename to test/jdk/java/util/Currency/ValidateISO4217.java diff --git a/jdk/test/java/util/Currency/currency.properties b/test/jdk/java/util/Currency/currency.properties similarity index 100% rename from jdk/test/java/util/Currency/currency.properties rename to test/jdk/java/util/Currency/currency.properties diff --git a/jdk/test/java/util/Currency/tablea1.txt b/test/jdk/java/util/Currency/tablea1.txt similarity index 100% rename from jdk/test/java/util/Currency/tablea1.txt rename to test/jdk/java/util/Currency/tablea1.txt diff --git a/jdk/test/java/util/Date/Bug4955000.java b/test/jdk/java/util/Date/Bug4955000.java similarity index 100% rename from jdk/test/java/util/Date/Bug4955000.java rename to test/jdk/java/util/Date/Bug4955000.java diff --git a/jdk/test/java/util/Date/Bug8135055.java b/test/jdk/java/util/Date/Bug8135055.java similarity index 100% rename from jdk/test/java/util/Date/Bug8135055.java rename to test/jdk/java/util/Date/Bug8135055.java diff --git a/jdk/test/java/util/Date/DateGregorianCalendarTest.java b/test/jdk/java/util/Date/DateGregorianCalendarTest.java similarity index 100% rename from jdk/test/java/util/Date/DateGregorianCalendarTest.java rename to test/jdk/java/util/Date/DateGregorianCalendarTest.java diff --git a/jdk/test/java/util/Date/DateRegression.java b/test/jdk/java/util/Date/DateRegression.java similarity index 100% rename from jdk/test/java/util/Date/DateRegression.java rename to test/jdk/java/util/Date/DateRegression.java diff --git a/jdk/test/java/util/Date/DateTest.java b/test/jdk/java/util/Date/DateTest.java similarity index 100% rename from jdk/test/java/util/Date/DateTest.java rename to test/jdk/java/util/Date/DateTest.java diff --git a/jdk/test/java/util/Date/TZ.java b/test/jdk/java/util/Date/TZ.java similarity index 100% rename from jdk/test/java/util/Date/TZ.java rename to test/jdk/java/util/Date/TZ.java diff --git a/jdk/test/java/util/Date/TimestampTest.java b/test/jdk/java/util/Date/TimestampTest.java similarity index 100% rename from jdk/test/java/util/Date/TimestampTest.java rename to test/jdk/java/util/Date/TimestampTest.java diff --git a/jdk/test/java/util/Deque/ChorusLine.java b/test/jdk/java/util/Deque/ChorusLine.java similarity index 100% rename from jdk/test/java/util/Deque/ChorusLine.java rename to test/jdk/java/util/Deque/ChorusLine.java diff --git a/jdk/test/java/util/EnumMap/DistinctEntrySetElements.java b/test/jdk/java/util/EnumMap/DistinctEntrySetElements.java similarity index 100% rename from jdk/test/java/util/EnumMap/DistinctEntrySetElements.java rename to test/jdk/java/util/EnumMap/DistinctEntrySetElements.java diff --git a/jdk/test/java/util/EnumMap/EntrySetIteratorRemoveInvalidatesEntry.java b/test/jdk/java/util/EnumMap/EntrySetIteratorRemoveInvalidatesEntry.java similarity index 100% rename from jdk/test/java/util/EnumMap/EntrySetIteratorRemoveInvalidatesEntry.java rename to test/jdk/java/util/EnumMap/EntrySetIteratorRemoveInvalidatesEntry.java diff --git a/jdk/test/java/util/EnumMap/EnumMapBash.java b/test/jdk/java/util/EnumMap/EnumMapBash.java similarity index 100% rename from jdk/test/java/util/EnumMap/EnumMapBash.java rename to test/jdk/java/util/EnumMap/EnumMapBash.java diff --git a/jdk/test/java/util/EnumMap/ProperEntrySetOnClone.java b/test/jdk/java/util/EnumMap/ProperEntrySetOnClone.java similarity index 100% rename from jdk/test/java/util/EnumMap/ProperEntrySetOnClone.java rename to test/jdk/java/util/EnumMap/ProperEntrySetOnClone.java diff --git a/jdk/test/java/util/EnumMap/SimpleSerialization.java b/test/jdk/java/util/EnumMap/SimpleSerialization.java similarity index 100% rename from jdk/test/java/util/EnumMap/SimpleSerialization.java rename to test/jdk/java/util/EnumMap/SimpleSerialization.java diff --git a/jdk/test/java/util/EnumMap/ToArray.java b/test/jdk/java/util/EnumMap/ToArray.java similarity index 100% rename from jdk/test/java/util/EnumMap/ToArray.java rename to test/jdk/java/util/EnumMap/ToArray.java diff --git a/jdk/test/java/util/EnumMap/UniqueNullValue.java b/test/jdk/java/util/EnumMap/UniqueNullValue.java similarity index 100% rename from jdk/test/java/util/EnumMap/UniqueNullValue.java rename to test/jdk/java/util/EnumMap/UniqueNullValue.java diff --git a/jdk/test/java/util/EnumSet/AllOf.java b/test/jdk/java/util/EnumSet/AllOf.java similarity index 100% rename from jdk/test/java/util/EnumSet/AllOf.java rename to test/jdk/java/util/EnumSet/AllOf.java diff --git a/jdk/test/java/util/EnumSet/BogusEnumSet.java b/test/jdk/java/util/EnumSet/BogusEnumSet.java similarity index 100% rename from jdk/test/java/util/EnumSet/BogusEnumSet.java rename to test/jdk/java/util/EnumSet/BogusEnumSet.java diff --git a/jdk/test/java/util/EnumSet/ComplementOf.java b/test/jdk/java/util/EnumSet/ComplementOf.java similarity index 100% rename from jdk/test/java/util/EnumSet/ComplementOf.java rename to test/jdk/java/util/EnumSet/ComplementOf.java diff --git a/jdk/test/java/util/EnumSet/EnumSetBash.java b/test/jdk/java/util/EnumSet/EnumSetBash.java similarity index 100% rename from jdk/test/java/util/EnumSet/EnumSetBash.java rename to test/jdk/java/util/EnumSet/EnumSetBash.java diff --git a/jdk/test/java/util/EnumSet/InsertWrongType.java b/test/jdk/java/util/EnumSet/InsertWrongType.java similarity index 100% rename from jdk/test/java/util/EnumSet/InsertWrongType.java rename to test/jdk/java/util/EnumSet/InsertWrongType.java diff --git a/jdk/test/java/util/EnumSet/JumboRange.java b/test/jdk/java/util/EnumSet/JumboRange.java similarity index 100% rename from jdk/test/java/util/EnumSet/JumboRange.java rename to test/jdk/java/util/EnumSet/JumboRange.java diff --git a/jdk/test/java/util/EnumSet/LargeEnumIteratorRemoveResilience.java b/test/jdk/java/util/EnumSet/LargeEnumIteratorRemoveResilience.java similarity index 100% rename from jdk/test/java/util/EnumSet/LargeEnumIteratorRemoveResilience.java rename to test/jdk/java/util/EnumSet/LargeEnumIteratorRemoveResilience.java diff --git a/jdk/test/java/util/EnumSet/OneUniverse.java b/test/jdk/java/util/EnumSet/OneUniverse.java similarity index 100% rename from jdk/test/java/util/EnumSet/OneUniverse.java rename to test/jdk/java/util/EnumSet/OneUniverse.java diff --git a/jdk/test/java/util/EnumSet/Range.java b/test/jdk/java/util/EnumSet/Range.java similarity index 100% rename from jdk/test/java/util/EnumSet/Range.java rename to test/jdk/java/util/EnumSet/Range.java diff --git a/jdk/test/java/util/EnumSet/RetainAll.java b/test/jdk/java/util/EnumSet/RetainAll.java similarity index 100% rename from jdk/test/java/util/EnumSet/RetainAll.java rename to test/jdk/java/util/EnumSet/RetainAll.java diff --git a/jdk/test/java/util/EnumSet/SmallEnumIteratorRemoveResilience.java b/test/jdk/java/util/EnumSet/SmallEnumIteratorRemoveResilience.java similarity index 100% rename from jdk/test/java/util/EnumSet/SmallEnumIteratorRemoveResilience.java rename to test/jdk/java/util/EnumSet/SmallEnumIteratorRemoveResilience.java diff --git a/jdk/test/java/util/Formattable/StockName.java b/test/jdk/java/util/Formattable/StockName.java similarity index 100% rename from jdk/test/java/util/Formattable/StockName.java rename to test/jdk/java/util/Formattable/StockName.java diff --git a/jdk/test/java/util/Formatter/Basic-X.java.template b/test/jdk/java/util/Formatter/Basic-X.java.template similarity index 100% rename from jdk/test/java/util/Formatter/Basic-X.java.template rename to test/jdk/java/util/Formatter/Basic-X.java.template diff --git a/jdk/test/java/util/Formatter/Basic.java b/test/jdk/java/util/Formatter/Basic.java similarity index 100% rename from jdk/test/java/util/Formatter/Basic.java rename to test/jdk/java/util/Formatter/Basic.java diff --git a/jdk/test/java/util/Formatter/Basic.sh b/test/jdk/java/util/Formatter/Basic.sh similarity index 100% rename from jdk/test/java/util/Formatter/Basic.sh rename to test/jdk/java/util/Formatter/Basic.sh diff --git a/jdk/test/java/util/Formatter/BasicBigDecimal.java b/test/jdk/java/util/Formatter/BasicBigDecimal.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicBigDecimal.java rename to test/jdk/java/util/Formatter/BasicBigDecimal.java diff --git a/jdk/test/java/util/Formatter/BasicBigInteger.java b/test/jdk/java/util/Formatter/BasicBigInteger.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicBigInteger.java rename to test/jdk/java/util/Formatter/BasicBigInteger.java diff --git a/jdk/test/java/util/Formatter/BasicBoolean.java b/test/jdk/java/util/Formatter/BasicBoolean.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicBoolean.java rename to test/jdk/java/util/Formatter/BasicBoolean.java diff --git a/jdk/test/java/util/Formatter/BasicBooleanObject.java b/test/jdk/java/util/Formatter/BasicBooleanObject.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicBooleanObject.java rename to test/jdk/java/util/Formatter/BasicBooleanObject.java diff --git a/jdk/test/java/util/Formatter/BasicByte.java b/test/jdk/java/util/Formatter/BasicByte.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicByte.java rename to test/jdk/java/util/Formatter/BasicByte.java diff --git a/jdk/test/java/util/Formatter/BasicByteObject.java b/test/jdk/java/util/Formatter/BasicByteObject.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicByteObject.java rename to test/jdk/java/util/Formatter/BasicByteObject.java diff --git a/jdk/test/java/util/Formatter/BasicChar.java b/test/jdk/java/util/Formatter/BasicChar.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicChar.java rename to test/jdk/java/util/Formatter/BasicChar.java diff --git a/jdk/test/java/util/Formatter/BasicCharObject.java b/test/jdk/java/util/Formatter/BasicCharObject.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicCharObject.java rename to test/jdk/java/util/Formatter/BasicCharObject.java diff --git a/jdk/test/java/util/Formatter/BasicDateTime.java b/test/jdk/java/util/Formatter/BasicDateTime.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicDateTime.java rename to test/jdk/java/util/Formatter/BasicDateTime.java diff --git a/jdk/test/java/util/Formatter/BasicDouble.java b/test/jdk/java/util/Formatter/BasicDouble.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicDouble.java rename to test/jdk/java/util/Formatter/BasicDouble.java diff --git a/jdk/test/java/util/Formatter/BasicDoubleObject.java b/test/jdk/java/util/Formatter/BasicDoubleObject.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicDoubleObject.java rename to test/jdk/java/util/Formatter/BasicDoubleObject.java diff --git a/jdk/test/java/util/Formatter/BasicFloat.java b/test/jdk/java/util/Formatter/BasicFloat.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicFloat.java rename to test/jdk/java/util/Formatter/BasicFloat.java diff --git a/jdk/test/java/util/Formatter/BasicFloatObject.java b/test/jdk/java/util/Formatter/BasicFloatObject.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicFloatObject.java rename to test/jdk/java/util/Formatter/BasicFloatObject.java diff --git a/jdk/test/java/util/Formatter/BasicInt.java b/test/jdk/java/util/Formatter/BasicInt.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicInt.java rename to test/jdk/java/util/Formatter/BasicInt.java diff --git a/jdk/test/java/util/Formatter/BasicIntObject.java b/test/jdk/java/util/Formatter/BasicIntObject.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicIntObject.java rename to test/jdk/java/util/Formatter/BasicIntObject.java diff --git a/jdk/test/java/util/Formatter/BasicLong.java b/test/jdk/java/util/Formatter/BasicLong.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicLong.java rename to test/jdk/java/util/Formatter/BasicLong.java diff --git a/jdk/test/java/util/Formatter/BasicLongObject.java b/test/jdk/java/util/Formatter/BasicLongObject.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicLongObject.java rename to test/jdk/java/util/Formatter/BasicLongObject.java diff --git a/jdk/test/java/util/Formatter/BasicShort.java b/test/jdk/java/util/Formatter/BasicShort.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicShort.java rename to test/jdk/java/util/Formatter/BasicShort.java diff --git a/jdk/test/java/util/Formatter/BasicShortObject.java b/test/jdk/java/util/Formatter/BasicShortObject.java similarity index 100% rename from jdk/test/java/util/Formatter/BasicShortObject.java rename to test/jdk/java/util/Formatter/BasicShortObject.java diff --git a/jdk/test/java/util/Formatter/Close.java b/test/jdk/java/util/Formatter/Close.java similarity index 100% rename from jdk/test/java/util/Formatter/Close.java rename to test/jdk/java/util/Formatter/Close.java diff --git a/jdk/test/java/util/Formatter/Constructors.java b/test/jdk/java/util/Formatter/Constructors.java similarity index 100% rename from jdk/test/java/util/Formatter/Constructors.java rename to test/jdk/java/util/Formatter/Constructors.java diff --git a/jdk/test/java/util/Formatter/FailingConstructors.java b/test/jdk/java/util/Formatter/FailingConstructors.java similarity index 100% rename from jdk/test/java/util/Formatter/FailingConstructors.java rename to test/jdk/java/util/Formatter/FailingConstructors.java diff --git a/jdk/test/java/util/Formatter/Flush.java b/test/jdk/java/util/Formatter/Flush.java similarity index 100% rename from jdk/test/java/util/Formatter/Flush.java rename to test/jdk/java/util/Formatter/Flush.java diff --git a/jdk/test/java/util/Formatter/FormatLocale.java b/test/jdk/java/util/Formatter/FormatLocale.java similarity index 100% rename from jdk/test/java/util/Formatter/FormatLocale.java rename to test/jdk/java/util/Formatter/FormatLocale.java diff --git a/jdk/test/java/util/Formatter/NullArg.java b/test/jdk/java/util/Formatter/NullArg.java similarity index 100% rename from jdk/test/java/util/Formatter/NullArg.java rename to test/jdk/java/util/Formatter/NullArg.java diff --git a/jdk/test/java/util/Formatter/genBasic.sh b/test/jdk/java/util/Formatter/genBasic.sh similarity index 100% rename from jdk/test/java/util/Formatter/genBasic.sh rename to test/jdk/java/util/Formatter/genBasic.sh diff --git a/jdk/test/java/util/HashMap/HashMapCloneLeak.java b/test/jdk/java/util/HashMap/HashMapCloneLeak.java similarity index 100% rename from jdk/test/java/util/HashMap/HashMapCloneLeak.java rename to test/jdk/java/util/HashMap/HashMapCloneLeak.java diff --git a/jdk/test/java/util/HashMap/KeySetRemove.java b/test/jdk/java/util/HashMap/KeySetRemove.java similarity index 100% rename from jdk/test/java/util/HashMap/KeySetRemove.java rename to test/jdk/java/util/HashMap/KeySetRemove.java diff --git a/jdk/test/java/util/HashMap/NullKeyAtResize.java b/test/jdk/java/util/HashMap/NullKeyAtResize.java similarity index 100% rename from jdk/test/java/util/HashMap/NullKeyAtResize.java rename to test/jdk/java/util/HashMap/NullKeyAtResize.java diff --git a/jdk/test/java/util/HashMap/OverrideIsEmpty.java b/test/jdk/java/util/HashMap/OverrideIsEmpty.java similarity index 100% rename from jdk/test/java/util/HashMap/OverrideIsEmpty.java rename to test/jdk/java/util/HashMap/OverrideIsEmpty.java diff --git a/jdk/test/java/util/HashMap/PutNullKey.java b/test/jdk/java/util/HashMap/PutNullKey.java similarity index 100% rename from jdk/test/java/util/HashMap/PutNullKey.java rename to test/jdk/java/util/HashMap/PutNullKey.java diff --git a/jdk/test/java/util/HashMap/ReplaceExisting.java b/test/jdk/java/util/HashMap/ReplaceExisting.java similarity index 100% rename from jdk/test/java/util/HashMap/ReplaceExisting.java rename to test/jdk/java/util/HashMap/ReplaceExisting.java diff --git a/jdk/test/java/util/HashMap/SetValue.java b/test/jdk/java/util/HashMap/SetValue.java similarity index 100% rename from jdk/test/java/util/HashMap/SetValue.java rename to test/jdk/java/util/HashMap/SetValue.java diff --git a/jdk/test/java/util/HashMap/ToString.java b/test/jdk/java/util/HashMap/ToString.java similarity index 100% rename from jdk/test/java/util/HashMap/ToString.java rename to test/jdk/java/util/HashMap/ToString.java diff --git a/jdk/test/java/util/HashSet/Serialization.java b/test/jdk/java/util/HashSet/Serialization.java similarity index 100% rename from jdk/test/java/util/HashSet/Serialization.java rename to test/jdk/java/util/HashSet/Serialization.java diff --git a/jdk/test/java/util/Hashtable/DeserializedLength.java b/test/jdk/java/util/Hashtable/DeserializedLength.java similarity index 100% rename from jdk/test/java/util/Hashtable/DeserializedLength.java rename to test/jdk/java/util/Hashtable/DeserializedLength.java diff --git a/jdk/test/java/util/Hashtable/EqualsCast.java b/test/jdk/java/util/Hashtable/EqualsCast.java similarity index 100% rename from jdk/test/java/util/Hashtable/EqualsCast.java rename to test/jdk/java/util/Hashtable/EqualsCast.java diff --git a/jdk/test/java/util/Hashtable/HashCode.java b/test/jdk/java/util/Hashtable/HashCode.java similarity index 100% rename from jdk/test/java/util/Hashtable/HashCode.java rename to test/jdk/java/util/Hashtable/HashCode.java diff --git a/jdk/test/java/util/Hashtable/IllegalLoadFactor.java b/test/jdk/java/util/Hashtable/IllegalLoadFactor.java similarity index 100% rename from jdk/test/java/util/Hashtable/IllegalLoadFactor.java rename to test/jdk/java/util/Hashtable/IllegalLoadFactor.java diff --git a/jdk/test/java/util/Hashtable/ReadObject.java b/test/jdk/java/util/Hashtable/ReadObject.java similarity index 100% rename from jdk/test/java/util/Hashtable/ReadObject.java rename to test/jdk/java/util/Hashtable/ReadObject.java diff --git a/jdk/test/java/util/Hashtable/SelfRef.java b/test/jdk/java/util/Hashtable/SelfRef.java similarity index 100% rename from jdk/test/java/util/Hashtable/SelfRef.java rename to test/jdk/java/util/Hashtable/SelfRef.java diff --git a/jdk/test/java/util/Hashtable/SerializationDeadlock.java b/test/jdk/java/util/Hashtable/SerializationDeadlock.java similarity index 100% rename from jdk/test/java/util/Hashtable/SerializationDeadlock.java rename to test/jdk/java/util/Hashtable/SerializationDeadlock.java diff --git a/jdk/test/java/util/Hashtable/SimpleSerialization.java b/test/jdk/java/util/Hashtable/SimpleSerialization.java similarity index 100% rename from jdk/test/java/util/Hashtable/SimpleSerialization.java rename to test/jdk/java/util/Hashtable/SimpleSerialization.java diff --git a/jdk/test/java/util/IdentityHashMap/Capacity.java b/test/jdk/java/util/IdentityHashMap/Capacity.java similarity index 100% rename from jdk/test/java/util/IdentityHashMap/Capacity.java rename to test/jdk/java/util/IdentityHashMap/Capacity.java diff --git a/jdk/test/java/util/IdentityHashMap/DistinctEntrySetElements.java b/test/jdk/java/util/IdentityHashMap/DistinctEntrySetElements.java similarity index 100% rename from jdk/test/java/util/IdentityHashMap/DistinctEntrySetElements.java rename to test/jdk/java/util/IdentityHashMap/DistinctEntrySetElements.java diff --git a/jdk/test/java/util/IdentityHashMap/EntrySetIteratorRemoveInvalidatesEntry.java b/test/jdk/java/util/IdentityHashMap/EntrySetIteratorRemoveInvalidatesEntry.java similarity index 100% rename from jdk/test/java/util/IdentityHashMap/EntrySetIteratorRemoveInvalidatesEntry.java rename to test/jdk/java/util/IdentityHashMap/EntrySetIteratorRemoveInvalidatesEntry.java diff --git a/jdk/test/java/util/IdentityHashMap/ToArray.java b/test/jdk/java/util/IdentityHashMap/ToArray.java similarity index 100% rename from jdk/test/java/util/IdentityHashMap/ToArray.java rename to test/jdk/java/util/IdentityHashMap/ToArray.java diff --git a/jdk/test/java/util/IdentityHashMap/ToString.java b/test/jdk/java/util/IdentityHashMap/ToString.java similarity index 100% rename from jdk/test/java/util/IdentityHashMap/ToString.java rename to test/jdk/java/util/IdentityHashMap/ToString.java diff --git a/jdk/test/java/util/IllegalFormatException/Constructors.java b/test/jdk/java/util/IllegalFormatException/Constructors.java similarity index 100% rename from jdk/test/java/util/IllegalFormatException/Constructors.java rename to test/jdk/java/util/IllegalFormatException/Constructors.java diff --git a/jdk/test/java/util/Iterator/IteratorDefaults.java b/test/jdk/java/util/Iterator/IteratorDefaults.java similarity index 100% rename from jdk/test/java/util/Iterator/IteratorDefaults.java rename to test/jdk/java/util/Iterator/IteratorDefaults.java diff --git a/jdk/test/java/util/Iterator/PrimitiveIteratorDefaults.java b/test/jdk/java/util/Iterator/PrimitiveIteratorDefaults.java similarity index 100% rename from jdk/test/java/util/Iterator/PrimitiveIteratorDefaults.java rename to test/jdk/java/util/Iterator/PrimitiveIteratorDefaults.java diff --git a/jdk/test/java/util/LinkedHashMap/Basic.java b/test/jdk/java/util/LinkedHashMap/Basic.java similarity index 100% rename from jdk/test/java/util/LinkedHashMap/Basic.java rename to test/jdk/java/util/LinkedHashMap/Basic.java diff --git a/jdk/test/java/util/LinkedHashMap/Cache.java b/test/jdk/java/util/LinkedHashMap/Cache.java similarity index 100% rename from jdk/test/java/util/LinkedHashMap/Cache.java rename to test/jdk/java/util/LinkedHashMap/Cache.java diff --git a/jdk/test/java/util/LinkedHashMap/ComputeIfAbsentAccessOrder.java b/test/jdk/java/util/LinkedHashMap/ComputeIfAbsentAccessOrder.java similarity index 100% rename from jdk/test/java/util/LinkedHashMap/ComputeIfAbsentAccessOrder.java rename to test/jdk/java/util/LinkedHashMap/ComputeIfAbsentAccessOrder.java diff --git a/jdk/test/java/util/LinkedHashMap/EmptyMapIterator.java b/test/jdk/java/util/LinkedHashMap/EmptyMapIterator.java similarity index 100% rename from jdk/test/java/util/LinkedHashMap/EmptyMapIterator.java rename to test/jdk/java/util/LinkedHashMap/EmptyMapIterator.java diff --git a/jdk/test/java/util/LinkedHashSet/Basic.java b/test/jdk/java/util/LinkedHashSet/Basic.java similarity index 100% rename from jdk/test/java/util/LinkedHashSet/Basic.java rename to test/jdk/java/util/LinkedHashSet/Basic.java diff --git a/jdk/test/java/util/LinkedList/AddAll.java b/test/jdk/java/util/LinkedList/AddAll.java similarity index 100% rename from jdk/test/java/util/LinkedList/AddAll.java rename to test/jdk/java/util/LinkedList/AddAll.java diff --git a/jdk/test/java/util/LinkedList/Clone.java b/test/jdk/java/util/LinkedList/Clone.java similarity index 100% rename from jdk/test/java/util/LinkedList/Clone.java rename to test/jdk/java/util/LinkedList/Clone.java diff --git a/jdk/test/java/util/LinkedList/ComodifiedRemove.java b/test/jdk/java/util/LinkedList/ComodifiedRemove.java similarity index 100% rename from jdk/test/java/util/LinkedList/ComodifiedRemove.java rename to test/jdk/java/util/LinkedList/ComodifiedRemove.java diff --git a/jdk/test/java/util/LinkedList/Remove.java b/test/jdk/java/util/LinkedList/Remove.java similarity index 100% rename from jdk/test/java/util/LinkedList/Remove.java rename to test/jdk/java/util/LinkedList/Remove.java diff --git a/jdk/test/java/util/List/ListDefaults.java b/test/jdk/java/util/List/ListDefaults.java similarity index 100% rename from jdk/test/java/util/List/ListDefaults.java rename to test/jdk/java/util/List/ListDefaults.java diff --git a/jdk/test/java/util/List/ListFactories.java b/test/jdk/java/util/List/ListFactories.java similarity index 100% rename from jdk/test/java/util/List/ListFactories.java rename to test/jdk/java/util/List/ListFactories.java diff --git a/jdk/test/java/util/List/LockStep.java b/test/jdk/java/util/List/LockStep.java similarity index 100% rename from jdk/test/java/util/List/LockStep.java rename to test/jdk/java/util/List/LockStep.java diff --git a/jdk/test/java/util/List/NestedSubList.java b/test/jdk/java/util/List/NestedSubList.java similarity index 100% rename from jdk/test/java/util/List/NestedSubList.java rename to test/jdk/java/util/List/NestedSubList.java diff --git a/jdk/test/java/util/List/SubList.java b/test/jdk/java/util/List/SubList.java similarity index 100% rename from jdk/test/java/util/List/SubList.java rename to test/jdk/java/util/List/SubList.java diff --git a/jdk/test/java/util/Locale/Bug4152725.java b/test/jdk/java/util/Locale/Bug4152725.java similarity index 100% rename from jdk/test/java/util/Locale/Bug4152725.java rename to test/jdk/java/util/Locale/Bug4152725.java diff --git a/jdk/test/java/util/Locale/Bug4175998Test.java b/test/jdk/java/util/Locale/Bug4175998Test.java similarity index 100% rename from jdk/test/java/util/Locale/Bug4175998Test.java rename to test/jdk/java/util/Locale/Bug4175998Test.java diff --git a/jdk/test/java/util/Locale/Bug4184873Test.java b/test/jdk/java/util/Locale/Bug4184873Test.java similarity index 100% rename from jdk/test/java/util/Locale/Bug4184873Test.java rename to test/jdk/java/util/Locale/Bug4184873Test.java diff --git a/jdk/test/java/util/Locale/Bug4184873_he b/test/jdk/java/util/Locale/Bug4184873_he similarity index 100% rename from jdk/test/java/util/Locale/Bug4184873_he rename to test/jdk/java/util/Locale/Bug4184873_he diff --git a/jdk/test/java/util/Locale/Bug4184873_id b/test/jdk/java/util/Locale/Bug4184873_id similarity index 100% rename from jdk/test/java/util/Locale/Bug4184873_id rename to test/jdk/java/util/Locale/Bug4184873_id diff --git a/jdk/test/java/util/Locale/Bug4184873_yi b/test/jdk/java/util/Locale/Bug4184873_yi similarity index 100% rename from jdk/test/java/util/Locale/Bug4184873_yi rename to test/jdk/java/util/Locale/Bug4184873_yi diff --git a/jdk/test/java/util/Locale/Bug4210525.java b/test/jdk/java/util/Locale/Bug4210525.java similarity index 100% rename from jdk/test/java/util/Locale/Bug4210525.java rename to test/jdk/java/util/Locale/Bug4210525.java diff --git a/jdk/test/java/util/Locale/Bug4316602.java b/test/jdk/java/util/Locale/Bug4316602.java similarity index 100% rename from jdk/test/java/util/Locale/Bug4316602.java rename to test/jdk/java/util/Locale/Bug4316602.java diff --git a/jdk/test/java/util/Locale/Bug4518797.java b/test/jdk/java/util/Locale/Bug4518797.java similarity index 100% rename from jdk/test/java/util/Locale/Bug4518797.java rename to test/jdk/java/util/Locale/Bug4518797.java diff --git a/jdk/test/java/util/Locale/Bug6989440.java b/test/jdk/java/util/Locale/Bug6989440.java similarity index 100% rename from jdk/test/java/util/Locale/Bug6989440.java rename to test/jdk/java/util/Locale/Bug6989440.java diff --git a/jdk/test/java/util/Locale/Bug7069824.java b/test/jdk/java/util/Locale/Bug7069824.java similarity index 100% rename from jdk/test/java/util/Locale/Bug7069824.java rename to test/jdk/java/util/Locale/Bug7069824.java diff --git a/jdk/test/java/util/Locale/Bug8001562.java b/test/jdk/java/util/Locale/Bug8001562.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8001562.java rename to test/jdk/java/util/Locale/Bug8001562.java diff --git a/jdk/test/java/util/Locale/Bug8004240.java b/test/jdk/java/util/Locale/Bug8004240.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8004240.java rename to test/jdk/java/util/Locale/Bug8004240.java diff --git a/jdk/test/java/util/Locale/Bug8008577.java b/test/jdk/java/util/Locale/Bug8008577.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8008577.java rename to test/jdk/java/util/Locale/Bug8008577.java diff --git a/jdk/test/java/util/Locale/Bug8025703.java b/test/jdk/java/util/Locale/Bug8025703.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8025703.java rename to test/jdk/java/util/Locale/Bug8025703.java diff --git a/jdk/test/java/util/Locale/Bug8026766.java b/test/jdk/java/util/Locale/Bug8026766.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8026766.java rename to test/jdk/java/util/Locale/Bug8026766.java diff --git a/jdk/test/java/util/Locale/Bug8032842.java b/test/jdk/java/util/Locale/Bug8032842.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8032842.java rename to test/jdk/java/util/Locale/Bug8032842.java diff --git a/jdk/test/java/util/Locale/Bug8035133.java b/test/jdk/java/util/Locale/Bug8035133.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8035133.java rename to test/jdk/java/util/Locale/Bug8035133.java diff --git a/jdk/test/java/util/Locale/Bug8040211.java b/test/jdk/java/util/Locale/Bug8040211.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8040211.java rename to test/jdk/java/util/Locale/Bug8040211.java diff --git a/jdk/test/java/util/Locale/Bug8071929.java b/test/jdk/java/util/Locale/Bug8071929.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8071929.java rename to test/jdk/java/util/Locale/Bug8071929.java diff --git a/jdk/test/java/util/Locale/Bug8135061.java b/test/jdk/java/util/Locale/Bug8135061.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8135061.java rename to test/jdk/java/util/Locale/Bug8135061.java diff --git a/jdk/test/java/util/Locale/Bug8154797.java b/test/jdk/java/util/Locale/Bug8154797.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8154797.java rename to test/jdk/java/util/Locale/Bug8154797.java diff --git a/jdk/test/java/util/Locale/Bug8159420.java b/test/jdk/java/util/Locale/Bug8159420.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8159420.java rename to test/jdk/java/util/Locale/Bug8159420.java diff --git a/jdk/test/java/util/Locale/Bug8166994.java b/test/jdk/java/util/Locale/Bug8166994.java similarity index 100% rename from jdk/test/java/util/Locale/Bug8166994.java rename to test/jdk/java/util/Locale/Bug8166994.java diff --git a/jdk/test/java/util/Locale/ExtensionsTest.java b/test/jdk/java/util/Locale/ExtensionsTest.java similarity index 100% rename from jdk/test/java/util/Locale/ExtensionsTest.java rename to test/jdk/java/util/Locale/ExtensionsTest.java diff --git a/jdk/test/java/util/Locale/GenerateKeyList.java b/test/jdk/java/util/Locale/GenerateKeyList.java similarity index 100% rename from jdk/test/java/util/Locale/GenerateKeyList.java rename to test/jdk/java/util/Locale/GenerateKeyList.java diff --git a/jdk/test/java/util/Locale/HashCodeTest.java b/test/jdk/java/util/Locale/HashCodeTest.java similarity index 100% rename from jdk/test/java/util/Locale/HashCodeTest.java rename to test/jdk/java/util/Locale/HashCodeTest.java diff --git a/jdk/test/java/util/Locale/InternationalBAT.java b/test/jdk/java/util/Locale/InternationalBAT.java similarity index 100% rename from jdk/test/java/util/Locale/InternationalBAT.java rename to test/jdk/java/util/Locale/InternationalBAT.java diff --git a/jdk/test/java/util/Locale/LocaleCategory.java b/test/jdk/java/util/Locale/LocaleCategory.java similarity index 100% rename from jdk/test/java/util/Locale/LocaleCategory.java rename to test/jdk/java/util/Locale/LocaleCategory.java diff --git a/jdk/test/java/util/Locale/LocaleCategory.sh b/test/jdk/java/util/Locale/LocaleCategory.sh similarity index 100% rename from jdk/test/java/util/Locale/LocaleCategory.sh rename to test/jdk/java/util/Locale/LocaleCategory.sh diff --git a/jdk/test/java/util/Locale/LocaleEnhanceTest.java b/test/jdk/java/util/Locale/LocaleEnhanceTest.java similarity index 100% rename from jdk/test/java/util/Locale/LocaleEnhanceTest.java rename to test/jdk/java/util/Locale/LocaleEnhanceTest.java diff --git a/jdk/test/java/util/Locale/LocaleProviders.java b/test/jdk/java/util/Locale/LocaleProviders.java similarity index 100% rename from jdk/test/java/util/Locale/LocaleProviders.java rename to test/jdk/java/util/Locale/LocaleProviders.java diff --git a/jdk/test/java/util/Locale/LocaleProviders.sh b/test/jdk/java/util/Locale/LocaleProviders.sh similarity index 100% rename from jdk/test/java/util/Locale/LocaleProviders.sh rename to test/jdk/java/util/Locale/LocaleProviders.sh diff --git a/jdk/test/java/util/Locale/LocaleTest.java b/test/jdk/java/util/Locale/LocaleTest.java similarity index 100% rename from jdk/test/java/util/Locale/LocaleTest.java rename to test/jdk/java/util/Locale/LocaleTest.java diff --git a/jdk/test/java/util/Locale/PrintDefaultLocale.java b/test/jdk/java/util/Locale/PrintDefaultLocale.java similarity index 100% rename from jdk/test/java/util/Locale/PrintDefaultLocale.java rename to test/jdk/java/util/Locale/PrintDefaultLocale.java diff --git a/jdk/test/java/util/Locale/ThaiGov.java b/test/jdk/java/util/Locale/ThaiGov.java similarity index 100% rename from jdk/test/java/util/Locale/ThaiGov.java rename to test/jdk/java/util/Locale/ThaiGov.java diff --git a/jdk/test/java/util/Locale/bug4122700.java b/test/jdk/java/util/Locale/bug4122700.java similarity index 100% rename from jdk/test/java/util/Locale/bug4122700.java rename to test/jdk/java/util/Locale/bug4122700.java diff --git a/jdk/test/java/util/Locale/bug4123285.html b/test/jdk/java/util/Locale/bug4123285.html similarity index 100% rename from jdk/test/java/util/Locale/bug4123285.html rename to test/jdk/java/util/Locale/bug4123285.html diff --git a/jdk/test/java/util/Locale/bug4123285.java b/test/jdk/java/util/Locale/bug4123285.java similarity index 100% rename from jdk/test/java/util/Locale/bug4123285.java rename to test/jdk/java/util/Locale/bug4123285.java diff --git a/jdk/test/java/util/Locale/bug6277243.java b/test/jdk/java/util/Locale/bug6277243.java similarity index 100% rename from jdk/test/java/util/Locale/bug6277243.java rename to test/jdk/java/util/Locale/bug6277243.java diff --git a/jdk/test/java/util/Locale/bug6312358.java b/test/jdk/java/util/Locale/bug6312358.java similarity index 100% rename from jdk/test/java/util/Locale/bug6312358.java rename to test/jdk/java/util/Locale/bug6312358.java diff --git a/jdk/test/java/util/Locale/data/deflocale.c b/test/jdk/java/util/Locale/data/deflocale.c similarity index 100% rename from jdk/test/java/util/Locale/data/deflocale.c rename to test/jdk/java/util/Locale/data/deflocale.c diff --git a/jdk/test/java/util/Locale/data/deflocale.input b/test/jdk/java/util/Locale/data/deflocale.input similarity index 100% rename from jdk/test/java/util/Locale/data/deflocale.input rename to test/jdk/java/util/Locale/data/deflocale.input diff --git a/jdk/test/java/util/Locale/data/deflocale.rhel5 b/test/jdk/java/util/Locale/data/deflocale.rhel5 similarity index 100% rename from jdk/test/java/util/Locale/data/deflocale.rhel5 rename to test/jdk/java/util/Locale/data/deflocale.rhel5 diff --git a/jdk/test/java/util/Locale/data/deflocale.rhel5.fmtasdefault b/test/jdk/java/util/Locale/data/deflocale.rhel5.fmtasdefault similarity index 100% rename from jdk/test/java/util/Locale/data/deflocale.rhel5.fmtasdefault rename to test/jdk/java/util/Locale/data/deflocale.rhel5.fmtasdefault diff --git a/jdk/test/java/util/Locale/data/deflocale.sh b/test/jdk/java/util/Locale/data/deflocale.sh similarity index 100% rename from jdk/test/java/util/Locale/data/deflocale.sh rename to test/jdk/java/util/Locale/data/deflocale.sh diff --git a/jdk/test/java/util/Locale/data/deflocale.sol10 b/test/jdk/java/util/Locale/data/deflocale.sol10 similarity index 100% rename from jdk/test/java/util/Locale/data/deflocale.sol10 rename to test/jdk/java/util/Locale/data/deflocale.sol10 diff --git a/jdk/test/java/util/Locale/data/deflocale.sol10.fmtasdefault b/test/jdk/java/util/Locale/data/deflocale.sol10.fmtasdefault similarity index 100% rename from jdk/test/java/util/Locale/data/deflocale.sol10.fmtasdefault rename to test/jdk/java/util/Locale/data/deflocale.sol10.fmtasdefault diff --git a/jdk/test/java/util/Locale/data/deflocale.win7 b/test/jdk/java/util/Locale/data/deflocale.win7 similarity index 100% rename from jdk/test/java/util/Locale/data/deflocale.win7 rename to test/jdk/java/util/Locale/data/deflocale.win7 diff --git a/jdk/test/java/util/Locale/data/deflocale.win7.fmtasdefault b/test/jdk/java/util/Locale/data/deflocale.win7.fmtasdefault similarity index 100% rename from jdk/test/java/util/Locale/data/deflocale.win7.fmtasdefault rename to test/jdk/java/util/Locale/data/deflocale.win7.fmtasdefault diff --git a/jdk/test/java/util/Locale/icuLocales.txt b/test/jdk/java/util/Locale/icuLocales.txt similarity index 100% rename from jdk/test/java/util/Locale/icuLocales.txt rename to test/jdk/java/util/Locale/icuLocales.txt diff --git a/jdk/test/java/util/Locale/serialized/java6locale_ROOT b/test/jdk/java/util/Locale/serialized/java6locale_ROOT similarity index 100% rename from jdk/test/java/util/Locale/serialized/java6locale_ROOT rename to test/jdk/java/util/Locale/serialized/java6locale_ROOT diff --git a/jdk/test/java/util/Locale/serialized/java6locale__US b/test/jdk/java/util/Locale/serialized/java6locale__US similarity index 100% rename from jdk/test/java/util/Locale/serialized/java6locale__US rename to test/jdk/java/util/Locale/serialized/java6locale__US diff --git a/jdk/test/java/util/Locale/serialized/java6locale___Java b/test/jdk/java/util/Locale/serialized/java6locale___Java similarity index 100% rename from jdk/test/java/util/Locale/serialized/java6locale___Java rename to test/jdk/java/util/Locale/serialized/java6locale___Java diff --git a/jdk/test/java/util/Locale/serialized/java6locale_en b/test/jdk/java/util/Locale/serialized/java6locale_en similarity index 100% rename from jdk/test/java/util/Locale/serialized/java6locale_en rename to test/jdk/java/util/Locale/serialized/java6locale_en diff --git a/jdk/test/java/util/Locale/serialized/java6locale_en_US b/test/jdk/java/util/Locale/serialized/java6locale_en_US similarity index 100% rename from jdk/test/java/util/Locale/serialized/java6locale_en_US rename to test/jdk/java/util/Locale/serialized/java6locale_en_US diff --git a/jdk/test/java/util/Locale/serialized/java6locale_en_US_Java b/test/jdk/java/util/Locale/serialized/java6locale_en_US_Java similarity index 100% rename from jdk/test/java/util/Locale/serialized/java6locale_en_US_Java rename to test/jdk/java/util/Locale/serialized/java6locale_en_US_Java diff --git a/jdk/test/java/util/Locale/serialized/java6locale_iw_IL b/test/jdk/java/util/Locale/serialized/java6locale_iw_IL similarity index 100% rename from jdk/test/java/util/Locale/serialized/java6locale_iw_IL rename to test/jdk/java/util/Locale/serialized/java6locale_iw_IL diff --git a/jdk/test/java/util/Locale/serialized/java6locale_ja_JP_JP b/test/jdk/java/util/Locale/serialized/java6locale_ja_JP_JP similarity index 100% rename from jdk/test/java/util/Locale/serialized/java6locale_ja_JP_JP rename to test/jdk/java/util/Locale/serialized/java6locale_ja_JP_JP diff --git a/jdk/test/java/util/Locale/serialized/java6locale_no_NO_NY b/test/jdk/java/util/Locale/serialized/java6locale_no_NO_NY similarity index 100% rename from jdk/test/java/util/Locale/serialized/java6locale_no_NO_NY rename to test/jdk/java/util/Locale/serialized/java6locale_no_NO_NY diff --git a/jdk/test/java/util/Locale/serialized/java6locale_th_TH_TH b/test/jdk/java/util/Locale/serialized/java6locale_th_TH_TH similarity index 100% rename from jdk/test/java/util/Locale/serialized/java6locale_th_TH_TH rename to test/jdk/java/util/Locale/serialized/java6locale_th_TH_TH diff --git a/jdk/test/java/util/Map/BasicSerialization.java b/test/jdk/java/util/Map/BasicSerialization.java similarity index 100% rename from jdk/test/java/util/Map/BasicSerialization.java rename to test/jdk/java/util/Map/BasicSerialization.java diff --git a/jdk/test/java/util/Map/Collisions.java b/test/jdk/java/util/Map/Collisions.java similarity index 100% rename from jdk/test/java/util/Map/Collisions.java rename to test/jdk/java/util/Map/Collisions.java diff --git a/jdk/test/java/util/Map/Defaults.java b/test/jdk/java/util/Map/Defaults.java similarity index 100% rename from jdk/test/java/util/Map/Defaults.java rename to test/jdk/java/util/Map/Defaults.java diff --git a/jdk/test/java/util/Map/EntryComparators.java b/test/jdk/java/util/Map/EntryComparators.java similarity index 100% rename from jdk/test/java/util/Map/EntryComparators.java rename to test/jdk/java/util/Map/EntryComparators.java diff --git a/jdk/test/java/util/Map/EntryHashCode.java b/test/jdk/java/util/Map/EntryHashCode.java similarity index 100% rename from jdk/test/java/util/Map/EntryHashCode.java rename to test/jdk/java/util/Map/EntryHashCode.java diff --git a/jdk/test/java/util/Map/EntrySetIterator.java b/test/jdk/java/util/Map/EntrySetIterator.java similarity index 100% rename from jdk/test/java/util/Map/EntrySetIterator.java rename to test/jdk/java/util/Map/EntrySetIterator.java diff --git a/jdk/test/java/util/Map/FunctionalCMEs.java b/test/jdk/java/util/Map/FunctionalCMEs.java similarity index 100% rename from jdk/test/java/util/Map/FunctionalCMEs.java rename to test/jdk/java/util/Map/FunctionalCMEs.java diff --git a/jdk/test/java/util/Map/Get.java b/test/jdk/java/util/Map/Get.java similarity index 100% rename from jdk/test/java/util/Map/Get.java rename to test/jdk/java/util/Map/Get.java diff --git a/jdk/test/java/util/Map/InPlaceOpsCollisions.java b/test/jdk/java/util/Map/InPlaceOpsCollisions.java similarity index 100% rename from jdk/test/java/util/Map/InPlaceOpsCollisions.java rename to test/jdk/java/util/Map/InPlaceOpsCollisions.java diff --git a/jdk/test/java/util/Map/LockStep.java b/test/jdk/java/util/Map/LockStep.java similarity index 100% rename from jdk/test/java/util/Map/LockStep.java rename to test/jdk/java/util/Map/LockStep.java diff --git a/jdk/test/java/util/Map/MapBinToFromTreeTest.java b/test/jdk/java/util/Map/MapBinToFromTreeTest.java similarity index 100% rename from jdk/test/java/util/Map/MapBinToFromTreeTest.java rename to test/jdk/java/util/Map/MapBinToFromTreeTest.java diff --git a/jdk/test/java/util/Map/MapFactories.java b/test/jdk/java/util/Map/MapFactories.java similarity index 100% rename from jdk/test/java/util/Map/MapFactories.java rename to test/jdk/java/util/Map/MapFactories.java diff --git a/jdk/test/java/util/Map/MapWithCollisionsProviders.java b/test/jdk/java/util/Map/MapWithCollisionsProviders.java similarity index 100% rename from jdk/test/java/util/Map/MapWithCollisionsProviders.java rename to test/jdk/java/util/Map/MapWithCollisionsProviders.java diff --git a/jdk/test/java/util/Map/ToArray.java b/test/jdk/java/util/Map/ToArray.java similarity index 100% rename from jdk/test/java/util/Map/ToArray.java rename to test/jdk/java/util/Map/ToArray.java diff --git a/jdk/test/java/util/MissingFormatArgumentException/GetFormatSpecifier.java b/test/jdk/java/util/MissingFormatArgumentException/GetFormatSpecifier.java similarity index 100% rename from jdk/test/java/util/MissingFormatArgumentException/GetFormatSpecifier.java rename to test/jdk/java/util/MissingFormatArgumentException/GetFormatSpecifier.java diff --git a/jdk/test/java/util/NavigableMap/LockStep.java b/test/jdk/java/util/NavigableMap/LockStep.java similarity index 100% rename from jdk/test/java/util/NavigableMap/LockStep.java rename to test/jdk/java/util/NavigableMap/LockStep.java diff --git a/jdk/test/java/util/Objects/BasicObjectsTest.java b/test/jdk/java/util/Objects/BasicObjectsTest.java similarity index 100% rename from jdk/test/java/util/Objects/BasicObjectsTest.java rename to test/jdk/java/util/Objects/BasicObjectsTest.java diff --git a/jdk/test/java/util/Objects/CheckIndex.java b/test/jdk/java/util/Objects/CheckIndex.java similarity index 100% rename from jdk/test/java/util/Objects/CheckIndex.java rename to test/jdk/java/util/Objects/CheckIndex.java diff --git a/jdk/test/java/util/Observable/ClearChanged.java b/test/jdk/java/util/Observable/ClearChanged.java similarity index 100% rename from jdk/test/java/util/Observable/ClearChanged.java rename to test/jdk/java/util/Observable/ClearChanged.java diff --git a/jdk/test/java/util/Optional/Basic.java b/test/jdk/java/util/Optional/Basic.java similarity index 100% rename from jdk/test/java/util/Optional/Basic.java rename to test/jdk/java/util/Optional/Basic.java diff --git a/jdk/test/java/util/Optional/BasicDouble.java b/test/jdk/java/util/Optional/BasicDouble.java similarity index 100% rename from jdk/test/java/util/Optional/BasicDouble.java rename to test/jdk/java/util/Optional/BasicDouble.java diff --git a/jdk/test/java/util/Optional/BasicInt.java b/test/jdk/java/util/Optional/BasicInt.java similarity index 100% rename from jdk/test/java/util/Optional/BasicInt.java rename to test/jdk/java/util/Optional/BasicInt.java diff --git a/jdk/test/java/util/Optional/BasicLong.java b/test/jdk/java/util/Optional/BasicLong.java similarity index 100% rename from jdk/test/java/util/Optional/BasicLong.java rename to test/jdk/java/util/Optional/BasicLong.java diff --git a/jdk/test/java/util/PluggableLocale/BreakIteratorProviderTest.java b/test/jdk/java/util/PluggableLocale/BreakIteratorProviderTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/BreakIteratorProviderTest.java rename to test/jdk/java/util/PluggableLocale/BreakIteratorProviderTest.java diff --git a/jdk/test/java/util/PluggableLocale/BreakIteratorProviderTest.sh b/test/jdk/java/util/PluggableLocale/BreakIteratorProviderTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/BreakIteratorProviderTest.sh rename to test/jdk/java/util/PluggableLocale/BreakIteratorProviderTest.sh diff --git a/jdk/test/java/util/PluggableLocale/CalendarDataProviderTest.java b/test/jdk/java/util/PluggableLocale/CalendarDataProviderTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/CalendarDataProviderTest.java rename to test/jdk/java/util/PluggableLocale/CalendarDataProviderTest.java diff --git a/jdk/test/java/util/PluggableLocale/CalendarDataProviderTest.sh b/test/jdk/java/util/PluggableLocale/CalendarDataProviderTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/CalendarDataProviderTest.sh rename to test/jdk/java/util/PluggableLocale/CalendarDataProviderTest.sh diff --git a/jdk/test/java/util/PluggableLocale/CalendarNameProviderTest.java b/test/jdk/java/util/PluggableLocale/CalendarNameProviderTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/CalendarNameProviderTest.java rename to test/jdk/java/util/PluggableLocale/CalendarNameProviderTest.java diff --git a/jdk/test/java/util/PluggableLocale/CalendarNameProviderTest.sh b/test/jdk/java/util/PluggableLocale/CalendarNameProviderTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/CalendarNameProviderTest.sh rename to test/jdk/java/util/PluggableLocale/CalendarNameProviderTest.sh diff --git a/jdk/test/java/util/PluggableLocale/ClasspathTest.java b/test/jdk/java/util/PluggableLocale/ClasspathTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/ClasspathTest.java rename to test/jdk/java/util/PluggableLocale/ClasspathTest.java diff --git a/jdk/test/java/util/PluggableLocale/ClasspathTest.sh b/test/jdk/java/util/PluggableLocale/ClasspathTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/ClasspathTest.sh rename to test/jdk/java/util/PluggableLocale/ClasspathTest.sh diff --git a/jdk/test/java/util/PluggableLocale/CollatorProviderTest.java b/test/jdk/java/util/PluggableLocale/CollatorProviderTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/CollatorProviderTest.java rename to test/jdk/java/util/PluggableLocale/CollatorProviderTest.java diff --git a/jdk/test/java/util/PluggableLocale/CollatorProviderTest.sh b/test/jdk/java/util/PluggableLocale/CollatorProviderTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/CollatorProviderTest.sh rename to test/jdk/java/util/PluggableLocale/CollatorProviderTest.sh diff --git a/jdk/test/java/util/PluggableLocale/CurrencyNameProviderTest.java b/test/jdk/java/util/PluggableLocale/CurrencyNameProviderTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/CurrencyNameProviderTest.java rename to test/jdk/java/util/PluggableLocale/CurrencyNameProviderTest.java diff --git a/jdk/test/java/util/PluggableLocale/CurrencyNameProviderTest.sh b/test/jdk/java/util/PluggableLocale/CurrencyNameProviderTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/CurrencyNameProviderTest.sh rename to test/jdk/java/util/PluggableLocale/CurrencyNameProviderTest.sh diff --git a/jdk/test/java/util/PluggableLocale/DateFormatProviderTest.java b/test/jdk/java/util/PluggableLocale/DateFormatProviderTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/DateFormatProviderTest.java rename to test/jdk/java/util/PluggableLocale/DateFormatProviderTest.java diff --git a/jdk/test/java/util/PluggableLocale/DateFormatProviderTest.sh b/test/jdk/java/util/PluggableLocale/DateFormatProviderTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/DateFormatProviderTest.sh rename to test/jdk/java/util/PluggableLocale/DateFormatProviderTest.sh diff --git a/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java b/test/jdk/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java rename to test/jdk/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java diff --git a/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh b/test/jdk/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh rename to test/jdk/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh diff --git a/jdk/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java b/test/jdk/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java rename to test/jdk/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java diff --git a/jdk/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.sh b/test/jdk/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.sh rename to test/jdk/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.sh diff --git a/jdk/test/java/util/PluggableLocale/ExecTest.sh b/test/jdk/java/util/PluggableLocale/ExecTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/ExecTest.sh rename to test/jdk/java/util/PluggableLocale/ExecTest.sh diff --git a/jdk/test/java/util/PluggableLocale/GenericTest.java b/test/jdk/java/util/PluggableLocale/GenericTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/GenericTest.java rename to test/jdk/java/util/PluggableLocale/GenericTest.java diff --git a/jdk/test/java/util/PluggableLocale/GenericTest.sh b/test/jdk/java/util/PluggableLocale/GenericTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/GenericTest.sh rename to test/jdk/java/util/PluggableLocale/GenericTest.sh diff --git a/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.java b/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.java rename to test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java diff --git a/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.sh b/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.sh rename to test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.sh diff --git a/jdk/test/java/util/PluggableLocale/NumberFormatProviderTest.java b/test/jdk/java/util/PluggableLocale/NumberFormatProviderTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/NumberFormatProviderTest.java rename to test/jdk/java/util/PluggableLocale/NumberFormatProviderTest.java diff --git a/jdk/test/java/util/PluggableLocale/NumberFormatProviderTest.sh b/test/jdk/java/util/PluggableLocale/NumberFormatProviderTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/NumberFormatProviderTest.sh rename to test/jdk/java/util/PluggableLocale/NumberFormatProviderTest.sh diff --git a/jdk/test/java/util/PluggableLocale/PermissionTest.java b/test/jdk/java/util/PluggableLocale/PermissionTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/PermissionTest.java rename to test/jdk/java/util/PluggableLocale/PermissionTest.java diff --git a/jdk/test/java/util/PluggableLocale/PermissionTest.sh b/test/jdk/java/util/PluggableLocale/PermissionTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/PermissionTest.sh rename to test/jdk/java/util/PluggableLocale/PermissionTest.sh diff --git a/jdk/test/java/util/PluggableLocale/ProviderTest.java b/test/jdk/java/util/PluggableLocale/ProviderTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/ProviderTest.java rename to test/jdk/java/util/PluggableLocale/ProviderTest.java diff --git a/jdk/test/java/util/PluggableLocale/SupportedLocalesTest.java b/test/jdk/java/util/PluggableLocale/SupportedLocalesTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/SupportedLocalesTest.java rename to test/jdk/java/util/PluggableLocale/SupportedLocalesTest.java diff --git a/jdk/test/java/util/PluggableLocale/TimeZoneNameProviderTest.java b/test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/TimeZoneNameProviderTest.java rename to test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.java diff --git a/jdk/test/java/util/PluggableLocale/TimeZoneNameProviderTest.sh b/test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.sh similarity index 100% rename from jdk/test/java/util/PluggableLocale/TimeZoneNameProviderTest.sh rename to test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.sh diff --git a/jdk/test/java/util/PluggableLocale/barprovider.jar b/test/jdk/java/util/PluggableLocale/barprovider.jar similarity index 100% rename from jdk/test/java/util/PluggableLocale/barprovider.jar rename to test/jdk/java/util/PluggableLocale/barprovider.jar diff --git a/jdk/test/java/util/PluggableLocale/fooprovider.jar b/test/jdk/java/util/PluggableLocale/fooprovider.jar similarity index 100% rename from jdk/test/java/util/PluggableLocale/fooprovider.jar rename to test/jdk/java/util/PluggableLocale/fooprovider.jar diff --git a/jdk/test/java/util/PluggableLocale/localeServiceProvider.policy b/test/jdk/java/util/PluggableLocale/localeServiceProvider.policy similarity index 100% rename from jdk/test/java/util/PluggableLocale/localeServiceProvider.policy rename to test/jdk/java/util/PluggableLocale/localeServiceProvider.policy diff --git a/jdk/test/java/util/PluggableLocale/providersrc/BreakIteratorProviderImpl.java b/test/jdk/java/util/PluggableLocale/providersrc/BreakIteratorProviderImpl.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/BreakIteratorProviderImpl.java rename to test/jdk/java/util/PluggableLocale/providersrc/BreakIteratorProviderImpl.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/CalendarDataProviderImpl.java b/test/jdk/java/util/PluggableLocale/providersrc/CalendarDataProviderImpl.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/CalendarDataProviderImpl.java rename to test/jdk/java/util/PluggableLocale/providersrc/CalendarDataProviderImpl.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/CalendarNameProviderImpl.java b/test/jdk/java/util/PluggableLocale/providersrc/CalendarNameProviderImpl.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/CalendarNameProviderImpl.java rename to test/jdk/java/util/PluggableLocale/providersrc/CalendarNameProviderImpl.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/CollatorProviderImpl.java b/test/jdk/java/util/PluggableLocale/providersrc/CollatorProviderImpl.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/CollatorProviderImpl.java rename to test/jdk/java/util/PluggableLocale/providersrc/CollatorProviderImpl.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl.java b/test/jdk/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl.java rename to test/jdk/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl2.java b/test/jdk/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl2.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl2.java rename to test/jdk/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl2.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/DateFormatProviderImpl.java b/test/jdk/java/util/PluggableLocale/providersrc/DateFormatProviderImpl.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/DateFormatProviderImpl.java rename to test/jdk/java/util/PluggableLocale/providersrc/DateFormatProviderImpl.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java b/test/jdk/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java rename to test/jdk/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/DecimalFormatSymbolsProviderImpl.java b/test/jdk/java/util/PluggableLocale/providersrc/DecimalFormatSymbolsProviderImpl.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/DecimalFormatSymbolsProviderImpl.java rename to test/jdk/java/util/PluggableLocale/providersrc/DecimalFormatSymbolsProviderImpl.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/FooDateFormat.java b/test/jdk/java/util/PluggableLocale/providersrc/FooDateFormat.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/FooDateFormat.java rename to test/jdk/java/util/PluggableLocale/providersrc/FooDateFormat.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/FooNumberFormat.java b/test/jdk/java/util/PluggableLocale/providersrc/FooNumberFormat.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/FooNumberFormat.java rename to test/jdk/java/util/PluggableLocale/providersrc/FooNumberFormat.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/GenericTimeZoneNameProviderImpl.java b/test/jdk/java/util/PluggableLocale/providersrc/GenericTimeZoneNameProviderImpl.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/GenericTimeZoneNameProviderImpl.java rename to test/jdk/java/util/PluggableLocale/providersrc/GenericTimeZoneNameProviderImpl.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/LocaleNameProviderImpl.java b/test/jdk/java/util/PluggableLocale/providersrc/LocaleNameProviderImpl.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/LocaleNameProviderImpl.java rename to test/jdk/java/util/PluggableLocale/providersrc/LocaleNameProviderImpl.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/LocaleNames.properties b/test/jdk/java/util/PluggableLocale/providersrc/LocaleNames.properties similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/LocaleNames.properties rename to test/jdk/java/util/PluggableLocale/providersrc/LocaleNames.properties diff --git a/jdk/test/java/util/PluggableLocale/providersrc/LocaleNames_ja.properties b/test/jdk/java/util/PluggableLocale/providersrc/LocaleNames_ja.properties similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/LocaleNames_ja.properties rename to test/jdk/java/util/PluggableLocale/providersrc/LocaleNames_ja.properties diff --git a/jdk/test/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_kyoto.properties b/test/jdk/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_kyoto.properties similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_kyoto.properties rename to test/jdk/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_kyoto.properties diff --git a/jdk/test/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_osaka.properties b/test/jdk/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_osaka.properties similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_osaka.properties rename to test/jdk/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_osaka.properties diff --git a/jdk/test/java/util/PluggableLocale/providersrc/LocaleNames_xx.properties b/test/jdk/java/util/PluggableLocale/providersrc/LocaleNames_xx.properties similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/LocaleNames_xx.properties rename to test/jdk/java/util/PluggableLocale/providersrc/LocaleNames_xx.properties diff --git a/jdk/test/java/util/PluggableLocale/providersrc/Makefile b/test/jdk/java/util/PluggableLocale/providersrc/Makefile similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/Makefile rename to test/jdk/java/util/PluggableLocale/providersrc/Makefile diff --git a/jdk/test/java/util/PluggableLocale/providersrc/NumberFormatProviderImpl.java b/test/jdk/java/util/PluggableLocale/providersrc/NumberFormatProviderImpl.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/NumberFormatProviderImpl.java rename to test/jdk/java/util/PluggableLocale/providersrc/NumberFormatProviderImpl.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/TimeZoneNameProviderImpl.java b/test/jdk/java/util/PluggableLocale/providersrc/TimeZoneNameProviderImpl.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/TimeZoneNameProviderImpl.java rename to test/jdk/java/util/PluggableLocale/providersrc/TimeZoneNameProviderImpl.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/Utils.java b/test/jdk/java/util/PluggableLocale/providersrc/Utils.java similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/Utils.java rename to test/jdk/java/util/PluggableLocale/providersrc/Utils.java diff --git a/jdk/test/java/util/PluggableLocale/providersrc/java.text.spi.BreakIteratorProvider b/test/jdk/java/util/PluggableLocale/providersrc/java.text.spi.BreakIteratorProvider similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/java.text.spi.BreakIteratorProvider rename to test/jdk/java/util/PluggableLocale/providersrc/java.text.spi.BreakIteratorProvider diff --git a/jdk/test/java/util/PluggableLocale/providersrc/java.text.spi.CollatorProvider b/test/jdk/java/util/PluggableLocale/providersrc/java.text.spi.CollatorProvider similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/java.text.spi.CollatorProvider rename to test/jdk/java/util/PluggableLocale/providersrc/java.text.spi.CollatorProvider diff --git a/jdk/test/java/util/PluggableLocale/providersrc/java.text.spi.DateFormatProvider b/test/jdk/java/util/PluggableLocale/providersrc/java.text.spi.DateFormatProvider similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/java.text.spi.DateFormatProvider rename to test/jdk/java/util/PluggableLocale/providersrc/java.text.spi.DateFormatProvider diff --git a/jdk/test/java/util/PluggableLocale/providersrc/java.text.spi.DateFormatSymbolsProvider b/test/jdk/java/util/PluggableLocale/providersrc/java.text.spi.DateFormatSymbolsProvider similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/java.text.spi.DateFormatSymbolsProvider rename to test/jdk/java/util/PluggableLocale/providersrc/java.text.spi.DateFormatSymbolsProvider diff --git a/jdk/test/java/util/PluggableLocale/providersrc/java.text.spi.DecimalFormatSymbolsProvider b/test/jdk/java/util/PluggableLocale/providersrc/java.text.spi.DecimalFormatSymbolsProvider similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/java.text.spi.DecimalFormatSymbolsProvider rename to test/jdk/java/util/PluggableLocale/providersrc/java.text.spi.DecimalFormatSymbolsProvider diff --git a/jdk/test/java/util/PluggableLocale/providersrc/java.text.spi.NumberFormatProvider b/test/jdk/java/util/PluggableLocale/providersrc/java.text.spi.NumberFormatProvider similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/java.text.spi.NumberFormatProvider rename to test/jdk/java/util/PluggableLocale/providersrc/java.text.spi.NumberFormatProvider diff --git a/jdk/test/java/util/PluggableLocale/providersrc/java.util.spi.CalendarDataProvider b/test/jdk/java/util/PluggableLocale/providersrc/java.util.spi.CalendarDataProvider similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/java.util.spi.CalendarDataProvider rename to test/jdk/java/util/PluggableLocale/providersrc/java.util.spi.CalendarDataProvider diff --git a/jdk/test/java/util/PluggableLocale/providersrc/java.util.spi.CalendarNameProvider b/test/jdk/java/util/PluggableLocale/providersrc/java.util.spi.CalendarNameProvider similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/java.util.spi.CalendarNameProvider rename to test/jdk/java/util/PluggableLocale/providersrc/java.util.spi.CalendarNameProvider diff --git a/jdk/test/java/util/PluggableLocale/providersrc/java.util.spi.CurrencyNameProvider b/test/jdk/java/util/PluggableLocale/providersrc/java.util.spi.CurrencyNameProvider similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/java.util.spi.CurrencyNameProvider rename to test/jdk/java/util/PluggableLocale/providersrc/java.util.spi.CurrencyNameProvider diff --git a/jdk/test/java/util/PluggableLocale/providersrc/java.util.spi.LocaleNameProvider b/test/jdk/java/util/PluggableLocale/providersrc/java.util.spi.LocaleNameProvider similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/java.util.spi.LocaleNameProvider rename to test/jdk/java/util/PluggableLocale/providersrc/java.util.spi.LocaleNameProvider diff --git a/jdk/test/java/util/PluggableLocale/providersrc/java.util.spi.TimeZoneNameProvider b/test/jdk/java/util/PluggableLocale/providersrc/java.util.spi.TimeZoneNameProvider similarity index 100% rename from jdk/test/java/util/PluggableLocale/providersrc/java.util.spi.TimeZoneNameProvider rename to test/jdk/java/util/PluggableLocale/providersrc/java.util.spi.TimeZoneNameProvider diff --git a/jdk/test/java/util/PriorityQueue/AddNonComparable.java b/test/jdk/java/util/PriorityQueue/AddNonComparable.java similarity index 100% rename from jdk/test/java/util/PriorityQueue/AddNonComparable.java rename to test/jdk/java/util/PriorityQueue/AddNonComparable.java diff --git a/jdk/test/java/util/PriorityQueue/ForgetMeNot.java b/test/jdk/java/util/PriorityQueue/ForgetMeNot.java similarity index 100% rename from jdk/test/java/util/PriorityQueue/ForgetMeNot.java rename to test/jdk/java/util/PriorityQueue/ForgetMeNot.java diff --git a/jdk/test/java/util/PriorityQueue/NoNulls.java b/test/jdk/java/util/PriorityQueue/NoNulls.java similarity index 100% rename from jdk/test/java/util/PriorityQueue/NoNulls.java rename to test/jdk/java/util/PriorityQueue/NoNulls.java diff --git a/jdk/test/java/util/PriorityQueue/PriorityQueueSort.java b/test/jdk/java/util/PriorityQueue/PriorityQueueSort.java similarity index 100% rename from jdk/test/java/util/PriorityQueue/PriorityQueueSort.java rename to test/jdk/java/util/PriorityQueue/PriorityQueueSort.java diff --git a/jdk/test/java/util/PriorityQueue/RemoveContains.java b/test/jdk/java/util/PriorityQueue/RemoveContains.java similarity index 100% rename from jdk/test/java/util/PriorityQueue/RemoveContains.java rename to test/jdk/java/util/PriorityQueue/RemoveContains.java diff --git a/jdk/test/java/util/Properties/Bug6609431.java b/test/jdk/java/util/Properties/Bug6609431.java similarity index 100% rename from jdk/test/java/util/Properties/Bug6609431.java rename to test/jdk/java/util/Properties/Bug6609431.java diff --git a/jdk/test/java/util/Properties/Bug6609431.properties b/test/jdk/java/util/Properties/Bug6609431.properties similarity index 100% rename from jdk/test/java/util/Properties/Bug6609431.properties rename to test/jdk/java/util/Properties/Bug6609431.properties diff --git a/jdk/test/java/util/Properties/CheckOverrides.java b/test/jdk/java/util/Properties/CheckOverrides.java similarity index 100% rename from jdk/test/java/util/Properties/CheckOverrides.java rename to test/jdk/java/util/Properties/CheckOverrides.java diff --git a/jdk/test/java/util/Properties/CheckUnsynchronized.java b/test/jdk/java/util/Properties/CheckUnsynchronized.java similarity index 100% rename from jdk/test/java/util/Properties/CheckUnsynchronized.java rename to test/jdk/java/util/Properties/CheckUnsynchronized.java diff --git a/jdk/test/java/util/Properties/Compatibility.xml b/test/jdk/java/util/Properties/Compatibility.xml similarity index 100% rename from jdk/test/java/util/Properties/Compatibility.xml rename to test/jdk/java/util/Properties/Compatibility.xml diff --git a/jdk/test/java/util/Properties/CompatibilityTest.java b/test/jdk/java/util/Properties/CompatibilityTest.java similarity index 100% rename from jdk/test/java/util/Properties/CompatibilityTest.java rename to test/jdk/java/util/Properties/CompatibilityTest.java diff --git a/jdk/test/java/util/Properties/ConcurrentLoadAndStoreXML.java b/test/jdk/java/util/Properties/ConcurrentLoadAndStoreXML.java similarity index 100% rename from jdk/test/java/util/Properties/ConcurrentLoadAndStoreXML.java rename to test/jdk/java/util/Properties/ConcurrentLoadAndStoreXML.java diff --git a/jdk/test/java/util/Properties/LoadAndStoreNPE.java b/test/jdk/java/util/Properties/LoadAndStoreNPE.java similarity index 100% rename from jdk/test/java/util/Properties/LoadAndStoreNPE.java rename to test/jdk/java/util/Properties/LoadAndStoreNPE.java diff --git a/jdk/test/java/util/Properties/LoadAndStoreXML.java b/test/jdk/java/util/Properties/LoadAndStoreXML.java similarity index 100% rename from jdk/test/java/util/Properties/LoadAndStoreXML.java rename to test/jdk/java/util/Properties/LoadAndStoreXML.java diff --git a/jdk/test/java/util/Properties/LoadAndStoreXMLWithDefaults.java b/test/jdk/java/util/Properties/LoadAndStoreXMLWithDefaults.java similarity index 100% rename from jdk/test/java/util/Properties/LoadAndStoreXMLWithDefaults.java rename to test/jdk/java/util/Properties/LoadAndStoreXMLWithDefaults.java diff --git a/jdk/test/java/util/Properties/PropertiesSerialization.java b/test/jdk/java/util/Properties/PropertiesSerialization.java similarity index 100% rename from jdk/test/java/util/Properties/PropertiesSerialization.java rename to test/jdk/java/util/Properties/PropertiesSerialization.java diff --git a/jdk/test/java/util/Properties/invalidxml/BadCase.xml b/test/jdk/java/util/Properties/invalidxml/BadCase.xml similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/BadCase.xml rename to test/jdk/java/util/Properties/invalidxml/BadCase.xml diff --git a/jdk/test/java/util/Properties/invalidxml/BadDocType.xml b/test/jdk/java/util/Properties/invalidxml/BadDocType.xml similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/BadDocType.xml rename to test/jdk/java/util/Properties/invalidxml/BadDocType.xml diff --git a/jdk/test/java/util/Properties/invalidxml/DTDRootNotMatch.xml b/test/jdk/java/util/Properties/invalidxml/DTDRootNotMatch.xml similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/DTDRootNotMatch.xml rename to test/jdk/java/util/Properties/invalidxml/DTDRootNotMatch.xml diff --git a/jdk/test/java/util/Properties/invalidxml/IllegalComment.xml b/test/jdk/java/util/Properties/invalidxml/IllegalComment.xml similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/IllegalComment.xml rename to test/jdk/java/util/Properties/invalidxml/IllegalComment.xml diff --git a/jdk/test/java/util/Properties/invalidxml/IllegalEntry.xml b/test/jdk/java/util/Properties/invalidxml/IllegalEntry.xml similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/IllegalEntry.xml rename to test/jdk/java/util/Properties/invalidxml/IllegalEntry.xml diff --git a/jdk/test/java/util/Properties/invalidxml/IllegalEntry1.xml b/test/jdk/java/util/Properties/invalidxml/IllegalEntry1.xml similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/IllegalEntry1.xml rename to test/jdk/java/util/Properties/invalidxml/IllegalEntry1.xml diff --git a/jdk/test/java/util/Properties/invalidxml/IllegalKeyAttribute.xml b/test/jdk/java/util/Properties/invalidxml/IllegalKeyAttribute.xml similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/IllegalKeyAttribute.xml rename to test/jdk/java/util/Properties/invalidxml/IllegalKeyAttribute.xml diff --git a/jdk/test/java/util/Properties/invalidxml/NoClosingTag.xml b/test/jdk/java/util/Properties/invalidxml/NoClosingTag.xml similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/NoClosingTag.xml rename to test/jdk/java/util/Properties/invalidxml/NoClosingTag.xml diff --git a/jdk/test/java/util/Properties/invalidxml/NoDocType.xml b/test/jdk/java/util/Properties/invalidxml/NoDocType.xml similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/NoDocType.xml rename to test/jdk/java/util/Properties/invalidxml/NoDocType.xml diff --git a/jdk/test/java/util/Properties/invalidxml/NoNamespaceSupport.xml b/test/jdk/java/util/Properties/invalidxml/NoNamespaceSupport.xml similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/NoNamespaceSupport.xml rename to test/jdk/java/util/Properties/invalidxml/NoNamespaceSupport.xml diff --git a/jdk/test/java/util/Properties/invalidxml/NoRoot.xml b/test/jdk/java/util/Properties/invalidxml/NoRoot.xml similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/NoRoot.xml rename to test/jdk/java/util/Properties/invalidxml/NoRoot.xml diff --git a/jdk/test/java/util/Properties/invalidxml/NotQuoted.xml b/test/jdk/java/util/Properties/invalidxml/NotQuoted.xml similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/NotQuoted.xml rename to test/jdk/java/util/Properties/invalidxml/NotQuoted.xml diff --git a/jdk/test/java/util/Properties/invalidxml/README.txt b/test/jdk/java/util/Properties/invalidxml/README.txt similarity index 100% rename from jdk/test/java/util/Properties/invalidxml/README.txt rename to test/jdk/java/util/Properties/invalidxml/README.txt diff --git a/jdk/test/java/util/PropertyPermission/PropertyPermissionCollection.java b/test/jdk/java/util/PropertyPermission/PropertyPermissionCollection.java similarity index 100% rename from jdk/test/java/util/PropertyPermission/PropertyPermissionCollection.java rename to test/jdk/java/util/PropertyPermission/PropertyPermissionCollection.java diff --git a/jdk/test/java/util/Random/DistinctSeeds.java b/test/jdk/java/util/Random/DistinctSeeds.java similarity index 100% rename from jdk/test/java/util/Random/DistinctSeeds.java rename to test/jdk/java/util/Random/DistinctSeeds.java diff --git a/jdk/test/java/util/Random/NextBytes.java b/test/jdk/java/util/Random/NextBytes.java similarity index 100% rename from jdk/test/java/util/Random/NextBytes.java rename to test/jdk/java/util/Random/NextBytes.java diff --git a/jdk/test/java/util/Random/NextIntPowerOfTwoMod.java b/test/jdk/java/util/Random/NextIntPowerOfTwoMod.java similarity index 100% rename from jdk/test/java/util/Random/NextIntPowerOfTwoMod.java rename to test/jdk/java/util/Random/NextIntPowerOfTwoMod.java diff --git a/jdk/test/java/util/Random/RandomStreamTest.java b/test/jdk/java/util/Random/RandomStreamTest.java similarity index 100% rename from jdk/test/java/util/Random/RandomStreamTest.java rename to test/jdk/java/util/Random/RandomStreamTest.java diff --git a/jdk/test/java/util/Random/RandomTest.java b/test/jdk/java/util/Random/RandomTest.java similarity index 100% rename from jdk/test/java/util/Random/RandomTest.java rename to test/jdk/java/util/Random/RandomTest.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4083270Test.java b/test/jdk/java/util/ResourceBundle/Bug4083270Test.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4083270Test.java rename to test/jdk/java/util/ResourceBundle/Bug4083270Test.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4083270Test.properties b/test/jdk/java/util/ResourceBundle/Bug4083270Test.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4083270Test.properties rename to test/jdk/java/util/ResourceBundle/Bug4083270Test.properties diff --git a/jdk/test/java/util/ResourceBundle/Bug4165815Test.java b/test/jdk/java/util/ResourceBundle/Bug4165815Test.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4165815Test.java rename to test/jdk/java/util/ResourceBundle/Bug4165815Test.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4168625Class.java b/test/jdk/java/util/ResourceBundle/Bug4168625Class.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4168625Class.java rename to test/jdk/java/util/ResourceBundle/Bug4168625Class.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java b/test/jdk/java/util/ResourceBundle/Bug4168625Getter.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4168625Getter.java rename to test/jdk/java/util/ResourceBundle/Bug4168625Getter.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java b/test/jdk/java/util/ResourceBundle/Bug4168625Resource.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4168625Resource.java rename to test/jdk/java/util/ResourceBundle/Bug4168625Resource.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java b/test/jdk/java/util/ResourceBundle/Bug4168625Resource2.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java rename to test/jdk/java/util/ResourceBundle/Bug4168625Resource2.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java b/test/jdk/java/util/ResourceBundle/Bug4168625Resource2_en_US.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java rename to test/jdk/java/util/ResourceBundle/Bug4168625Resource2_en_US.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java b/test/jdk/java/util/ResourceBundle/Bug4168625Resource3.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java rename to test/jdk/java/util/ResourceBundle/Bug4168625Resource3.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java b/test/jdk/java/util/ResourceBundle/Bug4168625Resource3_en.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java rename to test/jdk/java/util/ResourceBundle/Bug4168625Resource3_en.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java b/test/jdk/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java rename to test/jdk/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java b/test/jdk/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java rename to test/jdk/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java b/test/jdk/java/util/ResourceBundle/Bug4168625Resource3_en_US.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java rename to test/jdk/java/util/ResourceBundle/Bug4168625Resource3_en_US.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4168625Test.java b/test/jdk/java/util/ResourceBundle/Bug4168625Test.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4168625Test.java rename to test/jdk/java/util/ResourceBundle/Bug4168625Test.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4177489Test.java b/test/jdk/java/util/ResourceBundle/Bug4177489Test.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4177489Test.java rename to test/jdk/java/util/ResourceBundle/Bug4177489Test.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java b/test/jdk/java/util/ResourceBundle/Bug4177489_Resource.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java rename to test/jdk/java/util/ResourceBundle/Bug4177489_Resource.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java b/test/jdk/java/util/ResourceBundle/Bug4177489_Resource_jf.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java rename to test/jdk/java/util/ResourceBundle/Bug4177489_Resource_jf.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf_JF.properties b/test/jdk/java/util/ResourceBundle/Bug4177489_Resource_jf_JF.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf_JF.properties rename to test/jdk/java/util/ResourceBundle/Bug4177489_Resource_jf_JF.properties diff --git a/jdk/test/java/util/ResourceBundle/Bug4179766Class.java b/test/jdk/java/util/ResourceBundle/Bug4179766Class.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4179766Class.java rename to test/jdk/java/util/ResourceBundle/Bug4179766Class.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java b/test/jdk/java/util/ResourceBundle/Bug4179766Getter.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4179766Getter.java rename to test/jdk/java/util/ResourceBundle/Bug4179766Getter.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java b/test/jdk/java/util/ResourceBundle/Bug4179766Resource.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4179766Resource.java rename to test/jdk/java/util/ResourceBundle/Bug4179766Resource.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4195978Test.java b/test/jdk/java/util/ResourceBundle/Bug4195978Test.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4195978Test.java rename to test/jdk/java/util/ResourceBundle/Bug4195978Test.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4257318.java b/test/jdk/java/util/ResourceBundle/Bug4257318.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4257318.java rename to test/jdk/java/util/ResourceBundle/Bug4257318.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4257318Res.java b/test/jdk/java/util/ResourceBundle/Bug4257318Res.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4257318Res.java rename to test/jdk/java/util/ResourceBundle/Bug4257318Res.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4257318Res_en.java b/test/jdk/java/util/ResourceBundle/Bug4257318Res_en.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4257318Res_en.java rename to test/jdk/java/util/ResourceBundle/Bug4257318Res_en.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4353454.java b/test/jdk/java/util/ResourceBundle/Bug4353454.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4353454.java rename to test/jdk/java/util/ResourceBundle/Bug4353454.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4396021.java b/test/jdk/java/util/ResourceBundle/Bug4396021.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4396021.java rename to test/jdk/java/util/ResourceBundle/Bug4396021.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4396021GeneralMessages.java b/test/jdk/java/util/ResourceBundle/Bug4396021GeneralMessages.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4396021GeneralMessages.java rename to test/jdk/java/util/ResourceBundle/Bug4396021GeneralMessages.java diff --git a/jdk/test/java/util/ResourceBundle/Bug4396021SpecialMessages.java b/test/jdk/java/util/ResourceBundle/Bug4396021SpecialMessages.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug4396021SpecialMessages.java rename to test/jdk/java/util/ResourceBundle/Bug4396021SpecialMessages.java diff --git a/jdk/test/java/util/ResourceBundle/Bug6190861.java b/test/jdk/java/util/ResourceBundle/Bug6190861.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6190861.java rename to test/jdk/java/util/ResourceBundle/Bug6190861.java diff --git a/jdk/test/java/util/ResourceBundle/Bug6190861Data.properties b/test/jdk/java/util/ResourceBundle/Bug6190861Data.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6190861Data.properties rename to test/jdk/java/util/ResourceBundle/Bug6190861Data.properties diff --git a/jdk/test/java/util/ResourceBundle/Bug6190861Data_en_US.properties b/test/jdk/java/util/ResourceBundle/Bug6190861Data_en_US.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6190861Data_en_US.properties rename to test/jdk/java/util/ResourceBundle/Bug6190861Data_en_US.properties diff --git a/jdk/test/java/util/ResourceBundle/Bug6204853.java b/test/jdk/java/util/ResourceBundle/Bug6204853.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6204853.java rename to test/jdk/java/util/ResourceBundle/Bug6204853.java diff --git a/jdk/test/java/util/ResourceBundle/Bug6204853.properties b/test/jdk/java/util/ResourceBundle/Bug6204853.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6204853.properties rename to test/jdk/java/util/ResourceBundle/Bug6204853.properties diff --git a/jdk/test/java/util/ResourceBundle/Bug6204853_Utf8.properties b/test/jdk/java/util/ResourceBundle/Bug6204853_Utf8.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6204853_Utf8.properties rename to test/jdk/java/util/ResourceBundle/Bug6204853_Utf8.properties diff --git a/jdk/test/java/util/ResourceBundle/Bug6299235Test.java b/test/jdk/java/util/ResourceBundle/Bug6299235Test.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6299235Test.java rename to test/jdk/java/util/ResourceBundle/Bug6299235Test.java diff --git a/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh b/test/jdk/java/util/ResourceBundle/Bug6299235Test.sh similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6299235Test.sh rename to test/jdk/java/util/ResourceBundle/Bug6299235Test.sh diff --git a/jdk/test/java/util/ResourceBundle/Bug6355009.java b/test/jdk/java/util/ResourceBundle/Bug6355009.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6355009.java rename to test/jdk/java/util/ResourceBundle/Bug6355009.java diff --git a/jdk/test/java/util/ResourceBundle/Bug6356571.java b/test/jdk/java/util/ResourceBundle/Bug6356571.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6356571.java rename to test/jdk/java/util/ResourceBundle/Bug6356571.java diff --git a/jdk/test/java/util/ResourceBundle/Bug6356571.properties b/test/jdk/java/util/ResourceBundle/Bug6356571.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6356571.properties rename to test/jdk/java/util/ResourceBundle/Bug6356571.properties diff --git a/jdk/test/java/util/ResourceBundle/Bug6359330.java b/test/jdk/java/util/ResourceBundle/Bug6359330.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6359330.java rename to test/jdk/java/util/ResourceBundle/Bug6359330.java diff --git a/jdk/test/java/util/ResourceBundle/Bug6572242.java b/test/jdk/java/util/ResourceBundle/Bug6572242.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Bug6572242.java rename to test/jdk/java/util/ResourceBundle/Bug6572242.java diff --git a/jdk/test/java/util/ResourceBundle/Control/AbstractRB.java b/test/jdk/java/util/ResourceBundle/Control/AbstractRB.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/AbstractRB.java rename to test/jdk/java/util/ResourceBundle/Control/AbstractRB.java diff --git a/jdk/test/java/util/ResourceBundle/Control/BadControlsTest.java b/test/jdk/java/util/ResourceBundle/Control/BadControlsTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/BadControlsTest.java rename to test/jdk/java/util/ResourceBundle/Control/BadControlsTest.java diff --git a/jdk/test/java/util/ResourceBundle/Control/BadStaticInitRB.java b/test/jdk/java/util/ResourceBundle/Control/BadStaticInitRB.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/BadStaticInitRB.java rename to test/jdk/java/util/ResourceBundle/Control/BadStaticInitRB.java diff --git a/jdk/test/java/util/ResourceBundle/Control/Bug6530694.java b/test/jdk/java/util/ResourceBundle/Control/Bug6530694.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/Bug6530694.java rename to test/jdk/java/util/ResourceBundle/Control/Bug6530694.java diff --git a/jdk/test/java/util/ResourceBundle/Control/Bug6530694_de_DE.properties b/test/jdk/java/util/ResourceBundle/Control/Bug6530694_de_DE.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/Bug6530694_de_DE.properties rename to test/jdk/java/util/ResourceBundle/Control/Bug6530694_de_DE.properties diff --git a/jdk/test/java/util/ResourceBundle/Control/Chinese.properties b/test/jdk/java/util/ResourceBundle/Control/Chinese.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/Chinese.properties rename to test/jdk/java/util/ResourceBundle/Control/Chinese.properties diff --git a/jdk/test/java/util/ResourceBundle/Control/Chinese_zh.properties b/test/jdk/java/util/ResourceBundle/Control/Chinese_zh.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/Chinese_zh.properties rename to test/jdk/java/util/ResourceBundle/Control/Chinese_zh.properties diff --git a/jdk/test/java/util/ResourceBundle/Control/Chinese_zh_CN.properties b/test/jdk/java/util/ResourceBundle/Control/Chinese_zh_CN.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/Chinese_zh_CN.properties rename to test/jdk/java/util/ResourceBundle/Control/Chinese_zh_CN.properties diff --git a/jdk/test/java/util/ResourceBundle/Control/Chinese_zh_TW.properties b/test/jdk/java/util/ResourceBundle/Control/Chinese_zh_TW.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/Chinese_zh_TW.properties rename to test/jdk/java/util/ResourceBundle/Control/Chinese_zh_TW.properties diff --git a/jdk/test/java/util/ResourceBundle/Control/ControlFactoryTest.java b/test/jdk/java/util/ResourceBundle/Control/ControlFactoryTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/ControlFactoryTest.java rename to test/jdk/java/util/ResourceBundle/Control/ControlFactoryTest.java diff --git a/jdk/test/java/util/ResourceBundle/Control/DefaultControlTest.java b/test/jdk/java/util/ResourceBundle/Control/DefaultControlTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/DefaultControlTest.java rename to test/jdk/java/util/ResourceBundle/Control/DefaultControlTest.java diff --git a/jdk/test/java/util/ResourceBundle/Control/LoadingStrategiesTest.java b/test/jdk/java/util/ResourceBundle/Control/LoadingStrategiesTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/LoadingStrategiesTest.java rename to test/jdk/java/util/ResourceBundle/Control/LoadingStrategiesTest.java diff --git a/jdk/test/java/util/ResourceBundle/Control/MalformedDataRB_en.properties b/test/jdk/java/util/ResourceBundle/Control/MalformedDataRB_en.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/MalformedDataRB_en.properties rename to test/jdk/java/util/ResourceBundle/Control/MalformedDataRB_en.properties diff --git a/jdk/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.java b/test/jdk/java/util/ResourceBundle/Control/MissingResourceCauseTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.java rename to test/jdk/java/util/ResourceBundle/Control/MissingResourceCauseTest.java diff --git a/jdk/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh b/test/jdk/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh rename to test/jdk/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh diff --git a/jdk/test/java/util/ResourceBundle/Control/NonResourceBundle.java b/test/jdk/java/util/ResourceBundle/Control/NonResourceBundle.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/NonResourceBundle.java rename to test/jdk/java/util/ResourceBundle/Control/NonResourceBundle.java diff --git a/jdk/test/java/util/ResourceBundle/Control/PackagePrivateRB.java b/test/jdk/java/util/ResourceBundle/Control/PackagePrivateRB.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/PackagePrivateRB.java rename to test/jdk/java/util/ResourceBundle/Control/PackagePrivateRB.java diff --git a/jdk/test/java/util/ResourceBundle/Control/PackagePrivateTest.java b/test/jdk/java/util/ResourceBundle/Control/PackagePrivateTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/PackagePrivateTest.java rename to test/jdk/java/util/ResourceBundle/Control/PackagePrivateTest.java diff --git a/jdk/test/java/util/ResourceBundle/Control/PrivateConstructorRB.java b/test/jdk/java/util/ResourceBundle/Control/PrivateConstructorRB.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/PrivateConstructorRB.java rename to test/jdk/java/util/ResourceBundle/Control/PrivateConstructorRB.java diff --git a/jdk/test/java/util/ResourceBundle/Control/StressOut.properties b/test/jdk/java/util/ResourceBundle/Control/StressOut.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/StressOut.properties rename to test/jdk/java/util/ResourceBundle/Control/StressOut.properties diff --git a/jdk/test/java/util/ResourceBundle/Control/StressOut_en_CA.properties b/test/jdk/java/util/ResourceBundle/Control/StressOut_en_CA.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/StressOut_en_CA.properties rename to test/jdk/java/util/ResourceBundle/Control/StressOut_en_CA.properties diff --git a/jdk/test/java/util/ResourceBundle/Control/StressOut_ja.properties b/test/jdk/java/util/ResourceBundle/Control/StressOut_ja.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/StressOut_ja.properties rename to test/jdk/java/util/ResourceBundle/Control/StressOut_ja.properties diff --git a/jdk/test/java/util/ResourceBundle/Control/StressOut_ja_JP.properties b/test/jdk/java/util/ResourceBundle/Control/StressOut_ja_JP.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/StressOut_ja_JP.properties rename to test/jdk/java/util/ResourceBundle/Control/StressOut_ja_JP.properties diff --git a/jdk/test/java/util/ResourceBundle/Control/StressOut_ko.properties b/test/jdk/java/util/ResourceBundle/Control/StressOut_ko.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/StressOut_ko.properties rename to test/jdk/java/util/ResourceBundle/Control/StressOut_ko.properties diff --git a/jdk/test/java/util/ResourceBundle/Control/StressOut_zh_CN.properties b/test/jdk/java/util/ResourceBundle/Control/StressOut_zh_CN.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/StressOut_zh_CN.properties rename to test/jdk/java/util/ResourceBundle/Control/StressOut_zh_CN.properties diff --git a/jdk/test/java/util/ResourceBundle/Control/StressTest.java b/test/jdk/java/util/ResourceBundle/Control/StressTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/StressTest.java rename to test/jdk/java/util/ResourceBundle/Control/StressTest.java diff --git a/jdk/test/java/util/ResourceBundle/Control/TestResourceRB.java b/test/jdk/java/util/ResourceBundle/Control/TestResourceRB.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/TestResourceRB.java rename to test/jdk/java/util/ResourceBundle/Control/TestResourceRB.java diff --git a/jdk/test/java/util/ResourceBundle/Control/XMLResourceBundleTest.java b/test/jdk/java/util/ResourceBundle/Control/XMLResourceBundleTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/XMLResourceBundleTest.java rename to test/jdk/java/util/ResourceBundle/Control/XMLResourceBundleTest.java diff --git a/jdk/test/java/util/ResourceBundle/Control/XmlRB.xml b/test/jdk/java/util/ResourceBundle/Control/XmlRB.xml similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/XmlRB.xml rename to test/jdk/java/util/ResourceBundle/Control/XmlRB.xml diff --git a/jdk/test/java/util/ResourceBundle/Control/XmlRB_ja.xml b/test/jdk/java/util/ResourceBundle/Control/XmlRB_ja.xml similarity index 100% rename from jdk/test/java/util/ResourceBundle/Control/XmlRB_ja.xml rename to test/jdk/java/util/ResourceBundle/Control/XmlRB_ja.xml diff --git a/jdk/test/java/util/ResourceBundle/FakeTestResource.java b/test/jdk/java/util/ResourceBundle/FakeTestResource.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/FakeTestResource.java rename to test/jdk/java/util/ResourceBundle/FakeTestResource.java diff --git a/jdk/test/java/util/ResourceBundle/KeySetMessages.java b/test/jdk/java/util/ResourceBundle/KeySetMessages.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/KeySetMessages.java rename to test/jdk/java/util/ResourceBundle/KeySetMessages.java diff --git a/jdk/test/java/util/ResourceBundle/KeySetMessages_zh_CN.java b/test/jdk/java/util/ResourceBundle/KeySetMessages_zh_CN.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/KeySetMessages_zh_CN.java rename to test/jdk/java/util/ResourceBundle/KeySetMessages_zh_CN.java diff --git a/jdk/test/java/util/ResourceBundle/KeySetResources.properties b/test/jdk/java/util/ResourceBundle/KeySetResources.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/KeySetResources.properties rename to test/jdk/java/util/ResourceBundle/KeySetResources.properties diff --git a/jdk/test/java/util/ResourceBundle/KeySetResources_ja_JP.properties b/test/jdk/java/util/ResourceBundle/KeySetResources_ja_JP.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/KeySetResources_ja_JP.properties rename to test/jdk/java/util/ResourceBundle/KeySetResources_ja_JP.properties diff --git a/jdk/test/java/util/ResourceBundle/KeySetTest.java b/test/jdk/java/util/ResourceBundle/KeySetTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/KeySetTest.java rename to test/jdk/java/util/ResourceBundle/KeySetTest.java diff --git a/jdk/test/java/util/ResourceBundle/RB4353454_en.properties b/test/jdk/java/util/ResourceBundle/RB4353454_en.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/RB4353454_en.properties rename to test/jdk/java/util/ResourceBundle/RB4353454_en.properties diff --git a/jdk/test/java/util/ResourceBundle/RBTestFmwk.java b/test/jdk/java/util/ResourceBundle/RBTestFmwk.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/RBTestFmwk.java rename to test/jdk/java/util/ResourceBundle/RBTestFmwk.java diff --git a/jdk/test/java/util/ResourceBundle/ReferencesTest.java b/test/jdk/java/util/ResourceBundle/ReferencesTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/ReferencesTest.java rename to test/jdk/java/util/ResourceBundle/ReferencesTest.java diff --git a/jdk/test/java/util/ResourceBundle/ReferencesTestBundle.properties b/test/jdk/java/util/ResourceBundle/ReferencesTestBundle.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/ReferencesTestBundle.properties rename to test/jdk/java/util/ResourceBundle/ReferencesTestBundle.properties diff --git a/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java b/test/jdk/java/util/ResourceBundle/ResourceBundleTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/ResourceBundleTest.java rename to test/jdk/java/util/ResourceBundle/ResourceBundleTest.java diff --git a/jdk/test/java/util/ResourceBundle/Test4300693.java b/test/jdk/java/util/ResourceBundle/Test4300693.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4300693.java rename to test/jdk/java/util/ResourceBundle/Test4300693.java diff --git a/jdk/test/java/util/ResourceBundle/Test4300693RB.java b/test/jdk/java/util/ResourceBundle/Test4300693RB.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4300693RB.java rename to test/jdk/java/util/ResourceBundle/Test4300693RB.java diff --git a/jdk/test/java/util/ResourceBundle/Test4314141.java b/test/jdk/java/util/ResourceBundle/Test4314141.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141.java rename to test/jdk/java/util/ResourceBundle/Test4314141.java diff --git a/jdk/test/java/util/ResourceBundle/Test4314141A.properties b/test/jdk/java/util/ResourceBundle/Test4314141A.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141A.properties rename to test/jdk/java/util/ResourceBundle/Test4314141A.properties diff --git a/jdk/test/java/util/ResourceBundle/Test4314141A_.properties b/test/jdk/java/util/ResourceBundle/Test4314141A_.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141A_.properties rename to test/jdk/java/util/ResourceBundle/Test4314141A_.properties diff --git a/jdk/test/java/util/ResourceBundle/Test4314141A__DE.properties b/test/jdk/java/util/ResourceBundle/Test4314141A__DE.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141A__DE.properties rename to test/jdk/java/util/ResourceBundle/Test4314141A__DE.properties diff --git a/jdk/test/java/util/ResourceBundle/Test4314141A___EURO.properties b/test/jdk/java/util/ResourceBundle/Test4314141A___EURO.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141A___EURO.properties rename to test/jdk/java/util/ResourceBundle/Test4314141A___EURO.properties diff --git a/jdk/test/java/util/ResourceBundle/Test4314141A_de.properties b/test/jdk/java/util/ResourceBundle/Test4314141A_de.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141A_de.properties rename to test/jdk/java/util/ResourceBundle/Test4314141A_de.properties diff --git a/jdk/test/java/util/ResourceBundle/Test4314141A_de_.properties b/test/jdk/java/util/ResourceBundle/Test4314141A_de_.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141A_de_.properties rename to test/jdk/java/util/ResourceBundle/Test4314141A_de_.properties diff --git a/jdk/test/java/util/ResourceBundle/Test4314141B.java b/test/jdk/java/util/ResourceBundle/Test4314141B.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141B.java rename to test/jdk/java/util/ResourceBundle/Test4314141B.java diff --git a/jdk/test/java/util/ResourceBundle/Test4314141B_en.properties b/test/jdk/java/util/ResourceBundle/Test4314141B_en.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141B_en.properties rename to test/jdk/java/util/ResourceBundle/Test4314141B_en.properties diff --git a/jdk/test/java/util/ResourceBundle/Test4314141B_es_ES.java b/test/jdk/java/util/ResourceBundle/Test4314141B_es_ES.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141B_es_ES.java rename to test/jdk/java/util/ResourceBundle/Test4314141B_es_ES.java diff --git a/jdk/test/java/util/ResourceBundle/Test4314141B_fr.properties b/test/jdk/java/util/ResourceBundle/Test4314141B_fr.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141B_fr.properties rename to test/jdk/java/util/ResourceBundle/Test4314141B_fr.properties diff --git a/jdk/test/java/util/ResourceBundle/Test4314141B_fr_CH.java b/test/jdk/java/util/ResourceBundle/Test4314141B_fr_CH.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141B_fr_CH.java rename to test/jdk/java/util/ResourceBundle/Test4314141B_fr_CH.java diff --git a/jdk/test/java/util/ResourceBundle/Test4314141B_fr_CH.properties b/test/jdk/java/util/ResourceBundle/Test4314141B_fr_CH.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4314141B_fr_CH.properties rename to test/jdk/java/util/ResourceBundle/Test4314141B_fr_CH.properties diff --git a/jdk/test/java/util/ResourceBundle/Test4318520.java b/test/jdk/java/util/ResourceBundle/Test4318520.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4318520.java rename to test/jdk/java/util/ResourceBundle/Test4318520.java diff --git a/jdk/test/java/util/ResourceBundle/Test4318520RB_de.properties b/test/jdk/java/util/ResourceBundle/Test4318520RB_de.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4318520RB_de.properties rename to test/jdk/java/util/ResourceBundle/Test4318520RB_de.properties diff --git a/jdk/test/java/util/ResourceBundle/Test4318520RB_en.properties b/test/jdk/java/util/ResourceBundle/Test4318520RB_en.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/Test4318520RB_en.properties rename to test/jdk/java/util/ResourceBundle/Test4318520RB_en.properties diff --git a/jdk/test/java/util/ResourceBundle/TestBug4179766.java b/test/jdk/java/util/ResourceBundle/TestBug4179766.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/TestBug4179766.java rename to test/jdk/java/util/ResourceBundle/TestBug4179766.java diff --git a/jdk/test/java/util/ResourceBundle/TestResource.java b/test/jdk/java/util/ResourceBundle/TestResource.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/TestResource.java rename to test/jdk/java/util/ResourceBundle/TestResource.java diff --git a/jdk/test/java/util/ResourceBundle/TestResource_de.java b/test/jdk/java/util/ResourceBundle/TestResource_de.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/TestResource_de.java rename to test/jdk/java/util/ResourceBundle/TestResource_de.java diff --git a/jdk/test/java/util/ResourceBundle/TestResource_fr.java b/test/jdk/java/util/ResourceBundle/TestResource_fr.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/TestResource_fr.java rename to test/jdk/java/util/ResourceBundle/TestResource_fr.java diff --git a/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java b/test/jdk/java/util/ResourceBundle/TestResource_fr_CH.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java rename to test/jdk/java/util/ResourceBundle/TestResource_fr_CH.java diff --git a/jdk/test/java/util/ResourceBundle/TestResource_it.java b/test/jdk/java/util/ResourceBundle/TestResource_it.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/TestResource_it.java rename to test/jdk/java/util/ResourceBundle/TestResource_it.java diff --git a/jdk/test/java/util/ResourceBundle/UTF8Properties/CodePointTest.java b/test/jdk/java/util/ResourceBundle/UTF8Properties/CodePointTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/UTF8Properties/CodePointTest.java rename to test/jdk/java/util/ResourceBundle/UTF8Properties/CodePointTest.java diff --git a/jdk/test/java/util/ResourceBundle/UTF8Properties/IllegalSequenceTest.java b/test/jdk/java/util/ResourceBundle/UTF8Properties/IllegalSequenceTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/UTF8Properties/IllegalSequenceTest.java rename to test/jdk/java/util/ResourceBundle/UTF8Properties/IllegalSequenceTest.java diff --git a/jdk/test/java/util/ResourceBundle/awtres.jar b/test/jdk/java/util/ResourceBundle/awtres.jar similarity index 100% rename from jdk/test/java/util/ResourceBundle/awtres.jar rename to test/jdk/java/util/ResourceBundle/awtres.jar diff --git a/jdk/test/java/util/ResourceBundle/bug4195978Test.properties b/test/jdk/java/util/ResourceBundle/bug4195978Test.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/bug4195978Test.properties rename to test/jdk/java/util/ResourceBundle/bug4195978Test.properties diff --git a/jdk/test/java/util/ResourceBundle/bug6572242.properties b/test/jdk/java/util/ResourceBundle/bug6572242.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/bug6572242.properties rename to test/jdk/java/util/ResourceBundle/bug6572242.properties diff --git a/jdk/test/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java b/test/jdk/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java rename to test/jdk/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java diff --git a/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle.java b/test/jdk/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle.java rename to test/jdk/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle.java diff --git a/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle_fr.java b/test/jdk/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle_fr.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle_fr.java rename to test/jdk/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle_fr.java diff --git a/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle.properties b/test/jdk/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle.properties rename to test/jdk/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle.properties diff --git a/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle_fr.properties b/test/jdk/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle_fr.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle_fr.properties rename to test/jdk/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle_fr.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/appbasic.sh b/test/jdk/java/util/ResourceBundle/modules/appbasic/appbasic.sh similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/appbasic.sh rename to test/jdk/java/util/ResourceBundle/modules/appbasic/appbasic.sh diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResources_de.java b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResources_de.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResources_de.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResources_de.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResources_fr.java b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResources_fr.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResources_fr.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResources_fr.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/eubundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/eubundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/Main.java b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/Main.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResources.java b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResources.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResources.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResources.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProviderImpl.java b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProviderImpl.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProviderImpl.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProviderImpl.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResources_en.java b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResources_en.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResources_en.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResources_en.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/spi/MyResourcesProvider.java b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/spi/MyResourcesProvider.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/spi/MyResourcesProvider.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/spi/MyResourcesProvider.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/module-info.java b/test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/appbasic2.sh b/test/jdk/java/util/ResourceBundle/modules/appbasic2/appbasic2.sh similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/appbasic2.sh rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/appbasic2.sh diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResources_de.java b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResources_de.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResources_de.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResources_de.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResources_fr.java b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResources_fr.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResources_fr.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResources_fr.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/eubundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/eubundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/Main.java b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/Main.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResources.java b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResources.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResources.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResources.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResourcesProviderImpl.java b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResourcesProviderImpl.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResourcesProviderImpl.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResourcesProviderImpl.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResources_en.java b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResources_en.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResources_en.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResources_en.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/spi/MyResourcesProvider.java b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/spi/MyResourcesProvider.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/spi/MyResourcesProvider.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/spi/MyResourcesProvider.java diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic2/src/test/module-info.java b/test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/appbasic2/src/test/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/basic.sh b/test/jdk/java/util/ResourceBundle/modules/basic/basic.sh similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/basic.sh rename to test/jdk/java/util/ResourceBundle/modules/basic/basic.sh diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties b/test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties rename to test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_ja_JP.properties b/test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_ja_JP.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_ja_JP.properties rename to test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_ja_JP.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties b/test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties rename to test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties b/test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties rename to test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/asiabundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/asiabundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResources_de.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResources_de.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResources_de.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResources_de.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResources_fr.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResources_fr.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResources_fr.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResources_fr.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/eubundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/eubundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/extra/jdk/test/resources/asia/MyResources_vi.properties b/test/jdk/java/util/ResourceBundle/modules/basic/src/extra/jdk/test/resources/asia/MyResources_vi.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/extra/jdk/test/resources/asia/MyResources_vi.properties rename to test/jdk/java/util/ResourceBundle/modules/basic/src/extra/jdk/test/resources/asia/MyResources_vi.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/extra/jdk/test/resources/eu/MyResources_es.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/extra/jdk/test/resources/eu/MyResources_es.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/extra/jdk/test/resources/eu/MyResources_es.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/extra/jdk/test/resources/eu/MyResources_es.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResources.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResources.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResources.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResources.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResourcesMain.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResourcesMain.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResourcesMain.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResourcesMain.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResources_en.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResources_en.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResources_en.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResources_en.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/spi/MyResourcesProvider.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/spi/MyResourcesProvider.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/spi/MyResourcesProvider.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/spi/MyResourcesProvider.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/mainbundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/mainbundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/test/jdk/test/Main.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/test/jdk/test/Main.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/test/jdk/test/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/basic/src/test/module-info.java b/test/jdk/java/util/ResourceBundle/modules/basic/src/test/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/basic/src/test/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/basic/src/test/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/cache/CacheTest.java b/test/jdk/java/util/ResourceBundle/modules/cache/CacheTest.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/cache/CacheTest.java rename to test/jdk/java/util/ResourceBundle/modules/cache/CacheTest.java diff --git a/jdk/test/java/util/ResourceBundle/modules/cache/src/mainbundles/jdk/test/resources/MyResources.properties b/test/jdk/java/util/ResourceBundle/modules/cache/src/mainbundles/jdk/test/resources/MyResources.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/cache/src/mainbundles/jdk/test/resources/MyResources.properties rename to test/jdk/java/util/ResourceBundle/modules/cache/src/mainbundles/jdk/test/resources/MyResources.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/cache/src/mainbundles/jdk/test/util/Bundles.java b/test/jdk/java/util/ResourceBundle/modules/cache/src/mainbundles/jdk/test/util/Bundles.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/cache/src/mainbundles/jdk/test/util/Bundles.java rename to test/jdk/java/util/ResourceBundle/modules/cache/src/mainbundles/jdk/test/util/Bundles.java diff --git a/jdk/test/java/util/ResourceBundle/modules/cache/src/mainbundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/cache/src/mainbundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/cache/src/mainbundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/cache/src/mainbundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/cache/src/test/jdk/test/Main.java b/test/jdk/java/util/ResourceBundle/modules/cache/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/cache/src/test/jdk/test/Main.java rename to test/jdk/java/util/ResourceBundle/modules/cache/src/test/jdk/test/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/cache/src/test/module-info.java b/test/jdk/java/util/ResourceBundle/modules/cache/src/test/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/cache/src/test/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/cache/src/test/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/casesensitive/CaseInsensitiveNameClash.java b/test/jdk/java/util/ResourceBundle/modules/casesensitive/CaseInsensitiveNameClash.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/casesensitive/CaseInsensitiveNameClash.java rename to test/jdk/java/util/ResourceBundle/modules/casesensitive/CaseInsensitiveNameClash.java diff --git a/jdk/test/java/util/ResourceBundle/modules/casesensitive/src/resbundle/jdk/test/Main.java b/test/jdk/java/util/ResourceBundle/modules/casesensitive/src/resbundle/jdk/test/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/casesensitive/src/resbundle/jdk/test/Main.java rename to test/jdk/java/util/ResourceBundle/modules/casesensitive/src/resbundle/jdk/test/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/casesensitive/src/resbundle/jdk/test/main.properties b/test/jdk/java/util/ResourceBundle/modules/casesensitive/src/resbundle/jdk/test/main.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/casesensitive/src/resbundle/jdk/test/main.properties rename to test/jdk/java/util/ResourceBundle/modules/casesensitive/src/resbundle/jdk/test/main.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/casesensitive/src/resbundle/module-info.java b/test/jdk/java/util/ResourceBundle/modules/casesensitive/src/resbundle/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/casesensitive/src/resbundle/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/casesensitive/src/resbundle/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/layer/run.sh b/test/jdk/java/util/ResourceBundle/modules/layer/run.sh similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/layer/run.sh rename to test/jdk/java/util/ResourceBundle/modules/layer/run.sh diff --git a/jdk/test/java/util/ResourceBundle/modules/layer/src/Main.java b/test/jdk/java/util/ResourceBundle/modules/layer/src/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/layer/src/Main.java rename to test/jdk/java/util/ResourceBundle/modules/layer/src/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/layer/src/m1/module-info.java b/test/jdk/java/util/ResourceBundle/modules/layer/src/m1/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/layer/src/m1/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/layer/src/m1/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/layer/src/m1/p/Main.java b/test/jdk/java/util/ResourceBundle/modules/layer/src/m1/p/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/layer/src/m1/p/Main.java rename to test/jdk/java/util/ResourceBundle/modules/layer/src/m1/p/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/layer/src/m1/p/internal/BundleProvider.java b/test/jdk/java/util/ResourceBundle/modules/layer/src/m1/p/internal/BundleProvider.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/layer/src/m1/p/internal/BundleProvider.java rename to test/jdk/java/util/ResourceBundle/modules/layer/src/m1/p/internal/BundleProvider.java diff --git a/jdk/test/java/util/ResourceBundle/modules/layer/src/m1/p/resources/MyResource.properties b/test/jdk/java/util/ResourceBundle/modules/layer/src/m1/p/resources/MyResource.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/layer/src/m1/p/resources/MyResource.properties rename to test/jdk/java/util/ResourceBundle/modules/layer/src/m1/p/resources/MyResource.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/layer/src/m1/p/resources/MyResource_en.properties b/test/jdk/java/util/ResourceBundle/modules/layer/src/m1/p/resources/MyResource_en.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/layer/src/m1/p/resources/MyResource_en.properties rename to test/jdk/java/util/ResourceBundle/modules/layer/src/m1/p/resources/MyResource_en.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/layer/src/m1/p/resources/spi/MyResourceProvider.java b/test/jdk/java/util/ResourceBundle/modules/layer/src/m1/p/resources/spi/MyResourceProvider.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/layer/src/m1/p/resources/spi/MyResourceProvider.java rename to test/jdk/java/util/ResourceBundle/modules/layer/src/m1/p/resources/spi/MyResourceProvider.java diff --git a/jdk/test/java/util/ResourceBundle/modules/layer/src/m2/module-info.java b/test/jdk/java/util/ResourceBundle/modules/layer/src/m2/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/layer/src/m2/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/layer/src/m2/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/layer/src/m2/p/internal/BundleProvider.java b/test/jdk/java/util/ResourceBundle/modules/layer/src/m2/p/internal/BundleProvider.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/layer/src/m2/p/internal/BundleProvider.java rename to test/jdk/java/util/ResourceBundle/modules/layer/src/m2/p/internal/BundleProvider.java diff --git a/jdk/test/java/util/ResourceBundle/modules/layer/src/m2/p/resources/MyResource_ja.properties b/test/jdk/java/util/ResourceBundle/modules/layer/src/m2/p/resources/MyResource_ja.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/layer/src/m2/p/resources/MyResource_ja.properties rename to test/jdk/java/util/ResourceBundle/modules/layer/src/m2/p/resources/MyResource_ja.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/modlocal/modlocal.sh b/test/jdk/java/util/ResourceBundle/modules/modlocal/modlocal.sh similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/modlocal/modlocal.sh rename to test/jdk/java/util/ResourceBundle/modules/modlocal/modlocal.sh diff --git a/jdk/test/java/util/ResourceBundle/modules/modlocal/src/extra/jdk/test/resources/MyResources_vi.properties b/test/jdk/java/util/ResourceBundle/modules/modlocal/src/extra/jdk/test/resources/MyResources_vi.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/modlocal/src/extra/jdk/test/resources/MyResources_vi.properties rename to test/jdk/java/util/ResourceBundle/modules/modlocal/src/extra/jdk/test/resources/MyResources_vi.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/Main.java b/test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/Main.java rename to test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources.java b/test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources.java rename to test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources.java diff --git a/jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_de.java b/test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_de.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_de.java rename to test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_de.java diff --git a/jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_en.java b/test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_en.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_en.java rename to test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_en.java diff --git a/jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_fr.java b/test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_fr.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_fr.java rename to test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_fr.java diff --git a/jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_ja.properties b/test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_ja.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_ja.properties rename to test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_ja.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_zh.properties b/test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_zh.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_zh.properties rename to test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_zh.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_zh_TW.properties b/test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_zh_TW.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_zh_TW.properties rename to test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_zh_TW.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/module-info.java b/test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/modlocal/src/test/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/security/TestPermission.java b/test/jdk/java/util/ResourceBundle/modules/security/TestPermission.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/security/TestPermission.java rename to test/jdk/java/util/ResourceBundle/modules/security/TestPermission.java diff --git a/jdk/test/java/util/ResourceBundle/modules/security/src/m1/module-info.java b/test/jdk/java/util/ResourceBundle/modules/security/src/m1/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/security/src/m1/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/security/src/m1/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/security/src/m1/p1/Bundle.java b/test/jdk/java/util/ResourceBundle/modules/security/src/m1/p1/Bundle.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/security/src/m1/p1/Bundle.java rename to test/jdk/java/util/ResourceBundle/modules/security/src/m1/p1/Bundle.java diff --git a/jdk/test/java/util/ResourceBundle/modules/security/src/m1/p1/resources/MyResources.java b/test/jdk/java/util/ResourceBundle/modules/security/src/m1/p1/resources/MyResources.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/security/src/m1/p1/resources/MyResources.java rename to test/jdk/java/util/ResourceBundle/modules/security/src/m1/p1/resources/MyResources.java diff --git a/jdk/test/java/util/ResourceBundle/modules/security/src/test/jdk/test/Main.java b/test/jdk/java/util/ResourceBundle/modules/security/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/security/src/test/jdk/test/Main.java rename to test/jdk/java/util/ResourceBundle/modules/security/src/test/jdk/test/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/security/src/test/jdk/test/resources/TestResources.java b/test/jdk/java/util/ResourceBundle/modules/security/src/test/jdk/test/resources/TestResources.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/security/src/test/jdk/test/resources/TestResources.java rename to test/jdk/java/util/ResourceBundle/modules/security/src/test/jdk/test/resources/TestResources.java diff --git a/jdk/test/java/util/ResourceBundle/modules/security/src/test/module-info.java b/test/jdk/java/util/ResourceBundle/modules/security/src/test/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/security/src/test/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/security/src/test/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/simple/simple.sh b/test/jdk/java/util/ResourceBundle/modules/simple/simple.sh similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/simple/simple.sh rename to test/jdk/java/util/ResourceBundle/modules/simple/simple.sh diff --git a/jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources.java b/test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources.java rename to test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources.java diff --git a/jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_de.java b/test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_de.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_de.java rename to test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_de.java diff --git a/jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_en.java b/test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_en.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_en.java rename to test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_en.java diff --git a/jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_fr.java b/test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_fr.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_fr.java rename to test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_fr.java diff --git a/jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_ja.properties b/test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_ja.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_ja.properties rename to test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_ja.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_zh.properties b/test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_zh.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_zh.properties rename to test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_zh.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_zh_TW.properties b/test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_zh_TW.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_zh_TW.properties rename to test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_zh_TW.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java b/test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java rename to test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java diff --git a/jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/simple/src/bundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/simple/src/test/jdk/test/Main.java b/test/jdk/java/util/ResourceBundle/modules/simple/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/simple/src/test/jdk/test/Main.java rename to test/jdk/java/util/ResourceBundle/modules/simple/src/test/jdk/test/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/simple/src/test/module-info.java b/test/jdk/java/util/ResourceBundle/modules/simple/src/test/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/simple/src/test/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/simple/src/test/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/Main.java b/test/jdk/java/util/ResourceBundle/modules/unnamed/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/Main.java rename to test/jdk/java/util/ResourceBundle/modules/unnamed/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo.java b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo.java rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo.java diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_de.java b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_de.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_de.java rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_de.java diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_en.java b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_en.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_en.java rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_en.java diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_fr.java b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_fr.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_fr.java rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_fr.java diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_ja.properties b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_ja.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_ja.properties rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_ja.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_zh.properties b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_zh.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_zh.properties rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_zh.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_zh_TW.properties b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_zh_TW.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_zh_TW.properties rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/internal/resources/Foo_zh_TW.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources.java b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources.java rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources.java diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_de.java b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_de.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_de.java rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_de.java diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_en.java b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_en.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_en.java rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_en.java diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_fr.java b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_fr.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_fr.java rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_fr.java diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_ja.properties b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_ja.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_ja.properties rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_ja.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_zh.properties b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_zh.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_zh.properties rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_zh.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_zh_TW.properties b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_zh_TW.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_zh_TW.properties rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/jdk/test/resources/MyResources_zh_TW.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/src/bundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/unnamed/src/bundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/unnamed/unnamed.sh b/test/jdk/java/util/ResourceBundle/modules/unnamed/unnamed.sh similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/unnamed/unnamed.sh rename to test/jdk/java/util/ResourceBundle/modules/unnamed/unnamed.sh diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/embargo/jdk/embargo/TestWithNoModuleArg.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/embargo/jdk/embargo/TestWithNoModuleArg.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/embargo/jdk/embargo/TestWithNoModuleArg.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/embargo/jdk/embargo/TestWithNoModuleArg.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/embargo/jdk/embargo/TestWithUnnamedModuleArg.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/embargo/jdk/embargo/TestWithUnnamedModuleArg.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/embargo/jdk/embargo/TestWithUnnamedModuleArg.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/embargo/jdk/embargo/TestWithUnnamedModuleArg.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/embargo/module-info.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/embargo/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/embargo/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/embargo/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/classes/MyResources.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/classes/MyResources.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/classes/MyResources.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/classes/MyResources.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/classes/spi/MyResourcesProvider.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/classes/spi/MyResourcesProvider.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/classes/spi/MyResourcesProvider.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/classes/spi/MyResourcesProvider.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/props/MyResources.properties b/test/jdk/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/props/MyResources.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/props/MyResources.properties rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/props/MyResources.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/classes/MyResources.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/classes/MyResources.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/classes/MyResources.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/classes/MyResources.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/classes/spi/MyResourcesProvider.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/classes/spi/MyResourcesProvider.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/classes/spi/MyResourcesProvider.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/classes/spi/MyResourcesProvider.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/props/MyResources.properties b/test/jdk/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/props/MyResources.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/props/MyResources.properties rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/props/MyResources.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/props/spi/MyResourcesProvider.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/props/spi/MyResourcesProvider.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/props/spi/MyResourcesProvider.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/props/spi/MyResourcesProvider.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/named.bundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/named.bundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/named.bundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/named.bundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/resources/classes/MyResources.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/resources/classes/MyResources.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/resources/classes/MyResources.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/resources/classes/MyResources.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/resources/props/MyResources.properties b/test/jdk/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/resources/props/MyResources.properties similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/resources/props/MyResources.properties rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/resources/props/MyResources.properties diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/test/Main.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/test/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/test/Main.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/pkg/jdk/pkg/test/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/test/jdk/test/TestWithNoModuleArg.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/test/jdk/test/TestWithNoModuleArg.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/test/jdk/test/TestWithNoModuleArg.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/test/jdk/test/TestWithNoModuleArg.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/test/jdk/test/TestWithUnnamedModuleArg.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/test/jdk/test/TestWithUnnamedModuleArg.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/test/jdk/test/TestWithUnnamedModuleArg.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/test/jdk/test/TestWithUnnamedModuleArg.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/src/test/module-info.java b/test/jdk/java/util/ResourceBundle/modules/visibility/src/test/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/src/test/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/visibility/src/test/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/visibility/visibility.sh b/test/jdk/java/util/ResourceBundle/modules/visibility/visibility.sh similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/visibility/visibility.sh rename to test/jdk/java/util/ResourceBundle/modules/visibility/visibility.sh diff --git a/jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources.xml b/test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources.xml similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources.xml rename to test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources.xml diff --git a/jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_de.xml b/test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_de.xml similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_de.xml rename to test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_de.xml diff --git a/jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_en.xml b/test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_en.xml similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_en.xml rename to test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_en.xml diff --git a/jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_fr.xml b/test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_fr.xml similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_fr.xml rename to test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_fr.xml diff --git a/jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_ja.xml b/test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_ja.xml similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_ja.xml rename to test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_ja.xml diff --git a/jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_zh.xml b/test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_zh.xml similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_zh.xml rename to test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_zh.xml diff --git a/jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_zh_TW.xml b/test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_zh_TW.xml similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_zh_TW.xml rename to test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_zh_TW.xml diff --git a/jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java b/test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java rename to test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java diff --git a/jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/module-info.java b/test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/xmlformat/src/bundles/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/xmlformat/src/test/jdk/test/Main.java b/test/jdk/java/util/ResourceBundle/modules/xmlformat/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/xmlformat/src/test/jdk/test/Main.java rename to test/jdk/java/util/ResourceBundle/modules/xmlformat/src/test/jdk/test/Main.java diff --git a/jdk/test/java/util/ResourceBundle/modules/xmlformat/src/test/module-info.java b/test/jdk/java/util/ResourceBundle/modules/xmlformat/src/test/module-info.java similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/xmlformat/src/test/module-info.java rename to test/jdk/java/util/ResourceBundle/modules/xmlformat/src/test/module-info.java diff --git a/jdk/test/java/util/ResourceBundle/modules/xmlformat/xmlformat.sh b/test/jdk/java/util/ResourceBundle/modules/xmlformat/xmlformat.sh similarity index 100% rename from jdk/test/java/util/ResourceBundle/modules/xmlformat/xmlformat.sh rename to test/jdk/java/util/ResourceBundle/modules/xmlformat/xmlformat.sh diff --git a/jdk/test/java/util/Scanner/FailingConstructors.java b/test/jdk/java/util/Scanner/FailingConstructors.java similarity index 100% rename from jdk/test/java/util/Scanner/FailingConstructors.java rename to test/jdk/java/util/Scanner/FailingConstructors.java diff --git a/jdk/test/java/util/Scanner/ScanTest.java b/test/jdk/java/util/Scanner/ScanTest.java similarity index 100% rename from jdk/test/java/util/Scanner/ScanTest.java rename to test/jdk/java/util/Scanner/ScanTest.java diff --git a/jdk/test/java/util/Scanner/ScannerStreamTest.java b/test/jdk/java/util/Scanner/ScannerStreamTest.java similarity index 100% rename from jdk/test/java/util/Scanner/ScannerStreamTest.java rename to test/jdk/java/util/Scanner/ScannerStreamTest.java diff --git a/jdk/test/java/util/Scanner/input.txt b/test/jdk/java/util/Scanner/input.txt similarity index 100% rename from jdk/test/java/util/Scanner/input.txt rename to test/jdk/java/util/Scanner/input.txt diff --git a/jdk/test/java/util/ServiceLoader/BadProvidersTest.java b/test/jdk/java/util/ServiceLoader/BadProvidersTest.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/BadProvidersTest.java rename to test/jdk/java/util/ServiceLoader/BadProvidersTest.java diff --git a/jdk/test/java/util/ServiceLoader/ModulesTest.java b/test/jdk/java/util/ServiceLoader/ModulesTest.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/ModulesTest.java rename to test/jdk/java/util/ServiceLoader/ModulesTest.java diff --git a/jdk/test/java/util/ServiceLoader/NPE.java b/test/jdk/java/util/ServiceLoader/NPE.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/NPE.java rename to test/jdk/java/util/ServiceLoader/NPE.java diff --git a/jdk/test/java/util/ServiceLoader/NoInterferenceTest.java b/test/jdk/java/util/ServiceLoader/NoInterferenceTest.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/NoInterferenceTest.java rename to test/jdk/java/util/ServiceLoader/NoInterferenceTest.java diff --git a/jdk/test/java/util/ServiceLoader/ReloadTest.java b/test/jdk/java/util/ServiceLoader/ReloadTest.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/ReloadTest.java rename to test/jdk/java/util/ServiceLoader/ReloadTest.java diff --git a/jdk/test/java/util/ServiceLoader/TwoIterators.java b/test/jdk/java/util/ServiceLoader/TwoIterators.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/TwoIterators.java rename to test/jdk/java/util/ServiceLoader/TwoIterators.java diff --git a/jdk/test/java/util/ServiceLoader/badfactories/badreturntype/ProviderFactory.java b/test/jdk/java/util/ServiceLoader/badfactories/badreturntype/ProviderFactory.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badfactories/badreturntype/ProviderFactory.java rename to test/jdk/java/util/ServiceLoader/badfactories/badreturntype/ProviderFactory.java diff --git a/jdk/test/java/util/ServiceLoader/badfactories/classnotpublic/ProviderFactory.java b/test/jdk/java/util/ServiceLoader/badfactories/classnotpublic/ProviderFactory.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badfactories/classnotpublic/ProviderFactory.java rename to test/jdk/java/util/ServiceLoader/badfactories/classnotpublic/ProviderFactory.java diff --git a/jdk/test/java/util/ServiceLoader/badfactories/classnotpublic/Service.java b/test/jdk/java/util/ServiceLoader/badfactories/classnotpublic/Service.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badfactories/classnotpublic/Service.java rename to test/jdk/java/util/ServiceLoader/badfactories/classnotpublic/Service.java diff --git a/jdk/test/java/util/ServiceLoader/badfactories/methodnotpublic/ProviderFactory.java b/test/jdk/java/util/ServiceLoader/badfactories/methodnotpublic/ProviderFactory.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badfactories/methodnotpublic/ProviderFactory.java rename to test/jdk/java/util/ServiceLoader/badfactories/methodnotpublic/ProviderFactory.java diff --git a/jdk/test/java/util/ServiceLoader/badfactories/methodnotpublic/Service.java b/test/jdk/java/util/ServiceLoader/badfactories/methodnotpublic/Service.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badfactories/methodnotpublic/Service.java rename to test/jdk/java/util/ServiceLoader/badfactories/methodnotpublic/Service.java diff --git a/jdk/test/java/util/ServiceLoader/badfactories/returnsnull/ProviderFactory.java b/test/jdk/java/util/ServiceLoader/badfactories/returnsnull/ProviderFactory.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badfactories/returnsnull/ProviderFactory.java rename to test/jdk/java/util/ServiceLoader/badfactories/returnsnull/ProviderFactory.java diff --git a/jdk/test/java/util/ServiceLoader/badfactories/returnsnull/Service.java b/test/jdk/java/util/ServiceLoader/badfactories/returnsnull/Service.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badfactories/returnsnull/Service.java rename to test/jdk/java/util/ServiceLoader/badfactories/returnsnull/Service.java diff --git a/jdk/test/java/util/ServiceLoader/badfactories/throwsexception/ProviderFactory.java b/test/jdk/java/util/ServiceLoader/badfactories/throwsexception/ProviderFactory.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badfactories/throwsexception/ProviderFactory.java rename to test/jdk/java/util/ServiceLoader/badfactories/throwsexception/ProviderFactory.java diff --git a/jdk/test/java/util/ServiceLoader/badfactories/throwsexception/Service.java b/test/jdk/java/util/ServiceLoader/badfactories/throwsexception/Service.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badfactories/throwsexception/Service.java rename to test/jdk/java/util/ServiceLoader/badfactories/throwsexception/Service.java diff --git a/jdk/test/java/util/ServiceLoader/badproviders/ctornotpublic/Provider.java b/test/jdk/java/util/ServiceLoader/badproviders/ctornotpublic/Provider.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badproviders/ctornotpublic/Provider.java rename to test/jdk/java/util/ServiceLoader/badproviders/ctornotpublic/Provider.java diff --git a/jdk/test/java/util/ServiceLoader/badproviders/ctornotpublic/Service.java b/test/jdk/java/util/ServiceLoader/badproviders/ctornotpublic/Service.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badproviders/ctornotpublic/Service.java rename to test/jdk/java/util/ServiceLoader/badproviders/ctornotpublic/Service.java diff --git a/jdk/test/java/util/ServiceLoader/badproviders/notasubtype/Provider.java b/test/jdk/java/util/ServiceLoader/badproviders/notasubtype/Provider.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badproviders/notasubtype/Provider.java rename to test/jdk/java/util/ServiceLoader/badproviders/notasubtype/Provider.java diff --git a/jdk/test/java/util/ServiceLoader/badproviders/notpublic/Provider.java b/test/jdk/java/util/ServiceLoader/badproviders/notpublic/Provider.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badproviders/notpublic/Provider.java rename to test/jdk/java/util/ServiceLoader/badproviders/notpublic/Provider.java diff --git a/jdk/test/java/util/ServiceLoader/badproviders/notpublic/Service.java b/test/jdk/java/util/ServiceLoader/badproviders/notpublic/Service.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badproviders/notpublic/Service.java rename to test/jdk/java/util/ServiceLoader/badproviders/notpublic/Service.java diff --git a/jdk/test/java/util/ServiceLoader/badproviders/throwsexception/Provider.java b/test/jdk/java/util/ServiceLoader/badproviders/throwsexception/Provider.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badproviders/throwsexception/Provider.java rename to test/jdk/java/util/ServiceLoader/badproviders/throwsexception/Provider.java diff --git a/jdk/test/java/util/ServiceLoader/badproviders/throwsexception/Service.java b/test/jdk/java/util/ServiceLoader/badproviders/throwsexception/Service.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/badproviders/throwsexception/Service.java rename to test/jdk/java/util/ServiceLoader/badproviders/throwsexception/Service.java diff --git a/jdk/test/java/util/ServiceLoader/basic/BarProvider.java b/test/jdk/java/util/ServiceLoader/basic/BarProvider.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/basic/BarProvider.java rename to test/jdk/java/util/ServiceLoader/basic/BarProvider.java diff --git a/jdk/test/java/util/ServiceLoader/basic/Basic.java b/test/jdk/java/util/ServiceLoader/basic/Basic.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/basic/Basic.java rename to test/jdk/java/util/ServiceLoader/basic/Basic.java diff --git a/jdk/test/java/util/ServiceLoader/basic/FooProvider1.java b/test/jdk/java/util/ServiceLoader/basic/FooProvider1.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/basic/FooProvider1.java rename to test/jdk/java/util/ServiceLoader/basic/FooProvider1.java diff --git a/jdk/test/java/util/ServiceLoader/basic/FooProvider2.java b/test/jdk/java/util/ServiceLoader/basic/FooProvider2.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/basic/FooProvider2.java rename to test/jdk/java/util/ServiceLoader/basic/FooProvider2.java diff --git a/jdk/test/java/util/ServiceLoader/basic/FooProvider3.java b/test/jdk/java/util/ServiceLoader/basic/FooProvider3.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/basic/FooProvider3.java rename to test/jdk/java/util/ServiceLoader/basic/FooProvider3.java diff --git a/jdk/test/java/util/ServiceLoader/basic/FooService.java b/test/jdk/java/util/ServiceLoader/basic/FooService.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/basic/FooService.java rename to test/jdk/java/util/ServiceLoader/basic/FooService.java diff --git a/jdk/test/java/util/ServiceLoader/basic/Load.java b/test/jdk/java/util/ServiceLoader/basic/Load.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/basic/Load.java rename to test/jdk/java/util/ServiceLoader/basic/Load.java diff --git a/jdk/test/java/util/ServiceLoader/basic/basic.sh b/test/jdk/java/util/ServiceLoader/basic/basic.sh similarity index 100% rename from jdk/test/java/util/ServiceLoader/basic/basic.sh rename to test/jdk/java/util/ServiceLoader/basic/basic.sh diff --git a/jdk/test/java/util/ServiceLoader/classpath/pearscript/META-INF/services/javax.script.ScriptEngineFactory b/test/jdk/java/util/ServiceLoader/classpath/pearscript/META-INF/services/javax.script.ScriptEngineFactory similarity index 100% rename from jdk/test/java/util/ServiceLoader/classpath/pearscript/META-INF/services/javax.script.ScriptEngineFactory rename to test/jdk/java/util/ServiceLoader/classpath/pearscript/META-INF/services/javax.script.ScriptEngineFactory diff --git a/jdk/test/java/util/ServiceLoader/classpath/pearscript/org/pear/PearScript.java b/test/jdk/java/util/ServiceLoader/classpath/pearscript/org/pear/PearScript.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/classpath/pearscript/org/pear/PearScript.java rename to test/jdk/java/util/ServiceLoader/classpath/pearscript/org/pear/PearScript.java diff --git a/jdk/test/java/util/ServiceLoader/classpath/pearscript/org/pear/PearScriptEngineFactory.java b/test/jdk/java/util/ServiceLoader/classpath/pearscript/org/pear/PearScriptEngineFactory.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/classpath/pearscript/org/pear/PearScriptEngineFactory.java rename to test/jdk/java/util/ServiceLoader/classpath/pearscript/org/pear/PearScriptEngineFactory.java diff --git a/jdk/test/java/util/ServiceLoader/inheritance/NoInheritanceTest.java b/test/jdk/java/util/ServiceLoader/inheritance/NoInheritanceTest.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/inheritance/NoInheritanceTest.java rename to test/jdk/java/util/ServiceLoader/inheritance/NoInheritanceTest.java diff --git a/jdk/test/java/util/ServiceLoader/inheritance/test/module-info.java b/test/jdk/java/util/ServiceLoader/inheritance/test/module-info.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/inheritance/test/module-info.java rename to test/jdk/java/util/ServiceLoader/inheritance/test/module-info.java diff --git a/jdk/test/java/util/ServiceLoader/inheritance/test/p/Main.java b/test/jdk/java/util/ServiceLoader/inheritance/test/p/Main.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/inheritance/test/p/Main.java rename to test/jdk/java/util/ServiceLoader/inheritance/test/p/Main.java diff --git a/jdk/test/java/util/ServiceLoader/modules/bananascript/module-info.java b/test/jdk/java/util/ServiceLoader/modules/bananascript/module-info.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/bananascript/module-info.java rename to test/jdk/java/util/ServiceLoader/modules/bananascript/module-info.java diff --git a/jdk/test/java/util/ServiceLoader/modules/bananascript/org/banana/BananaScript.java b/test/jdk/java/util/ServiceLoader/modules/bananascript/org/banana/BananaScript.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/bananascript/org/banana/BananaScript.java rename to test/jdk/java/util/ServiceLoader/modules/bananascript/org/banana/BananaScript.java diff --git a/jdk/test/java/util/ServiceLoader/modules/bananascript/org/banana/BananaScriptEngineFactory.java b/test/jdk/java/util/ServiceLoader/modules/bananascript/org/banana/BananaScriptEngineFactory.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/bananascript/org/banana/BananaScriptEngineFactory.java rename to test/jdk/java/util/ServiceLoader/modules/bananascript/org/banana/BananaScriptEngineFactory.java diff --git a/jdk/test/java/util/ServiceLoader/modules/p1/module-info.java b/test/jdk/java/util/ServiceLoader/modules/p1/module-info.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/p1/module-info.java rename to test/jdk/java/util/ServiceLoader/modules/p1/module-info.java diff --git a/jdk/test/java/util/ServiceLoader/modules/p1/q/P.java b/test/jdk/java/util/ServiceLoader/modules/p1/q/P.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/p1/q/P.java rename to test/jdk/java/util/ServiceLoader/modules/p1/q/P.java diff --git a/jdk/test/java/util/ServiceLoader/modules/p2/module-info.java b/test/jdk/java/util/ServiceLoader/modules/p2/module-info.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/p2/module-info.java rename to test/jdk/java/util/ServiceLoader/modules/p2/module-info.java diff --git a/jdk/test/java/util/ServiceLoader/modules/p2/q/P.java b/test/jdk/java/util/ServiceLoader/modules/p2/q/P.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/p2/q/P.java rename to test/jdk/java/util/ServiceLoader/modules/p2/q/P.java diff --git a/jdk/test/java/util/ServiceLoader/modules/s1/module-info.java b/test/jdk/java/util/ServiceLoader/modules/s1/module-info.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/s1/module-info.java rename to test/jdk/java/util/ServiceLoader/modules/s1/module-info.java diff --git a/jdk/test/java/util/ServiceLoader/modules/s1/p/S.java b/test/jdk/java/util/ServiceLoader/modules/s1/p/S.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/s1/p/S.java rename to test/jdk/java/util/ServiceLoader/modules/s1/p/S.java diff --git a/jdk/test/java/util/ServiceLoader/modules/s2/module-info.java b/test/jdk/java/util/ServiceLoader/modules/s2/module-info.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/s2/module-info.java rename to test/jdk/java/util/ServiceLoader/modules/s2/module-info.java diff --git a/jdk/test/java/util/ServiceLoader/modules/s2/p/S.java b/test/jdk/java/util/ServiceLoader/modules/s2/p/S.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/s2/p/S.java rename to test/jdk/java/util/ServiceLoader/modules/s2/p/S.java diff --git a/jdk/test/java/util/ServiceLoader/modules/test1/module-info.java b/test/jdk/java/util/ServiceLoader/modules/test1/module-info.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/test1/module-info.java rename to test/jdk/java/util/ServiceLoader/modules/test1/module-info.java diff --git a/jdk/test/java/util/ServiceLoader/modules/test1/p/ProviderFactory.java b/test/jdk/java/util/ServiceLoader/modules/test1/p/ProviderFactory.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/test1/p/ProviderFactory.java rename to test/jdk/java/util/ServiceLoader/modules/test1/p/ProviderFactory.java diff --git a/jdk/test/java/util/ServiceLoader/modules/test1/p/Service.java b/test/jdk/java/util/ServiceLoader/modules/test1/p/Service.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/test1/p/Service.java rename to test/jdk/java/util/ServiceLoader/modules/test1/p/Service.java diff --git a/jdk/test/java/util/ServiceLoader/modules/test2/module-info.java b/test/jdk/java/util/ServiceLoader/modules/test2/module-info.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/test2/module-info.java rename to test/jdk/java/util/ServiceLoader/modules/test2/module-info.java diff --git a/jdk/test/java/util/ServiceLoader/modules/test2/p/Provider.java b/test/jdk/java/util/ServiceLoader/modules/test2/p/Provider.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/test2/p/Provider.java rename to test/jdk/java/util/ServiceLoader/modules/test2/p/Provider.java diff --git a/jdk/test/java/util/ServiceLoader/modules/test2/p/Service.java b/test/jdk/java/util/ServiceLoader/modules/test2/p/Service.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/modules/test2/p/Service.java rename to test/jdk/java/util/ServiceLoader/modules/test2/p/Service.java diff --git a/jdk/test/java/util/ServiceLoader/nouses/NoUsesTest.java b/test/jdk/java/util/ServiceLoader/nouses/NoUsesTest.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/nouses/NoUsesTest.java rename to test/jdk/java/util/ServiceLoader/nouses/NoUsesTest.java diff --git a/jdk/test/java/util/ServiceLoader/nouses/test/module-info.java b/test/jdk/java/util/ServiceLoader/nouses/test/module-info.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/nouses/test/module-info.java rename to test/jdk/java/util/ServiceLoader/nouses/test/module-info.java diff --git a/jdk/test/java/util/ServiceLoader/nouses/test/p/Main.java b/test/jdk/java/util/ServiceLoader/nouses/test/p/Main.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/nouses/test/p/Main.java rename to test/jdk/java/util/ServiceLoader/nouses/test/p/Main.java diff --git a/jdk/test/java/util/ServiceLoader/security/SecurityTest.java b/test/jdk/java/util/ServiceLoader/security/SecurityTest.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/security/SecurityTest.java rename to test/jdk/java/util/ServiceLoader/security/SecurityTest.java diff --git a/jdk/test/java/util/ServiceLoader/security/test/module-info.java b/test/jdk/java/util/ServiceLoader/security/test/module-info.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/security/test/module-info.java rename to test/jdk/java/util/ServiceLoader/security/test/module-info.java diff --git a/jdk/test/java/util/ServiceLoader/security/test/p/Tests.java b/test/jdk/java/util/ServiceLoader/security/test/p/Tests.java similarity index 100% rename from jdk/test/java/util/ServiceLoader/security/test/p/Tests.java rename to test/jdk/java/util/ServiceLoader/security/test/p/Tests.java diff --git a/jdk/test/java/util/Spliterator/SpliteratorCharacteristics.java b/test/jdk/java/util/Spliterator/SpliteratorCharacteristics.java similarity index 100% rename from jdk/test/java/util/Spliterator/SpliteratorCharacteristics.java rename to test/jdk/java/util/Spliterator/SpliteratorCharacteristics.java diff --git a/jdk/test/java/util/Spliterator/SpliteratorCollisions.java b/test/jdk/java/util/Spliterator/SpliteratorCollisions.java similarity index 100% rename from jdk/test/java/util/Spliterator/SpliteratorCollisions.java rename to test/jdk/java/util/Spliterator/SpliteratorCollisions.java diff --git a/jdk/test/java/util/Spliterator/SpliteratorFailFastTest.java b/test/jdk/java/util/Spliterator/SpliteratorFailFastTest.java similarity index 100% rename from jdk/test/java/util/Spliterator/SpliteratorFailFastTest.java rename to test/jdk/java/util/Spliterator/SpliteratorFailFastTest.java diff --git a/jdk/test/java/util/Spliterator/SpliteratorLateBindingFailFastHelper.java b/test/jdk/java/util/Spliterator/SpliteratorLateBindingFailFastHelper.java similarity index 100% rename from jdk/test/java/util/Spliterator/SpliteratorLateBindingFailFastHelper.java rename to test/jdk/java/util/Spliterator/SpliteratorLateBindingFailFastHelper.java diff --git a/jdk/test/java/util/Spliterator/SpliteratorLateBindingTest.java b/test/jdk/java/util/Spliterator/SpliteratorLateBindingTest.java similarity index 100% rename from jdk/test/java/util/Spliterator/SpliteratorLateBindingTest.java rename to test/jdk/java/util/Spliterator/SpliteratorLateBindingTest.java diff --git a/jdk/test/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java b/test/jdk/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java similarity index 100% rename from jdk/test/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java rename to test/jdk/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java diff --git a/jdk/test/java/util/StringJoiner/MergeTest.java b/test/jdk/java/util/StringJoiner/MergeTest.java similarity index 100% rename from jdk/test/java/util/StringJoiner/MergeTest.java rename to test/jdk/java/util/StringJoiner/MergeTest.java diff --git a/jdk/test/java/util/StringJoiner/StringJoinerTest.java b/test/jdk/java/util/StringJoiner/StringJoinerTest.java similarity index 100% rename from jdk/test/java/util/StringJoiner/StringJoinerTest.java rename to test/jdk/java/util/StringJoiner/StringJoinerTest.java diff --git a/jdk/test/java/util/StringTokenizer/FormFeed.java b/test/jdk/java/util/StringTokenizer/FormFeed.java similarity index 100% rename from jdk/test/java/util/StringTokenizer/FormFeed.java rename to test/jdk/java/util/StringTokenizer/FormFeed.java diff --git a/jdk/test/java/util/StringTokenizer/ResetPos.java b/test/jdk/java/util/StringTokenizer/ResetPos.java similarity index 100% rename from jdk/test/java/util/StringTokenizer/ResetPos.java rename to test/jdk/java/util/StringTokenizer/ResetPos.java diff --git a/jdk/test/java/util/StringTokenizer/Supplementary.java b/test/jdk/java/util/StringTokenizer/Supplementary.java similarity index 100% rename from jdk/test/java/util/StringTokenizer/Supplementary.java rename to test/jdk/java/util/StringTokenizer/Supplementary.java diff --git a/jdk/test/java/util/TimSort/ArrayBuilder.java b/test/jdk/java/util/TimSort/ArrayBuilder.java similarity index 100% rename from jdk/test/java/util/TimSort/ArrayBuilder.java rename to test/jdk/java/util/TimSort/ArrayBuilder.java diff --git a/jdk/test/java/util/TimSort/README b/test/jdk/java/util/TimSort/README similarity index 100% rename from jdk/test/java/util/TimSort/README rename to test/jdk/java/util/TimSort/README diff --git a/jdk/test/java/util/TimSort/SortPerf.java b/test/jdk/java/util/TimSort/SortPerf.java similarity index 100% rename from jdk/test/java/util/TimSort/SortPerf.java rename to test/jdk/java/util/TimSort/SortPerf.java diff --git a/jdk/test/java/util/TimSort/Sorter.java b/test/jdk/java/util/TimSort/Sorter.java similarity index 100% rename from jdk/test/java/util/TimSort/Sorter.java rename to test/jdk/java/util/TimSort/Sorter.java diff --git a/jdk/test/java/util/TimeZone/Bug4322313.java b/test/jdk/java/util/TimeZone/Bug4322313.java similarity index 100% rename from jdk/test/java/util/TimeZone/Bug4322313.java rename to test/jdk/java/util/TimeZone/Bug4322313.java diff --git a/jdk/test/java/util/TimeZone/Bug5097350.java b/test/jdk/java/util/TimeZone/Bug5097350.java similarity index 100% rename from jdk/test/java/util/TimeZone/Bug5097350.java rename to test/jdk/java/util/TimeZone/Bug5097350.java diff --git a/jdk/test/java/util/TimeZone/Bug6772689.java b/test/jdk/java/util/TimeZone/Bug6772689.java similarity index 100% rename from jdk/test/java/util/TimeZone/Bug6772689.java rename to test/jdk/java/util/TimeZone/Bug6772689.java diff --git a/jdk/test/java/util/TimeZone/Bug6912560.java b/test/jdk/java/util/TimeZone/Bug6912560.java similarity index 100% rename from jdk/test/java/util/TimeZone/Bug6912560.java rename to test/jdk/java/util/TimeZone/Bug6912560.java diff --git a/jdk/test/java/util/TimeZone/Bug8066652.java b/test/jdk/java/util/TimeZone/Bug8066652.java similarity index 100% rename from jdk/test/java/util/TimeZone/Bug8066652.java rename to test/jdk/java/util/TimeZone/Bug8066652.java diff --git a/jdk/test/java/util/TimeZone/Bug8066652.sh b/test/jdk/java/util/TimeZone/Bug8066652.sh similarity index 100% rename from jdk/test/java/util/TimeZone/Bug8066652.sh rename to test/jdk/java/util/TimeZone/Bug8066652.sh diff --git a/jdk/test/java/util/TimeZone/Bug8149452.java b/test/jdk/java/util/TimeZone/Bug8149452.java similarity index 100% rename from jdk/test/java/util/TimeZone/Bug8149452.java rename to test/jdk/java/util/TimeZone/Bug8149452.java diff --git a/jdk/test/java/util/TimeZone/Bug8167143.java b/test/jdk/java/util/TimeZone/Bug8167143.java similarity index 100% rename from jdk/test/java/util/TimeZone/Bug8167143.java rename to test/jdk/java/util/TimeZone/Bug8167143.java diff --git a/jdk/test/java/util/TimeZone/CLDRDisplayNamesTest.java b/test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java similarity index 100% rename from jdk/test/java/util/TimeZone/CLDRDisplayNamesTest.java rename to test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java diff --git a/jdk/test/java/util/TimeZone/DaylightTimeTest.java b/test/jdk/java/util/TimeZone/DaylightTimeTest.java similarity index 100% rename from jdk/test/java/util/TimeZone/DaylightTimeTest.java rename to test/jdk/java/util/TimeZone/DaylightTimeTest.java diff --git a/jdk/test/java/util/TimeZone/DefaultTimeZoneTest.html b/test/jdk/java/util/TimeZone/DefaultTimeZoneTest.html similarity index 100% rename from jdk/test/java/util/TimeZone/DefaultTimeZoneTest.html rename to test/jdk/java/util/TimeZone/DefaultTimeZoneTest.html diff --git a/jdk/test/java/util/TimeZone/DefaultTimeZoneTest.java b/test/jdk/java/util/TimeZone/DefaultTimeZoneTest.java similarity index 100% rename from jdk/test/java/util/TimeZone/DefaultTimeZoneTest.java rename to test/jdk/java/util/TimeZone/DefaultTimeZoneTest.java diff --git a/jdk/test/java/util/TimeZone/HongKong.java b/test/jdk/java/util/TimeZone/HongKong.java similarity index 100% rename from jdk/test/java/util/TimeZone/HongKong.java rename to test/jdk/java/util/TimeZone/HongKong.java diff --git a/jdk/test/java/util/TimeZone/IDTest.java b/test/jdk/java/util/TimeZone/IDTest.java similarity index 100% rename from jdk/test/java/util/TimeZone/IDTest.java rename to test/jdk/java/util/TimeZone/IDTest.java diff --git a/jdk/test/java/util/TimeZone/ListTimeZones.java b/test/jdk/java/util/TimeZone/ListTimeZones.java similarity index 100% rename from jdk/test/java/util/TimeZone/ListTimeZones.java rename to test/jdk/java/util/TimeZone/ListTimeZones.java diff --git a/jdk/test/java/util/TimeZone/OldIDMappingTest.java b/test/jdk/java/util/TimeZone/OldIDMappingTest.java similarity index 100% rename from jdk/test/java/util/TimeZone/OldIDMappingTest.java rename to test/jdk/java/util/TimeZone/OldIDMappingTest.java diff --git a/jdk/test/java/util/TimeZone/OldIDMappingTest.sh b/test/jdk/java/util/TimeZone/OldIDMappingTest.sh similarity index 100% rename from jdk/test/java/util/TimeZone/OldIDMappingTest.sh rename to test/jdk/java/util/TimeZone/OldIDMappingTest.sh diff --git a/jdk/test/java/util/TimeZone/SetDefaultSecurityTest.java b/test/jdk/java/util/TimeZone/SetDefaultSecurityTest.java similarity index 100% rename from jdk/test/java/util/TimeZone/SetDefaultSecurityTest.java rename to test/jdk/java/util/TimeZone/SetDefaultSecurityTest.java diff --git a/jdk/test/java/util/TimeZone/TimeZoneBoundaryTest.java b/test/jdk/java/util/TimeZone/TimeZoneBoundaryTest.java similarity index 100% rename from jdk/test/java/util/TimeZone/TimeZoneBoundaryTest.java rename to test/jdk/java/util/TimeZone/TimeZoneBoundaryTest.java diff --git a/jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.java b/test/jdk/java/util/TimeZone/TimeZoneDatePermissionCheck.java similarity index 100% rename from jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.java rename to test/jdk/java/util/TimeZone/TimeZoneDatePermissionCheck.java diff --git a/jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh b/test/jdk/java/util/TimeZone/TimeZoneDatePermissionCheck.sh similarity index 100% rename from jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh rename to test/jdk/java/util/TimeZone/TimeZoneDatePermissionCheck.sh diff --git a/jdk/test/java/util/TimeZone/TimeZoneRegression.java b/test/jdk/java/util/TimeZone/TimeZoneRegression.java similarity index 100% rename from jdk/test/java/util/TimeZone/TimeZoneRegression.java rename to test/jdk/java/util/TimeZone/TimeZoneRegression.java diff --git a/jdk/test/java/util/TimeZone/TimeZoneTest.java b/test/jdk/java/util/TimeZone/TimeZoneTest.java similarity index 100% rename from jdk/test/java/util/TimeZone/TimeZoneTest.java rename to test/jdk/java/util/TimeZone/TimeZoneTest.java diff --git a/jdk/test/java/util/TimeZone/TransitionTest.java b/test/jdk/java/util/TimeZone/TransitionTest.java similarity index 100% rename from jdk/test/java/util/TimeZone/TransitionTest.java rename to test/jdk/java/util/TimeZone/TransitionTest.java diff --git a/jdk/test/java/util/TimeZone/TzIDOldMapping.java b/test/jdk/java/util/TimeZone/TzIDOldMapping.java similarity index 100% rename from jdk/test/java/util/TimeZone/TzIDOldMapping.java rename to test/jdk/java/util/TimeZone/TzIDOldMapping.java diff --git a/jdk/test/java/util/TimeZone/UTCAliasTest.java b/test/jdk/java/util/TimeZone/UTCAliasTest.java similarity index 100% rename from jdk/test/java/util/TimeZone/UTCAliasTest.java rename to test/jdk/java/util/TimeZone/UTCAliasTest.java diff --git a/jdk/test/java/util/TimeZone/bug4096952.java b/test/jdk/java/util/TimeZone/bug4096952.java similarity index 100% rename from jdk/test/java/util/TimeZone/bug4096952.java rename to test/jdk/java/util/TimeZone/bug4096952.java diff --git a/jdk/test/java/util/Timer/Args.java b/test/jdk/java/util/Timer/Args.java similarity index 100% rename from jdk/test/java/util/Timer/Args.java rename to test/jdk/java/util/Timer/Args.java diff --git a/jdk/test/java/util/Timer/DelayOverflow.java b/test/jdk/java/util/Timer/DelayOverflow.java similarity index 100% rename from jdk/test/java/util/Timer/DelayOverflow.java rename to test/jdk/java/util/Timer/DelayOverflow.java diff --git a/jdk/test/java/util/Timer/KillThread.java b/test/jdk/java/util/Timer/KillThread.java similarity index 100% rename from jdk/test/java/util/Timer/KillThread.java rename to test/jdk/java/util/Timer/KillThread.java diff --git a/jdk/test/java/util/Timer/NameConstructors.java b/test/jdk/java/util/Timer/NameConstructors.java similarity index 100% rename from jdk/test/java/util/Timer/NameConstructors.java rename to test/jdk/java/util/Timer/NameConstructors.java diff --git a/jdk/test/java/util/Timer/Purge.java b/test/jdk/java/util/Timer/Purge.java similarity index 100% rename from jdk/test/java/util/Timer/Purge.java rename to test/jdk/java/util/Timer/Purge.java diff --git a/jdk/test/java/util/TreeMap/Clone.java b/test/jdk/java/util/TreeMap/Clone.java similarity index 100% rename from jdk/test/java/util/TreeMap/Clone.java rename to test/jdk/java/util/TreeMap/Clone.java diff --git a/jdk/test/java/util/TreeMap/ContainsValue.java b/test/jdk/java/util/TreeMap/ContainsValue.java similarity index 100% rename from jdk/test/java/util/TreeMap/ContainsValue.java rename to test/jdk/java/util/TreeMap/ContainsValue.java diff --git a/jdk/test/java/util/TreeMap/EmptyMapAndNulls.java b/test/jdk/java/util/TreeMap/EmptyMapAndNulls.java similarity index 100% rename from jdk/test/java/util/TreeMap/EmptyMapAndNulls.java rename to test/jdk/java/util/TreeMap/EmptyMapAndNulls.java diff --git a/jdk/test/java/util/TreeMap/HeadTailTypeError.java b/test/jdk/java/util/TreeMap/HeadTailTypeError.java similarity index 100% rename from jdk/test/java/util/TreeMap/HeadTailTypeError.java rename to test/jdk/java/util/TreeMap/HeadTailTypeError.java diff --git a/jdk/test/java/util/TreeMap/NullAtEnd.java b/test/jdk/java/util/TreeMap/NullAtEnd.java similarity index 100% rename from jdk/test/java/util/TreeMap/NullAtEnd.java rename to test/jdk/java/util/TreeMap/NullAtEnd.java diff --git a/jdk/test/java/util/TreeMap/NullPermissiveComparator.java b/test/jdk/java/util/TreeMap/NullPermissiveComparator.java similarity index 100% rename from jdk/test/java/util/TreeMap/NullPermissiveComparator.java rename to test/jdk/java/util/TreeMap/NullPermissiveComparator.java diff --git a/jdk/test/java/util/TreeMap/SubMap.java b/test/jdk/java/util/TreeMap/SubMap.java similarity index 100% rename from jdk/test/java/util/TreeMap/SubMap.java rename to test/jdk/java/util/TreeMap/SubMap.java diff --git a/jdk/test/java/util/TreeMap/SubMapClear.java b/test/jdk/java/util/TreeMap/SubMapClear.java similarity index 100% rename from jdk/test/java/util/TreeMap/SubMapClear.java rename to test/jdk/java/util/TreeMap/SubMapClear.java diff --git a/jdk/test/java/util/UUID/Serial.java b/test/jdk/java/util/UUID/Serial.java similarity index 100% rename from jdk/test/java/util/UUID/Serial.java rename to test/jdk/java/util/UUID/Serial.java diff --git a/jdk/test/java/util/UUID/UUIDTest.java b/test/jdk/java/util/UUID/UUIDTest.java similarity index 100% rename from jdk/test/java/util/UUID/UUIDTest.java rename to test/jdk/java/util/UUID/UUIDTest.java diff --git a/jdk/test/java/util/Vector/ArrayManagement.java b/test/jdk/java/util/Vector/ArrayManagement.java similarity index 100% rename from jdk/test/java/util/Vector/ArrayManagement.java rename to test/jdk/java/util/Vector/ArrayManagement.java diff --git a/jdk/test/java/util/Vector/Bug8148174.java b/test/jdk/java/util/Vector/Bug8148174.java similarity index 100% rename from jdk/test/java/util/Vector/Bug8148174.java rename to test/jdk/java/util/Vector/Bug8148174.java diff --git a/jdk/test/java/util/Vector/ComodifiedRemoveAllElements.java b/test/jdk/java/util/Vector/ComodifiedRemoveAllElements.java similarity index 100% rename from jdk/test/java/util/Vector/ComodifiedRemoveAllElements.java rename to test/jdk/java/util/Vector/ComodifiedRemoveAllElements.java diff --git a/jdk/test/java/util/Vector/CopyInto.java b/test/jdk/java/util/Vector/CopyInto.java similarity index 100% rename from jdk/test/java/util/Vector/CopyInto.java rename to test/jdk/java/util/Vector/CopyInto.java diff --git a/jdk/test/java/util/Vector/IllegalConstructorArgs.java b/test/jdk/java/util/Vector/IllegalConstructorArgs.java similarity index 100% rename from jdk/test/java/util/Vector/IllegalConstructorArgs.java rename to test/jdk/java/util/Vector/IllegalConstructorArgs.java diff --git a/jdk/test/java/util/Vector/LastIndexOf.java b/test/jdk/java/util/Vector/LastIndexOf.java similarity index 100% rename from jdk/test/java/util/Vector/LastIndexOf.java rename to test/jdk/java/util/Vector/LastIndexOf.java diff --git a/jdk/test/java/util/Vector/SerializationDeadlock.java b/test/jdk/java/util/Vector/SerializationDeadlock.java similarity index 100% rename from jdk/test/java/util/Vector/SerializationDeadlock.java rename to test/jdk/java/util/Vector/SerializationDeadlock.java diff --git a/jdk/test/java/util/Vector/SimpleSerialization.java b/test/jdk/java/util/Vector/SimpleSerialization.java similarity index 100% rename from jdk/test/java/util/Vector/SimpleSerialization.java rename to test/jdk/java/util/Vector/SimpleSerialization.java diff --git a/jdk/test/java/util/Vector/SyncLastIndexOf.java b/test/jdk/java/util/Vector/SyncLastIndexOf.java similarity index 100% rename from jdk/test/java/util/Vector/SyncLastIndexOf.java rename to test/jdk/java/util/Vector/SyncLastIndexOf.java diff --git a/jdk/test/java/util/WeakHashMap/GCDuringIteration.java b/test/jdk/java/util/WeakHashMap/GCDuringIteration.java similarity index 100% rename from jdk/test/java/util/WeakHashMap/GCDuringIteration.java rename to test/jdk/java/util/WeakHashMap/GCDuringIteration.java diff --git a/jdk/test/java/util/WeakHashMap/Iteration.java b/test/jdk/java/util/WeakHashMap/Iteration.java similarity index 100% rename from jdk/test/java/util/WeakHashMap/Iteration.java rename to test/jdk/java/util/WeakHashMap/Iteration.java diff --git a/jdk/test/java/util/WeakHashMap/ZeroInitCap.java b/test/jdk/java/util/WeakHashMap/ZeroInitCap.java similarity index 100% rename from jdk/test/java/util/WeakHashMap/ZeroInitCap.java rename to test/jdk/java/util/WeakHashMap/ZeroInitCap.java diff --git a/jdk/test/java/util/concurrent/ArrayBlockingQueue/WhiteBox.java b/test/jdk/java/util/concurrent/ArrayBlockingQueue/WhiteBox.java similarity index 100% rename from jdk/test/java/util/concurrent/ArrayBlockingQueue/WhiteBox.java rename to test/jdk/java/util/concurrent/ArrayBlockingQueue/WhiteBox.java diff --git a/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java b/test/jdk/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java rename to test/jdk/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java diff --git a/jdk/test/java/util/concurrent/BlockingQueue/DrainToFails.java b/test/jdk/java/util/concurrent/BlockingQueue/DrainToFails.java similarity index 100% rename from jdk/test/java/util/concurrent/BlockingQueue/DrainToFails.java rename to test/jdk/java/util/concurrent/BlockingQueue/DrainToFails.java diff --git a/jdk/test/java/util/concurrent/BlockingQueue/Interrupt.java b/test/jdk/java/util/concurrent/BlockingQueue/Interrupt.java similarity index 100% rename from jdk/test/java/util/concurrent/BlockingQueue/Interrupt.java rename to test/jdk/java/util/concurrent/BlockingQueue/Interrupt.java diff --git a/jdk/test/java/util/concurrent/BlockingQueue/LastElement.java b/test/jdk/java/util/concurrent/BlockingQueue/LastElement.java similarity index 100% rename from jdk/test/java/util/concurrent/BlockingQueue/LastElement.java rename to test/jdk/java/util/concurrent/BlockingQueue/LastElement.java diff --git a/jdk/test/java/util/concurrent/BlockingQueue/LoopHelpers.java b/test/jdk/java/util/concurrent/BlockingQueue/LoopHelpers.java similarity index 100% rename from jdk/test/java/util/concurrent/BlockingQueue/LoopHelpers.java rename to test/jdk/java/util/concurrent/BlockingQueue/LoopHelpers.java diff --git a/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java b/test/jdk/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java rename to test/jdk/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java diff --git a/jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java b/test/jdk/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java rename to test/jdk/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java diff --git a/jdk/test/java/util/concurrent/BlockingQueue/PollMemoryLeak.java b/test/jdk/java/util/concurrent/BlockingQueue/PollMemoryLeak.java similarity index 100% rename from jdk/test/java/util/concurrent/BlockingQueue/PollMemoryLeak.java rename to test/jdk/java/util/concurrent/BlockingQueue/PollMemoryLeak.java diff --git a/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java b/test/jdk/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java rename to test/jdk/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java diff --git a/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java b/test/jdk/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java rename to test/jdk/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java diff --git a/jdk/test/java/util/concurrent/CompletableFuture/Basic.java b/test/jdk/java/util/concurrent/CompletableFuture/Basic.java similarity index 100% rename from jdk/test/java/util/concurrent/CompletableFuture/Basic.java rename to test/jdk/java/util/concurrent/CompletableFuture/Basic.java diff --git a/jdk/test/java/util/concurrent/CompletableFuture/ThenComposeAsyncTest.java b/test/jdk/java/util/concurrent/CompletableFuture/ThenComposeAsyncTest.java similarity index 100% rename from jdk/test/java/util/concurrent/CompletableFuture/ThenComposeAsyncTest.java rename to test/jdk/java/util/concurrent/CompletableFuture/ThenComposeAsyncTest.java diff --git a/jdk/test/java/util/concurrent/CompletableFuture/ThenComposeExceptionTest.java b/test/jdk/java/util/concurrent/CompletableFuture/ThenComposeExceptionTest.java similarity index 100% rename from jdk/test/java/util/concurrent/CompletableFuture/ThenComposeExceptionTest.java rename to test/jdk/java/util/concurrent/CompletableFuture/ThenComposeExceptionTest.java diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java b/test/jdk/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java rename to test/jdk/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/ConcurrentContainsKeyTest.java b/test/jdk/java/util/concurrent/ConcurrentHashMap/ConcurrentContainsKeyTest.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentHashMap/ConcurrentContainsKeyTest.java rename to test/jdk/java/util/concurrent/ConcurrentHashMap/ConcurrentContainsKeyTest.java diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/DistinctEntrySetElements.java b/test/jdk/java/util/concurrent/ConcurrentHashMap/DistinctEntrySetElements.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentHashMap/DistinctEntrySetElements.java rename to test/jdk/java/util/concurrent/ConcurrentHashMap/DistinctEntrySetElements.java diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/LoopHelpers.java b/test/jdk/java/util/concurrent/ConcurrentHashMap/LoopHelpers.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentHashMap/LoopHelpers.java rename to test/jdk/java/util/concurrent/ConcurrentHashMap/LoopHelpers.java diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java b/test/jdk/java/util/concurrent/ConcurrentHashMap/MapCheck.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java rename to test/jdk/java/util/concurrent/ConcurrentHashMap/MapCheck.java diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java b/test/jdk/java/util/concurrent/ConcurrentHashMap/MapLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java rename to test/jdk/java/util/concurrent/ConcurrentHashMap/MapLoops.java diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/ToArray.java b/test/jdk/java/util/concurrent/ConcurrentHashMap/ToArray.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentHashMap/ToArray.java rename to test/jdk/java/util/concurrent/ConcurrentHashMap/ToArray.java diff --git a/jdk/test/java/util/concurrent/ConcurrentLinkedQueue/RemoveLeak.java b/test/jdk/java/util/concurrent/ConcurrentLinkedQueue/RemoveLeak.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentLinkedQueue/RemoveLeak.java rename to test/jdk/java/util/concurrent/ConcurrentLinkedQueue/RemoveLeak.java diff --git a/jdk/test/java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java b/test/jdk/java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java rename to test/jdk/java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java diff --git a/jdk/test/java/util/concurrent/ConcurrentMap/ConcurrentModification.java b/test/jdk/java/util/concurrent/ConcurrentMap/ConcurrentModification.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentMap/ConcurrentModification.java rename to test/jdk/java/util/concurrent/ConcurrentMap/ConcurrentModification.java diff --git a/jdk/test/java/util/concurrent/ConcurrentMap/ConcurrentRemoveIf.java b/test/jdk/java/util/concurrent/ConcurrentMap/ConcurrentRemoveIf.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentMap/ConcurrentRemoveIf.java rename to test/jdk/java/util/concurrent/ConcurrentMap/ConcurrentRemoveIf.java diff --git a/jdk/test/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java b/test/jdk/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java rename to test/jdk/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java diff --git a/jdk/test/java/util/concurrent/ConcurrentQueues/GCRetention.java b/test/jdk/java/util/concurrent/ConcurrentQueues/GCRetention.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentQueues/GCRetention.java rename to test/jdk/java/util/concurrent/ConcurrentQueues/GCRetention.java diff --git a/jdk/test/java/util/concurrent/ConcurrentQueues/IteratorWeakConsistency.java b/test/jdk/java/util/concurrent/ConcurrentQueues/IteratorWeakConsistency.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentQueues/IteratorWeakConsistency.java rename to test/jdk/java/util/concurrent/ConcurrentQueues/IteratorWeakConsistency.java diff --git a/jdk/test/java/util/concurrent/ConcurrentQueues/LoopHelpers.java b/test/jdk/java/util/concurrent/ConcurrentQueues/LoopHelpers.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentQueues/LoopHelpers.java rename to test/jdk/java/util/concurrent/ConcurrentQueues/LoopHelpers.java diff --git a/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java b/test/jdk/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java rename to test/jdk/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java diff --git a/jdk/test/java/util/concurrent/ConcurrentQueues/RemovePollRace.java b/test/jdk/java/util/concurrent/ConcurrentQueues/RemovePollRace.java similarity index 100% rename from jdk/test/java/util/concurrent/ConcurrentQueues/RemovePollRace.java rename to test/jdk/java/util/concurrent/ConcurrentQueues/RemovePollRace.java diff --git a/jdk/test/java/util/concurrent/CopyOnWriteArrayList/COWSubList.java b/test/jdk/java/util/concurrent/CopyOnWriteArrayList/COWSubList.java similarity index 100% rename from jdk/test/java/util/concurrent/CopyOnWriteArrayList/COWSubList.java rename to test/jdk/java/util/concurrent/CopyOnWriteArrayList/COWSubList.java diff --git a/jdk/test/java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java b/test/jdk/java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java similarity index 100% rename from jdk/test/java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java rename to test/jdk/java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java diff --git a/jdk/test/java/util/concurrent/CopyOnWriteArraySet/RacingCows.java b/test/jdk/java/util/concurrent/CopyOnWriteArraySet/RacingCows.java similarity index 100% rename from jdk/test/java/util/concurrent/CopyOnWriteArraySet/RacingCows.java rename to test/jdk/java/util/concurrent/CopyOnWriteArraySet/RacingCows.java diff --git a/jdk/test/java/util/concurrent/CountDownLatch/Basic.java b/test/jdk/java/util/concurrent/CountDownLatch/Basic.java similarity index 100% rename from jdk/test/java/util/concurrent/CountDownLatch/Basic.java rename to test/jdk/java/util/concurrent/CountDownLatch/Basic.java diff --git a/jdk/test/java/util/concurrent/CyclicBarrier/Basic.java b/test/jdk/java/util/concurrent/CyclicBarrier/Basic.java similarity index 100% rename from jdk/test/java/util/concurrent/CyclicBarrier/Basic.java rename to test/jdk/java/util/concurrent/CyclicBarrier/Basic.java diff --git a/jdk/test/java/util/concurrent/DelayQueue/Iterate.java b/test/jdk/java/util/concurrent/DelayQueue/Iterate.java similarity index 100% rename from jdk/test/java/util/concurrent/DelayQueue/Iterate.java rename to test/jdk/java/util/concurrent/DelayQueue/Iterate.java diff --git a/jdk/test/java/util/concurrent/DelayQueue/PollUnexpired.java b/test/jdk/java/util/concurrent/DelayQueue/PollUnexpired.java similarity index 100% rename from jdk/test/java/util/concurrent/DelayQueue/PollUnexpired.java rename to test/jdk/java/util/concurrent/DelayQueue/PollUnexpired.java diff --git a/jdk/test/java/util/concurrent/DelayQueue/Stress.java b/test/jdk/java/util/concurrent/DelayQueue/Stress.java similarity index 100% rename from jdk/test/java/util/concurrent/DelayQueue/Stress.java rename to test/jdk/java/util/concurrent/DelayQueue/Stress.java diff --git a/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java b/test/jdk/java/util/concurrent/Exchanger/ExchangeLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java rename to test/jdk/java/util/concurrent/Exchanger/ExchangeLoops.java diff --git a/jdk/test/java/util/concurrent/Exchanger/LoopHelpers.java b/test/jdk/java/util/concurrent/Exchanger/LoopHelpers.java similarity index 100% rename from jdk/test/java/util/concurrent/Exchanger/LoopHelpers.java rename to test/jdk/java/util/concurrent/Exchanger/LoopHelpers.java diff --git a/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java b/test/jdk/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java rename to test/jdk/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java diff --git a/jdk/test/java/util/concurrent/ExecutorCompletionService/LoopHelpers.java b/test/jdk/java/util/concurrent/ExecutorCompletionService/LoopHelpers.java similarity index 100% rename from jdk/test/java/util/concurrent/ExecutorCompletionService/LoopHelpers.java rename to test/jdk/java/util/concurrent/ExecutorCompletionService/LoopHelpers.java diff --git a/jdk/test/java/util/concurrent/ExecutorService/Invoke.java b/test/jdk/java/util/concurrent/ExecutorService/Invoke.java similarity index 100% rename from jdk/test/java/util/concurrent/ExecutorService/Invoke.java rename to test/jdk/java/util/concurrent/ExecutorService/Invoke.java diff --git a/jdk/test/java/util/concurrent/Executors/AutoShutdown.java b/test/jdk/java/util/concurrent/Executors/AutoShutdown.java similarity index 100% rename from jdk/test/java/util/concurrent/Executors/AutoShutdown.java rename to test/jdk/java/util/concurrent/Executors/AutoShutdown.java diff --git a/jdk/test/java/util/concurrent/Executors/PrivilegedCallables.java b/test/jdk/java/util/concurrent/Executors/PrivilegedCallables.java similarity index 100% rename from jdk/test/java/util/concurrent/Executors/PrivilegedCallables.java rename to test/jdk/java/util/concurrent/Executors/PrivilegedCallables.java diff --git a/jdk/test/java/util/concurrent/Executors/Throws.java b/test/jdk/java/util/concurrent/Executors/Throws.java similarity index 100% rename from jdk/test/java/util/concurrent/Executors/Throws.java rename to test/jdk/java/util/concurrent/Executors/Throws.java diff --git a/jdk/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java b/test/jdk/java/util/concurrent/FutureTask/BlockingTaskExecutor.java similarity index 100% rename from jdk/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java rename to test/jdk/java/util/concurrent/FutureTask/BlockingTaskExecutor.java diff --git a/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java b/test/jdk/java/util/concurrent/FutureTask/CancelledFutureLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java rename to test/jdk/java/util/concurrent/FutureTask/CancelledFutureLoops.java diff --git a/jdk/test/java/util/concurrent/FutureTask/Customized.java b/test/jdk/java/util/concurrent/FutureTask/Customized.java similarity index 100% rename from jdk/test/java/util/concurrent/FutureTask/Customized.java rename to test/jdk/java/util/concurrent/FutureTask/Customized.java diff --git a/jdk/test/java/util/concurrent/FutureTask/DoneMeansDone.java b/test/jdk/java/util/concurrent/FutureTask/DoneMeansDone.java similarity index 100% rename from jdk/test/java/util/concurrent/FutureTask/DoneMeansDone.java rename to test/jdk/java/util/concurrent/FutureTask/DoneMeansDone.java diff --git a/jdk/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java b/test/jdk/java/util/concurrent/FutureTask/DoneTimedGetLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java rename to test/jdk/java/util/concurrent/FutureTask/DoneTimedGetLoops.java diff --git a/jdk/test/java/util/concurrent/FutureTask/ExplicitSet.java b/test/jdk/java/util/concurrent/FutureTask/ExplicitSet.java similarity index 100% rename from jdk/test/java/util/concurrent/FutureTask/ExplicitSet.java rename to test/jdk/java/util/concurrent/FutureTask/ExplicitSet.java diff --git a/jdk/test/java/util/concurrent/FutureTask/LoopHelpers.java b/test/jdk/java/util/concurrent/FutureTask/LoopHelpers.java similarity index 100% rename from jdk/test/java/util/concurrent/FutureTask/LoopHelpers.java rename to test/jdk/java/util/concurrent/FutureTask/LoopHelpers.java diff --git a/jdk/test/java/util/concurrent/FutureTask/NegativeTimeout.java b/test/jdk/java/util/concurrent/FutureTask/NegativeTimeout.java similarity index 100% rename from jdk/test/java/util/concurrent/FutureTask/NegativeTimeout.java rename to test/jdk/java/util/concurrent/FutureTask/NegativeTimeout.java diff --git a/jdk/test/java/util/concurrent/FutureTask/Throw.java b/test/jdk/java/util/concurrent/FutureTask/Throw.java similarity index 100% rename from jdk/test/java/util/concurrent/FutureTask/Throw.java rename to test/jdk/java/util/concurrent/FutureTask/Throw.java diff --git a/jdk/test/java/util/concurrent/LinkedBlockingQueue/ToArray.java b/test/jdk/java/util/concurrent/LinkedBlockingQueue/ToArray.java similarity index 100% rename from jdk/test/java/util/concurrent/LinkedBlockingQueue/ToArray.java rename to test/jdk/java/util/concurrent/LinkedBlockingQueue/ToArray.java diff --git a/jdk/test/java/util/concurrent/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java b/test/jdk/java/util/concurrent/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java similarity index 100% rename from jdk/test/java/util/concurrent/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java rename to test/jdk/java/util/concurrent/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java diff --git a/jdk/test/java/util/concurrent/LinkedTransferQueue/WhiteBox.java b/test/jdk/java/util/concurrent/LinkedTransferQueue/WhiteBox.java similarity index 100% rename from jdk/test/java/util/concurrent/LinkedTransferQueue/WhiteBox.java rename to test/jdk/java/util/concurrent/LinkedTransferQueue/WhiteBox.java diff --git a/jdk/test/java/util/concurrent/Phaser/Arrive.java b/test/jdk/java/util/concurrent/Phaser/Arrive.java similarity index 100% rename from jdk/test/java/util/concurrent/Phaser/Arrive.java rename to test/jdk/java/util/concurrent/Phaser/Arrive.java diff --git a/jdk/test/java/util/concurrent/Phaser/Basic.java b/test/jdk/java/util/concurrent/Phaser/Basic.java similarity index 100% rename from jdk/test/java/util/concurrent/Phaser/Basic.java rename to test/jdk/java/util/concurrent/Phaser/Basic.java diff --git a/jdk/test/java/util/concurrent/Phaser/FickleRegister.java b/test/jdk/java/util/concurrent/Phaser/FickleRegister.java similarity index 100% rename from jdk/test/java/util/concurrent/Phaser/FickleRegister.java rename to test/jdk/java/util/concurrent/Phaser/FickleRegister.java diff --git a/jdk/test/java/util/concurrent/Phaser/PhaseOverflow.java b/test/jdk/java/util/concurrent/Phaser/PhaseOverflow.java similarity index 100% rename from jdk/test/java/util/concurrent/Phaser/PhaseOverflow.java rename to test/jdk/java/util/concurrent/Phaser/PhaseOverflow.java diff --git a/jdk/test/java/util/concurrent/Phaser/TieredArriveLoops.java b/test/jdk/java/util/concurrent/Phaser/TieredArriveLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/Phaser/TieredArriveLoops.java rename to test/jdk/java/util/concurrent/Phaser/TieredArriveLoops.java diff --git a/jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java b/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java similarity index 100% rename from jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java rename to test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java diff --git a/jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/DecorateTask.java b/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/DecorateTask.java similarity index 100% rename from jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/DecorateTask.java rename to test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/DecorateTask.java diff --git a/jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/DelayOverflow.java b/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/DelayOverflow.java similarity index 100% rename from jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/DelayOverflow.java rename to test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/DelayOverflow.java diff --git a/jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/GCRetention.java b/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/GCRetention.java similarity index 100% rename from jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/GCRetention.java rename to test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/GCRetention.java diff --git a/jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/Stress.java b/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/Stress.java similarity index 100% rename from jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/Stress.java rename to test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/Stress.java diff --git a/jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCorePoolSize.java b/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCorePoolSize.java similarity index 100% rename from jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCorePoolSize.java rename to test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCorePoolSize.java diff --git a/jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCoreThreads.java b/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCoreThreads.java similarity index 100% rename from jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCoreThreads.java rename to test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCoreThreads.java diff --git a/jdk/test/java/util/concurrent/Semaphore/PermitOverflow.java b/test/jdk/java/util/concurrent/Semaphore/PermitOverflow.java similarity index 100% rename from jdk/test/java/util/concurrent/Semaphore/PermitOverflow.java rename to test/jdk/java/util/concurrent/Semaphore/PermitOverflow.java diff --git a/jdk/test/java/util/concurrent/Semaphore/RacingReleases.java b/test/jdk/java/util/concurrent/Semaphore/RacingReleases.java similarity index 100% rename from jdk/test/java/util/concurrent/Semaphore/RacingReleases.java rename to test/jdk/java/util/concurrent/Semaphore/RacingReleases.java diff --git a/jdk/test/java/util/concurrent/SynchronousQueue/Fairness.java b/test/jdk/java/util/concurrent/SynchronousQueue/Fairness.java similarity index 100% rename from jdk/test/java/util/concurrent/SynchronousQueue/Fairness.java rename to test/jdk/java/util/concurrent/SynchronousQueue/Fairness.java diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java similarity index 100% rename from jdk/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java rename to test/jdk/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java similarity index 100% rename from jdk/test/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java rename to test/jdk/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/Custom.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/Custom.java similarity index 100% rename from jdk/test/java/util/concurrent/ThreadPoolExecutor/Custom.java rename to test/jdk/java/util/concurrent/ThreadPoolExecutor/Custom.java diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/FlakyThreadFactory.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/FlakyThreadFactory.java similarity index 100% rename from jdk/test/java/util/concurrent/ThreadPoolExecutor/FlakyThreadFactory.java rename to test/jdk/java/util/concurrent/ThreadPoolExecutor/FlakyThreadFactory.java diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ModifyCorePoolSize.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/ModifyCorePoolSize.java similarity index 100% rename from jdk/test/java/util/concurrent/ThreadPoolExecutor/ModifyCorePoolSize.java rename to test/jdk/java/util/concurrent/ThreadPoolExecutor/ModifyCorePoolSize.java diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ScheduledTickleService.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/ScheduledTickleService.java similarity index 100% rename from jdk/test/java/util/concurrent/ThreadPoolExecutor/ScheduledTickleService.java rename to test/jdk/java/util/concurrent/ThreadPoolExecutor/ScheduledTickleService.java diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/SelfInterrupt.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/SelfInterrupt.java similarity index 100% rename from jdk/test/java/util/concurrent/ThreadPoolExecutor/SelfInterrupt.java rename to test/jdk/java/util/concurrent/ThreadPoolExecutor/SelfInterrupt.java diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java similarity index 100% rename from jdk/test/java/util/concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java rename to test/jdk/java/util/concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ThreadRestarts.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/ThreadRestarts.java similarity index 100% rename from jdk/test/java/util/concurrent/ThreadPoolExecutor/ThreadRestarts.java rename to test/jdk/java/util/concurrent/ThreadPoolExecutor/ThreadRestarts.java diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java similarity index 100% rename from jdk/test/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java rename to test/jdk/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/TimeOutShrink.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/TimeOutShrink.java similarity index 100% rename from jdk/test/java/util/concurrent/ThreadPoolExecutor/TimeOutShrink.java rename to test/jdk/java/util/concurrent/ThreadPoolExecutor/TimeOutShrink.java diff --git a/jdk/test/java/util/concurrent/TimeUnit/Basic.java b/test/jdk/java/util/concurrent/TimeUnit/Basic.java similarity index 100% rename from jdk/test/java/util/concurrent/TimeUnit/Basic.java rename to test/jdk/java/util/concurrent/TimeUnit/Basic.java diff --git a/jdk/test/java/util/concurrent/atomic/AtomicReferenceTest.java b/test/jdk/java/util/concurrent/atomic/AtomicReferenceTest.java similarity index 100% rename from jdk/test/java/util/concurrent/atomic/AtomicReferenceTest.java rename to test/jdk/java/util/concurrent/atomic/AtomicReferenceTest.java diff --git a/jdk/test/java/util/concurrent/atomic/AtomicUpdaters.java b/test/jdk/java/util/concurrent/atomic/AtomicUpdaters.java similarity index 100% rename from jdk/test/java/util/concurrent/atomic/AtomicUpdaters.java rename to test/jdk/java/util/concurrent/atomic/AtomicUpdaters.java diff --git a/jdk/test/java/util/concurrent/atomic/DoubleAdderDemo.java b/test/jdk/java/util/concurrent/atomic/DoubleAdderDemo.java similarity index 100% rename from jdk/test/java/util/concurrent/atomic/DoubleAdderDemo.java rename to test/jdk/java/util/concurrent/atomic/DoubleAdderDemo.java diff --git a/jdk/test/java/util/concurrent/atomic/Lazy.java b/test/jdk/java/util/concurrent/atomic/Lazy.java similarity index 100% rename from jdk/test/java/util/concurrent/atomic/Lazy.java rename to test/jdk/java/util/concurrent/atomic/Lazy.java diff --git a/jdk/test/java/util/concurrent/atomic/LongAdderDemo.java b/test/jdk/java/util/concurrent/atomic/LongAdderDemo.java similarity index 100% rename from jdk/test/java/util/concurrent/atomic/LongAdderDemo.java rename to test/jdk/java/util/concurrent/atomic/LongAdderDemo.java diff --git a/jdk/test/java/util/concurrent/atomic/Serial.java b/test/jdk/java/util/concurrent/atomic/Serial.java similarity index 100% rename from jdk/test/java/util/concurrent/atomic/Serial.java rename to test/jdk/java/util/concurrent/atomic/Serial.java diff --git a/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java b/test/jdk/java/util/concurrent/atomic/VMSupportsCS8.java similarity index 100% rename from jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java rename to test/jdk/java/util/concurrent/atomic/VMSupportsCS8.java diff --git a/jdk/test/java/util/concurrent/forkjoin/FJExceptionTableLeak.java b/test/jdk/java/util/concurrent/forkjoin/FJExceptionTableLeak.java similarity index 100% rename from jdk/test/java/util/concurrent/forkjoin/FJExceptionTableLeak.java rename to test/jdk/java/util/concurrent/forkjoin/FJExceptionTableLeak.java diff --git a/jdk/test/java/util/concurrent/forkjoin/Integrate.java b/test/jdk/java/util/concurrent/forkjoin/Integrate.java similarity index 100% rename from jdk/test/java/util/concurrent/forkjoin/Integrate.java rename to test/jdk/java/util/concurrent/forkjoin/Integrate.java diff --git a/jdk/test/java/util/concurrent/forkjoin/NQueensCS.java b/test/jdk/java/util/concurrent/forkjoin/NQueensCS.java similarity index 100% rename from jdk/test/java/util/concurrent/forkjoin/NQueensCS.java rename to test/jdk/java/util/concurrent/forkjoin/NQueensCS.java diff --git a/jdk/test/java/util/concurrent/forkjoin/SubmissionTest.java b/test/jdk/java/util/concurrent/forkjoin/SubmissionTest.java similarity index 100% rename from jdk/test/java/util/concurrent/forkjoin/SubmissionTest.java rename to test/jdk/java/util/concurrent/forkjoin/SubmissionTest.java diff --git a/jdk/test/java/util/concurrent/forkjoin/ThreadLessCommon.java b/test/jdk/java/util/concurrent/forkjoin/ThreadLessCommon.java similarity index 100% rename from jdk/test/java/util/concurrent/forkjoin/ThreadLessCommon.java rename to test/jdk/java/util/concurrent/forkjoin/ThreadLessCommon.java diff --git a/jdk/test/java/util/concurrent/forkjoin/ThrowingRunnable.java b/test/jdk/java/util/concurrent/forkjoin/ThrowingRunnable.java similarity index 100% rename from jdk/test/java/util/concurrent/forkjoin/ThrowingRunnable.java rename to test/jdk/java/util/concurrent/forkjoin/ThrowingRunnable.java diff --git a/jdk/test/java/util/concurrent/locks/Lock/CheckedLockLoops.java b/test/jdk/java/util/concurrent/locks/Lock/CheckedLockLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/Lock/CheckedLockLoops.java rename to test/jdk/java/util/concurrent/locks/Lock/CheckedLockLoops.java diff --git a/jdk/test/java/util/concurrent/locks/Lock/FlakyMutex.java b/test/jdk/java/util/concurrent/locks/Lock/FlakyMutex.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/Lock/FlakyMutex.java rename to test/jdk/java/util/concurrent/locks/Lock/FlakyMutex.java diff --git a/jdk/test/java/util/concurrent/locks/Lock/LoopHelpers.java b/test/jdk/java/util/concurrent/locks/Lock/LoopHelpers.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/Lock/LoopHelpers.java rename to test/jdk/java/util/concurrent/locks/Lock/LoopHelpers.java diff --git a/jdk/test/java/util/concurrent/locks/Lock/Mutex.java b/test/jdk/java/util/concurrent/locks/Lock/Mutex.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/Lock/Mutex.java rename to test/jdk/java/util/concurrent/locks/Lock/Mutex.java diff --git a/jdk/test/java/util/concurrent/locks/Lock/TimedAcquire.java b/test/jdk/java/util/concurrent/locks/Lock/TimedAcquire.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/Lock/TimedAcquire.java rename to test/jdk/java/util/concurrent/locks/Lock/TimedAcquire.java diff --git a/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java b/test/jdk/java/util/concurrent/locks/Lock/TimedAcquireLeak.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java rename to test/jdk/java/util/concurrent/locks/Lock/TimedAcquireLeak.java diff --git a/jdk/test/java/util/concurrent/locks/LockSupport/ParkLoops.java b/test/jdk/java/util/concurrent/locks/LockSupport/ParkLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/LockSupport/ParkLoops.java rename to test/jdk/java/util/concurrent/locks/LockSupport/ParkLoops.java diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java b/test/jdk/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java rename to test/jdk/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java b/test/jdk/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java rename to test/jdk/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/LoopHelpers.java b/test/jdk/java/util/concurrent/locks/ReentrantLock/LoopHelpers.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/ReentrantLock/LoopHelpers.java rename to test/jdk/java/util/concurrent/locks/ReentrantLock/LoopHelpers.java diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java b/test/jdk/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java rename to test/jdk/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java b/test/jdk/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java rename to test/jdk/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java diff --git a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/Bug6571733.java b/test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/Bug6571733.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/Bug6571733.java rename to test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/Bug6571733.java diff --git a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/Count.java b/test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/Count.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/Count.java rename to test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/Count.java diff --git a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/LoopHelpers.java b/test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/LoopHelpers.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/LoopHelpers.java rename to test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/LoopHelpers.java diff --git a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java b/test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java rename to test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java diff --git a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/RWMap.java b/test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/RWMap.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/RWMap.java rename to test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/RWMap.java diff --git a/jdk/test/java/util/concurrent/locks/StampedLock/Basic.java b/test/jdk/java/util/concurrent/locks/StampedLock/Basic.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/StampedLock/Basic.java rename to test/jdk/java/util/concurrent/locks/StampedLock/Basic.java diff --git a/jdk/test/java/util/concurrent/locks/StampedLock/ReadersUnlockAfterWriteUnlock.java b/test/jdk/java/util/concurrent/locks/StampedLock/ReadersUnlockAfterWriteUnlock.java similarity index 100% rename from jdk/test/java/util/concurrent/locks/StampedLock/ReadersUnlockAfterWriteUnlock.java rename to test/jdk/java/util/concurrent/locks/StampedLock/ReadersUnlockAfterWriteUnlock.java diff --git a/jdk/test/java/util/concurrent/tck/AbstractExecutorServiceTest.java b/test/jdk/java/util/concurrent/tck/AbstractExecutorServiceTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AbstractExecutorServiceTest.java rename to test/jdk/java/util/concurrent/tck/AbstractExecutorServiceTest.java diff --git a/jdk/test/java/util/concurrent/tck/AbstractQueueTest.java b/test/jdk/java/util/concurrent/tck/AbstractQueueTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AbstractQueueTest.java rename to test/jdk/java/util/concurrent/tck/AbstractQueueTest.java diff --git a/jdk/test/java/util/concurrent/tck/AbstractQueuedLongSynchronizerTest.java b/test/jdk/java/util/concurrent/tck/AbstractQueuedLongSynchronizerTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AbstractQueuedLongSynchronizerTest.java rename to test/jdk/java/util/concurrent/tck/AbstractQueuedLongSynchronizerTest.java diff --git a/jdk/test/java/util/concurrent/tck/AbstractQueuedSynchronizerTest.java b/test/jdk/java/util/concurrent/tck/AbstractQueuedSynchronizerTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AbstractQueuedSynchronizerTest.java rename to test/jdk/java/util/concurrent/tck/AbstractQueuedSynchronizerTest.java diff --git a/jdk/test/java/util/concurrent/tck/ArrayBlockingQueueTest.java b/test/jdk/java/util/concurrent/tck/ArrayBlockingQueueTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ArrayBlockingQueueTest.java rename to test/jdk/java/util/concurrent/tck/ArrayBlockingQueueTest.java diff --git a/jdk/test/java/util/concurrent/tck/ArrayDeque8Test.java b/test/jdk/java/util/concurrent/tck/ArrayDeque8Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ArrayDeque8Test.java rename to test/jdk/java/util/concurrent/tck/ArrayDeque8Test.java diff --git a/jdk/test/java/util/concurrent/tck/ArrayDequeTest.java b/test/jdk/java/util/concurrent/tck/ArrayDequeTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ArrayDequeTest.java rename to test/jdk/java/util/concurrent/tck/ArrayDequeTest.java diff --git a/jdk/test/java/util/concurrent/tck/ArrayListTest.java b/test/jdk/java/util/concurrent/tck/ArrayListTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ArrayListTest.java rename to test/jdk/java/util/concurrent/tck/ArrayListTest.java diff --git a/jdk/test/java/util/concurrent/tck/Atomic8Test.java b/test/jdk/java/util/concurrent/tck/Atomic8Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/Atomic8Test.java rename to test/jdk/java/util/concurrent/tck/Atomic8Test.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicBoolean9Test.java b/test/jdk/java/util/concurrent/tck/AtomicBoolean9Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicBoolean9Test.java rename to test/jdk/java/util/concurrent/tck/AtomicBoolean9Test.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicBooleanTest.java b/test/jdk/java/util/concurrent/tck/AtomicBooleanTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicBooleanTest.java rename to test/jdk/java/util/concurrent/tck/AtomicBooleanTest.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicInteger9Test.java b/test/jdk/java/util/concurrent/tck/AtomicInteger9Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicInteger9Test.java rename to test/jdk/java/util/concurrent/tck/AtomicInteger9Test.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicIntegerArray9Test.java b/test/jdk/java/util/concurrent/tck/AtomicIntegerArray9Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicIntegerArray9Test.java rename to test/jdk/java/util/concurrent/tck/AtomicIntegerArray9Test.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicIntegerArrayTest.java b/test/jdk/java/util/concurrent/tck/AtomicIntegerArrayTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicIntegerArrayTest.java rename to test/jdk/java/util/concurrent/tck/AtomicIntegerArrayTest.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicIntegerFieldUpdaterTest.java b/test/jdk/java/util/concurrent/tck/AtomicIntegerFieldUpdaterTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicIntegerFieldUpdaterTest.java rename to test/jdk/java/util/concurrent/tck/AtomicIntegerFieldUpdaterTest.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicIntegerTest.java b/test/jdk/java/util/concurrent/tck/AtomicIntegerTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicIntegerTest.java rename to test/jdk/java/util/concurrent/tck/AtomicIntegerTest.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicLong9Test.java b/test/jdk/java/util/concurrent/tck/AtomicLong9Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicLong9Test.java rename to test/jdk/java/util/concurrent/tck/AtomicLong9Test.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicLongArray9Test.java b/test/jdk/java/util/concurrent/tck/AtomicLongArray9Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicLongArray9Test.java rename to test/jdk/java/util/concurrent/tck/AtomicLongArray9Test.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicLongArrayTest.java b/test/jdk/java/util/concurrent/tck/AtomicLongArrayTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicLongArrayTest.java rename to test/jdk/java/util/concurrent/tck/AtomicLongArrayTest.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicLongFieldUpdaterTest.java b/test/jdk/java/util/concurrent/tck/AtomicLongFieldUpdaterTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicLongFieldUpdaterTest.java rename to test/jdk/java/util/concurrent/tck/AtomicLongFieldUpdaterTest.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicLongTest.java b/test/jdk/java/util/concurrent/tck/AtomicLongTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicLongTest.java rename to test/jdk/java/util/concurrent/tck/AtomicLongTest.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicMarkableReferenceTest.java b/test/jdk/java/util/concurrent/tck/AtomicMarkableReferenceTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicMarkableReferenceTest.java rename to test/jdk/java/util/concurrent/tck/AtomicMarkableReferenceTest.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicReference9Test.java b/test/jdk/java/util/concurrent/tck/AtomicReference9Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicReference9Test.java rename to test/jdk/java/util/concurrent/tck/AtomicReference9Test.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicReferenceArray9Test.java b/test/jdk/java/util/concurrent/tck/AtomicReferenceArray9Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicReferenceArray9Test.java rename to test/jdk/java/util/concurrent/tck/AtomicReferenceArray9Test.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicReferenceArrayTest.java b/test/jdk/java/util/concurrent/tck/AtomicReferenceArrayTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicReferenceArrayTest.java rename to test/jdk/java/util/concurrent/tck/AtomicReferenceArrayTest.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicReferenceFieldUpdaterTest.java b/test/jdk/java/util/concurrent/tck/AtomicReferenceFieldUpdaterTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicReferenceFieldUpdaterTest.java rename to test/jdk/java/util/concurrent/tck/AtomicReferenceFieldUpdaterTest.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicReferenceTest.java b/test/jdk/java/util/concurrent/tck/AtomicReferenceTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicReferenceTest.java rename to test/jdk/java/util/concurrent/tck/AtomicReferenceTest.java diff --git a/jdk/test/java/util/concurrent/tck/AtomicStampedReferenceTest.java b/test/jdk/java/util/concurrent/tck/AtomicStampedReferenceTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/AtomicStampedReferenceTest.java rename to test/jdk/java/util/concurrent/tck/AtomicStampedReferenceTest.java diff --git a/jdk/test/java/util/concurrent/tck/BlockingQueueTest.java b/test/jdk/java/util/concurrent/tck/BlockingQueueTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/BlockingQueueTest.java rename to test/jdk/java/util/concurrent/tck/BlockingQueueTest.java diff --git a/jdk/test/java/util/concurrent/tck/Collection8Test.java b/test/jdk/java/util/concurrent/tck/Collection8Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/Collection8Test.java rename to test/jdk/java/util/concurrent/tck/Collection8Test.java diff --git a/jdk/test/java/util/concurrent/tck/CollectionImplementation.java b/test/jdk/java/util/concurrent/tck/CollectionImplementation.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/CollectionImplementation.java rename to test/jdk/java/util/concurrent/tck/CollectionImplementation.java diff --git a/jdk/test/java/util/concurrent/tck/CollectionTest.java b/test/jdk/java/util/concurrent/tck/CollectionTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/CollectionTest.java rename to test/jdk/java/util/concurrent/tck/CollectionTest.java diff --git a/jdk/test/java/util/concurrent/tck/CompletableFutureTest.java b/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/CompletableFutureTest.java rename to test/jdk/java/util/concurrent/tck/CompletableFutureTest.java diff --git a/jdk/test/java/util/concurrent/tck/ConcurrentHashMap8Test.java b/test/jdk/java/util/concurrent/tck/ConcurrentHashMap8Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ConcurrentHashMap8Test.java rename to test/jdk/java/util/concurrent/tck/ConcurrentHashMap8Test.java diff --git a/jdk/test/java/util/concurrent/tck/ConcurrentHashMapTest.java b/test/jdk/java/util/concurrent/tck/ConcurrentHashMapTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ConcurrentHashMapTest.java rename to test/jdk/java/util/concurrent/tck/ConcurrentHashMapTest.java diff --git a/jdk/test/java/util/concurrent/tck/ConcurrentLinkedDequeTest.java b/test/jdk/java/util/concurrent/tck/ConcurrentLinkedDequeTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ConcurrentLinkedDequeTest.java rename to test/jdk/java/util/concurrent/tck/ConcurrentLinkedDequeTest.java diff --git a/jdk/test/java/util/concurrent/tck/ConcurrentLinkedQueueTest.java b/test/jdk/java/util/concurrent/tck/ConcurrentLinkedQueueTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ConcurrentLinkedQueueTest.java rename to test/jdk/java/util/concurrent/tck/ConcurrentLinkedQueueTest.java diff --git a/jdk/test/java/util/concurrent/tck/ConcurrentSkipListMapTest.java b/test/jdk/java/util/concurrent/tck/ConcurrentSkipListMapTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ConcurrentSkipListMapTest.java rename to test/jdk/java/util/concurrent/tck/ConcurrentSkipListMapTest.java diff --git a/jdk/test/java/util/concurrent/tck/ConcurrentSkipListSetTest.java b/test/jdk/java/util/concurrent/tck/ConcurrentSkipListSetTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ConcurrentSkipListSetTest.java rename to test/jdk/java/util/concurrent/tck/ConcurrentSkipListSetTest.java diff --git a/jdk/test/java/util/concurrent/tck/ConcurrentSkipListSubMapTest.java b/test/jdk/java/util/concurrent/tck/ConcurrentSkipListSubMapTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ConcurrentSkipListSubMapTest.java rename to test/jdk/java/util/concurrent/tck/ConcurrentSkipListSubMapTest.java diff --git a/jdk/test/java/util/concurrent/tck/ConcurrentSkipListSubSetTest.java b/test/jdk/java/util/concurrent/tck/ConcurrentSkipListSubSetTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ConcurrentSkipListSubSetTest.java rename to test/jdk/java/util/concurrent/tck/ConcurrentSkipListSubSetTest.java diff --git a/jdk/test/java/util/concurrent/tck/CopyOnWriteArrayListTest.java b/test/jdk/java/util/concurrent/tck/CopyOnWriteArrayListTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/CopyOnWriteArrayListTest.java rename to test/jdk/java/util/concurrent/tck/CopyOnWriteArrayListTest.java diff --git a/jdk/test/java/util/concurrent/tck/CopyOnWriteArraySetTest.java b/test/jdk/java/util/concurrent/tck/CopyOnWriteArraySetTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/CopyOnWriteArraySetTest.java rename to test/jdk/java/util/concurrent/tck/CopyOnWriteArraySetTest.java diff --git a/jdk/test/java/util/concurrent/tck/CountDownLatchTest.java b/test/jdk/java/util/concurrent/tck/CountDownLatchTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/CountDownLatchTest.java rename to test/jdk/java/util/concurrent/tck/CountDownLatchTest.java diff --git a/jdk/test/java/util/concurrent/tck/CountedCompleter8Test.java b/test/jdk/java/util/concurrent/tck/CountedCompleter8Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/CountedCompleter8Test.java rename to test/jdk/java/util/concurrent/tck/CountedCompleter8Test.java diff --git a/jdk/test/java/util/concurrent/tck/CountedCompleterTest.java b/test/jdk/java/util/concurrent/tck/CountedCompleterTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/CountedCompleterTest.java rename to test/jdk/java/util/concurrent/tck/CountedCompleterTest.java diff --git a/jdk/test/java/util/concurrent/tck/CyclicBarrierTest.java b/test/jdk/java/util/concurrent/tck/CyclicBarrierTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/CyclicBarrierTest.java rename to test/jdk/java/util/concurrent/tck/CyclicBarrierTest.java diff --git a/jdk/test/java/util/concurrent/tck/DelayQueueTest.java b/test/jdk/java/util/concurrent/tck/DelayQueueTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/DelayQueueTest.java rename to test/jdk/java/util/concurrent/tck/DelayQueueTest.java diff --git a/jdk/test/java/util/concurrent/tck/DoubleAccumulatorTest.java b/test/jdk/java/util/concurrent/tck/DoubleAccumulatorTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/DoubleAccumulatorTest.java rename to test/jdk/java/util/concurrent/tck/DoubleAccumulatorTest.java diff --git a/jdk/test/java/util/concurrent/tck/DoubleAdderTest.java b/test/jdk/java/util/concurrent/tck/DoubleAdderTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/DoubleAdderTest.java rename to test/jdk/java/util/concurrent/tck/DoubleAdderTest.java diff --git a/jdk/test/java/util/concurrent/tck/EntryTest.java b/test/jdk/java/util/concurrent/tck/EntryTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/EntryTest.java rename to test/jdk/java/util/concurrent/tck/EntryTest.java diff --git a/jdk/test/java/util/concurrent/tck/ExchangerTest.java b/test/jdk/java/util/concurrent/tck/ExchangerTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ExchangerTest.java rename to test/jdk/java/util/concurrent/tck/ExchangerTest.java diff --git a/jdk/test/java/util/concurrent/tck/ExecutorCompletionService9Test.java b/test/jdk/java/util/concurrent/tck/ExecutorCompletionService9Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ExecutorCompletionService9Test.java rename to test/jdk/java/util/concurrent/tck/ExecutorCompletionService9Test.java diff --git a/jdk/test/java/util/concurrent/tck/ExecutorCompletionServiceTest.java b/test/jdk/java/util/concurrent/tck/ExecutorCompletionServiceTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ExecutorCompletionServiceTest.java rename to test/jdk/java/util/concurrent/tck/ExecutorCompletionServiceTest.java diff --git a/jdk/test/java/util/concurrent/tck/ExecutorsTest.java b/test/jdk/java/util/concurrent/tck/ExecutorsTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ExecutorsTest.java rename to test/jdk/java/util/concurrent/tck/ExecutorsTest.java diff --git a/jdk/test/java/util/concurrent/tck/ForkJoinPool8Test.java b/test/jdk/java/util/concurrent/tck/ForkJoinPool8Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ForkJoinPool8Test.java rename to test/jdk/java/util/concurrent/tck/ForkJoinPool8Test.java diff --git a/jdk/test/java/util/concurrent/tck/ForkJoinPool9Test.java b/test/jdk/java/util/concurrent/tck/ForkJoinPool9Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ForkJoinPool9Test.java rename to test/jdk/java/util/concurrent/tck/ForkJoinPool9Test.java diff --git a/jdk/test/java/util/concurrent/tck/ForkJoinPoolTest.java b/test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ForkJoinPoolTest.java rename to test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java diff --git a/jdk/test/java/util/concurrent/tck/ForkJoinTask8Test.java b/test/jdk/java/util/concurrent/tck/ForkJoinTask8Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ForkJoinTask8Test.java rename to test/jdk/java/util/concurrent/tck/ForkJoinTask8Test.java diff --git a/jdk/test/java/util/concurrent/tck/ForkJoinTaskTest.java b/test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ForkJoinTaskTest.java rename to test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java diff --git a/jdk/test/java/util/concurrent/tck/FutureTaskTest.java b/test/jdk/java/util/concurrent/tck/FutureTaskTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/FutureTaskTest.java rename to test/jdk/java/util/concurrent/tck/FutureTaskTest.java diff --git a/jdk/test/java/util/concurrent/tck/JSR166TestCase.java b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/JSR166TestCase.java rename to test/jdk/java/util/concurrent/tck/JSR166TestCase.java diff --git a/jdk/test/java/util/concurrent/tck/LinkedBlockingDeque8Test.java b/test/jdk/java/util/concurrent/tck/LinkedBlockingDeque8Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/LinkedBlockingDeque8Test.java rename to test/jdk/java/util/concurrent/tck/LinkedBlockingDeque8Test.java diff --git a/jdk/test/java/util/concurrent/tck/LinkedBlockingDequeTest.java b/test/jdk/java/util/concurrent/tck/LinkedBlockingDequeTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/LinkedBlockingDequeTest.java rename to test/jdk/java/util/concurrent/tck/LinkedBlockingDequeTest.java diff --git a/jdk/test/java/util/concurrent/tck/LinkedBlockingQueue8Test.java b/test/jdk/java/util/concurrent/tck/LinkedBlockingQueue8Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/LinkedBlockingQueue8Test.java rename to test/jdk/java/util/concurrent/tck/LinkedBlockingQueue8Test.java diff --git a/jdk/test/java/util/concurrent/tck/LinkedBlockingQueueTest.java b/test/jdk/java/util/concurrent/tck/LinkedBlockingQueueTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/LinkedBlockingQueueTest.java rename to test/jdk/java/util/concurrent/tck/LinkedBlockingQueueTest.java diff --git a/jdk/test/java/util/concurrent/tck/LinkedListTest.java b/test/jdk/java/util/concurrent/tck/LinkedListTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/LinkedListTest.java rename to test/jdk/java/util/concurrent/tck/LinkedListTest.java diff --git a/jdk/test/java/util/concurrent/tck/LinkedTransferQueueTest.java b/test/jdk/java/util/concurrent/tck/LinkedTransferQueueTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/LinkedTransferQueueTest.java rename to test/jdk/java/util/concurrent/tck/LinkedTransferQueueTest.java diff --git a/jdk/test/java/util/concurrent/tck/LockSupportTest.java b/test/jdk/java/util/concurrent/tck/LockSupportTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/LockSupportTest.java rename to test/jdk/java/util/concurrent/tck/LockSupportTest.java diff --git a/jdk/test/java/util/concurrent/tck/LongAccumulatorTest.java b/test/jdk/java/util/concurrent/tck/LongAccumulatorTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/LongAccumulatorTest.java rename to test/jdk/java/util/concurrent/tck/LongAccumulatorTest.java diff --git a/jdk/test/java/util/concurrent/tck/LongAdderTest.java b/test/jdk/java/util/concurrent/tck/LongAdderTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/LongAdderTest.java rename to test/jdk/java/util/concurrent/tck/LongAdderTest.java diff --git a/jdk/test/java/util/concurrent/tck/PhaserTest.java b/test/jdk/java/util/concurrent/tck/PhaserTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/PhaserTest.java rename to test/jdk/java/util/concurrent/tck/PhaserTest.java diff --git a/jdk/test/java/util/concurrent/tck/PriorityBlockingQueueTest.java b/test/jdk/java/util/concurrent/tck/PriorityBlockingQueueTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/PriorityBlockingQueueTest.java rename to test/jdk/java/util/concurrent/tck/PriorityBlockingQueueTest.java diff --git a/jdk/test/java/util/concurrent/tck/PriorityQueueTest.java b/test/jdk/java/util/concurrent/tck/PriorityQueueTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/PriorityQueueTest.java rename to test/jdk/java/util/concurrent/tck/PriorityQueueTest.java diff --git a/jdk/test/java/util/concurrent/tck/RecursiveActionTest.java b/test/jdk/java/util/concurrent/tck/RecursiveActionTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/RecursiveActionTest.java rename to test/jdk/java/util/concurrent/tck/RecursiveActionTest.java diff --git a/jdk/test/java/util/concurrent/tck/RecursiveTaskTest.java b/test/jdk/java/util/concurrent/tck/RecursiveTaskTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/RecursiveTaskTest.java rename to test/jdk/java/util/concurrent/tck/RecursiveTaskTest.java diff --git a/jdk/test/java/util/concurrent/tck/ReentrantLockTest.java b/test/jdk/java/util/concurrent/tck/ReentrantLockTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ReentrantLockTest.java rename to test/jdk/java/util/concurrent/tck/ReentrantLockTest.java diff --git a/jdk/test/java/util/concurrent/tck/ReentrantReadWriteLockTest.java b/test/jdk/java/util/concurrent/tck/ReentrantReadWriteLockTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ReentrantReadWriteLockTest.java rename to test/jdk/java/util/concurrent/tck/ReentrantReadWriteLockTest.java diff --git a/jdk/test/java/util/concurrent/tck/ScheduledExecutorSubclassTest.java b/test/jdk/java/util/concurrent/tck/ScheduledExecutorSubclassTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ScheduledExecutorSubclassTest.java rename to test/jdk/java/util/concurrent/tck/ScheduledExecutorSubclassTest.java diff --git a/jdk/test/java/util/concurrent/tck/ScheduledExecutorTest.java b/test/jdk/java/util/concurrent/tck/ScheduledExecutorTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ScheduledExecutorTest.java rename to test/jdk/java/util/concurrent/tck/ScheduledExecutorTest.java diff --git a/jdk/test/java/util/concurrent/tck/SemaphoreTest.java b/test/jdk/java/util/concurrent/tck/SemaphoreTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/SemaphoreTest.java rename to test/jdk/java/util/concurrent/tck/SemaphoreTest.java diff --git a/jdk/test/java/util/concurrent/tck/SplittableRandomTest.java b/test/jdk/java/util/concurrent/tck/SplittableRandomTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/SplittableRandomTest.java rename to test/jdk/java/util/concurrent/tck/SplittableRandomTest.java diff --git a/jdk/test/java/util/concurrent/tck/StampedLockTest.java b/test/jdk/java/util/concurrent/tck/StampedLockTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/StampedLockTest.java rename to test/jdk/java/util/concurrent/tck/StampedLockTest.java diff --git a/jdk/test/java/util/concurrent/tck/SubmissionPublisherTest.java b/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/SubmissionPublisherTest.java rename to test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java diff --git a/jdk/test/java/util/concurrent/tck/SynchronousQueueTest.java b/test/jdk/java/util/concurrent/tck/SynchronousQueueTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/SynchronousQueueTest.java rename to test/jdk/java/util/concurrent/tck/SynchronousQueueTest.java diff --git a/jdk/test/java/util/concurrent/tck/SystemTest.java b/test/jdk/java/util/concurrent/tck/SystemTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/SystemTest.java rename to test/jdk/java/util/concurrent/tck/SystemTest.java diff --git a/jdk/test/java/util/concurrent/tck/ThreadLocalRandom8Test.java b/test/jdk/java/util/concurrent/tck/ThreadLocalRandom8Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ThreadLocalRandom8Test.java rename to test/jdk/java/util/concurrent/tck/ThreadLocalRandom8Test.java diff --git a/jdk/test/java/util/concurrent/tck/ThreadLocalRandomTest.java b/test/jdk/java/util/concurrent/tck/ThreadLocalRandomTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ThreadLocalRandomTest.java rename to test/jdk/java/util/concurrent/tck/ThreadLocalRandomTest.java diff --git a/jdk/test/java/util/concurrent/tck/ThreadLocalTest.java b/test/jdk/java/util/concurrent/tck/ThreadLocalTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ThreadLocalTest.java rename to test/jdk/java/util/concurrent/tck/ThreadLocalTest.java diff --git a/jdk/test/java/util/concurrent/tck/ThreadPoolExecutorSubclassTest.java b/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorSubclassTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ThreadPoolExecutorSubclassTest.java rename to test/jdk/java/util/concurrent/tck/ThreadPoolExecutorSubclassTest.java diff --git a/jdk/test/java/util/concurrent/tck/ThreadPoolExecutorTest.java b/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ThreadPoolExecutorTest.java rename to test/jdk/java/util/concurrent/tck/ThreadPoolExecutorTest.java diff --git a/jdk/test/java/util/concurrent/tck/ThreadTest.java b/test/jdk/java/util/concurrent/tck/ThreadTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/ThreadTest.java rename to test/jdk/java/util/concurrent/tck/ThreadTest.java diff --git a/jdk/test/java/util/concurrent/tck/TimeUnit8Test.java b/test/jdk/java/util/concurrent/tck/TimeUnit8Test.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/TimeUnit8Test.java rename to test/jdk/java/util/concurrent/tck/TimeUnit8Test.java diff --git a/jdk/test/java/util/concurrent/tck/TimeUnitTest.java b/test/jdk/java/util/concurrent/tck/TimeUnitTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/TimeUnitTest.java rename to test/jdk/java/util/concurrent/tck/TimeUnitTest.java diff --git a/jdk/test/java/util/concurrent/tck/TreeMapTest.java b/test/jdk/java/util/concurrent/tck/TreeMapTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/TreeMapTest.java rename to test/jdk/java/util/concurrent/tck/TreeMapTest.java diff --git a/jdk/test/java/util/concurrent/tck/TreeSetTest.java b/test/jdk/java/util/concurrent/tck/TreeSetTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/TreeSetTest.java rename to test/jdk/java/util/concurrent/tck/TreeSetTest.java diff --git a/jdk/test/java/util/concurrent/tck/TreeSubMapTest.java b/test/jdk/java/util/concurrent/tck/TreeSubMapTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/TreeSubMapTest.java rename to test/jdk/java/util/concurrent/tck/TreeSubMapTest.java diff --git a/jdk/test/java/util/concurrent/tck/TreeSubSetTest.java b/test/jdk/java/util/concurrent/tck/TreeSubSetTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/TreeSubSetTest.java rename to test/jdk/java/util/concurrent/tck/TreeSubSetTest.java diff --git a/jdk/test/java/util/concurrent/tck/VectorTest.java b/test/jdk/java/util/concurrent/tck/VectorTest.java similarity index 100% rename from jdk/test/java/util/concurrent/tck/VectorTest.java rename to test/jdk/java/util/concurrent/tck/VectorTest.java diff --git a/jdk/test/java/util/concurrent/tck/tck.policy b/test/jdk/java/util/concurrent/tck/tck.policy similarity index 100% rename from jdk/test/java/util/concurrent/tck/tck.policy rename to test/jdk/java/util/concurrent/tck/tck.policy diff --git a/jdk/test/java/util/function/BiFunction/BiFunctionTest.java b/test/jdk/java/util/function/BiFunction/BiFunctionTest.java similarity index 100% rename from jdk/test/java/util/function/BiFunction/BiFunctionTest.java rename to test/jdk/java/util/function/BiFunction/BiFunctionTest.java diff --git a/jdk/test/java/util/function/BinaryOperator/BasicTest.java b/test/jdk/java/util/function/BinaryOperator/BasicTest.java similarity index 100% rename from jdk/test/java/util/function/BinaryOperator/BasicTest.java rename to test/jdk/java/util/function/BinaryOperator/BasicTest.java diff --git a/jdk/test/java/util/jar/Attributes/IterationOrder.java b/test/jdk/java/util/jar/Attributes/IterationOrder.java similarity index 100% rename from jdk/test/java/util/jar/Attributes/IterationOrder.java rename to test/jdk/java/util/jar/Attributes/IterationOrder.java diff --git a/jdk/test/java/util/jar/Attributes/Name.java b/test/jdk/java/util/jar/Attributes/Name.java similarity index 100% rename from jdk/test/java/util/jar/Attributes/Name.java rename to test/jdk/java/util/jar/Attributes/Name.java diff --git a/jdk/test/java/util/jar/Attributes/PutAndPutAll.java b/test/jdk/java/util/jar/Attributes/PutAndPutAll.java similarity index 100% rename from jdk/test/java/util/jar/Attributes/PutAndPutAll.java rename to test/jdk/java/util/jar/Attributes/PutAndPutAll.java diff --git a/jdk/test/java/util/jar/JarEntry/GetMethodsReturnClones.java b/test/jdk/java/util/jar/JarEntry/GetMethodsReturnClones.java similarity index 100% rename from jdk/test/java/util/jar/JarEntry/GetMethodsReturnClones.java rename to test/jdk/java/util/jar/JarEntry/GetMethodsReturnClones.java diff --git a/jdk/test/java/util/jar/JarEntry/test.jar b/test/jdk/java/util/jar/JarEntry/test.jar similarity index 100% rename from jdk/test/java/util/jar/JarEntry/test.jar rename to test/jdk/java/util/jar/JarEntry/test.jar diff --git a/jdk/test/java/util/jar/JarFile/Constructor.java b/test/jdk/java/util/jar/JarFile/Constructor.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/Constructor.java rename to test/jdk/java/util/jar/JarFile/Constructor.java diff --git a/jdk/test/java/util/jar/JarFile/JarBacktickManifest.java b/test/jdk/java/util/jar/JarFile/JarBacktickManifest.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/JarBacktickManifest.java rename to test/jdk/java/util/jar/JarFile/JarBacktickManifest.java diff --git a/jdk/test/java/util/jar/JarFile/JarNoManifest.java b/test/jdk/java/util/jar/JarFile/JarNoManifest.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/JarNoManifest.java rename to test/jdk/java/util/jar/JarFile/JarNoManifest.java diff --git a/jdk/test/java/util/jar/JarFile/MevNPE.java b/test/jdk/java/util/jar/JarFile/MevNPE.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/MevNPE.java rename to test/jdk/java/util/jar/JarFile/MevNPE.java diff --git a/jdk/test/java/util/jar/JarFile/ScanSignedJar.java b/test/jdk/java/util/jar/JarFile/ScanSignedJar.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/ScanSignedJar.java rename to test/jdk/java/util/jar/JarFile/ScanSignedJar.java diff --git a/jdk/test/java/util/jar/JarFile/Signed.jar b/test/jdk/java/util/jar/JarFile/Signed.jar similarity index 100% rename from jdk/test/java/util/jar/JarFile/Signed.jar rename to test/jdk/java/util/jar/JarFile/Signed.jar diff --git a/jdk/test/java/util/jar/JarFile/SignedJarFileGetInputStream.java b/test/jdk/java/util/jar/JarFile/SignedJarFileGetInputStream.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/SignedJarFileGetInputStream.java rename to test/jdk/java/util/jar/JarFile/SignedJarFileGetInputStream.java diff --git a/jdk/test/java/util/jar/JarFile/SorryClosed.java b/test/jdk/java/util/jar/JarFile/SorryClosed.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/SorryClosed.java rename to test/jdk/java/util/jar/JarFile/SorryClosed.java diff --git a/jdk/test/java/util/jar/JarFile/TurkCert.java b/test/jdk/java/util/jar/JarFile/TurkCert.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/TurkCert.java rename to test/jdk/java/util/jar/JarFile/TurkCert.java diff --git a/jdk/test/java/util/jar/JarFile/VerifySignedJar.java b/test/jdk/java/util/jar/JarFile/VerifySignedJar.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/VerifySignedJar.java rename to test/jdk/java/util/jar/JarFile/VerifySignedJar.java diff --git a/jdk/test/java/util/jar/JarFile/bogus-signerinfo-attr.jar b/test/jdk/java/util/jar/JarFile/bogus-signerinfo-attr.jar similarity index 100% rename from jdk/test/java/util/jar/JarFile/bogus-signerinfo-attr.jar rename to test/jdk/java/util/jar/JarFile/bogus-signerinfo-attr.jar diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java rename to test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarHttpProperties.java b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarHttpProperties.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarHttpProperties.java rename to test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarHttpProperties.java diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java rename to test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java similarity index 100% rename from jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java rename to test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java diff --git a/jdk/test/java/util/jar/JarFile/mrjar/TEST.properties b/test/jdk/java/util/jar/JarFile/mrjar/TEST.properties similarity index 100% rename from jdk/test/java/util/jar/JarFile/mrjar/TEST.properties rename to test/jdk/java/util/jar/JarFile/mrjar/TEST.properties diff --git a/jdk/test/java/util/jar/JarFile/no-manifest.jar b/test/jdk/java/util/jar/JarFile/no-manifest.jar similarity index 100% rename from jdk/test/java/util/jar/JarFile/no-manifest.jar rename to test/jdk/java/util/jar/JarFile/no-manifest.jar diff --git a/jdk/test/java/util/jar/JarFile/test.jar b/test/jdk/java/util/jar/JarFile/test.jar similarity index 100% rename from jdk/test/java/util/jar/JarFile/test.jar rename to test/jdk/java/util/jar/JarFile/test.jar diff --git a/jdk/test/java/util/jar/JarFile/thawjar.jar b/test/jdk/java/util/jar/JarFile/thawjar.jar similarity index 100% rename from jdk/test/java/util/jar/JarFile/thawjar.jar rename to test/jdk/java/util/jar/JarFile/thawjar.jar diff --git a/jdk/test/java/util/jar/JarInputStream/BadSignedJar.jar b/test/jdk/java/util/jar/JarInputStream/BadSignedJar.jar similarity index 100% rename from jdk/test/java/util/jar/JarInputStream/BadSignedJar.jar rename to test/jdk/java/util/jar/JarInputStream/BadSignedJar.jar diff --git a/jdk/test/java/util/jar/JarInputStream/EmptyJar.java b/test/jdk/java/util/jar/JarInputStream/EmptyJar.java similarity index 100% rename from jdk/test/java/util/jar/JarInputStream/EmptyJar.java rename to test/jdk/java/util/jar/JarInputStream/EmptyJar.java diff --git a/jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java b/test/jdk/java/util/jar/JarInputStream/ExtraFileInMetaInf.java similarity index 100% rename from jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java rename to test/jdk/java/util/jar/JarInputStream/ExtraFileInMetaInf.java diff --git a/jdk/test/java/util/jar/JarInputStream/ScanSignedJar.java b/test/jdk/java/util/jar/JarInputStream/ScanSignedJar.java similarity index 100% rename from jdk/test/java/util/jar/JarInputStream/ScanSignedJar.java rename to test/jdk/java/util/jar/JarInputStream/ScanSignedJar.java diff --git a/jdk/test/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java b/test/jdk/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java similarity index 100% rename from jdk/test/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java rename to test/jdk/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java diff --git a/jdk/test/java/util/jar/JarInputStream/signed.jar b/test/jdk/java/util/jar/JarInputStream/signed.jar similarity index 100% rename from jdk/test/java/util/jar/JarInputStream/signed.jar rename to test/jdk/java/util/jar/JarInputStream/signed.jar diff --git a/jdk/test/java/util/jar/Manifest/CreateManifest.java b/test/jdk/java/util/jar/Manifest/CreateManifest.java similarity index 100% rename from jdk/test/java/util/jar/Manifest/CreateManifest.java rename to test/jdk/java/util/jar/Manifest/CreateManifest.java diff --git a/jdk/test/java/util/jar/Pack200/SecurityTest.java b/test/jdk/java/util/jar/Pack200/SecurityTest.java similarity index 100% rename from jdk/test/java/util/jar/Pack200/SecurityTest.java rename to test/jdk/java/util/jar/Pack200/SecurityTest.java diff --git a/jdk/test/java/util/jar/TestExtra.java b/test/jdk/java/util/jar/TestExtra.java similarity index 100% rename from jdk/test/java/util/jar/TestExtra.java rename to test/jdk/java/util/jar/TestExtra.java diff --git a/jdk/test/java/util/logging/AnonymousLogger/TestAnonymousLogger.java b/test/jdk/java/util/logging/AnonymousLogger/TestAnonymousLogger.java similarity index 100% rename from jdk/test/java/util/logging/AnonymousLogger/TestAnonymousLogger.java rename to test/jdk/java/util/logging/AnonymousLogger/TestAnonymousLogger.java diff --git a/jdk/test/java/util/logging/CheckLockLocationTest.java b/test/jdk/java/util/logging/CheckLockLocationTest.java similarity index 100% rename from jdk/test/java/util/logging/CheckLockLocationTest.java rename to test/jdk/java/util/logging/CheckLockLocationTest.java diff --git a/jdk/test/java/util/logging/CheckZombieLockTest.java b/test/jdk/java/util/logging/CheckZombieLockTest.java similarity index 100% rename from jdk/test/java/util/logging/CheckZombieLockTest.java rename to test/jdk/java/util/logging/CheckZombieLockTest.java diff --git a/jdk/test/java/util/logging/ClassLoaderLeakTest.java b/test/jdk/java/util/logging/ClassLoaderLeakTest.java similarity index 100% rename from jdk/test/java/util/logging/ClassLoaderLeakTest.java rename to test/jdk/java/util/logging/ClassLoaderLeakTest.java diff --git a/jdk/test/java/util/logging/CustomLogManager.java b/test/jdk/java/util/logging/CustomLogManager.java similarity index 100% rename from jdk/test/java/util/logging/CustomLogManager.java rename to test/jdk/java/util/logging/CustomLogManager.java diff --git a/jdk/test/java/util/logging/CustomLogManagerTest.java b/test/jdk/java/util/logging/CustomLogManagerTest.java similarity index 100% rename from jdk/test/java/util/logging/CustomLogManagerTest.java rename to test/jdk/java/util/logging/CustomLogManagerTest.java diff --git a/jdk/test/java/util/logging/DrainFindDeadlockTest.java b/test/jdk/java/util/logging/DrainFindDeadlockTest.java similarity index 100% rename from jdk/test/java/util/logging/DrainFindDeadlockTest.java rename to test/jdk/java/util/logging/DrainFindDeadlockTest.java diff --git a/jdk/test/java/util/logging/FileHandlerLongLimit.java b/test/jdk/java/util/logging/FileHandlerLongLimit.java similarity index 100% rename from jdk/test/java/util/logging/FileHandlerLongLimit.java rename to test/jdk/java/util/logging/FileHandlerLongLimit.java diff --git a/jdk/test/java/util/logging/FileHandlerMaxLocksTest.java b/test/jdk/java/util/logging/FileHandlerMaxLocksTest.java similarity index 100% rename from jdk/test/java/util/logging/FileHandlerMaxLocksTest.java rename to test/jdk/java/util/logging/FileHandlerMaxLocksTest.java diff --git a/jdk/test/java/util/logging/FileHandlerPath.java b/test/jdk/java/util/logging/FileHandlerPath.java similarity index 100% rename from jdk/test/java/util/logging/FileHandlerPath.java rename to test/jdk/java/util/logging/FileHandlerPath.java diff --git a/jdk/test/java/util/logging/FileHandlerPatternExceptions.java b/test/jdk/java/util/logging/FileHandlerPatternExceptions.java similarity index 100% rename from jdk/test/java/util/logging/FileHandlerPatternExceptions.java rename to test/jdk/java/util/logging/FileHandlerPatternExceptions.java diff --git a/jdk/test/java/util/logging/GetGlobalTest.java b/test/jdk/java/util/logging/GetGlobalTest.java similarity index 100% rename from jdk/test/java/util/logging/GetGlobalTest.java rename to test/jdk/java/util/logging/GetGlobalTest.java diff --git a/jdk/test/java/util/logging/HandlersConfigTest$Configured.props b/test/jdk/java/util/logging/HandlersConfigTest$Configured.props similarity index 100% rename from jdk/test/java/util/logging/HandlersConfigTest$Configured.props rename to test/jdk/java/util/logging/HandlersConfigTest$Configured.props diff --git a/jdk/test/java/util/logging/HandlersConfigTest$Default.props b/test/jdk/java/util/logging/HandlersConfigTest$Default.props similarity index 100% rename from jdk/test/java/util/logging/HandlersConfigTest$Default.props rename to test/jdk/java/util/logging/HandlersConfigTest$Default.props diff --git a/jdk/test/java/util/logging/HandlersConfigTest.java b/test/jdk/java/util/logging/HandlersConfigTest.java similarity index 100% rename from jdk/test/java/util/logging/HandlersConfigTest.java rename to test/jdk/java/util/logging/HandlersConfigTest.java diff --git a/jdk/test/java/util/logging/HigherResolutionTimeStamps/LogRecordWithNanos.java b/test/jdk/java/util/logging/HigherResolutionTimeStamps/LogRecordWithNanos.java similarity index 100% rename from jdk/test/java/util/logging/HigherResolutionTimeStamps/LogRecordWithNanos.java rename to test/jdk/java/util/logging/HigherResolutionTimeStamps/LogRecordWithNanos.java diff --git a/jdk/test/java/util/logging/HigherResolutionTimeStamps/LogRecordWithNanosAPI.java b/test/jdk/java/util/logging/HigherResolutionTimeStamps/LogRecordWithNanosAPI.java similarity index 100% rename from jdk/test/java/util/logging/HigherResolutionTimeStamps/LogRecordWithNanosAPI.java rename to test/jdk/java/util/logging/HigherResolutionTimeStamps/LogRecordWithNanosAPI.java diff --git a/jdk/test/java/util/logging/HigherResolutionTimeStamps/SerializeLogRecord.java b/test/jdk/java/util/logging/HigherResolutionTimeStamps/SerializeLogRecord.java similarity index 100% rename from jdk/test/java/util/logging/HigherResolutionTimeStamps/SerializeLogRecord.java rename to test/jdk/java/util/logging/HigherResolutionTimeStamps/SerializeLogRecord.java diff --git a/jdk/test/java/util/logging/HigherResolutionTimeStamps/SimpleFormatterNanos.java b/test/jdk/java/util/logging/HigherResolutionTimeStamps/SimpleFormatterNanos.java similarity index 100% rename from jdk/test/java/util/logging/HigherResolutionTimeStamps/SimpleFormatterNanos.java rename to test/jdk/java/util/logging/HigherResolutionTimeStamps/SimpleFormatterNanos.java diff --git a/jdk/test/java/util/logging/HigherResolutionTimeStamps/XmlFormatterNanos.java b/test/jdk/java/util/logging/HigherResolutionTimeStamps/XmlFormatterNanos.java similarity index 100% rename from jdk/test/java/util/logging/HigherResolutionTimeStamps/XmlFormatterNanos.java rename to test/jdk/java/util/logging/HigherResolutionTimeStamps/XmlFormatterNanos.java diff --git a/jdk/test/java/util/logging/Level/CustomLevel.java b/test/jdk/java/util/logging/Level/CustomLevel.java similarity index 100% rename from jdk/test/java/util/logging/Level/CustomLevel.java rename to test/jdk/java/util/logging/Level/CustomLevel.java diff --git a/jdk/test/java/util/logging/Level/myresource.properties b/test/jdk/java/util/logging/Level/myresource.properties similarity index 100% rename from jdk/test/java/util/logging/Level/myresource.properties rename to test/jdk/java/util/logging/Level/myresource.properties diff --git a/jdk/test/java/util/logging/Level/myresource2.properties b/test/jdk/java/util/logging/Level/myresource2.properties similarity index 100% rename from jdk/test/java/util/logging/Level/myresource2.properties rename to test/jdk/java/util/logging/Level/myresource2.properties diff --git a/jdk/test/java/util/logging/LocalizedLevelName.java b/test/jdk/java/util/logging/LocalizedLevelName.java similarity index 100% rename from jdk/test/java/util/logging/LocalizedLevelName.java rename to test/jdk/java/util/logging/LocalizedLevelName.java diff --git a/jdk/test/java/util/logging/LogManager/Configuration/InvalidEscapeConfigurationTest.java b/test/jdk/java/util/logging/LogManager/Configuration/InvalidEscapeConfigurationTest.java similarity index 100% rename from jdk/test/java/util/logging/LogManager/Configuration/InvalidEscapeConfigurationTest.java rename to test/jdk/java/util/logging/LogManager/Configuration/InvalidEscapeConfigurationTest.java diff --git a/jdk/test/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java b/test/jdk/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java similarity index 100% rename from jdk/test/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java rename to test/jdk/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java diff --git a/jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.java b/test/jdk/java/util/logging/LogManager/Configuration/TestConfigurationLock.java similarity index 100% rename from jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.java rename to test/jdk/java/util/logging/LogManager/Configuration/TestConfigurationLock.java diff --git a/jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.properties b/test/jdk/java/util/logging/LogManager/Configuration/TestConfigurationLock.properties similarity index 100% rename from jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.properties rename to test/jdk/java/util/logging/LogManager/Configuration/TestConfigurationLock.properties diff --git a/jdk/test/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java similarity index 100% rename from jdk/test/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java rename to test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java diff --git a/jdk/test/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java similarity index 100% rename from jdk/test/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java rename to test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java diff --git a/jdk/test/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigWithInputStreamTest.java b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigWithInputStreamTest.java similarity index 100% rename from jdk/test/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigWithInputStreamTest.java rename to test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigWithInputStreamTest.java diff --git a/jdk/test/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigurationTest.java b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigurationTest.java similarity index 100% rename from jdk/test/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigurationTest.java rename to test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigurationTest.java diff --git a/jdk/test/java/util/logging/LogManager/Configuration/updateConfiguration/UpdateConfigurationTest.java b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/UpdateConfigurationTest.java similarity index 100% rename from jdk/test/java/util/logging/LogManager/Configuration/updateConfiguration/UpdateConfigurationTest.java rename to test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/UpdateConfigurationTest.java diff --git a/jdk/test/java/util/logging/LogManager/LinkageErrorTest.java b/test/jdk/java/util/logging/LogManager/LinkageErrorTest.java similarity index 100% rename from jdk/test/java/util/logging/LogManager/LinkageErrorTest.java rename to test/jdk/java/util/logging/LogManager/LinkageErrorTest.java diff --git a/jdk/test/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java b/test/jdk/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java similarity index 100% rename from jdk/test/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java rename to test/jdk/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java diff --git a/jdk/test/java/util/logging/LogManager/TestLoggerNames.java b/test/jdk/java/util/logging/LogManager/TestLoggerNames.java similarity index 100% rename from jdk/test/java/util/logging/LogManager/TestLoggerNames.java rename to test/jdk/java/util/logging/LogManager/TestLoggerNames.java diff --git a/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java b/test/jdk/java/util/logging/LogManagerAppContextDeadlock.java similarity index 100% rename from jdk/test/java/util/logging/LogManagerAppContextDeadlock.java rename to test/jdk/java/util/logging/LogManagerAppContextDeadlock.java diff --git a/jdk/test/java/util/logging/LogManagerInstanceTest.java b/test/jdk/java/util/logging/LogManagerInstanceTest.java similarity index 100% rename from jdk/test/java/util/logging/LogManagerInstanceTest.java rename to test/jdk/java/util/logging/LogManagerInstanceTest.java diff --git a/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java b/test/jdk/java/util/logging/Logger/entering/LoggerEnteringWithParams.java similarity index 100% rename from jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java rename to test/jdk/java/util/logging/Logger/entering/LoggerEnteringWithParams.java diff --git a/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobal.java b/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobal.java similarity index 100% rename from jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobal.java rename to test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobal.java diff --git a/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java b/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java similarity index 100% rename from jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java rename to test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java diff --git a/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java b/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java similarity index 100% rename from jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java rename to test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java diff --git a/jdk/test/java/util/logging/Logger/getGlobal/logging.properties b/test/jdk/java/util/logging/Logger/getGlobal/logging.properties similarity index 100% rename from jdk/test/java/util/logging/Logger/getGlobal/logging.properties rename to test/jdk/java/util/logging/Logger/getGlobal/logging.properties diff --git a/jdk/test/java/util/logging/Logger/getGlobal/policy b/test/jdk/java/util/logging/Logger/getGlobal/policy similarity index 100% rename from jdk/test/java/util/logging/Logger/getGlobal/policy rename to test/jdk/java/util/logging/Logger/getGlobal/policy diff --git a/jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/BadLogManagerImpl.java b/test/jdk/java/util/logging/Logger/getGlobal/testgetglobal/BadLogManagerImpl.java similarity index 100% rename from jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/BadLogManagerImpl.java rename to test/jdk/java/util/logging/Logger/getGlobal/testgetglobal/BadLogManagerImpl.java diff --git a/jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/DummyLogManagerImpl.java b/test/jdk/java/util/logging/Logger/getGlobal/testgetglobal/DummyLogManagerImpl.java similarity index 100% rename from jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/DummyLogManagerImpl.java rename to test/jdk/java/util/logging/Logger/getGlobal/testgetglobal/DummyLogManagerImpl.java diff --git a/jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/HandlerImpl.java b/test/jdk/java/util/logging/Logger/getGlobal/testgetglobal/HandlerImpl.java similarity index 100% rename from jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/HandlerImpl.java rename to test/jdk/java/util/logging/Logger/getGlobal/testgetglobal/HandlerImpl.java diff --git a/jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/LogManagerImpl1.java b/test/jdk/java/util/logging/Logger/getGlobal/testgetglobal/LogManagerImpl1.java similarity index 100% rename from jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/LogManagerImpl1.java rename to test/jdk/java/util/logging/Logger/getGlobal/testgetglobal/LogManagerImpl1.java diff --git a/jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/LogManagerImpl2.java b/test/jdk/java/util/logging/Logger/getGlobal/testgetglobal/LogManagerImpl2.java similarity index 100% rename from jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/LogManagerImpl2.java rename to test/jdk/java/util/logging/Logger/getGlobal/testgetglobal/LogManagerImpl2.java diff --git a/jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/LogManagerImpl3.java b/test/jdk/java/util/logging/Logger/getGlobal/testgetglobal/LogManagerImpl3.java similarity index 100% rename from jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/LogManagerImpl3.java rename to test/jdk/java/util/logging/Logger/getGlobal/testgetglobal/LogManagerImpl3.java diff --git a/jdk/test/java/util/logging/Logger/getLogger/TestInferCaller.java b/test/jdk/java/util/logging/Logger/getLogger/TestInferCaller.java similarity index 100% rename from jdk/test/java/util/logging/Logger/getLogger/TestInferCaller.java rename to test/jdk/java/util/logging/Logger/getLogger/TestInferCaller.java diff --git a/jdk/test/java/util/logging/Logger/getLogger/TestLogger.java b/test/jdk/java/util/logging/Logger/getLogger/TestLogger.java similarity index 100% rename from jdk/test/java/util/logging/Logger/getLogger/TestLogger.java rename to test/jdk/java/util/logging/Logger/getLogger/TestLogger.java diff --git a/jdk/test/java/util/logging/Logger/getLogger/testlogger/MyResource.java b/test/jdk/java/util/logging/Logger/getLogger/testlogger/MyResource.java similarity index 100% rename from jdk/test/java/util/logging/Logger/getLogger/testlogger/MyResource.java rename to test/jdk/java/util/logging/Logger/getLogger/testlogger/MyResource.java diff --git a/jdk/test/java/util/logging/Logger/isLoggable/TestIsLoggable.java b/test/jdk/java/util/logging/Logger/isLoggable/TestIsLoggable.java similarity index 100% rename from jdk/test/java/util/logging/Logger/isLoggable/TestIsLoggable.java rename to test/jdk/java/util/logging/Logger/isLoggable/TestIsLoggable.java diff --git a/jdk/test/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java b/test/jdk/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java similarity index 100% rename from jdk/test/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java rename to test/jdk/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java diff --git a/jdk/test/java/util/logging/Logger/logrb/resources/ListBundle.java b/test/jdk/java/util/logging/Logger/logrb/resources/ListBundle.java similarity index 100% rename from jdk/test/java/util/logging/Logger/logrb/resources/ListBundle.java rename to test/jdk/java/util/logging/Logger/logrb/resources/ListBundle.java diff --git a/jdk/test/java/util/logging/Logger/logrb/resources/ListBundle_fr.java b/test/jdk/java/util/logging/Logger/logrb/resources/ListBundle_fr.java similarity index 100% rename from jdk/test/java/util/logging/Logger/logrb/resources/ListBundle_fr.java rename to test/jdk/java/util/logging/Logger/logrb/resources/ListBundle_fr.java diff --git a/jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle.properties b/test/jdk/java/util/logging/Logger/logrb/resources/PropertyBundle.properties similarity index 100% rename from jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle.properties rename to test/jdk/java/util/logging/Logger/logrb/resources/PropertyBundle.properties diff --git a/jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle_fr.properties b/test/jdk/java/util/logging/Logger/logrb/resources/PropertyBundle_fr.properties similarity index 100% rename from jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle_fr.properties rename to test/jdk/java/util/logging/Logger/logrb/resources/PropertyBundle_fr.properties diff --git a/jdk/test/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java b/test/jdk/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java similarity index 100% rename from jdk/test/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java rename to test/jdk/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java diff --git a/jdk/test/java/util/logging/Logger/setResourceBundle/resources/ListBundle.java b/test/jdk/java/util/logging/Logger/setResourceBundle/resources/ListBundle.java similarity index 100% rename from jdk/test/java/util/logging/Logger/setResourceBundle/resources/ListBundle.java rename to test/jdk/java/util/logging/Logger/setResourceBundle/resources/ListBundle.java diff --git a/jdk/test/java/util/logging/Logger/setResourceBundle/resources/ListBundle_fr.java b/test/jdk/java/util/logging/Logger/setResourceBundle/resources/ListBundle_fr.java similarity index 100% rename from jdk/test/java/util/logging/Logger/setResourceBundle/resources/ListBundle_fr.java rename to test/jdk/java/util/logging/Logger/setResourceBundle/resources/ListBundle_fr.java diff --git a/jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle.properties b/test/jdk/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle.properties similarity index 100% rename from jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle.properties rename to test/jdk/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle.properties diff --git a/jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle_fr.properties b/test/jdk/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle_fr.properties similarity index 100% rename from jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle_fr.properties rename to test/jdk/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle_fr.properties diff --git a/jdk/test/java/util/logging/LoggerResourceBundleRace.java b/test/jdk/java/util/logging/LoggerResourceBundleRace.java similarity index 100% rename from jdk/test/java/util/logging/LoggerResourceBundleRace.java rename to test/jdk/java/util/logging/LoggerResourceBundleRace.java diff --git a/jdk/test/java/util/logging/LoggerSubclass.java b/test/jdk/java/util/logging/LoggerSubclass.java similarity index 100% rename from jdk/test/java/util/logging/LoggerSubclass.java rename to test/jdk/java/util/logging/LoggerSubclass.java diff --git a/jdk/test/java/util/logging/LoggerSupplierAPIsTest.java b/test/jdk/java/util/logging/LoggerSupplierAPIsTest.java similarity index 100% rename from jdk/test/java/util/logging/LoggerSupplierAPIsTest.java rename to test/jdk/java/util/logging/LoggerSupplierAPIsTest.java diff --git a/jdk/test/java/util/logging/LoggingDeadlock.java b/test/jdk/java/util/logging/LoggingDeadlock.java similarity index 100% rename from jdk/test/java/util/logging/LoggingDeadlock.java rename to test/jdk/java/util/logging/LoggingDeadlock.java diff --git a/jdk/test/java/util/logging/LoggingDeadlock2.java b/test/jdk/java/util/logging/LoggingDeadlock2.java similarity index 100% rename from jdk/test/java/util/logging/LoggingDeadlock2.java rename to test/jdk/java/util/logging/LoggingDeadlock2.java diff --git a/jdk/test/java/util/logging/LoggingDeadlock3.java b/test/jdk/java/util/logging/LoggingDeadlock3.java similarity index 100% rename from jdk/test/java/util/logging/LoggingDeadlock3.java rename to test/jdk/java/util/logging/LoggingDeadlock3.java diff --git a/jdk/test/java/util/logging/LoggingDeadlock3.props b/test/jdk/java/util/logging/LoggingDeadlock3.props similarity index 100% rename from jdk/test/java/util/logging/LoggingDeadlock3.props rename to test/jdk/java/util/logging/LoggingDeadlock3.props diff --git a/jdk/test/java/util/logging/LoggingDeadlock4.java b/test/jdk/java/util/logging/LoggingDeadlock4.java similarity index 100% rename from jdk/test/java/util/logging/LoggingDeadlock4.java rename to test/jdk/java/util/logging/LoggingDeadlock4.java diff --git a/jdk/test/java/util/logging/LoggingMXBeanTest.java b/test/jdk/java/util/logging/LoggingMXBeanTest.java similarity index 100% rename from jdk/test/java/util/logging/LoggingMXBeanTest.java rename to test/jdk/java/util/logging/LoggingMXBeanTest.java diff --git a/jdk/test/java/util/logging/LoggingMXBeanTest2.java b/test/jdk/java/util/logging/LoggingMXBeanTest2.java similarity index 100% rename from jdk/test/java/util/logging/LoggingMXBeanTest2.java rename to test/jdk/java/util/logging/LoggingMXBeanTest2.java diff --git a/jdk/test/java/util/logging/LoggingNIOChange.java b/test/jdk/java/util/logging/LoggingNIOChange.java similarity index 100% rename from jdk/test/java/util/logging/LoggingNIOChange.java rename to test/jdk/java/util/logging/LoggingNIOChange.java diff --git a/jdk/test/java/util/logging/MemoryHandlerTest.java b/test/jdk/java/util/logging/MemoryHandlerTest.java similarity index 100% rename from jdk/test/java/util/logging/MemoryHandlerTest.java rename to test/jdk/java/util/logging/MemoryHandlerTest.java diff --git a/jdk/test/java/util/logging/MemoryHandlerTest.props b/test/jdk/java/util/logging/MemoryHandlerTest.props similarity index 100% rename from jdk/test/java/util/logging/MemoryHandlerTest.props rename to test/jdk/java/util/logging/MemoryHandlerTest.props diff --git a/jdk/test/java/util/logging/ParentLoggersTest.java b/test/jdk/java/util/logging/ParentLoggersTest.java similarity index 100% rename from jdk/test/java/util/logging/ParentLoggersTest.java rename to test/jdk/java/util/logging/ParentLoggersTest.java diff --git a/jdk/test/java/util/logging/ParentLoggersTest.props b/test/jdk/java/util/logging/ParentLoggersTest.props similarity index 100% rename from jdk/test/java/util/logging/ParentLoggersTest.props rename to test/jdk/java/util/logging/ParentLoggersTest.props diff --git a/jdk/test/java/util/logging/RacingThreadsTest.java b/test/jdk/java/util/logging/RacingThreadsTest.java similarity index 100% rename from jdk/test/java/util/logging/RacingThreadsTest.java rename to test/jdk/java/util/logging/RacingThreadsTest.java diff --git a/jdk/test/java/util/logging/Reflect.java b/test/jdk/java/util/logging/Reflect.java similarity index 100% rename from jdk/test/java/util/logging/Reflect.java rename to test/jdk/java/util/logging/Reflect.java diff --git a/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java b/test/jdk/java/util/logging/RootLogger/RootLevelInConfigFile.java similarity index 100% rename from jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java rename to test/jdk/java/util/logging/RootLogger/RootLevelInConfigFile.java diff --git a/jdk/test/java/util/logging/RootLogger/rootlogger.properties b/test/jdk/java/util/logging/RootLogger/rootlogger.properties similarity index 100% rename from jdk/test/java/util/logging/RootLogger/rootlogger.properties rename to test/jdk/java/util/logging/RootLogger/rootlogger.properties diff --git a/jdk/test/java/util/logging/SimpleFormatterFormat.java b/test/jdk/java/util/logging/SimpleFormatterFormat.java similarity index 100% rename from jdk/test/java/util/logging/SimpleFormatterFormat.java rename to test/jdk/java/util/logging/SimpleFormatterFormat.java diff --git a/jdk/test/java/util/logging/SimpleLogManager.java b/test/jdk/java/util/logging/SimpleLogManager.java similarity index 100% rename from jdk/test/java/util/logging/SimpleLogManager.java rename to test/jdk/java/util/logging/SimpleLogManager.java diff --git a/jdk/test/java/util/logging/SystemLoggerConfigTest.java b/test/jdk/java/util/logging/SystemLoggerConfigTest.java similarity index 100% rename from jdk/test/java/util/logging/SystemLoggerConfigTest.java rename to test/jdk/java/util/logging/SystemLoggerConfigTest.java diff --git a/jdk/test/java/util/logging/TEST.properties b/test/jdk/java/util/logging/TEST.properties similarity index 100% rename from jdk/test/java/util/logging/TEST.properties rename to test/jdk/java/util/logging/TEST.properties diff --git a/jdk/test/java/util/logging/TestAppletLoggerContext.java b/test/jdk/java/util/logging/TestAppletLoggerContext.java similarity index 100% rename from jdk/test/java/util/logging/TestAppletLoggerContext.java rename to test/jdk/java/util/logging/TestAppletLoggerContext.java diff --git a/jdk/test/java/util/logging/TestConfigurationListeners.java b/test/jdk/java/util/logging/TestConfigurationListeners.java similarity index 100% rename from jdk/test/java/util/logging/TestConfigurationListeners.java rename to test/jdk/java/util/logging/TestConfigurationListeners.java diff --git a/jdk/test/java/util/logging/TestGetLoggerNPE.java b/test/jdk/java/util/logging/TestGetLoggerNPE.java similarity index 100% rename from jdk/test/java/util/logging/TestGetLoggerNPE.java rename to test/jdk/java/util/logging/TestGetLoggerNPE.java diff --git a/jdk/test/java/util/logging/TestLogConfigurationDeadLock.java b/test/jdk/java/util/logging/TestLogConfigurationDeadLock.java similarity index 100% rename from jdk/test/java/util/logging/TestLogConfigurationDeadLock.java rename to test/jdk/java/util/logging/TestLogConfigurationDeadLock.java diff --git a/jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java b/test/jdk/java/util/logging/TestLogConfigurationDeadLockWithConf.java similarity index 100% rename from jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java rename to test/jdk/java/util/logging/TestLogConfigurationDeadLockWithConf.java diff --git a/jdk/test/java/util/logging/TestLoggerBundleSync.java b/test/jdk/java/util/logging/TestLoggerBundleSync.java similarity index 100% rename from jdk/test/java/util/logging/TestLoggerBundleSync.java rename to test/jdk/java/util/logging/TestLoggerBundleSync.java diff --git a/jdk/test/java/util/logging/TestLoggerWeakRefLeak.java b/test/jdk/java/util/logging/TestLoggerWeakRefLeak.java similarity index 100% rename from jdk/test/java/util/logging/TestLoggerWeakRefLeak.java rename to test/jdk/java/util/logging/TestLoggerWeakRefLeak.java diff --git a/jdk/test/java/util/logging/TestLoggingWithMainAppContext.java b/test/jdk/java/util/logging/TestLoggingWithMainAppContext.java similarity index 100% rename from jdk/test/java/util/logging/TestLoggingWithMainAppContext.java rename to test/jdk/java/util/logging/TestLoggingWithMainAppContext.java diff --git a/jdk/test/java/util/logging/TestMainAppContext.java b/test/jdk/java/util/logging/TestMainAppContext.java similarity index 100% rename from jdk/test/java/util/logging/TestMainAppContext.java rename to test/jdk/java/util/logging/TestMainAppContext.java diff --git a/jdk/test/java/util/logging/XMLFormatterDate.java b/test/jdk/java/util/logging/XMLFormatterDate.java similarity index 100% rename from jdk/test/java/util/logging/XMLFormatterDate.java rename to test/jdk/java/util/logging/XMLFormatterDate.java diff --git a/jdk/test/java/util/logging/bundlesearch/ClassPathTestBundle_en.properties b/test/jdk/java/util/logging/bundlesearch/ClassPathTestBundle_en.properties similarity index 100% rename from jdk/test/java/util/logging/bundlesearch/ClassPathTestBundle_en.properties rename to test/jdk/java/util/logging/bundlesearch/ClassPathTestBundle_en.properties diff --git a/jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java b/test/jdk/java/util/logging/bundlesearch/IndirectlyLoadABundle.java similarity index 100% rename from jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java rename to test/jdk/java/util/logging/bundlesearch/IndirectlyLoadABundle.java diff --git a/jdk/test/java/util/logging/bundlesearch/LoadItUp1.java b/test/jdk/java/util/logging/bundlesearch/LoadItUp1.java similarity index 100% rename from jdk/test/java/util/logging/bundlesearch/LoadItUp1.java rename to test/jdk/java/util/logging/bundlesearch/LoadItUp1.java diff --git a/jdk/test/java/util/logging/bundlesearch/LoadItUp2.java b/test/jdk/java/util/logging/bundlesearch/LoadItUp2.java similarity index 100% rename from jdk/test/java/util/logging/bundlesearch/LoadItUp2.java rename to test/jdk/java/util/logging/bundlesearch/LoadItUp2.java diff --git a/jdk/test/java/util/logging/bundlesearch/LoadItUp2Invoker.java b/test/jdk/java/util/logging/bundlesearch/LoadItUp2Invoker.java similarity index 100% rename from jdk/test/java/util/logging/bundlesearch/LoadItUp2Invoker.java rename to test/jdk/java/util/logging/bundlesearch/LoadItUp2Invoker.java diff --git a/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java b/test/jdk/java/util/logging/bundlesearch/ResourceBundleSearchTest.java similarity index 100% rename from jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java rename to test/jdk/java/util/logging/bundlesearch/ResourceBundleSearchTest.java diff --git a/jdk/test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java b/test/jdk/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java similarity index 100% rename from jdk/test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java rename to test/jdk/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java diff --git a/jdk/test/java/util/logging/bundlesearch/resources/CallerSearchableResource_en.properties b/test/jdk/java/util/logging/bundlesearch/resources/CallerSearchableResource_en.properties similarity index 100% rename from jdk/test/java/util/logging/bundlesearch/resources/CallerSearchableResource_en.properties rename to test/jdk/java/util/logging/bundlesearch/resources/CallerSearchableResource_en.properties diff --git a/jdk/test/java/util/logging/bundlesearch/resources/ContextClassLoaderTestBundle_en.properties b/test/jdk/java/util/logging/bundlesearch/resources/ContextClassLoaderTestBundle_en.properties similarity index 100% rename from jdk/test/java/util/logging/bundlesearch/resources/ContextClassLoaderTestBundle_en.properties rename to test/jdk/java/util/logging/bundlesearch/resources/ContextClassLoaderTestBundle_en.properties diff --git a/jdk/test/java/util/logging/bundlesearch/resources/StackSearchableResource_en.properties b/test/jdk/java/util/logging/bundlesearch/resources/StackSearchableResource_en.properties similarity index 100% rename from jdk/test/java/util/logging/bundlesearch/resources/StackSearchableResource_en.properties rename to test/jdk/java/util/logging/bundlesearch/resources/StackSearchableResource_en.properties diff --git a/jdk/test/java/util/logging/deadlockconf.properties b/test/jdk/java/util/logging/deadlockconf.properties similarity index 100% rename from jdk/test/java/util/logging/deadlockconf.properties rename to test/jdk/java/util/logging/deadlockconf.properties diff --git a/jdk/test/java/util/logging/modules/GetResourceBundleTest.java b/test/jdk/java/util/logging/modules/GetResourceBundleTest.java similarity index 100% rename from jdk/test/java/util/logging/modules/GetResourceBundleTest.java rename to test/jdk/java/util/logging/modules/GetResourceBundleTest.java diff --git a/jdk/test/java/util/logging/modules/LogManagerInModule/LogManagerInModuleTest.java b/test/jdk/java/util/logging/modules/LogManagerInModule/LogManagerInModuleTest.java similarity index 100% rename from jdk/test/java/util/logging/modules/LogManagerInModule/LogManagerInModuleTest.java rename to test/jdk/java/util/logging/modules/LogManagerInModule/LogManagerInModuleTest.java diff --git a/jdk/test/java/util/logging/modules/LogManagerInModule/logging.properties b/test/jdk/java/util/logging/modules/LogManagerInModule/logging.properties similarity index 100% rename from jdk/test/java/util/logging/modules/LogManagerInModule/logging.properties rename to test/jdk/java/util/logging/modules/LogManagerInModule/logging.properties diff --git a/jdk/test/java/util/logging/modules/LogManagerInModule/test.config/module-info.java b/test/jdk/java/util/logging/modules/LogManagerInModule/test.config/module-info.java similarity index 100% rename from jdk/test/java/util/logging/modules/LogManagerInModule/test.config/module-info.java rename to test/jdk/java/util/logging/modules/LogManagerInModule/test.config/module-info.java diff --git a/jdk/test/java/util/logging/modules/LogManagerInModule/test.config/test/config/LogConfig.java b/test/jdk/java/util/logging/modules/LogManagerInModule/test.config/test/config/LogConfig.java similarity index 100% rename from jdk/test/java/util/logging/modules/LogManagerInModule/test.config/test/config/LogConfig.java rename to test/jdk/java/util/logging/modules/LogManagerInModule/test.config/test/config/LogConfig.java diff --git a/jdk/test/java/util/logging/modules/LogManagerInModule/test.handlers/module-info.java b/test/jdk/java/util/logging/modules/LogManagerInModule/test.handlers/module-info.java similarity index 100% rename from jdk/test/java/util/logging/modules/LogManagerInModule/test.handlers/module-info.java rename to test/jdk/java/util/logging/modules/LogManagerInModule/test.handlers/module-info.java diff --git a/jdk/test/java/util/logging/modules/LogManagerInModule/test.handlers/test/handlers/TestHandler.java b/test/jdk/java/util/logging/modules/LogManagerInModule/test.handlers/test/handlers/TestHandler.java similarity index 100% rename from jdk/test/java/util/logging/modules/LogManagerInModule/test.handlers/test/handlers/TestHandler.java rename to test/jdk/java/util/logging/modules/LogManagerInModule/test.handlers/test/handlers/TestHandler.java diff --git a/jdk/test/java/util/logging/modules/LogManagerInModule/test.logmanager/module-info.java b/test/jdk/java/util/logging/modules/LogManagerInModule/test.logmanager/module-info.java similarity index 100% rename from jdk/test/java/util/logging/modules/LogManagerInModule/test.logmanager/module-info.java rename to test/jdk/java/util/logging/modules/LogManagerInModule/test.logmanager/module-info.java diff --git a/jdk/test/java/util/logging/modules/LogManagerInModule/test.logmanager/test/logmanager/TestLogManager.java b/test/jdk/java/util/logging/modules/LogManagerInModule/test.logmanager/test/logmanager/TestLogManager.java similarity index 100% rename from jdk/test/java/util/logging/modules/LogManagerInModule/test.logmanager/test/logmanager/TestLogManager.java rename to test/jdk/java/util/logging/modules/LogManagerInModule/test.logmanager/test/logmanager/TestLogManager.java diff --git a/jdk/test/java/util/logging/modules/pkgs/p3/resource/ClassResource.java b/test/jdk/java/util/logging/modules/pkgs/p3/resource/ClassResource.java similarity index 100% rename from jdk/test/java/util/logging/modules/pkgs/p3/resource/ClassResource.java rename to test/jdk/java/util/logging/modules/pkgs/p3/resource/ClassResource.java diff --git a/jdk/test/java/util/logging/modules/pkgs/p3/resource/p.properties b/test/jdk/java/util/logging/modules/pkgs/p3/resource/p.properties similarity index 100% rename from jdk/test/java/util/logging/modules/pkgs/p3/resource/p.properties rename to test/jdk/java/util/logging/modules/pkgs/p3/resource/p.properties diff --git a/jdk/test/java/util/logging/modules/pkgs/p3/test/ResourceBundleTest.java b/test/jdk/java/util/logging/modules/pkgs/p3/test/ResourceBundleTest.java similarity index 100% rename from jdk/test/java/util/logging/modules/pkgs/p3/test/ResourceBundleTest.java rename to test/jdk/java/util/logging/modules/pkgs/p3/test/ResourceBundleTest.java diff --git a/jdk/test/java/util/logging/modules/src/m1/module-info.java b/test/jdk/java/util/logging/modules/src/m1/module-info.java similarity index 100% rename from jdk/test/java/util/logging/modules/src/m1/module-info.java rename to test/jdk/java/util/logging/modules/src/m1/module-info.java diff --git a/jdk/test/java/util/logging/modules/src/m1/p1/resource/ClassResource.java b/test/jdk/java/util/logging/modules/src/m1/p1/resource/ClassResource.java similarity index 100% rename from jdk/test/java/util/logging/modules/src/m1/p1/resource/ClassResource.java rename to test/jdk/java/util/logging/modules/src/m1/p1/resource/ClassResource.java diff --git a/jdk/test/java/util/logging/modules/src/m1/p1/resource/p.properties b/test/jdk/java/util/logging/modules/src/m1/p1/resource/p.properties similarity index 100% rename from jdk/test/java/util/logging/modules/src/m1/p1/resource/p.properties rename to test/jdk/java/util/logging/modules/src/m1/p1/resource/p.properties diff --git a/jdk/test/java/util/logging/modules/src/m2/module-info.java b/test/jdk/java/util/logging/modules/src/m2/module-info.java similarity index 100% rename from jdk/test/java/util/logging/modules/src/m2/module-info.java rename to test/jdk/java/util/logging/modules/src/m2/module-info.java diff --git a/jdk/test/java/util/logging/modules/src/m2/p2/resource/ClassResource.java b/test/jdk/java/util/logging/modules/src/m2/p2/resource/ClassResource.java similarity index 100% rename from jdk/test/java/util/logging/modules/src/m2/p2/resource/ClassResource.java rename to test/jdk/java/util/logging/modules/src/m2/p2/resource/ClassResource.java diff --git a/jdk/test/java/util/logging/modules/src/m2/p2/resource/p.properties b/test/jdk/java/util/logging/modules/src/m2/p2/resource/p.properties similarity index 100% rename from jdk/test/java/util/logging/modules/src/m2/p2/resource/p.properties rename to test/jdk/java/util/logging/modules/src/m2/p2/resource/p.properties diff --git a/jdk/test/java/util/logging/modules/src/m2/p2/test/ModuleLoggerAccess.java b/test/jdk/java/util/logging/modules/src/m2/p2/test/ModuleLoggerAccess.java similarity index 100% rename from jdk/test/java/util/logging/modules/src/m2/p2/test/ModuleLoggerAccess.java rename to test/jdk/java/util/logging/modules/src/m2/p2/test/ModuleLoggerAccess.java diff --git a/jdk/test/java/util/prefs/AddNodeChangeListener.java b/test/jdk/java/util/prefs/AddNodeChangeListener.java similarity index 100% rename from jdk/test/java/util/prefs/AddNodeChangeListener.java rename to test/jdk/java/util/prefs/AddNodeChangeListener.java diff --git a/jdk/test/java/util/prefs/CheckUserPrefFirst.java b/test/jdk/java/util/prefs/CheckUserPrefFirst.java similarity index 100% rename from jdk/test/java/util/prefs/CheckUserPrefFirst.java rename to test/jdk/java/util/prefs/CheckUserPrefFirst.java diff --git a/jdk/test/java/util/prefs/CheckUserPrefLater.java b/test/jdk/java/util/prefs/CheckUserPrefLater.java similarity index 100% rename from jdk/test/java/util/prefs/CheckUserPrefLater.java rename to test/jdk/java/util/prefs/CheckUserPrefLater.java diff --git a/jdk/test/java/util/prefs/CheckUserPrefsStorage.sh b/test/jdk/java/util/prefs/CheckUserPrefsStorage.sh similarity index 100% rename from jdk/test/java/util/prefs/CheckUserPrefsStorage.sh rename to test/jdk/java/util/prefs/CheckUserPrefsStorage.sh diff --git a/jdk/test/java/util/prefs/CodePointZeroPrefsTest.java b/test/jdk/java/util/prefs/CodePointZeroPrefsTest.java similarity index 100% rename from jdk/test/java/util/prefs/CodePointZeroPrefsTest.java rename to test/jdk/java/util/prefs/CodePointZeroPrefsTest.java diff --git a/jdk/test/java/util/prefs/CommentsInXml.java b/test/jdk/java/util/prefs/CommentsInXml.java similarity index 100% rename from jdk/test/java/util/prefs/CommentsInXml.java rename to test/jdk/java/util/prefs/CommentsInXml.java diff --git a/jdk/test/java/util/prefs/ConflictInFlush.java b/test/jdk/java/util/prefs/ConflictInFlush.java similarity index 100% rename from jdk/test/java/util/prefs/ConflictInFlush.java rename to test/jdk/java/util/prefs/ConflictInFlush.java diff --git a/jdk/test/java/util/prefs/ExportNode.java b/test/jdk/java/util/prefs/ExportNode.java similarity index 100% rename from jdk/test/java/util/prefs/ExportNode.java rename to test/jdk/java/util/prefs/ExportNode.java diff --git a/jdk/test/java/util/prefs/ExportSubtree.java b/test/jdk/java/util/prefs/ExportSubtree.java similarity index 100% rename from jdk/test/java/util/prefs/ExportSubtree.java rename to test/jdk/java/util/prefs/ExportSubtree.java diff --git a/jdk/test/java/util/prefs/PrefsSpi.java b/test/jdk/java/util/prefs/PrefsSpi.java similarity index 100% rename from jdk/test/java/util/prefs/PrefsSpi.java rename to test/jdk/java/util/prefs/PrefsSpi.java diff --git a/jdk/test/java/util/prefs/PrefsSpi.sh b/test/jdk/java/util/prefs/PrefsSpi.sh similarity index 100% rename from jdk/test/java/util/prefs/PrefsSpi.sh rename to test/jdk/java/util/prefs/PrefsSpi.sh diff --git a/jdk/test/java/util/prefs/RemoveNullKeyCheck.java b/test/jdk/java/util/prefs/RemoveNullKeyCheck.java similarity index 100% rename from jdk/test/java/util/prefs/RemoveNullKeyCheck.java rename to test/jdk/java/util/prefs/RemoveNullKeyCheck.java diff --git a/jdk/test/java/util/prefs/RemoveReadOnlyNode.java b/test/jdk/java/util/prefs/RemoveReadOnlyNode.java similarity index 100% rename from jdk/test/java/util/prefs/RemoveReadOnlyNode.java rename to test/jdk/java/util/prefs/RemoveReadOnlyNode.java diff --git a/jdk/test/java/util/prefs/RemoveUnregedListener.java b/test/jdk/java/util/prefs/RemoveUnregedListener.java similarity index 100% rename from jdk/test/java/util/prefs/RemoveUnregedListener.java rename to test/jdk/java/util/prefs/RemoveUnregedListener.java diff --git a/jdk/test/java/util/prefs/SerializeExceptions.java b/test/jdk/java/util/prefs/SerializeExceptions.java similarity index 100% rename from jdk/test/java/util/prefs/SerializeExceptions.java rename to test/jdk/java/util/prefs/SerializeExceptions.java diff --git a/jdk/test/java/util/prefs/TEST.properties b/test/jdk/java/util/prefs/TEST.properties similarity index 100% rename from jdk/test/java/util/prefs/TEST.properties rename to test/jdk/java/util/prefs/TEST.properties diff --git a/jdk/test/java/util/regex/BMPTestCases.txt b/test/jdk/java/util/regex/BMPTestCases.txt similarity index 100% rename from jdk/test/java/util/regex/BMPTestCases.txt rename to test/jdk/java/util/regex/BMPTestCases.txt diff --git a/jdk/test/java/util/regex/GraphemeBreakProperty.txt b/test/jdk/java/util/regex/GraphemeBreakProperty.txt similarity index 100% rename from jdk/test/java/util/regex/GraphemeBreakProperty.txt rename to test/jdk/java/util/regex/GraphemeBreakProperty.txt diff --git a/jdk/test/java/util/regex/GraphemeBreakTest.txt b/test/jdk/java/util/regex/GraphemeBreakTest.txt similarity index 100% rename from jdk/test/java/util/regex/GraphemeBreakTest.txt rename to test/jdk/java/util/regex/GraphemeBreakTest.txt diff --git a/jdk/test/java/util/regex/GraphemeTest.java b/test/jdk/java/util/regex/GraphemeTest.java similarity index 100% rename from jdk/test/java/util/regex/GraphemeTest.java rename to test/jdk/java/util/regex/GraphemeTest.java diff --git a/jdk/test/java/util/regex/POSIX_ASCII.java b/test/jdk/java/util/regex/POSIX_ASCII.java similarity index 100% rename from jdk/test/java/util/regex/POSIX_ASCII.java rename to test/jdk/java/util/regex/POSIX_ASCII.java diff --git a/jdk/test/java/util/regex/POSIX_Unicode.java b/test/jdk/java/util/regex/POSIX_Unicode.java similarity index 100% rename from jdk/test/java/util/regex/POSIX_Unicode.java rename to test/jdk/java/util/regex/POSIX_Unicode.java diff --git a/jdk/test/java/util/regex/PatternStreamTest.java b/test/jdk/java/util/regex/PatternStreamTest.java similarity index 100% rename from jdk/test/java/util/regex/PatternStreamTest.java rename to test/jdk/java/util/regex/PatternStreamTest.java diff --git a/jdk/test/java/util/regex/RegExTest.java b/test/jdk/java/util/regex/RegExTest.java similarity index 100% rename from jdk/test/java/util/regex/RegExTest.java rename to test/jdk/java/util/regex/RegExTest.java diff --git a/jdk/test/java/util/regex/SupplementaryTestCases.txt b/test/jdk/java/util/regex/SupplementaryTestCases.txt similarity index 100% rename from jdk/test/java/util/regex/SupplementaryTestCases.txt rename to test/jdk/java/util/regex/SupplementaryTestCases.txt diff --git a/jdk/test/java/util/regex/TestCases.txt b/test/jdk/java/util/regex/TestCases.txt similarity index 100% rename from jdk/test/java/util/regex/TestCases.txt rename to test/jdk/java/util/regex/TestCases.txt diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java b/test/jdk/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java similarity index 100% rename from jdk/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java rename to test/jdk/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/com/foo/UserControlProvider.java b/test/jdk/java/util/spi/ResourceBundleControlProvider/com/foo/UserControlProvider.java similarity index 100% rename from jdk/test/java/util/spi/ResourceBundleControlProvider/com/foo/UserControlProvider.java rename to test/jdk/java/util/spi/ResourceBundleControlProvider/com/foo/UserControlProvider.java diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/com/foo/UserXMLControl.java b/test/jdk/java/util/spi/ResourceBundleControlProvider/com/foo/UserXMLControl.java similarity index 100% rename from jdk/test/java/util/spi/ResourceBundleControlProvider/com/foo/UserXMLControl.java rename to test/jdk/java/util/spi/ResourceBundleControlProvider/com/foo/UserXMLControl.java diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/com/foo/XmlRB.xml b/test/jdk/java/util/spi/ResourceBundleControlProvider/com/foo/XmlRB.xml similarity index 100% rename from jdk/test/java/util/spi/ResourceBundleControlProvider/com/foo/XmlRB.xml rename to test/jdk/java/util/spi/ResourceBundleControlProvider/com/foo/XmlRB.xml diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/com/foo/XmlRB_ja.xml b/test/jdk/java/util/spi/ResourceBundleControlProvider/com/foo/XmlRB_ja.xml similarity index 100% rename from jdk/test/java/util/spi/ResourceBundleControlProvider/com/foo/XmlRB_ja.xml rename to test/jdk/java/util/spi/ResourceBundleControlProvider/com/foo/XmlRB_ja.xml diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/simple.properties b/test/jdk/java/util/spi/ResourceBundleControlProvider/simple.properties similarity index 100% rename from jdk/test/java/util/spi/ResourceBundleControlProvider/simple.properties rename to test/jdk/java/util/spi/ResourceBundleControlProvider/simple.properties diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/test/jdk/test/ResourceBundleDelegate.java b/test/jdk/java/util/spi/ResourceBundleControlProvider/test/jdk/test/ResourceBundleDelegate.java similarity index 100% rename from jdk/test/java/util/spi/ResourceBundleControlProvider/test/jdk/test/ResourceBundleDelegate.java rename to test/jdk/java/util/spi/ResourceBundleControlProvider/test/jdk/test/ResourceBundleDelegate.java diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/test/module-info.java b/test/jdk/java/util/spi/ResourceBundleControlProvider/test/module-info.java similarity index 100% rename from jdk/test/java/util/spi/ResourceBundleControlProvider/test/module-info.java rename to test/jdk/java/util/spi/ResourceBundleControlProvider/test/module-info.java diff --git a/jdk/test/java/util/spi/ToolProviderTest.java b/test/jdk/java/util/spi/ToolProviderTest.java similarity index 100% rename from jdk/test/java/util/spi/ToolProviderTest.java rename to test/jdk/java/util/spi/ToolProviderTest.java diff --git a/jdk/test/java/util/stream/TestDoubleSumAverage.java b/test/jdk/java/util/stream/TestDoubleSumAverage.java similarity index 100% rename from jdk/test/java/util/stream/TestDoubleSumAverage.java rename to test/jdk/java/util/stream/TestDoubleSumAverage.java diff --git a/jdk/test/java/util/stream/boottest/TEST.properties b/test/jdk/java/util/stream/boottest/TEST.properties similarity index 100% rename from jdk/test/java/util/stream/boottest/TEST.properties rename to test/jdk/java/util/stream/boottest/TEST.properties diff --git a/jdk/test/java/util/stream/boottest/java.base/java/util/stream/DoubleNodeTest.java b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/DoubleNodeTest.java similarity index 100% rename from jdk/test/java/util/stream/boottest/java.base/java/util/stream/DoubleNodeTest.java rename to test/jdk/java/util/stream/boottest/java.base/java/util/stream/DoubleNodeTest.java diff --git a/jdk/test/java/util/stream/boottest/java.base/java/util/stream/FlagOpTest.java b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/FlagOpTest.java similarity index 100% rename from jdk/test/java/util/stream/boottest/java.base/java/util/stream/FlagOpTest.java rename to test/jdk/java/util/stream/boottest/java.base/java/util/stream/FlagOpTest.java diff --git a/jdk/test/java/util/stream/boottest/java.base/java/util/stream/IntNodeTest.java b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/IntNodeTest.java similarity index 100% rename from jdk/test/java/util/stream/boottest/java.base/java/util/stream/IntNodeTest.java rename to test/jdk/java/util/stream/boottest/java.base/java/util/stream/IntNodeTest.java diff --git a/jdk/test/java/util/stream/boottest/java.base/java/util/stream/LongNodeTest.java b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/LongNodeTest.java similarity index 100% rename from jdk/test/java/util/stream/boottest/java.base/java/util/stream/LongNodeTest.java rename to test/jdk/java/util/stream/boottest/java.base/java/util/stream/LongNodeTest.java diff --git a/jdk/test/java/util/stream/boottest/java.base/java/util/stream/NodeBuilderTest.java b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/NodeBuilderTest.java similarity index 100% rename from jdk/test/java/util/stream/boottest/java.base/java/util/stream/NodeBuilderTest.java rename to test/jdk/java/util/stream/boottest/java.base/java/util/stream/NodeBuilderTest.java diff --git a/jdk/test/java/util/stream/boottest/java.base/java/util/stream/NodeTest.java b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/NodeTest.java similarity index 100% rename from jdk/test/java/util/stream/boottest/java.base/java/util/stream/NodeTest.java rename to test/jdk/java/util/stream/boottest/java.base/java/util/stream/NodeTest.java diff --git a/jdk/test/java/util/stream/boottest/java.base/java/util/stream/SliceSpliteratorTest.java b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/SliceSpliteratorTest.java similarity index 100% rename from jdk/test/java/util/stream/boottest/java.base/java/util/stream/SliceSpliteratorTest.java rename to test/jdk/java/util/stream/boottest/java.base/java/util/stream/SliceSpliteratorTest.java diff --git a/jdk/test/java/util/stream/boottest/java.base/java/util/stream/SpinedBufferTest.java b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/SpinedBufferTest.java similarity index 100% rename from jdk/test/java/util/stream/boottest/java.base/java/util/stream/SpinedBufferTest.java rename to test/jdk/java/util/stream/boottest/java.base/java/util/stream/SpinedBufferTest.java diff --git a/jdk/test/java/util/stream/boottest/java.base/java/util/stream/StreamFlagsTest.java b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/StreamFlagsTest.java similarity index 100% rename from jdk/test/java/util/stream/boottest/java.base/java/util/stream/StreamFlagsTest.java rename to test/jdk/java/util/stream/boottest/java.base/java/util/stream/StreamFlagsTest.java diff --git a/jdk/test/java/util/stream/boottest/java.base/java/util/stream/StreamOpFlagsTest.java b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/StreamOpFlagsTest.java similarity index 100% rename from jdk/test/java/util/stream/boottest/java.base/java/util/stream/StreamOpFlagsTest.java rename to test/jdk/java/util/stream/boottest/java.base/java/util/stream/StreamOpFlagsTest.java diff --git a/jdk/test/java/util/stream/boottest/java.base/java/util/stream/StreamReuseTest.java b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/StreamReuseTest.java similarity index 100% rename from jdk/test/java/util/stream/boottest/java.base/java/util/stream/StreamReuseTest.java rename to test/jdk/java/util/stream/boottest/java.base/java/util/stream/StreamReuseTest.java diff --git a/jdk/test/java/util/stream/test/TEST.properties b/test/jdk/java/util/stream/test/TEST.properties similarity index 100% rename from jdk/test/java/util/stream/test/TEST.properties rename to test/jdk/java/util/stream/test/TEST.properties diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/lang/invoke/DeserializeMethodTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/lang/invoke/DeserializeMethodTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/lang/invoke/DeserializeMethodTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/lang/invoke/DeserializeMethodTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/lang/invoke/MHProxiesTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/lang/invoke/MHProxiesTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/lang/invoke/MHProxiesTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/lang/invoke/MHProxiesTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/lang/invoke/SerializedLambdaTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/lang/invoke/SerializedLambdaTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/lang/invoke/SerializedLambdaTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/lang/invoke/SerializedLambdaTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/FillableStringTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/FillableStringTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/FillableStringTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/FillableStringTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/MapTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/MapTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/MapTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/MapTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/SplittableRandomTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/SplittableRandomTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/SplittableRandomTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/SplittableRandomTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectAndSummaryStatisticsTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectAndSummaryStatisticsTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectAndSummaryStatisticsTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectAndSummaryStatisticsTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectionAndMapModifyStreamTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectionAndMapModifyStreamTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectionAndMapModifyStreamTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectionAndMapModifyStreamTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorsTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorsTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorsTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorsTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ConcatOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/ConcatOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ConcatOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/ConcatOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ConcatTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/ConcatTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ConcatTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/ConcatTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountLargeTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CountLargeTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountLargeTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CountLargeTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/DistinctOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/DistinctOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/DistinctOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/DistinctOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/DoublePrimitiveOpsTests.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/DoublePrimitiveOpsTests.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/DoublePrimitiveOpsTests.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/DoublePrimitiveOpsTests.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/FilterOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/FilterOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/FilterOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/FilterOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/FindAnyOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/FindAnyOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/FindAnyOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/FindAnyOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/FindFirstOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/FindFirstOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/FindFirstOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/FindFirstOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/FlatMapOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/FlatMapOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/FlatMapOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/FlatMapOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ForEachOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/ForEachOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ForEachOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/ForEachOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/GroupByOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/GroupByOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/GroupByOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/GroupByOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IntPrimitiveOpsTests.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/IntPrimitiveOpsTests.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IntPrimitiveOpsTests.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/IntPrimitiveOpsTests.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IntReduceTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/IntReduceTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IntReduceTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/IntReduceTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IntSliceOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/IntSliceOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IntSliceOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/IntSliceOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IntUniqOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/IntUniqOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IntUniqOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/IntUniqOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IterateTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/IterateTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IterateTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/IterateTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/LongPrimitiveOpsTests.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/LongPrimitiveOpsTests.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/LongPrimitiveOpsTests.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/LongPrimitiveOpsTests.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/MapOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/MapOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/MapOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/MapOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/MatchOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/MatchOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/MatchOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/MatchOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/MinMaxTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/MinMaxTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/MinMaxTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/MinMaxTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/PrimitiveAverageOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/PrimitiveAverageOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/PrimitiveAverageOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/PrimitiveAverageOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/PrimitiveSumTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/PrimitiveSumTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/PrimitiveSumTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/PrimitiveSumTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/RangeTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/RangeTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/RangeTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/RangeTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ReduceByOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/ReduceByOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ReduceByOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/ReduceByOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ReduceTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/ReduceTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ReduceTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/ReduceTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SequentialOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SequentialOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SequentialOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SequentialOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SortedOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SortedOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SortedOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SortedOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SpliteratorTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SpliteratorTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SpliteratorTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SpliteratorTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamBuilderTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamBuilderTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamBuilderTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamBuilderTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamCloseTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamCloseTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamCloseTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamCloseTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamLinkTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamLinkTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamLinkTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamLinkTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamParSeqTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamParSeqTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamParSeqTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamParSeqTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/TeeOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/TeeOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/TeeOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/TeeOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java similarity index 100% rename from jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java rename to test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java diff --git a/jdk/test/java/util/zip/3GBZipFiles.sh b/test/jdk/java/util/zip/3GBZipFiles.sh similarity index 100% rename from jdk/test/java/util/zip/3GBZipFiles.sh rename to test/jdk/java/util/zip/3GBZipFiles.sh diff --git a/jdk/test/java/util/zip/Available.java b/test/jdk/java/util/zip/Available.java similarity index 100% rename from jdk/test/java/util/zip/Available.java rename to test/jdk/java/util/zip/Available.java diff --git a/jdk/test/java/util/zip/Bounds.java b/test/jdk/java/util/zip/Bounds.java similarity index 100% rename from jdk/test/java/util/zip/Bounds.java rename to test/jdk/java/util/zip/Bounds.java diff --git a/jdk/test/java/util/zip/ChecksumBase.java b/test/jdk/java/util/zip/ChecksumBase.java similarity index 100% rename from jdk/test/java/util/zip/ChecksumBase.java rename to test/jdk/java/util/zip/ChecksumBase.java diff --git a/jdk/test/java/util/zip/ConstructDeflaterInput.java b/test/jdk/java/util/zip/ConstructDeflaterInput.java similarity index 100% rename from jdk/test/java/util/zip/ConstructDeflaterInput.java rename to test/jdk/java/util/zip/ConstructDeflaterInput.java diff --git a/jdk/test/java/util/zip/ConstructInflaterOutput.java b/test/jdk/java/util/zip/ConstructInflaterOutput.java similarity index 100% rename from jdk/test/java/util/zip/ConstructInflaterOutput.java rename to test/jdk/java/util/zip/ConstructInflaterOutput.java diff --git a/jdk/test/java/util/zip/DataDescriptor.java b/test/jdk/java/util/zip/DataDescriptor.java similarity index 100% rename from jdk/test/java/util/zip/DataDescriptor.java rename to test/jdk/java/util/zip/DataDescriptor.java diff --git a/jdk/test/java/util/zip/DataDescriptorSignatureMissing.java b/test/jdk/java/util/zip/DataDescriptorSignatureMissing.java similarity index 100% rename from jdk/test/java/util/zip/DataDescriptorSignatureMissing.java rename to test/jdk/java/util/zip/DataDescriptorSignatureMissing.java diff --git a/jdk/test/java/util/zip/DeInflate.java b/test/jdk/java/util/zip/DeInflate.java similarity index 100% rename from jdk/test/java/util/zip/DeInflate.java rename to test/jdk/java/util/zip/DeInflate.java diff --git a/jdk/test/java/util/zip/DeflateIn_InflateOut.java b/test/jdk/java/util/zip/DeflateIn_InflateOut.java similarity index 100% rename from jdk/test/java/util/zip/DeflateIn_InflateOut.java rename to test/jdk/java/util/zip/DeflateIn_InflateOut.java diff --git a/jdk/test/java/util/zip/EntryCount64k.java b/test/jdk/java/util/zip/EntryCount64k.java similarity index 100% rename from jdk/test/java/util/zip/EntryCount64k.java rename to test/jdk/java/util/zip/EntryCount64k.java diff --git a/jdk/test/java/util/zip/FileBuilder.java b/test/jdk/java/util/zip/FileBuilder.java similarity index 100% rename from jdk/test/java/util/zip/FileBuilder.java rename to test/jdk/java/util/zip/FileBuilder.java diff --git a/jdk/test/java/util/zip/FlaterCriticalArray.java b/test/jdk/java/util/zip/FlaterCriticalArray.java similarity index 100% rename from jdk/test/java/util/zip/FlaterCriticalArray.java rename to test/jdk/java/util/zip/FlaterCriticalArray.java diff --git a/jdk/test/java/util/zip/FlaterTest.java b/test/jdk/java/util/zip/FlaterTest.java similarity index 100% rename from jdk/test/java/util/zip/FlaterTest.java rename to test/jdk/java/util/zip/FlaterTest.java diff --git a/jdk/test/java/util/zip/GZIP/Accordion.java b/test/jdk/java/util/zip/GZIP/Accordion.java similarity index 100% rename from jdk/test/java/util/zip/GZIP/Accordion.java rename to test/jdk/java/util/zip/GZIP/Accordion.java diff --git a/jdk/test/java/util/zip/GZIP/GZIPInZip.java b/test/jdk/java/util/zip/GZIP/GZIPInZip.java similarity index 100% rename from jdk/test/java/util/zip/GZIP/GZIPInZip.java rename to test/jdk/java/util/zip/GZIP/GZIPInZip.java diff --git a/jdk/test/java/util/zip/GZIP/GZIPInputStreamRead.java b/test/jdk/java/util/zip/GZIP/GZIPInputStreamRead.java similarity index 100% rename from jdk/test/java/util/zip/GZIP/GZIPInputStreamRead.java rename to test/jdk/java/util/zip/GZIP/GZIPInputStreamRead.java diff --git a/jdk/test/java/util/zip/GZIP/ReadUByte.java b/test/jdk/java/util/zip/GZIP/ReadUByte.java similarity index 100% rename from jdk/test/java/util/zip/GZIP/ReadUByte.java rename to test/jdk/java/util/zip/GZIP/ReadUByte.java diff --git a/jdk/test/java/util/zip/InflateIn_DeflateOut.java b/test/jdk/java/util/zip/InflateIn_DeflateOut.java similarity index 100% rename from jdk/test/java/util/zip/InflateIn_DeflateOut.java rename to test/jdk/java/util/zip/InflateIn_DeflateOut.java diff --git a/jdk/test/java/util/zip/InflaterBufferSize.java b/test/jdk/java/util/zip/InflaterBufferSize.java similarity index 100% rename from jdk/test/java/util/zip/InflaterBufferSize.java rename to test/jdk/java/util/zip/InflaterBufferSize.java diff --git a/jdk/test/java/util/zip/InflaterInputStream/MarkReset.java b/test/jdk/java/util/zip/InflaterInputStream/MarkReset.java similarity index 100% rename from jdk/test/java/util/zip/InflaterInputStream/MarkReset.java rename to test/jdk/java/util/zip/InflaterInputStream/MarkReset.java diff --git a/jdk/test/java/util/zip/InflaterInputStream/TestAvailable.java b/test/jdk/java/util/zip/InflaterInputStream/TestAvailable.java similarity index 100% rename from jdk/test/java/util/zip/InflaterInputStream/TestAvailable.java rename to test/jdk/java/util/zip/InflaterInputStream/TestAvailable.java diff --git a/jdk/test/java/util/zip/InfoZip.java b/test/jdk/java/util/zip/InfoZip.java similarity index 100% rename from jdk/test/java/util/zip/InfoZip.java rename to test/jdk/java/util/zip/InfoZip.java diff --git a/jdk/test/java/util/zip/InterruptibleZip.java b/test/jdk/java/util/zip/InterruptibleZip.java similarity index 100% rename from jdk/test/java/util/zip/InterruptibleZip.java rename to test/jdk/java/util/zip/InterruptibleZip.java diff --git a/jdk/test/java/util/zip/LargeZip.java b/test/jdk/java/util/zip/LargeZip.java similarity index 100% rename from jdk/test/java/util/zip/LargeZip.java rename to test/jdk/java/util/zip/LargeZip.java diff --git a/jdk/test/java/util/zip/NoExtensionSignature.java b/test/jdk/java/util/zip/NoExtensionSignature.java similarity index 100% rename from jdk/test/java/util/zip/NoExtensionSignature.java rename to test/jdk/java/util/zip/NoExtensionSignature.java diff --git a/jdk/test/java/util/zip/ReadLoc.java b/test/jdk/java/util/zip/ReadLoc.java similarity index 100% rename from jdk/test/java/util/zip/ReadLoc.java rename to test/jdk/java/util/zip/ReadLoc.java diff --git a/jdk/test/java/util/zip/StoredCRC.java b/test/jdk/java/util/zip/StoredCRC.java similarity index 100% rename from jdk/test/java/util/zip/StoredCRC.java rename to test/jdk/java/util/zip/StoredCRC.java diff --git a/jdk/test/java/util/zip/StreamConstructor.java b/test/jdk/java/util/zip/StreamConstructor.java similarity index 100% rename from jdk/test/java/util/zip/StreamConstructor.java rename to test/jdk/java/util/zip/StreamConstructor.java diff --git a/jdk/test/java/util/zip/StreamIOAfterClose.java b/test/jdk/java/util/zip/StreamIOAfterClose.java similarity index 100% rename from jdk/test/java/util/zip/StreamIOAfterClose.java rename to test/jdk/java/util/zip/StreamIOAfterClose.java diff --git a/jdk/test/java/util/zip/TestCRC32.java b/test/jdk/java/util/zip/TestCRC32.java similarity index 100% rename from jdk/test/java/util/zip/TestCRC32.java rename to test/jdk/java/util/zip/TestCRC32.java diff --git a/jdk/test/java/util/zip/TestCRC32C.java b/test/jdk/java/util/zip/TestCRC32C.java similarity index 100% rename from jdk/test/java/util/zip/TestCRC32C.java rename to test/jdk/java/util/zip/TestCRC32C.java diff --git a/jdk/test/java/util/zip/TestChecksum.java b/test/jdk/java/util/zip/TestChecksum.java similarity index 100% rename from jdk/test/java/util/zip/TestChecksum.java rename to test/jdk/java/util/zip/TestChecksum.java diff --git a/jdk/test/java/util/zip/TestEmptyZip.java b/test/jdk/java/util/zip/TestEmptyZip.java similarity index 100% rename from jdk/test/java/util/zip/TestEmptyZip.java rename to test/jdk/java/util/zip/TestEmptyZip.java diff --git a/jdk/test/java/util/zip/TestExtraTime.java b/test/jdk/java/util/zip/TestExtraTime.java similarity index 100% rename from jdk/test/java/util/zip/TestExtraTime.java rename to test/jdk/java/util/zip/TestExtraTime.java diff --git a/jdk/test/java/util/zip/TestLocalTime.java b/test/jdk/java/util/zip/TestLocalTime.java similarity index 100% rename from jdk/test/java/util/zip/TestLocalTime.java rename to test/jdk/java/util/zip/TestLocalTime.java diff --git a/jdk/test/java/util/zip/TestZipError.java b/test/jdk/java/util/zip/TestZipError.java similarity index 100% rename from jdk/test/java/util/zip/TestZipError.java rename to test/jdk/java/util/zip/TestZipError.java diff --git a/jdk/test/java/util/zip/TimeChecksum.java b/test/jdk/java/util/zip/TimeChecksum.java similarity index 100% rename from jdk/test/java/util/zip/TimeChecksum.java rename to test/jdk/java/util/zip/TimeChecksum.java diff --git a/jdk/test/java/util/zip/TotalInOut.java b/test/jdk/java/util/zip/TotalInOut.java similarity index 100% rename from jdk/test/java/util/zip/TotalInOut.java rename to test/jdk/java/util/zip/TotalInOut.java diff --git a/jdk/test/java/util/zip/ZipCoding.java b/test/jdk/java/util/zip/ZipCoding.java similarity index 100% rename from jdk/test/java/util/zip/ZipCoding.java rename to test/jdk/java/util/zip/ZipCoding.java diff --git a/jdk/test/java/util/zip/ZipEntry/Clone.java b/test/jdk/java/util/zip/ZipEntry/Clone.java similarity index 100% rename from jdk/test/java/util/zip/ZipEntry/Clone.java rename to test/jdk/java/util/zip/ZipEntry/Clone.java diff --git a/jdk/test/java/util/zip/ZipEntry/Constructor.java b/test/jdk/java/util/zip/ZipEntry/Constructor.java similarity index 100% rename from jdk/test/java/util/zip/ZipEntry/Constructor.java rename to test/jdk/java/util/zip/ZipEntry/Constructor.java diff --git a/jdk/test/java/util/zip/ZipEntry/input.jar b/test/jdk/java/util/zip/ZipEntry/input.jar similarity index 100% rename from jdk/test/java/util/zip/ZipEntry/input.jar rename to test/jdk/java/util/zip/ZipEntry/input.jar diff --git a/jdk/test/java/util/zip/ZipFile/Assortment.java b/test/jdk/java/util/zip/ZipFile/Assortment.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/Assortment.java rename to test/jdk/java/util/zip/ZipFile/Assortment.java diff --git a/jdk/test/java/util/zip/ZipFile/Available.java b/test/jdk/java/util/zip/ZipFile/Available.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/Available.java rename to test/jdk/java/util/zip/ZipFile/Available.java diff --git a/jdk/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java b/test/jdk/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java rename to test/jdk/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java diff --git a/jdk/test/java/util/zip/ZipFile/Comment.java b/test/jdk/java/util/zip/ZipFile/Comment.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/Comment.java rename to test/jdk/java/util/zip/ZipFile/Comment.java diff --git a/jdk/test/java/util/zip/ZipFile/Constructor.java b/test/jdk/java/util/zip/ZipFile/Constructor.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/Constructor.java rename to test/jdk/java/util/zip/ZipFile/Constructor.java diff --git a/jdk/test/java/util/zip/ZipFile/CopyJar.java b/test/jdk/java/util/zip/ZipFile/CopyJar.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/CopyJar.java rename to test/jdk/java/util/zip/ZipFile/CopyJar.java diff --git a/jdk/test/java/util/zip/ZipFile/CorruptedZipFiles.java b/test/jdk/java/util/zip/ZipFile/CorruptedZipFiles.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/CorruptedZipFiles.java rename to test/jdk/java/util/zip/ZipFile/CorruptedZipFiles.java diff --git a/jdk/test/java/util/zip/ZipFile/DeleteTempJar.java b/test/jdk/java/util/zip/ZipFile/DeleteTempJar.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/DeleteTempJar.java rename to test/jdk/java/util/zip/ZipFile/DeleteTempJar.java diff --git a/jdk/test/java/util/zip/ZipFile/EnumAfterClose.java b/test/jdk/java/util/zip/ZipFile/EnumAfterClose.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/EnumAfterClose.java rename to test/jdk/java/util/zip/ZipFile/EnumAfterClose.java diff --git a/jdk/test/java/util/zip/ZipFile/FinalizeInflater.java b/test/jdk/java/util/zip/ZipFile/FinalizeInflater.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/FinalizeInflater.java rename to test/jdk/java/util/zip/ZipFile/FinalizeInflater.java diff --git a/jdk/test/java/util/zip/ZipFile/FinalizeZipFile.java b/test/jdk/java/util/zip/ZipFile/FinalizeZipFile.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/FinalizeZipFile.java rename to test/jdk/java/util/zip/ZipFile/FinalizeZipFile.java diff --git a/jdk/test/java/util/zip/ZipFile/GetDirEntry.java b/test/jdk/java/util/zip/ZipFile/GetDirEntry.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/GetDirEntry.java rename to test/jdk/java/util/zip/ZipFile/GetDirEntry.java diff --git a/jdk/test/java/util/zip/ZipFile/LargeZipFile.java b/test/jdk/java/util/zip/ZipFile/LargeZipFile.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/LargeZipFile.java rename to test/jdk/java/util/zip/ZipFile/LargeZipFile.java diff --git a/jdk/test/java/util/zip/ZipFile/ManyEntries.java b/test/jdk/java/util/zip/ZipFile/ManyEntries.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/ManyEntries.java rename to test/jdk/java/util/zip/ZipFile/ManyEntries.java diff --git a/jdk/test/java/util/zip/ZipFile/ManyZipFiles.java b/test/jdk/java/util/zip/ZipFile/ManyZipFiles.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/ManyZipFiles.java rename to test/jdk/java/util/zip/ZipFile/ManyZipFiles.java diff --git a/jdk/test/java/util/zip/ZipFile/MultiThreadedReadTest.java b/test/jdk/java/util/zip/ZipFile/MultiThreadedReadTest.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/MultiThreadedReadTest.java rename to test/jdk/java/util/zip/ZipFile/MultiThreadedReadTest.java diff --git a/jdk/test/java/util/zip/ZipFile/ReadAfterClose.java b/test/jdk/java/util/zip/ZipFile/ReadAfterClose.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/ReadAfterClose.java rename to test/jdk/java/util/zip/ZipFile/ReadAfterClose.java diff --git a/jdk/test/java/util/zip/ZipFile/ReadLongZipFileName.java b/test/jdk/java/util/zip/ZipFile/ReadLongZipFileName.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/ReadLongZipFileName.java rename to test/jdk/java/util/zip/ZipFile/ReadLongZipFileName.java diff --git a/jdk/test/java/util/zip/ZipFile/ReadZip.java b/test/jdk/java/util/zip/ZipFile/ReadZip.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/ReadZip.java rename to test/jdk/java/util/zip/ZipFile/ReadZip.java diff --git a/jdk/test/java/util/zip/ZipFile/ReleaseInflater.java b/test/jdk/java/util/zip/ZipFile/ReleaseInflater.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/ReleaseInflater.java rename to test/jdk/java/util/zip/ZipFile/ReleaseInflater.java diff --git a/jdk/test/java/util/zip/ZipFile/ShortRead.java b/test/jdk/java/util/zip/ZipFile/ShortRead.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/ShortRead.java rename to test/jdk/java/util/zip/ZipFile/ShortRead.java diff --git a/jdk/test/java/util/zip/ZipFile/StreamZipEntriesTest.java b/test/jdk/java/util/zip/ZipFile/StreamZipEntriesTest.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/StreamZipEntriesTest.java rename to test/jdk/java/util/zip/ZipFile/StreamZipEntriesTest.java diff --git a/jdk/test/java/util/zip/ZipFile/TestZipFile.java b/test/jdk/java/util/zip/ZipFile/TestZipFile.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/TestZipFile.java rename to test/jdk/java/util/zip/ZipFile/TestZipFile.java diff --git a/jdk/test/java/util/zip/ZipFile/ZeroDate.java b/test/jdk/java/util/zip/ZipFile/ZeroDate.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/ZeroDate.java rename to test/jdk/java/util/zip/ZipFile/ZeroDate.java diff --git a/jdk/test/java/util/zip/ZipFile/ZipEntryFreeTest.java b/test/jdk/java/util/zip/ZipFile/ZipEntryFreeTest.java similarity index 100% rename from jdk/test/java/util/zip/ZipFile/ZipEntryFreeTest.java rename to test/jdk/java/util/zip/ZipFile/ZipEntryFreeTest.java diff --git a/jdk/test/java/util/zip/ZipFile/crash.jar b/test/jdk/java/util/zip/ZipFile/crash.jar similarity index 100% rename from jdk/test/java/util/zip/ZipFile/crash.jar rename to test/jdk/java/util/zip/ZipFile/crash.jar diff --git a/jdk/test/java/util/zip/ZipFile/deletetempjar.sh b/test/jdk/java/util/zip/ZipFile/deletetempjar.sh similarity index 100% rename from jdk/test/java/util/zip/ZipFile/deletetempjar.sh rename to test/jdk/java/util/zip/ZipFile/deletetempjar.sh diff --git a/jdk/test/java/util/zip/ZipFile/input.jar b/test/jdk/java/util/zip/ZipFile/input.jar similarity index 100% rename from jdk/test/java/util/zip/ZipFile/input.jar rename to test/jdk/java/util/zip/ZipFile/input.jar diff --git a/jdk/test/java/util/zip/ZipFile/input.zip b/test/jdk/java/util/zip/ZipFile/input.zip similarity index 100% rename from jdk/test/java/util/zip/ZipFile/input.zip rename to test/jdk/java/util/zip/ZipFile/input.zip diff --git a/jdk/test/java/util/zip/ZipInputStream/Constructor.java b/test/jdk/java/util/zip/ZipInputStream/Constructor.java similarity index 100% rename from jdk/test/java/util/zip/ZipInputStream/Constructor.java rename to test/jdk/java/util/zip/ZipInputStream/Constructor.java diff --git a/jdk/test/java/util/zip/ZipInputStream/Skip.java b/test/jdk/java/util/zip/ZipInputStream/Skip.java similarity index 100% rename from jdk/test/java/util/zip/ZipInputStream/Skip.java rename to test/jdk/java/util/zip/ZipInputStream/Skip.java diff --git a/jdk/test/java/util/zip/input.jar b/test/jdk/java/util/zip/input.jar similarity index 100% rename from jdk/test/java/util/zip/input.jar rename to test/jdk/java/util/zip/input.jar diff --git a/jdk/test/java/util/zip/pkware123456789012345.zip b/test/jdk/java/util/zip/pkware123456789012345.zip similarity index 100% rename from jdk/test/java/util/zip/pkware123456789012345.zip rename to test/jdk/java/util/zip/pkware123456789012345.zip diff --git a/jdk/test/java/util/zip/test.zip b/test/jdk/java/util/zip/test.zip similarity index 100% rename from jdk/test/java/util/zip/test.zip rename to test/jdk/java/util/zip/test.zip diff --git a/jdk/test/java/util/zip/zip.java b/test/jdk/java/util/zip/zip.java similarity index 100% rename from jdk/test/java/util/zip/zip.java rename to test/jdk/java/util/zip/zip.java diff --git a/jdk/test/javax/accessibility/6986385/bug6986385.java b/test/jdk/javax/accessibility/6986385/bug6986385.java similarity index 100% rename from jdk/test/javax/accessibility/6986385/bug6986385.java rename to test/jdk/javax/accessibility/6986385/bug6986385.java diff --git a/jdk/test/javax/accessibility/8017112/AccessibleIndexInParentTest.java b/test/jdk/javax/accessibility/8017112/AccessibleIndexInParentTest.java similarity index 100% rename from jdk/test/javax/accessibility/8017112/AccessibleIndexInParentTest.java rename to test/jdk/javax/accessibility/8017112/AccessibleIndexInParentTest.java diff --git a/jdk/test/javax/accessibility/8069268/bug8069268.java b/test/jdk/javax/accessibility/8069268/bug8069268.java similarity index 100% rename from jdk/test/javax/accessibility/8069268/bug8069268.java rename to test/jdk/javax/accessibility/8069268/bug8069268.java diff --git a/jdk/test/javax/accessibility/AccessibilityProvider/BarProvider.java b/test/jdk/javax/accessibility/AccessibilityProvider/BarProvider.java similarity index 100% rename from jdk/test/javax/accessibility/AccessibilityProvider/BarProvider.java rename to test/jdk/javax/accessibility/AccessibilityProvider/BarProvider.java diff --git a/jdk/test/javax/accessibility/AccessibilityProvider/FooProvider.java b/test/jdk/javax/accessibility/AccessibilityProvider/FooProvider.java similarity index 100% rename from jdk/test/javax/accessibility/AccessibilityProvider/FooProvider.java rename to test/jdk/javax/accessibility/AccessibilityProvider/FooProvider.java diff --git a/jdk/test/javax/accessibility/AccessibilityProvider/Load.java b/test/jdk/javax/accessibility/AccessibilityProvider/Load.java similarity index 100% rename from jdk/test/javax/accessibility/AccessibilityProvider/Load.java rename to test/jdk/javax/accessibility/AccessibilityProvider/Load.java diff --git a/jdk/test/javax/accessibility/AccessibilityProvider/UnusedProvider.java b/test/jdk/javax/accessibility/AccessibilityProvider/UnusedProvider.java similarity index 100% rename from jdk/test/javax/accessibility/AccessibilityProvider/UnusedProvider.java rename to test/jdk/javax/accessibility/AccessibilityProvider/UnusedProvider.java diff --git a/jdk/test/javax/accessibility/AccessibilityProvider/accessibilityProvider.sp b/test/jdk/javax/accessibility/AccessibilityProvider/accessibilityProvider.sp similarity index 100% rename from jdk/test/javax/accessibility/AccessibilityProvider/accessibilityProvider.sp rename to test/jdk/javax/accessibility/AccessibilityProvider/accessibilityProvider.sp diff --git a/jdk/test/javax/accessibility/AccessibilityProvider/basic.sh b/test/jdk/javax/accessibility/AccessibilityProvider/basic.sh similarity index 100% rename from jdk/test/javax/accessibility/AccessibilityProvider/basic.sh rename to test/jdk/javax/accessibility/AccessibilityProvider/basic.sh diff --git a/jdk/test/javax/accessibility/JList/AccessibleJListChildNPETest.java b/test/jdk/javax/accessibility/JList/AccessibleJListChildNPETest.java similarity index 100% rename from jdk/test/javax/accessibility/JList/AccessibleJListChildNPETest.java rename to test/jdk/javax/accessibility/JList/AccessibleJListChildNPETest.java diff --git a/jdk/test/javax/accessibility/TEST.properties b/test/jdk/javax/accessibility/TEST.properties similarity index 100% rename from jdk/test/javax/accessibility/TEST.properties rename to test/jdk/javax/accessibility/TEST.properties diff --git a/jdk/test/javax/crypto/Cipher/ByteBuffers.java b/test/jdk/javax/crypto/Cipher/ByteBuffers.java similarity index 100% rename from jdk/test/javax/crypto/Cipher/ByteBuffers.java rename to test/jdk/javax/crypto/Cipher/ByteBuffers.java diff --git a/jdk/test/javax/crypto/Cipher/ByteBuffersNull.java b/test/jdk/javax/crypto/Cipher/ByteBuffersNull.java similarity index 100% rename from jdk/test/javax/crypto/Cipher/ByteBuffersNull.java rename to test/jdk/javax/crypto/Cipher/ByteBuffersNull.java diff --git a/jdk/test/javax/crypto/Cipher/CipherInputStreamExceptions.java b/test/jdk/javax/crypto/Cipher/CipherInputStreamExceptions.java similarity index 100% rename from jdk/test/javax/crypto/Cipher/CipherInputStreamExceptions.java rename to test/jdk/javax/crypto/Cipher/CipherInputStreamExceptions.java diff --git a/jdk/test/javax/crypto/Cipher/CipherStreamClose.java b/test/jdk/javax/crypto/Cipher/CipherStreamClose.java similarity index 100% rename from jdk/test/javax/crypto/Cipher/CipherStreamClose.java rename to test/jdk/javax/crypto/Cipher/CipherStreamClose.java diff --git a/jdk/test/javax/crypto/Cipher/EmptyFinalBuffer.java b/test/jdk/javax/crypto/Cipher/EmptyFinalBuffer.java similarity index 100% rename from jdk/test/javax/crypto/Cipher/EmptyFinalBuffer.java rename to test/jdk/javax/crypto/Cipher/EmptyFinalBuffer.java diff --git a/jdk/test/javax/crypto/Cipher/ExampleVectors/CheckExampleVectors.java b/test/jdk/javax/crypto/Cipher/ExampleVectors/CheckExampleVectors.java similarity index 100% rename from jdk/test/javax/crypto/Cipher/ExampleVectors/CheckExampleVectors.java rename to test/jdk/javax/crypto/Cipher/ExampleVectors/CheckExampleVectors.java diff --git a/jdk/test/javax/crypto/Cipher/ExampleVectors/NIST_800_38A_vectors.txt b/test/jdk/javax/crypto/Cipher/ExampleVectors/NIST_800_38A_vectors.txt similarity index 100% rename from jdk/test/javax/crypto/Cipher/ExampleVectors/NIST_800_38A_vectors.txt rename to test/jdk/javax/crypto/Cipher/ExampleVectors/NIST_800_38A_vectors.txt diff --git a/jdk/test/javax/crypto/Cipher/GCMAPI.java b/test/jdk/javax/crypto/Cipher/GCMAPI.java similarity index 100% rename from jdk/test/javax/crypto/Cipher/GCMAPI.java rename to test/jdk/javax/crypto/Cipher/GCMAPI.java diff --git a/jdk/test/javax/crypto/Cipher/GetMaxAllowed.java b/test/jdk/javax/crypto/Cipher/GetMaxAllowed.java similarity index 100% rename from jdk/test/javax/crypto/Cipher/GetMaxAllowed.java rename to test/jdk/javax/crypto/Cipher/GetMaxAllowed.java diff --git a/jdk/test/javax/crypto/Cipher/InOutBuffers.java b/test/jdk/javax/crypto/Cipher/InOutBuffers.java similarity index 100% rename from jdk/test/javax/crypto/Cipher/InOutBuffers.java rename to test/jdk/javax/crypto/Cipher/InOutBuffers.java diff --git a/jdk/test/javax/crypto/Cipher/TestCipherMode.java b/test/jdk/javax/crypto/Cipher/TestCipherMode.java similarity index 100% rename from jdk/test/javax/crypto/Cipher/TestCipherMode.java rename to test/jdk/javax/crypto/Cipher/TestCipherMode.java diff --git a/jdk/test/javax/crypto/Cipher/TestGetInstance.java b/test/jdk/javax/crypto/Cipher/TestGetInstance.java similarity index 100% rename from jdk/test/javax/crypto/Cipher/TestGetInstance.java rename to test/jdk/javax/crypto/Cipher/TestGetInstance.java diff --git a/jdk/test/javax/crypto/Cipher/Turkish.java b/test/jdk/javax/crypto/Cipher/Turkish.java similarity index 100% rename from jdk/test/javax/crypto/Cipher/Turkish.java rename to test/jdk/javax/crypto/Cipher/Turkish.java diff --git a/jdk/test/javax/crypto/CipherSpi/DirectBBRemaining.java b/test/jdk/javax/crypto/CipherSpi/DirectBBRemaining.java similarity index 100% rename from jdk/test/javax/crypto/CipherSpi/DirectBBRemaining.java rename to test/jdk/javax/crypto/CipherSpi/DirectBBRemaining.java diff --git a/jdk/test/javax/crypto/CryptoPermission/AllPermCheck.java b/test/jdk/javax/crypto/CryptoPermission/AllPermCheck.java similarity index 100% rename from jdk/test/javax/crypto/CryptoPermission/AllPermCheck.java rename to test/jdk/javax/crypto/CryptoPermission/AllPermCheck.java diff --git a/jdk/test/javax/crypto/CryptoPermission/LowercasePermCheck.java b/test/jdk/javax/crypto/CryptoPermission/LowercasePermCheck.java similarity index 100% rename from jdk/test/javax/crypto/CryptoPermission/LowercasePermCheck.java rename to test/jdk/javax/crypto/CryptoPermission/LowercasePermCheck.java diff --git a/jdk/test/javax/crypto/CryptoPermission/RC2PermCheck.java b/test/jdk/javax/crypto/CryptoPermission/RC2PermCheck.java similarity index 100% rename from jdk/test/javax/crypto/CryptoPermission/RC2PermCheck.java rename to test/jdk/javax/crypto/CryptoPermission/RC2PermCheck.java diff --git a/jdk/test/javax/crypto/CryptoPermission/RC4AliasPermCheck.java b/test/jdk/javax/crypto/CryptoPermission/RC4AliasPermCheck.java similarity index 100% rename from jdk/test/javax/crypto/CryptoPermission/RC4AliasPermCheck.java rename to test/jdk/javax/crypto/CryptoPermission/RC4AliasPermCheck.java diff --git a/jdk/test/javax/crypto/CryptoPermission/RSANoLimit.java b/test/jdk/javax/crypto/CryptoPermission/RSANoLimit.java similarity index 100% rename from jdk/test/javax/crypto/CryptoPermission/RSANoLimit.java rename to test/jdk/javax/crypto/CryptoPermission/RSANoLimit.java diff --git a/jdk/test/javax/crypto/CryptoPermissions/CryptoPolicyFallback.java b/test/jdk/javax/crypto/CryptoPermissions/CryptoPolicyFallback.java similarity index 100% rename from jdk/test/javax/crypto/CryptoPermissions/CryptoPolicyFallback.java rename to test/jdk/javax/crypto/CryptoPermissions/CryptoPolicyFallback.java diff --git a/jdk/test/javax/crypto/CryptoPermissions/README.txt b/test/jdk/javax/crypto/CryptoPermissions/README.txt similarity index 100% rename from jdk/test/javax/crypto/CryptoPermissions/README.txt rename to test/jdk/javax/crypto/CryptoPermissions/README.txt diff --git a/jdk/test/javax/crypto/CryptoPermissions/TestExemption.java b/test/jdk/javax/crypto/CryptoPermissions/TestExemption.java similarity index 100% rename from jdk/test/javax/crypto/CryptoPermissions/TestExemption.java rename to test/jdk/javax/crypto/CryptoPermissions/TestExemption.java diff --git a/jdk/test/javax/crypto/CryptoPermissions/TestExemption.sh b/test/jdk/javax/crypto/CryptoPermissions/TestExemption.sh similarity index 100% rename from jdk/test/javax/crypto/CryptoPermissions/TestExemption.sh rename to test/jdk/javax/crypto/CryptoPermissions/TestExemption.sh diff --git a/jdk/test/javax/crypto/CryptoPermissions/TestUnlimited.java b/test/jdk/javax/crypto/CryptoPermissions/TestUnlimited.java similarity index 100% rename from jdk/test/javax/crypto/CryptoPermissions/TestUnlimited.java rename to test/jdk/javax/crypto/CryptoPermissions/TestUnlimited.java diff --git a/jdk/test/javax/crypto/CryptoPermissions/cryptoPerms b/test/jdk/javax/crypto/CryptoPermissions/cryptoPerms similarity index 100% rename from jdk/test/javax/crypto/CryptoPermissions/cryptoPerms rename to test/jdk/javax/crypto/CryptoPermissions/cryptoPerms diff --git a/jdk/test/javax/crypto/EncryptedPrivateKeyInfo/GetAlgName.java b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetAlgName.java similarity index 100% rename from jdk/test/javax/crypto/EncryptedPrivateKeyInfo/GetAlgName.java rename to test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetAlgName.java diff --git a/jdk/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpec.java b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpec.java similarity index 100% rename from jdk/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpec.java rename to test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpec.java diff --git a/jdk/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException.java b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException.java similarity index 100% rename from jdk/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException.java rename to test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException.java diff --git a/jdk/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException2.java b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException2.java similarity index 100% rename from jdk/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException2.java rename to test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException2.java diff --git a/jdk/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecInvalidEncoding.java b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecInvalidEncoding.java similarity index 100% rename from jdk/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecInvalidEncoding.java rename to test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecInvalidEncoding.java diff --git a/jdk/test/javax/crypto/JceSecurity/FinalRestricted.java b/test/jdk/javax/crypto/JceSecurity/FinalRestricted.java similarity index 100% rename from jdk/test/javax/crypto/JceSecurity/FinalRestricted.java rename to test/jdk/javax/crypto/JceSecurity/FinalRestricted.java diff --git a/jdk/test/javax/crypto/JceSecurity/MyCertificateFactory.java b/test/jdk/javax/crypto/JceSecurity/MyCertificateFactory.java similarity index 100% rename from jdk/test/javax/crypto/JceSecurity/MyCertificateFactory.java rename to test/jdk/javax/crypto/JceSecurity/MyCertificateFactory.java diff --git a/jdk/test/javax/crypto/JceSecurity/MyProvider.java b/test/jdk/javax/crypto/JceSecurity/MyProvider.java similarity index 100% rename from jdk/test/javax/crypto/JceSecurity/MyProvider.java rename to test/jdk/javax/crypto/JceSecurity/MyProvider.java diff --git a/jdk/test/javax/crypto/JceSecurity/MyX509CertImpl.java b/test/jdk/javax/crypto/JceSecurity/MyX509CertImpl.java similarity index 100% rename from jdk/test/javax/crypto/JceSecurity/MyX509CertImpl.java rename to test/jdk/javax/crypto/JceSecurity/MyX509CertImpl.java diff --git a/jdk/test/javax/crypto/JceSecurity/SunJCE_BC_LoadOrdering.java b/test/jdk/javax/crypto/JceSecurity/SunJCE_BC_LoadOrdering.java similarity index 100% rename from jdk/test/javax/crypto/JceSecurity/SunJCE_BC_LoadOrdering.java rename to test/jdk/javax/crypto/JceSecurity/SunJCE_BC_LoadOrdering.java diff --git a/jdk/test/javax/crypto/KeyGenerator/TestGetInstance.java b/test/jdk/javax/crypto/KeyGenerator/TestGetInstance.java similarity index 100% rename from jdk/test/javax/crypto/KeyGenerator/TestGetInstance.java rename to test/jdk/javax/crypto/KeyGenerator/TestGetInstance.java diff --git a/jdk/test/javax/crypto/KeyGenerator/TestKGParity.java b/test/jdk/javax/crypto/KeyGenerator/TestKGParity.java similarity index 100% rename from jdk/test/javax/crypto/KeyGenerator/TestKGParity.java rename to test/jdk/javax/crypto/KeyGenerator/TestKGParity.java diff --git a/jdk/test/javax/crypto/Mac/ByteBuffers.java b/test/jdk/javax/crypto/Mac/ByteBuffers.java similarity index 100% rename from jdk/test/javax/crypto/Mac/ByteBuffers.java rename to test/jdk/javax/crypto/Mac/ByteBuffers.java diff --git a/jdk/test/javax/crypto/Mac/NullMacSpi.java b/test/jdk/javax/crypto/Mac/NullMacSpi.java similarity index 100% rename from jdk/test/javax/crypto/Mac/NullMacSpi.java rename to test/jdk/javax/crypto/Mac/NullMacSpi.java diff --git a/jdk/test/javax/crypto/Mac/TestGetInstance.java b/test/jdk/javax/crypto/Mac/TestGetInstance.java similarity index 100% rename from jdk/test/javax/crypto/Mac/TestGetInstance.java rename to test/jdk/javax/crypto/Mac/TestGetInstance.java diff --git a/jdk/test/javax/crypto/NullCipher/TestNPE.java b/test/jdk/javax/crypto/NullCipher/TestNPE.java similarity index 100% rename from jdk/test/javax/crypto/NullCipher/TestNPE.java rename to test/jdk/javax/crypto/NullCipher/TestNPE.java diff --git a/jdk/test/javax/crypto/NullCipher/TestWithoutInit.java b/test/jdk/javax/crypto/NullCipher/TestWithoutInit.java similarity index 100% rename from jdk/test/javax/crypto/NullCipher/TestWithoutInit.java rename to test/jdk/javax/crypto/NullCipher/TestWithoutInit.java diff --git a/jdk/test/javax/crypto/SealedObject/NullKeySealedObject.java b/test/jdk/javax/crypto/SealedObject/NullKeySealedObject.java similarity index 100% rename from jdk/test/javax/crypto/SealedObject/NullKeySealedObject.java rename to test/jdk/javax/crypto/SealedObject/NullKeySealedObject.java diff --git a/jdk/test/javax/crypto/SealedObject/TestSealedObjectNull.java b/test/jdk/javax/crypto/SealedObject/TestSealedObjectNull.java similarity index 100% rename from jdk/test/javax/crypto/SealedObject/TestSealedObjectNull.java rename to test/jdk/javax/crypto/SealedObject/TestSealedObjectNull.java diff --git a/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.java b/test/jdk/javax/crypto/SecretKeyFactory/FailOverTest.java similarity index 100% rename from jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.java rename to test/jdk/javax/crypto/SecretKeyFactory/FailOverTest.java diff --git a/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh b/test/jdk/javax/crypto/SecretKeyFactory/FailOverTest.sh similarity index 100% rename from jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh rename to test/jdk/javax/crypto/SecretKeyFactory/FailOverTest.sh diff --git a/jdk/test/javax/crypto/SecretKeyFactory/P1.jar b/test/jdk/javax/crypto/SecretKeyFactory/P1.jar similarity index 100% rename from jdk/test/javax/crypto/SecretKeyFactory/P1.jar rename to test/jdk/javax/crypto/SecretKeyFactory/P1.jar diff --git a/jdk/test/javax/crypto/SecretKeyFactory/P1SecretKeyFactory.java b/test/jdk/javax/crypto/SecretKeyFactory/P1SecretKeyFactory.java similarity index 100% rename from jdk/test/javax/crypto/SecretKeyFactory/P1SecretKeyFactory.java rename to test/jdk/javax/crypto/SecretKeyFactory/P1SecretKeyFactory.java diff --git a/jdk/test/javax/crypto/SecretKeyFactory/P2.jar b/test/jdk/javax/crypto/SecretKeyFactory/P2.jar similarity index 100% rename from jdk/test/javax/crypto/SecretKeyFactory/P2.jar rename to test/jdk/javax/crypto/SecretKeyFactory/P2.jar diff --git a/jdk/test/javax/crypto/SecretKeyFactory/P2SecretKeyFactory.java b/test/jdk/javax/crypto/SecretKeyFactory/P2SecretKeyFactory.java similarity index 100% rename from jdk/test/javax/crypto/SecretKeyFactory/P2SecretKeyFactory.java rename to test/jdk/javax/crypto/SecretKeyFactory/P2SecretKeyFactory.java diff --git a/jdk/test/javax/crypto/SecretKeyFactory/PBKDF2TranslateTest.java b/test/jdk/javax/crypto/SecretKeyFactory/PBKDF2TranslateTest.java similarity index 100% rename from jdk/test/javax/crypto/SecretKeyFactory/PBKDF2TranslateTest.java rename to test/jdk/javax/crypto/SecretKeyFactory/PBKDF2TranslateTest.java diff --git a/jdk/test/javax/crypto/SecretKeyFactory/Provider1.java b/test/jdk/javax/crypto/SecretKeyFactory/Provider1.java similarity index 100% rename from jdk/test/javax/crypto/SecretKeyFactory/Provider1.java rename to test/jdk/javax/crypto/SecretKeyFactory/Provider1.java diff --git a/jdk/test/javax/crypto/SecretKeyFactory/Provider2.java b/test/jdk/javax/crypto/SecretKeyFactory/Provider2.java similarity index 100% rename from jdk/test/javax/crypto/SecretKeyFactory/Provider2.java rename to test/jdk/javax/crypto/SecretKeyFactory/Provider2.java diff --git a/jdk/test/javax/crypto/SecretKeyFactory/README.FailOverTest b/test/jdk/javax/crypto/SecretKeyFactory/README.FailOverTest similarity index 100% rename from jdk/test/javax/crypto/SecretKeyFactory/README.FailOverTest rename to test/jdk/javax/crypto/SecretKeyFactory/README.FailOverTest diff --git a/jdk/test/javax/crypto/SecretKeyFactory/SecKFTranslateTest.java b/test/jdk/javax/crypto/SecretKeyFactory/SecKFTranslateTest.java similarity index 100% rename from jdk/test/javax/crypto/SecretKeyFactory/SecKFTranslateTest.java rename to test/jdk/javax/crypto/SecretKeyFactory/SecKFTranslateTest.java diff --git a/jdk/test/javax/crypto/SecretKeyFactory/security.properties b/test/jdk/javax/crypto/SecretKeyFactory/security.properties similarity index 100% rename from jdk/test/javax/crypto/SecretKeyFactory/security.properties rename to test/jdk/javax/crypto/SecretKeyFactory/security.properties diff --git a/jdk/test/javax/crypto/spec/DESKeySpec/CheckParity.java b/test/jdk/javax/crypto/spec/DESKeySpec/CheckParity.java similarity index 100% rename from jdk/test/javax/crypto/spec/DESKeySpec/CheckParity.java rename to test/jdk/javax/crypto/spec/DESKeySpec/CheckParity.java diff --git a/jdk/test/javax/crypto/spec/DESKeySpec/CheckWeakKeys.java b/test/jdk/javax/crypto/spec/DESKeySpec/CheckWeakKeys.java similarity index 100% rename from jdk/test/javax/crypto/spec/DESKeySpec/CheckWeakKeys.java rename to test/jdk/javax/crypto/spec/DESKeySpec/CheckWeakKeys.java diff --git a/jdk/test/javax/crypto/spec/DESKeySpec/NullKey.java b/test/jdk/javax/crypto/spec/DESKeySpec/NullKey.java similarity index 100% rename from jdk/test/javax/crypto/spec/DESKeySpec/NullKey.java rename to test/jdk/javax/crypto/spec/DESKeySpec/NullKey.java diff --git a/jdk/test/javax/crypto/spec/GCMParameterSpec/GCMParameterSpecTest.java b/test/jdk/javax/crypto/spec/GCMParameterSpec/GCMParameterSpecTest.java similarity index 100% rename from jdk/test/javax/crypto/spec/GCMParameterSpec/GCMParameterSpecTest.java rename to test/jdk/javax/crypto/spec/GCMParameterSpec/GCMParameterSpecTest.java diff --git a/jdk/test/javax/crypto/spec/IvParameterSpec/InvalidArgs.java b/test/jdk/javax/crypto/spec/IvParameterSpec/InvalidArgs.java similarity index 100% rename from jdk/test/javax/crypto/spec/IvParameterSpec/InvalidArgs.java rename to test/jdk/javax/crypto/spec/IvParameterSpec/InvalidArgs.java diff --git a/jdk/test/javax/crypto/spec/IvParameterSpec/NullIV.java b/test/jdk/javax/crypto/spec/IvParameterSpec/NullIV.java similarity index 100% rename from jdk/test/javax/crypto/spec/IvParameterSpec/NullIV.java rename to test/jdk/javax/crypto/spec/IvParameterSpec/NullIV.java diff --git a/jdk/test/javax/crypto/spec/RC2ParameterSpec/RC2AlgorithmParameters.java b/test/jdk/javax/crypto/spec/RC2ParameterSpec/RC2AlgorithmParameters.java similarity index 100% rename from jdk/test/javax/crypto/spec/RC2ParameterSpec/RC2AlgorithmParameters.java rename to test/jdk/javax/crypto/spec/RC2ParameterSpec/RC2AlgorithmParameters.java diff --git a/jdk/test/javax/crypto/spec/RC2ParameterSpec/RC2ParameterSpecEquals.java b/test/jdk/javax/crypto/spec/RC2ParameterSpec/RC2ParameterSpecEquals.java similarity index 100% rename from jdk/test/javax/crypto/spec/RC2ParameterSpec/RC2ParameterSpecEquals.java rename to test/jdk/javax/crypto/spec/RC2ParameterSpec/RC2ParameterSpecEquals.java diff --git a/jdk/test/javax/crypto/spec/RC5ParameterSpec/InvalidIV.java b/test/jdk/javax/crypto/spec/RC5ParameterSpec/InvalidIV.java similarity index 100% rename from jdk/test/javax/crypto/spec/RC5ParameterSpec/InvalidIV.java rename to test/jdk/javax/crypto/spec/RC5ParameterSpec/InvalidIV.java diff --git a/jdk/test/javax/crypto/spec/RC5ParameterSpec/RC5ParameterSpecEquals.java b/test/jdk/javax/crypto/spec/RC5ParameterSpec/RC5ParameterSpecEquals.java similarity index 100% rename from jdk/test/javax/crypto/spec/RC5ParameterSpec/RC5ParameterSpecEquals.java rename to test/jdk/javax/crypto/spec/RC5ParameterSpec/RC5ParameterSpecEquals.java diff --git a/jdk/test/javax/imageio/AllowSearch.java b/test/jdk/javax/imageio/AllowSearch.java similarity index 100% rename from jdk/test/javax/imageio/AllowSearch.java rename to test/jdk/javax/imageio/AllowSearch.java diff --git a/jdk/test/javax/imageio/AppContextTest.java b/test/jdk/javax/imageio/AppContextTest.java similarity index 100% rename from jdk/test/javax/imageio/AppContextTest.java rename to test/jdk/javax/imageio/AppContextTest.java diff --git a/jdk/test/javax/imageio/AppletResourceTest.html b/test/jdk/javax/imageio/AppletResourceTest.html similarity index 100% rename from jdk/test/javax/imageio/AppletResourceTest.html rename to test/jdk/javax/imageio/AppletResourceTest.html diff --git a/jdk/test/javax/imageio/AppletResourceTest.java b/test/jdk/javax/imageio/AppletResourceTest.java similarity index 100% rename from jdk/test/javax/imageio/AppletResourceTest.java rename to test/jdk/javax/imageio/AppletResourceTest.java diff --git a/jdk/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java b/test/jdk/javax/imageio/CachePremissionsTest/CachePermissionsTest.java similarity index 100% rename from jdk/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java rename to test/jdk/javax/imageio/CachePremissionsTest/CachePermissionsTest.java diff --git a/jdk/test/javax/imageio/CachePremissionsTest/rw.policy b/test/jdk/javax/imageio/CachePremissionsTest/rw.policy similarity index 100% rename from jdk/test/javax/imageio/CachePremissionsTest/rw.policy rename to test/jdk/javax/imageio/CachePremissionsTest/rw.policy diff --git a/jdk/test/javax/imageio/CachePremissionsTest/rwd.policy b/test/jdk/javax/imageio/CachePremissionsTest/rwd.policy similarity index 100% rename from jdk/test/javax/imageio/CachePremissionsTest/rwd.policy rename to test/jdk/javax/imageio/CachePremissionsTest/rwd.policy diff --git a/jdk/test/javax/imageio/CachePremissionsTest/w.policy b/test/jdk/javax/imageio/CachePremissionsTest/w.policy similarity index 100% rename from jdk/test/javax/imageio/CachePremissionsTest/w.policy rename to test/jdk/javax/imageio/CachePremissionsTest/w.policy diff --git a/jdk/test/javax/imageio/EmptyFileTest.java b/test/jdk/javax/imageio/EmptyFileTest.java similarity index 100% rename from jdk/test/javax/imageio/EmptyFileTest.java rename to test/jdk/javax/imageio/EmptyFileTest.java diff --git a/jdk/test/javax/imageio/GetNumImages.java b/test/jdk/javax/imageio/GetNumImages.java similarity index 100% rename from jdk/test/javax/imageio/GetNumImages.java rename to test/jdk/javax/imageio/GetNumImages.java diff --git a/jdk/test/javax/imageio/GetReaderWriterInfo.java b/test/jdk/javax/imageio/GetReaderWriterInfo.java similarity index 100% rename from jdk/test/javax/imageio/GetReaderWriterInfo.java rename to test/jdk/javax/imageio/GetReaderWriterInfo.java diff --git a/jdk/test/javax/imageio/GetReaderWriterInfoNullTest.java b/test/jdk/javax/imageio/GetReaderWriterInfoNullTest.java similarity index 100% rename from jdk/test/javax/imageio/GetReaderWriterInfoNullTest.java rename to test/jdk/javax/imageio/GetReaderWriterInfoNullTest.java diff --git a/jdk/test/javax/imageio/IIOImageConstructor.java b/test/jdk/javax/imageio/IIOImageConstructor.java similarity index 100% rename from jdk/test/javax/imageio/IIOImageConstructor.java rename to test/jdk/javax/imageio/IIOImageConstructor.java diff --git a/jdk/test/javax/imageio/ITSDataType.java b/test/jdk/javax/imageio/ITSDataType.java similarity index 100% rename from jdk/test/javax/imageio/ITSDataType.java rename to test/jdk/javax/imageio/ITSDataType.java diff --git a/jdk/test/javax/imageio/ImageCompressionTypesTest.java b/test/jdk/javax/imageio/ImageCompressionTypesTest.java similarity index 100% rename from jdk/test/javax/imageio/ImageCompressionTypesTest.java rename to test/jdk/javax/imageio/ImageCompressionTypesTest.java diff --git a/jdk/test/javax/imageio/ImageIOGetImageReaders.java b/test/jdk/javax/imageio/ImageIOGetImageReaders.java similarity index 100% rename from jdk/test/javax/imageio/ImageIOGetImageReaders.java rename to test/jdk/javax/imageio/ImageIOGetImageReaders.java diff --git a/jdk/test/javax/imageio/ImageIOWriteFile.java b/test/jdk/javax/imageio/ImageIOWriteFile.java similarity index 100% rename from jdk/test/javax/imageio/ImageIOWriteFile.java rename to test/jdk/javax/imageio/ImageIOWriteFile.java diff --git a/jdk/test/javax/imageio/ImageIOWriteNull.java b/test/jdk/javax/imageio/ImageIOWriteNull.java similarity index 100% rename from jdk/test/javax/imageio/ImageIOWriteNull.java rename to test/jdk/javax/imageio/ImageIOWriteNull.java diff --git a/jdk/test/javax/imageio/ImageReadParamPasses.java b/test/jdk/javax/imageio/ImageReadParamPasses.java similarity index 100% rename from jdk/test/javax/imageio/ImageReadParamPasses.java rename to test/jdk/javax/imageio/ImageReadParamPasses.java diff --git a/jdk/test/javax/imageio/ImageReaderGetDestination.java b/test/jdk/javax/imageio/ImageReaderGetDestination.java similarity index 100% rename from jdk/test/javax/imageio/ImageReaderGetDestination.java rename to test/jdk/javax/imageio/ImageReaderGetDestination.java diff --git a/jdk/test/javax/imageio/ImageReaderReadAll.java b/test/jdk/javax/imageio/ImageReaderReadAll.java similarity index 100% rename from jdk/test/javax/imageio/ImageReaderReadAll.java rename to test/jdk/javax/imageio/ImageReaderReadAll.java diff --git a/jdk/test/javax/imageio/ImageStreamFromRAF.java b/test/jdk/javax/imageio/ImageStreamFromRAF.java similarity index 100% rename from jdk/test/javax/imageio/ImageStreamFromRAF.java rename to test/jdk/javax/imageio/ImageStreamFromRAF.java diff --git a/jdk/test/javax/imageio/ImageTypeSpecifierBitsPerBand.java b/test/jdk/javax/imageio/ImageTypeSpecifierBitsPerBand.java similarity index 100% rename from jdk/test/javax/imageio/ImageTypeSpecifierBitsPerBand.java rename to test/jdk/javax/imageio/ImageTypeSpecifierBitsPerBand.java diff --git a/jdk/test/javax/imageio/ImageTypeSpecifierTest.java b/test/jdk/javax/imageio/ImageTypeSpecifierTest.java similarity index 100% rename from jdk/test/javax/imageio/ImageTypeSpecifierTest.java rename to test/jdk/javax/imageio/ImageTypeSpecifierTest.java diff --git a/jdk/test/javax/imageio/ImageWriteParamMisc.java b/test/jdk/javax/imageio/ImageWriteParamMisc.java similarity index 100% rename from jdk/test/javax/imageio/ImageWriteParamMisc.java rename to test/jdk/javax/imageio/ImageWriteParamMisc.java diff --git a/jdk/test/javax/imageio/MultiReadTest.java b/test/jdk/javax/imageio/MultiReadTest.java similarity index 100% rename from jdk/test/javax/imageio/MultiReadTest.java rename to test/jdk/javax/imageio/MultiReadTest.java diff --git a/jdk/test/javax/imageio/NullInputOutput.java b/test/jdk/javax/imageio/NullInputOutput.java similarity index 100% rename from jdk/test/javax/imageio/NullInputOutput.java rename to test/jdk/javax/imageio/NullInputOutput.java diff --git a/jdk/test/javax/imageio/PNGSpiStreamMetadata.java b/test/jdk/javax/imageio/PNGSpiStreamMetadata.java similarity index 100% rename from jdk/test/javax/imageio/PNGSpiStreamMetadata.java rename to test/jdk/javax/imageio/PNGSpiStreamMetadata.java diff --git a/jdk/test/javax/imageio/PNGSuffixes.java b/test/jdk/javax/imageio/PNGSuffixes.java similarity index 100% rename from jdk/test/javax/imageio/PNGSuffixes.java rename to test/jdk/javax/imageio/PNGSuffixes.java diff --git a/jdk/test/javax/imageio/ReadAbortTest.java b/test/jdk/javax/imageio/ReadAbortTest.java similarity index 100% rename from jdk/test/javax/imageio/ReadAbortTest.java rename to test/jdk/javax/imageio/ReadAbortTest.java diff --git a/jdk/test/javax/imageio/ReadBitsTest.java b/test/jdk/javax/imageio/ReadBitsTest.java similarity index 100% rename from jdk/test/javax/imageio/ReadBitsTest.java rename to test/jdk/javax/imageio/ReadBitsTest.java diff --git a/jdk/test/javax/imageio/SetOutput.java b/test/jdk/javax/imageio/SetOutput.java similarity index 100% rename from jdk/test/javax/imageio/SetOutput.java rename to test/jdk/javax/imageio/SetOutput.java diff --git a/jdk/test/javax/imageio/TEST.properties b/test/jdk/javax/imageio/TEST.properties similarity index 100% rename from jdk/test/javax/imageio/TEST.properties rename to test/jdk/javax/imageio/TEST.properties diff --git a/jdk/test/javax/imageio/WriteAbortTest.java b/test/jdk/javax/imageio/WriteAbortTest.java similarity index 100% rename from jdk/test/javax/imageio/WriteAbortTest.java rename to test/jdk/javax/imageio/WriteAbortTest.java diff --git a/jdk/test/javax/imageio/WriteNullImageTest.java b/test/jdk/javax/imageio/WriteNullImageTest.java similarity index 100% rename from jdk/test/javax/imageio/WriteNullImageTest.java rename to test/jdk/javax/imageio/WriteNullImageTest.java diff --git a/jdk/test/javax/imageio/event/WriteProgressListenerTest.java b/test/jdk/javax/imageio/event/WriteProgressListenerTest.java similarity index 100% rename from jdk/test/javax/imageio/event/WriteProgressListenerTest.java rename to test/jdk/javax/imageio/event/WriteProgressListenerTest.java diff --git a/jdk/test/javax/imageio/metadata/BooleanAttributes.java b/test/jdk/javax/imageio/metadata/BooleanAttributes.java similarity index 100% rename from jdk/test/javax/imageio/metadata/BooleanAttributes.java rename to test/jdk/javax/imageio/metadata/BooleanAttributes.java diff --git a/jdk/test/javax/imageio/metadata/DOML3Node.java b/test/jdk/javax/imageio/metadata/DOML3Node.java similarity index 100% rename from jdk/test/javax/imageio/metadata/DOML3Node.java rename to test/jdk/javax/imageio/metadata/DOML3Node.java diff --git a/jdk/test/javax/imageio/metadata/GetChildNames.java b/test/jdk/javax/imageio/metadata/GetChildNames.java similarity index 100% rename from jdk/test/javax/imageio/metadata/GetChildNames.java rename to test/jdk/javax/imageio/metadata/GetChildNames.java diff --git a/jdk/test/javax/imageio/metadata/GetElementsByTagNameTest.java b/test/jdk/javax/imageio/metadata/GetElementsByTagNameTest.java similarity index 100% rename from jdk/test/javax/imageio/metadata/GetElementsByTagNameTest.java rename to test/jdk/javax/imageio/metadata/GetElementsByTagNameTest.java diff --git a/jdk/test/javax/imageio/metadata/GetObjectMinValue.java b/test/jdk/javax/imageio/metadata/GetObjectMinValue.java similarity index 100% rename from jdk/test/javax/imageio/metadata/GetObjectMinValue.java rename to test/jdk/javax/imageio/metadata/GetObjectMinValue.java diff --git a/jdk/test/javax/imageio/metadata/IIOMetadataFormat/MetadataFormatTest.java b/test/jdk/javax/imageio/metadata/IIOMetadataFormat/MetadataFormatTest.java similarity index 100% rename from jdk/test/javax/imageio/metadata/IIOMetadataFormat/MetadataFormatTest.java rename to test/jdk/javax/imageio/metadata/IIOMetadataFormat/MetadataFormatTest.java diff --git a/jdk/test/javax/imageio/metadata/IIOMetadataFormat/MetadataFormatThreadTest.java b/test/jdk/javax/imageio/metadata/IIOMetadataFormat/MetadataFormatThreadTest.java similarity index 100% rename from jdk/test/javax/imageio/metadata/IIOMetadataFormat/MetadataFormatThreadTest.java rename to test/jdk/javax/imageio/metadata/IIOMetadataFormat/MetadataFormatThreadTest.java diff --git a/jdk/test/javax/imageio/metadata/IIOMetadataFormat/MetadataTest.java b/test/jdk/javax/imageio/metadata/IIOMetadataFormat/MetadataTest.java similarity index 100% rename from jdk/test/javax/imageio/metadata/IIOMetadataFormat/MetadataTest.java rename to test/jdk/javax/imageio/metadata/IIOMetadataFormat/MetadataTest.java diff --git a/jdk/test/javax/imageio/metadata/IIOMetadataFormat/UserPluginMetadataFormatTest.java b/test/jdk/javax/imageio/metadata/IIOMetadataFormat/UserPluginMetadataFormatTest.java similarity index 100% rename from jdk/test/javax/imageio/metadata/IIOMetadataFormat/UserPluginMetadataFormatTest.java rename to test/jdk/javax/imageio/metadata/IIOMetadataFormat/UserPluginMetadataFormatTest.java diff --git a/jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh b/test/jdk/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh similarity index 100% rename from jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh rename to test/jdk/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh diff --git a/jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh b/test/jdk/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh similarity index 100% rename from jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh rename to test/jdk/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh diff --git a/jdk/test/javax/imageio/metadata/IIOMetadataFormatImplTest.java b/test/jdk/javax/imageio/metadata/IIOMetadataFormatImplTest.java similarity index 100% rename from jdk/test/javax/imageio/metadata/IIOMetadataFormatImplTest.java rename to test/jdk/javax/imageio/metadata/IIOMetadataFormatImplTest.java diff --git a/jdk/test/javax/imageio/metadata/MetadataFormatPrinter.java b/test/jdk/javax/imageio/metadata/MetadataFormatPrinter.java similarity index 100% rename from jdk/test/javax/imageio/metadata/MetadataFormatPrinter.java rename to test/jdk/javax/imageio/metadata/MetadataFormatPrinter.java diff --git a/jdk/test/javax/imageio/metadata/NthItemNodeListTest.java b/test/jdk/javax/imageio/metadata/NthItemNodeListTest.java similarity index 100% rename from jdk/test/javax/imageio/metadata/NthItemNodeListTest.java rename to test/jdk/javax/imageio/metadata/NthItemNodeListTest.java diff --git a/jdk/test/javax/imageio/metadata/ObjectArrayMaxLength.java b/test/jdk/javax/imageio/metadata/ObjectArrayMaxLength.java similarity index 100% rename from jdk/test/javax/imageio/metadata/ObjectArrayMaxLength.java rename to test/jdk/javax/imageio/metadata/ObjectArrayMaxLength.java diff --git a/jdk/test/javax/imageio/metadata/RegisteredFormatsTest.java b/test/jdk/javax/imageio/metadata/RegisteredFormatsTest.java similarity index 100% rename from jdk/test/javax/imageio/metadata/RegisteredFormatsTest.java rename to test/jdk/javax/imageio/metadata/RegisteredFormatsTest.java diff --git a/jdk/test/javax/imageio/metadata/RemoveElement.java b/test/jdk/javax/imageio/metadata/RemoveElement.java similarity index 100% rename from jdk/test/javax/imageio/metadata/RemoveElement.java rename to test/jdk/javax/imageio/metadata/RemoveElement.java diff --git a/jdk/test/javax/imageio/metadata/SetAttributeNode.java b/test/jdk/javax/imageio/metadata/SetAttributeNode.java similarity index 100% rename from jdk/test/javax/imageio/metadata/SetAttributeNode.java rename to test/jdk/javax/imageio/metadata/SetAttributeNode.java diff --git a/jdk/test/javax/imageio/plugins/bmp/BMPCompressionTest.java b/test/jdk/javax/imageio/plugins/bmp/BMPCompressionTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/BMPCompressionTest.java rename to test/jdk/javax/imageio/plugins/bmp/BMPCompressionTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/BMPPixelSpacingTest.java b/test/jdk/javax/imageio/plugins/bmp/BMPPixelSpacingTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/BMPPixelSpacingTest.java rename to test/jdk/javax/imageio/plugins/bmp/BMPPixelSpacingTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/BMPPluginTest.java b/test/jdk/javax/imageio/plugins/bmp/BMPPluginTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/BMPPluginTest.java rename to test/jdk/javax/imageio/plugins/bmp/BMPPluginTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/BMPSubsamplingTest.java b/test/jdk/javax/imageio/plugins/bmp/BMPSubsamplingTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/BMPSubsamplingTest.java rename to test/jdk/javax/imageio/plugins/bmp/BMPSubsamplingTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/BMPWriteParamTest.java b/test/jdk/javax/imageio/plugins/bmp/BMPWriteParamTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/BMPWriteParamTest.java rename to test/jdk/javax/imageio/plugins/bmp/BMPWriteParamTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/BmpBigDestinationTest.java b/test/jdk/javax/imageio/plugins/bmp/BmpBigDestinationTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/BmpBigDestinationTest.java rename to test/jdk/javax/imageio/plugins/bmp/BmpBigDestinationTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/BmpDefaultImageMetadataTest.java b/test/jdk/javax/imageio/plugins/bmp/BmpDefaultImageMetadataTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/BmpDefaultImageMetadataTest.java rename to test/jdk/javax/imageio/plugins/bmp/BmpDefaultImageMetadataTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/Bug8066904.java b/test/jdk/javax/imageio/plugins/bmp/Bug8066904.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/Bug8066904.java rename to test/jdk/javax/imageio/plugins/bmp/Bug8066904.java diff --git a/jdk/test/javax/imageio/plugins/bmp/CompressionModeTest.java b/test/jdk/javax/imageio/plugins/bmp/CompressionModeTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/CompressionModeTest.java rename to test/jdk/javax/imageio/plugins/bmp/CompressionModeTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/EmbeddedFormatTest.java b/test/jdk/javax/imageio/plugins/bmp/EmbeddedFormatTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/EmbeddedFormatTest.java rename to test/jdk/javax/imageio/plugins/bmp/EmbeddedFormatTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/EmptyInputBmpMetadataTest.java b/test/jdk/javax/imageio/plugins/bmp/EmptyInputBmpMetadataTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/EmptyInputBmpMetadataTest.java rename to test/jdk/javax/imageio/plugins/bmp/EmptyInputBmpMetadataTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/NoExtraBytesTest.java b/test/jdk/javax/imageio/plugins/bmp/NoExtraBytesTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/NoExtraBytesTest.java rename to test/jdk/javax/imageio/plugins/bmp/NoExtraBytesTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/RLECompressionTest.java b/test/jdk/javax/imageio/plugins/bmp/RLECompressionTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/RLECompressionTest.java rename to test/jdk/javax/imageio/plugins/bmp/RLECompressionTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/ReaderListenersTest.java b/test/jdk/javax/imageio/plugins/bmp/ReaderListenersTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/ReaderListenersTest.java rename to test/jdk/javax/imageio/plugins/bmp/ReaderListenersTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/RleEncodingTest.java b/test/jdk/javax/imageio/plugins/bmp/RleEncodingTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/RleEncodingTest.java rename to test/jdk/javax/imageio/plugins/bmp/RleEncodingTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/TestCompressionBI_BITFIELDS.java b/test/jdk/javax/imageio/plugins/bmp/TestCompressionBI_BITFIELDS.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/TestCompressionBI_BITFIELDS.java rename to test/jdk/javax/imageio/plugins/bmp/TestCompressionBI_BITFIELDS.java diff --git a/jdk/test/javax/imageio/plugins/bmp/TopDownTest.java b/test/jdk/javax/imageio/plugins/bmp/TopDownTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/TopDownTest.java rename to test/jdk/javax/imageio/plugins/bmp/TopDownTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/Write3ByteBgrTest.java b/test/jdk/javax/imageio/plugins/bmp/Write3ByteBgrTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/Write3ByteBgrTest.java rename to test/jdk/javax/imageio/plugins/bmp/Write3ByteBgrTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/WriteProgressListenerTest.java b/test/jdk/javax/imageio/plugins/bmp/WriteProgressListenerTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/WriteProgressListenerTest.java rename to test/jdk/javax/imageio/plugins/bmp/WriteProgressListenerTest.java diff --git a/jdk/test/javax/imageio/plugins/bmp/WritingColorChangeTest.java b/test/jdk/javax/imageio/plugins/bmp/WritingColorChangeTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/bmp/WritingColorChangeTest.java rename to test/jdk/javax/imageio/plugins/bmp/WritingColorChangeTest.java diff --git a/jdk/test/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh b/test/jdk/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh similarity index 100% rename from jdk/test/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh rename to test/jdk/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh diff --git a/jdk/test/javax/imageio/plugins/external_plugin_tests/src/simp/META-INF/services/javax.imageio.spi.ImageReaderSpi b/test/jdk/javax/imageio/plugins/external_plugin_tests/src/simp/META-INF/services/javax.imageio.spi.ImageReaderSpi similarity index 100% rename from jdk/test/javax/imageio/plugins/external_plugin_tests/src/simp/META-INF/services/javax.imageio.spi.ImageReaderSpi rename to test/jdk/javax/imageio/plugins/external_plugin_tests/src/simp/META-INF/services/javax.imageio.spi.ImageReaderSpi diff --git a/jdk/test/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPImageReader.java b/test/jdk/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPImageReader.java similarity index 100% rename from jdk/test/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPImageReader.java rename to test/jdk/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPImageReader.java diff --git a/jdk/test/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPImageReaderSpi.java b/test/jdk/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPImageReaderSpi.java similarity index 100% rename from jdk/test/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPImageReaderSpi.java rename to test/jdk/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPImageReaderSpi.java diff --git a/jdk/test/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPMetadata.java b/test/jdk/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPMetadata.java similarity index 100% rename from jdk/test/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPMetadata.java rename to test/jdk/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPMetadata.java diff --git a/jdk/test/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPMetadataFormat.java b/test/jdk/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPMetadataFormat.java similarity index 100% rename from jdk/test/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPMetadataFormat.java rename to test/jdk/javax/imageio/plugins/external_plugin_tests/src/simp/SIMPMetadataFormat.java diff --git a/jdk/test/javax/imageio/plugins/external_plugin_tests/src/simp/module-info.java b/test/jdk/javax/imageio/plugins/external_plugin_tests/src/simp/module-info.java similarity index 100% rename from jdk/test/javax/imageio/plugins/external_plugin_tests/src/simp/module-info.java rename to test/jdk/javax/imageio/plugins/external_plugin_tests/src/simp/module-info.java diff --git a/jdk/test/javax/imageio/plugins/external_plugin_tests/src/simptest/TestSIMPPlugin.java b/test/jdk/javax/imageio/plugins/external_plugin_tests/src/simptest/TestSIMPPlugin.java similarity index 100% rename from jdk/test/javax/imageio/plugins/external_plugin_tests/src/simptest/TestSIMPPlugin.java rename to test/jdk/javax/imageio/plugins/external_plugin_tests/src/simptest/TestSIMPPlugin.java diff --git a/jdk/test/javax/imageio/plugins/gif/AnimationTest.java b/test/jdk/javax/imageio/plugins/gif/AnimationTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/AnimationTest.java rename to test/jdk/javax/imageio/plugins/gif/AnimationTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/DisableCompressionTest.java b/test/jdk/javax/imageio/plugins/gif/DisableCompressionTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/DisableCompressionTest.java rename to test/jdk/javax/imageio/plugins/gif/DisableCompressionTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/EncodeSubImageTest.java b/test/jdk/javax/imageio/plugins/gif/EncodeSubImageTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/EncodeSubImageTest.java rename to test/jdk/javax/imageio/plugins/gif/EncodeSubImageTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/EndWriteSequenceTest.java b/test/jdk/javax/imageio/plugins/gif/EndWriteSequenceTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/EndWriteSequenceTest.java rename to test/jdk/javax/imageio/plugins/gif/EndWriteSequenceTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/GIFPassListenerTest.java b/test/jdk/javax/imageio/plugins/gif/GIFPassListenerTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/GIFPassListenerTest.java rename to test/jdk/javax/imageio/plugins/gif/GIFPassListenerTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/GifTransparencyTest.java b/test/jdk/javax/imageio/plugins/gif/GifTransparencyTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/GifTransparencyTest.java rename to test/jdk/javax/imageio/plugins/gif/GifTransparencyTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/IndexingTest.java b/test/jdk/javax/imageio/plugins/gif/IndexingTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/IndexingTest.java rename to test/jdk/javax/imageio/plugins/gif/IndexingTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/LogicalScreenDimensionTest.java b/test/jdk/javax/imageio/plugins/gif/LogicalScreenDimensionTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/LogicalScreenDimensionTest.java rename to test/jdk/javax/imageio/plugins/gif/LogicalScreenDimensionTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/OddPaletteTest.java b/test/jdk/javax/imageio/plugins/gif/OddPaletteTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/OddPaletteTest.java rename to test/jdk/javax/imageio/plugins/gif/OddPaletteTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/PrepareWriteSequenceTest.java b/test/jdk/javax/imageio/plugins/gif/PrepareWriteSequenceTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/PrepareWriteSequenceTest.java rename to test/jdk/javax/imageio/plugins/gif/PrepareWriteSequenceTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/RGBAnimationTest.java b/test/jdk/javax/imageio/plugins/gif/RGBAnimationTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/RGBAnimationTest.java rename to test/jdk/javax/imageio/plugins/gif/RGBAnimationTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/RGBImageTest.java b/test/jdk/javax/imageio/plugins/gif/RGBImageTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/RGBImageTest.java rename to test/jdk/javax/imageio/plugins/gif/RGBImageTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/StreamMetadataTest.java b/test/jdk/javax/imageio/plugins/gif/StreamMetadataTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/StreamMetadataTest.java rename to test/jdk/javax/imageio/plugins/gif/StreamMetadataTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/TransparencyTest.java b/test/jdk/javax/imageio/plugins/gif/TransparencyTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/TransparencyTest.java rename to test/jdk/javax/imageio/plugins/gif/TransparencyTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/UshortOutOfMemoryTest.java b/test/jdk/javax/imageio/plugins/gif/UshortOutOfMemoryTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/UshortOutOfMemoryTest.java rename to test/jdk/javax/imageio/plugins/gif/UshortOutOfMemoryTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/WriteMetadataTest.java b/test/jdk/javax/imageio/plugins/gif/WriteMetadataTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/WriteMetadataTest.java rename to test/jdk/javax/imageio/plugins/gif/WriteMetadataTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/WriterResetTest.java b/test/jdk/javax/imageio/plugins/gif/WriterResetTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/WriterResetTest.java rename to test/jdk/javax/imageio/plugins/gif/WriterResetTest.java diff --git a/jdk/test/javax/imageio/plugins/gif/WriterReuseTest.java b/test/jdk/javax/imageio/plugins/gif/WriterReuseTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/gif/WriterReuseTest.java rename to test/jdk/javax/imageio/plugins/gif/WriterReuseTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/ByteBinaryTest.java b/test/jdk/javax/imageio/plugins/jpeg/ByteBinaryTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/ByteBinaryTest.java rename to test/jdk/javax/imageio/plugins/jpeg/ByteBinaryTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/CanEncodeIndexed.java b/test/jdk/javax/imageio/plugins/jpeg/CanEncodeIndexed.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/CanEncodeIndexed.java rename to test/jdk/javax/imageio/plugins/jpeg/CanEncodeIndexed.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/CompressionBug.java b/test/jdk/javax/imageio/plugins/jpeg/CompressionBug.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/CompressionBug.java rename to test/jdk/javax/imageio/plugins/jpeg/CompressionBug.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/CompressionVals.java b/test/jdk/javax/imageio/plugins/jpeg/CompressionVals.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/CompressionVals.java rename to test/jdk/javax/imageio/plugins/jpeg/CompressionVals.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/ConcurrentReadingTest.java b/test/jdk/javax/imageio/plugins/jpeg/ConcurrentReadingTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/ConcurrentReadingTest.java rename to test/jdk/javax/imageio/plugins/jpeg/ConcurrentReadingTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/ConcurrentWritingTest.java b/test/jdk/javax/imageio/plugins/jpeg/ConcurrentWritingTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/ConcurrentWritingTest.java rename to test/jdk/javax/imageio/plugins/jpeg/ConcurrentWritingTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/CrashAfterDispose.java b/test/jdk/javax/imageio/plugins/jpeg/CrashAfterDispose.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/CrashAfterDispose.java rename to test/jdk/javax/imageio/plugins/jpeg/CrashAfterDispose.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/DestTypeTest.java b/test/jdk/javax/imageio/plugins/jpeg/DestTypeTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/DestTypeTest.java rename to test/jdk/javax/imageio/plugins/jpeg/DestTypeTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/JPEGsNotAcceleratedTest.java b/test/jdk/javax/imageio/plugins/jpeg/JPEGsNotAcceleratedTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/JPEGsNotAcceleratedTest.java rename to test/jdk/javax/imageio/plugins/jpeg/JPEGsNotAcceleratedTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/JpegImageColorSpaceTest.java b/test/jdk/javax/imageio/plugins/jpeg/JpegImageColorSpaceTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/JpegImageColorSpaceTest.java rename to test/jdk/javax/imageio/plugins/jpeg/JpegImageColorSpaceTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/JpegMetadataColorSpaceTest.java b/test/jdk/javax/imageio/plugins/jpeg/JpegMetadataColorSpaceTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/JpegMetadataColorSpaceTest.java rename to test/jdk/javax/imageio/plugins/jpeg/JpegMetadataColorSpaceTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/JpegMultipleEOI.jpg b/test/jdk/javax/imageio/plugins/jpeg/JpegMultipleEOI.jpg similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/JpegMultipleEOI.jpg rename to test/jdk/javax/imageio/plugins/jpeg/JpegMultipleEOI.jpg diff --git a/jdk/test/javax/imageio/plugins/jpeg/JpegMultipleEOITest.java b/test/jdk/javax/imageio/plugins/jpeg/JpegMultipleEOITest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/JpegMultipleEOITest.java rename to test/jdk/javax/imageio/plugins/jpeg/JpegMultipleEOITest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/JpegRawImageTypeTest.java b/test/jdk/javax/imageio/plugins/jpeg/JpegRawImageTypeTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/JpegRawImageTypeTest.java rename to test/jdk/javax/imageio/plugins/jpeg/JpegRawImageTypeTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java b/test/jdk/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java rename to test/jdk/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/MagentaEXIFTest.java b/test/jdk/javax/imageio/plugins/jpeg/MagentaEXIFTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/MagentaEXIFTest.java rename to test/jdk/javax/imageio/plugins/jpeg/MagentaEXIFTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/MergeTreeTest.java b/test/jdk/javax/imageio/plugins/jpeg/MergeTreeTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/MergeTreeTest.java rename to test/jdk/javax/imageio/plugins/jpeg/MergeTreeTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/RasterWithMinXTest.java b/test/jdk/javax/imageio/plugins/jpeg/RasterWithMinXTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/RasterWithMinXTest.java rename to test/jdk/javax/imageio/plugins/jpeg/RasterWithMinXTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/ReadAllThumbnailsTest.java b/test/jdk/javax/imageio/plugins/jpeg/ReadAllThumbnailsTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/ReadAllThumbnailsTest.java rename to test/jdk/javax/imageio/plugins/jpeg/ReadAllThumbnailsTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/ReadAsGrayTest.java b/test/jdk/javax/imageio/plugins/jpeg/ReadAsGrayTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/ReadAsGrayTest.java rename to test/jdk/javax/imageio/plugins/jpeg/ReadAsGrayTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/ReadingInterruptionTest.java b/test/jdk/javax/imageio/plugins/jpeg/ReadingInterruptionTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/ReadingInterruptionTest.java rename to test/jdk/javax/imageio/plugins/jpeg/ReadingInterruptionTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/ResetOutOfMemory.java b/test/jdk/javax/imageio/plugins/jpeg/ResetOutOfMemory.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/ResetOutOfMemory.java rename to test/jdk/javax/imageio/plugins/jpeg/ResetOutOfMemory.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/TruncatedImageWarningTest.java b/test/jdk/javax/imageio/plugins/jpeg/TruncatedImageWarningTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/TruncatedImageWarningTest.java rename to test/jdk/javax/imageio/plugins/jpeg/TruncatedImageWarningTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/UshortGrayTest.java b/test/jdk/javax/imageio/plugins/jpeg/UshortGrayTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/UshortGrayTest.java rename to test/jdk/javax/imageio/plugins/jpeg/UshortGrayTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/WritingInterruptionTest.java b/test/jdk/javax/imageio/plugins/jpeg/WritingInterruptionTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/WritingInterruptionTest.java rename to test/jdk/javax/imageio/plugins/jpeg/WritingInterruptionTest.java diff --git a/jdk/test/javax/imageio/plugins/jpeg/nomarkers.jpg b/test/jdk/javax/imageio/plugins/jpeg/nomarkers.jpg similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/nomarkers.jpg rename to test/jdk/javax/imageio/plugins/jpeg/nomarkers.jpg diff --git a/jdk/test/javax/imageio/plugins/jpeg/thumbimg.jpg b/test/jdk/javax/imageio/plugins/jpeg/thumbimg.jpg similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/thumbimg.jpg rename to test/jdk/javax/imageio/plugins/jpeg/thumbimg.jpg diff --git a/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg b/test/jdk/javax/imageio/plugins/jpeg/truncated.jpg similarity index 100% rename from jdk/test/javax/imageio/plugins/jpeg/truncated.jpg rename to test/jdk/javax/imageio/plugins/jpeg/truncated.jpg diff --git a/jdk/test/javax/imageio/plugins/png/CanEncodeShort.java b/test/jdk/javax/imageio/plugins/png/CanEncodeShort.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/CanEncodeShort.java rename to test/jdk/javax/imageio/plugins/png/CanEncodeShort.java diff --git a/jdk/test/javax/imageio/plugins/png/GrayPngTest.java b/test/jdk/javax/imageio/plugins/png/GrayPngTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/GrayPngTest.java rename to test/jdk/javax/imageio/plugins/png/GrayPngTest.java diff --git a/jdk/test/javax/imageio/plugins/png/ITXtTest.java b/test/jdk/javax/imageio/plugins/png/ITXtTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/ITXtTest.java rename to test/jdk/javax/imageio/plugins/png/ITXtTest.java diff --git a/jdk/test/javax/imageio/plugins/png/ImageCompare.java b/test/jdk/javax/imageio/plugins/png/ImageCompare.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/ImageCompare.java rename to test/jdk/javax/imageio/plugins/png/ImageCompare.java diff --git a/jdk/test/javax/imageio/plugins/png/ItxtUtf8Test.java b/test/jdk/javax/imageio/plugins/png/ItxtUtf8Test.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/ItxtUtf8Test.java rename to test/jdk/javax/imageio/plugins/png/ItxtUtf8Test.java diff --git a/jdk/test/javax/imageio/plugins/png/MergeStdCommentTest.java b/test/jdk/javax/imageio/plugins/png/MergeStdCommentTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/MergeStdCommentTest.java rename to test/jdk/javax/imageio/plugins/png/MergeStdCommentTest.java diff --git a/jdk/test/javax/imageio/plugins/png/PngCreationTimeTest.java b/test/jdk/javax/imageio/plugins/png/PngCreationTimeTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/PngCreationTimeTest.java rename to test/jdk/javax/imageio/plugins/png/PngCreationTimeTest.java diff --git a/jdk/test/javax/imageio/plugins/png/PngDitDepthTest.java b/test/jdk/javax/imageio/plugins/png/PngDitDepthTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/PngDitDepthTest.java rename to test/jdk/javax/imageio/plugins/png/PngDitDepthTest.java diff --git a/jdk/test/javax/imageio/plugins/png/PngForceStopWritingTest.java b/test/jdk/javax/imageio/plugins/png/PngForceStopWritingTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/PngForceStopWritingTest.java rename to test/jdk/javax/imageio/plugins/png/PngForceStopWritingTest.java diff --git a/jdk/test/javax/imageio/plugins/png/PngOutputTypeTest.java b/test/jdk/javax/imageio/plugins/png/PngOutputTypeTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/PngOutputTypeTest.java rename to test/jdk/javax/imageio/plugins/png/PngOutputTypeTest.java diff --git a/jdk/test/javax/imageio/plugins/png/PngPremultAlphaTest.java b/test/jdk/javax/imageio/plugins/png/PngPremultAlphaTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/PngPremultAlphaTest.java rename to test/jdk/javax/imageio/plugins/png/PngPremultAlphaTest.java diff --git a/jdk/test/javax/imageio/plugins/png/ReadMalformedPngTest.java b/test/jdk/javax/imageio/plugins/png/ReadMalformedPngTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/ReadMalformedPngTest.java rename to test/jdk/javax/imageio/plugins/png/ReadMalformedPngTest.java diff --git a/jdk/test/javax/imageio/plugins/png/ShortHistogramTest.java b/test/jdk/javax/imageio/plugins/png/ShortHistogramTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/ShortHistogramTest.java rename to test/jdk/javax/imageio/plugins/png/ShortHistogramTest.java diff --git a/jdk/test/javax/imageio/plugins/png/ShortPaletteTest.java b/test/jdk/javax/imageio/plugins/png/ShortPaletteTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/ShortPaletteTest.java rename to test/jdk/javax/imageio/plugins/png/ShortPaletteTest.java diff --git a/jdk/test/javax/imageio/plugins/png/WriteProgressive.java b/test/jdk/javax/imageio/plugins/png/WriteProgressive.java similarity index 100% rename from jdk/test/javax/imageio/plugins/png/WriteProgressive.java rename to test/jdk/javax/imageio/plugins/png/WriteProgressive.java diff --git a/jdk/test/javax/imageio/plugins/png/duke.png b/test/jdk/javax/imageio/plugins/png/duke.png similarity index 100% rename from jdk/test/javax/imageio/plugins/png/duke.png rename to test/jdk/javax/imageio/plugins/png/duke.png diff --git a/jdk/test/javax/imageio/plugins/shared/BitDepth.java b/test/jdk/javax/imageio/plugins/shared/BitDepth.java similarity index 100% rename from jdk/test/javax/imageio/plugins/shared/BitDepth.java rename to test/jdk/javax/imageio/plugins/shared/BitDepth.java diff --git a/jdk/test/javax/imageio/plugins/shared/CanWriteSequence.java b/test/jdk/javax/imageio/plugins/shared/CanWriteSequence.java similarity index 100% rename from jdk/test/javax/imageio/plugins/shared/CanWriteSequence.java rename to test/jdk/javax/imageio/plugins/shared/CanWriteSequence.java diff --git a/jdk/test/javax/imageio/plugins/shared/ImageWriterCompressionTest.java b/test/jdk/javax/imageio/plugins/shared/ImageWriterCompressionTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/shared/ImageWriterCompressionTest.java rename to test/jdk/javax/imageio/plugins/shared/ImageWriterCompressionTest.java diff --git a/jdk/test/javax/imageio/plugins/shared/RepeatingWriteTest.java b/test/jdk/javax/imageio/plugins/shared/RepeatingWriteTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/shared/RepeatingWriteTest.java rename to test/jdk/javax/imageio/plugins/shared/RepeatingWriteTest.java diff --git a/jdk/test/javax/imageio/plugins/shared/WriteAfterAbort.java b/test/jdk/javax/imageio/plugins/shared/WriteAfterAbort.java similarity index 100% rename from jdk/test/javax/imageio/plugins/shared/WriteAfterAbort.java rename to test/jdk/javax/imageio/plugins/shared/WriteAfterAbort.java diff --git a/jdk/test/javax/imageio/plugins/tiff/BogusSecondImageTest.java b/test/jdk/javax/imageio/plugins/tiff/BogusSecondImageTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/BogusSecondImageTest.java rename to test/jdk/javax/imageio/plugins/tiff/BogusSecondImageTest.java diff --git a/jdk/test/javax/imageio/plugins/tiff/IFDTest.java b/test/jdk/javax/imageio/plugins/tiff/IFDTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/IFDTest.java rename to test/jdk/javax/imageio/plugins/tiff/IFDTest.java diff --git a/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java b/test/jdk/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java rename to test/jdk/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java diff --git a/jdk/test/javax/imageio/plugins/tiff/MultiPageTest/MultiPageTest.java b/test/jdk/javax/imageio/plugins/tiff/MultiPageTest/MultiPageTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/MultiPageTest/MultiPageTest.java rename to test/jdk/javax/imageio/plugins/tiff/MultiPageTest/MultiPageTest.java diff --git a/jdk/test/javax/imageio/plugins/tiff/ReadUnknownTagsTest.java b/test/jdk/javax/imageio/plugins/tiff/ReadUnknownTagsTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/ReadUnknownTagsTest.java rename to test/jdk/javax/imageio/plugins/tiff/ReadUnknownTagsTest.java diff --git a/jdk/test/javax/imageio/plugins/tiff/ReadWithoutBaselineTagSet.java b/test/jdk/javax/imageio/plugins/tiff/ReadWithoutBaselineTagSet.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/ReadWithoutBaselineTagSet.java rename to test/jdk/javax/imageio/plugins/tiff/ReadWithoutBaselineTagSet.java diff --git a/jdk/test/javax/imageio/plugins/tiff/TIFFCreateArrayForTypeTest.java b/test/jdk/javax/imageio/plugins/tiff/TIFFCreateArrayForTypeTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/TIFFCreateArrayForTypeTest.java rename to test/jdk/javax/imageio/plugins/tiff/TIFFCreateArrayForTypeTest.java diff --git a/jdk/test/javax/imageio/plugins/tiff/TIFFDirectoryTest.java b/test/jdk/javax/imageio/plugins/tiff/TIFFDirectoryTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/TIFFDirectoryTest.java rename to test/jdk/javax/imageio/plugins/tiff/TIFFDirectoryTest.java diff --git a/jdk/test/javax/imageio/plugins/tiff/TIFFDirectoryWriteReadTest.java b/test/jdk/javax/imageio/plugins/tiff/TIFFDirectoryWriteReadTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/TIFFDirectoryWriteReadTest.java rename to test/jdk/javax/imageio/plugins/tiff/TIFFDirectoryWriteReadTest.java diff --git a/jdk/test/javax/imageio/plugins/tiff/TIFFFieldTest.java b/test/jdk/javax/imageio/plugins/tiff/TIFFFieldTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/TIFFFieldTest.java rename to test/jdk/javax/imageio/plugins/tiff/TIFFFieldTest.java diff --git a/jdk/test/javax/imageio/plugins/tiff/TIFFImageReadParamTest.java b/test/jdk/javax/imageio/plugins/tiff/TIFFImageReadParamTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/TIFFImageReadParamTest.java rename to test/jdk/javax/imageio/plugins/tiff/TIFFImageReadParamTest.java diff --git a/jdk/test/javax/imageio/plugins/tiff/TIFFTagSetTest.java b/test/jdk/javax/imageio/plugins/tiff/TIFFTagSetTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/TIFFTagSetTest.java rename to test/jdk/javax/imageio/plugins/tiff/TIFFTagSetTest.java diff --git a/jdk/test/javax/imageio/plugins/tiff/WriteToSequenceAfterAbort.java b/test/jdk/javax/imageio/plugins/tiff/WriteToSequenceAfterAbort.java similarity index 100% rename from jdk/test/javax/imageio/plugins/tiff/WriteToSequenceAfterAbort.java rename to test/jdk/javax/imageio/plugins/tiff/WriteToSequenceAfterAbort.java diff --git a/jdk/test/javax/imageio/plugins/wbmp/CanDecodeTest.java b/test/jdk/javax/imageio/plugins/wbmp/CanDecodeTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/wbmp/CanDecodeTest.java rename to test/jdk/javax/imageio/plugins/wbmp/CanDecodeTest.java diff --git a/jdk/test/javax/imageio/plugins/wbmp/EmptyInputWbmpMetadataTest.java b/test/jdk/javax/imageio/plugins/wbmp/EmptyInputWbmpMetadataTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/wbmp/EmptyInputWbmpMetadataTest.java rename to test/jdk/javax/imageio/plugins/wbmp/EmptyInputWbmpMetadataTest.java diff --git a/jdk/test/javax/imageio/plugins/wbmp/GetImageTypesTest.java b/test/jdk/javax/imageio/plugins/wbmp/GetImageTypesTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/wbmp/GetImageTypesTest.java rename to test/jdk/javax/imageio/plugins/wbmp/GetImageTypesTest.java diff --git a/jdk/test/javax/imageio/plugins/wbmp/StreamResetTest.java b/test/jdk/javax/imageio/plugins/wbmp/StreamResetTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/wbmp/StreamResetTest.java rename to test/jdk/javax/imageio/plugins/wbmp/StreamResetTest.java diff --git a/jdk/test/javax/imageio/plugins/wbmp/ValidWbmpTest.java b/test/jdk/javax/imageio/plugins/wbmp/ValidWbmpTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/wbmp/ValidWbmpTest.java rename to test/jdk/javax/imageio/plugins/wbmp/ValidWbmpTest.java diff --git a/jdk/test/javax/imageio/plugins/wbmp/WBMPPluginTest.java b/test/jdk/javax/imageio/plugins/wbmp/WBMPPluginTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/wbmp/WBMPPluginTest.java rename to test/jdk/javax/imageio/plugins/wbmp/WBMPPluginTest.java diff --git a/jdk/test/javax/imageio/plugins/wbmp/WbmpBigDestinationTest.java b/test/jdk/javax/imageio/plugins/wbmp/WbmpBigDestinationTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/wbmp/WbmpBigDestinationTest.java rename to test/jdk/javax/imageio/plugins/wbmp/WbmpBigDestinationTest.java diff --git a/jdk/test/javax/imageio/plugins/wbmp/WbmpDefaultImageMetadataTest.java b/test/jdk/javax/imageio/plugins/wbmp/WbmpDefaultImageMetadataTest.java similarity index 100% rename from jdk/test/javax/imageio/plugins/wbmp/WbmpDefaultImageMetadataTest.java rename to test/jdk/javax/imageio/plugins/wbmp/WbmpDefaultImageMetadataTest.java diff --git a/jdk/test/javax/imageio/spi/AppletContextTest/BadPluginConfigurationTest.sh b/test/jdk/javax/imageio/spi/AppletContextTest/BadPluginConfigurationTest.sh similarity index 100% rename from jdk/test/javax/imageio/spi/AppletContextTest/BadPluginConfigurationTest.sh rename to test/jdk/javax/imageio/spi/AppletContextTest/BadPluginConfigurationTest.sh diff --git a/jdk/test/javax/imageio/spi/AppletContextTest/DummyReaderPluginSpi.java b/test/jdk/javax/imageio/spi/AppletContextTest/DummyReaderPluginSpi.java similarity index 100% rename from jdk/test/javax/imageio/spi/AppletContextTest/DummyReaderPluginSpi.java rename to test/jdk/javax/imageio/spi/AppletContextTest/DummyReaderPluginSpi.java diff --git a/jdk/test/javax/imageio/spi/AppletContextTest/IIOPluginTest.java b/test/jdk/javax/imageio/spi/AppletContextTest/IIOPluginTest.java similarity index 100% rename from jdk/test/javax/imageio/spi/AppletContextTest/IIOPluginTest.java rename to test/jdk/javax/imageio/spi/AppletContextTest/IIOPluginTest.java diff --git a/jdk/test/javax/imageio/spi/CreateMemoryCacheOutputStream.java b/test/jdk/javax/imageio/spi/CreateMemoryCacheOutputStream.java similarity index 100% rename from jdk/test/javax/imageio/spi/CreateMemoryCacheOutputStream.java rename to test/jdk/javax/imageio/spi/CreateMemoryCacheOutputStream.java diff --git a/jdk/test/javax/imageio/spi/DeregisterAllSpiTest.java b/test/jdk/javax/imageio/spi/DeregisterAllSpiTest.java similarity index 100% rename from jdk/test/javax/imageio/spi/DeregisterAllSpiTest.java rename to test/jdk/javax/imageio/spi/DeregisterAllSpiTest.java diff --git a/jdk/test/javax/imageio/spi/DeregisterOrderedSpiTest.java b/test/jdk/javax/imageio/spi/DeregisterOrderedSpiTest.java similarity index 100% rename from jdk/test/javax/imageio/spi/DeregisterOrderedSpiTest.java rename to test/jdk/javax/imageio/spi/DeregisterOrderedSpiTest.java diff --git a/jdk/test/javax/imageio/spi/MarkTryFinallyReproducer.java b/test/jdk/javax/imageio/spi/MarkTryFinallyReproducer.java similarity index 100% rename from jdk/test/javax/imageio/spi/MarkTryFinallyReproducer.java rename to test/jdk/javax/imageio/spi/MarkTryFinallyReproducer.java diff --git a/jdk/test/javax/imageio/spi/OrderingTest.java b/test/jdk/javax/imageio/spi/OrderingTest.java similarity index 100% rename from jdk/test/javax/imageio/spi/OrderingTest.java rename to test/jdk/javax/imageio/spi/OrderingTest.java diff --git a/jdk/test/javax/imageio/spi/PluginSpiTest.java b/test/jdk/javax/imageio/spi/PluginSpiTest.java similarity index 100% rename from jdk/test/javax/imageio/spi/PluginSpiTest.java rename to test/jdk/javax/imageio/spi/PluginSpiTest.java diff --git a/jdk/test/javax/imageio/spi/RegisterPluginTwiceTest.java b/test/jdk/javax/imageio/spi/RegisterPluginTwiceTest.java similarity index 100% rename from jdk/test/javax/imageio/spi/RegisterPluginTwiceTest.java rename to test/jdk/javax/imageio/spi/RegisterPluginTwiceTest.java diff --git a/jdk/test/javax/imageio/spi/ServiceRegistryRestriction.java b/test/jdk/javax/imageio/spi/ServiceRegistryRestriction.java similarity index 100% rename from jdk/test/javax/imageio/spi/ServiceRegistryRestriction.java rename to test/jdk/javax/imageio/spi/ServiceRegistryRestriction.java diff --git a/jdk/test/javax/imageio/spi/ServiceRegistrySyncTest.java b/test/jdk/javax/imageio/spi/ServiceRegistrySyncTest.java similarity index 100% rename from jdk/test/javax/imageio/spi/ServiceRegistrySyncTest.java rename to test/jdk/javax/imageio/spi/ServiceRegistrySyncTest.java diff --git a/jdk/test/javax/imageio/spi/SpiTest.java b/test/jdk/javax/imageio/spi/SpiTest.java similarity index 100% rename from jdk/test/javax/imageio/spi/SpiTest.java rename to test/jdk/javax/imageio/spi/SpiTest.java diff --git a/jdk/test/javax/imageio/spi/SpiVersionNumbers.java b/test/jdk/javax/imageio/spi/SpiVersionNumbers.java similarity index 100% rename from jdk/test/javax/imageio/spi/SpiVersionNumbers.java rename to test/jdk/javax/imageio/spi/SpiVersionNumbers.java diff --git a/jdk/test/javax/imageio/stream/BitPadding.java b/test/jdk/javax/imageio/stream/BitPadding.java similarity index 100% rename from jdk/test/javax/imageio/stream/BitPadding.java rename to test/jdk/javax/imageio/stream/BitPadding.java diff --git a/jdk/test/javax/imageio/stream/DeleteOnExitTest.java b/test/jdk/javax/imageio/stream/DeleteOnExitTest.java similarity index 100% rename from jdk/test/javax/imageio/stream/DeleteOnExitTest.java rename to test/jdk/javax/imageio/stream/DeleteOnExitTest.java diff --git a/jdk/test/javax/imageio/stream/DeleteOnExitTest.sh b/test/jdk/javax/imageio/stream/DeleteOnExitTest.sh similarity index 100% rename from jdk/test/javax/imageio/stream/DeleteOnExitTest.sh rename to test/jdk/javax/imageio/stream/DeleteOnExitTest.sh diff --git a/jdk/test/javax/imageio/stream/FileCacheImageInputStreamNullTest.java b/test/jdk/javax/imageio/stream/FileCacheImageInputStreamNullTest.java similarity index 100% rename from jdk/test/javax/imageio/stream/FileCacheImageInputStreamNullTest.java rename to test/jdk/javax/imageio/stream/FileCacheImageInputStreamNullTest.java diff --git a/jdk/test/javax/imageio/stream/FlushBefore.java b/test/jdk/javax/imageio/stream/FlushBefore.java similarity index 100% rename from jdk/test/javax/imageio/stream/FlushBefore.java rename to test/jdk/javax/imageio/stream/FlushBefore.java diff --git a/jdk/test/javax/imageio/stream/MemoryCacheImageOutputStreamTest.java b/test/jdk/javax/imageio/stream/MemoryCacheImageOutputStreamTest.java similarity index 100% rename from jdk/test/javax/imageio/stream/MemoryCacheImageOutputStreamTest.java rename to test/jdk/javax/imageio/stream/MemoryCacheImageOutputStreamTest.java diff --git a/jdk/test/javax/imageio/stream/NullStreamCheckTest.java b/test/jdk/javax/imageio/stream/NullStreamCheckTest.java similarity index 100% rename from jdk/test/javax/imageio/stream/NullStreamCheckTest.java rename to test/jdk/javax/imageio/stream/NullStreamCheckTest.java diff --git a/jdk/test/javax/imageio/stream/ReadBytesIIOByteBuffer.java b/test/jdk/javax/imageio/stream/ReadBytesIIOByteBuffer.java similarity index 100% rename from jdk/test/javax/imageio/stream/ReadBytesIIOByteBuffer.java rename to test/jdk/javax/imageio/stream/ReadBytesIIOByteBuffer.java diff --git a/jdk/test/javax/imageio/stream/ReadFullyTest.java b/test/jdk/javax/imageio/stream/ReadFullyTest.java similarity index 100% rename from jdk/test/javax/imageio/stream/ReadFullyTest.java rename to test/jdk/javax/imageio/stream/ReadFullyTest.java diff --git a/jdk/test/javax/imageio/stream/ReadUnsignedIntTest.java b/test/jdk/javax/imageio/stream/ReadUnsignedIntTest.java similarity index 100% rename from jdk/test/javax/imageio/stream/ReadUnsignedIntTest.java rename to test/jdk/javax/imageio/stream/ReadUnsignedIntTest.java diff --git a/jdk/test/javax/imageio/stream/ShortStreamTest.java b/test/jdk/javax/imageio/stream/ShortStreamTest.java similarity index 100% rename from jdk/test/javax/imageio/stream/ShortStreamTest.java rename to test/jdk/javax/imageio/stream/ShortStreamTest.java diff --git a/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh b/test/jdk/javax/imageio/stream/StreamCloserLeak/run_test.sh similarity index 100% rename from jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh rename to test/jdk/javax/imageio/stream/StreamCloserLeak/run_test.sh diff --git a/jdk/test/javax/imageio/stream/StreamCloserLeak/test/Main.java b/test/jdk/javax/imageio/stream/StreamCloserLeak/test/Main.java similarity index 100% rename from jdk/test/javax/imageio/stream/StreamCloserLeak/test/Main.java rename to test/jdk/javax/imageio/stream/StreamCloserLeak/test/Main.java diff --git a/jdk/test/javax/imageio/stream/StreamCloserLeak/testapp/Main.java b/test/jdk/javax/imageio/stream/StreamCloserLeak/testapp/Main.java similarity index 100% rename from jdk/test/javax/imageio/stream/StreamCloserLeak/testapp/Main.java rename to test/jdk/javax/imageio/stream/StreamCloserLeak/testapp/Main.java diff --git a/jdk/test/javax/imageio/stream/StreamFlush.java b/test/jdk/javax/imageio/stream/StreamFlush.java similarity index 100% rename from jdk/test/javax/imageio/stream/StreamFlush.java rename to test/jdk/javax/imageio/stream/StreamFlush.java diff --git a/jdk/test/javax/imageio/stream/WriteBitsTest.java b/test/jdk/javax/imageio/stream/WriteBitsTest.java similarity index 100% rename from jdk/test/javax/imageio/stream/WriteBitsTest.java rename to test/jdk/javax/imageio/stream/WriteBitsTest.java diff --git a/jdk/test/javax/management/ImplementationVersion/ImplVersionCommand.java b/test/jdk/javax/management/ImplementationVersion/ImplVersionCommand.java similarity index 100% rename from jdk/test/javax/management/ImplementationVersion/ImplVersionCommand.java rename to test/jdk/javax/management/ImplementationVersion/ImplVersionCommand.java diff --git a/jdk/test/javax/management/ImplementationVersion/ImplVersionReader.java b/test/jdk/javax/management/ImplementationVersion/ImplVersionReader.java similarity index 100% rename from jdk/test/javax/management/ImplementationVersion/ImplVersionReader.java rename to test/jdk/javax/management/ImplementationVersion/ImplVersionReader.java diff --git a/jdk/test/javax/management/ImplementationVersion/ImplVersionTest.java b/test/jdk/javax/management/ImplementationVersion/ImplVersionTest.java similarity index 100% rename from jdk/test/javax/management/ImplementationVersion/ImplVersionTest.java rename to test/jdk/javax/management/ImplementationVersion/ImplVersionTest.java diff --git a/jdk/test/javax/management/ImplementationVersion/policy b/test/jdk/javax/management/ImplementationVersion/policy similarity index 100% rename from jdk/test/javax/management/ImplementationVersion/policy rename to test/jdk/javax/management/ImplementationVersion/policy diff --git a/jdk/test/javax/management/Introspector/AnnotationSecurityTest.java b/test/jdk/javax/management/Introspector/AnnotationSecurityTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/AnnotationSecurityTest.java rename to test/jdk/javax/management/Introspector/AnnotationSecurityTest.java diff --git a/jdk/test/javax/management/Introspector/AnnotationSecurityTest.policy b/test/jdk/javax/management/Introspector/AnnotationSecurityTest.policy similarity index 100% rename from jdk/test/javax/management/Introspector/AnnotationSecurityTest.policy rename to test/jdk/javax/management/Introspector/AnnotationSecurityTest.policy diff --git a/jdk/test/javax/management/Introspector/AnnotationTest.java b/test/jdk/javax/management/Introspector/AnnotationTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/AnnotationTest.java rename to test/jdk/javax/management/Introspector/AnnotationTest.java diff --git a/jdk/test/javax/management/Introspector/ChangingNotifsTest.java b/test/jdk/javax/management/Introspector/ChangingNotifsTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/ChangingNotifsTest.java rename to test/jdk/javax/management/Introspector/ChangingNotifsTest.java diff --git a/jdk/test/javax/management/Introspector/ClassLeakTest.java b/test/jdk/javax/management/Introspector/ClassLeakTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/ClassLeakTest.java rename to test/jdk/javax/management/Introspector/ClassLeakTest.java diff --git a/jdk/test/javax/management/Introspector/Described.java b/test/jdk/javax/management/Introspector/Described.java similarity index 100% rename from jdk/test/javax/management/Introspector/Described.java rename to test/jdk/javax/management/Introspector/Described.java diff --git a/jdk/test/javax/management/Introspector/DescribedMBean.java b/test/jdk/javax/management/Introspector/DescribedMBean.java similarity index 100% rename from jdk/test/javax/management/Introspector/DescribedMBean.java rename to test/jdk/javax/management/Introspector/DescribedMBean.java diff --git a/jdk/test/javax/management/Introspector/DescribedMX.java b/test/jdk/javax/management/Introspector/DescribedMX.java similarity index 100% rename from jdk/test/javax/management/Introspector/DescribedMX.java rename to test/jdk/javax/management/Introspector/DescribedMX.java diff --git a/jdk/test/javax/management/Introspector/DescribedMXBean.java b/test/jdk/javax/management/Introspector/DescribedMXBean.java similarity index 100% rename from jdk/test/javax/management/Introspector/DescribedMXBean.java rename to test/jdk/javax/management/Introspector/DescribedMXBean.java diff --git a/jdk/test/javax/management/Introspector/DuplicateGetterTest.java b/test/jdk/javax/management/Introspector/DuplicateGetterTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/DuplicateGetterTest.java rename to test/jdk/javax/management/Introspector/DuplicateGetterTest.java diff --git a/jdk/test/javax/management/Introspector/FeatureOrderTest.java b/test/jdk/javax/management/Introspector/FeatureOrderTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/FeatureOrderTest.java rename to test/jdk/javax/management/Introspector/FeatureOrderTest.java diff --git a/jdk/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java b/test/jdk/javax/management/Introspector/GetMBeanInfoExceptionTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java rename to test/jdk/javax/management/Introspector/GetMBeanInfoExceptionTest.java diff --git a/jdk/test/javax/management/Introspector/IdenticalMBeanInfoTest.java b/test/jdk/javax/management/Introspector/IdenticalMBeanInfoTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/IdenticalMBeanInfoTest.java rename to test/jdk/javax/management/Introspector/IdenticalMBeanInfoTest.java diff --git a/jdk/test/javax/management/Introspector/ImmutableNotificationInfoTest.java b/test/jdk/javax/management/Introspector/ImmutableNotificationInfoTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/ImmutableNotificationInfoTest.java rename to test/jdk/javax/management/Introspector/ImmutableNotificationInfoTest.java diff --git a/jdk/test/javax/management/Introspector/InvokeGettersTest.java b/test/jdk/javax/management/Introspector/InvokeGettersTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/InvokeGettersTest.java rename to test/jdk/javax/management/Introspector/InvokeGettersTest.java diff --git a/jdk/test/javax/management/Introspector/IsMethodTest.java b/test/jdk/javax/management/Introspector/IsMethodTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/IsMethodTest.java rename to test/jdk/javax/management/Introspector/IsMethodTest.java diff --git a/jdk/test/javax/management/Introspector/LegacyConstructorPropertiesTest.java b/test/jdk/javax/management/Introspector/LegacyConstructorPropertiesTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/LegacyConstructorPropertiesTest.java rename to test/jdk/javax/management/Introspector/LegacyConstructorPropertiesTest.java diff --git a/jdk/test/javax/management/Introspector/NotAnMBeanTest.java b/test/jdk/javax/management/Introspector/NotAnMBeanTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/NotAnMBeanTest.java rename to test/jdk/javax/management/Introspector/NotAnMBeanTest.java diff --git a/jdk/test/javax/management/Introspector/NotCompliantCauseTest.java b/test/jdk/javax/management/Introspector/NotCompliantCauseTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/NotCompliantCauseTest.java rename to test/jdk/javax/management/Introspector/NotCompliantCauseTest.java diff --git a/jdk/test/javax/management/Introspector/SetWrongTypeAttributeTest.java b/test/jdk/javax/management/Introspector/SetWrongTypeAttributeTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/SetWrongTypeAttributeTest.java rename to test/jdk/javax/management/Introspector/SetWrongTypeAttributeTest.java diff --git a/jdk/test/javax/management/Introspector/SqeDescriptorKey.java b/test/jdk/javax/management/Introspector/SqeDescriptorKey.java similarity index 100% rename from jdk/test/javax/management/Introspector/SqeDescriptorKey.java rename to test/jdk/javax/management/Introspector/SqeDescriptorKey.java diff --git a/jdk/test/javax/management/Introspector/UnDescribed.java b/test/jdk/javax/management/Introspector/UnDescribed.java similarity index 100% rename from jdk/test/javax/management/Introspector/UnDescribed.java rename to test/jdk/javax/management/Introspector/UnDescribed.java diff --git a/jdk/test/javax/management/Introspector/UnDescribedMBean.java b/test/jdk/javax/management/Introspector/UnDescribedMBean.java similarity index 100% rename from jdk/test/javax/management/Introspector/UnDescribedMBean.java rename to test/jdk/javax/management/Introspector/UnDescribedMBean.java diff --git a/jdk/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java b/test/jdk/javax/management/Introspector/UnregisterMBeanExceptionTest.java similarity index 100% rename from jdk/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java rename to test/jdk/javax/management/Introspector/UnregisterMBeanExceptionTest.java diff --git a/jdk/test/javax/management/Introspector/annot/Name.java b/test/jdk/javax/management/Introspector/annot/Name.java similarity index 100% rename from jdk/test/javax/management/Introspector/annot/Name.java rename to test/jdk/javax/management/Introspector/annot/Name.java diff --git a/jdk/test/javax/management/MBeanInfo/EqualExceptionTest.java b/test/jdk/javax/management/MBeanInfo/EqualExceptionTest.java similarity index 100% rename from jdk/test/javax/management/MBeanInfo/EqualExceptionTest.java rename to test/jdk/javax/management/MBeanInfo/EqualExceptionTest.java diff --git a/jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java b/test/jdk/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java similarity index 100% rename from jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java rename to test/jdk/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java diff --git a/jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java b/test/jdk/javax/management/MBeanInfo/MBeanInfoEqualsTest.java similarity index 100% rename from jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java rename to test/jdk/javax/management/MBeanInfo/MBeanInfoEqualsTest.java diff --git a/jdk/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java b/test/jdk/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java similarity index 100% rename from jdk/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java rename to test/jdk/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java diff --git a/jdk/test/javax/management/MBeanInfo/NotificationInfoTest.java b/test/jdk/javax/management/MBeanInfo/NotificationInfoTest.java similarity index 100% rename from jdk/test/javax/management/MBeanInfo/NotificationInfoTest.java rename to test/jdk/javax/management/MBeanInfo/NotificationInfoTest.java diff --git a/jdk/test/javax/management/MBeanInfo/NullInfoArraysTest.java b/test/jdk/javax/management/MBeanInfo/NullInfoArraysTest.java similarity index 100% rename from jdk/test/javax/management/MBeanInfo/NullInfoArraysTest.java rename to test/jdk/javax/management/MBeanInfo/NullInfoArraysTest.java diff --git a/jdk/test/javax/management/MBeanInfo/SerializationTest.java b/test/jdk/javax/management/MBeanInfo/SerializationTest.java similarity index 100% rename from jdk/test/javax/management/MBeanInfo/SerializationTest.java rename to test/jdk/javax/management/MBeanInfo/SerializationTest.java diff --git a/jdk/test/javax/management/MBeanInfo/SerializationTest1.java b/test/jdk/javax/management/MBeanInfo/SerializationTest1.java similarity index 100% rename from jdk/test/javax/management/MBeanInfo/SerializationTest1.java rename to test/jdk/javax/management/MBeanInfo/SerializationTest1.java diff --git a/jdk/test/javax/management/MBeanInfo/SerializedMBeanInfo.java b/test/jdk/javax/management/MBeanInfo/SerializedMBeanInfo.java similarity index 100% rename from jdk/test/javax/management/MBeanInfo/SerializedMBeanInfo.java rename to test/jdk/javax/management/MBeanInfo/SerializedMBeanInfo.java diff --git a/jdk/test/javax/management/MBeanInfo/TooManyFooTest.java b/test/jdk/javax/management/MBeanInfo/TooManyFooTest.java similarity index 100% rename from jdk/test/javax/management/MBeanInfo/TooManyFooTest.java rename to test/jdk/javax/management/MBeanInfo/TooManyFooTest.java diff --git a/jdk/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java b/test/jdk/javax/management/MBeanServer/AttributeListTypeSafeTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java rename to test/jdk/javax/management/MBeanServer/AttributeListTypeSafeTest.java diff --git a/jdk/test/javax/management/MBeanServer/ExceptionFactory.java b/test/jdk/javax/management/MBeanServer/ExceptionFactory.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/ExceptionFactory.java rename to test/jdk/javax/management/MBeanServer/ExceptionFactory.java diff --git a/jdk/test/javax/management/MBeanServer/ExceptionTest.java b/test/jdk/javax/management/MBeanServer/ExceptionTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/ExceptionTest.java rename to test/jdk/javax/management/MBeanServer/ExceptionTest.java diff --git a/jdk/test/javax/management/MBeanServer/ExceptionThrower.java b/test/jdk/javax/management/MBeanServer/ExceptionThrower.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/ExceptionThrower.java rename to test/jdk/javax/management/MBeanServer/ExceptionThrower.java diff --git a/jdk/test/javax/management/MBeanServer/ExceptionThrowerMBean.java b/test/jdk/javax/management/MBeanServer/ExceptionThrowerMBean.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/ExceptionThrowerMBean.java rename to test/jdk/javax/management/MBeanServer/ExceptionThrowerMBean.java diff --git a/jdk/test/javax/management/MBeanServer/MBeanExceptionTest.java b/test/jdk/javax/management/MBeanServer/MBeanExceptionTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/MBeanExceptionTest.java rename to test/jdk/javax/management/MBeanServer/MBeanExceptionTest.java diff --git a/jdk/test/javax/management/MBeanServer/MBeanFallbackTest.java b/test/jdk/javax/management/MBeanServer/MBeanFallbackTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/MBeanFallbackTest.java rename to test/jdk/javax/management/MBeanServer/MBeanFallbackTest.java diff --git a/jdk/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java b/test/jdk/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java rename to test/jdk/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java diff --git a/jdk/test/javax/management/MBeanServer/MBeanServerNotificationTest.java b/test/jdk/javax/management/MBeanServer/MBeanServerNotificationTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/MBeanServerNotificationTest.java rename to test/jdk/javax/management/MBeanServer/MBeanServerNotificationTest.java diff --git a/jdk/test/javax/management/MBeanServer/MBeanTest.java b/test/jdk/javax/management/MBeanServer/MBeanTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/MBeanTest.java rename to test/jdk/javax/management/MBeanServer/MBeanTest.java diff --git a/jdk/test/javax/management/MBeanServer/NewMBeanListenerTest.java b/test/jdk/javax/management/MBeanServer/NewMBeanListenerTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/NewMBeanListenerTest.java rename to test/jdk/javax/management/MBeanServer/NewMBeanListenerTest.java diff --git a/jdk/test/javax/management/MBeanServer/NotifDeadlockTest.java b/test/jdk/javax/management/MBeanServer/NotifDeadlockTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/NotifDeadlockTest.java rename to test/jdk/javax/management/MBeanServer/NotifDeadlockTest.java diff --git a/jdk/test/javax/management/MBeanServer/OldMBeanServerTest.java b/test/jdk/javax/management/MBeanServer/OldMBeanServerTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/OldMBeanServerTest.java rename to test/jdk/javax/management/MBeanServer/OldMBeanServerTest.java diff --git a/jdk/test/javax/management/MBeanServer/PostExceptionTest.java b/test/jdk/javax/management/MBeanServer/PostExceptionTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/PostExceptionTest.java rename to test/jdk/javax/management/MBeanServer/PostExceptionTest.java diff --git a/jdk/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java b/test/jdk/javax/management/MBeanServer/PostRegisterDeadlockTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java rename to test/jdk/javax/management/MBeanServer/PostRegisterDeadlockTest.java diff --git a/jdk/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java b/test/jdk/javax/management/MBeanServer/PostRegisterDeadlockTest2.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java rename to test/jdk/javax/management/MBeanServer/PostRegisterDeadlockTest2.java diff --git a/jdk/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java b/test/jdk/javax/management/MBeanServer/PreDeregisterDeadlockTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java rename to test/jdk/javax/management/MBeanServer/PreDeregisterDeadlockTest.java diff --git a/jdk/test/javax/management/MBeanServer/PreRegisterTest.java b/test/jdk/javax/management/MBeanServer/PreRegisterTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServer/PreRegisterTest.java rename to test/jdk/javax/management/MBeanServer/PreRegisterTest.java diff --git a/jdk/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java b/test/jdk/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java similarity index 100% rename from jdk/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java rename to test/jdk/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java diff --git a/jdk/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java b/test/jdk/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java similarity index 100% rename from jdk/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java rename to test/jdk/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java diff --git a/jdk/test/javax/management/MustBeValidMBeanInfo/logging.properties b/test/jdk/javax/management/MustBeValidMBeanInfo/logging.properties similarity index 100% rename from jdk/test/javax/management/MustBeValidMBeanInfo/logging.properties rename to test/jdk/javax/management/MustBeValidMBeanInfo/logging.properties diff --git a/jdk/test/javax/management/ObjectInstance/MBeanInfoFailTest.java b/test/jdk/javax/management/ObjectInstance/MBeanInfoFailTest.java similarity index 100% rename from jdk/test/javax/management/ObjectInstance/MBeanInfoFailTest.java rename to test/jdk/javax/management/ObjectInstance/MBeanInfoFailTest.java diff --git a/jdk/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java b/test/jdk/javax/management/ObjectInstance/ObjectInstanceNullTest.java similarity index 100% rename from jdk/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java rename to test/jdk/javax/management/ObjectInstance/ObjectInstanceNullTest.java diff --git a/jdk/test/javax/management/ObjectInstance/ToStringMethodTest.java b/test/jdk/javax/management/ObjectInstance/ToStringMethodTest.java similarity index 100% rename from jdk/test/javax/management/ObjectInstance/ToStringMethodTest.java rename to test/jdk/javax/management/ObjectInstance/ToStringMethodTest.java diff --git a/jdk/test/javax/management/ObjectName/ApplyWildcardTest.java b/test/jdk/javax/management/ObjectName/ApplyWildcardTest.java similarity index 100% rename from jdk/test/javax/management/ObjectName/ApplyWildcardTest.java rename to test/jdk/javax/management/ObjectName/ApplyWildcardTest.java diff --git a/jdk/test/javax/management/ObjectName/ComparatorTest.java b/test/jdk/javax/management/ObjectName/ComparatorTest.java similarity index 100% rename from jdk/test/javax/management/ObjectName/ComparatorTest.java rename to test/jdk/javax/management/ObjectName/ComparatorTest.java diff --git a/jdk/test/javax/management/ObjectName/CompressedStorageTest.java b/test/jdk/javax/management/ObjectName/CompressedStorageTest.java similarity index 100% rename from jdk/test/javax/management/ObjectName/CompressedStorageTest.java rename to test/jdk/javax/management/ObjectName/CompressedStorageTest.java diff --git a/jdk/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java b/test/jdk/javax/management/ObjectName/DelegateNameWildcardNameTest.java similarity index 100% rename from jdk/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java rename to test/jdk/javax/management/ObjectName/DelegateNameWildcardNameTest.java diff --git a/jdk/test/javax/management/ObjectName/NullEmptyKeyValueTest.java b/test/jdk/javax/management/ObjectName/NullEmptyKeyValueTest.java similarity index 100% rename from jdk/test/javax/management/ObjectName/NullEmptyKeyValueTest.java rename to test/jdk/javax/management/ObjectName/NullEmptyKeyValueTest.java diff --git a/jdk/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java b/test/jdk/javax/management/ObjectName/ObjectNameGetInstanceTest.java similarity index 100% rename from jdk/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java rename to test/jdk/javax/management/ObjectName/ObjectNameGetInstanceTest.java diff --git a/jdk/test/javax/management/ObjectName/RepositoryWildcardTest.java b/test/jdk/javax/management/ObjectName/RepositoryWildcardTest.java similarity index 100% rename from jdk/test/javax/management/ObjectName/RepositoryWildcardTest.java rename to test/jdk/javax/management/ObjectName/RepositoryWildcardTest.java diff --git a/jdk/test/javax/management/ObjectName/SerialCompatTest.java b/test/jdk/javax/management/ObjectName/SerialCompatTest.java similarity index 100% rename from jdk/test/javax/management/ObjectName/SerialCompatTest.java rename to test/jdk/javax/management/ObjectName/SerialCompatTest.java diff --git a/jdk/test/javax/management/ObjectName/ValueWildcardTest.java b/test/jdk/javax/management/ObjectName/ValueWildcardTest.java similarity index 100% rename from jdk/test/javax/management/ObjectName/ValueWildcardTest.java rename to test/jdk/javax/management/ObjectName/ValueWildcardTest.java diff --git a/jdk/test/javax/management/TEST.properties b/test/jdk/javax/management/TEST.properties similarity index 100% rename from jdk/test/javax/management/TEST.properties rename to test/jdk/javax/management/TEST.properties diff --git a/jdk/test/javax/management/descriptor/DefaultDescriptorTest.java b/test/jdk/javax/management/descriptor/DefaultDescriptorTest.java similarity index 100% rename from jdk/test/javax/management/descriptor/DefaultDescriptorTest.java rename to test/jdk/javax/management/descriptor/DefaultDescriptorTest.java diff --git a/jdk/test/javax/management/descriptor/DescriptorTest.java b/test/jdk/javax/management/descriptor/DescriptorTest.java similarity index 100% rename from jdk/test/javax/management/descriptor/DescriptorTest.java rename to test/jdk/javax/management/descriptor/DescriptorTest.java diff --git a/jdk/test/javax/management/descriptor/EqualsHashCodeTest.java b/test/jdk/javax/management/descriptor/EqualsHashCodeTest.java similarity index 100% rename from jdk/test/javax/management/descriptor/EqualsHashCodeTest.java rename to test/jdk/javax/management/descriptor/EqualsHashCodeTest.java diff --git a/jdk/test/javax/management/descriptor/ImmutableArrayFieldTest.java b/test/jdk/javax/management/descriptor/ImmutableArrayFieldTest.java similarity index 100% rename from jdk/test/javax/management/descriptor/ImmutableArrayFieldTest.java rename to test/jdk/javax/management/descriptor/ImmutableArrayFieldTest.java diff --git a/jdk/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java b/test/jdk/javax/management/descriptor/ImmutableDescriptorSerialTest.java similarity index 100% rename from jdk/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java rename to test/jdk/javax/management/descriptor/ImmutableDescriptorSerialTest.java diff --git a/jdk/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java b/test/jdk/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java similarity index 100% rename from jdk/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java rename to test/jdk/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java diff --git a/jdk/test/javax/management/descriptor/MBeanInfoInteropTest.java b/test/jdk/javax/management/descriptor/MBeanInfoInteropTest.java similarity index 100% rename from jdk/test/javax/management/descriptor/MBeanInfoInteropTest.java rename to test/jdk/javax/management/descriptor/MBeanInfoInteropTest.java diff --git a/jdk/test/javax/management/descriptor/SerializedInfo.java b/test/jdk/javax/management/descriptor/SerializedInfo.java similarity index 100% rename from jdk/test/javax/management/descriptor/SerializedInfo.java rename to test/jdk/javax/management/descriptor/SerializedInfo.java diff --git a/jdk/test/javax/management/descriptor/UnionTest.java b/test/jdk/javax/management/descriptor/UnionTest.java similarity index 100% rename from jdk/test/javax/management/descriptor/UnionTest.java rename to test/jdk/javax/management/descriptor/UnionTest.java diff --git a/jdk/test/javax/management/generified/GenericTest.java b/test/jdk/javax/management/generified/GenericTest.java similarity index 100% rename from jdk/test/javax/management/generified/GenericTest.java rename to test/jdk/javax/management/generified/GenericTest.java diff --git a/jdk/test/javax/management/generified/ListTypeCheckTest.java b/test/jdk/javax/management/generified/ListTypeCheckTest.java similarity index 100% rename from jdk/test/javax/management/generified/ListTypeCheckTest.java rename to test/jdk/javax/management/generified/ListTypeCheckTest.java diff --git a/jdk/test/javax/management/loading/ArrayClassTest.java b/test/jdk/javax/management/loading/ArrayClassTest.java similarity index 100% rename from jdk/test/javax/management/loading/ArrayClassTest.java rename to test/jdk/javax/management/loading/ArrayClassTest.java diff --git a/jdk/test/javax/management/loading/DocumentRootTest.java b/test/jdk/javax/management/loading/DocumentRootTest.java similarity index 100% rename from jdk/test/javax/management/loading/DocumentRootTest.java rename to test/jdk/javax/management/loading/DocumentRootTest.java diff --git a/jdk/test/javax/management/loading/GetMBeansFromURLTest.java b/test/jdk/javax/management/loading/GetMBeansFromURLTest.java similarity index 100% rename from jdk/test/javax/management/loading/GetMBeansFromURLTest.java rename to test/jdk/javax/management/loading/GetMBeansFromURLTest.java diff --git a/jdk/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java b/test/jdk/javax/management/loading/LibraryLoader/LibraryLoaderTest.java similarity index 100% rename from jdk/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java rename to test/jdk/javax/management/loading/LibraryLoader/LibraryLoaderTest.java diff --git a/jdk/test/javax/management/loading/LibraryLoader/UseNativeLib0.html b/test/jdk/javax/management/loading/LibraryLoader/UseNativeLib0.html similarity index 100% rename from jdk/test/javax/management/loading/LibraryLoader/UseNativeLib0.html rename to test/jdk/javax/management/loading/LibraryLoader/UseNativeLib0.html diff --git a/jdk/test/javax/management/loading/LibraryLoader/UseNativeLib1.html b/test/jdk/javax/management/loading/LibraryLoader/UseNativeLib1.html similarity index 100% rename from jdk/test/javax/management/loading/LibraryLoader/UseNativeLib1.html rename to test/jdk/javax/management/loading/LibraryLoader/UseNativeLib1.html diff --git a/jdk/test/javax/management/loading/LibraryLoader/jar_src/RandomGen.c b/test/jdk/javax/management/loading/LibraryLoader/jar_src/RandomGen.c similarity index 100% rename from jdk/test/javax/management/loading/LibraryLoader/jar_src/RandomGen.c rename to test/jdk/javax/management/loading/LibraryLoader/jar_src/RandomGen.c diff --git a/jdk/test/javax/management/loading/LibraryLoader/jar_src/RandomGen.h b/test/jdk/javax/management/loading/LibraryLoader/jar_src/RandomGen.h similarity index 100% rename from jdk/test/javax/management/loading/LibraryLoader/jar_src/RandomGen.h rename to test/jdk/javax/management/loading/LibraryLoader/jar_src/RandomGen.h diff --git a/jdk/test/javax/management/loading/LibraryLoader/jar_src/UseNativeLib.java b/test/jdk/javax/management/loading/LibraryLoader/jar_src/UseNativeLib.java similarity index 100% rename from jdk/test/javax/management/loading/LibraryLoader/jar_src/UseNativeLib.java rename to test/jdk/javax/management/loading/LibraryLoader/jar_src/UseNativeLib.java diff --git a/jdk/test/javax/management/loading/LibraryLoader/jar_src/UseNativeLibMBean.java b/test/jdk/javax/management/loading/LibraryLoader/jar_src/UseNativeLibMBean.java similarity index 100% rename from jdk/test/javax/management/loading/LibraryLoader/jar_src/UseNativeLibMBean.java rename to test/jdk/javax/management/loading/LibraryLoader/jar_src/UseNativeLibMBean.java diff --git a/jdk/test/javax/management/loading/LibraryLoader/native.jar b/test/jdk/javax/management/loading/LibraryLoader/native.jar similarity index 100% rename from jdk/test/javax/management/loading/LibraryLoader/native.jar rename to test/jdk/javax/management/loading/LibraryLoader/native.jar diff --git a/jdk/test/javax/management/loading/MLetCLR/MLetCommand.java b/test/jdk/javax/management/loading/MLetCLR/MLetCommand.java similarity index 100% rename from jdk/test/javax/management/loading/MLetCLR/MLetCommand.java rename to test/jdk/javax/management/loading/MLetCLR/MLetCommand.java diff --git a/jdk/test/javax/management/loading/MLetCLR/policy b/test/jdk/javax/management/loading/MLetCLR/policy similarity index 100% rename from jdk/test/javax/management/loading/MLetCLR/policy rename to test/jdk/javax/management/loading/MLetCLR/policy diff --git a/jdk/test/javax/management/loading/MLetContentTest.java b/test/jdk/javax/management/loading/MLetContentTest.java similarity index 100% rename from jdk/test/javax/management/loading/MLetContentTest.java rename to test/jdk/javax/management/loading/MLetContentTest.java diff --git a/jdk/test/javax/management/loading/MLetInternalsTest.java b/test/jdk/javax/management/loading/MLetInternalsTest.java similarity index 100% rename from jdk/test/javax/management/loading/MLetInternalsTest.java rename to test/jdk/javax/management/loading/MLetInternalsTest.java diff --git a/jdk/test/javax/management/loading/MletParserLocaleTest.java b/test/jdk/javax/management/loading/MletParserLocaleTest.java similarity index 100% rename from jdk/test/javax/management/loading/MletParserLocaleTest.java rename to test/jdk/javax/management/loading/MletParserLocaleTest.java diff --git a/jdk/test/javax/management/loading/ParserInfiniteLoopTest.java b/test/jdk/javax/management/loading/ParserInfiniteLoopTest.java similarity index 100% rename from jdk/test/javax/management/loading/ParserInfiniteLoopTest.java rename to test/jdk/javax/management/loading/ParserInfiniteLoopTest.java diff --git a/jdk/test/javax/management/loading/SystemClassLoaderTest.java b/test/jdk/javax/management/loading/SystemClassLoaderTest.java similarity index 100% rename from jdk/test/javax/management/loading/SystemClassLoaderTest.java rename to test/jdk/javax/management/loading/SystemClassLoaderTest.java diff --git a/jdk/test/javax/management/loading/mlet1.html b/test/jdk/javax/management/loading/mlet1.html similarity index 100% rename from jdk/test/javax/management/loading/mlet1.html rename to test/jdk/javax/management/loading/mlet1.html diff --git a/jdk/test/javax/management/loading/mlet2.html b/test/jdk/javax/management/loading/mlet2.html similarity index 100% rename from jdk/test/javax/management/loading/mlet2.html rename to test/jdk/javax/management/loading/mlet2.html diff --git a/jdk/test/javax/management/loading/mlet3.html b/test/jdk/javax/management/loading/mlet3.html similarity index 100% rename from jdk/test/javax/management/loading/mlet3.html rename to test/jdk/javax/management/loading/mlet3.html diff --git a/jdk/test/javax/management/loading/mlet4.html b/test/jdk/javax/management/loading/mlet4.html similarity index 100% rename from jdk/test/javax/management/loading/mlet4.html rename to test/jdk/javax/management/loading/mlet4.html diff --git a/jdk/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java b/test/jdk/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java rename to test/jdk/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java diff --git a/jdk/test/javax/management/modelmbean/DescriptorSupportSerialTest.java b/test/jdk/javax/management/modelmbean/DescriptorSupportSerialTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/DescriptorSupportSerialTest.java rename to test/jdk/javax/management/modelmbean/DescriptorSupportSerialTest.java diff --git a/jdk/test/javax/management/modelmbean/DescriptorSupportTest.java b/test/jdk/javax/management/modelmbean/DescriptorSupportTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/DescriptorSupportTest.java rename to test/jdk/javax/management/modelmbean/DescriptorSupportTest.java diff --git a/jdk/test/javax/management/modelmbean/DescriptorSupportXMLLocaleTest.java b/test/jdk/javax/management/modelmbean/DescriptorSupportXMLLocaleTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/DescriptorSupportXMLLocaleTest.java rename to test/jdk/javax/management/modelmbean/DescriptorSupportXMLLocaleTest.java diff --git a/jdk/test/javax/management/modelmbean/DescriptorSupportXMLTest.java b/test/jdk/javax/management/modelmbean/DescriptorSupportXMLTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/DescriptorSupportXMLTest.java rename to test/jdk/javax/management/modelmbean/DescriptorSupportXMLTest.java diff --git a/jdk/test/javax/management/modelmbean/ExoticTargetTypeTest.java b/test/jdk/javax/management/modelmbean/ExoticTargetTypeTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/ExoticTargetTypeTest.java rename to test/jdk/javax/management/modelmbean/ExoticTargetTypeTest.java diff --git a/jdk/test/javax/management/modelmbean/InfoSupportTest.java b/test/jdk/javax/management/modelmbean/InfoSupportTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/InfoSupportTest.java rename to test/jdk/javax/management/modelmbean/InfoSupportTest.java diff --git a/jdk/test/javax/management/modelmbean/LoggingExceptionTest.java b/test/jdk/javax/management/modelmbean/LoggingExceptionTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/LoggingExceptionTest.java rename to test/jdk/javax/management/modelmbean/LoggingExceptionTest.java diff --git a/jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java b/test/jdk/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java rename to test/jdk/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java diff --git a/jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/logging.properties b/test/jdk/javax/management/modelmbean/ModelMBeanInfoSupport/logging.properties similarity index 100% rename from jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/logging.properties rename to test/jdk/javax/management/modelmbean/ModelMBeanInfoSupport/logging.properties diff --git a/jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/policy b/test/jdk/javax/management/modelmbean/ModelMBeanInfoSupport/policy similarity index 100% rename from jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/policy rename to test/jdk/javax/management/modelmbean/ModelMBeanInfoSupport/policy diff --git a/jdk/test/javax/management/modelmbean/OnUnregisterTest.java b/test/jdk/javax/management/modelmbean/OnUnregisterTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/OnUnregisterTest.java rename to test/jdk/javax/management/modelmbean/OnUnregisterTest.java diff --git a/jdk/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java b/test/jdk/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java rename to test/jdk/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java diff --git a/jdk/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java b/test/jdk/javax/management/modelmbean/RequiredModelMBeanMethodTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java rename to test/jdk/javax/management/modelmbean/RequiredModelMBeanMethodTest.java diff --git a/jdk/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java b/test/jdk/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java rename to test/jdk/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java diff --git a/jdk/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java b/test/jdk/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java similarity index 100% rename from jdk/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java rename to test/jdk/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java diff --git a/jdk/test/javax/management/modelmbean/SimpleModelMBean/logging.properties b/test/jdk/javax/management/modelmbean/SimpleModelMBean/logging.properties similarity index 100% rename from jdk/test/javax/management/modelmbean/SimpleModelMBean/logging.properties rename to test/jdk/javax/management/modelmbean/SimpleModelMBean/logging.properties diff --git a/jdk/test/javax/management/modelmbean/SimpleModelMBean/policy b/test/jdk/javax/management/modelmbean/SimpleModelMBean/policy similarity index 100% rename from jdk/test/javax/management/modelmbean/SimpleModelMBean/policy rename to test/jdk/javax/management/modelmbean/SimpleModelMBean/policy diff --git a/jdk/test/javax/management/modelmbean/UnserializableTargetObjectTest.java b/test/jdk/javax/management/modelmbean/UnserializableTargetObjectTest.java similarity index 100% rename from jdk/test/javax/management/modelmbean/UnserializableTargetObjectTest.java rename to test/jdk/javax/management/modelmbean/UnserializableTargetObjectTest.java diff --git a/jdk/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java b/test/jdk/javax/management/monitor/AttributeArbitraryDataTypeTest.java similarity index 100% rename from jdk/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java rename to test/jdk/javax/management/monitor/AttributeArbitraryDataTypeTest.java diff --git a/jdk/test/javax/management/monitor/CounterMonitorDeadlockTest.java b/test/jdk/javax/management/monitor/CounterMonitorDeadlockTest.java similarity index 100% rename from jdk/test/javax/management/monitor/CounterMonitorDeadlockTest.java rename to test/jdk/javax/management/monitor/CounterMonitorDeadlockTest.java diff --git a/jdk/test/javax/management/monitor/CounterMonitorInitThresholdTest.java b/test/jdk/javax/management/monitor/CounterMonitorInitThresholdTest.java similarity index 100% rename from jdk/test/javax/management/monitor/CounterMonitorInitThresholdTest.java rename to test/jdk/javax/management/monitor/CounterMonitorInitThresholdTest.java diff --git a/jdk/test/javax/management/monitor/CounterMonitorTest.java b/test/jdk/javax/management/monitor/CounterMonitorTest.java similarity index 100% rename from jdk/test/javax/management/monitor/CounterMonitorTest.java rename to test/jdk/javax/management/monitor/CounterMonitorTest.java diff --git a/jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java b/test/jdk/javax/management/monitor/CounterMonitorThresholdTest.java similarity index 100% rename from jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java rename to test/jdk/javax/management/monitor/CounterMonitorThresholdTest.java diff --git a/jdk/test/javax/management/monitor/DerivedGaugeMonitorTest.java b/test/jdk/javax/management/monitor/DerivedGaugeMonitorTest.java similarity index 100% rename from jdk/test/javax/management/monitor/DerivedGaugeMonitorTest.java rename to test/jdk/javax/management/monitor/DerivedGaugeMonitorTest.java diff --git a/jdk/test/javax/management/monitor/GaugeMonitorDeadlockTest.java b/test/jdk/javax/management/monitor/GaugeMonitorDeadlockTest.java similarity index 100% rename from jdk/test/javax/management/monitor/GaugeMonitorDeadlockTest.java rename to test/jdk/javax/management/monitor/GaugeMonitorDeadlockTest.java diff --git a/jdk/test/javax/management/monitor/MBeanServerBuilderImpl.java b/test/jdk/javax/management/monitor/MBeanServerBuilderImpl.java similarity index 100% rename from jdk/test/javax/management/monitor/MBeanServerBuilderImpl.java rename to test/jdk/javax/management/monitor/MBeanServerBuilderImpl.java diff --git a/jdk/test/javax/management/monitor/MBeanServerForwarderInvocationHandler.java b/test/jdk/javax/management/monitor/MBeanServerForwarderInvocationHandler.java similarity index 100% rename from jdk/test/javax/management/monitor/MBeanServerForwarderInvocationHandler.java rename to test/jdk/javax/management/monitor/MBeanServerForwarderInvocationHandler.java diff --git a/jdk/test/javax/management/monitor/MultiMonitorTest.java b/test/jdk/javax/management/monitor/MultiMonitorTest.java similarity index 100% rename from jdk/test/javax/management/monitor/MultiMonitorTest.java rename to test/jdk/javax/management/monitor/MultiMonitorTest.java diff --git a/jdk/test/javax/management/monitor/NonComparableAttributeValueTest.java b/test/jdk/javax/management/monitor/NonComparableAttributeValueTest.java similarity index 100% rename from jdk/test/javax/management/monitor/NonComparableAttributeValueTest.java rename to test/jdk/javax/management/monitor/NonComparableAttributeValueTest.java diff --git a/jdk/test/javax/management/monitor/NullAttributeValueTest.java b/test/jdk/javax/management/monitor/NullAttributeValueTest.java similarity index 100% rename from jdk/test/javax/management/monitor/NullAttributeValueTest.java rename to test/jdk/javax/management/monitor/NullAttributeValueTest.java diff --git a/jdk/test/javax/management/monitor/ReflectionExceptionTest.java b/test/jdk/javax/management/monitor/ReflectionExceptionTest.java similarity index 100% rename from jdk/test/javax/management/monitor/ReflectionExceptionTest.java rename to test/jdk/javax/management/monitor/ReflectionExceptionTest.java diff --git a/jdk/test/javax/management/monitor/RuntimeExceptionTest.java b/test/jdk/javax/management/monitor/RuntimeExceptionTest.java similarity index 100% rename from jdk/test/javax/management/monitor/RuntimeExceptionTest.java rename to test/jdk/javax/management/monitor/RuntimeExceptionTest.java diff --git a/jdk/test/javax/management/monitor/StartStopTest.java b/test/jdk/javax/management/monitor/StartStopTest.java similarity index 100% rename from jdk/test/javax/management/monitor/StartStopTest.java rename to test/jdk/javax/management/monitor/StartStopTest.java diff --git a/jdk/test/javax/management/monitor/StringMonitorDeadlockTest.java b/test/jdk/javax/management/monitor/StringMonitorDeadlockTest.java similarity index 100% rename from jdk/test/javax/management/monitor/StringMonitorDeadlockTest.java rename to test/jdk/javax/management/monitor/StringMonitorDeadlockTest.java diff --git a/jdk/test/javax/management/monitor/ThreadPoolAccTest.java b/test/jdk/javax/management/monitor/ThreadPoolAccTest.java similarity index 100% rename from jdk/test/javax/management/monitor/ThreadPoolAccTest.java rename to test/jdk/javax/management/monitor/ThreadPoolAccTest.java diff --git a/jdk/test/javax/management/monitor/ThreadPoolTest.java b/test/jdk/javax/management/monitor/ThreadPoolTest.java similarity index 100% rename from jdk/test/javax/management/monitor/ThreadPoolTest.java rename to test/jdk/javax/management/monitor/ThreadPoolTest.java diff --git a/jdk/test/javax/management/mxbean/AmbiguousConstructorTest.java b/test/jdk/javax/management/mxbean/AmbiguousConstructorTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/AmbiguousConstructorTest.java rename to test/jdk/javax/management/mxbean/AmbiguousConstructorTest.java diff --git a/jdk/test/javax/management/mxbean/Basic.java b/test/jdk/javax/management/mxbean/Basic.java similarity index 100% rename from jdk/test/javax/management/mxbean/Basic.java rename to test/jdk/javax/management/mxbean/Basic.java diff --git a/jdk/test/javax/management/mxbean/BasicMXBean.java b/test/jdk/javax/management/mxbean/BasicMXBean.java similarity index 100% rename from jdk/test/javax/management/mxbean/BasicMXBean.java rename to test/jdk/javax/management/mxbean/BasicMXBean.java diff --git a/jdk/test/javax/management/mxbean/ComparatorExceptionTest.java b/test/jdk/javax/management/mxbean/ComparatorExceptionTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/ComparatorExceptionTest.java rename to test/jdk/javax/management/mxbean/ComparatorExceptionTest.java diff --git a/jdk/test/javax/management/mxbean/ExceptionDiagnosisTest.java b/test/jdk/javax/management/mxbean/ExceptionDiagnosisTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/ExceptionDiagnosisTest.java rename to test/jdk/javax/management/mxbean/ExceptionDiagnosisTest.java diff --git a/jdk/test/javax/management/mxbean/GenericArrayTypeTest.java b/test/jdk/javax/management/mxbean/GenericArrayTypeTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/GenericArrayTypeTest.java rename to test/jdk/javax/management/mxbean/GenericArrayTypeTest.java diff --git a/jdk/test/javax/management/mxbean/GenericTypeTest.java b/test/jdk/javax/management/mxbean/GenericTypeTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/GenericTypeTest.java rename to test/jdk/javax/management/mxbean/GenericTypeTest.java diff --git a/jdk/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java b/test/jdk/javax/management/mxbean/InvalidMXBeanRegistrationTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java rename to test/jdk/javax/management/mxbean/InvalidMXBeanRegistrationTest.java diff --git a/jdk/test/javax/management/mxbean/LeakTest.java b/test/jdk/javax/management/mxbean/LeakTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/LeakTest.java rename to test/jdk/javax/management/mxbean/LeakTest.java diff --git a/jdk/test/javax/management/mxbean/MBeanOperationInfoTest.java b/test/jdk/javax/management/mxbean/MBeanOperationInfoTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/MBeanOperationInfoTest.java rename to test/jdk/javax/management/mxbean/MBeanOperationInfoTest.java diff --git a/jdk/test/javax/management/mxbean/MXBeanAnnotationTest.java b/test/jdk/javax/management/mxbean/MXBeanAnnotationTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/MXBeanAnnotationTest.java rename to test/jdk/javax/management/mxbean/MXBeanAnnotationTest.java diff --git a/jdk/test/javax/management/mxbean/MXBeanExceptionHandlingTest.java b/test/jdk/javax/management/mxbean/MXBeanExceptionHandlingTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/MXBeanExceptionHandlingTest.java rename to test/jdk/javax/management/mxbean/MXBeanExceptionHandlingTest.java diff --git a/jdk/test/javax/management/mxbean/MXBeanFallbackTest.java b/test/jdk/javax/management/mxbean/MXBeanFallbackTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/MXBeanFallbackTest.java rename to test/jdk/javax/management/mxbean/MXBeanFallbackTest.java diff --git a/jdk/test/javax/management/mxbean/MXBeanFlagTest.java b/test/jdk/javax/management/mxbean/MXBeanFlagTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/MXBeanFlagTest.java rename to test/jdk/javax/management/mxbean/MXBeanFlagTest.java diff --git a/jdk/test/javax/management/mxbean/MXBeanInteropTest1.java b/test/jdk/javax/management/mxbean/MXBeanInteropTest1.java similarity index 100% rename from jdk/test/javax/management/mxbean/MXBeanInteropTest1.java rename to test/jdk/javax/management/mxbean/MXBeanInteropTest1.java diff --git a/jdk/test/javax/management/mxbean/MXBeanInteropTest2.java b/test/jdk/javax/management/mxbean/MXBeanInteropTest2.java similarity index 100% rename from jdk/test/javax/management/mxbean/MXBeanInteropTest2.java rename to test/jdk/javax/management/mxbean/MXBeanInteropTest2.java diff --git a/jdk/test/javax/management/mxbean/MXBeanLoadingTest1.java b/test/jdk/javax/management/mxbean/MXBeanLoadingTest1.java similarity index 100% rename from jdk/test/javax/management/mxbean/MXBeanLoadingTest1.java rename to test/jdk/javax/management/mxbean/MXBeanLoadingTest1.java diff --git a/jdk/test/javax/management/mxbean/MXBeanNotifTest.java b/test/jdk/javax/management/mxbean/MXBeanNotifTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/MXBeanNotifTest.java rename to test/jdk/javax/management/mxbean/MXBeanNotifTest.java diff --git a/jdk/test/javax/management/mxbean/MXBeanPreRegisterTest.java b/test/jdk/javax/management/mxbean/MXBeanPreRegisterTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/MXBeanPreRegisterTest.java rename to test/jdk/javax/management/mxbean/MXBeanPreRegisterTest.java diff --git a/jdk/test/javax/management/mxbean/MXBeanRefTest.java b/test/jdk/javax/management/mxbean/MXBeanRefTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/MXBeanRefTest.java rename to test/jdk/javax/management/mxbean/MXBeanRefTest.java diff --git a/jdk/test/javax/management/mxbean/MXBeanTest.java b/test/jdk/javax/management/mxbean/MXBeanTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/MXBeanTest.java rename to test/jdk/javax/management/mxbean/MXBeanTest.java diff --git a/jdk/test/javax/management/mxbean/MXBeanWeirdParamTest.java b/test/jdk/javax/management/mxbean/MXBeanWeirdParamTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/MXBeanWeirdParamTest.java rename to test/jdk/javax/management/mxbean/MXBeanWeirdParamTest.java diff --git a/jdk/test/javax/management/mxbean/MerlinMXBean.java b/test/jdk/javax/management/mxbean/MerlinMXBean.java similarity index 100% rename from jdk/test/javax/management/mxbean/MerlinMXBean.java rename to test/jdk/javax/management/mxbean/MerlinMXBean.java diff --git a/jdk/test/javax/management/mxbean/MiscTest.java b/test/jdk/javax/management/mxbean/MiscTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/MiscTest.java rename to test/jdk/javax/management/mxbean/MiscTest.java diff --git a/jdk/test/javax/management/mxbean/OperationImpactTest.java b/test/jdk/javax/management/mxbean/OperationImpactTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/OperationImpactTest.java rename to test/jdk/javax/management/mxbean/OperationImpactTest.java diff --git a/jdk/test/javax/management/mxbean/OverloadTest.java b/test/jdk/javax/management/mxbean/OverloadTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/OverloadTest.java rename to test/jdk/javax/management/mxbean/OverloadTest.java diff --git a/jdk/test/javax/management/mxbean/PreRegisterNameTest.java b/test/jdk/javax/management/mxbean/PreRegisterNameTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/PreRegisterNameTest.java rename to test/jdk/javax/management/mxbean/PreRegisterNameTest.java diff --git a/jdk/test/javax/management/mxbean/PropertyNamesTest.java b/test/jdk/javax/management/mxbean/PropertyNamesTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/PropertyNamesTest.java rename to test/jdk/javax/management/mxbean/PropertyNamesTest.java diff --git a/jdk/test/javax/management/mxbean/RandomMXBeanTest.java b/test/jdk/javax/management/mxbean/RandomMXBeanTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/RandomMXBeanTest.java rename to test/jdk/javax/management/mxbean/RandomMXBeanTest.java diff --git a/jdk/test/javax/management/mxbean/SameObjectTwoNamesTest.java b/test/jdk/javax/management/mxbean/SameObjectTwoNamesTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/SameObjectTwoNamesTest.java rename to test/jdk/javax/management/mxbean/SameObjectTwoNamesTest.java diff --git a/jdk/test/javax/management/mxbean/SqeDescriptorKey.java b/test/jdk/javax/management/mxbean/SqeDescriptorKey.java similarity index 100% rename from jdk/test/javax/management/mxbean/SqeDescriptorKey.java rename to test/jdk/javax/management/mxbean/SqeDescriptorKey.java diff --git a/jdk/test/javax/management/mxbean/SqeNotification.java b/test/jdk/javax/management/mxbean/SqeNotification.java similarity index 100% rename from jdk/test/javax/management/mxbean/SqeNotification.java rename to test/jdk/javax/management/mxbean/SqeNotification.java diff --git a/jdk/test/javax/management/mxbean/SqeParameter.java b/test/jdk/javax/management/mxbean/SqeParameter.java similarity index 100% rename from jdk/test/javax/management/mxbean/SqeParameter.java rename to test/jdk/javax/management/mxbean/SqeParameter.java diff --git a/jdk/test/javax/management/mxbean/StandardMBeanOverrideTest.java b/test/jdk/javax/management/mxbean/StandardMBeanOverrideTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/StandardMBeanOverrideTest.java rename to test/jdk/javax/management/mxbean/StandardMBeanOverrideTest.java diff --git a/jdk/test/javax/management/mxbean/ThreadMXBeanTest.java b/test/jdk/javax/management/mxbean/ThreadMXBeanTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/ThreadMXBeanTest.java rename to test/jdk/javax/management/mxbean/ThreadMXBeanTest.java diff --git a/jdk/test/javax/management/mxbean/TigerMXBean.java b/test/jdk/javax/management/mxbean/TigerMXBean.java similarity index 100% rename from jdk/test/javax/management/mxbean/TigerMXBean.java rename to test/jdk/javax/management/mxbean/TigerMXBean.java diff --git a/jdk/test/javax/management/mxbean/TypeNameTest.java b/test/jdk/javax/management/mxbean/TypeNameTest.java similarity index 100% rename from jdk/test/javax/management/mxbean/TypeNameTest.java rename to test/jdk/javax/management/mxbean/TypeNameTest.java diff --git a/jdk/test/javax/management/mxbean/Utils.java b/test/jdk/javax/management/mxbean/Utils.java similarity index 100% rename from jdk/test/javax/management/mxbean/Utils.java rename to test/jdk/javax/management/mxbean/Utils.java diff --git a/jdk/test/javax/management/notification/BroadcasterSupportDeadlockTest.java b/test/jdk/javax/management/notification/BroadcasterSupportDeadlockTest.java similarity index 100% rename from jdk/test/javax/management/notification/BroadcasterSupportDeadlockTest.java rename to test/jdk/javax/management/notification/BroadcasterSupportDeadlockTest.java diff --git a/jdk/test/javax/management/notification/FilterExceptionTest.java b/test/jdk/javax/management/notification/FilterExceptionTest.java similarity index 100% rename from jdk/test/javax/management/notification/FilterExceptionTest.java rename to test/jdk/javax/management/notification/FilterExceptionTest.java diff --git a/jdk/test/javax/management/notification/NotifExecutorTest.java b/test/jdk/javax/management/notification/NotifExecutorTest.java similarity index 100% rename from jdk/test/javax/management/notification/NotifExecutorTest.java rename to test/jdk/javax/management/notification/NotifExecutorTest.java diff --git a/jdk/test/javax/management/notification/NotifInfoTest.java b/test/jdk/javax/management/notification/NotifInfoTest.java similarity index 100% rename from jdk/test/javax/management/notification/NotifInfoTest.java rename to test/jdk/javax/management/notification/NotifInfoTest.java diff --git a/jdk/test/javax/management/openmbean/ArrayTypeTest.java b/test/jdk/javax/management/openmbean/ArrayTypeTest.java similarity index 100% rename from jdk/test/javax/management/openmbean/ArrayTypeTest.java rename to test/jdk/javax/management/openmbean/ArrayTypeTest.java diff --git a/jdk/test/javax/management/openmbean/BadConstraintTest.java b/test/jdk/javax/management/openmbean/BadConstraintTest.java similarity index 100% rename from jdk/test/javax/management/openmbean/BadConstraintTest.java rename to test/jdk/javax/management/openmbean/BadConstraintTest.java diff --git a/jdk/test/javax/management/openmbean/CompositeDataStringTest.java b/test/jdk/javax/management/openmbean/CompositeDataStringTest.java similarity index 100% rename from jdk/test/javax/management/openmbean/CompositeDataStringTest.java rename to test/jdk/javax/management/openmbean/CompositeDataStringTest.java diff --git a/jdk/test/javax/management/openmbean/ConstraintTest.java b/test/jdk/javax/management/openmbean/ConstraintTest.java similarity index 100% rename from jdk/test/javax/management/openmbean/ConstraintTest.java rename to test/jdk/javax/management/openmbean/ConstraintTest.java diff --git a/jdk/test/javax/management/openmbean/EqualsTest.java b/test/jdk/javax/management/openmbean/EqualsTest.java similarity index 100% rename from jdk/test/javax/management/openmbean/EqualsTest.java rename to test/jdk/javax/management/openmbean/EqualsTest.java diff --git a/jdk/test/javax/management/openmbean/IsValueTest.java b/test/jdk/javax/management/openmbean/IsValueTest.java similarity index 100% rename from jdk/test/javax/management/openmbean/IsValueTest.java rename to test/jdk/javax/management/openmbean/IsValueTest.java diff --git a/jdk/test/javax/management/openmbean/MBeanFeatureInfoSerialStore.java b/test/jdk/javax/management/openmbean/MBeanFeatureInfoSerialStore.java similarity index 100% rename from jdk/test/javax/management/openmbean/MBeanFeatureInfoSerialStore.java rename to test/jdk/javax/management/openmbean/MBeanFeatureInfoSerialStore.java diff --git a/jdk/test/javax/management/openmbean/NullConstructorParamsTest.java b/test/jdk/javax/management/openmbean/NullConstructorParamsTest.java similarity index 100% rename from jdk/test/javax/management/openmbean/NullConstructorParamsTest.java rename to test/jdk/javax/management/openmbean/NullConstructorParamsTest.java diff --git a/jdk/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java b/test/jdk/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java similarity index 100% rename from jdk/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java rename to test/jdk/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java diff --git a/jdk/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java b/test/jdk/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java similarity index 100% rename from jdk/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java rename to test/jdk/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java diff --git a/jdk/test/javax/management/openmbean/OpenTypeDescriptorTest.java b/test/jdk/javax/management/openmbean/OpenTypeDescriptorTest.java similarity index 100% rename from jdk/test/javax/management/openmbean/OpenTypeDescriptorTest.java rename to test/jdk/javax/management/openmbean/OpenTypeDescriptorTest.java diff --git a/jdk/test/javax/management/openmbean/TabularDataOrderTest.java b/test/jdk/javax/management/openmbean/TabularDataOrderTest.java similarity index 100% rename from jdk/test/javax/management/openmbean/TabularDataOrderTest.java rename to test/jdk/javax/management/openmbean/TabularDataOrderTest.java diff --git a/jdk/test/javax/management/proxy/JMXProxyFallbackTest.java b/test/jdk/javax/management/proxy/JMXProxyFallbackTest.java similarity index 100% rename from jdk/test/javax/management/proxy/JMXProxyFallbackTest.java rename to test/jdk/javax/management/proxy/JMXProxyFallbackTest.java diff --git a/jdk/test/javax/management/proxy/JMXProxyTest.java b/test/jdk/javax/management/proxy/JMXProxyTest.java similarity index 100% rename from jdk/test/javax/management/proxy/JMXProxyTest.java rename to test/jdk/javax/management/proxy/JMXProxyTest.java diff --git a/jdk/test/javax/management/proxy/NotificationEmitterProxy.java b/test/jdk/javax/management/proxy/NotificationEmitterProxy.java similarity index 100% rename from jdk/test/javax/management/proxy/NotificationEmitterProxy.java rename to test/jdk/javax/management/proxy/NotificationEmitterProxy.java diff --git a/jdk/test/javax/management/proxy/ProxyObjectMethodsTest.java b/test/jdk/javax/management/proxy/ProxyObjectMethodsTest.java similarity index 100% rename from jdk/test/javax/management/proxy/ProxyObjectMethodsTest.java rename to test/jdk/javax/management/proxy/ProxyObjectMethodsTest.java diff --git a/jdk/test/javax/management/query/CustomQueryTest.java b/test/jdk/javax/management/query/CustomQueryTest.java similarity index 100% rename from jdk/test/javax/management/query/CustomQueryTest.java rename to test/jdk/javax/management/query/CustomQueryTest.java diff --git a/jdk/test/javax/management/query/InstanceOfExpTest.java b/test/jdk/javax/management/query/InstanceOfExpTest.java similarity index 100% rename from jdk/test/javax/management/query/InstanceOfExpTest.java rename to test/jdk/javax/management/query/InstanceOfExpTest.java diff --git a/jdk/test/javax/management/query/QueryData.java b/test/jdk/javax/management/query/QueryData.java similarity index 100% rename from jdk/test/javax/management/query/QueryData.java rename to test/jdk/javax/management/query/QueryData.java diff --git a/jdk/test/javax/management/query/QueryExpStringTest.java b/test/jdk/javax/management/query/QueryExpStringTest.java similarity index 100% rename from jdk/test/javax/management/query/QueryExpStringTest.java rename to test/jdk/javax/management/query/QueryExpStringTest.java diff --git a/jdk/test/javax/management/query/QueryFactory.java b/test/jdk/javax/management/query/QueryFactory.java similarity index 100% rename from jdk/test/javax/management/query/QueryFactory.java rename to test/jdk/javax/management/query/QueryFactory.java diff --git a/jdk/test/javax/management/query/QueryMatchTest.java b/test/jdk/javax/management/query/QueryMatchTest.java similarity index 100% rename from jdk/test/javax/management/query/QueryMatchTest.java rename to test/jdk/javax/management/query/QueryMatchTest.java diff --git a/jdk/test/javax/management/query/QuerySubstringTest.java b/test/jdk/javax/management/query/QuerySubstringTest.java similarity index 100% rename from jdk/test/javax/management/query/QuerySubstringTest.java rename to test/jdk/javax/management/query/QuerySubstringTest.java diff --git a/jdk/test/javax/management/query/ServerDelegate.java b/test/jdk/javax/management/query/ServerDelegate.java similarity index 100% rename from jdk/test/javax/management/query/ServerDelegate.java rename to test/jdk/javax/management/query/ServerDelegate.java diff --git a/jdk/test/javax/management/query/ServerDelegateMBean.java b/test/jdk/javax/management/query/ServerDelegateMBean.java similarity index 100% rename from jdk/test/javax/management/query/ServerDelegateMBean.java rename to test/jdk/javax/management/query/ServerDelegateMBean.java diff --git a/jdk/test/javax/management/query/SqeDescriptorKey.java b/test/jdk/javax/management/query/SqeDescriptorKey.java similarity index 100% rename from jdk/test/javax/management/query/SqeDescriptorKey.java rename to test/jdk/javax/management/query/SqeDescriptorKey.java diff --git a/jdk/test/javax/management/query/SupportedQueryTypesTest.java b/test/jdk/javax/management/query/SupportedQueryTypesTest.java similarity index 100% rename from jdk/test/javax/management/query/SupportedQueryTypesTest.java rename to test/jdk/javax/management/query/SupportedQueryTypesTest.java diff --git a/jdk/test/javax/management/query/TestQuery.java b/test/jdk/javax/management/query/TestQuery.java similarity index 100% rename from jdk/test/javax/management/query/TestQuery.java rename to test/jdk/javax/management/query/TestQuery.java diff --git a/jdk/test/javax/management/query/TestQueryMBean.java b/test/jdk/javax/management/query/TestQueryMBean.java similarity index 100% rename from jdk/test/javax/management/query/TestQueryMBean.java rename to test/jdk/javax/management/query/TestQueryMBean.java diff --git a/jdk/test/javax/management/relation/NonArrayListTest.java b/test/jdk/javax/management/relation/NonArrayListTest.java similarity index 100% rename from jdk/test/javax/management/relation/NonArrayListTest.java rename to test/jdk/javax/management/relation/NonArrayListTest.java diff --git a/jdk/test/javax/management/relation/RelationNotificationSeqNoTest.java b/test/jdk/javax/management/relation/RelationNotificationSeqNoTest.java similarity index 100% rename from jdk/test/javax/management/relation/RelationNotificationSeqNoTest.java rename to test/jdk/javax/management/relation/RelationNotificationSeqNoTest.java diff --git a/jdk/test/javax/management/relation/RelationNotificationSourceTest.java b/test/jdk/javax/management/relation/RelationNotificationSourceTest.java similarity index 100% rename from jdk/test/javax/management/relation/RelationNotificationSourceTest.java rename to test/jdk/javax/management/relation/RelationNotificationSourceTest.java diff --git a/jdk/test/javax/management/relation/RelationTypeTest.java b/test/jdk/javax/management/relation/RelationTypeTest.java similarity index 100% rename from jdk/test/javax/management/relation/RelationTypeTest.java rename to test/jdk/javax/management/relation/RelationTypeTest.java diff --git a/jdk/test/javax/management/remote/mandatory/TEST.properties b/test/jdk/javax/management/remote/mandatory/TEST.properties similarity index 100% rename from jdk/test/javax/management/remote/mandatory/TEST.properties rename to test/jdk/javax/management/remote/mandatory/TEST.properties diff --git a/jdk/test/javax/management/remote/mandatory/URLTest.java b/test/jdk/javax/management/remote/mandatory/URLTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/URLTest.java rename to test/jdk/javax/management/remote/mandatory/URLTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/AddressableTest.java b/test/jdk/javax/management/remote/mandatory/connection/AddressableTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/AddressableTest.java rename to test/jdk/javax/management/remote/mandatory/connection/AddressableTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java b/test/jdk/javax/management/remote/mandatory/connection/BrokenConnectionTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java rename to test/jdk/javax/management/remote/mandatory/connection/BrokenConnectionTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java b/test/jdk/javax/management/remote/mandatory/connection/CloseFailedClientTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java rename to test/jdk/javax/management/remote/mandatory/connection/CloseFailedClientTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/CloseServerTest.java b/test/jdk/javax/management/remote/mandatory/connection/CloseServerTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/CloseServerTest.java rename to test/jdk/javax/management/remote/mandatory/connection/CloseServerTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java b/test/jdk/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java rename to test/jdk/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/CloseableTest.java b/test/jdk/javax/management/remote/mandatory/connection/CloseableTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/CloseableTest.java rename to test/jdk/javax/management/remote/mandatory/connection/CloseableTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java b/test/jdk/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java rename to test/jdk/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/ConnectionTest.java b/test/jdk/javax/management/remote/mandatory/connection/ConnectionTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/ConnectionTest.java rename to test/jdk/javax/management/remote/mandatory/connection/ConnectionTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java b/test/jdk/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java rename to test/jdk/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/DeadLockTest.java b/test/jdk/javax/management/remote/mandatory/connection/DeadLockTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/DeadLockTest.java rename to test/jdk/javax/management/remote/mandatory/connection/DeadLockTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java b/test/jdk/javax/management/remote/mandatory/connection/FailedConnectionTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java rename to test/jdk/javax/management/remote/mandatory/connection/FailedConnectionTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/GetConnectionTest.java b/test/jdk/javax/management/remote/mandatory/connection/GetConnectionTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/GetConnectionTest.java rename to test/jdk/javax/management/remote/mandatory/connection/GetConnectionTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/IIOPURLTest.java b/test/jdk/javax/management/remote/mandatory/connection/IIOPURLTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/IIOPURLTest.java rename to test/jdk/javax/management/remote/mandatory/connection/IIOPURLTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java b/test/jdk/javax/management/remote/mandatory/connection/IdleTimeoutTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java rename to test/jdk/javax/management/remote/mandatory/connection/IdleTimeoutTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/JMXServiceURLLocaleTest.java b/test/jdk/javax/management/remote/mandatory/connection/JMXServiceURLLocaleTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/JMXServiceURLLocaleTest.java rename to test/jdk/javax/management/remote/mandatory/connection/JMXServiceURLLocaleTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java b/test/jdk/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java rename to test/jdk/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java b/test/jdk/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java rename to test/jdk/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/Name.java b/test/jdk/javax/management/remote/mandatory/connection/Name.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/Name.java rename to test/jdk/javax/management/remote/mandatory/connection/Name.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/NameMBean.java b/test/jdk/javax/management/remote/mandatory/connection/NameMBean.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/NameMBean.java rename to test/jdk/javax/management/remote/mandatory/connection/NameMBean.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/ObjectInputStreamWithLoaderNullCheckTest.java b/test/jdk/javax/management/remote/mandatory/connection/ObjectInputStreamWithLoaderNullCheckTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/ObjectInputStreamWithLoaderNullCheckTest.java rename to test/jdk/javax/management/remote/mandatory/connection/ObjectInputStreamWithLoaderNullCheckTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java b/test/jdk/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java rename to test/jdk/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java b/test/jdk/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java rename to test/jdk/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/RMIConnectorLogAttributesTest.java b/test/jdk/javax/management/remote/mandatory/connection/RMIConnectorLogAttributesTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/RMIConnectorLogAttributesTest.java rename to test/jdk/javax/management/remote/mandatory/connection/RMIConnectorLogAttributesTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java b/test/jdk/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java rename to test/jdk/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java b/test/jdk/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java rename to test/jdk/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/RMIExitTest.java b/test/jdk/javax/management/remote/mandatory/connection/RMIExitTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/RMIExitTest.java rename to test/jdk/javax/management/remote/mandatory/connection/RMIExitTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/RMISerializeTest.java b/test/jdk/javax/management/remote/mandatory/connection/RMISerializeTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/RMISerializeTest.java rename to test/jdk/javax/management/remote/mandatory/connection/RMISerializeTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/ReconnectTest.java b/test/jdk/javax/management/remote/mandatory/connection/ReconnectTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/ReconnectTest.java rename to test/jdk/javax/management/remote/mandatory/connection/ReconnectTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connection/TestLogHandler.java b/test/jdk/javax/management/remote/mandatory/connection/TestLogHandler.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connection/TestLogHandler.java rename to test/jdk/javax/management/remote/mandatory/connection/TestLogHandler.java diff --git a/jdk/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java b/test/jdk/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java rename to test/jdk/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java b/test/jdk/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java rename to test/jdk/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java b/test/jdk/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java rename to test/jdk/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java b/test/jdk/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java rename to test/jdk/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java diff --git a/jdk/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java b/test/jdk/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java rename to test/jdk/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java diff --git a/jdk/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java b/test/jdk/javax/management/remote/mandatory/loading/DefaultProviderTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java rename to test/jdk/javax/management/remote/mandatory/loading/DefaultProviderTest.java diff --git a/jdk/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java b/test/jdk/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java rename to test/jdk/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java diff --git a/jdk/test/javax/management/remote/mandatory/loading/MethodResultTest.java b/test/jdk/javax/management/remote/mandatory/loading/MethodResultTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/loading/MethodResultTest.java rename to test/jdk/javax/management/remote/mandatory/loading/MethodResultTest.java diff --git a/jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java b/test/jdk/javax/management/remote/mandatory/loading/MissingClassTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java rename to test/jdk/javax/management/remote/mandatory/loading/MissingClassTest.java diff --git a/jdk/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java b/test/jdk/javax/management/remote/mandatory/loading/RMIDownloadTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java rename to test/jdk/javax/management/remote/mandatory/loading/RMIDownloadTest.java diff --git a/jdk/test/javax/management/remote/mandatory/loading/SingleClassLoader.java b/test/jdk/javax/management/remote/mandatory/loading/SingleClassLoader.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/loading/SingleClassLoader.java rename to test/jdk/javax/management/remote/mandatory/loading/SingleClassLoader.java diff --git a/jdk/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java b/test/jdk/javax/management/remote/mandatory/loading/TargetMBeanTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java rename to test/jdk/javax/management/remote/mandatory/loading/TargetMBeanTest.java diff --git a/jdk/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java b/test/jdk/javax/management/remote/mandatory/loading/UserClassLoaderTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java rename to test/jdk/javax/management/remote/mandatory/loading/UserClassLoaderTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/AddRemoveTest.java b/test/jdk/javax/management/remote/mandatory/notif/AddRemoveTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/AddRemoveTest.java rename to test/jdk/javax/management/remote/mandatory/notif/AddRemoveTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java b/test/jdk/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java rename to test/jdk/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/DeadListenerTest.java b/test/jdk/javax/management/remote/mandatory/notif/DeadListenerTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/DeadListenerTest.java rename to test/jdk/javax/management/remote/mandatory/notif/DeadListenerTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/DiffHBTest.java b/test/jdk/javax/management/remote/mandatory/notif/DiffHBTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/DiffHBTest.java rename to test/jdk/javax/management/remote/mandatory/notif/DiffHBTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java b/test/jdk/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java rename to test/jdk/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java b/test/jdk/javax/management/remote/mandatory/notif/ListenerScaleTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java rename to test/jdk/javax/management/remote/mandatory/notif/ListenerScaleTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/NoPermToRemoveTest.java b/test/jdk/javax/management/remote/mandatory/notif/NoPermToRemoveTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/NoPermToRemoveTest.java rename to test/jdk/javax/management/remote/mandatory/notif/NoPermToRemoveTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java b/test/jdk/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java rename to test/jdk/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java b/test/jdk/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java rename to test/jdk/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java b/test/jdk/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java rename to test/jdk/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java b/test/jdk/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java rename to test/jdk/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java b/test/jdk/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java rename to test/jdk/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java b/test/jdk/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java rename to test/jdk/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java b/test/jdk/javax/management/remote/mandatory/notif/NotificationBufferTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java rename to test/jdk/javax/management/remote/mandatory/notif/NotificationBufferTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java b/test/jdk/javax/management/remote/mandatory/notif/NotificationEmissionTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java rename to test/jdk/javax/management/remote/mandatory/notif/NotificationEmissionTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/NotificationSender.java b/test/jdk/javax/management/remote/mandatory/notif/NotificationSender.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/NotificationSender.java rename to test/jdk/javax/management/remote/mandatory/notif/NotificationSender.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/NotificationSenderMBean.java b/test/jdk/javax/management/remote/mandatory/notif/NotificationSenderMBean.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/NotificationSenderMBean.java rename to test/jdk/javax/management/remote/mandatory/notif/NotificationSenderMBean.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/RMINotifTest.java b/test/jdk/javax/management/remote/mandatory/notif/RMINotifTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/RMINotifTest.java rename to test/jdk/javax/management/remote/mandatory/notif/RMINotifTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/ServerNotifs.java b/test/jdk/javax/management/remote/mandatory/notif/ServerNotifs.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/ServerNotifs.java rename to test/jdk/javax/management/remote/mandatory/notif/ServerNotifs.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java b/test/jdk/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java rename to test/jdk/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java diff --git a/jdk/test/javax/management/remote/mandatory/notif/policy.negative b/test/jdk/javax/management/remote/mandatory/notif/policy.negative similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/policy.negative rename to test/jdk/javax/management/remote/mandatory/notif/policy.negative diff --git a/jdk/test/javax/management/remote/mandatory/notif/policy.positive b/test/jdk/javax/management/remote/mandatory/notif/policy.positive similarity index 100% rename from jdk/test/javax/management/remote/mandatory/notif/policy.positive rename to test/jdk/javax/management/remote/mandatory/notif/policy.positive diff --git a/jdk/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java b/test/jdk/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java rename to test/jdk/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java diff --git a/jdk/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java b/test/jdk/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java rename to test/jdk/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java diff --git a/jdk/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandard.java b/test/jdk/javax/management/remote/mandatory/passwordAccessFile/SimpleStandard.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandard.java rename to test/jdk/javax/management/remote/mandatory/passwordAccessFile/SimpleStandard.java diff --git a/jdk/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandardMBean.java b/test/jdk/javax/management/remote/mandatory/passwordAccessFile/SimpleStandardMBean.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandardMBean.java rename to test/jdk/javax/management/remote/mandatory/passwordAccessFile/SimpleStandardMBean.java diff --git a/jdk/test/javax/management/remote/mandatory/passwordAccessFile/access.properties b/test/jdk/javax/management/remote/mandatory/passwordAccessFile/access.properties similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAccessFile/access.properties rename to test/jdk/javax/management/remote/mandatory/passwordAccessFile/access.properties diff --git a/jdk/test/javax/management/remote/mandatory/passwordAccessFile/password.properties b/test/jdk/javax/management/remote/mandatory/passwordAccessFile/password.properties similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAccessFile/password.properties rename to test/jdk/javax/management/remote/mandatory/passwordAccessFile/password.properties diff --git a/jdk/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java rename to test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java diff --git a/jdk/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java rename to test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java diff --git a/jdk/test/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandard.java b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandard.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandard.java rename to test/jdk/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandard.java diff --git a/jdk/test/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandardMBean.java b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandardMBean.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandardMBean.java rename to test/jdk/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandardMBean.java diff --git a/jdk/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.login b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.login similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.login rename to test/jdk/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.login diff --git a/jdk/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password rename to test/jdk/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password diff --git a/jdk/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password-alt b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password-alt similarity index 100% rename from jdk/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password-alt rename to test/jdk/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password-alt diff --git a/jdk/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorProvider b/test/jdk/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorProvider similarity index 100% rename from jdk/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorProvider rename to test/jdk/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorProvider diff --git a/jdk/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorServerProvider b/test/jdk/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorServerProvider similarity index 100% rename from jdk/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorServerProvider rename to test/jdk/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorServerProvider diff --git a/jdk/test/javax/management/remote/mandatory/provider/ProviderTest.java b/test/jdk/javax/management/remote/mandatory/provider/ProviderTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/provider/ProviderTest.java rename to test/jdk/javax/management/remote/mandatory/provider/ProviderTest.java diff --git a/jdk/test/javax/management/remote/mandatory/provider/provider/JMXConnectorProviderImpl.java b/test/jdk/javax/management/remote/mandatory/provider/provider/JMXConnectorProviderImpl.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/provider/provider/JMXConnectorProviderImpl.java rename to test/jdk/javax/management/remote/mandatory/provider/provider/JMXConnectorProviderImpl.java diff --git a/jdk/test/javax/management/remote/mandatory/provider/provider/JMXConnectorServerProviderImpl.java b/test/jdk/javax/management/remote/mandatory/provider/provider/JMXConnectorServerProviderImpl.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/provider/provider/JMXConnectorServerProviderImpl.java rename to test/jdk/javax/management/remote/mandatory/provider/provider/JMXConnectorServerProviderImpl.java diff --git a/jdk/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java b/test/jdk/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java rename to test/jdk/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java diff --git a/jdk/test/javax/management/remote/mandatory/socketFactories/RMIClientFactory.java b/test/jdk/javax/management/remote/mandatory/socketFactories/RMIClientFactory.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/socketFactories/RMIClientFactory.java rename to test/jdk/javax/management/remote/mandatory/socketFactories/RMIClientFactory.java diff --git a/jdk/test/javax/management/remote/mandatory/socketFactories/RMIServerFactory.java b/test/jdk/javax/management/remote/mandatory/socketFactories/RMIServerFactory.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/socketFactories/RMIServerFactory.java rename to test/jdk/javax/management/remote/mandatory/socketFactories/RMIServerFactory.java diff --git a/jdk/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java b/test/jdk/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java rename to test/jdk/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/SimpleStandard.java b/test/jdk/javax/management/remote/mandatory/subjectDelegation/SimpleStandard.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/SimpleStandard.java rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/SimpleStandard.java diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/SimpleStandardMBean.java b/test/jdk/javax/management/remote/mandatory/subjectDelegation/SimpleStandardMBean.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/SimpleStandardMBean.java rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/SimpleStandardMBean.java diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java b/test/jdk/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java b/test/jdk/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java b/test/jdk/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/jmxremote.password b/test/jdk/javax/management/remote/mandatory/subjectDelegation/jmxremote.password similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/jmxremote.password rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/jmxremote.password diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy11 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy11 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy11 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy11 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy12 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy12 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy12 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy12 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy13 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy13 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy13 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy13 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy14 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy14 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy14 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy14 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy15 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy15 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy15 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy15 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy16 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy16 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy16 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy16 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy21 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy21 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy21 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy21 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy22 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy22 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy22 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy22 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy23 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy23 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy23 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy23 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy24 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy24 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy24 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy24 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy25 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy25 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy25 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy25 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy31 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy31 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy31 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy31 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy32 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy32 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy32 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy32 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy33 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy33 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy33 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy33 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy34 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy34 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy34 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy34 diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/policy35 b/test/jdk/javax/management/remote/mandatory/subjectDelegation/policy35 similarity index 100% rename from jdk/test/javax/management/remote/mandatory/subjectDelegation/policy35 rename to test/jdk/javax/management/remote/mandatory/subjectDelegation/policy35 diff --git a/jdk/test/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java b/test/jdk/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java rename to test/jdk/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java diff --git a/jdk/test/javax/management/remote/mandatory/threads/ExecutorTest.java b/test/jdk/javax/management/remote/mandatory/threads/ExecutorTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/threads/ExecutorTest.java rename to test/jdk/javax/management/remote/mandatory/threads/ExecutorTest.java diff --git a/jdk/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java b/test/jdk/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java rename to test/jdk/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java diff --git a/jdk/test/javax/management/remote/mandatory/util/MapNullValuesTest.java b/test/jdk/javax/management/remote/mandatory/util/MapNullValuesTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/util/MapNullValuesTest.java rename to test/jdk/javax/management/remote/mandatory/util/MapNullValuesTest.java diff --git a/jdk/test/javax/management/remote/mandatory/version/ImplVersionCommand.java b/test/jdk/javax/management/remote/mandatory/version/ImplVersionCommand.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/version/ImplVersionCommand.java rename to test/jdk/javax/management/remote/mandatory/version/ImplVersionCommand.java diff --git a/jdk/test/javax/management/remote/mandatory/version/ImplVersionReader.java b/test/jdk/javax/management/remote/mandatory/version/ImplVersionReader.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/version/ImplVersionReader.java rename to test/jdk/javax/management/remote/mandatory/version/ImplVersionReader.java diff --git a/jdk/test/javax/management/remote/mandatory/version/ImplVersionTest.java b/test/jdk/javax/management/remote/mandatory/version/ImplVersionTest.java similarity index 100% rename from jdk/test/javax/management/remote/mandatory/version/ImplVersionTest.java rename to test/jdk/javax/management/remote/mandatory/version/ImplVersionTest.java diff --git a/jdk/test/javax/management/remote/mandatory/version/policy b/test/jdk/javax/management/remote/mandatory/version/policy similarity index 100% rename from jdk/test/javax/management/remote/mandatory/version/policy rename to test/jdk/javax/management/remote/mandatory/version/policy diff --git a/jdk/test/javax/management/remote/nonLocalAccess/NonLocalJMXRemoteTest.java b/test/jdk/javax/management/remote/nonLocalAccess/NonLocalJMXRemoteTest.java similarity index 100% rename from jdk/test/javax/management/remote/nonLocalAccess/NonLocalJMXRemoteTest.java rename to test/jdk/javax/management/remote/nonLocalAccess/NonLocalJMXRemoteTest.java diff --git a/jdk/test/javax/management/security/AuthorizationTest.java b/test/jdk/javax/management/security/AuthorizationTest.java similarity index 100% rename from jdk/test/javax/management/security/AuthorizationTest.java rename to test/jdk/javax/management/security/AuthorizationTest.java diff --git a/jdk/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java b/test/jdk/javax/management/security/AvoidGetMBeanInfoCallsTest.java similarity index 100% rename from jdk/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java rename to test/jdk/javax/management/security/AvoidGetMBeanInfoCallsTest.java diff --git a/jdk/test/javax/management/security/MBS_Light.java b/test/jdk/javax/management/security/MBS_Light.java similarity index 100% rename from jdk/test/javax/management/security/MBS_Light.java rename to test/jdk/javax/management/security/MBS_Light.java diff --git a/jdk/test/javax/management/security/MBS_LightMBean.java b/test/jdk/javax/management/security/MBS_LightMBean.java similarity index 100% rename from jdk/test/javax/management/security/MBS_LightMBean.java rename to test/jdk/javax/management/security/MBS_LightMBean.java diff --git a/jdk/test/javax/management/security/MBeanPermissionTest.java b/test/jdk/javax/management/security/MBeanPermissionTest.java similarity index 100% rename from jdk/test/javax/management/security/MBeanPermissionTest.java rename to test/jdk/javax/management/security/MBeanPermissionTest.java diff --git a/jdk/test/javax/management/security/RjmxMBeanParameter.java b/test/jdk/javax/management/security/RjmxMBeanParameter.java similarity index 100% rename from jdk/test/javax/management/security/RjmxMBeanParameter.java rename to test/jdk/javax/management/security/RjmxMBeanParameter.java diff --git a/jdk/test/javax/management/security/SecurityTest.java b/test/jdk/javax/management/security/SecurityTest.java similarity index 100% rename from jdk/test/javax/management/security/SecurityTest.java rename to test/jdk/javax/management/security/SecurityTest.java diff --git a/jdk/test/javax/management/security/ServerDelegate.java b/test/jdk/javax/management/security/ServerDelegate.java similarity index 100% rename from jdk/test/javax/management/security/ServerDelegate.java rename to test/jdk/javax/management/security/ServerDelegate.java diff --git a/jdk/test/javax/management/security/ServerDelegateMBean.java b/test/jdk/javax/management/security/ServerDelegateMBean.java similarity index 100% rename from jdk/test/javax/management/security/ServerDelegateMBean.java rename to test/jdk/javax/management/security/ServerDelegateMBean.java diff --git a/jdk/test/javax/management/security/Simple.java b/test/jdk/javax/management/security/Simple.java similarity index 100% rename from jdk/test/javax/management/security/Simple.java rename to test/jdk/javax/management/security/Simple.java diff --git a/jdk/test/javax/management/security/SimpleListener.java b/test/jdk/javax/management/security/SimpleListener.java similarity index 100% rename from jdk/test/javax/management/security/SimpleListener.java rename to test/jdk/javax/management/security/SimpleListener.java diff --git a/jdk/test/javax/management/security/SimpleMBean.java b/test/jdk/javax/management/security/SimpleMBean.java similarity index 100% rename from jdk/test/javax/management/security/SimpleMBean.java rename to test/jdk/javax/management/security/SimpleMBean.java diff --git a/jdk/test/javax/management/security/SqeDescriptorKey.java b/test/jdk/javax/management/security/SqeDescriptorKey.java similarity index 100% rename from jdk/test/javax/management/security/SqeDescriptorKey.java rename to test/jdk/javax/management/security/SqeDescriptorKey.java diff --git a/jdk/test/javax/management/security/TestJMXAuthenticator.java b/test/jdk/javax/management/security/TestJMXAuthenticator.java similarity index 100% rename from jdk/test/javax/management/security/TestJMXAuthenticator.java rename to test/jdk/javax/management/security/TestJMXAuthenticator.java diff --git a/jdk/test/javax/management/security/TestSampleLoginModule.java b/test/jdk/javax/management/security/TestSampleLoginModule.java similarity index 100% rename from jdk/test/javax/management/security/TestSampleLoginModule.java rename to test/jdk/javax/management/security/TestSampleLoginModule.java diff --git a/jdk/test/javax/management/security/Utils.java b/test/jdk/javax/management/security/Utils.java similarity index 100% rename from jdk/test/javax/management/security/Utils.java rename to test/jdk/javax/management/security/Utils.java diff --git a/jdk/test/javax/management/security/access.properties b/test/jdk/javax/management/security/access.properties similarity index 100% rename from jdk/test/javax/management/security/access.properties rename to test/jdk/javax/management/security/access.properties diff --git a/jdk/test/javax/management/security/java.policy.authorization b/test/jdk/javax/management/security/java.policy.authorization similarity index 100% rename from jdk/test/javax/management/security/java.policy.authorization rename to test/jdk/javax/management/security/java.policy.authorization diff --git a/jdk/test/javax/management/security/keystoreAgent b/test/jdk/javax/management/security/keystoreAgent similarity index 100% rename from jdk/test/javax/management/security/keystoreAgent rename to test/jdk/javax/management/security/keystoreAgent diff --git a/jdk/test/javax/management/security/keystoreClient b/test/jdk/javax/management/security/keystoreClient similarity index 100% rename from jdk/test/javax/management/security/keystoreClient rename to test/jdk/javax/management/security/keystoreClient diff --git a/jdk/test/javax/management/security/login.config b/test/jdk/javax/management/security/login.config similarity index 100% rename from jdk/test/javax/management/security/login.config rename to test/jdk/javax/management/security/login.config diff --git a/jdk/test/javax/management/security/password.properties b/test/jdk/javax/management/security/password.properties similarity index 100% rename from jdk/test/javax/management/security/password.properties rename to test/jdk/javax/management/security/password.properties diff --git a/jdk/test/javax/management/security/truststoreAgent b/test/jdk/javax/management/security/truststoreAgent similarity index 100% rename from jdk/test/javax/management/security/truststoreAgent rename to test/jdk/javax/management/security/truststoreAgent diff --git a/jdk/test/javax/management/security/truststoreClient b/test/jdk/javax/management/security/truststoreClient similarity index 100% rename from jdk/test/javax/management/security/truststoreClient rename to test/jdk/javax/management/security/truststoreClient diff --git a/jdk/test/javax/management/standardmbean/DeadlockTest.java b/test/jdk/javax/management/standardmbean/DeadlockTest.java similarity index 100% rename from jdk/test/javax/management/standardmbean/DeadlockTest.java rename to test/jdk/javax/management/standardmbean/DeadlockTest.java diff --git a/jdk/test/javax/management/timer/MissingNotificationTest.java b/test/jdk/javax/management/timer/MissingNotificationTest.java similarity index 100% rename from jdk/test/javax/management/timer/MissingNotificationTest.java rename to test/jdk/javax/management/timer/MissingNotificationTest.java diff --git a/jdk/test/javax/management/timer/StartTest.java b/test/jdk/javax/management/timer/StartTest.java similarity index 100% rename from jdk/test/javax/management/timer/StartTest.java rename to test/jdk/javax/management/timer/StartTest.java diff --git a/jdk/test/javax/naming/InitialContext/AppletIsNotUsed.java b/test/jdk/javax/naming/InitialContext/AppletIsNotUsed.java similarity index 100% rename from jdk/test/javax/naming/InitialContext/AppletIsNotUsed.java rename to test/jdk/javax/naming/InitialContext/AppletIsNotUsed.java diff --git a/jdk/test/javax/naming/InitialContext/EnvClone.java b/test/jdk/javax/naming/InitialContext/EnvClone.java similarity index 100% rename from jdk/test/javax/naming/InitialContext/EnvClone.java rename to test/jdk/javax/naming/InitialContext/EnvClone.java diff --git a/jdk/test/javax/naming/InitialContext/NoApplet.java b/test/jdk/javax/naming/InitialContext/NoApplet.java similarity index 100% rename from jdk/test/javax/naming/InitialContext/NoApplet.java rename to test/jdk/javax/naming/InitialContext/NoApplet.java diff --git a/jdk/test/javax/naming/Name/Serialized13Name.java b/test/jdk/javax/naming/Name/Serialized13Name.java similarity index 100% rename from jdk/test/javax/naming/Name/Serialized13Name.java rename to test/jdk/javax/naming/Name/Serialized13Name.java diff --git a/jdk/test/javax/naming/Name/j2se13-name.ser b/test/jdk/javax/naming/Name/j2se13-name.ser similarity index 100% rename from jdk/test/javax/naming/Name/j2se13-name.ser rename to test/jdk/javax/naming/Name/j2se13-name.ser diff --git a/jdk/test/javax/naming/RefAddr/NullContent.java b/test/jdk/javax/naming/RefAddr/NullContent.java similarity index 100% rename from jdk/test/javax/naming/RefAddr/NullContent.java rename to test/jdk/javax/naming/RefAddr/NullContent.java diff --git a/jdk/test/javax/naming/TEST.properties b/test/jdk/javax/naming/TEST.properties similarity index 100% rename from jdk/test/javax/naming/TEST.properties rename to test/jdk/javax/naming/TEST.properties diff --git a/jdk/test/javax/naming/ldap/LdapName/CompareToEqualsTests.java b/test/jdk/javax/naming/ldap/LdapName/CompareToEqualsTests.java similarity index 100% rename from jdk/test/javax/naming/ldap/LdapName/CompareToEqualsTests.java rename to test/jdk/javax/naming/ldap/LdapName/CompareToEqualsTests.java diff --git a/jdk/test/javax/naming/ldap/LdapName/EscapeUnescapeTests.java b/test/jdk/javax/naming/ldap/LdapName/EscapeUnescapeTests.java similarity index 100% rename from jdk/test/javax/naming/ldap/LdapName/EscapeUnescapeTests.java rename to test/jdk/javax/naming/ldap/LdapName/EscapeUnescapeTests.java diff --git a/jdk/test/javax/naming/ldap/LdapName/LdapNameConstruction.java b/test/jdk/javax/naming/ldap/LdapName/LdapNameConstruction.java similarity index 100% rename from jdk/test/javax/naming/ldap/LdapName/LdapNameConstruction.java rename to test/jdk/javax/naming/ldap/LdapName/LdapNameConstruction.java diff --git a/jdk/test/javax/naming/ldap/LdapName/LdapParserTests.java b/test/jdk/javax/naming/ldap/LdapName/LdapParserTests.java similarity index 100% rename from jdk/test/javax/naming/ldap/LdapName/LdapParserTests.java rename to test/jdk/javax/naming/ldap/LdapName/LdapParserTests.java diff --git a/jdk/test/javax/naming/ldap/LdapName/NameTests.java b/test/jdk/javax/naming/ldap/LdapName/NameTests.java similarity index 100% rename from jdk/test/javax/naming/ldap/LdapName/NameTests.java rename to test/jdk/javax/naming/ldap/LdapName/NameTests.java diff --git a/jdk/test/javax/naming/ldap/LdapName/RdnMisc.java b/test/jdk/javax/naming/ldap/LdapName/RdnMisc.java similarity index 100% rename from jdk/test/javax/naming/ldap/LdapName/RdnMisc.java rename to test/jdk/javax/naming/ldap/LdapName/RdnMisc.java diff --git a/jdk/test/javax/naming/ldap/LdapName/RdnToAttrsTest.java b/test/jdk/javax/naming/ldap/LdapName/RdnToAttrsTest.java similarity index 100% rename from jdk/test/javax/naming/ldap/LdapName/RdnToAttrsTest.java rename to test/jdk/javax/naming/ldap/LdapName/RdnToAttrsTest.java diff --git a/jdk/test/javax/naming/ldap/LdapName/TrailingSpaceTest.java b/test/jdk/javax/naming/ldap/LdapName/TrailingSpaceTest.java similarity index 100% rename from jdk/test/javax/naming/ldap/LdapName/TrailingSpaceTest.java rename to test/jdk/javax/naming/ldap/LdapName/TrailingSpaceTest.java diff --git a/jdk/test/javax/naming/module/basic.sh b/test/jdk/javax/naming/module/basic.sh similarity index 100% rename from jdk/test/javax/naming/module/basic.sh rename to test/jdk/javax/naming/module/basic.sh diff --git a/jdk/test/javax/naming/module/src/authz/module-info.java b/test/jdk/javax/naming/module/src/authz/module-info.java similarity index 100% rename from jdk/test/javax/naming/module/src/authz/module-info.java rename to test/jdk/javax/naming/module/src/authz/module-info.java diff --git a/jdk/test/javax/naming/module/src/authz/org/example/authz/AuthzIdRequestControl.java b/test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdRequestControl.java similarity index 100% rename from jdk/test/javax/naming/module/src/authz/org/example/authz/AuthzIdRequestControl.java rename to test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdRequestControl.java diff --git a/jdk/test/javax/naming/module/src/authz/org/example/authz/AuthzIdResponseControl.java b/test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdResponseControl.java similarity index 100% rename from jdk/test/javax/naming/module/src/authz/org/example/authz/AuthzIdResponseControl.java rename to test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdResponseControl.java diff --git a/jdk/test/javax/naming/module/src/authz/org/example/authz/AuthzIdResponseControlFactory.java b/test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdResponseControlFactory.java similarity index 100% rename from jdk/test/javax/naming/module/src/authz/org/example/authz/AuthzIdResponseControlFactory.java rename to test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdResponseControlFactory.java diff --git a/jdk/test/javax/naming/module/src/foo/module-info.java b/test/jdk/javax/naming/module/src/foo/module-info.java similarity index 100% rename from jdk/test/javax/naming/module/src/foo/module-info.java rename to test/jdk/javax/naming/module/src/foo/module-info.java diff --git a/jdk/test/javax/naming/module/src/foo/org/example/foo/FooControl.java b/test/jdk/javax/naming/module/src/foo/org/example/foo/FooControl.java similarity index 100% rename from jdk/test/javax/naming/module/src/foo/org/example/foo/FooControl.java rename to test/jdk/javax/naming/module/src/foo/org/example/foo/FooControl.java diff --git a/jdk/test/javax/naming/module/src/fruit/module-info.java b/test/jdk/javax/naming/module/src/fruit/module-info.java similarity index 100% rename from jdk/test/javax/naming/module/src/fruit/module-info.java rename to test/jdk/javax/naming/module/src/fruit/module-info.java diff --git a/jdk/test/javax/naming/module/src/fruit/org/example/fruit/Fruit.java b/test/jdk/javax/naming/module/src/fruit/org/example/fruit/Fruit.java similarity index 100% rename from jdk/test/javax/naming/module/src/fruit/org/example/fruit/Fruit.java rename to test/jdk/javax/naming/module/src/fruit/org/example/fruit/Fruit.java diff --git a/jdk/test/javax/naming/module/src/fruit/org/example/fruit/FruitFactory.java b/test/jdk/javax/naming/module/src/fruit/org/example/fruit/FruitFactory.java similarity index 100% rename from jdk/test/javax/naming/module/src/fruit/org/example/fruit/FruitFactory.java rename to test/jdk/javax/naming/module/src/fruit/org/example/fruit/FruitFactory.java diff --git a/jdk/test/javax/naming/module/src/hello/module-info.java b/test/jdk/javax/naming/module/src/hello/module-info.java similarity index 100% rename from jdk/test/javax/naming/module/src/hello/module-info.java rename to test/jdk/javax/naming/module/src/hello/module-info.java diff --git a/jdk/test/javax/naming/module/src/hello/org/example/hello/Hello.java b/test/jdk/javax/naming/module/src/hello/org/example/hello/Hello.java similarity index 100% rename from jdk/test/javax/naming/module/src/hello/org/example/hello/Hello.java rename to test/jdk/javax/naming/module/src/hello/org/example/hello/Hello.java diff --git a/jdk/test/javax/naming/module/src/hello/org/example/hello/HelloImpl.java b/test/jdk/javax/naming/module/src/hello/org/example/hello/HelloImpl.java similarity index 100% rename from jdk/test/javax/naming/module/src/hello/org/example/hello/HelloImpl.java rename to test/jdk/javax/naming/module/src/hello/org/example/hello/HelloImpl.java diff --git a/jdk/test/javax/naming/module/src/ldapv4/module-info.java b/test/jdk/javax/naming/module/src/ldapv4/module-info.java similarity index 100% rename from jdk/test/javax/naming/module/src/ldapv4/module-info.java rename to test/jdk/javax/naming/module/src/ldapv4/module-info.java diff --git a/jdk/test/javax/naming/module/src/ldapv4/org/example/ldapv4/ldapv4URLContext.java b/test/jdk/javax/naming/module/src/ldapv4/org/example/ldapv4/ldapv4URLContext.java similarity index 100% rename from jdk/test/javax/naming/module/src/ldapv4/org/example/ldapv4/ldapv4URLContext.java rename to test/jdk/javax/naming/module/src/ldapv4/org/example/ldapv4/ldapv4URLContext.java diff --git a/jdk/test/javax/naming/module/src/ldapv4/org/example/ldapv4/ldapv4URLContextFactory.java b/test/jdk/javax/naming/module/src/ldapv4/org/example/ldapv4/ldapv4URLContextFactory.java similarity index 100% rename from jdk/test/javax/naming/module/src/ldapv4/org/example/ldapv4/ldapv4URLContextFactory.java rename to test/jdk/javax/naming/module/src/ldapv4/org/example/ldapv4/ldapv4URLContextFactory.java diff --git a/jdk/test/javax/naming/module/src/person/module-info.java b/test/jdk/javax/naming/module/src/person/module-info.java similarity index 100% rename from jdk/test/javax/naming/module/src/person/module-info.java rename to test/jdk/javax/naming/module/src/person/module-info.java diff --git a/jdk/test/javax/naming/module/src/person/org/example/person/Person.java b/test/jdk/javax/naming/module/src/person/org/example/person/Person.java similarity index 100% rename from jdk/test/javax/naming/module/src/person/org/example/person/Person.java rename to test/jdk/javax/naming/module/src/person/org/example/person/Person.java diff --git a/jdk/test/javax/naming/module/src/person/org/example/person/PersonFactory.java b/test/jdk/javax/naming/module/src/person/org/example/person/PersonFactory.java similarity index 100% rename from jdk/test/javax/naming/module/src/person/org/example/person/PersonFactory.java rename to test/jdk/javax/naming/module/src/person/org/example/person/PersonFactory.java diff --git a/jdk/test/javax/naming/module/src/test/module-info.java b/test/jdk/javax/naming/module/src/test/module-info.java similarity index 100% rename from jdk/test/javax/naming/module/src/test/module-info.java rename to test/jdk/javax/naming/module/src/test/module-info.java diff --git a/jdk/test/javax/naming/module/src/test/test/ConnectWithAuthzId.java b/test/jdk/javax/naming/module/src/test/test/ConnectWithAuthzId.java similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/ConnectWithAuthzId.java rename to test/jdk/javax/naming/module/src/test/test/ConnectWithAuthzId.java diff --git a/jdk/test/javax/naming/module/src/test/test/ConnectWithAuthzId.ldap b/test/jdk/javax/naming/module/src/test/test/ConnectWithAuthzId.ldap similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/ConnectWithAuthzId.ldap rename to test/jdk/javax/naming/module/src/test/test/ConnectWithAuthzId.ldap diff --git a/jdk/test/javax/naming/module/src/test/test/ConnectWithFoo.java b/test/jdk/javax/naming/module/src/test/test/ConnectWithFoo.java similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/ConnectWithFoo.java rename to test/jdk/javax/naming/module/src/test/test/ConnectWithFoo.java diff --git a/jdk/test/javax/naming/module/src/test/test/ConnectWithFoo.ldap b/test/jdk/javax/naming/module/src/test/test/ConnectWithFoo.ldap similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/ConnectWithFoo.ldap rename to test/jdk/javax/naming/module/src/test/test/ConnectWithFoo.ldap diff --git a/jdk/test/javax/naming/module/src/test/test/LDAPServer.java b/test/jdk/javax/naming/module/src/test/test/LDAPServer.java similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/LDAPServer.java rename to test/jdk/javax/naming/module/src/test/test/LDAPServer.java diff --git a/jdk/test/javax/naming/module/src/test/test/ReadByUrl.java b/test/jdk/javax/naming/module/src/test/test/ReadByUrl.java similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/ReadByUrl.java rename to test/jdk/javax/naming/module/src/test/test/ReadByUrl.java diff --git a/jdk/test/javax/naming/module/src/test/test/ReadByUrl.ldap b/test/jdk/javax/naming/module/src/test/test/ReadByUrl.ldap similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/ReadByUrl.ldap rename to test/jdk/javax/naming/module/src/test/test/ReadByUrl.ldap diff --git a/jdk/test/javax/naming/module/src/test/test/StoreFruit.java b/test/jdk/javax/naming/module/src/test/test/StoreFruit.java similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/StoreFruit.java rename to test/jdk/javax/naming/module/src/test/test/StoreFruit.java diff --git a/jdk/test/javax/naming/module/src/test/test/StoreFruit.ldap b/test/jdk/javax/naming/module/src/test/test/StoreFruit.ldap similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/StoreFruit.ldap rename to test/jdk/javax/naming/module/src/test/test/StoreFruit.ldap diff --git a/jdk/test/javax/naming/module/src/test/test/StoreObject.java b/test/jdk/javax/naming/module/src/test/test/StoreObject.java similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/StoreObject.java rename to test/jdk/javax/naming/module/src/test/test/StoreObject.java diff --git a/jdk/test/javax/naming/module/src/test/test/StoreObject.ldap b/test/jdk/javax/naming/module/src/test/test/StoreObject.ldap similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/StoreObject.ldap rename to test/jdk/javax/naming/module/src/test/test/StoreObject.ldap diff --git a/jdk/test/javax/naming/module/src/test/test/StorePerson.java b/test/jdk/javax/naming/module/src/test/test/StorePerson.java similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/StorePerson.java rename to test/jdk/javax/naming/module/src/test/test/StorePerson.java diff --git a/jdk/test/javax/naming/module/src/test/test/StorePerson.ldap b/test/jdk/javax/naming/module/src/test/test/StorePerson.ldap similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/StorePerson.ldap rename to test/jdk/javax/naming/module/src/test/test/StorePerson.ldap diff --git a/jdk/test/javax/naming/module/src/test/test/StoreRemote.java b/test/jdk/javax/naming/module/src/test/test/StoreRemote.java similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/StoreRemote.java rename to test/jdk/javax/naming/module/src/test/test/StoreRemote.java diff --git a/jdk/test/javax/naming/module/src/test/test/StoreRemote.ldap b/test/jdk/javax/naming/module/src/test/test/StoreRemote.ldap similarity index 100% rename from jdk/test/javax/naming/module/src/test/test/StoreRemote.ldap rename to test/jdk/javax/naming/module/src/test/test/StoreRemote.ldap diff --git a/jdk/test/javax/naming/spi/DirectoryManager/DummyContext.java b/test/jdk/javax/naming/spi/DirectoryManager/DummyContext.java similarity index 100% rename from jdk/test/javax/naming/spi/DirectoryManager/DummyContext.java rename to test/jdk/javax/naming/spi/DirectoryManager/DummyContext.java diff --git a/jdk/test/javax/naming/spi/DirectoryManager/DummyObjectFactory.java b/test/jdk/javax/naming/spi/DirectoryManager/DummyObjectFactory.java similarity index 100% rename from jdk/test/javax/naming/spi/DirectoryManager/DummyObjectFactory.java rename to test/jdk/javax/naming/spi/DirectoryManager/DummyObjectFactory.java diff --git a/jdk/test/javax/naming/spi/DirectoryManager/GetContDirCtx.java b/test/jdk/javax/naming/spi/DirectoryManager/GetContDirCtx.java similarity index 100% rename from jdk/test/javax/naming/spi/DirectoryManager/GetContDirCtx.java rename to test/jdk/javax/naming/spi/DirectoryManager/GetContDirCtx.java diff --git a/jdk/test/javax/naming/spi/providers/InitialContextTest.java b/test/jdk/javax/naming/spi/providers/InitialContextTest.java similarity index 100% rename from jdk/test/javax/naming/spi/providers/InitialContextTest.java rename to test/jdk/javax/naming/spi/providers/InitialContextTest.java diff --git a/jdk/test/javax/naming/spi/providers/broken_factory.template b/test/jdk/javax/naming/spi/providers/broken_factory.template similarity index 100% rename from jdk/test/javax/naming/spi/providers/broken_factory.template rename to test/jdk/javax/naming/spi/providers/broken_factory.template diff --git a/jdk/test/javax/naming/spi/providers/factory.template b/test/jdk/javax/naming/spi/providers/factory.template similarity index 100% rename from jdk/test/javax/naming/spi/providers/factory.template rename to test/jdk/javax/naming/spi/providers/factory.template diff --git a/jdk/test/javax/naming/spi/providers/test.template b/test/jdk/javax/naming/spi/providers/test.template similarity index 100% rename from jdk/test/javax/naming/spi/providers/test.template rename to test/jdk/javax/naming/spi/providers/test.template diff --git a/jdk/test/javax/net/ssl/ALPN/MyX509ExtendedKeyManager.java b/test/jdk/javax/net/ssl/ALPN/MyX509ExtendedKeyManager.java similarity index 100% rename from jdk/test/javax/net/ssl/ALPN/MyX509ExtendedKeyManager.java rename to test/jdk/javax/net/ssl/ALPN/MyX509ExtendedKeyManager.java diff --git a/jdk/test/javax/net/ssl/ALPN/SSLEngineAlpnTest.java b/test/jdk/javax/net/ssl/ALPN/SSLEngineAlpnTest.java similarity index 100% rename from jdk/test/javax/net/ssl/ALPN/SSLEngineAlpnTest.java rename to test/jdk/javax/net/ssl/ALPN/SSLEngineAlpnTest.java diff --git a/jdk/test/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java b/test/jdk/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java similarity index 100% rename from jdk/test/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java rename to test/jdk/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java diff --git a/jdk/test/javax/net/ssl/ALPN/SSLSocketAlpnTest.java b/test/jdk/javax/net/ssl/ALPN/SSLSocketAlpnTest.java similarity index 100% rename from jdk/test/javax/net/ssl/ALPN/SSLSocketAlpnTest.java rename to test/jdk/javax/net/ssl/ALPN/SSLSocketAlpnTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/CipherSuite.java b/test/jdk/javax/net/ssl/DTLS/CipherSuite.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/CipherSuite.java rename to test/jdk/javax/net/ssl/DTLS/CipherSuite.java diff --git a/jdk/test/javax/net/ssl/DTLS/ClientAuth.java b/test/jdk/javax/net/ssl/DTLS/ClientAuth.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/ClientAuth.java rename to test/jdk/javax/net/ssl/DTLS/ClientAuth.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSBufferOverflowUnderflowTest.java b/test/jdk/javax/net/ssl/DTLS/DTLSBufferOverflowUnderflowTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSBufferOverflowUnderflowTest.java rename to test/jdk/javax/net/ssl/DTLS/DTLSBufferOverflowUnderflowTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSDataExchangeTest.java b/test/jdk/javax/net/ssl/DTLS/DTLSDataExchangeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSDataExchangeTest.java rename to test/jdk/javax/net/ssl/DTLS/DTLSDataExchangeTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSEnginesClosureTest.java b/test/jdk/javax/net/ssl/DTLS/DTLSEnginesClosureTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSEnginesClosureTest.java rename to test/jdk/javax/net/ssl/DTLS/DTLSEnginesClosureTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSHandshakeTest.java b/test/jdk/javax/net/ssl/DTLS/DTLSHandshakeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSHandshakeTest.java rename to test/jdk/javax/net/ssl/DTLS/DTLSHandshakeTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSHandshakeWithReplicatedPacketsTest.java b/test/jdk/javax/net/ssl/DTLS/DTLSHandshakeWithReplicatedPacketsTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSHandshakeWithReplicatedPacketsTest.java rename to test/jdk/javax/net/ssl/DTLS/DTLSHandshakeWithReplicatedPacketsTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSIncorrectAppDataTest.java b/test/jdk/javax/net/ssl/DTLS/DTLSIncorrectAppDataTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSIncorrectAppDataTest.java rename to test/jdk/javax/net/ssl/DTLS/DTLSIncorrectAppDataTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSMFLNTest.java b/test/jdk/javax/net/ssl/DTLS/DTLSMFLNTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSMFLNTest.java rename to test/jdk/javax/net/ssl/DTLS/DTLSMFLNTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSNotEnabledRC4Test.java b/test/jdk/javax/net/ssl/DTLS/DTLSNotEnabledRC4Test.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSNotEnabledRC4Test.java rename to test/jdk/javax/net/ssl/DTLS/DTLSNotEnabledRC4Test.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSOverDatagram.java b/test/jdk/javax/net/ssl/DTLS/DTLSOverDatagram.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSOverDatagram.java rename to test/jdk/javax/net/ssl/DTLS/DTLSOverDatagram.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSRehandshakeTest.java b/test/jdk/javax/net/ssl/DTLS/DTLSRehandshakeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSRehandshakeTest.java rename to test/jdk/javax/net/ssl/DTLS/DTLSRehandshakeTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSRehandshakeWithCipherChangeTest.java b/test/jdk/javax/net/ssl/DTLS/DTLSRehandshakeWithCipherChangeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSRehandshakeWithCipherChangeTest.java rename to test/jdk/javax/net/ssl/DTLS/DTLSRehandshakeWithCipherChangeTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSRehandshakeWithDataExTest.java b/test/jdk/javax/net/ssl/DTLS/DTLSRehandshakeWithDataExTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSRehandshakeWithDataExTest.java rename to test/jdk/javax/net/ssl/DTLS/DTLSRehandshakeWithDataExTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSSequenceNumberTest.java b/test/jdk/javax/net/ssl/DTLS/DTLSSequenceNumberTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSSequenceNumberTest.java rename to test/jdk/javax/net/ssl/DTLS/DTLSSequenceNumberTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSUnsupportedCiphersTest.java b/test/jdk/javax/net/ssl/DTLS/DTLSUnsupportedCiphersTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/DTLSUnsupportedCiphersTest.java rename to test/jdk/javax/net/ssl/DTLS/DTLSUnsupportedCiphersTest.java diff --git a/jdk/test/javax/net/ssl/DTLS/InvalidCookie.java b/test/jdk/javax/net/ssl/DTLS/InvalidCookie.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/InvalidCookie.java rename to test/jdk/javax/net/ssl/DTLS/InvalidCookie.java diff --git a/jdk/test/javax/net/ssl/DTLS/InvalidRecords.java b/test/jdk/javax/net/ssl/DTLS/InvalidRecords.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/InvalidRecords.java rename to test/jdk/javax/net/ssl/DTLS/InvalidRecords.java diff --git a/jdk/test/javax/net/ssl/DTLS/NoMacInitialClientHello.java b/test/jdk/javax/net/ssl/DTLS/NoMacInitialClientHello.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/NoMacInitialClientHello.java rename to test/jdk/javax/net/ssl/DTLS/NoMacInitialClientHello.java diff --git a/jdk/test/javax/net/ssl/DTLS/PacketLossRetransmission.java b/test/jdk/javax/net/ssl/DTLS/PacketLossRetransmission.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/PacketLossRetransmission.java rename to test/jdk/javax/net/ssl/DTLS/PacketLossRetransmission.java diff --git a/jdk/test/javax/net/ssl/DTLS/Reordered.java b/test/jdk/javax/net/ssl/DTLS/Reordered.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/Reordered.java rename to test/jdk/javax/net/ssl/DTLS/Reordered.java diff --git a/jdk/test/javax/net/ssl/DTLS/RespondToRetransmit.java b/test/jdk/javax/net/ssl/DTLS/RespondToRetransmit.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/RespondToRetransmit.java rename to test/jdk/javax/net/ssl/DTLS/RespondToRetransmit.java diff --git a/jdk/test/javax/net/ssl/DTLS/Retransmission.java b/test/jdk/javax/net/ssl/DTLS/Retransmission.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/Retransmission.java rename to test/jdk/javax/net/ssl/DTLS/Retransmission.java diff --git a/jdk/test/javax/net/ssl/DTLS/TEST.properties b/test/jdk/javax/net/ssl/DTLS/TEST.properties similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/TEST.properties rename to test/jdk/javax/net/ssl/DTLS/TEST.properties diff --git a/jdk/test/javax/net/ssl/DTLS/WeakCipherSuite.java b/test/jdk/javax/net/ssl/DTLS/WeakCipherSuite.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLS/WeakCipherSuite.java rename to test/jdk/javax/net/ssl/DTLS/WeakCipherSuite.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10BufferOverflowUnderflowTest.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10BufferOverflowUnderflowTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10BufferOverflowUnderflowTest.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10BufferOverflowUnderflowTest.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10DataExchangeTest.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10DataExchangeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10DataExchangeTest.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10DataExchangeTest.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10EnginesClosureTest.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10EnginesClosureTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10EnginesClosureTest.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10EnginesClosureTest.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10HandshakeTest.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10HandshakeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10HandshakeTest.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10HandshakeTest.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10HandshakeWithReplicatedPacketsTest.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10HandshakeWithReplicatedPacketsTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10HandshakeWithReplicatedPacketsTest.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10HandshakeWithReplicatedPacketsTest.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10IncorrectAppDataTest.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10IncorrectAppDataTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10IncorrectAppDataTest.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10IncorrectAppDataTest.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10MFLNTest.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10MFLNTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10MFLNTest.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10MFLNTest.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10NotEnabledRC4Test.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10NotEnabledRC4Test.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10NotEnabledRC4Test.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10NotEnabledRC4Test.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeTest.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10RehandshakeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeTest.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10RehandshakeTest.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithCipherChangeTest.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithCipherChangeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithCipherChangeTest.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithCipherChangeTest.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithDataExTest.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithDataExTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithDataExTest.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithDataExTest.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10SequenceNumberTest.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10SequenceNumberTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10SequenceNumberTest.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10SequenceNumberTest.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10UnsupportedCiphersTest.java b/test/jdk/javax/net/ssl/DTLSv10/DTLSv10UnsupportedCiphersTest.java similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/DTLSv10UnsupportedCiphersTest.java rename to test/jdk/javax/net/ssl/DTLSv10/DTLSv10UnsupportedCiphersTest.java diff --git a/jdk/test/javax/net/ssl/DTLSv10/TEST.properties b/test/jdk/javax/net/ssl/DTLSv10/TEST.properties similarity index 100% rename from jdk/test/javax/net/ssl/DTLSv10/TEST.properties rename to test/jdk/javax/net/ssl/DTLSv10/TEST.properties diff --git a/jdk/test/javax/net/ssl/Fix5070632.java b/test/jdk/javax/net/ssl/Fix5070632.java similarity index 100% rename from jdk/test/javax/net/ssl/Fix5070632.java rename to test/jdk/javax/net/ssl/Fix5070632.java diff --git a/jdk/test/javax/net/ssl/FixingJavadocs/ComURLNulls.java b/test/jdk/javax/net/ssl/FixingJavadocs/ComURLNulls.java similarity index 100% rename from jdk/test/javax/net/ssl/FixingJavadocs/ComURLNulls.java rename to test/jdk/javax/net/ssl/FixingJavadocs/ComURLNulls.java diff --git a/jdk/test/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java b/test/jdk/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java similarity index 100% rename from jdk/test/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java rename to test/jdk/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java diff --git a/jdk/test/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java b/test/jdk/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java similarity index 100% rename from jdk/test/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java rename to test/jdk/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java diff --git a/jdk/test/javax/net/ssl/FixingJavadocs/KMTMGetNothing.java b/test/jdk/javax/net/ssl/FixingJavadocs/KMTMGetNothing.java similarity index 100% rename from jdk/test/javax/net/ssl/FixingJavadocs/KMTMGetNothing.java rename to test/jdk/javax/net/ssl/FixingJavadocs/KMTMGetNothing.java diff --git a/jdk/test/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java b/test/jdk/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java similarity index 100% rename from jdk/test/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java rename to test/jdk/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java diff --git a/jdk/test/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java b/test/jdk/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java similarity index 100% rename from jdk/test/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java rename to test/jdk/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java diff --git a/jdk/test/javax/net/ssl/GetInstance.java b/test/jdk/javax/net/ssl/GetInstance.java similarity index 100% rename from jdk/test/javax/net/ssl/GetInstance.java rename to test/jdk/javax/net/ssl/GetInstance.java diff --git a/jdk/test/javax/net/ssl/HttpsURLConnection/CriticalSubjectAltName.java b/test/jdk/javax/net/ssl/HttpsURLConnection/CriticalSubjectAltName.java similarity index 100% rename from jdk/test/javax/net/ssl/HttpsURLConnection/CriticalSubjectAltName.java rename to test/jdk/javax/net/ssl/HttpsURLConnection/CriticalSubjectAltName.java diff --git a/jdk/test/javax/net/ssl/HttpsURLConnection/DelayDefaultContextLoading.java b/test/jdk/javax/net/ssl/HttpsURLConnection/DelayDefaultContextLoading.java similarity index 100% rename from jdk/test/javax/net/ssl/HttpsURLConnection/DelayDefaultContextLoading.java rename to test/jdk/javax/net/ssl/HttpsURLConnection/DelayDefaultContextLoading.java diff --git a/jdk/test/javax/net/ssl/HttpsURLConnection/Equals.java b/test/jdk/javax/net/ssl/HttpsURLConnection/Equals.java similarity index 100% rename from jdk/test/javax/net/ssl/HttpsURLConnection/Equals.java rename to test/jdk/javax/net/ssl/HttpsURLConnection/Equals.java diff --git a/jdk/test/javax/net/ssl/HttpsURLConnection/GetResponseCode.java b/test/jdk/javax/net/ssl/HttpsURLConnection/GetResponseCode.java similarity index 100% rename from jdk/test/javax/net/ssl/HttpsURLConnection/GetResponseCode.java rename to test/jdk/javax/net/ssl/HttpsURLConnection/GetResponseCode.java diff --git a/jdk/test/javax/net/ssl/HttpsURLConnection/crisubn.jks b/test/jdk/javax/net/ssl/HttpsURLConnection/crisubn.jks similarity index 100% rename from jdk/test/javax/net/ssl/HttpsURLConnection/crisubn.jks rename to test/jdk/javax/net/ssl/HttpsURLConnection/crisubn.jks diff --git a/jdk/test/javax/net/ssl/HttpsURLConnection/trusted.jks b/test/jdk/javax/net/ssl/HttpsURLConnection/trusted.jks similarity index 100% rename from jdk/test/javax/net/ssl/HttpsURLConnection/trusted.jks rename to test/jdk/javax/net/ssl/HttpsURLConnection/trusted.jks diff --git a/jdk/test/javax/net/ssl/README b/test/jdk/javax/net/ssl/README similarity index 100% rename from jdk/test/javax/net/ssl/README rename to test/jdk/javax/net/ssl/README diff --git a/jdk/test/javax/net/ssl/SSLEngine/AcceptLargeFragments.java b/test/jdk/javax/net/ssl/SSLEngine/AcceptLargeFragments.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/AcceptLargeFragments.java rename to test/jdk/javax/net/ssl/SSLEngine/AcceptLargeFragments.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/ArgCheck.java b/test/jdk/javax/net/ssl/SSLEngine/ArgCheck.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/ArgCheck.java rename to test/jdk/javax/net/ssl/SSLEngine/ArgCheck.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/Arrays.java b/test/jdk/javax/net/ssl/SSLEngine/Arrays.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/Arrays.java rename to test/jdk/javax/net/ssl/SSLEngine/Arrays.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/Basics.java b/test/jdk/javax/net/ssl/SSLEngine/Basics.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/Basics.java rename to test/jdk/javax/net/ssl/SSLEngine/Basics.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/CheckStatus.java b/test/jdk/javax/net/ssl/SSLEngine/CheckStatus.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/CheckStatus.java rename to test/jdk/javax/net/ssl/SSLEngine/CheckStatus.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/ConnectionTest.java b/test/jdk/javax/net/ssl/SSLEngine/ConnectionTest.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/ConnectionTest.java rename to test/jdk/javax/net/ssl/SSLEngine/ConnectionTest.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/EngineCloseOnAlert.java b/test/jdk/javax/net/ssl/SSLEngine/EngineCloseOnAlert.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/EngineCloseOnAlert.java rename to test/jdk/javax/net/ssl/SSLEngine/EngineCloseOnAlert.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/ExtendedKeyEngine.java b/test/jdk/javax/net/ssl/SSLEngine/ExtendedKeyEngine.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/ExtendedKeyEngine.java rename to test/jdk/javax/net/ssl/SSLEngine/ExtendedKeyEngine.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/ExtendedKeySocket.java b/test/jdk/javax/net/ssl/SSLEngine/ExtendedKeySocket.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/ExtendedKeySocket.java rename to test/jdk/javax/net/ssl/SSLEngine/ExtendedKeySocket.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/IllegalHandshakeMessage.java b/test/jdk/javax/net/ssl/SSLEngine/IllegalHandshakeMessage.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/IllegalHandshakeMessage.java rename to test/jdk/javax/net/ssl/SSLEngine/IllegalHandshakeMessage.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/IllegalRecordVersion.java b/test/jdk/javax/net/ssl/SSLEngine/IllegalRecordVersion.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/IllegalRecordVersion.java rename to test/jdk/javax/net/ssl/SSLEngine/IllegalRecordVersion.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/LargeBufs.java b/test/jdk/javax/net/ssl/SSLEngine/LargeBufs.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/LargeBufs.java rename to test/jdk/javax/net/ssl/SSLEngine/LargeBufs.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/LargePacket.java b/test/jdk/javax/net/ssl/SSLEngine/LargePacket.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/LargePacket.java rename to test/jdk/javax/net/ssl/SSLEngine/LargePacket.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/MyX509ExtendedKeyManager.java b/test/jdk/javax/net/ssl/SSLEngine/MyX509ExtendedKeyManager.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/MyX509ExtendedKeyManager.java rename to test/jdk/javax/net/ssl/SSLEngine/MyX509ExtendedKeyManager.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/MyX509KeyManager.java b/test/jdk/javax/net/ssl/SSLEngine/MyX509KeyManager.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/MyX509KeyManager.java rename to test/jdk/javax/net/ssl/SSLEngine/MyX509KeyManager.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/NoAuthClientAuth.java b/test/jdk/javax/net/ssl/SSLEngine/NoAuthClientAuth.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/NoAuthClientAuth.java rename to test/jdk/javax/net/ssl/SSLEngine/NoAuthClientAuth.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/SSLEngineResultArgs.java b/test/jdk/javax/net/ssl/SSLEngine/SSLEngineResultArgs.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/SSLEngineResultArgs.java rename to test/jdk/javax/net/ssl/SSLEngine/SSLEngineResultArgs.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/SSLEngineService.java b/test/jdk/javax/net/ssl/SSLEngine/SSLEngineService.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/SSLEngineService.java rename to test/jdk/javax/net/ssl/SSLEngine/SSLEngineService.java diff --git a/jdk/test/javax/net/ssl/SSLEngine/TestAllSuites.java b/test/jdk/javax/net/ssl/SSLEngine/TestAllSuites.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngine/TestAllSuites.java rename to test/jdk/javax/net/ssl/SSLEngine/TestAllSuites.java diff --git a/jdk/test/javax/net/ssl/SSLEngineResult/Deserialize.java b/test/jdk/javax/net/ssl/SSLEngineResult/Deserialize.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLEngineResult/Deserialize.java rename to test/jdk/javax/net/ssl/SSLEngineResult/Deserialize.java diff --git a/jdk/test/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java b/test/jdk/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java rename to test/jdk/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java diff --git a/jdk/test/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java b/test/jdk/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java rename to test/jdk/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java diff --git a/jdk/test/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java b/test/jdk/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java rename to test/jdk/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java diff --git a/jdk/test/javax/net/ssl/SSLSession/HttpsURLConnectionLocalCertificateChain.java b/test/jdk/javax/net/ssl/SSLSession/HttpsURLConnectionLocalCertificateChain.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLSession/HttpsURLConnectionLocalCertificateChain.java rename to test/jdk/javax/net/ssl/SSLSession/HttpsURLConnectionLocalCertificateChain.java diff --git a/jdk/test/javax/net/ssl/SSLSession/JSSERenegotiate.java b/test/jdk/javax/net/ssl/SSLSession/JSSERenegotiate.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLSession/JSSERenegotiate.java rename to test/jdk/javax/net/ssl/SSLSession/JSSERenegotiate.java diff --git a/jdk/test/javax/net/ssl/SSLSession/KeyManagerTrustManager.java b/test/jdk/javax/net/ssl/SSLSession/KeyManagerTrustManager.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLSession/KeyManagerTrustManager.java rename to test/jdk/javax/net/ssl/SSLSession/KeyManagerTrustManager.java diff --git a/jdk/test/javax/net/ssl/SSLSession/SSLCtxAccessToSessCtx.java b/test/jdk/javax/net/ssl/SSLSession/SSLCtxAccessToSessCtx.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLSession/SSLCtxAccessToSessCtx.java rename to test/jdk/javax/net/ssl/SSLSession/SSLCtxAccessToSessCtx.java diff --git a/jdk/test/javax/net/ssl/SSLSession/SessionCacheSizeTests.java b/test/jdk/javax/net/ssl/SSLSession/SessionCacheSizeTests.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLSession/SessionCacheSizeTests.java rename to test/jdk/javax/net/ssl/SSLSession/SessionCacheSizeTests.java diff --git a/jdk/test/javax/net/ssl/SSLSession/SessionTimeOutTests.java b/test/jdk/javax/net/ssl/SSLSession/SessionTimeOutTests.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLSession/SessionTimeOutTests.java rename to test/jdk/javax/net/ssl/SSLSession/SessionTimeOutTests.java diff --git a/jdk/test/javax/net/ssl/SSLSession/TestEnabledProtocols.java b/test/jdk/javax/net/ssl/SSLSession/TestEnabledProtocols.java similarity index 100% rename from jdk/test/javax/net/ssl/SSLSession/TestEnabledProtocols.java rename to test/jdk/javax/net/ssl/SSLSession/TestEnabledProtocols.java diff --git a/jdk/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java b/test/jdk/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java rename to test/jdk/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java diff --git a/jdk/test/javax/net/ssl/ServerName/IllegalSNIName.java b/test/jdk/javax/net/ssl/ServerName/IllegalSNIName.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/IllegalSNIName.java rename to test/jdk/javax/net/ssl/ServerName/IllegalSNIName.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorer.java b/test/jdk/javax/net/ssl/ServerName/SSLEngineExplorer.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLEngineExplorer.java rename to test/jdk/javax/net/ssl/ServerName/SSLEngineExplorer.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java rename to test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java rename to test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java b/test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java rename to test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java b/test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java rename to test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java rename to test/jdk/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorer.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorer.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLSocketExplorer.java rename to test/jdk/javax/net/ssl/ServerName/SSLSocketExplorer.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java rename to test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java rename to test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java rename to test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java rename to test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java rename to test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java rename to test/jdk/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketSNISensitive.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketSNISensitive.java similarity index 100% rename from jdk/test/javax/net/ssl/ServerName/SSLSocketSNISensitive.java rename to test/jdk/javax/net/ssl/ServerName/SSLSocketSNISensitive.java diff --git a/jdk/test/javax/net/ssl/Stapling/HttpsUrlConnClient.java b/test/jdk/javax/net/ssl/Stapling/HttpsUrlConnClient.java similarity index 100% rename from jdk/test/javax/net/ssl/Stapling/HttpsUrlConnClient.java rename to test/jdk/javax/net/ssl/Stapling/HttpsUrlConnClient.java diff --git a/jdk/test/javax/net/ssl/Stapling/SSLEngineWithStapling.java b/test/jdk/javax/net/ssl/Stapling/SSLEngineWithStapling.java similarity index 100% rename from jdk/test/javax/net/ssl/Stapling/SSLEngineWithStapling.java rename to test/jdk/javax/net/ssl/Stapling/SSLEngineWithStapling.java diff --git a/jdk/test/javax/net/ssl/Stapling/SSLSocketWithStapling.java b/test/jdk/javax/net/ssl/Stapling/SSLSocketWithStapling.java similarity index 100% rename from jdk/test/javax/net/ssl/Stapling/SSLSocketWithStapling.java rename to test/jdk/javax/net/ssl/Stapling/SSLSocketWithStapling.java diff --git a/jdk/test/javax/net/ssl/Stapling/StapleEnableProps.java b/test/jdk/javax/net/ssl/Stapling/StapleEnableProps.java similarity index 100% rename from jdk/test/javax/net/ssl/Stapling/StapleEnableProps.java rename to test/jdk/javax/net/ssl/Stapling/StapleEnableProps.java diff --git a/jdk/test/javax/net/ssl/Stapling/TEST.properties b/test/jdk/javax/net/ssl/Stapling/TEST.properties similarity index 100% rename from jdk/test/javax/net/ssl/Stapling/TEST.properties rename to test/jdk/javax/net/ssl/Stapling/TEST.properties diff --git a/jdk/test/javax/net/ssl/TLS/CipherTestUtils.java b/test/jdk/javax/net/ssl/TLS/CipherTestUtils.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/CipherTestUtils.java rename to test/jdk/javax/net/ssl/TLS/CipherTestUtils.java diff --git a/jdk/test/javax/net/ssl/TLS/JSSEClient.java b/test/jdk/javax/net/ssl/TLS/JSSEClient.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/JSSEClient.java rename to test/jdk/javax/net/ssl/TLS/JSSEClient.java diff --git a/jdk/test/javax/net/ssl/TLS/JSSEServer.java b/test/jdk/javax/net/ssl/TLS/JSSEServer.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/JSSEServer.java rename to test/jdk/javax/net/ssl/TLS/JSSEServer.java diff --git a/jdk/test/javax/net/ssl/TLS/TEST.properties b/test/jdk/javax/net/ssl/TLS/TEST.properties similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TEST.properties rename to test/jdk/javax/net/ssl/TLS/TEST.properties diff --git a/jdk/test/javax/net/ssl/TLS/TLSClientPropertyTest.java b/test/jdk/javax/net/ssl/TLS/TLSClientPropertyTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TLSClientPropertyTest.java rename to test/jdk/javax/net/ssl/TLS/TLSClientPropertyTest.java diff --git a/jdk/test/javax/net/ssl/TLS/TLSDataExchangeTest.java b/test/jdk/javax/net/ssl/TLS/TLSDataExchangeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TLSDataExchangeTest.java rename to test/jdk/javax/net/ssl/TLS/TLSDataExchangeTest.java diff --git a/jdk/test/javax/net/ssl/TLS/TLSEnginesClosureTest.java b/test/jdk/javax/net/ssl/TLS/TLSEnginesClosureTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TLSEnginesClosureTest.java rename to test/jdk/javax/net/ssl/TLS/TLSEnginesClosureTest.java diff --git a/jdk/test/javax/net/ssl/TLS/TLSHandshakeTest.java b/test/jdk/javax/net/ssl/TLS/TLSHandshakeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TLSHandshakeTest.java rename to test/jdk/javax/net/ssl/TLS/TLSHandshakeTest.java diff --git a/jdk/test/javax/net/ssl/TLS/TLSMFLNTest.java b/test/jdk/javax/net/ssl/TLS/TLSMFLNTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TLSMFLNTest.java rename to test/jdk/javax/net/ssl/TLS/TLSMFLNTest.java diff --git a/jdk/test/javax/net/ssl/TLS/TLSNotEnabledRC4Test.java b/test/jdk/javax/net/ssl/TLS/TLSNotEnabledRC4Test.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TLSNotEnabledRC4Test.java rename to test/jdk/javax/net/ssl/TLS/TLSNotEnabledRC4Test.java diff --git a/jdk/test/javax/net/ssl/TLS/TLSRehandshakeTest.java b/test/jdk/javax/net/ssl/TLS/TLSRehandshakeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TLSRehandshakeTest.java rename to test/jdk/javax/net/ssl/TLS/TLSRehandshakeTest.java diff --git a/jdk/test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java b/test/jdk/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java rename to test/jdk/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java diff --git a/jdk/test/javax/net/ssl/TLS/TLSRehandshakeWithDataExTest.java b/test/jdk/javax/net/ssl/TLS/TLSRehandshakeWithDataExTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TLSRehandshakeWithDataExTest.java rename to test/jdk/javax/net/ssl/TLS/TLSRehandshakeWithDataExTest.java diff --git a/jdk/test/javax/net/ssl/TLS/TLSUnsupportedCiphersTest.java b/test/jdk/javax/net/ssl/TLS/TLSUnsupportedCiphersTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TLSUnsupportedCiphersTest.java rename to test/jdk/javax/net/ssl/TLS/TLSUnsupportedCiphersTest.java diff --git a/jdk/test/javax/net/ssl/TLS/TestJSSE.java b/test/jdk/javax/net/ssl/TLS/TestJSSE.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TestJSSE.java rename to test/jdk/javax/net/ssl/TLS/TestJSSE.java diff --git a/jdk/test/javax/net/ssl/TLS/TestJSSEClientDefaultProtocol.java b/test/jdk/javax/net/ssl/TLS/TestJSSEClientDefaultProtocol.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TestJSSEClientDefaultProtocol.java rename to test/jdk/javax/net/ssl/TLS/TestJSSEClientDefaultProtocol.java diff --git a/jdk/test/javax/net/ssl/TLS/TestJSSEClientProtocol.java b/test/jdk/javax/net/ssl/TLS/TestJSSEClientProtocol.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TestJSSEClientProtocol.java rename to test/jdk/javax/net/ssl/TLS/TestJSSEClientProtocol.java diff --git a/jdk/test/javax/net/ssl/TLS/TestJSSENoCommonProtocols.java b/test/jdk/javax/net/ssl/TLS/TestJSSENoCommonProtocols.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TestJSSENoCommonProtocols.java rename to test/jdk/javax/net/ssl/TLS/TestJSSENoCommonProtocols.java diff --git a/jdk/test/javax/net/ssl/TLS/TestJSSEServerProtocol.java b/test/jdk/javax/net/ssl/TLS/TestJSSEServerProtocol.java similarity index 100% rename from jdk/test/javax/net/ssl/TLS/TestJSSEServerProtocol.java rename to test/jdk/javax/net/ssl/TLS/TestJSSEServerProtocol.java diff --git a/jdk/test/javax/net/ssl/TLSCommon/BufferOverflowUnderflowTest.java b/test/jdk/javax/net/ssl/TLSCommon/BufferOverflowUnderflowTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSCommon/BufferOverflowUnderflowTest.java rename to test/jdk/javax/net/ssl/TLSCommon/BufferOverflowUnderflowTest.java diff --git a/jdk/test/javax/net/ssl/TLSCommon/DataExchangeTest.java b/test/jdk/javax/net/ssl/TLSCommon/DataExchangeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSCommon/DataExchangeTest.java rename to test/jdk/javax/net/ssl/TLSCommon/DataExchangeTest.java diff --git a/jdk/test/javax/net/ssl/TLSCommon/EnginesClosureTest.java b/test/jdk/javax/net/ssl/TLSCommon/EnginesClosureTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSCommon/EnginesClosureTest.java rename to test/jdk/javax/net/ssl/TLSCommon/EnginesClosureTest.java diff --git a/jdk/test/javax/net/ssl/TLSCommon/HandshakeTest.java b/test/jdk/javax/net/ssl/TLSCommon/HandshakeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSCommon/HandshakeTest.java rename to test/jdk/javax/net/ssl/TLSCommon/HandshakeTest.java diff --git a/jdk/test/javax/net/ssl/TLSCommon/MFLNTest.java b/test/jdk/javax/net/ssl/TLSCommon/MFLNTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSCommon/MFLNTest.java rename to test/jdk/javax/net/ssl/TLSCommon/MFLNTest.java diff --git a/jdk/test/javax/net/ssl/TLSCommon/NotEnabledRC4Test.java b/test/jdk/javax/net/ssl/TLSCommon/NotEnabledRC4Test.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSCommon/NotEnabledRC4Test.java rename to test/jdk/javax/net/ssl/TLSCommon/NotEnabledRC4Test.java diff --git a/jdk/test/javax/net/ssl/TLSCommon/RehandshakeTest.java b/test/jdk/javax/net/ssl/TLSCommon/RehandshakeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSCommon/RehandshakeTest.java rename to test/jdk/javax/net/ssl/TLSCommon/RehandshakeTest.java diff --git a/jdk/test/javax/net/ssl/TLSCommon/RehandshakeWithCipherChangeTest.java b/test/jdk/javax/net/ssl/TLSCommon/RehandshakeWithCipherChangeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSCommon/RehandshakeWithCipherChangeTest.java rename to test/jdk/javax/net/ssl/TLSCommon/RehandshakeWithCipherChangeTest.java diff --git a/jdk/test/javax/net/ssl/TLSCommon/RehandshakeWithDataExTest.java b/test/jdk/javax/net/ssl/TLSCommon/RehandshakeWithDataExTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSCommon/RehandshakeWithDataExTest.java rename to test/jdk/javax/net/ssl/TLSCommon/RehandshakeWithDataExTest.java diff --git a/jdk/test/javax/net/ssl/TLSCommon/SSLEngineTestCase.java b/test/jdk/javax/net/ssl/TLSCommon/SSLEngineTestCase.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSCommon/SSLEngineTestCase.java rename to test/jdk/javax/net/ssl/TLSCommon/SSLEngineTestCase.java diff --git a/jdk/test/javax/net/ssl/TLSCommon/UnsupportedCiphersTest.java b/test/jdk/javax/net/ssl/TLSCommon/UnsupportedCiphersTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSCommon/UnsupportedCiphersTest.java rename to test/jdk/javax/net/ssl/TLSCommon/UnsupportedCiphersTest.java diff --git a/jdk/test/javax/net/ssl/TLSCommon/jaas.conf b/test/jdk/javax/net/ssl/TLSCommon/jaas.conf similarity index 100% rename from jdk/test/javax/net/ssl/TLSCommon/jaas.conf rename to test/jdk/javax/net/ssl/TLSCommon/jaas.conf diff --git a/jdk/test/javax/net/ssl/TLSv1/TEST.properties b/test/jdk/javax/net/ssl/TLSv1/TEST.properties similarity index 100% rename from jdk/test/javax/net/ssl/TLSv1/TEST.properties rename to test/jdk/javax/net/ssl/TLSv1/TEST.properties diff --git a/jdk/test/javax/net/ssl/TLSv1/TLSDataExchangeTest.java b/test/jdk/javax/net/ssl/TLSv1/TLSDataExchangeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv1/TLSDataExchangeTest.java rename to test/jdk/javax/net/ssl/TLSv1/TLSDataExchangeTest.java diff --git a/jdk/test/javax/net/ssl/TLSv1/TLSEnginesClosureTest.java b/test/jdk/javax/net/ssl/TLSv1/TLSEnginesClosureTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv1/TLSEnginesClosureTest.java rename to test/jdk/javax/net/ssl/TLSv1/TLSEnginesClosureTest.java diff --git a/jdk/test/javax/net/ssl/TLSv1/TLSHandshakeTest.java b/test/jdk/javax/net/ssl/TLSv1/TLSHandshakeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv1/TLSHandshakeTest.java rename to test/jdk/javax/net/ssl/TLSv1/TLSHandshakeTest.java diff --git a/jdk/test/javax/net/ssl/TLSv1/TLSMFLNTest.java b/test/jdk/javax/net/ssl/TLSv1/TLSMFLNTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv1/TLSMFLNTest.java rename to test/jdk/javax/net/ssl/TLSv1/TLSMFLNTest.java diff --git a/jdk/test/javax/net/ssl/TLSv1/TLSNotEnabledRC4Test.java b/test/jdk/javax/net/ssl/TLSv1/TLSNotEnabledRC4Test.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv1/TLSNotEnabledRC4Test.java rename to test/jdk/javax/net/ssl/TLSv1/TLSNotEnabledRC4Test.java diff --git a/jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeTest.java b/test/jdk/javax/net/ssl/TLSv1/TLSRehandshakeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeTest.java rename to test/jdk/javax/net/ssl/TLSv1/TLSRehandshakeTest.java diff --git a/jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java b/test/jdk/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java rename to test/jdk/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java diff --git a/jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeWithDataExTest.java b/test/jdk/javax/net/ssl/TLSv1/TLSRehandshakeWithDataExTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeWithDataExTest.java rename to test/jdk/javax/net/ssl/TLSv1/TLSRehandshakeWithDataExTest.java diff --git a/jdk/test/javax/net/ssl/TLSv1/TLSUnsupportedCiphersTest.java b/test/jdk/javax/net/ssl/TLSv1/TLSUnsupportedCiphersTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv1/TLSUnsupportedCiphersTest.java rename to test/jdk/javax/net/ssl/TLSv1/TLSUnsupportedCiphersTest.java diff --git a/jdk/test/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java b/test/jdk/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java rename to test/jdk/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java diff --git a/jdk/test/javax/net/ssl/TLSv11/ExportableBlockCipher.java b/test/jdk/javax/net/ssl/TLSv11/ExportableBlockCipher.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/ExportableBlockCipher.java rename to test/jdk/javax/net/ssl/TLSv11/ExportableBlockCipher.java diff --git a/jdk/test/javax/net/ssl/TLSv11/ExportableStreamCipher.java b/test/jdk/javax/net/ssl/TLSv11/ExportableStreamCipher.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/ExportableStreamCipher.java rename to test/jdk/javax/net/ssl/TLSv11/ExportableStreamCipher.java diff --git a/jdk/test/javax/net/ssl/TLSv11/GenericBlockCipher.java b/test/jdk/javax/net/ssl/TLSv11/GenericBlockCipher.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/GenericBlockCipher.java rename to test/jdk/javax/net/ssl/TLSv11/GenericBlockCipher.java diff --git a/jdk/test/javax/net/ssl/TLSv11/GenericStreamCipher.java b/test/jdk/javax/net/ssl/TLSv11/GenericStreamCipher.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/GenericStreamCipher.java rename to test/jdk/javax/net/ssl/TLSv11/GenericStreamCipher.java diff --git a/jdk/test/javax/net/ssl/TLSv11/TEST.properties b/test/jdk/javax/net/ssl/TLSv11/TEST.properties similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/TEST.properties rename to test/jdk/javax/net/ssl/TLSv11/TEST.properties diff --git a/jdk/test/javax/net/ssl/TLSv11/TLSDataExchangeTest.java b/test/jdk/javax/net/ssl/TLSv11/TLSDataExchangeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/TLSDataExchangeTest.java rename to test/jdk/javax/net/ssl/TLSv11/TLSDataExchangeTest.java diff --git a/jdk/test/javax/net/ssl/TLSv11/TLSEnginesClosureTest.java b/test/jdk/javax/net/ssl/TLSv11/TLSEnginesClosureTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/TLSEnginesClosureTest.java rename to test/jdk/javax/net/ssl/TLSv11/TLSEnginesClosureTest.java diff --git a/jdk/test/javax/net/ssl/TLSv11/TLSHandshakeTest.java b/test/jdk/javax/net/ssl/TLSv11/TLSHandshakeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/TLSHandshakeTest.java rename to test/jdk/javax/net/ssl/TLSv11/TLSHandshakeTest.java diff --git a/jdk/test/javax/net/ssl/TLSv11/TLSMFLNTest.java b/test/jdk/javax/net/ssl/TLSv11/TLSMFLNTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/TLSMFLNTest.java rename to test/jdk/javax/net/ssl/TLSv11/TLSMFLNTest.java diff --git a/jdk/test/javax/net/ssl/TLSv11/TLSNotEnabledRC4Test.java b/test/jdk/javax/net/ssl/TLSv11/TLSNotEnabledRC4Test.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/TLSNotEnabledRC4Test.java rename to test/jdk/javax/net/ssl/TLSv11/TLSNotEnabledRC4Test.java diff --git a/jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeTest.java b/test/jdk/javax/net/ssl/TLSv11/TLSRehandshakeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeTest.java rename to test/jdk/javax/net/ssl/TLSv11/TLSRehandshakeTest.java diff --git a/jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java b/test/jdk/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java rename to test/jdk/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java diff --git a/jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeWithDataExTest.java b/test/jdk/javax/net/ssl/TLSv11/TLSRehandshakeWithDataExTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeWithDataExTest.java rename to test/jdk/javax/net/ssl/TLSv11/TLSRehandshakeWithDataExTest.java diff --git a/jdk/test/javax/net/ssl/TLSv11/TLSUnsupportedCiphersTest.java b/test/jdk/javax/net/ssl/TLSv11/TLSUnsupportedCiphersTest.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv11/TLSUnsupportedCiphersTest.java rename to test/jdk/javax/net/ssl/TLSv11/TLSUnsupportedCiphersTest.java diff --git a/jdk/test/javax/net/ssl/TLSv12/DisabledShortDSAKeys.java b/test/jdk/javax/net/ssl/TLSv12/DisabledShortDSAKeys.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv12/DisabledShortDSAKeys.java rename to test/jdk/javax/net/ssl/TLSv12/DisabledShortDSAKeys.java diff --git a/jdk/test/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java b/test/jdk/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java rename to test/jdk/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java diff --git a/jdk/test/javax/net/ssl/TLSv12/ProtocolFilter.java b/test/jdk/javax/net/ssl/TLSv12/ProtocolFilter.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv12/ProtocolFilter.java rename to test/jdk/javax/net/ssl/TLSv12/ProtocolFilter.java diff --git a/jdk/test/javax/net/ssl/TLSv12/ShortRSAKey512.java b/test/jdk/javax/net/ssl/TLSv12/ShortRSAKey512.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv12/ShortRSAKey512.java rename to test/jdk/javax/net/ssl/TLSv12/ShortRSAKey512.java diff --git a/jdk/test/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java b/test/jdk/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java rename to test/jdk/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java diff --git a/jdk/test/javax/net/ssl/TLSv12/SignatureAlgorithms.java b/test/jdk/javax/net/ssl/TLSv12/SignatureAlgorithms.java similarity index 100% rename from jdk/test/javax/net/ssl/TLSv12/SignatureAlgorithms.java rename to test/jdk/javax/net/ssl/TLSv12/SignatureAlgorithms.java diff --git a/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java b/test/jdk/javax/net/ssl/ciphersuites/DisabledAlgorithms.java similarity index 100% rename from jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java rename to test/jdk/javax/net/ssl/ciphersuites/DisabledAlgorithms.java diff --git a/jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java b/test/jdk/javax/net/ssl/ciphersuites/ECCurvesconstraints.java similarity index 100% rename from jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java rename to test/jdk/javax/net/ssl/ciphersuites/ECCurvesconstraints.java diff --git a/jdk/test/javax/net/ssl/etc/README b/test/jdk/javax/net/ssl/etc/README similarity index 100% rename from jdk/test/javax/net/ssl/etc/README rename to test/jdk/javax/net/ssl/etc/README diff --git a/jdk/test/javax/net/ssl/etc/keystore b/test/jdk/javax/net/ssl/etc/keystore similarity index 100% rename from jdk/test/javax/net/ssl/etc/keystore rename to test/jdk/javax/net/ssl/etc/keystore diff --git a/jdk/test/javax/net/ssl/etc/truststore b/test/jdk/javax/net/ssl/etc/truststore similarity index 100% rename from jdk/test/javax/net/ssl/etc/truststore rename to test/jdk/javax/net/ssl/etc/truststore diff --git a/jdk/test/javax/net/ssl/etc/unknown_keystore b/test/jdk/javax/net/ssl/etc/unknown_keystore similarity index 100% rename from jdk/test/javax/net/ssl/etc/unknown_keystore rename to test/jdk/javax/net/ssl/etc/unknown_keystore diff --git a/jdk/test/javax/net/ssl/finalize/SSLSessionFinalizeTest.java b/test/jdk/javax/net/ssl/finalize/SSLSessionFinalizeTest.java similarity index 100% rename from jdk/test/javax/net/ssl/finalize/SSLSessionFinalizeTest.java rename to test/jdk/javax/net/ssl/finalize/SSLSessionFinalizeTest.java diff --git a/jdk/test/javax/net/ssl/finalize/security.policy b/test/jdk/javax/net/ssl/finalize/security.policy similarity index 100% rename from jdk/test/javax/net/ssl/finalize/security.policy rename to test/jdk/javax/net/ssl/finalize/security.policy diff --git a/jdk/test/javax/net/ssl/interop/ClientHelloChromeInterOp.java b/test/jdk/javax/net/ssl/interop/ClientHelloChromeInterOp.java similarity index 100% rename from jdk/test/javax/net/ssl/interop/ClientHelloChromeInterOp.java rename to test/jdk/javax/net/ssl/interop/ClientHelloChromeInterOp.java diff --git a/jdk/test/javax/net/ssl/interop/ClientHelloInterOp.java b/test/jdk/javax/net/ssl/interop/ClientHelloInterOp.java similarity index 100% rename from jdk/test/javax/net/ssl/interop/ClientHelloInterOp.java rename to test/jdk/javax/net/ssl/interop/ClientHelloInterOp.java diff --git a/jdk/test/javax/net/ssl/sanity/ciphersuites/CheckCipherSuites.java b/test/jdk/javax/net/ssl/sanity/ciphersuites/CheckCipherSuites.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/ciphersuites/CheckCipherSuites.java rename to test/jdk/javax/net/ssl/sanity/ciphersuites/CheckCipherSuites.java diff --git a/jdk/test/javax/net/ssl/sanity/ciphersuites/CipherSuitesInOrder.java b/test/jdk/javax/net/ssl/sanity/ciphersuites/CipherSuitesInOrder.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/ciphersuites/CipherSuitesInOrder.java rename to test/jdk/javax/net/ssl/sanity/ciphersuites/CipherSuitesInOrder.java diff --git a/jdk/test/javax/net/ssl/sanity/ciphersuites/NoKerberos.java b/test/jdk/javax/net/ssl/sanity/ciphersuites/NoKerberos.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/ciphersuites/NoKerberos.java rename to test/jdk/javax/net/ssl/sanity/ciphersuites/NoKerberos.java diff --git a/jdk/test/javax/net/ssl/sanity/interop/CipherTest.java b/test/jdk/javax/net/ssl/sanity/interop/CipherTest.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/interop/CipherTest.java rename to test/jdk/javax/net/ssl/sanity/interop/CipherTest.java diff --git a/jdk/test/javax/net/ssl/sanity/interop/ClientJSSEServerJSSE.java b/test/jdk/javax/net/ssl/sanity/interop/ClientJSSEServerJSSE.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/interop/ClientJSSEServerJSSE.java rename to test/jdk/javax/net/ssl/sanity/interop/ClientJSSEServerJSSE.java diff --git a/jdk/test/javax/net/ssl/sanity/interop/JSSEClient.java b/test/jdk/javax/net/ssl/sanity/interop/JSSEClient.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/interop/JSSEClient.java rename to test/jdk/javax/net/ssl/sanity/interop/JSSEClient.java diff --git a/jdk/test/javax/net/ssl/sanity/interop/JSSEServer.java b/test/jdk/javax/net/ssl/sanity/interop/JSSEServer.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/interop/JSSEServer.java rename to test/jdk/javax/net/ssl/sanity/interop/JSSEServer.java diff --git a/jdk/test/javax/net/ssl/sanity/pluggability/CheckSSLContextExport.java b/test/jdk/javax/net/ssl/sanity/pluggability/CheckSSLContextExport.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/pluggability/CheckSSLContextExport.java rename to test/jdk/javax/net/ssl/sanity/pluggability/CheckSSLContextExport.java diff --git a/jdk/test/javax/net/ssl/sanity/pluggability/CheckSockFacExport1.java b/test/jdk/javax/net/ssl/sanity/pluggability/CheckSockFacExport1.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/pluggability/CheckSockFacExport1.java rename to test/jdk/javax/net/ssl/sanity/pluggability/CheckSockFacExport1.java diff --git a/jdk/test/javax/net/ssl/sanity/pluggability/CheckSockFacExport2.java b/test/jdk/javax/net/ssl/sanity/pluggability/CheckSockFacExport2.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/pluggability/CheckSockFacExport2.java rename to test/jdk/javax/net/ssl/sanity/pluggability/CheckSockFacExport2.java diff --git a/jdk/test/javax/net/ssl/sanity/pluggability/CipherSuites.java b/test/jdk/javax/net/ssl/sanity/pluggability/CipherSuites.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/pluggability/CipherSuites.java rename to test/jdk/javax/net/ssl/sanity/pluggability/CipherSuites.java diff --git a/jdk/test/javax/net/ssl/sanity/pluggability/MySSLContextImpl.java b/test/jdk/javax/net/ssl/sanity/pluggability/MySSLContextImpl.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/pluggability/MySSLContextImpl.java rename to test/jdk/javax/net/ssl/sanity/pluggability/MySSLContextImpl.java diff --git a/jdk/test/javax/net/ssl/sanity/pluggability/MySSLEngineImpl.java b/test/jdk/javax/net/ssl/sanity/pluggability/MySSLEngineImpl.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/pluggability/MySSLEngineImpl.java rename to test/jdk/javax/net/ssl/sanity/pluggability/MySSLEngineImpl.java diff --git a/jdk/test/javax/net/ssl/sanity/pluggability/MySSLServerSocketFacImpl.java b/test/jdk/javax/net/ssl/sanity/pluggability/MySSLServerSocketFacImpl.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/pluggability/MySSLServerSocketFacImpl.java rename to test/jdk/javax/net/ssl/sanity/pluggability/MySSLServerSocketFacImpl.java diff --git a/jdk/test/javax/net/ssl/sanity/pluggability/MySSLSocketFacImpl.java b/test/jdk/javax/net/ssl/sanity/pluggability/MySSLSocketFacImpl.java similarity index 100% rename from jdk/test/javax/net/ssl/sanity/pluggability/MySSLSocketFacImpl.java rename to test/jdk/javax/net/ssl/sanity/pluggability/MySSLSocketFacImpl.java diff --git a/jdk/test/javax/net/ssl/templates/SSLCapabilities.java b/test/jdk/javax/net/ssl/templates/SSLCapabilities.java similarity index 100% rename from jdk/test/javax/net/ssl/templates/SSLCapabilities.java rename to test/jdk/javax/net/ssl/templates/SSLCapabilities.java diff --git a/jdk/test/javax/net/ssl/templates/SSLEngineTemplate.java b/test/jdk/javax/net/ssl/templates/SSLEngineTemplate.java similarity index 100% rename from jdk/test/javax/net/ssl/templates/SSLEngineTemplate.java rename to test/jdk/javax/net/ssl/templates/SSLEngineTemplate.java diff --git a/jdk/test/javax/net/ssl/templates/SSLExplorer.java b/test/jdk/javax/net/ssl/templates/SSLExplorer.java similarity index 100% rename from jdk/test/javax/net/ssl/templates/SSLExplorer.java rename to test/jdk/javax/net/ssl/templates/SSLExplorer.java diff --git a/jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java b/test/jdk/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java similarity index 100% rename from jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java rename to test/jdk/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java diff --git a/jdk/test/javax/net/ssl/templates/SSLSocketTemplate.java b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java similarity index 100% rename from jdk/test/javax/net/ssl/templates/SSLSocketTemplate.java rename to test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java diff --git a/jdk/test/javax/print/CheckDupFlavor.java b/test/jdk/javax/print/CheckDupFlavor.java similarity index 100% rename from jdk/test/javax/print/CheckDupFlavor.java rename to test/jdk/javax/print/CheckDupFlavor.java diff --git a/jdk/test/javax/print/DialogMargins.java b/test/jdk/javax/print/DialogMargins.java similarity index 100% rename from jdk/test/javax/print/DialogMargins.java rename to test/jdk/javax/print/DialogMargins.java diff --git a/jdk/test/javax/print/LookupServices.java b/test/jdk/javax/print/LookupServices.java similarity index 100% rename from jdk/test/javax/print/LookupServices.java rename to test/jdk/javax/print/LookupServices.java diff --git a/jdk/test/javax/print/PrintSE/PrintSE.java b/test/jdk/javax/print/PrintSE/PrintSE.java similarity index 100% rename from jdk/test/javax/print/PrintSE/PrintSE.java rename to test/jdk/javax/print/PrintSE/PrintSE.java diff --git a/jdk/test/javax/print/PrintSE/PrintSE.sh b/test/jdk/javax/print/PrintSE/PrintSE.sh similarity index 100% rename from jdk/test/javax/print/PrintSE/PrintSE.sh rename to test/jdk/javax/print/PrintSE/PrintSE.sh diff --git a/jdk/test/javax/print/PrintSEUmlauts/PrintSEUmlauts.java b/test/jdk/javax/print/PrintSEUmlauts/PrintSEUmlauts.java similarity index 100% rename from jdk/test/javax/print/PrintSEUmlauts/PrintSEUmlauts.java rename to test/jdk/javax/print/PrintSEUmlauts/PrintSEUmlauts.java diff --git a/jdk/test/javax/print/PrintServiceLookup/CountPrintServices.java b/test/jdk/javax/print/PrintServiceLookup/CountPrintServices.java similarity index 100% rename from jdk/test/javax/print/PrintServiceLookup/CountPrintServices.java rename to test/jdk/javax/print/PrintServiceLookup/CountPrintServices.java diff --git a/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java b/test/jdk/javax/print/PrintServiceLookup/GetPrintServices.java similarity index 100% rename from jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java rename to test/jdk/javax/print/PrintServiceLookup/GetPrintServices.java diff --git a/jdk/test/javax/print/PrintSubInputStream/Example.java b/test/jdk/javax/print/PrintSubInputStream/Example.java similarity index 100% rename from jdk/test/javax/print/PrintSubInputStream/Example.java rename to test/jdk/javax/print/PrintSubInputStream/Example.java diff --git a/jdk/test/javax/print/RegisterNullService.java b/test/jdk/javax/print/RegisterNullService.java similarity index 100% rename from jdk/test/javax/print/RegisterNullService.java rename to test/jdk/javax/print/RegisterNullService.java diff --git a/jdk/test/javax/print/StreamPrintingOrientation.java b/test/jdk/javax/print/StreamPrintingOrientation.java similarity index 100% rename from jdk/test/javax/print/StreamPrintingOrientation.java rename to test/jdk/javax/print/StreamPrintingOrientation.java diff --git a/jdk/test/javax/print/TEST.properties b/test/jdk/javax/print/TEST.properties similarity index 100% rename from jdk/test/javax/print/TEST.properties rename to test/jdk/javax/print/TEST.properties diff --git a/jdk/test/javax/print/TestRaceCond.java b/test/jdk/javax/print/TestRaceCond.java similarity index 100% rename from jdk/test/javax/print/TestRaceCond.java rename to test/jdk/javax/print/TestRaceCond.java diff --git a/jdk/test/javax/print/TextFlavorTest.java b/test/jdk/javax/print/TextFlavorTest.java similarity index 100% rename from jdk/test/javax/print/TextFlavorTest.java rename to test/jdk/javax/print/TextFlavorTest.java diff --git a/jdk/test/javax/print/applet/AppletPrintLookup.html b/test/jdk/javax/print/applet/AppletPrintLookup.html similarity index 100% rename from jdk/test/javax/print/applet/AppletPrintLookup.html rename to test/jdk/javax/print/applet/AppletPrintLookup.html diff --git a/jdk/test/javax/print/applet/AppletPrintLookup.sh b/test/jdk/javax/print/applet/AppletPrintLookup.sh similarity index 100% rename from jdk/test/javax/print/applet/AppletPrintLookup.sh rename to test/jdk/javax/print/applet/AppletPrintLookup.sh diff --git a/jdk/test/javax/print/applet/YesNo.java b/test/jdk/javax/print/applet/YesNo.java similarity index 100% rename from jdk/test/javax/print/applet/YesNo.java rename to test/jdk/javax/print/applet/YesNo.java diff --git a/jdk/test/javax/print/applet/applet0/Applet0.java b/test/jdk/javax/print/applet/applet0/Applet0.java similarity index 100% rename from jdk/test/javax/print/applet/applet0/Applet0.java rename to test/jdk/javax/print/applet/applet0/Applet0.java diff --git a/jdk/test/javax/print/applet/applet1/Applet1.java b/test/jdk/javax/print/applet/applet1/Applet1.java similarity index 100% rename from jdk/test/javax/print/applet/applet1/Applet1.java rename to test/jdk/javax/print/applet/applet1/Applet1.java diff --git a/jdk/test/javax/print/applet/applet1/Applet1PrintService.java b/test/jdk/javax/print/applet/applet1/Applet1PrintService.java similarity index 100% rename from jdk/test/javax/print/applet/applet1/Applet1PrintService.java rename to test/jdk/javax/print/applet/applet1/Applet1PrintService.java diff --git a/jdk/test/javax/print/applet/applet1/Applet1PrintServiceLookup.java b/test/jdk/javax/print/applet/applet1/Applet1PrintServiceLookup.java similarity index 100% rename from jdk/test/javax/print/applet/applet1/Applet1PrintServiceLookup.java rename to test/jdk/javax/print/applet/applet1/Applet1PrintServiceLookup.java diff --git a/jdk/test/javax/print/applet/applet1/META-INF/services/javax.print.PrintServiceLookup b/test/jdk/javax/print/applet/applet1/META-INF/services/javax.print.PrintServiceLookup similarity index 100% rename from jdk/test/javax/print/applet/applet1/META-INF/services/javax.print.PrintServiceLookup rename to test/jdk/javax/print/applet/applet1/META-INF/services/javax.print.PrintServiceLookup diff --git a/jdk/test/javax/print/applet/applet2/Applet2.java b/test/jdk/javax/print/applet/applet2/Applet2.java similarity index 100% rename from jdk/test/javax/print/applet/applet2/Applet2.java rename to test/jdk/javax/print/applet/applet2/Applet2.java diff --git a/jdk/test/javax/print/applet/applet2/Applet2PrintService.java b/test/jdk/javax/print/applet/applet2/Applet2PrintService.java similarity index 100% rename from jdk/test/javax/print/applet/applet2/Applet2PrintService.java rename to test/jdk/javax/print/applet/applet2/Applet2PrintService.java diff --git a/jdk/test/javax/print/applet/applet2/Applet2PrintServiceLookup.java b/test/jdk/javax/print/applet/applet2/Applet2PrintServiceLookup.java similarity index 100% rename from jdk/test/javax/print/applet/applet2/Applet2PrintServiceLookup.java rename to test/jdk/javax/print/applet/applet2/Applet2PrintServiceLookup.java diff --git a/jdk/test/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup b/test/jdk/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup similarity index 100% rename from jdk/test/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup rename to test/jdk/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup diff --git a/jdk/test/javax/print/applet/applet3/Applet3.java b/test/jdk/javax/print/applet/applet3/Applet3.java similarity index 100% rename from jdk/test/javax/print/applet/applet3/Applet3.java rename to test/jdk/javax/print/applet/applet3/Applet3.java diff --git a/jdk/test/javax/print/applet/applet3/Applet3PrintService.java b/test/jdk/javax/print/applet/applet3/Applet3PrintService.java similarity index 100% rename from jdk/test/javax/print/applet/applet3/Applet3PrintService.java rename to test/jdk/javax/print/applet/applet3/Applet3PrintService.java diff --git a/jdk/test/javax/print/applet/applet4/Applet4.java b/test/jdk/javax/print/applet/applet4/Applet4.java similarity index 100% rename from jdk/test/javax/print/applet/applet4/Applet4.java rename to test/jdk/javax/print/applet/applet4/Applet4.java diff --git a/jdk/test/javax/print/applet/applet4/Applet4PrintService.java b/test/jdk/javax/print/applet/applet4/Applet4PrintService.java similarity index 100% rename from jdk/test/javax/print/applet/applet4/Applet4PrintService.java rename to test/jdk/javax/print/applet/applet4/Applet4PrintService.java diff --git a/jdk/test/javax/print/applet/applet4/Applet4PrintServiceLookup.java b/test/jdk/javax/print/applet/applet4/Applet4PrintServiceLookup.java similarity index 100% rename from jdk/test/javax/print/applet/applet4/Applet4PrintServiceLookup.java rename to test/jdk/javax/print/applet/applet4/Applet4PrintServiceLookup.java diff --git a/jdk/test/javax/print/attribute/AttributeTest.java b/test/jdk/javax/print/attribute/AttributeTest.java similarity index 100% rename from jdk/test/javax/print/attribute/AttributeTest.java rename to test/jdk/javax/print/attribute/AttributeTest.java diff --git a/jdk/test/javax/print/attribute/Chroma.java b/test/jdk/javax/print/attribute/Chroma.java similarity index 100% rename from jdk/test/javax/print/attribute/Chroma.java rename to test/jdk/javax/print/attribute/Chroma.java diff --git a/jdk/test/javax/print/attribute/ChromaticityValues.java b/test/jdk/javax/print/attribute/ChromaticityValues.java similarity index 100% rename from jdk/test/javax/print/attribute/ChromaticityValues.java rename to test/jdk/javax/print/attribute/ChromaticityValues.java diff --git a/jdk/test/javax/print/attribute/CollateAttr.java b/test/jdk/javax/print/attribute/CollateAttr.java similarity index 100% rename from jdk/test/javax/print/attribute/CollateAttr.java rename to test/jdk/javax/print/attribute/CollateAttr.java diff --git a/jdk/test/javax/print/attribute/GetCopiesSupported.java b/test/jdk/javax/print/attribute/GetCopiesSupported.java similarity index 100% rename from jdk/test/javax/print/attribute/GetCopiesSupported.java rename to test/jdk/javax/print/attribute/GetCopiesSupported.java diff --git a/jdk/test/javax/print/attribute/MediaMappingsTest.java b/test/jdk/javax/print/attribute/MediaMappingsTest.java similarity index 100% rename from jdk/test/javax/print/attribute/MediaMappingsTest.java rename to test/jdk/javax/print/attribute/MediaMappingsTest.java diff --git a/jdk/test/javax/print/attribute/PSCopiesFlavorTest.java b/test/jdk/javax/print/attribute/PSCopiesFlavorTest.java similarity index 100% rename from jdk/test/javax/print/attribute/PSCopiesFlavorTest.java rename to test/jdk/javax/print/attribute/PSCopiesFlavorTest.java diff --git a/jdk/test/javax/print/attribute/PrintResAttr.java b/test/jdk/javax/print/attribute/PrintResAttr.java similarity index 100% rename from jdk/test/javax/print/attribute/PrintResAttr.java rename to test/jdk/javax/print/attribute/PrintResAttr.java diff --git a/jdk/test/javax/print/attribute/ServiceDialogTest.java b/test/jdk/javax/print/attribute/ServiceDialogTest.java similarity index 100% rename from jdk/test/javax/print/attribute/ServiceDialogTest.java rename to test/jdk/javax/print/attribute/ServiceDialogTest.java diff --git a/jdk/test/javax/print/attribute/ServiceDialogValidateTest.java b/test/jdk/javax/print/attribute/ServiceDialogValidateTest.java similarity index 100% rename from jdk/test/javax/print/attribute/ServiceDialogValidateTest.java rename to test/jdk/javax/print/attribute/ServiceDialogValidateTest.java diff --git a/jdk/test/javax/print/attribute/ServiceDlgPageRangeTest.java b/test/jdk/javax/print/attribute/ServiceDlgPageRangeTest.java similarity index 100% rename from jdk/test/javax/print/attribute/ServiceDlgPageRangeTest.java rename to test/jdk/javax/print/attribute/ServiceDlgPageRangeTest.java diff --git a/jdk/test/javax/print/attribute/ServiceDlgSheetCollateTest.java b/test/jdk/javax/print/attribute/ServiceDlgSheetCollateTest.java similarity index 100% rename from jdk/test/javax/print/attribute/ServiceDlgSheetCollateTest.java rename to test/jdk/javax/print/attribute/ServiceDlgSheetCollateTest.java diff --git a/jdk/test/javax/print/attribute/Services_getDocFl.java b/test/jdk/javax/print/attribute/Services_getDocFl.java similarity index 100% rename from jdk/test/javax/print/attribute/Services_getDocFl.java rename to test/jdk/javax/print/attribute/Services_getDocFl.java diff --git a/jdk/test/javax/print/attribute/SidesPageRangesTest.java b/test/jdk/javax/print/attribute/SidesPageRangesTest.java similarity index 100% rename from jdk/test/javax/print/attribute/SidesPageRangesTest.java rename to test/jdk/javax/print/attribute/SidesPageRangesTest.java diff --git a/jdk/test/javax/print/attribute/SupportedPrintableAreas.java b/test/jdk/javax/print/attribute/SupportedPrintableAreas.java similarity index 100% rename from jdk/test/javax/print/attribute/SupportedPrintableAreas.java rename to test/jdk/javax/print/attribute/SupportedPrintableAreas.java diff --git a/jdk/test/javax/print/attribute/TestOrientationSupportForStreamPrnSrv.java b/test/jdk/javax/print/attribute/TestOrientationSupportForStreamPrnSrv.java similarity index 100% rename from jdk/test/javax/print/attribute/TestOrientationSupportForStreamPrnSrv.java rename to test/jdk/javax/print/attribute/TestOrientationSupportForStreamPrnSrv.java diff --git a/jdk/test/javax/print/attribute/TestUnsupportedResolution.java b/test/jdk/javax/print/attribute/TestUnsupportedResolution.java similarity index 100% rename from jdk/test/javax/print/attribute/TestUnsupportedResolution.java rename to test/jdk/javax/print/attribute/TestUnsupportedResolution.java diff --git a/jdk/test/javax/print/attribute/URLPDFPrinting.java b/test/jdk/javax/print/attribute/URLPDFPrinting.java similarity index 100% rename from jdk/test/javax/print/attribute/URLPDFPrinting.java rename to test/jdk/javax/print/attribute/URLPDFPrinting.java diff --git a/jdk/test/javax/print/attribute/autosense/PrintAutoSenseData.java b/test/jdk/javax/print/attribute/autosense/PrintAutoSenseData.java similarity index 100% rename from jdk/test/javax/print/attribute/autosense/PrintAutoSenseData.java rename to test/jdk/javax/print/attribute/autosense/PrintAutoSenseData.java diff --git a/jdk/test/javax/print/attribute/autosense/sample.txt b/test/jdk/javax/print/attribute/autosense/sample.txt similarity index 100% rename from jdk/test/javax/print/attribute/autosense/sample.txt rename to test/jdk/javax/print/attribute/autosense/sample.txt diff --git a/jdk/test/javax/print/attribute/hello.pdf b/test/jdk/javax/print/attribute/hello.pdf similarity index 100% rename from jdk/test/javax/print/attribute/hello.pdf rename to test/jdk/javax/print/attribute/hello.pdf diff --git a/jdk/test/javax/rmi/PortableRemoteObject/8146975/HelloClient.java b/test/jdk/javax/rmi/PortableRemoteObject/8146975/HelloClient.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/8146975/HelloClient.java rename to test/jdk/javax/rmi/PortableRemoteObject/8146975/HelloClient.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/8146975/HelloImpl.java b/test/jdk/javax/rmi/PortableRemoteObject/8146975/HelloImpl.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/8146975/HelloImpl.java rename to test/jdk/javax/rmi/PortableRemoteObject/8146975/HelloImpl.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/8146975/HelloInterface.java b/test/jdk/javax/rmi/PortableRemoteObject/8146975/HelloInterface.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/8146975/HelloInterface.java rename to test/jdk/javax/rmi/PortableRemoteObject/8146975/HelloInterface.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/8146975/HelloServer.java b/test/jdk/javax/rmi/PortableRemoteObject/8146975/HelloServer.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/8146975/HelloServer.java rename to test/jdk/javax/rmi/PortableRemoteObject/8146975/HelloServer.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/8146975/RmiIiopReturnValueTest.java b/test/jdk/javax/rmi/PortableRemoteObject/8146975/RmiIiopReturnValueTest.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/8146975/RmiIiopReturnValueTest.java rename to test/jdk/javax/rmi/PortableRemoteObject/8146975/RmiIiopReturnValueTest.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/8146975/Test.java b/test/jdk/javax/rmi/PortableRemoteObject/8146975/Test.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/8146975/Test.java rename to test/jdk/javax/rmi/PortableRemoteObject/8146975/Test.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/8146975/Test3.java b/test/jdk/javax/rmi/PortableRemoteObject/8146975/Test3.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/8146975/Test3.java rename to test/jdk/javax/rmi/PortableRemoteObject/8146975/Test3.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/8146975/Test4.java b/test/jdk/javax/rmi/PortableRemoteObject/8146975/Test4.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/8146975/Test4.java rename to test/jdk/javax/rmi/PortableRemoteObject/8146975/Test4.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/8146975/_HelloImpl_Tie.java b/test/jdk/javax/rmi/PortableRemoteObject/8146975/_HelloImpl_Tie.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/8146975/_HelloImpl_Tie.java rename to test/jdk/javax/rmi/PortableRemoteObject/8146975/_HelloImpl_Tie.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/8146975/_HelloInterface_Stub.java b/test/jdk/javax/rmi/PortableRemoteObject/8146975/_HelloInterface_Stub.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/8146975/_HelloInterface_Stub.java rename to test/jdk/javax/rmi/PortableRemoteObject/8146975/_HelloInterface_Stub.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/8146975/jtreg.test.policy b/test/jdk/javax/rmi/PortableRemoteObject/8146975/jtreg.test.policy similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/8146975/jtreg.test.policy rename to test/jdk/javax/rmi/PortableRemoteObject/8146975/jtreg.test.policy diff --git a/jdk/test/javax/rmi/PortableRemoteObject/ConcurrentHashMapTest.java b/test/jdk/javax/rmi/PortableRemoteObject/ConcurrentHashMapTest.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/ConcurrentHashMapTest.java rename to test/jdk/javax/rmi/PortableRemoteObject/ConcurrentHashMapTest.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/HelloClient.java b/test/jdk/javax/rmi/PortableRemoteObject/HelloClient.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/HelloClient.java rename to test/jdk/javax/rmi/PortableRemoteObject/HelloClient.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/HelloImpl.java b/test/jdk/javax/rmi/PortableRemoteObject/HelloImpl.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/HelloImpl.java rename to test/jdk/javax/rmi/PortableRemoteObject/HelloImpl.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/HelloInterface.java b/test/jdk/javax/rmi/PortableRemoteObject/HelloInterface.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/HelloInterface.java rename to test/jdk/javax/rmi/PortableRemoteObject/HelloInterface.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/HelloServer.java b/test/jdk/javax/rmi/PortableRemoteObject/HelloServer.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/HelloServer.java rename to test/jdk/javax/rmi/PortableRemoteObject/HelloServer.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/Test.java b/test/jdk/javax/rmi/PortableRemoteObject/Test.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/Test.java rename to test/jdk/javax/rmi/PortableRemoteObject/Test.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/_HelloImpl_Tie.java b/test/jdk/javax/rmi/PortableRemoteObject/_HelloImpl_Tie.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/_HelloImpl_Tie.java rename to test/jdk/javax/rmi/PortableRemoteObject/_HelloImpl_Tie.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/_HelloInterface_Stub.java b/test/jdk/javax/rmi/PortableRemoteObject/_HelloInterface_Stub.java similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/_HelloInterface_Stub.java rename to test/jdk/javax/rmi/PortableRemoteObject/_HelloInterface_Stub.java diff --git a/jdk/test/javax/rmi/PortableRemoteObject/jtreg.test.policy b/test/jdk/javax/rmi/PortableRemoteObject/jtreg.test.policy similarity index 100% rename from jdk/test/javax/rmi/PortableRemoteObject/jtreg.test.policy rename to test/jdk/javax/rmi/PortableRemoteObject/jtreg.test.policy diff --git a/jdk/test/javax/rmi/TEST.properties b/test/jdk/javax/rmi/TEST.properties similarity index 100% rename from jdk/test/javax/rmi/TEST.properties rename to test/jdk/javax/rmi/TEST.properties diff --git a/jdk/test/javax/rmi/ssl/SSLSocketParametersTest.java b/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java similarity index 100% rename from jdk/test/javax/rmi/ssl/SSLSocketParametersTest.java rename to test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java diff --git a/jdk/test/javax/rmi/ssl/SSLSocketParametersTest.sh b/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.sh similarity index 100% rename from jdk/test/javax/rmi/ssl/SSLSocketParametersTest.sh rename to test/jdk/javax/rmi/ssl/SSLSocketParametersTest.sh diff --git a/jdk/test/javax/rmi/ssl/SocketFactoryTest.java b/test/jdk/javax/rmi/ssl/SocketFactoryTest.java similarity index 100% rename from jdk/test/javax/rmi/ssl/SocketFactoryTest.java rename to test/jdk/javax/rmi/ssl/SocketFactoryTest.java diff --git a/jdk/test/javax/rmi/ssl/keystore b/test/jdk/javax/rmi/ssl/keystore similarity index 100% rename from jdk/test/javax/rmi/ssl/keystore rename to test/jdk/javax/rmi/ssl/keystore diff --git a/jdk/test/javax/rmi/ssl/truststore b/test/jdk/javax/rmi/ssl/truststore similarity index 100% rename from jdk/test/javax/rmi/ssl/truststore rename to test/jdk/javax/rmi/ssl/truststore diff --git a/jdk/test/javax/script/CauseExceptionTest.java b/test/jdk/javax/script/CauseExceptionTest.java similarity index 100% rename from jdk/test/javax/script/CauseExceptionTest.java rename to test/jdk/javax/script/CauseExceptionTest.java diff --git a/jdk/test/javax/script/CommonSetup.sh b/test/jdk/javax/script/CommonSetup.sh similarity index 100% rename from jdk/test/javax/script/CommonSetup.sh rename to test/jdk/javax/script/CommonSetup.sh diff --git a/jdk/test/javax/script/DummyScriptEngine.java b/test/jdk/javax/script/DummyScriptEngine.java similarity index 100% rename from jdk/test/javax/script/DummyScriptEngine.java rename to test/jdk/javax/script/DummyScriptEngine.java diff --git a/jdk/test/javax/script/DummyScriptEngineFactory.java b/test/jdk/javax/script/DummyScriptEngineFactory.java similarity index 100% rename from jdk/test/javax/script/DummyScriptEngineFactory.java rename to test/jdk/javax/script/DummyScriptEngineFactory.java diff --git a/jdk/test/javax/script/ExceptionTest.java b/test/jdk/javax/script/ExceptionTest.java similarity index 100% rename from jdk/test/javax/script/ExceptionTest.java rename to test/jdk/javax/script/ExceptionTest.java diff --git a/jdk/test/javax/script/GetInterfaceTest.java b/test/jdk/javax/script/GetInterfaceTest.java similarity index 100% rename from jdk/test/javax/script/GetInterfaceTest.java rename to test/jdk/javax/script/GetInterfaceTest.java diff --git a/jdk/test/javax/script/Helper.java b/test/jdk/javax/script/Helper.java similarity index 100% rename from jdk/test/javax/script/Helper.java rename to test/jdk/javax/script/Helper.java diff --git a/jdk/test/javax/script/JavaScriptScopeTest.java b/test/jdk/javax/script/JavaScriptScopeTest.java similarity index 100% rename from jdk/test/javax/script/JavaScriptScopeTest.java rename to test/jdk/javax/script/JavaScriptScopeTest.java diff --git a/jdk/test/javax/script/META-INF/services/javax.script.ScriptEngineFactory b/test/jdk/javax/script/META-INF/services/javax.script.ScriptEngineFactory similarity index 100% rename from jdk/test/javax/script/META-INF/services/javax.script.ScriptEngineFactory rename to test/jdk/javax/script/META-INF/services/javax.script.ScriptEngineFactory diff --git a/jdk/test/javax/script/MyContext.java b/test/jdk/javax/script/MyContext.java similarity index 100% rename from jdk/test/javax/script/MyContext.java rename to test/jdk/javax/script/MyContext.java diff --git a/jdk/test/javax/script/NullUndefinedVarTest.java b/test/jdk/javax/script/NullUndefinedVarTest.java similarity index 100% rename from jdk/test/javax/script/NullUndefinedVarTest.java rename to test/jdk/javax/script/NullUndefinedVarTest.java diff --git a/jdk/test/javax/script/PluggableContextTest.java b/test/jdk/javax/script/PluggableContextTest.java similarity index 100% rename from jdk/test/javax/script/PluggableContextTest.java rename to test/jdk/javax/script/PluggableContextTest.java diff --git a/jdk/test/javax/script/ProviderTest.java b/test/jdk/javax/script/ProviderTest.java similarity index 100% rename from jdk/test/javax/script/ProviderTest.java rename to test/jdk/javax/script/ProviderTest.java diff --git a/jdk/test/javax/script/ProviderTest.sh b/test/jdk/javax/script/ProviderTest.sh similarity index 100% rename from jdk/test/javax/script/ProviderTest.sh rename to test/jdk/javax/script/ProviderTest.sh diff --git a/jdk/test/javax/script/SimpleScriptContextNameChecksTest.java b/test/jdk/javax/script/SimpleScriptContextNameChecksTest.java similarity index 100% rename from jdk/test/javax/script/SimpleScriptContextNameChecksTest.java rename to test/jdk/javax/script/SimpleScriptContextNameChecksTest.java diff --git a/jdk/test/javax/script/StringWriterPrintTest.java b/test/jdk/javax/script/StringWriterPrintTest.java similarity index 100% rename from jdk/test/javax/script/StringWriterPrintTest.java rename to test/jdk/javax/script/StringWriterPrintTest.java diff --git a/jdk/test/javax/script/TEST.properties b/test/jdk/javax/script/TEST.properties similarity index 100% rename from jdk/test/javax/script/TEST.properties rename to test/jdk/javax/script/TEST.properties diff --git a/jdk/test/javax/script/Test1.java b/test/jdk/javax/script/Test1.java similarity index 100% rename from jdk/test/javax/script/Test1.java rename to test/jdk/javax/script/Test1.java diff --git a/jdk/test/javax/script/Test1.js b/test/jdk/javax/script/Test1.js similarity index 100% rename from jdk/test/javax/script/Test1.js rename to test/jdk/javax/script/Test1.js diff --git a/jdk/test/javax/script/Test2.java b/test/jdk/javax/script/Test2.java similarity index 100% rename from jdk/test/javax/script/Test2.java rename to test/jdk/javax/script/Test2.java diff --git a/jdk/test/javax/script/Test2.js b/test/jdk/javax/script/Test2.js similarity index 100% rename from jdk/test/javax/script/Test2.js rename to test/jdk/javax/script/Test2.js diff --git a/jdk/test/javax/script/Test3.java b/test/jdk/javax/script/Test3.java similarity index 100% rename from jdk/test/javax/script/Test3.java rename to test/jdk/javax/script/Test3.java diff --git a/jdk/test/javax/script/Test3.js b/test/jdk/javax/script/Test3.js similarity index 100% rename from jdk/test/javax/script/Test3.js rename to test/jdk/javax/script/Test3.js diff --git a/jdk/test/javax/script/Test4.java b/test/jdk/javax/script/Test4.java similarity index 100% rename from jdk/test/javax/script/Test4.java rename to test/jdk/javax/script/Test4.java diff --git a/jdk/test/javax/script/Test4.js b/test/jdk/javax/script/Test4.js similarity index 100% rename from jdk/test/javax/script/Test4.js rename to test/jdk/javax/script/Test4.js diff --git a/jdk/test/javax/script/Test5.java b/test/jdk/javax/script/Test5.java similarity index 100% rename from jdk/test/javax/script/Test5.java rename to test/jdk/javax/script/Test5.java diff --git a/jdk/test/javax/script/Test5.js b/test/jdk/javax/script/Test5.js similarity index 100% rename from jdk/test/javax/script/Test5.js rename to test/jdk/javax/script/Test5.js diff --git a/jdk/test/javax/script/Test6.java b/test/jdk/javax/script/Test6.java similarity index 100% rename from jdk/test/javax/script/Test6.java rename to test/jdk/javax/script/Test6.java diff --git a/jdk/test/javax/script/Test6.js b/test/jdk/javax/script/Test6.js similarity index 100% rename from jdk/test/javax/script/Test6.js rename to test/jdk/javax/script/Test6.js diff --git a/jdk/test/javax/script/Test7.java b/test/jdk/javax/script/Test7.java similarity index 100% rename from jdk/test/javax/script/Test7.java rename to test/jdk/javax/script/Test7.java diff --git a/jdk/test/javax/script/Test7.js b/test/jdk/javax/script/Test7.js similarity index 100% rename from jdk/test/javax/script/Test7.js rename to test/jdk/javax/script/Test7.js diff --git a/jdk/test/javax/script/Test8.java b/test/jdk/javax/script/Test8.java similarity index 100% rename from jdk/test/javax/script/Test8.java rename to test/jdk/javax/script/Test8.java diff --git a/jdk/test/javax/script/Test8.js b/test/jdk/javax/script/Test8.js similarity index 100% rename from jdk/test/javax/script/Test8.js rename to test/jdk/javax/script/Test8.js diff --git a/jdk/test/javax/script/UnescapedBracketRegExTest.java b/test/jdk/javax/script/UnescapedBracketRegExTest.java similarity index 100% rename from jdk/test/javax/script/UnescapedBracketRegExTest.java rename to test/jdk/javax/script/UnescapedBracketRegExTest.java diff --git a/jdk/test/javax/script/VersionTest.java b/test/jdk/javax/script/VersionTest.java similarity index 100% rename from jdk/test/javax/script/VersionTest.java rename to test/jdk/javax/script/VersionTest.java diff --git a/jdk/test/javax/security/auth/Destroyable/KeyDestructionTest.java b/test/jdk/javax/security/auth/Destroyable/KeyDestructionTest.java similarity index 100% rename from jdk/test/javax/security/auth/Destroyable/KeyDestructionTest.java rename to test/jdk/javax/security/auth/Destroyable/KeyDestructionTest.java diff --git a/jdk/test/javax/security/auth/PrivateCredentialPermission/CanonError.java b/test/jdk/javax/security/auth/PrivateCredentialPermission/CanonError.java similarity index 100% rename from jdk/test/javax/security/auth/PrivateCredentialPermission/CanonError.java rename to test/jdk/javax/security/auth/PrivateCredentialPermission/CanonError.java diff --git a/jdk/test/javax/security/auth/PrivateCredentialPermission/EmptyName.java b/test/jdk/javax/security/auth/PrivateCredentialPermission/EmptyName.java similarity index 100% rename from jdk/test/javax/security/auth/PrivateCredentialPermission/EmptyName.java rename to test/jdk/javax/security/auth/PrivateCredentialPermission/EmptyName.java diff --git a/jdk/test/javax/security/auth/PrivateCredentialPermission/Equals.java b/test/jdk/javax/security/auth/PrivateCredentialPermission/Equals.java similarity index 100% rename from jdk/test/javax/security/auth/PrivateCredentialPermission/Equals.java rename to test/jdk/javax/security/auth/PrivateCredentialPermission/Equals.java diff --git a/jdk/test/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.java b/test/jdk/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.java similarity index 100% rename from jdk/test/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.java rename to test/jdk/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.java diff --git a/jdk/test/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.policy b/test/jdk/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.policy similarity index 100% rename from jdk/test/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.policy rename to test/jdk/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.policy diff --git a/jdk/test/javax/security/auth/PrivateCredentialPermission/Serial.java b/test/jdk/javax/security/auth/PrivateCredentialPermission/Serial.java similarity index 100% rename from jdk/test/javax/security/auth/PrivateCredentialPermission/Serial.java rename to test/jdk/javax/security/auth/PrivateCredentialPermission/Serial.java diff --git a/jdk/test/javax/security/auth/PrivateCredentialPermission/Serial.policy b/test/jdk/javax/security/auth/PrivateCredentialPermission/Serial.policy similarity index 100% rename from jdk/test/javax/security/auth/PrivateCredentialPermission/Serial.policy rename to test/jdk/javax/security/auth/PrivateCredentialPermission/Serial.policy diff --git a/jdk/test/javax/security/auth/PrivateCredentialPermission/Subset.java b/test/jdk/javax/security/auth/PrivateCredentialPermission/Subset.java similarity index 100% rename from jdk/test/javax/security/auth/PrivateCredentialPermission/Subset.java rename to test/jdk/javax/security/auth/PrivateCredentialPermission/Subset.java diff --git a/jdk/test/javax/security/auth/PrivateCredentialPermission/Subset.policy b/test/jdk/javax/security/auth/PrivateCredentialPermission/Subset.policy similarity index 100% rename from jdk/test/javax/security/auth/PrivateCredentialPermission/Subset.policy rename to test/jdk/javax/security/auth/PrivateCredentialPermission/Subset.policy diff --git a/jdk/test/javax/security/auth/Subject/AddPrincipalSubclass.java b/test/jdk/javax/security/auth/Subject/AddPrincipalSubclass.java similarity index 100% rename from jdk/test/javax/security/auth/Subject/AddPrincipalSubclass.java rename to test/jdk/javax/security/auth/Subject/AddPrincipalSubclass.java diff --git a/jdk/test/javax/security/auth/Subject/Generic.java b/test/jdk/javax/security/auth/Subject/Generic.java similarity index 100% rename from jdk/test/javax/security/auth/Subject/Generic.java rename to test/jdk/javax/security/auth/Subject/Generic.java diff --git a/jdk/test/javax/security/auth/Subject/Serial.java b/test/jdk/javax/security/auth/Subject/Serial.java similarity index 100% rename from jdk/test/javax/security/auth/Subject/Serial.java rename to test/jdk/javax/security/auth/Subject/Serial.java diff --git a/jdk/test/javax/security/auth/Subject/Serial.policy b/test/jdk/javax/security/auth/Subject/Serial.policy similarity index 100% rename from jdk/test/javax/security/auth/Subject/Serial.policy rename to test/jdk/javax/security/auth/Subject/Serial.policy diff --git a/jdk/test/javax/security/auth/Subject/Subject.java b/test/jdk/javax/security/auth/Subject/Subject.java similarity index 100% rename from jdk/test/javax/security/auth/Subject/Subject.java rename to test/jdk/javax/security/auth/Subject/Subject.java diff --git a/jdk/test/javax/security/auth/Subject/SubjectNullTests.java b/test/jdk/javax/security/auth/Subject/SubjectNullTests.java similarity index 100% rename from jdk/test/javax/security/auth/Subject/SubjectNullTests.java rename to test/jdk/javax/security/auth/Subject/SubjectNullTests.java diff --git a/jdk/test/javax/security/auth/Subject/Synch.java b/test/jdk/javax/security/auth/Subject/Synch.java similarity index 100% rename from jdk/test/javax/security/auth/Subject/Synch.java rename to test/jdk/javax/security/auth/Subject/Synch.java diff --git a/jdk/test/javax/security/auth/Subject/Synch2.java b/test/jdk/javax/security/auth/Subject/Synch2.java similarity index 100% rename from jdk/test/javax/security/auth/Subject/Synch2.java rename to test/jdk/javax/security/auth/Subject/Synch2.java diff --git a/jdk/test/javax/security/auth/Subject/Synch2.policy b/test/jdk/javax/security/auth/Subject/Synch2.policy similarity index 100% rename from jdk/test/javax/security/auth/Subject/Synch2.policy rename to test/jdk/javax/security/auth/Subject/Synch2.policy diff --git a/jdk/test/javax/security/auth/Subject/Synch3.java b/test/jdk/javax/security/auth/Subject/Synch3.java similarity index 100% rename from jdk/test/javax/security/auth/Subject/Synch3.java rename to test/jdk/javax/security/auth/Subject/Synch3.java diff --git a/jdk/test/javax/security/auth/Subject/doAs/NestedActions.java b/test/jdk/javax/security/auth/Subject/doAs/NestedActions.java similarity index 100% rename from jdk/test/javax/security/auth/Subject/doAs/NestedActions.java rename to test/jdk/javax/security/auth/Subject/doAs/NestedActions.java diff --git a/jdk/test/javax/security/auth/Subject/doAs/Test.java b/test/jdk/javax/security/auth/Subject/doAs/Test.java similarity index 100% rename from jdk/test/javax/security/auth/Subject/doAs/Test.java rename to test/jdk/javax/security/auth/Subject/doAs/Test.java diff --git a/jdk/test/javax/security/auth/Subject/doAs/Test.sh b/test/jdk/javax/security/auth/Subject/doAs/Test.sh similarity index 100% rename from jdk/test/javax/security/auth/Subject/doAs/Test.sh rename to test/jdk/javax/security/auth/Subject/doAs/Test.sh diff --git a/jdk/test/javax/security/auth/Subject/doAs/policy b/test/jdk/javax/security/auth/Subject/doAs/policy similarity index 100% rename from jdk/test/javax/security/auth/Subject/doAs/policy rename to test/jdk/javax/security/auth/Subject/doAs/policy diff --git a/jdk/test/javax/security/auth/Subject/doAs/policy.expect.ace b/test/jdk/javax/security/auth/Subject/doAs/policy.expect.ace similarity index 100% rename from jdk/test/javax/security/auth/Subject/doAs/policy.expect.ace rename to test/jdk/javax/security/auth/Subject/doAs/policy.expect.ace diff --git a/jdk/test/javax/security/auth/Subject/doAs/policy.expect.pae b/test/jdk/javax/security/auth/Subject/doAs/policy.expect.pae similarity index 100% rename from jdk/test/javax/security/auth/Subject/doAs/policy.expect.pae rename to test/jdk/javax/security/auth/Subject/doAs/policy.expect.pae diff --git a/jdk/test/javax/security/auth/Subject/doAs/policy.one.principal b/test/jdk/javax/security/auth/Subject/doAs/policy.one.principal similarity index 100% rename from jdk/test/javax/security/auth/Subject/doAs/policy.one.principal rename to test/jdk/javax/security/auth/Subject/doAs/policy.one.principal diff --git a/jdk/test/javax/security/auth/Subject/doAs/policy.two.principals b/test/jdk/javax/security/auth/Subject/doAs/policy.two.principals similarity index 100% rename from jdk/test/javax/security/auth/Subject/doAs/policy.two.principals rename to test/jdk/javax/security/auth/Subject/doAs/policy.two.principals diff --git a/jdk/test/javax/security/auth/SubjectDomainCombiner/Optimize.java b/test/jdk/javax/security/auth/SubjectDomainCombiner/Optimize.java similarity index 100% rename from jdk/test/javax/security/auth/SubjectDomainCombiner/Optimize.java rename to test/jdk/javax/security/auth/SubjectDomainCombiner/Optimize.java diff --git a/jdk/test/javax/security/auth/SubjectDomainCombiner/Regression.java b/test/jdk/javax/security/auth/SubjectDomainCombiner/Regression.java similarity index 100% rename from jdk/test/javax/security/auth/SubjectDomainCombiner/Regression.java rename to test/jdk/javax/security/auth/SubjectDomainCombiner/Regression.java diff --git a/jdk/test/javax/security/auth/SubjectDomainCombiner/Regression.policy b/test/jdk/javax/security/auth/SubjectDomainCombiner/Regression.policy similarity index 100% rename from jdk/test/javax/security/auth/SubjectDomainCombiner/Regression.policy rename to test/jdk/javax/security/auth/SubjectDomainCombiner/Regression.policy diff --git a/jdk/test/javax/security/auth/kerberos/DelegationPermissionCollection.java b/test/jdk/javax/security/auth/kerberos/DelegationPermissionCollection.java similarity index 100% rename from jdk/test/javax/security/auth/kerberos/DelegationPermissionCollection.java rename to test/jdk/javax/security/auth/kerberos/DelegationPermissionCollection.java diff --git a/jdk/test/javax/security/auth/kerberos/DelegationPermissionHash.java b/test/jdk/javax/security/auth/kerberos/DelegationPermissionHash.java similarity index 100% rename from jdk/test/javax/security/auth/kerberos/DelegationPermissionHash.java rename to test/jdk/javax/security/auth/kerberos/DelegationPermissionHash.java diff --git a/jdk/test/javax/security/auth/kerberos/KerberosHashEqualsTest.java b/test/jdk/javax/security/auth/kerberos/KerberosHashEqualsTest.java similarity index 100% rename from jdk/test/javax/security/auth/kerberos/KerberosHashEqualsTest.java rename to test/jdk/javax/security/auth/kerberos/KerberosHashEqualsTest.java diff --git a/jdk/test/javax/security/auth/kerberos/KerberosNullsAndDestroyTest.java b/test/jdk/javax/security/auth/kerberos/KerberosNullsAndDestroyTest.java similarity index 100% rename from jdk/test/javax/security/auth/kerberos/KerberosNullsAndDestroyTest.java rename to test/jdk/javax/security/auth/kerberos/KerberosNullsAndDestroyTest.java diff --git a/jdk/test/javax/security/auth/kerberos/KerberosTixDateTest.java b/test/jdk/javax/security/auth/kerberos/KerberosTixDateTest.java similarity index 100% rename from jdk/test/javax/security/auth/kerberos/KerberosTixDateTest.java rename to test/jdk/javax/security/auth/kerberos/KerberosTixDateTest.java diff --git a/jdk/test/javax/security/auth/kerberos/ServicePermissionCollection.java b/test/jdk/javax/security/auth/kerberos/ServicePermissionCollection.java similarity index 100% rename from jdk/test/javax/security/auth/kerberos/ServicePermissionCollection.java rename to test/jdk/javax/security/auth/kerberos/ServicePermissionCollection.java diff --git a/jdk/test/javax/security/auth/kerberos/ServicePermissionTest.java b/test/jdk/javax/security/auth/kerberos/ServicePermissionTest.java similarity index 100% rename from jdk/test/javax/security/auth/kerberos/ServicePermissionTest.java rename to test/jdk/javax/security/auth/kerberos/ServicePermissionTest.java diff --git a/jdk/test/javax/security/auth/kerberos/StandardNames.java b/test/jdk/javax/security/auth/kerberos/StandardNames.java similarity index 100% rename from jdk/test/javax/security/auth/kerberos/StandardNames.java rename to test/jdk/javax/security/auth/kerberos/StandardNames.java diff --git a/jdk/test/javax/security/auth/kerberos/TEST.properties b/test/jdk/javax/security/auth/kerberos/TEST.properties similarity index 100% rename from jdk/test/javax/security/auth/kerberos/TEST.properties rename to test/jdk/javax/security/auth/kerberos/TEST.properties diff --git a/jdk/test/javax/security/auth/login/Configuration/ConfigFileWithBlank.java b/test/jdk/javax/security/auth/login/Configuration/ConfigFileWithBlank.java similarity index 100% rename from jdk/test/javax/security/auth/login/Configuration/ConfigFileWithBlank.java rename to test/jdk/javax/security/auth/login/Configuration/ConfigFileWithBlank.java diff --git a/jdk/test/javax/security/auth/login/Configuration/GetInstance.bad.configURI b/test/jdk/javax/security/auth/login/Configuration/GetInstance.bad.configURI similarity index 100% rename from jdk/test/javax/security/auth/login/Configuration/GetInstance.bad.configURI rename to test/jdk/javax/security/auth/login/Configuration/GetInstance.bad.configURI diff --git a/jdk/test/javax/security/auth/login/Configuration/GetInstance.config b/test/jdk/javax/security/auth/login/Configuration/GetInstance.config similarity index 100% rename from jdk/test/javax/security/auth/login/Configuration/GetInstance.config rename to test/jdk/javax/security/auth/login/Configuration/GetInstance.config diff --git a/jdk/test/javax/security/auth/login/Configuration/GetInstance.configURI b/test/jdk/javax/security/auth/login/Configuration/GetInstance.configURI similarity index 100% rename from jdk/test/javax/security/auth/login/Configuration/GetInstance.configURI rename to test/jdk/javax/security/auth/login/Configuration/GetInstance.configURI diff --git a/jdk/test/javax/security/auth/login/Configuration/GetInstance.java b/test/jdk/javax/security/auth/login/Configuration/GetInstance.java similarity index 100% rename from jdk/test/javax/security/auth/login/Configuration/GetInstance.java rename to test/jdk/javax/security/auth/login/Configuration/GetInstance.java diff --git a/jdk/test/javax/security/auth/login/Configuration/GetInstanceConfigSpi.java b/test/jdk/javax/security/auth/login/Configuration/GetInstanceConfigSpi.java similarity index 100% rename from jdk/test/javax/security/auth/login/Configuration/GetInstanceConfigSpi.java rename to test/jdk/javax/security/auth/login/Configuration/GetInstanceConfigSpi.java diff --git a/jdk/test/javax/security/auth/login/Configuration/GetInstanceProvider.java b/test/jdk/javax/security/auth/login/Configuration/GetInstanceProvider.java similarity index 100% rename from jdk/test/javax/security/auth/login/Configuration/GetInstanceProvider.java rename to test/jdk/javax/security/auth/login/Configuration/GetInstanceProvider.java diff --git a/jdk/test/javax/security/auth/login/Configuration/GetInstanceSecurity.grantedPolicy b/test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.grantedPolicy similarity index 100% rename from jdk/test/javax/security/auth/login/Configuration/GetInstanceSecurity.grantedPolicy rename to test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.grantedPolicy diff --git a/jdk/test/javax/security/auth/login/Configuration/GetInstanceSecurity.java b/test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.java similarity index 100% rename from jdk/test/javax/security/auth/login/Configuration/GetInstanceSecurity.java rename to test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.java diff --git a/jdk/test/javax/security/auth/login/Configuration/GetInstanceSecurity.policy b/test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.policy similarity index 100% rename from jdk/test/javax/security/auth/login/Configuration/GetInstanceSecurity.policy rename to test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.policy diff --git a/jdk/test/javax/security/auth/login/Configuration/Synchronize.config b/test/jdk/javax/security/auth/login/Configuration/Synchronize.config similarity index 100% rename from jdk/test/javax/security/auth/login/Configuration/Synchronize.config rename to test/jdk/javax/security/auth/login/Configuration/Synchronize.config diff --git a/jdk/test/javax/security/auth/login/Configuration/Synchronize.java b/test/jdk/javax/security/auth/login/Configuration/Synchronize.java similarity index 100% rename from jdk/test/javax/security/auth/login/Configuration/Synchronize.java rename to test/jdk/javax/security/auth/login/Configuration/Synchronize.java diff --git a/jdk/test/javax/security/auth/login/Exceptions/NewExceptions.java b/test/jdk/javax/security/auth/login/Exceptions/NewExceptions.java similarity index 100% rename from jdk/test/javax/security/auth/login/Exceptions/NewExceptions.java rename to test/jdk/javax/security/auth/login/Exceptions/NewExceptions.java diff --git a/jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASConfigSyntaxTest.java b/test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/JAASConfigSyntaxTest.java similarity index 100% rename from jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASConfigSyntaxTest.java rename to test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/JAASConfigSyntaxTest.java diff --git a/jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutApplication.config b/test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutApplication.config similarity index 100% rename from jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutApplication.config rename to test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutApplication.config diff --git a/jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutBraces.config b/test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutBraces.config similarity index 100% rename from jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutBraces.config rename to test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutBraces.config diff --git a/jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutFlag.config b/test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutFlag.config similarity index 100% rename from jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutFlag.config rename to test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutFlag.config diff --git a/jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutLoginModule.config b/test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutLoginModule.config similarity index 100% rename from jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutLoginModule.config rename to test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutLoginModule.config diff --git a/jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutSemiColen.config b/test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutSemiColen.config similarity index 100% rename from jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutSemiColen.config rename to test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/JAASSynWithOutSemiColen.config diff --git a/jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/SampleLoginModule.java b/test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/SampleLoginModule.java similarity index 100% rename from jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/SampleLoginModule.java rename to test/jdk/javax/security/auth/login/JAASConfigSyntaxCheck/SampleLoginModule.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/ConfigConstructor.config b/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.config similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/ConfigConstructor.config rename to test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.config diff --git a/jdk/test/javax/security/auth/login/LoginContext/ConfigConstructor.java b/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/ConfigConstructor.java rename to test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/ConfigConstructor.policy b/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.policy similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/ConfigConstructor.policy rename to test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.policy diff --git a/jdk/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java b/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java rename to test/jdk/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.policy b/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.policy similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.policy rename to test/jdk/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.policy diff --git a/jdk/test/javax/security/auth/login/LoginContext/CustomLoginModule.java b/test/jdk/javax/security/auth/login/LoginContext/CustomLoginModule.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/CustomLoginModule.java rename to test/jdk/javax/security/auth/login/LoginContext/CustomLoginModule.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/DefaultHandler.config b/test/jdk/javax/security/auth/login/LoginContext/DefaultHandler.config similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/DefaultHandler.config rename to test/jdk/javax/security/auth/login/LoginContext/DefaultHandler.config diff --git a/jdk/test/javax/security/auth/login/LoginContext/DefaultHandler.java b/test/jdk/javax/security/auth/login/LoginContext/DefaultHandler.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/DefaultHandler.java rename to test/jdk/javax/security/auth/login/LoginContext/DefaultHandler.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/DefaultHandlerImpl.java b/test/jdk/javax/security/auth/login/LoginContext/DefaultHandlerImpl.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/DefaultHandlerImpl.java rename to test/jdk/javax/security/auth/login/LoginContext/DefaultHandlerImpl.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/DefaultHandlerModule.java b/test/jdk/javax/security/auth/login/LoginContext/DefaultHandlerModule.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/DefaultHandlerModule.java rename to test/jdk/javax/security/auth/login/LoginContext/DefaultHandlerModule.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/DummyLoginModule.java b/test/jdk/javax/security/auth/login/LoginContext/DummyLoginModule.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/DummyLoginModule.java rename to test/jdk/javax/security/auth/login/LoginContext/DummyLoginModule.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/DynamicConfigurationTest.java b/test/jdk/javax/security/auth/login/LoginContext/DynamicConfigurationTest.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/DynamicConfigurationTest.java rename to test/jdk/javax/security/auth/login/LoginContext/DynamicConfigurationTest.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/LCTest.jaas.config b/test/jdk/javax/security/auth/login/LoginContext/LCTest.jaas.config similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/LCTest.jaas.config rename to test/jdk/javax/security/auth/login/LoginContext/LCTest.jaas.config diff --git a/jdk/test/javax/security/auth/login/LoginContext/LCTest.java b/test/jdk/javax/security/auth/login/LoginContext/LCTest.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/LCTest.java rename to test/jdk/javax/security/auth/login/LoginContext/LCTest.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/ModuleSubject.config b/test/jdk/javax/security/auth/login/LoginContext/ModuleSubject.config similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/ModuleSubject.config rename to test/jdk/javax/security/auth/login/LoginContext/ModuleSubject.config diff --git a/jdk/test/javax/security/auth/login/LoginContext/ModuleSubject.java b/test/jdk/javax/security/auth/login/LoginContext/ModuleSubject.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/ModuleSubject.java rename to test/jdk/javax/security/auth/login/LoginContext/ModuleSubject.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/ModuleSubjectModule.java b/test/jdk/javax/security/auth/login/LoginContext/ModuleSubjectModule.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/ModuleSubjectModule.java rename to test/jdk/javax/security/auth/login/LoginContext/ModuleSubjectModule.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/MyConfiguration.java b/test/jdk/javax/security/auth/login/LoginContext/MyConfiguration.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/MyConfiguration.java rename to test/jdk/javax/security/auth/login/LoginContext/MyConfiguration.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/ResetConfigModule.java b/test/jdk/javax/security/auth/login/LoginContext/ResetConfigModule.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/ResetConfigModule.java rename to test/jdk/javax/security/auth/login/LoginContext/ResetConfigModule.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/ResetModule.java b/test/jdk/javax/security/auth/login/LoginContext/ResetModule.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/ResetModule.java rename to test/jdk/javax/security/auth/login/LoginContext/ResetModule.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/SharedState.java b/test/jdk/javax/security/auth/login/LoginContext/SharedState.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/SharedState.java rename to test/jdk/javax/security/auth/login/LoginContext/SharedState.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/SmartLoginModule.java b/test/jdk/javax/security/auth/login/LoginContext/SmartLoginModule.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/SmartLoginModule.java rename to test/jdk/javax/security/auth/login/LoginContext/SmartLoginModule.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/StandardCallbacks.java b/test/jdk/javax/security/auth/login/LoginContext/StandardCallbacks.java similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/StandardCallbacks.java rename to test/jdk/javax/security/auth/login/LoginContext/StandardCallbacks.java diff --git a/jdk/test/javax/security/auth/login/LoginContext/custom.config b/test/jdk/javax/security/auth/login/LoginContext/custom.config similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/custom.config rename to test/jdk/javax/security/auth/login/LoginContext/custom.config diff --git a/jdk/test/javax/security/auth/login/LoginContext/shared.config b/test/jdk/javax/security/auth/login/LoginContext/shared.config similarity index 100% rename from jdk/test/javax/security/auth/login/LoginContext/shared.config rename to test/jdk/javax/security/auth/login/LoginContext/shared.config diff --git a/jdk/test/javax/security/auth/login/modules/JaasClient.java b/test/jdk/javax/security/auth/login/modules/JaasClient.java similarity index 100% rename from jdk/test/javax/security/auth/login/modules/JaasClient.java rename to test/jdk/javax/security/auth/login/modules/JaasClient.java diff --git a/jdk/test/javax/security/auth/login/modules/JaasClientWithDefaultHandler.java b/test/jdk/javax/security/auth/login/modules/JaasClientWithDefaultHandler.java similarity index 100% rename from jdk/test/javax/security/auth/login/modules/JaasClientWithDefaultHandler.java rename to test/jdk/javax/security/auth/login/modules/JaasClientWithDefaultHandler.java diff --git a/jdk/test/javax/security/auth/login/modules/JaasModularClientTest.java b/test/jdk/javax/security/auth/login/modules/JaasModularClientTest.java similarity index 100% rename from jdk/test/javax/security/auth/login/modules/JaasModularClientTest.java rename to test/jdk/javax/security/auth/login/modules/JaasModularClientTest.java diff --git a/jdk/test/javax/security/auth/login/modules/JaasModularDefaultHandlerTest.java b/test/jdk/javax/security/auth/login/modules/JaasModularDefaultHandlerTest.java similarity index 100% rename from jdk/test/javax/security/auth/login/modules/JaasModularDefaultHandlerTest.java rename to test/jdk/javax/security/auth/login/modules/JaasModularDefaultHandlerTest.java diff --git a/jdk/test/javax/security/auth/login/modules/TestCallbackHandler.java b/test/jdk/javax/security/auth/login/modules/TestCallbackHandler.java similarity index 100% rename from jdk/test/javax/security/auth/login/modules/TestCallbackHandler.java rename to test/jdk/javax/security/auth/login/modules/TestCallbackHandler.java diff --git a/jdk/test/javax/security/auth/login/modules/TestLoginModule.java b/test/jdk/javax/security/auth/login/modules/TestLoginModule.java similarity index 100% rename from jdk/test/javax/security/auth/login/modules/TestLoginModule.java rename to test/jdk/javax/security/auth/login/modules/TestLoginModule.java diff --git a/jdk/test/javax/security/auth/login/modules/jaas.conf b/test/jdk/javax/security/auth/login/modules/jaas.conf similarity index 100% rename from jdk/test/javax/security/auth/login/modules/jaas.conf rename to test/jdk/javax/security/auth/login/modules/jaas.conf diff --git a/jdk/test/javax/security/auth/spi/FirstLoginModule.java b/test/jdk/javax/security/auth/spi/FirstLoginModule.java similarity index 100% rename from jdk/test/javax/security/auth/spi/FirstLoginModule.java rename to test/jdk/javax/security/auth/spi/FirstLoginModule.java diff --git a/jdk/test/javax/security/auth/spi/Loader.java b/test/jdk/javax/security/auth/spi/Loader.java similarity index 100% rename from jdk/test/javax/security/auth/spi/Loader.java rename to test/jdk/javax/security/auth/spi/Loader.java diff --git a/jdk/test/javax/security/auth/spi/META-INF/services/javax.security.auth.spi.LoginModule b/test/jdk/javax/security/auth/spi/META-INF/services/javax.security.auth.spi.LoginModule similarity index 100% rename from jdk/test/javax/security/auth/spi/META-INF/services/javax.security.auth.spi.LoginModule rename to test/jdk/javax/security/auth/spi/META-INF/services/javax.security.auth.spi.LoginModule diff --git a/jdk/test/javax/security/auth/spi/SecondLoginModule.java b/test/jdk/javax/security/auth/spi/SecondLoginModule.java similarity index 100% rename from jdk/test/javax/security/auth/spi/SecondLoginModule.java rename to test/jdk/javax/security/auth/spi/SecondLoginModule.java diff --git a/jdk/test/javax/security/auth/spi/sl.conf b/test/jdk/javax/security/auth/spi/sl.conf similarity index 100% rename from jdk/test/javax/security/auth/spi/sl.conf rename to test/jdk/javax/security/auth/spi/sl.conf diff --git a/jdk/test/javax/security/auth/x500/X500Principal/DerIsConstructor.java b/test/jdk/javax/security/auth/x500/X500Principal/DerIsConstructor.java similarity index 100% rename from jdk/test/javax/security/auth/x500/X500Principal/DerIsConstructor.java rename to test/jdk/javax/security/auth/x500/X500Principal/DerIsConstructor.java diff --git a/jdk/test/javax/security/auth/x500/X500Principal/Equals.java b/test/jdk/javax/security/auth/x500/X500Principal/Equals.java similarity index 100% rename from jdk/test/javax/security/auth/x500/X500Principal/Equals.java rename to test/jdk/javax/security/auth/x500/X500Principal/Equals.java diff --git a/jdk/test/javax/security/auth/x500/X500Principal/EscapedChars.java b/test/jdk/javax/security/auth/x500/X500Principal/EscapedChars.java similarity index 100% rename from jdk/test/javax/security/auth/x500/X500Principal/EscapedChars.java rename to test/jdk/javax/security/auth/x500/X500Principal/EscapedChars.java diff --git a/jdk/test/javax/security/auth/x500/X500Principal/InvalidConstructorInput.java b/test/jdk/javax/security/auth/x500/X500Principal/InvalidConstructorInput.java similarity index 100% rename from jdk/test/javax/security/auth/x500/X500Principal/InvalidConstructorInput.java rename to test/jdk/javax/security/auth/x500/X500Principal/InvalidConstructorInput.java diff --git a/jdk/test/javax/security/auth/x500/X500Principal/KeywordMap.java b/test/jdk/javax/security/auth/x500/X500Principal/KeywordMap.java similarity index 100% rename from jdk/test/javax/security/auth/x500/X500Principal/KeywordMap.java rename to test/jdk/javax/security/auth/x500/X500Principal/KeywordMap.java diff --git a/jdk/test/javax/security/auth/x500/X500Principal/NameFormat.java b/test/jdk/javax/security/auth/x500/X500Principal/NameFormat.java similarity index 100% rename from jdk/test/javax/security/auth/x500/X500Principal/NameFormat.java rename to test/jdk/javax/security/auth/x500/X500Principal/NameFormat.java diff --git a/jdk/test/javax/security/auth/x500/X500Principal/OIDMap.java b/test/jdk/javax/security/auth/x500/X500Principal/OIDMap.java similarity index 100% rename from jdk/test/javax/security/auth/x500/X500Principal/OIDMap.java rename to test/jdk/javax/security/auth/x500/X500Principal/OIDMap.java diff --git a/jdk/test/javax/security/auth/x500/X500Principal/Parse.java b/test/jdk/javax/security/auth/x500/X500Principal/Parse.java similarity index 100% rename from jdk/test/javax/security/auth/x500/X500Principal/Parse.java rename to test/jdk/javax/security/auth/x500/X500Principal/Parse.java diff --git a/jdk/test/javax/security/auth/x500/X500Principal/RFC4514.java b/test/jdk/javax/security/auth/x500/X500Principal/RFC4514.java similarity index 100% rename from jdk/test/javax/security/auth/x500/X500Principal/RFC4514.java rename to test/jdk/javax/security/auth/x500/X500Principal/RFC4514.java diff --git a/jdk/test/javax/security/sasl/Sasl/ClientServerTest.java b/test/jdk/javax/security/sasl/Sasl/ClientServerTest.java similarity index 100% rename from jdk/test/javax/security/sasl/Sasl/ClientServerTest.java rename to test/jdk/javax/security/sasl/Sasl/ClientServerTest.java diff --git a/jdk/test/javax/security/sasl/Sasl/PassSysProps.java b/test/jdk/javax/security/sasl/Sasl/PassSysProps.java similarity index 100% rename from jdk/test/javax/security/sasl/Sasl/PassSysProps.java rename to test/jdk/javax/security/sasl/Sasl/PassSysProps.java diff --git a/jdk/test/javax/smartcardio/CommandAPDUTest.java b/test/jdk/javax/smartcardio/CommandAPDUTest.java similarity index 100% rename from jdk/test/javax/smartcardio/CommandAPDUTest.java rename to test/jdk/javax/smartcardio/CommandAPDUTest.java diff --git a/jdk/test/javax/smartcardio/HistoricalBytes.java b/test/jdk/javax/smartcardio/HistoricalBytes.java similarity index 100% rename from jdk/test/javax/smartcardio/HistoricalBytes.java rename to test/jdk/javax/smartcardio/HistoricalBytes.java diff --git a/jdk/test/javax/smartcardio/ResponseAPDUTest.java b/test/jdk/javax/smartcardio/ResponseAPDUTest.java similarity index 100% rename from jdk/test/javax/smartcardio/ResponseAPDUTest.java rename to test/jdk/javax/smartcardio/ResponseAPDUTest.java diff --git a/jdk/test/javax/smartcardio/Serialize.java b/test/jdk/javax/smartcardio/Serialize.java similarity index 100% rename from jdk/test/javax/smartcardio/Serialize.java rename to test/jdk/javax/smartcardio/Serialize.java diff --git a/jdk/test/javax/smartcardio/TEST.properties b/test/jdk/javax/smartcardio/TEST.properties similarity index 100% rename from jdk/test/javax/smartcardio/TEST.properties rename to test/jdk/javax/smartcardio/TEST.properties diff --git a/jdk/test/javax/smartcardio/TerminalFactorySpiTest.java b/test/jdk/javax/smartcardio/TerminalFactorySpiTest.java similarity index 100% rename from jdk/test/javax/smartcardio/TerminalFactorySpiTest.java rename to test/jdk/javax/smartcardio/TerminalFactorySpiTest.java diff --git a/jdk/test/javax/smartcardio/TestCardPermission.java b/test/jdk/javax/smartcardio/TestCardPermission.java similarity index 100% rename from jdk/test/javax/smartcardio/TestCardPermission.java rename to test/jdk/javax/smartcardio/TestCardPermission.java diff --git a/jdk/test/javax/smartcardio/TestCommandAPDU.java b/test/jdk/javax/smartcardio/TestCommandAPDU.java similarity index 100% rename from jdk/test/javax/smartcardio/TestCommandAPDU.java rename to test/jdk/javax/smartcardio/TestCommandAPDU.java diff --git a/jdk/test/javax/smartcardio/policy b/test/jdk/javax/smartcardio/policy similarity index 100% rename from jdk/test/javax/smartcardio/policy rename to test/jdk/javax/smartcardio/policy diff --git a/jdk/test/javax/sound/TEST.properties b/test/jdk/javax/sound/TEST.properties similarity index 100% rename from jdk/test/javax/sound/TEST.properties rename to test/jdk/javax/sound/TEST.properties diff --git a/jdk/test/javax/sound/midi/Devices/ClosedReceiver.java b/test/jdk/javax/sound/midi/Devices/ClosedReceiver.java similarity index 100% rename from jdk/test/javax/sound/midi/Devices/ClosedReceiver.java rename to test/jdk/javax/sound/midi/Devices/ClosedReceiver.java diff --git a/jdk/test/javax/sound/midi/Devices/IOLoop.java b/test/jdk/javax/sound/midi/Devices/IOLoop.java similarity index 100% rename from jdk/test/javax/sound/midi/Devices/IOLoop.java rename to test/jdk/javax/sound/midi/Devices/IOLoop.java diff --git a/jdk/test/javax/sound/midi/Devices/InitializationHang.java b/test/jdk/javax/sound/midi/Devices/InitializationHang.java similarity index 100% rename from jdk/test/javax/sound/midi/Devices/InitializationHang.java rename to test/jdk/javax/sound/midi/Devices/InitializationHang.java diff --git a/jdk/test/javax/sound/midi/Devices/MidiDeviceGetReceivers.java b/test/jdk/javax/sound/midi/Devices/MidiDeviceGetReceivers.java similarity index 100% rename from jdk/test/javax/sound/midi/Devices/MidiDeviceGetReceivers.java rename to test/jdk/javax/sound/midi/Devices/MidiDeviceGetReceivers.java diff --git a/jdk/test/javax/sound/midi/Devices/MidiIO.java b/test/jdk/javax/sound/midi/Devices/MidiIO.java similarity index 100% rename from jdk/test/javax/sound/midi/Devices/MidiIO.java rename to test/jdk/javax/sound/midi/Devices/MidiIO.java diff --git a/jdk/test/javax/sound/midi/Devices/MidiOutGetMicrosecondPositionBug.java b/test/jdk/javax/sound/midi/Devices/MidiOutGetMicrosecondPositionBug.java similarity index 100% rename from jdk/test/javax/sound/midi/Devices/MidiOutGetMicrosecondPositionBug.java rename to test/jdk/javax/sound/midi/Devices/MidiOutGetMicrosecondPositionBug.java diff --git a/jdk/test/javax/sound/midi/Devices/OpenClose.java b/test/jdk/javax/sound/midi/Devices/OpenClose.java similarity index 100% rename from jdk/test/javax/sound/midi/Devices/OpenClose.java rename to test/jdk/javax/sound/midi/Devices/OpenClose.java diff --git a/jdk/test/javax/sound/midi/Devices/ReceiverTransmitterAvailable.java b/test/jdk/javax/sound/midi/Devices/ReceiverTransmitterAvailable.java similarity index 100% rename from jdk/test/javax/sound/midi/Devices/ReceiverTransmitterAvailable.java rename to test/jdk/javax/sound/midi/Devices/ReceiverTransmitterAvailable.java diff --git a/jdk/test/javax/sound/midi/Devices/Reopen.java b/test/jdk/javax/sound/midi/Devices/Reopen.java similarity index 100% rename from jdk/test/javax/sound/midi/Devices/Reopen.java rename to test/jdk/javax/sound/midi/Devices/Reopen.java diff --git a/jdk/test/javax/sound/midi/File/SMFCp037.java b/test/jdk/javax/sound/midi/File/SMFCp037.java similarity index 100% rename from jdk/test/javax/sound/midi/File/SMFCp037.java rename to test/jdk/javax/sound/midi/File/SMFCp037.java diff --git a/jdk/test/javax/sound/midi/File/SMFParserBreak.java b/test/jdk/javax/sound/midi/File/SMFParserBreak.java similarity index 100% rename from jdk/test/javax/sound/midi/File/SMFParserBreak.java rename to test/jdk/javax/sound/midi/File/SMFParserBreak.java diff --git a/jdk/test/javax/sound/midi/File/SMPTESequence.java b/test/jdk/javax/sound/midi/File/SMPTESequence.java similarity index 100% rename from jdk/test/javax/sound/midi/File/SMPTESequence.java rename to test/jdk/javax/sound/midi/File/SMPTESequence.java diff --git a/jdk/test/javax/sound/midi/File/WriteRealTimeMessageNPE.java b/test/jdk/javax/sound/midi/File/WriteRealTimeMessageNPE.java similarity index 100% rename from jdk/test/javax/sound/midi/File/WriteRealTimeMessageNPE.java rename to test/jdk/javax/sound/midi/File/WriteRealTimeMessageNPE.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/Bits16ToFromFloatArray.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/Bits16ToFromFloatArray.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/Bits16ToFromFloatArray.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/Bits16ToFromFloatArray.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/Bits24ToFromFloatArray.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/Bits24ToFromFloatArray.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/Bits24ToFromFloatArray.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/Bits24ToFromFloatArray.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/Bits32ToFromFloatArray.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/Bits32ToFromFloatArray.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/Bits32ToFromFloatArray.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/Bits32ToFromFloatArray.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/Bits64ToFromFloatArray.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/Bits64ToFromFloatArray.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/Bits64ToFromFloatArray.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/Bits64ToFromFloatArray.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/Bits8ToFromFloatArray.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/Bits8ToFromFloatArray.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/Bits8ToFromFloatArray.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/Bits8ToFromFloatArray.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java b/test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java rename to test/jdk/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java diff --git a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java b/test/jdk/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java rename to test/jdk/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java diff --git a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java b/test/jdk/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java rename to test/jdk/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java diff --git a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java b/test/jdk/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java rename to test/jdk/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java diff --git a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java b/test/jdk/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java rename to test/jdk/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java diff --git a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/ding.dls b/test/jdk/javax/sound/midi/Gervill/DLSSoundbankReader/ding.dls similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/ding.dls rename to test/jdk/javax/sound/midi/Gervill/DLSSoundbankReader/ding.dls diff --git a/jdk/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java b/test/jdk/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java rename to test/jdk/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/Load.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/Load.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java b/test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java rename to test/jdk/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java b/test/jdk/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java rename to test/jdk/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java b/test/jdk/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java rename to test/jdk/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java b/test/jdk/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java rename to test/jdk/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java b/test/jdk/javax/sound/midi/Gervill/ModelDestination/SetTransform.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java rename to test/jdk/javax/sound/midi/Gervill/ModelDestination/SetTransform.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java b/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java rename to test/jdk/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java b/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java rename to test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java b/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java rename to test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java b/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java rename to test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java b/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java rename to test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java b/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java rename to test/jdk/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java b/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java rename to test/jdk/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java b/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java rename to test/jdk/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java b/test/jdk/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java rename to test/jdk/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java b/test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java rename to test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java b/test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java rename to test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java b/test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java rename to test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java b/test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java rename to test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java b/test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java rename to test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java b/test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetName.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java rename to test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetName.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java b/test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java rename to test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java b/test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java rename to test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java b/test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java rename to test/jdk/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java b/test/jdk/javax/sound/midi/Gervill/ModelSource/NewModelSource.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java rename to test/jdk/javax/sound/midi/Gervill/ModelSource/NewModelSource.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java b/test/jdk/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java rename to test/jdk/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java b/test/jdk/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java rename to test/jdk/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java b/test/jdk/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java rename to test/jdk/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java b/test/jdk/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java rename to test/jdk/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java b/test/jdk/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java rename to test/jdk/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java b/test/jdk/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java rename to test/jdk/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java b/test/jdk/javax/sound/midi/Gervill/ModelSource/SetTransform.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java rename to test/jdk/javax/sound/midi/Gervill/ModelSource/SetTransform.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java b/test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java rename to test/jdk/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/Available.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/Available.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/Close.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/Close.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/Read.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/Read.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java b/test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java rename to test/jdk/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java diff --git a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java b/test/jdk/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java rename to test/jdk/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java diff --git a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java b/test/jdk/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java rename to test/jdk/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java diff --git a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java b/test/jdk/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java rename to test/jdk/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java diff --git a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java b/test/jdk/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java rename to test/jdk/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java diff --git a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/ding.sf2 b/test/jdk/javax/sound/midi/Gervill/SF2SoundbankReader/ding.sf2 similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/ding.sf2 rename to test/jdk/javax/sound/midi/Gervill/SF2SoundbankReader/ding.sf2 diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/Clear.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/Clear.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/SetName.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/SetName.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java b/test/jdk/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java rename to test/jdk/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java b/test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java rename to test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java b/test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java rename to test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java b/test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java rename to test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java b/test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java rename to test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java b/test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java rename to test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java b/test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java rename to test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java b/test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java rename to test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java b/test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java rename to test/jdk/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java b/test/jdk/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java rename to test/jdk/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java b/test/jdk/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java rename to test/jdk/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java b/test/jdk/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java rename to test/jdk/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java b/test/jdk/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java rename to test/jdk/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java b/test/jdk/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java rename to test/jdk/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java b/test/jdk/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java rename to test/jdk/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java b/test/jdk/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java rename to test/jdk/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java b/test/jdk/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java rename to test/jdk/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java b/test/jdk/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java rename to test/jdk/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Controller.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/Controller.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/Controller.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/Controller.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/LocalControl.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/LocalControl.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mono.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/Mono.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/Mono.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/Mono.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mute.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/Mute.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/Mute.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/Mute.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOn.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOn.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Omni.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/Omni.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/Omni.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/Omni.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/PitchBend.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/PitchBend.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/SoftTestUtils.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/SoftTestUtils.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/SoftTestUtils.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/SoftTestUtils.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Solo.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/Solo.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftChannel/Solo.java rename to test/jdk/javax/sound/midi/Gervill/SoftChannel/Solo.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java b/test/jdk/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java rename to test/jdk/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java b/test/jdk/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java rename to test/jdk/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java b/test/jdk/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java rename to test/jdk/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java b/test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java rename to test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java b/test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java rename to test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java b/test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java rename to test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java b/test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java rename to test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java b/test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java rename to test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java b/test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java rename to test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java b/test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java rename to test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java b/test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java rename to test/jdk/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java b/test/jdk/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java rename to test/jdk/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java b/test/jdk/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java rename to test/jdk/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java b/test/jdk/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java rename to test/jdk/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java b/test/jdk/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java rename to test/jdk/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java b/test/jdk/javax/sound/midi/Gervill/SoftProvider/GetDevice.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java rename to test/jdk/javax/sound/midi/Gervill/SoftProvider/GetDevice.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Close.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Close.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Close.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Close.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/SoftTestUtils.java b/test/jdk/javax/sound/midi/Gervill/SoftReceiver/SoftTestUtils.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftReceiver/SoftTestUtils.java rename to test/jdk/javax/sound/midi/Gervill/SoftReceiver/SoftTestUtils.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java b/test/jdk/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java rename to test/jdk/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/Close.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/Close.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Open.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/Open.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Open.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/Open.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/ding.sf2 b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/ding.sf2 similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/ding.sf2 rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/ding.sf2 diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/expresso.mid b/test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/expresso.mid similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/expresso.mid rename to test/jdk/javax/sound/midi/Gervill/SoftSynthesizer/expresso.mid diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetName.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/GetName.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/GetName.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/GetName.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/GetTuning.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/GetTuning.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load1.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/Load1.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/Load1.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/Load1.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load2.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/Load2.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/Load2.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/Load2.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load4.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/Load4.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/Load4.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/Load4.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load5.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/Load5.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/Load5.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/Load5.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load6.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/Load6.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/Load6.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/Load6.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load7.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/Load7.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/Load7.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/Load7.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load8.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/Load8.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/Load8.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/Load8.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load9.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/Load9.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/Load9.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/Load9.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java b/test/jdk/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java similarity index 100% rename from jdk/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java rename to test/jdk/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java diff --git a/jdk/test/javax/sound/midi/MetaMessage/MetaMessageClone.java b/test/jdk/javax/sound/midi/MetaMessage/MetaMessageClone.java similarity index 100% rename from jdk/test/javax/sound/midi/MetaMessage/MetaMessageClone.java rename to test/jdk/javax/sound/midi/MetaMessage/MetaMessageClone.java diff --git a/jdk/test/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java b/test/jdk/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java similarity index 100% rename from jdk/test/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java rename to test/jdk/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java diff --git a/jdk/test/javax/sound/midi/MidiSystem/6411624/Test6411624.java b/test/jdk/javax/sound/midi/MidiSystem/6411624/Test6411624.java similarity index 100% rename from jdk/test/javax/sound/midi/MidiSystem/6411624/Test6411624.java rename to test/jdk/javax/sound/midi/MidiSystem/6411624/Test6411624.java diff --git a/jdk/test/javax/sound/midi/MidiSystem/6411624/bug6411624.java b/test/jdk/javax/sound/midi/MidiSystem/6411624/bug6411624.java similarity index 100% rename from jdk/test/javax/sound/midi/MidiSystem/6411624/bug6411624.java rename to test/jdk/javax/sound/midi/MidiSystem/6411624/bug6411624.java diff --git a/jdk/test/javax/sound/midi/MidiSystem/DefaultDevices.java b/test/jdk/javax/sound/midi/MidiSystem/DefaultDevices.java similarity index 100% rename from jdk/test/javax/sound/midi/MidiSystem/DefaultDevices.java rename to test/jdk/javax/sound/midi/MidiSystem/DefaultDevices.java diff --git a/jdk/test/javax/sound/midi/MidiSystem/DefaultProperties.java b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties.java similarity index 100% rename from jdk/test/javax/sound/midi/MidiSystem/DefaultProperties.java rename to test/jdk/javax/sound/midi/MidiSystem/DefaultProperties.java diff --git a/jdk/test/javax/sound/midi/MidiSystem/GetSequencer.java b/test/jdk/javax/sound/midi/MidiSystem/GetSequencer.java similarity index 100% rename from jdk/test/javax/sound/midi/MidiSystem/GetSequencer.java rename to test/jdk/javax/sound/midi/MidiSystem/GetSequencer.java diff --git a/jdk/test/javax/sound/midi/MidiSystem/MidiFileTypeUniqueness.java b/test/jdk/javax/sound/midi/MidiSystem/MidiFileTypeUniqueness.java similarity index 100% rename from jdk/test/javax/sound/midi/MidiSystem/MidiFileTypeUniqueness.java rename to test/jdk/javax/sound/midi/MidiSystem/MidiFileTypeUniqueness.java diff --git a/jdk/test/javax/sound/midi/MidiSystem/ProviderCacheing.java b/test/jdk/javax/sound/midi/MidiSystem/ProviderCacheing.java similarity index 100% rename from jdk/test/javax/sound/midi/MidiSystem/ProviderCacheing.java rename to test/jdk/javax/sound/midi/MidiSystem/ProviderCacheing.java diff --git a/jdk/test/javax/sound/midi/MidiSystem/testdata/conf/sound.properties b/test/jdk/javax/sound/midi/MidiSystem/testdata/conf/sound.properties similarity index 100% rename from jdk/test/javax/sound/midi/MidiSystem/testdata/conf/sound.properties rename to test/jdk/javax/sound/midi/MidiSystem/testdata/conf/sound.properties diff --git a/jdk/test/javax/sound/midi/Sequence/GetMicrosecondLength.java b/test/jdk/javax/sound/midi/Sequence/GetMicrosecondLength.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequence/GetMicrosecondLength.java rename to test/jdk/javax/sound/midi/Sequence/GetMicrosecondLength.java diff --git a/jdk/test/javax/sound/midi/Sequence/MidiSMPTE.java b/test/jdk/javax/sound/midi/Sequence/MidiSMPTE.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequence/MidiSMPTE.java rename to test/jdk/javax/sound/midi/Sequence/MidiSMPTE.java diff --git a/jdk/test/javax/sound/midi/Sequence/SMPTEDuration.java b/test/jdk/javax/sound/midi/Sequence/SMPTEDuration.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequence/SMPTEDuration.java rename to test/jdk/javax/sound/midi/Sequence/SMPTEDuration.java diff --git a/jdk/test/javax/sound/midi/Sequencer/LoopIAE.java b/test/jdk/javax/sound/midi/Sequencer/LoopIAE.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/LoopIAE.java rename to test/jdk/javax/sound/midi/Sequencer/LoopIAE.java diff --git a/jdk/test/javax/sound/midi/Sequencer/Looping.java b/test/jdk/javax/sound/midi/Sequencer/Looping.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/Looping.java rename to test/jdk/javax/sound/midi/Sequencer/Looping.java diff --git a/jdk/test/javax/sound/midi/Sequencer/MetaCallback.java b/test/jdk/javax/sound/midi/Sequencer/MetaCallback.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/MetaCallback.java rename to test/jdk/javax/sound/midi/Sequencer/MetaCallback.java diff --git a/jdk/test/javax/sound/midi/Sequencer/Recording.java b/test/jdk/javax/sound/midi/Sequencer/Recording.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/Recording.java rename to test/jdk/javax/sound/midi/Sequencer/Recording.java diff --git a/jdk/test/javax/sound/midi/Sequencer/SeqRecordDoesNotCopy.java b/test/jdk/javax/sound/midi/Sequencer/SeqRecordDoesNotCopy.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/SeqRecordDoesNotCopy.java rename to test/jdk/javax/sound/midi/Sequencer/SeqRecordDoesNotCopy.java diff --git a/jdk/test/javax/sound/midi/Sequencer/SeqRecordsRealTimeEvents.java b/test/jdk/javax/sound/midi/Sequencer/SeqRecordsRealTimeEvents.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/SeqRecordsRealTimeEvents.java rename to test/jdk/javax/sound/midi/Sequencer/SeqRecordsRealTimeEvents.java diff --git a/jdk/test/javax/sound/midi/Sequencer/SeqStartRecording.java b/test/jdk/javax/sound/midi/Sequencer/SeqStartRecording.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/SeqStartRecording.java rename to test/jdk/javax/sound/midi/Sequencer/SeqStartRecording.java diff --git a/jdk/test/javax/sound/midi/Sequencer/SequencerCacheValues.java b/test/jdk/javax/sound/midi/Sequencer/SequencerCacheValues.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/SequencerCacheValues.java rename to test/jdk/javax/sound/midi/Sequencer/SequencerCacheValues.java diff --git a/jdk/test/javax/sound/midi/Sequencer/SequencerImplicitSynthOpen.java b/test/jdk/javax/sound/midi/Sequencer/SequencerImplicitSynthOpen.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/SequencerImplicitSynthOpen.java rename to test/jdk/javax/sound/midi/Sequencer/SequencerImplicitSynthOpen.java diff --git a/jdk/test/javax/sound/midi/Sequencer/SequencerSetMuteSolo.java b/test/jdk/javax/sound/midi/Sequencer/SequencerSetMuteSolo.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/SequencerSetMuteSolo.java rename to test/jdk/javax/sound/midi/Sequencer/SequencerSetMuteSolo.java diff --git a/jdk/test/javax/sound/midi/Sequencer/SequencerState.java b/test/jdk/javax/sound/midi/Sequencer/SequencerState.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/SequencerState.java rename to test/jdk/javax/sound/midi/Sequencer/SequencerState.java diff --git a/jdk/test/javax/sound/midi/Sequencer/SetTickPosition.java b/test/jdk/javax/sound/midi/Sequencer/SetTickPosition.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/SetTickPosition.java rename to test/jdk/javax/sound/midi/Sequencer/SetTickPosition.java diff --git a/jdk/test/javax/sound/midi/Sequencer/TickLength.java b/test/jdk/javax/sound/midi/Sequencer/TickLength.java similarity index 100% rename from jdk/test/javax/sound/midi/Sequencer/TickLength.java rename to test/jdk/javax/sound/midi/Sequencer/TickLength.java diff --git a/jdk/test/javax/sound/midi/ShortMessage/FastShortMessage.java b/test/jdk/javax/sound/midi/ShortMessage/FastShortMessage.java similarity index 100% rename from jdk/test/javax/sound/midi/ShortMessage/FastShortMessage.java rename to test/jdk/javax/sound/midi/ShortMessage/FastShortMessage.java diff --git a/jdk/test/javax/sound/midi/ShortMessage/FastShortMessage2.java b/test/jdk/javax/sound/midi/ShortMessage/FastShortMessage2.java similarity index 100% rename from jdk/test/javax/sound/midi/ShortMessage/FastShortMessage2.java rename to test/jdk/javax/sound/midi/ShortMessage/FastShortMessage2.java diff --git a/jdk/test/javax/sound/midi/Soundbanks/ExtraCharInSoundbank.java b/test/jdk/javax/sound/midi/Soundbanks/ExtraCharInSoundbank.java similarity index 100% rename from jdk/test/javax/sound/midi/Soundbanks/ExtraCharInSoundbank.java rename to test/jdk/javax/sound/midi/Soundbanks/ExtraCharInSoundbank.java diff --git a/jdk/test/javax/sound/midi/Soundbanks/GetSoundBankIOException.java b/test/jdk/javax/sound/midi/Soundbanks/GetSoundBankIOException.java similarity index 100% rename from jdk/test/javax/sound/midi/Soundbanks/GetSoundBankIOException.java rename to test/jdk/javax/sound/midi/Soundbanks/GetSoundBankIOException.java diff --git a/jdk/test/javax/sound/midi/Synthesizer/AsynchronousMidiChannel.java b/test/jdk/javax/sound/midi/Synthesizer/AsynchronousMidiChannel.java similarity index 100% rename from jdk/test/javax/sound/midi/Synthesizer/AsynchronousMidiChannel.java rename to test/jdk/javax/sound/midi/Synthesizer/AsynchronousMidiChannel.java diff --git a/jdk/test/javax/sound/midi/Synthesizer/Receiver/bug6186488.java b/test/jdk/javax/sound/midi/Synthesizer/Receiver/bug6186488.java similarity index 100% rename from jdk/test/javax/sound/midi/Synthesizer/Receiver/bug6186488.java rename to test/jdk/javax/sound/midi/Synthesizer/Receiver/bug6186488.java diff --git a/jdk/test/javax/sound/midi/Synthesizer/SynthesizerGetLatency.java b/test/jdk/javax/sound/midi/Synthesizer/SynthesizerGetLatency.java similarity index 100% rename from jdk/test/javax/sound/midi/Synthesizer/SynthesizerGetLatency.java rename to test/jdk/javax/sound/midi/Synthesizer/SynthesizerGetLatency.java diff --git a/jdk/test/javax/sound/midi/Synthesizer/bug4685396.java b/test/jdk/javax/sound/midi/Synthesizer/bug4685396.java similarity index 100% rename from jdk/test/javax/sound/midi/Synthesizer/bug4685396.java rename to test/jdk/javax/sound/midi/Synthesizer/bug4685396.java diff --git a/jdk/test/javax/sound/midi/Track/TrackAddSameTick.java b/test/jdk/javax/sound/midi/Track/TrackAddSameTick.java similarity index 100% rename from jdk/test/javax/sound/midi/Track/TrackAddSameTick.java rename to test/jdk/javax/sound/midi/Track/TrackAddSameTick.java diff --git a/jdk/test/javax/sound/midi/Track/bug6416024.java b/test/jdk/javax/sound/midi/Track/bug6416024.java similarity index 100% rename from jdk/test/javax/sound/midi/Track/bug6416024.java rename to test/jdk/javax/sound/midi/Track/bug6416024.java diff --git a/jdk/test/javax/sound/midi/Transmitter/bug6415669.java b/test/jdk/javax/sound/midi/Transmitter/bug6415669.java similarity index 100% rename from jdk/test/javax/sound/midi/Transmitter/bug6415669.java rename to test/jdk/javax/sound/midi/Transmitter/bug6415669.java diff --git a/jdk/test/javax/sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java similarity index 100% rename from jdk/test/javax/sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java rename to test/jdk/javax/sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java diff --git a/jdk/test/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java similarity index 100% rename from jdk/test/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java rename to test/jdk/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java diff --git a/jdk/test/javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java similarity index 100% rename from jdk/test/javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java rename to test/jdk/javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java diff --git a/jdk/test/javax/sound/midi/spi/MidiFileReader/ExpectedNPEOnNull.java b/test/jdk/javax/sound/midi/spi/MidiFileReader/ExpectedNPEOnNull.java similarity index 100% rename from jdk/test/javax/sound/midi/spi/MidiFileReader/ExpectedNPEOnNull.java rename to test/jdk/javax/sound/midi/spi/MidiFileReader/ExpectedNPEOnNull.java diff --git a/jdk/test/javax/sound/midi/spi/MidiFileWriter/ExpectedNPEOnNull.java b/test/jdk/javax/sound/midi/spi/MidiFileWriter/ExpectedNPEOnNull.java similarity index 100% rename from jdk/test/javax/sound/midi/spi/MidiFileWriter/ExpectedNPEOnNull.java rename to test/jdk/javax/sound/midi/spi/MidiFileWriter/ExpectedNPEOnNull.java diff --git a/jdk/test/javax/sound/midi/spi/SoundbankReader/ExpectedNPEOnNull.java b/test/jdk/javax/sound/midi/spi/SoundbankReader/ExpectedNPEOnNull.java similarity index 100% rename from jdk/test/javax/sound/midi/spi/SoundbankReader/ExpectedNPEOnNull.java rename to test/jdk/javax/sound/midi/spi/SoundbankReader/ExpectedNPEOnNull.java diff --git a/jdk/test/javax/sound/sampled/AudioFileFormat/AudioFileFormatToString.java b/test/jdk/javax/sound/sampled/AudioFileFormat/AudioFileFormatToString.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioFileFormat/AudioFileFormatToString.java rename to test/jdk/javax/sound/sampled/AudioFileFormat/AudioFileFormatToString.java diff --git a/jdk/test/javax/sound/sampled/AudioFileFormat/Properties.java b/test/jdk/javax/sound/sampled/AudioFileFormat/Properties.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioFileFormat/Properties.java rename to test/jdk/javax/sound/sampled/AudioFileFormat/Properties.java diff --git a/jdk/test/javax/sound/sampled/AudioFileFormat/TypeEquals.java b/test/jdk/javax/sound/sampled/AudioFileFormat/TypeEquals.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioFileFormat/TypeEquals.java rename to test/jdk/javax/sound/sampled/AudioFileFormat/TypeEquals.java diff --git a/jdk/test/javax/sound/sampled/AudioFileFormat/TypeEqualsToNull.java b/test/jdk/javax/sound/sampled/AudioFileFormat/TypeEqualsToNull.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioFileFormat/TypeEqualsToNull.java rename to test/jdk/javax/sound/sampled/AudioFileFormat/TypeEqualsToNull.java diff --git a/jdk/test/javax/sound/sampled/AudioFormat/AudioFormatBitSize.java b/test/jdk/javax/sound/sampled/AudioFormat/AudioFormatBitSize.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioFormat/AudioFormatBitSize.java rename to test/jdk/javax/sound/sampled/AudioFormat/AudioFormatBitSize.java diff --git a/jdk/test/javax/sound/sampled/AudioFormat/EncodingEquals.java b/test/jdk/javax/sound/sampled/AudioFormat/EncodingEquals.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioFormat/EncodingEquals.java rename to test/jdk/javax/sound/sampled/AudioFormat/EncodingEquals.java diff --git a/jdk/test/javax/sound/sampled/AudioFormat/EncodingEqualsToNull.java b/test/jdk/javax/sound/sampled/AudioFormat/EncodingEqualsToNull.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioFormat/EncodingEqualsToNull.java rename to test/jdk/javax/sound/sampled/AudioFormat/EncodingEqualsToNull.java diff --git a/jdk/test/javax/sound/sampled/AudioFormat/Matches_NOT_SPECIFIED.java b/test/jdk/javax/sound/sampled/AudioFormat/Matches_NOT_SPECIFIED.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioFormat/Matches_NOT_SPECIFIED.java rename to test/jdk/javax/sound/sampled/AudioFormat/Matches_NOT_SPECIFIED.java diff --git a/jdk/test/javax/sound/sampled/AudioFormat/PCM_FLOAT_support.java b/test/jdk/javax/sound/sampled/AudioFormat/PCM_FLOAT_support.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioFormat/PCM_FLOAT_support.java rename to test/jdk/javax/sound/sampled/AudioFormat/PCM_FLOAT_support.java diff --git a/jdk/test/javax/sound/sampled/AudioFormat/Properties.java b/test/jdk/javax/sound/sampled/AudioFormat/Properties.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioFormat/Properties.java rename to test/jdk/javax/sound/sampled/AudioFormat/Properties.java diff --git a/jdk/test/javax/sound/sampled/AudioInputStream/AISReadFraction.java b/test/jdk/javax/sound/sampled/AudioInputStream/AISReadFraction.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioInputStream/AISReadFraction.java rename to test/jdk/javax/sound/sampled/AudioInputStream/AISReadFraction.java diff --git a/jdk/test/javax/sound/sampled/AudioInputStream/FrameLengthAfterConversion.java b/test/jdk/javax/sound/sampled/AudioInputStream/FrameLengthAfterConversion.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioInputStream/FrameLengthAfterConversion.java rename to test/jdk/javax/sound/sampled/AudioInputStream/FrameLengthAfterConversion.java diff --git a/jdk/test/javax/sound/sampled/AudioInputStream/SkipOnConvertSampleSize.java b/test/jdk/javax/sound/sampled/AudioInputStream/SkipOnConvertSampleSize.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioInputStream/SkipOnConvertSampleSize.java rename to test/jdk/javax/sound/sampled/AudioInputStream/SkipOnConvertSampleSize.java diff --git a/jdk/test/javax/sound/sampled/AudioInputStream/bug6188860.java b/test/jdk/javax/sound/sampled/AudioInputStream/bug6188860.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioInputStream/bug6188860.java rename to test/jdk/javax/sound/sampled/AudioInputStream/bug6188860.java diff --git a/jdk/test/javax/sound/sampled/AudioSystem/AudioFileTypes/AudioFileTypeUniqueness.java b/test/jdk/javax/sound/sampled/AudioSystem/AudioFileTypes/AudioFileTypeUniqueness.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioSystem/AudioFileTypes/AudioFileTypeUniqueness.java rename to test/jdk/javax/sound/sampled/AudioSystem/AudioFileTypes/AudioFileTypeUniqueness.java diff --git a/jdk/test/javax/sound/sampled/AudioSystem/AudioFileTypes/ShowAudioFileTypes.java b/test/jdk/javax/sound/sampled/AudioSystem/AudioFileTypes/ShowAudioFileTypes.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioSystem/AudioFileTypes/ShowAudioFileTypes.java rename to test/jdk/javax/sound/sampled/AudioSystem/AudioFileTypes/ShowAudioFileTypes.java diff --git a/jdk/test/javax/sound/sampled/AudioSystem/DefaultMixers.java b/test/jdk/javax/sound/sampled/AudioSystem/DefaultMixers.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioSystem/DefaultMixers.java rename to test/jdk/javax/sound/sampled/AudioSystem/DefaultMixers.java diff --git a/jdk/test/javax/sound/sampled/AudioSystem/DefaultProperties.java b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioSystem/DefaultProperties.java rename to test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties.java diff --git a/jdk/test/javax/sound/sampled/AudioSystem/ProviderCacheing.java b/test/jdk/javax/sound/sampled/AudioSystem/ProviderCacheing.java similarity index 100% rename from jdk/test/javax/sound/sampled/AudioSystem/ProviderCacheing.java rename to test/jdk/javax/sound/sampled/AudioSystem/ProviderCacheing.java diff --git a/jdk/test/javax/sound/sampled/AudioSystem/testdata/conf/sound.properties b/test/jdk/javax/sound/sampled/AudioSystem/testdata/conf/sound.properties similarity index 100% rename from jdk/test/javax/sound/sampled/AudioSystem/testdata/conf/sound.properties rename to test/jdk/javax/sound/sampled/AudioSystem/testdata/conf/sound.properties diff --git a/jdk/test/javax/sound/sampled/Clip/ClipCloseLoss.java b/test/jdk/javax/sound/sampled/Clip/ClipCloseLoss.java similarity index 100% rename from jdk/test/javax/sound/sampled/Clip/ClipCloseLoss.java rename to test/jdk/javax/sound/sampled/Clip/ClipCloseLoss.java diff --git a/jdk/test/javax/sound/sampled/Clip/ClipFlushCrash.java b/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java similarity index 100% rename from jdk/test/javax/sound/sampled/Clip/ClipFlushCrash.java rename to test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java diff --git a/jdk/test/javax/sound/sampled/Clip/ClipSetPos.java b/test/jdk/javax/sound/sampled/Clip/ClipSetPos.java similarity index 100% rename from jdk/test/javax/sound/sampled/Clip/ClipSetPos.java rename to test/jdk/javax/sound/sampled/Clip/ClipSetPos.java diff --git a/jdk/test/javax/sound/sampled/Clip/Drain/ClipDrain.java b/test/jdk/javax/sound/sampled/Clip/Drain/ClipDrain.java similarity index 100% rename from jdk/test/javax/sound/sampled/Clip/Drain/ClipDrain.java rename to test/jdk/javax/sound/sampled/Clip/Drain/ClipDrain.java diff --git a/jdk/test/javax/sound/sampled/Clip/Duration/ClipDuration.java b/test/jdk/javax/sound/sampled/Clip/Duration/ClipDuration.java similarity index 100% rename from jdk/test/javax/sound/sampled/Clip/Duration/ClipDuration.java rename to test/jdk/javax/sound/sampled/Clip/Duration/ClipDuration.java diff --git a/jdk/test/javax/sound/sampled/Clip/Endpoint/ClipSetEndPoint.java b/test/jdk/javax/sound/sampled/Clip/Endpoint/ClipSetEndPoint.java similarity index 100% rename from jdk/test/javax/sound/sampled/Clip/Endpoint/ClipSetEndPoint.java rename to test/jdk/javax/sound/sampled/Clip/Endpoint/ClipSetEndPoint.java diff --git a/jdk/test/javax/sound/sampled/Clip/IsRunningHang.java b/test/jdk/javax/sound/sampled/Clip/IsRunningHang.java similarity index 100% rename from jdk/test/javax/sound/sampled/Clip/IsRunningHang.java rename to test/jdk/javax/sound/sampled/Clip/IsRunningHang.java diff --git a/jdk/test/javax/sound/sampled/Clip/Open/ClipOpenBug.java b/test/jdk/javax/sound/sampled/Clip/Open/ClipOpenBug.java similarity index 100% rename from jdk/test/javax/sound/sampled/Clip/Open/ClipOpenBug.java rename to test/jdk/javax/sound/sampled/Clip/Open/ClipOpenBug.java diff --git a/jdk/test/javax/sound/sampled/Clip/OpenNonIntegralNumberOfSampleframes.java b/test/jdk/javax/sound/sampled/Clip/OpenNonIntegralNumberOfSampleframes.java similarity index 100% rename from jdk/test/javax/sound/sampled/Clip/OpenNonIntegralNumberOfSampleframes.java rename to test/jdk/javax/sound/sampled/Clip/OpenNonIntegralNumberOfSampleframes.java diff --git a/jdk/test/javax/sound/sampled/Clip/bug5070081.java b/test/jdk/javax/sound/sampled/Clip/bug5070081.java similarity index 100% rename from jdk/test/javax/sound/sampled/Clip/bug5070081.java rename to test/jdk/javax/sound/sampled/Clip/bug5070081.java diff --git a/jdk/test/javax/sound/sampled/Clip/bug6251460.java b/test/jdk/javax/sound/sampled/Clip/bug6251460.java similarity index 100% rename from jdk/test/javax/sound/sampled/Clip/bug6251460.java rename to test/jdk/javax/sound/sampled/Clip/bug6251460.java diff --git a/jdk/test/javax/sound/sampled/Controls/CompoundControl/ToString.java b/test/jdk/javax/sound/sampled/Controls/CompoundControl/ToString.java similarity index 100% rename from jdk/test/javax/sound/sampled/Controls/CompoundControl/ToString.java rename to test/jdk/javax/sound/sampled/Controls/CompoundControl/ToString.java diff --git a/jdk/test/javax/sound/sampled/Controls/FloatControl/FloatControlBug.java b/test/jdk/javax/sound/sampled/Controls/FloatControl/FloatControlBug.java similarity index 100% rename from jdk/test/javax/sound/sampled/Controls/FloatControl/FloatControlBug.java rename to test/jdk/javax/sound/sampled/Controls/FloatControl/FloatControlBug.java diff --git a/jdk/test/javax/sound/sampled/DataLine/DataLineInfoNegBufferSize.java b/test/jdk/javax/sound/sampled/DataLine/DataLineInfoNegBufferSize.java similarity index 100% rename from jdk/test/javax/sound/sampled/DataLine/DataLineInfoNegBufferSize.java rename to test/jdk/javax/sound/sampled/DataLine/DataLineInfoNegBufferSize.java diff --git a/jdk/test/javax/sound/sampled/DataLine/DataLine_ArrayIndexOutOfBounds.java b/test/jdk/javax/sound/sampled/DataLine/DataLine_ArrayIndexOutOfBounds.java similarity index 100% rename from jdk/test/javax/sound/sampled/DataLine/DataLine_ArrayIndexOutOfBounds.java rename to test/jdk/javax/sound/sampled/DataLine/DataLine_ArrayIndexOutOfBounds.java diff --git a/jdk/test/javax/sound/sampled/DataLine/LineDefFormat.java b/test/jdk/javax/sound/sampled/DataLine/LineDefFormat.java similarity index 100% rename from jdk/test/javax/sound/sampled/DataLine/LineDefFormat.java rename to test/jdk/javax/sound/sampled/DataLine/LineDefFormat.java diff --git a/jdk/test/javax/sound/sampled/DataLine/LongFramePosition.java b/test/jdk/javax/sound/sampled/DataLine/LongFramePosition.java similarity index 100% rename from jdk/test/javax/sound/sampled/DataLine/LongFramePosition.java rename to test/jdk/javax/sound/sampled/DataLine/LongFramePosition.java diff --git a/jdk/test/javax/sound/sampled/DirectAudio/TickAtEndOfPlay.java b/test/jdk/javax/sound/sampled/DirectAudio/TickAtEndOfPlay.java similarity index 100% rename from jdk/test/javax/sound/sampled/DirectAudio/TickAtEndOfPlay.java rename to test/jdk/javax/sound/sampled/DirectAudio/TickAtEndOfPlay.java diff --git a/jdk/test/javax/sound/sampled/DirectAudio/bug6372428.java b/test/jdk/javax/sound/sampled/DirectAudio/bug6372428.java similarity index 100% rename from jdk/test/javax/sound/sampled/DirectAudio/bug6372428.java rename to test/jdk/javax/sound/sampled/DirectAudio/bug6372428.java diff --git a/jdk/test/javax/sound/sampled/DirectAudio/bug6400879.java b/test/jdk/javax/sound/sampled/DirectAudio/bug6400879.java similarity index 100% rename from jdk/test/javax/sound/sampled/DirectAudio/bug6400879.java rename to test/jdk/javax/sound/sampled/DirectAudio/bug6400879.java diff --git a/jdk/test/javax/sound/sampled/FileTypeExtension/FileTypeExtensionTest.java b/test/jdk/javax/sound/sampled/FileTypeExtension/FileTypeExtensionTest.java similarity index 100% rename from jdk/test/javax/sound/sampled/FileTypeExtension/FileTypeExtensionTest.java rename to test/jdk/javax/sound/sampled/FileTypeExtension/FileTypeExtensionTest.java diff --git a/jdk/test/javax/sound/sampled/LineEvent/LineInfoNPE.java b/test/jdk/javax/sound/sampled/LineEvent/LineInfoNPE.java similarity index 100% rename from jdk/test/javax/sound/sampled/LineEvent/LineInfoNPE.java rename to test/jdk/javax/sound/sampled/LineEvent/LineInfoNPE.java diff --git a/jdk/test/javax/sound/sampled/Lines/16and32KHz/Has16and32KHz.java b/test/jdk/javax/sound/sampled/Lines/16and32KHz/Has16and32KHz.java similarity index 100% rename from jdk/test/javax/sound/sampled/Lines/16and32KHz/Has16and32KHz.java rename to test/jdk/javax/sound/sampled/Lines/16and32KHz/Has16and32KHz.java diff --git a/jdk/test/javax/sound/sampled/Lines/BufferSizeCheck.java b/test/jdk/javax/sound/sampled/Lines/BufferSizeCheck.java similarity index 100% rename from jdk/test/javax/sound/sampled/Lines/BufferSizeCheck.java rename to test/jdk/javax/sound/sampled/Lines/BufferSizeCheck.java diff --git a/jdk/test/javax/sound/sampled/Lines/ChangingBuffer.java b/test/jdk/javax/sound/sampled/Lines/ChangingBuffer.java similarity index 100% rename from jdk/test/javax/sound/sampled/Lines/ChangingBuffer.java rename to test/jdk/javax/sound/sampled/Lines/ChangingBuffer.java diff --git a/jdk/test/javax/sound/sampled/Lines/ClickInPlay/ClickInPlay.java b/test/jdk/javax/sound/sampled/Lines/ClickInPlay/ClickInPlay.java similarity index 100% rename from jdk/test/javax/sound/sampled/Lines/ClickInPlay/ClickInPlay.java rename to test/jdk/javax/sound/sampled/Lines/ClickInPlay/ClickInPlay.java diff --git a/jdk/test/javax/sound/sampled/Lines/ClickInPlay/Test4218609.java b/test/jdk/javax/sound/sampled/Lines/ClickInPlay/Test4218609.java similarity index 100% rename from jdk/test/javax/sound/sampled/Lines/ClickInPlay/Test4218609.java rename to test/jdk/javax/sound/sampled/Lines/ClickInPlay/Test4218609.java diff --git a/jdk/test/javax/sound/sampled/Lines/ClipOpenException.java b/test/jdk/javax/sound/sampled/Lines/ClipOpenException.java similarity index 100% rename from jdk/test/javax/sound/sampled/Lines/ClipOpenException.java rename to test/jdk/javax/sound/sampled/Lines/ClipOpenException.java diff --git a/jdk/test/javax/sound/sampled/Lines/FrameSize/FrameSizeTest.java b/test/jdk/javax/sound/sampled/Lines/FrameSize/FrameSizeTest.java similarity index 100% rename from jdk/test/javax/sound/sampled/Lines/FrameSize/FrameSizeTest.java rename to test/jdk/javax/sound/sampled/Lines/FrameSize/FrameSizeTest.java diff --git a/jdk/test/javax/sound/sampled/Lines/GetLine.java b/test/jdk/javax/sound/sampled/Lines/GetLine.java similarity index 100% rename from jdk/test/javax/sound/sampled/Lines/GetLine.java rename to test/jdk/javax/sound/sampled/Lines/GetLine.java diff --git a/jdk/test/javax/sound/sampled/Lines/SDLwrite.java b/test/jdk/javax/sound/sampled/Lines/SDLwrite.java similarity index 100% rename from jdk/test/javax/sound/sampled/Lines/SDLwrite.java rename to test/jdk/javax/sound/sampled/Lines/SDLwrite.java diff --git a/jdk/test/javax/sound/sampled/Lines/SourceDataLineDefaultBufferSizeCrash.java b/test/jdk/javax/sound/sampled/Lines/SourceDataLineDefaultBufferSizeCrash.java similarity index 100% rename from jdk/test/javax/sound/sampled/Lines/SourceDataLineDefaultBufferSizeCrash.java rename to test/jdk/javax/sound/sampled/Lines/SourceDataLineDefaultBufferSizeCrash.java diff --git a/jdk/test/javax/sound/sampled/Lines/StopStart.java b/test/jdk/javax/sound/sampled/Lines/StopStart.java similarity index 100% rename from jdk/test/javax/sound/sampled/Lines/StopStart.java rename to test/jdk/javax/sound/sampled/Lines/StopStart.java diff --git a/jdk/test/javax/sound/sampled/LinuxBlock/PlaySine.java b/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java similarity index 100% rename from jdk/test/javax/sound/sampled/LinuxBlock/PlaySine.java rename to test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java diff --git a/jdk/test/javax/sound/sampled/LinuxCrash/ClipLinuxCrash.java b/test/jdk/javax/sound/sampled/LinuxCrash/ClipLinuxCrash.java similarity index 100% rename from jdk/test/javax/sound/sampled/LinuxCrash/ClipLinuxCrash.java rename to test/jdk/javax/sound/sampled/LinuxCrash/ClipLinuxCrash.java diff --git a/jdk/test/javax/sound/sampled/LinuxCrash/ClipLinuxCrash2.java b/test/jdk/javax/sound/sampled/LinuxCrash/ClipLinuxCrash2.java similarity index 100% rename from jdk/test/javax/sound/sampled/LinuxCrash/ClipLinuxCrash2.java rename to test/jdk/javax/sound/sampled/LinuxCrash/ClipLinuxCrash2.java diff --git a/jdk/test/javax/sound/sampled/LinuxCrash/SDLLinuxCrash.java b/test/jdk/javax/sound/sampled/LinuxCrash/SDLLinuxCrash.java similarity index 100% rename from jdk/test/javax/sound/sampled/LinuxCrash/SDLLinuxCrash.java rename to test/jdk/javax/sound/sampled/LinuxCrash/SDLLinuxCrash.java diff --git a/jdk/test/javax/sound/sampled/Mixers/BogusMixers.java b/test/jdk/javax/sound/sampled/Mixers/BogusMixers.java similarity index 100% rename from jdk/test/javax/sound/sampled/Mixers/BogusMixers.java rename to test/jdk/javax/sound/sampled/Mixers/BogusMixers.java diff --git a/jdk/test/javax/sound/sampled/Mixers/BothEndiansAndSigns.java b/test/jdk/javax/sound/sampled/Mixers/BothEndiansAndSigns.java similarity index 100% rename from jdk/test/javax/sound/sampled/Mixers/BothEndiansAndSigns.java rename to test/jdk/javax/sound/sampled/Mixers/BothEndiansAndSigns.java diff --git a/jdk/test/javax/sound/sampled/Mixers/DirectSoundRepeatingBuffer/DirectSoundRepeatingBuffer.java b/test/jdk/javax/sound/sampled/Mixers/DirectSoundRepeatingBuffer/DirectSoundRepeatingBuffer.java similarity index 100% rename from jdk/test/javax/sound/sampled/Mixers/DirectSoundRepeatingBuffer/DirectSoundRepeatingBuffer.java rename to test/jdk/javax/sound/sampled/Mixers/DirectSoundRepeatingBuffer/DirectSoundRepeatingBuffer.java diff --git a/jdk/test/javax/sound/sampled/Mixers/DirectSoundRepeatingBuffer/Test4997635.java b/test/jdk/javax/sound/sampled/Mixers/DirectSoundRepeatingBuffer/Test4997635.java similarity index 100% rename from jdk/test/javax/sound/sampled/Mixers/DirectSoundRepeatingBuffer/Test4997635.java rename to test/jdk/javax/sound/sampled/Mixers/DirectSoundRepeatingBuffer/Test4997635.java diff --git a/jdk/test/javax/sound/sampled/Mixers/DirectSoundUnderrunSilence/DirectSoundUnderrunSilence.java b/test/jdk/javax/sound/sampled/Mixers/DirectSoundUnderrunSilence/DirectSoundUnderrunSilence.java similarity index 100% rename from jdk/test/javax/sound/sampled/Mixers/DirectSoundUnderrunSilence/DirectSoundUnderrunSilence.java rename to test/jdk/javax/sound/sampled/Mixers/DirectSoundUnderrunSilence/DirectSoundUnderrunSilence.java diff --git a/jdk/test/javax/sound/sampled/Mixers/DirectSoundUnderrunSilence/Test5032020.java b/test/jdk/javax/sound/sampled/Mixers/DirectSoundUnderrunSilence/Test5032020.java similarity index 100% rename from jdk/test/javax/sound/sampled/Mixers/DirectSoundUnderrunSilence/Test5032020.java rename to test/jdk/javax/sound/sampled/Mixers/DirectSoundUnderrunSilence/Test5032020.java diff --git a/jdk/test/javax/sound/sampled/Mixers/DisabledAssertionCrash.java b/test/jdk/javax/sound/sampled/Mixers/DisabledAssertionCrash.java similarity index 100% rename from jdk/test/javax/sound/sampled/Mixers/DisabledAssertionCrash.java rename to test/jdk/javax/sound/sampled/Mixers/DisabledAssertionCrash.java diff --git a/jdk/test/javax/sound/sampled/Mixers/NoSimpleInputDevice.java b/test/jdk/javax/sound/sampled/Mixers/NoSimpleInputDevice.java similarity index 100% rename from jdk/test/javax/sound/sampled/Mixers/NoSimpleInputDevice.java rename to test/jdk/javax/sound/sampled/Mixers/NoSimpleInputDevice.java diff --git a/jdk/test/javax/sound/sampled/Mixers/PhantomMixers.java b/test/jdk/javax/sound/sampled/Mixers/PhantomMixers.java similarity index 100% rename from jdk/test/javax/sound/sampled/Mixers/PhantomMixers.java rename to test/jdk/javax/sound/sampled/Mixers/PhantomMixers.java diff --git a/jdk/test/javax/sound/sampled/Mixers/PlugHwMonoAnd8bitAvailable.java b/test/jdk/javax/sound/sampled/Mixers/PlugHwMonoAnd8bitAvailable.java similarity index 100% rename from jdk/test/javax/sound/sampled/Mixers/PlugHwMonoAnd8bitAvailable.java rename to test/jdk/javax/sound/sampled/Mixers/PlugHwMonoAnd8bitAvailable.java diff --git a/jdk/test/javax/sound/sampled/Mixers/UnexpectedIAE.java b/test/jdk/javax/sound/sampled/Mixers/UnexpectedIAE.java similarity index 100% rename from jdk/test/javax/sound/sampled/Mixers/UnexpectedIAE.java rename to test/jdk/javax/sound/sampled/Mixers/UnexpectedIAE.java diff --git a/jdk/test/javax/sound/sampled/Recording/TargetDataLineFlush.java b/test/jdk/javax/sound/sampled/Recording/TargetDataLineFlush.java similarity index 100% rename from jdk/test/javax/sound/sampled/Recording/TargetDataLineFlush.java rename to test/jdk/javax/sound/sampled/Recording/TargetDataLineFlush.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/AIFFCp037.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/AIFFCp037.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/AIFFCp037.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/AIFFCp037.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/AIFFLargeHeader.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/AIFFLargeHeader.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/AIFFLargeHeader.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/AIFFLargeHeader.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/Aiff12bit.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/Aiff12bit.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/Aiff12bit.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/Aiff12bit.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/AuNotSpecified.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/AuNotSpecified.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/AuNotSpecified.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/AuNotSpecified.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/AuZeroLength.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/AuZeroLength.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/AuZeroLength.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/AuZeroLength.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/AudioFileClose.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/AudioFileClose.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/AudioFileClose.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/AudioFileClose.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/EndlessLoopHugeLengthWave.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/EndlessLoopHugeLengthWave.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/EndlessLoopHugeLengthWave.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/EndlessLoopHugeLengthWave.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/ExpectedNPEOnNull.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/ExpectedNPEOnNull.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/ExpectedNPEOnNull.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/ExpectedNPEOnNull.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/OpenWaveFile.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/OpenWaveFile.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/OpenWaveFile.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/OpenWaveFile.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/ReadersExceptions.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/ReadersExceptions.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/ReadersExceptions.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/ReadersExceptions.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAiffFiles.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAiffFiles.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAiffFiles.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAiffFiles.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAuFiles.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAuFiles.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAuFiles.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAuFiles.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveExtFiles.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveExtFiles.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveExtFiles.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveExtFiles.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveFiles.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveFiles.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveFiles.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveFiles.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeWaveExtensible.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/RecognizeWaveExtensible.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeWaveExtensible.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/RecognizeWaveExtensible.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/RepeatedFormatReader.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/RepeatedFormatReader.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/RepeatedFormatReader.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/RepeatedFormatReader.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/ShortHeader.java b/test/jdk/javax/sound/sampled/spi/AudioFileReader/ShortHeader.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/ShortHeader.java rename to test/jdk/javax/sound/sampled/spi/AudioFileReader/ShortHeader.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileWriter/AUwithULAW.java b/test/jdk/javax/sound/sampled/spi/AudioFileWriter/AUwithULAW.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileWriter/AUwithULAW.java rename to test/jdk/javax/sound/sampled/spi/AudioFileWriter/AUwithULAW.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileWriter/AiffSampleRate.java b/test/jdk/javax/sound/sampled/spi/AudioFileWriter/AiffSampleRate.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileWriter/AiffSampleRate.java rename to test/jdk/javax/sound/sampled/spi/AudioFileWriter/AiffSampleRate.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileWriter/AlawEncoderSync.java b/test/jdk/javax/sound/sampled/spi/AudioFileWriter/AlawEncoderSync.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileWriter/AlawEncoderSync.java rename to test/jdk/javax/sound/sampled/spi/AudioFileWriter/AlawEncoderSync.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileWriter/ExpectedNPEOnNull.java b/test/jdk/javax/sound/sampled/spi/AudioFileWriter/ExpectedNPEOnNull.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileWriter/ExpectedNPEOnNull.java rename to test/jdk/javax/sound/sampled/spi/AudioFileWriter/ExpectedNPEOnNull.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileWriter/RIFFHeader.java b/test/jdk/javax/sound/sampled/spi/AudioFileWriter/RIFFHeader.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileWriter/RIFFHeader.java rename to test/jdk/javax/sound/sampled/spi/AudioFileWriter/RIFFHeader.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileWriter/WaveBigEndian.java b/test/jdk/javax/sound/sampled/spi/AudioFileWriter/WaveBigEndian.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileWriter/WaveBigEndian.java rename to test/jdk/javax/sound/sampled/spi/AudioFileWriter/WaveBigEndian.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileWriter/WriteAuUnspecifiedLength.java b/test/jdk/javax/sound/sampled/spi/AudioFileWriter/WriteAuUnspecifiedLength.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileWriter/WriteAuUnspecifiedLength.java rename to test/jdk/javax/sound/sampled/spi/AudioFileWriter/WriteAuUnspecifiedLength.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileWriter/WriteUnsupportedAudioFormat.java b/test/jdk/javax/sound/sampled/spi/AudioFileWriter/WriteUnsupportedAudioFormat.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileWriter/WriteUnsupportedAudioFormat.java rename to test/jdk/javax/sound/sampled/spi/AudioFileWriter/WriteUnsupportedAudioFormat.java diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileWriter/WriterCloseInput.java b/test/jdk/javax/sound/sampled/spi/AudioFileWriter/WriterCloseInput.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/AudioFileWriter/WriterCloseInput.java rename to test/jdk/javax/sound/sampled/spi/AudioFileWriter/WriterCloseInput.java diff --git a/jdk/test/javax/sound/sampled/spi/FormatConversionProvider/AlawUlaw.java b/test/jdk/javax/sound/sampled/spi/FormatConversionProvider/AlawUlaw.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/FormatConversionProvider/AlawUlaw.java rename to test/jdk/javax/sound/sampled/spi/FormatConversionProvider/AlawUlaw.java diff --git a/jdk/test/javax/sound/sampled/spi/FormatConversionProvider/ExpectedNPEOnNull.java b/test/jdk/javax/sound/sampled/spi/FormatConversionProvider/ExpectedNPEOnNull.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/FormatConversionProvider/ExpectedNPEOnNull.java rename to test/jdk/javax/sound/sampled/spi/FormatConversionProvider/ExpectedNPEOnNull.java diff --git a/jdk/test/javax/sound/sampled/spi/FormatConversionProvider/GetAudioStreamConversionSupported.java b/test/jdk/javax/sound/sampled/spi/FormatConversionProvider/GetAudioStreamConversionSupported.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/FormatConversionProvider/GetAudioStreamConversionSupported.java rename to test/jdk/javax/sound/sampled/spi/FormatConversionProvider/GetAudioStreamConversionSupported.java diff --git a/jdk/test/javax/sound/sampled/spi/FormatConversionProvider/GetTargetIsSupported.java b/test/jdk/javax/sound/sampled/spi/FormatConversionProvider/GetTargetIsSupported.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/FormatConversionProvider/GetTargetIsSupported.java rename to test/jdk/javax/sound/sampled/spi/FormatConversionProvider/GetTargetIsSupported.java diff --git a/jdk/test/javax/sound/sampled/spi/MixerProvider/ExpectedNPEOnNull.java b/test/jdk/javax/sound/sampled/spi/MixerProvider/ExpectedNPEOnNull.java similarity index 100% rename from jdk/test/javax/sound/sampled/spi/MixerProvider/ExpectedNPEOnNull.java rename to test/jdk/javax/sound/sampled/spi/MixerProvider/ExpectedNPEOnNull.java diff --git a/jdk/test/javax/sql/rowset/TEST.properties b/test/jdk/javax/sql/rowset/TEST.properties similarity index 100% rename from jdk/test/javax/sql/rowset/TEST.properties rename to test/jdk/javax/sql/rowset/TEST.properties diff --git a/jdk/test/javax/sql/rowset/serial/SerialBlob/SetBinaryStream.java b/test/jdk/javax/sql/rowset/serial/SerialBlob/SetBinaryStream.java similarity index 100% rename from jdk/test/javax/sql/rowset/serial/SerialBlob/SetBinaryStream.java rename to test/jdk/javax/sql/rowset/serial/SerialBlob/SetBinaryStream.java diff --git a/jdk/test/javax/sql/rowset/serial/SerialClob/SetAsciiStream.java b/test/jdk/javax/sql/rowset/serial/SerialClob/SetAsciiStream.java similarity index 100% rename from jdk/test/javax/sql/rowset/serial/SerialClob/SetAsciiStream.java rename to test/jdk/javax/sql/rowset/serial/SerialClob/SetAsciiStream.java diff --git a/jdk/test/javax/sql/rowset/serial/SerialClob/SetCharacterStream.java b/test/jdk/javax/sql/rowset/serial/SerialClob/SetCharacterStream.java similarity index 100% rename from jdk/test/javax/sql/rowset/serial/SerialClob/SetCharacterStream.java rename to test/jdk/javax/sql/rowset/serial/SerialClob/SetCharacterStream.java diff --git a/jdk/test/javax/sql/testng/TEST.properties b/test/jdk/javax/sql/testng/TEST.properties similarity index 100% rename from jdk/test/javax/sql/testng/TEST.properties rename to test/jdk/javax/sql/testng/TEST.properties diff --git a/jdk/test/javax/sql/testng/jars/badFactory/META-INF/services/javax.sql.rowset.RowSetFactory b/test/jdk/javax/sql/testng/jars/badFactory/META-INF/services/javax.sql.rowset.RowSetFactory similarity index 100% rename from jdk/test/javax/sql/testng/jars/badFactory/META-INF/services/javax.sql.rowset.RowSetFactory rename to test/jdk/javax/sql/testng/jars/badFactory/META-INF/services/javax.sql.rowset.RowSetFactory diff --git a/jdk/test/javax/sql/testng/jars/goodFactory/META-INF/services/javax.sql.rowset.RowSetFactory b/test/jdk/javax/sql/testng/jars/goodFactory/META-INF/services/javax.sql.rowset.RowSetFactory similarity index 100% rename from jdk/test/javax/sql/testng/jars/goodFactory/META-INF/services/javax.sql.rowset.RowSetFactory rename to test/jdk/javax/sql/testng/jars/goodFactory/META-INF/services/javax.sql.rowset.RowSetFactory diff --git a/jdk/test/javax/sql/testng/test/rowset/BaseRowSetTests.java b/test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/BaseRowSetTests.java rename to test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/CommonRowSetTests.java b/test/jdk/javax/sql/testng/test/rowset/CommonRowSetTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/CommonRowSetTests.java rename to test/jdk/javax/sql/testng/test/rowset/CommonRowSetTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/RowSetFactoryTests.java b/test/jdk/javax/sql/testng/test/rowset/RowSetFactoryTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/RowSetFactoryTests.java rename to test/jdk/javax/sql/testng/test/rowset/RowSetFactoryTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/RowSetMetaDataTests.java b/test/jdk/javax/sql/testng/test/rowset/RowSetMetaDataTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/RowSetMetaDataTests.java rename to test/jdk/javax/sql/testng/test/rowset/RowSetMetaDataTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/RowSetProviderTests.java b/test/jdk/javax/sql/testng/test/rowset/RowSetProviderTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/RowSetProviderTests.java rename to test/jdk/javax/sql/testng/test/rowset/RowSetProviderTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/RowSetWarningTests.java b/test/jdk/javax/sql/testng/test/rowset/RowSetWarningTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/RowSetWarningTests.java rename to test/jdk/javax/sql/testng/test/rowset/RowSetWarningTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/cachedrowset/CachedRowSetTests.java b/test/jdk/javax/sql/testng/test/rowset/cachedrowset/CachedRowSetTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/cachedrowset/CachedRowSetTests.java rename to test/jdk/javax/sql/testng/test/rowset/cachedrowset/CachedRowSetTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/cachedrowset/CommonCachedRowSetTests.java b/test/jdk/javax/sql/testng/test/rowset/cachedrowset/CommonCachedRowSetTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/cachedrowset/CommonCachedRowSetTests.java rename to test/jdk/javax/sql/testng/test/rowset/cachedrowset/CommonCachedRowSetTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/filteredrowset/CityFilter.java b/test/jdk/javax/sql/testng/test/rowset/filteredrowset/CityFilter.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/filteredrowset/CityFilter.java rename to test/jdk/javax/sql/testng/test/rowset/filteredrowset/CityFilter.java diff --git a/jdk/test/javax/sql/testng/test/rowset/filteredrowset/FilteredRowSetTests.java b/test/jdk/javax/sql/testng/test/rowset/filteredrowset/FilteredRowSetTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/filteredrowset/FilteredRowSetTests.java rename to test/jdk/javax/sql/testng/test/rowset/filteredrowset/FilteredRowSetTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/filteredrowset/PrimaryKeyFilter.java b/test/jdk/javax/sql/testng/test/rowset/filteredrowset/PrimaryKeyFilter.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/filteredrowset/PrimaryKeyFilter.java rename to test/jdk/javax/sql/testng/test/rowset/filteredrowset/PrimaryKeyFilter.java diff --git a/jdk/test/javax/sql/testng/test/rowset/joinrowset/JoinRowSetTests.java b/test/jdk/javax/sql/testng/test/rowset/joinrowset/JoinRowSetTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/joinrowset/JoinRowSetTests.java rename to test/jdk/javax/sql/testng/test/rowset/joinrowset/JoinRowSetTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java rename to test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/serial/SQLOutputImplTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SQLOutputImplTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/serial/SQLOutputImplTests.java rename to test/jdk/javax/sql/testng/test/rowset/serial/SQLOutputImplTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/serial/SerialArrayTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/serial/SerialArrayTests.java rename to test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/serial/SerialBlobTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialBlobTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/serial/SerialBlobTests.java rename to test/jdk/javax/sql/testng/test/rowset/serial/SerialBlobTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/serial/SerialClobTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialClobTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/serial/SerialClobTests.java rename to test/jdk/javax/sql/testng/test/rowset/serial/SerialClobTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/serial/SerialDataLinkTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialDataLinkTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/serial/SerialDataLinkTests.java rename to test/jdk/javax/sql/testng/test/rowset/serial/SerialDataLinkTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java rename to test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/serial/SerialJavaObjectTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialJavaObjectTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/serial/SerialJavaObjectTests.java rename to test/jdk/javax/sql/testng/test/rowset/serial/SerialJavaObjectTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/serial/SerialRefTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialRefTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/serial/SerialRefTests.java rename to test/jdk/javax/sql/testng/test/rowset/serial/SerialRefTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/serial/SerialStructTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/serial/SerialStructTests.java rename to test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/spi/SyncFactoryExceptionTests.java b/test/jdk/javax/sql/testng/test/rowset/spi/SyncFactoryExceptionTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/spi/SyncFactoryExceptionTests.java rename to test/jdk/javax/sql/testng/test/rowset/spi/SyncFactoryExceptionTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/spi/SyncFactoryPermissionsTests.java b/test/jdk/javax/sql/testng/test/rowset/spi/SyncFactoryPermissionsTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/spi/SyncFactoryPermissionsTests.java rename to test/jdk/javax/sql/testng/test/rowset/spi/SyncFactoryPermissionsTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/spi/SyncFactoryTests.java b/test/jdk/javax/sql/testng/test/rowset/spi/SyncFactoryTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/spi/SyncFactoryTests.java rename to test/jdk/javax/sql/testng/test/rowset/spi/SyncFactoryTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/spi/SyncProviderExceptionTests.java b/test/jdk/javax/sql/testng/test/rowset/spi/SyncProviderExceptionTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/spi/SyncProviderExceptionTests.java rename to test/jdk/javax/sql/testng/test/rowset/spi/SyncProviderExceptionTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/webrowset/CommonWebRowSetTests.java b/test/jdk/javax/sql/testng/test/rowset/webrowset/CommonWebRowSetTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/webrowset/CommonWebRowSetTests.java rename to test/jdk/javax/sql/testng/test/rowset/webrowset/CommonWebRowSetTests.java diff --git a/jdk/test/javax/sql/testng/test/rowset/webrowset/WebRowSetTests.java b/test/jdk/javax/sql/testng/test/rowset/webrowset/WebRowSetTests.java similarity index 100% rename from jdk/test/javax/sql/testng/test/rowset/webrowset/WebRowSetTests.java rename to test/jdk/javax/sql/testng/test/rowset/webrowset/WebRowSetTests.java diff --git a/jdk/test/javax/sql/testng/util/PropertyStubProvider.java b/test/jdk/javax/sql/testng/util/PropertyStubProvider.java similarity index 100% rename from jdk/test/javax/sql/testng/util/PropertyStubProvider.java rename to test/jdk/javax/sql/testng/util/PropertyStubProvider.java diff --git a/jdk/test/javax/sql/testng/util/StubArray.java b/test/jdk/javax/sql/testng/util/StubArray.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubArray.java rename to test/jdk/javax/sql/testng/util/StubArray.java diff --git a/jdk/test/javax/sql/testng/util/StubBaseRowSet.java b/test/jdk/javax/sql/testng/util/StubBaseRowSet.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubBaseRowSet.java rename to test/jdk/javax/sql/testng/util/StubBaseRowSet.java diff --git a/jdk/test/javax/sql/testng/util/StubBlob.java b/test/jdk/javax/sql/testng/util/StubBlob.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubBlob.java rename to test/jdk/javax/sql/testng/util/StubBlob.java diff --git a/jdk/test/javax/sql/testng/util/StubCachedRowSetImpl.java b/test/jdk/javax/sql/testng/util/StubCachedRowSetImpl.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubCachedRowSetImpl.java rename to test/jdk/javax/sql/testng/util/StubCachedRowSetImpl.java diff --git a/jdk/test/javax/sql/testng/util/StubClob.java b/test/jdk/javax/sql/testng/util/StubClob.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubClob.java rename to test/jdk/javax/sql/testng/util/StubClob.java diff --git a/jdk/test/javax/sql/testng/util/StubContext.java b/test/jdk/javax/sql/testng/util/StubContext.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubContext.java rename to test/jdk/javax/sql/testng/util/StubContext.java diff --git a/jdk/test/javax/sql/testng/util/StubFilteredRowSetImpl.java b/test/jdk/javax/sql/testng/util/StubFilteredRowSetImpl.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubFilteredRowSetImpl.java rename to test/jdk/javax/sql/testng/util/StubFilteredRowSetImpl.java diff --git a/jdk/test/javax/sql/testng/util/StubJdbcRowSetImpl.java b/test/jdk/javax/sql/testng/util/StubJdbcRowSetImpl.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubJdbcRowSetImpl.java rename to test/jdk/javax/sql/testng/util/StubJdbcRowSetImpl.java diff --git a/jdk/test/javax/sql/testng/util/StubJoinRowSetImpl.java b/test/jdk/javax/sql/testng/util/StubJoinRowSetImpl.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubJoinRowSetImpl.java rename to test/jdk/javax/sql/testng/util/StubJoinRowSetImpl.java diff --git a/jdk/test/javax/sql/testng/util/StubNClob.java b/test/jdk/javax/sql/testng/util/StubNClob.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubNClob.java rename to test/jdk/javax/sql/testng/util/StubNClob.java diff --git a/jdk/test/javax/sql/testng/util/StubRef.java b/test/jdk/javax/sql/testng/util/StubRef.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubRef.java rename to test/jdk/javax/sql/testng/util/StubRef.java diff --git a/jdk/test/javax/sql/testng/util/StubRowId.java b/test/jdk/javax/sql/testng/util/StubRowId.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubRowId.java rename to test/jdk/javax/sql/testng/util/StubRowId.java diff --git a/jdk/test/javax/sql/testng/util/StubRowSetFactory.java b/test/jdk/javax/sql/testng/util/StubRowSetFactory.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubRowSetFactory.java rename to test/jdk/javax/sql/testng/util/StubRowSetFactory.java diff --git a/jdk/test/javax/sql/testng/util/StubSQLXML.java b/test/jdk/javax/sql/testng/util/StubSQLXML.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubSQLXML.java rename to test/jdk/javax/sql/testng/util/StubSQLXML.java diff --git a/jdk/test/javax/sql/testng/util/StubStruct.java b/test/jdk/javax/sql/testng/util/StubStruct.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubStruct.java rename to test/jdk/javax/sql/testng/util/StubStruct.java diff --git a/jdk/test/javax/sql/testng/util/StubSyncProvider.java b/test/jdk/javax/sql/testng/util/StubSyncProvider.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubSyncProvider.java rename to test/jdk/javax/sql/testng/util/StubSyncProvider.java diff --git a/jdk/test/javax/sql/testng/util/StubSyncResolver.java b/test/jdk/javax/sql/testng/util/StubSyncResolver.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubSyncResolver.java rename to test/jdk/javax/sql/testng/util/StubSyncResolver.java diff --git a/jdk/test/javax/sql/testng/util/StubWebRowSetImpl.java b/test/jdk/javax/sql/testng/util/StubWebRowSetImpl.java similarity index 100% rename from jdk/test/javax/sql/testng/util/StubWebRowSetImpl.java rename to test/jdk/javax/sql/testng/util/StubWebRowSetImpl.java diff --git a/jdk/test/javax/sql/testng/util/SuperHero.java b/test/jdk/javax/sql/testng/util/SuperHero.java similarity index 100% rename from jdk/test/javax/sql/testng/util/SuperHero.java rename to test/jdk/javax/sql/testng/util/SuperHero.java diff --git a/jdk/test/javax/sql/testng/util/TestRowSetListener.java b/test/jdk/javax/sql/testng/util/TestRowSetListener.java similarity index 100% rename from jdk/test/javax/sql/testng/util/TestRowSetListener.java rename to test/jdk/javax/sql/testng/util/TestRowSetListener.java diff --git a/jdk/test/javax/sql/testng/util/TestSQLDataImpl.java b/test/jdk/javax/sql/testng/util/TestSQLDataImpl.java similarity index 100% rename from jdk/test/javax/sql/testng/util/TestSQLDataImpl.java rename to test/jdk/javax/sql/testng/util/TestSQLDataImpl.java diff --git a/jdk/test/javax/sql/testng/xml/COFFEE_ROWS.xml b/test/jdk/javax/sql/testng/xml/COFFEE_ROWS.xml similarity index 100% rename from jdk/test/javax/sql/testng/xml/COFFEE_ROWS.xml rename to test/jdk/javax/sql/testng/xml/COFFEE_ROWS.xml diff --git a/jdk/test/javax/sql/testng/xml/DELETED_COFFEE_ROWS.xml b/test/jdk/javax/sql/testng/xml/DELETED_COFFEE_ROWS.xml similarity index 100% rename from jdk/test/javax/sql/testng/xml/DELETED_COFFEE_ROWS.xml rename to test/jdk/javax/sql/testng/xml/DELETED_COFFEE_ROWS.xml diff --git a/jdk/test/javax/sql/testng/xml/INSERTED_COFFEE_ROWS.xml b/test/jdk/javax/sql/testng/xml/INSERTED_COFFEE_ROWS.xml similarity index 100% rename from jdk/test/javax/sql/testng/xml/INSERTED_COFFEE_ROWS.xml rename to test/jdk/javax/sql/testng/xml/INSERTED_COFFEE_ROWS.xml diff --git a/jdk/test/javax/sql/testng/xml/MODFIED_DELETED_COFFEE_ROWS.xml b/test/jdk/javax/sql/testng/xml/MODFIED_DELETED_COFFEE_ROWS.xml similarity index 100% rename from jdk/test/javax/sql/testng/xml/MODFIED_DELETED_COFFEE_ROWS.xml rename to test/jdk/javax/sql/testng/xml/MODFIED_DELETED_COFFEE_ROWS.xml diff --git a/jdk/test/javax/sql/testng/xml/UPDATED_COFFEE_ROWS.xml b/test/jdk/javax/sql/testng/xml/UPDATED_COFFEE_ROWS.xml similarity index 100% rename from jdk/test/javax/sql/testng/xml/UPDATED_COFFEE_ROWS.xml rename to test/jdk/javax/sql/testng/xml/UPDATED_COFFEE_ROWS.xml diff --git a/jdk/test/javax/sql/testng/xml/UPDATED_INSERTED_COFFEE_ROWS.xml b/test/jdk/javax/sql/testng/xml/UPDATED_INSERTED_COFFEE_ROWS.xml similarity index 100% rename from jdk/test/javax/sql/testng/xml/UPDATED_INSERTED_COFFEE_ROWS.xml rename to test/jdk/javax/sql/testng/xml/UPDATED_INSERTED_COFFEE_ROWS.xml diff --git a/jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java b/test/jdk/javax/swing/AbstractButton/6711682/bug6711682.java similarity index 100% rename from jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java rename to test/jdk/javax/swing/AbstractButton/6711682/bug6711682.java diff --git a/jdk/test/javax/swing/AbstractButton/AnimatedIcon/AnimatedIcon.java b/test/jdk/javax/swing/AbstractButton/AnimatedIcon/AnimatedIcon.java similarity index 100% rename from jdk/test/javax/swing/AbstractButton/AnimatedIcon/AnimatedIcon.java rename to test/jdk/javax/swing/AbstractButton/AnimatedIcon/AnimatedIcon.java diff --git a/jdk/test/javax/swing/Action/8133039/bug8133039.java b/test/jdk/javax/swing/Action/8133039/bug8133039.java similarity index 100% rename from jdk/test/javax/swing/Action/8133039/bug8133039.java rename to test/jdk/javax/swing/Action/8133039/bug8133039.java diff --git a/jdk/test/javax/swing/AncestorNotifier/7193219/bug7193219.java b/test/jdk/javax/swing/AncestorNotifier/7193219/bug7193219.java similarity index 100% rename from jdk/test/javax/swing/AncestorNotifier/7193219/bug7193219.java rename to test/jdk/javax/swing/AncestorNotifier/7193219/bug7193219.java diff --git a/jdk/test/javax/swing/ClientProperty/UIClientPropertyKeyTest/UIClientPropertyKeyTest.java b/test/jdk/javax/swing/ClientProperty/UIClientPropertyKeyTest/UIClientPropertyKeyTest.java similarity index 100% rename from jdk/test/javax/swing/ClientProperty/UIClientPropertyKeyTest/UIClientPropertyKeyTest.java rename to test/jdk/javax/swing/ClientProperty/UIClientPropertyKeyTest/UIClientPropertyKeyTest.java diff --git a/jdk/test/javax/swing/DataTransfer/6456844/bug6456844.java b/test/jdk/javax/swing/DataTransfer/6456844/bug6456844.java similarity index 100% rename from jdk/test/javax/swing/DataTransfer/6456844/bug6456844.java rename to test/jdk/javax/swing/DataTransfer/6456844/bug6456844.java diff --git a/jdk/test/javax/swing/DataTransfer/8059739/bug8059739.java b/test/jdk/javax/swing/DataTransfer/8059739/bug8059739.java similarity index 100% rename from jdk/test/javax/swing/DataTransfer/8059739/bug8059739.java rename to test/jdk/javax/swing/DataTransfer/8059739/bug8059739.java diff --git a/jdk/test/javax/swing/DefaultButtonModel/DefaultButtonModelCrashTest.java b/test/jdk/javax/swing/DefaultButtonModel/DefaultButtonModelCrashTest.java similarity index 100% rename from jdk/test/javax/swing/DefaultButtonModel/DefaultButtonModelCrashTest.java rename to test/jdk/javax/swing/DefaultButtonModel/DefaultButtonModelCrashTest.java diff --git a/jdk/test/javax/swing/GroupLayout/6613904/bug6613904.java b/test/jdk/javax/swing/GroupLayout/6613904/bug6613904.java similarity index 100% rename from jdk/test/javax/swing/GroupLayout/6613904/bug6613904.java rename to test/jdk/javax/swing/GroupLayout/6613904/bug6613904.java diff --git a/jdk/test/javax/swing/GroupLayout/7071166/bug7071166.java b/test/jdk/javax/swing/GroupLayout/7071166/bug7071166.java similarity index 100% rename from jdk/test/javax/swing/GroupLayout/7071166/bug7071166.java rename to test/jdk/javax/swing/GroupLayout/7071166/bug7071166.java diff --git a/jdk/test/javax/swing/GroupLayout/8013566/bug8013566.java b/test/jdk/javax/swing/GroupLayout/8013566/bug8013566.java similarity index 100% rename from jdk/test/javax/swing/GroupLayout/8013566/bug8013566.java rename to test/jdk/javax/swing/GroupLayout/8013566/bug8013566.java diff --git a/jdk/test/javax/swing/GroupLayout/8079640/bug8079640.java b/test/jdk/javax/swing/GroupLayout/8079640/bug8079640.java similarity index 100% rename from jdk/test/javax/swing/GroupLayout/8079640/bug8079640.java rename to test/jdk/javax/swing/GroupLayout/8079640/bug8079640.java diff --git a/jdk/test/javax/swing/Headless/HeadlessAbstractSpinnerModel.java b/test/jdk/javax/swing/Headless/HeadlessAbstractSpinnerModel.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessAbstractSpinnerModel.java rename to test/jdk/javax/swing/Headless/HeadlessAbstractSpinnerModel.java diff --git a/jdk/test/javax/swing/Headless/HeadlessBox.java b/test/jdk/javax/swing/Headless/HeadlessBox.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessBox.java rename to test/jdk/javax/swing/Headless/HeadlessBox.java diff --git a/jdk/test/javax/swing/Headless/HeadlessBox_Filler.java b/test/jdk/javax/swing/Headless/HeadlessBox_Filler.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessBox_Filler.java rename to test/jdk/javax/swing/Headless/HeadlessBox_Filler.java diff --git a/jdk/test/javax/swing/Headless/HeadlessCellRendererPane.java b/test/jdk/javax/swing/Headless/HeadlessCellRendererPane.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessCellRendererPane.java rename to test/jdk/javax/swing/Headless/HeadlessCellRendererPane.java diff --git a/jdk/test/javax/swing/Headless/HeadlessDefaultListCellRenderer.java b/test/jdk/javax/swing/Headless/HeadlessDefaultListCellRenderer.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessDefaultListCellRenderer.java rename to test/jdk/javax/swing/Headless/HeadlessDefaultListCellRenderer.java diff --git a/jdk/test/javax/swing/Headless/HeadlessDefaultListCellRenderer_UIResource.java b/test/jdk/javax/swing/Headless/HeadlessDefaultListCellRenderer_UIResource.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessDefaultListCellRenderer_UIResource.java rename to test/jdk/javax/swing/Headless/HeadlessDefaultListCellRenderer_UIResource.java diff --git a/jdk/test/javax/swing/Headless/HeadlessGrayFilter.java b/test/jdk/javax/swing/Headless/HeadlessGrayFilter.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessGrayFilter.java rename to test/jdk/javax/swing/Headless/HeadlessGrayFilter.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJApplet.java b/test/jdk/javax/swing/Headless/HeadlessJApplet.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJApplet.java rename to test/jdk/javax/swing/Headless/HeadlessJApplet.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJButton.java b/test/jdk/javax/swing/Headless/HeadlessJButton.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJButton.java rename to test/jdk/javax/swing/Headless/HeadlessJButton.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJCheckBox.java b/test/jdk/javax/swing/Headless/HeadlessJCheckBox.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJCheckBox.java rename to test/jdk/javax/swing/Headless/HeadlessJCheckBox.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJCheckBoxMenuItem.java b/test/jdk/javax/swing/Headless/HeadlessJCheckBoxMenuItem.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJCheckBoxMenuItem.java rename to test/jdk/javax/swing/Headless/HeadlessJCheckBoxMenuItem.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJColorChooser.java b/test/jdk/javax/swing/Headless/HeadlessJColorChooser.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJColorChooser.java rename to test/jdk/javax/swing/Headless/HeadlessJColorChooser.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJComboBox.java b/test/jdk/javax/swing/Headless/HeadlessJComboBox.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJComboBox.java rename to test/jdk/javax/swing/Headless/HeadlessJComboBox.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJComponent.java b/test/jdk/javax/swing/Headless/HeadlessJComponent.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJComponent.java rename to test/jdk/javax/swing/Headless/HeadlessJComponent.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJDesktopPane.java b/test/jdk/javax/swing/Headless/HeadlessJDesktopPane.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJDesktopPane.java rename to test/jdk/javax/swing/Headless/HeadlessJDesktopPane.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJDialog.java b/test/jdk/javax/swing/Headless/HeadlessJDialog.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJDialog.java rename to test/jdk/javax/swing/Headless/HeadlessJDialog.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJEditorPane.java b/test/jdk/javax/swing/Headless/HeadlessJEditorPane.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJEditorPane.java rename to test/jdk/javax/swing/Headless/HeadlessJEditorPane.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJFileChooser.java b/test/jdk/javax/swing/Headless/HeadlessJFileChooser.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJFileChooser.java rename to test/jdk/javax/swing/Headless/HeadlessJFileChooser.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJFormattedTextField.java b/test/jdk/javax/swing/Headless/HeadlessJFormattedTextField.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJFormattedTextField.java rename to test/jdk/javax/swing/Headless/HeadlessJFormattedTextField.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJFrame.java b/test/jdk/javax/swing/Headless/HeadlessJFrame.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJFrame.java rename to test/jdk/javax/swing/Headless/HeadlessJFrame.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJInternalFrame.java b/test/jdk/javax/swing/Headless/HeadlessJInternalFrame.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJInternalFrame.java rename to test/jdk/javax/swing/Headless/HeadlessJInternalFrame.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJInternalFrame_JDesktopIcon.java b/test/jdk/javax/swing/Headless/HeadlessJInternalFrame_JDesktopIcon.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJInternalFrame_JDesktopIcon.java rename to test/jdk/javax/swing/Headless/HeadlessJInternalFrame_JDesktopIcon.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJLabel.java b/test/jdk/javax/swing/Headless/HeadlessJLabel.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJLabel.java rename to test/jdk/javax/swing/Headless/HeadlessJLabel.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJLayeredPane.java b/test/jdk/javax/swing/Headless/HeadlessJLayeredPane.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJLayeredPane.java rename to test/jdk/javax/swing/Headless/HeadlessJLayeredPane.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJList.java b/test/jdk/javax/swing/Headless/HeadlessJList.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJList.java rename to test/jdk/javax/swing/Headless/HeadlessJList.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJMenu.java b/test/jdk/javax/swing/Headless/HeadlessJMenu.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJMenu.java rename to test/jdk/javax/swing/Headless/HeadlessJMenu.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJMenuBar.java b/test/jdk/javax/swing/Headless/HeadlessJMenuBar.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJMenuBar.java rename to test/jdk/javax/swing/Headless/HeadlessJMenuBar.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJMenuItem.java b/test/jdk/javax/swing/Headless/HeadlessJMenuItem.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJMenuItem.java rename to test/jdk/javax/swing/Headless/HeadlessJMenuItem.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJOptionPane.java b/test/jdk/javax/swing/Headless/HeadlessJOptionPane.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJOptionPane.java rename to test/jdk/javax/swing/Headless/HeadlessJOptionPane.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJPanel.java b/test/jdk/javax/swing/Headless/HeadlessJPanel.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJPanel.java rename to test/jdk/javax/swing/Headless/HeadlessJPanel.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJPasswordField.java b/test/jdk/javax/swing/Headless/HeadlessJPasswordField.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJPasswordField.java rename to test/jdk/javax/swing/Headless/HeadlessJPasswordField.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJPopupMenu.java b/test/jdk/javax/swing/Headless/HeadlessJPopupMenu.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJPopupMenu.java rename to test/jdk/javax/swing/Headless/HeadlessJPopupMenu.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJPopupMenu_Separator.java b/test/jdk/javax/swing/Headless/HeadlessJPopupMenu_Separator.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJPopupMenu_Separator.java rename to test/jdk/javax/swing/Headless/HeadlessJPopupMenu_Separator.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJProgressBar.java b/test/jdk/javax/swing/Headless/HeadlessJProgressBar.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJProgressBar.java rename to test/jdk/javax/swing/Headless/HeadlessJProgressBar.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJRadioButton.java b/test/jdk/javax/swing/Headless/HeadlessJRadioButton.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJRadioButton.java rename to test/jdk/javax/swing/Headless/HeadlessJRadioButton.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJRadioButtonMenuItem.java b/test/jdk/javax/swing/Headless/HeadlessJRadioButtonMenuItem.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJRadioButtonMenuItem.java rename to test/jdk/javax/swing/Headless/HeadlessJRadioButtonMenuItem.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJRootPane.java b/test/jdk/javax/swing/Headless/HeadlessJRootPane.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJRootPane.java rename to test/jdk/javax/swing/Headless/HeadlessJRootPane.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJScrollBar.java b/test/jdk/javax/swing/Headless/HeadlessJScrollBar.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJScrollBar.java rename to test/jdk/javax/swing/Headless/HeadlessJScrollBar.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJScrollPane.java b/test/jdk/javax/swing/Headless/HeadlessJScrollPane.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJScrollPane.java rename to test/jdk/javax/swing/Headless/HeadlessJScrollPane.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJSeparator.java b/test/jdk/javax/swing/Headless/HeadlessJSeparator.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJSeparator.java rename to test/jdk/javax/swing/Headless/HeadlessJSeparator.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJSlider.java b/test/jdk/javax/swing/Headless/HeadlessJSlider.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJSlider.java rename to test/jdk/javax/swing/Headless/HeadlessJSlider.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJSpinner.java b/test/jdk/javax/swing/Headless/HeadlessJSpinner.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJSpinner.java rename to test/jdk/javax/swing/Headless/HeadlessJSpinner.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJSplitPane.java b/test/jdk/javax/swing/Headless/HeadlessJSplitPane.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJSplitPane.java rename to test/jdk/javax/swing/Headless/HeadlessJSplitPane.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJTabbedPane.java b/test/jdk/javax/swing/Headless/HeadlessJTabbedPane.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJTabbedPane.java rename to test/jdk/javax/swing/Headless/HeadlessJTabbedPane.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJTable.java b/test/jdk/javax/swing/Headless/HeadlessJTable.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJTable.java rename to test/jdk/javax/swing/Headless/HeadlessJTable.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJTextArea.java b/test/jdk/javax/swing/Headless/HeadlessJTextArea.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJTextArea.java rename to test/jdk/javax/swing/Headless/HeadlessJTextArea.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJTextField.java b/test/jdk/javax/swing/Headless/HeadlessJTextField.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJTextField.java rename to test/jdk/javax/swing/Headless/HeadlessJTextField.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJTextPane.java b/test/jdk/javax/swing/Headless/HeadlessJTextPane.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJTextPane.java rename to test/jdk/javax/swing/Headless/HeadlessJTextPane.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJToggleButton.java b/test/jdk/javax/swing/Headless/HeadlessJToggleButton.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJToggleButton.java rename to test/jdk/javax/swing/Headless/HeadlessJToggleButton.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJToolBar.java b/test/jdk/javax/swing/Headless/HeadlessJToolBar.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJToolBar.java rename to test/jdk/javax/swing/Headless/HeadlessJToolBar.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJToolBar_Separator.java b/test/jdk/javax/swing/Headless/HeadlessJToolBar_Separator.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJToolBar_Separator.java rename to test/jdk/javax/swing/Headless/HeadlessJToolBar_Separator.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJToolTip.java b/test/jdk/javax/swing/Headless/HeadlessJToolTip.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJToolTip.java rename to test/jdk/javax/swing/Headless/HeadlessJToolTip.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJTree.java b/test/jdk/javax/swing/Headless/HeadlessJTree.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJTree.java rename to test/jdk/javax/swing/Headless/HeadlessJTree.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJViewport.java b/test/jdk/javax/swing/Headless/HeadlessJViewport.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJViewport.java rename to test/jdk/javax/swing/Headless/HeadlessJViewport.java diff --git a/jdk/test/javax/swing/Headless/HeadlessJWindow.java b/test/jdk/javax/swing/Headless/HeadlessJWindow.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessJWindow.java rename to test/jdk/javax/swing/Headless/HeadlessJWindow.java diff --git a/jdk/test/javax/swing/Headless/HeadlessLookAndFeel.java b/test/jdk/javax/swing/Headless/HeadlessLookAndFeel.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessLookAndFeel.java rename to test/jdk/javax/swing/Headless/HeadlessLookAndFeel.java diff --git a/jdk/test/javax/swing/Headless/HeadlessMenuSelectionManager.java b/test/jdk/javax/swing/Headless/HeadlessMenuSelectionManager.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessMenuSelectionManager.java rename to test/jdk/javax/swing/Headless/HeadlessMenuSelectionManager.java diff --git a/jdk/test/javax/swing/Headless/HeadlessOverlayLayout.java b/test/jdk/javax/swing/Headless/HeadlessOverlayLayout.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessOverlayLayout.java rename to test/jdk/javax/swing/Headless/HeadlessOverlayLayout.java diff --git a/jdk/test/javax/swing/Headless/HeadlessPopupFactory.java b/test/jdk/javax/swing/Headless/HeadlessPopupFactory.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessPopupFactory.java rename to test/jdk/javax/swing/Headless/HeadlessPopupFactory.java diff --git a/jdk/test/javax/swing/Headless/HeadlessScrollPaneLayout.java b/test/jdk/javax/swing/Headless/HeadlessScrollPaneLayout.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessScrollPaneLayout.java rename to test/jdk/javax/swing/Headless/HeadlessScrollPaneLayout.java diff --git a/jdk/test/javax/swing/Headless/HeadlessSizeRequirements.java b/test/jdk/javax/swing/Headless/HeadlessSizeRequirements.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessSizeRequirements.java rename to test/jdk/javax/swing/Headless/HeadlessSizeRequirements.java diff --git a/jdk/test/javax/swing/Headless/HeadlessSizeSequence.java b/test/jdk/javax/swing/Headless/HeadlessSizeSequence.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessSizeSequence.java rename to test/jdk/javax/swing/Headless/HeadlessSizeSequence.java diff --git a/jdk/test/javax/swing/Headless/HeadlessSpinnerListModel.java b/test/jdk/javax/swing/Headless/HeadlessSpinnerListModel.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessSpinnerListModel.java rename to test/jdk/javax/swing/Headless/HeadlessSpinnerListModel.java diff --git a/jdk/test/javax/swing/Headless/HeadlessSpinnerNumberModel.java b/test/jdk/javax/swing/Headless/HeadlessSpinnerNumberModel.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessSpinnerNumberModel.java rename to test/jdk/javax/swing/Headless/HeadlessSpinnerNumberModel.java diff --git a/jdk/test/javax/swing/Headless/HeadlessTimer.java b/test/jdk/javax/swing/Headless/HeadlessTimer.java similarity index 100% rename from jdk/test/javax/swing/Headless/HeadlessTimer.java rename to test/jdk/javax/swing/Headless/HeadlessTimer.java diff --git a/jdk/test/javax/swing/InputVerifier/VerifyTarget/VerifyTargetTest.java b/test/jdk/javax/swing/InputVerifier/VerifyTarget/VerifyTargetTest.java similarity index 100% rename from jdk/test/javax/swing/InputVerifier/VerifyTarget/VerifyTargetTest.java rename to test/jdk/javax/swing/InputVerifier/VerifyTarget/VerifyTargetTest.java diff --git a/jdk/test/javax/swing/JButton/4368790/bug4368790.java b/test/jdk/javax/swing/JButton/4368790/bug4368790.java similarity index 100% rename from jdk/test/javax/swing/JButton/4368790/bug4368790.java rename to test/jdk/javax/swing/JButton/4368790/bug4368790.java diff --git a/jdk/test/javax/swing/JButton/4796987/bug4796987.java b/test/jdk/javax/swing/JButton/4796987/bug4796987.java similarity index 100% rename from jdk/test/javax/swing/JButton/4796987/bug4796987.java rename to test/jdk/javax/swing/JButton/4796987/bug4796987.java diff --git a/jdk/test/javax/swing/JButton/6604281/bug6604281.java b/test/jdk/javax/swing/JButton/6604281/bug6604281.java similarity index 100% rename from jdk/test/javax/swing/JButton/6604281/bug6604281.java rename to test/jdk/javax/swing/JButton/6604281/bug6604281.java diff --git a/jdk/test/javax/swing/JButton/8151303/PressedIconTest.java b/test/jdk/javax/swing/JButton/8151303/PressedIconTest.java similarity index 100% rename from jdk/test/javax/swing/JButton/8151303/PressedIconTest.java rename to test/jdk/javax/swing/JButton/8151303/PressedIconTest.java diff --git a/jdk/test/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java b/test/jdk/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java similarity index 100% rename from jdk/test/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java rename to test/jdk/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java diff --git a/jdk/test/javax/swing/JButton/PressedButtonRightClickTest.java b/test/jdk/javax/swing/JButton/PressedButtonRightClickTest.java similarity index 100% rename from jdk/test/javax/swing/JButton/PressedButtonRightClickTest.java rename to test/jdk/javax/swing/JButton/PressedButtonRightClickTest.java diff --git a/jdk/test/javax/swing/JButton/TimeChangeButtonClickTest.java b/test/jdk/javax/swing/JButton/TimeChangeButtonClickTest.java similarity index 100% rename from jdk/test/javax/swing/JButton/TimeChangeButtonClickTest.java rename to test/jdk/javax/swing/JButton/TimeChangeButtonClickTest.java diff --git a/jdk/test/javax/swing/JCheckBox/4449413/bug4449413.html b/test/jdk/javax/swing/JCheckBox/4449413/bug4449413.html similarity index 100% rename from jdk/test/javax/swing/JCheckBox/4449413/bug4449413.html rename to test/jdk/javax/swing/JCheckBox/4449413/bug4449413.html diff --git a/jdk/test/javax/swing/JCheckBox/4449413/bug4449413.java b/test/jdk/javax/swing/JCheckBox/4449413/bug4449413.java similarity index 100% rename from jdk/test/javax/swing/JCheckBox/4449413/bug4449413.java rename to test/jdk/javax/swing/JCheckBox/4449413/bug4449413.java diff --git a/jdk/test/javax/swing/JCheckBox/8032667/bug8032667.html b/test/jdk/javax/swing/JCheckBox/8032667/bug8032667.html similarity index 100% rename from jdk/test/javax/swing/JCheckBox/8032667/bug8032667.html rename to test/jdk/javax/swing/JCheckBox/8032667/bug8032667.html diff --git a/jdk/test/javax/swing/JCheckBox/8032667/bug8032667.java b/test/jdk/javax/swing/JCheckBox/8032667/bug8032667.java similarity index 100% rename from jdk/test/javax/swing/JCheckBox/8032667/bug8032667.java rename to test/jdk/javax/swing/JCheckBox/8032667/bug8032667.java diff --git a/jdk/test/javax/swing/JCheckBox/8032667/bug8032667_image_diff.java b/test/jdk/javax/swing/JCheckBox/8032667/bug8032667_image_diff.java similarity index 100% rename from jdk/test/javax/swing/JCheckBox/8032667/bug8032667_image_diff.java rename to test/jdk/javax/swing/JCheckBox/8032667/bug8032667_image_diff.java diff --git a/jdk/test/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java b/test/jdk/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java rename to test/jdk/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java diff --git a/jdk/test/javax/swing/JColorChooser/8065098/bug8065098.html b/test/jdk/javax/swing/JColorChooser/8065098/bug8065098.html similarity index 100% rename from jdk/test/javax/swing/JColorChooser/8065098/bug8065098.html rename to test/jdk/javax/swing/JColorChooser/8065098/bug8065098.html diff --git a/jdk/test/javax/swing/JColorChooser/8065098/bug8065098.java b/test/jdk/javax/swing/JColorChooser/8065098/bug8065098.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/8065098/bug8065098.java rename to test/jdk/javax/swing/JColorChooser/8065098/bug8065098.java diff --git a/jdk/test/javax/swing/JColorChooser/Test4165217.java b/test/jdk/javax/swing/JColorChooser/Test4165217.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4165217.java rename to test/jdk/javax/swing/JColorChooser/Test4165217.java diff --git a/jdk/test/javax/swing/JColorChooser/Test4177735.java b/test/jdk/javax/swing/JColorChooser/Test4177735.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4177735.java rename to test/jdk/javax/swing/JColorChooser/Test4177735.java diff --git a/jdk/test/javax/swing/JColorChooser/Test4193384.java b/test/jdk/javax/swing/JColorChooser/Test4193384.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4193384.java rename to test/jdk/javax/swing/JColorChooser/Test4193384.java diff --git a/jdk/test/javax/swing/JColorChooser/Test4222508.html b/test/jdk/javax/swing/JColorChooser/Test4222508.html similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4222508.html rename to test/jdk/javax/swing/JColorChooser/Test4222508.html diff --git a/jdk/test/javax/swing/JColorChooser/Test4222508.java b/test/jdk/javax/swing/JColorChooser/Test4222508.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4222508.java rename to test/jdk/javax/swing/JColorChooser/Test4222508.java diff --git a/jdk/test/javax/swing/JColorChooser/Test4234761.java b/test/jdk/javax/swing/JColorChooser/Test4234761.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4234761.java rename to test/jdk/javax/swing/JColorChooser/Test4234761.java diff --git a/jdk/test/javax/swing/JColorChooser/Test4319113.html b/test/jdk/javax/swing/JColorChooser/Test4319113.html similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4319113.html rename to test/jdk/javax/swing/JColorChooser/Test4319113.html diff --git a/jdk/test/javax/swing/JColorChooser/Test4319113.java b/test/jdk/javax/swing/JColorChooser/Test4319113.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4319113.java rename to test/jdk/javax/swing/JColorChooser/Test4319113.java diff --git a/jdk/test/javax/swing/JColorChooser/Test4461329.java b/test/jdk/javax/swing/JColorChooser/Test4461329.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4461329.java rename to test/jdk/javax/swing/JColorChooser/Test4461329.java diff --git a/jdk/test/javax/swing/JColorChooser/Test4711996.java b/test/jdk/javax/swing/JColorChooser/Test4711996.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4711996.java rename to test/jdk/javax/swing/JColorChooser/Test4711996.java diff --git a/jdk/test/javax/swing/JColorChooser/Test4759306.html b/test/jdk/javax/swing/JColorChooser/Test4759306.html similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4759306.html rename to test/jdk/javax/swing/JColorChooser/Test4759306.html diff --git a/jdk/test/javax/swing/JColorChooser/Test4759306.java b/test/jdk/javax/swing/JColorChooser/Test4759306.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4759306.java rename to test/jdk/javax/swing/JColorChooser/Test4759306.java diff --git a/jdk/test/javax/swing/JColorChooser/Test4759934.html b/test/jdk/javax/swing/JColorChooser/Test4759934.html similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4759934.html rename to test/jdk/javax/swing/JColorChooser/Test4759934.html diff --git a/jdk/test/javax/swing/JColorChooser/Test4759934.java b/test/jdk/javax/swing/JColorChooser/Test4759934.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4759934.java rename to test/jdk/javax/swing/JColorChooser/Test4759934.java diff --git a/jdk/test/javax/swing/JColorChooser/Test4887836.html b/test/jdk/javax/swing/JColorChooser/Test4887836.html similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4887836.html rename to test/jdk/javax/swing/JColorChooser/Test4887836.html diff --git a/jdk/test/javax/swing/JColorChooser/Test4887836.java b/test/jdk/javax/swing/JColorChooser/Test4887836.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test4887836.java rename to test/jdk/javax/swing/JColorChooser/Test4887836.java diff --git a/jdk/test/javax/swing/JColorChooser/Test6199676.java b/test/jdk/javax/swing/JColorChooser/Test6199676.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test6199676.java rename to test/jdk/javax/swing/JColorChooser/Test6199676.java diff --git a/jdk/test/javax/swing/JColorChooser/Test6348456.html b/test/jdk/javax/swing/JColorChooser/Test6348456.html similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test6348456.html rename to test/jdk/javax/swing/JColorChooser/Test6348456.html diff --git a/jdk/test/javax/swing/JColorChooser/Test6348456.java b/test/jdk/javax/swing/JColorChooser/Test6348456.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test6348456.java rename to test/jdk/javax/swing/JColorChooser/Test6348456.java diff --git a/jdk/test/javax/swing/JColorChooser/Test6524757.java b/test/jdk/javax/swing/JColorChooser/Test6524757.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test6524757.java rename to test/jdk/javax/swing/JColorChooser/Test6524757.java diff --git a/jdk/test/javax/swing/JColorChooser/Test6541987.java b/test/jdk/javax/swing/JColorChooser/Test6541987.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test6541987.java rename to test/jdk/javax/swing/JColorChooser/Test6541987.java diff --git a/jdk/test/javax/swing/JColorChooser/Test6559154.java b/test/jdk/javax/swing/JColorChooser/Test6559154.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test6559154.java rename to test/jdk/javax/swing/JColorChooser/Test6559154.java diff --git a/jdk/test/javax/swing/JColorChooser/Test6707406.java b/test/jdk/javax/swing/JColorChooser/Test6707406.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test6707406.java rename to test/jdk/javax/swing/JColorChooser/Test6707406.java diff --git a/jdk/test/javax/swing/JColorChooser/Test6827032.java b/test/jdk/javax/swing/JColorChooser/Test6827032.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test6827032.java rename to test/jdk/javax/swing/JColorChooser/Test6827032.java diff --git a/jdk/test/javax/swing/JColorChooser/Test6977726.html b/test/jdk/javax/swing/JColorChooser/Test6977726.html similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test6977726.html rename to test/jdk/javax/swing/JColorChooser/Test6977726.html diff --git a/jdk/test/javax/swing/JColorChooser/Test6977726.java b/test/jdk/javax/swing/JColorChooser/Test6977726.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test6977726.java rename to test/jdk/javax/swing/JColorChooser/Test6977726.java diff --git a/jdk/test/javax/swing/JColorChooser/Test7194184.java b/test/jdk/javax/swing/JColorChooser/Test7194184.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test7194184.java rename to test/jdk/javax/swing/JColorChooser/Test7194184.java diff --git a/jdk/test/javax/swing/JColorChooser/Test8051548.java b/test/jdk/javax/swing/JColorChooser/Test8051548.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test8051548.java rename to test/jdk/javax/swing/JColorChooser/Test8051548.java diff --git a/jdk/test/javax/swing/JColorChooser/Test8152419.java b/test/jdk/javax/swing/JColorChooser/Test8152419.java similarity index 100% rename from jdk/test/javax/swing/JColorChooser/Test8152419.java rename to test/jdk/javax/swing/JColorChooser/Test8152419.java diff --git a/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java b/test/jdk/javax/swing/JComboBox/4199622/bug4199622.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/4199622/bug4199622.java rename to test/jdk/javax/swing/JComboBox/4199622/bug4199622.java diff --git a/jdk/test/javax/swing/JComboBox/4515752/DefaultButtonTest.java b/test/jdk/javax/swing/JComboBox/4515752/DefaultButtonTest.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/4515752/DefaultButtonTest.java rename to test/jdk/javax/swing/JComboBox/4515752/DefaultButtonTest.java diff --git a/jdk/test/javax/swing/JComboBox/4523758/bug4523758.java b/test/jdk/javax/swing/JComboBox/4523758/bug4523758.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/4523758/bug4523758.java rename to test/jdk/javax/swing/JComboBox/4523758/bug4523758.java diff --git a/jdk/test/javax/swing/JComboBox/4743225/bug4743225.java b/test/jdk/javax/swing/JComboBox/4743225/bug4743225.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/4743225/bug4743225.java rename to test/jdk/javax/swing/JComboBox/4743225/bug4743225.java diff --git a/jdk/test/javax/swing/JComboBox/6236162/bug6236162.java b/test/jdk/javax/swing/JComboBox/6236162/bug6236162.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/6236162/bug6236162.java rename to test/jdk/javax/swing/JComboBox/6236162/bug6236162.java diff --git a/jdk/test/javax/swing/JComboBox/6337518/bug6337518.java b/test/jdk/javax/swing/JComboBox/6337518/bug6337518.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/6337518/bug6337518.java rename to test/jdk/javax/swing/JComboBox/6337518/bug6337518.java diff --git a/jdk/test/javax/swing/JComboBox/6406264/bug6406264.java b/test/jdk/javax/swing/JComboBox/6406264/bug6406264.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/6406264/bug6406264.java rename to test/jdk/javax/swing/JComboBox/6406264/bug6406264.java diff --git a/jdk/test/javax/swing/JComboBox/6559152/bug6559152.java b/test/jdk/javax/swing/JComboBox/6559152/bug6559152.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/6559152/bug6559152.java rename to test/jdk/javax/swing/JComboBox/6559152/bug6559152.java diff --git a/jdk/test/javax/swing/JComboBox/6567433/UpdateUIRecursionTest.java b/test/jdk/javax/swing/JComboBox/6567433/UpdateUIRecursionTest.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/6567433/UpdateUIRecursionTest.java rename to test/jdk/javax/swing/JComboBox/6567433/UpdateUIRecursionTest.java diff --git a/jdk/test/javax/swing/JComboBox/6607130/bug6607130.java b/test/jdk/javax/swing/JComboBox/6607130/bug6607130.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/6607130/bug6607130.java rename to test/jdk/javax/swing/JComboBox/6607130/bug6607130.java diff --git a/jdk/test/javax/swing/JComboBox/6632953/bug6632953.java b/test/jdk/javax/swing/JComboBox/6632953/bug6632953.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/6632953/bug6632953.java rename to test/jdk/javax/swing/JComboBox/6632953/bug6632953.java diff --git a/jdk/test/javax/swing/JComboBox/7031551/bug7031551.java b/test/jdk/javax/swing/JComboBox/7031551/bug7031551.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/7031551/bug7031551.java rename to test/jdk/javax/swing/JComboBox/7031551/bug7031551.java diff --git a/jdk/test/javax/swing/JComboBox/7082443/bug7082443.java b/test/jdk/javax/swing/JComboBox/7082443/bug7082443.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/7082443/bug7082443.java rename to test/jdk/javax/swing/JComboBox/7082443/bug7082443.java diff --git a/jdk/test/javax/swing/JComboBox/7195179/Test7195179.java b/test/jdk/javax/swing/JComboBox/7195179/Test7195179.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/7195179/Test7195179.java rename to test/jdk/javax/swing/JComboBox/7195179/Test7195179.java diff --git a/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java b/test/jdk/javax/swing/JComboBox/8015300/Test8015300.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/8015300/Test8015300.java rename to test/jdk/javax/swing/JComboBox/8015300/Test8015300.java diff --git a/jdk/test/javax/swing/JComboBox/8019180/Test8019180.java b/test/jdk/javax/swing/JComboBox/8019180/Test8019180.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/8019180/Test8019180.java rename to test/jdk/javax/swing/JComboBox/8019180/Test8019180.java diff --git a/jdk/test/javax/swing/JComboBox/8032878/bug8032878.java b/test/jdk/javax/swing/JComboBox/8032878/bug8032878.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/8032878/bug8032878.java rename to test/jdk/javax/swing/JComboBox/8032878/bug8032878.java diff --git a/jdk/test/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java b/test/jdk/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java rename to test/jdk/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java diff --git a/jdk/test/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java b/test/jdk/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java rename to test/jdk/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java diff --git a/jdk/test/javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java b/test/jdk/javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java rename to test/jdk/javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java diff --git a/jdk/test/javax/swing/JComboBox/8057893/bug8057893.java b/test/jdk/javax/swing/JComboBox/8057893/bug8057893.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/8057893/bug8057893.java rename to test/jdk/javax/swing/JComboBox/8057893/bug8057893.java diff --git a/jdk/test/javax/swing/JComboBox/8072767/bug8072767.java b/test/jdk/javax/swing/JComboBox/8072767/bug8072767.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/8072767/bug8072767.java rename to test/jdk/javax/swing/JComboBox/8072767/bug8072767.java diff --git a/jdk/test/javax/swing/JComboBox/8080972/TestBasicComboBoxEditor.java b/test/jdk/javax/swing/JComboBox/8080972/TestBasicComboBoxEditor.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/8080972/TestBasicComboBoxEditor.java rename to test/jdk/javax/swing/JComboBox/8080972/TestBasicComboBoxEditor.java diff --git a/jdk/test/javax/swing/JComboBox/8136998/bug8136998.java b/test/jdk/javax/swing/JComboBox/8136998/bug8136998.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/8136998/bug8136998.java rename to test/jdk/javax/swing/JComboBox/8136998/bug8136998.java diff --git a/jdk/test/javax/swing/JComboBox/8182031/ComboPopupTest.java b/test/jdk/javax/swing/JComboBox/8182031/ComboPopupTest.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/8182031/ComboPopupTest.java rename to test/jdk/javax/swing/JComboBox/8182031/ComboPopupTest.java diff --git a/jdk/test/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java b/test/jdk/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java rename to test/jdk/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java diff --git a/jdk/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java b/test/jdk/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java rename to test/jdk/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java diff --git a/jdk/test/javax/swing/JComboBox/WindowsComboBoxSize/WindowsComboBoxSizeTest.java b/test/jdk/javax/swing/JComboBox/WindowsComboBoxSize/WindowsComboBoxSizeTest.java similarity index 100% rename from jdk/test/javax/swing/JComboBox/WindowsComboBoxSize/WindowsComboBoxSizeTest.java rename to test/jdk/javax/swing/JComboBox/WindowsComboBoxSize/WindowsComboBoxSizeTest.java diff --git a/jdk/test/javax/swing/JComponent/4337267/bug4337267.java b/test/jdk/javax/swing/JComponent/4337267/bug4337267.java similarity index 100% rename from jdk/test/javax/swing/JComponent/4337267/bug4337267.java rename to test/jdk/javax/swing/JComponent/4337267/bug4337267.java diff --git a/jdk/test/javax/swing/JComponent/4339584/GetUI.java b/test/jdk/javax/swing/JComponent/4339584/GetUI.java similarity index 100% rename from jdk/test/javax/swing/JComponent/4339584/GetUI.java rename to test/jdk/javax/swing/JComponent/4339584/GetUI.java diff --git a/jdk/test/javax/swing/JComponent/6683775/bug6683775.java b/test/jdk/javax/swing/JComponent/6683775/bug6683775.java similarity index 100% rename from jdk/test/javax/swing/JComponent/6683775/bug6683775.java rename to test/jdk/javax/swing/JComponent/6683775/bug6683775.java diff --git a/jdk/test/javax/swing/JComponent/6989617/bug6989617.java b/test/jdk/javax/swing/JComponent/6989617/bug6989617.java similarity index 100% rename from jdk/test/javax/swing/JComponent/6989617/bug6989617.java rename to test/jdk/javax/swing/JComponent/6989617/bug6989617.java diff --git a/jdk/test/javax/swing/JComponent/7154030/bug7154030.java b/test/jdk/javax/swing/JComponent/7154030/bug7154030.java similarity index 100% rename from jdk/test/javax/swing/JComponent/7154030/bug7154030.java rename to test/jdk/javax/swing/JComponent/7154030/bug7154030.java diff --git a/jdk/test/javax/swing/JComponent/8043610/bug8043610.java b/test/jdk/javax/swing/JComponent/8043610/bug8043610.java similarity index 100% rename from jdk/test/javax/swing/JComponent/8043610/bug8043610.java rename to test/jdk/javax/swing/JComponent/8043610/bug8043610.java diff --git a/jdk/test/javax/swing/JDesktopPane/DesktopPaneBackgroundTest.java b/test/jdk/javax/swing/JDesktopPane/DesktopPaneBackgroundTest.java similarity index 100% rename from jdk/test/javax/swing/JDesktopPane/DesktopPaneBackgroundTest.java rename to test/jdk/javax/swing/JDesktopPane/DesktopPaneBackgroundTest.java diff --git a/jdk/test/javax/swing/JDialog/6639507/bug6639507.java b/test/jdk/javax/swing/JDialog/6639507/bug6639507.java similarity index 100% rename from jdk/test/javax/swing/JDialog/6639507/bug6639507.java rename to test/jdk/javax/swing/JDialog/6639507/bug6639507.java diff --git a/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java b/test/jdk/javax/swing/JDialog/Transparency/TransparencyTest.java similarity index 100% rename from jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java rename to test/jdk/javax/swing/JDialog/Transparency/TransparencyTest.java diff --git a/jdk/test/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java b/test/jdk/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java similarity index 100% rename from jdk/test/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java rename to test/jdk/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java diff --git a/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java b/test/jdk/javax/swing/JEditorPane/4492274/bug4492274.java similarity index 100% rename from jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java rename to test/jdk/javax/swing/JEditorPane/4492274/bug4492274.java diff --git a/jdk/test/javax/swing/JEditorPane/4492274/test.html b/test/jdk/javax/swing/JEditorPane/4492274/test.html similarity index 100% rename from jdk/test/javax/swing/JEditorPane/4492274/test.html rename to test/jdk/javax/swing/JEditorPane/4492274/test.html diff --git a/jdk/test/javax/swing/JEditorPane/5076514/bug5076514.java b/test/jdk/javax/swing/JEditorPane/5076514/bug5076514.java similarity index 100% rename from jdk/test/javax/swing/JEditorPane/5076514/bug5076514.java rename to test/jdk/javax/swing/JEditorPane/5076514/bug5076514.java diff --git a/jdk/test/javax/swing/JEditorPane/6882559/bug6882559.java b/test/jdk/javax/swing/JEditorPane/6882559/bug6882559.java similarity index 100% rename from jdk/test/javax/swing/JEditorPane/6882559/bug6882559.java rename to test/jdk/javax/swing/JEditorPane/6882559/bug6882559.java diff --git a/jdk/test/javax/swing/JEditorPane/6917744/bug6917744.java b/test/jdk/javax/swing/JEditorPane/6917744/bug6917744.java similarity index 100% rename from jdk/test/javax/swing/JEditorPane/6917744/bug6917744.java rename to test/jdk/javax/swing/JEditorPane/6917744/bug6917744.java diff --git a/jdk/test/javax/swing/JEditorPane/6917744/test.html b/test/jdk/javax/swing/JEditorPane/6917744/test.html similarity index 100% rename from jdk/test/javax/swing/JEditorPane/6917744/test.html rename to test/jdk/javax/swing/JEditorPane/6917744/test.html diff --git a/jdk/test/javax/swing/JEditorPane/8080972/TestJEditor.java b/test/jdk/javax/swing/JEditorPane/8080972/TestJEditor.java similarity index 100% rename from jdk/test/javax/swing/JEditorPane/8080972/TestJEditor.java rename to test/jdk/javax/swing/JEditorPane/8080972/TestJEditor.java diff --git a/jdk/test/javax/swing/JEditorPane/8146319/JEditorPaneTest.java b/test/jdk/javax/swing/JEditorPane/8146319/JEditorPaneTest.java similarity index 100% rename from jdk/test/javax/swing/JEditorPane/8146319/JEditorPaneTest.java rename to test/jdk/javax/swing/JEditorPane/8146319/JEditorPaneTest.java diff --git a/jdk/test/javax/swing/JEditorPane/8158734/bug8158734.java b/test/jdk/javax/swing/JEditorPane/8158734/bug8158734.java similarity index 100% rename from jdk/test/javax/swing/JEditorPane/8158734/bug8158734.java rename to test/jdk/javax/swing/JEditorPane/8158734/bug8158734.java diff --git a/jdk/test/javax/swing/JEditorPane/bug4714674.java b/test/jdk/javax/swing/JEditorPane/bug4714674.java similarity index 100% rename from jdk/test/javax/swing/JEditorPane/bug4714674.java rename to test/jdk/javax/swing/JEditorPane/bug4714674.java diff --git a/jdk/test/javax/swing/JFileChooser/4150029/bug4150029.html b/test/jdk/javax/swing/JFileChooser/4150029/bug4150029.html similarity index 100% rename from jdk/test/javax/swing/JFileChooser/4150029/bug4150029.html rename to test/jdk/javax/swing/JFileChooser/4150029/bug4150029.html diff --git a/jdk/test/javax/swing/JFileChooser/4150029/bug4150029.java b/test/jdk/javax/swing/JFileChooser/4150029/bug4150029.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/4150029/bug4150029.java rename to test/jdk/javax/swing/JFileChooser/4150029/bug4150029.java diff --git a/jdk/test/javax/swing/JFileChooser/4524490/bug4524490.java b/test/jdk/javax/swing/JFileChooser/4524490/bug4524490.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/4524490/bug4524490.java rename to test/jdk/javax/swing/JFileChooser/4524490/bug4524490.java diff --git a/jdk/test/javax/swing/JFileChooser/4847375/bug4847375.java b/test/jdk/javax/swing/JFileChooser/4847375/bug4847375.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/4847375/bug4847375.java rename to test/jdk/javax/swing/JFileChooser/4847375/bug4847375.java diff --git a/jdk/test/javax/swing/JFileChooser/6342301/bug6342301.java b/test/jdk/javax/swing/JFileChooser/6342301/bug6342301.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6342301/bug6342301.java rename to test/jdk/javax/swing/JFileChooser/6342301/bug6342301.java diff --git a/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java b/test/jdk/javax/swing/JFileChooser/6396844/TwentyThousandTest.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java rename to test/jdk/javax/swing/JFileChooser/6396844/TwentyThousandTest.java diff --git a/jdk/test/javax/swing/JFileChooser/6484091/bug6484091.java b/test/jdk/javax/swing/JFileChooser/6484091/bug6484091.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6484091/bug6484091.java rename to test/jdk/javax/swing/JFileChooser/6484091/bug6484091.java diff --git a/jdk/test/javax/swing/JFileChooser/6489130/bug6489130.java b/test/jdk/javax/swing/JFileChooser/6489130/bug6489130.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6489130/bug6489130.java rename to test/jdk/javax/swing/JFileChooser/6489130/bug6489130.java diff --git a/jdk/test/javax/swing/JFileChooser/6520101/bug6520101.java b/test/jdk/javax/swing/JFileChooser/6520101/bug6520101.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6520101/bug6520101.java rename to test/jdk/javax/swing/JFileChooser/6520101/bug6520101.java diff --git a/jdk/test/javax/swing/JFileChooser/6550546/bug6550546.java b/test/jdk/javax/swing/JFileChooser/6550546/bug6550546.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6550546/bug6550546.java rename to test/jdk/javax/swing/JFileChooser/6550546/bug6550546.java diff --git a/jdk/test/javax/swing/JFileChooser/6570445/bug6570445.java b/test/jdk/javax/swing/JFileChooser/6570445/bug6570445.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6570445/bug6570445.java rename to test/jdk/javax/swing/JFileChooser/6570445/bug6570445.java diff --git a/jdk/test/javax/swing/JFileChooser/6688203/bug6688203.java b/test/jdk/javax/swing/JFileChooser/6688203/bug6688203.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6688203/bug6688203.java rename to test/jdk/javax/swing/JFileChooser/6688203/bug6688203.java diff --git a/jdk/test/javax/swing/JFileChooser/6698013/bug6698013.html b/test/jdk/javax/swing/JFileChooser/6698013/bug6698013.html similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6698013/bug6698013.html rename to test/jdk/javax/swing/JFileChooser/6698013/bug6698013.html diff --git a/jdk/test/javax/swing/JFileChooser/6698013/bug6698013.java b/test/jdk/javax/swing/JFileChooser/6698013/bug6698013.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6698013/bug6698013.java rename to test/jdk/javax/swing/JFileChooser/6698013/bug6698013.java diff --git a/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java b/test/jdk/javax/swing/JFileChooser/6713352/bug6713352.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java rename to test/jdk/javax/swing/JFileChooser/6713352/bug6713352.java diff --git a/jdk/test/javax/swing/JFileChooser/6738668/bug6738668.java b/test/jdk/javax/swing/JFileChooser/6738668/bug6738668.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6738668/bug6738668.java rename to test/jdk/javax/swing/JFileChooser/6738668/bug6738668.java diff --git a/jdk/test/javax/swing/JFileChooser/6738668/security.policy b/test/jdk/javax/swing/JFileChooser/6738668/security.policy similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6738668/security.policy rename to test/jdk/javax/swing/JFileChooser/6738668/security.policy diff --git a/jdk/test/javax/swing/JFileChooser/6741890/bug6741890.java b/test/jdk/javax/swing/JFileChooser/6741890/bug6741890.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6741890/bug6741890.java rename to test/jdk/javax/swing/JFileChooser/6741890/bug6741890.java diff --git a/jdk/test/javax/swing/JFileChooser/6798062/bug6798062.html b/test/jdk/javax/swing/JFileChooser/6798062/bug6798062.html similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6798062/bug6798062.html rename to test/jdk/javax/swing/JFileChooser/6798062/bug6798062.html diff --git a/jdk/test/javax/swing/JFileChooser/6798062/bug6798062.java b/test/jdk/javax/swing/JFileChooser/6798062/bug6798062.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6798062/bug6798062.java rename to test/jdk/javax/swing/JFileChooser/6798062/bug6798062.java diff --git a/jdk/test/javax/swing/JFileChooser/6817933/Test6817933.java b/test/jdk/javax/swing/JFileChooser/6817933/Test6817933.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6817933/Test6817933.java rename to test/jdk/javax/swing/JFileChooser/6817933/Test6817933.java diff --git a/jdk/test/javax/swing/JFileChooser/6840086/bug6840086.java b/test/jdk/javax/swing/JFileChooser/6840086/bug6840086.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6840086/bug6840086.java rename to test/jdk/javax/swing/JFileChooser/6840086/bug6840086.java diff --git a/jdk/test/javax/swing/JFileChooser/6868611/bug6868611.java b/test/jdk/javax/swing/JFileChooser/6868611/bug6868611.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6868611/bug6868611.java rename to test/jdk/javax/swing/JFileChooser/6868611/bug6868611.java diff --git a/jdk/test/javax/swing/JFileChooser/6945316/bug6945316.java b/test/jdk/javax/swing/JFileChooser/6945316/bug6945316.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/6945316/bug6945316.java rename to test/jdk/javax/swing/JFileChooser/6945316/bug6945316.java diff --git a/jdk/test/javax/swing/JFileChooser/7036025/bug7036025.java b/test/jdk/javax/swing/JFileChooser/7036025/bug7036025.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/7036025/bug7036025.java rename to test/jdk/javax/swing/JFileChooser/7036025/bug7036025.java diff --git a/jdk/test/javax/swing/JFileChooser/7036025/security.policy b/test/jdk/javax/swing/JFileChooser/7036025/security.policy similarity index 100% rename from jdk/test/javax/swing/JFileChooser/7036025/security.policy rename to test/jdk/javax/swing/JFileChooser/7036025/security.policy diff --git a/jdk/test/javax/swing/JFileChooser/7199708/bug7199708.java b/test/jdk/javax/swing/JFileChooser/7199708/bug7199708.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/7199708/bug7199708.java rename to test/jdk/javax/swing/JFileChooser/7199708/bug7199708.java diff --git a/jdk/test/javax/swing/JFileChooser/8002077/bug8002077.java b/test/jdk/javax/swing/JFileChooser/8002077/bug8002077.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8002077/bug8002077.java rename to test/jdk/javax/swing/JFileChooser/8002077/bug8002077.java diff --git a/jdk/test/javax/swing/JFileChooser/8010718/bug8010718.java b/test/jdk/javax/swing/JFileChooser/8010718/bug8010718.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8010718/bug8010718.java rename to test/jdk/javax/swing/JFileChooser/8010718/bug8010718.java diff --git a/jdk/test/javax/swing/JFileChooser/8013442/Test8013442.java b/test/jdk/javax/swing/JFileChooser/8013442/Test8013442.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8013442/Test8013442.java rename to test/jdk/javax/swing/JFileChooser/8013442/Test8013442.java diff --git a/jdk/test/javax/swing/JFileChooser/8016665/JFileChooserOrientation.java b/test/jdk/javax/swing/JFileChooser/8016665/JFileChooserOrientation.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8016665/JFileChooserOrientation.java rename to test/jdk/javax/swing/JFileChooser/8016665/JFileChooserOrientation.java diff --git a/jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java b/test/jdk/javax/swing/JFileChooser/8021253/bug8021253.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java rename to test/jdk/javax/swing/JFileChooser/8021253/bug8021253.java diff --git a/jdk/test/javax/swing/JFileChooser/8041694/bug8041694.java b/test/jdk/javax/swing/JFileChooser/8041694/bug8041694.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8041694/bug8041694.java rename to test/jdk/javax/swing/JFileChooser/8041694/bug8041694.java diff --git a/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java b/test/jdk/javax/swing/JFileChooser/8046391/bug8046391.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java rename to test/jdk/javax/swing/JFileChooser/8046391/bug8046391.java diff --git a/jdk/test/javax/swing/JFileChooser/8062561/bug8062561.java b/test/jdk/javax/swing/JFileChooser/8062561/bug8062561.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8062561/bug8062561.java rename to test/jdk/javax/swing/JFileChooser/8062561/bug8062561.java diff --git a/jdk/test/javax/swing/JFileChooser/8062561/security.policy b/test/jdk/javax/swing/JFileChooser/8062561/security.policy similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8062561/security.policy rename to test/jdk/javax/swing/JFileChooser/8062561/security.policy diff --git a/jdk/test/javax/swing/JFileChooser/8062561/security2.policy b/test/jdk/javax/swing/JFileChooser/8062561/security2.policy similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8062561/security2.policy rename to test/jdk/javax/swing/JFileChooser/8062561/security2.policy diff --git a/jdk/test/javax/swing/JFileChooser/8067660/FileChooserTest.java b/test/jdk/javax/swing/JFileChooser/8067660/FileChooserTest.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8067660/FileChooserTest.java rename to test/jdk/javax/swing/JFileChooser/8067660/FileChooserTest.java diff --git a/jdk/test/javax/swing/JFileChooser/8080628/bug8080628.java b/test/jdk/javax/swing/JFileChooser/8080628/bug8080628.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8080628/bug8080628.java rename to test/jdk/javax/swing/JFileChooser/8080628/bug8080628.java diff --git a/jdk/test/javax/swing/JFileChooser/8152677/SelectAllFilesFilterTest.java b/test/jdk/javax/swing/JFileChooser/8152677/SelectAllFilesFilterTest.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/8152677/SelectAllFilesFilterTest.java rename to test/jdk/javax/swing/JFileChooser/8152677/SelectAllFilesFilterTest.java diff --git a/jdk/test/javax/swing/JFileChooser/DeserializedJFileChooser/DeserializedJFileChooserTest.java b/test/jdk/javax/swing/JFileChooser/DeserializedJFileChooser/DeserializedJFileChooserTest.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/DeserializedJFileChooser/DeserializedJFileChooserTest.java rename to test/jdk/javax/swing/JFileChooser/DeserializedJFileChooser/DeserializedJFileChooserTest.java diff --git a/jdk/test/javax/swing/JFileChooser/FileFilterDescription/FileFilterDescription.html b/test/jdk/javax/swing/JFileChooser/FileFilterDescription/FileFilterDescription.html similarity index 100% rename from jdk/test/javax/swing/JFileChooser/FileFilterDescription/FileFilterDescription.html rename to test/jdk/javax/swing/JFileChooser/FileFilterDescription/FileFilterDescription.html diff --git a/jdk/test/javax/swing/JFileChooser/FileFilterDescription/FileFilterDescription.java b/test/jdk/javax/swing/JFileChooser/FileFilterDescription/FileFilterDescription.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/FileFilterDescription/FileFilterDescription.java rename to test/jdk/javax/swing/JFileChooser/FileFilterDescription/FileFilterDescription.java diff --git a/jdk/test/javax/swing/JFileChooser/GodMode/JFileChooserTest.java b/test/jdk/javax/swing/JFileChooser/GodMode/JFileChooserTest.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/GodMode/JFileChooserTest.java rename to test/jdk/javax/swing/JFileChooser/GodMode/JFileChooserTest.java diff --git a/jdk/test/javax/swing/JFileChooser/ShellFolderQueries/ShellFolderQueriesTest.java b/test/jdk/javax/swing/JFileChooser/ShellFolderQueries/ShellFolderQueriesTest.java similarity index 100% rename from jdk/test/javax/swing/JFileChooser/ShellFolderQueries/ShellFolderQueriesTest.java rename to test/jdk/javax/swing/JFileChooser/ShellFolderQueries/ShellFolderQueriesTest.java diff --git a/jdk/test/javax/swing/JFormattedTextField/7070795/JFormattedTextFieldTest.java b/test/jdk/javax/swing/JFormattedTextField/7070795/JFormattedTextFieldTest.java similarity index 100% rename from jdk/test/javax/swing/JFormattedTextField/7070795/JFormattedTextFieldTest.java rename to test/jdk/javax/swing/JFormattedTextField/7070795/JFormattedTextFieldTest.java diff --git a/jdk/test/javax/swing/JFormattedTextField/8080972/TestDefaultFormatter.java b/test/jdk/javax/swing/JFormattedTextField/8080972/TestDefaultFormatter.java similarity index 100% rename from jdk/test/javax/swing/JFormattedTextField/8080972/TestDefaultFormatter.java rename to test/jdk/javax/swing/JFormattedTextField/8080972/TestDefaultFormatter.java diff --git a/jdk/test/javax/swing/JFormattedTextField/Test6462562.java b/test/jdk/javax/swing/JFormattedTextField/Test6462562.java similarity index 100% rename from jdk/test/javax/swing/JFormattedTextField/Test6462562.java rename to test/jdk/javax/swing/JFormattedTextField/Test6462562.java diff --git a/jdk/test/javax/swing/JFrame/4962534/bug4962534.html b/test/jdk/javax/swing/JFrame/4962534/bug4962534.html similarity index 100% rename from jdk/test/javax/swing/JFrame/4962534/bug4962534.html rename to test/jdk/javax/swing/JFrame/4962534/bug4962534.html diff --git a/jdk/test/javax/swing/JFrame/4962534/bug4962534.java b/test/jdk/javax/swing/JFrame/4962534/bug4962534.java similarity index 100% rename from jdk/test/javax/swing/JFrame/4962534/bug4962534.java rename to test/jdk/javax/swing/JFrame/4962534/bug4962534.java diff --git a/jdk/test/javax/swing/JFrame/8016356/bug8016356.java b/test/jdk/javax/swing/JFrame/8016356/bug8016356.java similarity index 100% rename from jdk/test/javax/swing/JFrame/8016356/bug8016356.java rename to test/jdk/javax/swing/JFrame/8016356/bug8016356.java diff --git a/jdk/test/javax/swing/JFrame/8037575/bug8037575.java b/test/jdk/javax/swing/JFrame/8037575/bug8037575.java similarity index 100% rename from jdk/test/javax/swing/JFrame/8037575/bug8037575.java rename to test/jdk/javax/swing/JFrame/8037575/bug8037575.java diff --git a/jdk/test/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java b/test/jdk/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java similarity index 100% rename from jdk/test/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java rename to test/jdk/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java diff --git a/jdk/test/javax/swing/JFrame/AlwaysOnTop/AlwaysOnTopImeTest.java b/test/jdk/javax/swing/JFrame/AlwaysOnTop/AlwaysOnTopImeTest.java similarity index 100% rename from jdk/test/javax/swing/JFrame/AlwaysOnTop/AlwaysOnTopImeTest.java rename to test/jdk/javax/swing/JFrame/AlwaysOnTop/AlwaysOnTopImeTest.java diff --git a/jdk/test/javax/swing/JFrame/HangNonVolatileBuffer/HangNonVolatileBuffer.java b/test/jdk/javax/swing/JFrame/HangNonVolatileBuffer/HangNonVolatileBuffer.java similarity index 100% rename from jdk/test/javax/swing/JFrame/HangNonVolatileBuffer/HangNonVolatileBuffer.java rename to test/jdk/javax/swing/JFrame/HangNonVolatileBuffer/HangNonVolatileBuffer.java diff --git a/jdk/test/javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java b/test/jdk/javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java similarity index 100% rename from jdk/test/javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java rename to test/jdk/javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java diff --git a/jdk/test/javax/swing/JInternalFrame/4193219/IconCoord.java b/test/jdk/javax/swing/JInternalFrame/4193219/IconCoord.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/4193219/IconCoord.java rename to test/jdk/javax/swing/JInternalFrame/4193219/IconCoord.java diff --git a/jdk/test/javax/swing/JInternalFrame/4251301/bug4251301.java b/test/jdk/javax/swing/JInternalFrame/4251301/bug4251301.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/4251301/bug4251301.java rename to test/jdk/javax/swing/JInternalFrame/4251301/bug4251301.java diff --git a/jdk/test/javax/swing/JInternalFrame/4769772/TestJInternalFrameIconify.java b/test/jdk/javax/swing/JInternalFrame/4769772/TestJInternalFrameIconify.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/4769772/TestJInternalFrameIconify.java rename to test/jdk/javax/swing/JInternalFrame/4769772/TestJInternalFrameIconify.java diff --git a/jdk/test/javax/swing/JInternalFrame/5066752/bug5066752.java b/test/jdk/javax/swing/JInternalFrame/5066752/bug5066752.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/5066752/bug5066752.java rename to test/jdk/javax/swing/JInternalFrame/5066752/bug5066752.java diff --git a/jdk/test/javax/swing/JInternalFrame/6288609/TestJInternalFrameDispose.java b/test/jdk/javax/swing/JInternalFrame/6288609/TestJInternalFrameDispose.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/6288609/TestJInternalFrameDispose.java rename to test/jdk/javax/swing/JInternalFrame/6288609/TestJInternalFrameDispose.java diff --git a/jdk/test/javax/swing/JInternalFrame/6647340/bug6647340.java b/test/jdk/javax/swing/JInternalFrame/6647340/bug6647340.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/6647340/bug6647340.java rename to test/jdk/javax/swing/JInternalFrame/6647340/bug6647340.java diff --git a/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java b/test/jdk/javax/swing/JInternalFrame/6725409/bug6725409.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java rename to test/jdk/javax/swing/JInternalFrame/6725409/bug6725409.java diff --git a/jdk/test/javax/swing/JInternalFrame/6726866/bug6726866.html b/test/jdk/javax/swing/JInternalFrame/6726866/bug6726866.html similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/6726866/bug6726866.html rename to test/jdk/javax/swing/JInternalFrame/6726866/bug6726866.html diff --git a/jdk/test/javax/swing/JInternalFrame/6726866/bug6726866.java b/test/jdk/javax/swing/JInternalFrame/6726866/bug6726866.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/6726866/bug6726866.java rename to test/jdk/javax/swing/JInternalFrame/6726866/bug6726866.java diff --git a/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java b/test/jdk/javax/swing/JInternalFrame/8020708/bug8020708.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java rename to test/jdk/javax/swing/JInternalFrame/8020708/bug8020708.java diff --git a/jdk/test/javax/swing/JInternalFrame/8069348/bug8069348.java b/test/jdk/javax/swing/JInternalFrame/8069348/bug8069348.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/8069348/bug8069348.java rename to test/jdk/javax/swing/JInternalFrame/8069348/bug8069348.java diff --git a/jdk/test/javax/swing/JInternalFrame/8075314/bug8075314.java b/test/jdk/javax/swing/JInternalFrame/8075314/bug8075314.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/8075314/bug8075314.java rename to test/jdk/javax/swing/JInternalFrame/8075314/bug8075314.java diff --git a/jdk/test/javax/swing/JInternalFrame/8145060/TestJInternalFrameMinimize.java b/test/jdk/javax/swing/JInternalFrame/8145060/TestJInternalFrameMinimize.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/8145060/TestJInternalFrameMinimize.java rename to test/jdk/javax/swing/JInternalFrame/8145060/TestJInternalFrameMinimize.java diff --git a/jdk/test/javax/swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java b/test/jdk/javax/swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java rename to test/jdk/javax/swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java diff --git a/jdk/test/javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java b/test/jdk/javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java rename to test/jdk/javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java diff --git a/jdk/test/javax/swing/JInternalFrame/8160248/JInternalFrameDraggingTest.java b/test/jdk/javax/swing/JInternalFrame/8160248/JInternalFrameDraggingTest.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/8160248/JInternalFrameDraggingTest.java rename to test/jdk/javax/swing/JInternalFrame/8160248/JInternalFrameDraggingTest.java diff --git a/jdk/test/javax/swing/JInternalFrame/DockIconRepaint/DockIconRepaint.java b/test/jdk/javax/swing/JInternalFrame/DockIconRepaint/DockIconRepaint.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/DockIconRepaint/DockIconRepaint.java rename to test/jdk/javax/swing/JInternalFrame/DockIconRepaint/DockIconRepaint.java diff --git a/jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java b/test/jdk/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java rename to test/jdk/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java diff --git a/jdk/test/javax/swing/JInternalFrame/NormalBoundsTest.java b/test/jdk/javax/swing/JInternalFrame/NormalBoundsTest.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/NormalBoundsTest.java rename to test/jdk/javax/swing/JInternalFrame/NormalBoundsTest.java diff --git a/jdk/test/javax/swing/JInternalFrame/SetLayerNPE/SetLayerNPE.java b/test/jdk/javax/swing/JInternalFrame/SetLayerNPE/SetLayerNPE.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/SetLayerNPE/SetLayerNPE.java rename to test/jdk/javax/swing/JInternalFrame/SetLayerNPE/SetLayerNPE.java diff --git a/jdk/test/javax/swing/JInternalFrame/Test6325652.java b/test/jdk/javax/swing/JInternalFrame/Test6325652.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/Test6325652.java rename to test/jdk/javax/swing/JInternalFrame/Test6325652.java diff --git a/jdk/test/javax/swing/JInternalFrame/Test6505027.java b/test/jdk/javax/swing/JInternalFrame/Test6505027.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/Test6505027.java rename to test/jdk/javax/swing/JInternalFrame/Test6505027.java diff --git a/jdk/test/javax/swing/JInternalFrame/Test6802868.java b/test/jdk/javax/swing/JInternalFrame/Test6802868.java similarity index 100% rename from jdk/test/javax/swing/JInternalFrame/Test6802868.java rename to test/jdk/javax/swing/JInternalFrame/Test6802868.java diff --git a/jdk/test/javax/swing/JLabel/6501991/bug6501991.java b/test/jdk/javax/swing/JLabel/6501991/bug6501991.java similarity index 100% rename from jdk/test/javax/swing/JLabel/6501991/bug6501991.java rename to test/jdk/javax/swing/JLabel/6501991/bug6501991.java diff --git a/jdk/test/javax/swing/JLabel/6596966/bug6596966.java b/test/jdk/javax/swing/JLabel/6596966/bug6596966.java similarity index 100% rename from jdk/test/javax/swing/JLabel/6596966/bug6596966.java rename to test/jdk/javax/swing/JLabel/6596966/bug6596966.java diff --git a/jdk/test/javax/swing/JLabel/7004134/bug7004134.java b/test/jdk/javax/swing/JLabel/7004134/bug7004134.java similarity index 100% rename from jdk/test/javax/swing/JLabel/7004134/bug7004134.java rename to test/jdk/javax/swing/JLabel/7004134/bug7004134.java diff --git a/jdk/test/javax/swing/JLayer/6824395/bug6824395.java b/test/jdk/javax/swing/JLayer/6824395/bug6824395.java similarity index 100% rename from jdk/test/javax/swing/JLayer/6824395/bug6824395.java rename to test/jdk/javax/swing/JLayer/6824395/bug6824395.java diff --git a/jdk/test/javax/swing/JLayer/6872503/bug6872503.java b/test/jdk/javax/swing/JLayer/6872503/bug6872503.java similarity index 100% rename from jdk/test/javax/swing/JLayer/6872503/bug6872503.java rename to test/jdk/javax/swing/JLayer/6872503/bug6872503.java diff --git a/jdk/test/javax/swing/JLayer/6875153/bug6875153.java b/test/jdk/javax/swing/JLayer/6875153/bug6875153.java similarity index 100% rename from jdk/test/javax/swing/JLayer/6875153/bug6875153.java rename to test/jdk/javax/swing/JLayer/6875153/bug6875153.java diff --git a/jdk/test/javax/swing/JLayer/6875716/bug6875716.java b/test/jdk/javax/swing/JLayer/6875716/bug6875716.java similarity index 100% rename from jdk/test/javax/swing/JLayer/6875716/bug6875716.java rename to test/jdk/javax/swing/JLayer/6875716/bug6875716.java diff --git a/jdk/test/javax/swing/JLayer/6994419/bug6994419.java b/test/jdk/javax/swing/JLayer/6994419/bug6994419.java similarity index 100% rename from jdk/test/javax/swing/JLayer/6994419/bug6994419.java rename to test/jdk/javax/swing/JLayer/6994419/bug6994419.java diff --git a/jdk/test/javax/swing/JLayer/8041982/bug8041982.java b/test/jdk/javax/swing/JLayer/8041982/bug8041982.java similarity index 100% rename from jdk/test/javax/swing/JLayer/8041982/bug8041982.java rename to test/jdk/javax/swing/JLayer/8041982/bug8041982.java diff --git a/jdk/test/javax/swing/JLayer/8041982/cupanim.gif b/test/jdk/javax/swing/JLayer/8041982/cupanim.gif similarity index 100% rename from jdk/test/javax/swing/JLayer/8041982/cupanim.gif rename to test/jdk/javax/swing/JLayer/8041982/cupanim.gif diff --git a/jdk/test/javax/swing/JLayer/8054543/bug8054543.java b/test/jdk/javax/swing/JLayer/8054543/bug8054543.java similarity index 100% rename from jdk/test/javax/swing/JLayer/8054543/bug8054543.java rename to test/jdk/javax/swing/JLayer/8054543/bug8054543.java diff --git a/jdk/test/javax/swing/JLayer/SerializationTest/SerializationTest.java b/test/jdk/javax/swing/JLayer/SerializationTest/SerializationTest.java similarity index 100% rename from jdk/test/javax/swing/JLayer/SerializationTest/SerializationTest.java rename to test/jdk/javax/swing/JLayer/SerializationTest/SerializationTest.java diff --git a/jdk/test/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java b/test/jdk/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java similarity index 100% rename from jdk/test/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java rename to test/jdk/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java diff --git a/jdk/test/javax/swing/JList/6462008/bug6462008.java b/test/jdk/javax/swing/JList/6462008/bug6462008.java similarity index 100% rename from jdk/test/javax/swing/JList/6462008/bug6462008.java rename to test/jdk/javax/swing/JList/6462008/bug6462008.java diff --git a/jdk/test/javax/swing/JList/6510999/bug6510999.java b/test/jdk/javax/swing/JList/6510999/bug6510999.java similarity index 100% rename from jdk/test/javax/swing/JList/6510999/bug6510999.java rename to test/jdk/javax/swing/JList/6510999/bug6510999.java diff --git a/jdk/test/javax/swing/JList/6567433/UpdateUIRecursionTest.java b/test/jdk/javax/swing/JList/6567433/UpdateUIRecursionTest.java similarity index 100% rename from jdk/test/javax/swing/JList/6567433/UpdateUIRecursionTest.java rename to test/jdk/javax/swing/JList/6567433/UpdateUIRecursionTest.java diff --git a/jdk/test/javax/swing/JList/6823603/bug6823603.java b/test/jdk/javax/swing/JList/6823603/bug6823603.java similarity index 100% rename from jdk/test/javax/swing/JList/6823603/bug6823603.java rename to test/jdk/javax/swing/JList/6823603/bug6823603.java diff --git a/jdk/test/javax/swing/JList/8161483/Bug8161483.java b/test/jdk/javax/swing/JList/8161483/Bug8161483.java similarity index 100% rename from jdk/test/javax/swing/JList/8161483/Bug8161483.java rename to test/jdk/javax/swing/JList/8161483/Bug8161483.java diff --git a/jdk/test/javax/swing/JMenu/4213634/bug4213634.java b/test/jdk/javax/swing/JMenu/4213634/bug4213634.java similarity index 100% rename from jdk/test/javax/swing/JMenu/4213634/bug4213634.java rename to test/jdk/javax/swing/JMenu/4213634/bug4213634.java diff --git a/jdk/test/javax/swing/JMenu/4417601/bug4417601.java b/test/jdk/javax/swing/JMenu/4417601/bug4417601.java similarity index 100% rename from jdk/test/javax/swing/JMenu/4417601/bug4417601.java rename to test/jdk/javax/swing/JMenu/4417601/bug4417601.java diff --git a/jdk/test/javax/swing/JMenu/4515762/bug4515762.java b/test/jdk/javax/swing/JMenu/4515762/bug4515762.java similarity index 100% rename from jdk/test/javax/swing/JMenu/4515762/bug4515762.java rename to test/jdk/javax/swing/JMenu/4515762/bug4515762.java diff --git a/jdk/test/javax/swing/JMenu/4692443/bug4692443.java b/test/jdk/javax/swing/JMenu/4692443/bug4692443.java similarity index 100% rename from jdk/test/javax/swing/JMenu/4692443/bug4692443.java rename to test/jdk/javax/swing/JMenu/4692443/bug4692443.java diff --git a/jdk/test/javax/swing/JMenu/6359669/bug6359669.java b/test/jdk/javax/swing/JMenu/6359669/bug6359669.java similarity index 100% rename from jdk/test/javax/swing/JMenu/6359669/bug6359669.java rename to test/jdk/javax/swing/JMenu/6359669/bug6359669.java diff --git a/jdk/test/javax/swing/JMenu/6470128/bug6470128.java b/test/jdk/javax/swing/JMenu/6470128/bug6470128.java similarity index 100% rename from jdk/test/javax/swing/JMenu/6470128/bug6470128.java rename to test/jdk/javax/swing/JMenu/6470128/bug6470128.java diff --git a/jdk/test/javax/swing/JMenu/6538132/bug6538132.java b/test/jdk/javax/swing/JMenu/6538132/bug6538132.java similarity index 100% rename from jdk/test/javax/swing/JMenu/6538132/bug6538132.java rename to test/jdk/javax/swing/JMenu/6538132/bug6538132.java diff --git a/jdk/test/javax/swing/JMenu/8067346/bug8067346.java b/test/jdk/javax/swing/JMenu/8067346/bug8067346.java similarity index 100% rename from jdk/test/javax/swing/JMenu/8067346/bug8067346.java rename to test/jdk/javax/swing/JMenu/8067346/bug8067346.java diff --git a/jdk/test/javax/swing/JMenu/8071705/bug8071705.java b/test/jdk/javax/swing/JMenu/8071705/bug8071705.java similarity index 100% rename from jdk/test/javax/swing/JMenu/8071705/bug8071705.java rename to test/jdk/javax/swing/JMenu/8071705/bug8071705.java diff --git a/jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java b/test/jdk/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java similarity index 100% rename from jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java rename to test/jdk/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java diff --git a/jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java b/test/jdk/javax/swing/JMenuBar/4750590/bug4750590.java similarity index 100% rename from jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java rename to test/jdk/javax/swing/JMenuBar/4750590/bug4750590.java diff --git a/jdk/test/javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java b/test/jdk/javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java similarity index 100% rename from jdk/test/javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java rename to test/jdk/javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java diff --git a/jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java b/test/jdk/javax/swing/JMenuItem/4171437/bug4171437.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java rename to test/jdk/javax/swing/JMenuItem/4171437/bug4171437.java diff --git a/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java b/test/jdk/javax/swing/JMenuItem/4654927/bug4654927.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java rename to test/jdk/javax/swing/JMenuItem/4654927/bug4654927.java diff --git a/jdk/test/javax/swing/JMenuItem/6209975/bug6209975.java b/test/jdk/javax/swing/JMenuItem/6209975/bug6209975.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/6209975/bug6209975.java rename to test/jdk/javax/swing/JMenuItem/6209975/bug6209975.java diff --git a/jdk/test/javax/swing/JMenuItem/6249972/bug6249972.java b/test/jdk/javax/swing/JMenuItem/6249972/bug6249972.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/6249972/bug6249972.java rename to test/jdk/javax/swing/JMenuItem/6249972/bug6249972.java diff --git a/jdk/test/javax/swing/JMenuItem/6438430/bug6438430.java b/test/jdk/javax/swing/JMenuItem/6438430/bug6438430.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/6438430/bug6438430.java rename to test/jdk/javax/swing/JMenuItem/6438430/bug6438430.java diff --git a/jdk/test/javax/swing/JMenuItem/6883341/bug6883341.java b/test/jdk/javax/swing/JMenuItem/6883341/bug6883341.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/6883341/bug6883341.java rename to test/jdk/javax/swing/JMenuItem/6883341/bug6883341.java diff --git a/jdk/test/javax/swing/JMenuItem/7036148/bug7036148.java b/test/jdk/javax/swing/JMenuItem/7036148/bug7036148.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/7036148/bug7036148.java rename to test/jdk/javax/swing/JMenuItem/7036148/bug7036148.java diff --git a/jdk/test/javax/swing/JMenuItem/8031573/bug8031573.html b/test/jdk/javax/swing/JMenuItem/8031573/bug8031573.html similarity index 100% rename from jdk/test/javax/swing/JMenuItem/8031573/bug8031573.html rename to test/jdk/javax/swing/JMenuItem/8031573/bug8031573.html diff --git a/jdk/test/javax/swing/JMenuItem/8031573/bug8031573.java b/test/jdk/javax/swing/JMenuItem/8031573/bug8031573.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/8031573/bug8031573.java rename to test/jdk/javax/swing/JMenuItem/8031573/bug8031573.java diff --git a/jdk/test/javax/swing/JMenuItem/8139169/ScreenMenuBarInputTwice.java b/test/jdk/javax/swing/JMenuItem/8139169/ScreenMenuBarInputTwice.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/8139169/ScreenMenuBarInputTwice.java rename to test/jdk/javax/swing/JMenuItem/8139169/ScreenMenuBarInputTwice.java diff --git a/jdk/test/javax/swing/JMenuItem/8152981/MenuItemIconTest.java b/test/jdk/javax/swing/JMenuItem/8152981/MenuItemIconTest.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/8152981/MenuItemIconTest.java rename to test/jdk/javax/swing/JMenuItem/8152981/MenuItemIconTest.java diff --git a/jdk/test/javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java b/test/jdk/javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java rename to test/jdk/javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java diff --git a/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java b/test/jdk/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java rename to test/jdk/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java diff --git a/jdk/test/javax/swing/JMenuItem/ClickMenuTestManual/ClickMenuTestManual.java b/test/jdk/javax/swing/JMenuItem/ClickMenuTestManual/ClickMenuTestManual.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/ClickMenuTestManual/ClickMenuTestManual.java rename to test/jdk/javax/swing/JMenuItem/ClickMenuTestManual/ClickMenuTestManual.java diff --git a/jdk/test/javax/swing/JMenuItem/ShortcutNotDiplayed/ShortcutNotDisplayedTest.java b/test/jdk/javax/swing/JMenuItem/ShortcutNotDiplayed/ShortcutNotDisplayedTest.java similarity index 100% rename from jdk/test/javax/swing/JMenuItem/ShortcutNotDiplayed/ShortcutNotDisplayedTest.java rename to test/jdk/javax/swing/JMenuItem/ShortcutNotDiplayed/ShortcutNotDisplayedTest.java diff --git a/jdk/test/javax/swing/JOptionPane/4174551/bug4174551.html b/test/jdk/javax/swing/JOptionPane/4174551/bug4174551.html similarity index 100% rename from jdk/test/javax/swing/JOptionPane/4174551/bug4174551.html rename to test/jdk/javax/swing/JOptionPane/4174551/bug4174551.html diff --git a/jdk/test/javax/swing/JOptionPane/4174551/bug4174551.java b/test/jdk/javax/swing/JOptionPane/4174551/bug4174551.java similarity index 100% rename from jdk/test/javax/swing/JOptionPane/4174551/bug4174551.java rename to test/jdk/javax/swing/JOptionPane/4174551/bug4174551.java diff --git a/jdk/test/javax/swing/JOptionPane/6428694/bug6428694.java b/test/jdk/javax/swing/JOptionPane/6428694/bug6428694.java similarity index 100% rename from jdk/test/javax/swing/JOptionPane/6428694/bug6428694.java rename to test/jdk/javax/swing/JOptionPane/6428694/bug6428694.java diff --git a/jdk/test/javax/swing/JOptionPane/6464022/bug6464022.java b/test/jdk/javax/swing/JOptionPane/6464022/bug6464022.java similarity index 100% rename from jdk/test/javax/swing/JOptionPane/6464022/bug6464022.java rename to test/jdk/javax/swing/JOptionPane/6464022/bug6464022.java diff --git a/jdk/test/javax/swing/JOptionPane/7042497/JOptionPaneConfirmDlgTest.java b/test/jdk/javax/swing/JOptionPane/7042497/JOptionPaneConfirmDlgTest.java similarity index 100% rename from jdk/test/javax/swing/JOptionPane/7042497/JOptionPaneConfirmDlgTest.java rename to test/jdk/javax/swing/JOptionPane/7042497/JOptionPaneConfirmDlgTest.java diff --git a/jdk/test/javax/swing/JOptionPane/7138665/bug7138665.java b/test/jdk/javax/swing/JOptionPane/7138665/bug7138665.java similarity index 100% rename from jdk/test/javax/swing/JOptionPane/7138665/bug7138665.java rename to test/jdk/javax/swing/JOptionPane/7138665/bug7138665.java diff --git a/jdk/test/javax/swing/JOptionPane/8024926/bug8024926.html b/test/jdk/javax/swing/JOptionPane/8024926/bug8024926.html similarity index 100% rename from jdk/test/javax/swing/JOptionPane/8024926/bug8024926.html rename to test/jdk/javax/swing/JOptionPane/8024926/bug8024926.html diff --git a/jdk/test/javax/swing/JOptionPane/8024926/bug8024926.java b/test/jdk/javax/swing/JOptionPane/8024926/bug8024926.java similarity index 100% rename from jdk/test/javax/swing/JOptionPane/8024926/bug8024926.java rename to test/jdk/javax/swing/JOptionPane/8024926/bug8024926.java diff --git a/jdk/test/javax/swing/JOptionPane/8081019/bug8081019.java b/test/jdk/javax/swing/JOptionPane/8081019/bug8081019.java similarity index 100% rename from jdk/test/javax/swing/JOptionPane/8081019/bug8081019.java rename to test/jdk/javax/swing/JOptionPane/8081019/bug8081019.java diff --git a/jdk/test/javax/swing/JOptionPane/8139213/OptionPaneTest.java b/test/jdk/javax/swing/JOptionPane/8139213/OptionPaneTest.java similarity index 100% rename from jdk/test/javax/swing/JOptionPane/8139213/OptionPaneTest.java rename to test/jdk/javax/swing/JOptionPane/8139213/OptionPaneTest.java diff --git a/jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java b/test/jdk/javax/swing/JPopupMenu/4458079/bug4458079.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java rename to test/jdk/javax/swing/JPopupMenu/4458079/bug4458079.java diff --git a/jdk/test/javax/swing/JPopupMenu/4634626/bug4634626.html b/test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.html similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/4634626/bug4634626.html rename to test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.html diff --git a/jdk/test/javax/swing/JPopupMenu/4634626/bug4634626.java b/test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/4634626/bug4634626.java rename to test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.java diff --git a/jdk/test/javax/swing/JPopupMenu/4870644/bug4870644.java b/test/jdk/javax/swing/JPopupMenu/4870644/bug4870644.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/4870644/bug4870644.java rename to test/jdk/javax/swing/JPopupMenu/4870644/bug4870644.java diff --git a/jdk/test/javax/swing/JPopupMenu/4966112/bug4966112.java b/test/jdk/javax/swing/JPopupMenu/4966112/bug4966112.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/4966112/bug4966112.java rename to test/jdk/javax/swing/JPopupMenu/4966112/bug4966112.java diff --git a/jdk/test/javax/swing/JPopupMenu/6217905/bug6217905.java b/test/jdk/javax/swing/JPopupMenu/6217905/bug6217905.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6217905/bug6217905.java rename to test/jdk/javax/swing/JPopupMenu/6217905/bug6217905.java diff --git a/jdk/test/javax/swing/JPopupMenu/6415145/bug6415145.java b/test/jdk/javax/swing/JPopupMenu/6415145/bug6415145.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6415145/bug6415145.java rename to test/jdk/javax/swing/JPopupMenu/6415145/bug6415145.java diff --git a/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java b/test/jdk/javax/swing/JPopupMenu/6495920/bug6495920.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java rename to test/jdk/javax/swing/JPopupMenu/6495920/bug6495920.java diff --git a/jdk/test/javax/swing/JPopupMenu/6515446/bug6515446.java b/test/jdk/javax/swing/JPopupMenu/6515446/bug6515446.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6515446/bug6515446.java rename to test/jdk/javax/swing/JPopupMenu/6515446/bug6515446.java diff --git a/jdk/test/javax/swing/JPopupMenu/6544309/bug6544309.java b/test/jdk/javax/swing/JPopupMenu/6544309/bug6544309.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6544309/bug6544309.java rename to test/jdk/javax/swing/JPopupMenu/6544309/bug6544309.java diff --git a/jdk/test/javax/swing/JPopupMenu/6580930/bug6580930.java b/test/jdk/javax/swing/JPopupMenu/6580930/bug6580930.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6580930/bug6580930.java rename to test/jdk/javax/swing/JPopupMenu/6580930/bug6580930.java diff --git a/jdk/test/javax/swing/JPopupMenu/6583251/bug6583251.java b/test/jdk/javax/swing/JPopupMenu/6583251/bug6583251.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6583251/bug6583251.java rename to test/jdk/javax/swing/JPopupMenu/6583251/bug6583251.java diff --git a/jdk/test/javax/swing/JPopupMenu/6675802/bug6675802.java b/test/jdk/javax/swing/JPopupMenu/6675802/bug6675802.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6675802/bug6675802.java rename to test/jdk/javax/swing/JPopupMenu/6675802/bug6675802.java diff --git a/jdk/test/javax/swing/JPopupMenu/6690791/bug6690791.java b/test/jdk/javax/swing/JPopupMenu/6690791/bug6690791.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6690791/bug6690791.java rename to test/jdk/javax/swing/JPopupMenu/6690791/bug6690791.java diff --git a/jdk/test/javax/swing/JPopupMenu/6691503/bug6691503.java b/test/jdk/javax/swing/JPopupMenu/6691503/bug6691503.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6691503/bug6691503.java rename to test/jdk/javax/swing/JPopupMenu/6691503/bug6691503.java diff --git a/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java b/test/jdk/javax/swing/JPopupMenu/6694823/bug6694823.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java rename to test/jdk/javax/swing/JPopupMenu/6694823/bug6694823.java diff --git a/jdk/test/javax/swing/JPopupMenu/6800513/bug6800513.java b/test/jdk/javax/swing/JPopupMenu/6800513/bug6800513.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6800513/bug6800513.java rename to test/jdk/javax/swing/JPopupMenu/6800513/bug6800513.java diff --git a/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java b/test/jdk/javax/swing/JPopupMenu/6827786/bug6827786.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java rename to test/jdk/javax/swing/JPopupMenu/6827786/bug6827786.java diff --git a/jdk/test/javax/swing/JPopupMenu/6949414/JPopupMenuEndlessLoopTest.java b/test/jdk/javax/swing/JPopupMenu/6949414/JPopupMenuEndlessLoopTest.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6949414/JPopupMenuEndlessLoopTest.java rename to test/jdk/javax/swing/JPopupMenu/6949414/JPopupMenuEndlessLoopTest.java diff --git a/jdk/test/javax/swing/JPopupMenu/6987844/bug6987844.java b/test/jdk/javax/swing/JPopupMenu/6987844/bug6987844.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/6987844/bug6987844.java rename to test/jdk/javax/swing/JPopupMenu/6987844/bug6987844.java diff --git a/jdk/test/javax/swing/JPopupMenu/7154841/bug7154841.java b/test/jdk/javax/swing/JPopupMenu/7154841/bug7154841.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/7154841/bug7154841.java rename to test/jdk/javax/swing/JPopupMenu/7154841/bug7154841.java diff --git a/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java b/test/jdk/javax/swing/JPopupMenu/7156657/bug7156657.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java rename to test/jdk/javax/swing/JPopupMenu/7156657/bug7156657.java diff --git a/jdk/test/javax/swing/JPopupMenu/7160604/bug7160604.html b/test/jdk/javax/swing/JPopupMenu/7160604/bug7160604.html similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/7160604/bug7160604.html rename to test/jdk/javax/swing/JPopupMenu/7160604/bug7160604.html diff --git a/jdk/test/javax/swing/JPopupMenu/7160604/bug7160604.java b/test/jdk/javax/swing/JPopupMenu/7160604/bug7160604.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/7160604/bug7160604.java rename to test/jdk/javax/swing/JPopupMenu/7160604/bug7160604.java diff --git a/jdk/test/javax/swing/JPopupMenu/8075063/ContextMenuScrollTest.java b/test/jdk/javax/swing/JPopupMenu/8075063/ContextMenuScrollTest.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/8075063/ContextMenuScrollTest.java rename to test/jdk/javax/swing/JPopupMenu/8075063/ContextMenuScrollTest.java diff --git a/jdk/test/javax/swing/JPopupMenu/8147521/PopupMenuTest.java b/test/jdk/javax/swing/JPopupMenu/8147521/PopupMenuTest.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/8147521/PopupMenuTest.java rename to test/jdk/javax/swing/JPopupMenu/8147521/PopupMenuTest.java diff --git a/jdk/test/javax/swing/JPopupMenu/8173739/TestPopupMenu.java b/test/jdk/javax/swing/JPopupMenu/8173739/TestPopupMenu.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/8173739/TestPopupMenu.java rename to test/jdk/javax/swing/JPopupMenu/8173739/TestPopupMenu.java diff --git a/jdk/test/javax/swing/JPopupMenu/Separator/6547087/bug6547087.java b/test/jdk/javax/swing/JPopupMenu/Separator/6547087/bug6547087.java similarity index 100% rename from jdk/test/javax/swing/JPopupMenu/Separator/6547087/bug6547087.java rename to test/jdk/javax/swing/JPopupMenu/Separator/6547087/bug6547087.java diff --git a/jdk/test/javax/swing/JProgressBar/7141573/bug7141573.java b/test/jdk/javax/swing/JProgressBar/7141573/bug7141573.java similarity index 100% rename from jdk/test/javax/swing/JProgressBar/7141573/bug7141573.java rename to test/jdk/javax/swing/JProgressBar/7141573/bug7141573.java diff --git a/jdk/test/javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java b/test/jdk/javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java similarity index 100% rename from jdk/test/javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java rename to test/jdk/javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java diff --git a/jdk/test/javax/swing/JProgressBar/8161664/ProgressBarMemoryLeakTest.java b/test/jdk/javax/swing/JProgressBar/8161664/ProgressBarMemoryLeakTest.java similarity index 100% rename from jdk/test/javax/swing/JProgressBar/8161664/ProgressBarMemoryLeakTest.java rename to test/jdk/javax/swing/JProgressBar/8161664/ProgressBarMemoryLeakTest.java diff --git a/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java b/test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java similarity index 100% rename from jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java rename to test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java diff --git a/jdk/test/javax/swing/JRadioButton/8041561/bug8041561.java b/test/jdk/javax/swing/JRadioButton/8041561/bug8041561.java similarity index 100% rename from jdk/test/javax/swing/JRadioButton/8041561/bug8041561.java rename to test/jdk/javax/swing/JRadioButton/8041561/bug8041561.java diff --git a/jdk/test/javax/swing/JRadioButton/8075609/bug8075609.java b/test/jdk/javax/swing/JRadioButton/8075609/bug8075609.java similarity index 100% rename from jdk/test/javax/swing/JRadioButton/8075609/bug8075609.java rename to test/jdk/javax/swing/JRadioButton/8075609/bug8075609.java diff --git a/jdk/test/javax/swing/JRadioButton/ButtonGroupFocus/ButtonGroupFocusTest.java b/test/jdk/javax/swing/JRadioButton/ButtonGroupFocus/ButtonGroupFocusTest.java similarity index 100% rename from jdk/test/javax/swing/JRadioButton/ButtonGroupFocus/ButtonGroupFocusTest.java rename to test/jdk/javax/swing/JRadioButton/ButtonGroupFocus/ButtonGroupFocusTest.java diff --git a/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java b/test/jdk/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java similarity index 100% rename from jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java rename to test/jdk/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java diff --git a/jdk/test/javax/swing/JRootPane/4670486/bug4670486.java b/test/jdk/javax/swing/JRootPane/4670486/bug4670486.java similarity index 100% rename from jdk/test/javax/swing/JRootPane/4670486/bug4670486.java rename to test/jdk/javax/swing/JRootPane/4670486/bug4670486.java diff --git a/jdk/test/javax/swing/JRootPane/SilenceOfDeprecatedMenuBar/SilenceOfDeprecatedMenuBar.java b/test/jdk/javax/swing/JRootPane/SilenceOfDeprecatedMenuBar/SilenceOfDeprecatedMenuBar.java similarity index 100% rename from jdk/test/javax/swing/JRootPane/SilenceOfDeprecatedMenuBar/SilenceOfDeprecatedMenuBar.java rename to test/jdk/javax/swing/JRootPane/SilenceOfDeprecatedMenuBar/SilenceOfDeprecatedMenuBar.java diff --git a/jdk/test/javax/swing/JScrollBar/4708809/bug4708809.java b/test/jdk/javax/swing/JScrollBar/4708809/bug4708809.java similarity index 100% rename from jdk/test/javax/swing/JScrollBar/4708809/bug4708809.java rename to test/jdk/javax/swing/JScrollBar/4708809/bug4708809.java diff --git a/jdk/test/javax/swing/JScrollBar/4865918/bug4865918.java b/test/jdk/javax/swing/JScrollBar/4865918/bug4865918.java similarity index 100% rename from jdk/test/javax/swing/JScrollBar/4865918/bug4865918.java rename to test/jdk/javax/swing/JScrollBar/4865918/bug4865918.java diff --git a/jdk/test/javax/swing/JScrollBar/6542335/bug6542335.java b/test/jdk/javax/swing/JScrollBar/6542335/bug6542335.java similarity index 100% rename from jdk/test/javax/swing/JScrollBar/6542335/bug6542335.java rename to test/jdk/javax/swing/JScrollBar/6542335/bug6542335.java diff --git a/jdk/test/javax/swing/JScrollBar/6924059/bug6924059.java b/test/jdk/javax/swing/JScrollBar/6924059/bug6924059.java similarity index 100% rename from jdk/test/javax/swing/JScrollBar/6924059/bug6924059.java rename to test/jdk/javax/swing/JScrollBar/6924059/bug6924059.java diff --git a/jdk/test/javax/swing/JScrollBar/7163696/Test7163696.java b/test/jdk/javax/swing/JScrollBar/7163696/Test7163696.java similarity index 100% rename from jdk/test/javax/swing/JScrollBar/7163696/Test7163696.java rename to test/jdk/javax/swing/JScrollBar/7163696/Test7163696.java diff --git a/jdk/test/javax/swing/JScrollBar/8039464/Test8039464.html b/test/jdk/javax/swing/JScrollBar/8039464/Test8039464.html similarity index 100% rename from jdk/test/javax/swing/JScrollBar/8039464/Test8039464.html rename to test/jdk/javax/swing/JScrollBar/8039464/Test8039464.html diff --git a/jdk/test/javax/swing/JScrollBar/8039464/Test8039464.java b/test/jdk/javax/swing/JScrollBar/8039464/Test8039464.java similarity index 100% rename from jdk/test/javax/swing/JScrollBar/8039464/Test8039464.java rename to test/jdk/javax/swing/JScrollBar/8039464/Test8039464.java diff --git a/jdk/test/javax/swing/JScrollBar/bug4202954/bug4202954.java b/test/jdk/javax/swing/JScrollBar/bug4202954/bug4202954.java similarity index 100% rename from jdk/test/javax/swing/JScrollBar/bug4202954/bug4202954.java rename to test/jdk/javax/swing/JScrollBar/bug4202954/bug4202954.java diff --git a/jdk/test/javax/swing/JScrollPane/6274267/bug6274267.java b/test/jdk/javax/swing/JScrollPane/6274267/bug6274267.java similarity index 100% rename from jdk/test/javax/swing/JScrollPane/6274267/bug6274267.java rename to test/jdk/javax/swing/JScrollPane/6274267/bug6274267.java diff --git a/jdk/test/javax/swing/JScrollPane/6559589/bug6559589.java b/test/jdk/javax/swing/JScrollPane/6559589/bug6559589.java similarity index 100% rename from jdk/test/javax/swing/JScrollPane/6559589/bug6559589.java rename to test/jdk/javax/swing/JScrollPane/6559589/bug6559589.java diff --git a/jdk/test/javax/swing/JScrollPane/6612531/bug6612531.java b/test/jdk/javax/swing/JScrollPane/6612531/bug6612531.java similarity index 100% rename from jdk/test/javax/swing/JScrollPane/6612531/bug6612531.java rename to test/jdk/javax/swing/JScrollPane/6612531/bug6612531.java diff --git a/jdk/test/javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelOnShiftPressed.java b/test/jdk/javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelOnShiftPressed.java similarity index 100% rename from jdk/test/javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelOnShiftPressed.java rename to test/jdk/javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelOnShiftPressed.java diff --git a/jdk/test/javax/swing/JScrollPane/Test6526631.java b/test/jdk/javax/swing/JScrollPane/Test6526631.java similarity index 100% rename from jdk/test/javax/swing/JScrollPane/Test6526631.java rename to test/jdk/javax/swing/JScrollPane/Test6526631.java diff --git a/jdk/test/javax/swing/JScrollPane/bug8044371.java b/test/jdk/javax/swing/JScrollPane/bug8044371.java similarity index 100% rename from jdk/test/javax/swing/JScrollPane/bug8044371.java rename to test/jdk/javax/swing/JScrollPane/bug8044371.java diff --git a/jdk/test/javax/swing/JSlider/4252173/bug4252173.java b/test/jdk/javax/swing/JSlider/4252173/bug4252173.java similarity index 100% rename from jdk/test/javax/swing/JSlider/4252173/bug4252173.java rename to test/jdk/javax/swing/JSlider/4252173/bug4252173.java diff --git a/jdk/test/javax/swing/JSlider/4987336/box.gif b/test/jdk/javax/swing/JSlider/4987336/box.gif similarity index 100% rename from jdk/test/javax/swing/JSlider/4987336/box.gif rename to test/jdk/javax/swing/JSlider/4987336/box.gif diff --git a/jdk/test/javax/swing/JSlider/4987336/bug4987336.html b/test/jdk/javax/swing/JSlider/4987336/bug4987336.html similarity index 100% rename from jdk/test/javax/swing/JSlider/4987336/bug4987336.html rename to test/jdk/javax/swing/JSlider/4987336/bug4987336.html diff --git a/jdk/test/javax/swing/JSlider/4987336/bug4987336.java b/test/jdk/javax/swing/JSlider/4987336/bug4987336.java similarity index 100% rename from jdk/test/javax/swing/JSlider/4987336/bug4987336.java rename to test/jdk/javax/swing/JSlider/4987336/bug4987336.java diff --git a/jdk/test/javax/swing/JSlider/4987336/cupanim.gif b/test/jdk/javax/swing/JSlider/4987336/cupanim.gif similarity index 100% rename from jdk/test/javax/swing/JSlider/4987336/cupanim.gif rename to test/jdk/javax/swing/JSlider/4987336/cupanim.gif diff --git a/jdk/test/javax/swing/JSlider/6278700/bug6278700.java b/test/jdk/javax/swing/JSlider/6278700/bug6278700.java similarity index 100% rename from jdk/test/javax/swing/JSlider/6278700/bug6278700.java rename to test/jdk/javax/swing/JSlider/6278700/bug6278700.java diff --git a/jdk/test/javax/swing/JSlider/6348946/bug6348946.java b/test/jdk/javax/swing/JSlider/6348946/bug6348946.java similarity index 100% rename from jdk/test/javax/swing/JSlider/6348946/bug6348946.java rename to test/jdk/javax/swing/JSlider/6348946/bug6348946.java diff --git a/jdk/test/javax/swing/JSlider/6401380/bug6401380.java b/test/jdk/javax/swing/JSlider/6401380/bug6401380.java similarity index 100% rename from jdk/test/javax/swing/JSlider/6401380/bug6401380.java rename to test/jdk/javax/swing/JSlider/6401380/bug6401380.java diff --git a/jdk/test/javax/swing/JSlider/6524424/bug6524424.html b/test/jdk/javax/swing/JSlider/6524424/bug6524424.html similarity index 100% rename from jdk/test/javax/swing/JSlider/6524424/bug6524424.html rename to test/jdk/javax/swing/JSlider/6524424/bug6524424.html diff --git a/jdk/test/javax/swing/JSlider/6524424/bug6524424.java b/test/jdk/javax/swing/JSlider/6524424/bug6524424.java similarity index 100% rename from jdk/test/javax/swing/JSlider/6524424/bug6524424.java rename to test/jdk/javax/swing/JSlider/6524424/bug6524424.java diff --git a/jdk/test/javax/swing/JSlider/6579827/bug6579827.java b/test/jdk/javax/swing/JSlider/6579827/bug6579827.java similarity index 100% rename from jdk/test/javax/swing/JSlider/6579827/bug6579827.java rename to test/jdk/javax/swing/JSlider/6579827/bug6579827.java diff --git a/jdk/test/javax/swing/JSlider/6587742/bug6587742.html b/test/jdk/javax/swing/JSlider/6587742/bug6587742.html similarity index 100% rename from jdk/test/javax/swing/JSlider/6587742/bug6587742.html rename to test/jdk/javax/swing/JSlider/6587742/bug6587742.html diff --git a/jdk/test/javax/swing/JSlider/6587742/bug6587742.java b/test/jdk/javax/swing/JSlider/6587742/bug6587742.java similarity index 100% rename from jdk/test/javax/swing/JSlider/6587742/bug6587742.java rename to test/jdk/javax/swing/JSlider/6587742/bug6587742.java diff --git a/jdk/test/javax/swing/JSlider/6742358/bug6742358.html b/test/jdk/javax/swing/JSlider/6742358/bug6742358.html similarity index 100% rename from jdk/test/javax/swing/JSlider/6742358/bug6742358.html rename to test/jdk/javax/swing/JSlider/6742358/bug6742358.html diff --git a/jdk/test/javax/swing/JSlider/6742358/bug6742358.java b/test/jdk/javax/swing/JSlider/6742358/bug6742358.java similarity index 100% rename from jdk/test/javax/swing/JSlider/6742358/bug6742358.java rename to test/jdk/javax/swing/JSlider/6742358/bug6742358.java diff --git a/jdk/test/javax/swing/JSlider/6794831/bug6794831.java b/test/jdk/javax/swing/JSlider/6794831/bug6794831.java similarity index 100% rename from jdk/test/javax/swing/JSlider/6794831/bug6794831.java rename to test/jdk/javax/swing/JSlider/6794831/bug6794831.java diff --git a/jdk/test/javax/swing/JSlider/6794836/bug6794836.java b/test/jdk/javax/swing/JSlider/6794836/bug6794836.java similarity index 100% rename from jdk/test/javax/swing/JSlider/6794836/bug6794836.java rename to test/jdk/javax/swing/JSlider/6794836/bug6794836.java diff --git a/jdk/test/javax/swing/JSlider/6848475/bug6848475.java b/test/jdk/javax/swing/JSlider/6848475/bug6848475.java similarity index 100% rename from jdk/test/javax/swing/JSlider/6848475/bug6848475.java rename to test/jdk/javax/swing/JSlider/6848475/bug6848475.java diff --git a/jdk/test/javax/swing/JSlider/6918861/bug6918861.java b/test/jdk/javax/swing/JSlider/6918861/bug6918861.java similarity index 100% rename from jdk/test/javax/swing/JSlider/6918861/bug6918861.java rename to test/jdk/javax/swing/JSlider/6918861/bug6918861.java diff --git a/jdk/test/javax/swing/JSlider/6923305/bug6923305.java b/test/jdk/javax/swing/JSlider/6923305/bug6923305.java similarity index 100% rename from jdk/test/javax/swing/JSlider/6923305/bug6923305.java rename to test/jdk/javax/swing/JSlider/6923305/bug6923305.java diff --git a/jdk/test/javax/swing/JSlider/8162856/MetalHiDPISliderThumbTest.java b/test/jdk/javax/swing/JSlider/8162856/MetalHiDPISliderThumbTest.java similarity index 100% rename from jdk/test/javax/swing/JSlider/8162856/MetalHiDPISliderThumbTest.java rename to test/jdk/javax/swing/JSlider/8162856/MetalHiDPISliderThumbTest.java diff --git a/jdk/test/javax/swing/JSlider/SliderTick/SliderTickTest.java b/test/jdk/javax/swing/JSlider/SliderTick/SliderTickTest.java similarity index 100% rename from jdk/test/javax/swing/JSlider/SliderTick/SliderTickTest.java rename to test/jdk/javax/swing/JSlider/SliderTick/SliderTickTest.java diff --git a/jdk/test/javax/swing/JSpinner/4973721/bug4973721.java b/test/jdk/javax/swing/JSpinner/4973721/bug4973721.java similarity index 100% rename from jdk/test/javax/swing/JSpinner/4973721/bug4973721.java rename to test/jdk/javax/swing/JSpinner/4973721/bug4973721.java diff --git a/jdk/test/javax/swing/JSpinner/5012888/bug5012888.java b/test/jdk/javax/swing/JSpinner/5012888/bug5012888.java similarity index 100% rename from jdk/test/javax/swing/JSpinner/5012888/bug5012888.java rename to test/jdk/javax/swing/JSpinner/5012888/bug5012888.java diff --git a/jdk/test/javax/swing/JSpinner/6421058/bug6421058.java b/test/jdk/javax/swing/JSpinner/6421058/bug6421058.java similarity index 100% rename from jdk/test/javax/swing/JSpinner/6421058/bug6421058.java rename to test/jdk/javax/swing/JSpinner/6421058/bug6421058.java diff --git a/jdk/test/javax/swing/JSpinner/6463712/bug6463712.java b/test/jdk/javax/swing/JSpinner/6463712/bug6463712.java similarity index 100% rename from jdk/test/javax/swing/JSpinner/6463712/bug6463712.java rename to test/jdk/javax/swing/JSpinner/6463712/bug6463712.java diff --git a/jdk/test/javax/swing/JSpinner/6532833/bug6532833.java b/test/jdk/javax/swing/JSpinner/6532833/bug6532833.java similarity index 100% rename from jdk/test/javax/swing/JSpinner/6532833/bug6532833.java rename to test/jdk/javax/swing/JSpinner/6532833/bug6532833.java diff --git a/jdk/test/javax/swing/JSpinner/8008657/bug8008657.java b/test/jdk/javax/swing/JSpinner/8008657/bug8008657.java similarity index 100% rename from jdk/test/javax/swing/JSpinner/8008657/bug8008657.java rename to test/jdk/javax/swing/JSpinner/8008657/bug8008657.java diff --git a/jdk/test/javax/swing/JSpinner/WrongEditorTextFieldFont/WrongEditorTextFieldFont.java b/test/jdk/javax/swing/JSpinner/WrongEditorTextFieldFont/WrongEditorTextFieldFont.java similarity index 100% rename from jdk/test/javax/swing/JSpinner/WrongEditorTextFieldFont/WrongEditorTextFieldFont.java rename to test/jdk/javax/swing/JSpinner/WrongEditorTextFieldFont/WrongEditorTextFieldFont.java diff --git a/jdk/test/javax/swing/JSplitPane/4201995/bug4201995.java b/test/jdk/javax/swing/JSplitPane/4201995/bug4201995.java similarity index 100% rename from jdk/test/javax/swing/JSplitPane/4201995/bug4201995.java rename to test/jdk/javax/swing/JSplitPane/4201995/bug4201995.java diff --git a/jdk/test/javax/swing/JSplitPane/4514858/bug4514858.java b/test/jdk/javax/swing/JSplitPane/4514858/bug4514858.java similarity index 100% rename from jdk/test/javax/swing/JSplitPane/4514858/bug4514858.java rename to test/jdk/javax/swing/JSplitPane/4514858/bug4514858.java diff --git a/jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java b/test/jdk/javax/swing/JSplitPane/4816114/bug4816114.java similarity index 100% rename from jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java rename to test/jdk/javax/swing/JSplitPane/4816114/bug4816114.java diff --git a/jdk/test/javax/swing/JSplitPane/4885629/bug4885629.java b/test/jdk/javax/swing/JSplitPane/4885629/bug4885629.java similarity index 100% rename from jdk/test/javax/swing/JSplitPane/4885629/bug4885629.java rename to test/jdk/javax/swing/JSplitPane/4885629/bug4885629.java diff --git a/jdk/test/javax/swing/JSplitPane/8132123/bug8132123.html b/test/jdk/javax/swing/JSplitPane/8132123/bug8132123.html similarity index 100% rename from jdk/test/javax/swing/JSplitPane/8132123/bug8132123.html rename to test/jdk/javax/swing/JSplitPane/8132123/bug8132123.html diff --git a/jdk/test/javax/swing/JSplitPane/8132123/bug8132123.java b/test/jdk/javax/swing/JSplitPane/8132123/bug8132123.java similarity index 100% rename from jdk/test/javax/swing/JSplitPane/8132123/bug8132123.java rename to test/jdk/javax/swing/JSplitPane/8132123/bug8132123.java diff --git a/jdk/test/javax/swing/JTabbedPane/4209065/bug4209065.html b/test/jdk/javax/swing/JTabbedPane/4209065/bug4209065.html similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/4209065/bug4209065.html rename to test/jdk/javax/swing/JTabbedPane/4209065/bug4209065.html diff --git a/jdk/test/javax/swing/JTabbedPane/4209065/bug4209065.java b/test/jdk/javax/swing/JTabbedPane/4209065/bug4209065.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/4209065/bug4209065.java rename to test/jdk/javax/swing/JTabbedPane/4209065/bug4209065.java diff --git a/jdk/test/javax/swing/JTabbedPane/4310381/bug4310381.html b/test/jdk/javax/swing/JTabbedPane/4310381/bug4310381.html similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/4310381/bug4310381.html rename to test/jdk/javax/swing/JTabbedPane/4310381/bug4310381.html diff --git a/jdk/test/javax/swing/JTabbedPane/4310381/bug4310381.java b/test/jdk/javax/swing/JTabbedPane/4310381/bug4310381.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/4310381/bug4310381.java rename to test/jdk/javax/swing/JTabbedPane/4310381/bug4310381.java diff --git a/jdk/test/javax/swing/JTabbedPane/4361477/bug4361477.java b/test/jdk/javax/swing/JTabbedPane/4361477/bug4361477.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/4361477/bug4361477.java rename to test/jdk/javax/swing/JTabbedPane/4361477/bug4361477.java diff --git a/jdk/test/javax/swing/JTabbedPane/4624207/bug4624207.java b/test/jdk/javax/swing/JTabbedPane/4624207/bug4624207.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/4624207/bug4624207.java rename to test/jdk/javax/swing/JTabbedPane/4624207/bug4624207.java diff --git a/jdk/test/javax/swing/JTabbedPane/4666224/bug4666224.html b/test/jdk/javax/swing/JTabbedPane/4666224/bug4666224.html similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/4666224/bug4666224.html rename to test/jdk/javax/swing/JTabbedPane/4666224/bug4666224.html diff --git a/jdk/test/javax/swing/JTabbedPane/4666224/bug4666224.java b/test/jdk/javax/swing/JTabbedPane/4666224/bug4666224.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/4666224/bug4666224.java rename to test/jdk/javax/swing/JTabbedPane/4666224/bug4666224.java diff --git a/jdk/test/javax/swing/JTabbedPane/6416920/bug6416920.java b/test/jdk/javax/swing/JTabbedPane/6416920/bug6416920.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/6416920/bug6416920.java rename to test/jdk/javax/swing/JTabbedPane/6416920/bug6416920.java diff --git a/jdk/test/javax/swing/JTabbedPane/6495408/bug6495408.java b/test/jdk/javax/swing/JTabbedPane/6495408/bug6495408.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/6495408/bug6495408.java rename to test/jdk/javax/swing/JTabbedPane/6495408/bug6495408.java diff --git a/jdk/test/javax/swing/JTabbedPane/6670274/bug6670274.java b/test/jdk/javax/swing/JTabbedPane/6670274/bug6670274.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/6670274/bug6670274.java rename to test/jdk/javax/swing/JTabbedPane/6670274/bug6670274.java diff --git a/jdk/test/javax/swing/JTabbedPane/7010561/bug7010561.java b/test/jdk/javax/swing/JTabbedPane/7010561/bug7010561.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/7010561/bug7010561.java rename to test/jdk/javax/swing/JTabbedPane/7010561/bug7010561.java diff --git a/jdk/test/javax/swing/JTabbedPane/7024235/Test7024235.java b/test/jdk/javax/swing/JTabbedPane/7024235/Test7024235.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/7024235/Test7024235.java rename to test/jdk/javax/swing/JTabbedPane/7024235/Test7024235.java diff --git a/jdk/test/javax/swing/JTabbedPane/7161568/bug7161568.java b/test/jdk/javax/swing/JTabbedPane/7161568/bug7161568.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/7161568/bug7161568.java rename to test/jdk/javax/swing/JTabbedPane/7161568/bug7161568.java diff --git a/jdk/test/javax/swing/JTabbedPane/7170310/bug7170310.java b/test/jdk/javax/swing/JTabbedPane/7170310/bug7170310.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/7170310/bug7170310.java rename to test/jdk/javax/swing/JTabbedPane/7170310/bug7170310.java diff --git a/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java b/test/jdk/javax/swing/JTabbedPane/8007563/Test8007563.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java rename to test/jdk/javax/swing/JTabbedPane/8007563/Test8007563.java diff --git a/jdk/test/javax/swing/JTabbedPane/8017284/bug8017284.java b/test/jdk/javax/swing/JTabbedPane/8017284/bug8017284.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/8017284/bug8017284.java rename to test/jdk/javax/swing/JTabbedPane/8017284/bug8017284.java diff --git a/jdk/test/javax/swing/JTabbedPane/8134116/Bug8134116.java b/test/jdk/javax/swing/JTabbedPane/8134116/Bug8134116.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/8134116/Bug8134116.java rename to test/jdk/javax/swing/JTabbedPane/8134116/Bug8134116.java diff --git a/jdk/test/javax/swing/JTabbedPane/8137169/ScrollableTabbedPaneTest.java b/test/jdk/javax/swing/JTabbedPane/8137169/ScrollableTabbedPaneTest.java similarity index 100% rename from jdk/test/javax/swing/JTabbedPane/8137169/ScrollableTabbedPaneTest.java rename to test/jdk/javax/swing/JTabbedPane/8137169/ScrollableTabbedPaneTest.java diff --git a/jdk/test/javax/swing/JTable/4220171/bug4220171.java b/test/jdk/javax/swing/JTable/4220171/bug4220171.java similarity index 100% rename from jdk/test/javax/swing/JTable/4220171/bug4220171.java rename to test/jdk/javax/swing/JTable/4220171/bug4220171.java diff --git a/jdk/test/javax/swing/JTable/4222153/bug4222153.html b/test/jdk/javax/swing/JTable/4222153/bug4222153.html similarity index 100% rename from jdk/test/javax/swing/JTable/4222153/bug4222153.html rename to test/jdk/javax/swing/JTable/4222153/bug4222153.html diff --git a/jdk/test/javax/swing/JTable/4222153/bug4222153.java b/test/jdk/javax/swing/JTable/4222153/bug4222153.java similarity index 100% rename from jdk/test/javax/swing/JTable/4222153/bug4222153.java rename to test/jdk/javax/swing/JTable/4222153/bug4222153.java diff --git a/jdk/test/javax/swing/JTable/4235420/bug4235420.java b/test/jdk/javax/swing/JTable/4235420/bug4235420.java similarity index 100% rename from jdk/test/javax/swing/JTable/4235420/bug4235420.java rename to test/jdk/javax/swing/JTable/4235420/bug4235420.java diff --git a/jdk/test/javax/swing/JTable/6263446/bug6263446.java b/test/jdk/javax/swing/JTable/6263446/bug6263446.java similarity index 100% rename from jdk/test/javax/swing/JTable/6263446/bug6263446.java rename to test/jdk/javax/swing/JTable/6263446/bug6263446.java diff --git a/jdk/test/javax/swing/JTable/6567433/UpdateUIRecursionTest.java b/test/jdk/javax/swing/JTable/6567433/UpdateUIRecursionTest.java similarity index 100% rename from jdk/test/javax/swing/JTable/6567433/UpdateUIRecursionTest.java rename to test/jdk/javax/swing/JTable/6567433/UpdateUIRecursionTest.java diff --git a/jdk/test/javax/swing/JTable/6735286/bug6735286.java b/test/jdk/javax/swing/JTable/6735286/bug6735286.java similarity index 100% rename from jdk/test/javax/swing/JTable/6735286/bug6735286.java rename to test/jdk/javax/swing/JTable/6735286/bug6735286.java diff --git a/jdk/test/javax/swing/JTable/6768387/bug6768387.java b/test/jdk/javax/swing/JTable/6768387/bug6768387.java similarity index 100% rename from jdk/test/javax/swing/JTable/6768387/bug6768387.java rename to test/jdk/javax/swing/JTable/6768387/bug6768387.java diff --git a/jdk/test/javax/swing/JTable/6777378/bug6777378.java b/test/jdk/javax/swing/JTable/6777378/bug6777378.java similarity index 100% rename from jdk/test/javax/swing/JTable/6777378/bug6777378.java rename to test/jdk/javax/swing/JTable/6777378/bug6777378.java diff --git a/jdk/test/javax/swing/JTable/6788484/bug6788484.java b/test/jdk/javax/swing/JTable/6788484/bug6788484.java similarity index 100% rename from jdk/test/javax/swing/JTable/6788484/bug6788484.java rename to test/jdk/javax/swing/JTable/6788484/bug6788484.java diff --git a/jdk/test/javax/swing/JTable/6894632/bug6894632.java b/test/jdk/javax/swing/JTable/6894632/bug6894632.java similarity index 100% rename from jdk/test/javax/swing/JTable/6894632/bug6894632.java rename to test/jdk/javax/swing/JTable/6894632/bug6894632.java diff --git a/jdk/test/javax/swing/JTable/6913768/bug6913768.java b/test/jdk/javax/swing/JTable/6913768/bug6913768.java similarity index 100% rename from jdk/test/javax/swing/JTable/6913768/bug6913768.java rename to test/jdk/javax/swing/JTable/6913768/bug6913768.java diff --git a/jdk/test/javax/swing/JTable/6937798/bug6937798.java b/test/jdk/javax/swing/JTable/6937798/bug6937798.java similarity index 100% rename from jdk/test/javax/swing/JTable/6937798/bug6937798.java rename to test/jdk/javax/swing/JTable/6937798/bug6937798.java diff --git a/jdk/test/javax/swing/JTable/7027139/bug7027139.java b/test/jdk/javax/swing/JTable/7027139/bug7027139.java similarity index 100% rename from jdk/test/javax/swing/JTable/7027139/bug7027139.java rename to test/jdk/javax/swing/JTable/7027139/bug7027139.java diff --git a/jdk/test/javax/swing/JTable/7055065/bug7055065.java b/test/jdk/javax/swing/JTable/7055065/bug7055065.java similarity index 100% rename from jdk/test/javax/swing/JTable/7055065/bug7055065.java rename to test/jdk/javax/swing/JTable/7055065/bug7055065.java diff --git a/jdk/test/javax/swing/JTable/7068740/bug7068740.java b/test/jdk/javax/swing/JTable/7068740/bug7068740.java similarity index 100% rename from jdk/test/javax/swing/JTable/7068740/bug7068740.java rename to test/jdk/javax/swing/JTable/7068740/bug7068740.java diff --git a/jdk/test/javax/swing/JTable/7124218/SelectEditTableCell.java b/test/jdk/javax/swing/JTable/7124218/SelectEditTableCell.java similarity index 100% rename from jdk/test/javax/swing/JTable/7124218/SelectEditTableCell.java rename to test/jdk/javax/swing/JTable/7124218/SelectEditTableCell.java diff --git a/jdk/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java b/test/jdk/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java similarity index 100% rename from jdk/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java rename to test/jdk/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java diff --git a/jdk/test/javax/swing/JTable/8005019/bug8005019.java b/test/jdk/javax/swing/JTable/8005019/bug8005019.java similarity index 100% rename from jdk/test/javax/swing/JTable/8005019/bug8005019.java rename to test/jdk/javax/swing/JTable/8005019/bug8005019.java diff --git a/jdk/test/javax/swing/JTable/8031971/bug8031971.java b/test/jdk/javax/swing/JTable/8031971/bug8031971.java similarity index 100% rename from jdk/test/javax/swing/JTable/8031971/bug8031971.java rename to test/jdk/javax/swing/JTable/8031971/bug8031971.java diff --git a/jdk/test/javax/swing/JTable/8032874/bug8032874.java b/test/jdk/javax/swing/JTable/8032874/bug8032874.java similarity index 100% rename from jdk/test/javax/swing/JTable/8032874/bug8032874.java rename to test/jdk/javax/swing/JTable/8032874/bug8032874.java diff --git a/jdk/test/javax/swing/JTable/8080972/TestJTableCellEditor.java b/test/jdk/javax/swing/JTable/8080972/TestJTableCellEditor.java similarity index 100% rename from jdk/test/javax/swing/JTable/8080972/TestJTableCellEditor.java rename to test/jdk/javax/swing/JTable/8080972/TestJTableCellEditor.java diff --git a/jdk/test/javax/swing/JTable/8133919/DrawGridLinesTest.java b/test/jdk/javax/swing/JTable/8133919/DrawGridLinesTest.java similarity index 100% rename from jdk/test/javax/swing/JTable/8133919/DrawGridLinesTest.java rename to test/jdk/javax/swing/JTable/8133919/DrawGridLinesTest.java diff --git a/jdk/test/javax/swing/JTable/JTableScrollTest.java b/test/jdk/javax/swing/JTable/JTableScrollTest.java similarity index 100% rename from jdk/test/javax/swing/JTable/JTableScrollTest.java rename to test/jdk/javax/swing/JTable/JTableScrollTest.java diff --git a/jdk/test/javax/swing/JTable/KeyBoardNavigation/KeyBoardNavigation.html b/test/jdk/javax/swing/JTable/KeyBoardNavigation/KeyBoardNavigation.html similarity index 100% rename from jdk/test/javax/swing/JTable/KeyBoardNavigation/KeyBoardNavigation.html rename to test/jdk/javax/swing/JTable/KeyBoardNavigation/KeyBoardNavigation.html diff --git a/jdk/test/javax/swing/JTable/KeyBoardNavigation/KeyBoardNavigation.java b/test/jdk/javax/swing/JTable/KeyBoardNavigation/KeyBoardNavigation.java similarity index 100% rename from jdk/test/javax/swing/JTable/KeyBoardNavigation/KeyBoardNavigation.java rename to test/jdk/javax/swing/JTable/KeyBoardNavigation/KeyBoardNavigation.java diff --git a/jdk/test/javax/swing/JTable/LostTextTest.java b/test/jdk/javax/swing/JTable/LostTextTest.java similarity index 100% rename from jdk/test/javax/swing/JTable/LostTextTest.java rename to test/jdk/javax/swing/JTable/LostTextTest.java diff --git a/jdk/test/javax/swing/JTable/PrintManualTest_FitWidthMultiple.java b/test/jdk/javax/swing/JTable/PrintManualTest_FitWidthMultiple.java similarity index 100% rename from jdk/test/javax/swing/JTable/PrintManualTest_FitWidthMultiple.java rename to test/jdk/javax/swing/JTable/PrintManualTest_FitWidthMultiple.java diff --git a/jdk/test/javax/swing/JTable/SorterIOOBEtest/DefaultRowSorterIOOBEtest.java b/test/jdk/javax/swing/JTable/SorterIOOBEtest/DefaultRowSorterIOOBEtest.java similarity index 100% rename from jdk/test/javax/swing/JTable/SorterIOOBEtest/DefaultRowSorterIOOBEtest.java rename to test/jdk/javax/swing/JTable/SorterIOOBEtest/DefaultRowSorterIOOBEtest.java diff --git a/jdk/test/javax/swing/JTable/TAB/TAB.html b/test/jdk/javax/swing/JTable/TAB/TAB.html similarity index 100% rename from jdk/test/javax/swing/JTable/TAB/TAB.html rename to test/jdk/javax/swing/JTable/TAB/TAB.html diff --git a/jdk/test/javax/swing/JTable/TAB/TAB.java b/test/jdk/javax/swing/JTable/TAB/TAB.java similarity index 100% rename from jdk/test/javax/swing/JTable/TAB/TAB.java rename to test/jdk/javax/swing/JTable/TAB/TAB.java diff --git a/jdk/test/javax/swing/JTable/Test6888156.java b/test/jdk/javax/swing/JTable/Test6888156.java similarity index 100% rename from jdk/test/javax/swing/JTable/Test6888156.java rename to test/jdk/javax/swing/JTable/Test6888156.java diff --git a/jdk/test/javax/swing/JTableHeader/4473075/bug4473075.java b/test/jdk/javax/swing/JTableHeader/4473075/bug4473075.java similarity index 100% rename from jdk/test/javax/swing/JTableHeader/4473075/bug4473075.java rename to test/jdk/javax/swing/JTableHeader/4473075/bug4473075.java diff --git a/jdk/test/javax/swing/JTableHeader/6442918/bug6442918a.java b/test/jdk/javax/swing/JTableHeader/6442918/bug6442918a.java similarity index 100% rename from jdk/test/javax/swing/JTableHeader/6442918/bug6442918a.java rename to test/jdk/javax/swing/JTableHeader/6442918/bug6442918a.java diff --git a/jdk/test/javax/swing/JTableHeader/6567433/UpdateUIRecursionTest.java b/test/jdk/javax/swing/JTableHeader/6567433/UpdateUIRecursionTest.java similarity index 100% rename from jdk/test/javax/swing/JTableHeader/6567433/UpdateUIRecursionTest.java rename to test/jdk/javax/swing/JTableHeader/6567433/UpdateUIRecursionTest.java diff --git a/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java b/test/jdk/javax/swing/JTableHeader/6884066/bug6884066.java similarity index 100% rename from jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java rename to test/jdk/javax/swing/JTableHeader/6884066/bug6884066.java diff --git a/jdk/test/javax/swing/JTableHeader/6889007/bug6889007.java b/test/jdk/javax/swing/JTableHeader/6889007/bug6889007.java similarity index 100% rename from jdk/test/javax/swing/JTableHeader/6889007/bug6889007.java rename to test/jdk/javax/swing/JTableHeader/6889007/bug6889007.java diff --git a/jdk/test/javax/swing/JTableHeader/8020039/TableHeaderRendererExceptionTest.java b/test/jdk/javax/swing/JTableHeader/8020039/TableHeaderRendererExceptionTest.java similarity index 100% rename from jdk/test/javax/swing/JTableHeader/8020039/TableHeaderRendererExceptionTest.java rename to test/jdk/javax/swing/JTableHeader/8020039/TableHeaderRendererExceptionTest.java diff --git a/jdk/test/javax/swing/JTextArea/4697612/bug4697612.java b/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java similarity index 100% rename from jdk/test/javax/swing/JTextArea/4697612/bug4697612.java rename to test/jdk/javax/swing/JTextArea/4697612/bug4697612.java diff --git a/jdk/test/javax/swing/JTextArea/4697612/bug4697612.txt b/test/jdk/javax/swing/JTextArea/4697612/bug4697612.txt similarity index 100% rename from jdk/test/javax/swing/JTextArea/4697612/bug4697612.txt rename to test/jdk/javax/swing/JTextArea/4697612/bug4697612.txt diff --git a/jdk/test/javax/swing/JTextArea/6925473/bug6925473.java b/test/jdk/javax/swing/JTextArea/6925473/bug6925473.java similarity index 100% rename from jdk/test/javax/swing/JTextArea/6925473/bug6925473.java rename to test/jdk/javax/swing/JTextArea/6925473/bug6925473.java diff --git a/jdk/test/javax/swing/JTextArea/6940863/bug6940863.java b/test/jdk/javax/swing/JTextArea/6940863/bug6940863.java similarity index 100% rename from jdk/test/javax/swing/JTextArea/6940863/bug6940863.java rename to test/jdk/javax/swing/JTextArea/6940863/bug6940863.java diff --git a/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java b/test/jdk/javax/swing/JTextArea/7049024/bug7049024.java similarity index 100% rename from jdk/test/javax/swing/JTextArea/7049024/bug7049024.java rename to test/jdk/javax/swing/JTextArea/7049024/bug7049024.java diff --git a/jdk/test/javax/swing/JTextArea/8148555/JTextAreaEmojiTest.java b/test/jdk/javax/swing/JTextArea/8148555/JTextAreaEmojiTest.java similarity index 100% rename from jdk/test/javax/swing/JTextArea/8148555/JTextAreaEmojiTest.java rename to test/jdk/javax/swing/JTextArea/8148555/JTextAreaEmojiTest.java diff --git a/jdk/test/javax/swing/JTextArea/8149849/DNDTextToScaledArea.java b/test/jdk/javax/swing/JTextArea/8149849/DNDTextToScaledArea.java similarity index 100% rename from jdk/test/javax/swing/JTextArea/8149849/DNDTextToScaledArea.java rename to test/jdk/javax/swing/JTextArea/8149849/DNDTextToScaledArea.java diff --git a/jdk/test/javax/swing/JTextArea/ScrollbarFlicker/ScrollFlickerTest.java b/test/jdk/javax/swing/JTextArea/ScrollbarFlicker/ScrollFlickerTest.java similarity index 100% rename from jdk/test/javax/swing/JTextArea/ScrollbarFlicker/ScrollFlickerTest.java rename to test/jdk/javax/swing/JTextArea/ScrollbarFlicker/ScrollFlickerTest.java diff --git a/jdk/test/javax/swing/JTextArea/Test6593649.java b/test/jdk/javax/swing/JTextArea/Test6593649.java similarity index 100% rename from jdk/test/javax/swing/JTextArea/Test6593649.java rename to test/jdk/javax/swing/JTextArea/Test6593649.java diff --git a/jdk/test/javax/swing/JTextArea/TextViewOOM/TextViewOOM.java b/test/jdk/javax/swing/JTextArea/TextViewOOM/TextViewOOM.java similarity index 100% rename from jdk/test/javax/swing/JTextArea/TextViewOOM/TextViewOOM.java rename to test/jdk/javax/swing/JTextArea/TextViewOOM/TextViewOOM.java diff --git a/jdk/test/javax/swing/JTextField/8036819/bug8036819.java b/test/jdk/javax/swing/JTextField/8036819/bug8036819.java similarity index 100% rename from jdk/test/javax/swing/JTextField/8036819/bug8036819.java rename to test/jdk/javax/swing/JTextField/8036819/bug8036819.java diff --git a/jdk/test/javax/swing/JTextField/I18NViewNoWrapMinSpan/I18NViewNoWrapMinSpan.java b/test/jdk/javax/swing/JTextField/I18NViewNoWrapMinSpan/I18NViewNoWrapMinSpan.java similarity index 100% rename from jdk/test/javax/swing/JTextField/I18NViewNoWrapMinSpan/I18NViewNoWrapMinSpan.java rename to test/jdk/javax/swing/JTextField/I18NViewNoWrapMinSpan/I18NViewNoWrapMinSpan.java diff --git a/jdk/test/javax/swing/JTextField/MissingCharsKorean/MissingCharsKorean.java b/test/jdk/javax/swing/JTextField/MissingCharsKorean/MissingCharsKorean.java similarity index 100% rename from jdk/test/javax/swing/JTextField/MissingCharsKorean/MissingCharsKorean.java rename to test/jdk/javax/swing/JTextField/MissingCharsKorean/MissingCharsKorean.java diff --git a/jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java b/test/jdk/javax/swing/JTextPane/JTextPaneDocumentAlignment.java similarity index 100% rename from jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java rename to test/jdk/javax/swing/JTextPane/JTextPaneDocumentAlignment.java diff --git a/jdk/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java b/test/jdk/javax/swing/JTextPane/JTextPaneDocumentWrapping.java similarity index 100% rename from jdk/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java rename to test/jdk/javax/swing/JTextPane/JTextPaneDocumentWrapping.java diff --git a/jdk/test/javax/swing/JTextPane/bug8025082.java b/test/jdk/javax/swing/JTextPane/bug8025082.java similarity index 100% rename from jdk/test/javax/swing/JTextPane/bug8025082.java rename to test/jdk/javax/swing/JTextPane/bug8025082.java diff --git a/jdk/test/javax/swing/JToolBar/4247996/bug4247996.java b/test/jdk/javax/swing/JToolBar/4247996/bug4247996.java similarity index 100% rename from jdk/test/javax/swing/JToolBar/4247996/bug4247996.java rename to test/jdk/javax/swing/JToolBar/4247996/bug4247996.java diff --git a/jdk/test/javax/swing/JToolBar/4529206/bug4529206.java b/test/jdk/javax/swing/JToolBar/4529206/bug4529206.java similarity index 100% rename from jdk/test/javax/swing/JToolBar/4529206/bug4529206.java rename to test/jdk/javax/swing/JToolBar/4529206/bug4529206.java diff --git a/jdk/test/javax/swing/JToolTip/4644444/bug4644444.html b/test/jdk/javax/swing/JToolTip/4644444/bug4644444.html similarity index 100% rename from jdk/test/javax/swing/JToolTip/4644444/bug4644444.html rename to test/jdk/javax/swing/JToolTip/4644444/bug4644444.html diff --git a/jdk/test/javax/swing/JToolTip/4644444/bug4644444.java b/test/jdk/javax/swing/JToolTip/4644444/bug4644444.java similarity index 100% rename from jdk/test/javax/swing/JToolTip/4644444/bug4644444.java rename to test/jdk/javax/swing/JToolTip/4644444/bug4644444.java diff --git a/jdk/test/javax/swing/JToolTip/4846413/bug4846413.java b/test/jdk/javax/swing/JToolTip/4846413/bug4846413.java similarity index 100% rename from jdk/test/javax/swing/JToolTip/4846413/bug4846413.java rename to test/jdk/javax/swing/JToolTip/4846413/bug4846413.java diff --git a/jdk/test/javax/swing/JToolTip/6219960/bug6219960.java b/test/jdk/javax/swing/JToolTip/6219960/bug6219960.java similarity index 100% rename from jdk/test/javax/swing/JToolTip/6219960/bug6219960.java rename to test/jdk/javax/swing/JToolTip/6219960/bug6219960.java diff --git a/jdk/test/javax/swing/JTree/4314199/bug4314199.html b/test/jdk/javax/swing/JTree/4314199/bug4314199.html similarity index 100% rename from jdk/test/javax/swing/JTree/4314199/bug4314199.html rename to test/jdk/javax/swing/JTree/4314199/bug4314199.html diff --git a/jdk/test/javax/swing/JTree/4314199/bug4314199.java b/test/jdk/javax/swing/JTree/4314199/bug4314199.java similarity index 100% rename from jdk/test/javax/swing/JTree/4314199/bug4314199.java rename to test/jdk/javax/swing/JTree/4314199/bug4314199.java diff --git a/jdk/test/javax/swing/JTree/4330357/bug4330357.java b/test/jdk/javax/swing/JTree/4330357/bug4330357.java similarity index 100% rename from jdk/test/javax/swing/JTree/4330357/bug4330357.java rename to test/jdk/javax/swing/JTree/4330357/bug4330357.java diff --git a/jdk/test/javax/swing/JTree/4633594/JTreeFocusTest.java b/test/jdk/javax/swing/JTree/4633594/JTreeFocusTest.java similarity index 100% rename from jdk/test/javax/swing/JTree/4633594/JTreeFocusTest.java rename to test/jdk/javax/swing/JTree/4633594/JTreeFocusTest.java diff --git a/jdk/test/javax/swing/JTree/4908142/bug4908142.java b/test/jdk/javax/swing/JTree/4908142/bug4908142.java similarity index 100% rename from jdk/test/javax/swing/JTree/4908142/bug4908142.java rename to test/jdk/javax/swing/JTree/4908142/bug4908142.java diff --git a/jdk/test/javax/swing/JTree/4927934/bug4927934.java b/test/jdk/javax/swing/JTree/4927934/bug4927934.java similarity index 100% rename from jdk/test/javax/swing/JTree/4927934/bug4927934.java rename to test/jdk/javax/swing/JTree/4927934/bug4927934.java diff --git a/jdk/test/javax/swing/JTree/6263446/bug6263446.java b/test/jdk/javax/swing/JTree/6263446/bug6263446.java similarity index 100% rename from jdk/test/javax/swing/JTree/6263446/bug6263446.java rename to test/jdk/javax/swing/JTree/6263446/bug6263446.java diff --git a/jdk/test/javax/swing/JTree/6505523/bug6505523.java b/test/jdk/javax/swing/JTree/6505523/bug6505523.java similarity index 100% rename from jdk/test/javax/swing/JTree/6505523/bug6505523.java rename to test/jdk/javax/swing/JTree/6505523/bug6505523.java diff --git a/jdk/test/javax/swing/JTree/6567433/UpdateUIRecursionTest.java b/test/jdk/javax/swing/JTree/6567433/UpdateUIRecursionTest.java similarity index 100% rename from jdk/test/javax/swing/JTree/6567433/UpdateUIRecursionTest.java rename to test/jdk/javax/swing/JTree/6567433/UpdateUIRecursionTest.java diff --git a/jdk/test/javax/swing/JTree/6578666/bug6578666.java b/test/jdk/javax/swing/JTree/6578666/bug6578666.java similarity index 100% rename from jdk/test/javax/swing/JTree/6578666/bug6578666.java rename to test/jdk/javax/swing/JTree/6578666/bug6578666.java diff --git a/jdk/test/javax/swing/JTree/8003400/Test8003400.java b/test/jdk/javax/swing/JTree/8003400/Test8003400.java similarity index 100% rename from jdk/test/javax/swing/JTree/8003400/Test8003400.java rename to test/jdk/javax/swing/JTree/8003400/Test8003400.java diff --git a/jdk/test/javax/swing/JTree/8003830/bug8003830.java b/test/jdk/javax/swing/JTree/8003830/bug8003830.java similarity index 100% rename from jdk/test/javax/swing/JTree/8003830/bug8003830.java rename to test/jdk/javax/swing/JTree/8003830/bug8003830.java diff --git a/jdk/test/javax/swing/JTree/8004298/bug8004298.java b/test/jdk/javax/swing/JTree/8004298/bug8004298.java similarity index 100% rename from jdk/test/javax/swing/JTree/8004298/bug8004298.java rename to test/jdk/javax/swing/JTree/8004298/bug8004298.java diff --git a/jdk/test/javax/swing/JTree/8013571/Test8013571.java b/test/jdk/javax/swing/JTree/8013571/Test8013571.java similarity index 100% rename from jdk/test/javax/swing/JTree/8013571/Test8013571.java rename to test/jdk/javax/swing/JTree/8013571/Test8013571.java diff --git a/jdk/test/javax/swing/JTree/8038113/bug8038113.html b/test/jdk/javax/swing/JTree/8038113/bug8038113.html similarity index 100% rename from jdk/test/javax/swing/JTree/8038113/bug8038113.html rename to test/jdk/javax/swing/JTree/8038113/bug8038113.html diff --git a/jdk/test/javax/swing/JTree/8038113/bug8038113.java b/test/jdk/javax/swing/JTree/8038113/bug8038113.java similarity index 100% rename from jdk/test/javax/swing/JTree/8038113/bug8038113.java rename to test/jdk/javax/swing/JTree/8038113/bug8038113.java diff --git a/jdk/test/javax/swing/JTree/8072676/TreeClipTest.java b/test/jdk/javax/swing/JTree/8072676/TreeClipTest.java similarity index 100% rename from jdk/test/javax/swing/JTree/8072676/TreeClipTest.java rename to test/jdk/javax/swing/JTree/8072676/TreeClipTest.java diff --git a/jdk/test/javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java b/test/jdk/javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java similarity index 100% rename from jdk/test/javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java rename to test/jdk/javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java diff --git a/jdk/test/javax/swing/JViewport/6953396/bug6953396.java b/test/jdk/javax/swing/JViewport/6953396/bug6953396.java similarity index 100% rename from jdk/test/javax/swing/JViewport/6953396/bug6953396.java rename to test/jdk/javax/swing/JViewport/6953396/bug6953396.java diff --git a/jdk/test/javax/swing/JViewport/7107099/bug7107099.java b/test/jdk/javax/swing/JViewport/7107099/bug7107099.java similarity index 100% rename from jdk/test/javax/swing/JViewport/7107099/bug7107099.java rename to test/jdk/javax/swing/JViewport/7107099/bug7107099.java diff --git a/jdk/test/javax/swing/JViewport/8164032/JViewPortBackingStoreImageTest.java b/test/jdk/javax/swing/JViewport/8164032/JViewPortBackingStoreImageTest.java similarity index 100% rename from jdk/test/javax/swing/JViewport/8164032/JViewPortBackingStoreImageTest.java rename to test/jdk/javax/swing/JViewport/8164032/JViewPortBackingStoreImageTest.java diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/Common.java b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/Common.java similarity index 100% rename from jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/Common.java rename to test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/Common.java diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucent.java b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucent.java similarity index 100% rename from jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucent.java rename to test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucent.java diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java similarity index 100% rename from jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java rename to test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentGradient.java b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentGradient.java similarity index 100% rename from jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentGradient.java rename to test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentGradient.java diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentSwing.java b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentSwing.java similarity index 100% rename from jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentSwing.java rename to test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentSwing.java diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/SetShapeAndClickSwing.java b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/SetShapeAndClickSwing.java similarity index 100% rename from jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/SetShapeAndClickSwing.java rename to test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/SetShapeAndClickSwing.java diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java similarity index 100% rename from jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java rename to test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedTranslucentPerPixelTranslucentGradient.java b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedTranslucentPerPixelTranslucentGradient.java similarity index 100% rename from jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedTranslucentPerPixelTranslucentGradient.java rename to test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedTranslucentPerPixelTranslucentGradient.java diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java similarity index 100% rename from jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java rename to test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentPerPixelTranslucentGradient.java b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentPerPixelTranslucentGradient.java similarity index 100% rename from jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentPerPixelTranslucentGradient.java rename to test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentPerPixelTranslucentGradient.java diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentWindowClickSwing.java b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentWindowClickSwing.java similarity index 100% rename from jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentWindowClickSwing.java rename to test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentWindowClickSwing.java diff --git a/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java b/test/jdk/javax/swing/KeyboardManager/8013370/Test8013370.java similarity index 100% rename from jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java rename to test/jdk/javax/swing/KeyboardManager/8013370/Test8013370.java diff --git a/jdk/test/javax/swing/LookAndFeel/6439354/TitledBorderTest.java b/test/jdk/javax/swing/LookAndFeel/6439354/TitledBorderTest.java similarity index 100% rename from jdk/test/javax/swing/LookAndFeel/6439354/TitledBorderTest.java rename to test/jdk/javax/swing/LookAndFeel/6439354/TitledBorderTest.java diff --git a/jdk/test/javax/swing/LookAndFeel/6474153/bug6474153.java b/test/jdk/javax/swing/LookAndFeel/6474153/bug6474153.java similarity index 100% rename from jdk/test/javax/swing/LookAndFeel/6474153/bug6474153.java rename to test/jdk/javax/swing/LookAndFeel/6474153/bug6474153.java diff --git a/jdk/test/javax/swing/LookAndFeel/6897701/JMenuItemsTest.java b/test/jdk/javax/swing/LookAndFeel/6897701/JMenuItemsTest.java similarity index 100% rename from jdk/test/javax/swing/LookAndFeel/6897701/JMenuItemsTest.java rename to test/jdk/javax/swing/LookAndFeel/6897701/JMenuItemsTest.java diff --git a/jdk/test/javax/swing/LookAndFeel/8138881/TestOSVersion.java b/test/jdk/javax/swing/LookAndFeel/8138881/TestOSVersion.java similarity index 100% rename from jdk/test/javax/swing/LookAndFeel/8138881/TestOSVersion.java rename to test/jdk/javax/swing/LookAndFeel/8138881/TestOSVersion.java diff --git a/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK.java b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK.java similarity index 100% rename from jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK.java rename to test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK.java diff --git a/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK2.sh b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.sh similarity index 100% rename from jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK2.sh rename to test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.sh diff --git a/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK2.txt b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.txt similarity index 100% rename from jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK2.txt rename to test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.txt diff --git a/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK3.sh b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK3.sh similarity index 100% rename from jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK3.sh rename to test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK3.sh diff --git a/jdk/test/javax/swing/LookAndFeel/8145547/ProvokeGTK.java b/test/jdk/javax/swing/LookAndFeel/8145547/ProvokeGTK.java similarity index 100% rename from jdk/test/javax/swing/LookAndFeel/8145547/ProvokeGTK.java rename to test/jdk/javax/swing/LookAndFeel/8145547/ProvokeGTK.java diff --git a/jdk/test/javax/swing/LookAndFeel/8146276/NimbusGlueTest.java b/test/jdk/javax/swing/LookAndFeel/8146276/NimbusGlueTest.java similarity index 100% rename from jdk/test/javax/swing/LookAndFeel/8146276/NimbusGlueTest.java rename to test/jdk/javax/swing/LookAndFeel/8146276/NimbusGlueTest.java diff --git a/jdk/test/javax/swing/MultiUIDefaults/4300666/bug4300666.html b/test/jdk/javax/swing/MultiUIDefaults/4300666/bug4300666.html similarity index 100% rename from jdk/test/javax/swing/MultiUIDefaults/4300666/bug4300666.html rename to test/jdk/javax/swing/MultiUIDefaults/4300666/bug4300666.html diff --git a/jdk/test/javax/swing/MultiUIDefaults/4300666/bug4300666.java b/test/jdk/javax/swing/MultiUIDefaults/4300666/bug4300666.java similarity index 100% rename from jdk/test/javax/swing/MultiUIDefaults/4300666/bug4300666.java rename to test/jdk/javax/swing/MultiUIDefaults/4300666/bug4300666.java diff --git a/jdk/test/javax/swing/MultiUIDefaults/4331767/bug4331767.java b/test/jdk/javax/swing/MultiUIDefaults/4331767/bug4331767.java similarity index 100% rename from jdk/test/javax/swing/MultiUIDefaults/4331767/bug4331767.java rename to test/jdk/javax/swing/MultiUIDefaults/4331767/bug4331767.java diff --git a/jdk/test/javax/swing/MultiUIDefaults/NPECheck/MultiUIDefaultsNPECheck.java b/test/jdk/javax/swing/MultiUIDefaults/NPECheck/MultiUIDefaultsNPECheck.java similarity index 100% rename from jdk/test/javax/swing/MultiUIDefaults/NPECheck/MultiUIDefaultsNPECheck.java rename to test/jdk/javax/swing/MultiUIDefaults/NPECheck/MultiUIDefaultsNPECheck.java diff --git a/jdk/test/javax/swing/MultiUIDefaults/Test6860438.java b/test/jdk/javax/swing/MultiUIDefaults/Test6860438.java similarity index 100% rename from jdk/test/javax/swing/MultiUIDefaults/Test6860438.java rename to test/jdk/javax/swing/MultiUIDefaults/Test6860438.java diff --git a/jdk/test/javax/swing/Popup/6514582/bug6514582.java b/test/jdk/javax/swing/Popup/6514582/bug6514582.java similarity index 100% rename from jdk/test/javax/swing/Popup/6514582/bug6514582.java rename to test/jdk/javax/swing/Popup/6514582/bug6514582.java diff --git a/jdk/test/javax/swing/Popup/TaskbarPositionTest.java b/test/jdk/javax/swing/Popup/TaskbarPositionTest.java similarity index 100% rename from jdk/test/javax/swing/Popup/TaskbarPositionTest.java rename to test/jdk/javax/swing/Popup/TaskbarPositionTest.java diff --git a/jdk/test/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java b/test/jdk/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java similarity index 100% rename from jdk/test/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java rename to test/jdk/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java diff --git a/jdk/test/javax/swing/PopupFactory/8048506/bug8048506.java b/test/jdk/javax/swing/PopupFactory/8048506/bug8048506.java similarity index 100% rename from jdk/test/javax/swing/PopupFactory/8048506/bug8048506.java rename to test/jdk/javax/swing/PopupFactory/8048506/bug8048506.java diff --git a/jdk/test/javax/swing/ProgressMonitor/ProgressMonitorEscapeKeyPress.java b/test/jdk/javax/swing/ProgressMonitor/ProgressMonitorEscapeKeyPress.java similarity index 100% rename from jdk/test/javax/swing/ProgressMonitor/ProgressMonitorEscapeKeyPress.java rename to test/jdk/javax/swing/ProgressMonitor/ProgressMonitorEscapeKeyPress.java diff --git a/jdk/test/javax/swing/RepaintManager/6608456/bug6608456.java b/test/jdk/javax/swing/RepaintManager/6608456/bug6608456.java similarity index 100% rename from jdk/test/javax/swing/RepaintManager/6608456/bug6608456.java rename to test/jdk/javax/swing/RepaintManager/6608456/bug6608456.java diff --git a/jdk/test/javax/swing/RepaintManager/7013453/bug7013453.java b/test/jdk/javax/swing/RepaintManager/7013453/bug7013453.java similarity index 100% rename from jdk/test/javax/swing/RepaintManager/7013453/bug7013453.java rename to test/jdk/javax/swing/RepaintManager/7013453/bug7013453.java diff --git a/jdk/test/javax/swing/RepaintManager/8162350/RepaintManagerFPUIScaleTest.java b/test/jdk/javax/swing/RepaintManager/8162350/RepaintManagerFPUIScaleTest.java similarity index 100% rename from jdk/test/javax/swing/RepaintManager/8162350/RepaintManagerFPUIScaleTest.java rename to test/jdk/javax/swing/RepaintManager/8162350/RepaintManagerFPUIScaleTest.java diff --git a/jdk/test/javax/swing/RepaintManager/DisplayListenerLeak/DisplayListenerLeak.java b/test/jdk/javax/swing/RepaintManager/DisplayListenerLeak/DisplayListenerLeak.java similarity index 100% rename from jdk/test/javax/swing/RepaintManager/DisplayListenerLeak/DisplayListenerLeak.java rename to test/jdk/javax/swing/RepaintManager/DisplayListenerLeak/DisplayListenerLeak.java diff --git a/jdk/test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java b/test/jdk/javax/swing/RepaintManager/IconifyTest/IconifyTest.java similarity index 100% rename from jdk/test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java rename to test/jdk/javax/swing/RepaintManager/IconifyTest/IconifyTest.java diff --git a/jdk/test/javax/swing/Security/6657138/ComponentTest.java b/test/jdk/javax/swing/Security/6657138/ComponentTest.java similarity index 100% rename from jdk/test/javax/swing/Security/6657138/ComponentTest.java rename to test/jdk/javax/swing/Security/6657138/ComponentTest.java diff --git a/jdk/test/javax/swing/Security/6657138/bug6657138.java b/test/jdk/javax/swing/Security/6657138/bug6657138.java similarity index 100% rename from jdk/test/javax/swing/Security/6657138/bug6657138.java rename to test/jdk/javax/swing/Security/6657138/bug6657138.java diff --git a/jdk/test/javax/swing/Security/6938813/bug6938813.java b/test/jdk/javax/swing/Security/6938813/bug6938813.java similarity index 100% rename from jdk/test/javax/swing/Security/6938813/bug6938813.java rename to test/jdk/javax/swing/Security/6938813/bug6938813.java diff --git a/jdk/test/javax/swing/SpringLayout/4726194/bug4726194.java b/test/jdk/javax/swing/SpringLayout/4726194/bug4726194.java similarity index 100% rename from jdk/test/javax/swing/SpringLayout/4726194/bug4726194.java rename to test/jdk/javax/swing/SpringLayout/4726194/bug4726194.java diff --git a/jdk/test/javax/swing/SwingContainer/SwingContainerIsForContainerOnly/SwingContainerIsForContainerOnly.java b/test/jdk/javax/swing/SwingContainer/SwingContainerIsForContainerOnly/SwingContainerIsForContainerOnly.java similarity index 100% rename from jdk/test/javax/swing/SwingContainer/SwingContainerIsForContainerOnly/SwingContainerIsForContainerOnly.java rename to test/jdk/javax/swing/SwingContainer/SwingContainerIsForContainerOnly/SwingContainerIsForContainerOnly.java diff --git a/jdk/test/javax/swing/SwingTest.java b/test/jdk/javax/swing/SwingTest.java similarity index 100% rename from jdk/test/javax/swing/SwingTest.java rename to test/jdk/javax/swing/SwingTest.java diff --git a/jdk/test/javax/swing/SwingUtilities/4917669/bug4917669.java b/test/jdk/javax/swing/SwingUtilities/4917669/bug4917669.java similarity index 100% rename from jdk/test/javax/swing/SwingUtilities/4917669/bug4917669.java rename to test/jdk/javax/swing/SwingUtilities/4917669/bug4917669.java diff --git a/jdk/test/javax/swing/SwingUtilities/6797139/bug6797139.java b/test/jdk/javax/swing/SwingUtilities/6797139/bug6797139.java similarity index 100% rename from jdk/test/javax/swing/SwingUtilities/6797139/bug6797139.java rename to test/jdk/javax/swing/SwingUtilities/6797139/bug6797139.java diff --git a/jdk/test/javax/swing/SwingUtilities/7088744/bug7088744.java b/test/jdk/javax/swing/SwingUtilities/7088744/bug7088744.java similarity index 100% rename from jdk/test/javax/swing/SwingUtilities/7088744/bug7088744.java rename to test/jdk/javax/swing/SwingUtilities/7088744/bug7088744.java diff --git a/jdk/test/javax/swing/SwingUtilities/7146377/bug7146377.java b/test/jdk/javax/swing/SwingUtilities/7146377/bug7146377.java similarity index 100% rename from jdk/test/javax/swing/SwingUtilities/7146377/bug7146377.java rename to test/jdk/javax/swing/SwingUtilities/7146377/bug7146377.java diff --git a/jdk/test/javax/swing/SwingUtilities/7170657/bug7170657.java b/test/jdk/javax/swing/SwingUtilities/7170657/bug7170657.java similarity index 100% rename from jdk/test/javax/swing/SwingUtilities/7170657/bug7170657.java rename to test/jdk/javax/swing/SwingUtilities/7170657/bug7170657.java diff --git a/jdk/test/javax/swing/SwingUtilities/8032219/DrawRect.java b/test/jdk/javax/swing/SwingUtilities/8032219/DrawRect.java similarity index 100% rename from jdk/test/javax/swing/SwingUtilities/8032219/DrawRect.java rename to test/jdk/javax/swing/SwingUtilities/8032219/DrawRect.java diff --git a/jdk/test/javax/swing/SwingUtilities/8049533/bug8049533.java b/test/jdk/javax/swing/SwingUtilities/8049533/bug8049533.java similarity index 100% rename from jdk/test/javax/swing/SwingUtilities/8049533/bug8049533.java rename to test/jdk/javax/swing/SwingUtilities/8049533/bug8049533.java diff --git a/jdk/test/javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java b/test/jdk/javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java similarity index 100% rename from jdk/test/javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java rename to test/jdk/javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java diff --git a/jdk/test/javax/swing/SwingWorker/6432565/bug6432565.java b/test/jdk/javax/swing/SwingWorker/6432565/bug6432565.java similarity index 100% rename from jdk/test/javax/swing/SwingWorker/6432565/bug6432565.java rename to test/jdk/javax/swing/SwingWorker/6432565/bug6432565.java diff --git a/jdk/test/javax/swing/SwingWorker/6493680/bug6493680.java b/test/jdk/javax/swing/SwingWorker/6493680/bug6493680.java similarity index 100% rename from jdk/test/javax/swing/SwingWorker/6493680/bug6493680.java rename to test/jdk/javax/swing/SwingWorker/6493680/bug6493680.java diff --git a/jdk/test/javax/swing/SwingWorker/6880336/NestedWorkers.java b/test/jdk/javax/swing/SwingWorker/6880336/NestedWorkers.java similarity index 100% rename from jdk/test/javax/swing/SwingWorker/6880336/NestedWorkers.java rename to test/jdk/javax/swing/SwingWorker/6880336/NestedWorkers.java diff --git a/jdk/test/javax/swing/TEST.properties b/test/jdk/javax/swing/TEST.properties similarity index 100% rename from jdk/test/javax/swing/TEST.properties rename to test/jdk/javax/swing/TEST.properties diff --git a/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java b/test/jdk/javax/swing/ToolTipManager/7123767/bug7123767.java similarity index 100% rename from jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java rename to test/jdk/javax/swing/ToolTipManager/7123767/bug7123767.java diff --git a/jdk/test/javax/swing/ToolTipManager/Test6256140.java b/test/jdk/javax/swing/ToolTipManager/Test6256140.java similarity index 100% rename from jdk/test/javax/swing/ToolTipManager/Test6256140.java rename to test/jdk/javax/swing/ToolTipManager/Test6256140.java diff --git a/jdk/test/javax/swing/ToolTipManager/Test6657026.java b/test/jdk/javax/swing/ToolTipManager/Test6657026.java similarity index 100% rename from jdk/test/javax/swing/ToolTipManager/Test6657026.java rename to test/jdk/javax/swing/ToolTipManager/Test6657026.java diff --git a/jdk/test/javax/swing/UI/UnninstallUIMemoryLeaks/UnninstallUIMemoryLeaks.java b/test/jdk/javax/swing/UI/UnninstallUIMemoryLeaks/UnninstallUIMemoryLeaks.java similarity index 100% rename from jdk/test/javax/swing/UI/UnninstallUIMemoryLeaks/UnninstallUIMemoryLeaks.java rename to test/jdk/javax/swing/UI/UnninstallUIMemoryLeaks/UnninstallUIMemoryLeaks.java diff --git a/jdk/test/javax/swing/UIDefaults/6302464/bug6302464.java b/test/jdk/javax/swing/UIDefaults/6302464/bug6302464.java similarity index 100% rename from jdk/test/javax/swing/UIDefaults/6302464/bug6302464.java rename to test/jdk/javax/swing/UIDefaults/6302464/bug6302464.java diff --git a/jdk/test/javax/swing/UIDefaults/6622002/bug6622002.java b/test/jdk/javax/swing/UIDefaults/6622002/bug6622002.java similarity index 100% rename from jdk/test/javax/swing/UIDefaults/6622002/bug6622002.java rename to test/jdk/javax/swing/UIDefaults/6622002/bug6622002.java diff --git a/jdk/test/javax/swing/UIDefaults/6795356/TableTest.java b/test/jdk/javax/swing/UIDefaults/6795356/TableTest.java similarity index 100% rename from jdk/test/javax/swing/UIDefaults/6795356/TableTest.java rename to test/jdk/javax/swing/UIDefaults/6795356/TableTest.java diff --git a/jdk/test/javax/swing/UIDefaults/6795356/bug6795356.java b/test/jdk/javax/swing/UIDefaults/6795356/bug6795356.java similarity index 100% rename from jdk/test/javax/swing/UIDefaults/6795356/bug6795356.java rename to test/jdk/javax/swing/UIDefaults/6795356/bug6795356.java diff --git a/jdk/test/javax/swing/UIDefaults/7180976/Pending.java b/test/jdk/javax/swing/UIDefaults/7180976/Pending.java similarity index 100% rename from jdk/test/javax/swing/UIDefaults/7180976/Pending.java rename to test/jdk/javax/swing/UIDefaults/7180976/Pending.java diff --git a/jdk/test/javax/swing/UIDefaults/8080972/TestProxyLazyValue.java b/test/jdk/javax/swing/UIDefaults/8080972/TestProxyLazyValue.java similarity index 100% rename from jdk/test/javax/swing/UIDefaults/8080972/TestProxyLazyValue.java rename to test/jdk/javax/swing/UIDefaults/8080972/TestProxyLazyValue.java diff --git a/jdk/test/javax/swing/UIDefaults/8133926/InternalFrameIcon.java b/test/jdk/javax/swing/UIDefaults/8133926/InternalFrameIcon.java similarity index 100% rename from jdk/test/javax/swing/UIDefaults/8133926/InternalFrameIcon.java rename to test/jdk/javax/swing/UIDefaults/8133926/InternalFrameIcon.java diff --git a/jdk/test/javax/swing/UIDefaults/8149879/InternalResourceBundle.java b/test/jdk/javax/swing/UIDefaults/8149879/InternalResourceBundle.java similarity index 100% rename from jdk/test/javax/swing/UIDefaults/8149879/InternalResourceBundle.java rename to test/jdk/javax/swing/UIDefaults/8149879/InternalResourceBundle.java diff --git a/jdk/test/javax/swing/UIManager/8136366/CreateLookAndFeelTest.java b/test/jdk/javax/swing/UIManager/8136366/CreateLookAndFeelTest.java similarity index 100% rename from jdk/test/javax/swing/UIManager/8136366/CreateLookAndFeelTest.java rename to test/jdk/javax/swing/UIManager/8136366/CreateLookAndFeelTest.java diff --git a/jdk/test/javax/swing/UIManager/Test6657026.java b/test/jdk/javax/swing/UIManager/Test6657026.java similarity index 100% rename from jdk/test/javax/swing/UIManager/Test6657026.java rename to test/jdk/javax/swing/UIManager/Test6657026.java diff --git a/jdk/test/javax/swing/UITest/UITest.java b/test/jdk/javax/swing/UITest/UITest.java similarity index 100% rename from jdk/test/javax/swing/UITest/UITest.java rename to test/jdk/javax/swing/UITest/UITest.java diff --git a/jdk/test/javax/swing/border/8152159/TitledBorderLabelUITest.java b/test/jdk/javax/swing/border/8152159/TitledBorderLabelUITest.java similarity index 100% rename from jdk/test/javax/swing/border/8152159/TitledBorderLabelUITest.java rename to test/jdk/javax/swing/border/8152159/TitledBorderLabelUITest.java diff --git a/jdk/test/javax/swing/border/Test4120351.java b/test/jdk/javax/swing/border/Test4120351.java similarity index 100% rename from jdk/test/javax/swing/border/Test4120351.java rename to test/jdk/javax/swing/border/Test4120351.java diff --git a/jdk/test/javax/swing/border/Test4124729.java b/test/jdk/javax/swing/border/Test4124729.java similarity index 100% rename from jdk/test/javax/swing/border/Test4124729.java rename to test/jdk/javax/swing/border/Test4124729.java diff --git a/jdk/test/javax/swing/border/Test4129681.html b/test/jdk/javax/swing/border/Test4129681.html similarity index 100% rename from jdk/test/javax/swing/border/Test4129681.html rename to test/jdk/javax/swing/border/Test4129681.html diff --git a/jdk/test/javax/swing/border/Test4129681.java b/test/jdk/javax/swing/border/Test4129681.java similarity index 100% rename from jdk/test/javax/swing/border/Test4129681.java rename to test/jdk/javax/swing/border/Test4129681.java diff --git a/jdk/test/javax/swing/border/Test4243289.html b/test/jdk/javax/swing/border/Test4243289.html similarity index 100% rename from jdk/test/javax/swing/border/Test4243289.html rename to test/jdk/javax/swing/border/Test4243289.html diff --git a/jdk/test/javax/swing/border/Test4243289.java b/test/jdk/javax/swing/border/Test4243289.java similarity index 100% rename from jdk/test/javax/swing/border/Test4243289.java rename to test/jdk/javax/swing/border/Test4243289.java diff --git a/jdk/test/javax/swing/border/Test4247606.html b/test/jdk/javax/swing/border/Test4247606.html similarity index 100% rename from jdk/test/javax/swing/border/Test4247606.html rename to test/jdk/javax/swing/border/Test4247606.html diff --git a/jdk/test/javax/swing/border/Test4247606.java b/test/jdk/javax/swing/border/Test4247606.java similarity index 100% rename from jdk/test/javax/swing/border/Test4247606.java rename to test/jdk/javax/swing/border/Test4247606.java diff --git a/jdk/test/javax/swing/border/Test4252164.html b/test/jdk/javax/swing/border/Test4252164.html similarity index 100% rename from jdk/test/javax/swing/border/Test4252164.html rename to test/jdk/javax/swing/border/Test4252164.html diff --git a/jdk/test/javax/swing/border/Test4252164.java b/test/jdk/javax/swing/border/Test4252164.java similarity index 100% rename from jdk/test/javax/swing/border/Test4252164.java rename to test/jdk/javax/swing/border/Test4252164.java diff --git a/jdk/test/javax/swing/border/Test4760089.html b/test/jdk/javax/swing/border/Test4760089.html similarity index 100% rename from jdk/test/javax/swing/border/Test4760089.html rename to test/jdk/javax/swing/border/Test4760089.html diff --git a/jdk/test/javax/swing/border/Test4760089.java b/test/jdk/javax/swing/border/Test4760089.java similarity index 100% rename from jdk/test/javax/swing/border/Test4760089.java rename to test/jdk/javax/swing/border/Test4760089.java diff --git a/jdk/test/javax/swing/border/Test4856008.java b/test/jdk/javax/swing/border/Test4856008.java similarity index 100% rename from jdk/test/javax/swing/border/Test4856008.java rename to test/jdk/javax/swing/border/Test4856008.java diff --git a/jdk/test/javax/swing/border/Test6461042.java b/test/jdk/javax/swing/border/Test6461042.java similarity index 100% rename from jdk/test/javax/swing/border/Test6461042.java rename to test/jdk/javax/swing/border/Test6461042.java diff --git a/jdk/test/javax/swing/border/Test6625450.java b/test/jdk/javax/swing/border/Test6625450.java similarity index 100% rename from jdk/test/javax/swing/border/Test6625450.java rename to test/jdk/javax/swing/border/Test6625450.java diff --git a/jdk/test/javax/swing/border/Test6910490.html b/test/jdk/javax/swing/border/Test6910490.html similarity index 100% rename from jdk/test/javax/swing/border/Test6910490.html rename to test/jdk/javax/swing/border/Test6910490.html diff --git a/jdk/test/javax/swing/border/Test6910490.java b/test/jdk/javax/swing/border/Test6910490.java similarity index 100% rename from jdk/test/javax/swing/border/Test6910490.java rename to test/jdk/javax/swing/border/Test6910490.java diff --git a/jdk/test/javax/swing/border/Test6978482.java b/test/jdk/javax/swing/border/Test6978482.java similarity index 100% rename from jdk/test/javax/swing/border/Test6978482.java rename to test/jdk/javax/swing/border/Test6978482.java diff --git a/jdk/test/javax/swing/border/Test6981576.java b/test/jdk/javax/swing/border/Test6981576.java similarity index 100% rename from jdk/test/javax/swing/border/Test6981576.java rename to test/jdk/javax/swing/border/Test6981576.java diff --git a/jdk/test/javax/swing/border/Test7022041.java b/test/jdk/javax/swing/border/Test7022041.java similarity index 100% rename from jdk/test/javax/swing/border/Test7022041.java rename to test/jdk/javax/swing/border/Test7022041.java diff --git a/jdk/test/javax/swing/border/Test7034614.java b/test/jdk/javax/swing/border/Test7034614.java similarity index 100% rename from jdk/test/javax/swing/border/Test7034614.java rename to test/jdk/javax/swing/border/Test7034614.java diff --git a/jdk/test/javax/swing/border/Test7149090.java b/test/jdk/javax/swing/border/Test7149090.java similarity index 100% rename from jdk/test/javax/swing/border/Test7149090.java rename to test/jdk/javax/swing/border/Test7149090.java diff --git a/jdk/test/javax/swing/dnd/7171812/JListWithScroll.java b/test/jdk/javax/swing/dnd/7171812/JListWithScroll.java similarity index 100% rename from jdk/test/javax/swing/dnd/7171812/JListWithScroll.java rename to test/jdk/javax/swing/dnd/7171812/JListWithScroll.java diff --git a/jdk/test/javax/swing/dnd/7171812/bug7171812.java b/test/jdk/javax/swing/dnd/7171812/bug7171812.java similarity index 100% rename from jdk/test/javax/swing/dnd/7171812/bug7171812.java rename to test/jdk/javax/swing/dnd/7171812/bug7171812.java diff --git a/jdk/test/javax/swing/dnd/8080972/TestTransferHandler.java b/test/jdk/javax/swing/dnd/8080972/TestTransferHandler.java similarity index 100% rename from jdk/test/javax/swing/dnd/8080972/TestTransferHandler.java rename to test/jdk/javax/swing/dnd/8080972/TestTransferHandler.java diff --git a/jdk/test/javax/swing/dnd/8139050/NativeErrorsInTableDnD.java b/test/jdk/javax/swing/dnd/8139050/NativeErrorsInTableDnD.java similarity index 100% rename from jdk/test/javax/swing/dnd/8139050/NativeErrorsInTableDnD.java rename to test/jdk/javax/swing/dnd/8139050/NativeErrorsInTableDnD.java diff --git a/jdk/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java b/test/jdk/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java similarity index 100% rename from jdk/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java rename to test/jdk/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java diff --git a/jdk/test/javax/swing/plaf/basic/6866751/bug6866751.java b/test/jdk/javax/swing/plaf/basic/6866751/bug6866751.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/6866751/bug6866751.java rename to test/jdk/javax/swing/plaf/basic/6866751/bug6866751.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicComboBoxEditor/Test8015336.java b/test/jdk/javax/swing/plaf/basic/BasicComboBoxEditor/Test8015336.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicComboBoxEditor/Test8015336.java rename to test/jdk/javax/swing/plaf/basic/BasicComboBoxEditor/Test8015336.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicComboPopup/7072653/bug7072653.java b/test/jdk/javax/swing/plaf/basic/BasicComboPopup/7072653/bug7072653.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicComboPopup/7072653/bug7072653.java rename to test/jdk/javax/swing/plaf/basic/BasicComboPopup/7072653/bug7072653.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java b/test/jdk/javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java rename to test/jdk/javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation/JComboBoxPopupLocation.java b/test/jdk/javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation/JComboBoxPopupLocation.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation/JComboBoxPopupLocation.java rename to test/jdk/javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation/JComboBoxPopupLocation.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java b/test/jdk/javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java rename to test/jdk/javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java b/test/jdk/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java rename to test/jdk/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java b/test/jdk/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java rename to test/jdk/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicLabelUI/bug7172652.java b/test/jdk/javax/swing/plaf/basic/BasicLabelUI/bug7172652.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicLabelUI/bug7172652.java rename to test/jdk/javax/swing/plaf/basic/BasicLabelUI/bug7172652.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java b/test/jdk/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java rename to test/jdk/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicRootPaneUI/HiddenDefaultButtonTest.java b/test/jdk/javax/swing/plaf/basic/BasicRootPaneUI/HiddenDefaultButtonTest.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicRootPaneUI/HiddenDefaultButtonTest.java rename to test/jdk/javax/swing/plaf/basic/BasicRootPaneUI/HiddenDefaultButtonTest.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/8166591/TooMuchWheelRotationEventsTest.java b/test/jdk/javax/swing/plaf/basic/BasicScrollPaneUI/8166591/TooMuchWheelRotationEventsTest.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/8166591/TooMuchWheelRotationEventsTest.java rename to test/jdk/javax/swing/plaf/basic/BasicScrollPaneUI/8166591/TooMuchWheelRotationEventsTest.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/Test6632810.java b/test/jdk/javax/swing/plaf/basic/BasicScrollPaneUI/Test6632810.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/Test6632810.java rename to test/jdk/javax/swing/plaf/basic/BasicScrollPaneUI/Test6632810.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java b/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java rename to test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicTabbedPaneUI/Test6943780.java b/test/jdk/javax/swing/plaf/basic/BasicTabbedPaneUI/Test6943780.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicTabbedPaneUI/Test6943780.java rename to test/jdk/javax/swing/plaf/basic/BasicTabbedPaneUI/Test6943780.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java b/test/jdk/javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java rename to test/jdk/javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java diff --git a/jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java b/test/jdk/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java rename to test/jdk/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java diff --git a/jdk/test/javax/swing/plaf/basic/Test6984643.java b/test/jdk/javax/swing/plaf/basic/Test6984643.java similarity index 100% rename from jdk/test/javax/swing/plaf/basic/Test6984643.java rename to test/jdk/javax/swing/plaf/basic/Test6984643.java diff --git a/jdk/test/javax/swing/plaf/gtk/crash/RenderBadPictureCrash.java b/test/jdk/javax/swing/plaf/gtk/crash/RenderBadPictureCrash.java similarity index 100% rename from jdk/test/javax/swing/plaf/gtk/crash/RenderBadPictureCrash.java rename to test/jdk/javax/swing/plaf/gtk/crash/RenderBadPictureCrash.java diff --git a/jdk/test/javax/swing/plaf/metal/MetalBorders/Test6657026.java b/test/jdk/javax/swing/plaf/metal/MetalBorders/Test6657026.java similarity index 100% rename from jdk/test/javax/swing/plaf/metal/MetalBorders/Test6657026.java rename to test/jdk/javax/swing/plaf/metal/MetalBorders/Test6657026.java diff --git a/jdk/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java b/test/jdk/javax/swing/plaf/metal/MetalBumps/Test6657026.java similarity index 100% rename from jdk/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java rename to test/jdk/javax/swing/plaf/metal/MetalBumps/Test6657026.java diff --git a/jdk/test/javax/swing/plaf/metal/MetalGradient/8163193/ButtonGradientTest.java b/test/jdk/javax/swing/plaf/metal/MetalGradient/8163193/ButtonGradientTest.java similarity index 100% rename from jdk/test/javax/swing/plaf/metal/MetalGradient/8163193/ButtonGradientTest.java rename to test/jdk/javax/swing/plaf/metal/MetalGradient/8163193/ButtonGradientTest.java diff --git a/jdk/test/javax/swing/plaf/metal/MetalIcons/MetalHiDPIIconsTest.java b/test/jdk/javax/swing/plaf/metal/MetalIcons/MetalHiDPIIconsTest.java similarity index 100% rename from jdk/test/javax/swing/plaf/metal/MetalIcons/MetalHiDPIIconsTest.java rename to test/jdk/javax/swing/plaf/metal/MetalIcons/MetalHiDPIIconsTest.java diff --git a/jdk/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java b/test/jdk/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java similarity index 100% rename from jdk/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java rename to test/jdk/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java diff --git a/jdk/test/javax/swing/plaf/metal/MetalLookAndFeel/5073047/bug5073047.java b/test/jdk/javax/swing/plaf/metal/MetalLookAndFeel/5073047/bug5073047.java similarity index 100% rename from jdk/test/javax/swing/plaf/metal/MetalLookAndFeel/5073047/bug5073047.java rename to test/jdk/javax/swing/plaf/metal/MetalLookAndFeel/5073047/bug5073047.java diff --git a/jdk/test/javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java b/test/jdk/javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java similarity index 100% rename from jdk/test/javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java rename to test/jdk/javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java diff --git a/jdk/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java b/test/jdk/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java similarity index 100% rename from jdk/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java rename to test/jdk/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java diff --git a/jdk/test/javax/swing/plaf/metal/MetalUtils/bug6190373.java b/test/jdk/javax/swing/plaf/metal/MetalUtils/bug6190373.java similarity index 100% rename from jdk/test/javax/swing/plaf/metal/MetalUtils/bug6190373.java rename to test/jdk/javax/swing/plaf/metal/MetalUtils/bug6190373.java diff --git a/jdk/test/javax/swing/plaf/motif/8165485/MotifHiDPIIconsTest.java b/test/jdk/javax/swing/plaf/motif/8165485/MotifHiDPIIconsTest.java similarity index 100% rename from jdk/test/javax/swing/plaf/motif/8165485/MotifHiDPIIconsTest.java rename to test/jdk/javax/swing/plaf/motif/8165485/MotifHiDPIIconsTest.java diff --git a/jdk/test/javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java b/test/jdk/javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java rename to test/jdk/javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java diff --git a/jdk/test/javax/swing/plaf/nimbus/8041642/bug8041642.java b/test/jdk/javax/swing/plaf/nimbus/8041642/bug8041642.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/8041642/bug8041642.java rename to test/jdk/javax/swing/plaf/nimbus/8041642/bug8041642.java diff --git a/jdk/test/javax/swing/plaf/nimbus/8041725/bug8041725.java b/test/jdk/javax/swing/plaf/nimbus/8041725/bug8041725.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/8041725/bug8041725.java rename to test/jdk/javax/swing/plaf/nimbus/8041725/bug8041725.java diff --git a/jdk/test/javax/swing/plaf/nimbus/8057791/bug8057791.java b/test/jdk/javax/swing/plaf/nimbus/8057791/bug8057791.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/8057791/bug8057791.java rename to test/jdk/javax/swing/plaf/nimbus/8057791/bug8057791.java diff --git a/jdk/test/javax/swing/plaf/nimbus/8080972/TestAbstractRegionPainter.java b/test/jdk/javax/swing/plaf/nimbus/8080972/TestAbstractRegionPainter.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/8080972/TestAbstractRegionPainter.java rename to test/jdk/javax/swing/plaf/nimbus/8080972/TestAbstractRegionPainter.java diff --git a/jdk/test/javax/swing/plaf/nimbus/AbstractRegionPainter/PaintContextScaleValidation.java b/test/jdk/javax/swing/plaf/nimbus/AbstractRegionPainter/PaintContextScaleValidation.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/AbstractRegionPainter/PaintContextScaleValidation.java rename to test/jdk/javax/swing/plaf/nimbus/AbstractRegionPainter/PaintContextScaleValidation.java diff --git a/jdk/test/javax/swing/plaf/nimbus/ColorCustomizationTest.java b/test/jdk/javax/swing/plaf/nimbus/ColorCustomizationTest.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/ColorCustomizationTest.java rename to test/jdk/javax/swing/plaf/nimbus/ColorCustomizationTest.java diff --git a/jdk/test/javax/swing/plaf/nimbus/Test6741426.java b/test/jdk/javax/swing/plaf/nimbus/Test6741426.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/Test6741426.java rename to test/jdk/javax/swing/plaf/nimbus/Test6741426.java diff --git a/jdk/test/javax/swing/plaf/nimbus/Test6849805.java b/test/jdk/javax/swing/plaf/nimbus/Test6849805.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/Test6849805.java rename to test/jdk/javax/swing/plaf/nimbus/Test6849805.java diff --git a/jdk/test/javax/swing/plaf/nimbus/Test6919629.java b/test/jdk/javax/swing/plaf/nimbus/Test6919629.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/Test6919629.java rename to test/jdk/javax/swing/plaf/nimbus/Test6919629.java diff --git a/jdk/test/javax/swing/plaf/nimbus/Test7048204.java b/test/jdk/javax/swing/plaf/nimbus/Test7048204.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/Test7048204.java rename to test/jdk/javax/swing/plaf/nimbus/Test7048204.java diff --git a/jdk/test/javax/swing/plaf/nimbus/TestDisabledToolTipBorder.java b/test/jdk/javax/swing/plaf/nimbus/TestDisabledToolTipBorder.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/TestDisabledToolTipBorder.java rename to test/jdk/javax/swing/plaf/nimbus/TestDisabledToolTipBorder.java diff --git a/jdk/test/javax/swing/plaf/nimbus/TestNimbusOverride.java b/test/jdk/javax/swing/plaf/nimbus/TestNimbusOverride.java similarity index 100% rename from jdk/test/javax/swing/plaf/nimbus/TestNimbusOverride.java rename to test/jdk/javax/swing/plaf/nimbus/TestNimbusOverride.java diff --git a/jdk/test/javax/swing/plaf/synth/6771547/SynthTest.java b/test/jdk/javax/swing/plaf/synth/6771547/SynthTest.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/6771547/SynthTest.java rename to test/jdk/javax/swing/plaf/synth/6771547/SynthTest.java diff --git a/jdk/test/javax/swing/plaf/synth/6771547/synthconfig.xml b/test/jdk/javax/swing/plaf/synth/6771547/synthconfig.xml similarity index 100% rename from jdk/test/javax/swing/plaf/synth/6771547/synthconfig.xml rename to test/jdk/javax/swing/plaf/synth/6771547/synthconfig.xml diff --git a/jdk/test/javax/swing/plaf/synth/7032791/bug7032791.java b/test/jdk/javax/swing/plaf/synth/7032791/bug7032791.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/7032791/bug7032791.java rename to test/jdk/javax/swing/plaf/synth/7032791/bug7032791.java diff --git a/jdk/test/javax/swing/plaf/synth/7143614/bug7143614.java b/test/jdk/javax/swing/plaf/synth/7143614/bug7143614.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/7143614/bug7143614.java rename to test/jdk/javax/swing/plaf/synth/7143614/bug7143614.java diff --git a/jdk/test/javax/swing/plaf/synth/7158712/bug7158712.java b/test/jdk/javax/swing/plaf/synth/7158712/bug7158712.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/7158712/bug7158712.java rename to test/jdk/javax/swing/plaf/synth/7158712/bug7158712.java diff --git a/jdk/test/javax/swing/plaf/synth/8040328/bug8040328.java b/test/jdk/javax/swing/plaf/synth/8040328/bug8040328.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/8040328/bug8040328.java rename to test/jdk/javax/swing/plaf/synth/8040328/bug8040328.java diff --git a/jdk/test/javax/swing/plaf/synth/8081411/bug8081411.java b/test/jdk/javax/swing/plaf/synth/8081411/bug8081411.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/8081411/bug8081411.java rename to test/jdk/javax/swing/plaf/synth/8081411/bug8081411.java diff --git a/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java b/test/jdk/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java rename to test/jdk/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java diff --git a/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.xml b/test/jdk/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.xml similarity index 100% rename from jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.xml rename to test/jdk/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.xml diff --git a/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/red.gif b/test/jdk/javax/swing/plaf/synth/SynthButtonUI/6276188/red.gif similarity index 100% rename from jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/red.gif rename to test/jdk/javax/swing/plaf/synth/SynthButtonUI/6276188/red.gif diff --git a/jdk/test/javax/swing/plaf/synth/SynthScrollbarThumbPainter/SynthScrollbarThumbPainterTest.java b/test/jdk/javax/swing/plaf/synth/SynthScrollbarThumbPainter/SynthScrollbarThumbPainterTest.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/SynthScrollbarThumbPainter/SynthScrollbarThumbPainterTest.java rename to test/jdk/javax/swing/plaf/synth/SynthScrollbarThumbPainter/SynthScrollbarThumbPainterTest.java diff --git a/jdk/test/javax/swing/plaf/synth/SynthToolBarUI/6739756/bug6739756.java b/test/jdk/javax/swing/plaf/synth/SynthToolBarUI/6739756/bug6739756.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/SynthToolBarUI/6739756/bug6739756.java rename to test/jdk/javax/swing/plaf/synth/SynthToolBarUI/6739756/bug6739756.java diff --git a/jdk/test/javax/swing/plaf/synth/Test6660049.java b/test/jdk/javax/swing/plaf/synth/Test6660049.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/Test6660049.java rename to test/jdk/javax/swing/plaf/synth/Test6660049.java diff --git a/jdk/test/javax/swing/plaf/synth/Test6933784.java b/test/jdk/javax/swing/plaf/synth/Test6933784.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/Test6933784.java rename to test/jdk/javax/swing/plaf/synth/Test6933784.java diff --git a/jdk/test/javax/swing/plaf/synth/Test8015926.java b/test/jdk/javax/swing/plaf/synth/Test8015926.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/Test8015926.java rename to test/jdk/javax/swing/plaf/synth/Test8015926.java diff --git a/jdk/test/javax/swing/plaf/synth/Test8043627.java b/test/jdk/javax/swing/plaf/synth/Test8043627.java similarity index 100% rename from jdk/test/javax/swing/plaf/synth/Test8043627.java rename to test/jdk/javax/swing/plaf/synth/Test8043627.java diff --git a/jdk/test/javax/swing/plaf/windows/6921687/bug6921687.java b/test/jdk/javax/swing/plaf/windows/6921687/bug6921687.java similarity index 100% rename from jdk/test/javax/swing/plaf/windows/6921687/bug6921687.java rename to test/jdk/javax/swing/plaf/windows/6921687/bug6921687.java diff --git a/jdk/test/javax/swing/plaf/windows/8165594/WindowsClassicHiDPIIconsTest.java b/test/jdk/javax/swing/plaf/windows/8165594/WindowsClassicHiDPIIconsTest.java similarity index 100% rename from jdk/test/javax/swing/plaf/windows/8165594/WindowsClassicHiDPIIconsTest.java rename to test/jdk/javax/swing/plaf/windows/8165594/WindowsClassicHiDPIIconsTest.java diff --git a/jdk/test/javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java b/test/jdk/javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java similarity index 100% rename from jdk/test/javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java rename to test/jdk/javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java diff --git a/jdk/test/javax/swing/regtesthelpers/JRobot.java b/test/jdk/javax/swing/regtesthelpers/JRobot.java similarity index 100% rename from jdk/test/javax/swing/regtesthelpers/JRobot.java rename to test/jdk/javax/swing/regtesthelpers/JRobot.java diff --git a/jdk/test/javax/swing/regtesthelpers/SwingTestHelper.java b/test/jdk/javax/swing/regtesthelpers/SwingTestHelper.java similarity index 100% rename from jdk/test/javax/swing/regtesthelpers/SwingTestHelper.java rename to test/jdk/javax/swing/regtesthelpers/SwingTestHelper.java diff --git a/jdk/test/javax/swing/regtesthelpers/Test.java b/test/jdk/javax/swing/regtesthelpers/Test.java similarity index 100% rename from jdk/test/javax/swing/regtesthelpers/Test.java rename to test/jdk/javax/swing/regtesthelpers/Test.java diff --git a/jdk/test/javax/swing/regtesthelpers/Util.java b/test/jdk/javax/swing/regtesthelpers/Util.java similarity index 100% rename from jdk/test/javax/swing/regtesthelpers/Util.java rename to test/jdk/javax/swing/regtesthelpers/Util.java diff --git a/jdk/test/javax/swing/reliability/GUIUndFrame.java b/test/jdk/javax/swing/reliability/GUIUndFrame.java similarity index 100% rename from jdk/test/javax/swing/reliability/GUIUndFrame.java rename to test/jdk/javax/swing/reliability/GUIUndFrame.java diff --git a/jdk/test/javax/swing/reliability/GUIZoomFrame.java b/test/jdk/javax/swing/reliability/GUIZoomFrame.java similarity index 100% rename from jdk/test/javax/swing/reliability/GUIZoomFrame.java rename to test/jdk/javax/swing/reliability/GUIZoomFrame.java diff --git a/jdk/test/javax/swing/reliability/Task.java b/test/jdk/javax/swing/reliability/Task.java similarity index 100% rename from jdk/test/javax/swing/reliability/Task.java rename to test/jdk/javax/swing/reliability/Task.java diff --git a/jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java b/test/jdk/javax/swing/reliability/TaskUndJFrameProperties.java similarity index 100% rename from jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java rename to test/jdk/javax/swing/reliability/TaskUndJFrameProperties.java diff --git a/jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java b/test/jdk/javax/swing/reliability/TaskZoomJFrameChangeState.java similarity index 100% rename from jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java rename to test/jdk/javax/swing/reliability/TaskZoomJFrameChangeState.java diff --git a/jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java b/test/jdk/javax/swing/reliability/TaskZoomJFrameRepaint.java similarity index 100% rename from jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java rename to test/jdk/javax/swing/reliability/TaskZoomJFrameRepaint.java diff --git a/jdk/test/javax/swing/system/6799345/TestShutdown.java b/test/jdk/javax/swing/system/6799345/TestShutdown.java similarity index 100% rename from jdk/test/javax/swing/system/6799345/TestShutdown.java rename to test/jdk/javax/swing/system/6799345/TestShutdown.java diff --git a/jdk/test/javax/swing/text/AbstractDocument/6968363/Test6968363.java b/test/jdk/javax/swing/text/AbstractDocument/6968363/Test6968363.java similarity index 100% rename from jdk/test/javax/swing/text/AbstractDocument/6968363/Test6968363.java rename to test/jdk/javax/swing/text/AbstractDocument/6968363/Test6968363.java diff --git a/jdk/test/javax/swing/text/AbstractDocument/8030118/Test8030118.java b/test/jdk/javax/swing/text/AbstractDocument/8030118/Test8030118.java similarity index 100% rename from jdk/test/javax/swing/text/AbstractDocument/8030118/Test8030118.java rename to test/jdk/javax/swing/text/AbstractDocument/8030118/Test8030118.java diff --git a/jdk/test/javax/swing/text/AbstractDocument/DocumentInsert/DocumentInsertAtWrongPositionTest.java b/test/jdk/javax/swing/text/AbstractDocument/DocumentInsert/DocumentInsertAtWrongPositionTest.java similarity index 100% rename from jdk/test/javax/swing/text/AbstractDocument/DocumentInsert/DocumentInsertAtWrongPositionTest.java rename to test/jdk/javax/swing/text/AbstractDocument/DocumentInsert/DocumentInsertAtWrongPositionTest.java diff --git a/jdk/test/javax/swing/text/CSSBorder/6796710/bug6796710.java b/test/jdk/javax/swing/text/CSSBorder/6796710/bug6796710.java similarity index 100% rename from jdk/test/javax/swing/text/CSSBorder/6796710/bug6796710.java rename to test/jdk/javax/swing/text/CSSBorder/6796710/bug6796710.java diff --git a/jdk/test/javax/swing/text/Caret/8163124/CaretFloatingPointAPITest.java b/test/jdk/javax/swing/text/Caret/8163124/CaretFloatingPointAPITest.java similarity index 100% rename from jdk/test/javax/swing/text/Caret/8163124/CaretFloatingPointAPITest.java rename to test/jdk/javax/swing/text/Caret/8163124/CaretFloatingPointAPITest.java diff --git a/jdk/test/javax/swing/text/DefaultCaret/6938583/bug6938583.java b/test/jdk/javax/swing/text/DefaultCaret/6938583/bug6938583.java similarity index 100% rename from jdk/test/javax/swing/text/DefaultCaret/6938583/bug6938583.java rename to test/jdk/javax/swing/text/DefaultCaret/6938583/bug6938583.java diff --git a/jdk/test/javax/swing/text/DefaultCaret/7083457/bug7083457.java b/test/jdk/javax/swing/text/DefaultCaret/7083457/bug7083457.java similarity index 100% rename from jdk/test/javax/swing/text/DefaultCaret/7083457/bug7083457.java rename to test/jdk/javax/swing/text/DefaultCaret/7083457/bug7083457.java diff --git a/jdk/test/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java b/test/jdk/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java similarity index 100% rename from jdk/test/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java rename to test/jdk/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java diff --git a/jdk/test/javax/swing/text/DefaultHighlighter/6771184/bug6771184.java b/test/jdk/javax/swing/text/DefaultHighlighter/6771184/bug6771184.java similarity index 100% rename from jdk/test/javax/swing/text/DefaultHighlighter/6771184/bug6771184.java rename to test/jdk/javax/swing/text/DefaultHighlighter/6771184/bug6771184.java diff --git a/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java b/test/jdk/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java similarity index 100% rename from jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java rename to test/jdk/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java diff --git a/jdk/test/javax/swing/text/DevanagariEditor.java b/test/jdk/javax/swing/text/DevanagariEditor.java similarity index 100% rename from jdk/test/javax/swing/text/DevanagariEditor.java rename to test/jdk/javax/swing/text/DevanagariEditor.java diff --git a/jdk/test/javax/swing/text/FlowView/LayoutTest.java b/test/jdk/javax/swing/text/FlowView/LayoutTest.java similarity index 100% rename from jdk/test/javax/swing/text/FlowView/LayoutTest.java rename to test/jdk/javax/swing/text/FlowView/LayoutTest.java diff --git a/jdk/test/javax/swing/text/GapContent/4496801/bug4496801.java b/test/jdk/javax/swing/text/GapContent/4496801/bug4496801.java similarity index 100% rename from jdk/test/javax/swing/text/GapContent/4496801/bug4496801.java rename to test/jdk/javax/swing/text/GapContent/4496801/bug4496801.java diff --git a/jdk/test/javax/swing/text/GlyphPainter2/6427244/bug6427244.java b/test/jdk/javax/swing/text/GlyphPainter2/6427244/bug6427244.java similarity index 100% rename from jdk/test/javax/swing/text/GlyphPainter2/6427244/bug6427244.java rename to test/jdk/javax/swing/text/GlyphPainter2/6427244/bug6427244.java diff --git a/jdk/test/javax/swing/text/GlyphView/4984669/bug4984669.html b/test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.html similarity index 100% rename from jdk/test/javax/swing/text/GlyphView/4984669/bug4984669.html rename to test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.html diff --git a/jdk/test/javax/swing/text/GlyphView/4984669/bug4984669.java b/test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.java similarity index 100% rename from jdk/test/javax/swing/text/GlyphView/4984669/bug4984669.java rename to test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.java diff --git a/jdk/test/javax/swing/text/JTextComponent/5074573/bug5074573.java b/test/jdk/javax/swing/text/JTextComponent/5074573/bug5074573.java similarity index 100% rename from jdk/test/javax/swing/text/JTextComponent/5074573/bug5074573.java rename to test/jdk/javax/swing/text/JTextComponent/5074573/bug5074573.java diff --git a/jdk/test/javax/swing/text/JTextComponent/8156217/TextSelectionTest.java b/test/jdk/javax/swing/text/JTextComponent/8156217/TextSelectionTest.java similarity index 100% rename from jdk/test/javax/swing/text/JTextComponent/8156217/TextSelectionTest.java rename to test/jdk/javax/swing/text/JTextComponent/8156217/TextSelectionTest.java diff --git a/jdk/test/javax/swing/text/LayoutQueue/Test6588003.java b/test/jdk/javax/swing/text/LayoutQueue/Test6588003.java similarity index 100% rename from jdk/test/javax/swing/text/LayoutQueue/Test6588003.java rename to test/jdk/javax/swing/text/LayoutQueue/Test6588003.java diff --git a/jdk/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java b/test/jdk/javax/swing/text/NavigationFilter/6735293/bug6735293.java similarity index 100% rename from jdk/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java rename to test/jdk/javax/swing/text/NavigationFilter/6735293/bug6735293.java diff --git a/jdk/test/javax/swing/text/NavigationFilter/8058305/bug8058305.java b/test/jdk/javax/swing/text/NavigationFilter/8058305/bug8058305.java similarity index 100% rename from jdk/test/javax/swing/text/NavigationFilter/8058305/bug8058305.java rename to test/jdk/javax/swing/text/NavigationFilter/8058305/bug8058305.java diff --git a/jdk/test/javax/swing/text/StyledEditorKit/4506788/bug4506788.html b/test/jdk/javax/swing/text/StyledEditorKit/4506788/bug4506788.html similarity index 100% rename from jdk/test/javax/swing/text/StyledEditorKit/4506788/bug4506788.html rename to test/jdk/javax/swing/text/StyledEditorKit/4506788/bug4506788.html diff --git a/jdk/test/javax/swing/text/StyledEditorKit/4506788/bug4506788.java b/test/jdk/javax/swing/text/StyledEditorKit/4506788/bug4506788.java similarity index 100% rename from jdk/test/javax/swing/text/StyledEditorKit/4506788/bug4506788.java rename to test/jdk/javax/swing/text/StyledEditorKit/4506788/bug4506788.java diff --git a/jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java b/test/jdk/javax/swing/text/StyledEditorKit/8016833/bug8016833.java similarity index 100% rename from jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java rename to test/jdk/javax/swing/text/StyledEditorKit/8016833/bug8016833.java diff --git a/jdk/test/javax/swing/text/TableView/TableViewLayoutTest.java b/test/jdk/javax/swing/text/TableView/TableViewLayoutTest.java similarity index 100% rename from jdk/test/javax/swing/text/TableView/TableViewLayoutTest.java rename to test/jdk/javax/swing/text/TableView/TableViewLayoutTest.java diff --git a/jdk/test/javax/swing/text/Utilities/8134721/bug8134721.java b/test/jdk/javax/swing/text/Utilities/8134721/bug8134721.java similarity index 100% rename from jdk/test/javax/swing/text/Utilities/8134721/bug8134721.java rename to test/jdk/javax/swing/text/Utilities/8134721/bug8134721.java diff --git a/jdk/test/javax/swing/text/Utilities/8142966/SwingFontMetricsTest.java b/test/jdk/javax/swing/text/Utilities/8142966/SwingFontMetricsTest.java similarity index 100% rename from jdk/test/javax/swing/text/Utilities/8142966/SwingFontMetricsTest.java rename to test/jdk/javax/swing/text/Utilities/8142966/SwingFontMetricsTest.java diff --git a/jdk/test/javax/swing/text/Utilities/bug7045593.java b/test/jdk/javax/swing/text/Utilities/bug7045593.java similarity index 100% rename from jdk/test/javax/swing/text/Utilities/bug7045593.java rename to test/jdk/javax/swing/text/Utilities/bug7045593.java diff --git a/jdk/test/javax/swing/text/View/8014863/bug8014863.java b/test/jdk/javax/swing/text/View/8014863/bug8014863.java similarity index 100% rename from jdk/test/javax/swing/text/View/8014863/bug8014863.java rename to test/jdk/javax/swing/text/View/8014863/bug8014863.java diff --git a/jdk/test/javax/swing/text/View/8015853/bug8015853.java b/test/jdk/javax/swing/text/View/8015853/bug8015853.java similarity index 100% rename from jdk/test/javax/swing/text/View/8015853/bug8015853.java rename to test/jdk/javax/swing/text/View/8015853/bug8015853.java diff --git a/jdk/test/javax/swing/text/View/8015853/bug8015853.txt b/test/jdk/javax/swing/text/View/8015853/bug8015853.txt similarity index 100% rename from jdk/test/javax/swing/text/View/8015853/bug8015853.txt rename to test/jdk/javax/swing/text/View/8015853/bug8015853.txt diff --git a/jdk/test/javax/swing/text/View/8048110/bug8048110.java b/test/jdk/javax/swing/text/View/8048110/bug8048110.java similarity index 100% rename from jdk/test/javax/swing/text/View/8048110/bug8048110.java rename to test/jdk/javax/swing/text/View/8048110/bug8048110.java diff --git a/jdk/test/javax/swing/text/View/8080972/TestObjectView.java b/test/jdk/javax/swing/text/View/8080972/TestObjectView.java similarity index 100% rename from jdk/test/javax/swing/text/View/8080972/TestObjectView.java rename to test/jdk/javax/swing/text/View/8080972/TestObjectView.java diff --git a/jdk/test/javax/swing/text/View/8156217/FPMethodCalledTest.java b/test/jdk/javax/swing/text/View/8156217/FPMethodCalledTest.java similarity index 100% rename from jdk/test/javax/swing/text/View/8156217/FPMethodCalledTest.java rename to test/jdk/javax/swing/text/View/8156217/FPMethodCalledTest.java diff --git a/jdk/test/javax/swing/text/WrappedPlainView/6857057/StubBranchElement.java b/test/jdk/javax/swing/text/WrappedPlainView/6857057/StubBranchElement.java similarity index 100% rename from jdk/test/javax/swing/text/WrappedPlainView/6857057/StubBranchElement.java rename to test/jdk/javax/swing/text/WrappedPlainView/6857057/StubBranchElement.java diff --git a/jdk/test/javax/swing/text/WrappedPlainView/6857057/StubLeafElement.java b/test/jdk/javax/swing/text/WrappedPlainView/6857057/StubLeafElement.java similarity index 100% rename from jdk/test/javax/swing/text/WrappedPlainView/6857057/StubLeafElement.java rename to test/jdk/javax/swing/text/WrappedPlainView/6857057/StubLeafElement.java diff --git a/jdk/test/javax/swing/text/WrappedPlainView/6857057/bug6857057.java b/test/jdk/javax/swing/text/WrappedPlainView/6857057/bug6857057.java similarity index 100% rename from jdk/test/javax/swing/text/WrappedPlainView/6857057/bug6857057.java rename to test/jdk/javax/swing/text/WrappedPlainView/6857057/bug6857057.java diff --git a/jdk/test/javax/swing/text/html/7189299/bug7189299.java b/test/jdk/javax/swing/text/html/7189299/bug7189299.java similarity index 100% rename from jdk/test/javax/swing/text/html/7189299/bug7189299.java rename to test/jdk/javax/swing/text/html/7189299/bug7189299.java diff --git a/jdk/test/javax/swing/text/html/8005391/bug8005391.java b/test/jdk/javax/swing/text/html/8005391/bug8005391.java similarity index 100% rename from jdk/test/javax/swing/text/html/8005391/bug8005391.java rename to test/jdk/javax/swing/text/html/8005391/bug8005391.java diff --git a/jdk/test/javax/swing/text/html/8031109/bug8031109.java b/test/jdk/javax/swing/text/html/8031109/bug8031109.java similarity index 100% rename from jdk/test/javax/swing/text/html/8031109/bug8031109.java rename to test/jdk/javax/swing/text/html/8031109/bug8031109.java diff --git a/jdk/test/javax/swing/text/html/8034955/bug8034955.java b/test/jdk/javax/swing/text/html/8034955/bug8034955.java similarity index 100% rename from jdk/test/javax/swing/text/html/8034955/bug8034955.java rename to test/jdk/javax/swing/text/html/8034955/bug8034955.java diff --git a/jdk/test/javax/swing/text/html/CSS/4530474/bug4530474.java b/test/jdk/javax/swing/text/html/CSS/4530474/bug4530474.java similarity index 100% rename from jdk/test/javax/swing/text/html/CSS/4530474/bug4530474.java rename to test/jdk/javax/swing/text/html/CSS/4530474/bug4530474.java diff --git a/jdk/test/javax/swing/text/html/CSS/4530474/test.css b/test/jdk/javax/swing/text/html/CSS/4530474/test.css similarity index 100% rename from jdk/test/javax/swing/text/html/CSS/4530474/test.css rename to test/jdk/javax/swing/text/html/CSS/4530474/test.css diff --git a/jdk/test/javax/swing/text/html/CSS/4530474/test.html b/test/jdk/javax/swing/text/html/CSS/4530474/test.html similarity index 100% rename from jdk/test/javax/swing/text/html/CSS/4530474/test.html rename to test/jdk/javax/swing/text/html/CSS/4530474/test.html diff --git a/jdk/test/javax/swing/text/html/CSS/ColorValue/RGBColorValueTest.java b/test/jdk/javax/swing/text/html/CSS/ColorValue/RGBColorValueTest.java similarity index 100% rename from jdk/test/javax/swing/text/html/CSS/ColorValue/RGBColorValueTest.java rename to test/jdk/javax/swing/text/html/CSS/ColorValue/RGBColorValueTest.java diff --git a/jdk/test/javax/swing/text/html/HRuleView/Test5062055.java b/test/jdk/javax/swing/text/html/HRuleView/Test5062055.java similarity index 100% rename from jdk/test/javax/swing/text/html/HRuleView/Test5062055.java rename to test/jdk/javax/swing/text/html/HRuleView/Test5062055.java diff --git a/jdk/test/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java b/test/jdk/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java similarity index 100% rename from jdk/test/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java rename to test/jdk/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java diff --git a/jdk/test/javax/swing/text/html/HTMLEditorKit/4242228/bug4242228.java b/test/jdk/javax/swing/text/html/HTMLEditorKit/4242228/bug4242228.java similarity index 100% rename from jdk/test/javax/swing/text/html/HTMLEditorKit/4242228/bug4242228.java rename to test/jdk/javax/swing/text/html/HTMLEditorKit/4242228/bug4242228.java diff --git a/jdk/test/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java b/test/jdk/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java similarity index 100% rename from jdk/test/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java rename to test/jdk/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java diff --git a/jdk/test/javax/swing/text/html/HTMLEditorKit/7104635/HTMLEditorKitWriterBug.java b/test/jdk/javax/swing/text/html/HTMLEditorKit/7104635/HTMLEditorKitWriterBug.java similarity index 100% rename from jdk/test/javax/swing/text/html/HTMLEditorKit/7104635/HTMLEditorKitWriterBug.java rename to test/jdk/javax/swing/text/html/HTMLEditorKit/7104635/HTMLEditorKitWriterBug.java diff --git a/jdk/test/javax/swing/text/html/StyleSheet/BackgroundImage/BackgroundImagePosition.java b/test/jdk/javax/swing/text/html/StyleSheet/BackgroundImage/BackgroundImagePosition.java similarity index 100% rename from jdk/test/javax/swing/text/html/StyleSheet/BackgroundImage/BackgroundImagePosition.java rename to test/jdk/javax/swing/text/html/StyleSheet/BackgroundImage/BackgroundImagePosition.java diff --git a/jdk/test/javax/swing/text/html/StyleSheet/bug4936917.java b/test/jdk/javax/swing/text/html/StyleSheet/bug4936917.java similarity index 100% rename from jdk/test/javax/swing/text/html/StyleSheet/bug4936917.java rename to test/jdk/javax/swing/text/html/StyleSheet/bug4936917.java diff --git a/jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.html b/test/jdk/javax/swing/text/html/TableView/7030332/bug7030332.html similarity index 100% rename from jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.html rename to test/jdk/javax/swing/text/html/TableView/7030332/bug7030332.html diff --git a/jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.java b/test/jdk/javax/swing/text/html/TableView/7030332/bug7030332.java similarity index 100% rename from jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.java rename to test/jdk/javax/swing/text/html/TableView/7030332/bug7030332.java diff --git a/jdk/test/javax/swing/text/html/TableView/7030332/sample0.png b/test/jdk/javax/swing/text/html/TableView/7030332/sample0.png similarity index 100% rename from jdk/test/javax/swing/text/html/TableView/7030332/sample0.png rename to test/jdk/javax/swing/text/html/TableView/7030332/sample0.png diff --git a/jdk/test/javax/swing/text/html/TableView/7030332/sample1.png b/test/jdk/javax/swing/text/html/TableView/7030332/sample1.png similarity index 100% rename from jdk/test/javax/swing/text/html/TableView/7030332/sample1.png rename to test/jdk/javax/swing/text/html/TableView/7030332/sample1.png diff --git a/jdk/test/javax/swing/text/html/TableView/7030332/sample2.png b/test/jdk/javax/swing/text/html/TableView/7030332/sample2.png similarity index 100% rename from jdk/test/javax/swing/text/html/TableView/7030332/sample2.png rename to test/jdk/javax/swing/text/html/TableView/7030332/sample2.png diff --git a/jdk/test/javax/swing/text/html/TableView/7030332/sample3.png b/test/jdk/javax/swing/text/html/TableView/7030332/sample3.png similarity index 100% rename from jdk/test/javax/swing/text/html/TableView/7030332/sample3.png rename to test/jdk/javax/swing/text/html/TableView/7030332/sample3.png diff --git a/jdk/test/javax/swing/text/html/TableView/7030332/sample4.png b/test/jdk/javax/swing/text/html/TableView/7030332/sample4.png similarity index 100% rename from jdk/test/javax/swing/text/html/TableView/7030332/sample4.png rename to test/jdk/javax/swing/text/html/TableView/7030332/sample4.png diff --git a/jdk/test/javax/swing/text/html/Test4783068.java b/test/jdk/javax/swing/text/html/Test4783068.java similarity index 100% rename from jdk/test/javax/swing/text/html/Test4783068.java rename to test/jdk/javax/swing/text/html/Test4783068.java diff --git a/jdk/test/javax/swing/text/html/parser/8074956/bug8074956.java b/test/jdk/javax/swing/text/html/parser/8074956/bug8074956.java similarity index 100% rename from jdk/test/javax/swing/text/html/parser/8074956/bug8074956.java rename to test/jdk/javax/swing/text/html/parser/8074956/bug8074956.java diff --git a/jdk/test/javax/swing/text/html/parser/Parser/6836089/bug6836089.java b/test/jdk/javax/swing/text/html/parser/Parser/6836089/bug6836089.java similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Parser/6836089/bug6836089.java rename to test/jdk/javax/swing/text/html/parser/Parser/6836089/bug6836089.java diff --git a/jdk/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java b/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java rename to test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java diff --git a/jdk/test/javax/swing/text/html/parser/Parser/7003777/bug7003777.java b/test/jdk/javax/swing/text/html/parser/Parser/7003777/bug7003777.java similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Parser/7003777/bug7003777.java rename to test/jdk/javax/swing/text/html/parser/Parser/7003777/bug7003777.java diff --git a/jdk/test/javax/swing/text/html/parser/Parser/7011777/bug7011777.java b/test/jdk/javax/swing/text/html/parser/Parser/7011777/bug7011777.java similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Parser/7011777/bug7011777.java rename to test/jdk/javax/swing/text/html/parser/Parser/7011777/bug7011777.java diff --git a/jdk/test/javax/swing/text/html/parser/Parser/7165725/bug7165725.java b/test/jdk/javax/swing/text/html/parser/Parser/7165725/bug7165725.java similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Parser/7165725/bug7165725.java rename to test/jdk/javax/swing/text/html/parser/Parser/7165725/bug7165725.java diff --git a/jdk/test/javax/swing/text/html/parser/Parser/7165725/false-text-after-script.html b/test/jdk/javax/swing/text/html/parser/Parser/7165725/false-text-after-script.html similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Parser/7165725/false-text-after-script.html rename to test/jdk/javax/swing/text/html/parser/Parser/7165725/false-text-after-script.html diff --git a/jdk/test/javax/swing/text/html/parser/Parser/7165725/successive-script-tag.html b/test/jdk/javax/swing/text/html/parser/Parser/7165725/successive-script-tag.html similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Parser/7165725/successive-script-tag.html rename to test/jdk/javax/swing/text/html/parser/Parser/7165725/successive-script-tag.html diff --git a/jdk/test/javax/swing/text/html/parser/Parser/8028616/bug8028616.java b/test/jdk/javax/swing/text/html/parser/Parser/8028616/bug8028616.java similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Parser/8028616/bug8028616.java rename to test/jdk/javax/swing/text/html/parser/Parser/8028616/bug8028616.java diff --git a/jdk/test/javax/swing/text/html/parser/Parser/8078268/bug8078268.java b/test/jdk/javax/swing/text/html/parser/Parser/8078268/bug8078268.java similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Parser/8078268/bug8078268.java rename to test/jdk/javax/swing/text/html/parser/Parser/8078268/bug8078268.java diff --git a/jdk/test/javax/swing/text/html/parser/Parser/8078268/slowparse.html b/test/jdk/javax/swing/text/html/parser/Parser/8078268/slowparse.html similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Parser/8078268/slowparse.html rename to test/jdk/javax/swing/text/html/parser/Parser/8078268/slowparse.html diff --git a/jdk/test/javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java b/test/jdk/javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java rename to test/jdk/javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java diff --git a/jdk/test/javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/test.html b/test/jdk/javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/test.html similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/test.html rename to test/jdk/javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/test.html diff --git a/jdk/test/javax/swing/text/html/parser/Test8017492.java b/test/jdk/javax/swing/text/html/parser/Test8017492.java similarity index 100% rename from jdk/test/javax/swing/text/html/parser/Test8017492.java rename to test/jdk/javax/swing/text/html/parser/Test8017492.java diff --git a/jdk/test/javax/swing/text/rtf/RTFWriteParagraphAlignTest.java b/test/jdk/javax/swing/text/rtf/RTFWriteParagraphAlignTest.java similarity index 100% rename from jdk/test/javax/swing/text/rtf/RTFWriteParagraphAlignTest.java rename to test/jdk/javax/swing/text/rtf/RTFWriteParagraphAlignTest.java diff --git a/jdk/test/javax/swing/tree/DefaultTreeCellRenderer/7142955/bug7142955.java b/test/jdk/javax/swing/tree/DefaultTreeCellRenderer/7142955/bug7142955.java similarity index 100% rename from jdk/test/javax/swing/tree/DefaultTreeCellRenderer/7142955/bug7142955.java rename to test/jdk/javax/swing/tree/DefaultTreeCellRenderer/7142955/bug7142955.java diff --git a/jdk/test/javax/swing/undo/UndoManager/AbstractDocumentUndoConcurrentTest.java b/test/jdk/javax/swing/undo/UndoManager/AbstractDocumentUndoConcurrentTest.java similarity index 100% rename from jdk/test/javax/swing/undo/UndoManager/AbstractDocumentUndoConcurrentTest.java rename to test/jdk/javax/swing/undo/UndoManager/AbstractDocumentUndoConcurrentTest.java diff --git a/jdk/test/javax/transaction/testng/Driver.java b/test/jdk/javax/transaction/testng/Driver.java similarity index 100% rename from jdk/test/javax/transaction/testng/Driver.java rename to test/jdk/javax/transaction/testng/Driver.java diff --git a/jdk/test/javax/transaction/testng/test/transaction/InvalidTransactionExceptionTests.java b/test/jdk/javax/transaction/testng/test/transaction/InvalidTransactionExceptionTests.java similarity index 100% rename from jdk/test/javax/transaction/testng/test/transaction/InvalidTransactionExceptionTests.java rename to test/jdk/javax/transaction/testng/test/transaction/InvalidTransactionExceptionTests.java diff --git a/jdk/test/javax/transaction/testng/test/transaction/TransactionRequiredExceptionTests.java b/test/jdk/javax/transaction/testng/test/transaction/TransactionRequiredExceptionTests.java similarity index 100% rename from jdk/test/javax/transaction/testng/test/transaction/TransactionRequiredExceptionTests.java rename to test/jdk/javax/transaction/testng/test/transaction/TransactionRequiredExceptionTests.java diff --git a/jdk/test/javax/transaction/testng/test/transaction/TransactionRolledbackExceptionTests.java b/test/jdk/javax/transaction/testng/test/transaction/TransactionRolledbackExceptionTests.java similarity index 100% rename from jdk/test/javax/transaction/testng/test/transaction/TransactionRolledbackExceptionTests.java rename to test/jdk/javax/transaction/testng/test/transaction/TransactionRolledbackExceptionTests.java diff --git a/jdk/test/javax/transaction/testng/test/transaction/XAExceptionTests.java b/test/jdk/javax/transaction/testng/test/transaction/XAExceptionTests.java similarity index 100% rename from jdk/test/javax/transaction/testng/test/transaction/XAExceptionTests.java rename to test/jdk/javax/transaction/testng/test/transaction/XAExceptionTests.java diff --git a/jdk/test/javax/transaction/testng/util/SerializedTransactionExceptions.java b/test/jdk/javax/transaction/testng/util/SerializedTransactionExceptions.java similarity index 100% rename from jdk/test/javax/transaction/testng/util/SerializedTransactionExceptions.java rename to test/jdk/javax/transaction/testng/util/SerializedTransactionExceptions.java diff --git a/jdk/test/javax/xml/bind/JAXBContext/JAXBContextWithAbstractFactory.java b/test/jdk/javax/xml/bind/JAXBContext/JAXBContextWithAbstractFactory.java similarity index 100% rename from jdk/test/javax/xml/bind/JAXBContext/JAXBContextWithAbstractFactory.java rename to test/jdk/javax/xml/bind/JAXBContext/JAXBContextWithAbstractFactory.java diff --git a/jdk/test/javax/xml/bind/JAXBContext/JAXBContextWithLegacyFactory.java b/test/jdk/javax/xml/bind/JAXBContext/JAXBContextWithLegacyFactory.java similarity index 100% rename from jdk/test/javax/xml/bind/JAXBContext/JAXBContextWithLegacyFactory.java rename to test/jdk/javax/xml/bind/JAXBContext/JAXBContextWithLegacyFactory.java diff --git a/jdk/test/javax/xml/bind/JAXBContext/JAXBContextWithSubclassedFactory.java b/test/jdk/javax/xml/bind/JAXBContext/JAXBContextWithSubclassedFactory.java similarity index 100% rename from jdk/test/javax/xml/bind/JAXBContext/JAXBContextWithSubclassedFactory.java rename to test/jdk/javax/xml/bind/JAXBContext/JAXBContextWithSubclassedFactory.java diff --git a/jdk/test/javax/xml/bind/jxc/8046817/GenerateEnumSchema.java b/test/jdk/javax/xml/bind/jxc/8046817/GenerateEnumSchema.java similarity index 100% rename from jdk/test/javax/xml/bind/jxc/8046817/GenerateEnumSchema.java rename to test/jdk/javax/xml/bind/jxc/8046817/GenerateEnumSchema.java diff --git a/jdk/test/javax/xml/bind/jxc/8046817/TestClassType.java b/test/jdk/javax/xml/bind/jxc/8046817/TestClassType.java similarity index 100% rename from jdk/test/javax/xml/bind/jxc/8046817/TestClassType.java rename to test/jdk/javax/xml/bind/jxc/8046817/TestClassType.java diff --git a/jdk/test/javax/xml/bind/jxc/8046817/TestEnumType.java b/test/jdk/javax/xml/bind/jxc/8046817/TestEnumType.java similarity index 100% rename from jdk/test/javax/xml/bind/jxc/8046817/TestEnumType.java rename to test/jdk/javax/xml/bind/jxc/8046817/TestEnumType.java diff --git a/jdk/test/javax/xml/bind/jxc/8073519/InputWithError.java b/test/jdk/javax/xml/bind/jxc/8073519/InputWithError.java similarity index 100% rename from jdk/test/javax/xml/bind/jxc/8073519/InputWithError.java rename to test/jdk/javax/xml/bind/jxc/8073519/InputWithError.java diff --git a/jdk/test/javax/xml/bind/jxc/8073519/SchemagenErrorReporting.java b/test/jdk/javax/xml/bind/jxc/8073519/SchemagenErrorReporting.java similarity index 100% rename from jdk/test/javax/xml/bind/jxc/8073519/SchemagenErrorReporting.java rename to test/jdk/javax/xml/bind/jxc/8073519/SchemagenErrorReporting.java diff --git a/jdk/test/javax/xml/bind/jxc/8073872/Foo.java b/test/jdk/javax/xml/bind/jxc/8073872/Foo.java similarity index 100% rename from jdk/test/javax/xml/bind/jxc/8073872/Foo.java rename to test/jdk/javax/xml/bind/jxc/8073872/Foo.java diff --git a/jdk/test/javax/xml/bind/jxc/8073872/SchemagenStackOverflow.java b/test/jdk/javax/xml/bind/jxc/8073872/SchemagenStackOverflow.java similarity index 100% rename from jdk/test/javax/xml/bind/jxc/8073872/SchemagenStackOverflow.java rename to test/jdk/javax/xml/bind/jxc/8073872/SchemagenStackOverflow.java diff --git a/jdk/test/javax/xml/bind/marshal/8134111/UnmarshalTest.java b/test/jdk/javax/xml/bind/marshal/8134111/UnmarshalTest.java similarity index 100% rename from jdk/test/javax/xml/bind/marshal/8134111/UnmarshalTest.java rename to test/jdk/javax/xml/bind/marshal/8134111/UnmarshalTest.java diff --git a/jdk/test/javax/xml/bind/marshal/8134111/testTypes/ObjectFactory.java b/test/jdk/javax/xml/bind/marshal/8134111/testTypes/ObjectFactory.java similarity index 100% rename from jdk/test/javax/xml/bind/marshal/8134111/testTypes/ObjectFactory.java rename to test/jdk/javax/xml/bind/marshal/8134111/testTypes/ObjectFactory.java diff --git a/jdk/test/javax/xml/bind/marshal/8134111/testTypes/Root.java b/test/jdk/javax/xml/bind/marshal/8134111/testTypes/Root.java similarity index 100% rename from jdk/test/javax/xml/bind/marshal/8134111/testTypes/Root.java rename to test/jdk/javax/xml/bind/marshal/8134111/testTypes/Root.java diff --git a/jdk/test/javax/xml/bind/marshal/8134111/testTypes/WhenType.java b/test/jdk/javax/xml/bind/marshal/8134111/testTypes/WhenType.java similarity index 100% rename from jdk/test/javax/xml/bind/marshal/8134111/testTypes/WhenType.java rename to test/jdk/javax/xml/bind/marshal/8134111/testTypes/WhenType.java diff --git a/jdk/test/javax/xml/bind/marshal/8134111/testTypes/package-info.java b/test/jdk/javax/xml/bind/marshal/8134111/testTypes/package-info.java similarity index 100% rename from jdk/test/javax/xml/bind/marshal/8134111/testTypes/package-info.java rename to test/jdk/javax/xml/bind/marshal/8134111/testTypes/package-info.java diff --git a/jdk/test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java b/test/jdk/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java similarity index 100% rename from jdk/test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java rename to test/jdk/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java diff --git a/jdk/test/javax/xml/bind/xjc/8029837/test.xsd b/test/jdk/javax/xml/bind/xjc/8029837/test.xsd similarity index 100% rename from jdk/test/javax/xml/bind/xjc/8029837/test.xsd rename to test/jdk/javax/xml/bind/xjc/8029837/test.xsd diff --git a/jdk/test/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java b/test/jdk/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java similarity index 100% rename from jdk/test/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java rename to test/jdk/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java diff --git a/jdk/test/javax/xml/bind/xjc/8032884/optional-property-schema.xsd b/test/jdk/javax/xml/bind/xjc/8032884/optional-property-schema.xsd similarity index 100% rename from jdk/test/javax/xml/bind/xjc/8032884/optional-property-schema.xsd rename to test/jdk/javax/xml/bind/xjc/8032884/optional-property-schema.xsd diff --git a/jdk/test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java b/test/jdk/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java similarity index 100% rename from jdk/test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java rename to test/jdk/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java diff --git a/jdk/test/javax/xml/bind/xjc/8145039/testSchema.xsd b/test/jdk/javax/xml/bind/xjc/8145039/testSchema.xsd similarity index 100% rename from jdk/test/javax/xml/bind/xjc/8145039/testSchema.xsd rename to test/jdk/javax/xml/bind/xjc/8145039/testSchema.xsd diff --git a/jdk/test/javax/xml/crypto/dsig/ErrorHandlerPermissions.java b/test/jdk/javax/xml/crypto/dsig/ErrorHandlerPermissions.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/ErrorHandlerPermissions.java rename to test/jdk/javax/xml/crypto/dsig/ErrorHandlerPermissions.java diff --git a/jdk/test/javax/xml/crypto/dsig/ErrorHandlerPermissions.policy b/test/jdk/javax/xml/crypto/dsig/ErrorHandlerPermissions.policy similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/ErrorHandlerPermissions.policy rename to test/jdk/javax/xml/crypto/dsig/ErrorHandlerPermissions.policy diff --git a/jdk/test/javax/xml/crypto/dsig/GenerationTests.java b/test/jdk/javax/xml/crypto/dsig/GenerationTests.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/GenerationTests.java rename to test/jdk/javax/xml/crypto/dsig/GenerationTests.java diff --git a/jdk/test/javax/xml/crypto/dsig/GetInstanceTests.java b/test/jdk/javax/xml/crypto/dsig/GetInstanceTests.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/GetInstanceTests.java rename to test/jdk/javax/xml/crypto/dsig/GetInstanceTests.java diff --git a/jdk/test/javax/xml/crypto/dsig/KeySelectors.java b/test/jdk/javax/xml/crypto/dsig/KeySelectors.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/KeySelectors.java rename to test/jdk/javax/xml/crypto/dsig/KeySelectors.java diff --git a/jdk/test/javax/xml/crypto/dsig/SecureValidationPolicy.java b/test/jdk/javax/xml/crypto/dsig/SecureValidationPolicy.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/SecureValidationPolicy.java rename to test/jdk/javax/xml/crypto/dsig/SecureValidationPolicy.java diff --git a/jdk/test/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java b/test/jdk/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java rename to test/jdk/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java diff --git a/jdk/test/javax/xml/crypto/dsig/SecurityManager/policy b/test/jdk/javax/xml/crypto/dsig/SecurityManager/policy similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/SecurityManager/policy rename to test/jdk/javax/xml/crypto/dsig/SecurityManager/policy diff --git a/jdk/test/javax/xml/crypto/dsig/SignatureValidator.java b/test/jdk/javax/xml/crypto/dsig/SignatureValidator.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/SignatureValidator.java rename to test/jdk/javax/xml/crypto/dsig/SignatureValidator.java diff --git a/jdk/test/javax/xml/crypto/dsig/TransformService/NullParent.java b/test/jdk/javax/xml/crypto/dsig/TransformService/NullParent.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/TransformService/NullParent.java rename to test/jdk/javax/xml/crypto/dsig/TransformService/NullParent.java diff --git a/jdk/test/javax/xml/crypto/dsig/TransformService/UnknownProvider.java b/test/jdk/javax/xml/crypto/dsig/TransformService/UnknownProvider.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/TransformService/UnknownProvider.java rename to test/jdk/javax/xml/crypto/dsig/TransformService/UnknownProvider.java diff --git a/jdk/test/javax/xml/crypto/dsig/TransformService/test.policy b/test/jdk/javax/xml/crypto/dsig/TransformService/test.policy similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/TransformService/test.policy rename to test/jdk/javax/xml/crypto/dsig/TransformService/test.policy diff --git a/jdk/test/javax/xml/crypto/dsig/ValidationTests.java b/test/jdk/javax/xml/crypto/dsig/ValidationTests.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/ValidationTests.java rename to test/jdk/javax/xml/crypto/dsig/ValidationTests.java diff --git a/jdk/test/javax/xml/crypto/dsig/X509KeySelector.java b/test/jdk/javax/xml/crypto/dsig/X509KeySelector.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/X509KeySelector.java rename to test/jdk/javax/xml/crypto/dsig/X509KeySelector.java diff --git a/jdk/test/javax/xml/crypto/dsig/XMLSignatureFactory/UnknownProvider.java b/test/jdk/javax/xml/crypto/dsig/XMLSignatureFactory/UnknownProvider.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/XMLSignatureFactory/UnknownProvider.java rename to test/jdk/javax/xml/crypto/dsig/XMLSignatureFactory/UnknownProvider.java diff --git a/jdk/test/javax/xml/crypto/dsig/data/certs/badb.crt b/test/jdk/javax/xml/crypto/dsig/data/certs/badb.crt similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/certs/badb.crt rename to test/jdk/javax/xml/crypto/dsig/data/certs/badb.crt diff --git a/jdk/test/javax/xml/crypto/dsig/data/certs/balor.crt b/test/jdk/javax/xml/crypto/dsig/data/certs/balor.crt similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/certs/balor.crt rename to test/jdk/javax/xml/crypto/dsig/data/certs/balor.crt diff --git a/jdk/test/javax/xml/crypto/dsig/data/certs/bres.crt b/test/jdk/javax/xml/crypto/dsig/data/certs/bres.crt similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/certs/bres.crt rename to test/jdk/javax/xml/crypto/dsig/data/certs/bres.crt diff --git a/jdk/test/javax/xml/crypto/dsig/data/certs/ca.crt b/test/jdk/javax/xml/crypto/dsig/data/certs/ca.crt similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/certs/ca.crt rename to test/jdk/javax/xml/crypto/dsig/data/certs/ca.crt diff --git a/jdk/test/javax/xml/crypto/dsig/data/certs/crl b/test/jdk/javax/xml/crypto/dsig/data/certs/crl similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/certs/crl rename to test/jdk/javax/xml/crypto/dsig/data/certs/crl diff --git a/jdk/test/javax/xml/crypto/dsig/data/certs/lugh.crt b/test/jdk/javax/xml/crypto/dsig/data/certs/lugh.crt similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/certs/lugh.crt rename to test/jdk/javax/xml/crypto/dsig/data/certs/lugh.crt diff --git a/jdk/test/javax/xml/crypto/dsig/data/certs/macha.crt b/test/jdk/javax/xml/crypto/dsig/data/certs/macha.crt similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/certs/macha.crt rename to test/jdk/javax/xml/crypto/dsig/data/certs/macha.crt diff --git a/jdk/test/javax/xml/crypto/dsig/data/certs/morigu.crt b/test/jdk/javax/xml/crypto/dsig/data/certs/morigu.crt similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/certs/morigu.crt rename to test/jdk/javax/xml/crypto/dsig/data/certs/morigu.crt diff --git a/jdk/test/javax/xml/crypto/dsig/data/certs/nemain.crt b/test/jdk/javax/xml/crypto/dsig/data/certs/nemain.crt similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/certs/nemain.crt rename to test/jdk/javax/xml/crypto/dsig/data/certs/nemain.crt diff --git a/jdk/test/javax/xml/crypto/dsig/data/certs/test.jks b/test/jdk/javax/xml/crypto/dsig/data/certs/test.jks similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/certs/test.jks rename to test/jdk/javax/xml/crypto/dsig/data/certs/test.jks diff --git a/jdk/test/javax/xml/crypto/dsig/data/certs/user.crt b/test/jdk/javax/xml/crypto/dsig/data/certs/user.crt similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/certs/user.crt rename to test/jdk/javax/xml/crypto/dsig/data/certs/user.crt diff --git a/jdk/test/javax/xml/crypto/dsig/data/certs/xmldsig.jks b/test/jdk/javax/xml/crypto/dsig/data/certs/xmldsig.jks similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/certs/xmldsig.jks rename to test/jdk/javax/xml/crypto/dsig/data/certs/xmldsig.jks diff --git a/jdk/test/javax/xml/crypto/dsig/data/envelope.xml b/test/jdk/javax/xml/crypto/dsig/data/envelope.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/envelope.xml rename to test/jdk/javax/xml/crypto/dsig/data/envelope.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/exc-signature.xml b/test/jdk/javax/xml/crypto/dsig/data/exc-signature.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/exc-signature.xml rename to test/jdk/javax/xml/crypto/dsig/data/exc-signature.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/sign-spec.xml b/test/jdk/javax/xml/crypto/dsig/data/sign-spec.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/sign-spec.xml rename to test/jdk/javax/xml/crypto/dsig/data/sign-spec.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloped-dsa.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-enveloped-dsa.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-enveloped-dsa.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-enveloped-dsa.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-b64-dsa.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-b64-dsa.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-b64-dsa.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-b64-dsa.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-dsa.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-dsa.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-dsa.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-dsa.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-40.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-40.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-40.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-40.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-0-attack.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-0-attack.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-0-attack.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-0-attack.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-8-attack.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-8-attack.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-8-attack.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-8-attack.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-p256-sha1.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-p256-sha1.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-p256-sha1.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-p256-sha1.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-p384-sha1.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-p384-sha1.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-p384-sha1.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-p384-sha1.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-p521-sha1.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-p521-sha1.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-p521-sha1.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-p521-sha1.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-rsa.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-rsa.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-rsa.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-enveloping-rsa.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-external-b64-dsa.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-external-b64-dsa.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-external-b64-dsa.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-external-b64-dsa.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-external-dsa.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-external-dsa.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-external-dsa.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-external-dsa.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-external-rsa.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-external-rsa.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-external-rsa.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-external-rsa.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-extra-text-in-signed-info.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-extra-text-in-signed-info.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-extra-text-in-signed-info.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-extra-text-in-signed-info.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-keyname.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-keyname.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-keyname.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-keyname.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-no-reference-uri.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-no-reference-uri.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-no-reference-uri.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-no-reference-uri.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-retrievalmethod-rawx509crt.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-retrievalmethod-rawx509crt.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-retrievalmethod-rawx509crt.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-retrievalmethod-rawx509crt.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-wrong-canonicalization-method-algorithm.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-wrong-canonicalization-method-algorithm.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-wrong-canonicalization-method-algorithm.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-wrong-canonicalization-method-algorithm.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-wrong-signature-method-algorithm.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-wrong-signature-method-algorithm.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-wrong-signature-method-algorithm.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-wrong-signature-method-algorithm.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-wrong-tag-names.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-wrong-tag-names.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-wrong-tag-names.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-wrong-tag-names.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-wrong-transform-algorithm.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-wrong-transform-algorithm.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-wrong-transform-algorithm.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-wrong-transform-algorithm.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-x509-crt-crl.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-x509-crt-crl.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-x509-crt-crl.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-x509-crt-crl.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-x509-crt.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-x509-crt.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-x509-crt.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-x509-crt.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-x509-is.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-x509-is.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-x509-is.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-x509-is.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-x509-ski.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-x509-ski.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-x509-ski.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-x509-ski.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-x509-sn.xml b/test/jdk/javax/xml/crypto/dsig/data/signature-x509-sn.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature-x509-sn.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature-x509-sn.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature.xml b/test/jdk/javax/xml/crypto/dsig/data/signature.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/signature.xml rename to test/jdk/javax/xml/crypto/dsig/data/signature.xml diff --git a/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet b/test/jdk/javax/xml/crypto/dsig/data/xml-stylesheet similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet rename to test/jdk/javax/xml/crypto/dsig/data/xml-stylesheet diff --git a/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64 b/test/jdk/javax/xml/crypto/dsig/data/xml-stylesheet.b64 similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64 rename to test/jdk/javax/xml/crypto/dsig/data/xml-stylesheet.b64 diff --git a/jdk/test/javax/xml/crypto/dsig/data/xmldsig-xfilter2.xml b/test/jdk/javax/xml/crypto/dsig/data/xmldsig-xfilter2.xml similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/data/xmldsig-xfilter2.xml rename to test/jdk/javax/xml/crypto/dsig/data/xmldsig-xfilter2.xml diff --git a/jdk/test/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java b/test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java rename to test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java diff --git a/jdk/test/javax/xml/crypto/dsig/keyinfo/KeyInfo/test.policy b/test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfo/test.policy similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/keyinfo/KeyInfo/test.policy rename to test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfo/test.policy diff --git a/jdk/test/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory/UnknownProvider.java b/test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory/UnknownProvider.java similarity index 100% rename from jdk/test/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory/UnknownProvider.java rename to test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory/UnknownProvider.java diff --git a/jdk/test/javax/xml/jaxp/Encodings/CheckEncodingPropertiesFile.java b/test/jdk/javax/xml/jaxp/Encodings/CheckEncodingPropertiesFile.java similarity index 100% rename from jdk/test/javax/xml/jaxp/Encodings/CheckEncodingPropertiesFile.java rename to test/jdk/javax/xml/jaxp/Encodings/CheckEncodingPropertiesFile.java diff --git a/jdk/test/javax/xml/jaxp/PrecisionDecimalDV/XPrecisionDecimalToString.java b/test/jdk/javax/xml/jaxp/PrecisionDecimalDV/XPrecisionDecimalToString.java similarity index 100% rename from jdk/test/javax/xml/jaxp/PrecisionDecimalDV/XPrecisionDecimalToString.java rename to test/jdk/javax/xml/jaxp/PrecisionDecimalDV/XPrecisionDecimalToString.java diff --git a/jdk/test/javax/xml/jaxp/TEST.properties b/test/jdk/javax/xml/jaxp/TEST.properties similarity index 100% rename from jdk/test/javax/xml/jaxp/TEST.properties rename to test/jdk/javax/xml/jaxp/TEST.properties diff --git a/jdk/test/javax/xml/jaxp/XPath/8009579/XPathExceptionInitCause.java b/test/jdk/javax/xml/jaxp/XPath/8009579/XPathExceptionInitCause.java similarity index 100% rename from jdk/test/javax/xml/jaxp/XPath/8009579/XPathExceptionInitCause.java rename to test/jdk/javax/xml/jaxp/XPath/8009579/XPathExceptionInitCause.java diff --git a/jdk/test/javax/xml/jaxp/XPath/8015978/XPathNegativeZero.java b/test/jdk/javax/xml/jaxp/XPath/8015978/XPathNegativeZero.java similarity index 100% rename from jdk/test/javax/xml/jaxp/XPath/8015978/XPathNegativeZero.java rename to test/jdk/javax/xml/jaxp/XPath/8015978/XPathNegativeZero.java diff --git a/jdk/test/javax/xml/jaxp/XPath/8015978/dummy.xml b/test/jdk/javax/xml/jaxp/XPath/8015978/dummy.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/XPath/8015978/dummy.xml rename to test/jdk/javax/xml/jaxp/XPath/8015978/dummy.xml diff --git a/jdk/test/javax/xml/jaxp/XPath/8015978/negativezero.xsl b/test/jdk/javax/xml/jaxp/XPath/8015978/negativezero.xsl similarity index 100% rename from jdk/test/javax/xml/jaxp/XPath/8015978/negativezero.xsl rename to test/jdk/javax/xml/jaxp/XPath/8015978/negativezero.xsl diff --git a/jdk/test/javax/xml/jaxp/XPath/8035577/Regex.java b/test/jdk/javax/xml/jaxp/XPath/8035577/Regex.java similarity index 100% rename from jdk/test/javax/xml/jaxp/XPath/8035577/Regex.java rename to test/jdk/javax/xml/jaxp/XPath/8035577/Regex.java diff --git a/jdk/test/javax/xml/jaxp/common/8020430/JAXP15RegTest.java b/test/jdk/javax/xml/jaxp/common/8020430/JAXP15RegTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8020430/JAXP15RegTest.java rename to test/jdk/javax/xml/jaxp/common/8020430/JAXP15RegTest.java diff --git a/jdk/test/javax/xml/jaxp/common/8020430/TestBase.java b/test/jdk/javax/xml/jaxp/common/8020430/TestBase.java similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8020430/TestBase.java rename to test/jdk/javax/xml/jaxp/common/8020430/TestBase.java diff --git a/jdk/test/javax/xml/jaxp/common/8032908/TestFunc.java b/test/jdk/javax/xml/jaxp/common/8032908/TestFunc.java similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8032908/TestFunc.java rename to test/jdk/javax/xml/jaxp/common/8032908/TestFunc.java diff --git a/jdk/test/javax/xml/jaxp/common/8032908/XSLT.java b/test/jdk/javax/xml/jaxp/common/8032908/XSLT.java similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8032908/XSLT.java rename to test/jdk/javax/xml/jaxp/common/8032908/XSLT.java diff --git a/jdk/test/javax/xml/jaxp/common/8032908/in.xml b/test/jdk/javax/xml/jaxp/common/8032908/in.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8032908/in.xml rename to test/jdk/javax/xml/jaxp/common/8032908/in.xml diff --git a/jdk/test/javax/xml/jaxp/common/8032908/test.xsl b/test/jdk/javax/xml/jaxp/common/8032908/test.xsl similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8032908/test.xsl rename to test/jdk/javax/xml/jaxp/common/8032908/test.xsl diff --git a/jdk/test/javax/xml/jaxp/common/8035437/AbstractMethodErrorTest.java b/test/jdk/javax/xml/jaxp/common/8035437/AbstractMethodErrorTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8035437/AbstractMethodErrorTest.java rename to test/jdk/javax/xml/jaxp/common/8035437/AbstractMethodErrorTest.java diff --git a/jdk/test/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Document.java b/test/jdk/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Document.java similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Document.java rename to test/jdk/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Document.java diff --git a/jdk/test/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Node.java b/test/jdk/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Node.java similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Node.java rename to test/jdk/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Node.java diff --git a/jdk/test/javax/xml/jaxp/common/8035437/patch-src2/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java b/test/jdk/javax/xml/jaxp/common/8035437/patch-src2/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8035437/patch-src2/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java rename to test/jdk/javax/xml/jaxp/common/8035437/patch-src2/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java diff --git a/jdk/test/javax/xml/jaxp/common/8035437/run.sh b/test/jdk/javax/xml/jaxp/common/8035437/run.sh similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8035437/run.sh rename to test/jdk/javax/xml/jaxp/common/8035437/run.sh diff --git a/jdk/test/javax/xml/jaxp/datatype/5077522/DurationComparison.java b/test/jdk/javax/xml/jaxp/datatype/5077522/DurationComparison.java similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/5077522/DurationComparison.java rename to test/jdk/javax/xml/jaxp/datatype/5077522/DurationComparison.java diff --git a/jdk/test/javax/xml/jaxp/datatype/8033980/CalendarDuration1097Test.java b/test/jdk/javax/xml/jaxp/datatype/8033980/CalendarDuration1097Test.java similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/8033980/CalendarDuration1097Test.java rename to test/jdk/javax/xml/jaxp/datatype/8033980/CalendarDuration1097Test.java diff --git a/jdk/test/javax/xml/jaxp/datatype/8033980/CalendarDuration1243Test.java b/test/jdk/javax/xml/jaxp/datatype/8033980/CalendarDuration1243Test.java similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/8033980/CalendarDuration1243Test.java rename to test/jdk/javax/xml/jaxp/datatype/8033980/CalendarDuration1243Test.java diff --git a/jdk/test/javax/xml/jaxp/datatype/8033980/CalendarDuration1416Test.java b/test/jdk/javax/xml/jaxp/datatype/8033980/CalendarDuration1416Test.java similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/8033980/CalendarDuration1416Test.java rename to test/jdk/javax/xml/jaxp/datatype/8033980/CalendarDuration1416Test.java diff --git a/jdk/test/javax/xml/jaxp/datatype/8033980/JDK6_Duration.ser b/test/jdk/javax/xml/jaxp/datatype/8033980/JDK6_Duration.ser similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/8033980/JDK6_Duration.ser rename to test/jdk/javax/xml/jaxp/datatype/8033980/JDK6_Duration.ser diff --git a/jdk/test/javax/xml/jaxp/datatype/8033980/JDK6_XMLGregorianCalendar.ser b/test/jdk/javax/xml/jaxp/datatype/8033980/JDK6_XMLGregorianCalendar.ser similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/8033980/JDK6_XMLGregorianCalendar.ser rename to test/jdk/javax/xml/jaxp/datatype/8033980/JDK6_XMLGregorianCalendar.ser diff --git a/jdk/test/javax/xml/jaxp/datatype/8033980/JDK7_Duration.ser b/test/jdk/javax/xml/jaxp/datatype/8033980/JDK7_Duration.ser similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/8033980/JDK7_Duration.ser rename to test/jdk/javax/xml/jaxp/datatype/8033980/JDK7_Duration.ser diff --git a/jdk/test/javax/xml/jaxp/datatype/8033980/JDK7_XMLGregorianCalendar.ser b/test/jdk/javax/xml/jaxp/datatype/8033980/JDK7_XMLGregorianCalendar.ser similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/8033980/JDK7_XMLGregorianCalendar.ser rename to test/jdk/javax/xml/jaxp/datatype/8033980/JDK7_XMLGregorianCalendar.ser diff --git a/jdk/test/javax/xml/jaxp/datatype/8033980/JDK8_Duration.ser b/test/jdk/javax/xml/jaxp/datatype/8033980/JDK8_Duration.ser similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/8033980/JDK8_Duration.ser rename to test/jdk/javax/xml/jaxp/datatype/8033980/JDK8_Duration.ser diff --git a/jdk/test/javax/xml/jaxp/datatype/8033980/JDK8_XMLGregorianCalendar.ser b/test/jdk/javax/xml/jaxp/datatype/8033980/JDK8_XMLGregorianCalendar.ser similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/8033980/JDK8_XMLGregorianCalendar.ser rename to test/jdk/javax/xml/jaxp/datatype/8033980/JDK8_XMLGregorianCalendar.ser diff --git a/jdk/test/javax/xml/jaxp/datatype/8033980/JDK9_Duration.ser b/test/jdk/javax/xml/jaxp/datatype/8033980/JDK9_Duration.ser similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/8033980/JDK9_Duration.ser rename to test/jdk/javax/xml/jaxp/datatype/8033980/JDK9_Duration.ser diff --git a/jdk/test/javax/xml/jaxp/datatype/8033980/JDK9_XMLGregorianCalendar.ser b/test/jdk/javax/xml/jaxp/datatype/8033980/JDK9_XMLGregorianCalendar.ser similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/8033980/JDK9_XMLGregorianCalendar.ser rename to test/jdk/javax/xml/jaxp/datatype/8033980/JDK9_XMLGregorianCalendar.ser diff --git a/jdk/test/javax/xml/jaxp/datatype/8033980/SerializationTest.java b/test/jdk/javax/xml/jaxp/datatype/8033980/SerializationTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/datatype/8033980/SerializationTest.java rename to test/jdk/javax/xml/jaxp/datatype/8033980/SerializationTest.java diff --git a/jdk/test/javax/xml/jaxp/parsers/8021148/JAXPSAXParserTest.java b/test/jdk/javax/xml/jaxp/parsers/8021148/JAXPSAXParserTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8021148/JAXPSAXParserTest.java rename to test/jdk/javax/xml/jaxp/parsers/8021148/JAXPSAXParserTest.java diff --git a/jdk/test/javax/xml/jaxp/parsers/8021148/TestBase.java b/test/jdk/javax/xml/jaxp/parsers/8021148/TestBase.java similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8021148/TestBase.java rename to test/jdk/javax/xml/jaxp/parsers/8021148/TestBase.java diff --git a/jdk/test/javax/xml/jaxp/parsers/8022548/JDK8022548.xml b/test/jdk/javax/xml/jaxp/parsers/8022548/JDK8022548.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8022548/JDK8022548.xml rename to test/jdk/javax/xml/jaxp/parsers/8022548/JDK8022548.xml diff --git a/jdk/test/javax/xml/jaxp/parsers/8022548/JDK8022548.xsl b/test/jdk/javax/xml/jaxp/parsers/8022548/JDK8022548.xsl similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8022548/JDK8022548.xsl rename to test/jdk/javax/xml/jaxp/parsers/8022548/JDK8022548.xsl diff --git a/jdk/test/javax/xml/jaxp/parsers/8022548/TestBase.java b/test/jdk/javax/xml/jaxp/parsers/8022548/TestBase.java similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8022548/TestBase.java rename to test/jdk/javax/xml/jaxp/parsers/8022548/TestBase.java diff --git a/jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java b/test/jdk/javax/xml/jaxp/parsers/8022548/XOMParserTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java rename to test/jdk/javax/xml/jaxp/parsers/8022548/XOMParserTest.java diff --git a/jdk/test/javax/xml/jaxp/parsers/8024707/TestFunc.java b/test/jdk/javax/xml/jaxp/parsers/8024707/TestFunc.java similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8024707/TestFunc.java rename to test/jdk/javax/xml/jaxp/parsers/8024707/TestFunc.java diff --git a/jdk/test/javax/xml/jaxp/parsers/8024707/XSLT.java b/test/jdk/javax/xml/jaxp/parsers/8024707/XSLT.java similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8024707/XSLT.java rename to test/jdk/javax/xml/jaxp/parsers/8024707/XSLT.java diff --git a/jdk/test/javax/xml/jaxp/parsers/8024707/in.xml b/test/jdk/javax/xml/jaxp/parsers/8024707/in.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8024707/in.xml rename to test/jdk/javax/xml/jaxp/parsers/8024707/in.xml diff --git a/jdk/test/javax/xml/jaxp/parsers/8024707/test.xsl b/test/jdk/javax/xml/jaxp/parsers/8024707/test.xsl similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8024707/test.xsl rename to test/jdk/javax/xml/jaxp/parsers/8024707/test.xsl diff --git a/jdk/test/javax/xml/jaxp/parsers/8027359/FragmentScannerBufferLimitTest.java b/test/jdk/javax/xml/jaxp/parsers/8027359/FragmentScannerBufferLimitTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8027359/FragmentScannerBufferLimitTest.java rename to test/jdk/javax/xml/jaxp/parsers/8027359/FragmentScannerBufferLimitTest.java diff --git a/jdk/test/javax/xml/jaxp/parsers/8027359/XML11EntityScannerTest.java b/test/jdk/javax/xml/jaxp/parsers/8027359/XML11EntityScannerTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8027359/XML11EntityScannerTest.java rename to test/jdk/javax/xml/jaxp/parsers/8027359/XML11EntityScannerTest.java diff --git a/jdk/test/javax/xml/jaxp/parsers/8029955/EntityScannerTest.java b/test/jdk/javax/xml/jaxp/parsers/8029955/EntityScannerTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8029955/EntityScannerTest.java rename to test/jdk/javax/xml/jaxp/parsers/8029955/EntityScannerTest.java diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/XSLT.java b/test/jdk/javax/xml/jaxp/parsers/8032909/XSLT.java similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8032909/XSLT.java rename to test/jdk/javax/xml/jaxp/parsers/8032909/XSLT.java diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xml b/test/jdk/javax/xml/jaxp/parsers/8032909/a_utf16.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xml rename to test/jdk/javax/xml/jaxp/parsers/8032909/a_utf16.xml diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xsl b/test/jdk/javax/xml/jaxp/parsers/8032909/a_utf16.xsl similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xsl rename to test/jdk/javax/xml/jaxp/parsers/8032909/a_utf16.xsl diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xml b/test/jdk/javax/xml/jaxp/parsers/8032909/a_utf8.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xml rename to test/jdk/javax/xml/jaxp/parsers/8032909/a_utf8.xml diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xsl b/test/jdk/javax/xml/jaxp/parsers/8032909/a_utf8.xsl similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xsl rename to test/jdk/javax/xml/jaxp/parsers/8032909/a_utf8.xsl diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xml b/test/jdk/javax/xml/jaxp/parsers/8032909/a_windows1252.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xml rename to test/jdk/javax/xml/jaxp/parsers/8032909/a_windows1252.xml diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl b/test/jdk/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl similarity index 100% rename from jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl rename to test/jdk/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl diff --git a/jdk/test/javax/xml/jaxp/testng/TEST.properties b/test/jdk/javax/xml/jaxp/testng/TEST.properties similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/TEST.properties rename to test/jdk/javax/xml/jaxp/testng/TEST.properties diff --git a/jdk/test/javax/xml/jaxp/testng/parse/EntityCharacterEventOrder.java b/test/jdk/javax/xml/jaxp/testng/parse/EntityCharacterEventOrder.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/parse/EntityCharacterEventOrder.java rename to test/jdk/javax/xml/jaxp/testng/parse/EntityCharacterEventOrder.java diff --git a/jdk/test/javax/xml/jaxp/testng/parse/XMLEntityScannerLoad.java b/test/jdk/javax/xml/jaxp/testng/parse/XMLEntityScannerLoad.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/parse/XMLEntityScannerLoad.java rename to test/jdk/javax/xml/jaxp/testng/parse/XMLEntityScannerLoad.java diff --git a/jdk/test/javax/xml/jaxp/testng/parse/jdk7156085/UTF8ReaderBug.java b/test/jdk/javax/xml/jaxp/testng/parse/jdk7156085/UTF8ReaderBug.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/parse/jdk7156085/UTF8ReaderBug.java rename to test/jdk/javax/xml/jaxp/testng/parse/jdk7156085/UTF8ReaderBug.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/BaseTest.java b/test/jdk/javax/xml/jaxp/testng/validation/BaseTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/BaseTest.java rename to test/jdk/javax/xml/jaxp/testng/validation/BaseTest.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/SpecialCaseErrorHandler.java b/test/jdk/javax/xml/jaxp/testng/validation/SpecialCaseErrorHandler.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/SpecialCaseErrorHandler.java rename to test/jdk/javax/xml/jaxp/testng/validation/SpecialCaseErrorHandler.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/filelist b/test/jdk/javax/xml/jaxp/testng/validation/filelist similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/filelist rename to test/jdk/javax/xml/jaxp/testng/validation/filelist diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/FeaturePropagationTest.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/FeaturePropagationTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/FeaturePropagationTest.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/FeaturePropagationTest.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/RootSimpleTypeDefinitionTest.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/RootSimpleTypeDefinitionTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/RootSimpleTypeDefinitionTest.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/RootSimpleTypeDefinitionTest.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/RootTypeDefinitionTest.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/RootTypeDefinitionTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/RootTypeDefinitionTest.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/RootTypeDefinitionTest.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/Xerces1128doc1Test.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/Xerces1128doc1Test.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/Xerces1128doc1Test.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/Xerces1128doc1Test.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/Xerces1128doc2Test.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/Xerces1128doc2Test.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/Xerces1128doc2Test.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/Xerces1128doc2Test.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/base.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/base.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/base.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/base.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/base.xsd b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/base.xsd similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/base.xsd rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/base.xsd diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/idc.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/idc.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/idc.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/idc.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/idc.xsd b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/idc.xsd similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/idc.xsd rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/idc.xsd diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/simpleType.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/simpleType.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/simpleType.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/simpleType.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/xerces1128.xsd b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/xerces1128.xsd similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/xerces1128.xsd rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/xerces1128.xsd diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/xerces1128_1.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/xerces1128_1.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/xerces1128_1.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/xerces1128_1.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/xerces1128_2.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/xerces1128_2.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8036951/xerces1128_2.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8036951/xerces1128_2.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/BasicTest.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/BasicTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/BasicTest.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/BasicTest.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/BasicTest1.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/BasicTest1.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/BasicTest1.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/BasicTest1.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/FixedAttrTest.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/FixedAttrTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/FixedAttrTest.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/FixedAttrTest.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IdIdrefCheckingTest.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IdIdrefCheckingTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IdIdrefCheckingTest.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IdIdrefCheckingTest.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IdentityConstraintCheckingTest.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IdentityConstraintCheckingTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IdentityConstraintCheckingTest.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IdentityConstraintCheckingTest.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_A_A.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_A_A.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_A_A.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_A_A.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_A_C.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_A_C.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_A_C.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_A_C.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_A.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_A.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_A.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_A.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_AC.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_AC.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_AC.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_AC.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_C.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_C.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_C.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_C.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_CA.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_CA.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_CA.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/IgnoreXSITypeTest_C_CA.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/RootTypeDefinitionTest.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/RootTypeDefinitionTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/RootTypeDefinitionTest.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/RootTypeDefinitionTest.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/UnparsedEntityCheckingTest.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/UnparsedEntityCheckingTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/UnparsedEntityCheckingTest.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/UnparsedEntityCheckingTest.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/UseGrammarPoolOnlyTest_False.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/UseGrammarPoolOnlyTest_False.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/UseGrammarPoolOnlyTest_False.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/UseGrammarPoolOnlyTest_False.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/UseGrammarPoolOnlyTest_True.java b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/UseGrammarPoolOnlyTest_True.java similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/UseGrammarPoolOnlyTest_True.java rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/UseGrammarPoolOnlyTest_True.java diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/base.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/base.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/base.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/base.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/base.xsd b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/base.xsd similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/base.xsd rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/base.xsd diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/fixedAttr.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/fixedAttr.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/fixedAttr.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/fixedAttr.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/idIdref.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/idIdref.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/idIdref.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/idIdref.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/idc.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/idc.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/idc.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/idc.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/idc.xsd b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/idc.xsd similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/idc.xsd rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/idc.xsd diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/otherNamespace.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/otherNamespace.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/otherNamespace.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/otherNamespace.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/otherNamespace.xsd b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/otherNamespace.xsd similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/otherNamespace.xsd rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/otherNamespace.xsd diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/unparsedEntity.dtd b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/unparsedEntity.dtd similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/unparsedEntity.dtd rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/unparsedEntity.dtd diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/unparsedEntity.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/unparsedEntity.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/unparsedEntity.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/unparsedEntity.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_A_A.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_A_A.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_A_A.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_A_A.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_A_C.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_A_C.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_A_C.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_A_C.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_A.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_A.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_A.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_A.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_AC.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_AC.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_AC.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_AC.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_C.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_C.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_C.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_C.xml diff --git a/jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_CA.xml b/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_CA.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_CA.xml rename to test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/xsitype_C_CA.xml diff --git a/jdk/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml b/test/jdk/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml rename to test/jdk/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml diff --git a/jdk/test/javax/xml/jaxp/transform/8004476/TestBase.java b/test/jdk/javax/xml/jaxp/transform/8004476/TestBase.java similarity index 100% rename from jdk/test/javax/xml/jaxp/transform/8004476/TestBase.java rename to test/jdk/javax/xml/jaxp/transform/8004476/TestBase.java diff --git a/jdk/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java b/test/jdk/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java rename to test/jdk/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java diff --git a/jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java b/test/jdk/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java rename to test/jdk/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java diff --git a/jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xml b/test/jdk/javax/xml/jaxp/transform/8004476/tokenize.xml similarity index 100% rename from jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xml rename to test/jdk/javax/xml/jaxp/transform/8004476/tokenize.xml diff --git a/jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xsl b/test/jdk/javax/xml/jaxp/transform/8004476/tokenize.xsl similarity index 100% rename from jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xsl rename to test/jdk/javax/xml/jaxp/transform/8004476/tokenize.xsl diff --git a/jdk/test/javax/xml/jaxp/transform/8062923/XslSubstringTest.java b/test/jdk/javax/xml/jaxp/transform/8062923/XslSubstringTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/transform/8062923/XslSubstringTest.java rename to test/jdk/javax/xml/jaxp/transform/8062923/XslSubstringTest.java diff --git a/jdk/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java b/test/jdk/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java rename to test/jdk/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java diff --git a/jdk/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd b/test/jdk/javax/xml/jaxp/validation/8015092/idIxpns.xsd similarity index 100% rename from jdk/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd rename to test/jdk/javax/xml/jaxp/validation/8015092/idIxpns.xsd diff --git a/jdk/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd b/test/jdk/javax/xml/jaxp/validation/8015092/idIxpns1.xsd similarity index 100% rename from jdk/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd rename to test/jdk/javax/xml/jaxp/validation/8015092/idIxpns1.xsd diff --git a/jdk/test/javax/xml/jaxp/validation/8015092/idJ029.xsd b/test/jdk/javax/xml/jaxp/validation/8015092/idJ029.xsd similarity index 100% rename from jdk/test/javax/xml/jaxp/validation/8015092/idJ029.xsd rename to test/jdk/javax/xml/jaxp/validation/8015092/idJ029.xsd diff --git a/jdk/test/javax/xml/jaxp/validation/8015092/idJimp.xsd b/test/jdk/javax/xml/jaxp/validation/8015092/idJimp.xsd similarity index 100% rename from jdk/test/javax/xml/jaxp/validation/8015092/idJimp.xsd rename to test/jdk/javax/xml/jaxp/validation/8015092/idJimp.xsd diff --git a/jdk/test/javax/xml/jaxp/validation/8015243/AnyURITest.java b/test/jdk/javax/xml/jaxp/validation/8015243/AnyURITest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/validation/8015243/AnyURITest.java rename to test/jdk/javax/xml/jaxp/validation/8015243/AnyURITest.java diff --git a/jdk/test/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd b/test/jdk/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd similarity index 100% rename from jdk/test/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd rename to test/jdk/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd diff --git a/jdk/test/javax/xml/jaxp/validation/8049514/FeaturePropagationTest.java b/test/jdk/javax/xml/jaxp/validation/8049514/FeaturePropagationTest.java similarity index 100% rename from jdk/test/javax/xml/jaxp/validation/8049514/FeaturePropagationTest.java rename to test/jdk/javax/xml/jaxp/validation/8049514/FeaturePropagationTest.java diff --git a/jdk/test/javax/xml/soap/XmlTest.java b/test/jdk/javax/xml/soap/XmlTest.java similarity index 100% rename from jdk/test/javax/xml/soap/XmlTest.java rename to test/jdk/javax/xml/soap/XmlTest.java diff --git a/jdk/test/javax/xml/soap/spi/SAAJFactoryTest.java b/test/jdk/javax/xml/soap/spi/SAAJFactoryTest.java similarity index 100% rename from jdk/test/javax/xml/soap/spi/SAAJFactoryTest.java rename to test/jdk/javax/xml/soap/spi/SAAJFactoryTest.java diff --git a/jdk/test/javax/xml/soap/spi/saaj/factory/Invalid.java b/test/jdk/javax/xml/soap/spi/saaj/factory/Invalid.java similarity index 100% rename from jdk/test/javax/xml/soap/spi/saaj/factory/Invalid.java rename to test/jdk/javax/xml/soap/spi/saaj/factory/Invalid.java diff --git a/jdk/test/javax/xml/soap/spi/saaj/factory/Valid.java b/test/jdk/javax/xml/soap/spi/saaj/factory/Valid.java similarity index 100% rename from jdk/test/javax/xml/soap/spi/saaj/factory/Valid.java rename to test/jdk/javax/xml/soap/spi/saaj/factory/Valid.java diff --git a/jdk/test/javax/xml/soap/spi/saaj/factory/Valid2.java b/test/jdk/javax/xml/soap/spi/saaj/factory/Valid2.java similarity index 100% rename from jdk/test/javax/xml/soap/spi/saaj/factory/Valid2.java rename to test/jdk/javax/xml/soap/spi/saaj/factory/Valid2.java diff --git a/jdk/test/javax/xml/soap/spi/saaj/factory/Valid3.java b/test/jdk/javax/xml/soap/spi/saaj/factory/Valid3.java similarity index 100% rename from jdk/test/javax/xml/soap/spi/saaj/factory/Valid3.java rename to test/jdk/javax/xml/soap/spi/saaj/factory/Valid3.java diff --git a/jdk/test/javax/xml/soap/spi/test.policy b/test/jdk/javax/xml/soap/spi/test.policy similarity index 100% rename from jdk/test/javax/xml/soap/spi/test.policy rename to test/jdk/javax/xml/soap/spi/test.policy diff --git a/jdk/test/javax/xml/ws/8033113/Organization_List.wsdl b/test/jdk/javax/xml/ws/8033113/Organization_List.wsdl similarity index 100% rename from jdk/test/javax/xml/ws/8033113/Organization_List.wsdl rename to test/jdk/javax/xml/ws/8033113/Organization_List.wsdl diff --git a/jdk/test/javax/xml/ws/8033113/WsImportTest.java b/test/jdk/javax/xml/ws/8033113/WsImportTest.java similarity index 100% rename from jdk/test/javax/xml/ws/8033113/WsImportTest.java rename to test/jdk/javax/xml/ws/8033113/WsImportTest.java diff --git a/jdk/test/javax/xml/ws/8033113/customization.xml b/test/jdk/javax/xml/ws/8033113/customization.xml similarity index 100% rename from jdk/test/javax/xml/ws/8033113/customization.xml rename to test/jdk/javax/xml/ws/8033113/customization.xml diff --git a/jdk/test/javax/xml/ws/8043129/MailTest.java b/test/jdk/javax/xml/ws/8043129/MailTest.java similarity index 100% rename from jdk/test/javax/xml/ws/8043129/MailTest.java rename to test/jdk/javax/xml/ws/8043129/MailTest.java diff --git a/jdk/test/javax/xml/ws/8043129/javax.mail.jar b/test/jdk/javax/xml/ws/8043129/javax.mail.jar similarity index 100% rename from jdk/test/javax/xml/ws/8043129/javax.mail.jar rename to test/jdk/javax/xml/ws/8043129/javax.mail.jar diff --git a/jdk/test/javax/xml/ws/8159058/SaajEmptyNamespaceTest.java b/test/jdk/javax/xml/ws/8159058/SaajEmptyNamespaceTest.java similarity index 100% rename from jdk/test/javax/xml/ws/8159058/SaajEmptyNamespaceTest.java rename to test/jdk/javax/xml/ws/8159058/SaajEmptyNamespaceTest.java diff --git a/jdk/test/javax/xml/ws/clientjar/TestService.java b/test/jdk/javax/xml/ws/clientjar/TestService.java similarity index 100% rename from jdk/test/javax/xml/ws/clientjar/TestService.java rename to test/jdk/javax/xml/ws/clientjar/TestService.java diff --git a/jdk/test/javax/xml/ws/clientjar/TestWsImport.java b/test/jdk/javax/xml/ws/clientjar/TestWsImport.java similarity index 100% rename from jdk/test/javax/xml/ws/clientjar/TestWsImport.java rename to test/jdk/javax/xml/ws/clientjar/TestWsImport.java diff --git a/jdk/test/javax/xml/ws/ebcdic/WsImportTest.java b/test/jdk/javax/xml/ws/ebcdic/WsImportTest.java similarity index 100% rename from jdk/test/javax/xml/ws/ebcdic/WsImportTest.java rename to test/jdk/javax/xml/ws/ebcdic/WsImportTest.java diff --git a/jdk/test/javax/xml/ws/ebcdic/test-service.wsdl b/test/jdk/javax/xml/ws/ebcdic/test-service.wsdl similarity index 100% rename from jdk/test/javax/xml/ws/ebcdic/test-service.wsdl rename to test/jdk/javax/xml/ws/ebcdic/test-service.wsdl diff --git a/jdk/test/javax/xml/ws/publish/WSTest.java b/test/jdk/javax/xml/ws/publish/WSTest.java similarity index 100% rename from jdk/test/javax/xml/ws/publish/WSTest.java rename to test/jdk/javax/xml/ws/publish/WSTest.java diff --git a/jdk/test/javax/xml/ws/xsanymixed/CopyingResponse.java b/test/jdk/javax/xml/ws/xsanymixed/CopyingResponse.java similarity index 100% rename from jdk/test/javax/xml/ws/xsanymixed/CopyingResponse.java rename to test/jdk/javax/xml/ws/xsanymixed/CopyingResponse.java diff --git a/jdk/test/javax/xml/ws/xsanymixed/ServiceImpl.java b/test/jdk/javax/xml/ws/xsanymixed/ServiceImpl.java similarity index 100% rename from jdk/test/javax/xml/ws/xsanymixed/ServiceImpl.java rename to test/jdk/javax/xml/ws/xsanymixed/ServiceImpl.java diff --git a/jdk/test/javax/xml/ws/xsanymixed/Test.java b/test/jdk/javax/xml/ws/xsanymixed/Test.java similarity index 100% rename from jdk/test/javax/xml/ws/xsanymixed/Test.java rename to test/jdk/javax/xml/ws/xsanymixed/Test.java diff --git a/jdk/test/javax/xml/ws/xsanymixed/compile-wsdl.sh b/test/jdk/javax/xml/ws/xsanymixed/compile-wsdl.sh similarity index 100% rename from jdk/test/javax/xml/ws/xsanymixed/compile-wsdl.sh rename to test/jdk/javax/xml/ws/xsanymixed/compile-wsdl.sh diff --git a/jdk/test/javax/xml/ws/xsanymixed/service.wsdl b/test/jdk/javax/xml/ws/xsanymixed/service.wsdl similarity index 100% rename from jdk/test/javax/xml/ws/xsanymixed/service.wsdl rename to test/jdk/javax/xml/ws/xsanymixed/service.wsdl diff --git a/jdk/test/jdk/editpad/EditPadTest.java b/test/jdk/jdk/editpad/EditPadTest.java similarity index 100% rename from jdk/test/jdk/editpad/EditPadTest.java rename to test/jdk/jdk/editpad/EditPadTest.java diff --git a/jdk/test/jdk/internal/agent/AgentCMETest.java b/test/jdk/jdk/internal/agent/AgentCMETest.java similarity index 100% rename from jdk/test/jdk/internal/agent/AgentCMETest.java rename to test/jdk/jdk/internal/agent/AgentCMETest.java diff --git a/jdk/test/jdk/internal/agent/AgentCheckTest.java b/test/jdk/jdk/internal/agent/AgentCheckTest.java similarity index 100% rename from jdk/test/jdk/internal/agent/AgentCheckTest.java rename to test/jdk/jdk/internal/agent/AgentCheckTest.java diff --git a/jdk/test/jdk/internal/jimage/JImageOpenTest.java b/test/jdk/jdk/internal/jimage/JImageOpenTest.java similarity index 100% rename from jdk/test/jdk/internal/jimage/JImageOpenTest.java rename to test/jdk/jdk/internal/jimage/JImageOpenTest.java diff --git a/jdk/test/jdk/internal/jimage/JImageReadTest.java b/test/jdk/jdk/internal/jimage/JImageReadTest.java similarity index 100% rename from jdk/test/jdk/internal/jimage/JImageReadTest.java rename to test/jdk/jdk/internal/jimage/JImageReadTest.java diff --git a/jdk/test/jdk/internal/jimage/TEST.properties b/test/jdk/jdk/internal/jimage/TEST.properties similarity index 100% rename from jdk/test/jdk/internal/jimage/TEST.properties rename to test/jdk/jdk/internal/jimage/TEST.properties diff --git a/jdk/test/jdk/internal/jline/KeyConversionTest.java b/test/jdk/jdk/internal/jline/KeyConversionTest.java similarity index 100% rename from jdk/test/jdk/internal/jline/KeyConversionTest.java rename to test/jdk/jdk/internal/jline/KeyConversionTest.java diff --git a/jdk/test/jdk/internal/jline/console/StripAnsiTest.java b/test/jdk/jdk/internal/jline/console/StripAnsiTest.java similarity index 100% rename from jdk/test/jdk/internal/jline/console/StripAnsiTest.java rename to test/jdk/jdk/internal/jline/console/StripAnsiTest.java diff --git a/jdk/test/jdk/internal/jline/extra/HistoryTest.java b/test/jdk/jdk/internal/jline/extra/HistoryTest.java similarity index 100% rename from jdk/test/jdk/internal/jline/extra/HistoryTest.java rename to test/jdk/jdk/internal/jline/extra/HistoryTest.java diff --git a/jdk/test/jdk/internal/jrtfs/Basic.java b/test/jdk/jdk/internal/jrtfs/Basic.java similarity index 100% rename from jdk/test/jdk/internal/jrtfs/Basic.java rename to test/jdk/jdk/internal/jrtfs/Basic.java diff --git a/jdk/test/jdk/internal/jrtfs/PathOps.java b/test/jdk/jdk/internal/jrtfs/PathOps.java similarity index 100% rename from jdk/test/jdk/internal/jrtfs/PathOps.java rename to test/jdk/jdk/internal/jrtfs/PathOps.java diff --git a/jdk/test/jdk/internal/jrtfs/WithSecurityManager.java b/test/jdk/jdk/internal/jrtfs/WithSecurityManager.java similarity index 100% rename from jdk/test/jdk/internal/jrtfs/WithSecurityManager.java rename to test/jdk/jdk/internal/jrtfs/WithSecurityManager.java diff --git a/jdk/test/jdk/internal/jrtfs/java.policy b/test/jdk/jdk/internal/jrtfs/java.policy similarity index 100% rename from jdk/test/jdk/internal/jrtfs/java.policy rename to test/jdk/jdk/internal/jrtfs/java.policy diff --git a/jdk/test/jdk/internal/jrtfs/remote/Main.java b/test/jdk/jdk/internal/jrtfs/remote/Main.java similarity index 100% rename from jdk/test/jdk/internal/jrtfs/remote/Main.java rename to test/jdk/jdk/internal/jrtfs/remote/Main.java diff --git a/jdk/test/jdk/internal/jrtfs/remote/RemoteRuntimeImageTest.java b/test/jdk/jdk/internal/jrtfs/remote/RemoteRuntimeImageTest.java similarity index 100% rename from jdk/test/jdk/internal/jrtfs/remote/RemoteRuntimeImageTest.java rename to test/jdk/jdk/internal/jrtfs/remote/RemoteRuntimeImageTest.java diff --git a/jdk/test/jdk/internal/loader/ClassLoaderValue/ClassLoaderValueTest.java b/test/jdk/jdk/internal/loader/ClassLoaderValue/ClassLoaderValueTest.java similarity index 100% rename from jdk/test/jdk/internal/loader/ClassLoaderValue/ClassLoaderValueTest.java rename to test/jdk/jdk/internal/loader/ClassLoaderValue/ClassLoaderValueTest.java diff --git a/jdk/test/jdk/internal/math/FloatingDecimal/OldFDBigIntForTest.java b/test/jdk/jdk/internal/math/FloatingDecimal/OldFDBigIntForTest.java similarity index 100% rename from jdk/test/jdk/internal/math/FloatingDecimal/OldFDBigIntForTest.java rename to test/jdk/jdk/internal/math/FloatingDecimal/OldFDBigIntForTest.java diff --git a/jdk/test/jdk/internal/math/FloatingDecimal/OldFloatingDecimalForTest.java b/test/jdk/jdk/internal/math/FloatingDecimal/OldFloatingDecimalForTest.java similarity index 100% rename from jdk/test/jdk/internal/math/FloatingDecimal/OldFloatingDecimalForTest.java rename to test/jdk/jdk/internal/math/FloatingDecimal/OldFloatingDecimalForTest.java diff --git a/jdk/test/jdk/internal/math/FloatingDecimal/TestFDBigInteger.java b/test/jdk/jdk/internal/math/FloatingDecimal/TestFDBigInteger.java similarity index 100% rename from jdk/test/jdk/internal/math/FloatingDecimal/TestFDBigInteger.java rename to test/jdk/jdk/internal/math/FloatingDecimal/TestFDBigInteger.java diff --git a/jdk/test/jdk/internal/math/FloatingDecimal/TestFloatingDecimal.java b/test/jdk/jdk/internal/math/FloatingDecimal/TestFloatingDecimal.java similarity index 100% rename from jdk/test/jdk/internal/math/FloatingDecimal/TestFloatingDecimal.java rename to test/jdk/jdk/internal/math/FloatingDecimal/TestFloatingDecimal.java diff --git a/jdk/test/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java b/test/jdk/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java similarity index 100% rename from jdk/test/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java rename to test/jdk/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java diff --git a/jdk/test/jdk/internal/misc/Unsafe/CopyCommon.java b/test/jdk/jdk/internal/misc/Unsafe/CopyCommon.java similarity index 100% rename from jdk/test/jdk/internal/misc/Unsafe/CopyCommon.java rename to test/jdk/jdk/internal/misc/Unsafe/CopyCommon.java diff --git a/jdk/test/jdk/internal/misc/Unsafe/CopyMemory.java b/test/jdk/jdk/internal/misc/Unsafe/CopyMemory.java similarity index 100% rename from jdk/test/jdk/internal/misc/Unsafe/CopyMemory.java rename to test/jdk/jdk/internal/misc/Unsafe/CopyMemory.java diff --git a/jdk/test/jdk/internal/misc/Unsafe/CopyMemoryLarge.java b/test/jdk/jdk/internal/misc/Unsafe/CopyMemoryLarge.java similarity index 100% rename from jdk/test/jdk/internal/misc/Unsafe/CopyMemoryLarge.java rename to test/jdk/jdk/internal/misc/Unsafe/CopyMemoryLarge.java diff --git a/jdk/test/jdk/internal/misc/Unsafe/CopySwap.java b/test/jdk/jdk/internal/misc/Unsafe/CopySwap.java similarity index 100% rename from jdk/test/jdk/internal/misc/Unsafe/CopySwap.java rename to test/jdk/jdk/internal/misc/Unsafe/CopySwap.java diff --git a/jdk/test/jdk/internal/misc/Unsafe/CopySwapLarge.java b/test/jdk/jdk/internal/misc/Unsafe/CopySwapLarge.java similarity index 100% rename from jdk/test/jdk/internal/misc/Unsafe/CopySwapLarge.java rename to test/jdk/jdk/internal/misc/Unsafe/CopySwapLarge.java diff --git a/jdk/test/jdk/internal/misc/Unsafe/TestBadHostClass.java b/test/jdk/jdk/internal/misc/Unsafe/TestBadHostClass.java similarity index 100% rename from jdk/test/jdk/internal/misc/Unsafe/TestBadHostClass.java rename to test/jdk/jdk/internal/misc/Unsafe/TestBadHostClass.java diff --git a/jdk/test/jdk/internal/misc/VM/GetNanoTimeAdjustment.java b/test/jdk/jdk/internal/misc/VM/GetNanoTimeAdjustment.java similarity index 100% rename from jdk/test/jdk/internal/misc/VM/GetNanoTimeAdjustment.java rename to test/jdk/jdk/internal/misc/VM/GetNanoTimeAdjustment.java diff --git a/jdk/test/jdk/internal/misc/VM/RuntimeArguments.java b/test/jdk/jdk/internal/misc/VM/RuntimeArguments.java similarity index 100% rename from jdk/test/jdk/internal/misc/VM/RuntimeArguments.java rename to test/jdk/jdk/internal/misc/VM/RuntimeArguments.java diff --git a/jdk/test/jdk/internal/ref/Cleaner/ExitOnThrow.java b/test/jdk/jdk/internal/ref/Cleaner/ExitOnThrow.java similarity index 100% rename from jdk/test/jdk/internal/ref/Cleaner/ExitOnThrow.java rename to test/jdk/jdk/internal/ref/Cleaner/ExitOnThrow.java diff --git a/jdk/test/jdk/internal/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java b/test/jdk/jdk/internal/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java similarity index 100% rename from jdk/test/jdk/internal/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java rename to test/jdk/jdk/internal/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java diff --git a/jdk/test/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java b/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java similarity index 100% rename from jdk/test/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java rename to test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java diff --git a/jdk/test/jdk/internal/reflect/CallerSensitive/CheckCSMs.java b/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java similarity index 100% rename from jdk/test/jdk/internal/reflect/CallerSensitive/CheckCSMs.java rename to test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java diff --git a/jdk/test/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java b/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java similarity index 100% rename from jdk/test/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java rename to test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java diff --git a/jdk/test/jdk/internal/reflect/Reflection/GetCallerClass.java b/test/jdk/jdk/internal/reflect/Reflection/GetCallerClass.java similarity index 100% rename from jdk/test/jdk/internal/reflect/Reflection/GetCallerClass.java rename to test/jdk/jdk/internal/reflect/Reflection/GetCallerClass.java diff --git a/jdk/test/jdk/internal/reflect/Reflection/GetCallerClassTest.java b/test/jdk/jdk/internal/reflect/Reflection/GetCallerClassTest.java similarity index 100% rename from jdk/test/jdk/internal/reflect/Reflection/GetCallerClassTest.java rename to test/jdk/jdk/internal/reflect/Reflection/GetCallerClassTest.java diff --git a/jdk/test/jdk/internal/reflect/Reflection/GetCallerClassTest.sh b/test/jdk/jdk/internal/reflect/Reflection/GetCallerClassTest.sh similarity index 100% rename from jdk/test/jdk/internal/reflect/Reflection/GetCallerClassTest.sh rename to test/jdk/jdk/internal/reflect/Reflection/GetCallerClassTest.sh diff --git a/jdk/test/jdk/internal/reflect/Reflection/GetCallerClassWithDepth.java b/test/jdk/jdk/internal/reflect/Reflection/GetCallerClassWithDepth.java similarity index 100% rename from jdk/test/jdk/internal/reflect/Reflection/GetCallerClassWithDepth.java rename to test/jdk/jdk/internal/reflect/Reflection/GetCallerClassWithDepth.java diff --git a/jdk/test/jdk/internal/reflect/constantPool/ConstantPoolTest.java b/test/jdk/jdk/internal/reflect/constantPool/ConstantPoolTest.java similarity index 100% rename from jdk/test/jdk/internal/reflect/constantPool/ConstantPoolTest.java rename to test/jdk/jdk/internal/reflect/constantPool/ConstantPoolTest.java diff --git a/jdk/test/jdk/internal/reflect/constantPool/ConstantPoolTestDummy.jasm b/test/jdk/jdk/internal/reflect/constantPool/ConstantPoolTestDummy.jasm similarity index 100% rename from jdk/test/jdk/internal/reflect/constantPool/ConstantPoolTestDummy.jasm rename to test/jdk/jdk/internal/reflect/constantPool/ConstantPoolTestDummy.jasm diff --git a/jdk/test/jdk/internal/util/jar/TestVersionedStream.java b/test/jdk/jdk/internal/util/jar/TestVersionedStream.java similarity index 100% rename from jdk/test/jdk/internal/util/jar/TestVersionedStream.java rename to test/jdk/jdk/internal/util/jar/TestVersionedStream.java diff --git a/jdk/test/jdk/lambda/ArrayCtorRefTest.java b/test/jdk/jdk/lambda/ArrayCtorRefTest.java similarity index 100% rename from jdk/test/jdk/lambda/ArrayCtorRefTest.java rename to test/jdk/jdk/lambda/ArrayCtorRefTest.java diff --git a/jdk/test/jdk/lambda/LambdaTranslationCompoundSamTest.java b/test/jdk/jdk/lambda/LambdaTranslationCompoundSamTest.java similarity index 100% rename from jdk/test/jdk/lambda/LambdaTranslationCompoundSamTest.java rename to test/jdk/jdk/lambda/LambdaTranslationCompoundSamTest.java diff --git a/jdk/test/jdk/lambda/LambdaTranslationTest1.java b/test/jdk/jdk/lambda/LambdaTranslationTest1.java similarity index 100% rename from jdk/test/jdk/lambda/LambdaTranslationTest1.java rename to test/jdk/jdk/lambda/LambdaTranslationTest1.java diff --git a/jdk/test/jdk/lambda/LambdaTranslationTest2.java b/test/jdk/jdk/lambda/LambdaTranslationTest2.java similarity index 100% rename from jdk/test/jdk/lambda/LambdaTranslationTest2.java rename to test/jdk/jdk/lambda/LambdaTranslationTest2.java diff --git a/jdk/test/jdk/lambda/MethodReferenceTestCallerSensitive.java b/test/jdk/jdk/lambda/MethodReferenceTestCallerSensitive.java similarity index 100% rename from jdk/test/jdk/lambda/MethodReferenceTestCallerSensitive.java rename to test/jdk/jdk/lambda/MethodReferenceTestCallerSensitive.java diff --git a/jdk/test/jdk/lambda/MethodReferenceTestInstanceMethod.java b/test/jdk/jdk/lambda/MethodReferenceTestInstanceMethod.java similarity index 100% rename from jdk/test/jdk/lambda/MethodReferenceTestInstanceMethod.java rename to test/jdk/jdk/lambda/MethodReferenceTestInstanceMethod.java diff --git a/jdk/test/jdk/lambda/TEST.properties b/test/jdk/jdk/lambda/TEST.properties similarity index 100% rename from jdk/test/jdk/lambda/TEST.properties rename to test/jdk/jdk/lambda/TEST.properties diff --git a/jdk/test/jdk/lambda/TestInnerCtorRef.java b/test/jdk/jdk/lambda/TestInnerCtorRef.java similarity index 100% rename from jdk/test/jdk/lambda/TestInnerCtorRef.java rename to test/jdk/jdk/lambda/TestInnerCtorRef.java diff --git a/jdk/test/jdk/lambda/TestPrivateCtorRef.java b/test/jdk/jdk/lambda/TestPrivateCtorRef.java similarity index 100% rename from jdk/test/jdk/lambda/TestPrivateCtorRef.java rename to test/jdk/jdk/lambda/TestPrivateCtorRef.java diff --git a/jdk/test/jdk/lambda/separate/AttributeInjector.java b/test/jdk/jdk/lambda/separate/AttributeInjector.java similarity index 100% rename from jdk/test/jdk/lambda/separate/AttributeInjector.java rename to test/jdk/jdk/lambda/separate/AttributeInjector.java diff --git a/jdk/test/jdk/lambda/separate/ClassFile.java b/test/jdk/jdk/lambda/separate/ClassFile.java similarity index 100% rename from jdk/test/jdk/lambda/separate/ClassFile.java rename to test/jdk/jdk/lambda/separate/ClassFile.java diff --git a/jdk/test/jdk/lambda/separate/ClassFilePreprocessor.java b/test/jdk/jdk/lambda/separate/ClassFilePreprocessor.java similarity index 100% rename from jdk/test/jdk/lambda/separate/ClassFilePreprocessor.java rename to test/jdk/jdk/lambda/separate/ClassFilePreprocessor.java diff --git a/jdk/test/jdk/lambda/separate/ClassToInterfaceConverter.java b/test/jdk/jdk/lambda/separate/ClassToInterfaceConverter.java similarity index 100% rename from jdk/test/jdk/lambda/separate/ClassToInterfaceConverter.java rename to test/jdk/jdk/lambda/separate/ClassToInterfaceConverter.java diff --git a/jdk/test/jdk/lambda/separate/Compiler.java b/test/jdk/jdk/lambda/separate/Compiler.java similarity index 100% rename from jdk/test/jdk/lambda/separate/Compiler.java rename to test/jdk/jdk/lambda/separate/Compiler.java diff --git a/jdk/test/jdk/lambda/separate/DirectedClassLoader.java b/test/jdk/jdk/lambda/separate/DirectedClassLoader.java similarity index 100% rename from jdk/test/jdk/lambda/separate/DirectedClassLoader.java rename to test/jdk/jdk/lambda/separate/DirectedClassLoader.java diff --git a/jdk/test/jdk/lambda/separate/SourceModel.java b/test/jdk/jdk/lambda/separate/SourceModel.java similarity index 100% rename from jdk/test/jdk/lambda/separate/SourceModel.java rename to test/jdk/jdk/lambda/separate/SourceModel.java diff --git a/jdk/test/jdk/lambda/separate/TestHarness.java b/test/jdk/jdk/lambda/separate/TestHarness.java similarity index 100% rename from jdk/test/jdk/lambda/separate/TestHarness.java rename to test/jdk/jdk/lambda/separate/TestHarness.java diff --git a/jdk/test/jdk/lambda/vm/DefaultMethodRegressionTests.java b/test/jdk/jdk/lambda/vm/DefaultMethodRegressionTests.java similarity index 100% rename from jdk/test/jdk/lambda/vm/DefaultMethodRegressionTests.java rename to test/jdk/jdk/lambda/vm/DefaultMethodRegressionTests.java diff --git a/jdk/test/jdk/lambda/vm/InterfaceAccessFlagsTest.java b/test/jdk/jdk/lambda/vm/InterfaceAccessFlagsTest.java similarity index 100% rename from jdk/test/jdk/lambda/vm/InterfaceAccessFlagsTest.java rename to test/jdk/jdk/lambda/vm/InterfaceAccessFlagsTest.java diff --git a/jdk/test/jdk/lambda/vm/StrictfpDefault.java b/test/jdk/jdk/lambda/vm/StrictfpDefault.java similarity index 100% rename from jdk/test/jdk/lambda/vm/StrictfpDefault.java rename to test/jdk/jdk/lambda/vm/StrictfpDefault.java diff --git a/jdk/test/jdk/modules/etc/JdkQualifiedExportTest.java b/test/jdk/jdk/modules/etc/JdkQualifiedExportTest.java similarity index 100% rename from jdk/test/jdk/modules/etc/JdkQualifiedExportTest.java rename to test/jdk/jdk/modules/etc/JdkQualifiedExportTest.java diff --git a/jdk/test/jdk/modules/etc/UpgradeableModules.java b/test/jdk/jdk/modules/etc/UpgradeableModules.java similarity index 100% rename from jdk/test/jdk/modules/etc/UpgradeableModules.java rename to test/jdk/jdk/modules/etc/UpgradeableModules.java diff --git a/jdk/test/jdk/modules/etc/VerifyModuleDelegation.java b/test/jdk/jdk/modules/etc/VerifyModuleDelegation.java similarity index 100% rename from jdk/test/jdk/modules/etc/VerifyModuleDelegation.java rename to test/jdk/jdk/modules/etc/VerifyModuleDelegation.java diff --git a/jdk/test/jdk/modules/incubator/DefaultImage.java b/test/jdk/jdk/modules/incubator/DefaultImage.java similarity index 100% rename from jdk/test/jdk/modules/incubator/DefaultImage.java rename to test/jdk/jdk/modules/incubator/DefaultImage.java diff --git a/jdk/test/jdk/modules/incubator/ImageModules.java b/test/jdk/jdk/modules/incubator/ImageModules.java similarity index 100% rename from jdk/test/jdk/modules/incubator/ImageModules.java rename to test/jdk/jdk/modules/incubator/ImageModules.java diff --git a/jdk/test/jdk/modules/incubator/src/cp/listmods/ListModules.java b/test/jdk/jdk/modules/incubator/src/cp/listmods/ListModules.java similarity index 100% rename from jdk/test/jdk/modules/incubator/src/cp/listmods/ListModules.java rename to test/jdk/jdk/modules/incubator/src/cp/listmods/ListModules.java diff --git a/jdk/test/jdk/modules/incubator/src/cp/test/ConvertToLowerCase.java b/test/jdk/jdk/modules/incubator/src/cp/test/ConvertToLowerCase.java similarity index 100% rename from jdk/test/jdk/modules/incubator/src/cp/test/ConvertToLowerCase.java rename to test/jdk/jdk/modules/incubator/src/cp/test/ConvertToLowerCase.java diff --git a/jdk/test/jdk/modules/incubator/src/cp/test/WriteUpperCase.java b/test/jdk/jdk/modules/incubator/src/cp/test/WriteUpperCase.java similarity index 100% rename from jdk/test/jdk/modules/incubator/src/cp/test/WriteUpperCase.java rename to test/jdk/jdk/modules/incubator/src/cp/test/WriteUpperCase.java diff --git a/jdk/test/jdk/modules/incubator/src/message.converter/converter/MessageConverter.java b/test/jdk/jdk/modules/incubator/src/message.converter/converter/MessageConverter.java similarity index 100% rename from jdk/test/jdk/modules/incubator/src/message.converter/converter/MessageConverter.java rename to test/jdk/jdk/modules/incubator/src/message.converter/converter/MessageConverter.java diff --git a/jdk/test/jdk/modules/incubator/src/message.converter/module-info.java b/test/jdk/jdk/modules/incubator/src/message.converter/module-info.java similarity index 100% rename from jdk/test/jdk/modules/incubator/src/message.converter/module-info.java rename to test/jdk/jdk/modules/incubator/src/message.converter/module-info.java diff --git a/jdk/test/jdk/modules/incubator/src/message.writer/module-info.java b/test/jdk/jdk/modules/incubator/src/message.writer/module-info.java similarity index 100% rename from jdk/test/jdk/modules/incubator/src/message.writer/module-info.java rename to test/jdk/jdk/modules/incubator/src/message.writer/module-info.java diff --git a/jdk/test/jdk/modules/incubator/src/message.writer/writer/MessageWriter.java b/test/jdk/jdk/modules/incubator/src/message.writer/writer/MessageWriter.java similarity index 100% rename from jdk/test/jdk/modules/incubator/src/message.writer/writer/MessageWriter.java rename to test/jdk/jdk/modules/incubator/src/message.writer/writer/MessageWriter.java diff --git a/jdk/test/jdk/modules/open/Basic.java b/test/jdk/jdk/modules/open/Basic.java similarity index 100% rename from jdk/test/jdk/modules/open/Basic.java rename to test/jdk/jdk/modules/open/Basic.java diff --git a/jdk/test/jdk/modules/open/modules/m1/module-info.java b/test/jdk/jdk/modules/open/modules/m1/module-info.java similarity index 100% rename from jdk/test/jdk/modules/open/modules/m1/module-info.java rename to test/jdk/jdk/modules/open/modules/m1/module-info.java diff --git a/jdk/test/jdk/modules/open/modules/m1/p/NotPublicType.java b/test/jdk/jdk/modules/open/modules/m1/p/NotPublicType.java similarity index 100% rename from jdk/test/jdk/modules/open/modules/m1/p/NotPublicType.java rename to test/jdk/jdk/modules/open/modules/m1/p/NotPublicType.java diff --git a/jdk/test/jdk/modules/open/modules/m1/p/PublicType.java b/test/jdk/jdk/modules/open/modules/m1/p/PublicType.java similarity index 100% rename from jdk/test/jdk/modules/open/modules/m1/p/PublicType.java rename to test/jdk/jdk/modules/open/modules/m1/p/PublicType.java diff --git a/jdk/test/jdk/modules/open/modules/m1/p/internal/NotPublicType.java b/test/jdk/jdk/modules/open/modules/m1/p/internal/NotPublicType.java similarity index 100% rename from jdk/test/jdk/modules/open/modules/m1/p/internal/NotPublicType.java rename to test/jdk/jdk/modules/open/modules/m1/p/internal/NotPublicType.java diff --git a/jdk/test/jdk/modules/open/modules/m1/p/internal/PublicType.java b/test/jdk/jdk/modules/open/modules/m1/p/internal/PublicType.java similarity index 100% rename from jdk/test/jdk/modules/open/modules/m1/p/internal/PublicType.java rename to test/jdk/jdk/modules/open/modules/m1/p/internal/PublicType.java diff --git a/jdk/test/jdk/modules/open/modules/m2/module-info.java b/test/jdk/jdk/modules/open/modules/m2/module-info.java similarity index 100% rename from jdk/test/jdk/modules/open/modules/m2/module-info.java rename to test/jdk/jdk/modules/open/modules/m2/module-info.java diff --git a/jdk/test/jdk/modules/open/modules/m2/q/NotPublicType.java b/test/jdk/jdk/modules/open/modules/m2/q/NotPublicType.java similarity index 100% rename from jdk/test/jdk/modules/open/modules/m2/q/NotPublicType.java rename to test/jdk/jdk/modules/open/modules/m2/q/NotPublicType.java diff --git a/jdk/test/jdk/modules/open/modules/m2/q/PublicType.java b/test/jdk/jdk/modules/open/modules/m2/q/PublicType.java similarity index 100% rename from jdk/test/jdk/modules/open/modules/m2/q/PublicType.java rename to test/jdk/jdk/modules/open/modules/m2/q/PublicType.java diff --git a/jdk/test/jdk/modules/open/modules/m2/q/internal/NotPublicType.java b/test/jdk/jdk/modules/open/modules/m2/q/internal/NotPublicType.java similarity index 100% rename from jdk/test/jdk/modules/open/modules/m2/q/internal/NotPublicType.java rename to test/jdk/jdk/modules/open/modules/m2/q/internal/NotPublicType.java diff --git a/jdk/test/jdk/modules/open/modules/m2/q/internal/PublicType.java b/test/jdk/jdk/modules/open/modules/m2/q/internal/PublicType.java similarity index 100% rename from jdk/test/jdk/modules/open/modules/m2/q/internal/PublicType.java rename to test/jdk/jdk/modules/open/modules/m2/q/internal/PublicType.java diff --git a/jdk/test/jdk/modules/scenarios/automaticmodules/RunWithAutomaticModules.java b/test/jdk/jdk/modules/scenarios/automaticmodules/RunWithAutomaticModules.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/automaticmodules/RunWithAutomaticModules.java rename to test/jdk/jdk/modules/scenarios/automaticmodules/RunWithAutomaticModules.java diff --git a/jdk/test/jdk/modules/scenarios/automaticmodules/src/bananascript/META-INF/services/javax.script.ScriptEngineFactory b/test/jdk/jdk/modules/scenarios/automaticmodules/src/bananascript/META-INF/services/javax.script.ScriptEngineFactory similarity index 100% rename from jdk/test/jdk/modules/scenarios/automaticmodules/src/bananascript/META-INF/services/javax.script.ScriptEngineFactory rename to test/jdk/jdk/modules/scenarios/automaticmodules/src/bananascript/META-INF/services/javax.script.ScriptEngineFactory diff --git a/jdk/test/jdk/modules/scenarios/automaticmodules/src/bananascript/org/banana/BananaScript.java b/test/jdk/jdk/modules/scenarios/automaticmodules/src/bananascript/org/banana/BananaScript.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/automaticmodules/src/bananascript/org/banana/BananaScript.java rename to test/jdk/jdk/modules/scenarios/automaticmodules/src/bananascript/org/banana/BananaScript.java diff --git a/jdk/test/jdk/modules/scenarios/automaticmodules/src/bananascript/org/banana/BananaScriptEngineFactory.java b/test/jdk/jdk/modules/scenarios/automaticmodules/src/bananascript/org/banana/BananaScriptEngineFactory.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/automaticmodules/src/bananascript/org/banana/BananaScriptEngineFactory.java rename to test/jdk/jdk/modules/scenarios/automaticmodules/src/bananascript/org/banana/BananaScriptEngineFactory.java diff --git a/jdk/test/jdk/modules/scenarios/automaticmodules/src/basictest/module-info.java b/test/jdk/jdk/modules/scenarios/automaticmodules/src/basictest/module-info.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/automaticmodules/src/basictest/module-info.java rename to test/jdk/jdk/modules/scenarios/automaticmodules/src/basictest/module-info.java diff --git a/jdk/test/jdk/modules/scenarios/automaticmodules/src/basictest/test/Main.java b/test/jdk/jdk/modules/scenarios/automaticmodules/src/basictest/test/Main.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/automaticmodules/src/basictest/test/Main.java rename to test/jdk/jdk/modules/scenarios/automaticmodules/src/basictest/test/Main.java diff --git a/jdk/test/jdk/modules/scenarios/automaticmodules/src/httpserver/http/HttpServer.java b/test/jdk/jdk/modules/scenarios/automaticmodules/src/httpserver/http/HttpServer.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/automaticmodules/src/httpserver/http/HttpServer.java rename to test/jdk/jdk/modules/scenarios/automaticmodules/src/httpserver/http/HttpServer.java diff --git a/jdk/test/jdk/modules/scenarios/automaticmodules/src/httpserver/http/spi/HttpServerProvider.java b/test/jdk/jdk/modules/scenarios/automaticmodules/src/httpserver/http/spi/HttpServerProvider.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/automaticmodules/src/httpserver/http/spi/HttpServerProvider.java rename to test/jdk/jdk/modules/scenarios/automaticmodules/src/httpserver/http/spi/HttpServerProvider.java diff --git a/jdk/test/jdk/modules/scenarios/automaticmodules/src/logging/logging/Logger.java b/test/jdk/jdk/modules/scenarios/automaticmodules/src/logging/logging/Logger.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/automaticmodules/src/logging/logging/Logger.java rename to test/jdk/jdk/modules/scenarios/automaticmodules/src/logging/logging/Logger.java diff --git a/jdk/test/jdk/modules/scenarios/automaticmodules/src/sptest/module-info.java b/test/jdk/jdk/modules/scenarios/automaticmodules/src/sptest/module-info.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/automaticmodules/src/sptest/module-info.java rename to test/jdk/jdk/modules/scenarios/automaticmodules/src/sptest/module-info.java diff --git a/jdk/test/jdk/modules/scenarios/automaticmodules/src/sptest/test/Main.java b/test/jdk/jdk/modules/scenarios/automaticmodules/src/sptest/test/Main.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/automaticmodules/src/sptest/test/Main.java rename to test/jdk/jdk/modules/scenarios/automaticmodules/src/sptest/test/Main.java diff --git a/jdk/test/jdk/modules/scenarios/container/ContainerTest.java b/test/jdk/jdk/modules/scenarios/container/ContainerTest.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/container/ContainerTest.java rename to test/jdk/jdk/modules/scenarios/container/ContainerTest.java diff --git a/jdk/test/jdk/modules/scenarios/container/src/app1/app1/Main.java b/test/jdk/jdk/modules/scenarios/container/src/app1/app1/Main.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/container/src/app1/app1/Main.java rename to test/jdk/jdk/modules/scenarios/container/src/app1/app1/Main.java diff --git a/jdk/test/jdk/modules/scenarios/container/src/app1/module-info.java b/test/jdk/jdk/modules/scenarios/container/src/app1/module-info.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/container/src/app1/module-info.java rename to test/jdk/jdk/modules/scenarios/container/src/app1/module-info.java diff --git a/jdk/test/jdk/modules/scenarios/container/src/app2/app2/Main.java b/test/jdk/jdk/modules/scenarios/container/src/app2/app2/Main.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/container/src/app2/app2/Main.java rename to test/jdk/jdk/modules/scenarios/container/src/app2/app2/Main.java diff --git a/jdk/test/jdk/modules/scenarios/container/src/app2/module-info.java b/test/jdk/jdk/modules/scenarios/container/src/app2/module-info.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/container/src/app2/module-info.java rename to test/jdk/jdk/modules/scenarios/container/src/app2/module-info.java diff --git a/jdk/test/jdk/modules/scenarios/container/src/container/container/Main.java b/test/jdk/jdk/modules/scenarios/container/src/container/container/Main.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/container/src/container/container/Main.java rename to test/jdk/jdk/modules/scenarios/container/src/container/container/Main.java diff --git a/jdk/test/jdk/modules/scenarios/container/src/container/module-info.java b/test/jdk/jdk/modules/scenarios/container/src/container/module-info.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/container/src/container/module-info.java rename to test/jdk/jdk/modules/scenarios/container/src/container/module-info.java diff --git a/jdk/test/jdk/modules/scenarios/container/src/java.ws.rs/javax/ws/rs/Client.java b/test/jdk/jdk/modules/scenarios/container/src/java.ws.rs/javax/ws/rs/Client.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/container/src/java.ws.rs/javax/ws/rs/Client.java rename to test/jdk/jdk/modules/scenarios/container/src/java.ws.rs/javax/ws/rs/Client.java diff --git a/jdk/test/jdk/modules/scenarios/container/src/java.ws.rs/module-info.java b/test/jdk/jdk/modules/scenarios/container/src/java.ws.rs/module-info.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/container/src/java.ws.rs/module-info.java rename to test/jdk/jdk/modules/scenarios/container/src/java.ws.rs/module-info.java diff --git a/jdk/test/jdk/modules/scenarios/container/src/java.xml.ws/javax/xml/ws/WebService.java b/test/jdk/jdk/modules/scenarios/container/src/java.xml.ws/javax/xml/ws/WebService.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/container/src/java.xml.ws/javax/xml/ws/WebService.java rename to test/jdk/jdk/modules/scenarios/container/src/java.xml.ws/javax/xml/ws/WebService.java diff --git a/jdk/test/jdk/modules/scenarios/container/src/java.xml.ws/module-info.java b/test/jdk/jdk/modules/scenarios/container/src/java.xml.ws/module-info.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/container/src/java.xml.ws/module-info.java rename to test/jdk/jdk/modules/scenarios/container/src/java.xml.ws/module-info.java diff --git a/jdk/test/jdk/modules/scenarios/overlappingpackages/OverlappingPackagesTest.java b/test/jdk/jdk/modules/scenarios/overlappingpackages/OverlappingPackagesTest.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/overlappingpackages/OverlappingPackagesTest.java rename to test/jdk/jdk/modules/scenarios/overlappingpackages/OverlappingPackagesTest.java diff --git a/jdk/test/jdk/modules/scenarios/overlappingpackages/src/m1/module-info.java b/test/jdk/jdk/modules/scenarios/overlappingpackages/src/m1/module-info.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/overlappingpackages/src/m1/module-info.java rename to test/jdk/jdk/modules/scenarios/overlappingpackages/src/m1/module-info.java diff --git a/jdk/test/jdk/modules/scenarios/overlappingpackages/src/m1/p/C1.java b/test/jdk/jdk/modules/scenarios/overlappingpackages/src/m1/p/C1.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/overlappingpackages/src/m1/p/C1.java rename to test/jdk/jdk/modules/scenarios/overlappingpackages/src/m1/p/C1.java diff --git a/jdk/test/jdk/modules/scenarios/overlappingpackages/src/m2/module-info.java b/test/jdk/jdk/modules/scenarios/overlappingpackages/src/m2/module-info.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/overlappingpackages/src/m2/module-info.java rename to test/jdk/jdk/modules/scenarios/overlappingpackages/src/m2/module-info.java diff --git a/jdk/test/jdk/modules/scenarios/overlappingpackages/src/m2/p/C2.java b/test/jdk/jdk/modules/scenarios/overlappingpackages/src/m2/p/C2.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/overlappingpackages/src/m2/p/C2.java rename to test/jdk/jdk/modules/scenarios/overlappingpackages/src/m2/p/C2.java diff --git a/jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/jdk/internal/misc/Unsafe.java b/test/jdk/jdk/modules/scenarios/overlappingpackages/src/misc/jdk/internal/misc/Unsafe.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/jdk/internal/misc/Unsafe.java rename to test/jdk/jdk/modules/scenarios/overlappingpackages/src/misc/jdk/internal/misc/Unsafe.java diff --git a/jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/module-info.java b/test/jdk/jdk/modules/scenarios/overlappingpackages/src/misc/module-info.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/module-info.java rename to test/jdk/jdk/modules/scenarios/overlappingpackages/src/misc/module-info.java diff --git a/jdk/test/jdk/modules/scenarios/overlappingpackages/src/test/module-info.java b/test/jdk/jdk/modules/scenarios/overlappingpackages/src/test/module-info.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/overlappingpackages/src/test/module-info.java rename to test/jdk/jdk/modules/scenarios/overlappingpackages/src/test/module-info.java diff --git a/jdk/test/jdk/modules/scenarios/overlappingpackages/src/test/test/Main.java b/test/jdk/jdk/modules/scenarios/overlappingpackages/src/test/test/Main.java similarity index 100% rename from jdk/test/jdk/modules/scenarios/overlappingpackages/src/test/test/Main.java rename to test/jdk/jdk/modules/scenarios/overlappingpackages/src/test/test/Main.java diff --git a/jdk/test/jdk/net/SocketFlow/SocketFlowBasic.java b/test/jdk/jdk/net/SocketFlow/SocketFlowBasic.java similarity index 100% rename from jdk/test/jdk/net/SocketFlow/SocketFlowBasic.java rename to test/jdk/jdk/net/SocketFlow/SocketFlowBasic.java diff --git a/jdk/test/jdk/net/Sockets/SupportedOptions.java b/test/jdk/jdk/net/Sockets/SupportedOptions.java similarity index 100% rename from jdk/test/jdk/net/Sockets/SupportedOptions.java rename to test/jdk/jdk/net/Sockets/SupportedOptions.java diff --git a/jdk/test/jdk/net/Sockets/Test.java b/test/jdk/jdk/net/Sockets/Test.java similarity index 100% rename from jdk/test/jdk/net/Sockets/Test.java rename to test/jdk/jdk/net/Sockets/Test.java diff --git a/jdk/test/jdk/net/Sockets/policy.fail b/test/jdk/jdk/net/Sockets/policy.fail similarity index 100% rename from jdk/test/jdk/net/Sockets/policy.fail rename to test/jdk/jdk/net/Sockets/policy.fail diff --git a/jdk/test/jdk/net/Sockets/policy.success b/test/jdk/jdk/net/Sockets/policy.success similarity index 100% rename from jdk/test/jdk/net/Sockets/policy.success rename to test/jdk/jdk/net/Sockets/policy.success diff --git a/jdk/test/jdk/nio/zipfs/Basic.java b/test/jdk/jdk/nio/zipfs/Basic.java similarity index 100% rename from jdk/test/jdk/nio/zipfs/Basic.java rename to test/jdk/jdk/nio/zipfs/Basic.java diff --git a/jdk/test/jdk/nio/zipfs/Demo.java b/test/jdk/jdk/nio/zipfs/Demo.java similarity index 100% rename from jdk/test/jdk/nio/zipfs/Demo.java rename to test/jdk/jdk/nio/zipfs/Demo.java diff --git a/jdk/test/jdk/nio/zipfs/MultiReleaseJarTest.java b/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java similarity index 100% rename from jdk/test/jdk/nio/zipfs/MultiReleaseJarTest.java rename to test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java diff --git a/jdk/test/jdk/nio/zipfs/PathOps.java b/test/jdk/jdk/nio/zipfs/PathOps.java similarity index 100% rename from jdk/test/jdk/nio/zipfs/PathOps.java rename to test/jdk/jdk/nio/zipfs/PathOps.java diff --git a/jdk/test/jdk/nio/zipfs/Utils.java b/test/jdk/jdk/nio/zipfs/Utils.java similarity index 100% rename from jdk/test/jdk/nio/zipfs/Utils.java rename to test/jdk/jdk/nio/zipfs/Utils.java diff --git a/jdk/test/jdk/nio/zipfs/ZFSTests.java b/test/jdk/jdk/nio/zipfs/ZFSTests.java similarity index 100% rename from jdk/test/jdk/nio/zipfs/ZFSTests.java rename to test/jdk/jdk/nio/zipfs/ZFSTests.java diff --git a/jdk/test/jdk/nio/zipfs/ZeroDate.java b/test/jdk/jdk/nio/zipfs/ZeroDate.java similarity index 100% rename from jdk/test/jdk/nio/zipfs/ZeroDate.java rename to test/jdk/jdk/nio/zipfs/ZeroDate.java diff --git a/jdk/test/jdk/nio/zipfs/ZipFSTester.java b/test/jdk/jdk/nio/zipfs/ZipFSTester.java similarity index 100% rename from jdk/test/jdk/nio/zipfs/ZipFSTester.java rename to test/jdk/jdk/nio/zipfs/ZipFSTester.java diff --git a/jdk/test/jdk/nio/zipfs/jarfs/JFSTester.java b/test/jdk/jdk/nio/zipfs/jarfs/JFSTester.java similarity index 100% rename from jdk/test/jdk/nio/zipfs/jarfs/JFSTester.java rename to test/jdk/jdk/nio/zipfs/jarfs/JFSTester.java diff --git a/jdk/test/jdk/nio/zipfs/jarfs/root/dir1/leaf1.txt b/test/jdk/jdk/nio/zipfs/jarfs/root/dir1/leaf1.txt similarity index 100% rename from jdk/test/jdk/nio/zipfs/jarfs/root/dir1/leaf1.txt rename to test/jdk/jdk/nio/zipfs/jarfs/root/dir1/leaf1.txt diff --git a/jdk/test/jdk/nio/zipfs/jarfs/root/dir1/leaf2.txt b/test/jdk/jdk/nio/zipfs/jarfs/root/dir1/leaf2.txt similarity index 100% rename from jdk/test/jdk/nio/zipfs/jarfs/root/dir1/leaf2.txt rename to test/jdk/jdk/nio/zipfs/jarfs/root/dir1/leaf2.txt diff --git a/jdk/test/jdk/nio/zipfs/jarfs/root/dir2/leaf3.txt b/test/jdk/jdk/nio/zipfs/jarfs/root/dir2/leaf3.txt similarity index 100% rename from jdk/test/jdk/nio/zipfs/jarfs/root/dir2/leaf3.txt rename to test/jdk/jdk/nio/zipfs/jarfs/root/dir2/leaf3.txt diff --git a/jdk/test/jdk/nio/zipfs/jarfs/root/dir2/leaf4.txt b/test/jdk/jdk/nio/zipfs/jarfs/root/dir2/leaf4.txt similarity index 100% rename from jdk/test/jdk/nio/zipfs/jarfs/root/dir2/leaf4.txt rename to test/jdk/jdk/nio/zipfs/jarfs/root/dir2/leaf4.txt diff --git a/jdk/test/jdk/nio/zipfs/jarfs/v9/root/dir1/leaf1.txt b/test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir1/leaf1.txt similarity index 100% rename from jdk/test/jdk/nio/zipfs/jarfs/v9/root/dir1/leaf1.txt rename to test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir1/leaf1.txt diff --git a/jdk/test/jdk/nio/zipfs/jarfs/v9/root/dir1/leaf2.txt b/test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir1/leaf2.txt similarity index 100% rename from jdk/test/jdk/nio/zipfs/jarfs/v9/root/dir1/leaf2.txt rename to test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir1/leaf2.txt diff --git a/jdk/test/jdk/nio/zipfs/jarfs/v9/root/dir2/leaf3.txt b/test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir2/leaf3.txt similarity index 100% rename from jdk/test/jdk/nio/zipfs/jarfs/v9/root/dir2/leaf3.txt rename to test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir2/leaf3.txt diff --git a/jdk/test/jdk/nio/zipfs/jarfs/v9/root/dir2/leaf4.txt b/test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir2/leaf4.txt similarity index 100% rename from jdk/test/jdk/nio/zipfs/jarfs/v9/root/dir2/leaf4.txt rename to test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir2/leaf4.txt diff --git a/jdk/test/jdk/nio/zipfs/test.policy b/test/jdk/jdk/nio/zipfs/test.policy similarity index 100% rename from jdk/test/jdk/nio/zipfs/test.policy rename to test/jdk/jdk/nio/zipfs/test.policy diff --git a/jdk/test/jdk/nio/zipfs/test.policy.readonly b/test/jdk/jdk/nio/zipfs/test.policy.readonly similarity index 100% rename from jdk/test/jdk/nio/zipfs/test.policy.readonly rename to test/jdk/jdk/nio/zipfs/test.policy.readonly diff --git a/jdk/test/jdk/security/JavaDotSecurity/final_java_security b/test/jdk/jdk/security/JavaDotSecurity/final_java_security similarity index 100% rename from jdk/test/jdk/security/JavaDotSecurity/final_java_security rename to test/jdk/jdk/security/JavaDotSecurity/final_java_security diff --git a/jdk/test/jdk/security/JavaDotSecurity/ifdefs.sh b/test/jdk/jdk/security/JavaDotSecurity/ifdefs.sh similarity index 100% rename from jdk/test/jdk/security/JavaDotSecurity/ifdefs.sh rename to test/jdk/jdk/security/JavaDotSecurity/ifdefs.sh diff --git a/jdk/test/jdk/security/JavaDotSecurity/more_restricted b/test/jdk/jdk/security/JavaDotSecurity/more_restricted similarity index 100% rename from jdk/test/jdk/security/JavaDotSecurity/more_restricted rename to test/jdk/jdk/security/JavaDotSecurity/more_restricted diff --git a/jdk/test/jdk/security/JavaDotSecurity/raw_java_security b/test/jdk/jdk/security/JavaDotSecurity/raw_java_security similarity index 100% rename from jdk/test/jdk/security/JavaDotSecurity/raw_java_security rename to test/jdk/jdk/security/JavaDotSecurity/raw_java_security diff --git a/jdk/test/jdk/security/jarsigner/Function.java b/test/jdk/jdk/security/jarsigner/Function.java similarity index 100% rename from jdk/test/jdk/security/jarsigner/Function.java rename to test/jdk/jdk/security/jarsigner/Function.java diff --git a/jdk/test/jdk/security/jarsigner/Spec.java b/test/jdk/jdk/security/jarsigner/Spec.java similarity index 100% rename from jdk/test/jdk/security/jarsigner/Spec.java rename to test/jdk/jdk/security/jarsigner/Spec.java diff --git a/jdk/test/jprt.config b/test/jdk/jprt.config similarity index 100% rename from jdk/test/jprt.config rename to test/jdk/jprt.config diff --git a/jdk/test/lib/security/CheckBlacklistedCerts.java b/test/jdk/lib/security/CheckBlacklistedCerts.java similarity index 100% rename from jdk/test/lib/security/CheckBlacklistedCerts.java rename to test/jdk/lib/security/CheckBlacklistedCerts.java diff --git a/jdk/test/lib/testlibrary/AssertsTest.java b/test/jdk/lib/testlibrary/AssertsTest.java similarity index 100% rename from jdk/test/lib/testlibrary/AssertsTest.java rename to test/jdk/lib/testlibrary/AssertsTest.java diff --git a/jdk/test/lib/testlibrary/ExtendedRobot.java b/test/jdk/lib/testlibrary/ExtendedRobot.java similarity index 100% rename from jdk/test/lib/testlibrary/ExtendedRobot.java rename to test/jdk/lib/testlibrary/ExtendedRobot.java diff --git a/jdk/test/lib/testlibrary/JarUtils.java b/test/jdk/lib/testlibrary/JarUtils.java similarity index 100% rename from jdk/test/lib/testlibrary/JarUtils.java rename to test/jdk/lib/testlibrary/JarUtils.java diff --git a/jdk/test/lib/testlibrary/ModuleTargetHelper.java b/test/jdk/lib/testlibrary/ModuleTargetHelper.java similarity index 100% rename from jdk/test/lib/testlibrary/ModuleTargetHelper.java rename to test/jdk/lib/testlibrary/ModuleTargetHelper.java diff --git a/jdk/test/lib/testlibrary/ModuleUtils.java b/test/jdk/lib/testlibrary/ModuleUtils.java similarity index 100% rename from jdk/test/lib/testlibrary/ModuleUtils.java rename to test/jdk/lib/testlibrary/ModuleUtils.java diff --git a/jdk/test/lib/testlibrary/OutputAnalyzerReportingTest.java b/test/jdk/lib/testlibrary/OutputAnalyzerReportingTest.java similarity index 100% rename from jdk/test/lib/testlibrary/OutputAnalyzerReportingTest.java rename to test/jdk/lib/testlibrary/OutputAnalyzerReportingTest.java diff --git a/jdk/test/lib/testlibrary/OutputAnalyzerTest.java b/test/jdk/lib/testlibrary/OutputAnalyzerTest.java similarity index 100% rename from jdk/test/lib/testlibrary/OutputAnalyzerTest.java rename to test/jdk/lib/testlibrary/OutputAnalyzerTest.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/SpliteratorOfIntDataBuilder.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/SpliteratorOfIntDataBuilder.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/SpliteratorOfIntDataBuilder.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/SpliteratorOfIntDataBuilder.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/SpliteratorTestHelper.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/SpliteratorTestHelper.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/SpliteratorTestHelper.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/SpliteratorTestHelper.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/CollectorOps.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/CollectorOps.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/CollectorOps.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/CollectorOps.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/DefaultMethodStreams.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/DefaultMethodStreams.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/DefaultMethodStreams.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/DefaultMethodStreams.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/DoubleStreamTestDataProvider.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/DoubleStreamTestDataProvider.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/DoubleStreamTestDataProvider.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/DoubleStreamTestDataProvider.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/DoubleStreamTestScenario.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/DoubleStreamTestScenario.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/DoubleStreamTestScenario.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/DoubleStreamTestScenario.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/FlagDeclaringOp.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/FlagDeclaringOp.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/FlagDeclaringOp.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/FlagDeclaringOp.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/IntStreamTestDataProvider.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/IntStreamTestDataProvider.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/IntStreamTestDataProvider.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/IntStreamTestDataProvider.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/IntStreamTestScenario.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/IntStreamTestScenario.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/IntStreamTestScenario.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/IntStreamTestScenario.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/IntermediateTestOp.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/IntermediateTestOp.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/IntermediateTestOp.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/IntermediateTestOp.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/LambdaTestHelpers.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/LambdaTestHelpers.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/LambdaTestHelpers.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/LambdaTestHelpers.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/LambdaTestMode.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/LambdaTestMode.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/LambdaTestMode.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/LambdaTestMode.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/LoggingTestCase.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/LoggingTestCase.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/LoggingTestCase.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/LoggingTestCase.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/LongStreamTestDataProvider.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/LongStreamTestDataProvider.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/LongStreamTestDataProvider.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/LongStreamTestDataProvider.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/LongStreamTestScenario.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/LongStreamTestScenario.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/LongStreamTestScenario.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/LongStreamTestScenario.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/OpTestCase.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/OpTestCase.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/OpTestCase.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/OpTestCase.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/StatefulTestOp.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/StatefulTestOp.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/StatefulTestOp.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/StatefulTestOp.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/StatelessTestOp.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/StatelessTestOp.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/StatelessTestOp.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/StatelessTestOp.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/StreamOpFlagTestHelper.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/StreamOpFlagTestHelper.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/StreamOpFlagTestHelper.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/StreamOpFlagTestHelper.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/StreamTestDataProvider.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/StreamTestDataProvider.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/StreamTestDataProvider.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/StreamTestDataProvider.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/StreamTestScenario.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/StreamTestScenario.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/StreamTestScenario.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/StreamTestScenario.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/TestData.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/TestData.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/TestData.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/TestData.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/TestFlagExpectedOp.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/TestFlagExpectedOp.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/TestFlagExpectedOp.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/TestFlagExpectedOp.java diff --git a/jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/ThrowableHelper.java b/test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/ThrowableHelper.java similarity index 100% rename from jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/ThrowableHelper.java rename to test/jdk/lib/testlibrary/bootlib/java.base/java/util/stream/ThrowableHelper.java diff --git a/jdk/test/lib/testlibrary/java/util/jar/Compiler.java b/test/jdk/lib/testlibrary/java/util/jar/Compiler.java similarity index 100% rename from jdk/test/lib/testlibrary/java/util/jar/Compiler.java rename to test/jdk/lib/testlibrary/java/util/jar/Compiler.java diff --git a/jdk/test/lib/testlibrary/java/util/jar/CreateMultiReleaseTestJars.java b/test/jdk/lib/testlibrary/java/util/jar/CreateMultiReleaseTestJars.java similarity index 100% rename from jdk/test/lib/testlibrary/java/util/jar/CreateMultiReleaseTestJars.java rename to test/jdk/lib/testlibrary/java/util/jar/CreateMultiReleaseTestJars.java diff --git a/jdk/test/lib/testlibrary/java/util/jar/JarBuilder.java b/test/jdk/lib/testlibrary/java/util/jar/JarBuilder.java similarity index 100% rename from jdk/test/lib/testlibrary/java/util/jar/JarBuilder.java rename to test/jdk/lib/testlibrary/java/util/jar/JarBuilder.java diff --git a/jdk/test/lib/testlibrary/java/util/jar/SimpleHttpServer.java b/test/jdk/lib/testlibrary/java/util/jar/SimpleHttpServer.java similarity index 100% rename from jdk/test/lib/testlibrary/java/util/jar/SimpleHttpServer.java rename to test/jdk/lib/testlibrary/java/util/jar/SimpleHttpServer.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/Asserts.java b/test/jdk/lib/testlibrary/jdk/testlibrary/Asserts.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/Asserts.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/Asserts.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java b/test/jdk/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java b/test/jdk/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/JcmdBase.java b/test/jdk/lib/testlibrary/jdk/testlibrary/JcmdBase.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/JcmdBase.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/JcmdBase.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/OSInfo.java b/test/jdk/lib/testlibrary/jdk/testlibrary/OSInfo.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/OSInfo.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/OSInfo.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/OptimalCapacity.java b/test/jdk/lib/testlibrary/jdk/testlibrary/OptimalCapacity.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/OptimalCapacity.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/OptimalCapacity.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java b/test/jdk/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/OutputBuffer.java b/test/jdk/lib/testlibrary/jdk/testlibrary/OutputBuffer.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/OutputBuffer.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/OutputBuffer.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessThread.java b/test/jdk/lib/testlibrary/jdk/testlibrary/ProcessThread.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/ProcessThread.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/ProcessThread.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java b/test/jdk/lib/testlibrary/jdk/testlibrary/ProcessTools.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/ProcessTools.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/RandomFactory.java b/test/jdk/lib/testlibrary/jdk/testlibrary/RandomFactory.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/RandomFactory.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/RandomFactory.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.java b/test/jdk/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java b/test/jdk/lib/testlibrary/jdk/testlibrary/StreamPumper.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/StreamPumper.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/TestThread.java b/test/jdk/lib/testlibrary/jdk/testlibrary/TestThread.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/TestThread.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/TestThread.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java b/test/jdk/lib/testlibrary/jdk/testlibrary/Utils.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/Utils.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/XRun.java b/test/jdk/lib/testlibrary/jdk/testlibrary/XRun.java similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/XRun.java rename to test/jdk/lib/testlibrary/jdk/testlibrary/XRun.java diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/testkeys b/test/jdk/lib/testlibrary/jdk/testlibrary/testkeys similarity index 100% rename from jdk/test/lib/testlibrary/jdk/testlibrary/testkeys rename to test/jdk/lib/testlibrary/jdk/testlibrary/testkeys diff --git a/jdk/test/native_sanity/simplenativelauncher/ProgramTest.java b/test/jdk/native_sanity/simplenativelauncher/ProgramTest.java similarity index 100% rename from jdk/test/native_sanity/simplenativelauncher/ProgramTest.java rename to test/jdk/native_sanity/simplenativelauncher/ProgramTest.java diff --git a/jdk/test/native_sanity/simplenativelauncher/exesanity_SimpleNativeLauncher.c b/test/jdk/native_sanity/simplenativelauncher/exesanity_SimpleNativeLauncher.c similarity index 100% rename from jdk/test/native_sanity/simplenativelauncher/exesanity_SimpleNativeLauncher.c rename to test/jdk/native_sanity/simplenativelauncher/exesanity_SimpleNativeLauncher.c diff --git a/jdk/test/native_sanity/simplenativelib/NativeLib.java b/test/jdk/native_sanity/simplenativelib/NativeLib.java similarity index 100% rename from jdk/test/native_sanity/simplenativelib/NativeLib.java rename to test/jdk/native_sanity/simplenativelib/NativeLib.java diff --git a/jdk/test/native_sanity/simplenativelib/libsanity_SimpleNativeLib.c b/test/jdk/native_sanity/simplenativelib/libsanity_SimpleNativeLib.c similarity index 100% rename from jdk/test/native_sanity/simplenativelib/libsanity_SimpleNativeLib.c rename to test/jdk/native_sanity/simplenativelib/libsanity_SimpleNativeLib.c diff --git a/jdk/test/native_sanity/simplenativelib2/NativeLib.java b/test/jdk/native_sanity/simplenativelib2/NativeLib.java similarity index 100% rename from jdk/test/native_sanity/simplenativelib2/NativeLib.java rename to test/jdk/native_sanity/simplenativelib2/NativeLib.java diff --git a/jdk/test/native_sanity/simplenativelib2/libsanity_SimpleNativeLib2.c b/test/jdk/native_sanity/simplenativelib2/libsanity_SimpleNativeLib2.c similarity index 100% rename from jdk/test/native_sanity/simplenativelib2/libsanity_SimpleNativeLib2.c rename to test/jdk/native_sanity/simplenativelib2/libsanity_SimpleNativeLib2.c diff --git a/jdk/test/org/omg/CORBA/OrbPropertiesTest.java b/test/jdk/org/omg/CORBA/OrbPropertiesTest.java similarity index 100% rename from jdk/test/org/omg/CORBA/OrbPropertiesTest.java rename to test/jdk/org/omg/CORBA/OrbPropertiesTest.java diff --git a/jdk/test/org/omg/CORBA/TestOrbImpl.java b/test/jdk/org/omg/CORBA/TestOrbImpl.java similarity index 100% rename from jdk/test/org/omg/CORBA/TestOrbImpl.java rename to test/jdk/org/omg/CORBA/TestOrbImpl.java diff --git a/jdk/test/org/omg/CORBA/TestSingletonOrbImpl.java b/test/jdk/org/omg/CORBA/TestSingletonOrbImpl.java similarity index 100% rename from jdk/test/org/omg/CORBA/TestSingletonOrbImpl.java rename to test/jdk/org/omg/CORBA/TestSingletonOrbImpl.java diff --git a/jdk/test/org/omg/CORBA/jtreg.test.policy b/test/jdk/org/omg/CORBA/jtreg.test.policy similarity index 100% rename from jdk/test/org/omg/CORBA/jtreg.test.policy rename to test/jdk/org/omg/CORBA/jtreg.test.policy diff --git a/jdk/test/req.flg b/test/jdk/req.flg similarity index 100% rename from jdk/test/req.flg rename to test/jdk/req.flg diff --git a/jdk/test/sanity/client/README b/test/jdk/sanity/client/README similarity index 100% rename from jdk/test/sanity/client/README rename to test/jdk/sanity/client/README diff --git a/jdk/test/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java b/test/jdk/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java rename to test/jdk/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/ButtonDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ButtonDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/ButtonDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/ButtonDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/ComboBoxDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ComboBoxDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/ComboBoxDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/ComboBoxDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/DialogDemoTest.java b/test/jdk/sanity/client/SwingSet/src/DialogDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/DialogDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/DialogDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/ListDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ListDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/ListDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/ListDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/OptionPaneDemoTest.java b/test/jdk/sanity/client/SwingSet/src/OptionPaneDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/OptionPaneDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/OptionPaneDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/ProgressBarDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ProgressBarDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/ProgressBarDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/ProgressBarDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/ScrollPaneDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ScrollPaneDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/ScrollPaneDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/ScrollPaneDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/SliderDemoTest.java b/test/jdk/sanity/client/SwingSet/src/SliderDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/SliderDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/SliderDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/SpinnerDemoTest.java b/test/jdk/sanity/client/SwingSet/src/SpinnerDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/SpinnerDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/SpinnerDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/SplitPaneDemoTest.java b/test/jdk/sanity/client/SwingSet/src/SplitPaneDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/SplitPaneDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/SplitPaneDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/TabbedPaneDemoTest.java b/test/jdk/sanity/client/SwingSet/src/TabbedPaneDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/TabbedPaneDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/TabbedPaneDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/TestHelpers.java b/test/jdk/sanity/client/SwingSet/src/TestHelpers.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/TestHelpers.java rename to test/jdk/sanity/client/SwingSet/src/TestHelpers.java diff --git a/jdk/test/sanity/client/SwingSet/src/TextFieldDemoTest.java b/test/jdk/sanity/client/SwingSet/src/TextFieldDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/TextFieldDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/TextFieldDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/ToggleButtonDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ToggleButtonDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/ToggleButtonDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/ToggleButtonDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/TreeDemoTest.java b/test/jdk/sanity/client/SwingSet/src/TreeDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/TreeDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/TreeDemoTest.java diff --git a/jdk/test/sanity/client/SwingSet/src/WindowDemoTest.java b/test/jdk/sanity/client/SwingSet/src/WindowDemoTest.java similarity index 100% rename from jdk/test/sanity/client/SwingSet/src/WindowDemoTest.java rename to test/jdk/sanity/client/SwingSet/src/WindowDemoTest.java diff --git a/jdk/test/sanity/client/TEST.ROOT.template b/test/jdk/sanity/client/TEST.ROOT.template similarity index 100% rename from jdk/test/sanity/client/TEST.ROOT.template rename to test/jdk/sanity/client/TEST.ROOT.template diff --git a/jdk/test/sanity/client/TEST.properties b/test/jdk/sanity/client/TEST.properties similarity index 100% rename from jdk/test/sanity/client/TEST.properties rename to test/jdk/sanity/client/TEST.properties diff --git a/jdk/test/sanity/client/lib/Extensions/src/org/jemmy2ext/JemmyExt.java b/test/jdk/sanity/client/lib/Extensions/src/org/jemmy2ext/JemmyExt.java similarity index 100% rename from jdk/test/sanity/client/lib/Extensions/src/org/jemmy2ext/JemmyExt.java rename to test/jdk/sanity/client/lib/Extensions/src/org/jemmy2ext/JemmyExt.java diff --git a/jdk/test/sanity/client/lib/Extensions/src/org/jtregext/GuiTestListener.java b/test/jdk/sanity/client/lib/Extensions/src/org/jtregext/GuiTestListener.java similarity index 100% rename from jdk/test/sanity/client/lib/Extensions/src/org/jtregext/GuiTestListener.java rename to test/jdk/sanity/client/lib/Extensions/src/org/jtregext/GuiTestListener.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/README b/test/jdk/sanity/client/lib/SwingSet3/README similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/README rename to test/jdk/sanity/client/lib/SwingSet3/README diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/DemoProperties.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/DemoProperties.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/DemoProperties.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/DemoProperties.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/DemoUtilities.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/DemoUtilities.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/DemoUtilities.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/DemoUtilities.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JGridPanel.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JGridPanel.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JGridPanel.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JGridPanel.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JHyperlink.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JHyperlink.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JHyperlink.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JHyperlink.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/ResourceManager.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/ResourceManager.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/ResourceManager.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/ResourceManager.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/ButtonDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/ButtonDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/ButtonDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/ButtonDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/ButtonDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/ButtonDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/ButtonDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/ButtonDemo.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/blogs.png b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/blogs.png similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/blogs.png rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/blogs.png diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/document-print.png b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/document-print.png similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/document-print.png rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/document-print.png diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_day.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_day.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_day.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_day.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_night.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_night.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_night.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_night.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/edit-find.png b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/edit-find.png similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/edit-find.png rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/edit-find.png diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton.png b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton.png similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton.png rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton.png diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_dark.png b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_dark.png similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_dark.png rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_dark.png diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_glow.png b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_glow.png similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_glow.png rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_glow.png diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/ComboBoxDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/ComboBoxDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/ComboBoxDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/ComboBoxDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/ComboBoxDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/ComboBoxDemo.properties similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/ComboBoxDemo.properties rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/ComboBoxDemo.properties diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/ComboBoxDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/ComboBoxDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/ComboBoxDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/ComboBoxDemo.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenteyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenteyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenteyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenteyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenthair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenthair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenthair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenthair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brentmouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brentmouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brentmouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brentmouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeseyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeseyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeseyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeseyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeshair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeshair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeshair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeshair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgesmouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgesmouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgesmouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgesmouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanseyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanseyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanseyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanseyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanshair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanshair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanshair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanshair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hansmouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hansmouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hansmouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hansmouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardeyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardeyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardeyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardeyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardhair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardhair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardhair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardhair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardmouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardmouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardmouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardmouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameseyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameseyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameseyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameseyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameshair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameshair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameshair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameshair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jamesmouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jamesmouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jamesmouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jamesmouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffeyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffeyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffeyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffeyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffhair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffhair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffhair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffhair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffmouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffmouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffmouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffmouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/joneyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/joneyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/joneyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/joneyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonhair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonhair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonhair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonhair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonmouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonmouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonmouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonmouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laraeyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laraeyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laraeyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laraeyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larahair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larahair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larahair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larahair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laramouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laramouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laramouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laramouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryeyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryeyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryeyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryeyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryhair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryhair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryhair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryhair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larrymouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larrymouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larrymouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larrymouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisaeyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisaeyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisaeyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisaeyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisahair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisahair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisahair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisahair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisamouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisamouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisamouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisamouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaeleyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaeleyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaeleyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaeleyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelhair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelhair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelhair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelhair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelmouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelmouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelmouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelmouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipeyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipeyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipeyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipeyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philiphair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philiphair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philiphair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philiphair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipmouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipmouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipmouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipmouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotteyes.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotteyes.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotteyes.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotteyes.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotthair.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotthair.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotthair.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotthair.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scottmouth.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scottmouth.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scottmouth.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scottmouth.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/dialog/DialogDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/dialog/DialogDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/dialog/DialogDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/dialog/DialogDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/ListDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/ListDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/ListDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/ListDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/Permuter.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/Permuter.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/Permuter.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/Permuter.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/ListDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/ListDemo.properties similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/ListDemo.properties rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/ListDemo.properties diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/ListDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/ListDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/ListDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/ListDemo.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/blue.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/blue.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/blue.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/blue.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/cyan.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/cyan.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/cyan.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/cyan.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/gray.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/gray.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/gray.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/gray.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/green.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/green.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/green.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/green.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/magenta.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/magenta.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/magenta.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/magenta.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/red.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/red.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/red.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/red.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/yellow.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/yellow.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/yellow.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/yellow.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/OptionPaneDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/OptionPaneDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/OptionPaneDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/OptionPaneDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/OptionPaneDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/OptionPaneDemo.properties similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/OptionPaneDemo.properties rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/OptionPaneDemo.properties diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/OptionPaneDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/OptionPaneDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/OptionPaneDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/OptionPaneDemo.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/bottle.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/bottle.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/bottle.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/bottle.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/ProgressBarDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/ProgressBarDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/ProgressBarDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/ProgressBarDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/ProgressBarDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/ProgressBarDemo.properties similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/ProgressBarDemo.properties rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/ProgressBarDemo.properties diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/images/ProgressBarDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/images/ProgressBarDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/images/ProgressBarDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/images/ProgressBarDemo.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/ScrollPaneDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/ScrollPaneDemo.properties similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/ScrollPaneDemo.properties rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/ScrollPaneDemo.properties diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/COPYRIGHT b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/COPYRIGHT similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/COPYRIGHT rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/COPYRIGHT diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/ScrollPaneDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/ScrollPaneDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/ScrollPaneDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/ScrollPaneDemo.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/colheader.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/colheader.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/colheader.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/colheader.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/crayons.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/crayons.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/crayons.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/crayons.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/lowerleft.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/lowerleft.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/lowerleft.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/lowerleft.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/rowheader.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/rowheader.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/rowheader.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/rowheader.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperleft.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperleft.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperleft.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperleft.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperright.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperright.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperright.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperright.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/slider/SliderDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/slider/SliderDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/slider/SliderDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/slider/SliderDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/slider/resources/SliderDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/slider/resources/SliderDemo.properties similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/slider/resources/SliderDemo.properties rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/slider/resources/SliderDemo.properties diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JMandelbrot.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JMandelbrot.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JMandelbrot.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JMandelbrot.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JPaletteShower.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JPaletteShower.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JPaletteShower.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JPaletteShower.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JSpinnerPanel.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JSpinnerPanel.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JSpinnerPanel.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JSpinnerPanel.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/MandelbrotControl.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/MandelbrotControl.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/MandelbrotControl.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/MandelbrotControl.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/Palette.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/Palette.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/Palette.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/Palette.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/PaletteChooser.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/PaletteChooser.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/PaletteChooser.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/PaletteChooser.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/SpinnerDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/SpinnerDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/SpinnerDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/SpinnerDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/SpinnerDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/SpinnerDemo.properties similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/SpinnerDemo.properties rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/SpinnerDemo.properties diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/images/SpinnerDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/images/SpinnerDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/images/SpinnerDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/images/SpinnerDemo.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/SplitPaneDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/SplitPaneDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/SplitPaneDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/SplitPaneDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/SplitPaneDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/SplitPaneDemo.properties similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/SplitPaneDemo.properties rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/SplitPaneDemo.properties diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/SplitPaneDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/SplitPaneDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/SplitPaneDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/SplitPaneDemo.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/day.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/day.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/day.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/day.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/night.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/night.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/night.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/night.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/TabbedPaneDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/TabbedPaneDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/TabbedPaneDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/TabbedPaneDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/TabbedPaneDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/TabbedPaneDemo.properties similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/TabbedPaneDemo.properties rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/TabbedPaneDemo.properties diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/TabbedPaneDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/TabbedPaneDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/TabbedPaneDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/TabbedPaneDemo.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/blake.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/blake.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/blake.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/blake.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/brooke.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/brooke.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/brooke.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/brooke.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/camille.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/camille.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/camille.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/camille.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/david.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/david.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/david.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/david.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/matthew.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/matthew.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/matthew.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/matthew.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/miranda.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/miranda.jpg similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/miranda.jpg rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/miranda.jpg diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/stephen.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/stephen.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/stephen.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/stephen.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/JHistoryTextField.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/JHistoryTextField.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/JHistoryTextField.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/JHistoryTextField.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/TextFieldDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/TextFieldDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/TextFieldDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/TextFieldDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/TextFieldDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/TextFieldDemo.properties similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/TextFieldDemo.properties rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/TextFieldDemo.properties diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/images/TextFieldDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/images/TextFieldDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/images/TextFieldDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/images/TextFieldDemo.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/DirectionPanel.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/DirectionPanel.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/DirectionPanel.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/DirectionPanel.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/LayoutControlPanel.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/LayoutControlPanel.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/LayoutControlPanel.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/LayoutControlPanel.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/ToggleButtonDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/ToggleButtonDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/ToggleButtonDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/ToggleButtonDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/ToggleButtonDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/ToggleButtonDemo.properties similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/ToggleButtonDemo.properties rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/ToggleButtonDemo.properties diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ToggleButtonDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ToggleButtonDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ToggleButtonDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ToggleButtonDemo.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1d.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1d.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1d.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1d.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1p.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1p.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1p.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1p.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1r.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1r.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1r.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1r.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2d.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2d.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2d.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2d.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2p.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2p.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2p.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2p.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2r.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2r.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2r.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2r.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3d.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3d.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3d.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3d.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3p.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3p.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3p.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3p.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3r.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3r.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3r.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3r.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bl.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bl.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bl.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bl.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bldn.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bldn.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bldn.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bldn.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bm.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bm.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bm.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bm.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bmdn.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bmdn.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bmdn.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bmdn.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/br.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/br.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/br.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/br.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/brdn.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/brdn.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/brdn.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/brdn.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/c.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/c.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/c.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/c.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cb.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cb.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cb.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cb.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbr.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbr.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbr.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbr.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbrs.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbrs.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbrs.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbrs.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbs.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbs.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbs.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbs.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cdn.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cdn.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cdn.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cdn.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ml.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ml.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ml.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ml.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mldn.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mldn.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mldn.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mldn.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mr.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mr.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mr.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mr.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mrdn.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mrdn.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mrdn.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mrdn.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rb.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rb.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rb.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rb.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbp.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbp.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbp.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbp.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbr.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbr.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbr.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbr.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbrs.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbrs.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbrs.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbrs.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbs.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbs.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbs.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbs.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tl.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tl.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tl.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tl.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tldn.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tldn.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tldn.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tldn.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tm.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tm.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tm.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tm.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tmdn.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tmdn.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tmdn.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tmdn.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tr.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tr.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tr.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tr.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/trdn.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/trdn.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/trdn.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/trdn.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/TreeDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/TreeDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/TreeDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/TreeDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/TreeDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/TreeDemo.properties similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/TreeDemo.properties rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/TreeDemo.properties diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/images/TreeDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/images/TreeDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/images/TreeDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/images/TreeDemo.gif diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/tree.txt b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/tree.txt similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/tree.txt rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/tree.txt diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/WindowDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/WindowDemo.java similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/WindowDemo.java rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/WindowDemo.java diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/WindowDemo.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/WindowDemo.html similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/WindowDemo.html rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/WindowDemo.html diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/images/WindowDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/images/WindowDemo.gif similarity index 100% rename from jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/images/WindowDemo.gif rename to test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/images/WindowDemo.gif diff --git a/jdk/test/sanity/client/lib/jemmy/README b/test/jdk/sanity/client/lib/jemmy/README similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/README rename to test/jdk/sanity/client/lib/jemmy/README diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Action.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Action.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Action.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Action.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ActionProducer.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ActionProducer.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ActionProducer.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ActionProducer.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Bundle.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Bundle.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Bundle.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Bundle.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/BundleManager.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/BundleManager.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/BundleManager.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/BundleManager.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/CharBindingMap.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/CharBindingMap.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/CharBindingMap.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/CharBindingMap.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ClassReference.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ClassReference.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ClassReference.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ClassReference.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentChooser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentChooser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentChooser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentChooser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentIsNotFocusedException.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentIsNotFocusedException.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentIsNotFocusedException.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentIsNotFocusedException.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentIsNotVisibleException.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentIsNotVisibleException.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentIsNotVisibleException.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentIsNotVisibleException.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentSearcher.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentSearcher.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentSearcher.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ComponentSearcher.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/DefaultCharBindingMap.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/DefaultCharBindingMap.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/DefaultCharBindingMap.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/DefaultCharBindingMap.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/DialogWaiter.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/DialogWaiter.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/DialogWaiter.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/DialogWaiter.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/EventDispatcher.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/EventDispatcher.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/EventDispatcher.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/EventDispatcher.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/EventTool.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/EventTool.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/EventTool.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/EventTool.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/FrameWaiter.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/FrameWaiter.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/FrameWaiter.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/FrameWaiter.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyException.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyException.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyException.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyException.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyInputException.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyInputException.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyInputException.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyInputException.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyProperties.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyProperties.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyProperties.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyProperties.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/NoComponentUnderMouseException.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/NoComponentUnderMouseException.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/NoComponentUnderMouseException.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/NoComponentUnderMouseException.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ObjectBrowser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ObjectBrowser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ObjectBrowser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ObjectBrowser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Outputable.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Outputable.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Outputable.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Outputable.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/QueueTool.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/QueueTool.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/QueueTool.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/QueueTool.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Scenario.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Scenario.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Scenario.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Scenario.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Test.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Test.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Test.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Test.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/TestCompletedException.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/TestCompletedException.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/TestCompletedException.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/TestCompletedException.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/TestOut.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/TestOut.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/TestOut.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/TestOut.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeout.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeout.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeout.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeout.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/TimeoutExpiredException.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/TimeoutExpiredException.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/TimeoutExpiredException.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/TimeoutExpiredException.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeoutable.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeoutable.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeoutable.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeoutable.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeouts.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeouts.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeouts.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeouts.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Waitable.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Waitable.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Waitable.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Waitable.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Waiter.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Waiter.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Waiter.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Waiter.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/WindowWaiter.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/WindowWaiter.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/WindowWaiter.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/WindowWaiter.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/accessibility/AccessibilityChooser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/accessibility/AccessibilityChooser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/accessibility/AccessibilityChooser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/accessibility/AccessibilityChooser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/accessibility/AccessibleDescriptionChooser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/accessibility/AccessibleDescriptionChooser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/accessibility/AccessibleDescriptionChooser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/accessibility/AccessibleDescriptionChooser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/accessibility/AccessibleNameChooser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/accessibility/AccessibleNameChooser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/accessibility/AccessibleNameChooser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/accessibility/AccessibleNameChooser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/debug.timeouts b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/debug.timeouts similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/debug.timeouts rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/debug.timeouts diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/APIDriverInstaller.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/APIDriverInstaller.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/APIDriverInstaller.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/APIDriverInstaller.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ArrayDriverInstaller.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ArrayDriverInstaller.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ArrayDriverInstaller.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ArrayDriverInstaller.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ButtonDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ButtonDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ButtonDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ButtonDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DefaultDriverInstaller.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DefaultDriverInstaller.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DefaultDriverInstaller.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DefaultDriverInstaller.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DescriptablePathChooser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DescriptablePathChooser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DescriptablePathChooser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DescriptablePathChooser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/Driver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/Driver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/Driver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/Driver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DriverInstaller.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DriverInstaller.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DriverInstaller.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DriverInstaller.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DriverManager.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DriverManager.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DriverManager.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/DriverManager.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/EditorDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/EditorDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/EditorDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/EditorDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/FocusDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/FocusDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/FocusDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/FocusDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/FrameDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/FrameDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/FrameDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/FrameDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/InputDriverInstaller.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/InputDriverInstaller.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/InputDriverInstaller.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/InputDriverInstaller.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/InternalFrameDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/InternalFrameDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/InternalFrameDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/InternalFrameDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/KeyDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/KeyDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/KeyDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/KeyDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/LightDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/LightDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/LightDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/LightDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/LightSupportiveDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/LightSupportiveDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/LightSupportiveDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/LightSupportiveDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ListDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ListDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ListDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ListDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/MenuDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/MenuDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/MenuDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/MenuDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/MouseDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/MouseDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/MouseDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/MouseDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/MultiSelListDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/MultiSelListDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/MultiSelListDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/MultiSelListDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/OrderedListDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/OrderedListDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/OrderedListDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/OrderedListDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/PathChooser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/PathChooser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/PathChooser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/PathChooser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ScrollDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ScrollDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ScrollDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/ScrollDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/SupportiveDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/SupportiveDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/SupportiveDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/SupportiveDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/TableDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/TableDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/TableDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/TableDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/TextDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/TextDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/TextDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/TextDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/TreeDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/TreeDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/TreeDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/TreeDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/UnsupportedOperatorException.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/UnsupportedOperatorException.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/UnsupportedOperatorException.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/UnsupportedOperatorException.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/WindowDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/WindowDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/WindowDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/WindowDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/buttons/ButtonMouseDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/buttons/ButtonMouseDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/buttons/ButtonMouseDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/buttons/ButtonMouseDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/buttons/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/buttons/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/buttons/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/buttons/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/focus/APIFocusDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/focus/APIFocusDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/focus/APIFocusDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/focus/APIFocusDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/focus/MouseFocusDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/focus/MouseFocusDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/focus/MouseFocusDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/focus/MouseFocusDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/focus/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/focus/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/focus/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/focus/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/EventDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/EventDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/EventDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/EventDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/KeyEventDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/KeyEventDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/KeyEventDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/KeyEventDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/KeyRobotDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/KeyRobotDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/KeyRobotDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/KeyRobotDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/MouseEventDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/MouseEventDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/MouseEventDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/MouseEventDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/MouseRobotDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/MouseRobotDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/MouseRobotDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/MouseRobotDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/RobotDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/RobotDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/RobotDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/RobotDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/input/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/ChoiceDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/ChoiceDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/ChoiceDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/ChoiceDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JComboMouseDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JComboMouseDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JComboMouseDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JComboMouseDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JListMouseDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JListMouseDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JListMouseDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JListMouseDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JTabAPIDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JTabAPIDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JTabAPIDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JTabAPIDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JTabMouseDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JTabMouseDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JTabMouseDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JTabMouseDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JTableHeaderDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JTableHeaderDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JTableHeaderDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/JTableHeaderDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/ListAPIDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/ListAPIDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/ListAPIDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/ListAPIDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/ListKeyboardDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/ListKeyboardDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/ListKeyboardDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/ListKeyboardDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/lists/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/APIJMenuDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/APIJMenuDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/APIJMenuDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/APIJMenuDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/AppleMenuDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/AppleMenuDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/AppleMenuDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/AppleMenuDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/DefaultJMenuDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/DefaultJMenuDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/DefaultJMenuDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/DefaultJMenuDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/QueueJMenuDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/QueueJMenuDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/QueueJMenuDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/QueueJMenuDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/menus/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/AWTScrollDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/AWTScrollDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/AWTScrollDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/AWTScrollDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/AbstractScrollDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/AbstractScrollDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/AbstractScrollDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/AbstractScrollDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JScrollBarAPIDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JScrollBarAPIDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JScrollBarAPIDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JScrollBarAPIDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JScrollBarDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JScrollBarDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JScrollBarDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JScrollBarDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSliderAPIDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSliderAPIDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSliderAPIDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSliderAPIDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSliderDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSliderDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSliderDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSliderDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSpinnerDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSpinnerDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSpinnerDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSpinnerDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSplitPaneDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSplitPaneDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSplitPaneDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/JSplitPaneDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/KeyboardJSliderScrollDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/KeyboardJSliderScrollDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/KeyboardJSliderScrollDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/KeyboardJSliderScrollDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/ScrollAdjuster.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/ScrollAdjuster.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/ScrollAdjuster.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/ScrollAdjuster.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/ScrollPaneDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/ScrollPaneDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/ScrollPaneDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/ScrollPaneDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/ScrollbarDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/ScrollbarDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/ScrollbarDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/ScrollbarDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/scrolling/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/tables/JTableMouseDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/tables/JTableMouseDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/tables/JTableMouseDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/tables/JTableMouseDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/tables/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/tables/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/tables/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/tables/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/AWTTextAPIDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/AWTTextAPIDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/AWTTextAPIDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/AWTTextAPIDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/AWTTextKeyboardDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/AWTTextKeyboardDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/AWTTextKeyboardDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/AWTTextKeyboardDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/DownKey.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/DownKey.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/DownKey.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/DownKey.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/EndKey.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/EndKey.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/EndKey.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/EndKey.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/GoAndBackKey.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/GoAndBackKey.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/GoAndBackKey.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/GoAndBackKey.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/HomeKey.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/HomeKey.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/HomeKey.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/HomeKey.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/NavigationKey.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/NavigationKey.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/NavigationKey.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/NavigationKey.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/OffsetKey.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/OffsetKey.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/OffsetKey.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/OffsetKey.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/SwingTextAPIDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/SwingTextAPIDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/SwingTextAPIDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/SwingTextAPIDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/SwingTextKeyboardDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/SwingTextKeyboardDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/SwingTextKeyboardDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/SwingTextKeyboardDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/TextAPIDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/TextAPIDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/TextAPIDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/TextAPIDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/TextKeyboardDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/TextKeyboardDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/TextKeyboardDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/TextKeyboardDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/UpKey.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/UpKey.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/UpKey.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/UpKey.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/text/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/trees/JTreeAPIDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/trees/JTreeAPIDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/trees/JTreeAPIDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/trees/JTreeAPIDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/trees/JTreeMouseDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/trees/JTreeMouseDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/trees/JTreeMouseDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/trees/JTreeMouseDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/trees/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/trees/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/trees/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/trees/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/DefaultFrameDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/DefaultFrameDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/DefaultFrameDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/DefaultFrameDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/DefaultInternalFrameDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/DefaultInternalFrameDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/DefaultInternalFrameDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/DefaultInternalFrameDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/DefaultWindowDriver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/DefaultWindowDriver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/DefaultWindowDriver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/DefaultWindowDriver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/drivers/windows/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/GUIBrowser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/GUIBrowser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/GUIBrowser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/GUIBrowser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/TrialListenerManager.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/TrialListenerManager.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/TrialListenerManager.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/TrialListenerManager.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ColorImageComparator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ColorImageComparator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ColorImageComparator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ColorImageComparator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/FileImageComparator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/FileImageComparator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/FileImageComparator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/FileImageComparator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageComparator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageComparator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageComparator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageComparator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageFinder.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageFinder.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageFinder.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageFinder.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageLoader.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageLoader.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageLoader.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageLoader.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageSaver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageSaver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageSaver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageSaver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageTool.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageTool.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageTool.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/ImageTool.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/PNGImageLoader.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/PNGImageLoader.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/PNGImageLoader.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/PNGImageLoader.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/PNGImageSaver.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/PNGImageSaver.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/PNGImageSaver.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/PNGImageSaver.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/RoughImageComparator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/RoughImageComparator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/RoughImageComparator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/RoughImageComparator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/RoughImageFinder.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/RoughImageFinder.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/RoughImageFinder.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/RoughImageFinder.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/StrictImageComparator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/StrictImageComparator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/StrictImageComparator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/StrictImageComparator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/StrictImageFinder.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/StrictImageFinder.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/StrictImageFinder.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/StrictImageFinder.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/image/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/AbstractButtonOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/AbstractButtonOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/AbstractButtonOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/AbstractButtonOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ButtonOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ButtonOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ButtonOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ButtonOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/CheckboxOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/CheckboxOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/CheckboxOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/CheckboxOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ChoiceOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ChoiceOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ChoiceOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ChoiceOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ComponentOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ComponentOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ComponentOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ComponentOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ContainerOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ContainerOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ContainerOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ContainerOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/DialogOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/DialogOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/DialogOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/DialogOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/FrameOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/FrameOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/FrameOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/FrameOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JButtonOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JButtonOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JButtonOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JButtonOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JCheckBoxMenuItemOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JCheckBoxMenuItemOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JCheckBoxMenuItemOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JCheckBoxMenuItemOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JCheckBoxOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JCheckBoxOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JCheckBoxOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JCheckBoxOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JColorChooserOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JColorChooserOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JColorChooserOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JColorChooserOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JComboBoxOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JComboBoxOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JComboBoxOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JComboBoxOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JComponentOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JComponentOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JComponentOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JComponentOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JDialogOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JDialogOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JDialogOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JDialogOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JEditorPaneOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JEditorPaneOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JEditorPaneOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JEditorPaneOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JFileChooserOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JFileChooserOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JFileChooserOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JFileChooserOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JFrameOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JFrameOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JFrameOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JFrameOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JInternalFrameOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JInternalFrameOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JInternalFrameOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JInternalFrameOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JLabelOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JLabelOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JLabelOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JLabelOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JListOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JListOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JListOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JListOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JMenuBarOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JMenuBarOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JMenuBarOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JMenuBarOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JMenuItemOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JMenuItemOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JMenuItemOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JMenuItemOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JMenuOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JMenuOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JMenuOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JMenuOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JPasswordFieldOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JPasswordFieldOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JPasswordFieldOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JPasswordFieldOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JPopupMenuOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JPopupMenuOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JPopupMenuOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JPopupMenuOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JProgressBarOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JProgressBarOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JProgressBarOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JProgressBarOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JRadioButtonMenuItemOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JRadioButtonMenuItemOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JRadioButtonMenuItemOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JRadioButtonMenuItemOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JRadioButtonOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JRadioButtonOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JRadioButtonOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JRadioButtonOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JScrollBarOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JScrollBarOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JScrollBarOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JScrollBarOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JScrollPaneOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JScrollPaneOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JScrollPaneOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JScrollPaneOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JSliderOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JSliderOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JSliderOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JSliderOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JSpinnerOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JSpinnerOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JSpinnerOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JSpinnerOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JSplitPaneOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JSplitPaneOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JSplitPaneOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JSplitPaneOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTabbedPaneOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTabbedPaneOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTabbedPaneOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTabbedPaneOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTableHeaderOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTableHeaderOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTableHeaderOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTableHeaderOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTableOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTableOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTableOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTableOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextAreaOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextAreaOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextAreaOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextAreaOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextComponentOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextComponentOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextComponentOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextComponentOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextFieldOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextFieldOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextFieldOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextFieldOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextPaneOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextPaneOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextPaneOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextPaneOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JToggleButtonOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JToggleButtonOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JToggleButtonOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JToggleButtonOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTreeOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTreeOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTreeOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTreeOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/LabelOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/LabelOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/LabelOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/LabelOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ListOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ListOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ListOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ListOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/Operator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/Operator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/Operator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/Operator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ScrollPaneOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ScrollPaneOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ScrollPaneOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ScrollPaneOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ScrollbarOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ScrollbarOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ScrollbarOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/ScrollbarOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/TextAreaOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/TextAreaOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/TextAreaOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/TextAreaOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/TextComponentOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/TextComponentOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/TextComponentOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/TextComponentOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/TextFieldOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/TextFieldOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/TextFieldOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/TextFieldOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/WindowOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/WindowOperator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/WindowOperator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/WindowOperator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/AbstractTextStyleChooser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/AbstractTextStyleChooser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/AbstractTextStyleChooser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/AbstractTextStyleChooser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/DefaultVisualizer.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/DefaultVisualizer.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/DefaultVisualizer.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/DefaultVisualizer.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/DumpController.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/DumpController.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/DumpController.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/DumpController.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/Dumper.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/Dumper.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/Dumper.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/Dumper.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/EmptyVisualizer.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/EmptyVisualizer.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/EmptyVisualizer.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/EmptyVisualizer.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/MouseVisualizer.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/MouseVisualizer.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/MouseVisualizer.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/MouseVisualizer.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/NameComponentChooser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/NameComponentChooser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/NameComponentChooser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/NameComponentChooser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/PNGDecoder.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/PNGDecoder.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/PNGDecoder.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/PNGDecoder.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/PNGEncoder.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/PNGEncoder.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/PNGEncoder.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/PNGEncoder.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/PropChooser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/PropChooser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/PropChooser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/PropChooser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/RegExComparator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/RegExComparator.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/RegExComparator.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/RegExComparator.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/StringPropChooser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/StringPropChooser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/StringPropChooser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/StringPropChooser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/TextStyleChooser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/TextStyleChooser.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/TextStyleChooser.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/TextStyleChooser.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/WindowJob.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/WindowJob.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/WindowJob.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/WindowJob.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/WindowManager.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/WindowManager.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/WindowManager.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/WindowManager.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/package-info.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/package-info.java similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/package-info.java rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/package-info.java diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/version_info b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/version_info similarity index 100% rename from jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/version_info rename to test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/version_info diff --git a/jdk/test/start-Xvfb.sh b/test/jdk/start-Xvfb.sh similarity index 100% rename from jdk/test/start-Xvfb.sh rename to test/jdk/start-Xvfb.sh diff --git a/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java b/test/jdk/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java similarity index 100% rename from jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java rename to test/jdk/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java diff --git a/jdk/test/sun/applet/TEST.properties b/test/jdk/sun/applet/TEST.properties similarity index 100% rename from jdk/test/sun/applet/TEST.properties rename to test/jdk/sun/applet/TEST.properties diff --git a/jdk/test/sun/awt/AppContext/8012933/Test8012933.java b/test/jdk/sun/awt/AppContext/8012933/Test8012933.java similarity index 100% rename from jdk/test/sun/awt/AppContext/8012933/Test8012933.java rename to test/jdk/sun/awt/AppContext/8012933/Test8012933.java diff --git a/jdk/test/sun/awt/AppContext/MultiThread/MultiThreadTest.java b/test/jdk/sun/awt/AppContext/MultiThread/MultiThreadTest.java similarity index 100% rename from jdk/test/sun/awt/AppContext/MultiThread/MultiThreadTest.java rename to test/jdk/sun/awt/AppContext/MultiThread/MultiThreadTest.java diff --git a/jdk/test/sun/awt/TEST.properties b/test/jdk/sun/awt/TEST.properties similarity index 100% rename from jdk/test/sun/awt/TEST.properties rename to test/jdk/sun/awt/TEST.properties diff --git a/jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java b/test/jdk/sun/awt/datatransfer/DataFlavorComparatorTest.java similarity index 100% rename from jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java rename to test/jdk/sun/awt/datatransfer/DataFlavorComparatorTest.java diff --git a/jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest1.java b/test/jdk/sun/awt/datatransfer/DataFlavorComparatorTest1.java similarity index 100% rename from jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest1.java rename to test/jdk/sun/awt/datatransfer/DataFlavorComparatorTest1.java diff --git a/jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java b/test/jdk/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java similarity index 100% rename from jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java rename to test/jdk/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java diff --git a/jdk/test/sun/awt/dnd/8024061/bug8024061.java b/test/jdk/sun/awt/dnd/8024061/bug8024061.java similarity index 100% rename from jdk/test/sun/awt/dnd/8024061/bug8024061.java rename to test/jdk/sun/awt/dnd/8024061/bug8024061.java diff --git a/jdk/test/sun/awt/font/ClassLoaderLeakTest.java b/test/jdk/sun/awt/font/ClassLoaderLeakTest.java similarity index 100% rename from jdk/test/sun/awt/font/ClassLoaderLeakTest.java rename to test/jdk/sun/awt/font/ClassLoaderLeakTest.java diff --git a/jdk/test/sun/awt/image/DrawByteBinary.java b/test/jdk/sun/awt/image/DrawByteBinary.java similarity index 100% rename from jdk/test/sun/awt/image/DrawByteBinary.java rename to test/jdk/sun/awt/image/DrawByteBinary.java diff --git a/jdk/test/sun/awt/image/ImageRepresentation/LUTCompareTest.java b/test/jdk/sun/awt/image/ImageRepresentation/LUTCompareTest.java similarity index 100% rename from jdk/test/sun/awt/image/ImageRepresentation/LUTCompareTest.java rename to test/jdk/sun/awt/image/ImageRepresentation/LUTCompareTest.java diff --git a/jdk/test/sun/awt/image/ImageWatched/AddNoLeak.java b/test/jdk/sun/awt/image/ImageWatched/AddNoLeak.java similarity index 100% rename from jdk/test/sun/awt/image/ImageWatched/AddNoLeak.java rename to test/jdk/sun/awt/image/ImageWatched/AddNoLeak.java diff --git a/jdk/test/sun/awt/image/ImagingLib/SamePackingTypeTest.java b/test/jdk/sun/awt/image/ImagingLib/SamePackingTypeTest.java similarity index 100% rename from jdk/test/sun/awt/image/ImagingLib/SamePackingTypeTest.java rename to test/jdk/sun/awt/image/ImagingLib/SamePackingTypeTest.java diff --git a/jdk/test/sun/awt/image/OffScreenImageSource/ImageConsumerUnregisterTest.java b/test/jdk/sun/awt/image/OffScreenImageSource/ImageConsumerUnregisterTest.java similarity index 100% rename from jdk/test/sun/awt/image/OffScreenImageSource/ImageConsumerUnregisterTest.java rename to test/jdk/sun/awt/image/OffScreenImageSource/ImageConsumerUnregisterTest.java diff --git a/jdk/test/sun/awt/image/OffScreenImageSource/ImageFilterTest.java b/test/jdk/sun/awt/image/OffScreenImageSource/ImageFilterTest.java similarity index 100% rename from jdk/test/sun/awt/image/OffScreenImageSource/ImageFilterTest.java rename to test/jdk/sun/awt/image/OffScreenImageSource/ImageFilterTest.java diff --git a/jdk/test/sun/awt/image/bug8038000.java b/test/jdk/sun/awt/image/bug8038000.java similarity index 100% rename from jdk/test/sun/awt/image/bug8038000.java rename to test/jdk/sun/awt/image/bug8038000.java diff --git a/jdk/test/sun/awt/shell/BadHiDPIIcon.java b/test/jdk/sun/awt/shell/BadHiDPIIcon.java similarity index 100% rename from jdk/test/sun/awt/shell/BadHiDPIIcon.java rename to test/jdk/sun/awt/shell/BadHiDPIIcon.java diff --git a/jdk/test/sun/awt/shell/FileSystemViewMemoryLeak.java b/test/jdk/sun/awt/shell/FileSystemViewMemoryLeak.java similarity index 100% rename from jdk/test/sun/awt/shell/FileSystemViewMemoryLeak.java rename to test/jdk/sun/awt/shell/FileSystemViewMemoryLeak.java diff --git a/jdk/test/sun/awt/shell/ShellFolderMemoryLeak.java b/test/jdk/sun/awt/shell/ShellFolderMemoryLeak.java similarity index 100% rename from jdk/test/sun/awt/shell/ShellFolderMemoryLeak.java rename to test/jdk/sun/awt/shell/ShellFolderMemoryLeak.java diff --git a/jdk/test/sun/invoke/util/ValueConversionsTest.java b/test/jdk/sun/invoke/util/ValueConversionsTest.java similarity index 100% rename from jdk/test/sun/invoke/util/ValueConversionsTest.java rename to test/jdk/sun/invoke/util/ValueConversionsTest.java diff --git a/jdk/test/sun/invoke/util/WrapperTest.java b/test/jdk/sun/invoke/util/WrapperTest.java similarity index 100% rename from jdk/test/sun/invoke/util/WrapperTest.java rename to test/jdk/sun/invoke/util/WrapperTest.java diff --git a/jdk/test/sun/java2d/AcceleratedXORModeTest.java b/test/jdk/sun/java2d/AcceleratedXORModeTest.java similarity index 100% rename from jdk/test/sun/java2d/AcceleratedXORModeTest.java rename to test/jdk/sun/java2d/AcceleratedXORModeTest.java diff --git a/jdk/test/sun/java2d/ClassCastExceptionForInvalidSurface.java b/test/jdk/sun/java2d/ClassCastExceptionForInvalidSurface.java similarity index 100% rename from jdk/test/sun/java2d/ClassCastExceptionForInvalidSurface.java rename to test/jdk/sun/java2d/ClassCastExceptionForInvalidSurface.java diff --git a/jdk/test/sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java b/test/jdk/sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java rename to test/jdk/sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java diff --git a/jdk/test/sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java b/test/jdk/sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java rename to test/jdk/sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java diff --git a/jdk/test/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java b/test/jdk/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java rename to test/jdk/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java diff --git a/jdk/test/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java b/test/jdk/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java rename to test/jdk/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java diff --git a/jdk/test/sun/java2d/DirectX/InfiniteValidationLoopTest/InfiniteValidationLoopTest.java b/test/jdk/sun/java2d/DirectX/InfiniteValidationLoopTest/InfiniteValidationLoopTest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/InfiniteValidationLoopTest/InfiniteValidationLoopTest.java rename to test/jdk/sun/java2d/DirectX/InfiniteValidationLoopTest/InfiniteValidationLoopTest.java diff --git a/jdk/test/sun/java2d/DirectX/NonOpaqueDestLCDAATest/NonOpaqueDestLCDAATest.java b/test/jdk/sun/java2d/DirectX/NonOpaqueDestLCDAATest/NonOpaqueDestLCDAATest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/NonOpaqueDestLCDAATest/NonOpaqueDestLCDAATest.java rename to test/jdk/sun/java2d/DirectX/NonOpaqueDestLCDAATest/NonOpaqueDestLCDAATest.java diff --git a/jdk/test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java b/test/jdk/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java rename to test/jdk/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java diff --git a/jdk/test/sun/java2d/DirectX/OpaqueImageToSurfaceBlitTest/OpaqueImageToSurfaceBlitTest.java b/test/jdk/sun/java2d/DirectX/OpaqueImageToSurfaceBlitTest/OpaqueImageToSurfaceBlitTest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/OpaqueImageToSurfaceBlitTest/OpaqueImageToSurfaceBlitTest.java rename to test/jdk/sun/java2d/DirectX/OpaqueImageToSurfaceBlitTest/OpaqueImageToSurfaceBlitTest.java diff --git a/jdk/test/sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java b/test/jdk/sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java rename to test/jdk/sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java diff --git a/jdk/test/sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java b/test/jdk/sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java rename to test/jdk/sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java diff --git a/jdk/test/sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java b/test/jdk/sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java rename to test/jdk/sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java diff --git a/jdk/test/sun/java2d/DirectX/SwingOnScreenScrollingTest/SwingOnScreenScrollingTest.java b/test/jdk/sun/java2d/DirectX/SwingOnScreenScrollingTest/SwingOnScreenScrollingTest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/SwingOnScreenScrollingTest/SwingOnScreenScrollingTest.java rename to test/jdk/sun/java2d/DirectX/SwingOnScreenScrollingTest/SwingOnScreenScrollingTest.java diff --git a/jdk/test/sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java b/test/jdk/sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java similarity index 100% rename from jdk/test/sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java rename to test/jdk/sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java diff --git a/jdk/test/sun/java2d/Disposer/TestDisposerLeak.java b/test/jdk/sun/java2d/Disposer/TestDisposerLeak.java similarity index 100% rename from jdk/test/sun/java2d/Disposer/TestDisposerLeak.java rename to test/jdk/sun/java2d/Disposer/TestDisposerLeak.java diff --git a/jdk/test/sun/java2d/DrawCachedImageAndTransform.java b/test/jdk/sun/java2d/DrawCachedImageAndTransform.java similarity index 100% rename from jdk/test/sun/java2d/DrawCachedImageAndTransform.java rename to test/jdk/sun/java2d/DrawCachedImageAndTransform.java diff --git a/jdk/test/sun/java2d/DrawXORModeTest.java b/test/jdk/sun/java2d/DrawXORModeTest.java similarity index 100% rename from jdk/test/sun/java2d/DrawXORModeTest.java rename to test/jdk/sun/java2d/DrawXORModeTest.java diff --git a/jdk/test/sun/java2d/GdiRendering/InsetClipping.java b/test/jdk/sun/java2d/GdiRendering/InsetClipping.java similarity index 100% rename from jdk/test/sun/java2d/GdiRendering/InsetClipping.java rename to test/jdk/sun/java2d/GdiRendering/InsetClipping.java diff --git a/jdk/test/sun/java2d/OpenGL/CopyAreaOOB.java b/test/jdk/sun/java2d/OpenGL/CopyAreaOOB.java similarity index 100% rename from jdk/test/sun/java2d/OpenGL/CopyAreaOOB.java rename to test/jdk/sun/java2d/OpenGL/CopyAreaOOB.java diff --git a/jdk/test/sun/java2d/OpenGL/CustomCompositeTest.java b/test/jdk/sun/java2d/OpenGL/CustomCompositeTest.java similarity index 100% rename from jdk/test/sun/java2d/OpenGL/CustomCompositeTest.java rename to test/jdk/sun/java2d/OpenGL/CustomCompositeTest.java diff --git a/jdk/test/sun/java2d/OpenGL/DrawBufImgOp.java b/test/jdk/sun/java2d/OpenGL/DrawBufImgOp.java similarity index 100% rename from jdk/test/sun/java2d/OpenGL/DrawBufImgOp.java rename to test/jdk/sun/java2d/OpenGL/DrawBufImgOp.java diff --git a/jdk/test/sun/java2d/OpenGL/DrawHugeImageTest.java b/test/jdk/sun/java2d/OpenGL/DrawHugeImageTest.java similarity index 100% rename from jdk/test/sun/java2d/OpenGL/DrawHugeImageTest.java rename to test/jdk/sun/java2d/OpenGL/DrawHugeImageTest.java diff --git a/jdk/test/sun/java2d/OpenGL/GradientPaints.java b/test/jdk/sun/java2d/OpenGL/GradientPaints.java similarity index 100% rename from jdk/test/sun/java2d/OpenGL/GradientPaints.java rename to test/jdk/sun/java2d/OpenGL/GradientPaints.java diff --git a/jdk/test/sun/java2d/OpenGL/bug7181438.java b/test/jdk/sun/java2d/OpenGL/bug7181438.java similarity index 100% rename from jdk/test/sun/java2d/OpenGL/bug7181438.java rename to test/jdk/sun/java2d/OpenGL/bug7181438.java diff --git a/jdk/test/sun/java2d/SunGraphics2D/DrawImageBilinear.java b/test/jdk/sun/java2d/SunGraphics2D/DrawImageBilinear.java similarity index 100% rename from jdk/test/sun/java2d/SunGraphics2D/DrawImageBilinear.java rename to test/jdk/sun/java2d/SunGraphics2D/DrawImageBilinear.java diff --git a/jdk/test/sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java b/test/jdk/sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java similarity index 100% rename from jdk/test/sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java rename to test/jdk/sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java diff --git a/jdk/test/sun/java2d/SunGraphics2D/PolyVertTest.java b/test/jdk/sun/java2d/SunGraphics2D/PolyVertTest.java similarity index 100% rename from jdk/test/sun/java2d/SunGraphics2D/PolyVertTest.java rename to test/jdk/sun/java2d/SunGraphics2D/PolyVertTest.java diff --git a/jdk/test/sun/java2d/SunGraphics2D/SimplePrimQuality.java b/test/jdk/sun/java2d/SunGraphics2D/SimplePrimQuality.java similarity index 100% rename from jdk/test/sun/java2d/SunGraphics2D/SimplePrimQuality.java rename to test/jdk/sun/java2d/SunGraphics2D/SimplePrimQuality.java diff --git a/jdk/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java b/test/jdk/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java similarity index 100% rename from jdk/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java rename to test/jdk/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java diff --git a/jdk/test/sun/java2d/SunGraphics2D/SurfaceDestination/SurfaceDestination.java b/test/jdk/sun/java2d/SunGraphics2D/SurfaceDestination/SurfaceDestination.java similarity index 100% rename from jdk/test/sun/java2d/SunGraphics2D/SurfaceDestination/SurfaceDestination.java rename to test/jdk/sun/java2d/SunGraphics2D/SurfaceDestination/SurfaceDestination.java diff --git a/jdk/test/sun/java2d/SunGraphicsEnvironment/TestSGEuseAlternateFontforJALocales.java b/test/jdk/sun/java2d/SunGraphicsEnvironment/TestSGEuseAlternateFontforJALocales.java similarity index 100% rename from jdk/test/sun/java2d/SunGraphicsEnvironment/TestSGEuseAlternateFontforJALocales.java rename to test/jdk/sun/java2d/SunGraphicsEnvironment/TestSGEuseAlternateFontforJALocales.java diff --git a/jdk/test/sun/java2d/TEST.properties b/test/jdk/sun/java2d/TEST.properties similarity index 100% rename from jdk/test/sun/java2d/TEST.properties rename to test/jdk/sun/java2d/TEST.properties diff --git a/jdk/test/sun/java2d/X11SurfaceData/DrawImageBgTest/DrawImageBgTest.java b/test/jdk/sun/java2d/X11SurfaceData/DrawImageBgTest/DrawImageBgTest.java similarity index 100% rename from jdk/test/sun/java2d/X11SurfaceData/DrawImageBgTest/DrawImageBgTest.java rename to test/jdk/sun/java2d/X11SurfaceData/DrawImageBgTest/DrawImageBgTest.java diff --git a/jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.java b/test/jdk/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.java similarity index 100% rename from jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.java rename to test/jdk/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.java diff --git a/jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh b/test/jdk/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh similarity index 100% rename from jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh rename to test/jdk/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh diff --git a/jdk/test/sun/java2d/XRSurfaceData/ComponentResizeTest.java b/test/jdk/sun/java2d/XRSurfaceData/ComponentResizeTest.java similarity index 100% rename from jdk/test/sun/java2d/XRSurfaceData/ComponentResizeTest.java rename to test/jdk/sun/java2d/XRSurfaceData/ComponentResizeTest.java diff --git a/jdk/test/sun/java2d/XRenderBlitsTest.java b/test/jdk/sun/java2d/XRenderBlitsTest.java similarity index 100% rename from jdk/test/sun/java2d/XRenderBlitsTest.java rename to test/jdk/sun/java2d/XRenderBlitsTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/AlphaTest.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/AlphaTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/AlphaTest.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/AlphaTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/CIEXYZ.png b/test/jdk/sun/java2d/cmm/ColorConvertOp/CIEXYZ.png similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/CIEXYZ.png rename to test/jdk/sun/java2d/cmm/ColorConvertOp/CIEXYZ.png diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/ColConvTest.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ColConvTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/ColConvTest.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/ColConvTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/ColCvtAlpha.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ColCvtAlpha.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/ColCvtAlpha.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/ColCvtAlpha.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/ColCvtIntARGB.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ColCvtIntARGB.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/ColCvtIntARGB.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/ColCvtIntARGB.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/ColorConvertTest.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ColorConvertTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/ColorConvertTest.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/ColorConvertTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/ColorSpaceCvtCrashTest/ColorSpaceCvtCrashTest.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ColorSpaceCvtCrashTest/ColorSpaceCvtCrashTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/ColorSpaceCvtCrashTest/ColorSpaceCvtCrashTest.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/ColorSpaceCvtCrashTest/ColorSpaceCvtCrashTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html b/test/jdk/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html rename to test/jdk/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/GRAY.png b/test/jdk/sun/java2d/cmm/ColorConvertOp/GRAY.png similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/GRAY.png rename to test/jdk/sun/java2d/cmm/ColorConvertOp/GRAY.png diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/GrayTest.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/GrayTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/GrayTest.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/GrayTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/ImageComparator.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ImageComparator.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/ImageComparator.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/ImageComparator.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/ImageFactory.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ImageFactory.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/ImageFactory.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/ImageFactory.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/InvalidRenderIntentTest.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/InvalidRenderIntentTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/InvalidRenderIntentTest.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/InvalidRenderIntentTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/LRGB.png b/test/jdk/sun/java2d/cmm/ColorConvertOp/LRGB.png similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/LRGB.png rename to test/jdk/sun/java2d/cmm/ColorConvertOp/LRGB.png diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/LRGB555.png b/test/jdk/sun/java2d/cmm/ColorConvertOp/LRGB555.png similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/LRGB555.png rename to test/jdk/sun/java2d/cmm/ColorConvertOp/LRGB555.png diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/LRGB565.png b/test/jdk/sun/java2d/cmm/ColorConvertOp/LRGB565.png similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/LRGB565.png rename to test/jdk/sun/java2d/cmm/ColorConvertOp/LRGB565.png diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/MTColConvTest.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/MTColConvTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/MTColConvTest.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/MTColConvTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/MTSafetyTest.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/MTSafetyTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/MTSafetyTest.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/MTSafetyTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/PYCC.png b/test/jdk/sun/java2d/cmm/ColorConvertOp/PYCC.png similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/PYCC.png rename to test/jdk/sun/java2d/cmm/ColorConvertOp/PYCC.png diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/RGBColorConvertTest.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/RGBColorConvertTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/RGBColorConvertTest.java rename to test/jdk/sun/java2d/cmm/ColorConvertOp/RGBColorConvertTest.java diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/SRGB.png b/test/jdk/sun/java2d/cmm/ColorConvertOp/SRGB.png similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/SRGB.png rename to test/jdk/sun/java2d/cmm/ColorConvertOp/SRGB.png diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/SRGB555.png b/test/jdk/sun/java2d/cmm/ColorConvertOp/SRGB555.png similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/SRGB555.png rename to test/jdk/sun/java2d/cmm/ColorConvertOp/SRGB555.png diff --git a/jdk/test/sun/java2d/cmm/ColorConvertOp/SRGB565.png b/test/jdk/sun/java2d/cmm/ColorConvertOp/SRGB565.png similarity index 100% rename from jdk/test/sun/java2d/cmm/ColorConvertOp/SRGB565.png rename to test/jdk/sun/java2d/cmm/ColorConvertOp/SRGB565.png diff --git a/jdk/test/sun/java2d/cmm/ProfileOp/DisposalCrashTest.java b/test/jdk/sun/java2d/cmm/ProfileOp/DisposalCrashTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ProfileOp/DisposalCrashTest.java rename to test/jdk/sun/java2d/cmm/ProfileOp/DisposalCrashTest.java diff --git a/jdk/test/sun/java2d/cmm/ProfileOp/MTReadProfileTest.java b/test/jdk/sun/java2d/cmm/ProfileOp/MTReadProfileTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ProfileOp/MTReadProfileTest.java rename to test/jdk/sun/java2d/cmm/ProfileOp/MTReadProfileTest.java diff --git a/jdk/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java b/test/jdk/sun/java2d/cmm/ProfileOp/ReadProfileTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java rename to test/jdk/sun/java2d/cmm/ProfileOp/ReadProfileTest.java diff --git a/jdk/test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java b/test/jdk/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java rename to test/jdk/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java diff --git a/jdk/test/sun/java2d/cmm/ProfileOp/SetDataTest.java b/test/jdk/sun/java2d/cmm/ProfileOp/SetDataTest.java similarity index 100% rename from jdk/test/sun/java2d/cmm/ProfileOp/SetDataTest.java rename to test/jdk/sun/java2d/cmm/ProfileOp/SetDataTest.java diff --git a/jdk/test/sun/java2d/loops/Bug7049339.java b/test/jdk/sun/java2d/loops/Bug7049339.java similarity index 100% rename from jdk/test/sun/java2d/loops/Bug7049339.java rename to test/jdk/sun/java2d/loops/Bug7049339.java diff --git a/jdk/test/sun/java2d/loops/ConvertToByteIndexedTest.java b/test/jdk/sun/java2d/loops/ConvertToByteIndexedTest.java similarity index 100% rename from jdk/test/sun/java2d/loops/ConvertToByteIndexedTest.java rename to test/jdk/sun/java2d/loops/ConvertToByteIndexedTest.java diff --git a/jdk/test/sun/java2d/loops/CopyAreaSpeed.html b/test/jdk/sun/java2d/loops/CopyAreaSpeed.html similarity index 100% rename from jdk/test/sun/java2d/loops/CopyAreaSpeed.html rename to test/jdk/sun/java2d/loops/CopyAreaSpeed.html diff --git a/jdk/test/sun/java2d/loops/CopyAreaSpeed.java b/test/jdk/sun/java2d/loops/CopyAreaSpeed.java similarity index 100% rename from jdk/test/sun/java2d/loops/CopyAreaSpeed.java rename to test/jdk/sun/java2d/loops/CopyAreaSpeed.java diff --git a/jdk/test/sun/java2d/loops/RenderToCustomBufferTest.java b/test/jdk/sun/java2d/loops/RenderToCustomBufferTest.java similarity index 100% rename from jdk/test/sun/java2d/loops/RenderToCustomBufferTest.java rename to test/jdk/sun/java2d/loops/RenderToCustomBufferTest.java diff --git a/jdk/test/sun/java2d/marlin/ArrayCacheSizeTest.java b/test/jdk/sun/java2d/marlin/ArrayCacheSizeTest.java similarity index 100% rename from jdk/test/sun/java2d/marlin/ArrayCacheSizeTest.java rename to test/jdk/sun/java2d/marlin/ArrayCacheSizeTest.java diff --git a/jdk/test/sun/java2d/marlin/CeilAndFloorTests.java b/test/jdk/sun/java2d/marlin/CeilAndFloorTests.java similarity index 100% rename from jdk/test/sun/java2d/marlin/CeilAndFloorTests.java rename to test/jdk/sun/java2d/marlin/CeilAndFloorTests.java diff --git a/jdk/test/sun/java2d/marlin/CrashNaNTest.java b/test/jdk/sun/java2d/marlin/CrashNaNTest.java similarity index 100% rename from jdk/test/sun/java2d/marlin/CrashNaNTest.java rename to test/jdk/sun/java2d/marlin/CrashNaNTest.java diff --git a/jdk/test/sun/java2d/marlin/CrashPaintTest.java b/test/jdk/sun/java2d/marlin/CrashPaintTest.java similarity index 100% rename from jdk/test/sun/java2d/marlin/CrashPaintTest.java rename to test/jdk/sun/java2d/marlin/CrashPaintTest.java diff --git a/jdk/test/sun/java2d/marlin/CrashTest.java b/test/jdk/sun/java2d/marlin/CrashTest.java similarity index 100% rename from jdk/test/sun/java2d/marlin/CrashTest.java rename to test/jdk/sun/java2d/marlin/CrashTest.java diff --git a/jdk/test/sun/java2d/marlin/TextClipErrorTest.java b/test/jdk/sun/java2d/marlin/TextClipErrorTest.java similarity index 100% rename from jdk/test/sun/java2d/marlin/TextClipErrorTest.java rename to test/jdk/sun/java2d/marlin/TextClipErrorTest.java diff --git a/jdk/test/sun/java2d/pipe/InterpolationQualityTest.java b/test/jdk/sun/java2d/pipe/InterpolationQualityTest.java similarity index 100% rename from jdk/test/sun/java2d/pipe/InterpolationQualityTest.java rename to test/jdk/sun/java2d/pipe/InterpolationQualityTest.java diff --git a/jdk/test/sun/java2d/pipe/MutableColorTest/MutableColorTest.java b/test/jdk/sun/java2d/pipe/MutableColorTest/MutableColorTest.java similarity index 100% rename from jdk/test/sun/java2d/pipe/MutableColorTest/MutableColorTest.java rename to test/jdk/sun/java2d/pipe/MutableColorTest/MutableColorTest.java diff --git a/jdk/test/sun/java2d/pipe/RegionOps.java b/test/jdk/sun/java2d/pipe/RegionOps.java similarity index 100% rename from jdk/test/sun/java2d/pipe/RegionOps.java rename to test/jdk/sun/java2d/pipe/RegionOps.java diff --git a/jdk/test/sun/java2d/pipe/Test7027667.java b/test/jdk/sun/java2d/pipe/Test7027667.java similarity index 100% rename from jdk/test/sun/java2d/pipe/Test7027667.java rename to test/jdk/sun/java2d/pipe/Test7027667.java diff --git a/jdk/test/sun/java2d/pipe/Test8004821.java b/test/jdk/sun/java2d/pipe/Test8004821.java similarity index 100% rename from jdk/test/sun/java2d/pipe/Test8004821.java rename to test/jdk/sun/java2d/pipe/Test8004821.java diff --git a/jdk/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java b/test/jdk/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java similarity index 100% rename from jdk/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java rename to test/jdk/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java diff --git a/jdk/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java b/test/jdk/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java similarity index 100% rename from jdk/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java rename to test/jdk/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java diff --git a/jdk/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java b/test/jdk/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java similarity index 100% rename from jdk/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java rename to test/jdk/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java diff --git a/jdk/test/sun/java2d/pisces/OpenJDKFillBug.java b/test/jdk/sun/java2d/pisces/OpenJDKFillBug.java similarity index 100% rename from jdk/test/sun/java2d/pisces/OpenJDKFillBug.java rename to test/jdk/sun/java2d/pisces/OpenJDKFillBug.java diff --git a/jdk/test/sun/java2d/pisces/Renderer/Test7019861.java b/test/jdk/sun/java2d/pisces/Renderer/Test7019861.java similarity index 100% rename from jdk/test/sun/java2d/pisces/Renderer/Test7019861.java rename to test/jdk/sun/java2d/pisces/Renderer/Test7019861.java diff --git a/jdk/test/sun/java2d/pisces/Renderer/TestNPE.java b/test/jdk/sun/java2d/pisces/Renderer/TestNPE.java similarity index 100% rename from jdk/test/sun/java2d/pisces/Renderer/TestNPE.java rename to test/jdk/sun/java2d/pisces/Renderer/TestNPE.java diff --git a/jdk/test/sun/java2d/pisces/Test7036754.java b/test/jdk/sun/java2d/pisces/Test7036754.java similarity index 100% rename from jdk/test/sun/java2d/pisces/Test7036754.java rename to test/jdk/sun/java2d/pisces/Test7036754.java diff --git a/jdk/test/sun/java2d/xrender/HugeGradientTest.java b/test/jdk/sun/java2d/xrender/HugeGradientTest.java similarity index 100% rename from jdk/test/sun/java2d/xrender/HugeGradientTest.java rename to test/jdk/sun/java2d/xrender/HugeGradientTest.java diff --git a/jdk/test/sun/jvmstat/TEST.properties b/test/jdk/sun/jvmstat/TEST.properties similarity index 100% rename from jdk/test/sun/jvmstat/TEST.properties rename to test/jdk/sun/jvmstat/TEST.properties diff --git a/jdk/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java b/test/jdk/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java similarity index 100% rename from jdk/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java rename to test/jdk/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java diff --git a/jdk/test/sun/jvmstat/monitor/HostIdentifier/testcases b/test/jdk/sun/jvmstat/monitor/HostIdentifier/testcases similarity index 100% rename from jdk/test/sun/jvmstat/monitor/HostIdentifier/testcases rename to test/jdk/sun/jvmstat/monitor/HostIdentifier/testcases diff --git a/jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java b/test/jdk/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java similarity index 100% rename from jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java rename to test/jdk/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java diff --git a/jdk/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java b/test/jdk/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java similarity index 100% rename from jdk/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java rename to test/jdk/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java diff --git a/jdk/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java b/test/jdk/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java similarity index 100% rename from jdk/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java rename to test/jdk/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java diff --git a/jdk/test/sun/jvmstat/monitor/VmIdentifier/testcases b/test/jdk/sun/jvmstat/monitor/VmIdentifier/testcases similarity index 100% rename from jdk/test/sun/jvmstat/monitor/VmIdentifier/testcases rename to test/jdk/sun/jvmstat/monitor/VmIdentifier/testcases diff --git a/jdk/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java b/test/jdk/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java similarity index 100% rename from jdk/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java rename to test/jdk/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java diff --git a/jdk/test/sun/jvmstat/testlibrary/Sleeper.java b/test/jdk/sun/jvmstat/testlibrary/Sleeper.java similarity index 100% rename from jdk/test/sun/jvmstat/testlibrary/Sleeper.java rename to test/jdk/sun/jvmstat/testlibrary/Sleeper.java diff --git a/jdk/test/sun/jvmstat/testlibrary/utils.sh b/test/jdk/sun/jvmstat/testlibrary/utils.sh similarity index 100% rename from jdk/test/sun/jvmstat/testlibrary/utils.sh rename to test/jdk/sun/jvmstat/testlibrary/utils.sh diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/ClassToLoad0.java b/test/jdk/sun/management/HotspotClassLoadingMBean/ClassToLoad0.java similarity index 100% rename from jdk/test/sun/management/HotspotClassLoadingMBean/ClassToLoad0.java rename to test/jdk/sun/management/HotspotClassLoadingMBean/ClassToLoad0.java diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java b/test/jdk/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java similarity index 100% rename from jdk/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java rename to test/jdk/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java b/test/jdk/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java similarity index 100% rename from jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java rename to test/jdk/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java b/test/jdk/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java similarity index 100% rename from jdk/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java rename to test/jdk/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java b/test/jdk/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java similarity index 100% rename from jdk/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java rename to test/jdk/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java b/test/jdk/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java similarity index 100% rename from jdk/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java rename to test/jdk/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java b/test/jdk/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java similarity index 100% rename from jdk/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java rename to test/jdk/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java diff --git a/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java b/test/jdk/sun/management/HotspotRuntimeMBean/GetSafepointCount.java similarity index 100% rename from jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java rename to test/jdk/sun/management/HotspotRuntimeMBean/GetSafepointCount.java diff --git a/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java b/test/jdk/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java similarity index 100% rename from jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java rename to test/jdk/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java diff --git a/jdk/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java b/test/jdk/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java similarity index 100% rename from jdk/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java rename to test/jdk/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java diff --git a/jdk/test/sun/management/HotspotThreadMBean/GetInternalThreads.java b/test/jdk/sun/management/HotspotThreadMBean/GetInternalThreads.java similarity index 100% rename from jdk/test/sun/management/HotspotThreadMBean/GetInternalThreads.java rename to test/jdk/sun/management/HotspotThreadMBean/GetInternalThreads.java diff --git a/jdk/test/sun/management/LazyCompositeDataTest.java b/test/jdk/sun/management/LazyCompositeDataTest.java similarity index 100% rename from jdk/test/sun/management/LazyCompositeDataTest.java rename to test/jdk/sun/management/LazyCompositeDataTest.java diff --git a/jdk/test/sun/management/LoggingTest/LoggingTest.java b/test/jdk/sun/management/LoggingTest/LoggingTest.java similarity index 100% rename from jdk/test/sun/management/LoggingTest/LoggingTest.java rename to test/jdk/sun/management/LoggingTest/LoggingTest.java diff --git a/jdk/test/sun/management/LoggingTest/LoggingWithJULTest.java b/test/jdk/sun/management/LoggingTest/LoggingWithJULTest.java similarity index 100% rename from jdk/test/sun/management/LoggingTest/LoggingWithJULTest.java rename to test/jdk/sun/management/LoggingTest/LoggingWithJULTest.java diff --git a/jdk/test/sun/management/LoggingTest/LoggingWithLoggerFinderTest.java b/test/jdk/sun/management/LoggingTest/LoggingWithLoggerFinderTest.java similarity index 100% rename from jdk/test/sun/management/LoggingTest/LoggingWithLoggerFinderTest.java rename to test/jdk/sun/management/LoggingTest/LoggingWithLoggerFinderTest.java diff --git a/jdk/test/sun/management/LoggingTest/logging.properties b/test/jdk/sun/management/LoggingTest/logging.properties similarity index 100% rename from jdk/test/sun/management/LoggingTest/logging.properties rename to test/jdk/sun/management/LoggingTest/logging.properties diff --git a/jdk/test/sun/management/LoggingTest/test.loggerfinder/module-info.java b/test/jdk/sun/management/LoggingTest/test.loggerfinder/module-info.java similarity index 100% rename from jdk/test/sun/management/LoggingTest/test.loggerfinder/module-info.java rename to test/jdk/sun/management/LoggingTest/test.loggerfinder/module-info.java diff --git a/jdk/test/sun/management/LoggingTest/test.loggerfinder/test/loggerfinder/TestLoggerFinder.java b/test/jdk/sun/management/LoggingTest/test.loggerfinder/test/loggerfinder/TestLoggerFinder.java similarity index 100% rename from jdk/test/sun/management/LoggingTest/test.loggerfinder/test/loggerfinder/TestLoggerFinder.java rename to test/jdk/sun/management/LoggingTest/test.loggerfinder/test/loggerfinder/TestLoggerFinder.java diff --git a/jdk/test/sun/management/PlatformMBeanProviderConstructorCheck.java b/test/jdk/sun/management/PlatformMBeanProviderConstructorCheck.java similarity index 100% rename from jdk/test/sun/management/PlatformMBeanProviderConstructorCheck.java rename to test/jdk/sun/management/PlatformMBeanProviderConstructorCheck.java diff --git a/jdk/test/sun/management/StackTraceElementCompositeData/CompatibilityTest.java b/test/jdk/sun/management/StackTraceElementCompositeData/CompatibilityTest.java similarity index 100% rename from jdk/test/sun/management/StackTraceElementCompositeData/CompatibilityTest.java rename to test/jdk/sun/management/StackTraceElementCompositeData/CompatibilityTest.java diff --git a/jdk/test/sun/management/TEST.properties b/test/jdk/sun/management/TEST.properties similarity index 100% rename from jdk/test/sun/management/TEST.properties rename to test/jdk/sun/management/TEST.properties diff --git a/jdk/test/sun/management/jdp/ClientConnection.java b/test/jdk/sun/management/jdp/ClientConnection.java similarity index 100% rename from jdk/test/sun/management/jdp/ClientConnection.java rename to test/jdk/sun/management/jdp/ClientConnection.java diff --git a/jdk/test/sun/management/jdp/DynamicLauncher.java b/test/jdk/sun/management/jdp/DynamicLauncher.java similarity index 100% rename from jdk/test/sun/management/jdp/DynamicLauncher.java rename to test/jdk/sun/management/jdp/DynamicLauncher.java diff --git a/jdk/test/sun/management/jdp/JdpDefaultsTest.java b/test/jdk/sun/management/jdp/JdpDefaultsTest.java similarity index 100% rename from jdk/test/sun/management/jdp/JdpDefaultsTest.java rename to test/jdk/sun/management/jdp/JdpDefaultsTest.java diff --git a/jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java b/test/jdk/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java similarity index 100% rename from jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java rename to test/jdk/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java diff --git a/jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTestCase.java b/test/jdk/sun/management/jdp/JdpJmxRemoteDynamicPortTestCase.java similarity index 100% rename from jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTestCase.java rename to test/jdk/sun/management/jdp/JdpJmxRemoteDynamicPortTestCase.java diff --git a/jdk/test/sun/management/jdp/JdpOffTest.java b/test/jdk/sun/management/jdp/JdpOffTest.java similarity index 100% rename from jdk/test/sun/management/jdp/JdpOffTest.java rename to test/jdk/sun/management/jdp/JdpOffTest.java diff --git a/jdk/test/sun/management/jdp/JdpOffTestCase.java b/test/jdk/sun/management/jdp/JdpOffTestCase.java similarity index 100% rename from jdk/test/sun/management/jdp/JdpOffTestCase.java rename to test/jdk/sun/management/jdp/JdpOffTestCase.java diff --git a/jdk/test/sun/management/jdp/JdpOnTestCase.java b/test/jdk/sun/management/jdp/JdpOnTestCase.java similarity index 100% rename from jdk/test/sun/management/jdp/JdpOnTestCase.java rename to test/jdk/sun/management/jdp/JdpOnTestCase.java diff --git a/jdk/test/sun/management/jdp/JdpSpecificAddressTest.java b/test/jdk/sun/management/jdp/JdpSpecificAddressTest.java similarity index 100% rename from jdk/test/sun/management/jdp/JdpSpecificAddressTest.java rename to test/jdk/sun/management/jdp/JdpSpecificAddressTest.java diff --git a/jdk/test/sun/management/jdp/JdpTestCase.java b/test/jdk/sun/management/jdp/JdpTestCase.java similarity index 100% rename from jdk/test/sun/management/jdp/JdpTestCase.java rename to test/jdk/sun/management/jdp/JdpTestCase.java diff --git a/jdk/test/sun/management/jdp/JdpTestUtil.java b/test/jdk/sun/management/jdp/JdpTestUtil.java similarity index 100% rename from jdk/test/sun/management/jdp/JdpTestUtil.java rename to test/jdk/sun/management/jdp/JdpTestUtil.java diff --git a/jdk/test/sun/management/jdp/JdpTestUtilTest.java b/test/jdk/sun/management/jdp/JdpTestUtilTest.java similarity index 100% rename from jdk/test/sun/management/jdp/JdpTestUtilTest.java rename to test/jdk/sun/management/jdp/JdpTestUtilTest.java diff --git a/jdk/test/sun/management/jdp/PacketTest.java b/test/jdk/sun/management/jdp/PacketTest.java similarity index 100% rename from jdk/test/sun/management/jdp/PacketTest.java rename to test/jdk/sun/management/jdp/PacketTest.java diff --git a/jdk/test/sun/management/jdp/PortAlreadyInUseTest.java b/test/jdk/sun/management/jdp/PortAlreadyInUseTest.java similarity index 100% rename from jdk/test/sun/management/jdp/PortAlreadyInUseTest.java rename to test/jdk/sun/management/jdp/PortAlreadyInUseTest.java diff --git a/jdk/test/sun/management/jdp/README b/test/jdk/sun/management/jdp/README similarity index 100% rename from jdk/test/sun/management/jdp/README rename to test/jdk/sun/management/jdp/README diff --git a/jdk/test/sun/management/jdp/TEST.properties b/test/jdk/sun/management/jdp/TEST.properties similarity index 100% rename from jdk/test/sun/management/jdp/TEST.properties rename to test/jdk/sun/management/jdp/TEST.properties diff --git a/jdk/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java b/test/jdk/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java rename to test/jdk/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java diff --git a/jdk/test/sun/management/jmxremote/RunTest.sh b/test/jdk/sun/management/jmxremote/RunTest.sh similarity index 100% rename from jdk/test/sun/management/jmxremote/RunTest.sh rename to test/jdk/sun/management/jmxremote/RunTest.sh diff --git a/jdk/test/sun/management/jmxremote/TEST.properties b/test/jdk/sun/management/jmxremote/TEST.properties similarity index 100% rename from jdk/test/sun/management/jmxremote/TEST.properties rename to test/jdk/sun/management/jmxremote/TEST.properties diff --git a/jdk/test/sun/management/jmxremote/bootstrap/AbstractFilePermissionTest.java b/test/jdk/sun/management/jmxremote/bootstrap/AbstractFilePermissionTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/AbstractFilePermissionTest.java rename to test/jdk/sun/management/jmxremote/bootstrap/AbstractFilePermissionTest.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java b/test/jdk/sun/management/jmxremote/bootstrap/CustomLauncherTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java rename to test/jdk/sun/management/jmxremote/bootstrap/CustomLauncherTest.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/Dummy.java b/test/jdk/sun/management/jmxremote/bootstrap/Dummy.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/Dummy.java rename to test/jdk/sun/management/jmxremote/bootstrap/Dummy.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh b/test/jdk/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh rename to test/jdk/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh diff --git a/jdk/test/sun/management/jmxremote/bootstrap/JMXAgentInterfaceBinding.java b/test/jdk/sun/management/jmxremote/bootstrap/JMXAgentInterfaceBinding.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/JMXAgentInterfaceBinding.java rename to test/jdk/sun/management/jmxremote/bootstrap/JMXAgentInterfaceBinding.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java b/test/jdk/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java rename to test/jdk/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java b/test/jdk/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java rename to test/jdk/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java b/test/jdk/sun/management/jmxremote/bootstrap/LocalManagementTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java rename to test/jdk/sun/management/jmxremote/bootstrap/LocalManagementTest.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/Makefile b/test/jdk/sun/management/jmxremote/bootstrap/Makefile similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/Makefile rename to test/jdk/sun/management/jmxremote/bootstrap/Makefile diff --git a/jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java b/test/jdk/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java rename to test/jdk/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java b/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java rename to test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh b/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh rename to test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh diff --git a/jdk/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java b/test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java rename to test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTestApp.java b/test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTestApp.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTestApp.java rename to test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTestApp.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh b/test/jdk/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh rename to test/jdk/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh diff --git a/jdk/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.java b/test/jdk/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.java rename to test/jdk/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh b/test/jdk/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh rename to test/jdk/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh diff --git a/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java b/test/jdk/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java rename to test/jdk/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/TestApplication.java b/test/jdk/sun/management/jmxremote/bootstrap/TestApplication.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/TestApplication.java rename to test/jdk/sun/management/jmxremote/bootstrap/TestApplication.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/TestLogger.java b/test/jdk/sun/management/jmxremote/bootstrap/TestLogger.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/TestLogger.java rename to test/jdk/sun/management/jmxremote/bootstrap/TestLogger.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/TestManager.java b/test/jdk/sun/management/jmxremote/bootstrap/TestManager.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/TestManager.java rename to test/jdk/sun/management/jmxremote/bootstrap/TestManager.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/Utils.java b/test/jdk/sun/management/jmxremote/bootstrap/Utils.java similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/Utils.java rename to test/jdk/sun/management/jmxremote/bootstrap/Utils.java diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.access.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.access.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.access.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.access.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.password.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.password.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.password.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.password.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.access.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.access.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.access.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.access.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.password.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.password.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.password.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.password.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.ssl.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.ssl.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.ssl.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.ssl.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest11_ok.ssl.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest11_ok.ssl.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest11_ok.ssl.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest11_ok.ssl.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest12_ok.ssl.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest12_ok.ssl.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest12_ok.ssl.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest12_ok.ssl.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest13_ok.ssl.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest13_ok.ssl.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest13_ok.ssl.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest13_ok.ssl.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest14_ko.ssl.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest14_ko.ssl.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest14_ko.ssl.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_ssltest14_ko.ssl.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.access.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.access.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.access.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.access.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.password.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.password.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.password.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.password.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.access.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.access.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.access.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.access.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.password.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.password.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.password.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.password.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.access.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.access.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.access.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.access.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.password.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.password.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.password.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.password.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test06_ok.password.in b/test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test06_ok.password.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/jmxremote_test06_ok.password.in rename to test/jdk/sun/management/jmxremote/bootstrap/jmxremote_test06_ok.password.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/launcher.c b/test/jdk/sun/management/jmxremote/bootstrap/launcher.c similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/launcher.c rename to test/jdk/sun/management/jmxremote/bootstrap/launcher.c diff --git a/jdk/test/sun/management/jmxremote/bootstrap/linux-amd64/launcher b/test/jdk/sun/management/jmxremote/bootstrap/linux-amd64/launcher similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/linux-amd64/launcher rename to test/jdk/sun/management/jmxremote/bootstrap/linux-amd64/launcher diff --git a/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher b/test/jdk/sun/management/jmxremote/bootstrap/linux-i586/launcher similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher rename to test/jdk/sun/management/jmxremote/bootstrap/linux-i586/launcher diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest06_ok.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_ssltest06_ok.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_ssltest06_ok.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_ssltest06_ok.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest08_ko.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_ssltest08_ko.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_ssltest08_ko.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_ssltest08_ko.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest09_ko.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_ssltest09_ko.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_ssltest09_ko.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_ssltest09_ko.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest10_ok.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_ssltest10_ok.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_ssltest10_ok.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_ssltest10_ok.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest12_ko.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_ssltest12_ko.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_ssltest12_ko.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_ssltest12_ko.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest13_ko.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_ssltest13_ko.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_ssltest13_ko.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_ssltest13_ko.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest14_ko.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_ssltest14_ko.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_ssltest14_ko.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_ssltest14_ko.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_test01_ok.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_test01_ok.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_test01_ok.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_test01_ok.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_test02_ok.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_test02_ok.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_test02_ok.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_test02_ok.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_test03_ko.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_test03_ko.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_test03_ko.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_test03_ko.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_test04_ok.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_test04_ok.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_test04_ok.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_test04_ok.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_test05_ko.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_test05_ko.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_test05_ko.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_test05_ko.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_test06_ok.properties.in b/test/jdk/sun/management/jmxremote/bootstrap/management_test06_ok.properties.in similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/management_test06_ok.properties.in rename to test/jdk/sun/management/jmxremote/bootstrap/management_test06_ok.properties.in diff --git a/jdk/test/sun/management/jmxremote/bootstrap/rmiregistry.properties b/test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/rmiregistry.properties rename to test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties diff --git a/jdk/test/sun/management/jmxremote/bootstrap/rmiregistryssl.properties b/test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/rmiregistryssl.properties rename to test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties diff --git a/jdk/test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher b/test/jdk/sun/management/jmxremote/bootstrap/solaris-amd64/launcher similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher rename to test/jdk/sun/management/jmxremote/bootstrap/solaris-amd64/launcher diff --git a/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher b/test/jdk/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher rename to test/jdk/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher diff --git a/jdk/test/sun/management/jmxremote/bootstrap/ssl/Readme.txt b/test/jdk/sun/management/jmxremote/bootstrap/ssl/Readme.txt similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/ssl/Readme.txt rename to test/jdk/sun/management/jmxremote/bootstrap/ssl/Readme.txt diff --git a/jdk/test/sun/management/jmxremote/bootstrap/ssl/keystore b/test/jdk/sun/management/jmxremote/bootstrap/ssl/keystore similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/ssl/keystore rename to test/jdk/sun/management/jmxremote/bootstrap/ssl/keystore diff --git a/jdk/test/sun/management/jmxremote/bootstrap/ssl/truststore b/test/jdk/sun/management/jmxremote/bootstrap/ssl/truststore similarity index 100% rename from jdk/test/sun/management/jmxremote/bootstrap/ssl/truststore rename to test/jdk/sun/management/jmxremote/bootstrap/ssl/truststore diff --git a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java b/test/jdk/sun/management/jmxremote/startstop/JMXStartStopTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java rename to test/jdk/sun/management/jmxremote/startstop/JMXStartStopTest.java diff --git a/jdk/test/sun/management/jmxremote/startstop/JMXStatus1Test.java b/test/jdk/sun/management/jmxremote/startstop/JMXStatus1Test.java similarity index 100% rename from jdk/test/sun/management/jmxremote/startstop/JMXStatus1Test.java rename to test/jdk/sun/management/jmxremote/startstop/JMXStatus1Test.java diff --git a/jdk/test/sun/management/jmxremote/startstop/JMXStatus2Test.java b/test/jdk/sun/management/jmxremote/startstop/JMXStatus2Test.java similarity index 100% rename from jdk/test/sun/management/jmxremote/startstop/JMXStatus2Test.java rename to test/jdk/sun/management/jmxremote/startstop/JMXStatus2Test.java diff --git a/jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java b/test/jdk/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java rename to test/jdk/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java diff --git a/jdk/test/sun/management/jmxremote/startstop/JMXStatusTest.java b/test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java similarity index 100% rename from jdk/test/sun/management/jmxremote/startstop/JMXStatusTest.java rename to test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java diff --git a/jdk/test/sun/management/jmxremote/startstop/ManagementAgentJcmd.java b/test/jdk/sun/management/jmxremote/startstop/ManagementAgentJcmd.java similarity index 100% rename from jdk/test/sun/management/jmxremote/startstop/ManagementAgentJcmd.java rename to test/jdk/sun/management/jmxremote/startstop/ManagementAgentJcmd.java diff --git a/jdk/test/sun/management/jmxremote/startstop/PortAllocator.java b/test/jdk/sun/management/jmxremote/startstop/PortAllocator.java similarity index 100% rename from jdk/test/sun/management/jmxremote/startstop/PortAllocator.java rename to test/jdk/sun/management/jmxremote/startstop/PortAllocator.java diff --git a/jdk/test/sun/management/jmxremote/startstop/REMOTE_TESTING.txt b/test/jdk/sun/management/jmxremote/startstop/REMOTE_TESTING.txt similarity index 100% rename from jdk/test/sun/management/jmxremote/startstop/REMOTE_TESTING.txt rename to test/jdk/sun/management/jmxremote/startstop/REMOTE_TESTING.txt diff --git a/jdk/test/sun/management/jmxremote/startstop/TestApp.java b/test/jdk/sun/management/jmxremote/startstop/TestApp.java similarity index 100% rename from jdk/test/sun/management/jmxremote/startstop/TestApp.java rename to test/jdk/sun/management/jmxremote/startstop/TestApp.java diff --git a/jdk/test/sun/management/jmxremote/startstop/management_cl.properties b/test/jdk/sun/management/jmxremote/startstop/management_cl.properties similarity index 100% rename from jdk/test/sun/management/jmxremote/startstop/management_cl.properties rename to test/jdk/sun/management/jmxremote/startstop/management_cl.properties diff --git a/jdk/test/sun/management/jmxremote/startstop/management_jcmd.properties b/test/jdk/sun/management/jmxremote/startstop/management_jcmd.properties similarity index 100% rename from jdk/test/sun/management/jmxremote/startstop/management_jcmd.properties rename to test/jdk/sun/management/jmxremote/startstop/management_jcmd.properties diff --git a/jdk/test/sun/management/windows/README b/test/jdk/sun/management/windows/README similarity index 100% rename from jdk/test/sun/management/windows/README rename to test/jdk/sun/management/windows/README diff --git a/jdk/test/sun/management/windows/revokeall.c b/test/jdk/sun/management/windows/revokeall.c similarity index 100% rename from jdk/test/sun/management/windows/revokeall.c rename to test/jdk/sun/management/windows/revokeall.c diff --git a/jdk/test/sun/management/windows/revokeall.exe b/test/jdk/sun/management/windows/revokeall.exe similarity index 100% rename from jdk/test/sun/management/windows/revokeall.exe rename to test/jdk/sun/management/windows/revokeall.exe diff --git a/jdk/test/sun/misc/ClassLoaderUtil/test.jar b/test/jdk/sun/misc/ClassLoaderUtil/test.jar similarity index 100% rename from jdk/test/sun/misc/ClassLoaderUtil/test.jar rename to test/jdk/sun/misc/ClassLoaderUtil/test.jar diff --git a/jdk/test/sun/misc/CopyMemory.java b/test/jdk/sun/misc/CopyMemory.java similarity index 100% rename from jdk/test/sun/misc/CopyMemory.java rename to test/jdk/sun/misc/CopyMemory.java diff --git a/jdk/test/sun/misc/EscapePath.java b/test/jdk/sun/misc/EscapePath.java similarity index 100% rename from jdk/test/sun/misc/EscapePath.java rename to test/jdk/sun/misc/EscapePath.java diff --git a/jdk/test/sun/misc/GetSunMiscUnsafe.java b/test/jdk/sun/misc/GetSunMiscUnsafe.java similarity index 100% rename from jdk/test/sun/misc/GetSunMiscUnsafe.java rename to test/jdk/sun/misc/GetSunMiscUnsafe.java diff --git a/jdk/test/sun/misc/Hello.class b/test/jdk/sun/misc/Hello.class similarity index 100% rename from jdk/test/sun/misc/Hello.class rename to test/jdk/sun/misc/Hello.class diff --git a/jdk/test/sun/misc/InvokeCleaner.java b/test/jdk/sun/misc/InvokeCleaner.java similarity index 100% rename from jdk/test/sun/misc/InvokeCleaner.java rename to test/jdk/sun/misc/InvokeCleaner.java diff --git a/jdk/test/sun/misc/JarIndex/JarIndexMergeForClassLoaderTest.java b/test/jdk/sun/misc/JarIndex/JarIndexMergeForClassLoaderTest.java similarity index 100% rename from jdk/test/sun/misc/JarIndex/JarIndexMergeForClassLoaderTest.java rename to test/jdk/sun/misc/JarIndex/JarIndexMergeForClassLoaderTest.java diff --git a/jdk/test/sun/misc/JarIndex/JarIndexMergeTest.java b/test/jdk/sun/misc/JarIndex/JarIndexMergeTest.java similarity index 100% rename from jdk/test/sun/misc/JarIndex/JarIndexMergeTest.java rename to test/jdk/sun/misc/JarIndex/JarIndexMergeTest.java diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java b/test/jdk/sun/misc/JarIndex/metaInfFilenames/Basic.java similarity index 100% rename from jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java rename to test/jdk/sun/misc/JarIndex/metaInfFilenames/Basic.java diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/jarA/META-INF/services/my.happy.land b/test/jdk/sun/misc/JarIndex/metaInfFilenames/jarA/META-INF/services/my.happy.land similarity index 100% rename from jdk/test/sun/misc/JarIndex/metaInfFilenames/jarA/META-INF/services/my.happy.land rename to test/jdk/sun/misc/JarIndex/metaInfFilenames/jarA/META-INF/services/my.happy.land diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/jarA/a/A.java b/test/jdk/sun/misc/JarIndex/metaInfFilenames/jarA/a/A.java similarity index 100% rename from jdk/test/sun/misc/JarIndex/metaInfFilenames/jarA/a/A.java rename to test/jdk/sun/misc/JarIndex/metaInfFilenames/jarA/a/A.java diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/jarA/com/message/spi/MessageService.java b/test/jdk/sun/misc/JarIndex/metaInfFilenames/jarA/com/message/spi/MessageService.java similarity index 100% rename from jdk/test/sun/misc/JarIndex/metaInfFilenames/jarA/com/message/spi/MessageService.java rename to test/jdk/sun/misc/JarIndex/metaInfFilenames/jarA/com/message/spi/MessageService.java diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/JAVA2.DS b/test/jdk/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/JAVA2.DS similarity index 100% rename from jdk/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/JAVA2.DS rename to test/jdk/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/JAVA2.DS diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/services/no.name.service b/test/jdk/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/services/no.name.service similarity index 100% rename from jdk/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/services/no.name.service rename to test/jdk/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/services/no.name.service diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/jarB/b/B.java b/test/jdk/sun/misc/JarIndex/metaInfFilenames/jarB/b/B.java similarity index 100% rename from jdk/test/sun/misc/JarIndex/metaInfFilenames/jarB/b/B.java rename to test/jdk/sun/misc/JarIndex/metaInfFilenames/jarB/b/B.java diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts.mf b/test/jdk/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts.mf similarity index 100% rename from jdk/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts.mf rename to test/jdk/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts.mf diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/Company-corporate.ttf b/test/jdk/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/Company-corporate.ttf similarity index 100% rename from jdk/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/Company-corporate.ttf rename to test/jdk/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/Company-corporate.ttf diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/kidpr.ttf b/test/jdk/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/kidpr.ttf similarity index 100% rename from jdk/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/kidpr.ttf rename to test/jdk/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/kidpr.ttf diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/services/com.message.spi.MessageService b/test/jdk/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/services/com.message.spi.MessageService similarity index 100% rename from jdk/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/services/com.message.spi.MessageService rename to test/jdk/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/services/com.message.spi.MessageService diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/jarC/my/impl/StandardMessageService.java b/test/jdk/sun/misc/JarIndex/metaInfFilenames/jarC/my/impl/StandardMessageService.java similarity index 100% rename from jdk/test/sun/misc/JarIndex/metaInfFilenames/jarC/my/impl/StandardMessageService.java rename to test/jdk/sun/misc/JarIndex/metaInfFilenames/jarC/my/impl/StandardMessageService.java diff --git a/jdk/test/sun/misc/SunMiscSignalTest.java b/test/jdk/sun/misc/SunMiscSignalTest.java similarity index 100% rename from jdk/test/sun/misc/SunMiscSignalTest.java rename to test/jdk/sun/misc/SunMiscSignalTest.java diff --git a/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.java b/test/jdk/sun/misc/URLClassPath/ClassnameCharTest.java similarity index 100% rename from jdk/test/sun/misc/URLClassPath/ClassnameCharTest.java rename to test/jdk/sun/misc/URLClassPath/ClassnameCharTest.java diff --git a/jdk/test/sun/misc/URLClassPath/FileLoaderTest.java b/test/jdk/sun/misc/URLClassPath/FileLoaderTest.java similarity index 100% rename from jdk/test/sun/misc/URLClassPath/FileLoaderTest.java rename to test/jdk/sun/misc/URLClassPath/FileLoaderTest.java diff --git a/jdk/test/sun/misc/URLClassPath/JarLoaderTest.java b/test/jdk/sun/misc/URLClassPath/JarLoaderTest.java similarity index 100% rename from jdk/test/sun/misc/URLClassPath/JarLoaderTest.java rename to test/jdk/sun/misc/URLClassPath/JarLoaderTest.java diff --git a/jdk/test/sun/misc/URLClassPath/testclasses.jar b/test/jdk/sun/misc/URLClassPath/testclasses.jar similarity index 100% rename from jdk/test/sun/misc/URLClassPath/testclasses.jar rename to test/jdk/sun/misc/URLClassPath/testclasses.jar diff --git a/jdk/test/sun/net/InetAddress/nameservice/dns/CNameTest.java b/test/jdk/sun/net/InetAddress/nameservice/dns/CNameTest.java similarity index 100% rename from jdk/test/sun/net/InetAddress/nameservice/dns/CNameTest.java rename to test/jdk/sun/net/InetAddress/nameservice/dns/CNameTest.java diff --git a/jdk/test/sun/net/InetAddress/nameservice/dns/CanonicalName.java b/test/jdk/sun/net/InetAddress/nameservice/dns/CanonicalName.java similarity index 100% rename from jdk/test/sun/net/InetAddress/nameservice/dns/CanonicalName.java rename to test/jdk/sun/net/InetAddress/nameservice/dns/CanonicalName.java diff --git a/jdk/test/sun/net/InetAddress/nameservice/dns/Lookup.java b/test/jdk/sun/net/InetAddress/nameservice/dns/Lookup.java similarity index 100% rename from jdk/test/sun/net/InetAddress/nameservice/dns/Lookup.java rename to test/jdk/sun/net/InetAddress/nameservice/dns/Lookup.java diff --git a/jdk/test/sun/net/InetAddress/nameservice/simple/CacheTest.java b/test/jdk/sun/net/InetAddress/nameservice/simple/CacheTest.java similarity index 100% rename from jdk/test/sun/net/InetAddress/nameservice/simple/CacheTest.java rename to test/jdk/sun/net/InetAddress/nameservice/simple/CacheTest.java diff --git a/jdk/test/sun/net/InetAddress/nameservice/simple/CacheTestHosts b/test/jdk/sun/net/InetAddress/nameservice/simple/CacheTestHosts similarity index 100% rename from jdk/test/sun/net/InetAddress/nameservice/simple/CacheTestHosts rename to test/jdk/sun/net/InetAddress/nameservice/simple/CacheTestHosts diff --git a/jdk/test/sun/net/InetAddress/nameservice/simple/DefaultCaching.java b/test/jdk/sun/net/InetAddress/nameservice/simple/DefaultCaching.java similarity index 100% rename from jdk/test/sun/net/InetAddress/nameservice/simple/DefaultCaching.java rename to test/jdk/sun/net/InetAddress/nameservice/simple/DefaultCaching.java diff --git a/jdk/test/sun/net/InetAddress/nameservice/simple/DefaultCachingHosts b/test/jdk/sun/net/InetAddress/nameservice/simple/DefaultCachingHosts similarity index 100% rename from jdk/test/sun/net/InetAddress/nameservice/simple/DefaultCachingHosts rename to test/jdk/sun/net/InetAddress/nameservice/simple/DefaultCachingHosts diff --git a/jdk/test/sun/net/TelnetTest.java b/test/jdk/sun/net/TelnetTest.java similarity index 100% rename from jdk/test/sun/net/TelnetTest.java rename to test/jdk/sun/net/TelnetTest.java diff --git a/jdk/test/sun/net/ftp/B6427768.java b/test/jdk/sun/net/ftp/B6427768.java similarity index 100% rename from jdk/test/sun/net/ftp/B6427768.java rename to test/jdk/sun/net/ftp/B6427768.java diff --git a/jdk/test/sun/net/ftp/EncDec.doc b/test/jdk/sun/net/ftp/EncDec.doc similarity index 100% rename from jdk/test/sun/net/ftp/EncDec.doc rename to test/jdk/sun/net/ftp/EncDec.doc diff --git a/jdk/test/sun/net/ftp/FtpGetContent.java b/test/jdk/sun/net/ftp/FtpGetContent.java similarity index 100% rename from jdk/test/sun/net/ftp/FtpGetContent.java rename to test/jdk/sun/net/ftp/FtpGetContent.java diff --git a/jdk/test/sun/net/ftp/FtpURL.java b/test/jdk/sun/net/ftp/FtpURL.java similarity index 100% rename from jdk/test/sun/net/ftp/FtpURL.java rename to test/jdk/sun/net/ftp/FtpURL.java diff --git a/jdk/test/sun/net/ftp/FtpURLConnectionLeak.java b/test/jdk/sun/net/ftp/FtpURLConnectionLeak.java similarity index 100% rename from jdk/test/sun/net/ftp/FtpURLConnectionLeak.java rename to test/jdk/sun/net/ftp/FtpURLConnectionLeak.java diff --git a/jdk/test/sun/net/ftp/MarkResetTest.java b/test/jdk/sun/net/ftp/MarkResetTest.java similarity index 100% rename from jdk/test/sun/net/ftp/MarkResetTest.java rename to test/jdk/sun/net/ftp/MarkResetTest.java diff --git a/jdk/test/sun/net/ftp/TestFtpClientNameListWithNull.java b/test/jdk/sun/net/ftp/TestFtpClientNameListWithNull.java similarity index 100% rename from jdk/test/sun/net/ftp/TestFtpClientNameListWithNull.java rename to test/jdk/sun/net/ftp/TestFtpClientNameListWithNull.java diff --git a/jdk/test/sun/net/idn/NFS4StringPrep.java b/test/jdk/sun/net/idn/NFS4StringPrep.java similarity index 100% rename from jdk/test/sun/net/idn/NFS4StringPrep.java rename to test/jdk/sun/net/idn/NFS4StringPrep.java diff --git a/jdk/test/sun/net/idn/PunycodeTest.java b/test/jdk/sun/net/idn/PunycodeTest.java similarity index 100% rename from jdk/test/sun/net/idn/PunycodeTest.java rename to test/jdk/sun/net/idn/PunycodeTest.java diff --git a/jdk/test/sun/net/idn/TestData.java b/test/jdk/sun/net/idn/TestData.java similarity index 100% rename from jdk/test/sun/net/idn/TestData.java rename to test/jdk/sun/net/idn/TestData.java diff --git a/jdk/test/sun/net/idn/TestStringPrep.java b/test/jdk/sun/net/idn/TestStringPrep.java similarity index 100% rename from jdk/test/sun/net/idn/TestStringPrep.java rename to test/jdk/sun/net/idn/TestStringPrep.java diff --git a/jdk/test/sun/net/idn/nfscis.spp b/test/jdk/sun/net/idn/nfscis.spp similarity index 100% rename from jdk/test/sun/net/idn/nfscis.spp rename to test/jdk/sun/net/idn/nfscis.spp diff --git a/jdk/test/sun/net/idn/nfscsi.spp b/test/jdk/sun/net/idn/nfscsi.spp similarity index 100% rename from jdk/test/sun/net/idn/nfscsi.spp rename to test/jdk/sun/net/idn/nfscsi.spp diff --git a/jdk/test/sun/net/idn/nfscss.spp b/test/jdk/sun/net/idn/nfscss.spp similarity index 100% rename from jdk/test/sun/net/idn/nfscss.spp rename to test/jdk/sun/net/idn/nfscss.spp diff --git a/jdk/test/sun/net/idn/nfsmxp.spp b/test/jdk/sun/net/idn/nfsmxp.spp similarity index 100% rename from jdk/test/sun/net/idn/nfsmxp.spp rename to test/jdk/sun/net/idn/nfsmxp.spp diff --git a/jdk/test/sun/net/idn/nfsmxs.spp b/test/jdk/sun/net/idn/nfsmxs.spp similarity index 100% rename from jdk/test/sun/net/idn/nfsmxs.spp rename to test/jdk/sun/net/idn/nfsmxs.spp diff --git a/jdk/test/sun/net/sdp/ProbeIB.java b/test/jdk/sun/net/sdp/ProbeIB.java similarity index 100% rename from jdk/test/sun/net/sdp/ProbeIB.java rename to test/jdk/sun/net/sdp/ProbeIB.java diff --git a/jdk/test/sun/net/sdp/Sanity.java b/test/jdk/sun/net/sdp/Sanity.java similarity index 100% rename from jdk/test/sun/net/sdp/Sanity.java rename to test/jdk/sun/net/sdp/Sanity.java diff --git a/jdk/test/sun/net/sdp/sanity.sh b/test/jdk/sun/net/sdp/sanity.sh similarity index 100% rename from jdk/test/sun/net/sdp/sanity.sh rename to test/jdk/sun/net/sdp/sanity.sh diff --git a/jdk/test/sun/net/util/IPAddressUtilTest.java b/test/jdk/sun/net/util/IPAddressUtilTest.java similarity index 100% rename from jdk/test/sun/net/util/IPAddressUtilTest.java rename to test/jdk/sun/net/util/IPAddressUtilTest.java diff --git a/jdk/test/sun/net/www/AuthHeaderTest.java b/test/jdk/sun/net/www/AuthHeaderTest.java similarity index 100% rename from jdk/test/sun/net/www/AuthHeaderTest.java rename to test/jdk/sun/net/www/AuthHeaderTest.java diff --git a/jdk/test/sun/net/www/EmbeddedEquals.java b/test/jdk/sun/net/www/EmbeddedEquals.java similarity index 100% rename from jdk/test/sun/net/www/EmbeddedEquals.java rename to test/jdk/sun/net/www/EmbeddedEquals.java diff --git a/jdk/test/sun/net/www/HeaderTests.java b/test/jdk/sun/net/www/HeaderTests.java similarity index 100% rename from jdk/test/sun/net/www/HeaderTests.java rename to test/jdk/sun/net/www/HeaderTests.java diff --git a/jdk/test/sun/net/www/MessageHeaderTest.java b/test/jdk/sun/net/www/MessageHeaderTest.java similarity index 100% rename from jdk/test/sun/net/www/MessageHeaderTest.java rename to test/jdk/sun/net/www/MessageHeaderTest.java diff --git a/jdk/test/sun/net/www/ParseUtil_4922813.java b/test/jdk/sun/net/www/ParseUtil_4922813.java similarity index 100% rename from jdk/test/sun/net/www/ParseUtil_4922813.java rename to test/jdk/sun/net/www/ParseUtil_4922813.java diff --git a/jdk/test/sun/net/www/ParseUtil_6274990.java b/test/jdk/sun/net/www/ParseUtil_6274990.java similarity index 100% rename from jdk/test/sun/net/www/ParseUtil_6274990.java rename to test/jdk/sun/net/www/ParseUtil_6274990.java diff --git a/jdk/test/sun/net/www/ParseUtil_6306697.java b/test/jdk/sun/net/www/ParseUtil_6306697.java similarity index 100% rename from jdk/test/sun/net/www/ParseUtil_6306697.java rename to test/jdk/sun/net/www/ParseUtil_6306697.java diff --git a/jdk/test/sun/net/www/ParseUtil_6380332.java b/test/jdk/sun/net/www/ParseUtil_6380332.java similarity index 100% rename from jdk/test/sun/net/www/ParseUtil_6380332.java rename to test/jdk/sun/net/www/ParseUtil_6380332.java diff --git a/jdk/test/sun/net/www/ParseUtil_6478588.java b/test/jdk/sun/net/www/ParseUtil_6478588.java similarity index 100% rename from jdk/test/sun/net/www/ParseUtil_6478588.java rename to test/jdk/sun/net/www/ParseUtil_6478588.java diff --git a/jdk/test/sun/net/www/ftptest/FtpAuthHandler.java b/test/jdk/sun/net/www/ftptest/FtpAuthHandler.java similarity index 100% rename from jdk/test/sun/net/www/ftptest/FtpAuthHandler.java rename to test/jdk/sun/net/www/ftptest/FtpAuthHandler.java diff --git a/jdk/test/sun/net/www/ftptest/FtpCommandHandler.java b/test/jdk/sun/net/www/ftptest/FtpCommandHandler.java similarity index 100% rename from jdk/test/sun/net/www/ftptest/FtpCommandHandler.java rename to test/jdk/sun/net/www/ftptest/FtpCommandHandler.java diff --git a/jdk/test/sun/net/www/ftptest/FtpFileSystemHandler.java b/test/jdk/sun/net/www/ftptest/FtpFileSystemHandler.java similarity index 100% rename from jdk/test/sun/net/www/ftptest/FtpFileSystemHandler.java rename to test/jdk/sun/net/www/ftptest/FtpFileSystemHandler.java diff --git a/jdk/test/sun/net/www/ftptest/FtpServer.java b/test/jdk/sun/net/www/ftptest/FtpServer.java similarity index 100% rename from jdk/test/sun/net/www/ftptest/FtpServer.java rename to test/jdk/sun/net/www/ftptest/FtpServer.java diff --git a/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java b/test/jdk/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java similarity index 100% rename from jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java rename to test/jdk/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java diff --git a/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java b/test/jdk/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java similarity index 100% rename from jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java rename to test/jdk/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java diff --git a/jdk/test/sun/net/www/http/ChunkedInputStream/TestAvailable.java b/test/jdk/sun/net/www/http/ChunkedInputStream/TestAvailable.java similarity index 100% rename from jdk/test/sun/net/www/http/ChunkedInputStream/TestAvailable.java rename to test/jdk/sun/net/www/http/ChunkedInputStream/TestAvailable.java diff --git a/jdk/test/sun/net/www/http/ChunkedOutputStream/CheckError.java b/test/jdk/sun/net/www/http/ChunkedOutputStream/CheckError.java similarity index 100% rename from jdk/test/sun/net/www/http/ChunkedOutputStream/CheckError.java rename to test/jdk/sun/net/www/http/ChunkedOutputStream/CheckError.java diff --git a/jdk/test/sun/net/www/http/ChunkedOutputStream/Test.java b/test/jdk/sun/net/www/http/ChunkedOutputStream/Test.java similarity index 100% rename from jdk/test/sun/net/www/http/ChunkedOutputStream/Test.java rename to test/jdk/sun/net/www/http/ChunkedOutputStream/Test.java diff --git a/jdk/test/sun/net/www/http/HttpClient/B6726695.java b/test/jdk/sun/net/www/http/HttpClient/B6726695.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/B6726695.java rename to test/jdk/sun/net/www/http/HttpClient/B6726695.java diff --git a/jdk/test/sun/net/www/http/HttpClient/B7025238.java b/test/jdk/sun/net/www/http/HttpClient/B7025238.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/B7025238.java rename to test/jdk/sun/net/www/http/HttpClient/B7025238.java diff --git a/jdk/test/sun/net/www/http/HttpClient/B8025710.java b/test/jdk/sun/net/www/http/HttpClient/B8025710.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/B8025710.java rename to test/jdk/sun/net/www/http/HttpClient/B8025710.java diff --git a/jdk/test/sun/net/www/http/HttpClient/CookieHttpClientTest.java b/test/jdk/sun/net/www/http/HttpClient/CookieHttpClientTest.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/CookieHttpClientTest.java rename to test/jdk/sun/net/www/http/HttpClient/CookieHttpClientTest.java diff --git a/jdk/test/sun/net/www/http/HttpClient/GetProxyPort.java b/test/jdk/sun/net/www/http/HttpClient/GetProxyPort.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/GetProxyPort.java rename to test/jdk/sun/net/www/http/HttpClient/GetProxyPort.java diff --git a/jdk/test/sun/net/www/http/HttpClient/ImplicitFileName.java b/test/jdk/sun/net/www/http/HttpClient/ImplicitFileName.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/ImplicitFileName.java rename to test/jdk/sun/net/www/http/HttpClient/ImplicitFileName.java diff --git a/jdk/test/sun/net/www/http/HttpClient/IsAvailable.java b/test/jdk/sun/net/www/http/HttpClient/IsAvailable.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/IsAvailable.java rename to test/jdk/sun/net/www/http/HttpClient/IsAvailable.java diff --git a/jdk/test/sun/net/www/http/HttpClient/IsKeepingAlive.java b/test/jdk/sun/net/www/http/HttpClient/IsKeepingAlive.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/IsKeepingAlive.java rename to test/jdk/sun/net/www/http/HttpClient/IsKeepingAlive.java diff --git a/jdk/test/sun/net/www/http/HttpClient/IsKeepingAlive.policy b/test/jdk/sun/net/www/http/HttpClient/IsKeepingAlive.policy similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/IsKeepingAlive.policy rename to test/jdk/sun/net/www/http/HttpClient/IsKeepingAlive.policy diff --git a/jdk/test/sun/net/www/http/HttpClient/MultiThreadTest.java b/test/jdk/sun/net/www/http/HttpClient/MultiThreadTest.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/MultiThreadTest.java rename to test/jdk/sun/net/www/http/HttpClient/MultiThreadTest.java diff --git a/jdk/test/sun/net/www/http/HttpClient/OpenServer.java b/test/jdk/sun/net/www/http/HttpClient/OpenServer.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/OpenServer.java rename to test/jdk/sun/net/www/http/HttpClient/OpenServer.java diff --git a/jdk/test/sun/net/www/http/HttpClient/OpenServer.policy b/test/jdk/sun/net/www/http/HttpClient/OpenServer.policy similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/OpenServer.policy rename to test/jdk/sun/net/www/http/HttpClient/OpenServer.policy diff --git a/jdk/test/sun/net/www/http/HttpClient/ProxyFromCache.java b/test/jdk/sun/net/www/http/HttpClient/ProxyFromCache.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/ProxyFromCache.java rename to test/jdk/sun/net/www/http/HttpClient/ProxyFromCache.java diff --git a/jdk/test/sun/net/www/http/HttpClient/ProxyTest.java b/test/jdk/sun/net/www/http/HttpClient/ProxyTest.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/ProxyTest.java rename to test/jdk/sun/net/www/http/HttpClient/ProxyTest.java diff --git a/jdk/test/sun/net/www/http/HttpClient/RequestURI.java b/test/jdk/sun/net/www/http/HttpClient/RequestURI.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/RequestURI.java rename to test/jdk/sun/net/www/http/HttpClient/RequestURI.java diff --git a/jdk/test/sun/net/www/http/HttpClient/RetryPost.java b/test/jdk/sun/net/www/http/HttpClient/RetryPost.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/RetryPost.java rename to test/jdk/sun/net/www/http/HttpClient/RetryPost.java diff --git a/jdk/test/sun/net/www/http/HttpClient/StreamingRetry.java b/test/jdk/sun/net/www/http/HttpClient/StreamingRetry.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpClient/StreamingRetry.java rename to test/jdk/sun/net/www/http/HttpClient/StreamingRetry.java diff --git a/jdk/test/sun/net/www/http/HttpURLConnection/DigestAuth.java b/test/jdk/sun/net/www/http/HttpURLConnection/DigestAuth.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpURLConnection/DigestAuth.java rename to test/jdk/sun/net/www/http/HttpURLConnection/DigestAuth.java diff --git a/jdk/test/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.java b/test/jdk/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.java rename to test/jdk/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.java diff --git a/jdk/test/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.policy b/test/jdk/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.policy similarity index 100% rename from jdk/test/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.policy rename to test/jdk/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.policy diff --git a/jdk/test/sun/net/www/http/HttpURLConnection/PostOnDelete.java b/test/jdk/sun/net/www/http/HttpURLConnection/PostOnDelete.java similarity index 100% rename from jdk/test/sun/net/www/http/HttpURLConnection/PostOnDelete.java rename to test/jdk/sun/net/www/http/HttpURLConnection/PostOnDelete.java diff --git a/jdk/test/sun/net/www/http/KeepAliveCache/B5045306.java b/test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java similarity index 100% rename from jdk/test/sun/net/www/http/KeepAliveCache/B5045306.java rename to test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java diff --git a/jdk/test/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java b/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java similarity index 100% rename from jdk/test/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java rename to test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java diff --git a/jdk/test/sun/net/www/http/KeepAliveStream/InfiniteLoop.java b/test/jdk/sun/net/www/http/KeepAliveStream/InfiniteLoop.java similarity index 100% rename from jdk/test/sun/net/www/http/KeepAliveStream/InfiniteLoop.java rename to test/jdk/sun/net/www/http/KeepAliveStream/InfiniteLoop.java diff --git a/jdk/test/sun/net/www/http/KeepAliveStream/KeepAliveStreamClose.java b/test/jdk/sun/net/www/http/KeepAliveStream/KeepAliveStreamClose.java similarity index 100% rename from jdk/test/sun/net/www/http/KeepAliveStream/KeepAliveStreamClose.java rename to test/jdk/sun/net/www/http/KeepAliveStream/KeepAliveStreamClose.java diff --git a/jdk/test/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java b/test/jdk/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java similarity index 100% rename from jdk/test/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java rename to test/jdk/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java diff --git a/jdk/test/sun/net/www/httptest/AbstractCallback.java b/test/jdk/sun/net/www/httptest/AbstractCallback.java similarity index 100% rename from jdk/test/sun/net/www/httptest/AbstractCallback.java rename to test/jdk/sun/net/www/httptest/AbstractCallback.java diff --git a/jdk/test/sun/net/www/httptest/ClosedChannelList.java b/test/jdk/sun/net/www/httptest/ClosedChannelList.java similarity index 100% rename from jdk/test/sun/net/www/httptest/ClosedChannelList.java rename to test/jdk/sun/net/www/httptest/ClosedChannelList.java diff --git a/jdk/test/sun/net/www/httptest/HttpCallback.java b/test/jdk/sun/net/www/httptest/HttpCallback.java similarity index 100% rename from jdk/test/sun/net/www/httptest/HttpCallback.java rename to test/jdk/sun/net/www/httptest/HttpCallback.java diff --git a/jdk/test/sun/net/www/httptest/HttpTransaction.java b/test/jdk/sun/net/www/httptest/HttpTransaction.java similarity index 100% rename from jdk/test/sun/net/www/httptest/HttpTransaction.java rename to test/jdk/sun/net/www/httptest/HttpTransaction.java diff --git a/jdk/test/sun/net/www/httptest/TestHttpServer.java b/test/jdk/sun/net/www/httptest/TestHttpServer.java similarity index 100% rename from jdk/test/sun/net/www/httptest/TestHttpServer.java rename to test/jdk/sun/net/www/httptest/TestHttpServer.java diff --git a/jdk/test/sun/net/www/protocol/file/DirPermissionDenied.java b/test/jdk/sun/net/www/protocol/file/DirPermissionDenied.java similarity index 100% rename from jdk/test/sun/net/www/protocol/file/DirPermissionDenied.java rename to test/jdk/sun/net/www/protocol/file/DirPermissionDenied.java diff --git a/jdk/test/sun/net/www/protocol/file/EncodedMultiByteChar.java b/test/jdk/sun/net/www/protocol/file/EncodedMultiByteChar.java similarity index 100% rename from jdk/test/sun/net/www/protocol/file/EncodedMultiByteChar.java rename to test/jdk/sun/net/www/protocol/file/EncodedMultiByteChar.java diff --git a/jdk/test/sun/net/www/protocol/file/Equals.java b/test/jdk/sun/net/www/protocol/file/Equals.java similarity index 100% rename from jdk/test/sun/net/www/protocol/file/Equals.java rename to test/jdk/sun/net/www/protocol/file/Equals.java diff --git a/jdk/test/sun/net/www/protocol/file/FileMap.java b/test/jdk/sun/net/www/protocol/file/FileMap.java similarity index 100% rename from jdk/test/sun/net/www/protocol/file/FileMap.java rename to test/jdk/sun/net/www/protocol/file/FileMap.java diff --git a/jdk/test/sun/net/www/protocol/file/FileURLTest.java b/test/jdk/sun/net/www/protocol/file/FileURLTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/file/FileURLTest.java rename to test/jdk/sun/net/www/protocol/file/FileURLTest.java diff --git a/jdk/test/sun/net/www/protocol/file/GetContentLength.java b/test/jdk/sun/net/www/protocol/file/GetContentLength.java similarity index 100% rename from jdk/test/sun/net/www/protocol/file/GetContentLength.java rename to test/jdk/sun/net/www/protocol/file/GetContentLength.java diff --git a/jdk/test/sun/net/www/protocol/file/GetContentType.java b/test/jdk/sun/net/www/protocol/file/GetContentType.java similarity index 100% rename from jdk/test/sun/net/www/protocol/file/GetContentType.java rename to test/jdk/sun/net/www/protocol/file/GetContentType.java diff --git a/jdk/test/sun/net/www/protocol/file/GetLastModified.java b/test/jdk/sun/net/www/protocol/file/GetLastModified.java similarity index 100% rename from jdk/test/sun/net/www/protocol/file/GetLastModified.java rename to test/jdk/sun/net/www/protocol/file/GetLastModified.java diff --git a/jdk/test/sun/net/www/protocol/file/NonUTF8EncodedChar.java b/test/jdk/sun/net/www/protocol/file/NonUTF8EncodedChar.java similarity index 100% rename from jdk/test/sun/net/www/protocol/file/NonUTF8EncodedChar.java rename to test/jdk/sun/net/www/protocol/file/NonUTF8EncodedChar.java diff --git a/jdk/test/sun/net/www/protocol/ftp/HandlerEquals.java b/test/jdk/sun/net/www/protocol/ftp/HandlerEquals.java similarity index 100% rename from jdk/test/sun/net/www/protocol/ftp/HandlerEquals.java rename to test/jdk/sun/net/www/protocol/ftp/HandlerEquals.java diff --git a/jdk/test/sun/net/www/protocol/ftp/UserAndPasswordTest.java b/test/jdk/sun/net/www/protocol/ftp/UserAndPasswordTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/ftp/UserAndPasswordTest.java rename to test/jdk/sun/net/www/protocol/ftp/UserAndPasswordTest.java diff --git a/jdk/test/sun/net/www/protocol/http/6550798/TestCache.java b/test/jdk/sun/net/www/protocol/http/6550798/TestCache.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/6550798/TestCache.java rename to test/jdk/sun/net/www/protocol/http/6550798/TestCache.java diff --git a/jdk/test/sun/net/www/protocol/http/6550798/test.java b/test/jdk/sun/net/www/protocol/http/6550798/test.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/6550798/test.java rename to test/jdk/sun/net/www/protocol/http/6550798/test.java diff --git a/jdk/test/sun/net/www/protocol/http/AsyncDisconnect.java b/test/jdk/sun/net/www/protocol/http/AsyncDisconnect.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/AsyncDisconnect.java rename to test/jdk/sun/net/www/protocol/http/AsyncDisconnect.java diff --git a/jdk/test/sun/net/www/protocol/http/B5017051.java b/test/jdk/sun/net/www/protocol/http/B5017051.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/B5017051.java rename to test/jdk/sun/net/www/protocol/http/B5017051.java diff --git a/jdk/test/sun/net/www/protocol/http/B6296310.java b/test/jdk/sun/net/www/protocol/http/B6296310.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/B6296310.java rename to test/jdk/sun/net/www/protocol/http/B6296310.java diff --git a/jdk/test/sun/net/www/protocol/http/B6299712.java b/test/jdk/sun/net/www/protocol/http/B6299712.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/B6299712.java rename to test/jdk/sun/net/www/protocol/http/B6299712.java diff --git a/jdk/test/sun/net/www/protocol/http/B6369510.java b/test/jdk/sun/net/www/protocol/http/B6369510.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/B6369510.java rename to test/jdk/sun/net/www/protocol/http/B6369510.java diff --git a/jdk/test/sun/net/www/protocol/http/B6518816.java b/test/jdk/sun/net/www/protocol/http/B6518816.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/B6518816.java rename to test/jdk/sun/net/www/protocol/http/B6518816.java diff --git a/jdk/test/sun/net/www/protocol/http/B6641309.java b/test/jdk/sun/net/www/protocol/http/B6641309.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/B6641309.java rename to test/jdk/sun/net/www/protocol/http/B6641309.java diff --git a/jdk/test/sun/net/www/protocol/http/B6660405.java b/test/jdk/sun/net/www/protocol/http/B6660405.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/B6660405.java rename to test/jdk/sun/net/www/protocol/http/B6660405.java diff --git a/jdk/test/sun/net/www/protocol/http/B6890349.java b/test/jdk/sun/net/www/protocol/http/B6890349.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/B6890349.java rename to test/jdk/sun/net/www/protocol/http/B6890349.java diff --git a/jdk/test/sun/net/www/protocol/http/B8012625.java b/test/jdk/sun/net/www/protocol/http/B8012625.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/B8012625.java rename to test/jdk/sun/net/www/protocol/http/B8012625.java diff --git a/jdk/test/sun/net/www/protocol/http/BasicLongCredentials.java b/test/jdk/sun/net/www/protocol/http/BasicLongCredentials.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/BasicLongCredentials.java rename to test/jdk/sun/net/www/protocol/http/BasicLongCredentials.java diff --git a/jdk/test/sun/net/www/protocol/http/ChunkedErrorStream.java b/test/jdk/sun/net/www/protocol/http/ChunkedErrorStream.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/ChunkedErrorStream.java rename to test/jdk/sun/net/www/protocol/http/ChunkedErrorStream.java diff --git a/jdk/test/sun/net/www/protocol/http/CloseOptionHeader.java b/test/jdk/sun/net/www/protocol/http/CloseOptionHeader.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/CloseOptionHeader.java rename to test/jdk/sun/net/www/protocol/http/CloseOptionHeader.java diff --git a/jdk/test/sun/net/www/protocol/http/DigestTest.java b/test/jdk/sun/net/www/protocol/http/DigestTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/DigestTest.java rename to test/jdk/sun/net/www/protocol/http/DigestTest.java diff --git a/jdk/test/sun/net/www/protocol/http/Finalizer.java b/test/jdk/sun/net/www/protocol/http/Finalizer.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/Finalizer.java rename to test/jdk/sun/net/www/protocol/http/Finalizer.java diff --git a/jdk/test/sun/net/www/protocol/http/GetOutputStream.java b/test/jdk/sun/net/www/protocol/http/GetOutputStream.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/GetOutputStream.java rename to test/jdk/sun/net/www/protocol/http/GetOutputStream.java diff --git a/jdk/test/sun/net/www/protocol/http/HttpInputStream.java b/test/jdk/sun/net/www/protocol/http/HttpInputStream.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/HttpInputStream.java rename to test/jdk/sun/net/www/protocol/http/HttpInputStream.java diff --git a/jdk/test/sun/net/www/protocol/http/HttpOnly.java b/test/jdk/sun/net/www/protocol/http/HttpOnly.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/HttpOnly.java rename to test/jdk/sun/net/www/protocol/http/HttpOnly.java diff --git a/jdk/test/sun/net/www/protocol/http/HttpStreams.java b/test/jdk/sun/net/www/protocol/http/HttpStreams.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/HttpStreams.java rename to test/jdk/sun/net/www/protocol/http/HttpStreams.java diff --git a/jdk/test/sun/net/www/protocol/http/Modified.java b/test/jdk/sun/net/www/protocol/http/Modified.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/Modified.java rename to test/jdk/sun/net/www/protocol/http/Modified.java diff --git a/jdk/test/sun/net/www/protocol/http/NTLMTest.java b/test/jdk/sun/net/www/protocol/http/NTLMTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/NTLMTest.java rename to test/jdk/sun/net/www/protocol/http/NTLMTest.java diff --git a/jdk/test/sun/net/www/protocol/http/NULLTargetInfoTest.java b/test/jdk/sun/net/www/protocol/http/NULLTargetInfoTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/NULLTargetInfoTest.java rename to test/jdk/sun/net/www/protocol/http/NULLTargetInfoTest.java diff --git a/jdk/test/sun/net/www/protocol/http/NoCache.java b/test/jdk/sun/net/www/protocol/http/NoCache.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/NoCache.java rename to test/jdk/sun/net/www/protocol/http/NoCache.java diff --git a/jdk/test/sun/net/www/protocol/http/NoNTLM.java b/test/jdk/sun/net/www/protocol/http/NoNTLM.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/NoNTLM.java rename to test/jdk/sun/net/www/protocol/http/NoNTLM.java diff --git a/jdk/test/sun/net/www/protocol/http/ProtocolRedirect.java b/test/jdk/sun/net/www/protocol/http/ProtocolRedirect.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/ProtocolRedirect.java rename to test/jdk/sun/net/www/protocol/http/ProtocolRedirect.java diff --git a/jdk/test/sun/net/www/protocol/http/ProxyTunnelServer.java b/test/jdk/sun/net/www/protocol/http/ProxyTunnelServer.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/ProxyTunnelServer.java rename to test/jdk/sun/net/www/protocol/http/ProxyTunnelServer.java diff --git a/jdk/test/sun/net/www/protocol/http/RedirectOnPost.java b/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/RedirectOnPost.java rename to test/jdk/sun/net/www/protocol/http/RedirectOnPost.java diff --git a/jdk/test/sun/net/www/protocol/http/RelativeRedirect.java b/test/jdk/sun/net/www/protocol/http/RelativeRedirect.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/RelativeRedirect.java rename to test/jdk/sun/net/www/protocol/http/RelativeRedirect.java diff --git a/jdk/test/sun/net/www/protocol/http/ResponseCacheStream.java b/test/jdk/sun/net/www/protocol/http/ResponseCacheStream.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/ResponseCacheStream.java rename to test/jdk/sun/net/www/protocol/http/ResponseCacheStream.java diff --git a/jdk/test/sun/net/www/protocol/http/RetryUponTimeout.java b/test/jdk/sun/net/www/protocol/http/RetryUponTimeout.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/RetryUponTimeout.java rename to test/jdk/sun/net/www/protocol/http/RetryUponTimeout.java diff --git a/jdk/test/sun/net/www/protocol/http/SetChunkedStreamingMode.java b/test/jdk/sun/net/www/protocol/http/SetChunkedStreamingMode.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/SetChunkedStreamingMode.java rename to test/jdk/sun/net/www/protocol/http/SetChunkedStreamingMode.java diff --git a/jdk/test/sun/net/www/protocol/http/SetIfModifiedSince.java b/test/jdk/sun/net/www/protocol/http/SetIfModifiedSince.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/SetIfModifiedSince.java rename to test/jdk/sun/net/www/protocol/http/SetIfModifiedSince.java diff --git a/jdk/test/sun/net/www/protocol/http/StackTraceTest.java b/test/jdk/sun/net/www/protocol/http/StackTraceTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/StackTraceTest.java rename to test/jdk/sun/net/www/protocol/http/StackTraceTest.java diff --git a/jdk/test/sun/net/www/protocol/http/StreamingOutputStream.java b/test/jdk/sun/net/www/protocol/http/StreamingOutputStream.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/StreamingOutputStream.java rename to test/jdk/sun/net/www/protocol/http/StreamingOutputStream.java diff --git a/jdk/test/sun/net/www/protocol/http/TunnelThroughProxy.java b/test/jdk/sun/net/www/protocol/http/TunnelThroughProxy.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/TunnelThroughProxy.java rename to test/jdk/sun/net/www/protocol/http/TunnelThroughProxy.java diff --git a/jdk/test/sun/net/www/protocol/http/UserAgent.java b/test/jdk/sun/net/www/protocol/http/UserAgent.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/UserAgent.java rename to test/jdk/sun/net/www/protocol/http/UserAgent.java diff --git a/jdk/test/sun/net/www/protocol/http/UserAuth.java b/test/jdk/sun/net/www/protocol/http/UserAuth.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/UserAuth.java rename to test/jdk/sun/net/www/protocol/http/UserAuth.java diff --git a/jdk/test/sun/net/www/protocol/http/UserCookie.java b/test/jdk/sun/net/www/protocol/http/UserCookie.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/UserCookie.java rename to test/jdk/sun/net/www/protocol/http/UserCookie.java diff --git a/jdk/test/sun/net/www/protocol/http/WebGet.java b/test/jdk/sun/net/www/protocol/http/WebGet.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/WebGet.java rename to test/jdk/sun/net/www/protocol/http/WebGet.java diff --git a/jdk/test/sun/net/www/protocol/http/ZoneId.java b/test/jdk/sun/net/www/protocol/http/ZoneId.java similarity index 100% rename from jdk/test/sun/net/www/protocol/http/ZoneId.java rename to test/jdk/sun/net/www/protocol/http/ZoneId.java diff --git a/jdk/test/sun/net/www/protocol/http/spnegoLog.properties b/test/jdk/sun/net/www/protocol/http/spnegoLog.properties similarity index 100% rename from jdk/test/sun/net/www/protocol/http/spnegoLog.properties rename to test/jdk/sun/net/www/protocol/http/spnegoLog.properties diff --git a/jdk/test/sun/net/www/protocol/http/spnegoLogin.conf b/test/jdk/sun/net/www/protocol/http/spnegoLogin.conf similarity index 100% rename from jdk/test/sun/net/www/protocol/http/spnegoLogin.conf rename to test/jdk/sun/net/www/protocol/http/spnegoLogin.conf diff --git a/jdk/test/sun/net/www/protocol/http/spnegoReadme b/test/jdk/sun/net/www/protocol/http/spnegoReadme similarity index 100% rename from jdk/test/sun/net/www/protocol/http/spnegoReadme rename to test/jdk/sun/net/www/protocol/http/spnegoReadme diff --git a/jdk/test/sun/net/www/protocol/http/spnegoTest b/test/jdk/sun/net/www/protocol/http/spnegoTest similarity index 100% rename from jdk/test/sun/net/www/protocol/http/spnegoTest rename to test/jdk/sun/net/www/protocol/http/spnegoTest diff --git a/jdk/test/sun/net/www/protocol/https/AbstractCallback.java b/test/jdk/sun/net/www/protocol/https/AbstractCallback.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/AbstractCallback.java rename to test/jdk/sun/net/www/protocol/https/AbstractCallback.java diff --git a/jdk/test/sun/net/www/protocol/https/ChunkedOutputStream.java b/test/jdk/sun/net/www/protocol/https/ChunkedOutputStream.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/ChunkedOutputStream.java rename to test/jdk/sun/net/www/protocol/https/ChunkedOutputStream.java diff --git a/jdk/test/sun/net/www/protocol/https/ClosedChannelList.java b/test/jdk/sun/net/www/protocol/https/ClosedChannelList.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/ClosedChannelList.java rename to test/jdk/sun/net/www/protocol/https/ClosedChannelList.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpCallback.java b/test/jdk/sun/net/www/protocol/https/HttpCallback.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpCallback.java rename to test/jdk/sun/net/www/protocol/https/HttpCallback.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpTransaction.java b/test/jdk/sun/net/www/protocol/https/HttpTransaction.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpTransaction.java rename to test/jdk/sun/net/www/protocol/https/HttpTransaction.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsClient/MyKeyManager.java b/test/jdk/sun/net/www/protocol/https/HttpsClient/MyKeyManager.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsClient/MyKeyManager.java rename to test/jdk/sun/net/www/protocol/https/HttpsClient/MyKeyManager.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java b/test/jdk/sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java rename to test/jdk/sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyTunnelServer.java b/test/jdk/sun/net/www/protocol/https/HttpsClient/ProxyTunnelServer.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyTunnelServer.java rename to test/jdk/sun/net/www/protocol/https/HttpsClient/ProxyTunnelServer.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java b/test/jdk/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java rename to test/jdk/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsClient/dnsstore b/test/jdk/sun/net/www/protocol/https/HttpsClient/dnsstore similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsClient/dnsstore rename to test/jdk/sun/net/www/protocol/https/HttpsClient/dnsstore diff --git a/jdk/test/sun/net/www/protocol/https/HttpsClient/ipstore b/test/jdk/sun/net/www/protocol/https/HttpsClient/ipstore similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsClient/ipstore rename to test/jdk/sun/net/www/protocol/https/HttpsClient/ipstore diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Identities.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/Identities.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Identities.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/Identities.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/TunnelProxy.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/TunnelProxy.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/HttpsURLConnection/TunnelProxy.java rename to test/jdk/sun/net/www/protocol/https/HttpsURLConnection/TunnelProxy.java diff --git a/jdk/test/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java b/test/jdk/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java rename to test/jdk/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java diff --git a/jdk/test/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java b/test/jdk/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java rename to test/jdk/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java diff --git a/jdk/test/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java b/test/jdk/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java rename to test/jdk/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java diff --git a/jdk/test/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java b/test/jdk/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java rename to test/jdk/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java diff --git a/jdk/test/sun/net/www/protocol/https/TestHttpsServer.java b/test/jdk/sun/net/www/protocol/https/TestHttpsServer.java similarity index 100% rename from jdk/test/sun/net/www/protocol/https/TestHttpsServer.java rename to test/jdk/sun/net/www/protocol/https/TestHttpsServer.java diff --git a/jdk/test/sun/net/www/protocol/jar/B4756443.java b/test/jdk/sun/net/www/protocol/jar/B4756443.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/B4756443.java rename to test/jdk/sun/net/www/protocol/jar/B4756443.java diff --git a/jdk/test/sun/net/www/protocol/jar/B4957695.java b/test/jdk/sun/net/www/protocol/jar/B4957695.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/B4957695.java rename to test/jdk/sun/net/www/protocol/jar/B4957695.java diff --git a/jdk/test/sun/net/www/protocol/jar/B5105410.java b/test/jdk/sun/net/www/protocol/jar/B5105410.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/B5105410.java rename to test/jdk/sun/net/www/protocol/jar/B5105410.java diff --git a/jdk/test/sun/net/www/protocol/jar/B6449504.java b/test/jdk/sun/net/www/protocol/jar/B6449504.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/B6449504.java rename to test/jdk/sun/net/www/protocol/jar/B6449504.java diff --git a/jdk/test/sun/net/www/protocol/jar/GetContentType.java b/test/jdk/sun/net/www/protocol/jar/GetContentType.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/GetContentType.java rename to test/jdk/sun/net/www/protocol/jar/GetContentType.java diff --git a/jdk/test/sun/net/www/protocol/jar/GetContentTypeTest.java b/test/jdk/sun/net/www/protocol/jar/GetContentTypeTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/GetContentTypeTest.java rename to test/jdk/sun/net/www/protocol/jar/GetContentTypeTest.java diff --git a/jdk/test/sun/net/www/protocol/jar/JarURLConnectionUseCaches.java b/test/jdk/sun/net/www/protocol/jar/JarURLConnectionUseCaches.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/JarURLConnectionUseCaches.java rename to test/jdk/sun/net/www/protocol/jar/JarURLConnectionUseCaches.java diff --git a/jdk/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java b/test/jdk/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java rename to test/jdk/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java diff --git a/jdk/test/sun/net/www/protocol/jar/bar.jar b/test/jdk/sun/net/www/protocol/jar/bar.jar similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/bar.jar rename to test/jdk/sun/net/www/protocol/jar/bar.jar diff --git a/jdk/test/sun/net/www/protocol/jar/foo.jar b/test/jdk/sun/net/www/protocol/jar/foo.jar similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/foo.jar rename to test/jdk/sun/net/www/protocol/jar/foo.jar diff --git a/jdk/test/sun/net/www/protocol/jar/foo1.jar b/test/jdk/sun/net/www/protocol/jar/foo1.jar similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/foo1.jar rename to test/jdk/sun/net/www/protocol/jar/foo1.jar diff --git a/jdk/test/sun/net/www/protocol/jar/foo2.jar b/test/jdk/sun/net/www/protocol/jar/foo2.jar similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/foo2.jar rename to test/jdk/sun/net/www/protocol/jar/foo2.jar diff --git a/jdk/test/sun/net/www/protocol/jar/jarbug/TestDriver.java b/test/jdk/sun/net/www/protocol/jar/jarbug/TestDriver.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/jarbug/TestDriver.java rename to test/jdk/sun/net/www/protocol/jar/jarbug/TestDriver.java diff --git a/jdk/test/sun/net/www/protocol/jar/jarbug/etc/jar1/jar1/bundle.properties b/test/jdk/sun/net/www/protocol/jar/jarbug/etc/jar1/jar1/bundle.properties similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/jarbug/etc/jar1/jar1/bundle.properties rename to test/jdk/sun/net/www/protocol/jar/jarbug/etc/jar1/jar1/bundle.properties diff --git a/jdk/test/sun/net/www/protocol/jar/jarbug/etc/jar1/res1.txt b/test/jdk/sun/net/www/protocol/jar/jarbug/etc/jar1/res1.txt similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/jarbug/etc/jar1/res1.txt rename to test/jdk/sun/net/www/protocol/jar/jarbug/etc/jar1/res1.txt diff --git a/jdk/test/sun/net/www/protocol/jar/jarbug/src/jar1/GetResource.java b/test/jdk/sun/net/www/protocol/jar/jarbug/src/jar1/GetResource.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/jarbug/src/jar1/GetResource.java rename to test/jdk/sun/net/www/protocol/jar/jarbug/src/jar1/GetResource.java diff --git a/jdk/test/sun/net/www/protocol/jar/jarbug/src/jar1/LoadResourceBundle.java b/test/jdk/sun/net/www/protocol/jar/jarbug/src/jar1/LoadResourceBundle.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/jarbug/src/jar1/LoadResourceBundle.java rename to test/jdk/sun/net/www/protocol/jar/jarbug/src/jar1/LoadResourceBundle.java diff --git a/jdk/test/sun/net/www/protocol/jar/jarbug/src/test/JarTest.java b/test/jdk/sun/net/www/protocol/jar/jarbug/src/test/JarTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/jarbug/src/test/JarTest.java rename to test/jdk/sun/net/www/protocol/jar/jarbug/src/test/JarTest.java diff --git a/jdk/test/sun/net/www/protocol/jar/jarbug/src/test/TestBug4361044.java b/test/jdk/sun/net/www/protocol/jar/jarbug/src/test/TestBug4361044.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/jarbug/src/test/TestBug4361044.java rename to test/jdk/sun/net/www/protocol/jar/jarbug/src/test/TestBug4361044.java diff --git a/jdk/test/sun/net/www/protocol/jar/jarbug/src/test/TestBug4523159.java b/test/jdk/sun/net/www/protocol/jar/jarbug/src/test/TestBug4523159.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/jarbug/src/test/TestBug4523159.java rename to test/jdk/sun/net/www/protocol/jar/jarbug/src/test/TestBug4523159.java diff --git a/jdk/test/sun/net/www/protocol/jar/resource.jar b/test/jdk/sun/net/www/protocol/jar/resource.jar similarity index 100% rename from jdk/test/sun/net/www/protocol/jar/resource.jar rename to test/jdk/sun/net/www/protocol/jar/resource.jar diff --git a/jdk/test/sun/net/www/protocol/jrt/Basic.java b/test/jdk/sun/net/www/protocol/jrt/Basic.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jrt/Basic.java rename to test/jdk/sun/net/www/protocol/jrt/Basic.java diff --git a/jdk/test/sun/net/www/protocol/jrt/OtherResources.java b/test/jdk/sun/net/www/protocol/jrt/OtherResources.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jrt/OtherResources.java rename to test/jdk/sun/net/www/protocol/jrt/OtherResources.java diff --git a/jdk/test/sun/net/www/protocol/jrt/OtherResourcesTest.java b/test/jdk/sun/net/www/protocol/jrt/OtherResourcesTest.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jrt/OtherResourcesTest.java rename to test/jdk/sun/net/www/protocol/jrt/OtherResourcesTest.java diff --git a/jdk/test/sun/net/www/protocol/jrt/WithSecurityManager.java b/test/jdk/sun/net/www/protocol/jrt/WithSecurityManager.java similarity index 100% rename from jdk/test/sun/net/www/protocol/jrt/WithSecurityManager.java rename to test/jdk/sun/net/www/protocol/jrt/WithSecurityManager.java diff --git a/jdk/test/sun/net/www/protocol/jrt/java.policy b/test/jdk/sun/net/www/protocol/jrt/java.policy similarity index 100% rename from jdk/test/sun/net/www/protocol/jrt/java.policy rename to test/jdk/sun/net/www/protocol/jrt/java.policy diff --git a/jdk/test/sun/net/www/protocol/mailto/HandlerParse.java b/test/jdk/sun/net/www/protocol/mailto/HandlerParse.java similarity index 100% rename from jdk/test/sun/net/www/protocol/mailto/HandlerParse.java rename to test/jdk/sun/net/www/protocol/mailto/HandlerParse.java diff --git a/jdk/test/sun/nio/ch/Basic.java b/test/jdk/sun/nio/ch/Basic.java similarity index 100% rename from jdk/test/sun/nio/ch/Basic.java rename to test/jdk/sun/nio/ch/Basic.java diff --git a/jdk/test/sun/nio/ch/SelProvider.java b/test/jdk/sun/nio/ch/SelProvider.java similarity index 100% rename from jdk/test/sun/nio/ch/SelProvider.java rename to test/jdk/sun/nio/ch/SelProvider.java diff --git a/jdk/test/sun/nio/ch/ServerSocketAdaptorTest.java b/test/jdk/sun/nio/ch/ServerSocketAdaptorTest.java similarity index 100% rename from jdk/test/sun/nio/ch/ServerSocketAdaptorTest.java rename to test/jdk/sun/nio/ch/ServerSocketAdaptorTest.java diff --git a/jdk/test/sun/nio/ch/TempBuffer.java b/test/jdk/sun/nio/ch/TempBuffer.java similarity index 100% rename from jdk/test/sun/nio/ch/TempBuffer.java rename to test/jdk/sun/nio/ch/TempBuffer.java diff --git a/jdk/test/sun/nio/ch/TestMaxCachedBufferSize.java b/test/jdk/sun/nio/ch/TestMaxCachedBufferSize.java similarity index 100% rename from jdk/test/sun/nio/ch/TestMaxCachedBufferSize.java rename to test/jdk/sun/nio/ch/TestMaxCachedBufferSize.java diff --git a/jdk/test/sun/nio/cs/BufferUnderflowEUCTWTest.java b/test/jdk/sun/nio/cs/BufferUnderflowEUCTWTest.java similarity index 100% rename from jdk/test/sun/nio/cs/BufferUnderflowEUCTWTest.java rename to test/jdk/sun/nio/cs/BufferUnderflowEUCTWTest.java diff --git a/jdk/test/sun/nio/cs/CheckCaseInsensitiveEncAliases.java b/test/jdk/sun/nio/cs/CheckCaseInsensitiveEncAliases.java similarity index 100% rename from jdk/test/sun/nio/cs/CheckCaseInsensitiveEncAliases.java rename to test/jdk/sun/nio/cs/CheckCaseInsensitiveEncAliases.java diff --git a/jdk/test/sun/nio/cs/CheckHistoricalNames.java b/test/jdk/sun/nio/cs/CheckHistoricalNames.java similarity index 100% rename from jdk/test/sun/nio/cs/CheckHistoricalNames.java rename to test/jdk/sun/nio/cs/CheckHistoricalNames.java diff --git a/jdk/test/sun/nio/cs/CheckICNE.java b/test/jdk/sun/nio/cs/CheckICNE.java similarity index 100% rename from jdk/test/sun/nio/cs/CheckICNE.java rename to test/jdk/sun/nio/cs/CheckICNE.java diff --git a/jdk/test/sun/nio/cs/ConvertSingle.java b/test/jdk/sun/nio/cs/ConvertSingle.java similarity index 100% rename from jdk/test/sun/nio/cs/ConvertSingle.java rename to test/jdk/sun/nio/cs/ConvertSingle.java diff --git a/jdk/test/sun/nio/cs/Decode.java b/test/jdk/sun/nio/cs/Decode.java similarity index 100% rename from jdk/test/sun/nio/cs/Decode.java rename to test/jdk/sun/nio/cs/Decode.java diff --git a/jdk/test/sun/nio/cs/DecoderOverflow.java b/test/jdk/sun/nio/cs/DecoderOverflow.java similarity index 100% rename from jdk/test/sun/nio/cs/DecoderOverflow.java rename to test/jdk/sun/nio/cs/DecoderOverflow.java diff --git a/jdk/test/sun/nio/cs/EUCJPUnderflowDecodeTest.java b/test/jdk/sun/nio/cs/EUCJPUnderflowDecodeTest.java similarity index 100% rename from jdk/test/sun/nio/cs/EUCJPUnderflowDecodeTest.java rename to test/jdk/sun/nio/cs/EUCJPUnderflowDecodeTest.java diff --git a/jdk/test/sun/nio/cs/EUC_TW_OLD.java b/test/jdk/sun/nio/cs/EUC_TW_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/EUC_TW_OLD.java rename to test/jdk/sun/nio/cs/EUC_TW_OLD.java diff --git a/jdk/test/sun/nio/cs/EncodingNothing.java b/test/jdk/sun/nio/cs/EncodingNothing.java similarity index 100% rename from jdk/test/sun/nio/cs/EncodingNothing.java rename to test/jdk/sun/nio/cs/EncodingNothing.java diff --git a/jdk/test/sun/nio/cs/EucJpLinux0212.java b/test/jdk/sun/nio/cs/EucJpLinux0212.java similarity index 100% rename from jdk/test/sun/nio/cs/EucJpLinux0212.java rename to test/jdk/sun/nio/cs/EucJpLinux0212.java diff --git a/jdk/test/sun/nio/cs/EucJpLinuxDecoderRecoveryTest.java b/test/jdk/sun/nio/cs/EucJpLinuxDecoderRecoveryTest.java similarity index 100% rename from jdk/test/sun/nio/cs/EucJpLinuxDecoderRecoveryTest.java rename to test/jdk/sun/nio/cs/EucJpLinuxDecoderRecoveryTest.java diff --git a/jdk/test/sun/nio/cs/EuroConverter.java b/test/jdk/sun/nio/cs/EuroConverter.java similarity index 100% rename from jdk/test/sun/nio/cs/EuroConverter.java rename to test/jdk/sun/nio/cs/EuroConverter.java diff --git a/jdk/test/sun/nio/cs/FindASCIICodingBugs.java b/test/jdk/sun/nio/cs/FindASCIICodingBugs.java similarity index 100% rename from jdk/test/sun/nio/cs/FindASCIICodingBugs.java rename to test/jdk/sun/nio/cs/FindASCIICodingBugs.java diff --git a/jdk/test/sun/nio/cs/FindASCIIRangeCodingBugs.java b/test/jdk/sun/nio/cs/FindASCIIRangeCodingBugs.java similarity index 100% rename from jdk/test/sun/nio/cs/FindASCIIRangeCodingBugs.java rename to test/jdk/sun/nio/cs/FindASCIIRangeCodingBugs.java diff --git a/jdk/test/sun/nio/cs/FindASCIIReplBugs.java b/test/jdk/sun/nio/cs/FindASCIIReplBugs.java similarity index 100% rename from jdk/test/sun/nio/cs/FindASCIIReplBugs.java rename to test/jdk/sun/nio/cs/FindASCIIReplBugs.java diff --git a/jdk/test/sun/nio/cs/FindCanEncodeBugs.java b/test/jdk/sun/nio/cs/FindCanEncodeBugs.java similarity index 100% rename from jdk/test/sun/nio/cs/FindCanEncodeBugs.java rename to test/jdk/sun/nio/cs/FindCanEncodeBugs.java diff --git a/jdk/test/sun/nio/cs/FindDecoderBugs.java b/test/jdk/sun/nio/cs/FindDecoderBugs.java similarity index 100% rename from jdk/test/sun/nio/cs/FindDecoderBugs.java rename to test/jdk/sun/nio/cs/FindDecoderBugs.java diff --git a/jdk/test/sun/nio/cs/FindEncoderBugs.java b/test/jdk/sun/nio/cs/FindEncoderBugs.java similarity index 100% rename from jdk/test/sun/nio/cs/FindEncoderBugs.java rename to test/jdk/sun/nio/cs/FindEncoderBugs.java diff --git a/jdk/test/sun/nio/cs/FindOneCharEncoderBugs.java b/test/jdk/sun/nio/cs/FindOneCharEncoderBugs.java similarity index 100% rename from jdk/test/sun/nio/cs/FindOneCharEncoderBugs.java rename to test/jdk/sun/nio/cs/FindOneCharEncoderBugs.java diff --git a/jdk/test/sun/nio/cs/HWKatakanaMS932EncodeTest.java b/test/jdk/sun/nio/cs/HWKatakanaMS932EncodeTest.java similarity index 100% rename from jdk/test/sun/nio/cs/HWKatakanaMS932EncodeTest.java rename to test/jdk/sun/nio/cs/HWKatakanaMS932EncodeTest.java diff --git a/jdk/test/sun/nio/cs/ISCIITest.java b/test/jdk/sun/nio/cs/ISCIITest.java similarity index 100% rename from jdk/test/sun/nio/cs/ISCIITest.java rename to test/jdk/sun/nio/cs/ISCIITest.java diff --git a/jdk/test/sun/nio/cs/ISO2022JP.trailEsc b/test/jdk/sun/nio/cs/ISO2022JP.trailEsc similarity index 100% rename from jdk/test/sun/nio/cs/ISO2022JP.trailEsc rename to test/jdk/sun/nio/cs/ISO2022JP.trailEsc diff --git a/jdk/test/sun/nio/cs/ISO8859x.java b/test/jdk/sun/nio/cs/ISO8859x.java similarity index 100% rename from jdk/test/sun/nio/cs/ISO8859x.java rename to test/jdk/sun/nio/cs/ISO8859x.java diff --git a/jdk/test/sun/nio/cs/JISAutoDetectTest.java b/test/jdk/sun/nio/cs/JISAutoDetectTest.java similarity index 100% rename from jdk/test/sun/nio/cs/JISAutoDetectTest.java rename to test/jdk/sun/nio/cs/JISAutoDetectTest.java diff --git a/jdk/test/sun/nio/cs/LatinCharReplacementTWTest.java b/test/jdk/sun/nio/cs/LatinCharReplacementTWTest.java similarity index 100% rename from jdk/test/sun/nio/cs/LatinCharReplacementTWTest.java rename to test/jdk/sun/nio/cs/LatinCharReplacementTWTest.java diff --git a/jdk/test/sun/nio/cs/LeftOverSurrogate.java b/test/jdk/sun/nio/cs/LeftOverSurrogate.java similarity index 100% rename from jdk/test/sun/nio/cs/LeftOverSurrogate.java rename to test/jdk/sun/nio/cs/LeftOverSurrogate.java diff --git a/jdk/test/sun/nio/cs/MalformedSurrogates.java b/test/jdk/sun/nio/cs/MalformedSurrogates.java similarity index 100% rename from jdk/test/sun/nio/cs/MalformedSurrogates.java rename to test/jdk/sun/nio/cs/MalformedSurrogates.java diff --git a/jdk/test/sun/nio/cs/NIOJISAutoDetectTest.java b/test/jdk/sun/nio/cs/NIOJISAutoDetectTest.java similarity index 100% rename from jdk/test/sun/nio/cs/NIOJISAutoDetectTest.java rename to test/jdk/sun/nio/cs/NIOJISAutoDetectTest.java diff --git a/jdk/test/sun/nio/cs/OLD/DBCSDecoderMapping.java b/test/jdk/sun/nio/cs/OLD/DBCSDecoderMapping.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/DBCSDecoderMapping.java rename to test/jdk/sun/nio/cs/OLD/DBCSDecoderMapping.java diff --git a/jdk/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Decoder.java b/test/jdk/sun/nio/cs/OLD/DBCS_IBM_ASCII_Decoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Decoder.java rename to test/jdk/sun/nio/cs/OLD/DBCS_IBM_ASCII_Decoder.java diff --git a/jdk/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Encoder.java b/test/jdk/sun/nio/cs/OLD/DBCS_IBM_ASCII_Encoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Encoder.java rename to test/jdk/sun/nio/cs/OLD/DBCS_IBM_ASCII_Encoder.java diff --git a/jdk/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Decoder.java b/test/jdk/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Decoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Decoder.java rename to test/jdk/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Decoder.java diff --git a/jdk/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Encoder.java b/test/jdk/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Encoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Encoder.java rename to test/jdk/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Encoder.java diff --git a/jdk/test/sun/nio/cs/OLD/DBCS_ONLY_IBM_EBCDIC_Decoder.java b/test/jdk/sun/nio/cs/OLD/DBCS_ONLY_IBM_EBCDIC_Decoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/DBCS_ONLY_IBM_EBCDIC_Decoder.java rename to test/jdk/sun/nio/cs/OLD/DBCS_ONLY_IBM_EBCDIC_Decoder.java diff --git a/jdk/test/sun/nio/cs/OLD/DoubleByteDecoder.java b/test/jdk/sun/nio/cs/OLD/DoubleByteDecoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/DoubleByteDecoder.java rename to test/jdk/sun/nio/cs/OLD/DoubleByteDecoder.java diff --git a/jdk/test/sun/nio/cs/OLD/DoubleByteEncoder.java b/test/jdk/sun/nio/cs/OLD/DoubleByteEncoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/DoubleByteEncoder.java rename to test/jdk/sun/nio/cs/OLD/DoubleByteEncoder.java diff --git a/jdk/test/sun/nio/cs/OLD/EUC_CN_OLD.java b/test/jdk/sun/nio/cs/OLD/EUC_CN_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/EUC_CN_OLD.java rename to test/jdk/sun/nio/cs/OLD/EUC_CN_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/EUC_JP_LINUX_OLD.java b/test/jdk/sun/nio/cs/OLD/EUC_JP_LINUX_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/EUC_JP_LINUX_OLD.java rename to test/jdk/sun/nio/cs/OLD/EUC_JP_LINUX_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/EUC_JP_OLD.java b/test/jdk/sun/nio/cs/OLD/EUC_JP_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/EUC_JP_OLD.java rename to test/jdk/sun/nio/cs/OLD/EUC_JP_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/EUC_JP_Open_OLD.java b/test/jdk/sun/nio/cs/OLD/EUC_JP_Open_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/EUC_JP_Open_OLD.java rename to test/jdk/sun/nio/cs/OLD/EUC_JP_Open_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/EUC_KR_OLD.java b/test/jdk/sun/nio/cs/OLD/EUC_KR_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/EUC_KR_OLD.java rename to test/jdk/sun/nio/cs/OLD/EUC_KR_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/GBK_OLD.java b/test/jdk/sun/nio/cs/OLD/GBK_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/GBK_OLD.java rename to test/jdk/sun/nio/cs/OLD/GBK_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM1381_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM1381_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM1381_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM1381_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM1383_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM1383_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM1383_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM1383_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM930_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM930_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM930_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM930_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM933_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM933_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM933_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM933_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM935_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM935_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM935_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM935_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM937_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM937_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM937_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM937_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM939_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM939_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM939_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM939_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM942C_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM942C_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM942C_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM942C_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM942_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM942_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM942_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM942_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM943C_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM943C_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM943C_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM943C_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM943_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM943_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM943_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM943_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM948_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM948_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM948_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM948_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM949C_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM949C_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM949C_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM949C_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM949_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM949_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM949_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM949_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM950_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM950_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM950_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM950_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/IBM970_OLD.java b/test/jdk/sun/nio/cs/OLD/IBM970_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/IBM970_OLD.java rename to test/jdk/sun/nio/cs/OLD/IBM970_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/JIS_X_0201_OLD.java b/test/jdk/sun/nio/cs/OLD/JIS_X_0201_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/JIS_X_0201_OLD.java rename to test/jdk/sun/nio/cs/OLD/JIS_X_0201_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/JIS_X_0208_Decoder.java b/test/jdk/sun/nio/cs/OLD/JIS_X_0208_Decoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/JIS_X_0208_Decoder.java rename to test/jdk/sun/nio/cs/OLD/JIS_X_0208_Decoder.java diff --git a/jdk/test/sun/nio/cs/OLD/JIS_X_0208_Encoder.java b/test/jdk/sun/nio/cs/OLD/JIS_X_0208_Encoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/JIS_X_0208_Encoder.java rename to test/jdk/sun/nio/cs/OLD/JIS_X_0208_Encoder.java diff --git a/jdk/test/sun/nio/cs/OLD/JIS_X_0208_OLD.java b/test/jdk/sun/nio/cs/OLD/JIS_X_0208_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/JIS_X_0208_OLD.java rename to test/jdk/sun/nio/cs/OLD/JIS_X_0208_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/JIS_X_0208_Solaris_Decoder.java b/test/jdk/sun/nio/cs/OLD/JIS_X_0208_Solaris_Decoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/JIS_X_0208_Solaris_Decoder.java rename to test/jdk/sun/nio/cs/OLD/JIS_X_0208_Solaris_Decoder.java diff --git a/jdk/test/sun/nio/cs/OLD/JIS_X_0208_Solaris_Encoder.java b/test/jdk/sun/nio/cs/OLD/JIS_X_0208_Solaris_Encoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/JIS_X_0208_Solaris_Encoder.java rename to test/jdk/sun/nio/cs/OLD/JIS_X_0208_Solaris_Encoder.java diff --git a/jdk/test/sun/nio/cs/OLD/JIS_X_0212_Decoder.java b/test/jdk/sun/nio/cs/OLD/JIS_X_0212_Decoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/JIS_X_0212_Decoder.java rename to test/jdk/sun/nio/cs/OLD/JIS_X_0212_Decoder.java diff --git a/jdk/test/sun/nio/cs/OLD/JIS_X_0212_Encoder.java b/test/jdk/sun/nio/cs/OLD/JIS_X_0212_Encoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/JIS_X_0212_Encoder.java rename to test/jdk/sun/nio/cs/OLD/JIS_X_0212_Encoder.java diff --git a/jdk/test/sun/nio/cs/OLD/JIS_X_0212_OLD.java b/test/jdk/sun/nio/cs/OLD/JIS_X_0212_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/JIS_X_0212_OLD.java rename to test/jdk/sun/nio/cs/OLD/JIS_X_0212_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/JIS_X_0212_Solaris_Decoder.java b/test/jdk/sun/nio/cs/OLD/JIS_X_0212_Solaris_Decoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/JIS_X_0212_Solaris_Decoder.java rename to test/jdk/sun/nio/cs/OLD/JIS_X_0212_Solaris_Decoder.java diff --git a/jdk/test/sun/nio/cs/OLD/JIS_X_0212_Solaris_Encoder.java b/test/jdk/sun/nio/cs/OLD/JIS_X_0212_Solaris_Encoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/JIS_X_0212_Solaris_Encoder.java rename to test/jdk/sun/nio/cs/OLD/JIS_X_0212_Solaris_Encoder.java diff --git a/jdk/test/sun/nio/cs/OLD/Johab_OLD.java b/test/jdk/sun/nio/cs/OLD/Johab_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/Johab_OLD.java rename to test/jdk/sun/nio/cs/OLD/Johab_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/MS932DB.java b/test/jdk/sun/nio/cs/OLD/MS932DB.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/MS932DB.java rename to test/jdk/sun/nio/cs/OLD/MS932DB.java diff --git a/jdk/test/sun/nio/cs/OLD/MS932_OLD.java b/test/jdk/sun/nio/cs/OLD/MS932_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/MS932_OLD.java rename to test/jdk/sun/nio/cs/OLD/MS932_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/MS936_OLD.java b/test/jdk/sun/nio/cs/OLD/MS936_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/MS936_OLD.java rename to test/jdk/sun/nio/cs/OLD/MS936_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/MS949_OLD.java b/test/jdk/sun/nio/cs/OLD/MS949_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/MS949_OLD.java rename to test/jdk/sun/nio/cs/OLD/MS949_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/MS950_OLD.java b/test/jdk/sun/nio/cs/OLD/MS950_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/MS950_OLD.java rename to test/jdk/sun/nio/cs/OLD/MS950_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/PCK_OLD.java b/test/jdk/sun/nio/cs/OLD/PCK_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/PCK_OLD.java rename to test/jdk/sun/nio/cs/OLD/PCK_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/SJIS_OLD.java b/test/jdk/sun/nio/cs/OLD/SJIS_OLD.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/SJIS_OLD.java rename to test/jdk/sun/nio/cs/OLD/SJIS_OLD.java diff --git a/jdk/test/sun/nio/cs/OLD/SimpleEUCDecoder.java b/test/jdk/sun/nio/cs/OLD/SimpleEUCDecoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/SimpleEUCDecoder.java rename to test/jdk/sun/nio/cs/OLD/SimpleEUCDecoder.java diff --git a/jdk/test/sun/nio/cs/OLD/SingleByteDecoder.java b/test/jdk/sun/nio/cs/OLD/SingleByteDecoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/SingleByteDecoder.java rename to test/jdk/sun/nio/cs/OLD/SingleByteDecoder.java diff --git a/jdk/test/sun/nio/cs/OLD/SingleByteEncoder.java b/test/jdk/sun/nio/cs/OLD/SingleByteEncoder.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/SingleByteEncoder.java rename to test/jdk/sun/nio/cs/OLD/SingleByteEncoder.java diff --git a/jdk/test/sun/nio/cs/OLD/TestIBMDB.java b/test/jdk/sun/nio/cs/OLD/TestIBMDB.java similarity index 100% rename from jdk/test/sun/nio/cs/OLD/TestIBMDB.java rename to test/jdk/sun/nio/cs/OLD/TestIBMDB.java diff --git a/jdk/test/sun/nio/cs/ReadZero.java b/test/jdk/sun/nio/cs/ReadZero.java similarity index 100% rename from jdk/test/sun/nio/cs/ReadZero.java rename to test/jdk/sun/nio/cs/ReadZero.java diff --git a/jdk/test/sun/nio/cs/SJISCanEncode.java b/test/jdk/sun/nio/cs/SJISCanEncode.java similarity index 100% rename from jdk/test/sun/nio/cs/SJISCanEncode.java rename to test/jdk/sun/nio/cs/SJISCanEncode.java diff --git a/jdk/test/sun/nio/cs/StrCodingBenchmark.java b/test/jdk/sun/nio/cs/StrCodingBenchmark.java similarity index 100% rename from jdk/test/sun/nio/cs/StrCodingBenchmark.java rename to test/jdk/sun/nio/cs/StrCodingBenchmark.java diff --git a/jdk/test/sun/nio/cs/StrCodingBenchmarkDB.java b/test/jdk/sun/nio/cs/StrCodingBenchmarkDB.java similarity index 100% rename from jdk/test/sun/nio/cs/StrCodingBenchmarkDB.java rename to test/jdk/sun/nio/cs/StrCodingBenchmarkDB.java diff --git a/jdk/test/sun/nio/cs/StrCodingBenchmarkUTF8.java b/test/jdk/sun/nio/cs/StrCodingBenchmarkUTF8.java similarity index 100% rename from jdk/test/sun/nio/cs/StrCodingBenchmarkUTF8.java rename to test/jdk/sun/nio/cs/StrCodingBenchmarkUTF8.java diff --git a/jdk/test/sun/nio/cs/StreamEncoderClose.java b/test/jdk/sun/nio/cs/StreamEncoderClose.java similarity index 100% rename from jdk/test/sun/nio/cs/StreamEncoderClose.java rename to test/jdk/sun/nio/cs/StreamEncoderClose.java diff --git a/jdk/test/sun/nio/cs/StreamEncoderOut.java b/test/jdk/sun/nio/cs/StreamEncoderOut.java similarity index 100% rename from jdk/test/sun/nio/cs/StreamEncoderOut.java rename to test/jdk/sun/nio/cs/StreamEncoderOut.java diff --git a/jdk/test/sun/nio/cs/SurrogateGB18030Test.java b/test/jdk/sun/nio/cs/SurrogateGB18030Test.java similarity index 100% rename from jdk/test/sun/nio/cs/SurrogateGB18030Test.java rename to test/jdk/sun/nio/cs/SurrogateGB18030Test.java diff --git a/jdk/test/sun/nio/cs/SurrogateTestEUCTW.java b/test/jdk/sun/nio/cs/SurrogateTestEUCTW.java similarity index 100% rename from jdk/test/sun/nio/cs/SurrogateTestEUCTW.java rename to test/jdk/sun/nio/cs/SurrogateTestEUCTW.java diff --git a/jdk/test/sun/nio/cs/SurrogateTestEUCTW.plane15.surrogates b/test/jdk/sun/nio/cs/SurrogateTestEUCTW.plane15.surrogates similarity index 100% rename from jdk/test/sun/nio/cs/SurrogateTestEUCTW.plane15.surrogates rename to test/jdk/sun/nio/cs/SurrogateTestEUCTW.plane15.surrogates diff --git a/jdk/test/sun/nio/cs/SurrogateTestEUCTW.plane3.surrogates b/test/jdk/sun/nio/cs/SurrogateTestEUCTW.plane3.surrogates similarity index 100% rename from jdk/test/sun/nio/cs/SurrogateTestEUCTW.plane3.surrogates rename to test/jdk/sun/nio/cs/SurrogateTestEUCTW.plane3.surrogates diff --git a/jdk/test/sun/nio/cs/SurrogateTestEUCTW.plane4.surrogates b/test/jdk/sun/nio/cs/SurrogateTestEUCTW.plane4.surrogates similarity index 100% rename from jdk/test/sun/nio/cs/SurrogateTestEUCTW.plane4.surrogates rename to test/jdk/sun/nio/cs/SurrogateTestEUCTW.plane4.surrogates diff --git a/jdk/test/sun/nio/cs/SurrogateTestEUCTW.plane5.surrogates b/test/jdk/sun/nio/cs/SurrogateTestEUCTW.plane5.surrogates similarity index 100% rename from jdk/test/sun/nio/cs/SurrogateTestEUCTW.plane5.surrogates rename to test/jdk/sun/nio/cs/SurrogateTestEUCTW.plane5.surrogates diff --git a/jdk/test/sun/nio/cs/SurrogateTestEUCTW.plane6.surrogates b/test/jdk/sun/nio/cs/SurrogateTestEUCTW.plane6.surrogates similarity index 100% rename from jdk/test/sun/nio/cs/SurrogateTestEUCTW.plane6.surrogates rename to test/jdk/sun/nio/cs/SurrogateTestEUCTW.plane6.surrogates diff --git a/jdk/test/sun/nio/cs/SurrogateTestEUCTW.plane7.surrogates b/test/jdk/sun/nio/cs/SurrogateTestEUCTW.plane7.surrogates similarity index 100% rename from jdk/test/sun/nio/cs/SurrogateTestEUCTW.plane7.surrogates rename to test/jdk/sun/nio/cs/SurrogateTestEUCTW.plane7.surrogates diff --git a/jdk/test/sun/nio/cs/SurrogateTestHKSCS.java b/test/jdk/sun/nio/cs/SurrogateTestHKSCS.java similarity index 100% rename from jdk/test/sun/nio/cs/SurrogateTestHKSCS.java rename to test/jdk/sun/nio/cs/SurrogateTestHKSCS.java diff --git a/jdk/test/sun/nio/cs/Test4206507.java b/test/jdk/sun/nio/cs/Test4206507.java similarity index 100% rename from jdk/test/sun/nio/cs/Test4206507.java rename to test/jdk/sun/nio/cs/Test4206507.java diff --git a/jdk/test/sun/nio/cs/Test6254467.java b/test/jdk/sun/nio/cs/Test6254467.java similarity index 100% rename from jdk/test/sun/nio/cs/Test6254467.java rename to test/jdk/sun/nio/cs/Test6254467.java diff --git a/jdk/test/sun/nio/cs/Test6275027.java b/test/jdk/sun/nio/cs/Test6275027.java similarity index 100% rename from jdk/test/sun/nio/cs/Test6275027.java rename to test/jdk/sun/nio/cs/Test6275027.java diff --git a/jdk/test/sun/nio/cs/Test6392804.java b/test/jdk/sun/nio/cs/Test6392804.java similarity index 100% rename from jdk/test/sun/nio/cs/Test6392804.java rename to test/jdk/sun/nio/cs/Test6392804.java diff --git a/jdk/test/sun/nio/cs/TestCharsetMapping.java b/test/jdk/sun/nio/cs/TestCharsetMapping.java similarity index 100% rename from jdk/test/sun/nio/cs/TestCharsetMapping.java rename to test/jdk/sun/nio/cs/TestCharsetMapping.java diff --git a/jdk/test/sun/nio/cs/TestConverterDroppedCharacters.java b/test/jdk/sun/nio/cs/TestConverterDroppedCharacters.java similarity index 100% rename from jdk/test/sun/nio/cs/TestConverterDroppedCharacters.java rename to test/jdk/sun/nio/cs/TestConverterDroppedCharacters.java diff --git a/jdk/test/sun/nio/cs/TestCp834_SBCS.java b/test/jdk/sun/nio/cs/TestCp834_SBCS.java similarity index 100% rename from jdk/test/sun/nio/cs/TestCp834_SBCS.java rename to test/jdk/sun/nio/cs/TestCp834_SBCS.java diff --git a/jdk/test/sun/nio/cs/TestCp93xSISO.java b/test/jdk/sun/nio/cs/TestCp93xSISO.java similarity index 100% rename from jdk/test/sun/nio/cs/TestCp93xSISO.java rename to test/jdk/sun/nio/cs/TestCp93xSISO.java diff --git a/jdk/test/sun/nio/cs/TestEBCDICLineFeed.java b/test/jdk/sun/nio/cs/TestEBCDICLineFeed.java similarity index 100% rename from jdk/test/sun/nio/cs/TestEBCDICLineFeed.java rename to test/jdk/sun/nio/cs/TestEBCDICLineFeed.java diff --git a/jdk/test/sun/nio/cs/TestEUC_TW.java b/test/jdk/sun/nio/cs/TestEUC_TW.java similarity index 100% rename from jdk/test/sun/nio/cs/TestEUC_TW.java rename to test/jdk/sun/nio/cs/TestEUC_TW.java diff --git a/jdk/test/sun/nio/cs/TestHKSCS.java b/test/jdk/sun/nio/cs/TestHKSCS.java similarity index 100% rename from jdk/test/sun/nio/cs/TestHKSCS.java rename to test/jdk/sun/nio/cs/TestHKSCS.java diff --git a/jdk/test/sun/nio/cs/TestIBM1364.java b/test/jdk/sun/nio/cs/TestIBM1364.java similarity index 100% rename from jdk/test/sun/nio/cs/TestIBM1364.java rename to test/jdk/sun/nio/cs/TestIBM1364.java diff --git a/jdk/test/sun/nio/cs/TestIBMBugs.java b/test/jdk/sun/nio/cs/TestIBMBugs.java similarity index 100% rename from jdk/test/sun/nio/cs/TestIBMBugs.java rename to test/jdk/sun/nio/cs/TestIBMBugs.java diff --git a/jdk/test/sun/nio/cs/TestISO2022CNDecoder.java b/test/jdk/sun/nio/cs/TestISO2022CNDecoder.java similarity index 100% rename from jdk/test/sun/nio/cs/TestISO2022CNDecoder.java rename to test/jdk/sun/nio/cs/TestISO2022CNDecoder.java diff --git a/jdk/test/sun/nio/cs/TestISO2022JP.java b/test/jdk/sun/nio/cs/TestISO2022JP.java similarity index 100% rename from jdk/test/sun/nio/cs/TestISO2022JP.java rename to test/jdk/sun/nio/cs/TestISO2022JP.java diff --git a/jdk/test/sun/nio/cs/TestISO2022JPEncoder.java b/test/jdk/sun/nio/cs/TestISO2022JPEncoder.java similarity index 100% rename from jdk/test/sun/nio/cs/TestISO2022JPEncoder.java rename to test/jdk/sun/nio/cs/TestISO2022JPEncoder.java diff --git a/jdk/test/sun/nio/cs/TestISO2022JPSubBytes.java b/test/jdk/sun/nio/cs/TestISO2022JPSubBytes.java similarity index 100% rename from jdk/test/sun/nio/cs/TestISO2022JPSubBytes.java rename to test/jdk/sun/nio/cs/TestISO2022JPSubBytes.java diff --git a/jdk/test/sun/nio/cs/TestIllegalISO2022Esc.java b/test/jdk/sun/nio/cs/TestIllegalISO2022Esc.java similarity index 100% rename from jdk/test/sun/nio/cs/TestIllegalISO2022Esc.java rename to test/jdk/sun/nio/cs/TestIllegalISO2022Esc.java diff --git a/jdk/test/sun/nio/cs/TestIllegalSJIS.java b/test/jdk/sun/nio/cs/TestIllegalSJIS.java similarity index 100% rename from jdk/test/sun/nio/cs/TestIllegalSJIS.java rename to test/jdk/sun/nio/cs/TestIllegalSJIS.java diff --git a/jdk/test/sun/nio/cs/TestJIS0208Decoder.java b/test/jdk/sun/nio/cs/TestJIS0208Decoder.java similarity index 100% rename from jdk/test/sun/nio/cs/TestJIS0208Decoder.java rename to test/jdk/sun/nio/cs/TestJIS0208Decoder.java diff --git a/jdk/test/sun/nio/cs/TestJIS0212Decoder.java b/test/jdk/sun/nio/cs/TestJIS0212Decoder.java similarity index 100% rename from jdk/test/sun/nio/cs/TestJIS0212Decoder.java rename to test/jdk/sun/nio/cs/TestJIS0212Decoder.java diff --git a/jdk/test/sun/nio/cs/TestMS5022X.java b/test/jdk/sun/nio/cs/TestMS5022X.java similarity index 100% rename from jdk/test/sun/nio/cs/TestMS5022X.java rename to test/jdk/sun/nio/cs/TestMS5022X.java diff --git a/jdk/test/sun/nio/cs/TestMiscEUC_JP.java b/test/jdk/sun/nio/cs/TestMiscEUC_JP.java similarity index 100% rename from jdk/test/sun/nio/cs/TestMiscEUC_JP.java rename to test/jdk/sun/nio/cs/TestMiscEUC_JP.java diff --git a/jdk/test/sun/nio/cs/TestSJIS0213.java b/test/jdk/sun/nio/cs/TestSJIS0213.java similarity index 100% rename from jdk/test/sun/nio/cs/TestSJIS0213.java rename to test/jdk/sun/nio/cs/TestSJIS0213.java diff --git a/jdk/test/sun/nio/cs/TestSJIS0213_SM.java b/test/jdk/sun/nio/cs/TestSJIS0213_SM.java similarity index 100% rename from jdk/test/sun/nio/cs/TestSJIS0213_SM.java rename to test/jdk/sun/nio/cs/TestSJIS0213_SM.java diff --git a/jdk/test/sun/nio/cs/TestStringCoding.java b/test/jdk/sun/nio/cs/TestStringCoding.java similarity index 100% rename from jdk/test/sun/nio/cs/TestStringCoding.java rename to test/jdk/sun/nio/cs/TestStringCoding.java diff --git a/jdk/test/sun/nio/cs/TestStringCodingUTF8.java b/test/jdk/sun/nio/cs/TestStringCodingUTF8.java similarity index 100% rename from jdk/test/sun/nio/cs/TestStringCodingUTF8.java rename to test/jdk/sun/nio/cs/TestStringCodingUTF8.java diff --git a/jdk/test/sun/nio/cs/TestTrailingEscapesISO2022JP.java b/test/jdk/sun/nio/cs/TestTrailingEscapesISO2022JP.java similarity index 100% rename from jdk/test/sun/nio/cs/TestTrailingEscapesISO2022JP.java rename to test/jdk/sun/nio/cs/TestTrailingEscapesISO2022JP.java diff --git a/jdk/test/sun/nio/cs/TestUTF8.java b/test/jdk/sun/nio/cs/TestUTF8.java similarity index 100% rename from jdk/test/sun/nio/cs/TestUTF8.java rename to test/jdk/sun/nio/cs/TestUTF8.java diff --git a/jdk/test/sun/nio/cs/TestUTF8BOM.java b/test/jdk/sun/nio/cs/TestUTF8BOM.java similarity index 100% rename from jdk/test/sun/nio/cs/TestUTF8BOM.java rename to test/jdk/sun/nio/cs/TestUTF8BOM.java diff --git a/jdk/test/sun/nio/cs/TestUTF_16.java b/test/jdk/sun/nio/cs/TestUTF_16.java similarity index 100% rename from jdk/test/sun/nio/cs/TestUTF_16.java rename to test/jdk/sun/nio/cs/TestUTF_16.java diff --git a/jdk/test/sun/nio/cs/TestUTF_32.java b/test/jdk/sun/nio/cs/TestUTF_32.java similarity index 100% rename from jdk/test/sun/nio/cs/TestUTF_32.java rename to test/jdk/sun/nio/cs/TestUTF_32.java diff --git a/jdk/test/sun/nio/cs/TestUni2HKSCS.java b/test/jdk/sun/nio/cs/TestUni2HKSCS.java similarity index 100% rename from jdk/test/sun/nio/cs/TestUni2HKSCS.java rename to test/jdk/sun/nio/cs/TestUni2HKSCS.java diff --git a/jdk/test/sun/nio/cs/TestUnmappable.java b/test/jdk/sun/nio/cs/TestUnmappable.java similarity index 100% rename from jdk/test/sun/nio/cs/TestUnmappable.java rename to test/jdk/sun/nio/cs/TestUnmappable.java diff --git a/jdk/test/sun/nio/cs/UkrainianIsNotRussian.java b/test/jdk/sun/nio/cs/UkrainianIsNotRussian.java similarity index 100% rename from jdk/test/sun/nio/cs/UkrainianIsNotRussian.java rename to test/jdk/sun/nio/cs/UkrainianIsNotRussian.java diff --git a/jdk/test/sun/nio/cs/ZeroedByteArrayEUCTWTest.java b/test/jdk/sun/nio/cs/ZeroedByteArrayEUCTWTest.java similarity index 100% rename from jdk/test/sun/nio/cs/ZeroedByteArrayEUCTWTest.java rename to test/jdk/sun/nio/cs/ZeroedByteArrayEUCTWTest.java diff --git a/jdk/test/sun/pisces/DashStrokeTest.java b/test/jdk/sun/pisces/DashStrokeTest.java similarity index 100% rename from jdk/test/sun/pisces/DashStrokeTest.java rename to test/jdk/sun/pisces/DashStrokeTest.java diff --git a/jdk/test/sun/pisces/JoinMiterTest.java b/test/jdk/sun/pisces/JoinMiterTest.java similarity index 100% rename from jdk/test/sun/pisces/JoinMiterTest.java rename to test/jdk/sun/pisces/JoinMiterTest.java diff --git a/jdk/test/sun/pisces/ScaleTest.java b/test/jdk/sun/pisces/ScaleTest.java similarity index 100% rename from jdk/test/sun/pisces/ScaleTest.java rename to test/jdk/sun/pisces/ScaleTest.java diff --git a/jdk/test/sun/pisces/StrokeShapeTest.java b/test/jdk/sun/pisces/StrokeShapeTest.java similarity index 100% rename from jdk/test/sun/pisces/StrokeShapeTest.java rename to test/jdk/sun/pisces/StrokeShapeTest.java diff --git a/jdk/test/sun/pisces/TEST.properties b/test/jdk/sun/pisces/TEST.properties similarity index 100% rename from jdk/test/sun/pisces/TEST.properties rename to test/jdk/sun/pisces/TEST.properties diff --git a/jdk/test/sun/pisces/ThinLineTest.java b/test/jdk/sun/pisces/ThinLineTest.java similarity index 100% rename from jdk/test/sun/pisces/ThinLineTest.java rename to test/jdk/sun/pisces/ThinLineTest.java diff --git a/jdk/test/sun/reflect/Reflection/GetCallerClassWithDepth.java b/test/jdk/sun/reflect/Reflection/GetCallerClassWithDepth.java similarity index 100% rename from jdk/test/sun/reflect/Reflection/GetCallerClassWithDepth.java rename to test/jdk/sun/reflect/Reflection/GetCallerClassWithDepth.java diff --git a/jdk/test/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java b/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java similarity index 100% rename from jdk/test/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java rename to test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java diff --git a/jdk/test/sun/reflect/ReflectionFactory/security.policy b/test/jdk/sun/reflect/ReflectionFactory/security.policy similarity index 100% rename from jdk/test/sun/reflect/ReflectionFactory/security.policy rename to test/jdk/sun/reflect/ReflectionFactory/security.policy diff --git a/jdk/test/sun/rmi/TEST.properties b/test/jdk/sun/rmi/TEST.properties similarity index 100% rename from jdk/test/sun/rmi/TEST.properties rename to test/jdk/sun/rmi/TEST.properties diff --git a/jdk/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java b/test/jdk/sun/rmi/log/ReliableLog/LogAlignmentTest.java similarity index 100% rename from jdk/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java rename to test/jdk/sun/rmi/log/ReliableLog/LogAlignmentTest.java diff --git a/jdk/test/sun/rmi/log/ReliableLog/Recovery.java b/test/jdk/sun/rmi/log/ReliableLog/Recovery.java similarity index 100% rename from jdk/test/sun/rmi/log/ReliableLog/Recovery.java rename to test/jdk/sun/rmi/log/ReliableLog/Recovery.java diff --git a/jdk/test/sun/rmi/log/ReliableLog/SnapshotSize.java b/test/jdk/sun/rmi/log/ReliableLog/SnapshotSize.java similarity index 100% rename from jdk/test/sun/rmi/log/ReliableLog/SnapshotSize.java rename to test/jdk/sun/rmi/log/ReliableLog/SnapshotSize.java diff --git a/jdk/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java b/test/jdk/sun/rmi/rmic/RMIGenerator/RmicDefault.java similarity index 100% rename from jdk/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java rename to test/jdk/sun/rmi/rmic/RMIGenerator/RmicDefault.java diff --git a/jdk/test/sun/rmi/rmic/RMIGenerator/packagedir/AppletServer.java b/test/jdk/sun/rmi/rmic/RMIGenerator/packagedir/AppletServer.java similarity index 100% rename from jdk/test/sun/rmi/rmic/RMIGenerator/packagedir/AppletServer.java rename to test/jdk/sun/rmi/rmic/RMIGenerator/packagedir/AppletServer.java diff --git a/jdk/test/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeImpl.java b/test/jdk/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeImpl.java rename to test/jdk/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeImpl.java diff --git a/jdk/test/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeInterface.java b/test/jdk/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeInterface.java similarity index 100% rename from jdk/test/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeInterface.java rename to test/jdk/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeInterface.java diff --git a/jdk/test/sun/rmi/rmic/classFileVersion/G1.java b/test/jdk/sun/rmi/rmic/classFileVersion/G1.java similarity index 100% rename from jdk/test/sun/rmi/rmic/classFileVersion/G1.java rename to test/jdk/sun/rmi/rmic/classFileVersion/G1.java diff --git a/jdk/test/sun/rmi/rmic/classFileVersion/G1Impl.java b/test/jdk/sun/rmi/rmic/classFileVersion/G1Impl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/classFileVersion/G1Impl.java rename to test/jdk/sun/rmi/rmic/classFileVersion/G1Impl.java diff --git a/jdk/test/sun/rmi/rmic/classFileVersion/run.sh b/test/jdk/sun/rmi/rmic/classFileVersion/run.sh similarity index 100% rename from jdk/test/sun/rmi/rmic/classFileVersion/run.sh rename to test/jdk/sun/rmi/rmic/classFileVersion/run.sh diff --git a/jdk/test/sun/rmi/rmic/classpath/RMICClassPathTest.java b/test/jdk/sun/rmi/rmic/classpath/RMICClassPathTest.java similarity index 100% rename from jdk/test/sun/rmi/rmic/classpath/RMICClassPathTest.java rename to test/jdk/sun/rmi/rmic/classpath/RMICClassPathTest.java diff --git a/jdk/test/sun/rmi/rmic/covariantReturns/G2.java b/test/jdk/sun/rmi/rmic/covariantReturns/G2.java similarity index 100% rename from jdk/test/sun/rmi/rmic/covariantReturns/G2.java rename to test/jdk/sun/rmi/rmic/covariantReturns/G2.java diff --git a/jdk/test/sun/rmi/rmic/covariantReturns/G2Impl.java b/test/jdk/sun/rmi/rmic/covariantReturns/G2Impl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/covariantReturns/G2Impl.java rename to test/jdk/sun/rmi/rmic/covariantReturns/G2Impl.java diff --git a/jdk/test/sun/rmi/rmic/covariantReturns/G5.java b/test/jdk/sun/rmi/rmic/covariantReturns/G5.java similarity index 100% rename from jdk/test/sun/rmi/rmic/covariantReturns/G5.java rename to test/jdk/sun/rmi/rmic/covariantReturns/G5.java diff --git a/jdk/test/sun/rmi/rmic/covariantReturns/G5Impl.java b/test/jdk/sun/rmi/rmic/covariantReturns/G5Impl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/covariantReturns/G5Impl.java rename to test/jdk/sun/rmi/rmic/covariantReturns/G5Impl.java diff --git a/jdk/test/sun/rmi/rmic/covariantReturns/run.sh b/test/jdk/sun/rmi/rmic/covariantReturns/run.sh similarity index 100% rename from jdk/test/sun/rmi/rmic/covariantReturns/run.sh rename to test/jdk/sun/rmi/rmic/covariantReturns/run.sh diff --git a/jdk/test/sun/rmi/rmic/defaultStubVersion/G1.java b/test/jdk/sun/rmi/rmic/defaultStubVersion/G1.java similarity index 100% rename from jdk/test/sun/rmi/rmic/defaultStubVersion/G1.java rename to test/jdk/sun/rmi/rmic/defaultStubVersion/G1.java diff --git a/jdk/test/sun/rmi/rmic/defaultStubVersion/G1Impl.java b/test/jdk/sun/rmi/rmic/defaultStubVersion/G1Impl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/defaultStubVersion/G1Impl.java rename to test/jdk/sun/rmi/rmic/defaultStubVersion/G1Impl.java diff --git a/jdk/test/sun/rmi/rmic/defaultStubVersion/run.sh b/test/jdk/sun/rmi/rmic/defaultStubVersion/run.sh similarity index 100% rename from jdk/test/sun/rmi/rmic/defaultStubVersion/run.sh rename to test/jdk/sun/rmi/rmic/defaultStubVersion/run.sh diff --git a/jdk/test/sun/rmi/rmic/extraCompilation/run.sh b/test/jdk/sun/rmi/rmic/extraCompilation/run.sh similarity index 100% rename from jdk/test/sun/rmi/rmic/extraCompilation/run.sh rename to test/jdk/sun/rmi/rmic/extraCompilation/run.sh diff --git a/jdk/test/sun/rmi/rmic/iiopCompilation/IIOPCompilation.java b/test/jdk/sun/rmi/rmic/iiopCompilation/IIOPCompilation.java similarity index 100% rename from jdk/test/sun/rmi/rmic/iiopCompilation/IIOPCompilation.java rename to test/jdk/sun/rmi/rmic/iiopCompilation/IIOPCompilation.java diff --git a/jdk/test/sun/rmi/rmic/manifestClassPath/Util.sh b/test/jdk/sun/rmi/rmic/manifestClassPath/Util.sh similarity index 100% rename from jdk/test/sun/rmi/rmic/manifestClassPath/Util.sh rename to test/jdk/sun/rmi/rmic/manifestClassPath/Util.sh diff --git a/jdk/test/sun/rmi/rmic/manifestClassPath/run.sh b/test/jdk/sun/rmi/rmic/manifestClassPath/run.sh similarity index 100% rename from jdk/test/sun/rmi/rmic/manifestClassPath/run.sh rename to test/jdk/sun/rmi/rmic/manifestClassPath/run.sh diff --git a/jdk/test/sun/rmi/rmic/minimizeWrapperInstances/P.java b/test/jdk/sun/rmi/rmic/minimizeWrapperInstances/P.java similarity index 100% rename from jdk/test/sun/rmi/rmic/minimizeWrapperInstances/P.java rename to test/jdk/sun/rmi/rmic/minimizeWrapperInstances/P.java diff --git a/jdk/test/sun/rmi/rmic/minimizeWrapperInstances/PImpl.java b/test/jdk/sun/rmi/rmic/minimizeWrapperInstances/PImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/minimizeWrapperInstances/PImpl.java rename to test/jdk/sun/rmi/rmic/minimizeWrapperInstances/PImpl.java diff --git a/jdk/test/sun/rmi/rmic/minimizeWrapperInstances/Test.java b/test/jdk/sun/rmi/rmic/minimizeWrapperInstances/Test.java similarity index 100% rename from jdk/test/sun/rmi/rmic/minimizeWrapperInstances/Test.java rename to test/jdk/sun/rmi/rmic/minimizeWrapperInstances/Test.java diff --git a/jdk/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh b/test/jdk/sun/rmi/rmic/minimizeWrapperInstances/run.sh similarity index 100% rename from jdk/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh rename to test/jdk/sun/rmi/rmic/minimizeWrapperInstances/run.sh diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/Agent.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/Agent.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/Agent.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/Agent.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/AgentServer.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/AgentServer.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/AgentServer.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/AgentServer.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/AgentServerImpl.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/AgentServerImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/AgentServerImpl.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/AgentServerImpl.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/Apple.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/Apple.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/Apple.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/Apple.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/AppleEvent.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleEvent.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/AppleEvent.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleEvent.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/AppleImpl.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/AppleImpl.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleImpl.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/AppleUser.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleUser.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/AppleUser.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleUser.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/Callback.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/Callback.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/Callback.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/Callback.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/ComputeServer.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/ComputeServer.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/ComputeServer.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/ComputeServer.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/ComputeServerImpl.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/ComputeServerImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/ComputeServerImpl.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/ComputeServerImpl.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/CountInterface.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/CountInterface.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/CountInterface.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/CountInterface.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/CountServerImpl.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/CountServerImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/CountServerImpl.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/CountServerImpl.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/DayTimeInterface.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/DayTimeInterface.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/DayTimeInterface.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/DayTimeInterface.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/DayTimeServerImpl.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/DayTimeServerImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/DayTimeServerImpl.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/DayTimeServerImpl.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/G1.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/G1.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/G1.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/G1.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/G1Impl.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/G1Impl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/G1Impl.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/G1Impl.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/MyObject.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/MyObject.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/MyObject.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/MyObject.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/MyObjectImpl.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/MyObjectImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/MyObjectImpl.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/MyObjectImpl.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/NotActivatableInterface.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/NotActivatableInterface.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/NotActivatableInterface.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/NotActivatableInterface.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/NotActivatableServerImpl.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/NotActivatableServerImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/NotActivatableServerImpl.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/NotActivatableServerImpl.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/Orange.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/Orange.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/Orange.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/Orange.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/OrangeEcho.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/OrangeEcho.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/OrangeEcho.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/OrangeEcho.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/OrangeEchoImpl.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/OrangeEchoImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/OrangeEchoImpl.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/OrangeEchoImpl.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/OrangeImpl.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/OrangeImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/OrangeImpl.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/OrangeImpl.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/Server.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/Server.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/Server.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/Server.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/ServerImpl.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/ServerImpl.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/ServerImpl.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/ServerImpl.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/Task.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/Task.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/Task.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/Task.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/TestInterface.java b/test/jdk/sun/rmi/rmic/newrmic/equivalence/TestInterface.java similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/TestInterface.java rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/TestInterface.java diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/batch.sh b/test/jdk/sun/rmi/rmic/newrmic/equivalence/batch.sh similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/batch.sh rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/batch.sh diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/run.sh b/test/jdk/sun/rmi/rmic/newrmic/equivalence/run.sh similarity index 100% rename from jdk/test/sun/rmi/rmic/newrmic/equivalence/run.sh rename to test/jdk/sun/rmi/rmic/newrmic/equivalence/run.sh diff --git a/jdk/test/sun/rmi/rmic/oldjavacRemoved/Foo.java b/test/jdk/sun/rmi/rmic/oldjavacRemoved/Foo.java similarity index 100% rename from jdk/test/sun/rmi/rmic/oldjavacRemoved/Foo.java rename to test/jdk/sun/rmi/rmic/oldjavacRemoved/Foo.java diff --git a/jdk/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh b/test/jdk/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh similarity index 100% rename from jdk/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh rename to test/jdk/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh diff --git a/jdk/test/sun/rmi/runtime/Log/4504153/Test4504153.java b/test/jdk/sun/rmi/runtime/Log/4504153/Test4504153.java similarity index 100% rename from jdk/test/sun/rmi/runtime/Log/4504153/Test4504153.java rename to test/jdk/sun/rmi/runtime/Log/4504153/Test4504153.java diff --git a/jdk/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java b/test/jdk/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java similarity index 100% rename from jdk/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java rename to test/jdk/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java diff --git a/jdk/test/sun/rmi/runtime/Log/6409194/logging.properties b/test/jdk/sun/rmi/runtime/Log/6409194/logging.properties similarity index 100% rename from jdk/test/sun/rmi/runtime/Log/6409194/logging.properties rename to test/jdk/sun/rmi/runtime/Log/6409194/logging.properties diff --git a/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java b/test/jdk/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java similarity index 100% rename from jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java rename to test/jdk/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java diff --git a/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java b/test/jdk/sun/rmi/runtime/Log/checkLogging/CheckLogging.java similarity index 100% rename from jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java rename to test/jdk/sun/rmi/runtime/Log/checkLogging/CheckLogging.java diff --git a/jdk/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java b/test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java similarity index 100% rename from jdk/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java rename to test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java diff --git a/jdk/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub_Stub.java b/test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub_Stub.java similarity index 100% rename from jdk/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub_Stub.java rename to test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub_Stub.java diff --git a/jdk/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/Receiver.java b/test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/Receiver.java similarity index 100% rename from jdk/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/Receiver.java rename to test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/Receiver.java diff --git a/jdk/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy b/test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy similarity index 100% rename from jdk/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy rename to test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy diff --git a/jdk/test/sun/rmi/transport/tcp/DeadCachedConnection.java b/test/jdk/sun/rmi/transport/tcp/DeadCachedConnection.java similarity index 100% rename from jdk/test/sun/rmi/transport/tcp/DeadCachedConnection.java rename to test/jdk/sun/rmi/transport/tcp/DeadCachedConnection.java diff --git a/jdk/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java b/test/jdk/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java similarity index 100% rename from jdk/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java rename to test/jdk/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java diff --git a/jdk/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java b/test/jdk/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java similarity index 100% rename from jdk/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java rename to test/jdk/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java diff --git a/jdk/test/sun/security/TestSignatureOidHelper.java b/test/jdk/sun/security/TestSignatureOidHelper.java similarity index 100% rename from jdk/test/sun/security/TestSignatureOidHelper.java rename to test/jdk/sun/security/TestSignatureOidHelper.java diff --git a/jdk/test/sun/security/action/Generify.java b/test/jdk/sun/security/action/Generify.java similarity index 100% rename from jdk/test/sun/security/action/Generify.java rename to test/jdk/sun/security/action/Generify.java diff --git a/jdk/test/sun/security/action/GetLongAction/ReturnNullIfNoDefault.java b/test/jdk/sun/security/action/GetLongAction/ReturnNullIfNoDefault.java similarity index 100% rename from jdk/test/sun/security/action/GetLongAction/ReturnNullIfNoDefault.java rename to test/jdk/sun/security/action/GetLongAction/ReturnNullIfNoDefault.java diff --git a/jdk/test/sun/security/ec/InvalidCurve.java b/test/jdk/sun/security/ec/InvalidCurve.java similarity index 100% rename from jdk/test/sun/security/ec/InvalidCurve.java rename to test/jdk/sun/security/ec/InvalidCurve.java diff --git a/jdk/test/sun/security/ec/NSASuiteB/TestSHAwithECDSASignatureOids.java b/test/jdk/sun/security/ec/NSASuiteB/TestSHAwithECDSASignatureOids.java similarity index 100% rename from jdk/test/sun/security/ec/NSASuiteB/TestSHAwithECDSASignatureOids.java rename to test/jdk/sun/security/ec/NSASuiteB/TestSHAwithECDSASignatureOids.java diff --git a/jdk/test/sun/security/ec/SignatureOffsets.java b/test/jdk/sun/security/ec/SignatureOffsets.java similarity index 100% rename from jdk/test/sun/security/ec/SignatureOffsets.java rename to test/jdk/sun/security/ec/SignatureOffsets.java diff --git a/jdk/test/sun/security/ec/SignedObjectChain.java b/test/jdk/sun/security/ec/SignedObjectChain.java similarity index 100% rename from jdk/test/sun/security/ec/SignedObjectChain.java rename to test/jdk/sun/security/ec/SignedObjectChain.java diff --git a/jdk/test/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/TestEC.java similarity index 100% rename from jdk/test/sun/security/ec/TestEC.java rename to test/jdk/sun/security/ec/TestEC.java diff --git a/jdk/test/sun/security/ec/TestEC.policy b/test/jdk/sun/security/ec/TestEC.policy similarity index 100% rename from jdk/test/sun/security/ec/TestEC.policy rename to test/jdk/sun/security/ec/TestEC.policy diff --git a/jdk/test/sun/security/ec/certs/sunlabscerts.pem b/test/jdk/sun/security/ec/certs/sunlabscerts.pem similarity index 100% rename from jdk/test/sun/security/ec/certs/sunlabscerts.pem rename to test/jdk/sun/security/ec/certs/sunlabscerts.pem diff --git a/jdk/test/sun/security/ec/keystore b/test/jdk/sun/security/ec/keystore similarity index 100% rename from jdk/test/sun/security/ec/keystore rename to test/jdk/sun/security/ec/keystore diff --git a/jdk/test/sun/security/ec/p12passwords.txt b/test/jdk/sun/security/ec/p12passwords.txt similarity index 100% rename from jdk/test/sun/security/ec/p12passwords.txt rename to test/jdk/sun/security/ec/p12passwords.txt diff --git a/jdk/test/sun/security/ec/pkcs12/secp256r1server-secp384r1ca.p12 b/test/jdk/sun/security/ec/pkcs12/secp256r1server-secp384r1ca.p12 similarity index 100% rename from jdk/test/sun/security/ec/pkcs12/secp256r1server-secp384r1ca.p12 rename to test/jdk/sun/security/ec/pkcs12/secp256r1server-secp384r1ca.p12 diff --git a/jdk/test/sun/security/ec/pkcs12/sect193r1server-rsa1024ca.p12 b/test/jdk/sun/security/ec/pkcs12/sect193r1server-rsa1024ca.p12 similarity index 100% rename from jdk/test/sun/security/ec/pkcs12/sect193r1server-rsa1024ca.p12 rename to test/jdk/sun/security/ec/pkcs12/sect193r1server-rsa1024ca.p12 diff --git a/jdk/test/sun/security/ec/truststore b/test/jdk/sun/security/ec/truststore similarity index 100% rename from jdk/test/sun/security/ec/truststore rename to test/jdk/sun/security/ec/truststore diff --git a/jdk/test/sun/security/jca/PreferredProviderNegativeTest.java b/test/jdk/sun/security/jca/PreferredProviderNegativeTest.java similarity index 100% rename from jdk/test/sun/security/jca/PreferredProviderNegativeTest.java rename to test/jdk/sun/security/jca/PreferredProviderNegativeTest.java diff --git a/jdk/test/sun/security/jca/PreferredProviderTest.java b/test/jdk/sun/security/jca/PreferredProviderTest.java similarity index 100% rename from jdk/test/sun/security/jca/PreferredProviderTest.java rename to test/jdk/sun/security/jca/PreferredProviderTest.java diff --git a/jdk/test/sun/security/jgss/CtorTests2.java b/test/jdk/sun/security/jgss/CtorTests2.java similarity index 100% rename from jdk/test/sun/security/jgss/CtorTests2.java rename to test/jdk/sun/security/jgss/CtorTests2.java diff --git a/jdk/test/sun/security/jgss/DefaultGssConfig.java b/test/jdk/sun/security/jgss/DefaultGssConfig.java similarity index 100% rename from jdk/test/sun/security/jgss/DefaultGssConfig.java rename to test/jdk/sun/security/jgss/DefaultGssConfig.java diff --git a/jdk/test/sun/security/jgss/GssMemoryIssues.java b/test/jdk/sun/security/jgss/GssMemoryIssues.java similarity index 100% rename from jdk/test/sun/security/jgss/GssMemoryIssues.java rename to test/jdk/sun/security/jgss/GssMemoryIssues.java diff --git a/jdk/test/sun/security/jgss/GssNPE.java b/test/jdk/sun/security/jgss/GssNPE.java similarity index 100% rename from jdk/test/sun/security/jgss/GssNPE.java rename to test/jdk/sun/security/jgss/GssNPE.java diff --git a/jdk/test/sun/security/jgss/spnego/MSOID.java b/test/jdk/sun/security/jgss/spnego/MSOID.java similarity index 100% rename from jdk/test/sun/security/jgss/spnego/MSOID.java rename to test/jdk/sun/security/jgss/spnego/MSOID.java diff --git a/jdk/test/sun/security/jgss/spnego/MechTokenMissing.java b/test/jdk/sun/security/jgss/spnego/MechTokenMissing.java similarity index 100% rename from jdk/test/sun/security/jgss/spnego/MechTokenMissing.java rename to test/jdk/sun/security/jgss/spnego/MechTokenMissing.java diff --git a/jdk/test/sun/security/jgss/spnego/NegTokenTargFields.java b/test/jdk/sun/security/jgss/spnego/NegTokenTargFields.java similarity index 100% rename from jdk/test/sun/security/jgss/spnego/NegTokenTargFields.java rename to test/jdk/sun/security/jgss/spnego/NegTokenTargFields.java diff --git a/jdk/test/sun/security/jgss/spnego/NoSpnegoAsDefMech.java b/test/jdk/sun/security/jgss/spnego/NoSpnegoAsDefMech.java similarity index 100% rename from jdk/test/sun/security/jgss/spnego/NoSpnegoAsDefMech.java rename to test/jdk/sun/security/jgss/spnego/NoSpnegoAsDefMech.java diff --git a/jdk/test/sun/security/jgss/spnego/NotPreferredMech.java b/test/jdk/sun/security/jgss/spnego/NotPreferredMech.java similarity index 100% rename from jdk/test/sun/security/jgss/spnego/NotPreferredMech.java rename to test/jdk/sun/security/jgss/spnego/NotPreferredMech.java diff --git a/jdk/test/sun/security/jgss/spnego/msoid.txt b/test/jdk/sun/security/jgss/spnego/msoid.txt similarity index 100% rename from jdk/test/sun/security/jgss/spnego/msoid.txt rename to test/jdk/sun/security/jgss/spnego/msoid.txt diff --git a/jdk/test/sun/security/krb5/BadKdcDefaultValue.java b/test/jdk/sun/security/krb5/BadKdcDefaultValue.java similarity index 100% rename from jdk/test/sun/security/krb5/BadKdcDefaultValue.java rename to test/jdk/sun/security/krb5/BadKdcDefaultValue.java diff --git a/jdk/test/sun/security/krb5/IPv6.java b/test/jdk/sun/security/krb5/IPv6.java similarity index 100% rename from jdk/test/sun/security/krb5/IPv6.java rename to test/jdk/sun/security/krb5/IPv6.java diff --git a/jdk/test/sun/security/krb5/Krb5NameEquals.java b/test/jdk/sun/security/krb5/Krb5NameEquals.java similarity index 100% rename from jdk/test/sun/security/krb5/Krb5NameEquals.java rename to test/jdk/sun/security/krb5/Krb5NameEquals.java diff --git a/jdk/test/sun/security/krb5/KrbCredSubKey.java b/test/jdk/sun/security/krb5/KrbCredSubKey.java similarity index 100% rename from jdk/test/sun/security/krb5/KrbCredSubKey.java rename to test/jdk/sun/security/krb5/KrbCredSubKey.java diff --git a/jdk/test/sun/security/krb5/MicroTime.java b/test/jdk/sun/security/krb5/MicroTime.java similarity index 100% rename from jdk/test/sun/security/krb5/MicroTime.java rename to test/jdk/sun/security/krb5/MicroTime.java diff --git a/jdk/test/sun/security/krb5/NegativeNonce.java b/test/jdk/sun/security/krb5/NegativeNonce.java similarity index 100% rename from jdk/test/sun/security/krb5/NegativeNonce.java rename to test/jdk/sun/security/krb5/NegativeNonce.java diff --git a/jdk/test/sun/security/krb5/OptionPADataInKDCReq.java b/test/jdk/sun/security/krb5/OptionPADataInKDCReq.java similarity index 100% rename from jdk/test/sun/security/krb5/OptionPADataInKDCReq.java rename to test/jdk/sun/security/krb5/OptionPADataInKDCReq.java diff --git a/jdk/test/sun/security/krb5/RFC396xTest.java b/test/jdk/sun/security/krb5/RFC396xTest.java similarity index 100% rename from jdk/test/sun/security/krb5/RFC396xTest.java rename to test/jdk/sun/security/krb5/RFC396xTest.java diff --git a/jdk/test/sun/security/krb5/ServiceCredsCombination.java b/test/jdk/sun/security/krb5/ServiceCredsCombination.java similarity index 100% rename from jdk/test/sun/security/krb5/ServiceCredsCombination.java rename to test/jdk/sun/security/krb5/ServiceCredsCombination.java diff --git a/jdk/test/sun/security/krb5/TestPAData.java b/test/jdk/sun/security/krb5/TestPAData.java similarity index 100% rename from jdk/test/sun/security/krb5/TestPAData.java rename to test/jdk/sun/security/krb5/TestPAData.java diff --git a/jdk/test/sun/security/krb5/UnknownCCEntry.java b/test/jdk/sun/security/krb5/UnknownCCEntry.java similarity index 100% rename from jdk/test/sun/security/krb5/UnknownCCEntry.java rename to test/jdk/sun/security/krb5/UnknownCCEntry.java diff --git a/jdk/test/sun/security/krb5/auto/AcceptPermissions.java b/test/jdk/sun/security/krb5/auto/AcceptPermissions.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/AcceptPermissions.java rename to test/jdk/sun/security/krb5/auto/AcceptPermissions.java diff --git a/jdk/test/sun/security/krb5/auto/AcceptorSubKey.java b/test/jdk/sun/security/krb5/auto/AcceptorSubKey.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/AcceptorSubKey.java rename to test/jdk/sun/security/krb5/auto/AcceptorSubKey.java diff --git a/jdk/test/sun/security/krb5/auto/Action.java b/test/jdk/sun/security/krb5/auto/Action.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/Action.java rename to test/jdk/sun/security/krb5/auto/Action.java diff --git a/jdk/test/sun/security/krb5/auto/Addresses.java b/test/jdk/sun/security/krb5/auto/Addresses.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/Addresses.java rename to test/jdk/sun/security/krb5/auto/Addresses.java diff --git a/jdk/test/sun/security/krb5/auto/AddressesAndNameType.java b/test/jdk/sun/security/krb5/auto/AddressesAndNameType.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/AddressesAndNameType.java rename to test/jdk/sun/security/krb5/auto/AddressesAndNameType.java diff --git a/jdk/test/sun/security/krb5/auto/Basic.java b/test/jdk/sun/security/krb5/auto/Basic.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/Basic.java rename to test/jdk/sun/security/krb5/auto/Basic.java diff --git a/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java b/test/jdk/sun/security/krb5/auto/BasicKrb5Test.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/BasicKrb5Test.java rename to test/jdk/sun/security/krb5/auto/BasicKrb5Test.java diff --git a/jdk/test/sun/security/krb5/auto/BasicProc.java b/test/jdk/sun/security/krb5/auto/BasicProc.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/BasicProc.java rename to test/jdk/sun/security/krb5/auto/BasicProc.java diff --git a/jdk/test/sun/security/krb5/auto/BogusKDC.java b/test/jdk/sun/security/krb5/auto/BogusKDC.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/BogusKDC.java rename to test/jdk/sun/security/krb5/auto/BogusKDC.java diff --git a/jdk/test/sun/security/krb5/auto/CleanState.java b/test/jdk/sun/security/krb5/auto/CleanState.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/CleanState.java rename to test/jdk/sun/security/krb5/auto/CleanState.java diff --git a/jdk/test/sun/security/krb5/auto/Context.java b/test/jdk/sun/security/krb5/auto/Context.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/Context.java rename to test/jdk/sun/security/krb5/auto/Context.java diff --git a/jdk/test/sun/security/krb5/auto/CrossRealm.java b/test/jdk/sun/security/krb5/auto/CrossRealm.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/CrossRealm.java rename to test/jdk/sun/security/krb5/auto/CrossRealm.java diff --git a/jdk/test/sun/security/krb5/auto/DiffNameSameKey.java b/test/jdk/sun/security/krb5/auto/DiffNameSameKey.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/DiffNameSameKey.java rename to test/jdk/sun/security/krb5/auto/DiffNameSameKey.java diff --git a/jdk/test/sun/security/krb5/auto/DupEtypes.java b/test/jdk/sun/security/krb5/auto/DupEtypes.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/DupEtypes.java rename to test/jdk/sun/security/krb5/auto/DupEtypes.java diff --git a/jdk/test/sun/security/krb5/auto/DynamicKeytab.java b/test/jdk/sun/security/krb5/auto/DynamicKeytab.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/DynamicKeytab.java rename to test/jdk/sun/security/krb5/auto/DynamicKeytab.java diff --git a/jdk/test/sun/security/krb5/auto/EmptyPassword.java b/test/jdk/sun/security/krb5/auto/EmptyPassword.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/EmptyPassword.java rename to test/jdk/sun/security/krb5/auto/EmptyPassword.java diff --git a/jdk/test/sun/security/krb5/auto/FileKeyTab.java b/test/jdk/sun/security/krb5/auto/FileKeyTab.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/FileKeyTab.java rename to test/jdk/sun/security/krb5/auto/FileKeyTab.java diff --git a/jdk/test/sun/security/krb5/auto/ForwardableCheck.java b/test/jdk/sun/security/krb5/auto/ForwardableCheck.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/ForwardableCheck.java rename to test/jdk/sun/security/krb5/auto/ForwardableCheck.java diff --git a/jdk/test/sun/security/krb5/auto/Forwarded.java b/test/jdk/sun/security/krb5/auto/Forwarded.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/Forwarded.java rename to test/jdk/sun/security/krb5/auto/Forwarded.java diff --git a/jdk/test/sun/security/krb5/auto/GSS.java b/test/jdk/sun/security/krb5/auto/GSS.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/GSS.java rename to test/jdk/sun/security/krb5/auto/GSS.java diff --git a/jdk/test/sun/security/krb5/auto/GSSUnbound.java b/test/jdk/sun/security/krb5/auto/GSSUnbound.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/GSSUnbound.java rename to test/jdk/sun/security/krb5/auto/GSSUnbound.java diff --git a/jdk/test/sun/security/krb5/auto/Helper.java b/test/jdk/sun/security/krb5/auto/Helper.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/Helper.java rename to test/jdk/sun/security/krb5/auto/Helper.java diff --git a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java b/test/jdk/sun/security/krb5/auto/HttpNegotiateServer.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java rename to test/jdk/sun/security/krb5/auto/HttpNegotiateServer.java diff --git a/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java b/test/jdk/sun/security/krb5/auto/IgnoreChannelBinding.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java rename to test/jdk/sun/security/krb5/auto/IgnoreChannelBinding.java diff --git a/jdk/test/sun/security/krb5/auto/KDC.java b/test/jdk/sun/security/krb5/auto/KDC.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/KDC.java rename to test/jdk/sun/security/krb5/auto/KDC.java diff --git a/jdk/test/sun/security/krb5/auto/KPEquals.java b/test/jdk/sun/security/krb5/auto/KPEquals.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/KPEquals.java rename to test/jdk/sun/security/krb5/auto/KPEquals.java diff --git a/jdk/test/sun/security/krb5/auto/KdcPolicy.java b/test/jdk/sun/security/krb5/auto/KdcPolicy.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/KdcPolicy.java rename to test/jdk/sun/security/krb5/auto/KdcPolicy.java diff --git a/jdk/test/sun/security/krb5/auto/KeyPermissions.java b/test/jdk/sun/security/krb5/auto/KeyPermissions.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/KeyPermissions.java rename to test/jdk/sun/security/krb5/auto/KeyPermissions.java diff --git a/jdk/test/sun/security/krb5/auto/KeyTabCompat.java b/test/jdk/sun/security/krb5/auto/KeyTabCompat.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/KeyTabCompat.java rename to test/jdk/sun/security/krb5/auto/KeyTabCompat.java diff --git a/jdk/test/sun/security/krb5/auto/KrbTicket.java b/test/jdk/sun/security/krb5/auto/KrbTicket.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/KrbTicket.java rename to test/jdk/sun/security/krb5/auto/KrbTicket.java diff --git a/jdk/test/sun/security/krb5/auto/KvnoNA.java b/test/jdk/sun/security/krb5/auto/KvnoNA.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/KvnoNA.java rename to test/jdk/sun/security/krb5/auto/KvnoNA.java diff --git a/jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java b/test/jdk/sun/security/krb5/auto/LifeTimeInSeconds.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java rename to test/jdk/sun/security/krb5/auto/LifeTimeInSeconds.java diff --git a/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java b/test/jdk/sun/security/krb5/auto/LoginModuleOptions.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/LoginModuleOptions.java rename to test/jdk/sun/security/krb5/auto/LoginModuleOptions.java diff --git a/jdk/test/sun/security/krb5/auto/LoginNoPass.java b/test/jdk/sun/security/krb5/auto/LoginNoPass.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/LoginNoPass.java rename to test/jdk/sun/security/krb5/auto/LoginNoPass.java diff --git a/jdk/test/sun/security/krb5/auto/LongLife.java b/test/jdk/sun/security/krb5/auto/LongLife.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/LongLife.java rename to test/jdk/sun/security/krb5/auto/LongLife.java diff --git a/jdk/test/sun/security/krb5/auto/MSOID2.java b/test/jdk/sun/security/krb5/auto/MSOID2.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/MSOID2.java rename to test/jdk/sun/security/krb5/auto/MSOID2.java diff --git a/jdk/test/sun/security/krb5/auto/ModuleName.java b/test/jdk/sun/security/krb5/auto/ModuleName.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/ModuleName.java rename to test/jdk/sun/security/krb5/auto/ModuleName.java diff --git a/jdk/test/sun/security/krb5/auto/MoreKvno.java b/test/jdk/sun/security/krb5/auto/MoreKvno.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/MoreKvno.java rename to test/jdk/sun/security/krb5/auto/MoreKvno.java diff --git a/jdk/test/sun/security/krb5/auto/NewInquireTypes.java b/test/jdk/sun/security/krb5/auto/NewInquireTypes.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/NewInquireTypes.java rename to test/jdk/sun/security/krb5/auto/NewInquireTypes.java diff --git a/jdk/test/sun/security/krb5/auto/NewSalt.java b/test/jdk/sun/security/krb5/auto/NewSalt.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/NewSalt.java rename to test/jdk/sun/security/krb5/auto/NewSalt.java diff --git a/jdk/test/sun/security/krb5/auto/NoAddresses.java b/test/jdk/sun/security/krb5/auto/NoAddresses.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/NoAddresses.java rename to test/jdk/sun/security/krb5/auto/NoAddresses.java diff --git a/jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java b/test/jdk/sun/security/krb5/auto/NoInitNoKeytab.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java rename to test/jdk/sun/security/krb5/auto/NoInitNoKeytab.java diff --git a/jdk/test/sun/security/krb5/auto/NonMutualSpnego.java b/test/jdk/sun/security/krb5/auto/NonMutualSpnego.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/NonMutualSpnego.java rename to test/jdk/sun/security/krb5/auto/NonMutualSpnego.java diff --git a/jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java b/test/jdk/sun/security/krb5/auto/NoneReplayCacheTest.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java rename to test/jdk/sun/security/krb5/auto/NoneReplayCacheTest.java diff --git a/jdk/test/sun/security/krb5/auto/NullRenewUntil.java b/test/jdk/sun/security/krb5/auto/NullRenewUntil.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/NullRenewUntil.java rename to test/jdk/sun/security/krb5/auto/NullRenewUntil.java diff --git a/jdk/test/sun/security/krb5/auto/OkAsDelegate.java b/test/jdk/sun/security/krb5/auto/OkAsDelegate.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/OkAsDelegate.java rename to test/jdk/sun/security/krb5/auto/OkAsDelegate.java diff --git a/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java b/test/jdk/sun/security/krb5/auto/OkAsDelegateXRealm.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java rename to test/jdk/sun/security/krb5/auto/OkAsDelegateXRealm.java diff --git a/jdk/test/sun/security/krb5/auto/OneKDC.java b/test/jdk/sun/security/krb5/auto/OneKDC.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/OneKDC.java rename to test/jdk/sun/security/krb5/auto/OneKDC.java diff --git a/jdk/test/sun/security/krb5/auto/OnlyDesLogin.java b/test/jdk/sun/security/krb5/auto/OnlyDesLogin.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/OnlyDesLogin.java rename to test/jdk/sun/security/krb5/auto/OnlyDesLogin.java diff --git a/jdk/test/sun/security/krb5/auto/PrincipalNameEquals.java b/test/jdk/sun/security/krb5/auto/PrincipalNameEquals.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/PrincipalNameEquals.java rename to test/jdk/sun/security/krb5/auto/PrincipalNameEquals.java diff --git a/jdk/test/sun/security/krb5/auto/RRC.java b/test/jdk/sun/security/krb5/auto/RRC.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/RRC.java rename to test/jdk/sun/security/krb5/auto/RRC.java diff --git a/jdk/test/sun/security/krb5/auto/RefreshKrb5Config.java b/test/jdk/sun/security/krb5/auto/RefreshKrb5Config.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/RefreshKrb5Config.java rename to test/jdk/sun/security/krb5/auto/RefreshKrb5Config.java diff --git a/jdk/test/sun/security/krb5/auto/Renew.java b/test/jdk/sun/security/krb5/auto/Renew.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/Renew.java rename to test/jdk/sun/security/krb5/auto/Renew.java diff --git a/jdk/test/sun/security/krb5/auto/Renewal.java b/test/jdk/sun/security/krb5/auto/Renewal.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/Renewal.java rename to test/jdk/sun/security/krb5/auto/Renewal.java diff --git a/jdk/test/sun/security/krb5/auto/ReplayCacheExpunge.java b/test/jdk/sun/security/krb5/auto/ReplayCacheExpunge.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/ReplayCacheExpunge.java rename to test/jdk/sun/security/krb5/auto/ReplayCacheExpunge.java diff --git a/jdk/test/sun/security/krb5/auto/ReplayCachePrecise.java b/test/jdk/sun/security/krb5/auto/ReplayCachePrecise.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/ReplayCachePrecise.java rename to test/jdk/sun/security/krb5/auto/ReplayCachePrecise.java diff --git a/jdk/test/sun/security/krb5/auto/ReplayCacheTest.java b/test/jdk/sun/security/krb5/auto/ReplayCacheTest.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/ReplayCacheTest.java rename to test/jdk/sun/security/krb5/auto/ReplayCacheTest.java diff --git a/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java b/test/jdk/sun/security/krb5/auto/ReplayCacheTestProc.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java rename to test/jdk/sun/security/krb5/auto/ReplayCacheTestProc.java diff --git a/jdk/test/sun/security/krb5/auto/S4U2proxy.java b/test/jdk/sun/security/krb5/auto/S4U2proxy.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/S4U2proxy.java rename to test/jdk/sun/security/krb5/auto/S4U2proxy.java diff --git a/jdk/test/sun/security/krb5/auto/S4U2proxyGSS.java b/test/jdk/sun/security/krb5/auto/S4U2proxyGSS.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/S4U2proxyGSS.java rename to test/jdk/sun/security/krb5/auto/S4U2proxyGSS.java diff --git a/jdk/test/sun/security/krb5/auto/S4U2self.java b/test/jdk/sun/security/krb5/auto/S4U2self.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/S4U2self.java rename to test/jdk/sun/security/krb5/auto/S4U2self.java diff --git a/jdk/test/sun/security/krb5/auto/S4U2selfAsServer.java b/test/jdk/sun/security/krb5/auto/S4U2selfAsServer.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/S4U2selfAsServer.java rename to test/jdk/sun/security/krb5/auto/S4U2selfAsServer.java diff --git a/jdk/test/sun/security/krb5/auto/S4U2selfAsServerGSS.java b/test/jdk/sun/security/krb5/auto/S4U2selfAsServerGSS.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/S4U2selfAsServerGSS.java rename to test/jdk/sun/security/krb5/auto/S4U2selfAsServerGSS.java diff --git a/jdk/test/sun/security/krb5/auto/S4U2selfGSS.java b/test/jdk/sun/security/krb5/auto/S4U2selfGSS.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/S4U2selfGSS.java rename to test/jdk/sun/security/krb5/auto/S4U2selfGSS.java diff --git a/jdk/test/sun/security/krb5/auto/SPNEGO.java b/test/jdk/sun/security/krb5/auto/SPNEGO.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/SPNEGO.java rename to test/jdk/sun/security/krb5/auto/SPNEGO.java diff --git a/jdk/test/sun/security/krb5/auto/SSL.java b/test/jdk/sun/security/krb5/auto/SSL.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/SSL.java rename to test/jdk/sun/security/krb5/auto/SSL.java diff --git a/jdk/test/sun/security/krb5/auto/SSLwithPerms.java b/test/jdk/sun/security/krb5/auto/SSLwithPerms.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/SSLwithPerms.java rename to test/jdk/sun/security/krb5/auto/SSLwithPerms.java diff --git a/jdk/test/sun/security/krb5/auto/SaslBasic.java b/test/jdk/sun/security/krb5/auto/SaslBasic.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/SaslBasic.java rename to test/jdk/sun/security/krb5/auto/SaslBasic.java diff --git a/jdk/test/sun/security/krb5/auto/SaslGSS.java b/test/jdk/sun/security/krb5/auto/SaslGSS.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/SaslGSS.java rename to test/jdk/sun/security/krb5/auto/SaslGSS.java diff --git a/jdk/test/sun/security/krb5/auto/SaslUnbound.java b/test/jdk/sun/security/krb5/auto/SaslUnbound.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/SaslUnbound.java rename to test/jdk/sun/security/krb5/auto/SaslUnbound.java diff --git a/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java b/test/jdk/sun/security/krb5/auto/SpnegoLifeTime.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java rename to test/jdk/sun/security/krb5/auto/SpnegoLifeTime.java diff --git a/jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java b/test/jdk/sun/security/krb5/auto/SpnegoReqFlags.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java rename to test/jdk/sun/security/krb5/auto/SpnegoReqFlags.java diff --git a/jdk/test/sun/security/krb5/auto/TEST.properties b/test/jdk/sun/security/krb5/auto/TEST.properties similarity index 100% rename from jdk/test/sun/security/krb5/auto/TEST.properties rename to test/jdk/sun/security/krb5/auto/TEST.properties diff --git a/jdk/test/sun/security/krb5/auto/Test5653.java b/test/jdk/sun/security/krb5/auto/Test5653.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/Test5653.java rename to test/jdk/sun/security/krb5/auto/Test5653.java diff --git a/jdk/test/sun/security/krb5/auto/TestHosts b/test/jdk/sun/security/krb5/auto/TestHosts similarity index 100% rename from jdk/test/sun/security/krb5/auto/TestHosts rename to test/jdk/sun/security/krb5/auto/TestHosts diff --git a/jdk/test/sun/security/krb5/auto/TicketSName.java b/test/jdk/sun/security/krb5/auto/TicketSName.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/TicketSName.java rename to test/jdk/sun/security/krb5/auto/TicketSName.java diff --git a/jdk/test/sun/security/krb5/auto/TwoOrThree.java b/test/jdk/sun/security/krb5/auto/TwoOrThree.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/TwoOrThree.java rename to test/jdk/sun/security/krb5/auto/TwoOrThree.java diff --git a/jdk/test/sun/security/krb5/auto/TwoPrinces.java b/test/jdk/sun/security/krb5/auto/TwoPrinces.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/TwoPrinces.java rename to test/jdk/sun/security/krb5/auto/TwoPrinces.java diff --git a/jdk/test/sun/security/krb5/auto/TwoTab.java b/test/jdk/sun/security/krb5/auto/TwoTab.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/TwoTab.java rename to test/jdk/sun/security/krb5/auto/TwoTab.java diff --git a/jdk/test/sun/security/krb5/auto/UnboundSSL.java b/test/jdk/sun/security/krb5/auto/UnboundSSL.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/UnboundSSL.java rename to test/jdk/sun/security/krb5/auto/UnboundSSL.java diff --git a/jdk/test/sun/security/krb5/auto/UnboundSSLMultipleKeys.java b/test/jdk/sun/security/krb5/auto/UnboundSSLMultipleKeys.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/UnboundSSLMultipleKeys.java rename to test/jdk/sun/security/krb5/auto/UnboundSSLMultipleKeys.java diff --git a/jdk/test/sun/security/krb5/auto/UnboundSSLPrincipalProperty.java b/test/jdk/sun/security/krb5/auto/UnboundSSLPrincipalProperty.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/UnboundSSLPrincipalProperty.java rename to test/jdk/sun/security/krb5/auto/UnboundSSLPrincipalProperty.java diff --git a/jdk/test/sun/security/krb5/auto/UnboundSSLUtils.java b/test/jdk/sun/security/krb5/auto/UnboundSSLUtils.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/UnboundSSLUtils.java rename to test/jdk/sun/security/krb5/auto/UnboundSSLUtils.java diff --git a/jdk/test/sun/security/krb5/auto/UnboundService.java b/test/jdk/sun/security/krb5/auto/UnboundService.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/UnboundService.java rename to test/jdk/sun/security/krb5/auto/UnboundService.java diff --git a/jdk/test/sun/security/krb5/auto/Unreachable.java b/test/jdk/sun/security/krb5/auto/Unreachable.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/Unreachable.java rename to test/jdk/sun/security/krb5/auto/Unreachable.java diff --git a/jdk/test/sun/security/krb5/auto/UseCacheAndStoreKey.java b/test/jdk/sun/security/krb5/auto/UseCacheAndStoreKey.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/UseCacheAndStoreKey.java rename to test/jdk/sun/security/krb5/auto/UseCacheAndStoreKey.java diff --git a/jdk/test/sun/security/krb5/auto/W83.java b/test/jdk/sun/security/krb5/auto/W83.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/W83.java rename to test/jdk/sun/security/krb5/auto/W83.java diff --git a/jdk/test/sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java b/test/jdk/sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java rename to test/jdk/sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java diff --git a/jdk/test/sun/security/krb5/auto/principalProperty/TestHosts b/test/jdk/sun/security/krb5/auto/principalProperty/TestHosts similarity index 100% rename from jdk/test/sun/security/krb5/auto/principalProperty/TestHosts rename to test/jdk/sun/security/krb5/auto/principalProperty/TestHosts diff --git a/jdk/test/sun/security/krb5/auto/principalProperty/jaas.conf b/test/jdk/sun/security/krb5/auto/principalProperty/jaas.conf similarity index 100% rename from jdk/test/sun/security/krb5/auto/principalProperty/jaas.conf rename to test/jdk/sun/security/krb5/auto/principalProperty/jaas.conf diff --git a/jdk/test/sun/security/krb5/auto/principalProperty/principalSystemPropTest.policy b/test/jdk/sun/security/krb5/auto/principalProperty/principalSystemPropTest.policy similarity index 100% rename from jdk/test/sun/security/krb5/auto/principalProperty/principalSystemPropTest.policy rename to test/jdk/sun/security/krb5/auto/principalProperty/principalSystemPropTest.policy diff --git a/jdk/test/sun/security/krb5/auto/rcache_usemd5.sh b/test/jdk/sun/security/krb5/auto/rcache_usemd5.sh similarity index 100% rename from jdk/test/sun/security/krb5/auto/rcache_usemd5.sh rename to test/jdk/sun/security/krb5/auto/rcache_usemd5.sh diff --git a/jdk/test/sun/security/krb5/auto/refreshKrb5Config.jaas b/test/jdk/sun/security/krb5/auto/refreshKrb5Config.jaas similarity index 100% rename from jdk/test/sun/security/krb5/auto/refreshKrb5Config.jaas rename to test/jdk/sun/security/krb5/auto/refreshKrb5Config.jaas diff --git a/jdk/test/sun/security/krb5/auto/tools/KinitConfPlusProps.java b/test/jdk/sun/security/krb5/auto/tools/KinitConfPlusProps.java similarity index 100% rename from jdk/test/sun/security/krb5/auto/tools/KinitConfPlusProps.java rename to test/jdk/sun/security/krb5/auto/tools/KinitConfPlusProps.java diff --git a/jdk/test/sun/security/krb5/auto/unbound.ssl.jaas.conf b/test/jdk/sun/security/krb5/auto/unbound.ssl.jaas.conf similarity index 100% rename from jdk/test/sun/security/krb5/auto/unbound.ssl.jaas.conf rename to test/jdk/sun/security/krb5/auto/unbound.ssl.jaas.conf diff --git a/jdk/test/sun/security/krb5/auto/unbound.ssl.policy b/test/jdk/sun/security/krb5/auto/unbound.ssl.policy similarity index 100% rename from jdk/test/sun/security/krb5/auto/unbound.ssl.policy rename to test/jdk/sun/security/krb5/auto/unbound.ssl.policy diff --git a/jdk/test/sun/security/krb5/canonicalize/Test.java b/test/jdk/sun/security/krb5/canonicalize/Test.java similarity index 100% rename from jdk/test/sun/security/krb5/canonicalize/Test.java rename to test/jdk/sun/security/krb5/canonicalize/Test.java diff --git a/jdk/test/sun/security/krb5/canonicalize/TestHosts b/test/jdk/sun/security/krb5/canonicalize/TestHosts similarity index 100% rename from jdk/test/sun/security/krb5/canonicalize/TestHosts rename to test/jdk/sun/security/krb5/canonicalize/TestHosts diff --git a/jdk/test/sun/security/krb5/ccache/CorruptedCC.java b/test/jdk/sun/security/krb5/ccache/CorruptedCC.java similarity index 100% rename from jdk/test/sun/security/krb5/ccache/CorruptedCC.java rename to test/jdk/sun/security/krb5/ccache/CorruptedCC.java diff --git a/jdk/test/sun/security/krb5/ccache/DefaultFile.java b/test/jdk/sun/security/krb5/ccache/DefaultFile.java similarity index 100% rename from jdk/test/sun/security/krb5/ccache/DefaultFile.java rename to test/jdk/sun/security/krb5/ccache/DefaultFile.java diff --git a/jdk/test/sun/security/krb5/ccache/EmptyCC.java b/test/jdk/sun/security/krb5/ccache/EmptyCC.java similarity index 100% rename from jdk/test/sun/security/krb5/ccache/EmptyCC.java rename to test/jdk/sun/security/krb5/ccache/EmptyCC.java diff --git a/jdk/test/sun/security/krb5/ccache/EmptyRealmCC.java b/test/jdk/sun/security/krb5/ccache/EmptyRealmCC.java similarity index 100% rename from jdk/test/sun/security/krb5/ccache/EmptyRealmCC.java rename to test/jdk/sun/security/krb5/ccache/EmptyRealmCC.java diff --git a/jdk/test/sun/security/krb5/ccache/TimeInCCache.java b/test/jdk/sun/security/krb5/ccache/TimeInCCache.java similarity index 100% rename from jdk/test/sun/security/krb5/ccache/TimeInCCache.java rename to test/jdk/sun/security/krb5/ccache/TimeInCCache.java diff --git a/jdk/test/sun/security/krb5/config/ConfPlusProp.java b/test/jdk/sun/security/krb5/config/ConfPlusProp.java similarity index 100% rename from jdk/test/sun/security/krb5/config/ConfPlusProp.java rename to test/jdk/sun/security/krb5/config/ConfPlusProp.java diff --git a/jdk/test/sun/security/krb5/config/ConfigWithQuotations.java b/test/jdk/sun/security/krb5/config/ConfigWithQuotations.java similarity index 100% rename from jdk/test/sun/security/krb5/config/ConfigWithQuotations.java rename to test/jdk/sun/security/krb5/config/ConfigWithQuotations.java diff --git a/jdk/test/sun/security/krb5/config/DNS.java b/test/jdk/sun/security/krb5/config/DNS.java similarity index 100% rename from jdk/test/sun/security/krb5/config/DNS.java rename to test/jdk/sun/security/krb5/config/DNS.java diff --git a/jdk/test/sun/security/krb5/config/DefUdpLimit.java b/test/jdk/sun/security/krb5/config/DefUdpLimit.java similarity index 100% rename from jdk/test/sun/security/krb5/config/DefUdpLimit.java rename to test/jdk/sun/security/krb5/config/DefUdpLimit.java diff --git a/jdk/test/sun/security/krb5/config/DnsFallback.java b/test/jdk/sun/security/krb5/config/DnsFallback.java similarity index 100% rename from jdk/test/sun/security/krb5/config/DnsFallback.java rename to test/jdk/sun/security/krb5/config/DnsFallback.java diff --git a/jdk/test/sun/security/krb5/config/Duplicates.java b/test/jdk/sun/security/krb5/config/Duplicates.java similarity index 100% rename from jdk/test/sun/security/krb5/config/Duplicates.java rename to test/jdk/sun/security/krb5/config/Duplicates.java diff --git a/jdk/test/sun/security/krb5/config/Duration.java b/test/jdk/sun/security/krb5/config/Duration.java similarity index 100% rename from jdk/test/sun/security/krb5/config/Duration.java rename to test/jdk/sun/security/krb5/config/Duration.java diff --git a/jdk/test/sun/security/krb5/config/ExtraLines.java b/test/jdk/sun/security/krb5/config/ExtraLines.java similarity index 100% rename from jdk/test/sun/security/krb5/config/ExtraLines.java rename to test/jdk/sun/security/krb5/config/ExtraLines.java diff --git a/jdk/test/sun/security/krb5/config/Include.java b/test/jdk/sun/security/krb5/config/Include.java similarity index 100% rename from jdk/test/sun/security/krb5/config/Include.java rename to test/jdk/sun/security/krb5/config/Include.java diff --git a/jdk/test/sun/security/krb5/config/KdcDefaultOptions.java b/test/jdk/sun/security/krb5/config/KdcDefaultOptions.java similarity index 100% rename from jdk/test/sun/security/krb5/config/KdcDefaultOptions.java rename to test/jdk/sun/security/krb5/config/KdcDefaultOptions.java diff --git a/jdk/test/sun/security/krb5/config/ParseCAPaths.java b/test/jdk/sun/security/krb5/config/ParseCAPaths.java similarity index 100% rename from jdk/test/sun/security/krb5/config/ParseCAPaths.java rename to test/jdk/sun/security/krb5/config/ParseCAPaths.java diff --git a/jdk/test/sun/security/krb5/config/ParseConfig.java b/test/jdk/sun/security/krb5/config/ParseConfig.java similarity index 100% rename from jdk/test/sun/security/krb5/config/ParseConfig.java rename to test/jdk/sun/security/krb5/config/ParseConfig.java diff --git a/jdk/test/sun/security/krb5/config/SCDynamicConfigTest.java b/test/jdk/sun/security/krb5/config/SCDynamicConfigTest.java similarity index 100% rename from jdk/test/sun/security/krb5/config/SCDynamicConfigTest.java rename to test/jdk/sun/security/krb5/config/SCDynamicConfigTest.java diff --git a/jdk/test/sun/security/krb5/config/Semicolon.java b/test/jdk/sun/security/krb5/config/Semicolon.java similarity index 100% rename from jdk/test/sun/security/krb5/config/Semicolon.java rename to test/jdk/sun/security/krb5/config/Semicolon.java diff --git a/jdk/test/sun/security/krb5/config/YesNo.java b/test/jdk/sun/security/krb5/config/YesNo.java similarity index 100% rename from jdk/test/sun/security/krb5/config/YesNo.java rename to test/jdk/sun/security/krb5/config/YesNo.java diff --git a/jdk/test/sun/security/krb5/config/comments.conf b/test/jdk/sun/security/krb5/config/comments.conf similarity index 100% rename from jdk/test/sun/security/krb5/config/comments.conf rename to test/jdk/sun/security/krb5/config/comments.conf diff --git a/jdk/test/sun/security/krb5/config/confplusprop.conf b/test/jdk/sun/security/krb5/config/confplusprop.conf similarity index 100% rename from jdk/test/sun/security/krb5/config/confplusprop.conf rename to test/jdk/sun/security/krb5/config/confplusprop.conf diff --git a/jdk/test/sun/security/krb5/config/confplusprop2.conf b/test/jdk/sun/security/krb5/config/confplusprop2.conf similarity index 100% rename from jdk/test/sun/security/krb5/config/confplusprop2.conf rename to test/jdk/sun/security/krb5/config/confplusprop2.conf diff --git a/jdk/test/sun/security/krb5/config/edu.mit.Kerberos b/test/jdk/sun/security/krb5/config/edu.mit.Kerberos similarity index 100% rename from jdk/test/sun/security/krb5/config/edu.mit.Kerberos rename to test/jdk/sun/security/krb5/config/edu.mit.Kerberos diff --git a/jdk/test/sun/security/krb5/config/java.naming/javax/naming/spi/NamingManager.java b/test/jdk/sun/security/krb5/config/java.naming/javax/naming/spi/NamingManager.java similarity index 100% rename from jdk/test/sun/security/krb5/config/java.naming/javax/naming/spi/NamingManager.java rename to test/jdk/sun/security/krb5/config/java.naming/javax/naming/spi/NamingManager.java diff --git a/jdk/test/sun/security/krb5/config/k1.conf b/test/jdk/sun/security/krb5/config/k1.conf similarity index 100% rename from jdk/test/sun/security/krb5/config/k1.conf rename to test/jdk/sun/security/krb5/config/k1.conf diff --git a/jdk/test/sun/security/krb5/config/kdc_default_options.conf b/test/jdk/sun/security/krb5/config/kdc_default_options.conf similarity index 100% rename from jdk/test/sun/security/krb5/config/kdc_default_options.conf rename to test/jdk/sun/security/krb5/config/kdc_default_options.conf diff --git a/jdk/test/sun/security/krb5/config/krb5-capaths.conf b/test/jdk/sun/security/krb5/config/krb5-capaths.conf similarity index 100% rename from jdk/test/sun/security/krb5/config/krb5-capaths.conf rename to test/jdk/sun/security/krb5/config/krb5-capaths.conf diff --git a/jdk/test/sun/security/krb5/config/krb5.conf b/test/jdk/sun/security/krb5/config/krb5.conf similarity index 100% rename from jdk/test/sun/security/krb5/config/krb5.conf rename to test/jdk/sun/security/krb5/config/krb5.conf diff --git a/jdk/test/sun/security/krb5/config/yesno.conf b/test/jdk/sun/security/krb5/config/yesno.conf similarity index 100% rename from jdk/test/sun/security/krb5/config/yesno.conf rename to test/jdk/sun/security/krb5/config/yesno.conf diff --git a/jdk/test/sun/security/krb5/etype/ETypeOrder.java b/test/jdk/sun/security/krb5/etype/ETypeOrder.java similarity index 100% rename from jdk/test/sun/security/krb5/etype/ETypeOrder.java rename to test/jdk/sun/security/krb5/etype/ETypeOrder.java diff --git a/jdk/test/sun/security/krb5/etype/UnsupportedKeyType.java b/test/jdk/sun/security/krb5/etype/UnsupportedKeyType.java similarity index 100% rename from jdk/test/sun/security/krb5/etype/UnsupportedKeyType.java rename to test/jdk/sun/security/krb5/etype/UnsupportedKeyType.java diff --git a/jdk/test/sun/security/krb5/etype/WeakCrypto.java b/test/jdk/sun/security/krb5/etype/WeakCrypto.java similarity index 100% rename from jdk/test/sun/security/krb5/etype/WeakCrypto.java rename to test/jdk/sun/security/krb5/etype/WeakCrypto.java diff --git a/jdk/test/sun/security/krb5/etype/weakcrypto.conf b/test/jdk/sun/security/krb5/etype/weakcrypto.conf similarity index 100% rename from jdk/test/sun/security/krb5/etype/weakcrypto.conf rename to test/jdk/sun/security/krb5/etype/weakcrypto.conf diff --git a/jdk/test/sun/security/krb5/ktab/FileKeyTab.java b/test/jdk/sun/security/krb5/ktab/FileKeyTab.java similarity index 100% rename from jdk/test/sun/security/krb5/ktab/FileKeyTab.java rename to test/jdk/sun/security/krb5/ktab/FileKeyTab.java diff --git a/jdk/test/sun/security/krb5/ktab/HighestKvno.java b/test/jdk/sun/security/krb5/ktab/HighestKvno.java similarity index 100% rename from jdk/test/sun/security/krb5/ktab/HighestKvno.java rename to test/jdk/sun/security/krb5/ktab/HighestKvno.java diff --git a/jdk/test/sun/security/krb5/ktab/KeyString.java b/test/jdk/sun/security/krb5/ktab/KeyString.java similarity index 100% rename from jdk/test/sun/security/krb5/ktab/KeyString.java rename to test/jdk/sun/security/krb5/ktab/KeyString.java diff --git a/jdk/test/sun/security/krb5/ktab/KeyTabIndex.java b/test/jdk/sun/security/krb5/ktab/KeyTabIndex.java similarity index 100% rename from jdk/test/sun/security/krb5/ktab/KeyTabIndex.java rename to test/jdk/sun/security/krb5/ktab/KeyTabIndex.java diff --git a/jdk/test/sun/security/krb5/name/Constructors.java b/test/jdk/sun/security/krb5/name/Constructors.java similarity index 100% rename from jdk/test/sun/security/krb5/name/Constructors.java rename to test/jdk/sun/security/krb5/name/Constructors.java diff --git a/jdk/test/sun/security/krb5/name/Immutable.java b/test/jdk/sun/security/krb5/name/Immutable.java similarity index 100% rename from jdk/test/sun/security/krb5/name/Immutable.java rename to test/jdk/sun/security/krb5/name/Immutable.java diff --git a/jdk/test/sun/security/krb5/name/empty.conf b/test/jdk/sun/security/krb5/name/empty.conf similarity index 100% rename from jdk/test/sun/security/krb5/name/empty.conf rename to test/jdk/sun/security/krb5/name/empty.conf diff --git a/jdk/test/sun/security/krb5/name/krb5.conf b/test/jdk/sun/security/krb5/name/krb5.conf similarity index 100% rename from jdk/test/sun/security/krb5/name/krb5.conf rename to test/jdk/sun/security/krb5/name/krb5.conf diff --git a/jdk/test/sun/security/krb5/runNameEquals.sh b/test/jdk/sun/security/krb5/runNameEquals.sh similarity index 100% rename from jdk/test/sun/security/krb5/runNameEquals.sh rename to test/jdk/sun/security/krb5/runNameEquals.sh diff --git a/jdk/test/sun/security/krb5/tools/KtabCheck.java b/test/jdk/sun/security/krb5/tools/KtabCheck.java similarity index 100% rename from jdk/test/sun/security/krb5/tools/KtabCheck.java rename to test/jdk/sun/security/krb5/tools/KtabCheck.java diff --git a/jdk/test/sun/security/krb5/tools/KtabZero.java b/test/jdk/sun/security/krb5/tools/KtabZero.java similarity index 100% rename from jdk/test/sun/security/krb5/tools/KtabZero.java rename to test/jdk/sun/security/krb5/tools/KtabZero.java diff --git a/jdk/test/sun/security/krb5/tools/ktarg.sh b/test/jdk/sun/security/krb5/tools/ktarg.sh similarity index 100% rename from jdk/test/sun/security/krb5/tools/ktarg.sh rename to test/jdk/sun/security/krb5/tools/ktarg.sh diff --git a/jdk/test/sun/security/krb5/tools/ktcheck.sh b/test/jdk/sun/security/krb5/tools/ktcheck.sh similarity index 100% rename from jdk/test/sun/security/krb5/tools/ktcheck.sh rename to test/jdk/sun/security/krb5/tools/ktcheck.sh diff --git a/jdk/test/sun/security/krb5/tools/ktmissing.sh b/test/jdk/sun/security/krb5/tools/ktmissing.sh similarity index 100% rename from jdk/test/sun/security/krb5/tools/ktmissing.sh rename to test/jdk/sun/security/krb5/tools/ktmissing.sh diff --git a/jdk/test/sun/security/krb5/tools/ktzero.sh b/test/jdk/sun/security/krb5/tools/ktzero.sh similarity index 100% rename from jdk/test/sun/security/krb5/tools/ktzero.sh rename to test/jdk/sun/security/krb5/tools/ktzero.sh diff --git a/jdk/test/sun/security/krb5/tools/onlythree.conf b/test/jdk/sun/security/krb5/tools/onlythree.conf similarity index 100% rename from jdk/test/sun/security/krb5/tools/onlythree.conf rename to test/jdk/sun/security/krb5/tools/onlythree.conf diff --git a/jdk/test/sun/security/mscapi/246810.cer b/test/jdk/sun/security/mscapi/246810.cer similarity index 100% rename from jdk/test/sun/security/mscapi/246810.cer rename to test/jdk/sun/security/mscapi/246810.cer diff --git a/jdk/test/sun/security/mscapi/AccessKeyStore.java b/test/jdk/sun/security/mscapi/AccessKeyStore.java similarity index 100% rename from jdk/test/sun/security/mscapi/AccessKeyStore.java rename to test/jdk/sun/security/mscapi/AccessKeyStore.java diff --git a/jdk/test/sun/security/mscapi/CastError.java b/test/jdk/sun/security/mscapi/CastError.java similarity index 100% rename from jdk/test/sun/security/mscapi/CastError.java rename to test/jdk/sun/security/mscapi/CastError.java diff --git a/jdk/test/sun/security/mscapi/IsSunMSCAPIAvailable.java b/test/jdk/sun/security/mscapi/IsSunMSCAPIAvailable.java similarity index 100% rename from jdk/test/sun/security/mscapi/IsSunMSCAPIAvailable.java rename to test/jdk/sun/security/mscapi/IsSunMSCAPIAvailable.java diff --git a/jdk/test/sun/security/mscapi/IterateWindowsRootStore.java b/test/jdk/sun/security/mscapi/IterateWindowsRootStore.java similarity index 100% rename from jdk/test/sun/security/mscapi/IterateWindowsRootStore.java rename to test/jdk/sun/security/mscapi/IterateWindowsRootStore.java diff --git a/jdk/test/sun/security/mscapi/KeyStoreCompatibilityMode.java b/test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.java similarity index 100% rename from jdk/test/sun/security/mscapi/KeyStoreCompatibilityMode.java rename to test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.java diff --git a/jdk/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh b/test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.sh similarity index 100% rename from jdk/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh rename to test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.sh diff --git a/jdk/test/sun/security/mscapi/KeyStoreEmptyCertChain.java b/test/jdk/sun/security/mscapi/KeyStoreEmptyCertChain.java similarity index 100% rename from jdk/test/sun/security/mscapi/KeyStoreEmptyCertChain.java rename to test/jdk/sun/security/mscapi/KeyStoreEmptyCertChain.java diff --git a/jdk/test/sun/security/mscapi/KeytoolChangeAlias.sh b/test/jdk/sun/security/mscapi/KeytoolChangeAlias.sh similarity index 100% rename from jdk/test/sun/security/mscapi/KeytoolChangeAlias.sh rename to test/jdk/sun/security/mscapi/KeytoolChangeAlias.sh diff --git a/jdk/test/sun/security/mscapi/PrngSlow.java b/test/jdk/sun/security/mscapi/PrngSlow.java similarity index 100% rename from jdk/test/sun/security/mscapi/PrngSlow.java rename to test/jdk/sun/security/mscapi/PrngSlow.java diff --git a/jdk/test/sun/security/mscapi/PublicKeyInterop.java b/test/jdk/sun/security/mscapi/PublicKeyInterop.java similarity index 100% rename from jdk/test/sun/security/mscapi/PublicKeyInterop.java rename to test/jdk/sun/security/mscapi/PublicKeyInterop.java diff --git a/jdk/test/sun/security/mscapi/PublicKeyInterop.sh b/test/jdk/sun/security/mscapi/PublicKeyInterop.sh similarity index 100% rename from jdk/test/sun/security/mscapi/PublicKeyInterop.sh rename to test/jdk/sun/security/mscapi/PublicKeyInterop.sh diff --git a/jdk/test/sun/security/mscapi/RSAEncryptDecrypt.java b/test/jdk/sun/security/mscapi/RSAEncryptDecrypt.java similarity index 100% rename from jdk/test/sun/security/mscapi/RSAEncryptDecrypt.java rename to test/jdk/sun/security/mscapi/RSAEncryptDecrypt.java diff --git a/jdk/test/sun/security/mscapi/RSAEncryptDecrypt.sh b/test/jdk/sun/security/mscapi/RSAEncryptDecrypt.sh similarity index 100% rename from jdk/test/sun/security/mscapi/RSAEncryptDecrypt.sh rename to test/jdk/sun/security/mscapi/RSAEncryptDecrypt.sh diff --git a/jdk/test/sun/security/mscapi/ShortRSAKey1024.sh b/test/jdk/sun/security/mscapi/ShortRSAKey1024.sh similarity index 100% rename from jdk/test/sun/security/mscapi/ShortRSAKey1024.sh rename to test/jdk/sun/security/mscapi/ShortRSAKey1024.sh diff --git a/jdk/test/sun/security/mscapi/ShortRSAKeyWithinTLS.java b/test/jdk/sun/security/mscapi/ShortRSAKeyWithinTLS.java similarity index 100% rename from jdk/test/sun/security/mscapi/ShortRSAKeyWithinTLS.java rename to test/jdk/sun/security/mscapi/ShortRSAKeyWithinTLS.java diff --git a/jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.java b/test/jdk/sun/security/mscapi/SignUsingNONEwithRSA.java similarity index 100% rename from jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.java rename to test/jdk/sun/security/mscapi/SignUsingNONEwithRSA.java diff --git a/jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.java b/test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.java similarity index 100% rename from jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.java rename to test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.java diff --git a/jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.sh b/test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.sh similarity index 100% rename from jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.sh rename to test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.sh diff --git a/jdk/test/sun/security/mscapi/SignatureOffsets.java b/test/jdk/sun/security/mscapi/SignatureOffsets.java similarity index 100% rename from jdk/test/sun/security/mscapi/SignatureOffsets.java rename to test/jdk/sun/security/mscapi/SignatureOffsets.java diff --git a/jdk/test/sun/security/mscapi/SignedObjectChain.java b/test/jdk/sun/security/mscapi/SignedObjectChain.java similarity index 100% rename from jdk/test/sun/security/mscapi/SignedObjectChain.java rename to test/jdk/sun/security/mscapi/SignedObjectChain.java diff --git a/jdk/test/sun/security/mscapi/SmallPrimeExponentP.java b/test/jdk/sun/security/mscapi/SmallPrimeExponentP.java similarity index 100% rename from jdk/test/sun/security/mscapi/SmallPrimeExponentP.java rename to test/jdk/sun/security/mscapi/SmallPrimeExponentP.java diff --git a/jdk/test/sun/security/mscapi/access.policy b/test/jdk/sun/security/mscapi/access.policy similarity index 100% rename from jdk/test/sun/security/mscapi/access.policy rename to test/jdk/sun/security/mscapi/access.policy diff --git a/jdk/test/sun/security/mscapi/noaccess.policy b/test/jdk/sun/security/mscapi/noaccess.policy similarity index 100% rename from jdk/test/sun/security/mscapi/noaccess.policy rename to test/jdk/sun/security/mscapi/noaccess.policy diff --git a/jdk/test/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.sh b/test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.sh similarity index 100% rename from jdk/test/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.sh rename to test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.sh diff --git a/jdk/test/sun/security/mscapi/nonUniqueAliases/nonUniq1.pem b/test/jdk/sun/security/mscapi/nonUniqueAliases/nonUniq1.pem similarity index 100% rename from jdk/test/sun/security/mscapi/nonUniqueAliases/nonUniq1.pem rename to test/jdk/sun/security/mscapi/nonUniqueAliases/nonUniq1.pem diff --git a/jdk/test/sun/security/mscapi/nonUniqueAliases/nonUniq2.pem b/test/jdk/sun/security/mscapi/nonUniqueAliases/nonUniq2.pem similarity index 100% rename from jdk/test/sun/security/mscapi/nonUniqueAliases/nonUniq2.pem rename to test/jdk/sun/security/mscapi/nonUniqueAliases/nonUniq2.pem diff --git a/jdk/test/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java b/test/jdk/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java similarity index 100% rename from jdk/test/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java rename to test/jdk/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java diff --git a/jdk/test/sun/security/pkcs/pkcs10/PKCS10AttrEncoding.java b/test/jdk/sun/security/pkcs/pkcs10/PKCS10AttrEncoding.java similarity index 100% rename from jdk/test/sun/security/pkcs/pkcs10/PKCS10AttrEncoding.java rename to test/jdk/sun/security/pkcs/pkcs10/PKCS10AttrEncoding.java diff --git a/jdk/test/sun/security/pkcs/pkcs10/PKCS10AttributeReader.java b/test/jdk/sun/security/pkcs/pkcs10/PKCS10AttributeReader.java similarity index 100% rename from jdk/test/sun/security/pkcs/pkcs10/PKCS10AttributeReader.java rename to test/jdk/sun/security/pkcs/pkcs10/PKCS10AttributeReader.java diff --git a/jdk/test/sun/security/pkcs/pkcs7/PKCS7VerifyTest.java b/test/jdk/sun/security/pkcs/pkcs7/PKCS7VerifyTest.java similarity index 100% rename from jdk/test/sun/security/pkcs/pkcs7/PKCS7VerifyTest.java rename to test/jdk/sun/security/pkcs/pkcs7/PKCS7VerifyTest.java diff --git a/jdk/test/sun/security/pkcs/pkcs7/SignerOrder.java b/test/jdk/sun/security/pkcs/pkcs7/SignerOrder.java similarity index 100% rename from jdk/test/sun/security/pkcs/pkcs7/SignerOrder.java rename to test/jdk/sun/security/pkcs/pkcs7/SignerOrder.java diff --git a/jdk/test/sun/security/pkcs/pkcs7/jarsigner/META-INF/MANIFEST.MF b/test/jdk/sun/security/pkcs/pkcs7/jarsigner/META-INF/MANIFEST.MF similarity index 100% rename from jdk/test/sun/security/pkcs/pkcs7/jarsigner/META-INF/MANIFEST.MF rename to test/jdk/sun/security/pkcs/pkcs7/jarsigner/META-INF/MANIFEST.MF diff --git a/jdk/test/sun/security/pkcs/pkcs7/jarsigner/META-INF/PKCS7TEST.DSA.base64 b/test/jdk/sun/security/pkcs/pkcs7/jarsigner/META-INF/PKCS7TEST.DSA.base64 similarity index 100% rename from jdk/test/sun/security/pkcs/pkcs7/jarsigner/META-INF/PKCS7TEST.DSA.base64 rename to test/jdk/sun/security/pkcs/pkcs7/jarsigner/META-INF/PKCS7TEST.DSA.base64 diff --git a/jdk/test/sun/security/pkcs/pkcs7/jarsigner/META-INF/PKCS7TEST.SF b/test/jdk/sun/security/pkcs/pkcs7/jarsigner/META-INF/PKCS7TEST.SF similarity index 100% rename from jdk/test/sun/security/pkcs/pkcs7/jarsigner/META-INF/PKCS7TEST.SF rename to test/jdk/sun/security/pkcs/pkcs7/jarsigner/META-INF/PKCS7TEST.SF diff --git a/jdk/test/sun/security/pkcs/pkcs8/PKCS8Test.java b/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java similarity index 100% rename from jdk/test/sun/security/pkcs/pkcs8/PKCS8Test.java rename to test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java diff --git a/jdk/test/sun/security/pkcs/pkcs8/TestLeadingZeros.java b/test/jdk/sun/security/pkcs/pkcs8/TestLeadingZeros.java similarity index 100% rename from jdk/test/sun/security/pkcs/pkcs8/TestLeadingZeros.java rename to test/jdk/sun/security/pkcs/pkcs8/TestLeadingZeros.java diff --git a/jdk/test/sun/security/pkcs/pkcs9/UnknownAttribute.java b/test/jdk/sun/security/pkcs/pkcs9/UnknownAttribute.java similarity index 100% rename from jdk/test/sun/security/pkcs/pkcs9/UnknownAttribute.java rename to test/jdk/sun/security/pkcs/pkcs9/UnknownAttribute.java diff --git a/jdk/test/sun/security/pkcs/pkcs9/UnstructuredName.java b/test/jdk/sun/security/pkcs/pkcs9/UnstructuredName.java similarity index 100% rename from jdk/test/sun/security/pkcs/pkcs9/UnstructuredName.java rename to test/jdk/sun/security/pkcs/pkcs9/UnstructuredName.java diff --git a/jdk/test/sun/security/pkcs11/Cipher/JNICheck.java b/test/jdk/sun/security/pkcs11/Cipher/JNICheck.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Cipher/JNICheck.java rename to test/jdk/sun/security/pkcs11/Cipher/JNICheck.java diff --git a/jdk/test/sun/security/pkcs11/Cipher/ReinitCipher.java b/test/jdk/sun/security/pkcs11/Cipher/ReinitCipher.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Cipher/ReinitCipher.java rename to test/jdk/sun/security/pkcs11/Cipher/ReinitCipher.java diff --git a/jdk/test/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java b/test/jdk/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java rename to test/jdk/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java diff --git a/jdk/test/sun/security/pkcs11/Cipher/TestRSACipher.java b/test/jdk/sun/security/pkcs11/Cipher/TestRSACipher.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Cipher/TestRSACipher.java rename to test/jdk/sun/security/pkcs11/Cipher/TestRSACipher.java diff --git a/jdk/test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java b/test/jdk/sun/security/pkcs11/Cipher/TestRSACipherWrap.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java rename to test/jdk/sun/security/pkcs11/Cipher/TestRSACipherWrap.java diff --git a/jdk/test/sun/security/pkcs11/Cipher/TestRawRSACipher.java b/test/jdk/sun/security/pkcs11/Cipher/TestRawRSACipher.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Cipher/TestRawRSACipher.java rename to test/jdk/sun/security/pkcs11/Cipher/TestRawRSACipher.java diff --git a/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java b/test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphers.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java rename to test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphers.java diff --git a/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java b/test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java rename to test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java diff --git a/jdk/test/sun/security/pkcs11/Config/ReadConfInUTF16Env.java b/test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Config/ReadConfInUTF16Env.java rename to test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.java diff --git a/jdk/test/sun/security/pkcs11/Config/ReadConfInUTF16Env.sh b/test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.sh similarity index 100% rename from jdk/test/sun/security/pkcs11/Config/ReadConfInUTF16Env.sh rename to test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.sh diff --git a/jdk/test/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java b/test/jdk/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java rename to test/jdk/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java diff --git a/jdk/test/sun/security/pkcs11/KeyAgreement/TestDH.java b/test/jdk/sun/security/pkcs11/KeyAgreement/TestDH.java similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyAgreement/TestDH.java rename to test/jdk/sun/security/pkcs11/KeyAgreement/TestDH.java diff --git a/jdk/test/sun/security/pkcs11/KeyAgreement/TestInterop.java b/test/jdk/sun/security/pkcs11/KeyAgreement/TestInterop.java similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyAgreement/TestInterop.java rename to test/jdk/sun/security/pkcs11/KeyAgreement/TestInterop.java diff --git a/jdk/test/sun/security/pkcs11/KeyAgreement/TestShort.java b/test/jdk/sun/security/pkcs11/KeyAgreement/TestShort.java similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyAgreement/TestShort.java rename to test/jdk/sun/security/pkcs11/KeyAgreement/TestShort.java diff --git a/jdk/test/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java b/test/jdk/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java rename to test/jdk/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java diff --git a/jdk/test/sun/security/pkcs11/KeyGenerator/DESParity.java b/test/jdk/sun/security/pkcs11/KeyGenerator/DESParity.java similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyGenerator/DESParity.java rename to test/jdk/sun/security/pkcs11/KeyGenerator/DESParity.java diff --git a/jdk/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java b/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java rename to test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java diff --git a/jdk/test/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java b/test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java rename to test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java diff --git a/jdk/test/sun/security/pkcs11/KeyStore/Basic.java b/test/jdk/sun/security/pkcs11/KeyStore/Basic.java similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/Basic.java rename to test/jdk/sun/security/pkcs11/KeyStore/Basic.java diff --git a/jdk/test/sun/security/pkcs11/KeyStore/Basic.policy b/test/jdk/sun/security/pkcs11/KeyStore/Basic.policy similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/Basic.policy rename to test/jdk/sun/security/pkcs11/KeyStore/Basic.policy diff --git a/jdk/test/sun/security/pkcs11/KeyStore/Basic.sh b/test/jdk/sun/security/pkcs11/KeyStore/Basic.sh similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/Basic.sh rename to test/jdk/sun/security/pkcs11/KeyStore/Basic.sh diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/README b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/README similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/README rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/README diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/basic.keystore b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/basic.keystore similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/basic.keystore rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/basic.keystore diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/ca.cert b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/ca.cert similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/ca.cert rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/ca.cert diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/ca.key b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/ca.key similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/ca.key rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/ca.key diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/ca2.cert b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/ca2.cert similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/ca2.cert rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/ca2.cert diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/p11-activcard.txt b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/p11-activcard.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/p11-activcard.txt rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/p11-activcard.txt diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/p11-ibutton.txt b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/p11-ibutton.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/p11-ibutton.txt rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/p11-ibutton.txt diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/p11-nss.txt b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/p11-nss.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/p11-nss.txt rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/p11-nss.txt diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/p11-sca1000.txt b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/p11-sca1000.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/p11-sca1000.txt rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/p11-sca1000.txt diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/p11-solaris.txt b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/p11-solaris.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/p11-solaris.txt rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/p11-solaris.txt diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk1.cert similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk1.cert diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert2 b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk1.cert2 similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert2 rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk1.cert2 diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk1.key b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk1.key similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk1.key rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk1.key diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk2.cert b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk2.cert similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk2.cert rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk2.cert diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk2.key b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk2.key similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk2.key rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk2.key diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk3.cert b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk3.cert similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk3.cert rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk3.cert diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk3.key b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk3.key similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/pk3.key rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/pk3.key diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/pkcs11_softtoken/objstore_info b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/pkcs11_softtoken/objstore_info similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/pkcs11_softtoken/objstore_info rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/pkcs11_softtoken/objstore_info diff --git a/jdk/test/sun/security/pkcs11/KeyStore/BasicData/random.cert b/test/jdk/sun/security/pkcs11/KeyStore/BasicData/random.cert similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/BasicData/random.cert rename to test/jdk/sun/security/pkcs11/KeyStore/BasicData/random.cert diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.java b/test/jdk/sun/security/pkcs11/KeyStore/ClientAuth.java similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.java rename to test/jdk/sun/security/pkcs11/KeyStore/ClientAuth.java diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh b/test/jdk/sun/security/pkcs11/KeyStore/ClientAuth.sh similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh rename to test/jdk/sun/security/pkcs11/KeyStore/ClientAuth.sh diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/README b/test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/README similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/README rename to test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/README diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/cert8.db b/test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/cert8.db similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/cert8.db rename to test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/cert8.db diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/ibutton.cert b/test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/ibutton.cert similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/ibutton.cert rename to test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/ibutton.cert diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/key3.db b/test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/key3.db similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/key3.db rename to test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/key3.db diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/p11-nss.txt b/test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/p11-nss.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/p11-nss.txt rename to test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/p11-nss.txt diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/secmod.db b/test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/secmod.db similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/secmod.db rename to test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/secmod.db diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/server.keystore b/test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/server.keystore similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/server.keystore rename to test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/server.keystore diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/truststore b/test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/truststore similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/truststore rename to test/jdk/sun/security/pkcs11/KeyStore/ClientAuthData/truststore diff --git a/jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.java b/test/jdk/sun/security/pkcs11/KeyStore/SecretKeysBasic.java similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.java rename to test/jdk/sun/security/pkcs11/KeyStore/SecretKeysBasic.java diff --git a/jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh b/test/jdk/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh rename to test/jdk/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh diff --git a/jdk/test/sun/security/pkcs11/KeyStore/Solaris.sh b/test/jdk/sun/security/pkcs11/KeyStore/Solaris.sh similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/Solaris.sh rename to test/jdk/sun/security/pkcs11/KeyStore/Solaris.sh diff --git a/jdk/test/sun/security/pkcs11/KeyStore/loader.jar b/test/jdk/sun/security/pkcs11/KeyStore/loader.jar similarity index 100% rename from jdk/test/sun/security/pkcs11/KeyStore/loader.jar rename to test/jdk/sun/security/pkcs11/KeyStore/loader.jar diff --git a/jdk/test/sun/security/pkcs11/Mac/MacKAT.java b/test/jdk/sun/security/pkcs11/Mac/MacKAT.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Mac/MacKAT.java rename to test/jdk/sun/security/pkcs11/Mac/MacKAT.java diff --git a/jdk/test/sun/security/pkcs11/Mac/MacSameTest.java b/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Mac/MacSameTest.java rename to test/jdk/sun/security/pkcs11/Mac/MacSameTest.java diff --git a/jdk/test/sun/security/pkcs11/Mac/ReinitMac.java b/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Mac/ReinitMac.java rename to test/jdk/sun/security/pkcs11/Mac/ReinitMac.java diff --git a/jdk/test/sun/security/pkcs11/MessageDigest/ByteBuffers.java b/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java similarity index 100% rename from jdk/test/sun/security/pkcs11/MessageDigest/ByteBuffers.java rename to test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java diff --git a/jdk/test/sun/security/pkcs11/MessageDigest/DigestKAT.java b/test/jdk/sun/security/pkcs11/MessageDigest/DigestKAT.java similarity index 100% rename from jdk/test/sun/security/pkcs11/MessageDigest/DigestKAT.java rename to test/jdk/sun/security/pkcs11/MessageDigest/DigestKAT.java diff --git a/jdk/test/sun/security/pkcs11/MessageDigest/ReinitDigest.java b/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java similarity index 100% rename from jdk/test/sun/security/pkcs11/MessageDigest/ReinitDigest.java rename to test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java diff --git a/jdk/test/sun/security/pkcs11/MessageDigest/TestCloning.java b/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java similarity index 100% rename from jdk/test/sun/security/pkcs11/MessageDigest/TestCloning.java rename to test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java diff --git a/jdk/test/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java similarity index 100% rename from jdk/test/sun/security/pkcs11/PKCS11Test.java rename to test/jdk/sun/security/pkcs11/PKCS11Test.java diff --git a/jdk/test/sun/security/pkcs11/Provider/Absolute.cfg b/test/jdk/sun/security/pkcs11/Provider/Absolute.cfg similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/Absolute.cfg rename to test/jdk/sun/security/pkcs11/Provider/Absolute.cfg diff --git a/jdk/test/sun/security/pkcs11/Provider/Absolute.java b/test/jdk/sun/security/pkcs11/Provider/Absolute.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/Absolute.java rename to test/jdk/sun/security/pkcs11/Provider/Absolute.java diff --git a/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString-nss.txt b/test/jdk/sun/security/pkcs11/Provider/ConfigQuotedString-nss.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString-nss.txt rename to test/jdk/sun/security/pkcs11/Provider/ConfigQuotedString-nss.txt diff --git a/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.java b/test/jdk/sun/security/pkcs11/Provider/ConfigQuotedString.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.java rename to test/jdk/sun/security/pkcs11/Provider/ConfigQuotedString.java diff --git a/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh b/test/jdk/sun/security/pkcs11/Provider/ConfigQuotedString.sh similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh rename to test/jdk/sun/security/pkcs11/Provider/ConfigQuotedString.sh diff --git a/jdk/test/sun/security/pkcs11/Provider/ConfigShortPath.java b/test/jdk/sun/security/pkcs11/Provider/ConfigShortPath.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/ConfigShortPath.java rename to test/jdk/sun/security/pkcs11/Provider/ConfigShortPath.java diff --git a/jdk/test/sun/security/pkcs11/Provider/Login-nss.txt b/test/jdk/sun/security/pkcs11/Provider/Login-nss.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/Login-nss.txt rename to test/jdk/sun/security/pkcs11/Provider/Login-nss.txt diff --git a/jdk/test/sun/security/pkcs11/Provider/Login.java b/test/jdk/sun/security/pkcs11/Provider/Login.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/Login.java rename to test/jdk/sun/security/pkcs11/Provider/Login.java diff --git a/jdk/test/sun/security/pkcs11/Provider/Login.policy b/test/jdk/sun/security/pkcs11/Provider/Login.policy similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/Login.policy rename to test/jdk/sun/security/pkcs11/Provider/Login.policy diff --git a/jdk/test/sun/security/pkcs11/Provider/Login.sh b/test/jdk/sun/security/pkcs11/Provider/Login.sh similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/Login.sh rename to test/jdk/sun/security/pkcs11/Provider/Login.sh diff --git a/jdk/test/sun/security/pkcs11/Provider/LoginISE.java b/test/jdk/sun/security/pkcs11/Provider/LoginISE.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/LoginISE.java rename to test/jdk/sun/security/pkcs11/Provider/LoginISE.java diff --git a/jdk/test/sun/security/pkcs11/Provider/csp.cfg b/test/jdk/sun/security/pkcs11/Provider/csp.cfg similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/csp.cfg rename to test/jdk/sun/security/pkcs11/Provider/csp.cfg diff --git a/jdk/test/sun/security/pkcs11/Provider/cspPlus.cfg b/test/jdk/sun/security/pkcs11/Provider/cspPlus.cfg similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/cspPlus.cfg rename to test/jdk/sun/security/pkcs11/Provider/cspPlus.cfg diff --git a/jdk/test/sun/security/pkcs11/Provider/cspQuotedPath.cfg b/test/jdk/sun/security/pkcs11/Provider/cspQuotedPath.cfg similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/cspQuotedPath.cfg rename to test/jdk/sun/security/pkcs11/Provider/cspQuotedPath.cfg diff --git a/jdk/test/sun/security/pkcs11/Provider/cspSpace.cfg b/test/jdk/sun/security/pkcs11/Provider/cspSpace.cfg similarity index 100% rename from jdk/test/sun/security/pkcs11/Provider/cspSpace.cfg rename to test/jdk/sun/security/pkcs11/Provider/cspSpace.cfg diff --git a/jdk/test/sun/security/pkcs11/README b/test/jdk/sun/security/pkcs11/README similarity index 100% rename from jdk/test/sun/security/pkcs11/README rename to test/jdk/sun/security/pkcs11/README diff --git a/jdk/test/sun/security/pkcs11/SampleTest.java b/test/jdk/sun/security/pkcs11/SampleTest.java similarity index 100% rename from jdk/test/sun/security/pkcs11/SampleTest.java rename to test/jdk/sun/security/pkcs11/SampleTest.java diff --git a/jdk/test/sun/security/pkcs11/Secmod/AddPrivateKey.java b/test/jdk/sun/security/pkcs11/Secmod/AddPrivateKey.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/AddPrivateKey.java rename to test/jdk/sun/security/pkcs11/Secmod/AddPrivateKey.java diff --git a/jdk/test/sun/security/pkcs11/Secmod/AddTrustedCert.java b/test/jdk/sun/security/pkcs11/Secmod/AddTrustedCert.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/AddTrustedCert.java rename to test/jdk/sun/security/pkcs11/Secmod/AddTrustedCert.java diff --git a/jdk/test/sun/security/pkcs11/Secmod/Crypto.java b/test/jdk/sun/security/pkcs11/Secmod/Crypto.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/Crypto.java rename to test/jdk/sun/security/pkcs11/Secmod/Crypto.java diff --git a/jdk/test/sun/security/pkcs11/Secmod/GetPrivateKey.java b/test/jdk/sun/security/pkcs11/Secmod/GetPrivateKey.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/GetPrivateKey.java rename to test/jdk/sun/security/pkcs11/Secmod/GetPrivateKey.java diff --git a/jdk/test/sun/security/pkcs11/Secmod/JksSetPrivateKey.java b/test/jdk/sun/security/pkcs11/Secmod/JksSetPrivateKey.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/JksSetPrivateKey.java rename to test/jdk/sun/security/pkcs11/Secmod/JksSetPrivateKey.java diff --git a/jdk/test/sun/security/pkcs11/Secmod/LoadKeystore.java b/test/jdk/sun/security/pkcs11/Secmod/LoadKeystore.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/LoadKeystore.java rename to test/jdk/sun/security/pkcs11/Secmod/LoadKeystore.java diff --git a/jdk/test/sun/security/pkcs11/Secmod/TrustAnchors.java b/test/jdk/sun/security/pkcs11/Secmod/TrustAnchors.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/TrustAnchors.java rename to test/jdk/sun/security/pkcs11/Secmod/TrustAnchors.java diff --git a/jdk/test/sun/security/pkcs11/Secmod/anchor.cer b/test/jdk/sun/security/pkcs11/Secmod/anchor.cer similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/anchor.cer rename to test/jdk/sun/security/pkcs11/Secmod/anchor.cer diff --git a/jdk/test/sun/security/pkcs11/Secmod/cert8.db b/test/jdk/sun/security/pkcs11/Secmod/cert8.db similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/cert8.db rename to test/jdk/sun/security/pkcs11/Secmod/cert8.db diff --git a/jdk/test/sun/security/pkcs11/Secmod/key3.db b/test/jdk/sun/security/pkcs11/Secmod/key3.db similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/key3.db rename to test/jdk/sun/security/pkcs11/Secmod/key3.db diff --git a/jdk/test/sun/security/pkcs11/Secmod/keystore.jks b/test/jdk/sun/security/pkcs11/Secmod/keystore.jks similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/keystore.jks rename to test/jdk/sun/security/pkcs11/Secmod/keystore.jks diff --git a/jdk/test/sun/security/pkcs11/Secmod/nss.cfg b/test/jdk/sun/security/pkcs11/Secmod/nss.cfg similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/nss.cfg rename to test/jdk/sun/security/pkcs11/Secmod/nss.cfg diff --git a/jdk/test/sun/security/pkcs11/Secmod/nsscrypto.cfg b/test/jdk/sun/security/pkcs11/Secmod/nsscrypto.cfg similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/nsscrypto.cfg rename to test/jdk/sun/security/pkcs11/Secmod/nsscrypto.cfg diff --git a/jdk/test/sun/security/pkcs11/Secmod/nsstrust.cfg b/test/jdk/sun/security/pkcs11/Secmod/nsstrust.cfg similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/nsstrust.cfg rename to test/jdk/sun/security/pkcs11/Secmod/nsstrust.cfg diff --git a/jdk/test/sun/security/pkcs11/Secmod/policy b/test/jdk/sun/security/pkcs11/Secmod/policy similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/policy rename to test/jdk/sun/security/pkcs11/Secmod/policy diff --git a/jdk/test/sun/security/pkcs11/Secmod/secmod.db b/test/jdk/sun/security/pkcs11/Secmod/secmod.db similarity index 100% rename from jdk/test/sun/security/pkcs11/Secmod/secmod.db rename to test/jdk/sun/security/pkcs11/Secmod/secmod.db diff --git a/jdk/test/sun/security/pkcs11/SecmodTest.java b/test/jdk/sun/security/pkcs11/SecmodTest.java similarity index 100% rename from jdk/test/sun/security/pkcs11/SecmodTest.java rename to test/jdk/sun/security/pkcs11/SecmodTest.java diff --git a/jdk/test/sun/security/pkcs11/SecureRandom/Basic.java b/test/jdk/sun/security/pkcs11/SecureRandom/Basic.java similarity index 100% rename from jdk/test/sun/security/pkcs11/SecureRandom/Basic.java rename to test/jdk/sun/security/pkcs11/SecureRandom/Basic.java diff --git a/jdk/test/sun/security/pkcs11/SecureRandom/TestDeserialization.java b/test/jdk/sun/security/pkcs11/SecureRandom/TestDeserialization.java similarity index 100% rename from jdk/test/sun/security/pkcs11/SecureRandom/TestDeserialization.java rename to test/jdk/sun/security/pkcs11/SecureRandom/TestDeserialization.java diff --git a/jdk/test/sun/security/pkcs11/Serialize/SerializeProvider.java b/test/jdk/sun/security/pkcs11/Serialize/SerializeProvider.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Serialize/SerializeProvider.java rename to test/jdk/sun/security/pkcs11/Serialize/SerializeProvider.java diff --git a/jdk/test/sun/security/pkcs11/Signature/ByteBuffers.java b/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Signature/ByteBuffers.java rename to test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java diff --git a/jdk/test/sun/security/pkcs11/Signature/ReinitSignature.java b/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Signature/ReinitSignature.java rename to test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java diff --git a/jdk/test/sun/security/pkcs11/Signature/TestDSA.java b/test/jdk/sun/security/pkcs11/Signature/TestDSA.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Signature/TestDSA.java rename to test/jdk/sun/security/pkcs11/Signature/TestDSA.java diff --git a/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java b/test/jdk/sun/security/pkcs11/Signature/TestDSAKeyLength.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java rename to test/jdk/sun/security/pkcs11/Signature/TestDSAKeyLength.java diff --git a/jdk/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java b/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java similarity index 100% rename from jdk/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java rename to test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java diff --git a/jdk/test/sun/security/pkcs11/ec/ReadCertificates.java b/test/jdk/sun/security/pkcs11/ec/ReadCertificates.java similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/ReadCertificates.java rename to test/jdk/sun/security/pkcs11/ec/ReadCertificates.java diff --git a/jdk/test/sun/security/pkcs11/ec/ReadPKCS12.java b/test/jdk/sun/security/pkcs11/ec/ReadPKCS12.java similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/ReadPKCS12.java rename to test/jdk/sun/security/pkcs11/ec/ReadPKCS12.java diff --git a/jdk/test/sun/security/pkcs11/ec/TestCurves.java b/test/jdk/sun/security/pkcs11/ec/TestCurves.java similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/TestCurves.java rename to test/jdk/sun/security/pkcs11/ec/TestCurves.java diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDH.java b/test/jdk/sun/security/pkcs11/ec/TestECDH.java similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/TestECDH.java rename to test/jdk/sun/security/pkcs11/ec/TestECDH.java diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDH2.java b/test/jdk/sun/security/pkcs11/ec/TestECDH2.java similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/TestECDH2.java rename to test/jdk/sun/security/pkcs11/ec/TestECDH2.java diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDSA.java b/test/jdk/sun/security/pkcs11/ec/TestECDSA.java similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/TestECDSA.java rename to test/jdk/sun/security/pkcs11/ec/TestECDSA.java diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java b/test/jdk/sun/security/pkcs11/ec/TestECDSA2.java similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/TestECDSA2.java rename to test/jdk/sun/security/pkcs11/ec/TestECDSA2.java diff --git a/jdk/test/sun/security/pkcs11/ec/TestECGenSpec.java b/test/jdk/sun/security/pkcs11/ec/TestECGenSpec.java similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/TestECGenSpec.java rename to test/jdk/sun/security/pkcs11/ec/TestECGenSpec.java diff --git a/jdk/test/sun/security/pkcs11/ec/TestKeyFactory.java b/test/jdk/sun/security/pkcs11/ec/TestKeyFactory.java similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/TestKeyFactory.java rename to test/jdk/sun/security/pkcs11/ec/TestKeyFactory.java diff --git a/jdk/test/sun/security/pkcs11/ec/certs/sunlabscerts.pem b/test/jdk/sun/security/pkcs11/ec/certs/sunlabscerts.pem similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/certs/sunlabscerts.pem rename to test/jdk/sun/security/pkcs11/ec/certs/sunlabscerts.pem diff --git a/jdk/test/sun/security/pkcs11/ec/p12passwords.txt b/test/jdk/sun/security/pkcs11/ec/p12passwords.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/p12passwords.txt rename to test/jdk/sun/security/pkcs11/ec/p12passwords.txt diff --git a/jdk/test/sun/security/pkcs11/ec/pkcs12/secp256r1server-secp384r1ca.p12 b/test/jdk/sun/security/pkcs11/ec/pkcs12/secp256r1server-secp384r1ca.p12 similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/pkcs12/secp256r1server-secp384r1ca.p12 rename to test/jdk/sun/security/pkcs11/ec/pkcs12/secp256r1server-secp384r1ca.p12 diff --git a/jdk/test/sun/security/pkcs11/ec/pkcs12/sect193r1server-rsa1024ca.p12 b/test/jdk/sun/security/pkcs11/ec/pkcs12/sect193r1server-rsa1024ca.p12 similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/pkcs12/sect193r1server-rsa1024ca.p12 rename to test/jdk/sun/security/pkcs11/ec/pkcs12/sect193r1server-rsa1024ca.p12 diff --git a/jdk/test/sun/security/pkcs11/ec/policy b/test/jdk/sun/security/pkcs11/ec/policy similarity index 100% rename from jdk/test/sun/security/pkcs11/ec/policy rename to test/jdk/sun/security/pkcs11/ec/policy diff --git a/jdk/test/sun/security/pkcs11/fips/CipherTest.java b/test/jdk/sun/security/pkcs11/fips/CipherTest.java similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/CipherTest.java rename to test/jdk/sun/security/pkcs11/fips/CipherTest.java diff --git a/jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java b/test/jdk/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java rename to test/jdk/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java diff --git a/jdk/test/sun/security/pkcs11/fips/ImportKeyStore.java b/test/jdk/sun/security/pkcs11/fips/ImportKeyStore.java similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/ImportKeyStore.java rename to test/jdk/sun/security/pkcs11/fips/ImportKeyStore.java diff --git a/jdk/test/sun/security/pkcs11/fips/JSSEClient.java b/test/jdk/sun/security/pkcs11/fips/JSSEClient.java similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/JSSEClient.java rename to test/jdk/sun/security/pkcs11/fips/JSSEClient.java diff --git a/jdk/test/sun/security/pkcs11/fips/JSSEServer.java b/test/jdk/sun/security/pkcs11/fips/JSSEServer.java similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/JSSEServer.java rename to test/jdk/sun/security/pkcs11/fips/JSSEServer.java diff --git a/jdk/test/sun/security/pkcs11/fips/TrustManagerTest.java b/test/jdk/sun/security/pkcs11/fips/TrustManagerTest.java similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/TrustManagerTest.java rename to test/jdk/sun/security/pkcs11/fips/TrustManagerTest.java diff --git a/jdk/test/sun/security/pkcs11/fips/TrustManagerTest.policy b/test/jdk/sun/security/pkcs11/fips/TrustManagerTest.policy similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/TrustManagerTest.policy rename to test/jdk/sun/security/pkcs11/fips/TrustManagerTest.policy diff --git a/jdk/test/sun/security/pkcs11/fips/cert8.db b/test/jdk/sun/security/pkcs11/fips/cert8.db similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/cert8.db rename to test/jdk/sun/security/pkcs11/fips/cert8.db diff --git a/jdk/test/sun/security/pkcs11/fips/certs/anchor.cer b/test/jdk/sun/security/pkcs11/fips/certs/anchor.cer similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/certs/anchor.cer rename to test/jdk/sun/security/pkcs11/fips/certs/anchor.cer diff --git a/jdk/test/sun/security/pkcs11/fips/certs/ca.cer b/test/jdk/sun/security/pkcs11/fips/certs/ca.cer similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/certs/ca.cer rename to test/jdk/sun/security/pkcs11/fips/certs/ca.cer diff --git a/jdk/test/sun/security/pkcs11/fips/certs/server.cer b/test/jdk/sun/security/pkcs11/fips/certs/server.cer similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/certs/server.cer rename to test/jdk/sun/security/pkcs11/fips/certs/server.cer diff --git a/jdk/test/sun/security/pkcs11/fips/fips.cfg b/test/jdk/sun/security/pkcs11/fips/fips.cfg similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/fips.cfg rename to test/jdk/sun/security/pkcs11/fips/fips.cfg diff --git a/jdk/test/sun/security/pkcs11/fips/key3.db b/test/jdk/sun/security/pkcs11/fips/key3.db similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/key3.db rename to test/jdk/sun/security/pkcs11/fips/key3.db diff --git a/jdk/test/sun/security/pkcs11/fips/keystore b/test/jdk/sun/security/pkcs11/fips/keystore similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/keystore rename to test/jdk/sun/security/pkcs11/fips/keystore diff --git a/jdk/test/sun/security/pkcs11/fips/secmod.db b/test/jdk/sun/security/pkcs11/fips/secmod.db similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/secmod.db rename to test/jdk/sun/security/pkcs11/fips/secmod.db diff --git a/jdk/test/sun/security/pkcs11/fips/truststore b/test/jdk/sun/security/pkcs11/fips/truststore similarity index 100% rename from jdk/test/sun/security/pkcs11/fips/truststore rename to test/jdk/sun/security/pkcs11/fips/truststore diff --git a/jdk/test/sun/security/pkcs11/nss/db/cert8.db b/test/jdk/sun/security/pkcs11/nss/db/cert8.db similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/db/cert8.db rename to test/jdk/sun/security/pkcs11/nss/db/cert8.db diff --git a/jdk/test/sun/security/pkcs11/nss/db/key3.db b/test/jdk/sun/security/pkcs11/nss/db/key3.db similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/db/key3.db rename to test/jdk/sun/security/pkcs11/nss/db/key3.db diff --git a/jdk/test/sun/security/pkcs11/nss/db/secmod.db b/test/jdk/sun/security/pkcs11/nss/db/secmod.db similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/db/secmod.db rename to test/jdk/sun/security/pkcs11/nss/db/secmod.db diff --git a/jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libfreebl3.dylib b/test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libfreebl3.dylib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libfreebl3.dylib rename to test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libfreebl3.dylib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnspr4.dylib b/test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnspr4.dylib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnspr4.dylib rename to test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnspr4.dylib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnss3.dylib b/test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnss3.dylib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnss3.dylib rename to test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnss3.dylib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssckbi.dylib b/test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssckbi.dylib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssckbi.dylib rename to test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssckbi.dylib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssdbm3.dylib b/test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssdbm3.dylib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssdbm3.dylib rename to test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssdbm3.dylib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssutil3.dylib b/test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssutil3.dylib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssutil3.dylib rename to test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssutil3.dylib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libplc4.dylib b/test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libplc4.dylib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libplc4.dylib rename to test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libplc4.dylib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libplds4.dylib b/test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libplds4.dylib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libplds4.dylib rename to test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libplds4.dylib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libsoftokn3.dylib b/test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libsoftokn3.dylib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libsoftokn3.dylib rename to test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libsoftokn3.dylib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libsqlite3.dylib b/test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libsqlite3.dylib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libsqlite3.dylib rename to test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libsqlite3.dylib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libssl3.dylib b/test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libssl3.dylib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libssl3.dylib rename to test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libssl3.dylib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nspr4.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nspr4.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nspr4.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nspr4.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nspr4.lib b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nspr4.lib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nspr4.lib rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nspr4.lib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/plc4.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/plc4.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/plc4.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/plc4.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/plc4.lib b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/plc4.lib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/plc4.lib rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/plc4.lib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/plds4.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/plds4.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/plds4.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/plds4.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/plds4.lib b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/plds4.lib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/plds4.lib rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/plds4.lib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib b/test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib rename to test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nspr4.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nspr4.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nspr4.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nspr4.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nspr4.lib b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nspr4.lib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nspr4.lib rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nspr4.lib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/plc4.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/plc4.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/plc4.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/plc4.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/plc4.lib b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/plc4.lib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/plc4.lib rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/plc4.lib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/plds4.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/plds4.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/plds4.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/plds4.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/plds4.lib b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/plds4.lib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/plds4.lib rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/plds4.lib diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib b/test/jdk/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib rename to test/jdk/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib diff --git a/jdk/test/sun/security/pkcs11/nss/p11-deimos.txt b/test/jdk/sun/security/pkcs11/nss/p11-deimos.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/p11-deimos.txt rename to test/jdk/sun/security/pkcs11/nss/p11-deimos.txt diff --git a/jdk/test/sun/security/pkcs11/nss/p11-nss.txt b/test/jdk/sun/security/pkcs11/nss/p11-nss.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/p11-nss.txt rename to test/jdk/sun/security/pkcs11/nss/p11-nss.txt diff --git a/jdk/test/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz b/test/jdk/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz rename to test/jdk/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz diff --git a/jdk/test/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz.sha256 b/test/jdk/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz.sha256 similarity index 100% rename from jdk/test/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz.sha256 rename to test/jdk/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz.sha256 diff --git a/jdk/test/sun/security/pkcs11/policy b/test/jdk/sun/security/pkcs11/policy similarity index 100% rename from jdk/test/sun/security/pkcs11/policy rename to test/jdk/sun/security/pkcs11/policy diff --git a/jdk/test/sun/security/pkcs11/rsa/GenKeyStore.java b/test/jdk/sun/security/pkcs11/rsa/GenKeyStore.java similarity index 100% rename from jdk/test/sun/security/pkcs11/rsa/GenKeyStore.java rename to test/jdk/sun/security/pkcs11/rsa/GenKeyStore.java diff --git a/jdk/test/sun/security/pkcs11/rsa/KeyWrap.java b/test/jdk/sun/security/pkcs11/rsa/KeyWrap.java similarity index 100% rename from jdk/test/sun/security/pkcs11/rsa/KeyWrap.java rename to test/jdk/sun/security/pkcs11/rsa/KeyWrap.java diff --git a/jdk/test/sun/security/pkcs11/rsa/TestCACerts.java b/test/jdk/sun/security/pkcs11/rsa/TestCACerts.java similarity index 100% rename from jdk/test/sun/security/pkcs11/rsa/TestCACerts.java rename to test/jdk/sun/security/pkcs11/rsa/TestCACerts.java diff --git a/jdk/test/sun/security/pkcs11/rsa/TestCACerts.policy b/test/jdk/sun/security/pkcs11/rsa/TestCACerts.policy similarity index 100% rename from jdk/test/sun/security/pkcs11/rsa/TestCACerts.policy rename to test/jdk/sun/security/pkcs11/rsa/TestCACerts.policy diff --git a/jdk/test/sun/security/pkcs11/rsa/TestKeyFactory.java b/test/jdk/sun/security/pkcs11/rsa/TestKeyFactory.java similarity index 100% rename from jdk/test/sun/security/pkcs11/rsa/TestKeyFactory.java rename to test/jdk/sun/security/pkcs11/rsa/TestKeyFactory.java diff --git a/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java b/test/jdk/sun/security/pkcs11/rsa/TestKeyPairGenerator.java similarity index 100% rename from jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java rename to test/jdk/sun/security/pkcs11/rsa/TestKeyPairGenerator.java diff --git a/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.policy b/test/jdk/sun/security/pkcs11/rsa/TestKeyPairGenerator.policy similarity index 100% rename from jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.policy rename to test/jdk/sun/security/pkcs11/rsa/TestKeyPairGenerator.policy diff --git a/jdk/test/sun/security/pkcs11/rsa/TestSignatures.java b/test/jdk/sun/security/pkcs11/rsa/TestSignatures.java similarity index 100% rename from jdk/test/sun/security/pkcs11/rsa/TestSignatures.java rename to test/jdk/sun/security/pkcs11/rsa/TestSignatures.java diff --git a/jdk/test/sun/security/pkcs11/rsa/rsakeys.ks b/test/jdk/sun/security/pkcs11/rsa/rsakeys.ks similarity index 100% rename from jdk/test/sun/security/pkcs11/rsa/rsakeys.ks rename to test/jdk/sun/security/pkcs11/rsa/rsakeys.ks diff --git a/jdk/test/sun/security/pkcs11/rsa/rsakeys.ks.policy b/test/jdk/sun/security/pkcs11/rsa/rsakeys.ks.policy similarity index 100% rename from jdk/test/sun/security/pkcs11/rsa/rsakeys.ks.policy rename to test/jdk/sun/security/pkcs11/rsa/rsakeys.ks.policy diff --git a/jdk/test/sun/security/pkcs11/sslecc/CipherTest.java b/test/jdk/sun/security/pkcs11/sslecc/CipherTest.java similarity index 100% rename from jdk/test/sun/security/pkcs11/sslecc/CipherTest.java rename to test/jdk/sun/security/pkcs11/sslecc/CipherTest.java diff --git a/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java b/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java similarity index 100% rename from jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java rename to test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java diff --git a/jdk/test/sun/security/pkcs11/sslecc/JSSEClient.java b/test/jdk/sun/security/pkcs11/sslecc/JSSEClient.java similarity index 100% rename from jdk/test/sun/security/pkcs11/sslecc/JSSEClient.java rename to test/jdk/sun/security/pkcs11/sslecc/JSSEClient.java diff --git a/jdk/test/sun/security/pkcs11/sslecc/JSSEServer.java b/test/jdk/sun/security/pkcs11/sslecc/JSSEServer.java similarity index 100% rename from jdk/test/sun/security/pkcs11/sslecc/JSSEServer.java rename to test/jdk/sun/security/pkcs11/sslecc/JSSEServer.java diff --git a/jdk/test/sun/security/pkcs11/sslecc/keystore b/test/jdk/sun/security/pkcs11/sslecc/keystore similarity index 100% rename from jdk/test/sun/security/pkcs11/sslecc/keystore rename to test/jdk/sun/security/pkcs11/sslecc/keystore diff --git a/jdk/test/sun/security/pkcs11/sslecc/policy b/test/jdk/sun/security/pkcs11/sslecc/policy similarity index 100% rename from jdk/test/sun/security/pkcs11/sslecc/policy rename to test/jdk/sun/security/pkcs11/sslecc/policy diff --git a/jdk/test/sun/security/pkcs11/sslecc/truststore b/test/jdk/sun/security/pkcs11/sslecc/truststore similarity index 100% rename from jdk/test/sun/security/pkcs11/sslecc/truststore rename to test/jdk/sun/security/pkcs11/sslecc/truststore diff --git a/jdk/test/sun/security/pkcs11/tls/TestKeyMaterial.java b/test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java similarity index 100% rename from jdk/test/sun/security/pkcs11/tls/TestKeyMaterial.java rename to test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java diff --git a/jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java b/test/jdk/sun/security/pkcs11/tls/TestLeadingZeroesP11.java similarity index 100% rename from jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java rename to test/jdk/sun/security/pkcs11/tls/TestLeadingZeroesP11.java diff --git a/jdk/test/sun/security/pkcs11/tls/TestMasterSecret.java b/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.java similarity index 100% rename from jdk/test/sun/security/pkcs11/tls/TestMasterSecret.java rename to test/jdk/sun/security/pkcs11/tls/TestMasterSecret.java diff --git a/jdk/test/sun/security/pkcs11/tls/TestMasterSecret.policy b/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.policy similarity index 100% rename from jdk/test/sun/security/pkcs11/tls/TestMasterSecret.policy rename to test/jdk/sun/security/pkcs11/tls/TestMasterSecret.policy diff --git a/jdk/test/sun/security/pkcs11/tls/TestPRF.java b/test/jdk/sun/security/pkcs11/tls/TestPRF.java similarity index 100% rename from jdk/test/sun/security/pkcs11/tls/TestPRF.java rename to test/jdk/sun/security/pkcs11/tls/TestPRF.java diff --git a/jdk/test/sun/security/pkcs11/tls/TestPremaster.java b/test/jdk/sun/security/pkcs11/tls/TestPremaster.java similarity index 100% rename from jdk/test/sun/security/pkcs11/tls/TestPremaster.java rename to test/jdk/sun/security/pkcs11/tls/TestPremaster.java diff --git a/jdk/test/sun/security/pkcs11/tls/keymatdata.txt b/test/jdk/sun/security/pkcs11/tls/keymatdata.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/tls/keymatdata.txt rename to test/jdk/sun/security/pkcs11/tls/keymatdata.txt diff --git a/jdk/test/sun/security/pkcs11/tls/masterdata.txt b/test/jdk/sun/security/pkcs11/tls/masterdata.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/tls/masterdata.txt rename to test/jdk/sun/security/pkcs11/tls/masterdata.txt diff --git a/jdk/test/sun/security/pkcs11/tls/policy b/test/jdk/sun/security/pkcs11/tls/policy similarity index 100% rename from jdk/test/sun/security/pkcs11/tls/policy rename to test/jdk/sun/security/pkcs11/tls/policy diff --git a/jdk/test/sun/security/pkcs11/tls/prfdata.txt b/test/jdk/sun/security/pkcs11/tls/prfdata.txt similarity index 100% rename from jdk/test/sun/security/pkcs11/tls/prfdata.txt rename to test/jdk/sun/security/pkcs11/tls/prfdata.txt diff --git a/jdk/test/sun/security/pkcs12/Bug6415637.java b/test/jdk/sun/security/pkcs12/Bug6415637.java similarity index 100% rename from jdk/test/sun/security/pkcs12/Bug6415637.java rename to test/jdk/sun/security/pkcs12/Bug6415637.java diff --git a/jdk/test/sun/security/pkcs12/EmptyAlias.java b/test/jdk/sun/security/pkcs12/EmptyAlias.java similarity index 100% rename from jdk/test/sun/security/pkcs12/EmptyAlias.java rename to test/jdk/sun/security/pkcs12/EmptyAlias.java diff --git a/jdk/test/sun/security/pkcs12/MixedcaseAlias.java b/test/jdk/sun/security/pkcs12/MixedcaseAlias.java similarity index 100% rename from jdk/test/sun/security/pkcs12/MixedcaseAlias.java rename to test/jdk/sun/security/pkcs12/MixedcaseAlias.java diff --git a/jdk/test/sun/security/pkcs12/P12SecretKey.java b/test/jdk/sun/security/pkcs12/P12SecretKey.java similarity index 100% rename from jdk/test/sun/security/pkcs12/P12SecretKey.java rename to test/jdk/sun/security/pkcs12/P12SecretKey.java diff --git a/jdk/test/sun/security/pkcs12/PKCS12SameKeyId.java b/test/jdk/sun/security/pkcs12/PKCS12SameKeyId.java similarity index 100% rename from jdk/test/sun/security/pkcs12/PKCS12SameKeyId.java rename to test/jdk/sun/security/pkcs12/PKCS12SameKeyId.java diff --git a/jdk/test/sun/security/pkcs12/ProbeLargeKeystore.java b/test/jdk/sun/security/pkcs12/ProbeLargeKeystore.java similarity index 100% rename from jdk/test/sun/security/pkcs12/ProbeLargeKeystore.java rename to test/jdk/sun/security/pkcs12/ProbeLargeKeystore.java diff --git a/jdk/test/sun/security/pkcs12/StorePasswordTest.java b/test/jdk/sun/security/pkcs12/StorePasswordTest.java similarity index 100% rename from jdk/test/sun/security/pkcs12/StorePasswordTest.java rename to test/jdk/sun/security/pkcs12/StorePasswordTest.java diff --git a/jdk/test/sun/security/pkcs12/StoreSecretKeyTest.java b/test/jdk/sun/security/pkcs12/StoreSecretKeyTest.java similarity index 100% rename from jdk/test/sun/security/pkcs12/StoreSecretKeyTest.java rename to test/jdk/sun/security/pkcs12/StoreSecretKeyTest.java diff --git a/jdk/test/sun/security/pkcs12/StoreTrustedCertTest.java b/test/jdk/sun/security/pkcs12/StoreTrustedCertTest.java similarity index 100% rename from jdk/test/sun/security/pkcs12/StoreTrustedCertTest.java rename to test/jdk/sun/security/pkcs12/StoreTrustedCertTest.java diff --git a/jdk/test/sun/security/pkcs12/trusted.pem b/test/jdk/sun/security/pkcs12/trusted.pem similarity index 100% rename from jdk/test/sun/security/pkcs12/trusted.pem rename to test/jdk/sun/security/pkcs12/trusted.pem diff --git a/jdk/test/sun/security/provider/DSA/SupportedDSAParamGen.java b/test/jdk/sun/security/provider/DSA/SupportedDSAParamGen.java similarity index 100% rename from jdk/test/sun/security/provider/DSA/SupportedDSAParamGen.java rename to test/jdk/sun/security/provider/DSA/SupportedDSAParamGen.java diff --git a/jdk/test/sun/security/provider/DSA/TestAlgParameterGenerator.java b/test/jdk/sun/security/provider/DSA/TestAlgParameterGenerator.java similarity index 100% rename from jdk/test/sun/security/provider/DSA/TestAlgParameterGenerator.java rename to test/jdk/sun/security/provider/DSA/TestAlgParameterGenerator.java diff --git a/jdk/test/sun/security/provider/DSA/TestDSA.java b/test/jdk/sun/security/provider/DSA/TestDSA.java similarity index 100% rename from jdk/test/sun/security/provider/DSA/TestDSA.java rename to test/jdk/sun/security/provider/DSA/TestDSA.java diff --git a/jdk/test/sun/security/provider/DSA/TestDSA2.java b/test/jdk/sun/security/provider/DSA/TestDSA2.java similarity index 100% rename from jdk/test/sun/security/provider/DSA/TestDSA2.java rename to test/jdk/sun/security/provider/DSA/TestDSA2.java diff --git a/jdk/test/sun/security/provider/DSA/TestKeyPairGenerator.java b/test/jdk/sun/security/provider/DSA/TestKeyPairGenerator.java similarity index 100% rename from jdk/test/sun/security/provider/DSA/TestKeyPairGenerator.java rename to test/jdk/sun/security/provider/DSA/TestKeyPairGenerator.java diff --git a/jdk/test/sun/security/provider/DSA/TestMaxLengthDER.java b/test/jdk/sun/security/provider/DSA/TestMaxLengthDER.java similarity index 100% rename from jdk/test/sun/security/provider/DSA/TestMaxLengthDER.java rename to test/jdk/sun/security/provider/DSA/TestMaxLengthDER.java diff --git a/jdk/test/sun/security/provider/FileInputStreamPool/FileInputStreamPoolTest.java b/test/jdk/sun/security/provider/FileInputStreamPool/FileInputStreamPoolTest.java similarity index 100% rename from jdk/test/sun/security/provider/FileInputStreamPool/FileInputStreamPoolTest.java rename to test/jdk/sun/security/provider/FileInputStreamPool/FileInputStreamPoolTest.java diff --git a/jdk/test/sun/security/provider/KeyStore/CaseSensitiveAliases.java b/test/jdk/sun/security/provider/KeyStore/CaseSensitiveAliases.java similarity index 100% rename from jdk/test/sun/security/provider/KeyStore/CaseSensitiveAliases.java rename to test/jdk/sun/security/provider/KeyStore/CaseSensitiveAliases.java diff --git a/jdk/test/sun/security/provider/KeyStore/DKSTest.java b/test/jdk/sun/security/provider/KeyStore/DKSTest.java similarity index 100% rename from jdk/test/sun/security/provider/KeyStore/DKSTest.java rename to test/jdk/sun/security/provider/KeyStore/DKSTest.java diff --git a/jdk/test/sun/security/provider/KeyStore/DKSTest.sh b/test/jdk/sun/security/provider/KeyStore/DKSTest.sh similarity index 100% rename from jdk/test/sun/security/provider/KeyStore/DKSTest.sh rename to test/jdk/sun/security/provider/KeyStore/DKSTest.sh diff --git a/jdk/test/sun/security/provider/KeyStore/TestJKSWithSecretKey.java b/test/jdk/sun/security/provider/KeyStore/TestJKSWithSecretKey.java similarity index 100% rename from jdk/test/sun/security/provider/KeyStore/TestJKSWithSecretKey.java rename to test/jdk/sun/security/provider/KeyStore/TestJKSWithSecretKey.java diff --git a/jdk/test/sun/security/provider/KeyStore/WrongPassword.java b/test/jdk/sun/security/provider/KeyStore/WrongPassword.java similarity index 100% rename from jdk/test/sun/security/provider/KeyStore/WrongPassword.java rename to test/jdk/sun/security/provider/KeyStore/WrongPassword.java diff --git a/jdk/test/sun/security/provider/KeyStore/domains.cfg b/test/jdk/sun/security/provider/KeyStore/domains.cfg similarity index 100% rename from jdk/test/sun/security/provider/KeyStore/domains.cfg rename to test/jdk/sun/security/provider/KeyStore/domains.cfg diff --git a/jdk/test/sun/security/provider/KeyStore/pw.jks b/test/jdk/sun/security/provider/KeyStore/pw.jks similarity index 100% rename from jdk/test/sun/security/provider/KeyStore/pw.jks rename to test/jdk/sun/security/provider/KeyStore/pw.jks diff --git a/jdk/test/sun/security/provider/MessageDigest/DigestKAT.java b/test/jdk/sun/security/provider/MessageDigest/DigestKAT.java similarity index 100% rename from jdk/test/sun/security/provider/MessageDigest/DigestKAT.java rename to test/jdk/sun/security/provider/MessageDigest/DigestKAT.java diff --git a/jdk/test/sun/security/provider/MessageDigest/Offsets.java b/test/jdk/sun/security/provider/MessageDigest/Offsets.java similarity index 100% rename from jdk/test/sun/security/provider/MessageDigest/Offsets.java rename to test/jdk/sun/security/provider/MessageDigest/Offsets.java diff --git a/jdk/test/sun/security/provider/MessageDigest/SHA512.java b/test/jdk/sun/security/provider/MessageDigest/SHA512.java similarity index 100% rename from jdk/test/sun/security/provider/MessageDigest/SHA512.java rename to test/jdk/sun/security/provider/MessageDigest/SHA512.java diff --git a/jdk/test/sun/security/provider/MessageDigest/TestSHAClone.java b/test/jdk/sun/security/provider/MessageDigest/TestSHAClone.java similarity index 100% rename from jdk/test/sun/security/provider/MessageDigest/TestSHAClone.java rename to test/jdk/sun/security/provider/MessageDigest/TestSHAClone.java diff --git a/jdk/test/sun/security/provider/NSASuiteB/TestDSAGenParameterSpec.java b/test/jdk/sun/security/provider/NSASuiteB/TestDSAGenParameterSpec.java similarity index 100% rename from jdk/test/sun/security/provider/NSASuiteB/TestDSAGenParameterSpec.java rename to test/jdk/sun/security/provider/NSASuiteB/TestDSAGenParameterSpec.java diff --git a/jdk/test/sun/security/provider/NSASuiteB/TestSHAOids.java b/test/jdk/sun/security/provider/NSASuiteB/TestSHAOids.java similarity index 100% rename from jdk/test/sun/security/provider/NSASuiteB/TestSHAOids.java rename to test/jdk/sun/security/provider/NSASuiteB/TestSHAOids.java diff --git a/jdk/test/sun/security/provider/NSASuiteB/TestSHAwithDSASignatureOids.java b/test/jdk/sun/security/provider/NSASuiteB/TestSHAwithDSASignatureOids.java similarity index 100% rename from jdk/test/sun/security/provider/NSASuiteB/TestSHAwithDSASignatureOids.java rename to test/jdk/sun/security/provider/NSASuiteB/TestSHAwithDSASignatureOids.java diff --git a/jdk/test/sun/security/provider/PolicyFile/Alias.java b/test/jdk/sun/security/provider/PolicyFile/Alias.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/Alias.java rename to test/jdk/sun/security/provider/PolicyFile/Alias.java diff --git a/jdk/test/sun/security/provider/PolicyFile/Alias.keystore b/test/jdk/sun/security/provider/PolicyFile/Alias.keystore similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/Alias.keystore rename to test/jdk/sun/security/provider/PolicyFile/Alias.keystore diff --git a/jdk/test/sun/security/provider/PolicyFile/Alias.policy b/test/jdk/sun/security/provider/PolicyFile/Alias.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/Alias.policy rename to test/jdk/sun/security/provider/PolicyFile/Alias.policy diff --git a/jdk/test/sun/security/provider/PolicyFile/AliasExpansion.java b/test/jdk/sun/security/provider/PolicyFile/AliasExpansion.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/AliasExpansion.java rename to test/jdk/sun/security/provider/PolicyFile/AliasExpansion.java diff --git a/jdk/test/sun/security/provider/PolicyFile/AliasExpansion.policy b/test/jdk/sun/security/provider/PolicyFile/AliasExpansion.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/AliasExpansion.policy rename to test/jdk/sun/security/provider/PolicyFile/AliasExpansion.policy diff --git a/jdk/test/sun/security/provider/PolicyFile/BadPolicyFile.java b/test/jdk/sun/security/provider/PolicyFile/BadPolicyFile.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/BadPolicyFile.java rename to test/jdk/sun/security/provider/PolicyFile/BadPolicyFile.java diff --git a/jdk/test/sun/security/provider/PolicyFile/BadPolicyFile.policy b/test/jdk/sun/security/provider/PolicyFile/BadPolicyFile.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/BadPolicyFile.policy rename to test/jdk/sun/security/provider/PolicyFile/BadPolicyFile.policy diff --git a/jdk/test/sun/security/provider/PolicyFile/CanonPath.java b/test/jdk/sun/security/provider/PolicyFile/CanonPath.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/CanonPath.java rename to test/jdk/sun/security/provider/PolicyFile/CanonPath.java diff --git a/jdk/test/sun/security/provider/PolicyFile/CombinedPerms.java b/test/jdk/sun/security/provider/PolicyFile/CombinedPerms.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/CombinedPerms.java rename to test/jdk/sun/security/provider/PolicyFile/CombinedPerms.java diff --git a/jdk/test/sun/security/provider/PolicyFile/CombinedPerms.policy b/test/jdk/sun/security/provider/PolicyFile/CombinedPerms.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/CombinedPerms.policy rename to test/jdk/sun/security/provider/PolicyFile/CombinedPerms.policy diff --git a/jdk/test/sun/security/provider/PolicyFile/Comparator.Combined.Policy b/test/jdk/sun/security/provider/PolicyFile/Comparator.Combined.Policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/Comparator.Combined.Policy rename to test/jdk/sun/security/provider/PolicyFile/Comparator.Combined.Policy diff --git a/jdk/test/sun/security/provider/PolicyFile/Comparator.Comparator.Policy b/test/jdk/sun/security/provider/PolicyFile/Comparator.Comparator.Policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/Comparator.Comparator.Policy rename to test/jdk/sun/security/provider/PolicyFile/Comparator.Comparator.Policy diff --git a/jdk/test/sun/security/provider/PolicyFile/Comparator.Principal.Policy b/test/jdk/sun/security/provider/PolicyFile/Comparator.Principal.Policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/Comparator.Principal.Policy rename to test/jdk/sun/security/provider/PolicyFile/Comparator.Principal.Policy diff --git a/jdk/test/sun/security/provider/PolicyFile/Comparator.java b/test/jdk/sun/security/provider/PolicyFile/Comparator.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/Comparator.java rename to test/jdk/sun/security/provider/PolicyFile/Comparator.java diff --git a/jdk/test/sun/security/provider/PolicyFile/DefaultPolicy.java b/test/jdk/sun/security/provider/PolicyFile/DefaultPolicy.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/DefaultPolicy.java rename to test/jdk/sun/security/provider/PolicyFile/DefaultPolicy.java diff --git a/jdk/test/sun/security/provider/PolicyFile/EmailAddress.java b/test/jdk/sun/security/provider/PolicyFile/EmailAddress.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/EmailAddress.java rename to test/jdk/sun/security/provider/PolicyFile/EmailAddress.java diff --git a/jdk/test/sun/security/provider/PolicyFile/EmailAddress.policy b/test/jdk/sun/security/provider/PolicyFile/EmailAddress.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/EmailAddress.policy rename to test/jdk/sun/security/provider/PolicyFile/EmailAddress.policy diff --git a/jdk/test/sun/security/provider/PolicyFile/Extra.policy b/test/jdk/sun/security/provider/PolicyFile/Extra.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/Extra.policy rename to test/jdk/sun/security/provider/PolicyFile/Extra.policy diff --git a/jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java b/test/jdk/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java rename to test/jdk/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java diff --git a/jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh b/test/jdk/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh rename to test/jdk/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh diff --git a/jdk/test/sun/security/provider/PolicyFile/Modules.java b/test/jdk/sun/security/provider/PolicyFile/Modules.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/Modules.java rename to test/jdk/sun/security/provider/PolicyFile/Modules.java diff --git a/jdk/test/sun/security/provider/PolicyFile/NullCodeSource.java b/test/jdk/sun/security/provider/PolicyFile/NullCodeSource.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/NullCodeSource.java rename to test/jdk/sun/security/provider/PolicyFile/NullCodeSource.java diff --git a/jdk/test/sun/security/provider/PolicyFile/SelfExpansion.java b/test/jdk/sun/security/provider/PolicyFile/SelfExpansion.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/SelfExpansion.java rename to test/jdk/sun/security/provider/PolicyFile/SelfExpansion.java diff --git a/jdk/test/sun/security/provider/PolicyFile/SelfExpansion.policy b/test/jdk/sun/security/provider/PolicyFile/SelfExpansion.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/SelfExpansion.policy rename to test/jdk/sun/security/provider/PolicyFile/SelfExpansion.policy diff --git a/jdk/test/sun/security/provider/PolicyFile/SelfWildcard.java b/test/jdk/sun/security/provider/PolicyFile/SelfWildcard.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/SelfWildcard.java rename to test/jdk/sun/security/provider/PolicyFile/SelfWildcard.java diff --git a/jdk/test/sun/security/provider/PolicyFile/SelfWildcard.policy b/test/jdk/sun/security/provider/PolicyFile/SelfWildcard.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/SelfWildcard.policy rename to test/jdk/sun/security/provider/PolicyFile/SelfWildcard.policy diff --git a/jdk/test/sun/security/provider/PolicyFile/SomeExtensionClass.java b/test/jdk/sun/security/provider/PolicyFile/SomeExtensionClass.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/SomeExtensionClass.java rename to test/jdk/sun/security/provider/PolicyFile/SomeExtensionClass.java diff --git a/jdk/test/sun/security/provider/PolicyFile/TokenStore.RelPassPolicy b/test/jdk/sun/security/provider/PolicyFile/TokenStore.RelPassPolicy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/TokenStore.RelPassPolicy rename to test/jdk/sun/security/provider/PolicyFile/TokenStore.RelPassPolicy diff --git a/jdk/test/sun/security/provider/PolicyFile/TokenStore.java b/test/jdk/sun/security/provider/PolicyFile/TokenStore.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/TokenStore.java rename to test/jdk/sun/security/provider/PolicyFile/TokenStore.java diff --git a/jdk/test/sun/security/provider/PolicyFile/TokenStore.keystore b/test/jdk/sun/security/provider/PolicyFile/TokenStore.keystore similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/TokenStore.keystore rename to test/jdk/sun/security/provider/PolicyFile/TokenStore.keystore diff --git a/jdk/test/sun/security/provider/PolicyFile/TokenStore.pwd b/test/jdk/sun/security/provider/PolicyFile/TokenStore.pwd similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/TokenStore.pwd rename to test/jdk/sun/security/provider/PolicyFile/TokenStore.pwd diff --git a/jdk/test/sun/security/provider/PolicyFile/TrustedCert.java b/test/jdk/sun/security/provider/PolicyFile/TrustedCert.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/TrustedCert.java rename to test/jdk/sun/security/provider/PolicyFile/TrustedCert.java diff --git a/jdk/test/sun/security/provider/PolicyFile/TrustedCert.keystore b/test/jdk/sun/security/provider/PolicyFile/TrustedCert.keystore similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/TrustedCert.keystore rename to test/jdk/sun/security/provider/PolicyFile/TrustedCert.keystore diff --git a/jdk/test/sun/security/provider/PolicyFile/TrustedCert.keystore1 b/test/jdk/sun/security/provider/PolicyFile/TrustedCert.keystore1 similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/TrustedCert.keystore1 rename to test/jdk/sun/security/provider/PolicyFile/TrustedCert.keystore1 diff --git a/jdk/test/sun/security/provider/PolicyFile/TrustedCert.policy b/test/jdk/sun/security/provider/PolicyFile/TrustedCert.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/TrustedCert.policy rename to test/jdk/sun/security/provider/PolicyFile/TrustedCert.policy diff --git a/jdk/test/sun/security/provider/PolicyFile/Utf8.java b/test/jdk/sun/security/provider/PolicyFile/Utf8.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/Utf8.java rename to test/jdk/sun/security/provider/PolicyFile/Utf8.java diff --git a/jdk/test/sun/security/provider/PolicyFile/Utf8.policy b/test/jdk/sun/security/provider/PolicyFile/Utf8.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/Utf8.policy rename to test/jdk/sun/security/provider/PolicyFile/Utf8.policy diff --git a/jdk/test/sun/security/provider/PolicyFile/WildcardPrincipalName.java b/test/jdk/sun/security/provider/PolicyFile/WildcardPrincipalName.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/WildcardPrincipalName.java rename to test/jdk/sun/security/provider/PolicyFile/WildcardPrincipalName.java diff --git a/jdk/test/sun/security/provider/PolicyFile/getinstance/GetInstance.java b/test/jdk/sun/security/provider/PolicyFile/getinstance/GetInstance.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/getinstance/GetInstance.java rename to test/jdk/sun/security/provider/PolicyFile/getinstance/GetInstance.java diff --git a/jdk/test/sun/security/provider/PolicyFile/getinstance/GetInstance.policy b/test/jdk/sun/security/provider/PolicyFile/getinstance/GetInstance.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/getinstance/GetInstance.policy rename to test/jdk/sun/security/provider/PolicyFile/getinstance/GetInstance.policy diff --git a/jdk/test/sun/security/provider/PolicyFile/getinstance/NoArgPermission.java b/test/jdk/sun/security/provider/PolicyFile/getinstance/NoArgPermission.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/getinstance/NoArgPermission.java rename to test/jdk/sun/security/provider/PolicyFile/getinstance/NoArgPermission.java diff --git a/jdk/test/sun/security/provider/PolicyFile/getinstance/OneArgPermission.java b/test/jdk/sun/security/provider/PolicyFile/getinstance/OneArgPermission.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/getinstance/OneArgPermission.java rename to test/jdk/sun/security/provider/PolicyFile/getinstance/OneArgPermission.java diff --git a/jdk/test/sun/security/provider/PolicyFile/getinstance/TwoArgNullActionsPermission.java b/test/jdk/sun/security/provider/PolicyFile/getinstance/TwoArgNullActionsPermission.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/getinstance/TwoArgNullActionsPermission.java rename to test/jdk/sun/security/provider/PolicyFile/getinstance/TwoArgNullActionsPermission.java diff --git a/jdk/test/sun/security/provider/PolicyFile/getinstance/TwoArgPermission.java b/test/jdk/sun/security/provider/PolicyFile/getinstance/TwoArgPermission.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/getinstance/TwoArgPermission.java rename to test/jdk/sun/security/provider/PolicyFile/getinstance/TwoArgPermission.java diff --git a/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh b/test/jdk/sun/security/provider/PolicyFile/getinstance/getinstance.sh similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh rename to test/jdk/sun/security/provider/PolicyFile/getinstance/getinstance.sh diff --git a/jdk/test/sun/security/provider/PolicyFile/modules.policy b/test/jdk/sun/security/provider/PolicyFile/modules.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/modules.policy rename to test/jdk/sun/security/provider/PolicyFile/modules.policy diff --git a/jdk/test/sun/security/provider/PolicyFile/nullDomain.java b/test/jdk/sun/security/provider/PolicyFile/nullDomain.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/nullDomain.java rename to test/jdk/sun/security/provider/PolicyFile/nullDomain.java diff --git a/jdk/test/sun/security/provider/PolicyFile/wildcard.policy b/test/jdk/sun/security/provider/PolicyFile/wildcard.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyFile/wildcard.policy rename to test/jdk/sun/security/provider/PolicyFile/wildcard.policy diff --git a/jdk/test/sun/security/provider/PolicyParser/AvoidPropertyExpansionExceptions.java b/test/jdk/sun/security/provider/PolicyParser/AvoidPropertyExpansionExceptions.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/AvoidPropertyExpansionExceptions.java rename to test/jdk/sun/security/provider/PolicyParser/AvoidPropertyExpansionExceptions.java diff --git a/jdk/test/sun/security/provider/PolicyParser/BogusGrants.java b/test/jdk/sun/security/provider/PolicyParser/BogusGrants.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/BogusGrants.java rename to test/jdk/sun/security/provider/PolicyParser/BogusGrants.java diff --git a/jdk/test/sun/security/provider/PolicyParser/EncodeURL.java b/test/jdk/sun/security/provider/PolicyParser/EncodeURL.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/EncodeURL.java rename to test/jdk/sun/security/provider/PolicyParser/EncodeURL.java diff --git a/jdk/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java b/test/jdk/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java rename to test/jdk/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java diff --git a/jdk/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.policy b/test/jdk/sun/security/provider/PolicyParser/ExpansionErrorMisleading.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.policy rename to test/jdk/sun/security/provider/PolicyParser/ExpansionErrorMisleading.policy diff --git a/jdk/test/sun/security/provider/PolicyParser/ExtDirs.java b/test/jdk/sun/security/provider/PolicyParser/ExtDirs.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExtDirs.java rename to test/jdk/sun/security/provider/PolicyParser/ExtDirs.java diff --git a/jdk/test/sun/security/provider/PolicyParser/ExtDirs.policy b/test/jdk/sun/security/provider/PolicyParser/ExtDirs.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExtDirs.policy rename to test/jdk/sun/security/provider/PolicyParser/ExtDirs.policy diff --git a/jdk/test/sun/security/provider/PolicyParser/ExtDirs1.policy b/test/jdk/sun/security/provider/PolicyParser/ExtDirs1.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExtDirs1.policy rename to test/jdk/sun/security/provider/PolicyParser/ExtDirs1.policy diff --git a/jdk/test/sun/security/provider/PolicyParser/ExtDirs2.policy b/test/jdk/sun/security/provider/PolicyParser/ExtDirs2.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExtDirs2.policy rename to test/jdk/sun/security/provider/PolicyParser/ExtDirs2.policy diff --git a/jdk/test/sun/security/provider/PolicyParser/ExtDirs3.policy b/test/jdk/sun/security/provider/PolicyParser/ExtDirs3.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExtDirs3.policy rename to test/jdk/sun/security/provider/PolicyParser/ExtDirs3.policy diff --git a/jdk/test/sun/security/provider/PolicyParser/ExtDirsA.java b/test/jdk/sun/security/provider/PolicyParser/ExtDirsA.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExtDirsA.java rename to test/jdk/sun/security/provider/PolicyParser/ExtDirsA.java diff --git a/jdk/test/sun/security/provider/PolicyParser/ExtDirsA/a.jar b/test/jdk/sun/security/provider/PolicyParser/ExtDirsA/a.jar similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExtDirsA/a.jar rename to test/jdk/sun/security/provider/PolicyParser/ExtDirsA/a.jar diff --git a/jdk/test/sun/security/provider/PolicyParser/ExtDirsB.java b/test/jdk/sun/security/provider/PolicyParser/ExtDirsB.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExtDirsB.java rename to test/jdk/sun/security/provider/PolicyParser/ExtDirsB.java diff --git a/jdk/test/sun/security/provider/PolicyParser/ExtDirsB/b.jar b/test/jdk/sun/security/provider/PolicyParser/ExtDirsB/b.jar similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExtDirsB/b.jar rename to test/jdk/sun/security/provider/PolicyParser/ExtDirsB/b.jar diff --git a/jdk/test/sun/security/provider/PolicyParser/ExtDirsChange.java b/test/jdk/sun/security/provider/PolicyParser/ExtDirsChange.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExtDirsChange.java rename to test/jdk/sun/security/provider/PolicyParser/ExtDirsChange.java diff --git a/jdk/test/sun/security/provider/PolicyParser/ExtDirsChange.policy b/test/jdk/sun/security/provider/PolicyParser/ExtDirsChange.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExtDirsChange.policy rename to test/jdk/sun/security/provider/PolicyParser/ExtDirsChange.policy diff --git a/jdk/test/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java b/test/jdk/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java rename to test/jdk/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java diff --git a/jdk/test/sun/security/provider/PolicyParser/PrincipalExpansionError.java b/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/PrincipalExpansionError.java rename to test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.java diff --git a/jdk/test/sun/security/provider/PolicyParser/PrincipalExpansionError.policy b/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/PrincipalExpansionError.policy rename to test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.policy diff --git a/jdk/test/sun/security/provider/PolicyParser/PrincipalExpansionError.sh b/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.sh similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/PrincipalExpansionError.sh rename to test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.sh diff --git a/jdk/test/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java b/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java rename to test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java diff --git a/jdk/test/sun/security/provider/PolicyParser/TokenStore.java b/test/jdk/sun/security/provider/PolicyParser/TokenStore.java similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/TokenStore.java rename to test/jdk/sun/security/provider/PolicyParser/TokenStore.java diff --git a/jdk/test/sun/security/provider/PolicyParser/UnresolvedProperty.policy b/test/jdk/sun/security/provider/PolicyParser/UnresolvedProperty.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/UnresolvedProperty.policy rename to test/jdk/sun/security/provider/PolicyParser/UnresolvedProperty.policy diff --git a/jdk/test/sun/security/provider/PolicyParser/p001.policy b/test/jdk/sun/security/provider/PolicyParser/p001.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/p001.policy rename to test/jdk/sun/security/provider/PolicyParser/p001.policy diff --git a/jdk/test/sun/security/provider/PolicyParser/p002.policy b/test/jdk/sun/security/provider/PolicyParser/p002.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/p002.policy rename to test/jdk/sun/security/provider/PolicyParser/p002.policy diff --git a/jdk/test/sun/security/provider/PolicyParser/p003.policy b/test/jdk/sun/security/provider/PolicyParser/p003.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/p003.policy rename to test/jdk/sun/security/provider/PolicyParser/p003.policy diff --git a/jdk/test/sun/security/provider/PolicyParser/p004.policy b/test/jdk/sun/security/provider/PolicyParser/p004.policy similarity index 100% rename from jdk/test/sun/security/provider/PolicyParser/p004.policy rename to test/jdk/sun/security/provider/PolicyParser/p004.policy diff --git a/jdk/test/sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java b/test/jdk/sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java similarity index 100% rename from jdk/test/sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java rename to test/jdk/sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java diff --git a/jdk/test/sun/security/provider/SecureRandom/AbstractDrbg/java.base/sun/security/provider/S.java b/test/jdk/sun/security/provider/SecureRandom/AbstractDrbg/java.base/sun/security/provider/S.java similarity index 100% rename from jdk/test/sun/security/provider/SecureRandom/AbstractDrbg/java.base/sun/security/provider/S.java rename to test/jdk/sun/security/provider/SecureRandom/AbstractDrbg/java.base/sun/security/provider/S.java diff --git a/jdk/test/sun/security/provider/SecureRandom/AutoReseed.java b/test/jdk/sun/security/provider/SecureRandom/AutoReseed.java similarity index 100% rename from jdk/test/sun/security/provider/SecureRandom/AutoReseed.java rename to test/jdk/sun/security/provider/SecureRandom/AutoReseed.java diff --git a/jdk/test/sun/security/provider/SecureRandom/CommonSeeder.java b/test/jdk/sun/security/provider/SecureRandom/CommonSeeder.java similarity index 100% rename from jdk/test/sun/security/provider/SecureRandom/CommonSeeder.java rename to test/jdk/sun/security/provider/SecureRandom/CommonSeeder.java diff --git a/jdk/test/sun/security/provider/SecureRandom/DRBGAlg.java b/test/jdk/sun/security/provider/SecureRandom/DRBGAlg.java similarity index 100% rename from jdk/test/sun/security/provider/SecureRandom/DRBGAlg.java rename to test/jdk/sun/security/provider/SecureRandom/DRBGAlg.java diff --git a/jdk/test/sun/security/provider/SecureRandom/DRBGS11n.java b/test/jdk/sun/security/provider/SecureRandom/DRBGS11n.java similarity index 100% rename from jdk/test/sun/security/provider/SecureRandom/DRBGS11n.java rename to test/jdk/sun/security/provider/SecureRandom/DRBGS11n.java diff --git a/jdk/test/sun/security/provider/SecureRandom/DrbgCavp.java b/test/jdk/sun/security/provider/SecureRandom/DrbgCavp.java similarity index 100% rename from jdk/test/sun/security/provider/SecureRandom/DrbgCavp.java rename to test/jdk/sun/security/provider/SecureRandom/DrbgCavp.java diff --git a/jdk/test/sun/security/provider/SecureRandom/SHA1PRNGReseed.java b/test/jdk/sun/security/provider/SecureRandom/SHA1PRNGReseed.java similarity index 100% rename from jdk/test/sun/security/provider/SecureRandom/SHA1PRNGReseed.java rename to test/jdk/sun/security/provider/SecureRandom/SHA1PRNGReseed.java diff --git a/jdk/test/sun/security/provider/SecureRandom/StrongSecureRandom.java b/test/jdk/sun/security/provider/SecureRandom/StrongSecureRandom.java similarity index 100% rename from jdk/test/sun/security/provider/SecureRandom/StrongSecureRandom.java rename to test/jdk/sun/security/provider/SecureRandom/StrongSecureRandom.java diff --git a/jdk/test/sun/security/provider/SecureRandom/StrongSeedReader.java b/test/jdk/sun/security/provider/SecureRandom/StrongSeedReader.java similarity index 100% rename from jdk/test/sun/security/provider/SecureRandom/StrongSeedReader.java rename to test/jdk/sun/security/provider/SecureRandom/StrongSeedReader.java diff --git a/jdk/test/sun/security/provider/SeedGenerator/Awt_Hang_Test.java b/test/jdk/sun/security/provider/SeedGenerator/Awt_Hang_Test.java similarity index 100% rename from jdk/test/sun/security/provider/SeedGenerator/Awt_Hang_Test.java rename to test/jdk/sun/security/provider/SeedGenerator/Awt_Hang_Test.java diff --git a/jdk/test/sun/security/provider/SeedGenerator/Priority_Inversion.java b/test/jdk/sun/security/provider/SeedGenerator/Priority_Inversion.java similarity index 100% rename from jdk/test/sun/security/provider/SeedGenerator/Priority_Inversion.java rename to test/jdk/sun/security/provider/SeedGenerator/Priority_Inversion.java diff --git a/jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java b/test/jdk/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java similarity index 100% rename from jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java rename to test/jdk/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java diff --git a/jdk/test/sun/security/provider/X509Factory/BadPem.java b/test/jdk/sun/security/provider/X509Factory/BadPem.java similarity index 100% rename from jdk/test/sun/security/provider/X509Factory/BadPem.java rename to test/jdk/sun/security/provider/X509Factory/BadPem.java diff --git a/jdk/test/sun/security/provider/X509Factory/BigCRL.java b/test/jdk/sun/security/provider/X509Factory/BigCRL.java similarity index 100% rename from jdk/test/sun/security/provider/X509Factory/BigCRL.java rename to test/jdk/sun/security/provider/X509Factory/BigCRL.java diff --git a/jdk/test/sun/security/provider/certpath/CertId/CheckCertId.java b/test/jdk/sun/security/provider/certpath/CertId/CheckCertId.java similarity index 100% rename from jdk/test/sun/security/provider/certpath/CertId/CheckCertId.java rename to test/jdk/sun/security/provider/certpath/CertId/CheckCertId.java diff --git a/jdk/test/sun/security/provider/certpath/CertId/interCA.der b/test/jdk/sun/security/provider/certpath/CertId/interCA.der similarity index 100% rename from jdk/test/sun/security/provider/certpath/CertId/interCA.der rename to test/jdk/sun/security/provider/certpath/CertId/interCA.der diff --git a/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java similarity index 100% rename from jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java rename to test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java diff --git a/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java similarity index 100% rename from jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java rename to test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java diff --git a/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java similarity index 100% rename from jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java rename to test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java diff --git a/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java similarity index 100% rename from jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java rename to test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java diff --git a/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java similarity index 100% rename from jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java rename to test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java diff --git a/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/README b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/README similarity index 100% rename from jdk/test/sun/security/provider/certpath/DisabledAlgorithms/README rename to test/jdk/sun/security/provider/certpath/DisabledAlgorithms/README diff --git a/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/generate.sh b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/generate.sh similarity index 100% rename from jdk/test/sun/security/provider/certpath/DisabledAlgorithms/generate.sh rename to test/jdk/sun/security/provider/certpath/DisabledAlgorithms/generate.sh diff --git a/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/openssl.cnf b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/openssl.cnf similarity index 100% rename from jdk/test/sun/security/provider/certpath/DisabledAlgorithms/openssl.cnf rename to test/jdk/sun/security/provider/certpath/DisabledAlgorithms/openssl.cnf diff --git a/jdk/test/sun/security/provider/certpath/Extensions/OCSPNonceExtensionTests.java b/test/jdk/sun/security/provider/certpath/Extensions/OCSPNonceExtensionTests.java similarity index 100% rename from jdk/test/sun/security/provider/certpath/Extensions/OCSPNonceExtensionTests.java rename to test/jdk/sun/security/provider/certpath/Extensions/OCSPNonceExtensionTests.java diff --git a/jdk/test/sun/security/provider/certpath/OCSP/OCSPSingleExtensions.java b/test/jdk/sun/security/provider/certpath/OCSP/OCSPSingleExtensions.java similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/OCSPSingleExtensions.java rename to test/jdk/sun/security/provider/certpath/OCSP/OCSPSingleExtensions.java diff --git a/jdk/test/sun/security/provider/certpath/OCSP/TEST.properties b/test/jdk/sun/security/provider/certpath/OCSP/TEST.properties similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/TEST.properties rename to test/jdk/sun/security/provider/certpath/OCSP/TEST.properties diff --git a/jdk/test/sun/security/provider/certpath/OCSP/int.crt b/test/jdk/sun/security/provider/certpath/OCSP/int.crt similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/int.crt rename to test/jdk/sun/security/provider/certpath/OCSP/int.crt diff --git a/jdk/test/sun/security/provider/certpath/OCSP/ocsp-good-nonext.resp b/test/jdk/sun/security/provider/certpath/OCSP/ocsp-good-nonext.resp similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/ocsp-good-nonext.resp rename to test/jdk/sun/security/provider/certpath/OCSP/ocsp-good-nonext.resp diff --git a/jdk/test/sun/security/provider/certpath/OCSP/ocsp-good-witharchcut.resp b/test/jdk/sun/security/provider/certpath/OCSP/ocsp-good-witharchcut.resp similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/ocsp-good-witharchcut.resp rename to test/jdk/sun/security/provider/certpath/OCSP/ocsp-good-witharchcut.resp diff --git a/jdk/test/sun/security/provider/certpath/OCSP/ocsp-good-withnext.resp b/test/jdk/sun/security/provider/certpath/OCSP/ocsp-good-withnext.resp similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/ocsp-good-withnext.resp rename to test/jdk/sun/security/provider/certpath/OCSP/ocsp-good-withnext.resp diff --git a/jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-bad-sr-tag.resp b/test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-bad-sr-tag.resp similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-bad-sr-tag.resp rename to test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-bad-sr-tag.resp diff --git a/jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-nocerts.resp b/test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-nocerts.resp similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-nocerts.resp rename to test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-nocerts.resp diff --git a/jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-nonext-noinv.resp b/test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-nonext-noinv.resp similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-nonext-noinv.resp rename to test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-nonext-noinv.resp diff --git a/jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-nonext-withinv.resp b/test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-nonext-withinv.resp similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-nonext-withinv.resp rename to test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-nonext-withinv.resp diff --git a/jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-sr-cont-reverse.resp b/test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-sr-cont-reverse.resp similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-sr-cont-reverse.resp rename to test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-sr-cont-reverse.resp diff --git a/jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-twonext.resp b/test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-twonext.resp similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-twonext.resp rename to test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-twonext.resp diff --git a/jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-withnext-noinv.resp b/test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-withnext-noinv.resp similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-withnext-noinv.resp rename to test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-withnext-noinv.resp diff --git a/jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-withnext-withinv.resp b/test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-withnext-withinv.resp similarity index 100% rename from jdk/test/sun/security/provider/certpath/OCSP/ocsp-rev-withnext-withinv.resp rename to test/jdk/sun/security/provider/certpath/OCSP/ocsp-rev-withnext-withinv.resp diff --git a/jdk/test/sun/security/provider/certpath/PKIXCertPathValidator/Validity.java b/test/jdk/sun/security/provider/certpath/PKIXCertPathValidator/Validity.java similarity index 100% rename from jdk/test/sun/security/provider/certpath/PKIXCertPathValidator/Validity.java rename to test/jdk/sun/security/provider/certpath/PKIXCertPathValidator/Validity.java diff --git a/jdk/test/sun/security/provider/certpath/ResponderId/ResponderIdTests.java b/test/jdk/sun/security/provider/certpath/ResponderId/ResponderIdTests.java similarity index 100% rename from jdk/test/sun/security/provider/certpath/ResponderId/ResponderIdTests.java rename to test/jdk/sun/security/provider/certpath/ResponderId/ResponderIdTests.java diff --git a/jdk/test/sun/security/provider/certpath/SunCertPathBuilderExceptionTest.java b/test/jdk/sun/security/provider/certpath/SunCertPathBuilderExceptionTest.java similarity index 100% rename from jdk/test/sun/security/provider/certpath/SunCertPathBuilderExceptionTest.java rename to test/jdk/sun/security/provider/certpath/SunCertPathBuilderExceptionTest.java diff --git a/jdk/test/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java b/test/jdk/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java similarity index 100% rename from jdk/test/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java rename to test/jdk/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java diff --git a/jdk/test/sun/security/provider/certpath/speech2speech b/test/jdk/sun/security/provider/certpath/speech2speech similarity index 100% rename from jdk/test/sun/security/provider/certpath/speech2speech rename to test/jdk/sun/security/provider/certpath/speech2speech diff --git a/jdk/test/sun/security/rsa/GenKeyStore.java b/test/jdk/sun/security/rsa/GenKeyStore.java similarity index 100% rename from jdk/test/sun/security/rsa/GenKeyStore.java rename to test/jdk/sun/security/rsa/GenKeyStore.java diff --git a/jdk/test/sun/security/rsa/InvalidBitString.java b/test/jdk/sun/security/rsa/InvalidBitString.java similarity index 100% rename from jdk/test/sun/security/rsa/InvalidBitString.java rename to test/jdk/sun/security/rsa/InvalidBitString.java diff --git a/jdk/test/sun/security/rsa/KeySizeTest.java b/test/jdk/sun/security/rsa/KeySizeTest.java similarity index 100% rename from jdk/test/sun/security/rsa/KeySizeTest.java rename to test/jdk/sun/security/rsa/KeySizeTest.java diff --git a/jdk/test/sun/security/rsa/PrivateKeyEqualityTest.java b/test/jdk/sun/security/rsa/PrivateKeyEqualityTest.java similarity index 100% rename from jdk/test/sun/security/rsa/PrivateKeyEqualityTest.java rename to test/jdk/sun/security/rsa/PrivateKeyEqualityTest.java diff --git a/jdk/test/sun/security/rsa/SignatureOffsets.java b/test/jdk/sun/security/rsa/SignatureOffsets.java similarity index 100% rename from jdk/test/sun/security/rsa/SignatureOffsets.java rename to test/jdk/sun/security/rsa/SignatureOffsets.java diff --git a/jdk/test/sun/security/rsa/SignatureTest.java b/test/jdk/sun/security/rsa/SignatureTest.java similarity index 100% rename from jdk/test/sun/security/rsa/SignatureTest.java rename to test/jdk/sun/security/rsa/SignatureTest.java diff --git a/jdk/test/sun/security/rsa/SignedObjectChain.java b/test/jdk/sun/security/rsa/SignedObjectChain.java similarity index 100% rename from jdk/test/sun/security/rsa/SignedObjectChain.java rename to test/jdk/sun/security/rsa/SignedObjectChain.java diff --git a/jdk/test/sun/security/rsa/SpecTest.java b/test/jdk/sun/security/rsa/SpecTest.java similarity index 100% rename from jdk/test/sun/security/rsa/SpecTest.java rename to test/jdk/sun/security/rsa/SpecTest.java diff --git a/jdk/test/sun/security/rsa/TestCACerts.java b/test/jdk/sun/security/rsa/TestCACerts.java similarity index 100% rename from jdk/test/sun/security/rsa/TestCACerts.java rename to test/jdk/sun/security/rsa/TestCACerts.java diff --git a/jdk/test/sun/security/rsa/TestKeyFactory.java b/test/jdk/sun/security/rsa/TestKeyFactory.java similarity index 100% rename from jdk/test/sun/security/rsa/TestKeyFactory.java rename to test/jdk/sun/security/rsa/TestKeyFactory.java diff --git a/jdk/test/sun/security/rsa/TestKeyPairGenerator.java b/test/jdk/sun/security/rsa/TestKeyPairGenerator.java similarity index 100% rename from jdk/test/sun/security/rsa/TestKeyPairGenerator.java rename to test/jdk/sun/security/rsa/TestKeyPairGenerator.java diff --git a/jdk/test/sun/security/rsa/TestKeyPairGeneratorLength.java b/test/jdk/sun/security/rsa/TestKeyPairGeneratorLength.java similarity index 100% rename from jdk/test/sun/security/rsa/TestKeyPairGeneratorLength.java rename to test/jdk/sun/security/rsa/TestKeyPairGeneratorLength.java diff --git a/jdk/test/sun/security/rsa/TestSignatures.java b/test/jdk/sun/security/rsa/TestSignatures.java similarity index 100% rename from jdk/test/sun/security/rsa/TestSignatures.java rename to test/jdk/sun/security/rsa/TestSignatures.java diff --git a/jdk/test/sun/security/rsa/rsakeys.ks b/test/jdk/sun/security/rsa/rsakeys.ks similarity index 100% rename from jdk/test/sun/security/rsa/rsakeys.ks rename to test/jdk/sun/security/rsa/rsakeys.ks diff --git a/jdk/test/sun/security/smartcardio/README.txt b/test/jdk/sun/security/smartcardio/README.txt similarity index 100% rename from jdk/test/sun/security/smartcardio/README.txt rename to test/jdk/sun/security/smartcardio/README.txt diff --git a/jdk/test/sun/security/smartcardio/TestAll.java b/test/jdk/sun/security/smartcardio/TestAll.java similarity index 100% rename from jdk/test/sun/security/smartcardio/TestAll.java rename to test/jdk/sun/security/smartcardio/TestAll.java diff --git a/jdk/test/sun/security/smartcardio/TestChannel.java b/test/jdk/sun/security/smartcardio/TestChannel.java similarity index 100% rename from jdk/test/sun/security/smartcardio/TestChannel.java rename to test/jdk/sun/security/smartcardio/TestChannel.java diff --git a/jdk/test/sun/security/smartcardio/TestConnect.java b/test/jdk/sun/security/smartcardio/TestConnect.java similarity index 100% rename from jdk/test/sun/security/smartcardio/TestConnect.java rename to test/jdk/sun/security/smartcardio/TestConnect.java diff --git a/jdk/test/sun/security/smartcardio/TestConnectAgain.java b/test/jdk/sun/security/smartcardio/TestConnectAgain.java similarity index 100% rename from jdk/test/sun/security/smartcardio/TestConnectAgain.java rename to test/jdk/sun/security/smartcardio/TestConnectAgain.java diff --git a/jdk/test/sun/security/smartcardio/TestControl.java b/test/jdk/sun/security/smartcardio/TestControl.java similarity index 100% rename from jdk/test/sun/security/smartcardio/TestControl.java rename to test/jdk/sun/security/smartcardio/TestControl.java diff --git a/jdk/test/sun/security/smartcardio/TestDefault.java b/test/jdk/sun/security/smartcardio/TestDefault.java similarity index 100% rename from jdk/test/sun/security/smartcardio/TestDefault.java rename to test/jdk/sun/security/smartcardio/TestDefault.java diff --git a/jdk/test/sun/security/smartcardio/TestDirect.java b/test/jdk/sun/security/smartcardio/TestDirect.java similarity index 100% rename from jdk/test/sun/security/smartcardio/TestDirect.java rename to test/jdk/sun/security/smartcardio/TestDirect.java diff --git a/jdk/test/sun/security/smartcardio/TestExclusive.java b/test/jdk/sun/security/smartcardio/TestExclusive.java similarity index 100% rename from jdk/test/sun/security/smartcardio/TestExclusive.java rename to test/jdk/sun/security/smartcardio/TestExclusive.java diff --git a/jdk/test/sun/security/smartcardio/TestMultiplePresent.java b/test/jdk/sun/security/smartcardio/TestMultiplePresent.java similarity index 100% rename from jdk/test/sun/security/smartcardio/TestMultiplePresent.java rename to test/jdk/sun/security/smartcardio/TestMultiplePresent.java diff --git a/jdk/test/sun/security/smartcardio/TestPresent.java b/test/jdk/sun/security/smartcardio/TestPresent.java similarity index 100% rename from jdk/test/sun/security/smartcardio/TestPresent.java rename to test/jdk/sun/security/smartcardio/TestPresent.java diff --git a/jdk/test/sun/security/smartcardio/TestTransmit.java b/test/jdk/sun/security/smartcardio/TestTransmit.java similarity index 100% rename from jdk/test/sun/security/smartcardio/TestTransmit.java rename to test/jdk/sun/security/smartcardio/TestTransmit.java diff --git a/jdk/test/sun/security/smartcardio/Utils.java b/test/jdk/sun/security/smartcardio/Utils.java similarity index 100% rename from jdk/test/sun/security/smartcardio/Utils.java rename to test/jdk/sun/security/smartcardio/Utils.java diff --git a/jdk/test/sun/security/smartcardio/apdu.log b/test/jdk/sun/security/smartcardio/apdu.log similarity index 100% rename from jdk/test/sun/security/smartcardio/apdu.log rename to test/jdk/sun/security/smartcardio/apdu.log diff --git a/jdk/test/sun/security/smartcardio/test.policy b/test/jdk/sun/security/smartcardio/test.policy similarity index 100% rename from jdk/test/sun/security/smartcardio/test.policy rename to test/jdk/sun/security/smartcardio/test.policy diff --git a/jdk/test/sun/security/ssl/AppInputStream/ReadBlocksClose.java b/test/jdk/sun/security/ssl/AppInputStream/ReadBlocksClose.java similarity index 100% rename from jdk/test/sun/security/ssl/AppInputStream/ReadBlocksClose.java rename to test/jdk/sun/security/ssl/AppInputStream/ReadBlocksClose.java diff --git a/jdk/test/sun/security/ssl/AppInputStream/ReadHandshake.java b/test/jdk/sun/security/ssl/AppInputStream/ReadHandshake.java similarity index 100% rename from jdk/test/sun/security/ssl/AppInputStream/ReadHandshake.java rename to test/jdk/sun/security/ssl/AppInputStream/ReadHandshake.java diff --git a/jdk/test/sun/security/ssl/AppInputStream/ReadZeroBytes.java b/test/jdk/sun/security/ssl/AppInputStream/ReadZeroBytes.java similarity index 100% rename from jdk/test/sun/security/ssl/AppInputStream/ReadZeroBytes.java rename to test/jdk/sun/security/ssl/AppInputStream/ReadZeroBytes.java diff --git a/jdk/test/sun/security/ssl/AppInputStream/RemoveMarkReset.java b/test/jdk/sun/security/ssl/AppInputStream/RemoveMarkReset.java similarity index 100% rename from jdk/test/sun/security/ssl/AppInputStream/RemoveMarkReset.java rename to test/jdk/sun/security/ssl/AppInputStream/RemoveMarkReset.java diff --git a/jdk/test/sun/security/ssl/AppOutputStream/NoExceptionOnClose.java b/test/jdk/sun/security/ssl/AppOutputStream/NoExceptionOnClose.java similarity index 100% rename from jdk/test/sun/security/ssl/AppOutputStream/NoExceptionOnClose.java rename to test/jdk/sun/security/ssl/AppOutputStream/NoExceptionOnClose.java diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/JSSEClient.java b/test/jdk/sun/security/ssl/CertPathRestrictions/JSSEClient.java similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/JSSEClient.java rename to test/jdk/sun/security/ssl/CertPathRestrictions/JSSEClient.java diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/JSSEServer.java b/test/jdk/sun/security/ssl/CertPathRestrictions/JSSEServer.java similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/JSSEServer.java rename to test/jdk/sun/security/ssl/CertPathRestrictions/JSSEServer.java diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java b/test/jdk/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java rename to test/jdk/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA1-INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA1-INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA1-INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA1-INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA1-INTER_CA_SHA256-ROOT_CA_SHA256.cer b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA1-INTER_CA_SHA256-ROOT_CA_SHA256.cer similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA1-INTER_CA_SHA256-ROOT_CA_SHA256.cer rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA1-INTER_CA_SHA256-ROOT_CA_SHA256.cer diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA1-PRIV.key b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA1-PRIV.key similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA1-PRIV.key rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA1-PRIV.key diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA1.cer b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA1.cer similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA1.cer rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA1.cer diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA256-PRIV.key b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA256-PRIV.key similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA256-PRIV.key rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA256-PRIV.key diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA256.cer b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA256.cer similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA256.cer rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA256.cer diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA1-PRIV.key b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA1-PRIV.key similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA1-PRIV.key rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA1-PRIV.key diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA1.cer b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA1.cer similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA1.cer rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA1.cer diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA256.cer b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA256.cer similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA256.cer rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA256.cer diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA1-PRIV.key b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA1-PRIV.key similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA1-PRIV.key rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA1-PRIV.key diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA1.cer b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA1.cer similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA1.cer rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA1.cer diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA256-PRIV.key b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA256-PRIV.key similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA256-PRIV.key rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA256-PRIV.key diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA256.cer b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA256.cer similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA256.cer rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA256.cer diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA1-PRIV.key b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA1-PRIV.key similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA1-PRIV.key rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA1-PRIV.key diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA1.cer b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA1.cer similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA1.cer rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA1.cer diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA256.cer b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA256.cer similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA256.cer rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA256.cer diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA1-PRIV.key b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA1-PRIV.key similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA1-PRIV.key rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA1-PRIV.key diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA1.cer b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA1.cer similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA1.cer rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA1.cer diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA256-PRIV.key b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA256-PRIV.key similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA256-PRIV.key rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA256-PRIV.key diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA256.cer b/test/jdk/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA256.cer similarity index 100% rename from jdk/test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA256.cer rename to test/jdk/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA256.cer diff --git a/jdk/test/sun/security/ssl/CipherSuite/SSL_NULL.java b/test/jdk/sun/security/ssl/CipherSuite/SSL_NULL.java similarity index 100% rename from jdk/test/sun/security/ssl/CipherSuite/SSL_NULL.java rename to test/jdk/sun/security/ssl/CipherSuite/SSL_NULL.java diff --git a/jdk/test/sun/security/ssl/ClientHandshaker/CipherSuiteOrder.java b/test/jdk/sun/security/ssl/ClientHandshaker/CipherSuiteOrder.java similarity index 100% rename from jdk/test/sun/security/ssl/ClientHandshaker/CipherSuiteOrder.java rename to test/jdk/sun/security/ssl/ClientHandshaker/CipherSuiteOrder.java diff --git a/jdk/test/sun/security/ssl/ClientHandshaker/LengthCheckTest.java b/test/jdk/sun/security/ssl/ClientHandshaker/LengthCheckTest.java similarity index 100% rename from jdk/test/sun/security/ssl/ClientHandshaker/LengthCheckTest.java rename to test/jdk/sun/security/ssl/ClientHandshaker/LengthCheckTest.java diff --git a/jdk/test/sun/security/ssl/ClientHandshaker/RSAExport.java b/test/jdk/sun/security/ssl/ClientHandshaker/RSAExport.java similarity index 100% rename from jdk/test/sun/security/ssl/ClientHandshaker/RSAExport.java rename to test/jdk/sun/security/ssl/ClientHandshaker/RSAExport.java diff --git a/jdk/test/sun/security/ssl/DHKeyExchange/DHEKeySizing.java b/test/jdk/sun/security/ssl/DHKeyExchange/DHEKeySizing.java similarity index 100% rename from jdk/test/sun/security/ssl/DHKeyExchange/DHEKeySizing.java rename to test/jdk/sun/security/ssl/DHKeyExchange/DHEKeySizing.java diff --git a/jdk/test/sun/security/ssl/DHKeyExchange/LegacyDHEKeyExchange.java b/test/jdk/sun/security/ssl/DHKeyExchange/LegacyDHEKeyExchange.java similarity index 100% rename from jdk/test/sun/security/ssl/DHKeyExchange/LegacyDHEKeyExchange.java rename to test/jdk/sun/security/ssl/DHKeyExchange/LegacyDHEKeyExchange.java diff --git a/jdk/test/sun/security/ssl/DHKeyExchange/UseStrongDHSizes.java b/test/jdk/sun/security/ssl/DHKeyExchange/UseStrongDHSizes.java similarity index 100% rename from jdk/test/sun/security/ssl/DHKeyExchange/UseStrongDHSizes.java rename to test/jdk/sun/security/ssl/DHKeyExchange/UseStrongDHSizes.java diff --git a/jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.java b/test/jdk/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.java similarity index 100% rename from jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.java rename to test/jdk/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.java diff --git a/jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.sh b/test/jdk/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.sh similarity index 100% rename from jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.sh rename to test/jdk/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.sh diff --git a/jdk/test/sun/security/ssl/ExtensionType/OptimalListSize.java b/test/jdk/sun/security/ssl/ExtensionType/OptimalListSize.java similarity index 100% rename from jdk/test/sun/security/ssl/ExtensionType/OptimalListSize.java rename to test/jdk/sun/security/ssl/ExtensionType/OptimalListSize.java diff --git a/jdk/test/sun/security/ssl/GenSSLConfigs/ClientThread.java b/test/jdk/sun/security/ssl/GenSSLConfigs/ClientThread.java similarity index 100% rename from jdk/test/sun/security/ssl/GenSSLConfigs/ClientThread.java rename to test/jdk/sun/security/ssl/GenSSLConfigs/ClientThread.java diff --git a/jdk/test/sun/security/ssl/GenSSLConfigs/Handler.java b/test/jdk/sun/security/ssl/GenSSLConfigs/Handler.java similarity index 100% rename from jdk/test/sun/security/ssl/GenSSLConfigs/Handler.java rename to test/jdk/sun/security/ssl/GenSSLConfigs/Handler.java diff --git a/jdk/test/sun/security/ssl/GenSSLConfigs/ServerHandler.java b/test/jdk/sun/security/ssl/GenSSLConfigs/ServerHandler.java similarity index 100% rename from jdk/test/sun/security/ssl/GenSSLConfigs/ServerHandler.java rename to test/jdk/sun/security/ssl/GenSSLConfigs/ServerHandler.java diff --git a/jdk/test/sun/security/ssl/GenSSLConfigs/ServerThread.java b/test/jdk/sun/security/ssl/GenSSLConfigs/ServerThread.java similarity index 100% rename from jdk/test/sun/security/ssl/GenSSLConfigs/ServerThread.java rename to test/jdk/sun/security/ssl/GenSSLConfigs/ServerThread.java diff --git a/jdk/test/sun/security/ssl/GenSSLConfigs/TestThread.java b/test/jdk/sun/security/ssl/GenSSLConfigs/TestThread.java similarity index 100% rename from jdk/test/sun/security/ssl/GenSSLConfigs/TestThread.java rename to test/jdk/sun/security/ssl/GenSSLConfigs/TestThread.java diff --git a/jdk/test/sun/security/ssl/GenSSLConfigs/Traffic.java b/test/jdk/sun/security/ssl/GenSSLConfigs/Traffic.java similarity index 100% rename from jdk/test/sun/security/ssl/GenSSLConfigs/Traffic.java rename to test/jdk/sun/security/ssl/GenSSLConfigs/Traffic.java diff --git a/jdk/test/sun/security/ssl/GenSSLConfigs/main.java b/test/jdk/sun/security/ssl/GenSSLConfigs/main.java similarity index 100% rename from jdk/test/sun/security/ssl/GenSSLConfigs/main.java rename to test/jdk/sun/security/ssl/GenSSLConfigs/main.java diff --git a/jdk/test/sun/security/ssl/HandshakeOutStream/NullCerts.java b/test/jdk/sun/security/ssl/HandshakeOutStream/NullCerts.java similarity index 100% rename from jdk/test/sun/security/ssl/HandshakeOutStream/NullCerts.java rename to test/jdk/sun/security/ssl/HandshakeOutStream/NullCerts.java diff --git a/jdk/test/sun/security/ssl/InputRecord/ClientHelloRead.java b/test/jdk/sun/security/ssl/InputRecord/ClientHelloRead.java similarity index 100% rename from jdk/test/sun/security/ssl/InputRecord/ClientHelloRead.java rename to test/jdk/sun/security/ssl/InputRecord/ClientHelloRead.java diff --git a/jdk/test/sun/security/ssl/InputRecord/OriginServer.java b/test/jdk/sun/security/ssl/InputRecord/OriginServer.java similarity index 100% rename from jdk/test/sun/security/ssl/InputRecord/OriginServer.java rename to test/jdk/sun/security/ssl/InputRecord/OriginServer.java diff --git a/jdk/test/sun/security/ssl/InputRecord/ProxyTunnelServer.java b/test/jdk/sun/security/ssl/InputRecord/ProxyTunnelServer.java similarity index 100% rename from jdk/test/sun/security/ssl/InputRecord/ProxyTunnelServer.java rename to test/jdk/sun/security/ssl/InputRecord/ProxyTunnelServer.java diff --git a/jdk/test/sun/security/ssl/InputRecord/SSLSocketTimeoutNulls.java b/test/jdk/sun/security/ssl/InputRecord/SSLSocketTimeoutNulls.java similarity index 100% rename from jdk/test/sun/security/ssl/InputRecord/SSLSocketTimeoutNulls.java rename to test/jdk/sun/security/ssl/InputRecord/SSLSocketTimeoutNulls.java diff --git a/jdk/test/sun/security/ssl/ProtocolVersion/HttpsProtocols.java b/test/jdk/sun/security/ssl/ProtocolVersion/HttpsProtocols.java similarity index 100% rename from jdk/test/sun/security/ssl/ProtocolVersion/HttpsProtocols.java rename to test/jdk/sun/security/ssl/ProtocolVersion/HttpsProtocols.java diff --git a/jdk/test/sun/security/ssl/SSLContextImpl/BadKSProvider.java b/test/jdk/sun/security/ssl/SSLContextImpl/BadKSProvider.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLContextImpl/BadKSProvider.java rename to test/jdk/sun/security/ssl/SSLContextImpl/BadKSProvider.java diff --git a/jdk/test/sun/security/ssl/SSLContextImpl/BadTSProvider.java b/test/jdk/sun/security/ssl/SSLContextImpl/BadTSProvider.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLContextImpl/BadTSProvider.java rename to test/jdk/sun/security/ssl/SSLContextImpl/BadTSProvider.java diff --git a/jdk/test/sun/security/ssl/SSLContextImpl/CustomizedCipherSuites.java b/test/jdk/sun/security/ssl/SSLContextImpl/CustomizedCipherSuites.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLContextImpl/CustomizedCipherSuites.java rename to test/jdk/sun/security/ssl/SSLContextImpl/CustomizedCipherSuites.java diff --git a/jdk/test/sun/security/ssl/SSLContextImpl/CustomizedDefaultProtocols.java b/test/jdk/sun/security/ssl/SSLContextImpl/CustomizedDefaultProtocols.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLContextImpl/CustomizedDefaultProtocols.java rename to test/jdk/sun/security/ssl/SSLContextImpl/CustomizedDefaultProtocols.java diff --git a/jdk/test/sun/security/ssl/SSLContextImpl/DefaultEnabledProtocols.java b/test/jdk/sun/security/ssl/SSLContextImpl/DefaultEnabledProtocols.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLContextImpl/DefaultEnabledProtocols.java rename to test/jdk/sun/security/ssl/SSLContextImpl/DefaultEnabledProtocols.java diff --git a/jdk/test/sun/security/ssl/SSLContextImpl/GoodProvider.java b/test/jdk/sun/security/ssl/SSLContextImpl/GoodProvider.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLContextImpl/GoodProvider.java rename to test/jdk/sun/security/ssl/SSLContextImpl/GoodProvider.java diff --git a/jdk/test/sun/security/ssl/SSLContextImpl/IllegalProtocolProperty.java b/test/jdk/sun/security/ssl/SSLContextImpl/IllegalProtocolProperty.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLContextImpl/IllegalProtocolProperty.java rename to test/jdk/sun/security/ssl/SSLContextImpl/IllegalProtocolProperty.java diff --git a/jdk/test/sun/security/ssl/SSLContextImpl/MD2InTrustAnchor.java b/test/jdk/sun/security/ssl/SSLContextImpl/MD2InTrustAnchor.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLContextImpl/MD2InTrustAnchor.java rename to test/jdk/sun/security/ssl/SSLContextImpl/MD2InTrustAnchor.java diff --git a/jdk/test/sun/security/ssl/SSLContextImpl/NoOldVersionContext.java b/test/jdk/sun/security/ssl/SSLContextImpl/NoOldVersionContext.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLContextImpl/NoOldVersionContext.java rename to test/jdk/sun/security/ssl/SSLContextImpl/NoOldVersionContext.java diff --git a/jdk/test/sun/security/ssl/SSLContextImpl/NullGetAcceptedIssuers.java b/test/jdk/sun/security/ssl/SSLContextImpl/NullGetAcceptedIssuers.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLContextImpl/NullGetAcceptedIssuers.java rename to test/jdk/sun/security/ssl/SSLContextImpl/NullGetAcceptedIssuers.java diff --git a/jdk/test/sun/security/ssl/SSLContextImpl/SSLContextVersion.java b/test/jdk/sun/security/ssl/SSLContextImpl/SSLContextVersion.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLContextImpl/SSLContextVersion.java rename to test/jdk/sun/security/ssl/SSLContextImpl/SSLContextVersion.java diff --git a/jdk/test/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java b/test/jdk/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java rename to test/jdk/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java diff --git a/jdk/test/sun/security/ssl/SSLEngineImpl/CloseEngineException.java b/test/jdk/sun/security/ssl/SSLEngineImpl/CloseEngineException.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLEngineImpl/CloseEngineException.java rename to test/jdk/sun/security/ssl/SSLEngineImpl/CloseEngineException.java diff --git a/jdk/test/sun/security/ssl/SSLEngineImpl/CloseInboundException.java b/test/jdk/sun/security/ssl/SSLEngineImpl/CloseInboundException.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLEngineImpl/CloseInboundException.java rename to test/jdk/sun/security/ssl/SSLEngineImpl/CloseInboundException.java diff --git a/jdk/test/sun/security/ssl/SSLEngineImpl/CloseStart.java b/test/jdk/sun/security/ssl/SSLEngineImpl/CloseStart.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLEngineImpl/CloseStart.java rename to test/jdk/sun/security/ssl/SSLEngineImpl/CloseStart.java diff --git a/jdk/test/sun/security/ssl/SSLEngineImpl/DelegatedTaskWrongException.java b/test/jdk/sun/security/ssl/SSLEngineImpl/DelegatedTaskWrongException.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLEngineImpl/DelegatedTaskWrongException.java rename to test/jdk/sun/security/ssl/SSLEngineImpl/DelegatedTaskWrongException.java diff --git a/jdk/test/sun/security/ssl/SSLEngineImpl/EmptyExtensionData.java b/test/jdk/sun/security/ssl/SSLEngineImpl/EmptyExtensionData.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLEngineImpl/EmptyExtensionData.java rename to test/jdk/sun/security/ssl/SSLEngineImpl/EmptyExtensionData.java diff --git a/jdk/test/sun/security/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java b/test/jdk/sun/security/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java rename to test/jdk/sun/security/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java diff --git a/jdk/test/sun/security/ssl/SSLEngineImpl/RehandshakeFinished.java b/test/jdk/sun/security/ssl/SSLEngineImpl/RehandshakeFinished.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLEngineImpl/RehandshakeFinished.java rename to test/jdk/sun/security/ssl/SSLEngineImpl/RehandshakeFinished.java diff --git a/jdk/test/sun/security/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java b/test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java rename to test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java diff --git a/jdk/test/sun/security/ssl/SSLEngineImpl/SSLEngineDeadlock.java b/test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineDeadlock.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLEngineImpl/SSLEngineDeadlock.java rename to test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineDeadlock.java diff --git a/jdk/test/sun/security/ssl/SSLSessionContextImpl/Timeout.java b/test/jdk/sun/security/ssl/SSLSessionContextImpl/Timeout.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSessionContextImpl/Timeout.java rename to test/jdk/sun/security/ssl/SSLSessionContextImpl/Timeout.java diff --git a/jdk/test/sun/security/ssl/SSLSessionImpl/HashCodeMissing.java b/test/jdk/sun/security/ssl/SSLSessionImpl/HashCodeMissing.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSessionImpl/HashCodeMissing.java rename to test/jdk/sun/security/ssl/SSLSessionImpl/HashCodeMissing.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java b/test/jdk/sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/CheckMethods.java b/test/jdk/sun/security/ssl/SSLSocketImpl/CheckMethods.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/CheckMethods.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/CheckMethods.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/ClientModeClientAuth.java b/test/jdk/sun/security/ssl/SSLSocketImpl/ClientModeClientAuth.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/ClientModeClientAuth.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/ClientModeClientAuth.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/ClientTimeout.java b/test/jdk/sun/security/ssl/SSLSocketImpl/ClientTimeout.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/ClientTimeout.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/ClientTimeout.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/CloseSocket.java b/test/jdk/sun/security/ssl/SSLSocketImpl/CloseSocket.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/CloseSocket.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/CloseSocket.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/CloseSocketException.java b/test/jdk/sun/security/ssl/SSLSocketImpl/CloseSocketException.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/CloseSocketException.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/CloseSocketException.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java b/test/jdk/sun/security/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/LargePacketAfterHandshakeTest.java b/test/jdk/sun/security/ssl/SSLSocketImpl/LargePacketAfterHandshakeTest.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/LargePacketAfterHandshakeTest.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/LargePacketAfterHandshakeTest.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/LoopbackSSLSocket.java b/test/jdk/sun/security/ssl/SSLSocketImpl/LoopbackSSLSocket.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/LoopbackSSLSocket.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/LoopbackSSLSocket.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/NewSocketMethods.java b/test/jdk/sun/security/ssl/SSLSocketImpl/NewSocketMethods.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/NewSocketMethods.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/NewSocketMethods.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/NoImpactServerRenego.java b/test/jdk/sun/security/ssl/SSLSocketImpl/NoImpactServerRenego.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/NoImpactServerRenego.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/NoImpactServerRenego.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/NonAutoClose.java b/test/jdk/sun/security/ssl/SSLSocketImpl/NonAutoClose.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/NonAutoClose.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/NonAutoClose.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.java b/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.policy b/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.policy similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.policy rename to test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.policy diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.sh b/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.sh similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.sh rename to test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.sh diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTestHeyYou.java b/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTestHeyYou.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTestHeyYou.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTestHeyYou.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/RejectClientRenego.java b/test/jdk/sun/security/ssl/SSLSocketImpl/RejectClientRenego.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/RejectClientRenego.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/RejectClientRenego.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/ReuseAddr.java b/test/jdk/sun/security/ssl/SSLSocketImpl/ReuseAddr.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/ReuseAddr.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/ReuseAddr.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/ReverseNameLookup.java b/test/jdk/sun/security/ssl/SSLSocketImpl/ReverseNameLookup.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/ReverseNameLookup.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/ReverseNameLookup.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/ServerTimeout.java b/test/jdk/sun/security/ssl/SSLSocketImpl/ServerTimeout.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/ServerTimeout.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/ServerTimeout.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/SetClientMode.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SetClientMode.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/SetClientMode.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/SetClientMode.java diff --git a/jdk/test/sun/security/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java b/test/jdk/sun/security/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java similarity index 100% rename from jdk/test/sun/security/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java rename to test/jdk/sun/security/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java diff --git a/jdk/test/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java b/test/jdk/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java similarity index 100% rename from jdk/test/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java rename to test/jdk/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java diff --git a/jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHost.java b/test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHost.java similarity index 100% rename from jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHost.java rename to test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHost.java diff --git a/jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostClient.java b/test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHostClient.java similarity index 100% rename from jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostClient.java rename to test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHostClient.java diff --git a/jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostServer.java b/test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHostServer.java similarity index 100% rename from jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostServer.java rename to test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHostServer.java diff --git a/jdk/test/sun/security/ssl/ServerHandshaker/HelloExtensionsTest.java b/test/jdk/sun/security/ssl/ServerHandshaker/HelloExtensionsTest.java similarity index 100% rename from jdk/test/sun/security/ssl/ServerHandshaker/HelloExtensionsTest.java rename to test/jdk/sun/security/ssl/ServerHandshaker/HelloExtensionsTest.java diff --git a/jdk/test/sun/security/ssl/SocketCreation/SocketCreation.java b/test/jdk/sun/security/ssl/SocketCreation/SocketCreation.java similarity index 100% rename from jdk/test/sun/security/ssl/SocketCreation/SocketCreation.java rename to test/jdk/sun/security/ssl/SocketCreation/SocketCreation.java diff --git a/jdk/test/sun/security/ssl/StatusStapling/RunStatReqSelect.java b/test/jdk/sun/security/ssl/StatusStapling/RunStatReqSelect.java similarity index 100% rename from jdk/test/sun/security/ssl/StatusStapling/RunStatReqSelect.java rename to test/jdk/sun/security/ssl/StatusStapling/RunStatReqSelect.java diff --git a/jdk/test/sun/security/ssl/StatusStapling/TEST.properties b/test/jdk/sun/security/ssl/StatusStapling/TEST.properties similarity index 100% rename from jdk/test/sun/security/ssl/StatusStapling/TEST.properties rename to test/jdk/sun/security/ssl/StatusStapling/TEST.properties diff --git a/jdk/test/sun/security/ssl/StatusStapling/TestRun.java b/test/jdk/sun/security/ssl/StatusStapling/TestRun.java similarity index 100% rename from jdk/test/sun/security/ssl/StatusStapling/TestRun.java rename to test/jdk/sun/security/ssl/StatusStapling/TestRun.java diff --git a/jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/BogusStatusRequest.java b/test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/BogusStatusRequest.java similarity index 100% rename from jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/BogusStatusRequest.java rename to test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/BogusStatusRequest.java diff --git a/jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqExtensionTests.java b/test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqExtensionTests.java similarity index 100% rename from jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqExtensionTests.java rename to test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqExtensionTests.java diff --git a/jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqItemV2Tests.java b/test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqItemV2Tests.java similarity index 100% rename from jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqItemV2Tests.java rename to test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqItemV2Tests.java diff --git a/jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqListV2ExtensionTests.java b/test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqListV2ExtensionTests.java similarity index 100% rename from jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqListV2ExtensionTests.java rename to test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqListV2ExtensionTests.java diff --git a/jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/OCSPStatusRequestTests.java b/test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/OCSPStatusRequestTests.java similarity index 100% rename from jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/OCSPStatusRequestTests.java rename to test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/OCSPStatusRequestTests.java diff --git a/jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/StatusReqSelection.java b/test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/StatusReqSelection.java similarity index 100% rename from jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/StatusReqSelection.java rename to test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/StatusReqSelection.java diff --git a/jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/StatusResponseManagerTests.java b/test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/StatusResponseManagerTests.java similarity index 100% rename from jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/StatusResponseManagerTests.java rename to test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/StatusResponseManagerTests.java diff --git a/jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/TestCase.java b/test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/TestCase.java similarity index 100% rename from jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/TestCase.java rename to test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/TestCase.java diff --git a/jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/TestUtils.java b/test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/TestUtils.java similarity index 100% rename from jdk/test/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/TestUtils.java rename to test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/TestUtils.java diff --git a/jdk/test/sun/security/ssl/X509KeyManager/NullCases.java b/test/jdk/sun/security/ssl/X509KeyManager/NullCases.java similarity index 100% rename from jdk/test/sun/security/ssl/X509KeyManager/NullCases.java rename to test/jdk/sun/security/ssl/X509KeyManager/NullCases.java diff --git a/jdk/test/sun/security/ssl/X509KeyManager/PreferredKey.java b/test/jdk/sun/security/ssl/X509KeyManager/PreferredKey.java similarity index 100% rename from jdk/test/sun/security/ssl/X509KeyManager/PreferredKey.java rename to test/jdk/sun/security/ssl/X509KeyManager/PreferredKey.java diff --git a/jdk/test/sun/security/ssl/X509KeyManager/SelectOneKeyOutOfMany.java b/test/jdk/sun/security/ssl/X509KeyManager/SelectOneKeyOutOfMany.java similarity index 100% rename from jdk/test/sun/security/ssl/X509KeyManager/SelectOneKeyOutOfMany.java rename to test/jdk/sun/security/ssl/X509KeyManager/SelectOneKeyOutOfMany.java diff --git a/jdk/test/sun/security/ssl/X509TrustManagerImpl/BasicConstraints.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/BasicConstraints.java similarity index 100% rename from jdk/test/sun/security/ssl/X509TrustManagerImpl/BasicConstraints.java rename to test/jdk/sun/security/ssl/X509TrustManagerImpl/BasicConstraints.java diff --git a/jdk/test/sun/security/ssl/X509TrustManagerImpl/CertRequestOverflow.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/CertRequestOverflow.java similarity index 100% rename from jdk/test/sun/security/ssl/X509TrustManagerImpl/CertRequestOverflow.java rename to test/jdk/sun/security/ssl/X509TrustManagerImpl/CertRequestOverflow.java diff --git a/jdk/test/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java similarity index 100% rename from jdk/test/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java rename to test/jdk/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java diff --git a/jdk/test/sun/security/ssl/X509TrustManagerImpl/ClientServer.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/ClientServer.java similarity index 100% rename from jdk/test/sun/security/ssl/X509TrustManagerImpl/ClientServer.java rename to test/jdk/sun/security/ssl/X509TrustManagerImpl/ClientServer.java diff --git a/jdk/test/sun/security/ssl/X509TrustManagerImpl/ComodoHacker.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/ComodoHacker.java similarity index 100% rename from jdk/test/sun/security/ssl/X509TrustManagerImpl/ComodoHacker.java rename to test/jdk/sun/security/ssl/X509TrustManagerImpl/ComodoHacker.java diff --git a/jdk/test/sun/security/ssl/X509TrustManagerImpl/PKIXExtendedTM.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/PKIXExtendedTM.java similarity index 100% rename from jdk/test/sun/security/ssl/X509TrustManagerImpl/PKIXExtendedTM.java rename to test/jdk/sun/security/ssl/X509TrustManagerImpl/PKIXExtendedTM.java diff --git a/jdk/test/sun/security/ssl/X509TrustManagerImpl/SelfIssuedCert.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/SelfIssuedCert.java similarity index 100% rename from jdk/test/sun/security/ssl/X509TrustManagerImpl/SelfIssuedCert.java rename to test/jdk/sun/security/ssl/X509TrustManagerImpl/SelfIssuedCert.java diff --git a/jdk/test/sun/security/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java similarity index 100% rename from jdk/test/sun/security/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java rename to test/jdk/sun/security/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java diff --git a/jdk/test/sun/security/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java similarity index 100% rename from jdk/test/sun/security/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java rename to test/jdk/sun/security/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java diff --git a/jdk/test/sun/security/ssl/rsa/BrokenRSAPrivateCrtKey.java b/test/jdk/sun/security/ssl/rsa/BrokenRSAPrivateCrtKey.java similarity index 100% rename from jdk/test/sun/security/ssl/rsa/BrokenRSAPrivateCrtKey.java rename to test/jdk/sun/security/ssl/rsa/BrokenRSAPrivateCrtKey.java diff --git a/jdk/test/sun/security/ssl/rsa/SignatureOffsets.java b/test/jdk/sun/security/ssl/rsa/SignatureOffsets.java similarity index 100% rename from jdk/test/sun/security/ssl/rsa/SignatureOffsets.java rename to test/jdk/sun/security/ssl/rsa/SignatureOffsets.java diff --git a/jdk/test/sun/security/ssl/rsa/SignedObjectChain.java b/test/jdk/sun/security/ssl/rsa/SignedObjectChain.java similarity index 100% rename from jdk/test/sun/security/ssl/rsa/SignedObjectChain.java rename to test/jdk/sun/security/ssl/rsa/SignedObjectChain.java diff --git a/jdk/test/sun/security/ssl/spi/ProviderInit.java b/test/jdk/sun/security/ssl/spi/ProviderInit.java similarity index 100% rename from jdk/test/sun/security/ssl/spi/ProviderInit.java rename to test/jdk/sun/security/ssl/spi/ProviderInit.java diff --git a/jdk/test/sun/security/tools/jarsigner/AlgOptions.jar b/test/jdk/sun/security/tools/jarsigner/AlgOptions.jar similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/AlgOptions.jar rename to test/jdk/sun/security/tools/jarsigner/AlgOptions.jar diff --git a/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh b/test/jdk/sun/security/tools/jarsigner/AlgOptions.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/AlgOptions.sh rename to test/jdk/sun/security/tools/jarsigner/AlgOptions.sh diff --git a/jdk/test/sun/security/tools/jarsigner/AltProvider.java b/test/jdk/sun/security/tools/jarsigner/AltProvider.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/AltProvider.java rename to test/jdk/sun/security/tools/jarsigner/AltProvider.java diff --git a/jdk/test/sun/security/tools/jarsigner/CertChainUnclosed.java b/test/jdk/sun/security/tools/jarsigner/CertChainUnclosed.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/CertChainUnclosed.java rename to test/jdk/sun/security/tools/jarsigner/CertChainUnclosed.java diff --git a/jdk/test/sun/security/tools/jarsigner/DefaultSigalg.java b/test/jdk/sun/security/tools/jarsigner/DefaultSigalg.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/DefaultSigalg.java rename to test/jdk/sun/security/tools/jarsigner/DefaultSigalg.java diff --git a/jdk/test/sun/security/tools/jarsigner/EntriesOrder.java b/test/jdk/sun/security/tools/jarsigner/EntriesOrder.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/EntriesOrder.java rename to test/jdk/sun/security/tools/jarsigner/EntriesOrder.java diff --git a/jdk/test/sun/security/tools/jarsigner/JarSigning.keystore b/test/jdk/sun/security/tools/jarsigner/JarSigning.keystore similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/JarSigning.keystore rename to test/jdk/sun/security/tools/jarsigner/JarSigning.keystore diff --git a/jdk/test/sun/security/tools/jarsigner/JarSigningNonAscii.java b/test/jdk/sun/security/tools/jarsigner/JarSigningNonAscii.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/JarSigningNonAscii.java rename to test/jdk/sun/security/tools/jarsigner/JarSigningNonAscii.java diff --git a/jdk/test/sun/security/tools/jarsigner/JarSigning_RU.jar b/test/jdk/sun/security/tools/jarsigner/JarSigning_RU.jar similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/JarSigning_RU.jar rename to test/jdk/sun/security/tools/jarsigner/JarSigning_RU.jar diff --git a/jdk/test/sun/security/tools/jarsigner/JavaApplication1.jar b/test/jdk/sun/security/tools/jarsigner/JavaApplication1.jar similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/JavaApplication1.jar rename to test/jdk/sun/security/tools/jarsigner/JavaApplication1.jar diff --git a/jdk/test/sun/security/tools/jarsigner/LargeJarEntry.java b/test/jdk/sun/security/tools/jarsigner/LargeJarEntry.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/LargeJarEntry.java rename to test/jdk/sun/security/tools/jarsigner/LargeJarEntry.java diff --git a/jdk/test/sun/security/tools/jarsigner/Options.java b/test/jdk/sun/security/tools/jarsigner/Options.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/Options.java rename to test/jdk/sun/security/tools/jarsigner/Options.java diff --git a/jdk/test/sun/security/tools/jarsigner/PercentSign.sh b/test/jdk/sun/security/tools/jarsigner/PercentSign.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/PercentSign.sh rename to test/jdk/sun/security/tools/jarsigner/PercentSign.sh diff --git a/jdk/test/sun/security/tools/jarsigner/Test4431684.java b/test/jdk/sun/security/tools/jarsigner/Test4431684.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/Test4431684.java rename to test/jdk/sun/security/tools/jarsigner/Test4431684.java diff --git a/jdk/test/sun/security/tools/jarsigner/TimestampCheck.java b/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/TimestampCheck.java rename to test/jdk/sun/security/tools/jarsigner/TimestampCheck.java diff --git a/jdk/test/sun/security/tools/jarsigner/TsacertOptionTest.java b/test/jdk/sun/security/tools/jarsigner/TsacertOptionTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/TsacertOptionTest.java rename to test/jdk/sun/security/tools/jarsigner/TsacertOptionTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/Utils.java b/test/jdk/sun/security/tools/jarsigner/Utils.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/Utils.java rename to test/jdk/sun/security/tools/jarsigner/Utils.java diff --git a/jdk/test/sun/security/tools/jarsigner/Warning.java b/test/jdk/sun/security/tools/jarsigner/Warning.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/Warning.java rename to test/jdk/sun/security/tools/jarsigner/Warning.java diff --git a/jdk/test/sun/security/tools/jarsigner/a%b/percent.keystore b/test/jdk/sun/security/tools/jarsigner/a%b/percent.keystore similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/a%b/percent.keystore rename to test/jdk/sun/security/tools/jarsigner/a%b/percent.keystore diff --git a/jdk/test/sun/security/tools/jarsigner/alt/test.dummy/module-info.java b/test/jdk/sun/security/tools/jarsigner/alt/test.dummy/module-info.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/alt/test.dummy/module-info.java rename to test/jdk/sun/security/tools/jarsigner/alt/test.dummy/module-info.java diff --git a/jdk/test/sun/security/tools/jarsigner/alt/test.dummy/org/test/dummy/DummyProvider.java b/test/jdk/sun/security/tools/jarsigner/alt/test.dummy/org/test/dummy/DummyProvider.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/alt/test.dummy/org/test/dummy/DummyProvider.java rename to test/jdk/sun/security/tools/jarsigner/alt/test.dummy/org/test/dummy/DummyProvider.java diff --git a/jdk/test/sun/security/tools/jarsigner/certpolicy.sh b/test/jdk/sun/security/tools/jarsigner/certpolicy.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/certpolicy.sh rename to test/jdk/sun/security/tools/jarsigner/certpolicy.sh diff --git a/jdk/test/sun/security/tools/jarsigner/checkusage.sh b/test/jdk/sun/security/tools/jarsigner/checkusage.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/checkusage.sh rename to test/jdk/sun/security/tools/jarsigner/checkusage.sh diff --git a/jdk/test/sun/security/tools/jarsigner/collator.sh b/test/jdk/sun/security/tools/jarsigner/collator.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/collator.sh rename to test/jdk/sun/security/tools/jarsigner/collator.sh diff --git a/jdk/test/sun/security/tools/jarsigner/compatibility/Compatibility.java b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/compatibility/Compatibility.java rename to test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java diff --git a/jdk/test/sun/security/tools/jarsigner/compatibility/DetailsOutputStream.java b/test/jdk/sun/security/tools/jarsigner/compatibility/DetailsOutputStream.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/compatibility/DetailsOutputStream.java rename to test/jdk/sun/security/tools/jarsigner/compatibility/DetailsOutputStream.java diff --git a/jdk/test/sun/security/tools/jarsigner/compatibility/HtmlHelper.java b/test/jdk/sun/security/tools/jarsigner/compatibility/HtmlHelper.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/compatibility/HtmlHelper.java rename to test/jdk/sun/security/tools/jarsigner/compatibility/HtmlHelper.java diff --git a/jdk/test/sun/security/tools/jarsigner/compatibility/JdkUtils.java b/test/jdk/sun/security/tools/jarsigner/compatibility/JdkUtils.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/compatibility/JdkUtils.java rename to test/jdk/sun/security/tools/jarsigner/compatibility/JdkUtils.java diff --git a/jdk/test/sun/security/tools/jarsigner/compatibility/PhaseOutputStream.java b/test/jdk/sun/security/tools/jarsigner/compatibility/PhaseOutputStream.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/compatibility/PhaseOutputStream.java rename to test/jdk/sun/security/tools/jarsigner/compatibility/PhaseOutputStream.java diff --git a/jdk/test/sun/security/tools/jarsigner/compatibility/README b/test/jdk/sun/security/tools/jarsigner/compatibility/README similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/compatibility/README rename to test/jdk/sun/security/tools/jarsigner/compatibility/README diff --git a/jdk/test/sun/security/tools/jarsigner/compatibility/java.security b/test/jdk/sun/security/tools/jarsigner/compatibility/java.security similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/compatibility/java.security rename to test/jdk/sun/security/tools/jarsigner/compatibility/java.security diff --git a/jdk/test/sun/security/tools/jarsigner/concise_jarsigner.sh b/test/jdk/sun/security/tools/jarsigner/concise_jarsigner.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/concise_jarsigner.sh rename to test/jdk/sun/security/tools/jarsigner/concise_jarsigner.sh diff --git a/jdk/test/sun/security/tools/jarsigner/crl.sh b/test/jdk/sun/security/tools/jarsigner/crl.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/crl.sh rename to test/jdk/sun/security/tools/jarsigner/crl.sh diff --git a/jdk/test/sun/security/tools/jarsigner/default_options.sh b/test/jdk/sun/security/tools/jarsigner/default_options.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/default_options.sh rename to test/jdk/sun/security/tools/jarsigner/default_options.sh diff --git a/jdk/test/sun/security/tools/jarsigner/diffend.sh b/test/jdk/sun/security/tools/jarsigner/diffend.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/diffend.sh rename to test/jdk/sun/security/tools/jarsigner/diffend.sh diff --git a/jdk/test/sun/security/tools/jarsigner/ec.sh b/test/jdk/sun/security/tools/jarsigner/ec.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/ec.sh rename to test/jdk/sun/security/tools/jarsigner/ec.sh diff --git a/jdk/test/sun/security/tools/jarsigner/emptymanifest.sh b/test/jdk/sun/security/tools/jarsigner/emptymanifest.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/emptymanifest.sh rename to test/jdk/sun/security/tools/jarsigner/emptymanifest.sh diff --git a/jdk/test/sun/security/tools/jarsigner/jvindex.sh b/test/jdk/sun/security/tools/jarsigner/jvindex.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/jvindex.sh rename to test/jdk/sun/security/tools/jarsigner/jvindex.sh diff --git a/jdk/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java b/test/jdk/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java rename to test/jdk/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/multiRelease/SignedJar.policy b/test/jdk/sun/security/tools/jarsigner/multiRelease/SignedJar.policy similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/multiRelease/SignedJar.policy rename to test/jdk/sun/security/tools/jarsigner/multiRelease/SignedJar.policy diff --git a/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Main.java b/test/jdk/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Main.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Main.java rename to test/jdk/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Main.java diff --git a/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Version.java b/test/jdk/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Version.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Version.java rename to test/jdk/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Version.java diff --git a/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/v10/version/Version.java b/test/jdk/sun/security/tools/jarsigner/multiRelease/jarContent/v10/version/Version.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/v10/version/Version.java rename to test/jdk/sun/security/tools/jarsigner/multiRelease/jarContent/v10/version/Version.java diff --git a/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/v9/version/Version.java b/test/jdk/sun/security/tools/jarsigner/multiRelease/jarContent/v9/version/Version.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/v9/version/Version.java rename to test/jdk/sun/security/tools/jarsigner/multiRelease/jarContent/v9/version/Version.java diff --git a/jdk/test/sun/security/tools/jarsigner/nameclash.sh b/test/jdk/sun/security/tools/jarsigner/nameclash.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/nameclash.sh rename to test/jdk/sun/security/tools/jarsigner/nameclash.sh diff --git a/jdk/test/sun/security/tools/jarsigner/newsize7.sh b/test/jdk/sun/security/tools/jarsigner/newsize7.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/newsize7.sh rename to test/jdk/sun/security/tools/jarsigner/newsize7.sh diff --git a/jdk/test/sun/security/tools/jarsigner/oldsig.sh b/test/jdk/sun/security/tools/jarsigner/oldsig.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/oldsig.sh rename to test/jdk/sun/security/tools/jarsigner/oldsig.sh diff --git a/jdk/test/sun/security/tools/jarsigner/oldsig/A.class b/test/jdk/sun/security/tools/jarsigner/oldsig/A.class similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/oldsig/A.class rename to test/jdk/sun/security/tools/jarsigner/oldsig/A.class diff --git a/jdk/test/sun/security/tools/jarsigner/oldsig/A.jar b/test/jdk/sun/security/tools/jarsigner/oldsig/A.jar similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/oldsig/A.jar rename to test/jdk/sun/security/tools/jarsigner/oldsig/A.jar diff --git a/jdk/test/sun/security/tools/jarsigner/onlymanifest.sh b/test/jdk/sun/security/tools/jarsigner/onlymanifest.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/onlymanifest.sh rename to test/jdk/sun/security/tools/jarsigner/onlymanifest.sh diff --git a/jdk/test/sun/security/tools/jarsigner/passtype.sh b/test/jdk/sun/security/tools/jarsigner/passtype.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/passtype.sh rename to test/jdk/sun/security/tools/jarsigner/passtype.sh diff --git a/jdk/test/sun/security/tools/jarsigner/samename.sh b/test/jdk/sun/security/tools/jarsigner/samename.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/samename.sh rename to test/jdk/sun/security/tools/jarsigner/samename.sh diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/AliasNotInStoreTest.java b/test/jdk/sun/security/tools/jarsigner/warnings/AliasNotInStoreTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/AliasNotInStoreTest.java rename to test/jdk/sun/security/tools/jarsigner/warnings/AliasNotInStoreTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/BadExtendedKeyUsageTest.java b/test/jdk/sun/security/tools/jarsigner/warnings/BadExtendedKeyUsageTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/BadExtendedKeyUsageTest.java rename to test/jdk/sun/security/tools/jarsigner/warnings/BadExtendedKeyUsageTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java b/test/jdk/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java rename to test/jdk/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java b/test/jdk/sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java rename to test/jdk/sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/ChainNotValidatedTest.java b/test/jdk/sun/security/tools/jarsigner/warnings/ChainNotValidatedTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/ChainNotValidatedTest.java rename to test/jdk/sun/security/tools/jarsigner/warnings/ChainNotValidatedTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/HasExpiredCertTest.java b/test/jdk/sun/security/tools/jarsigner/warnings/HasExpiredCertTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/HasExpiredCertTest.java rename to test/jdk/sun/security/tools/jarsigner/warnings/HasExpiredCertTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/HasExpiringCertTest.java b/test/jdk/sun/security/tools/jarsigner/warnings/HasExpiringCertTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/HasExpiringCertTest.java rename to test/jdk/sun/security/tools/jarsigner/warnings/HasExpiringCertTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/HasUnsignedEntryTest.java b/test/jdk/sun/security/tools/jarsigner/warnings/HasUnsignedEntryTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/HasUnsignedEntryTest.java rename to test/jdk/sun/security/tools/jarsigner/warnings/HasUnsignedEntryTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/MultipleWarningsTest.java b/test/jdk/sun/security/tools/jarsigner/warnings/MultipleWarningsTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/MultipleWarningsTest.java rename to test/jdk/sun/security/tools/jarsigner/warnings/MultipleWarningsTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/NoTimestampTest.java b/test/jdk/sun/security/tools/jarsigner/warnings/NoTimestampTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/NoTimestampTest.java rename to test/jdk/sun/security/tools/jarsigner/warnings/NoTimestampTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/NotSignedByAliasTest.java b/test/jdk/sun/security/tools/jarsigner/warnings/NotSignedByAliasTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/NotSignedByAliasTest.java rename to test/jdk/sun/security/tools/jarsigner/warnings/NotSignedByAliasTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/NotYetValidCertTest.java b/test/jdk/sun/security/tools/jarsigner/warnings/NotYetValidCertTest.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/NotYetValidCertTest.java rename to test/jdk/sun/security/tools/jarsigner/warnings/NotYetValidCertTest.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/Test.java b/test/jdk/sun/security/tools/jarsigner/warnings/Test.java similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/Test.java rename to test/jdk/sun/security/tools/jarsigner/warnings/Test.java diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/bad_netscape_cert_type.jks.base64 b/test/jdk/sun/security/tools/jarsigner/warnings/bad_netscape_cert_type.jks.base64 similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/bad_netscape_cert_type.jks.base64 rename to test/jdk/sun/security/tools/jarsigner/warnings/bad_netscape_cert_type.jks.base64 diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/bad_netscape_cert_type.sh b/test/jdk/sun/security/tools/jarsigner/warnings/bad_netscape_cert_type.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/warnings/bad_netscape_cert_type.sh rename to test/jdk/sun/security/tools/jarsigner/warnings/bad_netscape_cert_type.sh diff --git a/jdk/test/sun/security/tools/jarsigner/weaksize.sh b/test/jdk/sun/security/tools/jarsigner/weaksize.sh similarity index 100% rename from jdk/test/sun/security/tools/jarsigner/weaksize.sh rename to test/jdk/sun/security/tools/jarsigner/weaksize.sh diff --git a/jdk/test/sun/security/tools/keytool/CacertsOption.java b/test/jdk/sun/security/tools/keytool/CacertsOption.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/CacertsOption.java rename to test/jdk/sun/security/tools/keytool/CacertsOption.java diff --git a/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.jks b/test/jdk/sun/security/tools/keytool/CloneKeyAskPassword.jks similarity index 100% rename from jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.jks rename to test/jdk/sun/security/tools/keytool/CloneKeyAskPassword.jks diff --git a/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh b/test/jdk/sun/security/tools/keytool/CloneKeyAskPassword.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh rename to test/jdk/sun/security/tools/keytool/CloneKeyAskPassword.sh diff --git a/jdk/test/sun/security/tools/keytool/CloseFile.java b/test/jdk/sun/security/tools/keytool/CloseFile.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/CloseFile.java rename to test/jdk/sun/security/tools/keytool/CloseFile.java diff --git a/jdk/test/sun/security/tools/keytool/DefaultSignatureAlgorithm.java b/test/jdk/sun/security/tools/keytool/DefaultSignatureAlgorithm.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/DefaultSignatureAlgorithm.java rename to test/jdk/sun/security/tools/keytool/DefaultSignatureAlgorithm.java diff --git a/jdk/test/sun/security/tools/keytool/DupCommands.java b/test/jdk/sun/security/tools/keytool/DupCommands.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/DupCommands.java rename to test/jdk/sun/security/tools/keytool/DupCommands.java diff --git a/jdk/test/sun/security/tools/keytool/DupImport.java b/test/jdk/sun/security/tools/keytool/DupImport.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/DupImport.java rename to test/jdk/sun/security/tools/keytool/DupImport.java diff --git a/jdk/test/sun/security/tools/keytool/ExportPrivateKeyNoPwd.java b/test/jdk/sun/security/tools/keytool/ExportPrivateKeyNoPwd.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/ExportPrivateKeyNoPwd.java rename to test/jdk/sun/security/tools/keytool/ExportPrivateKeyNoPwd.java diff --git a/jdk/test/sun/security/tools/keytool/HasSrcStoretypeOption.java b/test/jdk/sun/security/tools/keytool/HasSrcStoretypeOption.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/HasSrcStoretypeOption.java rename to test/jdk/sun/security/tools/keytool/HasSrcStoretypeOption.java diff --git a/jdk/test/sun/security/tools/keytool/ImportPrompt.java b/test/jdk/sun/security/tools/keytool/ImportPrompt.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/ImportPrompt.java rename to test/jdk/sun/security/tools/keytool/ImportPrompt.java diff --git a/jdk/test/sun/security/tools/keytool/KeyToolTest.java b/test/jdk/sun/security/tools/keytool/KeyToolTest.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/KeyToolTest.java rename to test/jdk/sun/security/tools/keytool/KeyToolTest.java diff --git a/jdk/test/sun/security/tools/keytool/ListKeychainStore.sh b/test/jdk/sun/security/tools/keytool/ListKeychainStore.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/ListKeychainStore.sh rename to test/jdk/sun/security/tools/keytool/ListKeychainStore.sh diff --git a/jdk/test/sun/security/tools/keytool/NewSize7.java b/test/jdk/sun/security/tools/keytool/NewSize7.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/NewSize7.java rename to test/jdk/sun/security/tools/keytool/NewSize7.java diff --git a/jdk/test/sun/security/tools/keytool/NoExtNPE.sh b/test/jdk/sun/security/tools/keytool/NoExtNPE.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/NoExtNPE.sh rename to test/jdk/sun/security/tools/keytool/NoExtNPE.sh diff --git a/jdk/test/sun/security/tools/keytool/PrintSSL.java b/test/jdk/sun/security/tools/keytool/PrintSSL.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/PrintSSL.java rename to test/jdk/sun/security/tools/keytool/PrintSSL.java diff --git a/jdk/test/sun/security/tools/keytool/ReadJar.java b/test/jdk/sun/security/tools/keytool/ReadJar.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/ReadJar.java rename to test/jdk/sun/security/tools/keytool/ReadJar.java diff --git a/jdk/test/sun/security/tools/keytool/SecretKeyKS.jks b/test/jdk/sun/security/tools/keytool/SecretKeyKS.jks similarity index 100% rename from jdk/test/sun/security/tools/keytool/SecretKeyKS.jks rename to test/jdk/sun/security/tools/keytool/SecretKeyKS.jks diff --git a/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh b/test/jdk/sun/security/tools/keytool/SecretKeyKS.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/SecretKeyKS.sh rename to test/jdk/sun/security/tools/keytool/SecretKeyKS.sh diff --git a/jdk/test/sun/security/tools/keytool/StandardAlgName.sh b/test/jdk/sun/security/tools/keytool/StandardAlgName.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/StandardAlgName.sh rename to test/jdk/sun/security/tools/keytool/StandardAlgName.sh diff --git a/jdk/test/sun/security/tools/keytool/StartDateTest.java b/test/jdk/sun/security/tools/keytool/StartDateTest.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/StartDateTest.java rename to test/jdk/sun/security/tools/keytool/StartDateTest.java diff --git a/jdk/test/sun/security/tools/keytool/StorePasswords.java b/test/jdk/sun/security/tools/keytool/StorePasswords.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/StorePasswords.java rename to test/jdk/sun/security/tools/keytool/StorePasswords.java diff --git a/jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh b/test/jdk/sun/security/tools/keytool/StorePasswordsByShell.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh rename to test/jdk/sun/security/tools/keytool/StorePasswordsByShell.sh diff --git a/jdk/test/sun/security/tools/keytool/UnknownAndUnparseable.java b/test/jdk/sun/security/tools/keytool/UnknownAndUnparseable.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/UnknownAndUnparseable.java rename to test/jdk/sun/security/tools/keytool/UnknownAndUnparseable.java diff --git a/jdk/test/sun/security/tools/keytool/WeakAlg.java b/test/jdk/sun/security/tools/keytool/WeakAlg.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/WeakAlg.java rename to test/jdk/sun/security/tools/keytool/WeakAlg.java diff --git a/jdk/test/sun/security/tools/keytool/autotest.sh b/test/jdk/sun/security/tools/keytool/autotest.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/autotest.sh rename to test/jdk/sun/security/tools/keytool/autotest.sh diff --git a/jdk/test/sun/security/tools/keytool/console.sh b/test/jdk/sun/security/tools/keytool/console.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/console.sh rename to test/jdk/sun/security/tools/keytool/console.sh diff --git a/jdk/test/sun/security/tools/keytool/default_options.sh b/test/jdk/sun/security/tools/keytool/default_options.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/default_options.sh rename to test/jdk/sun/security/tools/keytool/default_options.sh diff --git a/jdk/test/sun/security/tools/keytool/emptysubject.sh b/test/jdk/sun/security/tools/keytool/emptysubject.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/emptysubject.sh rename to test/jdk/sun/security/tools/keytool/emptysubject.sh diff --git a/jdk/test/sun/security/tools/keytool/file-in-help.sh b/test/jdk/sun/security/tools/keytool/file-in-help.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/file-in-help.sh rename to test/jdk/sun/security/tools/keytool/file-in-help.sh diff --git a/jdk/test/sun/security/tools/keytool/i18n.html b/test/jdk/sun/security/tools/keytool/i18n.html similarity index 100% rename from jdk/test/sun/security/tools/keytool/i18n.html rename to test/jdk/sun/security/tools/keytool/i18n.html diff --git a/jdk/test/sun/security/tools/keytool/i18n.java b/test/jdk/sun/security/tools/keytool/i18n.java similarity index 100% rename from jdk/test/sun/security/tools/keytool/i18n.java rename to test/jdk/sun/security/tools/keytool/i18n.java diff --git a/jdk/test/sun/security/tools/keytool/i18n.sh b/test/jdk/sun/security/tools/keytool/i18n.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/i18n.sh rename to test/jdk/sun/security/tools/keytool/i18n.sh diff --git a/jdk/test/sun/security/tools/keytool/importreadall.sh b/test/jdk/sun/security/tools/keytool/importreadall.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/importreadall.sh rename to test/jdk/sun/security/tools/keytool/importreadall.sh diff --git a/jdk/test/sun/security/tools/keytool/keyalg.sh b/test/jdk/sun/security/tools/keytool/keyalg.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/keyalg.sh rename to test/jdk/sun/security/tools/keytool/keyalg.sh diff --git a/jdk/test/sun/security/tools/keytool/newhelp.sh b/test/jdk/sun/security/tools/keytool/newhelp.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/newhelp.sh rename to test/jdk/sun/security/tools/keytool/newhelp.sh diff --git a/jdk/test/sun/security/tools/keytool/p11-nss.txt b/test/jdk/sun/security/tools/keytool/p11-nss.txt similarity index 100% rename from jdk/test/sun/security/tools/keytool/p11-nss.txt rename to test/jdk/sun/security/tools/keytool/p11-nss.txt diff --git a/jdk/test/sun/security/tools/keytool/p12importks.sh b/test/jdk/sun/security/tools/keytool/p12importks.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/p12importks.sh rename to test/jdk/sun/security/tools/keytool/p12importks.sh diff --git a/jdk/test/sun/security/tools/keytool/resource.sh b/test/jdk/sun/security/tools/keytool/resource.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/resource.sh rename to test/jdk/sun/security/tools/keytool/resource.sh diff --git a/jdk/test/sun/security/tools/keytool/selfissued.sh b/test/jdk/sun/security/tools/keytool/selfissued.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/selfissued.sh rename to test/jdk/sun/security/tools/keytool/selfissued.sh diff --git a/jdk/test/sun/security/tools/keytool/standard.sh b/test/jdk/sun/security/tools/keytool/standard.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/standard.sh rename to test/jdk/sun/security/tools/keytool/standard.sh diff --git a/jdk/test/sun/security/tools/keytool/trystore.sh b/test/jdk/sun/security/tools/keytool/trystore.sh similarity index 100% rename from jdk/test/sun/security/tools/keytool/trystore.sh rename to test/jdk/sun/security/tools/keytool/trystore.sh diff --git a/jdk/test/sun/security/tools/policytool/Alias.html b/test/jdk/sun/security/tools/policytool/Alias.html similarity index 100% rename from jdk/test/sun/security/tools/policytool/Alias.html rename to test/jdk/sun/security/tools/policytool/Alias.html diff --git a/jdk/test/sun/security/tools/policytool/Alias.java b/test/jdk/sun/security/tools/policytool/Alias.java similarity index 100% rename from jdk/test/sun/security/tools/policytool/Alias.java rename to test/jdk/sun/security/tools/policytool/Alias.java diff --git a/jdk/test/sun/security/tools/policytool/Alias.sh b/test/jdk/sun/security/tools/policytool/Alias.sh similarity index 100% rename from jdk/test/sun/security/tools/policytool/Alias.sh rename to test/jdk/sun/security/tools/policytool/Alias.sh diff --git a/jdk/test/sun/security/tools/policytool/ChangeUI.html b/test/jdk/sun/security/tools/policytool/ChangeUI.html similarity index 100% rename from jdk/test/sun/security/tools/policytool/ChangeUI.html rename to test/jdk/sun/security/tools/policytool/ChangeUI.html diff --git a/jdk/test/sun/security/tools/policytool/ChangeUI.java b/test/jdk/sun/security/tools/policytool/ChangeUI.java similarity index 100% rename from jdk/test/sun/security/tools/policytool/ChangeUI.java rename to test/jdk/sun/security/tools/policytool/ChangeUI.java diff --git a/jdk/test/sun/security/tools/policytool/ChangeUI.sh b/test/jdk/sun/security/tools/policytool/ChangeUI.sh similarity index 100% rename from jdk/test/sun/security/tools/policytool/ChangeUI.sh rename to test/jdk/sun/security/tools/policytool/ChangeUI.sh diff --git a/jdk/test/sun/security/tools/policytool/OpenPolicy.html b/test/jdk/sun/security/tools/policytool/OpenPolicy.html similarity index 100% rename from jdk/test/sun/security/tools/policytool/OpenPolicy.html rename to test/jdk/sun/security/tools/policytool/OpenPolicy.html diff --git a/jdk/test/sun/security/tools/policytool/OpenPolicy.java b/test/jdk/sun/security/tools/policytool/OpenPolicy.java similarity index 100% rename from jdk/test/sun/security/tools/policytool/OpenPolicy.java rename to test/jdk/sun/security/tools/policytool/OpenPolicy.java diff --git a/jdk/test/sun/security/tools/policytool/OpenPolicy.sh b/test/jdk/sun/security/tools/policytool/OpenPolicy.sh similarity index 100% rename from jdk/test/sun/security/tools/policytool/OpenPolicy.sh rename to test/jdk/sun/security/tools/policytool/OpenPolicy.sh diff --git a/jdk/test/sun/security/tools/policytool/SaveAs.html b/test/jdk/sun/security/tools/policytool/SaveAs.html similarity index 100% rename from jdk/test/sun/security/tools/policytool/SaveAs.html rename to test/jdk/sun/security/tools/policytool/SaveAs.html diff --git a/jdk/test/sun/security/tools/policytool/SaveAs.java b/test/jdk/sun/security/tools/policytool/SaveAs.java similarity index 100% rename from jdk/test/sun/security/tools/policytool/SaveAs.java rename to test/jdk/sun/security/tools/policytool/SaveAs.java diff --git a/jdk/test/sun/security/tools/policytool/SaveAs.sh b/test/jdk/sun/security/tools/policytool/SaveAs.sh similarity index 100% rename from jdk/test/sun/security/tools/policytool/SaveAs.sh rename to test/jdk/sun/security/tools/policytool/SaveAs.sh diff --git a/jdk/test/sun/security/tools/policytool/UpdatePermissions.html b/test/jdk/sun/security/tools/policytool/UpdatePermissions.html similarity index 100% rename from jdk/test/sun/security/tools/policytool/UpdatePermissions.html rename to test/jdk/sun/security/tools/policytool/UpdatePermissions.html diff --git a/jdk/test/sun/security/tools/policytool/UpdatePermissions.java b/test/jdk/sun/security/tools/policytool/UpdatePermissions.java similarity index 100% rename from jdk/test/sun/security/tools/policytool/UpdatePermissions.java rename to test/jdk/sun/security/tools/policytool/UpdatePermissions.java diff --git a/jdk/test/sun/security/tools/policytool/UpdatePermissions.sh b/test/jdk/sun/security/tools/policytool/UpdatePermissions.sh similarity index 100% rename from jdk/test/sun/security/tools/policytool/UpdatePermissions.sh rename to test/jdk/sun/security/tools/policytool/UpdatePermissions.sh diff --git a/jdk/test/sun/security/tools/policytool/UsePolicy.html b/test/jdk/sun/security/tools/policytool/UsePolicy.html similarity index 100% rename from jdk/test/sun/security/tools/policytool/UsePolicy.html rename to test/jdk/sun/security/tools/policytool/UsePolicy.html diff --git a/jdk/test/sun/security/tools/policytool/UsePolicy.java b/test/jdk/sun/security/tools/policytool/UsePolicy.java similarity index 100% rename from jdk/test/sun/security/tools/policytool/UsePolicy.java rename to test/jdk/sun/security/tools/policytool/UsePolicy.java diff --git a/jdk/test/sun/security/tools/policytool/UsePolicy.sh b/test/jdk/sun/security/tools/policytool/UsePolicy.sh similarity index 100% rename from jdk/test/sun/security/tools/policytool/UsePolicy.sh rename to test/jdk/sun/security/tools/policytool/UsePolicy.sh diff --git a/jdk/test/sun/security/tools/policytool/i18n.html b/test/jdk/sun/security/tools/policytool/i18n.html similarity index 100% rename from jdk/test/sun/security/tools/policytool/i18n.html rename to test/jdk/sun/security/tools/policytool/i18n.html diff --git a/jdk/test/sun/security/tools/policytool/i18n.java b/test/jdk/sun/security/tools/policytool/i18n.java similarity index 100% rename from jdk/test/sun/security/tools/policytool/i18n.java rename to test/jdk/sun/security/tools/policytool/i18n.java diff --git a/jdk/test/sun/security/tools/policytool/i18n.sh b/test/jdk/sun/security/tools/policytool/i18n.sh similarity index 100% rename from jdk/test/sun/security/tools/policytool/i18n.sh rename to test/jdk/sun/security/tools/policytool/i18n.sh diff --git a/jdk/test/sun/security/util/AlgorithmConstraints/DecomposeAlgorithms.java b/test/jdk/sun/security/util/AlgorithmConstraints/DecomposeAlgorithms.java similarity index 100% rename from jdk/test/sun/security/util/AlgorithmConstraints/DecomposeAlgorithms.java rename to test/jdk/sun/security/util/AlgorithmConstraints/DecomposeAlgorithms.java diff --git a/jdk/test/sun/security/util/BitArray/NamedBitList.java b/test/jdk/sun/security/util/BitArray/NamedBitList.java similarity index 100% rename from jdk/test/sun/security/util/BitArray/NamedBitList.java rename to test/jdk/sun/security/util/BitArray/NamedBitList.java diff --git a/jdk/test/sun/security/util/Debug/MultiOptions.java b/test/jdk/sun/security/util/Debug/MultiOptions.java similarity index 100% rename from jdk/test/sun/security/util/Debug/MultiOptions.java rename to test/jdk/sun/security/util/Debug/MultiOptions.java diff --git a/jdk/test/sun/security/util/DerInputBuffer/Allow.policy b/test/jdk/sun/security/util/DerInputBuffer/Allow.policy similarity index 100% rename from jdk/test/sun/security/util/DerInputBuffer/Allow.policy rename to test/jdk/sun/security/util/DerInputBuffer/Allow.policy diff --git a/jdk/test/sun/security/util/DerInputBuffer/BigInteger0.java b/test/jdk/sun/security/util/DerInputBuffer/BigInteger0.java similarity index 100% rename from jdk/test/sun/security/util/DerInputBuffer/BigInteger0.java rename to test/jdk/sun/security/util/DerInputBuffer/BigInteger0.java diff --git a/jdk/test/sun/security/util/DerInputBuffer/DerInputBufferEqualsHashCode.java b/test/jdk/sun/security/util/DerInputBuffer/DerInputBufferEqualsHashCode.java similarity index 100% rename from jdk/test/sun/security/util/DerInputBuffer/DerInputBufferEqualsHashCode.java rename to test/jdk/sun/security/util/DerInputBuffer/DerInputBufferEqualsHashCode.java diff --git a/jdk/test/sun/security/util/DerInputBuffer/PaddedBitString.java b/test/jdk/sun/security/util/DerInputBuffer/PaddedBitString.java similarity index 100% rename from jdk/test/sun/security/util/DerInputBuffer/PaddedBitString.java rename to test/jdk/sun/security/util/DerInputBuffer/PaddedBitString.java diff --git a/jdk/test/sun/security/util/DerInputBuffer/TimeParsing.java b/test/jdk/sun/security/util/DerInputBuffer/TimeParsing.java similarity index 100% rename from jdk/test/sun/security/util/DerInputBuffer/TimeParsing.java rename to test/jdk/sun/security/util/DerInputBuffer/TimeParsing.java diff --git a/jdk/test/sun/security/util/DerOutputStream/LocaleInTime.java b/test/jdk/sun/security/util/DerOutputStream/LocaleInTime.java similarity index 100% rename from jdk/test/sun/security/util/DerOutputStream/LocaleInTime.java rename to test/jdk/sun/security/util/DerOutputStream/LocaleInTime.java diff --git a/jdk/test/sun/security/util/DerValue/BadValue.java b/test/jdk/sun/security/util/DerValue/BadValue.java similarity index 100% rename from jdk/test/sun/security/util/DerValue/BadValue.java rename to test/jdk/sun/security/util/DerValue/BadValue.java diff --git a/jdk/test/sun/security/util/DerValue/DerValueEqualsHashCode.java b/test/jdk/sun/security/util/DerValue/DerValueEqualsHashCode.java similarity index 100% rename from jdk/test/sun/security/util/DerValue/DerValueEqualsHashCode.java rename to test/jdk/sun/security/util/DerValue/DerValueEqualsHashCode.java diff --git a/jdk/test/sun/security/util/DerValue/EmptyValue.java b/test/jdk/sun/security/util/DerValue/EmptyValue.java similarity index 100% rename from jdk/test/sun/security/util/DerValue/EmptyValue.java rename to test/jdk/sun/security/util/DerValue/EmptyValue.java diff --git a/jdk/test/sun/security/util/DerValue/Indefinite.java b/test/jdk/sun/security/util/DerValue/Indefinite.java similarity index 100% rename from jdk/test/sun/security/util/DerValue/Indefinite.java rename to test/jdk/sun/security/util/DerValue/Indefinite.java diff --git a/jdk/test/sun/security/util/DerValue/NegInt.java b/test/jdk/sun/security/util/DerValue/NegInt.java similarity index 100% rename from jdk/test/sun/security/util/DerValue/NegInt.java rename to test/jdk/sun/security/util/DerValue/NegInt.java diff --git a/jdk/test/sun/security/util/FilePermCompat/CompatImpact.java b/test/jdk/sun/security/util/FilePermCompat/CompatImpact.java similarity index 100% rename from jdk/test/sun/security/util/FilePermCompat/CompatImpact.java rename to test/jdk/sun/security/util/FilePermCompat/CompatImpact.java diff --git a/jdk/test/sun/security/util/FilePermCompat/Flag.java b/test/jdk/sun/security/util/FilePermCompat/Flag.java similarity index 100% rename from jdk/test/sun/security/util/FilePermCompat/Flag.java rename to test/jdk/sun/security/util/FilePermCompat/Flag.java diff --git a/jdk/test/sun/security/util/FilePermCompat/flag.policy b/test/jdk/sun/security/util/FilePermCompat/flag.policy similarity index 100% rename from jdk/test/sun/security/util/FilePermCompat/flag.policy rename to test/jdk/sun/security/util/FilePermCompat/flag.policy diff --git a/jdk/test/sun/security/util/HostnameMatcher/TestHostnameChecker.java b/test/jdk/sun/security/util/HostnameMatcher/TestHostnameChecker.java similarity index 100% rename from jdk/test/sun/security/util/HostnameMatcher/TestHostnameChecker.java rename to test/jdk/sun/security/util/HostnameMatcher/TestHostnameChecker.java diff --git a/jdk/test/sun/security/util/HostnameMatcher/cert1.crt b/test/jdk/sun/security/util/HostnameMatcher/cert1.crt similarity index 100% rename from jdk/test/sun/security/util/HostnameMatcher/cert1.crt rename to test/jdk/sun/security/util/HostnameMatcher/cert1.crt diff --git a/jdk/test/sun/security/util/HostnameMatcher/cert2.crt b/test/jdk/sun/security/util/HostnameMatcher/cert2.crt similarity index 100% rename from jdk/test/sun/security/util/HostnameMatcher/cert2.crt rename to test/jdk/sun/security/util/HostnameMatcher/cert2.crt diff --git a/jdk/test/sun/security/util/HostnameMatcher/cert3.crt b/test/jdk/sun/security/util/HostnameMatcher/cert3.crt similarity index 100% rename from jdk/test/sun/security/util/HostnameMatcher/cert3.crt rename to test/jdk/sun/security/util/HostnameMatcher/cert3.crt diff --git a/jdk/test/sun/security/util/HostnameMatcher/cert4.crt b/test/jdk/sun/security/util/HostnameMatcher/cert4.crt similarity index 100% rename from jdk/test/sun/security/util/HostnameMatcher/cert4.crt rename to test/jdk/sun/security/util/HostnameMatcher/cert4.crt diff --git a/jdk/test/sun/security/util/HostnameMatcher/cert5.crt b/test/jdk/sun/security/util/HostnameMatcher/cert5.crt similarity index 100% rename from jdk/test/sun/security/util/HostnameMatcher/cert5.crt rename to test/jdk/sun/security/util/HostnameMatcher/cert5.crt diff --git a/jdk/test/sun/security/util/Oid/OidEquals.java b/test/jdk/sun/security/util/Oid/OidEquals.java similarity index 100% rename from jdk/test/sun/security/util/Oid/OidEquals.java rename to test/jdk/sun/security/util/Oid/OidEquals.java diff --git a/jdk/test/sun/security/util/Oid/OidFormat.java b/test/jdk/sun/security/util/Oid/OidFormat.java similarity index 100% rename from jdk/test/sun/security/util/Oid/OidFormat.java rename to test/jdk/sun/security/util/Oid/OidFormat.java diff --git a/jdk/test/sun/security/util/Oid/S11N.java b/test/jdk/sun/security/util/Oid/S11N.java similarity index 100% rename from jdk/test/sun/security/util/Oid/S11N.java rename to test/jdk/sun/security/util/Oid/S11N.java diff --git a/jdk/test/sun/security/util/Pem/PemEncoding.java b/test/jdk/sun/security/util/Pem/PemEncoding.java similarity index 100% rename from jdk/test/sun/security/util/Pem/PemEncoding.java rename to test/jdk/sun/security/util/Pem/PemEncoding.java diff --git a/jdk/test/sun/security/util/Pem/encoding.sh b/test/jdk/sun/security/util/Pem/encoding.sh similarity index 100% rename from jdk/test/sun/security/util/Pem/encoding.sh rename to test/jdk/sun/security/util/Pem/encoding.sh diff --git a/jdk/test/sun/security/util/PropertyExpander/ExpandAndEncode.java b/test/jdk/sun/security/util/PropertyExpander/ExpandAndEncode.java similarity index 100% rename from jdk/test/sun/security/util/PropertyExpander/ExpandAndEncode.java rename to test/jdk/sun/security/util/PropertyExpander/ExpandAndEncode.java diff --git a/jdk/test/sun/security/util/Resources/Format.config b/test/jdk/sun/security/util/Resources/Format.config similarity index 100% rename from jdk/test/sun/security/util/Resources/Format.config rename to test/jdk/sun/security/util/Resources/Format.config diff --git a/jdk/test/sun/security/util/Resources/Format.java b/test/jdk/sun/security/util/Resources/Format.java similarity index 100% rename from jdk/test/sun/security/util/Resources/Format.java rename to test/jdk/sun/security/util/Resources/Format.java diff --git a/jdk/test/sun/security/util/Resources/Format.policy b/test/jdk/sun/security/util/Resources/Format.policy similarity index 100% rename from jdk/test/sun/security/util/Resources/Format.policy rename to test/jdk/sun/security/util/Resources/Format.policy diff --git a/jdk/test/sun/security/util/Resources/NewNamesFormat.java b/test/jdk/sun/security/util/Resources/NewNamesFormat.java similarity index 100% rename from jdk/test/sun/security/util/Resources/NewNamesFormat.java rename to test/jdk/sun/security/util/Resources/NewNamesFormat.java diff --git a/jdk/test/sun/security/util/Resources/NewResourcesNames.java b/test/jdk/sun/security/util/Resources/NewResourcesNames.java similarity index 100% rename from jdk/test/sun/security/util/Resources/NewResourcesNames.java rename to test/jdk/sun/security/util/Resources/NewResourcesNames.java diff --git a/jdk/test/sun/security/util/Resources/customSysClassLoader/BootMessages.java b/test/jdk/sun/security/util/Resources/customSysClassLoader/BootMessages.java similarity index 100% rename from jdk/test/sun/security/util/Resources/customSysClassLoader/BootMessages.java rename to test/jdk/sun/security/util/Resources/customSysClassLoader/BootMessages.java diff --git a/jdk/test/sun/security/util/Resources/customSysClassLoader/CustomClassLoader.java b/test/jdk/sun/security/util/Resources/customSysClassLoader/CustomClassLoader.java similarity index 100% rename from jdk/test/sun/security/util/Resources/customSysClassLoader/CustomClassLoader.java rename to test/jdk/sun/security/util/Resources/customSysClassLoader/CustomClassLoader.java diff --git a/jdk/test/sun/security/util/Resources/customSysClassLoader/MessageFormatting.java b/test/jdk/sun/security/util/Resources/customSysClassLoader/MessageFormatting.java similarity index 100% rename from jdk/test/sun/security/util/Resources/customSysClassLoader/MessageFormatting.java rename to test/jdk/sun/security/util/Resources/customSysClassLoader/MessageFormatting.java diff --git a/jdk/test/sun/security/util/Resources/customSysClassLoader/error.policy b/test/jdk/sun/security/util/Resources/customSysClassLoader/error.policy similarity index 100% rename from jdk/test/sun/security/util/Resources/customSysClassLoader/error.policy rename to test/jdk/sun/security/util/Resources/customSysClassLoader/error.policy diff --git a/jdk/test/sun/security/util/asn1StringTypes/StringTypes.java b/test/jdk/sun/security/util/asn1StringTypes/StringTypes.java similarity index 100% rename from jdk/test/sun/security/util/asn1StringTypes/StringTypes.java rename to test/jdk/sun/security/util/asn1StringTypes/StringTypes.java diff --git a/jdk/test/sun/security/validator/CertReplace.java b/test/jdk/sun/security/validator/CertReplace.java similarity index 100% rename from jdk/test/sun/security/validator/CertReplace.java rename to test/jdk/sun/security/validator/CertReplace.java diff --git a/jdk/test/sun/security/validator/ConstructorTest.java b/test/jdk/sun/security/validator/ConstructorTest.java similarity index 100% rename from jdk/test/sun/security/validator/ConstructorTest.java rename to test/jdk/sun/security/validator/ConstructorTest.java diff --git a/jdk/test/sun/security/validator/EndEntityExtensionCheck.java b/test/jdk/sun/security/validator/EndEntityExtensionCheck.java similarity index 100% rename from jdk/test/sun/security/validator/EndEntityExtensionCheck.java rename to test/jdk/sun/security/validator/EndEntityExtensionCheck.java diff --git a/jdk/test/sun/security/validator/certreplace.sh b/test/jdk/sun/security/validator/certreplace.sh similarity index 100% rename from jdk/test/sun/security/validator/certreplace.sh rename to test/jdk/sun/security/validator/certreplace.sh diff --git a/jdk/test/sun/security/validator/samedn.sh b/test/jdk/sun/security/validator/samedn.sh similarity index 100% rename from jdk/test/sun/security/validator/samedn.sh rename to test/jdk/sun/security/validator/samedn.sh diff --git a/jdk/test/sun/security/x509/AVA/AVAEqualsHashCode.java b/test/jdk/sun/security/x509/AVA/AVAEqualsHashCode.java similarity index 100% rename from jdk/test/sun/security/x509/AVA/AVAEqualsHashCode.java rename to test/jdk/sun/security/x509/AVA/AVAEqualsHashCode.java diff --git a/jdk/test/sun/security/x509/AVA/Allow.policy b/test/jdk/sun/security/x509/AVA/Allow.policy similarity index 100% rename from jdk/test/sun/security/x509/AVA/Allow.policy rename to test/jdk/sun/security/x509/AVA/Allow.policy diff --git a/jdk/test/sun/security/x509/AVA/BadName.java b/test/jdk/sun/security/x509/AVA/BadName.java similarity index 100% rename from jdk/test/sun/security/x509/AVA/BadName.java rename to test/jdk/sun/security/x509/AVA/BadName.java diff --git a/jdk/test/sun/security/x509/AVA/DomainComponentEncoding.java b/test/jdk/sun/security/x509/AVA/DomainComponentEncoding.java similarity index 100% rename from jdk/test/sun/security/x509/AVA/DomainComponentEncoding.java rename to test/jdk/sun/security/x509/AVA/DomainComponentEncoding.java diff --git a/jdk/test/sun/security/x509/AVA/EmailAddressEncoding.java b/test/jdk/sun/security/x509/AVA/EmailAddressEncoding.java similarity index 100% rename from jdk/test/sun/security/x509/AVA/EmailAddressEncoding.java rename to test/jdk/sun/security/x509/AVA/EmailAddressEncoding.java diff --git a/jdk/test/sun/security/x509/AVA/EmptyValue.java b/test/jdk/sun/security/x509/AVA/EmptyValue.java similarity index 100% rename from jdk/test/sun/security/x509/AVA/EmptyValue.java rename to test/jdk/sun/security/x509/AVA/EmptyValue.java diff --git a/jdk/test/sun/security/x509/AlgorithmId/AlgorithmIdEqualsHashCode.java b/test/jdk/sun/security/x509/AlgorithmId/AlgorithmIdEqualsHashCode.java similarity index 100% rename from jdk/test/sun/security/x509/AlgorithmId/AlgorithmIdEqualsHashCode.java rename to test/jdk/sun/security/x509/AlgorithmId/AlgorithmIdEqualsHashCode.java diff --git a/jdk/test/sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java b/test/jdk/sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java similarity index 100% rename from jdk/test/sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java rename to test/jdk/sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java diff --git a/jdk/test/sun/security/x509/AlgorithmId/NonStandardNames.java b/test/jdk/sun/security/x509/AlgorithmId/NonStandardNames.java similarity index 100% rename from jdk/test/sun/security/x509/AlgorithmId/NonStandardNames.java rename to test/jdk/sun/security/x509/AlgorithmId/NonStandardNames.java diff --git a/jdk/test/sun/security/x509/AlgorithmId/OidTableInit.java b/test/jdk/sun/security/x509/AlgorithmId/OidTableInit.java similarity index 100% rename from jdk/test/sun/security/x509/AlgorithmId/OidTableInit.java rename to test/jdk/sun/security/x509/AlgorithmId/OidTableInit.java diff --git a/jdk/test/sun/security/x509/AlgorithmId/SHA256withECDSA.java b/test/jdk/sun/security/x509/AlgorithmId/SHA256withECDSA.java similarity index 100% rename from jdk/test/sun/security/x509/AlgorithmId/SHA256withECDSA.java rename to test/jdk/sun/security/x509/AlgorithmId/SHA256withECDSA.java diff --git a/jdk/test/sun/security/x509/AlgorithmId/TurkishRegion.java b/test/jdk/sun/security/x509/AlgorithmId/TurkishRegion.java similarity index 100% rename from jdk/test/sun/security/x509/AlgorithmId/TurkishRegion.java rename to test/jdk/sun/security/x509/AlgorithmId/TurkishRegion.java diff --git a/jdk/test/sun/security/x509/Extensions/BCNull.java b/test/jdk/sun/security/x509/Extensions/BCNull.java similarity index 100% rename from jdk/test/sun/security/x509/Extensions/BCNull.java rename to test/jdk/sun/security/x509/Extensions/BCNull.java diff --git a/jdk/test/sun/security/x509/Extensions/DefaultCriticality.java b/test/jdk/sun/security/x509/Extensions/DefaultCriticality.java similarity index 100% rename from jdk/test/sun/security/x509/Extensions/DefaultCriticality.java rename to test/jdk/sun/security/x509/Extensions/DefaultCriticality.java diff --git a/jdk/test/sun/security/x509/GeneralName/Encode.java b/test/jdk/sun/security/x509/GeneralName/Encode.java similarity index 100% rename from jdk/test/sun/security/x509/GeneralName/Encode.java rename to test/jdk/sun/security/x509/GeneralName/Encode.java diff --git a/jdk/test/sun/security/x509/GeneralName/X400Address.java b/test/jdk/sun/security/x509/GeneralName/X400Address.java similarity index 100% rename from jdk/test/sun/security/x509/GeneralName/X400Address.java rename to test/jdk/sun/security/x509/GeneralName/X400Address.java diff --git a/jdk/test/sun/security/x509/URICertStore/AIA b/test/jdk/sun/security/x509/URICertStore/AIA similarity index 100% rename from jdk/test/sun/security/x509/URICertStore/AIA rename to test/jdk/sun/security/x509/URICertStore/AIA diff --git a/jdk/test/sun/security/x509/URICertStore/CRLDP b/test/jdk/sun/security/x509/URICertStore/CRLDP similarity index 100% rename from jdk/test/sun/security/x509/URICertStore/CRLDP rename to test/jdk/sun/security/x509/URICertStore/CRLDP diff --git a/jdk/test/sun/security/x509/URICertStore/ExtensionsWithLDAP.java b/test/jdk/sun/security/x509/URICertStore/ExtensionsWithLDAP.java similarity index 100% rename from jdk/test/sun/security/x509/URICertStore/ExtensionsWithLDAP.java rename to test/jdk/sun/security/x509/URICertStore/ExtensionsWithLDAP.java diff --git a/jdk/test/sun/security/x509/URICertStore/SocksProxy.java b/test/jdk/sun/security/x509/URICertStore/SocksProxy.java similarity index 100% rename from jdk/test/sun/security/x509/URICertStore/SocksProxy.java rename to test/jdk/sun/security/x509/URICertStore/SocksProxy.java diff --git a/jdk/test/sun/security/x509/URIName/Parse.java b/test/jdk/sun/security/x509/URIName/Parse.java similarity index 100% rename from jdk/test/sun/security/x509/URIName/Parse.java rename to test/jdk/sun/security/x509/URIName/Parse.java diff --git a/jdk/test/sun/security/x509/X500Name/AllAttribs.java b/test/jdk/sun/security/x509/X500Name/AllAttribs.java similarity index 100% rename from jdk/test/sun/security/x509/X500Name/AllAttribs.java rename to test/jdk/sun/security/x509/X500Name/AllAttribs.java diff --git a/jdk/test/sun/security/x509/X500Name/DerValueConstructor.java b/test/jdk/sun/security/x509/X500Name/DerValueConstructor.java similarity index 100% rename from jdk/test/sun/security/x509/X500Name/DerValueConstructor.java rename to test/jdk/sun/security/x509/X500Name/DerValueConstructor.java diff --git a/jdk/test/sun/security/x509/X500Name/EmailKeyword.java b/test/jdk/sun/security/x509/X500Name/EmailKeyword.java similarity index 100% rename from jdk/test/sun/security/x509/X500Name/EmailKeyword.java rename to test/jdk/sun/security/x509/X500Name/EmailKeyword.java diff --git a/jdk/test/sun/security/x509/X500Name/NullX500Name.java b/test/jdk/sun/security/x509/X500Name/NullX500Name.java similarity index 100% rename from jdk/test/sun/security/x509/X500Name/NullX500Name.java rename to test/jdk/sun/security/x509/X500Name/NullX500Name.java diff --git a/jdk/test/sun/security/x509/X500Name/RDNwithMultipleAVAs.java b/test/jdk/sun/security/x509/X500Name/RDNwithMultipleAVAs.java similarity index 100% rename from jdk/test/sun/security/x509/X500Name/RDNwithMultipleAVAs.java rename to test/jdk/sun/security/x509/X500Name/RDNwithMultipleAVAs.java diff --git a/jdk/test/sun/security/x509/X509CRLImpl/OrderAndDup.java b/test/jdk/sun/security/x509/X509CRLImpl/OrderAndDup.java similarity index 100% rename from jdk/test/sun/security/x509/X509CRLImpl/OrderAndDup.java rename to test/jdk/sun/security/x509/X509CRLImpl/OrderAndDup.java diff --git a/jdk/test/sun/security/x509/X509CRLImpl/UnexpectedNPE.java b/test/jdk/sun/security/x509/X509CRLImpl/UnexpectedNPE.java similarity index 100% rename from jdk/test/sun/security/x509/X509CRLImpl/UnexpectedNPE.java rename to test/jdk/sun/security/x509/X509CRLImpl/UnexpectedNPE.java diff --git a/jdk/test/sun/security/x509/X509CRLImpl/Verify.java b/test/jdk/sun/security/x509/X509CRLImpl/Verify.java similarity index 100% rename from jdk/test/sun/security/x509/X509CRLImpl/Verify.java rename to test/jdk/sun/security/x509/X509CRLImpl/Verify.java diff --git a/jdk/test/sun/security/x509/X509CertImpl/V3Certificate.java b/test/jdk/sun/security/x509/X509CertImpl/V3Certificate.java similarity index 100% rename from jdk/test/sun/security/x509/X509CertImpl/V3Certificate.java rename to test/jdk/sun/security/x509/X509CertImpl/V3Certificate.java diff --git a/jdk/test/sun/security/x509/X509CertImpl/Verify.java b/test/jdk/sun/security/x509/X509CertImpl/Verify.java similarity index 100% rename from jdk/test/sun/security/x509/X509CertImpl/Verify.java rename to test/jdk/sun/security/x509/X509CertImpl/Verify.java diff --git a/jdk/test/sun/security/x509/equalNames/AltNamesEqualsTest.java b/test/jdk/sun/security/x509/equalNames/AltNamesEqualsTest.java similarity index 100% rename from jdk/test/sun/security/x509/equalNames/AltNamesEqualsTest.java rename to test/jdk/sun/security/x509/equalNames/AltNamesEqualsTest.java diff --git a/jdk/test/sun/text/IntHashtable/Bug4170614Test.sh b/test/jdk/sun/text/IntHashtable/Bug4170614Test.sh similarity index 100% rename from jdk/test/sun/text/IntHashtable/Bug4170614Test.sh rename to test/jdk/sun/text/IntHashtable/Bug4170614Test.sh diff --git a/jdk/test/sun/text/IntHashtable/Bug4705389.java b/test/jdk/sun/text/IntHashtable/Bug4705389.java similarity index 100% rename from jdk/test/sun/text/IntHashtable/Bug4705389.java rename to test/jdk/sun/text/IntHashtable/Bug4705389.java diff --git a/jdk/test/sun/text/IntHashtable/patch-src/java/text/Bug4170614Test.java b/test/jdk/sun/text/IntHashtable/patch-src/java/text/Bug4170614Test.java similarity index 100% rename from jdk/test/sun/text/IntHashtable/patch-src/java/text/Bug4170614Test.java rename to test/jdk/sun/text/IntHashtable/patch-src/java/text/Bug4170614Test.java diff --git a/jdk/test/sun/text/resources/Collator/Bug4248694.java b/test/jdk/sun/text/resources/Collator/Bug4248694.java similarity index 100% rename from jdk/test/sun/text/resources/Collator/Bug4248694.java rename to test/jdk/sun/text/resources/Collator/Bug4248694.java diff --git a/jdk/test/sun/text/resources/Collator/Bug4804273.java b/test/jdk/sun/text/resources/Collator/Bug4804273.java similarity index 100% rename from jdk/test/sun/text/resources/Collator/Bug4804273.java rename to test/jdk/sun/text/resources/Collator/Bug4804273.java diff --git a/jdk/test/sun/text/resources/Collator/Bug4848897.java b/test/jdk/sun/text/resources/Collator/Bug4848897.java similarity index 100% rename from jdk/test/sun/text/resources/Collator/Bug4848897.java rename to test/jdk/sun/text/resources/Collator/Bug4848897.java diff --git a/jdk/test/sun/text/resources/Collator/Bug6755060.java b/test/jdk/sun/text/resources/Collator/Bug6755060.java similarity index 100% rename from jdk/test/sun/text/resources/Collator/Bug6755060.java rename to test/jdk/sun/text/resources/Collator/Bug6755060.java diff --git a/jdk/test/sun/text/resources/Format/Bug4395196.java b/test/jdk/sun/text/resources/Format/Bug4395196.java similarity index 100% rename from jdk/test/sun/text/resources/Format/Bug4395196.java rename to test/jdk/sun/text/resources/Format/Bug4395196.java diff --git a/jdk/test/sun/text/resources/Format/Bug4442855.java b/test/jdk/sun/text/resources/Format/Bug4442855.java similarity index 100% rename from jdk/test/sun/text/resources/Format/Bug4442855.java rename to test/jdk/sun/text/resources/Format/Bug4442855.java diff --git a/jdk/test/sun/text/resources/Format/Bug4621320.java b/test/jdk/sun/text/resources/Format/Bug4621320.java similarity index 100% rename from jdk/test/sun/text/resources/Format/Bug4621320.java rename to test/jdk/sun/text/resources/Format/Bug4621320.java diff --git a/jdk/test/sun/text/resources/Format/Bug4651568.java b/test/jdk/sun/text/resources/Format/Bug4651568.java similarity index 100% rename from jdk/test/sun/text/resources/Format/Bug4651568.java rename to test/jdk/sun/text/resources/Format/Bug4651568.java diff --git a/jdk/test/sun/text/resources/Format/Bug4685470.java b/test/jdk/sun/text/resources/Format/Bug4685470.java similarity index 100% rename from jdk/test/sun/text/resources/Format/Bug4685470.java rename to test/jdk/sun/text/resources/Format/Bug4685470.java diff --git a/jdk/test/sun/text/resources/Format/Bug4762201.java b/test/jdk/sun/text/resources/Format/Bug4762201.java similarity index 100% rename from jdk/test/sun/text/resources/Format/Bug4762201.java rename to test/jdk/sun/text/resources/Format/Bug4762201.java diff --git a/jdk/test/sun/text/resources/Format/Bug4807540.java b/test/jdk/sun/text/resources/Format/Bug4807540.java similarity index 100% rename from jdk/test/sun/text/resources/Format/Bug4807540.java rename to test/jdk/sun/text/resources/Format/Bug4807540.java diff --git a/jdk/test/sun/text/resources/Format/Bug4810032.java b/test/jdk/sun/text/resources/Format/Bug4810032.java similarity index 100% rename from jdk/test/sun/text/resources/Format/Bug4810032.java rename to test/jdk/sun/text/resources/Format/Bug4810032.java diff --git a/jdk/test/sun/text/resources/Format/Bug4994312.java b/test/jdk/sun/text/resources/Format/Bug4994312.java similarity index 100% rename from jdk/test/sun/text/resources/Format/Bug4994312.java rename to test/jdk/sun/text/resources/Format/Bug4994312.java diff --git a/jdk/test/sun/text/resources/Format/Bug5096553.java b/test/jdk/sun/text/resources/Format/Bug5096553.java similarity index 100% rename from jdk/test/sun/text/resources/Format/Bug5096553.java rename to test/jdk/sun/text/resources/Format/Bug5096553.java diff --git a/jdk/test/sun/text/resources/Format/Bug8037343.java b/test/jdk/sun/text/resources/Format/Bug8037343.java similarity index 100% rename from jdk/test/sun/text/resources/Format/Bug8037343.java rename to test/jdk/sun/text/resources/Format/Bug8037343.java diff --git a/jdk/test/sun/text/resources/Format/Bug8074791.java b/test/jdk/sun/text/resources/Format/Bug8074791.java similarity index 100% rename from jdk/test/sun/text/resources/Format/Bug8074791.java rename to test/jdk/sun/text/resources/Format/Bug8074791.java diff --git a/jdk/test/sun/text/resources/JavaTimeSupplementaryTest.java b/test/jdk/sun/text/resources/JavaTimeSupplementaryTest.java similarity index 100% rename from jdk/test/sun/text/resources/JavaTimeSupplementaryTest.java rename to test/jdk/sun/text/resources/JavaTimeSupplementaryTest.java diff --git a/jdk/test/sun/text/resources/LocaleData b/test/jdk/sun/text/resources/LocaleData similarity index 100% rename from jdk/test/sun/text/resources/LocaleData rename to test/jdk/sun/text/resources/LocaleData diff --git a/jdk/test/sun/text/resources/LocaleData.cldr b/test/jdk/sun/text/resources/LocaleData.cldr similarity index 100% rename from jdk/test/sun/text/resources/LocaleData.cldr rename to test/jdk/sun/text/resources/LocaleData.cldr diff --git a/jdk/test/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java similarity index 100% rename from jdk/test/sun/text/resources/LocaleDataTest.java rename to test/jdk/sun/text/resources/LocaleDataTest.java diff --git a/jdk/test/sun/tools/java/CFCTest.java b/test/jdk/sun/tools/java/CFCTest.java similarity index 100% rename from jdk/test/sun/tools/java/CFCTest.java rename to test/jdk/sun/tools/java/CFCTest.java diff --git a/jdk/test/sun/tools/jcmd/TEST.properties b/test/jdk/sun/tools/jcmd/TEST.properties similarity index 100% rename from jdk/test/sun/tools/jcmd/TEST.properties rename to test/jdk/sun/tools/jcmd/TEST.properties diff --git a/jdk/test/sun/tools/jcmd/TestJcmdDefaults.java b/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java similarity index 100% rename from jdk/test/sun/tools/jcmd/TestJcmdDefaults.java rename to test/jdk/sun/tools/jcmd/TestJcmdDefaults.java diff --git a/jdk/test/sun/tools/jcmd/TestJcmdSanity.java b/test/jdk/sun/tools/jcmd/TestJcmdSanity.java similarity index 100% rename from jdk/test/sun/tools/jcmd/TestJcmdSanity.java rename to test/jdk/sun/tools/jcmd/TestJcmdSanity.java diff --git a/jdk/test/sun/tools/jcmd/dcmd-big-script.txt b/test/jdk/sun/tools/jcmd/dcmd-big-script.txt similarity index 100% rename from jdk/test/sun/tools/jcmd/dcmd-big-script.txt rename to test/jdk/sun/tools/jcmd/dcmd-big-script.txt diff --git a/jdk/test/sun/tools/jcmd/dcmd-script.txt b/test/jdk/sun/tools/jcmd/dcmd-script.txt similarity index 100% rename from jdk/test/sun/tools/jcmd/dcmd-script.txt rename to test/jdk/sun/tools/jcmd/dcmd-script.txt diff --git a/jdk/test/sun/tools/jcmd/help_help.out b/test/jdk/sun/tools/jcmd/help_help.out similarity index 100% rename from jdk/test/sun/tools/jcmd/help_help.out rename to test/jdk/sun/tools/jcmd/help_help.out diff --git a/jdk/test/sun/tools/jcmd/usage.out b/test/jdk/sun/tools/jcmd/usage.out similarity index 100% rename from jdk/test/sun/tools/jcmd/usage.out rename to test/jdk/sun/tools/jcmd/usage.out diff --git a/jdk/test/sun/tools/jconsole/ResourceCheckTest.java b/test/jdk/sun/tools/jconsole/ResourceCheckTest.java similarity index 100% rename from jdk/test/sun/tools/jconsole/ResourceCheckTest.java rename to test/jdk/sun/tools/jconsole/ResourceCheckTest.java diff --git a/jdk/test/sun/tools/jhsdb/AlternateHashingTest.java b/test/jdk/sun/tools/jhsdb/AlternateHashingTest.java similarity index 100% rename from jdk/test/sun/tools/jhsdb/AlternateHashingTest.java rename to test/jdk/sun/tools/jhsdb/AlternateHashingTest.java diff --git a/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java b/test/jdk/sun/tools/jhsdb/BasicLauncherTest.java similarity index 100% rename from jdk/test/sun/tools/jhsdb/BasicLauncherTest.java rename to test/jdk/sun/tools/jhsdb/BasicLauncherTest.java diff --git a/jdk/test/sun/tools/jhsdb/HeapDumpTest.java b/test/jdk/sun/tools/jhsdb/HeapDumpTest.java similarity index 100% rename from jdk/test/sun/tools/jhsdb/HeapDumpTest.java rename to test/jdk/sun/tools/jhsdb/HeapDumpTest.java diff --git a/jdk/test/sun/tools/jhsdb/LingeredAppWithAltHashing.java b/test/jdk/sun/tools/jhsdb/LingeredAppWithAltHashing.java similarity index 100% rename from jdk/test/sun/tools/jhsdb/LingeredAppWithAltHashing.java rename to test/jdk/sun/tools/jhsdb/LingeredAppWithAltHashing.java diff --git a/jdk/test/sun/tools/jhsdb/LingeredAppWithExtendedChars.java b/test/jdk/sun/tools/jhsdb/LingeredAppWithExtendedChars.java similarity index 100% rename from jdk/test/sun/tools/jhsdb/LingeredAppWithExtendedChars.java rename to test/jdk/sun/tools/jhsdb/LingeredAppWithExtendedChars.java diff --git a/jdk/test/sun/tools/jhsdb/SAGetoptTest.java b/test/jdk/sun/tools/jhsdb/SAGetoptTest.java similarity index 100% rename from jdk/test/sun/tools/jhsdb/SAGetoptTest.java rename to test/jdk/sun/tools/jhsdb/SAGetoptTest.java diff --git a/jdk/test/sun/tools/jhsdb/TEST.properties b/test/jdk/sun/tools/jhsdb/TEST.properties similarity index 100% rename from jdk/test/sun/tools/jhsdb/TEST.properties rename to test/jdk/sun/tools/jhsdb/TEST.properties diff --git a/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java b/test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java similarity index 100% rename from jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java rename to test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java diff --git a/jdk/test/sun/tools/jhsdb/heapconfig/TmtoolTestScenario.java b/test/jdk/sun/tools/jhsdb/heapconfig/TmtoolTestScenario.java similarity index 100% rename from jdk/test/sun/tools/jhsdb/heapconfig/TmtoolTestScenario.java rename to test/jdk/sun/tools/jhsdb/heapconfig/TmtoolTestScenario.java diff --git a/jdk/test/sun/tools/jinfo/BasicJInfoTest.java b/test/jdk/sun/tools/jinfo/BasicJInfoTest.java similarity index 100% rename from jdk/test/sun/tools/jinfo/BasicJInfoTest.java rename to test/jdk/sun/tools/jinfo/BasicJInfoTest.java diff --git a/jdk/test/sun/tools/jinfo/JInfoTest.java b/test/jdk/sun/tools/jinfo/JInfoTest.java similarity index 100% rename from jdk/test/sun/tools/jinfo/JInfoTest.java rename to test/jdk/sun/tools/jinfo/JInfoTest.java diff --git a/jdk/test/sun/tools/jinfo/TEST.properties b/test/jdk/sun/tools/jinfo/TEST.properties similarity index 100% rename from jdk/test/sun/tools/jinfo/TEST.properties rename to test/jdk/sun/tools/jinfo/TEST.properties diff --git a/jdk/test/sun/tools/jmap/BasicJMapTest.java b/test/jdk/sun/tools/jmap/BasicJMapTest.java similarity index 100% rename from jdk/test/sun/tools/jmap/BasicJMapTest.java rename to test/jdk/sun/tools/jmap/BasicJMapTest.java diff --git a/jdk/test/sun/tools/jmap/TEST.properties b/test/jdk/sun/tools/jmap/TEST.properties similarity index 100% rename from jdk/test/sun/tools/jmap/TEST.properties rename to test/jdk/sun/tools/jmap/TEST.properties diff --git a/jdk/test/sun/tools/jps/JpsHelper.java b/test/jdk/sun/tools/jps/JpsHelper.java similarity index 100% rename from jdk/test/sun/tools/jps/JpsHelper.java rename to test/jdk/sun/tools/jps/JpsHelper.java diff --git a/jdk/test/sun/tools/jps/LingeredApp.java b/test/jdk/sun/tools/jps/LingeredApp.java similarity index 100% rename from jdk/test/sun/tools/jps/LingeredApp.java rename to test/jdk/sun/tools/jps/LingeredApp.java diff --git a/jdk/test/sun/tools/jps/LingeredAppForJps.java b/test/jdk/sun/tools/jps/LingeredAppForJps.java similarity index 100% rename from jdk/test/sun/tools/jps/LingeredAppForJps.java rename to test/jdk/sun/tools/jps/LingeredAppForJps.java diff --git a/jdk/test/sun/tools/jps/TestJps.java b/test/jdk/sun/tools/jps/TestJps.java similarity index 100% rename from jdk/test/sun/tools/jps/TestJps.java rename to test/jdk/sun/tools/jps/TestJps.java diff --git a/jdk/test/sun/tools/jps/TestJpsSanity.java b/test/jdk/sun/tools/jps/TestJpsSanity.java similarity index 100% rename from jdk/test/sun/tools/jps/TestJpsSanity.java rename to test/jdk/sun/tools/jps/TestJpsSanity.java diff --git a/jdk/test/sun/tools/jps/usage.out b/test/jdk/sun/tools/jps/usage.out similarity index 100% rename from jdk/test/sun/tools/jps/usage.out rename to test/jdk/sun/tools/jps/usage.out diff --git a/jdk/test/sun/tools/jrunscript/CheckEngine.java b/test/jdk/sun/tools/jrunscript/CheckEngine.java similarity index 100% rename from jdk/test/sun/tools/jrunscript/CheckEngine.java rename to test/jdk/sun/tools/jrunscript/CheckEngine.java diff --git a/jdk/test/sun/tools/jrunscript/Hello.java b/test/jdk/sun/tools/jrunscript/Hello.java similarity index 100% rename from jdk/test/sun/tools/jrunscript/Hello.java rename to test/jdk/sun/tools/jrunscript/Hello.java diff --git a/jdk/test/sun/tools/jrunscript/common.sh b/test/jdk/sun/tools/jrunscript/common.sh similarity index 100% rename from jdk/test/sun/tools/jrunscript/common.sh rename to test/jdk/sun/tools/jrunscript/common.sh diff --git a/jdk/test/sun/tools/jrunscript/dash-e.out b/test/jdk/sun/tools/jrunscript/dash-e.out similarity index 100% rename from jdk/test/sun/tools/jrunscript/dash-e.out rename to test/jdk/sun/tools/jrunscript/dash-e.out diff --git a/jdk/test/sun/tools/jrunscript/dash-f.out b/test/jdk/sun/tools/jrunscript/dash-f.out similarity index 100% rename from jdk/test/sun/tools/jrunscript/dash-f.out rename to test/jdk/sun/tools/jrunscript/dash-f.out diff --git a/jdk/test/sun/tools/jrunscript/hello.js b/test/jdk/sun/tools/jrunscript/hello.js similarity index 100% rename from jdk/test/sun/tools/jrunscript/hello.js rename to test/jdk/sun/tools/jrunscript/hello.js diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-DTest.sh b/test/jdk/sun/tools/jrunscript/jrunscript-DTest.sh similarity index 100% rename from jdk/test/sun/tools/jrunscript/jrunscript-DTest.sh rename to test/jdk/sun/tools/jrunscript/jrunscript-DTest.sh diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh b/test/jdk/sun/tools/jrunscript/jrunscript-argsTest.sh similarity index 100% rename from jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh rename to test/jdk/sun/tools/jrunscript/jrunscript-argsTest.sh diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-cpTest.sh b/test/jdk/sun/tools/jrunscript/jrunscript-cpTest.sh similarity index 100% rename from jdk/test/sun/tools/jrunscript/jrunscript-cpTest.sh rename to test/jdk/sun/tools/jrunscript/jrunscript-cpTest.sh diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh b/test/jdk/sun/tools/jrunscript/jrunscript-eTest.sh similarity index 100% rename from jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh rename to test/jdk/sun/tools/jrunscript/jrunscript-eTest.sh diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh b/test/jdk/sun/tools/jrunscript/jrunscript-fTest.sh similarity index 100% rename from jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh rename to test/jdk/sun/tools/jrunscript/jrunscript-fTest.sh diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-helpTest.sh b/test/jdk/sun/tools/jrunscript/jrunscript-helpTest.sh similarity index 100% rename from jdk/test/sun/tools/jrunscript/jrunscript-helpTest.sh rename to test/jdk/sun/tools/jrunscript/jrunscript-helpTest.sh diff --git a/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh b/test/jdk/sun/tools/jrunscript/jrunscriptTest.sh similarity index 100% rename from jdk/test/sun/tools/jrunscript/jrunscriptTest.sh rename to test/jdk/sun/tools/jrunscript/jrunscriptTest.sh diff --git a/jdk/test/sun/tools/jrunscript/repl.out b/test/jdk/sun/tools/jrunscript/repl.out similarity index 100% rename from jdk/test/sun/tools/jrunscript/repl.out rename to test/jdk/sun/tools/jrunscript/repl.out diff --git a/jdk/test/sun/tools/jstack/BasicJStackTest.java b/test/jdk/sun/tools/jstack/BasicJStackTest.java similarity index 100% rename from jdk/test/sun/tools/jstack/BasicJStackTest.java rename to test/jdk/sun/tools/jstack/BasicJStackTest.java diff --git a/jdk/test/sun/tools/jstack/DeadlockDetectionTest.java b/test/jdk/sun/tools/jstack/DeadlockDetectionTest.java similarity index 100% rename from jdk/test/sun/tools/jstack/DeadlockDetectionTest.java rename to test/jdk/sun/tools/jstack/DeadlockDetectionTest.java diff --git a/jdk/test/sun/tools/jstack/TEST.properties b/test/jdk/sun/tools/jstack/TEST.properties similarity index 100% rename from jdk/test/sun/tools/jstack/TEST.properties rename to test/jdk/sun/tools/jstack/TEST.properties diff --git a/jdk/test/sun/tools/jstat/JStatInterval.java b/test/jdk/sun/tools/jstat/JStatInterval.java similarity index 100% rename from jdk/test/sun/tools/jstat/JStatInterval.java rename to test/jdk/sun/tools/jstat/JStatInterval.java diff --git a/jdk/test/sun/tools/jstat/TEST.properties b/test/jdk/sun/tools/jstat/TEST.properties similarity index 100% rename from jdk/test/sun/tools/jstat/TEST.properties rename to test/jdk/sun/tools/jstat/TEST.properties diff --git a/jdk/test/sun/tools/jstat/classOutput1.awk b/test/jdk/sun/tools/jstat/classOutput1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/classOutput1.awk rename to test/jdk/sun/tools/jstat/classOutput1.awk diff --git a/jdk/test/sun/tools/jstat/classloadOutput1.awk b/test/jdk/sun/tools/jstat/classloadOutput1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/classloadOutput1.awk rename to test/jdk/sun/tools/jstat/classloadOutput1.awk diff --git a/jdk/test/sun/tools/jstat/compilerOutput1.awk b/test/jdk/sun/tools/jstat/compilerOutput1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/compilerOutput1.awk rename to test/jdk/sun/tools/jstat/compilerOutput1.awk diff --git a/jdk/test/sun/tools/jstat/fileURITest1.awk b/test/jdk/sun/tools/jstat/fileURITest1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/fileURITest1.awk rename to test/jdk/sun/tools/jstat/fileURITest1.awk diff --git a/jdk/test/sun/tools/jstat/gcCapacityOutput1.awk b/test/jdk/sun/tools/jstat/gcCapacityOutput1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/gcCapacityOutput1.awk rename to test/jdk/sun/tools/jstat/gcCapacityOutput1.awk diff --git a/jdk/test/sun/tools/jstat/gcCauseOutput1.awk b/test/jdk/sun/tools/jstat/gcCauseOutput1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/gcCauseOutput1.awk rename to test/jdk/sun/tools/jstat/gcCauseOutput1.awk diff --git a/jdk/test/sun/tools/jstat/gcMetaCapacityOutput1.awk b/test/jdk/sun/tools/jstat/gcMetaCapacityOutput1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/gcMetaCapacityOutput1.awk rename to test/jdk/sun/tools/jstat/gcMetaCapacityOutput1.awk diff --git a/jdk/test/sun/tools/jstat/gcNewCapacityOutput1.awk b/test/jdk/sun/tools/jstat/gcNewCapacityOutput1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/gcNewCapacityOutput1.awk rename to test/jdk/sun/tools/jstat/gcNewCapacityOutput1.awk diff --git a/jdk/test/sun/tools/jstat/gcNewOutput1.awk b/test/jdk/sun/tools/jstat/gcNewOutput1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/gcNewOutput1.awk rename to test/jdk/sun/tools/jstat/gcNewOutput1.awk diff --git a/jdk/test/sun/tools/jstat/gcOldCapacityOutput1.awk b/test/jdk/sun/tools/jstat/gcOldCapacityOutput1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/gcOldCapacityOutput1.awk rename to test/jdk/sun/tools/jstat/gcOldCapacityOutput1.awk diff --git a/jdk/test/sun/tools/jstat/gcOldOutput1.awk b/test/jdk/sun/tools/jstat/gcOldOutput1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/gcOldOutput1.awk rename to test/jdk/sun/tools/jstat/gcOldOutput1.awk diff --git a/jdk/test/sun/tools/jstat/gcOutput1.awk b/test/jdk/sun/tools/jstat/gcOutput1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/gcOutput1.awk rename to test/jdk/sun/tools/jstat/gcOutput1.awk diff --git a/jdk/test/sun/tools/jstat/hsperfdata_3433 b/test/jdk/sun/tools/jstat/hsperfdata_3433 similarity index 100% rename from jdk/test/sun/tools/jstat/hsperfdata_3433 rename to test/jdk/sun/tools/jstat/hsperfdata_3433 diff --git a/jdk/test/sun/tools/jstat/jstatClassOutput1.sh b/test/jdk/sun/tools/jstat/jstatClassOutput1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatClassOutput1.sh rename to test/jdk/sun/tools/jstat/jstatClassOutput1.sh diff --git a/jdk/test/sun/tools/jstat/jstatClassloadOutput1.sh b/test/jdk/sun/tools/jstat/jstatClassloadOutput1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatClassloadOutput1.sh rename to test/jdk/sun/tools/jstat/jstatClassloadOutput1.sh diff --git a/jdk/test/sun/tools/jstat/jstatCompilerOutput1.sh b/test/jdk/sun/tools/jstat/jstatCompilerOutput1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatCompilerOutput1.sh rename to test/jdk/sun/tools/jstat/jstatCompilerOutput1.sh diff --git a/jdk/test/sun/tools/jstat/jstatFileURITest1.sh b/test/jdk/sun/tools/jstat/jstatFileURITest1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatFileURITest1.sh rename to test/jdk/sun/tools/jstat/jstatFileURITest1.sh diff --git a/jdk/test/sun/tools/jstat/jstatGcCapacityOutput1.sh b/test/jdk/sun/tools/jstat/jstatGcCapacityOutput1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatGcCapacityOutput1.sh rename to test/jdk/sun/tools/jstat/jstatGcCapacityOutput1.sh diff --git a/jdk/test/sun/tools/jstat/jstatGcCauseOutput1.sh b/test/jdk/sun/tools/jstat/jstatGcCauseOutput1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatGcCauseOutput1.sh rename to test/jdk/sun/tools/jstat/jstatGcCauseOutput1.sh diff --git a/jdk/test/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh b/test/jdk/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh rename to test/jdk/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh diff --git a/jdk/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh b/test/jdk/sun/tools/jstat/jstatGcNewCapacityOutput1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh rename to test/jdk/sun/tools/jstat/jstatGcNewCapacityOutput1.sh diff --git a/jdk/test/sun/tools/jstat/jstatGcNewOutput1.sh b/test/jdk/sun/tools/jstat/jstatGcNewOutput1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatGcNewOutput1.sh rename to test/jdk/sun/tools/jstat/jstatGcNewOutput1.sh diff --git a/jdk/test/sun/tools/jstat/jstatGcOldCapacityOutput1.sh b/test/jdk/sun/tools/jstat/jstatGcOldCapacityOutput1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatGcOldCapacityOutput1.sh rename to test/jdk/sun/tools/jstat/jstatGcOldCapacityOutput1.sh diff --git a/jdk/test/sun/tools/jstat/jstatGcOldOutput1.sh b/test/jdk/sun/tools/jstat/jstatGcOldOutput1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatGcOldOutput1.sh rename to test/jdk/sun/tools/jstat/jstatGcOldOutput1.sh diff --git a/jdk/test/sun/tools/jstat/jstatGcOutput1.sh b/test/jdk/sun/tools/jstat/jstatGcOutput1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatGcOutput1.sh rename to test/jdk/sun/tools/jstat/jstatGcOutput1.sh diff --git a/jdk/test/sun/tools/jstat/jstatHelp.sh b/test/jdk/sun/tools/jstat/jstatHelp.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatHelp.sh rename to test/jdk/sun/tools/jstat/jstatHelp.sh diff --git a/jdk/test/sun/tools/jstat/jstatLineCounts1.sh b/test/jdk/sun/tools/jstat/jstatLineCounts1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatLineCounts1.sh rename to test/jdk/sun/tools/jstat/jstatLineCounts1.sh diff --git a/jdk/test/sun/tools/jstat/jstatLineCounts2.sh b/test/jdk/sun/tools/jstat/jstatLineCounts2.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatLineCounts2.sh rename to test/jdk/sun/tools/jstat/jstatLineCounts2.sh diff --git a/jdk/test/sun/tools/jstat/jstatLineCounts3.sh b/test/jdk/sun/tools/jstat/jstatLineCounts3.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatLineCounts3.sh rename to test/jdk/sun/tools/jstat/jstatLineCounts3.sh diff --git a/jdk/test/sun/tools/jstat/jstatLineCounts4.sh b/test/jdk/sun/tools/jstat/jstatLineCounts4.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatLineCounts4.sh rename to test/jdk/sun/tools/jstat/jstatLineCounts4.sh diff --git a/jdk/test/sun/tools/jstat/jstatOptions1.sh b/test/jdk/sun/tools/jstat/jstatOptions1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatOptions1.sh rename to test/jdk/sun/tools/jstat/jstatOptions1.sh diff --git a/jdk/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh b/test/jdk/sun/tools/jstat/jstatPrintCompilationOutput1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh rename to test/jdk/sun/tools/jstat/jstatPrintCompilationOutput1.sh diff --git a/jdk/test/sun/tools/jstat/jstatSnap1.sh b/test/jdk/sun/tools/jstat/jstatSnap1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatSnap1.sh rename to test/jdk/sun/tools/jstat/jstatSnap1.sh diff --git a/jdk/test/sun/tools/jstat/jstatSnap2.sh b/test/jdk/sun/tools/jstat/jstatSnap2.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatSnap2.sh rename to test/jdk/sun/tools/jstat/jstatSnap2.sh diff --git a/jdk/test/sun/tools/jstat/jstatTimeStamp1.sh b/test/jdk/sun/tools/jstat/jstatTimeStamp1.sh similarity index 100% rename from jdk/test/sun/tools/jstat/jstatTimeStamp1.sh rename to test/jdk/sun/tools/jstat/jstatTimeStamp1.sh diff --git a/jdk/test/sun/tools/jstat/lineCounts1.awk b/test/jdk/sun/tools/jstat/lineCounts1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/lineCounts1.awk rename to test/jdk/sun/tools/jstat/lineCounts1.awk diff --git a/jdk/test/sun/tools/jstat/lineCounts2.awk b/test/jdk/sun/tools/jstat/lineCounts2.awk similarity index 100% rename from jdk/test/sun/tools/jstat/lineCounts2.awk rename to test/jdk/sun/tools/jstat/lineCounts2.awk diff --git a/jdk/test/sun/tools/jstat/lineCounts3.awk b/test/jdk/sun/tools/jstat/lineCounts3.awk similarity index 100% rename from jdk/test/sun/tools/jstat/lineCounts3.awk rename to test/jdk/sun/tools/jstat/lineCounts3.awk diff --git a/jdk/test/sun/tools/jstat/lineCounts4.awk b/test/jdk/sun/tools/jstat/lineCounts4.awk similarity index 100% rename from jdk/test/sun/tools/jstat/lineCounts4.awk rename to test/jdk/sun/tools/jstat/lineCounts4.awk diff --git a/jdk/test/sun/tools/jstat/options1.out b/test/jdk/sun/tools/jstat/options1.out similarity index 100% rename from jdk/test/sun/tools/jstat/options1.out rename to test/jdk/sun/tools/jstat/options1.out diff --git a/jdk/test/sun/tools/jstat/options2.out b/test/jdk/sun/tools/jstat/options2.out similarity index 100% rename from jdk/test/sun/tools/jstat/options2.out rename to test/jdk/sun/tools/jstat/options2.out diff --git a/jdk/test/sun/tools/jstat/printCompilationOutput1.awk b/test/jdk/sun/tools/jstat/printCompilationOutput1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/printCompilationOutput1.awk rename to test/jdk/sun/tools/jstat/printCompilationOutput1.awk diff --git a/jdk/test/sun/tools/jstat/snap1.awk b/test/jdk/sun/tools/jstat/snap1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/snap1.awk rename to test/jdk/sun/tools/jstat/snap1.awk diff --git a/jdk/test/sun/tools/jstat/snap2.awk b/test/jdk/sun/tools/jstat/snap2.awk similarity index 100% rename from jdk/test/sun/tools/jstat/snap2.awk rename to test/jdk/sun/tools/jstat/snap2.awk diff --git a/jdk/test/sun/tools/jstat/timeStamp1.awk b/test/jdk/sun/tools/jstat/timeStamp1.awk similarity index 100% rename from jdk/test/sun/tools/jstat/timeStamp1.awk rename to test/jdk/sun/tools/jstat/timeStamp1.awk diff --git a/jdk/test/sun/tools/jstat/usage.out b/test/jdk/sun/tools/jstat/usage.out similarity index 100% rename from jdk/test/sun/tools/jstat/usage.out rename to test/jdk/sun/tools/jstat/usage.out diff --git a/jdk/test/sun/tools/jstatd/JstatGCUtilParser.java b/test/jdk/sun/tools/jstatd/JstatGCUtilParser.java similarity index 100% rename from jdk/test/sun/tools/jstatd/JstatGCUtilParser.java rename to test/jdk/sun/tools/jstatd/JstatGCUtilParser.java diff --git a/jdk/test/sun/tools/jstatd/JstatdTest.java b/test/jdk/sun/tools/jstatd/JstatdTest.java similarity index 100% rename from jdk/test/sun/tools/jstatd/JstatdTest.java rename to test/jdk/sun/tools/jstatd/JstatdTest.java diff --git a/jdk/test/sun/tools/jstatd/TEST.properties b/test/jdk/sun/tools/jstatd/TEST.properties similarity index 100% rename from jdk/test/sun/tools/jstatd/TEST.properties rename to test/jdk/sun/tools/jstatd/TEST.properties diff --git a/jdk/test/sun/tools/jstatd/TestJstatdDefaults.java b/test/jdk/sun/tools/jstatd/TestJstatdDefaults.java similarity index 100% rename from jdk/test/sun/tools/jstatd/TestJstatdDefaults.java rename to test/jdk/sun/tools/jstatd/TestJstatdDefaults.java diff --git a/jdk/test/sun/tools/jstatd/TestJstatdExternalRegistry.java b/test/jdk/sun/tools/jstatd/TestJstatdExternalRegistry.java similarity index 100% rename from jdk/test/sun/tools/jstatd/TestJstatdExternalRegistry.java rename to test/jdk/sun/tools/jstatd/TestJstatdExternalRegistry.java diff --git a/jdk/test/sun/tools/jstatd/TestJstatdPort.java b/test/jdk/sun/tools/jstatd/TestJstatdPort.java similarity index 100% rename from jdk/test/sun/tools/jstatd/TestJstatdPort.java rename to test/jdk/sun/tools/jstatd/TestJstatdPort.java diff --git a/jdk/test/sun/tools/jstatd/TestJstatdPortAndServer.java b/test/jdk/sun/tools/jstatd/TestJstatdPortAndServer.java similarity index 100% rename from jdk/test/sun/tools/jstatd/TestJstatdPortAndServer.java rename to test/jdk/sun/tools/jstatd/TestJstatdPortAndServer.java diff --git a/jdk/test/sun/tools/jstatd/TestJstatdServer.java b/test/jdk/sun/tools/jstatd/TestJstatdServer.java similarity index 100% rename from jdk/test/sun/tools/jstatd/TestJstatdServer.java rename to test/jdk/sun/tools/jstatd/TestJstatdServer.java diff --git a/jdk/test/sun/tools/jstatd/TestJstatdUsage.java b/test/jdk/sun/tools/jstatd/TestJstatdUsage.java similarity index 100% rename from jdk/test/sun/tools/jstatd/TestJstatdUsage.java rename to test/jdk/sun/tools/jstatd/TestJstatdUsage.java diff --git a/jdk/test/sun/tools/jstatd/all.policy b/test/jdk/sun/tools/jstatd/all.policy similarity index 100% rename from jdk/test/sun/tools/jstatd/all.policy rename to test/jdk/sun/tools/jstatd/all.policy diff --git a/jdk/test/sun/util/calendar/Bug6653944.java b/test/jdk/sun/util/calendar/Bug6653944.java similarity index 100% rename from jdk/test/sun/util/calendar/Bug6653944.java rename to test/jdk/sun/util/calendar/Bug6653944.java diff --git a/jdk/test/sun/util/calendar/Bug8176160.java b/test/jdk/sun/util/calendar/Bug8176160.java similarity index 100% rename from jdk/test/sun/util/calendar/Bug8176160.java rename to test/jdk/sun/util/calendar/Bug8176160.java diff --git a/jdk/test/sun/util/calendar/zi/BackEnd.java b/test/jdk/sun/util/calendar/zi/BackEnd.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/BackEnd.java rename to test/jdk/sun/util/calendar/zi/BackEnd.java diff --git a/jdk/test/sun/util/calendar/zi/Checksum.java b/test/jdk/sun/util/calendar/zi/Checksum.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/Checksum.java rename to test/jdk/sun/util/calendar/zi/Checksum.java diff --git a/jdk/test/sun/util/calendar/zi/DayOfWeek.java b/test/jdk/sun/util/calendar/zi/DayOfWeek.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/DayOfWeek.java rename to test/jdk/sun/util/calendar/zi/DayOfWeek.java diff --git a/jdk/test/sun/util/calendar/zi/Gen.java b/test/jdk/sun/util/calendar/zi/Gen.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/Gen.java rename to test/jdk/sun/util/calendar/zi/Gen.java diff --git a/jdk/test/sun/util/calendar/zi/GenDoc.java b/test/jdk/sun/util/calendar/zi/GenDoc.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/GenDoc.java rename to test/jdk/sun/util/calendar/zi/GenDoc.java diff --git a/jdk/test/sun/util/calendar/zi/Main.java b/test/jdk/sun/util/calendar/zi/Main.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/Main.java rename to test/jdk/sun/util/calendar/zi/Main.java diff --git a/jdk/test/sun/util/calendar/zi/Mappings.java b/test/jdk/sun/util/calendar/zi/Mappings.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/Mappings.java rename to test/jdk/sun/util/calendar/zi/Mappings.java diff --git a/jdk/test/sun/util/calendar/zi/Month.java b/test/jdk/sun/util/calendar/zi/Month.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/Month.java rename to test/jdk/sun/util/calendar/zi/Month.java diff --git a/jdk/test/sun/util/calendar/zi/Rule.java b/test/jdk/sun/util/calendar/zi/Rule.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/Rule.java rename to test/jdk/sun/util/calendar/zi/Rule.java diff --git a/jdk/test/sun/util/calendar/zi/RuleDay.java b/test/jdk/sun/util/calendar/zi/RuleDay.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/RuleDay.java rename to test/jdk/sun/util/calendar/zi/RuleDay.java diff --git a/jdk/test/sun/util/calendar/zi/RuleRec.java b/test/jdk/sun/util/calendar/zi/RuleRec.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/RuleRec.java rename to test/jdk/sun/util/calendar/zi/RuleRec.java diff --git a/jdk/test/sun/util/calendar/zi/Simple.java b/test/jdk/sun/util/calendar/zi/Simple.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/Simple.java rename to test/jdk/sun/util/calendar/zi/Simple.java diff --git a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java b/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/TestZoneInfo310.java rename to test/jdk/sun/util/calendar/zi/TestZoneInfo310.java diff --git a/jdk/test/sun/util/calendar/zi/Time.java b/test/jdk/sun/util/calendar/zi/Time.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/Time.java rename to test/jdk/sun/util/calendar/zi/Time.java diff --git a/jdk/test/sun/util/calendar/zi/Timezone.java b/test/jdk/sun/util/calendar/zi/Timezone.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/Timezone.java rename to test/jdk/sun/util/calendar/zi/Timezone.java diff --git a/jdk/test/sun/util/calendar/zi/TzIDOldMapping.java b/test/jdk/sun/util/calendar/zi/TzIDOldMapping.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/TzIDOldMapping.java rename to test/jdk/sun/util/calendar/zi/TzIDOldMapping.java diff --git a/jdk/test/sun/util/calendar/zi/Zone.java b/test/jdk/sun/util/calendar/zi/Zone.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/Zone.java rename to test/jdk/sun/util/calendar/zi/Zone.java diff --git a/jdk/test/sun/util/calendar/zi/ZoneInfoFile.java b/test/jdk/sun/util/calendar/zi/ZoneInfoFile.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/ZoneInfoFile.java rename to test/jdk/sun/util/calendar/zi/ZoneInfoFile.java diff --git a/jdk/test/sun/util/calendar/zi/ZoneInfoOld.java b/test/jdk/sun/util/calendar/zi/ZoneInfoOld.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/ZoneInfoOld.java rename to test/jdk/sun/util/calendar/zi/ZoneInfoOld.java diff --git a/jdk/test/sun/util/calendar/zi/ZoneRec.java b/test/jdk/sun/util/calendar/zi/ZoneRec.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/ZoneRec.java rename to test/jdk/sun/util/calendar/zi/ZoneRec.java diff --git a/jdk/test/sun/util/calendar/zi/Zoneinfo.java b/test/jdk/sun/util/calendar/zi/Zoneinfo.java similarity index 100% rename from jdk/test/sun/util/calendar/zi/Zoneinfo.java rename to test/jdk/sun/util/calendar/zi/Zoneinfo.java diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/test/jdk/sun/util/calendar/zi/tzdata/VERSION similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/VERSION rename to test/jdk/sun/util/calendar/zi/tzdata/VERSION diff --git a/jdk/test/sun/util/calendar/zi/tzdata/africa b/test/jdk/sun/util/calendar/zi/tzdata/africa similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/africa rename to test/jdk/sun/util/calendar/zi/tzdata/africa diff --git a/jdk/test/sun/util/calendar/zi/tzdata/antarctica b/test/jdk/sun/util/calendar/zi/tzdata/antarctica similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/antarctica rename to test/jdk/sun/util/calendar/zi/tzdata/antarctica diff --git a/jdk/test/sun/util/calendar/zi/tzdata/asia b/test/jdk/sun/util/calendar/zi/tzdata/asia similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/asia rename to test/jdk/sun/util/calendar/zi/tzdata/asia diff --git a/jdk/test/sun/util/calendar/zi/tzdata/australasia b/test/jdk/sun/util/calendar/zi/tzdata/australasia similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/australasia rename to test/jdk/sun/util/calendar/zi/tzdata/australasia diff --git a/jdk/test/sun/util/calendar/zi/tzdata/backward b/test/jdk/sun/util/calendar/zi/tzdata/backward similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/backward rename to test/jdk/sun/util/calendar/zi/tzdata/backward diff --git a/jdk/test/sun/util/calendar/zi/tzdata/etcetera b/test/jdk/sun/util/calendar/zi/tzdata/etcetera similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/etcetera rename to test/jdk/sun/util/calendar/zi/tzdata/etcetera diff --git a/jdk/test/sun/util/calendar/zi/tzdata/europe b/test/jdk/sun/util/calendar/zi/tzdata/europe similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/europe rename to test/jdk/sun/util/calendar/zi/tzdata/europe diff --git a/jdk/test/sun/util/calendar/zi/tzdata/factory b/test/jdk/sun/util/calendar/zi/tzdata/factory similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/factory rename to test/jdk/sun/util/calendar/zi/tzdata/factory diff --git a/jdk/test/sun/util/calendar/zi/tzdata/gmt b/test/jdk/sun/util/calendar/zi/tzdata/gmt similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/gmt rename to test/jdk/sun/util/calendar/zi/tzdata/gmt diff --git a/jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab b/test/jdk/sun/util/calendar/zi/tzdata/iso3166.tab similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab rename to test/jdk/sun/util/calendar/zi/tzdata/iso3166.tab diff --git a/jdk/test/sun/util/calendar/zi/tzdata/jdk11_backward b/test/jdk/sun/util/calendar/zi/tzdata/jdk11_backward similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/jdk11_backward rename to test/jdk/sun/util/calendar/zi/tzdata/jdk11_backward diff --git a/jdk/test/sun/util/calendar/zi/tzdata/leapseconds b/test/jdk/sun/util/calendar/zi/tzdata/leapseconds similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/leapseconds rename to test/jdk/sun/util/calendar/zi/tzdata/leapseconds diff --git a/jdk/test/sun/util/calendar/zi/tzdata/northamerica b/test/jdk/sun/util/calendar/zi/tzdata/northamerica similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/northamerica rename to test/jdk/sun/util/calendar/zi/tzdata/northamerica diff --git a/jdk/test/sun/util/calendar/zi/tzdata/pacificnew b/test/jdk/sun/util/calendar/zi/tzdata/pacificnew similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/pacificnew rename to test/jdk/sun/util/calendar/zi/tzdata/pacificnew diff --git a/jdk/test/sun/util/calendar/zi/tzdata/solar87 b/test/jdk/sun/util/calendar/zi/tzdata/solar87 similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/solar87 rename to test/jdk/sun/util/calendar/zi/tzdata/solar87 diff --git a/jdk/test/sun/util/calendar/zi/tzdata/solar88 b/test/jdk/sun/util/calendar/zi/tzdata/solar88 similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/solar88 rename to test/jdk/sun/util/calendar/zi/tzdata/solar88 diff --git a/jdk/test/sun/util/calendar/zi/tzdata/solar89 b/test/jdk/sun/util/calendar/zi/tzdata/solar89 similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/solar89 rename to test/jdk/sun/util/calendar/zi/tzdata/solar89 diff --git a/jdk/test/sun/util/calendar/zi/tzdata/southamerica b/test/jdk/sun/util/calendar/zi/tzdata/southamerica similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/southamerica rename to test/jdk/sun/util/calendar/zi/tzdata/southamerica diff --git a/jdk/test/sun/util/calendar/zi/tzdata/systemv b/test/jdk/sun/util/calendar/zi/tzdata/systemv similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/systemv rename to test/jdk/sun/util/calendar/zi/tzdata/systemv diff --git a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab b/test/jdk/sun/util/calendar/zi/tzdata/zone.tab similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata/zone.tab rename to test/jdk/sun/util/calendar/zi/tzdata/zone.tab diff --git a/jdk/test/sun/util/calendar/zi/tzdata_jdk/gmt b/test/jdk/sun/util/calendar/zi/tzdata_jdk/gmt similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata_jdk/gmt rename to test/jdk/sun/util/calendar/zi/tzdata_jdk/gmt diff --git a/jdk/test/sun/util/calendar/zi/tzdata_jdk/jdk11_backward b/test/jdk/sun/util/calendar/zi/tzdata_jdk/jdk11_backward similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata_jdk/jdk11_backward rename to test/jdk/sun/util/calendar/zi/tzdata_jdk/jdk11_backward diff --git a/jdk/test/sun/util/calendar/zi/tzdata_jdk/jdk11_full_backward b/test/jdk/sun/util/calendar/zi/tzdata_jdk/jdk11_full_backward similarity index 100% rename from jdk/test/sun/util/calendar/zi/tzdata_jdk/jdk11_full_backward rename to test/jdk/sun/util/calendar/zi/tzdata_jdk/jdk11_full_backward diff --git a/jdk/test/sun/util/locale/provider/Bug8024141.java b/test/jdk/sun/util/locale/provider/Bug8024141.java similarity index 100% rename from jdk/test/sun/util/locale/provider/Bug8024141.java rename to test/jdk/sun/util/locale/provider/Bug8024141.java diff --git a/jdk/test/sun/util/locale/provider/Bug8038436.java b/test/jdk/sun/util/locale/provider/Bug8038436.java similarity index 100% rename from jdk/test/sun/util/locale/provider/Bug8038436.java rename to test/jdk/sun/util/locale/provider/Bug8038436.java diff --git a/jdk/test/sun/util/locale/provider/Bug8152817.java b/test/jdk/sun/util/locale/provider/Bug8152817.java similarity index 100% rename from jdk/test/sun/util/locale/provider/Bug8152817.java rename to test/jdk/sun/util/locale/provider/Bug8152817.java diff --git a/jdk/test/sun/util/locale/provider/Bug8163350.java b/test/jdk/sun/util/locale/provider/Bug8163350.java similarity index 100% rename from jdk/test/sun/util/locale/provider/Bug8163350.java rename to test/jdk/sun/util/locale/provider/Bug8163350.java diff --git a/jdk/test/sun/util/logging/PlatformLoggerTest.java b/test/jdk/sun/util/logging/PlatformLoggerTest.java similarity index 100% rename from jdk/test/sun/util/logging/PlatformLoggerTest.java rename to test/jdk/sun/util/logging/PlatformLoggerTest.java diff --git a/jdk/test/sun/util/logging/SourceClassName.java b/test/jdk/sun/util/logging/SourceClassName.java similarity index 100% rename from jdk/test/sun/util/logging/SourceClassName.java rename to test/jdk/sun/util/logging/SourceClassName.java diff --git a/jdk/test/sun/util/resources/Calendar/Bug4518811.java b/test/jdk/sun/util/resources/Calendar/Bug4518811.java similarity index 100% rename from jdk/test/sun/util/resources/Calendar/Bug4518811.java rename to test/jdk/sun/util/resources/Calendar/Bug4518811.java diff --git a/jdk/test/sun/util/resources/Calendar/Bug4527203.java b/test/jdk/sun/util/resources/Calendar/Bug4527203.java similarity index 100% rename from jdk/test/sun/util/resources/Calendar/Bug4527203.java rename to test/jdk/sun/util/resources/Calendar/Bug4527203.java diff --git a/jdk/test/sun/util/resources/Locale/Bug4429024.java b/test/jdk/sun/util/resources/Locale/Bug4429024.java similarity index 100% rename from jdk/test/sun/util/resources/Locale/Bug4429024.java rename to test/jdk/sun/util/resources/Locale/Bug4429024.java diff --git a/jdk/test/sun/util/resources/Locale/Bug4965260.java b/test/jdk/sun/util/resources/Locale/Bug4965260.java similarity index 100% rename from jdk/test/sun/util/resources/Locale/Bug4965260.java rename to test/jdk/sun/util/resources/Locale/Bug4965260.java diff --git a/jdk/test/sun/util/resources/Locale/Bug6275682.java b/test/jdk/sun/util/resources/Locale/Bug6275682.java similarity index 100% rename from jdk/test/sun/util/resources/Locale/Bug6275682.java rename to test/jdk/sun/util/resources/Locale/Bug6275682.java diff --git a/jdk/test/sun/util/resources/TimeZone/Bug4640234.java b/test/jdk/sun/util/resources/TimeZone/Bug4640234.java similarity index 100% rename from jdk/test/sun/util/resources/TimeZone/Bug4640234.java rename to test/jdk/sun/util/resources/TimeZone/Bug4640234.java diff --git a/jdk/test/sun/util/resources/TimeZone/Bug4848242.java b/test/jdk/sun/util/resources/TimeZone/Bug4848242.java similarity index 100% rename from jdk/test/sun/util/resources/TimeZone/Bug4848242.java rename to test/jdk/sun/util/resources/TimeZone/Bug4848242.java diff --git a/jdk/test/sun/util/resources/TimeZone/Bug4858517.java b/test/jdk/sun/util/resources/TimeZone/Bug4858517.java similarity index 100% rename from jdk/test/sun/util/resources/TimeZone/Bug4858517.java rename to test/jdk/sun/util/resources/TimeZone/Bug4858517.java diff --git a/jdk/test/sun/util/resources/TimeZone/Bug4938846.java b/test/jdk/sun/util/resources/TimeZone/Bug4938846.java similarity index 100% rename from jdk/test/sun/util/resources/TimeZone/Bug4938846.java rename to test/jdk/sun/util/resources/TimeZone/Bug4938846.java diff --git a/jdk/test/sun/util/resources/TimeZone/Bug6271396.java b/test/jdk/sun/util/resources/TimeZone/Bug6271396.java similarity index 100% rename from jdk/test/sun/util/resources/TimeZone/Bug6271396.java rename to test/jdk/sun/util/resources/TimeZone/Bug6271396.java diff --git a/jdk/test/sun/util/resources/TimeZone/Bug6317929.java b/test/jdk/sun/util/resources/TimeZone/Bug6317929.java similarity index 100% rename from jdk/test/sun/util/resources/TimeZone/Bug6317929.java rename to test/jdk/sun/util/resources/TimeZone/Bug6317929.java diff --git a/jdk/test/sun/util/resources/TimeZone/Bug6377794.java b/test/jdk/sun/util/resources/TimeZone/Bug6377794.java similarity index 100% rename from jdk/test/sun/util/resources/TimeZone/Bug6377794.java rename to test/jdk/sun/util/resources/TimeZone/Bug6377794.java diff --git a/jdk/test/sun/util/resources/TimeZone/Bug6442006.java b/test/jdk/sun/util/resources/TimeZone/Bug6442006.java similarity index 100% rename from jdk/test/sun/util/resources/TimeZone/Bug6442006.java rename to test/jdk/sun/util/resources/TimeZone/Bug6442006.java diff --git a/jdk/test/sun/util/resources/TimeZone/Bug8139107.java b/test/jdk/sun/util/resources/TimeZone/Bug8139107.java similarity index 100% rename from jdk/test/sun/util/resources/TimeZone/Bug8139107.java rename to test/jdk/sun/util/resources/TimeZone/Bug8139107.java diff --git a/jdk/test/sun/util/resources/TimeZone/IntlTest.java b/test/jdk/sun/util/resources/TimeZone/IntlTest.java similarity index 100% rename from jdk/test/sun/util/resources/TimeZone/IntlTest.java rename to test/jdk/sun/util/resources/TimeZone/IntlTest.java diff --git a/jdk/test/sun/util/resources/cldr/Bug8134250.java b/test/jdk/sun/util/resources/cldr/Bug8134250.java similarity index 100% rename from jdk/test/sun/util/resources/cldr/Bug8134250.java rename to test/jdk/sun/util/resources/cldr/Bug8134250.java diff --git a/jdk/test/sun/util/resources/cldr/Bug8134384.java b/test/jdk/sun/util/resources/cldr/Bug8134384.java similarity index 100% rename from jdk/test/sun/util/resources/cldr/Bug8134384.java rename to test/jdk/sun/util/resources/cldr/Bug8134384.java diff --git a/jdk/test/sun/util/resources/cldr/Bug8145136.java b/test/jdk/sun/util/resources/cldr/Bug8145136.java similarity index 100% rename from jdk/test/sun/util/resources/cldr/Bug8145136.java rename to test/jdk/sun/util/resources/cldr/Bug8145136.java diff --git a/jdk/test/tools/jar/ChangeDir.java b/test/jdk/tools/jar/ChangeDir.java similarity index 100% rename from jdk/test/tools/jar/ChangeDir.java rename to test/jdk/tools/jar/ChangeDir.java diff --git a/jdk/test/tools/jar/InputFilesTest.java b/test/jdk/tools/jar/InputFilesTest.java similarity index 100% rename from jdk/test/tools/jar/InputFilesTest.java rename to test/jdk/tools/jar/InputFilesTest.java diff --git a/jdk/test/tools/jar/JarBackSlash.java b/test/jdk/tools/jar/JarBackSlash.java similarity index 100% rename from jdk/test/tools/jar/JarBackSlash.java rename to test/jdk/tools/jar/JarBackSlash.java diff --git a/jdk/test/tools/jar/JarEntryTime.java b/test/jdk/tools/jar/JarEntryTime.java similarity index 100% rename from jdk/test/tools/jar/JarEntryTime.java rename to test/jdk/tools/jar/JarEntryTime.java diff --git a/jdk/test/tools/jar/LeadingGarbage.java b/test/jdk/tools/jar/LeadingGarbage.java similarity index 100% rename from jdk/test/tools/jar/LeadingGarbage.java rename to test/jdk/tools/jar/LeadingGarbage.java diff --git a/jdk/test/tools/jar/ReleaseBeforeFiles.java b/test/jdk/tools/jar/ReleaseBeforeFiles.java similarity index 100% rename from jdk/test/tools/jar/ReleaseBeforeFiles.java rename to test/jdk/tools/jar/ReleaseBeforeFiles.java diff --git a/jdk/test/tools/jar/UpdateJar.java b/test/jdk/tools/jar/UpdateJar.java similarity index 100% rename from jdk/test/tools/jar/UpdateJar.java rename to test/jdk/tools/jar/UpdateJar.java diff --git a/jdk/test/tools/jar/UpdateManifest.java b/test/jdk/tools/jar/UpdateManifest.java similarity index 100% rename from jdk/test/tools/jar/UpdateManifest.java rename to test/jdk/tools/jar/UpdateManifest.java diff --git a/jdk/test/tools/jar/compat/CLICompatibility.java b/test/jdk/tools/jar/compat/CLICompatibility.java similarity index 100% rename from jdk/test/tools/jar/compat/CLICompatibility.java rename to test/jdk/tools/jar/compat/CLICompatibility.java diff --git a/jdk/test/tools/jar/index/MetaInf.java b/test/jdk/tools/jar/index/MetaInf.java similarity index 100% rename from jdk/test/tools/jar/index/MetaInf.java rename to test/jdk/tools/jar/index/MetaInf.java diff --git a/jdk/test/tools/jar/index/jarcontents/META-INF/services/A b/test/jdk/tools/jar/index/jarcontents/META-INF/services/A similarity index 100% rename from jdk/test/tools/jar/index/jarcontents/META-INF/services/A rename to test/jdk/tools/jar/index/jarcontents/META-INF/services/A diff --git a/jdk/test/tools/jar/mmrjar/Basic.java b/test/jdk/tools/jar/mmrjar/Basic.java similarity index 100% rename from jdk/test/tools/jar/mmrjar/Basic.java rename to test/jdk/tools/jar/mmrjar/Basic.java diff --git a/jdk/test/tools/jar/mmrjar/src/classes/p/Hi.java b/test/jdk/tools/jar/mmrjar/src/classes/p/Hi.java similarity index 100% rename from jdk/test/tools/jar/mmrjar/src/classes/p/Hi.java rename to test/jdk/tools/jar/mmrjar/src/classes/p/Hi.java diff --git a/jdk/test/tools/jar/mmrjar/src/mr10/p/internal/bar/Gee.java b/test/jdk/tools/jar/mmrjar/src/mr10/p/internal/bar/Gee.java similarity index 100% rename from jdk/test/tools/jar/mmrjar/src/mr10/p/internal/bar/Gee.java rename to test/jdk/tools/jar/mmrjar/src/mr10/p/internal/bar/Gee.java diff --git a/jdk/test/tools/jar/mmrjar/src/mr9/module-info.java b/test/jdk/tools/jar/mmrjar/src/mr9/module-info.java similarity index 100% rename from jdk/test/tools/jar/mmrjar/src/mr9/module-info.java rename to test/jdk/tools/jar/mmrjar/src/mr9/module-info.java diff --git a/jdk/test/tools/jar/mmrjar/src/mr9/p/Hi.java b/test/jdk/tools/jar/mmrjar/src/mr9/p/Hi.java similarity index 100% rename from jdk/test/tools/jar/mmrjar/src/mr9/p/Hi.java rename to test/jdk/tools/jar/mmrjar/src/mr9/p/Hi.java diff --git a/jdk/test/tools/jar/mmrjar/src/mr9/p/internal/Bar.java b/test/jdk/tools/jar/mmrjar/src/mr9/p/internal/Bar.java similarity index 100% rename from jdk/test/tools/jar/mmrjar/src/mr9/p/internal/Bar.java rename to test/jdk/tools/jar/mmrjar/src/mr9/p/internal/Bar.java diff --git a/jdk/test/tools/jar/modularJar/Basic.java b/test/jdk/tools/jar/modularJar/Basic.java similarity index 100% rename from jdk/test/tools/jar/modularJar/Basic.java rename to test/jdk/tools/jar/modularJar/Basic.java diff --git a/jdk/test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java b/test/jdk/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java rename to test/jdk/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java diff --git a/jdk/test/tools/jar/modularJar/src/bar/jdk/test/bar/internal/Message.java b/test/jdk/tools/jar/modularJar/src/bar/jdk/test/bar/internal/Message.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/bar/jdk/test/bar/internal/Message.java rename to test/jdk/tools/jar/modularJar/src/bar/jdk/test/bar/internal/Message.java diff --git a/jdk/test/tools/jar/modularJar/src/bar/module-info.java b/test/jdk/tools/jar/modularJar/src/bar/module-info.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/bar/module-info.java rename to test/jdk/tools/jar/modularJar/src/bar/module-info.java diff --git a/jdk/test/tools/jar/modularJar/src/baz/jdk/test/baz/Baz.java b/test/jdk/tools/jar/modularJar/src/baz/jdk/test/baz/Baz.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/baz/jdk/test/baz/Baz.java rename to test/jdk/tools/jar/modularJar/src/baz/jdk/test/baz/Baz.java diff --git a/jdk/test/tools/jar/modularJar/src/baz/jdk/test/baz/BazService.java b/test/jdk/tools/jar/modularJar/src/baz/jdk/test/baz/BazService.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/baz/jdk/test/baz/BazService.java rename to test/jdk/tools/jar/modularJar/src/baz/jdk/test/baz/BazService.java diff --git a/jdk/test/tools/jar/modularJar/src/baz/jdk/test/baz/internal/BazServiceImpl.java b/test/jdk/tools/jar/modularJar/src/baz/jdk/test/baz/internal/BazServiceImpl.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/baz/jdk/test/baz/internal/BazServiceImpl.java rename to test/jdk/tools/jar/modularJar/src/baz/jdk/test/baz/internal/BazServiceImpl.java diff --git a/jdk/test/tools/jar/modularJar/src/baz/module-info.java b/test/jdk/tools/jar/modularJar/src/baz/module-info.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/baz/module-info.java rename to test/jdk/tools/jar/modularJar/src/baz/module-info.java diff --git a/jdk/test/tools/jar/modularJar/src/foo/jdk/test/foo/Foo.java b/test/jdk/tools/jar/modularJar/src/foo/jdk/test/foo/Foo.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/foo/jdk/test/foo/Foo.java rename to test/jdk/tools/jar/modularJar/src/foo/jdk/test/foo/Foo.java diff --git a/jdk/test/tools/jar/modularJar/src/foo/jdk/test/foo/internal/Message.java b/test/jdk/tools/jar/modularJar/src/foo/jdk/test/foo/internal/Message.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/foo/jdk/test/foo/internal/Message.java rename to test/jdk/tools/jar/modularJar/src/foo/jdk/test/foo/internal/Message.java diff --git a/jdk/test/tools/jar/modularJar/src/foo/jdk/test/foo/resources/foo.properties b/test/jdk/tools/jar/modularJar/src/foo/jdk/test/foo/resources/foo.properties similarity index 100% rename from jdk/test/tools/jar/modularJar/src/foo/jdk/test/foo/resources/foo.properties rename to test/jdk/tools/jar/modularJar/src/foo/jdk/test/foo/resources/foo.properties diff --git a/jdk/test/tools/jar/modularJar/src/foo/module-info.java b/test/jdk/tools/jar/modularJar/src/foo/module-info.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/foo/module-info.java rename to test/jdk/tools/jar/modularJar/src/foo/module-info.java diff --git a/jdk/test/tools/jar/modularJar/src/foobar/Bar.java b/test/jdk/tools/jar/modularJar/src/foobar/Bar.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/foobar/Bar.java rename to test/jdk/tools/jar/modularJar/src/foobar/Bar.java diff --git a/jdk/test/tools/jar/modularJar/src/foobar/Foo.java b/test/jdk/tools/jar/modularJar/src/foobar/Foo.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/foobar/Foo.java rename to test/jdk/tools/jar/modularJar/src/foobar/Foo.java diff --git a/jdk/test/tools/jar/modularJar/src/foobar/module-info.java b/test/jdk/tools/jar/modularJar/src/foobar/module-info.java similarity index 100% rename from jdk/test/tools/jar/modularJar/src/foobar/module-info.java rename to test/jdk/tools/jar/modularJar/src/foobar/module-info.java diff --git a/jdk/test/tools/jar/multiRelease/ApiValidatorTest.java b/test/jdk/tools/jar/multiRelease/ApiValidatorTest.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/ApiValidatorTest.java rename to test/jdk/tools/jar/multiRelease/ApiValidatorTest.java diff --git a/jdk/test/tools/jar/multiRelease/Basic.java b/test/jdk/tools/jar/multiRelease/Basic.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/Basic.java rename to test/jdk/tools/jar/multiRelease/Basic.java diff --git a/jdk/test/tools/jar/multiRelease/Basic1.java b/test/jdk/tools/jar/multiRelease/Basic1.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/Basic1.java rename to test/jdk/tools/jar/multiRelease/Basic1.java diff --git a/jdk/test/tools/jar/multiRelease/MRTestBase.java b/test/jdk/tools/jar/multiRelease/MRTestBase.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/MRTestBase.java rename to test/jdk/tools/jar/multiRelease/MRTestBase.java diff --git a/jdk/test/tools/jar/multiRelease/RuntimeTest.java b/test/jdk/tools/jar/multiRelease/RuntimeTest.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/RuntimeTest.java rename to test/jdk/tools/jar/multiRelease/RuntimeTest.java diff --git a/jdk/test/tools/jar/multiRelease/data/runtimetest/MVJarJJSTestScript.js b/test/jdk/tools/jar/multiRelease/data/runtimetest/MVJarJJSTestScript.js similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/runtimetest/MVJarJJSTestScript.js rename to test/jdk/tools/jar/multiRelease/data/runtimetest/MVJarJJSTestScript.js diff --git a/jdk/test/tools/jar/multiRelease/data/runtimetest/manifest.txt b/test/jdk/tools/jar/multiRelease/data/runtimetest/manifest.txt similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/runtimetest/manifest.txt rename to test/jdk/tools/jar/multiRelease/data/runtimetest/manifest.txt diff --git a/jdk/test/tools/jar/multiRelease/data/runtimetest/test/UseByImport.java b/test/jdk/tools/jar/multiRelease/data/runtimetest/test/UseByImport.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/runtimetest/test/UseByImport.java rename to test/jdk/tools/jar/multiRelease/data/runtimetest/test/UseByImport.java diff --git a/jdk/test/tools/jar/multiRelease/data/runtimetest/test/UseByReflection.java b/test/jdk/tools/jar/multiRelease/data/runtimetest/test/UseByReflection.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/runtimetest/test/UseByReflection.java rename to test/jdk/tools/jar/multiRelease/data/runtimetest/test/UseByReflection.java diff --git a/jdk/test/tools/jar/multiRelease/data/runtimetest/testpackage/Helper.java.template b/test/jdk/tools/jar/multiRelease/data/runtimetest/testpackage/Helper.java.template similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/runtimetest/testpackage/Helper.java.template rename to test/jdk/tools/jar/multiRelease/data/runtimetest/testpackage/Helper.java.template diff --git a/jdk/test/tools/jar/multiRelease/data/runtimetest/testpackage/Main.java.template b/test/jdk/tools/jar/multiRelease/data/runtimetest/testpackage/Main.java.template similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/runtimetest/testpackage/Main.java.template rename to test/jdk/tools/jar/multiRelease/data/runtimetest/testpackage/Main.java.template diff --git a/jdk/test/tools/jar/multiRelease/data/runtimetest/versionResource.template b/test/jdk/tools/jar/multiRelease/data/runtimetest/versionResource.template similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/runtimetest/versionResource.template rename to test/jdk/tools/jar/multiRelease/data/runtimetest/versionResource.template diff --git a/jdk/test/tools/jar/multiRelease/data/test01/base/version/Main.java b/test/jdk/tools/jar/multiRelease/data/test01/base/version/Main.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/test01/base/version/Main.java rename to test/jdk/tools/jar/multiRelease/data/test01/base/version/Main.java diff --git a/jdk/test/tools/jar/multiRelease/data/test01/base/version/Version.java b/test/jdk/tools/jar/multiRelease/data/test01/base/version/Version.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/test01/base/version/Version.java rename to test/jdk/tools/jar/multiRelease/data/test01/base/version/Version.java diff --git a/jdk/test/tools/jar/multiRelease/data/test01/v10/version/Version.java b/test/jdk/tools/jar/multiRelease/data/test01/v10/version/Version.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/test01/v10/version/Version.java rename to test/jdk/tools/jar/multiRelease/data/test01/v10/version/Version.java diff --git a/jdk/test/tools/jar/multiRelease/data/test01/v9/version/Version.java b/test/jdk/tools/jar/multiRelease/data/test01/v9/version/Version.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/test01/v9/version/Version.java rename to test/jdk/tools/jar/multiRelease/data/test01/v9/version/Version.java diff --git a/jdk/test/tools/jar/multiRelease/data/test04/v9/version/Version.java b/test/jdk/tools/jar/multiRelease/data/test04/v9/version/Version.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/test04/v9/version/Version.java rename to test/jdk/tools/jar/multiRelease/data/test04/v9/version/Version.java diff --git a/jdk/test/tools/jar/multiRelease/data/test05/v9/version/Extra.java b/test/jdk/tools/jar/multiRelease/data/test05/v9/version/Extra.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/test05/v9/version/Extra.java rename to test/jdk/tools/jar/multiRelease/data/test05/v9/version/Extra.java diff --git a/jdk/test/tools/jar/multiRelease/data/test06/v9/version/Extra.java b/test/jdk/tools/jar/multiRelease/data/test06/v9/version/Extra.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/test06/v9/version/Extra.java rename to test/jdk/tools/jar/multiRelease/data/test06/v9/version/Extra.java diff --git a/jdk/test/tools/jar/multiRelease/data/test10/base/version/Nested.java b/test/jdk/tools/jar/multiRelease/data/test10/base/version/Nested.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/test10/base/version/Nested.java rename to test/jdk/tools/jar/multiRelease/data/test10/base/version/Nested.java diff --git a/jdk/test/tools/jar/multiRelease/data/test10/v9/version/Nested.java b/test/jdk/tools/jar/multiRelease/data/test10/v9/version/Nested.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/data/test10/v9/version/Nested.java rename to test/jdk/tools/jar/multiRelease/data/test10/v9/version/Nested.java diff --git a/jdk/test/tools/jar/multiRelease/whitebox/Driver.java b/test/jdk/tools/jar/multiRelease/whitebox/Driver.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/whitebox/Driver.java rename to test/jdk/tools/jar/multiRelease/whitebox/Driver.java diff --git a/jdk/test/tools/jar/multiRelease/whitebox/jdk.jartool/sun/tools/jar/ValidatorComparatorTest.java b/test/jdk/tools/jar/multiRelease/whitebox/jdk.jartool/sun/tools/jar/ValidatorComparatorTest.java similarity index 100% rename from jdk/test/tools/jar/multiRelease/whitebox/jdk.jartool/sun/tools/jar/ValidatorComparatorTest.java rename to test/jdk/tools/jar/multiRelease/whitebox/jdk.jartool/sun/tools/jar/ValidatorComparatorTest.java diff --git a/jdk/test/tools/jimage/JImageBasicsTest.java b/test/jdk/tools/jimage/JImageBasicsTest.java similarity index 100% rename from jdk/test/tools/jimage/JImageBasicsTest.java rename to test/jdk/tools/jimage/JImageBasicsTest.java diff --git a/jdk/test/tools/jimage/JImageCliTest.java b/test/jdk/tools/jimage/JImageCliTest.java similarity index 100% rename from jdk/test/tools/jimage/JImageCliTest.java rename to test/jdk/tools/jimage/JImageCliTest.java diff --git a/jdk/test/tools/jimage/JImageExtractTest.java b/test/jdk/tools/jimage/JImageExtractTest.java similarity index 100% rename from jdk/test/tools/jimage/JImageExtractTest.java rename to test/jdk/tools/jimage/JImageExtractTest.java diff --git a/jdk/test/tools/jimage/JImageInfoTest.java b/test/jdk/tools/jimage/JImageInfoTest.java similarity index 100% rename from jdk/test/tools/jimage/JImageInfoTest.java rename to test/jdk/tools/jimage/JImageInfoTest.java diff --git a/jdk/test/tools/jimage/JImageListTest.java b/test/jdk/tools/jimage/JImageListTest.java similarity index 100% rename from jdk/test/tools/jimage/JImageListTest.java rename to test/jdk/tools/jimage/JImageListTest.java diff --git a/jdk/test/tools/jimage/JImageTest.java b/test/jdk/tools/jimage/JImageTest.java similarity index 100% rename from jdk/test/tools/jimage/JImageTest.java rename to test/jdk/tools/jimage/JImageTest.java diff --git a/jdk/test/tools/jimage/JImageToolTest.java b/test/jdk/tools/jimage/JImageToolTest.java similarity index 100% rename from jdk/test/tools/jimage/JImageToolTest.java rename to test/jdk/tools/jimage/JImageToolTest.java diff --git a/jdk/test/tools/jimage/JImageVerifyTest.java b/test/jdk/tools/jimage/JImageVerifyTest.java similarity index 100% rename from jdk/test/tools/jimage/JImageVerifyTest.java rename to test/jdk/tools/jimage/JImageVerifyTest.java diff --git a/jdk/test/tools/jimage/VerifyJimage.java b/test/jdk/tools/jimage/VerifyJimage.java similarity index 100% rename from jdk/test/tools/jimage/VerifyJimage.java rename to test/jdk/tools/jimage/VerifyJimage.java diff --git a/jdk/test/tools/jjs/Hello.java b/test/jdk/tools/jjs/Hello.java similarity index 100% rename from jdk/test/tools/jjs/Hello.java rename to test/jdk/tools/jjs/Hello.java diff --git a/jdk/test/tools/jjs/addmodulesrepeat.js b/test/jdk/tools/jjs/addmodulesrepeat.js similarity index 100% rename from jdk/test/tools/jjs/addmodulesrepeat.js rename to test/jdk/tools/jjs/addmodulesrepeat.js diff --git a/jdk/test/tools/jjs/args.js b/test/jdk/tools/jjs/args.js similarity index 100% rename from jdk/test/tools/jjs/args.js rename to test/jdk/tools/jjs/args.js diff --git a/jdk/test/tools/jjs/classpath.js b/test/jdk/tools/jjs/classpath.js similarity index 100% rename from jdk/test/tools/jjs/classpath.js rename to test/jdk/tools/jjs/classpath.js diff --git a/jdk/test/tools/jjs/com.greetings/com/greetings/Hello.java b/test/jdk/tools/jjs/com.greetings/com/greetings/Hello.java similarity index 100% rename from jdk/test/tools/jjs/com.greetings/com/greetings/Hello.java rename to test/jdk/tools/jjs/com.greetings/com/greetings/Hello.java diff --git a/jdk/test/tools/jjs/com.greetings/module-info.java b/test/jdk/tools/jjs/com.greetings/module-info.java similarity index 100% rename from jdk/test/tools/jjs/com.greetings/module-info.java rename to test/jdk/tools/jjs/com.greetings/module-info.java diff --git a/jdk/test/tools/jjs/common.sh b/test/jdk/tools/jjs/common.sh similarity index 100% rename from jdk/test/tools/jjs/common.sh rename to test/jdk/tools/jjs/common.sh diff --git a/jdk/test/tools/jjs/es6.js b/test/jdk/tools/jjs/es6.js similarity index 100% rename from jdk/test/tools/jjs/es6.js rename to test/jdk/tools/jjs/es6.js diff --git a/jdk/test/tools/jjs/file.js b/test/jdk/tools/jjs/file.js similarity index 100% rename from jdk/test/tools/jjs/file.js rename to test/jdk/tools/jjs/file.js diff --git a/jdk/test/tools/jjs/file.out b/test/jdk/tools/jjs/file.out similarity index 100% rename from jdk/test/tools/jjs/file.out rename to test/jdk/tools/jjs/file.out diff --git a/jdk/test/tools/jjs/jjs-DTest.sh b/test/jdk/tools/jjs/jjs-DTest.sh similarity index 100% rename from jdk/test/tools/jjs/jjs-DTest.sh rename to test/jdk/tools/jjs/jjs-DTest.sh diff --git a/jdk/test/tools/jjs/jjs-argsTest.sh b/test/jdk/tools/jjs/jjs-argsTest.sh similarity index 100% rename from jdk/test/tools/jjs/jjs-argsTest.sh rename to test/jdk/tools/jjs/jjs-argsTest.sh diff --git a/jdk/test/tools/jjs/jjs-cpTest.sh b/test/jdk/tools/jjs/jjs-cpTest.sh similarity index 100% rename from jdk/test/tools/jjs/jjs-cpTest.sh rename to test/jdk/tools/jjs/jjs-cpTest.sh diff --git a/jdk/test/tools/jjs/jjs-es6Test.sh b/test/jdk/tools/jjs/jjs-es6Test.sh similarity index 100% rename from jdk/test/tools/jjs/jjs-es6Test.sh rename to test/jdk/tools/jjs/jjs-es6Test.sh diff --git a/jdk/test/tools/jjs/jjs-fileTest.sh b/test/jdk/tools/jjs/jjs-fileTest.sh similarity index 100% rename from jdk/test/tools/jjs/jjs-fileTest.sh rename to test/jdk/tools/jjs/jjs-fileTest.sh diff --git a/jdk/test/tools/jjs/jjs-helpTest.sh b/test/jdk/tools/jjs/jjs-helpTest.sh similarity index 100% rename from jdk/test/tools/jjs/jjs-helpTest.sh rename to test/jdk/tools/jjs/jjs-helpTest.sh diff --git a/jdk/test/tools/jjs/jjs-modulepathTest.sh b/test/jdk/tools/jjs/jjs-modulepathTest.sh similarity index 100% rename from jdk/test/tools/jjs/jjs-modulepathTest.sh rename to test/jdk/tools/jjs/jjs-modulepathTest.sh diff --git a/jdk/test/tools/jjs/jjs-scriptingTest.sh b/test/jdk/tools/jjs/jjs-scriptingTest.sh similarity index 100% rename from jdk/test/tools/jjs/jjs-scriptingTest.sh rename to test/jdk/tools/jjs/jjs-scriptingTest.sh diff --git a/jdk/test/tools/jjs/jjs-strictTest.sh b/test/jdk/tools/jjs/jjs-strictTest.sh similarity index 100% rename from jdk/test/tools/jjs/jjs-strictTest.sh rename to test/jdk/tools/jjs/jjs-strictTest.sh diff --git a/jdk/test/tools/jjs/modulepath.js b/test/jdk/tools/jjs/modulepath.js similarity index 100% rename from jdk/test/tools/jjs/modulepath.js rename to test/jdk/tools/jjs/modulepath.js diff --git a/jdk/test/tools/jjs/scripting.js b/test/jdk/tools/jjs/scripting.js similarity index 100% rename from jdk/test/tools/jjs/scripting.js rename to test/jdk/tools/jjs/scripting.js diff --git a/jdk/test/tools/jjs/strict.js b/test/jdk/tools/jjs/strict.js similarity index 100% rename from jdk/test/tools/jjs/strict.js rename to test/jdk/tools/jjs/strict.js diff --git a/jdk/test/tools/jjs/sysprops.js b/test/jdk/tools/jjs/sysprops.js similarity index 100% rename from jdk/test/tools/jjs/sysprops.js rename to test/jdk/tools/jjs/sysprops.js diff --git a/jdk/test/tools/jjs/sysprops.policy b/test/jdk/tools/jjs/sysprops.policy similarity index 100% rename from jdk/test/tools/jjs/sysprops.policy rename to test/jdk/tools/jjs/sysprops.policy diff --git a/jdk/test/tools/jlink/CheckExecutable.java b/test/jdk/tools/jlink/CheckExecutable.java similarity index 100% rename from jdk/test/tools/jlink/CheckExecutable.java rename to test/jdk/tools/jlink/CheckExecutable.java diff --git a/jdk/test/tools/jlink/DefaultProviderTest.java b/test/jdk/tools/jlink/DefaultProviderTest.java similarity index 100% rename from jdk/test/tools/jlink/DefaultProviderTest.java rename to test/jdk/tools/jlink/DefaultProviderTest.java diff --git a/jdk/test/tools/jlink/ImageFileCreatorTest.java b/test/jdk/tools/jlink/ImageFileCreatorTest.java similarity index 100% rename from jdk/test/tools/jlink/ImageFileCreatorTest.java rename to test/jdk/tools/jlink/ImageFileCreatorTest.java diff --git a/jdk/test/tools/jlink/ImageFilePoolTest.java b/test/jdk/tools/jlink/ImageFilePoolTest.java similarity index 100% rename from jdk/test/tools/jlink/ImageFilePoolTest.java rename to test/jdk/tools/jlink/ImageFilePoolTest.java diff --git a/jdk/test/tools/jlink/IntegrationTest.java b/test/jdk/tools/jlink/IntegrationTest.java similarity index 100% rename from jdk/test/tools/jlink/IntegrationTest.java rename to test/jdk/tools/jlink/IntegrationTest.java diff --git a/jdk/test/tools/jlink/JLink2Test.java b/test/jdk/tools/jlink/JLink2Test.java similarity index 100% rename from jdk/test/tools/jlink/JLink2Test.java rename to test/jdk/tools/jlink/JLink2Test.java diff --git a/jdk/test/tools/jlink/JLinkNegativeTest.java b/test/jdk/tools/jlink/JLinkNegativeTest.java similarity index 100% rename from jdk/test/tools/jlink/JLinkNegativeTest.java rename to test/jdk/tools/jlink/JLinkNegativeTest.java diff --git a/jdk/test/tools/jlink/JLinkOptionsTest.java b/test/jdk/tools/jlink/JLinkOptionsTest.java similarity index 100% rename from jdk/test/tools/jlink/JLinkOptionsTest.java rename to test/jdk/tools/jlink/JLinkOptionsTest.java diff --git a/jdk/test/tools/jlink/JLinkPluginsTest.java b/test/jdk/tools/jlink/JLinkPluginsTest.java similarity index 100% rename from jdk/test/tools/jlink/JLinkPluginsTest.java rename to test/jdk/tools/jlink/JLinkPluginsTest.java diff --git a/jdk/test/tools/jlink/JLinkPostProcessingTest.java b/test/jdk/tools/jlink/JLinkPostProcessingTest.java similarity index 100% rename from jdk/test/tools/jlink/JLinkPostProcessingTest.java rename to test/jdk/tools/jlink/JLinkPostProcessingTest.java diff --git a/jdk/test/tools/jlink/JLinkSigningTest.java b/test/jdk/tools/jlink/JLinkSigningTest.java similarity index 100% rename from jdk/test/tools/jlink/JLinkSigningTest.java rename to test/jdk/tools/jlink/JLinkSigningTest.java diff --git a/jdk/test/tools/jlink/JLinkTest.java b/test/jdk/tools/jlink/JLinkTest.java similarity index 100% rename from jdk/test/tools/jlink/JLinkTest.java rename to test/jdk/tools/jlink/JLinkTest.java diff --git a/jdk/test/tools/jlink/JLinkToolProviderTest.java b/test/jdk/tools/jlink/JLinkToolProviderTest.java similarity index 100% rename from jdk/test/tools/jlink/JLinkToolProviderTest.java rename to test/jdk/tools/jlink/JLinkToolProviderTest.java diff --git a/jdk/test/tools/jlink/ModuleNamesOrderTest.java b/test/jdk/tools/jlink/ModuleNamesOrderTest.java similarity index 100% rename from jdk/test/tools/jlink/ModuleNamesOrderTest.java rename to test/jdk/tools/jlink/ModuleNamesOrderTest.java diff --git a/jdk/test/tools/jlink/NativeTest.java b/test/jdk/tools/jlink/NativeTest.java similarity index 100% rename from jdk/test/tools/jlink/NativeTest.java rename to test/jdk/tools/jlink/NativeTest.java diff --git a/jdk/test/tools/jlink/ReleaseImplementorTest.java b/test/jdk/tools/jlink/ReleaseImplementorTest.java similarity index 100% rename from jdk/test/tools/jlink/ReleaseImplementorTest.java rename to test/jdk/tools/jlink/ReleaseImplementorTest.java diff --git a/jdk/test/tools/jlink/ResourceDuplicateCheckTest.java b/test/jdk/tools/jlink/ResourceDuplicateCheckTest.java similarity index 100% rename from jdk/test/tools/jlink/ResourceDuplicateCheckTest.java rename to test/jdk/tools/jlink/ResourceDuplicateCheckTest.java diff --git a/jdk/test/tools/jlink/ResourcePoolTest.java b/test/jdk/tools/jlink/ResourcePoolTest.java similarity index 100% rename from jdk/test/tools/jlink/ResourcePoolTest.java rename to test/jdk/tools/jlink/ResourcePoolTest.java diff --git a/jdk/test/tools/jlink/SecurityTest.java b/test/jdk/tools/jlink/SecurityTest.java similarity index 100% rename from jdk/test/tools/jlink/SecurityTest.java rename to test/jdk/tools/jlink/SecurityTest.java diff --git a/jdk/test/tools/jlink/basic/AllModulePath.java b/test/jdk/tools/jlink/basic/AllModulePath.java similarity index 100% rename from jdk/test/tools/jlink/basic/AllModulePath.java rename to test/jdk/tools/jlink/basic/AllModulePath.java diff --git a/jdk/test/tools/jlink/basic/BasicTest.java b/test/jdk/tools/jlink/basic/BasicTest.java similarity index 100% rename from jdk/test/tools/jlink/basic/BasicTest.java rename to test/jdk/tools/jlink/basic/BasicTest.java diff --git a/jdk/test/tools/jlink/basic/src/m1/module-info.java b/test/jdk/tools/jlink/basic/src/m1/module-info.java similarity index 100% rename from jdk/test/tools/jlink/basic/src/m1/module-info.java rename to test/jdk/tools/jlink/basic/src/m1/module-info.java diff --git a/jdk/test/tools/jlink/basic/src/m1/p/ListModules.java b/test/jdk/tools/jlink/basic/src/m1/p/ListModules.java similarity index 100% rename from jdk/test/tools/jlink/basic/src/m1/p/ListModules.java rename to test/jdk/tools/jlink/basic/src/m1/p/ListModules.java diff --git a/jdk/test/tools/jlink/basic/src/test/jdk/test/Test.java b/test/jdk/tools/jlink/basic/src/test/jdk/test/Test.java similarity index 100% rename from jdk/test/tools/jlink/basic/src/test/jdk/test/Test.java rename to test/jdk/tools/jlink/basic/src/test/jdk/test/Test.java diff --git a/jdk/test/tools/jlink/basic/src/test/module-info.java b/test/jdk/tools/jlink/basic/src/test/module-info.java similarity index 100% rename from jdk/test/tools/jlink/basic/src/test/module-info.java rename to test/jdk/tools/jlink/basic/src/test/module-info.java diff --git a/jdk/test/tools/jlink/bindservices/BindServices.java b/test/jdk/tools/jlink/bindservices/BindServices.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/BindServices.java rename to test/jdk/tools/jlink/bindservices/BindServices.java diff --git a/jdk/test/tools/jlink/bindservices/SuggestProviders.java b/test/jdk/tools/jlink/bindservices/SuggestProviders.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/SuggestProviders.java rename to test/jdk/tools/jlink/bindservices/SuggestProviders.java diff --git a/jdk/test/tools/jlink/bindservices/src/m1/module-info.java b/test/jdk/tools/jlink/bindservices/src/m1/module-info.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/src/m1/module-info.java rename to test/jdk/tools/jlink/bindservices/src/m1/module-info.java diff --git a/jdk/test/tools/jlink/bindservices/src/m1/p1/Impl.java b/test/jdk/tools/jlink/bindservices/src/m1/p1/Impl.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/src/m1/p1/Impl.java rename to test/jdk/tools/jlink/bindservices/src/m1/p1/Impl.java diff --git a/jdk/test/tools/jlink/bindservices/src/m1/p1/Main.java b/test/jdk/tools/jlink/bindservices/src/m1/p1/Main.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/src/m1/p1/Main.java rename to test/jdk/tools/jlink/bindservices/src/m1/p1/Main.java diff --git a/jdk/test/tools/jlink/bindservices/src/m1/p1/S.java b/test/jdk/tools/jlink/bindservices/src/m1/p1/S.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/src/m1/p1/S.java rename to test/jdk/tools/jlink/bindservices/src/m1/p1/S.java diff --git a/jdk/test/tools/jlink/bindservices/src/m2/module-info.java b/test/jdk/tools/jlink/bindservices/src/m2/module-info.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/src/m2/module-info.java rename to test/jdk/tools/jlink/bindservices/src/m2/module-info.java diff --git a/jdk/test/tools/jlink/bindservices/src/m2/p2/Impl.java b/test/jdk/tools/jlink/bindservices/src/m2/p2/Impl.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/src/m2/p2/Impl.java rename to test/jdk/tools/jlink/bindservices/src/m2/p2/Impl.java diff --git a/jdk/test/tools/jlink/bindservices/src/m2/p2/T.java b/test/jdk/tools/jlink/bindservices/src/m2/p2/T.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/src/m2/p2/T.java rename to test/jdk/tools/jlink/bindservices/src/m2/p2/T.java diff --git a/jdk/test/tools/jlink/bindservices/src/m3/module-info.java b/test/jdk/tools/jlink/bindservices/src/m3/module-info.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/src/m3/module-info.java rename to test/jdk/tools/jlink/bindservices/src/m3/module-info.java diff --git a/jdk/test/tools/jlink/bindservices/src/m3/p3/Impl.java b/test/jdk/tools/jlink/bindservices/src/m3/p3/Impl.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/src/m3/p3/Impl.java rename to test/jdk/tools/jlink/bindservices/src/m3/p3/Impl.java diff --git a/jdk/test/tools/jlink/bindservices/src/m3/p3/MyProvider.java b/test/jdk/tools/jlink/bindservices/src/m3/p3/MyProvider.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/src/m3/p3/MyProvider.java rename to test/jdk/tools/jlink/bindservices/src/m3/p3/MyProvider.java diff --git a/jdk/test/tools/jlink/bindservices/src/m3/p3/S.java b/test/jdk/tools/jlink/bindservices/src/m3/p3/S.java similarity index 100% rename from jdk/test/tools/jlink/bindservices/src/m3/p3/S.java rename to test/jdk/tools/jlink/bindservices/src/m3/p3/S.java diff --git a/jdk/test/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java b/test/jdk/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java similarity index 100% rename from jdk/test/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java rename to test/jdk/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java diff --git a/jdk/test/tools/jlink/multireleasejar/base/m1/module-info.java b/test/jdk/tools/jlink/multireleasejar/base/m1/module-info.java similarity index 100% rename from jdk/test/tools/jlink/multireleasejar/base/m1/module-info.java rename to test/jdk/tools/jlink/multireleasejar/base/m1/module-info.java diff --git a/jdk/test/tools/jlink/multireleasejar/base/m1/p/Main.java b/test/jdk/tools/jlink/multireleasejar/base/m1/p/Main.java similarity index 100% rename from jdk/test/tools/jlink/multireleasejar/base/m1/p/Main.java rename to test/jdk/tools/jlink/multireleasejar/base/m1/p/Main.java diff --git a/jdk/test/tools/jlink/multireleasejar/rt/m1/module-info.java b/test/jdk/tools/jlink/multireleasejar/rt/m1/module-info.java similarity index 100% rename from jdk/test/tools/jlink/multireleasejar/rt/m1/module-info.java rename to test/jdk/tools/jlink/multireleasejar/rt/m1/module-info.java diff --git a/jdk/test/tools/jlink/multireleasejar/rt/m1/p/Main.java b/test/jdk/tools/jlink/multireleasejar/rt/m1/p/Main.java similarity index 100% rename from jdk/test/tools/jlink/multireleasejar/rt/m1/p/Main.java rename to test/jdk/tools/jlink/multireleasejar/rt/m1/p/Main.java diff --git a/jdk/test/tools/jlink/multireleasejar/rt/m1/p/Type.java b/test/jdk/tools/jlink/multireleasejar/rt/m1/p/Type.java similarity index 100% rename from jdk/test/tools/jlink/multireleasejar/rt/m1/p/Type.java rename to test/jdk/tools/jlink/multireleasejar/rt/m1/p/Type.java diff --git a/jdk/test/tools/jlink/multireleasejar/rt/m1/q/PublicClass.java b/test/jdk/tools/jlink/multireleasejar/rt/m1/q/PublicClass.java similarity index 100% rename from jdk/test/tools/jlink/multireleasejar/rt/m1/q/PublicClass.java rename to test/jdk/tools/jlink/multireleasejar/rt/m1/q/PublicClass.java diff --git a/jdk/test/tools/jlink/optimplugin/module-info.java b/test/jdk/tools/jlink/optimplugin/module-info.java similarity index 100% rename from jdk/test/tools/jlink/optimplugin/module-info.java rename to test/jdk/tools/jlink/optimplugin/module-info.java diff --git a/jdk/test/tools/jlink/optimplugin/optim/AType.java b/test/jdk/tools/jlink/optimplugin/optim/AType.java similarity index 100% rename from jdk/test/tools/jlink/optimplugin/optim/AType.java rename to test/jdk/tools/jlink/optimplugin/optim/AType.java diff --git a/jdk/test/tools/jlink/optimplugin/optim/ForNameTestCase.java b/test/jdk/tools/jlink/optimplugin/optim/ForNameTestCase.java similarity index 100% rename from jdk/test/tools/jlink/optimplugin/optim/ForNameTestCase.java rename to test/jdk/tools/jlink/optimplugin/optim/ForNameTestCase.java diff --git a/jdk/test/tools/jlink/plugins/CompressIndexesTest.java b/test/jdk/tools/jlink/plugins/CompressIndexesTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/CompressIndexesTest.java rename to test/jdk/tools/jlink/plugins/CompressIndexesTest.java diff --git a/jdk/test/tools/jlink/plugins/CompressorPluginTest.java b/test/jdk/tools/jlink/plugins/CompressorPluginTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/CompressorPluginTest.java rename to test/jdk/tools/jlink/plugins/CompressorPluginTest.java diff --git a/jdk/test/tools/jlink/plugins/ExcludeFilesPluginTest.java b/test/jdk/tools/jlink/plugins/ExcludeFilesPluginTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/ExcludeFilesPluginTest.java rename to test/jdk/tools/jlink/plugins/ExcludeFilesPluginTest.java diff --git a/jdk/test/tools/jlink/plugins/ExcludeJmodSectionPluginTest.java b/test/jdk/tools/jlink/plugins/ExcludeJmodSectionPluginTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/ExcludeJmodSectionPluginTest.java rename to test/jdk/tools/jlink/plugins/ExcludeJmodSectionPluginTest.java diff --git a/jdk/test/tools/jlink/plugins/ExcludePluginTest.java b/test/jdk/tools/jlink/plugins/ExcludePluginTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/ExcludePluginTest.java rename to test/jdk/tools/jlink/plugins/ExcludePluginTest.java diff --git a/jdk/test/tools/jlink/plugins/ExcludeVMPluginTest.java b/test/jdk/tools/jlink/plugins/ExcludeVMPluginTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/ExcludeVMPluginTest.java rename to test/jdk/tools/jlink/plugins/ExcludeVMPluginTest.java diff --git a/jdk/test/tools/jlink/plugins/GenerateJLIClassesPluginTest.java b/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/GenerateJLIClassesPluginTest.java rename to test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java diff --git a/jdk/test/tools/jlink/plugins/GetAvailableLocales.java b/test/jdk/tools/jlink/plugins/GetAvailableLocales.java similarity index 100% rename from jdk/test/tools/jlink/plugins/GetAvailableLocales.java rename to test/jdk/tools/jlink/plugins/GetAvailableLocales.java diff --git a/jdk/test/tools/jlink/plugins/IncludeLocalesPluginTest.java b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/IncludeLocalesPluginTest.java rename to test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java diff --git a/jdk/test/tools/jlink/plugins/LastSorterTest.java b/test/jdk/tools/jlink/plugins/LastSorterTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/LastSorterTest.java rename to test/jdk/tools/jlink/plugins/LastSorterTest.java diff --git a/jdk/test/tools/jlink/plugins/LegalFilePluginTest.java b/test/jdk/tools/jlink/plugins/LegalFilePluginTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/LegalFilePluginTest.java rename to test/jdk/tools/jlink/plugins/LegalFilePluginTest.java diff --git a/jdk/test/tools/jlink/plugins/OrderResourcesPluginTest.java b/test/jdk/tools/jlink/plugins/OrderResourcesPluginTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/OrderResourcesPluginTest.java rename to test/jdk/tools/jlink/plugins/OrderResourcesPluginTest.java diff --git a/jdk/test/tools/jlink/plugins/PluginsNegativeTest.java b/test/jdk/tools/jlink/plugins/PluginsNegativeTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/PluginsNegativeTest.java rename to test/jdk/tools/jlink/plugins/PluginsNegativeTest.java diff --git a/jdk/test/tools/jlink/plugins/PrevisitorTest.java b/test/jdk/tools/jlink/plugins/PrevisitorTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/PrevisitorTest.java rename to test/jdk/tools/jlink/plugins/PrevisitorTest.java diff --git a/jdk/test/tools/jlink/plugins/ResourceFilterTest.java b/test/jdk/tools/jlink/plugins/ResourceFilterTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/ResourceFilterTest.java rename to test/jdk/tools/jlink/plugins/ResourceFilterTest.java diff --git a/jdk/test/tools/jlink/plugins/SignatureParserTest.java b/test/jdk/tools/jlink/plugins/SignatureParserTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SignatureParserTest.java rename to test/jdk/tools/jlink/plugins/SignatureParserTest.java diff --git a/jdk/test/tools/jlink/plugins/StringSharingPluginTest.java b/test/jdk/tools/jlink/plugins/StringSharingPluginTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/StringSharingPluginTest.java rename to test/jdk/tools/jlink/plugins/StringSharingPluginTest.java diff --git a/jdk/test/tools/jlink/plugins/StripDebugPluginTest.java b/test/jdk/tools/jlink/plugins/StripDebugPluginTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/StripDebugPluginTest.java rename to test/jdk/tools/jlink/plugins/StripDebugPluginTest.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/module-info.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m1/module-info.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/module-info.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m1/module-info.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p1/Main.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p1/Main.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p1/Main.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p1/Main.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p2/T.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p2/T.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p2/T.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p2/T.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m2/module-info.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m2/module-info.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m2/module-info.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m2/module-info.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m2/q/S1.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m2/q/S1.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m2/q/S1.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m2/q/S1.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m2/q/S2.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m2/q/S2.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m2/q/S2.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m2/q/S2.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m3/module-info.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m3/module-info.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m3/module-info.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m3/module-info.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Foo.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Foo.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Foo.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Foo.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Lib.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Lib.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Lib.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Lib.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Main.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Main.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Main.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m3/p3/Main.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m4/module-info.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m4/module-info.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m4/module-info.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m4/module-info.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/Foo.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/Foo.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/Foo.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/Foo.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/Main.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/Main.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/Main.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/Main.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/dummy/dummy.properties b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/dummy/dummy.properties similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/dummy/dummy.properties rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/dummy/dummy.properties diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m5/module-info.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m5/module-info.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m5/module-info.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m5/module-info.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m5/p5/Main.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m5/p5/Main.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m5/p5/Main.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m5/p5/Main.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/jdk/test/Main.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/jdk/test/Main.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/test/jdk/test/Main.java diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/module-info.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/test/module-info.java similarity index 100% rename from jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/module-info.java rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/test/module-info.java diff --git a/jdk/test/tools/jlink/toolprovider.policy b/test/jdk/tools/jlink/toolprovider.policy similarity index 100% rename from jdk/test/tools/jlink/toolprovider.policy rename to test/jdk/tools/jlink/toolprovider.policy diff --git a/jdk/test/tools/jmod/JmodNegativeTest.java b/test/jdk/tools/jmod/JmodNegativeTest.java similarity index 100% rename from jdk/test/tools/jmod/JmodNegativeTest.java rename to test/jdk/tools/jmod/JmodNegativeTest.java diff --git a/jdk/test/tools/jmod/JmodTest.java b/test/jdk/tools/jmod/JmodTest.java similarity index 100% rename from jdk/test/tools/jmod/JmodTest.java rename to test/jdk/tools/jmod/JmodTest.java diff --git a/jdk/test/tools/jmod/hashes/HashesTest.java b/test/jdk/tools/jmod/hashes/HashesTest.java similarity index 100% rename from jdk/test/tools/jmod/hashes/HashesTest.java rename to test/jdk/tools/jmod/hashes/HashesTest.java diff --git a/jdk/test/tools/jmod/src/apa/jdk/test/apa/Apa.java b/test/jdk/tools/jmod/src/apa/jdk/test/apa/Apa.java similarity index 100% rename from jdk/test/tools/jmod/src/apa/jdk/test/apa/Apa.java rename to test/jdk/tools/jmod/src/apa/jdk/test/apa/Apa.java diff --git a/jdk/test/tools/jmod/src/apa/module-info.java b/test/jdk/tools/jmod/src/apa/module-info.java similarity index 100% rename from jdk/test/tools/jmod/src/apa/module-info.java rename to test/jdk/tools/jmod/src/apa/module-info.java diff --git a/jdk/test/tools/jmod/src/foo/jdk/test/foo/Foo.java b/test/jdk/tools/jmod/src/foo/jdk/test/foo/Foo.java similarity index 100% rename from jdk/test/tools/jmod/src/foo/jdk/test/foo/Foo.java rename to test/jdk/tools/jmod/src/foo/jdk/test/foo/Foo.java diff --git a/jdk/test/tools/jmod/src/foo/jdk/test/foo/internal/Message.java b/test/jdk/tools/jmod/src/foo/jdk/test/foo/internal/Message.java similarity index 100% rename from jdk/test/tools/jmod/src/foo/jdk/test/foo/internal/Message.java rename to test/jdk/tools/jmod/src/foo/jdk/test/foo/internal/Message.java diff --git a/jdk/test/tools/jmod/src/foo/jdk/test/foo/resources/foo.properties b/test/jdk/tools/jmod/src/foo/jdk/test/foo/resources/foo.properties similarity index 100% rename from jdk/test/tools/jmod/src/foo/jdk/test/foo/resources/foo.properties rename to test/jdk/tools/jmod/src/foo/jdk/test/foo/resources/foo.properties diff --git a/jdk/test/tools/jmod/src/foo/module-info.java b/test/jdk/tools/jmod/src/foo/module-info.java similarity index 100% rename from jdk/test/tools/jmod/src/foo/module-info.java rename to test/jdk/tools/jmod/src/foo/module-info.java diff --git a/jdk/test/tools/launcher/6842838/CreateBadJar.java b/test/jdk/tools/launcher/6842838/CreateBadJar.java similarity index 100% rename from jdk/test/tools/launcher/6842838/CreateBadJar.java rename to test/jdk/tools/launcher/6842838/CreateBadJar.java diff --git a/jdk/test/tools/launcher/6842838/Test6842838.sh b/test/jdk/tools/launcher/6842838/Test6842838.sh similarity index 100% rename from jdk/test/tools/launcher/6842838/Test6842838.sh rename to test/jdk/tools/launcher/6842838/Test6842838.sh diff --git a/jdk/test/tools/launcher/ArgFileSyntax.java b/test/jdk/tools/launcher/ArgFileSyntax.java similarity index 100% rename from jdk/test/tools/launcher/ArgFileSyntax.java rename to test/jdk/tools/launcher/ArgFileSyntax.java diff --git a/jdk/test/tools/launcher/ArgsEnvVar.java b/test/jdk/tools/launcher/ArgsEnvVar.java similarity index 100% rename from jdk/test/tools/launcher/ArgsEnvVar.java rename to test/jdk/tools/launcher/ArgsEnvVar.java diff --git a/jdk/test/tools/launcher/ArgsFileTest.java b/test/jdk/tools/launcher/ArgsFileTest.java similarity index 100% rename from jdk/test/tools/launcher/ArgsFileTest.java rename to test/jdk/tools/launcher/ArgsFileTest.java diff --git a/jdk/test/tools/launcher/Arrrghs.java b/test/jdk/tools/launcher/Arrrghs.java similarity index 100% rename from jdk/test/tools/launcher/Arrrghs.java rename to test/jdk/tools/launcher/Arrrghs.java diff --git a/jdk/test/tools/launcher/BigJar.java b/test/jdk/tools/launcher/BigJar.java similarity index 100% rename from jdk/test/tools/launcher/BigJar.java rename to test/jdk/tools/launcher/BigJar.java diff --git a/jdk/test/tools/launcher/ChangeDataModel.java b/test/jdk/tools/launcher/ChangeDataModel.java similarity index 100% rename from jdk/test/tools/launcher/ChangeDataModel.java rename to test/jdk/tools/launcher/ChangeDataModel.java diff --git a/jdk/test/tools/launcher/ClassPathWildCard.sh b/test/jdk/tools/launcher/ClassPathWildCard.sh similarity index 100% rename from jdk/test/tools/launcher/ClassPathWildCard.sh rename to test/jdk/tools/launcher/ClassPathWildCard.sh diff --git a/jdk/test/tools/launcher/DefaultLocaleTest.java b/test/jdk/tools/launcher/DefaultLocaleTest.java similarity index 100% rename from jdk/test/tools/launcher/DefaultLocaleTest.java rename to test/jdk/tools/launcher/DefaultLocaleTest.java diff --git a/jdk/test/tools/launcher/DefaultLocaleTestRun.java b/test/jdk/tools/launcher/DefaultLocaleTestRun.java similarity index 100% rename from jdk/test/tools/launcher/DefaultLocaleTestRun.java rename to test/jdk/tools/launcher/DefaultLocaleTestRun.java diff --git a/jdk/test/tools/launcher/DiacriticTest.java b/test/jdk/tools/launcher/DiacriticTest.java similarity index 100% rename from jdk/test/tools/launcher/DiacriticTest.java rename to test/jdk/tools/launcher/DiacriticTest.java diff --git a/jdk/test/tools/launcher/EnvironmentVariables.java b/test/jdk/tools/launcher/EnvironmentVariables.java similarity index 100% rename from jdk/test/tools/launcher/EnvironmentVariables.java rename to test/jdk/tools/launcher/EnvironmentVariables.java diff --git a/jdk/test/tools/launcher/ExecutionEnvironment.java b/test/jdk/tools/launcher/ExecutionEnvironment.java similarity index 100% rename from jdk/test/tools/launcher/ExecutionEnvironment.java rename to test/jdk/tools/launcher/ExecutionEnvironment.java diff --git a/jdk/test/tools/launcher/FXLauncherTest.java b/test/jdk/tools/launcher/FXLauncherTest.java similarity index 100% rename from jdk/test/tools/launcher/FXLauncherTest.java rename to test/jdk/tools/launcher/FXLauncherTest.java diff --git a/jdk/test/tools/launcher/I18NArgTest.java b/test/jdk/tools/launcher/I18NArgTest.java similarity index 100% rename from jdk/test/tools/launcher/I18NArgTest.java rename to test/jdk/tools/launcher/I18NArgTest.java diff --git a/jdk/test/tools/launcher/I18NJarTest.java b/test/jdk/tools/launcher/I18NJarTest.java similarity index 100% rename from jdk/test/tools/launcher/I18NJarTest.java rename to test/jdk/tools/launcher/I18NJarTest.java diff --git a/jdk/test/tools/launcher/I18NTest.java b/test/jdk/tools/launcher/I18NTest.java similarity index 100% rename from jdk/test/tools/launcher/I18NTest.java rename to test/jdk/tools/launcher/I18NTest.java diff --git a/jdk/test/tools/launcher/InfoStreams.java b/test/jdk/tools/launcher/InfoStreams.java similarity index 100% rename from jdk/test/tools/launcher/InfoStreams.java rename to test/jdk/tools/launcher/InfoStreams.java diff --git a/jdk/test/tools/launcher/Jexec.java b/test/jdk/tools/launcher/Jexec.java similarity index 100% rename from jdk/test/tools/launcher/Jexec.java rename to test/jdk/tools/launcher/Jexec.java diff --git a/jdk/test/tools/launcher/LauncherMessageTest.java b/test/jdk/tools/launcher/LauncherMessageTest.java similarity index 100% rename from jdk/test/tools/launcher/LauncherMessageTest.java rename to test/jdk/tools/launcher/LauncherMessageTest.java diff --git a/jdk/test/tools/launcher/MainClassAttributeTest.java b/test/jdk/tools/launcher/MainClassAttributeTest.java similarity index 100% rename from jdk/test/tools/launcher/MainClassAttributeTest.java rename to test/jdk/tools/launcher/MainClassAttributeTest.java diff --git a/jdk/test/tools/launcher/MainClassCantBeLoadedTest.java b/test/jdk/tools/launcher/MainClassCantBeLoadedTest.java similarity index 100% rename from jdk/test/tools/launcher/MainClassCantBeLoadedTest.java rename to test/jdk/tools/launcher/MainClassCantBeLoadedTest.java diff --git a/jdk/test/tools/launcher/MiscTests.java b/test/jdk/tools/launcher/MiscTests.java similarity index 100% rename from jdk/test/tools/launcher/MiscTests.java rename to test/jdk/tools/launcher/MiscTests.java diff --git a/jdk/test/tools/launcher/MultipleJRE.sh b/test/jdk/tools/launcher/MultipleJRE.sh similarity index 100% rename from jdk/test/tools/launcher/MultipleJRE.sh rename to test/jdk/tools/launcher/MultipleJRE.sh diff --git a/jdk/test/tools/launcher/MultipleJRERemoved.java b/test/jdk/tools/launcher/MultipleJRERemoved.java similarity index 100% rename from jdk/test/tools/launcher/MultipleJRERemoved.java rename to test/jdk/tools/launcher/MultipleJRERemoved.java diff --git a/jdk/test/tools/launcher/PrintVersion.java b/test/jdk/tools/launcher/PrintVersion.java similarity index 100% rename from jdk/test/tools/launcher/PrintVersion.java rename to test/jdk/tools/launcher/PrintVersion.java diff --git a/jdk/test/tools/launcher/RunpathTest.java b/test/jdk/tools/launcher/RunpathTest.java similarity index 100% rename from jdk/test/tools/launcher/RunpathTest.java rename to test/jdk/tools/launcher/RunpathTest.java diff --git a/jdk/test/tools/launcher/Settings.java b/test/jdk/tools/launcher/Settings.java similarity index 100% rename from jdk/test/tools/launcher/Settings.java rename to test/jdk/tools/launcher/Settings.java diff --git a/jdk/test/tools/launcher/Test7029048.java b/test/jdk/tools/launcher/Test7029048.java similarity index 100% rename from jdk/test/tools/launcher/Test7029048.java rename to test/jdk/tools/launcher/Test7029048.java diff --git a/jdk/test/tools/launcher/TestHelper.java b/test/jdk/tools/launcher/TestHelper.java similarity index 100% rename from jdk/test/tools/launcher/TestHelper.java rename to test/jdk/tools/launcher/TestHelper.java diff --git a/jdk/test/tools/launcher/TestMainWithoutEnclosing.java b/test/jdk/tools/launcher/TestMainWithoutEnclosing.java similarity index 100% rename from jdk/test/tools/launcher/TestMainWithoutEnclosing.java rename to test/jdk/tools/launcher/TestMainWithoutEnclosing.java diff --git a/jdk/test/tools/launcher/TestSpecialArgs.java b/test/jdk/tools/launcher/TestSpecialArgs.java similarity index 100% rename from jdk/test/tools/launcher/TestSpecialArgs.java rename to test/jdk/tools/launcher/TestSpecialArgs.java diff --git a/jdk/test/tools/launcher/TooSmallStackSize.java b/test/jdk/tools/launcher/TooSmallStackSize.java similarity index 100% rename from jdk/test/tools/launcher/TooSmallStackSize.java rename to test/jdk/tools/launcher/TooSmallStackSize.java diff --git a/jdk/test/tools/launcher/ToolsOpts.java b/test/jdk/tools/launcher/ToolsOpts.java similarity index 100% rename from jdk/test/tools/launcher/ToolsOpts.java rename to test/jdk/tools/launcher/ToolsOpts.java diff --git a/jdk/test/tools/launcher/UglyPrintVersion.java b/test/jdk/tools/launcher/UglyPrintVersion.java similarity index 100% rename from jdk/test/tools/launcher/UglyPrintVersion.java rename to test/jdk/tools/launcher/UglyPrintVersion.java diff --git a/jdk/test/tools/launcher/UnicodeTest.jar b/test/jdk/tools/launcher/UnicodeTest.jar similarity index 100% rename from jdk/test/tools/launcher/UnicodeTest.jar rename to test/jdk/tools/launcher/UnicodeTest.jar diff --git a/jdk/test/tools/launcher/UnicodeTest.java b/test/jdk/tools/launcher/UnicodeTest.java similarity index 100% rename from jdk/test/tools/launcher/UnicodeTest.java rename to test/jdk/tools/launcher/UnicodeTest.java diff --git a/jdk/test/tools/launcher/UnresolvedExceptions.java b/test/jdk/tools/launcher/UnresolvedExceptions.java similarity index 100% rename from jdk/test/tools/launcher/UnresolvedExceptions.java rename to test/jdk/tools/launcher/UnresolvedExceptions.java diff --git a/jdk/test/tools/launcher/VersionCheck.java b/test/jdk/tools/launcher/VersionCheck.java similarity index 100% rename from jdk/test/tools/launcher/VersionCheck.java rename to test/jdk/tools/launcher/VersionCheck.java diff --git a/jdk/test/tools/launcher/ZipMeUp.java b/test/jdk/tools/launcher/ZipMeUp.java similarity index 100% rename from jdk/test/tools/launcher/ZipMeUp.java rename to test/jdk/tools/launcher/ZipMeUp.java diff --git a/jdk/test/tools/launcher/modules/addexports/AddExportsTest.java b/test/jdk/tools/launcher/modules/addexports/AddExportsTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/AddExportsTest.java rename to test/jdk/tools/launcher/modules/addexports/AddExportsTest.java diff --git a/jdk/test/tools/launcher/modules/addexports/AddExportsTestWarningError.java b/test/jdk/tools/launcher/modules/addexports/AddExportsTestWarningError.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/AddExportsTestWarningError.java rename to test/jdk/tools/launcher/modules/addexports/AddExportsTestWarningError.java diff --git a/jdk/test/tools/launcher/modules/addexports/manifest/AddExportsAndOpensInManifest.java b/test/jdk/tools/launcher/modules/addexports/manifest/AddExportsAndOpensInManifest.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/manifest/AddExportsAndOpensInManifest.java rename to test/jdk/tools/launcher/modules/addexports/manifest/AddExportsAndOpensInManifest.java diff --git a/jdk/test/tools/launcher/modules/addexports/manifest/Test1.java b/test/jdk/tools/launcher/modules/addexports/manifest/Test1.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/manifest/Test1.java rename to test/jdk/tools/launcher/modules/addexports/manifest/Test1.java diff --git a/jdk/test/tools/launcher/modules/addexports/manifest/Test2.java b/test/jdk/tools/launcher/modules/addexports/manifest/Test2.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/manifest/Test2.java rename to test/jdk/tools/launcher/modules/addexports/manifest/Test2.java diff --git a/jdk/test/tools/launcher/modules/addexports/src/java.transaction/javax/transaction/Transaction.java b/test/jdk/tools/launcher/modules/addexports/src/java.transaction/javax/transaction/Transaction.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/src/java.transaction/javax/transaction/Transaction.java rename to test/jdk/tools/launcher/modules/addexports/src/java.transaction/javax/transaction/Transaction.java diff --git a/jdk/test/tools/launcher/modules/addexports/src/java.transaction/javax/transaction/internal/Helper.java b/test/jdk/tools/launcher/modules/addexports/src/java.transaction/javax/transaction/internal/Helper.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/src/java.transaction/javax/transaction/internal/Helper.java rename to test/jdk/tools/launcher/modules/addexports/src/java.transaction/javax/transaction/internal/Helper.java diff --git a/jdk/test/tools/launcher/modules/addexports/src/java.transaction/module-info.java b/test/jdk/tools/launcher/modules/addexports/src/java.transaction/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/src/java.transaction/module-info.java rename to test/jdk/tools/launcher/modules/addexports/src/java.transaction/module-info.java diff --git a/jdk/test/tools/launcher/modules/addexports/src/m1/jdk/test1/Main.java b/test/jdk/tools/launcher/modules/addexports/src/m1/jdk/test1/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/src/m1/jdk/test1/Main.java rename to test/jdk/tools/launcher/modules/addexports/src/m1/jdk/test1/Main.java diff --git a/jdk/test/tools/launcher/modules/addexports/src/m1/module-info.java b/test/jdk/tools/launcher/modules/addexports/src/m1/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/src/m1/module-info.java rename to test/jdk/tools/launcher/modules/addexports/src/m1/module-info.java diff --git a/jdk/test/tools/launcher/modules/addexports/src/m2/jdk/test2/Main.java b/test/jdk/tools/launcher/modules/addexports/src/m2/jdk/test2/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/src/m2/jdk/test2/Main.java rename to test/jdk/tools/launcher/modules/addexports/src/m2/jdk/test2/Main.java diff --git a/jdk/test/tools/launcher/modules/addexports/src/m2/module-info.java b/test/jdk/tools/launcher/modules/addexports/src/m2/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/src/m2/module-info.java rename to test/jdk/tools/launcher/modules/addexports/src/m2/module-info.java diff --git a/jdk/test/tools/launcher/modules/addexports/src/m3/jdk/test3/Main.java b/test/jdk/tools/launcher/modules/addexports/src/m3/jdk/test3/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/src/m3/jdk/test3/Main.java rename to test/jdk/tools/launcher/modules/addexports/src/m3/jdk/test3/Main.java diff --git a/jdk/test/tools/launcher/modules/addexports/src/m3/module-info.java b/test/jdk/tools/launcher/modules/addexports/src/m3/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/src/m3/module-info.java rename to test/jdk/tools/launcher/modules/addexports/src/m3/module-info.java diff --git a/jdk/test/tools/launcher/modules/addexports/src/m4/jdk/test4/Type.java b/test/jdk/tools/launcher/modules/addexports/src/m4/jdk/test4/Type.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/src/m4/jdk/test4/Type.java rename to test/jdk/tools/launcher/modules/addexports/src/m4/jdk/test4/Type.java diff --git a/jdk/test/tools/launcher/modules/addexports/src/m4/module-info.java b/test/jdk/tools/launcher/modules/addexports/src/m4/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/addexports/src/m4/module-info.java rename to test/jdk/tools/launcher/modules/addexports/src/m4/module-info.java diff --git a/jdk/test/tools/launcher/modules/addmods/AddModsTest.java b/test/jdk/tools/launcher/modules/addmods/AddModsTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/addmods/AddModsTest.java rename to test/jdk/tools/launcher/modules/addmods/AddModsTest.java diff --git a/jdk/test/tools/launcher/modules/addmods/src/logger/logger/Logger.java b/test/jdk/tools/launcher/modules/addmods/src/logger/logger/Logger.java similarity index 100% rename from jdk/test/tools/launcher/modules/addmods/src/logger/logger/Logger.java rename to test/jdk/tools/launcher/modules/addmods/src/logger/logger/Logger.java diff --git a/jdk/test/tools/launcher/modules/addmods/src/logger/module-info.java b/test/jdk/tools/launcher/modules/addmods/src/logger/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/addmods/src/logger/module-info.java rename to test/jdk/tools/launcher/modules/addmods/src/logger/module-info.java diff --git a/jdk/test/tools/launcher/modules/addmods/src/test/module-info.java b/test/jdk/tools/launcher/modules/addmods/src/test/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/addmods/src/test/module-info.java rename to test/jdk/tools/launcher/modules/addmods/src/test/module-info.java diff --git a/jdk/test/tools/launcher/modules/addmods/src/test/test/Main.java b/test/jdk/tools/launcher/modules/addmods/src/test/test/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/addmods/src/test/test/Main.java rename to test/jdk/tools/launcher/modules/addmods/src/test/test/Main.java diff --git a/jdk/test/tools/launcher/modules/addreads/AddReadsTest.java b/test/jdk/tools/launcher/modules/addreads/AddReadsTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/addreads/AddReadsTest.java rename to test/jdk/tools/launcher/modules/addreads/AddReadsTest.java diff --git a/jdk/test/tools/launcher/modules/addreads/AddReadsTestWarningError.java b/test/jdk/tools/launcher/modules/addreads/AddReadsTestWarningError.java similarity index 100% rename from jdk/test/tools/launcher/modules/addreads/AddReadsTestWarningError.java rename to test/jdk/tools/launcher/modules/addreads/AddReadsTestWarningError.java diff --git a/jdk/test/tools/launcher/modules/addreads/src/junit/org/junit/Assert.java b/test/jdk/tools/launcher/modules/addreads/src/junit/org/junit/Assert.java similarity index 100% rename from jdk/test/tools/launcher/modules/addreads/src/junit/org/junit/Assert.java rename to test/jdk/tools/launcher/modules/addreads/src/junit/org/junit/Assert.java diff --git a/jdk/test/tools/launcher/modules/addreads/src/m1/module-info.java b/test/jdk/tools/launcher/modules/addreads/src/m1/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/addreads/src/m1/module-info.java rename to test/jdk/tools/launcher/modules/addreads/src/m1/module-info.java diff --git a/jdk/test/tools/launcher/modules/addreads/src/m1/p/Main.java b/test/jdk/tools/launcher/modules/addreads/src/m1/p/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/addreads/src/m1/p/Main.java rename to test/jdk/tools/launcher/modules/addreads/src/m1/p/Main.java diff --git a/jdk/test/tools/launcher/modules/basic/BasicTest.java b/test/jdk/tools/launcher/modules/basic/BasicTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/basic/BasicTest.java rename to test/jdk/tools/launcher/modules/basic/BasicTest.java diff --git a/jdk/test/tools/launcher/modules/basic/InitErrors.java b/test/jdk/tools/launcher/modules/basic/InitErrors.java similarity index 100% rename from jdk/test/tools/launcher/modules/basic/InitErrors.java rename to test/jdk/tools/launcher/modules/basic/InitErrors.java diff --git a/jdk/test/tools/launcher/modules/basic/src/test/jdk/test/Main.java b/test/jdk/tools/launcher/modules/basic/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/basic/src/test/jdk/test/Main.java rename to test/jdk/tools/launcher/modules/basic/src/test/jdk/test/Main.java diff --git a/jdk/test/tools/launcher/modules/basic/src/test/module-info.java b/test/jdk/tools/launcher/modules/basic/src/test/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/basic/src/test/module-info.java rename to test/jdk/tools/launcher/modules/basic/src/test/module-info.java diff --git a/jdk/test/tools/launcher/modules/classpath/JavaClassPathTest.java b/test/jdk/tools/launcher/modules/classpath/JavaClassPathTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/classpath/JavaClassPathTest.java rename to test/jdk/tools/launcher/modules/classpath/JavaClassPathTest.java diff --git a/jdk/test/tools/launcher/modules/classpath/src/m/jdk/test/Main.java b/test/jdk/tools/launcher/modules/classpath/src/m/jdk/test/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/classpath/src/m/jdk/test/Main.java rename to test/jdk/tools/launcher/modules/classpath/src/m/jdk/test/Main.java diff --git a/jdk/test/tools/launcher/modules/classpath/src/m/module-info.java b/test/jdk/tools/launcher/modules/classpath/src/m/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/classpath/src/m/module-info.java rename to test/jdk/tools/launcher/modules/classpath/src/m/module-info.java diff --git a/jdk/test/tools/launcher/modules/describe/DescribeModuleTest.java b/test/jdk/tools/launcher/modules/describe/DescribeModuleTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/describe/DescribeModuleTest.java rename to test/jdk/tools/launcher/modules/describe/DescribeModuleTest.java diff --git a/jdk/test/tools/launcher/modules/dryrun/DryRunTest.java b/test/jdk/tools/launcher/modules/dryrun/DryRunTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/dryrun/DryRunTest.java rename to test/jdk/tools/launcher/modules/dryrun/DryRunTest.java diff --git a/jdk/test/tools/launcher/modules/dryrun/src/m/module-info.java b/test/jdk/tools/launcher/modules/dryrun/src/m/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/dryrun/src/m/module-info.java rename to test/jdk/tools/launcher/modules/dryrun/src/m/module-info.java diff --git a/jdk/test/tools/launcher/modules/dryrun/src/m/p/Lib.java b/test/jdk/tools/launcher/modules/dryrun/src/m/p/Lib.java similarity index 100% rename from jdk/test/tools/launcher/modules/dryrun/src/m/p/Lib.java rename to test/jdk/tools/launcher/modules/dryrun/src/m/p/Lib.java diff --git a/jdk/test/tools/launcher/modules/dryrun/src/test/jdk/test/Main.java b/test/jdk/tools/launcher/modules/dryrun/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/dryrun/src/test/jdk/test/Main.java rename to test/jdk/tools/launcher/modules/dryrun/src/test/jdk/test/Main.java diff --git a/jdk/test/tools/launcher/modules/dryrun/src/test/jdk/test/MainWithClinit.java b/test/jdk/tools/launcher/modules/dryrun/src/test/jdk/test/MainWithClinit.java similarity index 100% rename from jdk/test/tools/launcher/modules/dryrun/src/test/jdk/test/MainWithClinit.java rename to test/jdk/tools/launcher/modules/dryrun/src/test/jdk/test/MainWithClinit.java diff --git a/jdk/test/tools/launcher/modules/dryrun/src/test/module-info.java b/test/jdk/tools/launcher/modules/dryrun/src/test/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/dryrun/src/test/module-info.java rename to test/jdk/tools/launcher/modules/dryrun/src/test/module-info.java diff --git a/jdk/test/tools/launcher/modules/illegalaccess/IllegalAccessTest.java b/test/jdk/tools/launcher/modules/illegalaccess/IllegalAccessTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/illegalaccess/IllegalAccessTest.java rename to test/jdk/tools/launcher/modules/illegalaccess/IllegalAccessTest.java diff --git a/jdk/test/tools/launcher/modules/illegalaccess/TryAccess.java b/test/jdk/tools/launcher/modules/illegalaccess/TryAccess.java similarity index 100% rename from jdk/test/tools/launcher/modules/illegalaccess/TryAccess.java rename to test/jdk/tools/launcher/modules/illegalaccess/TryAccess.java diff --git a/jdk/test/tools/launcher/modules/illegalaccess/modules/m/module-info.java b/test/jdk/tools/launcher/modules/illegalaccess/modules/m/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/illegalaccess/modules/m/module-info.java rename to test/jdk/tools/launcher/modules/illegalaccess/modules/m/module-info.java diff --git a/jdk/test/tools/launcher/modules/illegalaccess/modules/m/p/Type.java b/test/jdk/tools/launcher/modules/illegalaccess/modules/m/p/Type.java similarity index 100% rename from jdk/test/tools/launcher/modules/illegalaccess/modules/m/p/Type.java rename to test/jdk/tools/launcher/modules/illegalaccess/modules/m/p/Type.java diff --git a/jdk/test/tools/launcher/modules/illegalaccess/patchsrc/java.base/java/lang/Helper.java b/test/jdk/tools/launcher/modules/illegalaccess/patchsrc/java.base/java/lang/Helper.java similarity index 100% rename from jdk/test/tools/launcher/modules/illegalaccess/patchsrc/java.base/java/lang/Helper.java rename to test/jdk/tools/launcher/modules/illegalaccess/patchsrc/java.base/java/lang/Helper.java diff --git a/jdk/test/tools/launcher/modules/illegalaccess/upgradesrc/java.activation/javax/activation/MimeTypeParameterList.java b/test/jdk/tools/launcher/modules/illegalaccess/upgradesrc/java.activation/javax/activation/MimeTypeParameterList.java similarity index 100% rename from jdk/test/tools/launcher/modules/illegalaccess/upgradesrc/java.activation/javax/activation/MimeTypeParameterList.java rename to test/jdk/tools/launcher/modules/illegalaccess/upgradesrc/java.activation/javax/activation/MimeTypeParameterList.java diff --git a/jdk/test/tools/launcher/modules/illegalaccess/upgradesrc/java.activation/module-info.java b/test/jdk/tools/launcher/modules/illegalaccess/upgradesrc/java.activation/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/illegalaccess/upgradesrc/java.activation/module-info.java rename to test/jdk/tools/launcher/modules/illegalaccess/upgradesrc/java.activation/module-info.java diff --git a/jdk/test/tools/launcher/modules/limitmods/LimitModsTest.java b/test/jdk/tools/launcher/modules/limitmods/LimitModsTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/limitmods/LimitModsTest.java rename to test/jdk/tools/launcher/modules/limitmods/LimitModsTest.java diff --git a/jdk/test/tools/launcher/modules/limitmods/src/test/jdk/test/UseAWT.java b/test/jdk/tools/launcher/modules/limitmods/src/test/jdk/test/UseAWT.java similarity index 100% rename from jdk/test/tools/launcher/modules/limitmods/src/test/jdk/test/UseAWT.java rename to test/jdk/tools/launcher/modules/limitmods/src/test/jdk/test/UseAWT.java diff --git a/jdk/test/tools/launcher/modules/limitmods/src/test/module-info.java b/test/jdk/tools/launcher/modules/limitmods/src/test/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/limitmods/src/test/module-info.java rename to test/jdk/tools/launcher/modules/limitmods/src/test/module-info.java diff --git a/jdk/test/tools/launcher/modules/listmods/ListModsTest.java b/test/jdk/tools/launcher/modules/listmods/ListModsTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/listmods/ListModsTest.java rename to test/jdk/tools/launcher/modules/listmods/ListModsTest.java diff --git a/jdk/test/tools/launcher/modules/listmods/src/java.transaction/javax/transaction/Transaction.java b/test/jdk/tools/launcher/modules/listmods/src/java.transaction/javax/transaction/Transaction.java similarity index 100% rename from jdk/test/tools/launcher/modules/listmods/src/java.transaction/javax/transaction/Transaction.java rename to test/jdk/tools/launcher/modules/listmods/src/java.transaction/javax/transaction/Transaction.java diff --git a/jdk/test/tools/launcher/modules/listmods/src/java.transaction/module-info.java b/test/jdk/tools/launcher/modules/listmods/src/java.transaction/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/listmods/src/java.transaction/module-info.java rename to test/jdk/tools/launcher/modules/listmods/src/java.transaction/module-info.java diff --git a/jdk/test/tools/launcher/modules/listmods/src/m1/module-info.java b/test/jdk/tools/launcher/modules/listmods/src/m1/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/listmods/src/m1/module-info.java rename to test/jdk/tools/launcher/modules/listmods/src/m1/module-info.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/PatchTest.java b/test/jdk/tools/launcher/modules/patch/basic/PatchTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/PatchTest.java rename to test/jdk/tools/launcher/modules/patch/basic/PatchTest.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java b/test/jdk/tools/launcher/modules/patch/basic/PatchTestWarningError.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java rename to test/jdk/tools/launcher/modules/patch/basic/PatchTestWarningError.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/src/test/jdk/test/Main.java b/test/jdk/tools/launcher/modules/patch/basic/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/src/test/jdk/test/Main.java rename to test/jdk/tools/launcher/modules/patch/basic/src/test/jdk/test/Main.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/src/test/module-info.java b/test/jdk/tools/launcher/modules/patch/basic/src/test/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/src/test/module-info.java rename to test/jdk/tools/launcher/modules/patch/basic/src/test/module-info.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/src1/java.base/java/text/Annotation.java b/test/jdk/tools/launcher/modules/patch/basic/src1/java.base/java/text/Annotation.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/src1/java.base/java/text/Annotation.java rename to test/jdk/tools/launcher/modules/patch/basic/src1/java.base/java/text/Annotation.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/src1/java.base/java/text/AnnotationBuddy.java b/test/jdk/tools/launcher/modules/patch/basic/src1/java.base/java/text/AnnotationBuddy.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/src1/java.base/java/text/AnnotationBuddy.java rename to test/jdk/tools/launcher/modules/patch/basic/src1/java.base/java/text/AnnotationBuddy.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/Main.java b/test/jdk/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/Main.java rename to test/jdk/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/Main.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/MainBuddy.java b/test/jdk/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/MainBuddy.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/MainBuddy.java rename to test/jdk/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/MainBuddy.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClient.java b/test/jdk/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClient.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClient.java rename to test/jdk/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClient.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClientBuddy.java b/test/jdk/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClientBuddy.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClientBuddy.java rename to test/jdk/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClientBuddy.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/src2/java.base/java/lang2/Object.java b/test/jdk/tools/launcher/modules/patch/basic/src2/java.base/java/lang2/Object.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/src2/java.base/java/lang2/Object.java rename to test/jdk/tools/launcher/modules/patch/basic/src2/java.base/java/lang2/Object.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/src2/jdk.compiler/com/sun/tools/javac2/Main.java b/test/jdk/tools/launcher/modules/patch/basic/src2/jdk.compiler/com/sun/tools/javac2/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/src2/jdk.compiler/com/sun/tools/javac2/Main.java rename to test/jdk/tools/launcher/modules/patch/basic/src2/jdk.compiler/com/sun/tools/javac2/Main.java diff --git a/jdk/test/tools/launcher/modules/patch/basic/src2/jdk.naming.dns/com/sun/jndi/dns2/Zone.java b/test/jdk/tools/launcher/modules/patch/basic/src2/jdk.naming.dns/com/sun/jndi/dns2/Zone.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/basic/src2/jdk.naming.dns/com/sun/jndi/dns2/Zone.java rename to test/jdk/tools/launcher/modules/patch/basic/src2/jdk.naming.dns/com/sun/jndi/dns2/Zone.java diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java b/test/jdk/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java rename to test/jdk/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src/m1/module-info.java b/test/jdk/tools/launcher/modules/patch/systemmodules/src/m1/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/systemmodules/src/m1/module-info.java rename to test/jdk/tools/launcher/modules/patch/systemmodules/src/m1/module-info.java diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src/m1/p1/Main.java b/test/jdk/tools/launcher/modules/patch/systemmodules/src/m1/p1/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/systemmodules/src/m1/p1/Main.java rename to test/jdk/tools/launcher/modules/patch/systemmodules/src/m1/p1/Main.java diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src/m2/module-info.java b/test/jdk/tools/launcher/modules/patch/systemmodules/src/m2/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/systemmodules/src/m2/module-info.java rename to test/jdk/tools/launcher/modules/patch/systemmodules/src/m2/module-info.java diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src/m2/p2/Lib.java b/test/jdk/tools/launcher/modules/patch/systemmodules/src/m2/p2/Lib.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/systemmodules/src/m2/p2/Lib.java rename to test/jdk/tools/launcher/modules/patch/systemmodules/src/m2/p2/Lib.java diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModulesMap.java b/test/jdk/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModulesMap.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModulesMap.java rename to test/jdk/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModulesMap.java diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src1/m1/module-info.java b/test/jdk/tools/launcher/modules/patch/systemmodules/src1/m1/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/systemmodules/src1/m1/module-info.java rename to test/jdk/tools/launcher/modules/patch/systemmodules/src1/m1/module-info.java diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src1/m1/p1/Main.java b/test/jdk/tools/launcher/modules/patch/systemmodules/src1/m1/p1/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/systemmodules/src1/m1/p1/Main.java rename to test/jdk/tools/launcher/modules/patch/systemmodules/src1/m1/p1/Main.java diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src1/m2/p2/Lib.java b/test/jdk/tools/launcher/modules/patch/systemmodules/src1/m2/p2/Lib.java similarity index 100% rename from jdk/test/tools/launcher/modules/patch/systemmodules/src1/m2/p2/Lib.java rename to test/jdk/tools/launcher/modules/patch/systemmodules/src1/m2/p2/Lib.java diff --git a/jdk/test/tools/launcher/modules/showmoduleresolution/ShowModuleResolutionTest.java b/test/jdk/tools/launcher/modules/showmoduleresolution/ShowModuleResolutionTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/showmoduleresolution/ShowModuleResolutionTest.java rename to test/jdk/tools/launcher/modules/showmoduleresolution/ShowModuleResolutionTest.java diff --git a/jdk/test/tools/launcher/modules/upgrademodulepath/UpgradeModulePathTest.java b/test/jdk/tools/launcher/modules/upgrademodulepath/UpgradeModulePathTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/upgrademodulepath/UpgradeModulePathTest.java rename to test/jdk/tools/launcher/modules/upgrademodulepath/UpgradeModulePathTest.java diff --git a/jdk/test/tools/launcher/modules/upgrademodulepath/src/java.enterprise/javax/enterprise/context/Scope.java b/test/jdk/tools/launcher/modules/upgrademodulepath/src/java.enterprise/javax/enterprise/context/Scope.java similarity index 100% rename from jdk/test/tools/launcher/modules/upgrademodulepath/src/java.enterprise/javax/enterprise/context/Scope.java rename to test/jdk/tools/launcher/modules/upgrademodulepath/src/java.enterprise/javax/enterprise/context/Scope.java diff --git a/jdk/test/tools/launcher/modules/upgrademodulepath/src/java.enterprise/module-info.java b/test/jdk/tools/launcher/modules/upgrademodulepath/src/java.enterprise/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/upgrademodulepath/src/java.enterprise/module-info.java rename to test/jdk/tools/launcher/modules/upgrademodulepath/src/java.enterprise/module-info.java diff --git a/jdk/test/tools/launcher/modules/upgrademodulepath/src/java.transaction/javax/transaction/Transaction.java b/test/jdk/tools/launcher/modules/upgrademodulepath/src/java.transaction/javax/transaction/Transaction.java similarity index 100% rename from jdk/test/tools/launcher/modules/upgrademodulepath/src/java.transaction/javax/transaction/Transaction.java rename to test/jdk/tools/launcher/modules/upgrademodulepath/src/java.transaction/javax/transaction/Transaction.java diff --git a/jdk/test/tools/launcher/modules/upgrademodulepath/src/java.transaction/module-info.java b/test/jdk/tools/launcher/modules/upgrademodulepath/src/java.transaction/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/upgrademodulepath/src/java.transaction/module-info.java rename to test/jdk/tools/launcher/modules/upgrademodulepath/src/java.transaction/module-info.java diff --git a/jdk/test/tools/launcher/modules/upgrademodulepath/src/test/jdk/test/Main.java b/test/jdk/tools/launcher/modules/upgrademodulepath/src/test/jdk/test/Main.java similarity index 100% rename from jdk/test/tools/launcher/modules/upgrademodulepath/src/test/jdk/test/Main.java rename to test/jdk/tools/launcher/modules/upgrademodulepath/src/test/jdk/test/Main.java diff --git a/jdk/test/tools/launcher/modules/upgrademodulepath/src/test/module-info.java b/test/jdk/tools/launcher/modules/upgrademodulepath/src/test/module-info.java similarity index 100% rename from jdk/test/tools/launcher/modules/upgrademodulepath/src/test/module-info.java rename to test/jdk/tools/launcher/modules/upgrademodulepath/src/test/module-info.java diff --git a/jdk/test/tools/launcher/modules/validate/ValidateModulesTest.java b/test/jdk/tools/launcher/modules/validate/ValidateModulesTest.java similarity index 100% rename from jdk/test/tools/launcher/modules/validate/ValidateModulesTest.java rename to test/jdk/tools/launcher/modules/validate/ValidateModulesTest.java diff --git a/jdk/test/tools/lib/tests/Helper.java b/test/jdk/tools/lib/tests/Helper.java similarity index 100% rename from jdk/test/tools/lib/tests/Helper.java rename to test/jdk/tools/lib/tests/Helper.java diff --git a/jdk/test/tools/lib/tests/JImageGenerator.java b/test/jdk/tools/lib/tests/JImageGenerator.java similarity index 100% rename from jdk/test/tools/lib/tests/JImageGenerator.java rename to test/jdk/tools/lib/tests/JImageGenerator.java diff --git a/jdk/test/tools/lib/tests/JImageValidator.java b/test/jdk/tools/lib/tests/JImageValidator.java similarity index 100% rename from jdk/test/tools/lib/tests/JImageValidator.java rename to test/jdk/tools/lib/tests/JImageValidator.java diff --git a/jdk/test/tools/lib/tests/Result.java b/test/jdk/tools/lib/tests/Result.java similarity index 100% rename from jdk/test/tools/lib/tests/Result.java rename to test/jdk/tools/lib/tests/Result.java diff --git a/jdk/test/tools/pack200/AttributeTests.java b/test/jdk/tools/pack200/AttributeTests.java similarity index 100% rename from jdk/test/tools/pack200/AttributeTests.java rename to test/jdk/tools/pack200/AttributeTests.java diff --git a/jdk/test/tools/pack200/BandIntegrity.java b/test/jdk/tools/pack200/BandIntegrity.java similarity index 100% rename from jdk/test/tools/pack200/BandIntegrity.java rename to test/jdk/tools/pack200/BandIntegrity.java diff --git a/jdk/test/tools/pack200/CommandLineTests.java b/test/jdk/tools/pack200/CommandLineTests.java similarity index 100% rename from jdk/test/tools/pack200/CommandLineTests.java rename to test/jdk/tools/pack200/CommandLineTests.java diff --git a/jdk/test/tools/pack200/InstructionTests.java b/test/jdk/tools/pack200/InstructionTests.java similarity index 100% rename from jdk/test/tools/pack200/InstructionTests.java rename to test/jdk/tools/pack200/InstructionTests.java diff --git a/jdk/test/tools/pack200/ModuleAttributes.java b/test/jdk/tools/pack200/ModuleAttributes.java similarity index 100% rename from jdk/test/tools/pack200/ModuleAttributes.java rename to test/jdk/tools/pack200/ModuleAttributes.java diff --git a/jdk/test/tools/pack200/MultiRelease.java b/test/jdk/tools/pack200/MultiRelease.java similarity index 100% rename from jdk/test/tools/pack200/MultiRelease.java rename to test/jdk/tools/pack200/MultiRelease.java diff --git a/jdk/test/tools/pack200/Pack200Props.java b/test/jdk/tools/pack200/Pack200Props.java similarity index 100% rename from jdk/test/tools/pack200/Pack200Props.java rename to test/jdk/tools/pack200/Pack200Props.java diff --git a/jdk/test/tools/pack200/Pack200Test.java b/test/jdk/tools/pack200/Pack200Test.java similarity index 100% rename from jdk/test/tools/pack200/Pack200Test.java rename to test/jdk/tools/pack200/Pack200Test.java diff --git a/jdk/test/tools/pack200/PackChecksum.java b/test/jdk/tools/pack200/PackChecksum.java similarity index 100% rename from jdk/test/tools/pack200/PackChecksum.java rename to test/jdk/tools/pack200/PackChecksum.java diff --git a/jdk/test/tools/pack200/PackTestZip64.java b/test/jdk/tools/pack200/PackTestZip64.java similarity index 100% rename from jdk/test/tools/pack200/PackTestZip64.java rename to test/jdk/tools/pack200/PackTestZip64.java diff --git a/jdk/test/tools/pack200/PackTestZip64Manual.java b/test/jdk/tools/pack200/PackTestZip64Manual.java similarity index 100% rename from jdk/test/tools/pack200/PackTestZip64Manual.java rename to test/jdk/tools/pack200/PackTestZip64Manual.java diff --git a/jdk/test/tools/pack200/PackageVersionTest.java b/test/jdk/tools/pack200/PackageVersionTest.java similarity index 100% rename from jdk/test/tools/pack200/PackageVersionTest.java rename to test/jdk/tools/pack200/PackageVersionTest.java diff --git a/jdk/test/tools/pack200/RepackTest.java b/test/jdk/tools/pack200/RepackTest.java similarity index 100% rename from jdk/test/tools/pack200/RepackTest.java rename to test/jdk/tools/pack200/RepackTest.java diff --git a/jdk/test/tools/pack200/T7007157.java b/test/jdk/tools/pack200/T7007157.java similarity index 100% rename from jdk/test/tools/pack200/T7007157.java rename to test/jdk/tools/pack200/T7007157.java diff --git a/jdk/test/tools/pack200/TestExceptions.java b/test/jdk/tools/pack200/TestExceptions.java similarity index 100% rename from jdk/test/tools/pack200/TestExceptions.java rename to test/jdk/tools/pack200/TestExceptions.java diff --git a/jdk/test/tools/pack200/TestNormal.java b/test/jdk/tools/pack200/TestNormal.java similarity index 100% rename from jdk/test/tools/pack200/TestNormal.java rename to test/jdk/tools/pack200/TestNormal.java diff --git a/jdk/test/tools/pack200/TimeStamp.java b/test/jdk/tools/pack200/TimeStamp.java similarity index 100% rename from jdk/test/tools/pack200/TimeStamp.java rename to test/jdk/tools/pack200/TimeStamp.java diff --git a/jdk/test/tools/pack200/UnpackerMemoryTest.java b/test/jdk/tools/pack200/UnpackerMemoryTest.java similarity index 100% rename from jdk/test/tools/pack200/UnpackerMemoryTest.java rename to test/jdk/tools/pack200/UnpackerMemoryTest.java diff --git a/jdk/test/tools/pack200/Utils.java b/test/jdk/tools/pack200/Utils.java similarity index 100% rename from jdk/test/tools/pack200/Utils.java rename to test/jdk/tools/pack200/Utils.java diff --git a/jdk/test/tools/pack200/badattr.jar b/test/jdk/tools/pack200/badattr.jar similarity index 100% rename from jdk/test/tools/pack200/badattr.jar rename to test/jdk/tools/pack200/badattr.jar diff --git a/jdk/test/tools/pack200/pack200-verifier/data/README b/test/jdk/tools/pack200/pack200-verifier/data/README similarity index 100% rename from jdk/test/tools/pack200/pack200-verifier/data/README rename to test/jdk/tools/pack200/pack200-verifier/data/README diff --git a/jdk/test/tools/pack200/pack200-verifier/data/golden.jar b/test/jdk/tools/pack200/pack200-verifier/data/golden.jar similarity index 100% rename from jdk/test/tools/pack200/pack200-verifier/data/golden.jar rename to test/jdk/tools/pack200/pack200-verifier/data/golden.jar diff --git a/jdk/test/tools/pack200/pack200-verifier/make/build.xml b/test/jdk/tools/pack200/pack200-verifier/make/build.xml similarity index 100% rename from jdk/test/tools/pack200/pack200-verifier/make/build.xml rename to test/jdk/tools/pack200/pack200-verifier/make/build.xml diff --git a/jdk/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/ClassCompare.java b/test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/ClassCompare.java similarity index 100% rename from jdk/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/ClassCompare.java rename to test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/ClassCompare.java diff --git a/jdk/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java b/test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java similarity index 100% rename from jdk/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java rename to test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java diff --git a/jdk/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/JarFileCompare.java b/test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/JarFileCompare.java similarity index 100% rename from jdk/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/JarFileCompare.java rename to test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/JarFileCompare.java diff --git a/jdk/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java b/test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java similarity index 100% rename from jdk/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java rename to test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java diff --git a/jdk/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java b/test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java similarity index 100% rename from jdk/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java rename to test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java diff --git a/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java b/test/jdk/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java similarity index 100% rename from jdk/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java rename to test/jdk/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java diff --git a/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/CommandLineParser.java b/test/jdk/tools/pack200/pack200-verifier/src/xmlkit/CommandLineParser.java similarity index 100% rename from jdk/test/tools/pack200/pack200-verifier/src/xmlkit/CommandLineParser.java rename to test/jdk/tools/pack200/pack200-verifier/src/xmlkit/CommandLineParser.java diff --git a/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/TokenList.java b/test/jdk/tools/pack200/pack200-verifier/src/xmlkit/TokenList.java similarity index 100% rename from jdk/test/tools/pack200/pack200-verifier/src/xmlkit/TokenList.java rename to test/jdk/tools/pack200/pack200-verifier/src/xmlkit/TokenList.java diff --git a/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/XMLKit.java b/test/jdk/tools/pack200/pack200-verifier/src/xmlkit/XMLKit.java similarity index 100% rename from jdk/test/tools/pack200/pack200-verifier/src/xmlkit/XMLKit.java rename to test/jdk/tools/pack200/pack200-verifier/src/xmlkit/XMLKit.java diff --git a/jdk/test/tools/pack200/typeannos/Lambda.java b/test/jdk/tools/pack200/typeannos/Lambda.java similarity index 100% rename from jdk/test/tools/pack200/typeannos/Lambda.java rename to test/jdk/tools/pack200/typeannos/Lambda.java diff --git a/jdk/test/tools/pack200/typeannos/Readme.txt b/test/jdk/tools/pack200/typeannos/Readme.txt similarity index 100% rename from jdk/test/tools/pack200/typeannos/Readme.txt rename to test/jdk/tools/pack200/typeannos/Readme.txt diff --git a/jdk/test/tools/pack200/typeannos/TargetTypes.java b/test/jdk/tools/pack200/typeannos/TargetTypes.java similarity index 100% rename from jdk/test/tools/pack200/typeannos/TargetTypes.java rename to test/jdk/tools/pack200/typeannos/TargetTypes.java diff --git a/jdk/test/tools/pack200/typeannos/TestTypeAnnotations.java b/test/jdk/tools/pack200/typeannos/TestTypeAnnotations.java similarity index 100% rename from jdk/test/tools/pack200/typeannos/TestTypeAnnotations.java rename to test/jdk/tools/pack200/typeannos/TestTypeAnnotations.java diff --git a/jdk/test/tools/pack200/typeannos/TypeUseTarget.java b/test/jdk/tools/pack200/typeannos/TypeUseTarget.java similarity index 100% rename from jdk/test/tools/pack200/typeannos/TypeUseTarget.java rename to test/jdk/tools/pack200/typeannos/TypeUseTarget.java diff --git a/jdk/test/tools/schemagen/MultiReleaseJarTest.java b/test/jdk/tools/schemagen/MultiReleaseJarTest.java similarity index 100% rename from jdk/test/tools/schemagen/MultiReleaseJarTest.java rename to test/jdk/tools/schemagen/MultiReleaseJarTest.java diff --git a/jdk/test/tools/schemagen/data/mr/base/schemagen/Person.java b/test/jdk/tools/schemagen/data/mr/base/schemagen/Person.java similarity index 100% rename from jdk/test/tools/schemagen/data/mr/base/schemagen/Person.java rename to test/jdk/tools/schemagen/data/mr/base/schemagen/Person.java diff --git a/jdk/test/tools/schemagen/data/mr/v10/schemagen/Person.java b/test/jdk/tools/schemagen/data/mr/v10/schemagen/Person.java similarity index 100% rename from jdk/test/tools/schemagen/data/mr/v10/schemagen/Person.java rename to test/jdk/tools/schemagen/data/mr/v10/schemagen/Person.java diff --git a/jdk/test/tools/schemagen/data/mr/v9/schemagen/Person.java b/test/jdk/tools/schemagen/data/mr/v9/schemagen/Person.java similarity index 100% rename from jdk/test/tools/schemagen/data/mr/v9/schemagen/Person.java rename to test/jdk/tools/schemagen/data/mr/v9/schemagen/Person.java diff --git a/jdk/test/tools/wsgen/MultiReleaseJarTest.java b/test/jdk/tools/wsgen/MultiReleaseJarTest.java similarity index 100% rename from jdk/test/tools/wsgen/MultiReleaseJarTest.java rename to test/jdk/tools/wsgen/MultiReleaseJarTest.java diff --git a/jdk/test/tools/wsgen/data/mr/base/wsgen/TestServer.java b/test/jdk/tools/wsgen/data/mr/base/wsgen/TestServer.java similarity index 100% rename from jdk/test/tools/wsgen/data/mr/base/wsgen/TestServer.java rename to test/jdk/tools/wsgen/data/mr/base/wsgen/TestServer.java diff --git a/jdk/test/tools/wsgen/data/mr/v10/wsgen/TestServer.java b/test/jdk/tools/wsgen/data/mr/v10/wsgen/TestServer.java similarity index 100% rename from jdk/test/tools/wsgen/data/mr/v10/wsgen/TestServer.java rename to test/jdk/tools/wsgen/data/mr/v10/wsgen/TestServer.java diff --git a/jdk/test/tools/wsgen/data/mr/v9/wsgen/TestServer.java b/test/jdk/tools/wsgen/data/mr/v9/wsgen/TestServer.java similarity index 100% rename from jdk/test/tools/wsgen/data/mr/v9/wsgen/TestServer.java rename to test/jdk/tools/wsgen/data/mr/v9/wsgen/TestServer.java diff --git a/jdk/test/vm/verifier/TestStaticIF.java b/test/jdk/vm/verifier/TestStaticIF.java similarity index 100% rename from jdk/test/vm/verifier/TestStaticIF.java rename to test/jdk/vm/verifier/TestStaticIF.java diff --git a/jdk/test/vm/verifier/VerifyProtectedConstructor.java b/test/jdk/vm/verifier/VerifyProtectedConstructor.java similarity index 100% rename from jdk/test/vm/verifier/VerifyProtectedConstructor.java rename to test/jdk/vm/verifier/VerifyProtectedConstructor.java diff --git a/jdk/test/vm/verifier/VerifyStackForExceptionHandlers.java b/test/jdk/vm/verifier/VerifyStackForExceptionHandlers.java similarity index 100% rename from jdk/test/vm/verifier/VerifyStackForExceptionHandlers.java rename to test/jdk/vm/verifier/VerifyStackForExceptionHandlers.java diff --git a/jdk/test/vm/verifier/defaultMethods/DefaultMethodRegressionTests.java b/test/jdk/vm/verifier/defaultMethods/DefaultMethodRegressionTests.java similarity index 100% rename from jdk/test/vm/verifier/defaultMethods/DefaultMethodRegressionTests.java rename to test/jdk/vm/verifier/defaultMethods/DefaultMethodRegressionTests.java diff --git a/jdk/test/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java b/test/jdk/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java similarity index 100% rename from jdk/test/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java rename to test/jdk/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java diff --git a/langtools/test/Makefile b/test/langtools/Makefile similarity index 100% rename from langtools/test/Makefile rename to test/langtools/Makefile diff --git a/langtools/test/ProblemList.txt b/test/langtools/ProblemList.txt similarity index 100% rename from langtools/test/ProblemList.txt rename to test/langtools/ProblemList.txt diff --git a/langtools/test/TEST.ROOT b/test/langtools/TEST.ROOT similarity index 100% rename from langtools/test/TEST.ROOT rename to test/langtools/TEST.ROOT diff --git a/langtools/test/TEST.groups b/test/langtools/TEST.groups similarity index 100% rename from langtools/test/TEST.groups rename to test/langtools/TEST.groups diff --git a/langtools/test/jdk/internal/shellsupport/doc/JavadocFormatterTest.java b/test/langtools/jdk/internal/shellsupport/doc/JavadocFormatterTest.java similarity index 100% rename from langtools/test/jdk/internal/shellsupport/doc/JavadocFormatterTest.java rename to test/langtools/jdk/internal/shellsupport/doc/JavadocFormatterTest.java diff --git a/langtools/test/jdk/internal/shellsupport/doc/JavadocHelperTest.java b/test/langtools/jdk/internal/shellsupport/doc/JavadocHelperTest.java similarity index 100% rename from langtools/test/jdk/internal/shellsupport/doc/JavadocHelperTest.java rename to test/langtools/jdk/internal/shellsupport/doc/JavadocHelperTest.java diff --git a/langtools/test/jdk/javadoc/doclet/5093723/DocumentedClass.java b/test/langtools/jdk/javadoc/doclet/5093723/DocumentedClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/5093723/DocumentedClass.java rename to test/langtools/jdk/javadoc/doclet/5093723/DocumentedClass.java diff --git a/langtools/test/jdk/javadoc/doclet/5093723/T5093723.java b/test/langtools/jdk/javadoc/doclet/5093723/T5093723.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/5093723/T5093723.java rename to test/langtools/jdk/javadoc/doclet/5093723/T5093723.java diff --git a/langtools/test/jdk/javadoc/doclet/5093723/UndocumentedClass.java b/test/langtools/jdk/javadoc/doclet/5093723/UndocumentedClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/5093723/UndocumentedClass.java rename to test/langtools/jdk/javadoc/doclet/5093723/UndocumentedClass.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessAsciiArt/AccessAsciiArt.java b/test/langtools/jdk/javadoc/doclet/AccessAsciiArt/AccessAsciiArt.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessAsciiArt/AccessAsciiArt.java rename to test/langtools/jdk/javadoc/doclet/AccessAsciiArt/AccessAsciiArt.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessAsciiArt/p1/C.java b/test/langtools/jdk/javadoc/doclet/AccessAsciiArt/p1/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessAsciiArt/p1/C.java rename to test/langtools/jdk/javadoc/doclet/AccessAsciiArt/p1/C.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessAsciiArt/p1/I.java b/test/langtools/jdk/javadoc/doclet/AccessAsciiArt/p1/I.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessAsciiArt/p1/I.java rename to test/langtools/jdk/javadoc/doclet/AccessAsciiArt/p1/I.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessAsciiArt/p1/SC.java b/test/langtools/jdk/javadoc/doclet/AccessAsciiArt/p1/SC.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessAsciiArt/p1/SC.java rename to test/langtools/jdk/javadoc/doclet/AccessAsciiArt/p1/SC.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessAsciiArt/p1/SI.java b/test/langtools/jdk/javadoc/doclet/AccessAsciiArt/p1/SI.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessAsciiArt/p1/SI.java rename to test/langtools/jdk/javadoc/doclet/AccessAsciiArt/p1/SI.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessAsciiArt/p1/subpkg/SSC.java b/test/langtools/jdk/javadoc/doclet/AccessAsciiArt/p1/subpkg/SSC.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessAsciiArt/p1/subpkg/SSC.java rename to test/langtools/jdk/javadoc/doclet/AccessAsciiArt/p1/subpkg/SSC.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessFrameTitle/AccessFrameTitle.java b/test/langtools/jdk/javadoc/doclet/AccessFrameTitle/AccessFrameTitle.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessFrameTitle/AccessFrameTitle.java rename to test/langtools/jdk/javadoc/doclet/AccessFrameTitle/AccessFrameTitle.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessFrameTitle/p1/C1.java b/test/langtools/jdk/javadoc/doclet/AccessFrameTitle/p1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessFrameTitle/p1/C1.java rename to test/langtools/jdk/javadoc/doclet/AccessFrameTitle/p1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessFrameTitle/p2/C2.java b/test/langtools/jdk/javadoc/doclet/AccessFrameTitle/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessFrameTitle/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/AccessFrameTitle/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessH1/AccessH1.java b/test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessH1/AccessH1.java rename to test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessH1/p1/C.java b/test/langtools/jdk/javadoc/doclet/AccessH1/p1/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessH1/p1/C.java rename to test/langtools/jdk/javadoc/doclet/AccessH1/p1/C.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessH1/p2/C2.java b/test/langtools/jdk/javadoc/doclet/AccessH1/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessH1/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/AccessH1/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java b/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java rename to test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessSkipNav/p1/C1.java b/test/langtools/jdk/javadoc/doclet/AccessSkipNav/p1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessSkipNav/p1/C1.java rename to test/langtools/jdk/javadoc/doclet/AccessSkipNav/p1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessSkipNav/p2/C2.java b/test/langtools/jdk/javadoc/doclet/AccessSkipNav/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessSkipNav/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/AccessSkipNav/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessSummary/AccessSummary.java b/test/langtools/jdk/javadoc/doclet/AccessSummary/AccessSummary.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessSummary/AccessSummary.java rename to test/langtools/jdk/javadoc/doclet/AccessSummary/AccessSummary.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessSummary/p1/C1.java b/test/langtools/jdk/javadoc/doclet/AccessSummary/p1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessSummary/p1/C1.java rename to test/langtools/jdk/javadoc/doclet/AccessSummary/p1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/AccessSummary/p2/C2.java b/test/langtools/jdk/javadoc/doclet/AccessSummary/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AccessSummary/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/AccessSummary/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/AuthorDD/AuthorDD.java b/test/langtools/jdk/javadoc/doclet/AuthorDD/AuthorDD.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AuthorDD/AuthorDD.java rename to test/langtools/jdk/javadoc/doclet/AuthorDD/AuthorDD.java diff --git a/langtools/test/jdk/javadoc/doclet/AuthorDD/p1/C1.java b/test/langtools/jdk/javadoc/doclet/AuthorDD/p1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/AuthorDD/p1/C1.java rename to test/langtools/jdk/javadoc/doclet/AuthorDD/p1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java b/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java rename to test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java diff --git a/langtools/test/jdk/javadoc/doclet/DocRootSlash/overview.html b/test/langtools/jdk/javadoc/doclet/DocRootSlash/overview.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/DocRootSlash/overview.html rename to test/langtools/jdk/javadoc/doclet/DocRootSlash/overview.html diff --git a/langtools/test/jdk/javadoc/doclet/DocRootSlash/p1/C1.java b/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/DocRootSlash/p1/C1.java rename to test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/DocRootSlash/p1/package.html b/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/DocRootSlash/p1/package.html rename to test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/package.html diff --git a/langtools/test/jdk/javadoc/doclet/DocRootSlash/p2/C2.java b/test/langtools/jdk/javadoc/doclet/DocRootSlash/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/DocRootSlash/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/DocRootSlash/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/DocRootSlash/p2/package.html b/test/langtools/jdk/javadoc/doclet/DocRootSlash/p2/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/DocRootSlash/p2/package.html rename to test/langtools/jdk/javadoc/doclet/DocRootSlash/p2/package.html diff --git a/langtools/test/jdk/javadoc/doclet/InheritDocForUserTags/DocTest.java b/test/langtools/jdk/javadoc/doclet/InheritDocForUserTags/DocTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/InheritDocForUserTags/DocTest.java rename to test/langtools/jdk/javadoc/doclet/InheritDocForUserTags/DocTest.java diff --git a/langtools/test/jdk/javadoc/doclet/JavascriptWinTitle/JavascriptWinTitle.java b/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/JavascriptWinTitle.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/JavascriptWinTitle/JavascriptWinTitle.java rename to test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/JavascriptWinTitle.java diff --git a/langtools/test/jdk/javadoc/doclet/JavascriptWinTitle/overview.html b/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/overview.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/JavascriptWinTitle/overview.html rename to test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/overview.html diff --git a/langtools/test/jdk/javadoc/doclet/JavascriptWinTitle/p1/C.java b/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/p1/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/JavascriptWinTitle/p1/C.java rename to test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/p1/C.java diff --git a/langtools/test/jdk/javadoc/doclet/JavascriptWinTitle/p2/C2.java b/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/JavascriptWinTitle/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/JavascriptWinTitle/package-list b/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/package-list similarity index 100% rename from langtools/test/jdk/javadoc/doclet/JavascriptWinTitle/package-list rename to test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/package-list diff --git a/langtools/test/jdk/javadoc/doclet/MetaTag/MetaTag.java b/test/langtools/jdk/javadoc/doclet/MetaTag/MetaTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/MetaTag/MetaTag.java rename to test/langtools/jdk/javadoc/doclet/MetaTag/MetaTag.java diff --git a/langtools/test/jdk/javadoc/doclet/MetaTag/p1/C1.java b/test/langtools/jdk/javadoc/doclet/MetaTag/p1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/MetaTag/p1/C1.java rename to test/langtools/jdk/javadoc/doclet/MetaTag/p1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/MetaTag/p2/C2.java b/test/langtools/jdk/javadoc/doclet/MetaTag/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/MetaTag/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/MetaTag/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/PackagesHeader/PackagesHeader.java b/test/langtools/jdk/javadoc/doclet/PackagesHeader/PackagesHeader.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/PackagesHeader/PackagesHeader.java rename to test/langtools/jdk/javadoc/doclet/PackagesHeader/PackagesHeader.java diff --git a/langtools/test/jdk/javadoc/doclet/PackagesHeader/p1/C1.java b/test/langtools/jdk/javadoc/doclet/PackagesHeader/p1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/PackagesHeader/p1/C1.java rename to test/langtools/jdk/javadoc/doclet/PackagesHeader/p1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/PackagesHeader/p2/C2.java b/test/langtools/jdk/javadoc/doclet/PackagesHeader/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/PackagesHeader/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/PackagesHeader/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/T6735320/SerialFieldTest.java b/test/langtools/jdk/javadoc/doclet/T6735320/SerialFieldTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/T6735320/SerialFieldTest.java rename to test/langtools/jdk/javadoc/doclet/T6735320/SerialFieldTest.java diff --git a/langtools/test/jdk/javadoc/doclet/T6735320/T6735320.java b/test/langtools/jdk/javadoc/doclet/T6735320/T6735320.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/T6735320/T6735320.java rename to test/langtools/jdk/javadoc/doclet/T6735320/T6735320.java diff --git a/langtools/test/jdk/javadoc/doclet/ValidHtml/ValidHtml.java b/test/langtools/jdk/javadoc/doclet/ValidHtml/ValidHtml.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/ValidHtml/ValidHtml.java rename to test/langtools/jdk/javadoc/doclet/ValidHtml/ValidHtml.java diff --git a/langtools/test/jdk/javadoc/doclet/ValidHtml/overview.html b/test/langtools/jdk/javadoc/doclet/ValidHtml/overview.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/ValidHtml/overview.html rename to test/langtools/jdk/javadoc/doclet/ValidHtml/overview.html diff --git a/langtools/test/jdk/javadoc/doclet/ValidHtml/p1/C.java b/test/langtools/jdk/javadoc/doclet/ValidHtml/p1/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/ValidHtml/p1/C.java rename to test/langtools/jdk/javadoc/doclet/ValidHtml/p1/C.java diff --git a/langtools/test/jdk/javadoc/doclet/ValidHtml/p2/C2.java b/test/langtools/jdk/javadoc/doclet/ValidHtml/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/ValidHtml/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/ValidHtml/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/VersionNumber/VersionNumber.java b/test/langtools/jdk/javadoc/doclet/VersionNumber/VersionNumber.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/VersionNumber/VersionNumber.java rename to test/langtools/jdk/javadoc/doclet/VersionNumber/VersionNumber.java diff --git a/langtools/test/jdk/javadoc/doclet/VersionNumber/p1/C.java b/test/langtools/jdk/javadoc/doclet/VersionNumber/p1/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/VersionNumber/p1/C.java rename to test/langtools/jdk/javadoc/doclet/VersionNumber/p1/C.java diff --git a/langtools/test/jdk/javadoc/doclet/WindowTitles/WindowTitles.java b/test/langtools/jdk/javadoc/doclet/WindowTitles/WindowTitles.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/WindowTitles/WindowTitles.java rename to test/langtools/jdk/javadoc/doclet/WindowTitles/WindowTitles.java diff --git a/langtools/test/jdk/javadoc/doclet/WindowTitles/p1/C1.java b/test/langtools/jdk/javadoc/doclet/WindowTitles/p1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/WindowTitles/p1/C1.java rename to test/langtools/jdk/javadoc/doclet/WindowTitles/p1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/WindowTitles/p2/C2.java b/test/langtools/jdk/javadoc/doclet/WindowTitles/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/WindowTitles/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/WindowTitles/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/_template/Template.java b/test/langtools/jdk/javadoc/doclet/_template/Template.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/_template/Template.java rename to test/langtools/jdk/javadoc/doclet/_template/Template.java diff --git a/langtools/test/jdk/javadoc/doclet/_template/TemplateComplete.java b/test/langtools/jdk/javadoc/doclet/_template/TemplateComplete.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/_template/TemplateComplete.java rename to test/langtools/jdk/javadoc/doclet/_template/TemplateComplete.java diff --git a/langtools/test/jdk/javadoc/doclet/constantValues/A.java b/test/langtools/jdk/javadoc/doclet/constantValues/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/constantValues/A.java rename to test/langtools/jdk/javadoc/doclet/constantValues/A.java diff --git a/langtools/test/jdk/javadoc/doclet/constantValues/TestConstantValues.java b/test/langtools/jdk/javadoc/doclet/constantValues/TestConstantValues.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/constantValues/TestConstantValues.java rename to test/langtools/jdk/javadoc/doclet/constantValues/TestConstantValues.java diff --git a/langtools/test/jdk/javadoc/doclet/constantValues/TestConstantValues2.java b/test/langtools/jdk/javadoc/doclet/constantValues/TestConstantValues2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/constantValues/TestConstantValues2.java rename to test/langtools/jdk/javadoc/doclet/constantValues/TestConstantValues2.java diff --git a/langtools/test/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java b/test/langtools/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java rename to test/langtools/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java diff --git a/langtools/test/jdk/javadoc/doclet/dupThrowsTags/TestDupThrowsTags.java b/test/langtools/jdk/javadoc/doclet/dupThrowsTags/TestDupThrowsTags.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/dupThrowsTags/TestDupThrowsTags.java rename to test/langtools/jdk/javadoc/doclet/dupThrowsTags/TestDupThrowsTags.java diff --git a/langtools/test/jdk/javadoc/doclet/lib/JavadocTester.java b/test/langtools/jdk/javadoc/doclet/lib/JavadocTester.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/lib/JavadocTester.java rename to test/langtools/jdk/javadoc/doclet/lib/JavadocTester.java diff --git a/langtools/test/jdk/javadoc/doclet/testAbsLinkPath/TestAbsLinkPath.java b/test/langtools/jdk/javadoc/doclet/testAbsLinkPath/TestAbsLinkPath.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAbsLinkPath/TestAbsLinkPath.java rename to test/langtools/jdk/javadoc/doclet/testAbsLinkPath/TestAbsLinkPath.java diff --git a/langtools/test/jdk/javadoc/doclet/testAbsLinkPath/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testAbsLinkPath/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAbsLinkPath/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testAbsLinkPath/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testAbsLinkPath/pkg2/C2.java b/test/langtools/jdk/javadoc/doclet/testAbsLinkPath/pkg2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAbsLinkPath/pkg2/C2.java rename to test/langtools/jdk/javadoc/doclet/testAbsLinkPath/pkg2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testAbstractMethod/TestAbstractMethod.java b/test/langtools/jdk/javadoc/doclet/testAbstractMethod/TestAbstractMethod.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAbstractMethod/TestAbstractMethod.java rename to test/langtools/jdk/javadoc/doclet/testAbstractMethod/TestAbstractMethod.java diff --git a/langtools/test/jdk/javadoc/doclet/testAbstractMethod/pkg/A.java b/test/langtools/jdk/javadoc/doclet/testAbstractMethod/pkg/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAbstractMethod/pkg/A.java rename to test/langtools/jdk/javadoc/doclet/testAbstractMethod/pkg/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testAbstractMethod/pkg/B.java b/test/langtools/jdk/javadoc/doclet/testAbstractMethod/pkg/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAbstractMethod/pkg/B.java rename to test/langtools/jdk/javadoc/doclet/testAbstractMethod/pkg/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testAbstractMethod/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testAbstractMethod/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAbstractMethod/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testAbstractMethod/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java b/test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java rename to test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java diff --git a/langtools/test/jdk/javadoc/doclet/testAnchorNames/pkg1/DeprMemClass.java b/test/langtools/jdk/javadoc/doclet/testAnchorNames/pkg1/DeprMemClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAnchorNames/pkg1/DeprMemClass.java rename to test/langtools/jdk/javadoc/doclet/testAnchorNames/pkg1/DeprMemClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testAnchorNames/pkg1/RegClass.java b/test/langtools/jdk/javadoc/doclet/testAnchorNames/pkg1/RegClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAnchorNames/pkg1/RegClass.java rename to test/langtools/jdk/javadoc/doclet/testAnchorNames/pkg1/RegClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testAnnotationOptional/TestAnnotationOptional.java b/test/langtools/jdk/javadoc/doclet/testAnnotationOptional/TestAnnotationOptional.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAnnotationOptional/TestAnnotationOptional.java rename to test/langtools/jdk/javadoc/doclet/testAnnotationOptional/TestAnnotationOptional.java diff --git a/langtools/test/jdk/javadoc/doclet/testAnnotationOptional/pkg/AnnotationOptional.java b/test/langtools/jdk/javadoc/doclet/testAnnotationOptional/pkg/AnnotationOptional.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAnnotationOptional/pkg/AnnotationOptional.java rename to test/langtools/jdk/javadoc/doclet/testAnnotationOptional/pkg/AnnotationOptional.java diff --git a/langtools/test/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java rename to test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java diff --git a/langtools/test/jdk/javadoc/doclet/testAnnotationTypes/pkg/AnnotationType.java b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/pkg/AnnotationType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAnnotationTypes/pkg/AnnotationType.java rename to test/langtools/jdk/javadoc/doclet/testAnnotationTypes/pkg/AnnotationType.java diff --git a/langtools/test/jdk/javadoc/doclet/testAnnotationTypes/pkg/AnnotationTypeField.java b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/pkg/AnnotationTypeField.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testAnnotationTypes/pkg/AnnotationTypeField.java rename to test/langtools/jdk/javadoc/doclet/testAnnotationTypes/pkg/AnnotationTypeField.java diff --git a/langtools/test/jdk/javadoc/doclet/testBackSlashInLink/C.java b/test/langtools/jdk/javadoc/doclet/testBackSlashInLink/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBackSlashInLink/C.java rename to test/langtools/jdk/javadoc/doclet/testBackSlashInLink/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testBackSlashInLink/TestBackSlashInLink.java b/test/langtools/jdk/javadoc/doclet/testBackSlashInLink/TestBackSlashInLink.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBackSlashInLink/TestBackSlashInLink.java rename to test/langtools/jdk/javadoc/doclet/testBackSlashInLink/TestBackSlashInLink.java diff --git a/langtools/test/jdk/javadoc/doclet/testBadHtml/TestBadHtml.java b/test/langtools/jdk/javadoc/doclet/testBadHtml/TestBadHtml.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBadHtml/TestBadHtml.java rename to test/langtools/jdk/javadoc/doclet/testBadHtml/TestBadHtml.java diff --git a/langtools/test/jdk/javadoc/doclet/testBadHtml/pkg1/A.java b/test/langtools/jdk/javadoc/doclet/testBadHtml/pkg1/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBadHtml/pkg1/A.java rename to test/langtools/jdk/javadoc/doclet/testBadHtml/pkg1/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testBadPackageFileInJar/TestBadPackageFileInJar.java b/test/langtools/jdk/javadoc/doclet/testBadPackageFileInJar/TestBadPackageFileInJar.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBadPackageFileInJar/TestBadPackageFileInJar.java rename to test/langtools/jdk/javadoc/doclet/testBadPackageFileInJar/TestBadPackageFileInJar.java diff --git a/langtools/test/jdk/javadoc/doclet/testBadPackageFileInJar/badPackageFileInJar.jar b/test/langtools/jdk/javadoc/doclet/testBadPackageFileInJar/badPackageFileInJar.jar similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBadPackageFileInJar/badPackageFileInJar.jar rename to test/langtools/jdk/javadoc/doclet/testBadPackageFileInJar/badPackageFileInJar.jar diff --git a/langtools/test/jdk/javadoc/doclet/testBadPackageFileInJar/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testBadPackageFileInJar/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBadPackageFileInJar/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testBadPackageFileInJar/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testBadSourceFile/C1.java b/test/langtools/jdk/javadoc/doclet/testBadSourceFile/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBadSourceFile/C1.java rename to test/langtools/jdk/javadoc/doclet/testBadSourceFile/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testBadSourceFile/C2.java b/test/langtools/jdk/javadoc/doclet/testBadSourceFile/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBadSourceFile/C2.java rename to test/langtools/jdk/javadoc/doclet/testBadSourceFile/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testBadSourceFile/TestBadSourceFile.java b/test/langtools/jdk/javadoc/doclet/testBadSourceFile/TestBadSourceFile.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBadSourceFile/TestBadSourceFile.java rename to test/langtools/jdk/javadoc/doclet/testBadSourceFile/TestBadSourceFile.java diff --git a/langtools/test/jdk/javadoc/doclet/testBaseClass/Bar.java b/test/langtools/jdk/javadoc/doclet/testBaseClass/Bar.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBaseClass/Bar.java rename to test/langtools/jdk/javadoc/doclet/testBaseClass/Bar.java diff --git a/langtools/test/jdk/javadoc/doclet/testBaseClass/BaseClass.java b/test/langtools/jdk/javadoc/doclet/testBaseClass/BaseClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBaseClass/BaseClass.java rename to test/langtools/jdk/javadoc/doclet/testBaseClass/BaseClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testBaseClass/TestBaseClass.java b/test/langtools/jdk/javadoc/doclet/testBaseClass/TestBaseClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBaseClass/TestBaseClass.java rename to test/langtools/jdk/javadoc/doclet/testBaseClass/TestBaseClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testBaseClass/baz/Foo.java b/test/langtools/jdk/javadoc/doclet/testBaseClass/baz/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBaseClass/baz/Foo.java rename to test/langtools/jdk/javadoc/doclet/testBaseClass/baz/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testBreakIterator/TestBreakIterator.java b/test/langtools/jdk/javadoc/doclet/testBreakIterator/TestBreakIterator.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBreakIterator/TestBreakIterator.java rename to test/langtools/jdk/javadoc/doclet/testBreakIterator/TestBreakIterator.java diff --git a/langtools/test/jdk/javadoc/doclet/testBreakIterator/pkg/BreakIteratorTest.java b/test/langtools/jdk/javadoc/doclet/testBreakIterator/pkg/BreakIteratorTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testBreakIterator/pkg/BreakIteratorTest.java rename to test/langtools/jdk/javadoc/doclet/testBreakIterator/pkg/BreakIteratorTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testCRLineSeparator/TestCRLineSeparator.java b/test/langtools/jdk/javadoc/doclet/testCRLineSeparator/TestCRLineSeparator.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCRLineSeparator/TestCRLineSeparator.java rename to test/langtools/jdk/javadoc/doclet/testCRLineSeparator/TestCRLineSeparator.java diff --git a/langtools/test/jdk/javadoc/doclet/testCRLineSeparator/pkg/MyClass.java b/test/langtools/jdk/javadoc/doclet/testCRLineSeparator/pkg/MyClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCRLineSeparator/pkg/MyClass.java rename to test/langtools/jdk/javadoc/doclet/testCRLineSeparator/pkg/MyClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testCharset/TestCharset.java b/test/langtools/jdk/javadoc/doclet/testCharset/TestCharset.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCharset/TestCharset.java rename to test/langtools/jdk/javadoc/doclet/testCharset/TestCharset.java diff --git a/langtools/test/jdk/javadoc/doclet/testCharset/pkg/Foo.java b/test/langtools/jdk/javadoc/doclet/testCharset/pkg/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCharset/pkg/Foo.java rename to test/langtools/jdk/javadoc/doclet/testCharset/pkg/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testCharsetDocencodingOptions/TestCharsetDocencodingOptions.java b/test/langtools/jdk/javadoc/doclet/testCharsetDocencodingOptions/TestCharsetDocencodingOptions.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCharsetDocencodingOptions/TestCharsetDocencodingOptions.java rename to test/langtools/jdk/javadoc/doclet/testCharsetDocencodingOptions/TestCharsetDocencodingOptions.java diff --git a/langtools/test/jdk/javadoc/doclet/testCharsetDocencodingOptions/pkg/Foo.java b/test/langtools/jdk/javadoc/doclet/testCharsetDocencodingOptions/pkg/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCharsetDocencodingOptions/pkg/Foo.java rename to test/langtools/jdk/javadoc/doclet/testCharsetDocencodingOptions/pkg/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassCrossReferences/C.java b/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassCrossReferences/C.java rename to test/langtools/jdk/javadoc/doclet/testClassCrossReferences/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java b/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java rename to test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassCrossReferences/package-list b/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/package-list similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassCrossReferences/package-list rename to test/langtools/jdk/javadoc/doclet/testClassCrossReferences/package-list diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/TestClassDocCatalog.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/TestClassDocCatalog.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/TestClassDocCatalog.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/TestClassDocCatalog.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyAnnotation.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyAnnotation.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyAnnotation.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyAnnotation.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyClass.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyClass.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyEnum.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyEnum.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyEnum.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyEnum.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyError.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyError.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyError.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyError.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyException.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyException.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyException.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyException.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyInterface.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyInterface.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyAnnotation.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyAnnotation.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyAnnotation.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyAnnotation.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyClass.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyClass.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyEnum.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyEnum.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyEnum.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyEnum.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyError.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyError.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyError.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyError.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyException.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyException.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyException.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyException.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyInterface.java b/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyInterface.java rename to test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java b/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java rename to test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassLinks/p/C.java b/test/langtools/jdk/javadoc/doclet/testClassLinks/p/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassLinks/p/C.java rename to test/langtools/jdk/javadoc/doclet/testClassLinks/p/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassTree/TestClassTree.java b/test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassTree/TestClassTree.java rename to test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassTree/pkg/AnnotationType.java b/test/langtools/jdk/javadoc/doclet/testClassTree/pkg/AnnotationType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassTree/pkg/AnnotationType.java rename to test/langtools/jdk/javadoc/doclet/testClassTree/pkg/AnnotationType.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassTree/pkg/ChildClass.java b/test/langtools/jdk/javadoc/doclet/testClassTree/pkg/ChildClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassTree/pkg/ChildClass.java rename to test/langtools/jdk/javadoc/doclet/testClassTree/pkg/ChildClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassTree/pkg/Coin.java b/test/langtools/jdk/javadoc/doclet/testClassTree/pkg/Coin.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassTree/pkg/Coin.java rename to test/langtools/jdk/javadoc/doclet/testClassTree/pkg/Coin.java diff --git a/langtools/test/jdk/javadoc/doclet/testClassTree/pkg/ParentClass.java b/test/langtools/jdk/javadoc/doclet/testClassTree/pkg/ParentClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testClassTree/pkg/ParentClass.java rename to test/langtools/jdk/javadoc/doclet/testClassTree/pkg/ParentClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testCmndLineClass/C5.java b/test/langtools/jdk/javadoc/doclet/testCmndLineClass/C5.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCmndLineClass/C5.java rename to test/langtools/jdk/javadoc/doclet/testCmndLineClass/C5.java diff --git a/langtools/test/jdk/javadoc/doclet/testCmndLineClass/TestCmndLineClass.java b/test/langtools/jdk/javadoc/doclet/testCmndLineClass/TestCmndLineClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCmndLineClass/TestCmndLineClass.java rename to test/langtools/jdk/javadoc/doclet/testCmndLineClass/TestCmndLineClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testCmndLineClass/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testCmndLineClass/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCmndLineClass/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testCmndLineClass/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testCmndLineClass/pkg1/C2.java b/test/langtools/jdk/javadoc/doclet/testCmndLineClass/pkg1/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCmndLineClass/pkg1/C2.java rename to test/langtools/jdk/javadoc/doclet/testCmndLineClass/pkg1/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testCmndLineClass/pkg1/package.html b/test/langtools/jdk/javadoc/doclet/testCmndLineClass/pkg1/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCmndLineClass/pkg1/package.html rename to test/langtools/jdk/javadoc/doclet/testCmndLineClass/pkg1/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testCmndLineClass/pkg2/C3.java b/test/langtools/jdk/javadoc/doclet/testCmndLineClass/pkg2/C3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCmndLineClass/pkg2/C3.java rename to test/langtools/jdk/javadoc/doclet/testCmndLineClass/pkg2/C3.java diff --git a/langtools/test/jdk/javadoc/doclet/testCmndLineClass/pkg2/C4.java b/test/langtools/jdk/javadoc/doclet/testCmndLineClass/pkg2/C4.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCmndLineClass/pkg2/C4.java rename to test/langtools/jdk/javadoc/doclet/testCmndLineClass/pkg2/C4.java diff --git a/langtools/test/jdk/javadoc/doclet/testCmndLineClass/pkg2/package.html b/test/langtools/jdk/javadoc/doclet/testCmndLineClass/pkg2/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCmndLineClass/pkg2/package.html rename to test/langtools/jdk/javadoc/doclet/testCmndLineClass/pkg2/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testCompletionFailure/TestCompletionFailure.java b/test/langtools/jdk/javadoc/doclet/testCompletionFailure/TestCompletionFailure.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCompletionFailure/TestCompletionFailure.java rename to test/langtools/jdk/javadoc/doclet/testCompletionFailure/TestCompletionFailure.java diff --git a/langtools/test/jdk/javadoc/doclet/testCompletionFailure/pkg1/NumberFormatTest.java b/test/langtools/jdk/javadoc/doclet/testCompletionFailure/pkg1/NumberFormatTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCompletionFailure/pkg1/NumberFormatTest.java rename to test/langtools/jdk/javadoc/doclet/testCompletionFailure/pkg1/NumberFormatTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testConstantValuesPage/TestConstantValuesPage.java b/test/langtools/jdk/javadoc/doclet/testConstantValuesPage/TestConstantValuesPage.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testConstantValuesPage/TestConstantValuesPage.java rename to test/langtools/jdk/javadoc/doclet/testConstantValuesPage/TestConstantValuesPage.java diff --git a/langtools/test/jdk/javadoc/doclet/testConstructorIndent/C.java b/test/langtools/jdk/javadoc/doclet/testConstructorIndent/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testConstructorIndent/C.java rename to test/langtools/jdk/javadoc/doclet/testConstructorIndent/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testConstructorIndent/TestConstructorIndent.java b/test/langtools/jdk/javadoc/doclet/testConstructorIndent/TestConstructorIndent.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testConstructorIndent/TestConstructorIndent.java rename to test/langtools/jdk/javadoc/doclet/testConstructorIndent/TestConstructorIndent.java diff --git a/langtools/test/jdk/javadoc/doclet/testConstructors/TestConstructors.java b/test/langtools/jdk/javadoc/doclet/testConstructors/TestConstructors.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testConstructors/TestConstructors.java rename to test/langtools/jdk/javadoc/doclet/testConstructors/TestConstructors.java diff --git a/langtools/test/jdk/javadoc/doclet/testConstructors/pkg1/Outer.java b/test/langtools/jdk/javadoc/doclet/testConstructors/pkg1/Outer.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testConstructors/pkg1/Outer.java rename to test/langtools/jdk/javadoc/doclet/testConstructors/pkg1/Outer.java diff --git a/langtools/test/jdk/javadoc/doclet/testCopyFiles/TestCopyFiles.java b/test/langtools/jdk/javadoc/doclet/testCopyFiles/TestCopyFiles.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCopyFiles/TestCopyFiles.java rename to test/langtools/jdk/javadoc/doclet/testCopyFiles/TestCopyFiles.java diff --git a/langtools/test/jdk/javadoc/doclet/testCopyFiles/modules/acme.mdle/module-info.java b/test/langtools/jdk/javadoc/doclet/testCopyFiles/modules/acme.mdle/module-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCopyFiles/modules/acme.mdle/module-info.java rename to test/langtools/jdk/javadoc/doclet/testCopyFiles/modules/acme.mdle/module-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testCopyFiles/modules/acme.mdle/p/Foo.java b/test/langtools/jdk/javadoc/doclet/testCopyFiles/modules/acme.mdle/p/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCopyFiles/modules/acme.mdle/p/Foo.java rename to test/langtools/jdk/javadoc/doclet/testCopyFiles/modules/acme.mdle/p/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testCopyFiles/modules/acme.mdle/p/doc-files/inpackage.html b/test/langtools/jdk/javadoc/doclet/testCopyFiles/modules/acme.mdle/p/doc-files/inpackage.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCopyFiles/modules/acme.mdle/p/doc-files/inpackage.html rename to test/langtools/jdk/javadoc/doclet/testCopyFiles/modules/acme.mdle/p/doc-files/inpackage.html diff --git a/langtools/test/jdk/javadoc/doclet/testCopyFiles/packages/p1/Foo.java b/test/langtools/jdk/javadoc/doclet/testCopyFiles/packages/p1/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCopyFiles/packages/p1/Foo.java rename to test/langtools/jdk/javadoc/doclet/testCopyFiles/packages/p1/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testCopyFiles/packages/p1/doc-files/inpackage.html b/test/langtools/jdk/javadoc/doclet/testCopyFiles/packages/p1/doc-files/inpackage.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCopyFiles/packages/p1/doc-files/inpackage.html rename to test/langtools/jdk/javadoc/doclet/testCopyFiles/packages/p1/doc-files/inpackage.html diff --git a/langtools/test/jdk/javadoc/doclet/testCopyFiles/unnamed/Foo.java b/test/langtools/jdk/javadoc/doclet/testCopyFiles/unnamed/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCopyFiles/unnamed/Foo.java rename to test/langtools/jdk/javadoc/doclet/testCopyFiles/unnamed/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testCopyFiles/unnamed/doc-files/inpackage.html b/test/langtools/jdk/javadoc/doclet/testCopyFiles/unnamed/doc-files/inpackage.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testCopyFiles/unnamed/doc-files/inpackage.html rename to test/langtools/jdk/javadoc/doclet/testCopyFiles/unnamed/doc-files/inpackage.html diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java rename to test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java rename to test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestAnnotationType.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestAnnotationType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestAnnotationType.java rename to test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestAnnotationType.java diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestClass.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestClass.java rename to test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestEnum.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestEnum.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestEnum.java rename to test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestEnum.java diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestError.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestError.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestError.java rename to test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestError.java diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestException.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestException.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestException.java rename to test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestException.java diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestInterface.java rename to test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocEncoding/TestDocEncoding.java b/test/langtools/jdk/javadoc/doclet/testDocEncoding/TestDocEncoding.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocEncoding/TestDocEncoding.java rename to test/langtools/jdk/javadoc/doclet/testDocEncoding/TestDocEncoding.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocEncoding/pkg/Test.java b/test/langtools/jdk/javadoc/doclet/testDocEncoding/pkg/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocEncoding/pkg/Test.java rename to test/langtools/jdk/javadoc/doclet/testDocEncoding/pkg/Test.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocErrorReporter/TestDocErrorReporter.java b/test/langtools/jdk/javadoc/doclet/testDocErrorReporter/TestDocErrorReporter.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocErrorReporter/TestDocErrorReporter.java rename to test/langtools/jdk/javadoc/doclet/testDocErrorReporter/TestDocErrorReporter.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocFileDir/TestDocFileDir.java b/test/langtools/jdk/javadoc/doclet/testDocFileDir/TestDocFileDir.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocFileDir/TestDocFileDir.java rename to test/langtools/jdk/javadoc/doclet/testDocFileDir/TestDocFileDir.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocFileDir/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testDocFileDir/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocFileDir/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testDocFileDir/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt b/test/langtools/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt rename to test/langtools/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt diff --git a/langtools/test/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt b/test/langtools/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt rename to test/langtools/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt diff --git a/langtools/test/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-used1/testfile.txt b/test/langtools/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-used1/testfile.txt similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-used1/testfile.txt rename to test/langtools/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-used1/testfile.txt diff --git a/langtools/test/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-used2/testfile.txt b/test/langtools/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-used2/testfile.txt similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-used2/testfile.txt rename to test/langtools/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/subdir-used2/testfile.txt diff --git a/langtools/test/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/testfile.txt b/test/langtools/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/testfile.txt similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/testfile.txt rename to test/langtools/jdk/javadoc/doclet/testDocFileDir/pkg/doc-files/testfile.txt diff --git a/langtools/test/jdk/javadoc/doclet/testDocFiles/TestDocFiles.java b/test/langtools/jdk/javadoc/doclet/testDocFiles/TestDocFiles.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocFiles/TestDocFiles.java rename to test/langtools/jdk/javadoc/doclet/testDocFiles/TestDocFiles.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocFiles/pkg/Test.java b/test/langtools/jdk/javadoc/doclet/testDocFiles/pkg/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocFiles/pkg/Test.java rename to test/langtools/jdk/javadoc/doclet/testDocFiles/pkg/Test.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocFiles/pkg/doc-files/test.txt b/test/langtools/jdk/javadoc/doclet/testDocFiles/pkg/doc-files/test.txt similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocFiles/pkg/doc-files/test.txt rename to test/langtools/jdk/javadoc/doclet/testDocFiles/pkg/doc-files/test.txt diff --git a/langtools/test/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootInlineTag.java b/test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootInlineTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootInlineTag.java rename to test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootInlineTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootTag.java b/test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootTag.java rename to test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocRootInlineTag/package-list b/test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/package-list similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocRootInlineTag/package-list rename to test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/package-list diff --git a/langtools/test/jdk/javadoc/doclet/testDocRootInlineTag/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocRootInlineTag/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocRootLink/TestDocRootLink.java b/test/langtools/jdk/javadoc/doclet/testDocRootLink/TestDocRootLink.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocRootLink/TestDocRootLink.java rename to test/langtools/jdk/javadoc/doclet/testDocRootLink/TestDocRootLink.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocRootLink/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testDocRootLink/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocRootLink/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testDocRootLink/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocRootLink/pkg1/package.html b/test/langtools/jdk/javadoc/doclet/testDocRootLink/pkg1/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocRootLink/pkg1/package.html rename to test/langtools/jdk/javadoc/doclet/testDocRootLink/pkg1/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testDocRootLink/pkg2/C2.java b/test/langtools/jdk/javadoc/doclet/testDocRootLink/pkg2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocRootLink/pkg2/C2.java rename to test/langtools/jdk/javadoc/doclet/testDocRootLink/pkg2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testDocRootLink/pkg2/package.html b/test/langtools/jdk/javadoc/doclet/testDocRootLink/pkg2/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDocRootLink/pkg2/package.html rename to test/langtools/jdk/javadoc/doclet/testDocRootLink/pkg2/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testDupParamWarn/TestDupParamWarn.java b/test/langtools/jdk/javadoc/doclet/testDupParamWarn/TestDupParamWarn.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDupParamWarn/TestDupParamWarn.java rename to test/langtools/jdk/javadoc/doclet/testDupParamWarn/TestDupParamWarn.java diff --git a/langtools/test/jdk/javadoc/doclet/testDupParamWarn/pkg/Bar.java b/test/langtools/jdk/javadoc/doclet/testDupParamWarn/pkg/Bar.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDupParamWarn/pkg/Bar.java rename to test/langtools/jdk/javadoc/doclet/testDupParamWarn/pkg/Bar.java diff --git a/langtools/test/jdk/javadoc/doclet/testDupParamWarn/pkg/Foo.java b/test/langtools/jdk/javadoc/doclet/testDupParamWarn/pkg/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testDupParamWarn/pkg/Foo.java rename to test/langtools/jdk/javadoc/doclet/testDupParamWarn/pkg/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testEmptyClass/TestEmptyClass.java b/test/langtools/jdk/javadoc/doclet/testEmptyClass/TestEmptyClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testEmptyClass/TestEmptyClass.java rename to test/langtools/jdk/javadoc/doclet/testEmptyClass/TestEmptyClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testEmptyClass/src/Empty.java b/test/langtools/jdk/javadoc/doclet/testEmptyClass/src/Empty.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testEmptyClass/src/Empty.java rename to test/langtools/jdk/javadoc/doclet/testEmptyClass/src/Empty.java diff --git a/langtools/test/jdk/javadoc/doclet/testEnclosingClass/TestEnclosingClass.java b/test/langtools/jdk/javadoc/doclet/testEnclosingClass/TestEnclosingClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testEnclosingClass/TestEnclosingClass.java rename to test/langtools/jdk/javadoc/doclet/testEnclosingClass/TestEnclosingClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testEnclosingClass/pkg/MyClass.java b/test/langtools/jdk/javadoc/doclet/testEnclosingClass/pkg/MyClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testEnclosingClass/pkg/MyClass.java rename to test/langtools/jdk/javadoc/doclet/testEnclosingClass/pkg/MyClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testEncoding/EncodeTest.java b/test/langtools/jdk/javadoc/doclet/testEncoding/EncodeTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testEncoding/EncodeTest.java rename to test/langtools/jdk/javadoc/doclet/testEncoding/EncodeTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testEncoding/TestEncoding.java b/test/langtools/jdk/javadoc/doclet/testEncoding/TestEncoding.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testEncoding/TestEncoding.java rename to test/langtools/jdk/javadoc/doclet/testEncoding/TestEncoding.java diff --git a/langtools/test/jdk/javadoc/doclet/testExternalOverridenMethod/TestExternalOverridenMethod.java b/test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/TestExternalOverridenMethod.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testExternalOverridenMethod/TestExternalOverridenMethod.java rename to test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/TestExternalOverridenMethod.java diff --git a/langtools/test/jdk/javadoc/doclet/testExternalOverridenMethod/package-list b/test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/package-list similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testExternalOverridenMethod/package-list rename to test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/package-list diff --git a/langtools/test/jdk/javadoc/doclet/testExternalOverridenMethod/pkg/XReader.java b/test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/pkg/XReader.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testExternalOverridenMethod/pkg/XReader.java rename to test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/pkg/XReader.java diff --git a/langtools/test/jdk/javadoc/doclet/testFramesNoFrames/TestFramesNoFrames.java b/test/langtools/jdk/javadoc/doclet/testFramesNoFrames/TestFramesNoFrames.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testFramesNoFrames/TestFramesNoFrames.java rename to test/langtools/jdk/javadoc/doclet/testFramesNoFrames/TestFramesNoFrames.java diff --git a/langtools/test/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java b/test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java rename to test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java diff --git a/langtools/test/jdk/javadoc/doclet/testGeneratedBy/pkg/MyClass.java b/test/langtools/jdk/javadoc/doclet/testGeneratedBy/pkg/MyClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testGeneratedBy/pkg/MyClass.java rename to test/langtools/jdk/javadoc/doclet/testGeneratedBy/pkg/MyClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testGroupOption/C.java b/test/langtools/jdk/javadoc/doclet/testGroupOption/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testGroupOption/C.java rename to test/langtools/jdk/javadoc/doclet/testGroupOption/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testGroupOption/TestGroupOption.java b/test/langtools/jdk/javadoc/doclet/testGroupOption/TestGroupOption.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testGroupOption/TestGroupOption.java rename to test/langtools/jdk/javadoc/doclet/testGroupOption/TestGroupOption.java diff --git a/langtools/test/jdk/javadoc/doclet/testGroupOption/abc1/C.java b/test/langtools/jdk/javadoc/doclet/testGroupOption/abc1/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testGroupOption/abc1/C.java rename to test/langtools/jdk/javadoc/doclet/testGroupOption/abc1/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testGroupOption/abc2/C.java b/test/langtools/jdk/javadoc/doclet/testGroupOption/abc2/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testGroupOption/abc2/C.java rename to test/langtools/jdk/javadoc/doclet/testGroupOption/abc2/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testGroupOption/abc3/C.java b/test/langtools/jdk/javadoc/doclet/testGroupOption/abc3/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testGroupOption/abc3/C.java rename to test/langtools/jdk/javadoc/doclet/testGroupOption/abc3/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testGroupOption/other/C.java b/test/langtools/jdk/javadoc/doclet/testGroupOption/other/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testGroupOption/other/C.java rename to test/langtools/jdk/javadoc/doclet/testGroupOption/other/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testGroupOption/pkg1/C.java b/test/langtools/jdk/javadoc/doclet/testGroupOption/pkg1/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testGroupOption/pkg1/C.java rename to test/langtools/jdk/javadoc/doclet/testGroupOption/pkg1/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testGroupOption/pkg2/C.java b/test/langtools/jdk/javadoc/doclet/testGroupOption/pkg2/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testGroupOption/pkg2/C.java rename to test/langtools/jdk/javadoc/doclet/testGroupOption/pkg2/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testGroupOption/pkg3/C.java b/test/langtools/jdk/javadoc/doclet/testGroupOption/pkg3/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testGroupOption/pkg3/C.java rename to test/langtools/jdk/javadoc/doclet/testGroupOption/pkg3/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testHeadings/TestHeadings.java b/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHeadings/TestHeadings.java rename to test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java diff --git a/langtools/test/jdk/javadoc/doclet/testHeadings/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testHeadings/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHeadings/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testHeadings/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testHeadings/pkg2/C2.java b/test/langtools/jdk/javadoc/doclet/testHeadings/pkg2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHeadings/pkg2/C2.java rename to test/langtools/jdk/javadoc/doclet/testHeadings/pkg2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testHelpFile/TestHelpFile.java b/test/langtools/jdk/javadoc/doclet/testHelpFile/TestHelpFile.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHelpFile/TestHelpFile.java rename to test/langtools/jdk/javadoc/doclet/testHelpFile/TestHelpFile.java diff --git a/langtools/test/jdk/javadoc/doclet/testHelpOption/Sample.java b/test/langtools/jdk/javadoc/doclet/testHelpOption/Sample.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHelpOption/Sample.java rename to test/langtools/jdk/javadoc/doclet/testHelpOption/Sample.java diff --git a/langtools/test/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java b/test/langtools/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java rename to test/langtools/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java diff --git a/langtools/test/jdk/javadoc/doclet/testHelpOption/test-help.html b/test/langtools/jdk/javadoc/doclet/testHelpOption/test-help.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHelpOption/test-help.html rename to test/langtools/jdk/javadoc/doclet/testHelpOption/test-help.html diff --git a/langtools/test/jdk/javadoc/doclet/testHiddenMembers/TestHiddenMembers.java b/test/langtools/jdk/javadoc/doclet/testHiddenMembers/TestHiddenMembers.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHiddenMembers/TestHiddenMembers.java rename to test/langtools/jdk/javadoc/doclet/testHiddenMembers/TestHiddenMembers.java diff --git a/langtools/test/jdk/javadoc/doclet/testHiddenMembers/pkg/BaseClass.java b/test/langtools/jdk/javadoc/doclet/testHiddenMembers/pkg/BaseClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHiddenMembers/pkg/BaseClass.java rename to test/langtools/jdk/javadoc/doclet/testHiddenMembers/pkg/BaseClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testHiddenMembers/pkg/SubClass.java b/test/langtools/jdk/javadoc/doclet/testHiddenMembers/pkg/SubClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHiddenMembers/pkg/SubClass.java rename to test/langtools/jdk/javadoc/doclet/testHiddenMembers/pkg/SubClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java b/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java rename to test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testHiddenTag/pkg1/A.java b/test/langtools/jdk/javadoc/doclet/testHiddenTag/pkg1/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHiddenTag/pkg1/A.java rename to test/langtools/jdk/javadoc/doclet/testHiddenTag/pkg1/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testHref/TestHref.java b/test/langtools/jdk/javadoc/doclet/testHref/TestHref.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHref/TestHref.java rename to test/langtools/jdk/javadoc/doclet/testHref/TestHref.java diff --git a/langtools/test/jdk/javadoc/doclet/testHref/package-list b/test/langtools/jdk/javadoc/doclet/testHref/package-list similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHref/package-list rename to test/langtools/jdk/javadoc/doclet/testHref/package-list diff --git a/langtools/test/jdk/javadoc/doclet/testHref/pkg/C1.java b/test/langtools/jdk/javadoc/doclet/testHref/pkg/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHref/pkg/C1.java rename to test/langtools/jdk/javadoc/doclet/testHref/pkg/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testHref/pkg/C2.java b/test/langtools/jdk/javadoc/doclet/testHref/pkg/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHref/pkg/C2.java rename to test/langtools/jdk/javadoc/doclet/testHref/pkg/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testHref/pkg/C4.java b/test/langtools/jdk/javadoc/doclet/testHref/pkg/C4.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHref/pkg/C4.java rename to test/langtools/jdk/javadoc/doclet/testHref/pkg/C4.java diff --git a/langtools/test/jdk/javadoc/doclet/testHrefInDocComment/TestHrefInDocComment.java b/test/langtools/jdk/javadoc/doclet/testHrefInDocComment/TestHrefInDocComment.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHrefInDocComment/TestHrefInDocComment.java rename to test/langtools/jdk/javadoc/doclet/testHrefInDocComment/TestHrefInDocComment.java diff --git a/langtools/test/jdk/javadoc/doclet/testHrefInDocComment/pkg/I1.java b/test/langtools/jdk/javadoc/doclet/testHrefInDocComment/pkg/I1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHrefInDocComment/pkg/I1.java rename to test/langtools/jdk/javadoc/doclet/testHrefInDocComment/pkg/I1.java diff --git a/langtools/test/jdk/javadoc/doclet/testHrefInDocComment/pkg/I2.java b/test/langtools/jdk/javadoc/doclet/testHrefInDocComment/pkg/I2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHrefInDocComment/pkg/I2.java rename to test/langtools/jdk/javadoc/doclet/testHrefInDocComment/pkg/I2.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlComments/C.java b/test/langtools/jdk/javadoc/doclet/testHtmlComments/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlComments/C.java rename to test/langtools/jdk/javadoc/doclet/testHtmlComments/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlComments/TestHtmlComments.java b/test/langtools/jdk/javadoc/doclet/testHtmlComments/TestHtmlComments.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlComments/TestHtmlComments.java rename to test/langtools/jdk/javadoc/doclet/testHtmlComments/TestHtmlComments.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java rename to test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C2.java b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C2.java rename to test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C3.java b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C3.java rename to test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C3.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C4.java b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C4.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C4.java rename to test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C4.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C5.java b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C5.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C5.java rename to test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/C5.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/package-info.java b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/package-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/package-info.java rename to test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/pkg1/package-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlDocument/TestHtmlDocument.java b/test/langtools/jdk/javadoc/doclet/testHtmlDocument/TestHtmlDocument.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlDocument/TestHtmlDocument.java rename to test/langtools/jdk/javadoc/doclet/testHtmlDocument/TestHtmlDocument.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlDocument/testLink.html b/test/langtools/jdk/javadoc/doclet/testHtmlDocument/testLink.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlDocument/testLink.html rename to test/langtools/jdk/javadoc/doclet/testHtmlDocument/testLink.html diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlDocument/testMarkup.html b/test/langtools/jdk/javadoc/doclet/testHtmlDocument/testMarkup.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlDocument/testMarkup.html rename to test/langtools/jdk/javadoc/doclet/testHtmlDocument/testMarkup.html diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlStrongTag/TestHtmlStrongTag.java b/test/langtools/jdk/javadoc/doclet/testHtmlStrongTag/TestHtmlStrongTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlStrongTag/TestHtmlStrongTag.java rename to test/langtools/jdk/javadoc/doclet/testHtmlStrongTag/TestHtmlStrongTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlStrongTag/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testHtmlStrongTag/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlStrongTag/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testHtmlStrongTag/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlStrongTag/pkg2/C2.java b/test/langtools/jdk/javadoc/doclet/testHtmlStrongTag/pkg2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlStrongTag/pkg2/C2.java rename to test/langtools/jdk/javadoc/doclet/testHtmlStrongTag/pkg2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTableStyles/pkg1/TestTable.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/pkg1/TestTable.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTableStyles/pkg1/TestTable.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/pkg1/TestTable.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTableStyles/pkg2/TestUse.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/pkg2/TestUse.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTableStyles/pkg2/TestUse.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/pkg2/TestUse.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg1/I1.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg1/I1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg1/I1.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg1/I1.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg1/package-info.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg1/package-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg1/package-info.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg1/package-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg2/C2.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg2/C2.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg2/C3.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg2/C3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg2/C3.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg2/C3.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg2/C4.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg2/C4.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg2/C4.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg2/C4.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg2/package-info.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg2/package-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTableTags/pkg2/package-info.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTableTags/pkg2/package-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java b/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTag/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testHtmlTag/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTag/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTag/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTag/pkg2/C2.java b/test/langtools/jdk/javadoc/doclet/testHtmlTag/pkg2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTag/pkg2/C2.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTag/pkg2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTag/pkg3/A.java b/test/langtools/jdk/javadoc/doclet/testHtmlTag/pkg3/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTag/pkg3/A.java rename to test/langtools/jdk/javadoc/doclet/testHtmlTag/pkg3/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTag/pkg3/package.html b/test/langtools/jdk/javadoc/doclet/testHtmlTag/pkg3/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlTag/pkg3/package.html rename to test/langtools/jdk/javadoc/doclet/testHtmlTag/pkg3/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg/AnnotationType.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg/AnnotationType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg/AnnotationType.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg/AnnotationType.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg/AnotherClass.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg/AnotherClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg/AnotherClass.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg/AnotherClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg/TestError.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg/TestError.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg/TestError.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg/TestError.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg/TestException.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg/TestException.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg/TestException.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg/TestException.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg/TestInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg/TestInterface.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg/TestInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg/package-info.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg/package-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg/package-info.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg/package-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg1/NestedInnerClass.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg1/NestedInnerClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg1/NestedInnerClass.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg1/NestedInnerClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg1/PrivateIncludeInnerClass.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg1/PrivateIncludeInnerClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg1/PrivateIncludeInnerClass.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg1/PrivateIncludeInnerClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg1/ProtectedInnerClass.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg1/ProtectedInnerClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg1/ProtectedInnerClass.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg1/ProtectedInnerClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg1/PublicExcludeInnerClass.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg1/PublicExcludeInnerClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg1/PublicExcludeInnerClass.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg1/PublicExcludeInnerClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg1/RegClass.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg1/RegClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg1/RegClass.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg1/RegClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/DeprecatedClassByAnnotation.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/DeprecatedClassByAnnotation.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/DeprecatedClassByAnnotation.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/DeprecatedClassByAnnotation.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/Interface.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/Interface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/Interface.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/Interface.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestAnnotationType.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestAnnotationType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestAnnotationType.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestAnnotationType.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestClass.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestClass.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestEnum.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestEnum.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestEnum.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestEnum.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestError.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestError.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestError.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestError.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestException.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestException.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestException.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestException.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestInterface.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg2/TestInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg3/ClassNoConstants.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg3/ClassNoConstants.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testHtmlVersion/pkg3/ClassNoConstants.java rename to test/langtools/jdk/javadoc/doclet/testHtmlVersion/pkg3/ClassNoConstants.java diff --git a/langtools/test/jdk/javadoc/doclet/testIOException/TestIOException.java b/test/langtools/jdk/javadoc/doclet/testIOException/TestIOException.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIOException/TestIOException.java rename to test/langtools/jdk/javadoc/doclet/testIOException/TestIOException.java diff --git a/langtools/test/jdk/javadoc/doclet/testIncluded/TestIncluded.java b/test/langtools/jdk/javadoc/doclet/testIncluded/TestIncluded.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIncluded/TestIncluded.java rename to test/langtools/jdk/javadoc/doclet/testIncluded/TestIncluded.java diff --git a/langtools/test/jdk/javadoc/doclet/testIncluded/parent/A.java b/test/langtools/jdk/javadoc/doclet/testIncluded/parent/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIncluded/parent/A.java rename to test/langtools/jdk/javadoc/doclet/testIncluded/parent/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testIncluded/pkg/B.java b/test/langtools/jdk/javadoc/doclet/testIncluded/pkg/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIncluded/pkg/B.java rename to test/langtools/jdk/javadoc/doclet/testIncluded/pkg/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testIndentation/TestIndentation.java b/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIndentation/TestIndentation.java rename to test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java diff --git a/langtools/test/jdk/javadoc/doclet/testIndentation/p/Indent.java b/test/langtools/jdk/javadoc/doclet/testIndentation/p/Indent.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIndentation/p/Indent.java rename to test/langtools/jdk/javadoc/doclet/testIndentation/p/Indent.java diff --git a/langtools/test/jdk/javadoc/doclet/testIndentation/p/IndentAnnot.java b/test/langtools/jdk/javadoc/doclet/testIndentation/p/IndentAnnot.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIndentation/p/IndentAnnot.java rename to test/langtools/jdk/javadoc/doclet/testIndentation/p/IndentAnnot.java diff --git a/langtools/test/jdk/javadoc/doclet/testIndex/NoPackage.java b/test/langtools/jdk/javadoc/doclet/testIndex/NoPackage.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIndex/NoPackage.java rename to test/langtools/jdk/javadoc/doclet/testIndex/NoPackage.java diff --git a/langtools/test/jdk/javadoc/doclet/testIndex/TestIndex.java b/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIndex/TestIndex.java rename to test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java diff --git a/langtools/test/jdk/javadoc/doclet/testIndex/pkg/AnnotationType.java b/test/langtools/jdk/javadoc/doclet/testIndex/pkg/AnnotationType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIndex/pkg/AnnotationType.java rename to test/langtools/jdk/javadoc/doclet/testIndex/pkg/AnnotationType.java diff --git a/langtools/test/jdk/javadoc/doclet/testIndex/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testIndex/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIndex/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testIndex/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testIndex/pkg/Coin.java b/test/langtools/jdk/javadoc/doclet/testIndex/pkg/Coin.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIndex/pkg/Coin.java rename to test/langtools/jdk/javadoc/doclet/testIndex/pkg/Coin.java diff --git a/langtools/test/jdk/javadoc/doclet/testIndex/pkg/Interface.java b/test/langtools/jdk/javadoc/doclet/testIndex/pkg/Interface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIndex/pkg/Interface.java rename to test/langtools/jdk/javadoc/doclet/testIndex/pkg/Interface.java diff --git a/langtools/test/jdk/javadoc/doclet/testIndexFiles/TestIndexFiles.java b/test/langtools/jdk/javadoc/doclet/testIndexFiles/TestIndexFiles.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIndexFiles/TestIndexFiles.java rename to test/langtools/jdk/javadoc/doclet/testIndexFiles/TestIndexFiles.java diff --git a/langtools/test/jdk/javadoc/doclet/testIndexFiles/pkg/ClassForIndexFilesTest.java b/test/langtools/jdk/javadoc/doclet/testIndexFiles/pkg/ClassForIndexFilesTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIndexFiles/pkg/ClassForIndexFilesTest.java rename to test/langtools/jdk/javadoc/doclet/testIndexFiles/pkg/ClassForIndexFilesTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testIndexFiles/pkg/package-info.java b/test/langtools/jdk/javadoc/doclet/testIndexFiles/pkg/package-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testIndexFiles/pkg/package-info.java rename to test/langtools/jdk/javadoc/doclet/testIndexFiles/pkg/package-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testInlineLinkLabel/TestInlineLinkLabel.java b/test/langtools/jdk/javadoc/doclet/testInlineLinkLabel/TestInlineLinkLabel.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInlineLinkLabel/TestInlineLinkLabel.java rename to test/langtools/jdk/javadoc/doclet/testInlineLinkLabel/TestInlineLinkLabel.java diff --git a/langtools/test/jdk/javadoc/doclet/testInlineLinkLabel/pkg/C1.java b/test/langtools/jdk/javadoc/doclet/testInlineLinkLabel/pkg/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInlineLinkLabel/pkg/C1.java rename to test/langtools/jdk/javadoc/doclet/testInlineLinkLabel/pkg/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testInlineLinkLabel/pkg/C2.java b/test/langtools/jdk/javadoc/doclet/testInlineLinkLabel/pkg/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInlineLinkLabel/pkg/C2.java rename to test/langtools/jdk/javadoc/doclet/testInlineLinkLabel/pkg/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testInlineLinkLabel/pkg/package.html b/test/langtools/jdk/javadoc/doclet/testInlineLinkLabel/pkg/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInlineLinkLabel/pkg/package.html rename to test/langtools/jdk/javadoc/doclet/testInlineLinkLabel/pkg/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testInterface/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInterface/TestInterface.java rename to test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testInterface/pkg/Child.java b/test/langtools/jdk/javadoc/doclet/testInterface/pkg/Child.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInterface/pkg/Child.java rename to test/langtools/jdk/javadoc/doclet/testInterface/pkg/Child.java diff --git a/langtools/test/jdk/javadoc/doclet/testInterface/pkg/ClassWithStaticMethod.java b/test/langtools/jdk/javadoc/doclet/testInterface/pkg/ClassWithStaticMethod.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInterface/pkg/ClassWithStaticMethod.java rename to test/langtools/jdk/javadoc/doclet/testInterface/pkg/ClassWithStaticMethod.java diff --git a/langtools/test/jdk/javadoc/doclet/testInterface/pkg/Interface.java b/test/langtools/jdk/javadoc/doclet/testInterface/pkg/Interface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInterface/pkg/Interface.java rename to test/langtools/jdk/javadoc/doclet/testInterface/pkg/Interface.java diff --git a/langtools/test/jdk/javadoc/doclet/testInterface/pkg/InterfaceWithStaticMethod.java b/test/langtools/jdk/javadoc/doclet/testInterface/pkg/InterfaceWithStaticMethod.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInterface/pkg/InterfaceWithStaticMethod.java rename to test/langtools/jdk/javadoc/doclet/testInterface/pkg/InterfaceWithStaticMethod.java diff --git a/langtools/test/jdk/javadoc/doclet/testInterface/pkg/Parent.java b/test/langtools/jdk/javadoc/doclet/testInterface/pkg/Parent.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInterface/pkg/Parent.java rename to test/langtools/jdk/javadoc/doclet/testInterface/pkg/Parent.java diff --git a/langtools/test/jdk/javadoc/doclet/testInterface/pkg1/Child.java b/test/langtools/jdk/javadoc/doclet/testInterface/pkg1/Child.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInterface/pkg1/Child.java rename to test/langtools/jdk/javadoc/doclet/testInterface/pkg1/Child.java diff --git a/langtools/test/jdk/javadoc/doclet/testInterface/pkg1/GrandParent.java b/test/langtools/jdk/javadoc/doclet/testInterface/pkg1/GrandParent.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInterface/pkg1/GrandParent.java rename to test/langtools/jdk/javadoc/doclet/testInterface/pkg1/GrandParent.java diff --git a/langtools/test/jdk/javadoc/doclet/testInterface/pkg1/Interface.java b/test/langtools/jdk/javadoc/doclet/testInterface/pkg1/Interface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInterface/pkg1/Interface.java rename to test/langtools/jdk/javadoc/doclet/testInterface/pkg1/Interface.java diff --git a/langtools/test/jdk/javadoc/doclet/testInterface/pkg1/Parent.java b/test/langtools/jdk/javadoc/doclet/testInterface/pkg1/Parent.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInterface/pkg1/Parent.java rename to test/langtools/jdk/javadoc/doclet/testInterface/pkg1/Parent.java diff --git a/langtools/test/jdk/javadoc/doclet/testInterface/pkg2/Abstract.java b/test/langtools/jdk/javadoc/doclet/testInterface/pkg2/Abstract.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInterface/pkg2/Abstract.java rename to test/langtools/jdk/javadoc/doclet/testInterface/pkg2/Abstract.java diff --git a/langtools/test/jdk/javadoc/doclet/testInterface/pkg2/Spliterator.java b/test/langtools/jdk/javadoc/doclet/testInterface/pkg2/Spliterator.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testInterface/pkg2/Spliterator.java rename to test/langtools/jdk/javadoc/doclet/testInterface/pkg2/Spliterator.java diff --git a/langtools/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java rename to test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java diff --git a/langtools/test/jdk/javadoc/doclet/testJavaFX/pkg1/C.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/pkg1/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testJavaFX/pkg1/C.java rename to test/langtools/jdk/javadoc/doclet/testJavaFX/pkg1/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testJavaFX/pkg1/D.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/pkg1/D.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testJavaFX/pkg1/D.java rename to test/langtools/jdk/javadoc/doclet/testJavaFX/pkg1/D.java diff --git a/langtools/test/jdk/javadoc/doclet/testJavaFX/pkg2/Test.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/pkg2/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testJavaFX/pkg2/Test.java rename to test/langtools/jdk/javadoc/doclet/testJavaFX/pkg2/Test.java diff --git a/langtools/test/jdk/javadoc/doclet/testJavaFX/pkg4/C.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/pkg4/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testJavaFX/pkg4/C.java rename to test/langtools/jdk/javadoc/doclet/testJavaFX/pkg4/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testJavascript/TestJavascript.java b/test/langtools/jdk/javadoc/doclet/testJavascript/TestJavascript.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testJavascript/TestJavascript.java rename to test/langtools/jdk/javadoc/doclet/testJavascript/TestJavascript.java diff --git a/langtools/test/jdk/javadoc/doclet/testJavascript/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testJavascript/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testJavascript/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testJavascript/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java b/test/langtools/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java rename to test/langtools/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java diff --git a/langtools/test/jdk/javadoc/doclet/testLambdaFeature/pkg/A.java b/test/langtools/jdk/javadoc/doclet/testLambdaFeature/pkg/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLambdaFeature/pkg/A.java rename to test/langtools/jdk/javadoc/doclet/testLambdaFeature/pkg/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testLambdaFeature/pkg/B.java b/test/langtools/jdk/javadoc/doclet/testLambdaFeature/pkg/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLambdaFeature/pkg/B.java rename to test/langtools/jdk/javadoc/doclet/testLambdaFeature/pkg/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testLambdaFeature/pkg1/FuncInf.java b/test/langtools/jdk/javadoc/doclet/testLambdaFeature/pkg1/FuncInf.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLambdaFeature/pkg1/FuncInf.java rename to test/langtools/jdk/javadoc/doclet/testLambdaFeature/pkg1/FuncInf.java diff --git a/langtools/test/jdk/javadoc/doclet/testLambdaFeature/pkg1/NotAFuncInf.java b/test/langtools/jdk/javadoc/doclet/testLambdaFeature/pkg1/NotAFuncInf.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLambdaFeature/pkg1/NotAFuncInf.java rename to test/langtools/jdk/javadoc/doclet/testLambdaFeature/pkg1/NotAFuncInf.java diff --git a/langtools/test/jdk/javadoc/doclet/testLeadingSpaces/LeadingSpaces.java b/test/langtools/jdk/javadoc/doclet/testLeadingSpaces/LeadingSpaces.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLeadingSpaces/LeadingSpaces.java rename to test/langtools/jdk/javadoc/doclet/testLeadingSpaces/LeadingSpaces.java diff --git a/langtools/test/jdk/javadoc/doclet/testLegacyTaglet/C.java b/test/langtools/jdk/javadoc/doclet/testLegacyTaglet/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLegacyTaglet/C.java rename to test/langtools/jdk/javadoc/doclet/testLegacyTaglet/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testLegacyTaglet/Check.java b/test/langtools/jdk/javadoc/doclet/testLegacyTaglet/Check.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLegacyTaglet/Check.java rename to test/langtools/jdk/javadoc/doclet/testLegacyTaglet/Check.java diff --git a/langtools/test/jdk/javadoc/doclet/testLegacyTaglet/TestLegacyTaglet.java b/test/langtools/jdk/javadoc/doclet/testLegacyTaglet/TestLegacyTaglet.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLegacyTaglet/TestLegacyTaglet.java rename to test/langtools/jdk/javadoc/doclet/testLegacyTaglet/TestLegacyTaglet.java diff --git a/langtools/test/jdk/javadoc/doclet/testLegacyTaglet/ToDoTaglet.java b/test/langtools/jdk/javadoc/doclet/testLegacyTaglet/ToDoTaglet.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLegacyTaglet/ToDoTaglet.java rename to test/langtools/jdk/javadoc/doclet/testLegacyTaglet/ToDoTaglet.java diff --git a/langtools/test/jdk/javadoc/doclet/testLegacyTaglet/UnderlineTaglet.java b/test/langtools/jdk/javadoc/doclet/testLegacyTaglet/UnderlineTaglet.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLegacyTaglet/UnderlineTaglet.java rename to test/langtools/jdk/javadoc/doclet/testLegacyTaglet/UnderlineTaglet.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkOption/TestBadLinkOption.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestBadLinkOption.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkOption/TestBadLinkOption.java rename to test/langtools/jdk/javadoc/doclet/testLinkOption/TestBadLinkOption.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java rename to test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkOption/TestNewLineInLink.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestNewLineInLink.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkOption/TestNewLineInLink.java rename to test/langtools/jdk/javadoc/doclet/testLinkOption/TestNewLineInLink.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkOption/extra/StringBuilder.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/extra/StringBuilder.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkOption/extra/StringBuilder.java rename to test/langtools/jdk/javadoc/doclet/testLinkOption/extra/StringBuilder.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkOption/jdk/package-list b/test/langtools/jdk/javadoc/doclet/testLinkOption/jdk/package-list similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkOption/jdk/package-list rename to test/langtools/jdk/javadoc/doclet/testLinkOption/jdk/package-list diff --git a/langtools/test/jdk/javadoc/doclet/testLinkOption/mylib/lang/StringBuilderChild.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/mylib/lang/StringBuilderChild.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkOption/mylib/lang/StringBuilderChild.java rename to test/langtools/jdk/javadoc/doclet/testLinkOption/mylib/lang/StringBuilderChild.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkOption/pkg/B.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/pkg/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkOption/pkg/B.java rename to test/langtools/jdk/javadoc/doclet/testLinkOption/pkg/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkOption/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkOption/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testLinkOption/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkOption/pkg2/C2.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/pkg2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkOption/pkg2/C2.java rename to test/langtools/jdk/javadoc/doclet/testLinkOption/pkg2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkOption/pkg3/A.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/pkg3/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkOption/pkg3/A.java rename to test/langtools/jdk/javadoc/doclet/testLinkOption/pkg3/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkOption/testNewLineInLink/C.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/testNewLineInLink/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkOption/testNewLineInLink/C.java rename to test/langtools/jdk/javadoc/doclet/testLinkOption/testNewLineInLink/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkOption/testNewLineInLink/package.html b/test/langtools/jdk/javadoc/doclet/testLinkOption/testNewLineInLink/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkOption/testNewLineInLink/package.html rename to test/langtools/jdk/javadoc/doclet/testLinkOption/testNewLineInLink/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java rename to test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkTaglet/checkPkg/A.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/checkPkg/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkTaglet/checkPkg/A.java rename to test/langtools/jdk/javadoc/doclet/testLinkTaglet/checkPkg/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkTaglet/checkPkg/B.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/checkPkg/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkTaglet/checkPkg/B.java rename to test/langtools/jdk/javadoc/doclet/testLinkTaglet/checkPkg/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkToSerialForm/TestLinkToSerialForm.java b/test/langtools/jdk/javadoc/doclet/testLinkToSerialForm/TestLinkToSerialForm.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkToSerialForm/TestLinkToSerialForm.java rename to test/langtools/jdk/javadoc/doclet/testLinkToSerialForm/TestLinkToSerialForm.java diff --git a/langtools/test/jdk/javadoc/doclet/testLinkToSerialForm/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testLinkToSerialForm/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLinkToSerialForm/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testLinkToSerialForm/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java b/test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java rename to test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java diff --git a/langtools/test/jdk/javadoc/doclet/testLiteralCodeInPre/pkg/Test.java b/test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/pkg/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testLiteralCodeInPre/pkg/Test.java rename to test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/pkg/Test.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/diamond/A.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/diamond/A.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/diamond/B.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/diamond/B.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/diamond/C.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/diamond/C.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/diamond/X.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/X.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/diamond/X.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/X.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/diamond/Z.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/Z.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/diamond/Z.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/Z.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/inheritDist/A.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/inheritDist/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/inheritDist/A.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/inheritDist/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/inheritDist/B.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/inheritDist/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/inheritDist/B.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/inheritDist/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/inheritDist/C.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/inheritDist/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/inheritDist/C.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/inheritDist/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/pkg/BaseClass.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg/BaseClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/pkg/BaseClass.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg/BaseClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/pkg/BaseInterface.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg/BaseInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/pkg/BaseInterface.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg/BaseInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/pkg/SubClass.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg/SubClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/pkg/SubClass.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg/SubClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/pkg1/Implementer.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg1/Implementer.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/pkg1/Implementer.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg1/Implementer.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/pkg1/Interface.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg1/Interface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberInheritence/pkg1/Interface.java rename to test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg1/Interface.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java b/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java rename to test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberSummary/pkg/PrivateParent.java b/test/langtools/jdk/javadoc/doclet/testMemberSummary/pkg/PrivateParent.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberSummary/pkg/PrivateParent.java rename to test/langtools/jdk/javadoc/doclet/testMemberSummary/pkg/PrivateParent.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberSummary/pkg/PublicChild.java b/test/langtools/jdk/javadoc/doclet/testMemberSummary/pkg/PublicChild.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberSummary/pkg/PublicChild.java rename to test/langtools/jdk/javadoc/doclet/testMemberSummary/pkg/PublicChild.java diff --git a/langtools/test/jdk/javadoc/doclet/testMemberSummary/pkg2/A.java b/test/langtools/jdk/javadoc/doclet/testMemberSummary/pkg2/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMemberSummary/pkg2/A.java rename to test/langtools/jdk/javadoc/doclet/testMemberSummary/pkg2/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java b/test/langtools/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java rename to test/langtools/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java diff --git a/langtools/test/jdk/javadoc/doclet/testMethodTypes/pkg1/A.java b/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMethodTypes/pkg1/A.java rename to test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testMethodTypes/pkg1/B.java b/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMethodTypes/pkg1/B.java rename to test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testMethodTypes/pkg1/D.java b/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/D.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMethodTypes/pkg1/D.java rename to test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/D.java diff --git a/langtools/test/jdk/javadoc/doclet/testMissingType/TestMissingType.java b/test/langtools/jdk/javadoc/doclet/testMissingType/TestMissingType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMissingType/TestMissingType.java rename to test/langtools/jdk/javadoc/doclet/testMissingType/TestMissingType.java diff --git a/langtools/test/jdk/javadoc/doclet/testMissingType/p/MissingType.java b/test/langtools/jdk/javadoc/doclet/testMissingType/p/MissingType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testMissingType/p/MissingType.java rename to test/langtools/jdk/javadoc/doclet/testMissingType/p/MissingType.java diff --git a/langtools/test/jdk/javadoc/doclet/testModifierEx/TestModifierEx.java b/test/langtools/jdk/javadoc/doclet/testModifierEx/TestModifierEx.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModifierEx/TestModifierEx.java rename to test/langtools/jdk/javadoc/doclet/testModifierEx/TestModifierEx.java diff --git a/langtools/test/jdk/javadoc/doclet/testModifierEx/pkg1/Abstract.java b/test/langtools/jdk/javadoc/doclet/testModifierEx/pkg1/Abstract.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModifierEx/pkg1/Abstract.java rename to test/langtools/jdk/javadoc/doclet/testModifierEx/pkg1/Abstract.java diff --git a/langtools/test/jdk/javadoc/doclet/testModifierEx/pkg1/AnnotationType.java b/test/langtools/jdk/javadoc/doclet/testModifierEx/pkg1/AnnotationType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModifierEx/pkg1/AnnotationType.java rename to test/langtools/jdk/javadoc/doclet/testModifierEx/pkg1/AnnotationType.java diff --git a/langtools/test/jdk/javadoc/doclet/testModifierEx/pkg1/Enum.java b/test/langtools/jdk/javadoc/doclet/testModifierEx/pkg1/Enum.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModifierEx/pkg1/Enum.java rename to test/langtools/jdk/javadoc/doclet/testModifierEx/pkg1/Enum.java diff --git a/langtools/test/jdk/javadoc/doclet/testModifierEx/pkg1/Interface.java b/test/langtools/jdk/javadoc/doclet/testModifierEx/pkg1/Interface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModifierEx/pkg1/Interface.java rename to test/langtools/jdk/javadoc/doclet/testModifierEx/pkg1/Interface.java diff --git a/langtools/test/jdk/javadoc/doclet/testModifierEx/pkg1/Klass.java b/test/langtools/jdk/javadoc/doclet/testModifierEx/pkg1/Klass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModifierEx/pkg1/Klass.java rename to test/langtools/jdk/javadoc/doclet/testModifierEx/pkg1/Klass.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java b/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java rename to test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/TestModuleServices.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/TestModuleServices.java rename to test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java rename to test/langtools/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/TestModules.java rename to test/langtools/jdk/javadoc/doclet/testModules/TestModules.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleA/concealedpkgmdlA/ConcealedClassInModuleA.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleA/concealedpkgmdlA/ConcealedClassInModuleA.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleA/concealedpkgmdlA/ConcealedClassInModuleA.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleA/concealedpkgmdlA/ConcealedClassInModuleA.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleA/module-info.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleA/module-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleA/module-info.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleA/module-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleA/testpkgmdlA/TestClassInModuleA.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleA/testpkgmdlA/TestClassInModuleA.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleA/testpkgmdlA/TestClassInModuleA.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleA/testpkgmdlA/TestClassInModuleA.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleB/module-info.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleB/module-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleB/module-info.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleB/module-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterface2InModuleB.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterface2InModuleB.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterface2InModuleB.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterface2InModuleB.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterfaceInModuleB.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterfaceInModuleB.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterfaceInModuleB.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterfaceInModuleB.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationType.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationType.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationType.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationTypeUndocumented.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationTypeUndocumented.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationTypeUndocumented.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationTypeUndocumented.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClass2InModuleB.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClass2InModuleB.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClass2InModuleB.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClass2InModuleB.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClassInModuleB.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClassInModuleB.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClassInModuleB.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClassInModuleB.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleC/module-info.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleC/module-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleC/module-info.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleC/module-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleC/testpkgmdlC/TestClassInModuleC.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleC/testpkgmdlC/TestClassInModuleC.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleC/testpkgmdlC/TestClassInModuleC.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleC/testpkgmdlC/TestClassInModuleC.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleNoExport/module-info.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleNoExport/module-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleNoExport/module-info.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleNoExport/module-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleNoExport/testpkgmdlNoExport/TestClassInModuleNoExport.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleNoExport/testpkgmdlNoExport/TestClassInModuleNoExport.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleNoExport/testpkgmdlNoExport/TestClassInModuleNoExport.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleNoExport/testpkgmdlNoExport/TestClassInModuleNoExport.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleT/module-info.java b/test/langtools/jdk/javadoc/doclet/testModules/moduleT/module-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduleT/module-info.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduleT/module-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduletags/module-info.java b/test/langtools/jdk/javadoc/doclet/testModules/moduletags/module-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduletags/module-info.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduletags/module-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduletags/testpkgmdltags/TestClassInModuleTags.java b/test/langtools/jdk/javadoc/doclet/testModules/moduletags/testpkgmdltags/TestClassInModuleTags.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/moduletags/testpkgmdltags/TestClassInModuleTags.java rename to test/langtools/jdk/javadoc/doclet/testModules/moduletags/testpkgmdltags/TestClassInModuleTags.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/overview.html b/test/langtools/jdk/javadoc/doclet/testModules/overview.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/overview.html rename to test/langtools/jdk/javadoc/doclet/testModules/overview.html diff --git a/langtools/test/jdk/javadoc/doclet/testModules/test.moduleFullName/module-info.java b/test/langtools/jdk/javadoc/doclet/testModules/test.moduleFullName/module-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/test.moduleFullName/module-info.java rename to test/langtools/jdk/javadoc/doclet/testModules/test.moduleFullName/module-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/test.moduleFullName/testpkgmdlfullname/TestClassInTestModuleFullName.java b/test/langtools/jdk/javadoc/doclet/testModules/test.moduleFullName/testpkgmdlfullname/TestClassInTestModuleFullName.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/test.moduleFullName/testpkgmdlfullname/TestClassInTestModuleFullName.java rename to test/langtools/jdk/javadoc/doclet/testModules/test.moduleFullName/testpkgmdlfullname/TestClassInTestModuleFullName.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/testpkgnomodule/TestClassNoModule.java b/test/langtools/jdk/javadoc/doclet/testModules/testpkgnomodule/TestClassNoModule.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/testpkgnomodule/TestClassNoModule.java rename to test/langtools/jdk/javadoc/doclet/testModules/testpkgnomodule/TestClassNoModule.java diff --git a/langtools/test/jdk/javadoc/doclet/testModules/testpkgnomodule1/TestClassNoModulePkg1.java b/test/langtools/jdk/javadoc/doclet/testModules/testpkgnomodule1/TestClassNoModulePkg1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testModules/testpkgnomodule1/TestClassNoModulePkg1.java rename to test/langtools/jdk/javadoc/doclet/testModules/testpkgnomodule1/TestClassNoModulePkg1.java diff --git a/langtools/test/jdk/javadoc/doclet/testNavigation/TestNavigation.java b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNavigation/TestNavigation.java rename to test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java diff --git a/langtools/test/jdk/javadoc/doclet/testNavigation/overview.html b/test/langtools/jdk/javadoc/doclet/testNavigation/overview.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNavigation/overview.html rename to test/langtools/jdk/javadoc/doclet/testNavigation/overview.html diff --git a/langtools/test/jdk/javadoc/doclet/testNavigation/pkg/A.java b/test/langtools/jdk/javadoc/doclet/testNavigation/pkg/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNavigation/pkg/A.java rename to test/langtools/jdk/javadoc/doclet/testNavigation/pkg/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testNavigation/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testNavigation/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNavigation/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testNavigation/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testNavigation/pkg/E.java b/test/langtools/jdk/javadoc/doclet/testNavigation/pkg/E.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNavigation/pkg/E.java rename to test/langtools/jdk/javadoc/doclet/testNavigation/pkg/E.java diff --git a/langtools/test/jdk/javadoc/doclet/testNavigation/pkg/I.java b/test/langtools/jdk/javadoc/doclet/testNavigation/pkg/I.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNavigation/pkg/I.java rename to test/langtools/jdk/javadoc/doclet/testNavigation/pkg/I.java diff --git a/langtools/test/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java b/test/langtools/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java rename to test/langtools/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java diff --git a/langtools/test/jdk/javadoc/doclet/testNestedGenerics/pkg/NestedGenerics.java b/test/langtools/jdk/javadoc/doclet/testNestedGenerics/pkg/NestedGenerics.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNestedGenerics/pkg/NestedGenerics.java rename to test/langtools/jdk/javadoc/doclet/testNestedGenerics/pkg/NestedGenerics.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/AnnotationType.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/AnnotationType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/AnnotationType.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/AnnotationType.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/AnnotationTypeUsage.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/AnnotationTypeUsage.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/AnnotationTypeUsage.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/AnnotationTypeUsage.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/Coin.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/Coin.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/Coin.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/Coin.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/MultiTypeParameters.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/MultiTypeParameters.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/MultiTypeParameters.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/MultiTypeParameters.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/SubInterface.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/SubInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/SubInterface.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/SubInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/SuperInterface.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/SuperInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/SuperInterface.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/SuperInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/TypeParameterSubClass.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/TypeParameterSubClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/TypeParameterSubClass.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/TypeParameterSubClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/TypeParameters.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/TypeParameters.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/TypeParameters.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/TypeParameters.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/VarArgs.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/VarArgs.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/VarArgs.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/VarArgs.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/Wildcards.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/Wildcards.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/Wildcards.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/Wildcards.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/package-info.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/package-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/package-info.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg/package-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg1/A.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg1/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg1/A.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg1/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg1/B.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg1/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg1/B.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg1/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ClassUseTest1.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ClassUseTest1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ClassUseTest1.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ClassUseTest1.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ClassUseTest2.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ClassUseTest2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ClassUseTest2.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ClassUseTest2.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ClassUseTest3.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ClassUseTest3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ClassUseTest3.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ClassUseTest3.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo2.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo2.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo2.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo3.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo3.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo3.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo4.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo4.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo4.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/Foo4.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ParamTest.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ParamTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ParamTest.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ParamTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ParamTest2.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ParamTest2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ParamTest2.java rename to test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/pkg2/ParamTest2.java diff --git a/langtools/test/jdk/javadoc/doclet/testNoPackagesFile/C.java b/test/langtools/jdk/javadoc/doclet/testNoPackagesFile/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNoPackagesFile/C.java rename to test/langtools/jdk/javadoc/doclet/testNoPackagesFile/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testNoPackagesFile/TestNoPackagesFile.java b/test/langtools/jdk/javadoc/doclet/testNoPackagesFile/TestNoPackagesFile.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNoPackagesFile/TestNoPackagesFile.java rename to test/langtools/jdk/javadoc/doclet/testNoPackagesFile/TestNoPackagesFile.java diff --git a/langtools/test/jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/C.java b/test/langtools/jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/C.java rename to test/langtools/jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/Negative.java b/test/langtools/jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/Negative.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/Negative.java rename to test/langtools/jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/Negative.java diff --git a/langtools/test/jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/TestNonInlineHtmlTagRemoval.java b/test/langtools/jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/TestNonInlineHtmlTagRemoval.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/TestNonInlineHtmlTagRemoval.java rename to test/langtools/jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/TestNonInlineHtmlTagRemoval.java diff --git a/langtools/test/jdk/javadoc/doclet/testNotifications/TestNotifications.java b/test/langtools/jdk/javadoc/doclet/testNotifications/TestNotifications.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNotifications/TestNotifications.java rename to test/langtools/jdk/javadoc/doclet/testNotifications/TestNotifications.java diff --git a/langtools/test/jdk/javadoc/doclet/testNotifications/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testNotifications/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testNotifications/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testNotifications/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testOptions/TestOptions.java b/test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOptions/TestOptions.java rename to test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java diff --git a/langtools/test/jdk/javadoc/doclet/testOptions/custom-stylesheet.css b/test/langtools/jdk/javadoc/doclet/testOptions/custom-stylesheet.css similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOptions/custom-stylesheet.css rename to test/langtools/jdk/javadoc/doclet/testOptions/custom-stylesheet.css diff --git a/langtools/test/jdk/javadoc/doclet/testOptions/deprecated/Foo.java b/test/langtools/jdk/javadoc/doclet/testOptions/deprecated/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOptions/deprecated/Foo.java rename to test/langtools/jdk/javadoc/doclet/testOptions/deprecated/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testOptions/help.html b/test/langtools/jdk/javadoc/doclet/testOptions/help.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOptions/help.html rename to test/langtools/jdk/javadoc/doclet/testOptions/help.html diff --git a/langtools/test/jdk/javadoc/doclet/testOptions/linksource/AnnotationTypeField.java b/test/langtools/jdk/javadoc/doclet/testOptions/linksource/AnnotationTypeField.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOptions/linksource/AnnotationTypeField.java rename to test/langtools/jdk/javadoc/doclet/testOptions/linksource/AnnotationTypeField.java diff --git a/langtools/test/jdk/javadoc/doclet/testOptions/linksource/Properties.java b/test/langtools/jdk/javadoc/doclet/testOptions/linksource/Properties.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOptions/linksource/Properties.java rename to test/langtools/jdk/javadoc/doclet/testOptions/linksource/Properties.java diff --git a/langtools/test/jdk/javadoc/doclet/testOptions/linksource/SomeClass.java b/test/langtools/jdk/javadoc/doclet/testOptions/linksource/SomeClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOptions/linksource/SomeClass.java rename to test/langtools/jdk/javadoc/doclet/testOptions/linksource/SomeClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testOptions/linksource/SomeEnum.java b/test/langtools/jdk/javadoc/doclet/testOptions/linksource/SomeEnum.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOptions/linksource/SomeEnum.java rename to test/langtools/jdk/javadoc/doclet/testOptions/linksource/SomeEnum.java diff --git a/langtools/test/jdk/javadoc/doclet/testOptions/pkg/Foo.java b/test/langtools/jdk/javadoc/doclet/testOptions/pkg/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOptions/pkg/Foo.java rename to test/langtools/jdk/javadoc/doclet/testOptions/pkg/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/C.java b/test/langtools/jdk/javadoc/doclet/testOrdering/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/C.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/TestOrdering.java b/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/TestOrdering.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/UsedInC.java b/test/langtools/jdk/javadoc/doclet/testOrdering/UsedInC.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/UsedInC.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/UsedInC.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/A.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/A.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/B.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/B.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/C2.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/C2.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/C3.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/C3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/C3.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/C3.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/C4.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/C4.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/C4.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/C4.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/ImplementsOrdering.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/ImplementsOrdering.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/ImplementsOrdering.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/ImplementsOrdering.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/MethodOrder.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/MethodOrder.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/MethodOrder.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/MethodOrder.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/OverrideOrdering.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/OverrideOrdering.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/OverrideOrdering.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/OverrideOrdering.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/UsedClass.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/UsedClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg1/UsedClass.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg1/UsedClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/AnnoFieldTest.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/AnnoFieldTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/AnnoFieldTest.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/AnnoFieldTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/AnnoOptionalTest.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/AnnoOptionalTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/AnnoOptionalTest.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/AnnoOptionalTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/AnnoRequiredTest.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/AnnoRequiredTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/AnnoRequiredTest.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/AnnoRequiredTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/CtorTest.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/CtorTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/CtorTest.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/CtorTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/EnumTest.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/EnumTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/EnumTest.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/EnumTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/FieldTest.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/FieldTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/FieldTest.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/FieldTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/IntfTest.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/IntfTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/IntfTest.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/IntfTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/MethodTest.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/MethodTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/MethodTest.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/MethodTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/PropertyTest.java b/test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/PropertyTest.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/pkg5/PropertyTest.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/pkg5/PropertyTest.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/src-2/a/A.java b/test/langtools/jdk/javadoc/doclet/testOrdering/src-2/a/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/src-2/a/A.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/src-2/a/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/src-2/a/something.java b/test/langtools/jdk/javadoc/doclet/testOrdering/src-2/a/something.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/src-2/a/something.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/src-2/a/something.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/src-2/b/B.java b/test/langtools/jdk/javadoc/doclet/testOrdering/src-2/b/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/src-2/b/B.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/src-2/b/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/src-2/b/something.java b/test/langtools/jdk/javadoc/doclet/testOrdering/src-2/b/something.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/src-2/b/something.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/src-2/b/something.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/src-2/e/something.java b/test/langtools/jdk/javadoc/doclet/testOrdering/src-2/e/something.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/src-2/e/something.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/src-2/e/something.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/src-2/something/J.java b/test/langtools/jdk/javadoc/doclet/testOrdering/src-2/something/J.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/src-2/something/J.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/src-2/something/J.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/src-2/something/package-info.java b/test/langtools/jdk/javadoc/doclet/testOrdering/src-2/something/package-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/src-2/something/package-info.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/src-2/something/package-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testOrdering/src-2/something/something.java b/test/langtools/jdk/javadoc/doclet/testOrdering/src-2/something/something.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOrdering/src-2/something/something.java rename to test/langtools/jdk/javadoc/doclet/testOrdering/src-2/something/something.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestBadOverride.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestBadOverride.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestBadOverride.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestBadOverride.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestMultiInheritence.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestMultiInheritence.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestMultiInheritence.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestMultiInheritence.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestOverridenMethodDocCopy.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenMethodDocCopy.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestOverridenMethodDocCopy.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenMethodDocCopy.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethods.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethods.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethods.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethods.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg1/BaseClass.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg1/BaseClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg1/BaseClass.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg1/BaseClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg1/SubClass.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg1/SubClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg1/SubClass.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg1/SubClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg2/SubClass.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg2/SubClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg2/SubClass.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg2/SubClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg3/I0.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I0.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg3/I0.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I0.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg3/I1.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg3/I1.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I1.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg3/I2.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg3/I2.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I2.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg3/I3.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg3/I3.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I3.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg3/I4.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I4.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg3/I4.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I4.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg4/Foo.java b/test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg4/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverridenMethods/pkg4/Foo.java rename to test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg4/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverview/TestOverview.java b/test/langtools/jdk/javadoc/doclet/testOverview/TestOverview.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverview/TestOverview.java rename to test/langtools/jdk/javadoc/doclet/testOverview/TestOverview.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverview/msrc/module-info.java b/test/langtools/jdk/javadoc/doclet/testOverview/msrc/module-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverview/msrc/module-info.java rename to test/langtools/jdk/javadoc/doclet/testOverview/msrc/module-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverview/msrc/p1/C.java b/test/langtools/jdk/javadoc/doclet/testOverview/msrc/p1/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverview/msrc/p1/C.java rename to test/langtools/jdk/javadoc/doclet/testOverview/msrc/p1/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverview/msrc/p2/C2.java b/test/langtools/jdk/javadoc/doclet/testOverview/msrc/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverview/msrc/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/testOverview/msrc/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverview/overview.html b/test/langtools/jdk/javadoc/doclet/testOverview/overview.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverview/overview.html rename to test/langtools/jdk/javadoc/doclet/testOverview/overview.html diff --git a/langtools/test/jdk/javadoc/doclet/testOverview/src/p1/C.java b/test/langtools/jdk/javadoc/doclet/testOverview/src/p1/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverview/src/p1/C.java rename to test/langtools/jdk/javadoc/doclet/testOverview/src/p1/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testOverview/src/p2/C2.java b/test/langtools/jdk/javadoc/doclet/testOverview/src/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testOverview/src/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/testOverview/src/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageDeprecation/C2.java b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageDeprecation/C2.java rename to test/langtools/jdk/javadoc/doclet/testPackageDeprecation/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageDeprecation/FooDepr.java b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/FooDepr.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageDeprecation/FooDepr.java rename to test/langtools/jdk/javadoc/doclet/testPackageDeprecation/FooDepr.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java rename to test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageDeprecation/pkg/A.java b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/pkg/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageDeprecation/pkg/A.java rename to test/langtools/jdk/javadoc/doclet/testPackageDeprecation/pkg/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageDeprecation/pkg1/ClassUseTest1.java b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/pkg1/ClassUseTest1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageDeprecation/pkg1/ClassUseTest1.java rename to test/langtools/jdk/javadoc/doclet/testPackageDeprecation/pkg1/ClassUseTest1.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageDeprecation/pkg1/Foo.java b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/pkg1/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageDeprecation/pkg1/Foo.java rename to test/langtools/jdk/javadoc/doclet/testPackageDeprecation/pkg1/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageDeprecation/pkg1/Foo2.java b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/pkg1/Foo2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageDeprecation/pkg1/Foo2.java rename to test/langtools/jdk/javadoc/doclet/testPackageDeprecation/pkg1/Foo2.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageDeprecation/pkg1/package-info.java b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/pkg1/package-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageDeprecation/pkg1/package-info.java rename to test/langtools/jdk/javadoc/doclet/testPackageDeprecation/pkg1/package-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageDescription/TestPackageDescription.java b/test/langtools/jdk/javadoc/doclet/testPackageDescription/TestPackageDescription.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageDescription/TestPackageDescription.java rename to test/langtools/jdk/javadoc/doclet/testPackageDescription/TestPackageDescription.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageDescription/pkg/A.java b/test/langtools/jdk/javadoc/doclet/testPackageDescription/pkg/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageDescription/pkg/A.java rename to test/langtools/jdk/javadoc/doclet/testPackageDescription/pkg/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageDescription/pkg/package-info.java b/test/langtools/jdk/javadoc/doclet/testPackageDescription/pkg/package-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageDescription/pkg/package-info.java rename to test/langtools/jdk/javadoc/doclet/testPackageDescription/pkg/package-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageHtml/TestPackageHtml.java b/test/langtools/jdk/javadoc/doclet/testPackageHtml/TestPackageHtml.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageHtml/TestPackageHtml.java rename to test/langtools/jdk/javadoc/doclet/testPackageHtml/TestPackageHtml.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg1/X.java b/test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg1/X.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg1/X.java rename to test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg1/X.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg1/package.html b/test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg1/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg1/package.html rename to test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg1/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg2/X.java b/test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg2/X.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg2/X.java rename to test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg2/X.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg2/package.html b/test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg2/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg2/package.html rename to test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg2/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg3/X.java b/test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg3/X.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg3/X.java rename to test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg3/X.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg3/package.html b/test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg3/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg3/package.html rename to test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg3/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg4/X.java b/test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg4/X.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg4/X.java rename to test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg4/X.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg4/package.html b/test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg4/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg4/package.html rename to test/langtools/jdk/javadoc/doclet/testPackageHtml/pkg4/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java b/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java rename to test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackagePage/com/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testPackagePage/com/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackagePage/com/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testPackagePage/com/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testPackagePage/com/pkg/package.html b/test/langtools/jdk/javadoc/doclet/testPackagePage/com/pkg/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackagePage/com/pkg/package.html rename to test/langtools/jdk/javadoc/doclet/testPackagePage/com/pkg/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testPackagePage/pkg2/C.java b/test/langtools/jdk/javadoc/doclet/testPackagePage/pkg2/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPackagePage/pkg2/C.java rename to test/langtools/jdk/javadoc/doclet/testPackagePage/pkg2/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java b/test/langtools/jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java rename to test/langtools/jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java diff --git a/langtools/test/jdk/javadoc/doclet/testParamTaglet/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testParamTaglet/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testParamTaglet/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testParamTaglet/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testParamTaglet/pkg/Parent.java b/test/langtools/jdk/javadoc/doclet/testParamTaglet/pkg/Parent.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testParamTaglet/pkg/Parent.java rename to test/langtools/jdk/javadoc/doclet/testParamTaglet/pkg/Parent.java diff --git a/langtools/test/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java rename to test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java diff --git a/langtools/test/jdk/javadoc/doclet/testPrivateClasses/pkg/PrivateInterface.java b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/pkg/PrivateInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPrivateClasses/pkg/PrivateInterface.java rename to test/langtools/jdk/javadoc/doclet/testPrivateClasses/pkg/PrivateInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testPrivateClasses/pkg/PrivateParent.java b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/pkg/PrivateParent.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPrivateClasses/pkg/PrivateParent.java rename to test/langtools/jdk/javadoc/doclet/testPrivateClasses/pkg/PrivateParent.java diff --git a/langtools/test/jdk/javadoc/doclet/testPrivateClasses/pkg/PublicChild.java b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/pkg/PublicChild.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPrivateClasses/pkg/PublicChild.java rename to test/langtools/jdk/javadoc/doclet/testPrivateClasses/pkg/PublicChild.java diff --git a/langtools/test/jdk/javadoc/doclet/testPrivateClasses/pkg/PublicInterface.java b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/pkg/PublicInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPrivateClasses/pkg/PublicInterface.java rename to test/langtools/jdk/javadoc/doclet/testPrivateClasses/pkg/PublicInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testPrivateClasses/pkg2/C.java b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/pkg2/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPrivateClasses/pkg2/C.java rename to test/langtools/jdk/javadoc/doclet/testPrivateClasses/pkg2/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testPrivateClasses/pkg2/I.java b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/pkg2/I.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testPrivateClasses/pkg2/I.java rename to test/langtools/jdk/javadoc/doclet/testPrivateClasses/pkg2/I.java diff --git a/langtools/test/jdk/javadoc/doclet/testProperty/TestProperty.java b/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testProperty/TestProperty.java rename to test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java diff --git a/langtools/test/jdk/javadoc/doclet/testProperty/pkg/MyClass.java b/test/langtools/jdk/javadoc/doclet/testProperty/pkg/MyClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testProperty/pkg/MyClass.java rename to test/langtools/jdk/javadoc/doclet/testProperty/pkg/MyClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testProperty/pkg/MyClassT.java b/test/langtools/jdk/javadoc/doclet/testProperty/pkg/MyClassT.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testProperty/pkg/MyClassT.java rename to test/langtools/jdk/javadoc/doclet/testProperty/pkg/MyClassT.java diff --git a/langtools/test/jdk/javadoc/doclet/testProperty/pkg/MyObj.java b/test/langtools/jdk/javadoc/doclet/testProperty/pkg/MyObj.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testProperty/pkg/MyObj.java rename to test/langtools/jdk/javadoc/doclet/testProperty/pkg/MyObj.java diff --git a/langtools/test/jdk/javadoc/doclet/testProperty/pkg/ObjectProperty.java b/test/langtools/jdk/javadoc/doclet/testProperty/pkg/ObjectProperty.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testProperty/pkg/ObjectProperty.java rename to test/langtools/jdk/javadoc/doclet/testProperty/pkg/ObjectProperty.java diff --git a/langtools/test/jdk/javadoc/doclet/testProperty/pkg/SimpleObjectProperty.java b/test/langtools/jdk/javadoc/doclet/testProperty/pkg/SimpleObjectProperty.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testProperty/pkg/SimpleObjectProperty.java rename to test/langtools/jdk/javadoc/doclet/testProperty/pkg/SimpleObjectProperty.java diff --git a/langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/TestRecurseSubPackages.java b/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/TestRecurseSubPackages.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/TestRecurseSubPackages.java rename to test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/TestRecurseSubPackages.java diff --git a/langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/C2.java b/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/C2.java rename to test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/C3.java b/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/C3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/C3.java rename to test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/C3.java diff --git a/langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/C4.java b/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/C4.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/C4.java rename to test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/C4.java diff --git a/langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/packageToExclude/DummyClass.java b/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/packageToExclude/DummyClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/packageToExclude/DummyClass.java rename to test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/packageToExclude/DummyClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/pkg3/C5.java b/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/pkg3/C5.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/pkg3/C5.java rename to test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/pkg3/C5.java diff --git a/langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/pkg3/C6.java b/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/pkg3/C6.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/pkg3/C6.java rename to test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/pkg1/pkg2/pkg3/C6.java diff --git a/langtools/test/jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java rename to test/langtools/jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java diff --git a/langtools/test/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testRelativeLinks/pkg/package.html b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRelativeLinks/pkg/package.html rename to test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testRelativeLinks/pkg2/Foo.java b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg2/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRelativeLinks/pkg2/Foo.java rename to test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg2/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/TestRepeatedAnnotations.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/TestRepeatedAnnotations.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/TestRepeatedAnnotations.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/TestRepeatedAnnotations.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContaineeRegDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContaineeRegDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContaineeRegDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContaineeRegDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContaineeSynthDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContaineeSynthDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContaineeSynthDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContaineeSynthDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContainerRegDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContainerRegDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContainerRegDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContainerRegDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContainerRegNotDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContainerRegNotDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContainerRegNotDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContainerRegNotDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContainerSynthDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContainerSynthDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContainerSynthDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/ContainerSynthDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/D.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/D.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/D.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/D.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/NonSynthDocContainer.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/NonSynthDocContainer.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/NonSynthDocContainer.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/NonSynthDocContainer.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegArryDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegArryDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegArryDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegArryDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContaineeDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContaineeDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContaineeDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContaineeDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContaineeNotDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContaineeNotDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContaineeNotDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContaineeNotDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContainerDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContainerDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContainerDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContainerDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContainerNotDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContainerNotDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContainerNotDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegContainerNotDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg/RegDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/C.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/C.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContaineeNotDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContaineeNotDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContaineeNotDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContaineeNotDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContaineeSynthDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContaineeSynthDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContaineeSynthDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContaineeSynthDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContainerSynthNotDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContainerSynthNotDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContainerSynthNotDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContainerSynthNotDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContainerValDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContainerValDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContainerValDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContainerValDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContainerValNotDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContainerValNotDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContainerValNotDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/ContainerValNotDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContaineeDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContaineeDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContaineeDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContaineeDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContaineeNotDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContaineeNotDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContaineeNotDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContaineeNotDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContainerValDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContainerValDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContainerValDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContainerValDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContainerValNotDoc.java b/test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContainerValNotDoc.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContainerValNotDoc.java rename to test/langtools/jdk/javadoc/doclet/testRepeatedAnnotations/pkg1/RegContainerValNotDoc.java diff --git a/langtools/test/jdk/javadoc/doclet/testReturnTag/TestReturnTag.java b/test/langtools/jdk/javadoc/doclet/testReturnTag/TestReturnTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testReturnTag/TestReturnTag.java rename to test/langtools/jdk/javadoc/doclet/testReturnTag/TestReturnTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/TestSearch.java b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/TestSearch.java rename to test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/UnnamedPkgClass.java b/test/langtools/jdk/javadoc/doclet/testSearch/UnnamedPkgClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/UnnamedPkgClass.java rename to test/langtools/jdk/javadoc/doclet/testSearch/UnnamedPkgClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg/AnnotationType.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg/AnnotationType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg/AnnotationType.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg/AnnotationType.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg/AnotherClass.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg/AnotherClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg/AnotherClass.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg/AnotherClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg/TestError.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg/TestError.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg/TestError.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg/TestError.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg/TestException.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg/TestException.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg/TestException.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg/TestException.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg/TestInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg/TestInterface.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg/TestInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg/package-info.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg/package-info.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg/package-info.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg/package-info.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg1/NestedInnerClass.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg1/NestedInnerClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg1/NestedInnerClass.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg1/NestedInnerClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg1/PrivateIncludeInnerClass.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg1/PrivateIncludeInnerClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg1/PrivateIncludeInnerClass.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg1/PrivateIncludeInnerClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg1/ProtectedInnerClass.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg1/ProtectedInnerClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg1/ProtectedInnerClass.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg1/ProtectedInnerClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg1/PublicExcludeInnerClass.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg1/PublicExcludeInnerClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg1/PublicExcludeInnerClass.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg1/PublicExcludeInnerClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg1/RegClass.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg1/RegClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg1/RegClass.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg1/RegClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg2/DeprecatedClassByAnnotation.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg2/DeprecatedClassByAnnotation.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg2/DeprecatedClassByAnnotation.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg2/DeprecatedClassByAnnotation.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg2/Interface.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg2/Interface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg2/Interface.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg2/Interface.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg2/TestAnnotationType.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg2/TestAnnotationType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg2/TestAnnotationType.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg2/TestAnnotationType.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg2/TestClass.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg2/TestClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg2/TestClass.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg2/TestClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg2/TestEnum.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg2/TestEnum.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg2/TestEnum.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg2/TestEnum.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg2/TestError.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg2/TestError.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg2/TestError.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg2/TestError.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg2/TestException.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg2/TestException.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg2/TestException.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg2/TestException.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg2/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg2/TestInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg2/TestInterface.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg2/TestInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkg3/ClassNoConstants.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkg3/ClassNoConstants.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkg3/ClassNoConstants.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkg3/ClassNoConstants.java diff --git a/langtools/test/jdk/javadoc/doclet/testSearch/pkgfx/C.java b/test/langtools/jdk/javadoc/doclet/testSearch/pkgfx/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSearch/pkgfx/C.java rename to test/langtools/jdk/javadoc/doclet/testSearch/pkgfx/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java rename to test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testSeeTag/pkg/Test.java b/test/langtools/jdk/javadoc/doclet/testSeeTag/pkg/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSeeTag/pkg/Test.java rename to test/langtools/jdk/javadoc/doclet/testSeeTag/pkg/Test.java diff --git a/langtools/test/jdk/javadoc/doclet/testSeeTag/pkg/Test2.java b/test/langtools/jdk/javadoc/doclet/testSeeTag/pkg/Test2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSeeTag/pkg/Test2.java rename to test/langtools/jdk/javadoc/doclet/testSeeTag/pkg/Test2.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerialVersionUID/C.java b/test/langtools/jdk/javadoc/doclet/testSerialVersionUID/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerialVersionUID/C.java rename to test/langtools/jdk/javadoc/doclet/testSerialVersionUID/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerialVersionUID/TestSerialVersionUID.java b/test/langtools/jdk/javadoc/doclet/testSerialVersionUID/TestSerialVersionUID.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerialVersionUID/TestSerialVersionUID.java rename to test/langtools/jdk/javadoc/doclet/testSerialVersionUID/TestSerialVersionUID.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerializedForm/ExternalizedForm.java b/test/langtools/jdk/javadoc/doclet/testSerializedForm/ExternalizedForm.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerializedForm/ExternalizedForm.java rename to test/langtools/jdk/javadoc/doclet/testSerializedForm/ExternalizedForm.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerializedForm/SerializedForm.java b/test/langtools/jdk/javadoc/doclet/testSerializedForm/SerializedForm.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerializedForm/SerializedForm.java rename to test/langtools/jdk/javadoc/doclet/testSerializedForm/SerializedForm.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java b/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java rename to test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerializedForm/pkg1/NestedInnerClass.java b/test/langtools/jdk/javadoc/doclet/testSerializedForm/pkg1/NestedInnerClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerializedForm/pkg1/NestedInnerClass.java rename to test/langtools/jdk/javadoc/doclet/testSerializedForm/pkg1/NestedInnerClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerializedForm/pkg1/PrivateIncludeInnerClass.java b/test/langtools/jdk/javadoc/doclet/testSerializedForm/pkg1/PrivateIncludeInnerClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerializedForm/pkg1/PrivateIncludeInnerClass.java rename to test/langtools/jdk/javadoc/doclet/testSerializedForm/pkg1/PrivateIncludeInnerClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerializedForm/pkg1/ProtectedInnerClass.java b/test/langtools/jdk/javadoc/doclet/testSerializedForm/pkg1/ProtectedInnerClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerializedForm/pkg1/ProtectedInnerClass.java rename to test/langtools/jdk/javadoc/doclet/testSerializedForm/pkg1/ProtectedInnerClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerializedForm/pkg1/PublicExcludeInnerClass.java b/test/langtools/jdk/javadoc/doclet/testSerializedForm/pkg1/PublicExcludeInnerClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerializedForm/pkg1/PublicExcludeInnerClass.java rename to test/langtools/jdk/javadoc/doclet/testSerializedForm/pkg1/PublicExcludeInnerClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java b/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java rename to test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/pkg1/C2.java b/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/pkg1/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/pkg1/C2.java rename to test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/pkg1/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/pkg1/C3.java b/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/pkg1/C3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/pkg1/C3.java rename to test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/pkg1/C3.java diff --git a/langtools/test/jdk/javadoc/doclet/testSimpleTag/C.java b/test/langtools/jdk/javadoc/doclet/testSimpleTag/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSimpleTag/C.java rename to test/langtools/jdk/javadoc/doclet/testSimpleTag/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testSimpleTag/TestSimpleTag.java b/test/langtools/jdk/javadoc/doclet/testSimpleTag/TestSimpleTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSimpleTag/TestSimpleTag.java rename to test/langtools/jdk/javadoc/doclet/testSimpleTag/TestSimpleTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testSimpleTagExclude/DummyClass.java b/test/langtools/jdk/javadoc/doclet/testSimpleTagExclude/DummyClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSimpleTagExclude/DummyClass.java rename to test/langtools/jdk/javadoc/doclet/testSimpleTagExclude/DummyClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSimpleTagExclude/TestSimpleTagExclude.java b/test/langtools/jdk/javadoc/doclet/testSimpleTagExclude/TestSimpleTagExclude.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSimpleTagExclude/TestSimpleTagExclude.java rename to test/langtools/jdk/javadoc/doclet/testSimpleTagExclude/TestSimpleTagExclude.java diff --git a/langtools/test/jdk/javadoc/doclet/testSimpleTagInherit/TestSimpleTagInherit.java b/test/langtools/jdk/javadoc/doclet/testSimpleTagInherit/TestSimpleTagInherit.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSimpleTagInherit/TestSimpleTagInherit.java rename to test/langtools/jdk/javadoc/doclet/testSimpleTagInherit/TestSimpleTagInherit.java diff --git a/langtools/test/jdk/javadoc/doclet/testSimpleTagInherit/p/BaseClass.java b/test/langtools/jdk/javadoc/doclet/testSimpleTagInherit/p/BaseClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSimpleTagInherit/p/BaseClass.java rename to test/langtools/jdk/javadoc/doclet/testSimpleTagInherit/p/BaseClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSimpleTagInherit/p/TestClass.java b/test/langtools/jdk/javadoc/doclet/testSimpleTagInherit/p/TestClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSimpleTagInherit/p/TestClass.java rename to test/langtools/jdk/javadoc/doclet/testSimpleTagInherit/p/TestClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSinceTag/TestSinceTag.java b/test/langtools/jdk/javadoc/doclet/testSinceTag/TestSinceTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSinceTag/TestSinceTag.java rename to test/langtools/jdk/javadoc/doclet/testSinceTag/TestSinceTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testSinceTag/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testSinceTag/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSinceTag/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testSinceTag/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testSingleQuotedLink/TestSingleQuotedLink.java b/test/langtools/jdk/javadoc/doclet/testSingleQuotedLink/TestSingleQuotedLink.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSingleQuotedLink/TestSingleQuotedLink.java rename to test/langtools/jdk/javadoc/doclet/testSingleQuotedLink/TestSingleQuotedLink.java diff --git a/langtools/test/jdk/javadoc/doclet/testSingleQuotedLink/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testSingleQuotedLink/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSingleQuotedLink/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testSingleQuotedLink/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testSingleQuotedLink/pkg1/C2.java b/test/langtools/jdk/javadoc/doclet/testSingleQuotedLink/pkg1/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSingleQuotedLink/pkg1/C2.java rename to test/langtools/jdk/javadoc/doclet/testSingleQuotedLink/pkg1/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testSingleQuotedLink/pkg1/package.html b/test/langtools/jdk/javadoc/doclet/testSingleQuotedLink/pkg1/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSingleQuotedLink/pkg1/package.html rename to test/langtools/jdk/javadoc/doclet/testSingleQuotedLink/pkg1/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testSourceTab/DoubleTab/C.java b/test/langtools/jdk/javadoc/doclet/testSourceTab/DoubleTab/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSourceTab/DoubleTab/C.java rename to test/langtools/jdk/javadoc/doclet/testSourceTab/DoubleTab/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testSourceTab/SingleTab/C.java b/test/langtools/jdk/javadoc/doclet/testSourceTab/SingleTab/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSourceTab/SingleTab/C.java rename to test/langtools/jdk/javadoc/doclet/testSourceTab/SingleTab/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testSourceTab/TestSourceTab.java b/test/langtools/jdk/javadoc/doclet/testSourceTab/TestSourceTab.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSourceTab/TestSourceTab.java rename to test/langtools/jdk/javadoc/doclet/testSourceTab/TestSourceTab.java diff --git a/langtools/test/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java rename to test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java diff --git a/langtools/test/jdk/javadoc/doclet/testStylesheet/pkg/A.java b/test/langtools/jdk/javadoc/doclet/testStylesheet/pkg/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testStylesheet/pkg/A.java rename to test/langtools/jdk/javadoc/doclet/testStylesheet/pkg/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testSubTitle/TestSubTitle.java b/test/langtools/jdk/javadoc/doclet/testSubTitle/TestSubTitle.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSubTitle/TestSubTitle.java rename to test/langtools/jdk/javadoc/doclet/testSubTitle/TestSubTitle.java diff --git a/langtools/test/jdk/javadoc/doclet/testSubTitle/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testSubTitle/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSubTitle/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testSubTitle/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testSubTitle/pkg/package.html b/test/langtools/jdk/javadoc/doclet/testSubTitle/pkg/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSubTitle/pkg/package.html rename to test/langtools/jdk/javadoc/doclet/testSubTitle/pkg/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testSummaryHeading/C.java b/test/langtools/jdk/javadoc/doclet/testSummaryHeading/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSummaryHeading/C.java rename to test/langtools/jdk/javadoc/doclet/testSummaryHeading/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testSummaryHeading/TestSummaryHeading.java b/test/langtools/jdk/javadoc/doclet/testSummaryHeading/TestSummaryHeading.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSummaryHeading/TestSummaryHeading.java rename to test/langtools/jdk/javadoc/doclet/testSummaryHeading/TestSummaryHeading.java diff --git a/langtools/test/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java b/test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java rename to test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testSummaryTag/p1/A.java b/test/langtools/jdk/javadoc/doclet/testSummaryTag/p1/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSummaryTag/p1/A.java rename to test/langtools/jdk/javadoc/doclet/testSummaryTag/p1/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testSummaryTag/p1/B.java b/test/langtools/jdk/javadoc/doclet/testSummaryTag/p1/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSummaryTag/p1/B.java rename to test/langtools/jdk/javadoc/doclet/testSummaryTag/p1/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testSummaryTag/p1/package.html b/test/langtools/jdk/javadoc/doclet/testSummaryTag/p1/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSummaryTag/p1/package.html rename to test/langtools/jdk/javadoc/doclet/testSummaryTag/p1/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testSummaryTag/p2/A.java b/test/langtools/jdk/javadoc/doclet/testSummaryTag/p2/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSummaryTag/p2/A.java rename to test/langtools/jdk/javadoc/doclet/testSummaryTag/p2/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testSummaryTag/p2/package.html b/test/langtools/jdk/javadoc/doclet/testSummaryTag/p2/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSummaryTag/p2/package.html rename to test/langtools/jdk/javadoc/doclet/testSummaryTag/p2/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testSummaryTag/p3/A.java b/test/langtools/jdk/javadoc/doclet/testSummaryTag/p3/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSummaryTag/p3/A.java rename to test/langtools/jdk/javadoc/doclet/testSummaryTag/p3/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testSummaryTag/p3/overview.html b/test/langtools/jdk/javadoc/doclet/testSummaryTag/p3/overview.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSummaryTag/p3/overview.html rename to test/langtools/jdk/javadoc/doclet/testSummaryTag/p3/overview.html diff --git a/langtools/test/jdk/javadoc/doclet/testSuperclassInSerialForm/TestSuperClassInSerialForm.java b/test/langtools/jdk/javadoc/doclet/testSuperclassInSerialForm/TestSuperClassInSerialForm.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSuperclassInSerialForm/TestSuperClassInSerialForm.java rename to test/langtools/jdk/javadoc/doclet/testSuperclassInSerialForm/TestSuperClassInSerialForm.java diff --git a/langtools/test/jdk/javadoc/doclet/testSuperclassInSerialForm/pkg/SubClass.java b/test/langtools/jdk/javadoc/doclet/testSuperclassInSerialForm/pkg/SubClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSuperclassInSerialForm/pkg/SubClass.java rename to test/langtools/jdk/javadoc/doclet/testSuperclassInSerialForm/pkg/SubClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSuperclassInSerialForm/pkg/SuperClass.java b/test/langtools/jdk/javadoc/doclet/testSuperclassInSerialForm/pkg/SuperClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSuperclassInSerialForm/pkg/SuperClass.java rename to test/langtools/jdk/javadoc/doclet/testSuperclassInSerialForm/pkg/SuperClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testSupplementary/C.java b/test/langtools/jdk/javadoc/doclet/testSupplementary/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSupplementary/C.java rename to test/langtools/jdk/javadoc/doclet/testSupplementary/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testSupplementary/TestSupplementary.java b/test/langtools/jdk/javadoc/doclet/testSupplementary/TestSupplementary.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testSupplementary/TestSupplementary.java rename to test/langtools/jdk/javadoc/doclet/testSupplementary/TestSupplementary.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagInheritence/TestTagInheritence.java b/test/langtools/jdk/javadoc/doclet/testTagInheritence/TestTagInheritence.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagInheritence/TestTagInheritence.java rename to test/langtools/jdk/javadoc/doclet/testTagInheritence/TestTagInheritence.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagInheritence/firstSentence/A.java b/test/langtools/jdk/javadoc/doclet/testTagInheritence/firstSentence/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagInheritence/firstSentence/A.java rename to test/langtools/jdk/javadoc/doclet/testTagInheritence/firstSentence/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagInheritence/firstSentence/B.java b/test/langtools/jdk/javadoc/doclet/testTagInheritence/firstSentence/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagInheritence/firstSentence/B.java rename to test/langtools/jdk/javadoc/doclet/testTagInheritence/firstSentence/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagInheritence/firstSentence2/A.java b/test/langtools/jdk/javadoc/doclet/testTagInheritence/firstSentence2/A.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagInheritence/firstSentence2/A.java rename to test/langtools/jdk/javadoc/doclet/testTagInheritence/firstSentence2/A.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagInheritence/firstSentence2/B.java b/test/langtools/jdk/javadoc/doclet/testTagInheritence/firstSentence2/B.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagInheritence/firstSentence2/B.java rename to test/langtools/jdk/javadoc/doclet/testTagInheritence/firstSentence2/B.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagInheritence/firstSentence2/C.java b/test/langtools/jdk/javadoc/doclet/testTagInheritence/firstSentence2/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagInheritence/firstSentence2/C.java rename to test/langtools/jdk/javadoc/doclet/testTagInheritence/firstSentence2/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagInheritence/pkg/TestAbstractClass.java b/test/langtools/jdk/javadoc/doclet/testTagInheritence/pkg/TestAbstractClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagInheritence/pkg/TestAbstractClass.java rename to test/langtools/jdk/javadoc/doclet/testTagInheritence/pkg/TestAbstractClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagInheritence/pkg/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testTagInheritence/pkg/TestInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagInheritence/pkg/TestInterface.java rename to test/langtools/jdk/javadoc/doclet/testTagInheritence/pkg/TestInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagInheritence/pkg/TestInterfaceForAbstractClass.java b/test/langtools/jdk/javadoc/doclet/testTagInheritence/pkg/TestInterfaceForAbstractClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagInheritence/pkg/TestInterfaceForAbstractClass.java rename to test/langtools/jdk/javadoc/doclet/testTagInheritence/pkg/TestInterfaceForAbstractClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagInheritence/pkg/TestSuperSuperClass.java b/test/langtools/jdk/javadoc/doclet/testTagInheritence/pkg/TestSuperSuperClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagInheritence/pkg/TestSuperSuperClass.java rename to test/langtools/jdk/javadoc/doclet/testTagInheritence/pkg/TestSuperSuperClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagInheritence/pkg/TestSuperSuperInterface.java b/test/langtools/jdk/javadoc/doclet/testTagInheritence/pkg/TestSuperSuperInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagInheritence/pkg/TestSuperSuperInterface.java rename to test/langtools/jdk/javadoc/doclet/testTagInheritence/pkg/TestSuperSuperInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagInheritence/pkg/TestTagInheritence.java b/test/langtools/jdk/javadoc/doclet/testTagInheritence/pkg/TestTagInheritence.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagInheritence/pkg/TestTagInheritence.java rename to test/langtools/jdk/javadoc/doclet/testTagInheritence/pkg/TestTagInheritence.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagMisuse/TestTagMisuse.java b/test/langtools/jdk/javadoc/doclet/testTagMisuse/TestTagMisuse.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagMisuse/TestTagMisuse.java rename to test/langtools/jdk/javadoc/doclet/testTagMisuse/TestTagMisuse.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagOutput/TestTagOutput.java b/test/langtools/jdk/javadoc/doclet/testTagOutput/TestTagOutput.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagOutput/TestTagOutput.java rename to test/langtools/jdk/javadoc/doclet/testTagOutput/TestTagOutput.java diff --git a/langtools/test/jdk/javadoc/doclet/testTagOutput/pkg1/DeprecatedTag.java b/test/langtools/jdk/javadoc/doclet/testTagOutput/pkg1/DeprecatedTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTagOutput/pkg1/DeprecatedTag.java rename to test/langtools/jdk/javadoc/doclet/testTagOutput/pkg1/DeprecatedTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsHead/C.java b/test/langtools/jdk/javadoc/doclet/testThrowsHead/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsHead/C.java rename to test/langtools/jdk/javadoc/doclet/testThrowsHead/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsHead/TestThrowsHead.java b/test/langtools/jdk/javadoc/doclet/testThrowsHead/TestThrowsHead.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsHead/TestThrowsHead.java rename to test/langtools/jdk/javadoc/doclet/testThrowsHead/TestThrowsHead.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsInheritence/C.java b/test/langtools/jdk/javadoc/doclet/testThrowsInheritence/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsInheritence/C.java rename to test/langtools/jdk/javadoc/doclet/testThrowsInheritence/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsInheritence/Foo.java b/test/langtools/jdk/javadoc/doclet/testThrowsInheritence/Foo.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsInheritence/Foo.java rename to test/langtools/jdk/javadoc/doclet/testThrowsInheritence/Foo.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsInheritence/I.java b/test/langtools/jdk/javadoc/doclet/testThrowsInheritence/I.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsInheritence/I.java rename to test/langtools/jdk/javadoc/doclet/testThrowsInheritence/I.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsInheritence/Iface.java b/test/langtools/jdk/javadoc/doclet/testThrowsInheritence/Iface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsInheritence/Iface.java rename to test/langtools/jdk/javadoc/doclet/testThrowsInheritence/Iface.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsInheritence/TestThrowsTagInheritence.java b/test/langtools/jdk/javadoc/doclet/testThrowsInheritence/TestThrowsTagInheritence.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsInheritence/TestThrowsTagInheritence.java rename to test/langtools/jdk/javadoc/doclet/testThrowsInheritence/TestThrowsTagInheritence.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsInheritence/pkg/Abstract.java b/test/langtools/jdk/javadoc/doclet/testThrowsInheritence/pkg/Abstract.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsInheritence/pkg/Abstract.java rename to test/langtools/jdk/javadoc/doclet/testThrowsInheritence/pkg/Abstract.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsInheritence/pkg/Extender.java b/test/langtools/jdk/javadoc/doclet/testThrowsInheritence/pkg/Extender.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsInheritence/pkg/Extender.java rename to test/langtools/jdk/javadoc/doclet/testThrowsInheritence/pkg/Extender.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsTag/TestThrowsTag.java b/test/langtools/jdk/javadoc/doclet/testThrowsTag/TestThrowsTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsTag/TestThrowsTag.java rename to test/langtools/jdk/javadoc/doclet/testThrowsTag/TestThrowsTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/P.java b/test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/P.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/P.java rename to test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/P.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T1.java b/test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T1.java rename to test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T1.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T2.java b/test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T2.java rename to test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T2.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T3.java b/test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T3.java rename to test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T3.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T4.java b/test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T4.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T4.java rename to test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T4.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T5.java b/test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T5.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T5.java rename to test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T5.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T6.java b/test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T6.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T6.java rename to test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T6.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T7.java b/test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T7.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T7.java rename to test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T7.java diff --git a/langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T8.java b/test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T8.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testThrowsTag/pkg/T8.java rename to test/langtools/jdk/javadoc/doclet/testThrowsTag/pkg/T8.java diff --git a/langtools/test/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java b/test/langtools/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java rename to test/langtools/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java diff --git a/langtools/test/jdk/javadoc/doclet/testTitleInHref/package-list b/test/langtools/jdk/javadoc/doclet/testTitleInHref/package-list similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTitleInHref/package-list rename to test/langtools/jdk/javadoc/doclet/testTitleInHref/package-list diff --git a/langtools/test/jdk/javadoc/doclet/testTitleInHref/pkg/Class.java b/test/langtools/jdk/javadoc/doclet/testTitleInHref/pkg/Class.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTitleInHref/pkg/Class.java rename to test/langtools/jdk/javadoc/doclet/testTitleInHref/pkg/Class.java diff --git a/langtools/test/jdk/javadoc/doclet/testTitleInHref/pkg/Interface.java b/test/langtools/jdk/javadoc/doclet/testTitleInHref/pkg/Interface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTitleInHref/pkg/Interface.java rename to test/langtools/jdk/javadoc/doclet/testTitleInHref/pkg/Interface.java diff --git a/langtools/test/jdk/javadoc/doclet/testTitleInHref/pkg/Links.java b/test/langtools/jdk/javadoc/doclet/testTitleInHref/pkg/Links.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTitleInHref/pkg/Links.java rename to test/langtools/jdk/javadoc/doclet/testTitleInHref/pkg/Links.java diff --git a/langtools/test/jdk/javadoc/doclet/testTopOption/TestTopOption.java b/test/langtools/jdk/javadoc/doclet/testTopOption/TestTopOption.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTopOption/TestTopOption.java rename to test/langtools/jdk/javadoc/doclet/testTopOption/TestTopOption.java diff --git a/langtools/test/jdk/javadoc/doclet/testTopOption/overview.html b/test/langtools/jdk/javadoc/doclet/testTopOption/overview.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTopOption/overview.html rename to test/langtools/jdk/javadoc/doclet/testTopOption/overview.html diff --git a/langtools/test/jdk/javadoc/doclet/testTopOption/pkg/AnnotationType.java b/test/langtools/jdk/javadoc/doclet/testTopOption/pkg/AnnotationType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTopOption/pkg/AnnotationType.java rename to test/langtools/jdk/javadoc/doclet/testTopOption/pkg/AnnotationType.java diff --git a/langtools/test/jdk/javadoc/doclet/testTopOption/pkg/Cl.java b/test/langtools/jdk/javadoc/doclet/testTopOption/pkg/Cl.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTopOption/pkg/Cl.java rename to test/langtools/jdk/javadoc/doclet/testTopOption/pkg/Cl.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/ClassExtends.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/ClassExtends.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/ClassExtends.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/ClassExtends.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/ClassParameters.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/ClassParameters.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/ClassParameters.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/ClassParameters.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Fields.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Fields.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Fields.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Fields.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/MethodReturnType.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/MethodReturnType.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/MethodReturnType.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/MethodReturnType.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/MethodTypeParameters.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/MethodTypeParameters.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/MethodTypeParameters.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/MethodTypeParameters.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Parameters.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Parameters.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Parameters.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Parameters.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Receivers.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Receivers.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Receivers.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Receivers.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/RepeatedAnnotations.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/RepeatedAnnotations.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/RepeatedAnnotations.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/RepeatedAnnotations.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Throws.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Throws.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Throws.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Throws.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/TypeParameters.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/TypeParameters.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/TypeParameters.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/TypeParameters.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Varargs.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Varargs.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Varargs.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Varargs.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Wildcards.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Wildcards.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Wildcards.java rename to test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Wildcards.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java rename to test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeParams/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeParams/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeParams/pkg/ClassUseTest3.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/ClassUseTest3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeParams/pkg/ClassUseTest3.java rename to test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/ClassUseTest3.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeParams/pkg/Foo4.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/Foo4.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeParams/pkg/Foo4.java rename to test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/Foo4.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeParams/pkg/ParamTest2.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/ParamTest2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeParams/pkg/ParamTest2.java rename to test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/ParamTest2.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeParams/pkg/Parent.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/Parent.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeParams/pkg/Parent.java rename to test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/Parent.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeVariableLinks/TestTypeVariableLinks.java b/test/langtools/jdk/javadoc/doclet/testTypeVariableLinks/TestTypeVariableLinks.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeVariableLinks/TestTypeVariableLinks.java rename to test/langtools/jdk/javadoc/doclet/testTypeVariableLinks/TestTypeVariableLinks.java diff --git a/langtools/test/jdk/javadoc/doclet/testTypeVariableLinks/pkg1/C.java b/test/langtools/jdk/javadoc/doclet/testTypeVariableLinks/pkg1/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testTypeVariableLinks/pkg1/C.java rename to test/langtools/jdk/javadoc/doclet/testTypeVariableLinks/pkg1/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testUnnamedPackage/BadSource.java b/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/BadSource.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUnnamedPackage/BadSource.java rename to test/langtools/jdk/javadoc/doclet/testUnnamedPackage/BadSource.java diff --git a/langtools/test/jdk/javadoc/doclet/testUnnamedPackage/C.java b/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUnnamedPackage/C.java rename to test/langtools/jdk/javadoc/doclet/testUnnamedPackage/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java b/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java rename to test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java diff --git a/langtools/test/jdk/javadoc/doclet/testUnnamedPackage/package.html b/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUnnamedPackage/package.html rename to test/langtools/jdk/javadoc/doclet/testUnnamedPackage/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/C.java b/test/langtools/jdk/javadoc/doclet/testUseOption/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/C.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/TestUseOption.java b/test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/TestUseOption.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/UsedInC.java b/test/langtools/jdk/javadoc/doclet/testUseOption/UsedInC.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/UsedInC.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/UsedInC.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/AnAbstract.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/AnAbstract.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/AnAbstract.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/AnAbstract.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C1.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C1.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C10.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C10.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C10.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C10.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C2.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C2.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C4.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C4.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C4.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C4.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C5.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C5.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C5.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C5.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C6.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C6.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C6.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C6.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C7.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C7.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C7.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C7.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C8.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C8.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C8.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C8.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C9.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C9.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C9.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/C9.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/SubInterface.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/SubInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/SubInterface.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/SubInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/UsedClass.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/UsedClass.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/UsedClass.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/UsedClass.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/UsedInterface.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/UsedInterface.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/UsedInterface.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/UsedInterface.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/UsedInterfaceA.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/UsedInterfaceA.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/UsedInterfaceA.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/UsedInterfaceA.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/UsedThrowable.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/UsedThrowable.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/UsedThrowable.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/UsedThrowable.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/package.html b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/package.html rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg1/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg2/C3.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg2/C3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg2/C3.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg2/C3.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg2/package.html b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg2/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg2/package.html rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg2/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg3/C.java b/test/langtools/jdk/javadoc/doclet/testUseOption/pkg3/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/pkg3/C.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/pkg3/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/unique/C1.java b/test/langtools/jdk/javadoc/doclet/testUseOption/unique/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/unique/C1.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/unique/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/unique/UseMe.java b/test/langtools/jdk/javadoc/doclet/testUseOption/unique/UseMe.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUseOption/unique/UseMe.java rename to test/langtools/jdk/javadoc/doclet/testUseOption/unique/UseMe.java diff --git a/langtools/test/jdk/javadoc/doclet/testUserTaglet/InfoTaglet.java b/test/langtools/jdk/javadoc/doclet/testUserTaglet/InfoTaglet.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUserTaglet/InfoTaglet.java rename to test/langtools/jdk/javadoc/doclet/testUserTaglet/InfoTaglet.java diff --git a/langtools/test/jdk/javadoc/doclet/testUserTaglet/TestUserTaglet.java b/test/langtools/jdk/javadoc/doclet/testUserTaglet/TestUserTaglet.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUserTaglet/TestUserTaglet.java rename to test/langtools/jdk/javadoc/doclet/testUserTaglet/TestUserTaglet.java diff --git a/langtools/test/jdk/javadoc/doclet/testUserTaglet/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testUserTaglet/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testUserTaglet/pkg/C.java rename to test/langtools/jdk/javadoc/doclet/testUserTaglet/pkg/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testValueTag/TestValueTag.java b/test/langtools/jdk/javadoc/doclet/testValueTag/TestValueTag.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testValueTag/TestValueTag.java rename to test/langtools/jdk/javadoc/doclet/testValueTag/TestValueTag.java diff --git a/langtools/test/jdk/javadoc/doclet/testValueTag/pkg1/Class1.java b/test/langtools/jdk/javadoc/doclet/testValueTag/pkg1/Class1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testValueTag/pkg1/Class1.java rename to test/langtools/jdk/javadoc/doclet/testValueTag/pkg1/Class1.java diff --git a/langtools/test/jdk/javadoc/doclet/testValueTag/pkg1/Class2.java b/test/langtools/jdk/javadoc/doclet/testValueTag/pkg1/Class2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testValueTag/pkg1/Class2.java rename to test/langtools/jdk/javadoc/doclet/testValueTag/pkg1/Class2.java diff --git a/langtools/test/jdk/javadoc/doclet/testValueTag/pkg1/CustomTagUsage.java b/test/langtools/jdk/javadoc/doclet/testValueTag/pkg1/CustomTagUsage.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testValueTag/pkg1/CustomTagUsage.java rename to test/langtools/jdk/javadoc/doclet/testValueTag/pkg1/CustomTagUsage.java diff --git a/langtools/test/jdk/javadoc/doclet/testValueTag/pkg2/Class3.java b/test/langtools/jdk/javadoc/doclet/testValueTag/pkg2/Class3.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testValueTag/pkg2/Class3.java rename to test/langtools/jdk/javadoc/doclet/testValueTag/pkg2/Class3.java diff --git a/langtools/test/jdk/javadoc/doclet/testValueTag/pkg2/package.html b/test/langtools/jdk/javadoc/doclet/testValueTag/pkg2/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testValueTag/pkg2/package.html rename to test/langtools/jdk/javadoc/doclet/testValueTag/pkg2/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testVersionOption/TestVersionOption.java b/test/langtools/jdk/javadoc/doclet/testVersionOption/TestVersionOption.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testVersionOption/TestVersionOption.java rename to test/langtools/jdk/javadoc/doclet/testVersionOption/TestVersionOption.java diff --git a/langtools/test/jdk/javadoc/doclet/testWarnBadParamNames/C.java b/test/langtools/jdk/javadoc/doclet/testWarnBadParamNames/C.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testWarnBadParamNames/C.java rename to test/langtools/jdk/javadoc/doclet/testWarnBadParamNames/C.java diff --git a/langtools/test/jdk/javadoc/doclet/testWarnBadParamNames/TestWarnBadParamNames.java b/test/langtools/jdk/javadoc/doclet/testWarnBadParamNames/TestWarnBadParamNames.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testWarnBadParamNames/TestWarnBadParamNames.java rename to test/langtools/jdk/javadoc/doclet/testWarnBadParamNames/TestWarnBadParamNames.java diff --git a/langtools/test/jdk/javadoc/doclet/testWarnings/TestWarnings.java b/test/langtools/jdk/javadoc/doclet/testWarnings/TestWarnings.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testWarnings/TestWarnings.java rename to test/langtools/jdk/javadoc/doclet/testWarnings/TestWarnings.java diff --git a/langtools/test/jdk/javadoc/doclet/testWarnings/pkg/X.java b/test/langtools/jdk/javadoc/doclet/testWarnings/pkg/X.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testWarnings/pkg/X.java rename to test/langtools/jdk/javadoc/doclet/testWarnings/pkg/X.java diff --git a/langtools/test/jdk/javadoc/doclet/testWarnings/pkg/package.html b/test/langtools/jdk/javadoc/doclet/testWarnings/pkg/package.html similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testWarnings/pkg/package.html rename to test/langtools/jdk/javadoc/doclet/testWarnings/pkg/package.html diff --git a/langtools/test/jdk/javadoc/doclet/testWindowTitle/TestWindowTitle.java b/test/langtools/jdk/javadoc/doclet/testWindowTitle/TestWindowTitle.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testWindowTitle/TestWindowTitle.java rename to test/langtools/jdk/javadoc/doclet/testWindowTitle/TestWindowTitle.java diff --git a/langtools/test/jdk/javadoc/doclet/testWindowTitle/p1/C1.java b/test/langtools/jdk/javadoc/doclet/testWindowTitle/p1/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testWindowTitle/p1/C1.java rename to test/langtools/jdk/javadoc/doclet/testWindowTitle/p1/C1.java diff --git a/langtools/test/jdk/javadoc/doclet/testWindowTitle/p2/C2.java b/test/langtools/jdk/javadoc/doclet/testWindowTitle/p2/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testWindowTitle/p2/C2.java rename to test/langtools/jdk/javadoc/doclet/testWindowTitle/p2/C2.java diff --git a/langtools/test/jdk/javadoc/doclet/testXOption/TestXOption.java b/test/langtools/jdk/javadoc/doclet/testXOption/TestXOption.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/testXOption/TestXOption.java rename to test/langtools/jdk/javadoc/doclet/testXOption/TestXOption.java diff --git a/langtools/test/jdk/javadoc/doclet/typeAnnotations/smoke/TestSmoke.java b/test/langtools/jdk/javadoc/doclet/typeAnnotations/smoke/TestSmoke.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/typeAnnotations/smoke/TestSmoke.java rename to test/langtools/jdk/javadoc/doclet/typeAnnotations/smoke/TestSmoke.java diff --git a/langtools/test/jdk/javadoc/doclet/typeAnnotations/smoke/pkg/TargetTypes.java b/test/langtools/jdk/javadoc/doclet/typeAnnotations/smoke/pkg/TargetTypes.java similarity index 100% rename from langtools/test/jdk/javadoc/doclet/typeAnnotations/smoke/pkg/TargetTypes.java rename to test/langtools/jdk/javadoc/doclet/typeAnnotations/smoke/pkg/TargetTypes.java diff --git a/langtools/test/jdk/javadoc/tool/6176978/T6176978.java b/test/langtools/jdk/javadoc/tool/6176978/T6176978.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6176978/T6176978.java rename to test/langtools/jdk/javadoc/tool/6176978/T6176978.java diff --git a/langtools/test/jdk/javadoc/tool/6176978/X.java b/test/langtools/jdk/javadoc/tool/6176978/X.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6176978/X.java rename to test/langtools/jdk/javadoc/tool/6176978/X.java diff --git a/langtools/test/jdk/javadoc/tool/6227454/Test.java b/test/langtools/jdk/javadoc/tool/6227454/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6227454/Test.java rename to test/langtools/jdk/javadoc/tool/6227454/Test.java diff --git a/langtools/test/jdk/javadoc/tool/6942366/T6942366.java b/test/langtools/jdk/javadoc/tool/6942366/T6942366.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6942366/T6942366.java rename to test/langtools/jdk/javadoc/tool/6942366/T6942366.java diff --git a/langtools/test/jdk/javadoc/tool/6942366/Test.java b/test/langtools/jdk/javadoc/tool/6942366/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6942366/Test.java rename to test/langtools/jdk/javadoc/tool/6942366/Test.java diff --git a/langtools/test/jdk/javadoc/tool/6942366/p/Base.java b/test/langtools/jdk/javadoc/tool/6942366/p/Base.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6942366/p/Base.java rename to test/langtools/jdk/javadoc/tool/6942366/p/Base.java diff --git a/langtools/test/jdk/javadoc/tool/6958836/Test.java b/test/langtools/jdk/javadoc/tool/6958836/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6958836/Test.java rename to test/langtools/jdk/javadoc/tool/6958836/Test.java diff --git a/langtools/test/jdk/javadoc/tool/6958836/errs/Errors.java b/test/langtools/jdk/javadoc/tool/6958836/errs/Errors.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6958836/errs/Errors.java rename to test/langtools/jdk/javadoc/tool/6958836/errs/Errors.java diff --git a/langtools/test/jdk/javadoc/tool/6958836/warns/Warnings.java b/test/langtools/jdk/javadoc/tool/6958836/warns/Warnings.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6958836/warns/Warnings.java rename to test/langtools/jdk/javadoc/tool/6958836/warns/Warnings.java diff --git a/langtools/test/jdk/javadoc/tool/6964914/Error.java b/test/langtools/jdk/javadoc/tool/6964914/Error.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6964914/Error.java rename to test/langtools/jdk/javadoc/tool/6964914/Error.java diff --git a/langtools/test/jdk/javadoc/tool/6964914/JavacWarning.java b/test/langtools/jdk/javadoc/tool/6964914/JavacWarning.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6964914/JavacWarning.java rename to test/langtools/jdk/javadoc/tool/6964914/JavacWarning.java diff --git a/langtools/test/jdk/javadoc/tool/6964914/JavadocWarning.java b/test/langtools/jdk/javadoc/tool/6964914/JavadocWarning.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6964914/JavadocWarning.java rename to test/langtools/jdk/javadoc/tool/6964914/JavadocWarning.java diff --git a/langtools/test/jdk/javadoc/tool/6964914/Test.java b/test/langtools/jdk/javadoc/tool/6964914/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6964914/Test.java rename to test/langtools/jdk/javadoc/tool/6964914/Test.java diff --git a/langtools/test/jdk/javadoc/tool/6964914/TestStdDoclet.java b/test/langtools/jdk/javadoc/tool/6964914/TestStdDoclet.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6964914/TestStdDoclet.java rename to test/langtools/jdk/javadoc/tool/6964914/TestStdDoclet.java diff --git a/langtools/test/jdk/javadoc/tool/6964914/TestUserDoclet.java b/test/langtools/jdk/javadoc/tool/6964914/TestUserDoclet.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/6964914/TestUserDoclet.java rename to test/langtools/jdk/javadoc/tool/6964914/TestUserDoclet.java diff --git a/langtools/test/jdk/javadoc/tool/8025693/Test.java b/test/langtools/jdk/javadoc/tool/8025693/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/8025693/Test.java rename to test/langtools/jdk/javadoc/tool/8025693/Test.java diff --git a/langtools/test/jdk/javadoc/tool/BadOptionsTest.java b/test/langtools/jdk/javadoc/tool/BadOptionsTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/BadOptionsTest.java rename to test/langtools/jdk/javadoc/tool/BadOptionsTest.java diff --git a/langtools/test/jdk/javadoc/tool/BreakIteratorWarning.java b/test/langtools/jdk/javadoc/tool/BreakIteratorWarning.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/BreakIteratorWarning.java rename to test/langtools/jdk/javadoc/tool/BreakIteratorWarning.java diff --git a/langtools/test/jdk/javadoc/tool/CheckResourceKeys.java b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/CheckResourceKeys.java rename to test/langtools/jdk/javadoc/tool/CheckResourceKeys.java diff --git a/langtools/test/jdk/javadoc/tool/EnsureNewOldDoclet.java b/test/langtools/jdk/javadoc/tool/EnsureNewOldDoclet.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/EnsureNewOldDoclet.java rename to test/langtools/jdk/javadoc/tool/EnsureNewOldDoclet.java diff --git a/langtools/test/jdk/javadoc/tool/FlagsTooEarly.java b/test/langtools/jdk/javadoc/tool/FlagsTooEarly.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/FlagsTooEarly.java rename to test/langtools/jdk/javadoc/tool/FlagsTooEarly.java diff --git a/langtools/test/jdk/javadoc/tool/IgnoreSourceErrors.java b/test/langtools/jdk/javadoc/tool/IgnoreSourceErrors.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/IgnoreSourceErrors.java rename to test/langtools/jdk/javadoc/tool/IgnoreSourceErrors.java diff --git a/langtools/test/jdk/javadoc/tool/InlineTagsWithBraces.java b/test/langtools/jdk/javadoc/tool/InlineTagsWithBraces.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/InlineTagsWithBraces.java rename to test/langtools/jdk/javadoc/tool/InlineTagsWithBraces.java diff --git a/langtools/test/jdk/javadoc/tool/LangVers.java b/test/langtools/jdk/javadoc/tool/LangVers.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/LangVers.java rename to test/langtools/jdk/javadoc/tool/LangVers.java diff --git a/langtools/test/jdk/javadoc/tool/MaxWarns.java b/test/langtools/jdk/javadoc/tool/MaxWarns.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/MaxWarns.java rename to test/langtools/jdk/javadoc/tool/MaxWarns.java diff --git a/langtools/test/jdk/javadoc/tool/NoStar.java b/test/langtools/jdk/javadoc/tool/NoStar.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/NoStar.java rename to test/langtools/jdk/javadoc/tool/NoStar.java diff --git a/langtools/test/jdk/javadoc/tool/OptionSyntaxTest.java b/test/langtools/jdk/javadoc/tool/OptionSyntaxTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/OptionSyntaxTest.java rename to test/langtools/jdk/javadoc/tool/OptionSyntaxTest.java diff --git a/langtools/test/jdk/javadoc/tool/QuietOption.java b/test/langtools/jdk/javadoc/tool/QuietOption.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/QuietOption.java rename to test/langtools/jdk/javadoc/tool/QuietOption.java diff --git a/langtools/test/jdk/javadoc/tool/ReleaseOption.java b/test/langtools/jdk/javadoc/tool/ReleaseOption.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/ReleaseOption.java rename to test/langtools/jdk/javadoc/tool/ReleaseOption.java diff --git a/langtools/test/jdk/javadoc/tool/ReleaseOptionSource.java b/test/langtools/jdk/javadoc/tool/ReleaseOptionSource.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/ReleaseOptionSource.java rename to test/langtools/jdk/javadoc/tool/ReleaseOptionSource.java diff --git a/langtools/test/jdk/javadoc/tool/T4696488.java b/test/langtools/jdk/javadoc/tool/T4696488.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/T4696488.java rename to test/langtools/jdk/javadoc/tool/T4696488.java diff --git a/langtools/test/jdk/javadoc/tool/T4994049/FileWithTabs.java b/test/langtools/jdk/javadoc/tool/T4994049/FileWithTabs.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/T4994049/FileWithTabs.java rename to test/langtools/jdk/javadoc/tool/T4994049/FileWithTabs.java diff --git a/langtools/test/jdk/javadoc/tool/T4994049/T4994049.java b/test/langtools/jdk/javadoc/tool/T4994049/T4994049.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/T4994049/T4994049.java rename to test/langtools/jdk/javadoc/tool/T4994049/T4994049.java diff --git a/langtools/test/jdk/javadoc/tool/T6551367.java b/test/langtools/jdk/javadoc/tool/T6551367.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/T6551367.java rename to test/langtools/jdk/javadoc/tool/T6551367.java diff --git a/langtools/test/jdk/javadoc/tool/T6968833.java b/test/langtools/jdk/javadoc/tool/T6968833.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/T6968833.java rename to test/langtools/jdk/javadoc/tool/T6968833.java diff --git a/langtools/test/jdk/javadoc/tool/TestScriptInComment.java b/test/langtools/jdk/javadoc/tool/TestScriptInComment.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/TestScriptInComment.java rename to test/langtools/jdk/javadoc/tool/TestScriptInComment.java diff --git a/langtools/test/jdk/javadoc/tool/ToolProviderTest.java b/test/langtools/jdk/javadoc/tool/ToolProviderTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/ToolProviderTest.java rename to test/langtools/jdk/javadoc/tool/ToolProviderTest.java diff --git a/langtools/test/jdk/javadoc/tool/VerifyLocale.java b/test/langtools/jdk/javadoc/tool/VerifyLocale.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/VerifyLocale.java rename to test/langtools/jdk/javadoc/tool/VerifyLocale.java diff --git a/langtools/test/jdk/javadoc/tool/XWerror.java b/test/langtools/jdk/javadoc/tool/XWerror.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/XWerror.java rename to test/langtools/jdk/javadoc/tool/XWerror.java diff --git a/langtools/test/jdk/javadoc/tool/api/TestName.java b/test/langtools/jdk/javadoc/tool/api/TestName.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/TestName.java rename to test/langtools/jdk/javadoc/tool/api/TestName.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/APITest.java b/test/langtools/jdk/javadoc/tool/api/basic/APITest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/APITest.java rename to test/langtools/jdk/javadoc/tool/api/basic/APITest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/AddModulesTest.java b/test/langtools/jdk/javadoc/tool/api/basic/AddModulesTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/AddModulesTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/AddModulesTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/DocletPathTest.java b/test/langtools/jdk/javadoc/tool/api/basic/DocletPathTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/DocletPathTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/DocletPathTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/DocumentationToolLocationTest.java b/test/langtools/jdk/javadoc/tool/api/basic/DocumentationToolLocationTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/DocumentationToolLocationTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/DocumentationToolLocationTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/GetSourceVersionsTest.java b/test/langtools/jdk/javadoc/tool/api/basic/GetSourceVersionsTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/GetSourceVersionsTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/GetSourceVersionsTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/GetTask_DiagListenerTest.java b/test/langtools/jdk/javadoc/tool/api/basic/GetTask_DiagListenerTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/GetTask_DiagListenerTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/GetTask_DiagListenerTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/GetTask_DocletClassTest.java b/test/langtools/jdk/javadoc/tool/api/basic/GetTask_DocletClassTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/GetTask_DocletClassTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/GetTask_DocletClassTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/GetTask_FileManagerTest.java b/test/langtools/jdk/javadoc/tool/api/basic/GetTask_FileManagerTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/GetTask_FileManagerTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/GetTask_FileManagerTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/GetTask_FileObjectsTest.java b/test/langtools/jdk/javadoc/tool/api/basic/GetTask_FileObjectsTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/GetTask_FileObjectsTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/GetTask_FileObjectsTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/GetTask_OptionsTest.java b/test/langtools/jdk/javadoc/tool/api/basic/GetTask_OptionsTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/GetTask_OptionsTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/GetTask_OptionsTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/GetTask_WriterTest.java b/test/langtools/jdk/javadoc/tool/api/basic/GetTask_WriterTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/GetTask_WriterTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/GetTask_WriterTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/IsSupportedOptionTest.java b/test/langtools/jdk/javadoc/tool/api/basic/IsSupportedOptionTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/IsSupportedOptionTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/IsSupportedOptionTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java b/test/langtools/jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/RunTest.java b/test/langtools/jdk/javadoc/tool/api/basic/RunTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/RunTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/RunTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/TagletPathTest.java b/test/langtools/jdk/javadoc/tool/api/basic/TagletPathTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/TagletPathTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/TagletPathTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/Task_reuseTest.java b/test/langtools/jdk/javadoc/tool/api/basic/Task_reuseTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/Task_reuseTest.java rename to test/langtools/jdk/javadoc/tool/api/basic/Task_reuseTest.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/pkg/C.java b/test/langtools/jdk/javadoc/tool/api/basic/pkg/C.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/pkg/C.java rename to test/langtools/jdk/javadoc/tool/api/basic/pkg/C.java diff --git a/langtools/test/jdk/javadoc/tool/api/basic/taglets/UnderlineTaglet.java b/test/langtools/jdk/javadoc/tool/api/basic/taglets/UnderlineTaglet.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/api/basic/taglets/UnderlineTaglet.java rename to test/langtools/jdk/javadoc/tool/api/basic/taglets/UnderlineTaglet.java diff --git a/langtools/test/jdk/javadoc/tool/badSuper/BadSuper.java b/test/langtools/jdk/javadoc/tool/badSuper/BadSuper.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/badSuper/BadSuper.java rename to test/langtools/jdk/javadoc/tool/badSuper/BadSuper.java diff --git a/langtools/test/jdk/javadoc/tool/badSuper/p/A.java b/test/langtools/jdk/javadoc/tool/badSuper/p/A.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/badSuper/p/A.java rename to test/langtools/jdk/javadoc/tool/badSuper/p/A.java diff --git a/langtools/test/jdk/javadoc/tool/badSuper/p/B.java b/test/langtools/jdk/javadoc/tool/badSuper/p/B.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/badSuper/p/B.java rename to test/langtools/jdk/javadoc/tool/badSuper/p/B.java diff --git a/langtools/test/jdk/javadoc/tool/completionFailure/CompletionFailure.java b/test/langtools/jdk/javadoc/tool/completionFailure/CompletionFailure.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/completionFailure/CompletionFailure.java rename to test/langtools/jdk/javadoc/tool/completionFailure/CompletionFailure.java diff --git a/langtools/test/jdk/javadoc/tool/completionFailure/pkg/A.java b/test/langtools/jdk/javadoc/tool/completionFailure/pkg/A.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/completionFailure/pkg/A.java rename to test/langtools/jdk/javadoc/tool/completionFailure/pkg/A.java diff --git a/langtools/test/jdk/javadoc/tool/completionFailure/pkg/B.java b/test/langtools/jdk/javadoc/tool/completionFailure/pkg/B.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/completionFailure/pkg/B.java rename to test/langtools/jdk/javadoc/tool/completionFailure/pkg/B.java diff --git a/langtools/test/jdk/javadoc/tool/doclint/DocLintTest.java b/test/langtools/jdk/javadoc/tool/doclint/DocLintTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/doclint/DocLintTest.java rename to test/langtools/jdk/javadoc/tool/doclint/DocLintTest.java diff --git a/langtools/test/jdk/javadoc/tool/doclint/ImplicitHeadersTest.java b/test/langtools/jdk/javadoc/tool/doclint/ImplicitHeadersTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/doclint/ImplicitHeadersTest.java rename to test/langtools/jdk/javadoc/tool/doclint/ImplicitHeadersTest.java diff --git a/langtools/test/jdk/javadoc/tool/dupOk/DupOk.java b/test/langtools/jdk/javadoc/tool/dupOk/DupOk.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/dupOk/DupOk.java rename to test/langtools/jdk/javadoc/tool/dupOk/DupOk.java diff --git a/langtools/test/jdk/javadoc/tool/dupOk/sp1/p/A.java b/test/langtools/jdk/javadoc/tool/dupOk/sp1/p/A.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/dupOk/sp1/p/A.java rename to test/langtools/jdk/javadoc/tool/dupOk/sp1/p/A.java diff --git a/langtools/test/jdk/javadoc/tool/dupOk/sp2/p/A.java b/test/langtools/jdk/javadoc/tool/dupOk/sp2/p/A.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/dupOk/sp2/p/A.java rename to test/langtools/jdk/javadoc/tool/dupOk/sp2/p/A.java diff --git a/langtools/test/jdk/javadoc/tool/dupOk/sp2/p/B.java b/test/langtools/jdk/javadoc/tool/dupOk/sp2/p/B.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/dupOk/sp2/p/B.java rename to test/langtools/jdk/javadoc/tool/dupOk/sp2/p/B.java diff --git a/langtools/test/jdk/javadoc/tool/enum/docComments/Main.java b/test/langtools/jdk/javadoc/tool/enum/docComments/Main.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/enum/docComments/Main.java rename to test/langtools/jdk/javadoc/tool/enum/docComments/Main.java diff --git a/langtools/test/jdk/javadoc/tool/enum/docComments/pkg1/Operation.java b/test/langtools/jdk/javadoc/tool/enum/docComments/pkg1/Operation.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/enum/docComments/pkg1/Operation.java rename to test/langtools/jdk/javadoc/tool/enum/docComments/pkg1/Operation.java diff --git a/langtools/test/jdk/javadoc/tool/enum/enumType/Main.java b/test/langtools/jdk/javadoc/tool/enum/enumType/Main.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/enum/enumType/Main.java rename to test/langtools/jdk/javadoc/tool/enum/enumType/Main.java diff --git a/langtools/test/jdk/javadoc/tool/enum/enumType/expected.out b/test/langtools/jdk/javadoc/tool/enum/enumType/expected.out similarity index 100% rename from langtools/test/jdk/javadoc/tool/enum/enumType/expected.out rename to test/langtools/jdk/javadoc/tool/enum/enumType/expected.out diff --git a/langtools/test/jdk/javadoc/tool/enum/enumType/pkg1/QuotablePerson.java b/test/langtools/jdk/javadoc/tool/enum/enumType/pkg1/QuotablePerson.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/enum/enumType/pkg1/QuotablePerson.java rename to test/langtools/jdk/javadoc/tool/enum/enumType/pkg1/QuotablePerson.java diff --git a/langtools/test/jdk/javadoc/tool/example/Example.java b/test/langtools/jdk/javadoc/tool/example/Example.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/example/Example.java rename to test/langtools/jdk/javadoc/tool/example/Example.java diff --git a/langtools/test/jdk/javadoc/tool/example/Tester.java b/test/langtools/jdk/javadoc/tool/example/Tester.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/example/Tester.java rename to test/langtools/jdk/javadoc/tool/example/Tester.java diff --git a/langtools/test/jdk/javadoc/tool/example/overview.html b/test/langtools/jdk/javadoc/tool/example/overview.html similarity index 100% rename from langtools/test/jdk/javadoc/tool/example/overview.html rename to test/langtools/jdk/javadoc/tool/example/overview.html diff --git a/langtools/test/jdk/javadoc/tool/exceptionHandling/TestExceptionHandling.java b/test/langtools/jdk/javadoc/tool/exceptionHandling/TestExceptionHandling.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/exceptionHandling/TestExceptionHandling.java rename to test/langtools/jdk/javadoc/tool/exceptionHandling/TestExceptionHandling.java diff --git a/langtools/test/jdk/javadoc/tool/modules/CommandLineFiles.java b/test/langtools/jdk/javadoc/tool/modules/CommandLineFiles.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/modules/CommandLineFiles.java rename to test/langtools/jdk/javadoc/tool/modules/CommandLineFiles.java diff --git a/langtools/test/jdk/javadoc/tool/modules/FilterOptions.java b/test/langtools/jdk/javadoc/tool/modules/FilterOptions.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/modules/FilterOptions.java rename to test/langtools/jdk/javadoc/tool/modules/FilterOptions.java diff --git a/langtools/test/jdk/javadoc/tool/modules/MissingSourceModules.java b/test/langtools/jdk/javadoc/tool/modules/MissingSourceModules.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/modules/MissingSourceModules.java rename to test/langtools/jdk/javadoc/tool/modules/MissingSourceModules.java diff --git a/langtools/test/jdk/javadoc/tool/modules/ModuleTestBase.java b/test/langtools/jdk/javadoc/tool/modules/ModuleTestBase.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/modules/ModuleTestBase.java rename to test/langtools/jdk/javadoc/tool/modules/ModuleTestBase.java diff --git a/langtools/test/jdk/javadoc/tool/modules/Modules.java b/test/langtools/jdk/javadoc/tool/modules/Modules.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/modules/Modules.java rename to test/langtools/jdk/javadoc/tool/modules/Modules.java diff --git a/langtools/test/jdk/javadoc/tool/modules/PackageOptions.java b/test/langtools/jdk/javadoc/tool/modules/PackageOptions.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/modules/PackageOptions.java rename to test/langtools/jdk/javadoc/tool/modules/PackageOptions.java diff --git a/langtools/test/jdk/javadoc/tool/modules/PatchModules.java b/test/langtools/jdk/javadoc/tool/modules/PatchModules.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/modules/PatchModules.java rename to test/langtools/jdk/javadoc/tool/modules/PatchModules.java diff --git a/langtools/test/jdk/javadoc/tool/modules/ReleaseOptions.java b/test/langtools/jdk/javadoc/tool/modules/ReleaseOptions.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/modules/ReleaseOptions.java rename to test/langtools/jdk/javadoc/tool/modules/ReleaseOptions.java diff --git a/langtools/test/jdk/javadoc/tool/nonConstExprs/Test.java b/test/langtools/jdk/javadoc/tool/nonConstExprs/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/nonConstExprs/Test.java rename to test/langtools/jdk/javadoc/tool/nonConstExprs/Test.java diff --git a/langtools/test/jdk/javadoc/tool/outputRedirect/Test.java b/test/langtools/jdk/javadoc/tool/outputRedirect/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/outputRedirect/Test.java rename to test/langtools/jdk/javadoc/tool/outputRedirect/Test.java diff --git a/langtools/test/jdk/javadoc/tool/outputRedirect/p/OutputRedirect.java b/test/langtools/jdk/javadoc/tool/outputRedirect/p/OutputRedirect.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/outputRedirect/p/OutputRedirect.java rename to test/langtools/jdk/javadoc/tool/outputRedirect/p/OutputRedirect.java diff --git a/langtools/test/jdk/javadoc/tool/parser/7091528/T7091528.java b/test/langtools/jdk/javadoc/tool/parser/7091528/T7091528.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/parser/7091528/T7091528.java rename to test/langtools/jdk/javadoc/tool/parser/7091528/T7091528.java diff --git a/langtools/test/jdk/javadoc/tool/parser/7091528/p/C1.java b/test/langtools/jdk/javadoc/tool/parser/7091528/p/C1.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/parser/7091528/p/C1.java rename to test/langtools/jdk/javadoc/tool/parser/7091528/p/C1.java diff --git a/langtools/test/jdk/javadoc/tool/parser/7091528/p/C3.java b/test/langtools/jdk/javadoc/tool/parser/7091528/p/C3.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/parser/7091528/p/C3.java rename to test/langtools/jdk/javadoc/tool/parser/7091528/p/C3.java diff --git a/langtools/test/jdk/javadoc/tool/parser/7091528/p/q/C2.java b/test/langtools/jdk/javadoc/tool/parser/7091528/p/q/C2.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/parser/7091528/p/q/C2.java rename to test/langtools/jdk/javadoc/tool/parser/7091528/p/q/C2.java diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/README.txt b/test/langtools/jdk/javadoc/tool/sampleapi/README.txt similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/README.txt rename to test/langtools/jdk/javadoc/tool/sampleapi/README.txt diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/SampleApiTest.java b/test/langtools/jdk/javadoc/tool/sampleapi/SampleApiTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/SampleApiTest.java rename to test/langtools/jdk/javadoc/tool/sampleapi/SampleApiTest.java diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/SampleApi.java b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/SampleApi.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/SampleApi.java rename to test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/SampleApi.java diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/SampleApiDefaultRunner.java b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/SampleApiDefaultRunner.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/SampleApiDefaultRunner.java rename to test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/SampleApiDefaultRunner.java diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/DocCommentGenerator.java b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/DocCommentGenerator.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/DocCommentGenerator.java rename to test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/DocCommentGenerator.java diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/Documentifier.java b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/Documentifier.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/Documentifier.java rename to test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/Documentifier.java diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/ModuleGenerator.java b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/ModuleGenerator.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/ModuleGenerator.java rename to test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/ModuleGenerator.java diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/PackageGenerator.java b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/PackageGenerator.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/PackageGenerator.java rename to test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/PackageGenerator.java diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java rename to test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/SimpleMultiplier.java b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/SimpleMultiplier.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/SimpleMultiplier.java rename to test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/SimpleMultiplier.java diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/res/fx.xml b/test/langtools/jdk/javadoc/tool/sampleapi/res/fx.xml similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/res/fx.xml rename to test/langtools/jdk/javadoc/tool/sampleapi/res/fx.xml diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/res/simple.xml b/test/langtools/jdk/javadoc/tool/sampleapi/res/simple.xml similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/res/simple.xml rename to test/langtools/jdk/javadoc/tool/sampleapi/res/simple.xml diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/res/sub.xml b/test/langtools/jdk/javadoc/tool/sampleapi/res/sub.xml similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/res/sub.xml rename to test/langtools/jdk/javadoc/tool/sampleapi/res/sub.xml diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/res/tiny.xml b/test/langtools/jdk/javadoc/tool/sampleapi/res/tiny.xml similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/res/tiny.xml rename to test/langtools/jdk/javadoc/tool/sampleapi/res/tiny.xml diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/res/tinysub.xml b/test/langtools/jdk/javadoc/tool/sampleapi/res/tinysub.xml similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/res/tinysub.xml rename to test/langtools/jdk/javadoc/tool/sampleapi/res/tinysub.xml diff --git a/langtools/test/jdk/javadoc/tool/sampleapi/res/transitive.xml b/test/langtools/jdk/javadoc/tool/sampleapi/res/transitive.xml similarity index 100% rename from langtools/test/jdk/javadoc/tool/sampleapi/res/transitive.xml rename to test/langtools/jdk/javadoc/tool/sampleapi/res/transitive.xml diff --git a/langtools/test/jdk/javadoc/tool/sourceOnly/Test.java b/test/langtools/jdk/javadoc/tool/sourceOnly/Test.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sourceOnly/Test.java rename to test/langtools/jdk/javadoc/tool/sourceOnly/Test.java diff --git a/langtools/test/jdk/javadoc/tool/sourceOnly/p/NonSource.jasm b/test/langtools/jdk/javadoc/tool/sourceOnly/p/NonSource.jasm similarity index 100% rename from langtools/test/jdk/javadoc/tool/sourceOnly/p/NonSource.jasm rename to test/langtools/jdk/javadoc/tool/sourceOnly/p/NonSource.jasm diff --git a/langtools/test/jdk/javadoc/tool/sourceOnly/p/SourceOnly.java b/test/langtools/jdk/javadoc/tool/sourceOnly/p/SourceOnly.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sourceOnly/p/SourceOnly.java rename to test/langtools/jdk/javadoc/tool/sourceOnly/p/SourceOnly.java diff --git a/langtools/test/jdk/javadoc/tool/sourceOption/SourceOption.java b/test/langtools/jdk/javadoc/tool/sourceOption/SourceOption.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sourceOption/SourceOption.java rename to test/langtools/jdk/javadoc/tool/sourceOption/SourceOption.java diff --git a/langtools/test/jdk/javadoc/tool/sourceOption/p/LambdaConstructTest.java b/test/langtools/jdk/javadoc/tool/sourceOption/p/LambdaConstructTest.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/sourceOption/p/LambdaConstructTest.java rename to test/langtools/jdk/javadoc/tool/sourceOption/p/LambdaConstructTest.java diff --git a/langtools/test/jdk/javadoc/tool/subpackageIgnore/SubpackageIgnore.java b/test/langtools/jdk/javadoc/tool/subpackageIgnore/SubpackageIgnore.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/subpackageIgnore/SubpackageIgnore.java rename to test/langtools/jdk/javadoc/tool/subpackageIgnore/SubpackageIgnore.java diff --git a/langtools/test/jdk/javadoc/tool/subpackageIgnore/pkg1/ValidFile.java b/test/langtools/jdk/javadoc/tool/subpackageIgnore/pkg1/ValidFile.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/subpackageIgnore/pkg1/ValidFile.java rename to test/langtools/jdk/javadoc/tool/subpackageIgnore/pkg1/ValidFile.java diff --git a/langtools/test/jdk/javadoc/tool/subpackageIgnore/pkg1/not-subpkg/SomeJavaFile.java b/test/langtools/jdk/javadoc/tool/subpackageIgnore/pkg1/not-subpkg/SomeJavaFile.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/subpackageIgnore/pkg1/not-subpkg/SomeJavaFile.java rename to test/langtools/jdk/javadoc/tool/subpackageIgnore/pkg1/not-subpkg/SomeJavaFile.java diff --git a/langtools/test/jdk/javadoc/tool/treeapi/TestDocTrees.java b/test/langtools/jdk/javadoc/tool/treeapi/TestDocTrees.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/treeapi/TestDocTrees.java rename to test/langtools/jdk/javadoc/tool/treeapi/TestDocTrees.java diff --git a/langtools/test/jdk/javadoc/tool/treeapi/overview.html b/test/langtools/jdk/javadoc/tool/treeapi/overview.html similarity index 100% rename from langtools/test/jdk/javadoc/tool/treeapi/overview.html rename to test/langtools/jdk/javadoc/tool/treeapi/overview.html diff --git a/langtools/test/jdk/javadoc/tool/varArgs/Main.java b/test/langtools/jdk/javadoc/tool/varArgs/Main.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/varArgs/Main.java rename to test/langtools/jdk/javadoc/tool/varArgs/Main.java diff --git a/langtools/test/jdk/javadoc/tool/varArgs/expected.out b/test/langtools/jdk/javadoc/tool/varArgs/expected.out similarity index 100% rename from langtools/test/jdk/javadoc/tool/varArgs/expected.out rename to test/langtools/jdk/javadoc/tool/varArgs/expected.out diff --git a/langtools/test/jdk/javadoc/tool/varArgs/pkg1/A.java b/test/langtools/jdk/javadoc/tool/varArgs/pkg1/A.java similarity index 100% rename from langtools/test/jdk/javadoc/tool/varArgs/pkg1/A.java rename to test/langtools/jdk/javadoc/tool/varArgs/pkg1/A.java diff --git a/langtools/test/jdk/jshell/AnalysisTest.java b/test/langtools/jdk/jshell/AnalysisTest.java similarity index 100% rename from langtools/test/jdk/jshell/AnalysisTest.java rename to test/langtools/jdk/jshell/AnalysisTest.java diff --git a/langtools/test/jdk/jshell/AnalyzeSnippetTest.java b/test/langtools/jdk/jshell/AnalyzeSnippetTest.java similarity index 100% rename from langtools/test/jdk/jshell/AnalyzeSnippetTest.java rename to test/langtools/jdk/jshell/AnalyzeSnippetTest.java diff --git a/langtools/test/jdk/jshell/BadExecutionControlSpecTest.java b/test/langtools/jdk/jshell/BadExecutionControlSpecTest.java similarity index 100% rename from langtools/test/jdk/jshell/BadExecutionControlSpecTest.java rename to test/langtools/jdk/jshell/BadExecutionControlSpecTest.java diff --git a/langtools/test/jdk/jshell/ClassMembersTest.java b/test/langtools/jdk/jshell/ClassMembersTest.java similarity index 100% rename from langtools/test/jdk/jshell/ClassMembersTest.java rename to test/langtools/jdk/jshell/ClassMembersTest.java diff --git a/langtools/test/jdk/jshell/ClassPathTest.java b/test/langtools/jdk/jshell/ClassPathTest.java similarity index 100% rename from langtools/test/jdk/jshell/ClassPathTest.java rename to test/langtools/jdk/jshell/ClassPathTest.java diff --git a/langtools/test/jdk/jshell/ClassesTest.java b/test/langtools/jdk/jshell/ClassesTest.java similarity index 100% rename from langtools/test/jdk/jshell/ClassesTest.java rename to test/langtools/jdk/jshell/ClassesTest.java diff --git a/langtools/test/jdk/jshell/CommandCompletionTest.java b/test/langtools/jdk/jshell/CommandCompletionTest.java similarity index 100% rename from langtools/test/jdk/jshell/CommandCompletionTest.java rename to test/langtools/jdk/jshell/CommandCompletionTest.java diff --git a/langtools/test/jdk/jshell/Compiler.java b/test/langtools/jdk/jshell/Compiler.java similarity index 100% rename from langtools/test/jdk/jshell/Compiler.java rename to test/langtools/jdk/jshell/Compiler.java diff --git a/langtools/test/jdk/jshell/CompilerOptionsTest.java b/test/langtools/jdk/jshell/CompilerOptionsTest.java similarity index 100% rename from langtools/test/jdk/jshell/CompilerOptionsTest.java rename to test/langtools/jdk/jshell/CompilerOptionsTest.java diff --git a/langtools/test/jdk/jshell/CompletenessStressTest.java b/test/langtools/jdk/jshell/CompletenessStressTest.java similarity index 100% rename from langtools/test/jdk/jshell/CompletenessStressTest.java rename to test/langtools/jdk/jshell/CompletenessStressTest.java diff --git a/langtools/test/jdk/jshell/CompletenessTest.java b/test/langtools/jdk/jshell/CompletenessTest.java similarity index 100% rename from langtools/test/jdk/jshell/CompletenessTest.java rename to test/langtools/jdk/jshell/CompletenessTest.java diff --git a/langtools/test/jdk/jshell/CompletionSuggestionTest.java b/test/langtools/jdk/jshell/CompletionSuggestionTest.java similarity index 100% rename from langtools/test/jdk/jshell/CompletionSuggestionTest.java rename to test/langtools/jdk/jshell/CompletionSuggestionTest.java diff --git a/langtools/test/jdk/jshell/ComputeFQNsTest.java b/test/langtools/jdk/jshell/ComputeFQNsTest.java similarity index 100% rename from langtools/test/jdk/jshell/ComputeFQNsTest.java rename to test/langtools/jdk/jshell/ComputeFQNsTest.java diff --git a/langtools/test/jdk/jshell/CustomEditor.java b/test/langtools/jdk/jshell/CustomEditor.java similarity index 100% rename from langtools/test/jdk/jshell/CustomEditor.java rename to test/langtools/jdk/jshell/CustomEditor.java diff --git a/langtools/test/jdk/jshell/DropTest.java b/test/langtools/jdk/jshell/DropTest.java similarity index 100% rename from langtools/test/jdk/jshell/DropTest.java rename to test/langtools/jdk/jshell/DropTest.java diff --git a/langtools/test/jdk/jshell/DyingRemoteAgent.java b/test/langtools/jdk/jshell/DyingRemoteAgent.java similarity index 100% rename from langtools/test/jdk/jshell/DyingRemoteAgent.java rename to test/langtools/jdk/jshell/DyingRemoteAgent.java diff --git a/langtools/test/jdk/jshell/EditorTestBase.java b/test/langtools/jdk/jshell/EditorTestBase.java similarity index 100% rename from langtools/test/jdk/jshell/EditorTestBase.java rename to test/langtools/jdk/jshell/EditorTestBase.java diff --git a/langtools/test/jdk/jshell/EmptyTest.java b/test/langtools/jdk/jshell/EmptyTest.java similarity index 100% rename from langtools/test/jdk/jshell/EmptyTest.java rename to test/langtools/jdk/jshell/EmptyTest.java diff --git a/langtools/test/jdk/jshell/ErrorTranslationTest.java b/test/langtools/jdk/jshell/ErrorTranslationTest.java similarity index 100% rename from langtools/test/jdk/jshell/ErrorTranslationTest.java rename to test/langtools/jdk/jshell/ErrorTranslationTest.java diff --git a/langtools/test/jdk/jshell/ExceptionMessageTest.java b/test/langtools/jdk/jshell/ExceptionMessageTest.java similarity index 100% rename from langtools/test/jdk/jshell/ExceptionMessageTest.java rename to test/langtools/jdk/jshell/ExceptionMessageTest.java diff --git a/langtools/test/jdk/jshell/ExceptionsTest.java b/test/langtools/jdk/jshell/ExceptionsTest.java similarity index 100% rename from langtools/test/jdk/jshell/ExceptionsTest.java rename to test/langtools/jdk/jshell/ExceptionsTest.java diff --git a/langtools/test/jdk/jshell/ExecutionControlSpecTest.java b/test/langtools/jdk/jshell/ExecutionControlSpecTest.java similarity index 100% rename from langtools/test/jdk/jshell/ExecutionControlSpecTest.java rename to test/langtools/jdk/jshell/ExecutionControlSpecTest.java diff --git a/langtools/test/jdk/jshell/ExecutionControlTestBase.java b/test/langtools/jdk/jshell/ExecutionControlTestBase.java similarity index 100% rename from langtools/test/jdk/jshell/ExecutionControlTestBase.java rename to test/langtools/jdk/jshell/ExecutionControlTestBase.java diff --git a/langtools/test/jdk/jshell/ExpectedDiagnostic.java b/test/langtools/jdk/jshell/ExpectedDiagnostic.java similarity index 100% rename from langtools/test/jdk/jshell/ExpectedDiagnostic.java rename to test/langtools/jdk/jshell/ExpectedDiagnostic.java diff --git a/langtools/test/jdk/jshell/ExternalEditorTest.java b/test/langtools/jdk/jshell/ExternalEditorTest.java similarity index 100% rename from langtools/test/jdk/jshell/ExternalEditorTest.java rename to test/langtools/jdk/jshell/ExternalEditorTest.java diff --git a/langtools/test/jdk/jshell/FailOverDirectExecutionControlTest.java b/test/langtools/jdk/jshell/FailOverDirectExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/FailOverDirectExecutionControlTest.java rename to test/langtools/jdk/jshell/FailOverDirectExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/FailOverExecutionControlDyingLaunchTest.java b/test/langtools/jdk/jshell/FailOverExecutionControlDyingLaunchTest.java similarity index 100% rename from langtools/test/jdk/jshell/FailOverExecutionControlDyingLaunchTest.java rename to test/langtools/jdk/jshell/FailOverExecutionControlDyingLaunchTest.java diff --git a/langtools/test/jdk/jshell/FailOverExecutionControlHangingLaunchTest.java b/test/langtools/jdk/jshell/FailOverExecutionControlHangingLaunchTest.java similarity index 100% rename from langtools/test/jdk/jshell/FailOverExecutionControlHangingLaunchTest.java rename to test/langtools/jdk/jshell/FailOverExecutionControlHangingLaunchTest.java diff --git a/langtools/test/jdk/jshell/FailOverExecutionControlHangingListenTest.java b/test/langtools/jdk/jshell/FailOverExecutionControlHangingListenTest.java similarity index 100% rename from langtools/test/jdk/jshell/FailOverExecutionControlHangingListenTest.java rename to test/langtools/jdk/jshell/FailOverExecutionControlHangingListenTest.java diff --git a/langtools/test/jdk/jshell/FailOverExecutionControlTest.java b/test/langtools/jdk/jshell/FailOverExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/FailOverExecutionControlTest.java rename to test/langtools/jdk/jshell/FailOverExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/FileManagerTest.java b/test/langtools/jdk/jshell/FileManagerTest.java similarity index 100% rename from langtools/test/jdk/jshell/FileManagerTest.java rename to test/langtools/jdk/jshell/FileManagerTest.java diff --git a/langtools/test/jdk/jshell/ForwardReferenceImportTest.java b/test/langtools/jdk/jshell/ForwardReferenceImportTest.java similarity index 100% rename from langtools/test/jdk/jshell/ForwardReferenceImportTest.java rename to test/langtools/jdk/jshell/ForwardReferenceImportTest.java diff --git a/langtools/test/jdk/jshell/ForwardReferenceTest.java b/test/langtools/jdk/jshell/ForwardReferenceTest.java similarity index 100% rename from langtools/test/jdk/jshell/ForwardReferenceTest.java rename to test/langtools/jdk/jshell/ForwardReferenceTest.java diff --git a/langtools/test/jdk/jshell/GetResourceTest.java b/test/langtools/jdk/jshell/GetResourceTest.java similarity index 100% rename from langtools/test/jdk/jshell/GetResourceTest.java rename to test/langtools/jdk/jshell/GetResourceTest.java diff --git a/langtools/test/jdk/jshell/HangingRemoteAgent.java b/test/langtools/jdk/jshell/HangingRemoteAgent.java similarity index 100% rename from langtools/test/jdk/jshell/HangingRemoteAgent.java rename to test/langtools/jdk/jshell/HangingRemoteAgent.java diff --git a/langtools/test/jdk/jshell/HistoryTest.java b/test/langtools/jdk/jshell/HistoryTest.java similarity index 100% rename from langtools/test/jdk/jshell/HistoryTest.java rename to test/langtools/jdk/jshell/HistoryTest.java diff --git a/langtools/test/jdk/jshell/HistoryUITest.java b/test/langtools/jdk/jshell/HistoryUITest.java similarity index 100% rename from langtools/test/jdk/jshell/HistoryUITest.java rename to test/langtools/jdk/jshell/HistoryUITest.java diff --git a/langtools/test/jdk/jshell/IOTest.java b/test/langtools/jdk/jshell/IOTest.java similarity index 100% rename from langtools/test/jdk/jshell/IOTest.java rename to test/langtools/jdk/jshell/IOTest.java diff --git a/langtools/test/jdk/jshell/IdGeneratorTest.java b/test/langtools/jdk/jshell/IdGeneratorTest.java similarity index 100% rename from langtools/test/jdk/jshell/IdGeneratorTest.java rename to test/langtools/jdk/jshell/IdGeneratorTest.java diff --git a/langtools/test/jdk/jshell/IgnoreTest.java b/test/langtools/jdk/jshell/IgnoreTest.java similarity index 100% rename from langtools/test/jdk/jshell/IgnoreTest.java rename to test/langtools/jdk/jshell/IgnoreTest.java diff --git a/langtools/test/jdk/jshell/IllegalArgumentExceptionTest.java b/test/langtools/jdk/jshell/IllegalArgumentExceptionTest.java similarity index 100% rename from langtools/test/jdk/jshell/IllegalArgumentExceptionTest.java rename to test/langtools/jdk/jshell/IllegalArgumentExceptionTest.java diff --git a/langtools/test/jdk/jshell/ImportTest.java b/test/langtools/jdk/jshell/ImportTest.java similarity index 100% rename from langtools/test/jdk/jshell/ImportTest.java rename to test/langtools/jdk/jshell/ImportTest.java diff --git a/langtools/test/jdk/jshell/InferTypeTest.java b/test/langtools/jdk/jshell/InferTypeTest.java similarity index 100% rename from langtools/test/jdk/jshell/InferTypeTest.java rename to test/langtools/jdk/jshell/InferTypeTest.java diff --git a/langtools/test/jdk/jshell/JShellQueryTest.java b/test/langtools/jdk/jshell/JShellQueryTest.java similarity index 100% rename from langtools/test/jdk/jshell/JShellQueryTest.java rename to test/langtools/jdk/jshell/JShellQueryTest.java diff --git a/langtools/test/jdk/jshell/JShellStateClosedTest.java b/test/langtools/jdk/jshell/JShellStateClosedTest.java similarity index 100% rename from langtools/test/jdk/jshell/JShellStateClosedTest.java rename to test/langtools/jdk/jshell/JShellStateClosedTest.java diff --git a/langtools/test/jdk/jshell/JavadocTest.java b/test/langtools/jdk/jshell/JavadocTest.java similarity index 100% rename from langtools/test/jdk/jshell/JavadocTest.java rename to test/langtools/jdk/jshell/JavadocTest.java diff --git a/langtools/test/jdk/jshell/JdiBadOptionLaunchExecutionControlTest.java b/test/langtools/jdk/jshell/JdiBadOptionLaunchExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/JdiBadOptionLaunchExecutionControlTest.java rename to test/langtools/jdk/jshell/JdiBadOptionLaunchExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/JdiBadOptionListenExecutionControlTest.java b/test/langtools/jdk/jshell/JdiBadOptionListenExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/JdiBadOptionListenExecutionControlTest.java rename to test/langtools/jdk/jshell/JdiBadOptionListenExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/JdiBogusHostListenExecutionControlTest.java b/test/langtools/jdk/jshell/JdiBogusHostListenExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/JdiBogusHostListenExecutionControlTest.java rename to test/langtools/jdk/jshell/JdiBogusHostListenExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/JdiFailingLaunchExecutionControlTest.java b/test/langtools/jdk/jshell/JdiFailingLaunchExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/JdiFailingLaunchExecutionControlTest.java rename to test/langtools/jdk/jshell/JdiFailingLaunchExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/JdiFailingListenExecutionControlTest.java b/test/langtools/jdk/jshell/JdiFailingListenExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/JdiFailingListenExecutionControlTest.java rename to test/langtools/jdk/jshell/JdiFailingListenExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/JdiHangingLaunchExecutionControlTest.java b/test/langtools/jdk/jshell/JdiHangingLaunchExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/JdiHangingLaunchExecutionControlTest.java rename to test/langtools/jdk/jshell/JdiHangingLaunchExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/JdiHangingListenExecutionControlTest.java b/test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/JdiHangingListenExecutionControlTest.java rename to test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/JdiLaunchingExecutionControlTest.java b/test/langtools/jdk/jshell/JdiLaunchingExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/JdiLaunchingExecutionControlTest.java rename to test/langtools/jdk/jshell/JdiLaunchingExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/JdiListeningExecutionControlTest.java b/test/langtools/jdk/jshell/JdiListeningExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/JdiListeningExecutionControlTest.java rename to test/langtools/jdk/jshell/JdiListeningExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/JdiListeningLocalhostExecutionControlTest.java b/test/langtools/jdk/jshell/JdiListeningLocalhostExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/JdiListeningLocalhostExecutionControlTest.java rename to test/langtools/jdk/jshell/JdiListeningLocalhostExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/KullaCompletenessStressTest.java b/test/langtools/jdk/jshell/KullaCompletenessStressTest.java similarity index 100% rename from langtools/test/jdk/jshell/KullaCompletenessStressTest.java rename to test/langtools/jdk/jshell/KullaCompletenessStressTest.java diff --git a/langtools/test/jdk/jshell/KullaTesting.java b/test/langtools/jdk/jshell/KullaTesting.java similarity index 100% rename from langtools/test/jdk/jshell/KullaTesting.java rename to test/langtools/jdk/jshell/KullaTesting.java diff --git a/langtools/test/jdk/jshell/MethodsTest.java b/test/langtools/jdk/jshell/MethodsTest.java similarity index 100% rename from langtools/test/jdk/jshell/MethodsTest.java rename to test/langtools/jdk/jshell/MethodsTest.java diff --git a/langtools/test/jdk/jshell/ModifiersTest.java b/test/langtools/jdk/jshell/ModifiersTest.java similarity index 100% rename from langtools/test/jdk/jshell/ModifiersTest.java rename to test/langtools/jdk/jshell/ModifiersTest.java diff --git a/langtools/test/jdk/jshell/MyExecutionControl.java b/test/langtools/jdk/jshell/MyExecutionControl.java similarity index 100% rename from langtools/test/jdk/jshell/MyExecutionControl.java rename to test/langtools/jdk/jshell/MyExecutionControl.java diff --git a/langtools/test/jdk/jshell/MyExecutionControlProvider.java b/test/langtools/jdk/jshell/MyExecutionControlProvider.java similarity index 100% rename from langtools/test/jdk/jshell/MyExecutionControlProvider.java rename to test/langtools/jdk/jshell/MyExecutionControlProvider.java diff --git a/langtools/test/jdk/jshell/MyRemoteExecutionControl.java b/test/langtools/jdk/jshell/MyRemoteExecutionControl.java similarity index 100% rename from langtools/test/jdk/jshell/MyRemoteExecutionControl.java rename to test/langtools/jdk/jshell/MyRemoteExecutionControl.java diff --git a/langtools/test/jdk/jshell/NullTest.java b/test/langtools/jdk/jshell/NullTest.java similarity index 100% rename from langtools/test/jdk/jshell/NullTest.java rename to test/langtools/jdk/jshell/NullTest.java diff --git a/langtools/test/jdk/jshell/PasteAndMeasurementsUITest.java b/test/langtools/jdk/jshell/PasteAndMeasurementsUITest.java similarity index 100% rename from langtools/test/jdk/jshell/PasteAndMeasurementsUITest.java rename to test/langtools/jdk/jshell/PasteAndMeasurementsUITest.java diff --git a/langtools/test/jdk/jshell/PipeInputStreamTest.java b/test/langtools/jdk/jshell/PipeInputStreamTest.java similarity index 100% rename from langtools/test/jdk/jshell/PipeInputStreamTest.java rename to test/langtools/jdk/jshell/PipeInputStreamTest.java diff --git a/langtools/test/jdk/jshell/RejectedFailedTest.java b/test/langtools/jdk/jshell/RejectedFailedTest.java similarity index 100% rename from langtools/test/jdk/jshell/RejectedFailedTest.java rename to test/langtools/jdk/jshell/RejectedFailedTest.java diff --git a/langtools/test/jdk/jshell/ReplToolTesting.java b/test/langtools/jdk/jshell/ReplToolTesting.java similarity index 100% rename from langtools/test/jdk/jshell/ReplToolTesting.java rename to test/langtools/jdk/jshell/ReplToolTesting.java diff --git a/langtools/test/jdk/jshell/ReplaceTest.java b/test/langtools/jdk/jshell/ReplaceTest.java similarity index 100% rename from langtools/test/jdk/jshell/ReplaceTest.java rename to test/langtools/jdk/jshell/ReplaceTest.java diff --git a/langtools/test/jdk/jshell/ShutdownTest.java b/test/langtools/jdk/jshell/ShutdownTest.java similarity index 100% rename from langtools/test/jdk/jshell/ShutdownTest.java rename to test/langtools/jdk/jshell/ShutdownTest.java diff --git a/langtools/test/jdk/jshell/SimpleRegressionTest.java b/test/langtools/jdk/jshell/SimpleRegressionTest.java similarity index 100% rename from langtools/test/jdk/jshell/SimpleRegressionTest.java rename to test/langtools/jdk/jshell/SimpleRegressionTest.java diff --git a/langtools/test/jdk/jshell/SnippetStatusListenerTest.java b/test/langtools/jdk/jshell/SnippetStatusListenerTest.java similarity index 100% rename from langtools/test/jdk/jshell/SnippetStatusListenerTest.java rename to test/langtools/jdk/jshell/SnippetStatusListenerTest.java diff --git a/langtools/test/jdk/jshell/SnippetTest.java b/test/langtools/jdk/jshell/SnippetTest.java similarity index 100% rename from langtools/test/jdk/jshell/SnippetTest.java rename to test/langtools/jdk/jshell/SnippetTest.java diff --git a/langtools/test/jdk/jshell/StartOptionTest.java b/test/langtools/jdk/jshell/StartOptionTest.java similarity index 100% rename from langtools/test/jdk/jshell/StartOptionTest.java rename to test/langtools/jdk/jshell/StartOptionTest.java diff --git a/langtools/test/jdk/jshell/StopExecutionTest.java b/test/langtools/jdk/jshell/StopExecutionTest.java similarity index 100% rename from langtools/test/jdk/jshell/StopExecutionTest.java rename to test/langtools/jdk/jshell/StopExecutionTest.java diff --git a/langtools/test/jdk/jshell/T8146368/JShellTest8146368.java b/test/langtools/jdk/jshell/T8146368/JShellTest8146368.java similarity index 100% rename from langtools/test/jdk/jshell/T8146368/JShellTest8146368.java rename to test/langtools/jdk/jshell/T8146368/JShellTest8146368.java diff --git a/langtools/test/jdk/jshell/T8146368/JShellToolTest8146368.java b/test/langtools/jdk/jshell/T8146368/JShellToolTest8146368.java similarity index 100% rename from langtools/test/jdk/jshell/T8146368/JShellToolTest8146368.java rename to test/langtools/jdk/jshell/T8146368/JShellToolTest8146368.java diff --git a/langtools/test/jdk/jshell/TestingInputStream.java b/test/langtools/jdk/jshell/TestingInputStream.java similarity index 100% rename from langtools/test/jdk/jshell/TestingInputStream.java rename to test/langtools/jdk/jshell/TestingInputStream.java diff --git a/langtools/test/jdk/jshell/ToolBasicTest.java b/test/langtools/jdk/jshell/ToolBasicTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolBasicTest.java rename to test/langtools/jdk/jshell/ToolBasicTest.java diff --git a/langtools/test/jdk/jshell/ToolCommandOptionTest.java b/test/langtools/jdk/jshell/ToolCommandOptionTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolCommandOptionTest.java rename to test/langtools/jdk/jshell/ToolCommandOptionTest.java diff --git a/langtools/test/jdk/jshell/ToolFormatTest.java b/test/langtools/jdk/jshell/ToolFormatTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolFormatTest.java rename to test/langtools/jdk/jshell/ToolFormatTest.java diff --git a/langtools/test/jdk/jshell/ToolLocalSimpleTest.java b/test/langtools/jdk/jshell/ToolLocalSimpleTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolLocalSimpleTest.java rename to test/langtools/jdk/jshell/ToolLocalSimpleTest.java diff --git a/langtools/test/jdk/jshell/ToolLocaleMessageTest.java b/test/langtools/jdk/jshell/ToolLocaleMessageTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolLocaleMessageTest.java rename to test/langtools/jdk/jshell/ToolLocaleMessageTest.java diff --git a/langtools/test/jdk/jshell/ToolMultilineSnippetHistoryTest.java b/test/langtools/jdk/jshell/ToolMultilineSnippetHistoryTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolMultilineSnippetHistoryTest.java rename to test/langtools/jdk/jshell/ToolMultilineSnippetHistoryTest.java diff --git a/langtools/test/jdk/jshell/ToolProviderTest.java b/test/langtools/jdk/jshell/ToolProviderTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolProviderTest.java rename to test/langtools/jdk/jshell/ToolProviderTest.java diff --git a/langtools/test/jdk/jshell/ToolReloadTest.java b/test/langtools/jdk/jshell/ToolReloadTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolReloadTest.java rename to test/langtools/jdk/jshell/ToolReloadTest.java diff --git a/langtools/test/jdk/jshell/ToolRetainTest.java b/test/langtools/jdk/jshell/ToolRetainTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolRetainTest.java rename to test/langtools/jdk/jshell/ToolRetainTest.java diff --git a/langtools/test/jdk/jshell/ToolShiftTabTest.java b/test/langtools/jdk/jshell/ToolShiftTabTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolShiftTabTest.java rename to test/langtools/jdk/jshell/ToolShiftTabTest.java diff --git a/langtools/test/jdk/jshell/ToolSimpleTest.java b/test/langtools/jdk/jshell/ToolSimpleTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolSimpleTest.java rename to test/langtools/jdk/jshell/ToolSimpleTest.java diff --git a/langtools/test/jdk/jshell/ToolTabCommandTest.java b/test/langtools/jdk/jshell/ToolTabCommandTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolTabCommandTest.java rename to test/langtools/jdk/jshell/ToolTabCommandTest.java diff --git a/langtools/test/jdk/jshell/ToolTabSnippetTest.java b/test/langtools/jdk/jshell/ToolTabSnippetTest.java similarity index 100% rename from langtools/test/jdk/jshell/ToolTabSnippetTest.java rename to test/langtools/jdk/jshell/ToolTabSnippetTest.java diff --git a/langtools/test/jdk/jshell/TypeNameTest.java b/test/langtools/jdk/jshell/TypeNameTest.java similarity index 100% rename from langtools/test/jdk/jshell/TypeNameTest.java rename to test/langtools/jdk/jshell/TypeNameTest.java diff --git a/langtools/test/jdk/jshell/UITesting.java b/test/langtools/jdk/jshell/UITesting.java similarity index 100% rename from langtools/test/jdk/jshell/UITesting.java rename to test/langtools/jdk/jshell/UITesting.java diff --git a/langtools/test/jdk/jshell/UserExecutionControlTest.java b/test/langtools/jdk/jshell/UserExecutionControlTest.java similarity index 100% rename from langtools/test/jdk/jshell/UserExecutionControlTest.java rename to test/langtools/jdk/jshell/UserExecutionControlTest.java diff --git a/langtools/test/jdk/jshell/UserInputTest.java b/test/langtools/jdk/jshell/UserInputTest.java similarity index 100% rename from langtools/test/jdk/jshell/UserInputTest.java rename to test/langtools/jdk/jshell/UserInputTest.java diff --git a/langtools/test/jdk/jshell/UserJdiUserRemoteTest.java b/test/langtools/jdk/jshell/UserJdiUserRemoteTest.java similarity index 100% rename from langtools/test/jdk/jshell/UserJdiUserRemoteTest.java rename to test/langtools/jdk/jshell/UserJdiUserRemoteTest.java diff --git a/langtools/test/jdk/jshell/VariablesTest.java b/test/langtools/jdk/jshell/VariablesTest.java similarity index 100% rename from langtools/test/jdk/jshell/VariablesTest.java rename to test/langtools/jdk/jshell/VariablesTest.java diff --git a/langtools/test/jdk/jshell/WrapperTest.java b/test/langtools/jdk/jshell/WrapperTest.java similarity index 100% rename from langtools/test/jdk/jshell/WrapperTest.java rename to test/langtools/jdk/jshell/WrapperTest.java diff --git a/langtools/test/lib/annotations/annotations/classfile/ClassfileInspector.java b/test/langtools/lib/annotations/annotations/classfile/ClassfileInspector.java similarity index 100% rename from langtools/test/lib/annotations/annotations/classfile/ClassfileInspector.java rename to test/langtools/lib/annotations/annotations/classfile/ClassfileInspector.java diff --git a/langtools/test/lib/combo/TEST.properties b/test/langtools/lib/combo/TEST.properties similarity index 100% rename from langtools/test/lib/combo/TEST.properties rename to test/langtools/lib/combo/TEST.properties diff --git a/langtools/test/lib/combo/tools/javac/combo/Diagnostics.java b/test/langtools/lib/combo/tools/javac/combo/Diagnostics.java similarity index 100% rename from langtools/test/lib/combo/tools/javac/combo/Diagnostics.java rename to test/langtools/lib/combo/tools/javac/combo/Diagnostics.java diff --git a/langtools/test/lib/combo/tools/javac/combo/JavacTemplateTestBase.java b/test/langtools/lib/combo/tools/javac/combo/JavacTemplateTestBase.java similarity index 100% rename from langtools/test/lib/combo/tools/javac/combo/JavacTemplateTestBase.java rename to test/langtools/lib/combo/tools/javac/combo/JavacTemplateTestBase.java diff --git a/langtools/test/lib/combo/tools/javac/combo/Template.java b/test/langtools/lib/combo/tools/javac/combo/Template.java similarity index 100% rename from langtools/test/lib/combo/tools/javac/combo/Template.java rename to test/langtools/lib/combo/tools/javac/combo/Template.java diff --git a/langtools/test/lib/combo/tools/javac/combo/TemplateTest.java b/test/langtools/lib/combo/tools/javac/combo/TemplateTest.java similarity index 100% rename from langtools/test/lib/combo/tools/javac/combo/TemplateTest.java rename to test/langtools/lib/combo/tools/javac/combo/TemplateTest.java diff --git a/langtools/test/req.flg b/test/langtools/req.flg similarity index 100% rename from langtools/test/req.flg rename to test/langtools/req.flg diff --git a/langtools/test/tools/all/RunCodingRules.java b/test/langtools/tools/all/RunCodingRules.java similarity index 100% rename from langtools/test/tools/all/RunCodingRules.java rename to test/langtools/tools/all/RunCodingRules.java diff --git a/langtools/test/tools/doclint/AccessTest.java b/test/langtools/tools/doclint/AccessTest.java similarity index 100% rename from langtools/test/tools/doclint/AccessTest.java rename to test/langtools/tools/doclint/AccessTest.java diff --git a/langtools/test/tools/doclint/AccessTest.package.out b/test/langtools/tools/doclint/AccessTest.package.out similarity index 100% rename from langtools/test/tools/doclint/AccessTest.package.out rename to test/langtools/tools/doclint/AccessTest.package.out diff --git a/langtools/test/tools/doclint/AccessTest.private.out b/test/langtools/tools/doclint/AccessTest.private.out similarity index 100% rename from langtools/test/tools/doclint/AccessTest.private.out rename to test/langtools/tools/doclint/AccessTest.private.out diff --git a/langtools/test/tools/doclint/AccessTest.protected.out b/test/langtools/tools/doclint/AccessTest.protected.out similarity index 100% rename from langtools/test/tools/doclint/AccessTest.protected.out rename to test/langtools/tools/doclint/AccessTest.protected.out diff --git a/langtools/test/tools/doclint/AccessTest.public.out b/test/langtools/tools/doclint/AccessTest.public.out similarity index 100% rename from langtools/test/tools/doclint/AccessTest.public.out rename to test/langtools/tools/doclint/AccessTest.public.out diff --git a/langtools/test/tools/doclint/AccessibilityTest.java b/test/langtools/tools/doclint/AccessibilityTest.java similarity index 100% rename from langtools/test/tools/doclint/AccessibilityTest.java rename to test/langtools/tools/doclint/AccessibilityTest.java diff --git a/langtools/test/tools/doclint/AccessibilityTest.out b/test/langtools/tools/doclint/AccessibilityTest.out similarity index 100% rename from langtools/test/tools/doclint/AccessibilityTest.out rename to test/langtools/tools/doclint/AccessibilityTest.out diff --git a/langtools/test/tools/doclint/AnchorTest.java b/test/langtools/tools/doclint/AnchorTest.java similarity index 100% rename from langtools/test/tools/doclint/AnchorTest.java rename to test/langtools/tools/doclint/AnchorTest.java diff --git a/langtools/test/tools/doclint/AnchorTest.out b/test/langtools/tools/doclint/AnchorTest.out similarity index 100% rename from langtools/test/tools/doclint/AnchorTest.out rename to test/langtools/tools/doclint/AnchorTest.out diff --git a/langtools/test/tools/doclint/AnchorTest2.java b/test/langtools/tools/doclint/AnchorTest2.java similarity index 100% rename from langtools/test/tools/doclint/AnchorTest2.java rename to test/langtools/tools/doclint/AnchorTest2.java diff --git a/langtools/test/tools/doclint/AnchorTest2.out b/test/langtools/tools/doclint/AnchorTest2.out similarity index 100% rename from langtools/test/tools/doclint/AnchorTest2.out rename to test/langtools/tools/doclint/AnchorTest2.out diff --git a/langtools/test/tools/doclint/AnchorTest2a.java b/test/langtools/tools/doclint/AnchorTest2a.java similarity index 100% rename from langtools/test/tools/doclint/AnchorTest2a.java rename to test/langtools/tools/doclint/AnchorTest2a.java diff --git a/langtools/test/tools/doclint/BadPackageCommentTest.java b/test/langtools/tools/doclint/BadPackageCommentTest.java similarity index 100% rename from langtools/test/tools/doclint/BadPackageCommentTest.java rename to test/langtools/tools/doclint/BadPackageCommentTest.java diff --git a/langtools/test/tools/doclint/BadPackageCommentTest.out b/test/langtools/tools/doclint/BadPackageCommentTest.out similarity index 100% rename from langtools/test/tools/doclint/BadPackageCommentTest.out rename to test/langtools/tools/doclint/BadPackageCommentTest.out diff --git a/langtools/test/tools/doclint/CoverageExtras.java b/test/langtools/tools/doclint/CoverageExtras.java similarity index 100% rename from langtools/test/tools/doclint/CoverageExtras.java rename to test/langtools/tools/doclint/CoverageExtras.java diff --git a/langtools/test/tools/doclint/CustomTagTest.java b/test/langtools/tools/doclint/CustomTagTest.java similarity index 100% rename from langtools/test/tools/doclint/CustomTagTest.java rename to test/langtools/tools/doclint/CustomTagTest.java diff --git a/langtools/test/tools/doclint/CustomTagTest.out b/test/langtools/tools/doclint/CustomTagTest.out similarity index 100% rename from langtools/test/tools/doclint/CustomTagTest.out rename to test/langtools/tools/doclint/CustomTagTest.out diff --git a/langtools/test/tools/doclint/CustomTagTestWithOption.out b/test/langtools/tools/doclint/CustomTagTestWithOption.out similarity index 100% rename from langtools/test/tools/doclint/CustomTagTestWithOption.out rename to test/langtools/tools/doclint/CustomTagTestWithOption.out diff --git a/langtools/test/tools/doclint/DocLintTester.java b/test/langtools/tools/doclint/DocLintTester.java similarity index 100% rename from langtools/test/tools/doclint/DocLintTester.java rename to test/langtools/tools/doclint/DocLintTester.java diff --git a/langtools/test/tools/doclint/DuplicateParamTest.java b/test/langtools/tools/doclint/DuplicateParamTest.java similarity index 100% rename from langtools/test/tools/doclint/DuplicateParamTest.java rename to test/langtools/tools/doclint/DuplicateParamTest.java diff --git a/langtools/test/tools/doclint/DuplicateParamTest.out b/test/langtools/tools/doclint/DuplicateParamTest.out similarity index 100% rename from langtools/test/tools/doclint/DuplicateParamTest.out rename to test/langtools/tools/doclint/DuplicateParamTest.out diff --git a/langtools/test/tools/doclint/DuplicateReturnTest.java b/test/langtools/tools/doclint/DuplicateReturnTest.java similarity index 100% rename from langtools/test/tools/doclint/DuplicateReturnTest.java rename to test/langtools/tools/doclint/DuplicateReturnTest.java diff --git a/langtools/test/tools/doclint/DuplicateReturnTest.out b/test/langtools/tools/doclint/DuplicateReturnTest.out similarity index 100% rename from langtools/test/tools/doclint/DuplicateReturnTest.out rename to test/langtools/tools/doclint/DuplicateReturnTest.out diff --git a/langtools/test/tools/doclint/EmptyAuthorTest.java b/test/langtools/tools/doclint/EmptyAuthorTest.java similarity index 100% rename from langtools/test/tools/doclint/EmptyAuthorTest.java rename to test/langtools/tools/doclint/EmptyAuthorTest.java diff --git a/langtools/test/tools/doclint/EmptyAuthorTest.out b/test/langtools/tools/doclint/EmptyAuthorTest.out similarity index 100% rename from langtools/test/tools/doclint/EmptyAuthorTest.out rename to test/langtools/tools/doclint/EmptyAuthorTest.out diff --git a/langtools/test/tools/doclint/EmptyExceptionTest.java b/test/langtools/tools/doclint/EmptyExceptionTest.java similarity index 100% rename from langtools/test/tools/doclint/EmptyExceptionTest.java rename to test/langtools/tools/doclint/EmptyExceptionTest.java diff --git a/langtools/test/tools/doclint/EmptyExceptionTest.out b/test/langtools/tools/doclint/EmptyExceptionTest.out similarity index 100% rename from langtools/test/tools/doclint/EmptyExceptionTest.out rename to test/langtools/tools/doclint/EmptyExceptionTest.out diff --git a/langtools/test/tools/doclint/EmptyParamTest.java b/test/langtools/tools/doclint/EmptyParamTest.java similarity index 100% rename from langtools/test/tools/doclint/EmptyParamTest.java rename to test/langtools/tools/doclint/EmptyParamTest.java diff --git a/langtools/test/tools/doclint/EmptyParamTest.out b/test/langtools/tools/doclint/EmptyParamTest.out similarity index 100% rename from langtools/test/tools/doclint/EmptyParamTest.out rename to test/langtools/tools/doclint/EmptyParamTest.out diff --git a/langtools/test/tools/doclint/EmptyPreTest.java b/test/langtools/tools/doclint/EmptyPreTest.java similarity index 100% rename from langtools/test/tools/doclint/EmptyPreTest.java rename to test/langtools/tools/doclint/EmptyPreTest.java diff --git a/langtools/test/tools/doclint/EmptyReturnTest.java b/test/langtools/tools/doclint/EmptyReturnTest.java similarity index 100% rename from langtools/test/tools/doclint/EmptyReturnTest.java rename to test/langtools/tools/doclint/EmptyReturnTest.java diff --git a/langtools/test/tools/doclint/EmptyReturnTest.out b/test/langtools/tools/doclint/EmptyReturnTest.out similarity index 100% rename from langtools/test/tools/doclint/EmptyReturnTest.out rename to test/langtools/tools/doclint/EmptyReturnTest.out diff --git a/langtools/test/tools/doclint/EmptySerialDataTest.java b/test/langtools/tools/doclint/EmptySerialDataTest.java similarity index 100% rename from langtools/test/tools/doclint/EmptySerialDataTest.java rename to test/langtools/tools/doclint/EmptySerialDataTest.java diff --git a/langtools/test/tools/doclint/EmptySerialDataTest.out b/test/langtools/tools/doclint/EmptySerialDataTest.out similarity index 100% rename from langtools/test/tools/doclint/EmptySerialDataTest.out rename to test/langtools/tools/doclint/EmptySerialDataTest.out diff --git a/langtools/test/tools/doclint/EmptySerialFieldTest.java b/test/langtools/tools/doclint/EmptySerialFieldTest.java similarity index 100% rename from langtools/test/tools/doclint/EmptySerialFieldTest.java rename to test/langtools/tools/doclint/EmptySerialFieldTest.java diff --git a/langtools/test/tools/doclint/EmptySerialFieldTest.out b/test/langtools/tools/doclint/EmptySerialFieldTest.out similarity index 100% rename from langtools/test/tools/doclint/EmptySerialFieldTest.out rename to test/langtools/tools/doclint/EmptySerialFieldTest.out diff --git a/langtools/test/tools/doclint/EmptySinceTest.java b/test/langtools/tools/doclint/EmptySinceTest.java similarity index 100% rename from langtools/test/tools/doclint/EmptySinceTest.java rename to test/langtools/tools/doclint/EmptySinceTest.java diff --git a/langtools/test/tools/doclint/EmptySinceTest.out b/test/langtools/tools/doclint/EmptySinceTest.out similarity index 100% rename from langtools/test/tools/doclint/EmptySinceTest.out rename to test/langtools/tools/doclint/EmptySinceTest.out diff --git a/langtools/test/tools/doclint/EmptyVersionTest.java b/test/langtools/tools/doclint/EmptyVersionTest.java similarity index 100% rename from langtools/test/tools/doclint/EmptyVersionTest.java rename to test/langtools/tools/doclint/EmptyVersionTest.java diff --git a/langtools/test/tools/doclint/EmptyVersionTest.out b/test/langtools/tools/doclint/EmptyVersionTest.out similarity index 100% rename from langtools/test/tools/doclint/EmptyVersionTest.out rename to test/langtools/tools/doclint/EmptyVersionTest.out diff --git a/langtools/test/tools/doclint/EndTagsTest.java b/test/langtools/tools/doclint/EndTagsTest.java similarity index 100% rename from langtools/test/tools/doclint/EndTagsTest.java rename to test/langtools/tools/doclint/EndTagsTest.java diff --git a/langtools/test/tools/doclint/EndTagsTest.out b/test/langtools/tools/doclint/EndTagsTest.out similarity index 100% rename from langtools/test/tools/doclint/EndTagsTest.out rename to test/langtools/tools/doclint/EndTagsTest.out diff --git a/langtools/test/tools/doclint/EndWithIdentifierTest.java b/test/langtools/tools/doclint/EndWithIdentifierTest.java similarity index 100% rename from langtools/test/tools/doclint/EndWithIdentifierTest.java rename to test/langtools/tools/doclint/EndWithIdentifierTest.java diff --git a/langtools/test/tools/doclint/EndWithIdentifierTest.out b/test/langtools/tools/doclint/EndWithIdentifierTest.out similarity index 100% rename from langtools/test/tools/doclint/EndWithIdentifierTest.out rename to test/langtools/tools/doclint/EndWithIdentifierTest.out diff --git a/langtools/test/tools/doclint/HtmlAttrsTest.java b/test/langtools/tools/doclint/HtmlAttrsTest.java similarity index 100% rename from langtools/test/tools/doclint/HtmlAttrsTest.java rename to test/langtools/tools/doclint/HtmlAttrsTest.java diff --git a/langtools/test/tools/doclint/HtmlAttrsTest.out b/test/langtools/tools/doclint/HtmlAttrsTest.out similarity index 100% rename from langtools/test/tools/doclint/HtmlAttrsTest.out rename to test/langtools/tools/doclint/HtmlAttrsTest.out diff --git a/langtools/test/tools/doclint/HtmlTagsTest.java b/test/langtools/tools/doclint/HtmlTagsTest.java similarity index 100% rename from langtools/test/tools/doclint/HtmlTagsTest.java rename to test/langtools/tools/doclint/HtmlTagsTest.java diff --git a/langtools/test/tools/doclint/HtmlTagsTest.out b/test/langtools/tools/doclint/HtmlTagsTest.out similarity index 100% rename from langtools/test/tools/doclint/HtmlTagsTest.out rename to test/langtools/tools/doclint/HtmlTagsTest.out diff --git a/langtools/test/tools/doclint/HtmlVersionTest.java b/test/langtools/tools/doclint/HtmlVersionTest.java similarity index 100% rename from langtools/test/tools/doclint/HtmlVersionTest.java rename to test/langtools/tools/doclint/HtmlVersionTest.java diff --git a/langtools/test/tools/doclint/LiteralTest.java b/test/langtools/tools/doclint/LiteralTest.java similarity index 100% rename from langtools/test/tools/doclint/LiteralTest.java rename to test/langtools/tools/doclint/LiteralTest.java diff --git a/langtools/test/tools/doclint/LiteralTest.out b/test/langtools/tools/doclint/LiteralTest.out similarity index 100% rename from langtools/test/tools/doclint/LiteralTest.out rename to test/langtools/tools/doclint/LiteralTest.out diff --git a/langtools/test/tools/doclint/MissingCommentTest.java b/test/langtools/tools/doclint/MissingCommentTest.java similarity index 100% rename from langtools/test/tools/doclint/MissingCommentTest.java rename to test/langtools/tools/doclint/MissingCommentTest.java diff --git a/langtools/test/tools/doclint/MissingCommentTest.out b/test/langtools/tools/doclint/MissingCommentTest.out similarity index 100% rename from langtools/test/tools/doclint/MissingCommentTest.out rename to test/langtools/tools/doclint/MissingCommentTest.out diff --git a/langtools/test/tools/doclint/MissingParamsTest.java b/test/langtools/tools/doclint/MissingParamsTest.java similarity index 100% rename from langtools/test/tools/doclint/MissingParamsTest.java rename to test/langtools/tools/doclint/MissingParamsTest.java diff --git a/langtools/test/tools/doclint/MissingParamsTest.out b/test/langtools/tools/doclint/MissingParamsTest.out similarity index 100% rename from langtools/test/tools/doclint/MissingParamsTest.out rename to test/langtools/tools/doclint/MissingParamsTest.out diff --git a/langtools/test/tools/doclint/MissingReturnTest.java b/test/langtools/tools/doclint/MissingReturnTest.java similarity index 100% rename from langtools/test/tools/doclint/MissingReturnTest.java rename to test/langtools/tools/doclint/MissingReturnTest.java diff --git a/langtools/test/tools/doclint/MissingReturnTest.out b/test/langtools/tools/doclint/MissingReturnTest.out similarity index 100% rename from langtools/test/tools/doclint/MissingReturnTest.out rename to test/langtools/tools/doclint/MissingReturnTest.out diff --git a/langtools/test/tools/doclint/MissingThrowsTest.java b/test/langtools/tools/doclint/MissingThrowsTest.java similarity index 100% rename from langtools/test/tools/doclint/MissingThrowsTest.java rename to test/langtools/tools/doclint/MissingThrowsTest.java diff --git a/langtools/test/tools/doclint/MissingThrowsTest.out b/test/langtools/tools/doclint/MissingThrowsTest.out similarity index 100% rename from langtools/test/tools/doclint/MissingThrowsTest.out rename to test/langtools/tools/doclint/MissingThrowsTest.out diff --git a/langtools/test/tools/doclint/OptionTest.java b/test/langtools/tools/doclint/OptionTest.java similarity index 100% rename from langtools/test/tools/doclint/OptionTest.java rename to test/langtools/tools/doclint/OptionTest.java diff --git a/langtools/test/tools/doclint/OverridesTest.java b/test/langtools/tools/doclint/OverridesTest.java similarity index 100% rename from langtools/test/tools/doclint/OverridesTest.java rename to test/langtools/tools/doclint/OverridesTest.java diff --git a/langtools/test/tools/doclint/ParaTagTest.java b/test/langtools/tools/doclint/ParaTagTest.java similarity index 100% rename from langtools/test/tools/doclint/ParaTagTest.java rename to test/langtools/tools/doclint/ParaTagTest.java diff --git a/langtools/test/tools/doclint/ProvidesTest.java b/test/langtools/tools/doclint/ProvidesTest.java similarity index 100% rename from langtools/test/tools/doclint/ProvidesTest.java rename to test/langtools/tools/doclint/ProvidesTest.java diff --git a/langtools/test/tools/doclint/ProvidesTest.out b/test/langtools/tools/doclint/ProvidesTest.out similarity index 100% rename from langtools/test/tools/doclint/ProvidesTest.out rename to test/langtools/tools/doclint/ProvidesTest.out diff --git a/langtools/test/tools/doclint/ReferenceTest.java b/test/langtools/tools/doclint/ReferenceTest.java similarity index 100% rename from langtools/test/tools/doclint/ReferenceTest.java rename to test/langtools/tools/doclint/ReferenceTest.java diff --git a/langtools/test/tools/doclint/ReferenceTest.out b/test/langtools/tools/doclint/ReferenceTest.out similarity index 100% rename from langtools/test/tools/doclint/ReferenceTest.out rename to test/langtools/tools/doclint/ReferenceTest.out diff --git a/langtools/test/tools/doclint/ResourceTest.java b/test/langtools/tools/doclint/ResourceTest.java similarity index 100% rename from langtools/test/tools/doclint/ResourceTest.java rename to test/langtools/tools/doclint/ResourceTest.java diff --git a/langtools/test/tools/doclint/RunTest.java b/test/langtools/tools/doclint/RunTest.java similarity index 100% rename from langtools/test/tools/doclint/RunTest.java rename to test/langtools/tools/doclint/RunTest.java diff --git a/langtools/test/tools/doclint/SummaryTest.java b/test/langtools/tools/doclint/SummaryTest.java similarity index 100% rename from langtools/test/tools/doclint/SummaryTest.java rename to test/langtools/tools/doclint/SummaryTest.java diff --git a/langtools/test/tools/doclint/SummaryTest.out b/test/langtools/tools/doclint/SummaryTest.out similarity index 100% rename from langtools/test/tools/doclint/SummaryTest.out rename to test/langtools/tools/doclint/SummaryTest.out diff --git a/langtools/test/tools/doclint/SyntaxTest.java b/test/langtools/tools/doclint/SyntaxTest.java similarity index 100% rename from langtools/test/tools/doclint/SyntaxTest.java rename to test/langtools/tools/doclint/SyntaxTest.java diff --git a/langtools/test/tools/doclint/SyntaxTest.out b/test/langtools/tools/doclint/SyntaxTest.out similarity index 100% rename from langtools/test/tools/doclint/SyntaxTest.out rename to test/langtools/tools/doclint/SyntaxTest.out diff --git a/langtools/test/tools/doclint/SyntheticTest.java b/test/langtools/tools/doclint/SyntheticTest.java similarity index 100% rename from langtools/test/tools/doclint/SyntheticTest.java rename to test/langtools/tools/doclint/SyntheticTest.java diff --git a/langtools/test/tools/doclint/UnfinishedInlineTagTest.java b/test/langtools/tools/doclint/UnfinishedInlineTagTest.java similarity index 100% rename from langtools/test/tools/doclint/UnfinishedInlineTagTest.java rename to test/langtools/tools/doclint/UnfinishedInlineTagTest.java diff --git a/langtools/test/tools/doclint/UnfinishedInlineTagTest.out b/test/langtools/tools/doclint/UnfinishedInlineTagTest.out similarity index 100% rename from langtools/test/tools/doclint/UnfinishedInlineTagTest.out rename to test/langtools/tools/doclint/UnfinishedInlineTagTest.out diff --git a/langtools/test/tools/doclint/UsesTest.java b/test/langtools/tools/doclint/UsesTest.java similarity index 100% rename from langtools/test/tools/doclint/UsesTest.java rename to test/langtools/tools/doclint/UsesTest.java diff --git a/langtools/test/tools/doclint/UsesTest.out b/test/langtools/tools/doclint/UsesTest.out similarity index 100% rename from langtools/test/tools/doclint/UsesTest.out rename to test/langtools/tools/doclint/UsesTest.out diff --git a/langtools/test/tools/doclint/ValidTest.java b/test/langtools/tools/doclint/ValidTest.java similarity index 100% rename from langtools/test/tools/doclint/ValidTest.java rename to test/langtools/tools/doclint/ValidTest.java diff --git a/langtools/test/tools/doclint/ValueTest.java b/test/langtools/tools/doclint/ValueTest.java similarity index 100% rename from langtools/test/tools/doclint/ValueTest.java rename to test/langtools/tools/doclint/ValueTest.java diff --git a/langtools/test/tools/doclint/ValueTest.out b/test/langtools/tools/doclint/ValueTest.out similarity index 100% rename from langtools/test/tools/doclint/ValueTest.out rename to test/langtools/tools/doclint/ValueTest.out diff --git a/langtools/test/tools/doclint/anchorTests/p/Test.java b/test/langtools/tools/doclint/anchorTests/p/Test.java similarity index 100% rename from langtools/test/tools/doclint/anchorTests/p/Test.java rename to test/langtools/tools/doclint/anchorTests/p/Test.java diff --git a/langtools/test/tools/doclint/anchorTests/p/Test.javac.out b/test/langtools/tools/doclint/anchorTests/p/Test.javac.out similarity index 100% rename from langtools/test/tools/doclint/anchorTests/p/Test.javac.out rename to test/langtools/tools/doclint/anchorTests/p/Test.javac.out diff --git a/langtools/test/tools/doclint/anchorTests/p/Test.out b/test/langtools/tools/doclint/anchorTests/p/Test.out similarity index 100% rename from langtools/test/tools/doclint/anchorTests/p/Test.out rename to test/langtools/tools/doclint/anchorTests/p/Test.out diff --git a/langtools/test/tools/doclint/anchorTests/p/package-info.java b/test/langtools/tools/doclint/anchorTests/p/package-info.java similarity index 100% rename from langtools/test/tools/doclint/anchorTests/p/package-info.java rename to test/langtools/tools/doclint/anchorTests/p/package-info.java diff --git a/langtools/test/tools/doclint/anchorTests/p/package-info.javac.out b/test/langtools/tools/doclint/anchorTests/p/package-info.javac.out similarity index 100% rename from langtools/test/tools/doclint/anchorTests/p/package-info.javac.out rename to test/langtools/tools/doclint/anchorTests/p/package-info.javac.out diff --git a/langtools/test/tools/doclint/anchorTests/p/package-info.out b/test/langtools/tools/doclint/anchorTests/p/package-info.out similarity index 100% rename from langtools/test/tools/doclint/anchorTests/p/package-info.out rename to test/langtools/tools/doclint/anchorTests/p/package-info.out diff --git a/langtools/test/tools/doclint/html/BlockTagsTest.java b/test/langtools/tools/doclint/html/BlockTagsTest.java similarity index 100% rename from langtools/test/tools/doclint/html/BlockTagsTest.java rename to test/langtools/tools/doclint/html/BlockTagsTest.java diff --git a/langtools/test/tools/doclint/html/EntitiesTest.java b/test/langtools/tools/doclint/html/EntitiesTest.java similarity index 100% rename from langtools/test/tools/doclint/html/EntitiesTest.java rename to test/langtools/tools/doclint/html/EntitiesTest.java diff --git a/langtools/test/tools/doclint/html/EntitiesTest.out b/test/langtools/tools/doclint/html/EntitiesTest.out similarity index 100% rename from langtools/test/tools/doclint/html/EntitiesTest.out rename to test/langtools/tools/doclint/html/EntitiesTest.out diff --git a/langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTest.java b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.java similarity index 100% rename from langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTest.java rename to test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.java diff --git a/langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out similarity index 100% rename from langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out rename to test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out diff --git a/langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml5.out b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTestHtml5.out similarity index 100% rename from langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml5.out rename to test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTestHtml5.out diff --git a/langtools/test/tools/doclint/html/InlineTagsTest.java b/test/langtools/tools/doclint/html/InlineTagsTest.java similarity index 100% rename from langtools/test/tools/doclint/html/InlineTagsTest.java rename to test/langtools/tools/doclint/html/InlineTagsTest.java diff --git a/langtools/test/tools/doclint/html/ListTagsTest.java b/test/langtools/tools/doclint/html/ListTagsTest.java similarity index 100% rename from langtools/test/tools/doclint/html/ListTagsTest.java rename to test/langtools/tools/doclint/html/ListTagsTest.java diff --git a/langtools/test/tools/doclint/html/ListTagsTest.out b/test/langtools/tools/doclint/html/ListTagsTest.out similarity index 100% rename from langtools/test/tools/doclint/html/ListTagsTest.out rename to test/langtools/tools/doclint/html/ListTagsTest.out diff --git a/langtools/test/tools/doclint/html/OtherTagsTest.java b/test/langtools/tools/doclint/html/OtherTagsTest.java similarity index 100% rename from langtools/test/tools/doclint/html/OtherTagsTest.java rename to test/langtools/tools/doclint/html/OtherTagsTest.java diff --git a/langtools/test/tools/doclint/html/OtherTagsTest.out b/test/langtools/tools/doclint/html/OtherTagsTest.out similarity index 100% rename from langtools/test/tools/doclint/html/OtherTagsTest.out rename to test/langtools/tools/doclint/html/OtherTagsTest.out diff --git a/langtools/test/tools/doclint/html/TableTagsTest.java b/test/langtools/tools/doclint/html/TableTagsTest.java similarity index 100% rename from langtools/test/tools/doclint/html/TableTagsTest.java rename to test/langtools/tools/doclint/html/TableTagsTest.java diff --git a/langtools/test/tools/doclint/html/TagNotAllowed.java b/test/langtools/tools/doclint/html/TagNotAllowed.java similarity index 100% rename from langtools/test/tools/doclint/html/TagNotAllowed.java rename to test/langtools/tools/doclint/html/TagNotAllowed.java diff --git a/langtools/test/tools/doclint/html/TagNotAllowed.out b/test/langtools/tools/doclint/html/TagNotAllowed.out similarity index 100% rename from langtools/test/tools/doclint/html/TagNotAllowed.out rename to test/langtools/tools/doclint/html/TagNotAllowed.out diff --git a/langtools/test/tools/doclint/html/TextNotAllowed.java b/test/langtools/tools/doclint/html/TextNotAllowed.java similarity index 100% rename from langtools/test/tools/doclint/html/TextNotAllowed.java rename to test/langtools/tools/doclint/html/TextNotAllowed.java diff --git a/langtools/test/tools/doclint/html/TextNotAllowed.out b/test/langtools/tools/doclint/html/TextNotAllowed.out similarity index 100% rename from langtools/test/tools/doclint/html/TextNotAllowed.out rename to test/langtools/tools/doclint/html/TextNotAllowed.out diff --git a/langtools/test/tools/doclint/moduleTests/bad/module-info.java b/test/langtools/tools/doclint/moduleTests/bad/module-info.java similarity index 100% rename from langtools/test/tools/doclint/moduleTests/bad/module-info.java rename to test/langtools/tools/doclint/moduleTests/bad/module-info.java diff --git a/langtools/test/tools/doclint/moduleTests/bad/module-info.javac.out b/test/langtools/tools/doclint/moduleTests/bad/module-info.javac.out similarity index 100% rename from langtools/test/tools/doclint/moduleTests/bad/module-info.javac.out rename to test/langtools/tools/doclint/moduleTests/bad/module-info.javac.out diff --git a/langtools/test/tools/doclint/moduleTests/bad/module-info.out b/test/langtools/tools/doclint/moduleTests/bad/module-info.out similarity index 100% rename from langtools/test/tools/doclint/moduleTests/bad/module-info.out rename to test/langtools/tools/doclint/moduleTests/bad/module-info.out diff --git a/langtools/test/tools/doclint/moduleTests/good/module-info.java b/test/langtools/tools/doclint/moduleTests/good/module-info.java similarity index 100% rename from langtools/test/tools/doclint/moduleTests/good/module-info.java rename to test/langtools/tools/doclint/moduleTests/good/module-info.java diff --git a/langtools/test/tools/doclint/packageTests/bad/Test.java b/test/langtools/tools/doclint/packageTests/bad/Test.java similarity index 100% rename from langtools/test/tools/doclint/packageTests/bad/Test.java rename to test/langtools/tools/doclint/packageTests/bad/Test.java diff --git a/langtools/test/tools/doclint/packageTests/bad/Test.javac.out b/test/langtools/tools/doclint/packageTests/bad/Test.javac.out similarity index 100% rename from langtools/test/tools/doclint/packageTests/bad/Test.javac.out rename to test/langtools/tools/doclint/packageTests/bad/Test.javac.out diff --git a/langtools/test/tools/doclint/packageTests/bad/Test.out b/test/langtools/tools/doclint/packageTests/bad/Test.out similarity index 100% rename from langtools/test/tools/doclint/packageTests/bad/Test.out rename to test/langtools/tools/doclint/packageTests/bad/Test.out diff --git a/langtools/test/tools/doclint/packageTests/bad/package-info.java b/test/langtools/tools/doclint/packageTests/bad/package-info.java similarity index 100% rename from langtools/test/tools/doclint/packageTests/bad/package-info.java rename to test/langtools/tools/doclint/packageTests/bad/package-info.java diff --git a/langtools/test/tools/doclint/packageTests/bad/package-info.javac.out b/test/langtools/tools/doclint/packageTests/bad/package-info.javac.out similarity index 100% rename from langtools/test/tools/doclint/packageTests/bad/package-info.javac.out rename to test/langtools/tools/doclint/packageTests/bad/package-info.javac.out diff --git a/langtools/test/tools/doclint/packageTests/bad/package-info.out b/test/langtools/tools/doclint/packageTests/bad/package-info.out similarity index 100% rename from langtools/test/tools/doclint/packageTests/bad/package-info.out rename to test/langtools/tools/doclint/packageTests/bad/package-info.out diff --git a/langtools/test/tools/doclint/packageTests/good/Test.java b/test/langtools/tools/doclint/packageTests/good/Test.java similarity index 100% rename from langtools/test/tools/doclint/packageTests/good/Test.java rename to test/langtools/tools/doclint/packageTests/good/Test.java diff --git a/langtools/test/tools/doclint/packageTests/good/package-info.java b/test/langtools/tools/doclint/packageTests/good/package-info.java similarity index 100% rename from langtools/test/tools/doclint/packageTests/good/package-info.java rename to test/langtools/tools/doclint/packageTests/good/package-info.java diff --git a/langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.java b/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.java similarity index 100% rename from langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.java rename to test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.java diff --git a/langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.out b/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.out similarity index 100% rename from langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.out rename to test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.out diff --git a/langtools/test/tools/doclint/tidy/BadEnd.java b/test/langtools/tools/doclint/tidy/BadEnd.java similarity index 100% rename from langtools/test/tools/doclint/tidy/BadEnd.java rename to test/langtools/tools/doclint/tidy/BadEnd.java diff --git a/langtools/test/tools/doclint/tidy/BadEnd.out b/test/langtools/tools/doclint/tidy/BadEnd.out similarity index 100% rename from langtools/test/tools/doclint/tidy/BadEnd.out rename to test/langtools/tools/doclint/tidy/BadEnd.out diff --git a/langtools/test/tools/doclint/tidy/InsertImplicit.java b/test/langtools/tools/doclint/tidy/InsertImplicit.java similarity index 100% rename from langtools/test/tools/doclint/tidy/InsertImplicit.java rename to test/langtools/tools/doclint/tidy/InsertImplicit.java diff --git a/langtools/test/tools/doclint/tidy/InsertImplicit.out b/test/langtools/tools/doclint/tidy/InsertImplicit.out similarity index 100% rename from langtools/test/tools/doclint/tidy/InsertImplicit.out rename to test/langtools/tools/doclint/tidy/InsertImplicit.out diff --git a/langtools/test/tools/doclint/tidy/InvalidEntity.java b/test/langtools/tools/doclint/tidy/InvalidEntity.java similarity index 100% rename from langtools/test/tools/doclint/tidy/InvalidEntity.java rename to test/langtools/tools/doclint/tidy/InvalidEntity.java diff --git a/langtools/test/tools/doclint/tidy/InvalidEntity.out b/test/langtools/tools/doclint/tidy/InvalidEntity.out similarity index 100% rename from langtools/test/tools/doclint/tidy/InvalidEntity.out rename to test/langtools/tools/doclint/tidy/InvalidEntity.out diff --git a/langtools/test/tools/doclint/tidy/InvalidName.java b/test/langtools/tools/doclint/tidy/InvalidName.java similarity index 100% rename from langtools/test/tools/doclint/tidy/InvalidName.java rename to test/langtools/tools/doclint/tidy/InvalidName.java diff --git a/langtools/test/tools/doclint/tidy/InvalidName.out b/test/langtools/tools/doclint/tidy/InvalidName.out similarity index 100% rename from langtools/test/tools/doclint/tidy/InvalidName.out rename to test/langtools/tools/doclint/tidy/InvalidName.out diff --git a/langtools/test/tools/doclint/tidy/InvalidTag.java b/test/langtools/tools/doclint/tidy/InvalidTag.java similarity index 100% rename from langtools/test/tools/doclint/tidy/InvalidTag.java rename to test/langtools/tools/doclint/tidy/InvalidTag.java diff --git a/langtools/test/tools/doclint/tidy/InvalidTag.out b/test/langtools/tools/doclint/tidy/InvalidTag.out similarity index 100% rename from langtools/test/tools/doclint/tidy/InvalidTag.out rename to test/langtools/tools/doclint/tidy/InvalidTag.out diff --git a/langtools/test/tools/doclint/tidy/InvalidURI.java b/test/langtools/tools/doclint/tidy/InvalidURI.java similarity index 100% rename from langtools/test/tools/doclint/tidy/InvalidURI.java rename to test/langtools/tools/doclint/tidy/InvalidURI.java diff --git a/langtools/test/tools/doclint/tidy/InvalidURI.out b/test/langtools/tools/doclint/tidy/InvalidURI.out similarity index 100% rename from langtools/test/tools/doclint/tidy/InvalidURI.out rename to test/langtools/tools/doclint/tidy/InvalidURI.out diff --git a/langtools/test/tools/doclint/tidy/MissingGT.java b/test/langtools/tools/doclint/tidy/MissingGT.java similarity index 100% rename from langtools/test/tools/doclint/tidy/MissingGT.java rename to test/langtools/tools/doclint/tidy/MissingGT.java diff --git a/langtools/test/tools/doclint/tidy/MissingGT.out b/test/langtools/tools/doclint/tidy/MissingGT.out similarity index 100% rename from langtools/test/tools/doclint/tidy/MissingGT.out rename to test/langtools/tools/doclint/tidy/MissingGT.out diff --git a/langtools/test/tools/doclint/tidy/MissingTag.java b/test/langtools/tools/doclint/tidy/MissingTag.java similarity index 100% rename from langtools/test/tools/doclint/tidy/MissingTag.java rename to test/langtools/tools/doclint/tidy/MissingTag.java diff --git a/langtools/test/tools/doclint/tidy/MissingTag.out b/test/langtools/tools/doclint/tidy/MissingTag.out similarity index 100% rename from langtools/test/tools/doclint/tidy/MissingTag.out rename to test/langtools/tools/doclint/tidy/MissingTag.out diff --git a/langtools/test/tools/doclint/tidy/NestedTag.java b/test/langtools/tools/doclint/tidy/NestedTag.java similarity index 100% rename from langtools/test/tools/doclint/tidy/NestedTag.java rename to test/langtools/tools/doclint/tidy/NestedTag.java diff --git a/langtools/test/tools/doclint/tidy/NestedTag.out b/test/langtools/tools/doclint/tidy/NestedTag.out similarity index 100% rename from langtools/test/tools/doclint/tidy/NestedTag.out rename to test/langtools/tools/doclint/tidy/NestedTag.out diff --git a/langtools/test/tools/doclint/tidy/ParaInPre.java b/test/langtools/tools/doclint/tidy/ParaInPre.java similarity index 100% rename from langtools/test/tools/doclint/tidy/ParaInPre.java rename to test/langtools/tools/doclint/tidy/ParaInPre.java diff --git a/langtools/test/tools/doclint/tidy/ParaInPre.out b/test/langtools/tools/doclint/tidy/ParaInPre.out similarity index 100% rename from langtools/test/tools/doclint/tidy/ParaInPre.out rename to test/langtools/tools/doclint/tidy/ParaInPre.out diff --git a/langtools/test/tools/doclint/tidy/README.txt b/test/langtools/tools/doclint/tidy/README.txt similarity index 100% rename from langtools/test/tools/doclint/tidy/README.txt rename to test/langtools/tools/doclint/tidy/README.txt diff --git a/langtools/test/tools/doclint/tidy/RepeatedAttr.java b/test/langtools/tools/doclint/tidy/RepeatedAttr.java similarity index 100% rename from langtools/test/tools/doclint/tidy/RepeatedAttr.java rename to test/langtools/tools/doclint/tidy/RepeatedAttr.java diff --git a/langtools/test/tools/doclint/tidy/RepeatedAttr.out b/test/langtools/tools/doclint/tidy/RepeatedAttr.out similarity index 100% rename from langtools/test/tools/doclint/tidy/RepeatedAttr.out rename to test/langtools/tools/doclint/tidy/RepeatedAttr.out diff --git a/langtools/test/tools/doclint/tidy/TextNotAllowed.java b/test/langtools/tools/doclint/tidy/TextNotAllowed.java similarity index 100% rename from langtools/test/tools/doclint/tidy/TextNotAllowed.java rename to test/langtools/tools/doclint/tidy/TextNotAllowed.java diff --git a/langtools/test/tools/doclint/tidy/TextNotAllowed.out b/test/langtools/tools/doclint/tidy/TextNotAllowed.out similarity index 100% rename from langtools/test/tools/doclint/tidy/TextNotAllowed.out rename to test/langtools/tools/doclint/tidy/TextNotAllowed.out diff --git a/langtools/test/tools/doclint/tidy/TrimmingEmptyTag.java b/test/langtools/tools/doclint/tidy/TrimmingEmptyTag.java similarity index 100% rename from langtools/test/tools/doclint/tidy/TrimmingEmptyTag.java rename to test/langtools/tools/doclint/tidy/TrimmingEmptyTag.java diff --git a/langtools/test/tools/doclint/tidy/TrimmingEmptyTag.out b/test/langtools/tools/doclint/tidy/TrimmingEmptyTag.out similarity index 100% rename from langtools/test/tools/doclint/tidy/TrimmingEmptyTag.out rename to test/langtools/tools/doclint/tidy/TrimmingEmptyTag.out diff --git a/langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.java b/test/langtools/tools/doclint/tidy/UnescapedOrUnknownEntity.java similarity index 100% rename from langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.java rename to test/langtools/tools/doclint/tidy/UnescapedOrUnknownEntity.java diff --git a/langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.out b/test/langtools/tools/doclint/tidy/UnescapedOrUnknownEntity.out similarity index 100% rename from langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.out rename to test/langtools/tools/doclint/tidy/UnescapedOrUnknownEntity.out diff --git a/langtools/test/tools/doclint/tidy/util/Main.java b/test/langtools/tools/doclint/tidy/util/Main.java similarity index 100% rename from langtools/test/tools/doclint/tidy/util/Main.java rename to test/langtools/tools/doclint/tidy/util/Main.java diff --git a/langtools/test/tools/doclint/tidy/util/tidy.sh b/test/langtools/tools/doclint/tidy/util/tidy.sh similarity index 100% rename from langtools/test/tools/doclint/tidy/util/tidy.sh rename to test/langtools/tools/doclint/tidy/util/tidy.sh diff --git a/langtools/test/tools/doclint/tool/HelpTest.java b/test/langtools/tools/doclint/tool/HelpTest.java similarity index 100% rename from langtools/test/tools/doclint/tool/HelpTest.java rename to test/langtools/tools/doclint/tool/HelpTest.java diff --git a/langtools/test/tools/doclint/tool/HelpTest.out b/test/langtools/tools/doclint/tool/HelpTest.out similarity index 100% rename from langtools/test/tools/doclint/tool/HelpTest.out rename to test/langtools/tools/doclint/tool/HelpTest.out diff --git a/langtools/test/tools/doclint/tool/MaxDiagsTest.java b/test/langtools/tools/doclint/tool/MaxDiagsTest.java similarity index 100% rename from langtools/test/tools/doclint/tool/MaxDiagsTest.java rename to test/langtools/tools/doclint/tool/MaxDiagsTest.java diff --git a/langtools/test/tools/doclint/tool/MaxDiagsTest.out b/test/langtools/tools/doclint/tool/MaxDiagsTest.out similarity index 100% rename from langtools/test/tools/doclint/tool/MaxDiagsTest.out rename to test/langtools/tools/doclint/tool/MaxDiagsTest.out diff --git a/langtools/test/tools/doclint/tool/PathsTest.java b/test/langtools/tools/doclint/tool/PathsTest.java similarity index 100% rename from langtools/test/tools/doclint/tool/PathsTest.java rename to test/langtools/tools/doclint/tool/PathsTest.java diff --git a/langtools/test/tools/doclint/tool/RunTest.java b/test/langtools/tools/doclint/tool/RunTest.java similarity index 100% rename from langtools/test/tools/doclint/tool/RunTest.java rename to test/langtools/tools/doclint/tool/RunTest.java diff --git a/langtools/test/tools/doclint/tool/StatsTest.java b/test/langtools/tools/doclint/tool/StatsTest.java similarity index 100% rename from langtools/test/tools/doclint/tool/StatsTest.java rename to test/langtools/tools/doclint/tool/StatsTest.java diff --git a/langtools/test/tools/doclint/tool/StatsTest.out b/test/langtools/tools/doclint/tool/StatsTest.out similarity index 100% rename from langtools/test/tools/doclint/tool/StatsTest.out rename to test/langtools/tools/doclint/tool/StatsTest.out diff --git a/langtools/test/tools/javac/4241573/T4241573.java b/test/langtools/tools/javac/4241573/T4241573.java similarity index 100% rename from langtools/test/tools/javac/4241573/T4241573.java rename to test/langtools/tools/javac/4241573/T4241573.java diff --git a/langtools/test/tools/javac/4846262/CheckEBCDICLocaleTest.java b/test/langtools/tools/javac/4846262/CheckEBCDICLocaleTest.java similarity index 100% rename from langtools/test/tools/javac/4846262/CheckEBCDICLocaleTest.java rename to test/langtools/tools/javac/4846262/CheckEBCDICLocaleTest.java diff --git a/langtools/test/tools/javac/4846262/Native2Ascii.java b/test/langtools/tools/javac/4846262/Native2Ascii.java similarity index 100% rename from langtools/test/tools/javac/4846262/Native2Ascii.java rename to test/langtools/tools/javac/4846262/Native2Ascii.java diff --git a/langtools/test/tools/javac/4880220/T4880220.empty.out b/test/langtools/tools/javac/4880220/T4880220.empty.out similarity index 100% rename from langtools/test/tools/javac/4880220/T4880220.empty.out rename to test/langtools/tools/javac/4880220/T4880220.empty.out diff --git a/langtools/test/tools/javac/4880220/T4880220.error.out b/test/langtools/tools/javac/4880220/T4880220.error.out similarity index 100% rename from langtools/test/tools/javac/4880220/T4880220.error.out rename to test/langtools/tools/javac/4880220/T4880220.error.out diff --git a/langtools/test/tools/javac/4880220/T4880220.java b/test/langtools/tools/javac/4880220/T4880220.java similarity index 100% rename from langtools/test/tools/javac/4880220/T4880220.java rename to test/langtools/tools/javac/4880220/T4880220.java diff --git a/langtools/test/tools/javac/4880220/T4880220.warn.out b/test/langtools/tools/javac/4880220/T4880220.warn.out similarity index 100% rename from langtools/test/tools/javac/4880220/T4880220.warn.out rename to test/langtools/tools/javac/4880220/T4880220.warn.out diff --git a/langtools/test/tools/javac/4917091/Test255.java b/test/langtools/tools/javac/4917091/Test255.java similarity index 100% rename from langtools/test/tools/javac/4917091/Test255.java rename to test/langtools/tools/javac/4917091/Test255.java diff --git a/langtools/test/tools/javac/4917091/Test256a.java b/test/langtools/tools/javac/4917091/Test256a.java similarity index 100% rename from langtools/test/tools/javac/4917091/Test256a.java rename to test/langtools/tools/javac/4917091/Test256a.java diff --git a/langtools/test/tools/javac/4917091/Test256a.out b/test/langtools/tools/javac/4917091/Test256a.out similarity index 100% rename from langtools/test/tools/javac/4917091/Test256a.out rename to test/langtools/tools/javac/4917091/Test256a.out diff --git a/langtools/test/tools/javac/4917091/Test256b.java b/test/langtools/tools/javac/4917091/Test256b.java similarity index 100% rename from langtools/test/tools/javac/4917091/Test256b.java rename to test/langtools/tools/javac/4917091/Test256b.java diff --git a/langtools/test/tools/javac/4917091/Test256b.out b/test/langtools/tools/javac/4917091/Test256b.out similarity index 100% rename from langtools/test/tools/javac/4917091/Test256b.out rename to test/langtools/tools/javac/4917091/Test256b.out diff --git a/langtools/test/tools/javac/4980495/static/Test.java b/test/langtools/tools/javac/4980495/static/Test.java similarity index 100% rename from langtools/test/tools/javac/4980495/static/Test.java rename to test/langtools/tools/javac/4980495/static/Test.java diff --git a/langtools/test/tools/javac/4980495/static/Test.out b/test/langtools/tools/javac/4980495/static/Test.out similarity index 100% rename from langtools/test/tools/javac/4980495/static/Test.out rename to test/langtools/tools/javac/4980495/static/Test.out diff --git a/langtools/test/tools/javac/4980495/static/p1/A1.java b/test/langtools/tools/javac/4980495/static/p1/A1.java similarity index 100% rename from langtools/test/tools/javac/4980495/static/p1/A1.java rename to test/langtools/tools/javac/4980495/static/p1/A1.java diff --git a/langtools/test/tools/javac/4980495/static/p2/A2.java b/test/langtools/tools/javac/4980495/static/p2/A2.java similarity index 100% rename from langtools/test/tools/javac/4980495/static/p2/A2.java rename to test/langtools/tools/javac/4980495/static/p2/A2.java diff --git a/langtools/test/tools/javac/4980495/std/NonStatic2StaticImportClash.java b/test/langtools/tools/javac/4980495/std/NonStatic2StaticImportClash.java similarity index 100% rename from langtools/test/tools/javac/4980495/std/NonStatic2StaticImportClash.java rename to test/langtools/tools/javac/4980495/std/NonStatic2StaticImportClash.java diff --git a/langtools/test/tools/javac/4980495/std/NonStatic2StaticImportClash.out b/test/langtools/tools/javac/4980495/std/NonStatic2StaticImportClash.out similarity index 100% rename from langtools/test/tools/javac/4980495/std/NonStatic2StaticImportClash.out rename to test/langtools/tools/javac/4980495/std/NonStatic2StaticImportClash.out diff --git a/langtools/test/tools/javac/4980495/std/Static2NonStaticImportClash.java b/test/langtools/tools/javac/4980495/std/Static2NonStaticImportClash.java similarity index 100% rename from langtools/test/tools/javac/4980495/std/Static2NonStaticImportClash.java rename to test/langtools/tools/javac/4980495/std/Static2NonStaticImportClash.java diff --git a/langtools/test/tools/javac/4980495/std/Static2NonStaticImportClash.out b/test/langtools/tools/javac/4980495/std/Static2NonStaticImportClash.out similarity index 100% rename from langtools/test/tools/javac/4980495/std/Static2NonStaticImportClash.out rename to test/langtools/tools/javac/4980495/std/Static2NonStaticImportClash.out diff --git a/langtools/test/tools/javac/4980495/std/Test.java b/test/langtools/tools/javac/4980495/std/Test.java similarity index 100% rename from langtools/test/tools/javac/4980495/std/Test.java rename to test/langtools/tools/javac/4980495/std/Test.java diff --git a/langtools/test/tools/javac/4980495/std/Test.out b/test/langtools/tools/javac/4980495/std/Test.out similarity index 100% rename from langtools/test/tools/javac/4980495/std/Test.out rename to test/langtools/tools/javac/4980495/std/Test.out diff --git a/langtools/test/tools/javac/4980495/std/p1/A1.java b/test/langtools/tools/javac/4980495/std/p1/A1.java similarity index 100% rename from langtools/test/tools/javac/4980495/std/p1/A1.java rename to test/langtools/tools/javac/4980495/std/p1/A1.java diff --git a/langtools/test/tools/javac/4980495/std/p2/A2.java b/test/langtools/tools/javac/4980495/std/p2/A2.java similarity index 100% rename from langtools/test/tools/javac/4980495/std/p2/A2.java rename to test/langtools/tools/javac/4980495/std/p2/A2.java diff --git a/langtools/test/tools/javac/5017953/T5017953.java b/test/langtools/tools/javac/5017953/T5017953.java similarity index 100% rename from langtools/test/tools/javac/5017953/T5017953.java rename to test/langtools/tools/javac/5017953/T5017953.java diff --git a/langtools/test/tools/javac/5017953/T5017953.out b/test/langtools/tools/javac/5017953/T5017953.out similarity index 100% rename from langtools/test/tools/javac/5017953/T5017953.out rename to test/langtools/tools/javac/5017953/T5017953.out diff --git a/langtools/test/tools/javac/5045412/Bar.java b/test/langtools/tools/javac/5045412/Bar.java similarity index 100% rename from langtools/test/tools/javac/5045412/Bar.java rename to test/langtools/tools/javac/5045412/Bar.java diff --git a/langtools/test/tools/javac/5045412/Foo.java b/test/langtools/tools/javac/5045412/Foo.java similarity index 100% rename from langtools/test/tools/javac/5045412/Foo.java rename to test/langtools/tools/javac/5045412/Foo.java diff --git a/langtools/test/tools/javac/6199662/Tree.java b/test/langtools/tools/javac/6199662/Tree.java similarity index 100% rename from langtools/test/tools/javac/6199662/Tree.java rename to test/langtools/tools/javac/6199662/Tree.java diff --git a/langtools/test/tools/javac/6199662/TreeInfo.java b/test/langtools/tools/javac/6199662/TreeInfo.java similarity index 100% rename from langtools/test/tools/javac/6199662/TreeInfo.java rename to test/langtools/tools/javac/6199662/TreeInfo.java diff --git a/langtools/test/tools/javac/6199662/TreeScanner.java b/test/langtools/tools/javac/6199662/TreeScanner.java similarity index 100% rename from langtools/test/tools/javac/6199662/TreeScanner.java rename to test/langtools/tools/javac/6199662/TreeScanner.java diff --git a/langtools/test/tools/javac/6257443/T6257443.java b/test/langtools/tools/javac/6257443/T6257443.java similarity index 100% rename from langtools/test/tools/javac/6257443/T6257443.java rename to test/langtools/tools/javac/6257443/T6257443.java diff --git a/langtools/test/tools/javac/6257443/package-info.java b/test/langtools/tools/javac/6257443/package-info.java similarity index 100% rename from langtools/test/tools/javac/6257443/package-info.java rename to test/langtools/tools/javac/6257443/package-info.java diff --git a/langtools/test/tools/javac/6302184/HiddenOptionsShouldUseGivenEncodingTest.java b/test/langtools/tools/javac/6302184/HiddenOptionsShouldUseGivenEncodingTest.java similarity index 100% rename from langtools/test/tools/javac/6302184/HiddenOptionsShouldUseGivenEncodingTest.java rename to test/langtools/tools/javac/6302184/HiddenOptionsShouldUseGivenEncodingTest.java diff --git a/langtools/test/tools/javac/6302184/T6302184.java b/test/langtools/tools/javac/6302184/T6302184.java similarity index 100% rename from langtools/test/tools/javac/6302184/T6302184.java rename to test/langtools/tools/javac/6302184/T6302184.java diff --git a/langtools/test/tools/javac/6302184/T6302184.out b/test/langtools/tools/javac/6302184/T6302184.out similarity index 100% rename from langtools/test/tools/javac/6302184/T6302184.out rename to test/langtools/tools/javac/6302184/T6302184.out diff --git a/langtools/test/tools/javac/6304921/T6304921.java b/test/langtools/tools/javac/6304921/T6304921.java similarity index 100% rename from langtools/test/tools/javac/6304921/T6304921.java rename to test/langtools/tools/javac/6304921/T6304921.java diff --git a/langtools/test/tools/javac/6304921/T6304921.out b/test/langtools/tools/javac/6304921/T6304921.out similarity index 100% rename from langtools/test/tools/javac/6304921/T6304921.out rename to test/langtools/tools/javac/6304921/T6304921.out diff --git a/langtools/test/tools/javac/6304921/TestLog.java b/test/langtools/tools/javac/6304921/TestLog.java similarity index 100% rename from langtools/test/tools/javac/6304921/TestLog.java rename to test/langtools/tools/javac/6304921/TestLog.java diff --git a/langtools/test/tools/javac/6330920/T6330920.java b/test/langtools/tools/javac/6330920/T6330920.java similarity index 100% rename from langtools/test/tools/javac/6330920/T6330920.java rename to test/langtools/tools/javac/6330920/T6330920.java diff --git a/langtools/test/tools/javac/6330920/T6330920.out b/test/langtools/tools/javac/6330920/T6330920.out similarity index 100% rename from langtools/test/tools/javac/6330920/T6330920.out rename to test/langtools/tools/javac/6330920/T6330920.out diff --git a/langtools/test/tools/javac/6330997/T1.java b/test/langtools/tools/javac/6330997/T1.java similarity index 100% rename from langtools/test/tools/javac/6330997/T1.java rename to test/langtools/tools/javac/6330997/T1.java diff --git a/langtools/test/tools/javac/6330997/T2.java b/test/langtools/tools/javac/6330997/T2.java similarity index 100% rename from langtools/test/tools/javac/6330997/T2.java rename to test/langtools/tools/javac/6330997/T2.java diff --git a/langtools/test/tools/javac/6330997/T6330997.java b/test/langtools/tools/javac/6330997/T6330997.java similarity index 100% rename from langtools/test/tools/javac/6330997/T6330997.java rename to test/langtools/tools/javac/6330997/T6330997.java diff --git a/langtools/test/tools/javac/6341866/A.java b/test/langtools/tools/javac/6341866/A.java similarity index 100% rename from langtools/test/tools/javac/6341866/A.java rename to test/langtools/tools/javac/6341866/A.java diff --git a/langtools/test/tools/javac/6341866/Anno.java b/test/langtools/tools/javac/6341866/Anno.java similarity index 100% rename from langtools/test/tools/javac/6341866/Anno.java rename to test/langtools/tools/javac/6341866/Anno.java diff --git a/langtools/test/tools/javac/6341866/B.java b/test/langtools/tools/javac/6341866/B.java similarity index 100% rename from langtools/test/tools/javac/6341866/B.java rename to test/langtools/tools/javac/6341866/B.java diff --git a/langtools/test/tools/javac/6341866/T6341866.java b/test/langtools/tools/javac/6341866/T6341866.java similarity index 100% rename from langtools/test/tools/javac/6341866/T6341866.java rename to test/langtools/tools/javac/6341866/T6341866.java diff --git a/langtools/test/tools/javac/6342411/T6342411.java b/test/langtools/tools/javac/6342411/T6342411.java similarity index 100% rename from langtools/test/tools/javac/6342411/T6342411.java rename to test/langtools/tools/javac/6342411/T6342411.java diff --git a/langtools/test/tools/javac/6342411/a/Base.java b/test/langtools/tools/javac/6342411/a/Base.java similarity index 100% rename from langtools/test/tools/javac/6342411/a/Base.java rename to test/langtools/tools/javac/6342411/a/Base.java diff --git a/langtools/test/tools/javac/6342411/a/Pub.java b/test/langtools/tools/javac/6342411/a/Pub.java similarity index 100% rename from langtools/test/tools/javac/6342411/a/Pub.java rename to test/langtools/tools/javac/6342411/a/Pub.java diff --git a/langtools/test/tools/javac/6360970/T6360970.java b/test/langtools/tools/javac/6360970/T6360970.java similarity index 100% rename from langtools/test/tools/javac/6360970/T6360970.java rename to test/langtools/tools/javac/6360970/T6360970.java diff --git a/langtools/test/tools/javac/6360970/T6360970.out b/test/langtools/tools/javac/6360970/T6360970.out similarity index 100% rename from langtools/test/tools/javac/6360970/T6360970.out rename to test/langtools/tools/javac/6360970/T6360970.out diff --git a/langtools/test/tools/javac/6390045/T6390045a.java b/test/langtools/tools/javac/6390045/T6390045a.java similarity index 100% rename from langtools/test/tools/javac/6390045/T6390045a.java rename to test/langtools/tools/javac/6390045/T6390045a.java diff --git a/langtools/test/tools/javac/6390045/T6390045b.java b/test/langtools/tools/javac/6390045/T6390045b.java similarity index 100% rename from langtools/test/tools/javac/6390045/T6390045b.java rename to test/langtools/tools/javac/6390045/T6390045b.java diff --git a/langtools/test/tools/javac/6394683/A.java b/test/langtools/tools/javac/6394683/A.java similarity index 100% rename from langtools/test/tools/javac/6394683/A.java rename to test/langtools/tools/javac/6394683/A.java diff --git a/langtools/test/tools/javac/6394683/B.java b/test/langtools/tools/javac/6394683/B.java similarity index 100% rename from langtools/test/tools/javac/6394683/B.java rename to test/langtools/tools/javac/6394683/B.java diff --git a/langtools/test/tools/javac/6394683/T6394683.java b/test/langtools/tools/javac/6394683/T6394683.java similarity index 100% rename from langtools/test/tools/javac/6394683/T6394683.java rename to test/langtools/tools/javac/6394683/T6394683.java diff --git a/langtools/test/tools/javac/6400383/T6400383.java b/test/langtools/tools/javac/6400383/T6400383.java similarity index 100% rename from langtools/test/tools/javac/6400383/T6400383.java rename to test/langtools/tools/javac/6400383/T6400383.java diff --git a/langtools/test/tools/javac/6400872/A.java b/test/langtools/tools/javac/6400872/A.java similarity index 100% rename from langtools/test/tools/javac/6400872/A.java rename to test/langtools/tools/javac/6400872/A.java diff --git a/langtools/test/tools/javac/6400872/B.java b/test/langtools/tools/javac/6400872/B.java similarity index 100% rename from langtools/test/tools/javac/6400872/B.java rename to test/langtools/tools/javac/6400872/B.java diff --git a/langtools/test/tools/javac/6400872/C.java b/test/langtools/tools/javac/6400872/C.java similarity index 100% rename from langtools/test/tools/javac/6400872/C.java rename to test/langtools/tools/javac/6400872/C.java diff --git a/langtools/test/tools/javac/6400872/T6400872.java b/test/langtools/tools/javac/6400872/T6400872.java similarity index 100% rename from langtools/test/tools/javac/6400872/T6400872.java rename to test/langtools/tools/javac/6400872/T6400872.java diff --git a/langtools/test/tools/javac/6402516/A.java b/test/langtools/tools/javac/6402516/A.java similarity index 100% rename from langtools/test/tools/javac/6402516/A.java rename to test/langtools/tools/javac/6402516/A.java diff --git a/langtools/test/tools/javac/6402516/CheckClass.java b/test/langtools/tools/javac/6402516/CheckClass.java similarity index 100% rename from langtools/test/tools/javac/6402516/CheckClass.java rename to test/langtools/tools/javac/6402516/CheckClass.java diff --git a/langtools/test/tools/javac/6402516/CheckIsAccessible.java b/test/langtools/tools/javac/6402516/CheckIsAccessible.java similarity index 100% rename from langtools/test/tools/javac/6402516/CheckIsAccessible.java rename to test/langtools/tools/javac/6402516/CheckIsAccessible.java diff --git a/langtools/test/tools/javac/6402516/CheckLocalElements.java b/test/langtools/tools/javac/6402516/CheckLocalElements.java similarity index 100% rename from langtools/test/tools/javac/6402516/CheckLocalElements.java rename to test/langtools/tools/javac/6402516/CheckLocalElements.java diff --git a/langtools/test/tools/javac/6402516/CheckMethod.java b/test/langtools/tools/javac/6402516/CheckMethod.java similarity index 100% rename from langtools/test/tools/javac/6402516/CheckMethod.java rename to test/langtools/tools/javac/6402516/CheckMethod.java diff --git a/langtools/test/tools/javac/6402516/Checker.java b/test/langtools/tools/javac/6402516/Checker.java similarity index 100% rename from langtools/test/tools/javac/6402516/Checker.java rename to test/langtools/tools/javac/6402516/Checker.java diff --git a/langtools/test/tools/javac/6402516/TestClass.java b/test/langtools/tools/javac/6402516/TestClass.java similarity index 100% rename from langtools/test/tools/javac/6402516/TestClass.java rename to test/langtools/tools/javac/6402516/TestClass.java diff --git a/langtools/test/tools/javac/6402516/TestIsAccessible.java b/test/langtools/tools/javac/6402516/TestIsAccessible.java similarity index 100% rename from langtools/test/tools/javac/6402516/TestIsAccessible.java rename to test/langtools/tools/javac/6402516/TestIsAccessible.java diff --git a/langtools/test/tools/javac/6402516/TestLocalElements.java b/test/langtools/tools/javac/6402516/TestLocalElements.java similarity index 100% rename from langtools/test/tools/javac/6402516/TestLocalElements.java rename to test/langtools/tools/javac/6402516/TestLocalElements.java diff --git a/langtools/test/tools/javac/6402516/TestMethod.java b/test/langtools/tools/javac/6402516/TestMethod.java similarity index 100% rename from langtools/test/tools/javac/6402516/TestMethod.java rename to test/langtools/tools/javac/6402516/TestMethod.java diff --git a/langtools/test/tools/javac/6403424/A.java b/test/langtools/tools/javac/6403424/A.java similarity index 100% rename from langtools/test/tools/javac/6403424/A.java rename to test/langtools/tools/javac/6403424/A.java diff --git a/langtools/test/tools/javac/6403424/B.java b/test/langtools/tools/javac/6403424/B.java similarity index 100% rename from langtools/test/tools/javac/6403424/B.java rename to test/langtools/tools/javac/6403424/B.java diff --git a/langtools/test/tools/javac/6403424/T6403424.java b/test/langtools/tools/javac/6403424/T6403424.java similarity index 100% rename from langtools/test/tools/javac/6403424/T6403424.java rename to test/langtools/tools/javac/6403424/T6403424.java diff --git a/langtools/test/tools/javac/6410653/T6410653.java b/test/langtools/tools/javac/6410653/T6410653.java similarity index 100% rename from langtools/test/tools/javac/6410653/T6410653.java rename to test/langtools/tools/javac/6410653/T6410653.java diff --git a/langtools/test/tools/javac/6440583/A.java b/test/langtools/tools/javac/6440583/A.java similarity index 100% rename from langtools/test/tools/javac/6440583/A.java rename to test/langtools/tools/javac/6440583/A.java diff --git a/langtools/test/tools/javac/6440583/T6440583.java b/test/langtools/tools/javac/6440583/T6440583.java similarity index 100% rename from langtools/test/tools/javac/6440583/T6440583.java rename to test/langtools/tools/javac/6440583/T6440583.java diff --git a/langtools/test/tools/javac/6457284/T6457284.java b/test/langtools/tools/javac/6457284/T6457284.java similarity index 100% rename from langtools/test/tools/javac/6457284/T6457284.java rename to test/langtools/tools/javac/6457284/T6457284.java diff --git a/langtools/test/tools/javac/6491592/T6491592.java b/test/langtools/tools/javac/6491592/T6491592.java similarity index 100% rename from langtools/test/tools/javac/6491592/T6491592.java rename to test/langtools/tools/javac/6491592/T6491592.java diff --git a/langtools/test/tools/javac/6491592/T6491592.out b/test/langtools/tools/javac/6491592/T6491592.out similarity index 100% rename from langtools/test/tools/javac/6491592/T6491592.out rename to test/langtools/tools/javac/6491592/T6491592.out diff --git a/langtools/test/tools/javac/6508981/TestInferBinaryName.java b/test/langtools/tools/javac/6508981/TestInferBinaryName.java similarity index 100% rename from langtools/test/tools/javac/6508981/TestInferBinaryName.java rename to test/langtools/tools/javac/6508981/TestInferBinaryName.java diff --git a/langtools/test/tools/javac/6508981/p/A.java b/test/langtools/tools/javac/6508981/p/A.java similarity index 100% rename from langtools/test/tools/javac/6508981/p/A.java rename to test/langtools/tools/javac/6508981/p/A.java diff --git a/langtools/test/tools/javac/6520152/T.java b/test/langtools/tools/javac/6520152/T.java similarity index 100% rename from langtools/test/tools/javac/6520152/T.java rename to test/langtools/tools/javac/6520152/T.java diff --git a/langtools/test/tools/javac/6520152/T6520152.java b/test/langtools/tools/javac/6520152/T6520152.java similarity index 100% rename from langtools/test/tools/javac/6520152/T6520152.java rename to test/langtools/tools/javac/6520152/T6520152.java diff --git a/langtools/test/tools/javac/6521805/T6521805b.java b/test/langtools/tools/javac/6521805/T6521805b.java similarity index 100% rename from langtools/test/tools/javac/6521805/T6521805b.java rename to test/langtools/tools/javac/6521805/T6521805b.java diff --git a/langtools/test/tools/javac/6521805/T6521805c.java b/test/langtools/tools/javac/6521805/T6521805c.java similarity index 100% rename from langtools/test/tools/javac/6521805/T6521805c.java rename to test/langtools/tools/javac/6521805/T6521805c.java diff --git a/langtools/test/tools/javac/6521805/T6521805d.java b/test/langtools/tools/javac/6521805/T6521805d.java similarity index 100% rename from langtools/test/tools/javac/6521805/T6521805d.java rename to test/langtools/tools/javac/6521805/T6521805d.java diff --git a/langtools/test/tools/javac/6521805/T6521805d.out b/test/langtools/tools/javac/6521805/T6521805d.out similarity index 100% rename from langtools/test/tools/javac/6521805/T6521805d.out rename to test/langtools/tools/javac/6521805/T6521805d.out diff --git a/langtools/test/tools/javac/6521805/T6521805e.java b/test/langtools/tools/javac/6521805/T6521805e.java similarity index 100% rename from langtools/test/tools/javac/6521805/T6521805e.java rename to test/langtools/tools/javac/6521805/T6521805e.java diff --git a/langtools/test/tools/javac/6521805/T6521805e.out b/test/langtools/tools/javac/6521805/T6521805e.out similarity index 100% rename from langtools/test/tools/javac/6521805/T6521805e.out rename to test/langtools/tools/javac/6521805/T6521805e.out diff --git a/langtools/test/tools/javac/6521805/p/Outer.java b/test/langtools/tools/javac/6521805/p/Outer.java similarity index 100% rename from langtools/test/tools/javac/6521805/p/Outer.java rename to test/langtools/tools/javac/6521805/p/Outer.java diff --git a/langtools/test/tools/javac/6521805/p/Sub.java b/test/langtools/tools/javac/6521805/p/Sub.java similarity index 100% rename from langtools/test/tools/javac/6521805/p/Sub.java rename to test/langtools/tools/javac/6521805/p/Sub.java diff --git a/langtools/test/tools/javac/6547131/T.java b/test/langtools/tools/javac/6547131/T.java similarity index 100% rename from langtools/test/tools/javac/6547131/T.java rename to test/langtools/tools/javac/6547131/T.java diff --git a/langtools/test/tools/javac/6547131/p/Outer$I.jasm b/test/langtools/tools/javac/6547131/p/Outer$I.jasm similarity index 100% rename from langtools/test/tools/javac/6547131/p/Outer$I.jasm rename to test/langtools/tools/javac/6547131/p/Outer$I.jasm diff --git a/langtools/test/tools/javac/6547131/p/Outer.jasm b/test/langtools/tools/javac/6547131/p/Outer.jasm similarity index 100% rename from langtools/test/tools/javac/6547131/p/Outer.jasm rename to test/langtools/tools/javac/6547131/p/Outer.jasm diff --git a/langtools/test/tools/javac/6558548/T6558548.java b/test/langtools/tools/javac/6558548/T6558548.java similarity index 100% rename from langtools/test/tools/javac/6558548/T6558548.java rename to test/langtools/tools/javac/6558548/T6558548.java diff --git a/langtools/test/tools/javac/6558548/T6558548_6.out b/test/langtools/tools/javac/6558548/T6558548_6.out similarity index 100% rename from langtools/test/tools/javac/6558548/T6558548_6.out rename to test/langtools/tools/javac/6558548/T6558548_6.out diff --git a/langtools/test/tools/javac/6558548/T6558548_latest.out b/test/langtools/tools/javac/6558548/T6558548_latest.out similarity index 100% rename from langtools/test/tools/javac/6558548/T6558548_latest.out rename to test/langtools/tools/javac/6558548/T6558548_latest.out diff --git a/langtools/test/tools/javac/6563143/EqualsHashCodeWarningTest.java b/test/langtools/tools/javac/6563143/EqualsHashCodeWarningTest.java similarity index 100% rename from langtools/test/tools/javac/6563143/EqualsHashCodeWarningTest.java rename to test/langtools/tools/javac/6563143/EqualsHashCodeWarningTest.java diff --git a/langtools/test/tools/javac/6563143/EqualsHashCodeWarningTest.out b/test/langtools/tools/javac/6563143/EqualsHashCodeWarningTest.out similarity index 100% rename from langtools/test/tools/javac/6563143/EqualsHashCodeWarningTest.out rename to test/langtools/tools/javac/6563143/EqualsHashCodeWarningTest.out diff --git a/langtools/test/tools/javac/6567415/T6567415.java b/test/langtools/tools/javac/6567415/T6567415.java similarity index 100% rename from langtools/test/tools/javac/6567415/T6567415.java rename to test/langtools/tools/javac/6567415/T6567415.java diff --git a/langtools/test/tools/javac/6589361/T6589361.java b/test/langtools/tools/javac/6589361/T6589361.java similarity index 100% rename from langtools/test/tools/javac/6589361/T6589361.java rename to test/langtools/tools/javac/6589361/T6589361.java diff --git a/langtools/test/tools/javac/6627362/T6627362.java b/test/langtools/tools/javac/6627362/T6627362.java similarity index 100% rename from langtools/test/tools/javac/6627362/T6627362.java rename to test/langtools/tools/javac/6627362/T6627362.java diff --git a/langtools/test/tools/javac/6627362/x/E.java b/test/langtools/tools/javac/6627362/x/E.java similarity index 100% rename from langtools/test/tools/javac/6627362/x/E.java rename to test/langtools/tools/javac/6627362/x/E.java diff --git a/langtools/test/tools/javac/6627362/x/java/lang/Object.java b/test/langtools/tools/javac/6627362/x/java/lang/Object.java similarity index 100% rename from langtools/test/tools/javac/6627362/x/java/lang/Object.java rename to test/langtools/tools/javac/6627362/x/java/lang/Object.java diff --git a/langtools/test/tools/javac/6668794/badClass/A.java b/test/langtools/tools/javac/6668794/badClass/A.java similarity index 100% rename from langtools/test/tools/javac/6668794/badClass/A.java rename to test/langtools/tools/javac/6668794/badClass/A.java diff --git a/langtools/test/tools/javac/6668794/badClass/B.java b/test/langtools/tools/javac/6668794/badClass/B.java similarity index 100% rename from langtools/test/tools/javac/6668794/badClass/B.java rename to test/langtools/tools/javac/6668794/badClass/B.java diff --git a/langtools/test/tools/javac/6668794/badClass/Test.java b/test/langtools/tools/javac/6668794/badClass/Test.java similarity index 100% rename from langtools/test/tools/javac/6668794/badClass/Test.java rename to test/langtools/tools/javac/6668794/badClass/Test.java diff --git a/langtools/test/tools/javac/6668794/badSource/Test.java b/test/langtools/tools/javac/6668794/badSource/Test.java similarity index 100% rename from langtools/test/tools/javac/6668794/badSource/Test.java rename to test/langtools/tools/javac/6668794/badSource/Test.java diff --git a/langtools/test/tools/javac/6668794/badSource/Test.out b/test/langtools/tools/javac/6668794/badSource/Test.out similarity index 100% rename from langtools/test/tools/javac/6668794/badSource/Test.out rename to test/langtools/tools/javac/6668794/badSource/Test.out diff --git a/langtools/test/tools/javac/6668794/badSource/p/A.java b/test/langtools/tools/javac/6668794/badSource/p/A.java similarity index 100% rename from langtools/test/tools/javac/6668794/badSource/p/A.java rename to test/langtools/tools/javac/6668794/badSource/p/A.java diff --git a/langtools/test/tools/javac/6717241/T6717241a.java b/test/langtools/tools/javac/6717241/T6717241a.java similarity index 100% rename from langtools/test/tools/javac/6717241/T6717241a.java rename to test/langtools/tools/javac/6717241/T6717241a.java diff --git a/langtools/test/tools/javac/6717241/T6717241a.out b/test/langtools/tools/javac/6717241/T6717241a.out similarity index 100% rename from langtools/test/tools/javac/6717241/T6717241a.out rename to test/langtools/tools/javac/6717241/T6717241a.out diff --git a/langtools/test/tools/javac/6717241/T6717241b.java b/test/langtools/tools/javac/6717241/T6717241b.java similarity index 100% rename from langtools/test/tools/javac/6717241/T6717241b.java rename to test/langtools/tools/javac/6717241/T6717241b.java diff --git a/langtools/test/tools/javac/6717241/T6717241b.out b/test/langtools/tools/javac/6717241/T6717241b.out similarity index 100% rename from langtools/test/tools/javac/6717241/T6717241b.out rename to test/langtools/tools/javac/6717241/T6717241b.out diff --git a/langtools/test/tools/javac/6734819/T6734819a.java b/test/langtools/tools/javac/6734819/T6734819a.java similarity index 100% rename from langtools/test/tools/javac/6734819/T6734819a.java rename to test/langtools/tools/javac/6734819/T6734819a.java diff --git a/langtools/test/tools/javac/6734819/T6734819a.out b/test/langtools/tools/javac/6734819/T6734819a.out similarity index 100% rename from langtools/test/tools/javac/6734819/T6734819a.out rename to test/langtools/tools/javac/6734819/T6734819a.out diff --git a/langtools/test/tools/javac/6734819/T6734819b.java b/test/langtools/tools/javac/6734819/T6734819b.java similarity index 100% rename from langtools/test/tools/javac/6734819/T6734819b.java rename to test/langtools/tools/javac/6734819/T6734819b.java diff --git a/langtools/test/tools/javac/6734819/T6734819b.out b/test/langtools/tools/javac/6734819/T6734819b.out similarity index 100% rename from langtools/test/tools/javac/6734819/T6734819b.out rename to test/langtools/tools/javac/6734819/T6734819b.out diff --git a/langtools/test/tools/javac/6734819/T6734819c.java b/test/langtools/tools/javac/6734819/T6734819c.java similarity index 100% rename from langtools/test/tools/javac/6734819/T6734819c.java rename to test/langtools/tools/javac/6734819/T6734819c.java diff --git a/langtools/test/tools/javac/6734819/T6734819c.out b/test/langtools/tools/javac/6734819/T6734819c.out similarity index 100% rename from langtools/test/tools/javac/6734819/T6734819c.out rename to test/langtools/tools/javac/6734819/T6734819c.out diff --git a/langtools/test/tools/javac/6758789/T6758789a.java b/test/langtools/tools/javac/6758789/T6758789a.java similarity index 100% rename from langtools/test/tools/javac/6758789/T6758789a.java rename to test/langtools/tools/javac/6758789/T6758789a.java diff --git a/langtools/test/tools/javac/6758789/T6758789a.out b/test/langtools/tools/javac/6758789/T6758789a.out similarity index 100% rename from langtools/test/tools/javac/6758789/T6758789a.out rename to test/langtools/tools/javac/6758789/T6758789a.out diff --git a/langtools/test/tools/javac/6758789/T6758789b.java b/test/langtools/tools/javac/6758789/T6758789b.java similarity index 100% rename from langtools/test/tools/javac/6758789/T6758789b.java rename to test/langtools/tools/javac/6758789/T6758789b.java diff --git a/langtools/test/tools/javac/6758789/T6758789b.out b/test/langtools/tools/javac/6758789/T6758789b.out similarity index 100% rename from langtools/test/tools/javac/6758789/T6758789b.out rename to test/langtools/tools/javac/6758789/T6758789b.out diff --git a/langtools/test/tools/javac/6835430/A.java b/test/langtools/tools/javac/6835430/A.java similarity index 100% rename from langtools/test/tools/javac/6835430/A.java rename to test/langtools/tools/javac/6835430/A.java diff --git a/langtools/test/tools/javac/6835430/T6835430.java b/test/langtools/tools/javac/6835430/T6835430.java similarity index 100% rename from langtools/test/tools/javac/6835430/T6835430.java rename to test/langtools/tools/javac/6835430/T6835430.java diff --git a/langtools/test/tools/javac/6840059/T6840059.java b/test/langtools/tools/javac/6840059/T6840059.java similarity index 100% rename from langtools/test/tools/javac/6840059/T6840059.java rename to test/langtools/tools/javac/6840059/T6840059.java diff --git a/langtools/test/tools/javac/6840059/T6840059.out b/test/langtools/tools/javac/6840059/T6840059.out similarity index 100% rename from langtools/test/tools/javac/6840059/T6840059.out rename to test/langtools/tools/javac/6840059/T6840059.out diff --git a/langtools/test/tools/javac/6857948/T6857948.java b/test/langtools/tools/javac/6857948/T6857948.java similarity index 100% rename from langtools/test/tools/javac/6857948/T6857948.java rename to test/langtools/tools/javac/6857948/T6857948.java diff --git a/langtools/test/tools/javac/6857948/T6857948.out b/test/langtools/tools/javac/6857948/T6857948.out similarity index 100% rename from langtools/test/tools/javac/6857948/T6857948.out rename to test/langtools/tools/javac/6857948/T6857948.out diff --git a/langtools/test/tools/javac/6863465/T6863465a.java b/test/langtools/tools/javac/6863465/T6863465a.java similarity index 100% rename from langtools/test/tools/javac/6863465/T6863465a.java rename to test/langtools/tools/javac/6863465/T6863465a.java diff --git a/langtools/test/tools/javac/6863465/T6863465a.out b/test/langtools/tools/javac/6863465/T6863465a.out similarity index 100% rename from langtools/test/tools/javac/6863465/T6863465a.out rename to test/langtools/tools/javac/6863465/T6863465a.out diff --git a/langtools/test/tools/javac/6863465/T6863465b.java b/test/langtools/tools/javac/6863465/T6863465b.java similarity index 100% rename from langtools/test/tools/javac/6863465/T6863465b.java rename to test/langtools/tools/javac/6863465/T6863465b.java diff --git a/langtools/test/tools/javac/6863465/T6863465b.out b/test/langtools/tools/javac/6863465/T6863465b.out similarity index 100% rename from langtools/test/tools/javac/6863465/T6863465b.out rename to test/langtools/tools/javac/6863465/T6863465b.out diff --git a/langtools/test/tools/javac/6863465/T6863465c.java b/test/langtools/tools/javac/6863465/T6863465c.java similarity index 100% rename from langtools/test/tools/javac/6863465/T6863465c.java rename to test/langtools/tools/javac/6863465/T6863465c.java diff --git a/langtools/test/tools/javac/6863465/T6863465c.out b/test/langtools/tools/javac/6863465/T6863465c.out similarity index 100% rename from langtools/test/tools/javac/6863465/T6863465c.out rename to test/langtools/tools/javac/6863465/T6863465c.out diff --git a/langtools/test/tools/javac/6863465/T6863465d.java b/test/langtools/tools/javac/6863465/T6863465d.java similarity index 100% rename from langtools/test/tools/javac/6863465/T6863465d.java rename to test/langtools/tools/javac/6863465/T6863465d.java diff --git a/langtools/test/tools/javac/6863465/T6863465d.out b/test/langtools/tools/javac/6863465/T6863465d.out similarity index 100% rename from langtools/test/tools/javac/6863465/T6863465d.out rename to test/langtools/tools/javac/6863465/T6863465d.out diff --git a/langtools/test/tools/javac/6863465/TestCircularClassfile.java b/test/langtools/tools/javac/6863465/TestCircularClassfile.java similarity index 100% rename from langtools/test/tools/javac/6863465/TestCircularClassfile.java rename to test/langtools/tools/javac/6863465/TestCircularClassfile.java diff --git a/langtools/test/tools/javac/6889255/T6889255.java b/test/langtools/tools/javac/6889255/T6889255.java similarity index 100% rename from langtools/test/tools/javac/6889255/T6889255.java rename to test/langtools/tools/javac/6889255/T6889255.java diff --git a/langtools/test/tools/javac/6902720/E1.java b/test/langtools/tools/javac/6902720/E1.java similarity index 100% rename from langtools/test/tools/javac/6902720/E1.java rename to test/langtools/tools/javac/6902720/E1.java diff --git a/langtools/test/tools/javac/6902720/E2.java b/test/langtools/tools/javac/6902720/E2.java similarity index 100% rename from langtools/test/tools/javac/6902720/E2.java rename to test/langtools/tools/javac/6902720/E2.java diff --git a/langtools/test/tools/javac/6902720/Test.java b/test/langtools/tools/javac/6902720/Test.java similarity index 100% rename from langtools/test/tools/javac/6902720/Test.java rename to test/langtools/tools/javac/6902720/Test.java diff --git a/langtools/test/tools/javac/6917288/GraphicalInstaller.java b/test/langtools/tools/javac/6917288/GraphicalInstaller.java similarity index 100% rename from langtools/test/tools/javac/6917288/GraphicalInstaller.java rename to test/langtools/tools/javac/6917288/GraphicalInstaller.java diff --git a/langtools/test/tools/javac/6917288/GraphicalInstallerTest.java b/test/langtools/tools/javac/6917288/GraphicalInstallerTest.java similarity index 100% rename from langtools/test/tools/javac/6917288/GraphicalInstallerTest.java rename to test/langtools/tools/javac/6917288/GraphicalInstallerTest.java diff --git a/langtools/test/tools/javac/6917288/T6917288.java b/test/langtools/tools/javac/6917288/T6917288.java similarity index 100% rename from langtools/test/tools/javac/6917288/T6917288.java rename to test/langtools/tools/javac/6917288/T6917288.java diff --git a/langtools/test/tools/javac/6948381/T6948381.java b/test/langtools/tools/javac/6948381/T6948381.java similarity index 100% rename from langtools/test/tools/javac/6948381/T6948381.java rename to test/langtools/tools/javac/6948381/T6948381.java diff --git a/langtools/test/tools/javac/6948381/npe/A.java b/test/langtools/tools/javac/6948381/npe/A.java similarity index 100% rename from langtools/test/tools/javac/6948381/npe/A.java rename to test/langtools/tools/javac/6948381/npe/A.java diff --git a/langtools/test/tools/javac/6948381/npe/B.java b/test/langtools/tools/javac/6948381/npe/B.java similarity index 100% rename from langtools/test/tools/javac/6948381/npe/B.java rename to test/langtools/tools/javac/6948381/npe/B.java diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_BAD34.java b/test/langtools/tools/javac/6979683/TestCast6979683_BAD34.java similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_BAD34.java rename to test/langtools/tools/javac/6979683/TestCast6979683_BAD34.java diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_BAD34.java.errlog b/test/langtools/tools/javac/6979683/TestCast6979683_BAD34.java.errlog similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_BAD34.java.errlog rename to test/langtools/tools/javac/6979683/TestCast6979683_BAD34.java.errlog diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_BAD35.java b/test/langtools/tools/javac/6979683/TestCast6979683_BAD35.java similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_BAD35.java rename to test/langtools/tools/javac/6979683/TestCast6979683_BAD35.java diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_BAD35.java.errlog b/test/langtools/tools/javac/6979683/TestCast6979683_BAD35.java.errlog similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_BAD35.java.errlog rename to test/langtools/tools/javac/6979683/TestCast6979683_BAD35.java.errlog diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_BAD36.java b/test/langtools/tools/javac/6979683/TestCast6979683_BAD36.java similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_BAD36.java rename to test/langtools/tools/javac/6979683/TestCast6979683_BAD36.java diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_BAD36.java.errlog b/test/langtools/tools/javac/6979683/TestCast6979683_BAD36.java.errlog similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_BAD36.java.errlog rename to test/langtools/tools/javac/6979683/TestCast6979683_BAD36.java.errlog diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_BAD37.java b/test/langtools/tools/javac/6979683/TestCast6979683_BAD37.java similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_BAD37.java rename to test/langtools/tools/javac/6979683/TestCast6979683_BAD37.java diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_BAD37.java.errlog b/test/langtools/tools/javac/6979683/TestCast6979683_BAD37.java.errlog similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_BAD37.java.errlog rename to test/langtools/tools/javac/6979683/TestCast6979683_BAD37.java.errlog diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_BAD38.java b/test/langtools/tools/javac/6979683/TestCast6979683_BAD38.java similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_BAD38.java rename to test/langtools/tools/javac/6979683/TestCast6979683_BAD38.java diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_BAD38.java.errlog b/test/langtools/tools/javac/6979683/TestCast6979683_BAD38.java.errlog similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_BAD38.java.errlog rename to test/langtools/tools/javac/6979683/TestCast6979683_BAD38.java.errlog diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_BAD39.java b/test/langtools/tools/javac/6979683/TestCast6979683_BAD39.java similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_BAD39.java rename to test/langtools/tools/javac/6979683/TestCast6979683_BAD39.java diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_BAD39.java.errlog b/test/langtools/tools/javac/6979683/TestCast6979683_BAD39.java.errlog similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_BAD39.java.errlog rename to test/langtools/tools/javac/6979683/TestCast6979683_BAD39.java.errlog diff --git a/langtools/test/tools/javac/6979683/TestCast6979683_GOOD.java b/test/langtools/tools/javac/6979683/TestCast6979683_GOOD.java similarity index 100% rename from langtools/test/tools/javac/6979683/TestCast6979683_GOOD.java rename to test/langtools/tools/javac/6979683/TestCast6979683_GOOD.java diff --git a/langtools/test/tools/javac/6996626/Main.java b/test/langtools/tools/javac/6996626/Main.java similarity index 100% rename from langtools/test/tools/javac/6996626/Main.java rename to test/langtools/tools/javac/6996626/Main.java diff --git a/langtools/test/tools/javac/6996626/pack1/Symbol.java b/test/langtools/tools/javac/6996626/pack1/Symbol.java similarity index 100% rename from langtools/test/tools/javac/6996626/pack1/Symbol.java rename to test/langtools/tools/javac/6996626/pack1/Symbol.java diff --git a/langtools/test/tools/javac/7003595/T7003595.java b/test/langtools/tools/javac/7003595/T7003595.java similarity index 100% rename from langtools/test/tools/javac/7003595/T7003595.java rename to test/langtools/tools/javac/7003595/T7003595.java diff --git a/langtools/test/tools/javac/7003595/T7003595b.java b/test/langtools/tools/javac/7003595/T7003595b.java similarity index 100% rename from langtools/test/tools/javac/7003595/T7003595b.java rename to test/langtools/tools/javac/7003595/T7003595b.java diff --git a/langtools/test/tools/javac/7023703/T7023703neg.java b/test/langtools/tools/javac/7023703/T7023703neg.java similarity index 100% rename from langtools/test/tools/javac/7023703/T7023703neg.java rename to test/langtools/tools/javac/7023703/T7023703neg.java diff --git a/langtools/test/tools/javac/7023703/T7023703neg.out b/test/langtools/tools/javac/7023703/T7023703neg.out similarity index 100% rename from langtools/test/tools/javac/7023703/T7023703neg.out rename to test/langtools/tools/javac/7023703/T7023703neg.out diff --git a/langtools/test/tools/javac/7023703/T7023703pos.java b/test/langtools/tools/javac/7023703/T7023703pos.java similarity index 100% rename from langtools/test/tools/javac/7023703/T7023703pos.java rename to test/langtools/tools/javac/7023703/T7023703pos.java diff --git a/langtools/test/tools/javac/7024568/T7024568.java b/test/langtools/tools/javac/7024568/T7024568.java similarity index 100% rename from langtools/test/tools/javac/7024568/T7024568.java rename to test/langtools/tools/javac/7024568/T7024568.java diff --git a/langtools/test/tools/javac/7024568/T7024568.out b/test/langtools/tools/javac/7024568/T7024568.out similarity index 100% rename from langtools/test/tools/javac/7024568/T7024568.out rename to test/langtools/tools/javac/7024568/T7024568.out diff --git a/langtools/test/tools/javac/7079713/TestCircularClassfile.java b/test/langtools/tools/javac/7079713/TestCircularClassfile.java similarity index 100% rename from langtools/test/tools/javac/7079713/TestCircularClassfile.java rename to test/langtools/tools/javac/7079713/TestCircularClassfile.java diff --git a/langtools/test/tools/javac/7085024/T7085024.java b/test/langtools/tools/javac/7085024/T7085024.java similarity index 100% rename from langtools/test/tools/javac/7085024/T7085024.java rename to test/langtools/tools/javac/7085024/T7085024.java diff --git a/langtools/test/tools/javac/7085024/T7085024.out b/test/langtools/tools/javac/7085024/T7085024.out similarity index 100% rename from langtools/test/tools/javac/7085024/T7085024.out rename to test/langtools/tools/javac/7085024/T7085024.out diff --git a/langtools/test/tools/javac/7086595/T7086595.java b/test/langtools/tools/javac/7086595/T7086595.java similarity index 100% rename from langtools/test/tools/javac/7086595/T7086595.java rename to test/langtools/tools/javac/7086595/T7086595.java diff --git a/langtools/test/tools/javac/7086595/T7086595.out b/test/langtools/tools/javac/7086595/T7086595.out similarity index 100% rename from langtools/test/tools/javac/7086595/T7086595.out rename to test/langtools/tools/javac/7086595/T7086595.out diff --git a/langtools/test/tools/javac/7102515/T7102515.java b/test/langtools/tools/javac/7102515/T7102515.java similarity index 100% rename from langtools/test/tools/javac/7102515/T7102515.java rename to test/langtools/tools/javac/7102515/T7102515.java diff --git a/langtools/test/tools/javac/7102515/T7102515.out b/test/langtools/tools/javac/7102515/T7102515.out similarity index 100% rename from langtools/test/tools/javac/7102515/T7102515.out rename to test/langtools/tools/javac/7102515/T7102515.out diff --git a/langtools/test/tools/javac/7118412/ShadowingTest.java b/test/langtools/tools/javac/7118412/ShadowingTest.java similarity index 100% rename from langtools/test/tools/javac/7118412/ShadowingTest.java rename to test/langtools/tools/javac/7118412/ShadowingTest.java diff --git a/langtools/test/tools/javac/7129225/Anno.java b/test/langtools/tools/javac/7129225/Anno.java similarity index 100% rename from langtools/test/tools/javac/7129225/Anno.java rename to test/langtools/tools/javac/7129225/Anno.java diff --git a/langtools/test/tools/javac/7129225/AnnoProcessor.java b/test/langtools/tools/javac/7129225/AnnoProcessor.java similarity index 100% rename from langtools/test/tools/javac/7129225/AnnoProcessor.java rename to test/langtools/tools/javac/7129225/AnnoProcessor.java diff --git a/langtools/test/tools/javac/7129225/NegTest.out b/test/langtools/tools/javac/7129225/NegTest.out similarity index 100% rename from langtools/test/tools/javac/7129225/NegTest.out rename to test/langtools/tools/javac/7129225/NegTest.out diff --git a/langtools/test/tools/javac/7129225/TestImportStar.java b/test/langtools/tools/javac/7129225/TestImportStar.java similarity index 100% rename from langtools/test/tools/javac/7129225/TestImportStar.java rename to test/langtools/tools/javac/7129225/TestImportStar.java diff --git a/langtools/test/tools/javac/7129225/TestImportStar.out b/test/langtools/tools/javac/7129225/TestImportStar.out similarity index 100% rename from langtools/test/tools/javac/7129225/TestImportStar.out rename to test/langtools/tools/javac/7129225/TestImportStar.out diff --git a/langtools/test/tools/javac/7132880/T7132880.java b/test/langtools/tools/javac/7132880/T7132880.java similarity index 100% rename from langtools/test/tools/javac/7132880/T7132880.java rename to test/langtools/tools/javac/7132880/T7132880.java diff --git a/langtools/test/tools/javac/7132880/T7132880.out b/test/langtools/tools/javac/7132880/T7132880.out similarity index 100% rename from langtools/test/tools/javac/7132880/T7132880.out rename to test/langtools/tools/javac/7132880/T7132880.out diff --git a/langtools/test/tools/javac/7142086/T7142086.java b/test/langtools/tools/javac/7142086/T7142086.java similarity index 100% rename from langtools/test/tools/javac/7142086/T7142086.java rename to test/langtools/tools/javac/7142086/T7142086.java diff --git a/langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java b/test/langtools/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java similarity index 100% rename from langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java rename to test/langtools/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java diff --git a/langtools/test/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java b/test/langtools/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java similarity index 100% rename from langtools/test/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java rename to test/langtools/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java diff --git a/langtools/test/tools/javac/7153958/pkg/ClassToBeStaticallyImportedA.java b/test/langtools/tools/javac/7153958/pkg/ClassToBeStaticallyImportedA.java similarity index 100% rename from langtools/test/tools/javac/7153958/pkg/ClassToBeStaticallyImportedA.java rename to test/langtools/tools/javac/7153958/pkg/ClassToBeStaticallyImportedA.java diff --git a/langtools/test/tools/javac/7153958/pkg/ClassToBeStaticallyImportedB.java b/test/langtools/tools/javac/7153958/pkg/ClassToBeStaticallyImportedB.java similarity index 100% rename from langtools/test/tools/javac/7153958/pkg/ClassToBeStaticallyImportedB.java rename to test/langtools/tools/javac/7153958/pkg/ClassToBeStaticallyImportedB.java diff --git a/langtools/test/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java b/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java similarity index 100% rename from langtools/test/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java rename to test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java diff --git a/langtools/test/tools/javac/7167125/DiffResultAfterSameOperationInnerClasses.java b/test/langtools/tools/javac/7167125/DiffResultAfterSameOperationInnerClasses.java similarity index 100% rename from langtools/test/tools/javac/7167125/DiffResultAfterSameOperationInnerClasses.java rename to test/langtools/tools/javac/7167125/DiffResultAfterSameOperationInnerClasses.java diff --git a/langtools/test/tools/javac/7182350/T7182350.java b/test/langtools/tools/javac/7182350/T7182350.java similarity index 100% rename from langtools/test/tools/javac/7182350/T7182350.java rename to test/langtools/tools/javac/7182350/T7182350.java diff --git a/langtools/test/tools/javac/7182350/T7182350.out b/test/langtools/tools/javac/7182350/T7182350.out similarity index 100% rename from langtools/test/tools/javac/7182350/T7182350.out rename to test/langtools/tools/javac/7182350/T7182350.out diff --git a/langtools/test/tools/javac/7199823/InnerClassCannotBeVerified.java b/test/langtools/tools/javac/7199823/InnerClassCannotBeVerified.java similarity index 100% rename from langtools/test/tools/javac/7199823/InnerClassCannotBeVerified.java rename to test/langtools/tools/javac/7199823/InnerClassCannotBeVerified.java diff --git a/langtools/test/tools/javac/8000518/DuplicateConstantPoolEntry.java b/test/langtools/tools/javac/8000518/DuplicateConstantPoolEntry.java similarity index 100% rename from langtools/test/tools/javac/8000518/DuplicateConstantPoolEntry.java rename to test/langtools/tools/javac/8000518/DuplicateConstantPoolEntry.java diff --git a/langtools/test/tools/javac/8002286/T8002286.java b/test/langtools/tools/javac/8002286/T8002286.java similarity index 100% rename from langtools/test/tools/javac/8002286/T8002286.java rename to test/langtools/tools/javac/8002286/T8002286.java diff --git a/langtools/test/tools/javac/8002286/T8002286.out b/test/langtools/tools/javac/8002286/T8002286.out similarity index 100% rename from langtools/test/tools/javac/8002286/T8002286.out rename to test/langtools/tools/javac/8002286/T8002286.out diff --git a/langtools/test/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java b/test/langtools/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java similarity index 100% rename from langtools/test/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java rename to test/langtools/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java diff --git a/langtools/test/tools/javac/8009170/RedundantByteCodeInArrayTest.java b/test/langtools/tools/javac/8009170/RedundantByteCodeInArrayTest.java similarity index 100% rename from langtools/test/tools/javac/8009170/RedundantByteCodeInArrayTest.java rename to test/langtools/tools/javac/8009170/RedundantByteCodeInArrayTest.java diff --git a/langtools/test/tools/javac/8052070/DuplicateTypeParameter.java b/test/langtools/tools/javac/8052070/DuplicateTypeParameter.java similarity index 100% rename from langtools/test/tools/javac/8052070/DuplicateTypeParameter.java rename to test/langtools/tools/javac/8052070/DuplicateTypeParameter.java diff --git a/langtools/test/tools/javac/8052070/DuplicateTypeParameter.out b/test/langtools/tools/javac/8052070/DuplicateTypeParameter.out similarity index 100% rename from langtools/test/tools/javac/8052070/DuplicateTypeParameter.out rename to test/langtools/tools/javac/8052070/DuplicateTypeParameter.out diff --git a/langtools/test/tools/javac/8062359/UnresolvableClassNPEInAttrTest.java b/test/langtools/tools/javac/8062359/UnresolvableClassNPEInAttrTest.java similarity index 100% rename from langtools/test/tools/javac/8062359/UnresolvableClassNPEInAttrTest.java rename to test/langtools/tools/javac/8062359/UnresolvableClassNPEInAttrTest.java diff --git a/langtools/test/tools/javac/8062359/UnresolvableClassNPEInAttrTest.out b/test/langtools/tools/javac/8062359/UnresolvableClassNPEInAttrTest.out similarity index 100% rename from langtools/test/tools/javac/8062359/UnresolvableClassNPEInAttrTest.out rename to test/langtools/tools/javac/8062359/UnresolvableClassNPEInAttrTest.out diff --git a/langtools/test/tools/javac/8074306/TestSyntheticNullChecks.java b/test/langtools/tools/javac/8074306/TestSyntheticNullChecks.java similarity index 100% rename from langtools/test/tools/javac/8074306/TestSyntheticNullChecks.java rename to test/langtools/tools/javac/8074306/TestSyntheticNullChecks.java diff --git a/langtools/test/tools/javac/8138840/T8138840.java b/test/langtools/tools/javac/8138840/T8138840.java similarity index 100% rename from langtools/test/tools/javac/8138840/T8138840.java rename to test/langtools/tools/javac/8138840/T8138840.java diff --git a/langtools/test/tools/javac/8138840/T8138840.out b/test/langtools/tools/javac/8138840/T8138840.out similarity index 100% rename from langtools/test/tools/javac/8138840/T8138840.out rename to test/langtools/tools/javac/8138840/T8138840.out diff --git a/langtools/test/tools/javac/8138840/T8139243.java b/test/langtools/tools/javac/8138840/T8139243.java similarity index 100% rename from langtools/test/tools/javac/8138840/T8139243.java rename to test/langtools/tools/javac/8138840/T8139243.java diff --git a/langtools/test/tools/javac/8138840/T8139243.out b/test/langtools/tools/javac/8138840/T8139243.out similarity index 100% rename from langtools/test/tools/javac/8138840/T8139243.out rename to test/langtools/tools/javac/8138840/T8139243.out diff --git a/langtools/test/tools/javac/8138840/T8139249.java b/test/langtools/tools/javac/8138840/T8139249.java similarity index 100% rename from langtools/test/tools/javac/8138840/T8139249.java rename to test/langtools/tools/javac/8138840/T8139249.java diff --git a/langtools/test/tools/javac/8138840/T8139249.out b/test/langtools/tools/javac/8138840/T8139249.out similarity index 100% rename from langtools/test/tools/javac/8138840/T8139249.out rename to test/langtools/tools/javac/8138840/T8139249.out diff --git a/langtools/test/tools/javac/8161985/T8161985a.java b/test/langtools/tools/javac/8161985/T8161985a.java similarity index 100% rename from langtools/test/tools/javac/8161985/T8161985a.java rename to test/langtools/tools/javac/8161985/T8161985a.java diff --git a/langtools/test/tools/javac/8161985/T8161985a.out b/test/langtools/tools/javac/8161985/T8161985a.out similarity index 100% rename from langtools/test/tools/javac/8161985/T8161985a.out rename to test/langtools/tools/javac/8161985/T8161985a.out diff --git a/langtools/test/tools/javac/8161985/T8161985b.java b/test/langtools/tools/javac/8161985/T8161985b.java similarity index 100% rename from langtools/test/tools/javac/8161985/T8161985b.java rename to test/langtools/tools/javac/8161985/T8161985b.java diff --git a/langtools/test/tools/javac/8161985/T8161985b.out b/test/langtools/tools/javac/8161985/T8161985b.out similarity index 100% rename from langtools/test/tools/javac/8161985/T8161985b.out rename to test/langtools/tools/javac/8161985/T8161985b.out diff --git a/langtools/test/tools/javac/8167000/T8167000.java b/test/langtools/tools/javac/8167000/T8167000.java similarity index 100% rename from langtools/test/tools/javac/8167000/T8167000.java rename to test/langtools/tools/javac/8167000/T8167000.java diff --git a/langtools/test/tools/javac/8167000/T8167000.out b/test/langtools/tools/javac/8167000/T8167000.out similarity index 100% rename from langtools/test/tools/javac/8167000/T8167000.out rename to test/langtools/tools/javac/8167000/T8167000.out diff --git a/langtools/test/tools/javac/8167000/T8167000b.java b/test/langtools/tools/javac/8167000/T8167000b.java similarity index 100% rename from langtools/test/tools/javac/8167000/T8167000b.java rename to test/langtools/tools/javac/8167000/T8167000b.java diff --git a/langtools/test/tools/javac/8167000/T8167000b.out b/test/langtools/tools/javac/8167000/T8167000b.out similarity index 100% rename from langtools/test/tools/javac/8167000/T8167000b.out rename to test/langtools/tools/javac/8167000/T8167000b.out diff --git a/langtools/test/tools/javac/8167000/T8167000c.java b/test/langtools/tools/javac/8167000/T8167000c.java similarity index 100% rename from langtools/test/tools/javac/8167000/T8167000c.java rename to test/langtools/tools/javac/8167000/T8167000c.java diff --git a/langtools/test/tools/javac/8167000/T8167000c.out b/test/langtools/tools/javac/8167000/T8167000c.out similarity index 100% rename from langtools/test/tools/javac/8167000/T8167000c.out rename to test/langtools/tools/javac/8167000/T8167000c.out diff --git a/langtools/test/tools/javac/AbstractOverride.java b/test/langtools/tools/javac/AbstractOverride.java similarity index 100% rename from langtools/test/tools/javac/AbstractOverride.java rename to test/langtools/tools/javac/AbstractOverride.java diff --git a/langtools/test/tools/javac/AccessMethods/AccessMethodsLHS.java b/test/langtools/tools/javac/AccessMethods/AccessMethodsLHS.java similarity index 100% rename from langtools/test/tools/javac/AccessMethods/AccessMethodsLHS.java rename to test/langtools/tools/javac/AccessMethods/AccessMethodsLHS.java diff --git a/langtools/test/tools/javac/AccessMethods/BitwiseAssignment.java b/test/langtools/tools/javac/AccessMethods/BitwiseAssignment.java similarity index 100% rename from langtools/test/tools/javac/AccessMethods/BitwiseAssignment.java rename to test/langtools/tools/javac/AccessMethods/BitwiseAssignment.java diff --git a/langtools/test/tools/javac/AccessMethods/ChainedAssignment.java b/test/langtools/tools/javac/AccessMethods/ChainedAssignment.java similarity index 100% rename from langtools/test/tools/javac/AccessMethods/ChainedAssignment.java rename to test/langtools/tools/javac/AccessMethods/ChainedAssignment.java diff --git a/langtools/test/tools/javac/AccessMethods/ConstructorAccess.java b/test/langtools/tools/javac/AccessMethods/ConstructorAccess.java similarity index 100% rename from langtools/test/tools/javac/AccessMethods/ConstructorAccess.java rename to test/langtools/tools/javac/AccessMethods/ConstructorAccess.java diff --git a/langtools/test/tools/javac/AccessMethods/InternalHandshake.java b/test/langtools/tools/javac/AccessMethods/InternalHandshake.java similarity index 100% rename from langtools/test/tools/javac/AccessMethods/InternalHandshake.java rename to test/langtools/tools/javac/AccessMethods/InternalHandshake.java diff --git a/langtools/test/tools/javac/AccessMethods/LateAddition.java b/test/langtools/tools/javac/AccessMethods/LateAddition.java similarity index 100% rename from langtools/test/tools/javac/AccessMethods/LateAddition.java rename to test/langtools/tools/javac/AccessMethods/LateAddition.java diff --git a/langtools/test/tools/javac/AccessMethods/UplevelPrivateConstants.java b/test/langtools/tools/javac/AccessMethods/UplevelPrivateConstants.java similarity index 100% rename from langtools/test/tools/javac/AccessMethods/UplevelPrivateConstants.java rename to test/langtools/tools/javac/AccessMethods/UplevelPrivateConstants.java diff --git a/langtools/test/tools/javac/AddReferenceThis.java b/test/langtools/tools/javac/AddReferenceThis.java similarity index 100% rename from langtools/test/tools/javac/AddReferenceThis.java rename to test/langtools/tools/javac/AddReferenceThis.java diff --git a/langtools/test/tools/javac/Ambig3.java b/test/langtools/tools/javac/Ambig3.java similarity index 100% rename from langtools/test/tools/javac/Ambig3.java rename to test/langtools/tools/javac/Ambig3.java diff --git a/langtools/test/tools/javac/Ambig3.out b/test/langtools/tools/javac/Ambig3.out similarity index 100% rename from langtools/test/tools/javac/Ambig3.out rename to test/langtools/tools/javac/Ambig3.out diff --git a/langtools/test/tools/javac/AnonClsInIntf.java b/test/langtools/tools/javac/AnonClsInIntf.java similarity index 100% rename from langtools/test/tools/javac/AnonClsInIntf.java rename to test/langtools/tools/javac/AnonClsInIntf.java diff --git a/langtools/test/tools/javac/AnonInnerException_1.java b/test/langtools/tools/javac/AnonInnerException_1.java similarity index 100% rename from langtools/test/tools/javac/AnonInnerException_1.java rename to test/langtools/tools/javac/AnonInnerException_1.java diff --git a/langtools/test/tools/javac/AnonInnerException_2.java b/test/langtools/tools/javac/AnonInnerException_2.java similarity index 100% rename from langtools/test/tools/javac/AnonInnerException_2.java rename to test/langtools/tools/javac/AnonInnerException_2.java diff --git a/langtools/test/tools/javac/AnonInnerException_3.java b/test/langtools/tools/javac/AnonInnerException_3.java similarity index 100% rename from langtools/test/tools/javac/AnonInnerException_3.java rename to test/langtools/tools/javac/AnonInnerException_3.java diff --git a/langtools/test/tools/javac/AnonStaticMember_1.java b/test/langtools/tools/javac/AnonStaticMember_1.java similarity index 100% rename from langtools/test/tools/javac/AnonStaticMember_1.java rename to test/langtools/tools/javac/AnonStaticMember_1.java diff --git a/langtools/test/tools/javac/AnonStaticMember_2.java b/test/langtools/tools/javac/AnonStaticMember_2.java similarity index 100% rename from langtools/test/tools/javac/AnonStaticMember_2.java rename to test/langtools/tools/javac/AnonStaticMember_2.java diff --git a/langtools/test/tools/javac/AnonStaticMember_2.out b/test/langtools/tools/javac/AnonStaticMember_2.out similarity index 100% rename from langtools/test/tools/javac/AnonStaticMember_2.out rename to test/langtools/tools/javac/AnonStaticMember_2.out diff --git a/langtools/test/tools/javac/AnonStaticMember_3.java b/test/langtools/tools/javac/AnonStaticMember_3.java similarity index 100% rename from langtools/test/tools/javac/AnonStaticMember_3.java rename to test/langtools/tools/javac/AnonStaticMember_3.java diff --git a/langtools/test/tools/javac/AnonymousClass/AnonymousClassFlags.java b/test/langtools/tools/javac/AnonymousClass/AnonymousClassFlags.java similarity index 100% rename from langtools/test/tools/javac/AnonymousClass/AnonymousClassFlags.java rename to test/langtools/tools/javac/AnonymousClass/AnonymousClassFlags.java diff --git a/langtools/test/tools/javac/AnonymousClass/AnonymousCtorExceptionTest.java b/test/langtools/tools/javac/AnonymousClass/AnonymousCtorExceptionTest.java similarity index 100% rename from langtools/test/tools/javac/AnonymousClass/AnonymousCtorExceptionTest.java rename to test/langtools/tools/javac/AnonymousClass/AnonymousCtorExceptionTest.java diff --git a/langtools/test/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.java b/test/langtools/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.java similarity index 100% rename from langtools/test/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.java rename to test/langtools/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.java diff --git a/langtools/test/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.out b/test/langtools/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.out similarity index 100% rename from langtools/test/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.out rename to test/langtools/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.out diff --git a/langtools/test/tools/javac/AnonymousClass/AnonymousInSuperCallTest.java b/test/langtools/tools/javac/AnonymousClass/AnonymousInSuperCallTest.java similarity index 100% rename from langtools/test/tools/javac/AnonymousClass/AnonymousInSuperCallTest.java rename to test/langtools/tools/javac/AnonymousClass/AnonymousInSuperCallTest.java diff --git a/langtools/test/tools/javac/AnonymousClass/CtorAccessBypassTest.java b/test/langtools/tools/javac/AnonymousClass/CtorAccessBypassTest.java similarity index 100% rename from langtools/test/tools/javac/AnonymousClass/CtorAccessBypassTest.java rename to test/langtools/tools/javac/AnonymousClass/CtorAccessBypassTest.java diff --git a/langtools/test/tools/javac/AnonymousConstructorExceptions.java b/test/langtools/tools/javac/AnonymousConstructorExceptions.java similarity index 100% rename from langtools/test/tools/javac/AnonymousConstructorExceptions.java rename to test/langtools/tools/javac/AnonymousConstructorExceptions.java diff --git a/langtools/test/tools/javac/AnonymousNull.java b/test/langtools/tools/javac/AnonymousNull.java similarity index 100% rename from langtools/test/tools/javac/AnonymousNull.java rename to test/langtools/tools/javac/AnonymousNull.java diff --git a/langtools/test/tools/javac/AnonymousProtect/AnonymousProtect.java b/test/langtools/tools/javac/AnonymousProtect/AnonymousProtect.java similarity index 100% rename from langtools/test/tools/javac/AnonymousProtect/AnonymousProtect.java rename to test/langtools/tools/javac/AnonymousProtect/AnonymousProtect.java diff --git a/langtools/test/tools/javac/AnonymousProtect/P1/priv.java b/test/langtools/tools/javac/AnonymousProtect/P1/priv.java similarity index 100% rename from langtools/test/tools/javac/AnonymousProtect/P1/priv.java rename to test/langtools/tools/javac/AnonymousProtect/P1/priv.java diff --git a/langtools/test/tools/javac/AnonymousProtect/P1/pub.java b/test/langtools/tools/javac/AnonymousProtect/P1/pub.java similarity index 100% rename from langtools/test/tools/javac/AnonymousProtect/P1/pub.java rename to test/langtools/tools/javac/AnonymousProtect/P1/pub.java diff --git a/langtools/test/tools/javac/AnonymousProtect/P1/pubExposePriv.java b/test/langtools/tools/javac/AnonymousProtect/P1/pubExposePriv.java similarity index 100% rename from langtools/test/tools/javac/AnonymousProtect/P1/pubExposePriv.java rename to test/langtools/tools/javac/AnonymousProtect/P1/pubExposePriv.java diff --git a/langtools/test/tools/javac/AnonymousProtect/P2/usePub.java b/test/langtools/tools/javac/AnonymousProtect/P2/usePub.java similarity index 100% rename from langtools/test/tools/javac/AnonymousProtect/P2/usePub.java rename to test/langtools/tools/javac/AnonymousProtect/P2/usePub.java diff --git a/langtools/test/tools/javac/AnonymousSubclassTest.java b/test/langtools/tools/javac/AnonymousSubclassTest.java similarity index 100% rename from langtools/test/tools/javac/AnonymousSubclassTest.java rename to test/langtools/tools/javac/AnonymousSubclassTest.java diff --git a/langtools/test/tools/javac/AnonymousType.java b/test/langtools/tools/javac/AnonymousType.java similarity index 100% rename from langtools/test/tools/javac/AnonymousType.java rename to test/langtools/tools/javac/AnonymousType.java diff --git a/langtools/test/tools/javac/ArrayCast.java b/test/langtools/tools/javac/ArrayCast.java similarity index 100% rename from langtools/test/tools/javac/ArrayCast.java rename to test/langtools/tools/javac/ArrayCast.java diff --git a/langtools/test/tools/javac/BadAnnotation.java b/test/langtools/tools/javac/BadAnnotation.java similarity index 100% rename from langtools/test/tools/javac/BadAnnotation.java rename to test/langtools/tools/javac/BadAnnotation.java diff --git a/langtools/test/tools/javac/BadAnnotation.out b/test/langtools/tools/javac/BadAnnotation.out similarity index 100% rename from langtools/test/tools/javac/BadAnnotation.out rename to test/langtools/tools/javac/BadAnnotation.out diff --git a/langtools/test/tools/javac/BadBreak.java b/test/langtools/tools/javac/BadBreak.java similarity index 100% rename from langtools/test/tools/javac/BadBreak.java rename to test/langtools/tools/javac/BadBreak.java diff --git a/langtools/test/tools/javac/BadCovar.java b/test/langtools/tools/javac/BadCovar.java similarity index 100% rename from langtools/test/tools/javac/BadCovar.java rename to test/langtools/tools/javac/BadCovar.java diff --git a/langtools/test/tools/javac/BadCovar.out b/test/langtools/tools/javac/BadCovar.out similarity index 100% rename from langtools/test/tools/javac/BadCovar.out rename to test/langtools/tools/javac/BadCovar.out diff --git a/langtools/test/tools/javac/BadHexConstant.java b/test/langtools/tools/javac/BadHexConstant.java similarity index 100% rename from langtools/test/tools/javac/BadHexConstant.java rename to test/langtools/tools/javac/BadHexConstant.java diff --git a/langtools/test/tools/javac/BadHexConstant.out b/test/langtools/tools/javac/BadHexConstant.out similarity index 100% rename from langtools/test/tools/javac/BadHexConstant.out rename to test/langtools/tools/javac/BadHexConstant.out diff --git a/langtools/test/tools/javac/BadOptimization/DeadCode1.java b/test/langtools/tools/javac/BadOptimization/DeadCode1.java similarity index 100% rename from langtools/test/tools/javac/BadOptimization/DeadCode1.java rename to test/langtools/tools/javac/BadOptimization/DeadCode1.java diff --git a/langtools/test/tools/javac/BadOptimization/DeadCode2.java b/test/langtools/tools/javac/BadOptimization/DeadCode2.java similarity index 100% rename from langtools/test/tools/javac/BadOptimization/DeadCode2.java rename to test/langtools/tools/javac/BadOptimization/DeadCode2.java diff --git a/langtools/test/tools/javac/BadOptimization/DeadCode3.java b/test/langtools/tools/javac/BadOptimization/DeadCode3.java similarity index 100% rename from langtools/test/tools/javac/BadOptimization/DeadCode3.java rename to test/langtools/tools/javac/BadOptimization/DeadCode3.java diff --git a/langtools/test/tools/javac/BadOptimization/DeadCode4.java b/test/langtools/tools/javac/BadOptimization/DeadCode4.java similarity index 100% rename from langtools/test/tools/javac/BadOptimization/DeadCode4.java rename to test/langtools/tools/javac/BadOptimization/DeadCode4.java diff --git a/langtools/test/tools/javac/BadOptimization/DeadCode5.java b/test/langtools/tools/javac/BadOptimization/DeadCode5.java similarity index 100% rename from langtools/test/tools/javac/BadOptimization/DeadCode5.java rename to test/langtools/tools/javac/BadOptimization/DeadCode5.java diff --git a/langtools/test/tools/javac/BadOptimization/DeadCode6.java b/test/langtools/tools/javac/BadOptimization/DeadCode6.java similarity index 100% rename from langtools/test/tools/javac/BadOptimization/DeadCode6.java rename to test/langtools/tools/javac/BadOptimization/DeadCode6.java diff --git a/langtools/test/tools/javac/BadOptimization/Switch1.java b/test/langtools/tools/javac/BadOptimization/Switch1.java similarity index 100% rename from langtools/test/tools/javac/BadOptimization/Switch1.java rename to test/langtools/tools/javac/BadOptimization/Switch1.java diff --git a/langtools/test/tools/javac/BadOptimization/Switch2.java b/test/langtools/tools/javac/BadOptimization/Switch2.java similarity index 100% rename from langtools/test/tools/javac/BadOptimization/Switch2.java rename to test/langtools/tools/javac/BadOptimization/Switch2.java diff --git a/langtools/test/tools/javac/BoolArray.java b/test/langtools/tools/javac/BoolArray.java similarity index 100% rename from langtools/test/tools/javac/BoolArray.java rename to test/langtools/tools/javac/BoolArray.java diff --git a/langtools/test/tools/javac/BoundClassError.java b/test/langtools/tools/javac/BoundClassError.java similarity index 100% rename from langtools/test/tools/javac/BoundClassError.java rename to test/langtools/tools/javac/BoundClassError.java diff --git a/langtools/test/tools/javac/BoundClassError.out b/test/langtools/tools/javac/BoundClassError.out similarity index 100% rename from langtools/test/tools/javac/BoundClassError.out rename to test/langtools/tools/javac/BoundClassError.out diff --git a/langtools/test/tools/javac/BranchToFewerDefines.java b/test/langtools/tools/javac/BranchToFewerDefines.java similarity index 100% rename from langtools/test/tools/javac/BranchToFewerDefines.java rename to test/langtools/tools/javac/BranchToFewerDefines.java diff --git a/langtools/test/tools/javac/BreakAcrossClass.java b/test/langtools/tools/javac/BreakAcrossClass.java similarity index 100% rename from langtools/test/tools/javac/BreakAcrossClass.java rename to test/langtools/tools/javac/BreakAcrossClass.java diff --git a/langtools/test/tools/javac/BreakAcrossClass.out b/test/langtools/tools/javac/BreakAcrossClass.out similarity index 100% rename from langtools/test/tools/javac/BreakAcrossClass.out rename to test/langtools/tools/javac/BreakAcrossClass.out diff --git a/langtools/test/tools/javac/CaptureInSubtype.java b/test/langtools/tools/javac/CaptureInSubtype.java similarity index 100% rename from langtools/test/tools/javac/CaptureInSubtype.java rename to test/langtools/tools/javac/CaptureInSubtype.java diff --git a/langtools/test/tools/javac/CaptureInSubtype.out b/test/langtools/tools/javac/CaptureInSubtype.out similarity index 100% rename from langtools/test/tools/javac/CaptureInSubtype.out rename to test/langtools/tools/javac/CaptureInSubtype.out diff --git a/langtools/test/tools/javac/CascadedInnerNewInstance.java b/test/langtools/tools/javac/CascadedInnerNewInstance.java similarity index 100% rename from langtools/test/tools/javac/CascadedInnerNewInstance.java rename to test/langtools/tools/javac/CascadedInnerNewInstance.java diff --git a/langtools/test/tools/javac/CastInterface2Array.java b/test/langtools/tools/javac/CastInterface2Array.java similarity index 100% rename from langtools/test/tools/javac/CastInterface2Array.java rename to test/langtools/tools/javac/CastInterface2Array.java diff --git a/langtools/test/tools/javac/CheckNoClassCastException.java b/test/langtools/tools/javac/CheckNoClassCastException.java similarity index 100% rename from langtools/test/tools/javac/CheckNoClassCastException.java rename to test/langtools/tools/javac/CheckNoClassCastException.java diff --git a/langtools/test/tools/javac/ClassCycle/ClassCycle1a.java b/test/langtools/tools/javac/ClassCycle/ClassCycle1a.java similarity index 100% rename from langtools/test/tools/javac/ClassCycle/ClassCycle1a.java rename to test/langtools/tools/javac/ClassCycle/ClassCycle1a.java diff --git a/langtools/test/tools/javac/ClassCycle/ClassCycle1a.out b/test/langtools/tools/javac/ClassCycle/ClassCycle1a.out similarity index 100% rename from langtools/test/tools/javac/ClassCycle/ClassCycle1a.out rename to test/langtools/tools/javac/ClassCycle/ClassCycle1a.out diff --git a/langtools/test/tools/javac/ClassCycle/ClassCycle1b.java b/test/langtools/tools/javac/ClassCycle/ClassCycle1b.java similarity index 100% rename from langtools/test/tools/javac/ClassCycle/ClassCycle1b.java rename to test/langtools/tools/javac/ClassCycle/ClassCycle1b.java diff --git a/langtools/test/tools/javac/ClassCycle/ClassCycle2a.java b/test/langtools/tools/javac/ClassCycle/ClassCycle2a.java similarity index 100% rename from langtools/test/tools/javac/ClassCycle/ClassCycle2a.java rename to test/langtools/tools/javac/ClassCycle/ClassCycle2a.java diff --git a/langtools/test/tools/javac/ClassCycle/ClassCycle2a.out b/test/langtools/tools/javac/ClassCycle/ClassCycle2a.out similarity index 100% rename from langtools/test/tools/javac/ClassCycle/ClassCycle2a.out rename to test/langtools/tools/javac/ClassCycle/ClassCycle2a.out diff --git a/langtools/test/tools/javac/ClassCycle/ClassCycle2b.java b/test/langtools/tools/javac/ClassCycle/ClassCycle2b.java similarity index 100% rename from langtools/test/tools/javac/ClassCycle/ClassCycle2b.java rename to test/langtools/tools/javac/ClassCycle/ClassCycle2b.java diff --git a/langtools/test/tools/javac/ClassCycle/ClassCycle3a.java b/test/langtools/tools/javac/ClassCycle/ClassCycle3a.java similarity index 100% rename from langtools/test/tools/javac/ClassCycle/ClassCycle3a.java rename to test/langtools/tools/javac/ClassCycle/ClassCycle3a.java diff --git a/langtools/test/tools/javac/ClassCycle/ClassCycle3a.out b/test/langtools/tools/javac/ClassCycle/ClassCycle3a.out similarity index 100% rename from langtools/test/tools/javac/ClassCycle/ClassCycle3a.out rename to test/langtools/tools/javac/ClassCycle/ClassCycle3a.out diff --git a/langtools/test/tools/javac/ClassCycle/ClassCycle3b.java b/test/langtools/tools/javac/ClassCycle/ClassCycle3b.java similarity index 100% rename from langtools/test/tools/javac/ClassCycle/ClassCycle3b.java rename to test/langtools/tools/javac/ClassCycle/ClassCycle3b.java diff --git a/langtools/test/tools/javac/ClassFileModifiers/ClassModifiers.java b/test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.java similarity index 100% rename from langtools/test/tools/javac/ClassFileModifiers/ClassModifiers.java rename to test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.java diff --git a/langtools/test/tools/javac/ClassFileModifiers/ClassModifiers.out b/test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.out similarity index 100% rename from langtools/test/tools/javac/ClassFileModifiers/ClassModifiers.out rename to test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.out diff --git a/langtools/test/tools/javac/ClassFileModifiers/MemberModifiers.java b/test/langtools/tools/javac/ClassFileModifiers/MemberModifiers.java similarity index 100% rename from langtools/test/tools/javac/ClassFileModifiers/MemberModifiers.java rename to test/langtools/tools/javac/ClassFileModifiers/MemberModifiers.java diff --git a/langtools/test/tools/javac/ClassFileModifiers/MemberModifiers.out b/test/langtools/tools/javac/ClassFileModifiers/MemberModifiers.out similarity index 100% rename from langtools/test/tools/javac/ClassFileModifiers/MemberModifiers.out rename to test/langtools/tools/javac/ClassFileModifiers/MemberModifiers.out diff --git a/langtools/test/tools/javac/ClassIsAbstract.java b/test/langtools/tools/javac/ClassIsAbstract.java similarity index 100% rename from langtools/test/tools/javac/ClassIsAbstract.java rename to test/langtools/tools/javac/ClassIsAbstract.java diff --git a/langtools/test/tools/javac/ClassIsAbstract.out b/test/langtools/tools/javac/ClassIsAbstract.out similarity index 100% rename from langtools/test/tools/javac/ClassIsAbstract.out rename to test/langtools/tools/javac/ClassIsAbstract.out diff --git a/langtools/test/tools/javac/ClassLit.java b/test/langtools/tools/javac/ClassLit.java similarity index 100% rename from langtools/test/tools/javac/ClassLit.java rename to test/langtools/tools/javac/ClassLit.java diff --git a/langtools/test/tools/javac/ClassLiterals/ClassLiteralHelperContext.java b/test/langtools/tools/javac/ClassLiterals/ClassLiteralHelperContext.java similarity index 100% rename from langtools/test/tools/javac/ClassLiterals/ClassLiteralHelperContext.java rename to test/langtools/tools/javac/ClassLiterals/ClassLiteralHelperContext.java diff --git a/langtools/test/tools/javac/ClassLiterals/InitializeOuter.java b/test/langtools/tools/javac/ClassLiterals/InitializeOuter.java similarity index 100% rename from langtools/test/tools/javac/ClassLiterals/InitializeOuter.java rename to test/langtools/tools/javac/ClassLiterals/InitializeOuter.java diff --git a/langtools/test/tools/javac/ClassLiterals/InitializeTarget.java b/test/langtools/tools/javac/ClassLiterals/InitializeTarget.java similarity index 100% rename from langtools/test/tools/javac/ClassLiterals/InitializeTarget.java rename to test/langtools/tools/javac/ClassLiterals/InitializeTarget.java diff --git a/langtools/test/tools/javac/ClassLiterals/InnerClassLiterals.java b/test/langtools/tools/javac/ClassLiterals/InnerClassLiterals.java similarity index 100% rename from langtools/test/tools/javac/ClassLiterals/InnerClassLiterals.java rename to test/langtools/tools/javac/ClassLiterals/InnerClassLiterals.java diff --git a/langtools/test/tools/javac/ClassLiterals/LiteralInterfaceImpl.java b/test/langtools/tools/javac/ClassLiterals/LiteralInterfaceImpl.java similarity index 100% rename from langtools/test/tools/javac/ClassLiterals/LiteralInterfaceImpl.java rename to test/langtools/tools/javac/ClassLiterals/LiteralInterfaceImpl.java diff --git a/langtools/test/tools/javac/ClassLiterals/LiteralInterface_1.java b/test/langtools/tools/javac/ClassLiterals/LiteralInterface_1.java similarity index 100% rename from langtools/test/tools/javac/ClassLiterals/LiteralInterface_1.java rename to test/langtools/tools/javac/ClassLiterals/LiteralInterface_1.java diff --git a/langtools/test/tools/javac/ClassLiterals/LiteralInterface_2.java b/test/langtools/tools/javac/ClassLiterals/LiteralInterface_2.java similarity index 100% rename from langtools/test/tools/javac/ClassLiterals/LiteralInterface_2.java rename to test/langtools/tools/javac/ClassLiterals/LiteralInterface_2.java diff --git a/langtools/test/tools/javac/ClassLiterals/LiteralInterface_3.java b/test/langtools/tools/javac/ClassLiterals/LiteralInterface_3.java similarity index 100% rename from langtools/test/tools/javac/ClassLiterals/LiteralInterface_3.java rename to test/langtools/tools/javac/ClassLiterals/LiteralInterface_3.java diff --git a/langtools/test/tools/javac/ClassLiterals/evalinit/ClassLiteralEvalInit.java b/test/langtools/tools/javac/ClassLiterals/evalinit/ClassLiteralEvalInit.java similarity index 100% rename from langtools/test/tools/javac/ClassLiterals/evalinit/ClassLiteralEvalInit.java rename to test/langtools/tools/javac/ClassLiterals/evalinit/ClassLiteralEvalInit.java diff --git a/langtools/test/tools/javac/ClassLiterals/evalinit/java/lang/Integer.java b/test/langtools/tools/javac/ClassLiterals/evalinit/java/lang/Integer.java similarity index 100% rename from langtools/test/tools/javac/ClassLiterals/evalinit/java/lang/Integer.java rename to test/langtools/tools/javac/ClassLiterals/evalinit/java/lang/Integer.java diff --git a/langtools/test/tools/javac/ClassLiterals/p1/C.java b/test/langtools/tools/javac/ClassLiterals/p1/C.java similarity index 100% rename from langtools/test/tools/javac/ClassLiterals/p1/C.java rename to test/langtools/tools/javac/ClassLiterals/p1/C.java diff --git a/langtools/test/tools/javac/ClassLiterals/p1/SuperClass.java b/test/langtools/tools/javac/ClassLiterals/p1/SuperClass.java similarity index 100% rename from langtools/test/tools/javac/ClassLiterals/p1/SuperClass.java rename to test/langtools/tools/javac/ClassLiterals/p1/SuperClass.java diff --git a/langtools/test/tools/javac/ClassModifiers/InterfaceAndInnerClsCtor.java b/test/langtools/tools/javac/ClassModifiers/InterfaceAndInnerClsCtor.java similarity index 100% rename from langtools/test/tools/javac/ClassModifiers/InterfaceAndInnerClsCtor.java rename to test/langtools/tools/javac/ClassModifiers/InterfaceAndInnerClsCtor.java diff --git a/langtools/test/tools/javac/ClassPathTest/ClassPathTest.java b/test/langtools/tools/javac/ClassPathTest/ClassPathTest.java similarity index 100% rename from langtools/test/tools/javac/ClassPathTest/ClassPathTest.java rename to test/langtools/tools/javac/ClassPathTest/ClassPathTest.java diff --git a/langtools/test/tools/javac/ClassToTypeParm.java b/test/langtools/tools/javac/ClassToTypeParm.java similarity index 100% rename from langtools/test/tools/javac/ClassToTypeParm.java rename to test/langtools/tools/javac/ClassToTypeParm.java diff --git a/langtools/test/tools/javac/ClassToTypeParm.out b/test/langtools/tools/javac/ClassToTypeParm.out similarity index 100% rename from langtools/test/tools/javac/ClassToTypeParm.out rename to test/langtools/tools/javac/ClassToTypeParm.out diff --git a/langtools/test/tools/javac/CloneableProblem.java b/test/langtools/tools/javac/CloneableProblem.java similarity index 100% rename from langtools/test/tools/javac/CloneableProblem.java rename to test/langtools/tools/javac/CloneableProblem.java diff --git a/langtools/test/tools/javac/Closure1.java b/test/langtools/tools/javac/Closure1.java similarity index 100% rename from langtools/test/tools/javac/Closure1.java rename to test/langtools/tools/javac/Closure1.java diff --git a/langtools/test/tools/javac/Closure2.java b/test/langtools/tools/javac/Closure2.java similarity index 100% rename from langtools/test/tools/javac/Closure2.java rename to test/langtools/tools/javac/Closure2.java diff --git a/langtools/test/tools/javac/Closure3.java b/test/langtools/tools/javac/Closure3.java similarity index 100% rename from langtools/test/tools/javac/Closure3.java rename to test/langtools/tools/javac/Closure3.java diff --git a/langtools/test/tools/javac/Closure4.java b/test/langtools/tools/javac/Closure4.java similarity index 100% rename from langtools/test/tools/javac/Closure4.java rename to test/langtools/tools/javac/Closure4.java diff --git a/langtools/test/tools/javac/Closure5.java b/test/langtools/tools/javac/Closure5.java similarity index 100% rename from langtools/test/tools/javac/Closure5.java rename to test/langtools/tools/javac/Closure5.java diff --git a/langtools/test/tools/javac/Closure6.java b/test/langtools/tools/javac/Closure6.java similarity index 100% rename from langtools/test/tools/javac/Closure6.java rename to test/langtools/tools/javac/Closure6.java diff --git a/langtools/test/tools/javac/CompoundBox.java b/test/langtools/tools/javac/CompoundBox.java similarity index 100% rename from langtools/test/tools/javac/CompoundBox.java rename to test/langtools/tools/javac/CompoundBox.java diff --git a/langtools/test/tools/javac/CompoundBox.out b/test/langtools/tools/javac/CompoundBox.out similarity index 100% rename from langtools/test/tools/javac/CompoundBox.out rename to test/langtools/tools/javac/CompoundBox.out diff --git a/langtools/test/tools/javac/ConditionalArgTypes_1.java b/test/langtools/tools/javac/ConditionalArgTypes_1.java similarity index 100% rename from langtools/test/tools/javac/ConditionalArgTypes_1.java rename to test/langtools/tools/javac/ConditionalArgTypes_1.java diff --git a/langtools/test/tools/javac/ConditionalArgTypes_2.java b/test/langtools/tools/javac/ConditionalArgTypes_2.java similarity index 100% rename from langtools/test/tools/javac/ConditionalArgTypes_2.java rename to test/langtools/tools/javac/ConditionalArgTypes_2.java diff --git a/langtools/test/tools/javac/ConditionalInline.java b/test/langtools/tools/javac/ConditionalInline.java similarity index 100% rename from langtools/test/tools/javac/ConditionalInline.java rename to test/langtools/tools/javac/ConditionalInline.java diff --git a/langtools/test/tools/javac/ConditionalWithVoid.java b/test/langtools/tools/javac/ConditionalWithVoid.java similarity index 100% rename from langtools/test/tools/javac/ConditionalWithVoid.java rename to test/langtools/tools/javac/ConditionalWithVoid.java diff --git a/langtools/test/tools/javac/ConditionalWithVoid.out b/test/langtools/tools/javac/ConditionalWithVoid.out similarity index 100% rename from langtools/test/tools/javac/ConditionalWithVoid.out rename to test/langtools/tools/javac/ConditionalWithVoid.out diff --git a/langtools/test/tools/javac/ConstBoolAppend.java b/test/langtools/tools/javac/ConstBoolAppend.java similarity index 100% rename from langtools/test/tools/javac/ConstBoolAppend.java rename to test/langtools/tools/javac/ConstBoolAppend.java diff --git a/langtools/test/tools/javac/ConstCharAppend.java b/test/langtools/tools/javac/ConstCharAppend.java similarity index 100% rename from langtools/test/tools/javac/ConstCharAppend.java rename to test/langtools/tools/javac/ConstCharAppend.java diff --git a/langtools/test/tools/javac/ConstFoldTest.java b/test/langtools/tools/javac/ConstFoldTest.java similarity index 100% rename from langtools/test/tools/javac/ConstFoldTest.java rename to test/langtools/tools/javac/ConstFoldTest.java diff --git a/langtools/test/tools/javac/ConstantValues/ConstValInit.java b/test/langtools/tools/javac/ConstantValues/ConstValInit.java similarity index 100% rename from langtools/test/tools/javac/ConstantValues/ConstValInit.java rename to test/langtools/tools/javac/ConstantValues/ConstValInit.java diff --git a/langtools/test/tools/javac/ConstantValues/ConstValInlining.java b/test/langtools/tools/javac/ConstantValues/ConstValInlining.java similarity index 100% rename from langtools/test/tools/javac/ConstantValues/ConstValInlining.java rename to test/langtools/tools/javac/ConstantValues/ConstValInlining.java diff --git a/langtools/test/tools/javac/ConstantValues/test_ff1.java b/test/langtools/tools/javac/ConstantValues/test_ff1.java similarity index 100% rename from langtools/test/tools/javac/ConstantValues/test_ff1.java rename to test/langtools/tools/javac/ConstantValues/test_ff1.java diff --git a/langtools/test/tools/javac/ConstantValues/test_ff2.java b/test/langtools/tools/javac/ConstantValues/test_ff2.java similarity index 100% rename from langtools/test/tools/javac/ConstantValues/test_ff2.java rename to test/langtools/tools/javac/ConstantValues/test_ff2.java diff --git a/langtools/test/tools/javac/CyclicInheritance.java b/test/langtools/tools/javac/CyclicInheritance.java similarity index 100% rename from langtools/test/tools/javac/CyclicInheritance.java rename to test/langtools/tools/javac/CyclicInheritance.java diff --git a/langtools/test/tools/javac/CyclicInheritance.out b/test/langtools/tools/javac/CyclicInheritance.out similarity index 100% rename from langtools/test/tools/javac/CyclicInheritance.out rename to test/langtools/tools/javac/CyclicInheritance.out diff --git a/langtools/test/tools/javac/CyclicInheritance2.java b/test/langtools/tools/javac/CyclicInheritance2.java similarity index 100% rename from langtools/test/tools/javac/CyclicInheritance2.java rename to test/langtools/tools/javac/CyclicInheritance2.java diff --git a/langtools/test/tools/javac/CyclicInheritance4.java b/test/langtools/tools/javac/CyclicInheritance4.java similarity index 100% rename from langtools/test/tools/javac/CyclicInheritance4.java rename to test/langtools/tools/javac/CyclicInheritance4.java diff --git a/langtools/test/tools/javac/CyclicInheritance6/Main.java b/test/langtools/tools/javac/CyclicInheritance6/Main.java similarity index 100% rename from langtools/test/tools/javac/CyclicInheritance6/Main.java rename to test/langtools/tools/javac/CyclicInheritance6/Main.java diff --git a/langtools/test/tools/javac/CyclicInheritance6/p1/A.java b/test/langtools/tools/javac/CyclicInheritance6/p1/A.java similarity index 100% rename from langtools/test/tools/javac/CyclicInheritance6/p1/A.java rename to test/langtools/tools/javac/CyclicInheritance6/p1/A.java diff --git a/langtools/test/tools/javac/CyclicInheritance6/p1/B.java b/test/langtools/tools/javac/CyclicInheritance6/p1/B.java similarity index 100% rename from langtools/test/tools/javac/CyclicInheritance6/p1/B.java rename to test/langtools/tools/javac/CyclicInheritance6/p1/B.java diff --git a/langtools/test/tools/javac/CyclicInheritance6/p1/C.java b/test/langtools/tools/javac/CyclicInheritance6/p1/C.java similarity index 100% rename from langtools/test/tools/javac/CyclicInheritance6/p1/C.java rename to test/langtools/tools/javac/CyclicInheritance6/p1/C.java diff --git a/langtools/test/tools/javac/CyclicScoping/CyclicScoping_1.java b/test/langtools/tools/javac/CyclicScoping/CyclicScoping_1.java similarity index 100% rename from langtools/test/tools/javac/CyclicScoping/CyclicScoping_1.java rename to test/langtools/tools/javac/CyclicScoping/CyclicScoping_1.java diff --git a/langtools/test/tools/javac/CyclicScoping/CyclicScoping_2.java b/test/langtools/tools/javac/CyclicScoping/CyclicScoping_2.java similarity index 100% rename from langtools/test/tools/javac/CyclicScoping/CyclicScoping_2.java rename to test/langtools/tools/javac/CyclicScoping/CyclicScoping_2.java diff --git a/langtools/test/tools/javac/DeadInnerClass.java b/test/langtools/tools/javac/DeadInnerClass.java similarity index 100% rename from langtools/test/tools/javac/DeadInnerClass.java rename to test/langtools/tools/javac/DeadInnerClass.java diff --git a/langtools/test/tools/javac/DeclarationStatementInline.java b/test/langtools/tools/javac/DeclarationStatementInline.java similarity index 100% rename from langtools/test/tools/javac/DeclarationStatementInline.java rename to test/langtools/tools/javac/DeclarationStatementInline.java diff --git a/langtools/test/tools/javac/DeepStringConcat.java b/test/langtools/tools/javac/DeepStringConcat.java similarity index 100% rename from langtools/test/tools/javac/DeepStringConcat.java rename to test/langtools/tools/javac/DeepStringConcat.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/7003744/T7003744a.java b/test/langtools/tools/javac/DefiniteAssignment/7003744/T7003744a.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/7003744/T7003744a.java rename to test/langtools/tools/javac/DefiniteAssignment/7003744/T7003744a.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/7003744/T7003744b.java b/test/langtools/tools/javac/DefiniteAssignment/7003744/T7003744b.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/7003744/T7003744b.java rename to test/langtools/tools/javac/DefiniteAssignment/7003744/T7003744b.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/8156180/T8156180.java b/test/langtools/tools/javac/DefiniteAssignment/8156180/T8156180.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/8156180/T8156180.java rename to test/langtools/tools/javac/DefiniteAssignment/8156180/T8156180.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/8156180/T8156180.out b/test/langtools/tools/javac/DefiniteAssignment/8156180/T8156180.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/8156180/T8156180.out rename to test/langtools/tools/javac/DefiniteAssignment/8156180/T8156180.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/ConstantInfiniteWhile.java b/test/langtools/tools/javac/DefiniteAssignment/ConstantInfiniteWhile.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/ConstantInfiniteWhile.java rename to test/langtools/tools/javac/DefiniteAssignment/ConstantInfiniteWhile.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DABlock.java b/test/langtools/tools/javac/DefiniteAssignment/DABlock.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DABlock.java rename to test/langtools/tools/javac/DefiniteAssignment/DABlock.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DALoop1.java b/test/langtools/tools/javac/DefiniteAssignment/DALoop1.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DALoop1.java rename to test/langtools/tools/javac/DefiniteAssignment/DALoop1.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DASwitch.java b/test/langtools/tools/javac/DefiniteAssignment/DASwitch.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DASwitch.java rename to test/langtools/tools/javac/DefiniteAssignment/DASwitch.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DASwitch.out b/test/langtools/tools/javac/DefiniteAssignment/DASwitch.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DASwitch.out rename to test/langtools/tools/javac/DefiniteAssignment/DASwitch.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/DUAssert.java b/test/langtools/tools/javac/DefiniteAssignment/DUAssert.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DUAssert.java rename to test/langtools/tools/javac/DefiniteAssignment/DUAssert.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DUBeforeDefined1.java b/test/langtools/tools/javac/DefiniteAssignment/DUBeforeDefined1.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DUBeforeDefined1.java rename to test/langtools/tools/javac/DefiniteAssignment/DUBeforeDefined1.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DUBeforeDefined2.java b/test/langtools/tools/javac/DefiniteAssignment/DUBeforeDefined2.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DUBeforeDefined2.java rename to test/langtools/tools/javac/DefiniteAssignment/DUBeforeDefined2.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DUParam1.java b/test/langtools/tools/javac/DefiniteAssignment/DUParam1.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DUParam1.java rename to test/langtools/tools/javac/DefiniteAssignment/DUParam1.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DUParam1.out b/test/langtools/tools/javac/DefiniteAssignment/DUParam1.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DUParam1.out rename to test/langtools/tools/javac/DefiniteAssignment/DUParam1.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/DUParam2.java b/test/langtools/tools/javac/DefiniteAssignment/DUParam2.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DUParam2.java rename to test/langtools/tools/javac/DefiniteAssignment/DUParam2.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DUParam2.out b/test/langtools/tools/javac/DefiniteAssignment/DUParam2.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DUParam2.out rename to test/langtools/tools/javac/DefiniteAssignment/DUParam2.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/DUSwitch.java b/test/langtools/tools/javac/DefiniteAssignment/DUSwitch.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DUSwitch.java rename to test/langtools/tools/javac/DefiniteAssignment/DUSwitch.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DUSwitch2.java b/test/langtools/tools/javac/DefiniteAssignment/DUSwitch2.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DUSwitch2.java rename to test/langtools/tools/javac/DefiniteAssignment/DUSwitch2.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DUTry.java b/test/langtools/tools/javac/DefiniteAssignment/DUTry.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DUTry.java rename to test/langtools/tools/javac/DefiniteAssignment/DUTry.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterIf_1.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterIf_1.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterIf_1.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterIf_1.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterIf_2.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterIf_2.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterIf_2.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterIf_2.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterThis_1.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterThis_1.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterThis_1.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterThis_1.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterThis_1.out b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterThis_1.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterThis_1.out rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterThis_1.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterThis_2.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterThis_2.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterThis_2.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterThis_2.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterTry1.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry1.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterTry1.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry1.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterTry1.out b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry1.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterTry1.out rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry1.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterTry2.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry2.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterTry2.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry2.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterTry2.out b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry2.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterTry2.out rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry2.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterTry3.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry3.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterTry3.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry3.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterTry3.out b/test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry3.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignAfterTry3.out rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry3.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_1.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_1.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_1.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_1.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_10.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_10.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_10.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_10.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_11.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_11.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_11.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_11.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_12.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_12.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_12.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_12.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_13.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_13.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_13.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_13.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_14.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_14.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_14.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_14.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_15.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_15.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_15.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_15.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_16.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_16.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_16.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_16.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_2.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_2.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_2.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_2.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_3.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_3.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_3.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_3.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_4.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_4.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_4.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_4.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_5.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_5.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_5.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_5.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_6.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_6.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_6.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_6.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_7.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_7.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_7.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_7.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_8.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_8.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_8.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_8.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_9.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_9.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_9.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_9.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignCond.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignCond.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignCond.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignCond.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignConstantBoolean.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignConstantBoolean.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignConstantBoolean.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignConstantBoolean.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/DefAssignNestedArg.java b/test/langtools/tools/javac/DefiniteAssignment/DefAssignNestedArg.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/DefAssignNestedArg.java rename to test/langtools/tools/javac/DefiniteAssignment/DefAssignNestedArg.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4704365.java b/test/langtools/tools/javac/DefiniteAssignment/T4704365.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4704365.java rename to test/langtools/tools/javac/DefiniteAssignment/T4704365.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4704365.out b/test/langtools/tools/javac/DefiniteAssignment/T4704365.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4704365.out rename to test/langtools/tools/javac/DefiniteAssignment/T4704365.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4717164.java b/test/langtools/tools/javac/DefiniteAssignment/T4717164.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4717164.java rename to test/langtools/tools/javac/DefiniteAssignment/T4717164.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4717164.out b/test/langtools/tools/javac/DefiniteAssignment/T4717164.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4717164.out rename to test/langtools/tools/javac/DefiniteAssignment/T4717164.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4717165.java b/test/langtools/tools/javac/DefiniteAssignment/T4717165.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4717165.java rename to test/langtools/tools/javac/DefiniteAssignment/T4717165.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4717165.out b/test/langtools/tools/javac/DefiniteAssignment/T4717165.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4717165.out rename to test/langtools/tools/javac/DefiniteAssignment/T4717165.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4718134.java b/test/langtools/tools/javac/DefiniteAssignment/T4718134.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4718134.java rename to test/langtools/tools/javac/DefiniteAssignment/T4718134.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4718142.java b/test/langtools/tools/javac/DefiniteAssignment/T4718142.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4718142.java rename to test/langtools/tools/javac/DefiniteAssignment/T4718142.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4718142.out b/test/langtools/tools/javac/DefiniteAssignment/T4718142.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4718142.out rename to test/langtools/tools/javac/DefiniteAssignment/T4718142.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4718142a.java b/test/langtools/tools/javac/DefiniteAssignment/T4718142a.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4718142a.java rename to test/langtools/tools/javac/DefiniteAssignment/T4718142a.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4718142a.out b/test/langtools/tools/javac/DefiniteAssignment/T4718142a.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4718142a.out rename to test/langtools/tools/javac/DefiniteAssignment/T4718142a.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4718708.java b/test/langtools/tools/javac/DefiniteAssignment/T4718708.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4718708.java rename to test/langtools/tools/javac/DefiniteAssignment/T4718708.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4718708.out b/test/langtools/tools/javac/DefiniteAssignment/T4718708.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4718708.out rename to test/langtools/tools/javac/DefiniteAssignment/T4718708.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4720379.java b/test/langtools/tools/javac/DefiniteAssignment/T4720379.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4720379.java rename to test/langtools/tools/javac/DefiniteAssignment/T4720379.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4720751.java b/test/langtools/tools/javac/DefiniteAssignment/T4720751.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4720751.java rename to test/langtools/tools/javac/DefiniteAssignment/T4720751.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4721062a.java b/test/langtools/tools/javac/DefiniteAssignment/T4721062a.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4721062a.java rename to test/langtools/tools/javac/DefiniteAssignment/T4721062a.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4721062a.out b/test/langtools/tools/javac/DefiniteAssignment/T4721062a.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4721062a.out rename to test/langtools/tools/javac/DefiniteAssignment/T4721062a.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4721062b.java b/test/langtools/tools/javac/DefiniteAssignment/T4721062b.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4721062b.java rename to test/langtools/tools/javac/DefiniteAssignment/T4721062b.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4721062b.out b/test/langtools/tools/javac/DefiniteAssignment/T4721062b.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4721062b.out rename to test/langtools/tools/javac/DefiniteAssignment/T4721062b.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4721076.java b/test/langtools/tools/javac/DefiniteAssignment/T4721076.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4721076.java rename to test/langtools/tools/javac/DefiniteAssignment/T4721076.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4721998.java b/test/langtools/tools/javac/DefiniteAssignment/T4721998.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4721998.java rename to test/langtools/tools/javac/DefiniteAssignment/T4721998.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4725725.java b/test/langtools/tools/javac/DefiniteAssignment/T4725725.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4725725.java rename to test/langtools/tools/javac/DefiniteAssignment/T4725725.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T4725725.out b/test/langtools/tools/javac/DefiniteAssignment/T4725725.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T4725725.out rename to test/langtools/tools/javac/DefiniteAssignment/T4725725.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/T7181578.java b/test/langtools/tools/javac/DefiniteAssignment/T7181578.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T7181578.java rename to test/langtools/tools/javac/DefiniteAssignment/T7181578.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T8039026.java b/test/langtools/tools/javac/DefiniteAssignment/T8039026.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T8039026.java rename to test/langtools/tools/javac/DefiniteAssignment/T8039026.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/T8039026.out b/test/langtools/tools/javac/DefiniteAssignment/T8039026.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/T8039026.out rename to test/langtools/tools/javac/DefiniteAssignment/T8039026.out diff --git a/langtools/test/tools/javac/DefiniteAssignment/ThrowBeforeTryFinally.java b/test/langtools/tools/javac/DefiniteAssignment/ThrowBeforeTryFinally.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/ThrowBeforeTryFinally.java rename to test/langtools/tools/javac/DefiniteAssignment/ThrowBeforeTryFinally.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/UncaughtException.java b/test/langtools/tools/javac/DefiniteAssignment/UncaughtException.java similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/UncaughtException.java rename to test/langtools/tools/javac/DefiniteAssignment/UncaughtException.java diff --git a/langtools/test/tools/javac/DefiniteAssignment/UncaughtException.out b/test/langtools/tools/javac/DefiniteAssignment/UncaughtException.out similarity index 100% rename from langtools/test/tools/javac/DefiniteAssignment/UncaughtException.out rename to test/langtools/tools/javac/DefiniteAssignment/UncaughtException.out diff --git a/langtools/test/tools/javac/DepParam.java b/test/langtools/tools/javac/DepParam.java similarity index 100% rename from langtools/test/tools/javac/DepParam.java rename to test/langtools/tools/javac/DepParam.java diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234a.java b/test/langtools/tools/javac/Diagnostics/6722234/T6722234a.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6722234/T6722234a.java rename to test/langtools/tools/javac/Diagnostics/6722234/T6722234a.java diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234a_1.out b/test/langtools/tools/javac/Diagnostics/6722234/T6722234a_1.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6722234/T6722234a_1.out rename to test/langtools/tools/javac/Diagnostics/6722234/T6722234a_1.out diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234a_2.out b/test/langtools/tools/javac/Diagnostics/6722234/T6722234a_2.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6722234/T6722234a_2.out rename to test/langtools/tools/javac/Diagnostics/6722234/T6722234a_2.out diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234b.java b/test/langtools/tools/javac/Diagnostics/6722234/T6722234b.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6722234/T6722234b.java rename to test/langtools/tools/javac/Diagnostics/6722234/T6722234b.java diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234b_1.out b/test/langtools/tools/javac/Diagnostics/6722234/T6722234b_1.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6722234/T6722234b_1.out rename to test/langtools/tools/javac/Diagnostics/6722234/T6722234b_1.out diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234b_2.out b/test/langtools/tools/javac/Diagnostics/6722234/T6722234b_2.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6722234/T6722234b_2.out rename to test/langtools/tools/javac/Diagnostics/6722234/T6722234b_2.out diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234c.java b/test/langtools/tools/javac/Diagnostics/6722234/T6722234c.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6722234/T6722234c.java rename to test/langtools/tools/javac/Diagnostics/6722234/T6722234c.java diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234c.out b/test/langtools/tools/javac/Diagnostics/6722234/T6722234c.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6722234/T6722234c.out rename to test/langtools/tools/javac/Diagnostics/6722234/T6722234c.out diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234d.java b/test/langtools/tools/javac/Diagnostics/6722234/T6722234d.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6722234/T6722234d.java rename to test/langtools/tools/javac/Diagnostics/6722234/T6722234d.java diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_1.out b/test/langtools/tools/javac/Diagnostics/6722234/T6722234d_1.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6722234/T6722234d_1.out rename to test/langtools/tools/javac/Diagnostics/6722234/T6722234d_1.out diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_2.out b/test/langtools/tools/javac/Diagnostics/6722234/T6722234d_2.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6722234/T6722234d_2.out rename to test/langtools/tools/javac/Diagnostics/6722234/T6722234d_2.out diff --git a/langtools/test/tools/javac/Diagnostics/6769027/T6769027.java b/test/langtools/tools/javac/Diagnostics/6769027/T6769027.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6769027/T6769027.java rename to test/langtools/tools/javac/Diagnostics/6769027/T6769027.java diff --git a/langtools/test/tools/javac/Diagnostics/6769027/tester.properties b/test/langtools/tools/javac/Diagnostics/6769027/tester.properties similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6769027/tester.properties rename to test/langtools/tools/javac/Diagnostics/6769027/tester.properties diff --git a/langtools/test/tools/javac/Diagnostics/6799605/T6799605.java b/test/langtools/tools/javac/Diagnostics/6799605/T6799605.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6799605/T6799605.java rename to test/langtools/tools/javac/Diagnostics/6799605/T6799605.java diff --git a/langtools/test/tools/javac/Diagnostics/6799605/T6799605.out b/test/langtools/tools/javac/Diagnostics/6799605/T6799605.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6799605/T6799605.out rename to test/langtools/tools/javac/Diagnostics/6799605/T6799605.out diff --git a/langtools/test/tools/javac/Diagnostics/6860795/T6860795.java b/test/langtools/tools/javac/Diagnostics/6860795/T6860795.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6860795/T6860795.java rename to test/langtools/tools/javac/Diagnostics/6860795/T6860795.java diff --git a/langtools/test/tools/javac/Diagnostics/6860795/T6860795.out b/test/langtools/tools/javac/Diagnostics/6860795/T6860795.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6860795/T6860795.out rename to test/langtools/tools/javac/Diagnostics/6860795/T6860795.out diff --git a/langtools/test/tools/javac/Diagnostics/6862608/T6862608a.java b/test/langtools/tools/javac/Diagnostics/6862608/T6862608a.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6862608/T6862608a.java rename to test/langtools/tools/javac/Diagnostics/6862608/T6862608a.java diff --git a/langtools/test/tools/javac/Diagnostics/6862608/T6862608a.out b/test/langtools/tools/javac/Diagnostics/6862608/T6862608a.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6862608/T6862608a.out rename to test/langtools/tools/javac/Diagnostics/6862608/T6862608a.out diff --git a/langtools/test/tools/javac/Diagnostics/6862608/T6862608b.java b/test/langtools/tools/javac/Diagnostics/6862608/T6862608b.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6862608/T6862608b.java rename to test/langtools/tools/javac/Diagnostics/6862608/T6862608b.java diff --git a/langtools/test/tools/javac/Diagnostics/6862608/T6862608b.out b/test/langtools/tools/javac/Diagnostics/6862608/T6862608b.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6862608/T6862608b.out rename to test/langtools/tools/javac/Diagnostics/6862608/T6862608b.out diff --git a/langtools/test/tools/javac/Diagnostics/6864382/T6864382.java b/test/langtools/tools/javac/Diagnostics/6864382/T6864382.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6864382/T6864382.java rename to test/langtools/tools/javac/Diagnostics/6864382/T6864382.java diff --git a/langtools/test/tools/javac/Diagnostics/6864382/T6864382.out b/test/langtools/tools/javac/Diagnostics/6864382/T6864382.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/6864382/T6864382.out rename to test/langtools/tools/javac/Diagnostics/6864382/T6864382.out diff --git a/langtools/test/tools/javac/Diagnostics/7010608/Test.java b/test/langtools/tools/javac/Diagnostics/7010608/Test.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/7010608/Test.java rename to test/langtools/tools/javac/Diagnostics/7010608/Test.java diff --git a/langtools/test/tools/javac/Diagnostics/7116676/T7116676.java b/test/langtools/tools/javac/Diagnostics/7116676/T7116676.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/7116676/T7116676.java rename to test/langtools/tools/javac/Diagnostics/7116676/T7116676.java diff --git a/langtools/test/tools/javac/Diagnostics/8010387/T8010387.java b/test/langtools/tools/javac/Diagnostics/8010387/T8010387.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/8010387/T8010387.java rename to test/langtools/tools/javac/Diagnostics/8010387/T8010387.java diff --git a/langtools/test/tools/javac/Diagnostics/8010387/T8010387.out b/test/langtools/tools/javac/Diagnostics/8010387/T8010387.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/8010387/T8010387.out rename to test/langtools/tools/javac/Diagnostics/8010387/T8010387.out diff --git a/langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883.java b/test/langtools/tools/javac/Diagnostics/compressed/8067883/T8067883.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883.java rename to test/langtools/tools/javac/Diagnostics/compressed/8067883/T8067883.java diff --git a/langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883a.out b/test/langtools/tools/javac/Diagnostics/compressed/8067883/T8067883a.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883a.out rename to test/langtools/tools/javac/Diagnostics/compressed/8067883/T8067883a.out diff --git a/langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883b.out b/test/langtools/tools/javac/Diagnostics/compressed/8067883/T8067883b.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883b.out rename to test/langtools/tools/javac/Diagnostics/compressed/8067883/T8067883b.out diff --git a/langtools/test/tools/javac/Diagnostics/compressed/T8012003a.java b/test/langtools/tools/javac/Diagnostics/compressed/T8012003a.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/compressed/T8012003a.java rename to test/langtools/tools/javac/Diagnostics/compressed/T8012003a.java diff --git a/langtools/test/tools/javac/Diagnostics/compressed/T8012003a.out b/test/langtools/tools/javac/Diagnostics/compressed/T8012003a.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/compressed/T8012003a.out rename to test/langtools/tools/javac/Diagnostics/compressed/T8012003a.out diff --git a/langtools/test/tools/javac/Diagnostics/compressed/T8012003b.java b/test/langtools/tools/javac/Diagnostics/compressed/T8012003b.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/compressed/T8012003b.java rename to test/langtools/tools/javac/Diagnostics/compressed/T8012003b.java diff --git a/langtools/test/tools/javac/Diagnostics/compressed/T8012003b.out b/test/langtools/tools/javac/Diagnostics/compressed/T8012003b.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/compressed/T8012003b.out rename to test/langtools/tools/javac/Diagnostics/compressed/T8012003b.out diff --git a/langtools/test/tools/javac/Diagnostics/compressed/T8012003c.java b/test/langtools/tools/javac/Diagnostics/compressed/T8012003c.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/compressed/T8012003c.java rename to test/langtools/tools/javac/Diagnostics/compressed/T8012003c.java diff --git a/langtools/test/tools/javac/Diagnostics/compressed/T8012003c.out b/test/langtools/tools/javac/Diagnostics/compressed/T8012003c.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/compressed/T8012003c.out rename to test/langtools/tools/javac/Diagnostics/compressed/T8012003c.out diff --git a/langtools/test/tools/javac/Diagnostics/compressed/T8020286.java b/test/langtools/tools/javac/Diagnostics/compressed/T8020286.java similarity index 100% rename from langtools/test/tools/javac/Diagnostics/compressed/T8020286.java rename to test/langtools/tools/javac/Diagnostics/compressed/T8020286.java diff --git a/langtools/test/tools/javac/Diagnostics/compressed/T8020286.out b/test/langtools/tools/javac/Diagnostics/compressed/T8020286.out similarity index 100% rename from langtools/test/tools/javac/Diagnostics/compressed/T8020286.out rename to test/langtools/tools/javac/Diagnostics/compressed/T8020286.out diff --git a/langtools/test/tools/javac/Digits.java b/test/langtools/tools/javac/Digits.java similarity index 100% rename from langtools/test/tools/javac/Digits.java rename to test/langtools/tools/javac/Digits.java diff --git a/langtools/test/tools/javac/Digits.out b/test/langtools/tools/javac/Digits.out similarity index 100% rename from langtools/test/tools/javac/Digits.out rename to test/langtools/tools/javac/Digits.out diff --git a/langtools/test/tools/javac/DivByZero.java b/test/langtools/tools/javac/DivByZero.java similarity index 100% rename from langtools/test/tools/javac/DivByZero.java rename to test/langtools/tools/javac/DivByZero.java diff --git a/langtools/test/tools/javac/DuplicateClass.java b/test/langtools/tools/javac/DuplicateClass.java similarity index 100% rename from langtools/test/tools/javac/DuplicateClass.java rename to test/langtools/tools/javac/DuplicateClass.java diff --git a/langtools/test/tools/javac/DuplicateClass.out b/test/langtools/tools/javac/DuplicateClass.out similarity index 100% rename from langtools/test/tools/javac/DuplicateClass.out rename to test/langtools/tools/javac/DuplicateClass.out diff --git a/langtools/test/tools/javac/DuplicateClass2.java b/test/langtools/tools/javac/DuplicateClass2.java similarity index 100% rename from langtools/test/tools/javac/DuplicateClass2.java rename to test/langtools/tools/javac/DuplicateClass2.java diff --git a/langtools/test/tools/javac/DuplicateImport.java b/test/langtools/tools/javac/DuplicateImport.java similarity index 100% rename from langtools/test/tools/javac/DuplicateImport.java rename to test/langtools/tools/javac/DuplicateImport.java diff --git a/langtools/test/tools/javac/EOI.java b/test/langtools/tools/javac/EOI.java similarity index 100% rename from langtools/test/tools/javac/EOI.java rename to test/langtools/tools/javac/EOI.java diff --git a/langtools/test/tools/javac/EOI.out b/test/langtools/tools/javac/EOI.out similarity index 100% rename from langtools/test/tools/javac/EOI.out rename to test/langtools/tools/javac/EOI.out diff --git a/langtools/test/tools/javac/EarlyAssert.java b/test/langtools/tools/javac/EarlyAssert.java similarity index 100% rename from langtools/test/tools/javac/EarlyAssert.java rename to test/langtools/tools/javac/EarlyAssert.java diff --git a/langtools/test/tools/javac/EarlyAssertWrapper.java b/test/langtools/tools/javac/EarlyAssertWrapper.java similarity index 100% rename from langtools/test/tools/javac/EarlyAssertWrapper.java rename to test/langtools/tools/javac/EarlyAssertWrapper.java diff --git a/langtools/test/tools/javac/EmptyArray.java b/test/langtools/tools/javac/EmptyArray.java similarity index 100% rename from langtools/test/tools/javac/EmptyArray.java rename to test/langtools/tools/javac/EmptyArray.java diff --git a/langtools/test/tools/javac/EmptyBreak.java b/test/langtools/tools/javac/EmptyBreak.java similarity index 100% rename from langtools/test/tools/javac/EmptyBreak.java rename to test/langtools/tools/javac/EmptyBreak.java diff --git a/langtools/test/tools/javac/EmptyDocComments.java b/test/langtools/tools/javac/EmptyDocComments.java similarity index 100% rename from langtools/test/tools/javac/EmptyDocComments.java rename to test/langtools/tools/javac/EmptyDocComments.java diff --git a/langtools/test/tools/javac/EmptySwitch.java b/test/langtools/tools/javac/EmptySwitch.java similarity index 100% rename from langtools/test/tools/javac/EmptySwitch.java rename to test/langtools/tools/javac/EmptySwitch.java diff --git a/langtools/test/tools/javac/EnclosingAccessCheck.java b/test/langtools/tools/javac/EnclosingAccessCheck.java similarity index 100% rename from langtools/test/tools/javac/EnclosingAccessCheck.java rename to test/langtools/tools/javac/EnclosingAccessCheck.java diff --git a/langtools/test/tools/javac/Enum1.java b/test/langtools/tools/javac/Enum1.java similarity index 100% rename from langtools/test/tools/javac/Enum1.java rename to test/langtools/tools/javac/Enum1.java diff --git a/langtools/test/tools/javac/ExceptionalFinally.java b/test/langtools/tools/javac/ExceptionalFinally.java similarity index 100% rename from langtools/test/tools/javac/ExceptionalFinally.java rename to test/langtools/tools/javac/ExceptionalFinally.java diff --git a/langtools/test/tools/javac/ExceptionalFinally2.java b/test/langtools/tools/javac/ExceptionalFinally2.java similarity index 100% rename from langtools/test/tools/javac/ExceptionalFinally2.java rename to test/langtools/tools/javac/ExceptionalFinally2.java diff --git a/langtools/test/tools/javac/ExceptionalFinally2.out b/test/langtools/tools/javac/ExceptionalFinally2.out similarity index 100% rename from langtools/test/tools/javac/ExceptionalFinally2.out rename to test/langtools/tools/javac/ExceptionalFinally2.out diff --git a/langtools/test/tools/javac/ExprQualifiedType.java b/test/langtools/tools/javac/ExprQualifiedType.java similarity index 100% rename from langtools/test/tools/javac/ExprQualifiedType.java rename to test/langtools/tools/javac/ExprQualifiedType.java diff --git a/langtools/test/tools/javac/ExprQualifiedType.out b/test/langtools/tools/javac/ExprQualifiedType.out similarity index 100% rename from langtools/test/tools/javac/ExprQualifiedType.out rename to test/langtools/tools/javac/ExprQualifiedType.out diff --git a/langtools/test/tools/javac/ExtDirs/ExtDirTest.java b/test/langtools/tools/javac/ExtDirs/ExtDirTest.java similarity index 100% rename from langtools/test/tools/javac/ExtDirs/ExtDirTest.java rename to test/langtools/tools/javac/ExtDirs/ExtDirTest.java diff --git a/langtools/test/tools/javac/ExtendArray.java b/test/langtools/tools/javac/ExtendArray.java similarity index 100% rename from langtools/test/tools/javac/ExtendArray.java rename to test/langtools/tools/javac/ExtendArray.java diff --git a/langtools/test/tools/javac/ExtendArray.out b/test/langtools/tools/javac/ExtendArray.out similarity index 100% rename from langtools/test/tools/javac/ExtendArray.out rename to test/langtools/tools/javac/ExtendArray.out diff --git a/langtools/test/tools/javac/ExtendsAccess/ExtendsAccess.java b/test/langtools/tools/javac/ExtendsAccess/ExtendsAccess.java similarity index 100% rename from langtools/test/tools/javac/ExtendsAccess/ExtendsAccess.java rename to test/langtools/tools/javac/ExtendsAccess/ExtendsAccess.java diff --git a/langtools/test/tools/javac/ExtendsAccess/ExtendsAccess.out b/test/langtools/tools/javac/ExtendsAccess/ExtendsAccess.out similarity index 100% rename from langtools/test/tools/javac/ExtendsAccess/ExtendsAccess.out rename to test/langtools/tools/javac/ExtendsAccess/ExtendsAccess.out diff --git a/langtools/test/tools/javac/ExtendsAccess/p/ExtendsAccess.java b/test/langtools/tools/javac/ExtendsAccess/p/ExtendsAccess.java similarity index 100% rename from langtools/test/tools/javac/ExtendsAccess/p/ExtendsAccess.java rename to test/langtools/tools/javac/ExtendsAccess/p/ExtendsAccess.java diff --git a/langtools/test/tools/javac/ExtendsScope.java b/test/langtools/tools/javac/ExtendsScope.java similarity index 100% rename from langtools/test/tools/javac/ExtendsScope.java rename to test/langtools/tools/javac/ExtendsScope.java diff --git a/langtools/test/tools/javac/ExtendsScope.out b/test/langtools/tools/javac/ExtendsScope.out similarity index 100% rename from langtools/test/tools/javac/ExtendsScope.out rename to test/langtools/tools/javac/ExtendsScope.out diff --git a/langtools/test/tools/javac/ExtraneousEquals.java b/test/langtools/tools/javac/ExtraneousEquals.java similarity index 100% rename from langtools/test/tools/javac/ExtraneousEquals.java rename to test/langtools/tools/javac/ExtraneousEquals.java diff --git a/langtools/test/tools/javac/ExtraneousEquals.out b/test/langtools/tools/javac/ExtraneousEquals.out similarity index 100% rename from langtools/test/tools/javac/ExtraneousEquals.out rename to test/langtools/tools/javac/ExtraneousEquals.out diff --git a/langtools/test/tools/javac/FaultySignature.java b/test/langtools/tools/javac/FaultySignature.java similarity index 100% rename from langtools/test/tools/javac/FaultySignature.java rename to test/langtools/tools/javac/FaultySignature.java diff --git a/langtools/test/tools/javac/FinalInitializer.java b/test/langtools/tools/javac/FinalInitializer.java similarity index 100% rename from langtools/test/tools/javac/FinalInitializer.java rename to test/langtools/tools/javac/FinalInitializer.java diff --git a/langtools/test/tools/javac/FinalInitializer_2.java b/test/langtools/tools/javac/FinalInitializer_2.java similarity index 100% rename from langtools/test/tools/javac/FinalInitializer_2.java rename to test/langtools/tools/javac/FinalInitializer_2.java diff --git a/langtools/test/tools/javac/FinalIntConcatenation.java b/test/langtools/tools/javac/FinalIntConcatenation.java similarity index 100% rename from langtools/test/tools/javac/FinalIntConcatenation.java rename to test/langtools/tools/javac/FinalIntConcatenation.java diff --git a/langtools/test/tools/javac/FinalThisReference.java b/test/langtools/tools/javac/FinalThisReference.java similarity index 100% rename from langtools/test/tools/javac/FinalThisReference.java rename to test/langtools/tools/javac/FinalThisReference.java diff --git a/langtools/test/tools/javac/FinallyWarn.java b/test/langtools/tools/javac/FinallyWarn.java similarity index 100% rename from langtools/test/tools/javac/FinallyWarn.java rename to test/langtools/tools/javac/FinallyWarn.java diff --git a/langtools/test/tools/javac/FinallyWarn.out b/test/langtools/tools/javac/FinallyWarn.out similarity index 100% rename from langtools/test/tools/javac/FinallyWarn.out rename to test/langtools/tools/javac/FinallyWarn.out diff --git a/langtools/test/tools/javac/FlatnameClash.java b/test/langtools/tools/javac/FlatnameClash.java similarity index 100% rename from langtools/test/tools/javac/FlatnameClash.java rename to test/langtools/tools/javac/FlatnameClash.java diff --git a/langtools/test/tools/javac/FlatnameClash2.java b/test/langtools/tools/javac/FlatnameClash2.java similarity index 100% rename from langtools/test/tools/javac/FlatnameClash2.java rename to test/langtools/tools/javac/FlatnameClash2.java diff --git a/langtools/test/tools/javac/FlatnameClash2.out b/test/langtools/tools/javac/FlatnameClash2.out similarity index 100% rename from langtools/test/tools/javac/FlatnameClash2.out rename to test/langtools/tools/javac/FlatnameClash2.out diff --git a/langtools/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.java b/test/langtools/tools/javac/FloatingPointChanges/BadConstructorModifiers.java similarity index 100% rename from langtools/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.java rename to test/langtools/tools/javac/FloatingPointChanges/BadConstructorModifiers.java diff --git a/langtools/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.out b/test/langtools/tools/javac/FloatingPointChanges/BadConstructorModifiers.out similarity index 100% rename from langtools/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.out rename to test/langtools/tools/javac/FloatingPointChanges/BadConstructorModifiers.out diff --git a/langtools/test/tools/javac/FloatingPointChanges/Test.java b/test/langtools/tools/javac/FloatingPointChanges/Test.java similarity index 100% rename from langtools/test/tools/javac/FloatingPointChanges/Test.java rename to test/langtools/tools/javac/FloatingPointChanges/Test.java diff --git a/langtools/test/tools/javac/FoldConditional.java b/test/langtools/tools/javac/FoldConditional.java similarity index 100% rename from langtools/test/tools/javac/FoldConditional.java rename to test/langtools/tools/javac/FoldConditional.java diff --git a/langtools/test/tools/javac/ForwardReference/ForwardReference_2.java b/test/langtools/tools/javac/ForwardReference/ForwardReference_2.java similarity index 100% rename from langtools/test/tools/javac/ForwardReference/ForwardReference_2.java rename to test/langtools/tools/javac/ForwardReference/ForwardReference_2.java diff --git a/langtools/test/tools/javac/ForwardReference/ForwardReference_4.java b/test/langtools/tools/javac/ForwardReference/ForwardReference_4.java similarity index 100% rename from langtools/test/tools/javac/ForwardReference/ForwardReference_4.java rename to test/langtools/tools/javac/ForwardReference/ForwardReference_4.java diff --git a/langtools/test/tools/javac/ForwardReference/ForwardReference_5.java b/test/langtools/tools/javac/ForwardReference/ForwardReference_5.java similarity index 100% rename from langtools/test/tools/javac/ForwardReference/ForwardReference_5.java rename to test/langtools/tools/javac/ForwardReference/ForwardReference_5.java diff --git a/langtools/test/tools/javac/ForwardReference/T6676362a.java b/test/langtools/tools/javac/ForwardReference/T6676362a.java similarity index 100% rename from langtools/test/tools/javac/ForwardReference/T6676362a.java rename to test/langtools/tools/javac/ForwardReference/T6676362a.java diff --git a/langtools/test/tools/javac/ForwardReference/T6676362b.java b/test/langtools/tools/javac/ForwardReference/T6676362b.java similarity index 100% rename from langtools/test/tools/javac/ForwardReference/T6676362b.java rename to test/langtools/tools/javac/ForwardReference/T6676362b.java diff --git a/langtools/test/tools/javac/ForwardReference/UseBeforeDeclaration.java b/test/langtools/tools/javac/ForwardReference/UseBeforeDeclaration.java similarity index 100% rename from langtools/test/tools/javac/ForwardReference/UseBeforeDeclaration.java rename to test/langtools/tools/javac/ForwardReference/UseBeforeDeclaration.java diff --git a/langtools/test/tools/javac/GoodCovar.java b/test/langtools/tools/javac/GoodCovar.java similarity index 100% rename from langtools/test/tools/javac/GoodCovar.java rename to test/langtools/tools/javac/GoodCovar.java diff --git a/langtools/test/tools/javac/HexFloatLiterals.java b/test/langtools/tools/javac/HexFloatLiterals.java similarity index 100% rename from langtools/test/tools/javac/HexFloatLiterals.java rename to test/langtools/tools/javac/HexFloatLiterals.java diff --git a/langtools/test/tools/javac/HexThree.java b/test/langtools/tools/javac/HexThree.java similarity index 100% rename from langtools/test/tools/javac/HexThree.java rename to test/langtools/tools/javac/HexThree.java diff --git a/langtools/test/tools/javac/HiddenAbstractMethod/Test.java b/test/langtools/tools/javac/HiddenAbstractMethod/Test.java similarity index 100% rename from langtools/test/tools/javac/HiddenAbstractMethod/Test.java rename to test/langtools/tools/javac/HiddenAbstractMethod/Test.java diff --git a/langtools/test/tools/javac/HiddenAbstractMethod/Test.out b/test/langtools/tools/javac/HiddenAbstractMethod/Test.out similarity index 100% rename from langtools/test/tools/javac/HiddenAbstractMethod/Test.out rename to test/langtools/tools/javac/HiddenAbstractMethod/Test.out diff --git a/langtools/test/tools/javac/HiddenAbstractMethod/one/Parent.java b/test/langtools/tools/javac/HiddenAbstractMethod/one/Parent.java similarity index 100% rename from langtools/test/tools/javac/HiddenAbstractMethod/one/Parent.java rename to test/langtools/tools/javac/HiddenAbstractMethod/one/Parent.java diff --git a/langtools/test/tools/javac/HiddenAbstractMethod/two/Child.java b/test/langtools/tools/javac/HiddenAbstractMethod/two/Child.java similarity index 100% rename from langtools/test/tools/javac/HiddenAbstractMethod/two/Child.java rename to test/langtools/tools/javac/HiddenAbstractMethod/two/Child.java diff --git a/langtools/test/tools/javac/IllDefinedOrderOfInit.java b/test/langtools/tools/javac/IllDefinedOrderOfInit.java similarity index 100% rename from langtools/test/tools/javac/IllDefinedOrderOfInit.java rename to test/langtools/tools/javac/IllDefinedOrderOfInit.java diff --git a/langtools/test/tools/javac/IllegalAnnotation.java b/test/langtools/tools/javac/IllegalAnnotation.java similarity index 100% rename from langtools/test/tools/javac/IllegalAnnotation.java rename to test/langtools/tools/javac/IllegalAnnotation.java diff --git a/langtools/test/tools/javac/IllegalAnnotation.out b/test/langtools/tools/javac/IllegalAnnotation.out similarity index 100% rename from langtools/test/tools/javac/IllegalAnnotation.out rename to test/langtools/tools/javac/IllegalAnnotation.out diff --git a/langtools/test/tools/javac/IllegallyOptimizedException.java b/test/langtools/tools/javac/IllegallyOptimizedException.java similarity index 100% rename from langtools/test/tools/javac/IllegallyOptimizedException.java rename to test/langtools/tools/javac/IllegallyOptimizedException.java diff --git a/langtools/test/tools/javac/ImplicitToString.java b/test/langtools/tools/javac/ImplicitToString.java similarity index 100% rename from langtools/test/tools/javac/ImplicitToString.java rename to test/langtools/tools/javac/ImplicitToString.java diff --git a/langtools/test/tools/javac/ImportCycle/Dummy.java b/test/langtools/tools/javac/ImportCycle/Dummy.java similarity index 100% rename from langtools/test/tools/javac/ImportCycle/Dummy.java rename to test/langtools/tools/javac/ImportCycle/Dummy.java diff --git a/langtools/test/tools/javac/ImportCycle/foo/Bottom.java b/test/langtools/tools/javac/ImportCycle/foo/Bottom.java similarity index 100% rename from langtools/test/tools/javac/ImportCycle/foo/Bottom.java rename to test/langtools/tools/javac/ImportCycle/foo/Bottom.java diff --git a/langtools/test/tools/javac/ImportCycle/foo/Bottom2.java b/test/langtools/tools/javac/ImportCycle/foo/Bottom2.java similarity index 100% rename from langtools/test/tools/javac/ImportCycle/foo/Bottom2.java rename to test/langtools/tools/javac/ImportCycle/foo/Bottom2.java diff --git a/langtools/test/tools/javac/ImportCycle/foo/Middle.java b/test/langtools/tools/javac/ImportCycle/foo/Middle.java similarity index 100% rename from langtools/test/tools/javac/ImportCycle/foo/Middle.java rename to test/langtools/tools/javac/ImportCycle/foo/Middle.java diff --git a/langtools/test/tools/javac/ImportCycle/foo/Middle2.java b/test/langtools/tools/javac/ImportCycle/foo/Middle2.java similarity index 100% rename from langtools/test/tools/javac/ImportCycle/foo/Middle2.java rename to test/langtools/tools/javac/ImportCycle/foo/Middle2.java diff --git a/langtools/test/tools/javac/ImportCycle/foo/Top.java b/test/langtools/tools/javac/ImportCycle/foo/Top.java similarity index 100% rename from langtools/test/tools/javac/ImportCycle/foo/Top.java rename to test/langtools/tools/javac/ImportCycle/foo/Top.java diff --git a/langtools/test/tools/javac/ImportCycle/foo/Top2.java b/test/langtools/tools/javac/ImportCycle/foo/Top2.java similarity index 100% rename from langtools/test/tools/javac/ImportCycle/foo/Top2.java rename to test/langtools/tools/javac/ImportCycle/foo/Top2.java diff --git a/langtools/test/tools/javac/ImportPackagePrivateInner/Dummy.java b/test/langtools/tools/javac/ImportPackagePrivateInner/Dummy.java similarity index 100% rename from langtools/test/tools/javac/ImportPackagePrivateInner/Dummy.java rename to test/langtools/tools/javac/ImportPackagePrivateInner/Dummy.java diff --git a/langtools/test/tools/javac/ImportPackagePrivateInner/foo/Accessee.java b/test/langtools/tools/javac/ImportPackagePrivateInner/foo/Accessee.java similarity index 100% rename from langtools/test/tools/javac/ImportPackagePrivateInner/foo/Accessee.java rename to test/langtools/tools/javac/ImportPackagePrivateInner/foo/Accessee.java diff --git a/langtools/test/tools/javac/ImportPackagePrivateInner/foo/Accessor.java b/test/langtools/tools/javac/ImportPackagePrivateInner/foo/Accessor.java similarity index 100% rename from langtools/test/tools/javac/ImportPackagePrivateInner/foo/Accessor.java rename to test/langtools/tools/javac/ImportPackagePrivateInner/foo/Accessor.java diff --git a/langtools/test/tools/javac/ImportUnnamed/Dummy.java b/test/langtools/tools/javac/ImportUnnamed/Dummy.java similarity index 100% rename from langtools/test/tools/javac/ImportUnnamed/Dummy.java rename to test/langtools/tools/javac/ImportUnnamed/Dummy.java diff --git a/langtools/test/tools/javac/ImportUnnamed/Dummy.out b/test/langtools/tools/javac/ImportUnnamed/Dummy.out similarity index 100% rename from langtools/test/tools/javac/ImportUnnamed/Dummy.out rename to test/langtools/tools/javac/ImportUnnamed/Dummy.out diff --git a/langtools/test/tools/javac/ImportUnnamed/foo/A.java b/test/langtools/tools/javac/ImportUnnamed/foo/A.java similarity index 100% rename from langtools/test/tools/javac/ImportUnnamed/foo/A.java rename to test/langtools/tools/javac/ImportUnnamed/foo/A.java diff --git a/langtools/test/tools/javac/InconsistentInheritedSignature.java b/test/langtools/tools/javac/InconsistentInheritedSignature.java similarity index 100% rename from langtools/test/tools/javac/InconsistentInheritedSignature.java rename to test/langtools/tools/javac/InconsistentInheritedSignature.java diff --git a/langtools/test/tools/javac/InconsistentInheritedSignature.out b/test/langtools/tools/javac/InconsistentInheritedSignature.out similarity index 100% rename from langtools/test/tools/javac/InconsistentInheritedSignature.out rename to test/langtools/tools/javac/InconsistentInheritedSignature.out diff --git a/langtools/test/tools/javac/InconsistentStack.java b/test/langtools/tools/javac/InconsistentStack.java similarity index 100% rename from langtools/test/tools/javac/InconsistentStack.java rename to test/langtools/tools/javac/InconsistentStack.java diff --git a/langtools/test/tools/javac/IncorrectInheritance/IncorrectInheritanceTest.java b/test/langtools/tools/javac/IncorrectInheritance/IncorrectInheritanceTest.java similarity index 100% rename from langtools/test/tools/javac/IncorrectInheritance/IncorrectInheritanceTest.java rename to test/langtools/tools/javac/IncorrectInheritance/IncorrectInheritanceTest.java diff --git a/langtools/test/tools/javac/Increment.java b/test/langtools/tools/javac/Increment.java similarity index 100% rename from langtools/test/tools/javac/Increment.java rename to test/langtools/tools/javac/Increment.java diff --git a/langtools/test/tools/javac/InheritedPrivateImpl.java b/test/langtools/tools/javac/InheritedPrivateImpl.java similarity index 100% rename from langtools/test/tools/javac/InheritedPrivateImpl.java rename to test/langtools/tools/javac/InheritedPrivateImpl.java diff --git a/langtools/test/tools/javac/InitializerCompletion_1.java b/test/langtools/tools/javac/InitializerCompletion_1.java similarity index 100% rename from langtools/test/tools/javac/InitializerCompletion_1.java rename to test/langtools/tools/javac/InitializerCompletion_1.java diff --git a/langtools/test/tools/javac/InitializerCompletion_2.java b/test/langtools/tools/javac/InitializerCompletion_2.java similarity index 100% rename from langtools/test/tools/javac/InitializerCompletion_2.java rename to test/langtools/tools/javac/InitializerCompletion_2.java diff --git a/langtools/test/tools/javac/InitializerCompletion_3.java b/test/langtools/tools/javac/InitializerCompletion_3.java similarity index 100% rename from langtools/test/tools/javac/InitializerCompletion_3.java rename to test/langtools/tools/javac/InitializerCompletion_3.java diff --git a/langtools/test/tools/javac/InitializerCompletion_4.java b/test/langtools/tools/javac/InitializerCompletion_4.java similarity index 100% rename from langtools/test/tools/javac/InitializerCompletion_4.java rename to test/langtools/tools/javac/InitializerCompletion_4.java diff --git a/langtools/test/tools/javac/InnerClassesAttribute/Outside$1$Inside.jasm b/test/langtools/tools/javac/InnerClassesAttribute/Outside$1$Inside.jasm similarity index 100% rename from langtools/test/tools/javac/InnerClassesAttribute/Outside$1$Inside.jasm rename to test/langtools/tools/javac/InnerClassesAttribute/Outside$1$Inside.jasm diff --git a/langtools/test/tools/javac/InnerClassesAttribute/Outside.jasm b/test/langtools/tools/javac/InnerClassesAttribute/Outside.jasm similarity index 100% rename from langtools/test/tools/javac/InnerClassesAttribute/Outside.jasm rename to test/langtools/tools/javac/InnerClassesAttribute/Outside.jasm diff --git a/langtools/test/tools/javac/InnerClassesAttribute/Outside.java.back b/test/langtools/tools/javac/InnerClassesAttribute/Outside.java.back similarity index 100% rename from langtools/test/tools/javac/InnerClassesAttribute/Outside.java.back rename to test/langtools/tools/javac/InnerClassesAttribute/Outside.java.back diff --git a/langtools/test/tools/javac/InnerClassesAttribute/Test.java b/test/langtools/tools/javac/InnerClassesAttribute/Test.java similarity index 100% rename from langtools/test/tools/javac/InnerClassesAttribute/Test.java rename to test/langtools/tools/javac/InnerClassesAttribute/Test.java diff --git a/langtools/test/tools/javac/InnerMemberRegression.java b/test/langtools/tools/javac/InnerMemberRegression.java similarity index 100% rename from langtools/test/tools/javac/InnerMemberRegression.java rename to test/langtools/tools/javac/InnerMemberRegression.java diff --git a/langtools/test/tools/javac/InnerMethSig.java b/test/langtools/tools/javac/InnerMethSig.java similarity index 100% rename from langtools/test/tools/javac/InnerMethSig.java rename to test/langtools/tools/javac/InnerMethSig.java diff --git a/langtools/test/tools/javac/InnerNamedConstant_1.java b/test/langtools/tools/javac/InnerNamedConstant_1.java similarity index 100% rename from langtools/test/tools/javac/InnerNamedConstant_1.java rename to test/langtools/tools/javac/InnerNamedConstant_1.java diff --git a/langtools/test/tools/javac/InnerNamedConstant_2.java b/test/langtools/tools/javac/InnerNamedConstant_2.java similarity index 100% rename from langtools/test/tools/javac/InnerNamedConstant_2.java rename to test/langtools/tools/javac/InnerNamedConstant_2.java diff --git a/langtools/test/tools/javac/InnerNamedConstant_2.out b/test/langtools/tools/javac/InnerNamedConstant_2.out similarity index 100% rename from langtools/test/tools/javac/InnerNamedConstant_2.out rename to test/langtools/tools/javac/InnerNamedConstant_2.out diff --git a/langtools/test/tools/javac/InnerTruth.java b/test/langtools/tools/javac/InnerTruth.java similarity index 100% rename from langtools/test/tools/javac/InnerTruth.java rename to test/langtools/tools/javac/InnerTruth.java diff --git a/langtools/test/tools/javac/InstanceInitException_1.java b/test/langtools/tools/javac/InstanceInitException_1.java similarity index 100% rename from langtools/test/tools/javac/InstanceInitException_1.java rename to test/langtools/tools/javac/InstanceInitException_1.java diff --git a/langtools/test/tools/javac/InstanceInitException_2.java b/test/langtools/tools/javac/InstanceInitException_2.java similarity index 100% rename from langtools/test/tools/javac/InstanceInitException_2.java rename to test/langtools/tools/javac/InstanceInitException_2.java diff --git a/langtools/test/tools/javac/InterfaceAssert.java b/test/langtools/tools/javac/InterfaceAssert.java similarity index 100% rename from langtools/test/tools/javac/InterfaceAssert.java rename to test/langtools/tools/javac/InterfaceAssert.java diff --git a/langtools/test/tools/javac/InterfaceFieldParsing_1.java b/test/langtools/tools/javac/InterfaceFieldParsing_1.java similarity index 100% rename from langtools/test/tools/javac/InterfaceFieldParsing_1.java rename to test/langtools/tools/javac/InterfaceFieldParsing_1.java diff --git a/langtools/test/tools/javac/InterfaceInInner.java b/test/langtools/tools/javac/InterfaceInInner.java similarity index 100% rename from langtools/test/tools/javac/InterfaceInInner.java rename to test/langtools/tools/javac/InterfaceInInner.java diff --git a/langtools/test/tools/javac/InterfaceInInner.out b/test/langtools/tools/javac/InterfaceInInner.out similarity index 100% rename from langtools/test/tools/javac/InterfaceInInner.out rename to test/langtools/tools/javac/InterfaceInInner.out diff --git a/langtools/test/tools/javac/InterfaceMemberClassModifiers.java b/test/langtools/tools/javac/InterfaceMemberClassModifiers.java similarity index 100% rename from langtools/test/tools/javac/InterfaceMemberClassModifiers.java rename to test/langtools/tools/javac/InterfaceMemberClassModifiers.java diff --git a/langtools/test/tools/javac/InterfaceMemberClassModifiers.out b/test/langtools/tools/javac/InterfaceMemberClassModifiers.out similarity index 100% rename from langtools/test/tools/javac/InterfaceMemberClassModifiers.out rename to test/langtools/tools/javac/InterfaceMemberClassModifiers.out diff --git a/langtools/test/tools/javac/InterfaceObjectIncompatibility.java b/test/langtools/tools/javac/InterfaceObjectIncompatibility.java similarity index 100% rename from langtools/test/tools/javac/InterfaceObjectIncompatibility.java rename to test/langtools/tools/javac/InterfaceObjectIncompatibility.java diff --git a/langtools/test/tools/javac/InterfaceObjectIncompatibility.out b/test/langtools/tools/javac/InterfaceObjectIncompatibility.out similarity index 100% rename from langtools/test/tools/javac/InterfaceObjectIncompatibility.out rename to test/langtools/tools/javac/InterfaceObjectIncompatibility.out diff --git a/langtools/test/tools/javac/InterfaceObjectInheritance.java b/test/langtools/tools/javac/InterfaceObjectInheritance.java similarity index 100% rename from langtools/test/tools/javac/InterfaceObjectInheritance.java rename to test/langtools/tools/javac/InterfaceObjectInheritance.java diff --git a/langtools/test/tools/javac/InterfaceObjectInheritance.out b/test/langtools/tools/javac/InterfaceObjectInheritance.out similarity index 100% rename from langtools/test/tools/javac/InterfaceObjectInheritance.out rename to test/langtools/tools/javac/InterfaceObjectInheritance.out diff --git a/langtools/test/tools/javac/InterfaceOverrideCheck.java b/test/langtools/tools/javac/InterfaceOverrideCheck.java similarity index 100% rename from langtools/test/tools/javac/InterfaceOverrideCheck.java rename to test/langtools/tools/javac/InterfaceOverrideCheck.java diff --git a/langtools/test/tools/javac/InterfaceOverrideFinal.java b/test/langtools/tools/javac/InterfaceOverrideFinal.java similarity index 100% rename from langtools/test/tools/javac/InterfaceOverrideFinal.java rename to test/langtools/tools/javac/InterfaceOverrideFinal.java diff --git a/langtools/test/tools/javac/InterfaceOverrideFinal.out b/test/langtools/tools/javac/InterfaceOverrideFinal.out similarity index 100% rename from langtools/test/tools/javac/InterfaceOverrideFinal.out rename to test/langtools/tools/javac/InterfaceOverrideFinal.out diff --git a/langtools/test/tools/javac/InterfaceOverrideObject.java b/test/langtools/tools/javac/InterfaceOverrideObject.java similarity index 100% rename from langtools/test/tools/javac/InterfaceOverrideObject.java rename to test/langtools/tools/javac/InterfaceOverrideObject.java diff --git a/langtools/test/tools/javac/InvalidIntfCast.java b/test/langtools/tools/javac/InvalidIntfCast.java similarity index 100% rename from langtools/test/tools/javac/InvalidIntfCast.java rename to test/langtools/tools/javac/InvalidIntfCast.java diff --git a/langtools/test/tools/javac/JsrRet.java b/test/langtools/tools/javac/JsrRet.java similarity index 100% rename from langtools/test/tools/javac/JsrRet.java rename to test/langtools/tools/javac/JsrRet.java diff --git a/langtools/test/tools/javac/LabelHiding_1.java b/test/langtools/tools/javac/LabelHiding_1.java similarity index 100% rename from langtools/test/tools/javac/LabelHiding_1.java rename to test/langtools/tools/javac/LabelHiding_1.java diff --git a/langtools/test/tools/javac/LabeledDeclaration.java b/test/langtools/tools/javac/LabeledDeclaration.java similarity index 100% rename from langtools/test/tools/javac/LabeledDeclaration.java rename to test/langtools/tools/javac/LabeledDeclaration.java diff --git a/langtools/test/tools/javac/LabeledDeclaration.out b/test/langtools/tools/javac/LabeledDeclaration.out similarity index 100% rename from langtools/test/tools/javac/LabeledDeclaration.out rename to test/langtools/tools/javac/LabeledDeclaration.out diff --git a/langtools/test/tools/javac/LocalClasses_1.java b/test/langtools/tools/javac/LocalClasses_1.java similarity index 100% rename from langtools/test/tools/javac/LocalClasses_1.java rename to test/langtools/tools/javac/LocalClasses_1.java diff --git a/langtools/test/tools/javac/LocalClasses_2.java b/test/langtools/tools/javac/LocalClasses_2.java similarity index 100% rename from langtools/test/tools/javac/LocalClasses_2.java rename to test/langtools/tools/javac/LocalClasses_2.java diff --git a/langtools/test/tools/javac/LocalClasses_2.out b/test/langtools/tools/javac/LocalClasses_2.out similarity index 100% rename from langtools/test/tools/javac/LocalClasses_2.out rename to test/langtools/tools/javac/LocalClasses_2.out diff --git a/langtools/test/tools/javac/ManyMembers2.java b/test/langtools/tools/javac/ManyMembers2.java similarity index 100% rename from langtools/test/tools/javac/ManyMembers2.java rename to test/langtools/tools/javac/ManyMembers2.java diff --git a/langtools/test/tools/javac/MemberTypeInheritance.java b/test/langtools/tools/javac/MemberTypeInheritance.java similarity index 100% rename from langtools/test/tools/javac/MemberTypeInheritance.java rename to test/langtools/tools/javac/MemberTypeInheritance.java diff --git a/langtools/test/tools/javac/MethodParameters/AnnotationTest.java b/test/langtools/tools/javac/MethodParameters/AnnotationTest.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/AnnotationTest.java rename to test/langtools/tools/javac/MethodParameters/AnnotationTest.java diff --git a/langtools/test/tools/javac/MethodParameters/AnnotationTest.out b/test/langtools/tools/javac/MethodParameters/AnnotationTest.out similarity index 100% rename from langtools/test/tools/javac/MethodParameters/AnnotationTest.out rename to test/langtools/tools/javac/MethodParameters/AnnotationTest.out diff --git a/langtools/test/tools/javac/MethodParameters/AnonymousClass.java b/test/langtools/tools/javac/MethodParameters/AnonymousClass.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/AnonymousClass.java rename to test/langtools/tools/javac/MethodParameters/AnonymousClass.java diff --git a/langtools/test/tools/javac/MethodParameters/AnonymousClass.out b/test/langtools/tools/javac/MethodParameters/AnonymousClass.out similarity index 100% rename from langtools/test/tools/javac/MethodParameters/AnonymousClass.out rename to test/langtools/tools/javac/MethodParameters/AnonymousClass.out diff --git a/langtools/test/tools/javac/MethodParameters/AttributeVisitor.java b/test/langtools/tools/javac/MethodParameters/AttributeVisitor.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/AttributeVisitor.java rename to test/langtools/tools/javac/MethodParameters/AttributeVisitor.java diff --git a/langtools/test/tools/javac/MethodParameters/CaptureTest.java b/test/langtools/tools/javac/MethodParameters/CaptureTest.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/CaptureTest.java rename to test/langtools/tools/javac/MethodParameters/CaptureTest.java diff --git a/langtools/test/tools/javac/MethodParameters/ClassFileVisitor.java b/test/langtools/tools/javac/MethodParameters/ClassFileVisitor.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/ClassFileVisitor.java rename to test/langtools/tools/javac/MethodParameters/ClassFileVisitor.java diff --git a/langtools/test/tools/javac/MethodParameters/Constructors.java b/test/langtools/tools/javac/MethodParameters/Constructors.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/Constructors.java rename to test/langtools/tools/javac/MethodParameters/Constructors.java diff --git a/langtools/test/tools/javac/MethodParameters/Constructors.out b/test/langtools/tools/javac/MethodParameters/Constructors.out similarity index 100% rename from langtools/test/tools/javac/MethodParameters/Constructors.out rename to test/langtools/tools/javac/MethodParameters/Constructors.out diff --git a/langtools/test/tools/javac/MethodParameters/EnumTest.java b/test/langtools/tools/javac/MethodParameters/EnumTest.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/EnumTest.java rename to test/langtools/tools/javac/MethodParameters/EnumTest.java diff --git a/langtools/test/tools/javac/MethodParameters/EnumTest.out b/test/langtools/tools/javac/MethodParameters/EnumTest.out similarity index 100% rename from langtools/test/tools/javac/MethodParameters/EnumTest.out rename to test/langtools/tools/javac/MethodParameters/EnumTest.out diff --git a/langtools/test/tools/javac/MethodParameters/InstanceMethods.java b/test/langtools/tools/javac/MethodParameters/InstanceMethods.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/InstanceMethods.java rename to test/langtools/tools/javac/MethodParameters/InstanceMethods.java diff --git a/langtools/test/tools/javac/MethodParameters/InstanceMethods.out b/test/langtools/tools/javac/MethodParameters/InstanceMethods.out similarity index 100% rename from langtools/test/tools/javac/MethodParameters/InstanceMethods.out rename to test/langtools/tools/javac/MethodParameters/InstanceMethods.out diff --git a/langtools/test/tools/javac/MethodParameters/LambdaTest.java b/test/langtools/tools/javac/MethodParameters/LambdaTest.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/LambdaTest.java rename to test/langtools/tools/javac/MethodParameters/LambdaTest.java diff --git a/langtools/test/tools/javac/MethodParameters/LambdaTest.out b/test/langtools/tools/javac/MethodParameters/LambdaTest.out similarity index 100% rename from langtools/test/tools/javac/MethodParameters/LambdaTest.out rename to test/langtools/tools/javac/MethodParameters/LambdaTest.out diff --git a/langtools/test/tools/javac/MethodParameters/LocalClassTest.java b/test/langtools/tools/javac/MethodParameters/LocalClassTest.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/LocalClassTest.java rename to test/langtools/tools/javac/MethodParameters/LocalClassTest.java diff --git a/langtools/test/tools/javac/MethodParameters/LocalClassTest.out b/test/langtools/tools/javac/MethodParameters/LocalClassTest.out similarity index 100% rename from langtools/test/tools/javac/MethodParameters/LocalClassTest.out rename to test/langtools/tools/javac/MethodParameters/LocalClassTest.out diff --git a/langtools/test/tools/javac/MethodParameters/MemberClassTest.java b/test/langtools/tools/javac/MethodParameters/MemberClassTest.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/MemberClassTest.java rename to test/langtools/tools/javac/MethodParameters/MemberClassTest.java diff --git a/langtools/test/tools/javac/MethodParameters/MemberClassTest.out b/test/langtools/tools/javac/MethodParameters/MemberClassTest.out similarity index 100% rename from langtools/test/tools/javac/MethodParameters/MemberClassTest.out rename to test/langtools/tools/javac/MethodParameters/MemberClassTest.out diff --git a/langtools/test/tools/javac/MethodParameters/MethodParametersTester.java b/test/langtools/tools/javac/MethodParameters/MethodParametersTester.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/MethodParametersTester.java rename to test/langtools/tools/javac/MethodParameters/MethodParametersTester.java diff --git a/langtools/test/tools/javac/MethodParameters/ReflectionVisitor.java b/test/langtools/tools/javac/MethodParameters/ReflectionVisitor.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/ReflectionVisitor.java rename to test/langtools/tools/javac/MethodParameters/ReflectionVisitor.java diff --git a/langtools/test/tools/javac/MethodParameters/StaticMethods.java b/test/langtools/tools/javac/MethodParameters/StaticMethods.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/StaticMethods.java rename to test/langtools/tools/javac/MethodParameters/StaticMethods.java diff --git a/langtools/test/tools/javac/MethodParameters/StaticMethods.out b/test/langtools/tools/javac/MethodParameters/StaticMethods.out similarity index 100% rename from langtools/test/tools/javac/MethodParameters/StaticMethods.out rename to test/langtools/tools/javac/MethodParameters/StaticMethods.out diff --git a/langtools/test/tools/javac/MethodParameters/UncommonParamNames.java b/test/langtools/tools/javac/MethodParameters/UncommonParamNames.java similarity index 100% rename from langtools/test/tools/javac/MethodParameters/UncommonParamNames.java rename to test/langtools/tools/javac/MethodParameters/UncommonParamNames.java diff --git a/langtools/test/tools/javac/MethodParameters/UncommonParamNames.out b/test/langtools/tools/javac/MethodParameters/UncommonParamNames.out similarity index 100% rename from langtools/test/tools/javac/MethodParameters/UncommonParamNames.out rename to test/langtools/tools/javac/MethodParameters/UncommonParamNames.out diff --git a/langtools/test/tools/javac/MethodParametersTest.java b/test/langtools/tools/javac/MethodParametersTest.java similarity index 100% rename from langtools/test/tools/javac/MethodParametersTest.java rename to test/langtools/tools/javac/MethodParametersTest.java diff --git a/langtools/test/tools/javac/MissingInclude/MissingIncludeTest.java b/test/langtools/tools/javac/MissingInclude/MissingIncludeTest.java similarity index 100% rename from langtools/test/tools/javac/MissingInclude/MissingIncludeTest.java rename to test/langtools/tools/javac/MissingInclude/MissingIncludeTest.java diff --git a/langtools/test/tools/javac/NameClash/NameClashTest.java b/test/langtools/tools/javac/NameClash/NameClashTest.java similarity index 100% rename from langtools/test/tools/javac/NameClash/NameClashTest.java rename to test/langtools/tools/javac/NameClash/NameClashTest.java diff --git a/langtools/test/tools/javac/NameClash/One.java b/test/langtools/tools/javac/NameClash/One.java similarity index 100% rename from langtools/test/tools/javac/NameClash/One.java rename to test/langtools/tools/javac/NameClash/One.java diff --git a/langtools/test/tools/javac/NameClash/a/One.java b/test/langtools/tools/javac/NameClash/a/One.java similarity index 100% rename from langtools/test/tools/javac/NameClash/a/One.java rename to test/langtools/tools/javac/NameClash/a/One.java diff --git a/langtools/test/tools/javac/NameClash/b/One.java b/test/langtools/tools/javac/NameClash/b/One.java similarity index 100% rename from langtools/test/tools/javac/NameClash/b/One.java rename to test/langtools/tools/javac/NameClash/b/One.java diff --git a/langtools/test/tools/javac/NameCollision.java b/test/langtools/tools/javac/NameCollision.java similarity index 100% rename from langtools/test/tools/javac/NameCollision.java rename to test/langtools/tools/javac/NameCollision.java diff --git a/langtools/test/tools/javac/NameCollision.out b/test/langtools/tools/javac/NameCollision.out similarity index 100% rename from langtools/test/tools/javac/NameCollision.out rename to test/langtools/tools/javac/NameCollision.out diff --git a/langtools/test/tools/javac/NameCollision2.java b/test/langtools/tools/javac/NameCollision2.java similarity index 100% rename from langtools/test/tools/javac/NameCollision2.java rename to test/langtools/tools/javac/NameCollision2.java diff --git a/langtools/test/tools/javac/NestedDuplicateLabels.java b/test/langtools/tools/javac/NestedDuplicateLabels.java similarity index 100% rename from langtools/test/tools/javac/NestedDuplicateLabels.java rename to test/langtools/tools/javac/NestedDuplicateLabels.java diff --git a/langtools/test/tools/javac/NestedDuplicateLabels.out b/test/langtools/tools/javac/NestedDuplicateLabels.out similarity index 100% rename from langtools/test/tools/javac/NestedDuplicateLabels.out rename to test/langtools/tools/javac/NestedDuplicateLabels.out diff --git a/langtools/test/tools/javac/NestedFinallyReturn.java b/test/langtools/tools/javac/NestedFinallyReturn.java similarity index 100% rename from langtools/test/tools/javac/NestedFinallyReturn.java rename to test/langtools/tools/javac/NestedFinallyReturn.java diff --git a/langtools/test/tools/javac/NestedInnerClassNames.java b/test/langtools/tools/javac/NestedInnerClassNames.java similarity index 100% rename from langtools/test/tools/javac/NestedInnerClassNames.java rename to test/langtools/tools/javac/NestedInnerClassNames.java diff --git a/langtools/test/tools/javac/NestedInnerClassNames.out b/test/langtools/tools/javac/NestedInnerClassNames.out similarity index 100% rename from langtools/test/tools/javac/NestedInnerClassNames.out rename to test/langtools/tools/javac/NestedInnerClassNames.out diff --git a/langtools/test/tools/javac/NewGeneric.java b/test/langtools/tools/javac/NewGeneric.java similarity index 100% rename from langtools/test/tools/javac/NewGeneric.java rename to test/langtools/tools/javac/NewGeneric.java diff --git a/langtools/test/tools/javac/NewGeneric.out b/test/langtools/tools/javac/NewGeneric.out similarity index 100% rename from langtools/test/tools/javac/NewGeneric.out rename to test/langtools/tools/javac/NewGeneric.out diff --git a/langtools/test/tools/javac/NoStringToLower.java b/test/langtools/tools/javac/NoStringToLower.java similarity index 100% rename from langtools/test/tools/javac/NoStringToLower.java rename to test/langtools/tools/javac/NoStringToLower.java diff --git a/langtools/test/tools/javac/NonAmbiguousField/Test.java b/test/langtools/tools/javac/NonAmbiguousField/Test.java similarity index 100% rename from langtools/test/tools/javac/NonAmbiguousField/Test.java rename to test/langtools/tools/javac/NonAmbiguousField/Test.java diff --git a/langtools/test/tools/javac/NonAmbiguousField/Test.out b/test/langtools/tools/javac/NonAmbiguousField/Test.out similarity index 100% rename from langtools/test/tools/javac/NonAmbiguousField/Test.out rename to test/langtools/tools/javac/NonAmbiguousField/Test.out diff --git a/langtools/test/tools/javac/NonAmbiguousField/one/Parent.java b/test/langtools/tools/javac/NonAmbiguousField/one/Parent.java similarity index 100% rename from langtools/test/tools/javac/NonAmbiguousField/one/Parent.java rename to test/langtools/tools/javac/NonAmbiguousField/one/Parent.java diff --git a/langtools/test/tools/javac/NonAmbiguousField/one/Parent2.java b/test/langtools/tools/javac/NonAmbiguousField/one/Parent2.java similarity index 100% rename from langtools/test/tools/javac/NonAmbiguousField/one/Parent2.java rename to test/langtools/tools/javac/NonAmbiguousField/one/Parent2.java diff --git a/langtools/test/tools/javac/NonAmbiguousField/two/Child.java b/test/langtools/tools/javac/NonAmbiguousField/two/Child.java similarity index 100% rename from langtools/test/tools/javac/NonAmbiguousField/two/Child.java rename to test/langtools/tools/javac/NonAmbiguousField/two/Child.java diff --git a/langtools/test/tools/javac/NonAmbiguousField/two/Child2.java b/test/langtools/tools/javac/NonAmbiguousField/two/Child2.java similarity index 100% rename from langtools/test/tools/javac/NonAmbiguousField/two/Child2.java rename to test/langtools/tools/javac/NonAmbiguousField/two/Child2.java diff --git a/langtools/test/tools/javac/NonStaticFieldExpr1.java b/test/langtools/tools/javac/NonStaticFieldExpr1.java similarity index 100% rename from langtools/test/tools/javac/NonStaticFieldExpr1.java rename to test/langtools/tools/javac/NonStaticFieldExpr1.java diff --git a/langtools/test/tools/javac/NonStaticFieldExpr1.out b/test/langtools/tools/javac/NonStaticFieldExpr1.out similarity index 100% rename from langtools/test/tools/javac/NonStaticFieldExpr1.out rename to test/langtools/tools/javac/NonStaticFieldExpr1.out diff --git a/langtools/test/tools/javac/NonStaticFieldExpr2.java b/test/langtools/tools/javac/NonStaticFieldExpr2.java similarity index 100% rename from langtools/test/tools/javac/NonStaticFieldExpr2.java rename to test/langtools/tools/javac/NonStaticFieldExpr2.java diff --git a/langtools/test/tools/javac/NonStaticFieldExpr2.out b/test/langtools/tools/javac/NonStaticFieldExpr2.out similarity index 100% rename from langtools/test/tools/javac/NonStaticFieldExpr2.out rename to test/langtools/tools/javac/NonStaticFieldExpr2.out diff --git a/langtools/test/tools/javac/NonStaticFieldExpr3.java b/test/langtools/tools/javac/NonStaticFieldExpr3.java similarity index 100% rename from langtools/test/tools/javac/NonStaticFieldExpr3.java rename to test/langtools/tools/javac/NonStaticFieldExpr3.java diff --git a/langtools/test/tools/javac/NonStaticFieldExpr3.out b/test/langtools/tools/javac/NonStaticFieldExpr3.out similarity index 100% rename from langtools/test/tools/javac/NonStaticFieldExpr3.out rename to test/langtools/tools/javac/NonStaticFieldExpr3.out diff --git a/langtools/test/tools/javac/NonStaticFieldExpr4c.java b/test/langtools/tools/javac/NonStaticFieldExpr4c.java similarity index 100% rename from langtools/test/tools/javac/NonStaticFieldExpr4c.java rename to test/langtools/tools/javac/NonStaticFieldExpr4c.java diff --git a/langtools/test/tools/javac/NonStaticFieldExpr4d.java b/test/langtools/tools/javac/NonStaticFieldExpr4d.java similarity index 100% rename from langtools/test/tools/javac/NonStaticFieldExpr4d.java rename to test/langtools/tools/javac/NonStaticFieldExpr4d.java diff --git a/langtools/test/tools/javac/NonStaticFinalVar.java b/test/langtools/tools/javac/NonStaticFinalVar.java similarity index 100% rename from langtools/test/tools/javac/NonStaticFinalVar.java rename to test/langtools/tools/javac/NonStaticFinalVar.java diff --git a/langtools/test/tools/javac/Null2DArray.java b/test/langtools/tools/javac/Null2DArray.java similarity index 100% rename from langtools/test/tools/javac/Null2DArray.java rename to test/langtools/tools/javac/Null2DArray.java diff --git a/langtools/test/tools/javac/NullQualifiedNew.java b/test/langtools/tools/javac/NullQualifiedNew.java similarity index 100% rename from langtools/test/tools/javac/NullQualifiedNew.java rename to test/langtools/tools/javac/NullQualifiedNew.java diff --git a/langtools/test/tools/javac/NullQualifiedNew2.java b/test/langtools/tools/javac/NullQualifiedNew2.java similarity index 100% rename from langtools/test/tools/javac/NullQualifiedNew2.java rename to test/langtools/tools/javac/NullQualifiedNew2.java diff --git a/langtools/test/tools/javac/NullQualifiedSuper1.java b/test/langtools/tools/javac/NullQualifiedSuper1.java similarity index 100% rename from langtools/test/tools/javac/NullQualifiedSuper1.java rename to test/langtools/tools/javac/NullQualifiedSuper1.java diff --git a/langtools/test/tools/javac/NullQualifiedSuper2.java b/test/langtools/tools/javac/NullQualifiedSuper2.java similarity index 100% rename from langtools/test/tools/javac/NullQualifiedSuper2.java rename to test/langtools/tools/javac/NullQualifiedSuper2.java diff --git a/langtools/test/tools/javac/NullStaticQualifier.java b/test/langtools/tools/javac/NullStaticQualifier.java similarity index 100% rename from langtools/test/tools/javac/NullStaticQualifier.java rename to test/langtools/tools/javac/NullStaticQualifier.java diff --git a/langtools/test/tools/javac/ObjectIncompatibleInterface.java b/test/langtools/tools/javac/ObjectIncompatibleInterface.java similarity index 100% rename from langtools/test/tools/javac/ObjectIncompatibleInterface.java rename to test/langtools/tools/javac/ObjectIncompatibleInterface.java diff --git a/langtools/test/tools/javac/ObjectMethodRefFromInterface.java b/test/langtools/tools/javac/ObjectMethodRefFromInterface.java similarity index 100% rename from langtools/test/tools/javac/ObjectMethodRefFromInterface.java rename to test/langtools/tools/javac/ObjectMethodRefFromInterface.java diff --git a/langtools/test/tools/javac/OuterParameter_1.java b/test/langtools/tools/javac/OuterParameter_1.java similarity index 100% rename from langtools/test/tools/javac/OuterParameter_1.java rename to test/langtools/tools/javac/OuterParameter_1.java diff --git a/langtools/test/tools/javac/OverrideChecks/6199153/T6199153.java b/test/langtools/tools/javac/OverrideChecks/6199153/T6199153.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/6199153/T6199153.java rename to test/langtools/tools/javac/OverrideChecks/6199153/T6199153.java diff --git a/langtools/test/tools/javac/OverrideChecks/6199153/T6199153.out b/test/langtools/tools/javac/OverrideChecks/6199153/T6199153.out similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/6199153/T6199153.out rename to test/langtools/tools/javac/OverrideChecks/6199153/T6199153.out diff --git a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189a.java b/test/langtools/tools/javac/OverrideChecks/6400189/T6400189a.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/6400189/T6400189a.java rename to test/langtools/tools/javac/OverrideChecks/6400189/T6400189a.java diff --git a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189a.out b/test/langtools/tools/javac/OverrideChecks/6400189/T6400189a.out similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/6400189/T6400189a.out rename to test/langtools/tools/javac/OverrideChecks/6400189/T6400189a.out diff --git a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189b.java b/test/langtools/tools/javac/OverrideChecks/6400189/T6400189b.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/6400189/T6400189b.java rename to test/langtools/tools/javac/OverrideChecks/6400189/T6400189b.java diff --git a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189b.out b/test/langtools/tools/javac/OverrideChecks/6400189/T6400189b.out similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/6400189/T6400189b.out rename to test/langtools/tools/javac/OverrideChecks/6400189/T6400189b.out diff --git a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189c.java b/test/langtools/tools/javac/OverrideChecks/6400189/T6400189c.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/6400189/T6400189c.java rename to test/langtools/tools/javac/OverrideChecks/6400189/T6400189c.java diff --git a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189d.java b/test/langtools/tools/javac/OverrideChecks/6400189/T6400189d.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/6400189/T6400189d.java rename to test/langtools/tools/javac/OverrideChecks/6400189/T6400189d.java diff --git a/langtools/test/tools/javac/OverrideChecks/6738538/T6738538a.java b/test/langtools/tools/javac/OverrideChecks/6738538/T6738538a.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/6738538/T6738538a.java rename to test/langtools/tools/javac/OverrideChecks/6738538/T6738538a.java diff --git a/langtools/test/tools/javac/OverrideChecks/6738538/T6738538b.java b/test/langtools/tools/javac/OverrideChecks/6738538/T6738538b.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/6738538/T6738538b.java rename to test/langtools/tools/javac/OverrideChecks/6738538/T6738538b.java diff --git a/langtools/test/tools/javac/OverrideChecks/IncompleteMessageOverride.java b/test/langtools/tools/javac/OverrideChecks/IncompleteMessageOverride.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/IncompleteMessageOverride.java rename to test/langtools/tools/javac/OverrideChecks/IncompleteMessageOverride.java diff --git a/langtools/test/tools/javac/OverrideChecks/IncompleteMessageOverride.out b/test/langtools/tools/javac/OverrideChecks/IncompleteMessageOverride.out similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/IncompleteMessageOverride.out rename to test/langtools/tools/javac/OverrideChecks/IncompleteMessageOverride.out diff --git a/langtools/test/tools/javac/OverrideChecks/InconsistentReturn.java b/test/langtools/tools/javac/OverrideChecks/InconsistentReturn.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/InconsistentReturn.java rename to test/langtools/tools/javac/OverrideChecks/InconsistentReturn.java diff --git a/langtools/test/tools/javac/OverrideChecks/InconsistentReturn.out b/test/langtools/tools/javac/OverrideChecks/InconsistentReturn.out similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/InconsistentReturn.out rename to test/langtools/tools/javac/OverrideChecks/InconsistentReturn.out diff --git a/langtools/test/tools/javac/OverrideChecks/InterfaceImplements.java b/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/InterfaceImplements.java rename to test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java diff --git a/langtools/test/tools/javac/OverrideChecks/InterfaceOverride.java b/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/InterfaceOverride.java rename to test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java diff --git a/langtools/test/tools/javac/OverrideChecks/Private.java b/test/langtools/tools/javac/OverrideChecks/Private.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/Private.java rename to test/langtools/tools/javac/OverrideChecks/Private.java diff --git a/langtools/test/tools/javac/OverrideChecks/Private.out b/test/langtools/tools/javac/OverrideChecks/Private.out similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/Private.out rename to test/langtools/tools/javac/OverrideChecks/Private.out diff --git a/langtools/test/tools/javac/OverrideChecks/StaticOverride.java b/test/langtools/tools/javac/OverrideChecks/StaticOverride.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/StaticOverride.java rename to test/langtools/tools/javac/OverrideChecks/StaticOverride.java diff --git a/langtools/test/tools/javac/OverrideChecks/StaticOverride.out b/test/langtools/tools/javac/OverrideChecks/StaticOverride.out similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/StaticOverride.out rename to test/langtools/tools/javac/OverrideChecks/StaticOverride.out diff --git a/langtools/test/tools/javac/OverrideChecks/T4720356a.java b/test/langtools/tools/javac/OverrideChecks/T4720356a.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/T4720356a.java rename to test/langtools/tools/javac/OverrideChecks/T4720356a.java diff --git a/langtools/test/tools/javac/OverrideChecks/T4720356a.out b/test/langtools/tools/javac/OverrideChecks/T4720356a.out similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/T4720356a.out rename to test/langtools/tools/javac/OverrideChecks/T4720356a.out diff --git a/langtools/test/tools/javac/OverrideChecks/T4720356b.java b/test/langtools/tools/javac/OverrideChecks/T4720356b.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/T4720356b.java rename to test/langtools/tools/javac/OverrideChecks/T4720356b.java diff --git a/langtools/test/tools/javac/OverrideChecks/T4720359a.java b/test/langtools/tools/javac/OverrideChecks/T4720359a.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/T4720359a.java rename to test/langtools/tools/javac/OverrideChecks/T4720359a.java diff --git a/langtools/test/tools/javac/OverrideChecks/T4720359a.out b/test/langtools/tools/javac/OverrideChecks/T4720359a.out similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/T4720359a.out rename to test/langtools/tools/javac/OverrideChecks/T4720359a.out diff --git a/langtools/test/tools/javac/OverrideChecks/T4720359b.java b/test/langtools/tools/javac/OverrideChecks/T4720359b.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/T4720359b.java rename to test/langtools/tools/javac/OverrideChecks/T4720359b.java diff --git a/langtools/test/tools/javac/OverrideChecks/T4721069.java b/test/langtools/tools/javac/OverrideChecks/T4721069.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/T4721069.java rename to test/langtools/tools/javac/OverrideChecks/T4721069.java diff --git a/langtools/test/tools/javac/OverrideChecks/T4721069.out b/test/langtools/tools/javac/OverrideChecks/T4721069.out similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/T4721069.out rename to test/langtools/tools/javac/OverrideChecks/T4721069.out diff --git a/langtools/test/tools/javac/OverrideChecks/T6326485.java b/test/langtools/tools/javac/OverrideChecks/T6326485.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/T6326485.java rename to test/langtools/tools/javac/OverrideChecks/T6326485.java diff --git a/langtools/test/tools/javac/OverrideChecks/T6399361.java b/test/langtools/tools/javac/OverrideChecks/T6399361.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/T6399361.java rename to test/langtools/tools/javac/OverrideChecks/T6399361.java diff --git a/langtools/test/tools/javac/OverrideChecks/T8139255.java b/test/langtools/tools/javac/OverrideChecks/T8139255.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/T8139255.java rename to test/langtools/tools/javac/OverrideChecks/T8139255.java diff --git a/langtools/test/tools/javac/OverrideChecks/T8139255.out b/test/langtools/tools/javac/OverrideChecks/T8139255.out similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/T8139255.out rename to test/langtools/tools/javac/OverrideChecks/T8139255.out diff --git a/langtools/test/tools/javac/OverrideChecks/ThrowsConflict.java b/test/langtools/tools/javac/OverrideChecks/ThrowsConflict.java similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/ThrowsConflict.java rename to test/langtools/tools/javac/OverrideChecks/ThrowsConflict.java diff --git a/langtools/test/tools/javac/OverrideChecks/ThrowsConflict.out b/test/langtools/tools/javac/OverrideChecks/ThrowsConflict.out similarity index 100% rename from langtools/test/tools/javac/OverrideChecks/ThrowsConflict.out rename to test/langtools/tools/javac/OverrideChecks/ThrowsConflict.out diff --git a/langtools/test/tools/javac/OverridePosition.java b/test/langtools/tools/javac/OverridePosition.java similarity index 100% rename from langtools/test/tools/javac/OverridePosition.java rename to test/langtools/tools/javac/OverridePosition.java diff --git a/langtools/test/tools/javac/OverridePosition.out b/test/langtools/tools/javac/OverridePosition.out similarity index 100% rename from langtools/test/tools/javac/OverridePosition.out rename to test/langtools/tools/javac/OverridePosition.out diff --git a/langtools/test/tools/javac/PackageClassAmbiguity/Bad.java b/test/langtools/tools/javac/PackageClassAmbiguity/Bad.java similarity index 100% rename from langtools/test/tools/javac/PackageClassAmbiguity/Bad.java rename to test/langtools/tools/javac/PackageClassAmbiguity/Bad.java diff --git a/langtools/test/tools/javac/PackageClassAmbiguity/Bad.out b/test/langtools/tools/javac/PackageClassAmbiguity/Bad.out similarity index 100% rename from langtools/test/tools/javac/PackageClassAmbiguity/Bad.out rename to test/langtools/tools/javac/PackageClassAmbiguity/Bad.out diff --git a/langtools/test/tools/javac/PackageClassAmbiguity/util.java b/test/langtools/tools/javac/PackageClassAmbiguity/util.java similarity index 100% rename from langtools/test/tools/javac/PackageClassAmbiguity/util.java rename to test/langtools/tools/javac/PackageClassAmbiguity/util.java diff --git a/langtools/test/tools/javac/PackageClassAmbiguity/util.out b/test/langtools/tools/javac/PackageClassAmbiguity/util.out similarity index 100% rename from langtools/test/tools/javac/PackageClassAmbiguity/util.out rename to test/langtools/tools/javac/PackageClassAmbiguity/util.out diff --git a/langtools/test/tools/javac/PackageClassClash/PackageClassClash.java b/test/langtools/tools/javac/PackageClassClash/PackageClassClash.java similarity index 100% rename from langtools/test/tools/javac/PackageClassClash/PackageClassClash.java rename to test/langtools/tools/javac/PackageClassClash/PackageClassClash.java diff --git a/langtools/test/tools/javac/Parens1.java b/test/langtools/tools/javac/Parens1.java similarity index 100% rename from langtools/test/tools/javac/Parens1.java rename to test/langtools/tools/javac/Parens1.java diff --git a/langtools/test/tools/javac/Parens1.out b/test/langtools/tools/javac/Parens1.out similarity index 100% rename from langtools/test/tools/javac/Parens1.out rename to test/langtools/tools/javac/Parens1.out diff --git a/langtools/test/tools/javac/Parens2.java b/test/langtools/tools/javac/Parens2.java similarity index 100% rename from langtools/test/tools/javac/Parens2.java rename to test/langtools/tools/javac/Parens2.java diff --git a/langtools/test/tools/javac/Parens2.out b/test/langtools/tools/javac/Parens2.out similarity index 100% rename from langtools/test/tools/javac/Parens2.out rename to test/langtools/tools/javac/Parens2.out diff --git a/langtools/test/tools/javac/Parens3.java b/test/langtools/tools/javac/Parens3.java similarity index 100% rename from langtools/test/tools/javac/Parens3.java rename to test/langtools/tools/javac/Parens3.java diff --git a/langtools/test/tools/javac/Parens3.out b/test/langtools/tools/javac/Parens3.out similarity index 100% rename from langtools/test/tools/javac/Parens3.out rename to test/langtools/tools/javac/Parens3.out diff --git a/langtools/test/tools/javac/Parens4.java b/test/langtools/tools/javac/Parens4.java similarity index 100% rename from langtools/test/tools/javac/Parens4.java rename to test/langtools/tools/javac/Parens4.java diff --git a/langtools/test/tools/javac/Parens4.out b/test/langtools/tools/javac/Parens4.out similarity index 100% rename from langtools/test/tools/javac/Parens4.out rename to test/langtools/tools/javac/Parens4.out diff --git a/langtools/test/tools/javac/ParseConditional.java b/test/langtools/tools/javac/ParseConditional.java similarity index 100% rename from langtools/test/tools/javac/ParseConditional.java rename to test/langtools/tools/javac/ParseConditional.java diff --git a/langtools/test/tools/javac/ParseConditional.out b/test/langtools/tools/javac/ParseConditional.out similarity index 100% rename from langtools/test/tools/javac/ParseConditional.out rename to test/langtools/tools/javac/ParseConditional.out diff --git a/langtools/test/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java b/test/langtools/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java similarity index 100% rename from langtools/test/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java rename to test/langtools/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java diff --git a/langtools/test/tools/javac/Paths/6638501/JarFromManifestFailure.java b/test/langtools/tools/javac/Paths/6638501/JarFromManifestFailure.java similarity index 100% rename from langtools/test/tools/javac/Paths/6638501/JarFromManifestFailure.java rename to test/langtools/tools/javac/Paths/6638501/JarFromManifestFailure.java diff --git a/langtools/test/tools/javac/Paths/6638501/WsCompileExample.java b/test/langtools/tools/javac/Paths/6638501/WsCompileExample.java similarity index 100% rename from langtools/test/tools/javac/Paths/6638501/WsCompileExample.java rename to test/langtools/tools/javac/Paths/6638501/WsCompileExample.java diff --git a/langtools/test/tools/javac/Paths/6638501/test/SayHello.java b/test/langtools/tools/javac/Paths/6638501/test/SayHello.java similarity index 100% rename from langtools/test/tools/javac/Paths/6638501/test/SayHello.java rename to test/langtools/tools/javac/Paths/6638501/test/SayHello.java diff --git a/langtools/test/tools/javac/Paths/6638501/test1/SayHelloToo.java b/test/langtools/tools/javac/Paths/6638501/test1/SayHelloToo.java similarity index 100% rename from langtools/test/tools/javac/Paths/6638501/test1/SayHelloToo.java rename to test/langtools/tools/javac/Paths/6638501/test1/SayHelloToo.java diff --git a/langtools/test/tools/javac/Paths/AbsolutePathTest.java b/test/langtools/tools/javac/Paths/AbsolutePathTest.java similarity index 100% rename from langtools/test/tools/javac/Paths/AbsolutePathTest.java rename to test/langtools/tools/javac/Paths/AbsolutePathTest.java diff --git a/langtools/test/tools/javac/Paths/Class-Path.sh b/test/langtools/tools/javac/Paths/Class-Path.sh similarity index 100% rename from langtools/test/tools/javac/Paths/Class-Path.sh rename to test/langtools/tools/javac/Paths/Class-Path.sh diff --git a/langtools/test/tools/javac/Paths/Class-Path2.sh b/test/langtools/tools/javac/Paths/Class-Path2.sh similarity index 100% rename from langtools/test/tools/javac/Paths/Class-Path2.sh rename to test/langtools/tools/javac/Paths/Class-Path2.sh diff --git a/langtools/test/tools/javac/Paths/Diagnostics.sh b/test/langtools/tools/javac/Paths/Diagnostics.sh similarity index 100% rename from langtools/test/tools/javac/Paths/Diagnostics.sh rename to test/langtools/tools/javac/Paths/Diagnostics.sh diff --git a/langtools/test/tools/javac/Paths/Help.sh b/test/langtools/tools/javac/Paths/Help.sh similarity index 100% rename from langtools/test/tools/javac/Paths/Help.sh rename to test/langtools/tools/javac/Paths/Help.sh diff --git a/langtools/test/tools/javac/Paths/MineField.sh b/test/langtools/tools/javac/Paths/MineField.sh similarity index 100% rename from langtools/test/tools/javac/Paths/MineField.sh rename to test/langtools/tools/javac/Paths/MineField.sh diff --git a/langtools/test/tools/javac/Paths/TestCompileJARInClassPath.java b/test/langtools/tools/javac/Paths/TestCompileJARInClassPath.java similarity index 100% rename from langtools/test/tools/javac/Paths/TestCompileJARInClassPath.java rename to test/langtools/tools/javac/Paths/TestCompileJARInClassPath.java diff --git a/langtools/test/tools/javac/Paths/Util.sh b/test/langtools/tools/javac/Paths/Util.sh similarity index 100% rename from langtools/test/tools/javac/Paths/Util.sh rename to test/langtools/tools/javac/Paths/Util.sh diff --git a/langtools/test/tools/javac/Paths/wcMineField.sh b/test/langtools/tools/javac/Paths/wcMineField.sh similarity index 100% rename from langtools/test/tools/javac/Paths/wcMineField.sh rename to test/langtools/tools/javac/Paths/wcMineField.sh diff --git a/langtools/test/tools/javac/PrivateLocalConstructor.java b/test/langtools/tools/javac/PrivateLocalConstructor.java similarity index 100% rename from langtools/test/tools/javac/PrivateLocalConstructor.java rename to test/langtools/tools/javac/PrivateLocalConstructor.java diff --git a/langtools/test/tools/javac/PrivateUplevelConstant.java b/test/langtools/tools/javac/PrivateUplevelConstant.java similarity index 100% rename from langtools/test/tools/javac/PrivateUplevelConstant.java rename to test/langtools/tools/javac/PrivateUplevelConstant.java diff --git a/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java b/test/langtools/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java similarity index 100% rename from langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java rename to test/langtools/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java diff --git a/langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_1.java b/test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_1.java similarity index 100% rename from langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_1.java rename to test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_1.java diff --git a/langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_1.out b/test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_1.out similarity index 100% rename from langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_1.out rename to test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_1.out diff --git a/langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_2.java b/test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_2.java similarity index 100% rename from langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_2.java rename to test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_2.java diff --git a/langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_2.out b/test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_2.out similarity index 100% rename from langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_2.out rename to test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_2.out diff --git a/langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_3.java b/test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_3.java similarity index 100% rename from langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_3.java rename to test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_3.java diff --git a/langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_3.out b/test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_3.out similarity index 100% rename from langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_3.out rename to test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_3.out diff --git a/langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_4.java b/test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_4.java similarity index 100% rename from langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_4.java rename to test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_4.java diff --git a/langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_4.out b/test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_4.out similarity index 100% rename from langtools/test/tools/javac/QualifiedAccess/QualifiedAccess_4.out rename to test/langtools/tools/javac/QualifiedAccess/QualifiedAccess_4.out diff --git a/langtools/test/tools/javac/QualifiedAccess/pack1/P1.java b/test/langtools/tools/javac/QualifiedAccess/pack1/P1.java similarity index 100% rename from langtools/test/tools/javac/QualifiedAccess/pack1/P1.java rename to test/langtools/tools/javac/QualifiedAccess/pack1/P1.java diff --git a/langtools/test/tools/javac/QualifiedAccess/pack1/P2.java b/test/langtools/tools/javac/QualifiedAccess/pack1/P2.java similarity index 100% rename from langtools/test/tools/javac/QualifiedAccess/pack1/P2.java rename to test/langtools/tools/javac/QualifiedAccess/pack1/P2.java diff --git a/langtools/test/tools/javac/QualifiedConstant.java b/test/langtools/tools/javac/QualifiedConstant.java similarity index 100% rename from langtools/test/tools/javac/QualifiedConstant.java rename to test/langtools/tools/javac/QualifiedConstant.java diff --git a/langtools/test/tools/javac/QualifiedNew.java b/test/langtools/tools/javac/QualifiedNew.java similarity index 100% rename from langtools/test/tools/javac/QualifiedNew.java rename to test/langtools/tools/javac/QualifiedNew.java diff --git a/langtools/test/tools/javac/QualifiedNew.out b/test/langtools/tools/javac/QualifiedNew.out similarity index 100% rename from langtools/test/tools/javac/QualifiedNew.out rename to test/langtools/tools/javac/QualifiedNew.out diff --git a/langtools/test/tools/javac/QualifiedNewScope.java b/test/langtools/tools/javac/QualifiedNewScope.java similarity index 100% rename from langtools/test/tools/javac/QualifiedNewScope.java rename to test/langtools/tools/javac/QualifiedNewScope.java diff --git a/langtools/test/tools/javac/QualifiedOuterThis.java b/test/langtools/tools/javac/QualifiedOuterThis.java similarity index 100% rename from langtools/test/tools/javac/QualifiedOuterThis.java rename to test/langtools/tools/javac/QualifiedOuterThis.java diff --git a/langtools/test/tools/javac/QualifiedOuterThis2.java b/test/langtools/tools/javac/QualifiedOuterThis2.java similarity index 100% rename from langtools/test/tools/javac/QualifiedOuterThis2.java rename to test/langtools/tools/javac/QualifiedOuterThis2.java diff --git a/langtools/test/tools/javac/QualifiedThisAndSuper_1.java b/test/langtools/tools/javac/QualifiedThisAndSuper_1.java similarity index 100% rename from langtools/test/tools/javac/QualifiedThisAndSuper_1.java rename to test/langtools/tools/javac/QualifiedThisAndSuper_1.java diff --git a/langtools/test/tools/javac/QualifiedThisAndSuper_2.java b/test/langtools/tools/javac/QualifiedThisAndSuper_2.java similarity index 100% rename from langtools/test/tools/javac/QualifiedThisAndSuper_2.java rename to test/langtools/tools/javac/QualifiedThisAndSuper_2.java diff --git a/langtools/test/tools/javac/QualifiedThisAndSuper_3.java b/test/langtools/tools/javac/QualifiedThisAndSuper_3.java similarity index 100% rename from langtools/test/tools/javac/QualifiedThisAndSuper_3.java rename to test/langtools/tools/javac/QualifiedThisAndSuper_3.java diff --git a/langtools/test/tools/javac/QualifiedThisExactMatch.java b/test/langtools/tools/javac/QualifiedThisExactMatch.java similarity index 100% rename from langtools/test/tools/javac/QualifiedThisExactMatch.java rename to test/langtools/tools/javac/QualifiedThisExactMatch.java diff --git a/langtools/test/tools/javac/RawCrash.java b/test/langtools/tools/javac/RawCrash.java similarity index 100% rename from langtools/test/tools/javac/RawCrash.java rename to test/langtools/tools/javac/RawCrash.java diff --git a/langtools/test/tools/javac/ReturnAfterIfThenElse.java b/test/langtools/tools/javac/ReturnAfterIfThenElse.java similarity index 100% rename from langtools/test/tools/javac/ReturnAfterIfThenElse.java rename to test/langtools/tools/javac/ReturnAfterIfThenElse.java diff --git a/langtools/test/tools/javac/ShiftExpressionTest.java b/test/langtools/tools/javac/ShiftExpressionTest.java similarity index 100% rename from langtools/test/tools/javac/ShiftExpressionTest.java rename to test/langtools/tools/javac/ShiftExpressionTest.java diff --git a/langtools/test/tools/javac/StandaloneQualifiedSuper.java b/test/langtools/tools/javac/StandaloneQualifiedSuper.java similarity index 100% rename from langtools/test/tools/javac/StandaloneQualifiedSuper.java rename to test/langtools/tools/javac/StandaloneQualifiedSuper.java diff --git a/langtools/test/tools/javac/StaticBlockScope.java b/test/langtools/tools/javac/StaticBlockScope.java similarity index 100% rename from langtools/test/tools/javac/StaticBlockScope.java rename to test/langtools/tools/javac/StaticBlockScope.java diff --git a/langtools/test/tools/javac/StdoutCloseTest.java b/test/langtools/tools/javac/StdoutCloseTest.java similarity index 100% rename from langtools/test/tools/javac/StdoutCloseTest.java rename to test/langtools/tools/javac/StdoutCloseTest.java diff --git a/langtools/test/tools/javac/StoreClass.java b/test/langtools/tools/javac/StoreClass.java similarity index 100% rename from langtools/test/tools/javac/StoreClass.java rename to test/langtools/tools/javac/StoreClass.java diff --git a/langtools/test/tools/javac/StoreClass.out b/test/langtools/tools/javac/StoreClass.out similarity index 100% rename from langtools/test/tools/javac/StoreClass.out rename to test/langtools/tools/javac/StoreClass.out diff --git a/langtools/test/tools/javac/StrictAbstract.java b/test/langtools/tools/javac/StrictAbstract.java similarity index 100% rename from langtools/test/tools/javac/StrictAbstract.java rename to test/langtools/tools/javac/StrictAbstract.java diff --git a/langtools/test/tools/javac/StringAppendAccessMethodOnLHS.java b/test/langtools/tools/javac/StringAppendAccessMethodOnLHS.java similarity index 100% rename from langtools/test/tools/javac/StringAppendAccessMethodOnLHS.java rename to test/langtools/tools/javac/StringAppendAccessMethodOnLHS.java diff --git a/langtools/test/tools/javac/StringConcat/TestIndyStringConcat.java b/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java similarity index 100% rename from langtools/test/tools/javac/StringConcat/TestIndyStringConcat.java rename to test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java diff --git a/langtools/test/tools/javac/StringConcat/access/Holder.java b/test/langtools/tools/javac/StringConcat/access/Holder.java similarity index 100% rename from langtools/test/tools/javac/StringConcat/access/Holder.java rename to test/langtools/tools/javac/StringConcat/access/Holder.java diff --git a/langtools/test/tools/javac/StringConcat/access/PublicClass.java b/test/langtools/tools/javac/StringConcat/access/PublicClass.java similarity index 100% rename from langtools/test/tools/javac/StringConcat/access/PublicClass.java rename to test/langtools/tools/javac/StringConcat/access/PublicClass.java diff --git a/langtools/test/tools/javac/StringConcat/access/PublicInterface.java b/test/langtools/tools/javac/StringConcat/access/PublicInterface.java similarity index 100% rename from langtools/test/tools/javac/StringConcat/access/PublicInterface.java rename to test/langtools/tools/javac/StringConcat/access/PublicInterface.java diff --git a/langtools/test/tools/javac/StringConcat/access/Public_PrivateInterface1.java b/test/langtools/tools/javac/StringConcat/access/Public_PrivateInterface1.java similarity index 100% rename from langtools/test/tools/javac/StringConcat/access/Public_PrivateInterface1.java rename to test/langtools/tools/javac/StringConcat/access/Public_PrivateInterface1.java diff --git a/langtools/test/tools/javac/StringConcat/access/Public_PrivateInterface2.java b/test/langtools/tools/javac/StringConcat/access/Public_PrivateInterface2.java similarity index 100% rename from langtools/test/tools/javac/StringConcat/access/Public_PrivateInterface2.java rename to test/langtools/tools/javac/StringConcat/access/Public_PrivateInterface2.java diff --git a/langtools/test/tools/javac/StringConcat/access/Public_PublicClass.java b/test/langtools/tools/javac/StringConcat/access/Public_PublicClass.java similarity index 100% rename from langtools/test/tools/javac/StringConcat/access/Public_PublicClass.java rename to test/langtools/tools/javac/StringConcat/access/Public_PublicClass.java diff --git a/langtools/test/tools/javac/StringConcat/access/Public_PublicInterface.java b/test/langtools/tools/javac/StringConcat/access/Public_PublicInterface.java similarity index 100% rename from langtools/test/tools/javac/StringConcat/access/Public_PublicInterface.java rename to test/langtools/tools/javac/StringConcat/access/Public_PublicInterface.java diff --git a/langtools/test/tools/javac/StringConcat/access/Test.java b/test/langtools/tools/javac/StringConcat/access/Test.java similarity index 100% rename from langtools/test/tools/javac/StringConcat/access/Test.java rename to test/langtools/tools/javac/StringConcat/access/Test.java diff --git a/langtools/test/tools/javac/StringConversion.java b/test/langtools/tools/javac/StringConversion.java similarity index 100% rename from langtools/test/tools/javac/StringConversion.java rename to test/langtools/tools/javac/StringConversion.java diff --git a/langtools/test/tools/javac/StringConversion2.java b/test/langtools/tools/javac/StringConversion2.java similarity index 100% rename from langtools/test/tools/javac/StringConversion2.java rename to test/langtools/tools/javac/StringConversion2.java diff --git a/langtools/test/tools/javac/StringsInSwitch/7181320/BinOpInCaseLabel.java b/test/langtools/tools/javac/StringsInSwitch/7181320/BinOpInCaseLabel.java similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/7181320/BinOpInCaseLabel.java rename to test/langtools/tools/javac/StringsInSwitch/7181320/BinOpInCaseLabel.java diff --git a/langtools/test/tools/javac/StringsInSwitch/7181320/CastInCaseLabel.java b/test/langtools/tools/javac/StringsInSwitch/7181320/CastInCaseLabel.java similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/7181320/CastInCaseLabel.java rename to test/langtools/tools/javac/StringsInSwitch/7181320/CastInCaseLabel.java diff --git a/langtools/test/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel.java b/test/langtools/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel.java similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel.java rename to test/langtools/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel.java diff --git a/langtools/test/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel1.java b/test/langtools/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel1.java similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel1.java rename to test/langtools/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel1.java diff --git a/langtools/test/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel2.java b/test/langtools/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel2.java similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel2.java rename to test/langtools/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel2.java diff --git a/langtools/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.java b/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1.java similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.java rename to test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1.java diff --git a/langtools/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.out b/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1.out similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.out rename to test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1.out diff --git a/langtools/test/tools/javac/StringsInSwitch/BadlyTypedLabel1_6.out b/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1_6.out similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/BadlyTypedLabel1_6.out rename to test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1_6.out diff --git a/langtools/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.java b/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2.java similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.java rename to test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2.java diff --git a/langtools/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.out b/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2.out similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.out rename to test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2.out diff --git a/langtools/test/tools/javac/StringsInSwitch/BadlyTypedLabel2_6.out b/test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2_6.out similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/BadlyTypedLabel2_6.out rename to test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2_6.out diff --git a/langtools/test/tools/javac/StringsInSwitch/NonConstantLabel.java b/test/langtools/tools/javac/StringsInSwitch/NonConstantLabel.java similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/NonConstantLabel.java rename to test/langtools/tools/javac/StringsInSwitch/NonConstantLabel.java diff --git a/langtools/test/tools/javac/StringsInSwitch/NonConstantLabel.out b/test/langtools/tools/javac/StringsInSwitch/NonConstantLabel.out similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/NonConstantLabel.out rename to test/langtools/tools/javac/StringsInSwitch/NonConstantLabel.out diff --git a/langtools/test/tools/javac/StringsInSwitch/NonConstantLabel6.out b/test/langtools/tools/javac/StringsInSwitch/NonConstantLabel6.out similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/NonConstantLabel6.out rename to test/langtools/tools/javac/StringsInSwitch/NonConstantLabel6.out diff --git a/langtools/test/tools/javac/StringsInSwitch/OneCaseSwitches.java b/test/langtools/tools/javac/StringsInSwitch/OneCaseSwitches.java similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/OneCaseSwitches.java rename to test/langtools/tools/javac/StringsInSwitch/OneCaseSwitches.java diff --git a/langtools/test/tools/javac/StringsInSwitch/OneCaseSwitches.out b/test/langtools/tools/javac/StringsInSwitch/OneCaseSwitches.out similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/OneCaseSwitches.out rename to test/langtools/tools/javac/StringsInSwitch/OneCaseSwitches.out diff --git a/langtools/test/tools/javac/StringsInSwitch/RSCL1.out b/test/langtools/tools/javac/StringsInSwitch/RSCL1.out similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/RSCL1.out rename to test/langtools/tools/javac/StringsInSwitch/RSCL1.out diff --git a/langtools/test/tools/javac/StringsInSwitch/RSCL1_6.out b/test/langtools/tools/javac/StringsInSwitch/RSCL1_6.out similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/RSCL1_6.out rename to test/langtools/tools/javac/StringsInSwitch/RSCL1_6.out diff --git a/langtools/test/tools/javac/StringsInSwitch/RSCL2.out b/test/langtools/tools/javac/StringsInSwitch/RSCL2.out similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/RSCL2.out rename to test/langtools/tools/javac/StringsInSwitch/RSCL2.out diff --git a/langtools/test/tools/javac/StringsInSwitch/RSCL2_6.out b/test/langtools/tools/javac/StringsInSwitch/RSCL2_6.out similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/RSCL2_6.out rename to test/langtools/tools/javac/StringsInSwitch/RSCL2_6.out diff --git a/langtools/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java b/test/langtools/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java rename to test/langtools/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java diff --git a/langtools/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels2.java b/test/langtools/tools/javac/StringsInSwitch/RepeatedStringCaseLabels2.java similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels2.java rename to test/langtools/tools/javac/StringsInSwitch/RepeatedStringCaseLabels2.java diff --git a/langtools/test/tools/javac/StringsInSwitch/StringSwitches.java b/test/langtools/tools/javac/StringsInSwitch/StringSwitches.java similarity index 100% rename from langtools/test/tools/javac/StringsInSwitch/StringSwitches.java rename to test/langtools/tools/javac/StringsInSwitch/StringSwitches.java diff --git a/langtools/test/tools/javac/SuperField.java b/test/langtools/tools/javac/SuperField.java similarity index 100% rename from langtools/test/tools/javac/SuperField.java rename to test/langtools/tools/javac/SuperField.java diff --git a/langtools/test/tools/javac/SuperMeth.java b/test/langtools/tools/javac/SuperMeth.java similarity index 100% rename from langtools/test/tools/javac/SuperMeth.java rename to test/langtools/tools/javac/SuperMeth.java diff --git a/langtools/test/tools/javac/SuperMethodResolve.java b/test/langtools/tools/javac/SuperMethodResolve.java similarity index 100% rename from langtools/test/tools/javac/SuperMethodResolve.java rename to test/langtools/tools/javac/SuperMethodResolve.java diff --git a/langtools/test/tools/javac/SuperNew.java b/test/langtools/tools/javac/SuperNew.java similarity index 100% rename from langtools/test/tools/javac/SuperNew.java rename to test/langtools/tools/javac/SuperNew.java diff --git a/langtools/test/tools/javac/SuperNew2.java b/test/langtools/tools/javac/SuperNew2.java similarity index 100% rename from langtools/test/tools/javac/SuperNew2.java rename to test/langtools/tools/javac/SuperNew2.java diff --git a/langtools/test/tools/javac/SuperNew3.java b/test/langtools/tools/javac/SuperNew3.java similarity index 100% rename from langtools/test/tools/javac/SuperNew3.java rename to test/langtools/tools/javac/SuperNew3.java diff --git a/langtools/test/tools/javac/SuperNew4.java b/test/langtools/tools/javac/SuperNew4.java similarity index 100% rename from langtools/test/tools/javac/SuperNew4.java rename to test/langtools/tools/javac/SuperNew4.java diff --git a/langtools/test/tools/javac/SuperclassConstructorException.java b/test/langtools/tools/javac/SuperclassConstructorException.java similarity index 100% rename from langtools/test/tools/javac/SuperclassConstructorException.java rename to test/langtools/tools/javac/SuperclassConstructorException.java diff --git a/langtools/test/tools/javac/SwitchExitStateTest.java b/test/langtools/tools/javac/SwitchExitStateTest.java similarity index 100% rename from langtools/test/tools/javac/SwitchExitStateTest.java rename to test/langtools/tools/javac/SwitchExitStateTest.java diff --git a/langtools/test/tools/javac/SwitchFence.java b/test/langtools/tools/javac/SwitchFence.java similarity index 100% rename from langtools/test/tools/javac/SwitchFence.java rename to test/langtools/tools/javac/SwitchFence.java diff --git a/langtools/test/tools/javac/SwitchScope.java b/test/langtools/tools/javac/SwitchScope.java similarity index 100% rename from langtools/test/tools/javac/SwitchScope.java rename to test/langtools/tools/javac/SwitchScope.java diff --git a/langtools/test/tools/javac/SwitchScope.out b/test/langtools/tools/javac/SwitchScope.out similarity index 100% rename from langtools/test/tools/javac/SwitchScope.out rename to test/langtools/tools/javac/SwitchScope.out diff --git a/langtools/test/tools/javac/SynchronizedClass.java b/test/langtools/tools/javac/SynchronizedClass.java similarity index 100% rename from langtools/test/tools/javac/SynchronizedClass.java rename to test/langtools/tools/javac/SynchronizedClass.java diff --git a/langtools/test/tools/javac/SynchronizedClass.out b/test/langtools/tools/javac/SynchronizedClass.out similarity index 100% rename from langtools/test/tools/javac/SynchronizedClass.out rename to test/langtools/tools/javac/SynchronizedClass.out diff --git a/langtools/test/tools/javac/SynthName1.java b/test/langtools/tools/javac/SynthName1.java similarity index 100% rename from langtools/test/tools/javac/SynthName1.java rename to test/langtools/tools/javac/SynthName1.java diff --git a/langtools/test/tools/javac/SynthName2.java b/test/langtools/tools/javac/SynthName2.java similarity index 100% rename from langtools/test/tools/javac/SynthName2.java rename to test/langtools/tools/javac/SynthName2.java diff --git a/langtools/test/tools/javac/SynthName2.out b/test/langtools/tools/javac/SynthName2.out similarity index 100% rename from langtools/test/tools/javac/SynthName2.out rename to test/langtools/tools/javac/SynthName2.out diff --git a/langtools/test/tools/javac/T4093617/T4093617.java b/test/langtools/tools/javac/T4093617/T4093617.java similarity index 100% rename from langtools/test/tools/javac/T4093617/T4093617.java rename to test/langtools/tools/javac/T4093617/T4093617.java diff --git a/langtools/test/tools/javac/T4093617/T4093617.out b/test/langtools/tools/javac/T4093617/T4093617.out similarity index 100% rename from langtools/test/tools/javac/T4093617/T4093617.out rename to test/langtools/tools/javac/T4093617/T4093617.out diff --git a/langtools/test/tools/javac/T4093617/java.base/java/lang/Object.java b/test/langtools/tools/javac/T4093617/java.base/java/lang/Object.java similarity index 100% rename from langtools/test/tools/javac/T4093617/java.base/java/lang/Object.java rename to test/langtools/tools/javac/T4093617/java.base/java/lang/Object.java diff --git a/langtools/test/tools/javac/T4848619/T4848619a.java b/test/langtools/tools/javac/T4848619/T4848619a.java similarity index 100% rename from langtools/test/tools/javac/T4848619/T4848619a.java rename to test/langtools/tools/javac/T4848619/T4848619a.java diff --git a/langtools/test/tools/javac/T4848619/T4848619a.out b/test/langtools/tools/javac/T4848619/T4848619a.out similarity index 100% rename from langtools/test/tools/javac/T4848619/T4848619a.out rename to test/langtools/tools/javac/T4848619/T4848619a.out diff --git a/langtools/test/tools/javac/T4848619/T4848619b.java b/test/langtools/tools/javac/T4848619/T4848619b.java similarity index 100% rename from langtools/test/tools/javac/T4848619/T4848619b.java rename to test/langtools/tools/javac/T4848619/T4848619b.java diff --git a/langtools/test/tools/javac/T4848619/T4848619b.out b/test/langtools/tools/javac/T4848619/T4848619b.out similarity index 100% rename from langtools/test/tools/javac/T4848619/T4848619b.out rename to test/langtools/tools/javac/T4848619/T4848619b.out diff --git a/langtools/test/tools/javac/T4881267.java b/test/langtools/tools/javac/T4881267.java similarity index 100% rename from langtools/test/tools/javac/T4881267.java rename to test/langtools/tools/javac/T4881267.java diff --git a/langtools/test/tools/javac/T4881267.out b/test/langtools/tools/javac/T4881267.out similarity index 100% rename from langtools/test/tools/javac/T4881267.out rename to test/langtools/tools/javac/T4881267.out diff --git a/langtools/test/tools/javac/T4906100.java b/test/langtools/tools/javac/T4906100.java similarity index 100% rename from langtools/test/tools/javac/T4906100.java rename to test/langtools/tools/javac/T4906100.java diff --git a/langtools/test/tools/javac/T4906100.out b/test/langtools/tools/javac/T4906100.out similarity index 100% rename from langtools/test/tools/javac/T4906100.out rename to test/langtools/tools/javac/T4906100.out diff --git a/langtools/test/tools/javac/T4965689/ClassLiteralWastesByteTest.java b/test/langtools/tools/javac/T4965689/ClassLiteralWastesByteTest.java similarity index 100% rename from langtools/test/tools/javac/T4965689/ClassLiteralWastesByteTest.java rename to test/langtools/tools/javac/T4965689/ClassLiteralWastesByteTest.java diff --git a/langtools/test/tools/javac/T4994049/DeprecatedNOT.java b/test/langtools/tools/javac/T4994049/DeprecatedNOT.java similarity index 100% rename from langtools/test/tools/javac/T4994049/DeprecatedNOT.java rename to test/langtools/tools/javac/T4994049/DeprecatedNOT.java diff --git a/langtools/test/tools/javac/T4994049/DeprecatedYES.java b/test/langtools/tools/javac/T4994049/DeprecatedYES.java similarity index 100% rename from langtools/test/tools/javac/T4994049/DeprecatedYES.java rename to test/langtools/tools/javac/T4994049/DeprecatedYES.java diff --git a/langtools/test/tools/javac/T4994049/DeprecatedYES.out b/test/langtools/tools/javac/T4994049/DeprecatedYES.out similarity index 100% rename from langtools/test/tools/javac/T4994049/DeprecatedYES.out rename to test/langtools/tools/javac/T4994049/DeprecatedYES.out diff --git a/langtools/test/tools/javac/T4994049/T4994049.java b/test/langtools/tools/javac/T4994049/T4994049.java similarity index 100% rename from langtools/test/tools/javac/T4994049/T4994049.java rename to test/langtools/tools/javac/T4994049/T4994049.java diff --git a/langtools/test/tools/javac/T4994049/T4994049.out b/test/langtools/tools/javac/T4994049/T4994049.out similarity index 100% rename from langtools/test/tools/javac/T4994049/T4994049.out rename to test/langtools/tools/javac/T4994049/T4994049.out diff --git a/langtools/test/tools/javac/T5003235/T5003235a.java b/test/langtools/tools/javac/T5003235/T5003235a.java similarity index 100% rename from langtools/test/tools/javac/T5003235/T5003235a.java rename to test/langtools/tools/javac/T5003235/T5003235a.java diff --git a/langtools/test/tools/javac/T5003235/T5003235a.out b/test/langtools/tools/javac/T5003235/T5003235a.out similarity index 100% rename from langtools/test/tools/javac/T5003235/T5003235a.out rename to test/langtools/tools/javac/T5003235/T5003235a.out diff --git a/langtools/test/tools/javac/T5003235/T5003235b.java b/test/langtools/tools/javac/T5003235/T5003235b.java similarity index 100% rename from langtools/test/tools/javac/T5003235/T5003235b.java rename to test/langtools/tools/javac/T5003235/T5003235b.java diff --git a/langtools/test/tools/javac/T5003235/T5003235b.out b/test/langtools/tools/javac/T5003235/T5003235b.out similarity index 100% rename from langtools/test/tools/javac/T5003235/T5003235b.out rename to test/langtools/tools/javac/T5003235/T5003235b.out diff --git a/langtools/test/tools/javac/T5003235/T5003235c.java b/test/langtools/tools/javac/T5003235/T5003235c.java similarity index 100% rename from langtools/test/tools/javac/T5003235/T5003235c.java rename to test/langtools/tools/javac/T5003235/T5003235c.java diff --git a/langtools/test/tools/javac/T5003235/T5003235c.out b/test/langtools/tools/javac/T5003235/T5003235c.out similarity index 100% rename from langtools/test/tools/javac/T5003235/T5003235c.out rename to test/langtools/tools/javac/T5003235/T5003235c.out diff --git a/langtools/test/tools/javac/T5024091/T5024091.java b/test/langtools/tools/javac/T5024091/T5024091.java similarity index 100% rename from langtools/test/tools/javac/T5024091/T5024091.java rename to test/langtools/tools/javac/T5024091/T5024091.java diff --git a/langtools/test/tools/javac/T5024091/T5024091.out b/test/langtools/tools/javac/T5024091/T5024091.out similarity index 100% rename from langtools/test/tools/javac/T5024091/T5024091.out rename to test/langtools/tools/javac/T5024091/T5024091.out diff --git a/langtools/test/tools/javac/T5048776.java b/test/langtools/tools/javac/T5048776.java similarity index 100% rename from langtools/test/tools/javac/T5048776.java rename to test/langtools/tools/javac/T5048776.java diff --git a/langtools/test/tools/javac/T5048776a.out b/test/langtools/tools/javac/T5048776a.out similarity index 100% rename from langtools/test/tools/javac/T5048776a.out rename to test/langtools/tools/javac/T5048776a.out diff --git a/langtools/test/tools/javac/T5048776b.out b/test/langtools/tools/javac/T5048776b.out similarity index 100% rename from langtools/test/tools/javac/T5048776b.out rename to test/langtools/tools/javac/T5048776b.out diff --git a/langtools/test/tools/javac/T5053846/MethodRefDupInConstantPoolTest.java b/test/langtools/tools/javac/T5053846/MethodRefDupInConstantPoolTest.java similarity index 100% rename from langtools/test/tools/javac/T5053846/MethodRefDupInConstantPoolTest.java rename to test/langtools/tools/javac/T5053846/MethodRefDupInConstantPoolTest.java diff --git a/langtools/test/tools/javac/T5090006/AssertionFailureTest.java b/test/langtools/tools/javac/T5090006/AssertionFailureTest.java similarity index 100% rename from langtools/test/tools/javac/T5090006/AssertionFailureTest.java rename to test/langtools/tools/javac/T5090006/AssertionFailureTest.java diff --git a/langtools/test/tools/javac/T5090006/broken.jar b/test/langtools/tools/javac/T5090006/broken.jar similarity index 100% rename from langtools/test/tools/javac/T5090006/broken.jar rename to test/langtools/tools/javac/T5090006/broken.jar diff --git a/langtools/test/tools/javac/T5092545.java b/test/langtools/tools/javac/T5092545.java similarity index 100% rename from langtools/test/tools/javac/T5092545.java rename to test/langtools/tools/javac/T5092545.java diff --git a/langtools/test/tools/javac/T5105890.java b/test/langtools/tools/javac/T5105890.java similarity index 100% rename from langtools/test/tools/javac/T5105890.java rename to test/langtools/tools/javac/T5105890.java diff --git a/langtools/test/tools/javac/T6180021/AbstractSub.java b/test/langtools/tools/javac/T6180021/AbstractSub.java similarity index 100% rename from langtools/test/tools/javac/T6180021/AbstractSub.java rename to test/langtools/tools/javac/T6180021/AbstractSub.java diff --git a/langtools/test/tools/javac/T6180021/Sub.java b/test/langtools/tools/javac/T6180021/Sub.java similarity index 100% rename from langtools/test/tools/javac/T6180021/Sub.java rename to test/langtools/tools/javac/T6180021/Sub.java diff --git a/langtools/test/tools/javac/T6180021/Super.java b/test/langtools/tools/javac/T6180021/Super.java similarity index 100% rename from langtools/test/tools/javac/T6180021/Super.java rename to test/langtools/tools/javac/T6180021/Super.java diff --git a/langtools/test/tools/javac/T6181889/EmptyFinallyTest.java b/test/langtools/tools/javac/T6181889/EmptyFinallyTest.java similarity index 100% rename from langtools/test/tools/javac/T6181889/EmptyFinallyTest.java rename to test/langtools/tools/javac/T6181889/EmptyFinallyTest.java diff --git a/langtools/test/tools/javac/T6214885.java b/test/langtools/tools/javac/T6214885.java similarity index 100% rename from langtools/test/tools/javac/T6214885.java rename to test/langtools/tools/javac/T6214885.java diff --git a/langtools/test/tools/javac/T6214885a.out b/test/langtools/tools/javac/T6214885a.out similarity index 100% rename from langtools/test/tools/javac/T6214885a.out rename to test/langtools/tools/javac/T6214885a.out diff --git a/langtools/test/tools/javac/T6214885b.out b/test/langtools/tools/javac/T6214885b.out similarity index 100% rename from langtools/test/tools/javac/T6214885b.out rename to test/langtools/tools/javac/T6214885b.out diff --git a/langtools/test/tools/javac/T6224167.java b/test/langtools/tools/javac/T6224167.java similarity index 100% rename from langtools/test/tools/javac/T6224167.java rename to test/langtools/tools/javac/T6224167.java diff --git a/langtools/test/tools/javac/T6224167.out b/test/langtools/tools/javac/T6224167.out similarity index 100% rename from langtools/test/tools/javac/T6224167.out rename to test/langtools/tools/javac/T6224167.out diff --git a/langtools/test/tools/javac/T6227617.java b/test/langtools/tools/javac/T6227617.java similarity index 100% rename from langtools/test/tools/javac/T6227617.java rename to test/langtools/tools/javac/T6227617.java diff --git a/langtools/test/tools/javac/T6227617.out b/test/langtools/tools/javac/T6227617.out similarity index 100% rename from langtools/test/tools/javac/T6227617.out rename to test/langtools/tools/javac/T6227617.out diff --git a/langtools/test/tools/javac/T6230128.java b/test/langtools/tools/javac/T6230128.java similarity index 100% rename from langtools/test/tools/javac/T6230128.java rename to test/langtools/tools/javac/T6230128.java diff --git a/langtools/test/tools/javac/T6230128.out b/test/langtools/tools/javac/T6230128.out similarity index 100% rename from langtools/test/tools/javac/T6230128.out rename to test/langtools/tools/javac/T6230128.out diff --git a/langtools/test/tools/javac/T6231246/T6231246.java b/test/langtools/tools/javac/T6231246/T6231246.java similarity index 100% rename from langtools/test/tools/javac/T6231246/T6231246.java rename to test/langtools/tools/javac/T6231246/T6231246.java diff --git a/langtools/test/tools/javac/T6231847.java b/test/langtools/tools/javac/T6231847.java similarity index 100% rename from langtools/test/tools/javac/T6231847.java rename to test/langtools/tools/javac/T6231847.java diff --git a/langtools/test/tools/javac/T6231847.out b/test/langtools/tools/javac/T6231847.out similarity index 100% rename from langtools/test/tools/javac/T6231847.out rename to test/langtools/tools/javac/T6231847.out diff --git a/langtools/test/tools/javac/T6232928.java b/test/langtools/tools/javac/T6232928.java similarity index 100% rename from langtools/test/tools/javac/T6232928.java rename to test/langtools/tools/javac/T6232928.java diff --git a/langtools/test/tools/javac/T6232928/package-info.java b/test/langtools/tools/javac/T6232928/package-info.java similarity index 100% rename from langtools/test/tools/javac/T6232928/package-info.java rename to test/langtools/tools/javac/T6232928/package-info.java diff --git a/langtools/test/tools/javac/T6234077.java b/test/langtools/tools/javac/T6234077.java similarity index 100% rename from langtools/test/tools/javac/T6234077.java rename to test/langtools/tools/javac/T6234077.java diff --git a/langtools/test/tools/javac/T6234077.out b/test/langtools/tools/javac/T6234077.out similarity index 100% rename from langtools/test/tools/javac/T6234077.out rename to test/langtools/tools/javac/T6234077.out diff --git a/langtools/test/tools/javac/T6238612.java b/test/langtools/tools/javac/T6238612.java similarity index 100% rename from langtools/test/tools/javac/T6238612.java rename to test/langtools/tools/javac/T6238612.java diff --git a/langtools/test/tools/javac/T6241723.java b/test/langtools/tools/javac/T6241723.java similarity index 100% rename from langtools/test/tools/javac/T6241723.java rename to test/langtools/tools/javac/T6241723.java diff --git a/langtools/test/tools/javac/T6241723.out b/test/langtools/tools/javac/T6241723.out similarity index 100% rename from langtools/test/tools/javac/T6241723.out rename to test/langtools/tools/javac/T6241723.out diff --git a/langtools/test/tools/javac/T6245591.java b/test/langtools/tools/javac/T6245591.java similarity index 100% rename from langtools/test/tools/javac/T6245591.java rename to test/langtools/tools/javac/T6245591.java diff --git a/langtools/test/tools/javac/T6245591.out b/test/langtools/tools/javac/T6245591.out similarity index 100% rename from langtools/test/tools/javac/T6245591.out rename to test/langtools/tools/javac/T6245591.out diff --git a/langtools/test/tools/javac/T6247324.java b/test/langtools/tools/javac/T6247324.java similarity index 100% rename from langtools/test/tools/javac/T6247324.java rename to test/langtools/tools/javac/T6247324.java diff --git a/langtools/test/tools/javac/T6247324.out b/test/langtools/tools/javac/T6247324.out similarity index 100% rename from langtools/test/tools/javac/T6247324.out rename to test/langtools/tools/javac/T6247324.out diff --git a/langtools/test/tools/javac/T6265400.java b/test/langtools/tools/javac/T6265400.java similarity index 100% rename from langtools/test/tools/javac/T6265400.java rename to test/langtools/tools/javac/T6265400.java diff --git a/langtools/test/tools/javac/T6266772.java b/test/langtools/tools/javac/T6266772.java similarity index 100% rename from langtools/test/tools/javac/T6266772.java rename to test/langtools/tools/javac/T6266772.java diff --git a/langtools/test/tools/javac/T6294589.java b/test/langtools/tools/javac/T6294589.java similarity index 100% rename from langtools/test/tools/javac/T6294589.java rename to test/langtools/tools/javac/T6294589.java diff --git a/langtools/test/tools/javac/T6304128.java b/test/langtools/tools/javac/T6304128.java similarity index 100% rename from langtools/test/tools/javac/T6304128.java rename to test/langtools/tools/javac/T6304128.java diff --git a/langtools/test/tools/javac/T6306967.java b/test/langtools/tools/javac/T6306967.java similarity index 100% rename from langtools/test/tools/javac/T6306967.java rename to test/langtools/tools/javac/T6306967.java diff --git a/langtools/test/tools/javac/T6306967.out b/test/langtools/tools/javac/T6306967.out similarity index 100% rename from langtools/test/tools/javac/T6306967.out rename to test/langtools/tools/javac/T6306967.out diff --git a/langtools/test/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.java b/test/langtools/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.java similarity index 100% rename from langtools/test/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.java rename to test/langtools/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.java diff --git a/langtools/test/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.out b/test/langtools/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.out similarity index 100% rename from langtools/test/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.out rename to test/langtools/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.out diff --git a/langtools/test/tools/javac/T6326754.java b/test/langtools/tools/javac/T6326754.java similarity index 100% rename from langtools/test/tools/javac/T6326754.java rename to test/langtools/tools/javac/T6326754.java diff --git a/langtools/test/tools/javac/T6326754.out b/test/langtools/tools/javac/T6326754.out similarity index 100% rename from langtools/test/tools/javac/T6326754.out rename to test/langtools/tools/javac/T6326754.out diff --git a/langtools/test/tools/javac/T6340549.java b/test/langtools/tools/javac/T6340549.java similarity index 100% rename from langtools/test/tools/javac/T6340549.java rename to test/langtools/tools/javac/T6340549.java diff --git a/langtools/test/tools/javac/T6351767.java b/test/langtools/tools/javac/T6351767.java similarity index 100% rename from langtools/test/tools/javac/T6351767.java rename to test/langtools/tools/javac/T6351767.java diff --git a/langtools/test/tools/javac/T6356217/T6356217.java b/test/langtools/tools/javac/T6356217/T6356217.java similarity index 100% rename from langtools/test/tools/javac/T6356217/T6356217.java rename to test/langtools/tools/javac/T6356217/T6356217.java diff --git a/langtools/test/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.java b/test/langtools/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.java similarity index 100% rename from langtools/test/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.java rename to test/langtools/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.java diff --git a/langtools/test/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.out b/test/langtools/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.out similarity index 100% rename from langtools/test/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.out rename to test/langtools/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.out diff --git a/langtools/test/tools/javac/T6358024.java b/test/langtools/tools/javac/T6358024.java similarity index 100% rename from langtools/test/tools/javac/T6358024.java rename to test/langtools/tools/javac/T6358024.java diff --git a/langtools/test/tools/javac/T6358166.java b/test/langtools/tools/javac/T6358166.java similarity index 100% rename from langtools/test/tools/javac/T6358166.java rename to test/langtools/tools/javac/T6358166.java diff --git a/langtools/test/tools/javac/T6358168.java b/test/langtools/tools/javac/T6358168.java similarity index 100% rename from langtools/test/tools/javac/T6358168.java rename to test/langtools/tools/javac/T6358168.java diff --git a/langtools/test/tools/javac/T6361619.java b/test/langtools/tools/javac/T6361619.java similarity index 100% rename from langtools/test/tools/javac/T6361619.java rename to test/langtools/tools/javac/T6361619.java diff --git a/langtools/test/tools/javac/T6366196.java b/test/langtools/tools/javac/T6366196.java similarity index 100% rename from langtools/test/tools/javac/T6366196.java rename to test/langtools/tools/javac/T6366196.java diff --git a/langtools/test/tools/javac/T6370653.java b/test/langtools/tools/javac/T6370653.java similarity index 100% rename from langtools/test/tools/javac/T6370653.java rename to test/langtools/tools/javac/T6370653.java diff --git a/langtools/test/tools/javac/T6379327.java b/test/langtools/tools/javac/T6379327.java similarity index 100% rename from langtools/test/tools/javac/T6379327.java rename to test/langtools/tools/javac/T6379327.java diff --git a/langtools/test/tools/javac/T6379327.out b/test/langtools/tools/javac/T6379327.out similarity index 100% rename from langtools/test/tools/javac/T6379327.out rename to test/langtools/tools/javac/T6379327.out diff --git a/langtools/test/tools/javac/T6394563.empty.out b/test/langtools/tools/javac/T6394563.empty.out similarity index 100% rename from langtools/test/tools/javac/T6394563.empty.out rename to test/langtools/tools/javac/T6394563.empty.out diff --git a/langtools/test/tools/javac/T6394563.java b/test/langtools/tools/javac/T6394563.java similarity index 100% rename from langtools/test/tools/javac/T6394563.java rename to test/langtools/tools/javac/T6394563.java diff --git a/langtools/test/tools/javac/T6394563.note.out b/test/langtools/tools/javac/T6394563.note.out similarity index 100% rename from langtools/test/tools/javac/T6394563.note.out rename to test/langtools/tools/javac/T6394563.note.out diff --git a/langtools/test/tools/javac/T6394563.warn.out b/test/langtools/tools/javac/T6394563.warn.out similarity index 100% rename from langtools/test/tools/javac/T6394563.warn.out rename to test/langtools/tools/javac/T6394563.warn.out diff --git a/langtools/test/tools/javac/T6395974.java b/test/langtools/tools/javac/T6395974.java similarity index 100% rename from langtools/test/tools/javac/T6395974.java rename to test/langtools/tools/javac/T6395974.java diff --git a/langtools/test/tools/javac/T6397044.java b/test/langtools/tools/javac/T6397044.java similarity index 100% rename from langtools/test/tools/javac/T6397044.java rename to test/langtools/tools/javac/T6397044.java diff --git a/langtools/test/tools/javac/T6397286.java b/test/langtools/tools/javac/T6397286.java similarity index 100% rename from langtools/test/tools/javac/T6397286.java rename to test/langtools/tools/javac/T6397286.java diff --git a/langtools/test/tools/javac/T6403466.byfile.out b/test/langtools/tools/javac/T6403466.byfile.out similarity index 100% rename from langtools/test/tools/javac/T6403466.byfile.out rename to test/langtools/tools/javac/T6403466.byfile.out diff --git a/langtools/test/tools/javac/T6403466.java b/test/langtools/tools/javac/T6403466.java similarity index 100% rename from langtools/test/tools/javac/T6403466.java rename to test/langtools/tools/javac/T6403466.java diff --git a/langtools/test/tools/javac/T6403466.out b/test/langtools/tools/javac/T6403466.out similarity index 100% rename from langtools/test/tools/javac/T6403466.out rename to test/langtools/tools/javac/T6403466.out diff --git a/langtools/test/tools/javac/T6404756.java b/test/langtools/tools/javac/T6404756.java similarity index 100% rename from langtools/test/tools/javac/T6404756.java rename to test/langtools/tools/javac/T6404756.java diff --git a/langtools/test/tools/javac/T6404756.out b/test/langtools/tools/javac/T6404756.out similarity index 100% rename from langtools/test/tools/javac/T6404756.out rename to test/langtools/tools/javac/T6404756.out diff --git a/langtools/test/tools/javac/T6405099.java b/test/langtools/tools/javac/T6405099.java similarity index 100% rename from langtools/test/tools/javac/T6405099.java rename to test/langtools/tools/javac/T6405099.java diff --git a/langtools/test/tools/javac/T6406771.java b/test/langtools/tools/javac/T6406771.java similarity index 100% rename from langtools/test/tools/javac/T6406771.java rename to test/langtools/tools/javac/T6406771.java diff --git a/langtools/test/tools/javac/T6407066.java b/test/langtools/tools/javac/T6407066.java similarity index 100% rename from langtools/test/tools/javac/T6407066.java rename to test/langtools/tools/javac/T6407066.java diff --git a/langtools/test/tools/javac/T6407257.java b/test/langtools/tools/javac/T6407257.java similarity index 100% rename from langtools/test/tools/javac/T6407257.java rename to test/langtools/tools/javac/T6407257.java diff --git a/langtools/test/tools/javac/T6407257.out b/test/langtools/tools/javac/T6407257.out similarity index 100% rename from langtools/test/tools/javac/T6407257.out rename to test/langtools/tools/javac/T6407257.out diff --git a/langtools/test/tools/javac/T6410706.java b/test/langtools/tools/javac/T6410706.java similarity index 100% rename from langtools/test/tools/javac/T6410706.java rename to test/langtools/tools/javac/T6410706.java diff --git a/langtools/test/tools/javac/T6411379.java b/test/langtools/tools/javac/T6411379.java similarity index 100% rename from langtools/test/tools/javac/T6411379.java rename to test/langtools/tools/javac/T6411379.java diff --git a/langtools/test/tools/javac/T6423583.java b/test/langtools/tools/javac/T6423583.java similarity index 100% rename from langtools/test/tools/javac/T6423583.java rename to test/langtools/tools/javac/T6423583.java diff --git a/langtools/test/tools/javac/T6435291/T.jcod b/test/langtools/tools/javac/T6435291/T.jcod similarity index 100% rename from langtools/test/tools/javac/T6435291/T.jcod rename to test/langtools/tools/javac/T6435291/T.jcod diff --git a/langtools/test/tools/javac/T6435291/T6435291.java b/test/langtools/tools/javac/T6435291/T6435291.java similarity index 100% rename from langtools/test/tools/javac/T6435291/T6435291.java rename to test/langtools/tools/javac/T6435291/T6435291.java diff --git a/langtools/test/tools/javac/T6458749.java b/test/langtools/tools/javac/T6458749.java similarity index 100% rename from langtools/test/tools/javac/T6458749.java rename to test/langtools/tools/javac/T6458749.java diff --git a/langtools/test/tools/javac/T6458823/MyProcessor.java b/test/langtools/tools/javac/T6458823/MyProcessor.java similarity index 100% rename from langtools/test/tools/javac/T6458823/MyProcessor.java rename to test/langtools/tools/javac/T6458823/MyProcessor.java diff --git a/langtools/test/tools/javac/T6458823/T6458823.java b/test/langtools/tools/javac/T6458823/T6458823.java similarity index 100% rename from langtools/test/tools/javac/T6458823/T6458823.java rename to test/langtools/tools/javac/T6458823/T6458823.java diff --git a/langtools/test/tools/javac/T6458823/TestClass.java b/test/langtools/tools/javac/T6458823/TestClass.java similarity index 100% rename from langtools/test/tools/javac/T6458823/TestClass.java rename to test/langtools/tools/javac/T6458823/TestClass.java diff --git a/langtools/test/tools/javac/T6472751.java b/test/langtools/tools/javac/T6472751.java similarity index 100% rename from langtools/test/tools/javac/T6472751.java rename to test/langtools/tools/javac/T6472751.java diff --git a/langtools/test/tools/javac/T6534287.java b/test/langtools/tools/javac/T6534287.java similarity index 100% rename from langtools/test/tools/javac/T6534287.java rename to test/langtools/tools/javac/T6534287.java diff --git a/langtools/test/tools/javac/T6554097.java b/test/langtools/tools/javac/T6554097.java similarity index 100% rename from langtools/test/tools/javac/T6554097.java rename to test/langtools/tools/javac/T6554097.java diff --git a/langtools/test/tools/javac/T6554097.out b/test/langtools/tools/javac/T6554097.out similarity index 100% rename from langtools/test/tools/javac/T6554097.out rename to test/langtools/tools/javac/T6554097.out diff --git a/langtools/test/tools/javac/T6558476.java b/test/langtools/tools/javac/T6558476.java similarity index 100% rename from langtools/test/tools/javac/T6558476.java rename to test/langtools/tools/javac/T6558476.java diff --git a/langtools/test/tools/javac/T6567414.java b/test/langtools/tools/javac/T6567414.java similarity index 100% rename from langtools/test/tools/javac/T6567414.java rename to test/langtools/tools/javac/T6567414.java diff --git a/langtools/test/tools/javac/T6567414.out b/test/langtools/tools/javac/T6567414.out similarity index 100% rename from langtools/test/tools/javac/T6567414.out rename to test/langtools/tools/javac/T6567414.out diff --git a/langtools/test/tools/javac/T6587674.java b/test/langtools/tools/javac/T6587674.java similarity index 100% rename from langtools/test/tools/javac/T6587674.java rename to test/langtools/tools/javac/T6587674.java diff --git a/langtools/test/tools/javac/T6595666.java b/test/langtools/tools/javac/T6595666.java similarity index 100% rename from langtools/test/tools/javac/T6595666.java rename to test/langtools/tools/javac/T6595666.java diff --git a/langtools/test/tools/javac/T6625520.java b/test/langtools/tools/javac/T6625520.java similarity index 100% rename from langtools/test/tools/javac/T6625520.java rename to test/langtools/tools/javac/T6625520.java diff --git a/langtools/test/tools/javac/T6654037.java b/test/langtools/tools/javac/T6654037.java similarity index 100% rename from langtools/test/tools/javac/T6654037.java rename to test/langtools/tools/javac/T6654037.java diff --git a/langtools/test/tools/javac/T6663588.java b/test/langtools/tools/javac/T6663588.java similarity index 100% rename from langtools/test/tools/javac/T6663588.java rename to test/langtools/tools/javac/T6663588.java diff --git a/langtools/test/tools/javac/T6663588.out b/test/langtools/tools/javac/T6663588.out similarity index 100% rename from langtools/test/tools/javac/T6663588.out rename to test/langtools/tools/javac/T6663588.out diff --git a/langtools/test/tools/javac/T6665791.java b/test/langtools/tools/javac/T6665791.java similarity index 100% rename from langtools/test/tools/javac/T6665791.java rename to test/langtools/tools/javac/T6665791.java diff --git a/langtools/test/tools/javac/T6668802.java b/test/langtools/tools/javac/T6668802.java similarity index 100% rename from langtools/test/tools/javac/T6668802.java rename to test/langtools/tools/javac/T6668802.java diff --git a/langtools/test/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java b/test/langtools/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java similarity index 100% rename from langtools/test/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java rename to test/langtools/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java diff --git a/langtools/test/tools/javac/T6725036.java b/test/langtools/tools/javac/T6725036.java similarity index 100% rename from langtools/test/tools/javac/T6725036.java rename to test/langtools/tools/javac/T6725036.java diff --git a/langtools/test/tools/javac/T6759996.java b/test/langtools/tools/javac/T6759996.java similarity index 100% rename from langtools/test/tools/javac/T6759996.java rename to test/langtools/tools/javac/T6759996.java diff --git a/langtools/test/tools/javac/T6794959.java b/test/langtools/tools/javac/T6794959.java similarity index 100% rename from langtools/test/tools/javac/T6794959.java rename to test/langtools/tools/javac/T6794959.java diff --git a/langtools/test/tools/javac/T6794959a.out b/test/langtools/tools/javac/T6794959a.out similarity index 100% rename from langtools/test/tools/javac/T6794959a.out rename to test/langtools/tools/javac/T6794959a.out diff --git a/langtools/test/tools/javac/T6794959b.out b/test/langtools/tools/javac/T6794959b.out similarity index 100% rename from langtools/test/tools/javac/T6794959b.out rename to test/langtools/tools/javac/T6794959b.out diff --git a/langtools/test/tools/javac/T6855236.java b/test/langtools/tools/javac/T6855236.java similarity index 100% rename from langtools/test/tools/javac/T6855236.java rename to test/langtools/tools/javac/T6855236.java diff --git a/langtools/test/tools/javac/T6873849.java b/test/langtools/tools/javac/T6873849.java similarity index 100% rename from langtools/test/tools/javac/T6873849.java rename to test/langtools/tools/javac/T6873849.java diff --git a/langtools/test/tools/javac/T6881645.java b/test/langtools/tools/javac/T6881645.java similarity index 100% rename from langtools/test/tools/javac/T6881645.java rename to test/langtools/tools/javac/T6881645.java diff --git a/langtools/test/tools/javac/T6882235.java b/test/langtools/tools/javac/T6882235.java similarity index 100% rename from langtools/test/tools/javac/T6882235.java rename to test/langtools/tools/javac/T6882235.java diff --git a/langtools/test/tools/javac/T6882235.out b/test/langtools/tools/javac/T6882235.out similarity index 100% rename from langtools/test/tools/javac/T6882235.out rename to test/langtools/tools/javac/T6882235.out diff --git a/langtools/test/tools/javac/T6900149.java b/test/langtools/tools/javac/T6900149.java similarity index 100% rename from langtools/test/tools/javac/T6900149.java rename to test/langtools/tools/javac/T6900149.java diff --git a/langtools/test/tools/javac/T6942649.java b/test/langtools/tools/javac/T6942649.java similarity index 100% rename from langtools/test/tools/javac/T6942649.java rename to test/langtools/tools/javac/T6942649.java diff --git a/langtools/test/tools/javac/T6956462/T6956462.java b/test/langtools/tools/javac/T6956462/T6956462.java similarity index 100% rename from langtools/test/tools/javac/T6956462/T6956462.java rename to test/langtools/tools/javac/T6956462/T6956462.java diff --git a/langtools/test/tools/javac/T6956462/TestClass.java b/test/langtools/tools/javac/T6956462/TestClass.java similarity index 100% rename from langtools/test/tools/javac/T6956462/TestClass.java rename to test/langtools/tools/javac/T6956462/TestClass.java diff --git a/langtools/test/tools/javac/T6956638.java b/test/langtools/tools/javac/T6956638.java similarity index 100% rename from langtools/test/tools/javac/T6956638.java rename to test/langtools/tools/javac/T6956638.java diff --git a/langtools/test/tools/javac/T6970173/DebugPointerAtBadPositionTest.java b/test/langtools/tools/javac/T6970173/DebugPointerAtBadPositionTest.java similarity index 100% rename from langtools/test/tools/javac/T6970173/DebugPointerAtBadPositionTest.java rename to test/langtools/tools/javac/T6970173/DebugPointerAtBadPositionTest.java diff --git a/langtools/test/tools/javac/T6972327.java b/test/langtools/tools/javac/T6972327.java similarity index 100% rename from langtools/test/tools/javac/T6972327.java rename to test/langtools/tools/javac/T6972327.java diff --git a/langtools/test/tools/javac/T6977800.java b/test/langtools/tools/javac/T6977800.java similarity index 100% rename from langtools/test/tools/javac/T6977800.java rename to test/langtools/tools/javac/T6977800.java diff --git a/langtools/test/tools/javac/T6985181.java b/test/langtools/tools/javac/T6985181.java similarity index 100% rename from langtools/test/tools/javac/T6985181.java rename to test/langtools/tools/javac/T6985181.java diff --git a/langtools/test/tools/javac/T6993301.java b/test/langtools/tools/javac/T6993301.java similarity index 100% rename from langtools/test/tools/javac/T6993301.java rename to test/langtools/tools/javac/T6993301.java diff --git a/langtools/test/tools/javac/T6999210.java b/test/langtools/tools/javac/T6999210.java similarity index 100% rename from langtools/test/tools/javac/T6999210.java rename to test/langtools/tools/javac/T6999210.java diff --git a/langtools/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java b/test/langtools/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java similarity index 100% rename from langtools/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java rename to test/langtools/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java diff --git a/langtools/test/tools/javac/T7040104.java b/test/langtools/tools/javac/T7040104.java similarity index 100% rename from langtools/test/tools/javac/T7040104.java rename to test/langtools/tools/javac/T7040104.java diff --git a/langtools/test/tools/javac/T7040592/CoerceNullToMoreSpecificTypeTest.java b/test/langtools/tools/javac/T7040592/CoerceNullToMoreSpecificTypeTest.java similarity index 100% rename from langtools/test/tools/javac/T7040592/CoerceNullToMoreSpecificTypeTest.java rename to test/langtools/tools/javac/T7040592/CoerceNullToMoreSpecificTypeTest.java diff --git a/langtools/test/tools/javac/T7040592/T7040592.java b/test/langtools/tools/javac/T7040592/T7040592.java similarity index 100% rename from langtools/test/tools/javac/T7040592/T7040592.java rename to test/langtools/tools/javac/T7040592/T7040592.java diff --git a/langtools/test/tools/javac/T7042623.java b/test/langtools/tools/javac/T7042623.java similarity index 100% rename from langtools/test/tools/javac/T7042623.java rename to test/langtools/tools/javac/T7042623.java diff --git a/langtools/test/tools/javac/T7042623.out b/test/langtools/tools/javac/T7042623.out similarity index 100% rename from langtools/test/tools/javac/T7042623.out rename to test/langtools/tools/javac/T7042623.out diff --git a/langtools/test/tools/javac/T7053059/DoubleCastTest.java b/test/langtools/tools/javac/T7053059/DoubleCastTest.java similarity index 100% rename from langtools/test/tools/javac/T7053059/DoubleCastTest.java rename to test/langtools/tools/javac/T7053059/DoubleCastTest.java diff --git a/langtools/test/tools/javac/T7053059/VerifyErrorWithDoubleAssignmentTest.java b/test/langtools/tools/javac/T7053059/VerifyErrorWithDoubleAssignmentTest.java similarity index 100% rename from langtools/test/tools/javac/T7053059/VerifyErrorWithDoubleAssignmentTest.java rename to test/langtools/tools/javac/T7053059/VerifyErrorWithDoubleAssignmentTest.java diff --git a/langtools/test/tools/javac/T7090499.java b/test/langtools/tools/javac/T7090499.java similarity index 100% rename from langtools/test/tools/javac/T7090499.java rename to test/langtools/tools/javac/T7090499.java diff --git a/langtools/test/tools/javac/T7090499.out b/test/langtools/tools/javac/T7090499.out similarity index 100% rename from langtools/test/tools/javac/T7090499.out rename to test/langtools/tools/javac/T7090499.out diff --git a/langtools/test/tools/javac/T7093325.java b/test/langtools/tools/javac/T7093325.java similarity index 100% rename from langtools/test/tools/javac/T7093325.java rename to test/langtools/tools/javac/T7093325.java diff --git a/langtools/test/tools/javac/T7120266.java b/test/langtools/tools/javac/T7120266.java similarity index 100% rename from langtools/test/tools/javac/T7120266.java rename to test/langtools/tools/javac/T7120266.java diff --git a/langtools/test/tools/javac/T7120463.java b/test/langtools/tools/javac/T7120463.java similarity index 100% rename from langtools/test/tools/javac/T7120463.java rename to test/langtools/tools/javac/T7120463.java diff --git a/langtools/test/tools/javac/T7120463.out b/test/langtools/tools/javac/T7120463.out similarity index 100% rename from langtools/test/tools/javac/T7120463.out rename to test/langtools/tools/javac/T7120463.out diff --git a/langtools/test/tools/javac/T7126754.java b/test/langtools/tools/javac/T7126754.java similarity index 100% rename from langtools/test/tools/javac/T7126754.java rename to test/langtools/tools/javac/T7126754.java diff --git a/langtools/test/tools/javac/T7142672/AnnoProcessor.java b/test/langtools/tools/javac/T7142672/AnnoProcessor.java similarity index 100% rename from langtools/test/tools/javac/T7142672/AnnoProcessor.java rename to test/langtools/tools/javac/T7142672/AnnoProcessor.java diff --git a/langtools/test/tools/javac/T7142672/Bug.java b/test/langtools/tools/javac/T7142672/Bug.java similarity index 100% rename from langtools/test/tools/javac/T7142672/Bug.java rename to test/langtools/tools/javac/T7142672/Bug.java diff --git a/langtools/test/tools/javac/T7142672/Test2.java b/test/langtools/tools/javac/T7142672/Test2.java similarity index 100% rename from langtools/test/tools/javac/T7142672/Test2.java rename to test/langtools/tools/javac/T7142672/Test2.java diff --git a/langtools/test/tools/javac/T7142672/Test3.java b/test/langtools/tools/javac/T7142672/Test3.java similarity index 100% rename from langtools/test/tools/javac/T7142672/Test3.java rename to test/langtools/tools/javac/T7142672/Test3.java diff --git a/langtools/test/tools/javac/T7159016.java b/test/langtools/tools/javac/T7159016.java similarity index 100% rename from langtools/test/tools/javac/T7159016.java rename to test/langtools/tools/javac/T7159016.java diff --git a/langtools/test/tools/javac/T7165659/InnerClassAttrMustNotHaveStrictFPFlagTest.java b/test/langtools/tools/javac/T7165659/InnerClassAttrMustNotHaveStrictFPFlagTest.java similarity index 100% rename from langtools/test/tools/javac/T7165659/InnerClassAttrMustNotHaveStrictFPFlagTest.java rename to test/langtools/tools/javac/T7165659/InnerClassAttrMustNotHaveStrictFPFlagTest.java diff --git a/langtools/test/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java b/test/langtools/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java similarity index 100% rename from langtools/test/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java rename to test/langtools/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java diff --git a/langtools/test/tools/javac/T8000316/T8000316.java b/test/langtools/tools/javac/T8000316/T8000316.java similarity index 100% rename from langtools/test/tools/javac/T8000316/T8000316.java rename to test/langtools/tools/javac/T8000316/T8000316.java diff --git a/langtools/test/tools/javac/T8003967/DetectMutableStaticFields.java b/test/langtools/tools/javac/T8003967/DetectMutableStaticFields.java similarity index 100% rename from langtools/test/tools/javac/T8003967/DetectMutableStaticFields.java rename to test/langtools/tools/javac/T8003967/DetectMutableStaticFields.java diff --git a/langtools/test/tools/javac/T8004969.java b/test/langtools/tools/javac/T8004969.java similarity index 100% rename from langtools/test/tools/javac/T8004969.java rename to test/langtools/tools/javac/T8004969.java diff --git a/langtools/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java b/test/langtools/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java similarity index 100% rename from langtools/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java rename to test/langtools/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java diff --git a/langtools/test/tools/javac/T8010659/CompilerCrashWhenMixingBinariesAndSourcesTest.java b/test/langtools/tools/javac/T8010659/CompilerCrashWhenMixingBinariesAndSourcesTest.java similarity index 100% rename from langtools/test/tools/javac/T8010659/CompilerCrashWhenMixingBinariesAndSourcesTest.java rename to test/langtools/tools/javac/T8010659/CompilerCrashWhenMixingBinariesAndSourcesTest.java diff --git a/langtools/test/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java b/test/langtools/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java similarity index 100% rename from langtools/test/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java rename to test/langtools/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java diff --git a/langtools/test/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java b/test/langtools/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java similarity index 100% rename from langtools/test/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java rename to test/langtools/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java diff --git a/langtools/test/tools/javac/T8013394/CompileErrorWithIteratorTest.java b/test/langtools/tools/javac/T8013394/CompileErrorWithIteratorTest.java similarity index 100% rename from langtools/test/tools/javac/T8013394/CompileErrorWithIteratorTest.java rename to test/langtools/tools/javac/T8013394/CompileErrorWithIteratorTest.java diff --git a/langtools/test/tools/javac/T8016099/UncheckedWarningRegressionTest.java b/test/langtools/tools/javac/T8016099/UncheckedWarningRegressionTest.java similarity index 100% rename from langtools/test/tools/javac/T8016099/UncheckedWarningRegressionTest.java rename to test/langtools/tools/javac/T8016099/UncheckedWarningRegressionTest.java diff --git a/langtools/test/tools/javac/T8016099/UncheckedWarningRegressionTest.out b/test/langtools/tools/javac/T8016099/UncheckedWarningRegressionTest.out similarity index 100% rename from langtools/test/tools/javac/T8016099/UncheckedWarningRegressionTest.out rename to test/langtools/tools/javac/T8016099/UncheckedWarningRegressionTest.out diff --git a/langtools/test/tools/javac/T8019486/WrongLNTForLambdaTest.java b/test/langtools/tools/javac/T8019486/WrongLNTForLambdaTest.java similarity index 100% rename from langtools/test/tools/javac/T8019486/WrongLNTForLambdaTest.java rename to test/langtools/tools/javac/T8019486/WrongLNTForLambdaTest.java diff --git a/langtools/test/tools/javac/T8020997/CannotCompileRepeatedAnnoTest.java b/test/langtools/tools/javac/T8020997/CannotCompileRepeatedAnnoTest.java similarity index 100% rename from langtools/test/tools/javac/T8020997/CannotCompileRepeatedAnnoTest.java rename to test/langtools/tools/javac/T8020997/CannotCompileRepeatedAnnoTest.java diff --git a/langtools/test/tools/javac/T8022053/UnverifiableInitForNestedLocalClassTest.java b/test/langtools/tools/javac/T8022053/UnverifiableInitForNestedLocalClassTest.java similarity index 100% rename from langtools/test/tools/javac/T8022053/UnverifiableInitForNestedLocalClassTest.java rename to test/langtools/tools/javac/T8022053/UnverifiableInitForNestedLocalClassTest.java diff --git a/langtools/test/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java b/test/langtools/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java similarity index 100% rename from langtools/test/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java rename to test/langtools/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java diff --git a/langtools/test/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java b/test/langtools/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java similarity index 100% rename from langtools/test/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java rename to test/langtools/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java diff --git a/langtools/test/tools/javac/T8022316/CompilerErrorGenericThrowPlusMethodRefTest.java b/test/langtools/tools/javac/T8022316/CompilerErrorGenericThrowPlusMethodRefTest.java similarity index 100% rename from langtools/test/tools/javac/T8022316/CompilerErrorGenericThrowPlusMethodRefTest.java rename to test/langtools/tools/javac/T8022316/CompilerErrorGenericThrowPlusMethodRefTest.java diff --git a/langtools/test/tools/javac/T8022316/CompilerErrorGenericThrowPlusMethodRefTest.out b/test/langtools/tools/javac/T8022316/CompilerErrorGenericThrowPlusMethodRefTest.out similarity index 100% rename from langtools/test/tools/javac/T8022316/CompilerErrorGenericThrowPlusMethodRefTest.out rename to test/langtools/tools/javac/T8022316/CompilerErrorGenericThrowPlusMethodRefTest.out diff --git a/langtools/test/tools/javac/T8023112/SkipLazyConstantCreationForMethodRefTest.java b/test/langtools/tools/javac/T8023112/SkipLazyConstantCreationForMethodRefTest.java similarity index 100% rename from langtools/test/tools/javac/T8023112/SkipLazyConstantCreationForMethodRefTest.java rename to test/langtools/tools/javac/T8023112/SkipLazyConstantCreationForMethodRefTest.java diff --git a/langtools/test/tools/javac/T8023545/MisleadingErrorMsgDiamondPlusPrivateCtorTest.java b/test/langtools/tools/javac/T8023545/MisleadingErrorMsgDiamondPlusPrivateCtorTest.java similarity index 100% rename from langtools/test/tools/javac/T8023545/MisleadingErrorMsgDiamondPlusPrivateCtorTest.java rename to test/langtools/tools/javac/T8023545/MisleadingErrorMsgDiamondPlusPrivateCtorTest.java diff --git a/langtools/test/tools/javac/T8023545/MisleadingErrorMsgDiamondPlusPrivateCtorTest.out b/test/langtools/tools/javac/T8023545/MisleadingErrorMsgDiamondPlusPrivateCtorTest.out similarity index 100% rename from langtools/test/tools/javac/T8023545/MisleadingErrorMsgDiamondPlusPrivateCtorTest.out rename to test/langtools/tools/javac/T8023545/MisleadingErrorMsgDiamondPlusPrivateCtorTest.out diff --git a/langtools/test/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java b/test/langtools/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java similarity index 100% rename from langtools/test/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java rename to test/langtools/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java diff --git a/langtools/test/tools/javac/T8024207/FlowCrashTest.java b/test/langtools/tools/javac/T8024207/FlowCrashTest.java similarity index 100% rename from langtools/test/tools/javac/T8024207/FlowCrashTest.java rename to test/langtools/tools/javac/T8024207/FlowCrashTest.java diff --git a/langtools/test/tools/javac/T8024207/FlowCrashTest.out b/test/langtools/tools/javac/T8024207/FlowCrashTest.out similarity index 100% rename from langtools/test/tools/javac/T8024207/FlowCrashTest.out rename to test/langtools/tools/javac/T8024207/FlowCrashTest.out diff --git a/langtools/test/tools/javac/T8024398/NPETryTest.java b/test/langtools/tools/javac/T8024398/NPETryTest.java similarity index 100% rename from langtools/test/tools/javac/T8024398/NPETryTest.java rename to test/langtools/tools/javac/T8024398/NPETryTest.java diff --git a/langtools/test/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java b/test/langtools/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java similarity index 100% rename from langtools/test/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java rename to test/langtools/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java diff --git a/langtools/test/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java b/test/langtools/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java similarity index 100% rename from langtools/test/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java rename to test/langtools/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java diff --git a/langtools/test/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.out b/test/langtools/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.out similarity index 100% rename from langtools/test/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.out rename to test/langtools/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.out diff --git a/langtools/test/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java b/test/langtools/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java similarity index 100% rename from langtools/test/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java rename to test/langtools/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java diff --git a/langtools/test/tools/javac/T8029002/MultipleUpperBoundsIncorporationTest.java b/test/langtools/tools/javac/T8029002/MultipleUpperBoundsIncorporationTest.java similarity index 100% rename from langtools/test/tools/javac/T8029002/MultipleUpperBoundsIncorporationTest.java rename to test/langtools/tools/javac/T8029002/MultipleUpperBoundsIncorporationTest.java diff --git a/langtools/test/tools/javac/T8029102/WarnSerializableElementTest.java b/test/langtools/tools/javac/T8029102/WarnSerializableElementTest.java similarity index 100% rename from langtools/test/tools/javac/T8029102/WarnSerializableElementTest.java rename to test/langtools/tools/javac/T8029102/WarnSerializableElementTest.java diff --git a/langtools/test/tools/javac/T8029102/WarnSerializableElementTest.out b/test/langtools/tools/javac/T8029102/WarnSerializableElementTest.out similarity index 100% rename from langtools/test/tools/javac/T8029102/WarnSerializableElementTest.out rename to test/langtools/tools/javac/T8029102/WarnSerializableElementTest.out diff --git a/langtools/test/tools/javac/T8029102/WarnSerializableLambdaTestb.java b/test/langtools/tools/javac/T8029102/WarnSerializableLambdaTestb.java similarity index 100% rename from langtools/test/tools/javac/T8029102/WarnSerializableLambdaTestb.java rename to test/langtools/tools/javac/T8029102/WarnSerializableLambdaTestb.java diff --git a/langtools/test/tools/javac/T8029102/WarnSerializableLambdaTestb.out b/test/langtools/tools/javac/T8029102/WarnSerializableLambdaTestb.out similarity index 100% rename from langtools/test/tools/javac/T8029102/WarnSerializableLambdaTestb.out rename to test/langtools/tools/javac/T8029102/WarnSerializableLambdaTestb.out diff --git a/langtools/test/tools/javac/T8029102/WarnSerializableLambdaTestc.java b/test/langtools/tools/javac/T8029102/WarnSerializableLambdaTestc.java similarity index 100% rename from langtools/test/tools/javac/T8029102/WarnSerializableLambdaTestc.java rename to test/langtools/tools/javac/T8029102/WarnSerializableLambdaTestc.java diff --git a/langtools/test/tools/javac/T8029102/WarnSerializableLambdaTestc.out b/test/langtools/tools/javac/T8029102/WarnSerializableLambdaTestc.out similarity index 100% rename from langtools/test/tools/javac/T8029102/WarnSerializableLambdaTestc.out rename to test/langtools/tools/javac/T8029102/WarnSerializableLambdaTestc.out diff --git a/langtools/test/tools/javac/T8029179/CompileErrorForValidBooleanExpTest.java b/test/langtools/tools/javac/T8029179/CompileErrorForValidBooleanExpTest.java similarity index 100% rename from langtools/test/tools/javac/T8029179/CompileErrorForValidBooleanExpTest.java rename to test/langtools/tools/javac/T8029179/CompileErrorForValidBooleanExpTest.java diff --git a/langtools/test/tools/javac/T8029569/VarargsAmbiguityCrashTest.java b/test/langtools/tools/javac/T8029569/VarargsAmbiguityCrashTest.java similarity index 100% rename from langtools/test/tools/javac/T8029569/VarargsAmbiguityCrashTest.java rename to test/langtools/tools/javac/T8029569/VarargsAmbiguityCrashTest.java diff --git a/langtools/test/tools/javac/T8029569/VarargsAmbiguityCrashTest.out b/test/langtools/tools/javac/T8029569/VarargsAmbiguityCrashTest.out similarity index 100% rename from langtools/test/tools/javac/T8029569/VarargsAmbiguityCrashTest.out rename to test/langtools/tools/javac/T8029569/VarargsAmbiguityCrashTest.out diff --git a/langtools/test/tools/javac/T8030816/CrashLambdaExpressionWithNonAccessibleIdTest.java b/test/langtools/tools/javac/T8030816/CrashLambdaExpressionWithNonAccessibleIdTest.java similarity index 100% rename from langtools/test/tools/javac/T8030816/CrashLambdaExpressionWithNonAccessibleIdTest.java rename to test/langtools/tools/javac/T8030816/CrashLambdaExpressionWithNonAccessibleIdTest.java diff --git a/langtools/test/tools/javac/T8030816/CrashLambdaExpressionWithNonAccessibleIdTest.out b/test/langtools/tools/javac/T8030816/CrashLambdaExpressionWithNonAccessibleIdTest.out similarity index 100% rename from langtools/test/tools/javac/T8030816/CrashLambdaExpressionWithNonAccessibleIdTest.out rename to test/langtools/tools/javac/T8030816/CrashLambdaExpressionWithNonAccessibleIdTest.out diff --git a/langtools/test/tools/javac/T8034044.java b/test/langtools/tools/javac/T8034044.java similarity index 100% rename from langtools/test/tools/javac/T8034044.java rename to test/langtools/tools/javac/T8034044.java diff --git a/langtools/test/tools/javac/T8037947/CCEForFunctionalInterExtedingRawSuperInterTest.java b/test/langtools/tools/javac/T8037947/CCEForFunctionalInterExtedingRawSuperInterTest.java similarity index 100% rename from langtools/test/tools/javac/T8037947/CCEForFunctionalInterExtedingRawSuperInterTest.java rename to test/langtools/tools/javac/T8037947/CCEForFunctionalInterExtedingRawSuperInterTest.java diff --git a/langtools/test/tools/javac/T8038975/AccessTest.java b/test/langtools/tools/javac/T8038975/AccessTest.java similarity index 100% rename from langtools/test/tools/javac/T8038975/AccessTest.java rename to test/langtools/tools/javac/T8038975/AccessTest.java diff --git a/langtools/test/tools/javac/T8038975/a/A.java b/test/langtools/tools/javac/T8038975/a/A.java similarity index 100% rename from langtools/test/tools/javac/T8038975/a/A.java rename to test/langtools/tools/javac/T8038975/a/A.java diff --git a/langtools/test/tools/javac/T8038975/a/B.java b/test/langtools/tools/javac/T8038975/a/B.java similarity index 100% rename from langtools/test/tools/javac/T8038975/a/B.java rename to test/langtools/tools/javac/T8038975/a/B.java diff --git a/langtools/test/tools/javac/T8047338/FilterNonMembersToObtainFunctionDescriptorTest.java b/test/langtools/tools/javac/T8047338/FilterNonMembersToObtainFunctionDescriptorTest.java similarity index 100% rename from langtools/test/tools/javac/T8047338/FilterNonMembersToObtainFunctionDescriptorTest.java rename to test/langtools/tools/javac/T8047338/FilterNonMembersToObtainFunctionDescriptorTest.java diff --git a/langtools/test/tools/javac/T8048543/InferenceVariableInstantiatedUnexpectedlyTest.java b/test/langtools/tools/javac/T8048543/InferenceVariableInstantiatedUnexpectedlyTest.java similarity index 100% rename from langtools/test/tools/javac/T8048543/InferenceVariableInstantiatedUnexpectedlyTest.java rename to test/langtools/tools/javac/T8048543/InferenceVariableInstantiatedUnexpectedlyTest.java diff --git a/langtools/test/tools/javac/T8050386/WrongStackframeGenerationTest1.java b/test/langtools/tools/javac/T8050386/WrongStackframeGenerationTest1.java similarity index 100% rename from langtools/test/tools/javac/T8050386/WrongStackframeGenerationTest1.java rename to test/langtools/tools/javac/T8050386/WrongStackframeGenerationTest1.java diff --git a/langtools/test/tools/javac/T8050386/WrongStackframeGenerationTest2.java b/test/langtools/tools/javac/T8050386/WrongStackframeGenerationTest2.java similarity index 100% rename from langtools/test/tools/javac/T8050386/WrongStackframeGenerationTest2.java rename to test/langtools/tools/javac/T8050386/WrongStackframeGenerationTest2.java diff --git a/langtools/test/tools/javac/T8058244/MissingErrorInDefaultSuperCallTest.java b/test/langtools/tools/javac/T8058244/MissingErrorInDefaultSuperCallTest.java similarity index 100% rename from langtools/test/tools/javac/T8058244/MissingErrorInDefaultSuperCallTest.java rename to test/langtools/tools/javac/T8058244/MissingErrorInDefaultSuperCallTest.java diff --git a/langtools/test/tools/javac/T8058244/MissingErrorInDefaultSuperCallTest.out b/test/langtools/tools/javac/T8058244/MissingErrorInDefaultSuperCallTest.out similarity index 100% rename from langtools/test/tools/javac/T8058244/MissingErrorInDefaultSuperCallTest.out rename to test/langtools/tools/javac/T8058244/MissingErrorInDefaultSuperCallTest.out diff --git a/langtools/test/tools/javac/T8059921/ForbidAccessToFieldUsingSuperTest.java b/test/langtools/tools/javac/T8059921/ForbidAccessToFieldUsingSuperTest.java similarity index 100% rename from langtools/test/tools/javac/T8059921/ForbidAccessToFieldUsingSuperTest.java rename to test/langtools/tools/javac/T8059921/ForbidAccessToFieldUsingSuperTest.java diff --git a/langtools/test/tools/javac/T8059921/ForbidAccessToFieldUsingSuperTest.out b/test/langtools/tools/javac/T8059921/ForbidAccessToFieldUsingSuperTest.out similarity index 100% rename from langtools/test/tools/javac/T8059921/ForbidAccessToFieldUsingSuperTest.out rename to test/langtools/tools/javac/T8059921/ForbidAccessToFieldUsingSuperTest.out diff --git a/langtools/test/tools/javac/T8068460/PrettyPrintingForLoopsTest.java b/test/langtools/tools/javac/T8068460/PrettyPrintingForLoopsTest.java similarity index 100% rename from langtools/test/tools/javac/T8068460/PrettyPrintingForLoopsTest.java rename to test/langtools/tools/javac/T8068460/PrettyPrintingForLoopsTest.java diff --git a/langtools/test/tools/javac/T8071847/T8071847.java b/test/langtools/tools/javac/T8071847/T8071847.java similarity index 100% rename from langtools/test/tools/javac/T8071847/T8071847.java rename to test/langtools/tools/javac/T8071847/T8071847.java diff --git a/langtools/test/tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java b/test/langtools/tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java similarity index 100% rename from langtools/test/tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java rename to test/langtools/tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java diff --git a/langtools/test/tools/javac/T8139474/DashRelease7DashVerboseTest.java b/test/langtools/tools/javac/T8139474/DashRelease7DashVerboseTest.java similarity index 100% rename from langtools/test/tools/javac/T8139474/DashRelease7DashVerboseTest.java rename to test/langtools/tools/javac/T8139474/DashRelease7DashVerboseTest.java diff --git a/langtools/test/tools/javac/T8151191/Anno.java b/test/langtools/tools/javac/T8151191/Anno.java similarity index 100% rename from langtools/test/tools/javac/T8151191/Anno.java rename to test/langtools/tools/javac/T8151191/Anno.java diff --git a/langtools/test/tools/javac/T8151191/AnnoProcessor.java b/test/langtools/tools/javac/T8151191/AnnoProcessor.java similarity index 100% rename from langtools/test/tools/javac/T8151191/AnnoProcessor.java rename to test/langtools/tools/javac/T8151191/AnnoProcessor.java diff --git a/langtools/test/tools/javac/T8151191/ErrorRunningJavadocOnInnerClasses.java b/test/langtools/tools/javac/T8151191/ErrorRunningJavadocOnInnerClasses.java similarity index 100% rename from langtools/test/tools/javac/T8151191/ErrorRunningJavadocOnInnerClasses.java rename to test/langtools/tools/javac/T8151191/ErrorRunningJavadocOnInnerClasses.java diff --git a/langtools/test/tools/javac/T8152360/DeprecateJavahTest.java b/test/langtools/tools/javac/T8152360/DeprecateJavahTest.java similarity index 100% rename from langtools/test/tools/javac/T8152360/DeprecateJavahTest.java rename to test/langtools/tools/javac/T8152360/DeprecateJavahTest.java diff --git a/langtools/test/tools/javac/T8159970/TypeEqualityInInferenceTest.java b/test/langtools/tools/javac/T8159970/TypeEqualityInInferenceTest.java similarity index 100% rename from langtools/test/tools/javac/T8159970/TypeEqualityInInferenceTest.java rename to test/langtools/tools/javac/T8159970/TypeEqualityInInferenceTest.java diff --git a/langtools/test/tools/javac/T8160156/LetExpressionsAreUnnecessarilyGeneratedTest.java b/test/langtools/tools/javac/T8160156/LetExpressionsAreUnnecessarilyGeneratedTest.java similarity index 100% rename from langtools/test/tools/javac/T8160156/LetExpressionsAreUnnecessarilyGeneratedTest.java rename to test/langtools/tools/javac/T8160156/LetExpressionsAreUnnecessarilyGeneratedTest.java diff --git a/langtools/test/tools/javac/T8161277/IsSameTypeWildcardTest.java b/test/langtools/tools/javac/T8161277/IsSameTypeWildcardTest.java similarity index 100% rename from langtools/test/tools/javac/T8161277/IsSameTypeWildcardTest.java rename to test/langtools/tools/javac/T8161277/IsSameTypeWildcardTest.java diff --git a/langtools/test/tools/javac/T8161383/LookingForOperatorSymbolsAtWrongPlaceTest.java b/test/langtools/tools/javac/T8161383/LookingForOperatorSymbolsAtWrongPlaceTest.java similarity index 100% rename from langtools/test/tools/javac/T8161383/LookingForOperatorSymbolsAtWrongPlaceTest.java rename to test/langtools/tools/javac/T8161383/LookingForOperatorSymbolsAtWrongPlaceTest.java diff --git a/langtools/test/tools/javac/T8170667/ParameterProcessor.java b/test/langtools/tools/javac/T8170667/ParameterProcessor.java similarity index 100% rename from langtools/test/tools/javac/T8170667/ParameterProcessor.java rename to test/langtools/tools/javac/T8170667/ParameterProcessor.java diff --git a/langtools/test/tools/javac/T8171325/NPEClearingLocalClassNameIndexesTest.java b/test/langtools/tools/javac/T8171325/NPEClearingLocalClassNameIndexesTest.java similarity index 100% rename from langtools/test/tools/javac/T8171325/NPEClearingLocalClassNameIndexesTest.java rename to test/langtools/tools/javac/T8171325/NPEClearingLocalClassNameIndexesTest.java diff --git a/langtools/test/tools/javac/T8171325/NPEClearingLocalClassNameIndexesTest.out b/test/langtools/tools/javac/T8171325/NPEClearingLocalClassNameIndexesTest.out similarity index 100% rename from langtools/test/tools/javac/T8171325/NPEClearingLocalClassNameIndexesTest.out rename to test/langtools/tools/javac/T8171325/NPEClearingLocalClassNameIndexesTest.out diff --git a/langtools/test/tools/javac/T8171332/Buggy.java b/test/langtools/tools/javac/T8171332/Buggy.java similarity index 100% rename from langtools/test/tools/javac/T8171332/Buggy.java rename to test/langtools/tools/javac/T8171332/Buggy.java diff --git a/langtools/test/tools/javac/T8171332/Processor.java b/test/langtools/tools/javac/T8171332/Processor.java similarity index 100% rename from langtools/test/tools/javac/T8171332/Processor.java rename to test/langtools/tools/javac/T8171332/Processor.java diff --git a/langtools/test/tools/javac/T8171332/Processor.out b/test/langtools/tools/javac/T8171332/Processor.out similarity index 100% rename from langtools/test/tools/javac/T8171332/Processor.out rename to test/langtools/tools/javac/T8171332/Processor.out diff --git a/langtools/test/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.java b/test/langtools/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.java similarity index 100% rename from langtools/test/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.java rename to test/langtools/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.java diff --git a/langtools/test/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.out b/test/langtools/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.out similarity index 100% rename from langtools/test/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.out rename to test/langtools/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.out diff --git a/langtools/test/tools/javac/T8171528/pkg1/package-info.java b/test/langtools/tools/javac/T8171528/pkg1/package-info.java similarity index 100% rename from langtools/test/tools/javac/T8171528/pkg1/package-info.java rename to test/langtools/tools/javac/T8171528/pkg1/package-info.java diff --git a/langtools/test/tools/javac/T8171528/pkg2/package-info.java b/test/langtools/tools/javac/T8171528/pkg2/package-info.java similarity index 100% rename from langtools/test/tools/javac/T8171528/pkg2/package-info.java rename to test/langtools/tools/javac/T8171528/pkg2/package-info.java diff --git a/langtools/test/tools/javac/T8173955/MessageForClassTest.java b/test/langtools/tools/javac/T8173955/MessageForClassTest.java similarity index 100% rename from langtools/test/tools/javac/T8173955/MessageForClassTest.java rename to test/langtools/tools/javac/T8173955/MessageForClassTest.java diff --git a/langtools/test/tools/javac/T8173955/MessageForClassTest.out b/test/langtools/tools/javac/T8173955/MessageForClassTest.out similarity index 100% rename from langtools/test/tools/javac/T8173955/MessageForClassTest.out rename to test/langtools/tools/javac/T8173955/MessageForClassTest.out diff --git a/langtools/test/tools/javac/T8173955/MessageForEnumTest.java b/test/langtools/tools/javac/T8173955/MessageForEnumTest.java similarity index 100% rename from langtools/test/tools/javac/T8173955/MessageForEnumTest.java rename to test/langtools/tools/javac/T8173955/MessageForEnumTest.java diff --git a/langtools/test/tools/javac/T8173955/MessageForEnumTest.out b/test/langtools/tools/javac/T8173955/MessageForEnumTest.out similarity index 100% rename from langtools/test/tools/javac/T8173955/MessageForEnumTest.out rename to test/langtools/tools/javac/T8173955/MessageForEnumTest.out diff --git a/langtools/test/tools/javac/T8173955/MessageForInterfaceTest.java b/test/langtools/tools/javac/T8173955/MessageForInterfaceTest.java similarity index 100% rename from langtools/test/tools/javac/T8173955/MessageForInterfaceTest.java rename to test/langtools/tools/javac/T8173955/MessageForInterfaceTest.java diff --git a/langtools/test/tools/javac/T8173955/MessageForInterfaceTest.out b/test/langtools/tools/javac/T8173955/MessageForInterfaceTest.out similarity index 100% rename from langtools/test/tools/javac/T8173955/MessageForInterfaceTest.out rename to test/langtools/tools/javac/T8173955/MessageForInterfaceTest.out diff --git a/langtools/test/tools/javac/T8175198/AnnotationsAndFormalParamsTest.java b/test/langtools/tools/javac/T8175198/AnnotationsAndFormalParamsTest.java similarity index 100% rename from langtools/test/tools/javac/T8175198/AnnotationsAndFormalParamsTest.java rename to test/langtools/tools/javac/T8175198/AnnotationsAndFormalParamsTest.java diff --git a/langtools/test/tools/javac/T8175198/AnnotationsAndFormalParamsTest.out b/test/langtools/tools/javac/T8175198/AnnotationsAndFormalParamsTest.out similarity index 100% rename from langtools/test/tools/javac/T8175198/AnnotationsAndFormalParamsTest.out rename to test/langtools/tools/javac/T8175198/AnnotationsAndFormalParamsTest.out diff --git a/langtools/test/tools/javac/T8175235/InferenceRegressionTest01.java b/test/langtools/tools/javac/T8175235/InferenceRegressionTest01.java similarity index 100% rename from langtools/test/tools/javac/T8175235/InferenceRegressionTest01.java rename to test/langtools/tools/javac/T8175235/InferenceRegressionTest01.java diff --git a/langtools/test/tools/javac/T8175235/InferenceRegressionTest02.java b/test/langtools/tools/javac/T8175235/InferenceRegressionTest02.java similarity index 100% rename from langtools/test/tools/javac/T8175235/InferenceRegressionTest02.java rename to test/langtools/tools/javac/T8175235/InferenceRegressionTest02.java diff --git a/langtools/test/tools/javac/T8175790/NPEDueToErroneousLambdaTest.java b/test/langtools/tools/javac/T8175790/NPEDueToErroneousLambdaTest.java similarity index 100% rename from langtools/test/tools/javac/T8175790/NPEDueToErroneousLambdaTest.java rename to test/langtools/tools/javac/T8175790/NPEDueToErroneousLambdaTest.java diff --git a/langtools/test/tools/javac/T8175790/NPEDueToErroneousLambdaTest.out b/test/langtools/tools/javac/T8175790/NPEDueToErroneousLambdaTest.out similarity index 100% rename from langtools/test/tools/javac/T8175790/NPEDueToErroneousLambdaTest.out rename to test/langtools/tools/javac/T8175790/NPEDueToErroneousLambdaTest.out diff --git a/langtools/test/tools/javac/T8175794/MissingReturnConstraintTest.java b/test/langtools/tools/javac/T8175794/MissingReturnConstraintTest.java similarity index 100% rename from langtools/test/tools/javac/T8175794/MissingReturnConstraintTest.java rename to test/langtools/tools/javac/T8175794/MissingReturnConstraintTest.java diff --git a/langtools/test/tools/javac/T8176714/FieldOverloadKindNotAssignedTest.java b/test/langtools/tools/javac/T8176714/FieldOverloadKindNotAssignedTest.java similarity index 100% rename from langtools/test/tools/javac/T8176714/FieldOverloadKindNotAssignedTest.java rename to test/langtools/tools/javac/T8176714/FieldOverloadKindNotAssignedTest.java diff --git a/langtools/test/tools/javac/T8176714/TimingOfMReferenceCheckingTest01.java b/test/langtools/tools/javac/T8176714/TimingOfMReferenceCheckingTest01.java similarity index 100% rename from langtools/test/tools/javac/T8176714/TimingOfMReferenceCheckingTest01.java rename to test/langtools/tools/javac/T8176714/TimingOfMReferenceCheckingTest01.java diff --git a/langtools/test/tools/javac/T8176714/TimingOfMReferenceCheckingTest02.java b/test/langtools/tools/javac/T8176714/TimingOfMReferenceCheckingTest02.java similarity index 100% rename from langtools/test/tools/javac/T8176714/TimingOfMReferenceCheckingTest02.java rename to test/langtools/tools/javac/T8176714/TimingOfMReferenceCheckingTest02.java diff --git a/langtools/test/tools/javac/T8180141/MissingLNTEntryForBreakContinueTest.java b/test/langtools/tools/javac/T8180141/MissingLNTEntryForBreakContinueTest.java similarity index 100% rename from langtools/test/tools/javac/T8180141/MissingLNTEntryForBreakContinueTest.java rename to test/langtools/tools/javac/T8180141/MissingLNTEntryForBreakContinueTest.java diff --git a/langtools/test/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java b/test/langtools/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java similarity index 100% rename from langtools/test/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java rename to test/langtools/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java diff --git a/langtools/test/tools/javac/T8181464/Anno.java b/test/langtools/tools/javac/T8181464/Anno.java similarity index 100% rename from langtools/test/tools/javac/T8181464/Anno.java rename to test/langtools/tools/javac/T8181464/Anno.java diff --git a/langtools/test/tools/javac/T8181464/Anno2.java b/test/langtools/tools/javac/T8181464/Anno2.java similarity index 100% rename from langtools/test/tools/javac/T8181464/Anno2.java rename to test/langtools/tools/javac/T8181464/Anno2.java diff --git a/langtools/test/tools/javac/T8181464/AnnoProcessor.java b/test/langtools/tools/javac/T8181464/AnnoProcessor.java similarity index 100% rename from langtools/test/tools/javac/T8181464/AnnoProcessor.java rename to test/langtools/tools/javac/T8181464/AnnoProcessor.java diff --git a/langtools/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest1.java b/test/langtools/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest1.java similarity index 100% rename from langtools/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest1.java rename to test/langtools/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest1.java diff --git a/langtools/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest1.out b/test/langtools/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest1.out similarity index 100% rename from langtools/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest1.out rename to test/langtools/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest1.out diff --git a/langtools/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest2.java b/test/langtools/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest2.java similarity index 100% rename from langtools/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest2.java rename to test/langtools/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest2.java diff --git a/langtools/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest2.out b/test/langtools/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest2.out similarity index 100% rename from langtools/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest2.out rename to test/langtools/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest2.out diff --git a/langtools/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest3.java b/test/langtools/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest3.java similarity index 100% rename from langtools/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest3.java rename to test/langtools/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest3.java diff --git a/langtools/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest3.out b/test/langtools/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest3.out similarity index 100% rename from langtools/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest3.out rename to test/langtools/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest3.out diff --git a/langtools/test/tools/javac/T8182047/CorrectGenerationOfExConstraintsTest.java b/test/langtools/tools/javac/T8182047/CorrectGenerationOfExConstraintsTest.java similarity index 100% rename from langtools/test/tools/javac/T8182047/CorrectGenerationOfExConstraintsTest.java rename to test/langtools/tools/javac/T8182047/CorrectGenerationOfExConstraintsTest.java diff --git a/langtools/test/tools/javac/T8182649/AddCheckForPartiallyInferredTypesTest.java b/test/langtools/tools/javac/T8182649/AddCheckForPartiallyInferredTypesTest.java similarity index 100% rename from langtools/test/tools/javac/T8182649/AddCheckForPartiallyInferredTypesTest.java rename to test/langtools/tools/javac/T8182649/AddCheckForPartiallyInferredTypesTest.java diff --git a/langtools/test/tools/javac/T8182747/BadAnnotationRegressionTest.java b/test/langtools/tools/javac/T8182747/BadAnnotationRegressionTest.java similarity index 100% rename from langtools/test/tools/javac/T8182747/BadAnnotationRegressionTest.java rename to test/langtools/tools/javac/T8182747/BadAnnotationRegressionTest.java diff --git a/langtools/test/tools/javac/T8182747/BadAnnotationRegressionTest.out b/test/langtools/tools/javac/T8182747/BadAnnotationRegressionTest.out similarity index 100% rename from langtools/test/tools/javac/T8182747/BadAnnotationRegressionTest.out rename to test/langtools/tools/javac/T8182747/BadAnnotationRegressionTest.out diff --git a/langtools/test/tools/javac/TestPkgInfo.java b/test/langtools/tools/javac/TestPkgInfo.java similarity index 100% rename from langtools/test/tools/javac/TestPkgInfo.java rename to test/langtools/tools/javac/TestPkgInfo.java diff --git a/langtools/test/tools/javac/ThrowNull.java b/test/langtools/tools/javac/ThrowNull.java similarity index 100% rename from langtools/test/tools/javac/ThrowNull.java rename to test/langtools/tools/javac/ThrowNull.java diff --git a/langtools/test/tools/javac/ThrowsIntersection_1.java b/test/langtools/tools/javac/ThrowsIntersection_1.java similarity index 100% rename from langtools/test/tools/javac/ThrowsIntersection_1.java rename to test/langtools/tools/javac/ThrowsIntersection_1.java diff --git a/langtools/test/tools/javac/ThrowsIntersection_2.java b/test/langtools/tools/javac/ThrowsIntersection_2.java similarity index 100% rename from langtools/test/tools/javac/ThrowsIntersection_2.java rename to test/langtools/tools/javac/ThrowsIntersection_2.java diff --git a/langtools/test/tools/javac/ThrowsIntersection_3.java b/test/langtools/tools/javac/ThrowsIntersection_3.java similarity index 100% rename from langtools/test/tools/javac/ThrowsIntersection_3.java rename to test/langtools/tools/javac/ThrowsIntersection_3.java diff --git a/langtools/test/tools/javac/ThrowsIntersection_4.java b/test/langtools/tools/javac/ThrowsIntersection_4.java similarity index 100% rename from langtools/test/tools/javac/ThrowsIntersection_4.java rename to test/langtools/tools/javac/ThrowsIntersection_4.java diff --git a/langtools/test/tools/javac/TryInInstanceInit.java b/test/langtools/tools/javac/TryInInstanceInit.java similarity index 100% rename from langtools/test/tools/javac/TryInInstanceInit.java rename to test/langtools/tools/javac/TryInInstanceInit.java diff --git a/langtools/test/tools/javac/TryWithResources/BadTwr.java b/test/langtools/tools/javac/TryWithResources/BadTwr.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/BadTwr.java rename to test/langtools/tools/javac/TryWithResources/BadTwr.java diff --git a/langtools/test/tools/javac/TryWithResources/BadTwr.out b/test/langtools/tools/javac/TryWithResources/BadTwr.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/BadTwr.out rename to test/langtools/tools/javac/TryWithResources/BadTwr.out diff --git a/langtools/test/tools/javac/TryWithResources/BadTwr6.out b/test/langtools/tools/javac/TryWithResources/BadTwr6.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/BadTwr6.out rename to test/langtools/tools/javac/TryWithResources/BadTwr6.out diff --git a/langtools/test/tools/javac/TryWithResources/BadTwrSyntax.java b/test/langtools/tools/javac/TryWithResources/BadTwrSyntax.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/BadTwrSyntax.java rename to test/langtools/tools/javac/TryWithResources/BadTwrSyntax.java diff --git a/langtools/test/tools/javac/TryWithResources/BadTwrSyntax.out b/test/langtools/tools/javac/TryWithResources/BadTwrSyntax.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/BadTwrSyntax.out rename to test/langtools/tools/javac/TryWithResources/BadTwrSyntax.out diff --git a/langtools/test/tools/javac/TryWithResources/BadTwrSyntax6.out b/test/langtools/tools/javac/TryWithResources/BadTwrSyntax6.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/BadTwrSyntax6.out rename to test/langtools/tools/javac/TryWithResources/BadTwrSyntax6.out diff --git a/langtools/test/tools/javac/TryWithResources/DuplicateResource.java b/test/langtools/tools/javac/TryWithResources/DuplicateResource.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/DuplicateResource.java rename to test/langtools/tools/javac/TryWithResources/DuplicateResource.java diff --git a/langtools/test/tools/javac/TryWithResources/DuplicateResourceDecl.java b/test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/DuplicateResourceDecl.java rename to test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.java diff --git a/langtools/test/tools/javac/TryWithResources/DuplicateResourceDecl.out b/test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/DuplicateResourceDecl.out rename to test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.out diff --git a/langtools/test/tools/javac/TryWithResources/ExplicitFinal.java b/test/langtools/tools/javac/TryWithResources/ExplicitFinal.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ExplicitFinal.java rename to test/langtools/tools/javac/TryWithResources/ExplicitFinal.java diff --git a/langtools/test/tools/javac/TryWithResources/ImplicitFinal.java b/test/langtools/tools/javac/TryWithResources/ImplicitFinal.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ImplicitFinal.java rename to test/langtools/tools/javac/TryWithResources/ImplicitFinal.java diff --git a/langtools/test/tools/javac/TryWithResources/ImplicitFinal.out b/test/langtools/tools/javac/TryWithResources/ImplicitFinal.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ImplicitFinal.out rename to test/langtools/tools/javac/TryWithResources/ImplicitFinal.out diff --git a/langtools/test/tools/javac/TryWithResources/InterruptedExceptionTest.java b/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/InterruptedExceptionTest.java rename to test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest.java diff --git a/langtools/test/tools/javac/TryWithResources/PlainTry.java b/test/langtools/tools/javac/TryWithResources/PlainTry.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/PlainTry.java rename to test/langtools/tools/javac/TryWithResources/PlainTry.java diff --git a/langtools/test/tools/javac/TryWithResources/PlainTry.out b/test/langtools/tools/javac/TryWithResources/PlainTry.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/PlainTry.out rename to test/langtools/tools/javac/TryWithResources/PlainTry.out diff --git a/langtools/test/tools/javac/TryWithResources/PlainTry6.out b/test/langtools/tools/javac/TryWithResources/PlainTry6.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/PlainTry6.out rename to test/langtools/tools/javac/TryWithResources/PlainTry6.out diff --git a/langtools/test/tools/javac/TryWithResources/ResDeclOutsideTry.java b/test/langtools/tools/javac/TryWithResources/ResDeclOutsideTry.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResDeclOutsideTry.java rename to test/langtools/tools/javac/TryWithResources/ResDeclOutsideTry.java diff --git a/langtools/test/tools/javac/TryWithResources/ResDeclOutsideTry.out b/test/langtools/tools/javac/TryWithResources/ResDeclOutsideTry.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResDeclOutsideTry.out rename to test/langtools/tools/javac/TryWithResources/ResDeclOutsideTry.out diff --git a/langtools/test/tools/javac/TryWithResources/ResInNestedExpr.java b/test/langtools/tools/javac/TryWithResources/ResInNestedExpr.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResInNestedExpr.java rename to test/langtools/tools/javac/TryWithResources/ResInNestedExpr.java diff --git a/langtools/test/tools/javac/TryWithResources/ResourceInterface.java b/test/langtools/tools/javac/TryWithResources/ResourceInterface.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResourceInterface.java rename to test/langtools/tools/javac/TryWithResources/ResourceInterface.java diff --git a/langtools/test/tools/javac/TryWithResources/ResourceInterface.out b/test/langtools/tools/javac/TryWithResources/ResourceInterface.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResourceInterface.out rename to test/langtools/tools/javac/TryWithResources/ResourceInterface.out diff --git a/langtools/test/tools/javac/TryWithResources/ResourceNameConflict.java b/test/langtools/tools/javac/TryWithResources/ResourceNameConflict.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResourceNameConflict.java rename to test/langtools/tools/javac/TryWithResources/ResourceNameConflict.java diff --git a/langtools/test/tools/javac/TryWithResources/ResourceNameConflict.out b/test/langtools/tools/javac/TryWithResources/ResourceNameConflict.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResourceNameConflict.out rename to test/langtools/tools/javac/TryWithResources/ResourceNameConflict.out diff --git a/langtools/test/tools/javac/TryWithResources/ResourceOutsideTry.java b/test/langtools/tools/javac/TryWithResources/ResourceOutsideTry.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResourceOutsideTry.java rename to test/langtools/tools/javac/TryWithResources/ResourceOutsideTry.java diff --git a/langtools/test/tools/javac/TryWithResources/ResourceOutsideTry.out b/test/langtools/tools/javac/TryWithResources/ResourceOutsideTry.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResourceOutsideTry.out rename to test/langtools/tools/javac/TryWithResources/ResourceOutsideTry.out diff --git a/langtools/test/tools/javac/TryWithResources/ResourceRedecl.java b/test/langtools/tools/javac/TryWithResources/ResourceRedecl.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResourceRedecl.java rename to test/langtools/tools/javac/TryWithResources/ResourceRedecl.java diff --git a/langtools/test/tools/javac/TryWithResources/ResourceRedecl.out b/test/langtools/tools/javac/TryWithResources/ResourceRedecl.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResourceRedecl.out rename to test/langtools/tools/javac/TryWithResources/ResourceRedecl.out diff --git a/langtools/test/tools/javac/TryWithResources/ResourceShadow.java b/test/langtools/tools/javac/TryWithResources/ResourceShadow.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResourceShadow.java rename to test/langtools/tools/javac/TryWithResources/ResourceShadow.java diff --git a/langtools/test/tools/javac/TryWithResources/ResourceTypeVar.java b/test/langtools/tools/javac/TryWithResources/ResourceTypeVar.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/ResourceTypeVar.java rename to test/langtools/tools/javac/TryWithResources/ResourceTypeVar.java diff --git a/langtools/test/tools/javac/TryWithResources/T7022711.java b/test/langtools/tools/javac/TryWithResources/T7022711.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/T7022711.java rename to test/langtools/tools/javac/TryWithResources/T7022711.java diff --git a/langtools/test/tools/javac/TryWithResources/T7022711.out b/test/langtools/tools/javac/TryWithResources/T7022711.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/T7022711.out rename to test/langtools/tools/javac/TryWithResources/T7022711.out diff --git a/langtools/test/tools/javac/TryWithResources/T7032633.java b/test/langtools/tools/javac/TryWithResources/T7032633.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/T7032633.java rename to test/langtools/tools/javac/TryWithResources/T7032633.java diff --git a/langtools/test/tools/javac/TryWithResources/T7164542.java b/test/langtools/tools/javac/TryWithResources/T7164542.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/T7164542.java rename to test/langtools/tools/javac/TryWithResources/T7164542.java diff --git a/langtools/test/tools/javac/TryWithResources/T7178324.java b/test/langtools/tools/javac/TryWithResources/T7178324.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/T7178324.java rename to test/langtools/tools/javac/TryWithResources/T7178324.java diff --git a/langtools/test/tools/javac/TryWithResources/TestTwr09.java b/test/langtools/tools/javac/TryWithResources/TestTwr09.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TestTwr09.java rename to test/langtools/tools/javac/TryWithResources/TestTwr09.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrAndLambda.java b/test/langtools/tools/javac/TryWithResources/TwrAndLambda.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrAndLambda.java rename to test/langtools/tools/javac/TryWithResources/TwrAndLambda.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrAndLambda.out b/test/langtools/tools/javac/TryWithResources/TwrAndLambda.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrAndLambda.out rename to test/langtools/tools/javac/TryWithResources/TwrAndLambda.out diff --git a/langtools/test/tools/javac/TryWithResources/TwrAndTypeVariables.java b/test/langtools/tools/javac/TryWithResources/TwrAndTypeVariables.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrAndTypeVariables.java rename to test/langtools/tools/javac/TryWithResources/TwrAndTypeVariables.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrAndTypeVariables.out b/test/langtools/tools/javac/TryWithResources/TwrAndTypeVariables.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrAndTypeVariables.out rename to test/langtools/tools/javac/TryWithResources/TwrAndTypeVariables.out diff --git a/langtools/test/tools/javac/TryWithResources/TwrAndTypeVariables2Test.java b/test/langtools/tools/javac/TryWithResources/TwrAndTypeVariables2Test.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrAndTypeVariables2Test.java rename to test/langtools/tools/javac/TryWithResources/TwrAndTypeVariables2Test.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrAvoidNullCheck.java b/test/langtools/tools/javac/TryWithResources/TwrAvoidNullCheck.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrAvoidNullCheck.java rename to test/langtools/tools/javac/TryWithResources/TwrAvoidNullCheck.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrClose.java b/test/langtools/tools/javac/TryWithResources/TwrClose.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrClose.java rename to test/langtools/tools/javac/TryWithResources/TwrClose.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrFlow.java b/test/langtools/tools/javac/TryWithResources/TwrFlow.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrFlow.java rename to test/langtools/tools/javac/TryWithResources/TwrFlow.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrFlow.out b/test/langtools/tools/javac/TryWithResources/TwrFlow.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrFlow.out rename to test/langtools/tools/javac/TryWithResources/TwrFlow.out diff --git a/langtools/test/tools/javac/TryWithResources/TwrForVariable1.java b/test/langtools/tools/javac/TryWithResources/TwrForVariable1.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrForVariable1.java rename to test/langtools/tools/javac/TryWithResources/TwrForVariable1.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrForVariable1.out b/test/langtools/tools/javac/TryWithResources/TwrForVariable1.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrForVariable1.out rename to test/langtools/tools/javac/TryWithResources/TwrForVariable1.out diff --git a/langtools/test/tools/javac/TryWithResources/TwrForVariable2.java b/test/langtools/tools/javac/TryWithResources/TwrForVariable2.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrForVariable2.java rename to test/langtools/tools/javac/TryWithResources/TwrForVariable2.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrForVariable2.out b/test/langtools/tools/javac/TryWithResources/TwrForVariable2.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrForVariable2.out rename to test/langtools/tools/javac/TryWithResources/TwrForVariable2.out diff --git a/langtools/test/tools/javac/TryWithResources/TwrForVariable3.java b/test/langtools/tools/javac/TryWithResources/TwrForVariable3.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrForVariable3.java rename to test/langtools/tools/javac/TryWithResources/TwrForVariable3.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrForVariable3.out b/test/langtools/tools/javac/TryWithResources/TwrForVariable3.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrForVariable3.out rename to test/langtools/tools/javac/TryWithResources/TwrForVariable3.out diff --git a/langtools/test/tools/javac/TryWithResources/TwrForVariable4.java b/test/langtools/tools/javac/TryWithResources/TwrForVariable4.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrForVariable4.java rename to test/langtools/tools/javac/TryWithResources/TwrForVariable4.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrForVariable4.out b/test/langtools/tools/javac/TryWithResources/TwrForVariable4.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrForVariable4.out rename to test/langtools/tools/javac/TryWithResources/TwrForVariable4.out diff --git a/langtools/test/tools/javac/TryWithResources/TwrLint.java b/test/langtools/tools/javac/TryWithResources/TwrLint.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrLint.java rename to test/langtools/tools/javac/TryWithResources/TwrLint.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrLint.out b/test/langtools/tools/javac/TryWithResources/TwrLint.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrLint.out rename to test/langtools/tools/javac/TryWithResources/TwrLint.out diff --git a/langtools/test/tools/javac/TryWithResources/TwrMultiCatch.java b/test/langtools/tools/javac/TryWithResources/TwrMultiCatch.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrMultiCatch.java rename to test/langtools/tools/javac/TryWithResources/TwrMultiCatch.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrNullTests.java b/test/langtools/tools/javac/TryWithResources/TwrNullTests.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrNullTests.java rename to test/langtools/tools/javac/TryWithResources/TwrNullTests.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrOnNonResource.java b/test/langtools/tools/javac/TryWithResources/TwrOnNonResource.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrOnNonResource.java rename to test/langtools/tools/javac/TryWithResources/TwrOnNonResource.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrOnNonResource.out b/test/langtools/tools/javac/TryWithResources/TwrOnNonResource.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrOnNonResource.out rename to test/langtools/tools/javac/TryWithResources/TwrOnNonResource.out diff --git a/langtools/test/tools/javac/TryWithResources/TwrOnNonResource6.out b/test/langtools/tools/javac/TryWithResources/TwrOnNonResource6.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrOnNonResource6.out rename to test/langtools/tools/javac/TryWithResources/TwrOnNonResource6.out diff --git a/langtools/test/tools/javac/TryWithResources/TwrShareCloseCode.java b/test/langtools/tools/javac/TryWithResources/TwrShareCloseCode.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrShareCloseCode.java rename to test/langtools/tools/javac/TryWithResources/TwrShareCloseCode.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrSuppression.java b/test/langtools/tools/javac/TryWithResources/TwrSuppression.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrSuppression.java rename to test/langtools/tools/javac/TryWithResources/TwrSuppression.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrTests.java b/test/langtools/tools/javac/TryWithResources/TwrTests.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrTests.java rename to test/langtools/tools/javac/TryWithResources/TwrTests.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrVarKinds.java b/test/langtools/tools/javac/TryWithResources/TwrVarKinds.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrVarKinds.java rename to test/langtools/tools/javac/TryWithResources/TwrVarKinds.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrVarKinds.out b/test/langtools/tools/javac/TryWithResources/TwrVarKinds.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrVarKinds.out rename to test/langtools/tools/javac/TryWithResources/TwrVarKinds.out diff --git a/langtools/test/tools/javac/TryWithResources/TwrVarRedeclaration.java b/test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrVarRedeclaration.java rename to test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.java diff --git a/langtools/test/tools/javac/TryWithResources/TwrVarRedeclaration.out b/test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/TwrVarRedeclaration.out rename to test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.out diff --git a/langtools/test/tools/javac/TryWithResources/UnusedResourcesTest.java b/test/langtools/tools/javac/TryWithResources/UnusedResourcesTest.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/UnusedResourcesTest.java rename to test/langtools/tools/javac/TryWithResources/UnusedResourcesTest.java diff --git a/langtools/test/tools/javac/TryWithResources/WeirdTwr.java b/test/langtools/tools/javac/TryWithResources/WeirdTwr.java similarity index 100% rename from langtools/test/tools/javac/TryWithResources/WeirdTwr.java rename to test/langtools/tools/javac/TryWithResources/WeirdTwr.java diff --git a/langtools/test/tools/javac/TryWithResources/WeirdTwr.out b/test/langtools/tools/javac/TryWithResources/WeirdTwr.out similarity index 100% rename from langtools/test/tools/javac/TryWithResources/WeirdTwr.out rename to test/langtools/tools/javac/TryWithResources/WeirdTwr.out diff --git a/langtools/test/tools/javac/TypeVarShadow.java b/test/langtools/tools/javac/TypeVarShadow.java similarity index 100% rename from langtools/test/tools/javac/TypeVarShadow.java rename to test/langtools/tools/javac/TypeVarShadow.java diff --git a/langtools/test/tools/javac/UncaughtOverflow.java b/test/langtools/tools/javac/UncaughtOverflow.java similarity index 100% rename from langtools/test/tools/javac/UncaughtOverflow.java rename to test/langtools/tools/javac/UncaughtOverflow.java diff --git a/langtools/test/tools/javac/UncaughtOverflow.out b/test/langtools/tools/javac/UncaughtOverflow.out similarity index 100% rename from langtools/test/tools/javac/UncaughtOverflow.out rename to test/langtools/tools/javac/UncaughtOverflow.out diff --git a/langtools/test/tools/javac/UnreachableLoopCond.java b/test/langtools/tools/javac/UnreachableLoopCond.java similarity index 100% rename from langtools/test/tools/javac/UnreachableLoopCond.java rename to test/langtools/tools/javac/UnreachableLoopCond.java diff --git a/langtools/test/tools/javac/UnreachableVar.java b/test/langtools/tools/javac/UnreachableVar.java similarity index 100% rename from langtools/test/tools/javac/UnreachableVar.java rename to test/langtools/tools/javac/UnreachableVar.java diff --git a/langtools/test/tools/javac/UnterminatedLineComment.java b/test/langtools/tools/javac/UnterminatedLineComment.java similarity index 100% rename from langtools/test/tools/javac/UnterminatedLineComment.java rename to test/langtools/tools/javac/UnterminatedLineComment.java diff --git a/langtools/test/tools/javac/UplevelFromAnonInSuperCall.java b/test/langtools/tools/javac/UplevelFromAnonInSuperCall.java similarity index 100% rename from langtools/test/tools/javac/UplevelFromAnonInSuperCall.java rename to test/langtools/tools/javac/UplevelFromAnonInSuperCall.java diff --git a/langtools/test/tools/javac/UseEnum.java b/test/langtools/tools/javac/UseEnum.java similarity index 100% rename from langtools/test/tools/javac/UseEnum.java rename to test/langtools/tools/javac/UseEnum.java diff --git a/langtools/test/tools/javac/UseEnum.out b/test/langtools/tools/javac/UseEnum.out similarity index 100% rename from langtools/test/tools/javac/UseEnum.out rename to test/langtools/tools/javac/UseEnum.out diff --git a/langtools/test/tools/javac/VarDeclarationWithAssignment.java b/test/langtools/tools/javac/VarDeclarationWithAssignment.java similarity index 100% rename from langtools/test/tools/javac/VarDeclarationWithAssignment.java rename to test/langtools/tools/javac/VarDeclarationWithAssignment.java diff --git a/langtools/test/tools/javac/Verify.java b/test/langtools/tools/javac/Verify.java similarity index 100% rename from langtools/test/tools/javac/Verify.java rename to test/langtools/tools/javac/Verify.java diff --git a/langtools/test/tools/javac/VerifyDA.java b/test/langtools/tools/javac/VerifyDA.java similarity index 100% rename from langtools/test/tools/javac/VerifyDA.java rename to test/langtools/tools/javac/VerifyDA.java diff --git a/langtools/test/tools/javac/VersionOpt.java b/test/langtools/tools/javac/VersionOpt.java similarity index 100% rename from langtools/test/tools/javac/VersionOpt.java rename to test/langtools/tools/javac/VersionOpt.java diff --git a/langtools/test/tools/javac/VoidArray.java b/test/langtools/tools/javac/VoidArray.java similarity index 100% rename from langtools/test/tools/javac/VoidArray.java rename to test/langtools/tools/javac/VoidArray.java diff --git a/langtools/test/tools/javac/VoidArray.out b/test/langtools/tools/javac/VoidArray.out similarity index 100% rename from langtools/test/tools/javac/VoidArray.out rename to test/langtools/tools/javac/VoidArray.out diff --git a/langtools/test/tools/javac/abstract/T1.java b/test/langtools/tools/javac/abstract/T1.java similarity index 100% rename from langtools/test/tools/javac/abstract/T1.java rename to test/langtools/tools/javac/abstract/T1.java diff --git a/langtools/test/tools/javac/abstract/T2.java b/test/langtools/tools/javac/abstract/T2.java similarity index 100% rename from langtools/test/tools/javac/abstract/T2.java rename to test/langtools/tools/javac/abstract/T2.java diff --git a/langtools/test/tools/javac/abstract/T3.java b/test/langtools/tools/javac/abstract/T3.java similarity index 100% rename from langtools/test/tools/javac/abstract/T3.java rename to test/langtools/tools/javac/abstract/T3.java diff --git a/langtools/test/tools/javac/abstract/T4717181a.java b/test/langtools/tools/javac/abstract/T4717181a.java similarity index 100% rename from langtools/test/tools/javac/abstract/T4717181a.java rename to test/langtools/tools/javac/abstract/T4717181a.java diff --git a/langtools/test/tools/javac/abstract/T4717181b.java b/test/langtools/tools/javac/abstract/T4717181b.java similarity index 100% rename from langtools/test/tools/javac/abstract/T4717181b.java rename to test/langtools/tools/javac/abstract/T4717181b.java diff --git a/langtools/test/tools/javac/abstract/U1.java b/test/langtools/tools/javac/abstract/U1.java similarity index 100% rename from langtools/test/tools/javac/abstract/U1.java rename to test/langtools/tools/javac/abstract/U1.java diff --git a/langtools/test/tools/javac/abstract/U2.java b/test/langtools/tools/javac/abstract/U2.java similarity index 100% rename from langtools/test/tools/javac/abstract/U2.java rename to test/langtools/tools/javac/abstract/U2.java diff --git a/langtools/test/tools/javac/abstract/U3.java b/test/langtools/tools/javac/abstract/U3.java similarity index 100% rename from langtools/test/tools/javac/abstract/U3.java rename to test/langtools/tools/javac/abstract/U3.java diff --git a/langtools/test/tools/javac/accessVirtualInner/Main.java b/test/langtools/tools/javac/accessVirtualInner/Main.java similarity index 100% rename from langtools/test/tools/javac/accessVirtualInner/Main.java rename to test/langtools/tools/javac/accessVirtualInner/Main.java diff --git a/langtools/test/tools/javac/accessVirtualInner/a/A.java b/test/langtools/tools/javac/accessVirtualInner/a/A.java similarity index 100% rename from langtools/test/tools/javac/accessVirtualInner/a/A.java rename to test/langtools/tools/javac/accessVirtualInner/a/A.java diff --git a/langtools/test/tools/javac/accessVirtualInner/b/B.java b/test/langtools/tools/javac/accessVirtualInner/b/B.java similarity index 100% rename from langtools/test/tools/javac/accessVirtualInner/b/B.java rename to test/langtools/tools/javac/accessVirtualInner/b/B.java diff --git a/langtools/test/tools/javac/accessVirtualInner/c/C.java b/test/langtools/tools/javac/accessVirtualInner/c/C.java similarity index 100% rename from langtools/test/tools/javac/accessVirtualInner/c/C.java rename to test/langtools/tools/javac/accessVirtualInner/c/C.java diff --git a/langtools/test/tools/javac/annotations/6214965/CompilerAnnotationTest.java b/test/langtools/tools/javac/annotations/6214965/CompilerAnnotationTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/6214965/CompilerAnnotationTest.java rename to test/langtools/tools/javac/annotations/6214965/CompilerAnnotationTest.java diff --git a/langtools/test/tools/javac/annotations/6214965/CompilerAnnotationTest2.java b/test/langtools/tools/javac/annotations/6214965/CompilerAnnotationTest2.java similarity index 100% rename from langtools/test/tools/javac/annotations/6214965/CompilerAnnotationTest2.java rename to test/langtools/tools/javac/annotations/6214965/CompilerAnnotationTest2.java diff --git a/langtools/test/tools/javac/annotations/6214965/CompilerAnnotationTest2bad.java b/test/langtools/tools/javac/annotations/6214965/CompilerAnnotationTest2bad.java similarity index 100% rename from langtools/test/tools/javac/annotations/6214965/CompilerAnnotationTest2bad.java rename to test/langtools/tools/javac/annotations/6214965/CompilerAnnotationTest2bad.java diff --git a/langtools/test/tools/javac/annotations/6214965/T6214965.java b/test/langtools/tools/javac/annotations/6214965/T6214965.java similarity index 100% rename from langtools/test/tools/javac/annotations/6214965/T6214965.java rename to test/langtools/tools/javac/annotations/6214965/T6214965.java diff --git a/langtools/test/tools/javac/annotations/6214965/T6214965.out b/test/langtools/tools/javac/annotations/6214965/T6214965.out similarity index 100% rename from langtools/test/tools/javac/annotations/6214965/T6214965.out rename to test/langtools/tools/javac/annotations/6214965/T6214965.out diff --git a/langtools/test/tools/javac/annotations/6359949/T6359949.java b/test/langtools/tools/javac/annotations/6359949/T6359949.java similarity index 100% rename from langtools/test/tools/javac/annotations/6359949/T6359949.java rename to test/langtools/tools/javac/annotations/6359949/T6359949.java diff --git a/langtools/test/tools/javac/annotations/6359949/T6359949a.java b/test/langtools/tools/javac/annotations/6359949/T6359949a.java similarity index 100% rename from langtools/test/tools/javac/annotations/6359949/T6359949a.java rename to test/langtools/tools/javac/annotations/6359949/T6359949a.java diff --git a/langtools/test/tools/javac/annotations/6359949/T6359949a.out b/test/langtools/tools/javac/annotations/6359949/T6359949a.out similarity index 100% rename from langtools/test/tools/javac/annotations/6359949/T6359949a.out rename to test/langtools/tools/javac/annotations/6359949/T6359949a.out diff --git a/langtools/test/tools/javac/annotations/6365854/T6365854.java b/test/langtools/tools/javac/annotations/6365854/T6365854.java similarity index 100% rename from langtools/test/tools/javac/annotations/6365854/T6365854.java rename to test/langtools/tools/javac/annotations/6365854/T6365854.java diff --git a/langtools/test/tools/javac/annotations/6365854/TestAnnotation.java b/test/langtools/tools/javac/annotations/6365854/TestAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/6365854/TestAnnotation.java rename to test/langtools/tools/javac/annotations/6365854/TestAnnotation.java diff --git a/langtools/test/tools/javac/annotations/6365854/TestCore.java b/test/langtools/tools/javac/annotations/6365854/TestCore.java similarity index 100% rename from langtools/test/tools/javac/annotations/6365854/TestCore.java rename to test/langtools/tools/javac/annotations/6365854/TestCore.java diff --git a/langtools/test/tools/javac/annotations/6365854/evolve/TestAnnotation.java b/test/langtools/tools/javac/annotations/6365854/evolve/TestAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/6365854/evolve/TestAnnotation.java rename to test/langtools/tools/javac/annotations/6365854/evolve/TestAnnotation.java diff --git a/langtools/test/tools/javac/annotations/6365854/test1.out b/test/langtools/tools/javac/annotations/6365854/test1.out similarity index 100% rename from langtools/test/tools/javac/annotations/6365854/test1.out rename to test/langtools/tools/javac/annotations/6365854/test1.out diff --git a/langtools/test/tools/javac/annotations/6365854/test2.out b/test/langtools/tools/javac/annotations/6365854/test2.out similarity index 100% rename from langtools/test/tools/javac/annotations/6365854/test2.out rename to test/langtools/tools/javac/annotations/6365854/test2.out diff --git a/langtools/test/tools/javac/annotations/6550655/T6550655.java b/test/langtools/tools/javac/annotations/6550655/T6550655.java similarity index 100% rename from langtools/test/tools/javac/annotations/6550655/T6550655.java rename to test/langtools/tools/javac/annotations/6550655/T6550655.java diff --git a/langtools/test/tools/javac/annotations/6881115/T6881115.java b/test/langtools/tools/javac/annotations/6881115/T6881115.java similarity index 100% rename from langtools/test/tools/javac/annotations/6881115/T6881115.java rename to test/langtools/tools/javac/annotations/6881115/T6881115.java diff --git a/langtools/test/tools/javac/annotations/6881115/T6881115.out b/test/langtools/tools/javac/annotations/6881115/T6881115.out similarity index 100% rename from langtools/test/tools/javac/annotations/6881115/T6881115.out rename to test/langtools/tools/javac/annotations/6881115/T6881115.out diff --git a/langtools/test/tools/javac/annotations/8145489/T8145489.java b/test/langtools/tools/javac/annotations/8145489/T8145489.java similarity index 100% rename from langtools/test/tools/javac/annotations/8145489/T8145489.java rename to test/langtools/tools/javac/annotations/8145489/T8145489.java diff --git a/langtools/test/tools/javac/annotations/8145489/foo/Anno.java b/test/langtools/tools/javac/annotations/8145489/foo/Anno.java similarity index 100% rename from langtools/test/tools/javac/annotations/8145489/foo/Anno.java rename to test/langtools/tools/javac/annotations/8145489/foo/Anno.java diff --git a/langtools/test/tools/javac/annotations/8145489/foo/Status.java b/test/langtools/tools/javac/annotations/8145489/foo/Status.java similarity index 100% rename from langtools/test/tools/javac/annotations/8145489/foo/Status.java rename to test/langtools/tools/javac/annotations/8145489/foo/Status.java diff --git a/langtools/test/tools/javac/annotations/8145489/foo/package-info.java b/test/langtools/tools/javac/annotations/8145489/foo/package-info.java similarity index 100% rename from langtools/test/tools/javac/annotations/8145489/foo/package-info.java rename to test/langtools/tools/javac/annotations/8145489/foo/package-info.java diff --git a/langtools/test/tools/javac/annotations/AnnotationTypeElementModifiers.java b/test/langtools/tools/javac/annotations/AnnotationTypeElementModifiers.java similarity index 100% rename from langtools/test/tools/javac/annotations/AnnotationTypeElementModifiers.java rename to test/langtools/tools/javac/annotations/AnnotationTypeElementModifiers.java diff --git a/langtools/test/tools/javac/annotations/AnnotationTypeElementModifiers.out b/test/langtools/tools/javac/annotations/AnnotationTypeElementModifiers.out similarity index 100% rename from langtools/test/tools/javac/annotations/AnnotationTypeElementModifiers.out rename to test/langtools/tools/javac/annotations/AnnotationTypeElementModifiers.out diff --git a/langtools/test/tools/javac/annotations/FinalReceiverTest.java b/test/langtools/tools/javac/annotations/FinalReceiverTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/FinalReceiverTest.java rename to test/langtools/tools/javac/annotations/FinalReceiverTest.java diff --git a/langtools/test/tools/javac/annotations/FinalReceiverTest.out b/test/langtools/tools/javac/annotations/FinalReceiverTest.out similarity index 100% rename from langtools/test/tools/javac/annotations/FinalReceiverTest.out rename to test/langtools/tools/javac/annotations/FinalReceiverTest.out diff --git a/langtools/test/tools/javac/annotations/FinalStringInNested.java b/test/langtools/tools/javac/annotations/FinalStringInNested.java similarity index 100% rename from langtools/test/tools/javac/annotations/FinalStringInNested.java rename to test/langtools/tools/javac/annotations/FinalStringInNested.java diff --git a/langtools/test/tools/javac/annotations/LocalInnerReceiverTest.java b/test/langtools/tools/javac/annotations/LocalInnerReceiverTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/LocalInnerReceiverTest.java rename to test/langtools/tools/javac/annotations/LocalInnerReceiverTest.java diff --git a/langtools/test/tools/javac/annotations/SyntheticParameters.java b/test/langtools/tools/javac/annotations/SyntheticParameters.java similarity index 100% rename from langtools/test/tools/javac/annotations/SyntheticParameters.java rename to test/langtools/tools/javac/annotations/SyntheticParameters.java diff --git a/langtools/test/tools/javac/annotations/T7043371.java b/test/langtools/tools/javac/annotations/T7043371.java similarity index 100% rename from langtools/test/tools/javac/annotations/T7043371.java rename to test/langtools/tools/javac/annotations/T7043371.java diff --git a/langtools/test/tools/javac/annotations/T7073477.java b/test/langtools/tools/javac/annotations/T7073477.java similarity index 100% rename from langtools/test/tools/javac/annotations/T7073477.java rename to test/langtools/tools/javac/annotations/T7073477.java diff --git a/langtools/test/tools/javac/annotations/T8154270/EraseClassInfoAnnotationValueTest.java b/test/langtools/tools/javac/annotations/T8154270/EraseClassInfoAnnotationValueTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/T8154270/EraseClassInfoAnnotationValueTest.java rename to test/langtools/tools/javac/annotations/T8154270/EraseClassInfoAnnotationValueTest.java diff --git a/langtools/test/tools/javac/annotations/T8154270/Other.java b/test/langtools/tools/javac/annotations/T8154270/Other.java similarity index 100% rename from langtools/test/tools/javac/annotations/T8154270/Other.java rename to test/langtools/tools/javac/annotations/T8154270/Other.java diff --git a/langtools/test/tools/javac/annotations/TestAnnotationPackageInfo.java b/test/langtools/tools/javac/annotations/TestAnnotationPackageInfo.java similarity index 100% rename from langtools/test/tools/javac/annotations/TestAnnotationPackageInfo.java rename to test/langtools/tools/javac/annotations/TestAnnotationPackageInfo.java diff --git a/langtools/test/tools/javac/annotations/clinit/AnnoWithClinit1.java b/test/langtools/tools/javac/annotations/clinit/AnnoWithClinit1.java similarity index 100% rename from langtools/test/tools/javac/annotations/clinit/AnnoWithClinit1.java rename to test/langtools/tools/javac/annotations/clinit/AnnoWithClinit1.java diff --git a/langtools/test/tools/javac/annotations/clinit/AnnoWithClinitFail.java b/test/langtools/tools/javac/annotations/clinit/AnnoWithClinitFail.java similarity index 100% rename from langtools/test/tools/javac/annotations/clinit/AnnoWithClinitFail.java rename to test/langtools/tools/javac/annotations/clinit/AnnoWithClinitFail.java diff --git a/langtools/test/tools/javac/annotations/clinit/AnnoWithClinitFail.out b/test/langtools/tools/javac/annotations/clinit/AnnoWithClinitFail.out similarity index 100% rename from langtools/test/tools/javac/annotations/clinit/AnnoWithClinitFail.out rename to test/langtools/tools/javac/annotations/clinit/AnnoWithClinitFail.out diff --git a/langtools/test/tools/javac/annotations/default/A.java b/test/langtools/tools/javac/annotations/default/A.java similarity index 100% rename from langtools/test/tools/javac/annotations/default/A.java rename to test/langtools/tools/javac/annotations/default/A.java diff --git a/langtools/test/tools/javac/annotations/default/B.java b/test/langtools/tools/javac/annotations/default/B.java similarity index 100% rename from langtools/test/tools/javac/annotations/default/B.java rename to test/langtools/tools/javac/annotations/default/B.java diff --git a/langtools/test/tools/javac/annotations/default/C.java b/test/langtools/tools/javac/annotations/default/C.java similarity index 100% rename from langtools/test/tools/javac/annotations/default/C.java rename to test/langtools/tools/javac/annotations/default/C.java diff --git a/langtools/test/tools/javac/annotations/default/Derr.java b/test/langtools/tools/javac/annotations/default/Derr.java similarity index 100% rename from langtools/test/tools/javac/annotations/default/Derr.java rename to test/langtools/tools/javac/annotations/default/Derr.java diff --git a/langtools/test/tools/javac/annotations/default/Derr.out b/test/langtools/tools/javac/annotations/default/Derr.out similarity index 100% rename from langtools/test/tools/javac/annotations/default/Derr.out rename to test/langtools/tools/javac/annotations/default/Derr.out diff --git a/langtools/test/tools/javac/annotations/default/Eerr.java b/test/langtools/tools/javac/annotations/default/Eerr.java similarity index 100% rename from langtools/test/tools/javac/annotations/default/Eerr.java rename to test/langtools/tools/javac/annotations/default/Eerr.java diff --git a/langtools/test/tools/javac/annotations/default/Eerr.out b/test/langtools/tools/javac/annotations/default/Eerr.out similarity index 100% rename from langtools/test/tools/javac/annotations/default/Eerr.out rename to test/langtools/tools/javac/annotations/default/Eerr.out diff --git a/langtools/test/tools/javac/annotations/neg/8022765/ErroneousAnnotations.java b/test/langtools/tools/javac/annotations/neg/8022765/ErroneousAnnotations.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/8022765/ErroneousAnnotations.java rename to test/langtools/tools/javac/annotations/neg/8022765/ErroneousAnnotations.java diff --git a/langtools/test/tools/javac/annotations/neg/8022765/ErroneousAnnotations.out b/test/langtools/tools/javac/annotations/neg/8022765/ErroneousAnnotations.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/8022765/ErroneousAnnotations.out rename to test/langtools/tools/javac/annotations/neg/8022765/ErroneousAnnotations.out diff --git a/langtools/test/tools/javac/annotations/neg/8022765/T8022765.java b/test/langtools/tools/javac/annotations/neg/8022765/T8022765.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/8022765/T8022765.java rename to test/langtools/tools/javac/annotations/neg/8022765/T8022765.java diff --git a/langtools/test/tools/javac/annotations/neg/8022765/T8022765.out b/test/langtools/tools/javac/annotations/neg/8022765/T8022765.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/8022765/T8022765.out rename to test/langtools/tools/javac/annotations/neg/8022765/T8022765.out diff --git a/langtools/test/tools/javac/annotations/neg/8022765/VerifyAnnotationsAttributed.java b/test/langtools/tools/javac/annotations/neg/8022765/VerifyAnnotationsAttributed.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/8022765/VerifyAnnotationsAttributed.java rename to test/langtools/tools/javac/annotations/neg/8022765/VerifyAnnotationsAttributed.java diff --git a/langtools/test/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java b/test/langtools/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java rename to test/langtools/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java diff --git a/langtools/test/tools/javac/annotations/neg/8171322/SimpleProcessor.java b/test/langtools/tools/javac/annotations/neg/8171322/SimpleProcessor.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/8171322/SimpleProcessor.java rename to test/langtools/tools/javac/annotations/neg/8171322/SimpleProcessor.java diff --git a/langtools/test/tools/javac/annotations/neg/8171322/TypeVariableAsAnnotationTest.java b/test/langtools/tools/javac/annotations/neg/8171322/TypeVariableAsAnnotationTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/8171322/TypeVariableAsAnnotationTest.java rename to test/langtools/tools/javac/annotations/neg/8171322/TypeVariableAsAnnotationTest.java diff --git a/langtools/test/tools/javac/annotations/neg/8171322/TypeVariableAsAnnotationTest.out b/test/langtools/tools/javac/annotations/neg/8171322/TypeVariableAsAnnotationTest.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/8171322/TypeVariableAsAnnotationTest.out rename to test/langtools/tools/javac/annotations/neg/8171322/TypeVariableAsAnnotationTest.out diff --git a/langtools/test/tools/javac/annotations/neg/AnnComma.java b/test/langtools/tools/javac/annotations/neg/AnnComma.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/AnnComma.java rename to test/langtools/tools/javac/annotations/neg/AnnComma.java diff --git a/langtools/test/tools/javac/annotations/neg/AnnComma.out b/test/langtools/tools/javac/annotations/neg/AnnComma.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/AnnComma.out rename to test/langtools/tools/javac/annotations/neg/AnnComma.out diff --git a/langtools/test/tools/javac/annotations/neg/AnonSubclass.java b/test/langtools/tools/javac/annotations/neg/AnonSubclass.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/AnonSubclass.java rename to test/langtools/tools/javac/annotations/neg/AnonSubclass.java diff --git a/langtools/test/tools/javac/annotations/neg/AnonSubclass.out b/test/langtools/tools/javac/annotations/neg/AnonSubclass.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/AnonSubclass.out rename to test/langtools/tools/javac/annotations/neg/AnonSubclass.out diff --git a/langtools/test/tools/javac/annotations/neg/ArrayLit.java b/test/langtools/tools/javac/annotations/neg/ArrayLit.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/ArrayLit.java rename to test/langtools/tools/javac/annotations/neg/ArrayLit.java diff --git a/langtools/test/tools/javac/annotations/neg/ArrayLit.out b/test/langtools/tools/javac/annotations/neg/ArrayLit.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/ArrayLit.out rename to test/langtools/tools/javac/annotations/neg/ArrayLit.out diff --git a/langtools/test/tools/javac/annotations/neg/Constant.java b/test/langtools/tools/javac/annotations/neg/Constant.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Constant.java rename to test/langtools/tools/javac/annotations/neg/Constant.java diff --git a/langtools/test/tools/javac/annotations/neg/Constant.out b/test/langtools/tools/javac/annotations/neg/Constant.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Constant.out rename to test/langtools/tools/javac/annotations/neg/Constant.out diff --git a/langtools/test/tools/javac/annotations/neg/Cycle1.java b/test/langtools/tools/javac/annotations/neg/Cycle1.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Cycle1.java rename to test/langtools/tools/javac/annotations/neg/Cycle1.java diff --git a/langtools/test/tools/javac/annotations/neg/Cycle1.out b/test/langtools/tools/javac/annotations/neg/Cycle1.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Cycle1.out rename to test/langtools/tools/javac/annotations/neg/Cycle1.out diff --git a/langtools/test/tools/javac/annotations/neg/Cycle2.java b/test/langtools/tools/javac/annotations/neg/Cycle2.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Cycle2.java rename to test/langtools/tools/javac/annotations/neg/Cycle2.java diff --git a/langtools/test/tools/javac/annotations/neg/Cycle2.out b/test/langtools/tools/javac/annotations/neg/Cycle2.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Cycle2.out rename to test/langtools/tools/javac/annotations/neg/Cycle2.out diff --git a/langtools/test/tools/javac/annotations/neg/Cycle3.java b/test/langtools/tools/javac/annotations/neg/Cycle3.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Cycle3.java rename to test/langtools/tools/javac/annotations/neg/Cycle3.java diff --git a/langtools/test/tools/javac/annotations/neg/Cycle3.out b/test/langtools/tools/javac/annotations/neg/Cycle3.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Cycle3.out rename to test/langtools/tools/javac/annotations/neg/Cycle3.out diff --git a/langtools/test/tools/javac/annotations/neg/Dep.java b/test/langtools/tools/javac/annotations/neg/Dep.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Dep.java rename to test/langtools/tools/javac/annotations/neg/Dep.java diff --git a/langtools/test/tools/javac/annotations/neg/Dep.out b/test/langtools/tools/javac/annotations/neg/Dep.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Dep.out rename to test/langtools/tools/javac/annotations/neg/Dep.out diff --git a/langtools/test/tools/javac/annotations/neg/DeprecatedAnnotationTest/DeprecatedAnnotationTest.out b/test/langtools/tools/javac/annotations/neg/DeprecatedAnnotationTest/DeprecatedAnnotationTest.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/DeprecatedAnnotationTest/DeprecatedAnnotationTest.out rename to test/langtools/tools/javac/annotations/neg/DeprecatedAnnotationTest/DeprecatedAnnotationTest.out diff --git a/langtools/test/tools/javac/annotations/neg/DeprecatedAnnotationTest/package-info.java b/test/langtools/tools/javac/annotations/neg/DeprecatedAnnotationTest/package-info.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/DeprecatedAnnotationTest/package-info.java rename to test/langtools/tools/javac/annotations/neg/DeprecatedAnnotationTest/package-info.java diff --git a/langtools/test/tools/javac/annotations/neg/Dup.java b/test/langtools/tools/javac/annotations/neg/Dup.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Dup.java rename to test/langtools/tools/javac/annotations/neg/Dup.java diff --git a/langtools/test/tools/javac/annotations/neg/Dup.out b/test/langtools/tools/javac/annotations/neg/Dup.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Dup.out rename to test/langtools/tools/javac/annotations/neg/Dup.out diff --git a/langtools/test/tools/javac/annotations/neg/DupTarget.java b/test/langtools/tools/javac/annotations/neg/DupTarget.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/DupTarget.java rename to test/langtools/tools/javac/annotations/neg/DupTarget.java diff --git a/langtools/test/tools/javac/annotations/neg/DupTarget.out b/test/langtools/tools/javac/annotations/neg/DupTarget.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/DupTarget.out rename to test/langtools/tools/javac/annotations/neg/DupTarget.out diff --git a/langtools/test/tools/javac/annotations/neg/InvalidPackageAnno.java b/test/langtools/tools/javac/annotations/neg/InvalidPackageAnno.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/InvalidPackageAnno.java rename to test/langtools/tools/javac/annotations/neg/InvalidPackageAnno.java diff --git a/langtools/test/tools/javac/annotations/neg/InvalidPackageAnno.out b/test/langtools/tools/javac/annotations/neg/InvalidPackageAnno.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/InvalidPackageAnno.out rename to test/langtools/tools/javac/annotations/neg/InvalidPackageAnno.out diff --git a/langtools/test/tools/javac/annotations/neg/MemberOver.java b/test/langtools/tools/javac/annotations/neg/MemberOver.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/MemberOver.java rename to test/langtools/tools/javac/annotations/neg/MemberOver.java diff --git a/langtools/test/tools/javac/annotations/neg/MemberOver.out b/test/langtools/tools/javac/annotations/neg/MemberOver.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/MemberOver.out rename to test/langtools/tools/javac/annotations/neg/MemberOver.out diff --git a/langtools/test/tools/javac/annotations/neg/NoAnnotationMethods.java b/test/langtools/tools/javac/annotations/neg/NoAnnotationMethods.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoAnnotationMethods.java rename to test/langtools/tools/javac/annotations/neg/NoAnnotationMethods.java diff --git a/langtools/test/tools/javac/annotations/neg/NoAnnotationMethods.out b/test/langtools/tools/javac/annotations/neg/NoAnnotationMethods.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoAnnotationMethods.out rename to test/langtools/tools/javac/annotations/neg/NoAnnotationMethods.out diff --git a/langtools/test/tools/javac/annotations/neg/NoClone.java b/test/langtools/tools/javac/annotations/neg/NoClone.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoClone.java rename to test/langtools/tools/javac/annotations/neg/NoClone.java diff --git a/langtools/test/tools/javac/annotations/neg/NoClone.out b/test/langtools/tools/javac/annotations/neg/NoClone.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoClone.out rename to test/langtools/tools/javac/annotations/neg/NoClone.out diff --git a/langtools/test/tools/javac/annotations/neg/NoDefault.java b/test/langtools/tools/javac/annotations/neg/NoDefault.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoDefault.java rename to test/langtools/tools/javac/annotations/neg/NoDefault.java diff --git a/langtools/test/tools/javac/annotations/neg/NoDefault.out b/test/langtools/tools/javac/annotations/neg/NoDefault.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoDefault.out rename to test/langtools/tools/javac/annotations/neg/NoDefault.out diff --git a/langtools/test/tools/javac/annotations/neg/NoDefaultAbstract.java b/test/langtools/tools/javac/annotations/neg/NoDefaultAbstract.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoDefaultAbstract.java rename to test/langtools/tools/javac/annotations/neg/NoDefaultAbstract.java diff --git a/langtools/test/tools/javac/annotations/neg/NoDefaultAbstract.out b/test/langtools/tools/javac/annotations/neg/NoDefaultAbstract.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoDefaultAbstract.out rename to test/langtools/tools/javac/annotations/neg/NoDefaultAbstract.out diff --git a/langtools/test/tools/javac/annotations/neg/NoObjectMethods.java b/test/langtools/tools/javac/annotations/neg/NoObjectMethods.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoObjectMethods.java rename to test/langtools/tools/javac/annotations/neg/NoObjectMethods.java diff --git a/langtools/test/tools/javac/annotations/neg/NoObjectMethods.out b/test/langtools/tools/javac/annotations/neg/NoObjectMethods.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoObjectMethods.out rename to test/langtools/tools/javac/annotations/neg/NoObjectMethods.out diff --git a/langtools/test/tools/javac/annotations/neg/NoStatic.java b/test/langtools/tools/javac/annotations/neg/NoStatic.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoStatic.java rename to test/langtools/tools/javac/annotations/neg/NoStatic.java diff --git a/langtools/test/tools/javac/annotations/neg/NoStatic.out b/test/langtools/tools/javac/annotations/neg/NoStatic.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoStatic.out rename to test/langtools/tools/javac/annotations/neg/NoStatic.out diff --git a/langtools/test/tools/javac/annotations/neg/NoStaticAbstract.java b/test/langtools/tools/javac/annotations/neg/NoStaticAbstract.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoStaticAbstract.java rename to test/langtools/tools/javac/annotations/neg/NoStaticAbstract.java diff --git a/langtools/test/tools/javac/annotations/neg/NoStaticAbstract.out b/test/langtools/tools/javac/annotations/neg/NoStaticAbstract.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/NoStaticAbstract.out rename to test/langtools/tools/javac/annotations/neg/NoStaticAbstract.out diff --git a/langtools/test/tools/javac/annotations/neg/ObjectMembers.java b/test/langtools/tools/javac/annotations/neg/ObjectMembers.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/ObjectMembers.java rename to test/langtools/tools/javac/annotations/neg/ObjectMembers.java diff --git a/langtools/test/tools/javac/annotations/neg/ObjectMembers.out b/test/langtools/tools/javac/annotations/neg/ObjectMembers.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/ObjectMembers.out rename to test/langtools/tools/javac/annotations/neg/ObjectMembers.out diff --git a/langtools/test/tools/javac/annotations/neg/OverrideNo.java b/test/langtools/tools/javac/annotations/neg/OverrideNo.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/OverrideNo.java rename to test/langtools/tools/javac/annotations/neg/OverrideNo.java diff --git a/langtools/test/tools/javac/annotations/neg/OverrideNo.out b/test/langtools/tools/javac/annotations/neg/OverrideNo.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/OverrideNo.out rename to test/langtools/tools/javac/annotations/neg/OverrideNo.out diff --git a/langtools/test/tools/javac/annotations/neg/Package.java b/test/langtools/tools/javac/annotations/neg/Package.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Package.java rename to test/langtools/tools/javac/annotations/neg/Package.java diff --git a/langtools/test/tools/javac/annotations/neg/Package.out b/test/langtools/tools/javac/annotations/neg/Package.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Package.out rename to test/langtools/tools/javac/annotations/neg/Package.out diff --git a/langtools/test/tools/javac/annotations/neg/Recovery.java b/test/langtools/tools/javac/annotations/neg/Recovery.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Recovery.java rename to test/langtools/tools/javac/annotations/neg/Recovery.java diff --git a/langtools/test/tools/javac/annotations/neg/Recovery.out b/test/langtools/tools/javac/annotations/neg/Recovery.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Recovery.out rename to test/langtools/tools/javac/annotations/neg/Recovery.out diff --git a/langtools/test/tools/javac/annotations/neg/Recovery1.java b/test/langtools/tools/javac/annotations/neg/Recovery1.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Recovery1.java rename to test/langtools/tools/javac/annotations/neg/Recovery1.java diff --git a/langtools/test/tools/javac/annotations/neg/Recovery1.out b/test/langtools/tools/javac/annotations/neg/Recovery1.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Recovery1.out rename to test/langtools/tools/javac/annotations/neg/Recovery1.out diff --git a/langtools/test/tools/javac/annotations/neg/Scope.java b/test/langtools/tools/javac/annotations/neg/Scope.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Scope.java rename to test/langtools/tools/javac/annotations/neg/Scope.java diff --git a/langtools/test/tools/javac/annotations/neg/Scope.out b/test/langtools/tools/javac/annotations/neg/Scope.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Scope.out rename to test/langtools/tools/javac/annotations/neg/Scope.out diff --git a/langtools/test/tools/javac/annotations/neg/Syntax1.java b/test/langtools/tools/javac/annotations/neg/Syntax1.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Syntax1.java rename to test/langtools/tools/javac/annotations/neg/Syntax1.java diff --git a/langtools/test/tools/javac/annotations/neg/Syntax1.out b/test/langtools/tools/javac/annotations/neg/Syntax1.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Syntax1.out rename to test/langtools/tools/javac/annotations/neg/Syntax1.out diff --git a/langtools/test/tools/javac/annotations/neg/WrongTarget.java b/test/langtools/tools/javac/annotations/neg/WrongTarget.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/WrongTarget.java rename to test/langtools/tools/javac/annotations/neg/WrongTarget.java diff --git a/langtools/test/tools/javac/annotations/neg/WrongTarget.out b/test/langtools/tools/javac/annotations/neg/WrongTarget.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/WrongTarget.out rename to test/langtools/tools/javac/annotations/neg/WrongTarget.out diff --git a/langtools/test/tools/javac/annotations/neg/WrongTarget2.java b/test/langtools/tools/javac/annotations/neg/WrongTarget2.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/WrongTarget2.java rename to test/langtools/tools/javac/annotations/neg/WrongTarget2.java diff --git a/langtools/test/tools/javac/annotations/neg/WrongTarget2.out b/test/langtools/tools/javac/annotations/neg/WrongTarget2.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/WrongTarget2.out rename to test/langtools/tools/javac/annotations/neg/WrongTarget2.out diff --git a/langtools/test/tools/javac/annotations/neg/WrongValue.java b/test/langtools/tools/javac/annotations/neg/WrongValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/WrongValue.java rename to test/langtools/tools/javac/annotations/neg/WrongValue.java diff --git a/langtools/test/tools/javac/annotations/neg/WrongValue.out b/test/langtools/tools/javac/annotations/neg/WrongValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/WrongValue.out rename to test/langtools/tools/javac/annotations/neg/WrongValue.out diff --git a/langtools/test/tools/javac/annotations/neg/Z1.java b/test/langtools/tools/javac/annotations/neg/Z1.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z1.java rename to test/langtools/tools/javac/annotations/neg/Z1.java diff --git a/langtools/test/tools/javac/annotations/neg/Z1.out b/test/langtools/tools/javac/annotations/neg/Z1.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z1.out rename to test/langtools/tools/javac/annotations/neg/Z1.out diff --git a/langtools/test/tools/javac/annotations/neg/Z10.java b/test/langtools/tools/javac/annotations/neg/Z10.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z10.java rename to test/langtools/tools/javac/annotations/neg/Z10.java diff --git a/langtools/test/tools/javac/annotations/neg/Z10.out b/test/langtools/tools/javac/annotations/neg/Z10.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z10.out rename to test/langtools/tools/javac/annotations/neg/Z10.out diff --git a/langtools/test/tools/javac/annotations/neg/Z11.java b/test/langtools/tools/javac/annotations/neg/Z11.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z11.java rename to test/langtools/tools/javac/annotations/neg/Z11.java diff --git a/langtools/test/tools/javac/annotations/neg/Z11.out b/test/langtools/tools/javac/annotations/neg/Z11.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z11.out rename to test/langtools/tools/javac/annotations/neg/Z11.out diff --git a/langtools/test/tools/javac/annotations/neg/Z12.java b/test/langtools/tools/javac/annotations/neg/Z12.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z12.java rename to test/langtools/tools/javac/annotations/neg/Z12.java diff --git a/langtools/test/tools/javac/annotations/neg/Z12.out b/test/langtools/tools/javac/annotations/neg/Z12.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z12.out rename to test/langtools/tools/javac/annotations/neg/Z12.out diff --git a/langtools/test/tools/javac/annotations/neg/Z13.java b/test/langtools/tools/javac/annotations/neg/Z13.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z13.java rename to test/langtools/tools/javac/annotations/neg/Z13.java diff --git a/langtools/test/tools/javac/annotations/neg/Z13.out b/test/langtools/tools/javac/annotations/neg/Z13.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z13.out rename to test/langtools/tools/javac/annotations/neg/Z13.out diff --git a/langtools/test/tools/javac/annotations/neg/Z14.java b/test/langtools/tools/javac/annotations/neg/Z14.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z14.java rename to test/langtools/tools/javac/annotations/neg/Z14.java diff --git a/langtools/test/tools/javac/annotations/neg/Z14.out b/test/langtools/tools/javac/annotations/neg/Z14.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z14.out rename to test/langtools/tools/javac/annotations/neg/Z14.out diff --git a/langtools/test/tools/javac/annotations/neg/Z15.java b/test/langtools/tools/javac/annotations/neg/Z15.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z15.java rename to test/langtools/tools/javac/annotations/neg/Z15.java diff --git a/langtools/test/tools/javac/annotations/neg/Z15.out b/test/langtools/tools/javac/annotations/neg/Z15.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z15.out rename to test/langtools/tools/javac/annotations/neg/Z15.out diff --git a/langtools/test/tools/javac/annotations/neg/Z16.java b/test/langtools/tools/javac/annotations/neg/Z16.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z16.java rename to test/langtools/tools/javac/annotations/neg/Z16.java diff --git a/langtools/test/tools/javac/annotations/neg/Z16.out b/test/langtools/tools/javac/annotations/neg/Z16.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z16.out rename to test/langtools/tools/javac/annotations/neg/Z16.out diff --git a/langtools/test/tools/javac/annotations/neg/Z2.java b/test/langtools/tools/javac/annotations/neg/Z2.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z2.java rename to test/langtools/tools/javac/annotations/neg/Z2.java diff --git a/langtools/test/tools/javac/annotations/neg/Z2.out b/test/langtools/tools/javac/annotations/neg/Z2.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z2.out rename to test/langtools/tools/javac/annotations/neg/Z2.out diff --git a/langtools/test/tools/javac/annotations/neg/Z3.java b/test/langtools/tools/javac/annotations/neg/Z3.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z3.java rename to test/langtools/tools/javac/annotations/neg/Z3.java diff --git a/langtools/test/tools/javac/annotations/neg/Z3.out b/test/langtools/tools/javac/annotations/neg/Z3.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z3.out rename to test/langtools/tools/javac/annotations/neg/Z3.out diff --git a/langtools/test/tools/javac/annotations/neg/Z4.java b/test/langtools/tools/javac/annotations/neg/Z4.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z4.java rename to test/langtools/tools/javac/annotations/neg/Z4.java diff --git a/langtools/test/tools/javac/annotations/neg/Z4.out b/test/langtools/tools/javac/annotations/neg/Z4.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z4.out rename to test/langtools/tools/javac/annotations/neg/Z4.out diff --git a/langtools/test/tools/javac/annotations/neg/Z5.java b/test/langtools/tools/javac/annotations/neg/Z5.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z5.java rename to test/langtools/tools/javac/annotations/neg/Z5.java diff --git a/langtools/test/tools/javac/annotations/neg/Z5.out b/test/langtools/tools/javac/annotations/neg/Z5.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z5.out rename to test/langtools/tools/javac/annotations/neg/Z5.out diff --git a/langtools/test/tools/javac/annotations/neg/Z8.java b/test/langtools/tools/javac/annotations/neg/Z8.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z8.java rename to test/langtools/tools/javac/annotations/neg/Z8.java diff --git a/langtools/test/tools/javac/annotations/neg/Z8.out b/test/langtools/tools/javac/annotations/neg/Z8.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z8.out rename to test/langtools/tools/javac/annotations/neg/Z8.out diff --git a/langtools/test/tools/javac/annotations/neg/Z9.java b/test/langtools/tools/javac/annotations/neg/Z9.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z9.java rename to test/langtools/tools/javac/annotations/neg/Z9.java diff --git a/langtools/test/tools/javac/annotations/neg/Z9.out b/test/langtools/tools/javac/annotations/neg/Z9.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/Z9.out rename to test/langtools/tools/javac/annotations/neg/Z9.out diff --git a/langtools/test/tools/javac/annotations/neg/bar/package-info.java b/test/langtools/tools/javac/annotations/neg/bar/package-info.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/bar/package-info.java rename to test/langtools/tools/javac/annotations/neg/bar/package-info.java diff --git a/langtools/test/tools/javac/annotations/neg/pkg/AnonSubclassOnPkg.java b/test/langtools/tools/javac/annotations/neg/pkg/AnonSubclassOnPkg.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/pkg/AnonSubclassOnPkg.java rename to test/langtools/tools/javac/annotations/neg/pkg/AnonSubclassOnPkg.java diff --git a/langtools/test/tools/javac/annotations/neg/pkg/package-info.java b/test/langtools/tools/javac/annotations/neg/pkg/package-info.java similarity index 100% rename from langtools/test/tools/javac/annotations/neg/pkg/package-info.java rename to test/langtools/tools/javac/annotations/neg/pkg/package-info.java diff --git a/langtools/test/tools/javac/annotations/neg/pkg/package-info.out b/test/langtools/tools/javac/annotations/neg/pkg/package-info.out similarity index 100% rename from langtools/test/tools/javac/annotations/neg/pkg/package-info.out rename to test/langtools/tools/javac/annotations/neg/pkg/package-info.out diff --git a/langtools/test/tools/javac/annotations/pos/AnnotationMethods.java b/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/AnnotationMethods.java rename to test/langtools/tools/javac/annotations/pos/AnnotationMethods.java diff --git a/langtools/test/tools/javac/annotations/pos/AnnoteElideBraces.java b/test/langtools/tools/javac/annotations/pos/AnnoteElideBraces.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/AnnoteElideBraces.java rename to test/langtools/tools/javac/annotations/pos/AnnoteElideBraces.java diff --git a/langtools/test/tools/javac/annotations/pos/ClassA.java b/test/langtools/tools/javac/annotations/pos/ClassA.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/ClassA.java rename to test/langtools/tools/javac/annotations/pos/ClassA.java diff --git a/langtools/test/tools/javac/annotations/pos/ClassB.java b/test/langtools/tools/javac/annotations/pos/ClassB.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/ClassB.java rename to test/langtools/tools/javac/annotations/pos/ClassB.java diff --git a/langtools/test/tools/javac/annotations/pos/Dep.java b/test/langtools/tools/javac/annotations/pos/Dep.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/Dep.java rename to test/langtools/tools/javac/annotations/pos/Dep.java diff --git a/langtools/test/tools/javac/annotations/pos/Enum1.java b/test/langtools/tools/javac/annotations/pos/Enum1.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/Enum1.java rename to test/langtools/tools/javac/annotations/pos/Enum1.java diff --git a/langtools/test/tools/javac/annotations/pos/Local.java b/test/langtools/tools/javac/annotations/pos/Local.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/Local.java rename to test/langtools/tools/javac/annotations/pos/Local.java diff --git a/langtools/test/tools/javac/annotations/pos/Members.java b/test/langtools/tools/javac/annotations/pos/Members.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/Members.java rename to test/langtools/tools/javac/annotations/pos/Members.java diff --git a/langtools/test/tools/javac/annotations/pos/NType.java b/test/langtools/tools/javac/annotations/pos/NType.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/NType.java rename to test/langtools/tools/javac/annotations/pos/NType.java diff --git a/langtools/test/tools/javac/annotations/pos/OverrideCheck.java b/test/langtools/tools/javac/annotations/pos/OverrideCheck.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/OverrideCheck.java rename to test/langtools/tools/javac/annotations/pos/OverrideCheck.java diff --git a/langtools/test/tools/javac/annotations/pos/OverrideOK.java b/test/langtools/tools/javac/annotations/pos/OverrideOK.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/OverrideOK.java rename to test/langtools/tools/javac/annotations/pos/OverrideOK.java diff --git a/langtools/test/tools/javac/annotations/pos/Parameter.java b/test/langtools/tools/javac/annotations/pos/Parameter.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/Parameter.java rename to test/langtools/tools/javac/annotations/pos/Parameter.java diff --git a/langtools/test/tools/javac/annotations/pos/Primitives.java b/test/langtools/tools/javac/annotations/pos/Primitives.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/Primitives.java rename to test/langtools/tools/javac/annotations/pos/Primitives.java diff --git a/langtools/test/tools/javac/annotations/pos/RightTarget.java b/test/langtools/tools/javac/annotations/pos/RightTarget.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/RightTarget.java rename to test/langtools/tools/javac/annotations/pos/RightTarget.java diff --git a/langtools/test/tools/javac/annotations/pos/TrailingComma.java b/test/langtools/tools/javac/annotations/pos/TrailingComma.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/TrailingComma.java rename to test/langtools/tools/javac/annotations/pos/TrailingComma.java diff --git a/langtools/test/tools/javac/annotations/pos/Z1.java b/test/langtools/tools/javac/annotations/pos/Z1.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/Z1.java rename to test/langtools/tools/javac/annotations/pos/Z1.java diff --git a/langtools/test/tools/javac/annotations/pos/Z2.java b/test/langtools/tools/javac/annotations/pos/Z2.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/Z2.java rename to test/langtools/tools/javac/annotations/pos/Z2.java diff --git a/langtools/test/tools/javac/annotations/pos/Z3.java b/test/langtools/tools/javac/annotations/pos/Z3.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/Z3.java rename to test/langtools/tools/javac/annotations/pos/Z3.java diff --git a/langtools/test/tools/javac/annotations/pos/Z4.java b/test/langtools/tools/javac/annotations/pos/Z4.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/Z4.java rename to test/langtools/tools/javac/annotations/pos/Z4.java diff --git a/langtools/test/tools/javac/annotations/pos/package-info.java b/test/langtools/tools/javac/annotations/pos/package-info.java similarity index 100% rename from langtools/test/tools/javac/annotations/pos/package-info.java rename to test/langtools/tools/javac/annotations/pos/package-info.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/8029017/TypeUseTarget.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/8029017/TypeUseTarget.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/8029017/TypeUseTarget.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/8029017/TypeUseTarget.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/8029017/TypeUseTargetNeg.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/8029017/TypeUseTargetNeg.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/8029017/TypeUseTargetNeg.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/8029017/TypeUseTargetNeg.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/8029017/TypeUseTargetNeg.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/8029017/TypeUseTargetNeg.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/8029017/TypeUseTargetNeg.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/8029017/TypeUseTargetNeg.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/BasicRepeatingAnnotations.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/BasicRepeatingAnnotations.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/BasicRepeatingAnnotations.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/BasicRepeatingAnnotations.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/CheckTargets.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/CheckTargets.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/CheckTargets.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/CheckTargets.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/ClassReaderDefault.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/ClassReaderDefault.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/ClassReaderDefault.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/ClassReaderDefault.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/ContainerHasRepeatedContained.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/ContainerHasRepeatedContained.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/ContainerHasRepeatedContained.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/ContainerHasRepeatedContained.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultCasePresent.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultCasePresent.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultCasePresent.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultCasePresent.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultTarget.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTarget.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultTarget.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTarget.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DelayRepeatedContainer.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/DelayRepeatedContainer.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/DelayRepeatedContainer.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/DelayRepeatedContainer.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidClsTypeParamTarget.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidClsTypeParamTarget.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidClsTypeParamTarget.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidClsTypeParamTarget.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidClsTypeParamTarget.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidClsTypeParamTarget.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidClsTypeParamTarget.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidClsTypeParamTarget.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeParamTarget.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeParamTarget.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeParamTarget.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeParamTarget.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeParamTarget.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeParamTarget.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeParamTarget.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeParamTarget.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeUse.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeUse.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeUse.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeUse.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeUse.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeUse.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeUse.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidMethodTypeUse.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidRepAnnoOnCast.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidRepAnnoOnCast.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidRepAnnoOnCast.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidRepAnnoOnCast.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidRepAnnoOnCast.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidRepAnnoOnCast.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidRepAnnoOnCast.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidRepAnnoOnCast.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidTarget.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidTarget.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidTarget.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/InvalidTarget.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/MissingContainer.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/MissingContainer.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/MissingContainer.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/MissingContainer.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MultiLevelRepeatableAnno.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/MultiLevelRepeatableAnno.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/MultiLevelRepeatableAnno.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/MultiLevelRepeatableAnno.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/MultipleAnnoMixedOrder.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/MultipleAnnoMixedOrder.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/MultipleAnnoMixedOrder.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/MultipleAnnoMixedOrder.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/NestedContainers.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/NestedContainers.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/NestedContainers.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/NestedContainers.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/NoTargetOnContainer.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/NoTargetOnContainer.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/NoTargetOnContainer.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/NoTargetOnContainer.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/NoTargetOnContainer2.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/NoTargetOnContainer2.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/NoTargetOnContainer2.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/NoTargetOnContainer2.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepMemberAnno.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/RepMemberAnno.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/RepMemberAnno.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/RepMemberAnno.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepSelfMemberAnno.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/RepSelfMemberAnno.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/RepSelfMemberAnno.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/RepSelfMemberAnno.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/SelfRepeatingAnnotations.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/SelfRepeatingAnnotations.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/SelfRepeatingAnnotations.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/SelfRepeatingAnnotations.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/SeparateCompile.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/SeparateCompile.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/SeparateCompile.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/SeparateCompile.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/SingleRepeatingAndContainer.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/SingleRepeatingAndContainer.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/SingleRepeatingAndContainer.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/SingleRepeatingAndContainer.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongVersion.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/WrongVersion.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongVersion6.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion6.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/WrongVersion6.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion6.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongVersion7.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion7.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/WrongVersion7.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion7.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/BrokenTypeAnnoContainer.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/BrokenTypeAnnoContainer.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/BrokenTypeAnnoContainer.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/BrokenTypeAnnoContainer.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/BrokenTypeAnnoContainer.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/BrokenTypeAnnoContainer.out similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/BrokenTypeAnnoContainer.out rename to test/langtools/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/BrokenTypeAnnoContainer.out diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/T.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/T.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/T.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/T.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/TC.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/TC.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/TC.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/TC.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/TCBroken.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/TCBroken.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/TCBroken.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/brokenTypeAnnoContainer/TCBroken.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/BasicSyntaxCombo.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/combo/BasicSyntaxCombo.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/combo/BasicSyntaxCombo.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/combo/BasicSyntaxCombo.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DeprecatedAnnoCombo.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/combo/DeprecatedAnnoCombo.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DeprecatedAnnoCombo.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/combo/DeprecatedAnnoCombo.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DocumentedAnnoCombo.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/combo/DocumentedAnnoCombo.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DocumentedAnnoCombo.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/combo/DocumentedAnnoCombo.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/Helper.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/combo/Helper.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/combo/Helper.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/combo/Helper.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/InheritedAnnoCombo.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/combo/InheritedAnnoCombo.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/combo/InheritedAnnoCombo.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/combo/InheritedAnnoCombo.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/ReflectionTest.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/combo/ReflectionTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/combo/ReflectionTest.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/combo/ReflectionTest.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/RetentionAnnoCombo.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/combo/RetentionAnnoCombo.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/combo/RetentionAnnoCombo.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/combo/RetentionAnnoCombo.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/TargetAnnoCombo.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/combo/TargetAnnoCombo.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/combo/TargetAnnoCombo.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/combo/TargetAnnoCombo.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedBase.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedBase.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedBase.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedBase.java diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedContainer.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedContainer.java similarity index 100% rename from langtools/test/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedContainer.java rename to test/langtools/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedContainer.java diff --git a/langtools/test/tools/javac/annotations/testCrashNestedAnnos/TestCrashNestedAnnos.java b/test/langtools/tools/javac/annotations/testCrashNestedAnnos/TestCrashNestedAnnos.java similarity index 100% rename from langtools/test/tools/javac/annotations/testCrashNestedAnnos/TestCrashNestedAnnos.java rename to test/langtools/tools/javac/annotations/testCrashNestedAnnos/TestCrashNestedAnnos.java diff --git a/langtools/test/tools/javac/annotations/testCrashNestedAnnos/TestCrashNestedAnnos.out b/test/langtools/tools/javac/annotations/testCrashNestedAnnos/TestCrashNestedAnnos.out similarity index 100% rename from langtools/test/tools/javac/annotations/testCrashNestedAnnos/TestCrashNestedAnnos.out rename to test/langtools/tools/javac/annotations/testCrashNestedAnnos/TestCrashNestedAnnos.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/6967002/T6967002.java b/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/6967002/T6967002.java rename to test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/6967002/T6967002.out b/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/6967002/T6967002.out rename to test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/8013180/QualifiedName.java b/test/langtools/tools/javac/annotations/typeAnnotations/8013180/QualifiedName.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/8013180/QualifiedName.java rename to test/langtools/tools/javac/annotations/typeAnnotations/8013180/QualifiedName.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/8047024/T8047024.java b/test/langtools/tools/javac/annotations/typeAnnotations/8047024/T8047024.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/8047024/T8047024.java rename to test/langtools/tools/javac/annotations/typeAnnotations/8047024/T8047024.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/8047024/T8047024_01.java b/test/langtools/tools/javac/annotations/typeAnnotations/8047024/T8047024_01.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/8047024/T8047024_01.java rename to test/langtools/tools/javac/annotations/typeAnnotations/8047024/T8047024_01.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.java b/test/langtools/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.java rename to test/langtools/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.out b/test/langtools/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.out rename to test/langtools/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/ErasureTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/ErasureTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/ErasureTest.java rename to test/langtools/tools/javac/annotations/typeAnnotations/ErasureTest.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/InnerClass.java b/test/langtools/tools/javac/annotations/typeAnnotations/InnerClass.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/InnerClass.java rename to test/langtools/tools/javac/annotations/typeAnnotations/InnerClass.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/MultipleTargets.java b/test/langtools/tools/javac/annotations/typeAnnotations/MultipleTargets.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/MultipleTargets.java rename to test/langtools/tools/javac/annotations/typeAnnotations/MultipleTargets.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/RichFormatterWithAnnotationsTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/RichFormatterWithAnnotationsTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/RichFormatterWithAnnotationsTest.java rename to test/langtools/tools/javac/annotations/typeAnnotations/RichFormatterWithAnnotationsTest.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/TargetTypes.java b/test/langtools/tools/javac/annotations/typeAnnotations/TargetTypes.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/TargetTypes.java rename to test/langtools/tools/javac/annotations/typeAnnotations/TargetTypes.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/TestAnonInnerInstance1.java b/test/langtools/tools/javac/annotations/typeAnnotations/TestAnonInnerInstance1.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/TestAnonInnerInstance1.java rename to test/langtools/tools/javac/annotations/typeAnnotations/TestAnonInnerInstance1.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/TypeParameterTarget.java b/test/langtools/tools/javac/annotations/typeAnnotations/TypeParameterTarget.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/TypeParameterTarget.java rename to test/langtools/tools/javac/annotations/typeAnnotations/TypeParameterTarget.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/TypeProcOnly.java b/test/langtools/tools/javac/annotations/typeAnnotations/TypeProcOnly.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/TypeProcOnly.java rename to test/langtools/tools/javac/annotations/typeAnnotations/TypeProcOnly.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/TypeUseTarget.java b/test/langtools/tools/javac/annotations/typeAnnotations/TypeUseTarget.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/TypeUseTarget.java rename to test/langtools/tools/javac/annotations/typeAnnotations/TypeUseTarget.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java b/test/langtools/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java rename to test/langtools/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java b/test/langtools/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java rename to test/langtools/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java b/test/langtools/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java rename to test/langtools/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/attribution/Scopes.java b/test/langtools/tools/javac/annotations/typeAnnotations/attribution/Scopes.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/attribution/Scopes.java rename to test/langtools/tools/javac/annotations/typeAnnotations/attribution/Scopes.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/AnonymousExtendsTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnonymousExtendsTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/AnonymousExtendsTest.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnonymousExtendsTest.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/DeadCode.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/DeadCode.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/DeadCode.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/DeadCode.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/InstanceInitializer.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/InstanceInitializer.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/InstanceInitializer.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/InstanceInitializer.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NestedLambdasCastedTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NestedLambdasCastedTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/NestedLambdasCastedTest.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/NestedLambdasCastedTest.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/Scopes.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/Scopes.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/Scopes.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/Scopes.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/StaticInitializer.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/StaticInitializer.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/StaticInitializer.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/StaticInitializer.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/SyntheticParameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/SyntheticParameters.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/SyntheticParameters.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/SyntheticParameters.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8008762.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8008762.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8008762.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8008762.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8008769.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8008769.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8008769.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8008769.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8010015.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8010015.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8010015.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8010015.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TypeAnnotationPropagationTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TypeAnnotationPropagationTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/TypeAnnotationPropagationTest.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/TypeAnnotationPropagationTest.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/testanoninner.template b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/testanoninner.template similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/classfile/testanoninner.template rename to test/langtools/tools/javac/annotations/typeAnnotations/classfile/testanoninner.template diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest2.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest2.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest2.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest2.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest2.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest2.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest2.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest2.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest3.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest3.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest3.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest3.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest3.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest3.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest3.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest3.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/BadCast.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/BadCast.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/BadCast.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/BadCast.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/BadCast.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/BadCast.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/BadCast.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/BadCast.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/CheckErrorsForSource7.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CheckErrorsForSource7.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/CheckErrorsForSource7.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/CheckErrorsForSource7.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/CheckForDeclAnnoNPE.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CheckForDeclAnnoNPE.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/CheckForDeclAnnoNPE.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/CheckForDeclAnnoNPE.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/DummyProcessor.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/DummyProcessor.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/DummyProcessor.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/DummyProcessor.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/IndexArray.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/IndexArray.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/IndexArray.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/IndexArray.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/IndexArray.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/IndexArray.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/IndexArray.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/IndexArray.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/LazyConstantValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/LazyConstantValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/LazyConstantValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/LazyConstantValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/LazyConstantValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/LazyConstantValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/LazyConstantValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/LazyConstantValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/LintCast.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/LintCast.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/LintCast.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/LintCast.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/LintCast.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/LintCast.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/LintCast.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/LintCast.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/OldArray.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/OldArray.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/OldArray.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/OldArray.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/OldArray.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/OldArray.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/OldArray.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/OldArray.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/Scopes.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/Scopes.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/Scopes.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/Scopes.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/Scopes.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/Scopes.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/Scopes.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/Scopes.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/StaticFields.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/StaticFields.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/StaticFields.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/StaticFields.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/StaticFields.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/StaticFields.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/T8008751.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/T8008751.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/T8008751.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/T8008751.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/T8009360.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/T8009360.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/T8009360.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/T8009360.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/T8011722.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/T8011722.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/T8011722.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/T8011722.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/T8020715.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/T8020715.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/T8020715.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/T8020715.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeAndField.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeAndField.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeAndField.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeAndField.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeOnAnonClass.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeOnAnonClass.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeOnAnonClass.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeOnAnonClass.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeOnAnonClass.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeOnAnonClass.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeOnAnonClass.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeOnAnonClass.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariable.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariable.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariable.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariable.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableCycleTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableCycleTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableCycleTest.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableCycleTest.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/InvalidLocation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/InvalidLocation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/InvalidLocation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/InvalidLocation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/InvalidLocation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/InvalidLocation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/InvalidLocation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/InvalidLocation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/InvalidLocation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/InvalidLocation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/InvalidLocation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/InvalidLocation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/InvalidLocation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/InvalidLocation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/InvalidLocation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/InvalidLocation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/BrokenAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/BrokenAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/BrokenAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/BrokenAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/BrokenAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/BrokenAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/BrokenAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/BrokenAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/InvalidLocation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/InvalidLocation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/InvalidLocation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/InvalidLocation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/InvalidLocation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/InvalidLocation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/InvalidLocation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/InvalidLocation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DeclarationAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/DeclarationAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DeclarationAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/DeclarationAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DeclarationAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/DeclarationAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DeclarationAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/DeclarationAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/InvalidLocation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/InvalidLocation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/InvalidLocation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/InvalidLocation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/InvalidLocation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/InvalidLocation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/InvalidLocation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/InvalidLocation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/Nesting.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/Nesting.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/Nesting.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/Nesting.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/InvalidLocation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/InvalidLocation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/InvalidLocation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/InvalidLocation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/InvalidLocation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/InvalidLocation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/InvalidLocation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/InvalidLocation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/MissingAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/MissingAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/MissingAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/MissingAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/MissingAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/MissingAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/MissingAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/rest/MissingAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/InvalidLocation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/InvalidLocation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/InvalidLocation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/InvalidLocation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/InvalidLocation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/InvalidLocation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/InvalidLocation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/InvalidLocation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/InvalidLocation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/InvalidLocation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/InvalidLocation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/InvalidLocation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/InvalidLocation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/InvalidLocation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/InvalidLocation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/InvalidLocation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DeclarationAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DeclarationAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DeclarationAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DeclarationAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DeclarationAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DeclarationAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DeclarationAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DeclarationAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/InvalidLocation.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/InvalidLocation.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/InvalidLocation.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/InvalidLocation.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/InvalidLocation.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/InvalidLocation.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/InvalidLocation.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/InvalidLocation.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/Constructor.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/Constructor.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/target/Constructor.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/target/Constructor.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/Constructor.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/Constructor.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/target/Constructor.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/target/Constructor.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/DotClass.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/target/DotClass.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/IncompleteArray.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/IncompleteArray.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/target/IncompleteArray.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/target/IncompleteArray.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/IncompleteArray.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/IncompleteArray.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/target/IncompleteArray.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/target/IncompleteArray.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeParameter.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/NotTypeParameter.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeParameter.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/target/NotTypeParameter.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeParameter.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/NotTypeParameter.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeParameter.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/target/NotTypeParameter.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeUse.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/NotTypeUse.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeUse.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/target/NotTypeUse.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeUse.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/NotTypeUse.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeUse.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/target/NotTypeUse.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/VoidMethod.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VoidMethod.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/target/VoidMethod.java rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VoidMethod.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/VoidMethod.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VoidMethod.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/failures/target/VoidMethod.out rename to test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VoidMethod.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AllLocations.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/AllLocations.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AllLocations.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/AllLocations.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AnonymousClass.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/AnonymousClass.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AnonymousClass.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/AnonymousClass.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/BasicTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/BasicTest.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/BasicTest.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/BasicTest.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ClassExtends.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/ClassExtends.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ClassExtends.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/ClassExtends.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ClassParameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/ClassParameters.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ClassParameters.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/ClassParameters.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ConstructorTypeArgs.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/ConstructorTypeArgs.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ConstructorTypeArgs.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/ConstructorTypeArgs.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ExceptionParameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/ExceptionParameters.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ExceptionParameters.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/ExceptionParameters.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Expressions.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Expressions.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Expressions.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Expressions.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Fields.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Fields.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Fields.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Fields.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Lambda.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Lambda.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Lambda.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Lambda.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/LocalVariables.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/LocalVariables.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/LocalVariables.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/LocalVariables.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MethodReturnType.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/MethodReturnType.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MethodReturnType.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/MethodReturnType.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MethodTypeArgs.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/MethodTypeArgs.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MethodTypeArgs.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/MethodTypeArgs.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MethodTypeParameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/MethodTypeParameters.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MethodTypeParameters.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/MethodTypeParameters.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MultiCatch.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/MultiCatch.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MultiCatch.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/MultiCatch.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/NestedTypes.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/NestedTypes.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/NestedTypes.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/NestedTypes.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Parameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Parameters.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Parameters.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Parameters.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Receivers.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Receivers.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Receivers.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Receivers.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ResourceVariables.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/ResourceVariables.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ResourceVariables.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/ResourceVariables.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Throws.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Throws.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Throws.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Throws.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/TopLevelBlocks.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/TopLevelBlocks.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/TopLevelBlocks.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/TopLevelBlocks.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/TypeCasts.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/TypeCasts.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/TypeCasts.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/TypeCasts.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/TypeParameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/TypeParameters.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/TypeParameters.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/TypeParameters.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Varargs.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Varargs.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Varargs.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Varargs.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Wildcards.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Wildcards.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Wildcards.java rename to test/langtools/tools/javac/annotations/typeAnnotations/newlocations/Wildcards.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java b/test/langtools/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java rename to test/langtools/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java b/test/langtools/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java rename to test/langtools/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java b/test/langtools/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java rename to test/langtools/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/package-info.java b/test/langtools/tools/javac/annotations/typeAnnotations/packageanno/mypackage/package-info.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/package-info.java rename to test/langtools/tools/javac/annotations/typeAnnotations/packageanno/mypackage/package-info.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Test.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Test.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Test.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Test.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java similarity index 100% rename from langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java rename to test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java diff --git a/langtools/test/tools/javac/api/6400303/T6400303.java b/test/langtools/tools/javac/api/6400303/T6400303.java similarity index 100% rename from langtools/test/tools/javac/api/6400303/T6400303.java rename to test/langtools/tools/javac/api/6400303/T6400303.java diff --git a/langtools/test/tools/javac/api/6400303/Test1.java b/test/langtools/tools/javac/api/6400303/Test1.java similarity index 100% rename from langtools/test/tools/javac/api/6400303/Test1.java rename to test/langtools/tools/javac/api/6400303/Test1.java diff --git a/langtools/test/tools/javac/api/6400303/Test2.java b/test/langtools/tools/javac/api/6400303/Test2.java similarity index 100% rename from langtools/test/tools/javac/api/6400303/Test2.java rename to test/langtools/tools/javac/api/6400303/Test2.java diff --git a/langtools/test/tools/javac/api/6406133/Erroneous.java b/test/langtools/tools/javac/api/6406133/Erroneous.java similarity index 100% rename from langtools/test/tools/javac/api/6406133/Erroneous.java rename to test/langtools/tools/javac/api/6406133/Erroneous.java diff --git a/langtools/test/tools/javac/api/6406133/T6406133.java b/test/langtools/tools/javac/api/6406133/T6406133.java similarity index 100% rename from langtools/test/tools/javac/api/6406133/T6406133.java rename to test/langtools/tools/javac/api/6406133/T6406133.java diff --git a/langtools/test/tools/javac/api/6410643/T6410643.java b/test/langtools/tools/javac/api/6410643/T6410643.java similarity index 100% rename from langtools/test/tools/javac/api/6410643/T6410643.java rename to test/langtools/tools/javac/api/6410643/T6410643.java diff --git a/langtools/test/tools/javac/api/6411310/T6411310.java b/test/langtools/tools/javac/api/6411310/T6411310.java similarity index 100% rename from langtools/test/tools/javac/api/6411310/T6411310.java rename to test/langtools/tools/javac/api/6411310/T6411310.java diff --git a/langtools/test/tools/javac/api/6411333/T6411333.java b/test/langtools/tools/javac/api/6411333/T6411333.java similarity index 100% rename from langtools/test/tools/javac/api/6411333/T6411333.java rename to test/langtools/tools/javac/api/6411333/T6411333.java diff --git a/langtools/test/tools/javac/api/6412656/T6412656.java b/test/langtools/tools/javac/api/6412656/T6412656.java similarity index 100% rename from langtools/test/tools/javac/api/6412656/T6412656.java rename to test/langtools/tools/javac/api/6412656/T6412656.java diff --git a/langtools/test/tools/javac/api/6415780/T6415780.java b/test/langtools/tools/javac/api/6415780/T6415780.java similarity index 100% rename from langtools/test/tools/javac/api/6415780/T6415780.java rename to test/langtools/tools/javac/api/6415780/T6415780.java diff --git a/langtools/test/tools/javac/api/6418694/T6418694.java b/test/langtools/tools/javac/api/6418694/T6418694.java similarity index 100% rename from langtools/test/tools/javac/api/6418694/T6418694.java rename to test/langtools/tools/javac/api/6418694/T6418694.java diff --git a/langtools/test/tools/javac/api/6420409/T6420409.java b/test/langtools/tools/javac/api/6420409/T6420409.java similarity index 100% rename from langtools/test/tools/javac/api/6420409/T6420409.java rename to test/langtools/tools/javac/api/6420409/T6420409.java diff --git a/langtools/test/tools/javac/api/6420464/T6420464.java b/test/langtools/tools/javac/api/6420464/T6420464.java similarity index 100% rename from langtools/test/tools/javac/api/6420464/T6420464.java rename to test/langtools/tools/javac/api/6420464/T6420464.java diff --git a/langtools/test/tools/javac/api/6421111/T6421111.java b/test/langtools/tools/javac/api/6421111/T6421111.java similarity index 100% rename from langtools/test/tools/javac/api/6421111/T6421111.java rename to test/langtools/tools/javac/api/6421111/T6421111.java diff --git a/langtools/test/tools/javac/api/6421756/T6421756.java b/test/langtools/tools/javac/api/6421756/T6421756.java similarity index 100% rename from langtools/test/tools/javac/api/6421756/T6421756.java rename to test/langtools/tools/javac/api/6421756/T6421756.java diff --git a/langtools/test/tools/javac/api/6422215/T6422215.java b/test/langtools/tools/javac/api/6422215/T6422215.java similarity index 100% rename from langtools/test/tools/javac/api/6422215/T6422215.java rename to test/langtools/tools/javac/api/6422215/T6422215.java diff --git a/langtools/test/tools/javac/api/6422327/T6422327.java b/test/langtools/tools/javac/api/6422327/T6422327.java similarity index 100% rename from langtools/test/tools/javac/api/6422327/T6422327.java rename to test/langtools/tools/javac/api/6422327/T6422327.java diff --git a/langtools/test/tools/javac/api/6422327/T6422327.other b/test/langtools/tools/javac/api/6422327/T6422327.other similarity index 100% rename from langtools/test/tools/javac/api/6422327/T6422327.other rename to test/langtools/tools/javac/api/6422327/T6422327.other diff --git a/langtools/test/tools/javac/api/6423003/T6423003.java b/test/langtools/tools/javac/api/6423003/T6423003.java similarity index 100% rename from langtools/test/tools/javac/api/6423003/T6423003.java rename to test/langtools/tools/javac/api/6423003/T6423003.java diff --git a/langtools/test/tools/javac/api/6431257/T6431257.java b/test/langtools/tools/javac/api/6431257/T6431257.java similarity index 100% rename from langtools/test/tools/javac/api/6431257/T6431257.java rename to test/langtools/tools/javac/api/6431257/T6431257.java diff --git a/langtools/test/tools/javac/api/6431257/package-info.java b/test/langtools/tools/javac/api/6431257/package-info.java similarity index 100% rename from langtools/test/tools/javac/api/6431257/package-info.java rename to test/langtools/tools/javac/api/6431257/package-info.java diff --git a/langtools/test/tools/javac/api/6431435/A.java b/test/langtools/tools/javac/api/6431435/A.java similarity index 100% rename from langtools/test/tools/javac/api/6431435/A.java rename to test/langtools/tools/javac/api/6431435/A.java diff --git a/langtools/test/tools/javac/api/6431435/T6431435.java b/test/langtools/tools/javac/api/6431435/T6431435.java similarity index 100% rename from langtools/test/tools/javac/api/6431435/T6431435.java rename to test/langtools/tools/javac/api/6431435/T6431435.java diff --git a/langtools/test/tools/javac/api/6431435/p/B.java b/test/langtools/tools/javac/api/6431435/p/B.java similarity index 100% rename from langtools/test/tools/javac/api/6431435/p/B.java rename to test/langtools/tools/javac/api/6431435/p/B.java diff --git a/langtools/test/tools/javac/api/6437349/T6437349.java b/test/langtools/tools/javac/api/6437349/T6437349.java similarity index 100% rename from langtools/test/tools/javac/api/6437349/T6437349.java rename to test/langtools/tools/javac/api/6437349/T6437349.java diff --git a/langtools/test/tools/javac/api/6437999/T6437999.java b/test/langtools/tools/javac/api/6437999/T6437999.java similarity index 100% rename from langtools/test/tools/javac/api/6437999/T6437999.java rename to test/langtools/tools/javac/api/6437999/T6437999.java diff --git a/langtools/test/tools/javac/api/6440333/T6440333.java b/test/langtools/tools/javac/api/6440333/T6440333.java similarity index 100% rename from langtools/test/tools/javac/api/6440333/T6440333.java rename to test/langtools/tools/javac/api/6440333/T6440333.java diff --git a/langtools/test/tools/javac/api/6440528/T6440528.java b/test/langtools/tools/javac/api/6440528/T6440528.java similarity index 100% rename from langtools/test/tools/javac/api/6440528/T6440528.java rename to test/langtools/tools/javac/api/6440528/T6440528.java diff --git a/langtools/test/tools/javac/api/6440528/package-info.java b/test/langtools/tools/javac/api/6440528/package-info.java similarity index 100% rename from langtools/test/tools/javac/api/6440528/package-info.java rename to test/langtools/tools/javac/api/6440528/package-info.java diff --git a/langtools/test/tools/javac/api/6452876/T6452876.java b/test/langtools/tools/javac/api/6452876/T6452876.java similarity index 100% rename from langtools/test/tools/javac/api/6452876/T6452876.java rename to test/langtools/tools/javac/api/6452876/T6452876.java diff --git a/langtools/test/tools/javac/api/6468404/T6468404.java b/test/langtools/tools/javac/api/6468404/T6468404.java similarity index 100% rename from langtools/test/tools/javac/api/6468404/T6468404.java rename to test/langtools/tools/javac/api/6468404/T6468404.java diff --git a/langtools/test/tools/javac/api/6471599/Main.java b/test/langtools/tools/javac/api/6471599/Main.java similarity index 100% rename from langtools/test/tools/javac/api/6471599/Main.java rename to test/langtools/tools/javac/api/6471599/Main.java diff --git a/langtools/test/tools/javac/api/6557752/T6557752.java b/test/langtools/tools/javac/api/6557752/T6557752.java similarity index 100% rename from langtools/test/tools/javac/api/6557752/T6557752.java rename to test/langtools/tools/javac/api/6557752/T6557752.java diff --git a/langtools/test/tools/javac/api/6598108/T6598108.java b/test/langtools/tools/javac/api/6598108/T6598108.java similarity index 100% rename from langtools/test/tools/javac/api/6598108/T6598108.java rename to test/langtools/tools/javac/api/6598108/T6598108.java diff --git a/langtools/test/tools/javac/api/6608214/T6608214.java b/test/langtools/tools/javac/api/6608214/T6608214.java similarity index 100% rename from langtools/test/tools/javac/api/6608214/T6608214.java rename to test/langtools/tools/javac/api/6608214/T6608214.java diff --git a/langtools/test/tools/javac/api/6731573/Erroneous.java b/test/langtools/tools/javac/api/6731573/Erroneous.java similarity index 100% rename from langtools/test/tools/javac/api/6731573/Erroneous.java rename to test/langtools/tools/javac/api/6731573/Erroneous.java diff --git a/langtools/test/tools/javac/api/6731573/T6731573.java b/test/langtools/tools/javac/api/6731573/T6731573.java similarity index 100% rename from langtools/test/tools/javac/api/6731573/T6731573.java rename to test/langtools/tools/javac/api/6731573/T6731573.java diff --git a/langtools/test/tools/javac/api/6733837/T6733837.java b/test/langtools/tools/javac/api/6733837/T6733837.java similarity index 100% rename from langtools/test/tools/javac/api/6733837/T6733837.java rename to test/langtools/tools/javac/api/6733837/T6733837.java diff --git a/langtools/test/tools/javac/api/6852595/T6852595.java b/test/langtools/tools/javac/api/6852595/T6852595.java similarity index 100% rename from langtools/test/tools/javac/api/6852595/T6852595.java rename to test/langtools/tools/javac/api/6852595/T6852595.java diff --git a/langtools/test/tools/javac/api/7086261/T7086261.java b/test/langtools/tools/javac/api/7086261/T7086261.java similarity index 100% rename from langtools/test/tools/javac/api/7086261/T7086261.java rename to test/langtools/tools/javac/api/7086261/T7086261.java diff --git a/langtools/test/tools/javac/api/8007344/Test.java b/test/langtools/tools/javac/api/8007344/Test.java similarity index 100% rename from langtools/test/tools/javac/api/8007344/Test.java rename to test/langtools/tools/javac/api/8007344/Test.java diff --git a/langtools/test/tools/javac/api/EndPositions.java b/test/langtools/tools/javac/api/EndPositions.java similarity index 100% rename from langtools/test/tools/javac/api/EndPositions.java rename to test/langtools/tools/javac/api/EndPositions.java diff --git a/langtools/test/tools/javac/api/Sibling.java b/test/langtools/tools/javac/api/Sibling.java similarity index 100% rename from langtools/test/tools/javac/api/Sibling.java rename to test/langtools/tools/javac/api/Sibling.java diff --git a/langtools/test/tools/javac/api/T6257235.java b/test/langtools/tools/javac/api/T6257235.java similarity index 100% rename from langtools/test/tools/javac/api/T6257235.java rename to test/langtools/tools/javac/api/T6257235.java diff --git a/langtools/test/tools/javac/api/T6258271.java b/test/langtools/tools/javac/api/T6258271.java similarity index 100% rename from langtools/test/tools/javac/api/T6258271.java rename to test/langtools/tools/javac/api/T6258271.java diff --git a/langtools/test/tools/javac/api/T6265137.java b/test/langtools/tools/javac/api/T6265137.java similarity index 100% rename from langtools/test/tools/javac/api/T6265137.java rename to test/langtools/tools/javac/api/T6265137.java diff --git a/langtools/test/tools/javac/api/T6265137a.java b/test/langtools/tools/javac/api/T6265137a.java similarity index 100% rename from langtools/test/tools/javac/api/T6265137a.java rename to test/langtools/tools/javac/api/T6265137a.java diff --git a/langtools/test/tools/javac/api/T6306137.java b/test/langtools/tools/javac/api/T6306137.java similarity index 100% rename from langtools/test/tools/javac/api/T6306137.java rename to test/langtools/tools/javac/api/T6306137.java diff --git a/langtools/test/tools/javac/api/T6345974.java b/test/langtools/tools/javac/api/T6345974.java similarity index 100% rename from langtools/test/tools/javac/api/T6345974.java rename to test/langtools/tools/javac/api/T6345974.java diff --git a/langtools/test/tools/javac/api/T6357331.java b/test/langtools/tools/javac/api/T6357331.java similarity index 100% rename from langtools/test/tools/javac/api/T6357331.java rename to test/langtools/tools/javac/api/T6357331.java diff --git a/langtools/test/tools/javac/api/T6358786.java b/test/langtools/tools/javac/api/T6358786.java similarity index 100% rename from langtools/test/tools/javac/api/T6358786.java rename to test/langtools/tools/javac/api/T6358786.java diff --git a/langtools/test/tools/javac/api/T6358955.java b/test/langtools/tools/javac/api/T6358955.java similarity index 100% rename from langtools/test/tools/javac/api/T6358955.java rename to test/langtools/tools/javac/api/T6358955.java diff --git a/langtools/test/tools/javac/api/T6392782.java b/test/langtools/tools/javac/api/T6392782.java similarity index 100% rename from langtools/test/tools/javac/api/T6392782.java rename to test/langtools/tools/javac/api/T6392782.java diff --git a/langtools/test/tools/javac/api/T6395981.java b/test/langtools/tools/javac/api/T6395981.java similarity index 100% rename from langtools/test/tools/javac/api/T6395981.java rename to test/langtools/tools/javac/api/T6395981.java diff --git a/langtools/test/tools/javac/api/T6397104.java b/test/langtools/tools/javac/api/T6397104.java similarity index 100% rename from langtools/test/tools/javac/api/T6397104.java rename to test/langtools/tools/javac/api/T6397104.java diff --git a/langtools/test/tools/javac/api/T6400205.java b/test/langtools/tools/javac/api/T6400205.java similarity index 100% rename from langtools/test/tools/javac/api/T6400205.java rename to test/langtools/tools/javac/api/T6400205.java diff --git a/langtools/test/tools/javac/api/T6400207.java b/test/langtools/tools/javac/api/T6400207.java similarity index 100% rename from langtools/test/tools/javac/api/T6400207.java rename to test/langtools/tools/javac/api/T6400207.java diff --git a/langtools/test/tools/javac/api/T6407011.java b/test/langtools/tools/javac/api/T6407011.java similarity index 100% rename from langtools/test/tools/javac/api/T6407011.java rename to test/langtools/tools/javac/api/T6407011.java diff --git a/langtools/test/tools/javac/api/T6412669.java b/test/langtools/tools/javac/api/T6412669.java similarity index 100% rename from langtools/test/tools/javac/api/T6412669.java rename to test/langtools/tools/javac/api/T6412669.java diff --git a/langtools/test/tools/javac/api/T6419926.java b/test/langtools/tools/javac/api/T6419926.java similarity index 100% rename from langtools/test/tools/javac/api/T6419926.java rename to test/langtools/tools/javac/api/T6419926.java diff --git a/langtools/test/tools/javac/api/T6431879.java b/test/langtools/tools/javac/api/T6431879.java similarity index 100% rename from langtools/test/tools/javac/api/T6431879.java rename to test/langtools/tools/javac/api/T6431879.java diff --git a/langtools/test/tools/javac/api/T6437138.java b/test/langtools/tools/javac/api/T6437138.java similarity index 100% rename from langtools/test/tools/javac/api/T6437138.java rename to test/langtools/tools/javac/api/T6437138.java diff --git a/langtools/test/tools/javac/api/T6483788.java b/test/langtools/tools/javac/api/T6483788.java similarity index 100% rename from langtools/test/tools/javac/api/T6483788.java rename to test/langtools/tools/javac/api/T6483788.java diff --git a/langtools/test/tools/javac/api/T6501502.java b/test/langtools/tools/javac/api/T6501502.java similarity index 100% rename from langtools/test/tools/javac/api/T6501502.java rename to test/langtools/tools/javac/api/T6501502.java diff --git a/langtools/test/tools/javac/api/T6838467.java b/test/langtools/tools/javac/api/T6838467.java similarity index 100% rename from langtools/test/tools/javac/api/T6838467.java rename to test/langtools/tools/javac/api/T6838467.java diff --git a/langtools/test/tools/javac/api/T6877206.java b/test/langtools/tools/javac/api/T6877206.java similarity index 100% rename from langtools/test/tools/javac/api/T6877206.java rename to test/langtools/tools/javac/api/T6877206.java diff --git a/langtools/test/tools/javac/api/TestClientCodeWrapper.java b/test/langtools/tools/javac/api/TestClientCodeWrapper.java similarity index 100% rename from langtools/test/tools/javac/api/TestClientCodeWrapper.java rename to test/langtools/tools/javac/api/TestClientCodeWrapper.java diff --git a/langtools/test/tools/javac/api/TestContainTypes.java b/test/langtools/tools/javac/api/TestContainTypes.java similarity index 100% rename from langtools/test/tools/javac/api/TestContainTypes.java rename to test/langtools/tools/javac/api/TestContainTypes.java diff --git a/langtools/test/tools/javac/api/TestDocComments.java b/test/langtools/tools/javac/api/TestDocComments.java similarity index 100% rename from langtools/test/tools/javac/api/TestDocComments.java rename to test/langtools/tools/javac/api/TestDocComments.java diff --git a/langtools/test/tools/javac/api/TestEvalExpression.java b/test/langtools/tools/javac/api/TestEvalExpression.java similarity index 100% rename from langtools/test/tools/javac/api/TestEvalExpression.java rename to test/langtools/tools/javac/api/TestEvalExpression.java diff --git a/langtools/test/tools/javac/api/TestGetElement.java b/test/langtools/tools/javac/api/TestGetElement.java similarity index 100% rename from langtools/test/tools/javac/api/TestGetElement.java rename to test/langtools/tools/javac/api/TestGetElement.java diff --git a/langtools/test/tools/javac/api/TestGetElementReference.java b/test/langtools/tools/javac/api/TestGetElementReference.java similarity index 100% rename from langtools/test/tools/javac/api/TestGetElementReference.java rename to test/langtools/tools/javac/api/TestGetElementReference.java diff --git a/langtools/test/tools/javac/api/TestGetElementReferenceData.java b/test/langtools/tools/javac/api/TestGetElementReferenceData.java similarity index 100% rename from langtools/test/tools/javac/api/TestGetElementReferenceData.java rename to test/langtools/tools/javac/api/TestGetElementReferenceData.java diff --git a/langtools/test/tools/javac/api/TestGetScope.java b/test/langtools/tools/javac/api/TestGetScope.java similarity index 100% rename from langtools/test/tools/javac/api/TestGetScope.java rename to test/langtools/tools/javac/api/TestGetScope.java diff --git a/langtools/test/tools/javac/api/TestGetTree.java b/test/langtools/tools/javac/api/TestGetTree.java similarity index 100% rename from langtools/test/tools/javac/api/TestGetTree.java rename to test/langtools/tools/javac/api/TestGetTree.java diff --git a/langtools/test/tools/javac/api/TestJavacTask.java b/test/langtools/tools/javac/api/TestJavacTask.java similarity index 100% rename from langtools/test/tools/javac/api/TestJavacTask.java rename to test/langtools/tools/javac/api/TestJavacTask.java diff --git a/langtools/test/tools/javac/api/TestJavacTaskScanner.java b/test/langtools/tools/javac/api/TestJavacTaskScanner.java similarity index 100% rename from langtools/test/tools/javac/api/TestJavacTaskScanner.java rename to test/langtools/tools/javac/api/TestJavacTaskScanner.java diff --git a/langtools/test/tools/javac/api/TestJavacTask_Lock.java b/test/langtools/tools/javac/api/TestJavacTask_Lock.java similarity index 100% rename from langtools/test/tools/javac/api/TestJavacTask_Lock.java rename to test/langtools/tools/javac/api/TestJavacTask_Lock.java diff --git a/langtools/test/tools/javac/api/TestJavacTask_Multiple.java b/test/langtools/tools/javac/api/TestJavacTask_Multiple.java similarity index 100% rename from langtools/test/tools/javac/api/TestJavacTask_Multiple.java rename to test/langtools/tools/javac/api/TestJavacTask_Multiple.java diff --git a/langtools/test/tools/javac/api/TestJavacTask_ParseAttrGen.java b/test/langtools/tools/javac/api/TestJavacTask_ParseAttrGen.java similarity index 100% rename from langtools/test/tools/javac/api/TestJavacTask_ParseAttrGen.java rename to test/langtools/tools/javac/api/TestJavacTask_ParseAttrGen.java diff --git a/langtools/test/tools/javac/api/TestName.java b/test/langtools/tools/javac/api/TestName.java similarity index 100% rename from langtools/test/tools/javac/api/TestName.java rename to test/langtools/tools/javac/api/TestName.java diff --git a/langtools/test/tools/javac/api/TestOperators.java b/test/langtools/tools/javac/api/TestOperators.java similarity index 100% rename from langtools/test/tools/javac/api/TestOperators.java rename to test/langtools/tools/javac/api/TestOperators.java diff --git a/langtools/test/tools/javac/api/TestResolveError.java b/test/langtools/tools/javac/api/TestResolveError.java similarity index 100% rename from langtools/test/tools/javac/api/TestResolveError.java rename to test/langtools/tools/javac/api/TestResolveError.java diff --git a/langtools/test/tools/javac/api/TestResolveIdent.java b/test/langtools/tools/javac/api/TestResolveIdent.java similarity index 100% rename from langtools/test/tools/javac/api/TestResolveIdent.java rename to test/langtools/tools/javac/api/TestResolveIdent.java diff --git a/langtools/test/tools/javac/api/TestSearchPaths.java b/test/langtools/tools/javac/api/TestSearchPaths.java similarity index 100% rename from langtools/test/tools/javac/api/TestSearchPaths.java rename to test/langtools/tools/javac/api/TestSearchPaths.java diff --git a/langtools/test/tools/javac/api/TestTreePath.java b/test/langtools/tools/javac/api/TestTreePath.java similarity index 100% rename from langtools/test/tools/javac/api/TestTreePath.java rename to test/langtools/tools/javac/api/TestTreePath.java diff --git a/langtools/test/tools/javac/api/TestTrees.java b/test/langtools/tools/javac/api/TestTrees.java similarity index 100% rename from langtools/test/tools/javac/api/TestTrees.java rename to test/langtools/tools/javac/api/TestTrees.java diff --git a/langtools/test/tools/javac/api/ToolProvider/HelloWorldTest.java b/test/langtools/tools/javac/api/ToolProvider/HelloWorldTest.java similarity index 100% rename from langtools/test/tools/javac/api/ToolProvider/HelloWorldTest.java rename to test/langtools/tools/javac/api/ToolProvider/HelloWorldTest.java diff --git a/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest.java b/test/langtools/tools/javac/api/ToolProvider/ToolProviderTest.java similarity index 100% rename from langtools/test/tools/javac/api/ToolProvider/ToolProviderTest.java rename to test/langtools/tools/javac/api/ToolProvider/ToolProviderTest.java diff --git a/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest1.java b/test/langtools/tools/javac/api/ToolProvider/ToolProviderTest1.java similarity index 100% rename from langtools/test/tools/javac/api/ToolProvider/ToolProviderTest1.java rename to test/langtools/tools/javac/api/ToolProvider/ToolProviderTest1.java diff --git a/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest2.java b/test/langtools/tools/javac/api/ToolProvider/ToolProviderTest2.java similarity index 100% rename from langtools/test/tools/javac/api/ToolProvider/ToolProviderTest2.java rename to test/langtools/tools/javac/api/ToolProvider/ToolProviderTest2.java diff --git a/langtools/test/tools/javac/api/evalexpr/ByteArrayClassLoader.java b/test/langtools/tools/javac/api/evalexpr/ByteArrayClassLoader.java similarity index 100% rename from langtools/test/tools/javac/api/evalexpr/ByteArrayClassLoader.java rename to test/langtools/tools/javac/api/evalexpr/ByteArrayClassLoader.java diff --git a/langtools/test/tools/javac/api/evalexpr/CompileFromString.java b/test/langtools/tools/javac/api/evalexpr/CompileFromString.java similarity index 100% rename from langtools/test/tools/javac/api/evalexpr/CompileFromString.java rename to test/langtools/tools/javac/api/evalexpr/CompileFromString.java diff --git a/langtools/test/tools/javac/api/evalexpr/MemoryFileManager.java b/test/langtools/tools/javac/api/evalexpr/MemoryFileManager.java similarity index 100% rename from langtools/test/tools/javac/api/evalexpr/MemoryFileManager.java rename to test/langtools/tools/javac/api/evalexpr/MemoryFileManager.java diff --git a/langtools/test/tools/javac/api/file/MyStandardJavaFileManager.java b/test/langtools/tools/javac/api/file/MyStandardJavaFileManager.java similarity index 100% rename from langtools/test/tools/javac/api/file/MyStandardJavaFileManager.java rename to test/langtools/tools/javac/api/file/MyStandardJavaFileManager.java diff --git a/langtools/test/tools/javac/api/file/SJFM_AsPath.java b/test/langtools/tools/javac/api/file/SJFM_AsPath.java similarity index 100% rename from langtools/test/tools/javac/api/file/SJFM_AsPath.java rename to test/langtools/tools/javac/api/file/SJFM_AsPath.java diff --git a/langtools/test/tools/javac/api/file/SJFM_GetFileObjects.java b/test/langtools/tools/javac/api/file/SJFM_GetFileObjects.java similarity index 100% rename from langtools/test/tools/javac/api/file/SJFM_GetFileObjects.java rename to test/langtools/tools/javac/api/file/SJFM_GetFileObjects.java diff --git a/langtools/test/tools/javac/api/file/SJFM_IsSameFile.java b/test/langtools/tools/javac/api/file/SJFM_IsSameFile.java similarity index 100% rename from langtools/test/tools/javac/api/file/SJFM_IsSameFile.java rename to test/langtools/tools/javac/api/file/SJFM_IsSameFile.java diff --git a/langtools/test/tools/javac/api/file/SJFM_Locations.java b/test/langtools/tools/javac/api/file/SJFM_Locations.java similarity index 100% rename from langtools/test/tools/javac/api/file/SJFM_Locations.java rename to test/langtools/tools/javac/api/file/SJFM_Locations.java diff --git a/langtools/test/tools/javac/api/file/SJFM_TestBase.java b/test/langtools/tools/javac/api/file/SJFM_TestBase.java similarity index 100% rename from langtools/test/tools/javac/api/file/SJFM_TestBase.java rename to test/langtools/tools/javac/api/file/SJFM_TestBase.java diff --git a/langtools/test/tools/javac/api/guide/Test.java b/test/langtools/tools/javac/api/guide/Test.java similarity index 100% rename from langtools/test/tools/javac/api/guide/Test.java rename to test/langtools/tools/javac/api/guide/Test.java diff --git a/langtools/test/tools/javac/api/guide/TestMe.java b/test/langtools/tools/javac/api/guide/TestMe.java similarity index 100% rename from langtools/test/tools/javac/api/guide/TestMe.java rename to test/langtools/tools/javac/api/guide/TestMe.java diff --git a/langtools/test/tools/javac/api/lib/ToolTester.java b/test/langtools/tools/javac/api/lib/ToolTester.java similarity index 100% rename from langtools/test/tools/javac/api/lib/ToolTester.java rename to test/langtools/tools/javac/api/lib/ToolTester.java diff --git a/langtools/test/tools/javac/api/mod/api/pkg/Api.java b/test/langtools/tools/javac/api/mod/api/pkg/Api.java similarity index 100% rename from langtools/test/tools/javac/api/mod/api/pkg/Api.java rename to test/langtools/tools/javac/api/mod/api/pkg/Api.java diff --git a/langtools/test/tools/javac/api/mod/module-info.java b/test/langtools/tools/javac/api/mod/module-info.java similarity index 100% rename from langtools/test/tools/javac/api/mod/module-info.java rename to test/langtools/tools/javac/api/mod/module-info.java diff --git a/langtools/test/tools/javac/api/taskListeners/CompileEvent.java b/test/langtools/tools/javac/api/taskListeners/CompileEvent.java similarity index 100% rename from langtools/test/tools/javac/api/taskListeners/CompileEvent.java rename to test/langtools/tools/javac/api/taskListeners/CompileEvent.java diff --git a/langtools/test/tools/javac/api/taskListeners/EventsBalancedTest.java b/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java similarity index 100% rename from langtools/test/tools/javac/api/taskListeners/EventsBalancedTest.java rename to test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java diff --git a/langtools/test/tools/javac/api/taskListeners/TestSimpleAddRemove.java b/test/langtools/tools/javac/api/taskListeners/TestSimpleAddRemove.java similarity index 100% rename from langtools/test/tools/javac/api/taskListeners/TestSimpleAddRemove.java rename to test/langtools/tools/javac/api/taskListeners/TestSimpleAddRemove.java diff --git a/langtools/test/tools/javac/assert/Attach.java b/test/langtools/tools/javac/assert/Attach.java similarity index 100% rename from langtools/test/tools/javac/assert/Attach.java rename to test/langtools/tools/javac/assert/Attach.java diff --git a/langtools/test/tools/javac/assert/DU1.java b/test/langtools/tools/javac/assert/DU1.java similarity index 100% rename from langtools/test/tools/javac/assert/DU1.java rename to test/langtools/tools/javac/assert/DU1.java diff --git a/langtools/test/tools/javac/assert/DU1.out b/test/langtools/tools/javac/assert/DU1.out similarity index 100% rename from langtools/test/tools/javac/assert/DU1.out rename to test/langtools/tools/javac/assert/DU1.out diff --git a/langtools/test/tools/javac/assert/DU2.java b/test/langtools/tools/javac/assert/DU2.java similarity index 100% rename from langtools/test/tools/javac/assert/DU2.java rename to test/langtools/tools/javac/assert/DU2.java diff --git a/langtools/test/tools/javac/assert/DU2.out b/test/langtools/tools/javac/assert/DU2.out similarity index 100% rename from langtools/test/tools/javac/assert/DU2.out rename to test/langtools/tools/javac/assert/DU2.out diff --git a/langtools/test/tools/javac/assert/Position.java b/test/langtools/tools/javac/assert/Position.java similarity index 100% rename from langtools/test/tools/javac/assert/Position.java rename to test/langtools/tools/javac/assert/Position.java diff --git a/langtools/test/tools/javac/binaryCompat/T1.java b/test/langtools/tools/javac/binaryCompat/T1.java similarity index 100% rename from langtools/test/tools/javac/binaryCompat/T1.java rename to test/langtools/tools/javac/binaryCompat/T1.java diff --git a/langtools/test/tools/javac/binaryCompat/T2.java b/test/langtools/tools/javac/binaryCompat/T2.java similarity index 100% rename from langtools/test/tools/javac/binaryCompat/T2.java rename to test/langtools/tools/javac/binaryCompat/T2.java diff --git a/langtools/test/tools/javac/binaryCompat/T3.java b/test/langtools/tools/javac/binaryCompat/T3.java similarity index 100% rename from langtools/test/tools/javac/binaryCompat/T3.java rename to test/langtools/tools/javac/binaryCompat/T3.java diff --git a/langtools/test/tools/javac/boxing/BoxedForeach.java b/test/langtools/tools/javac/boxing/BoxedForeach.java similarity index 100% rename from langtools/test/tools/javac/boxing/BoxedForeach.java rename to test/langtools/tools/javac/boxing/BoxedForeach.java diff --git a/langtools/test/tools/javac/boxing/Boxing1.java b/test/langtools/tools/javac/boxing/Boxing1.java similarity index 100% rename from langtools/test/tools/javac/boxing/Boxing1.java rename to test/langtools/tools/javac/boxing/Boxing1.java diff --git a/langtools/test/tools/javac/boxing/Boxing2.java b/test/langtools/tools/javac/boxing/Boxing2.java similarity index 100% rename from langtools/test/tools/javac/boxing/Boxing2.java rename to test/langtools/tools/javac/boxing/Boxing2.java diff --git a/langtools/test/tools/javac/boxing/Boxing2.out b/test/langtools/tools/javac/boxing/Boxing2.out similarity index 100% rename from langtools/test/tools/javac/boxing/Boxing2.out rename to test/langtools/tools/javac/boxing/Boxing2.out diff --git a/langtools/test/tools/javac/boxing/Boxing4.java b/test/langtools/tools/javac/boxing/Boxing4.java similarity index 100% rename from langtools/test/tools/javac/boxing/Boxing4.java rename to test/langtools/tools/javac/boxing/Boxing4.java diff --git a/langtools/test/tools/javac/boxing/BoxingCaching.java b/test/langtools/tools/javac/boxing/BoxingCaching.java similarity index 100% rename from langtools/test/tools/javac/boxing/BoxingCaching.java rename to test/langtools/tools/javac/boxing/BoxingCaching.java diff --git a/langtools/test/tools/javac/boxing/IncrementBoxedAndAccess.java b/test/langtools/tools/javac/boxing/IncrementBoxedAndAccess.java similarity index 100% rename from langtools/test/tools/javac/boxing/IncrementBoxedAndAccess.java rename to test/langtools/tools/javac/boxing/IncrementBoxedAndAccess.java diff --git a/langtools/test/tools/javac/boxing/QualBoxedPostOp.java b/test/langtools/tools/javac/boxing/QualBoxedPostOp.java similarity index 100% rename from langtools/test/tools/javac/boxing/QualBoxedPostOp.java rename to test/langtools/tools/javac/boxing/QualBoxedPostOp.java diff --git a/langtools/test/tools/javac/boxing/QualBoxedPostOp2.java b/test/langtools/tools/javac/boxing/QualBoxedPostOp2.java similarity index 100% rename from langtools/test/tools/javac/boxing/QualBoxedPostOp2.java rename to test/langtools/tools/javac/boxing/QualBoxedPostOp2.java diff --git a/langtools/test/tools/javac/boxing/QualBoxedPostOp3.java b/test/langtools/tools/javac/boxing/QualBoxedPostOp3.java similarity index 100% rename from langtools/test/tools/javac/boxing/QualBoxedPostOp3.java rename to test/langtools/tools/javac/boxing/QualBoxedPostOp3.java diff --git a/langtools/test/tools/javac/boxing/QualBoxedPostOp3Parent.java b/test/langtools/tools/javac/boxing/QualBoxedPostOp3Parent.java similarity index 100% rename from langtools/test/tools/javac/boxing/QualBoxedPostOp3Parent.java rename to test/langtools/tools/javac/boxing/QualBoxedPostOp3Parent.java diff --git a/langtools/test/tools/javac/boxing/T5082929.java b/test/langtools/tools/javac/boxing/T5082929.java similarity index 100% rename from langtools/test/tools/javac/boxing/T5082929.java rename to test/langtools/tools/javac/boxing/T5082929.java diff --git a/langtools/test/tools/javac/boxing/T5082929.out b/test/langtools/tools/javac/boxing/T5082929.out similarity index 100% rename from langtools/test/tools/javac/boxing/T5082929.out rename to test/langtools/tools/javac/boxing/T5082929.out diff --git a/langtools/test/tools/javac/boxing/T6348760.java b/test/langtools/tools/javac/boxing/T6348760.java similarity index 100% rename from langtools/test/tools/javac/boxing/T6348760.java rename to test/langtools/tools/javac/boxing/T6348760.java diff --git a/langtools/test/tools/javac/boxing/T6369051.java b/test/langtools/tools/javac/boxing/T6369051.java similarity index 100% rename from langtools/test/tools/javac/boxing/T6369051.java rename to test/langtools/tools/javac/boxing/T6369051.java diff --git a/langtools/test/tools/javac/boxing/T6614974.java b/test/langtools/tools/javac/boxing/T6614974.java similarity index 100% rename from langtools/test/tools/javac/boxing/T6614974.java rename to test/langtools/tools/javac/boxing/T6614974.java diff --git a/langtools/test/tools/javac/boxing/T6816548.java b/test/langtools/tools/javac/boxing/T6816548.java similarity index 100% rename from langtools/test/tools/javac/boxing/T6816548.java rename to test/langtools/tools/javac/boxing/T6816548.java diff --git a/langtools/test/tools/javac/capture/Capture1.java b/test/langtools/tools/javac/capture/Capture1.java similarity index 100% rename from langtools/test/tools/javac/capture/Capture1.java rename to test/langtools/tools/javac/capture/Capture1.java diff --git a/langtools/test/tools/javac/capture/Capture2.java b/test/langtools/tools/javac/capture/Capture2.java similarity index 100% rename from langtools/test/tools/javac/capture/Capture2.java rename to test/langtools/tools/javac/capture/Capture2.java diff --git a/langtools/test/tools/javac/capture/Capture2.out b/test/langtools/tools/javac/capture/Capture2.out similarity index 100% rename from langtools/test/tools/javac/capture/Capture2.out rename to test/langtools/tools/javac/capture/Capture2.out diff --git a/langtools/test/tools/javac/capture/Capture3.java b/test/langtools/tools/javac/capture/Capture3.java similarity index 100% rename from langtools/test/tools/javac/capture/Capture3.java rename to test/langtools/tools/javac/capture/Capture3.java diff --git a/langtools/test/tools/javac/capture/Capture5.java b/test/langtools/tools/javac/capture/Capture5.java similarity index 100% rename from langtools/test/tools/javac/capture/Capture5.java rename to test/langtools/tools/javac/capture/Capture5.java diff --git a/langtools/test/tools/javac/capture/Martin.java b/test/langtools/tools/javac/capture/Martin.java similarity index 100% rename from langtools/test/tools/javac/capture/Martin.java rename to test/langtools/tools/javac/capture/Martin.java diff --git a/langtools/test/tools/javac/capture/Martin.out b/test/langtools/tools/javac/capture/Martin.out similarity index 100% rename from langtools/test/tools/javac/capture/Martin.out rename to test/langtools/tools/javac/capture/Martin.out diff --git a/langtools/test/tools/javac/capture/T6594284.java b/test/langtools/tools/javac/capture/T6594284.java similarity index 100% rename from langtools/test/tools/javac/capture/T6594284.java rename to test/langtools/tools/javac/capture/T6594284.java diff --git a/langtools/test/tools/javac/capture/T6594284.out b/test/langtools/tools/javac/capture/T6594284.out similarity index 100% rename from langtools/test/tools/javac/capture/T6594284.out rename to test/langtools/tools/javac/capture/T6594284.out diff --git a/langtools/test/tools/javac/cast/4916620/T4916620.java b/test/langtools/tools/javac/cast/4916620/T4916620.java similarity index 100% rename from langtools/test/tools/javac/cast/4916620/T4916620.java rename to test/langtools/tools/javac/cast/4916620/T4916620.java diff --git a/langtools/test/tools/javac/cast/4916620/T4916620.out b/test/langtools/tools/javac/cast/4916620/T4916620.out similarity index 100% rename from langtools/test/tools/javac/cast/4916620/T4916620.out rename to test/langtools/tools/javac/cast/4916620/T4916620.out diff --git a/langtools/test/tools/javac/cast/5034609/T5034609.java b/test/langtools/tools/javac/cast/5034609/T5034609.java similarity index 100% rename from langtools/test/tools/javac/cast/5034609/T5034609.java rename to test/langtools/tools/javac/cast/5034609/T5034609.java diff --git a/langtools/test/tools/javac/cast/5043020/T5043020.java b/test/langtools/tools/javac/cast/5043020/T5043020.java similarity index 100% rename from langtools/test/tools/javac/cast/5043020/T5043020.java rename to test/langtools/tools/javac/cast/5043020/T5043020.java diff --git a/langtools/test/tools/javac/cast/5064736/T5064736.java b/test/langtools/tools/javac/cast/5064736/T5064736.java similarity index 100% rename from langtools/test/tools/javac/cast/5064736/T5064736.java rename to test/langtools/tools/javac/cast/5064736/T5064736.java diff --git a/langtools/test/tools/javac/cast/5064736/T5064736.out b/test/langtools/tools/javac/cast/5064736/T5064736.out similarity index 100% rename from langtools/test/tools/javac/cast/5064736/T5064736.out rename to test/langtools/tools/javac/cast/5064736/T5064736.out diff --git a/langtools/test/tools/javac/cast/5065215/T5065215.java b/test/langtools/tools/javac/cast/5065215/T5065215.java similarity index 100% rename from langtools/test/tools/javac/cast/5065215/T5065215.java rename to test/langtools/tools/javac/cast/5065215/T5065215.java diff --git a/langtools/test/tools/javac/cast/6211853/T6211853.java b/test/langtools/tools/javac/cast/6211853/T6211853.java similarity index 100% rename from langtools/test/tools/javac/cast/6211853/T6211853.java rename to test/langtools/tools/javac/cast/6211853/T6211853.java diff --git a/langtools/test/tools/javac/cast/6219964/T6219964.java b/test/langtools/tools/javac/cast/6219964/T6219964.java similarity index 100% rename from langtools/test/tools/javac/cast/6219964/T6219964.java rename to test/langtools/tools/javac/cast/6219964/T6219964.java diff --git a/langtools/test/tools/javac/cast/6256789/T6256789.java b/test/langtools/tools/javac/cast/6256789/T6256789.java similarity index 100% rename from langtools/test/tools/javac/cast/6256789/T6256789.java rename to test/langtools/tools/javac/cast/6256789/T6256789.java diff --git a/langtools/test/tools/javac/cast/6270087/T6270087.java b/test/langtools/tools/javac/cast/6270087/T6270087.java similarity index 100% rename from langtools/test/tools/javac/cast/6270087/T6270087.java rename to test/langtools/tools/javac/cast/6270087/T6270087.java diff --git a/langtools/test/tools/javac/cast/6270087/T6270087neg.java b/test/langtools/tools/javac/cast/6270087/T6270087neg.java similarity index 100% rename from langtools/test/tools/javac/cast/6270087/T6270087neg.java rename to test/langtools/tools/javac/cast/6270087/T6270087neg.java diff --git a/langtools/test/tools/javac/cast/6270087/T6270087neg.out b/test/langtools/tools/javac/cast/6270087/T6270087neg.out similarity index 100% rename from langtools/test/tools/javac/cast/6270087/T6270087neg.out rename to test/langtools/tools/javac/cast/6270087/T6270087neg.out diff --git a/langtools/test/tools/javac/cast/6286112/T6286112.java b/test/langtools/tools/javac/cast/6286112/T6286112.java similarity index 100% rename from langtools/test/tools/javac/cast/6286112/T6286112.java rename to test/langtools/tools/javac/cast/6286112/T6286112.java diff --git a/langtools/test/tools/javac/cast/6295056/T6295056.java b/test/langtools/tools/javac/cast/6295056/T6295056.java similarity index 100% rename from langtools/test/tools/javac/cast/6295056/T6295056.java rename to test/langtools/tools/javac/cast/6295056/T6295056.java diff --git a/langtools/test/tools/javac/cast/6295056/T6295056.out b/test/langtools/tools/javac/cast/6295056/T6295056.out similarity index 100% rename from langtools/test/tools/javac/cast/6295056/T6295056.out rename to test/langtools/tools/javac/cast/6295056/T6295056.out diff --git a/langtools/test/tools/javac/cast/6302214/T6302214.java b/test/langtools/tools/javac/cast/6302214/T6302214.java similarity index 100% rename from langtools/test/tools/javac/cast/6302214/T6302214.java rename to test/langtools/tools/javac/cast/6302214/T6302214.java diff --git a/langtools/test/tools/javac/cast/6302214/T6302214a.java b/test/langtools/tools/javac/cast/6302214/T6302214a.java similarity index 100% rename from langtools/test/tools/javac/cast/6302214/T6302214a.java rename to test/langtools/tools/javac/cast/6302214/T6302214a.java diff --git a/langtools/test/tools/javac/cast/6302956/T6302956.java b/test/langtools/tools/javac/cast/6302956/T6302956.java similarity index 100% rename from langtools/test/tools/javac/cast/6302956/T6302956.java rename to test/langtools/tools/javac/cast/6302956/T6302956.java diff --git a/langtools/test/tools/javac/cast/6302956/T6302956.out b/test/langtools/tools/javac/cast/6302956/T6302956.out similarity index 100% rename from langtools/test/tools/javac/cast/6302956/T6302956.out rename to test/langtools/tools/javac/cast/6302956/T6302956.out diff --git a/langtools/test/tools/javac/cast/6358534/T6358534.java b/test/langtools/tools/javac/cast/6358534/T6358534.java similarity index 100% rename from langtools/test/tools/javac/cast/6358534/T6358534.java rename to test/langtools/tools/javac/cast/6358534/T6358534.java diff --git a/langtools/test/tools/javac/cast/6467183/T6467183a.java b/test/langtools/tools/javac/cast/6467183/T6467183a.java similarity index 100% rename from langtools/test/tools/javac/cast/6467183/T6467183a.java rename to test/langtools/tools/javac/cast/6467183/T6467183a.java diff --git a/langtools/test/tools/javac/cast/6467183/T6467183a.out b/test/langtools/tools/javac/cast/6467183/T6467183a.out similarity index 100% rename from langtools/test/tools/javac/cast/6467183/T6467183a.out rename to test/langtools/tools/javac/cast/6467183/T6467183a.out diff --git a/langtools/test/tools/javac/cast/6467183/T6467183b.java b/test/langtools/tools/javac/cast/6467183/T6467183b.java similarity index 100% rename from langtools/test/tools/javac/cast/6467183/T6467183b.java rename to test/langtools/tools/javac/cast/6467183/T6467183b.java diff --git a/langtools/test/tools/javac/cast/6467183/T6467183b.out b/test/langtools/tools/javac/cast/6467183/T6467183b.out similarity index 100% rename from langtools/test/tools/javac/cast/6467183/T6467183b.out rename to test/langtools/tools/javac/cast/6467183/T6467183b.out diff --git a/langtools/test/tools/javac/cast/6507317/T6507317.java b/test/langtools/tools/javac/cast/6507317/T6507317.java similarity index 100% rename from langtools/test/tools/javac/cast/6507317/T6507317.java rename to test/langtools/tools/javac/cast/6507317/T6507317.java diff --git a/langtools/test/tools/javac/cast/6548436/T6548436a.java b/test/langtools/tools/javac/cast/6548436/T6548436a.java similarity index 100% rename from langtools/test/tools/javac/cast/6548436/T6548436a.java rename to test/langtools/tools/javac/cast/6548436/T6548436a.java diff --git a/langtools/test/tools/javac/cast/6548436/T6548436b.java b/test/langtools/tools/javac/cast/6548436/T6548436b.java similarity index 100% rename from langtools/test/tools/javac/cast/6548436/T6548436b.java rename to test/langtools/tools/javac/cast/6548436/T6548436b.java diff --git a/langtools/test/tools/javac/cast/6548436/T6548436c.java b/test/langtools/tools/javac/cast/6548436/T6548436c.java similarity index 100% rename from langtools/test/tools/javac/cast/6548436/T6548436c.java rename to test/langtools/tools/javac/cast/6548436/T6548436c.java diff --git a/langtools/test/tools/javac/cast/6548436/T6548436d.java b/test/langtools/tools/javac/cast/6548436/T6548436d.java similarity index 100% rename from langtools/test/tools/javac/cast/6548436/T6548436d.java rename to test/langtools/tools/javac/cast/6548436/T6548436d.java diff --git a/langtools/test/tools/javac/cast/6548436/T6548436d.out b/test/langtools/tools/javac/cast/6548436/T6548436d.out similarity index 100% rename from langtools/test/tools/javac/cast/6548436/T6548436d.out rename to test/langtools/tools/javac/cast/6548436/T6548436d.out diff --git a/langtools/test/tools/javac/cast/6557182/T6557182.java b/test/langtools/tools/javac/cast/6557182/T6557182.java similarity index 100% rename from langtools/test/tools/javac/cast/6557182/T6557182.java rename to test/langtools/tools/javac/cast/6557182/T6557182.java diff --git a/langtools/test/tools/javac/cast/6557182/T6557182.out b/test/langtools/tools/javac/cast/6557182/T6557182.out similarity index 100% rename from langtools/test/tools/javac/cast/6557182/T6557182.out rename to test/langtools/tools/javac/cast/6557182/T6557182.out diff --git a/langtools/test/tools/javac/cast/6558559/T6558559a.java b/test/langtools/tools/javac/cast/6558559/T6558559a.java similarity index 100% rename from langtools/test/tools/javac/cast/6558559/T6558559a.java rename to test/langtools/tools/javac/cast/6558559/T6558559a.java diff --git a/langtools/test/tools/javac/cast/6558559/T6558559b.java b/test/langtools/tools/javac/cast/6558559/T6558559b.java similarity index 100% rename from langtools/test/tools/javac/cast/6558559/T6558559b.java rename to test/langtools/tools/javac/cast/6558559/T6558559b.java diff --git a/langtools/test/tools/javac/cast/6569057/T6569057.java b/test/langtools/tools/javac/cast/6569057/T6569057.java similarity index 100% rename from langtools/test/tools/javac/cast/6569057/T6569057.java rename to test/langtools/tools/javac/cast/6569057/T6569057.java diff --git a/langtools/test/tools/javac/cast/6586091/T6586091.java b/test/langtools/tools/javac/cast/6586091/T6586091.java similarity index 100% rename from langtools/test/tools/javac/cast/6586091/T6586091.java rename to test/langtools/tools/javac/cast/6586091/T6586091.java diff --git a/langtools/test/tools/javac/cast/6665356/T6665356.java b/test/langtools/tools/javac/cast/6665356/T6665356.java similarity index 100% rename from langtools/test/tools/javac/cast/6665356/T6665356.java rename to test/langtools/tools/javac/cast/6665356/T6665356.java diff --git a/langtools/test/tools/javac/cast/6665356/T6665356.out b/test/langtools/tools/javac/cast/6665356/T6665356.out similarity index 100% rename from langtools/test/tools/javac/cast/6665356/T6665356.out rename to test/langtools/tools/javac/cast/6665356/T6665356.out diff --git a/langtools/test/tools/javac/cast/6714835/T6714835.java b/test/langtools/tools/javac/cast/6714835/T6714835.java similarity index 100% rename from langtools/test/tools/javac/cast/6714835/T6714835.java rename to test/langtools/tools/javac/cast/6714835/T6714835.java diff --git a/langtools/test/tools/javac/cast/6714835/T6714835.out b/test/langtools/tools/javac/cast/6714835/T6714835.out similarity index 100% rename from langtools/test/tools/javac/cast/6714835/T6714835.out rename to test/langtools/tools/javac/cast/6714835/T6714835.out diff --git a/langtools/test/tools/javac/cast/6795580/T6795580.java b/test/langtools/tools/javac/cast/6795580/T6795580.java similarity index 100% rename from langtools/test/tools/javac/cast/6795580/T6795580.java rename to test/langtools/tools/javac/cast/6795580/T6795580.java diff --git a/langtools/test/tools/javac/cast/6795580/T6795580.out b/test/langtools/tools/javac/cast/6795580/T6795580.out similarity index 100% rename from langtools/test/tools/javac/cast/6795580/T6795580.out rename to test/langtools/tools/javac/cast/6795580/T6795580.out diff --git a/langtools/test/tools/javac/cast/6932571/T6932571a.java b/test/langtools/tools/javac/cast/6932571/T6932571a.java similarity index 100% rename from langtools/test/tools/javac/cast/6932571/T6932571a.java rename to test/langtools/tools/javac/cast/6932571/T6932571a.java diff --git a/langtools/test/tools/javac/cast/6932571/T6932571b.java b/test/langtools/tools/javac/cast/6932571/T6932571b.java similarity index 100% rename from langtools/test/tools/javac/cast/6932571/T6932571b.java rename to test/langtools/tools/javac/cast/6932571/T6932571b.java diff --git a/langtools/test/tools/javac/cast/6932571/T6932571neg.java b/test/langtools/tools/javac/cast/6932571/T6932571neg.java similarity index 100% rename from langtools/test/tools/javac/cast/6932571/T6932571neg.java rename to test/langtools/tools/javac/cast/6932571/T6932571neg.java diff --git a/langtools/test/tools/javac/cast/6932571/T6932571neg.out b/test/langtools/tools/javac/cast/6932571/T6932571neg.out similarity index 100% rename from langtools/test/tools/javac/cast/6932571/T6932571neg.out rename to test/langtools/tools/javac/cast/6932571/T6932571neg.out diff --git a/langtools/test/tools/javac/cast/7005095/T7005095neg.java b/test/langtools/tools/javac/cast/7005095/T7005095neg.java similarity index 100% rename from langtools/test/tools/javac/cast/7005095/T7005095neg.java rename to test/langtools/tools/javac/cast/7005095/T7005095neg.java diff --git a/langtools/test/tools/javac/cast/7005095/T7005095neg.out b/test/langtools/tools/javac/cast/7005095/T7005095neg.out similarity index 100% rename from langtools/test/tools/javac/cast/7005095/T7005095neg.out rename to test/langtools/tools/javac/cast/7005095/T7005095neg.out diff --git a/langtools/test/tools/javac/cast/7005095/T7005095pos.java b/test/langtools/tools/javac/cast/7005095/T7005095pos.java similarity index 100% rename from langtools/test/tools/javac/cast/7005095/T7005095pos.java rename to test/langtools/tools/javac/cast/7005095/T7005095pos.java diff --git a/langtools/test/tools/javac/cast/7005671/T7005671.java b/test/langtools/tools/javac/cast/7005671/T7005671.java similarity index 100% rename from langtools/test/tools/javac/cast/7005671/T7005671.java rename to test/langtools/tools/javac/cast/7005671/T7005671.java diff --git a/langtools/test/tools/javac/cast/7005671/T7005671.out b/test/langtools/tools/javac/cast/7005671/T7005671.out similarity index 100% rename from langtools/test/tools/javac/cast/7005671/T7005671.out rename to test/langtools/tools/javac/cast/7005671/T7005671.out diff --git a/langtools/test/tools/javac/cast/7123100/T7123100a.java b/test/langtools/tools/javac/cast/7123100/T7123100a.java similarity index 100% rename from langtools/test/tools/javac/cast/7123100/T7123100a.java rename to test/langtools/tools/javac/cast/7123100/T7123100a.java diff --git a/langtools/test/tools/javac/cast/7123100/T7123100a.out b/test/langtools/tools/javac/cast/7123100/T7123100a.out similarity index 100% rename from langtools/test/tools/javac/cast/7123100/T7123100a.out rename to test/langtools/tools/javac/cast/7123100/T7123100a.out diff --git a/langtools/test/tools/javac/cast/7123100/T7123100b.java b/test/langtools/tools/javac/cast/7123100/T7123100b.java similarity index 100% rename from langtools/test/tools/javac/cast/7123100/T7123100b.java rename to test/langtools/tools/javac/cast/7123100/T7123100b.java diff --git a/langtools/test/tools/javac/cast/7123100/T7123100b.out b/test/langtools/tools/javac/cast/7123100/T7123100b.out similarity index 100% rename from langtools/test/tools/javac/cast/7123100/T7123100b.out rename to test/langtools/tools/javac/cast/7123100/T7123100b.out diff --git a/langtools/test/tools/javac/cast/7123100/T7123100c.java b/test/langtools/tools/javac/cast/7123100/T7123100c.java similarity index 100% rename from langtools/test/tools/javac/cast/7123100/T7123100c.java rename to test/langtools/tools/javac/cast/7123100/T7123100c.java diff --git a/langtools/test/tools/javac/cast/7123100/T7123100c.out b/test/langtools/tools/javac/cast/7123100/T7123100c.out similarity index 100% rename from langtools/test/tools/javac/cast/7123100/T7123100c.out rename to test/langtools/tools/javac/cast/7123100/T7123100c.out diff --git a/langtools/test/tools/javac/cast/7123100/T7123100d.java b/test/langtools/tools/javac/cast/7123100/T7123100d.java similarity index 100% rename from langtools/test/tools/javac/cast/7123100/T7123100d.java rename to test/langtools/tools/javac/cast/7123100/T7123100d.java diff --git a/langtools/test/tools/javac/cast/7123100/T7123100d.out b/test/langtools/tools/javac/cast/7123100/T7123100d.out similarity index 100% rename from langtools/test/tools/javac/cast/7123100/T7123100d.out rename to test/langtools/tools/javac/cast/7123100/T7123100d.out diff --git a/langtools/test/tools/javac/cast/7126754/T7126754.java b/test/langtools/tools/javac/cast/7126754/T7126754.java similarity index 100% rename from langtools/test/tools/javac/cast/7126754/T7126754.java rename to test/langtools/tools/javac/cast/7126754/T7126754.java diff --git a/langtools/test/tools/javac/cast/7126754/T7126754.out b/test/langtools/tools/javac/cast/7126754/T7126754.out similarity index 100% rename from langtools/test/tools/javac/cast/7126754/T7126754.out rename to test/langtools/tools/javac/cast/7126754/T7126754.out diff --git a/langtools/test/tools/javac/cast/8141343/T8141343.java b/test/langtools/tools/javac/cast/8141343/T8141343.java similarity index 100% rename from langtools/test/tools/javac/cast/8141343/T8141343.java rename to test/langtools/tools/javac/cast/8141343/T8141343.java diff --git a/langtools/test/tools/javac/cast/8141343/T8141343.out b/test/langtools/tools/javac/cast/8141343/T8141343.out similarity index 100% rename from langtools/test/tools/javac/cast/8141343/T8141343.out rename to test/langtools/tools/javac/cast/8141343/T8141343.out diff --git a/langtools/test/tools/javac/cast/BoxedArray.java b/test/langtools/tools/javac/cast/BoxedArray.java similarity index 100% rename from langtools/test/tools/javac/cast/BoxedArray.java rename to test/langtools/tools/javac/cast/BoxedArray.java diff --git a/langtools/test/tools/javac/cast/BoxedArray.out b/test/langtools/tools/javac/cast/BoxedArray.out similarity index 100% rename from langtools/test/tools/javac/cast/BoxedArray.out rename to test/langtools/tools/javac/cast/BoxedArray.out diff --git a/langtools/test/tools/javac/cast/forum/T654170.java b/test/langtools/tools/javac/cast/forum/T654170.java similarity index 100% rename from langtools/test/tools/javac/cast/forum/T654170.java rename to test/langtools/tools/javac/cast/forum/T654170.java diff --git a/langtools/test/tools/javac/cast/intersection/IntersectionTypeCastTest.java b/test/langtools/tools/javac/cast/intersection/IntersectionTypeCastTest.java similarity index 100% rename from langtools/test/tools/javac/cast/intersection/IntersectionTypeCastTest.java rename to test/langtools/tools/javac/cast/intersection/IntersectionTypeCastTest.java diff --git a/langtools/test/tools/javac/cast/intersection/IntersectionTypeParserTest.java b/test/langtools/tools/javac/cast/intersection/IntersectionTypeParserTest.java similarity index 100% rename from langtools/test/tools/javac/cast/intersection/IntersectionTypeParserTest.java rename to test/langtools/tools/javac/cast/intersection/IntersectionTypeParserTest.java diff --git a/langtools/test/tools/javac/cast/intersection/model/Check.java b/test/langtools/tools/javac/cast/intersection/model/Check.java similarity index 100% rename from langtools/test/tools/javac/cast/intersection/model/Check.java rename to test/langtools/tools/javac/cast/intersection/model/Check.java diff --git a/langtools/test/tools/javac/cast/intersection/model/IntersectionTypeInfo.java b/test/langtools/tools/javac/cast/intersection/model/IntersectionTypeInfo.java similarity index 100% rename from langtools/test/tools/javac/cast/intersection/model/IntersectionTypeInfo.java rename to test/langtools/tools/javac/cast/intersection/model/IntersectionTypeInfo.java diff --git a/langtools/test/tools/javac/cast/intersection/model/Member.java b/test/langtools/tools/javac/cast/intersection/model/Member.java similarity index 100% rename from langtools/test/tools/javac/cast/intersection/model/Member.java rename to test/langtools/tools/javac/cast/intersection/model/Member.java diff --git a/langtools/test/tools/javac/cast/intersection/model/Model01.java b/test/langtools/tools/javac/cast/intersection/model/Model01.java similarity index 100% rename from langtools/test/tools/javac/cast/intersection/model/Model01.java rename to test/langtools/tools/javac/cast/intersection/model/Model01.java diff --git a/langtools/test/tools/javac/cast/intersection/model/ModelChecker.java b/test/langtools/tools/javac/cast/intersection/model/ModelChecker.java similarity index 100% rename from langtools/test/tools/javac/cast/intersection/model/ModelChecker.java rename to test/langtools/tools/javac/cast/intersection/model/ModelChecker.java diff --git a/langtools/test/tools/javac/classfiles/ClassVersionChecker.java b/test/langtools/tools/javac/classfiles/ClassVersionChecker.java similarity index 100% rename from langtools/test/tools/javac/classfiles/ClassVersionChecker.java rename to test/langtools/tools/javac/classfiles/ClassVersionChecker.java diff --git a/langtools/test/tools/javac/classfiles/InnerClasses/SyntheticClasses.java b/test/langtools/tools/javac/classfiles/InnerClasses/SyntheticClasses.java similarity index 100% rename from langtools/test/tools/javac/classfiles/InnerClasses/SyntheticClasses.java rename to test/langtools/tools/javac/classfiles/InnerClasses/SyntheticClasses.java diff --git a/langtools/test/tools/javac/classfiles/InnerClasses/T8068517.java b/test/langtools/tools/javac/classfiles/InnerClasses/T8068517.java similarity index 100% rename from langtools/test/tools/javac/classfiles/InnerClasses/T8068517.java rename to test/langtools/tools/javac/classfiles/InnerClasses/T8068517.java diff --git a/langtools/test/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefault.java.template b/test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefault.java.template similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefault.java.template rename to test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefault.java.template diff --git a/langtools/test/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java b/test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java rename to test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultVerifier.java b/test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultVerifier.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultVerifier.java rename to test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultVerifier.java diff --git a/langtools/test/tools/javac/classfiles/attributes/AnnotationDefault/ExpectedValues.java b/test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/ExpectedValues.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/AnnotationDefault/ExpectedValues.java rename to test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/ExpectedValues.java diff --git a/langtools/test/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java b/test/langtools/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java rename to test/langtools/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/LineNumberTable/Container.java b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/Container.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/LineNumberTable/Container.java rename to test/langtools/tools/javac/classfiles/attributes/LineNumberTable/Container.java diff --git a/langtools/test/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java rename to test/langtools/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTestBase.java b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTestBase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTestBase.java rename to test/langtools/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTestBase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/LineNumberTable/T8050993.java b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/T8050993.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/LineNumberTable/T8050993.java rename to test/langtools/tools/javac/classfiles/attributes/LineNumberTable/T8050993.java diff --git a/langtools/test/tools/javac/classfiles/attributes/LineNumberTable/TestCase.java b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/TestCase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/LineNumberTable/TestCase.java rename to test/langtools/tools/javac/classfiles/attributes/LineNumberTable/TestCase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java b/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java rename to test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTestBase.java b/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTestBase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTestBase.java rename to test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTestBase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java b/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java rename to test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T.jcod b/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T.jcod similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T.jcod rename to test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T.jcod diff --git a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T8136453.java b/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T8136453.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T8136453.java rename to test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T8136453.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleFlagTest.java b/test/langtools/tools/javac/classfiles/attributes/Module/ModuleFlagTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Module/ModuleFlagTest.java rename to test/langtools/tools/javac/classfiles/attributes/Module/ModuleFlagTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTest.java b/test/langtools/tools/javac/classfiles/attributes/Module/ModuleTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Module/ModuleTest.java rename to test/langtools/tools/javac/classfiles/attributes/Module/ModuleTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java b/test/langtools/tools/javac/classfiles/attributes/Module/ModuleTestBase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java rename to test/langtools/tools/javac/classfiles/attributes/Module/ModuleTestBase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Signature/ConstructorTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/ConstructorTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Signature/ConstructorTest.java rename to test/langtools/tools/javac/classfiles/attributes/Signature/ConstructorTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Signature/Driver.java b/test/langtools/tools/javac/classfiles/attributes/Signature/Driver.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Signature/Driver.java rename to test/langtools/tools/javac/classfiles/attributes/Signature/Driver.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Signature/EnumTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/EnumTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Signature/EnumTest.java rename to test/langtools/tools/javac/classfiles/attributes/Signature/EnumTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Signature/ExceptionTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/ExceptionTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Signature/ExceptionTest.java rename to test/langtools/tools/javac/classfiles/attributes/Signature/ExceptionTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Signature/ExpectedSignature.java b/test/langtools/tools/javac/classfiles/attributes/Signature/ExpectedSignature.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Signature/ExpectedSignature.java rename to test/langtools/tools/javac/classfiles/attributes/Signature/ExpectedSignature.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Signature/ExpectedSignatureContainer.java b/test/langtools/tools/javac/classfiles/attributes/Signature/ExpectedSignatureContainer.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Signature/ExpectedSignatureContainer.java rename to test/langtools/tools/javac/classfiles/attributes/Signature/ExpectedSignatureContainer.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Signature/FieldTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/FieldTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Signature/FieldTest.java rename to test/langtools/tools/javac/classfiles/attributes/Signature/FieldTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Signature/InnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/InnerClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Signature/InnerClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/Signature/InnerClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java rename to test/langtools/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java rename to test/langtools/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java rename to test/langtools/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/MixTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/MixTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/SourceFile/MixTest.java rename to test/langtools/tools/javac/classfiles/attributes/SourceFile/MixTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/ModuleInfoTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/ModuleInfoTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/SourceFile/ModuleInfoTest.java rename to test/langtools/tools/javac/classfiles/attributes/SourceFile/ModuleInfoTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java rename to test/langtools/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/SourceFileTestBase.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/SourceFileTestBase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/SourceFile/SourceFileTestBase.java rename to test/langtools/tools/javac/classfiles/attributes/SourceFile/SourceFileTestBase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java rename to test/langtools/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassMembersTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassMembersTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassMembersTest.java rename to test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassMembersTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateSiblingsTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateSiblingsTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateSiblingsTest.java rename to test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateSiblingsTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Synthetic/AssertFieldTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AssertFieldTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Synthetic/AssertFieldTest.java rename to test/langtools/tools/javac/classfiles/attributes/Synthetic/AssertFieldTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Synthetic/BridgeMethodForGenericMethodTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodForGenericMethodTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Synthetic/BridgeMethodForGenericMethodTest.java rename to test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodForGenericMethodTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTest.java rename to test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Synthetic/EnumTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/EnumTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Synthetic/EnumTest.java rename to test/langtools/tools/javac/classfiles/attributes/Synthetic/EnumTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Synthetic/ExpectedClass.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/ExpectedClass.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Synthetic/ExpectedClass.java rename to test/langtools/tools/javac/classfiles/attributes/Synthetic/ExpectedClass.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Synthetic/ExpectedClasses.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/ExpectedClasses.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Synthetic/ExpectedClasses.java rename to test/langtools/tools/javac/classfiles/attributes/Synthetic/ExpectedClasses.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Synthetic/PackageInfoTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/PackageInfoTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Synthetic/PackageInfoTest.java rename to test/langtools/tools/javac/classfiles/attributes/Synthetic/PackageInfoTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Synthetic/SyntheticTestDriver.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/SyntheticTestDriver.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Synthetic/SyntheticTestDriver.java rename to test/langtools/tools/javac/classfiles/attributes/Synthetic/SyntheticTestDriver.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Synthetic/ThisFieldTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/ThisFieldTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Synthetic/ThisFieldTest.java rename to test/langtools/tools/javac/classfiles/attributes/Synthetic/ThisFieldTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/Synthetic/package_info_test/package-info.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/package_info_test/package-info.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/Synthetic/package_info_test/package-info.java rename to test/langtools/tools/javac/classfiles/attributes/Synthetic/package_info_test/package-info.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/AnnotationsTestBase.java b/test/langtools/tools/javac/classfiles/attributes/annotations/AnnotationsTestBase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/AnnotationsTestBase.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/AnnotationsTestBase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/ClassType.java b/test/langtools/tools/javac/classfiles/attributes/annotations/ClassType.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/ClassType.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/ClassType.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/README.txt b/test/langtools/tools/javac/classfiles/attributes/annotations/README.txt similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/README.txt rename to test/langtools/tools/javac/classfiles/attributes/annotations/README.txt diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForGenericMethodTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForGenericMethodTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForGenericMethodTest.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForGenericMethodTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerAnnotationTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerAnnotationTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerAnnotationTest.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerAnnotationTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerEnumTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerEnumTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerEnumTest.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerEnumTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerInterfaceTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerInterfaceTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerInterfaceTest.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerInterfaceTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForTopLevelClassTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForTopLevelClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForTopLevelClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForTopLevelClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsTestBase.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsTestBase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsTestBase.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsTestBase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForGenericMethodTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForGenericMethodTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForGenericMethodTest.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForGenericMethodTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForLambdaTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForLambdaTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForLambdaTest.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForLambdaTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTest.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTestBase.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTestBase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTestBase.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTestBase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/TestAnnotationInfo.java b/test/langtools/tools/javac/classfiles/attributes/annotations/TestAnnotationInfo.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/TestAnnotationInfo.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/TestAnnotationInfo.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/TestCase.java b/test/langtools/tools/javac/classfiles/attributes/annotations/TestCase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/TestCase.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/TestCase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/annotations/WorkAnnotations.java b/test/langtools/tools/javac/classfiles/attributes/annotations/WorkAnnotations.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/annotations/WorkAnnotations.java rename to test/langtools/tools/javac/classfiles/attributes/annotations/WorkAnnotations.java diff --git a/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java rename to test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java rename to test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTestBase.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTestBase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTestBase.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTestBase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTestBase.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesTestBase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTestBase.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesTestBase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/README.txt b/test/langtools/tools/javac/classfiles/attributes/innerclasses/README.txt similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/README.txt rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/README.txt diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/TestCase.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/TestCase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/innerclasses/TestCase.java rename to test/langtools/tools/javac/classfiles/attributes/innerclasses/TestCase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/lib/TestBase.java b/test/langtools/tools/javac/classfiles/attributes/lib/TestBase.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/lib/TestBase.java rename to test/langtools/tools/javac/classfiles/attributes/lib/TestBase.java diff --git a/langtools/test/tools/javac/classfiles/attributes/lib/TestResult.java b/test/langtools/tools/javac/classfiles/attributes/lib/TestResult.java similarity index 100% rename from langtools/test/tools/javac/classfiles/attributes/lib/TestResult.java rename to test/langtools/tools/javac/classfiles/attributes/lib/TestResult.java diff --git a/langtools/test/tools/javac/classreader/8171132/BadConstantValue.java b/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java similarity index 100% rename from langtools/test/tools/javac/classreader/8171132/BadConstantValue.java rename to test/langtools/tools/javac/classreader/8171132/BadConstantValue.java diff --git a/langtools/test/tools/javac/classreader/BadClass.java b/test/langtools/tools/javac/classreader/BadClass.java similarity index 100% rename from langtools/test/tools/javac/classreader/BadClass.java rename to test/langtools/tools/javac/classreader/BadClass.java diff --git a/langtools/test/tools/javac/classreader/FileSystemClosedTest.java b/test/langtools/tools/javac/classreader/FileSystemClosedTest.java similarity index 100% rename from langtools/test/tools/javac/classreader/FileSystemClosedTest.java rename to test/langtools/tools/javac/classreader/FileSystemClosedTest.java diff --git a/langtools/test/tools/javac/classreader/T7031108.java b/test/langtools/tools/javac/classreader/T7031108.java similarity index 100% rename from langtools/test/tools/javac/classreader/T7031108.java rename to test/langtools/tools/javac/classreader/T7031108.java diff --git a/langtools/test/tools/javac/code/ArrayClone.java b/test/langtools/tools/javac/code/ArrayClone.java similarity index 100% rename from langtools/test/tools/javac/code/ArrayClone.java rename to test/langtools/tools/javac/code/ArrayClone.java diff --git a/langtools/test/tools/javac/completionDeps/DepsAndAnno.java b/test/langtools/tools/javac/completionDeps/DepsAndAnno.java similarity index 100% rename from langtools/test/tools/javac/completionDeps/DepsAndAnno.java rename to test/langtools/tools/javac/completionDeps/DepsAndAnno.java diff --git a/langtools/test/tools/javac/completionDeps/DepsAndDocLint.java b/test/langtools/tools/javac/completionDeps/DepsAndDocLint.java similarity index 100% rename from langtools/test/tools/javac/completionDeps/DepsAndDocLint.java rename to test/langtools/tools/javac/completionDeps/DepsAndDocLint.java diff --git a/langtools/test/tools/javac/conditional/6500343/T6500343a.java b/test/langtools/tools/javac/conditional/6500343/T6500343a.java similarity index 100% rename from langtools/test/tools/javac/conditional/6500343/T6500343a.java rename to test/langtools/tools/javac/conditional/6500343/T6500343a.java diff --git a/langtools/test/tools/javac/conditional/6500343/T6500343b.java b/test/langtools/tools/javac/conditional/6500343/T6500343b.java similarity index 100% rename from langtools/test/tools/javac/conditional/6500343/T6500343b.java rename to test/langtools/tools/javac/conditional/6500343/T6500343b.java diff --git a/langtools/test/tools/javac/conditional/8064464/T8064464.java b/test/langtools/tools/javac/conditional/8064464/T8064464.java similarity index 100% rename from langtools/test/tools/javac/conditional/8064464/T8064464.java rename to test/langtools/tools/javac/conditional/8064464/T8064464.java diff --git a/langtools/test/tools/javac/conditional/8064464/T8064464.out b/test/langtools/tools/javac/conditional/8064464/T8064464.out similarity index 100% rename from langtools/test/tools/javac/conditional/8064464/T8064464.out rename to test/langtools/tools/javac/conditional/8064464/T8064464.out diff --git a/langtools/test/tools/javac/conditional/Conditional.java b/test/langtools/tools/javac/conditional/Conditional.java similarity index 100% rename from langtools/test/tools/javac/conditional/Conditional.java rename to test/langtools/tools/javac/conditional/Conditional.java diff --git a/langtools/test/tools/javac/conditional/Conditional.out b/test/langtools/tools/javac/conditional/Conditional.out similarity index 100% rename from langtools/test/tools/javac/conditional/Conditional.out rename to test/langtools/tools/javac/conditional/Conditional.out diff --git a/langtools/test/tools/javac/conditional/ConditionalWithFinalStrings.java b/test/langtools/tools/javac/conditional/ConditionalWithFinalStrings.java similarity index 100% rename from langtools/test/tools/javac/conditional/ConditionalWithFinalStrings.java rename to test/langtools/tools/javac/conditional/ConditionalWithFinalStrings.java diff --git a/langtools/test/tools/javac/conditional/T8016702.java b/test/langtools/tools/javac/conditional/T8016702.java similarity index 100% rename from langtools/test/tools/javac/conditional/T8016702.java rename to test/langtools/tools/javac/conditional/T8016702.java diff --git a/langtools/test/tools/javac/constDebug/ConstDebugTest.java b/test/langtools/tools/javac/constDebug/ConstDebugTest.java similarity index 100% rename from langtools/test/tools/javac/constDebug/ConstDebugTest.java rename to test/langtools/tools/javac/constDebug/ConstDebugTest.java diff --git a/langtools/test/tools/javac/crossPackageImpl/CrossPackageImplA.java b/test/langtools/tools/javac/crossPackageImpl/CrossPackageImplA.java similarity index 100% rename from langtools/test/tools/javac/crossPackageImpl/CrossPackageImplA.java rename to test/langtools/tools/javac/crossPackageImpl/CrossPackageImplA.java diff --git a/langtools/test/tools/javac/crossPackageImpl/CrossPackageImplB.java b/test/langtools/tools/javac/crossPackageImpl/CrossPackageImplB.java similarity index 100% rename from langtools/test/tools/javac/crossPackageImpl/CrossPackageImplB.java rename to test/langtools/tools/javac/crossPackageImpl/CrossPackageImplB.java diff --git a/langtools/test/tools/javac/danglingDep/DepX.java b/test/langtools/tools/javac/danglingDep/DepX.java similarity index 100% rename from langtools/test/tools/javac/danglingDep/DepX.java rename to test/langtools/tools/javac/danglingDep/DepX.java diff --git a/langtools/test/tools/javac/danglingDep/DepX.out b/test/langtools/tools/javac/danglingDep/DepX.out similarity index 100% rename from langtools/test/tools/javac/danglingDep/DepX.out rename to test/langtools/tools/javac/danglingDep/DepX.out diff --git a/langtools/test/tools/javac/danglingDep/NoDepX.java b/test/langtools/tools/javac/danglingDep/NoDepX.java similarity index 100% rename from langtools/test/tools/javac/danglingDep/NoDepX.java rename to test/langtools/tools/javac/danglingDep/NoDepX.java diff --git a/langtools/test/tools/javac/danglingDep/NoDepX.out b/test/langtools/tools/javac/danglingDep/NoDepX.out similarity index 100% rename from langtools/test/tools/javac/danglingDep/NoDepX.out rename to test/langtools/tools/javac/danglingDep/NoDepX.out diff --git a/langtools/test/tools/javac/danglingDep/RefX.java b/test/langtools/tools/javac/danglingDep/RefX.java similarity index 100% rename from langtools/test/tools/javac/danglingDep/RefX.java rename to test/langtools/tools/javac/danglingDep/RefX.java diff --git a/langtools/test/tools/javac/danglingDep/Test1.java b/test/langtools/tools/javac/danglingDep/Test1.java similarity index 100% rename from langtools/test/tools/javac/danglingDep/Test1.java rename to test/langtools/tools/javac/danglingDep/Test1.java diff --git a/langtools/test/tools/javac/danglingDep/Test1.out b/test/langtools/tools/javac/danglingDep/Test1.out similarity index 100% rename from langtools/test/tools/javac/danglingDep/Test1.out rename to test/langtools/tools/javac/danglingDep/Test1.out diff --git a/langtools/test/tools/javac/declaration/method/MethodVoidParameter.java b/test/langtools/tools/javac/declaration/method/MethodVoidParameter.java similarity index 100% rename from langtools/test/tools/javac/declaration/method/MethodVoidParameter.java rename to test/langtools/tools/javac/declaration/method/MethodVoidParameter.java diff --git a/langtools/test/tools/javac/declaration/method/MethodVoidParameter.out b/test/langtools/tools/javac/declaration/method/MethodVoidParameter.out similarity index 100% rename from langtools/test/tools/javac/declaration/method/MethodVoidParameter.out rename to test/langtools/tools/javac/declaration/method/MethodVoidParameter.out diff --git a/langtools/test/tools/javac/defaultMethods/Assertions.java b/test/langtools/tools/javac/defaultMethods/Assertions.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Assertions.java rename to test/langtools/tools/javac/defaultMethods/Assertions.java diff --git a/langtools/test/tools/javac/defaultMethods/AssertionsTest.java b/test/langtools/tools/javac/defaultMethods/AssertionsTest.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/AssertionsTest.java rename to test/langtools/tools/javac/defaultMethods/AssertionsTest.java diff --git a/langtools/test/tools/javac/defaultMethods/BadClassfile.java b/test/langtools/tools/javac/defaultMethods/BadClassfile.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/BadClassfile.java rename to test/langtools/tools/javac/defaultMethods/BadClassfile.java diff --git a/langtools/test/tools/javac/defaultMethods/CannotChangeAssertionsStateAfterInitialized.java b/test/langtools/tools/javac/defaultMethods/CannotChangeAssertionsStateAfterInitialized.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/CannotChangeAssertionsStateAfterInitialized.java rename to test/langtools/tools/javac/defaultMethods/CannotChangeAssertionsStateAfterInitialized.java diff --git a/langtools/test/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java b/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java rename to test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java diff --git a/langtools/test/tools/javac/defaultMethods/ClassReaderTest/ClassReaderTest.java b/test/langtools/tools/javac/defaultMethods/ClassReaderTest/ClassReaderTest.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/ClassReaderTest/ClassReaderTest.java rename to test/langtools/tools/javac/defaultMethods/ClassReaderTest/ClassReaderTest.java diff --git a/langtools/test/tools/javac/defaultMethods/ClassReaderTest/pkg/Foo.java b/test/langtools/tools/javac/defaultMethods/ClassReaderTest/pkg/Foo.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/ClassReaderTest/pkg/Foo.java rename to test/langtools/tools/javac/defaultMethods/ClassReaderTest/pkg/Foo.java diff --git a/langtools/test/tools/javac/defaultMethods/DefaultMethodFlags.java b/test/langtools/tools/javac/defaultMethods/DefaultMethodFlags.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/DefaultMethodFlags.java rename to test/langtools/tools/javac/defaultMethods/DefaultMethodFlags.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg01.java b/test/langtools/tools/javac/defaultMethods/Neg01.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg01.java rename to test/langtools/tools/javac/defaultMethods/Neg01.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg01.out b/test/langtools/tools/javac/defaultMethods/Neg01.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg01.out rename to test/langtools/tools/javac/defaultMethods/Neg01.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg02.java b/test/langtools/tools/javac/defaultMethods/Neg02.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg02.java rename to test/langtools/tools/javac/defaultMethods/Neg02.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg02.out b/test/langtools/tools/javac/defaultMethods/Neg02.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg02.out rename to test/langtools/tools/javac/defaultMethods/Neg02.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg03.java b/test/langtools/tools/javac/defaultMethods/Neg03.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg03.java rename to test/langtools/tools/javac/defaultMethods/Neg03.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg03.out b/test/langtools/tools/javac/defaultMethods/Neg03.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg03.out rename to test/langtools/tools/javac/defaultMethods/Neg03.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg04.java b/test/langtools/tools/javac/defaultMethods/Neg04.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg04.java rename to test/langtools/tools/javac/defaultMethods/Neg04.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg04.out b/test/langtools/tools/javac/defaultMethods/Neg04.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg04.out rename to test/langtools/tools/javac/defaultMethods/Neg04.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg05.java b/test/langtools/tools/javac/defaultMethods/Neg05.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg05.java rename to test/langtools/tools/javac/defaultMethods/Neg05.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg05.out b/test/langtools/tools/javac/defaultMethods/Neg05.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg05.out rename to test/langtools/tools/javac/defaultMethods/Neg05.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg06.java b/test/langtools/tools/javac/defaultMethods/Neg06.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg06.java rename to test/langtools/tools/javac/defaultMethods/Neg06.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg06.out b/test/langtools/tools/javac/defaultMethods/Neg06.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg06.out rename to test/langtools/tools/javac/defaultMethods/Neg06.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg07.java b/test/langtools/tools/javac/defaultMethods/Neg07.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg07.java rename to test/langtools/tools/javac/defaultMethods/Neg07.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg07.out b/test/langtools/tools/javac/defaultMethods/Neg07.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg07.out rename to test/langtools/tools/javac/defaultMethods/Neg07.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg08.java b/test/langtools/tools/javac/defaultMethods/Neg08.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg08.java rename to test/langtools/tools/javac/defaultMethods/Neg08.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg08.out b/test/langtools/tools/javac/defaultMethods/Neg08.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg08.out rename to test/langtools/tools/javac/defaultMethods/Neg08.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg09.java b/test/langtools/tools/javac/defaultMethods/Neg09.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg09.java rename to test/langtools/tools/javac/defaultMethods/Neg09.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg09.out b/test/langtools/tools/javac/defaultMethods/Neg09.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg09.out rename to test/langtools/tools/javac/defaultMethods/Neg09.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg10.java b/test/langtools/tools/javac/defaultMethods/Neg10.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg10.java rename to test/langtools/tools/javac/defaultMethods/Neg10.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg10.out b/test/langtools/tools/javac/defaultMethods/Neg10.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg10.out rename to test/langtools/tools/javac/defaultMethods/Neg10.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg11.java b/test/langtools/tools/javac/defaultMethods/Neg11.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg11.java rename to test/langtools/tools/javac/defaultMethods/Neg11.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg11.out b/test/langtools/tools/javac/defaultMethods/Neg11.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg11.out rename to test/langtools/tools/javac/defaultMethods/Neg11.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg12.java b/test/langtools/tools/javac/defaultMethods/Neg12.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg12.java rename to test/langtools/tools/javac/defaultMethods/Neg12.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg12.out b/test/langtools/tools/javac/defaultMethods/Neg12.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg12.out rename to test/langtools/tools/javac/defaultMethods/Neg12.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg13.java b/test/langtools/tools/javac/defaultMethods/Neg13.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg13.java rename to test/langtools/tools/javac/defaultMethods/Neg13.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg13.out b/test/langtools/tools/javac/defaultMethods/Neg13.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg13.out rename to test/langtools/tools/javac/defaultMethods/Neg13.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg14.java b/test/langtools/tools/javac/defaultMethods/Neg14.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg14.java rename to test/langtools/tools/javac/defaultMethods/Neg14.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg14.out b/test/langtools/tools/javac/defaultMethods/Neg14.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg14.out rename to test/langtools/tools/javac/defaultMethods/Neg14.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg15.java b/test/langtools/tools/javac/defaultMethods/Neg15.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg15.java rename to test/langtools/tools/javac/defaultMethods/Neg15.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg15.out b/test/langtools/tools/javac/defaultMethods/Neg15.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg15.out rename to test/langtools/tools/javac/defaultMethods/Neg15.out diff --git a/langtools/test/tools/javac/defaultMethods/Neg16.java b/test/langtools/tools/javac/defaultMethods/Neg16.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg16.java rename to test/langtools/tools/javac/defaultMethods/Neg16.java diff --git a/langtools/test/tools/javac/defaultMethods/Neg16.out b/test/langtools/tools/javac/defaultMethods/Neg16.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Neg16.out rename to test/langtools/tools/javac/defaultMethods/Neg16.out diff --git a/langtools/test/tools/javac/defaultMethods/Pos01.java b/test/langtools/tools/javac/defaultMethods/Pos01.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos01.java rename to test/langtools/tools/javac/defaultMethods/Pos01.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos02.java b/test/langtools/tools/javac/defaultMethods/Pos02.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos02.java rename to test/langtools/tools/javac/defaultMethods/Pos02.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos04.java b/test/langtools/tools/javac/defaultMethods/Pos04.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos04.java rename to test/langtools/tools/javac/defaultMethods/Pos04.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos05.java b/test/langtools/tools/javac/defaultMethods/Pos05.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos05.java rename to test/langtools/tools/javac/defaultMethods/Pos05.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos06.java b/test/langtools/tools/javac/defaultMethods/Pos06.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos06.java rename to test/langtools/tools/javac/defaultMethods/Pos06.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos07.java b/test/langtools/tools/javac/defaultMethods/Pos07.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos07.java rename to test/langtools/tools/javac/defaultMethods/Pos07.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos08.java b/test/langtools/tools/javac/defaultMethods/Pos08.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos08.java rename to test/langtools/tools/javac/defaultMethods/Pos08.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos10.java b/test/langtools/tools/javac/defaultMethods/Pos10.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos10.java rename to test/langtools/tools/javac/defaultMethods/Pos10.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos11.java b/test/langtools/tools/javac/defaultMethods/Pos11.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos11.java rename to test/langtools/tools/javac/defaultMethods/Pos11.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos12.java b/test/langtools/tools/javac/defaultMethods/Pos12.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos12.java rename to test/langtools/tools/javac/defaultMethods/Pos12.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos13.java b/test/langtools/tools/javac/defaultMethods/Pos13.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos13.java rename to test/langtools/tools/javac/defaultMethods/Pos13.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos14.java b/test/langtools/tools/javac/defaultMethods/Pos14.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos14.java rename to test/langtools/tools/javac/defaultMethods/Pos14.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos15.java b/test/langtools/tools/javac/defaultMethods/Pos15.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos15.java rename to test/langtools/tools/javac/defaultMethods/Pos15.java diff --git a/langtools/test/tools/javac/defaultMethods/Pos16.java b/test/langtools/tools/javac/defaultMethods/Pos16.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/Pos16.java rename to test/langtools/tools/javac/defaultMethods/Pos16.java diff --git a/langtools/test/tools/javac/defaultMethods/TestDefaultBody.java b/test/langtools/tools/javac/defaultMethods/TestDefaultBody.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/TestDefaultBody.java rename to test/langtools/tools/javac/defaultMethods/TestDefaultBody.java diff --git a/langtools/test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java b/test/langtools/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java rename to test/langtools/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java diff --git a/langtools/test/tools/javac/defaultMethods/crossCompile/Clinit.java b/test/langtools/tools/javac/defaultMethods/crossCompile/Clinit.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/crossCompile/Clinit.java rename to test/langtools/tools/javac/defaultMethods/crossCompile/Clinit.java diff --git a/langtools/test/tools/javac/defaultMethods/crossCompile/CrossCompile.java b/test/langtools/tools/javac/defaultMethods/crossCompile/CrossCompile.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/crossCompile/CrossCompile.java rename to test/langtools/tools/javac/defaultMethods/crossCompile/CrossCompile.java diff --git a/langtools/test/tools/javac/defaultMethods/private/Private01.java b/test/langtools/tools/javac/defaultMethods/private/Private01.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private01.java rename to test/langtools/tools/javac/defaultMethods/private/Private01.java diff --git a/langtools/test/tools/javac/defaultMethods/private/Private02.java b/test/langtools/tools/javac/defaultMethods/private/Private02.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private02.java rename to test/langtools/tools/javac/defaultMethods/private/Private02.java diff --git a/langtools/test/tools/javac/defaultMethods/private/Private02.out b/test/langtools/tools/javac/defaultMethods/private/Private02.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private02.out rename to test/langtools/tools/javac/defaultMethods/private/Private02.out diff --git a/langtools/test/tools/javac/defaultMethods/private/Private03.java b/test/langtools/tools/javac/defaultMethods/private/Private03.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private03.java rename to test/langtools/tools/javac/defaultMethods/private/Private03.java diff --git a/langtools/test/tools/javac/defaultMethods/private/Private03.out b/test/langtools/tools/javac/defaultMethods/private/Private03.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private03.out rename to test/langtools/tools/javac/defaultMethods/private/Private03.out diff --git a/langtools/test/tools/javac/defaultMethods/private/Private04.java b/test/langtools/tools/javac/defaultMethods/private/Private04.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private04.java rename to test/langtools/tools/javac/defaultMethods/private/Private04.java diff --git a/langtools/test/tools/javac/defaultMethods/private/Private05.java b/test/langtools/tools/javac/defaultMethods/private/Private05.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private05.java rename to test/langtools/tools/javac/defaultMethods/private/Private05.java diff --git a/langtools/test/tools/javac/defaultMethods/private/Private06.java b/test/langtools/tools/javac/defaultMethods/private/Private06.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private06.java rename to test/langtools/tools/javac/defaultMethods/private/Private06.java diff --git a/langtools/test/tools/javac/defaultMethods/private/Private06.out b/test/langtools/tools/javac/defaultMethods/private/Private06.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private06.out rename to test/langtools/tools/javac/defaultMethods/private/Private06.out diff --git a/langtools/test/tools/javac/defaultMethods/private/Private07.java b/test/langtools/tools/javac/defaultMethods/private/Private07.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private07.java rename to test/langtools/tools/javac/defaultMethods/private/Private07.java diff --git a/langtools/test/tools/javac/defaultMethods/private/Private07.out b/test/langtools/tools/javac/defaultMethods/private/Private07.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private07.out rename to test/langtools/tools/javac/defaultMethods/private/Private07.out diff --git a/langtools/test/tools/javac/defaultMethods/private/Private08.java b/test/langtools/tools/javac/defaultMethods/private/Private08.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private08.java rename to test/langtools/tools/javac/defaultMethods/private/Private08.java diff --git a/langtools/test/tools/javac/defaultMethods/private/Private08.out b/test/langtools/tools/javac/defaultMethods/private/Private08.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private08.out rename to test/langtools/tools/javac/defaultMethods/private/Private08.out diff --git a/langtools/test/tools/javac/defaultMethods/private/Private09.java b/test/langtools/tools/javac/defaultMethods/private/Private09.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private09.java rename to test/langtools/tools/javac/defaultMethods/private/Private09.java diff --git a/langtools/test/tools/javac/defaultMethods/private/Private09.out b/test/langtools/tools/javac/defaultMethods/private/Private09.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private09.out rename to test/langtools/tools/javac/defaultMethods/private/Private09.out diff --git a/langtools/test/tools/javac/defaultMethods/private/Private10.java b/test/langtools/tools/javac/defaultMethods/private/Private10.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private10.java rename to test/langtools/tools/javac/defaultMethods/private/Private10.java diff --git a/langtools/test/tools/javac/defaultMethods/private/Private10.out b/test/langtools/tools/javac/defaultMethods/private/Private10.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/Private10.out rename to test/langtools/tools/javac/defaultMethods/private/Private10.out diff --git a/langtools/test/tools/javac/defaultMethods/private/PrivateGenerics.java b/test/langtools/tools/javac/defaultMethods/private/PrivateGenerics.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/PrivateGenerics.java rename to test/langtools/tools/javac/defaultMethods/private/PrivateGenerics.java diff --git a/langtools/test/tools/javac/defaultMethods/private/PrivateInterfaceMethodProcessorTest.java b/test/langtools/tools/javac/defaultMethods/private/PrivateInterfaceMethodProcessorTest.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/private/PrivateInterfaceMethodProcessorTest.java rename to test/langtools/tools/javac/defaultMethods/private/PrivateInterfaceMethodProcessorTest.java diff --git a/langtools/test/tools/javac/defaultMethods/separate/Separate.java b/test/langtools/tools/javac/defaultMethods/separate/Separate.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/separate/Separate.java rename to test/langtools/tools/javac/defaultMethods/separate/Separate.java diff --git a/langtools/test/tools/javac/defaultMethods/separate/pkg1/A.java b/test/langtools/tools/javac/defaultMethods/separate/pkg1/A.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/separate/pkg1/A.java rename to test/langtools/tools/javac/defaultMethods/separate/pkg1/A.java diff --git a/langtools/test/tools/javac/defaultMethods/static/Static01.java b/test/langtools/tools/javac/defaultMethods/static/Static01.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/Static01.java rename to test/langtools/tools/javac/defaultMethods/static/Static01.java diff --git a/langtools/test/tools/javac/defaultMethods/static/Static02.java b/test/langtools/tools/javac/defaultMethods/static/Static02.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/Static02.java rename to test/langtools/tools/javac/defaultMethods/static/Static02.java diff --git a/langtools/test/tools/javac/defaultMethods/static/Static02.out b/test/langtools/tools/javac/defaultMethods/static/Static02.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/Static02.out rename to test/langtools/tools/javac/defaultMethods/static/Static02.out diff --git a/langtools/test/tools/javac/defaultMethods/static/StaticInvokeQualified.java b/test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/StaticInvokeQualified.java rename to test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified.java diff --git a/langtools/test/tools/javac/defaultMethods/static/StaticInvokeQualified6.out b/test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified6.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/StaticInvokeQualified6.out rename to test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified6.out diff --git a/langtools/test/tools/javac/defaultMethods/static/StaticInvokeQualified7.out b/test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified7.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/StaticInvokeQualified7.out rename to test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified7.out diff --git a/langtools/test/tools/javac/defaultMethods/static/StaticInvokeSimple.java b/test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/StaticInvokeSimple.java rename to test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple.java diff --git a/langtools/test/tools/javac/defaultMethods/static/StaticInvokeSimple6.out b/test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple6.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/StaticInvokeSimple6.out rename to test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple6.out diff --git a/langtools/test/tools/javac/defaultMethods/static/StaticInvokeSimple7.out b/test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple7.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/StaticInvokeSimple7.out rename to test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple7.out diff --git a/langtools/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java b/test/langtools/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java rename to test/langtools/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java diff --git a/langtools/test/tools/javac/defaultMethods/static/import/StaticImport1.java b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport1.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/import/StaticImport1.java rename to test/langtools/tools/javac/defaultMethods/static/import/StaticImport1.java diff --git a/langtools/test/tools/javac/defaultMethods/static/import/StaticImport2.java b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport2.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/import/StaticImport2.java rename to test/langtools/tools/javac/defaultMethods/static/import/StaticImport2.java diff --git a/langtools/test/tools/javac/defaultMethods/static/import/StaticImport2.out b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport2.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/import/StaticImport2.out rename to test/langtools/tools/javac/defaultMethods/static/import/StaticImport2.out diff --git a/langtools/test/tools/javac/defaultMethods/static/import/StaticImport3.java b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport3.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/import/StaticImport3.java rename to test/langtools/tools/javac/defaultMethods/static/import/StaticImport3.java diff --git a/langtools/test/tools/javac/defaultMethods/static/import/StaticImport3.out b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport3.out similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/import/StaticImport3.out rename to test/langtools/tools/javac/defaultMethods/static/import/StaticImport3.out diff --git a/langtools/test/tools/javac/defaultMethods/static/import/pkg/A.java b/test/langtools/tools/javac/defaultMethods/static/import/pkg/A.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/import/pkg/A.java rename to test/langtools/tools/javac/defaultMethods/static/import/pkg/A.java diff --git a/langtools/test/tools/javac/defaultMethods/static/import/pkg/B.java b/test/langtools/tools/javac/defaultMethods/static/import/pkg/B.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/import/pkg/B.java rename to test/langtools/tools/javac/defaultMethods/static/import/pkg/B.java diff --git a/langtools/test/tools/javac/defaultMethods/static/import/pkg/C.java b/test/langtools/tools/javac/defaultMethods/static/import/pkg/C.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/static/import/pkg/C.java rename to test/langtools/tools/javac/defaultMethods/static/import/pkg/C.java diff --git a/langtools/test/tools/javac/defaultMethods/super/TestDefaultSuperCall.java b/test/langtools/tools/javac/defaultMethods/super/TestDefaultSuperCall.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/super/TestDefaultSuperCall.java rename to test/langtools/tools/javac/defaultMethods/super/TestDefaultSuperCall.java diff --git a/langtools/test/tools/javac/defaultMethods/super/TestDirectSuperInterfaceInvoke.java b/test/langtools/tools/javac/defaultMethods/super/TestDirectSuperInterfaceInvoke.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/super/TestDirectSuperInterfaceInvoke.java rename to test/langtools/tools/javac/defaultMethods/super/TestDirectSuperInterfaceInvoke.java diff --git a/langtools/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java b/test/langtools/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java similarity index 100% rename from langtools/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java rename to test/langtools/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java diff --git a/langtools/test/tools/javac/defaultMethodsVisibility/DefaultMethodsNotVisibleForSourceLessThan8Test.java b/test/langtools/tools/javac/defaultMethodsVisibility/DefaultMethodsNotVisibleForSourceLessThan8Test.java similarity index 100% rename from langtools/test/tools/javac/defaultMethodsVisibility/DefaultMethodsNotVisibleForSourceLessThan8Test.java rename to test/langtools/tools/javac/defaultMethodsVisibility/DefaultMethodsNotVisibleForSourceLessThan8Test.java diff --git a/langtools/test/tools/javac/depDocComment/DeprecatedDocComment.java b/test/langtools/tools/javac/depDocComment/DeprecatedDocComment.java similarity index 100% rename from langtools/test/tools/javac/depDocComment/DeprecatedDocComment.java rename to test/langtools/tools/javac/depDocComment/DeprecatedDocComment.java diff --git a/langtools/test/tools/javac/depDocComment/DeprecatedDocComment.out b/test/langtools/tools/javac/depDocComment/DeprecatedDocComment.out similarity index 100% rename from langtools/test/tools/javac/depDocComment/DeprecatedDocComment.out rename to test/langtools/tools/javac/depDocComment/DeprecatedDocComment.out diff --git a/langtools/test/tools/javac/depDocComment/DeprecatedDocComment2.java b/test/langtools/tools/javac/depDocComment/DeprecatedDocComment2.java similarity index 100% rename from langtools/test/tools/javac/depDocComment/DeprecatedDocComment2.java rename to test/langtools/tools/javac/depDocComment/DeprecatedDocComment2.java diff --git a/langtools/test/tools/javac/depDocComment/DeprecatedDocComment3.java b/test/langtools/tools/javac/depDocComment/DeprecatedDocComment3.java similarity index 100% rename from langtools/test/tools/javac/depDocComment/DeprecatedDocComment3.java rename to test/langtools/tools/javac/depDocComment/DeprecatedDocComment3.java diff --git a/langtools/test/tools/javac/depDocComment/DeprecatedDocComment4.java b/test/langtools/tools/javac/depDocComment/DeprecatedDocComment4.java similarity index 100% rename from langtools/test/tools/javac/depDocComment/DeprecatedDocComment4.java rename to test/langtools/tools/javac/depDocComment/DeprecatedDocComment4.java diff --git a/langtools/test/tools/javac/depDocComment/DeprecatedDocComment4.out b/test/langtools/tools/javac/depDocComment/DeprecatedDocComment4.out similarity index 100% rename from langtools/test/tools/javac/depDocComment/DeprecatedDocComment4.out rename to test/langtools/tools/javac/depDocComment/DeprecatedDocComment4.out diff --git a/langtools/test/tools/javac/depDocComment/SuppressDepAnnWithSwitchTest.java b/test/langtools/tools/javac/depDocComment/SuppressDepAnnWithSwitchTest.java similarity index 100% rename from langtools/test/tools/javac/depDocComment/SuppressDepAnnWithSwitchTest.java rename to test/langtools/tools/javac/depDocComment/SuppressDepAnnWithSwitchTest.java diff --git a/langtools/test/tools/javac/depDocComment/SuppressDeprecation.java b/test/langtools/tools/javac/depDocComment/SuppressDeprecation.java similarity index 100% rename from langtools/test/tools/javac/depDocComment/SuppressDeprecation.java rename to test/langtools/tools/javac/depDocComment/SuppressDeprecation.java diff --git a/langtools/test/tools/javac/depDocComment/SuppressDeprecation.out b/test/langtools/tools/javac/depDocComment/SuppressDeprecation.out similarity index 100% rename from langtools/test/tools/javac/depDocComment/SuppressDeprecation.out rename to test/langtools/tools/javac/depDocComment/SuppressDeprecation.out diff --git a/langtools/test/tools/javac/depDocComment/SuppressDeprecation8.out b/test/langtools/tools/javac/depDocComment/SuppressDeprecation8.out similarity index 100% rename from langtools/test/tools/javac/depDocComment/SuppressDeprecation8.out rename to test/langtools/tools/javac/depDocComment/SuppressDeprecation8.out diff --git a/langtools/test/tools/javac/depOverrides/annotation/A.java b/test/langtools/tools/javac/depOverrides/annotation/A.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/A.java rename to test/langtools/tools/javac/depOverrides/annotation/A.java diff --git a/langtools/test/tools/javac/depOverrides/annotation/B.java b/test/langtools/tools/javac/depOverrides/annotation/B.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/B.java rename to test/langtools/tools/javac/depOverrides/annotation/B.java diff --git a/langtools/test/tools/javac/depOverrides/annotation/B2.java b/test/langtools/tools/javac/depOverrides/annotation/B2.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/B2.java rename to test/langtools/tools/javac/depOverrides/annotation/B2.java diff --git a/langtools/test/tools/javac/depOverrides/annotation/B3.java b/test/langtools/tools/javac/depOverrides/annotation/B3.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/B3.java rename to test/langtools/tools/javac/depOverrides/annotation/B3.java diff --git a/langtools/test/tools/javac/depOverrides/annotation/I.java b/test/langtools/tools/javac/depOverrides/annotation/I.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/I.java rename to test/langtools/tools/javac/depOverrides/annotation/I.java diff --git a/langtools/test/tools/javac/depOverrides/annotation/P.java b/test/langtools/tools/javac/depOverrides/annotation/P.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/P.java rename to test/langtools/tools/javac/depOverrides/annotation/P.java diff --git a/langtools/test/tools/javac/depOverrides/annotation/Q.java b/test/langtools/tools/javac/depOverrides/annotation/Q.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/Q.java rename to test/langtools/tools/javac/depOverrides/annotation/Q.java diff --git a/langtools/test/tools/javac/depOverrides/annotation/R.java b/test/langtools/tools/javac/depOverrides/annotation/R.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/R.java rename to test/langtools/tools/javac/depOverrides/annotation/R.java diff --git a/langtools/test/tools/javac/depOverrides/annotation/Test1.java b/test/langtools/tools/javac/depOverrides/annotation/Test1.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/Test1.java rename to test/langtools/tools/javac/depOverrides/annotation/Test1.java diff --git a/langtools/test/tools/javac/depOverrides/annotation/Test1A.out b/test/langtools/tools/javac/depOverrides/annotation/Test1A.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/Test1A.out rename to test/langtools/tools/javac/depOverrides/annotation/Test1A.out diff --git a/langtools/test/tools/javac/depOverrides/annotation/Test1B.out b/test/langtools/tools/javac/depOverrides/annotation/Test1B.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/Test1B.out rename to test/langtools/tools/javac/depOverrides/annotation/Test1B.out diff --git a/langtools/test/tools/javac/depOverrides/annotation/Test1B2.out b/test/langtools/tools/javac/depOverrides/annotation/Test1B2.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/Test1B2.out rename to test/langtools/tools/javac/depOverrides/annotation/Test1B2.out diff --git a/langtools/test/tools/javac/depOverrides/annotation/Test2.java b/test/langtools/tools/javac/depOverrides/annotation/Test2.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/Test2.java rename to test/langtools/tools/javac/depOverrides/annotation/Test2.java diff --git a/langtools/test/tools/javac/depOverrides/annotation/Test2Q.out b/test/langtools/tools/javac/depOverrides/annotation/Test2Q.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/Test2Q.out rename to test/langtools/tools/javac/depOverrides/annotation/Test2Q.out diff --git a/langtools/test/tools/javac/depOverrides/annotation/Test2R.out b/test/langtools/tools/javac/depOverrides/annotation/Test2R.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/Test2R.out rename to test/langtools/tools/javac/depOverrides/annotation/Test2R.out diff --git a/langtools/test/tools/javac/depOverrides/annotation/Test3.java b/test/langtools/tools/javac/depOverrides/annotation/Test3.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/Test3.java rename to test/langtools/tools/javac/depOverrides/annotation/Test3.java diff --git a/langtools/test/tools/javac/depOverrides/annotation/Test3.out b/test/langtools/tools/javac/depOverrides/annotation/Test3.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/Test3.out rename to test/langtools/tools/javac/depOverrides/annotation/Test3.out diff --git a/langtools/test/tools/javac/depOverrides/annotation/empty b/test/langtools/tools/javac/depOverrides/annotation/empty similarity index 100% rename from langtools/test/tools/javac/depOverrides/annotation/empty rename to test/langtools/tools/javac/depOverrides/annotation/empty diff --git a/langtools/test/tools/javac/depOverrides/doccomment/A.java b/test/langtools/tools/javac/depOverrides/doccomment/A.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/A.java rename to test/langtools/tools/javac/depOverrides/doccomment/A.java diff --git a/langtools/test/tools/javac/depOverrides/doccomment/B.java b/test/langtools/tools/javac/depOverrides/doccomment/B.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/B.java rename to test/langtools/tools/javac/depOverrides/doccomment/B.java diff --git a/langtools/test/tools/javac/depOverrides/doccomment/B2.java b/test/langtools/tools/javac/depOverrides/doccomment/B2.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/B2.java rename to test/langtools/tools/javac/depOverrides/doccomment/B2.java diff --git a/langtools/test/tools/javac/depOverrides/doccomment/B3.java b/test/langtools/tools/javac/depOverrides/doccomment/B3.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/B3.java rename to test/langtools/tools/javac/depOverrides/doccomment/B3.java diff --git a/langtools/test/tools/javac/depOverrides/doccomment/I.java b/test/langtools/tools/javac/depOverrides/doccomment/I.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/I.java rename to test/langtools/tools/javac/depOverrides/doccomment/I.java diff --git a/langtools/test/tools/javac/depOverrides/doccomment/P.java b/test/langtools/tools/javac/depOverrides/doccomment/P.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/P.java rename to test/langtools/tools/javac/depOverrides/doccomment/P.java diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Q.java b/test/langtools/tools/javac/depOverrides/doccomment/Q.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Q.java rename to test/langtools/tools/javac/depOverrides/doccomment/Q.java diff --git a/langtools/test/tools/javac/depOverrides/doccomment/R.java b/test/langtools/tools/javac/depOverrides/doccomment/R.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/R.java rename to test/langtools/tools/javac/depOverrides/doccomment/R.java diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Test1.java b/test/langtools/tools/javac/depOverrides/doccomment/Test1.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Test1.java rename to test/langtools/tools/javac/depOverrides/doccomment/Test1.java diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Test1A.out b/test/langtools/tools/javac/depOverrides/doccomment/Test1A.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Test1A.out rename to test/langtools/tools/javac/depOverrides/doccomment/Test1A.out diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Test1B.out b/test/langtools/tools/javac/depOverrides/doccomment/Test1B.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Test1B.out rename to test/langtools/tools/javac/depOverrides/doccomment/Test1B.out diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Test1B2.out b/test/langtools/tools/javac/depOverrides/doccomment/Test1B2.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Test1B2.out rename to test/langtools/tools/javac/depOverrides/doccomment/Test1B2.out diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Test1B3.out b/test/langtools/tools/javac/depOverrides/doccomment/Test1B3.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Test1B3.out rename to test/langtools/tools/javac/depOverrides/doccomment/Test1B3.out diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Test1I.out b/test/langtools/tools/javac/depOverrides/doccomment/Test1I.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Test1I.out rename to test/langtools/tools/javac/depOverrides/doccomment/Test1I.out diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Test2.java b/test/langtools/tools/javac/depOverrides/doccomment/Test2.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Test2.java rename to test/langtools/tools/javac/depOverrides/doccomment/Test2.java diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Test2P.out b/test/langtools/tools/javac/depOverrides/doccomment/Test2P.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Test2P.out rename to test/langtools/tools/javac/depOverrides/doccomment/Test2P.out diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Test2Q.out b/test/langtools/tools/javac/depOverrides/doccomment/Test2Q.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Test2Q.out rename to test/langtools/tools/javac/depOverrides/doccomment/Test2Q.out diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Test2R.out b/test/langtools/tools/javac/depOverrides/doccomment/Test2R.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Test2R.out rename to test/langtools/tools/javac/depOverrides/doccomment/Test2R.out diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Test3.java b/test/langtools/tools/javac/depOverrides/doccomment/Test3.java similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Test3.java rename to test/langtools/tools/javac/depOverrides/doccomment/Test3.java diff --git a/langtools/test/tools/javac/depOverrides/doccomment/Test3.out b/test/langtools/tools/javac/depOverrides/doccomment/Test3.out similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/Test3.out rename to test/langtools/tools/javac/depOverrides/doccomment/Test3.out diff --git a/langtools/test/tools/javac/depOverrides/doccomment/empty b/test/langtools/tools/javac/depOverrides/doccomment/empty similarity index 100% rename from langtools/test/tools/javac/depOverrides/doccomment/empty rename to test/langtools/tools/javac/depOverrides/doccomment/empty diff --git a/langtools/test/tools/javac/desugar/BoxingAndSuper.java b/test/langtools/tools/javac/desugar/BoxingAndSuper.java similarity index 100% rename from langtools/test/tools/javac/desugar/BoxingAndSuper.java rename to test/langtools/tools/javac/desugar/BoxingAndSuper.java diff --git a/langtools/test/tools/javac/diags/ArgTypeCompilerFactory.java b/test/langtools/tools/javac/diags/ArgTypeCompilerFactory.java similarity index 100% rename from langtools/test/tools/javac/diags/ArgTypeCompilerFactory.java rename to test/langtools/tools/javac/diags/ArgTypeCompilerFactory.java diff --git a/langtools/test/tools/javac/diags/CheckExamples.java b/test/langtools/tools/javac/diags/CheckExamples.java similarity index 100% rename from langtools/test/tools/javac/diags/CheckExamples.java rename to test/langtools/tools/javac/diags/CheckExamples.java diff --git a/langtools/test/tools/javac/diags/CheckResourceKeys.java b/test/langtools/tools/javac/diags/CheckResourceKeys.java similarity index 100% rename from langtools/test/tools/javac/diags/CheckResourceKeys.java rename to test/langtools/tools/javac/diags/CheckResourceKeys.java diff --git a/langtools/test/tools/javac/diags/DiagnosticRewriterTest.java b/test/langtools/tools/javac/diags/DiagnosticRewriterTest.java similarity index 100% rename from langtools/test/tools/javac/diags/DiagnosticRewriterTest.java rename to test/langtools/tools/javac/diags/DiagnosticRewriterTest.java diff --git a/langtools/test/tools/javac/diags/DiagnosticRewriterTest.out b/test/langtools/tools/javac/diags/DiagnosticRewriterTest.out similarity index 100% rename from langtools/test/tools/javac/diags/DiagnosticRewriterTest.out rename to test/langtools/tools/javac/diags/DiagnosticRewriterTest.out diff --git a/langtools/test/tools/javac/diags/DiagnosticRewriterTest2.java b/test/langtools/tools/javac/diags/DiagnosticRewriterTest2.java similarity index 100% rename from langtools/test/tools/javac/diags/DiagnosticRewriterTest2.java rename to test/langtools/tools/javac/diags/DiagnosticRewriterTest2.java diff --git a/langtools/test/tools/javac/diags/DiagnosticRewriterTest2.out b/test/langtools/tools/javac/diags/DiagnosticRewriterTest2.out similarity index 100% rename from langtools/test/tools/javac/diags/DiagnosticRewriterTest2.out rename to test/langtools/tools/javac/diags/DiagnosticRewriterTest2.out diff --git a/langtools/test/tools/javac/diags/DocCommentProcessor.java b/test/langtools/tools/javac/diags/DocCommentProcessor.java similarity index 100% rename from langtools/test/tools/javac/diags/DocCommentProcessor.java rename to test/langtools/tools/javac/diags/DocCommentProcessor.java diff --git a/langtools/test/tools/javac/diags/EagerInitCheck.java b/test/langtools/tools/javac/diags/EagerInitCheck.java similarity index 100% rename from langtools/test/tools/javac/diags/EagerInitCheck.java rename to test/langtools/tools/javac/diags/EagerInitCheck.java diff --git a/langtools/test/tools/javac/diags/EagerInitCheck.out b/test/langtools/tools/javac/diags/EagerInitCheck.out similarity index 100% rename from langtools/test/tools/javac/diags/EagerInitCheck.out rename to test/langtools/tools/javac/diags/EagerInitCheck.out diff --git a/langtools/test/tools/javac/diags/Example.java b/test/langtools/tools/javac/diags/Example.java similarity index 100% rename from langtools/test/tools/javac/diags/Example.java rename to test/langtools/tools/javac/diags/Example.java diff --git a/langtools/test/tools/javac/diags/FileManager.java b/test/langtools/tools/javac/diags/FileManager.java similarity index 100% rename from langtools/test/tools/javac/diags/FileManager.java rename to test/langtools/tools/javac/diags/FileManager.java diff --git a/langtools/test/tools/javac/diags/HTMLWriter.java b/test/langtools/tools/javac/diags/HTMLWriter.java similarity index 100% rename from langtools/test/tools/javac/diags/HTMLWriter.java rename to test/langtools/tools/javac/diags/HTMLWriter.java diff --git a/langtools/test/tools/javac/diags/IEagerInitCheck.java b/test/langtools/tools/javac/diags/IEagerInitCheck.java similarity index 100% rename from langtools/test/tools/javac/diags/IEagerInitCheck.java rename to test/langtools/tools/javac/diags/IEagerInitCheck.java diff --git a/langtools/test/tools/javac/diags/MessageFile.java b/test/langtools/tools/javac/diags/MessageFile.java similarity index 100% rename from langtools/test/tools/javac/diags/MessageFile.java rename to test/langtools/tools/javac/diags/MessageFile.java diff --git a/langtools/test/tools/javac/diags/MessageInfo.java b/test/langtools/tools/javac/diags/MessageInfo.java similarity index 100% rename from langtools/test/tools/javac/diags/MessageInfo.java rename to test/langtools/tools/javac/diags/MessageInfo.java diff --git a/langtools/test/tools/javac/diags/README.examples.txt b/test/langtools/tools/javac/diags/README.examples.txt similarity index 100% rename from langtools/test/tools/javac/diags/README.examples.txt rename to test/langtools/tools/javac/diags/README.examples.txt diff --git a/langtools/test/tools/javac/diags/RunExamples.java b/test/langtools/tools/javac/diags/RunExamples.java similarity index 100% rename from langtools/test/tools/javac/diags/RunExamples.java rename to test/langtools/tools/javac/diags/RunExamples.java diff --git a/langtools/test/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt similarity index 100% rename from langtools/test/tools/javac/diags/examples.not-yet.txt rename to test/langtools/tools/javac/diags/examples.not-yet.txt diff --git a/langtools/test/tools/javac/diags/examples/AbstractCantBeAccessed.java b/test/langtools/tools/javac/diags/examples/AbstractCantBeAccessed.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AbstractCantBeAccessed.java rename to test/langtools/tools/javac/diags/examples/AbstractCantBeAccessed.java diff --git a/langtools/test/tools/javac/diags/examples/AbstractCantBeInstantiated.java b/test/langtools/tools/javac/diags/examples/AbstractCantBeInstantiated.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AbstractCantBeInstantiated.java rename to test/langtools/tools/javac/diags/examples/AbstractCantBeInstantiated.java diff --git a/langtools/test/tools/javac/diags/examples/AbstractMethodCantHaveBody.java b/test/langtools/tools/javac/diags/examples/AbstractMethodCantHaveBody.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AbstractMethodCantHaveBody.java rename to test/langtools/tools/javac/diags/examples/AbstractMethodCantHaveBody.java diff --git a/langtools/test/tools/javac/diags/examples/AddExportsWithRelease.java b/test/langtools/tools/javac/diags/examples/AddExportsWithRelease.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AddExportsWithRelease.java rename to test/langtools/tools/javac/diags/examples/AddExportsWithRelease.java diff --git a/langtools/test/tools/javac/diags/examples/AddOpensIgnored.java b/test/langtools/tools/javac/diags/examples/AddOpensIgnored.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AddOpensIgnored.java rename to test/langtools/tools/javac/diags/examples/AddOpensIgnored.java diff --git a/langtools/test/tools/javac/diags/examples/AddReadsWithRelease.java b/test/langtools/tools/javac/diags/examples/AddReadsWithRelease.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AddReadsWithRelease.java rename to test/langtools/tools/javac/diags/examples/AddReadsWithRelease.java diff --git a/langtools/test/tools/javac/diags/examples/AddmodsAllModulePathInvalid/module-info.java b/test/langtools/tools/javac/diags/examples/AddmodsAllModulePathInvalid/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AddmodsAllModulePathInvalid/module-info.java rename to test/langtools/tools/javac/diags/examples/AddmodsAllModulePathInvalid/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/AlreadyDefined.java b/test/langtools/tools/javac/diags/examples/AlreadyDefined.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AlreadyDefined.java rename to test/langtools/tools/javac/diags/examples/AlreadyDefined.java diff --git a/langtools/test/tools/javac/diags/examples/AlreadyDefinedClinit.java b/test/langtools/tools/javac/diags/examples/AlreadyDefinedClinit.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AlreadyDefinedClinit.java rename to test/langtools/tools/javac/diags/examples/AlreadyDefinedClinit.java diff --git a/langtools/test/tools/javac/diags/examples/AlreadyDefinedImport.java b/test/langtools/tools/javac/diags/examples/AlreadyDefinedImport.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AlreadyDefinedImport.java rename to test/langtools/tools/javac/diags/examples/AlreadyDefinedImport.java diff --git a/langtools/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/AlreadDefinedStaticImport.java b/test/langtools/tools/javac/diags/examples/AlreadyDefinedStaticImport/AlreadDefinedStaticImport.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/AlreadDefinedStaticImport.java rename to test/langtools/tools/javac/diags/examples/AlreadyDefinedStaticImport/AlreadDefinedStaticImport.java diff --git a/langtools/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E1.java b/test/langtools/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E1.java rename to test/langtools/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E1.java diff --git a/langtools/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java b/test/langtools/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java rename to test/langtools/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java diff --git a/langtools/test/tools/javac/diags/examples/AnnoMustBeClasLiteral.java b/test/langtools/tools/javac/diags/examples/AnnoMustBeClasLiteral.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnoMustBeClasLiteral.java rename to test/langtools/tools/javac/diags/examples/AnnoMustBeClasLiteral.java diff --git a/langtools/test/tools/javac/diags/examples/AnnoNotApplicable.java b/test/langtools/tools/javac/diags/examples/AnnoNotApplicable.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnoNotApplicable.java rename to test/langtools/tools/javac/diags/examples/AnnoNotApplicable.java diff --git a/langtools/test/tools/javac/diags/examples/AnnoNotValidForType.java b/test/langtools/tools/javac/diags/examples/AnnoNotValidForType.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnoNotValidForType.java rename to test/langtools/tools/javac/diags/examples/AnnoNotValidForType.java diff --git a/langtools/test/tools/javac/diags/examples/AnnoValueMustBeAnnotation.java b/test/langtools/tools/javac/diags/examples/AnnoValueMustBeAnnotation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnoValueMustBeAnnotation.java rename to test/langtools/tools/javac/diags/examples/AnnoValueMustBeAnnotation.java diff --git a/langtools/test/tools/javac/diags/examples/AnnoValueMustBeClassLiteral.java b/test/langtools/tools/javac/diags/examples/AnnoValueMustBeClassLiteral.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnoValueMustBeClassLiteral.java rename to test/langtools/tools/javac/diags/examples/AnnoValueMustBeClassLiteral.java diff --git a/langtools/test/tools/javac/diags/examples/AnnosWithoutProcessors/AnnosWithoutProcessors.java b/test/langtools/tools/javac/diags/examples/AnnosWithoutProcessors/AnnosWithoutProcessors.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnosWithoutProcessors/AnnosWithoutProcessors.java rename to test/langtools/tools/javac/diags/examples/AnnosWithoutProcessors/AnnosWithoutProcessors.java diff --git a/langtools/test/tools/javac/diags/examples/AnnosWithoutProcessors/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/AnnosWithoutProcessors/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnosWithoutProcessors/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/AnnosWithoutProcessors/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/AnnotationMissingValue.java b/test/langtools/tools/javac/diags/examples/AnnotationMissingValue.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnotationMissingValue.java rename to test/langtools/tools/javac/diags/examples/AnnotationMissingValue.java diff --git a/langtools/test/tools/javac/diags/examples/AnnotationMissingValues1.java b/test/langtools/tools/javac/diags/examples/AnnotationMissingValues1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnotationMissingValues1.java rename to test/langtools/tools/javac/diags/examples/AnnotationMissingValues1.java diff --git a/langtools/test/tools/javac/diags/examples/AnnotationMustBeConstant.java b/test/langtools/tools/javac/diags/examples/AnnotationMustBeConstant.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnotationMustBeConstant.java rename to test/langtools/tools/javac/diags/examples/AnnotationMustBeConstant.java diff --git a/langtools/test/tools/javac/diags/examples/AnnotationMustBeConstant2.java b/test/langtools/tools/javac/diags/examples/AnnotationMustBeConstant2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnotationMustBeConstant2.java rename to test/langtools/tools/javac/diags/examples/AnnotationMustBeConstant2.java diff --git a/langtools/test/tools/javac/diags/examples/AnnotationMustBeNameValue.java b/test/langtools/tools/javac/diags/examples/AnnotationMustBeNameValue.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnotationMustBeNameValue.java rename to test/langtools/tools/javac/diags/examples/AnnotationMustBeNameValue.java diff --git a/langtools/test/tools/javac/diags/examples/AnnotationsAfterTypeParamsNotSupportedInSource.java b/test/langtools/tools/javac/diags/examples/AnnotationsAfterTypeParamsNotSupportedInSource.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnnotationsAfterTypeParamsNotSupportedInSource.java rename to test/langtools/tools/javac/diags/examples/AnnotationsAfterTypeParamsNotSupportedInSource.java diff --git a/langtools/test/tools/javac/diags/examples/AnonClassImplInterfaceNoArgs.java b/test/langtools/tools/javac/diags/examples/AnonClassImplInterfaceNoArgs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnonClassImplInterfaceNoArgs.java rename to test/langtools/tools/javac/diags/examples/AnonClassImplInterfaceNoArgs.java diff --git a/langtools/test/tools/javac/diags/examples/AnonClassImplInterfaceNoQualForNew.java b/test/langtools/tools/javac/diags/examples/AnonClassImplInterfaceNoQualForNew.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnonClassImplInterfaceNoQualForNew.java rename to test/langtools/tools/javac/diags/examples/AnonClassImplInterfaceNoQualForNew.java diff --git a/langtools/test/tools/javac/diags/examples/AnonClassImplInterfaceNoTypeArgs.java b/test/langtools/tools/javac/diags/examples/AnonClassImplInterfaceNoTypeArgs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnonClassImplInterfaceNoTypeArgs.java rename to test/langtools/tools/javac/diags/examples/AnonClassImplInterfaceNoTypeArgs.java diff --git a/langtools/test/tools/javac/diags/examples/AnonymousClass.java b/test/langtools/tools/javac/diags/examples/AnonymousClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AnonymousClass.java rename to test/langtools/tools/javac/diags/examples/AnonymousClass.java diff --git a/langtools/test/tools/javac/diags/examples/ApplicableMethodFound.java b/test/langtools/tools/javac/diags/examples/ApplicableMethodFound.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ApplicableMethodFound.java rename to test/langtools/tools/javac/diags/examples/ApplicableMethodFound.java diff --git a/langtools/test/tools/javac/diags/examples/ApplicableMethodFound1.java b/test/langtools/tools/javac/diags/examples/ApplicableMethodFound1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ApplicableMethodFound1.java rename to test/langtools/tools/javac/diags/examples/ApplicableMethodFound1.java diff --git a/langtools/test/tools/javac/diags/examples/ArrayAndReceiver.java b/test/langtools/tools/javac/diags/examples/ArrayAndReceiver.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ArrayAndReceiver.java rename to test/langtools/tools/javac/diags/examples/ArrayAndReceiver.java diff --git a/langtools/test/tools/javac/diags/examples/ArrayAndVarargs.java b/test/langtools/tools/javac/diags/examples/ArrayAndVarargs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ArrayAndVarargs.java rename to test/langtools/tools/javac/diags/examples/ArrayAndVarargs.java diff --git a/langtools/test/tools/javac/diags/examples/ArrayDimMissing.java b/test/langtools/tools/javac/diags/examples/ArrayDimMissing.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ArrayDimMissing.java rename to test/langtools/tools/javac/diags/examples/ArrayDimMissing.java diff --git a/langtools/test/tools/javac/diags/examples/ArrayRequired.java b/test/langtools/tools/javac/diags/examples/ArrayRequired.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ArrayRequired.java rename to test/langtools/tools/javac/diags/examples/ArrayRequired.java diff --git a/langtools/test/tools/javac/diags/examples/AssertAsIdentifier2.java b/test/langtools/tools/javac/diags/examples/AssertAsIdentifier2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AssertAsIdentifier2.java rename to test/langtools/tools/javac/diags/examples/AssertAsIdentifier2.java diff --git a/langtools/test/tools/javac/diags/examples/AttrMustBeConstant.java b/test/langtools/tools/javac/diags/examples/AttrMustBeConstant.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AttrMustBeConstant.java rename to test/langtools/tools/javac/diags/examples/AttrMustBeConstant.java diff --git a/langtools/test/tools/javac/diags/examples/AuxiliaryClassWarning/ClassUsingAuxiliary.java b/test/langtools/tools/javac/diags/examples/AuxiliaryClassWarning/ClassUsingAuxiliary.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AuxiliaryClassWarning/ClassUsingAuxiliary.java rename to test/langtools/tools/javac/diags/examples/AuxiliaryClassWarning/ClassUsingAuxiliary.java diff --git a/langtools/test/tools/javac/diags/examples/AuxiliaryClassWarning/ClassWithAuxiliary.java b/test/langtools/tools/javac/diags/examples/AuxiliaryClassWarning/ClassWithAuxiliary.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/AuxiliaryClassWarning/ClassWithAuxiliary.java rename to test/langtools/tools/javac/diags/examples/AuxiliaryClassWarning/ClassWithAuxiliary.java diff --git a/langtools/test/tools/javac/diags/examples/BadArgTypesInLambda.java b/test/langtools/tools/javac/diags/examples/BadArgTypesInLambda.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BadArgTypesInLambda.java rename to test/langtools/tools/javac/diags/examples/BadArgTypesInLambda.java diff --git a/langtools/test/tools/javac/diags/examples/BadEntity.java b/test/langtools/tools/javac/diags/examples/BadEntity.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BadEntity.java rename to test/langtools/tools/javac/diags/examples/BadEntity.java diff --git a/langtools/test/tools/javac/diags/examples/BadFunctionalIntfAnno.java b/test/langtools/tools/javac/diags/examples/BadFunctionalIntfAnno.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BadFunctionalIntfAnno.java rename to test/langtools/tools/javac/diags/examples/BadFunctionalIntfAnno.java diff --git a/langtools/test/tools/javac/diags/examples/BadGreaterThan.java b/test/langtools/tools/javac/diags/examples/BadGreaterThan.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BadGreaterThan.java rename to test/langtools/tools/javac/diags/examples/BadGreaterThan.java diff --git a/langtools/test/tools/javac/diags/examples/BadInlineTag.java b/test/langtools/tools/javac/diags/examples/BadInlineTag.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BadInlineTag.java rename to test/langtools/tools/javac/diags/examples/BadInlineTag.java diff --git a/langtools/test/tools/javac/diags/examples/BadInstanceMethodInUnboundLookup.java b/test/langtools/tools/javac/diags/examples/BadInstanceMethodInUnboundLookup.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BadInstanceMethodInUnboundLookup.java rename to test/langtools/tools/javac/diags/examples/BadInstanceMethodInUnboundLookup.java diff --git a/langtools/test/tools/javac/diags/examples/BadNameForOption_Error.java b/test/langtools/tools/javac/diags/examples/BadNameForOption_Error.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BadNameForOption_Error.java rename to test/langtools/tools/javac/diags/examples/BadNameForOption_Error.java diff --git a/langtools/test/tools/javac/diags/examples/BadNameForOption_Warning.java b/test/langtools/tools/javac/diags/examples/BadNameForOption_Warning.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BadNameForOption_Warning.java rename to test/langtools/tools/javac/diags/examples/BadNameForOption_Warning.java diff --git a/langtools/test/tools/javac/diags/examples/BadSourceFileHeader/BadSourceFileHeader.java b/test/langtools/tools/javac/diags/examples/BadSourceFileHeader/BadSourceFileHeader.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BadSourceFileHeader/BadSourceFileHeader.java rename to test/langtools/tools/javac/diags/examples/BadSourceFileHeader/BadSourceFileHeader.java diff --git a/langtools/test/tools/javac/diags/examples/BadSourceFileHeader/sourcepath/p/A.java b/test/langtools/tools/javac/diags/examples/BadSourceFileHeader/sourcepath/p/A.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BadSourceFileHeader/sourcepath/p/A.java rename to test/langtools/tools/javac/diags/examples/BadSourceFileHeader/sourcepath/p/A.java diff --git a/langtools/test/tools/javac/diags/examples/BadStaticMethodInBoundLookup.java b/test/langtools/tools/javac/diags/examples/BadStaticMethodInBoundLookup.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BadStaticMethodInBoundLookup.java rename to test/langtools/tools/javac/diags/examples/BadStaticMethodInBoundLookup.java diff --git a/langtools/test/tools/javac/diags/examples/BadStaticMethodInUnboundLookup.java b/test/langtools/tools/javac/diags/examples/BadStaticMethodInUnboundLookup.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BadStaticMethodInUnboundLookup.java rename to test/langtools/tools/javac/diags/examples/BadStaticMethodInUnboundLookup.java diff --git a/langtools/test/tools/javac/diags/examples/BreakOutsideSwitchLoop.java b/test/langtools/tools/javac/diags/examples/BreakOutsideSwitchLoop.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/BreakOutsideSwitchLoop.java rename to test/langtools/tools/javac/diags/examples/BreakOutsideSwitchLoop.java diff --git a/langtools/test/tools/javac/diags/examples/CallMustBeFirst.java b/test/langtools/tools/javac/diags/examples/CallMustBeFirst.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CallMustBeFirst.java rename to test/langtools/tools/javac/diags/examples/CallMustBeFirst.java diff --git a/langtools/test/tools/javac/diags/examples/CannotCreateArrayWithDiamond.java b/test/langtools/tools/javac/diags/examples/CannotCreateArrayWithDiamond.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CannotCreateArrayWithDiamond.java rename to test/langtools/tools/javac/diags/examples/CannotCreateArrayWithDiamond.java diff --git a/langtools/test/tools/javac/diags/examples/CannotCreateArrayWithTypeArgs.java b/test/langtools/tools/javac/diags/examples/CannotCreateArrayWithTypeArgs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CannotCreateArrayWithTypeArgs.java rename to test/langtools/tools/javac/diags/examples/CannotCreateArrayWithTypeArgs.java diff --git a/langtools/test/tools/javac/diags/examples/CantAccessInnerClsConstr.java b/test/langtools/tools/javac/diags/examples/CantAccessInnerClsConstr.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantAccessInnerClsConstr.java rename to test/langtools/tools/javac/diags/examples/CantAccessInnerClsConstr.java diff --git a/langtools/test/tools/javac/diags/examples/CantAnnotateScoping.java b/test/langtools/tools/javac/diags/examples/CantAnnotateScoping.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantAnnotateScoping.java rename to test/langtools/tools/javac/diags/examples/CantAnnotateScoping.java diff --git a/langtools/test/tools/javac/diags/examples/CantAnnotateScoping1.java b/test/langtools/tools/javac/diags/examples/CantAnnotateScoping1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantAnnotateScoping1.java rename to test/langtools/tools/javac/diags/examples/CantAnnotateScoping1.java diff --git a/langtools/test/tools/javac/diags/examples/CantApplyDiamond.java b/test/langtools/tools/javac/diags/examples/CantApplyDiamond.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantApplyDiamond.java rename to test/langtools/tools/javac/diags/examples/CantApplyDiamond.java diff --git a/langtools/test/tools/javac/diags/examples/CantApplyDiamond1.java b/test/langtools/tools/javac/diags/examples/CantApplyDiamond1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantApplyDiamond1.java rename to test/langtools/tools/javac/diags/examples/CantApplyDiamond1.java diff --git a/langtools/test/tools/javac/diags/examples/CantApplySymbolFragment.java b/test/langtools/tools/javac/diags/examples/CantApplySymbolFragment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantApplySymbolFragment.java rename to test/langtools/tools/javac/diags/examples/CantApplySymbolFragment.java diff --git a/langtools/test/tools/javac/diags/examples/CantApplySymbolsFragment.java b/test/langtools/tools/javac/diags/examples/CantApplySymbolsFragment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantApplySymbolsFragment.java rename to test/langtools/tools/javac/diags/examples/CantApplySymbolsFragment.java diff --git a/langtools/test/tools/javac/diags/examples/CantAssignToFinal.java b/test/langtools/tools/javac/diags/examples/CantAssignToFinal.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantAssignToFinal.java rename to test/langtools/tools/javac/diags/examples/CantAssignToFinal.java diff --git a/langtools/test/tools/javac/diags/examples/CantAssignToThis.java b/test/langtools/tools/javac/diags/examples/CantAssignToThis.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantAssignToThis.java rename to test/langtools/tools/javac/diags/examples/CantAssignToThis.java diff --git a/langtools/test/tools/javac/diags/examples/CantDeref.java b/test/langtools/tools/javac/diags/examples/CantDeref.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantDeref.java rename to test/langtools/tools/javac/diags/examples/CantDeref.java diff --git a/langtools/test/tools/javac/diags/examples/CantExtendIntfAnno.java b/test/langtools/tools/javac/diags/examples/CantExtendIntfAnno.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantExtendIntfAnno.java rename to test/langtools/tools/javac/diags/examples/CantExtendIntfAnno.java diff --git a/langtools/test/tools/javac/diags/examples/CantImplement.java b/test/langtools/tools/javac/diags/examples/CantImplement.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantImplement.java rename to test/langtools/tools/javac/diags/examples/CantImplement.java diff --git a/langtools/test/tools/javac/diags/examples/CantInheritDiffArg.java b/test/langtools/tools/javac/diags/examples/CantInheritDiffArg.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantInheritDiffArg.java rename to test/langtools/tools/javac/diags/examples/CantInheritDiffArg.java diff --git a/langtools/test/tools/javac/diags/examples/CantRefBeforeConstr.java b/test/langtools/tools/javac/diags/examples/CantRefBeforeConstr.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantRefBeforeConstr.java rename to test/langtools/tools/javac/diags/examples/CantRefBeforeConstr.java diff --git a/langtools/test/tools/javac/diags/examples/CantRefNonEffectivelyFinalVar.java b/test/langtools/tools/javac/diags/examples/CantRefNonEffectivelyFinalVar.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantRefNonEffectivelyFinalVar.java rename to test/langtools/tools/javac/diags/examples/CantRefNonEffectivelyFinalVar.java diff --git a/langtools/test/tools/javac/diags/examples/CantResolve.java b/test/langtools/tools/javac/diags/examples/CantResolve.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantResolve.java rename to test/langtools/tools/javac/diags/examples/CantResolve.java diff --git a/langtools/test/tools/javac/diags/examples/CantResolveArgs.java b/test/langtools/tools/javac/diags/examples/CantResolveArgs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantResolveArgs.java rename to test/langtools/tools/javac/diags/examples/CantResolveArgs.java diff --git a/langtools/test/tools/javac/diags/examples/CantResolveArgsParams.java b/test/langtools/tools/javac/diags/examples/CantResolveArgsParams.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantResolveArgsParams.java rename to test/langtools/tools/javac/diags/examples/CantResolveArgsParams.java diff --git a/langtools/test/tools/javac/diags/examples/CantResolveLocation.java b/test/langtools/tools/javac/diags/examples/CantResolveLocation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantResolveLocation.java rename to test/langtools/tools/javac/diags/examples/CantResolveLocation.java diff --git a/langtools/test/tools/javac/diags/examples/CantResolveLocationArgs.java b/test/langtools/tools/javac/diags/examples/CantResolveLocationArgs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantResolveLocationArgs.java rename to test/langtools/tools/javac/diags/examples/CantResolveLocationArgs.java diff --git a/langtools/test/tools/javac/diags/examples/CantResolveLocationArgsFragment.java b/test/langtools/tools/javac/diags/examples/CantResolveLocationArgsFragment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantResolveLocationArgsFragment.java rename to test/langtools/tools/javac/diags/examples/CantResolveLocationArgsFragment.java diff --git a/langtools/test/tools/javac/diags/examples/CantResolveLocationArgsParams.java b/test/langtools/tools/javac/diags/examples/CantResolveLocationArgsParams.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantResolveLocationArgsParams.java rename to test/langtools/tools/javac/diags/examples/CantResolveLocationArgsParams.java diff --git a/langtools/test/tools/javac/diags/examples/CantResolveLocationArgsParamsFragment.java b/test/langtools/tools/javac/diags/examples/CantResolveLocationArgsParamsFragment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CantResolveLocationArgsParamsFragment.java rename to test/langtools/tools/javac/diags/examples/CantResolveLocationArgsParamsFragment.java diff --git a/langtools/test/tools/javac/diags/examples/CatchWithoutTry.java b/test/langtools/tools/javac/diags/examples/CatchWithoutTry.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CatchWithoutTry.java rename to test/langtools/tools/javac/diags/examples/CatchWithoutTry.java diff --git a/langtools/test/tools/javac/diags/examples/ClashesWith.java b/test/langtools/tools/javac/diags/examples/ClashesWith.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ClashesWith.java rename to test/langtools/tools/javac/diags/examples/ClashesWith.java diff --git a/langtools/test/tools/javac/diags/examples/ClassCantWrite.java b/test/langtools/tools/javac/diags/examples/ClassCantWrite.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ClassCantWrite.java rename to test/langtools/tools/javac/diags/examples/ClassCantWrite.java diff --git a/langtools/test/tools/javac/diags/examples/ClassPublicInFile.java b/test/langtools/tools/javac/diags/examples/ClassPublicInFile.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ClassPublicInFile.java rename to test/langtools/tools/javac/diags/examples/ClassPublicInFile.java diff --git a/langtools/test/tools/javac/diags/examples/CompressedDiags.java b/test/langtools/tools/javac/diags/examples/CompressedDiags.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CompressedDiags.java rename to test/langtools/tools/javac/diags/examples/CompressedDiags.java diff --git a/langtools/test/tools/javac/diags/examples/ConcreteInheritanceConflict.java b/test/langtools/tools/javac/diags/examples/ConcreteInheritanceConflict.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ConcreteInheritanceConflict.java rename to test/langtools/tools/javac/diags/examples/ConcreteInheritanceConflict.java diff --git a/langtools/test/tools/javac/diags/examples/ConditionalTargetCantBeVoid.java b/test/langtools/tools/javac/diags/examples/ConditionalTargetCantBeVoid.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ConditionalTargetCantBeVoid.java rename to test/langtools/tools/javac/diags/examples/ConditionalTargetCantBeVoid.java diff --git a/langtools/test/tools/javac/diags/examples/ConflictingExports/exported/Class.java b/test/langtools/tools/javac/diags/examples/ConflictingExports/exported/Class.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ConflictingExports/exported/Class.java rename to test/langtools/tools/javac/diags/examples/ConflictingExports/exported/Class.java diff --git a/langtools/test/tools/javac/diags/examples/ConflictingExports/module-info.java b/test/langtools/tools/javac/diags/examples/ConflictingExports/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ConflictingExports/module-info.java rename to test/langtools/tools/javac/diags/examples/ConflictingExports/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ConflictingExportsToModule/exported/Class.java b/test/langtools/tools/javac/diags/examples/ConflictingExportsToModule/exported/Class.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ConflictingExportsToModule/exported/Class.java rename to test/langtools/tools/javac/diags/examples/ConflictingExportsToModule/exported/Class.java diff --git a/langtools/test/tools/javac/diags/examples/ConflictingExportsToModule/module-info.java b/test/langtools/tools/javac/diags/examples/ConflictingExportsToModule/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ConflictingExportsToModule/module-info.java rename to test/langtools/tools/javac/diags/examples/ConflictingExportsToModule/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ConflictingOpens/exported/Class.java b/test/langtools/tools/javac/diags/examples/ConflictingOpens/exported/Class.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ConflictingOpens/exported/Class.java rename to test/langtools/tools/javac/diags/examples/ConflictingOpens/exported/Class.java diff --git a/langtools/test/tools/javac/diags/examples/ConflictingOpens/module-info.java b/test/langtools/tools/javac/diags/examples/ConflictingOpens/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ConflictingOpens/module-info.java rename to test/langtools/tools/javac/diags/examples/ConflictingOpens/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ConflictingOpensToModule/module-info.java b/test/langtools/tools/javac/diags/examples/ConflictingOpensToModule/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ConflictingOpensToModule/module-info.java rename to test/langtools/tools/javac/diags/examples/ConflictingOpensToModule/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ConflictingOpensToModule/opened/Class.java b/test/langtools/tools/javac/diags/examples/ConflictingOpensToModule/opened/Class.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ConflictingOpensToModule/opened/Class.java rename to test/langtools/tools/javac/diags/examples/ConflictingOpensToModule/opened/Class.java diff --git a/langtools/test/tools/javac/diags/examples/ConstExprRequired.java b/test/langtools/tools/javac/diags/examples/ConstExprRequired.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ConstExprRequired.java rename to test/langtools/tools/javac/diags/examples/ConstExprRequired.java diff --git a/langtools/test/tools/javac/diags/examples/ConstantSVUID.java b/test/langtools/tools/javac/diags/examples/ConstantSVUID.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ConstantSVUID.java rename to test/langtools/tools/javac/diags/examples/ConstantSVUID.java diff --git a/langtools/test/tools/javac/diags/examples/ContinueOutsideLoop.java b/test/langtools/tools/javac/diags/examples/ContinueOutsideLoop.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ContinueOutsideLoop.java rename to test/langtools/tools/javac/diags/examples/ContinueOutsideLoop.java diff --git a/langtools/test/tools/javac/diags/examples/CountError.java b/test/langtools/tools/javac/diags/examples/CountError.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CountError.java rename to test/langtools/tools/javac/diags/examples/CountError.java diff --git a/langtools/test/tools/javac/diags/examples/CountErrorPlural.java b/test/langtools/tools/javac/diags/examples/CountErrorPlural.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CountErrorPlural.java rename to test/langtools/tools/javac/diags/examples/CountErrorPlural.java diff --git a/langtools/test/tools/javac/diags/examples/CountWarn.java b/test/langtools/tools/javac/diags/examples/CountWarn.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CountWarn.java rename to test/langtools/tools/javac/diags/examples/CountWarn.java diff --git a/langtools/test/tools/javac/diags/examples/CountWarnPlural.java b/test/langtools/tools/javac/diags/examples/CountWarnPlural.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CountWarnPlural.java rename to test/langtools/tools/javac/diags/examples/CountWarnPlural.java diff --git a/langtools/test/tools/javac/diags/examples/CyclicAnnoElement.java b/test/langtools/tools/javac/diags/examples/CyclicAnnoElement.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CyclicAnnoElement.java rename to test/langtools/tools/javac/diags/examples/CyclicAnnoElement.java diff --git a/langtools/test/tools/javac/diags/examples/CyclicInheritance.java b/test/langtools/tools/javac/diags/examples/CyclicInheritance.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CyclicInheritance.java rename to test/langtools/tools/javac/diags/examples/CyclicInheritance.java diff --git a/langtools/test/tools/javac/diags/examples/CyclicRequires/CyclicRequires.java b/test/langtools/tools/javac/diags/examples/CyclicRequires/CyclicRequires.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CyclicRequires/CyclicRequires.java rename to test/langtools/tools/javac/diags/examples/CyclicRequires/CyclicRequires.java diff --git a/langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m2x/module-info.java b/test/langtools/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m2x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m2x/module-info.java rename to test/langtools/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m2x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/DefaultAllowedInIntfAnnotationMember.java b/test/langtools/tools/javac/diags/examples/DefaultAllowedInIntfAnnotationMember.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DefaultAllowedInIntfAnnotationMember.java rename to test/langtools/tools/javac/diags/examples/DefaultAllowedInIntfAnnotationMember.java diff --git a/langtools/test/tools/javac/diags/examples/DefaultMethodNotSupported.java b/test/langtools/tools/javac/diags/examples/DefaultMethodNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DefaultMethodNotSupported.java rename to test/langtools/tools/javac/diags/examples/DefaultMethodNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/DefaultOverridesObjectMember.java b/test/langtools/tools/javac/diags/examples/DefaultOverridesObjectMember.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DefaultOverridesObjectMember.java rename to test/langtools/tools/javac/diags/examples/DefaultOverridesObjectMember.java diff --git a/langtools/test/tools/javac/diags/examples/DeferredMethodInst.java b/test/langtools/tools/javac/diags/examples/DeferredMethodInst.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DeferredMethodInst.java rename to test/langtools/tools/javac/diags/examples/DeferredMethodInst.java diff --git a/langtools/test/tools/javac/diags/examples/DeprecatedAnnotationHasNoEffect/DeprecatedAnnotationHasNoEffect.java b/test/langtools/tools/javac/diags/examples/DeprecatedAnnotationHasNoEffect/DeprecatedAnnotationHasNoEffect.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DeprecatedAnnotationHasNoEffect/DeprecatedAnnotationHasNoEffect.java rename to test/langtools/tools/javac/diags/examples/DeprecatedAnnotationHasNoEffect/DeprecatedAnnotationHasNoEffect.java diff --git a/langtools/test/tools/javac/diags/examples/DeprecatedFilename.java b/test/langtools/tools/javac/diags/examples/DeprecatedFilename.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DeprecatedFilename.java rename to test/langtools/tools/javac/diags/examples/DeprecatedFilename.java diff --git a/langtools/test/tools/javac/diags/examples/DeprecatedFilenameAdditional.java b/test/langtools/tools/javac/diags/examples/DeprecatedFilenameAdditional.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DeprecatedFilenameAdditional.java rename to test/langtools/tools/javac/diags/examples/DeprecatedFilenameAdditional.java diff --git a/langtools/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedClass.java b/test/langtools/tools/javac/diags/examples/DeprecatedPlural/DeprecatedClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedClass.java rename to test/langtools/tools/javac/diags/examples/DeprecatedPlural/DeprecatedClass.java diff --git a/langtools/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedFilename.java b/test/langtools/tools/javac/diags/examples/DeprecatedPlural/DeprecatedFilename.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedFilename.java rename to test/langtools/tools/javac/diags/examples/DeprecatedPlural/DeprecatedFilename.java diff --git a/langtools/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedPlural.java b/test/langtools/tools/javac/diags/examples/DeprecatedPlural/DeprecatedPlural.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedPlural.java rename to test/langtools/tools/javac/diags/examples/DeprecatedPlural/DeprecatedPlural.java diff --git a/langtools/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedClass.java b/test/langtools/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedClass.java rename to test/langtools/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedClass.java diff --git a/langtools/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedFilename.java b/test/langtools/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedFilename.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedFilename.java rename to test/langtools/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedFilename.java diff --git a/langtools/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedPlural.java b/test/langtools/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedPlural.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedPlural.java rename to test/langtools/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedPlural.java diff --git a/langtools/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedPluralAdditional.java b/test/langtools/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedPluralAdditional.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedPluralAdditional.java rename to test/langtools/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedPluralAdditional.java diff --git a/langtools/test/tools/javac/diags/examples/DiamondAndAnonClass.java b/test/langtools/tools/javac/diags/examples/DiamondAndAnonClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DiamondAndAnonClass.java rename to test/langtools/tools/javac/diags/examples/DiamondAndAnonClass.java diff --git a/langtools/test/tools/javac/diags/examples/DiamondAndExplicitParams.java b/test/langtools/tools/javac/diags/examples/DiamondAndExplicitParams.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DiamondAndExplicitParams.java rename to test/langtools/tools/javac/diags/examples/DiamondAndExplicitParams.java diff --git a/langtools/test/tools/javac/diags/examples/DiamondAndNonDenotableTypes.java b/test/langtools/tools/javac/diags/examples/DiamondAndNonDenotableTypes.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DiamondAndNonDenotableTypes.java rename to test/langtools/tools/javac/diags/examples/DiamondAndNonDenotableTypes.java diff --git a/langtools/test/tools/javac/diags/examples/DiamondMethodDoesNotOverride.java b/test/langtools/tools/javac/diags/examples/DiamondMethodDoesNotOverride.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DiamondMethodDoesNotOverride.java rename to test/langtools/tools/javac/diags/examples/DiamondMethodDoesNotOverride.java diff --git a/langtools/test/tools/javac/diags/examples/DiamondNonGeneric.java b/test/langtools/tools/javac/diags/examples/DiamondNonGeneric.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DiamondNonGeneric.java rename to test/langtools/tools/javac/diags/examples/DiamondNonGeneric.java diff --git a/langtools/test/tools/javac/diags/examples/DiamondNotSupported.java b/test/langtools/tools/javac/diags/examples/DiamondNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DiamondNotSupported.java rename to test/langtools/tools/javac/diags/examples/DiamondNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/DiamondRedundantArgs.java b/test/langtools/tools/javac/diags/examples/DiamondRedundantArgs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DiamondRedundantArgs.java rename to test/langtools/tools/javac/diags/examples/DiamondRedundantArgs.java diff --git a/langtools/test/tools/javac/diags/examples/DirPathElementNotDirectory/DirPathElementNotDirectory.java b/test/langtools/tools/javac/diags/examples/DirPathElementNotDirectory/DirPathElementNotDirectory.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DirPathElementNotDirectory/DirPathElementNotDirectory.java rename to test/langtools/tools/javac/diags/examples/DirPathElementNotDirectory/DirPathElementNotDirectory.java diff --git a/langtools/test/tools/javac/diags/examples/DirPathElementNotDirectory/modulesourcepath b/test/langtools/tools/javac/diags/examples/DirPathElementNotDirectory/modulesourcepath similarity index 100% rename from langtools/test/tools/javac/diags/examples/DirPathElementNotDirectory/modulesourcepath rename to test/langtools/tools/javac/diags/examples/DirPathElementNotDirectory/modulesourcepath diff --git a/langtools/test/tools/javac/diags/examples/DirPathElementNotFound.java b/test/langtools/tools/javac/diags/examples/DirPathElementNotFound.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DirPathElementNotFound.java rename to test/langtools/tools/javac/diags/examples/DirPathElementNotFound.java diff --git a/langtools/test/tools/javac/diags/examples/DivZero.java b/test/langtools/tools/javac/diags/examples/DivZero.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DivZero.java rename to test/langtools/tools/javac/diags/examples/DivZero.java diff --git a/langtools/test/tools/javac/diags/examples/DoesNotOverride.java b/test/langtools/tools/javac/diags/examples/DoesNotOverride.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DoesNotOverride.java rename to test/langtools/tools/javac/diags/examples/DoesNotOverride.java diff --git a/langtools/test/tools/javac/diags/examples/DoesntExist.java b/test/langtools/tools/javac/diags/examples/DoesntExist.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DoesntExist.java rename to test/langtools/tools/javac/diags/examples/DoesntExist.java diff --git a/langtools/test/tools/javac/diags/examples/DotClassExpected.java b/test/langtools/tools/javac/diags/examples/DotClassExpected.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DotClassExpected.java rename to test/langtools/tools/javac/diags/examples/DotClassExpected.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateAnnotationJava8.java b/test/langtools/tools/javac/diags/examples/DuplicateAnnotationJava8.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateAnnotationJava8.java rename to test/langtools/tools/javac/diags/examples/DuplicateAnnotationJava8.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateAnnotationMemberValue.java b/test/langtools/tools/javac/diags/examples/DuplicateAnnotationMemberValue.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateAnnotationMemberValue.java rename to test/langtools/tools/javac/diags/examples/DuplicateAnnotationMemberValue.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateCaseLabel.java b/test/langtools/tools/javac/diags/examples/DuplicateCaseLabel.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateCaseLabel.java rename to test/langtools/tools/javac/diags/examples/DuplicateCaseLabel.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateClass.java b/test/langtools/tools/javac/diags/examples/DuplicateClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateClass.java rename to test/langtools/tools/javac/diags/examples/DuplicateClass.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateDefaultLabel.java b/test/langtools/tools/javac/diags/examples/DuplicateDefaultLabel.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateDefaultLabel.java rename to test/langtools/tools/javac/diags/examples/DuplicateDefaultLabel.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateModule/DuplicateModule.java b/test/langtools/tools/javac/diags/examples/DuplicateModule/DuplicateModule.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateModule/DuplicateModule.java rename to test/langtools/tools/javac/diags/examples/DuplicateModule/DuplicateModule.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m2x/module-info.java b/test/langtools/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m2x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m2x/module-info.java rename to test/langtools/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m2x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateProvides/exported/Service.java b/test/langtools/tools/javac/diags/examples/DuplicateProvides/exported/Service.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateProvides/exported/Service.java rename to test/langtools/tools/javac/diags/examples/DuplicateProvides/exported/Service.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateProvides/impl/ServiceImplementation.java b/test/langtools/tools/javac/diags/examples/DuplicateProvides/impl/ServiceImplementation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateProvides/impl/ServiceImplementation.java rename to test/langtools/tools/javac/diags/examples/DuplicateProvides/impl/ServiceImplementation.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateProvides/module-info.java b/test/langtools/tools/javac/diags/examples/DuplicateProvides/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateProvides/module-info.java rename to test/langtools/tools/javac/diags/examples/DuplicateProvides/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateRequires/module-info.java b/test/langtools/tools/javac/diags/examples/DuplicateRequires/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateRequires/module-info.java rename to test/langtools/tools/javac/diags/examples/DuplicateRequires/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateUses/exported/Service.java b/test/langtools/tools/javac/diags/examples/DuplicateUses/exported/Service.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateUses/exported/Service.java rename to test/langtools/tools/javac/diags/examples/DuplicateUses/exported/Service.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateUses/module-info.java b/test/langtools/tools/javac/diags/examples/DuplicateUses/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateUses/module-info.java rename to test/langtools/tools/javac/diags/examples/DuplicateUses/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ElseWithoutIf.java b/test/langtools/tools/javac/diags/examples/ElseWithoutIf.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ElseWithoutIf.java rename to test/langtools/tools/javac/diags/examples/ElseWithoutIf.java diff --git a/langtools/test/tools/javac/diags/examples/EmptyCharLiteral.java b/test/langtools/tools/javac/diags/examples/EmptyCharLiteral.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/EmptyCharLiteral.java rename to test/langtools/tools/javac/diags/examples/EmptyCharLiteral.java diff --git a/langtools/test/tools/javac/diags/examples/EmptyIf.java b/test/langtools/tools/javac/diags/examples/EmptyIf.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/EmptyIf.java rename to test/langtools/tools/javac/diags/examples/EmptyIf.java diff --git a/langtools/test/tools/javac/diags/examples/EnclClassRequired.java b/test/langtools/tools/javac/diags/examples/EnclClassRequired.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/EnclClassRequired.java rename to test/langtools/tools/javac/diags/examples/EnclClassRequired.java diff --git a/langtools/test/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst.java b/test/langtools/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst.java rename to test/langtools/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst.java diff --git a/langtools/test/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst2.java b/test/langtools/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst2.java rename to test/langtools/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst2.java diff --git a/langtools/test/tools/javac/diags/examples/EnumAsIdentifier2.java b/test/langtools/tools/javac/diags/examples/EnumAsIdentifier2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/EnumAsIdentifier2.java rename to test/langtools/tools/javac/diags/examples/EnumAsIdentifier2.java diff --git a/langtools/test/tools/javac/diags/examples/EnumCantBeInstantiated.java b/test/langtools/tools/javac/diags/examples/EnumCantBeInstantiated.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/EnumCantBeInstantiated.java rename to test/langtools/tools/javac/diags/examples/EnumCantBeInstantiated.java diff --git a/langtools/test/tools/javac/diags/examples/EnumLabelUnqualified.java b/test/langtools/tools/javac/diags/examples/EnumLabelUnqualified.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/EnumLabelUnqualified.java rename to test/langtools/tools/javac/diags/examples/EnumLabelUnqualified.java diff --git a/langtools/test/tools/javac/diags/examples/EnumNoFinalize.java b/test/langtools/tools/javac/diags/examples/EnumNoFinalize.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/EnumNoFinalize.java rename to test/langtools/tools/javac/diags/examples/EnumNoFinalize.java diff --git a/langtools/test/tools/javac/diags/examples/EnumNoSubclassing.java b/test/langtools/tools/javac/diags/examples/EnumNoSubclassing.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/EnumNoSubclassing.java rename to test/langtools/tools/javac/diags/examples/EnumNoSubclassing.java diff --git a/langtools/test/tools/javac/diags/examples/EnumTypesNotExtensible.java b/test/langtools/tools/javac/diags/examples/EnumTypesNotExtensible.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/EnumTypesNotExtensible.java rename to test/langtools/tools/javac/diags/examples/EnumTypesNotExtensible.java diff --git a/langtools/test/tools/javac/diags/examples/EnumsMustBeStatic.java b/test/langtools/tools/javac/diags/examples/EnumsMustBeStatic.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/EnumsMustBeStatic.java rename to test/langtools/tools/javac/diags/examples/EnumsMustBeStatic.java diff --git a/langtools/test/tools/javac/diags/examples/ErrProcMessager/ErrProcMessager.java b/test/langtools/tools/javac/diags/examples/ErrProcMessager/ErrProcMessager.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ErrProcMessager/ErrProcMessager.java rename to test/langtools/tools/javac/diags/examples/ErrProcMessager/ErrProcMessager.java diff --git a/langtools/test/tools/javac/diags/examples/ErrProcMessager/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ErrProcMessager/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ErrProcMessager/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ErrProcMessager/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ErrSyntheticNameConflict.java b/test/langtools/tools/javac/diags/examples/ErrSyntheticNameConflict.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ErrSyntheticNameConflict.java rename to test/langtools/tools/javac/diags/examples/ErrSyntheticNameConflict.java diff --git a/langtools/test/tools/javac/diags/examples/Error.java b/test/langtools/tools/javac/diags/examples/Error.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/Error.java rename to test/langtools/tools/javac/diags/examples/Error.java diff --git a/langtools/test/tools/javac/diags/examples/ErrorReadingFile.java b/test/langtools/tools/javac/diags/examples/ErrorReadingFile.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ErrorReadingFile.java rename to test/langtools/tools/javac/diags/examples/ErrorReadingFile.java diff --git a/langtools/test/tools/javac/diags/examples/ExceptAlreadyCaught.java b/test/langtools/tools/javac/diags/examples/ExceptAlreadyCaught.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ExceptAlreadyCaught.java rename to test/langtools/tools/javac/diags/examples/ExceptAlreadyCaught.java diff --git a/langtools/test/tools/javac/diags/examples/ExceptNeverThrown.java b/test/langtools/tools/javac/diags/examples/ExceptNeverThrown.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ExceptNeverThrown.java rename to test/langtools/tools/javac/diags/examples/ExceptNeverThrown.java diff --git a/langtools/test/tools/javac/diags/examples/Expected2.java b/test/langtools/tools/javac/diags/examples/Expected2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/Expected2.java rename to test/langtools/tools/javac/diags/examples/Expected2.java diff --git a/langtools/test/tools/javac/diags/examples/Expected3.java b/test/langtools/tools/javac/diags/examples/Expected3.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/Expected3.java rename to test/langtools/tools/javac/diags/examples/Expected3.java diff --git a/langtools/test/tools/javac/diags/examples/ExpectedModule.java b/test/langtools/tools/javac/diags/examples/ExpectedModule.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ExpectedModule.java rename to test/langtools/tools/javac/diags/examples/ExpectedModule.java diff --git a/langtools/test/tools/javac/diags/examples/ExplicitParamsDoNotConformToBounds.java b/test/langtools/tools/javac/diags/examples/ExplicitParamsDoNotConformToBounds.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ExplicitParamsDoNotConformToBounds.java rename to test/langtools/tools/javac/diags/examples/ExplicitParamsDoNotConformToBounds.java diff --git a/langtools/test/tools/javac/diags/examples/FileShouldBeOnSourcePathOrPatchPath/FileShouldBeOnSourcePathOrModulePath.java b/test/langtools/tools/javac/diags/examples/FileShouldBeOnSourcePathOrPatchPath/FileShouldBeOnSourcePathOrModulePath.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/FileShouldBeOnSourcePathOrPatchPath/FileShouldBeOnSourcePathOrModulePath.java rename to test/langtools/tools/javac/diags/examples/FileShouldBeOnSourcePathOrPatchPath/FileShouldBeOnSourcePathOrModulePath.java diff --git a/langtools/test/tools/javac/diags/examples/FileShouldBeOnSourcePathOrPatchPath/sourcepath/module-info.java b/test/langtools/tools/javac/diags/examples/FileShouldBeOnSourcePathOrPatchPath/sourcepath/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/FileShouldBeOnSourcePathOrPatchPath/sourcepath/module-info.java rename to test/langtools/tools/javac/diags/examples/FileShouldBeOnSourcePathOrPatchPath/sourcepath/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/FinalParamCantBeAssigned.java b/test/langtools/tools/javac/diags/examples/FinalParamCantBeAssigned.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/FinalParamCantBeAssigned.java rename to test/langtools/tools/javac/diags/examples/FinalParamCantBeAssigned.java diff --git a/langtools/test/tools/javac/diags/examples/FinallyCannotComplete.java b/test/langtools/tools/javac/diags/examples/FinallyCannotComplete.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/FinallyCannotComplete.java rename to test/langtools/tools/javac/diags/examples/FinallyCannotComplete.java diff --git a/langtools/test/tools/javac/diags/examples/FinallyWithoutTry.java b/test/langtools/tools/javac/diags/examples/FinallyWithoutTry.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/FinallyWithoutTry.java rename to test/langtools/tools/javac/diags/examples/FinallyWithoutTry.java diff --git a/langtools/test/tools/javac/diags/examples/FloatNumberTooLarge.java b/test/langtools/tools/javac/diags/examples/FloatNumberTooLarge.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/FloatNumberTooLarge.java rename to test/langtools/tools/javac/diags/examples/FloatNumberTooLarge.java diff --git a/langtools/test/tools/javac/diags/examples/FloatNumberTooSmall.java b/test/langtools/tools/javac/diags/examples/FloatNumberTooSmall.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/FloatNumberTooSmall.java rename to test/langtools/tools/javac/diags/examples/FloatNumberTooSmall.java diff --git a/langtools/test/tools/javac/diags/examples/ForeachBadInitialization.java b/test/langtools/tools/javac/diags/examples/ForeachBadInitialization.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ForeachBadInitialization.java rename to test/langtools/tools/javac/diags/examples/ForeachBadInitialization.java diff --git a/langtools/test/tools/javac/diags/examples/ForeachNotApplicable.java b/test/langtools/tools/javac/diags/examples/ForeachNotApplicable.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ForeachNotApplicable.java rename to test/langtools/tools/javac/diags/examples/ForeachNotApplicable.java diff --git a/langtools/test/tools/javac/diags/examples/GenericArrayCreation.java b/test/langtools/tools/javac/diags/examples/GenericArrayCreation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/GenericArrayCreation.java rename to test/langtools/tools/javac/diags/examples/GenericArrayCreation.java diff --git a/langtools/test/tools/javac/diags/examples/GenericThrowable.java b/test/langtools/tools/javac/diags/examples/GenericThrowable.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/GenericThrowable.java rename to test/langtools/tools/javac/diags/examples/GenericThrowable.java diff --git a/langtools/test/tools/javac/diags/examples/GreaterThanExpected.java b/test/langtools/tools/javac/diags/examples/GreaterThanExpected.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/GreaterThanExpected.java rename to test/langtools/tools/javac/diags/examples/GreaterThanExpected.java diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecated.java b/test/langtools/tools/javac/diags/examples/HasBeenDeprecated.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/HasBeenDeprecated.java rename to test/langtools/tools/javac/diags/examples/HasBeenDeprecated.java diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/HasBeenDeprecatedModule.java b/test/langtools/tools/javac/diags/examples/HasBeenDeprecatedModule/HasBeenDeprecatedModule.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/HasBeenDeprecatedModule.java rename to test/langtools/tools/javac/diags/examples/HasBeenDeprecatedModule/HasBeenDeprecatedModule.java diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2x/module-info.java b/test/langtools/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2x/module-info.java rename to test/langtools/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/HasBeenDeprecatedRemovalModule.java b/test/langtools/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/HasBeenDeprecatedRemovalModule.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/HasBeenDeprecatedRemovalModule.java rename to test/langtools/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/HasBeenDeprecatedRemovalModule.java diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2x/module-info.java b/test/langtools/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2x/module-info.java rename to test/langtools/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/HideStatic.java b/test/langtools/tools/javac/diags/examples/HideStatic.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/HideStatic.java rename to test/langtools/tools/javac/diags/examples/HideStatic.java diff --git a/langtools/test/tools/javac/diags/examples/IdentifierExpected.java b/test/langtools/tools/javac/diags/examples/IdentifierExpected.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IdentifierExpected.java rename to test/langtools/tools/javac/diags/examples/IdentifierExpected.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalAnnotationDeclaration.java b/test/langtools/tools/javac/diags/examples/IllegalAnnotationDeclaration.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalAnnotationDeclaration.java rename to test/langtools/tools/javac/diags/examples/IllegalAnnotationDeclaration.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalArgumentForOption/IllegalArgumentForOption.java b/test/langtools/tools/javac/diags/examples/IllegalArgumentForOption/IllegalArgumentForOption.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalArgumentForOption/IllegalArgumentForOption.java rename to test/langtools/tools/javac/diags/examples/IllegalArgumentForOption/IllegalArgumentForOption.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalArrayCreation.java b/test/langtools/tools/javac/diags/examples/IllegalArrayCreation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalArrayCreation.java rename to test/langtools/tools/javac/diags/examples/IllegalArrayCreation.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalChar.java b/test/langtools/tools/javac/diags/examples/IllegalChar.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalChar.java rename to test/langtools/tools/javac/diags/examples/IllegalChar.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalComboModifiers.java b/test/langtools/tools/javac/diags/examples/IllegalComboModifiers.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalComboModifiers.java rename to test/langtools/tools/javac/diags/examples/IllegalComboModifiers.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalDot.java b/test/langtools/tools/javac/diags/examples/IllegalDot.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalDot.java rename to test/langtools/tools/javac/diags/examples/IllegalDot.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalEnumStaticRef.java b/test/langtools/tools/javac/diags/examples/IllegalEnumStaticRef.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalEnumStaticRef.java rename to test/langtools/tools/javac/diags/examples/IllegalEnumStaticRef.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalEscapeChar.java b/test/langtools/tools/javac/diags/examples/IllegalEscapeChar.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalEscapeChar.java rename to test/langtools/tools/javac/diags/examples/IllegalEscapeChar.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalForwardRef.java b/test/langtools/tools/javac/diags/examples/IllegalForwardRef.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalForwardRef.java rename to test/langtools/tools/javac/diags/examples/IllegalForwardRef.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalInitializer.java b/test/langtools/tools/javac/diags/examples/IllegalInitializer.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalInitializer.java rename to test/langtools/tools/javac/diags/examples/IllegalInitializer.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalLineEndInCharLit.java b/test/langtools/tools/javac/diags/examples/IllegalLineEndInCharLit.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalLineEndInCharLit.java rename to test/langtools/tools/javac/diags/examples/IllegalLineEndInCharLit.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalNonAsciiDigit.java b/test/langtools/tools/javac/diags/examples/IllegalNonAsciiDigit.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalNonAsciiDigit.java rename to test/langtools/tools/javac/diags/examples/IllegalNonAsciiDigit.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalParanthesisExpression.java b/test/langtools/tools/javac/diags/examples/IllegalParanthesisExpression.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalParanthesisExpression.java rename to test/langtools/tools/javac/diags/examples/IllegalParanthesisExpression.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalQualNotIcls.java b/test/langtools/tools/javac/diags/examples/IllegalQualNotIcls.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalQualNotIcls.java rename to test/langtools/tools/javac/diags/examples/IllegalQualNotIcls.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalSelfRef.java b/test/langtools/tools/javac/diags/examples/IllegalSelfRef.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalSelfRef.java rename to test/langtools/tools/javac/diags/examples/IllegalSelfRef.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalStartOfExpr.java b/test/langtools/tools/javac/diags/examples/IllegalStartOfExpr.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalStartOfExpr.java rename to test/langtools/tools/javac/diags/examples/IllegalStartOfExpr.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalStartOfStmt.java b/test/langtools/tools/javac/diags/examples/IllegalStartOfStmt.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalStartOfStmt.java rename to test/langtools/tools/javac/diags/examples/IllegalStartOfStmt.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalStartOfType.java b/test/langtools/tools/javac/diags/examples/IllegalStartOfType.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalStartOfType.java rename to test/langtools/tools/javac/diags/examples/IllegalStartOfType.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalStaticIntfMethCall.java b/test/langtools/tools/javac/diags/examples/IllegalStaticIntfMethCall.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalStaticIntfMethCall.java rename to test/langtools/tools/javac/diags/examples/IllegalStaticIntfMethCall.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalUnderscore.java b/test/langtools/tools/javac/diags/examples/IllegalUnderscore.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalUnderscore.java rename to test/langtools/tools/javac/diags/examples/IllegalUnderscore.java diff --git a/langtools/test/tools/javac/diags/examples/IllegalUnicodeEscape.java b/test/langtools/tools/javac/diags/examples/IllegalUnicodeEscape.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IllegalUnicodeEscape.java rename to test/langtools/tools/javac/diags/examples/IllegalUnicodeEscape.java diff --git a/langtools/test/tools/javac/diags/examples/ImportRequiresCanonical/ImportRequiresCanonical.java b/test/langtools/tools/javac/diags/examples/ImportRequiresCanonical/ImportRequiresCanonical.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ImportRequiresCanonical/ImportRequiresCanonical.java rename to test/langtools/tools/javac/diags/examples/ImportRequiresCanonical/ImportRequiresCanonical.java diff --git a/langtools/test/tools/javac/diags/examples/ImportRequiresCanonical/p/Base.java b/test/langtools/tools/javac/diags/examples/ImportRequiresCanonical/p/Base.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ImportRequiresCanonical/p/Base.java rename to test/langtools/tools/javac/diags/examples/ImportRequiresCanonical/p/Base.java diff --git a/langtools/test/tools/javac/diags/examples/ImportRequiresCanonical/p/ExtendsBase.java b/test/langtools/tools/javac/diags/examples/ImportRequiresCanonical/p/ExtendsBase.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ImportRequiresCanonical/p/ExtendsBase.java rename to test/langtools/tools/javac/diags/examples/ImportRequiresCanonical/p/ExtendsBase.java diff --git a/langtools/test/tools/javac/diags/examples/ImproperSVUID.java b/test/langtools/tools/javac/diags/examples/ImproperSVUID.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ImproperSVUID.java rename to test/langtools/tools/javac/diags/examples/ImproperSVUID.java diff --git a/langtools/test/tools/javac/diags/examples/ImproperTypeInnerRawParam.java b/test/langtools/tools/javac/diags/examples/ImproperTypeInnerRawParam.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ImproperTypeInnerRawParam.java rename to test/langtools/tools/javac/diags/examples/ImproperTypeInnerRawParam.java diff --git a/langtools/test/tools/javac/diags/examples/ImproperTypeParamMissing.java b/test/langtools/tools/javac/diags/examples/ImproperTypeParamMissing.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ImproperTypeParamMissing.java rename to test/langtools/tools/javac/diags/examples/ImproperTypeParamMissing.java diff --git a/langtools/test/tools/javac/diags/examples/InaccessibleVarargsType/InaccessibleVarargsType.java b/test/langtools/tools/javac/diags/examples/InaccessibleVarargsType/InaccessibleVarargsType.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InaccessibleVarargsType/InaccessibleVarargsType.java rename to test/langtools/tools/javac/diags/examples/InaccessibleVarargsType/InaccessibleVarargsType.java diff --git a/langtools/test/tools/javac/diags/examples/InaccessibleVarargsType/p1/A.java b/test/langtools/tools/javac/diags/examples/InaccessibleVarargsType/p1/A.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InaccessibleVarargsType/p1/A.java rename to test/langtools/tools/javac/diags/examples/InaccessibleVarargsType/p1/A.java diff --git a/langtools/test/tools/javac/diags/examples/InaccessibleVarargsType/p1/B.java b/test/langtools/tools/javac/diags/examples/InaccessibleVarargsType/p1/B.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InaccessibleVarargsType/p1/B.java rename to test/langtools/tools/javac/diags/examples/InaccessibleVarargsType/p1/B.java diff --git a/langtools/test/tools/javac/diags/examples/InapplicableSymbols.java b/test/langtools/tools/javac/diags/examples/InapplicableSymbols.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InapplicableSymbols.java rename to test/langtools/tools/javac/diags/examples/InapplicableSymbols.java diff --git a/langtools/test/tools/javac/diags/examples/IncomparableTypes.java b/test/langtools/tools/javac/diags/examples/IncomparableTypes.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncomparableTypes.java rename to test/langtools/tools/javac/diags/examples/IncomparableTypes.java diff --git a/langtools/test/tools/javac/diags/examples/IncompatibleAbstracts.java b/test/langtools/tools/javac/diags/examples/IncompatibleAbstracts.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncompatibleAbstracts.java rename to test/langtools/tools/javac/diags/examples/IncompatibleAbstracts.java diff --git a/langtools/test/tools/javac/diags/examples/IncompatibleArgTypesInLambda.java b/test/langtools/tools/javac/diags/examples/IncompatibleArgTypesInLambda.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncompatibleArgTypesInLambda.java rename to test/langtools/tools/javac/diags/examples/IncompatibleArgTypesInLambda.java diff --git a/langtools/test/tools/javac/diags/examples/IncompatibleArgTypesInMethodRef.java b/test/langtools/tools/javac/diags/examples/IncompatibleArgTypesInMethodRef.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncompatibleArgTypesInMethodRef.java rename to test/langtools/tools/javac/diags/examples/IncompatibleArgTypesInMethodRef.java diff --git a/langtools/test/tools/javac/diags/examples/IncompatibleDescsInFunctionalIntf.java b/test/langtools/tools/javac/diags/examples/IncompatibleDescsInFunctionalIntf.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncompatibleDescsInFunctionalIntf.java rename to test/langtools/tools/javac/diags/examples/IncompatibleDescsInFunctionalIntf.java diff --git a/langtools/test/tools/javac/diags/examples/IncompatibleEqUpperBounds.java b/test/langtools/tools/javac/diags/examples/IncompatibleEqUpperBounds.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncompatibleEqUpperBounds.java rename to test/langtools/tools/javac/diags/examples/IncompatibleEqUpperBounds.java diff --git a/langtools/test/tools/javac/diags/examples/IncompatibleRetTypeInLambda.java b/test/langtools/tools/javac/diags/examples/IncompatibleRetTypeInLambda.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncompatibleRetTypeInLambda.java rename to test/langtools/tools/javac/diags/examples/IncompatibleRetTypeInLambda.java diff --git a/langtools/test/tools/javac/diags/examples/IncompatibleRetTypeInMref.java b/test/langtools/tools/javac/diags/examples/IncompatibleRetTypeInMref.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncompatibleRetTypeInMref.java rename to test/langtools/tools/javac/diags/examples/IncompatibleRetTypeInMref.java diff --git a/langtools/test/tools/javac/diags/examples/IncompatibleThrownTypesInMref.java b/test/langtools/tools/javac/diags/examples/IncompatibleThrownTypesInMref.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncompatibleThrownTypesInMref.java rename to test/langtools/tools/javac/diags/examples/IncompatibleThrownTypesInMref.java diff --git a/langtools/test/tools/javac/diags/examples/IncompatibleTypes1.java b/test/langtools/tools/javac/diags/examples/IncompatibleTypes1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncompatibleTypes1.java rename to test/langtools/tools/javac/diags/examples/IncompatibleTypes1.java diff --git a/langtools/test/tools/javac/diags/examples/IncompatibleTypesInConditional.java b/test/langtools/tools/javac/diags/examples/IncompatibleTypesInConditional.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncompatibleTypesInConditional.java rename to test/langtools/tools/javac/diags/examples/IncompatibleTypesInConditional.java diff --git a/langtools/test/tools/javac/diags/examples/IncompatibleUpperBounds.java b/test/langtools/tools/javac/diags/examples/IncompatibleUpperBounds.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncompatibleUpperBounds.java rename to test/langtools/tools/javac/diags/examples/IncompatibleUpperBounds.java diff --git a/langtools/test/tools/javac/diags/examples/InconvertibleTypes.java b/test/langtools/tools/javac/diags/examples/InconvertibleTypes.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InconvertibleTypes.java rename to test/langtools/tools/javac/diags/examples/InconvertibleTypes.java diff --git a/langtools/test/tools/javac/diags/examples/IncorrectConstructorReceiverName.java b/test/langtools/tools/javac/diags/examples/IncorrectConstructorReceiverName.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncorrectConstructorReceiverName.java rename to test/langtools/tools/javac/diags/examples/IncorrectConstructorReceiverName.java diff --git a/langtools/test/tools/javac/diags/examples/IncorrectConstructorReceiverType.java b/test/langtools/tools/javac/diags/examples/IncorrectConstructorReceiverType.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncorrectConstructorReceiverType.java rename to test/langtools/tools/javac/diags/examples/IncorrectConstructorReceiverType.java diff --git a/langtools/test/tools/javac/diags/examples/IncorrectReceiverName.java b/test/langtools/tools/javac/diags/examples/IncorrectReceiverName.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncorrectReceiverName.java rename to test/langtools/tools/javac/diags/examples/IncorrectReceiverName.java diff --git a/langtools/test/tools/javac/diags/examples/IncorrectReceiverType.java b/test/langtools/tools/javac/diags/examples/IncorrectReceiverType.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IncorrectReceiverType.java rename to test/langtools/tools/javac/diags/examples/IncorrectReceiverType.java diff --git a/langtools/test/tools/javac/diags/examples/InexactVarargsCall.java b/test/langtools/tools/javac/diags/examples/InexactVarargsCall.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InexactVarargsCall.java rename to test/langtools/tools/javac/diags/examples/InexactVarargsCall.java diff --git a/langtools/test/tools/javac/diags/examples/InferArgsLengthMismatch.java b/test/langtools/tools/javac/diags/examples/InferArgsLengthMismatch.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InferArgsLengthMismatch.java rename to test/langtools/tools/javac/diags/examples/InferArgsLengthMismatch.java diff --git a/langtools/test/tools/javac/diags/examples/InferNoConformingAssignment.java b/test/langtools/tools/javac/diags/examples/InferNoConformingAssignment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InferNoConformingAssignment.java rename to test/langtools/tools/javac/diags/examples/InferNoConformingAssignment.java diff --git a/langtools/test/tools/javac/diags/examples/InferVarargsArgumentMismatch.java b/test/langtools/tools/javac/diags/examples/InferVarargsArgumentMismatch.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InferVarargsArgumentMismatch.java rename to test/langtools/tools/javac/diags/examples/InferVarargsArgumentMismatch.java diff --git a/langtools/test/tools/javac/diags/examples/InferredDoNotConformToEq.java b/test/langtools/tools/javac/diags/examples/InferredDoNotConformToEq.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InferredDoNotConformToEq.java rename to test/langtools/tools/javac/diags/examples/InferredDoNotConformToEq.java diff --git a/langtools/test/tools/javac/diags/examples/InferredDoNotConformToUpper.java b/test/langtools/tools/javac/diags/examples/InferredDoNotConformToUpper.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InferredDoNotConformToUpper.java rename to test/langtools/tools/javac/diags/examples/InferredDoNotConformToUpper.java diff --git a/langtools/test/tools/javac/diags/examples/InheritFromFinal.java b/test/langtools/tools/javac/diags/examples/InheritFromFinal.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InheritFromFinal.java rename to test/langtools/tools/javac/diags/examples/InheritFromFinal.java diff --git a/langtools/test/tools/javac/diags/examples/InitializerMustComplete.java b/test/langtools/tools/javac/diags/examples/InitializerMustComplete.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InitializerMustComplete.java rename to test/langtools/tools/javac/diags/examples/InitializerMustComplete.java diff --git a/langtools/test/tools/javac/diags/examples/InitializerNotAllowed.java b/test/langtools/tools/javac/diags/examples/InitializerNotAllowed.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InitializerNotAllowed.java rename to test/langtools/tools/javac/diags/examples/InitializerNotAllowed.java diff --git a/langtools/test/tools/javac/diags/examples/InnerClassCantHaveStatic.java b/test/langtools/tools/javac/diags/examples/InnerClassCantHaveStatic.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InnerClassCantHaveStatic.java rename to test/langtools/tools/javac/diags/examples/InnerClassCantHaveStatic.java diff --git a/langtools/test/tools/javac/diags/examples/IntNumberTooLarge.java b/test/langtools/tools/javac/diags/examples/IntNumberTooLarge.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IntNumberTooLarge.java rename to test/langtools/tools/javac/diags/examples/IntNumberTooLarge.java diff --git a/langtools/test/tools/javac/diags/examples/InterfaceExpected.java b/test/langtools/tools/javac/diags/examples/InterfaceExpected.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InterfaceExpected.java rename to test/langtools/tools/javac/diags/examples/InterfaceExpected.java diff --git a/langtools/test/tools/javac/diags/examples/InterfaceNotAllowed.java b/test/langtools/tools/javac/diags/examples/InterfaceNotAllowed.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InterfaceNotAllowed.java rename to test/langtools/tools/javac/diags/examples/InterfaceNotAllowed.java diff --git a/langtools/test/tools/javac/diags/examples/IntersectionTypesInCastNotSupported.java b/test/langtools/tools/javac/diags/examples/IntersectionTypesInCastNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IntersectionTypesInCastNotSupported.java rename to test/langtools/tools/javac/diags/examples/IntersectionTypesInCastNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/IntfAnnotationCantHaveTypeParams.java b/test/langtools/tools/javac/diags/examples/IntfAnnotationCantHaveTypeParams.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IntfAnnotationCantHaveTypeParams.java rename to test/langtools/tools/javac/diags/examples/IntfAnnotationCantHaveTypeParams.java diff --git a/langtools/test/tools/javac/diags/examples/IntfAnnotationMemberClash.java b/test/langtools/tools/javac/diags/examples/IntfAnnotationMemberClash.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IntfAnnotationMemberClash.java rename to test/langtools/tools/javac/diags/examples/IntfAnnotationMemberClash.java diff --git a/langtools/test/tools/javac/diags/examples/IntfAnnotationsCantHaveParams.java b/test/langtools/tools/javac/diags/examples/IntfAnnotationsCantHaveParams.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IntfAnnotationsCantHaveParams.java rename to test/langtools/tools/javac/diags/examples/IntfAnnotationsCantHaveParams.java diff --git a/langtools/test/tools/javac/diags/examples/IntfAnnotationsCantHaveTypeParams.java b/test/langtools/tools/javac/diags/examples/IntfAnnotationsCantHaveTypeParams.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IntfAnnotationsCantHaveTypeParams.java rename to test/langtools/tools/javac/diags/examples/IntfAnnotationsCantHaveTypeParams.java diff --git a/langtools/test/tools/javac/diags/examples/IntfMethodCantHaveBody.java b/test/langtools/tools/javac/diags/examples/IntfMethodCantHaveBody.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/IntfMethodCantHaveBody.java rename to test/langtools/tools/javac/diags/examples/IntfMethodCantHaveBody.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidAnnoMemberType.java b/test/langtools/tools/javac/diags/examples/InvalidAnnoMemberType.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidAnnoMemberType.java rename to test/langtools/tools/javac/diags/examples/InvalidAnnoMemberType.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidBinaryNumber.java b/test/langtools/tools/javac/diags/examples/InvalidBinaryNumber.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidBinaryNumber.java rename to test/langtools/tools/javac/diags/examples/InvalidBinaryNumber.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidDefaultInterface/InvalidDefaultInterface.java b/test/langtools/tools/javac/diags/examples/InvalidDefaultInterface/InvalidDefaultInterface.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidDefaultInterface/InvalidDefaultInterface.java rename to test/langtools/tools/javac/diags/examples/InvalidDefaultInterface/InvalidDefaultInterface.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidDefaultInterface/processors/CreateBadClassFile.java b/test/langtools/tools/javac/diags/examples/InvalidDefaultInterface/processors/CreateBadClassFile.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidDefaultInterface/processors/CreateBadClassFile.java rename to test/langtools/tools/javac/diags/examples/InvalidDefaultInterface/processors/CreateBadClassFile.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidDuplicateAnnotation.java b/test/langtools/tools/javac/diags/examples/InvalidDuplicateAnnotation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidDuplicateAnnotation.java rename to test/langtools/tools/javac/diags/examples/InvalidDuplicateAnnotation.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidGenericLambdaTarget.java b/test/langtools/tools/javac/diags/examples/InvalidGenericLambdaTarget.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidGenericLambdaTarget.java rename to test/langtools/tools/javac/diags/examples/InvalidGenericLambdaTarget.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidHexNumber.java b/test/langtools/tools/javac/diags/examples/InvalidHexNumber.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidHexNumber.java rename to test/langtools/tools/javac/diags/examples/InvalidHexNumber.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidInstanceof.java b/test/langtools/tools/javac/diags/examples/InvalidInstanceof.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidInstanceof.java rename to test/langtools/tools/javac/diags/examples/InvalidInstanceof.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidMethodDecl.java b/test/langtools/tools/javac/diags/examples/InvalidMethodDecl.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidMethodDecl.java rename to test/langtools/tools/javac/diags/examples/InvalidMethodDecl.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidModuleDirective/module-info.java b/test/langtools/tools/javac/diags/examples/InvalidModuleDirective/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidModuleDirective/module-info.java rename to test/langtools/tools/javac/diags/examples/InvalidModuleDirective/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidStaticInterface/InvalidStaticInterface.java b/test/langtools/tools/javac/diags/examples/InvalidStaticInterface/InvalidStaticInterface.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidStaticInterface/InvalidStaticInterface.java rename to test/langtools/tools/javac/diags/examples/InvalidStaticInterface/InvalidStaticInterface.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidStaticInterface/processors/CreateBadClassFile.java b/test/langtools/tools/javac/diags/examples/InvalidStaticInterface/processors/CreateBadClassFile.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidStaticInterface/processors/CreateBadClassFile.java rename to test/langtools/tools/javac/diags/examples/InvalidStaticInterface/processors/CreateBadClassFile.java diff --git a/langtools/test/tools/javac/diags/examples/InvalidTypeContextRepeatableAnnotation.java b/test/langtools/tools/javac/diags/examples/InvalidTypeContextRepeatableAnnotation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/InvalidTypeContextRepeatableAnnotation.java rename to test/langtools/tools/javac/diags/examples/InvalidTypeContextRepeatableAnnotation.java diff --git a/langtools/test/tools/javac/diags/examples/KindnameClass.java b/test/langtools/tools/javac/diags/examples/KindnameClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/KindnameClass.java rename to test/langtools/tools/javac/diags/examples/KindnameClass.java diff --git a/langtools/test/tools/javac/diags/examples/KindnameConstructor.java b/test/langtools/tools/javac/diags/examples/KindnameConstructor.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/KindnameConstructor.java rename to test/langtools/tools/javac/diags/examples/KindnameConstructor.java diff --git a/langtools/test/tools/javac/diags/examples/KindnameInstanceInit.java b/test/langtools/tools/javac/diags/examples/KindnameInstanceInit.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/KindnameInstanceInit.java rename to test/langtools/tools/javac/diags/examples/KindnameInstanceInit.java diff --git a/langtools/test/tools/javac/diags/examples/KindnameMethod.java b/test/langtools/tools/javac/diags/examples/KindnameMethod.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/KindnameMethod.java rename to test/langtools/tools/javac/diags/examples/KindnameMethod.java diff --git a/langtools/test/tools/javac/diags/examples/KindnameStaticInit.java b/test/langtools/tools/javac/diags/examples/KindnameStaticInit.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/KindnameStaticInit.java rename to test/langtools/tools/javac/diags/examples/KindnameStaticInit.java diff --git a/langtools/test/tools/javac/diags/examples/KindnameVariable.java b/test/langtools/tools/javac/diags/examples/KindnameVariable.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/KindnameVariable.java rename to test/langtools/tools/javac/diags/examples/KindnameVariable.java diff --git a/langtools/test/tools/javac/diags/examples/LabelInUse.java b/test/langtools/tools/javac/diags/examples/LabelInUse.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LabelInUse.java rename to test/langtools/tools/javac/diags/examples/LabelInUse.java diff --git a/langtools/test/tools/javac/diags/examples/LambdaBodyNeitherValueNorVoidCompatible.java b/test/langtools/tools/javac/diags/examples/LambdaBodyNeitherValueNorVoidCompatible.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LambdaBodyNeitherValueNorVoidCompatible.java rename to test/langtools/tools/javac/diags/examples/LambdaBodyNeitherValueNorVoidCompatible.java diff --git a/langtools/test/tools/javac/diags/examples/LambdaNotSupported.java b/test/langtools/tools/javac/diags/examples/LambdaNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LambdaNotSupported.java rename to test/langtools/tools/javac/diags/examples/LambdaNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/LambdaStat.java b/test/langtools/tools/javac/diags/examples/LambdaStat.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LambdaStat.java rename to test/langtools/tools/javac/diags/examples/LambdaStat.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessible/LeaksNotAccessible.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessible/LeaksNotAccessible.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessible/LeaksNotAccessible.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessible/LeaksNotAccessible.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/api/Api.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/api/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/api/Api.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/api/Api.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/LeaksNotAccessibleNotRequiredTransitive.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/LeaksNotAccessibleNotRequiredTransitive.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/LeaksNotAccessibleNotRequiredTransitive.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/LeaksNotAccessibleNotRequiredTransitive.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/api1/Api1.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/api1/Api1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/api1/Api1.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/api1/Api1.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/api2/Api2.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/api2/Api2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/api2/Api2.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/api2/Api2.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/module-info.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/module-info.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/LeaksNotAccessibleUnexported.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexported/LeaksNotAccessibleUnexported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/LeaksNotAccessibleUnexported.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexported/LeaksNotAccessibleUnexported.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/api/Api.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/api/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/api/Api.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/api/Api.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/impl/Impl.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/impl/Impl.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/impl/Impl.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/impl/Impl.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/LeaksNotAccessibleUnexportedQualified.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/LeaksNotAccessibleUnexportedQualified.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/LeaksNotAccessibleUnexportedQualified.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/LeaksNotAccessibleUnexportedQualified.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/api/Api.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/api/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/api/Api.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/api/Api.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/qapi/QApi.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/qapi/QApi.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/qapi/QApi.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/qapi/QApi.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m2x/module-info.java b/test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m2x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m2x/module-info.java rename to test/langtools/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m2x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/LocalEnum.java b/test/langtools/tools/javac/diags/examples/LocalEnum.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LocalEnum.java rename to test/langtools/tools/javac/diags/examples/LocalEnum.java diff --git a/langtools/test/tools/javac/diags/examples/LocalVarNeedsFinal.java b/test/langtools/tools/javac/diags/examples/LocalVarNeedsFinal.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LocalVarNeedsFinal.java rename to test/langtools/tools/javac/diags/examples/LocalVarNeedsFinal.java diff --git a/langtools/test/tools/javac/diags/examples/Location.java b/test/langtools/tools/javac/diags/examples/Location.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/Location.java rename to test/langtools/tools/javac/diags/examples/Location.java diff --git a/langtools/test/tools/javac/diags/examples/Location1.java b/test/langtools/tools/javac/diags/examples/Location1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/Location1.java rename to test/langtools/tools/javac/diags/examples/Location1.java diff --git a/langtools/test/tools/javac/diags/examples/LongSVUID.java b/test/langtools/tools/javac/diags/examples/LongSVUID.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LongSVUID.java rename to test/langtools/tools/javac/diags/examples/LongSVUID.java diff --git a/langtools/test/tools/javac/diags/examples/MalformedFpLit.java b/test/langtools/tools/javac/diags/examples/MalformedFpLit.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MalformedFpLit.java rename to test/langtools/tools/javac/diags/examples/MalformedFpLit.java diff --git a/langtools/test/tools/javac/diags/examples/MalformedHTML.java b/test/langtools/tools/javac/diags/examples/MalformedHTML.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MalformedHTML.java rename to test/langtools/tools/javac/diags/examples/MalformedHTML.java diff --git a/langtools/test/tools/javac/diags/examples/MalformedSupported/MalformedSupported.java b/test/langtools/tools/javac/diags/examples/MalformedSupported/MalformedSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MalformedSupported/MalformedSupported.java rename to test/langtools/tools/javac/diags/examples/MalformedSupported/MalformedSupported.java diff --git a/langtools/test/tools/javac/diags/examples/MalformedSupported/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/MalformedSupported/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MalformedSupported/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/MalformedSupported/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/MethodDoesNotOverride.java b/test/langtools/tools/javac/diags/examples/MethodDoesNotOverride.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MethodDoesNotOverride.java rename to test/langtools/tools/javac/diags/examples/MethodDoesNotOverride.java diff --git a/langtools/test/tools/javac/diags/examples/MethodInvokedWithWrongNumberOfArgs.java b/test/langtools/tools/javac/diags/examples/MethodInvokedWithWrongNumberOfArgs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MethodInvokedWithWrongNumberOfArgs.java rename to test/langtools/tools/javac/diags/examples/MethodInvokedWithWrongNumberOfArgs.java diff --git a/langtools/test/tools/javac/diags/examples/MethodRedundantTypeargs.java b/test/langtools/tools/javac/diags/examples/MethodRedundantTypeargs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MethodRedundantTypeargs.java rename to test/langtools/tools/javac/diags/examples/MethodRedundantTypeargs.java diff --git a/langtools/test/tools/javac/diags/examples/MethodReferencesNotSupported.java b/test/langtools/tools/javac/diags/examples/MethodReferencesNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MethodReferencesNotSupported.java rename to test/langtools/tools/javac/diags/examples/MethodReferencesNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/MightBeAssignedInLoop.java b/test/langtools/tools/javac/diags/examples/MightBeAssignedInLoop.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MightBeAssignedInLoop.java rename to test/langtools/tools/javac/diags/examples/MightBeAssignedInLoop.java diff --git a/langtools/test/tools/javac/diags/examples/MissingDeprecatedAnnotation.java b/test/langtools/tools/javac/diags/examples/MissingDeprecatedAnnotation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MissingDeprecatedAnnotation.java rename to test/langtools/tools/javac/diags/examples/MissingDeprecatedAnnotation.java diff --git a/langtools/test/tools/javac/diags/examples/MissingMethodBody.java b/test/langtools/tools/javac/diags/examples/MissingMethodBody.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MissingMethodBody.java rename to test/langtools/tools/javac/diags/examples/MissingMethodBody.java diff --git a/langtools/test/tools/javac/diags/examples/MissingReturnStatement.java b/test/langtools/tools/javac/diags/examples/MissingReturnStatement.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MissingReturnStatement.java rename to test/langtools/tools/javac/diags/examples/MissingReturnStatement.java diff --git a/langtools/test/tools/javac/diags/examples/MissingReturnValue.java b/test/langtools/tools/javac/diags/examples/MissingReturnValue.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MissingReturnValue.java rename to test/langtools/tools/javac/diags/examples/MissingReturnValue.java diff --git a/langtools/test/tools/javac/diags/examples/MissingReturnValueFragment.java b/test/langtools/tools/javac/diags/examples/MissingReturnValueFragment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MissingReturnValueFragment.java rename to test/langtools/tools/javac/diags/examples/MissingReturnValueFragment.java diff --git a/langtools/test/tools/javac/diags/examples/MissingSVUID.java b/test/langtools/tools/javac/diags/examples/MissingSVUID.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MissingSVUID.java rename to test/langtools/tools/javac/diags/examples/MissingSVUID.java diff --git a/langtools/test/tools/javac/diags/examples/MissingSemicolon.java b/test/langtools/tools/javac/diags/examples/MissingSemicolon.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MissingSemicolon.java rename to test/langtools/tools/javac/diags/examples/MissingSemicolon.java diff --git a/langtools/test/tools/javac/diags/examples/ModifierNotAllowed.java b/test/langtools/tools/javac/diags/examples/ModifierNotAllowed.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModifierNotAllowed.java rename to test/langtools/tools/javac/diags/examples/ModifierNotAllowed.java diff --git a/langtools/test/tools/javac/diags/examples/ModuleDeclSbInModuleInfoJava.java b/test/langtools/tools/javac/diags/examples/ModuleDeclSbInModuleInfoJava.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModuleDeclSbInModuleInfoJava.java rename to test/langtools/tools/javac/diags/examples/ModuleDeclSbInModuleInfoJava.java diff --git a/langtools/test/tools/javac/diags/examples/ModuleForOptionNotFound.java b/test/langtools/tools/javac/diags/examples/ModuleForOptionNotFound.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModuleForOptionNotFound.java rename to test/langtools/tools/javac/diags/examples/ModuleForOptionNotFound.java diff --git a/langtools/test/tools/javac/diags/examples/ModuleInfoWithoutModule/ModuleInfoWithoutModule.java b/test/langtools/tools/javac/diags/examples/ModuleInfoWithoutModule/ModuleInfoWithoutModule.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModuleInfoWithoutModule/ModuleInfoWithoutModule.java rename to test/langtools/tools/javac/diags/examples/ModuleInfoWithoutModule/ModuleInfoWithoutModule.java diff --git a/langtools/test/tools/javac/diags/examples/ModuleInfoWithoutModule/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/ModuleInfoWithoutModule/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModuleInfoWithoutModule/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/ModuleInfoWithoutModule/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ModuleNameMismatch/ModuleNameMismatch.java b/test/langtools/tools/javac/diags/examples/ModuleNameMismatch/ModuleNameMismatch.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModuleNameMismatch/ModuleNameMismatch.java rename to test/langtools/tools/javac/diags/examples/ModuleNameMismatch/ModuleNameMismatch.java diff --git a/langtools/test/tools/javac/diags/examples/ModuleNameMismatch/modulesourcepath/m/module-info.java b/test/langtools/tools/javac/diags/examples/ModuleNameMismatch/modulesourcepath/m/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModuleNameMismatch/modulesourcepath/m/module-info.java rename to test/langtools/tools/javac/diags/examples/ModuleNameMismatch/modulesourcepath/m/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ModuleNotFound/module-info.java b/test/langtools/tools/javac/diags/examples/ModuleNotFound/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModuleNotFound/module-info.java rename to test/langtools/tools/javac/diags/examples/ModuleNotFound/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ModuleNotFoundInModuleSourcePath/ModuleNotFoundInModuleSourcePath.java b/test/langtools/tools/javac/diags/examples/ModuleNotFoundInModuleSourcePath/ModuleNotFoundInModuleSourcePath.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModuleNotFoundInModuleSourcePath/ModuleNotFoundInModuleSourcePath.java rename to test/langtools/tools/javac/diags/examples/ModuleNotFoundInModuleSourcePath/ModuleNotFoundInModuleSourcePath.java diff --git a/langtools/test/tools/javac/diags/examples/ModuleNotOnModuleSourcePath/ModuleNotOnModuleSourcePath.java b/test/langtools/tools/javac/diags/examples/ModuleNotOnModuleSourcePath/ModuleNotOnModuleSourcePath.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModuleNotOnModuleSourcePath/ModuleNotOnModuleSourcePath.java rename to test/langtools/tools/javac/diags/examples/ModuleNotOnModuleSourcePath/ModuleNotOnModuleSourcePath.java diff --git a/langtools/test/tools/javac/diags/examples/ModuleNotOnModuleSourcePath/modulesourcepath/m/extra/module-info.java b/test/langtools/tools/javac/diags/examples/ModuleNotOnModuleSourcePath/modulesourcepath/m/extra/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModuleNotOnModuleSourcePath/modulesourcepath/m/extra/module-info.java rename to test/langtools/tools/javac/diags/examples/ModuleNotOnModuleSourcePath/modulesourcepath/m/extra/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ModuleSourcePathMustWithDashM/ModuleSourcePathMustWithDashM.java b/test/langtools/tools/javac/diags/examples/ModuleSourcePathMustWithDashM/ModuleSourcePathMustWithDashM.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModuleSourcePathMustWithDashM/ModuleSourcePathMustWithDashM.java rename to test/langtools/tools/javac/diags/examples/ModuleSourcePathMustWithDashM/ModuleSourcePathMustWithDashM.java diff --git a/langtools/test/tools/javac/diags/examples/ModulesNotSupportedInSource/module-info.java b/test/langtools/tools/javac/diags/examples/ModulesNotSupportedInSource/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ModulesNotSupportedInSource/module-info.java rename to test/langtools/tools/javac/diags/examples/ModulesNotSupportedInSource/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/MrefInferAndExplicitParams.java b/test/langtools/tools/javac/diags/examples/MrefInferAndExplicitParams.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MrefInferAndExplicitParams.java rename to test/langtools/tools/javac/diags/examples/MrefInferAndExplicitParams.java diff --git a/langtools/test/tools/javac/diags/examples/MrefStat.java b/test/langtools/tools/javac/diags/examples/MrefStat.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MrefStat.java rename to test/langtools/tools/javac/diags/examples/MrefStat.java diff --git a/langtools/test/tools/javac/diags/examples/MrefStat1.java b/test/langtools/tools/javac/diags/examples/MrefStat1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MrefStat1.java rename to test/langtools/tools/javac/diags/examples/MrefStat1.java diff --git a/langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/MultiModuleOutputCannotBeExplodedModule.java b/test/langtools/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/MultiModuleOutputCannotBeExplodedModule.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/MultiModuleOutputCannotBeExplodedModule.java rename to test/langtools/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/MultiModuleOutputCannotBeExplodedModule.java diff --git a/langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/additional/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/additional/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/additional/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/additional/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/modulesourcepath/m2x/module-info.java b/test/langtools/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/modulesourcepath/m2x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/modulesourcepath/m2x/module-info.java rename to test/langtools/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/modulesourcepath/m2x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/MulticatchCantBeAssigned.java b/test/langtools/tools/javac/diags/examples/MulticatchCantBeAssigned.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MulticatchCantBeAssigned.java rename to test/langtools/tools/javac/diags/examples/MulticatchCantBeAssigned.java diff --git a/langtools/test/tools/javac/diags/examples/MulticatchNotSupported.java b/test/langtools/tools/javac/diags/examples/MulticatchNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MulticatchNotSupported.java rename to test/langtools/tools/javac/diags/examples/MulticatchNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/MulticatchTypesMustBeDisjoint.java b/test/langtools/tools/javac/diags/examples/MulticatchTypesMustBeDisjoint.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/MulticatchTypesMustBeDisjoint.java rename to test/langtools/tools/javac/diags/examples/MulticatchTypesMustBeDisjoint.java diff --git a/langtools/test/tools/javac/diags/examples/NameClashSameErasure.java b/test/langtools/tools/javac/diags/examples/NameClashSameErasure.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NameClashSameErasure.java rename to test/langtools/tools/javac/diags/examples/NameClashSameErasure.java diff --git a/langtools/test/tools/javac/diags/examples/NameClashSameErasureNoHide.java b/test/langtools/tools/javac/diags/examples/NameClashSameErasureNoHide.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NameClashSameErasureNoHide.java rename to test/langtools/tools/javac/diags/examples/NameClashSameErasureNoHide.java diff --git a/langtools/test/tools/javac/diags/examples/NameClashSameErasureNoOverride.java b/test/langtools/tools/javac/diags/examples/NameClashSameErasureNoOverride.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NameClashSameErasureNoOverride.java rename to test/langtools/tools/javac/diags/examples/NameClashSameErasureNoOverride.java diff --git a/langtools/test/tools/javac/diags/examples/NameClashSameErasureNoOverride1.java b/test/langtools/tools/javac/diags/examples/NameClashSameErasureNoOverride1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NameClashSameErasureNoOverride1.java rename to test/langtools/tools/javac/diags/examples/NameClashSameErasureNoOverride1.java diff --git a/langtools/test/tools/javac/diags/examples/NativeMethodCantHaveBody.java b/test/langtools/tools/javac/diags/examples/NativeMethodCantHaveBody.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NativeMethodCantHaveBody.java rename to test/langtools/tools/javac/diags/examples/NativeMethodCantHaveBody.java diff --git a/langtools/test/tools/javac/diags/examples/NeitherConditionalSubtype.java b/test/langtools/tools/javac/diags/examples/NeitherConditionalSubtype.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NeitherConditionalSubtype.java rename to test/langtools/tools/javac/diags/examples/NeitherConditionalSubtype.java diff --git a/langtools/test/tools/javac/diags/examples/NewNotAllowedInAnno.java b/test/langtools/tools/javac/diags/examples/NewNotAllowedInAnno.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NewNotAllowedInAnno.java rename to test/langtools/tools/javac/diags/examples/NewNotAllowedInAnno.java diff --git a/langtools/test/tools/javac/diags/examples/NoAbstracts.java b/test/langtools/tools/javac/diags/examples/NoAbstracts.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoAbstracts.java rename to test/langtools/tools/javac/diags/examples/NoAbstracts.java diff --git a/langtools/test/tools/javac/diags/examples/NoAnnotationsOnDotClass.java b/test/langtools/tools/javac/diags/examples/NoAnnotationsOnDotClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoAnnotationsOnDotClass.java rename to test/langtools/tools/javac/diags/examples/NoAnnotationsOnDotClass.java diff --git a/langtools/test/tools/javac/diags/examples/NoArgs.java b/test/langtools/tools/javac/diags/examples/NoArgs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoArgs.java rename to test/langtools/tools/javac/diags/examples/NoArgs.java diff --git a/langtools/test/tools/javac/diags/examples/NoContent.java b/test/langtools/tools/javac/diags/examples/NoContent.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoContent.java rename to test/langtools/tools/javac/diags/examples/NoContent.java diff --git a/langtools/test/tools/javac/diags/examples/NoExplicitAnnoProcRequested.java b/test/langtools/tools/javac/diags/examples/NoExplicitAnnoProcRequested.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoExplicitAnnoProcRequested.java rename to test/langtools/tools/javac/diags/examples/NoExplicitAnnoProcRequested.java diff --git a/langtools/test/tools/javac/diags/examples/NoInterfaceExpected.java b/test/langtools/tools/javac/diags/examples/NoInterfaceExpected.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoInterfaceExpected.java rename to test/langtools/tools/javac/diags/examples/NoInterfaceExpected.java diff --git a/langtools/test/tools/javac/diags/examples/NoInterfaceHere.java b/test/langtools/tools/javac/diags/examples/NoInterfaceHere.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoInterfaceHere.java rename to test/langtools/tools/javac/diags/examples/NoInterfaceHere.java diff --git a/langtools/test/tools/javac/diags/examples/NoJavaLang.java b/test/langtools/tools/javac/diags/examples/NoJavaLang.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoJavaLang.java rename to test/langtools/tools/javac/diags/examples/NoJavaLang.java diff --git a/langtools/test/tools/javac/diags/examples/NoOpensUnlessStrong/exported/Class.java b/test/langtools/tools/javac/diags/examples/NoOpensUnlessStrong/exported/Class.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoOpensUnlessStrong/exported/Class.java rename to test/langtools/tools/javac/diags/examples/NoOpensUnlessStrong/exported/Class.java diff --git a/langtools/test/tools/javac/diags/examples/NoOpensUnlessStrong/module-info.java b/test/langtools/tools/javac/diags/examples/NoOpensUnlessStrong/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoOpensUnlessStrong/module-info.java rename to test/langtools/tools/javac/diags/examples/NoOpensUnlessStrong/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NoPkgInModuleInfoJava/module-info.java b/test/langtools/tools/javac/diags/examples/NoPkgInModuleInfoJava/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoPkgInModuleInfoJava/module-info.java rename to test/langtools/tools/javac/diags/examples/NoPkgInModuleInfoJava/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NoSuitableFunctionalIntfInst.java b/test/langtools/tools/javac/diags/examples/NoSuitableFunctionalIntfInst.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoSuitableFunctionalIntfInst.java rename to test/langtools/tools/javac/diags/examples/NoSuitableFunctionalIntfInst.java diff --git a/langtools/test/tools/javac/diags/examples/NoSuperclass/NoSuperclass.java b/test/langtools/tools/javac/diags/examples/NoSuperclass/NoSuperclass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoSuperclass/NoSuperclass.java rename to test/langtools/tools/javac/diags/examples/NoSuperclass/NoSuperclass.java diff --git a/langtools/test/tools/javac/diags/examples/NoSuperclass/patchmodule/java.base/java/lang/Object.java b/test/langtools/tools/javac/diags/examples/NoSuperclass/patchmodule/java.base/java/lang/Object.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoSuperclass/patchmodule/java.base/java/lang/Object.java rename to test/langtools/tools/javac/diags/examples/NoSuperclass/patchmodule/java.base/java/lang/Object.java diff --git a/langtools/test/tools/javac/diags/examples/NoTagName.java b/test/langtools/tools/javac/diags/examples/NoTagName.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoTagName.java rename to test/langtools/tools/javac/diags/examples/NoTagName.java diff --git a/langtools/test/tools/javac/diags/examples/NonApplicableRepeatingAnno.java b/test/langtools/tools/javac/diags/examples/NonApplicableRepeatingAnno.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NonApplicableRepeatingAnno.java rename to test/langtools/tools/javac/diags/examples/NonApplicableRepeatingAnno.java diff --git a/langtools/test/tools/javac/diags/examples/NonStaticCantBeRef.java b/test/langtools/tools/javac/diags/examples/NonStaticCantBeRef.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NonStaticCantBeRef.java rename to test/langtools/tools/javac/diags/examples/NonStaticCantBeRef.java diff --git a/langtools/test/tools/javac/diags/examples/NotAFunctionalIntf.java b/test/langtools/tools/javac/diags/examples/NotAFunctionalIntf.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotAFunctionalIntf.java rename to test/langtools/tools/javac/diags/examples/NotAFunctionalIntf.java diff --git a/langtools/test/tools/javac/diags/examples/NotAStatement.java b/test/langtools/tools/javac/diags/examples/NotAStatement.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotAStatement.java rename to test/langtools/tools/javac/diags/examples/NotAStatement.java diff --git a/langtools/test/tools/javac/diags/examples/NotAllowedClass.java b/test/langtools/tools/javac/diags/examples/NotAllowedClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotAllowedClass.java rename to test/langtools/tools/javac/diags/examples/NotAllowedClass.java diff --git a/langtools/test/tools/javac/diags/examples/NotAllowedVariable.java b/test/langtools/tools/javac/diags/examples/NotAllowedVariable.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotAllowedVariable.java rename to test/langtools/tools/javac/diags/examples/NotAllowedVariable.java diff --git a/langtools/test/tools/javac/diags/examples/NotAnInterfaceComponent.java b/test/langtools/tools/javac/diags/examples/NotAnInterfaceComponent.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotAnInterfaceComponent.java rename to test/langtools/tools/javac/diags/examples/NotAnInterfaceComponent.java diff --git a/langtools/test/tools/javac/diags/examples/NotApplicableMethodFound.java b/test/langtools/tools/javac/diags/examples/NotApplicableMethodFound.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotApplicableMethodFound.java rename to test/langtools/tools/javac/diags/examples/NotApplicableMethodFound.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccess/NotDefAccessClassIntfCantAccess.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccess/NotDefAccessClassIntfCantAccess.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccess/NotDefAccessClassIntfCantAccess.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccess/NotDefAccessClassIntfCantAccess.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccess/p/C.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccess/p/C.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccess/p/C.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccess/p/C.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessFragment.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessFragment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessFragment.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessFragment.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/NotDefAccessClassIntfCantAccessReason.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/NotDefAccessClassIntfCantAccessReason.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/NotDefAccessClassIntfCantAccessReason.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/NotDefAccessClassIntfCantAccessReason.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apia/api1/Api.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apia/api1/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apia/api1/Api.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apia/api1/Api.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apia/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apia/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apia/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apia/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apib/api2/Api.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apib/api2/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apib/api2/Api.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apib/api2/Api.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apib/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apib/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apib/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/apib/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/impl/impl/Impl.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/impl/impl/Impl.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/impl/impl/Impl.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/impl/impl/Impl.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/impl/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/impl/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/impl/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReason/modulesourcepath/impl/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/NotDefAccessClassIntfCantAccessReason.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/NotDefAccessClassIntfCantAccessReason.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/NotDefAccessClassIntfCantAccessReason.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/NotDefAccessClassIntfCantAccessReason.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apia/api1/Api.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apia/api1/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apia/api1/Api.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apia/api1/Api.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apia/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apia/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apia/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apia/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apib/api2/Api.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apib/api2/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apib/api2/Api.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apib/api2/Api.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apib/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apib/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apib/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/apib/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/impl/impl/Impl.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/impl/impl/Impl.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/impl/impl/Impl.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/impl/impl/Impl.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/impl/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/impl/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/impl/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessClassIntfCantAccessReasonFragment/modulesourcepath/impl/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotRead/NotDefAccessDoesNotRead.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotRead/NotDefAccessDoesNotRead.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotRead/NotDefAccessDoesNotRead.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotRead/NotDefAccessDoesNotRead.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/api/api/Api.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/api/api/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/api/api/Api.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/api/api/Api.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/api/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/api/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/api/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/api/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/impl/impl/Impl.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/impl/impl/Impl.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/impl/impl/Impl.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/impl/impl/Impl.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/impl/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/impl/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/impl/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotRead/modulesourcepath/impl/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadFromUnnamed/NotDefAccessDoesNotReadFromUnnamed.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadFromUnnamed/NotDefAccessDoesNotReadFromUnnamed.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadFromUnnamed/NotDefAccessDoesNotReadFromUnnamed.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadFromUnnamed/NotDefAccessDoesNotReadFromUnnamed.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadFromUnnamed/modulepath/api/api/Api.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadFromUnnamed/modulepath/api/api/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadFromUnnamed/modulepath/api/api/Api.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadFromUnnamed/modulepath/api/api/Api.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadFromUnnamed/modulepath/api/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadFromUnnamed/modulepath/api/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadFromUnnamed/modulepath/api/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadFromUnnamed/modulepath/api/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/NotDefAccessDoesNotReadUnnamed.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/NotDefAccessDoesNotReadUnnamed.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/NotDefAccessDoesNotReadUnnamed.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/NotDefAccessDoesNotReadUnnamed.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/classpath/api/Api.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/classpath/api/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/classpath/api/Api.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/classpath/api/Api.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/auxiliary/auxiliary/Auxiliary.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/auxiliary/auxiliary/Auxiliary.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/auxiliary/auxiliary/Auxiliary.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/auxiliary/auxiliary/Auxiliary.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/auxiliary/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/auxiliary/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/auxiliary/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/auxiliary/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/impl/impl/Impl.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/impl/impl/Impl.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/impl/impl/Impl.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/impl/impl/Impl.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/impl/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/impl/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/impl/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessDoesNotReadUnnamed/modulesourcepath/impl/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExported/NotDefAccessNotExported.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExported/NotDefAccessNotExported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExported/NotDefAccessNotExported.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExported/NotDefAccessNotExported.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/api/api/Api.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/api/api/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/api/api/Api.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/api/api/Api.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/api/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/api/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/api/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/api/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/impl/impl/Impl.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/impl/impl/Impl.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/impl/impl/Impl.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/impl/impl/Impl.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/impl/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/impl/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/impl/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExported/modulesourcepath/impl/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedFromUnnamed/NotDefAccessNotExportedFromUnnamed.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedFromUnnamed/NotDefAccessNotExportedFromUnnamed.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedFromUnnamed/NotDefAccessNotExportedFromUnnamed.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedFromUnnamed/NotDefAccessNotExportedFromUnnamed.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedFromUnnamed/modulepath/api/api/Api.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedFromUnnamed/modulepath/api/api/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedFromUnnamed/modulepath/api/api/Api.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedFromUnnamed/modulepath/api/api/Api.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedFromUnnamed/modulepath/api/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedFromUnnamed/modulepath/api/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedFromUnnamed/modulepath/api/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedFromUnnamed/modulepath/api/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModule/NotDefAccessNotExportedToModule.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModule/NotDefAccessNotExportedToModule.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModule/NotDefAccessNotExportedToModule.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModule/NotDefAccessNotExportedToModule.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/api/api/Api.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/api/api/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/api/api/Api.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/api/api/Api.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/api/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/api/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/api/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/api/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/impl/impl/Impl.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/impl/impl/Impl.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/impl/impl/Impl.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/impl/impl/Impl.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/impl/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/impl/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/impl/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/impl/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/other/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/other/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/other/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModule/modulesourcepath/other/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/NotDefAccessNotExportedToModuleFromUnnamed.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/NotDefAccessNotExportedToModuleFromUnnamed.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/NotDefAccessNotExportedToModuleFromUnnamed.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/NotDefAccessNotExportedToModuleFromUnnamed.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/modulepath/api/api/Api.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/modulepath/api/api/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/modulepath/api/api/Api.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/modulepath/api/api/Api.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/modulepath/api/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/modulepath/api/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/modulepath/api/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/modulepath/api/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/modulepath/other/module-info.java b/test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/modulepath/other/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/modulepath/other/module-info.java rename to test/langtools/tools/javac/diags/examples/NotDefAccessNotExportedToModuleFromUnnamed/modulepath/other/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefPublicCantAccess/NotDefPublicCantAccess.java b/test/langtools/tools/javac/diags/examples/NotDefPublicCantAccess/NotDefPublicCantAccess.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefPublicCantAccess/NotDefPublicCantAccess.java rename to test/langtools/tools/javac/diags/examples/NotDefPublicCantAccess/NotDefPublicCantAccess.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefPublicCantAccess/p/C.java b/test/langtools/tools/javac/diags/examples/NotDefPublicCantAccess/p/C.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefPublicCantAccess/p/C.java rename to test/langtools/tools/javac/diags/examples/NotDefPublicCantAccess/p/C.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefPublicCantAccessFragment/NotDefPublicCantAccessFragment.java b/test/langtools/tools/javac/diags/examples/NotDefPublicCantAccessFragment/NotDefPublicCantAccessFragment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefPublicCantAccessFragment/NotDefPublicCantAccessFragment.java rename to test/langtools/tools/javac/diags/examples/NotDefPublicCantAccessFragment/NotDefPublicCantAccessFragment.java diff --git a/langtools/test/tools/javac/diags/examples/NotDefPublicCantAccessFragment/p/C.java b/test/langtools/tools/javac/diags/examples/NotDefPublicCantAccessFragment/p/C.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotDefPublicCantAccessFragment/p/C.java rename to test/langtools/tools/javac/diags/examples/NotDefPublicCantAccessFragment/p/C.java diff --git a/langtools/test/tools/javac/diags/examples/NotEnclClass.java b/test/langtools/tools/javac/diags/examples/NotEnclClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotEnclClass.java rename to test/langtools/tools/javac/diags/examples/NotEnclClass.java diff --git a/langtools/test/tools/javac/diags/examples/NotInModuleOnModuleSourcePath/NotInModuleOnModuleSourcePath.java b/test/langtools/tools/javac/diags/examples/NotInModuleOnModuleSourcePath/NotInModuleOnModuleSourcePath.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotInModuleOnModuleSourcePath/NotInModuleOnModuleSourcePath.java rename to test/langtools/tools/javac/diags/examples/NotInModuleOnModuleSourcePath/NotInModuleOnModuleSourcePath.java diff --git a/langtools/test/tools/javac/diags/examples/NotInModuleOnModuleSourcePath/modulesourcepath/m/module-info.java b/test/langtools/tools/javac/diags/examples/NotInModuleOnModuleSourcePath/modulesourcepath/m/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotInModuleOnModuleSourcePath/modulesourcepath/m/module-info.java rename to test/langtools/tools/javac/diags/examples/NotInModuleOnModuleSourcePath/modulesourcepath/m/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NotInProfile.java b/test/langtools/tools/javac/diags/examples/NotInProfile.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotInProfile.java rename to test/langtools/tools/javac/diags/examples/NotInProfile.java diff --git a/langtools/test/tools/javac/diags/examples/NotLoopLabel.java b/test/langtools/tools/javac/diags/examples/NotLoopLabel.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotLoopLabel.java rename to test/langtools/tools/javac/diags/examples/NotLoopLabel.java diff --git a/langtools/test/tools/javac/diags/examples/NotWithinBounds.java b/test/langtools/tools/javac/diags/examples/NotWithinBounds.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NotWithinBounds.java rename to test/langtools/tools/javac/diags/examples/NotWithinBounds.java diff --git a/langtools/test/tools/javac/diags/examples/Note.java b/test/langtools/tools/javac/diags/examples/Note.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/Note.java rename to test/langtools/tools/javac/diags/examples/Note.java diff --git a/langtools/test/tools/javac/diags/examples/NoteProcMessager/NoteProcMessager.java b/test/langtools/tools/javac/diags/examples/NoteProcMessager/NoteProcMessager.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoteProcMessager/NoteProcMessager.java rename to test/langtools/tools/javac/diags/examples/NoteProcMessager/NoteProcMessager.java diff --git a/langtools/test/tools/javac/diags/examples/NoteProcMessager/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/NoteProcMessager/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/NoteProcMessager/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/NoteProcMessager/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ObsoleteSourceAndTarget.java b/test/langtools/tools/javac/diags/examples/ObsoleteSourceAndTarget.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ObsoleteSourceAndTarget.java rename to test/langtools/tools/javac/diags/examples/ObsoleteSourceAndTarget.java diff --git a/langtools/test/tools/javac/diags/examples/OperatorCantBeApplied.java b/test/langtools/tools/javac/diags/examples/OperatorCantBeApplied.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OperatorCantBeApplied.java rename to test/langtools/tools/javac/diags/examples/OperatorCantBeApplied.java diff --git a/langtools/test/tools/javac/diags/examples/OperatorCantBeApplied1.java b/test/langtools/tools/javac/diags/examples/OperatorCantBeApplied1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OperatorCantBeApplied1.java rename to test/langtools/tools/javac/diags/examples/OperatorCantBeApplied1.java diff --git a/langtools/test/tools/javac/diags/examples/OptionRemovedSource.java b/test/langtools/tools/javac/diags/examples/OptionRemovedSource.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OptionRemovedSource.java rename to test/langtools/tools/javac/diags/examples/OptionRemovedSource.java diff --git a/langtools/test/tools/javac/diags/examples/OptionRemovedTarget.java b/test/langtools/tools/javac/diags/examples/OptionRemovedTarget.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OptionRemovedTarget.java rename to test/langtools/tools/javac/diags/examples/OptionRemovedTarget.java diff --git a/langtools/test/tools/javac/diags/examples/Orphaned.java b/test/langtools/tools/javac/diags/examples/Orphaned.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/Orphaned.java rename to test/langtools/tools/javac/diags/examples/Orphaned.java diff --git a/langtools/test/tools/javac/diags/examples/OverriddenDefault.java b/test/langtools/tools/javac/diags/examples/OverriddenDefault.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OverriddenDefault.java rename to test/langtools/tools/javac/diags/examples/OverriddenDefault.java diff --git a/langtools/test/tools/javac/diags/examples/OverrideAnnotatedStaticMethod.java b/test/langtools/tools/javac/diags/examples/OverrideAnnotatedStaticMethod.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OverrideAnnotatedStaticMethod.java rename to test/langtools/tools/javac/diags/examples/OverrideAnnotatedStaticMethod.java diff --git a/langtools/test/tools/javac/diags/examples/OverrideDoesntThrow.java b/test/langtools/tools/javac/diags/examples/OverrideDoesntThrow.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OverrideDoesntThrow.java rename to test/langtools/tools/javac/diags/examples/OverrideDoesntThrow.java diff --git a/langtools/test/tools/javac/diags/examples/OverrideIncompatibleReturn.java b/test/langtools/tools/javac/diags/examples/OverrideIncompatibleReturn.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OverrideIncompatibleReturn.java rename to test/langtools/tools/javac/diags/examples/OverrideIncompatibleReturn.java diff --git a/langtools/test/tools/javac/diags/examples/OverrideMeth.java b/test/langtools/tools/javac/diags/examples/OverrideMeth.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OverrideMeth.java rename to test/langtools/tools/javac/diags/examples/OverrideMeth.java diff --git a/langtools/test/tools/javac/diags/examples/OverrideStatic.java b/test/langtools/tools/javac/diags/examples/OverrideStatic.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OverrideStatic.java rename to test/langtools/tools/javac/diags/examples/OverrideStatic.java diff --git a/langtools/test/tools/javac/diags/examples/OverrideUncheckedReturn.java b/test/langtools/tools/javac/diags/examples/OverrideUncheckedReturn.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OverrideUncheckedReturn.java rename to test/langtools/tools/javac/diags/examples/OverrideUncheckedReturn.java diff --git a/langtools/test/tools/javac/diags/examples/OverrideUncheckedThrown.java b/test/langtools/tools/javac/diags/examples/OverrideUncheckedThrown.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OverrideUncheckedThrown.java rename to test/langtools/tools/javac/diags/examples/OverrideUncheckedThrown.java diff --git a/langtools/test/tools/javac/diags/examples/OverrideVarargsExtra.java b/test/langtools/tools/javac/diags/examples/OverrideVarargsExtra.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OverrideVarargsExtra.java rename to test/langtools/tools/javac/diags/examples/OverrideVarargsExtra.java diff --git a/langtools/test/tools/javac/diags/examples/OverrideVarargsMissing.java b/test/langtools/tools/javac/diags/examples/OverrideVarargsMissing.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OverrideVarargsMissing.java rename to test/langtools/tools/javac/diags/examples/OverrideVarargsMissing.java diff --git a/langtools/test/tools/javac/diags/examples/OverrideWeakerAccess.java b/test/langtools/tools/javac/diags/examples/OverrideWeakerAccess.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/OverrideWeakerAccess.java rename to test/langtools/tools/javac/diags/examples/OverrideWeakerAccess.java diff --git a/langtools/test/tools/javac/diags/examples/PackageAnnos.java b/test/langtools/tools/javac/diags/examples/PackageAnnos.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageAnnos.java rename to test/langtools/tools/javac/diags/examples/PackageAnnos.java diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/PackageClashFromRequires.java b/test/langtools/tools/javac/diags/examples/PackageClashFromRequires/PackageClashFromRequires.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequires/PackageClashFromRequires.java rename to test/langtools/tools/javac/diags/examples/PackageClashFromRequires/PackageClashFromRequires.java diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/exported/Api1.java b/test/langtools/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/exported/Api1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/exported/Api1.java rename to test/langtools/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/exported/Api1.java diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/module-info.java b/test/langtools/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/module-info.java rename to test/langtools/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/exported/Api2.java b/test/langtools/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/exported/Api2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/exported/Api2.java rename to test/langtools/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/exported/Api2.java diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/module-info.java b/test/langtools/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/module-info.java rename to test/langtools/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/use/module-info.java b/test/langtools/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/use/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/use/module-info.java rename to test/langtools/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/use/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/PackageClashFromRequiresInUnnamed.java b/test/langtools/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/PackageClashFromRequiresInUnnamed.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/PackageClashFromRequiresInUnnamed.java rename to test/langtools/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/PackageClashFromRequiresInUnnamed.java diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/exported/Api1.java b/test/langtools/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/exported/Api1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/exported/Api1.java rename to test/langtools/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/exported/Api1.java diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/module-info.java b/test/langtools/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/module-info.java rename to test/langtools/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/exported/Api2.java b/test/langtools/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/exported/Api2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/exported/Api2.java rename to test/langtools/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/exported/Api2.java diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/module-info.java b/test/langtools/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/module-info.java rename to test/langtools/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFoundError/PackageEmptyOrNotFound.java b/test/langtools/tools/javac/diags/examples/PackageEmptyOrNotFoundError/PackageEmptyOrNotFound.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFoundError/PackageEmptyOrNotFound.java rename to test/langtools/tools/javac/diags/examples/PackageEmptyOrNotFoundError/PackageEmptyOrNotFound.java diff --git a/langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFoundError/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/PackageEmptyOrNotFoundError/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFoundError/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/PackageEmptyOrNotFoundError/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFoundWarning/PackageEmptyOrNotFound.java b/test/langtools/tools/javac/diags/examples/PackageEmptyOrNotFoundWarning/PackageEmptyOrNotFound.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFoundWarning/PackageEmptyOrNotFound.java rename to test/langtools/tools/javac/diags/examples/PackageEmptyOrNotFoundWarning/PackageEmptyOrNotFound.java diff --git a/langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFoundWarning/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/PackageEmptyOrNotFoundWarning/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFoundWarning/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/PackageEmptyOrNotFoundWarning/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/PackageInOtherModule/PackageInOtherModule.java b/test/langtools/tools/javac/diags/examples/PackageInOtherModule/PackageInOtherModule.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageInOtherModule/PackageInOtherModule.java rename to test/langtools/tools/javac/diags/examples/PackageInOtherModule/PackageInOtherModule.java diff --git a/langtools/test/tools/javac/diags/examples/PackageInfoAlreadySeen/p/package-info.java b/test/langtools/tools/javac/diags/examples/PackageInfoAlreadySeen/p/package-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageInfoAlreadySeen/p/package-info.java rename to test/langtools/tools/javac/diags/examples/PackageInfoAlreadySeen/p/package-info.java diff --git a/langtools/test/tools/javac/diags/examples/PackageInfoAlreadySeen/package-info.java b/test/langtools/tools/javac/diags/examples/PackageInfoAlreadySeen/package-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PackageInfoAlreadySeen/package-info.java rename to test/langtools/tools/javac/diags/examples/PackageInfoAlreadySeen/package-info.java diff --git a/langtools/test/tools/javac/diags/examples/PartialInstSig.java b/test/langtools/tools/javac/diags/examples/PartialInstSig.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PartialInstSig.java rename to test/langtools/tools/javac/diags/examples/PartialInstSig.java diff --git a/langtools/test/tools/javac/diags/examples/PatchModuleWithRelease/PatchModuleWithRelease.java b/test/langtools/tools/javac/diags/examples/PatchModuleWithRelease/PatchModuleWithRelease.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PatchModuleWithRelease/PatchModuleWithRelease.java rename to test/langtools/tools/javac/diags/examples/PatchModuleWithRelease/PatchModuleWithRelease.java diff --git a/langtools/test/tools/javac/diags/examples/PatchModuleWithRelease/patchmodule/java.base/java/lang/Test.java b/test/langtools/tools/javac/diags/examples/PatchModuleWithRelease/patchmodule/java.base/java/lang/Test.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PatchModuleWithRelease/patchmodule/java.base/java/lang/Test.java rename to test/langtools/tools/javac/diags/examples/PatchModuleWithRelease/patchmodule/java.base/java/lang/Test.java diff --git a/langtools/test/tools/javac/diags/examples/PathElementNotFound.java b/test/langtools/tools/javac/diags/examples/PathElementNotFound.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PathElementNotFound.java rename to test/langtools/tools/javac/diags/examples/PathElementNotFound.java diff --git a/langtools/test/tools/javac/diags/examples/PkgClashWithClass/p/q.java b/test/langtools/tools/javac/diags/examples/PkgClashWithClass/p/q.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PkgClashWithClass/p/q.java rename to test/langtools/tools/javac/diags/examples/PkgClashWithClass/p/q.java diff --git a/langtools/test/tools/javac/diags/examples/PkgClashWithClass/p/q/C.java b/test/langtools/tools/javac/diags/examples/PkgClashWithClass/p/q/C.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PkgClashWithClass/p/q/C.java rename to test/langtools/tools/javac/diags/examples/PkgClashWithClass/p/q/C.java diff --git a/langtools/test/tools/javac/diags/examples/PluginNotFound.java b/test/langtools/tools/javac/diags/examples/PluginNotFound.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PluginNotFound.java rename to test/langtools/tools/javac/diags/examples/PluginNotFound.java diff --git a/langtools/test/tools/javac/diags/examples/PoorChoiceForModuleName/module-info.java b/test/langtools/tools/javac/diags/examples/PoorChoiceForModuleName/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PoorChoiceForModuleName/module-info.java rename to test/langtools/tools/javac/diags/examples/PoorChoiceForModuleName/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/PossibleFallThrough.java b/test/langtools/tools/javac/diags/examples/PossibleFallThrough.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PossibleFallThrough.java rename to test/langtools/tools/javac/diags/examples/PossibleFallThrough.java diff --git a/langtools/test/tools/javac/diags/examples/PossibleLossPrecision.java b/test/langtools/tools/javac/diags/examples/PossibleLossPrecision.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PossibleLossPrecision.java rename to test/langtools/tools/javac/diags/examples/PossibleLossPrecision.java diff --git a/langtools/test/tools/javac/diags/examples/PotentialLambdaFound.java b/test/langtools/tools/javac/diags/examples/PotentialLambdaFound.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PotentialLambdaFound.java rename to test/langtools/tools/javac/diags/examples/PotentialLambdaFound.java diff --git a/langtools/test/tools/javac/diags/examples/PotentiallyAmbiguousOverload.java b/test/langtools/tools/javac/diags/examples/PotentiallyAmbiguousOverload.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PotentiallyAmbiguousOverload.java rename to test/langtools/tools/javac/diags/examples/PotentiallyAmbiguousOverload.java diff --git a/langtools/test/tools/javac/diags/examples/PrematureEOF.java b/test/langtools/tools/javac/diags/examples/PrematureEOF.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PrematureEOF.java rename to test/langtools/tools/javac/diags/examples/PrematureEOF.java diff --git a/langtools/test/tools/javac/diags/examples/PrintProcessorInfo/PrintProcessorInfo.java b/test/langtools/tools/javac/diags/examples/PrintProcessorInfo/PrintProcessorInfo.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PrintProcessorInfo/PrintProcessorInfo.java rename to test/langtools/tools/javac/diags/examples/PrintProcessorInfo/PrintProcessorInfo.java diff --git a/langtools/test/tools/javac/diags/examples/PrintProcessorInfo/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/PrintProcessorInfo/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PrintProcessorInfo/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/PrintProcessorInfo/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/PrintRounds/PrintRounds.java b/test/langtools/tools/javac/diags/examples/PrintRounds/PrintRounds.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PrintRounds/PrintRounds.java rename to test/langtools/tools/javac/diags/examples/PrintRounds/PrintRounds.java diff --git a/langtools/test/tools/javac/diags/examples/PrintRounds/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/PrintRounds/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PrintRounds/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/PrintRounds/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/PrivateInterfaceMethodsNotSupported.java b/test/langtools/tools/javac/diags/examples/PrivateInterfaceMethodsNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/PrivateInterfaceMethodsNotSupported.java rename to test/langtools/tools/javac/diags/examples/PrivateInterfaceMethodsNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/ProbFoundReqFragment.java b/test/langtools/tools/javac/diags/examples/ProbFoundReqFragment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProbFoundReqFragment.java rename to test/langtools/tools/javac/diags/examples/ProbFoundReqFragment.java diff --git a/langtools/test/tools/javac/diags/examples/ProcCantFindClass/ProcCantFindClass.java b/test/langtools/tools/javac/diags/examples/ProcCantFindClass/ProcCantFindClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcCantFindClass/ProcCantFindClass.java rename to test/langtools/tools/javac/diags/examples/ProcCantFindClass/ProcCantFindClass.java diff --git a/langtools/test/tools/javac/diags/examples/ProcCantFindClass/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcCantFindClass/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcCantFindClass/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcCantFindClass/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ProcFileCreateLastRound/ProcFileCreateLastRound.java b/test/langtools/tools/javac/diags/examples/ProcFileCreateLastRound/ProcFileCreateLastRound.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcFileCreateLastRound/ProcFileCreateLastRound.java rename to test/langtools/tools/javac/diags/examples/ProcFileCreateLastRound/ProcFileCreateLastRound.java diff --git a/langtools/test/tools/javac/diags/examples/ProcFileCreateLastRound/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcFileCreateLastRound/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcFileCreateLastRound/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcFileCreateLastRound/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ProcFileReopening/ProcFileReopening.java b/test/langtools/tools/javac/diags/examples/ProcFileReopening/ProcFileReopening.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcFileReopening/ProcFileReopening.java rename to test/langtools/tools/javac/diags/examples/ProcFileReopening/ProcFileReopening.java diff --git a/langtools/test/tools/javac/diags/examples/ProcFileReopening/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcFileReopening/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcFileReopening/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcFileReopening/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ProcIllegalFileName/ProcIllegalFileName.java b/test/langtools/tools/javac/diags/examples/ProcIllegalFileName/ProcIllegalFileName.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcIllegalFileName/ProcIllegalFileName.java rename to test/langtools/tools/javac/diags/examples/ProcIllegalFileName/ProcIllegalFileName.java diff --git a/langtools/test/tools/javac/diags/examples/ProcIllegalFileName/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcIllegalFileName/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcIllegalFileName/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcIllegalFileName/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ProcIncompatibleSourceVersion/ProcIncompatibleSourceVersion.java b/test/langtools/tools/javac/diags/examples/ProcIncompatibleSourceVersion/ProcIncompatibleSourceVersion.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcIncompatibleSourceVersion/ProcIncompatibleSourceVersion.java rename to test/langtools/tools/javac/diags/examples/ProcIncompatibleSourceVersion/ProcIncompatibleSourceVersion.java diff --git a/langtools/test/tools/javac/diags/examples/ProcIncompatibleSourceVersion/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcIncompatibleSourceVersion/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcIncompatibleSourceVersion/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcIncompatibleSourceVersion/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ProcOnlyNoProcs.java b/test/langtools/tools/javac/diags/examples/ProcOnlyNoProcs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcOnlyNoProcs.java rename to test/langtools/tools/javac/diags/examples/ProcOnlyNoProcs.java diff --git a/langtools/test/tools/javac/diags/examples/ProcPackageDoesNotExist/ProcPackageDoesNotExist.java b/test/langtools/tools/javac/diags/examples/ProcPackageDoesNotExist/ProcPackageDoesNotExist.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcPackageDoesNotExist/ProcPackageDoesNotExist.java rename to test/langtools/tools/javac/diags/examples/ProcPackageDoesNotExist/ProcPackageDoesNotExist.java diff --git a/langtools/test/tools/javac/diags/examples/ProcPackageDoesNotExist/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcPackageDoesNotExist/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcPackageDoesNotExist/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcPackageDoesNotExist/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ProcSuspiciousClassName/ProcSuspiciousClassName.java b/test/langtools/tools/javac/diags/examples/ProcSuspiciousClassName/ProcSuspiciousClassName.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcSuspiciousClassName/ProcSuspiciousClassName.java rename to test/langtools/tools/javac/diags/examples/ProcSuspiciousClassName/ProcSuspiciousClassName.java diff --git a/langtools/test/tools/javac/diags/examples/ProcSuspiciousClassName/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcSuspiciousClassName/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcSuspiciousClassName/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcSuspiciousClassName/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ProcTypeRecreate/ProcTypeRecreate.java b/test/langtools/tools/javac/diags/examples/ProcTypeRecreate/ProcTypeRecreate.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcTypeRecreate/ProcTypeRecreate.java rename to test/langtools/tools/javac/diags/examples/ProcTypeRecreate/ProcTypeRecreate.java diff --git a/langtools/test/tools/javac/diags/examples/ProcTypeRecreate/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcTypeRecreate/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcTypeRecreate/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcTypeRecreate/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ProcUnclosedTypeFiles/ProcUnclosedTypeFiles.java b/test/langtools/tools/javac/diags/examples/ProcUnclosedTypeFiles/ProcUnclosedTypeFiles.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcUnclosedTypeFiles/ProcUnclosedTypeFiles.java rename to test/langtools/tools/javac/diags/examples/ProcUnclosedTypeFiles/ProcUnclosedTypeFiles.java diff --git a/langtools/test/tools/javac/diags/examples/ProcUnclosedTypeFiles/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcUnclosedTypeFiles/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcUnclosedTypeFiles/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcUnclosedTypeFiles/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ProcUseImplicit/ProcUseImplicit.java b/test/langtools/tools/javac/diags/examples/ProcUseImplicit/ProcUseImplicit.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcUseImplicit/ProcUseImplicit.java rename to test/langtools/tools/javac/diags/examples/ProcUseImplicit/ProcUseImplicit.java diff --git a/langtools/test/tools/javac/diags/examples/ProcUseImplicit/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcUseImplicit/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcUseImplicit/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcUseImplicit/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ProcUseImplicit/sourcepath/p/SomeClass.java b/test/langtools/tools/javac/diags/examples/ProcUseImplicit/sourcepath/p/SomeClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcUseImplicit/sourcepath/p/SomeClass.java rename to test/langtools/tools/javac/diags/examples/ProcUseImplicit/sourcepath/p/SomeClass.java diff --git a/langtools/test/tools/javac/diags/examples/ProcUseProcOrImplicit/ProcUseProcOrImplicit.java b/test/langtools/tools/javac/diags/examples/ProcUseProcOrImplicit/ProcUseProcOrImplicit.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcUseProcOrImplicit/ProcUseProcOrImplicit.java rename to test/langtools/tools/javac/diags/examples/ProcUseProcOrImplicit/ProcUseProcOrImplicit.java diff --git a/langtools/test/tools/javac/diags/examples/ProcUseProcOrImplicit/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcUseProcOrImplicit/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcUseProcOrImplicit/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcUseProcOrImplicit/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ProcUseProcOrImplicit/sourcepath/p/SomeClass.java b/test/langtools/tools/javac/diags/examples/ProcUseProcOrImplicit/sourcepath/p/SomeClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcUseProcOrImplicit/sourcepath/p/SomeClass.java rename to test/langtools/tools/javac/diags/examples/ProcUseProcOrImplicit/sourcepath/p/SomeClass.java diff --git a/langtools/test/tools/javac/diags/examples/ProcessorCantInstantiate/ProcessorCantInstantiate.java b/test/langtools/tools/javac/diags/examples/ProcessorCantInstantiate/ProcessorCantInstantiate.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcessorCantInstantiate/ProcessorCantInstantiate.java rename to test/langtools/tools/javac/diags/examples/ProcessorCantInstantiate/ProcessorCantInstantiate.java diff --git a/langtools/test/tools/javac/diags/examples/ProcessorCantInstantiate/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcessorCantInstantiate/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcessorCantInstantiate/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcessorCantInstantiate/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/ProcessorNotFound.java b/test/langtools/tools/javac/diags/examples/ProcessorNotFound.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcessorNotFound.java rename to test/langtools/tools/javac/diags/examples/ProcessorNotFound.java diff --git a/langtools/test/tools/javac/diags/examples/ProcessorPathNoProcessorModulePath/ProcessorPathNoProcessorModulePath.java b/test/langtools/tools/javac/diags/examples/ProcessorPathNoProcessorModulePath/ProcessorPathNoProcessorModulePath.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcessorPathNoProcessorModulePath/ProcessorPathNoProcessorModulePath.java rename to test/langtools/tools/javac/diags/examples/ProcessorPathNoProcessorModulePath/ProcessorPathNoProcessorModulePath.java diff --git a/langtools/test/tools/javac/diags/examples/ProcessorWrongType/ProcessorWrongType.java b/test/langtools/tools/javac/diags/examples/ProcessorWrongType/ProcessorWrongType.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcessorWrongType/ProcessorWrongType.java rename to test/langtools/tools/javac/diags/examples/ProcessorWrongType/ProcessorWrongType.java diff --git a/langtools/test/tools/javac/diags/examples/ProcessorWrongType/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/ProcessorWrongType/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ProcessorWrongType/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/ProcessorWrongType/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/QualifiedNewStaticClass.java b/test/langtools/tools/javac/diags/examples/QualifiedNewStaticClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/QualifiedNewStaticClass.java rename to test/langtools/tools/javac/diags/examples/QualifiedNewStaticClass.java diff --git a/langtools/test/tools/javac/diags/examples/RawClassUse.java b/test/langtools/tools/javac/diags/examples/RawClassUse.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RawClassUse.java rename to test/langtools/tools/javac/diags/examples/RawClassUse.java diff --git a/langtools/test/tools/javac/diags/examples/ReceiverParameterNotApplicableConstructor.java b/test/langtools/tools/javac/diags/examples/ReceiverParameterNotApplicableConstructor.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ReceiverParameterNotApplicableConstructor.java rename to test/langtools/tools/javac/diags/examples/ReceiverParameterNotApplicableConstructor.java diff --git a/langtools/test/tools/javac/diags/examples/RecursiveConstrInvocation.java b/test/langtools/tools/javac/diags/examples/RecursiveConstrInvocation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RecursiveConstrInvocation.java rename to test/langtools/tools/javac/diags/examples/RecursiveConstrInvocation.java diff --git a/langtools/test/tools/javac/diags/examples/RedundantCast.java b/test/langtools/tools/javac/diags/examples/RedundantCast.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RedundantCast.java rename to test/langtools/tools/javac/diags/examples/RedundantCast.java diff --git a/langtools/test/tools/javac/diags/examples/RedundantSupertype.java b/test/langtools/tools/javac/diags/examples/RedundantSupertype.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RedundantSupertype.java rename to test/langtools/tools/javac/diags/examples/RedundantSupertype.java diff --git a/langtools/test/tools/javac/diags/examples/RefAmbiguous.java b/test/langtools/tools/javac/diags/examples/RefAmbiguous.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RefAmbiguous.java rename to test/langtools/tools/javac/diags/examples/RefAmbiguous.java diff --git a/langtools/test/tools/javac/diags/examples/RefAmbiguousFragment.java b/test/langtools/tools/javac/diags/examples/RefAmbiguousFragment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RefAmbiguousFragment.java rename to test/langtools/tools/javac/diags/examples/RefAmbiguousFragment.java diff --git a/langtools/test/tools/javac/diags/examples/RefBadParens.java b/test/langtools/tools/javac/diags/examples/RefBadParens.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RefBadParens.java rename to test/langtools/tools/javac/diags/examples/RefBadParens.java diff --git a/langtools/test/tools/javac/diags/examples/RefIdentifierExpected.java b/test/langtools/tools/javac/diags/examples/RefIdentifierExpected.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RefIdentifierExpected.java rename to test/langtools/tools/javac/diags/examples/RefIdentifierExpected.java diff --git a/langtools/test/tools/javac/diags/examples/RefSyntaxError.java b/test/langtools/tools/javac/diags/examples/RefSyntaxError.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RefSyntaxError.java rename to test/langtools/tools/javac/diags/examples/RefSyntaxError.java diff --git a/langtools/test/tools/javac/diags/examples/RefUnexpectedInput.java b/test/langtools/tools/javac/diags/examples/RefUnexpectedInput.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RefUnexpectedInput.java rename to test/langtools/tools/javac/diags/examples/RefUnexpectedInput.java diff --git a/langtools/test/tools/javac/diags/examples/RemovalFilename.java b/test/langtools/tools/javac/diags/examples/RemovalFilename.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RemovalFilename.java rename to test/langtools/tools/javac/diags/examples/RemovalFilename.java diff --git a/langtools/test/tools/javac/diags/examples/RemovalFilenameAdditional.java b/test/langtools/tools/javac/diags/examples/RemovalFilenameAdditional.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RemovalFilenameAdditional.java rename to test/langtools/tools/javac/diags/examples/RemovalFilenameAdditional.java diff --git a/langtools/test/tools/javac/diags/examples/RemovalPlural/RemovalClass.java b/test/langtools/tools/javac/diags/examples/RemovalPlural/RemovalClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RemovalPlural/RemovalClass.java rename to test/langtools/tools/javac/diags/examples/RemovalPlural/RemovalClass.java diff --git a/langtools/test/tools/javac/diags/examples/RemovalPlural/RemovalFilename.java b/test/langtools/tools/javac/diags/examples/RemovalPlural/RemovalFilename.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RemovalPlural/RemovalFilename.java rename to test/langtools/tools/javac/diags/examples/RemovalPlural/RemovalFilename.java diff --git a/langtools/test/tools/javac/diags/examples/RemovalPlural/RemovalPlural.java b/test/langtools/tools/javac/diags/examples/RemovalPlural/RemovalPlural.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RemovalPlural/RemovalPlural.java rename to test/langtools/tools/javac/diags/examples/RemovalPlural/RemovalPlural.java diff --git a/langtools/test/tools/javac/diags/examples/RemovalPluralAdditional/RemovalClass.java b/test/langtools/tools/javac/diags/examples/RemovalPluralAdditional/RemovalClass.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RemovalPluralAdditional/RemovalClass.java rename to test/langtools/tools/javac/diags/examples/RemovalPluralAdditional/RemovalClass.java diff --git a/langtools/test/tools/javac/diags/examples/RemovalPluralAdditional/RemovalFilename.java b/test/langtools/tools/javac/diags/examples/RemovalPluralAdditional/RemovalFilename.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RemovalPluralAdditional/RemovalFilename.java rename to test/langtools/tools/javac/diags/examples/RemovalPluralAdditional/RemovalFilename.java diff --git a/langtools/test/tools/javac/diags/examples/RemovalPluralAdditional/RemovalPlural.java b/test/langtools/tools/javac/diags/examples/RemovalPluralAdditional/RemovalPlural.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RemovalPluralAdditional/RemovalPlural.java rename to test/langtools/tools/javac/diags/examples/RemovalPluralAdditional/RemovalPlural.java diff --git a/langtools/test/tools/javac/diags/examples/RemovalPluralAdditional/RemovalPluralAdditional.java b/test/langtools/tools/javac/diags/examples/RemovalPluralAdditional/RemovalPluralAdditional.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RemovalPluralAdditional/RemovalPluralAdditional.java rename to test/langtools/tools/javac/diags/examples/RemovalPluralAdditional/RemovalPluralAdditional.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatableAnnotationsNotSupported.java b/test/langtools/tools/javac/diags/examples/RepeatableAnnotationsNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatableAnnotationsNotSupported.java rename to test/langtools/tools/javac/diags/examples/RepeatableAnnotationsNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatableDocumentedMismatch.java b/test/langtools/tools/javac/diags/examples/RepeatableDocumentedMismatch.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatableDocumentedMismatch.java rename to test/langtools/tools/javac/diags/examples/RepeatableDocumentedMismatch.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatableInheritedMismatch.java b/test/langtools/tools/javac/diags/examples/RepeatableInheritedMismatch.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatableInheritedMismatch.java rename to test/langtools/tools/javac/diags/examples/RepeatableInheritedMismatch.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatableNoValue.java b/test/langtools/tools/javac/diags/examples/RepeatableNoValue.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatableNoValue.java rename to test/langtools/tools/javac/diags/examples/RepeatableNoValue.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatableNonDefault.java b/test/langtools/tools/javac/diags/examples/RepeatableNonDefault.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatableNonDefault.java rename to test/langtools/tools/javac/diags/examples/RepeatableNonDefault.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatableRetentionMismatch.java b/test/langtools/tools/javac/diags/examples/RepeatableRetentionMismatch.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatableRetentionMismatch.java rename to test/langtools/tools/javac/diags/examples/RepeatableRetentionMismatch.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatableTargetMismatch.java b/test/langtools/tools/javac/diags/examples/RepeatableTargetMismatch.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatableTargetMismatch.java rename to test/langtools/tools/javac/diags/examples/RepeatableTargetMismatch.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatableWrongValueType.java b/test/langtools/tools/javac/diags/examples/RepeatableWrongValueType.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatableWrongValueType.java rename to test/langtools/tools/javac/diags/examples/RepeatableWrongValueType.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatedAnnotationTarget.java b/test/langtools/tools/javac/diags/examples/RepeatedAnnotationTarget.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatedAnnotationTarget.java rename to test/langtools/tools/javac/diags/examples/RepeatedAnnotationTarget.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatedInterface.java b/test/langtools/tools/javac/diags/examples/RepeatedInterface.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatedInterface.java rename to test/langtools/tools/javac/diags/examples/RepeatedInterface.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatedModifier.java b/test/langtools/tools/javac/diags/examples/RepeatedModifier.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatedModifier.java rename to test/langtools/tools/javac/diags/examples/RepeatedModifier.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatedProvidesForService/RepeatedProvides.java b/test/langtools/tools/javac/diags/examples/RepeatedProvidesForService/RepeatedProvides.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatedProvidesForService/RepeatedProvides.java rename to test/langtools/tools/javac/diags/examples/RepeatedProvidesForService/RepeatedProvides.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/module-info.java b/test/langtools/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/module-info.java rename to test/langtools/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/p/A.java b/test/langtools/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/p/A.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/p/A.java rename to test/langtools/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/p/A.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/p/B.java b/test/langtools/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/p/B.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/p/B.java rename to test/langtools/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/p/B.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/p/I.java b/test/langtools/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/p/I.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/p/I.java rename to test/langtools/tools/javac/diags/examples/RepeatedProvidesForService/modulesourcepath/m/p/I.java diff --git a/langtools/test/tools/javac/diags/examples/RepeatingAnnotationAndContainer.java b/test/langtools/tools/javac/diags/examples/RepeatingAnnotationAndContainer.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RepeatingAnnotationAndContainer.java rename to test/langtools/tools/javac/diags/examples/RepeatingAnnotationAndContainer.java diff --git a/langtools/test/tools/javac/diags/examples/ReportAccess.java b/test/langtools/tools/javac/diags/examples/ReportAccess.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ReportAccess.java rename to test/langtools/tools/javac/diags/examples/ReportAccess.java diff --git a/langtools/test/tools/javac/diags/examples/ReportAccessFragment.java b/test/langtools/tools/javac/diags/examples/ReportAccessFragment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ReportAccessFragment.java rename to test/langtools/tools/javac/diags/examples/ReportAccessFragment.java diff --git a/langtools/test/tools/javac/diags/examples/RequiresAutomatic/module-info.java b/test/langtools/tools/javac/diags/examples/RequiresAutomatic/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RequiresAutomatic/module-info.java rename to test/langtools/tools/javac/diags/examples/RequiresAutomatic/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/RequiresAutomatic/modulepath/a/A.java b/test/langtools/tools/javac/diags/examples/RequiresAutomatic/modulepath/a/A.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RequiresAutomatic/modulepath/a/A.java rename to test/langtools/tools/javac/diags/examples/RequiresAutomatic/modulepath/a/A.java diff --git a/langtools/test/tools/javac/diags/examples/RequiresTransitiveAutomatic/module-info.java b/test/langtools/tools/javac/diags/examples/RequiresTransitiveAutomatic/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RequiresTransitiveAutomatic/module-info.java rename to test/langtools/tools/javac/diags/examples/RequiresTransitiveAutomatic/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/RequiresTransitiveAutomatic/modulepath/a/A.java b/test/langtools/tools/javac/diags/examples/RequiresTransitiveAutomatic/modulepath/a/A.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/RequiresTransitiveAutomatic/modulepath/a/A.java rename to test/langtools/tools/javac/diags/examples/RequiresTransitiveAutomatic/modulepath/a/A.java diff --git a/langtools/test/tools/javac/diags/examples/ResourceClosed.java b/test/langtools/tools/javac/diags/examples/ResourceClosed.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ResourceClosed.java rename to test/langtools/tools/javac/diags/examples/ResourceClosed.java diff --git a/langtools/test/tools/javac/diags/examples/ResourceMayNotBeAssigned.java b/test/langtools/tools/javac/diags/examples/ResourceMayNotBeAssigned.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ResourceMayNotBeAssigned.java rename to test/langtools/tools/javac/diags/examples/ResourceMayNotBeAssigned.java diff --git a/langtools/test/tools/javac/diags/examples/ResourceNotApplicableToType.java b/test/langtools/tools/javac/diags/examples/ResourceNotApplicableToType.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ResourceNotApplicableToType.java rename to test/langtools/tools/javac/diags/examples/ResourceNotApplicableToType.java diff --git a/langtools/test/tools/javac/diags/examples/ResourceNotReferenced.java b/test/langtools/tools/javac/diags/examples/ResourceNotReferenced.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ResourceNotReferenced.java rename to test/langtools/tools/javac/diags/examples/ResourceNotReferenced.java diff --git a/langtools/test/tools/javac/diags/examples/ReturnOutsideMethod.java b/test/langtools/tools/javac/diags/examples/ReturnOutsideMethod.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ReturnOutsideMethod.java rename to test/langtools/tools/javac/diags/examples/ReturnOutsideMethod.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceDefinitionIsEnum/module-info.java b/test/langtools/tools/javac/diags/examples/ServiceDefinitionIsEnum/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceDefinitionIsEnum/module-info.java rename to test/langtools/tools/javac/diags/examples/ServiceDefinitionIsEnum/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceDefinitionIsEnum/pkg/EnumST.java b/test/langtools/tools/javac/diags/examples/ServiceDefinitionIsEnum/pkg/EnumST.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceDefinitionIsEnum/pkg/EnumST.java rename to test/langtools/tools/javac/diags/examples/ServiceDefinitionIsEnum/pkg/EnumST.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplMustBeSubtypeOfServiceIntf/module-info.java b/test/langtools/tools/javac/diags/examples/ServiceImplMustBeSubtypeOfServiceIntf/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplMustBeSubtypeOfServiceIntf/module-info.java rename to test/langtools/tools/javac/diags/examples/ServiceImplMustBeSubtypeOfServiceIntf/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplNotPublic/ServiceImplNotPublic.java b/test/langtools/tools/javac/diags/examples/ServiceImplNotPublic/ServiceImplNotPublic.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplNotPublic/ServiceImplNotPublic.java rename to test/langtools/tools/javac/diags/examples/ServiceImplNotPublic/ServiceImplNotPublic.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplNotPublic/example/ServiceImpl.java b/test/langtools/tools/javac/diags/examples/ServiceImplNotPublic/example/ServiceImpl.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplNotPublic/example/ServiceImpl.java rename to test/langtools/tools/javac/diags/examples/ServiceImplNotPublic/example/ServiceImpl.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplNotPublic/example/SomeService.java b/test/langtools/tools/javac/diags/examples/ServiceImplNotPublic/example/SomeService.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplNotPublic/example/SomeService.java rename to test/langtools/tools/javac/diags/examples/ServiceImplNotPublic/example/SomeService.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplNotPublic/module-info.java b/test/langtools/tools/javac/diags/examples/ServiceImplNotPublic/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplNotPublic/module-info.java rename to test/langtools/tools/javac/diags/examples/ServiceImplNotPublic/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf.java b/test/langtools/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf.java rename to test/langtools/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/impl/Impl.java b/test/langtools/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/impl/Impl.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/impl/Impl.java rename to test/langtools/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/impl/Impl.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/module-info.java b/test/langtools/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/module-info.java rename to test/langtools/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationDoesntHaveANoArgsConstructor/exported/Service.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationDoesntHaveANoArgsConstructor/exported/Service.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationDoesntHaveANoArgsConstructor/exported/Service.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationDoesntHaveANoArgsConstructor/exported/Service.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationDoesntHaveANoArgsConstructor/impl/ServiceImplementation.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationDoesntHaveANoArgsConstructor/impl/ServiceImplementation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationDoesntHaveANoArgsConstructor/impl/ServiceImplementation.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationDoesntHaveANoArgsConstructor/impl/ServiceImplementation.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationDoesntHaveANoArgsConstructor/module-info.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationDoesntHaveANoArgsConstructor/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationDoesntHaveANoArgsConstructor/module-info.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationDoesntHaveANoArgsConstructor/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationIsAbstract/exported/Service.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationIsAbstract/exported/Service.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationIsAbstract/exported/Service.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationIsAbstract/exported/Service.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationIsAbstract/impl/ServiceImplementation.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationIsAbstract/impl/ServiceImplementation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationIsAbstract/impl/ServiceImplementation.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationIsAbstract/impl/ServiceImplementation.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationIsAbstract/module-info.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationIsAbstract/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationIsAbstract/module-info.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationIsAbstract/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationIsInner/exported/Service.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationIsInner/exported/Service.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationIsInner/exported/Service.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationIsInner/exported/Service.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationIsInner/impl/ServiceImplementation.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationIsInner/impl/ServiceImplementation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationIsInner/impl/ServiceImplementation.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationIsInner/impl/ServiceImplementation.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationIsInner/module-info.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationIsInner/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationIsInner/module-info.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationIsInner/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationNoArgsConstructorNotPublic/exported/Service.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationNoArgsConstructorNotPublic/exported/Service.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationNoArgsConstructorNotPublic/exported/Service.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationNoArgsConstructorNotPublic/exported/Service.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationNoArgsConstructorNotPublic/impl/ServiceImplementation.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationNoArgsConstructorNotPublic/impl/ServiceImplementation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationNoArgsConstructorNotPublic/impl/ServiceImplementation.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationNoArgsConstructorNotPublic/impl/ServiceImplementation.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationNoArgsConstructorNotPublic/module-info.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationNoArgsConstructorNotPublic/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationNoArgsConstructorNotPublic/module-info.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationNoArgsConstructorNotPublic/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/ServiceImplementationNotInRightModule.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationNotInRightModule/ServiceImplementationNotInRightModule.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/ServiceImplementationNotInRightModule.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationNotInRightModule/ServiceImplementationNotInRightModule.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/exported/Service.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/exported/Service.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/exported/Service.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/exported/Service.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/exported/ServiceImplementation.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/exported/ServiceImplementation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/exported/ServiceImplementation.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/exported/ServiceImplementation.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m2x/module-info.java b/test/langtools/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m2x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m2x/module-info.java rename to test/langtools/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m2x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/ServiceProvidedButNotExportedOrUsed.java b/test/langtools/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/ServiceProvidedButNotExportedOrUsed.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/ServiceProvidedButNotExportedOrUsed.java rename to test/langtools/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/ServiceProvidedButNotExportedOrUsed.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/modulesourcepath/m/module-info.java b/test/langtools/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/modulesourcepath/m/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/modulesourcepath/m/module-info.java rename to test/langtools/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/modulesourcepath/m/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/modulesourcepath/m/p1/C1.java b/test/langtools/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/modulesourcepath/m/p1/C1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/modulesourcepath/m/p1/C1.java rename to test/langtools/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/modulesourcepath/m/p1/C1.java diff --git a/langtools/test/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/modulesourcepath/m/p2/C2.java b/test/langtools/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/modulesourcepath/m/p2/C2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/modulesourcepath/m/p2/C2.java rename to test/langtools/tools/javac/diags/examples/ServiceProvidedButNotExportedOrUsed/modulesourcepath/m/p2/C2.java diff --git a/langtools/test/tools/javac/diags/examples/SourceNoBootclasspath.java b/test/langtools/tools/javac/diags/examples/SourceNoBootclasspath.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/SourceNoBootclasspath.java rename to test/langtools/tools/javac/diags/examples/SourceNoBootclasspath.java diff --git a/langtools/test/tools/javac/diags/examples/StatExprExpected.java b/test/langtools/tools/javac/diags/examples/StatExprExpected.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/StatExprExpected.java rename to test/langtools/tools/javac/diags/examples/StatExprExpected.java diff --git a/langtools/test/tools/javac/diags/examples/StaticImportOnlyClassesAndInterfaces/Other.java b/test/langtools/tools/javac/diags/examples/StaticImportOnlyClassesAndInterfaces/Other.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/StaticImportOnlyClassesAndInterfaces/Other.java rename to test/langtools/tools/javac/diags/examples/StaticImportOnlyClassesAndInterfaces/Other.java diff --git a/langtools/test/tools/javac/diags/examples/StaticImportOnlyClassesAndInterfaces/StaticImportOnlyClassesAndInterfaces.java b/test/langtools/tools/javac/diags/examples/StaticImportOnlyClassesAndInterfaces/StaticImportOnlyClassesAndInterfaces.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/StaticImportOnlyClassesAndInterfaces/StaticImportOnlyClassesAndInterfaces.java rename to test/langtools/tools/javac/diags/examples/StaticImportOnlyClassesAndInterfaces/StaticImportOnlyClassesAndInterfaces.java diff --git a/langtools/test/tools/javac/diags/examples/StaticIntfMethodInvokeNotSupported.java b/test/langtools/tools/javac/diags/examples/StaticIntfMethodInvokeNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/StaticIntfMethodInvokeNotSupported.java rename to test/langtools/tools/javac/diags/examples/StaticIntfMethodInvokeNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/StaticIntfMethodNotSupported.java b/test/langtools/tools/javac/diags/examples/StaticIntfMethodNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/StaticIntfMethodNotSupported.java rename to test/langtools/tools/javac/diags/examples/StaticIntfMethodNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/StaticMrefWithTargs.java b/test/langtools/tools/javac/diags/examples/StaticMrefWithTargs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/StaticMrefWithTargs.java rename to test/langtools/tools/javac/diags/examples/StaticMrefWithTargs.java diff --git a/langtools/test/tools/javac/diags/examples/StaticNotQualifiedByType.java b/test/langtools/tools/javac/diags/examples/StaticNotQualifiedByType.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/StaticNotQualifiedByType.java rename to test/langtools/tools/javac/diags/examples/StaticNotQualifiedByType.java diff --git a/langtools/test/tools/javac/diags/examples/StringConstRequired.java b/test/langtools/tools/javac/diags/examples/StringConstRequired.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/StringConstRequired.java rename to test/langtools/tools/javac/diags/examples/StringConstRequired.java diff --git a/langtools/test/tools/javac/diags/examples/StringSwitchNotSupported.java b/test/langtools/tools/javac/diags/examples/StringSwitchNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/StringSwitchNotSupported.java rename to test/langtools/tools/javac/diags/examples/StringSwitchNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/SunApiFilename.java b/test/langtools/tools/javac/diags/examples/SunApiFilename.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/SunApiFilename.java rename to test/langtools/tools/javac/diags/examples/SunApiFilename.java diff --git a/langtools/test/tools/javac/diags/examples/SunApiFilenameAdditional.java b/test/langtools/tools/javac/diags/examples/SunApiFilenameAdditional.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/SunApiFilenameAdditional.java rename to test/langtools/tools/javac/diags/examples/SunApiFilenameAdditional.java diff --git a/langtools/test/tools/javac/diags/examples/SunApiPlural/SunApiFilename.java b/test/langtools/tools/javac/diags/examples/SunApiPlural/SunApiFilename.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/SunApiPlural/SunApiFilename.java rename to test/langtools/tools/javac/diags/examples/SunApiPlural/SunApiFilename.java diff --git a/langtools/test/tools/javac/diags/examples/SunApiPlural/SunApiPlural.java b/test/langtools/tools/javac/diags/examples/SunApiPlural/SunApiPlural.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/SunApiPlural/SunApiPlural.java rename to test/langtools/tools/javac/diags/examples/SunApiPlural/SunApiPlural.java diff --git a/langtools/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiFilename.java b/test/langtools/tools/javac/diags/examples/SunApiPluralAdditional/SunApiFilename.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiFilename.java rename to test/langtools/tools/javac/diags/examples/SunApiPluralAdditional/SunApiFilename.java diff --git a/langtools/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPlural.java b/test/langtools/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPlural.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPlural.java rename to test/langtools/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPlural.java diff --git a/langtools/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPluralAdditional.java b/test/langtools/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPluralAdditional.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPluralAdditional.java rename to test/langtools/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPluralAdditional.java diff --git a/langtools/test/tools/javac/diags/examples/SunProprietary.java b/test/langtools/tools/javac/diags/examples/SunProprietary.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/SunProprietary.java rename to test/langtools/tools/javac/diags/examples/SunProprietary.java diff --git a/langtools/test/tools/javac/diags/examples/SuperNotAllowedInEnum.java b/test/langtools/tools/javac/diags/examples/SuperNotAllowedInEnum.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/SuperNotAllowedInEnum.java rename to test/langtools/tools/javac/diags/examples/SuperNotAllowedInEnum.java diff --git a/langtools/test/tools/javac/diags/examples/ThisAsIdentifier.java b/test/langtools/tools/javac/diags/examples/ThisAsIdentifier.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ThisAsIdentifier.java rename to test/langtools/tools/javac/diags/examples/ThisAsIdentifier.java diff --git a/langtools/test/tools/javac/diags/examples/ThrowsNotAllowedInAnno.java b/test/langtools/tools/javac/diags/examples/ThrowsNotAllowedInAnno.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/ThrowsNotAllowedInAnno.java rename to test/langtools/tools/javac/diags/examples/ThrowsNotAllowedInAnno.java diff --git a/langtools/test/tools/javac/diags/examples/TooManyModules/TooManyModules.java b/test/langtools/tools/javac/diags/examples/TooManyModules/TooManyModules.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TooManyModules/TooManyModules.java rename to test/langtools/tools/javac/diags/examples/TooManyModules/TooManyModules.java diff --git a/langtools/test/tools/javac/diags/examples/TooManyModules/p1/module-info.java b/test/langtools/tools/javac/diags/examples/TooManyModules/p1/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TooManyModules/p1/module-info.java rename to test/langtools/tools/javac/diags/examples/TooManyModules/p1/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/TooManyModules/p2/module-info.java b/test/langtools/tools/javac/diags/examples/TooManyModules/p2/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TooManyModules/p2/module-info.java rename to test/langtools/tools/javac/diags/examples/TooManyModules/p2/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/TooManyPatchedModules/TooManyPatchedModules.java b/test/langtools/tools/javac/diags/examples/TooManyPatchedModules/TooManyPatchedModules.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TooManyPatchedModules/TooManyPatchedModules.java rename to test/langtools/tools/javac/diags/examples/TooManyPatchedModules/TooManyPatchedModules.java diff --git a/langtools/test/tools/javac/diags/examples/TooManyPatchedModules/patchmodule/java.compiler/p/C.java b/test/langtools/tools/javac/diags/examples/TooManyPatchedModules/patchmodule/java.compiler/p/C.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TooManyPatchedModules/patchmodule/java.compiler/p/C.java rename to test/langtools/tools/javac/diags/examples/TooManyPatchedModules/patchmodule/java.compiler/p/C.java diff --git a/langtools/test/tools/javac/diags/examples/TooManyPatchedModules/patchmodule/jdk.compiler/p/C.java b/test/langtools/tools/javac/diags/examples/TooManyPatchedModules/patchmodule/jdk.compiler/p/C.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TooManyPatchedModules/patchmodule/jdk.compiler/p/C.java rename to test/langtools/tools/javac/diags/examples/TooManyPatchedModules/patchmodule/jdk.compiler/p/C.java diff --git a/langtools/test/tools/javac/diags/examples/TrustMeOnNonVarargsMeth.java b/test/langtools/tools/javac/diags/examples/TrustMeOnNonVarargsMeth.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TrustMeOnNonVarargsMeth.java rename to test/langtools/tools/javac/diags/examples/TrustMeOnNonVarargsMeth.java diff --git a/langtools/test/tools/javac/diags/examples/TrustMeOnReifiableVarargsParam.java b/test/langtools/tools/javac/diags/examples/TrustMeOnReifiableVarargsParam.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TrustMeOnReifiableVarargsParam.java rename to test/langtools/tools/javac/diags/examples/TrustMeOnReifiableVarargsParam.java diff --git a/langtools/test/tools/javac/diags/examples/TrustMeOnVirtualMethod.java b/test/langtools/tools/javac/diags/examples/TrustMeOnVirtualMethod.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TrustMeOnVirtualMethod.java rename to test/langtools/tools/javac/diags/examples/TrustMeOnVirtualMethod.java diff --git a/langtools/test/tools/javac/diags/examples/TryResourceNotSupported.java b/test/langtools/tools/javac/diags/examples/TryResourceNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TryResourceNotSupported.java rename to test/langtools/tools/javac/diags/examples/TryResourceNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java b/test/langtools/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java rename to test/langtools/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java diff --git a/langtools/test/tools/javac/diags/examples/TryWithResourcesExprEffectivelyFinalVar.java b/test/langtools/tools/javac/diags/examples/TryWithResourcesExprEffectivelyFinalVar.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TryWithResourcesExprEffectivelyFinalVar.java rename to test/langtools/tools/javac/diags/examples/TryWithResourcesExprEffectivelyFinalVar.java diff --git a/langtools/test/tools/javac/diags/examples/TryWithResourcesExprNeedsVar.java b/test/langtools/tools/javac/diags/examples/TryWithResourcesExprNeedsVar.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TryWithResourcesExprNeedsVar.java rename to test/langtools/tools/javac/diags/examples/TryWithResourcesExprNeedsVar.java diff --git a/langtools/test/tools/javac/diags/examples/TryWithoutCatchOrFinally.java b/test/langtools/tools/javac/diags/examples/TryWithoutCatchOrFinally.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TryWithoutCatchOrFinally.java rename to test/langtools/tools/javac/diags/examples/TryWithoutCatchOrFinally.java diff --git a/langtools/test/tools/javac/diags/examples/TryWithoutCatchOrFinallyOrResource.java b/test/langtools/tools/javac/diags/examples/TryWithoutCatchOrFinallyOrResource.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TryWithoutCatchOrFinallyOrResource.java rename to test/langtools/tools/javac/diags/examples/TryWithoutCatchOrFinallyOrResource.java diff --git a/langtools/test/tools/javac/diags/examples/TypeAnnoNotApplicableInTypeContext.java b/test/langtools/tools/javac/diags/examples/TypeAnnoNotApplicableInTypeContext.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TypeAnnoNotApplicableInTypeContext.java rename to test/langtools/tools/javac/diags/examples/TypeAnnoNotApplicableInTypeContext.java diff --git a/langtools/test/tools/javac/diags/examples/TypeAnnotationsNotSupported.java b/test/langtools/tools/javac/diags/examples/TypeAnnotationsNotSupported.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TypeAnnotationsNotSupported.java rename to test/langtools/tools/javac/diags/examples/TypeAnnotationsNotSupported.java diff --git a/langtools/test/tools/javac/diags/examples/TypeFoundRequired.java b/test/langtools/tools/javac/diags/examples/TypeFoundRequired.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TypeFoundRequired.java rename to test/langtools/tools/javac/diags/examples/TypeFoundRequired.java diff --git a/langtools/test/tools/javac/diags/examples/TypeNoParams.java b/test/langtools/tools/javac/diags/examples/TypeNoParams.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TypeNoParams.java rename to test/langtools/tools/javac/diags/examples/TypeNoParams.java diff --git a/langtools/test/tools/javac/diags/examples/TypeReqClassArray.java b/test/langtools/tools/javac/diags/examples/TypeReqClassArray.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TypeReqClassArray.java rename to test/langtools/tools/javac/diags/examples/TypeReqClassArray.java diff --git a/langtools/test/tools/javac/diags/examples/TypeReqRef.java b/test/langtools/tools/javac/diags/examples/TypeReqRef.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TypeReqRef.java rename to test/langtools/tools/javac/diags/examples/TypeReqRef.java diff --git a/langtools/test/tools/javac/diags/examples/TypeVarCantBeDeref.java b/test/langtools/tools/javac/diags/examples/TypeVarCantBeDeref.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TypeVarCantBeDeref.java rename to test/langtools/tools/javac/diags/examples/TypeVarCantBeDeref.java diff --git a/langtools/test/tools/javac/diags/examples/TypeVarMayNotBeFollowedByOtherBounds.java b/test/langtools/tools/javac/diags/examples/TypeVarMayNotBeFollowedByOtherBounds.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TypeVarMayNotBeFollowedByOtherBounds.java rename to test/langtools/tools/javac/diags/examples/TypeVarMayNotBeFollowedByOtherBounds.java diff --git a/langtools/test/tools/javac/diags/examples/TypesIncompatible.java b/test/langtools/tools/javac/diags/examples/TypesIncompatible.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TypesIncompatible.java rename to test/langtools/tools/javac/diags/examples/TypesIncompatible.java diff --git a/langtools/test/tools/javac/diags/examples/TypesIncompatibleAbstractDefault.java b/test/langtools/tools/javac/diags/examples/TypesIncompatibleAbstractDefault.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TypesIncompatibleAbstractDefault.java rename to test/langtools/tools/javac/diags/examples/TypesIncompatibleAbstractDefault.java diff --git a/langtools/test/tools/javac/diags/examples/TypesIncompatibleUnrelatedDefaults.java b/test/langtools/tools/javac/diags/examples/TypesIncompatibleUnrelatedDefaults.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/TypesIncompatibleUnrelatedDefaults.java rename to test/langtools/tools/javac/diags/examples/TypesIncompatibleUnrelatedDefaults.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedAssign.java b/test/langtools/tools/javac/diags/examples/UncheckedAssign.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedAssign.java rename to test/langtools/tools/javac/diags/examples/UncheckedAssign.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedAssignToVar.java b/test/langtools/tools/javac/diags/examples/UncheckedAssignToVar.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedAssignToVar.java rename to test/langtools/tools/javac/diags/examples/UncheckedAssignToVar.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedCall.java b/test/langtools/tools/javac/diags/examples/UncheckedCall.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedCall.java rename to test/langtools/tools/javac/diags/examples/UncheckedCall.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedCast.java b/test/langtools/tools/javac/diags/examples/UncheckedCast.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedCast.java rename to test/langtools/tools/javac/diags/examples/UncheckedCast.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedClash.java b/test/langtools/tools/javac/diags/examples/UncheckedClash.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedClash.java rename to test/langtools/tools/javac/diags/examples/UncheckedClash.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedFilename.java b/test/langtools/tools/javac/diags/examples/UncheckedFilename.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedFilename.java rename to test/langtools/tools/javac/diags/examples/UncheckedFilename.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedFilenameAdditional.java b/test/langtools/tools/javac/diags/examples/UncheckedFilenameAdditional.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedFilenameAdditional.java rename to test/langtools/tools/javac/diags/examples/UncheckedFilenameAdditional.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedGenericArrayCreation.java b/test/langtools/tools/javac/diags/examples/UncheckedGenericArrayCreation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedGenericArrayCreation.java rename to test/langtools/tools/javac/diags/examples/UncheckedGenericArrayCreation.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedImplement.java b/test/langtools/tools/javac/diags/examples/UncheckedImplement.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedImplement.java rename to test/langtools/tools/javac/diags/examples/UncheckedImplement.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedMethodInvocation.java b/test/langtools/tools/javac/diags/examples/UncheckedMethodInvocation.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedMethodInvocation.java rename to test/langtools/tools/javac/diags/examples/UncheckedMethodInvocation.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedPlural/UncheckedFilename.java b/test/langtools/tools/javac/diags/examples/UncheckedPlural/UncheckedFilename.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedPlural/UncheckedFilename.java rename to test/langtools/tools/javac/diags/examples/UncheckedPlural/UncheckedFilename.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedPlural/UncheckedPlural.java b/test/langtools/tools/javac/diags/examples/UncheckedPlural/UncheckedPlural.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedPlural/UncheckedPlural.java rename to test/langtools/tools/javac/diags/examples/UncheckedPlural/UncheckedPlural.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename1.java b/test/langtools/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename1.java rename to test/langtools/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename1.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename2.java b/test/langtools/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename2.java rename to test/langtools/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename2.java diff --git a/langtools/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedPluralAdditional.java b/test/langtools/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedPluralAdditional.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedPluralAdditional.java rename to test/langtools/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedPluralAdditional.java diff --git a/langtools/test/tools/javac/diags/examples/UnclosedCharLiteral.java b/test/langtools/tools/javac/diags/examples/UnclosedCharLiteral.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnclosedCharLiteral.java rename to test/langtools/tools/javac/diags/examples/UnclosedCharLiteral.java diff --git a/langtools/test/tools/javac/diags/examples/UnclosedComment.java b/test/langtools/tools/javac/diags/examples/UnclosedComment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnclosedComment.java rename to test/langtools/tools/javac/diags/examples/UnclosedComment.java diff --git a/langtools/test/tools/javac/diags/examples/UnclosedStringLiteral.java b/test/langtools/tools/javac/diags/examples/UnclosedStringLiteral.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnclosedStringLiteral.java rename to test/langtools/tools/javac/diags/examples/UnclosedStringLiteral.java diff --git a/langtools/test/tools/javac/diags/examples/UndefinedLabel.java b/test/langtools/tools/javac/diags/examples/UndefinedLabel.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UndefinedLabel.java rename to test/langtools/tools/javac/diags/examples/UndefinedLabel.java diff --git a/langtools/test/tools/javac/diags/examples/UnderscoreAsIdentifierError.java b/test/langtools/tools/javac/diags/examples/UnderscoreAsIdentifierError.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnderscoreAsIdentifierError.java rename to test/langtools/tools/javac/diags/examples/UnderscoreAsIdentifierError.java diff --git a/langtools/test/tools/javac/diags/examples/UnderscoreAsIdentifierWarning.java b/test/langtools/tools/javac/diags/examples/UnderscoreAsIdentifierWarning.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnderscoreAsIdentifierWarning.java rename to test/langtools/tools/javac/diags/examples/UnderscoreAsIdentifierWarning.java diff --git a/langtools/test/tools/javac/diags/examples/UnderscoreInLambdaExpression.java b/test/langtools/tools/javac/diags/examples/UnderscoreInLambdaExpression.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnderscoreInLambdaExpression.java rename to test/langtools/tools/javac/diags/examples/UnderscoreInLambdaExpression.java diff --git a/langtools/test/tools/javac/diags/examples/UnexpectedContent.java b/test/langtools/tools/javac/diags/examples/UnexpectedContent.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnexpectedContent.java rename to test/langtools/tools/javac/diags/examples/UnexpectedContent.java diff --git a/langtools/test/tools/javac/diags/examples/UnexpectedLambda.java b/test/langtools/tools/javac/diags/examples/UnexpectedLambda.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnexpectedLambda.java rename to test/langtools/tools/javac/diags/examples/UnexpectedLambda.java diff --git a/langtools/test/tools/javac/diags/examples/UnexpectedMref.java b/test/langtools/tools/javac/diags/examples/UnexpectedMref.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnexpectedMref.java rename to test/langtools/tools/javac/diags/examples/UnexpectedMref.java diff --git a/langtools/test/tools/javac/diags/examples/UnexpectedReturnValue.java b/test/langtools/tools/javac/diags/examples/UnexpectedReturnValue.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnexpectedReturnValue.java rename to test/langtools/tools/javac/diags/examples/UnexpectedReturnValue.java diff --git a/langtools/test/tools/javac/diags/examples/UnexpectedTokenInModuleInfo/module-info.java b/test/langtools/tools/javac/diags/examples/UnexpectedTokenInModuleInfo/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnexpectedTokenInModuleInfo/module-info.java rename to test/langtools/tools/javac/diags/examples/UnexpectedTokenInModuleInfo/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/UnmatchedProcessorOptions/UnmatchedProcessorOptions.java b/test/langtools/tools/javac/diags/examples/UnmatchedProcessorOptions/UnmatchedProcessorOptions.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnmatchedProcessorOptions/UnmatchedProcessorOptions.java rename to test/langtools/tools/javac/diags/examples/UnmatchedProcessorOptions/UnmatchedProcessorOptions.java diff --git a/langtools/test/tools/javac/diags/examples/UnmatchedProcessorOptions/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/UnmatchedProcessorOptions/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnmatchedProcessorOptions/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/UnmatchedProcessorOptions/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/UnnamedPackage.java b/test/langtools/tools/javac/diags/examples/UnnamedPackage.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnnamedPackage.java rename to test/langtools/tools/javac/diags/examples/UnnamedPackage.java diff --git a/langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/UnnamedPackageInNamedModule.java b/test/langtools/tools/javac/diags/examples/UnnamedPackageInNamedModule/UnnamedPackageInNamedModule.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/UnnamedPackageInNamedModule.java rename to test/langtools/tools/javac/diags/examples/UnnamedPackageInNamedModule/UnnamedPackageInNamedModule.java diff --git a/langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/UnnamedPackageInNamedModule.java b/test/langtools/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/UnnamedPackageInNamedModule.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/UnnamedPackageInNamedModule.java rename to test/langtools/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/UnnamedPackageInNamedModule.java diff --git a/langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/module-info.java b/test/langtools/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/module-info.java rename to test/langtools/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/UnreachableCatch.java b/test/langtools/tools/javac/diags/examples/UnreachableCatch.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnreachableCatch.java rename to test/langtools/tools/javac/diags/examples/UnreachableCatch.java diff --git a/langtools/test/tools/javac/diags/examples/UnreachableCatch1.java b/test/langtools/tools/javac/diags/examples/UnreachableCatch1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnreachableCatch1.java rename to test/langtools/tools/javac/diags/examples/UnreachableCatch1.java diff --git a/langtools/test/tools/javac/diags/examples/UnreachableStatement.java b/test/langtools/tools/javac/diags/examples/UnreachableStatement.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnreachableStatement.java rename to test/langtools/tools/javac/diags/examples/UnreachableStatement.java diff --git a/langtools/test/tools/javac/diags/examples/UnreportedException.java b/test/langtools/tools/javac/diags/examples/UnreportedException.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnreportedException.java rename to test/langtools/tools/javac/diags/examples/UnreportedException.java diff --git a/langtools/test/tools/javac/diags/examples/UnreportedExceptionDefaultConstructor.java b/test/langtools/tools/javac/diags/examples/UnreportedExceptionDefaultConstructor.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnreportedExceptionDefaultConstructor.java rename to test/langtools/tools/javac/diags/examples/UnreportedExceptionDefaultConstructor.java diff --git a/langtools/test/tools/javac/diags/examples/UnreportedExceptionImplicitClose.java b/test/langtools/tools/javac/diags/examples/UnreportedExceptionImplicitClose.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnreportedExceptionImplicitClose.java rename to test/langtools/tools/javac/diags/examples/UnreportedExceptionImplicitClose.java diff --git a/langtools/test/tools/javac/diags/examples/UnsafeUseOfVarargsParam.java b/test/langtools/tools/javac/diags/examples/UnsafeUseOfVarargsParam.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnsafeUseOfVarargsParam.java rename to test/langtools/tools/javac/diags/examples/UnsafeUseOfVarargsParam.java diff --git a/langtools/test/tools/javac/diags/examples/UnsupportedBinaryLiteral.java b/test/langtools/tools/javac/diags/examples/UnsupportedBinaryLiteral.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnsupportedBinaryLiteral.java rename to test/langtools/tools/javac/diags/examples/UnsupportedBinaryLiteral.java diff --git a/langtools/test/tools/javac/diags/examples/UnsupportedEncoding.java b/test/langtools/tools/javac/diags/examples/UnsupportedEncoding.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnsupportedEncoding.java rename to test/langtools/tools/javac/diags/examples/UnsupportedEncoding.java diff --git a/langtools/test/tools/javac/diags/examples/UnsupportedUnderscoreLiteral.java b/test/langtools/tools/javac/diags/examples/UnsupportedUnderscoreLiteral.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnsupportedUnderscoreLiteral.java rename to test/langtools/tools/javac/diags/examples/UnsupportedUnderscoreLiteral.java diff --git a/langtools/test/tools/javac/diags/examples/UnterminatedInlineTag.java b/test/langtools/tools/javac/diags/examples/UnterminatedInlineTag.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnterminatedInlineTag.java rename to test/langtools/tools/javac/diags/examples/UnterminatedInlineTag.java diff --git a/langtools/test/tools/javac/diags/examples/UnterminatedSignature.java b/test/langtools/tools/javac/diags/examples/UnterminatedSignature.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/UnterminatedSignature.java rename to test/langtools/tools/javac/diags/examples/UnterminatedSignature.java diff --git a/langtools/test/tools/javac/diags/examples/VarInTryWithResourcesNotSupportedInSource.java b/test/langtools/tools/javac/diags/examples/VarInTryWithResourcesNotSupportedInSource.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarInTryWithResourcesNotSupportedInSource.java rename to test/langtools/tools/javac/diags/examples/VarInTryWithResourcesNotSupportedInSource.java diff --git a/langtools/test/tools/javac/diags/examples/VarMightAlreadyBeAssigned.java b/test/langtools/tools/javac/diags/examples/VarMightAlreadyBeAssigned.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarMightAlreadyBeAssigned.java rename to test/langtools/tools/javac/diags/examples/VarMightAlreadyBeAssigned.java diff --git a/langtools/test/tools/javac/diags/examples/VarMightNotHaveBeenInitialized.java b/test/langtools/tools/javac/diags/examples/VarMightNotHaveBeenInitialized.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarMightNotHaveBeenInitialized.java rename to test/langtools/tools/javac/diags/examples/VarMightNotHaveBeenInitialized.java diff --git a/langtools/test/tools/javac/diags/examples/VarNotIntializedInDefaultConstructor.java b/test/langtools/tools/javac/diags/examples/VarNotIntializedInDefaultConstructor.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarNotIntializedInDefaultConstructor.java rename to test/langtools/tools/javac/diags/examples/VarNotIntializedInDefaultConstructor.java diff --git a/langtools/test/tools/javac/diags/examples/VarargsAndOldArraySyntax.java b/test/langtools/tools/javac/diags/examples/VarargsAndOldArraySyntax.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarargsAndOldArraySyntax.java rename to test/langtools/tools/javac/diags/examples/VarargsAndOldArraySyntax.java diff --git a/langtools/test/tools/javac/diags/examples/VarargsAndReceiver.java b/test/langtools/tools/javac/diags/examples/VarargsAndReceiver.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarargsAndReceiver.java rename to test/langtools/tools/javac/diags/examples/VarargsAndReceiver.java diff --git a/langtools/test/tools/javac/diags/examples/VarargsArgumentMismatch.java b/test/langtools/tools/javac/diags/examples/VarargsArgumentMismatch.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarargsArgumentMismatch.java rename to test/langtools/tools/javac/diags/examples/VarargsArgumentMismatch.java diff --git a/langtools/test/tools/javac/diags/examples/VarargsClash.java b/test/langtools/tools/javac/diags/examples/VarargsClash.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarargsClash.java rename to test/langtools/tools/javac/diags/examples/VarargsClash.java diff --git a/langtools/test/tools/javac/diags/examples/VarargsFinalOnly.java b/test/langtools/tools/javac/diags/examples/VarargsFinalOnly.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarargsFinalOnly.java rename to test/langtools/tools/javac/diags/examples/VarargsFinalOnly.java diff --git a/langtools/test/tools/javac/diags/examples/VarargsImplement.java b/test/langtools/tools/javac/diags/examples/VarargsImplement.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarargsImplement.java rename to test/langtools/tools/javac/diags/examples/VarargsImplement.java diff --git a/langtools/test/tools/javac/diags/examples/VarargsMustBeLast.java b/test/langtools/tools/javac/diags/examples/VarargsMustBeLast.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarargsMustBeLast.java rename to test/langtools/tools/javac/diags/examples/VarargsMustBeLast.java diff --git a/langtools/test/tools/javac/diags/examples/VarargsNonReifiableType.java b/test/langtools/tools/javac/diags/examples/VarargsNonReifiableType.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarargsNonReifiableType.java rename to test/langtools/tools/javac/diags/examples/VarargsNonReifiableType.java diff --git a/langtools/test/tools/javac/diags/examples/VarargsOverride.java b/test/langtools/tools/javac/diags/examples/VarargsOverride.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VarargsOverride.java rename to test/langtools/tools/javac/diags/examples/VarargsOverride.java diff --git a/langtools/test/tools/javac/diags/examples/Verbose.java b/test/langtools/tools/javac/diags/examples/Verbose.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/Verbose.java rename to test/langtools/tools/javac/diags/examples/Verbose.java diff --git a/langtools/test/tools/javac/diags/examples/VerboseResolveMulti.java b/test/langtools/tools/javac/diags/examples/VerboseResolveMulti.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VerboseResolveMulti.java rename to test/langtools/tools/javac/diags/examples/VerboseResolveMulti.java diff --git a/langtools/test/tools/javac/diags/examples/VerboseResolveMulti1.java b/test/langtools/tools/javac/diags/examples/VerboseResolveMulti1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VerboseResolveMulti1.java rename to test/langtools/tools/javac/diags/examples/VerboseResolveMulti1.java diff --git a/langtools/test/tools/javac/diags/examples/VoidNotAllowed.java b/test/langtools/tools/javac/diags/examples/VoidNotAllowed.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/VoidNotAllowed.java rename to test/langtools/tools/javac/diags/examples/VoidNotAllowed.java diff --git a/langtools/test/tools/javac/diags/examples/WarnForwardRef.java b/test/langtools/tools/javac/diags/examples/WarnForwardRef.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WarnForwardRef.java rename to test/langtools/tools/javac/diags/examples/WarnForwardRef.java diff --git a/langtools/test/tools/javac/diags/examples/WarnModuleNotFound/WarnModuleNotFound.java b/test/langtools/tools/javac/diags/examples/WarnModuleNotFound/WarnModuleNotFound.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WarnModuleNotFound/WarnModuleNotFound.java rename to test/langtools/tools/javac/diags/examples/WarnModuleNotFound/WarnModuleNotFound.java diff --git a/langtools/test/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/api/Api.java b/test/langtools/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/api/Api.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/api/Api.java rename to test/langtools/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/api/Api.java diff --git a/langtools/test/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/module-info.java b/test/langtools/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/module-info.java rename to test/langtools/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/WarnProcMessager/WarnProcMessager.java b/test/langtools/tools/javac/diags/examples/WarnProcMessager/WarnProcMessager.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WarnProcMessager/WarnProcMessager.java rename to test/langtools/tools/javac/diags/examples/WarnProcMessager/WarnProcMessager.java diff --git a/langtools/test/tools/javac/diags/examples/WarnProcMessager/processors/AnnoProc.java b/test/langtools/tools/javac/diags/examples/WarnProcMessager/processors/AnnoProc.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WarnProcMessager/processors/AnnoProc.java rename to test/langtools/tools/javac/diags/examples/WarnProcMessager/processors/AnnoProc.java diff --git a/langtools/test/tools/javac/diags/examples/WarnSelfRef.java b/test/langtools/tools/javac/diags/examples/WarnSelfRef.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WarnSelfRef.java rename to test/langtools/tools/javac/diags/examples/WarnSelfRef.java diff --git a/langtools/test/tools/javac/diags/examples/WarnSerializableLambda.java b/test/langtools/tools/javac/diags/examples/WarnSerializableLambda.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WarnSerializableLambda.java rename to test/langtools/tools/javac/diags/examples/WarnSerializableLambda.java diff --git a/langtools/test/tools/javac/diags/examples/WarningAndWerror.java b/test/langtools/tools/javac/diags/examples/WarningAndWerror.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WarningAndWerror.java rename to test/langtools/tools/javac/diags/examples/WarningAndWerror.java diff --git a/langtools/test/tools/javac/diags/examples/WhereCaptured.java b/test/langtools/tools/javac/diags/examples/WhereCaptured.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WhereCaptured.java rename to test/langtools/tools/javac/diags/examples/WhereCaptured.java diff --git a/langtools/test/tools/javac/diags/examples/WhereCaptured1.java b/test/langtools/tools/javac/diags/examples/WhereCaptured1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WhereCaptured1.java rename to test/langtools/tools/javac/diags/examples/WhereCaptured1.java diff --git a/langtools/test/tools/javac/diags/examples/WhereFreshTvar.java b/test/langtools/tools/javac/diags/examples/WhereFreshTvar.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WhereFreshTvar.java rename to test/langtools/tools/javac/diags/examples/WhereFreshTvar.java diff --git a/langtools/test/tools/javac/diags/examples/WhereIntersection.java b/test/langtools/tools/javac/diags/examples/WhereIntersection.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WhereIntersection.java rename to test/langtools/tools/javac/diags/examples/WhereIntersection.java diff --git a/langtools/test/tools/javac/diags/examples/WhereIntersection2.java b/test/langtools/tools/javac/diags/examples/WhereIntersection2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WhereIntersection2.java rename to test/langtools/tools/javac/diags/examples/WhereIntersection2.java diff --git a/langtools/test/tools/javac/diags/examples/WhereTypeVar.java b/test/langtools/tools/javac/diags/examples/WhereTypeVar.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WhereTypeVar.java rename to test/langtools/tools/javac/diags/examples/WhereTypeVar.java diff --git a/langtools/test/tools/javac/diags/examples/WhereTypeVar2.java b/test/langtools/tools/javac/diags/examples/WhereTypeVar2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WhereTypeVar2.java rename to test/langtools/tools/javac/diags/examples/WhereTypeVar2.java diff --git a/langtools/test/tools/javac/diags/examples/WrongNumberTypeArgs.java b/test/langtools/tools/javac/diags/examples/WrongNumberTypeArgs.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WrongNumberTypeArgs.java rename to test/langtools/tools/javac/diags/examples/WrongNumberTypeArgs.java diff --git a/langtools/test/tools/javac/diags/examples/WrongNumberTypeArgsFragment.java b/test/langtools/tools/javac/diags/examples/WrongNumberTypeArgsFragment.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/WrongNumberTypeArgsFragment.java rename to test/langtools/tools/javac/diags/examples/WrongNumberTypeArgsFragment.java diff --git a/langtools/test/tools/javac/doclint/DocLintFormatTest.java b/test/langtools/tools/javac/doclint/DocLintFormatTest.java similarity index 100% rename from langtools/test/tools/javac/doclint/DocLintFormatTest.java rename to test/langtools/tools/javac/doclint/DocLintFormatTest.java diff --git a/langtools/test/tools/javac/doclint/DocLintTest.java b/test/langtools/tools/javac/doclint/DocLintTest.java similarity index 100% rename from langtools/test/tools/javac/doclint/DocLintTest.java rename to test/langtools/tools/javac/doclint/DocLintTest.java diff --git a/langtools/test/tools/javac/doclint/ImplicitHeadersTest.java b/test/langtools/tools/javac/doclint/ImplicitHeadersTest.java similarity index 100% rename from langtools/test/tools/javac/doclint/ImplicitHeadersTest.java rename to test/langtools/tools/javac/doclint/ImplicitHeadersTest.java diff --git a/langtools/test/tools/javac/doclint/IncludePackagesTest.java b/test/langtools/tools/javac/doclint/IncludePackagesTest.java similarity index 100% rename from langtools/test/tools/javac/doclint/IncludePackagesTest.java rename to test/langtools/tools/javac/doclint/IncludePackagesTest.java diff --git a/langtools/test/tools/javac/doclint/NPEDuplicateClassNamesTest.java b/test/langtools/tools/javac/doclint/NPEDuplicateClassNamesTest.java similarity index 100% rename from langtools/test/tools/javac/doclint/NPEDuplicateClassNamesTest.java rename to test/langtools/tools/javac/doclint/NPEDuplicateClassNamesTest.java diff --git a/langtools/test/tools/javac/doclint/implicitSource/ImplicitSourceTest.java b/test/langtools/tools/javac/doclint/implicitSource/ImplicitSourceTest.java similarity index 100% rename from langtools/test/tools/javac/doclint/implicitSource/ImplicitSourceTest.java rename to test/langtools/tools/javac/doclint/implicitSource/ImplicitSourceTest.java diff --git a/langtools/test/tools/javac/doclint/implicitSource/Other.java b/test/langtools/tools/javac/doclint/implicitSource/Other.java similarity index 100% rename from langtools/test/tools/javac/doclint/implicitSource/Other.java rename to test/langtools/tools/javac/doclint/implicitSource/Other.java diff --git a/langtools/test/tools/javac/doctree/AttrTest.java b/test/langtools/tools/javac/doctree/AttrTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/AttrTest.java rename to test/langtools/tools/javac/doctree/AttrTest.java diff --git a/langtools/test/tools/javac/doctree/AuthorTest.java b/test/langtools/tools/javac/doctree/AuthorTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/AuthorTest.java rename to test/langtools/tools/javac/doctree/AuthorTest.java diff --git a/langtools/test/tools/javac/doctree/BadTest.java b/test/langtools/tools/javac/doctree/BadTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/BadTest.java rename to test/langtools/tools/javac/doctree/BadTest.java diff --git a/langtools/test/tools/javac/doctree/CodeTest.java b/test/langtools/tools/javac/doctree/CodeTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/CodeTest.java rename to test/langtools/tools/javac/doctree/CodeTest.java diff --git a/langtools/test/tools/javac/doctree/DeprecatedTest.java b/test/langtools/tools/javac/doctree/DeprecatedTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/DeprecatedTest.java rename to test/langtools/tools/javac/doctree/DeprecatedTest.java diff --git a/langtools/test/tools/javac/doctree/DocCommentTester.java b/test/langtools/tools/javac/doctree/DocCommentTester.java similarity index 100% rename from langtools/test/tools/javac/doctree/DocCommentTester.java rename to test/langtools/tools/javac/doctree/DocCommentTester.java diff --git a/langtools/test/tools/javac/doctree/DocRootTest.java b/test/langtools/tools/javac/doctree/DocRootTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/DocRootTest.java rename to test/langtools/tools/javac/doctree/DocRootTest.java diff --git a/langtools/test/tools/javac/doctree/DocTreePathScannerTest.java b/test/langtools/tools/javac/doctree/DocTreePathScannerTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/DocTreePathScannerTest.java rename to test/langtools/tools/javac/doctree/DocTreePathScannerTest.java diff --git a/langtools/test/tools/javac/doctree/ElementTest.java b/test/langtools/tools/javac/doctree/ElementTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/ElementTest.java rename to test/langtools/tools/javac/doctree/ElementTest.java diff --git a/langtools/test/tools/javac/doctree/EntityTest.java b/test/langtools/tools/javac/doctree/EntityTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/EntityTest.java rename to test/langtools/tools/javac/doctree/EntityTest.java diff --git a/langtools/test/tools/javac/doctree/ExceptionTest.java b/test/langtools/tools/javac/doctree/ExceptionTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/ExceptionTest.java rename to test/langtools/tools/javac/doctree/ExceptionTest.java diff --git a/langtools/test/tools/javac/doctree/FirstSentenceTest.java b/test/langtools/tools/javac/doctree/FirstSentenceTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/FirstSentenceTest.java rename to test/langtools/tools/javac/doctree/FirstSentenceTest.java diff --git a/langtools/test/tools/javac/doctree/HiddenTest.java b/test/langtools/tools/javac/doctree/HiddenTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/HiddenTest.java rename to test/langtools/tools/javac/doctree/HiddenTest.java diff --git a/langtools/test/tools/javac/doctree/InPreTest.java b/test/langtools/tools/javac/doctree/InPreTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/InPreTest.java rename to test/langtools/tools/javac/doctree/InPreTest.java diff --git a/langtools/test/tools/javac/doctree/IndexTest.java b/test/langtools/tools/javac/doctree/IndexTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/IndexTest.java rename to test/langtools/tools/javac/doctree/IndexTest.java diff --git a/langtools/test/tools/javac/doctree/InheritDocTest.java b/test/langtools/tools/javac/doctree/InheritDocTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/InheritDocTest.java rename to test/langtools/tools/javac/doctree/InheritDocTest.java diff --git a/langtools/test/tools/javac/doctree/LinkPlainTest.java b/test/langtools/tools/javac/doctree/LinkPlainTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/LinkPlainTest.java rename to test/langtools/tools/javac/doctree/LinkPlainTest.java diff --git a/langtools/test/tools/javac/doctree/LinkTest.java b/test/langtools/tools/javac/doctree/LinkTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/LinkTest.java rename to test/langtools/tools/javac/doctree/LinkTest.java diff --git a/langtools/test/tools/javac/doctree/LiteralTest.java b/test/langtools/tools/javac/doctree/LiteralTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/LiteralTest.java rename to test/langtools/tools/javac/doctree/LiteralTest.java diff --git a/langtools/test/tools/javac/doctree/ParamTest.java b/test/langtools/tools/javac/doctree/ParamTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/ParamTest.java rename to test/langtools/tools/javac/doctree/ParamTest.java diff --git a/langtools/test/tools/javac/doctree/ProvidesTest.java b/test/langtools/tools/javac/doctree/ProvidesTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/ProvidesTest.java rename to test/langtools/tools/javac/doctree/ProvidesTest.java diff --git a/langtools/test/tools/javac/doctree/ReferenceTest.java b/test/langtools/tools/javac/doctree/ReferenceTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/ReferenceTest.java rename to test/langtools/tools/javac/doctree/ReferenceTest.java diff --git a/langtools/test/tools/javac/doctree/ReturnTest.java b/test/langtools/tools/javac/doctree/ReturnTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/ReturnTest.java rename to test/langtools/tools/javac/doctree/ReturnTest.java diff --git a/langtools/test/tools/javac/doctree/SeeTest.java b/test/langtools/tools/javac/doctree/SeeTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/SeeTest.java rename to test/langtools/tools/javac/doctree/SeeTest.java diff --git a/langtools/test/tools/javac/doctree/SerialDataTest.java b/test/langtools/tools/javac/doctree/SerialDataTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/SerialDataTest.java rename to test/langtools/tools/javac/doctree/SerialDataTest.java diff --git a/langtools/test/tools/javac/doctree/SerialFieldTest.java b/test/langtools/tools/javac/doctree/SerialFieldTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/SerialFieldTest.java rename to test/langtools/tools/javac/doctree/SerialFieldTest.java diff --git a/langtools/test/tools/javac/doctree/SerialTest.java b/test/langtools/tools/javac/doctree/SerialTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/SerialTest.java rename to test/langtools/tools/javac/doctree/SerialTest.java diff --git a/langtools/test/tools/javac/doctree/SimpleDocTreeVisitorTest.java b/test/langtools/tools/javac/doctree/SimpleDocTreeVisitorTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/SimpleDocTreeVisitorTest.java rename to test/langtools/tools/javac/doctree/SimpleDocTreeVisitorTest.java diff --git a/langtools/test/tools/javac/doctree/SinceTest.java b/test/langtools/tools/javac/doctree/SinceTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/SinceTest.java rename to test/langtools/tools/javac/doctree/SinceTest.java diff --git a/langtools/test/tools/javac/doctree/SummaryTest.java b/test/langtools/tools/javac/doctree/SummaryTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/SummaryTest.java rename to test/langtools/tools/javac/doctree/SummaryTest.java diff --git a/langtools/test/tools/javac/doctree/TagTest.java b/test/langtools/tools/javac/doctree/TagTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/TagTest.java rename to test/langtools/tools/javac/doctree/TagTest.java diff --git a/langtools/test/tools/javac/doctree/ThrowableTest.java b/test/langtools/tools/javac/doctree/ThrowableTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/ThrowableTest.java rename to test/langtools/tools/javac/doctree/ThrowableTest.java diff --git a/langtools/test/tools/javac/doctree/UsesTest.java b/test/langtools/tools/javac/doctree/UsesTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/UsesTest.java rename to test/langtools/tools/javac/doctree/UsesTest.java diff --git a/langtools/test/tools/javac/doctree/ValueTest.java b/test/langtools/tools/javac/doctree/ValueTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/ValueTest.java rename to test/langtools/tools/javac/doctree/ValueTest.java diff --git a/langtools/test/tools/javac/doctree/VersionTest.java b/test/langtools/tools/javac/doctree/VersionTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/VersionTest.java rename to test/langtools/tools/javac/doctree/VersionTest.java diff --git a/langtools/test/tools/javac/doctree/dcapi/DocCommentTreeApiTester.java b/test/langtools/tools/javac/doctree/dcapi/DocCommentTreeApiTester.java similarity index 100% rename from langtools/test/tools/javac/doctree/dcapi/DocCommentTreeApiTester.java rename to test/langtools/tools/javac/doctree/dcapi/DocCommentTreeApiTester.java diff --git a/langtools/test/tools/javac/doctree/dcapi/OverviewTest.java b/test/langtools/tools/javac/doctree/dcapi/OverviewTest.java similarity index 100% rename from langtools/test/tools/javac/doctree/dcapi/OverviewTest.java rename to test/langtools/tools/javac/doctree/dcapi/OverviewTest.java diff --git a/langtools/test/tools/javac/doctree/dcapi/overview0.html b/test/langtools/tools/javac/doctree/dcapi/overview0.html similarity index 100% rename from langtools/test/tools/javac/doctree/dcapi/overview0.html rename to test/langtools/tools/javac/doctree/dcapi/overview0.html diff --git a/langtools/test/tools/javac/doctree/dcapi/overview1.html b/test/langtools/tools/javac/doctree/dcapi/overview1.html similarity index 100% rename from langtools/test/tools/javac/doctree/dcapi/overview1.html rename to test/langtools/tools/javac/doctree/dcapi/overview1.html diff --git a/langtools/test/tools/javac/doctree/dcapi/overview2.html b/test/langtools/tools/javac/doctree/dcapi/overview2.html similarity index 100% rename from langtools/test/tools/javac/doctree/dcapi/overview2.html rename to test/langtools/tools/javac/doctree/dcapi/overview2.html diff --git a/langtools/test/tools/javac/doctree/dcapi/overview3.html b/test/langtools/tools/javac/doctree/dcapi/overview3.html similarity index 100% rename from langtools/test/tools/javac/doctree/dcapi/overview3.html rename to test/langtools/tools/javac/doctree/dcapi/overview3.html diff --git a/langtools/test/tools/javac/doctree/dcapi/overview4.html b/test/langtools/tools/javac/doctree/dcapi/overview4.html similarity index 100% rename from langtools/test/tools/javac/doctree/dcapi/overview4.html rename to test/langtools/tools/javac/doctree/dcapi/overview4.html diff --git a/langtools/test/tools/javac/doctree/dcapi/overview5.html b/test/langtools/tools/javac/doctree/dcapi/overview5.html similarity index 100% rename from langtools/test/tools/javac/doctree/dcapi/overview5.html rename to test/langtools/tools/javac/doctree/dcapi/overview5.html diff --git a/langtools/test/tools/javac/doctree/dcapi/overview6.html b/test/langtools/tools/javac/doctree/dcapi/overview6.html similarity index 100% rename from langtools/test/tools/javac/doctree/dcapi/overview6.html rename to test/langtools/tools/javac/doctree/dcapi/overview6.html diff --git a/langtools/test/tools/javac/doctree/dcapi/package.html b/test/langtools/tools/javac/doctree/dcapi/package.html similarity index 100% rename from langtools/test/tools/javac/doctree/dcapi/package.html rename to test/langtools/tools/javac/doctree/dcapi/package.html diff --git a/langtools/test/tools/javac/doctree/dcapi/pkg/Anchor.java b/test/langtools/tools/javac/doctree/dcapi/pkg/Anchor.java similarity index 100% rename from langtools/test/tools/javac/doctree/dcapi/pkg/Anchor.java rename to test/langtools/tools/javac/doctree/dcapi/pkg/Anchor.java diff --git a/langtools/test/tools/javac/doctree/dcapi/pkg/package.html b/test/langtools/tools/javac/doctree/dcapi/pkg/package.html similarity index 100% rename from langtools/test/tools/javac/doctree/dcapi/pkg/package.html rename to test/langtools/tools/javac/doctree/dcapi/pkg/package.html diff --git a/langtools/test/tools/javac/doctree/positions/TestPosition.java b/test/langtools/tools/javac/doctree/positions/TestPosition.java similarity index 100% rename from langtools/test/tools/javac/doctree/positions/TestPosition.java rename to test/langtools/tools/javac/doctree/positions/TestPosition.java diff --git a/langtools/test/tools/javac/doctree/positions/TestPosition.out b/test/langtools/tools/javac/doctree/positions/TestPosition.out similarity index 100% rename from langtools/test/tools/javac/doctree/positions/TestPosition.out rename to test/langtools/tools/javac/doctree/positions/TestPosition.out diff --git a/langtools/test/tools/javac/doctree/positions/TestPositionSource.java b/test/langtools/tools/javac/doctree/positions/TestPositionSource.java similarity index 100% rename from langtools/test/tools/javac/doctree/positions/TestPositionSource.java rename to test/langtools/tools/javac/doctree/positions/TestPositionSource.java diff --git a/langtools/test/tools/javac/enum/6350057/T6350057.java b/test/langtools/tools/javac/enum/6350057/T6350057.java similarity index 100% rename from langtools/test/tools/javac/enum/6350057/T6350057.java rename to test/langtools/tools/javac/enum/6350057/T6350057.java diff --git a/langtools/test/tools/javac/enum/6350057/TestEnum.java b/test/langtools/tools/javac/enum/6350057/TestEnum.java similarity index 100% rename from langtools/test/tools/javac/enum/6350057/TestEnum.java rename to test/langtools/tools/javac/enum/6350057/TestEnum.java diff --git a/langtools/test/tools/javac/enum/6424358/T6424358.java b/test/langtools/tools/javac/enum/6424358/T6424358.java similarity index 100% rename from langtools/test/tools/javac/enum/6424358/T6424358.java rename to test/langtools/tools/javac/enum/6424358/T6424358.java diff --git a/langtools/test/tools/javac/enum/7160084/T7160084a.java b/test/langtools/tools/javac/enum/7160084/T7160084a.java similarity index 100% rename from langtools/test/tools/javac/enum/7160084/T7160084a.java rename to test/langtools/tools/javac/enum/7160084/T7160084a.java diff --git a/langtools/test/tools/javac/enum/7160084/T7160084b.java b/test/langtools/tools/javac/enum/7160084/T7160084b.java similarity index 100% rename from langtools/test/tools/javac/enum/7160084/T7160084b.java rename to test/langtools/tools/javac/enum/7160084/T7160084b.java diff --git a/langtools/test/tools/javac/enum/AbstractEmptyEnum.java b/test/langtools/tools/javac/enum/AbstractEmptyEnum.java similarity index 100% rename from langtools/test/tools/javac/enum/AbstractEmptyEnum.java rename to test/langtools/tools/javac/enum/AbstractEmptyEnum.java diff --git a/langtools/test/tools/javac/enum/AbstractEmptyEnum.out b/test/langtools/tools/javac/enum/AbstractEmptyEnum.out similarity index 100% rename from langtools/test/tools/javac/enum/AbstractEmptyEnum.out rename to test/langtools/tools/javac/enum/AbstractEmptyEnum.out diff --git a/langtools/test/tools/javac/enum/AbstractEnum1.java b/test/langtools/tools/javac/enum/AbstractEnum1.java similarity index 100% rename from langtools/test/tools/javac/enum/AbstractEnum1.java rename to test/langtools/tools/javac/enum/AbstractEnum1.java diff --git a/langtools/test/tools/javac/enum/DA1.java b/test/langtools/tools/javac/enum/DA1.java similarity index 100% rename from langtools/test/tools/javac/enum/DA1.java rename to test/langtools/tools/javac/enum/DA1.java diff --git a/langtools/test/tools/javac/enum/DA1.out b/test/langtools/tools/javac/enum/DA1.out similarity index 100% rename from langtools/test/tools/javac/enum/DA1.out rename to test/langtools/tools/javac/enum/DA1.out diff --git a/langtools/test/tools/javac/enum/DA2.java b/test/langtools/tools/javac/enum/DA2.java similarity index 100% rename from langtools/test/tools/javac/enum/DA2.java rename to test/langtools/tools/javac/enum/DA2.java diff --git a/langtools/test/tools/javac/enum/DA2.out b/test/langtools/tools/javac/enum/DA2.out similarity index 100% rename from langtools/test/tools/javac/enum/DA2.out rename to test/langtools/tools/javac/enum/DA2.out diff --git a/langtools/test/tools/javac/enum/DA3.java b/test/langtools/tools/javac/enum/DA3.java similarity index 100% rename from langtools/test/tools/javac/enum/DA3.java rename to test/langtools/tools/javac/enum/DA3.java diff --git a/langtools/test/tools/javac/enum/DA3.out b/test/langtools/tools/javac/enum/DA3.out similarity index 100% rename from langtools/test/tools/javac/enum/DA3.out rename to test/langtools/tools/javac/enum/DA3.out diff --git a/langtools/test/tools/javac/enum/Def.java b/test/langtools/tools/javac/enum/Def.java similarity index 100% rename from langtools/test/tools/javac/enum/Def.java rename to test/langtools/tools/javac/enum/Def.java diff --git a/langtools/test/tools/javac/enum/Enum1.java b/test/langtools/tools/javac/enum/Enum1.java similarity index 100% rename from langtools/test/tools/javac/enum/Enum1.java rename to test/langtools/tools/javac/enum/Enum1.java diff --git a/langtools/test/tools/javac/enum/Enum2.java b/test/langtools/tools/javac/enum/Enum2.java similarity index 100% rename from langtools/test/tools/javac/enum/Enum2.java rename to test/langtools/tools/javac/enum/Enum2.java diff --git a/langtools/test/tools/javac/enum/Enum2.out b/test/langtools/tools/javac/enum/Enum2.out similarity index 100% rename from langtools/test/tools/javac/enum/Enum2.out rename to test/langtools/tools/javac/enum/Enum2.out diff --git a/langtools/test/tools/javac/enum/Enum3.java b/test/langtools/tools/javac/enum/Enum3.java similarity index 100% rename from langtools/test/tools/javac/enum/Enum3.java rename to test/langtools/tools/javac/enum/Enum3.java diff --git a/langtools/test/tools/javac/enum/EnumAsIdentifier.java b/test/langtools/tools/javac/enum/EnumAsIdentifier.java similarity index 100% rename from langtools/test/tools/javac/enum/EnumAsIdentifier.java rename to test/langtools/tools/javac/enum/EnumAsIdentifier.java diff --git a/langtools/test/tools/javac/enum/EnumAsIdentifier.out b/test/langtools/tools/javac/enum/EnumAsIdentifier.out similarity index 100% rename from langtools/test/tools/javac/enum/EnumAsIdentifier.out rename to test/langtools/tools/javac/enum/EnumAsIdentifier.out diff --git a/langtools/test/tools/javac/enum/EnumImplicitPrivateConstructor.java b/test/langtools/tools/javac/enum/EnumImplicitPrivateConstructor.java similarity index 100% rename from langtools/test/tools/javac/enum/EnumImplicitPrivateConstructor.java rename to test/langtools/tools/javac/enum/EnumImplicitPrivateConstructor.java diff --git a/langtools/test/tools/javac/enum/EnumInit.java b/test/langtools/tools/javac/enum/EnumInit.java similarity index 100% rename from langtools/test/tools/javac/enum/EnumInit.java rename to test/langtools/tools/javac/enum/EnumInit.java diff --git a/langtools/test/tools/javac/enum/EnumMembersOrder.java b/test/langtools/tools/javac/enum/EnumMembersOrder.java similarity index 100% rename from langtools/test/tools/javac/enum/EnumMembersOrder.java rename to test/langtools/tools/javac/enum/EnumMembersOrder.java diff --git a/langtools/test/tools/javac/enum/EnumMembersOrder.out b/test/langtools/tools/javac/enum/EnumMembersOrder.out similarity index 100% rename from langtools/test/tools/javac/enum/EnumMembersOrder.out rename to test/langtools/tools/javac/enum/EnumMembersOrder.out diff --git a/langtools/test/tools/javac/enum/EnumPrivateConstructor.java b/test/langtools/tools/javac/enum/EnumPrivateConstructor.java similarity index 100% rename from langtools/test/tools/javac/enum/EnumPrivateConstructor.java rename to test/langtools/tools/javac/enum/EnumPrivateConstructor.java diff --git a/langtools/test/tools/javac/enum/EnumProtectedConstructor.java b/test/langtools/tools/javac/enum/EnumProtectedConstructor.java similarity index 100% rename from langtools/test/tools/javac/enum/EnumProtectedConstructor.java rename to test/langtools/tools/javac/enum/EnumProtectedConstructor.java diff --git a/langtools/test/tools/javac/enum/EnumProtectedConstructor.out b/test/langtools/tools/javac/enum/EnumProtectedConstructor.out similarity index 100% rename from langtools/test/tools/javac/enum/EnumProtectedConstructor.out rename to test/langtools/tools/javac/enum/EnumProtectedConstructor.out diff --git a/langtools/test/tools/javac/enum/EnumPublicConstructor.java b/test/langtools/tools/javac/enum/EnumPublicConstructor.java similarity index 100% rename from langtools/test/tools/javac/enum/EnumPublicConstructor.java rename to test/langtools/tools/javac/enum/EnumPublicConstructor.java diff --git a/langtools/test/tools/javac/enum/EnumPublicConstructor.out b/test/langtools/tools/javac/enum/EnumPublicConstructor.out similarity index 100% rename from langtools/test/tools/javac/enum/EnumPublicConstructor.out rename to test/langtools/tools/javac/enum/EnumPublicConstructor.out diff --git a/langtools/test/tools/javac/enum/EnumSwitch1.java b/test/langtools/tools/javac/enum/EnumSwitch1.java similarity index 100% rename from langtools/test/tools/javac/enum/EnumSwitch1.java rename to test/langtools/tools/javac/enum/EnumSwitch1.java diff --git a/langtools/test/tools/javac/enum/EnumSwitch2.java b/test/langtools/tools/javac/enum/EnumSwitch2.java similarity index 100% rename from langtools/test/tools/javac/enum/EnumSwitch2.java rename to test/langtools/tools/javac/enum/EnumSwitch2.java diff --git a/langtools/test/tools/javac/enum/EnumSwitch2.out b/test/langtools/tools/javac/enum/EnumSwitch2.out similarity index 100% rename from langtools/test/tools/javac/enum/EnumSwitch2.out rename to test/langtools/tools/javac/enum/EnumSwitch2.out diff --git a/langtools/test/tools/javac/enum/EnumSwitch3.java b/test/langtools/tools/javac/enum/EnumSwitch3.java similarity index 100% rename from langtools/test/tools/javac/enum/EnumSwitch3.java rename to test/langtools/tools/javac/enum/EnumSwitch3.java diff --git a/langtools/test/tools/javac/enum/EnumSwitch4.java b/test/langtools/tools/javac/enum/EnumSwitch4.java similarity index 100% rename from langtools/test/tools/javac/enum/EnumSwitch4.java rename to test/langtools/tools/javac/enum/EnumSwitch4.java diff --git a/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum1.java b/test/langtools/tools/javac/enum/ExplicitlyAbstractEnum1.java similarity index 100% rename from langtools/test/tools/javac/enum/ExplicitlyAbstractEnum1.java rename to test/langtools/tools/javac/enum/ExplicitlyAbstractEnum1.java diff --git a/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum1.out b/test/langtools/tools/javac/enum/ExplicitlyAbstractEnum1.out similarity index 100% rename from langtools/test/tools/javac/enum/ExplicitlyAbstractEnum1.out rename to test/langtools/tools/javac/enum/ExplicitlyAbstractEnum1.out diff --git a/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum2.java b/test/langtools/tools/javac/enum/ExplicitlyAbstractEnum2.java similarity index 100% rename from langtools/test/tools/javac/enum/ExplicitlyAbstractEnum2.java rename to test/langtools/tools/javac/enum/ExplicitlyAbstractEnum2.java diff --git a/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum2.out b/test/langtools/tools/javac/enum/ExplicitlyAbstractEnum2.out similarity index 100% rename from langtools/test/tools/javac/enum/ExplicitlyAbstractEnum2.out rename to test/langtools/tools/javac/enum/ExplicitlyAbstractEnum2.out diff --git a/langtools/test/tools/javac/enum/ExplicitlyFinalEnum1.java b/test/langtools/tools/javac/enum/ExplicitlyFinalEnum1.java similarity index 100% rename from langtools/test/tools/javac/enum/ExplicitlyFinalEnum1.java rename to test/langtools/tools/javac/enum/ExplicitlyFinalEnum1.java diff --git a/langtools/test/tools/javac/enum/ExplicitlyFinalEnum1.out b/test/langtools/tools/javac/enum/ExplicitlyFinalEnum1.out similarity index 100% rename from langtools/test/tools/javac/enum/ExplicitlyFinalEnum1.out rename to test/langtools/tools/javac/enum/ExplicitlyFinalEnum1.out diff --git a/langtools/test/tools/javac/enum/ExplicitlyFinalEnum2.java b/test/langtools/tools/javac/enum/ExplicitlyFinalEnum2.java similarity index 100% rename from langtools/test/tools/javac/enum/ExplicitlyFinalEnum2.java rename to test/langtools/tools/javac/enum/ExplicitlyFinalEnum2.java diff --git a/langtools/test/tools/javac/enum/ExplicitlyFinalEnum2.out b/test/langtools/tools/javac/enum/ExplicitlyFinalEnum2.out similarity index 100% rename from langtools/test/tools/javac/enum/ExplicitlyFinalEnum2.out rename to test/langtools/tools/javac/enum/ExplicitlyFinalEnum2.out diff --git a/langtools/test/tools/javac/enum/FauxEnum1.java b/test/langtools/tools/javac/enum/FauxEnum1.java similarity index 100% rename from langtools/test/tools/javac/enum/FauxEnum1.java rename to test/langtools/tools/javac/enum/FauxEnum1.java diff --git a/langtools/test/tools/javac/enum/FauxEnum1.out b/test/langtools/tools/javac/enum/FauxEnum1.out similarity index 100% rename from langtools/test/tools/javac/enum/FauxEnum1.out rename to test/langtools/tools/javac/enum/FauxEnum1.out diff --git a/langtools/test/tools/javac/enum/FauxEnum3.java b/test/langtools/tools/javac/enum/FauxEnum3.java similarity index 100% rename from langtools/test/tools/javac/enum/FauxEnum3.java rename to test/langtools/tools/javac/enum/FauxEnum3.java diff --git a/langtools/test/tools/javac/enum/FauxEnum3.out b/test/langtools/tools/javac/enum/FauxEnum3.out similarity index 100% rename from langtools/test/tools/javac/enum/FauxEnum3.out rename to test/langtools/tools/javac/enum/FauxEnum3.out diff --git a/langtools/test/tools/javac/enum/FauxSpecialEnum1.java b/test/langtools/tools/javac/enum/FauxSpecialEnum1.java similarity index 100% rename from langtools/test/tools/javac/enum/FauxSpecialEnum1.java rename to test/langtools/tools/javac/enum/FauxSpecialEnum1.java diff --git a/langtools/test/tools/javac/enum/FauxSpecialEnum1.out b/test/langtools/tools/javac/enum/FauxSpecialEnum1.out similarity index 100% rename from langtools/test/tools/javac/enum/FauxSpecialEnum1.out rename to test/langtools/tools/javac/enum/FauxSpecialEnum1.out diff --git a/langtools/test/tools/javac/enum/FauxSpecialEnum2.java b/test/langtools/tools/javac/enum/FauxSpecialEnum2.java similarity index 100% rename from langtools/test/tools/javac/enum/FauxSpecialEnum2.java rename to test/langtools/tools/javac/enum/FauxSpecialEnum2.java diff --git a/langtools/test/tools/javac/enum/FauxSpecialEnum2.out b/test/langtools/tools/javac/enum/FauxSpecialEnum2.out similarity index 100% rename from langtools/test/tools/javac/enum/FauxSpecialEnum2.out rename to test/langtools/tools/javac/enum/FauxSpecialEnum2.out diff --git a/langtools/test/tools/javac/enum/LocalEnum.java b/test/langtools/tools/javac/enum/LocalEnum.java similarity index 100% rename from langtools/test/tools/javac/enum/LocalEnum.java rename to test/langtools/tools/javac/enum/LocalEnum.java diff --git a/langtools/test/tools/javac/enum/LocalEnum.out b/test/langtools/tools/javac/enum/LocalEnum.out similarity index 100% rename from langtools/test/tools/javac/enum/LocalEnum.out rename to test/langtools/tools/javac/enum/LocalEnum.out diff --git a/langtools/test/tools/javac/enum/NestedEnum.java b/test/langtools/tools/javac/enum/NestedEnum.java similarity index 100% rename from langtools/test/tools/javac/enum/NestedEnum.java rename to test/langtools/tools/javac/enum/NestedEnum.java diff --git a/langtools/test/tools/javac/enum/NestedEnum.out b/test/langtools/tools/javac/enum/NestedEnum.out similarity index 100% rename from langtools/test/tools/javac/enum/NestedEnum.out rename to test/langtools/tools/javac/enum/NestedEnum.out diff --git a/langtools/test/tools/javac/enum/NoFinal.java b/test/langtools/tools/javac/enum/NoFinal.java similarity index 100% rename from langtools/test/tools/javac/enum/NoFinal.java rename to test/langtools/tools/javac/enum/NoFinal.java diff --git a/langtools/test/tools/javac/enum/NoFinal.out b/test/langtools/tools/javac/enum/NoFinal.out similarity index 100% rename from langtools/test/tools/javac/enum/NoFinal.out rename to test/langtools/tools/javac/enum/NoFinal.out diff --git a/langtools/test/tools/javac/enum/NoFinal2.java b/test/langtools/tools/javac/enum/NoFinal2.java similarity index 100% rename from langtools/test/tools/javac/enum/NoFinal2.java rename to test/langtools/tools/javac/enum/NoFinal2.java diff --git a/langtools/test/tools/javac/enum/NoFinal2.out b/test/langtools/tools/javac/enum/NoFinal2.out similarity index 100% rename from langtools/test/tools/javac/enum/NoFinal2.out rename to test/langtools/tools/javac/enum/NoFinal2.out diff --git a/langtools/test/tools/javac/enum/NoFinal3.java b/test/langtools/tools/javac/enum/NoFinal3.java similarity index 100% rename from langtools/test/tools/javac/enum/NoFinal3.java rename to test/langtools/tools/javac/enum/NoFinal3.java diff --git a/langtools/test/tools/javac/enum/NoFinal3.out b/test/langtools/tools/javac/enum/NoFinal3.out similarity index 100% rename from langtools/test/tools/javac/enum/NoFinal3.out rename to test/langtools/tools/javac/enum/NoFinal3.out diff --git a/langtools/test/tools/javac/enum/NoFinal4.java b/test/langtools/tools/javac/enum/NoFinal4.java similarity index 100% rename from langtools/test/tools/javac/enum/NoFinal4.java rename to test/langtools/tools/javac/enum/NoFinal4.java diff --git a/langtools/test/tools/javac/enum/NoFinal4.out b/test/langtools/tools/javac/enum/NoFinal4.out similarity index 100% rename from langtools/test/tools/javac/enum/NoFinal4.out rename to test/langtools/tools/javac/enum/NoFinal4.out diff --git a/langtools/test/tools/javac/enum/NoFinal5.java b/test/langtools/tools/javac/enum/NoFinal5.java similarity index 100% rename from langtools/test/tools/javac/enum/NoFinal5.java rename to test/langtools/tools/javac/enum/NoFinal5.java diff --git a/langtools/test/tools/javac/enum/NoFinal5.out b/test/langtools/tools/javac/enum/NoFinal5.out similarity index 100% rename from langtools/test/tools/javac/enum/NoFinal5.out rename to test/langtools/tools/javac/enum/NoFinal5.out diff --git a/langtools/test/tools/javac/enum/OkFinal.java b/test/langtools/tools/javac/enum/OkFinal.java similarity index 100% rename from langtools/test/tools/javac/enum/OkFinal.java rename to test/langtools/tools/javac/enum/OkFinal.java diff --git a/langtools/test/tools/javac/enum/SynthValues.java b/test/langtools/tools/javac/enum/SynthValues.java similarity index 100% rename from langtools/test/tools/javac/enum/SynthValues.java rename to test/langtools/tools/javac/enum/SynthValues.java diff --git a/langtools/test/tools/javac/enum/T5075242.java b/test/langtools/tools/javac/enum/T5075242.java similarity index 100% rename from langtools/test/tools/javac/enum/T5075242.java rename to test/langtools/tools/javac/enum/T5075242.java diff --git a/langtools/test/tools/javac/enum/T5081785.java b/test/langtools/tools/javac/enum/T5081785.java similarity index 100% rename from langtools/test/tools/javac/enum/T5081785.java rename to test/langtools/tools/javac/enum/T5081785.java diff --git a/langtools/test/tools/javac/enum/T5081785.out b/test/langtools/tools/javac/enum/T5081785.out similarity index 100% rename from langtools/test/tools/javac/enum/T5081785.out rename to test/langtools/tools/javac/enum/T5081785.out diff --git a/langtools/test/tools/javac/enum/T6509042.java b/test/langtools/tools/javac/enum/T6509042.java similarity index 100% rename from langtools/test/tools/javac/enum/T6509042.java rename to test/langtools/tools/javac/enum/T6509042.java diff --git a/langtools/test/tools/javac/enum/T6675483.java b/test/langtools/tools/javac/enum/T6675483.java similarity index 100% rename from langtools/test/tools/javac/enum/T6675483.java rename to test/langtools/tools/javac/enum/T6675483.java diff --git a/langtools/test/tools/javac/enum/T6724345.java b/test/langtools/tools/javac/enum/T6724345.java similarity index 100% rename from langtools/test/tools/javac/enum/T6724345.java rename to test/langtools/tools/javac/enum/T6724345.java diff --git a/langtools/test/tools/javac/enum/TrailingComma.java b/test/langtools/tools/javac/enum/TrailingComma.java similarity index 100% rename from langtools/test/tools/javac/enum/TrailingComma.java rename to test/langtools/tools/javac/enum/TrailingComma.java diff --git a/langtools/test/tools/javac/enum/UserValue.java b/test/langtools/tools/javac/enum/UserValue.java similarity index 100% rename from langtools/test/tools/javac/enum/UserValue.java rename to test/langtools/tools/javac/enum/UserValue.java diff --git a/langtools/test/tools/javac/enum/ValueOf.java b/test/langtools/tools/javac/enum/ValueOf.java similarity index 100% rename from langtools/test/tools/javac/enum/ValueOf.java rename to test/langtools/tools/javac/enum/ValueOf.java diff --git a/langtools/test/tools/javac/enum/enumSwitch/Color2.java b/test/langtools/tools/javac/enum/enumSwitch/Color2.java similarity index 100% rename from langtools/test/tools/javac/enum/enumSwitch/Color2.java rename to test/langtools/tools/javac/enum/enumSwitch/Color2.java diff --git a/langtools/test/tools/javac/enum/enumSwitch/EnumSwitch.java b/test/langtools/tools/javac/enum/enumSwitch/EnumSwitch.java similarity index 100% rename from langtools/test/tools/javac/enum/enumSwitch/EnumSwitch.java rename to test/langtools/tools/javac/enum/enumSwitch/EnumSwitch.java diff --git a/langtools/test/tools/javac/enum/forwardRef/T6425594.java b/test/langtools/tools/javac/enum/forwardRef/T6425594.java similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/T6425594.java rename to test/langtools/tools/javac/enum/forwardRef/T6425594.java diff --git a/langtools/test/tools/javac/enum/forwardRef/T6425594.out b/test/langtools/tools/javac/enum/forwardRef/T6425594.out similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/T6425594.out rename to test/langtools/tools/javac/enum/forwardRef/T6425594.out diff --git a/langtools/test/tools/javac/enum/forwardRef/TestEnum1.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum1.java similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/TestEnum1.java rename to test/langtools/tools/javac/enum/forwardRef/TestEnum1.java diff --git a/langtools/test/tools/javac/enum/forwardRef/TestEnum1.out b/test/langtools/tools/javac/enum/forwardRef/TestEnum1.out similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/TestEnum1.out rename to test/langtools/tools/javac/enum/forwardRef/TestEnum1.out diff --git a/langtools/test/tools/javac/enum/forwardRef/TestEnum2.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum2.java similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/TestEnum2.java rename to test/langtools/tools/javac/enum/forwardRef/TestEnum2.java diff --git a/langtools/test/tools/javac/enum/forwardRef/TestEnum2.out b/test/langtools/tools/javac/enum/forwardRef/TestEnum2.out similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/TestEnum2.out rename to test/langtools/tools/javac/enum/forwardRef/TestEnum2.out diff --git a/langtools/test/tools/javac/enum/forwardRef/TestEnum3.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum3.java similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/TestEnum3.java rename to test/langtools/tools/javac/enum/forwardRef/TestEnum3.java diff --git a/langtools/test/tools/javac/enum/forwardRef/TestEnum3.out b/test/langtools/tools/javac/enum/forwardRef/TestEnum3.out similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/TestEnum3.out rename to test/langtools/tools/javac/enum/forwardRef/TestEnum3.out diff --git a/langtools/test/tools/javac/enum/forwardRef/TestEnum4.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum4.java similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/TestEnum4.java rename to test/langtools/tools/javac/enum/forwardRef/TestEnum4.java diff --git a/langtools/test/tools/javac/enum/forwardRef/TestEnum4.out b/test/langtools/tools/javac/enum/forwardRef/TestEnum4.out similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/TestEnum4.out rename to test/langtools/tools/javac/enum/forwardRef/TestEnum4.out diff --git a/langtools/test/tools/javac/enum/forwardRef/TestEnum5.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum5.java similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/TestEnum5.java rename to test/langtools/tools/javac/enum/forwardRef/TestEnum5.java diff --git a/langtools/test/tools/javac/enum/forwardRef/TestEnum5.out b/test/langtools/tools/javac/enum/forwardRef/TestEnum5.out similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/TestEnum5.out rename to test/langtools/tools/javac/enum/forwardRef/TestEnum5.out diff --git a/langtools/test/tools/javac/enum/forwardRef/TestEnum6.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum6.java similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/TestEnum6.java rename to test/langtools/tools/javac/enum/forwardRef/TestEnum6.java diff --git a/langtools/test/tools/javac/enum/forwardRef/TestEnum6.out b/test/langtools/tools/javac/enum/forwardRef/TestEnum6.out similarity index 100% rename from langtools/test/tools/javac/enum/forwardRef/TestEnum6.out rename to test/langtools/tools/javac/enum/forwardRef/TestEnum6.out diff --git a/langtools/test/tools/javac/expression/BinopVoidTest.java b/test/langtools/tools/javac/expression/BinopVoidTest.java similarity index 100% rename from langtools/test/tools/javac/expression/BinopVoidTest.java rename to test/langtools/tools/javac/expression/BinopVoidTest.java diff --git a/langtools/test/tools/javac/expression/BinopVoidTest.out b/test/langtools/tools/javac/expression/BinopVoidTest.out similarity index 100% rename from langtools/test/tools/javac/expression/BinopVoidTest.out rename to test/langtools/tools/javac/expression/BinopVoidTest.out diff --git a/langtools/test/tools/javac/expression/DeeplyChainedNonPolyExpressionTest.java b/test/langtools/tools/javac/expression/DeeplyChainedNonPolyExpressionTest.java similarity index 100% rename from langtools/test/tools/javac/expression/DeeplyChainedNonPolyExpressionTest.java rename to test/langtools/tools/javac/expression/DeeplyChainedNonPolyExpressionTest.java diff --git a/langtools/test/tools/javac/expression/IllegalParenthesis.java b/test/langtools/tools/javac/expression/IllegalParenthesis.java similarity index 100% rename from langtools/test/tools/javac/expression/IllegalParenthesis.java rename to test/langtools/tools/javac/expression/IllegalParenthesis.java diff --git a/langtools/test/tools/javac/expression/IllegalParenthesis.out b/test/langtools/tools/javac/expression/IllegalParenthesis.out similarity index 100% rename from langtools/test/tools/javac/expression/IllegalParenthesis.out rename to test/langtools/tools/javac/expression/IllegalParenthesis.out diff --git a/langtools/test/tools/javac/expression/NullAppend.java b/test/langtools/tools/javac/expression/NullAppend.java similarity index 100% rename from langtools/test/tools/javac/expression/NullAppend.java rename to test/langtools/tools/javac/expression/NullAppend.java diff --git a/langtools/test/tools/javac/expression/NullAppend.out b/test/langtools/tools/javac/expression/NullAppend.out similarity index 100% rename from langtools/test/tools/javac/expression/NullAppend.out rename to test/langtools/tools/javac/expression/NullAppend.out diff --git a/langtools/test/tools/javac/expression/NullAppend2.java b/test/langtools/tools/javac/expression/NullAppend2.java similarity index 100% rename from langtools/test/tools/javac/expression/NullAppend2.java rename to test/langtools/tools/javac/expression/NullAppend2.java diff --git a/langtools/test/tools/javac/expression/NullAppend2.out b/test/langtools/tools/javac/expression/NullAppend2.out similarity index 100% rename from langtools/test/tools/javac/expression/NullAppend2.out rename to test/langtools/tools/javac/expression/NullAppend2.out diff --git a/langtools/test/tools/javac/expression/_super/NonDirectSuper/Base.java b/test/langtools/tools/javac/expression/_super/NonDirectSuper/Base.java similarity index 100% rename from langtools/test/tools/javac/expression/_super/NonDirectSuper/Base.java rename to test/langtools/tools/javac/expression/_super/NonDirectSuper/Base.java diff --git a/langtools/test/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java b/test/langtools/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java similarity index 100% rename from langtools/test/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java rename to test/langtools/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java diff --git a/langtools/test/tools/javac/failover/CheckAttributedTree.java b/test/langtools/tools/javac/failover/CheckAttributedTree.java similarity index 100% rename from langtools/test/tools/javac/failover/CheckAttributedTree.java rename to test/langtools/tools/javac/failover/CheckAttributedTree.java diff --git a/langtools/test/tools/javac/failover/FailOver01.java b/test/langtools/tools/javac/failover/FailOver01.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver01.java rename to test/langtools/tools/javac/failover/FailOver01.java diff --git a/langtools/test/tools/javac/failover/FailOver01.out b/test/langtools/tools/javac/failover/FailOver01.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver01.out rename to test/langtools/tools/javac/failover/FailOver01.out diff --git a/langtools/test/tools/javac/failover/FailOver02.java b/test/langtools/tools/javac/failover/FailOver02.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver02.java rename to test/langtools/tools/javac/failover/FailOver02.java diff --git a/langtools/test/tools/javac/failover/FailOver02.out b/test/langtools/tools/javac/failover/FailOver02.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver02.out rename to test/langtools/tools/javac/failover/FailOver02.out diff --git a/langtools/test/tools/javac/failover/FailOver03.java b/test/langtools/tools/javac/failover/FailOver03.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver03.java rename to test/langtools/tools/javac/failover/FailOver03.java diff --git a/langtools/test/tools/javac/failover/FailOver03.out b/test/langtools/tools/javac/failover/FailOver03.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver03.out rename to test/langtools/tools/javac/failover/FailOver03.out diff --git a/langtools/test/tools/javac/failover/FailOver04.java b/test/langtools/tools/javac/failover/FailOver04.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver04.java rename to test/langtools/tools/javac/failover/FailOver04.java diff --git a/langtools/test/tools/javac/failover/FailOver04.out b/test/langtools/tools/javac/failover/FailOver04.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver04.out rename to test/langtools/tools/javac/failover/FailOver04.out diff --git a/langtools/test/tools/javac/failover/FailOver05.java b/test/langtools/tools/javac/failover/FailOver05.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver05.java rename to test/langtools/tools/javac/failover/FailOver05.java diff --git a/langtools/test/tools/javac/failover/FailOver05.out b/test/langtools/tools/javac/failover/FailOver05.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver05.out rename to test/langtools/tools/javac/failover/FailOver05.out diff --git a/langtools/test/tools/javac/failover/FailOver06.java b/test/langtools/tools/javac/failover/FailOver06.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver06.java rename to test/langtools/tools/javac/failover/FailOver06.java diff --git a/langtools/test/tools/javac/failover/FailOver06.out b/test/langtools/tools/javac/failover/FailOver06.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver06.out rename to test/langtools/tools/javac/failover/FailOver06.out diff --git a/langtools/test/tools/javac/failover/FailOver07.java b/test/langtools/tools/javac/failover/FailOver07.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver07.java rename to test/langtools/tools/javac/failover/FailOver07.java diff --git a/langtools/test/tools/javac/failover/FailOver07.out b/test/langtools/tools/javac/failover/FailOver07.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver07.out rename to test/langtools/tools/javac/failover/FailOver07.out diff --git a/langtools/test/tools/javac/failover/FailOver08.java b/test/langtools/tools/javac/failover/FailOver08.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver08.java rename to test/langtools/tools/javac/failover/FailOver08.java diff --git a/langtools/test/tools/javac/failover/FailOver08.out b/test/langtools/tools/javac/failover/FailOver08.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver08.out rename to test/langtools/tools/javac/failover/FailOver08.out diff --git a/langtools/test/tools/javac/failover/FailOver09.java b/test/langtools/tools/javac/failover/FailOver09.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver09.java rename to test/langtools/tools/javac/failover/FailOver09.java diff --git a/langtools/test/tools/javac/failover/FailOver09.out b/test/langtools/tools/javac/failover/FailOver09.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver09.out rename to test/langtools/tools/javac/failover/FailOver09.out diff --git a/langtools/test/tools/javac/failover/FailOver10.java b/test/langtools/tools/javac/failover/FailOver10.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver10.java rename to test/langtools/tools/javac/failover/FailOver10.java diff --git a/langtools/test/tools/javac/failover/FailOver10.out b/test/langtools/tools/javac/failover/FailOver10.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver10.out rename to test/langtools/tools/javac/failover/FailOver10.out diff --git a/langtools/test/tools/javac/failover/FailOver11.java b/test/langtools/tools/javac/failover/FailOver11.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver11.java rename to test/langtools/tools/javac/failover/FailOver11.java diff --git a/langtools/test/tools/javac/failover/FailOver11.out b/test/langtools/tools/javac/failover/FailOver11.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver11.out rename to test/langtools/tools/javac/failover/FailOver11.out diff --git a/langtools/test/tools/javac/failover/FailOver12.java b/test/langtools/tools/javac/failover/FailOver12.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver12.java rename to test/langtools/tools/javac/failover/FailOver12.java diff --git a/langtools/test/tools/javac/failover/FailOver12.out b/test/langtools/tools/javac/failover/FailOver12.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver12.out rename to test/langtools/tools/javac/failover/FailOver12.out diff --git a/langtools/test/tools/javac/failover/FailOver13.java b/test/langtools/tools/javac/failover/FailOver13.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver13.java rename to test/langtools/tools/javac/failover/FailOver13.java diff --git a/langtools/test/tools/javac/failover/FailOver13.out b/test/langtools/tools/javac/failover/FailOver13.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver13.out rename to test/langtools/tools/javac/failover/FailOver13.out diff --git a/langtools/test/tools/javac/failover/FailOver14.java b/test/langtools/tools/javac/failover/FailOver14.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver14.java rename to test/langtools/tools/javac/failover/FailOver14.java diff --git a/langtools/test/tools/javac/failover/FailOver14.out b/test/langtools/tools/javac/failover/FailOver14.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver14.out rename to test/langtools/tools/javac/failover/FailOver14.out diff --git a/langtools/test/tools/javac/failover/FailOver15.java b/test/langtools/tools/javac/failover/FailOver15.java similarity index 100% rename from langtools/test/tools/javac/failover/FailOver15.java rename to test/langtools/tools/javac/failover/FailOver15.java diff --git a/langtools/test/tools/javac/failover/FailOver15.out b/test/langtools/tools/javac/failover/FailOver15.out similarity index 100% rename from langtools/test/tools/javac/failover/FailOver15.out rename to test/langtools/tools/javac/failover/FailOver15.out diff --git a/langtools/test/tools/javac/falseCycle/FalseCycle.java b/test/langtools/tools/javac/falseCycle/FalseCycle.java similarity index 100% rename from langtools/test/tools/javac/falseCycle/FalseCycle.java rename to test/langtools/tools/javac/falseCycle/FalseCycle.java diff --git a/langtools/test/tools/javac/falseCycle/FalseCycleBase.java b/test/langtools/tools/javac/falseCycle/FalseCycleBase.java similarity index 100% rename from langtools/test/tools/javac/falseCycle/FalseCycleBase.java rename to test/langtools/tools/javac/falseCycle/FalseCycleBase.java diff --git a/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java b/test/langtools/tools/javac/fatalErrors/NoJavaLangTest.java similarity index 100% rename from langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java rename to test/langtools/tools/javac/fatalErrors/NoJavaLangTest.java diff --git a/langtools/test/tools/javac/file/ExplodedImage.java b/test/langtools/tools/javac/file/ExplodedImage.java similarity index 100% rename from langtools/test/tools/javac/file/ExplodedImage.java rename to test/langtools/tools/javac/file/ExplodedImage.java diff --git a/langtools/test/tools/javac/file/LimitedImage.java b/test/langtools/tools/javac/file/LimitedImage.java similarity index 100% rename from langtools/test/tools/javac/file/LimitedImage.java rename to test/langtools/tools/javac/file/LimitedImage.java diff --git a/langtools/test/tools/javac/file/ModuleAndPackageLocations.java b/test/langtools/tools/javac/file/ModuleAndPackageLocations.java similarity index 100% rename from langtools/test/tools/javac/file/ModuleAndPackageLocations.java rename to test/langtools/tools/javac/file/ModuleAndPackageLocations.java diff --git a/langtools/test/tools/javac/file/MultiReleaseJar/MultiReleaseJarAwareSJFM.java b/test/langtools/tools/javac/file/MultiReleaseJar/MultiReleaseJarAwareSJFM.java similarity index 100% rename from langtools/test/tools/javac/file/MultiReleaseJar/MultiReleaseJarAwareSJFM.java rename to test/langtools/tools/javac/file/MultiReleaseJar/MultiReleaseJarAwareSJFM.java diff --git a/langtools/test/tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java b/test/langtools/tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java similarity index 100% rename from langtools/test/tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java rename to test/langtools/tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java diff --git a/langtools/test/tools/javac/file/MultiReleaseJar/MutliReleaseModuleInfoTest.java b/test/langtools/tools/javac/file/MultiReleaseJar/MutliReleaseModuleInfoTest.java similarity index 100% rename from langtools/test/tools/javac/file/MultiReleaseJar/MutliReleaseModuleInfoTest.java rename to test/langtools/tools/javac/file/MultiReleaseJar/MutliReleaseModuleInfoTest.java diff --git a/langtools/test/tools/javac/file/SetLocationForModule.java b/test/langtools/tools/javac/file/SetLocationForModule.java similarity index 100% rename from langtools/test/tools/javac/file/SetLocationForModule.java rename to test/langtools/tools/javac/file/SetLocationForModule.java diff --git a/langtools/test/tools/javac/file/SymLinkTest.java b/test/langtools/tools/javac/file/SymLinkTest.java similarity index 100% rename from langtools/test/tools/javac/file/SymLinkTest.java rename to test/langtools/tools/javac/file/SymLinkTest.java diff --git a/langtools/test/tools/javac/file/T7018098.java b/test/langtools/tools/javac/file/T7018098.java similarity index 100% rename from langtools/test/tools/javac/file/T7018098.java rename to test/langtools/tools/javac/file/T7018098.java diff --git a/langtools/test/tools/javac/file/T7068437.java b/test/langtools/tools/javac/file/T7068437.java similarity index 100% rename from langtools/test/tools/javac/file/T7068437.java rename to test/langtools/tools/javac/file/T7068437.java diff --git a/langtools/test/tools/javac/file/T7068451.java b/test/langtools/tools/javac/file/T7068451.java similarity index 100% rename from langtools/test/tools/javac/file/T7068451.java rename to test/langtools/tools/javac/file/T7068451.java diff --git a/langtools/test/tools/javac/file/T8132857.java b/test/langtools/tools/javac/file/T8132857.java similarity index 100% rename from langtools/test/tools/javac/file/T8132857.java rename to test/langtools/tools/javac/file/T8132857.java diff --git a/langtools/test/tools/javac/file/T8143268.java b/test/langtools/tools/javac/file/T8143268.java similarity index 100% rename from langtools/test/tools/javac/file/T8143268.java rename to test/langtools/tools/javac/file/T8143268.java diff --git a/langtools/test/tools/javac/file/T8150475.java b/test/langtools/tools/javac/file/T8150475.java similarity index 100% rename from langtools/test/tools/javac/file/T8150475.java rename to test/langtools/tools/javac/file/T8150475.java diff --git a/langtools/test/tools/javac/file/zip/8003512/LoadClassFromJava6CreatedJarTest.java b/test/langtools/tools/javac/file/zip/8003512/LoadClassFromJava6CreatedJarTest.java similarity index 100% rename from langtools/test/tools/javac/file/zip/8003512/LoadClassFromJava6CreatedJarTest.java rename to test/langtools/tools/javac/file/zip/8003512/LoadClassFromJava6CreatedJarTest.java diff --git a/langtools/test/tools/javac/file/zip/T6836682.java b/test/langtools/tools/javac/file/zip/T6836682.java similarity index 100% rename from langtools/test/tools/javac/file/zip/T6836682.java rename to test/langtools/tools/javac/file/zip/T6836682.java diff --git a/langtools/test/tools/javac/file/zip/T6865530.java b/test/langtools/tools/javac/file/zip/T6865530.java similarity index 100% rename from langtools/test/tools/javac/file/zip/T6865530.java rename to test/langtools/tools/javac/file/zip/T6865530.java diff --git a/langtools/test/tools/javac/file/zip/T8076104.java b/test/langtools/tools/javac/file/zip/T8076104.java similarity index 100% rename from langtools/test/tools/javac/file/zip/T8076104.java rename to test/langtools/tools/javac/file/zip/T8076104.java diff --git a/langtools/test/tools/javac/file/zip/Utils.java b/test/langtools/tools/javac/file/zip/Utils.java similarity index 100% rename from langtools/test/tools/javac/file/zip/Utils.java rename to test/langtools/tools/javac/file/zip/Utils.java diff --git a/langtools/test/tools/javac/flow/AliveRanges.java b/test/langtools/tools/javac/flow/AliveRanges.java similarity index 100% rename from langtools/test/tools/javac/flow/AliveRanges.java rename to test/langtools/tools/javac/flow/AliveRanges.java diff --git a/langtools/test/tools/javac/flow/LVTHarness.java b/test/langtools/tools/javac/flow/LVTHarness.java similarity index 100% rename from langtools/test/tools/javac/flow/LVTHarness.java rename to test/langtools/tools/javac/flow/LVTHarness.java diff --git a/langtools/test/tools/javac/flow/T8030218/CompileTimeErrorForNonAssignedStaticFieldTest.java b/test/langtools/tools/javac/flow/T8030218/CompileTimeErrorForNonAssignedStaticFieldTest.java similarity index 100% rename from langtools/test/tools/javac/flow/T8030218/CompileTimeErrorForNonAssignedStaticFieldTest.java rename to test/langtools/tools/javac/flow/T8030218/CompileTimeErrorForNonAssignedStaticFieldTest.java diff --git a/langtools/test/tools/javac/flow/T8030218/CompileTimeErrorForNonAssignedStaticFieldTest.out b/test/langtools/tools/javac/flow/T8030218/CompileTimeErrorForNonAssignedStaticFieldTest.out similarity index 100% rename from langtools/test/tools/javac/flow/T8030218/CompileTimeErrorForNonAssignedStaticFieldTest.out rename to test/langtools/tools/javac/flow/T8030218/CompileTimeErrorForNonAssignedStaticFieldTest.out diff --git a/langtools/test/tools/javac/flow/T8042741/A.java b/test/langtools/tools/javac/flow/T8042741/A.java similarity index 100% rename from langtools/test/tools/javac/flow/T8042741/A.java rename to test/langtools/tools/javac/flow/T8042741/A.java diff --git a/langtools/test/tools/javac/flow/T8042741/LambdaArgumentsTest.java b/test/langtools/tools/javac/flow/T8042741/LambdaArgumentsTest.java similarity index 100% rename from langtools/test/tools/javac/flow/T8042741/LambdaArgumentsTest.java rename to test/langtools/tools/javac/flow/T8042741/LambdaArgumentsTest.java diff --git a/langtools/test/tools/javac/flow/T8042741/PositionTest.java b/test/langtools/tools/javac/flow/T8042741/PositionTest.java similarity index 100% rename from langtools/test/tools/javac/flow/T8042741/PositionTest.java rename to test/langtools/tools/javac/flow/T8042741/PositionTest.java diff --git a/langtools/test/tools/javac/flow/T8062747.java b/test/langtools/tools/javac/flow/T8062747.java similarity index 100% rename from langtools/test/tools/javac/flow/T8062747.java rename to test/langtools/tools/javac/flow/T8062747.java diff --git a/langtools/test/tools/javac/flow/tests/TestCaseConditional.java b/test/langtools/tools/javac/flow/tests/TestCaseConditional.java similarity index 100% rename from langtools/test/tools/javac/flow/tests/TestCaseConditional.java rename to test/langtools/tools/javac/flow/tests/TestCaseConditional.java diff --git a/langtools/test/tools/javac/flow/tests/TestCaseDoLoop.java b/test/langtools/tools/javac/flow/tests/TestCaseDoLoop.java similarity index 100% rename from langtools/test/tools/javac/flow/tests/TestCaseDoLoop.java rename to test/langtools/tools/javac/flow/tests/TestCaseDoLoop.java diff --git a/langtools/test/tools/javac/flow/tests/TestCaseFor.java b/test/langtools/tools/javac/flow/tests/TestCaseFor.java similarity index 100% rename from langtools/test/tools/javac/flow/tests/TestCaseFor.java rename to test/langtools/tools/javac/flow/tests/TestCaseFor.java diff --git a/langtools/test/tools/javac/flow/tests/TestCaseForEach.java b/test/langtools/tools/javac/flow/tests/TestCaseForEach.java similarity index 100% rename from langtools/test/tools/javac/flow/tests/TestCaseForEach.java rename to test/langtools/tools/javac/flow/tests/TestCaseForEach.java diff --git a/langtools/test/tools/javac/flow/tests/TestCaseIf.java b/test/langtools/tools/javac/flow/tests/TestCaseIf.java similarity index 100% rename from langtools/test/tools/javac/flow/tests/TestCaseIf.java rename to test/langtools/tools/javac/flow/tests/TestCaseIf.java diff --git a/langtools/test/tools/javac/flow/tests/TestCaseIfElse.java b/test/langtools/tools/javac/flow/tests/TestCaseIfElse.java similarity index 100% rename from langtools/test/tools/javac/flow/tests/TestCaseIfElse.java rename to test/langtools/tools/javac/flow/tests/TestCaseIfElse.java diff --git a/langtools/test/tools/javac/flow/tests/TestCaseLocalInInnerBlock.java b/test/langtools/tools/javac/flow/tests/TestCaseLocalInInnerBlock.java similarity index 100% rename from langtools/test/tools/javac/flow/tests/TestCaseLocalInInnerBlock.java rename to test/langtools/tools/javac/flow/tests/TestCaseLocalInInnerBlock.java diff --git a/langtools/test/tools/javac/flow/tests/TestCaseSwitch.java b/test/langtools/tools/javac/flow/tests/TestCaseSwitch.java similarity index 100% rename from langtools/test/tools/javac/flow/tests/TestCaseSwitch.java rename to test/langtools/tools/javac/flow/tests/TestCaseSwitch.java diff --git a/langtools/test/tools/javac/flow/tests/TestCaseTry.java b/test/langtools/tools/javac/flow/tests/TestCaseTry.java similarity index 100% rename from langtools/test/tools/javac/flow/tests/TestCaseTry.java rename to test/langtools/tools/javac/flow/tests/TestCaseTry.java diff --git a/langtools/test/tools/javac/flow/tests/TestCaseWhile.java b/test/langtools/tools/javac/flow/tests/TestCaseWhile.java similarity index 100% rename from langtools/test/tools/javac/flow/tests/TestCaseWhile.java rename to test/langtools/tools/javac/flow/tests/TestCaseWhile.java diff --git a/langtools/test/tools/javac/foreach/7139681/T7139681neg.java b/test/langtools/tools/javac/foreach/7139681/T7139681neg.java similarity index 100% rename from langtools/test/tools/javac/foreach/7139681/T7139681neg.java rename to test/langtools/tools/javac/foreach/7139681/T7139681neg.java diff --git a/langtools/test/tools/javac/foreach/7139681/T7139681neg.out b/test/langtools/tools/javac/foreach/7139681/T7139681neg.out similarity index 100% rename from langtools/test/tools/javac/foreach/7139681/T7139681neg.out rename to test/langtools/tools/javac/foreach/7139681/T7139681neg.out diff --git a/langtools/test/tools/javac/foreach/7139681/T7139681pos.java b/test/langtools/tools/javac/foreach/7139681/T7139681pos.java similarity index 100% rename from langtools/test/tools/javac/foreach/7139681/T7139681pos.java rename to test/langtools/tools/javac/foreach/7139681/T7139681pos.java diff --git a/langtools/test/tools/javac/foreach/Foreach.java b/test/langtools/tools/javac/foreach/Foreach.java similarity index 100% rename from langtools/test/tools/javac/foreach/Foreach.java rename to test/langtools/tools/javac/foreach/Foreach.java diff --git a/langtools/test/tools/javac/foreach/GenericIterator.java b/test/langtools/tools/javac/foreach/GenericIterator.java similarity index 100% rename from langtools/test/tools/javac/foreach/GenericIterator.java rename to test/langtools/tools/javac/foreach/GenericIterator.java diff --git a/langtools/test/tools/javac/foreach/IntersectIterator.java b/test/langtools/tools/javac/foreach/IntersectIterator.java similarity index 100% rename from langtools/test/tools/javac/foreach/IntersectIterator.java rename to test/langtools/tools/javac/foreach/IntersectIterator.java diff --git a/langtools/test/tools/javac/foreach/ListOfListTest.java b/test/langtools/tools/javac/foreach/ListOfListTest.java similarity index 100% rename from langtools/test/tools/javac/foreach/ListOfListTest.java rename to test/langtools/tools/javac/foreach/ListOfListTest.java diff --git a/langtools/test/tools/javac/foreach/SpecIterable.java b/test/langtools/tools/javac/foreach/SpecIterable.java similarity index 100% rename from langtools/test/tools/javac/foreach/SpecIterable.java rename to test/langtools/tools/javac/foreach/SpecIterable.java diff --git a/langtools/test/tools/javac/foreach/StaticBlock.java b/test/langtools/tools/javac/foreach/StaticBlock.java similarity index 100% rename from langtools/test/tools/javac/foreach/StaticBlock.java rename to test/langtools/tools/javac/foreach/StaticBlock.java diff --git a/langtools/test/tools/javac/foreach/SuperfluousAbstract.java b/test/langtools/tools/javac/foreach/SuperfluousAbstract.java similarity index 100% rename from langtools/test/tools/javac/foreach/SuperfluousAbstract.java rename to test/langtools/tools/javac/foreach/SuperfluousAbstract.java diff --git a/langtools/test/tools/javac/foreach/T6500701.java b/test/langtools/tools/javac/foreach/T6500701.java similarity index 100% rename from langtools/test/tools/javac/foreach/T6500701.java rename to test/langtools/tools/javac/foreach/T6500701.java diff --git a/langtools/test/tools/javac/generics/4453032/InterfaceCast1.java b/test/langtools/tools/javac/generics/4453032/InterfaceCast1.java similarity index 100% rename from langtools/test/tools/javac/generics/4453032/InterfaceCast1.java rename to test/langtools/tools/javac/generics/4453032/InterfaceCast1.java diff --git a/langtools/test/tools/javac/generics/5009937/T5009937.java b/test/langtools/tools/javac/generics/5009937/T5009937.java similarity index 100% rename from langtools/test/tools/javac/generics/5009937/T5009937.java rename to test/langtools/tools/javac/generics/5009937/T5009937.java diff --git a/langtools/test/tools/javac/generics/5009937/T5009937.out b/test/langtools/tools/javac/generics/5009937/T5009937.out similarity index 100% rename from langtools/test/tools/javac/generics/5009937/T5009937.out rename to test/langtools/tools/javac/generics/5009937/T5009937.out diff --git a/langtools/test/tools/javac/generics/5066774/T5066774.java b/test/langtools/tools/javac/generics/5066774/T5066774.java similarity index 100% rename from langtools/test/tools/javac/generics/5066774/T5066774.java rename to test/langtools/tools/javac/generics/5066774/T5066774.java diff --git a/langtools/test/tools/javac/generics/5086027/T5086027.java b/test/langtools/tools/javac/generics/5086027/T5086027.java similarity index 100% rename from langtools/test/tools/javac/generics/5086027/T5086027.java rename to test/langtools/tools/javac/generics/5086027/T5086027.java diff --git a/langtools/test/tools/javac/generics/5086027/T5086027.out b/test/langtools/tools/javac/generics/5086027/T5086027.out similarity index 100% rename from langtools/test/tools/javac/generics/5086027/T5086027.out rename to test/langtools/tools/javac/generics/5086027/T5086027.out diff --git a/langtools/test/tools/javac/generics/5086027/T5086027pos.java b/test/langtools/tools/javac/generics/5086027/T5086027pos.java similarity index 100% rename from langtools/test/tools/javac/generics/5086027/T5086027pos.java rename to test/langtools/tools/javac/generics/5086027/T5086027pos.java diff --git a/langtools/test/tools/javac/generics/6182950/T6182950a.java b/test/langtools/tools/javac/generics/6182950/T6182950a.java similarity index 100% rename from langtools/test/tools/javac/generics/6182950/T6182950a.java rename to test/langtools/tools/javac/generics/6182950/T6182950a.java diff --git a/langtools/test/tools/javac/generics/6182950/T6182950a.out b/test/langtools/tools/javac/generics/6182950/T6182950a.out similarity index 100% rename from langtools/test/tools/javac/generics/6182950/T6182950a.out rename to test/langtools/tools/javac/generics/6182950/T6182950a.out diff --git a/langtools/test/tools/javac/generics/6182950/T6182950b.java b/test/langtools/tools/javac/generics/6182950/T6182950b.java similarity index 100% rename from langtools/test/tools/javac/generics/6182950/T6182950b.java rename to test/langtools/tools/javac/generics/6182950/T6182950b.java diff --git a/langtools/test/tools/javac/generics/6182950/T6182950b.out b/test/langtools/tools/javac/generics/6182950/T6182950b.out similarity index 100% rename from langtools/test/tools/javac/generics/6182950/T6182950b.out rename to test/langtools/tools/javac/generics/6182950/T6182950b.out diff --git a/langtools/test/tools/javac/generics/6182950/T6182950c.java b/test/langtools/tools/javac/generics/6182950/T6182950c.java similarity index 100% rename from langtools/test/tools/javac/generics/6182950/T6182950c.java rename to test/langtools/tools/javac/generics/6182950/T6182950c.java diff --git a/langtools/test/tools/javac/generics/6192945/Method.java b/test/langtools/tools/javac/generics/6192945/Method.java similarity index 100% rename from langtools/test/tools/javac/generics/6192945/Method.java rename to test/langtools/tools/javac/generics/6192945/Method.java diff --git a/langtools/test/tools/javac/generics/6192945/MethodNeg.java b/test/langtools/tools/javac/generics/6192945/MethodNeg.java similarity index 100% rename from langtools/test/tools/javac/generics/6192945/MethodNeg.java rename to test/langtools/tools/javac/generics/6192945/MethodNeg.java diff --git a/langtools/test/tools/javac/generics/6192945/MethodNeg.out b/test/langtools/tools/javac/generics/6192945/MethodNeg.out similarity index 100% rename from langtools/test/tools/javac/generics/6192945/MethodNeg.out rename to test/langtools/tools/javac/generics/6192945/MethodNeg.out diff --git a/langtools/test/tools/javac/generics/6192945/Neg.java b/test/langtools/tools/javac/generics/6192945/Neg.java similarity index 100% rename from langtools/test/tools/javac/generics/6192945/Neg.java rename to test/langtools/tools/javac/generics/6192945/Neg.java diff --git a/langtools/test/tools/javac/generics/6192945/Neg.out b/test/langtools/tools/javac/generics/6192945/Neg.out similarity index 100% rename from langtools/test/tools/javac/generics/6192945/Neg.out rename to test/langtools/tools/javac/generics/6192945/Neg.out diff --git a/langtools/test/tools/javac/generics/6192945/Neg2.java b/test/langtools/tools/javac/generics/6192945/Neg2.java similarity index 100% rename from langtools/test/tools/javac/generics/6192945/Neg2.java rename to test/langtools/tools/javac/generics/6192945/Neg2.java diff --git a/langtools/test/tools/javac/generics/6192945/Neg2.out b/test/langtools/tools/javac/generics/6192945/Neg2.out similarity index 100% rename from langtools/test/tools/javac/generics/6192945/Neg2.out rename to test/langtools/tools/javac/generics/6192945/Neg2.out diff --git a/langtools/test/tools/javac/generics/6192945/Neg3.java b/test/langtools/tools/javac/generics/6192945/Neg3.java similarity index 100% rename from langtools/test/tools/javac/generics/6192945/Neg3.java rename to test/langtools/tools/javac/generics/6192945/Neg3.java diff --git a/langtools/test/tools/javac/generics/6192945/Neg3.out b/test/langtools/tools/javac/generics/6192945/Neg3.out similarity index 100% rename from langtools/test/tools/javac/generics/6192945/Neg3.out rename to test/langtools/tools/javac/generics/6192945/Neg3.out diff --git a/langtools/test/tools/javac/generics/6192945/T6192945.java b/test/langtools/tools/javac/generics/6192945/T6192945.java similarity index 100% rename from langtools/test/tools/javac/generics/6192945/T6192945.java rename to test/langtools/tools/javac/generics/6192945/T6192945.java diff --git a/langtools/test/tools/javac/generics/6207386/T6207386.java b/test/langtools/tools/javac/generics/6207386/T6207386.java similarity index 100% rename from langtools/test/tools/javac/generics/6207386/T6207386.java rename to test/langtools/tools/javac/generics/6207386/T6207386.java diff --git a/langtools/test/tools/javac/generics/6207386/T6207386.out b/test/langtools/tools/javac/generics/6207386/T6207386.out similarity index 100% rename from langtools/test/tools/javac/generics/6207386/T6207386.out rename to test/langtools/tools/javac/generics/6207386/T6207386.out diff --git a/langtools/test/tools/javac/generics/6207386/Test.java b/test/langtools/tools/javac/generics/6207386/Test.java similarity index 100% rename from langtools/test/tools/javac/generics/6207386/Test.java rename to test/langtools/tools/javac/generics/6207386/Test.java diff --git a/langtools/test/tools/javac/generics/6213818/T6213818.java b/test/langtools/tools/javac/generics/6213818/T6213818.java similarity index 100% rename from langtools/test/tools/javac/generics/6213818/T6213818.java rename to test/langtools/tools/javac/generics/6213818/T6213818.java diff --git a/langtools/test/tools/javac/generics/6218229/T6218229.java b/test/langtools/tools/javac/generics/6218229/T6218229.java similarity index 100% rename from langtools/test/tools/javac/generics/6218229/T6218229.java rename to test/langtools/tools/javac/generics/6218229/T6218229.java diff --git a/langtools/test/tools/javac/generics/6227936/Orig.java b/test/langtools/tools/javac/generics/6227936/Orig.java similarity index 100% rename from langtools/test/tools/javac/generics/6227936/Orig.java rename to test/langtools/tools/javac/generics/6227936/Orig.java diff --git a/langtools/test/tools/javac/generics/6227936/Orig.out b/test/langtools/tools/javac/generics/6227936/Orig.out similarity index 100% rename from langtools/test/tools/javac/generics/6227936/Orig.out rename to test/langtools/tools/javac/generics/6227936/Orig.out diff --git a/langtools/test/tools/javac/generics/6227936/T6227936.java b/test/langtools/tools/javac/generics/6227936/T6227936.java similarity index 100% rename from langtools/test/tools/javac/generics/6227936/T6227936.java rename to test/langtools/tools/javac/generics/6227936/T6227936.java diff --git a/langtools/test/tools/javac/generics/6245699/T6245699.java b/test/langtools/tools/javac/generics/6245699/T6245699.java similarity index 100% rename from langtools/test/tools/javac/generics/6245699/T6245699.java rename to test/langtools/tools/javac/generics/6245699/T6245699.java diff --git a/langtools/test/tools/javac/generics/6245699/T6245699a.java b/test/langtools/tools/javac/generics/6245699/T6245699a.java similarity index 100% rename from langtools/test/tools/javac/generics/6245699/T6245699a.java rename to test/langtools/tools/javac/generics/6245699/T6245699a.java diff --git a/langtools/test/tools/javac/generics/6245699/T6245699b.java b/test/langtools/tools/javac/generics/6245699/T6245699b.java similarity index 100% rename from langtools/test/tools/javac/generics/6245699/T6245699b.java rename to test/langtools/tools/javac/generics/6245699/T6245699b.java diff --git a/langtools/test/tools/javac/generics/6245699/T6245699b.out b/test/langtools/tools/javac/generics/6245699/T6245699b.out similarity index 100% rename from langtools/test/tools/javac/generics/6245699/T6245699b.out rename to test/langtools/tools/javac/generics/6245699/T6245699b.out diff --git a/langtools/test/tools/javac/generics/6245699/T6245699c.java b/test/langtools/tools/javac/generics/6245699/T6245699c.java similarity index 100% rename from langtools/test/tools/javac/generics/6245699/T6245699c.java rename to test/langtools/tools/javac/generics/6245699/T6245699c.java diff --git a/langtools/test/tools/javac/generics/6268476/T6268476.java b/test/langtools/tools/javac/generics/6268476/T6268476.java similarity index 100% rename from langtools/test/tools/javac/generics/6268476/T6268476.java rename to test/langtools/tools/javac/generics/6268476/T6268476.java diff --git a/langtools/test/tools/javac/generics/6292765/T6292765.java b/test/langtools/tools/javac/generics/6292765/T6292765.java similarity index 100% rename from langtools/test/tools/javac/generics/6292765/T6292765.java rename to test/langtools/tools/javac/generics/6292765/T6292765.java diff --git a/langtools/test/tools/javac/generics/6294779/T6294779a.java b/test/langtools/tools/javac/generics/6294779/T6294779a.java similarity index 100% rename from langtools/test/tools/javac/generics/6294779/T6294779a.java rename to test/langtools/tools/javac/generics/6294779/T6294779a.java diff --git a/langtools/test/tools/javac/generics/6294779/T6294779b.java b/test/langtools/tools/javac/generics/6294779/T6294779b.java similarity index 100% rename from langtools/test/tools/javac/generics/6294779/T6294779b.java rename to test/langtools/tools/javac/generics/6294779/T6294779b.java diff --git a/langtools/test/tools/javac/generics/6294779/T6294779c.java b/test/langtools/tools/javac/generics/6294779/T6294779c.java similarity index 100% rename from langtools/test/tools/javac/generics/6294779/T6294779c.java rename to test/langtools/tools/javac/generics/6294779/T6294779c.java diff --git a/langtools/test/tools/javac/generics/6294779/T6294779c.out b/test/langtools/tools/javac/generics/6294779/T6294779c.out similarity index 100% rename from langtools/test/tools/javac/generics/6294779/T6294779c.out rename to test/langtools/tools/javac/generics/6294779/T6294779c.out diff --git a/langtools/test/tools/javac/generics/6332204/T6332204.java b/test/langtools/tools/javac/generics/6332204/T6332204.java similarity index 100% rename from langtools/test/tools/javac/generics/6332204/T6332204.java rename to test/langtools/tools/javac/generics/6332204/T6332204.java diff --git a/langtools/test/tools/javac/generics/6332204/T6346876.java b/test/langtools/tools/javac/generics/6332204/T6346876.java similarity index 100% rename from langtools/test/tools/javac/generics/6332204/T6346876.java rename to test/langtools/tools/javac/generics/6332204/T6346876.java diff --git a/langtools/test/tools/javac/generics/6356636/T6356636.java b/test/langtools/tools/javac/generics/6356636/T6356636.java similarity index 100% rename from langtools/test/tools/javac/generics/6356636/T6356636.java rename to test/langtools/tools/javac/generics/6356636/T6356636.java diff --git a/langtools/test/tools/javac/generics/6356636/a/AbstractFoo.java b/test/langtools/tools/javac/generics/6356636/a/AbstractFoo.java similarity index 100% rename from langtools/test/tools/javac/generics/6356636/a/AbstractFoo.java rename to test/langtools/tools/javac/generics/6356636/a/AbstractFoo.java diff --git a/langtools/test/tools/javac/generics/6356636/a/Bar.java b/test/langtools/tools/javac/generics/6356636/a/Bar.java similarity index 100% rename from langtools/test/tools/javac/generics/6356636/a/Bar.java rename to test/langtools/tools/javac/generics/6356636/a/Bar.java diff --git a/langtools/test/tools/javac/generics/6359951/T6359951.java b/test/langtools/tools/javac/generics/6359951/T6359951.java similarity index 100% rename from langtools/test/tools/javac/generics/6359951/T6359951.java rename to test/langtools/tools/javac/generics/6359951/T6359951.java diff --git a/langtools/test/tools/javac/generics/6359951/T6359951.out b/test/langtools/tools/javac/generics/6359951/T6359951.out similarity index 100% rename from langtools/test/tools/javac/generics/6359951/T6359951.out rename to test/langtools/tools/javac/generics/6359951/T6359951.out diff --git a/langtools/test/tools/javac/generics/6372782/AbstractElement.java b/test/langtools/tools/javac/generics/6372782/AbstractElement.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/AbstractElement.java rename to test/langtools/tools/javac/generics/6372782/AbstractElement.java diff --git a/langtools/test/tools/javac/generics/6372782/AbstractPlanarVector.java b/test/langtools/tools/javac/generics/6372782/AbstractPlanarVector.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/AbstractPlanarVector.java rename to test/langtools/tools/javac/generics/6372782/AbstractPlanarVector.java diff --git a/langtools/test/tools/javac/generics/6372782/AbstractVector.java b/test/langtools/tools/javac/generics/6372782/AbstractVector.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/AbstractVector.java rename to test/langtools/tools/javac/generics/6372782/AbstractVector.java diff --git a/langtools/test/tools/javac/generics/6372782/AdditionDefined.java b/test/langtools/tools/javac/generics/6372782/AdditionDefined.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/AdditionDefined.java rename to test/langtools/tools/javac/generics/6372782/AdditionDefined.java diff --git a/langtools/test/tools/javac/generics/6372782/AdditiveClosure.java b/test/langtools/tools/javac/generics/6372782/AdditiveClosure.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/AdditiveClosure.java rename to test/langtools/tools/javac/generics/6372782/AdditiveClosure.java diff --git a/langtools/test/tools/javac/generics/6372782/Element.java b/test/langtools/tools/javac/generics/6372782/Element.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/Element.java rename to test/langtools/tools/javac/generics/6372782/Element.java diff --git a/langtools/test/tools/javac/generics/6372782/MultiplicationDefined.java b/test/langtools/tools/javac/generics/6372782/MultiplicationDefined.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/MultiplicationDefined.java rename to test/langtools/tools/javac/generics/6372782/MultiplicationDefined.java diff --git a/langtools/test/tools/javac/generics/6372782/PlainForm.java b/test/langtools/tools/javac/generics/6372782/PlainForm.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/PlainForm.java rename to test/langtools/tools/javac/generics/6372782/PlainForm.java diff --git a/langtools/test/tools/javac/generics/6372782/PlainPlanarVector.java b/test/langtools/tools/javac/generics/6372782/PlainPlanarVector.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/PlainPlanarVector.java rename to test/langtools/tools/javac/generics/6372782/PlainPlanarVector.java diff --git a/langtools/test/tools/javac/generics/6372782/PlanarVector.java b/test/langtools/tools/javac/generics/6372782/PlanarVector.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/PlanarVector.java rename to test/langtools/tools/javac/generics/6372782/PlanarVector.java diff --git a/langtools/test/tools/javac/generics/6372782/PlanarVectorVariable.java b/test/langtools/tools/javac/generics/6372782/PlanarVectorVariable.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/PlanarVectorVariable.java rename to test/langtools/tools/javac/generics/6372782/PlanarVectorVariable.java diff --git a/langtools/test/tools/javac/generics/6372782/Ring.java b/test/langtools/tools/javac/generics/6372782/Ring.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/Ring.java rename to test/langtools/tools/javac/generics/6372782/Ring.java diff --git a/langtools/test/tools/javac/generics/6372782/Scalar.java b/test/langtools/tools/javac/generics/6372782/Scalar.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/Scalar.java rename to test/langtools/tools/javac/generics/6372782/Scalar.java diff --git a/langtools/test/tools/javac/generics/6372782/State.java b/test/langtools/tools/javac/generics/6372782/State.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/State.java rename to test/langtools/tools/javac/generics/6372782/State.java diff --git a/langtools/test/tools/javac/generics/6372782/T6372782.java b/test/langtools/tools/javac/generics/6372782/T6372782.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/T6372782.java rename to test/langtools/tools/javac/generics/6372782/T6372782.java diff --git a/langtools/test/tools/javac/generics/6372782/Value.java b/test/langtools/tools/javac/generics/6372782/Value.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/Value.java rename to test/langtools/tools/javac/generics/6372782/Value.java diff --git a/langtools/test/tools/javac/generics/6372782/VariableForm.java b/test/langtools/tools/javac/generics/6372782/VariableForm.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/VariableForm.java rename to test/langtools/tools/javac/generics/6372782/VariableForm.java diff --git a/langtools/test/tools/javac/generics/6372782/Vector.java b/test/langtools/tools/javac/generics/6372782/Vector.java similarity index 100% rename from langtools/test/tools/javac/generics/6372782/Vector.java rename to test/langtools/tools/javac/generics/6372782/Vector.java diff --git a/langtools/test/tools/javac/generics/6413682/T6413682.java b/test/langtools/tools/javac/generics/6413682/T6413682.java similarity index 100% rename from langtools/test/tools/javac/generics/6413682/T6413682.java rename to test/langtools/tools/javac/generics/6413682/T6413682.java diff --git a/langtools/test/tools/javac/generics/6413682/T6413682.out b/test/langtools/tools/javac/generics/6413682/T6413682.out similarity index 100% rename from langtools/test/tools/javac/generics/6413682/T6413682.out rename to test/langtools/tools/javac/generics/6413682/T6413682.out diff --git a/langtools/test/tools/javac/generics/6413682/TestPos.java b/test/langtools/tools/javac/generics/6413682/TestPos.java similarity index 100% rename from langtools/test/tools/javac/generics/6413682/TestPos.java rename to test/langtools/tools/javac/generics/6413682/TestPos.java diff --git a/langtools/test/tools/javac/generics/6476118/T6476118a.java b/test/langtools/tools/javac/generics/6476118/T6476118a.java similarity index 100% rename from langtools/test/tools/javac/generics/6476118/T6476118a.java rename to test/langtools/tools/javac/generics/6476118/T6476118a.java diff --git a/langtools/test/tools/javac/generics/6476118/T6476118a.out b/test/langtools/tools/javac/generics/6476118/T6476118a.out similarity index 100% rename from langtools/test/tools/javac/generics/6476118/T6476118a.out rename to test/langtools/tools/javac/generics/6476118/T6476118a.out diff --git a/langtools/test/tools/javac/generics/6476118/T6476118b.java b/test/langtools/tools/javac/generics/6476118/T6476118b.java similarity index 100% rename from langtools/test/tools/javac/generics/6476118/T6476118b.java rename to test/langtools/tools/javac/generics/6476118/T6476118b.java diff --git a/langtools/test/tools/javac/generics/6476118/T6476118b.out b/test/langtools/tools/javac/generics/6476118/T6476118b.out similarity index 100% rename from langtools/test/tools/javac/generics/6476118/T6476118b.out rename to test/langtools/tools/javac/generics/6476118/T6476118b.out diff --git a/langtools/test/tools/javac/generics/6476118/T6476118c.java b/test/langtools/tools/javac/generics/6476118/T6476118c.java similarity index 100% rename from langtools/test/tools/javac/generics/6476118/T6476118c.java rename to test/langtools/tools/javac/generics/6476118/T6476118c.java diff --git a/langtools/test/tools/javac/generics/6476118/T6476118c.out b/test/langtools/tools/javac/generics/6476118/T6476118c.out similarity index 100% rename from langtools/test/tools/javac/generics/6476118/T6476118c.out rename to test/langtools/tools/javac/generics/6476118/T6476118c.out diff --git a/langtools/test/tools/javac/generics/6476118/T6476118d.java b/test/langtools/tools/javac/generics/6476118/T6476118d.java similarity index 100% rename from langtools/test/tools/javac/generics/6476118/T6476118d.java rename to test/langtools/tools/javac/generics/6476118/T6476118d.java diff --git a/langtools/test/tools/javac/generics/6487370/T6487370.java b/test/langtools/tools/javac/generics/6487370/T6487370.java similarity index 100% rename from langtools/test/tools/javac/generics/6487370/T6487370.java rename to test/langtools/tools/javac/generics/6487370/T6487370.java diff --git a/langtools/test/tools/javac/generics/6495506/A.java b/test/langtools/tools/javac/generics/6495506/A.java similarity index 100% rename from langtools/test/tools/javac/generics/6495506/A.java rename to test/langtools/tools/javac/generics/6495506/A.java diff --git a/langtools/test/tools/javac/generics/6495506/T6495506.java b/test/langtools/tools/javac/generics/6495506/T6495506.java similarity index 100% rename from langtools/test/tools/javac/generics/6495506/T6495506.java rename to test/langtools/tools/javac/generics/6495506/T6495506.java diff --git a/langtools/test/tools/javac/generics/6495506/T6495506.out b/test/langtools/tools/javac/generics/6495506/T6495506.out similarity index 100% rename from langtools/test/tools/javac/generics/6495506/T6495506.out rename to test/langtools/tools/javac/generics/6495506/T6495506.out diff --git a/langtools/test/tools/javac/generics/6531075/T6531075.java b/test/langtools/tools/javac/generics/6531075/T6531075.java similarity index 100% rename from langtools/test/tools/javac/generics/6531075/T6531075.java rename to test/langtools/tools/javac/generics/6531075/T6531075.java diff --git a/langtools/test/tools/javac/generics/6531090/T6531090a.java b/test/langtools/tools/javac/generics/6531090/T6531090a.java similarity index 100% rename from langtools/test/tools/javac/generics/6531090/T6531090a.java rename to test/langtools/tools/javac/generics/6531090/T6531090a.java diff --git a/langtools/test/tools/javac/generics/6531090/T6531090b.java b/test/langtools/tools/javac/generics/6531090/T6531090b.java similarity index 100% rename from langtools/test/tools/javac/generics/6531090/T6531090b.java rename to test/langtools/tools/javac/generics/6531090/T6531090b.java diff --git a/langtools/test/tools/javac/generics/6677785/T6677785.java b/test/langtools/tools/javac/generics/6677785/T6677785.java similarity index 100% rename from langtools/test/tools/javac/generics/6677785/T6677785.java rename to test/langtools/tools/javac/generics/6677785/T6677785.java diff --git a/langtools/test/tools/javac/generics/6677785/T6677785.out b/test/langtools/tools/javac/generics/6677785/T6677785.out similarity index 100% rename from langtools/test/tools/javac/generics/6677785/T6677785.out rename to test/langtools/tools/javac/generics/6677785/T6677785.out diff --git a/langtools/test/tools/javac/generics/6711619/T6711619a.java b/test/langtools/tools/javac/generics/6711619/T6711619a.java similarity index 100% rename from langtools/test/tools/javac/generics/6711619/T6711619a.java rename to test/langtools/tools/javac/generics/6711619/T6711619a.java diff --git a/langtools/test/tools/javac/generics/6711619/T6711619a.out b/test/langtools/tools/javac/generics/6711619/T6711619a.out similarity index 100% rename from langtools/test/tools/javac/generics/6711619/T6711619a.out rename to test/langtools/tools/javac/generics/6711619/T6711619a.out diff --git a/langtools/test/tools/javac/generics/6711619/T6711619b.java b/test/langtools/tools/javac/generics/6711619/T6711619b.java similarity index 100% rename from langtools/test/tools/javac/generics/6711619/T6711619b.java rename to test/langtools/tools/javac/generics/6711619/T6711619b.java diff --git a/langtools/test/tools/javac/generics/6711619/T6711619b.out b/test/langtools/tools/javac/generics/6711619/T6711619b.out similarity index 100% rename from langtools/test/tools/javac/generics/6711619/T6711619b.out rename to test/langtools/tools/javac/generics/6711619/T6711619b.out diff --git a/langtools/test/tools/javac/generics/6723444/T6723444.java b/test/langtools/tools/javac/generics/6723444/T6723444.java similarity index 100% rename from langtools/test/tools/javac/generics/6723444/T6723444.java rename to test/langtools/tools/javac/generics/6723444/T6723444.java diff --git a/langtools/test/tools/javac/generics/6723444/T6723444_1.out b/test/langtools/tools/javac/generics/6723444/T6723444_1.out similarity index 100% rename from langtools/test/tools/javac/generics/6723444/T6723444_1.out rename to test/langtools/tools/javac/generics/6723444/T6723444_1.out diff --git a/langtools/test/tools/javac/generics/6723444/T6723444_2.out b/test/langtools/tools/javac/generics/6723444/T6723444_2.out similarity index 100% rename from langtools/test/tools/javac/generics/6723444/T6723444_2.out rename to test/langtools/tools/javac/generics/6723444/T6723444_2.out diff --git a/langtools/test/tools/javac/generics/6729401/T6729401.java b/test/langtools/tools/javac/generics/6729401/T6729401.java similarity index 100% rename from langtools/test/tools/javac/generics/6729401/T6729401.java rename to test/langtools/tools/javac/generics/6729401/T6729401.java diff --git a/langtools/test/tools/javac/generics/6910550/T6910550a.java b/test/langtools/tools/javac/generics/6910550/T6910550a.java similarity index 100% rename from langtools/test/tools/javac/generics/6910550/T6910550a.java rename to test/langtools/tools/javac/generics/6910550/T6910550a.java diff --git a/langtools/test/tools/javac/generics/6910550/T6910550a.out b/test/langtools/tools/javac/generics/6910550/T6910550a.out similarity index 100% rename from langtools/test/tools/javac/generics/6910550/T6910550a.out rename to test/langtools/tools/javac/generics/6910550/T6910550a.out diff --git a/langtools/test/tools/javac/generics/6910550/T6910550b.java b/test/langtools/tools/javac/generics/6910550/T6910550b.java similarity index 100% rename from langtools/test/tools/javac/generics/6910550/T6910550b.java rename to test/langtools/tools/javac/generics/6910550/T6910550b.java diff --git a/langtools/test/tools/javac/generics/6910550/T6910550b.out b/test/langtools/tools/javac/generics/6910550/T6910550b.out similarity index 100% rename from langtools/test/tools/javac/generics/6910550/T6910550b.out rename to test/langtools/tools/javac/generics/6910550/T6910550b.out diff --git a/langtools/test/tools/javac/generics/6910550/T6910550c.java b/test/langtools/tools/javac/generics/6910550/T6910550c.java similarity index 100% rename from langtools/test/tools/javac/generics/6910550/T6910550c.java rename to test/langtools/tools/javac/generics/6910550/T6910550c.java diff --git a/langtools/test/tools/javac/generics/6910550/T6910550c.out b/test/langtools/tools/javac/generics/6910550/T6910550c.out similarity index 100% rename from langtools/test/tools/javac/generics/6910550/T6910550c.out rename to test/langtools/tools/javac/generics/6910550/T6910550c.out diff --git a/langtools/test/tools/javac/generics/6910550/T6910550d.java b/test/langtools/tools/javac/generics/6910550/T6910550d.java similarity index 100% rename from langtools/test/tools/javac/generics/6910550/T6910550d.java rename to test/langtools/tools/javac/generics/6910550/T6910550d.java diff --git a/langtools/test/tools/javac/generics/6910550/T6910550d.out b/test/langtools/tools/javac/generics/6910550/T6910550d.out similarity index 100% rename from langtools/test/tools/javac/generics/6910550/T6910550d.out rename to test/langtools/tools/javac/generics/6910550/T6910550d.out diff --git a/langtools/test/tools/javac/generics/6910550/T6910550e.java b/test/langtools/tools/javac/generics/6910550/T6910550e.java similarity index 100% rename from langtools/test/tools/javac/generics/6910550/T6910550e.java rename to test/langtools/tools/javac/generics/6910550/T6910550e.java diff --git a/langtools/test/tools/javac/generics/6910550/T6910550e.out b/test/langtools/tools/javac/generics/6910550/T6910550e.out similarity index 100% rename from langtools/test/tools/javac/generics/6910550/T6910550e.out rename to test/langtools/tools/javac/generics/6910550/T6910550e.out diff --git a/langtools/test/tools/javac/generics/6946618/T6946618a.java b/test/langtools/tools/javac/generics/6946618/T6946618a.java similarity index 100% rename from langtools/test/tools/javac/generics/6946618/T6946618a.java rename to test/langtools/tools/javac/generics/6946618/T6946618a.java diff --git a/langtools/test/tools/javac/generics/6946618/T6946618a.out b/test/langtools/tools/javac/generics/6946618/T6946618a.out similarity index 100% rename from langtools/test/tools/javac/generics/6946618/T6946618a.out rename to test/langtools/tools/javac/generics/6946618/T6946618a.out diff --git a/langtools/test/tools/javac/generics/6946618/T6946618b.java b/test/langtools/tools/javac/generics/6946618/T6946618b.java similarity index 100% rename from langtools/test/tools/javac/generics/6946618/T6946618b.java rename to test/langtools/tools/javac/generics/6946618/T6946618b.java diff --git a/langtools/test/tools/javac/generics/6946618/T6946618b.out b/test/langtools/tools/javac/generics/6946618/T6946618b.out similarity index 100% rename from langtools/test/tools/javac/generics/6946618/T6946618b.out rename to test/langtools/tools/javac/generics/6946618/T6946618b.out diff --git a/langtools/test/tools/javac/generics/6946618/T6946618c.java b/test/langtools/tools/javac/generics/6946618/T6946618c.java similarity index 100% rename from langtools/test/tools/javac/generics/6946618/T6946618c.java rename to test/langtools/tools/javac/generics/6946618/T6946618c.java diff --git a/langtools/test/tools/javac/generics/6946618/T6946618c.out b/test/langtools/tools/javac/generics/6946618/T6946618c.out similarity index 100% rename from langtools/test/tools/javac/generics/6946618/T6946618c.out rename to test/langtools/tools/javac/generics/6946618/T6946618c.out diff --git a/langtools/test/tools/javac/generics/6956758/T6956758neg.java b/test/langtools/tools/javac/generics/6956758/T6956758neg.java similarity index 100% rename from langtools/test/tools/javac/generics/6956758/T6956758neg.java rename to test/langtools/tools/javac/generics/6956758/T6956758neg.java diff --git a/langtools/test/tools/javac/generics/6956758/T6956758neg.out b/test/langtools/tools/javac/generics/6956758/T6956758neg.out similarity index 100% rename from langtools/test/tools/javac/generics/6956758/T6956758neg.out rename to test/langtools/tools/javac/generics/6956758/T6956758neg.out diff --git a/langtools/test/tools/javac/generics/6956758/T6956758pos.java b/test/langtools/tools/javac/generics/6956758/T6956758pos.java similarity index 100% rename from langtools/test/tools/javac/generics/6956758/T6956758pos.java rename to test/langtools/tools/javac/generics/6956758/T6956758pos.java diff --git a/langtools/test/tools/javac/generics/6969184/T6969184.java b/test/langtools/tools/javac/generics/6969184/T6969184.java similarity index 100% rename from langtools/test/tools/javac/generics/6969184/T6969184.java rename to test/langtools/tools/javac/generics/6969184/T6969184.java diff --git a/langtools/test/tools/javac/generics/6969184/T6969184.out b/test/langtools/tools/javac/generics/6969184/T6969184.out similarity index 100% rename from langtools/test/tools/javac/generics/6969184/T6969184.out rename to test/langtools/tools/javac/generics/6969184/T6969184.out diff --git a/langtools/test/tools/javac/generics/6985719/T6985719a.java b/test/langtools/tools/javac/generics/6985719/T6985719a.java similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719a.java rename to test/langtools/tools/javac/generics/6985719/T6985719a.java diff --git a/langtools/test/tools/javac/generics/6985719/T6985719a.out b/test/langtools/tools/javac/generics/6985719/T6985719a.out similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719a.out rename to test/langtools/tools/javac/generics/6985719/T6985719a.out diff --git a/langtools/test/tools/javac/generics/6985719/T6985719b.java b/test/langtools/tools/javac/generics/6985719/T6985719b.java similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719b.java rename to test/langtools/tools/javac/generics/6985719/T6985719b.java diff --git a/langtools/test/tools/javac/generics/6985719/T6985719b.out b/test/langtools/tools/javac/generics/6985719/T6985719b.out similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719b.out rename to test/langtools/tools/javac/generics/6985719/T6985719b.out diff --git a/langtools/test/tools/javac/generics/6985719/T6985719c.java b/test/langtools/tools/javac/generics/6985719/T6985719c.java similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719c.java rename to test/langtools/tools/javac/generics/6985719/T6985719c.java diff --git a/langtools/test/tools/javac/generics/6985719/T6985719c.out b/test/langtools/tools/javac/generics/6985719/T6985719c.out similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719c.out rename to test/langtools/tools/javac/generics/6985719/T6985719c.out diff --git a/langtools/test/tools/javac/generics/6985719/T6985719d.java b/test/langtools/tools/javac/generics/6985719/T6985719d.java similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719d.java rename to test/langtools/tools/javac/generics/6985719/T6985719d.java diff --git a/langtools/test/tools/javac/generics/6985719/T6985719d.out b/test/langtools/tools/javac/generics/6985719/T6985719d.out similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719d.out rename to test/langtools/tools/javac/generics/6985719/T6985719d.out diff --git a/langtools/test/tools/javac/generics/6985719/T6985719e.java b/test/langtools/tools/javac/generics/6985719/T6985719e.java similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719e.java rename to test/langtools/tools/javac/generics/6985719/T6985719e.java diff --git a/langtools/test/tools/javac/generics/6985719/T6985719e.out b/test/langtools/tools/javac/generics/6985719/T6985719e.out similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719e.out rename to test/langtools/tools/javac/generics/6985719/T6985719e.out diff --git a/langtools/test/tools/javac/generics/6985719/T6985719f.java b/test/langtools/tools/javac/generics/6985719/T6985719f.java similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719f.java rename to test/langtools/tools/javac/generics/6985719/T6985719f.java diff --git a/langtools/test/tools/javac/generics/6985719/T6985719f.out b/test/langtools/tools/javac/generics/6985719/T6985719f.out similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719f.out rename to test/langtools/tools/javac/generics/6985719/T6985719f.out diff --git a/langtools/test/tools/javac/generics/6985719/T6985719g.java b/test/langtools/tools/javac/generics/6985719/T6985719g.java similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719g.java rename to test/langtools/tools/javac/generics/6985719/T6985719g.java diff --git a/langtools/test/tools/javac/generics/6985719/T6985719g.out b/test/langtools/tools/javac/generics/6985719/T6985719g.out similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719g.out rename to test/langtools/tools/javac/generics/6985719/T6985719g.out diff --git a/langtools/test/tools/javac/generics/6985719/T6985719h.java b/test/langtools/tools/javac/generics/6985719/T6985719h.java similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719h.java rename to test/langtools/tools/javac/generics/6985719/T6985719h.java diff --git a/langtools/test/tools/javac/generics/6985719/T6985719h.out b/test/langtools/tools/javac/generics/6985719/T6985719h.out similarity index 100% rename from langtools/test/tools/javac/generics/6985719/T6985719h.out rename to test/langtools/tools/javac/generics/6985719/T6985719h.out diff --git a/langtools/test/tools/javac/generics/6987475/T6987475neg.java b/test/langtools/tools/javac/generics/6987475/T6987475neg.java similarity index 100% rename from langtools/test/tools/javac/generics/6987475/T6987475neg.java rename to test/langtools/tools/javac/generics/6987475/T6987475neg.java diff --git a/langtools/test/tools/javac/generics/6987475/T6987475neg.out b/test/langtools/tools/javac/generics/6987475/T6987475neg.out similarity index 100% rename from langtools/test/tools/javac/generics/6987475/T6987475neg.out rename to test/langtools/tools/javac/generics/6987475/T6987475neg.out diff --git a/langtools/test/tools/javac/generics/6987475/T6987475pos.java b/test/langtools/tools/javac/generics/6987475/T6987475pos.java similarity index 100% rename from langtools/test/tools/javac/generics/6987475/T6987475pos.java rename to test/langtools/tools/javac/generics/6987475/T6987475pos.java diff --git a/langtools/test/tools/javac/generics/7007615/T7007615.java b/test/langtools/tools/javac/generics/7007615/T7007615.java similarity index 100% rename from langtools/test/tools/javac/generics/7007615/T7007615.java rename to test/langtools/tools/javac/generics/7007615/T7007615.java diff --git a/langtools/test/tools/javac/generics/7007615/T7007615.out b/test/langtools/tools/javac/generics/7007615/T7007615.out similarity index 100% rename from langtools/test/tools/javac/generics/7007615/T7007615.out rename to test/langtools/tools/javac/generics/7007615/T7007615.out diff --git a/langtools/test/tools/javac/generics/7007615/acc1/AccessibilityCheck01.java b/test/langtools/tools/javac/generics/7007615/acc1/AccessibilityCheck01.java similarity index 100% rename from langtools/test/tools/javac/generics/7007615/acc1/AccessibilityCheck01.java rename to test/langtools/tools/javac/generics/7007615/acc1/AccessibilityCheck01.java diff --git a/langtools/test/tools/javac/generics/7007615/acc1/p1/C.java b/test/langtools/tools/javac/generics/7007615/acc1/p1/C.java similarity index 100% rename from langtools/test/tools/javac/generics/7007615/acc1/p1/C.java rename to test/langtools/tools/javac/generics/7007615/acc1/p1/C.java diff --git a/langtools/test/tools/javac/generics/7007615/acc1/p1/D.java b/test/langtools/tools/javac/generics/7007615/acc1/p1/D.java similarity index 100% rename from langtools/test/tools/javac/generics/7007615/acc1/p1/D.java rename to test/langtools/tools/javac/generics/7007615/acc1/p1/D.java diff --git a/langtools/test/tools/javac/generics/7007615/acc1/p2/E.java b/test/langtools/tools/javac/generics/7007615/acc1/p2/E.java similarity index 100% rename from langtools/test/tools/javac/generics/7007615/acc1/p2/E.java rename to test/langtools/tools/javac/generics/7007615/acc1/p2/E.java diff --git a/langtools/test/tools/javac/generics/7007615/acc2/AccessibilityCheck02.java b/test/langtools/tools/javac/generics/7007615/acc2/AccessibilityCheck02.java similarity index 100% rename from langtools/test/tools/javac/generics/7007615/acc2/AccessibilityCheck02.java rename to test/langtools/tools/javac/generics/7007615/acc2/AccessibilityCheck02.java diff --git a/langtools/test/tools/javac/generics/7007615/acc2/AccessibilityCheck02.out b/test/langtools/tools/javac/generics/7007615/acc2/AccessibilityCheck02.out similarity index 100% rename from langtools/test/tools/javac/generics/7007615/acc2/AccessibilityCheck02.out rename to test/langtools/tools/javac/generics/7007615/acc2/AccessibilityCheck02.out diff --git a/langtools/test/tools/javac/generics/7007615/acc2/p1/C.java b/test/langtools/tools/javac/generics/7007615/acc2/p1/C.java similarity index 100% rename from langtools/test/tools/javac/generics/7007615/acc2/p1/C.java rename to test/langtools/tools/javac/generics/7007615/acc2/p1/C.java diff --git a/langtools/test/tools/javac/generics/7007615/acc2/p1/D.java b/test/langtools/tools/javac/generics/7007615/acc2/p1/D.java similarity index 100% rename from langtools/test/tools/javac/generics/7007615/acc2/p1/D.java rename to test/langtools/tools/javac/generics/7007615/acc2/p1/D.java diff --git a/langtools/test/tools/javac/generics/7007615/acc2/p2/E.java b/test/langtools/tools/javac/generics/7007615/acc2/p2/E.java similarity index 100% rename from langtools/test/tools/javac/generics/7007615/acc2/p2/E.java rename to test/langtools/tools/javac/generics/7007615/acc2/p2/E.java diff --git a/langtools/test/tools/javac/generics/7015430/T7015430.java b/test/langtools/tools/javac/generics/7015430/T7015430.java similarity index 100% rename from langtools/test/tools/javac/generics/7015430/T7015430.java rename to test/langtools/tools/javac/generics/7015430/T7015430.java diff --git a/langtools/test/tools/javac/generics/7015430/T7015430_1.out b/test/langtools/tools/javac/generics/7015430/T7015430_1.out similarity index 100% rename from langtools/test/tools/javac/generics/7015430/T7015430_1.out rename to test/langtools/tools/javac/generics/7015430/T7015430_1.out diff --git a/langtools/test/tools/javac/generics/7015430/T7015430_2.out b/test/langtools/tools/javac/generics/7015430/T7015430_2.out similarity index 100% rename from langtools/test/tools/javac/generics/7015430/T7015430_2.out rename to test/langtools/tools/javac/generics/7015430/T7015430_2.out diff --git a/langtools/test/tools/javac/generics/7020657/T7020657neg.java b/test/langtools/tools/javac/generics/7020657/T7020657neg.java similarity index 100% rename from langtools/test/tools/javac/generics/7020657/T7020657neg.java rename to test/langtools/tools/javac/generics/7020657/T7020657neg.java diff --git a/langtools/test/tools/javac/generics/7020657/T7020657neg.out b/test/langtools/tools/javac/generics/7020657/T7020657neg.out similarity index 100% rename from langtools/test/tools/javac/generics/7020657/T7020657neg.out rename to test/langtools/tools/javac/generics/7020657/T7020657neg.out diff --git a/langtools/test/tools/javac/generics/7020657/T7020657pos.java b/test/langtools/tools/javac/generics/7020657/T7020657pos.java similarity index 100% rename from langtools/test/tools/javac/generics/7020657/T7020657pos.java rename to test/langtools/tools/javac/generics/7020657/T7020657pos.java diff --git a/langtools/test/tools/javac/generics/7022054/T7022054neg1.java b/test/langtools/tools/javac/generics/7022054/T7022054neg1.java similarity index 100% rename from langtools/test/tools/javac/generics/7022054/T7022054neg1.java rename to test/langtools/tools/javac/generics/7022054/T7022054neg1.java diff --git a/langtools/test/tools/javac/generics/7022054/T7022054neg1.out b/test/langtools/tools/javac/generics/7022054/T7022054neg1.out similarity index 100% rename from langtools/test/tools/javac/generics/7022054/T7022054neg1.out rename to test/langtools/tools/javac/generics/7022054/T7022054neg1.out diff --git a/langtools/test/tools/javac/generics/7022054/T7022054neg2.java b/test/langtools/tools/javac/generics/7022054/T7022054neg2.java similarity index 100% rename from langtools/test/tools/javac/generics/7022054/T7022054neg2.java rename to test/langtools/tools/javac/generics/7022054/T7022054neg2.java diff --git a/langtools/test/tools/javac/generics/7022054/T7022054neg2.out b/test/langtools/tools/javac/generics/7022054/T7022054neg2.out similarity index 100% rename from langtools/test/tools/javac/generics/7022054/T7022054neg2.out rename to test/langtools/tools/javac/generics/7022054/T7022054neg2.out diff --git a/langtools/test/tools/javac/generics/7022054/T7022054pos1.java b/test/langtools/tools/javac/generics/7022054/T7022054pos1.java similarity index 100% rename from langtools/test/tools/javac/generics/7022054/T7022054pos1.java rename to test/langtools/tools/javac/generics/7022054/T7022054pos1.java diff --git a/langtools/test/tools/javac/generics/7022054/T7022054pos1.out b/test/langtools/tools/javac/generics/7022054/T7022054pos1.out similarity index 100% rename from langtools/test/tools/javac/generics/7022054/T7022054pos1.out rename to test/langtools/tools/javac/generics/7022054/T7022054pos1.out diff --git a/langtools/test/tools/javac/generics/7022054/T7022054pos2.java b/test/langtools/tools/javac/generics/7022054/T7022054pos2.java similarity index 100% rename from langtools/test/tools/javac/generics/7022054/T7022054pos2.java rename to test/langtools/tools/javac/generics/7022054/T7022054pos2.java diff --git a/langtools/test/tools/javac/generics/7022054/T7022054pos2.out b/test/langtools/tools/javac/generics/7022054/T7022054pos2.out similarity index 100% rename from langtools/test/tools/javac/generics/7022054/T7022054pos2.out rename to test/langtools/tools/javac/generics/7022054/T7022054pos2.out diff --git a/langtools/test/tools/javac/generics/7034019/T7034019a.java b/test/langtools/tools/javac/generics/7034019/T7034019a.java similarity index 100% rename from langtools/test/tools/javac/generics/7034019/T7034019a.java rename to test/langtools/tools/javac/generics/7034019/T7034019a.java diff --git a/langtools/test/tools/javac/generics/7034019/T7034019b.java b/test/langtools/tools/javac/generics/7034019/T7034019b.java similarity index 100% rename from langtools/test/tools/javac/generics/7034019/T7034019b.java rename to test/langtools/tools/javac/generics/7034019/T7034019b.java diff --git a/langtools/test/tools/javac/generics/7034019/T7034019c.java b/test/langtools/tools/javac/generics/7034019/T7034019c.java similarity index 100% rename from langtools/test/tools/javac/generics/7034019/T7034019c.java rename to test/langtools/tools/javac/generics/7034019/T7034019c.java diff --git a/langtools/test/tools/javac/generics/7034019/T7034019c.out b/test/langtools/tools/javac/generics/7034019/T7034019c.out similarity index 100% rename from langtools/test/tools/javac/generics/7034019/T7034019c.out rename to test/langtools/tools/javac/generics/7034019/T7034019c.out diff --git a/langtools/test/tools/javac/generics/7034019/T7034019d.java b/test/langtools/tools/javac/generics/7034019/T7034019d.java similarity index 100% rename from langtools/test/tools/javac/generics/7034019/T7034019d.java rename to test/langtools/tools/javac/generics/7034019/T7034019d.java diff --git a/langtools/test/tools/javac/generics/7034019/T7034019d.out b/test/langtools/tools/javac/generics/7034019/T7034019d.out similarity index 100% rename from langtools/test/tools/javac/generics/7034019/T7034019d.out rename to test/langtools/tools/javac/generics/7034019/T7034019d.out diff --git a/langtools/test/tools/javac/generics/7034511/T7034511a.java b/test/langtools/tools/javac/generics/7034511/T7034511a.java similarity index 100% rename from langtools/test/tools/javac/generics/7034511/T7034511a.java rename to test/langtools/tools/javac/generics/7034511/T7034511a.java diff --git a/langtools/test/tools/javac/generics/7034511/T7034511a.out b/test/langtools/tools/javac/generics/7034511/T7034511a.out similarity index 100% rename from langtools/test/tools/javac/generics/7034511/T7034511a.out rename to test/langtools/tools/javac/generics/7034511/T7034511a.out diff --git a/langtools/test/tools/javac/generics/7034511/T7034511b.java b/test/langtools/tools/javac/generics/7034511/T7034511b.java similarity index 100% rename from langtools/test/tools/javac/generics/7034511/T7034511b.java rename to test/langtools/tools/javac/generics/7034511/T7034511b.java diff --git a/langtools/test/tools/javac/generics/7034511/T7034511b.out b/test/langtools/tools/javac/generics/7034511/T7034511b.out similarity index 100% rename from langtools/test/tools/javac/generics/7034511/T7034511b.out rename to test/langtools/tools/javac/generics/7034511/T7034511b.out diff --git a/langtools/test/tools/javac/generics/7034511/T7041019.java b/test/langtools/tools/javac/generics/7034511/T7041019.java similarity index 100% rename from langtools/test/tools/javac/generics/7034511/T7041019.java rename to test/langtools/tools/javac/generics/7034511/T7041019.java diff --git a/langtools/test/tools/javac/generics/7151070/T7151070.java b/test/langtools/tools/javac/generics/7151070/T7151070.java similarity index 100% rename from langtools/test/tools/javac/generics/7151070/T7151070.java rename to test/langtools/tools/javac/generics/7151070/T7151070.java diff --git a/langtools/test/tools/javac/generics/7151070/T7151070.out b/test/langtools/tools/javac/generics/7151070/T7151070.out similarity index 100% rename from langtools/test/tools/javac/generics/7151070/T7151070.out rename to test/langtools/tools/javac/generics/7151070/T7151070.out diff --git a/langtools/test/tools/javac/generics/7151802/T7151802.java b/test/langtools/tools/javac/generics/7151802/T7151802.java similarity index 100% rename from langtools/test/tools/javac/generics/7151802/T7151802.java rename to test/langtools/tools/javac/generics/7151802/T7151802.java diff --git a/langtools/test/tools/javac/generics/7151802/T7151802.out b/test/langtools/tools/javac/generics/7151802/T7151802.out similarity index 100% rename from langtools/test/tools/javac/generics/7151802/T7151802.out rename to test/langtools/tools/javac/generics/7151802/T7151802.out diff --git a/langtools/test/tools/javac/generics/8004094/B.java b/test/langtools/tools/javac/generics/8004094/B.java similarity index 100% rename from langtools/test/tools/javac/generics/8004094/B.java rename to test/langtools/tools/javac/generics/8004094/B.java diff --git a/langtools/test/tools/javac/generics/8004094/T8004094.java b/test/langtools/tools/javac/generics/8004094/T8004094.java similarity index 100% rename from langtools/test/tools/javac/generics/8004094/T8004094.java rename to test/langtools/tools/javac/generics/8004094/T8004094.java diff --git a/langtools/test/tools/javac/generics/8016640/T8016640.java b/test/langtools/tools/javac/generics/8016640/T8016640.java similarity index 100% rename from langtools/test/tools/javac/generics/8016640/T8016640.java rename to test/langtools/tools/javac/generics/8016640/T8016640.java diff --git a/langtools/test/tools/javac/generics/8016640/T8016640.out b/test/langtools/tools/javac/generics/8016640/T8016640.out similarity index 100% rename from langtools/test/tools/javac/generics/8016640/T8016640.out rename to test/langtools/tools/javac/generics/8016640/T8016640.out diff --git a/langtools/test/tools/javac/generics/8064803/T8064803.java b/test/langtools/tools/javac/generics/8064803/T8064803.java similarity index 100% rename from langtools/test/tools/javac/generics/8064803/T8064803.java rename to test/langtools/tools/javac/generics/8064803/T8064803.java diff --git a/langtools/test/tools/javac/generics/ArrayClone.java b/test/langtools/tools/javac/generics/ArrayClone.java similarity index 100% rename from langtools/test/tools/javac/generics/ArrayClone.java rename to test/langtools/tools/javac/generics/ArrayClone.java diff --git a/langtools/test/tools/javac/generics/ArrayTypearg.java b/test/langtools/tools/javac/generics/ArrayTypearg.java similarity index 100% rename from langtools/test/tools/javac/generics/ArrayTypearg.java rename to test/langtools/tools/javac/generics/ArrayTypearg.java diff --git a/langtools/test/tools/javac/generics/BridgeClash.java b/test/langtools/tools/javac/generics/BridgeClash.java similarity index 100% rename from langtools/test/tools/javac/generics/BridgeClash.java rename to test/langtools/tools/javac/generics/BridgeClash.java diff --git a/langtools/test/tools/javac/generics/BridgeOrder.java b/test/langtools/tools/javac/generics/BridgeOrder.java similarity index 100% rename from langtools/test/tools/javac/generics/BridgeOrder.java rename to test/langtools/tools/javac/generics/BridgeOrder.java diff --git a/langtools/test/tools/javac/generics/CastCrash.java b/test/langtools/tools/javac/generics/CastCrash.java similarity index 100% rename from langtools/test/tools/javac/generics/CastCrash.java rename to test/langtools/tools/javac/generics/CastCrash.java diff --git a/langtools/test/tools/javac/generics/CastCrash.out b/test/langtools/tools/javac/generics/CastCrash.out similarity index 100% rename from langtools/test/tools/javac/generics/CastCrash.out rename to test/langtools/tools/javac/generics/CastCrash.out diff --git a/langtools/test/tools/javac/generics/Casting.java b/test/langtools/tools/javac/generics/Casting.java similarity index 100% rename from langtools/test/tools/javac/generics/Casting.java rename to test/langtools/tools/javac/generics/Casting.java diff --git a/langtools/test/tools/javac/generics/Casting2.java b/test/langtools/tools/javac/generics/Casting2.java similarity index 100% rename from langtools/test/tools/javac/generics/Casting2.java rename to test/langtools/tools/javac/generics/Casting2.java diff --git a/langtools/test/tools/javac/generics/Casting3.java b/test/langtools/tools/javac/generics/Casting3.java similarity index 100% rename from langtools/test/tools/javac/generics/Casting3.java rename to test/langtools/tools/javac/generics/Casting3.java diff --git a/langtools/test/tools/javac/generics/Casting4.java b/test/langtools/tools/javac/generics/Casting4.java similarity index 100% rename from langtools/test/tools/javac/generics/Casting4.java rename to test/langtools/tools/javac/generics/Casting4.java diff --git a/langtools/test/tools/javac/generics/Casting5.java b/test/langtools/tools/javac/generics/Casting5.java similarity index 100% rename from langtools/test/tools/javac/generics/Casting5.java rename to test/langtools/tools/javac/generics/Casting5.java diff --git a/langtools/test/tools/javac/generics/CatchTyparam.java b/test/langtools/tools/javac/generics/CatchTyparam.java similarity index 100% rename from langtools/test/tools/javac/generics/CatchTyparam.java rename to test/langtools/tools/javac/generics/CatchTyparam.java diff --git a/langtools/test/tools/javac/generics/CatchTyparam.out b/test/langtools/tools/javac/generics/CatchTyparam.out similarity index 100% rename from langtools/test/tools/javac/generics/CatchTyparam.out rename to test/langtools/tools/javac/generics/CatchTyparam.out diff --git a/langtools/test/tools/javac/generics/CheckNoDuplicateErrors.java b/test/langtools/tools/javac/generics/CheckNoDuplicateErrors.java similarity index 100% rename from langtools/test/tools/javac/generics/CheckNoDuplicateErrors.java rename to test/langtools/tools/javac/generics/CheckNoDuplicateErrors.java diff --git a/langtools/test/tools/javac/generics/CheckNoDuplicateErrors.out b/test/langtools/tools/javac/generics/CheckNoDuplicateErrors.out similarity index 100% rename from langtools/test/tools/javac/generics/CheckNoDuplicateErrors.out rename to test/langtools/tools/javac/generics/CheckNoDuplicateErrors.out diff --git a/langtools/test/tools/javac/generics/Conditional.java b/test/langtools/tools/javac/generics/Conditional.java similarity index 100% rename from langtools/test/tools/javac/generics/Conditional.java rename to test/langtools/tools/javac/generics/Conditional.java diff --git a/langtools/test/tools/javac/generics/Covar2.java b/test/langtools/tools/javac/generics/Covar2.java similarity index 100% rename from langtools/test/tools/javac/generics/Covar2.java rename to test/langtools/tools/javac/generics/Covar2.java diff --git a/langtools/test/tools/javac/generics/Covar3.java b/test/langtools/tools/javac/generics/Covar3.java similarity index 100% rename from langtools/test/tools/javac/generics/Covar3.java rename to test/langtools/tools/javac/generics/Covar3.java diff --git a/langtools/test/tools/javac/generics/Covar3.out b/test/langtools/tools/javac/generics/Covar3.out similarity index 100% rename from langtools/test/tools/javac/generics/Covar3.out rename to test/langtools/tools/javac/generics/Covar3.out diff --git a/langtools/test/tools/javac/generics/Covar4.java b/test/langtools/tools/javac/generics/Covar4.java similarity index 100% rename from langtools/test/tools/javac/generics/Covar4.java rename to test/langtools/tools/javac/generics/Covar4.java diff --git a/langtools/test/tools/javac/generics/Covar4.out b/test/langtools/tools/javac/generics/Covar4.out similarity index 100% rename from langtools/test/tools/javac/generics/Covar4.out rename to test/langtools/tools/javac/generics/Covar4.out diff --git a/langtools/test/tools/javac/generics/Crash01.java b/test/langtools/tools/javac/generics/Crash01.java similarity index 100% rename from langtools/test/tools/javac/generics/Crash01.java rename to test/langtools/tools/javac/generics/Crash01.java diff --git a/langtools/test/tools/javac/generics/Crash02.java b/test/langtools/tools/javac/generics/Crash02.java similarity index 100% rename from langtools/test/tools/javac/generics/Crash02.java rename to test/langtools/tools/javac/generics/Crash02.java diff --git a/langtools/test/tools/javac/generics/CyclicInheritance3.java b/test/langtools/tools/javac/generics/CyclicInheritance3.java similarity index 100% rename from langtools/test/tools/javac/generics/CyclicInheritance3.java rename to test/langtools/tools/javac/generics/CyclicInheritance3.java diff --git a/langtools/test/tools/javac/generics/CyclicInheritance5.java b/test/langtools/tools/javac/generics/CyclicInheritance5.java similarity index 100% rename from langtools/test/tools/javac/generics/CyclicInheritance5.java rename to test/langtools/tools/javac/generics/CyclicInheritance5.java diff --git a/langtools/test/tools/javac/generics/ErasureClashCrash.java b/test/langtools/tools/javac/generics/ErasureClashCrash.java similarity index 100% rename from langtools/test/tools/javac/generics/ErasureClashCrash.java rename to test/langtools/tools/javac/generics/ErasureClashCrash.java diff --git a/langtools/test/tools/javac/generics/ErasureClashCrash.out b/test/langtools/tools/javac/generics/ErasureClashCrash.out similarity index 100% rename from langtools/test/tools/javac/generics/ErasureClashCrash.out rename to test/langtools/tools/javac/generics/ErasureClashCrash.out diff --git a/langtools/test/tools/javac/generics/ExtendedRaw1.java b/test/langtools/tools/javac/generics/ExtendedRaw1.java similarity index 100% rename from langtools/test/tools/javac/generics/ExtendedRaw1.java rename to test/langtools/tools/javac/generics/ExtendedRaw1.java diff --git a/langtools/test/tools/javac/generics/ExtendedRaw2.java b/test/langtools/tools/javac/generics/ExtendedRaw2.java similarity index 100% rename from langtools/test/tools/javac/generics/ExtendedRaw2.java rename to test/langtools/tools/javac/generics/ExtendedRaw2.java diff --git a/langtools/test/tools/javac/generics/ExtendedRaw3.java b/test/langtools/tools/javac/generics/ExtendedRaw3.java similarity index 100% rename from langtools/test/tools/javac/generics/ExtendedRaw3.java rename to test/langtools/tools/javac/generics/ExtendedRaw3.java diff --git a/langtools/test/tools/javac/generics/ExtendedRaw4.java b/test/langtools/tools/javac/generics/ExtendedRaw4.java similarity index 100% rename from langtools/test/tools/javac/generics/ExtendedRaw4.java rename to test/langtools/tools/javac/generics/ExtendedRaw4.java diff --git a/langtools/test/tools/javac/generics/FinalBridge.java b/test/langtools/tools/javac/generics/FinalBridge.java similarity index 100% rename from langtools/test/tools/javac/generics/FinalBridge.java rename to test/langtools/tools/javac/generics/FinalBridge.java diff --git a/langtools/test/tools/javac/generics/GenLit1.java b/test/langtools/tools/javac/generics/GenLit1.java similarity index 100% rename from langtools/test/tools/javac/generics/GenLit1.java rename to test/langtools/tools/javac/generics/GenLit1.java diff --git a/langtools/test/tools/javac/generics/GenLit1.out b/test/langtools/tools/javac/generics/GenLit1.out similarity index 100% rename from langtools/test/tools/javac/generics/GenLit1.out rename to test/langtools/tools/javac/generics/GenLit1.out diff --git a/langtools/test/tools/javac/generics/GenLit2.java b/test/langtools/tools/javac/generics/GenLit2.java similarity index 100% rename from langtools/test/tools/javac/generics/GenLit2.java rename to test/langtools/tools/javac/generics/GenLit2.java diff --git a/langtools/test/tools/javac/generics/GenLit2.out b/test/langtools/tools/javac/generics/GenLit2.out similarity index 100% rename from langtools/test/tools/javac/generics/GenLit2.out rename to test/langtools/tools/javac/generics/GenLit2.out diff --git a/langtools/test/tools/javac/generics/GenericAnonCtor.java b/test/langtools/tools/javac/generics/GenericAnonCtor.java similarity index 100% rename from langtools/test/tools/javac/generics/GenericAnonCtor.java rename to test/langtools/tools/javac/generics/GenericAnonCtor.java diff --git a/langtools/test/tools/javac/generics/GenericMerge.java b/test/langtools/tools/javac/generics/GenericMerge.java similarity index 100% rename from langtools/test/tools/javac/generics/GenericMerge.java rename to test/langtools/tools/javac/generics/GenericMerge.java diff --git a/langtools/test/tools/javac/generics/GenericOverride.java b/test/langtools/tools/javac/generics/GenericOverride.java similarity index 100% rename from langtools/test/tools/javac/generics/GenericOverride.java rename to test/langtools/tools/javac/generics/GenericOverride.java diff --git a/langtools/test/tools/javac/generics/GenericThrowable.java b/test/langtools/tools/javac/generics/GenericThrowable.java similarity index 100% rename from langtools/test/tools/javac/generics/GenericThrowable.java rename to test/langtools/tools/javac/generics/GenericThrowable.java diff --git a/langtools/test/tools/javac/generics/GenericThrowable.out b/test/langtools/tools/javac/generics/GenericThrowable.out similarity index 100% rename from langtools/test/tools/javac/generics/GenericThrowable.out rename to test/langtools/tools/javac/generics/GenericThrowable.out diff --git a/langtools/test/tools/javac/generics/GetClass.java b/test/langtools/tools/javac/generics/GetClass.java similarity index 100% rename from langtools/test/tools/javac/generics/GetClass.java rename to test/langtools/tools/javac/generics/GetClass.java diff --git a/langtools/test/tools/javac/generics/GetClass.out b/test/langtools/tools/javac/generics/GetClass.out similarity index 100% rename from langtools/test/tools/javac/generics/GetClass.out rename to test/langtools/tools/javac/generics/GetClass.out diff --git a/langtools/test/tools/javac/generics/GetClass2.java b/test/langtools/tools/javac/generics/GetClass2.java similarity index 100% rename from langtools/test/tools/javac/generics/GetClass2.java rename to test/langtools/tools/javac/generics/GetClass2.java diff --git a/langtools/test/tools/javac/generics/InheritanceConflict.java b/test/langtools/tools/javac/generics/InheritanceConflict.java similarity index 100% rename from langtools/test/tools/javac/generics/InheritanceConflict.java rename to test/langtools/tools/javac/generics/InheritanceConflict.java diff --git a/langtools/test/tools/javac/generics/InheritanceConflict.out b/test/langtools/tools/javac/generics/InheritanceConflict.out similarity index 100% rename from langtools/test/tools/javac/generics/InheritanceConflict.out rename to test/langtools/tools/javac/generics/InheritanceConflict.out diff --git a/langtools/test/tools/javac/generics/InheritanceConflict2.java b/test/langtools/tools/javac/generics/InheritanceConflict2.java similarity index 100% rename from langtools/test/tools/javac/generics/InheritanceConflict2.java rename to test/langtools/tools/javac/generics/InheritanceConflict2.java diff --git a/langtools/test/tools/javac/generics/InheritanceConflict3.java b/test/langtools/tools/javac/generics/InheritanceConflict3.java similarity index 100% rename from langtools/test/tools/javac/generics/InheritanceConflict3.java rename to test/langtools/tools/javac/generics/InheritanceConflict3.java diff --git a/langtools/test/tools/javac/generics/InheritanceConflict3.out b/test/langtools/tools/javac/generics/InheritanceConflict3.out similarity index 100% rename from langtools/test/tools/javac/generics/InheritanceConflict3.out rename to test/langtools/tools/javac/generics/InheritanceConflict3.out diff --git a/langtools/test/tools/javac/generics/InnerInterface1.java b/test/langtools/tools/javac/generics/InnerInterface1.java similarity index 100% rename from langtools/test/tools/javac/generics/InnerInterface1.java rename to test/langtools/tools/javac/generics/InnerInterface1.java diff --git a/langtools/test/tools/javac/generics/InnerInterface2.java b/test/langtools/tools/javac/generics/InnerInterface2.java similarity index 100% rename from langtools/test/tools/javac/generics/InnerInterface2.java rename to test/langtools/tools/javac/generics/InnerInterface2.java diff --git a/langtools/test/tools/javac/generics/InstanceOf1.java b/test/langtools/tools/javac/generics/InstanceOf1.java similarity index 100% rename from langtools/test/tools/javac/generics/InstanceOf1.java rename to test/langtools/tools/javac/generics/InstanceOf1.java diff --git a/langtools/test/tools/javac/generics/InstanceOf2.java b/test/langtools/tools/javac/generics/InstanceOf2.java similarity index 100% rename from langtools/test/tools/javac/generics/InstanceOf2.java rename to test/langtools/tools/javac/generics/InstanceOf2.java diff --git a/langtools/test/tools/javac/generics/InstanceOf2.out b/test/langtools/tools/javac/generics/InstanceOf2.out similarity index 100% rename from langtools/test/tools/javac/generics/InstanceOf2.out rename to test/langtools/tools/javac/generics/InstanceOf2.out diff --git a/langtools/test/tools/javac/generics/InstanceOf3.java b/test/langtools/tools/javac/generics/InstanceOf3.java similarity index 100% rename from langtools/test/tools/javac/generics/InstanceOf3.java rename to test/langtools/tools/javac/generics/InstanceOf3.java diff --git a/langtools/test/tools/javac/generics/InstanceOf3.out b/test/langtools/tools/javac/generics/InstanceOf3.out similarity index 100% rename from langtools/test/tools/javac/generics/InstanceOf3.out rename to test/langtools/tools/javac/generics/InstanceOf3.out diff --git a/langtools/test/tools/javac/generics/LoadOrder.java b/test/langtools/tools/javac/generics/LoadOrder.java similarity index 100% rename from langtools/test/tools/javac/generics/LoadOrder.java rename to test/langtools/tools/javac/generics/LoadOrder.java diff --git a/langtools/test/tools/javac/generics/LowerBoundBottomTypeTest.java b/test/langtools/tools/javac/generics/LowerBoundBottomTypeTest.java similarity index 100% rename from langtools/test/tools/javac/generics/LowerBoundBottomTypeTest.java rename to test/langtools/tools/javac/generics/LowerBoundBottomTypeTest.java diff --git a/langtools/test/tools/javac/generics/MissingBridge.java b/test/langtools/tools/javac/generics/MissingBridge.java similarity index 100% rename from langtools/test/tools/javac/generics/MissingBridge.java rename to test/langtools/tools/javac/generics/MissingBridge.java diff --git a/langtools/test/tools/javac/generics/MissingCast.java b/test/langtools/tools/javac/generics/MissingCast.java similarity index 100% rename from langtools/test/tools/javac/generics/MissingCast.java rename to test/langtools/tools/javac/generics/MissingCast.java diff --git a/langtools/test/tools/javac/generics/MissingCast2.java b/test/langtools/tools/javac/generics/MissingCast2.java similarity index 100% rename from langtools/test/tools/javac/generics/MissingCast2.java rename to test/langtools/tools/javac/generics/MissingCast2.java diff --git a/langtools/test/tools/javac/generics/Multibound1.java b/test/langtools/tools/javac/generics/Multibound1.java similarity index 100% rename from langtools/test/tools/javac/generics/Multibound1.java rename to test/langtools/tools/javac/generics/Multibound1.java diff --git a/langtools/test/tools/javac/generics/Multibound1.out b/test/langtools/tools/javac/generics/Multibound1.out similarity index 100% rename from langtools/test/tools/javac/generics/Multibound1.out rename to test/langtools/tools/javac/generics/Multibound1.out diff --git a/langtools/test/tools/javac/generics/MultipleInheritance.java b/test/langtools/tools/javac/generics/MultipleInheritance.java similarity index 100% rename from langtools/test/tools/javac/generics/MultipleInheritance.java rename to test/langtools/tools/javac/generics/MultipleInheritance.java diff --git a/langtools/test/tools/javac/generics/NameOrder.java b/test/langtools/tools/javac/generics/NameOrder.java similarity index 100% rename from langtools/test/tools/javac/generics/NameOrder.java rename to test/langtools/tools/javac/generics/NameOrder.java diff --git a/langtools/test/tools/javac/generics/Nonlinear.java b/test/langtools/tools/javac/generics/Nonlinear.java similarity index 100% rename from langtools/test/tools/javac/generics/Nonlinear.java rename to test/langtools/tools/javac/generics/Nonlinear.java diff --git a/langtools/test/tools/javac/generics/Nonlinear.out b/test/langtools/tools/javac/generics/Nonlinear.out similarity index 100% rename from langtools/test/tools/javac/generics/Nonlinear.out rename to test/langtools/tools/javac/generics/Nonlinear.out diff --git a/langtools/test/tools/javac/generics/ParametricException.java b/test/langtools/tools/javac/generics/ParametricException.java similarity index 100% rename from langtools/test/tools/javac/generics/ParametricException.java rename to test/langtools/tools/javac/generics/ParametricException.java diff --git a/langtools/test/tools/javac/generics/ParenVerify.java b/test/langtools/tools/javac/generics/ParenVerify.java similarity index 100% rename from langtools/test/tools/javac/generics/ParenVerify.java rename to test/langtools/tools/javac/generics/ParenVerify.java diff --git a/langtools/test/tools/javac/generics/PermuteBound.java b/test/langtools/tools/javac/generics/PermuteBound.java similarity index 100% rename from langtools/test/tools/javac/generics/PermuteBound.java rename to test/langtools/tools/javac/generics/PermuteBound.java diff --git a/langtools/test/tools/javac/generics/PrimitiveClass.java b/test/langtools/tools/javac/generics/PrimitiveClass.java similarity index 100% rename from langtools/test/tools/javac/generics/PrimitiveClass.java rename to test/langtools/tools/javac/generics/PrimitiveClass.java diff --git a/langtools/test/tools/javac/generics/PrimitiveVariant.java b/test/langtools/tools/javac/generics/PrimitiveVariant.java similarity index 100% rename from langtools/test/tools/javac/generics/PrimitiveVariant.java rename to test/langtools/tools/javac/generics/PrimitiveVariant.java diff --git a/langtools/test/tools/javac/generics/PrimitiveVariant.out b/test/langtools/tools/javac/generics/PrimitiveVariant.out similarity index 100% rename from langtools/test/tools/javac/generics/PrimitiveVariant.out rename to test/langtools/tools/javac/generics/PrimitiveVariant.out diff --git a/langtools/test/tools/javac/generics/RawClient.java b/test/langtools/tools/javac/generics/RawClient.java similarity index 100% rename from langtools/test/tools/javac/generics/RawClient.java rename to test/langtools/tools/javac/generics/RawClient.java diff --git a/langtools/test/tools/javac/generics/RefEqual.java b/test/langtools/tools/javac/generics/RefEqual.java similarity index 100% rename from langtools/test/tools/javac/generics/RefEqual.java rename to test/langtools/tools/javac/generics/RefEqual.java diff --git a/langtools/test/tools/javac/generics/RefEqual.out b/test/langtools/tools/javac/generics/RefEqual.out similarity index 100% rename from langtools/test/tools/javac/generics/RefEqual.out rename to test/langtools/tools/javac/generics/RefEqual.out diff --git a/langtools/test/tools/javac/generics/RelaxedArrays.java b/test/langtools/tools/javac/generics/RelaxedArrays.java similarity index 100% rename from langtools/test/tools/javac/generics/RelaxedArrays.java rename to test/langtools/tools/javac/generics/RelaxedArrays.java diff --git a/langtools/test/tools/javac/generics/ReverseOrder.java b/test/langtools/tools/javac/generics/ReverseOrder.java similarity index 100% rename from langtools/test/tools/javac/generics/ReverseOrder.java rename to test/langtools/tools/javac/generics/ReverseOrder.java diff --git a/langtools/test/tools/javac/generics/SelfImplement.java b/test/langtools/tools/javac/generics/SelfImplement.java similarity index 100% rename from langtools/test/tools/javac/generics/SelfImplement.java rename to test/langtools/tools/javac/generics/SelfImplement.java diff --git a/langtools/test/tools/javac/generics/SelfImplement.out b/test/langtools/tools/javac/generics/SelfImplement.out similarity index 100% rename from langtools/test/tools/javac/generics/SelfImplement.out rename to test/langtools/tools/javac/generics/SelfImplement.out diff --git a/langtools/test/tools/javac/generics/SilentUnchecked.java b/test/langtools/tools/javac/generics/SilentUnchecked.java similarity index 100% rename from langtools/test/tools/javac/generics/SilentUnchecked.java rename to test/langtools/tools/javac/generics/SilentUnchecked.java diff --git a/langtools/test/tools/javac/generics/SuperTypeargs.java b/test/langtools/tools/javac/generics/SuperTypeargs.java similarity index 100% rename from langtools/test/tools/javac/generics/SuperTypeargs.java rename to test/langtools/tools/javac/generics/SuperTypeargs.java diff --git a/langtools/test/tools/javac/generics/T4661029.java b/test/langtools/tools/javac/generics/T4661029.java similarity index 100% rename from langtools/test/tools/javac/generics/T4661029.java rename to test/langtools/tools/javac/generics/T4661029.java diff --git a/langtools/test/tools/javac/generics/T4683314.java b/test/langtools/tools/javac/generics/T4683314.java similarity index 100% rename from langtools/test/tools/javac/generics/T4683314.java rename to test/langtools/tools/javac/generics/T4683314.java diff --git a/langtools/test/tools/javac/generics/T4684378.java b/test/langtools/tools/javac/generics/T4684378.java similarity index 100% rename from langtools/test/tools/javac/generics/T4684378.java rename to test/langtools/tools/javac/generics/T4684378.java diff --git a/langtools/test/tools/javac/generics/T4695348.java b/test/langtools/tools/javac/generics/T4695348.java similarity index 100% rename from langtools/test/tools/javac/generics/T4695348.java rename to test/langtools/tools/javac/generics/T4695348.java diff --git a/langtools/test/tools/javac/generics/T4695348.out b/test/langtools/tools/javac/generics/T4695348.out similarity index 100% rename from langtools/test/tools/javac/generics/T4695348.out rename to test/langtools/tools/javac/generics/T4695348.out diff --git a/langtools/test/tools/javac/generics/T4695415.java b/test/langtools/tools/javac/generics/T4695415.java similarity index 100% rename from langtools/test/tools/javac/generics/T4695415.java rename to test/langtools/tools/javac/generics/T4695415.java diff --git a/langtools/test/tools/javac/generics/T4695847.java b/test/langtools/tools/javac/generics/T4695847.java similarity index 100% rename from langtools/test/tools/javac/generics/T4695847.java rename to test/langtools/tools/javac/generics/T4695847.java diff --git a/langtools/test/tools/javac/generics/T4711570.java b/test/langtools/tools/javac/generics/T4711570.java similarity index 100% rename from langtools/test/tools/javac/generics/T4711570.java rename to test/langtools/tools/javac/generics/T4711570.java diff --git a/langtools/test/tools/javac/generics/T4711572.java b/test/langtools/tools/javac/generics/T4711572.java similarity index 100% rename from langtools/test/tools/javac/generics/T4711572.java rename to test/langtools/tools/javac/generics/T4711572.java diff --git a/langtools/test/tools/javac/generics/T4711694.java b/test/langtools/tools/javac/generics/T4711694.java similarity index 100% rename from langtools/test/tools/javac/generics/T4711694.java rename to test/langtools/tools/javac/generics/T4711694.java diff --git a/langtools/test/tools/javac/generics/T4738171.java b/test/langtools/tools/javac/generics/T4738171.java similarity index 100% rename from langtools/test/tools/javac/generics/T4738171.java rename to test/langtools/tools/javac/generics/T4738171.java diff --git a/langtools/test/tools/javac/generics/T4738171.out b/test/langtools/tools/javac/generics/T4738171.out similarity index 100% rename from langtools/test/tools/javac/generics/T4738171.out rename to test/langtools/tools/javac/generics/T4738171.out diff --git a/langtools/test/tools/javac/generics/T4739399.java b/test/langtools/tools/javac/generics/T4739399.java similarity index 100% rename from langtools/test/tools/javac/generics/T4739399.java rename to test/langtools/tools/javac/generics/T4739399.java diff --git a/langtools/test/tools/javac/generics/T4739399.out b/test/langtools/tools/javac/generics/T4739399.out similarity index 100% rename from langtools/test/tools/javac/generics/T4739399.out rename to test/langtools/tools/javac/generics/T4739399.out diff --git a/langtools/test/tools/javac/generics/T4757416.java b/test/langtools/tools/javac/generics/T4757416.java similarity index 100% rename from langtools/test/tools/javac/generics/T4757416.java rename to test/langtools/tools/javac/generics/T4757416.java diff --git a/langtools/test/tools/javac/generics/T4757416.out b/test/langtools/tools/javac/generics/T4757416.out similarity index 100% rename from langtools/test/tools/javac/generics/T4757416.out rename to test/langtools/tools/javac/generics/T4757416.out diff --git a/langtools/test/tools/javac/generics/T4784207a.java b/test/langtools/tools/javac/generics/T4784207a.java similarity index 100% rename from langtools/test/tools/javac/generics/T4784207a.java rename to test/langtools/tools/javac/generics/T4784207a.java diff --git a/langtools/test/tools/javac/generics/T4784207b.java b/test/langtools/tools/javac/generics/T4784207b.java similarity index 100% rename from langtools/test/tools/javac/generics/T4784207b.java rename to test/langtools/tools/javac/generics/T4784207b.java diff --git a/langtools/test/tools/javac/generics/T4784219.java b/test/langtools/tools/javac/generics/T4784219.java similarity index 100% rename from langtools/test/tools/javac/generics/T4784219.java rename to test/langtools/tools/javac/generics/T4784219.java diff --git a/langtools/test/tools/javac/generics/T5011073.java b/test/langtools/tools/javac/generics/T5011073.java similarity index 100% rename from langtools/test/tools/javac/generics/T5011073.java rename to test/langtools/tools/javac/generics/T5011073.java diff --git a/langtools/test/tools/javac/generics/T5011073.out b/test/langtools/tools/javac/generics/T5011073.out similarity index 100% rename from langtools/test/tools/javac/generics/T5011073.out rename to test/langtools/tools/javac/generics/T5011073.out diff --git a/langtools/test/tools/javac/generics/T5094318.java b/test/langtools/tools/javac/generics/T5094318.java similarity index 100% rename from langtools/test/tools/javac/generics/T5094318.java rename to test/langtools/tools/javac/generics/T5094318.java diff --git a/langtools/test/tools/javac/generics/T6391995.java b/test/langtools/tools/javac/generics/T6391995.java similarity index 100% rename from langtools/test/tools/javac/generics/T6391995.java rename to test/langtools/tools/javac/generics/T6391995.java diff --git a/langtools/test/tools/javac/generics/T6481655.java b/test/langtools/tools/javac/generics/T6481655.java similarity index 100% rename from langtools/test/tools/javac/generics/T6481655.java rename to test/langtools/tools/javac/generics/T6481655.java diff --git a/langtools/test/tools/javac/generics/T6507024.java b/test/langtools/tools/javac/generics/T6507024.java similarity index 100% rename from langtools/test/tools/javac/generics/T6507024.java rename to test/langtools/tools/javac/generics/T6507024.java diff --git a/langtools/test/tools/javac/generics/T6557954.java b/test/langtools/tools/javac/generics/T6557954.java similarity index 100% rename from langtools/test/tools/javac/generics/T6557954.java rename to test/langtools/tools/javac/generics/T6557954.java diff --git a/langtools/test/tools/javac/generics/T6657499.java b/test/langtools/tools/javac/generics/T6657499.java similarity index 100% rename from langtools/test/tools/javac/generics/T6657499.java rename to test/langtools/tools/javac/generics/T6657499.java diff --git a/langtools/test/tools/javac/generics/T6660289.java b/test/langtools/tools/javac/generics/T6660289.java similarity index 100% rename from langtools/test/tools/javac/generics/T6660289.java rename to test/langtools/tools/javac/generics/T6660289.java diff --git a/langtools/test/tools/javac/generics/T6751514.java b/test/langtools/tools/javac/generics/T6751514.java similarity index 100% rename from langtools/test/tools/javac/generics/T6751514.java rename to test/langtools/tools/javac/generics/T6751514.java diff --git a/langtools/test/tools/javac/generics/T6869075.java b/test/langtools/tools/javac/generics/T6869075.java similarity index 100% rename from langtools/test/tools/javac/generics/T6869075.java rename to test/langtools/tools/javac/generics/T6869075.java diff --git a/langtools/test/tools/javac/generics/TyparamLit.java b/test/langtools/tools/javac/generics/TyparamLit.java similarity index 100% rename from langtools/test/tools/javac/generics/TyparamLit.java rename to test/langtools/tools/javac/generics/TyparamLit.java diff --git a/langtools/test/tools/javac/generics/TyparamLit.out b/test/langtools/tools/javac/generics/TyparamLit.out similarity index 100% rename from langtools/test/tools/javac/generics/TyparamLit.out rename to test/langtools/tools/javac/generics/TyparamLit.out diff --git a/langtools/test/tools/javac/generics/TyparamStaticScope.java b/test/langtools/tools/javac/generics/TyparamStaticScope.java similarity index 100% rename from langtools/test/tools/javac/generics/TyparamStaticScope.java rename to test/langtools/tools/javac/generics/TyparamStaticScope.java diff --git a/langtools/test/tools/javac/generics/TyparamStaticScope2.java b/test/langtools/tools/javac/generics/TyparamStaticScope2.java similarity index 100% rename from langtools/test/tools/javac/generics/TyparamStaticScope2.java rename to test/langtools/tools/javac/generics/TyparamStaticScope2.java diff --git a/langtools/test/tools/javac/generics/TyparamStaticScope2.out b/test/langtools/tools/javac/generics/TyparamStaticScope2.out similarity index 100% rename from langtools/test/tools/javac/generics/TyparamStaticScope2.out rename to test/langtools/tools/javac/generics/TyparamStaticScope2.out diff --git a/langtools/test/tools/javac/generics/UncheckedArray.java b/test/langtools/tools/javac/generics/UncheckedArray.java similarity index 100% rename from langtools/test/tools/javac/generics/UncheckedArray.java rename to test/langtools/tools/javac/generics/UncheckedArray.java diff --git a/langtools/test/tools/javac/generics/UncheckedArray.out b/test/langtools/tools/javac/generics/UncheckedArray.out similarity index 100% rename from langtools/test/tools/javac/generics/UncheckedArray.out rename to test/langtools/tools/javac/generics/UncheckedArray.out diff --git a/langtools/test/tools/javac/generics/UncheckedConstructor.java b/test/langtools/tools/javac/generics/UncheckedConstructor.java similarity index 100% rename from langtools/test/tools/javac/generics/UncheckedConstructor.java rename to test/langtools/tools/javac/generics/UncheckedConstructor.java diff --git a/langtools/test/tools/javac/generics/UncheckedConstructor.out b/test/langtools/tools/javac/generics/UncheckedConstructor.out similarity index 100% rename from langtools/test/tools/javac/generics/UncheckedConstructor.out rename to test/langtools/tools/javac/generics/UncheckedConstructor.out diff --git a/langtools/test/tools/javac/generics/UncheckedCovariance.java b/test/langtools/tools/javac/generics/UncheckedCovariance.java similarity index 100% rename from langtools/test/tools/javac/generics/UncheckedCovariance.java rename to test/langtools/tools/javac/generics/UncheckedCovariance.java diff --git a/langtools/test/tools/javac/generics/UncheckedCovariance.out b/test/langtools/tools/javac/generics/UncheckedCovariance.out similarity index 100% rename from langtools/test/tools/javac/generics/UncheckedCovariance.out rename to test/langtools/tools/javac/generics/UncheckedCovariance.out diff --git a/langtools/test/tools/javac/generics/UnsoundInference.java b/test/langtools/tools/javac/generics/UnsoundInference.java similarity index 100% rename from langtools/test/tools/javac/generics/UnsoundInference.java rename to test/langtools/tools/javac/generics/UnsoundInference.java diff --git a/langtools/test/tools/javac/generics/UnsoundInference.out b/test/langtools/tools/javac/generics/UnsoundInference.out similarity index 100% rename from langtools/test/tools/javac/generics/UnsoundInference.out rename to test/langtools/tools/javac/generics/UnsoundInference.out diff --git a/langtools/test/tools/javac/generics/Varargs.java b/test/langtools/tools/javac/generics/Varargs.java similarity index 100% rename from langtools/test/tools/javac/generics/Varargs.java rename to test/langtools/tools/javac/generics/Varargs.java diff --git a/langtools/test/tools/javac/generics/Varargs2.java b/test/langtools/tools/javac/generics/Varargs2.java similarity index 100% rename from langtools/test/tools/javac/generics/Varargs2.java rename to test/langtools/tools/javac/generics/Varargs2.java diff --git a/langtools/test/tools/javac/generics/WrongNew.java b/test/langtools/tools/javac/generics/WrongNew.java similarity index 100% rename from langtools/test/tools/javac/generics/WrongNew.java rename to test/langtools/tools/javac/generics/WrongNew.java diff --git a/langtools/test/tools/javac/generics/abstract/T4717181c.java b/test/langtools/tools/javac/generics/abstract/T4717181c.java similarity index 100% rename from langtools/test/tools/javac/generics/abstract/T4717181c.java rename to test/langtools/tools/javac/generics/abstract/T4717181c.java diff --git a/langtools/test/tools/javac/generics/abstract/T4717181c.out b/test/langtools/tools/javac/generics/abstract/T4717181c.out similarity index 100% rename from langtools/test/tools/javac/generics/abstract/T4717181c.out rename to test/langtools/tools/javac/generics/abstract/T4717181c.out diff --git a/langtools/test/tools/javac/generics/bridge1/A.java b/test/langtools/tools/javac/generics/bridge1/A.java similarity index 100% rename from langtools/test/tools/javac/generics/bridge1/A.java rename to test/langtools/tools/javac/generics/bridge1/A.java diff --git a/langtools/test/tools/javac/generics/bridge1/C.java b/test/langtools/tools/javac/generics/bridge1/C.java similarity index 100% rename from langtools/test/tools/javac/generics/bridge1/C.java rename to test/langtools/tools/javac/generics/bridge1/C.java diff --git a/langtools/test/tools/javac/generics/bridge1/D.java b/test/langtools/tools/javac/generics/bridge1/D.java similarity index 100% rename from langtools/test/tools/javac/generics/bridge1/D.java rename to test/langtools/tools/javac/generics/bridge1/D.java diff --git a/langtools/test/tools/javac/generics/bridge1/E.java b/test/langtools/tools/javac/generics/bridge1/E.java similarity index 100% rename from langtools/test/tools/javac/generics/bridge1/E.java rename to test/langtools/tools/javac/generics/bridge1/E.java diff --git a/langtools/test/tools/javac/generics/bridges/Bridge.java b/test/langtools/tools/javac/generics/bridges/Bridge.java similarity index 100% rename from langtools/test/tools/javac/generics/bridges/Bridge.java rename to test/langtools/tools/javac/generics/bridges/Bridge.java diff --git a/langtools/test/tools/javac/generics/bridges/BridgeHarness.java b/test/langtools/tools/javac/generics/bridges/BridgeHarness.java similarity index 100% rename from langtools/test/tools/javac/generics/bridges/BridgeHarness.java rename to test/langtools/tools/javac/generics/bridges/BridgeHarness.java diff --git a/langtools/test/tools/javac/generics/bridges/Bridges.java b/test/langtools/tools/javac/generics/bridges/Bridges.java similarity index 100% rename from langtools/test/tools/javac/generics/bridges/Bridges.java rename to test/langtools/tools/javac/generics/bridges/Bridges.java diff --git a/langtools/test/tools/javac/generics/bridges/ReorderedBoundsTest.java b/test/langtools/tools/javac/generics/bridges/ReorderedBoundsTest.java similarity index 100% rename from langtools/test/tools/javac/generics/bridges/ReorderedBoundsTest.java rename to test/langtools/tools/javac/generics/bridges/ReorderedBoundsTest.java diff --git a/langtools/test/tools/javac/generics/bridges/tests/TestBridgeWithDefault.java b/test/langtools/tools/javac/generics/bridges/tests/TestBridgeWithDefault.java similarity index 100% rename from langtools/test/tools/javac/generics/bridges/tests/TestBridgeWithDefault.java rename to test/langtools/tools/javac/generics/bridges/tests/TestBridgeWithDefault.java diff --git a/langtools/test/tools/javac/generics/bridges/tests/TestClassAndInterfaceBridgeIdentical01.java b/test/langtools/tools/javac/generics/bridges/tests/TestClassAndInterfaceBridgeIdentical01.java similarity index 100% rename from langtools/test/tools/javac/generics/bridges/tests/TestClassAndInterfaceBridgeIdentical01.java rename to test/langtools/tools/javac/generics/bridges/tests/TestClassAndInterfaceBridgeIdentical01.java diff --git a/langtools/test/tools/javac/generics/bridges/tests/TestClassAndInterfaceBridgeIdentical02.java b/test/langtools/tools/javac/generics/bridges/tests/TestClassAndInterfaceBridgeIdentical02.java similarity index 100% rename from langtools/test/tools/javac/generics/bridges/tests/TestClassAndInterfaceBridgeIdentical02.java rename to test/langtools/tools/javac/generics/bridges/tests/TestClassAndInterfaceBridgeIdentical02.java diff --git a/langtools/test/tools/javac/generics/bridges/tests/TestNoBridgeInSiblingsSuper.java b/test/langtools/tools/javac/generics/bridges/tests/TestNoBridgeInSiblingsSuper.java similarity index 100% rename from langtools/test/tools/javac/generics/bridges/tests/TestNoBridgeInSiblingsSuper.java rename to test/langtools/tools/javac/generics/bridges/tests/TestNoBridgeInSiblingsSuper.java diff --git a/langtools/test/tools/javac/generics/bridges/tests/TestNoDuplicateBridges01.java b/test/langtools/tools/javac/generics/bridges/tests/TestNoDuplicateBridges01.java similarity index 100% rename from langtools/test/tools/javac/generics/bridges/tests/TestNoDuplicateBridges01.java rename to test/langtools/tools/javac/generics/bridges/tests/TestNoDuplicateBridges01.java diff --git a/langtools/test/tools/javac/generics/bridges/tests/TestNoDuplicateBridges02.java b/test/langtools/tools/javac/generics/bridges/tests/TestNoDuplicateBridges02.java similarity index 100% rename from langtools/test/tools/javac/generics/bridges/tests/TestNoDuplicateBridges02.java rename to test/langtools/tools/javac/generics/bridges/tests/TestNoDuplicateBridges02.java diff --git a/langtools/test/tools/javac/generics/classreader/HArrayMethod.java b/test/langtools/tools/javac/generics/classreader/HArrayMethod.java similarity index 100% rename from langtools/test/tools/javac/generics/classreader/HArrayMethod.java rename to test/langtools/tools/javac/generics/classreader/HArrayMethod.java diff --git a/langtools/test/tools/javac/generics/classreader/HMember.java b/test/langtools/tools/javac/generics/classreader/HMember.java similarity index 100% rename from langtools/test/tools/javac/generics/classreader/HMember.java rename to test/langtools/tools/javac/generics/classreader/HMember.java diff --git a/langtools/test/tools/javac/generics/classreader/HMethod.java b/test/langtools/tools/javac/generics/classreader/HMethod.java similarity index 100% rename from langtools/test/tools/javac/generics/classreader/HMethod.java rename to test/langtools/tools/javac/generics/classreader/HMethod.java diff --git a/langtools/test/tools/javac/generics/classreader/HMethodImpl.java b/test/langtools/tools/javac/generics/classreader/HMethodImpl.java similarity index 100% rename from langtools/test/tools/javac/generics/classreader/HMethodImpl.java rename to test/langtools/tools/javac/generics/classreader/HMethodImpl.java diff --git a/langtools/test/tools/javac/generics/diamond/6939780/T6939780.java b/test/langtools/tools/javac/generics/diamond/6939780/T6939780.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/6939780/T6939780.java rename to test/langtools/tools/javac/generics/diamond/6939780/T6939780.java diff --git a/langtools/test/tools/javac/generics/diamond/6939780/T6939780_7.out b/test/langtools/tools/javac/generics/diamond/6939780/T6939780_7.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/6939780/T6939780_7.out rename to test/langtools/tools/javac/generics/diamond/6939780/T6939780_7.out diff --git a/langtools/test/tools/javac/generics/diamond/6939780/T6939780_8.out b/test/langtools/tools/javac/generics/diamond/6939780/T6939780_8.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/6939780/T6939780_8.out rename to test/langtools/tools/javac/generics/diamond/6939780/T6939780_8.out diff --git a/langtools/test/tools/javac/generics/diamond/6939780/T6939780_9.out b/test/langtools/tools/javac/generics/diamond/6939780/T6939780_9.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/6939780/T6939780_9.out rename to test/langtools/tools/javac/generics/diamond/6939780/T6939780_9.out diff --git a/langtools/test/tools/javac/generics/diamond/6996914/T6996914a.java b/test/langtools/tools/javac/generics/diamond/6996914/T6996914a.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/6996914/T6996914a.java rename to test/langtools/tools/javac/generics/diamond/6996914/T6996914a.java diff --git a/langtools/test/tools/javac/generics/diamond/6996914/T6996914b.java b/test/langtools/tools/javac/generics/diamond/6996914/T6996914b.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/6996914/T6996914b.java rename to test/langtools/tools/javac/generics/diamond/6996914/T6996914b.java diff --git a/langtools/test/tools/javac/generics/diamond/7002837/T7002837.java b/test/langtools/tools/javac/generics/diamond/7002837/T7002837.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/7002837/T7002837.java rename to test/langtools/tools/javac/generics/diamond/7002837/T7002837.java diff --git a/langtools/test/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java b/test/langtools/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java rename to test/langtools/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java diff --git a/langtools/test/tools/javac/generics/diamond/7030687/ParserTest.java b/test/langtools/tools/javac/generics/diamond/7030687/ParserTest.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/7030687/ParserTest.java rename to test/langtools/tools/javac/generics/diamond/7030687/ParserTest.java diff --git a/langtools/test/tools/javac/generics/diamond/7030687/T7030687.java b/test/langtools/tools/javac/generics/diamond/7030687/T7030687.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/7030687/T7030687.java rename to test/langtools/tools/javac/generics/diamond/7030687/T7030687.java diff --git a/langtools/test/tools/javac/generics/diamond/7030687/T7030687.out b/test/langtools/tools/javac/generics/diamond/7030687/T7030687.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/7030687/T7030687.out rename to test/langtools/tools/javac/generics/diamond/7030687/T7030687.out diff --git a/langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java b/test/langtools/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java rename to test/langtools/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java diff --git a/langtools/test/tools/javac/generics/diamond/7057297/T7057297.java b/test/langtools/tools/javac/generics/diamond/7057297/T7057297.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/7057297/T7057297.java rename to test/langtools/tools/javac/generics/diamond/7057297/T7057297.java diff --git a/langtools/test/tools/javac/generics/diamond/7057297/T7057297.out b/test/langtools/tools/javac/generics/diamond/7057297/T7057297.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/7057297/T7057297.out rename to test/langtools/tools/javac/generics/diamond/7057297/T7057297.out diff --git a/langtools/test/tools/javac/generics/diamond/7188968/T7188968.java b/test/langtools/tools/javac/generics/diamond/7188968/T7188968.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/7188968/T7188968.java rename to test/langtools/tools/javac/generics/diamond/7188968/T7188968.java diff --git a/langtools/test/tools/javac/generics/diamond/7188968/T7188968.out b/test/langtools/tools/javac/generics/diamond/7188968/T7188968.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/7188968/T7188968.out rename to test/langtools/tools/javac/generics/diamond/7188968/T7188968.out diff --git a/langtools/test/tools/javac/generics/diamond/8065986/T8065986a.java b/test/langtools/tools/javac/generics/diamond/8065986/T8065986a.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/8065986/T8065986a.java rename to test/langtools/tools/javac/generics/diamond/8065986/T8065986a.java diff --git a/langtools/test/tools/javac/generics/diamond/8065986/T8065986a.out b/test/langtools/tools/javac/generics/diamond/8065986/T8065986a.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/8065986/T8065986a.out rename to test/langtools/tools/javac/generics/diamond/8065986/T8065986a.out diff --git a/langtools/test/tools/javac/generics/diamond/8065986/T8065986b.java b/test/langtools/tools/javac/generics/diamond/8065986/T8065986b.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/8065986/T8065986b.java rename to test/langtools/tools/javac/generics/diamond/8065986/T8065986b.java diff --git a/langtools/test/tools/javac/generics/diamond/8065986/T8065986b.out b/test/langtools/tools/javac/generics/diamond/8065986/T8065986b.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/8065986/T8065986b.out rename to test/langtools/tools/javac/generics/diamond/8065986/T8065986b.out diff --git a/langtools/test/tools/javac/generics/diamond/MultipleInferenceHooksTest.java b/test/langtools/tools/javac/generics/diamond/MultipleInferenceHooksTest.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/MultipleInferenceHooksTest.java rename to test/langtools/tools/javac/generics/diamond/MultipleInferenceHooksTest.java diff --git a/langtools/test/tools/javac/generics/diamond/T6951833.java b/test/langtools/tools/javac/generics/diamond/T6951833.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/T6951833.java rename to test/langtools/tools/javac/generics/diamond/T6951833.java diff --git a/langtools/test/tools/javac/generics/diamond/T8041713/DiamondPlusUnexistingMethodRefCrashTest.java b/test/langtools/tools/javac/generics/diamond/T8041713/DiamondPlusUnexistingMethodRefCrashTest.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/T8041713/DiamondPlusUnexistingMethodRefCrashTest.java rename to test/langtools/tools/javac/generics/diamond/T8041713/DiamondPlusUnexistingMethodRefCrashTest.java diff --git a/langtools/test/tools/javac/generics/diamond/T8041713/DiamondPlusUnexistingMethodRefCrashTest.out b/test/langtools/tools/javac/generics/diamond/T8041713/DiamondPlusUnexistingMethodRefCrashTest.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/T8041713/DiamondPlusUnexistingMethodRefCrashTest.out rename to test/langtools/tools/javac/generics/diamond/T8041713/DiamondPlusUnexistingMethodRefCrashTest.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg01.java b/test/langtools/tools/javac/generics/diamond/neg/Neg01.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg01.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg01.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg01.out b/test/langtools/tools/javac/generics/diamond/neg/Neg01.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg01.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg01.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg02.java b/test/langtools/tools/javac/generics/diamond/neg/Neg02.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg02.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg02.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg02.out b/test/langtools/tools/javac/generics/diamond/neg/Neg02.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg02.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg02.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg03.java b/test/langtools/tools/javac/generics/diamond/neg/Neg03.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg03.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg03.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg03.out b/test/langtools/tools/javac/generics/diamond/neg/Neg03.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg03.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg03.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg04.java b/test/langtools/tools/javac/generics/diamond/neg/Neg04.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg04.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg04.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg04.out b/test/langtools/tools/javac/generics/diamond/neg/Neg04.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg04.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg04.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg05.java b/test/langtools/tools/javac/generics/diamond/neg/Neg05.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg05.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg05.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg05.out b/test/langtools/tools/javac/generics/diamond/neg/Neg05.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg05.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg05.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg06.java b/test/langtools/tools/javac/generics/diamond/neg/Neg06.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg06.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg06.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg06.out b/test/langtools/tools/javac/generics/diamond/neg/Neg06.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg06.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg06.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg07.java b/test/langtools/tools/javac/generics/diamond/neg/Neg07.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg07.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg07.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg07.out b/test/langtools/tools/javac/generics/diamond/neg/Neg07.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg07.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg07.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg08.java b/test/langtools/tools/javac/generics/diamond/neg/Neg08.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg08.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg08.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg08.out b/test/langtools/tools/javac/generics/diamond/neg/Neg08.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg08.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg08.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg09a.java b/test/langtools/tools/javac/generics/diamond/neg/Neg09a.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg09a.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg09a.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg09a.out b/test/langtools/tools/javac/generics/diamond/neg/Neg09a.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg09a.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg09a.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg09b.java b/test/langtools/tools/javac/generics/diamond/neg/Neg09b.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg09b.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg09b.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg09b.out b/test/langtools/tools/javac/generics/diamond/neg/Neg09b.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg09b.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg09b.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg09c.java b/test/langtools/tools/javac/generics/diamond/neg/Neg09c.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg09c.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg09c.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg09c.out b/test/langtools/tools/javac/generics/diamond/neg/Neg09c.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg09c.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg09c.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg09d.java b/test/langtools/tools/javac/generics/diamond/neg/Neg09d.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg09d.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg09d.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg09d.out b/test/langtools/tools/javac/generics/diamond/neg/Neg09d.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg09d.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg09d.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg10.java b/test/langtools/tools/javac/generics/diamond/neg/Neg10.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg10.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg10.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg10.out b/test/langtools/tools/javac/generics/diamond/neg/Neg10.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg10.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg10.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg11.java b/test/langtools/tools/javac/generics/diamond/neg/Neg11.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg11.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg11.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg11.out b/test/langtools/tools/javac/generics/diamond/neg/Neg11.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg11.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg11.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg12.java b/test/langtools/tools/javac/generics/diamond/neg/Neg12.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg12.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg12.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg12.out b/test/langtools/tools/javac/generics/diamond/neg/Neg12.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg12.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg12.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg13.java b/test/langtools/tools/javac/generics/diamond/neg/Neg13.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg13.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg13.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg13.out b/test/langtools/tools/javac/generics/diamond/neg/Neg13.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg13.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg13.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg14.java b/test/langtools/tools/javac/generics/diamond/neg/Neg14.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg14.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg14.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg14.out b/test/langtools/tools/javac/generics/diamond/neg/Neg14.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg14.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg14.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg15.java b/test/langtools/tools/javac/generics/diamond/neg/Neg15.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg15.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg15.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg15.out b/test/langtools/tools/javac/generics/diamond/neg/Neg15.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg15.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg15.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg16.java b/test/langtools/tools/javac/generics/diamond/neg/Neg16.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg16.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg16.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg16.out b/test/langtools/tools/javac/generics/diamond/neg/Neg16.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg16.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg16.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg17.java b/test/langtools/tools/javac/generics/diamond/neg/Neg17.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg17.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg17.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg17.out b/test/langtools/tools/javac/generics/diamond/neg/Neg17.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg17.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg17.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg18.java b/test/langtools/tools/javac/generics/diamond/neg/Neg18.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg18.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg18.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg18.out b/test/langtools/tools/javac/generics/diamond/neg/Neg18.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg18.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg18.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg19.java b/test/langtools/tools/javac/generics/diamond/neg/Neg19.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg19.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg19.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg19.out b/test/langtools/tools/javac/generics/diamond/neg/Neg19.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg19.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg19.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg20.java b/test/langtools/tools/javac/generics/diamond/neg/Neg20.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg20.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg20.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg20.out b/test/langtools/tools/javac/generics/diamond/neg/Neg20.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg20.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg20.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg21.java b/test/langtools/tools/javac/generics/diamond/neg/Neg21.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg21.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg21.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg21.out b/test/langtools/tools/javac/generics/diamond/neg/Neg21.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg21.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg21.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg22.java b/test/langtools/tools/javac/generics/diamond/neg/Neg22.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg22.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg22.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg22.out b/test/langtools/tools/javac/generics/diamond/neg/Neg22.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg22.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg22.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg23.java b/test/langtools/tools/javac/generics/diamond/neg/Neg23.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg23.java rename to test/langtools/tools/javac/generics/diamond/neg/Neg23.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg23.out b/test/langtools/tools/javac/generics/diamond/neg/Neg23.out similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/Neg23.out rename to test/langtools/tools/javac/generics/diamond/neg/Neg23.out diff --git a/langtools/test/tools/javac/generics/diamond/neg/T8078473.java b/test/langtools/tools/javac/generics/diamond/neg/T8078473.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/T8078473.java rename to test/langtools/tools/javac/generics/diamond/neg/T8078473.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/T8078473_2.java b/test/langtools/tools/javac/generics/diamond/neg/T8078473_2.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/T8078473_2.java rename to test/langtools/tools/javac/generics/diamond/neg/T8078473_2.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/pkg/Neg18_01.java b/test/langtools/tools/javac/generics/diamond/neg/pkg/Neg18_01.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/pkg/Neg18_01.java rename to test/langtools/tools/javac/generics/diamond/neg/pkg/Neg18_01.java diff --git a/langtools/test/tools/javac/generics/diamond/neg/pkg/Neg23_01.java b/test/langtools/tools/javac/generics/diamond/neg/pkg/Neg23_01.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/neg/pkg/Neg23_01.java rename to test/langtools/tools/javac/generics/diamond/neg/pkg/Neg23_01.java diff --git a/langtools/test/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java b/test/langtools/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java rename to test/langtools/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java diff --git a/langtools/test/tools/javac/generics/diamond/pos/Pos01.java b/test/langtools/tools/javac/generics/diamond/pos/Pos01.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/pos/Pos01.java rename to test/langtools/tools/javac/generics/diamond/pos/Pos01.java diff --git a/langtools/test/tools/javac/generics/diamond/pos/Pos02.java b/test/langtools/tools/javac/generics/diamond/pos/Pos02.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/pos/Pos02.java rename to test/langtools/tools/javac/generics/diamond/pos/Pos02.java diff --git a/langtools/test/tools/javac/generics/diamond/pos/Pos03.java b/test/langtools/tools/javac/generics/diamond/pos/Pos03.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/pos/Pos03.java rename to test/langtools/tools/javac/generics/diamond/pos/Pos03.java diff --git a/langtools/test/tools/javac/generics/diamond/pos/Pos04.java b/test/langtools/tools/javac/generics/diamond/pos/Pos04.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/pos/Pos04.java rename to test/langtools/tools/javac/generics/diamond/pos/Pos04.java diff --git a/langtools/test/tools/javac/generics/diamond/pos/Pos05.java b/test/langtools/tools/javac/generics/diamond/pos/Pos05.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/pos/Pos05.java rename to test/langtools/tools/javac/generics/diamond/pos/Pos05.java diff --git a/langtools/test/tools/javac/generics/diamond/pos/Pos06.java b/test/langtools/tools/javac/generics/diamond/pos/Pos06.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/pos/Pos06.java rename to test/langtools/tools/javac/generics/diamond/pos/Pos06.java diff --git a/langtools/test/tools/javac/generics/diamond/pos/Pos07.java b/test/langtools/tools/javac/generics/diamond/pos/Pos07.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/pos/Pos07.java rename to test/langtools/tools/javac/generics/diamond/pos/Pos07.java diff --git a/langtools/test/tools/javac/generics/diamond/pos/Pos08.java b/test/langtools/tools/javac/generics/diamond/pos/Pos08.java similarity index 100% rename from langtools/test/tools/javac/generics/diamond/pos/Pos08.java rename to test/langtools/tools/javac/generics/diamond/pos/Pos08.java diff --git a/langtools/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound1.java b/test/langtools/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound1.java similarity index 100% rename from langtools/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound1.java rename to test/langtools/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound1.java diff --git a/langtools/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java b/test/langtools/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java similarity index 100% rename from langtools/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java rename to test/langtools/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java diff --git a/langtools/test/tools/javac/generics/genericAbstract/A.java b/test/langtools/tools/javac/generics/genericAbstract/A.java similarity index 100% rename from langtools/test/tools/javac/generics/genericAbstract/A.java rename to test/langtools/tools/javac/generics/genericAbstract/A.java diff --git a/langtools/test/tools/javac/generics/genericAbstract/B.java b/test/langtools/tools/javac/generics/genericAbstract/B.java similarity index 100% rename from langtools/test/tools/javac/generics/genericAbstract/B.java rename to test/langtools/tools/javac/generics/genericAbstract/B.java diff --git a/langtools/test/tools/javac/generics/inference/4941882/T4941882.java b/test/langtools/tools/javac/generics/inference/4941882/T4941882.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/4941882/T4941882.java rename to test/langtools/tools/javac/generics/inference/4941882/T4941882.java diff --git a/langtools/test/tools/javac/generics/inference/4941882/T4941882.out b/test/langtools/tools/javac/generics/inference/4941882/T4941882.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/4941882/T4941882.out rename to test/langtools/tools/javac/generics/inference/4941882/T4941882.out diff --git a/langtools/test/tools/javac/generics/inference/4942040/T4942040.java b/test/langtools/tools/javac/generics/inference/4942040/T4942040.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/4942040/T4942040.java rename to test/langtools/tools/javac/generics/inference/4942040/T4942040.java diff --git a/langtools/test/tools/javac/generics/inference/4954546/T4954546.java b/test/langtools/tools/javac/generics/inference/4954546/T4954546.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/4954546/T4954546.java rename to test/langtools/tools/javac/generics/inference/4954546/T4954546.java diff --git a/langtools/test/tools/javac/generics/inference/4972073/T4972073.java b/test/langtools/tools/javac/generics/inference/4972073/T4972073.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/4972073/T4972073.java rename to test/langtools/tools/javac/generics/inference/4972073/T4972073.java diff --git a/langtools/test/tools/javac/generics/inference/4972073/T4972073.out b/test/langtools/tools/javac/generics/inference/4972073/T4972073.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/4972073/T4972073.out rename to test/langtools/tools/javac/generics/inference/4972073/T4972073.out diff --git a/langtools/test/tools/javac/generics/inference/4972073/T4972073a.java b/test/langtools/tools/javac/generics/inference/4972073/T4972073a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/4972073/T4972073a.java rename to test/langtools/tools/javac/generics/inference/4972073/T4972073a.java diff --git a/langtools/test/tools/javac/generics/inference/4972073/T4972073a.out b/test/langtools/tools/javac/generics/inference/4972073/T4972073a.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/4972073/T4972073a.out rename to test/langtools/tools/javac/generics/inference/4972073/T4972073a.out diff --git a/langtools/test/tools/javac/generics/inference/4972073/T4972073b.java b/test/langtools/tools/javac/generics/inference/4972073/T4972073b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/4972073/T4972073b.java rename to test/langtools/tools/javac/generics/inference/4972073/T4972073b.java diff --git a/langtools/test/tools/javac/generics/inference/4972073/T4972073b.out b/test/langtools/tools/javac/generics/inference/4972073/T4972073b.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/4972073/T4972073b.out rename to test/langtools/tools/javac/generics/inference/4972073/T4972073b.out diff --git a/langtools/test/tools/javac/generics/inference/5003431/T5003431.java b/test/langtools/tools/javac/generics/inference/5003431/T5003431.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5003431/T5003431.java rename to test/langtools/tools/javac/generics/inference/5003431/T5003431.java diff --git a/langtools/test/tools/javac/generics/inference/5021635/T5021635.java b/test/langtools/tools/javac/generics/inference/5021635/T5021635.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5021635/T5021635.java rename to test/langtools/tools/javac/generics/inference/5021635/T5021635.java diff --git a/langtools/test/tools/javac/generics/inference/5021635/T6299211.java b/test/langtools/tools/javac/generics/inference/5021635/T6299211.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5021635/T6299211.java rename to test/langtools/tools/javac/generics/inference/5021635/T6299211.java diff --git a/langtools/test/tools/javac/generics/inference/5034571/T5034571.java b/test/langtools/tools/javac/generics/inference/5034571/T5034571.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5034571/T5034571.java rename to test/langtools/tools/javac/generics/inference/5034571/T5034571.java diff --git a/langtools/test/tools/javac/generics/inference/5042462/T5042462.java b/test/langtools/tools/javac/generics/inference/5042462/T5042462.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5042462/T5042462.java rename to test/langtools/tools/javac/generics/inference/5042462/T5042462.java diff --git a/langtools/test/tools/javac/generics/inference/5044646/T5044646.java b/test/langtools/tools/javac/generics/inference/5044646/T5044646.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5044646/T5044646.java rename to test/langtools/tools/javac/generics/inference/5044646/T5044646.java diff --git a/langtools/test/tools/javac/generics/inference/5044646/T5044646.out b/test/langtools/tools/javac/generics/inference/5044646/T5044646.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/5044646/T5044646.out rename to test/langtools/tools/javac/generics/inference/5044646/T5044646.out diff --git a/langtools/test/tools/javac/generics/inference/5044646/p1/A1.java b/test/langtools/tools/javac/generics/inference/5044646/p1/A1.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5044646/p1/A1.java rename to test/langtools/tools/javac/generics/inference/5044646/p1/A1.java diff --git a/langtools/test/tools/javac/generics/inference/5044646/p1/B.java b/test/langtools/tools/javac/generics/inference/5044646/p1/B.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5044646/p1/B.java rename to test/langtools/tools/javac/generics/inference/5044646/p1/B.java diff --git a/langtools/test/tools/javac/generics/inference/5044646/p1/C.java b/test/langtools/tools/javac/generics/inference/5044646/p1/C.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5044646/p1/C.java rename to test/langtools/tools/javac/generics/inference/5044646/p1/C.java diff --git a/langtools/test/tools/javac/generics/inference/5044646/p2/A2.java b/test/langtools/tools/javac/generics/inference/5044646/p2/A2.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5044646/p2/A2.java rename to test/langtools/tools/javac/generics/inference/5044646/p2/A2.java diff --git a/langtools/test/tools/javac/generics/inference/5049523/T5049523.java b/test/langtools/tools/javac/generics/inference/5049523/T5049523.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5049523/T5049523.java rename to test/langtools/tools/javac/generics/inference/5049523/T5049523.java diff --git a/langtools/test/tools/javac/generics/inference/5070671/T5070671.java b/test/langtools/tools/javac/generics/inference/5070671/T5070671.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5070671/T5070671.java rename to test/langtools/tools/javac/generics/inference/5070671/T5070671.java diff --git a/langtools/test/tools/javac/generics/inference/5073060/GenericsAndPackages.java b/test/langtools/tools/javac/generics/inference/5073060/GenericsAndPackages.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5073060/GenericsAndPackages.java rename to test/langtools/tools/javac/generics/inference/5073060/GenericsAndPackages.java diff --git a/langtools/test/tools/javac/generics/inference/5073060/Neg.java b/test/langtools/tools/javac/generics/inference/5073060/Neg.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5073060/Neg.java rename to test/langtools/tools/javac/generics/inference/5073060/Neg.java diff --git a/langtools/test/tools/javac/generics/inference/5073060/Neg.out b/test/langtools/tools/javac/generics/inference/5073060/Neg.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/5073060/Neg.out rename to test/langtools/tools/javac/generics/inference/5073060/Neg.out diff --git a/langtools/test/tools/javac/generics/inference/5073060/NegHelper.java b/test/langtools/tools/javac/generics/inference/5073060/NegHelper.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5073060/NegHelper.java rename to test/langtools/tools/javac/generics/inference/5073060/NegHelper.java diff --git a/langtools/test/tools/javac/generics/inference/5073060/T5073060.java b/test/langtools/tools/javac/generics/inference/5073060/T5073060.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5073060/T5073060.java rename to test/langtools/tools/javac/generics/inference/5073060/T5073060.java diff --git a/langtools/test/tools/javac/generics/inference/5073060/T5073060a.java b/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5073060/T5073060a.java rename to test/langtools/tools/javac/generics/inference/5073060/T5073060a.java diff --git a/langtools/test/tools/javac/generics/inference/5080917/T5080917.java b/test/langtools/tools/javac/generics/inference/5080917/T5080917.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5080917/T5080917.java rename to test/langtools/tools/javac/generics/inference/5080917/T5080917.java diff --git a/langtools/test/tools/javac/generics/inference/5081782/Neg.java b/test/langtools/tools/javac/generics/inference/5081782/Neg.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5081782/Neg.java rename to test/langtools/tools/javac/generics/inference/5081782/Neg.java diff --git a/langtools/test/tools/javac/generics/inference/5081782/Neg.out b/test/langtools/tools/javac/generics/inference/5081782/Neg.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/5081782/Neg.out rename to test/langtools/tools/javac/generics/inference/5081782/Neg.out diff --git a/langtools/test/tools/javac/generics/inference/5081782/Pos.java b/test/langtools/tools/javac/generics/inference/5081782/Pos.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/5081782/Pos.java rename to test/langtools/tools/javac/generics/inference/5081782/Pos.java diff --git a/langtools/test/tools/javac/generics/inference/6215213/T6215213.java b/test/langtools/tools/javac/generics/inference/6215213/T6215213.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6215213/T6215213.java rename to test/langtools/tools/javac/generics/inference/6215213/T6215213.java diff --git a/langtools/test/tools/javac/generics/inference/6222762/T6222762.java b/test/langtools/tools/javac/generics/inference/6222762/T6222762.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6222762/T6222762.java rename to test/langtools/tools/javac/generics/inference/6222762/T6222762.java diff --git a/langtools/test/tools/javac/generics/inference/6240565/T6240565.java b/test/langtools/tools/javac/generics/inference/6240565/T6240565.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6240565/T6240565.java rename to test/langtools/tools/javac/generics/inference/6240565/T6240565.java diff --git a/langtools/test/tools/javac/generics/inference/6273455/T6273455.java b/test/langtools/tools/javac/generics/inference/6273455/T6273455.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6273455/T6273455.java rename to test/langtools/tools/javac/generics/inference/6273455/T6273455.java diff --git a/langtools/test/tools/javac/generics/inference/6278587/T6278587.java b/test/langtools/tools/javac/generics/inference/6278587/T6278587.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6278587/T6278587.java rename to test/langtools/tools/javac/generics/inference/6278587/T6278587.java diff --git a/langtools/test/tools/javac/generics/inference/6278587/T6278587Neg.java b/test/langtools/tools/javac/generics/inference/6278587/T6278587Neg.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6278587/T6278587Neg.java rename to test/langtools/tools/javac/generics/inference/6278587/T6278587Neg.java diff --git a/langtools/test/tools/javac/generics/inference/6278587/T6278587Neg.out b/test/langtools/tools/javac/generics/inference/6278587/T6278587Neg.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/6278587/T6278587Neg.out rename to test/langtools/tools/javac/generics/inference/6278587/T6278587Neg.out diff --git a/langtools/test/tools/javac/generics/inference/6302954/T6456971.java b/test/langtools/tools/javac/generics/inference/6302954/T6456971.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6302954/T6456971.java rename to test/langtools/tools/javac/generics/inference/6302954/T6456971.java diff --git a/langtools/test/tools/javac/generics/inference/6302954/T6476073.java b/test/langtools/tools/javac/generics/inference/6302954/T6476073.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6302954/T6476073.java rename to test/langtools/tools/javac/generics/inference/6302954/T6476073.java diff --git a/langtools/test/tools/javac/generics/inference/6302954/X.java b/test/langtools/tools/javac/generics/inference/6302954/X.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6302954/X.java rename to test/langtools/tools/javac/generics/inference/6302954/X.java diff --git a/langtools/test/tools/javac/generics/inference/6315770/T6315770.java b/test/langtools/tools/javac/generics/inference/6315770/T6315770.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6315770/T6315770.java rename to test/langtools/tools/javac/generics/inference/6315770/T6315770.java diff --git a/langtools/test/tools/javac/generics/inference/6315770/T6315770.out b/test/langtools/tools/javac/generics/inference/6315770/T6315770.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/6315770/T6315770.out rename to test/langtools/tools/javac/generics/inference/6315770/T6315770.out diff --git a/langtools/test/tools/javac/generics/inference/6356673/T6365166.java b/test/langtools/tools/javac/generics/inference/6356673/T6365166.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6356673/T6365166.java rename to test/langtools/tools/javac/generics/inference/6356673/T6365166.java diff --git a/langtools/test/tools/javac/generics/inference/6356673/Test.java b/test/langtools/tools/javac/generics/inference/6356673/Test.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6356673/Test.java rename to test/langtools/tools/javac/generics/inference/6356673/Test.java diff --git a/langtools/test/tools/javac/generics/inference/6359106/Orig.java b/test/langtools/tools/javac/generics/inference/6359106/Orig.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6359106/Orig.java rename to test/langtools/tools/javac/generics/inference/6359106/Orig.java diff --git a/langtools/test/tools/javac/generics/inference/6359106/T6359106.java b/test/langtools/tools/javac/generics/inference/6359106/T6359106.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6359106/T6359106.java rename to test/langtools/tools/javac/generics/inference/6359106/T6359106.java diff --git a/langtools/test/tools/javac/generics/inference/6365166/NewTest.java b/test/langtools/tools/javac/generics/inference/6365166/NewTest.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6365166/NewTest.java rename to test/langtools/tools/javac/generics/inference/6365166/NewTest.java diff --git a/langtools/test/tools/javac/generics/inference/6369605/T6369605a.java b/test/langtools/tools/javac/generics/inference/6369605/T6369605a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6369605/T6369605a.java rename to test/langtools/tools/javac/generics/inference/6369605/T6369605a.java diff --git a/langtools/test/tools/javac/generics/inference/6369605/T6369605b.java b/test/langtools/tools/javac/generics/inference/6369605/T6369605b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6369605/T6369605b.java rename to test/langtools/tools/javac/generics/inference/6369605/T6369605b.java diff --git a/langtools/test/tools/javac/generics/inference/6468384/T6468384.java b/test/langtools/tools/javac/generics/inference/6468384/T6468384.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6468384/T6468384.java rename to test/langtools/tools/javac/generics/inference/6468384/T6468384.java diff --git a/langtools/test/tools/javac/generics/inference/6569789/T6569789.java b/test/langtools/tools/javac/generics/inference/6569789/T6569789.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6569789/T6569789.java rename to test/langtools/tools/javac/generics/inference/6569789/T6569789.java diff --git a/langtools/test/tools/javac/generics/inference/6611449/T6611449.java b/test/langtools/tools/javac/generics/inference/6611449/T6611449.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6611449/T6611449.java rename to test/langtools/tools/javac/generics/inference/6611449/T6611449.java diff --git a/langtools/test/tools/javac/generics/inference/6611449/T6611449.out b/test/langtools/tools/javac/generics/inference/6611449/T6611449.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/6611449/T6611449.out rename to test/langtools/tools/javac/generics/inference/6611449/T6611449.out diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712a.java b/test/langtools/tools/javac/generics/inference/6638712/T6638712a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6638712/T6638712a.java rename to test/langtools/tools/javac/generics/inference/6638712/T6638712a.java diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712a.out b/test/langtools/tools/javac/generics/inference/6638712/T6638712a.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/6638712/T6638712a.out rename to test/langtools/tools/javac/generics/inference/6638712/T6638712a.out diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712b.java b/test/langtools/tools/javac/generics/inference/6638712/T6638712b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6638712/T6638712b.java rename to test/langtools/tools/javac/generics/inference/6638712/T6638712b.java diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712b.out b/test/langtools/tools/javac/generics/inference/6638712/T6638712b.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/6638712/T6638712b.out rename to test/langtools/tools/javac/generics/inference/6638712/T6638712b.out diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712c.java b/test/langtools/tools/javac/generics/inference/6638712/T6638712c.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6638712/T6638712c.java rename to test/langtools/tools/javac/generics/inference/6638712/T6638712c.java diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712c.out b/test/langtools/tools/javac/generics/inference/6638712/T6638712c.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/6638712/T6638712c.out rename to test/langtools/tools/javac/generics/inference/6638712/T6638712c.out diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712d.java b/test/langtools/tools/javac/generics/inference/6638712/T6638712d.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6638712/T6638712d.java rename to test/langtools/tools/javac/generics/inference/6638712/T6638712d.java diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712d.out b/test/langtools/tools/javac/generics/inference/6638712/T6638712d.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/6638712/T6638712d.out rename to test/langtools/tools/javac/generics/inference/6638712/T6638712d.out diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712e.java b/test/langtools/tools/javac/generics/inference/6638712/T6638712e.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6638712/T6638712e.java rename to test/langtools/tools/javac/generics/inference/6638712/T6638712e.java diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712e.out b/test/langtools/tools/javac/generics/inference/6638712/T6638712e.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/6638712/T6638712e.out rename to test/langtools/tools/javac/generics/inference/6638712/T6638712e.out diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759a.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759a.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759a.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759b.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759b.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759b.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759c.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759c.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759c.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759c.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759d.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759d.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759d.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759d.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759e.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759e.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759e.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759e.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759f.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759f.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759f.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759f.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759g.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759g.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759g.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759g.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759h.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759h.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759h.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759h.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759i.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759i.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759i.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759i.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759j.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759j.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759j.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759j.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759k.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759k.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759k.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759k.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759l.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759l.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759l.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759l.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759m.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759m.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759m.java rename to test/langtools/tools/javac/generics/inference/6650759/T6650759m.java diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759m.out b/test/langtools/tools/javac/generics/inference/6650759/T6650759m.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/6650759/T6650759m.out rename to test/langtools/tools/javac/generics/inference/6650759/T6650759m.out diff --git a/langtools/test/tools/javac/generics/inference/6718364/T6718364.java b/test/langtools/tools/javac/generics/inference/6718364/T6718364.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6718364/T6718364.java rename to test/langtools/tools/javac/generics/inference/6718364/T6718364.java diff --git a/langtools/test/tools/javac/generics/inference/6718364/T6718364.out b/test/langtools/tools/javac/generics/inference/6718364/T6718364.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/6718364/T6718364.out rename to test/langtools/tools/javac/generics/inference/6718364/T6718364.out diff --git a/langtools/test/tools/javac/generics/inference/6838943/T6838943.java b/test/langtools/tools/javac/generics/inference/6838943/T6838943.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6838943/T6838943.java rename to test/langtools/tools/javac/generics/inference/6838943/T6838943.java diff --git a/langtools/test/tools/javac/generics/inference/6838943/T6838943.out b/test/langtools/tools/javac/generics/inference/6838943/T6838943.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/6838943/T6838943.out rename to test/langtools/tools/javac/generics/inference/6838943/T6838943.out diff --git a/langtools/test/tools/javac/generics/inference/6938454/T6938454a.java b/test/langtools/tools/javac/generics/inference/6938454/T6938454a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6938454/T6938454a.java rename to test/langtools/tools/javac/generics/inference/6938454/T6938454a.java diff --git a/langtools/test/tools/javac/generics/inference/6938454/T6938454b.java b/test/langtools/tools/javac/generics/inference/6938454/T6938454b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6938454/T6938454b.java rename to test/langtools/tools/javac/generics/inference/6938454/T6938454b.java diff --git a/langtools/test/tools/javac/generics/inference/6943278/T6943278.java b/test/langtools/tools/javac/generics/inference/6943278/T6943278.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6943278/T6943278.java rename to test/langtools/tools/javac/generics/inference/6943278/T6943278.java diff --git a/langtools/test/tools/javac/generics/inference/6943278/T6943278.out b/test/langtools/tools/javac/generics/inference/6943278/T6943278.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/6943278/T6943278.out rename to test/langtools/tools/javac/generics/inference/6943278/T6943278.out diff --git a/langtools/test/tools/javac/generics/inference/6995200/T6995200.java b/test/langtools/tools/javac/generics/inference/6995200/T6995200.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/6995200/T6995200.java rename to test/langtools/tools/javac/generics/inference/6995200/T6995200.java diff --git a/langtools/test/tools/javac/generics/inference/7086586/T7086586.java b/test/langtools/tools/javac/generics/inference/7086586/T7086586.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/7086586/T7086586.java rename to test/langtools/tools/javac/generics/inference/7086586/T7086586.java diff --git a/langtools/test/tools/javac/generics/inference/7086586/T7086586.out b/test/langtools/tools/javac/generics/inference/7086586/T7086586.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/7086586/T7086586.out rename to test/langtools/tools/javac/generics/inference/7086586/T7086586.out diff --git a/langtools/test/tools/javac/generics/inference/7086586/T7086586b.java b/test/langtools/tools/javac/generics/inference/7086586/T7086586b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/7086586/T7086586b.java rename to test/langtools/tools/javac/generics/inference/7086586/T7086586b.java diff --git a/langtools/test/tools/javac/generics/inference/7086601/T7086601a.java b/test/langtools/tools/javac/generics/inference/7086601/T7086601a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/7086601/T7086601a.java rename to test/langtools/tools/javac/generics/inference/7086601/T7086601a.java diff --git a/langtools/test/tools/javac/generics/inference/7086601/T7086601a.out b/test/langtools/tools/javac/generics/inference/7086601/T7086601a.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/7086601/T7086601a.out rename to test/langtools/tools/javac/generics/inference/7086601/T7086601a.out diff --git a/langtools/test/tools/javac/generics/inference/7086601/T7086601b.java b/test/langtools/tools/javac/generics/inference/7086601/T7086601b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/7086601/T7086601b.java rename to test/langtools/tools/javac/generics/inference/7086601/T7086601b.java diff --git a/langtools/test/tools/javac/generics/inference/7154127/T7154127.java b/test/langtools/tools/javac/generics/inference/7154127/T7154127.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/7154127/T7154127.java rename to test/langtools/tools/javac/generics/inference/7154127/T7154127.java diff --git a/langtools/test/tools/javac/generics/inference/7154127/T7154127.out b/test/langtools/tools/javac/generics/inference/7154127/T7154127.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/7154127/T7154127.out rename to test/langtools/tools/javac/generics/inference/7154127/T7154127.out diff --git a/langtools/test/tools/javac/generics/inference/7177306/T7177306a.java b/test/langtools/tools/javac/generics/inference/7177306/T7177306a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/7177306/T7177306a.java rename to test/langtools/tools/javac/generics/inference/7177306/T7177306a.java diff --git a/langtools/test/tools/javac/generics/inference/7177306/T7177306a.out b/test/langtools/tools/javac/generics/inference/7177306/T7177306a.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/7177306/T7177306a.out rename to test/langtools/tools/javac/generics/inference/7177306/T7177306a.out diff --git a/langtools/test/tools/javac/generics/inference/7177306/T7177306b.java b/test/langtools/tools/javac/generics/inference/7177306/T7177306b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/7177306/T7177306b.java rename to test/langtools/tools/javac/generics/inference/7177306/T7177306b.java diff --git a/langtools/test/tools/javac/generics/inference/7177306/T7177306b.out b/test/langtools/tools/javac/generics/inference/7177306/T7177306b.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/7177306/T7177306b.out rename to test/langtools/tools/javac/generics/inference/7177306/T7177306b.out diff --git a/langtools/test/tools/javac/generics/inference/7177306/T7177306c.java b/test/langtools/tools/javac/generics/inference/7177306/T7177306c.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/7177306/T7177306c.java rename to test/langtools/tools/javac/generics/inference/7177306/T7177306c.java diff --git a/langtools/test/tools/javac/generics/inference/7177306/T7177306d.java b/test/langtools/tools/javac/generics/inference/7177306/T7177306d.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/7177306/T7177306d.java rename to test/langtools/tools/javac/generics/inference/7177306/T7177306d.java diff --git a/langtools/test/tools/javac/generics/inference/7177306/T7177306e.java b/test/langtools/tools/javac/generics/inference/7177306/T7177306e.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/7177306/T7177306e.java rename to test/langtools/tools/javac/generics/inference/7177306/T7177306e.java diff --git a/langtools/test/tools/javac/generics/inference/7177306/T7177306e.out b/test/langtools/tools/javac/generics/inference/7177306/T7177306e.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/7177306/T7177306e.out rename to test/langtools/tools/javac/generics/inference/7177306/T7177306e.out diff --git a/langtools/test/tools/javac/generics/inference/7177306/T7177306e_7.out b/test/langtools/tools/javac/generics/inference/7177306/T7177306e_7.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/7177306/T7177306e_7.out rename to test/langtools/tools/javac/generics/inference/7177306/T7177306e_7.out diff --git a/langtools/test/tools/javac/generics/inference/8006692/T8006692.java b/test/langtools/tools/javac/generics/inference/8006692/T8006692.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8006692/T8006692.java rename to test/langtools/tools/javac/generics/inference/8006692/T8006692.java diff --git a/langtools/test/tools/javac/generics/inference/8015505/T8015505.java b/test/langtools/tools/javac/generics/inference/8015505/T8015505.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8015505/T8015505.java rename to test/langtools/tools/javac/generics/inference/8015505/T8015505.java diff --git a/langtools/test/tools/javac/generics/inference/8015505/T8015505.out b/test/langtools/tools/javac/generics/inference/8015505/T8015505.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/8015505/T8015505.out rename to test/langtools/tools/javac/generics/inference/8015505/T8015505.out diff --git a/langtools/test/tools/javac/generics/inference/8019824/T8019824.java b/test/langtools/tools/javac/generics/inference/8019824/T8019824.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8019824/T8019824.java rename to test/langtools/tools/javac/generics/inference/8019824/T8019824.java diff --git a/langtools/test/tools/javac/generics/inference/8019824/T8019824.out b/test/langtools/tools/javac/generics/inference/8019824/T8019824.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/8019824/T8019824.out rename to test/langtools/tools/javac/generics/inference/8019824/T8019824.out diff --git a/langtools/test/tools/javac/generics/inference/8020149/T8020149.java b/test/langtools/tools/javac/generics/inference/8020149/T8020149.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8020149/T8020149.java rename to test/langtools/tools/javac/generics/inference/8020149/T8020149.java diff --git a/langtools/test/tools/javac/generics/inference/8043725/T8043725.java b/test/langtools/tools/javac/generics/inference/8043725/T8043725.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8043725/T8043725.java rename to test/langtools/tools/javac/generics/inference/8043725/T8043725.java diff --git a/langtools/test/tools/javac/generics/inference/8043893/T8043893.java b/test/langtools/tools/javac/generics/inference/8043893/T8043893.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8043893/T8043893.java rename to test/langtools/tools/javac/generics/inference/8043893/T8043893.java diff --git a/langtools/test/tools/javac/generics/inference/8043893/T8043893.out b/test/langtools/tools/javac/generics/inference/8043893/T8043893.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/8043893/T8043893.out rename to test/langtools/tools/javac/generics/inference/8043893/T8043893.out diff --git a/langtools/test/tools/javac/generics/inference/8043926/T8043926.java b/test/langtools/tools/javac/generics/inference/8043926/T8043926.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8043926/T8043926.java rename to test/langtools/tools/javac/generics/inference/8043926/T8043926.java diff --git a/langtools/test/tools/javac/generics/inference/8048838/T8048838.java b/test/langtools/tools/javac/generics/inference/8048838/T8048838.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8048838/T8048838.java rename to test/langtools/tools/javac/generics/inference/8048838/T8048838.java diff --git a/langtools/test/tools/javac/generics/inference/8055963/T8055963.java b/test/langtools/tools/javac/generics/inference/8055963/T8055963.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8055963/T8055963.java rename to test/langtools/tools/javac/generics/inference/8055963/T8055963.java diff --git a/langtools/test/tools/javac/generics/inference/8058199/T8058199.java b/test/langtools/tools/javac/generics/inference/8058199/T8058199.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8058199/T8058199.java rename to test/langtools/tools/javac/generics/inference/8058199/T8058199.java diff --git a/langtools/test/tools/javac/generics/inference/8058511/T8058511a.java b/test/langtools/tools/javac/generics/inference/8058511/T8058511a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8058511/T8058511a.java rename to test/langtools/tools/javac/generics/inference/8058511/T8058511a.java diff --git a/langtools/test/tools/javac/generics/inference/8058511/T8058511b.java b/test/langtools/tools/javac/generics/inference/8058511/T8058511b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8058511/T8058511b.java rename to test/langtools/tools/javac/generics/inference/8058511/T8058511b.java diff --git a/langtools/test/tools/javac/generics/inference/8058511/T8058511c.java b/test/langtools/tools/javac/generics/inference/8058511/T8058511c.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8058511/T8058511c.java rename to test/langtools/tools/javac/generics/inference/8058511/T8058511c.java diff --git a/langtools/test/tools/javac/generics/inference/8062977/T8062977.java b/test/langtools/tools/javac/generics/inference/8062977/T8062977.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8062977/T8062977.java rename to test/langtools/tools/javac/generics/inference/8062977/T8062977.java diff --git a/langtools/test/tools/javac/generics/inference/8062977/T8062977.out b/test/langtools/tools/javac/generics/inference/8062977/T8062977.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/8062977/T8062977.out rename to test/langtools/tools/javac/generics/inference/8062977/T8062977.out diff --git a/langtools/test/tools/javac/generics/inference/8067767/T8067767.java b/test/langtools/tools/javac/generics/inference/8067767/T8067767.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8067767/T8067767.java rename to test/langtools/tools/javac/generics/inference/8067767/T8067767.java diff --git a/langtools/test/tools/javac/generics/inference/8077306/T8077306.java b/test/langtools/tools/javac/generics/inference/8077306/T8077306.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8077306/T8077306.java rename to test/langtools/tools/javac/generics/inference/8077306/T8077306.java diff --git a/langtools/test/tools/javac/generics/inference/8078024/T8078024.java b/test/langtools/tools/javac/generics/inference/8078024/T8078024.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8078024/T8078024.java rename to test/langtools/tools/javac/generics/inference/8078024/T8078024.java diff --git a/langtools/test/tools/javac/generics/inference/8130304/T8130304.java b/test/langtools/tools/javac/generics/inference/8130304/T8130304.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8130304/T8130304.java rename to test/langtools/tools/javac/generics/inference/8130304/T8130304.java diff --git a/langtools/test/tools/javac/generics/inference/8141613/T8141613.java b/test/langtools/tools/javac/generics/inference/8141613/T8141613.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8141613/T8141613.java rename to test/langtools/tools/javac/generics/inference/8141613/T8141613.java diff --git a/langtools/test/tools/javac/generics/inference/8147493/T8147493a.java b/test/langtools/tools/javac/generics/inference/8147493/T8147493a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8147493/T8147493a.java rename to test/langtools/tools/javac/generics/inference/8147493/T8147493a.java diff --git a/langtools/test/tools/javac/generics/inference/8147493/T8147493b.java b/test/langtools/tools/javac/generics/inference/8147493/T8147493b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8147493/T8147493b.java rename to test/langtools/tools/javac/generics/inference/8147493/T8147493b.java diff --git a/langtools/test/tools/javac/generics/inference/8148213/T8148213.java b/test/langtools/tools/javac/generics/inference/8148213/T8148213.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8148213/T8148213.java rename to test/langtools/tools/javac/generics/inference/8148213/T8148213.java diff --git a/langtools/test/tools/javac/generics/inference/8148213/T8148213.out b/test/langtools/tools/javac/generics/inference/8148213/T8148213.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/8148213/T8148213.out rename to test/langtools/tools/javac/generics/inference/8148213/T8148213.out diff --git a/langtools/test/tools/javac/generics/inference/8152411/T8152411.java b/test/langtools/tools/javac/generics/inference/8152411/T8152411.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8152411/T8152411.java rename to test/langtools/tools/javac/generics/inference/8152411/T8152411.java diff --git a/langtools/test/tools/javac/generics/inference/8152411/T8152411.out b/test/langtools/tools/javac/generics/inference/8152411/T8152411.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/8152411/T8152411.out rename to test/langtools/tools/javac/generics/inference/8152411/T8152411.out diff --git a/langtools/test/tools/javac/generics/inference/8152832/T8152832.java b/test/langtools/tools/javac/generics/inference/8152832/T8152832.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8152832/T8152832.java rename to test/langtools/tools/javac/generics/inference/8152832/T8152832.java diff --git a/langtools/test/tools/javac/generics/inference/8156954/T8156954.java b/test/langtools/tools/javac/generics/inference/8156954/T8156954.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8156954/T8156954.java rename to test/langtools/tools/javac/generics/inference/8156954/T8156954.java diff --git a/langtools/test/tools/javac/generics/inference/8157149/T8157149a.java b/test/langtools/tools/javac/generics/inference/8157149/T8157149a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8157149/T8157149a.java rename to test/langtools/tools/javac/generics/inference/8157149/T8157149a.java diff --git a/langtools/test/tools/javac/generics/inference/8157149/T8157149a.out b/test/langtools/tools/javac/generics/inference/8157149/T8157149a.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/8157149/T8157149a.out rename to test/langtools/tools/javac/generics/inference/8157149/T8157149a.out diff --git a/langtools/test/tools/javac/generics/inference/8157149/T8157149b.java b/test/langtools/tools/javac/generics/inference/8157149/T8157149b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8157149/T8157149b.java rename to test/langtools/tools/javac/generics/inference/8157149/T8157149b.java diff --git a/langtools/test/tools/javac/generics/inference/8157149/T8157149c.java b/test/langtools/tools/javac/generics/inference/8157149/T8157149c.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8157149/T8157149c.java rename to test/langtools/tools/javac/generics/inference/8157149/T8157149c.java diff --git a/langtools/test/tools/javac/generics/inference/8158355/T8158355.java b/test/langtools/tools/javac/generics/inference/8158355/T8158355.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8158355/T8158355.java rename to test/langtools/tools/javac/generics/inference/8158355/T8158355.java diff --git a/langtools/test/tools/javac/generics/inference/8159680/T8159680.java b/test/langtools/tools/javac/generics/inference/8159680/T8159680.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8159680/T8159680.java rename to test/langtools/tools/javac/generics/inference/8159680/T8159680.java diff --git a/langtools/test/tools/javac/generics/inference/8164399/T8164399.java b/test/langtools/tools/javac/generics/inference/8164399/T8164399.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8164399/T8164399.java rename to test/langtools/tools/javac/generics/inference/8164399/T8164399.java diff --git a/langtools/test/tools/javac/generics/inference/8164399/T8164399b.java b/test/langtools/tools/javac/generics/inference/8164399/T8164399b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8164399/T8164399b.java rename to test/langtools/tools/javac/generics/inference/8164399/T8164399b.java diff --git a/langtools/test/tools/javac/generics/inference/8164399/T8164399b.out b/test/langtools/tools/javac/generics/inference/8164399/T8164399b.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/8164399/T8164399b.out rename to test/langtools/tools/javac/generics/inference/8164399/T8164399b.out diff --git a/langtools/test/tools/javac/generics/inference/8168134/T8168134.java b/test/langtools/tools/javac/generics/inference/8168134/T8168134.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8168134/T8168134.java rename to test/langtools/tools/javac/generics/inference/8168134/T8168134.java diff --git a/langtools/test/tools/javac/generics/inference/8170410/T8170410.java b/test/langtools/tools/javac/generics/inference/8170410/T8170410.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8170410/T8170410.java rename to test/langtools/tools/javac/generics/inference/8170410/T8170410.java diff --git a/langtools/test/tools/javac/generics/inference/8174249/T8174249a.java b/test/langtools/tools/javac/generics/inference/8174249/T8174249a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8174249/T8174249a.java rename to test/langtools/tools/javac/generics/inference/8174249/T8174249a.java diff --git a/langtools/test/tools/javac/generics/inference/8174249/T8174249b.java b/test/langtools/tools/javac/generics/inference/8174249/T8174249b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8174249/T8174249b.java rename to test/langtools/tools/javac/generics/inference/8174249/T8174249b.java diff --git a/langtools/test/tools/javac/generics/inference/8176534/T8176534.java b/test/langtools/tools/javac/generics/inference/8176534/T8176534.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8176534/T8176534.java rename to test/langtools/tools/javac/generics/inference/8176534/T8176534.java diff --git a/langtools/test/tools/javac/generics/inference/8176534/T8176534.out b/test/langtools/tools/javac/generics/inference/8176534/T8176534.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/8176534/T8176534.out rename to test/langtools/tools/javac/generics/inference/8176534/T8176534.out diff --git a/langtools/test/tools/javac/generics/inference/8176534/TestUncheckedCalls.java b/test/langtools/tools/javac/generics/inference/8176534/TestUncheckedCalls.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8176534/TestUncheckedCalls.java rename to test/langtools/tools/javac/generics/inference/8176534/TestUncheckedCalls.java diff --git a/langtools/test/tools/javac/generics/inference/8177097/T8177097a.java b/test/langtools/tools/javac/generics/inference/8177097/T8177097a.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8177097/T8177097a.java rename to test/langtools/tools/javac/generics/inference/8177097/T8177097a.java diff --git a/langtools/test/tools/javac/generics/inference/8177097/T8177097b.java b/test/langtools/tools/javac/generics/inference/8177097/T8177097b.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/8177097/T8177097b.java rename to test/langtools/tools/javac/generics/inference/8177097/T8177097b.java diff --git a/langtools/test/tools/javac/generics/inference/CaptureGLB1.java b/test/langtools/tools/javac/generics/inference/CaptureGLB1.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureGLB1.java rename to test/langtools/tools/javac/generics/inference/CaptureGLB1.java diff --git a/langtools/test/tools/javac/generics/inference/CaptureGLB2.java b/test/langtools/tools/javac/generics/inference/CaptureGLB2.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureGLB2.java rename to test/langtools/tools/javac/generics/inference/CaptureGLB2.java diff --git a/langtools/test/tools/javac/generics/inference/CaptureInDeclaredBound.java b/test/langtools/tools/javac/generics/inference/CaptureInDeclaredBound.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureInDeclaredBound.java rename to test/langtools/tools/javac/generics/inference/CaptureInDeclaredBound.java diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBound.java b/test/langtools/tools/javac/generics/inference/CaptureLowerBound.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureLowerBound.java rename to test/langtools/tools/javac/generics/inference/CaptureLowerBound.java diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBound7.out b/test/langtools/tools/javac/generics/inference/CaptureLowerBound7.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureLowerBound7.out rename to test/langtools/tools/javac/generics/inference/CaptureLowerBound7.out diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundArray.java b/test/langtools/tools/javac/generics/inference/CaptureLowerBoundArray.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureLowerBoundArray.java rename to test/langtools/tools/javac/generics/inference/CaptureLowerBoundArray.java diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundArray.out b/test/langtools/tools/javac/generics/inference/CaptureLowerBoundArray.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureLowerBoundArray.out rename to test/langtools/tools/javac/generics/inference/CaptureLowerBoundArray.out diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundAssign.java b/test/langtools/tools/javac/generics/inference/CaptureLowerBoundAssign.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureLowerBoundAssign.java rename to test/langtools/tools/javac/generics/inference/CaptureLowerBoundAssign.java diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundDeref.java b/test/langtools/tools/javac/generics/inference/CaptureLowerBoundDeref.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureLowerBoundDeref.java rename to test/langtools/tools/javac/generics/inference/CaptureLowerBoundDeref.java diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundDeref.out b/test/langtools/tools/javac/generics/inference/CaptureLowerBoundDeref.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureLowerBoundDeref.out rename to test/langtools/tools/javac/generics/inference/CaptureLowerBoundDeref.out diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundNeg.java b/test/langtools/tools/javac/generics/inference/CaptureLowerBoundNeg.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureLowerBoundNeg.java rename to test/langtools/tools/javac/generics/inference/CaptureLowerBoundNeg.java diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundNeg.out b/test/langtools/tools/javac/generics/inference/CaptureLowerBoundNeg.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureLowerBoundNeg.out rename to test/langtools/tools/javac/generics/inference/CaptureLowerBoundNeg.out diff --git a/langtools/test/tools/javac/generics/inference/CaptureUpperBoundDeref.java b/test/langtools/tools/javac/generics/inference/CaptureUpperBoundDeref.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureUpperBoundDeref.java rename to test/langtools/tools/javac/generics/inference/CaptureUpperBoundDeref.java diff --git a/langtools/test/tools/javac/generics/inference/CaptureUpperBoundDeref.out b/test/langtools/tools/javac/generics/inference/CaptureUpperBoundDeref.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/CaptureUpperBoundDeref.out rename to test/langtools/tools/javac/generics/inference/CaptureUpperBoundDeref.out diff --git a/langtools/test/tools/javac/generics/inference/CheckNoTimeoutException.java b/test/langtools/tools/javac/generics/inference/CheckNoTimeoutException.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/CheckNoTimeoutException.java rename to test/langtools/tools/javac/generics/inference/CheckNoTimeoutException.java diff --git a/langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTesta.java b/test/langtools/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTesta.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTesta.java rename to test/langtools/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTesta.java diff --git a/langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.java b/test/langtools/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.java rename to test/langtools/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.java diff --git a/langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.out b/test/langtools/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.out rename to test/langtools/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.out diff --git a/langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/PrimitiveTypeBoxingTest.java b/test/langtools/tools/javac/generics/inference/EagerReturnTypeResolution/PrimitiveTypeBoxingTest.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/PrimitiveTypeBoxingTest.java rename to test/langtools/tools/javac/generics/inference/EagerReturnTypeResolution/PrimitiveTypeBoxingTest.java diff --git a/langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/PrimitiveTypeBoxingTest.out b/test/langtools/tools/javac/generics/inference/EagerReturnTypeResolution/PrimitiveTypeBoxingTest.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/PrimitiveTypeBoxingTest.out rename to test/langtools/tools/javac/generics/inference/EagerReturnTypeResolution/PrimitiveTypeBoxingTest.out diff --git a/langtools/test/tools/javac/generics/inference/IntersectThrownTypesTest.java b/test/langtools/tools/javac/generics/inference/IntersectThrownTypesTest.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/IntersectThrownTypesTest.java rename to test/langtools/tools/javac/generics/inference/IntersectThrownTypesTest.java diff --git a/langtools/test/tools/javac/generics/inference/IntersectThrownTypesTest.out b/test/langtools/tools/javac/generics/inference/IntersectThrownTypesTest.out similarity index 100% rename from langtools/test/tools/javac/generics/inference/IntersectThrownTypesTest.out rename to test/langtools/tools/javac/generics/inference/IntersectThrownTypesTest.out diff --git a/langtools/test/tools/javac/generics/inference/LowerBoundGLB.java b/test/langtools/tools/javac/generics/inference/LowerBoundGLB.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/LowerBoundGLB.java rename to test/langtools/tools/javac/generics/inference/LowerBoundGLB.java diff --git a/langtools/test/tools/javac/generics/inference/NestedCapture.java b/test/langtools/tools/javac/generics/inference/NestedCapture.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/NestedCapture.java rename to test/langtools/tools/javac/generics/inference/NestedCapture.java diff --git a/langtools/test/tools/javac/generics/inference/NestedWildcards.java b/test/langtools/tools/javac/generics/inference/NestedWildcards.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/NestedWildcards.java rename to test/langtools/tools/javac/generics/inference/NestedWildcards.java diff --git a/langtools/test/tools/javac/generics/inference/T6835428.java b/test/langtools/tools/javac/generics/inference/T6835428.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/T6835428.java rename to test/langtools/tools/javac/generics/inference/T6835428.java diff --git a/langtools/test/tools/javac/generics/inference/T7015715.java b/test/langtools/tools/javac/generics/inference/T7015715.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/T7015715.java rename to test/langtools/tools/javac/generics/inference/T7015715.java diff --git a/langtools/test/tools/javac/generics/inference/T8028503/PrimitiveTypeInBoundForMethodRefTest.java b/test/langtools/tools/javac/generics/inference/T8028503/PrimitiveTypeInBoundForMethodRefTest.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/T8028503/PrimitiveTypeInBoundForMethodRefTest.java rename to test/langtools/tools/javac/generics/inference/T8028503/PrimitiveTypeInBoundForMethodRefTest.java diff --git a/langtools/test/tools/javac/generics/inference/T8044546/CrashImplicitLambdaTest.java b/test/langtools/tools/javac/generics/inference/T8044546/CrashImplicitLambdaTest.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/T8044546/CrashImplicitLambdaTest.java rename to test/langtools/tools/javac/generics/inference/T8044546/CrashImplicitLambdaTest.java diff --git a/langtools/test/tools/javac/generics/inference/T8044546/NestedInvocationsTest.java b/test/langtools/tools/javac/generics/inference/T8044546/NestedInvocationsTest.java similarity index 100% rename from langtools/test/tools/javac/generics/inference/T8044546/NestedInvocationsTest.java rename to test/langtools/tools/javac/generics/inference/T8044546/NestedInvocationsTest.java diff --git a/langtools/test/tools/javac/generics/neg/OrderedIntersections.java b/test/langtools/tools/javac/generics/neg/OrderedIntersections.java similarity index 100% rename from langtools/test/tools/javac/generics/neg/OrderedIntersections.java rename to test/langtools/tools/javac/generics/neg/OrderedIntersections.java diff --git a/langtools/test/tools/javac/generics/neg/OrderedIntersections.out b/test/langtools/tools/javac/generics/neg/OrderedIntersections.out similarity index 100% rename from langtools/test/tools/javac/generics/neg/OrderedIntersections.out rename to test/langtools/tools/javac/generics/neg/OrderedIntersections.out diff --git a/langtools/test/tools/javac/generics/odersky/BadTest.java b/test/langtools/tools/javac/generics/odersky/BadTest.java similarity index 100% rename from langtools/test/tools/javac/generics/odersky/BadTest.java rename to test/langtools/tools/javac/generics/odersky/BadTest.java diff --git a/langtools/test/tools/javac/generics/odersky/BadTest.out b/test/langtools/tools/javac/generics/odersky/BadTest.out similarity index 100% rename from langtools/test/tools/javac/generics/odersky/BadTest.out rename to test/langtools/tools/javac/generics/odersky/BadTest.out diff --git a/langtools/test/tools/javac/generics/odersky/BadTest2.java b/test/langtools/tools/javac/generics/odersky/BadTest2.java similarity index 100% rename from langtools/test/tools/javac/generics/odersky/BadTest2.java rename to test/langtools/tools/javac/generics/odersky/BadTest2.java diff --git a/langtools/test/tools/javac/generics/odersky/BadTest3.java b/test/langtools/tools/javac/generics/odersky/BadTest3.java similarity index 100% rename from langtools/test/tools/javac/generics/odersky/BadTest3.java rename to test/langtools/tools/javac/generics/odersky/BadTest3.java diff --git a/langtools/test/tools/javac/generics/odersky/BadTest3.out b/test/langtools/tools/javac/generics/odersky/BadTest3.out similarity index 100% rename from langtools/test/tools/javac/generics/odersky/BadTest3.out rename to test/langtools/tools/javac/generics/odersky/BadTest3.out diff --git a/langtools/test/tools/javac/generics/odersky/BadTest4.java b/test/langtools/tools/javac/generics/odersky/BadTest4.java similarity index 100% rename from langtools/test/tools/javac/generics/odersky/BadTest4.java rename to test/langtools/tools/javac/generics/odersky/BadTest4.java diff --git a/langtools/test/tools/javac/generics/odersky/BadTest4.out b/test/langtools/tools/javac/generics/odersky/BadTest4.out similarity index 100% rename from langtools/test/tools/javac/generics/odersky/BadTest4.out rename to test/langtools/tools/javac/generics/odersky/BadTest4.out diff --git a/langtools/test/tools/javac/generics/odersky/Cell.java b/test/langtools/tools/javac/generics/odersky/Cell.java similarity index 100% rename from langtools/test/tools/javac/generics/odersky/Cell.java rename to test/langtools/tools/javac/generics/odersky/Cell.java diff --git a/langtools/test/tools/javac/generics/odersky/List.java b/test/langtools/tools/javac/generics/odersky/List.java similarity index 100% rename from langtools/test/tools/javac/generics/odersky/List.java rename to test/langtools/tools/javac/generics/odersky/List.java diff --git a/langtools/test/tools/javac/generics/odersky/Test.java b/test/langtools/tools/javac/generics/odersky/Test.java similarity index 100% rename from langtools/test/tools/javac/generics/odersky/Test.java rename to test/langtools/tools/javac/generics/odersky/Test.java diff --git a/langtools/test/tools/javac/generics/odersky/Test2.java b/test/langtools/tools/javac/generics/odersky/Test2.java similarity index 100% rename from langtools/test/tools/javac/generics/odersky/Test2.java rename to test/langtools/tools/javac/generics/odersky/Test2.java diff --git a/langtools/test/tools/javac/generics/odersky/Test3.java b/test/langtools/tools/javac/generics/odersky/Test3.java similarity index 100% rename from langtools/test/tools/javac/generics/odersky/Test3.java rename to test/langtools/tools/javac/generics/odersky/Test3.java diff --git a/langtools/test/tools/javac/generics/odersky/Test4.java b/test/langtools/tools/javac/generics/odersky/Test4.java similarity index 100% rename from langtools/test/tools/javac/generics/odersky/Test4.java rename to test/langtools/tools/javac/generics/odersky/Test4.java diff --git a/langtools/test/tools/javac/generics/parametricException/J.java b/test/langtools/tools/javac/generics/parametricException/J.java similarity index 100% rename from langtools/test/tools/javac/generics/parametricException/J.java rename to test/langtools/tools/javac/generics/parametricException/J.java diff --git a/langtools/test/tools/javac/generics/parametricException/K.java b/test/langtools/tools/javac/generics/parametricException/K.java similarity index 100% rename from langtools/test/tools/javac/generics/parametricException/K.java rename to test/langtools/tools/javac/generics/parametricException/K.java diff --git a/langtools/test/tools/javac/generics/rare/6665356/T6665356.java b/test/langtools/tools/javac/generics/rare/6665356/T6665356.java similarity index 100% rename from langtools/test/tools/javac/generics/rare/6665356/T6665356.java rename to test/langtools/tools/javac/generics/rare/6665356/T6665356.java diff --git a/langtools/test/tools/javac/generics/rare/6665356/T6665356.out b/test/langtools/tools/javac/generics/rare/6665356/T6665356.out similarity index 100% rename from langtools/test/tools/javac/generics/rare/6665356/T6665356.out rename to test/langtools/tools/javac/generics/rare/6665356/T6665356.out diff --git a/langtools/test/tools/javac/generics/rare/Rare1.java b/test/langtools/tools/javac/generics/rare/Rare1.java similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare1.java rename to test/langtools/tools/javac/generics/rare/Rare1.java diff --git a/langtools/test/tools/javac/generics/rare/Rare10.java b/test/langtools/tools/javac/generics/rare/Rare10.java similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare10.java rename to test/langtools/tools/javac/generics/rare/Rare10.java diff --git a/langtools/test/tools/javac/generics/rare/Rare11.java b/test/langtools/tools/javac/generics/rare/Rare11.java similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare11.java rename to test/langtools/tools/javac/generics/rare/Rare11.java diff --git a/langtools/test/tools/javac/generics/rare/Rare2.java b/test/langtools/tools/javac/generics/rare/Rare2.java similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare2.java rename to test/langtools/tools/javac/generics/rare/Rare2.java diff --git a/langtools/test/tools/javac/generics/rare/Rare2.out b/test/langtools/tools/javac/generics/rare/Rare2.out similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare2.out rename to test/langtools/tools/javac/generics/rare/Rare2.out diff --git a/langtools/test/tools/javac/generics/rare/Rare3.java b/test/langtools/tools/javac/generics/rare/Rare3.java similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare3.java rename to test/langtools/tools/javac/generics/rare/Rare3.java diff --git a/langtools/test/tools/javac/generics/rare/Rare3.out b/test/langtools/tools/javac/generics/rare/Rare3.out similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare3.out rename to test/langtools/tools/javac/generics/rare/Rare3.out diff --git a/langtools/test/tools/javac/generics/rare/Rare4.java b/test/langtools/tools/javac/generics/rare/Rare4.java similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare4.java rename to test/langtools/tools/javac/generics/rare/Rare4.java diff --git a/langtools/test/tools/javac/generics/rare/Rare4.out b/test/langtools/tools/javac/generics/rare/Rare4.out similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare4.out rename to test/langtools/tools/javac/generics/rare/Rare4.out diff --git a/langtools/test/tools/javac/generics/rare/Rare5.java b/test/langtools/tools/javac/generics/rare/Rare5.java similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare5.java rename to test/langtools/tools/javac/generics/rare/Rare5.java diff --git a/langtools/test/tools/javac/generics/rare/Rare5.out b/test/langtools/tools/javac/generics/rare/Rare5.out similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare5.out rename to test/langtools/tools/javac/generics/rare/Rare5.out diff --git a/langtools/test/tools/javac/generics/rare/Rare6.java b/test/langtools/tools/javac/generics/rare/Rare6.java similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare6.java rename to test/langtools/tools/javac/generics/rare/Rare6.java diff --git a/langtools/test/tools/javac/generics/rare/Rare6.out b/test/langtools/tools/javac/generics/rare/Rare6.out similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare6.out rename to test/langtools/tools/javac/generics/rare/Rare6.out diff --git a/langtools/test/tools/javac/generics/rare/Rare7.java b/test/langtools/tools/javac/generics/rare/Rare7.java similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare7.java rename to test/langtools/tools/javac/generics/rare/Rare7.java diff --git a/langtools/test/tools/javac/generics/rare/Rare7.out b/test/langtools/tools/javac/generics/rare/Rare7.out similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare7.out rename to test/langtools/tools/javac/generics/rare/Rare7.out diff --git a/langtools/test/tools/javac/generics/rare/Rare8.java b/test/langtools/tools/javac/generics/rare/Rare8.java similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare8.java rename to test/langtools/tools/javac/generics/rare/Rare8.java diff --git a/langtools/test/tools/javac/generics/rare/Rare9.java b/test/langtools/tools/javac/generics/rare/Rare9.java similarity index 100% rename from langtools/test/tools/javac/generics/rare/Rare9.java rename to test/langtools/tools/javac/generics/rare/Rare9.java diff --git a/langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java b/test/langtools/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java rename to test/langtools/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java diff --git a/langtools/test/tools/javac/generics/rawOverride/7062745/T7062745neg.java b/test/langtools/tools/javac/generics/rawOverride/7062745/T7062745neg.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/7062745/T7062745neg.java rename to test/langtools/tools/javac/generics/rawOverride/7062745/T7062745neg.java diff --git a/langtools/test/tools/javac/generics/rawOverride/7062745/T7062745neg.out b/test/langtools/tools/javac/generics/rawOverride/7062745/T7062745neg.out similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/7062745/T7062745neg.out rename to test/langtools/tools/javac/generics/rawOverride/7062745/T7062745neg.out diff --git a/langtools/test/tools/javac/generics/rawOverride/7062745/T7062745pos.java b/test/langtools/tools/javac/generics/rawOverride/7062745/T7062745pos.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/7062745/T7062745pos.java rename to test/langtools/tools/javac/generics/rawOverride/7062745/T7062745pos.java diff --git a/langtools/test/tools/javac/generics/rawOverride/7157798/Test1.java b/test/langtools/tools/javac/generics/rawOverride/7157798/Test1.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/7157798/Test1.java rename to test/langtools/tools/javac/generics/rawOverride/7157798/Test1.java diff --git a/langtools/test/tools/javac/generics/rawOverride/7157798/Test2.java b/test/langtools/tools/javac/generics/rawOverride/7157798/Test2.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/7157798/Test2.java rename to test/langtools/tools/javac/generics/rawOverride/7157798/Test2.java diff --git a/langtools/test/tools/javac/generics/rawOverride/7157798/Test3.java b/test/langtools/tools/javac/generics/rawOverride/7157798/Test3.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/7157798/Test3.java rename to test/langtools/tools/javac/generics/rawOverride/7157798/Test3.java diff --git a/langtools/test/tools/javac/generics/rawOverride/7157798/Test3.out b/test/langtools/tools/javac/generics/rawOverride/7157798/Test3.out similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/7157798/Test3.out rename to test/langtools/tools/javac/generics/rawOverride/7157798/Test3.out diff --git a/langtools/test/tools/javac/generics/rawOverride/7157798/Test4.java b/test/langtools/tools/javac/generics/rawOverride/7157798/Test4.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/7157798/Test4.java rename to test/langtools/tools/javac/generics/rawOverride/7157798/Test4.java diff --git a/langtools/test/tools/javac/generics/rawOverride/7157798/Test4.out b/test/langtools/tools/javac/generics/rawOverride/7157798/Test4.out similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/7157798/Test4.out rename to test/langtools/tools/javac/generics/rawOverride/7157798/Test4.out diff --git a/langtools/test/tools/javac/generics/rawOverride/AttributeSet.java b/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/AttributeSet.java rename to test/langtools/tools/javac/generics/rawOverride/AttributeSet.java diff --git a/langtools/test/tools/javac/generics/rawOverride/Fail1.java b/test/langtools/tools/javac/generics/rawOverride/Fail1.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/Fail1.java rename to test/langtools/tools/javac/generics/rawOverride/Fail1.java diff --git a/langtools/test/tools/javac/generics/rawOverride/Fail1.out b/test/langtools/tools/javac/generics/rawOverride/Fail1.out similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/Fail1.out rename to test/langtools/tools/javac/generics/rawOverride/Fail1.out diff --git a/langtools/test/tools/javac/generics/rawOverride/T6178365.java b/test/langtools/tools/javac/generics/rawOverride/T6178365.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/T6178365.java rename to test/langtools/tools/javac/generics/rawOverride/T6178365.java diff --git a/langtools/test/tools/javac/generics/rawOverride/T6846972.java b/test/langtools/tools/javac/generics/rawOverride/T6846972.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/T6846972.java rename to test/langtools/tools/javac/generics/rawOverride/T6846972.java diff --git a/langtools/test/tools/javac/generics/rawOverride/T7148556.java b/test/langtools/tools/javac/generics/rawOverride/T7148556.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/T7148556.java rename to test/langtools/tools/javac/generics/rawOverride/T7148556.java diff --git a/langtools/test/tools/javac/generics/rawOverride/T8008627.java b/test/langtools/tools/javac/generics/rawOverride/T8008627.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/T8008627.java rename to test/langtools/tools/javac/generics/rawOverride/T8008627.java diff --git a/langtools/test/tools/javac/generics/rawOverride/Warn1.java b/test/langtools/tools/javac/generics/rawOverride/Warn1.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/Warn1.java rename to test/langtools/tools/javac/generics/rawOverride/Warn1.java diff --git a/langtools/test/tools/javac/generics/rawOverride/Warn1.out b/test/langtools/tools/javac/generics/rawOverride/Warn1.out similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/Warn1.out rename to test/langtools/tools/javac/generics/rawOverride/Warn1.out diff --git a/langtools/test/tools/javac/generics/rawOverride/Warn2.java b/test/langtools/tools/javac/generics/rawOverride/Warn2.java similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/Warn2.java rename to test/langtools/tools/javac/generics/rawOverride/Warn2.java diff --git a/langtools/test/tools/javac/generics/rawOverride/Warn2.out b/test/langtools/tools/javac/generics/rawOverride/Warn2.out similarity index 100% rename from langtools/test/tools/javac/generics/rawOverride/Warn2.out rename to test/langtools/tools/javac/generics/rawOverride/Warn2.out diff --git a/langtools/test/tools/javac/generics/rawSeparate/CharScanner.java b/test/langtools/tools/javac/generics/rawSeparate/CharScanner.java similarity index 100% rename from langtools/test/tools/javac/generics/rawSeparate/CharScanner.java rename to test/langtools/tools/javac/generics/rawSeparate/CharScanner.java diff --git a/langtools/test/tools/javac/generics/rawSeparate/Hashtable.java b/test/langtools/tools/javac/generics/rawSeparate/Hashtable.java similarity index 100% rename from langtools/test/tools/javac/generics/rawSeparate/Hashtable.java rename to test/langtools/tools/javac/generics/rawSeparate/Hashtable.java diff --git a/langtools/test/tools/javac/generics/rawSeparate/RetroLexer.java b/test/langtools/tools/javac/generics/rawSeparate/RetroLexer.java similarity index 100% rename from langtools/test/tools/javac/generics/rawSeparate/RetroLexer.java rename to test/langtools/tools/javac/generics/rawSeparate/RetroLexer.java diff --git a/langtools/test/tools/javac/generics/syntax/6318240/Bar.java b/test/langtools/tools/javac/generics/syntax/6318240/Bar.java similarity index 100% rename from langtools/test/tools/javac/generics/syntax/6318240/Bar.java rename to test/langtools/tools/javac/generics/syntax/6318240/Bar.java diff --git a/langtools/test/tools/javac/generics/syntax/6318240/BarNeg1.java b/test/langtools/tools/javac/generics/syntax/6318240/BarNeg1.java similarity index 100% rename from langtools/test/tools/javac/generics/syntax/6318240/BarNeg1.java rename to test/langtools/tools/javac/generics/syntax/6318240/BarNeg1.java diff --git a/langtools/test/tools/javac/generics/syntax/6318240/BarNeg1.out b/test/langtools/tools/javac/generics/syntax/6318240/BarNeg1.out similarity index 100% rename from langtools/test/tools/javac/generics/syntax/6318240/BarNeg1.out rename to test/langtools/tools/javac/generics/syntax/6318240/BarNeg1.out diff --git a/langtools/test/tools/javac/generics/syntax/6318240/BarNeg1a.java b/test/langtools/tools/javac/generics/syntax/6318240/BarNeg1a.java similarity index 100% rename from langtools/test/tools/javac/generics/syntax/6318240/BarNeg1a.java rename to test/langtools/tools/javac/generics/syntax/6318240/BarNeg1a.java diff --git a/langtools/test/tools/javac/generics/syntax/6318240/BarNeg1a.out b/test/langtools/tools/javac/generics/syntax/6318240/BarNeg1a.out similarity index 100% rename from langtools/test/tools/javac/generics/syntax/6318240/BarNeg1a.out rename to test/langtools/tools/javac/generics/syntax/6318240/BarNeg1a.out diff --git a/langtools/test/tools/javac/generics/syntax/6318240/BarNeg2.java b/test/langtools/tools/javac/generics/syntax/6318240/BarNeg2.java similarity index 100% rename from langtools/test/tools/javac/generics/syntax/6318240/BarNeg2.java rename to test/langtools/tools/javac/generics/syntax/6318240/BarNeg2.java diff --git a/langtools/test/tools/javac/generics/syntax/6318240/BarNeg2.out b/test/langtools/tools/javac/generics/syntax/6318240/BarNeg2.out similarity index 100% rename from langtools/test/tools/javac/generics/syntax/6318240/BarNeg2.out rename to test/langtools/tools/javac/generics/syntax/6318240/BarNeg2.out diff --git a/langtools/test/tools/javac/generics/syntax/6318240/BarNeg2a.java b/test/langtools/tools/javac/generics/syntax/6318240/BarNeg2a.java similarity index 100% rename from langtools/test/tools/javac/generics/syntax/6318240/BarNeg2a.java rename to test/langtools/tools/javac/generics/syntax/6318240/BarNeg2a.java diff --git a/langtools/test/tools/javac/generics/syntax/6318240/BarNeg2a.out b/test/langtools/tools/javac/generics/syntax/6318240/BarNeg2a.out similarity index 100% rename from langtools/test/tools/javac/generics/syntax/6318240/BarNeg2a.out rename to test/langtools/tools/javac/generics/syntax/6318240/BarNeg2a.out diff --git a/langtools/test/tools/javac/generics/syntax/6318240/Foo.java b/test/langtools/tools/javac/generics/syntax/6318240/Foo.java similarity index 100% rename from langtools/test/tools/javac/generics/syntax/6318240/Foo.java rename to test/langtools/tools/javac/generics/syntax/6318240/Foo.java diff --git a/langtools/test/tools/javac/generics/typeargs/Basic.java b/test/langtools/tools/javac/generics/typeargs/Basic.java similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Basic.java rename to test/langtools/tools/javac/generics/typeargs/Basic.java diff --git a/langtools/test/tools/javac/generics/typeargs/Metharg1.java b/test/langtools/tools/javac/generics/typeargs/Metharg1.java similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Metharg1.java rename to test/langtools/tools/javac/generics/typeargs/Metharg1.java diff --git a/langtools/test/tools/javac/generics/typeargs/Metharg1.out b/test/langtools/tools/javac/generics/typeargs/Metharg1.out similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Metharg1.out rename to test/langtools/tools/javac/generics/typeargs/Metharg1.out diff --git a/langtools/test/tools/javac/generics/typeargs/Metharg2.java b/test/langtools/tools/javac/generics/typeargs/Metharg2.java similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Metharg2.java rename to test/langtools/tools/javac/generics/typeargs/Metharg2.java diff --git a/langtools/test/tools/javac/generics/typeargs/Metharg2.out b/test/langtools/tools/javac/generics/typeargs/Metharg2.out similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Metharg2.out rename to test/langtools/tools/javac/generics/typeargs/Metharg2.out diff --git a/langtools/test/tools/javac/generics/typeargs/Newarg1.java b/test/langtools/tools/javac/generics/typeargs/Newarg1.java similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Newarg1.java rename to test/langtools/tools/javac/generics/typeargs/Newarg1.java diff --git a/langtools/test/tools/javac/generics/typeargs/Newarg1.out b/test/langtools/tools/javac/generics/typeargs/Newarg1.out similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Newarg1.out rename to test/langtools/tools/javac/generics/typeargs/Newarg1.out diff --git a/langtools/test/tools/javac/generics/typeargs/Newarg2.java b/test/langtools/tools/javac/generics/typeargs/Newarg2.java similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Newarg2.java rename to test/langtools/tools/javac/generics/typeargs/Newarg2.java diff --git a/langtools/test/tools/javac/generics/typeargs/Newarg2.out b/test/langtools/tools/javac/generics/typeargs/Newarg2.out similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Newarg2.out rename to test/langtools/tools/javac/generics/typeargs/Newarg2.out diff --git a/langtools/test/tools/javac/generics/typeargs/Superarg1.java b/test/langtools/tools/javac/generics/typeargs/Superarg1.java similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Superarg1.java rename to test/langtools/tools/javac/generics/typeargs/Superarg1.java diff --git a/langtools/test/tools/javac/generics/typeargs/Superarg1.out b/test/langtools/tools/javac/generics/typeargs/Superarg1.out similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Superarg1.out rename to test/langtools/tools/javac/generics/typeargs/Superarg1.out diff --git a/langtools/test/tools/javac/generics/typeargs/Superarg2.java b/test/langtools/tools/javac/generics/typeargs/Superarg2.java similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Superarg2.java rename to test/langtools/tools/javac/generics/typeargs/Superarg2.java diff --git a/langtools/test/tools/javac/generics/typeargs/Superarg2.out b/test/langtools/tools/javac/generics/typeargs/Superarg2.out similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/Superarg2.out rename to test/langtools/tools/javac/generics/typeargs/Superarg2.out diff --git a/langtools/test/tools/javac/generics/typeargs/ThisArg.java b/test/langtools/tools/javac/generics/typeargs/ThisArg.java similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/ThisArg.java rename to test/langtools/tools/javac/generics/typeargs/ThisArg.java diff --git a/langtools/test/tools/javac/generics/typeargs/ThisArg.out b/test/langtools/tools/javac/generics/typeargs/ThisArg.out similarity index 100% rename from langtools/test/tools/javac/generics/typeargs/ThisArg.out rename to test/langtools/tools/javac/generics/typeargs/ThisArg.out diff --git a/langtools/test/tools/javac/generics/typevars/4856983/T4856983.java b/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/4856983/T4856983.java rename to test/langtools/tools/javac/generics/typevars/4856983/T4856983.java diff --git a/langtools/test/tools/javac/generics/typevars/4856983/T4856983a.java b/test/langtools/tools/javac/generics/typevars/4856983/T4856983a.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/4856983/T4856983a.java rename to test/langtools/tools/javac/generics/typevars/4856983/T4856983a.java diff --git a/langtools/test/tools/javac/generics/typevars/4856983/T4856983a.out b/test/langtools/tools/javac/generics/typevars/4856983/T4856983a.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/4856983/T4856983a.out rename to test/langtools/tools/javac/generics/typevars/4856983/T4856983a.out diff --git a/langtools/test/tools/javac/generics/typevars/4856983/T4856983b.java b/test/langtools/tools/javac/generics/typevars/4856983/T4856983b.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/4856983/T4856983b.java rename to test/langtools/tools/javac/generics/typevars/4856983/T4856983b.java diff --git a/langtools/test/tools/javac/generics/typevars/4856983/T4856983b.out b/test/langtools/tools/javac/generics/typevars/4856983/T4856983b.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/4856983/T4856983b.out rename to test/langtools/tools/javac/generics/typevars/4856983/T4856983b.out diff --git a/langtools/test/tools/javac/generics/typevars/5060485/Compatibility.java b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5060485/Compatibility.java rename to test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java diff --git a/langtools/test/tools/javac/generics/typevars/5060485/Compatibility.out b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5060485/Compatibility.out rename to test/langtools/tools/javac/generics/typevars/5060485/Compatibility.out diff --git a/langtools/test/tools/javac/generics/typevars/5060485/Compatibility02.java b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility02.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5060485/Compatibility02.java rename to test/langtools/tools/javac/generics/typevars/5060485/Compatibility02.java diff --git a/langtools/test/tools/javac/generics/typevars/5060485/Compatibility02.out b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility02.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5060485/Compatibility02.out rename to test/langtools/tools/javac/generics/typevars/5060485/Compatibility02.out diff --git a/langtools/test/tools/javac/generics/typevars/5060485/Method.java b/test/langtools/tools/javac/generics/typevars/5060485/Method.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5060485/Method.java rename to test/langtools/tools/javac/generics/typevars/5060485/Method.java diff --git a/langtools/test/tools/javac/generics/typevars/5060485/Neg1.java b/test/langtools/tools/javac/generics/typevars/5060485/Neg1.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5060485/Neg1.java rename to test/langtools/tools/javac/generics/typevars/5060485/Neg1.java diff --git a/langtools/test/tools/javac/generics/typevars/5060485/Neg1.out b/test/langtools/tools/javac/generics/typevars/5060485/Neg1.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5060485/Neg1.out rename to test/langtools/tools/javac/generics/typevars/5060485/Neg1.out diff --git a/langtools/test/tools/javac/generics/typevars/5060485/Neg2.java b/test/langtools/tools/javac/generics/typevars/5060485/Neg2.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5060485/Neg2.java rename to test/langtools/tools/javac/generics/typevars/5060485/Neg2.java diff --git a/langtools/test/tools/javac/generics/typevars/5060485/Neg2.out b/test/langtools/tools/javac/generics/typevars/5060485/Neg2.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5060485/Neg2.out rename to test/langtools/tools/javac/generics/typevars/5060485/Neg2.out diff --git a/langtools/test/tools/javac/generics/typevars/5060485/Pos.java b/test/langtools/tools/javac/generics/typevars/5060485/Pos.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5060485/Pos.java rename to test/langtools/tools/javac/generics/typevars/5060485/Pos.java diff --git a/langtools/test/tools/javac/generics/typevars/5060485/T5060485.java b/test/langtools/tools/javac/generics/typevars/5060485/T5060485.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5060485/T5060485.java rename to test/langtools/tools/javac/generics/typevars/5060485/T5060485.java diff --git a/langtools/test/tools/javac/generics/typevars/5061359/Base.java b/test/langtools/tools/javac/generics/typevars/5061359/Base.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5061359/Base.java rename to test/langtools/tools/javac/generics/typevars/5061359/Base.java diff --git a/langtools/test/tools/javac/generics/typevars/5061359/Intf.java b/test/langtools/tools/javac/generics/typevars/5061359/Intf.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5061359/Intf.java rename to test/langtools/tools/javac/generics/typevars/5061359/Intf.java diff --git a/langtools/test/tools/javac/generics/typevars/5061359/T5061359.java b/test/langtools/tools/javac/generics/typevars/5061359/T5061359.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5061359/T5061359.java rename to test/langtools/tools/javac/generics/typevars/5061359/T5061359.java diff --git a/langtools/test/tools/javac/generics/typevars/5061359/T5061359.out b/test/langtools/tools/javac/generics/typevars/5061359/T5061359.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5061359/T5061359.out rename to test/langtools/tools/javac/generics/typevars/5061359/T5061359.out diff --git a/langtools/test/tools/javac/generics/typevars/5061359/T5061359a.java b/test/langtools/tools/javac/generics/typevars/5061359/T5061359a.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5061359/T5061359a.java rename to test/langtools/tools/javac/generics/typevars/5061359/T5061359a.java diff --git a/langtools/test/tools/javac/generics/typevars/5061359/T5061359a.out b/test/langtools/tools/javac/generics/typevars/5061359/T5061359a.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5061359/T5061359a.out rename to test/langtools/tools/javac/generics/typevars/5061359/T5061359a.out diff --git a/langtools/test/tools/javac/generics/typevars/5061359/T5061359b.java b/test/langtools/tools/javac/generics/typevars/5061359/T5061359b.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/5061359/T5061359b.java rename to test/langtools/tools/javac/generics/typevars/5061359/T5061359b.java diff --git a/langtools/test/tools/javac/generics/typevars/6182630/T6182630.java b/test/langtools/tools/javac/generics/typevars/6182630/T6182630.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6182630/T6182630.java rename to test/langtools/tools/javac/generics/typevars/6182630/T6182630.java diff --git a/langtools/test/tools/javac/generics/typevars/6182630/T6182630.out b/test/langtools/tools/javac/generics/typevars/6182630/T6182630.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6182630/T6182630.out rename to test/langtools/tools/javac/generics/typevars/6182630/T6182630.out diff --git a/langtools/test/tools/javac/generics/typevars/6199146/T6199146.java b/test/langtools/tools/javac/generics/typevars/6199146/T6199146.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6199146/T6199146.java rename to test/langtools/tools/javac/generics/typevars/6199146/T6199146.java diff --git a/langtools/test/tools/javac/generics/typevars/6199146/T6199146.out b/test/langtools/tools/javac/generics/typevars/6199146/T6199146.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6199146/T6199146.out rename to test/langtools/tools/javac/generics/typevars/6199146/T6199146.out diff --git a/langtools/test/tools/javac/generics/typevars/6486430/T6486430.java b/test/langtools/tools/javac/generics/typevars/6486430/T6486430.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6486430/T6486430.java rename to test/langtools/tools/javac/generics/typevars/6486430/T6486430.java diff --git a/langtools/test/tools/javac/generics/typevars/6486430/T6486430.out b/test/langtools/tools/javac/generics/typevars/6486430/T6486430.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6486430/T6486430.out rename to test/langtools/tools/javac/generics/typevars/6486430/T6486430.out diff --git a/langtools/test/tools/javac/generics/typevars/6486430/T6486430a.java b/test/langtools/tools/javac/generics/typevars/6486430/T6486430a.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6486430/T6486430a.java rename to test/langtools/tools/javac/generics/typevars/6486430/T6486430a.java diff --git a/langtools/test/tools/javac/generics/typevars/6486430/T6486430a.out b/test/langtools/tools/javac/generics/typevars/6486430/T6486430a.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6486430/T6486430a.out rename to test/langtools/tools/javac/generics/typevars/6486430/T6486430a.out diff --git a/langtools/test/tools/javac/generics/typevars/6569404/T6569404a.java b/test/langtools/tools/javac/generics/typevars/6569404/T6569404a.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6569404/T6569404a.java rename to test/langtools/tools/javac/generics/typevars/6569404/T6569404a.java diff --git a/langtools/test/tools/javac/generics/typevars/6569404/T6569404b.java b/test/langtools/tools/javac/generics/typevars/6569404/T6569404b.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6569404/T6569404b.java rename to test/langtools/tools/javac/generics/typevars/6569404/T6569404b.java diff --git a/langtools/test/tools/javac/generics/typevars/6569404/T6569404b.out b/test/langtools/tools/javac/generics/typevars/6569404/T6569404b.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6569404/T6569404b.out rename to test/langtools/tools/javac/generics/typevars/6569404/T6569404b.out diff --git a/langtools/test/tools/javac/generics/typevars/6569404/T6569404c.java b/test/langtools/tools/javac/generics/typevars/6569404/T6569404c.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6569404/T6569404c.java rename to test/langtools/tools/javac/generics/typevars/6569404/T6569404c.java diff --git a/langtools/test/tools/javac/generics/typevars/6680106/T6680106.java b/test/langtools/tools/javac/generics/typevars/6680106/T6680106.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6680106/T6680106.java rename to test/langtools/tools/javac/generics/typevars/6680106/T6680106.java diff --git a/langtools/test/tools/javac/generics/typevars/6680106/T6680106.out b/test/langtools/tools/javac/generics/typevars/6680106/T6680106.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6680106/T6680106.out rename to test/langtools/tools/javac/generics/typevars/6680106/T6680106.out diff --git a/langtools/test/tools/javac/generics/typevars/6804733/T6804733.java b/test/langtools/tools/javac/generics/typevars/6804733/T6804733.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6804733/T6804733.java rename to test/langtools/tools/javac/generics/typevars/6804733/T6804733.java diff --git a/langtools/test/tools/javac/generics/typevars/6804733/T6804733.out b/test/langtools/tools/javac/generics/typevars/6804733/T6804733.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6804733/T6804733.out rename to test/langtools/tools/javac/generics/typevars/6804733/T6804733.out diff --git a/langtools/test/tools/javac/generics/typevars/6968793/T6968793.java b/test/langtools/tools/javac/generics/typevars/6968793/T6968793.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6968793/T6968793.java rename to test/langtools/tools/javac/generics/typevars/6968793/T6968793.java diff --git a/langtools/test/tools/javac/generics/typevars/6968793/T6968793.out b/test/langtools/tools/javac/generics/typevars/6968793/T6968793.out similarity index 100% rename from langtools/test/tools/javac/generics/typevars/6968793/T6968793.out rename to test/langtools/tools/javac/generics/typevars/6968793/T6968793.out diff --git a/langtools/test/tools/javac/generics/typevars/8129214/T8129214.java b/test/langtools/tools/javac/generics/typevars/8129214/T8129214.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/8129214/T8129214.java rename to test/langtools/tools/javac/generics/typevars/8129214/T8129214.java diff --git a/langtools/test/tools/javac/generics/typevars/8129214/pkg/Foo.java b/test/langtools/tools/javac/generics/typevars/8129214/pkg/Foo.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/8129214/pkg/Foo.java rename to test/langtools/tools/javac/generics/typevars/8129214/pkg/Foo.java diff --git a/langtools/test/tools/javac/generics/typevars/IntersectionSubVar.java b/test/langtools/tools/javac/generics/typevars/IntersectionSubVar.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/IntersectionSubVar.java rename to test/langtools/tools/javac/generics/typevars/IntersectionSubVar.java diff --git a/langtools/test/tools/javac/generics/typevars/T6880344.java b/test/langtools/tools/javac/generics/typevars/T6880344.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/T6880344.java rename to test/langtools/tools/javac/generics/typevars/T6880344.java diff --git a/langtools/test/tools/javac/generics/typevars/T7040883.java b/test/langtools/tools/javac/generics/typevars/T7040883.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/T7040883.java rename to test/langtools/tools/javac/generics/typevars/T7040883.java diff --git a/langtools/test/tools/javac/generics/typevars/T7148242.java b/test/langtools/tools/javac/generics/typevars/T7148242.java similarity index 100% rename from langtools/test/tools/javac/generics/typevars/T7148242.java rename to test/langtools/tools/javac/generics/typevars/T7148242.java diff --git a/langtools/test/tools/javac/generics/wildcards/6320612/T6320612.java b/test/langtools/tools/javac/generics/wildcards/6320612/T6320612.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6320612/T6320612.java rename to test/langtools/tools/javac/generics/wildcards/6320612/T6320612.java diff --git a/langtools/test/tools/javac/generics/wildcards/6330931/T6330931.java b/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6330931/T6330931.java rename to test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java diff --git a/langtools/test/tools/javac/generics/wildcards/6437894/A.java b/test/langtools/tools/javac/generics/wildcards/6437894/A.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6437894/A.java rename to test/langtools/tools/javac/generics/wildcards/6437894/A.java diff --git a/langtools/test/tools/javac/generics/wildcards/6437894/B.java b/test/langtools/tools/javac/generics/wildcards/6437894/B.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6437894/B.java rename to test/langtools/tools/javac/generics/wildcards/6437894/B.java diff --git a/langtools/test/tools/javac/generics/wildcards/6437894/T6437894.java b/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6437894/T6437894.java rename to test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java diff --git a/langtools/test/tools/javac/generics/wildcards/6437894/T6437894.out b/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6437894/T6437894.out rename to test/langtools/tools/javac/generics/wildcards/6437894/T6437894.out diff --git a/langtools/test/tools/javac/generics/wildcards/6651719/T6651719a.java b/test/langtools/tools/javac/generics/wildcards/6651719/T6651719a.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6651719/T6651719a.java rename to test/langtools/tools/javac/generics/wildcards/6651719/T6651719a.java diff --git a/langtools/test/tools/javac/generics/wildcards/6762569/T6762569a.java b/test/langtools/tools/javac/generics/wildcards/6762569/T6762569a.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6762569/T6762569a.java rename to test/langtools/tools/javac/generics/wildcards/6762569/T6762569a.java diff --git a/langtools/test/tools/javac/generics/wildcards/6762569/T6762569b.java b/test/langtools/tools/javac/generics/wildcards/6762569/T6762569b.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6762569/T6762569b.java rename to test/langtools/tools/javac/generics/wildcards/6762569/T6762569b.java diff --git a/langtools/test/tools/javac/generics/wildcards/6762569/T6762569b.out b/test/langtools/tools/javac/generics/wildcards/6762569/T6762569b.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6762569/T6762569b.out rename to test/langtools/tools/javac/generics/wildcards/6762569/T6762569b.out diff --git a/langtools/test/tools/javac/generics/wildcards/6886247/T6886247_1.java b/test/langtools/tools/javac/generics/wildcards/6886247/T6886247_1.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6886247/T6886247_1.java rename to test/langtools/tools/javac/generics/wildcards/6886247/T6886247_1.java diff --git a/langtools/test/tools/javac/generics/wildcards/6886247/T6886247_2.java b/test/langtools/tools/javac/generics/wildcards/6886247/T6886247_2.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6886247/T6886247_2.java rename to test/langtools/tools/javac/generics/wildcards/6886247/T6886247_2.java diff --git a/langtools/test/tools/javac/generics/wildcards/6886247/T6886247_2.out b/test/langtools/tools/javac/generics/wildcards/6886247/T6886247_2.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/6886247/T6886247_2.out rename to test/langtools/tools/javac/generics/wildcards/6886247/T6886247_2.out diff --git a/langtools/test/tools/javac/generics/wildcards/7034495/T7034495.java b/test/langtools/tools/javac/generics/wildcards/7034495/T7034495.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/7034495/T7034495.java rename to test/langtools/tools/javac/generics/wildcards/7034495/T7034495.java diff --git a/langtools/test/tools/javac/generics/wildcards/7034495/T7034495.out b/test/langtools/tools/javac/generics/wildcards/7034495/T7034495.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/7034495/T7034495.out rename to test/langtools/tools/javac/generics/wildcards/7034495/T7034495.out diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes.java b/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes.java rename to test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.java diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes.out b/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes.out rename to test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.out diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType.java b/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/AssignmentSameType.java rename to test/langtools/tools/javac/generics/wildcards/AssignmentSameType.java diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType.out b/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/AssignmentSameType.out rename to test/langtools/tools/javac/generics/wildcards/AssignmentSameType.out diff --git a/langtools/test/tools/javac/generics/wildcards/BoundBug.java b/test/langtools/tools/javac/generics/wildcards/BoundBug.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/BoundBug.java rename to test/langtools/tools/javac/generics/wildcards/BoundBug.java diff --git a/langtools/test/tools/javac/generics/wildcards/ContraArg.java b/test/langtools/tools/javac/generics/wildcards/ContraArg.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/ContraArg.java rename to test/langtools/tools/javac/generics/wildcards/ContraArg.java diff --git a/langtools/test/tools/javac/generics/wildcards/RefQueue.java b/test/langtools/tools/javac/generics/wildcards/RefQueue.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/RefQueue.java rename to test/langtools/tools/javac/generics/wildcards/RefQueue.java diff --git a/langtools/test/tools/javac/generics/wildcards/RefQueueBug.java b/test/langtools/tools/javac/generics/wildcards/RefQueueBug.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/RefQueueBug.java rename to test/langtools/tools/javac/generics/wildcards/RefQueueBug.java diff --git a/langtools/test/tools/javac/generics/wildcards/SubtypeCaptureLeak.java b/test/langtools/tools/javac/generics/wildcards/SubtypeCaptureLeak.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/SubtypeCaptureLeak.java rename to test/langtools/tools/javac/generics/wildcards/SubtypeCaptureLeak.java diff --git a/langtools/test/tools/javac/generics/wildcards/T5097548.java b/test/langtools/tools/javac/generics/wildcards/T5097548.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/T5097548.java rename to test/langtools/tools/javac/generics/wildcards/T5097548.java diff --git a/langtools/test/tools/javac/generics/wildcards/T5097548b.java b/test/langtools/tools/javac/generics/wildcards/T5097548b.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/T5097548b.java rename to test/langtools/tools/javac/generics/wildcards/T5097548b.java diff --git a/langtools/test/tools/javac/generics/wildcards/T6450290.java b/test/langtools/tools/javac/generics/wildcards/T6450290.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/T6450290.java rename to test/langtools/tools/javac/generics/wildcards/T6450290.java diff --git a/langtools/test/tools/javac/generics/wildcards/T6450290.out b/test/langtools/tools/javac/generics/wildcards/T6450290.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/T6450290.out rename to test/langtools/tools/javac/generics/wildcards/T6450290.out diff --git a/langtools/test/tools/javac/generics/wildcards/T6732484.java b/test/langtools/tools/javac/generics/wildcards/T6732484.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/T6732484.java rename to test/langtools/tools/javac/generics/wildcards/T6732484.java diff --git a/langtools/test/tools/javac/generics/wildcards/T8015101.java b/test/langtools/tools/javac/generics/wildcards/T8015101.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/T8015101.java rename to test/langtools/tools/javac/generics/wildcards/T8015101.java diff --git a/langtools/test/tools/javac/generics/wildcards/T8034147.java b/test/langtools/tools/javac/generics/wildcards/T8034147.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/T8034147.java rename to test/langtools/tools/javac/generics/wildcards/T8034147.java diff --git a/langtools/test/tools/javac/generics/wildcards/UnboundArray.java b/test/langtools/tools/javac/generics/wildcards/UnboundArray.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/UnboundArray.java rename to test/langtools/tools/javac/generics/wildcards/UnboundArray.java diff --git a/langtools/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java b/test/langtools/tools/javac/generics/wildcards/neg/AmbiguousCast.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java rename to test/langtools/tools/javac/generics/wildcards/neg/AmbiguousCast.java diff --git a/langtools/test/tools/javac/generics/wildcards/neg/AmbiguousCast.out b/test/langtools/tools/javac/generics/wildcards/neg/AmbiguousCast.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/AmbiguousCast.out rename to test/langtools/tools/javac/generics/wildcards/neg/AmbiguousCast.out diff --git a/langtools/test/tools/javac/generics/wildcards/neg/Capture.java b/test/langtools/tools/javac/generics/wildcards/neg/Capture.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/Capture.java rename to test/langtools/tools/javac/generics/wildcards/neg/Capture.java diff --git a/langtools/test/tools/javac/generics/wildcards/neg/Capture.out b/test/langtools/tools/javac/generics/wildcards/neg/Capture.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/Capture.out rename to test/langtools/tools/javac/generics/wildcards/neg/Capture.out diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail.java b/test/langtools/tools/javac/generics/wildcards/neg/CastFail.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/CastFail.java rename to test/langtools/tools/javac/generics/wildcards/neg/CastFail.java diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail.out b/test/langtools/tools/javac/generics/wildcards/neg/CastFail.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/CastFail.out rename to test/langtools/tools/javac/generics/wildcards/neg/CastFail.out diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastTest.java b/test/langtools/tools/javac/generics/wildcards/neg/CastTest.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/CastTest.java rename to test/langtools/tools/javac/generics/wildcards/neg/CastTest.java diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn.java b/test/langtools/tools/javac/generics/wildcards/neg/CastWarn.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/CastWarn.java rename to test/langtools/tools/javac/generics/wildcards/neg/CastWarn.java diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn.out b/test/langtools/tools/javac/generics/wildcards/neg/CastWarn.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/CastWarn.out rename to test/langtools/tools/javac/generics/wildcards/neg/CastWarn.out diff --git a/langtools/test/tools/javac/generics/wildcards/neg/ParamCast.java b/test/langtools/tools/javac/generics/wildcards/neg/ParamCast.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/ParamCast.java rename to test/langtools/tools/javac/generics/wildcards/neg/ParamCast.java diff --git a/langtools/test/tools/javac/generics/wildcards/neg/ParamCast.out b/test/langtools/tools/javac/generics/wildcards/neg/ParamCast.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/ParamCast.out rename to test/langtools/tools/javac/generics/wildcards/neg/ParamCast.out diff --git a/langtools/test/tools/javac/generics/wildcards/neg/Readonly.java b/test/langtools/tools/javac/generics/wildcards/neg/Readonly.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/Readonly.java rename to test/langtools/tools/javac/generics/wildcards/neg/Readonly.java diff --git a/langtools/test/tools/javac/generics/wildcards/neg/Readonly.out b/test/langtools/tools/javac/generics/wildcards/neg/Readonly.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/Readonly.out rename to test/langtools/tools/javac/generics/wildcards/neg/Readonly.out diff --git a/langtools/test/tools/javac/generics/wildcards/neg/Unbounded.java b/test/langtools/tools/javac/generics/wildcards/neg/Unbounded.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/Unbounded.java rename to test/langtools/tools/javac/generics/wildcards/neg/Unbounded.java diff --git a/langtools/test/tools/javac/generics/wildcards/neg/Unbounded.out b/test/langtools/tools/javac/generics/wildcards/neg/Unbounded.out similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/neg/Unbounded.out rename to test/langtools/tools/javac/generics/wildcards/neg/Unbounded.out diff --git a/langtools/test/tools/javac/generics/wildcards/pos/AmbiguousCast2.java b/test/langtools/tools/javac/generics/wildcards/pos/AmbiguousCast2.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/pos/AmbiguousCast2.java rename to test/langtools/tools/javac/generics/wildcards/pos/AmbiguousCast2.java diff --git a/langtools/test/tools/javac/generics/wildcards/pos/BoundsCollision.java b/test/langtools/tools/javac/generics/wildcards/pos/BoundsCollision.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/pos/BoundsCollision.java rename to test/langtools/tools/javac/generics/wildcards/pos/BoundsCollision.java diff --git a/langtools/test/tools/javac/generics/wildcards/pos/Capture.java b/test/langtools/tools/javac/generics/wildcards/pos/Capture.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/pos/Capture.java rename to test/langtools/tools/javac/generics/wildcards/pos/Capture.java diff --git a/langtools/test/tools/javac/generics/wildcards/pos/CastTest.java b/test/langtools/tools/javac/generics/wildcards/pos/CastTest.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/pos/CastTest.java rename to test/langtools/tools/javac/generics/wildcards/pos/CastTest.java diff --git a/langtools/test/tools/javac/generics/wildcards/pos/InstanceOf.java b/test/langtools/tools/javac/generics/wildcards/pos/InstanceOf.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/pos/InstanceOf.java rename to test/langtools/tools/javac/generics/wildcards/pos/InstanceOf.java diff --git a/langtools/test/tools/javac/generics/wildcards/pos/ParamCast.java b/test/langtools/tools/javac/generics/wildcards/pos/ParamCast.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/pos/ParamCast.java rename to test/langtools/tools/javac/generics/wildcards/pos/ParamCast.java diff --git a/langtools/test/tools/javac/generics/wildcards/pos/RvalConversion.java b/test/langtools/tools/javac/generics/wildcards/pos/RvalConversion.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/pos/RvalConversion.java rename to test/langtools/tools/javac/generics/wildcards/pos/RvalConversion.java diff --git a/langtools/test/tools/javac/generics/wildcards/pos/UncheckedCast1.java b/test/langtools/tools/javac/generics/wildcards/pos/UncheckedCast1.java similarity index 100% rename from langtools/test/tools/javac/generics/wildcards/pos/UncheckedCast1.java rename to test/langtools/tools/javac/generics/wildcards/pos/UncheckedCast1.java diff --git a/langtools/test/tools/javac/ignored.jtx b/test/langtools/tools/javac/ignored.jtx similarity index 100% rename from langtools/test/tools/javac/ignored.jtx rename to test/langtools/tools/javac/ignored.jtx diff --git a/langtools/test/tools/javac/implicitCompile/Implicit.java b/test/langtools/tools/javac/implicitCompile/Implicit.java similarity index 100% rename from langtools/test/tools/javac/implicitCompile/Implicit.java rename to test/langtools/tools/javac/implicitCompile/Implicit.java diff --git a/langtools/test/tools/javac/implicitCompile/SkipAttrFlowGenForImplicits.java b/test/langtools/tools/javac/implicitCompile/SkipAttrFlowGenForImplicits.java similarity index 100% rename from langtools/test/tools/javac/implicitCompile/SkipAttrFlowGenForImplicits.java rename to test/langtools/tools/javac/implicitCompile/SkipAttrFlowGenForImplicits.java diff --git a/langtools/test/tools/javac/implicitCompile/SkipAttrFlowGenForImplicits.out b/test/langtools/tools/javac/implicitCompile/SkipAttrFlowGenForImplicits.out similarity index 100% rename from langtools/test/tools/javac/implicitCompile/SkipAttrFlowGenForImplicits.out rename to test/langtools/tools/javac/implicitCompile/SkipAttrFlowGenForImplicits.out diff --git a/langtools/test/tools/javac/implicitThis/6541876/T6541876a.java b/test/langtools/tools/javac/implicitThis/6541876/T6541876a.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/6541876/T6541876a.java rename to test/langtools/tools/javac/implicitThis/6541876/T6541876a.java diff --git a/langtools/test/tools/javac/implicitThis/6541876/T6541876b.java b/test/langtools/tools/javac/implicitThis/6541876/T6541876b.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/6541876/T6541876b.java rename to test/langtools/tools/javac/implicitThis/6541876/T6541876b.java diff --git a/langtools/test/tools/javac/implicitThis/NewBeforeOuterConstructed.java b/test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/NewBeforeOuterConstructed.java rename to test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed.java diff --git a/langtools/test/tools/javac/implicitThis/NewBeforeOuterConstructed.out b/test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed.out similarity index 100% rename from langtools/test/tools/javac/implicitThis/NewBeforeOuterConstructed.out rename to test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed.out diff --git a/langtools/test/tools/javac/implicitThis/NewBeforeOuterConstructed2.java b/test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed2.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/NewBeforeOuterConstructed2.java rename to test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed2.java diff --git a/langtools/test/tools/javac/implicitThis/NewBeforeOuterConstructed2.out b/test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed2.out similarity index 100% rename from langtools/test/tools/javac/implicitThis/NewBeforeOuterConstructed2.out rename to test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed2.out diff --git a/langtools/test/tools/javac/implicitThis/NewBeforeOuterConstructed3.java b/test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed3.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/NewBeforeOuterConstructed3.java rename to test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed3.java diff --git a/langtools/test/tools/javac/implicitThis/WhichImplicitThis1.java b/test/langtools/tools/javac/implicitThis/WhichImplicitThis1.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/WhichImplicitThis1.java rename to test/langtools/tools/javac/implicitThis/WhichImplicitThis1.java diff --git a/langtools/test/tools/javac/implicitThis/WhichImplicitThis10.java b/test/langtools/tools/javac/implicitThis/WhichImplicitThis10.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/WhichImplicitThis10.java rename to test/langtools/tools/javac/implicitThis/WhichImplicitThis10.java diff --git a/langtools/test/tools/javac/implicitThis/WhichImplicitThis11.java b/test/langtools/tools/javac/implicitThis/WhichImplicitThis11.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/WhichImplicitThis11.java rename to test/langtools/tools/javac/implicitThis/WhichImplicitThis11.java diff --git a/langtools/test/tools/javac/implicitThis/WhichImplicitThis2.java b/test/langtools/tools/javac/implicitThis/WhichImplicitThis2.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/WhichImplicitThis2.java rename to test/langtools/tools/javac/implicitThis/WhichImplicitThis2.java diff --git a/langtools/test/tools/javac/implicitThis/WhichImplicitThis3.java b/test/langtools/tools/javac/implicitThis/WhichImplicitThis3.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/WhichImplicitThis3.java rename to test/langtools/tools/javac/implicitThis/WhichImplicitThis3.java diff --git a/langtools/test/tools/javac/implicitThis/WhichImplicitThis4.java b/test/langtools/tools/javac/implicitThis/WhichImplicitThis4.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/WhichImplicitThis4.java rename to test/langtools/tools/javac/implicitThis/WhichImplicitThis4.java diff --git a/langtools/test/tools/javac/implicitThis/WhichImplicitThis5.java b/test/langtools/tools/javac/implicitThis/WhichImplicitThis5.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/WhichImplicitThis5.java rename to test/langtools/tools/javac/implicitThis/WhichImplicitThis5.java diff --git a/langtools/test/tools/javac/implicitThis/WhichImplicitThis6.java b/test/langtools/tools/javac/implicitThis/WhichImplicitThis6.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/WhichImplicitThis6.java rename to test/langtools/tools/javac/implicitThis/WhichImplicitThis6.java diff --git a/langtools/test/tools/javac/implicitThis/WhichImplicitThis7.java b/test/langtools/tools/javac/implicitThis/WhichImplicitThis7.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/WhichImplicitThis7.java rename to test/langtools/tools/javac/implicitThis/WhichImplicitThis7.java diff --git a/langtools/test/tools/javac/implicitThis/WhichImplicitThis9.java b/test/langtools/tools/javac/implicitThis/WhichImplicitThis9.java similarity index 100% rename from langtools/test/tools/javac/implicitThis/WhichImplicitThis9.java rename to test/langtools/tools/javac/implicitThis/WhichImplicitThis9.java diff --git a/langtools/test/tools/javac/importChecks/ImportCanonical1.java b/test/langtools/tools/javac/importChecks/ImportCanonical1.java similarity index 100% rename from langtools/test/tools/javac/importChecks/ImportCanonical1.java rename to test/langtools/tools/javac/importChecks/ImportCanonical1.java diff --git a/langtools/test/tools/javac/importChecks/ImportCanonical1.out b/test/langtools/tools/javac/importChecks/ImportCanonical1.out similarity index 100% rename from langtools/test/tools/javac/importChecks/ImportCanonical1.out rename to test/langtools/tools/javac/importChecks/ImportCanonical1.out diff --git a/langtools/test/tools/javac/importChecks/ImportCanonical2.java b/test/langtools/tools/javac/importChecks/ImportCanonical2.java similarity index 100% rename from langtools/test/tools/javac/importChecks/ImportCanonical2.java rename to test/langtools/tools/javac/importChecks/ImportCanonical2.java diff --git a/langtools/test/tools/javac/importChecks/ImportIsFullyQualified.java b/test/langtools/tools/javac/importChecks/ImportIsFullyQualified.java similarity index 100% rename from langtools/test/tools/javac/importChecks/ImportIsFullyQualified.java rename to test/langtools/tools/javac/importChecks/ImportIsFullyQualified.java diff --git a/langtools/test/tools/javac/importChecks/ImportIsFullyQualified.out b/test/langtools/tools/javac/importChecks/ImportIsFullyQualified.out similarity index 100% rename from langtools/test/tools/javac/importChecks/ImportIsFullyQualified.out rename to test/langtools/tools/javac/importChecks/ImportIsFullyQualified.out diff --git a/langtools/test/tools/javac/importChecks/ImportOfOwnClass.java b/test/langtools/tools/javac/importChecks/ImportOfOwnClass.java similarity index 100% rename from langtools/test/tools/javac/importChecks/ImportOfOwnClass.java rename to test/langtools/tools/javac/importChecks/ImportOfOwnClass.java diff --git a/langtools/test/tools/javac/importChecks/ImportsObservable.java b/test/langtools/tools/javac/importChecks/ImportsObservable.java similarity index 100% rename from langtools/test/tools/javac/importChecks/ImportsObservable.java rename to test/langtools/tools/javac/importChecks/ImportsObservable.java diff --git a/langtools/test/tools/javac/importChecks/InvalidImportsNoClasses.java b/test/langtools/tools/javac/importChecks/InvalidImportsNoClasses.java similarity index 100% rename from langtools/test/tools/javac/importChecks/InvalidImportsNoClasses.java rename to test/langtools/tools/javac/importChecks/InvalidImportsNoClasses.java diff --git a/langtools/test/tools/javac/importChecks/InvalidImportsNoClasses.out b/test/langtools/tools/javac/importChecks/InvalidImportsNoClasses.out similarity index 100% rename from langtools/test/tools/javac/importChecks/InvalidImportsNoClasses.out rename to test/langtools/tools/javac/importChecks/InvalidImportsNoClasses.out diff --git a/langtools/test/tools/javac/importChecks/NoImportedNoClasses.java b/test/langtools/tools/javac/importChecks/NoImportedNoClasses.java similarity index 100% rename from langtools/test/tools/javac/importChecks/NoImportedNoClasses.java rename to test/langtools/tools/javac/importChecks/NoImportedNoClasses.java diff --git a/langtools/test/tools/javac/importChecks/NoImportedNoClasses.out b/test/langtools/tools/javac/importChecks/NoImportedNoClasses.out similarity index 100% rename from langtools/test/tools/javac/importChecks/NoImportedNoClasses.out rename to test/langtools/tools/javac/importChecks/NoImportedNoClasses.out diff --git a/langtools/test/tools/javac/importContext/anonPackage/Foo.java b/test/langtools/tools/javac/importContext/anonPackage/Foo.java similarity index 100% rename from langtools/test/tools/javac/importContext/anonPackage/Foo.java rename to test/langtools/tools/javac/importContext/anonPackage/Foo.java diff --git a/langtools/test/tools/javac/importContext/anonPackage/bar/Baz.java b/test/langtools/tools/javac/importContext/anonPackage/bar/Baz.java similarity index 100% rename from langtools/test/tools/javac/importContext/anonPackage/bar/Baz.java rename to test/langtools/tools/javac/importContext/anonPackage/bar/Baz.java diff --git a/langtools/test/tools/javac/importContext/namedPackage/Dummy.java b/test/langtools/tools/javac/importContext/namedPackage/Dummy.java similarity index 100% rename from langtools/test/tools/javac/importContext/namedPackage/Dummy.java rename to test/langtools/tools/javac/importContext/namedPackage/Dummy.java diff --git a/langtools/test/tools/javac/importContext/namedPackage/bar/Baz.java b/test/langtools/tools/javac/importContext/namedPackage/bar/Baz.java similarity index 100% rename from langtools/test/tools/javac/importContext/namedPackage/bar/Baz.java rename to test/langtools/tools/javac/importContext/namedPackage/bar/Baz.java diff --git a/langtools/test/tools/javac/importContext/namedPackage/foo/Foo.java b/test/langtools/tools/javac/importContext/namedPackage/foo/Foo.java similarity index 100% rename from langtools/test/tools/javac/importContext/namedPackage/foo/Foo.java rename to test/langtools/tools/javac/importContext/namedPackage/foo/Foo.java diff --git a/langtools/test/tools/javac/importOnDemand/ImportOnDemandConflicts.java b/test/langtools/tools/javac/importOnDemand/ImportOnDemandConflicts.java similarity index 100% rename from langtools/test/tools/javac/importOnDemand/ImportOnDemandConflicts.java rename to test/langtools/tools/javac/importOnDemand/ImportOnDemandConflicts.java diff --git a/langtools/test/tools/javac/importOnDemand/ImportOnDemandConflicts.out b/test/langtools/tools/javac/importOnDemand/ImportOnDemandConflicts.out similarity index 100% rename from langtools/test/tools/javac/importOnDemand/ImportOnDemandConflicts.out rename to test/langtools/tools/javac/importOnDemand/ImportOnDemandConflicts.out diff --git a/langtools/test/tools/javac/importOnDemand/p1/Object.java b/test/langtools/tools/javac/importOnDemand/p1/Object.java similarity index 100% rename from langtools/test/tools/javac/importOnDemand/p1/Object.java rename to test/langtools/tools/javac/importOnDemand/p1/Object.java diff --git a/langtools/test/tools/javac/importOnDemand/p1/String.java b/test/langtools/tools/javac/importOnDemand/p1/String.java similarity index 100% rename from langtools/test/tools/javac/importOnDemand/p1/String.java rename to test/langtools/tools/javac/importOnDemand/p1/String.java diff --git a/langtools/test/tools/javac/importOnDemand/p2/Boolean.java b/test/langtools/tools/javac/importOnDemand/p2/Boolean.java similarity index 100% rename from langtools/test/tools/javac/importOnDemand/p2/Boolean.java rename to test/langtools/tools/javac/importOnDemand/p2/Boolean.java diff --git a/langtools/test/tools/javac/importscope/A.java b/test/langtools/tools/javac/importscope/A.java similarity index 100% rename from langtools/test/tools/javac/importscope/A.java rename to test/langtools/tools/javac/importscope/A.java diff --git a/langtools/test/tools/javac/importscope/B.java b/test/langtools/tools/javac/importscope/B.java similarity index 100% rename from langtools/test/tools/javac/importscope/B.java rename to test/langtools/tools/javac/importscope/B.java diff --git a/langtools/test/tools/javac/importscope/CompletionFailureDuringImport.java b/test/langtools/tools/javac/importscope/CompletionFailureDuringImport.java similarity index 100% rename from langtools/test/tools/javac/importscope/CompletionFailureDuringImport.java rename to test/langtools/tools/javac/importscope/CompletionFailureDuringImport.java diff --git a/langtools/test/tools/javac/importscope/ImportDependenciesTest.java b/test/langtools/tools/javac/importscope/ImportDependenciesTest.java similarity index 100% rename from langtools/test/tools/javac/importscope/ImportDependenciesTest.java rename to test/langtools/tools/javac/importscope/ImportDependenciesTest.java diff --git a/langtools/test/tools/javac/importscope/ImportInaccessible.java b/test/langtools/tools/javac/importscope/ImportInaccessible.java similarity index 100% rename from langtools/test/tools/javac/importscope/ImportInaccessible.java rename to test/langtools/tools/javac/importscope/ImportInaccessible.java diff --git a/langtools/test/tools/javac/importscope/ImportInaccessible.out b/test/langtools/tools/javac/importscope/ImportInaccessible.out similarity index 100% rename from langtools/test/tools/javac/importscope/ImportInaccessible.out rename to test/langtools/tools/javac/importscope/ImportInaccessible.out diff --git a/langtools/test/tools/javac/importscope/ImportMembersTest.java b/test/langtools/tools/javac/importscope/ImportMembersTest.java similarity index 100% rename from langtools/test/tools/javac/importscope/ImportMembersTest.java rename to test/langtools/tools/javac/importscope/ImportMembersTest.java diff --git a/langtools/test/tools/javac/importscope/ImportResolvedTooSoon.java b/test/langtools/tools/javac/importscope/ImportResolvedTooSoon.java similarity index 100% rename from langtools/test/tools/javac/importscope/ImportResolvedTooSoon.java rename to test/langtools/tools/javac/importscope/ImportResolvedTooSoon.java diff --git a/langtools/test/tools/javac/importscope/NegativeCyclicDependencyTest.java b/test/langtools/tools/javac/importscope/NegativeCyclicDependencyTest.java similarity index 100% rename from langtools/test/tools/javac/importscope/NegativeCyclicDependencyTest.java rename to test/langtools/tools/javac/importscope/NegativeCyclicDependencyTest.java diff --git a/langtools/test/tools/javac/importscope/T7101822A.java b/test/langtools/tools/javac/importscope/T7101822A.java similarity index 100% rename from langtools/test/tools/javac/importscope/T7101822A.java rename to test/langtools/tools/javac/importscope/T7101822A.java diff --git a/langtools/test/tools/javac/importscope/T7101822Z.java b/test/langtools/tools/javac/importscope/T7101822Z.java similarity index 100% rename from langtools/test/tools/javac/importscope/T7101822Z.java rename to test/langtools/tools/javac/importscope/T7101822Z.java diff --git a/langtools/test/tools/javac/importscope/T8075274/C.java b/test/langtools/tools/javac/importscope/T8075274/C.java similarity index 100% rename from langtools/test/tools/javac/importscope/T8075274/C.java rename to test/langtools/tools/javac/importscope/T8075274/C.java diff --git a/langtools/test/tools/javac/importscope/T8075274/D.java b/test/langtools/tools/javac/importscope/T8075274/D.java similarity index 100% rename from langtools/test/tools/javac/importscope/T8075274/D.java rename to test/langtools/tools/javac/importscope/T8075274/D.java diff --git a/langtools/test/tools/javac/importscope/T8075274/Outer.java b/test/langtools/tools/javac/importscope/T8075274/Outer.java similarity index 100% rename from langtools/test/tools/javac/importscope/T8075274/Outer.java rename to test/langtools/tools/javac/importscope/T8075274/Outer.java diff --git a/langtools/test/tools/javac/importscope/T8133235/A.java b/test/langtools/tools/javac/importscope/T8133235/A.java similarity index 100% rename from langtools/test/tools/javac/importscope/T8133235/A.java rename to test/langtools/tools/javac/importscope/T8133235/A.java diff --git a/langtools/test/tools/javac/importscope/T8133235/B.java b/test/langtools/tools/javac/importscope/T8133235/B.java similarity index 100% rename from langtools/test/tools/javac/importscope/T8133235/B.java rename to test/langtools/tools/javac/importscope/T8133235/B.java diff --git a/langtools/test/tools/javac/importscope/T8133235/C.java b/test/langtools/tools/javac/importscope/T8133235/C.java similarity index 100% rename from langtools/test/tools/javac/importscope/T8133235/C.java rename to test/langtools/tools/javac/importscope/T8133235/C.java diff --git a/langtools/test/tools/javac/importscope/T8133235/D.java b/test/langtools/tools/javac/importscope/T8133235/D.java similarity index 100% rename from langtools/test/tools/javac/importscope/T8133235/D.java rename to test/langtools/tools/javac/importscope/T8133235/D.java diff --git a/langtools/test/tools/javac/importscope/T8148131/A.java b/test/langtools/tools/javac/importscope/T8148131/A.java similarity index 100% rename from langtools/test/tools/javac/importscope/T8148131/A.java rename to test/langtools/tools/javac/importscope/T8148131/A.java diff --git a/langtools/test/tools/javac/importscope/T8148131/B.java b/test/langtools/tools/javac/importscope/T8148131/B.java similarity index 100% rename from langtools/test/tools/javac/importscope/T8148131/B.java rename to test/langtools/tools/javac/importscope/T8148131/B.java diff --git a/langtools/test/tools/javac/importscope/T8148131/C.java b/test/langtools/tools/javac/importscope/T8148131/C.java similarity index 100% rename from langtools/test/tools/javac/importscope/T8148131/C.java rename to test/langtools/tools/javac/importscope/T8148131/C.java diff --git a/langtools/test/tools/javac/importscope/T8148131/D.java b/test/langtools/tools/javac/importscope/T8148131/D.java similarity index 100% rename from langtools/test/tools/javac/importscope/T8148131/D.java rename to test/langtools/tools/javac/importscope/T8148131/D.java diff --git a/langtools/test/tools/javac/importscope/TestDeepFinishClassStack.java b/test/langtools/tools/javac/importscope/TestDeepFinishClassStack.java similarity index 100% rename from langtools/test/tools/javac/importscope/TestDeepFinishClassStack.java rename to test/langtools/tools/javac/importscope/TestDeepFinishClassStack.java diff --git a/langtools/test/tools/javac/importscope/TestDuplicateImport.java b/test/langtools/tools/javac/importscope/TestDuplicateImport.java similarity index 100% rename from langtools/test/tools/javac/importscope/TestDuplicateImport.java rename to test/langtools/tools/javac/importscope/TestDuplicateImport.java diff --git a/langtools/test/tools/javac/importscope/TestLazyImportScope.java b/test/langtools/tools/javac/importscope/TestLazyImportScope.java similarity index 100% rename from langtools/test/tools/javac/importscope/TestLazyImportScope.java rename to test/langtools/tools/javac/importscope/TestLazyImportScope.java diff --git a/langtools/test/tools/javac/importscope/TypeParamCycle.java b/test/langtools/tools/javac/importscope/TypeParamCycle.java similarity index 100% rename from langtools/test/tools/javac/importscope/TypeParamCycle.java rename to test/langtools/tools/javac/importscope/TypeParamCycle.java diff --git a/langtools/test/tools/javac/importscope/TypeParamCycle2.java b/test/langtools/tools/javac/importscope/TypeParamCycle2.java similarity index 100% rename from langtools/test/tools/javac/importscope/TypeParamCycle2.java rename to test/langtools/tools/javac/importscope/TypeParamCycle2.java diff --git a/langtools/test/tools/javac/importscope/TypeParamCycle3.java b/test/langtools/tools/javac/importscope/TypeParamCycle3.java similarity index 100% rename from langtools/test/tools/javac/importscope/TypeParamCycle3.java rename to test/langtools/tools/javac/importscope/TypeParamCycle3.java diff --git a/langtools/test/tools/javac/importscope/dependencies/DependenciesTest.java b/test/langtools/tools/javac/importscope/dependencies/DependenciesTest.java similarity index 100% rename from langtools/test/tools/javac/importscope/dependencies/DependenciesTest.java rename to test/langtools/tools/javac/importscope/dependencies/DependenciesTest.java diff --git a/langtools/test/tools/javac/importscope/dependencies/annotations/Phase.java b/test/langtools/tools/javac/importscope/dependencies/annotations/Phase.java similarity index 100% rename from langtools/test/tools/javac/importscope/dependencies/annotations/Phase.java rename to test/langtools/tools/javac/importscope/dependencies/annotations/Phase.java diff --git a/langtools/test/tools/javac/importscope/dependencies/annotations/TriggersComplete.java b/test/langtools/tools/javac/importscope/dependencies/annotations/TriggersComplete.java similarity index 100% rename from langtools/test/tools/javac/importscope/dependencies/annotations/TriggersComplete.java rename to test/langtools/tools/javac/importscope/dependencies/annotations/TriggersComplete.java diff --git a/langtools/test/tools/javac/importscope/dependencies/annotations/TriggersCompleteRepeat.java b/test/langtools/tools/javac/importscope/dependencies/annotations/TriggersCompleteRepeat.java similarity index 100% rename from langtools/test/tools/javac/importscope/dependencies/annotations/TriggersCompleteRepeat.java rename to test/langtools/tools/javac/importscope/dependencies/annotations/TriggersCompleteRepeat.java diff --git a/langtools/test/tools/javac/importscope/dependencies/tests/ImportResolvedTooSoon.java b/test/langtools/tools/javac/importscope/dependencies/tests/ImportResolvedTooSoon.java similarity index 100% rename from langtools/test/tools/javac/importscope/dependencies/tests/ImportResolvedTooSoon.java rename to test/langtools/tools/javac/importscope/dependencies/tests/ImportResolvedTooSoon.java diff --git a/langtools/test/tools/javac/importscope/dependencies/tests/Simple.java b/test/langtools/tools/javac/importscope/dependencies/tests/Simple.java similarity index 100% rename from langtools/test/tools/javac/importscope/dependencies/tests/Simple.java rename to test/langtools/tools/javac/importscope/dependencies/tests/Simple.java diff --git a/langtools/test/tools/javac/importscope/dependencies/tests/T7101822/T7101822.java b/test/langtools/tools/javac/importscope/dependencies/tests/T7101822/T7101822.java similarity index 100% rename from langtools/test/tools/javac/importscope/dependencies/tests/T7101822/T7101822.java rename to test/langtools/tools/javac/importscope/dependencies/tests/T7101822/T7101822.java diff --git a/langtools/test/tools/javac/importscope/dependencies/tests/T7101822/T7101822Aux.java b/test/langtools/tools/javac/importscope/dependencies/tests/T7101822/T7101822Aux.java similarity index 100% rename from langtools/test/tools/javac/importscope/dependencies/tests/T7101822/T7101822Aux.java rename to test/langtools/tools/javac/importscope/dependencies/tests/T7101822/T7101822Aux.java diff --git a/langtools/test/tools/javac/importscope/dependencies/tests/TypeParamCycle.java b/test/langtools/tools/javac/importscope/dependencies/tests/TypeParamCycle.java similarity index 100% rename from langtools/test/tools/javac/importscope/dependencies/tests/TypeParamCycle.java rename to test/langtools/tools/javac/importscope/dependencies/tests/TypeParamCycle.java diff --git a/langtools/test/tools/javac/importscope/dependencies/tests/TypeParamCycle2.java b/test/langtools/tools/javac/importscope/dependencies/tests/TypeParamCycle2.java similarity index 100% rename from langtools/test/tools/javac/importscope/dependencies/tests/TypeParamCycle2.java rename to test/langtools/tools/javac/importscope/dependencies/tests/TypeParamCycle2.java diff --git a/langtools/test/tools/javac/importscope/dependencies/tests/TypeParamCycle3.java b/test/langtools/tools/javac/importscope/dependencies/tests/TypeParamCycle3.java similarity index 100% rename from langtools/test/tools/javac/importscope/dependencies/tests/TypeParamCycle3.java rename to test/langtools/tools/javac/importscope/dependencies/tests/TypeParamCycle3.java diff --git a/langtools/test/tools/javac/incompatibleNoninherited/A.java b/test/langtools/tools/javac/incompatibleNoninherited/A.java similarity index 100% rename from langtools/test/tools/javac/incompatibleNoninherited/A.java rename to test/langtools/tools/javac/incompatibleNoninherited/A.java diff --git a/langtools/test/tools/javac/incompatibleNoninherited/B.java b/test/langtools/tools/javac/incompatibleNoninherited/B.java similarity index 100% rename from langtools/test/tools/javac/incompatibleNoninherited/B.java rename to test/langtools/tools/javac/incompatibleNoninherited/B.java diff --git a/langtools/test/tools/javac/incompleteStatements/T8000484.java b/test/langtools/tools/javac/incompleteStatements/T8000484.java similarity index 100% rename from langtools/test/tools/javac/incompleteStatements/T8000484.java rename to test/langtools/tools/javac/incompleteStatements/T8000484.java diff --git a/langtools/test/tools/javac/incompleteStatements/T8000484.out b/test/langtools/tools/javac/incompleteStatements/T8000484.out similarity index 100% rename from langtools/test/tools/javac/incompleteStatements/T8000484.out rename to test/langtools/tools/javac/incompleteStatements/T8000484.out diff --git a/langtools/test/tools/javac/inheritAccess/PvtMbrsNotInherit1.java b/test/langtools/tools/javac/inheritAccess/PvtMbrsNotInherit1.java similarity index 100% rename from langtools/test/tools/javac/inheritAccess/PvtMbrsNotInherit1.java rename to test/langtools/tools/javac/inheritAccess/PvtMbrsNotInherit1.java diff --git a/langtools/test/tools/javac/inheritedAccess/MethodReferenceQualification_1.java b/test/langtools/tools/javac/inheritedAccess/MethodReferenceQualification_1.java similarity index 100% rename from langtools/test/tools/javac/inheritedAccess/MethodReferenceQualification_1.java rename to test/langtools/tools/javac/inheritedAccess/MethodReferenceQualification_1.java diff --git a/langtools/test/tools/javac/inheritedAccess/P1/priv.java b/test/langtools/tools/javac/inheritedAccess/P1/priv.java similarity index 100% rename from langtools/test/tools/javac/inheritedAccess/P1/priv.java rename to test/langtools/tools/javac/inheritedAccess/P1/priv.java diff --git a/langtools/test/tools/javac/inheritedAccess/P1/pub.java b/test/langtools/tools/javac/inheritedAccess/P1/pub.java similarity index 100% rename from langtools/test/tools/javac/inheritedAccess/P1/pub.java rename to test/langtools/tools/javac/inheritedAccess/P1/pub.java diff --git a/langtools/test/tools/javac/innerClassFile/InnerClassFileTest.java b/test/langtools/tools/javac/innerClassFile/InnerClassFileTest.java similarity index 100% rename from langtools/test/tools/javac/innerClassFile/InnerClassFileTest.java rename to test/langtools/tools/javac/innerClassFile/InnerClassFileTest.java diff --git a/langtools/test/tools/javac/javazip/JavaZipTest.java b/test/langtools/tools/javac/javazip/JavaZipTest.java similarity index 100% rename from langtools/test/tools/javac/javazip/JavaZipTest.java rename to test/langtools/tools/javac/javazip/JavaZipTest.java diff --git a/langtools/test/tools/javac/jvm/6397652/T6397652.java b/test/langtools/tools/javac/jvm/6397652/T6397652.java similarity index 100% rename from langtools/test/tools/javac/jvm/6397652/T6397652.java rename to test/langtools/tools/javac/jvm/6397652/T6397652.java diff --git a/langtools/test/tools/javac/jvm/6397652/com/test/Test$Test$Test.java b/test/langtools/tools/javac/jvm/6397652/com/test/Test$Test$Test.java similarity index 100% rename from langtools/test/tools/javac/jvm/6397652/com/test/Test$Test$Test.java rename to test/langtools/tools/javac/jvm/6397652/com/test/Test$Test$Test.java diff --git a/langtools/test/tools/javac/jvm/6397652/com/test/Test$Test.java b/test/langtools/tools/javac/jvm/6397652/com/test/Test$Test.java similarity index 100% rename from langtools/test/tools/javac/jvm/6397652/com/test/Test$Test.java rename to test/langtools/tools/javac/jvm/6397652/com/test/Test$Test.java diff --git a/langtools/test/tools/javac/jvm/6397652/com/test/Test.java b/test/langtools/tools/javac/jvm/6397652/com/test/Test.java similarity index 100% rename from langtools/test/tools/javac/jvm/6397652/com/test/Test.java rename to test/langtools/tools/javac/jvm/6397652/com/test/Test.java diff --git a/langtools/test/tools/javac/jvm/ClassRefDupInConstantPoolTest.java b/test/langtools/tools/javac/jvm/ClassRefDupInConstantPoolTest.java similarity index 100% rename from langtools/test/tools/javac/jvm/ClassRefDupInConstantPoolTest.java rename to test/langtools/tools/javac/jvm/ClassRefDupInConstantPoolTest.java diff --git a/langtools/test/tools/javac/jvm/T7024096.java b/test/langtools/tools/javac/jvm/T7024096.java similarity index 100% rename from langtools/test/tools/javac/jvm/T7024096.java rename to test/langtools/tools/javac/jvm/T7024096.java diff --git a/langtools/test/tools/javac/jvm/T8020689.java b/test/langtools/tools/javac/jvm/T8020689.java similarity index 100% rename from langtools/test/tools/javac/jvm/T8020689.java rename to test/langtools/tools/javac/jvm/T8020689.java diff --git a/langtools/test/tools/javac/lambda/8012557/A.java b/test/langtools/tools/javac/lambda/8012557/A.java similarity index 100% rename from langtools/test/tools/javac/lambda/8012557/A.java rename to test/langtools/tools/javac/lambda/8012557/A.java diff --git a/langtools/test/tools/javac/lambda/8012557/B.java b/test/langtools/tools/javac/lambda/8012557/B.java similarity index 100% rename from langtools/test/tools/javac/lambda/8012557/B.java rename to test/langtools/tools/javac/lambda/8012557/B.java diff --git a/langtools/test/tools/javac/lambda/8012557/C.java b/test/langtools/tools/javac/lambda/8012557/C.java similarity index 100% rename from langtools/test/tools/javac/lambda/8012557/C.java rename to test/langtools/tools/javac/lambda/8012557/C.java diff --git a/langtools/test/tools/javac/lambda/8012557/PrivateLambdas.java b/test/langtools/tools/javac/lambda/8012557/PrivateLambdas.java similarity index 100% rename from langtools/test/tools/javac/lambda/8012557/PrivateLambdas.java rename to test/langtools/tools/javac/lambda/8012557/PrivateLambdas.java diff --git a/langtools/test/tools/javac/lambda/8012557/SAM.java b/test/langtools/tools/javac/lambda/8012557/SAM.java similarity index 100% rename from langtools/test/tools/javac/lambda/8012557/SAM.java rename to test/langtools/tools/javac/lambda/8012557/SAM.java diff --git a/langtools/test/tools/javac/lambda/8016081/T8016081.java b/test/langtools/tools/javac/lambda/8016081/T8016081.java similarity index 100% rename from langtools/test/tools/javac/lambda/8016081/T8016081.java rename to test/langtools/tools/javac/lambda/8016081/T8016081.java diff --git a/langtools/test/tools/javac/lambda/8016177/T8016177a.java b/test/langtools/tools/javac/lambda/8016177/T8016177a.java similarity index 100% rename from langtools/test/tools/javac/lambda/8016177/T8016177a.java rename to test/langtools/tools/javac/lambda/8016177/T8016177a.java diff --git a/langtools/test/tools/javac/lambda/8016177/T8016177a.out b/test/langtools/tools/javac/lambda/8016177/T8016177a.out similarity index 100% rename from langtools/test/tools/javac/lambda/8016177/T8016177a.out rename to test/langtools/tools/javac/lambda/8016177/T8016177a.out diff --git a/langtools/test/tools/javac/lambda/8016177/T8016177b.java b/test/langtools/tools/javac/lambda/8016177/T8016177b.java similarity index 100% rename from langtools/test/tools/javac/lambda/8016177/T8016177b.java rename to test/langtools/tools/javac/lambda/8016177/T8016177b.java diff --git a/langtools/test/tools/javac/lambda/8016177/T8016177b.out b/test/langtools/tools/javac/lambda/8016177/T8016177b.out similarity index 100% rename from langtools/test/tools/javac/lambda/8016177/T8016177b.out rename to test/langtools/tools/javac/lambda/8016177/T8016177b.out diff --git a/langtools/test/tools/javac/lambda/8016177/T8016177c.java b/test/langtools/tools/javac/lambda/8016177/T8016177c.java similarity index 100% rename from langtools/test/tools/javac/lambda/8016177/T8016177c.java rename to test/langtools/tools/javac/lambda/8016177/T8016177c.java diff --git a/langtools/test/tools/javac/lambda/8016177/T8016177c.out b/test/langtools/tools/javac/lambda/8016177/T8016177c.out similarity index 100% rename from langtools/test/tools/javac/lambda/8016177/T8016177c.out rename to test/langtools/tools/javac/lambda/8016177/T8016177c.out diff --git a/langtools/test/tools/javac/lambda/8016177/T8016177d.java b/test/langtools/tools/javac/lambda/8016177/T8016177d.java similarity index 100% rename from langtools/test/tools/javac/lambda/8016177/T8016177d.java rename to test/langtools/tools/javac/lambda/8016177/T8016177d.java diff --git a/langtools/test/tools/javac/lambda/8016177/T8016177e.java b/test/langtools/tools/javac/lambda/8016177/T8016177e.java similarity index 100% rename from langtools/test/tools/javac/lambda/8016177/T8016177e.java rename to test/langtools/tools/javac/lambda/8016177/T8016177e.java diff --git a/langtools/test/tools/javac/lambda/8016177/T8016177f.java b/test/langtools/tools/javac/lambda/8016177/T8016177f.java similarity index 100% rename from langtools/test/tools/javac/lambda/8016177/T8016177f.java rename to test/langtools/tools/javac/lambda/8016177/T8016177f.java diff --git a/langtools/test/tools/javac/lambda/8016177/T8016177g.java b/test/langtools/tools/javac/lambda/8016177/T8016177g.java similarity index 100% rename from langtools/test/tools/javac/lambda/8016177/T8016177g.java rename to test/langtools/tools/javac/lambda/8016177/T8016177g.java diff --git a/langtools/test/tools/javac/lambda/8016177/T8016177g.out b/test/langtools/tools/javac/lambda/8016177/T8016177g.out similarity index 100% rename from langtools/test/tools/javac/lambda/8016177/T8016177g.out rename to test/langtools/tools/javac/lambda/8016177/T8016177g.out diff --git a/langtools/test/tools/javac/lambda/8016320/IllegalBridgeModifier.java b/test/langtools/tools/javac/lambda/8016320/IllegalBridgeModifier.java similarity index 100% rename from langtools/test/tools/javac/lambda/8016320/IllegalBridgeModifier.java rename to test/langtools/tools/javac/lambda/8016320/IllegalBridgeModifier.java diff --git a/langtools/test/tools/javac/lambda/8019480/T8019480.java b/test/langtools/tools/javac/lambda/8019480/T8019480.java similarity index 100% rename from langtools/test/tools/javac/lambda/8019480/T8019480.java rename to test/langtools/tools/javac/lambda/8019480/T8019480.java diff --git a/langtools/test/tools/javac/lambda/8019480/T8019480.out b/test/langtools/tools/javac/lambda/8019480/T8019480.out similarity index 100% rename from langtools/test/tools/javac/lambda/8019480/T8019480.out rename to test/langtools/tools/javac/lambda/8019480/T8019480.out diff --git a/langtools/test/tools/javac/lambda/8020147/T8020147.java b/test/langtools/tools/javac/lambda/8020147/T8020147.java similarity index 100% rename from langtools/test/tools/javac/lambda/8020147/T8020147.java rename to test/langtools/tools/javac/lambda/8020147/T8020147.java diff --git a/langtools/test/tools/javac/lambda/8020147/T8020147.out b/test/langtools/tools/javac/lambda/8020147/T8020147.out similarity index 100% rename from langtools/test/tools/javac/lambda/8020147/T8020147.out rename to test/langtools/tools/javac/lambda/8020147/T8020147.out diff --git a/langtools/test/tools/javac/lambda/8020804/T8020804.java b/test/langtools/tools/javac/lambda/8020804/T8020804.java similarity index 100% rename from langtools/test/tools/javac/lambda/8020804/T8020804.java rename to test/langtools/tools/javac/lambda/8020804/T8020804.java diff --git a/langtools/test/tools/javac/lambda/8020843/T8020843a.java b/test/langtools/tools/javac/lambda/8020843/T8020843a.java similarity index 100% rename from langtools/test/tools/javac/lambda/8020843/T8020843a.java rename to test/langtools/tools/javac/lambda/8020843/T8020843a.java diff --git a/langtools/test/tools/javac/lambda/8020843/T8020843a.out b/test/langtools/tools/javac/lambda/8020843/T8020843a.out similarity index 100% rename from langtools/test/tools/javac/lambda/8020843/T8020843a.out rename to test/langtools/tools/javac/lambda/8020843/T8020843a.out diff --git a/langtools/test/tools/javac/lambda/8020843/T8020843b.java b/test/langtools/tools/javac/lambda/8020843/T8020843b.java similarity index 100% rename from langtools/test/tools/javac/lambda/8020843/T8020843b.java rename to test/langtools/tools/javac/lambda/8020843/T8020843b.java diff --git a/langtools/test/tools/javac/lambda/8020843/T8020843b.out b/test/langtools/tools/javac/lambda/8020843/T8020843b.out similarity index 100% rename from langtools/test/tools/javac/lambda/8020843/T8020843b.out rename to test/langtools/tools/javac/lambda/8020843/T8020843b.out diff --git a/langtools/test/tools/javac/lambda/8021567/T8021567.java b/test/langtools/tools/javac/lambda/8021567/T8021567.java similarity index 100% rename from langtools/test/tools/javac/lambda/8021567/T8021567.java rename to test/langtools/tools/javac/lambda/8021567/T8021567.java diff --git a/langtools/test/tools/javac/lambda/8021567/T8021567.out b/test/langtools/tools/javac/lambda/8021567/T8021567.out similarity index 100% rename from langtools/test/tools/javac/lambda/8021567/T8021567.out rename to test/langtools/tools/javac/lambda/8021567/T8021567.out diff --git a/langtools/test/tools/javac/lambda/8021567/T8021567b.java b/test/langtools/tools/javac/lambda/8021567/T8021567b.java similarity index 100% rename from langtools/test/tools/javac/lambda/8021567/T8021567b.java rename to test/langtools/tools/javac/lambda/8021567/T8021567b.java diff --git a/langtools/test/tools/javac/lambda/8023389/T8023389.java b/test/langtools/tools/javac/lambda/8023389/T8023389.java similarity index 100% rename from langtools/test/tools/javac/lambda/8023389/T8023389.java rename to test/langtools/tools/javac/lambda/8023389/T8023389.java diff --git a/langtools/test/tools/javac/lambda/8023549/T8023549.java b/test/langtools/tools/javac/lambda/8023549/T8023549.java similarity index 100% rename from langtools/test/tools/javac/lambda/8023549/T8023549.java rename to test/langtools/tools/javac/lambda/8023549/T8023549.java diff --git a/langtools/test/tools/javac/lambda/8023549/T8023549.out b/test/langtools/tools/javac/lambda/8023549/T8023549.out similarity index 100% rename from langtools/test/tools/javac/lambda/8023549/T8023549.out rename to test/langtools/tools/javac/lambda/8023549/T8023549.out diff --git a/langtools/test/tools/javac/lambda/8023558/T8023558a.java b/test/langtools/tools/javac/lambda/8023558/T8023558a.java similarity index 100% rename from langtools/test/tools/javac/lambda/8023558/T8023558a.java rename to test/langtools/tools/javac/lambda/8023558/T8023558a.java diff --git a/langtools/test/tools/javac/lambda/8023558/T8023558b.java b/test/langtools/tools/javac/lambda/8023558/T8023558b.java similarity index 100% rename from langtools/test/tools/javac/lambda/8023558/T8023558b.java rename to test/langtools/tools/javac/lambda/8023558/T8023558b.java diff --git a/langtools/test/tools/javac/lambda/8023558/T8023558c.java b/test/langtools/tools/javac/lambda/8023558/T8023558c.java similarity index 100% rename from langtools/test/tools/javac/lambda/8023558/T8023558c.java rename to test/langtools/tools/javac/lambda/8023558/T8023558c.java diff --git a/langtools/test/tools/javac/lambda/8024497/CrashUsingReturningThisRefLambdaFromDefaultMetTest.java b/test/langtools/tools/javac/lambda/8024497/CrashUsingReturningThisRefLambdaFromDefaultMetTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/8024497/CrashUsingReturningThisRefLambdaFromDefaultMetTest.java rename to test/langtools/tools/javac/lambda/8024497/CrashUsingReturningThisRefLambdaFromDefaultMetTest.java diff --git a/langtools/test/tools/javac/lambda/8051958/T8051958.java b/test/langtools/tools/javac/lambda/8051958/T8051958.java similarity index 100% rename from langtools/test/tools/javac/lambda/8051958/T8051958.java rename to test/langtools/tools/javac/lambda/8051958/T8051958.java diff --git a/langtools/test/tools/javac/lambda/8066974/T8066974.java b/test/langtools/tools/javac/lambda/8066974/T8066974.java similarity index 100% rename from langtools/test/tools/javac/lambda/8066974/T8066974.java rename to test/langtools/tools/javac/lambda/8066974/T8066974.java diff --git a/langtools/test/tools/javac/lambda/8066974/T8066974.out b/test/langtools/tools/javac/lambda/8066974/T8066974.out similarity index 100% rename from langtools/test/tools/javac/lambda/8066974/T8066974.out rename to test/langtools/tools/javac/lambda/8066974/T8066974.out diff --git a/langtools/test/tools/javac/lambda/8067792/T8067792.java b/test/langtools/tools/javac/lambda/8067792/T8067792.java similarity index 100% rename from langtools/test/tools/javac/lambda/8067792/T8067792.java rename to test/langtools/tools/javac/lambda/8067792/T8067792.java diff --git a/langtools/test/tools/javac/lambda/8067792/T8067792.out b/test/langtools/tools/javac/lambda/8067792/T8067792.out similarity index 100% rename from langtools/test/tools/javac/lambda/8067792/T8067792.out rename to test/langtools/tools/javac/lambda/8067792/T8067792.out diff --git a/langtools/test/tools/javac/lambda/8068399/T8068399.java b/test/langtools/tools/javac/lambda/8068399/T8068399.java similarity index 100% rename from langtools/test/tools/javac/lambda/8068399/T8068399.java rename to test/langtools/tools/javac/lambda/8068399/T8068399.java diff --git a/langtools/test/tools/javac/lambda/8068430/T8068430.java b/test/langtools/tools/javac/lambda/8068430/T8068430.java similarity index 100% rename from langtools/test/tools/javac/lambda/8068430/T8068430.java rename to test/langtools/tools/javac/lambda/8068430/T8068430.java diff --git a/langtools/test/tools/javac/lambda/8071432/T8071432.java b/test/langtools/tools/javac/lambda/8071432/T8071432.java similarity index 100% rename from langtools/test/tools/javac/lambda/8071432/T8071432.java rename to test/langtools/tools/javac/lambda/8071432/T8071432.java diff --git a/langtools/test/tools/javac/lambda/8071432/T8071432.out b/test/langtools/tools/javac/lambda/8071432/T8071432.out similarity index 100% rename from langtools/test/tools/javac/lambda/8071432/T8071432.out rename to test/langtools/tools/javac/lambda/8071432/T8071432.out diff --git a/langtools/test/tools/javac/lambda/8073842/T8073842.java b/test/langtools/tools/javac/lambda/8073842/T8073842.java similarity index 100% rename from langtools/test/tools/javac/lambda/8073842/T8073842.java rename to test/langtools/tools/javac/lambda/8073842/T8073842.java diff --git a/langtools/test/tools/javac/lambda/8074381/T8074381a.java b/test/langtools/tools/javac/lambda/8074381/T8074381a.java similarity index 100% rename from langtools/test/tools/javac/lambda/8074381/T8074381a.java rename to test/langtools/tools/javac/lambda/8074381/T8074381a.java diff --git a/langtools/test/tools/javac/lambda/8074381/T8074381a.out b/test/langtools/tools/javac/lambda/8074381/T8074381a.out similarity index 100% rename from langtools/test/tools/javac/lambda/8074381/T8074381a.out rename to test/langtools/tools/javac/lambda/8074381/T8074381a.out diff --git a/langtools/test/tools/javac/lambda/8074381/T8074381b.java b/test/langtools/tools/javac/lambda/8074381/T8074381b.java similarity index 100% rename from langtools/test/tools/javac/lambda/8074381/T8074381b.java rename to test/langtools/tools/javac/lambda/8074381/T8074381b.java diff --git a/langtools/test/tools/javac/lambda/8074381/T8074381b.out b/test/langtools/tools/javac/lambda/8074381/T8074381b.out similarity index 100% rename from langtools/test/tools/javac/lambda/8074381/T8074381b.out rename to test/langtools/tools/javac/lambda/8074381/T8074381b.out diff --git a/langtools/test/tools/javac/lambda/8131742/T8131742.java b/test/langtools/tools/javac/lambda/8131742/T8131742.java similarity index 100% rename from langtools/test/tools/javac/lambda/8131742/T8131742.java rename to test/langtools/tools/javac/lambda/8131742/T8131742.java diff --git a/langtools/test/tools/javac/lambda/8131742/T8131742.out b/test/langtools/tools/javac/lambda/8131742/T8131742.out similarity index 100% rename from langtools/test/tools/javac/lambda/8131742/T8131742.out rename to test/langtools/tools/javac/lambda/8131742/T8131742.out diff --git a/langtools/test/tools/javac/lambda/8134329/T8134329.java b/test/langtools/tools/javac/lambda/8134329/T8134329.java similarity index 100% rename from langtools/test/tools/javac/lambda/8134329/T8134329.java rename to test/langtools/tools/javac/lambda/8134329/T8134329.java diff --git a/langtools/test/tools/javac/lambda/8142876/T8142876.java b/test/langtools/tools/javac/lambda/8142876/T8142876.java similarity index 100% rename from langtools/test/tools/javac/lambda/8142876/T8142876.java rename to test/langtools/tools/javac/lambda/8142876/T8142876.java diff --git a/langtools/test/tools/javac/lambda/8148128/T8148128.java b/test/langtools/tools/javac/lambda/8148128/T8148128.java similarity index 100% rename from langtools/test/tools/javac/lambda/8148128/T8148128.java rename to test/langtools/tools/javac/lambda/8148128/T8148128.java diff --git a/langtools/test/tools/javac/lambda/8153884/T8153884.java b/test/langtools/tools/javac/lambda/8153884/T8153884.java similarity index 100% rename from langtools/test/tools/javac/lambda/8153884/T8153884.java rename to test/langtools/tools/javac/lambda/8153884/T8153884.java diff --git a/langtools/test/tools/javac/lambda/8153884/T8153884.out b/test/langtools/tools/javac/lambda/8153884/T8153884.out similarity index 100% rename from langtools/test/tools/javac/lambda/8153884/T8153884.out rename to test/langtools/tools/javac/lambda/8153884/T8153884.out diff --git a/langtools/test/tools/javac/lambda/8168480/T8168480.java b/test/langtools/tools/javac/lambda/8168480/T8168480.java similarity index 100% rename from langtools/test/tools/javac/lambda/8168480/T8168480.java rename to test/langtools/tools/javac/lambda/8168480/T8168480.java diff --git a/langtools/test/tools/javac/lambda/8168480/T8168480b.java b/test/langtools/tools/javac/lambda/8168480/T8168480b.java similarity index 100% rename from langtools/test/tools/javac/lambda/8168480/T8168480b.java rename to test/langtools/tools/javac/lambda/8168480/T8168480b.java diff --git a/langtools/test/tools/javac/lambda/8168480/T8168480b.out b/test/langtools/tools/javac/lambda/8168480/T8168480b.out similarity index 100% rename from langtools/test/tools/javac/lambda/8168480/T8168480b.out rename to test/langtools/tools/javac/lambda/8168480/T8168480b.out diff --git a/langtools/test/tools/javac/lambda/8169091/T8169091.java b/test/langtools/tools/javac/lambda/8169091/T8169091.java similarity index 100% rename from langtools/test/tools/javac/lambda/8169091/T8169091.java rename to test/langtools/tools/javac/lambda/8169091/T8169091.java diff --git a/langtools/test/tools/javac/lambda/AvoidInfiniteReattribution.java b/test/langtools/tools/javac/lambda/AvoidInfiniteReattribution.java similarity index 100% rename from langtools/test/tools/javac/lambda/AvoidInfiniteReattribution.java rename to test/langtools/tools/javac/lambda/AvoidInfiniteReattribution.java diff --git a/langtools/test/tools/javac/lambda/BadAccess.java b/test/langtools/tools/javac/lambda/BadAccess.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadAccess.java rename to test/langtools/tools/javac/lambda/BadAccess.java diff --git a/langtools/test/tools/javac/lambda/BadAccess.out b/test/langtools/tools/javac/lambda/BadAccess.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadAccess.out rename to test/langtools/tools/javac/lambda/BadAccess.out diff --git a/langtools/test/tools/javac/lambda/BadAccess02.java b/test/langtools/tools/javac/lambda/BadAccess02.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadAccess02.java rename to test/langtools/tools/javac/lambda/BadAccess02.java diff --git a/langtools/test/tools/javac/lambda/BadAccess02.out b/test/langtools/tools/javac/lambda/BadAccess02.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadAccess02.out rename to test/langtools/tools/javac/lambda/BadAccess02.out diff --git a/langtools/test/tools/javac/lambda/BadAccess03.java b/test/langtools/tools/javac/lambda/BadAccess03.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadAccess03.java rename to test/langtools/tools/javac/lambda/BadAccess03.java diff --git a/langtools/test/tools/javac/lambda/BadAccess03.out b/test/langtools/tools/javac/lambda/BadAccess03.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadAccess03.out rename to test/langtools/tools/javac/lambda/BadAccess03.out diff --git a/langtools/test/tools/javac/lambda/BadBreakContinue.java b/test/langtools/tools/javac/lambda/BadBreakContinue.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadBreakContinue.java rename to test/langtools/tools/javac/lambda/BadBreakContinue.java diff --git a/langtools/test/tools/javac/lambda/BadBreakContinue.out b/test/langtools/tools/javac/lambda/BadBreakContinue.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadBreakContinue.out rename to test/langtools/tools/javac/lambda/BadBreakContinue.out diff --git a/langtools/test/tools/javac/lambda/BadConv03.java b/test/langtools/tools/javac/lambda/BadConv03.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadConv03.java rename to test/langtools/tools/javac/lambda/BadConv03.java diff --git a/langtools/test/tools/javac/lambda/BadConv03.out b/test/langtools/tools/javac/lambda/BadConv03.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadConv03.out rename to test/langtools/tools/javac/lambda/BadConv03.out diff --git a/langtools/test/tools/javac/lambda/BadConv04.java b/test/langtools/tools/javac/lambda/BadConv04.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadConv04.java rename to test/langtools/tools/javac/lambda/BadConv04.java diff --git a/langtools/test/tools/javac/lambda/BadConv04.out b/test/langtools/tools/javac/lambda/BadConv04.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadConv04.out rename to test/langtools/tools/javac/lambda/BadConv04.out diff --git a/langtools/test/tools/javac/lambda/BadExpressionLambda.java b/test/langtools/tools/javac/lambda/BadExpressionLambda.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadExpressionLambda.java rename to test/langtools/tools/javac/lambda/BadExpressionLambda.java diff --git a/langtools/test/tools/javac/lambda/BadExpressionLambda.out b/test/langtools/tools/javac/lambda/BadExpressionLambda.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadExpressionLambda.out rename to test/langtools/tools/javac/lambda/BadExpressionLambda.out diff --git a/langtools/test/tools/javac/lambda/BadLambdaExpr.java b/test/langtools/tools/javac/lambda/BadLambdaExpr.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadLambdaExpr.java rename to test/langtools/tools/javac/lambda/BadLambdaExpr.java diff --git a/langtools/test/tools/javac/lambda/BadLambdaPos.java b/test/langtools/tools/javac/lambda/BadLambdaPos.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadLambdaPos.java rename to test/langtools/tools/javac/lambda/BadLambdaPos.java diff --git a/langtools/test/tools/javac/lambda/BadLambdaPos.out b/test/langtools/tools/javac/lambda/BadLambdaPos.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadLambdaPos.out rename to test/langtools/tools/javac/lambda/BadLambdaPos.out diff --git a/langtools/test/tools/javac/lambda/BadMethodCall.java b/test/langtools/tools/javac/lambda/BadMethodCall.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadMethodCall.java rename to test/langtools/tools/javac/lambda/BadMethodCall.java diff --git a/langtools/test/tools/javac/lambda/BadMethodCall.out b/test/langtools/tools/javac/lambda/BadMethodCall.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadMethodCall.out rename to test/langtools/tools/javac/lambda/BadMethodCall.out diff --git a/langtools/test/tools/javac/lambda/BadMethodCall2.java b/test/langtools/tools/javac/lambda/BadMethodCall2.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadMethodCall2.java rename to test/langtools/tools/javac/lambda/BadMethodCall2.java diff --git a/langtools/test/tools/javac/lambda/BadMethodCall2.out b/test/langtools/tools/javac/lambda/BadMethodCall2.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadMethodCall2.out rename to test/langtools/tools/javac/lambda/BadMethodCall2.out diff --git a/langtools/test/tools/javac/lambda/BadNestedLambda.java b/test/langtools/tools/javac/lambda/BadNestedLambda.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadNestedLambda.java rename to test/langtools/tools/javac/lambda/BadNestedLambda.java diff --git a/langtools/test/tools/javac/lambda/BadNestedLambda.out b/test/langtools/tools/javac/lambda/BadNestedLambda.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadNestedLambda.out rename to test/langtools/tools/javac/lambda/BadNestedLambda.out diff --git a/langtools/test/tools/javac/lambda/BadRecovery.java b/test/langtools/tools/javac/lambda/BadRecovery.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadRecovery.java rename to test/langtools/tools/javac/lambda/BadRecovery.java diff --git a/langtools/test/tools/javac/lambda/BadRecovery.out b/test/langtools/tools/javac/lambda/BadRecovery.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadRecovery.out rename to test/langtools/tools/javac/lambda/BadRecovery.out diff --git a/langtools/test/tools/javac/lambda/BadReturn.java b/test/langtools/tools/javac/lambda/BadReturn.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadReturn.java rename to test/langtools/tools/javac/lambda/BadReturn.java diff --git a/langtools/test/tools/javac/lambda/BadReturn.out b/test/langtools/tools/javac/lambda/BadReturn.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadReturn.out rename to test/langtools/tools/javac/lambda/BadReturn.out diff --git a/langtools/test/tools/javac/lambda/BadStatementInLambda.java b/test/langtools/tools/javac/lambda/BadStatementInLambda.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadStatementInLambda.java rename to test/langtools/tools/javac/lambda/BadStatementInLambda.java diff --git a/langtools/test/tools/javac/lambda/BadStatementInLambda.out b/test/langtools/tools/javac/lambda/BadStatementInLambda.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadStatementInLambda.out rename to test/langtools/tools/javac/lambda/BadStatementInLambda.out diff --git a/langtools/test/tools/javac/lambda/BadStatementInLambda02.java b/test/langtools/tools/javac/lambda/BadStatementInLambda02.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadStatementInLambda02.java rename to test/langtools/tools/javac/lambda/BadStatementInLambda02.java diff --git a/langtools/test/tools/javac/lambda/BadStatementInLambda02.out b/test/langtools/tools/javac/lambda/BadStatementInLambda02.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadStatementInLambda02.out rename to test/langtools/tools/javac/lambda/BadStatementInLambda02.out diff --git a/langtools/test/tools/javac/lambda/BadTargetType.java b/test/langtools/tools/javac/lambda/BadTargetType.java similarity index 100% rename from langtools/test/tools/javac/lambda/BadTargetType.java rename to test/langtools/tools/javac/lambda/BadTargetType.java diff --git a/langtools/test/tools/javac/lambda/BadTargetType.out b/test/langtools/tools/javac/lambda/BadTargetType.out similarity index 100% rename from langtools/test/tools/javac/lambda/BadTargetType.out rename to test/langtools/tools/javac/lambda/BadTargetType.out diff --git a/langtools/test/tools/javac/lambda/ByteCodeTest.java b/test/langtools/tools/javac/lambda/ByteCodeTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/ByteCodeTest.java rename to test/langtools/tools/javac/lambda/ByteCodeTest.java diff --git a/langtools/test/tools/javac/lambda/Conditional01.java b/test/langtools/tools/javac/lambda/Conditional01.java similarity index 100% rename from langtools/test/tools/javac/lambda/Conditional01.java rename to test/langtools/tools/javac/lambda/Conditional01.java diff --git a/langtools/test/tools/javac/lambda/Conditional02.java b/test/langtools/tools/javac/lambda/Conditional02.java similarity index 100% rename from langtools/test/tools/javac/lambda/Conditional02.java rename to test/langtools/tools/javac/lambda/Conditional02.java diff --git a/langtools/test/tools/javac/lambda/Conditional03.java b/test/langtools/tools/javac/lambda/Conditional03.java similarity index 100% rename from langtools/test/tools/javac/lambda/Conditional03.java rename to test/langtools/tools/javac/lambda/Conditional03.java diff --git a/langtools/test/tools/javac/lambda/Conformance01.java b/test/langtools/tools/javac/lambda/Conformance01.java similarity index 100% rename from langtools/test/tools/javac/lambda/Conformance01.java rename to test/langtools/tools/javac/lambda/Conformance01.java diff --git a/langtools/test/tools/javac/lambda/Defender01.java b/test/langtools/tools/javac/lambda/Defender01.java similarity index 100% rename from langtools/test/tools/javac/lambda/Defender01.java rename to test/langtools/tools/javac/lambda/Defender01.java diff --git a/langtools/test/tools/javac/lambda/DisjunctiveTypeTest.java b/test/langtools/tools/javac/lambda/DisjunctiveTypeTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/DisjunctiveTypeTest.java rename to test/langtools/tools/javac/lambda/DisjunctiveTypeTest.java diff --git a/langtools/test/tools/javac/lambda/DoubleStaticImport.java b/test/langtools/tools/javac/lambda/DoubleStaticImport.java similarity index 100% rename from langtools/test/tools/javac/lambda/DoubleStaticImport.java rename to test/langtools/tools/javac/lambda/DoubleStaticImport.java diff --git a/langtools/test/tools/javac/lambda/EffectivelyFinal01.java b/test/langtools/tools/javac/lambda/EffectivelyFinal01.java similarity index 100% rename from langtools/test/tools/javac/lambda/EffectivelyFinal01.java rename to test/langtools/tools/javac/lambda/EffectivelyFinal01.java diff --git a/langtools/test/tools/javac/lambda/EffectivelyFinal01.out b/test/langtools/tools/javac/lambda/EffectivelyFinal01.out similarity index 100% rename from langtools/test/tools/javac/lambda/EffectivelyFinal01.out rename to test/langtools/tools/javac/lambda/EffectivelyFinal01.out diff --git a/langtools/test/tools/javac/lambda/EffectivelyFinalTest.java b/test/langtools/tools/javac/lambda/EffectivelyFinalTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/EffectivelyFinalTest.java rename to test/langtools/tools/javac/lambda/EffectivelyFinalTest.java diff --git a/langtools/test/tools/javac/lambda/EffectivelyFinalTest01.out b/test/langtools/tools/javac/lambda/EffectivelyFinalTest01.out similarity index 100% rename from langtools/test/tools/javac/lambda/EffectivelyFinalTest01.out rename to test/langtools/tools/javac/lambda/EffectivelyFinalTest01.out diff --git a/langtools/test/tools/javac/lambda/EffectivelyFinalTest02.out b/test/langtools/tools/javac/lambda/EffectivelyFinalTest02.out similarity index 100% rename from langtools/test/tools/javac/lambda/EffectivelyFinalTest02.out rename to test/langtools/tools/javac/lambda/EffectivelyFinalTest02.out diff --git a/langtools/test/tools/javac/lambda/EffectivelyFinalThrows.java b/test/langtools/tools/javac/lambda/EffectivelyFinalThrows.java similarity index 100% rename from langtools/test/tools/javac/lambda/EffectivelyFinalThrows.java rename to test/langtools/tools/javac/lambda/EffectivelyFinalThrows.java diff --git a/langtools/test/tools/javac/lambda/ErroneousArg.java b/test/langtools/tools/javac/lambda/ErroneousArg.java similarity index 100% rename from langtools/test/tools/javac/lambda/ErroneousArg.java rename to test/langtools/tools/javac/lambda/ErroneousArg.java diff --git a/langtools/test/tools/javac/lambda/ErroneousArg.out b/test/langtools/tools/javac/lambda/ErroneousArg.out similarity index 100% rename from langtools/test/tools/javac/lambda/ErroneousArg.out rename to test/langtools/tools/javac/lambda/ErroneousArg.out diff --git a/langtools/test/tools/javac/lambda/ExceptionsInLambda.java b/test/langtools/tools/javac/lambda/ExceptionsInLambda.java similarity index 100% rename from langtools/test/tools/javac/lambda/ExceptionsInLambda.java rename to test/langtools/tools/javac/lambda/ExceptionsInLambda.java diff --git a/langtools/test/tools/javac/lambda/ExceptionsInLambda.out b/test/langtools/tools/javac/lambda/ExceptionsInLambda.out similarity index 100% rename from langtools/test/tools/javac/lambda/ExceptionsInLambda.out rename to test/langtools/tools/javac/lambda/ExceptionsInLambda.out diff --git a/langtools/test/tools/javac/lambda/FunctionalInterfaceAnno.java b/test/langtools/tools/javac/lambda/FunctionalInterfaceAnno.java similarity index 100% rename from langtools/test/tools/javac/lambda/FunctionalInterfaceAnno.java rename to test/langtools/tools/javac/lambda/FunctionalInterfaceAnno.java diff --git a/langtools/test/tools/javac/lambda/FunctionalInterfaceAnno.out b/test/langtools/tools/javac/lambda/FunctionalInterfaceAnno.out similarity index 100% rename from langtools/test/tools/javac/lambda/FunctionalInterfaceAnno.out rename to test/langtools/tools/javac/lambda/FunctionalInterfaceAnno.out diff --git a/langtools/test/tools/javac/lambda/FunctionalInterfaceAnno02.java b/test/langtools/tools/javac/lambda/FunctionalInterfaceAnno02.java similarity index 100% rename from langtools/test/tools/javac/lambda/FunctionalInterfaceAnno02.java rename to test/langtools/tools/javac/lambda/FunctionalInterfaceAnno02.java diff --git a/langtools/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java b/test/langtools/tools/javac/lambda/FunctionalInterfaceConversionTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java rename to test/langtools/tools/javac/lambda/FunctionalInterfaceConversionTest.java diff --git a/langtools/test/tools/javac/lambda/GenericMethodRefImplClass.java b/test/langtools/tools/javac/lambda/GenericMethodRefImplClass.java similarity index 100% rename from langtools/test/tools/javac/lambda/GenericMethodRefImplClass.java rename to test/langtools/tools/javac/lambda/GenericMethodRefImplClass.java diff --git a/langtools/test/tools/javac/lambda/IdentifierTest.java b/test/langtools/tools/javac/lambda/IdentifierTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/IdentifierTest.java rename to test/langtools/tools/javac/lambda/IdentifierTest.java diff --git a/langtools/test/tools/javac/lambda/IdentifierTest8.out b/test/langtools/tools/javac/lambda/IdentifierTest8.out similarity index 100% rename from langtools/test/tools/javac/lambda/IdentifierTest8.out rename to test/langtools/tools/javac/lambda/IdentifierTest8.out diff --git a/langtools/test/tools/javac/lambda/IdentifierTest9.out b/test/langtools/tools/javac/lambda/IdentifierTest9.out similarity index 100% rename from langtools/test/tools/javac/lambda/IdentifierTest9.out rename to test/langtools/tools/javac/lambda/IdentifierTest9.out diff --git a/langtools/test/tools/javac/lambda/InnerConstructor.java b/test/langtools/tools/javac/lambda/InnerConstructor.java similarity index 100% rename from langtools/test/tools/javac/lambda/InnerConstructor.java rename to test/langtools/tools/javac/lambda/InnerConstructor.java diff --git a/langtools/test/tools/javac/lambda/Intersection01.java b/test/langtools/tools/javac/lambda/Intersection01.java similarity index 100% rename from langtools/test/tools/javac/lambda/Intersection01.java rename to test/langtools/tools/javac/lambda/Intersection01.java diff --git a/langtools/test/tools/javac/lambda/Intersection02.java b/test/langtools/tools/javac/lambda/Intersection02.java similarity index 100% rename from langtools/test/tools/javac/lambda/Intersection02.java rename to test/langtools/tools/javac/lambda/Intersection02.java diff --git a/langtools/test/tools/javac/lambda/Intersection02.out b/test/langtools/tools/javac/lambda/Intersection02.out similarity index 100% rename from langtools/test/tools/javac/lambda/Intersection02.out rename to test/langtools/tools/javac/lambda/Intersection02.out diff --git a/langtools/test/tools/javac/lambda/Intersection03.java b/test/langtools/tools/javac/lambda/Intersection03.java similarity index 100% rename from langtools/test/tools/javac/lambda/Intersection03.java rename to test/langtools/tools/javac/lambda/Intersection03.java diff --git a/langtools/test/tools/javac/lambda/LambdaCapture01.java b/test/langtools/tools/javac/lambda/LambdaCapture01.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaCapture01.java rename to test/langtools/tools/javac/lambda/LambdaCapture01.java diff --git a/langtools/test/tools/javac/lambda/LambdaCapture02.java b/test/langtools/tools/javac/lambda/LambdaCapture02.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaCapture02.java rename to test/langtools/tools/javac/lambda/LambdaCapture02.java diff --git a/langtools/test/tools/javac/lambda/LambdaCapture03.java b/test/langtools/tools/javac/lambda/LambdaCapture03.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaCapture03.java rename to test/langtools/tools/javac/lambda/LambdaCapture03.java diff --git a/langtools/test/tools/javac/lambda/LambdaCapture04.java b/test/langtools/tools/javac/lambda/LambdaCapture04.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaCapture04.java rename to test/langtools/tools/javac/lambda/LambdaCapture04.java diff --git a/langtools/test/tools/javac/lambda/LambdaCapture05.java b/test/langtools/tools/javac/lambda/LambdaCapture05.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaCapture05.java rename to test/langtools/tools/javac/lambda/LambdaCapture05.java diff --git a/langtools/test/tools/javac/lambda/LambdaCapture06.java b/test/langtools/tools/javac/lambda/LambdaCapture06.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaCapture06.java rename to test/langtools/tools/javac/lambda/LambdaCapture06.java diff --git a/langtools/test/tools/javac/lambda/LambdaCapture07.java b/test/langtools/tools/javac/lambda/LambdaCapture07.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaCapture07.java rename to test/langtools/tools/javac/lambda/LambdaCapture07.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv01.java b/test/langtools/tools/javac/lambda/LambdaConv01.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv01.java rename to test/langtools/tools/javac/lambda/LambdaConv01.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv03.java b/test/langtools/tools/javac/lambda/LambdaConv03.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv03.java rename to test/langtools/tools/javac/lambda/LambdaConv03.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv05.java b/test/langtools/tools/javac/lambda/LambdaConv05.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv05.java rename to test/langtools/tools/javac/lambda/LambdaConv05.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv06.java b/test/langtools/tools/javac/lambda/LambdaConv06.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv06.java rename to test/langtools/tools/javac/lambda/LambdaConv06.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv08.java b/test/langtools/tools/javac/lambda/LambdaConv08.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv08.java rename to test/langtools/tools/javac/lambda/LambdaConv08.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv09.java b/test/langtools/tools/javac/lambda/LambdaConv09.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv09.java rename to test/langtools/tools/javac/lambda/LambdaConv09.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv09.out b/test/langtools/tools/javac/lambda/LambdaConv09.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv09.out rename to test/langtools/tools/javac/lambda/LambdaConv09.out diff --git a/langtools/test/tools/javac/lambda/LambdaConv10.java b/test/langtools/tools/javac/lambda/LambdaConv10.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv10.java rename to test/langtools/tools/javac/lambda/LambdaConv10.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv10.out b/test/langtools/tools/javac/lambda/LambdaConv10.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv10.out rename to test/langtools/tools/javac/lambda/LambdaConv10.out diff --git a/langtools/test/tools/javac/lambda/LambdaConv11.java b/test/langtools/tools/javac/lambda/LambdaConv11.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv11.java rename to test/langtools/tools/javac/lambda/LambdaConv11.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv12.java b/test/langtools/tools/javac/lambda/LambdaConv12.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv12.java rename to test/langtools/tools/javac/lambda/LambdaConv12.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv13.java b/test/langtools/tools/javac/lambda/LambdaConv13.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv13.java rename to test/langtools/tools/javac/lambda/LambdaConv13.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv16.java b/test/langtools/tools/javac/lambda/LambdaConv16.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv16.java rename to test/langtools/tools/javac/lambda/LambdaConv16.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv17.java b/test/langtools/tools/javac/lambda/LambdaConv17.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv17.java rename to test/langtools/tools/javac/lambda/LambdaConv17.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv18.java b/test/langtools/tools/javac/lambda/LambdaConv18.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv18.java rename to test/langtools/tools/javac/lambda/LambdaConv18.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv18.out b/test/langtools/tools/javac/lambda/LambdaConv18.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv18.out rename to test/langtools/tools/javac/lambda/LambdaConv18.out diff --git a/langtools/test/tools/javac/lambda/LambdaConv19.java b/test/langtools/tools/javac/lambda/LambdaConv19.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv19.java rename to test/langtools/tools/javac/lambda/LambdaConv19.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv20.java b/test/langtools/tools/javac/lambda/LambdaConv20.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv20.java rename to test/langtools/tools/javac/lambda/LambdaConv20.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv21.java b/test/langtools/tools/javac/lambda/LambdaConv21.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv21.java rename to test/langtools/tools/javac/lambda/LambdaConv21.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv21.out b/test/langtools/tools/javac/lambda/LambdaConv21.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv21.out rename to test/langtools/tools/javac/lambda/LambdaConv21.out diff --git a/langtools/test/tools/javac/lambda/LambdaConv22.java b/test/langtools/tools/javac/lambda/LambdaConv22.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv22.java rename to test/langtools/tools/javac/lambda/LambdaConv22.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv23.java b/test/langtools/tools/javac/lambda/LambdaConv23.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv23.java rename to test/langtools/tools/javac/lambda/LambdaConv23.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv24.java b/test/langtools/tools/javac/lambda/LambdaConv24.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv24.java rename to test/langtools/tools/javac/lambda/LambdaConv24.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv25.java b/test/langtools/tools/javac/lambda/LambdaConv25.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv25.java rename to test/langtools/tools/javac/lambda/LambdaConv25.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv25.out b/test/langtools/tools/javac/lambda/LambdaConv25.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv25.out rename to test/langtools/tools/javac/lambda/LambdaConv25.out diff --git a/langtools/test/tools/javac/lambda/LambdaConv26.java b/test/langtools/tools/javac/lambda/LambdaConv26.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv26.java rename to test/langtools/tools/javac/lambda/LambdaConv26.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv27.java b/test/langtools/tools/javac/lambda/LambdaConv27.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv27.java rename to test/langtools/tools/javac/lambda/LambdaConv27.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv28.java b/test/langtools/tools/javac/lambda/LambdaConv28.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv28.java rename to test/langtools/tools/javac/lambda/LambdaConv28.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv28.out b/test/langtools/tools/javac/lambda/LambdaConv28.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv28.out rename to test/langtools/tools/javac/lambda/LambdaConv28.out diff --git a/langtools/test/tools/javac/lambda/LambdaConv29.java b/test/langtools/tools/javac/lambda/LambdaConv29.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv29.java rename to test/langtools/tools/javac/lambda/LambdaConv29.java diff --git a/langtools/test/tools/javac/lambda/LambdaConv29.out b/test/langtools/tools/javac/lambda/LambdaConv29.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaConv29.out rename to test/langtools/tools/javac/lambda/LambdaConv29.out diff --git a/langtools/test/tools/javac/lambda/LambdaEffectivelyFinalTest.java b/test/langtools/tools/javac/lambda/LambdaEffectivelyFinalTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaEffectivelyFinalTest.java rename to test/langtools/tools/javac/lambda/LambdaEffectivelyFinalTest.java diff --git a/langtools/test/tools/javac/lambda/LambdaEffectivelyFinalTest.out b/test/langtools/tools/javac/lambda/LambdaEffectivelyFinalTest.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaEffectivelyFinalTest.out rename to test/langtools/tools/javac/lambda/LambdaEffectivelyFinalTest.out diff --git a/langtools/test/tools/javac/lambda/LambdaExpr01.java b/test/langtools/tools/javac/lambda/LambdaExpr01.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr01.java rename to test/langtools/tools/javac/lambda/LambdaExpr01.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr02.java b/test/langtools/tools/javac/lambda/LambdaExpr02.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr02.java rename to test/langtools/tools/javac/lambda/LambdaExpr02.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr04.java b/test/langtools/tools/javac/lambda/LambdaExpr04.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr04.java rename to test/langtools/tools/javac/lambda/LambdaExpr04.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr05.java b/test/langtools/tools/javac/lambda/LambdaExpr05.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr05.java rename to test/langtools/tools/javac/lambda/LambdaExpr05.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr06.java b/test/langtools/tools/javac/lambda/LambdaExpr06.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr06.java rename to test/langtools/tools/javac/lambda/LambdaExpr06.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr07.java b/test/langtools/tools/javac/lambda/LambdaExpr07.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr07.java rename to test/langtools/tools/javac/lambda/LambdaExpr07.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr08.java b/test/langtools/tools/javac/lambda/LambdaExpr08.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr08.java rename to test/langtools/tools/javac/lambda/LambdaExpr08.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr09.java b/test/langtools/tools/javac/lambda/LambdaExpr09.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr09.java rename to test/langtools/tools/javac/lambda/LambdaExpr09.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr10.java b/test/langtools/tools/javac/lambda/LambdaExpr10.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr10.java rename to test/langtools/tools/javac/lambda/LambdaExpr10.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr10.out b/test/langtools/tools/javac/lambda/LambdaExpr10.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr10.out rename to test/langtools/tools/javac/lambda/LambdaExpr10.out diff --git a/langtools/test/tools/javac/lambda/LambdaExpr11.java b/test/langtools/tools/javac/lambda/LambdaExpr11.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr11.java rename to test/langtools/tools/javac/lambda/LambdaExpr11.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr12.java b/test/langtools/tools/javac/lambda/LambdaExpr12.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr12.java rename to test/langtools/tools/javac/lambda/LambdaExpr12.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr13.java b/test/langtools/tools/javac/lambda/LambdaExpr13.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr13.java rename to test/langtools/tools/javac/lambda/LambdaExpr13.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr14.java b/test/langtools/tools/javac/lambda/LambdaExpr14.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr14.java rename to test/langtools/tools/javac/lambda/LambdaExpr14.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr15.java b/test/langtools/tools/javac/lambda/LambdaExpr15.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr15.java rename to test/langtools/tools/javac/lambda/LambdaExpr15.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr16.java b/test/langtools/tools/javac/lambda/LambdaExpr16.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr16.java rename to test/langtools/tools/javac/lambda/LambdaExpr16.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr17.java b/test/langtools/tools/javac/lambda/LambdaExpr17.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr17.java rename to test/langtools/tools/javac/lambda/LambdaExpr17.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr18.java b/test/langtools/tools/javac/lambda/LambdaExpr18.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr18.java rename to test/langtools/tools/javac/lambda/LambdaExpr18.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr19.java b/test/langtools/tools/javac/lambda/LambdaExpr19.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr19.java rename to test/langtools/tools/javac/lambda/LambdaExpr19.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr19.out b/test/langtools/tools/javac/lambda/LambdaExpr19.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr19.out rename to test/langtools/tools/javac/lambda/LambdaExpr19.out diff --git a/langtools/test/tools/javac/lambda/LambdaExpr20.java b/test/langtools/tools/javac/lambda/LambdaExpr20.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr20.java rename to test/langtools/tools/javac/lambda/LambdaExpr20.java diff --git a/langtools/test/tools/javac/lambda/LambdaExpr21.java b/test/langtools/tools/javac/lambda/LambdaExpr21.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExpr21.java rename to test/langtools/tools/javac/lambda/LambdaExpr21.java diff --git a/langtools/test/tools/javac/lambda/LambdaExprLeadsToMissingClassFilesTest.java b/test/langtools/tools/javac/lambda/LambdaExprLeadsToMissingClassFilesTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExprLeadsToMissingClassFilesTest.java rename to test/langtools/tools/javac/lambda/LambdaExprLeadsToMissingClassFilesTest.java diff --git a/langtools/test/tools/javac/lambda/LambdaExprNotVoid.java b/test/langtools/tools/javac/lambda/LambdaExprNotVoid.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExprNotVoid.java rename to test/langtools/tools/javac/lambda/LambdaExprNotVoid.java diff --git a/langtools/test/tools/javac/lambda/LambdaExprNotVoid.out b/test/langtools/tools/javac/lambda/LambdaExprNotVoid.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaExprNotVoid.out rename to test/langtools/tools/javac/lambda/LambdaExprNotVoid.out diff --git a/langtools/test/tools/javac/lambda/LambdaInnerTypeVarArgs.java b/test/langtools/tools/javac/lambda/LambdaInnerTypeVarArgs.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaInnerTypeVarArgs.java rename to test/langtools/tools/javac/lambda/LambdaInnerTypeVarArgs.java diff --git a/langtools/test/tools/javac/lambda/LambdaInnerTypeVarArgsSerialize.java b/test/langtools/tools/javac/lambda/LambdaInnerTypeVarArgsSerialize.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaInnerTypeVarArgsSerialize.java rename to test/langtools/tools/javac/lambda/LambdaInnerTypeVarArgsSerialize.java diff --git a/langtools/test/tools/javac/lambda/LambdaInnerTypeVarReflect.java b/test/langtools/tools/javac/lambda/LambdaInnerTypeVarReflect.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaInnerTypeVarReflect.java rename to test/langtools/tools/javac/lambda/LambdaInnerTypeVarReflect.java diff --git a/langtools/test/tools/javac/lambda/LambdaInnerTypeVarSerialize.java b/test/langtools/tools/javac/lambda/LambdaInnerTypeVarSerialize.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaInnerTypeVarSerialize.java rename to test/langtools/tools/javac/lambda/LambdaInnerTypeVarSerialize.java diff --git a/langtools/test/tools/javac/lambda/LambdaInterfaceStaticField.java b/test/langtools/tools/javac/lambda/LambdaInterfaceStaticField.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaInterfaceStaticField.java rename to test/langtools/tools/javac/lambda/LambdaInterfaceStaticField.java diff --git a/langtools/test/tools/javac/lambda/LambdaLambdaSerialized.java b/test/langtools/tools/javac/lambda/LambdaLambdaSerialized.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaLambdaSerialized.java rename to test/langtools/tools/javac/lambda/LambdaLambdaSerialized.java diff --git a/langtools/test/tools/javac/lambda/LambdaLocalTest.java b/test/langtools/tools/javac/lambda/LambdaLocalTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaLocalTest.java rename to test/langtools/tools/javac/lambda/LambdaLocalTest.java diff --git a/langtools/test/tools/javac/lambda/LambdaMultiCatchTest.java b/test/langtools/tools/javac/lambda/LambdaMultiCatchTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaMultiCatchTest.java rename to test/langtools/tools/javac/lambda/LambdaMultiCatchTest.java diff --git a/langtools/test/tools/javac/lambda/LambdaOuterLocalTest.java b/test/langtools/tools/javac/lambda/LambdaOuterLocalTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaOuterLocalTest.java rename to test/langtools/tools/javac/lambda/LambdaOuterLocalTest.java diff --git a/langtools/test/tools/javac/lambda/LambdaParameterNeedsNoInitTest.java b/test/langtools/tools/javac/lambda/LambdaParameterNeedsNoInitTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaParameterNeedsNoInitTest.java rename to test/langtools/tools/javac/lambda/LambdaParameterNeedsNoInitTest.java diff --git a/langtools/test/tools/javac/lambda/LambdaParenGeneric.java b/test/langtools/tools/javac/lambda/LambdaParenGeneric.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaParenGeneric.java rename to test/langtools/tools/javac/lambda/LambdaParenGeneric.java diff --git a/langtools/test/tools/javac/lambda/LambdaParenGenericOrig.java b/test/langtools/tools/javac/lambda/LambdaParenGenericOrig.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaParenGenericOrig.java rename to test/langtools/tools/javac/lambda/LambdaParenGenericOrig.java diff --git a/langtools/test/tools/javac/lambda/LambdaParserTest.java b/test/langtools/tools/javac/lambda/LambdaParserTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaParserTest.java rename to test/langtools/tools/javac/lambda/LambdaParserTest.java diff --git a/langtools/test/tools/javac/lambda/LambdaScope01.java b/test/langtools/tools/javac/lambda/LambdaScope01.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaScope01.java rename to test/langtools/tools/javac/lambda/LambdaScope01.java diff --git a/langtools/test/tools/javac/lambda/LambdaScope02.java b/test/langtools/tools/javac/lambda/LambdaScope02.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaScope02.java rename to test/langtools/tools/javac/lambda/LambdaScope02.java diff --git a/langtools/test/tools/javac/lambda/LambdaScope03.java b/test/langtools/tools/javac/lambda/LambdaScope03.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaScope03.java rename to test/langtools/tools/javac/lambda/LambdaScope03.java diff --git a/langtools/test/tools/javac/lambda/LambdaScope04.java b/test/langtools/tools/javac/lambda/LambdaScope04.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaScope04.java rename to test/langtools/tools/javac/lambda/LambdaScope04.java diff --git a/langtools/test/tools/javac/lambda/LambdaScope04.out b/test/langtools/tools/javac/lambda/LambdaScope04.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaScope04.out rename to test/langtools/tools/javac/lambda/LambdaScope04.out diff --git a/langtools/test/tools/javac/lambda/LambdaScope05.java b/test/langtools/tools/javac/lambda/LambdaScope05.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaScope05.java rename to test/langtools/tools/javac/lambda/LambdaScope05.java diff --git a/langtools/test/tools/javac/lambda/LambdaScope05.out b/test/langtools/tools/javac/lambda/LambdaScope05.out similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaScope05.out rename to test/langtools/tools/javac/lambda/LambdaScope05.out diff --git a/langtools/test/tools/javac/lambda/LambdaTestStrictFP.java b/test/langtools/tools/javac/lambda/LambdaTestStrictFP.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaTestStrictFP.java rename to test/langtools/tools/javac/lambda/LambdaTestStrictFP.java diff --git a/langtools/test/tools/javac/lambda/LambdaTestStrictFPFlag.java b/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaTestStrictFPFlag.java rename to test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java diff --git a/langtools/test/tools/javac/lambda/LambdaTestStrictFPMethod.java b/test/langtools/tools/javac/lambda/LambdaTestStrictFPMethod.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaTestStrictFPMethod.java rename to test/langtools/tools/javac/lambda/LambdaTestStrictFPMethod.java diff --git a/langtools/test/tools/javac/lambda/LambdaWithInterfaceSuper.java b/test/langtools/tools/javac/lambda/LambdaWithInterfaceSuper.java similarity index 100% rename from langtools/test/tools/javac/lambda/LambdaWithInterfaceSuper.java rename to test/langtools/tools/javac/lambda/LambdaWithInterfaceSuper.java diff --git a/langtools/test/tools/javac/lambda/LocalBreakAndContinue.java b/test/langtools/tools/javac/lambda/LocalBreakAndContinue.java similarity index 100% rename from langtools/test/tools/javac/lambda/LocalBreakAndContinue.java rename to test/langtools/tools/javac/lambda/LocalBreakAndContinue.java diff --git a/langtools/test/tools/javac/lambda/LocalVariableTable.java b/test/langtools/tools/javac/lambda/LocalVariableTable.java similarity index 100% rename from langtools/test/tools/javac/lambda/LocalVariableTable.java rename to test/langtools/tools/javac/lambda/LocalVariableTable.java diff --git a/langtools/test/tools/javac/lambda/MethodHandleInvokeTest.java b/test/langtools/tools/javac/lambda/MethodHandleInvokeTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodHandleInvokeTest.java rename to test/langtools/tools/javac/lambda/MethodHandleInvokeTest.java diff --git a/langtools/test/tools/javac/lambda/MethodReference01.java b/test/langtools/tools/javac/lambda/MethodReference01.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference01.java rename to test/langtools/tools/javac/lambda/MethodReference01.java diff --git a/langtools/test/tools/javac/lambda/MethodReference02.java b/test/langtools/tools/javac/lambda/MethodReference02.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference02.java rename to test/langtools/tools/javac/lambda/MethodReference02.java diff --git a/langtools/test/tools/javac/lambda/MethodReference03.java b/test/langtools/tools/javac/lambda/MethodReference03.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference03.java rename to test/langtools/tools/javac/lambda/MethodReference03.java diff --git a/langtools/test/tools/javac/lambda/MethodReference04.java b/test/langtools/tools/javac/lambda/MethodReference04.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference04.java rename to test/langtools/tools/javac/lambda/MethodReference04.java diff --git a/langtools/test/tools/javac/lambda/MethodReference04.out b/test/langtools/tools/javac/lambda/MethodReference04.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference04.out rename to test/langtools/tools/javac/lambda/MethodReference04.out diff --git a/langtools/test/tools/javac/lambda/MethodReference05.java b/test/langtools/tools/javac/lambda/MethodReference05.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference05.java rename to test/langtools/tools/javac/lambda/MethodReference05.java diff --git a/langtools/test/tools/javac/lambda/MethodReference06.java b/test/langtools/tools/javac/lambda/MethodReference06.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference06.java rename to test/langtools/tools/javac/lambda/MethodReference06.java diff --git a/langtools/test/tools/javac/lambda/MethodReference07.java b/test/langtools/tools/javac/lambda/MethodReference07.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference07.java rename to test/langtools/tools/javac/lambda/MethodReference07.java diff --git a/langtools/test/tools/javac/lambda/MethodReference08.java b/test/langtools/tools/javac/lambda/MethodReference08.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference08.java rename to test/langtools/tools/javac/lambda/MethodReference08.java diff --git a/langtools/test/tools/javac/lambda/MethodReference08.out b/test/langtools/tools/javac/lambda/MethodReference08.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference08.out rename to test/langtools/tools/javac/lambda/MethodReference08.out diff --git a/langtools/test/tools/javac/lambda/MethodReference09.java b/test/langtools/tools/javac/lambda/MethodReference09.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference09.java rename to test/langtools/tools/javac/lambda/MethodReference09.java diff --git a/langtools/test/tools/javac/lambda/MethodReference09.out b/test/langtools/tools/javac/lambda/MethodReference09.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference09.out rename to test/langtools/tools/javac/lambda/MethodReference09.out diff --git a/langtools/test/tools/javac/lambda/MethodReference10.java b/test/langtools/tools/javac/lambda/MethodReference10.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference10.java rename to test/langtools/tools/javac/lambda/MethodReference10.java diff --git a/langtools/test/tools/javac/lambda/MethodReference11.java b/test/langtools/tools/javac/lambda/MethodReference11.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference11.java rename to test/langtools/tools/javac/lambda/MethodReference11.java diff --git a/langtools/test/tools/javac/lambda/MethodReference12.java b/test/langtools/tools/javac/lambda/MethodReference12.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference12.java rename to test/langtools/tools/javac/lambda/MethodReference12.java diff --git a/langtools/test/tools/javac/lambda/MethodReference13.java b/test/langtools/tools/javac/lambda/MethodReference13.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference13.java rename to test/langtools/tools/javac/lambda/MethodReference13.java diff --git a/langtools/test/tools/javac/lambda/MethodReference14.java b/test/langtools/tools/javac/lambda/MethodReference14.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference14.java rename to test/langtools/tools/javac/lambda/MethodReference14.java diff --git a/langtools/test/tools/javac/lambda/MethodReference15.java b/test/langtools/tools/javac/lambda/MethodReference15.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference15.java rename to test/langtools/tools/javac/lambda/MethodReference15.java diff --git a/langtools/test/tools/javac/lambda/MethodReference16.java b/test/langtools/tools/javac/lambda/MethodReference16.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference16.java rename to test/langtools/tools/javac/lambda/MethodReference16.java diff --git a/langtools/test/tools/javac/lambda/MethodReference17.java b/test/langtools/tools/javac/lambda/MethodReference17.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference17.java rename to test/langtools/tools/javac/lambda/MethodReference17.java diff --git a/langtools/test/tools/javac/lambda/MethodReference18.java b/test/langtools/tools/javac/lambda/MethodReference18.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference18.java rename to test/langtools/tools/javac/lambda/MethodReference18.java diff --git a/langtools/test/tools/javac/lambda/MethodReference19.java b/test/langtools/tools/javac/lambda/MethodReference19.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference19.java rename to test/langtools/tools/javac/lambda/MethodReference19.java diff --git a/langtools/test/tools/javac/lambda/MethodReference20.java b/test/langtools/tools/javac/lambda/MethodReference20.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference20.java rename to test/langtools/tools/javac/lambda/MethodReference20.java diff --git a/langtools/test/tools/javac/lambda/MethodReference20.out b/test/langtools/tools/javac/lambda/MethodReference20.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference20.out rename to test/langtools/tools/javac/lambda/MethodReference20.out diff --git a/langtools/test/tools/javac/lambda/MethodReference21.java b/test/langtools/tools/javac/lambda/MethodReference21.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference21.java rename to test/langtools/tools/javac/lambda/MethodReference21.java diff --git a/langtools/test/tools/javac/lambda/MethodReference21.out b/test/langtools/tools/javac/lambda/MethodReference21.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference21.out rename to test/langtools/tools/javac/lambda/MethodReference21.out diff --git a/langtools/test/tools/javac/lambda/MethodReference22.java b/test/langtools/tools/javac/lambda/MethodReference22.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference22.java rename to test/langtools/tools/javac/lambda/MethodReference22.java diff --git a/langtools/test/tools/javac/lambda/MethodReference22.out b/test/langtools/tools/javac/lambda/MethodReference22.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference22.out rename to test/langtools/tools/javac/lambda/MethodReference22.out diff --git a/langtools/test/tools/javac/lambda/MethodReference23.java b/test/langtools/tools/javac/lambda/MethodReference23.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference23.java rename to test/langtools/tools/javac/lambda/MethodReference23.java diff --git a/langtools/test/tools/javac/lambda/MethodReference23.out b/test/langtools/tools/javac/lambda/MethodReference23.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference23.out rename to test/langtools/tools/javac/lambda/MethodReference23.out diff --git a/langtools/test/tools/javac/lambda/MethodReference24.java b/test/langtools/tools/javac/lambda/MethodReference24.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference24.java rename to test/langtools/tools/javac/lambda/MethodReference24.java diff --git a/langtools/test/tools/javac/lambda/MethodReference25.java b/test/langtools/tools/javac/lambda/MethodReference25.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference25.java rename to test/langtools/tools/javac/lambda/MethodReference25.java diff --git a/langtools/test/tools/javac/lambda/MethodReference25.out b/test/langtools/tools/javac/lambda/MethodReference25.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference25.out rename to test/langtools/tools/javac/lambda/MethodReference25.out diff --git a/langtools/test/tools/javac/lambda/MethodReference26.java b/test/langtools/tools/javac/lambda/MethodReference26.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference26.java rename to test/langtools/tools/javac/lambda/MethodReference26.java diff --git a/langtools/test/tools/javac/lambda/MethodReference27.java b/test/langtools/tools/javac/lambda/MethodReference27.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference27.java rename to test/langtools/tools/javac/lambda/MethodReference27.java diff --git a/langtools/test/tools/javac/lambda/MethodReference28.java b/test/langtools/tools/javac/lambda/MethodReference28.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference28.java rename to test/langtools/tools/javac/lambda/MethodReference28.java diff --git a/langtools/test/tools/javac/lambda/MethodReference28.out b/test/langtools/tools/javac/lambda/MethodReference28.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference28.out rename to test/langtools/tools/javac/lambda/MethodReference28.out diff --git a/langtools/test/tools/javac/lambda/MethodReference29.java b/test/langtools/tools/javac/lambda/MethodReference29.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference29.java rename to test/langtools/tools/javac/lambda/MethodReference29.java diff --git a/langtools/test/tools/javac/lambda/MethodReference30.java b/test/langtools/tools/javac/lambda/MethodReference30.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference30.java rename to test/langtools/tools/javac/lambda/MethodReference30.java diff --git a/langtools/test/tools/javac/lambda/MethodReference31.java b/test/langtools/tools/javac/lambda/MethodReference31.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference31.java rename to test/langtools/tools/javac/lambda/MethodReference31.java diff --git a/langtools/test/tools/javac/lambda/MethodReference32.java b/test/langtools/tools/javac/lambda/MethodReference32.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference32.java rename to test/langtools/tools/javac/lambda/MethodReference32.java diff --git a/langtools/test/tools/javac/lambda/MethodReference32.out b/test/langtools/tools/javac/lambda/MethodReference32.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference32.out rename to test/langtools/tools/javac/lambda/MethodReference32.out diff --git a/langtools/test/tools/javac/lambda/MethodReference33.java b/test/langtools/tools/javac/lambda/MethodReference33.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference33.java rename to test/langtools/tools/javac/lambda/MethodReference33.java diff --git a/langtools/test/tools/javac/lambda/MethodReference34.java b/test/langtools/tools/javac/lambda/MethodReference34.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference34.java rename to test/langtools/tools/javac/lambda/MethodReference34.java diff --git a/langtools/test/tools/javac/lambda/MethodReference35.java b/test/langtools/tools/javac/lambda/MethodReference35.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference35.java rename to test/langtools/tools/javac/lambda/MethodReference35.java diff --git a/langtools/test/tools/javac/lambda/MethodReference36.java b/test/langtools/tools/javac/lambda/MethodReference36.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference36.java rename to test/langtools/tools/javac/lambda/MethodReference36.java diff --git a/langtools/test/tools/javac/lambda/MethodReference37.java b/test/langtools/tools/javac/lambda/MethodReference37.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference37.java rename to test/langtools/tools/javac/lambda/MethodReference37.java diff --git a/langtools/test/tools/javac/lambda/MethodReference37.out b/test/langtools/tools/javac/lambda/MethodReference37.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference37.out rename to test/langtools/tools/javac/lambda/MethodReference37.out diff --git a/langtools/test/tools/javac/lambda/MethodReference38.java b/test/langtools/tools/javac/lambda/MethodReference38.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference38.java rename to test/langtools/tools/javac/lambda/MethodReference38.java diff --git a/langtools/test/tools/javac/lambda/MethodReference38.out b/test/langtools/tools/javac/lambda/MethodReference38.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference38.out rename to test/langtools/tools/javac/lambda/MethodReference38.out diff --git a/langtools/test/tools/javac/lambda/MethodReference39.java b/test/langtools/tools/javac/lambda/MethodReference39.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference39.java rename to test/langtools/tools/javac/lambda/MethodReference39.java diff --git a/langtools/test/tools/javac/lambda/MethodReference39.out b/test/langtools/tools/javac/lambda/MethodReference39.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference39.out rename to test/langtools/tools/javac/lambda/MethodReference39.out diff --git a/langtools/test/tools/javac/lambda/MethodReference40.java b/test/langtools/tools/javac/lambda/MethodReference40.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference40.java rename to test/langtools/tools/javac/lambda/MethodReference40.java diff --git a/langtools/test/tools/javac/lambda/MethodReference40.out b/test/langtools/tools/javac/lambda/MethodReference40.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference40.out rename to test/langtools/tools/javac/lambda/MethodReference40.out diff --git a/langtools/test/tools/javac/lambda/MethodReference41.java b/test/langtools/tools/javac/lambda/MethodReference41.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference41.java rename to test/langtools/tools/javac/lambda/MethodReference41.java diff --git a/langtools/test/tools/javac/lambda/MethodReference41.out b/test/langtools/tools/javac/lambda/MethodReference41.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference41.out rename to test/langtools/tools/javac/lambda/MethodReference41.out diff --git a/langtools/test/tools/javac/lambda/MethodReference42.java b/test/langtools/tools/javac/lambda/MethodReference42.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference42.java rename to test/langtools/tools/javac/lambda/MethodReference42.java diff --git a/langtools/test/tools/javac/lambda/MethodReference42.out b/test/langtools/tools/javac/lambda/MethodReference42.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference42.out rename to test/langtools/tools/javac/lambda/MethodReference42.out diff --git a/langtools/test/tools/javac/lambda/MethodReference43.java b/test/langtools/tools/javac/lambda/MethodReference43.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference43.java rename to test/langtools/tools/javac/lambda/MethodReference43.java diff --git a/langtools/test/tools/javac/lambda/MethodReference43.out b/test/langtools/tools/javac/lambda/MethodReference43.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference43.out rename to test/langtools/tools/javac/lambda/MethodReference43.out diff --git a/langtools/test/tools/javac/lambda/MethodReference44.java b/test/langtools/tools/javac/lambda/MethodReference44.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference44.java rename to test/langtools/tools/javac/lambda/MethodReference44.java diff --git a/langtools/test/tools/javac/lambda/MethodReference44.out b/test/langtools/tools/javac/lambda/MethodReference44.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference44.out rename to test/langtools/tools/javac/lambda/MethodReference44.out diff --git a/langtools/test/tools/javac/lambda/MethodReference45.java b/test/langtools/tools/javac/lambda/MethodReference45.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference45.java rename to test/langtools/tools/javac/lambda/MethodReference45.java diff --git a/langtools/test/tools/javac/lambda/MethodReference45.out b/test/langtools/tools/javac/lambda/MethodReference45.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference45.out rename to test/langtools/tools/javac/lambda/MethodReference45.out diff --git a/langtools/test/tools/javac/lambda/MethodReference46.java b/test/langtools/tools/javac/lambda/MethodReference46.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference46.java rename to test/langtools/tools/javac/lambda/MethodReference46.java diff --git a/langtools/test/tools/javac/lambda/MethodReference46.out b/test/langtools/tools/javac/lambda/MethodReference46.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference46.out rename to test/langtools/tools/javac/lambda/MethodReference46.out diff --git a/langtools/test/tools/javac/lambda/MethodReference47.java b/test/langtools/tools/javac/lambda/MethodReference47.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference47.java rename to test/langtools/tools/javac/lambda/MethodReference47.java diff --git a/langtools/test/tools/javac/lambda/MethodReference47.out b/test/langtools/tools/javac/lambda/MethodReference47.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference47.out rename to test/langtools/tools/javac/lambda/MethodReference47.out diff --git a/langtools/test/tools/javac/lambda/MethodReference48.java b/test/langtools/tools/javac/lambda/MethodReference48.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference48.java rename to test/langtools/tools/javac/lambda/MethodReference48.java diff --git a/langtools/test/tools/javac/lambda/MethodReference48.out b/test/langtools/tools/javac/lambda/MethodReference48.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference48.out rename to test/langtools/tools/javac/lambda/MethodReference48.out diff --git a/langtools/test/tools/javac/lambda/MethodReference49.java b/test/langtools/tools/javac/lambda/MethodReference49.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference49.java rename to test/langtools/tools/javac/lambda/MethodReference49.java diff --git a/langtools/test/tools/javac/lambda/MethodReference50.java b/test/langtools/tools/javac/lambda/MethodReference50.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference50.java rename to test/langtools/tools/javac/lambda/MethodReference50.java diff --git a/langtools/test/tools/javac/lambda/MethodReference50.out b/test/langtools/tools/javac/lambda/MethodReference50.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference50.out rename to test/langtools/tools/javac/lambda/MethodReference50.out diff --git a/langtools/test/tools/javac/lambda/MethodReference51.java b/test/langtools/tools/javac/lambda/MethodReference51.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference51.java rename to test/langtools/tools/javac/lambda/MethodReference51.java diff --git a/langtools/test/tools/javac/lambda/MethodReference51.out b/test/langtools/tools/javac/lambda/MethodReference51.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference51.out rename to test/langtools/tools/javac/lambda/MethodReference51.out diff --git a/langtools/test/tools/javac/lambda/MethodReference52.java b/test/langtools/tools/javac/lambda/MethodReference52.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference52.java rename to test/langtools/tools/javac/lambda/MethodReference52.java diff --git a/langtools/test/tools/javac/lambda/MethodReference52.out b/test/langtools/tools/javac/lambda/MethodReference52.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference52.out rename to test/langtools/tools/javac/lambda/MethodReference52.out diff --git a/langtools/test/tools/javac/lambda/MethodReference53.java b/test/langtools/tools/javac/lambda/MethodReference53.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference53.java rename to test/langtools/tools/javac/lambda/MethodReference53.java diff --git a/langtools/test/tools/javac/lambda/MethodReference53.out b/test/langtools/tools/javac/lambda/MethodReference53.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference53.out rename to test/langtools/tools/javac/lambda/MethodReference53.out diff --git a/langtools/test/tools/javac/lambda/MethodReference54.java b/test/langtools/tools/javac/lambda/MethodReference54.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference54.java rename to test/langtools/tools/javac/lambda/MethodReference54.java diff --git a/langtools/test/tools/javac/lambda/MethodReference54.out b/test/langtools/tools/javac/lambda/MethodReference54.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference54.out rename to test/langtools/tools/javac/lambda/MethodReference54.out diff --git a/langtools/test/tools/javac/lambda/MethodReference55.java b/test/langtools/tools/javac/lambda/MethodReference55.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference55.java rename to test/langtools/tools/javac/lambda/MethodReference55.java diff --git a/langtools/test/tools/javac/lambda/MethodReference55.out b/test/langtools/tools/javac/lambda/MethodReference55.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference55.out rename to test/langtools/tools/javac/lambda/MethodReference55.out diff --git a/langtools/test/tools/javac/lambda/MethodReference56.java b/test/langtools/tools/javac/lambda/MethodReference56.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference56.java rename to test/langtools/tools/javac/lambda/MethodReference56.java diff --git a/langtools/test/tools/javac/lambda/MethodReference56.out b/test/langtools/tools/javac/lambda/MethodReference56.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference56.out rename to test/langtools/tools/javac/lambda/MethodReference56.out diff --git a/langtools/test/tools/javac/lambda/MethodReference57.java b/test/langtools/tools/javac/lambda/MethodReference57.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference57.java rename to test/langtools/tools/javac/lambda/MethodReference57.java diff --git a/langtools/test/tools/javac/lambda/MethodReference58.java b/test/langtools/tools/javac/lambda/MethodReference58.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference58.java rename to test/langtools/tools/javac/lambda/MethodReference58.java diff --git a/langtools/test/tools/javac/lambda/MethodReference58.out b/test/langtools/tools/javac/lambda/MethodReference58.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference58.out rename to test/langtools/tools/javac/lambda/MethodReference58.out diff --git a/langtools/test/tools/javac/lambda/MethodReference59.java b/test/langtools/tools/javac/lambda/MethodReference59.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference59.java rename to test/langtools/tools/javac/lambda/MethodReference59.java diff --git a/langtools/test/tools/javac/lambda/MethodReference60.java b/test/langtools/tools/javac/lambda/MethodReference60.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference60.java rename to test/langtools/tools/javac/lambda/MethodReference60.java diff --git a/langtools/test/tools/javac/lambda/MethodReference60.out b/test/langtools/tools/javac/lambda/MethodReference60.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference60.out rename to test/langtools/tools/javac/lambda/MethodReference60.out diff --git a/langtools/test/tools/javac/lambda/MethodReference61.java b/test/langtools/tools/javac/lambda/MethodReference61.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference61.java rename to test/langtools/tools/javac/lambda/MethodReference61.java diff --git a/langtools/test/tools/javac/lambda/MethodReference62.java b/test/langtools/tools/javac/lambda/MethodReference62.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference62.java rename to test/langtools/tools/javac/lambda/MethodReference62.java diff --git a/langtools/test/tools/javac/lambda/MethodReference62.out b/test/langtools/tools/javac/lambda/MethodReference62.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference62.out rename to test/langtools/tools/javac/lambda/MethodReference62.out diff --git a/langtools/test/tools/javac/lambda/MethodReference63.java b/test/langtools/tools/javac/lambda/MethodReference63.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference63.java rename to test/langtools/tools/javac/lambda/MethodReference63.java diff --git a/langtools/test/tools/javac/lambda/MethodReference64.java b/test/langtools/tools/javac/lambda/MethodReference64.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference64.java rename to test/langtools/tools/javac/lambda/MethodReference64.java diff --git a/langtools/test/tools/javac/lambda/MethodReference64.out b/test/langtools/tools/javac/lambda/MethodReference64.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference64.out rename to test/langtools/tools/javac/lambda/MethodReference64.out diff --git a/langtools/test/tools/javac/lambda/MethodReference65.java b/test/langtools/tools/javac/lambda/MethodReference65.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference65.java rename to test/langtools/tools/javac/lambda/MethodReference65.java diff --git a/langtools/test/tools/javac/lambda/MethodReference66.java b/test/langtools/tools/javac/lambda/MethodReference66.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference66.java rename to test/langtools/tools/javac/lambda/MethodReference66.java diff --git a/langtools/test/tools/javac/lambda/MethodReference67.java b/test/langtools/tools/javac/lambda/MethodReference67.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference67.java rename to test/langtools/tools/javac/lambda/MethodReference67.java diff --git a/langtools/test/tools/javac/lambda/MethodReference67.out b/test/langtools/tools/javac/lambda/MethodReference67.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference67.out rename to test/langtools/tools/javac/lambda/MethodReference67.out diff --git a/langtools/test/tools/javac/lambda/MethodReference68.java b/test/langtools/tools/javac/lambda/MethodReference68.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference68.java rename to test/langtools/tools/javac/lambda/MethodReference68.java diff --git a/langtools/test/tools/javac/lambda/MethodReference68.out b/test/langtools/tools/javac/lambda/MethodReference68.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference68.out rename to test/langtools/tools/javac/lambda/MethodReference68.out diff --git a/langtools/test/tools/javac/lambda/MethodReference69.java b/test/langtools/tools/javac/lambda/MethodReference69.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference69.java rename to test/langtools/tools/javac/lambda/MethodReference69.java diff --git a/langtools/test/tools/javac/lambda/MethodReference69.out b/test/langtools/tools/javac/lambda/MethodReference69.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference69.out rename to test/langtools/tools/javac/lambda/MethodReference69.out diff --git a/langtools/test/tools/javac/lambda/MethodReference70.java b/test/langtools/tools/javac/lambda/MethodReference70.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference70.java rename to test/langtools/tools/javac/lambda/MethodReference70.java diff --git a/langtools/test/tools/javac/lambda/MethodReference70.out b/test/langtools/tools/javac/lambda/MethodReference70.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference70.out rename to test/langtools/tools/javac/lambda/MethodReference70.out diff --git a/langtools/test/tools/javac/lambda/MethodReference71.java b/test/langtools/tools/javac/lambda/MethodReference71.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference71.java rename to test/langtools/tools/javac/lambda/MethodReference71.java diff --git a/langtools/test/tools/javac/lambda/MethodReference71.out b/test/langtools/tools/javac/lambda/MethodReference71.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference71.out rename to test/langtools/tools/javac/lambda/MethodReference71.out diff --git a/langtools/test/tools/javac/lambda/MethodReference72.java b/test/langtools/tools/javac/lambda/MethodReference72.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference72.java rename to test/langtools/tools/javac/lambda/MethodReference72.java diff --git a/langtools/test/tools/javac/lambda/MethodReference72.out b/test/langtools/tools/javac/lambda/MethodReference72.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference72.out rename to test/langtools/tools/javac/lambda/MethodReference72.out diff --git a/langtools/test/tools/javac/lambda/MethodReference73.java b/test/langtools/tools/javac/lambda/MethodReference73.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference73.java rename to test/langtools/tools/javac/lambda/MethodReference73.java diff --git a/langtools/test/tools/javac/lambda/MethodReference73.out b/test/langtools/tools/javac/lambda/MethodReference73.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference73.out rename to test/langtools/tools/javac/lambda/MethodReference73.out diff --git a/langtools/test/tools/javac/lambda/MethodReference74.java b/test/langtools/tools/javac/lambda/MethodReference74.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference74.java rename to test/langtools/tools/javac/lambda/MethodReference74.java diff --git a/langtools/test/tools/javac/lambda/MethodReference75.java b/test/langtools/tools/javac/lambda/MethodReference75.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReference75.java rename to test/langtools/tools/javac/lambda/MethodReference75.java diff --git a/langtools/test/tools/javac/lambda/MethodReferenceArrayClone.java b/test/langtools/tools/javac/lambda/MethodReferenceArrayClone.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReferenceArrayClone.java rename to test/langtools/tools/javac/lambda/MethodReferenceArrayClone.java diff --git a/langtools/test/tools/javac/lambda/MethodReferenceGenericTarget.java b/test/langtools/tools/javac/lambda/MethodReferenceGenericTarget.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReferenceGenericTarget.java rename to test/langtools/tools/javac/lambda/MethodReferenceGenericTarget.java diff --git a/langtools/test/tools/javac/lambda/MethodReferenceNoThisTest.java b/test/langtools/tools/javac/lambda/MethodReferenceNoThisTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReferenceNoThisTest.java rename to test/langtools/tools/javac/lambda/MethodReferenceNoThisTest.java diff --git a/langtools/test/tools/javac/lambda/MethodReferenceNoThisTest.out b/test/langtools/tools/javac/lambda/MethodReferenceNoThisTest.out similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReferenceNoThisTest.out rename to test/langtools/tools/javac/lambda/MethodReferenceNoThisTest.out diff --git a/langtools/test/tools/javac/lambda/MethodReferenceParserTest.java b/test/langtools/tools/javac/lambda/MethodReferenceParserTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReferenceParserTest.java rename to test/langtools/tools/javac/lambda/MethodReferenceParserTest.java diff --git a/langtools/test/tools/javac/lambda/MethodReferenceStaticNotAccessibleTest.java b/test/langtools/tools/javac/lambda/MethodReferenceStaticNotAccessibleTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReferenceStaticNotAccessibleTest.java rename to test/langtools/tools/javac/lambda/MethodReferenceStaticNotAccessibleTest.java diff --git a/langtools/test/tools/javac/lambda/MethodReferenceVarargsTest.java b/test/langtools/tools/javac/lambda/MethodReferenceVarargsTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/MethodReferenceVarargsTest.java rename to test/langtools/tools/javac/lambda/MethodReferenceVarargsTest.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific01.java b/test/langtools/tools/javac/lambda/MostSpecific01.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific01.java rename to test/langtools/tools/javac/lambda/MostSpecific01.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific01.out b/test/langtools/tools/javac/lambda/MostSpecific01.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific01.out rename to test/langtools/tools/javac/lambda/MostSpecific01.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific02.java b/test/langtools/tools/javac/lambda/MostSpecific02.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific02.java rename to test/langtools/tools/javac/lambda/MostSpecific02.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific02.out b/test/langtools/tools/javac/lambda/MostSpecific02.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific02.out rename to test/langtools/tools/javac/lambda/MostSpecific02.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific03.java b/test/langtools/tools/javac/lambda/MostSpecific03.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific03.java rename to test/langtools/tools/javac/lambda/MostSpecific03.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific03.out b/test/langtools/tools/javac/lambda/MostSpecific03.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific03.out rename to test/langtools/tools/javac/lambda/MostSpecific03.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific04.java b/test/langtools/tools/javac/lambda/MostSpecific04.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific04.java rename to test/langtools/tools/javac/lambda/MostSpecific04.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific04.out b/test/langtools/tools/javac/lambda/MostSpecific04.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific04.out rename to test/langtools/tools/javac/lambda/MostSpecific04.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific05.java b/test/langtools/tools/javac/lambda/MostSpecific05.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific05.java rename to test/langtools/tools/javac/lambda/MostSpecific05.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific05.out b/test/langtools/tools/javac/lambda/MostSpecific05.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific05.out rename to test/langtools/tools/javac/lambda/MostSpecific05.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific06.java b/test/langtools/tools/javac/lambda/MostSpecific06.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific06.java rename to test/langtools/tools/javac/lambda/MostSpecific06.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific06.out b/test/langtools/tools/javac/lambda/MostSpecific06.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific06.out rename to test/langtools/tools/javac/lambda/MostSpecific06.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific07.java b/test/langtools/tools/javac/lambda/MostSpecific07.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific07.java rename to test/langtools/tools/javac/lambda/MostSpecific07.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific07.out b/test/langtools/tools/javac/lambda/MostSpecific07.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific07.out rename to test/langtools/tools/javac/lambda/MostSpecific07.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific08.java b/test/langtools/tools/javac/lambda/MostSpecific08.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific08.java rename to test/langtools/tools/javac/lambda/MostSpecific08.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific08.out b/test/langtools/tools/javac/lambda/MostSpecific08.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific08.out rename to test/langtools/tools/javac/lambda/MostSpecific08.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific09.java b/test/langtools/tools/javac/lambda/MostSpecific09.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific09.java rename to test/langtools/tools/javac/lambda/MostSpecific09.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific09.out b/test/langtools/tools/javac/lambda/MostSpecific09.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific09.out rename to test/langtools/tools/javac/lambda/MostSpecific09.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific10.java b/test/langtools/tools/javac/lambda/MostSpecific10.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific10.java rename to test/langtools/tools/javac/lambda/MostSpecific10.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific11.java b/test/langtools/tools/javac/lambda/MostSpecific11.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific11.java rename to test/langtools/tools/javac/lambda/MostSpecific11.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific12.java b/test/langtools/tools/javac/lambda/MostSpecific12.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific12.java rename to test/langtools/tools/javac/lambda/MostSpecific12.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific12.out b/test/langtools/tools/javac/lambda/MostSpecific12.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific12.out rename to test/langtools/tools/javac/lambda/MostSpecific12.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific13.java b/test/langtools/tools/javac/lambda/MostSpecific13.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific13.java rename to test/langtools/tools/javac/lambda/MostSpecific13.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific13.out b/test/langtools/tools/javac/lambda/MostSpecific13.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific13.out rename to test/langtools/tools/javac/lambda/MostSpecific13.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific14.java b/test/langtools/tools/javac/lambda/MostSpecific14.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific14.java rename to test/langtools/tools/javac/lambda/MostSpecific14.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific14.out b/test/langtools/tools/javac/lambda/MostSpecific14.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific14.out rename to test/langtools/tools/javac/lambda/MostSpecific14.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific15.java b/test/langtools/tools/javac/lambda/MostSpecific15.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific15.java rename to test/langtools/tools/javac/lambda/MostSpecific15.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific16.java b/test/langtools/tools/javac/lambda/MostSpecific16.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific16.java rename to test/langtools/tools/javac/lambda/MostSpecific16.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific16.out b/test/langtools/tools/javac/lambda/MostSpecific16.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific16.out rename to test/langtools/tools/javac/lambda/MostSpecific16.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific17.java b/test/langtools/tools/javac/lambda/MostSpecific17.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific17.java rename to test/langtools/tools/javac/lambda/MostSpecific17.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific18.java b/test/langtools/tools/javac/lambda/MostSpecific18.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific18.java rename to test/langtools/tools/javac/lambda/MostSpecific18.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific19.java b/test/langtools/tools/javac/lambda/MostSpecific19.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific19.java rename to test/langtools/tools/javac/lambda/MostSpecific19.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific19.out b/test/langtools/tools/javac/lambda/MostSpecific19.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific19.out rename to test/langtools/tools/javac/lambda/MostSpecific19.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific20.java b/test/langtools/tools/javac/lambda/MostSpecific20.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific20.java rename to test/langtools/tools/javac/lambda/MostSpecific20.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific21.java b/test/langtools/tools/javac/lambda/MostSpecific21.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific21.java rename to test/langtools/tools/javac/lambda/MostSpecific21.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific21.out b/test/langtools/tools/javac/lambda/MostSpecific21.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific21.out rename to test/langtools/tools/javac/lambda/MostSpecific21.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific22.java b/test/langtools/tools/javac/lambda/MostSpecific22.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific22.java rename to test/langtools/tools/javac/lambda/MostSpecific22.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific23.java b/test/langtools/tools/javac/lambda/MostSpecific23.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific23.java rename to test/langtools/tools/javac/lambda/MostSpecific23.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific23.out b/test/langtools/tools/javac/lambda/MostSpecific23.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific23.out rename to test/langtools/tools/javac/lambda/MostSpecific23.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific24.java b/test/langtools/tools/javac/lambda/MostSpecific24.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific24.java rename to test/langtools/tools/javac/lambda/MostSpecific24.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific24.out b/test/langtools/tools/javac/lambda/MostSpecific24.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific24.out rename to test/langtools/tools/javac/lambda/MostSpecific24.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific25.java b/test/langtools/tools/javac/lambda/MostSpecific25.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific25.java rename to test/langtools/tools/javac/lambda/MostSpecific25.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific25.out b/test/langtools/tools/javac/lambda/MostSpecific25.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific25.out rename to test/langtools/tools/javac/lambda/MostSpecific25.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific26.java b/test/langtools/tools/javac/lambda/MostSpecific26.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific26.java rename to test/langtools/tools/javac/lambda/MostSpecific26.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific26.out b/test/langtools/tools/javac/lambda/MostSpecific26.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific26.out rename to test/langtools/tools/javac/lambda/MostSpecific26.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific27.java b/test/langtools/tools/javac/lambda/MostSpecific27.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific27.java rename to test/langtools/tools/javac/lambda/MostSpecific27.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific28.java b/test/langtools/tools/javac/lambda/MostSpecific28.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific28.java rename to test/langtools/tools/javac/lambda/MostSpecific28.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific28.out b/test/langtools/tools/javac/lambda/MostSpecific28.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific28.out rename to test/langtools/tools/javac/lambda/MostSpecific28.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific29.java b/test/langtools/tools/javac/lambda/MostSpecific29.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific29.java rename to test/langtools/tools/javac/lambda/MostSpecific29.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific30.java b/test/langtools/tools/javac/lambda/MostSpecific30.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific30.java rename to test/langtools/tools/javac/lambda/MostSpecific30.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific30.out b/test/langtools/tools/javac/lambda/MostSpecific30.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific30.out rename to test/langtools/tools/javac/lambda/MostSpecific30.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific31.java b/test/langtools/tools/javac/lambda/MostSpecific31.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific31.java rename to test/langtools/tools/javac/lambda/MostSpecific31.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific31.out b/test/langtools/tools/javac/lambda/MostSpecific31.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific31.out rename to test/langtools/tools/javac/lambda/MostSpecific31.out diff --git a/langtools/test/tools/javac/lambda/MostSpecific32.java b/test/langtools/tools/javac/lambda/MostSpecific32.java similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific32.java rename to test/langtools/tools/javac/lambda/MostSpecific32.java diff --git a/langtools/test/tools/javac/lambda/MostSpecific32.out b/test/langtools/tools/javac/lambda/MostSpecific32.out similarity index 100% rename from langtools/test/tools/javac/lambda/MostSpecific32.out rename to test/langtools/tools/javac/lambda/MostSpecific32.out diff --git a/langtools/test/tools/javac/lambda/NakedThis.java b/test/langtools/tools/javac/lambda/NakedThis.java similarity index 100% rename from langtools/test/tools/javac/lambda/NakedThis.java rename to test/langtools/tools/javac/lambda/NakedThis.java diff --git a/langtools/test/tools/javac/lambda/NestedCapture01.java b/test/langtools/tools/javac/lambda/NestedCapture01.java similarity index 100% rename from langtools/test/tools/javac/lambda/NestedCapture01.java rename to test/langtools/tools/javac/lambda/NestedCapture01.java diff --git a/langtools/test/tools/javac/lambda/NestedCapture02.java b/test/langtools/tools/javac/lambda/NestedCapture02.java similarity index 100% rename from langtools/test/tools/javac/lambda/NestedCapture02.java rename to test/langtools/tools/javac/lambda/NestedCapture02.java diff --git a/langtools/test/tools/javac/lambda/NestedCapture03.java b/test/langtools/tools/javac/lambda/NestedCapture03.java similarity index 100% rename from langtools/test/tools/javac/lambda/NestedCapture03.java rename to test/langtools/tools/javac/lambda/NestedCapture03.java diff --git a/langtools/test/tools/javac/lambda/NestedCapture04.java b/test/langtools/tools/javac/lambda/NestedCapture04.java similarity index 100% rename from langtools/test/tools/javac/lambda/NestedCapture04.java rename to test/langtools/tools/javac/lambda/NestedCapture04.java diff --git a/langtools/test/tools/javac/lambda/NoWarnOnImplicitParams.java b/test/langtools/tools/javac/lambda/NoWarnOnImplicitParams.java similarity index 100% rename from langtools/test/tools/javac/lambda/NoWarnOnImplicitParams.java rename to test/langtools/tools/javac/lambda/NoWarnOnImplicitParams.java diff --git a/langtools/test/tools/javac/lambda/NoWarnOnImplicitParams.out b/test/langtools/tools/javac/lambda/NoWarnOnImplicitParams.out similarity index 100% rename from langtools/test/tools/javac/lambda/NoWarnOnImplicitParams.out rename to test/langtools/tools/javac/lambda/NoWarnOnImplicitParams.out diff --git a/langtools/test/tools/javac/lambda/SE5AnnotationsOnLambdaParameters.java b/test/langtools/tools/javac/lambda/SE5AnnotationsOnLambdaParameters.java similarity index 100% rename from langtools/test/tools/javac/lambda/SE5AnnotationsOnLambdaParameters.java rename to test/langtools/tools/javac/lambda/SE5AnnotationsOnLambdaParameters.java diff --git a/langtools/test/tools/javac/lambda/SerializedLambdaInInit.java b/test/langtools/tools/javac/lambda/SerializedLambdaInInit.java similarity index 100% rename from langtools/test/tools/javac/lambda/SerializedLambdaInInit.java rename to test/langtools/tools/javac/lambda/SerializedLambdaInInit.java diff --git a/langtools/test/tools/javac/lambda/SingleLocalTest.java b/test/langtools/tools/javac/lambda/SingleLocalTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/SingleLocalTest.java rename to test/langtools/tools/javac/lambda/SingleLocalTest.java diff --git a/langtools/test/tools/javac/lambda/SourceLevelTest.java b/test/langtools/tools/javac/lambda/SourceLevelTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/SourceLevelTest.java rename to test/langtools/tools/javac/lambda/SourceLevelTest.java diff --git a/langtools/test/tools/javac/lambda/SourceLevelTest.out b/test/langtools/tools/javac/lambda/SourceLevelTest.out similarity index 100% rename from langtools/test/tools/javac/lambda/SourceLevelTest.out rename to test/langtools/tools/javac/lambda/SourceLevelTest.out diff --git a/langtools/test/tools/javac/lambda/StaticMethodNegTest.java b/test/langtools/tools/javac/lambda/StaticMethodNegTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/StaticMethodNegTest.java rename to test/langtools/tools/javac/lambda/StaticMethodNegTest.java diff --git a/langtools/test/tools/javac/lambda/StaticMethodNegTest.out b/test/langtools/tools/javac/lambda/StaticMethodNegTest.out similarity index 100% rename from langtools/test/tools/javac/lambda/StaticMethodNegTest.out rename to test/langtools/tools/javac/lambda/StaticMethodNegTest.out diff --git a/langtools/test/tools/javac/lambda/T8024947/PotentiallyAmbiguousWarningTest.java b/test/langtools/tools/javac/lambda/T8024947/PotentiallyAmbiguousWarningTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8024947/PotentiallyAmbiguousWarningTest.java rename to test/langtools/tools/javac/lambda/T8024947/PotentiallyAmbiguousWarningTest.java diff --git a/langtools/test/tools/javac/lambda/T8024947/PotentiallyAmbiguousWarningTest.out b/test/langtools/tools/javac/lambda/T8024947/PotentiallyAmbiguousWarningTest.out similarity index 100% rename from langtools/test/tools/javac/lambda/T8024947/PotentiallyAmbiguousWarningTest.out rename to test/langtools/tools/javac/lambda/T8024947/PotentiallyAmbiguousWarningTest.out diff --git a/langtools/test/tools/javac/lambda/T8025290/ExplicitVSImplicitLambdaTest.java b/test/langtools/tools/javac/lambda/T8025290/ExplicitVSImplicitLambdaTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8025290/ExplicitVSImplicitLambdaTest.java rename to test/langtools/tools/javac/lambda/T8025290/ExplicitVSImplicitLambdaTest.java diff --git a/langtools/test/tools/javac/lambda/T8025816/CrashMethodReferenceWithSiteTypeVarTest.java b/test/langtools/tools/javac/lambda/T8025816/CrashMethodReferenceWithSiteTypeVarTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8025816/CrashMethodReferenceWithSiteTypeVarTest.java rename to test/langtools/tools/javac/lambda/T8025816/CrashMethodReferenceWithSiteTypeVarTest.java diff --git a/langtools/test/tools/javac/lambda/T8031967.java b/test/langtools/tools/javac/lambda/T8031967.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8031967.java rename to test/langtools/tools/javac/lambda/T8031967.java diff --git a/langtools/test/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest1.java b/test/langtools/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest1.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest1.java rename to test/langtools/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest1.java diff --git a/langtools/test/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest1.out b/test/langtools/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest1.out similarity index 100% rename from langtools/test/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest1.out rename to test/langtools/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest1.out diff --git a/langtools/test/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest2.java b/test/langtools/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest2.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest2.java rename to test/langtools/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest2.java diff --git a/langtools/test/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest2.out b/test/langtools/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest2.out similarity index 100% rename from langtools/test/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest2.out rename to test/langtools/tools/javac/lambda/T8033483/IgnoreLambdaBodyDuringResolutionTest2.out diff --git a/langtools/test/tools/javac/lambda/T8037935/LambdaWithBinOpConstRefToConstString.java b/test/langtools/tools/javac/lambda/T8037935/LambdaWithBinOpConstRefToConstString.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8037935/LambdaWithBinOpConstRefToConstString.java rename to test/langtools/tools/javac/lambda/T8037935/LambdaWithBinOpConstRefToConstString.java diff --git a/langtools/test/tools/javac/lambda/T8038182/CrashFunctionDescriptorExceptionTest.java b/test/langtools/tools/javac/lambda/T8038182/CrashFunctionDescriptorExceptionTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8038182/CrashFunctionDescriptorExceptionTest.java rename to test/langtools/tools/javac/lambda/T8038182/CrashFunctionDescriptorExceptionTest.java diff --git a/langtools/test/tools/javac/lambda/T8038182/CrashFunctionDescriptorExceptionTest.out b/test/langtools/tools/javac/lambda/T8038182/CrashFunctionDescriptorExceptionTest.out similarity index 100% rename from langtools/test/tools/javac/lambda/T8038182/CrashFunctionDescriptorExceptionTest.out rename to test/langtools/tools/javac/lambda/T8038182/CrashFunctionDescriptorExceptionTest.out diff --git a/langtools/test/tools/javac/lambda/T8038420/LambdaIncrement.java b/test/langtools/tools/javac/lambda/T8038420/LambdaIncrement.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8038420/LambdaIncrement.java rename to test/langtools/tools/javac/lambda/T8038420/LambdaIncrement.java diff --git a/langtools/test/tools/javac/lambda/T8041704/ErrorMessageTest.java b/test/langtools/tools/javac/lambda/T8041704/ErrorMessageTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8041704/ErrorMessageTest.java rename to test/langtools/tools/javac/lambda/T8041704/ErrorMessageTest.java diff --git a/langtools/test/tools/javac/lambda/T8041704/ErrorMessageTest.out b/test/langtools/tools/javac/lambda/T8041704/ErrorMessageTest.out similarity index 100% rename from langtools/test/tools/javac/lambda/T8041704/ErrorMessageTest.out rename to test/langtools/tools/javac/lambda/T8041704/ErrorMessageTest.out diff --git a/langtools/test/tools/javac/lambda/T8042759/ImplicitLambdaConsideredForApplicabilityTest.java b/test/langtools/tools/javac/lambda/T8042759/ImplicitLambdaConsideredForApplicabilityTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8042759/ImplicitLambdaConsideredForApplicabilityTest.java rename to test/langtools/tools/javac/lambda/T8042759/ImplicitLambdaConsideredForApplicabilityTest.java diff --git a/langtools/test/tools/javac/lambda/T8042759/ImplicitLambdaConsideredForApplicabilityTest.out b/test/langtools/tools/javac/lambda/T8042759/ImplicitLambdaConsideredForApplicabilityTest.out similarity index 100% rename from langtools/test/tools/javac/lambda/T8042759/ImplicitLambdaConsideredForApplicabilityTest.out rename to test/langtools/tools/javac/lambda/T8042759/ImplicitLambdaConsideredForApplicabilityTest.out diff --git a/langtools/test/tools/javac/lambda/T8056014.java b/test/langtools/tools/javac/lambda/T8056014.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8056014.java rename to test/langtools/tools/javac/lambda/T8056014.java diff --git a/langtools/test/tools/javac/lambda/T8056984.java b/test/langtools/tools/javac/lambda/T8056984.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8056984.java rename to test/langtools/tools/javac/lambda/T8056984.java diff --git a/langtools/test/tools/javac/lambda/T8057794.java b/test/langtools/tools/javac/lambda/T8057794.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8057794.java rename to test/langtools/tools/javac/lambda/T8057794.java diff --git a/langtools/test/tools/javac/lambda/T8057794.out b/test/langtools/tools/javac/lambda/T8057794.out similarity index 100% rename from langtools/test/tools/javac/lambda/T8057794.out rename to test/langtools/tools/javac/lambda/T8057794.out diff --git a/langtools/test/tools/javac/lambda/T8057800/NPEMethodReferenceAndGenericsTest.java b/test/langtools/tools/javac/lambda/T8057800/NPEMethodReferenceAndGenericsTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8057800/NPEMethodReferenceAndGenericsTest.java rename to test/langtools/tools/javac/lambda/T8057800/NPEMethodReferenceAndGenericsTest.java diff --git a/langtools/test/tools/javac/lambda/T8077605.java b/test/langtools/tools/javac/lambda/T8077605.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8077605.java rename to test/langtools/tools/javac/lambda/T8077605.java diff --git a/langtools/test/tools/javac/lambda/T8129740/AllowEnclosingVarCaptureTest.java b/test/langtools/tools/javac/lambda/T8129740/AllowEnclosingVarCaptureTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8129740/AllowEnclosingVarCaptureTest.java rename to test/langtools/tools/javac/lambda/T8129740/AllowEnclosingVarCaptureTest.java diff --git a/langtools/test/tools/javac/lambda/T8129740/CaptureInCtorChainingTest.java b/test/langtools/tools/javac/lambda/T8129740/CaptureInCtorChainingTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8129740/CaptureInCtorChainingTest.java rename to test/langtools/tools/javac/lambda/T8129740/CaptureInCtorChainingTest.java diff --git a/langtools/test/tools/javac/lambda/T8129740/QualifiedThisAccessTest.java b/test/langtools/tools/javac/lambda/T8129740/QualifiedThisAccessTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8129740/QualifiedThisAccessTest.java rename to test/langtools/tools/javac/lambda/T8129740/QualifiedThisAccessTest.java diff --git a/langtools/test/tools/javac/lambda/T8129740/SourceForTranslation.java b/test/langtools/tools/javac/lambda/T8129740/SourceForTranslation.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8129740/SourceForTranslation.java rename to test/langtools/tools/javac/lambda/T8129740/SourceForTranslation.java diff --git a/langtools/test/tools/javac/lambda/T8129740/SourceToSourceTranslationTest.java b/test/langtools/tools/javac/lambda/T8129740/SourceToSourceTranslationTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8129740/SourceToSourceTranslationTest.java rename to test/langtools/tools/javac/lambda/T8129740/SourceToSourceTranslationTest.java diff --git a/langtools/test/tools/javac/lambda/T8129740/Universe.java.out b/test/langtools/tools/javac/lambda/T8129740/Universe.java.out similarity index 100% rename from langtools/test/tools/javac/lambda/T8129740/Universe.java.out rename to test/langtools/tools/javac/lambda/T8129740/Universe.java.out diff --git a/langtools/test/tools/javac/lambda/T8145051.java b/test/langtools/tools/javac/lambda/T8145051.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8145051.java rename to test/langtools/tools/javac/lambda/T8145051.java diff --git a/langtools/test/tools/javac/lambda/T8175317.java b/test/langtools/tools/javac/lambda/T8175317.java similarity index 100% rename from langtools/test/tools/javac/lambda/T8175317.java rename to test/langtools/tools/javac/lambda/T8175317.java diff --git a/langtools/test/tools/javac/lambda/T8175317.out b/test/langtools/tools/javac/lambda/T8175317.out similarity index 100% rename from langtools/test/tools/javac/lambda/T8175317.out rename to test/langtools/tools/javac/lambda/T8175317.out diff --git a/langtools/test/tools/javac/lambda/TargetType01.java b/test/langtools/tools/javac/lambda/TargetType01.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType01.java rename to test/langtools/tools/javac/lambda/TargetType01.java diff --git a/langtools/test/tools/javac/lambda/TargetType01.out b/test/langtools/tools/javac/lambda/TargetType01.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType01.out rename to test/langtools/tools/javac/lambda/TargetType01.out diff --git a/langtools/test/tools/javac/lambda/TargetType02.java b/test/langtools/tools/javac/lambda/TargetType02.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType02.java rename to test/langtools/tools/javac/lambda/TargetType02.java diff --git a/langtools/test/tools/javac/lambda/TargetType02.out b/test/langtools/tools/javac/lambda/TargetType02.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType02.out rename to test/langtools/tools/javac/lambda/TargetType02.out diff --git a/langtools/test/tools/javac/lambda/TargetType03.java b/test/langtools/tools/javac/lambda/TargetType03.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType03.java rename to test/langtools/tools/javac/lambda/TargetType03.java diff --git a/langtools/test/tools/javac/lambda/TargetType04.java b/test/langtools/tools/javac/lambda/TargetType04.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType04.java rename to test/langtools/tools/javac/lambda/TargetType04.java diff --git a/langtools/test/tools/javac/lambda/TargetType04.out b/test/langtools/tools/javac/lambda/TargetType04.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType04.out rename to test/langtools/tools/javac/lambda/TargetType04.out diff --git a/langtools/test/tools/javac/lambda/TargetType05.java b/test/langtools/tools/javac/lambda/TargetType05.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType05.java rename to test/langtools/tools/javac/lambda/TargetType05.java diff --git a/langtools/test/tools/javac/lambda/TargetType06.java b/test/langtools/tools/javac/lambda/TargetType06.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType06.java rename to test/langtools/tools/javac/lambda/TargetType06.java diff --git a/langtools/test/tools/javac/lambda/TargetType07.java b/test/langtools/tools/javac/lambda/TargetType07.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType07.java rename to test/langtools/tools/javac/lambda/TargetType07.java diff --git a/langtools/test/tools/javac/lambda/TargetType08.java b/test/langtools/tools/javac/lambda/TargetType08.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType08.java rename to test/langtools/tools/javac/lambda/TargetType08.java diff --git a/langtools/test/tools/javac/lambda/TargetType10.java b/test/langtools/tools/javac/lambda/TargetType10.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType10.java rename to test/langtools/tools/javac/lambda/TargetType10.java diff --git a/langtools/test/tools/javac/lambda/TargetType11.java b/test/langtools/tools/javac/lambda/TargetType11.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType11.java rename to test/langtools/tools/javac/lambda/TargetType11.java diff --git a/langtools/test/tools/javac/lambda/TargetType12.java b/test/langtools/tools/javac/lambda/TargetType12.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType12.java rename to test/langtools/tools/javac/lambda/TargetType12.java diff --git a/langtools/test/tools/javac/lambda/TargetType13.java b/test/langtools/tools/javac/lambda/TargetType13.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType13.java rename to test/langtools/tools/javac/lambda/TargetType13.java diff --git a/langtools/test/tools/javac/lambda/TargetType13.out b/test/langtools/tools/javac/lambda/TargetType13.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType13.out rename to test/langtools/tools/javac/lambda/TargetType13.out diff --git a/langtools/test/tools/javac/lambda/TargetType14.java b/test/langtools/tools/javac/lambda/TargetType14.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType14.java rename to test/langtools/tools/javac/lambda/TargetType14.java diff --git a/langtools/test/tools/javac/lambda/TargetType14.out b/test/langtools/tools/javac/lambda/TargetType14.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType14.out rename to test/langtools/tools/javac/lambda/TargetType14.out diff --git a/langtools/test/tools/javac/lambda/TargetType15.java b/test/langtools/tools/javac/lambda/TargetType15.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType15.java rename to test/langtools/tools/javac/lambda/TargetType15.java diff --git a/langtools/test/tools/javac/lambda/TargetType16.java b/test/langtools/tools/javac/lambda/TargetType16.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType16.java rename to test/langtools/tools/javac/lambda/TargetType16.java diff --git a/langtools/test/tools/javac/lambda/TargetType17.java b/test/langtools/tools/javac/lambda/TargetType17.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType17.java rename to test/langtools/tools/javac/lambda/TargetType17.java diff --git a/langtools/test/tools/javac/lambda/TargetType17.out b/test/langtools/tools/javac/lambda/TargetType17.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType17.out rename to test/langtools/tools/javac/lambda/TargetType17.out diff --git a/langtools/test/tools/javac/lambda/TargetType18.java b/test/langtools/tools/javac/lambda/TargetType18.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType18.java rename to test/langtools/tools/javac/lambda/TargetType18.java diff --git a/langtools/test/tools/javac/lambda/TargetType19.java b/test/langtools/tools/javac/lambda/TargetType19.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType19.java rename to test/langtools/tools/javac/lambda/TargetType19.java diff --git a/langtools/test/tools/javac/lambda/TargetType19.out b/test/langtools/tools/javac/lambda/TargetType19.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType19.out rename to test/langtools/tools/javac/lambda/TargetType19.out diff --git a/langtools/test/tools/javac/lambda/TargetType20.java b/test/langtools/tools/javac/lambda/TargetType20.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType20.java rename to test/langtools/tools/javac/lambda/TargetType20.java diff --git a/langtools/test/tools/javac/lambda/TargetType21.java b/test/langtools/tools/javac/lambda/TargetType21.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType21.java rename to test/langtools/tools/javac/lambda/TargetType21.java diff --git a/langtools/test/tools/javac/lambda/TargetType21.out b/test/langtools/tools/javac/lambda/TargetType21.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType21.out rename to test/langtools/tools/javac/lambda/TargetType21.out diff --git a/langtools/test/tools/javac/lambda/TargetType22.java b/test/langtools/tools/javac/lambda/TargetType22.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType22.java rename to test/langtools/tools/javac/lambda/TargetType22.java diff --git a/langtools/test/tools/javac/lambda/TargetType22.out b/test/langtools/tools/javac/lambda/TargetType22.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType22.out rename to test/langtools/tools/javac/lambda/TargetType22.out diff --git a/langtools/test/tools/javac/lambda/TargetType23.java b/test/langtools/tools/javac/lambda/TargetType23.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType23.java rename to test/langtools/tools/javac/lambda/TargetType23.java diff --git a/langtools/test/tools/javac/lambda/TargetType23.out b/test/langtools/tools/javac/lambda/TargetType23.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType23.out rename to test/langtools/tools/javac/lambda/TargetType23.out diff --git a/langtools/test/tools/javac/lambda/TargetType24.java b/test/langtools/tools/javac/lambda/TargetType24.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType24.java rename to test/langtools/tools/javac/lambda/TargetType24.java diff --git a/langtools/test/tools/javac/lambda/TargetType24.out b/test/langtools/tools/javac/lambda/TargetType24.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType24.out rename to test/langtools/tools/javac/lambda/TargetType24.out diff --git a/langtools/test/tools/javac/lambda/TargetType25.java b/test/langtools/tools/javac/lambda/TargetType25.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType25.java rename to test/langtools/tools/javac/lambda/TargetType25.java diff --git a/langtools/test/tools/javac/lambda/TargetType26.java b/test/langtools/tools/javac/lambda/TargetType26.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType26.java rename to test/langtools/tools/javac/lambda/TargetType26.java diff --git a/langtools/test/tools/javac/lambda/TargetType26.out b/test/langtools/tools/javac/lambda/TargetType26.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType26.out rename to test/langtools/tools/javac/lambda/TargetType26.out diff --git a/langtools/test/tools/javac/lambda/TargetType27.java b/test/langtools/tools/javac/lambda/TargetType27.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType27.java rename to test/langtools/tools/javac/lambda/TargetType27.java diff --git a/langtools/test/tools/javac/lambda/TargetType27.out b/test/langtools/tools/javac/lambda/TargetType27.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType27.out rename to test/langtools/tools/javac/lambda/TargetType27.out diff --git a/langtools/test/tools/javac/lambda/TargetType28.java b/test/langtools/tools/javac/lambda/TargetType28.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType28.java rename to test/langtools/tools/javac/lambda/TargetType28.java diff --git a/langtools/test/tools/javac/lambda/TargetType28.out b/test/langtools/tools/javac/lambda/TargetType28.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType28.out rename to test/langtools/tools/javac/lambda/TargetType28.out diff --git a/langtools/test/tools/javac/lambda/TargetType29.java b/test/langtools/tools/javac/lambda/TargetType29.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType29.java rename to test/langtools/tools/javac/lambda/TargetType29.java diff --git a/langtools/test/tools/javac/lambda/TargetType30.java b/test/langtools/tools/javac/lambda/TargetType30.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType30.java rename to test/langtools/tools/javac/lambda/TargetType30.java diff --git a/langtools/test/tools/javac/lambda/TargetType31.java b/test/langtools/tools/javac/lambda/TargetType31.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType31.java rename to test/langtools/tools/javac/lambda/TargetType31.java diff --git a/langtools/test/tools/javac/lambda/TargetType32.java b/test/langtools/tools/javac/lambda/TargetType32.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType32.java rename to test/langtools/tools/javac/lambda/TargetType32.java diff --git a/langtools/test/tools/javac/lambda/TargetType33.java b/test/langtools/tools/javac/lambda/TargetType33.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType33.java rename to test/langtools/tools/javac/lambda/TargetType33.java diff --git a/langtools/test/tools/javac/lambda/TargetType33.out b/test/langtools/tools/javac/lambda/TargetType33.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType33.out rename to test/langtools/tools/javac/lambda/TargetType33.out diff --git a/langtools/test/tools/javac/lambda/TargetType34.java b/test/langtools/tools/javac/lambda/TargetType34.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType34.java rename to test/langtools/tools/javac/lambda/TargetType34.java diff --git a/langtools/test/tools/javac/lambda/TargetType35.java b/test/langtools/tools/javac/lambda/TargetType35.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType35.java rename to test/langtools/tools/javac/lambda/TargetType35.java diff --git a/langtools/test/tools/javac/lambda/TargetType36.java b/test/langtools/tools/javac/lambda/TargetType36.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType36.java rename to test/langtools/tools/javac/lambda/TargetType36.java diff --git a/langtools/test/tools/javac/lambda/TargetType36.out b/test/langtools/tools/javac/lambda/TargetType36.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType36.out rename to test/langtools/tools/javac/lambda/TargetType36.out diff --git a/langtools/test/tools/javac/lambda/TargetType37.java b/test/langtools/tools/javac/lambda/TargetType37.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType37.java rename to test/langtools/tools/javac/lambda/TargetType37.java diff --git a/langtools/test/tools/javac/lambda/TargetType38.java b/test/langtools/tools/javac/lambda/TargetType38.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType38.java rename to test/langtools/tools/javac/lambda/TargetType38.java diff --git a/langtools/test/tools/javac/lambda/TargetType38.out b/test/langtools/tools/javac/lambda/TargetType38.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType38.out rename to test/langtools/tools/javac/lambda/TargetType38.out diff --git a/langtools/test/tools/javac/lambda/TargetType39.java b/test/langtools/tools/javac/lambda/TargetType39.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType39.java rename to test/langtools/tools/javac/lambda/TargetType39.java diff --git a/langtools/test/tools/javac/lambda/TargetType39.out b/test/langtools/tools/javac/lambda/TargetType39.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType39.out rename to test/langtools/tools/javac/lambda/TargetType39.out diff --git a/langtools/test/tools/javac/lambda/TargetType40.java b/test/langtools/tools/javac/lambda/TargetType40.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType40.java rename to test/langtools/tools/javac/lambda/TargetType40.java diff --git a/langtools/test/tools/javac/lambda/TargetType40.out b/test/langtools/tools/javac/lambda/TargetType40.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType40.out rename to test/langtools/tools/javac/lambda/TargetType40.out diff --git a/langtools/test/tools/javac/lambda/TargetType41.java b/test/langtools/tools/javac/lambda/TargetType41.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType41.java rename to test/langtools/tools/javac/lambda/TargetType41.java diff --git a/langtools/test/tools/javac/lambda/TargetType41.out b/test/langtools/tools/javac/lambda/TargetType41.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType41.out rename to test/langtools/tools/javac/lambda/TargetType41.out diff --git a/langtools/test/tools/javac/lambda/TargetType42.java b/test/langtools/tools/javac/lambda/TargetType42.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType42.java rename to test/langtools/tools/javac/lambda/TargetType42.java diff --git a/langtools/test/tools/javac/lambda/TargetType43.java b/test/langtools/tools/javac/lambda/TargetType43.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType43.java rename to test/langtools/tools/javac/lambda/TargetType43.java diff --git a/langtools/test/tools/javac/lambda/TargetType43.out b/test/langtools/tools/javac/lambda/TargetType43.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType43.out rename to test/langtools/tools/javac/lambda/TargetType43.out diff --git a/langtools/test/tools/javac/lambda/TargetType44.java b/test/langtools/tools/javac/lambda/TargetType44.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType44.java rename to test/langtools/tools/javac/lambda/TargetType44.java diff --git a/langtools/test/tools/javac/lambda/TargetType44.out b/test/langtools/tools/javac/lambda/TargetType44.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType44.out rename to test/langtools/tools/javac/lambda/TargetType44.out diff --git a/langtools/test/tools/javac/lambda/TargetType45.java b/test/langtools/tools/javac/lambda/TargetType45.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType45.java rename to test/langtools/tools/javac/lambda/TargetType45.java diff --git a/langtools/test/tools/javac/lambda/TargetType46.java b/test/langtools/tools/javac/lambda/TargetType46.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType46.java rename to test/langtools/tools/javac/lambda/TargetType46.java diff --git a/langtools/test/tools/javac/lambda/TargetType46.out b/test/langtools/tools/javac/lambda/TargetType46.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType46.out rename to test/langtools/tools/javac/lambda/TargetType46.out diff --git a/langtools/test/tools/javac/lambda/TargetType47.java b/test/langtools/tools/javac/lambda/TargetType47.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType47.java rename to test/langtools/tools/javac/lambda/TargetType47.java diff --git a/langtools/test/tools/javac/lambda/TargetType48.java b/test/langtools/tools/javac/lambda/TargetType48.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType48.java rename to test/langtools/tools/javac/lambda/TargetType48.java diff --git a/langtools/test/tools/javac/lambda/TargetType49.java b/test/langtools/tools/javac/lambda/TargetType49.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType49.java rename to test/langtools/tools/javac/lambda/TargetType49.java diff --git a/langtools/test/tools/javac/lambda/TargetType49.out b/test/langtools/tools/javac/lambda/TargetType49.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType49.out rename to test/langtools/tools/javac/lambda/TargetType49.out diff --git a/langtools/test/tools/javac/lambda/TargetType50.java b/test/langtools/tools/javac/lambda/TargetType50.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType50.java rename to test/langtools/tools/javac/lambda/TargetType50.java diff --git a/langtools/test/tools/javac/lambda/TargetType51.java b/test/langtools/tools/javac/lambda/TargetType51.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType51.java rename to test/langtools/tools/javac/lambda/TargetType51.java diff --git a/langtools/test/tools/javac/lambda/TargetType52.java b/test/langtools/tools/javac/lambda/TargetType52.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType52.java rename to test/langtools/tools/javac/lambda/TargetType52.java diff --git a/langtools/test/tools/javac/lambda/TargetType52.out b/test/langtools/tools/javac/lambda/TargetType52.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType52.out rename to test/langtools/tools/javac/lambda/TargetType52.out diff --git a/langtools/test/tools/javac/lambda/TargetType53.java b/test/langtools/tools/javac/lambda/TargetType53.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType53.java rename to test/langtools/tools/javac/lambda/TargetType53.java diff --git a/langtools/test/tools/javac/lambda/TargetType54.java b/test/langtools/tools/javac/lambda/TargetType54.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType54.java rename to test/langtools/tools/javac/lambda/TargetType54.java diff --git a/langtools/test/tools/javac/lambda/TargetType55.java b/test/langtools/tools/javac/lambda/TargetType55.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType55.java rename to test/langtools/tools/javac/lambda/TargetType55.java diff --git a/langtools/test/tools/javac/lambda/TargetType56.java b/test/langtools/tools/javac/lambda/TargetType56.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType56.java rename to test/langtools/tools/javac/lambda/TargetType56.java diff --git a/langtools/test/tools/javac/lambda/TargetType57.java b/test/langtools/tools/javac/lambda/TargetType57.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType57.java rename to test/langtools/tools/javac/lambda/TargetType57.java diff --git a/langtools/test/tools/javac/lambda/TargetType57.out b/test/langtools/tools/javac/lambda/TargetType57.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType57.out rename to test/langtools/tools/javac/lambda/TargetType57.out diff --git a/langtools/test/tools/javac/lambda/TargetType58.java b/test/langtools/tools/javac/lambda/TargetType58.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType58.java rename to test/langtools/tools/javac/lambda/TargetType58.java diff --git a/langtools/test/tools/javac/lambda/TargetType59.java b/test/langtools/tools/javac/lambda/TargetType59.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType59.java rename to test/langtools/tools/javac/lambda/TargetType59.java diff --git a/langtools/test/tools/javac/lambda/TargetType60.java b/test/langtools/tools/javac/lambda/TargetType60.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType60.java rename to test/langtools/tools/javac/lambda/TargetType60.java diff --git a/langtools/test/tools/javac/lambda/TargetType60.out b/test/langtools/tools/javac/lambda/TargetType60.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType60.out rename to test/langtools/tools/javac/lambda/TargetType60.out diff --git a/langtools/test/tools/javac/lambda/TargetType61.java b/test/langtools/tools/javac/lambda/TargetType61.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType61.java rename to test/langtools/tools/javac/lambda/TargetType61.java diff --git a/langtools/test/tools/javac/lambda/TargetType62.java b/test/langtools/tools/javac/lambda/TargetType62.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType62.java rename to test/langtools/tools/javac/lambda/TargetType62.java diff --git a/langtools/test/tools/javac/lambda/TargetType63.java b/test/langtools/tools/javac/lambda/TargetType63.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType63.java rename to test/langtools/tools/javac/lambda/TargetType63.java diff --git a/langtools/test/tools/javac/lambda/TargetType63.out b/test/langtools/tools/javac/lambda/TargetType63.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType63.out rename to test/langtools/tools/javac/lambda/TargetType63.out diff --git a/langtools/test/tools/javac/lambda/TargetType64.java b/test/langtools/tools/javac/lambda/TargetType64.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType64.java rename to test/langtools/tools/javac/lambda/TargetType64.java diff --git a/langtools/test/tools/javac/lambda/TargetType65.java b/test/langtools/tools/javac/lambda/TargetType65.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType65.java rename to test/langtools/tools/javac/lambda/TargetType65.java diff --git a/langtools/test/tools/javac/lambda/TargetType66.java b/test/langtools/tools/javac/lambda/TargetType66.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType66.java rename to test/langtools/tools/javac/lambda/TargetType66.java diff --git a/langtools/test/tools/javac/lambda/TargetType66.out b/test/langtools/tools/javac/lambda/TargetType66.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType66.out rename to test/langtools/tools/javac/lambda/TargetType66.out diff --git a/langtools/test/tools/javac/lambda/TargetType67.java b/test/langtools/tools/javac/lambda/TargetType67.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType67.java rename to test/langtools/tools/javac/lambda/TargetType67.java diff --git a/langtools/test/tools/javac/lambda/TargetType68.java b/test/langtools/tools/javac/lambda/TargetType68.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType68.java rename to test/langtools/tools/javac/lambda/TargetType68.java diff --git a/langtools/test/tools/javac/lambda/TargetType68.out b/test/langtools/tools/javac/lambda/TargetType68.out similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType68.out rename to test/langtools/tools/javac/lambda/TargetType68.out diff --git a/langtools/test/tools/javac/lambda/TargetType69.java b/test/langtools/tools/javac/lambda/TargetType69.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType69.java rename to test/langtools/tools/javac/lambda/TargetType69.java diff --git a/langtools/test/tools/javac/lambda/TargetType70.java b/test/langtools/tools/javac/lambda/TargetType70.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType70.java rename to test/langtools/tools/javac/lambda/TargetType70.java diff --git a/langtools/test/tools/javac/lambda/TargetType71.java b/test/langtools/tools/javac/lambda/TargetType71.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType71.java rename to test/langtools/tools/javac/lambda/TargetType71.java diff --git a/langtools/test/tools/javac/lambda/TargetType72.java b/test/langtools/tools/javac/lambda/TargetType72.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType72.java rename to test/langtools/tools/javac/lambda/TargetType72.java diff --git a/langtools/test/tools/javac/lambda/TargetType73.java b/test/langtools/tools/javac/lambda/TargetType73.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType73.java rename to test/langtools/tools/javac/lambda/TargetType73.java diff --git a/langtools/test/tools/javac/lambda/TargetType74.java b/test/langtools/tools/javac/lambda/TargetType74.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType74.java rename to test/langtools/tools/javac/lambda/TargetType74.java diff --git a/langtools/test/tools/javac/lambda/TargetType75.java b/test/langtools/tools/javac/lambda/TargetType75.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType75.java rename to test/langtools/tools/javac/lambda/TargetType75.java diff --git a/langtools/test/tools/javac/lambda/TargetType76.java b/test/langtools/tools/javac/lambda/TargetType76.java similarity index 100% rename from langtools/test/tools/javac/lambda/TargetType76.java rename to test/langtools/tools/javac/lambda/TargetType76.java diff --git a/langtools/test/tools/javac/lambda/TestBootstrapMethodsCount.java b/test/langtools/tools/javac/lambda/TestBootstrapMethodsCount.java similarity index 100% rename from langtools/test/tools/javac/lambda/TestBootstrapMethodsCount.java rename to test/langtools/tools/javac/lambda/TestBootstrapMethodsCount.java diff --git a/langtools/test/tools/javac/lambda/TestInvokeDynamic.java b/test/langtools/tools/javac/lambda/TestInvokeDynamic.java similarity index 100% rename from langtools/test/tools/javac/lambda/TestInvokeDynamic.java rename to test/langtools/tools/javac/lambda/TestInvokeDynamic.java diff --git a/langtools/test/tools/javac/lambda/TestLambdaToMethodStats.java b/test/langtools/tools/javac/lambda/TestLambdaToMethodStats.java similarity index 100% rename from langtools/test/tools/javac/lambda/TestLambdaToMethodStats.java rename to test/langtools/tools/javac/lambda/TestLambdaToMethodStats.java diff --git a/langtools/test/tools/javac/lambda/TestSelfRef.java b/test/langtools/tools/javac/lambda/TestSelfRef.java similarity index 100% rename from langtools/test/tools/javac/lambda/TestSelfRef.java rename to test/langtools/tools/javac/lambda/TestSelfRef.java diff --git a/langtools/test/tools/javac/lambda/UnderscoreAsIdent.java b/test/langtools/tools/javac/lambda/UnderscoreAsIdent.java similarity index 100% rename from langtools/test/tools/javac/lambda/UnderscoreAsIdent.java rename to test/langtools/tools/javac/lambda/UnderscoreAsIdent.java diff --git a/langtools/test/tools/javac/lambda/UnderscoreAsIdent8.out b/test/langtools/tools/javac/lambda/UnderscoreAsIdent8.out similarity index 100% rename from langtools/test/tools/javac/lambda/UnderscoreAsIdent8.out rename to test/langtools/tools/javac/lambda/UnderscoreAsIdent8.out diff --git a/langtools/test/tools/javac/lambda/UnderscoreAsIdent9.out b/test/langtools/tools/javac/lambda/UnderscoreAsIdent9.out similarity index 100% rename from langtools/test/tools/javac/lambda/UnderscoreAsIdent9.out rename to test/langtools/tools/javac/lambda/UnderscoreAsIdent9.out diff --git a/langtools/test/tools/javac/lambda/VoidCompatibility.java b/test/langtools/tools/javac/lambda/VoidCompatibility.java similarity index 100% rename from langtools/test/tools/javac/lambda/VoidCompatibility.java rename to test/langtools/tools/javac/lambda/VoidCompatibility.java diff --git a/langtools/test/tools/javac/lambda/VoidLambdaParameter.java b/test/langtools/tools/javac/lambda/VoidLambdaParameter.java similarity index 100% rename from langtools/test/tools/javac/lambda/VoidLambdaParameter.java rename to test/langtools/tools/javac/lambda/VoidLambdaParameter.java diff --git a/langtools/test/tools/javac/lambda/VoidLambdaParameter.out b/test/langtools/tools/javac/lambda/VoidLambdaParameter.out similarity index 100% rename from langtools/test/tools/javac/lambda/VoidLambdaParameter.out rename to test/langtools/tools/javac/lambda/VoidLambdaParameter.out diff --git a/langtools/test/tools/javac/lambda/XDdumpLambdaToMethodStats.java b/test/langtools/tools/javac/lambda/XDdumpLambdaToMethodStats.java similarity index 100% rename from langtools/test/tools/javac/lambda/XDdumpLambdaToMethodStats.java rename to test/langtools/tools/javac/lambda/XDdumpLambdaToMethodStats.java diff --git a/langtools/test/tools/javac/lambda/abort/Abort.java b/test/langtools/tools/javac/lambda/abort/Abort.java similarity index 100% rename from langtools/test/tools/javac/lambda/abort/Abort.java rename to test/langtools/tools/javac/lambda/abort/Abort.java diff --git a/langtools/test/tools/javac/lambda/abort/CompletionFailure.java b/test/langtools/tools/javac/lambda/abort/CompletionFailure.java similarity index 100% rename from langtools/test/tools/javac/lambda/abort/CompletionFailure.java rename to test/langtools/tools/javac/lambda/abort/CompletionFailure.java diff --git a/langtools/test/tools/javac/lambda/badMemberRefBytecode/Main.java b/test/langtools/tools/javac/lambda/badMemberRefBytecode/Main.java similarity index 100% rename from langtools/test/tools/javac/lambda/badMemberRefBytecode/Main.java rename to test/langtools/tools/javac/lambda/badMemberRefBytecode/Main.java diff --git a/langtools/test/tools/javac/lambda/badMemberRefBytecode/TestBadMemberRefBytecode.java b/test/langtools/tools/javac/lambda/badMemberRefBytecode/TestBadMemberRefBytecode.java similarity index 100% rename from langtools/test/tools/javac/lambda/badMemberRefBytecode/TestBadMemberRefBytecode.java rename to test/langtools/tools/javac/lambda/badMemberRefBytecode/TestBadMemberRefBytecode.java diff --git a/langtools/test/tools/javac/lambda/badMemberRefBytecode/Use.java b/test/langtools/tools/javac/lambda/badMemberRefBytecode/Use.java similarity index 100% rename from langtools/test/tools/javac/lambda/badMemberRefBytecode/Use.java rename to test/langtools/tools/javac/lambda/badMemberRefBytecode/Use.java diff --git a/langtools/test/tools/javac/lambda/bridge/TestMetafactoryBridges.java b/test/langtools/tools/javac/lambda/bridge/TestMetafactoryBridges.java similarity index 100% rename from langtools/test/tools/javac/lambda/bridge/TestMetafactoryBridges.java rename to test/langtools/tools/javac/lambda/bridge/TestMetafactoryBridges.java diff --git a/langtools/test/tools/javac/lambda/bridge/template_tests/BridgeMethodTestCase.java b/test/langtools/tools/javac/lambda/bridge/template_tests/BridgeMethodTestCase.java similarity index 100% rename from langtools/test/tools/javac/lambda/bridge/template_tests/BridgeMethodTestCase.java rename to test/langtools/tools/javac/lambda/bridge/template_tests/BridgeMethodTestCase.java diff --git a/langtools/test/tools/javac/lambda/bridge/template_tests/BridgeMethodsTemplateTest.java b/test/langtools/tools/javac/lambda/bridge/template_tests/BridgeMethodsTemplateTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/bridge/template_tests/BridgeMethodsTemplateTest.java rename to test/langtools/tools/javac/lambda/bridge/template_tests/BridgeMethodsTemplateTest.java diff --git a/langtools/test/tools/javac/lambda/bridge/template_tests/TEST.properties b/test/langtools/tools/javac/lambda/bridge/template_tests/TEST.properties similarity index 100% rename from langtools/test/tools/javac/lambda/bridge/template_tests/TEST.properties rename to test/langtools/tools/javac/lambda/bridge/template_tests/TEST.properties diff --git a/langtools/test/tools/javac/lambda/bytecode/TestLambdaBytecode.java b/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java similarity index 100% rename from langtools/test/tools/javac/lambda/bytecode/TestLambdaBytecode.java rename to test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/Helper.java b/test/langtools/tools/javac/lambda/funcInterfaces/Helper.java similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/Helper.java rename to test/langtools/tools/javac/lambda/funcInterfaces/Helper.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1.java b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1.java similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1.java rename to test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg1.java b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1_neg1.java similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg1.java rename to test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1_neg1.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg1.out b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1_neg1.out similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg1.out rename to test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1_neg1.out diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg2.java b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1_neg2.java similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg2.java rename to test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1_neg2.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg2.out b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1_neg2.out similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg2.out rename to test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1_neg2.out diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg3.java b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1_neg3.java similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg3.java rename to test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1_neg3.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg3.out b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1_neg3.out similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg3.out rename to test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest1_neg3.out diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM1.java b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM1.java similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM1.java rename to test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM1.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM2.java b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM2.java similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM2.java rename to test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM2.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM3.java b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM3.java similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM3.java rename to test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM3.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.java b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.java similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.java rename to test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.out b/test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.out similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.out rename to test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.out diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/NonSAM1.java b/test/langtools/tools/javac/lambda/funcInterfaces/NonSAM1.java similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/NonSAM1.java rename to test/langtools/tools/javac/lambda/funcInterfaces/NonSAM1.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/NonSAM1.out b/test/langtools/tools/javac/lambda/funcInterfaces/NonSAM1.out similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/NonSAM1.out rename to test/langtools/tools/javac/lambda/funcInterfaces/NonSAM1.out diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/NonSAM2.java b/test/langtools/tools/javac/lambda/funcInterfaces/NonSAM2.java similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/NonSAM2.java rename to test/langtools/tools/javac/lambda/funcInterfaces/NonSAM2.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/NonSAM2.out b/test/langtools/tools/javac/lambda/funcInterfaces/NonSAM2.out similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/NonSAM2.out rename to test/langtools/tools/javac/lambda/funcInterfaces/NonSAM2.out diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/NonSAM3.java b/test/langtools/tools/javac/lambda/funcInterfaces/NonSAM3.java similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/NonSAM3.java rename to test/langtools/tools/javac/lambda/funcInterfaces/NonSAM3.java diff --git a/langtools/test/tools/javac/lambda/funcInterfaces/NonSAM3.out b/test/langtools/tools/javac/lambda/funcInterfaces/NonSAM3.out similarity index 100% rename from langtools/test/tools/javac/lambda/funcInterfaces/NonSAM3.out rename to test/langtools/tools/javac/lambda/funcInterfaces/NonSAM3.out diff --git a/langtools/test/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.java b/test/langtools/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.java similarity index 100% rename from langtools/test/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.java rename to test/langtools/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.java diff --git a/langtools/test/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.out b/test/langtools/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.out similarity index 100% rename from langtools/test/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.out rename to test/langtools/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.out diff --git a/langtools/test/tools/javac/lambda/inaccessibleMref01/p1/C.java b/test/langtools/tools/javac/lambda/inaccessibleMref01/p1/C.java similarity index 100% rename from langtools/test/tools/javac/lambda/inaccessibleMref01/p1/C.java rename to test/langtools/tools/javac/lambda/inaccessibleMref01/p1/C.java diff --git a/langtools/test/tools/javac/lambda/inaccessibleMref02/InaccessibleMref02.java b/test/langtools/tools/javac/lambda/inaccessibleMref02/InaccessibleMref02.java similarity index 100% rename from langtools/test/tools/javac/lambda/inaccessibleMref02/InaccessibleMref02.java rename to test/langtools/tools/javac/lambda/inaccessibleMref02/InaccessibleMref02.java diff --git a/langtools/test/tools/javac/lambda/inaccessibleMref02/p1/C.java b/test/langtools/tools/javac/lambda/inaccessibleMref02/p1/C.java similarity index 100% rename from langtools/test/tools/javac/lambda/inaccessibleMref02/p1/C.java rename to test/langtools/tools/javac/lambda/inaccessibleMref02/p1/C.java diff --git a/langtools/test/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java b/test/langtools/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java rename to test/langtools/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java diff --git a/langtools/test/tools/javac/lambda/lambdaExecution/InInterface.java b/test/langtools/tools/javac/lambda/lambdaExecution/InInterface.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExecution/InInterface.java rename to test/langtools/tools/javac/lambda/lambdaExecution/InInterface.java diff --git a/langtools/test/tools/javac/lambda/lambdaExecution/InnerConstructor.java b/test/langtools/tools/javac/lambda/lambdaExecution/InnerConstructor.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExecution/InnerConstructor.java rename to test/langtools/tools/javac/lambda/lambdaExecution/InnerConstructor.java diff --git a/langtools/test/tools/javac/lambda/lambdaExecution/LambdaTranslationTest1.java b/test/langtools/tools/javac/lambda/lambdaExecution/LambdaTranslationTest1.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExecution/LambdaTranslationTest1.java rename to test/langtools/tools/javac/lambda/lambdaExecution/LambdaTranslationTest1.java diff --git a/langtools/test/tools/javac/lambda/lambdaExecution/LambdaTranslationTest2.java b/test/langtools/tools/javac/lambda/lambdaExecution/LambdaTranslationTest2.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExecution/LambdaTranslationTest2.java rename to test/langtools/tools/javac/lambda/lambdaExecution/LambdaTranslationTest2.java diff --git a/langtools/test/tools/javac/lambda/lambdaExecution/TBlock.java b/test/langtools/tools/javac/lambda/lambdaExecution/TBlock.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExecution/TBlock.java rename to test/langtools/tools/javac/lambda/lambdaExecution/TBlock.java diff --git a/langtools/test/tools/javac/lambda/lambdaExecution/TMapper.java b/test/langtools/tools/javac/lambda/lambdaExecution/TMapper.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExecution/TMapper.java rename to test/langtools/tools/javac/lambda/lambdaExecution/TMapper.java diff --git a/langtools/test/tools/javac/lambda/lambdaExecution/TPredicate.java b/test/langtools/tools/javac/lambda/lambdaExecution/TPredicate.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExecution/TPredicate.java rename to test/langtools/tools/javac/lambda/lambdaExecution/TPredicate.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/AbstractClass_neg.java b/test/langtools/tools/javac/lambda/lambdaExpression/AbstractClass_neg.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/AbstractClass_neg.java rename to test/langtools/tools/javac/lambda/lambdaExpression/AbstractClass_neg.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/AbstractClass_neg.out b/test/langtools/tools/javac/lambda/lambdaExpression/AbstractClass_neg.out similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/AbstractClass_neg.out rename to test/langtools/tools/javac/lambda/lambdaExpression/AbstractClass_neg.out diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/AccessNonStatic_neg.java b/test/langtools/tools/javac/lambda/lambdaExpression/AccessNonStatic_neg.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/AccessNonStatic_neg.java rename to test/langtools/tools/javac/lambda/lambdaExpression/AccessNonStatic_neg.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/AccessNonStatic_neg.out b/test/langtools/tools/javac/lambda/lambdaExpression/AccessNonStatic_neg.out similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/AccessNonStatic_neg.out rename to test/langtools/tools/javac/lambda/lambdaExpression/AccessNonStatic_neg.out diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/EffectivelyFinal_neg.java b/test/langtools/tools/javac/lambda/lambdaExpression/EffectivelyFinal_neg.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/EffectivelyFinal_neg.java rename to test/langtools/tools/javac/lambda/lambdaExpression/EffectivelyFinal_neg.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/EffectivelyFinal_neg.out b/test/langtools/tools/javac/lambda/lambdaExpression/EffectivelyFinal_neg.out similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/EffectivelyFinal_neg.out rename to test/langtools/tools/javac/lambda/lambdaExpression/EffectivelyFinal_neg.out diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression1.java b/test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression1.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression1.java rename to test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression1.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression1.out b/test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression1.out similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression1.out rename to test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression1.out diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression3.java b/test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression3.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression3.java rename to test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression3.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression3.out b/test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression3.out similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression3.out rename to test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression3.out diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression4.java b/test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression4.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression4.java rename to test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression4.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression4.out b/test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression4.out similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression4.out rename to test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression4.out diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression5.java b/test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression5.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression5.java rename to test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression5.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression5.out b/test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression5.out similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression5.out rename to test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression5.out diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression6.java b/test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression6.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression6.java rename to test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression6.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression6.out b/test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression6.out similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression6.out rename to test/langtools/tools/javac/lambda/lambdaExpression/InvalidExpression6.out diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest1.java b/test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest1.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest1.java rename to test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest1.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest2.java b/test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest2.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest2.java rename to test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest2.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest3.java b/test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest3.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest3.java rename to test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest3.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest4.java b/test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest4.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest4.java rename to test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest4.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest5.java b/test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest5.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest5.java rename to test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest5.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest6.java b/test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest6.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest6.java rename to test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest6.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/SamConversion.java b/test/langtools/tools/javac/lambda/lambdaExpression/SamConversion.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/SamConversion.java rename to test/langtools/tools/javac/lambda/lambdaExpression/SamConversion.java diff --git a/langtools/test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java b/test/langtools/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java rename to test/langtools/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/TestNonSerializableLambdaNameStability.java b/test/langtools/tools/javac/lambda/lambdaNaming/TestNonSerializableLambdaNameStability.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/TestNonSerializableLambdaNameStability.java rename to test/langtools/tools/javac/lambda/lambdaNaming/TestNonSerializableLambdaNameStability.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/TestSerializedLambdaNameStability.java b/test/langtools/tools/javac/lambda/lambdaNaming/TestSerializedLambdaNameStability.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/TestSerializedLambdaNameStability.java rename to test/langtools/tools/javac/lambda/lambdaNaming/TestSerializedLambdaNameStability.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/after/TESTNameOfCapturedArgs.java b/test/langtools/tools/javac/lambda/lambdaNaming/after/TESTNameOfCapturedArgs.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/after/TESTNameOfCapturedArgs.java rename to test/langtools/tools/javac/lambda/lambdaNaming/after/TESTNameOfCapturedArgs.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/after/TESTOrderOfCapturedArgs.java b/test/langtools/tools/javac/lambda/lambdaNaming/after/TESTOrderOfCapturedArgs.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/after/TESTOrderOfCapturedArgs.java rename to test/langtools/tools/javac/lambda/lambdaNaming/after/TESTOrderOfCapturedArgs.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/after/TESTTargetName.java b/test/langtools/tools/javac/lambda/lambdaNaming/after/TESTTargetName.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/after/TESTTargetName.java rename to test/langtools/tools/javac/lambda/lambdaNaming/after/TESTTargetName.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/after/TESTTargetType.java b/test/langtools/tools/javac/lambda/lambdaNaming/after/TESTTargetType.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/after/TESTTargetType.java rename to test/langtools/tools/javac/lambda/lambdaNaming/after/TESTTargetType.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/after/TESTTypesOfCapturedArgs.java b/test/langtools/tools/javac/lambda/lambdaNaming/after/TESTTypesOfCapturedArgs.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/after/TESTTypesOfCapturedArgs.java rename to test/langtools/tools/javac/lambda/lambdaNaming/after/TESTTypesOfCapturedArgs.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/after/TESTVariableAssignmentTarget.java b/test/langtools/tools/javac/lambda/lambdaNaming/after/TESTVariableAssignmentTarget.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/after/TESTVariableAssignmentTarget.java rename to test/langtools/tools/javac/lambda/lambdaNaming/after/TESTVariableAssignmentTarget.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/before/TESTNameOfCapturedArgs.java b/test/langtools/tools/javac/lambda/lambdaNaming/before/TESTNameOfCapturedArgs.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/before/TESTNameOfCapturedArgs.java rename to test/langtools/tools/javac/lambda/lambdaNaming/before/TESTNameOfCapturedArgs.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/before/TESTOrderOfCapturedArgs.java b/test/langtools/tools/javac/lambda/lambdaNaming/before/TESTOrderOfCapturedArgs.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/before/TESTOrderOfCapturedArgs.java rename to test/langtools/tools/javac/lambda/lambdaNaming/before/TESTOrderOfCapturedArgs.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/before/TESTTargetName.java b/test/langtools/tools/javac/lambda/lambdaNaming/before/TESTTargetName.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/before/TESTTargetName.java rename to test/langtools/tools/javac/lambda/lambdaNaming/before/TESTTargetName.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/before/TESTTargetType.java b/test/langtools/tools/javac/lambda/lambdaNaming/before/TESTTargetType.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/before/TESTTargetType.java rename to test/langtools/tools/javac/lambda/lambdaNaming/before/TESTTargetType.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/before/TESTTypesOfCapturedArgs.java b/test/langtools/tools/javac/lambda/lambdaNaming/before/TESTTypesOfCapturedArgs.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/before/TESTTypesOfCapturedArgs.java rename to test/langtools/tools/javac/lambda/lambdaNaming/before/TESTTypesOfCapturedArgs.java diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/before/TESTVariableAssignmentTarget.java b/test/langtools/tools/javac/lambda/lambdaNaming/before/TESTVariableAssignmentTarget.java similarity index 100% rename from langtools/test/tools/javac/lambda/lambdaNaming/before/TESTVariableAssignmentTarget.java rename to test/langtools/tools/javac/lambda/lambdaNaming/before/TESTVariableAssignmentTarget.java diff --git a/langtools/test/tools/javac/lambda/methodReference/BridgeMethod.java b/test/langtools/tools/javac/lambda/methodReference/BridgeMethod.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/BridgeMethod.java rename to test/langtools/tools/javac/lambda/methodReference/BridgeMethod.java diff --git a/langtools/test/tools/javac/lambda/methodReference/IntersectionTypeReceiverTest.java b/test/langtools/tools/javac/lambda/methodReference/IntersectionTypeReceiverTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/IntersectionTypeReceiverTest.java rename to test/langtools/tools/javac/lambda/methodReference/IntersectionTypeReceiverTest.java diff --git a/langtools/test/tools/javac/lambda/methodReference/IntersectionTypeReceiverTest2.java b/test/langtools/tools/javac/lambda/methodReference/IntersectionTypeReceiverTest2.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/IntersectionTypeReceiverTest2.java rename to test/langtools/tools/javac/lambda/methodReference/IntersectionTypeReceiverTest2.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRef1.java b/test/langtools/tools/javac/lambda/methodReference/MethodRef1.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRef1.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRef1.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRef2.java b/test/langtools/tools/javac/lambda/methodReference/MethodRef2.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRef2.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRef2.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRef3.java b/test/langtools/tools/javac/lambda/methodReference/MethodRef3.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRef3.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRef3.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRef4.java b/test/langtools/tools/javac/lambda/methodReference/MethodRef4.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRef4.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRef4.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRef5.java b/test/langtools/tools/javac/lambda/methodReference/MethodRef5.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRef5.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRef5.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRef6.java b/test/langtools/tools/javac/lambda/methodReference/MethodRef6.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRef6.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRef6.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRef7.java b/test/langtools/tools/javac/lambda/methodReference/MethodRef7.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRef7.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRef7.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRef8.java b/test/langtools/tools/javac/lambda/methodReference/MethodRef8.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRef8.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRef8.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.out b/test/langtools/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.out similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.out rename to test/langtools/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.out diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefNewInnerBootstrap.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefNewInnerBootstrap.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefNewInnerBootstrap.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRefNewInnerBootstrap.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaNPE1.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaNPE1.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaNPE1.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaNPE1.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaNPE2.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaNPE2.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaNPE2.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaNPE2.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaVerify1.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaVerify1.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaVerify1.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaVerify1.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaVerify2.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaVerify2.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaVerify2.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaVerify2.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaVerify2simple.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaVerify2simple.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaVerify2simple.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRefNewInnerInLambdaVerify2simple.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefQualifier1.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefQualifier1.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefQualifier1.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRefQualifier1.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefSingleRefEvalBridge.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefSingleRefEvalBridge.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefSingleRefEvalBridge.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRefSingleRefEvalBridge.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefToInner.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefToInner.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefToInner.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRefToInner.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.out b/test/langtools/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.out similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.out rename to test/langtools/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.out diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRefToLocalClassMethodTest.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefToLocalClassMethodTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRefToLocalClassMethodTest.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRefToLocalClassMethodTest.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRef_neg.java b/test/langtools/tools/javac/lambda/methodReference/MethodRef_neg.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRef_neg.java rename to test/langtools/tools/javac/lambda/methodReference/MethodRef_neg.java diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodRef_neg.out b/test/langtools/tools/javac/lambda/methodReference/MethodRef_neg.out similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodRef_neg.out rename to test/langtools/tools/javac/lambda/methodReference/MethodRef_neg.out diff --git a/langtools/test/tools/javac/lambda/methodReference/MethodReferenceComplexNullCheckTest.java b/test/langtools/tools/javac/lambda/methodReference/MethodReferenceComplexNullCheckTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/MethodReferenceComplexNullCheckTest.java rename to test/langtools/tools/javac/lambda/methodReference/MethodReferenceComplexNullCheckTest.java diff --git a/langtools/test/tools/javac/lambda/methodReference/ProtectedInaccessibleMethodRefTest.java b/test/langtools/tools/javac/lambda/methodReference/ProtectedInaccessibleMethodRefTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/ProtectedInaccessibleMethodRefTest.java rename to test/langtools/tools/javac/lambda/methodReference/ProtectedInaccessibleMethodRefTest.java diff --git a/langtools/test/tools/javac/lambda/methodReference/SamConversion.java b/test/langtools/tools/javac/lambda/methodReference/SamConversion.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/SamConversion.java rename to test/langtools/tools/javac/lambda/methodReference/SamConversion.java diff --git a/langtools/test/tools/javac/lambda/methodReference/SamConversionComboTest.java b/test/langtools/tools/javac/lambda/methodReference/SamConversionComboTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/SamConversionComboTest.java rename to test/langtools/tools/javac/lambda/methodReference/SamConversionComboTest.java diff --git a/langtools/test/tools/javac/lambda/methodReference/TreeMakerParamsIsGoofy.java b/test/langtools/tools/javac/lambda/methodReference/TreeMakerParamsIsGoofy.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/TreeMakerParamsIsGoofy.java rename to test/langtools/tools/javac/lambda/methodReference/TreeMakerParamsIsGoofy.java diff --git a/langtools/test/tools/javac/lambda/methodReference/pack/SuperClass.java b/test/langtools/tools/javac/lambda/methodReference/pack/SuperClass.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReference/pack/SuperClass.java rename to test/langtools/tools/javac/lambda/methodReference/pack/SuperClass.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection1.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection1.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection1.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection1.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection2.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection2.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection2.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection2.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection3.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection3.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection3.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection3.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceNullCheckTest.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceNullCheckTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceNullCheckTest.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceNullCheckTest.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferencePackagePrivateQualifier.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferencePackagePrivateQualifier.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferencePackagePrivateQualifier.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferencePackagePrivateQualifier.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestFDCCE.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestFDCCE.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestFDCCE.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestFDCCE.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerDefault.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerDefault.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerDefault.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerDefault.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerInstance.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerInstance.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerInstance.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerInstance.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerVarArgsThis.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerVarArgsThis.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerVarArgsThis.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerVarArgsThis.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInstance.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInstance.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInstance.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInstance.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestKinds.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestKinds.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestKinds.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestKinds.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestMethodHandle.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestMethodHandle.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestMethodHandle.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestMethodHandle.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNew.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNew.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNew.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNew.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNewInner.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNewInner.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNewInner.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNewInner.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNewInnerImplicitArgs.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNewInnerImplicitArgs.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNewInnerImplicitArgs.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNewInnerImplicitArgs.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase1.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase1.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase1.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase1.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase2.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase2.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase2.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase2.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase4.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase4.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase4.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase4.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSuper.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSuper.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSuper.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSuper.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSuperDefault.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSuperDefault.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSuperDefault.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSuperDefault.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestTypeConversion.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestTypeConversion.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestTypeConversion.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestTypeConversion.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgs.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgs.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgs.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgs.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsExt.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsExt.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsExt.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsExt.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsSuper.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsSuper.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsSuper.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsSuper.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsSuperDefault.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsSuperDefault.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsSuperDefault.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsSuperDefault.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsThis.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsThis.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsThis.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarArgsThis.java diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/pkg/B.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/pkg/B.java similarity index 100% rename from langtools/test/tools/javac/lambda/methodReferenceExecution/pkg/B.java rename to test/langtools/tools/javac/lambda/methodReferenceExecution/pkg/B.java diff --git a/langtools/test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java b/test/langtools/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java rename to test/langtools/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java diff --git a/langtools/test/tools/javac/lambda/pkg/Parent.java b/test/langtools/tools/javac/lambda/pkg/Parent.java similarity index 100% rename from langtools/test/tools/javac/lambda/pkg/Parent.java rename to test/langtools/tools/javac/lambda/pkg/Parent.java diff --git a/langtools/test/tools/javac/lambda/pkg/PublicDerived8143647.java b/test/langtools/tools/javac/lambda/pkg/PublicDerived8143647.java similarity index 100% rename from langtools/test/tools/javac/lambda/pkg/PublicDerived8143647.java rename to test/langtools/tools/javac/lambda/pkg/PublicDerived8143647.java diff --git a/langtools/test/tools/javac/lambda/pkg/T8145051.java b/test/langtools/tools/javac/lambda/pkg/T8145051.java similarity index 100% rename from langtools/test/tools/javac/lambda/pkg/T8145051.java rename to test/langtools/tools/javac/lambda/pkg/T8145051.java diff --git a/langtools/test/tools/javac/lambda/privateMethodReferences/MethodInvoker.java b/test/langtools/tools/javac/lambda/privateMethodReferences/MethodInvoker.java similarity index 100% rename from langtools/test/tools/javac/lambda/privateMethodReferences/MethodInvoker.java rename to test/langtools/tools/javac/lambda/privateMethodReferences/MethodInvoker.java diff --git a/langtools/test/tools/javac/lambda/privateMethodReferences/MethodSupplier.java b/test/langtools/tools/javac/lambda/privateMethodReferences/MethodSupplier.java similarity index 100% rename from langtools/test/tools/javac/lambda/privateMethodReferences/MethodSupplier.java rename to test/langtools/tools/javac/lambda/privateMethodReferences/MethodSupplier.java diff --git a/langtools/test/tools/javac/lambda/privateMethodReferences/ThirdClass.java b/test/langtools/tools/javac/lambda/privateMethodReferences/ThirdClass.java similarity index 100% rename from langtools/test/tools/javac/lambda/privateMethodReferences/ThirdClass.java rename to test/langtools/tools/javac/lambda/privateMethodReferences/ThirdClass.java diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.java b/test/langtools/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.java similarity index 100% rename from langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.java rename to test/langtools/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.java diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.out b/test/langtools/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.out similarity index 100% rename from langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.out rename to test/langtools/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.out diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.java b/test/langtools/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.java similarity index 100% rename from langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.java rename to test/langtools/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.java diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.out b/test/langtools/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.out similarity index 100% rename from langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.out rename to test/langtools/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.out diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.java b/test/langtools/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.java similarity index 100% rename from langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.java rename to test/langtools/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.java diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.out b/test/langtools/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.out similarity index 100% rename from langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.out rename to test/langtools/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.out diff --git a/langtools/test/tools/javac/lambda/separate/Foo.java b/test/langtools/tools/javac/lambda/separate/Foo.java similarity index 100% rename from langtools/test/tools/javac/lambda/separate/Foo.java rename to test/langtools/tools/javac/lambda/separate/Foo.java diff --git a/langtools/test/tools/javac/lambda/separate/Test.java b/test/langtools/tools/javac/lambda/separate/Test.java similarity index 100% rename from langtools/test/tools/javac/lambda/separate/Test.java rename to test/langtools/tools/javac/lambda/separate/Test.java diff --git a/langtools/test/tools/javac/lambda/speculative/8147546/T8147546a.java b/test/langtools/tools/javac/lambda/speculative/8147546/T8147546a.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/8147546/T8147546a.java rename to test/langtools/tools/javac/lambda/speculative/8147546/T8147546a.java diff --git a/langtools/test/tools/javac/lambda/speculative/8147546/T8147546b.java b/test/langtools/tools/javac/lambda/speculative/8147546/T8147546b.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/8147546/T8147546b.java rename to test/langtools/tools/javac/lambda/speculative/8147546/T8147546b.java diff --git a/langtools/test/tools/javac/lambda/speculative/8154180/T8154180a.java b/test/langtools/tools/javac/lambda/speculative/8154180/T8154180a.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/8154180/T8154180a.java rename to test/langtools/tools/javac/lambda/speculative/8154180/T8154180a.java diff --git a/langtools/test/tools/javac/lambda/speculative/8154180/T8154180b.java b/test/langtools/tools/javac/lambda/speculative/8154180/T8154180b.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/8154180/T8154180b.java rename to test/langtools/tools/javac/lambda/speculative/8154180/T8154180b.java diff --git a/langtools/test/tools/javac/lambda/speculative/8154180/T8154180b.out b/test/langtools/tools/javac/lambda/speculative/8154180/T8154180b.out similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/8154180/T8154180b.out rename to test/langtools/tools/javac/lambda/speculative/8154180/T8154180b.out diff --git a/langtools/test/tools/javac/lambda/speculative/A.java b/test/langtools/tools/javac/lambda/speculative/A.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/A.java rename to test/langtools/tools/javac/lambda/speculative/A.java diff --git a/langtools/test/tools/javac/lambda/speculative/DiamondFinder.java b/test/langtools/tools/javac/lambda/speculative/DiamondFinder.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/DiamondFinder.java rename to test/langtools/tools/javac/lambda/speculative/DiamondFinder.java diff --git a/langtools/test/tools/javac/lambda/speculative/InferStrict.java b/test/langtools/tools/javac/lambda/speculative/InferStrict.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/InferStrict.java rename to test/langtools/tools/javac/lambda/speculative/InferStrict.java diff --git a/langtools/test/tools/javac/lambda/speculative/InferWeak.java b/test/langtools/tools/javac/lambda/speculative/InferWeak.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/InferWeak.java rename to test/langtools/tools/javac/lambda/speculative/InferWeak.java diff --git a/langtools/test/tools/javac/lambda/speculative/Main.java b/test/langtools/tools/javac/lambda/speculative/Main.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/Main.java rename to test/langtools/tools/javac/lambda/speculative/Main.java diff --git a/langtools/test/tools/javac/lambda/speculative/Main.out b/test/langtools/tools/javac/lambda/speculative/Main.out similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/Main.out rename to test/langtools/tools/javac/lambda/speculative/Main.out diff --git a/langtools/test/tools/javac/lambda/speculative/MissingError.java b/test/langtools/tools/javac/lambda/speculative/MissingError.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/MissingError.java rename to test/langtools/tools/javac/lambda/speculative/MissingError.java diff --git a/langtools/test/tools/javac/lambda/speculative/MissingError.out b/test/langtools/tools/javac/lambda/speculative/MissingError.out similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/MissingError.out rename to test/langtools/tools/javac/lambda/speculative/MissingError.out diff --git a/langtools/test/tools/javac/lambda/speculative/NestedLambdaGenerics.java b/test/langtools/tools/javac/lambda/speculative/NestedLambdaGenerics.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/NestedLambdaGenerics.java rename to test/langtools/tools/javac/lambda/speculative/NestedLambdaGenerics.java diff --git a/langtools/test/tools/javac/lambda/speculative/NestedLambdaNoGenerics.java b/test/langtools/tools/javac/lambda/speculative/NestedLambdaNoGenerics.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/NestedLambdaNoGenerics.java rename to test/langtools/tools/javac/lambda/speculative/NestedLambdaNoGenerics.java diff --git a/langtools/test/tools/javac/lambda/speculative/T8046685.java b/test/langtools/tools/javac/lambda/speculative/T8046685.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/T8046685.java rename to test/langtools/tools/javac/lambda/speculative/T8046685.java diff --git a/langtools/test/tools/javac/lambda/speculative/T8055984.java b/test/langtools/tools/javac/lambda/speculative/T8055984.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/T8055984.java rename to test/langtools/tools/javac/lambda/speculative/T8055984.java diff --git a/langtools/test/tools/javac/lambda/speculative/T8077247.java b/test/langtools/tools/javac/lambda/speculative/T8077247.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/T8077247.java rename to test/langtools/tools/javac/lambda/speculative/T8077247.java diff --git a/langtools/test/tools/javac/lambda/speculative/T8078093.java b/test/langtools/tools/javac/lambda/speculative/T8078093.java similarity index 100% rename from langtools/test/tools/javac/lambda/speculative/T8078093.java rename to test/langtools/tools/javac/lambda/speculative/T8078093.java diff --git a/langtools/test/tools/javac/lambda/typeInference/InferenceTest11.java b/test/langtools/tools/javac/lambda/typeInference/InferenceTest11.java similarity index 100% rename from langtools/test/tools/javac/lambda/typeInference/InferenceTest11.java rename to test/langtools/tools/javac/lambda/typeInference/InferenceTest11.java diff --git a/langtools/test/tools/javac/lambda/typeInference/InferenceTest2.java b/test/langtools/tools/javac/lambda/typeInference/InferenceTest2.java similarity index 100% rename from langtools/test/tools/javac/lambda/typeInference/InferenceTest2.java rename to test/langtools/tools/javac/lambda/typeInference/InferenceTest2.java diff --git a/langtools/test/tools/javac/lambda/typeInference/InferenceTest2b.java b/test/langtools/tools/javac/lambda/typeInference/InferenceTest2b.java similarity index 100% rename from langtools/test/tools/javac/lambda/typeInference/InferenceTest2b.java rename to test/langtools/tools/javac/lambda/typeInference/InferenceTest2b.java diff --git a/langtools/test/tools/javac/lambda/typeInference/InferenceTest3.java b/test/langtools/tools/javac/lambda/typeInference/InferenceTest3.java similarity index 100% rename from langtools/test/tools/javac/lambda/typeInference/InferenceTest3.java rename to test/langtools/tools/javac/lambda/typeInference/InferenceTest3.java diff --git a/langtools/test/tools/javac/lambda/typeInference/InferenceTest4.java b/test/langtools/tools/javac/lambda/typeInference/InferenceTest4.java similarity index 100% rename from langtools/test/tools/javac/lambda/typeInference/InferenceTest4.java rename to test/langtools/tools/javac/lambda/typeInference/InferenceTest4.java diff --git a/langtools/test/tools/javac/lambda/typeInference/InferenceTest6.java b/test/langtools/tools/javac/lambda/typeInference/InferenceTest6.java similarity index 100% rename from langtools/test/tools/javac/lambda/typeInference/InferenceTest6.java rename to test/langtools/tools/javac/lambda/typeInference/InferenceTest6.java diff --git a/langtools/test/tools/javac/lambda/typeInference/InferenceTest789.java b/test/langtools/tools/javac/lambda/typeInference/InferenceTest789.java similarity index 100% rename from langtools/test/tools/javac/lambda/typeInference/InferenceTest789.java rename to test/langtools/tools/javac/lambda/typeInference/InferenceTest789.java diff --git a/langtools/test/tools/javac/lambda/typeInference/InferenceTest_neg1_2.java b/test/langtools/tools/javac/lambda/typeInference/InferenceTest_neg1_2.java similarity index 100% rename from langtools/test/tools/javac/lambda/typeInference/InferenceTest_neg1_2.java rename to test/langtools/tools/javac/lambda/typeInference/InferenceTest_neg1_2.java diff --git a/langtools/test/tools/javac/lambda/typeInference/InferenceTest_neg1_2.out b/test/langtools/tools/javac/lambda/typeInference/InferenceTest_neg1_2.out similarity index 100% rename from langtools/test/tools/javac/lambda/typeInference/InferenceTest_neg1_2.out rename to test/langtools/tools/javac/lambda/typeInference/InferenceTest_neg1_2.out diff --git a/langtools/test/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java b/test/langtools/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java similarity index 100% rename from langtools/test/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java rename to test/langtools/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java diff --git a/langtools/test/tools/javac/lambdaShapes/TEST.properties b/test/langtools/tools/javac/lambdaShapes/TEST.properties similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/TEST.properties rename to test/langtools/tools/javac/lambdaShapes/TEST.properties diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/javac/FDTest.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/javac/FDTest.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/javac/FDTest.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/javac/FDTest.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/AttributeInjector.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/AttributeInjector.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/AttributeInjector.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/AttributeInjector.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFile.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFile.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFile.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFile.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFilePreprocessor.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFilePreprocessor.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFilePreprocessor.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFilePreprocessor.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassToInterfaceConverter.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassToInterfaceConverter.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassToInterfaceConverter.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassToInterfaceConverter.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/Compiler.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/Compiler.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/Compiler.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/Compiler.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/DirectedClassLoader.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/DirectedClassLoader.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/DirectedClassLoader.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/DirectedClassLoader.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/SourceModel.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/SourceModel.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/SourceModel.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/SourceModel.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/TestHarness.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/TestHarness.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/TestHarness.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/separate/TestHarness.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/ClassCase.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/ClassCase.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/ClassCase.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/ClassCase.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/Hierarchy.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/Hierarchy.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/Hierarchy.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/Hierarchy.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/HierarchyGenerator.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/HierarchyGenerator.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/HierarchyGenerator.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/HierarchyGenerator.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/Rule.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/Rule.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/Rule.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/Rule.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/RuleGroup.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/RuleGroup.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/RuleGroup.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/RuleGroup.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/TTNode.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/TTNode.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/TTNode.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/TTNode.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/TTParser.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/TTParser.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/TTParser.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/TTParser.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/TTShape.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/TTShape.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/TTShape.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/shapegen/TTShape.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java diff --git a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java b/test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java similarity index 100% rename from langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java rename to test/langtools/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java diff --git a/langtools/test/tools/javac/lexer/JavaLexerTest.java b/test/langtools/tools/javac/lexer/JavaLexerTest.java similarity index 100% rename from langtools/test/tools/javac/lexer/JavaLexerTest.java rename to test/langtools/tools/javac/lexer/JavaLexerTest.java diff --git a/langtools/test/tools/javac/lib/CompileFail.java b/test/langtools/tools/javac/lib/CompileFail.java similarity index 100% rename from langtools/test/tools/javac/lib/CompileFail.java rename to test/langtools/tools/javac/lib/CompileFail.java diff --git a/langtools/test/tools/javac/lib/DPrinter.java b/test/langtools/tools/javac/lib/DPrinter.java similarity index 100% rename from langtools/test/tools/javac/lib/DPrinter.java rename to test/langtools/tools/javac/lib/DPrinter.java diff --git a/langtools/test/tools/javac/lib/InMemoryFileManager.java b/test/langtools/tools/javac/lib/InMemoryFileManager.java similarity index 100% rename from langtools/test/tools/javac/lib/InMemoryFileManager.java rename to test/langtools/tools/javac/lib/InMemoryFileManager.java diff --git a/langtools/test/tools/javac/lib/JavacTestingAbstractProcessor.java b/test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java similarity index 100% rename from langtools/test/tools/javac/lib/JavacTestingAbstractProcessor.java rename to test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java diff --git a/langtools/test/tools/javac/lib/combo/ComboInstance.java b/test/langtools/tools/javac/lib/combo/ComboInstance.java similarity index 100% rename from langtools/test/tools/javac/lib/combo/ComboInstance.java rename to test/langtools/tools/javac/lib/combo/ComboInstance.java diff --git a/langtools/test/tools/javac/lib/combo/ComboParameter.java b/test/langtools/tools/javac/lib/combo/ComboParameter.java similarity index 100% rename from langtools/test/tools/javac/lib/combo/ComboParameter.java rename to test/langtools/tools/javac/lib/combo/ComboParameter.java diff --git a/langtools/test/tools/javac/lib/combo/ComboTask.java b/test/langtools/tools/javac/lib/combo/ComboTask.java similarity index 100% rename from langtools/test/tools/javac/lib/combo/ComboTask.java rename to test/langtools/tools/javac/lib/combo/ComboTask.java diff --git a/langtools/test/tools/javac/lib/combo/ComboTestHelper.java b/test/langtools/tools/javac/lib/combo/ComboTestHelper.java similarity index 100% rename from langtools/test/tools/javac/lib/combo/ComboTestHelper.java rename to test/langtools/tools/javac/lib/combo/ComboTestHelper.java diff --git a/langtools/test/tools/javac/lib/combo/ReusableContext.java b/test/langtools/tools/javac/lib/combo/ReusableContext.java similarity index 100% rename from langtools/test/tools/javac/lib/combo/ReusableContext.java rename to test/langtools/tools/javac/lib/combo/ReusableContext.java diff --git a/langtools/test/tools/javac/limits/ArrayDims1.java b/test/langtools/tools/javac/limits/ArrayDims1.java similarity index 100% rename from langtools/test/tools/javac/limits/ArrayDims1.java rename to test/langtools/tools/javac/limits/ArrayDims1.java diff --git a/langtools/test/tools/javac/limits/ArrayDims2.java b/test/langtools/tools/javac/limits/ArrayDims2.java similarity index 100% rename from langtools/test/tools/javac/limits/ArrayDims2.java rename to test/langtools/tools/javac/limits/ArrayDims2.java diff --git a/langtools/test/tools/javac/limits/ArrayDims2.out b/test/langtools/tools/javac/limits/ArrayDims2.out similarity index 100% rename from langtools/test/tools/javac/limits/ArrayDims2.out rename to test/langtools/tools/javac/limits/ArrayDims2.out diff --git a/langtools/test/tools/javac/limits/ArrayDims3.java b/test/langtools/tools/javac/limits/ArrayDims3.java similarity index 100% rename from langtools/test/tools/javac/limits/ArrayDims3.java rename to test/langtools/tools/javac/limits/ArrayDims3.java diff --git a/langtools/test/tools/javac/limits/ArrayDims4.java b/test/langtools/tools/javac/limits/ArrayDims4.java similarity index 100% rename from langtools/test/tools/javac/limits/ArrayDims4.java rename to test/langtools/tools/javac/limits/ArrayDims4.java diff --git a/langtools/test/tools/javac/limits/ArrayDims4.out b/test/langtools/tools/javac/limits/ArrayDims4.out similarity index 100% rename from langtools/test/tools/javac/limits/ArrayDims4.out rename to test/langtools/tools/javac/limits/ArrayDims4.out diff --git a/langtools/test/tools/javac/limits/ArrayDims5.java b/test/langtools/tools/javac/limits/ArrayDims5.java similarity index 100% rename from langtools/test/tools/javac/limits/ArrayDims5.java rename to test/langtools/tools/javac/limits/ArrayDims5.java diff --git a/langtools/test/tools/javac/limits/ArrayDims5.out b/test/langtools/tools/javac/limits/ArrayDims5.out similarity index 100% rename from langtools/test/tools/javac/limits/ArrayDims5.out rename to test/langtools/tools/javac/limits/ArrayDims5.out diff --git a/langtools/test/tools/javac/limits/CodeSize.java b/test/langtools/tools/javac/limits/CodeSize.java similarity index 100% rename from langtools/test/tools/javac/limits/CodeSize.java rename to test/langtools/tools/javac/limits/CodeSize.java diff --git a/langtools/test/tools/javac/limits/CodeSize.out b/test/langtools/tools/javac/limits/CodeSize.out similarity index 100% rename from langtools/test/tools/javac/limits/CodeSize.out rename to test/langtools/tools/javac/limits/CodeSize.out diff --git a/langtools/test/tools/javac/limits/LongName.java b/test/langtools/tools/javac/limits/LongName.java similarity index 100% rename from langtools/test/tools/javac/limits/LongName.java rename to test/langtools/tools/javac/limits/LongName.java diff --git a/langtools/test/tools/javac/limits/LongName.out b/test/langtools/tools/javac/limits/LongName.out similarity index 100% rename from langtools/test/tools/javac/limits/LongName.out rename to test/langtools/tools/javac/limits/LongName.out diff --git a/langtools/test/tools/javac/limits/NestedClassConstructorArgs.java b/test/langtools/tools/javac/limits/NestedClassConstructorArgs.java similarity index 100% rename from langtools/test/tools/javac/limits/NestedClassConstructorArgs.java rename to test/langtools/tools/javac/limits/NestedClassConstructorArgs.java diff --git a/langtools/test/tools/javac/limits/NestedClassMethodArgs.java b/test/langtools/tools/javac/limits/NestedClassMethodArgs.java similarity index 100% rename from langtools/test/tools/javac/limits/NestedClassMethodArgs.java rename to test/langtools/tools/javac/limits/NestedClassMethodArgs.java diff --git a/langtools/test/tools/javac/limits/NumArgsTest.java b/test/langtools/tools/javac/limits/NumArgsTest.java similarity index 100% rename from langtools/test/tools/javac/limits/NumArgsTest.java rename to test/langtools/tools/javac/limits/NumArgsTest.java diff --git a/langtools/test/tools/javac/limits/PoolSize1.java b/test/langtools/tools/javac/limits/PoolSize1.java similarity index 100% rename from langtools/test/tools/javac/limits/PoolSize1.java rename to test/langtools/tools/javac/limits/PoolSize1.java diff --git a/langtools/test/tools/javac/limits/PoolSize1.out b/test/langtools/tools/javac/limits/PoolSize1.out similarity index 100% rename from langtools/test/tools/javac/limits/PoolSize1.out rename to test/langtools/tools/javac/limits/PoolSize1.out diff --git a/langtools/test/tools/javac/limits/PoolSize2.java b/test/langtools/tools/javac/limits/PoolSize2.java similarity index 100% rename from langtools/test/tools/javac/limits/PoolSize2.java rename to test/langtools/tools/javac/limits/PoolSize2.java diff --git a/langtools/test/tools/javac/limits/PoolSize2.out b/test/langtools/tools/javac/limits/PoolSize2.out similarity index 100% rename from langtools/test/tools/javac/limits/PoolSize2.out rename to test/langtools/tools/javac/limits/PoolSize2.out diff --git a/langtools/test/tools/javac/limits/StaticNestedClassConstructorArgs.java b/test/langtools/tools/javac/limits/StaticNestedClassConstructorArgs.java similarity index 100% rename from langtools/test/tools/javac/limits/StaticNestedClassConstructorArgs.java rename to test/langtools/tools/javac/limits/StaticNestedClassConstructorArgs.java diff --git a/langtools/test/tools/javac/limits/StringLength.java b/test/langtools/tools/javac/limits/StringLength.java similarity index 100% rename from langtools/test/tools/javac/limits/StringLength.java rename to test/langtools/tools/javac/limits/StringLength.java diff --git a/langtools/test/tools/javac/limits/StringLength.out b/test/langtools/tools/javac/limits/StringLength.out similarity index 100% rename from langtools/test/tools/javac/limits/StringLength.out rename to test/langtools/tools/javac/limits/StringLength.out diff --git a/langtools/test/tools/javac/limits/TopLevelClassConstructorArgs.java b/test/langtools/tools/javac/limits/TopLevelClassConstructorArgs.java similarity index 100% rename from langtools/test/tools/javac/limits/TopLevelClassConstructorArgs.java rename to test/langtools/tools/javac/limits/TopLevelClassConstructorArgs.java diff --git a/langtools/test/tools/javac/limits/TopLevelClassMethodArgs.java b/test/langtools/tools/javac/limits/TopLevelClassMethodArgs.java similarity index 100% rename from langtools/test/tools/javac/limits/TopLevelClassMethodArgs.java rename to test/langtools/tools/javac/limits/TopLevelClassMethodArgs.java diff --git a/langtools/test/tools/javac/limits/TopLevelClassStaticMethodArgs.java b/test/langtools/tools/javac/limits/TopLevelClassStaticMethodArgs.java similarity index 100% rename from langtools/test/tools/javac/limits/TopLevelClassStaticMethodArgs.java rename to test/langtools/tools/javac/limits/TopLevelClassStaticMethodArgs.java diff --git a/langtools/test/tools/javac/linenumbers/ConditionalLineNumberTest.java b/test/langtools/tools/javac/linenumbers/ConditionalLineNumberTest.java similarity index 100% rename from langtools/test/tools/javac/linenumbers/ConditionalLineNumberTest.java rename to test/langtools/tools/javac/linenumbers/ConditionalLineNumberTest.java diff --git a/langtools/test/tools/javac/linenumbers/FinallyLineNumberTest.java b/test/langtools/tools/javac/linenumbers/FinallyLineNumberTest.java similarity index 100% rename from langtools/test/tools/javac/linenumbers/FinallyLineNumberTest.java rename to test/langtools/tools/javac/linenumbers/FinallyLineNumberTest.java diff --git a/langtools/test/tools/javac/linenumbers/NestedLineNumberTest.java b/test/langtools/tools/javac/linenumbers/NestedLineNumberTest.java similarity index 100% rename from langtools/test/tools/javac/linenumbers/NestedLineNumberTest.java rename to test/langtools/tools/javac/linenumbers/NestedLineNumberTest.java diff --git a/langtools/test/tools/javac/linenumbers/NullCheckLineNumberTest.java b/test/langtools/tools/javac/linenumbers/NullCheckLineNumberTest.java similarity index 100% rename from langtools/test/tools/javac/linenumbers/NullCheckLineNumberTest.java rename to test/langtools/tools/javac/linenumbers/NullCheckLineNumberTest.java diff --git a/langtools/test/tools/javac/links/LinksTest.java b/test/langtools/tools/javac/links/LinksTest.java similarity index 100% rename from langtools/test/tools/javac/links/LinksTest.java rename to test/langtools/tools/javac/links/LinksTest.java diff --git a/langtools/test/tools/javac/lint/Deprecation.java b/test/langtools/tools/javac/lint/Deprecation.java similarity index 100% rename from langtools/test/tools/javac/lint/Deprecation.java rename to test/langtools/tools/javac/lint/Deprecation.java diff --git a/langtools/test/tools/javac/lint/Deprecation.out b/test/langtools/tools/javac/lint/Deprecation.out similarity index 100% rename from langtools/test/tools/javac/lint/Deprecation.out rename to test/langtools/tools/javac/lint/Deprecation.out diff --git a/langtools/test/tools/javac/lint/FallThrough.java b/test/langtools/tools/javac/lint/FallThrough.java similarity index 100% rename from langtools/test/tools/javac/lint/FallThrough.java rename to test/langtools/tools/javac/lint/FallThrough.java diff --git a/langtools/test/tools/javac/lint/FallThrough.out b/test/langtools/tools/javac/lint/FallThrough.out similarity index 100% rename from langtools/test/tools/javac/lint/FallThrough.out rename to test/langtools/tools/javac/lint/FallThrough.out diff --git a/langtools/test/tools/javac/lint/NoWarn.java b/test/langtools/tools/javac/lint/NoWarn.java similarity index 100% rename from langtools/test/tools/javac/lint/NoWarn.java rename to test/langtools/tools/javac/lint/NoWarn.java diff --git a/langtools/test/tools/javac/lint/NoWarn1.out b/test/langtools/tools/javac/lint/NoWarn1.out similarity index 100% rename from langtools/test/tools/javac/lint/NoWarn1.out rename to test/langtools/tools/javac/lint/NoWarn1.out diff --git a/langtools/test/tools/javac/lint/NoWarn2.out b/test/langtools/tools/javac/lint/NoWarn2.out similarity index 100% rename from langtools/test/tools/javac/lint/NoWarn2.out rename to test/langtools/tools/javac/lint/NoWarn2.out diff --git a/langtools/test/tools/javac/lint/Unchecked.java b/test/langtools/tools/javac/lint/Unchecked.java similarity index 100% rename from langtools/test/tools/javac/lint/Unchecked.java rename to test/langtools/tools/javac/lint/Unchecked.java diff --git a/langtools/test/tools/javac/lint/Unchecked.out b/test/langtools/tools/javac/lint/Unchecked.out similarity index 100% rename from langtools/test/tools/javac/lint/Unchecked.out rename to test/langtools/tools/javac/lint/Unchecked.out diff --git a/langtools/test/tools/javac/literals/BadBinaryLiterals.6.out b/test/langtools/tools/javac/literals/BadBinaryLiterals.6.out similarity index 100% rename from langtools/test/tools/javac/literals/BadBinaryLiterals.6.out rename to test/langtools/tools/javac/literals/BadBinaryLiterals.6.out diff --git a/langtools/test/tools/javac/literals/BadBinaryLiterals.7.out b/test/langtools/tools/javac/literals/BadBinaryLiterals.7.out similarity index 100% rename from langtools/test/tools/javac/literals/BadBinaryLiterals.7.out rename to test/langtools/tools/javac/literals/BadBinaryLiterals.7.out diff --git a/langtools/test/tools/javac/literals/BadBinaryLiterals.java b/test/langtools/tools/javac/literals/BadBinaryLiterals.java similarity index 100% rename from langtools/test/tools/javac/literals/BadBinaryLiterals.java rename to test/langtools/tools/javac/literals/BadBinaryLiterals.java diff --git a/langtools/test/tools/javac/literals/BadUnderscoreLiterals.6.out b/test/langtools/tools/javac/literals/BadUnderscoreLiterals.6.out similarity index 100% rename from langtools/test/tools/javac/literals/BadUnderscoreLiterals.6.out rename to test/langtools/tools/javac/literals/BadUnderscoreLiterals.6.out diff --git a/langtools/test/tools/javac/literals/BadUnderscoreLiterals.7.out b/test/langtools/tools/javac/literals/BadUnderscoreLiterals.7.out similarity index 100% rename from langtools/test/tools/javac/literals/BadUnderscoreLiterals.7.out rename to test/langtools/tools/javac/literals/BadUnderscoreLiterals.7.out diff --git a/langtools/test/tools/javac/literals/BadUnderscoreLiterals.java b/test/langtools/tools/javac/literals/BadUnderscoreLiterals.java similarity index 100% rename from langtools/test/tools/javac/literals/BadUnderscoreLiterals.java rename to test/langtools/tools/javac/literals/BadUnderscoreLiterals.java diff --git a/langtools/test/tools/javac/literals/BinaryLiterals.java b/test/langtools/tools/javac/literals/BinaryLiterals.java similarity index 100% rename from langtools/test/tools/javac/literals/BinaryLiterals.java rename to test/langtools/tools/javac/literals/BinaryLiterals.java diff --git a/langtools/test/tools/javac/literals/T6891079.java b/test/langtools/tools/javac/literals/T6891079.java similarity index 100% rename from langtools/test/tools/javac/literals/T6891079.java rename to test/langtools/tools/javac/literals/T6891079.java diff --git a/langtools/test/tools/javac/literals/T6891079.out b/test/langtools/tools/javac/literals/T6891079.out similarity index 100% rename from langtools/test/tools/javac/literals/T6891079.out rename to test/langtools/tools/javac/literals/T6891079.out diff --git a/langtools/test/tools/javac/literals/UnderscoreLiterals.java b/test/langtools/tools/javac/literals/UnderscoreLiterals.java similarity index 100% rename from langtools/test/tools/javac/literals/UnderscoreLiterals.java rename to test/langtools/tools/javac/literals/UnderscoreLiterals.java diff --git a/langtools/test/tools/javac/main/AtFileTest.java b/test/langtools/tools/javac/main/AtFileTest.java similarity index 100% rename from langtools/test/tools/javac/main/AtFileTest.java rename to test/langtools/tools/javac/main/AtFileTest.java diff --git a/langtools/test/tools/javac/main/EnvVariableTest.java b/test/langtools/tools/javac/main/EnvVariableTest.java similarity index 100% rename from langtools/test/tools/javac/main/EnvVariableTest.java rename to test/langtools/tools/javac/main/EnvVariableTest.java diff --git a/langtools/test/tools/javac/main/Option_J_At_Test.java b/test/langtools/tools/javac/main/Option_J_At_Test.java similarity index 100% rename from langtools/test/tools/javac/main/Option_J_At_Test.java rename to test/langtools/tools/javac/main/Option_J_At_Test.java diff --git a/langtools/test/tools/javac/main/StreamsTest.java b/test/langtools/tools/javac/main/StreamsTest.java similarity index 100% rename from langtools/test/tools/javac/main/StreamsTest.java rename to test/langtools/tools/javac/main/StreamsTest.java diff --git a/langtools/test/tools/javac/main/T8058445.java b/test/langtools/tools/javac/main/T8058445.java similarity index 100% rename from langtools/test/tools/javac/main/T8058445.java rename to test/langtools/tools/javac/main/T8058445.java diff --git a/langtools/test/tools/javac/main/ToolProviderTest.java b/test/langtools/tools/javac/main/ToolProviderTest.java similarity index 100% rename from langtools/test/tools/javac/main/ToolProviderTest.java rename to test/langtools/tools/javac/main/ToolProviderTest.java diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/A.java b/test/langtools/tools/javac/mandatoryWarnings/deprecated/A.java similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/A.java rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/A.java diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/B.java b/test/langtools/tools/javac/mandatoryWarnings/deprecated/B.java similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/B.java rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/B.java diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/P.java b/test/langtools/tools/javac/mandatoryWarnings/deprecated/P.java similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/P.java rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/P.java diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Q.java b/test/langtools/tools/javac/mandatoryWarnings/deprecated/Q.java similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/Q.java rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/Q.java diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test.java b/test/langtools/tools/javac/mandatoryWarnings/deprecated/Test.java similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/Test.java rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/Test.java diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test1.out b/test/langtools/tools/javac/mandatoryWarnings/deprecated/Test1.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/Test1.out rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/Test1.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test2.out b/test/langtools/tools/javac/mandatoryWarnings/deprecated/Test2.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/Test2.out rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/Test2.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test3.out b/test/langtools/tools/javac/mandatoryWarnings/deprecated/Test3.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/Test3.out rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/Test3.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test3b.out b/test/langtools/tools/javac/mandatoryWarnings/deprecated/Test3b.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/Test3b.out rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/Test3b.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test4.out b/test/langtools/tools/javac/mandatoryWarnings/deprecated/Test4.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/Test4.out rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/Test4.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test4b.out b/test/langtools/tools/javac/mandatoryWarnings/deprecated/Test4b.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/Test4b.out rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/Test4b.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test4c.out b/test/langtools/tools/javac/mandatoryWarnings/deprecated/Test4c.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/Test4c.out rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/Test4c.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test4d.out b/test/langtools/tools/javac/mandatoryWarnings/deprecated/Test4d.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/Test4d.out rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/Test4d.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test5.out b/test/langtools/tools/javac/mandatoryWarnings/deprecated/Test5.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/Test5.out rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/Test5.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/deprecated/Test5b.out b/test/langtools/tools/javac/mandatoryWarnings/deprecated/Test5b.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/deprecated/Test5b.out rename to test/langtools/tools/javac/mandatoryWarnings/deprecated/Test5b.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/unchecked/A.java b/test/langtools/tools/javac/mandatoryWarnings/unchecked/A.java similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/unchecked/A.java rename to test/langtools/tools/javac/mandatoryWarnings/unchecked/A.java diff --git a/langtools/test/tools/javac/mandatoryWarnings/unchecked/B.java b/test/langtools/tools/javac/mandatoryWarnings/unchecked/B.java similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/unchecked/B.java rename to test/langtools/tools/javac/mandatoryWarnings/unchecked/B.java diff --git a/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test.java b/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test.java similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/unchecked/Test.java rename to test/langtools/tools/javac/mandatoryWarnings/unchecked/Test.java diff --git a/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test1.out b/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test1.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/unchecked/Test1.out rename to test/langtools/tools/javac/mandatoryWarnings/unchecked/Test1.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test2.out b/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test2.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/unchecked/Test2.out rename to test/langtools/tools/javac/mandatoryWarnings/unchecked/Test2.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test3.out b/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test3.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/unchecked/Test3.out rename to test/langtools/tools/javac/mandatoryWarnings/unchecked/Test3.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test3b.out b/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test3b.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/unchecked/Test3b.out rename to test/langtools/tools/javac/mandatoryWarnings/unchecked/Test3b.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test4.out b/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test4.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/unchecked/Test4.out rename to test/langtools/tools/javac/mandatoryWarnings/unchecked/Test4.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test4b.out b/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test4b.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/unchecked/Test4b.out rename to test/langtools/tools/javac/mandatoryWarnings/unchecked/Test4b.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test4c.out b/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test4c.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/unchecked/Test4c.out rename to test/langtools/tools/javac/mandatoryWarnings/unchecked/Test4c.out diff --git a/langtools/test/tools/javac/mandatoryWarnings/unchecked/Test4d.out b/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test4d.out similarity index 100% rename from langtools/test/tools/javac/mandatoryWarnings/unchecked/Test4d.out rename to test/langtools/tools/javac/mandatoryWarnings/unchecked/Test4d.out diff --git a/langtools/test/tools/javac/meth/BadPolySig/BadPolySig.java b/test/langtools/tools/javac/meth/BadPolySig/BadPolySig.java similarity index 100% rename from langtools/test/tools/javac/meth/BadPolySig/BadPolySig.java rename to test/langtools/tools/javac/meth/BadPolySig/BadPolySig.java diff --git a/langtools/test/tools/javac/meth/BadPolySig/java.base/java/lang/invoke/MethodHandle.java b/test/langtools/tools/javac/meth/BadPolySig/java.base/java/lang/invoke/MethodHandle.java similarity index 100% rename from langtools/test/tools/javac/meth/BadPolySig/java.base/java/lang/invoke/MethodHandle.java rename to test/langtools/tools/javac/meth/BadPolySig/java.base/java/lang/invoke/MethodHandle.java diff --git a/langtools/test/tools/javac/meth/InvokeMH.java b/test/langtools/tools/javac/meth/InvokeMH.java similarity index 100% rename from langtools/test/tools/javac/meth/InvokeMH.java rename to test/langtools/tools/javac/meth/InvokeMH.java diff --git a/langtools/test/tools/javac/meth/TestCP.java b/test/langtools/tools/javac/meth/TestCP.java similarity index 100% rename from langtools/test/tools/javac/meth/TestCP.java rename to test/langtools/tools/javac/meth/TestCP.java diff --git a/langtools/test/tools/javac/meth/VarargsWarn.java b/test/langtools/tools/javac/meth/VarargsWarn.java similarity index 100% rename from langtools/test/tools/javac/meth/VarargsWarn.java rename to test/langtools/tools/javac/meth/VarargsWarn.java diff --git a/langtools/test/tools/javac/meth/VarargsWarn.out b/test/langtools/tools/javac/meth/VarargsWarn.out similarity index 100% rename from langtools/test/tools/javac/meth/VarargsWarn.out rename to test/langtools/tools/javac/meth/VarargsWarn.out diff --git a/langtools/test/tools/javac/meth/XlintWarn.java b/test/langtools/tools/javac/meth/XlintWarn.java similarity index 100% rename from langtools/test/tools/javac/meth/XlintWarn.java rename to test/langtools/tools/javac/meth/XlintWarn.java diff --git a/langtools/test/tools/javac/miranda/4686148/AbstractTest.java b/test/langtools/tools/javac/miranda/4686148/AbstractTest.java similarity index 100% rename from langtools/test/tools/javac/miranda/4686148/AbstractTest.java rename to test/langtools/tools/javac/miranda/4686148/AbstractTest.java diff --git a/langtools/test/tools/javac/miranda/4686148/ConcreteTest.java b/test/langtools/tools/javac/miranda/4686148/ConcreteTest.java similarity index 100% rename from langtools/test/tools/javac/miranda/4686148/ConcreteTest.java rename to test/langtools/tools/javac/miranda/4686148/ConcreteTest.java diff --git a/langtools/test/tools/javac/miranda/4686148/Test.java b/test/langtools/tools/javac/miranda/4686148/Test.java similarity index 100% rename from langtools/test/tools/javac/miranda/4686148/Test.java rename to test/langtools/tools/javac/miranda/4686148/Test.java diff --git a/langtools/test/tools/javac/miranda/4686148/Test.out b/test/langtools/tools/javac/miranda/4686148/Test.out similarity index 100% rename from langtools/test/tools/javac/miranda/4686148/Test.out rename to test/langtools/tools/javac/miranda/4686148/Test.out diff --git a/langtools/test/tools/javac/miranda/4686811/Tryit.java b/test/langtools/tools/javac/miranda/4686811/Tryit.java similarity index 100% rename from langtools/test/tools/javac/miranda/4686811/Tryit.java rename to test/langtools/tools/javac/miranda/4686811/Tryit.java diff --git a/langtools/test/tools/javac/miranda/4686811/p1/A.java b/test/langtools/tools/javac/miranda/4686811/p1/A.java similarity index 100% rename from langtools/test/tools/javac/miranda/4686811/p1/A.java rename to test/langtools/tools/javac/miranda/4686811/p1/A.java diff --git a/langtools/test/tools/javac/miranda/4686811/p1/C.java b/test/langtools/tools/javac/miranda/4686811/p1/C.java similarity index 100% rename from langtools/test/tools/javac/miranda/4686811/p1/C.java rename to test/langtools/tools/javac/miranda/4686811/p1/C.java diff --git a/langtools/test/tools/javac/miranda/4686811/p2/B.java b/test/langtools/tools/javac/miranda/4686811/p2/B.java similarity index 100% rename from langtools/test/tools/javac/miranda/4686811/p2/B.java rename to test/langtools/tools/javac/miranda/4686811/p2/B.java diff --git a/langtools/test/tools/javac/miranda/4711056/T1.java b/test/langtools/tools/javac/miranda/4711056/T1.java similarity index 100% rename from langtools/test/tools/javac/miranda/4711056/T1.java rename to test/langtools/tools/javac/miranda/4711056/T1.java diff --git a/langtools/test/tools/javac/miranda/4711056/T1.out b/test/langtools/tools/javac/miranda/4711056/T1.out similarity index 100% rename from langtools/test/tools/javac/miranda/4711056/T1.out rename to test/langtools/tools/javac/miranda/4711056/T1.out diff --git a/langtools/test/tools/javac/miranda/4711056/T2.java b/test/langtools/tools/javac/miranda/4711056/T2.java similarity index 100% rename from langtools/test/tools/javac/miranda/4711056/T2.java rename to test/langtools/tools/javac/miranda/4711056/T2.java diff --git a/langtools/test/tools/javac/miranda/4711056/T3.java b/test/langtools/tools/javac/miranda/4711056/T3.java similarity index 100% rename from langtools/test/tools/javac/miranda/4711056/T3.java rename to test/langtools/tools/javac/miranda/4711056/T3.java diff --git a/langtools/test/tools/javac/miranda/4711056/T4.java b/test/langtools/tools/javac/miranda/4711056/T4.java similarity index 100% rename from langtools/test/tools/javac/miranda/4711056/T4.java rename to test/langtools/tools/javac/miranda/4711056/T4.java diff --git a/langtools/test/tools/javac/miranda/T4279316a.java b/test/langtools/tools/javac/miranda/T4279316a.java similarity index 100% rename from langtools/test/tools/javac/miranda/T4279316a.java rename to test/langtools/tools/javac/miranda/T4279316a.java diff --git a/langtools/test/tools/javac/miranda/T4279316b.java b/test/langtools/tools/javac/miranda/T4279316b.java similarity index 100% rename from langtools/test/tools/javac/miranda/T4279316b.java rename to test/langtools/tools/javac/miranda/T4279316b.java diff --git a/langtools/test/tools/javac/miranda/T4279316c.java b/test/langtools/tools/javac/miranda/T4279316c.java similarity index 100% rename from langtools/test/tools/javac/miranda/T4279316c.java rename to test/langtools/tools/javac/miranda/T4279316c.java diff --git a/langtools/test/tools/javac/miranda/T4279316d.java b/test/langtools/tools/javac/miranda/T4279316d.java similarity index 100% rename from langtools/test/tools/javac/miranda/T4279316d.java rename to test/langtools/tools/javac/miranda/T4279316d.java diff --git a/langtools/test/tools/javac/miranda/T4528315.java b/test/langtools/tools/javac/miranda/T4528315.java similarity index 100% rename from langtools/test/tools/javac/miranda/T4528315.java rename to test/langtools/tools/javac/miranda/T4528315.java diff --git a/langtools/test/tools/javac/miranda/T4666866.java b/test/langtools/tools/javac/miranda/T4666866.java similarity index 100% rename from langtools/test/tools/javac/miranda/T4666866.java rename to test/langtools/tools/javac/miranda/T4666866.java diff --git a/langtools/test/tools/javac/miranda/T4666866.out b/test/langtools/tools/javac/miranda/T4666866.out similarity index 100% rename from langtools/test/tools/javac/miranda/T4666866.out rename to test/langtools/tools/javac/miranda/T4666866.out diff --git a/langtools/test/tools/javac/miranda/T4711325.java b/test/langtools/tools/javac/miranda/T4711325.java similarity index 100% rename from langtools/test/tools/javac/miranda/T4711325.java rename to test/langtools/tools/javac/miranda/T4711325.java diff --git a/langtools/test/tools/javac/missingClass/A.java b/test/langtools/tools/javac/missingClass/A.java similarity index 100% rename from langtools/test/tools/javac/missingClass/A.java rename to test/langtools/tools/javac/missingClass/A.java diff --git a/langtools/test/tools/javac/missingClass/B.java b/test/langtools/tools/javac/missingClass/B.java similarity index 100% rename from langtools/test/tools/javac/missingClass/B.java rename to test/langtools/tools/javac/missingClass/B.java diff --git a/langtools/test/tools/javac/missingSuperRecovery/MissingInterfaceTest.java b/test/langtools/tools/javac/missingSuperRecovery/MissingInterfaceTest.java similarity index 100% rename from langtools/test/tools/javac/missingSuperRecovery/MissingInterfaceTest.java rename to test/langtools/tools/javac/missingSuperRecovery/MissingInterfaceTest.java diff --git a/langtools/test/tools/javac/missingSuperRecovery/MissingInterfaceTest.out b/test/langtools/tools/javac/missingSuperRecovery/MissingInterfaceTest.out similarity index 100% rename from langtools/test/tools/javac/missingSuperRecovery/MissingInterfaceTest.out rename to test/langtools/tools/javac/missingSuperRecovery/MissingInterfaceTest.out diff --git a/langtools/test/tools/javac/missingSuperRecovery/MissingInterfaceTestDep.java b/test/langtools/tools/javac/missingSuperRecovery/MissingInterfaceTestDep.java similarity index 100% rename from langtools/test/tools/javac/missingSuperRecovery/MissingInterfaceTestDep.java rename to test/langtools/tools/javac/missingSuperRecovery/MissingInterfaceTestDep.java diff --git a/langtools/test/tools/javac/missingSuperRecovery/MissingSuperRecovery.java b/test/langtools/tools/javac/missingSuperRecovery/MissingSuperRecovery.java similarity index 100% rename from langtools/test/tools/javac/missingSuperRecovery/MissingSuperRecovery.java rename to test/langtools/tools/javac/missingSuperRecovery/MissingSuperRecovery.java diff --git a/langtools/test/tools/javac/missingSuperRecovery/MissingSuperRecovery.out b/test/langtools/tools/javac/missingSuperRecovery/MissingSuperRecovery.out similarity index 100% rename from langtools/test/tools/javac/missingSuperRecovery/MissingSuperRecovery.out rename to test/langtools/tools/javac/missingSuperRecovery/MissingSuperRecovery.out diff --git a/langtools/test/tools/javac/missingSuperRecovery/impl.jasm b/test/langtools/tools/javac/missingSuperRecovery/impl.jasm similarity index 100% rename from langtools/test/tools/javac/missingSuperRecovery/impl.jasm rename to test/langtools/tools/javac/missingSuperRecovery/impl.jasm diff --git a/langtools/test/tools/javac/mixedTarget/CompatibleAbstracts3.java b/test/langtools/tools/javac/mixedTarget/CompatibleAbstracts3.java similarity index 100% rename from langtools/test/tools/javac/mixedTarget/CompatibleAbstracts3.java rename to test/langtools/tools/javac/mixedTarget/CompatibleAbstracts3.java diff --git a/langtools/test/tools/javac/mixedTarget/CompatibleAbstracts4.java b/test/langtools/tools/javac/mixedTarget/CompatibleAbstracts4.java similarity index 100% rename from langtools/test/tools/javac/mixedTarget/CompatibleAbstracts4.java rename to test/langtools/tools/javac/mixedTarget/CompatibleAbstracts4.java diff --git a/langtools/test/tools/javac/mixedTarget/CompatibleAbstracts5.java b/test/langtools/tools/javac/mixedTarget/CompatibleAbstracts5.java similarity index 100% rename from langtools/test/tools/javac/mixedTarget/CompatibleAbstracts5.java rename to test/langtools/tools/javac/mixedTarget/CompatibleAbstracts5.java diff --git a/langtools/test/tools/javac/mixedTarget/ExtendCovariant1.java b/test/langtools/tools/javac/mixedTarget/ExtendCovariant1.java similarity index 100% rename from langtools/test/tools/javac/mixedTarget/ExtendCovariant1.java rename to test/langtools/tools/javac/mixedTarget/ExtendCovariant1.java diff --git a/langtools/test/tools/javac/mixedTarget/ExtendCovariant2.java b/test/langtools/tools/javac/mixedTarget/ExtendCovariant2.java similarity index 100% rename from langtools/test/tools/javac/mixedTarget/ExtendCovariant2.java rename to test/langtools/tools/javac/mixedTarget/ExtendCovariant2.java diff --git a/langtools/test/tools/javac/modules/AbstractOrInnerClassServiceImplTest.java b/test/langtools/tools/javac/modules/AbstractOrInnerClassServiceImplTest.java similarity index 100% rename from langtools/test/tools/javac/modules/AbstractOrInnerClassServiceImplTest.java rename to test/langtools/tools/javac/modules/AbstractOrInnerClassServiceImplTest.java diff --git a/langtools/test/tools/javac/modules/AddExportsTest.java b/test/langtools/tools/javac/modules/AddExportsTest.java similarity index 100% rename from langtools/test/tools/javac/modules/AddExportsTest.java rename to test/langtools/tools/javac/modules/AddExportsTest.java diff --git a/langtools/test/tools/javac/modules/AddLimitMods.java b/test/langtools/tools/javac/modules/AddLimitMods.java similarity index 100% rename from langtools/test/tools/javac/modules/AddLimitMods.java rename to test/langtools/tools/javac/modules/AddLimitMods.java diff --git a/langtools/test/tools/javac/modules/AddModulesTest.java b/test/langtools/tools/javac/modules/AddModulesTest.java similarity index 100% rename from langtools/test/tools/javac/modules/AddModulesTest.java rename to test/langtools/tools/javac/modules/AddModulesTest.java diff --git a/langtools/test/tools/javac/modules/AddReadsTest.java b/test/langtools/tools/javac/modules/AddReadsTest.java similarity index 100% rename from langtools/test/tools/javac/modules/AddReadsTest.java rename to test/langtools/tools/javac/modules/AddReadsTest.java diff --git a/langtools/test/tools/javac/modules/AllDefaultTest.java b/test/langtools/tools/javac/modules/AllDefaultTest.java similarity index 100% rename from langtools/test/tools/javac/modules/AllDefaultTest.java rename to test/langtools/tools/javac/modules/AllDefaultTest.java diff --git a/langtools/test/tools/javac/modules/AnachronisticModuleInfo/AnachronisticModuleInfoTest.java b/test/langtools/tools/javac/modules/AnachronisticModuleInfo/AnachronisticModuleInfoTest.java similarity index 100% rename from langtools/test/tools/javac/modules/AnachronisticModuleInfo/AnachronisticModuleInfoTest.java rename to test/langtools/tools/javac/modules/AnachronisticModuleInfo/AnachronisticModuleInfoTest.java diff --git a/langtools/test/tools/javac/modules/AnachronisticModuleInfo/module-info.jcod b/test/langtools/tools/javac/modules/AnachronisticModuleInfo/module-info.jcod similarity index 100% rename from langtools/test/tools/javac/modules/AnachronisticModuleInfo/module-info.jcod rename to test/langtools/tools/javac/modules/AnachronisticModuleInfo/module-info.jcod diff --git a/langtools/test/tools/javac/modules/AnnotationProcessing.java b/test/langtools/tools/javac/modules/AnnotationProcessing.java similarity index 100% rename from langtools/test/tools/javac/modules/AnnotationProcessing.java rename to test/langtools/tools/javac/modules/AnnotationProcessing.java diff --git a/langtools/test/tools/javac/modules/AnnotationProcessingWithModuleInfoInWrongPlace.java b/test/langtools/tools/javac/modules/AnnotationProcessingWithModuleInfoInWrongPlace.java similarity index 100% rename from langtools/test/tools/javac/modules/AnnotationProcessingWithModuleInfoInWrongPlace.java rename to test/langtools/tools/javac/modules/AnnotationProcessingWithModuleInfoInWrongPlace.java diff --git a/langtools/test/tools/javac/modules/AnnotationProcessorsInModulesTest.java b/test/langtools/tools/javac/modules/AnnotationProcessorsInModulesTest.java similarity index 100% rename from langtools/test/tools/javac/modules/AnnotationProcessorsInModulesTest.java rename to test/langtools/tools/javac/modules/AnnotationProcessorsInModulesTest.java diff --git a/langtools/test/tools/javac/modules/AnnotationsOnModules.java b/test/langtools/tools/javac/modules/AnnotationsOnModules.java similarity index 100% rename from langtools/test/tools/javac/modules/AnnotationsOnModules.java rename to test/langtools/tools/javac/modules/AnnotationsOnModules.java diff --git a/langtools/test/tools/javac/modules/AutomaticModules.java b/test/langtools/tools/javac/modules/AutomaticModules.java similarity index 100% rename from langtools/test/tools/javac/modules/AutomaticModules.java rename to test/langtools/tools/javac/modules/AutomaticModules.java diff --git a/langtools/test/tools/javac/modules/BrokenModulesTest.java b/test/langtools/tools/javac/modules/BrokenModulesTest.java similarity index 100% rename from langtools/test/tools/javac/modules/BrokenModulesTest.java rename to test/langtools/tools/javac/modules/BrokenModulesTest.java diff --git a/langtools/test/tools/javac/modules/CompileModulePatchTest.java b/test/langtools/tools/javac/modules/CompileModulePatchTest.java similarity index 100% rename from langtools/test/tools/javac/modules/CompileModulePatchTest.java rename to test/langtools/tools/javac/modules/CompileModulePatchTest.java diff --git a/langtools/test/tools/javac/modules/ContainsTest.java b/test/langtools/tools/javac/modules/ContainsTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ContainsTest.java rename to test/langtools/tools/javac/modules/ContainsTest.java diff --git a/langtools/test/tools/javac/modules/ConvenientAccessErrorsTest.java b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ConvenientAccessErrorsTest.java rename to test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java diff --git a/langtools/test/tools/javac/modules/DirectiveVisitorTest.java b/test/langtools/tools/javac/modules/DirectiveVisitorTest.java similarity index 100% rename from langtools/test/tools/javac/modules/DirectiveVisitorTest.java rename to test/langtools/tools/javac/modules/DirectiveVisitorTest.java diff --git a/langtools/test/tools/javac/modules/DoclintOtherModules.java b/test/langtools/tools/javac/modules/DoclintOtherModules.java similarity index 100% rename from langtools/test/tools/javac/modules/DoclintOtherModules.java rename to test/langtools/tools/javac/modules/DoclintOtherModules.java diff --git a/langtools/test/tools/javac/modules/DuplicateClassTest.java b/test/langtools/tools/javac/modules/DuplicateClassTest.java similarity index 100% rename from langtools/test/tools/javac/modules/DuplicateClassTest.java rename to test/langtools/tools/javac/modules/DuplicateClassTest.java diff --git a/langtools/test/tools/javac/modules/EdgeCases.java b/test/langtools/tools/javac/modules/EdgeCases.java similarity index 100% rename from langtools/test/tools/javac/modules/EdgeCases.java rename to test/langtools/tools/javac/modules/EdgeCases.java diff --git a/langtools/test/tools/javac/modules/EnvVarTest.java b/test/langtools/tools/javac/modules/EnvVarTest.java similarity index 100% rename from langtools/test/tools/javac/modules/EnvVarTest.java rename to test/langtools/tools/javac/modules/EnvVarTest.java diff --git a/langtools/test/tools/javac/modules/ExportsUnexported.java b/test/langtools/tools/javac/modules/ExportsUnexported.java similarity index 100% rename from langtools/test/tools/javac/modules/ExportsUnexported.java rename to test/langtools/tools/javac/modules/ExportsUnexported.java diff --git a/langtools/test/tools/javac/modules/FileManagerGetServiceLoaderTest.java b/test/langtools/tools/javac/modules/FileManagerGetServiceLoaderTest.java similarity index 100% rename from langtools/test/tools/javac/modules/FileManagerGetServiceLoaderTest.java rename to test/langtools/tools/javac/modules/FileManagerGetServiceLoaderTest.java diff --git a/langtools/test/tools/javac/modules/GetLocationForModuleTest.java b/test/langtools/tools/javac/modules/GetLocationForModuleTest.java similarity index 100% rename from langtools/test/tools/javac/modules/GetLocationForModuleTest.java rename to test/langtools/tools/javac/modules/GetLocationForModuleTest.java diff --git a/langtools/test/tools/javac/modules/GraphsTest.java b/test/langtools/tools/javac/modules/GraphsTest.java similarity index 100% rename from langtools/test/tools/javac/modules/GraphsTest.java rename to test/langtools/tools/javac/modules/GraphsTest.java diff --git a/langtools/test/tools/javac/modules/HelloWorldTest.java b/test/langtools/tools/javac/modules/HelloWorldTest.java similarity index 100% rename from langtools/test/tools/javac/modules/HelloWorldTest.java rename to test/langtools/tools/javac/modules/HelloWorldTest.java diff --git a/langtools/test/tools/javac/modules/IncubatingTest.java b/test/langtools/tools/javac/modules/IncubatingTest.java similarity index 100% rename from langtools/test/tools/javac/modules/IncubatingTest.java rename to test/langtools/tools/javac/modules/IncubatingTest.java diff --git a/langtools/test/tools/javac/modules/InheritRuntimeEnvironmentTest.java b/test/langtools/tools/javac/modules/InheritRuntimeEnvironmentTest.java similarity index 100% rename from langtools/test/tools/javac/modules/InheritRuntimeEnvironmentTest.java rename to test/langtools/tools/javac/modules/InheritRuntimeEnvironmentTest.java diff --git a/langtools/test/tools/javac/modules/InvalidModuleDirective/module-info.java b/test/langtools/tools/javac/modules/InvalidModuleDirective/module-info.java similarity index 100% rename from langtools/test/tools/javac/modules/InvalidModuleDirective/module-info.java rename to test/langtools/tools/javac/modules/InvalidModuleDirective/module-info.java diff --git a/langtools/test/tools/javac/modules/InvalidModuleDirective/moduleinfo.out b/test/langtools/tools/javac/modules/InvalidModuleDirective/moduleinfo.out similarity index 100% rename from langtools/test/tools/javac/modules/InvalidModuleDirective/moduleinfo.out rename to test/langtools/tools/javac/modules/InvalidModuleDirective/moduleinfo.out diff --git a/langtools/test/tools/javac/modules/LimitModulesTest.java b/test/langtools/tools/javac/modules/LimitModulesTest.java similarity index 100% rename from langtools/test/tools/javac/modules/LimitModulesTest.java rename to test/langtools/tools/javac/modules/LimitModulesTest.java diff --git a/langtools/test/tools/javac/modules/MOptionTest.java b/test/langtools/tools/javac/modules/MOptionTest.java similarity index 100% rename from langtools/test/tools/javac/modules/MOptionTest.java rename to test/langtools/tools/javac/modules/MOptionTest.java diff --git a/langtools/test/tools/javac/modules/MissingJarInModulePathTest.java b/test/langtools/tools/javac/modules/MissingJarInModulePathTest.java similarity index 100% rename from langtools/test/tools/javac/modules/MissingJarInModulePathTest.java rename to test/langtools/tools/javac/modules/MissingJarInModulePathTest.java diff --git a/langtools/test/tools/javac/modules/MissingJarInModulePathTest.out b/test/langtools/tools/javac/modules/MissingJarInModulePathTest.out similarity index 100% rename from langtools/test/tools/javac/modules/MissingJarInModulePathTest.out rename to test/langtools/tools/javac/modules/MissingJarInModulePathTest.out diff --git a/langtools/test/tools/javac/modules/MissingModuleTest.java b/test/langtools/tools/javac/modules/MissingModuleTest.java similarity index 100% rename from langtools/test/tools/javac/modules/MissingModuleTest.java rename to test/langtools/tools/javac/modules/MissingModuleTest.java diff --git a/langtools/test/tools/javac/modules/ModuleFinderTest.java b/test/langtools/tools/javac/modules/ModuleFinderTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ModuleFinderTest.java rename to test/langtools/tools/javac/modules/ModuleFinderTest.java diff --git a/langtools/test/tools/javac/modules/ModuleInfoPatchPath.java b/test/langtools/tools/javac/modules/ModuleInfoPatchPath.java similarity index 100% rename from langtools/test/tools/javac/modules/ModuleInfoPatchPath.java rename to test/langtools/tools/javac/modules/ModuleInfoPatchPath.java diff --git a/langtools/test/tools/javac/modules/ModuleInfoTest.java b/test/langtools/tools/javac/modules/ModuleInfoTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ModuleInfoTest.java rename to test/langtools/tools/javac/modules/ModuleInfoTest.java diff --git a/langtools/test/tools/javac/modules/ModuleInfoTreeAccess.java b/test/langtools/tools/javac/modules/ModuleInfoTreeAccess.java similarity index 100% rename from langtools/test/tools/javac/modules/ModuleInfoTreeAccess.java rename to test/langtools/tools/javac/modules/ModuleInfoTreeAccess.java diff --git a/langtools/test/tools/javac/modules/ModulePathTest.java b/test/langtools/tools/javac/modules/ModulePathTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ModulePathTest.java rename to test/langtools/tools/javac/modules/ModulePathTest.java diff --git a/langtools/test/tools/javac/modules/ModuleSourcePathTest.java b/test/langtools/tools/javac/modules/ModuleSourcePathTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ModuleSourcePathTest.java rename to test/langtools/tools/javac/modules/ModuleSourcePathTest.java diff --git a/langtools/test/tools/javac/modules/ModuleTestBase.java b/test/langtools/tools/javac/modules/ModuleTestBase.java similarity index 100% rename from langtools/test/tools/javac/modules/ModuleTestBase.java rename to test/langtools/tools/javac/modules/ModuleTestBase.java diff --git a/langtools/test/tools/javac/modules/ModuleVersion.java b/test/langtools/tools/javac/modules/ModuleVersion.java similarity index 100% rename from langtools/test/tools/javac/modules/ModuleVersion.java rename to test/langtools/tools/javac/modules/ModuleVersion.java diff --git a/langtools/test/tools/javac/modules/ModulesAndClassPathTest.java b/test/langtools/tools/javac/modules/ModulesAndClassPathTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ModulesAndClassPathTest.java rename to test/langtools/tools/javac/modules/ModulesAndClassPathTest.java diff --git a/langtools/test/tools/javac/modules/ModulesAndModuleSourcePathTest.java b/test/langtools/tools/javac/modules/ModulesAndModuleSourcePathTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ModulesAndModuleSourcePathTest.java rename to test/langtools/tools/javac/modules/ModulesAndModuleSourcePathTest.java diff --git a/langtools/test/tools/javac/modules/MultiModuleModeTest.java b/test/langtools/tools/javac/modules/MultiModuleModeTest.java similarity index 100% rename from langtools/test/tools/javac/modules/MultiModuleModeTest.java rename to test/langtools/tools/javac/modules/MultiModuleModeTest.java diff --git a/langtools/test/tools/javac/modules/NPECompilingModuleInfoTest.java b/test/langtools/tools/javac/modules/NPECompilingModuleInfoTest.java similarity index 100% rename from langtools/test/tools/javac/modules/NPECompilingModuleInfoTest.java rename to test/langtools/tools/javac/modules/NPECompilingModuleInfoTest.java diff --git a/langtools/test/tools/javac/modules/NPEEmptyFileTest.java b/test/langtools/tools/javac/modules/NPEEmptyFileTest.java similarity index 100% rename from langtools/test/tools/javac/modules/NPEEmptyFileTest.java rename to test/langtools/tools/javac/modules/NPEEmptyFileTest.java diff --git a/langtools/test/tools/javac/modules/ObscureMessageForBadProvidesTest.java b/test/langtools/tools/javac/modules/ObscureMessageForBadProvidesTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ObscureMessageForBadProvidesTest.java rename to test/langtools/tools/javac/modules/ObscureMessageForBadProvidesTest.java diff --git a/langtools/test/tools/javac/modules/OpenModulesTest.java b/test/langtools/tools/javac/modules/OpenModulesTest.java similarity index 100% rename from langtools/test/tools/javac/modules/OpenModulesTest.java rename to test/langtools/tools/javac/modules/OpenModulesTest.java diff --git a/langtools/test/tools/javac/modules/OutputDirTest.java b/test/langtools/tools/javac/modules/OutputDirTest.java similarity index 100% rename from langtools/test/tools/javac/modules/OutputDirTest.java rename to test/langtools/tools/javac/modules/OutputDirTest.java diff --git a/langtools/test/tools/javac/modules/PackageConflictTest.java b/test/langtools/tools/javac/modules/PackageConflictTest.java similarity index 100% rename from langtools/test/tools/javac/modules/PackageConflictTest.java rename to test/langtools/tools/javac/modules/PackageConflictTest.java diff --git a/langtools/test/tools/javac/modules/PackageMultipleModules.java b/test/langtools/tools/javac/modules/PackageMultipleModules.java similarity index 100% rename from langtools/test/tools/javac/modules/PackageMultipleModules.java rename to test/langtools/tools/javac/modules/PackageMultipleModules.java diff --git a/langtools/test/tools/javac/modules/PatchModulesTest.java b/test/langtools/tools/javac/modules/PatchModulesTest.java similarity index 100% rename from langtools/test/tools/javac/modules/PatchModulesTest.java rename to test/langtools/tools/javac/modules/PatchModulesTest.java diff --git a/langtools/test/tools/javac/modules/PluginsInModulesTest.java b/test/langtools/tools/javac/modules/PluginsInModulesTest.java similarity index 100% rename from langtools/test/tools/javac/modules/PluginsInModulesTest.java rename to test/langtools/tools/javac/modules/PluginsInModulesTest.java diff --git a/langtools/test/tools/javac/modules/PoorChoiceForModuleNameTest.java b/test/langtools/tools/javac/modules/PoorChoiceForModuleNameTest.java similarity index 100% rename from langtools/test/tools/javac/modules/PoorChoiceForModuleNameTest.java rename to test/langtools/tools/javac/modules/PoorChoiceForModuleNameTest.java diff --git a/langtools/test/tools/javac/modules/ProvidesTest.java b/test/langtools/tools/javac/modules/ProvidesTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ProvidesTest.java rename to test/langtools/tools/javac/modules/ProvidesTest.java diff --git a/langtools/test/tools/javac/modules/QueryBeforeEnter.java b/test/langtools/tools/javac/modules/QueryBeforeEnter.java similarity index 100% rename from langtools/test/tools/javac/modules/QueryBeforeEnter.java rename to test/langtools/tools/javac/modules/QueryBeforeEnter.java diff --git a/langtools/test/tools/javac/modules/RepeatedUsesAndProvidesTest.java b/test/langtools/tools/javac/modules/RepeatedUsesAndProvidesTest.java similarity index 100% rename from langtools/test/tools/javac/modules/RepeatedUsesAndProvidesTest.java rename to test/langtools/tools/javac/modules/RepeatedUsesAndProvidesTest.java diff --git a/langtools/test/tools/javac/modules/ReportNonExistentPackageTest.java b/test/langtools/tools/javac/modules/ReportNonExistentPackageTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ReportNonExistentPackageTest.java rename to test/langtools/tools/javac/modules/ReportNonExistentPackageTest.java diff --git a/langtools/test/tools/javac/modules/RequiresStaticTest.java b/test/langtools/tools/javac/modules/RequiresStaticTest.java similarity index 100% rename from langtools/test/tools/javac/modules/RequiresStaticTest.java rename to test/langtools/tools/javac/modules/RequiresStaticTest.java diff --git a/langtools/test/tools/javac/modules/RequiresTransitiveTest.java b/test/langtools/tools/javac/modules/RequiresTransitiveTest.java similarity index 100% rename from langtools/test/tools/javac/modules/RequiresTransitiveTest.java rename to test/langtools/tools/javac/modules/RequiresTransitiveTest.java diff --git a/langtools/test/tools/javac/modules/ResolveTest.java b/test/langtools/tools/javac/modules/ResolveTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ResolveTest.java rename to test/langtools/tools/javac/modules/ResolveTest.java diff --git a/langtools/test/tools/javac/modules/ServiceInStaticClassErrorTest.java b/test/langtools/tools/javac/modules/ServiceInStaticClassErrorTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ServiceInStaticClassErrorTest.java rename to test/langtools/tools/javac/modules/ServiceInStaticClassErrorTest.java diff --git a/langtools/test/tools/javac/modules/ServiceProvidedButNotExportedOrUsedTest.java b/test/langtools/tools/javac/modules/ServiceProvidedButNotExportedOrUsedTest.java similarity index 100% rename from langtools/test/tools/javac/modules/ServiceProvidedButNotExportedOrUsedTest.java rename to test/langtools/tools/javac/modules/ServiceProvidedButNotExportedOrUsedTest.java diff --git a/langtools/test/tools/javac/modules/SingleModuleModeTest.java b/test/langtools/tools/javac/modules/SingleModuleModeTest.java similarity index 100% rename from langtools/test/tools/javac/modules/SingleModuleModeTest.java rename to test/langtools/tools/javac/modules/SingleModuleModeTest.java diff --git a/langtools/test/tools/javac/modules/SourceInSymlinkTest.java b/test/langtools/tools/javac/modules/SourceInSymlinkTest.java similarity index 100% rename from langtools/test/tools/javac/modules/SourceInSymlinkTest.java rename to test/langtools/tools/javac/modules/SourceInSymlinkTest.java diff --git a/langtools/test/tools/javac/modules/SourcePathTest.java b/test/langtools/tools/javac/modules/SourcePathTest.java similarity index 100% rename from langtools/test/tools/javac/modules/SourcePathTest.java rename to test/langtools/tools/javac/modules/SourcePathTest.java diff --git a/langtools/test/tools/javac/modules/SubpackageTest.java b/test/langtools/tools/javac/modules/SubpackageTest.java similarity index 100% rename from langtools/test/tools/javac/modules/SubpackageTest.java rename to test/langtools/tools/javac/modules/SubpackageTest.java diff --git a/langtools/test/tools/javac/modules/T8158224/Processor.java b/test/langtools/tools/javac/modules/T8158224/Processor.java similarity index 100% rename from langtools/test/tools/javac/modules/T8158224/Processor.java rename to test/langtools/tools/javac/modules/T8158224/Processor.java diff --git a/langtools/test/tools/javac/modules/T8158224/T8158224.java b/test/langtools/tools/javac/modules/T8158224/T8158224.java similarity index 100% rename from langtools/test/tools/javac/modules/T8158224/T8158224.java rename to test/langtools/tools/javac/modules/T8158224/T8158224.java diff --git a/langtools/test/tools/javac/modules/T8158224/mods/foo/module-info.java b/test/langtools/tools/javac/modules/T8158224/mods/foo/module-info.java similarity index 100% rename from langtools/test/tools/javac/modules/T8158224/mods/foo/module-info.java rename to test/langtools/tools/javac/modules/T8158224/mods/foo/module-info.java diff --git a/langtools/test/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.java b/test/langtools/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.java similarity index 100% rename from langtools/test/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.java rename to test/langtools/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.java diff --git a/langtools/test/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.out b/test/langtools/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.out similarity index 100% rename from langtools/test/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.out rename to test/langtools/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.out diff --git a/langtools/test/tools/javac/modules/T8159439/module-info.jcod b/test/langtools/tools/javac/modules/T8159439/module-info.jcod similarity index 100% rename from langtools/test/tools/javac/modules/T8159439/module-info.jcod rename to test/langtools/tools/javac/modules/T8159439/module-info.jcod diff --git a/langtools/test/tools/javac/modules/T8160454/NPEGetDirectivesTest.java b/test/langtools/tools/javac/modules/T8160454/NPEGetDirectivesTest.java similarity index 100% rename from langtools/test/tools/javac/modules/T8160454/NPEGetDirectivesTest.java rename to test/langtools/tools/javac/modules/T8160454/NPEGetDirectivesTest.java diff --git a/langtools/test/tools/javac/modules/T8161501/EmptyClass.java b/test/langtools/tools/javac/modules/T8161501/EmptyClass.java similarity index 100% rename from langtools/test/tools/javac/modules/T8161501/EmptyClass.java rename to test/langtools/tools/javac/modules/T8161501/EmptyClass.java diff --git a/langtools/test/tools/javac/modules/T8161501/UnnamedModuleUnnamedPackageTest.java b/test/langtools/tools/javac/modules/T8161501/UnnamedModuleUnnamedPackageTest.java similarity index 100% rename from langtools/test/tools/javac/modules/T8161501/UnnamedModuleUnnamedPackageTest.java rename to test/langtools/tools/javac/modules/T8161501/UnnamedModuleUnnamedPackageTest.java diff --git a/langtools/test/tools/javac/modules/T8168854/module-info.java b/test/langtools/tools/javac/modules/T8168854/module-info.java similarity index 100% rename from langtools/test/tools/javac/modules/T8168854/module-info.java rename to test/langtools/tools/javac/modules/T8168854/module-info.java diff --git a/langtools/test/tools/javac/modules/T8168854/pack1/Outer.java b/test/langtools/tools/javac/modules/T8168854/pack1/Outer.java similarity index 100% rename from langtools/test/tools/javac/modules/T8168854/pack1/Outer.java rename to test/langtools/tools/javac/modules/T8168854/pack1/Outer.java diff --git a/langtools/test/tools/javac/modules/T8168854/pack1/Outer1.java b/test/langtools/tools/javac/modules/T8168854/pack1/Outer1.java similarity index 100% rename from langtools/test/tools/javac/modules/T8168854/pack1/Outer1.java rename to test/langtools/tools/javac/modules/T8168854/pack1/Outer1.java diff --git a/langtools/test/tools/javac/modules/UnexpectedTokenInModuleInfoTest.java b/test/langtools/tools/javac/modules/UnexpectedTokenInModuleInfoTest.java similarity index 100% rename from langtools/test/tools/javac/modules/UnexpectedTokenInModuleInfoTest.java rename to test/langtools/tools/javac/modules/UnexpectedTokenInModuleInfoTest.java diff --git a/langtools/test/tools/javac/modules/UpgradeModulePathTest.java b/test/langtools/tools/javac/modules/UpgradeModulePathTest.java similarity index 100% rename from langtools/test/tools/javac/modules/UpgradeModulePathTest.java rename to test/langtools/tools/javac/modules/UpgradeModulePathTest.java diff --git a/langtools/test/tools/javac/modules/UsesTest.java b/test/langtools/tools/javac/modules/UsesTest.java similarity index 100% rename from langtools/test/tools/javac/modules/UsesTest.java rename to test/langtools/tools/javac/modules/UsesTest.java diff --git a/langtools/test/tools/javac/modules/WrongErrorMessageForNestedServiceProviderTest.java b/test/langtools/tools/javac/modules/WrongErrorMessageForNestedServiceProviderTest.java similarity index 100% rename from langtools/test/tools/javac/modules/WrongErrorMessageForNestedServiceProviderTest.java rename to test/langtools/tools/javac/modules/WrongErrorMessageForNestedServiceProviderTest.java diff --git a/langtools/test/tools/javac/multicatch/7005371/SubTest.java b/test/langtools/tools/javac/multicatch/7005371/SubTest.java similarity index 100% rename from langtools/test/tools/javac/multicatch/7005371/SubTest.java rename to test/langtools/tools/javac/multicatch/7005371/SubTest.java diff --git a/langtools/test/tools/javac/multicatch/7005371/T7005371.java b/test/langtools/tools/javac/multicatch/7005371/T7005371.java similarity index 100% rename from langtools/test/tools/javac/multicatch/7005371/T7005371.java rename to test/langtools/tools/javac/multicatch/7005371/T7005371.java diff --git a/langtools/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java b/test/langtools/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java similarity index 100% rename from langtools/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java rename to test/langtools/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java diff --git a/langtools/test/tools/javac/multicatch/7030606/T7030606.java b/test/langtools/tools/javac/multicatch/7030606/T7030606.java similarity index 100% rename from langtools/test/tools/javac/multicatch/7030606/T7030606.java rename to test/langtools/tools/javac/multicatch/7030606/T7030606.java diff --git a/langtools/test/tools/javac/multicatch/7030606/T7030606.out b/test/langtools/tools/javac/multicatch/7030606/T7030606.out similarity index 100% rename from langtools/test/tools/javac/multicatch/7030606/T7030606.out rename to test/langtools/tools/javac/multicatch/7030606/T7030606.out diff --git a/langtools/test/tools/javac/multicatch/8071291/T8071291.java b/test/langtools/tools/javac/multicatch/8071291/T8071291.java similarity index 100% rename from langtools/test/tools/javac/multicatch/8071291/T8071291.java rename to test/langtools/tools/javac/multicatch/8071291/T8071291.java diff --git a/langtools/test/tools/javac/multicatch/Neg01.java b/test/langtools/tools/javac/multicatch/Neg01.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg01.java rename to test/langtools/tools/javac/multicatch/Neg01.java diff --git a/langtools/test/tools/javac/multicatch/Neg01.out b/test/langtools/tools/javac/multicatch/Neg01.out similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg01.out rename to test/langtools/tools/javac/multicatch/Neg01.out diff --git a/langtools/test/tools/javac/multicatch/Neg01eff_final.java b/test/langtools/tools/javac/multicatch/Neg01eff_final.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg01eff_final.java rename to test/langtools/tools/javac/multicatch/Neg01eff_final.java diff --git a/langtools/test/tools/javac/multicatch/Neg01eff_final.out b/test/langtools/tools/javac/multicatch/Neg01eff_final.out similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg01eff_final.out rename to test/langtools/tools/javac/multicatch/Neg01eff_final.out diff --git a/langtools/test/tools/javac/multicatch/Neg02.java b/test/langtools/tools/javac/multicatch/Neg02.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg02.java rename to test/langtools/tools/javac/multicatch/Neg02.java diff --git a/langtools/test/tools/javac/multicatch/Neg02.out b/test/langtools/tools/javac/multicatch/Neg02.out similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg02.out rename to test/langtools/tools/javac/multicatch/Neg02.out diff --git a/langtools/test/tools/javac/multicatch/Neg02eff_final.java b/test/langtools/tools/javac/multicatch/Neg02eff_final.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg02eff_final.java rename to test/langtools/tools/javac/multicatch/Neg02eff_final.java diff --git a/langtools/test/tools/javac/multicatch/Neg02eff_final.out b/test/langtools/tools/javac/multicatch/Neg02eff_final.out similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg02eff_final.out rename to test/langtools/tools/javac/multicatch/Neg02eff_final.out diff --git a/langtools/test/tools/javac/multicatch/Neg03.java b/test/langtools/tools/javac/multicatch/Neg03.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg03.java rename to test/langtools/tools/javac/multicatch/Neg03.java diff --git a/langtools/test/tools/javac/multicatch/Neg03.out b/test/langtools/tools/javac/multicatch/Neg03.out similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg03.out rename to test/langtools/tools/javac/multicatch/Neg03.out diff --git a/langtools/test/tools/javac/multicatch/Neg04.java b/test/langtools/tools/javac/multicatch/Neg04.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg04.java rename to test/langtools/tools/javac/multicatch/Neg04.java diff --git a/langtools/test/tools/javac/multicatch/Neg04.out b/test/langtools/tools/javac/multicatch/Neg04.out similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg04.out rename to test/langtools/tools/javac/multicatch/Neg04.out diff --git a/langtools/test/tools/javac/multicatch/Neg04eff_final.java b/test/langtools/tools/javac/multicatch/Neg04eff_final.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg04eff_final.java rename to test/langtools/tools/javac/multicatch/Neg04eff_final.java diff --git a/langtools/test/tools/javac/multicatch/Neg04eff_final.out b/test/langtools/tools/javac/multicatch/Neg04eff_final.out similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg04eff_final.out rename to test/langtools/tools/javac/multicatch/Neg04eff_final.out diff --git a/langtools/test/tools/javac/multicatch/Neg06.java b/test/langtools/tools/javac/multicatch/Neg06.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg06.java rename to test/langtools/tools/javac/multicatch/Neg06.java diff --git a/langtools/test/tools/javac/multicatch/Neg06.out b/test/langtools/tools/javac/multicatch/Neg06.out similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg06.out rename to test/langtools/tools/javac/multicatch/Neg06.out diff --git a/langtools/test/tools/javac/multicatch/Neg07.java b/test/langtools/tools/javac/multicatch/Neg07.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg07.java rename to test/langtools/tools/javac/multicatch/Neg07.java diff --git a/langtools/test/tools/javac/multicatch/Neg07.out b/test/langtools/tools/javac/multicatch/Neg07.out similarity index 100% rename from langtools/test/tools/javac/multicatch/Neg07.out rename to test/langtools/tools/javac/multicatch/Neg07.out diff --git a/langtools/test/tools/javac/multicatch/Pos01.java b/test/langtools/tools/javac/multicatch/Pos01.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos01.java rename to test/langtools/tools/javac/multicatch/Pos01.java diff --git a/langtools/test/tools/javac/multicatch/Pos02.java b/test/langtools/tools/javac/multicatch/Pos02.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos02.java rename to test/langtools/tools/javac/multicatch/Pos02.java diff --git a/langtools/test/tools/javac/multicatch/Pos03.java b/test/langtools/tools/javac/multicatch/Pos03.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos03.java rename to test/langtools/tools/javac/multicatch/Pos03.java diff --git a/langtools/test/tools/javac/multicatch/Pos04.java b/test/langtools/tools/javac/multicatch/Pos04.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos04.java rename to test/langtools/tools/javac/multicatch/Pos04.java diff --git a/langtools/test/tools/javac/multicatch/Pos05.java b/test/langtools/tools/javac/multicatch/Pos05.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos05.java rename to test/langtools/tools/javac/multicatch/Pos05.java diff --git a/langtools/test/tools/javac/multicatch/Pos06.java b/test/langtools/tools/javac/multicatch/Pos06.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos06.java rename to test/langtools/tools/javac/multicatch/Pos06.java diff --git a/langtools/test/tools/javac/multicatch/Pos07.java b/test/langtools/tools/javac/multicatch/Pos07.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos07.java rename to test/langtools/tools/javac/multicatch/Pos07.java diff --git a/langtools/test/tools/javac/multicatch/Pos08.java b/test/langtools/tools/javac/multicatch/Pos08.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos08.java rename to test/langtools/tools/javac/multicatch/Pos08.java diff --git a/langtools/test/tools/javac/multicatch/Pos08eff_final.java b/test/langtools/tools/javac/multicatch/Pos08eff_final.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos08eff_final.java rename to test/langtools/tools/javac/multicatch/Pos08eff_final.java diff --git a/langtools/test/tools/javac/multicatch/Pos09.java b/test/langtools/tools/javac/multicatch/Pos09.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos09.java rename to test/langtools/tools/javac/multicatch/Pos09.java diff --git a/langtools/test/tools/javac/multicatch/Pos10.java b/test/langtools/tools/javac/multicatch/Pos10.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos10.java rename to test/langtools/tools/javac/multicatch/Pos10.java diff --git a/langtools/test/tools/javac/multicatch/Pos11.java b/test/langtools/tools/javac/multicatch/Pos11.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos11.java rename to test/langtools/tools/javac/multicatch/Pos11.java diff --git a/langtools/test/tools/javac/multicatch/Pos12.java b/test/langtools/tools/javac/multicatch/Pos12.java similarity index 100% rename from langtools/test/tools/javac/multicatch/Pos12.java rename to test/langtools/tools/javac/multicatch/Pos12.java diff --git a/langtools/test/tools/javac/multicatch/T6978574.java b/test/langtools/tools/javac/multicatch/T6978574.java similarity index 100% rename from langtools/test/tools/javac/multicatch/T6978574.java rename to test/langtools/tools/javac/multicatch/T6978574.java diff --git a/langtools/test/tools/javac/multicatch/model/Check.java b/test/langtools/tools/javac/multicatch/model/Check.java similarity index 100% rename from langtools/test/tools/javac/multicatch/model/Check.java rename to test/langtools/tools/javac/multicatch/model/Check.java diff --git a/langtools/test/tools/javac/multicatch/model/Member.java b/test/langtools/tools/javac/multicatch/model/Member.java similarity index 100% rename from langtools/test/tools/javac/multicatch/model/Member.java rename to test/langtools/tools/javac/multicatch/model/Member.java diff --git a/langtools/test/tools/javac/multicatch/model/Model01.java b/test/langtools/tools/javac/multicatch/model/Model01.java similarity index 100% rename from langtools/test/tools/javac/multicatch/model/Model01.java rename to test/langtools/tools/javac/multicatch/model/Model01.java diff --git a/langtools/test/tools/javac/multicatch/model/ModelChecker.java b/test/langtools/tools/javac/multicatch/model/ModelChecker.java similarity index 100% rename from langtools/test/tools/javac/multicatch/model/ModelChecker.java rename to test/langtools/tools/javac/multicatch/model/ModelChecker.java diff --git a/langtools/test/tools/javac/multicatch/model/UnionTypeInfo.java b/test/langtools/tools/javac/multicatch/model/UnionTypeInfo.java similarity index 100% rename from langtools/test/tools/javac/multicatch/model/UnionTypeInfo.java rename to test/langtools/tools/javac/multicatch/model/UnionTypeInfo.java diff --git a/langtools/test/tools/javac/nativeHeaders/NativeHeaderTest.java b/test/langtools/tools/javac/nativeHeaders/NativeHeaderTest.java similarity index 100% rename from langtools/test/tools/javac/nativeHeaders/NativeHeaderTest.java rename to test/langtools/tools/javac/nativeHeaders/NativeHeaderTest.java diff --git a/langtools/test/tools/javac/nativeHeaders/javahComparison/CompareTest.java b/test/langtools/tools/javac/nativeHeaders/javahComparison/CompareTest.java similarity index 100% rename from langtools/test/tools/javac/nativeHeaders/javahComparison/CompareTest.java rename to test/langtools/tools/javac/nativeHeaders/javahComparison/CompareTest.java diff --git a/langtools/test/tools/javac/nativeHeaders/javahComparison/TestClass1.java b/test/langtools/tools/javac/nativeHeaders/javahComparison/TestClass1.java similarity index 100% rename from langtools/test/tools/javac/nativeHeaders/javahComparison/TestClass1.java rename to test/langtools/tools/javac/nativeHeaders/javahComparison/TestClass1.java diff --git a/langtools/test/tools/javac/nativeHeaders/javahComparison/TestClass4.java b/test/langtools/tools/javac/nativeHeaders/javahComparison/TestClass4.java similarity index 100% rename from langtools/test/tools/javac/nativeHeaders/javahComparison/TestClass4.java rename to test/langtools/tools/javac/nativeHeaders/javahComparison/TestClass4.java diff --git a/langtools/test/tools/javac/nativeHeaders/javahComparison/TestClass5.java b/test/langtools/tools/javac/nativeHeaders/javahComparison/TestClass5.java similarity index 100% rename from langtools/test/tools/javac/nativeHeaders/javahComparison/TestClass5.java rename to test/langtools/tools/javac/nativeHeaders/javahComparison/TestClass5.java diff --git a/langtools/test/tools/javac/nested/4903103/T4903103.java b/test/langtools/tools/javac/nested/4903103/T4903103.java similarity index 100% rename from langtools/test/tools/javac/nested/4903103/T4903103.java rename to test/langtools/tools/javac/nested/4903103/T4903103.java diff --git a/langtools/test/tools/javac/nested/5009484/X.java b/test/langtools/tools/javac/nested/5009484/X.java similarity index 100% rename from langtools/test/tools/javac/nested/5009484/X.java rename to test/langtools/tools/javac/nested/5009484/X.java diff --git a/langtools/test/tools/javac/nested/5009484/X.out b/test/langtools/tools/javac/nested/5009484/X.out similarity index 100% rename from langtools/test/tools/javac/nested/5009484/X.out rename to test/langtools/tools/javac/nested/5009484/X.out diff --git a/langtools/test/tools/javac/nested/5009484/Y.java b/test/langtools/tools/javac/nested/5009484/Y.java similarity index 100% rename from langtools/test/tools/javac/nested/5009484/Y.java rename to test/langtools/tools/javac/nested/5009484/Y.java diff --git a/langtools/test/tools/javac/nested/5009484/Y.out b/test/langtools/tools/javac/nested/5009484/Y.out similarity index 100% rename from langtools/test/tools/javac/nested/5009484/Y.out rename to test/langtools/tools/javac/nested/5009484/Y.out diff --git a/langtools/test/tools/javac/newlines/NewLineTest.java b/test/langtools/tools/javac/newlines/NewLineTest.java similarity index 100% rename from langtools/test/tools/javac/newlines/NewLineTest.java rename to test/langtools/tools/javac/newlines/NewLineTest.java diff --git a/langtools/test/tools/javac/options/T6900037.java b/test/langtools/tools/javac/options/T6900037.java similarity index 100% rename from langtools/test/tools/javac/options/T6900037.java rename to test/langtools/tools/javac/options/T6900037.java diff --git a/langtools/test/tools/javac/options/T6900037.out b/test/langtools/tools/javac/options/T6900037.out similarity index 100% rename from langtools/test/tools/javac/options/T6900037.out rename to test/langtools/tools/javac/options/T6900037.out diff --git a/langtools/test/tools/javac/options/T6949443.java b/test/langtools/tools/javac/options/T6949443.java similarity index 100% rename from langtools/test/tools/javac/options/T6949443.java rename to test/langtools/tools/javac/options/T6949443.java diff --git a/langtools/test/tools/javac/options/T6986895.java b/test/langtools/tools/javac/options/T6986895.java similarity index 100% rename from langtools/test/tools/javac/options/T6986895.java rename to test/langtools/tools/javac/options/T6986895.java diff --git a/langtools/test/tools/javac/options/T7022337.java b/test/langtools/tools/javac/options/T7022337.java similarity index 100% rename from langtools/test/tools/javac/options/T7022337.java rename to test/langtools/tools/javac/options/T7022337.java diff --git a/langtools/test/tools/javac/options/XjcovUnionTypeTest.java b/test/langtools/tools/javac/options/XjcovUnionTypeTest.java similarity index 100% rename from langtools/test/tools/javac/options/XjcovUnionTypeTest.java rename to test/langtools/tools/javac/options/XjcovUnionTypeTest.java diff --git a/langtools/test/tools/javac/options/modes/AtFilesTest.java b/test/langtools/tools/javac/options/modes/AtFilesTest.java similarity index 100% rename from langtools/test/tools/javac/options/modes/AtFilesTest.java rename to test/langtools/tools/javac/options/modes/AtFilesTest.java diff --git a/langtools/test/tools/javac/options/modes/DocLintTest.java b/test/langtools/tools/javac/options/modes/DocLintTest.java similarity index 100% rename from langtools/test/tools/javac/options/modes/DocLintTest.java rename to test/langtools/tools/javac/options/modes/DocLintTest.java diff --git a/langtools/test/tools/javac/options/modes/FSInfoTest.java b/test/langtools/tools/javac/options/modes/FSInfoTest.java similarity index 100% rename from langtools/test/tools/javac/options/modes/FSInfoTest.java rename to test/langtools/tools/javac/options/modes/FSInfoTest.java diff --git a/langtools/test/tools/javac/options/modes/InfoOptsTest.java b/test/langtools/tools/javac/options/modes/InfoOptsTest.java similarity index 100% rename from langtools/test/tools/javac/options/modes/InfoOptsTest.java rename to test/langtools/tools/javac/options/modes/InfoOptsTest.java diff --git a/langtools/test/tools/javac/options/modes/NoOperandsTest.java b/test/langtools/tools/javac/options/modes/NoOperandsTest.java similarity index 100% rename from langtools/test/tools/javac/options/modes/NoOperandsTest.java rename to test/langtools/tools/javac/options/modes/NoOperandsTest.java diff --git a/langtools/test/tools/javac/options/modes/OptionModesTester.java b/test/langtools/tools/javac/options/modes/OptionModesTester.java similarity index 100% rename from langtools/test/tools/javac/options/modes/OptionModesTester.java rename to test/langtools/tools/javac/options/modes/OptionModesTester.java diff --git a/langtools/test/tools/javac/options/modes/OutputDirTest.java b/test/langtools/tools/javac/options/modes/OutputDirTest.java similarity index 100% rename from langtools/test/tools/javac/options/modes/OutputDirTest.java rename to test/langtools/tools/javac/options/modes/OutputDirTest.java diff --git a/langtools/test/tools/javac/options/modes/ProfileBootClassPathTest.java b/test/langtools/tools/javac/options/modes/ProfileBootClassPathTest.java similarity index 100% rename from langtools/test/tools/javac/options/modes/ProfileBootClassPathTest.java rename to test/langtools/tools/javac/options/modes/ProfileBootClassPathTest.java diff --git a/langtools/test/tools/javac/options/modes/ProfileTargetTest.java b/test/langtools/tools/javac/options/modes/ProfileTargetTest.java similarity index 100% rename from langtools/test/tools/javac/options/modes/ProfileTargetTest.java rename to test/langtools/tools/javac/options/modes/ProfileTargetTest.java diff --git a/langtools/test/tools/javac/options/modes/SourceTargetTest.java b/test/langtools/tools/javac/options/modes/SourceTargetTest.java similarity index 100% rename from langtools/test/tools/javac/options/modes/SourceTargetTest.java rename to test/langtools/tools/javac/options/modes/SourceTargetTest.java diff --git a/langtools/test/tools/javac/options/modes/StdOutTest.java b/test/langtools/tools/javac/options/modes/StdOutTest.java similarity index 100% rename from langtools/test/tools/javac/options/modes/StdOutTest.java rename to test/langtools/tools/javac/options/modes/StdOutTest.java diff --git a/langtools/test/tools/javac/options/release/ReleaseOption-release7.out b/test/langtools/tools/javac/options/release/ReleaseOption-release7.out similarity index 100% rename from langtools/test/tools/javac/options/release/ReleaseOption-release7.out rename to test/langtools/tools/javac/options/release/ReleaseOption-release7.out diff --git a/langtools/test/tools/javac/options/release/ReleaseOption.java b/test/langtools/tools/javac/options/release/ReleaseOption.java similarity index 100% rename from langtools/test/tools/javac/options/release/ReleaseOption.java rename to test/langtools/tools/javac/options/release/ReleaseOption.java diff --git a/langtools/test/tools/javac/options/release/ReleaseOptionClashes.java b/test/langtools/tools/javac/options/release/ReleaseOptionClashes.java similarity index 100% rename from langtools/test/tools/javac/options/release/ReleaseOptionClashes.java rename to test/langtools/tools/javac/options/release/ReleaseOptionClashes.java diff --git a/langtools/test/tools/javac/options/release/ReleaseOptionThroughAPI.java b/test/langtools/tools/javac/options/release/ReleaseOptionThroughAPI.java similarity index 100% rename from langtools/test/tools/javac/options/release/ReleaseOptionThroughAPI.java rename to test/langtools/tools/javac/options/release/ReleaseOptionThroughAPI.java diff --git a/langtools/test/tools/javac/options/release/ReleaseOptionUnsupported.java b/test/langtools/tools/javac/options/release/ReleaseOptionUnsupported.java similarity index 100% rename from langtools/test/tools/javac/options/release/ReleaseOptionUnsupported.java rename to test/langtools/tools/javac/options/release/ReleaseOptionUnsupported.java diff --git a/langtools/test/tools/javac/options/xprefer/XPreferTest.java b/test/langtools/tools/javac/options/xprefer/XPreferTest.java similarity index 100% rename from langtools/test/tools/javac/options/xprefer/XPreferTest.java rename to test/langtools/tools/javac/options/xprefer/XPreferTest.java diff --git a/langtools/test/tools/javac/overload/T4494762.java b/test/langtools/tools/javac/overload/T4494762.java similarity index 100% rename from langtools/test/tools/javac/overload/T4494762.java rename to test/langtools/tools/javac/overload/T4494762.java diff --git a/langtools/test/tools/javac/overload/T4723909.java b/test/langtools/tools/javac/overload/T4723909.java similarity index 100% rename from langtools/test/tools/javac/overload/T4723909.java rename to test/langtools/tools/javac/overload/T4723909.java diff --git a/langtools/test/tools/javac/overload/T4743490.java b/test/langtools/tools/javac/overload/T4743490.java similarity index 100% rename from langtools/test/tools/javac/overload/T4743490.java rename to test/langtools/tools/javac/overload/T4743490.java diff --git a/langtools/test/tools/javac/overload/T4743490.out b/test/langtools/tools/javac/overload/T4743490.out similarity index 100% rename from langtools/test/tools/javac/overload/T4743490.out rename to test/langtools/tools/javac/overload/T4743490.out diff --git a/langtools/test/tools/javac/overload/T5090220.java b/test/langtools/tools/javac/overload/T5090220.java similarity index 100% rename from langtools/test/tools/javac/overload/T5090220.java rename to test/langtools/tools/javac/overload/T5090220.java diff --git a/langtools/test/tools/javac/overload/T5090220.out b/test/langtools/tools/javac/overload/T5090220.out similarity index 100% rename from langtools/test/tools/javac/overload/T5090220.out rename to test/langtools/tools/javac/overload/T5090220.out diff --git a/langtools/test/tools/javac/overload/T6776289.java b/test/langtools/tools/javac/overload/T6776289.java similarity index 100% rename from langtools/test/tools/javac/overload/T6776289.java rename to test/langtools/tools/javac/overload/T6776289.java diff --git a/langtools/test/tools/javac/overload/T8176265.java b/test/langtools/tools/javac/overload/T8176265.java similarity index 100% rename from langtools/test/tools/javac/overload/T8176265.java rename to test/langtools/tools/javac/overload/T8176265.java diff --git a/langtools/test/tools/javac/overrridecrash/A.java b/test/langtools/tools/javac/overrridecrash/A.java similarity index 100% rename from langtools/test/tools/javac/overrridecrash/A.java rename to test/langtools/tools/javac/overrridecrash/A.java diff --git a/langtools/test/tools/javac/overrridecrash/B.java b/test/langtools/tools/javac/overrridecrash/B.java similarity index 100% rename from langtools/test/tools/javac/overrridecrash/B.java rename to test/langtools/tools/javac/overrridecrash/B.java diff --git a/langtools/test/tools/javac/overrridecrash/B.out b/test/langtools/tools/javac/overrridecrash/B.out similarity index 100% rename from langtools/test/tools/javac/overrridecrash/B.out rename to test/langtools/tools/javac/overrridecrash/B.out diff --git a/langtools/test/tools/javac/p1/AS.java b/test/langtools/tools/javac/p1/AS.java similarity index 100% rename from langtools/test/tools/javac/p1/AS.java rename to test/langtools/tools/javac/p1/AS.java diff --git a/langtools/test/tools/javac/p1/BS.java b/test/langtools/tools/javac/p1/BS.java similarity index 100% rename from langtools/test/tools/javac/p1/BS.java rename to test/langtools/tools/javac/p1/BS.java diff --git a/langtools/test/tools/javac/p1/CS.java b/test/langtools/tools/javac/p1/CS.java similarity index 100% rename from langtools/test/tools/javac/p1/CS.java rename to test/langtools/tools/javac/p1/CS.java diff --git a/langtools/test/tools/javac/packone/Mediator.java b/test/langtools/tools/javac/packone/Mediator.java similarity index 100% rename from langtools/test/tools/javac/packone/Mediator.java rename to test/langtools/tools/javac/packone/Mediator.java diff --git a/langtools/test/tools/javac/packone/Secret.java b/test/langtools/tools/javac/packone/Secret.java similarity index 100% rename from langtools/test/tools/javac/packone/Secret.java rename to test/langtools/tools/javac/packone/Secret.java diff --git a/langtools/test/tools/javac/parser/7157165/T7157165.java b/test/langtools/tools/javac/parser/7157165/T7157165.java similarity index 100% rename from langtools/test/tools/javac/parser/7157165/T7157165.java rename to test/langtools/tools/javac/parser/7157165/T7157165.java diff --git a/langtools/test/tools/javac/parser/7157165/T7157165.out b/test/langtools/tools/javac/parser/7157165/T7157165.out similarity index 100% rename from langtools/test/tools/javac/parser/7157165/T7157165.out rename to test/langtools/tools/javac/parser/7157165/T7157165.out diff --git a/langtools/test/tools/javac/parser/8014643/T8014643.java b/test/langtools/tools/javac/parser/8014643/T8014643.java similarity index 100% rename from langtools/test/tools/javac/parser/8014643/T8014643.java rename to test/langtools/tools/javac/parser/8014643/T8014643.java diff --git a/langtools/test/tools/javac/parser/8081769/T8081769.java b/test/langtools/tools/javac/parser/8081769/T8081769.java similarity index 100% rename from langtools/test/tools/javac/parser/8081769/T8081769.java rename to test/langtools/tools/javac/parser/8081769/T8081769.java diff --git a/langtools/test/tools/javac/parser/8081769/T8081769.out b/test/langtools/tools/javac/parser/8081769/T8081769.out similarity index 100% rename from langtools/test/tools/javac/parser/8081769/T8081769.out rename to test/langtools/tools/javac/parser/8081769/T8081769.out diff --git a/langtools/test/tools/javac/parser/8134007/T8134007.java b/test/langtools/tools/javac/parser/8134007/T8134007.java similarity index 100% rename from langtools/test/tools/javac/parser/8134007/T8134007.java rename to test/langtools/tools/javac/parser/8134007/T8134007.java diff --git a/langtools/test/tools/javac/parser/ErroneousParameters.java b/test/langtools/tools/javac/parser/ErroneousParameters.java similarity index 100% rename from langtools/test/tools/javac/parser/ErroneousParameters.java rename to test/langtools/tools/javac/parser/ErroneousParameters.java diff --git a/langtools/test/tools/javac/parser/ErroneousParameters.out b/test/langtools/tools/javac/parser/ErroneousParameters.out similarity index 100% rename from langtools/test/tools/javac/parser/ErroneousParameters.out rename to test/langtools/tools/javac/parser/ErroneousParameters.out diff --git a/langtools/test/tools/javac/parser/ExtraSemiTest.java b/test/langtools/tools/javac/parser/ExtraSemiTest.java similarity index 100% rename from langtools/test/tools/javac/parser/ExtraSemiTest.java rename to test/langtools/tools/javac/parser/ExtraSemiTest.java diff --git a/langtools/test/tools/javac/parser/JavacParserTest.java b/test/langtools/tools/javac/parser/JavacParserTest.java similarity index 100% rename from langtools/test/tools/javac/parser/JavacParserTest.java rename to test/langtools/tools/javac/parser/JavacParserTest.java diff --git a/langtools/test/tools/javac/parser/MissingClosingBrace.java b/test/langtools/tools/javac/parser/MissingClosingBrace.java similarity index 100% rename from langtools/test/tools/javac/parser/MissingClosingBrace.java rename to test/langtools/tools/javac/parser/MissingClosingBrace.java diff --git a/langtools/test/tools/javac/parser/MissingClosingBrace.out b/test/langtools/tools/javac/parser/MissingClosingBrace.out similarity index 100% rename from langtools/test/tools/javac/parser/MissingClosingBrace.out rename to test/langtools/tools/javac/parser/MissingClosingBrace.out diff --git a/langtools/test/tools/javac/parser/SingleCommaAnnotationValue.java b/test/langtools/tools/javac/parser/SingleCommaAnnotationValue.java similarity index 100% rename from langtools/test/tools/javac/parser/SingleCommaAnnotationValue.java rename to test/langtools/tools/javac/parser/SingleCommaAnnotationValue.java diff --git a/langtools/test/tools/javac/parser/SingleCommaAnnotationValueFail.java b/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.java similarity index 100% rename from langtools/test/tools/javac/parser/SingleCommaAnnotationValueFail.java rename to test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.java diff --git a/langtools/test/tools/javac/parser/SingleCommaAnnotationValueFail.out b/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out similarity index 100% rename from langtools/test/tools/javac/parser/SingleCommaAnnotationValueFail.out rename to test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out diff --git a/langtools/test/tools/javac/parser/StringFoldingTest.java b/test/langtools/tools/javac/parser/StringFoldingTest.java similarity index 100% rename from langtools/test/tools/javac/parser/StringFoldingTest.java rename to test/langtools/tools/javac/parser/StringFoldingTest.java diff --git a/langtools/test/tools/javac/parser/T4881269.java b/test/langtools/tools/javac/parser/T4881269.java similarity index 100% rename from langtools/test/tools/javac/parser/T4881269.java rename to test/langtools/tools/javac/parser/T4881269.java diff --git a/langtools/test/tools/javac/parser/T4881269.out b/test/langtools/tools/javac/parser/T4881269.out similarity index 100% rename from langtools/test/tools/javac/parser/T4881269.out rename to test/langtools/tools/javac/parser/T4881269.out diff --git a/langtools/test/tools/javac/parser/T4910483.java b/test/langtools/tools/javac/parser/T4910483.java similarity index 100% rename from langtools/test/tools/javac/parser/T4910483.java rename to test/langtools/tools/javac/parser/T4910483.java diff --git a/langtools/test/tools/javac/parser/extend/JavacExtensionTest.java b/test/langtools/tools/javac/parser/extend/JavacExtensionTest.java similarity index 100% rename from langtools/test/tools/javac/parser/extend/JavacExtensionTest.java rename to test/langtools/tools/javac/parser/extend/JavacExtensionTest.java diff --git a/langtools/test/tools/javac/parser/extend/TrialParser.java b/test/langtools/tools/javac/parser/extend/TrialParser.java similarity index 100% rename from langtools/test/tools/javac/parser/extend/TrialParser.java rename to test/langtools/tools/javac/parser/extend/TrialParser.java diff --git a/langtools/test/tools/javac/parser/extend/TrialParserFactory.java b/test/langtools/tools/javac/parser/extend/TrialParserFactory.java similarity index 100% rename from langtools/test/tools/javac/parser/extend/TrialParserFactory.java rename to test/langtools/tools/javac/parser/extend/TrialParserFactory.java diff --git a/langtools/test/tools/javac/platform/PlatformProviderTest.java b/test/langtools/tools/javac/platform/PlatformProviderTest.java similarity index 100% rename from langtools/test/tools/javac/platform/PlatformProviderTest.java rename to test/langtools/tools/javac/platform/PlatformProviderTest.java diff --git a/langtools/test/tools/javac/platform/PlatformProviderTestSource.java b/test/langtools/tools/javac/platform/PlatformProviderTestSource.java similarity index 100% rename from langtools/test/tools/javac/platform/PlatformProviderTestSource.java rename to test/langtools/tools/javac/platform/PlatformProviderTestSource.java diff --git a/langtools/test/tools/javac/plugin/missing/PluginNotFound.java b/test/langtools/tools/javac/plugin/missing/PluginNotFound.java similarity index 100% rename from langtools/test/tools/javac/plugin/missing/PluginNotFound.java rename to test/langtools/tools/javac/plugin/missing/PluginNotFound.java diff --git a/langtools/test/tools/javac/plugin/missing/PluginNotFound.out b/test/langtools/tools/javac/plugin/missing/PluginNotFound.out similarity index 100% rename from langtools/test/tools/javac/plugin/missing/PluginNotFound.out rename to test/langtools/tools/javac/plugin/missing/PluginNotFound.out diff --git a/langtools/test/tools/javac/plugin/showtype/Identifiers.java b/test/langtools/tools/javac/plugin/showtype/Identifiers.java similarity index 100% rename from langtools/test/tools/javac/plugin/showtype/Identifiers.java rename to test/langtools/tools/javac/plugin/showtype/Identifiers.java diff --git a/langtools/test/tools/javac/plugin/showtype/Identifiers.out b/test/langtools/tools/javac/plugin/showtype/Identifiers.out similarity index 100% rename from langtools/test/tools/javac/plugin/showtype/Identifiers.out rename to test/langtools/tools/javac/plugin/showtype/Identifiers.out diff --git a/langtools/test/tools/javac/plugin/showtype/Identifiers_PI.out b/test/langtools/tools/javac/plugin/showtype/Identifiers_PI.out similarity index 100% rename from langtools/test/tools/javac/plugin/showtype/Identifiers_PI.out rename to test/langtools/tools/javac/plugin/showtype/Identifiers_PI.out diff --git a/langtools/test/tools/javac/plugin/showtype/ShowTypePlugin.java b/test/langtools/tools/javac/plugin/showtype/ShowTypePlugin.java similarity index 100% rename from langtools/test/tools/javac/plugin/showtype/ShowTypePlugin.java rename to test/langtools/tools/javac/plugin/showtype/ShowTypePlugin.java diff --git a/langtools/test/tools/javac/plugin/showtype/Test.java b/test/langtools/tools/javac/plugin/showtype/Test.java similarity index 100% rename from langtools/test/tools/javac/plugin/showtype/Test.java rename to test/langtools/tools/javac/plugin/showtype/Test.java diff --git a/langtools/test/tools/javac/policy/test1/A.java b/test/langtools/tools/javac/policy/test1/A.java similarity index 100% rename from langtools/test/tools/javac/policy/test1/A.java rename to test/langtools/tools/javac/policy/test1/A.java diff --git a/langtools/test/tools/javac/policy/test1/B.java b/test/langtools/tools/javac/policy/test1/B.java similarity index 100% rename from langtools/test/tools/javac/policy/test1/B.java rename to test/langtools/tools/javac/policy/test1/B.java diff --git a/langtools/test/tools/javac/policy/test1/C.java b/test/langtools/tools/javac/policy/test1/C.java similarity index 100% rename from langtools/test/tools/javac/policy/test1/C.java rename to test/langtools/tools/javac/policy/test1/C.java diff --git a/langtools/test/tools/javac/policy/test1/D.java b/test/langtools/tools/javac/policy/test1/D.java similarity index 100% rename from langtools/test/tools/javac/policy/test1/D.java rename to test/langtools/tools/javac/policy/test1/D.java diff --git a/langtools/test/tools/javac/policy/test1/Test1a.java b/test/langtools/tools/javac/policy/test1/Test1a.java similarity index 100% rename from langtools/test/tools/javac/policy/test1/Test1a.java rename to test/langtools/tools/javac/policy/test1/Test1a.java diff --git a/langtools/test/tools/javac/policy/test1/Test1b.java b/test/langtools/tools/javac/policy/test1/Test1b.java similarity index 100% rename from langtools/test/tools/javac/policy/test1/Test1b.java rename to test/langtools/tools/javac/policy/test1/Test1b.java diff --git a/langtools/test/tools/javac/policy/test1/byfile.ABD.out b/test/langtools/tools/javac/policy/test1/byfile.ABD.out similarity index 100% rename from langtools/test/tools/javac/policy/test1/byfile.ABD.out rename to test/langtools/tools/javac/policy/test1/byfile.ABD.out diff --git a/langtools/test/tools/javac/policy/test1/byfile.ACD.out b/test/langtools/tools/javac/policy/test1/byfile.ACD.out similarity index 100% rename from langtools/test/tools/javac/policy/test1/byfile.ACD.out rename to test/langtools/tools/javac/policy/test1/byfile.ACD.out diff --git a/langtools/test/tools/javac/policy/test1/bytodo.ABD.out b/test/langtools/tools/javac/policy/test1/bytodo.ABD.out similarity index 100% rename from langtools/test/tools/javac/policy/test1/bytodo.ABD.out rename to test/langtools/tools/javac/policy/test1/bytodo.ABD.out diff --git a/langtools/test/tools/javac/policy/test1/bytodo.ACD.out b/test/langtools/tools/javac/policy/test1/bytodo.ACD.out similarity index 100% rename from langtools/test/tools/javac/policy/test1/bytodo.ACD.out rename to test/langtools/tools/javac/policy/test1/bytodo.ACD.out diff --git a/langtools/test/tools/javac/policy/test1/simple.ABD.out b/test/langtools/tools/javac/policy/test1/simple.ABD.out similarity index 100% rename from langtools/test/tools/javac/policy/test1/simple.ABD.out rename to test/langtools/tools/javac/policy/test1/simple.ABD.out diff --git a/langtools/test/tools/javac/policy/test1/simple.ACD.out b/test/langtools/tools/javac/policy/test1/simple.ACD.out similarity index 100% rename from langtools/test/tools/javac/policy/test1/simple.ACD.out rename to test/langtools/tools/javac/policy/test1/simple.ACD.out diff --git a/langtools/test/tools/javac/policy/test2/A.java b/test/langtools/tools/javac/policy/test2/A.java similarity index 100% rename from langtools/test/tools/javac/policy/test2/A.java rename to test/langtools/tools/javac/policy/test2/A.java diff --git a/langtools/test/tools/javac/policy/test2/B.java b/test/langtools/tools/javac/policy/test2/B.java similarity index 100% rename from langtools/test/tools/javac/policy/test2/B.java rename to test/langtools/tools/javac/policy/test2/B.java diff --git a/langtools/test/tools/javac/policy/test2/Test.java b/test/langtools/tools/javac/policy/test2/Test.java similarity index 100% rename from langtools/test/tools/javac/policy/test2/Test.java rename to test/langtools/tools/javac/policy/test2/Test.java diff --git a/langtools/test/tools/javac/policy/test2/byfile.AB.out b/test/langtools/tools/javac/policy/test2/byfile.AB.out similarity index 100% rename from langtools/test/tools/javac/policy/test2/byfile.AB.out rename to test/langtools/tools/javac/policy/test2/byfile.AB.out diff --git a/langtools/test/tools/javac/policy/test2/byfile.BA.out b/test/langtools/tools/javac/policy/test2/byfile.BA.out similarity index 100% rename from langtools/test/tools/javac/policy/test2/byfile.BA.out rename to test/langtools/tools/javac/policy/test2/byfile.BA.out diff --git a/langtools/test/tools/javac/policy/test2/bytodo.AB.out b/test/langtools/tools/javac/policy/test2/bytodo.AB.out similarity index 100% rename from langtools/test/tools/javac/policy/test2/bytodo.AB.out rename to test/langtools/tools/javac/policy/test2/bytodo.AB.out diff --git a/langtools/test/tools/javac/policy/test2/bytodo.BA.out b/test/langtools/tools/javac/policy/test2/bytodo.BA.out similarity index 100% rename from langtools/test/tools/javac/policy/test2/bytodo.BA.out rename to test/langtools/tools/javac/policy/test2/bytodo.BA.out diff --git a/langtools/test/tools/javac/policy/test3/A.java b/test/langtools/tools/javac/policy/test3/A.java similarity index 100% rename from langtools/test/tools/javac/policy/test3/A.java rename to test/langtools/tools/javac/policy/test3/A.java diff --git a/langtools/test/tools/javac/policy/test3/Test.java b/test/langtools/tools/javac/policy/test3/Test.java similarity index 100% rename from langtools/test/tools/javac/policy/test3/Test.java rename to test/langtools/tools/javac/policy/test3/Test.java diff --git a/langtools/test/tools/javac/positions/T6264029.java b/test/langtools/tools/javac/positions/T6264029.java similarity index 100% rename from langtools/test/tools/javac/positions/T6264029.java rename to test/langtools/tools/javac/positions/T6264029.java diff --git a/langtools/test/tools/javac/positions/T6264029.out b/test/langtools/tools/javac/positions/T6264029.out similarity index 100% rename from langtools/test/tools/javac/positions/T6264029.out rename to test/langtools/tools/javac/positions/T6264029.out diff --git a/langtools/test/tools/javac/positions/T6402077.java b/test/langtools/tools/javac/positions/T6402077.java similarity index 100% rename from langtools/test/tools/javac/positions/T6402077.java rename to test/langtools/tools/javac/positions/T6402077.java diff --git a/langtools/test/tools/javac/positions/T6404194.java b/test/langtools/tools/javac/positions/T6404194.java similarity index 100% rename from langtools/test/tools/javac/positions/T6404194.java rename to test/langtools/tools/javac/positions/T6404194.java diff --git a/langtools/test/tools/javac/positions/TreeEndPosTest.java b/test/langtools/tools/javac/positions/TreeEndPosTest.java similarity index 100% rename from langtools/test/tools/javac/positions/TreeEndPosTest.java rename to test/langtools/tools/javac/positions/TreeEndPosTest.java diff --git a/langtools/test/tools/javac/processing/6348193/T6348193.java b/test/langtools/tools/javac/processing/6348193/T6348193.java similarity index 100% rename from langtools/test/tools/javac/processing/6348193/T6348193.java rename to test/langtools/tools/javac/processing/6348193/T6348193.java diff --git a/langtools/test/tools/javac/processing/6348499/A.java b/test/langtools/tools/javac/processing/6348499/A.java similarity index 100% rename from langtools/test/tools/javac/processing/6348499/A.java rename to test/langtools/tools/javac/processing/6348499/A.java diff --git a/langtools/test/tools/javac/processing/6348499/T6348499.java b/test/langtools/tools/javac/processing/6348499/T6348499.java similarity index 100% rename from langtools/test/tools/javac/processing/6348499/T6348499.java rename to test/langtools/tools/javac/processing/6348499/T6348499.java diff --git a/langtools/test/tools/javac/processing/6350124/HelloWorldAP.java b/test/langtools/tools/javac/processing/6350124/HelloWorldAP.java similarity index 100% rename from langtools/test/tools/javac/processing/6350124/HelloWorldAP.java rename to test/langtools/tools/javac/processing/6350124/HelloWorldAP.java diff --git a/langtools/test/tools/javac/processing/6350124/Marked.java b/test/langtools/tools/javac/processing/6350124/Marked.java similarity index 100% rename from langtools/test/tools/javac/processing/6350124/Marked.java rename to test/langtools/tools/javac/processing/6350124/Marked.java diff --git a/langtools/test/tools/javac/processing/6350124/Marker.java b/test/langtools/tools/javac/processing/6350124/Marker.java similarity index 100% rename from langtools/test/tools/javac/processing/6350124/Marker.java rename to test/langtools/tools/javac/processing/6350124/Marker.java diff --git a/langtools/test/tools/javac/processing/6350124/T6350124.java b/test/langtools/tools/javac/processing/6350124/T6350124.java similarity index 100% rename from langtools/test/tools/javac/processing/6350124/T6350124.java rename to test/langtools/tools/javac/processing/6350124/T6350124.java diff --git a/langtools/test/tools/javac/processing/6359313/Foo.java b/test/langtools/tools/javac/processing/6359313/Foo.java similarity index 100% rename from langtools/test/tools/javac/processing/6359313/Foo.java rename to test/langtools/tools/javac/processing/6359313/Foo.java diff --git a/langtools/test/tools/javac/processing/6359313/T6359313.java b/test/langtools/tools/javac/processing/6359313/T6359313.java similarity index 100% rename from langtools/test/tools/javac/processing/6359313/T6359313.java rename to test/langtools/tools/javac/processing/6359313/T6359313.java diff --git a/langtools/test/tools/javac/processing/6359313/package-info.java b/test/langtools/tools/javac/processing/6359313/package-info.java similarity index 100% rename from langtools/test/tools/javac/processing/6359313/package-info.java rename to test/langtools/tools/javac/processing/6359313/package-info.java diff --git a/langtools/test/tools/javac/processing/6365040/ProcBar.java b/test/langtools/tools/javac/processing/6365040/ProcBar.java similarity index 100% rename from langtools/test/tools/javac/processing/6365040/ProcBar.java rename to test/langtools/tools/javac/processing/6365040/ProcBar.java diff --git a/langtools/test/tools/javac/processing/6365040/ProcFoo.java b/test/langtools/tools/javac/processing/6365040/ProcFoo.java similarity index 100% rename from langtools/test/tools/javac/processing/6365040/ProcFoo.java rename to test/langtools/tools/javac/processing/6365040/ProcFoo.java diff --git a/langtools/test/tools/javac/processing/6365040/T6365040.java b/test/langtools/tools/javac/processing/6365040/T6365040.java similarity index 100% rename from langtools/test/tools/javac/processing/6365040/T6365040.java rename to test/langtools/tools/javac/processing/6365040/T6365040.java diff --git a/langtools/test/tools/javac/processing/6365040/T6365040.out b/test/langtools/tools/javac/processing/6365040/T6365040.out similarity index 100% rename from langtools/test/tools/javac/processing/6365040/T6365040.out rename to test/langtools/tools/javac/processing/6365040/T6365040.out diff --git a/langtools/test/tools/javac/processing/6378728/T6378728.java b/test/langtools/tools/javac/processing/6378728/T6378728.java similarity index 100% rename from langtools/test/tools/javac/processing/6378728/T6378728.java rename to test/langtools/tools/javac/processing/6378728/T6378728.java diff --git a/langtools/test/tools/javac/processing/6413690/T6413690.java b/test/langtools/tools/javac/processing/6413690/T6413690.java similarity index 100% rename from langtools/test/tools/javac/processing/6413690/T6413690.java rename to test/langtools/tools/javac/processing/6413690/T6413690.java diff --git a/langtools/test/tools/javac/processing/6413690/TestMe.java b/test/langtools/tools/javac/processing/6413690/TestMe.java similarity index 100% rename from langtools/test/tools/javac/processing/6413690/TestMe.java rename to test/langtools/tools/javac/processing/6413690/TestMe.java diff --git a/langtools/test/tools/javac/processing/6413690/src/Super.java b/test/langtools/tools/javac/processing/6413690/src/Super.java similarity index 100% rename from langtools/test/tools/javac/processing/6413690/src/Super.java rename to test/langtools/tools/javac/processing/6413690/src/Super.java diff --git a/langtools/test/tools/javac/processing/6414633/A.java b/test/langtools/tools/javac/processing/6414633/A.java similarity index 100% rename from langtools/test/tools/javac/processing/6414633/A.java rename to test/langtools/tools/javac/processing/6414633/A.java diff --git a/langtools/test/tools/javac/processing/6414633/T6414633.java b/test/langtools/tools/javac/processing/6414633/T6414633.java similarity index 100% rename from langtools/test/tools/javac/processing/6414633/T6414633.java rename to test/langtools/tools/javac/processing/6414633/T6414633.java diff --git a/langtools/test/tools/javac/processing/6430209/T6430209.java b/test/langtools/tools/javac/processing/6430209/T6430209.java similarity index 100% rename from langtools/test/tools/javac/processing/6430209/T6430209.java rename to test/langtools/tools/javac/processing/6430209/T6430209.java diff --git a/langtools/test/tools/javac/processing/6430209/b6341534.java b/test/langtools/tools/javac/processing/6430209/b6341534.java similarity index 100% rename from langtools/test/tools/javac/processing/6430209/b6341534.java rename to test/langtools/tools/javac/processing/6430209/b6341534.java diff --git a/langtools/test/tools/javac/processing/6430209/test0.java b/test/langtools/tools/javac/processing/6430209/test0.java similarity index 100% rename from langtools/test/tools/javac/processing/6430209/test0.java rename to test/langtools/tools/javac/processing/6430209/test0.java diff --git a/langtools/test/tools/javac/processing/6430209/test1.java b/test/langtools/tools/javac/processing/6430209/test1.java similarity index 100% rename from langtools/test/tools/javac/processing/6430209/test1.java rename to test/langtools/tools/javac/processing/6430209/test1.java diff --git a/langtools/test/tools/javac/processing/6499119/ClassProcessor.java b/test/langtools/tools/javac/processing/6499119/ClassProcessor.java similarity index 100% rename from langtools/test/tools/javac/processing/6499119/ClassProcessor.java rename to test/langtools/tools/javac/processing/6499119/ClassProcessor.java diff --git a/langtools/test/tools/javac/processing/6499119/package-info.java b/test/langtools/tools/javac/processing/6499119/package-info.java similarity index 100% rename from langtools/test/tools/javac/processing/6499119/package-info.java rename to test/langtools/tools/javac/processing/6499119/package-info.java diff --git a/langtools/test/tools/javac/processing/6511613/DummyProcessor.java b/test/langtools/tools/javac/processing/6511613/DummyProcessor.java similarity index 100% rename from langtools/test/tools/javac/processing/6511613/DummyProcessor.java rename to test/langtools/tools/javac/processing/6511613/DummyProcessor.java diff --git a/langtools/test/tools/javac/processing/6511613/clss41701.java b/test/langtools/tools/javac/processing/6511613/clss41701.java similarity index 100% rename from langtools/test/tools/javac/processing/6511613/clss41701.java rename to test/langtools/tools/javac/processing/6511613/clss41701.java diff --git a/langtools/test/tools/javac/processing/6511613/clss41701.out b/test/langtools/tools/javac/processing/6511613/clss41701.out similarity index 100% rename from langtools/test/tools/javac/processing/6511613/clss41701.out rename to test/langtools/tools/javac/processing/6511613/clss41701.out diff --git a/langtools/test/tools/javac/processing/6512707/T6512707.java b/test/langtools/tools/javac/processing/6512707/T6512707.java similarity index 100% rename from langtools/test/tools/javac/processing/6512707/T6512707.java rename to test/langtools/tools/javac/processing/6512707/T6512707.java diff --git a/langtools/test/tools/javac/processing/6512707/TestAnnotation.java b/test/langtools/tools/javac/processing/6512707/TestAnnotation.java similarity index 100% rename from langtools/test/tools/javac/processing/6512707/TestAnnotation.java rename to test/langtools/tools/javac/processing/6512707/TestAnnotation.java diff --git a/langtools/test/tools/javac/processing/6512707/TestEnum.java b/test/langtools/tools/javac/processing/6512707/TestEnum.java similarity index 100% rename from langtools/test/tools/javac/processing/6512707/TestEnum.java rename to test/langtools/tools/javac/processing/6512707/TestEnum.java diff --git a/langtools/test/tools/javac/processing/6634138/Dummy.java b/test/langtools/tools/javac/processing/6634138/Dummy.java similarity index 100% rename from langtools/test/tools/javac/processing/6634138/Dummy.java rename to test/langtools/tools/javac/processing/6634138/Dummy.java diff --git a/langtools/test/tools/javac/processing/6634138/ExerciseDependency.java b/test/langtools/tools/javac/processing/6634138/ExerciseDependency.java similarity index 100% rename from langtools/test/tools/javac/processing/6634138/ExerciseDependency.java rename to test/langtools/tools/javac/processing/6634138/ExerciseDependency.java diff --git a/langtools/test/tools/javac/processing/6634138/T6634138.java b/test/langtools/tools/javac/processing/6634138/T6634138.java similarity index 100% rename from langtools/test/tools/javac/processing/6634138/T6634138.java rename to test/langtools/tools/javac/processing/6634138/T6634138.java diff --git a/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.1.out b/test/langtools/tools/javac/processing/6994946/SemanticErrorTest.1.out similarity index 100% rename from langtools/test/tools/javac/processing/6994946/SemanticErrorTest.1.out rename to test/langtools/tools/javac/processing/6994946/SemanticErrorTest.1.out diff --git a/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.2.out b/test/langtools/tools/javac/processing/6994946/SemanticErrorTest.2.out similarity index 100% rename from langtools/test/tools/javac/processing/6994946/SemanticErrorTest.2.out rename to test/langtools/tools/javac/processing/6994946/SemanticErrorTest.2.out diff --git a/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.java b/test/langtools/tools/javac/processing/6994946/SemanticErrorTest.java similarity index 100% rename from langtools/test/tools/javac/processing/6994946/SemanticErrorTest.java rename to test/langtools/tools/javac/processing/6994946/SemanticErrorTest.java diff --git a/langtools/test/tools/javac/processing/6994946/SyntaxErrorTest.java b/test/langtools/tools/javac/processing/6994946/SyntaxErrorTest.java similarity index 100% rename from langtools/test/tools/javac/processing/6994946/SyntaxErrorTest.java rename to test/langtools/tools/javac/processing/6994946/SyntaxErrorTest.java diff --git a/langtools/test/tools/javac/processing/6994946/SyntaxErrorTest.out b/test/langtools/tools/javac/processing/6994946/SyntaxErrorTest.out similarity index 100% rename from langtools/test/tools/javac/processing/6994946/SyntaxErrorTest.out rename to test/langtools/tools/javac/processing/6994946/SyntaxErrorTest.out diff --git a/langtools/test/tools/javac/processing/6994946/TestProcessor.java b/test/langtools/tools/javac/processing/6994946/TestProcessor.java similarity index 100% rename from langtools/test/tools/javac/processing/6994946/TestProcessor.java rename to test/langtools/tools/javac/processing/6994946/TestProcessor.java diff --git a/langtools/test/tools/javac/processing/8132446/Processor.java b/test/langtools/tools/javac/processing/8132446/Processor.java similarity index 100% rename from langtools/test/tools/javac/processing/8132446/Processor.java rename to test/langtools/tools/javac/processing/8132446/Processor.java diff --git a/langtools/test/tools/javac/processing/8132446/T8132446.java b/test/langtools/tools/javac/processing/8132446/T8132446.java similarity index 100% rename from langtools/test/tools/javac/processing/8132446/T8132446.java rename to test/langtools/tools/javac/processing/8132446/T8132446.java diff --git a/langtools/test/tools/javac/processing/OverwriteInitialInput.java b/test/langtools/tools/javac/processing/OverwriteInitialInput.java similarity index 100% rename from langtools/test/tools/javac/processing/OverwriteInitialInput.java rename to test/langtools/tools/javac/processing/OverwriteInitialInput.java diff --git a/langtools/test/tools/javac/processing/StopAfterError/StopAfterError.java b/test/langtools/tools/javac/processing/StopAfterError/StopAfterError.java similarity index 100% rename from langtools/test/tools/javac/processing/StopAfterError/StopAfterError.java rename to test/langtools/tools/javac/processing/StopAfterError/StopAfterError.java diff --git a/langtools/test/tools/javac/processing/StopAfterError/StopAfterError.out b/test/langtools/tools/javac/processing/StopAfterError/StopAfterError.out similarity index 100% rename from langtools/test/tools/javac/processing/StopAfterError/StopAfterError.out rename to test/langtools/tools/javac/processing/StopAfterError/StopAfterError.out diff --git a/langtools/test/tools/javac/processing/StopAfterError/StopAfterErrorAux.java b/test/langtools/tools/javac/processing/StopAfterError/StopAfterErrorAux.java similarity index 100% rename from langtools/test/tools/javac/processing/StopAfterError/StopAfterErrorAux.java rename to test/langtools/tools/javac/processing/StopAfterError/StopAfterErrorAux.java diff --git a/langtools/test/tools/javac/processing/StopAfterError/StopAfterErrorContinue.out b/test/langtools/tools/javac/processing/StopAfterError/StopAfterErrorContinue.out similarity index 100% rename from langtools/test/tools/javac/processing/StopAfterError/StopAfterErrorContinue.out rename to test/langtools/tools/javac/processing/StopAfterError/StopAfterErrorContinue.out diff --git a/langtools/test/tools/javac/processing/T6439826.java b/test/langtools/tools/javac/processing/T6439826.java similarity index 100% rename from langtools/test/tools/javac/processing/T6439826.java rename to test/langtools/tools/javac/processing/T6439826.java diff --git a/langtools/test/tools/javac/processing/T6920317.java b/test/langtools/tools/javac/processing/T6920317.java similarity index 100% rename from langtools/test/tools/javac/processing/T6920317.java rename to test/langtools/tools/javac/processing/T6920317.java diff --git a/langtools/test/tools/javac/processing/T7196462.java b/test/langtools/tools/javac/processing/T7196462.java similarity index 100% rename from langtools/test/tools/javac/processing/T7196462.java rename to test/langtools/tools/javac/processing/T7196462.java diff --git a/langtools/test/tools/javac/processing/T8142931.java b/test/langtools/tools/javac/processing/T8142931.java similarity index 100% rename from langtools/test/tools/javac/processing/T8142931.java rename to test/langtools/tools/javac/processing/T8142931.java diff --git a/langtools/test/tools/javac/processing/TestMultipleErrors.java b/test/langtools/tools/javac/processing/TestMultipleErrors.java similarity index 100% rename from langtools/test/tools/javac/processing/TestMultipleErrors.java rename to test/langtools/tools/javac/processing/TestMultipleErrors.java diff --git a/langtools/test/tools/javac/processing/TestMultipleErrors.out b/test/langtools/tools/javac/processing/TestMultipleErrors.out similarity index 100% rename from langtools/test/tools/javac/processing/TestMultipleErrors.out rename to test/langtools/tools/javac/processing/TestMultipleErrors.out diff --git a/langtools/test/tools/javac/processing/TestWarnErrorCount.java b/test/langtools/tools/javac/processing/TestWarnErrorCount.java similarity index 100% rename from langtools/test/tools/javac/processing/TestWarnErrorCount.java rename to test/langtools/tools/javac/processing/TestWarnErrorCount.java diff --git a/langtools/test/tools/javac/processing/completion/TestCompletions.java b/test/langtools/tools/javac/processing/completion/TestCompletions.java similarity index 100% rename from langtools/test/tools/javac/processing/completion/TestCompletions.java rename to test/langtools/tools/javac/processing/completion/TestCompletions.java diff --git a/langtools/test/tools/javac/processing/environment/HelloWorld.java b/test/langtools/tools/javac/processing/environment/HelloWorld.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/HelloWorld.java rename to test/langtools/tools/javac/processing/environment/HelloWorld.java diff --git a/langtools/test/tools/javac/processing/environment/ProcessingEnvAnnoDiscovery.java b/test/langtools/tools/javac/processing/environment/ProcessingEnvAnnoDiscovery.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/ProcessingEnvAnnoDiscovery.java rename to test/langtools/tools/javac/processing/environment/ProcessingEnvAnnoDiscovery.java diff --git a/langtools/test/tools/javac/processing/environment/TestSourceVersion.java b/test/langtools/tools/javac/processing/environment/TestSourceVersion.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/TestSourceVersion.java rename to test/langtools/tools/javac/processing/environment/TestSourceVersion.java diff --git a/langtools/test/tools/javac/processing/environment/round/Anno.java b/test/langtools/tools/javac/processing/environment/round/Anno.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/Anno.java rename to test/langtools/tools/javac/processing/environment/round/Anno.java diff --git a/langtools/test/tools/javac/processing/environment/round/AnnotatedElementInfo.java b/test/langtools/tools/javac/processing/environment/round/AnnotatedElementInfo.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/AnnotatedElementInfo.java rename to test/langtools/tools/javac/processing/environment/round/AnnotatedElementInfo.java diff --git a/langtools/test/tools/javac/processing/environment/round/BuriedAnnotations.java b/test/langtools/tools/javac/processing/environment/round/BuriedAnnotations.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/BuriedAnnotations.java rename to test/langtools/tools/javac/processing/environment/round/BuriedAnnotations.java diff --git a/langtools/test/tools/javac/processing/environment/round/C1.java b/test/langtools/tools/javac/processing/environment/round/C1.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/C1.java rename to test/langtools/tools/javac/processing/environment/round/C1.java diff --git a/langtools/test/tools/javac/processing/environment/round/C2.java b/test/langtools/tools/javac/processing/environment/round/C2.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/C2.java rename to test/langtools/tools/javac/processing/environment/round/C2.java diff --git a/langtools/test/tools/javac/processing/environment/round/ErroneousAnnotations.java b/test/langtools/tools/javac/processing/environment/round/ErroneousAnnotations.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/ErroneousAnnotations.java rename to test/langtools/tools/javac/processing/environment/round/ErroneousAnnotations.java diff --git a/langtools/test/tools/javac/processing/environment/round/ErroneousAnnotations.out b/test/langtools/tools/javac/processing/environment/round/ErroneousAnnotations.out similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/ErroneousAnnotations.out rename to test/langtools/tools/javac/processing/environment/round/ErroneousAnnotations.out diff --git a/langtools/test/tools/javac/processing/environment/round/Foo.java b/test/langtools/tools/javac/processing/environment/round/Foo.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/Foo.java rename to test/langtools/tools/javac/processing/environment/round/Foo.java diff --git a/langtools/test/tools/javac/processing/environment/round/InheritedAnnotation.java b/test/langtools/tools/javac/processing/environment/round/InheritedAnnotation.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/InheritedAnnotation.java rename to test/langtools/tools/javac/processing/environment/round/InheritedAnnotation.java diff --git a/langtools/test/tools/javac/processing/environment/round/ParameterAnnotations.java b/test/langtools/tools/javac/processing/environment/round/ParameterAnnotations.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/ParameterAnnotations.java rename to test/langtools/tools/javac/processing/environment/round/ParameterAnnotations.java diff --git a/langtools/test/tools/javac/processing/environment/round/Part1.java b/test/langtools/tools/javac/processing/environment/round/Part1.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/Part1.java rename to test/langtools/tools/javac/processing/environment/round/Part1.java diff --git a/langtools/test/tools/javac/processing/environment/round/Part2.java b/test/langtools/tools/javac/processing/environment/round/Part2.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/Part2.java rename to test/langtools/tools/javac/processing/environment/round/Part2.java diff --git a/langtools/test/tools/javac/processing/environment/round/SurfaceAnnotations.java b/test/langtools/tools/javac/processing/environment/round/SurfaceAnnotations.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/SurfaceAnnotations.java rename to test/langtools/tools/javac/processing/environment/round/SurfaceAnnotations.java diff --git a/langtools/test/tools/javac/processing/environment/round/TestContext.java b/test/langtools/tools/javac/processing/environment/round/TestContext.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/TestContext.java rename to test/langtools/tools/javac/processing/environment/round/TestContext.java diff --git a/langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java b/test/langtools/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java rename to test/langtools/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java diff --git a/langtools/test/tools/javac/processing/environment/round/TpAnno.java b/test/langtools/tools/javac/processing/environment/round/TpAnno.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/TpAnno.java rename to test/langtools/tools/javac/processing/environment/round/TpAnno.java diff --git a/langtools/test/tools/javac/processing/environment/round/TypeParameterAnnotations.java b/test/langtools/tools/javac/processing/environment/round/TypeParameterAnnotations.java similarity index 100% rename from langtools/test/tools/javac/processing/environment/round/TypeParameterAnnotations.java rename to test/langtools/tools/javac/processing/environment/round/TypeParameterAnnotations.java diff --git a/langtools/test/tools/javac/processing/errors/CrashOnNonExistingAnnotation/Processor.java b/test/langtools/tools/javac/processing/errors/CrashOnNonExistingAnnotation/Processor.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/CrashOnNonExistingAnnotation/Processor.java rename to test/langtools/tools/javac/processing/errors/CrashOnNonExistingAnnotation/Processor.java diff --git a/langtools/test/tools/javac/processing/errors/CrashOnNonExistingAnnotation/Source.java b/test/langtools/tools/javac/processing/errors/CrashOnNonExistingAnnotation/Source.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/CrashOnNonExistingAnnotation/Source.java rename to test/langtools/tools/javac/processing/errors/CrashOnNonExistingAnnotation/Source.java diff --git a/langtools/test/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Processor.java b/test/langtools/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Processor.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Processor.java rename to test/langtools/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Processor.java diff --git a/langtools/test/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Source.java b/test/langtools/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Source.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Source.java rename to test/langtools/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Source.java diff --git a/langtools/test/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Source.out b/test/langtools/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Source.out similarity index 100% rename from langtools/test/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Source.out rename to test/langtools/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Source.out diff --git a/langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Processor.java b/test/langtools/tools/javac/processing/errors/EnsureMirroredTypeException/Processor.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Processor.java rename to test/langtools/tools/javac/processing/errors/EnsureMirroredTypeException/Processor.java diff --git a/langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Source.java b/test/langtools/tools/javac/processing/errors/EnsureMirroredTypeException/Source.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Source.java rename to test/langtools/tools/javac/processing/errors/EnsureMirroredTypeException/Source.java diff --git a/langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Source.out b/test/langtools/tools/javac/processing/errors/EnsureMirroredTypeException/Source.out similarity index 100% rename from langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Source.out rename to test/langtools/tools/javac/processing/errors/EnsureMirroredTypeException/Source.out diff --git a/langtools/test/tools/javac/processing/errors/Foo.java b/test/langtools/tools/javac/processing/errors/Foo.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/Foo.java rename to test/langtools/tools/javac/processing/errors/Foo.java diff --git a/langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/GenerateFunctionalInterface.java b/test/langtools/tools/javac/processing/errors/StopOnInapplicableAnnotations/GenerateFunctionalInterface.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/GenerateFunctionalInterface.java rename to test/langtools/tools/javac/processing/errors/StopOnInapplicableAnnotations/GenerateFunctionalInterface.java diff --git a/langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/GenerateSuperInterfaceProcessor.java b/test/langtools/tools/javac/processing/errors/StopOnInapplicableAnnotations/GenerateSuperInterfaceProcessor.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/GenerateSuperInterfaceProcessor.java rename to test/langtools/tools/javac/processing/errors/StopOnInapplicableAnnotations/GenerateSuperInterfaceProcessor.java diff --git a/langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/Processor.java b/test/langtools/tools/javac/processing/errors/StopOnInapplicableAnnotations/Processor.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/Processor.java rename to test/langtools/tools/javac/processing/errors/StopOnInapplicableAnnotations/Processor.java diff --git a/langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/Source.java b/test/langtools/tools/javac/processing/errors/StopOnInapplicableAnnotations/Source.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/Source.java rename to test/langtools/tools/javac/processing/errors/StopOnInapplicableAnnotations/Source.java diff --git a/langtools/test/tools/javac/processing/errors/TestBadProcessor.java b/test/langtools/tools/javac/processing/errors/TestBadProcessor.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/TestBadProcessor.java rename to test/langtools/tools/javac/processing/errors/TestBadProcessor.java diff --git a/langtools/test/tools/javac/processing/errors/TestClassNames.java b/test/langtools/tools/javac/processing/errors/TestClassNames.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/TestClassNames.java rename to test/langtools/tools/javac/processing/errors/TestClassNames.java diff --git a/langtools/test/tools/javac/processing/errors/TestErrorCount.java b/test/langtools/tools/javac/processing/errors/TestErrorCount.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/TestErrorCount.java rename to test/langtools/tools/javac/processing/errors/TestErrorCount.java diff --git a/langtools/test/tools/javac/processing/errors/TestErrorCount.out b/test/langtools/tools/javac/processing/errors/TestErrorCount.out similarity index 100% rename from langtools/test/tools/javac/processing/errors/TestErrorCount.out rename to test/langtools/tools/javac/processing/errors/TestErrorCount.out diff --git a/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java b/test/langtools/tools/javac/processing/errors/TestFatalityOfParseErrors.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java rename to test/langtools/tools/javac/processing/errors/TestFatalityOfParseErrors.java diff --git a/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.out b/test/langtools/tools/javac/processing/errors/TestFatalityOfParseErrors.out similarity index 100% rename from langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.out rename to test/langtools/tools/javac/processing/errors/TestFatalityOfParseErrors.out diff --git a/langtools/test/tools/javac/processing/errors/TestOptionSyntaxErrors.java b/test/langtools/tools/javac/processing/errors/TestOptionSyntaxErrors.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/TestOptionSyntaxErrors.java rename to test/langtools/tools/javac/processing/errors/TestOptionSyntaxErrors.java diff --git a/langtools/test/tools/javac/processing/errors/TestParseErrors/ParseErrors.java b/test/langtools/tools/javac/processing/errors/TestParseErrors/ParseErrors.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/TestParseErrors/ParseErrors.java rename to test/langtools/tools/javac/processing/errors/TestParseErrors/ParseErrors.java diff --git a/langtools/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java b/test/langtools/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java rename to test/langtools/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java diff --git a/langtools/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.out b/test/langtools/tools/javac/processing/errors/TestParseErrors/TestParseErrors.out similarity index 100% rename from langtools/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.out rename to test/langtools/tools/javac/processing/errors/TestParseErrors/TestParseErrors.out diff --git a/langtools/test/tools/javac/processing/errors/TestReturnCode.java b/test/langtools/tools/javac/processing/errors/TestReturnCode.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/TestReturnCode.java rename to test/langtools/tools/javac/processing/errors/TestReturnCode.java diff --git a/langtools/test/tools/javac/processing/errors/TestSuppression.java b/test/langtools/tools/javac/processing/errors/TestSuppression.java similarity index 100% rename from langtools/test/tools/javac/processing/errors/TestSuppression.java rename to test/langtools/tools/javac/processing/errors/TestSuppression.java diff --git a/langtools/test/tools/javac/processing/filer/TestFilerConstraints.java b/test/langtools/tools/javac/processing/filer/TestFilerConstraints.java similarity index 100% rename from langtools/test/tools/javac/processing/filer/TestFilerConstraints.java rename to test/langtools/tools/javac/processing/filer/TestFilerConstraints.java diff --git a/langtools/test/tools/javac/processing/filer/TestGetResource.java b/test/langtools/tools/javac/processing/filer/TestGetResource.java similarity index 100% rename from langtools/test/tools/javac/processing/filer/TestGetResource.java rename to test/langtools/tools/javac/processing/filer/TestGetResource.java diff --git a/langtools/test/tools/javac/processing/filer/TestGetResource2.java b/test/langtools/tools/javac/processing/filer/TestGetResource2.java similarity index 100% rename from langtools/test/tools/javac/processing/filer/TestGetResource2.java rename to test/langtools/tools/javac/processing/filer/TestGetResource2.java diff --git a/langtools/test/tools/javac/processing/filer/TestInvalidRelativeNames.java b/test/langtools/tools/javac/processing/filer/TestInvalidRelativeNames.java similarity index 100% rename from langtools/test/tools/javac/processing/filer/TestInvalidRelativeNames.java rename to test/langtools/tools/javac/processing/filer/TestInvalidRelativeNames.java diff --git a/langtools/test/tools/javac/processing/filer/TestLastRound.java b/test/langtools/tools/javac/processing/filer/TestLastRound.java similarity index 100% rename from langtools/test/tools/javac/processing/filer/TestLastRound.java rename to test/langtools/tools/javac/processing/filer/TestLastRound.java diff --git a/langtools/test/tools/javac/processing/filer/TestLastRound.out b/test/langtools/tools/javac/processing/filer/TestLastRound.out similarity index 100% rename from langtools/test/tools/javac/processing/filer/TestLastRound.out rename to test/langtools/tools/javac/processing/filer/TestLastRound.out diff --git a/langtools/test/tools/javac/processing/filer/TestPackageInfo.java b/test/langtools/tools/javac/processing/filer/TestPackageInfo.java similarity index 100% rename from langtools/test/tools/javac/processing/filer/TestPackageInfo.java rename to test/langtools/tools/javac/processing/filer/TestPackageInfo.java diff --git a/langtools/test/tools/javac/processing/filer/TestValidRelativeNames.java b/test/langtools/tools/javac/processing/filer/TestValidRelativeNames.java similarity index 100% rename from langtools/test/tools/javac/processing/filer/TestValidRelativeNames.java rename to test/langtools/tools/javac/processing/filer/TestValidRelativeNames.java diff --git a/langtools/test/tools/javac/processing/filer/foo/Foo.java b/test/langtools/tools/javac/processing/filer/foo/Foo.java similarity index 100% rename from langtools/test/tools/javac/processing/filer/foo/Foo.java rename to test/langtools/tools/javac/processing/filer/foo/Foo.java diff --git a/langtools/test/tools/javac/processing/filer/foo/bar/FuBar.java b/test/langtools/tools/javac/processing/filer/foo/bar/FuBar.java similarity index 100% rename from langtools/test/tools/javac/processing/filer/foo/bar/FuBar.java rename to test/langtools/tools/javac/processing/filer/foo/bar/FuBar.java diff --git a/langtools/test/tools/javac/processing/filer/foo/bar/package-info.java b/test/langtools/tools/javac/processing/filer/foo/bar/package-info.java similarity index 100% rename from langtools/test/tools/javac/processing/filer/foo/bar/package-info.java rename to test/langtools/tools/javac/processing/filer/foo/bar/package-info.java diff --git a/langtools/test/tools/javac/processing/loader/testClose/TestClose.java b/test/langtools/tools/javac/processing/loader/testClose/TestClose.java similarity index 100% rename from langtools/test/tools/javac/processing/loader/testClose/TestClose.java rename to test/langtools/tools/javac/processing/loader/testClose/TestClose.java diff --git a/langtools/test/tools/javac/processing/loader/testClose/TestClose2.java b/test/langtools/tools/javac/processing/loader/testClose/TestClose2.java similarity index 100% rename from langtools/test/tools/javac/processing/loader/testClose/TestClose2.java rename to test/langtools/tools/javac/processing/loader/testClose/TestClose2.java diff --git a/langtools/test/tools/javac/processing/messager/6362067/T6362067.java b/test/langtools/tools/javac/processing/messager/6362067/T6362067.java similarity index 100% rename from langtools/test/tools/javac/processing/messager/6362067/T6362067.java rename to test/langtools/tools/javac/processing/messager/6362067/T6362067.java diff --git a/langtools/test/tools/javac/processing/messager/6362067/T6362067.out b/test/langtools/tools/javac/processing/messager/6362067/T6362067.out similarity index 100% rename from langtools/test/tools/javac/processing/messager/6362067/T6362067.out rename to test/langtools/tools/javac/processing/messager/6362067/T6362067.out diff --git a/langtools/test/tools/javac/processing/messager/6388543/T6388543.java b/test/langtools/tools/javac/processing/messager/6388543/T6388543.java similarity index 100% rename from langtools/test/tools/javac/processing/messager/6388543/T6388543.java rename to test/langtools/tools/javac/processing/messager/6388543/T6388543.java diff --git a/langtools/test/tools/javac/processing/messager/6388543/T6388543.out b/test/langtools/tools/javac/processing/messager/6388543/T6388543.out similarity index 100% rename from langtools/test/tools/javac/processing/messager/6388543/T6388543.out rename to test/langtools/tools/javac/processing/messager/6388543/T6388543.out diff --git a/langtools/test/tools/javac/processing/messager/MessagerBasics.java b/test/langtools/tools/javac/processing/messager/MessagerBasics.java similarity index 100% rename from langtools/test/tools/javac/processing/messager/MessagerBasics.java rename to test/langtools/tools/javac/processing/messager/MessagerBasics.java diff --git a/langtools/test/tools/javac/processing/messager/MessagerBasics.out b/test/langtools/tools/javac/processing/messager/MessagerBasics.out similarity index 100% rename from langtools/test/tools/javac/processing/messager/MessagerBasics.out rename to test/langtools/tools/javac/processing/messager/MessagerBasics.out diff --git a/langtools/test/tools/javac/processing/messager/MessagerDiags.java b/test/langtools/tools/javac/processing/messager/MessagerDiags.java similarity index 100% rename from langtools/test/tools/javac/processing/messager/MessagerDiags.java rename to test/langtools/tools/javac/processing/messager/MessagerDiags.java diff --git a/langtools/test/tools/javac/processing/model/6194785/T6194785.java b/test/langtools/tools/javac/processing/model/6194785/T6194785.java similarity index 100% rename from langtools/test/tools/javac/processing/model/6194785/T6194785.java rename to test/langtools/tools/javac/processing/model/6194785/T6194785.java diff --git a/langtools/test/tools/javac/processing/model/6194785/T6194785a.java b/test/langtools/tools/javac/processing/model/6194785/T6194785a.java similarity index 100% rename from langtools/test/tools/javac/processing/model/6194785/T6194785a.java rename to test/langtools/tools/javac/processing/model/6194785/T6194785a.java diff --git a/langtools/test/tools/javac/processing/model/6341534/T6341534.java b/test/langtools/tools/javac/processing/model/6341534/T6341534.java similarity index 100% rename from langtools/test/tools/javac/processing/model/6341534/T6341534.java rename to test/langtools/tools/javac/processing/model/6341534/T6341534.java diff --git a/langtools/test/tools/javac/processing/model/6341534/dir/Foo.java b/test/langtools/tools/javac/processing/model/6341534/dir/Foo.java similarity index 100% rename from langtools/test/tools/javac/processing/model/6341534/dir/Foo.java rename to test/langtools/tools/javac/processing/model/6341534/dir/Foo.java diff --git a/langtools/test/tools/javac/processing/model/6341534/dir/package-info.java b/test/langtools/tools/javac/processing/model/6341534/dir/package-info.java similarity index 100% rename from langtools/test/tools/javac/processing/model/6341534/dir/package-info.java rename to test/langtools/tools/javac/processing/model/6341534/dir/package-info.java diff --git a/langtools/test/tools/javac/processing/model/LocalClasses/LocalClassesModel.java b/test/langtools/tools/javac/processing/model/LocalClasses/LocalClassesModel.java similarity index 100% rename from langtools/test/tools/javac/processing/model/LocalClasses/LocalClassesModel.java rename to test/langtools/tools/javac/processing/model/LocalClasses/LocalClassesModel.java diff --git a/langtools/test/tools/javac/processing/model/LocalClasses/LocalClassesModel.out b/test/langtools/tools/javac/processing/model/LocalClasses/LocalClassesModel.out similarity index 100% rename from langtools/test/tools/javac/processing/model/LocalClasses/LocalClassesModel.out rename to test/langtools/tools/javac/processing/model/LocalClasses/LocalClassesModel.out diff --git a/langtools/test/tools/javac/processing/model/LocalClasses/LocalTest$1Local.jcod b/test/langtools/tools/javac/processing/model/LocalClasses/LocalTest$1Local.jcod similarity index 100% rename from langtools/test/tools/javac/processing/model/LocalClasses/LocalTest$1Local.jcod rename to test/langtools/tools/javac/processing/model/LocalClasses/LocalTest$1Local.jcod diff --git a/langtools/test/tools/javac/processing/model/LocalClasses/LocalTest$2Local.jcod b/test/langtools/tools/javac/processing/model/LocalClasses/LocalTest$2Local.jcod similarity index 100% rename from langtools/test/tools/javac/processing/model/LocalClasses/LocalTest$2Local.jcod rename to test/langtools/tools/javac/processing/model/LocalClasses/LocalTest$2Local.jcod diff --git a/langtools/test/tools/javac/processing/model/LocalClasses/LocalTest$3Local.jcod b/test/langtools/tools/javac/processing/model/LocalClasses/LocalTest$3Local.jcod similarity index 100% rename from langtools/test/tools/javac/processing/model/LocalClasses/LocalTest$3Local.jcod rename to test/langtools/tools/javac/processing/model/LocalClasses/LocalTest$3Local.jcod diff --git a/langtools/test/tools/javac/processing/model/LocalClasses/LocalTest$4Local.jcod b/test/langtools/tools/javac/processing/model/LocalClasses/LocalTest$4Local.jcod similarity index 100% rename from langtools/test/tools/javac/processing/model/LocalClasses/LocalTest$4Local.jcod rename to test/langtools/tools/javac/processing/model/LocalClasses/LocalTest$4Local.jcod diff --git a/langtools/test/tools/javac/processing/model/LocalClasses/LocalTest$5Local.jcod b/test/langtools/tools/javac/processing/model/LocalClasses/LocalTest$5Local.jcod similarity index 100% rename from langtools/test/tools/javac/processing/model/LocalClasses/LocalTest$5Local.jcod rename to test/langtools/tools/javac/processing/model/LocalClasses/LocalTest$5Local.jcod diff --git a/langtools/test/tools/javac/processing/model/LocalClasses/LocalTest.jcod b/test/langtools/tools/javac/processing/model/LocalClasses/LocalTest.jcod similarity index 100% rename from langtools/test/tools/javac/processing/model/LocalClasses/LocalTest.jcod rename to test/langtools/tools/javac/processing/model/LocalClasses/LocalTest.jcod diff --git a/langtools/test/tools/javac/processing/model/LocalClasses/LocalTest.orign b/test/langtools/tools/javac/processing/model/LocalClasses/LocalTest.orign similarity index 100% rename from langtools/test/tools/javac/processing/model/LocalClasses/LocalTest.orign rename to test/langtools/tools/javac/processing/model/LocalClasses/LocalTest.orign diff --git a/langtools/test/tools/javac/processing/model/LocalInAnonymous.java b/test/langtools/tools/javac/processing/model/LocalInAnonymous.java similarity index 100% rename from langtools/test/tools/javac/processing/model/LocalInAnonymous.java rename to test/langtools/tools/javac/processing/model/LocalInAnonymous.java diff --git a/langtools/test/tools/javac/processing/model/TestExceptions.java b/test/langtools/tools/javac/processing/model/TestExceptions.java similarity index 100% rename from langtools/test/tools/javac/processing/model/TestExceptions.java rename to test/langtools/tools/javac/processing/model/TestExceptions.java diff --git a/langtools/test/tools/javac/processing/model/TestSourceVersion.java b/test/langtools/tools/javac/processing/model/TestSourceVersion.java similarity index 100% rename from langtools/test/tools/javac/processing/model/TestSourceVersion.java rename to test/langtools/tools/javac/processing/model/TestSourceVersion.java diff --git a/langtools/test/tools/javac/processing/model/TestSymtabItems.java b/test/langtools/tools/javac/processing/model/TestSymtabItems.java similarity index 100% rename from langtools/test/tools/javac/processing/model/TestSymtabItems.java rename to test/langtools/tools/javac/processing/model/TestSymtabItems.java diff --git a/langtools/test/tools/javac/processing/model/TestVisitorDefaults.java b/test/langtools/tools/javac/processing/model/TestVisitorDefaults.java similarity index 100% rename from langtools/test/tools/javac/processing/model/TestVisitorDefaults.java rename to test/langtools/tools/javac/processing/model/TestVisitorDefaults.java diff --git a/langtools/test/tools/javac/processing/model/completionfailure/NoAbortForBadClassFile.java b/test/langtools/tools/javac/processing/model/completionfailure/NoAbortForBadClassFile.java similarity index 100% rename from langtools/test/tools/javac/processing/model/completionfailure/NoAbortForBadClassFile.java rename to test/langtools/tools/javac/processing/model/completionfailure/NoAbortForBadClassFile.java diff --git a/langtools/test/tools/javac/processing/model/element/8009367/TestQualifiedNameUsed.java b/test/langtools/tools/javac/processing/model/element/8009367/TestQualifiedNameUsed.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/8009367/TestQualifiedNameUsed.java rename to test/langtools/tools/javac/processing/model/element/8009367/TestQualifiedNameUsed.java diff --git a/langtools/test/tools/javac/processing/model/element/8009367/p/Q.java b/test/langtools/tools/javac/processing/model/element/8009367/p/Q.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/8009367/p/Q.java rename to test/langtools/tools/javac/processing/model/element/8009367/p/Q.java diff --git a/langtools/test/tools/javac/processing/model/element/8009367/p/QQ.java b/test/langtools/tools/javac/processing/model/element/8009367/p/QQ.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/8009367/p/QQ.java rename to test/langtools/tools/javac/processing/model/element/8009367/p/QQ.java diff --git a/langtools/test/tools/javac/processing/model/element/8009367/p/R.java b/test/langtools/tools/javac/processing/model/element/8009367/p/R.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/8009367/p/R.java rename to test/langtools/tools/javac/processing/model/element/8009367/p/R.java diff --git a/langtools/test/tools/javac/processing/model/element/8009367/p/RR.java b/test/langtools/tools/javac/processing/model/element/8009367/p/RR.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/8009367/p/RR.java rename to test/langtools/tools/javac/processing/model/element/8009367/p/RR.java diff --git a/langtools/test/tools/javac/processing/model/element/TestAnonClassNames.java b/test/langtools/tools/javac/processing/model/element/TestAnonClassNames.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestAnonClassNames.java rename to test/langtools/tools/javac/processing/model/element/TestAnonClassNames.java diff --git a/langtools/test/tools/javac/processing/model/element/TestAnonSourceNames.java b/test/langtools/tools/javac/processing/model/element/TestAnonSourceNames.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestAnonSourceNames.java rename to test/langtools/tools/javac/processing/model/element/TestAnonSourceNames.java diff --git a/langtools/test/tools/javac/processing/model/element/TestElement.java b/test/langtools/tools/javac/processing/model/element/TestElement.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestElement.java rename to test/langtools/tools/javac/processing/model/element/TestElement.java diff --git a/langtools/test/tools/javac/processing/model/element/TestEmptyContainer.java b/test/langtools/tools/javac/processing/model/element/TestEmptyContainer.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestEmptyContainer.java rename to test/langtools/tools/javac/processing/model/element/TestEmptyContainer.java diff --git a/langtools/test/tools/javac/processing/model/element/TestExecutableElement.java b/test/langtools/tools/javac/processing/model/element/TestExecutableElement.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestExecutableElement.java rename to test/langtools/tools/javac/processing/model/element/TestExecutableElement.java diff --git a/langtools/test/tools/javac/processing/model/element/TestMissingElement/InvalidSource.java b/test/langtools/tools/javac/processing/model/element/TestMissingElement/InvalidSource.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestMissingElement/InvalidSource.java rename to test/langtools/tools/javac/processing/model/element/TestMissingElement/InvalidSource.java diff --git a/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java b/test/langtools/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java rename to test/langtools/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java diff --git a/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.ref b/test/langtools/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.ref similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.ref rename to test/langtools/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.ref diff --git a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/Generator.java b/test/langtools/tools/javac/processing/model/element/TestMissingElement2/Generator.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestMissingElement2/Generator.java rename to test/langtools/tools/javac/processing/model/element/TestMissingElement2/Generator.java diff --git a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java b/test/langtools/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java rename to test/langtools/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java diff --git a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java b/test/langtools/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java rename to test/langtools/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java diff --git a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java b/test/langtools/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java rename to test/langtools/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java diff --git a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java b/test/langtools/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java rename to test/langtools/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java diff --git a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java b/test/langtools/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java rename to test/langtools/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java diff --git a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java b/test/langtools/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java rename to test/langtools/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java diff --git a/langtools/test/tools/javac/processing/model/element/TestModuleElementNames.java b/test/langtools/tools/javac/processing/model/element/TestModuleElementNames.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestModuleElementNames.java rename to test/langtools/tools/javac/processing/model/element/TestModuleElementNames.java diff --git a/langtools/test/tools/javac/processing/model/element/TestNames.java b/test/langtools/tools/javac/processing/model/element/TestNames.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestNames.java rename to test/langtools/tools/javac/processing/model/element/TestNames.java diff --git a/langtools/test/tools/javac/processing/model/element/TestNonInherited.java b/test/langtools/tools/javac/processing/model/element/TestNonInherited.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestNonInherited.java rename to test/langtools/tools/javac/processing/model/element/TestNonInherited.java diff --git a/langtools/test/tools/javac/processing/model/element/TestOrigin.java b/test/langtools/tools/javac/processing/model/element/TestOrigin.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestOrigin.java rename to test/langtools/tools/javac/processing/model/element/TestOrigin.java diff --git a/langtools/test/tools/javac/processing/model/element/TestPackageElement.java b/test/langtools/tools/javac/processing/model/element/TestPackageElement.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestPackageElement.java rename to test/langtools/tools/javac/processing/model/element/TestPackageElement.java diff --git a/langtools/test/tools/javac/processing/model/element/TestResourceElement.java b/test/langtools/tools/javac/processing/model/element/TestResourceElement.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestResourceElement.java rename to test/langtools/tools/javac/processing/model/element/TestResourceElement.java diff --git a/langtools/test/tools/javac/processing/model/element/TestResourceVariable.java b/test/langtools/tools/javac/processing/model/element/TestResourceVariable.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestResourceVariable.java rename to test/langtools/tools/javac/processing/model/element/TestResourceVariable.java diff --git a/langtools/test/tools/javac/processing/model/element/TestTypeElement.java b/test/langtools/tools/javac/processing/model/element/TestTypeElement.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestTypeElement.java rename to test/langtools/tools/javac/processing/model/element/TestTypeElement.java diff --git a/langtools/test/tools/javac/processing/model/element/TestTypeParameter.java b/test/langtools/tools/javac/processing/model/element/TestTypeParameter.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestTypeParameter.java rename to test/langtools/tools/javac/processing/model/element/TestTypeParameter.java diff --git a/langtools/test/tools/javac/processing/model/element/TestTypeParameterAnnotations.java b/test/langtools/tools/javac/processing/model/element/TestTypeParameterAnnotations.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TestTypeParameterAnnotations.java rename to test/langtools/tools/javac/processing/model/element/TestTypeParameterAnnotations.java diff --git a/langtools/test/tools/javac/processing/model/element/TypeParamBounds.java b/test/langtools/tools/javac/processing/model/element/TypeParamBounds.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/TypeParamBounds.java rename to test/langtools/tools/javac/processing/model/element/TypeParamBounds.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/ElementRepAnnoTester.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/ElementRepAnnoTester.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/ElementRepAnnoTester.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/ElementRepAnnoTester.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerBasicTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerBasicTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerBasicTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerBasicTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA1Test.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA1Test.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA1Test.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA1Test.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA2Test.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA2Test.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA2Test.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA2Test.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB2Test.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB2Test.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB2Test.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB2Test.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerBasicTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerBasicTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerBasicTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerBasicTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerInheritedTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerInheritedTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerInheritedTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerInheritedTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableBasicTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/RepeatableBasicTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableBasicTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/RepeatableBasicTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableInheritedTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/RepeatableInheritedTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableInheritedTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/RepeatableInheritedTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerBasicTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerBasicTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerBasicTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerBasicTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularBasicTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/SingularBasicTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularBasicTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/SingularBasicTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedATest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedATest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedATest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedATest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedBTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedBTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedBTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedBTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerBasicTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerBasicTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerBasicTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerBasicTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerInheritedTest.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerInheritedTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerInheritedTest.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerInheritedTest.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/Bar.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/Bar.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/Bar.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/Bar.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarContainer.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarContainer.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarContainer.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarContainer.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarContainerContainer.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarContainerContainer.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarContainerContainer.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarContainerContainer.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInherited.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInherited.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInherited.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInherited.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInheritedContainer.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInheritedContainer.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInheritedContainer.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInheritedContainer.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInheritedContainerContainer.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInheritedContainerContainer.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInheritedContainerContainer.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/BarInheritedContainerContainer.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/ExpectedBase.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/ExpectedBase.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/ExpectedBase.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/ExpectedBase.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/ExpectedContainer.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/ExpectedContainer.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/ExpectedContainer.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/ExpectedContainer.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/Foo.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/Foo.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/Foo.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/Foo.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/FooInherited.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/FooInherited.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/FooInherited.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/FooInherited.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/UnofficialContainer.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/UnofficialContainer.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/UnofficialContainer.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/UnofficialContainer.java diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/UnofficialInheritedContainer.java b/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/UnofficialInheritedContainer.java similarity index 100% rename from langtools/test/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/UnofficialInheritedContainer.java rename to test/langtools/tools/javac/processing/model/element/repeatingAnnotations/supportingAnnotations/UnofficialInheritedContainer.java diff --git a/langtools/test/tools/javac/processing/model/inheritedByType/EnsureOrder.java b/test/langtools/tools/javac/processing/model/inheritedByType/EnsureOrder.java similarity index 100% rename from langtools/test/tools/javac/processing/model/inheritedByType/EnsureOrder.java rename to test/langtools/tools/javac/processing/model/inheritedByType/EnsureOrder.java diff --git a/langtools/test/tools/javac/processing/model/nestedTypeVars/NestedTypeVars.java b/test/langtools/tools/javac/processing/model/nestedTypeVars/NestedTypeVars.java similarity index 100% rename from langtools/test/tools/javac/processing/model/nestedTypeVars/NestedTypeVars.java rename to test/langtools/tools/javac/processing/model/nestedTypeVars/NestedTypeVars.java diff --git a/langtools/test/tools/javac/processing/model/nestedTypeVars/NestedTypeVars.out b/test/langtools/tools/javac/processing/model/nestedTypeVars/NestedTypeVars.out similarity index 100% rename from langtools/test/tools/javac/processing/model/nestedTypeVars/NestedTypeVars.out rename to test/langtools/tools/javac/processing/model/nestedTypeVars/NestedTypeVars.out diff --git a/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java b/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java similarity index 100% rename from langtools/test/tools/javac/processing/model/testgetallmembers/Main.java rename to test/langtools/tools/javac/processing/model/testgetallmembers/Main.java diff --git a/langtools/test/tools/javac/processing/model/trees/BrokenEnumConstructor.java b/test/langtools/tools/javac/processing/model/trees/BrokenEnumConstructor.java similarity index 100% rename from langtools/test/tools/javac/processing/model/trees/BrokenEnumConstructor.java rename to test/langtools/tools/javac/processing/model/trees/BrokenEnumConstructor.java diff --git a/langtools/test/tools/javac/processing/model/trees/BrokenEnumConstructor.out b/test/langtools/tools/javac/processing/model/trees/BrokenEnumConstructor.out similarity index 100% rename from langtools/test/tools/javac/processing/model/trees/BrokenEnumConstructor.out rename to test/langtools/tools/javac/processing/model/trees/BrokenEnumConstructor.out diff --git a/langtools/test/tools/javac/processing/model/trees/OnDemandAttribution.java b/test/langtools/tools/javac/processing/model/trees/OnDemandAttribution.java similarity index 100% rename from langtools/test/tools/javac/processing/model/trees/OnDemandAttribution.java rename to test/langtools/tools/javac/processing/model/trees/OnDemandAttribution.java diff --git a/langtools/test/tools/javac/processing/model/trees/OnDemandAttributionData.java b/test/langtools/tools/javac/processing/model/trees/OnDemandAttributionData.java similarity index 100% rename from langtools/test/tools/javac/processing/model/trees/OnDemandAttributionData.java rename to test/langtools/tools/javac/processing/model/trees/OnDemandAttributionData.java diff --git a/langtools/test/tools/javac/processing/model/type/BasicAnnoTests.java b/test/langtools/tools/javac/processing/model/type/BasicAnnoTests.java similarity index 100% rename from langtools/test/tools/javac/processing/model/type/BasicAnnoTests.java rename to test/langtools/tools/javac/processing/model/type/BasicAnnoTests.java diff --git a/langtools/test/tools/javac/processing/model/type/BoundsTest.java b/test/langtools/tools/javac/processing/model/type/BoundsTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/type/BoundsTest.java rename to test/langtools/tools/javac/processing/model/type/BoundsTest.java diff --git a/langtools/test/tools/javac/processing/model/type/InheritedAP.java b/test/langtools/tools/javac/processing/model/type/InheritedAP.java similarity index 100% rename from langtools/test/tools/javac/processing/model/type/InheritedAP.java rename to test/langtools/tools/javac/processing/model/type/InheritedAP.java diff --git a/langtools/test/tools/javac/processing/model/type/IntersectionPropertiesTest.java b/test/langtools/tools/javac/processing/model/type/IntersectionPropertiesTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/type/IntersectionPropertiesTest.java rename to test/langtools/tools/javac/processing/model/type/IntersectionPropertiesTest.java diff --git a/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/NpeTest.java b/test/langtools/tools/javac/processing/model/type/MirroredTypeEx/NpeTest.java similarity index 100% rename from langtools/test/tools/javac/processing/model/type/MirroredTypeEx/NpeTest.java rename to test/langtools/tools/javac/processing/model/type/MirroredTypeEx/NpeTest.java diff --git a/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java b/test/langtools/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java similarity index 100% rename from langtools/test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java rename to test/langtools/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java diff --git a/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java b/test/langtools/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java similarity index 100% rename from langtools/test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java rename to test/langtools/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java diff --git a/langtools/test/tools/javac/processing/model/type/NoTypes.java b/test/langtools/tools/javac/processing/model/type/NoTypes.java similarity index 100% rename from langtools/test/tools/javac/processing/model/type/NoTypes.java rename to test/langtools/tools/javac/processing/model/type/NoTypes.java diff --git a/langtools/test/tools/javac/processing/model/type/TestTypeKind.java b/test/langtools/tools/javac/processing/model/type/TestTypeKind.java similarity index 100% rename from langtools/test/tools/javac/processing/model/type/TestTypeKind.java rename to test/langtools/tools/javac/processing/model/type/TestTypeKind.java diff --git a/langtools/test/tools/javac/processing/model/type/TestUnionType.java b/test/langtools/tools/javac/processing/model/type/TestUnionType.java similarity index 100% rename from langtools/test/tools/javac/processing/model/type/TestUnionType.java rename to test/langtools/tools/javac/processing/model/type/TestUnionType.java diff --git a/langtools/test/tools/javac/processing/model/util/BinaryName.java b/test/langtools/tools/javac/processing/model/util/BinaryName.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/BinaryName.java rename to test/langtools/tools/javac/processing/model/util/BinaryName.java diff --git a/langtools/test/tools/javac/processing/model/util/DirectSuperOfInt.java b/test/langtools/tools/javac/processing/model/util/DirectSuperOfInt.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/DirectSuperOfInt.java rename to test/langtools/tools/javac/processing/model/util/DirectSuperOfInt.java diff --git a/langtools/test/tools/javac/processing/model/util/GetTypeElemBadArg.java b/test/langtools/tools/javac/processing/model/util/GetTypeElemBadArg.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/GetTypeElemBadArg.java rename to test/langtools/tools/javac/processing/model/util/GetTypeElemBadArg.java diff --git a/langtools/test/tools/javac/processing/model/util/NoSupers.java b/test/langtools/tools/javac/processing/model/util/NoSupers.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/NoSupers.java rename to test/langtools/tools/javac/processing/model/util/NoSupers.java diff --git a/langtools/test/tools/javac/processing/model/util/OverridesSpecEx.java b/test/langtools/tools/javac/processing/model/util/OverridesSpecEx.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/OverridesSpecEx.java rename to test/langtools/tools/javac/processing/model/util/OverridesSpecEx.java diff --git a/langtools/test/tools/javac/processing/model/util/Superless.java b/test/langtools/tools/javac/processing/model/util/Superless.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/Superless.java rename to test/langtools/tools/javac/processing/model/util/Superless.java diff --git a/langtools/test/tools/javac/processing/model/util/TestIntersectionTypeVisitors.java b/test/langtools/tools/javac/processing/model/util/TestIntersectionTypeVisitors.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/TestIntersectionTypeVisitors.java rename to test/langtools/tools/javac/processing/model/util/TestIntersectionTypeVisitors.java diff --git a/langtools/test/tools/javac/processing/model/util/TypesBadArg.java b/test/langtools/tools/javac/processing/model/util/TypesBadArg.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/TypesBadArg.java rename to test/langtools/tools/javac/processing/model/util/TypesBadArg.java diff --git a/langtools/test/tools/javac/processing/model/util/deprecation/Dep1.java b/test/langtools/tools/javac/processing/model/util/deprecation/Dep1.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/deprecation/Dep1.java rename to test/langtools/tools/javac/processing/model/util/deprecation/Dep1.java diff --git a/langtools/test/tools/javac/processing/model/util/deprecation/ExpectedDeprecation.java b/test/langtools/tools/javac/processing/model/util/deprecation/ExpectedDeprecation.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/deprecation/ExpectedDeprecation.java rename to test/langtools/tools/javac/processing/model/util/deprecation/ExpectedDeprecation.java diff --git a/langtools/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java b/test/langtools/tools/javac/processing/model/util/deprecation/TestDeprecation.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java rename to test/langtools/tools/javac/processing/model/util/deprecation/TestDeprecation.java diff --git a/langtools/test/tools/javac/processing/model/util/directSupersOfErr/C1.java b/test/langtools/tools/javac/processing/model/util/directSupersOfErr/C1.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/directSupersOfErr/C1.java rename to test/langtools/tools/javac/processing/model/util/directSupersOfErr/C1.java diff --git a/langtools/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java b/test/langtools/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java rename to test/langtools/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java diff --git a/langtools/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.ref b/test/langtools/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.ref similarity index 100% rename from langtools/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.ref rename to test/langtools/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.ref diff --git a/langtools/test/tools/javac/processing/model/util/elements/Foo.java b/test/langtools/tools/javac/processing/model/util/elements/Foo.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/Foo.java rename to test/langtools/tools/javac/processing/model/util/elements/Foo.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/TestAllFoos.java b/test/langtools/tools/javac/processing/model/util/elements/TestAllFoos.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/TestAllFoos.java rename to test/langtools/tools/javac/processing/model/util/elements/TestAllFoos.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java b/test/langtools/tools/javac/processing/model/util/elements/TestGetConstantExpression.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java rename to test/langtools/tools/javac/processing/model/util/elements/TestGetConstantExpression.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/TestGetPackageOf.java b/test/langtools/tools/javac/processing/model/util/elements/TestGetPackageOf.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/TestGetPackageOf.java rename to test/langtools/tools/javac/processing/model/util/elements/TestGetPackageOf.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/TestIsFunctionalInterface.java b/test/langtools/tools/javac/processing/model/util/elements/TestIsFunctionalInterface.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/TestIsFunctionalInterface.java rename to test/langtools/tools/javac/processing/model/util/elements/TestIsFunctionalInterface.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/VacuousEnum.java b/test/langtools/tools/javac/processing/model/util/elements/VacuousEnum.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/VacuousEnum.java rename to test/langtools/tools/javac/processing/model/util/elements/VacuousEnum.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/doccomments/TestDocComments.java b/test/langtools/tools/javac/processing/model/util/elements/doccomments/TestDocComments.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/doccomments/TestDocComments.java rename to test/langtools/tools/javac/processing/model/util/elements/doccomments/TestDocComments.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/doccomments/TestPackageInfoComments.java b/test/langtools/tools/javac/processing/model/util/elements/doccomments/TestPackageInfoComments.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/doccomments/TestPackageInfoComments.java rename to test/langtools/tools/javac/processing/model/util/elements/doccomments/TestPackageInfoComments.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/doccomments/a/First.java b/test/langtools/tools/javac/processing/model/util/elements/doccomments/a/First.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/doccomments/a/First.java rename to test/langtools/tools/javac/processing/model/util/elements/doccomments/a/First.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/doccomments/p/package-info.java b/test/langtools/tools/javac/processing/model/util/elements/doccomments/p/package-info.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/doccomments/p/package-info.java rename to test/langtools/tools/javac/processing/model/util/elements/doccomments/p/package-info.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/doccomments/z/Last.java b/test/langtools/tools/javac/processing/model/util/elements/doccomments/z/Last.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/doccomments/z/Last.java rename to test/langtools/tools/javac/processing/model/util/elements/doccomments/z/Last.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/modules/m1/module-info.java b/test/langtools/tools/javac/processing/model/util/elements/modules/m1/module-info.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/modules/m1/module-info.java rename to test/langtools/tools/javac/processing/model/util/elements/modules/m1/module-info.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/modules/m1/pkg/C.java b/test/langtools/tools/javac/processing/model/util/elements/modules/m1/pkg/C.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/modules/m1/pkg/C.java rename to test/langtools/tools/javac/processing/model/util/elements/modules/m1/pkg/C.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/modules/m1/pkg/package-info.java b/test/langtools/tools/javac/processing/model/util/elements/modules/m1/pkg/package-info.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/modules/m1/pkg/package-info.java rename to test/langtools/tools/javac/processing/model/util/elements/modules/m1/pkg/package-info.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/modules/m2/module-info.java b/test/langtools/tools/javac/processing/model/util/elements/modules/m2/module-info.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/modules/m2/module-info.java rename to test/langtools/tools/javac/processing/model/util/elements/modules/m2/module-info.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/modules/m2/pkg/C.java b/test/langtools/tools/javac/processing/model/util/elements/modules/m2/pkg/C.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/modules/m2/pkg/C.java rename to test/langtools/tools/javac/processing/model/util/elements/modules/m2/pkg/C.java diff --git a/langtools/test/tools/javac/processing/model/util/elements/modules/m2/pkg/package-info.java b/test/langtools/tools/javac/processing/model/util/elements/modules/m2/pkg/package-info.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/elements/modules/m2/pkg/package-info.java rename to test/langtools/tools/javac/processing/model/util/elements/modules/m2/pkg/package-info.java diff --git a/langtools/test/tools/javac/processing/model/util/filter/ExpectedElementCounts.java b/test/langtools/tools/javac/processing/model/util/filter/ExpectedElementCounts.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/filter/ExpectedElementCounts.java rename to test/langtools/tools/javac/processing/model/util/filter/ExpectedElementCounts.java diff --git a/langtools/test/tools/javac/processing/model/util/filter/Foo1.java b/test/langtools/tools/javac/processing/model/util/filter/Foo1.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/filter/Foo1.java rename to test/langtools/tools/javac/processing/model/util/filter/Foo1.java diff --git a/langtools/test/tools/javac/processing/model/util/filter/TestIterables.java b/test/langtools/tools/javac/processing/model/util/filter/TestIterables.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/filter/TestIterables.java rename to test/langtools/tools/javac/processing/model/util/filter/TestIterables.java diff --git a/langtools/test/tools/javac/processing/model/util/printing/module-info.java b/test/langtools/tools/javac/processing/model/util/printing/module-info.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/printing/module-info.java rename to test/langtools/tools/javac/processing/model/util/printing/module-info.java diff --git a/langtools/test/tools/javac/processing/model/util/printing/module-info.out b/test/langtools/tools/javac/processing/model/util/printing/module-info.out similarity index 100% rename from langtools/test/tools/javac/processing/model/util/printing/module-info.out rename to test/langtools/tools/javac/processing/model/util/printing/module-info.out diff --git a/langtools/test/tools/javac/processing/model/util/printing/p/P.java b/test/langtools/tools/javac/processing/model/util/printing/p/P.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/printing/p/P.java rename to test/langtools/tools/javac/processing/model/util/printing/p/P.java diff --git a/langtools/test/tools/javac/processing/model/util/types/TestPseudoTypeHandling.java b/test/langtools/tools/javac/processing/model/util/types/TestPseudoTypeHandling.java similarity index 100% rename from langtools/test/tools/javac/processing/model/util/types/TestPseudoTypeHandling.java rename to test/langtools/tools/javac/processing/model/util/types/TestPseudoTypeHandling.java diff --git a/langtools/test/tools/javac/processing/options/TestImplicitNone.java b/test/langtools/tools/javac/processing/options/TestImplicitNone.java similarity index 100% rename from langtools/test/tools/javac/processing/options/TestImplicitNone.java rename to test/langtools/tools/javac/processing/options/TestImplicitNone.java diff --git a/langtools/test/tools/javac/processing/options/Xprint.java b/test/langtools/tools/javac/processing/options/Xprint.java similarity index 100% rename from langtools/test/tools/javac/processing/options/Xprint.java rename to test/langtools/tools/javac/processing/options/Xprint.java diff --git a/langtools/test/tools/javac/processing/options/XprintDocComments.java b/test/langtools/tools/javac/processing/options/XprintDocComments.java similarity index 100% rename from langtools/test/tools/javac/processing/options/XprintDocComments.java rename to test/langtools/tools/javac/processing/options/XprintDocComments.java diff --git a/langtools/test/tools/javac/processing/options/XprintDocComments.out b/test/langtools/tools/javac/processing/options/XprintDocComments.out similarity index 100% rename from langtools/test/tools/javac/processing/options/XprintDocComments.out rename to test/langtools/tools/javac/processing/options/XprintDocComments.out diff --git a/langtools/test/tools/javac/processing/options/testCommandLineClasses/Test.java b/test/langtools/tools/javac/processing/options/testCommandLineClasses/Test.java similarity index 100% rename from langtools/test/tools/javac/processing/options/testCommandLineClasses/Test.java rename to test/langtools/tools/javac/processing/options/testCommandLineClasses/Test.java diff --git a/langtools/test/tools/javac/processing/options/testCommandLineClasses/p/NestedExamples.java b/test/langtools/tools/javac/processing/options/testCommandLineClasses/p/NestedExamples.java similarity index 100% rename from langtools/test/tools/javac/processing/options/testCommandLineClasses/p/NestedExamples.java rename to test/langtools/tools/javac/processing/options/testCommandLineClasses/p/NestedExamples.java diff --git a/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.java b/test/langtools/tools/javac/processing/options/testPrintProcessorInfo/Test.java similarity index 100% rename from langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.java rename to test/langtools/tools/javac/processing/options/testPrintProcessorInfo/Test.java diff --git a/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.out b/test/langtools/tools/javac/processing/options/testPrintProcessorInfo/Test.out similarity index 100% rename from langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.out rename to test/langtools/tools/javac/processing/options/testPrintProcessorInfo/Test.out diff --git a/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java b/test/langtools/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java similarity index 100% rename from langtools/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java rename to test/langtools/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java diff --git a/langtools/test/tools/javac/processing/rounds/BaseClassesNotReRead.java b/test/langtools/tools/javac/processing/rounds/BaseClassesNotReRead.java similarity index 100% rename from langtools/test/tools/javac/processing/rounds/BaseClassesNotReRead.java rename to test/langtools/tools/javac/processing/rounds/BaseClassesNotReRead.java diff --git a/langtools/test/tools/javac/processing/rounds/BaseClassesNotReReadSource.java b/test/langtools/tools/javac/processing/rounds/BaseClassesNotReReadSource.java similarity index 100% rename from langtools/test/tools/javac/processing/rounds/BaseClassesNotReReadSource.java rename to test/langtools/tools/javac/processing/rounds/BaseClassesNotReReadSource.java diff --git a/langtools/test/tools/javac/processing/rounds/ClassDependingOnGenerated.java b/test/langtools/tools/javac/processing/rounds/ClassDependingOnGenerated.java similarity index 100% rename from langtools/test/tools/javac/processing/rounds/ClassDependingOnGenerated.java rename to test/langtools/tools/javac/processing/rounds/ClassDependingOnGenerated.java diff --git a/langtools/test/tools/javac/processing/rounds/ClassDependingOnGeneratedSource.java b/test/langtools/tools/javac/processing/rounds/ClassDependingOnGeneratedSource.java similarity index 100% rename from langtools/test/tools/javac/processing/rounds/ClassDependingOnGeneratedSource.java rename to test/langtools/tools/javac/processing/rounds/ClassDependingOnGeneratedSource.java diff --git a/langtools/test/tools/javac/processing/rounds/ClassWithSuperType.java b/test/langtools/tools/javac/processing/rounds/ClassWithSuperType.java similarity index 100% rename from langtools/test/tools/javac/processing/rounds/ClassWithSuperType.java rename to test/langtools/tools/javac/processing/rounds/ClassWithSuperType.java diff --git a/langtools/test/tools/javac/processing/rounds/CompleteOnClosed.java b/test/langtools/tools/javac/processing/rounds/CompleteOnClosed.java similarity index 100% rename from langtools/test/tools/javac/processing/rounds/CompleteOnClosed.java rename to test/langtools/tools/javac/processing/rounds/CompleteOnClosed.java diff --git a/langtools/test/tools/javac/processing/rounds/CompleteOnClosedOther.java b/test/langtools/tools/javac/processing/rounds/CompleteOnClosedOther.java similarity index 100% rename from langtools/test/tools/javac/processing/rounds/CompleteOnClosedOther.java rename to test/langtools/tools/javac/processing/rounds/CompleteOnClosedOther.java diff --git a/langtools/test/tools/javac/processing/rounds/MethodsDroppedBetweenRounds.java b/test/langtools/tools/javac/processing/rounds/MethodsDroppedBetweenRounds.java similarity index 100% rename from langtools/test/tools/javac/processing/rounds/MethodsDroppedBetweenRounds.java rename to test/langtools/tools/javac/processing/rounds/MethodsDroppedBetweenRounds.java diff --git a/langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java b/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations.java similarity index 100% rename from langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java rename to test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations.java diff --git a/langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilationsSource.java b/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilationsSource.java similarity index 100% rename from langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilationsSource.java rename to test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilationsSource.java diff --git a/langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations_1.out b/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_1.out similarity index 100% rename from langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations_1.out rename to test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_1.out diff --git a/langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations_2.out b/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_2.out similarity index 100% rename from langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations_2.out rename to test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_2.out diff --git a/langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations_3.out b/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_3.out similarity index 100% rename from langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations_3.out rename to test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_3.out diff --git a/langtools/test/tools/javac/processing/rounds/TypesCachesCleared.java b/test/langtools/tools/javac/processing/rounds/TypesCachesCleared.java similarity index 100% rename from langtools/test/tools/javac/processing/rounds/TypesCachesCleared.java rename to test/langtools/tools/javac/processing/rounds/TypesCachesCleared.java diff --git a/langtools/test/tools/javac/processing/warnings/HelloWorld.java b/test/langtools/tools/javac/processing/warnings/HelloWorld.java similarity index 100% rename from langtools/test/tools/javac/processing/warnings/HelloWorld.java rename to test/langtools/tools/javac/processing/warnings/HelloWorld.java diff --git a/langtools/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java b/test/langtools/tools/javac/processing/warnings/TestSourceVersionWarnings.java similarity index 100% rename from langtools/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java rename to test/langtools/tools/javac/processing/warnings/TestSourceVersionWarnings.java diff --git a/langtools/test/tools/javac/processing/warnings/UseImplicit/C1.java b/test/langtools/tools/javac/processing/warnings/UseImplicit/C1.java similarity index 100% rename from langtools/test/tools/javac/processing/warnings/UseImplicit/C1.java rename to test/langtools/tools/javac/processing/warnings/UseImplicit/C1.java diff --git a/langtools/test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java b/test/langtools/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java similarity index 100% rename from langtools/test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java rename to test/langtools/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java diff --git a/langtools/test/tools/javac/processing/warnings/UseImplicit/err.out b/test/langtools/tools/javac/processing/warnings/UseImplicit/err.out similarity index 100% rename from langtools/test/tools/javac/processing/warnings/UseImplicit/err.out rename to test/langtools/tools/javac/processing/warnings/UseImplicit/err.out diff --git a/langtools/test/tools/javac/processing/warnings/UseImplicit/p/C2.java b/test/langtools/tools/javac/processing/warnings/UseImplicit/p/C2.java similarity index 100% rename from langtools/test/tools/javac/processing/warnings/UseImplicit/p/C2.java rename to test/langtools/tools/javac/processing/warnings/UseImplicit/p/C2.java diff --git a/langtools/test/tools/javac/processing/warnings/UseImplicit/warn.out b/test/langtools/tools/javac/processing/warnings/UseImplicit/warn.out similarity index 100% rename from langtools/test/tools/javac/processing/warnings/UseImplicit/warn.out rename to test/langtools/tools/javac/processing/warnings/UseImplicit/warn.out diff --git a/langtools/test/tools/javac/processing/warnings/gold_0.out b/test/langtools/tools/javac/processing/warnings/gold_0.out similarity index 100% rename from langtools/test/tools/javac/processing/warnings/gold_0.out rename to test/langtools/tools/javac/processing/warnings/gold_0.out diff --git a/langtools/test/tools/javac/processing/warnings/gold_sv_none.out b/test/langtools/tools/javac/processing/warnings/gold_sv_none.out similarity index 100% rename from langtools/test/tools/javac/processing/warnings/gold_sv_none.out rename to test/langtools/tools/javac/processing/warnings/gold_sv_none.out diff --git a/langtools/test/tools/javac/processing/warnings/gold_sv_warn_5_6.out b/test/langtools/tools/javac/processing/warnings/gold_sv_warn_5_6.out similarity index 100% rename from langtools/test/tools/javac/processing/warnings/gold_sv_warn_5_6.out rename to test/langtools/tools/javac/processing/warnings/gold_sv_warn_5_6.out diff --git a/langtools/test/tools/javac/processing/warnings/gold_unsp_warn.out b/test/langtools/tools/javac/processing/warnings/gold_unsp_warn.out similarity index 100% rename from langtools/test/tools/javac/processing/warnings/gold_unsp_warn.out rename to test/langtools/tools/javac/processing/warnings/gold_unsp_warn.out diff --git a/langtools/test/tools/javac/processing/werror/WError1.java b/test/langtools/tools/javac/processing/werror/WError1.java similarity index 100% rename from langtools/test/tools/javac/processing/werror/WError1.java rename to test/langtools/tools/javac/processing/werror/WError1.java diff --git a/langtools/test/tools/javac/processing/werror/WError1.out b/test/langtools/tools/javac/processing/werror/WError1.out similarity index 100% rename from langtools/test/tools/javac/processing/werror/WError1.out rename to test/langtools/tools/javac/processing/werror/WError1.out diff --git a/langtools/test/tools/javac/processing/werror/WErrorGen.java b/test/langtools/tools/javac/processing/werror/WErrorGen.java similarity index 100% rename from langtools/test/tools/javac/processing/werror/WErrorGen.java rename to test/langtools/tools/javac/processing/werror/WErrorGen.java diff --git a/langtools/test/tools/javac/processing/werror/WErrorGen.out b/test/langtools/tools/javac/processing/werror/WErrorGen.out similarity index 100% rename from langtools/test/tools/javac/processing/werror/WErrorGen.out rename to test/langtools/tools/javac/processing/werror/WErrorGen.out diff --git a/langtools/test/tools/javac/processing/werror/WErrorLast.java b/test/langtools/tools/javac/processing/werror/WErrorLast.java similarity index 100% rename from langtools/test/tools/javac/processing/werror/WErrorLast.java rename to test/langtools/tools/javac/processing/werror/WErrorLast.java diff --git a/langtools/test/tools/javac/processing/werror/WErrorLast.out b/test/langtools/tools/javac/processing/werror/WErrorLast.out similarity index 100% rename from langtools/test/tools/javac/processing/werror/WErrorLast.out rename to test/langtools/tools/javac/processing/werror/WErrorLast.out diff --git a/langtools/test/tools/javac/profiles/ProfileOptionTest.java b/test/langtools/tools/javac/profiles/ProfileOptionTest.java similarity index 100% rename from langtools/test/tools/javac/profiles/ProfileOptionTest.java rename to test/langtools/tools/javac/profiles/ProfileOptionTest.java diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedAccess_1.java b/test/langtools/tools/javac/protectedAccess/ProtectedAccess_1.java similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedAccess_1.java rename to test/langtools/tools/javac/protectedAccess/ProtectedAccess_1.java diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedAccess_2.java b/test/langtools/tools/javac/protectedAccess/ProtectedAccess_2.java similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedAccess_2.java rename to test/langtools/tools/javac/protectedAccess/ProtectedAccess_2.java diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedAccess_3.java b/test/langtools/tools/javac/protectedAccess/ProtectedAccess_3.java similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedAccess_3.java rename to test/langtools/tools/javac/protectedAccess/ProtectedAccess_3.java diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess1.java b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess1.java similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess1.java rename to test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess1.java diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess2.java b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess2.java similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess2.java rename to test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess2.java diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess2.out b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess2.out similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess2.out rename to test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess2.out diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess3.java b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess3.java similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess3.java rename to test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess3.java diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess3.out b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess3.out similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess3.out rename to test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess3.out diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess4.java b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess4.java similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess4.java rename to test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess4.java diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess4.out b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess4.out similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess4.out rename to test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess4.out diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess5/Main.java b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess5/Main.java similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess5/Main.java rename to test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess5/Main.java diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess5/z1/Z1.java b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess5/z1/Z1.java similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess5/z1/Z1.java rename to test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess5/z1/Z1.java diff --git a/langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess5/z2/Z2.java b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess5/z2/Z2.java similarity index 100% rename from langtools/test/tools/javac/protectedAccess/ProtectedMemberAccess5/z2/Z2.java rename to test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess5/z2/Z2.java diff --git a/langtools/test/tools/javac/protectedAccess/p/SuperClass.java b/test/langtools/tools/javac/protectedAccess/p/SuperClass.java similarity index 100% rename from langtools/test/tools/javac/protectedAccess/p/SuperClass.java rename to test/langtools/tools/javac/protectedAccess/p/SuperClass.java diff --git a/langtools/test/tools/javac/protectedAccess/pkg/SuperClass.java b/test/langtools/tools/javac/protectedAccess/pkg/SuperClass.java similarity index 100% rename from langtools/test/tools/javac/protectedAccess/pkg/SuperClass.java rename to test/langtools/tools/javac/protectedAccess/pkg/SuperClass.java diff --git a/langtools/test/tools/javac/protectedInner/AnonInnerClass.java b/test/langtools/tools/javac/protectedInner/AnonInnerClass.java similarity index 100% rename from langtools/test/tools/javac/protectedInner/AnonInnerClass.java rename to test/langtools/tools/javac/protectedInner/AnonInnerClass.java diff --git a/langtools/test/tools/javac/protectedInner/InnerClass.java b/test/langtools/tools/javac/protectedInner/InnerClass.java similarity index 100% rename from langtools/test/tools/javac/protectedInner/InnerClass.java rename to test/langtools/tools/javac/protectedInner/InnerClass.java diff --git a/langtools/test/tools/javac/protectedInner/Outerclass.java b/test/langtools/tools/javac/protectedInner/Outerclass.java similarity index 100% rename from langtools/test/tools/javac/protectedInner/Outerclass.java rename to test/langtools/tools/javac/protectedInner/Outerclass.java diff --git a/langtools/test/tools/javac/protectedInner/mypackage/Superclass.java b/test/langtools/tools/javac/protectedInner/mypackage/Superclass.java similarity index 100% rename from langtools/test/tools/javac/protectedInner/mypackage/Superclass.java rename to test/langtools/tools/javac/protectedInner/mypackage/Superclass.java diff --git a/langtools/test/tools/javac/protectedInner/pkg1/Base.java b/test/langtools/tools/javac/protectedInner/pkg1/Base.java similarity index 100% rename from langtools/test/tools/javac/protectedInner/pkg1/Base.java rename to test/langtools/tools/javac/protectedInner/pkg1/Base.java diff --git a/langtools/test/tools/javac/protectedInner/pkg2/Sub.java b/test/langtools/tools/javac/protectedInner/pkg2/Sub.java similarity index 100% rename from langtools/test/tools/javac/protectedInner/pkg2/Sub.java rename to test/langtools/tools/javac/protectedInner/pkg2/Sub.java diff --git a/langtools/test/tools/javac/quid/T6999438.java b/test/langtools/tools/javac/quid/T6999438.java similarity index 100% rename from langtools/test/tools/javac/quid/T6999438.java rename to test/langtools/tools/javac/quid/T6999438.java diff --git a/langtools/test/tools/javac/quid/T6999438.out b/test/langtools/tools/javac/quid/T6999438.out similarity index 100% rename from langtools/test/tools/javac/quid/T6999438.out rename to test/langtools/tools/javac/quid/T6999438.out diff --git a/langtools/test/tools/javac/rawDiags/Error.java b/test/langtools/tools/javac/rawDiags/Error.java similarity index 100% rename from langtools/test/tools/javac/rawDiags/Error.java rename to test/langtools/tools/javac/rawDiags/Error.java diff --git a/langtools/test/tools/javac/rawDiags/Error.out b/test/langtools/tools/javac/rawDiags/Error.out similarity index 100% rename from langtools/test/tools/javac/rawDiags/Error.out rename to test/langtools/tools/javac/rawDiags/Error.out diff --git a/langtools/test/tools/javac/rawDiags/Note.java b/test/langtools/tools/javac/rawDiags/Note.java similarity index 100% rename from langtools/test/tools/javac/rawDiags/Note.java rename to test/langtools/tools/javac/rawDiags/Note.java diff --git a/langtools/test/tools/javac/rawDiags/Note.out b/test/langtools/tools/javac/rawDiags/Note.out similarity index 100% rename from langtools/test/tools/javac/rawDiags/Note.out rename to test/langtools/tools/javac/rawDiags/Note.out diff --git a/langtools/test/tools/javac/rawDiags/Warning.java b/test/langtools/tools/javac/rawDiags/Warning.java similarity index 100% rename from langtools/test/tools/javac/rawDiags/Warning.java rename to test/langtools/tools/javac/rawDiags/Warning.java diff --git a/langtools/test/tools/javac/rawDiags/Warning.out b/test/langtools/tools/javac/rawDiags/Warning.out similarity index 100% rename from langtools/test/tools/javac/rawDiags/Warning.out rename to test/langtools/tools/javac/rawDiags/Warning.out diff --git a/langtools/test/tools/javac/redefineObject/Object1-test.java b/test/langtools/tools/javac/redefineObject/Object1-test.java similarity index 100% rename from langtools/test/tools/javac/redefineObject/Object1-test.java rename to test/langtools/tools/javac/redefineObject/Object1-test.java diff --git a/langtools/test/tools/javac/redefineObject/Object1.out b/test/langtools/tools/javac/redefineObject/Object1.out similarity index 100% rename from langtools/test/tools/javac/redefineObject/Object1.out rename to test/langtools/tools/javac/redefineObject/Object1.out diff --git a/langtools/test/tools/javac/redefineObject/Object2-test.java b/test/langtools/tools/javac/redefineObject/Object2-test.java similarity index 100% rename from langtools/test/tools/javac/redefineObject/Object2-test.java rename to test/langtools/tools/javac/redefineObject/Object2-test.java diff --git a/langtools/test/tools/javac/redefineObject/Object2.out b/test/langtools/tools/javac/redefineObject/Object2.out similarity index 100% rename from langtools/test/tools/javac/redefineObject/Object2.out rename to test/langtools/tools/javac/redefineObject/Object2.out diff --git a/langtools/test/tools/javac/redefineObject/java.base/java/lang/Object1.java b/test/langtools/tools/javac/redefineObject/java.base/java/lang/Object1.java similarity index 100% rename from langtools/test/tools/javac/redefineObject/java.base/java/lang/Object1.java rename to test/langtools/tools/javac/redefineObject/java.base/java/lang/Object1.java diff --git a/langtools/test/tools/javac/redefineObject/java.base/java/lang/Object2.java b/test/langtools/tools/javac/redefineObject/java.base/java/lang/Object2.java similarity index 100% rename from langtools/test/tools/javac/redefineObject/java.base/java/lang/Object2.java rename to test/langtools/tools/javac/redefineObject/java.base/java/lang/Object2.java diff --git a/langtools/test/tools/javac/resolve/AmbiguityErrorTest.java b/test/langtools/tools/javac/resolve/AmbiguityErrorTest.java similarity index 100% rename from langtools/test/tools/javac/resolve/AmbiguityErrorTest.java rename to test/langtools/tools/javac/resolve/AmbiguityErrorTest.java diff --git a/langtools/test/tools/javac/resolve/BitWiseOperators.java b/test/langtools/tools/javac/resolve/BitWiseOperators.java similarity index 100% rename from langtools/test/tools/javac/resolve/BitWiseOperators.java rename to test/langtools/tools/javac/resolve/BitWiseOperators.java diff --git a/langtools/test/tools/javac/resolve/Candidate.java b/test/langtools/tools/javac/resolve/Candidate.java similarity index 100% rename from langtools/test/tools/javac/resolve/Candidate.java rename to test/langtools/tools/javac/resolve/Candidate.java diff --git a/langtools/test/tools/javac/resolve/Pos.java b/test/langtools/tools/javac/resolve/Pos.java similarity index 100% rename from langtools/test/tools/javac/resolve/Pos.java rename to test/langtools/tools/javac/resolve/Pos.java diff --git a/langtools/test/tools/javac/resolve/ResolveHarness.java b/test/langtools/tools/javac/resolve/ResolveHarness.java similarity index 100% rename from langtools/test/tools/javac/resolve/ResolveHarness.java rename to test/langtools/tools/javac/resolve/ResolveHarness.java diff --git a/langtools/test/tools/javac/resolve/TraceResolve.java b/test/langtools/tools/javac/resolve/TraceResolve.java similarity index 100% rename from langtools/test/tools/javac/resolve/TraceResolve.java rename to test/langtools/tools/javac/resolve/TraceResolve.java diff --git a/langtools/test/tools/javac/resolve/tests/AbstractMerge.java b/test/langtools/tools/javac/resolve/tests/AbstractMerge.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/AbstractMerge.java rename to test/langtools/tools/javac/resolve/tests/AbstractMerge.java diff --git a/langtools/test/tools/javac/resolve/tests/AmbiguityPrecedence.java b/test/langtools/tools/javac/resolve/tests/AmbiguityPrecedence.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/AmbiguityPrecedence.java rename to test/langtools/tools/javac/resolve/tests/AmbiguityPrecedence.java diff --git a/langtools/test/tools/javac/resolve/tests/BoxedReturnTypeInference.java b/test/langtools/tools/javac/resolve/tests/BoxedReturnTypeInference.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/BoxedReturnTypeInference.java rename to test/langtools/tools/javac/resolve/tests/BoxedReturnTypeInference.java diff --git a/langtools/test/tools/javac/resolve/tests/InnerOverOuter.java b/test/langtools/tools/javac/resolve/tests/InnerOverOuter.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/InnerOverOuter.java rename to test/langtools/tools/javac/resolve/tests/InnerOverOuter.java diff --git a/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceOverInferred.java b/test/langtools/tools/javac/resolve/tests/PrimitiveOverReferenceOverInferred.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceOverInferred.java rename to test/langtools/tools/javac/resolve/tests/PrimitiveOverReferenceOverInferred.java diff --git a/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceOverVarargs.java b/test/langtools/tools/javac/resolve/tests/PrimitiveOverReferenceOverVarargs.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceOverVarargs.java rename to test/langtools/tools/javac/resolve/tests/PrimitiveOverReferenceOverVarargs.java diff --git a/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java b/test/langtools/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java rename to test/langtools/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java diff --git a/langtools/test/tools/javac/resolve/tests/PrimitiveOverload.java b/test/langtools/tools/javac/resolve/tests/PrimitiveOverload.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/PrimitiveOverload.java rename to test/langtools/tools/javac/resolve/tests/PrimitiveOverload.java diff --git a/langtools/test/tools/javac/resolve/tests/PrimitiveReturnTypeInference.java b/test/langtools/tools/javac/resolve/tests/PrimitiveReturnTypeInference.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/PrimitiveReturnTypeInference.java rename to test/langtools/tools/javac/resolve/tests/PrimitiveReturnTypeInference.java diff --git a/langtools/test/tools/javac/resolve/tests/PrimitiveVsReferenceSamePhase.java b/test/langtools/tools/javac/resolve/tests/PrimitiveVsReferenceSamePhase.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/PrimitiveVsReferenceSamePhase.java rename to test/langtools/tools/javac/resolve/tests/PrimitiveVsReferenceSamePhase.java diff --git a/langtools/test/tools/javac/resolve/tests/ReferenceOverInferred.java b/test/langtools/tools/javac/resolve/tests/ReferenceOverInferred.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/ReferenceOverInferred.java rename to test/langtools/tools/javac/resolve/tests/ReferenceOverInferred.java diff --git a/langtools/test/tools/javac/resolve/tests/ReferenceOverVarargs.java b/test/langtools/tools/javac/resolve/tests/ReferenceOverVarargs.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/ReferenceOverVarargs.java rename to test/langtools/tools/javac/resolve/tests/ReferenceOverVarargs.java diff --git a/langtools/test/tools/javac/resolve/tests/ReferenceOverload.java b/test/langtools/tools/javac/resolve/tests/ReferenceOverload.java similarity index 100% rename from langtools/test/tools/javac/resolve/tests/ReferenceOverload.java rename to test/langtools/tools/javac/resolve/tests/ReferenceOverload.java diff --git a/langtools/test/tools/javac/scope/6225935/Bar.java b/test/langtools/tools/javac/scope/6225935/Bar.java similarity index 100% rename from langtools/test/tools/javac/scope/6225935/Bar.java rename to test/langtools/tools/javac/scope/6225935/Bar.java diff --git a/langtools/test/tools/javac/scope/6225935/Baz.java b/test/langtools/tools/javac/scope/6225935/Baz.java similarity index 100% rename from langtools/test/tools/javac/scope/6225935/Baz.java rename to test/langtools/tools/javac/scope/6225935/Baz.java diff --git a/langtools/test/tools/javac/scope/6225935/Estatico4.java b/test/langtools/tools/javac/scope/6225935/Estatico4.java similarity index 100% rename from langtools/test/tools/javac/scope/6225935/Estatico4.java rename to test/langtools/tools/javac/scope/6225935/Estatico4.java diff --git a/langtools/test/tools/javac/scope/6225935/Estatico4.out b/test/langtools/tools/javac/scope/6225935/Estatico4.out similarity index 100% rename from langtools/test/tools/javac/scope/6225935/Estatico4.out rename to test/langtools/tools/javac/scope/6225935/Estatico4.out diff --git a/langtools/test/tools/javac/scope/6225935/StaticImportAccess.java b/test/langtools/tools/javac/scope/6225935/StaticImportAccess.java similarity index 100% rename from langtools/test/tools/javac/scope/6225935/StaticImportAccess.java rename to test/langtools/tools/javac/scope/6225935/StaticImportAccess.java diff --git a/langtools/test/tools/javac/scope/6225935/T6214959.java b/test/langtools/tools/javac/scope/6225935/T6214959.java similarity index 100% rename from langtools/test/tools/javac/scope/6225935/T6214959.java rename to test/langtools/tools/javac/scope/6225935/T6214959.java diff --git a/langtools/test/tools/javac/scope/6225935/T6214959.out b/test/langtools/tools/javac/scope/6225935/T6214959.out similarity index 100% rename from langtools/test/tools/javac/scope/6225935/T6214959.out rename to test/langtools/tools/javac/scope/6225935/T6214959.out diff --git a/langtools/test/tools/javac/scope/6225935/T6225935.java b/test/langtools/tools/javac/scope/6225935/T6225935.java similarity index 100% rename from langtools/test/tools/javac/scope/6225935/T6225935.java rename to test/langtools/tools/javac/scope/6225935/T6225935.java diff --git a/langtools/test/tools/javac/scope/6225935/T6381787.java b/test/langtools/tools/javac/scope/6225935/T6381787.java similarity index 100% rename from langtools/test/tools/javac/scope/6225935/T6381787.java rename to test/langtools/tools/javac/scope/6225935/T6381787.java diff --git a/langtools/test/tools/javac/scope/6225935/Test.java b/test/langtools/tools/javac/scope/6225935/Test.java similarity index 100% rename from langtools/test/tools/javac/scope/6225935/Test.java rename to test/langtools/tools/javac/scope/6225935/Test.java diff --git a/langtools/test/tools/javac/scope/6225935/a/Ambiguous.java b/test/langtools/tools/javac/scope/6225935/a/Ambiguous.java similarity index 100% rename from langtools/test/tools/javac/scope/6225935/a/Ambiguous.java rename to test/langtools/tools/javac/scope/6225935/a/Ambiguous.java diff --git a/langtools/test/tools/javac/scope/6225935/a/Named.java b/test/langtools/tools/javac/scope/6225935/a/Named.java similarity index 100% rename from langtools/test/tools/javac/scope/6225935/a/Named.java rename to test/langtools/tools/javac/scope/6225935/a/Named.java diff --git a/langtools/test/tools/javac/scope/6225935/a/Private.java b/test/langtools/tools/javac/scope/6225935/a/Private.java similarity index 100% rename from langtools/test/tools/javac/scope/6225935/a/Private.java rename to test/langtools/tools/javac/scope/6225935/a/Private.java diff --git a/langtools/test/tools/javac/scope/6225935/a/Star.java b/test/langtools/tools/javac/scope/6225935/a/Star.java similarity index 100% rename from langtools/test/tools/javac/scope/6225935/a/Star.java rename to test/langtools/tools/javac/scope/6225935/a/Star.java diff --git a/langtools/test/tools/javac/scope/6392998/T6392998.java b/test/langtools/tools/javac/scope/6392998/T6392998.java similarity index 100% rename from langtools/test/tools/javac/scope/6392998/T6392998.java rename to test/langtools/tools/javac/scope/6392998/T6392998.java diff --git a/langtools/test/tools/javac/scope/7017664/CompoundScopeTest.java b/test/langtools/tools/javac/scope/7017664/CompoundScopeTest.java similarity index 100% rename from langtools/test/tools/javac/scope/7017664/CompoundScopeTest.java rename to test/langtools/tools/javac/scope/7017664/CompoundScopeTest.java diff --git a/langtools/test/tools/javac/scope/7017664/ImplementationCacheTest.java b/test/langtools/tools/javac/scope/7017664/ImplementationCacheTest.java similarity index 100% rename from langtools/test/tools/javac/scope/7017664/ImplementationCacheTest.java rename to test/langtools/tools/javac/scope/7017664/ImplementationCacheTest.java diff --git a/langtools/test/tools/javac/scope/7046348/EagerInterfaceCompletionTest.java b/test/langtools/tools/javac/scope/7046348/EagerInterfaceCompletionTest.java similarity index 100% rename from langtools/test/tools/javac/scope/7046348/EagerInterfaceCompletionTest.java rename to test/langtools/tools/javac/scope/7046348/EagerInterfaceCompletionTest.java diff --git a/langtools/test/tools/javac/scope/DupUnsharedTest.java b/test/langtools/tools/javac/scope/DupUnsharedTest.java similarity index 100% rename from langtools/test/tools/javac/scope/DupUnsharedTest.java rename to test/langtools/tools/javac/scope/DupUnsharedTest.java diff --git a/langtools/test/tools/javac/scope/HashCollisionTest.java b/test/langtools/tools/javac/scope/HashCollisionTest.java similarity index 100% rename from langtools/test/tools/javac/scope/HashCollisionTest.java rename to test/langtools/tools/javac/scope/HashCollisionTest.java diff --git a/langtools/test/tools/javac/scope/IterateAndRemove.java b/test/langtools/tools/javac/scope/IterateAndRemove.java similarity index 100% rename from langtools/test/tools/javac/scope/IterateAndRemove.java rename to test/langtools/tools/javac/scope/IterateAndRemove.java diff --git a/langtools/test/tools/javac/scope/RemoveSymbolTest.java b/test/langtools/tools/javac/scope/RemoveSymbolTest.java similarity index 100% rename from langtools/test/tools/javac/scope/RemoveSymbolTest.java rename to test/langtools/tools/javac/scope/RemoveSymbolTest.java diff --git a/langtools/test/tools/javac/scope/RemoveSymbolUnitTest.java b/test/langtools/tools/javac/scope/RemoveSymbolUnitTest.java similarity index 100% rename from langtools/test/tools/javac/scope/RemoveSymbolUnitTest.java rename to test/langtools/tools/javac/scope/RemoveSymbolUnitTest.java diff --git a/langtools/test/tools/javac/scope/StarImportTest.java b/test/langtools/tools/javac/scope/StarImportTest.java similarity index 100% rename from langtools/test/tools/javac/scope/StarImportTest.java rename to test/langtools/tools/javac/scope/StarImportTest.java diff --git a/langtools/test/tools/javac/serial/SerialWarn.java b/test/langtools/tools/javac/serial/SerialWarn.java similarity index 100% rename from langtools/test/tools/javac/serial/SerialWarn.java rename to test/langtools/tools/javac/serial/SerialWarn.java diff --git a/langtools/test/tools/javac/serial/SerialWarn.out b/test/langtools/tools/javac/serial/SerialWarn.out similarity index 100% rename from langtools/test/tools/javac/serial/SerialWarn.out rename to test/langtools/tools/javac/serial/SerialWarn.out diff --git a/langtools/test/tools/javac/serial/SerialWarnAnon.java b/test/langtools/tools/javac/serial/SerialWarnAnon.java similarity index 100% rename from langtools/test/tools/javac/serial/SerialWarnAnon.java rename to test/langtools/tools/javac/serial/SerialWarnAnon.java diff --git a/langtools/test/tools/javac/sourcePath/SourcePath.java b/test/langtools/tools/javac/sourcePath/SourcePath.java similarity index 100% rename from langtools/test/tools/javac/sourcePath/SourcePath.java rename to test/langtools/tools/javac/sourcePath/SourcePath.java diff --git a/langtools/test/tools/javac/sourcePath/SourcePathA.java b/test/langtools/tools/javac/sourcePath/SourcePathA.java similarity index 100% rename from langtools/test/tools/javac/sourcePath/SourcePathA.java rename to test/langtools/tools/javac/sourcePath/SourcePathA.java diff --git a/langtools/test/tools/javac/sourcePath2/SourcePath2.java b/test/langtools/tools/javac/sourcePath2/SourcePath2.java similarity index 100% rename from langtools/test/tools/javac/sourcePath2/SourcePath2.java rename to test/langtools/tools/javac/sourcePath2/SourcePath2.java diff --git a/langtools/test/tools/javac/sourcePath2/SourcePath2.out b/test/langtools/tools/javac/sourcePath2/SourcePath2.out similarity index 100% rename from langtools/test/tools/javac/sourcePath2/SourcePath2.out rename to test/langtools/tools/javac/sourcePath2/SourcePath2.out diff --git a/langtools/test/tools/javac/sourcePath2/p/SourcePath2A.java b/test/langtools/tools/javac/sourcePath2/p/SourcePath2A.java similarity index 100% rename from langtools/test/tools/javac/sourcePath2/p/SourcePath2A.java rename to test/langtools/tools/javac/sourcePath2/p/SourcePath2A.java diff --git a/langtools/test/tools/javac/stackmap/StackMapTest.java b/test/langtools/tools/javac/stackmap/StackMapTest.java similarity index 100% rename from langtools/test/tools/javac/stackmap/StackMapTest.java rename to test/langtools/tools/javac/stackmap/StackMapTest.java diff --git a/langtools/test/tools/javac/stackmap/UninitThis.java b/test/langtools/tools/javac/stackmap/UninitThis.java similarity index 100% rename from langtools/test/tools/javac/stackmap/UninitThis.java rename to test/langtools/tools/javac/stackmap/UninitThis.java diff --git a/langtools/test/tools/javac/staticImport/6537020/T6537020.java b/test/langtools/tools/javac/staticImport/6537020/T6537020.java similarity index 100% rename from langtools/test/tools/javac/staticImport/6537020/T6537020.java rename to test/langtools/tools/javac/staticImport/6537020/T6537020.java diff --git a/langtools/test/tools/javac/staticImport/6537020/T6537020.out b/test/langtools/tools/javac/staticImport/6537020/T6537020.out similarity index 100% rename from langtools/test/tools/javac/staticImport/6537020/T6537020.out rename to test/langtools/tools/javac/staticImport/6537020/T6537020.out diff --git a/langtools/test/tools/javac/staticImport/6665223/T6665223.java b/test/langtools/tools/javac/staticImport/6665223/T6665223.java similarity index 100% rename from langtools/test/tools/javac/staticImport/6665223/T6665223.java rename to test/langtools/tools/javac/staticImport/6665223/T6665223.java diff --git a/langtools/test/tools/javac/staticImport/6665223/pkg/A.java b/test/langtools/tools/javac/staticImport/6665223/pkg/A.java similarity index 100% rename from langtools/test/tools/javac/staticImport/6665223/pkg/A.java rename to test/langtools/tools/javac/staticImport/6665223/pkg/A.java diff --git a/langtools/test/tools/javac/staticImport/6665223/pkg/B.java b/test/langtools/tools/javac/staticImport/6665223/pkg/B.java similarity index 100% rename from langtools/test/tools/javac/staticImport/6665223/pkg/B.java rename to test/langtools/tools/javac/staticImport/6665223/pkg/B.java diff --git a/langtools/test/tools/javac/staticImport/6695838/T6695838.java b/test/langtools/tools/javac/staticImport/6695838/T6695838.java similarity index 100% rename from langtools/test/tools/javac/staticImport/6695838/T6695838.java rename to test/langtools/tools/javac/staticImport/6695838/T6695838.java diff --git a/langtools/test/tools/javac/staticImport/6695838/T6695838.out b/test/langtools/tools/javac/staticImport/6695838/T6695838.out similarity index 100% rename from langtools/test/tools/javac/staticImport/6695838/T6695838.out rename to test/langtools/tools/javac/staticImport/6695838/T6695838.out diff --git a/langtools/test/tools/javac/staticImport/6695838/a/Foo.java b/test/langtools/tools/javac/staticImport/6695838/a/Foo.java similarity index 100% rename from langtools/test/tools/javac/staticImport/6695838/a/Foo.java rename to test/langtools/tools/javac/staticImport/6695838/a/Foo.java diff --git a/langtools/test/tools/javac/staticImport/6695838/a/FooInterface.java b/test/langtools/tools/javac/staticImport/6695838/a/FooInterface.java similarity index 100% rename from langtools/test/tools/javac/staticImport/6695838/a/FooInterface.java rename to test/langtools/tools/javac/staticImport/6695838/a/FooInterface.java diff --git a/langtools/test/tools/javac/staticImport/Ambig1.java b/test/langtools/tools/javac/staticImport/Ambig1.java similarity index 100% rename from langtools/test/tools/javac/staticImport/Ambig1.java rename to test/langtools/tools/javac/staticImport/Ambig1.java diff --git a/langtools/test/tools/javac/staticImport/Ambig1.out b/test/langtools/tools/javac/staticImport/Ambig1.out similarity index 100% rename from langtools/test/tools/javac/staticImport/Ambig1.out rename to test/langtools/tools/javac/staticImport/Ambig1.out diff --git a/langtools/test/tools/javac/staticImport/ImportInherit.java b/test/langtools/tools/javac/staticImport/ImportInherit.java similarity index 100% rename from langtools/test/tools/javac/staticImport/ImportInherit.java rename to test/langtools/tools/javac/staticImport/ImportInherit.java diff --git a/langtools/test/tools/javac/staticImport/ImportPrivate.java b/test/langtools/tools/javac/staticImport/ImportPrivate.java similarity index 100% rename from langtools/test/tools/javac/staticImport/ImportPrivate.java rename to test/langtools/tools/javac/staticImport/ImportPrivate.java diff --git a/langtools/test/tools/javac/staticImport/ImportPrivate.out b/test/langtools/tools/javac/staticImport/ImportPrivate.out similarity index 100% rename from langtools/test/tools/javac/staticImport/ImportPrivate.out rename to test/langtools/tools/javac/staticImport/ImportPrivate.out diff --git a/langtools/test/tools/javac/staticImport/PrivateStaticImport.java b/test/langtools/tools/javac/staticImport/PrivateStaticImport.java similarity index 100% rename from langtools/test/tools/javac/staticImport/PrivateStaticImport.java rename to test/langtools/tools/javac/staticImport/PrivateStaticImport.java diff --git a/langtools/test/tools/javac/staticImport/PrivateStaticImport.out b/test/langtools/tools/javac/staticImport/PrivateStaticImport.out similarity index 100% rename from langtools/test/tools/javac/staticImport/PrivateStaticImport.out rename to test/langtools/tools/javac/staticImport/PrivateStaticImport.out diff --git a/langtools/test/tools/javac/staticImport/Shadow.java b/test/langtools/tools/javac/staticImport/Shadow.java similarity index 100% rename from langtools/test/tools/javac/staticImport/Shadow.java rename to test/langtools/tools/javac/staticImport/Shadow.java diff --git a/langtools/test/tools/javac/staticImport/Shadow.out b/test/langtools/tools/javac/staticImport/Shadow.out similarity index 100% rename from langtools/test/tools/javac/staticImport/Shadow.out rename to test/langtools/tools/javac/staticImport/Shadow.out diff --git a/langtools/test/tools/javac/staticImport/StaticImport.java b/test/langtools/tools/javac/staticImport/StaticImport.java similarity index 100% rename from langtools/test/tools/javac/staticImport/StaticImport.java rename to test/langtools/tools/javac/staticImport/StaticImport.java diff --git a/langtools/test/tools/javac/staticImport/StaticImport2.java b/test/langtools/tools/javac/staticImport/StaticImport2.java similarity index 100% rename from langtools/test/tools/javac/staticImport/StaticImport2.java rename to test/langtools/tools/javac/staticImport/StaticImport2.java diff --git a/langtools/test/tools/javac/staticImport/StaticImport2.out b/test/langtools/tools/javac/staticImport/StaticImport2.out similarity index 100% rename from langtools/test/tools/javac/staticImport/StaticImport2.out rename to test/langtools/tools/javac/staticImport/StaticImport2.out diff --git a/langtools/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.java b/test/langtools/tools/javac/staticQualifiedNew/StaticQualifiedNew.java similarity index 100% rename from langtools/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.java rename to test/langtools/tools/javac/staticQualifiedNew/StaticQualifiedNew.java diff --git a/langtools/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.out b/test/langtools/tools/javac/staticQualifiedNew/StaticQualifiedNew.out similarity index 100% rename from langtools/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.out rename to test/langtools/tools/javac/staticQualifiedNew/StaticQualifiedNew.out diff --git a/langtools/test/tools/javac/staticQualifiedNew/p2/X.java b/test/langtools/tools/javac/staticQualifiedNew/p2/X.java similarity index 100% rename from langtools/test/tools/javac/staticQualifiedNew/p2/X.java rename to test/langtools/tools/javac/staticQualifiedNew/p2/X.java diff --git a/langtools/test/tools/javac/sym/ElementStructureTest.java b/test/langtools/tools/javac/sym/ElementStructureTest.java similarity index 100% rename from langtools/test/tools/javac/sym/ElementStructureTest.java rename to test/langtools/tools/javac/sym/ElementStructureTest.java diff --git a/langtools/test/tools/javac/synthesize/Main.java b/test/langtools/tools/javac/synthesize/Main.java similarity index 100% rename from langtools/test/tools/javac/synthesize/Main.java rename to test/langtools/tools/javac/synthesize/Main.java diff --git a/langtools/test/tools/javac/synthesize/src/Boolean.java b/test/langtools/tools/javac/synthesize/src/Boolean.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Boolean.java rename to test/langtools/tools/javac/synthesize/src/Boolean.java diff --git a/langtools/test/tools/javac/synthesize/src/Byte.java b/test/langtools/tools/javac/synthesize/src/Byte.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Byte.java rename to test/langtools/tools/javac/synthesize/src/Byte.java diff --git a/langtools/test/tools/javac/synthesize/src/Character.java b/test/langtools/tools/javac/synthesize/src/Character.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Character.java rename to test/langtools/tools/javac/synthesize/src/Character.java diff --git a/langtools/test/tools/javac/synthesize/src/Cloneable.java b/test/langtools/tools/javac/synthesize/src/Cloneable.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Cloneable.java rename to test/langtools/tools/javac/synthesize/src/Cloneable.java diff --git a/langtools/test/tools/javac/synthesize/src/Double.java b/test/langtools/tools/javac/synthesize/src/Double.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Double.java rename to test/langtools/tools/javac/synthesize/src/Double.java diff --git a/langtools/test/tools/javac/synthesize/src/Float.java b/test/langtools/tools/javac/synthesize/src/Float.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Float.java rename to test/langtools/tools/javac/synthesize/src/Float.java diff --git a/langtools/test/tools/javac/synthesize/src/Integer.java b/test/langtools/tools/javac/synthesize/src/Integer.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Integer.java rename to test/langtools/tools/javac/synthesize/src/Integer.java diff --git a/langtools/test/tools/javac/synthesize/src/Long.java b/test/langtools/tools/javac/synthesize/src/Long.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Long.java rename to test/langtools/tools/javac/synthesize/src/Long.java diff --git a/langtools/test/tools/javac/synthesize/src/Number.java b/test/langtools/tools/javac/synthesize/src/Number.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Number.java rename to test/langtools/tools/javac/synthesize/src/Number.java diff --git a/langtools/test/tools/javac/synthesize/src/Object.java b/test/langtools/tools/javac/synthesize/src/Object.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Object.java rename to test/langtools/tools/javac/synthesize/src/Object.java diff --git a/langtools/test/tools/javac/synthesize/src/Serializable.java b/test/langtools/tools/javac/synthesize/src/Serializable.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Serializable.java rename to test/langtools/tools/javac/synthesize/src/Serializable.java diff --git a/langtools/test/tools/javac/synthesize/src/Short.java b/test/langtools/tools/javac/synthesize/src/Short.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Short.java rename to test/langtools/tools/javac/synthesize/src/Short.java diff --git a/langtools/test/tools/javac/synthesize/src/Test.java b/test/langtools/tools/javac/synthesize/src/Test.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Test.java rename to test/langtools/tools/javac/synthesize/src/Test.java diff --git a/langtools/test/tools/javac/synthesize/src/Void.java b/test/langtools/tools/javac/synthesize/src/Void.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/Void.java rename to test/langtools/tools/javac/synthesize/src/Void.java diff --git a/langtools/test/tools/javac/synthesize/src/module-info.java b/test/langtools/tools/javac/synthesize/src/module-info.java similarity index 100% rename from langtools/test/tools/javac/synthesize/src/module-info.java rename to test/langtools/tools/javac/synthesize/src/module-info.java diff --git a/langtools/test/tools/javac/tree/8067914/E.out b/test/langtools/tools/javac/tree/8067914/E.out similarity index 100% rename from langtools/test/tools/javac/tree/8067914/E.out rename to test/langtools/tools/javac/tree/8067914/E.out diff --git a/langtools/test/tools/javac/tree/8067914/NukeExtraCast.java b/test/langtools/tools/javac/tree/8067914/NukeExtraCast.java similarity index 100% rename from langtools/test/tools/javac/tree/8067914/NukeExtraCast.java rename to test/langtools/tools/javac/tree/8067914/NukeExtraCast.java diff --git a/langtools/test/tools/javac/tree/8067914/T8067914.java b/test/langtools/tools/javac/tree/8067914/T8067914.java similarity index 100% rename from langtools/test/tools/javac/tree/8067914/T8067914.java rename to test/langtools/tools/javac/tree/8067914/T8067914.java diff --git a/langtools/test/tools/javac/tree/AbstractTreeScannerTest.java b/test/langtools/tools/javac/tree/AbstractTreeScannerTest.java similarity index 100% rename from langtools/test/tools/javac/tree/AbstractTreeScannerTest.java rename to test/langtools/tools/javac/tree/AbstractTreeScannerTest.java diff --git a/langtools/test/tools/javac/tree/ArrayTypeToString.java b/test/langtools/tools/javac/tree/ArrayTypeToString.java similarity index 100% rename from langtools/test/tools/javac/tree/ArrayTypeToString.java rename to test/langtools/tools/javac/tree/ArrayTypeToString.java diff --git a/langtools/test/tools/javac/tree/ArrayTypeToString.out b/test/langtools/tools/javac/tree/ArrayTypeToString.out similarity index 100% rename from langtools/test/tools/javac/tree/ArrayTypeToString.out rename to test/langtools/tools/javac/tree/ArrayTypeToString.out diff --git a/langtools/test/tools/javac/tree/ClassTreeTest.java b/test/langtools/tools/javac/tree/ClassTreeTest.java similarity index 100% rename from langtools/test/tools/javac/tree/ClassTreeTest.java rename to test/langtools/tools/javac/tree/ClassTreeTest.java diff --git a/langtools/test/tools/javac/tree/DocCommentToplevelTest.java b/test/langtools/tools/javac/tree/DocCommentToplevelTest.java similarity index 100% rename from langtools/test/tools/javac/tree/DocCommentToplevelTest.java rename to test/langtools/tools/javac/tree/DocCommentToplevelTest.java diff --git a/langtools/test/tools/javac/tree/JavacTreeScannerTest.java b/test/langtools/tools/javac/tree/JavacTreeScannerTest.java similarity index 100% rename from langtools/test/tools/javac/tree/JavacTreeScannerTest.java rename to test/langtools/tools/javac/tree/JavacTreeScannerTest.java diff --git a/langtools/test/tools/javac/tree/MakeLiteralTest.java b/test/langtools/tools/javac/tree/MakeLiteralTest.java similarity index 100% rename from langtools/test/tools/javac/tree/MakeLiteralTest.java rename to test/langtools/tools/javac/tree/MakeLiteralTest.java diff --git a/langtools/test/tools/javac/tree/MakeQualIdent.java b/test/langtools/tools/javac/tree/MakeQualIdent.java similarity index 100% rename from langtools/test/tools/javac/tree/MakeQualIdent.java rename to test/langtools/tools/javac/tree/MakeQualIdent.java diff --git a/langtools/test/tools/javac/tree/MakeTypeTest.java b/test/langtools/tools/javac/tree/MakeTypeTest.java similarity index 100% rename from langtools/test/tools/javac/tree/MakeTypeTest.java rename to test/langtools/tools/javac/tree/MakeTypeTest.java diff --git a/langtools/test/tools/javac/tree/MakeTypeTest.out b/test/langtools/tools/javac/tree/MakeTypeTest.out similarity index 100% rename from langtools/test/tools/javac/tree/MakeTypeTest.out rename to test/langtools/tools/javac/tree/MakeTypeTest.out diff --git a/langtools/test/tools/javac/tree/MissingSemicolonTest.java b/test/langtools/tools/javac/tree/MissingSemicolonTest.java similarity index 100% rename from langtools/test/tools/javac/tree/MissingSemicolonTest.java rename to test/langtools/tools/javac/tree/MissingSemicolonTest.java diff --git a/langtools/test/tools/javac/tree/NewArrayPretty.java b/test/langtools/tools/javac/tree/NewArrayPretty.java similarity index 100% rename from langtools/test/tools/javac/tree/NewArrayPretty.java rename to test/langtools/tools/javac/tree/NewArrayPretty.java diff --git a/langtools/test/tools/javac/tree/NoPrivateTypesExported.java b/test/langtools/tools/javac/tree/NoPrivateTypesExported.java similarity index 100% rename from langtools/test/tools/javac/tree/NoPrivateTypesExported.java rename to test/langtools/tools/javac/tree/NoPrivateTypesExported.java diff --git a/langtools/test/tools/javac/tree/PrettySimpleStringTest.java b/test/langtools/tools/javac/tree/PrettySimpleStringTest.java similarity index 100% rename from langtools/test/tools/javac/tree/PrettySimpleStringTest.java rename to test/langtools/tools/javac/tree/PrettySimpleStringTest.java diff --git a/langtools/test/tools/javac/tree/ScopeTest.java b/test/langtools/tools/javac/tree/ScopeTest.java similarity index 100% rename from langtools/test/tools/javac/tree/ScopeTest.java rename to test/langtools/tools/javac/tree/ScopeTest.java diff --git a/langtools/test/tools/javac/tree/SourceTreeScannerTest.java b/test/langtools/tools/javac/tree/SourceTreeScannerTest.java similarity index 100% rename from langtools/test/tools/javac/tree/SourceTreeScannerTest.java rename to test/langtools/tools/javac/tree/SourceTreeScannerTest.java diff --git a/langtools/test/tools/javac/tree/T6923080.java b/test/langtools/tools/javac/tree/T6923080.java similarity index 100% rename from langtools/test/tools/javac/tree/T6923080.java rename to test/langtools/tools/javac/tree/T6923080.java diff --git a/langtools/test/tools/javac/tree/T6963934.java b/test/langtools/tools/javac/tree/T6963934.java similarity index 100% rename from langtools/test/tools/javac/tree/T6963934.java rename to test/langtools/tools/javac/tree/T6963934.java diff --git a/langtools/test/tools/javac/tree/T6993305.java b/test/langtools/tools/javac/tree/T6993305.java similarity index 100% rename from langtools/test/tools/javac/tree/T6993305.java rename to test/langtools/tools/javac/tree/T6993305.java diff --git a/langtools/test/tools/javac/tree/T8024415.java b/test/langtools/tools/javac/tree/T8024415.java similarity index 100% rename from langtools/test/tools/javac/tree/T8024415.java rename to test/langtools/tools/javac/tree/T8024415.java diff --git a/langtools/test/tools/javac/tree/TestAnnotatedAnonClass.java b/test/langtools/tools/javac/tree/TestAnnotatedAnonClass.java similarity index 100% rename from langtools/test/tools/javac/tree/TestAnnotatedAnonClass.java rename to test/langtools/tools/javac/tree/TestAnnotatedAnonClass.java diff --git a/langtools/test/tools/javac/tree/TestPrettyDocComment.java b/test/langtools/tools/javac/tree/TestPrettyDocComment.java similarity index 100% rename from langtools/test/tools/javac/tree/TestPrettyDocComment.java rename to test/langtools/tools/javac/tree/TestPrettyDocComment.java diff --git a/langtools/test/tools/javac/tree/TestToString.java b/test/langtools/tools/javac/tree/TestToString.java similarity index 100% rename from langtools/test/tools/javac/tree/TestToString.java rename to test/langtools/tools/javac/tree/TestToString.java diff --git a/langtools/test/tools/javac/tree/TreeKindTest.java b/test/langtools/tools/javac/tree/TreeKindTest.java similarity index 100% rename from langtools/test/tools/javac/tree/TreeKindTest.java rename to test/langtools/tools/javac/tree/TreeKindTest.java diff --git a/langtools/test/tools/javac/tree/TreePosRoundsTest.java b/test/langtools/tools/javac/tree/TreePosRoundsTest.java similarity index 100% rename from langtools/test/tools/javac/tree/TreePosRoundsTest.java rename to test/langtools/tools/javac/tree/TreePosRoundsTest.java diff --git a/langtools/test/tools/javac/tree/TreePosTest.java b/test/langtools/tools/javac/tree/TreePosTest.java similarity index 100% rename from langtools/test/tools/javac/tree/TreePosTest.java rename to test/langtools/tools/javac/tree/TreePosTest.java diff --git a/langtools/test/tools/javac/tree/TypeAnnotationsPretty.java b/test/langtools/tools/javac/tree/TypeAnnotationsPretty.java similarity index 100% rename from langtools/test/tools/javac/tree/TypeAnnotationsPretty.java rename to test/langtools/tools/javac/tree/TypeAnnotationsPretty.java diff --git a/langtools/test/tools/javac/treeannotests/AnnoTreeTests.java b/test/langtools/tools/javac/treeannotests/AnnoTreeTests.java similarity index 100% rename from langtools/test/tools/javac/treeannotests/AnnoTreeTests.java rename to test/langtools/tools/javac/treeannotests/AnnoTreeTests.java diff --git a/langtools/test/tools/javac/treeannotests/DA.java b/test/langtools/tools/javac/treeannotests/DA.java similarity index 100% rename from langtools/test/tools/javac/treeannotests/DA.java rename to test/langtools/tools/javac/treeannotests/DA.java diff --git a/langtools/test/tools/javac/treeannotests/TA.java b/test/langtools/tools/javac/treeannotests/TA.java similarity index 100% rename from langtools/test/tools/javac/treeannotests/TA.java rename to test/langtools/tools/javac/treeannotests/TA.java diff --git a/langtools/test/tools/javac/treeannotests/Test.java b/test/langtools/tools/javac/treeannotests/Test.java similarity index 100% rename from langtools/test/tools/javac/treeannotests/Test.java rename to test/langtools/tools/javac/treeannotests/Test.java diff --git a/langtools/test/tools/javac/treeannotests/TestProcessor.java b/test/langtools/tools/javac/treeannotests/TestProcessor.java similarity index 100% rename from langtools/test/tools/javac/treeannotests/TestProcessor.java rename to test/langtools/tools/javac/treeannotests/TestProcessor.java diff --git a/langtools/test/tools/javac/types/BadSigTest.java b/test/langtools/tools/javac/types/BadSigTest.java similarity index 100% rename from langtools/test/tools/javac/types/BadSigTest.java rename to test/langtools/tools/javac/types/BadSigTest.java diff --git a/langtools/test/tools/javac/types/BoxingConversionTest.java b/test/langtools/tools/javac/types/BoxingConversionTest.java similarity index 100% rename from langtools/test/tools/javac/types/BoxingConversionTest.java rename to test/langtools/tools/javac/types/BoxingConversionTest.java diff --git a/langtools/test/tools/javac/types/CastObjectToPrimitiveTest.java b/test/langtools/tools/javac/types/CastObjectToPrimitiveTest.java similarity index 100% rename from langtools/test/tools/javac/types/CastObjectToPrimitiveTest.java rename to test/langtools/tools/javac/types/CastObjectToPrimitiveTest.java diff --git a/langtools/test/tools/javac/types/CastObjectToPrimitiveTest.out b/test/langtools/tools/javac/types/CastObjectToPrimitiveTest.out similarity index 100% rename from langtools/test/tools/javac/types/CastObjectToPrimitiveTest.out rename to test/langtools/tools/javac/types/CastObjectToPrimitiveTest.out diff --git a/langtools/test/tools/javac/types/CastTest.java b/test/langtools/tools/javac/types/CastTest.java similarity index 100% rename from langtools/test/tools/javac/types/CastTest.java rename to test/langtools/tools/javac/types/CastTest.java diff --git a/langtools/test/tools/javac/types/CastToTypeVarTest.java b/test/langtools/tools/javac/types/CastToTypeVarTest.java similarity index 100% rename from langtools/test/tools/javac/types/CastToTypeVarTest.java rename to test/langtools/tools/javac/types/CastToTypeVarTest.java diff --git a/langtools/test/tools/javac/types/CastTypeVarToPrimitiveTest.java b/test/langtools/tools/javac/types/CastTypeVarToPrimitiveTest.java similarity index 100% rename from langtools/test/tools/javac/types/CastTypeVarToPrimitiveTest.java rename to test/langtools/tools/javac/types/CastTypeVarToPrimitiveTest.java diff --git a/langtools/test/tools/javac/types/GenericTypeWellFormednessTest.java b/test/langtools/tools/javac/types/GenericTypeWellFormednessTest.java similarity index 100% rename from langtools/test/tools/javac/types/GenericTypeWellFormednessTest.java rename to test/langtools/tools/javac/types/GenericTypeWellFormednessTest.java diff --git a/langtools/test/tools/javac/types/PrimitiveConversionTest.java b/test/langtools/tools/javac/types/PrimitiveConversionTest.java similarity index 100% rename from langtools/test/tools/javac/types/PrimitiveConversionTest.java rename to test/langtools/tools/javac/types/PrimitiveConversionTest.java diff --git a/langtools/test/tools/javac/types/ScopeListenerTest.java b/test/langtools/tools/javac/types/ScopeListenerTest.java similarity index 100% rename from langtools/test/tools/javac/types/ScopeListenerTest.java rename to test/langtools/tools/javac/types/ScopeListenerTest.java diff --git a/langtools/test/tools/javac/types/TestComparisons.java b/test/langtools/tools/javac/types/TestComparisons.java similarity index 100% rename from langtools/test/tools/javac/types/TestComparisons.java rename to test/langtools/tools/javac/types/TestComparisons.java diff --git a/langtools/test/tools/javac/unicode/FirstChar.java b/test/langtools/tools/javac/unicode/FirstChar.java similarity index 100% rename from langtools/test/tools/javac/unicode/FirstChar.java rename to test/langtools/tools/javac/unicode/FirstChar.java diff --git a/langtools/test/tools/javac/unicode/FirstChar2.java b/test/langtools/tools/javac/unicode/FirstChar2.java similarity index 100% rename from langtools/test/tools/javac/unicode/FirstChar2.java rename to test/langtools/tools/javac/unicode/FirstChar2.java diff --git a/langtools/test/tools/javac/unicode/NonasciiDigit.java b/test/langtools/tools/javac/unicode/NonasciiDigit.java similarity index 100% rename from langtools/test/tools/javac/unicode/NonasciiDigit.java rename to test/langtools/tools/javac/unicode/NonasciiDigit.java diff --git a/langtools/test/tools/javac/unicode/NonasciiDigit.out b/test/langtools/tools/javac/unicode/NonasciiDigit.out similarity index 100% rename from langtools/test/tools/javac/unicode/NonasciiDigit.out rename to test/langtools/tools/javac/unicode/NonasciiDigit.out diff --git a/langtools/test/tools/javac/unicode/SubChar.java b/test/langtools/tools/javac/unicode/SubChar.java similarity index 100% rename from langtools/test/tools/javac/unicode/SubChar.java rename to test/langtools/tools/javac/unicode/SubChar.java diff --git a/langtools/test/tools/javac/unicode/SupplementaryJavaID1.java b/test/langtools/tools/javac/unicode/SupplementaryJavaID1.java similarity index 100% rename from langtools/test/tools/javac/unicode/SupplementaryJavaID1.java rename to test/langtools/tools/javac/unicode/SupplementaryJavaID1.java diff --git a/langtools/test/tools/javac/unicode/SupplementaryJavaID2.java b/test/langtools/tools/javac/unicode/SupplementaryJavaID2.java similarity index 100% rename from langtools/test/tools/javac/unicode/SupplementaryJavaID2.java rename to test/langtools/tools/javac/unicode/SupplementaryJavaID2.java diff --git a/langtools/test/tools/javac/unicode/SupplementaryJavaID2.out b/test/langtools/tools/javac/unicode/SupplementaryJavaID2.out similarity index 100% rename from langtools/test/tools/javac/unicode/SupplementaryJavaID2.out rename to test/langtools/tools/javac/unicode/SupplementaryJavaID2.out diff --git a/langtools/test/tools/javac/unicode/SupplementaryJavaID3.java b/test/langtools/tools/javac/unicode/SupplementaryJavaID3.java similarity index 100% rename from langtools/test/tools/javac/unicode/SupplementaryJavaID3.java rename to test/langtools/tools/javac/unicode/SupplementaryJavaID3.java diff --git a/langtools/test/tools/javac/unicode/SupplementaryJavaID3.out b/test/langtools/tools/javac/unicode/SupplementaryJavaID3.out similarity index 100% rename from langtools/test/tools/javac/unicode/SupplementaryJavaID3.out rename to test/langtools/tools/javac/unicode/SupplementaryJavaID3.out diff --git a/langtools/test/tools/javac/unicode/SupplementaryJavaID4.java b/test/langtools/tools/javac/unicode/SupplementaryJavaID4.java similarity index 100% rename from langtools/test/tools/javac/unicode/SupplementaryJavaID4.java rename to test/langtools/tools/javac/unicode/SupplementaryJavaID4.java diff --git a/langtools/test/tools/javac/unicode/SupplementaryJavaID4.out b/test/langtools/tools/javac/unicode/SupplementaryJavaID4.out similarity index 100% rename from langtools/test/tools/javac/unicode/SupplementaryJavaID4.out rename to test/langtools/tools/javac/unicode/SupplementaryJavaID4.out diff --git a/langtools/test/tools/javac/unicode/SupplementaryJavaID5.java b/test/langtools/tools/javac/unicode/SupplementaryJavaID5.java similarity index 100% rename from langtools/test/tools/javac/unicode/SupplementaryJavaID5.java rename to test/langtools/tools/javac/unicode/SupplementaryJavaID5.java diff --git a/langtools/test/tools/javac/unicode/SupplementaryJavaID5.out b/test/langtools/tools/javac/unicode/SupplementaryJavaID5.out similarity index 100% rename from langtools/test/tools/javac/unicode/SupplementaryJavaID5.out rename to test/langtools/tools/javac/unicode/SupplementaryJavaID5.out diff --git a/langtools/test/tools/javac/unicode/SupplementaryJavaID6.java b/test/langtools/tools/javac/unicode/SupplementaryJavaID6.java similarity index 100% rename from langtools/test/tools/javac/unicode/SupplementaryJavaID6.java rename to test/langtools/tools/javac/unicode/SupplementaryJavaID6.java diff --git a/langtools/test/tools/javac/unicode/TripleQuote.java b/test/langtools/tools/javac/unicode/TripleQuote.java similarity index 100% rename from langtools/test/tools/javac/unicode/TripleQuote.java rename to test/langtools/tools/javac/unicode/TripleQuote.java diff --git a/langtools/test/tools/javac/unicode/TripleQuote.out b/test/langtools/tools/javac/unicode/TripleQuote.out similarity index 100% rename from langtools/test/tools/javac/unicode/TripleQuote.out rename to test/langtools/tools/javac/unicode/TripleQuote.out diff --git a/langtools/test/tools/javac/unicode/UnicodeAtEOL.java b/test/langtools/tools/javac/unicode/UnicodeAtEOL.java similarity index 100% rename from langtools/test/tools/javac/unicode/UnicodeAtEOL.java rename to test/langtools/tools/javac/unicode/UnicodeAtEOL.java diff --git a/langtools/test/tools/javac/unicode/UnicodeCommentDelimiter.java b/test/langtools/tools/javac/unicode/UnicodeCommentDelimiter.java similarity index 100% rename from langtools/test/tools/javac/unicode/UnicodeCommentDelimiter.java rename to test/langtools/tools/javac/unicode/UnicodeCommentDelimiter.java diff --git a/langtools/test/tools/javac/unicode/UnicodeNewline.java b/test/langtools/tools/javac/unicode/UnicodeNewline.java similarity index 100% rename from langtools/test/tools/javac/unicode/UnicodeNewline.java rename to test/langtools/tools/javac/unicode/UnicodeNewline.java diff --git a/langtools/test/tools/javac/unicode/UnicodeNewline.out b/test/langtools/tools/javac/unicode/UnicodeNewline.out similarity index 100% rename from langtools/test/tools/javac/unicode/UnicodeNewline.out rename to test/langtools/tools/javac/unicode/UnicodeNewline.out diff --git a/langtools/test/tools/javac/unicode/UnicodeUnicode.java b/test/langtools/tools/javac/unicode/UnicodeUnicode.java similarity index 100% rename from langtools/test/tools/javac/unicode/UnicodeUnicode.java rename to test/langtools/tools/javac/unicode/UnicodeUnicode.java diff --git a/langtools/test/tools/javac/unicode/Unmappable.java b/test/langtools/tools/javac/unicode/Unmappable.java similarity index 100% rename from langtools/test/tools/javac/unicode/Unmappable.java rename to test/langtools/tools/javac/unicode/Unmappable.java diff --git a/langtools/test/tools/javac/unicode/Unmappable.out b/test/langtools/tools/javac/unicode/Unmappable.out similarity index 100% rename from langtools/test/tools/javac/unicode/Unmappable.out rename to test/langtools/tools/javac/unicode/Unmappable.out diff --git a/langtools/test/tools/javac/unicode/Wrapper.java b/test/langtools/tools/javac/unicode/Wrapper.java similarity index 100% rename from langtools/test/tools/javac/unicode/Wrapper.java rename to test/langtools/tools/javac/unicode/Wrapper.java diff --git a/langtools/test/tools/javac/unit/T6198196.java b/test/langtools/tools/javac/unit/T6198196.java similarity index 100% rename from langtools/test/tools/javac/unit/T6198196.java rename to test/langtools/tools/javac/unit/T6198196.java diff --git a/langtools/test/tools/javac/unit/util/convert/EnclosingCandidates.java b/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java similarity index 100% rename from langtools/test/tools/javac/unit/util/convert/EnclosingCandidates.java rename to test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java diff --git a/langtools/test/tools/javac/unit/util/list/AbstractList.java b/test/langtools/tools/javac/unit/util/list/AbstractList.java similarity index 100% rename from langtools/test/tools/javac/unit/util/list/AbstractList.java rename to test/langtools/tools/javac/unit/util/list/AbstractList.java diff --git a/langtools/test/tools/javac/unit/util/list/FromArray.java b/test/langtools/tools/javac/unit/util/list/FromArray.java similarity index 100% rename from langtools/test/tools/javac/unit/util/list/FromArray.java rename to test/langtools/tools/javac/unit/util/list/FromArray.java diff --git a/langtools/test/tools/javac/util/BitsTest.java b/test/langtools/tools/javac/util/BitsTest.java similarity index 100% rename from langtools/test/tools/javac/util/BitsTest.java rename to test/langtools/tools/javac/util/BitsTest.java diff --git a/langtools/test/tools/javac/util/NewlineOnlyDiagnostic.java b/test/langtools/tools/javac/util/NewlineOnlyDiagnostic.java similarity index 100% rename from langtools/test/tools/javac/util/NewlineOnlyDiagnostic.java rename to test/langtools/tools/javac/util/NewlineOnlyDiagnostic.java diff --git a/langtools/test/tools/javac/util/StringUtilsTest.java b/test/langtools/tools/javac/util/StringUtilsTest.java similarity index 100% rename from langtools/test/tools/javac/util/StringUtilsTest.java rename to test/langtools/tools/javac/util/StringUtilsTest.java diff --git a/langtools/test/tools/javac/util/T6597678.java b/test/langtools/tools/javac/util/T6597678.java similarity index 100% rename from langtools/test/tools/javac/util/T6597678.java rename to test/langtools/tools/javac/util/T6597678.java diff --git a/langtools/test/tools/javac/util/filemanager/TestName.java b/test/langtools/tools/javac/util/filemanager/TestName.java similarity index 100% rename from langtools/test/tools/javac/util/filemanager/TestName.java rename to test/langtools/tools/javac/util/filemanager/TestName.java diff --git a/langtools/test/tools/javac/util/list/ListBufferTest.java b/test/langtools/tools/javac/util/list/ListBufferTest.java similarity index 100% rename from langtools/test/tools/javac/util/list/ListBufferTest.java rename to test/langtools/tools/javac/util/list/ListBufferTest.java diff --git a/langtools/test/tools/javac/util/list/TList.java b/test/langtools/tools/javac/util/list/TList.java similarity index 100% rename from langtools/test/tools/javac/util/list/TList.java rename to test/langtools/tools/javac/util/list/TList.java diff --git a/langtools/test/tools/javac/varargs/5088429/T5088429Neg01.java b/test/langtools/tools/javac/varargs/5088429/T5088429Neg01.java similarity index 100% rename from langtools/test/tools/javac/varargs/5088429/T5088429Neg01.java rename to test/langtools/tools/javac/varargs/5088429/T5088429Neg01.java diff --git a/langtools/test/tools/javac/varargs/5088429/T5088429Neg01.out b/test/langtools/tools/javac/varargs/5088429/T5088429Neg01.out similarity index 100% rename from langtools/test/tools/javac/varargs/5088429/T5088429Neg01.out rename to test/langtools/tools/javac/varargs/5088429/T5088429Neg01.out diff --git a/langtools/test/tools/javac/varargs/5088429/T5088429Neg02.java b/test/langtools/tools/javac/varargs/5088429/T5088429Neg02.java similarity index 100% rename from langtools/test/tools/javac/varargs/5088429/T5088429Neg02.java rename to test/langtools/tools/javac/varargs/5088429/T5088429Neg02.java diff --git a/langtools/test/tools/javac/varargs/5088429/T5088429Neg02.out b/test/langtools/tools/javac/varargs/5088429/T5088429Neg02.out similarity index 100% rename from langtools/test/tools/javac/varargs/5088429/T5088429Neg02.out rename to test/langtools/tools/javac/varargs/5088429/T5088429Neg02.out diff --git a/langtools/test/tools/javac/varargs/5088429/T5088429Pos01.java b/test/langtools/tools/javac/varargs/5088429/T5088429Pos01.java similarity index 100% rename from langtools/test/tools/javac/varargs/5088429/T5088429Pos01.java rename to test/langtools/tools/javac/varargs/5088429/T5088429Pos01.java diff --git a/langtools/test/tools/javac/varargs/5088429/T5088429Pos02.java b/test/langtools/tools/javac/varargs/5088429/T5088429Pos02.java similarity index 100% rename from langtools/test/tools/javac/varargs/5088429/T5088429Pos02.java rename to test/langtools/tools/javac/varargs/5088429/T5088429Pos02.java diff --git a/langtools/test/tools/javac/varargs/6199075/T6199075.java b/test/langtools/tools/javac/varargs/6199075/T6199075.java similarity index 100% rename from langtools/test/tools/javac/varargs/6199075/T6199075.java rename to test/langtools/tools/javac/varargs/6199075/T6199075.java diff --git a/langtools/test/tools/javac/varargs/6313164/T6313164.java b/test/langtools/tools/javac/varargs/6313164/T6313164.java similarity index 100% rename from langtools/test/tools/javac/varargs/6313164/T6313164.java rename to test/langtools/tools/javac/varargs/6313164/T6313164.java diff --git a/langtools/test/tools/javac/varargs/6313164/T6313164Source7.out b/test/langtools/tools/javac/varargs/6313164/T6313164Source7.out similarity index 100% rename from langtools/test/tools/javac/varargs/6313164/T6313164Source7.out rename to test/langtools/tools/javac/varargs/6313164/T6313164Source7.out diff --git a/langtools/test/tools/javac/varargs/6313164/T6313164Source8AndHigher.out b/test/langtools/tools/javac/varargs/6313164/T6313164Source8AndHigher.out similarity index 100% rename from langtools/test/tools/javac/varargs/6313164/T6313164Source8AndHigher.out rename to test/langtools/tools/javac/varargs/6313164/T6313164Source8AndHigher.out diff --git a/langtools/test/tools/javac/varargs/6313164/T7175433.java b/test/langtools/tools/javac/varargs/6313164/T7175433.java similarity index 100% rename from langtools/test/tools/javac/varargs/6313164/T7175433.java rename to test/langtools/tools/javac/varargs/6313164/T7175433.java diff --git a/langtools/test/tools/javac/varargs/6313164/T7175433.out b/test/langtools/tools/javac/varargs/6313164/T7175433.out similarity index 100% rename from langtools/test/tools/javac/varargs/6313164/T7175433.out rename to test/langtools/tools/javac/varargs/6313164/T7175433.out diff --git a/langtools/test/tools/javac/varargs/6313164/p1/A.java b/test/langtools/tools/javac/varargs/6313164/p1/A.java similarity index 100% rename from langtools/test/tools/javac/varargs/6313164/p1/A.java rename to test/langtools/tools/javac/varargs/6313164/p1/A.java diff --git a/langtools/test/tools/javac/varargs/6313164/p1/B.java b/test/langtools/tools/javac/varargs/6313164/p1/B.java similarity index 100% rename from langtools/test/tools/javac/varargs/6313164/p1/B.java rename to test/langtools/tools/javac/varargs/6313164/p1/B.java diff --git a/langtools/test/tools/javac/varargs/6313164/p1/C.java b/test/langtools/tools/javac/varargs/6313164/p1/C.java similarity index 100% rename from langtools/test/tools/javac/varargs/6313164/p1/C.java rename to test/langtools/tools/javac/varargs/6313164/p1/C.java diff --git a/langtools/test/tools/javac/varargs/6569633/T6569633.java b/test/langtools/tools/javac/varargs/6569633/T6569633.java similarity index 100% rename from langtools/test/tools/javac/varargs/6569633/T6569633.java rename to test/langtools/tools/javac/varargs/6569633/T6569633.java diff --git a/langtools/test/tools/javac/varargs/6569633/T6569633.out b/test/langtools/tools/javac/varargs/6569633/T6569633.out similarity index 100% rename from langtools/test/tools/javac/varargs/6569633/T6569633.out rename to test/langtools/tools/javac/varargs/6569633/T6569633.out diff --git a/langtools/test/tools/javac/varargs/6730476/T6730476a.java b/test/langtools/tools/javac/varargs/6730476/T6730476a.java similarity index 100% rename from langtools/test/tools/javac/varargs/6730476/T6730476a.java rename to test/langtools/tools/javac/varargs/6730476/T6730476a.java diff --git a/langtools/test/tools/javac/varargs/6730476/T6730476b.java b/test/langtools/tools/javac/varargs/6730476/T6730476b.java similarity index 100% rename from langtools/test/tools/javac/varargs/6730476/T6730476b.java rename to test/langtools/tools/javac/varargs/6730476/T6730476b.java diff --git a/langtools/test/tools/javac/varargs/6806876/T6806876.java b/test/langtools/tools/javac/varargs/6806876/T6806876.java similarity index 100% rename from langtools/test/tools/javac/varargs/6806876/T6806876.java rename to test/langtools/tools/javac/varargs/6806876/T6806876.java diff --git a/langtools/test/tools/javac/varargs/6806876/T6806876.out b/test/langtools/tools/javac/varargs/6806876/T6806876.out similarity index 100% rename from langtools/test/tools/javac/varargs/6806876/T6806876.out rename to test/langtools/tools/javac/varargs/6806876/T6806876.out diff --git a/langtools/test/tools/javac/varargs/6993978/T6993978neg.java b/test/langtools/tools/javac/varargs/6993978/T6993978neg.java similarity index 100% rename from langtools/test/tools/javac/varargs/6993978/T6993978neg.java rename to test/langtools/tools/javac/varargs/6993978/T6993978neg.java diff --git a/langtools/test/tools/javac/varargs/6993978/T6993978neg.out b/test/langtools/tools/javac/varargs/6993978/T6993978neg.out similarity index 100% rename from langtools/test/tools/javac/varargs/6993978/T6993978neg.out rename to test/langtools/tools/javac/varargs/6993978/T6993978neg.out diff --git a/langtools/test/tools/javac/varargs/7042566/T7042566.java b/test/langtools/tools/javac/varargs/7042566/T7042566.java similarity index 100% rename from langtools/test/tools/javac/varargs/7042566/T7042566.java rename to test/langtools/tools/javac/varargs/7042566/T7042566.java diff --git a/langtools/test/tools/javac/varargs/7043922/T7043922.java b/test/langtools/tools/javac/varargs/7043922/T7043922.java similarity index 100% rename from langtools/test/tools/javac/varargs/7043922/T7043922.java rename to test/langtools/tools/javac/varargs/7043922/T7043922.java diff --git a/langtools/test/tools/javac/varargs/7097436/T7097436.java b/test/langtools/tools/javac/varargs/7097436/T7097436.java similarity index 100% rename from langtools/test/tools/javac/varargs/7097436/T7097436.java rename to test/langtools/tools/javac/varargs/7097436/T7097436.java diff --git a/langtools/test/tools/javac/varargs/7097436/T7097436.out b/test/langtools/tools/javac/varargs/7097436/T7097436.out similarity index 100% rename from langtools/test/tools/javac/varargs/7097436/T7097436.out rename to test/langtools/tools/javac/varargs/7097436/T7097436.out diff --git a/langtools/test/tools/javac/varargs/8055514/T8055514.java b/test/langtools/tools/javac/varargs/8055514/T8055514.java similarity index 100% rename from langtools/test/tools/javac/varargs/8055514/T8055514.java rename to test/langtools/tools/javac/varargs/8055514/T8055514.java diff --git a/langtools/test/tools/javac/varargs/8055514/T8055514.out b/test/langtools/tools/javac/varargs/8055514/T8055514.out similarity index 100% rename from langtools/test/tools/javac/varargs/8055514/T8055514.out rename to test/langtools/tools/javac/varargs/8055514/T8055514.out diff --git a/langtools/test/tools/javac/varargs/Anon.java b/test/langtools/tools/javac/varargs/Anon.java similarity index 100% rename from langtools/test/tools/javac/varargs/Anon.java rename to test/langtools/tools/javac/varargs/Anon.java diff --git a/langtools/test/tools/javac/varargs/BadSyntax2.java b/test/langtools/tools/javac/varargs/BadSyntax2.java similarity index 100% rename from langtools/test/tools/javac/varargs/BadSyntax2.java rename to test/langtools/tools/javac/varargs/BadSyntax2.java diff --git a/langtools/test/tools/javac/varargs/MethodHandleCrash.java b/test/langtools/tools/javac/varargs/MethodHandleCrash.java similarity index 100% rename from langtools/test/tools/javac/varargs/MethodHandleCrash.java rename to test/langtools/tools/javac/varargs/MethodHandleCrash.java diff --git a/langtools/test/tools/javac/varargs/T6746184.java b/test/langtools/tools/javac/varargs/T6746184.java similarity index 100% rename from langtools/test/tools/javac/varargs/T6746184.java rename to test/langtools/tools/javac/varargs/T6746184.java diff --git a/langtools/test/tools/javac/varargs/T7013865.java b/test/langtools/tools/javac/varargs/T7013865.java similarity index 100% rename from langtools/test/tools/javac/varargs/T7013865.java rename to test/langtools/tools/javac/varargs/T7013865.java diff --git a/langtools/test/tools/javac/varargs/Varargs1.java b/test/langtools/tools/javac/varargs/Varargs1.java similarity index 100% rename from langtools/test/tools/javac/varargs/Varargs1.java rename to test/langtools/tools/javac/varargs/Varargs1.java diff --git a/langtools/test/tools/javac/varargs/VarargsOverride.java b/test/langtools/tools/javac/varargs/VarargsOverride.java similarity index 100% rename from langtools/test/tools/javac/varargs/VarargsOverride.java rename to test/langtools/tools/javac/varargs/VarargsOverride.java diff --git a/langtools/test/tools/javac/varargs/VarargsOverride.out b/test/langtools/tools/javac/varargs/VarargsOverride.out similarity index 100% rename from langtools/test/tools/javac/varargs/VarargsOverride.out rename to test/langtools/tools/javac/varargs/VarargsOverride.out diff --git a/langtools/test/tools/javac/varargs/Warn1.java b/test/langtools/tools/javac/varargs/Warn1.java similarity index 100% rename from langtools/test/tools/javac/varargs/Warn1.java rename to test/langtools/tools/javac/varargs/Warn1.java diff --git a/langtools/test/tools/javac/varargs/Warn1.out b/test/langtools/tools/javac/varargs/Warn1.out similarity index 100% rename from langtools/test/tools/javac/varargs/Warn1.out rename to test/langtools/tools/javac/varargs/Warn1.out diff --git a/langtools/test/tools/javac/varargs/Warn2.java b/test/langtools/tools/javac/varargs/Warn2.java similarity index 100% rename from langtools/test/tools/javac/varargs/Warn2.java rename to test/langtools/tools/javac/varargs/Warn2.java diff --git a/langtools/test/tools/javac/varargs/Warn2.out b/test/langtools/tools/javac/varargs/Warn2.out similarity index 100% rename from langtools/test/tools/javac/varargs/Warn2.out rename to test/langtools/tools/javac/varargs/Warn2.out diff --git a/langtools/test/tools/javac/varargs/access/OtherPackage.java b/test/langtools/tools/javac/varargs/access/OtherPackage.java similarity index 100% rename from langtools/test/tools/javac/varargs/access/OtherPackage.java rename to test/langtools/tools/javac/varargs/access/OtherPackage.java diff --git a/langtools/test/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest.java b/test/langtools/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest.java similarity index 100% rename from langtools/test/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest.java rename to test/langtools/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest.java diff --git a/langtools/test/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest2.java b/test/langtools/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest2.java similarity index 100% rename from langtools/test/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest2.java rename to test/langtools/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest2.java diff --git a/langtools/test/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest3.java b/test/langtools/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest3.java similarity index 100% rename from langtools/test/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest3.java rename to test/langtools/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest3.java diff --git a/langtools/test/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest4.java b/test/langtools/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest4.java similarity index 100% rename from langtools/test/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest4.java rename to test/langtools/tools/javac/varargs/access/VarargsAndWildcardParameterizedTypeTest4.java diff --git a/langtools/test/tools/javac/varargs/access/VarargsInferredPrivateType-source7.out b/test/langtools/tools/javac/varargs/access/VarargsInferredPrivateType-source7.out similarity index 100% rename from langtools/test/tools/javac/varargs/access/VarargsInferredPrivateType-source7.out rename to test/langtools/tools/javac/varargs/access/VarargsInferredPrivateType-source7.out diff --git a/langtools/test/tools/javac/varargs/access/VarargsInferredPrivateType.java b/test/langtools/tools/javac/varargs/access/VarargsInferredPrivateType.java similarity index 100% rename from langtools/test/tools/javac/varargs/access/VarargsInferredPrivateType.java rename to test/langtools/tools/javac/varargs/access/VarargsInferredPrivateType.java diff --git a/langtools/test/tools/javac/varargs/access/VarargsInferredPrivateType.out b/test/langtools/tools/javac/varargs/access/VarargsInferredPrivateType.out similarity index 100% rename from langtools/test/tools/javac/varargs/access/VarargsInferredPrivateType.out rename to test/langtools/tools/javac/varargs/access/VarargsInferredPrivateType.out diff --git a/langtools/test/tools/javac/varargs/warning/Warn2.java b/test/langtools/tools/javac/varargs/warning/Warn2.java similarity index 100% rename from langtools/test/tools/javac/varargs/warning/Warn2.java rename to test/langtools/tools/javac/varargs/warning/Warn2.java diff --git a/langtools/test/tools/javac/varargs/warning/Warn3.java b/test/langtools/tools/javac/varargs/warning/Warn3.java similarity index 100% rename from langtools/test/tools/javac/varargs/warning/Warn3.java rename to test/langtools/tools/javac/varargs/warning/Warn3.java diff --git a/langtools/test/tools/javac/varargs/warning/Warn4.java b/test/langtools/tools/javac/varargs/warning/Warn4.java similarity index 100% rename from langtools/test/tools/javac/varargs/warning/Warn4.java rename to test/langtools/tools/javac/varargs/warning/Warn4.java diff --git a/langtools/test/tools/javac/varargs/warning/Warn5.java b/test/langtools/tools/javac/varargs/warning/Warn5.java similarity index 100% rename from langtools/test/tools/javac/varargs/warning/Warn5.java rename to test/langtools/tools/javac/varargs/warning/Warn5.java diff --git a/langtools/test/tools/javac/varargs/warning/Warn6.java b/test/langtools/tools/javac/varargs/warning/Warn6.java similarity index 100% rename from langtools/test/tools/javac/varargs/warning/Warn6.java rename to test/langtools/tools/javac/varargs/warning/Warn6.java diff --git a/langtools/test/tools/javac/versions/SourceTargetTest.java b/test/langtools/tools/javac/versions/SourceTargetTest.java similarity index 100% rename from langtools/test/tools/javac/versions/SourceTargetTest.java rename to test/langtools/tools/javac/versions/SourceTargetTest.java diff --git a/langtools/test/tools/javac/versions/Versions.java b/test/langtools/tools/javac/versions/Versions.java similarity index 100% rename from langtools/test/tools/javac/versions/Versions.java rename to test/langtools/tools/javac/versions/Versions.java diff --git a/langtools/test/tools/javac/warnings/6594914/Auxiliary.java b/test/langtools/tools/javac/warnings/6594914/Auxiliary.java similarity index 100% rename from langtools/test/tools/javac/warnings/6594914/Auxiliary.java rename to test/langtools/tools/javac/warnings/6594914/Auxiliary.java diff --git a/langtools/test/tools/javac/warnings/6594914/DeprecatedClass.java b/test/langtools/tools/javac/warnings/6594914/DeprecatedClass.java similarity index 100% rename from langtools/test/tools/javac/warnings/6594914/DeprecatedClass.java rename to test/langtools/tools/javac/warnings/6594914/DeprecatedClass.java diff --git a/langtools/test/tools/javac/warnings/6594914/ExplicitCompilation.out b/test/langtools/tools/javac/warnings/6594914/ExplicitCompilation.out similarity index 100% rename from langtools/test/tools/javac/warnings/6594914/ExplicitCompilation.out rename to test/langtools/tools/javac/warnings/6594914/ExplicitCompilation.out diff --git a/langtools/test/tools/javac/warnings/6594914/ImplicitCompilation.java b/test/langtools/tools/javac/warnings/6594914/ImplicitCompilation.java similarity index 100% rename from langtools/test/tools/javac/warnings/6594914/ImplicitCompilation.java rename to test/langtools/tools/javac/warnings/6594914/ImplicitCompilation.java diff --git a/langtools/test/tools/javac/warnings/6594914/ImplicitCompilation.out b/test/langtools/tools/javac/warnings/6594914/ImplicitCompilation.out similarity index 100% rename from langtools/test/tools/javac/warnings/6594914/ImplicitCompilation.out rename to test/langtools/tools/javac/warnings/6594914/ImplicitCompilation.out diff --git a/langtools/test/tools/javac/warnings/6594914/T6594914a.java b/test/langtools/tools/javac/warnings/6594914/T6594914a.java similarity index 100% rename from langtools/test/tools/javac/warnings/6594914/T6594914a.java rename to test/langtools/tools/javac/warnings/6594914/T6594914a.java diff --git a/langtools/test/tools/javac/warnings/6594914/T6594914a.out b/test/langtools/tools/javac/warnings/6594914/T6594914a.out similarity index 100% rename from langtools/test/tools/javac/warnings/6594914/T6594914a.out rename to test/langtools/tools/javac/warnings/6594914/T6594914a.out diff --git a/langtools/test/tools/javac/warnings/6594914/T6594914b.out b/test/langtools/tools/javac/warnings/6594914/T6594914b.out similarity index 100% rename from langtools/test/tools/javac/warnings/6594914/T6594914b.out rename to test/langtools/tools/javac/warnings/6594914/T6594914b.out diff --git a/langtools/test/tools/javac/warnings/6747671/T6747671.java b/test/langtools/tools/javac/warnings/6747671/T6747671.java similarity index 100% rename from langtools/test/tools/javac/warnings/6747671/T6747671.java rename to test/langtools/tools/javac/warnings/6747671/T6747671.java diff --git a/langtools/test/tools/javac/warnings/6747671/T6747671.out b/test/langtools/tools/javac/warnings/6747671/T6747671.out similarity index 100% rename from langtools/test/tools/javac/warnings/6747671/T6747671.out rename to test/langtools/tools/javac/warnings/6747671/T6747671.out diff --git a/langtools/test/tools/javac/warnings/6885255/T6885255.java b/test/langtools/tools/javac/warnings/6885255/T6885255.java similarity index 100% rename from langtools/test/tools/javac/warnings/6885255/T6885255.java rename to test/langtools/tools/javac/warnings/6885255/T6885255.java diff --git a/langtools/test/tools/javac/warnings/6885255/T6885255.out b/test/langtools/tools/javac/warnings/6885255/T6885255.out similarity index 100% rename from langtools/test/tools/javac/warnings/6885255/T6885255.out rename to test/langtools/tools/javac/warnings/6885255/T6885255.out diff --git a/langtools/test/tools/javac/warnings/7090499/T7090499.java b/test/langtools/tools/javac/warnings/7090499/T7090499.java similarity index 100% rename from langtools/test/tools/javac/warnings/7090499/T7090499.java rename to test/langtools/tools/javac/warnings/7090499/T7090499.java diff --git a/langtools/test/tools/javac/warnings/7090499/T7090499.out b/test/langtools/tools/javac/warnings/7090499/T7090499.out similarity index 100% rename from langtools/test/tools/javac/warnings/7090499/T7090499.out rename to test/langtools/tools/javac/warnings/7090499/T7090499.out diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java similarity index 100% rename from langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java rename to test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.out b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.out similarity index 100% rename from langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.out rename to test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.out diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java similarity index 100% rename from langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java rename to test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary1.out b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary1.out similarity index 100% rename from langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary1.out rename to test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary1.out diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary2.out b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary2.out similarity index 100% rename from langtools/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary2.out rename to test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary2.out diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/ClassWithAuxiliary.java b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassWithAuxiliary.java similarity index 100% rename from langtools/test/tools/javac/warnings/AuxiliaryClass/ClassWithAuxiliary.java rename to test/langtools/tools/javac/warnings/AuxiliaryClass/ClassWithAuxiliary.java diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/NotAClassName.java b/test/langtools/tools/javac/warnings/AuxiliaryClass/NotAClassName.java similarity index 100% rename from langtools/test/tools/javac/warnings/AuxiliaryClass/NotAClassName.java rename to test/langtools/tools/javac/warnings/AuxiliaryClass/NotAClassName.java diff --git a/langtools/test/tools/javac/warnings/AuxiliaryClass/SelfClassWithAux.java b/test/langtools/tools/javac/warnings/AuxiliaryClass/SelfClassWithAux.java similarity index 100% rename from langtools/test/tools/javac/warnings/AuxiliaryClass/SelfClassWithAux.java rename to test/langtools/tools/javac/warnings/AuxiliaryClass/SelfClassWithAux.java diff --git a/langtools/test/tools/javac/warnings/DepAnn.java b/test/langtools/tools/javac/warnings/DepAnn.java similarity index 100% rename from langtools/test/tools/javac/warnings/DepAnn.java rename to test/langtools/tools/javac/warnings/DepAnn.java diff --git a/langtools/test/tools/javac/warnings/DepAnn.out b/test/langtools/tools/javac/warnings/DepAnn.out similarity index 100% rename from langtools/test/tools/javac/warnings/DepAnn.out rename to test/langtools/tools/javac/warnings/DepAnn.out diff --git a/langtools/test/tools/javac/warnings/Deprecation.java b/test/langtools/tools/javac/warnings/Deprecation.java similarity index 100% rename from langtools/test/tools/javac/warnings/Deprecation.java rename to test/langtools/tools/javac/warnings/Deprecation.java diff --git a/langtools/test/tools/javac/warnings/Deprecation.lintDeprecation.out b/test/langtools/tools/javac/warnings/Deprecation.lintDeprecation.out similarity index 100% rename from langtools/test/tools/javac/warnings/Deprecation.lintDeprecation.out rename to test/langtools/tools/javac/warnings/Deprecation.lintDeprecation.out diff --git a/langtools/test/tools/javac/warnings/Deprecation.lintDeprecation8.out b/test/langtools/tools/javac/warnings/Deprecation.lintDeprecation8.out similarity index 100% rename from langtools/test/tools/javac/warnings/Deprecation.lintDeprecation8.out rename to test/langtools/tools/javac/warnings/Deprecation.lintDeprecation8.out diff --git a/langtools/test/tools/javac/warnings/Deprecation.noLint.out b/test/langtools/tools/javac/warnings/Deprecation.noLint.out similarity index 100% rename from langtools/test/tools/javac/warnings/Deprecation.noLint.out rename to test/langtools/tools/javac/warnings/Deprecation.noLint.out diff --git a/langtools/test/tools/javac/warnings/DeprecationSE8Test.java b/test/langtools/tools/javac/warnings/DeprecationSE8Test.java similarity index 100% rename from langtools/test/tools/javac/warnings/DeprecationSE8Test.java rename to test/langtools/tools/javac/warnings/DeprecationSE8Test.java diff --git a/langtools/test/tools/javac/warnings/DeprecationSE8Test.noLint.out b/test/langtools/tools/javac/warnings/DeprecationSE8Test.noLint.out similarity index 100% rename from langtools/test/tools/javac/warnings/DeprecationSE8Test.noLint.out rename to test/langtools/tools/javac/warnings/DeprecationSE8Test.noLint.out diff --git a/langtools/test/tools/javac/warnings/DeprecationSE8Test.out b/test/langtools/tools/javac/warnings/DeprecationSE8Test.out similarity index 100% rename from langtools/test/tools/javac/warnings/DeprecationSE8Test.out rename to test/langtools/tools/javac/warnings/DeprecationSE8Test.out diff --git a/langtools/test/tools/javac/warnings/DivZero.java b/test/langtools/tools/javac/warnings/DivZero.java similarity index 100% rename from langtools/test/tools/javac/warnings/DivZero.java rename to test/langtools/tools/javac/warnings/DivZero.java diff --git a/langtools/test/tools/javac/warnings/DivZero.lint.out b/test/langtools/tools/javac/warnings/DivZero.lint.out similarity index 100% rename from langtools/test/tools/javac/warnings/DivZero.lint.out rename to test/langtools/tools/javac/warnings/DivZero.lint.out diff --git a/langtools/test/tools/javac/warnings/DivZero.noLint.out b/test/langtools/tools/javac/warnings/DivZero.noLint.out similarity index 100% rename from langtools/test/tools/javac/warnings/DivZero.noLint.out rename to test/langtools/tools/javac/warnings/DivZero.noLint.out diff --git a/langtools/test/tools/javac/warnings/FallThrough.java b/test/langtools/tools/javac/warnings/FallThrough.java similarity index 100% rename from langtools/test/tools/javac/warnings/FallThrough.java rename to test/langtools/tools/javac/warnings/FallThrough.java diff --git a/langtools/test/tools/javac/warnings/FallThrough.lintAll.out b/test/langtools/tools/javac/warnings/FallThrough.lintAll.out similarity index 100% rename from langtools/test/tools/javac/warnings/FallThrough.lintAll.out rename to test/langtools/tools/javac/warnings/FallThrough.lintAll.out diff --git a/langtools/test/tools/javac/warnings/FallThrough.lintFallThrough.out b/test/langtools/tools/javac/warnings/FallThrough.lintFallThrough.out similarity index 100% rename from langtools/test/tools/javac/warnings/FallThrough.lintFallThrough.out rename to test/langtools/tools/javac/warnings/FallThrough.lintFallThrough.out diff --git a/langtools/test/tools/javac/warnings/FallThrough.noLint.out b/test/langtools/tools/javac/warnings/FallThrough.noLint.out similarity index 100% rename from langtools/test/tools/javac/warnings/FallThrough.noLint.out rename to test/langtools/tools/javac/warnings/FallThrough.noLint.out diff --git a/langtools/test/tools/javac/warnings/Finally.java b/test/langtools/tools/javac/warnings/Finally.java similarity index 100% rename from langtools/test/tools/javac/warnings/Finally.java rename to test/langtools/tools/javac/warnings/Finally.java diff --git a/langtools/test/tools/javac/warnings/Finally.out b/test/langtools/tools/javac/warnings/Finally.out similarity index 100% rename from langtools/test/tools/javac/warnings/Finally.out rename to test/langtools/tools/javac/warnings/Finally.out diff --git a/langtools/test/tools/javac/warnings/NestedDeprecation/NestedDeprecation.java b/test/langtools/tools/javac/warnings/NestedDeprecation/NestedDeprecation.java similarity index 100% rename from langtools/test/tools/javac/warnings/NestedDeprecation/NestedDeprecation.java rename to test/langtools/tools/javac/warnings/NestedDeprecation/NestedDeprecation.java diff --git a/langtools/test/tools/javac/warnings/NestedDeprecation/NestedDeprecation.out b/test/langtools/tools/javac/warnings/NestedDeprecation/NestedDeprecation.out similarity index 100% rename from langtools/test/tools/javac/warnings/NestedDeprecation/NestedDeprecation.out rename to test/langtools/tools/javac/warnings/NestedDeprecation/NestedDeprecation.out diff --git a/langtools/test/tools/javac/warnings/NestedDeprecation/p/Dep1.java b/test/langtools/tools/javac/warnings/NestedDeprecation/p/Dep1.java similarity index 100% rename from langtools/test/tools/javac/warnings/NestedDeprecation/p/Dep1.java rename to test/langtools/tools/javac/warnings/NestedDeprecation/p/Dep1.java diff --git a/langtools/test/tools/javac/warnings/NestedDeprecation/p/Dep2.java b/test/langtools/tools/javac/warnings/NestedDeprecation/p/Dep2.java similarity index 100% rename from langtools/test/tools/javac/warnings/NestedDeprecation/p/Dep2.java rename to test/langtools/tools/javac/warnings/NestedDeprecation/p/Dep2.java diff --git a/langtools/test/tools/javac/warnings/Removal.java b/test/langtools/tools/javac/warnings/Removal.java similarity index 100% rename from langtools/test/tools/javac/warnings/Removal.java rename to test/langtools/tools/javac/warnings/Removal.java diff --git a/langtools/test/tools/javac/warnings/Serial.java b/test/langtools/tools/javac/warnings/Serial.java similarity index 100% rename from langtools/test/tools/javac/warnings/Serial.java rename to test/langtools/tools/javac/warnings/Serial.java diff --git a/langtools/test/tools/javac/warnings/Serial.out b/test/langtools/tools/javac/warnings/Serial.out similarity index 100% rename from langtools/test/tools/javac/warnings/Serial.out rename to test/langtools/tools/javac/warnings/Serial.out diff --git a/langtools/test/tools/javac/warnings/T6763518.java b/test/langtools/tools/javac/warnings/T6763518.java similarity index 100% rename from langtools/test/tools/javac/warnings/T6763518.java rename to test/langtools/tools/javac/warnings/T6763518.java diff --git a/langtools/test/tools/javac/warnings/Unchecked.java b/test/langtools/tools/javac/warnings/Unchecked.java similarity index 100% rename from langtools/test/tools/javac/warnings/Unchecked.java rename to test/langtools/tools/javac/warnings/Unchecked.java diff --git a/langtools/test/tools/javac/warnings/Unchecked.lintAll.out b/test/langtools/tools/javac/warnings/Unchecked.lintAll.out similarity index 100% rename from langtools/test/tools/javac/warnings/Unchecked.lintAll.out rename to test/langtools/tools/javac/warnings/Unchecked.lintAll.out diff --git a/langtools/test/tools/javac/warnings/Unchecked.lintUnchecked.out b/test/langtools/tools/javac/warnings/Unchecked.lintUnchecked.out similarity index 100% rename from langtools/test/tools/javac/warnings/Unchecked.lintUnchecked.out rename to test/langtools/tools/javac/warnings/Unchecked.lintUnchecked.out diff --git a/langtools/test/tools/javac/warnings/Unchecked.noLint.out b/test/langtools/tools/javac/warnings/Unchecked.noLint.out similarity index 100% rename from langtools/test/tools/javac/warnings/Unchecked.noLint.out rename to test/langtools/tools/javac/warnings/Unchecked.noLint.out diff --git a/langtools/test/tools/javac/warnings/VerifyLintDescriptions.java b/test/langtools/tools/javac/warnings/VerifyLintDescriptions.java similarity index 100% rename from langtools/test/tools/javac/warnings/VerifyLintDescriptions.java rename to test/langtools/tools/javac/warnings/VerifyLintDescriptions.java diff --git a/langtools/test/tools/javac/warnings/suppress/ImplicitTest.java b/test/langtools/tools/javac/warnings/suppress/ImplicitTest.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/ImplicitTest.java rename to test/langtools/tools/javac/warnings/suppress/ImplicitTest.java diff --git a/langtools/test/tools/javac/warnings/suppress/ImplicitTest.out b/test/langtools/tools/javac/warnings/suppress/ImplicitTest.out similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/ImplicitTest.out rename to test/langtools/tools/javac/warnings/suppress/ImplicitTest.out diff --git a/langtools/test/tools/javac/warnings/suppress/Overridden.java b/test/langtools/tools/javac/warnings/suppress/Overridden.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/Overridden.java rename to test/langtools/tools/javac/warnings/suppress/Overridden.java diff --git a/langtools/test/tools/javac/warnings/suppress/Overridden.out b/test/langtools/tools/javac/warnings/suppress/Overridden.out similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/Overridden.out rename to test/langtools/tools/javac/warnings/suppress/Overridden.out diff --git a/langtools/test/tools/javac/warnings/suppress/OverriddenSuppressed.java b/test/langtools/tools/javac/warnings/suppress/OverriddenSuppressed.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/OverriddenSuppressed.java rename to test/langtools/tools/javac/warnings/suppress/OverriddenSuppressed.java diff --git a/langtools/test/tools/javac/warnings/suppress/PackageInfo.java b/test/langtools/tools/javac/warnings/suppress/PackageInfo.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/PackageInfo.java rename to test/langtools/tools/javac/warnings/suppress/PackageInfo.java diff --git a/langtools/test/tools/javac/warnings/suppress/PackageInfo.out b/test/langtools/tools/javac/warnings/suppress/PackageInfo.out similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/PackageInfo.out rename to test/langtools/tools/javac/warnings/suppress/PackageInfo.out diff --git a/langtools/test/tools/javac/warnings/suppress/T6480588.java b/test/langtools/tools/javac/warnings/suppress/T6480588.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/T6480588.java rename to test/langtools/tools/javac/warnings/suppress/T6480588.java diff --git a/langtools/test/tools/javac/warnings/suppress/T6480588.out b/test/langtools/tools/javac/warnings/suppress/T6480588.out similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/T6480588.out rename to test/langtools/tools/javac/warnings/suppress/T6480588.out diff --git a/langtools/test/tools/javac/warnings/suppress/T6707032.java b/test/langtools/tools/javac/warnings/suppress/T6707032.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/T6707032.java rename to test/langtools/tools/javac/warnings/suppress/T6707032.java diff --git a/langtools/test/tools/javac/warnings/suppress/T6707032.out b/test/langtools/tools/javac/warnings/suppress/T6707032.out similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/T6707032.out rename to test/langtools/tools/javac/warnings/suppress/T6707032.out diff --git a/langtools/test/tools/javac/warnings/suppress/T8021112a.java b/test/langtools/tools/javac/warnings/suppress/T8021112a.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/T8021112a.java rename to test/langtools/tools/javac/warnings/suppress/T8021112a.java diff --git a/langtools/test/tools/javac/warnings/suppress/T8021112b.java b/test/langtools/tools/javac/warnings/suppress/T8021112b.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/T8021112b.java rename to test/langtools/tools/javac/warnings/suppress/T8021112b.java diff --git a/langtools/test/tools/javac/warnings/suppress/T8021112b.out b/test/langtools/tools/javac/warnings/suppress/T8021112b.out similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/T8021112b.out rename to test/langtools/tools/javac/warnings/suppress/T8021112b.out diff --git a/langtools/test/tools/javac/warnings/suppress/T8069094.java b/test/langtools/tools/javac/warnings/suppress/T8069094.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/T8069094.java rename to test/langtools/tools/javac/warnings/suppress/T8069094.java diff --git a/langtools/test/tools/javac/warnings/suppress/T8069094.out b/test/langtools/tools/javac/warnings/suppress/T8069094.out similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/T8069094.out rename to test/langtools/tools/javac/warnings/suppress/T8069094.out diff --git a/langtools/test/tools/javac/warnings/suppress/TypeAnnotations.java b/test/langtools/tools/javac/warnings/suppress/TypeAnnotations.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/TypeAnnotations.java rename to test/langtools/tools/javac/warnings/suppress/TypeAnnotations.java diff --git a/langtools/test/tools/javac/warnings/suppress/TypeAnnotations.out b/test/langtools/tools/javac/warnings/suppress/TypeAnnotations.out similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/TypeAnnotations.out rename to test/langtools/tools/javac/warnings/suppress/TypeAnnotations.out diff --git a/langtools/test/tools/javac/warnings/suppress/VerifySuppressWarnings.java b/test/langtools/tools/javac/warnings/suppress/VerifySuppressWarnings.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/VerifySuppressWarnings.java rename to test/langtools/tools/javac/warnings/suppress/VerifySuppressWarnings.java diff --git a/langtools/test/tools/javac/warnings/suppress/pack/DeprecatedClass.java b/test/langtools/tools/javac/warnings/suppress/pack/DeprecatedClass.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/pack/DeprecatedClass.java rename to test/langtools/tools/javac/warnings/suppress/pack/DeprecatedClass.java diff --git a/langtools/test/tools/javac/warnings/suppress/pack/ImplicitMain.java b/test/langtools/tools/javac/warnings/suppress/pack/ImplicitMain.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/pack/ImplicitMain.java rename to test/langtools/tools/javac/warnings/suppress/pack/ImplicitMain.java diff --git a/langtools/test/tools/javac/warnings/suppress/pack/ImplicitUse.java b/test/langtools/tools/javac/warnings/suppress/pack/ImplicitUse.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/pack/ImplicitUse.java rename to test/langtools/tools/javac/warnings/suppress/pack/ImplicitUse.java diff --git a/langtools/test/tools/javac/warnings/suppress/pack/package-info.java b/test/langtools/tools/javac/warnings/suppress/pack/package-info.java similarity index 100% rename from langtools/test/tools/javac/warnings/suppress/pack/package-info.java rename to test/langtools/tools/javac/warnings/suppress/pack/package-info.java diff --git a/langtools/test/tools/javadoc/6176978/T6176978.java b/test/langtools/tools/javadoc/6176978/T6176978.java similarity index 100% rename from langtools/test/tools/javadoc/6176978/T6176978.java rename to test/langtools/tools/javadoc/6176978/T6176978.java diff --git a/langtools/test/tools/javadoc/6176978/X.java b/test/langtools/tools/javadoc/6176978/X.java similarity index 100% rename from langtools/test/tools/javadoc/6176978/X.java rename to test/langtools/tools/javadoc/6176978/X.java diff --git a/langtools/test/tools/javadoc/6227454/Test.java b/test/langtools/tools/javadoc/6227454/Test.java similarity index 100% rename from langtools/test/tools/javadoc/6227454/Test.java rename to test/langtools/tools/javadoc/6227454/Test.java diff --git a/langtools/test/tools/javadoc/6942366/T6942366.java b/test/langtools/tools/javadoc/6942366/T6942366.java similarity index 100% rename from langtools/test/tools/javadoc/6942366/T6942366.java rename to test/langtools/tools/javadoc/6942366/T6942366.java diff --git a/langtools/test/tools/javadoc/6942366/Test.java b/test/langtools/tools/javadoc/6942366/Test.java similarity index 100% rename from langtools/test/tools/javadoc/6942366/Test.java rename to test/langtools/tools/javadoc/6942366/Test.java diff --git a/langtools/test/tools/javadoc/6942366/p/Base.java b/test/langtools/tools/javadoc/6942366/p/Base.java similarity index 100% rename from langtools/test/tools/javadoc/6942366/p/Base.java rename to test/langtools/tools/javadoc/6942366/p/Base.java diff --git a/langtools/test/tools/javadoc/6958836/Test.java b/test/langtools/tools/javadoc/6958836/Test.java similarity index 100% rename from langtools/test/tools/javadoc/6958836/Test.java rename to test/langtools/tools/javadoc/6958836/Test.java diff --git a/langtools/test/tools/javadoc/6964914/Error.java b/test/langtools/tools/javadoc/6964914/Error.java similarity index 100% rename from langtools/test/tools/javadoc/6964914/Error.java rename to test/langtools/tools/javadoc/6964914/Error.java diff --git a/langtools/test/tools/javadoc/6964914/JavacWarning.java b/test/langtools/tools/javadoc/6964914/JavacWarning.java similarity index 100% rename from langtools/test/tools/javadoc/6964914/JavacWarning.java rename to test/langtools/tools/javadoc/6964914/JavacWarning.java diff --git a/langtools/test/tools/javadoc/6964914/JavadocWarning.java b/test/langtools/tools/javadoc/6964914/JavadocWarning.java similarity index 100% rename from langtools/test/tools/javadoc/6964914/JavadocWarning.java rename to test/langtools/tools/javadoc/6964914/JavadocWarning.java diff --git a/langtools/test/tools/javadoc/6964914/Test.java b/test/langtools/tools/javadoc/6964914/Test.java similarity index 100% rename from langtools/test/tools/javadoc/6964914/Test.java rename to test/langtools/tools/javadoc/6964914/Test.java diff --git a/langtools/test/tools/javadoc/6964914/TestStdDoclet.java b/test/langtools/tools/javadoc/6964914/TestStdDoclet.java similarity index 100% rename from langtools/test/tools/javadoc/6964914/TestStdDoclet.java rename to test/langtools/tools/javadoc/6964914/TestStdDoclet.java diff --git a/langtools/test/tools/javadoc/6964914/TestUserDoclet.java b/test/langtools/tools/javadoc/6964914/TestUserDoclet.java similarity index 100% rename from langtools/test/tools/javadoc/6964914/TestUserDoclet.java rename to test/langtools/tools/javadoc/6964914/TestUserDoclet.java diff --git a/langtools/test/tools/javadoc/8025693/Test.java b/test/langtools/tools/javadoc/8025693/Test.java similarity index 100% rename from langtools/test/tools/javadoc/8025693/Test.java rename to test/langtools/tools/javadoc/8025693/Test.java diff --git a/langtools/test/tools/javadoc/8147801/T8147801.java b/test/langtools/tools/javadoc/8147801/T8147801.java similarity index 100% rename from langtools/test/tools/javadoc/8147801/T8147801.java rename to test/langtools/tools/javadoc/8147801/T8147801.java diff --git a/langtools/test/tools/javadoc/8147801/jarsrc/lib/Lib1.java b/test/langtools/tools/javadoc/8147801/jarsrc/lib/Lib1.java similarity index 100% rename from langtools/test/tools/javadoc/8147801/jarsrc/lib/Lib1.java rename to test/langtools/tools/javadoc/8147801/jarsrc/lib/Lib1.java diff --git a/langtools/test/tools/javadoc/8147801/jarsrc/lib/Lib2.java b/test/langtools/tools/javadoc/8147801/jarsrc/lib/Lib2.java similarity index 100% rename from langtools/test/tools/javadoc/8147801/jarsrc/lib/Lib2.java rename to test/langtools/tools/javadoc/8147801/jarsrc/lib/Lib2.java diff --git a/langtools/test/tools/javadoc/8147801/p/Test.java b/test/langtools/tools/javadoc/8147801/p/Test.java similarity index 100% rename from langtools/test/tools/javadoc/8147801/p/Test.java rename to test/langtools/tools/javadoc/8147801/p/Test.java diff --git a/langtools/test/tools/javadoc/BadOptionsTest.java b/test/langtools/tools/javadoc/BadOptionsTest.java similarity index 100% rename from langtools/test/tools/javadoc/BadOptionsTest.java rename to test/langtools/tools/javadoc/BadOptionsTest.java diff --git a/langtools/test/tools/javadoc/BooleanConst.java b/test/langtools/tools/javadoc/BooleanConst.java similarity index 100% rename from langtools/test/tools/javadoc/BooleanConst.java rename to test/langtools/tools/javadoc/BooleanConst.java diff --git a/langtools/test/tools/javadoc/BreakIteratorWarning.java b/test/langtools/tools/javadoc/BreakIteratorWarning.java similarity index 100% rename from langtools/test/tools/javadoc/BreakIteratorWarning.java rename to test/langtools/tools/javadoc/BreakIteratorWarning.java diff --git a/langtools/test/tools/javadoc/CheckResourceKeys.java b/test/langtools/tools/javadoc/CheckResourceKeys.java similarity index 100% rename from langtools/test/tools/javadoc/CheckResourceKeys.java rename to test/langtools/tools/javadoc/CheckResourceKeys.java diff --git a/langtools/test/tools/javadoc/CompletionError.java b/test/langtools/tools/javadoc/CompletionError.java similarity index 100% rename from langtools/test/tools/javadoc/CompletionError.java rename to test/langtools/tools/javadoc/CompletionError.java diff --git a/langtools/test/tools/javadoc/FlagsTooEarly.java b/test/langtools/tools/javadoc/FlagsTooEarly.java similarity index 100% rename from langtools/test/tools/javadoc/FlagsTooEarly.java rename to test/langtools/tools/javadoc/FlagsTooEarly.java diff --git a/langtools/test/tools/javadoc/InlineTagsWithBraces.java b/test/langtools/tools/javadoc/InlineTagsWithBraces.java similarity index 100% rename from langtools/test/tools/javadoc/InlineTagsWithBraces.java rename to test/langtools/tools/javadoc/InlineTagsWithBraces.java diff --git a/langtools/test/tools/javadoc/LangVers.java b/test/langtools/tools/javadoc/LangVers.java similarity index 100% rename from langtools/test/tools/javadoc/LangVers.java rename to test/langtools/tools/javadoc/LangVers.java diff --git a/langtools/test/tools/javadoc/MaxWarns.java b/test/langtools/tools/javadoc/MaxWarns.java similarity index 100% rename from langtools/test/tools/javadoc/MaxWarns.java rename to test/langtools/tools/javadoc/MaxWarns.java diff --git a/langtools/test/tools/javadoc/MethodLinks.java b/test/langtools/tools/javadoc/MethodLinks.java similarity index 100% rename from langtools/test/tools/javadoc/MethodLinks.java rename to test/langtools/tools/javadoc/MethodLinks.java diff --git a/langtools/test/tools/javadoc/NoStar.java b/test/langtools/tools/javadoc/NoStar.java similarity index 100% rename from langtools/test/tools/javadoc/NoStar.java rename to test/langtools/tools/javadoc/NoStar.java diff --git a/langtools/test/tools/javadoc/ReleaseOption.java b/test/langtools/tools/javadoc/ReleaseOption.java similarity index 100% rename from langtools/test/tools/javadoc/ReleaseOption.java rename to test/langtools/tools/javadoc/ReleaseOption.java diff --git a/langtools/test/tools/javadoc/ReleaseOptionSource.java b/test/langtools/tools/javadoc/ReleaseOptionSource.java similarity index 100% rename from langtools/test/tools/javadoc/ReleaseOptionSource.java rename to test/langtools/tools/javadoc/ReleaseOptionSource.java diff --git a/langtools/test/tools/javadoc/T4994049/FileWithTabs.java b/test/langtools/tools/javadoc/T4994049/FileWithTabs.java similarity index 100% rename from langtools/test/tools/javadoc/T4994049/FileWithTabs.java rename to test/langtools/tools/javadoc/T4994049/FileWithTabs.java diff --git a/langtools/test/tools/javadoc/T4994049/T4994049.java b/test/langtools/tools/javadoc/T4994049/T4994049.java similarity index 100% rename from langtools/test/tools/javadoc/T4994049/T4994049.java rename to test/langtools/tools/javadoc/T4994049/T4994049.java diff --git a/langtools/test/tools/javadoc/T6968833.java b/test/langtools/tools/javadoc/T6968833.java similarity index 100% rename from langtools/test/tools/javadoc/T6968833.java rename to test/langtools/tools/javadoc/T6968833.java diff --git a/langtools/test/tools/javadoc/XWerror.java b/test/langtools/tools/javadoc/XWerror.java similarity index 100% rename from langtools/test/tools/javadoc/XWerror.java rename to test/langtools/tools/javadoc/XWerror.java diff --git a/langtools/test/tools/javadoc/annotations/annotateMethodsFields/Main.java b/test/langtools/tools/javadoc/annotations/annotateMethodsFields/Main.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotateMethodsFields/Main.java rename to test/langtools/tools/javadoc/annotations/annotateMethodsFields/Main.java diff --git a/langtools/test/tools/javadoc/annotations/annotateMethodsFields/expected.out b/test/langtools/tools/javadoc/annotations/annotateMethodsFields/expected.out similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotateMethodsFields/expected.out rename to test/langtools/tools/javadoc/annotations/annotateMethodsFields/expected.out diff --git a/langtools/test/tools/javadoc/annotations/annotateMethodsFields/pkg1/A.java b/test/langtools/tools/javadoc/annotations/annotateMethodsFields/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotateMethodsFields/pkg1/A.java rename to test/langtools/tools/javadoc/annotations/annotateMethodsFields/pkg1/A.java diff --git a/langtools/test/tools/javadoc/annotations/annotateMethodsFields/pkg1/B.java b/test/langtools/tools/javadoc/annotations/annotateMethodsFields/pkg1/B.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotateMethodsFields/pkg1/B.java rename to test/langtools/tools/javadoc/annotations/annotateMethodsFields/pkg1/B.java diff --git a/langtools/test/tools/javadoc/annotations/annotateMethodsFields/pkg1/E.java b/test/langtools/tools/javadoc/annotations/annotateMethodsFields/pkg1/E.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotateMethodsFields/pkg1/E.java rename to test/langtools/tools/javadoc/annotations/annotateMethodsFields/pkg1/E.java diff --git a/langtools/test/tools/javadoc/annotations/annotatePackage/Main.java b/test/langtools/tools/javadoc/annotations/annotatePackage/Main.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotatePackage/Main.java rename to test/langtools/tools/javadoc/annotations/annotatePackage/Main.java diff --git a/langtools/test/tools/javadoc/annotations/annotatePackage/expected.out b/test/langtools/tools/javadoc/annotations/annotatePackage/expected.out similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotatePackage/expected.out rename to test/langtools/tools/javadoc/annotations/annotatePackage/expected.out diff --git a/langtools/test/tools/javadoc/annotations/annotatePackage/pkg1/A.java b/test/langtools/tools/javadoc/annotations/annotatePackage/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotatePackage/pkg1/A.java rename to test/langtools/tools/javadoc/annotations/annotatePackage/pkg1/A.java diff --git a/langtools/test/tools/javadoc/annotations/annotatePackage/pkg1/package-info.java b/test/langtools/tools/javadoc/annotations/annotatePackage/pkg1/package-info.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotatePackage/pkg1/package-info.java rename to test/langtools/tools/javadoc/annotations/annotatePackage/pkg1/package-info.java diff --git a/langtools/test/tools/javadoc/annotations/annotatePackage/pkg1/package.html b/test/langtools/tools/javadoc/annotations/annotatePackage/pkg1/package.html similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotatePackage/pkg1/package.html rename to test/langtools/tools/javadoc/annotations/annotatePackage/pkg1/package.html diff --git a/langtools/test/tools/javadoc/annotations/annotatePackage/pkg2/B.java b/test/langtools/tools/javadoc/annotations/annotatePackage/pkg2/B.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotatePackage/pkg2/B.java rename to test/langtools/tools/javadoc/annotations/annotatePackage/pkg2/B.java diff --git a/langtools/test/tools/javadoc/annotations/annotatePackage/pkg2/package.html b/test/langtools/tools/javadoc/annotations/annotatePackage/pkg2/package.html similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotatePackage/pkg2/package.html rename to test/langtools/tools/javadoc/annotations/annotatePackage/pkg2/package.html diff --git a/langtools/test/tools/javadoc/annotations/annotateParams/Main.java b/test/langtools/tools/javadoc/annotations/annotateParams/Main.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotateParams/Main.java rename to test/langtools/tools/javadoc/annotations/annotateParams/Main.java diff --git a/langtools/test/tools/javadoc/annotations/annotateParams/expected.out b/test/langtools/tools/javadoc/annotations/annotateParams/expected.out similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotateParams/expected.out rename to test/langtools/tools/javadoc/annotations/annotateParams/expected.out diff --git a/langtools/test/tools/javadoc/annotations/annotateParams/pkg1/A.java b/test/langtools/tools/javadoc/annotations/annotateParams/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotateParams/pkg1/A.java rename to test/langtools/tools/javadoc/annotations/annotateParams/pkg1/A.java diff --git a/langtools/test/tools/javadoc/annotations/annotateParams/pkg1/C.java b/test/langtools/tools/javadoc/annotations/annotateParams/pkg1/C.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/annotateParams/pkg1/C.java rename to test/langtools/tools/javadoc/annotations/annotateParams/pkg1/C.java diff --git a/langtools/test/tools/javadoc/annotations/badVals/Main.java b/test/langtools/tools/javadoc/annotations/badVals/Main.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/badVals/Main.java rename to test/langtools/tools/javadoc/annotations/badVals/Main.java diff --git a/langtools/test/tools/javadoc/annotations/badVals/pkg1/A.java b/test/langtools/tools/javadoc/annotations/badVals/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/badVals/pkg1/A.java rename to test/langtools/tools/javadoc/annotations/badVals/pkg1/A.java diff --git a/langtools/test/tools/javadoc/annotations/defaults/Main.java b/test/langtools/tools/javadoc/annotations/defaults/Main.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/defaults/Main.java rename to test/langtools/tools/javadoc/annotations/defaults/Main.java diff --git a/langtools/test/tools/javadoc/annotations/defaults/expected.out b/test/langtools/tools/javadoc/annotations/defaults/expected.out similarity index 100% rename from langtools/test/tools/javadoc/annotations/defaults/expected.out rename to test/langtools/tools/javadoc/annotations/defaults/expected.out diff --git a/langtools/test/tools/javadoc/annotations/defaults/pkg1/A.java b/test/langtools/tools/javadoc/annotations/defaults/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/defaults/pkg1/A.java rename to test/langtools/tools/javadoc/annotations/defaults/pkg1/A.java diff --git a/langtools/test/tools/javadoc/annotations/defaults/pkg1/B.java b/test/langtools/tools/javadoc/annotations/defaults/pkg1/B.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/defaults/pkg1/B.java rename to test/langtools/tools/javadoc/annotations/defaults/pkg1/B.java diff --git a/langtools/test/tools/javadoc/annotations/elementTypes/Main.java b/test/langtools/tools/javadoc/annotations/elementTypes/Main.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/elementTypes/Main.java rename to test/langtools/tools/javadoc/annotations/elementTypes/Main.java diff --git a/langtools/test/tools/javadoc/annotations/elementTypes/expected.out b/test/langtools/tools/javadoc/annotations/elementTypes/expected.out similarity index 100% rename from langtools/test/tools/javadoc/annotations/elementTypes/expected.out rename to test/langtools/tools/javadoc/annotations/elementTypes/expected.out diff --git a/langtools/test/tools/javadoc/annotations/elementTypes/pkg1/A.java b/test/langtools/tools/javadoc/annotations/elementTypes/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/elementTypes/pkg1/A.java rename to test/langtools/tools/javadoc/annotations/elementTypes/pkg1/A.java diff --git a/langtools/test/tools/javadoc/annotations/elementTypes/pkg1/B.java b/test/langtools/tools/javadoc/annotations/elementTypes/pkg1/B.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/elementTypes/pkg1/B.java rename to test/langtools/tools/javadoc/annotations/elementTypes/pkg1/B.java diff --git a/langtools/test/tools/javadoc/annotations/missing/Main.java b/test/langtools/tools/javadoc/annotations/missing/Main.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/missing/Main.java rename to test/langtools/tools/javadoc/annotations/missing/Main.java diff --git a/langtools/test/tools/javadoc/annotations/missing/somepackage/MissingAnnotationClass.java b/test/langtools/tools/javadoc/annotations/missing/somepackage/MissingAnnotationClass.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/missing/somepackage/MissingAnnotationClass.java rename to test/langtools/tools/javadoc/annotations/missing/somepackage/MissingAnnotationClass.java diff --git a/langtools/test/tools/javadoc/annotations/shortcuts/Main.java b/test/langtools/tools/javadoc/annotations/shortcuts/Main.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/shortcuts/Main.java rename to test/langtools/tools/javadoc/annotations/shortcuts/Main.java diff --git a/langtools/test/tools/javadoc/annotations/shortcuts/expected.out b/test/langtools/tools/javadoc/annotations/shortcuts/expected.out similarity index 100% rename from langtools/test/tools/javadoc/annotations/shortcuts/expected.out rename to test/langtools/tools/javadoc/annotations/shortcuts/expected.out diff --git a/langtools/test/tools/javadoc/annotations/shortcuts/pkg1/A.java b/test/langtools/tools/javadoc/annotations/shortcuts/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/shortcuts/pkg1/A.java rename to test/langtools/tools/javadoc/annotations/shortcuts/pkg1/A.java diff --git a/langtools/test/tools/javadoc/annotations/shortcuts/pkg1/Array.java b/test/langtools/tools/javadoc/annotations/shortcuts/pkg1/Array.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/shortcuts/pkg1/Array.java rename to test/langtools/tools/javadoc/annotations/shortcuts/pkg1/Array.java diff --git a/langtools/test/tools/javadoc/annotations/shortcuts/pkg1/Marker.java b/test/langtools/tools/javadoc/annotations/shortcuts/pkg1/Marker.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/shortcuts/pkg1/Marker.java rename to test/langtools/tools/javadoc/annotations/shortcuts/pkg1/Marker.java diff --git a/langtools/test/tools/javadoc/annotations/shortcuts/pkg1/Value.java b/test/langtools/tools/javadoc/annotations/shortcuts/pkg1/Value.java similarity index 100% rename from langtools/test/tools/javadoc/annotations/shortcuts/pkg1/Value.java rename to test/langtools/tools/javadoc/annotations/shortcuts/pkg1/Value.java diff --git a/langtools/test/tools/javadoc/api/basic/APITest.java b/test/langtools/tools/javadoc/api/basic/APITest.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/APITest.java rename to test/langtools/tools/javadoc/api/basic/APITest.java diff --git a/langtools/test/tools/javadoc/api/basic/DocletPathTest.java b/test/langtools/tools/javadoc/api/basic/DocletPathTest.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/DocletPathTest.java rename to test/langtools/tools/javadoc/api/basic/DocletPathTest.java diff --git a/langtools/test/tools/javadoc/api/basic/DocumentationToolLocationTest.java b/test/langtools/tools/javadoc/api/basic/DocumentationToolLocationTest.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/DocumentationToolLocationTest.java rename to test/langtools/tools/javadoc/api/basic/DocumentationToolLocationTest.java diff --git a/langtools/test/tools/javadoc/api/basic/GetSourceVersionsTest.java b/test/langtools/tools/javadoc/api/basic/GetSourceVersionsTest.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/GetSourceVersionsTest.java rename to test/langtools/tools/javadoc/api/basic/GetSourceVersionsTest.java diff --git a/langtools/test/tools/javadoc/api/basic/GetTask_DiagListenerTest.java b/test/langtools/tools/javadoc/api/basic/GetTask_DiagListenerTest.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/GetTask_DiagListenerTest.java rename to test/langtools/tools/javadoc/api/basic/GetTask_DiagListenerTest.java diff --git a/langtools/test/tools/javadoc/api/basic/GetTask_DocletClassTest.java b/test/langtools/tools/javadoc/api/basic/GetTask_DocletClassTest.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/GetTask_DocletClassTest.java rename to test/langtools/tools/javadoc/api/basic/GetTask_DocletClassTest.java diff --git a/langtools/test/tools/javadoc/api/basic/GetTask_FileManagerTest.java b/test/langtools/tools/javadoc/api/basic/GetTask_FileManagerTest.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/GetTask_FileManagerTest.java rename to test/langtools/tools/javadoc/api/basic/GetTask_FileManagerTest.java diff --git a/langtools/test/tools/javadoc/api/basic/GetTask_FileObjectsTest.java b/test/langtools/tools/javadoc/api/basic/GetTask_FileObjectsTest.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/GetTask_FileObjectsTest.java rename to test/langtools/tools/javadoc/api/basic/GetTask_FileObjectsTest.java diff --git a/langtools/test/tools/javadoc/api/basic/GetTask_OptionsTest.java b/test/langtools/tools/javadoc/api/basic/GetTask_OptionsTest.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/GetTask_OptionsTest.java rename to test/langtools/tools/javadoc/api/basic/GetTask_OptionsTest.java diff --git a/langtools/test/tools/javadoc/api/basic/GetTask_WriterTest.java b/test/langtools/tools/javadoc/api/basic/GetTask_WriterTest.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/GetTask_WriterTest.java rename to test/langtools/tools/javadoc/api/basic/GetTask_WriterTest.java diff --git a/langtools/test/tools/javadoc/api/basic/IsSupportedOptionTest.java b/test/langtools/tools/javadoc/api/basic/IsSupportedOptionTest.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/IsSupportedOptionTest.java rename to test/langtools/tools/javadoc/api/basic/IsSupportedOptionTest.java diff --git a/langtools/test/tools/javadoc/api/basic/Task_reuseTest.java b/test/langtools/tools/javadoc/api/basic/Task_reuseTest.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/Task_reuseTest.java rename to test/langtools/tools/javadoc/api/basic/Task_reuseTest.java diff --git a/langtools/test/tools/javadoc/api/basic/pkg/C.java b/test/langtools/tools/javadoc/api/basic/pkg/C.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/pkg/C.java rename to test/langtools/tools/javadoc/api/basic/pkg/C.java diff --git a/langtools/test/tools/javadoc/api/basic/taglets/UnderlineTaglet.java b/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java similarity index 100% rename from langtools/test/tools/javadoc/api/basic/taglets/UnderlineTaglet.java rename to test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java diff --git a/langtools/test/tools/javadoc/completionFailure/CompletionFailure.java b/test/langtools/tools/javadoc/completionFailure/CompletionFailure.java similarity index 100% rename from langtools/test/tools/javadoc/completionFailure/CompletionFailure.java rename to test/langtools/tools/javadoc/completionFailure/CompletionFailure.java diff --git a/langtools/test/tools/javadoc/completionFailure/pkg/A.java b/test/langtools/tools/javadoc/completionFailure/pkg/A.java similarity index 100% rename from langtools/test/tools/javadoc/completionFailure/pkg/A.java rename to test/langtools/tools/javadoc/completionFailure/pkg/A.java diff --git a/langtools/test/tools/javadoc/completionFailure/pkg/B.java b/test/langtools/tools/javadoc/completionFailure/pkg/B.java similarity index 100% rename from langtools/test/tools/javadoc/completionFailure/pkg/B.java rename to test/langtools/tools/javadoc/completionFailure/pkg/B.java diff --git a/langtools/test/tools/javadoc/dupOk/DupOk.java b/test/langtools/tools/javadoc/dupOk/DupOk.java similarity index 100% rename from langtools/test/tools/javadoc/dupOk/DupOk.java rename to test/langtools/tools/javadoc/dupOk/DupOk.java diff --git a/langtools/test/tools/javadoc/dupOk/sp1/p/A.java b/test/langtools/tools/javadoc/dupOk/sp1/p/A.java similarity index 100% rename from langtools/test/tools/javadoc/dupOk/sp1/p/A.java rename to test/langtools/tools/javadoc/dupOk/sp1/p/A.java diff --git a/langtools/test/tools/javadoc/dupOk/sp2/p/A.java b/test/langtools/tools/javadoc/dupOk/sp2/p/A.java similarity index 100% rename from langtools/test/tools/javadoc/dupOk/sp2/p/A.java rename to test/langtools/tools/javadoc/dupOk/sp2/p/A.java diff --git a/langtools/test/tools/javadoc/dupOk/sp2/p/B.java b/test/langtools/tools/javadoc/dupOk/sp2/p/B.java similarity index 100% rename from langtools/test/tools/javadoc/dupOk/sp2/p/B.java rename to test/langtools/tools/javadoc/dupOk/sp2/p/B.java diff --git a/langtools/test/tools/javadoc/enum/docComments/Main.java b/test/langtools/tools/javadoc/enum/docComments/Main.java similarity index 100% rename from langtools/test/tools/javadoc/enum/docComments/Main.java rename to test/langtools/tools/javadoc/enum/docComments/Main.java diff --git a/langtools/test/tools/javadoc/enum/docComments/pkg1/Operation.java b/test/langtools/tools/javadoc/enum/docComments/pkg1/Operation.java similarity index 100% rename from langtools/test/tools/javadoc/enum/docComments/pkg1/Operation.java rename to test/langtools/tools/javadoc/enum/docComments/pkg1/Operation.java diff --git a/langtools/test/tools/javadoc/enum/enumType/Main.java b/test/langtools/tools/javadoc/enum/enumType/Main.java similarity index 100% rename from langtools/test/tools/javadoc/enum/enumType/Main.java rename to test/langtools/tools/javadoc/enum/enumType/Main.java diff --git a/langtools/test/tools/javadoc/enum/enumType/expected.out b/test/langtools/tools/javadoc/enum/enumType/expected.out similarity index 100% rename from langtools/test/tools/javadoc/enum/enumType/expected.out rename to test/langtools/tools/javadoc/enum/enumType/expected.out diff --git a/langtools/test/tools/javadoc/enum/enumType/pkg1/QuotablePerson.java b/test/langtools/tools/javadoc/enum/enumType/pkg1/QuotablePerson.java similarity index 100% rename from langtools/test/tools/javadoc/enum/enumType/pkg1/QuotablePerson.java rename to test/langtools/tools/javadoc/enum/enumType/pkg1/QuotablePerson.java diff --git a/langtools/test/tools/javadoc/generics/genericClass/Main.java b/test/langtools/tools/javadoc/generics/genericClass/Main.java similarity index 100% rename from langtools/test/tools/javadoc/generics/genericClass/Main.java rename to test/langtools/tools/javadoc/generics/genericClass/Main.java diff --git a/langtools/test/tools/javadoc/generics/genericClass/expected.out b/test/langtools/tools/javadoc/generics/genericClass/expected.out similarity index 100% rename from langtools/test/tools/javadoc/generics/genericClass/expected.out rename to test/langtools/tools/javadoc/generics/genericClass/expected.out diff --git a/langtools/test/tools/javadoc/generics/genericClass/pkg1/A.java b/test/langtools/tools/javadoc/generics/genericClass/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/generics/genericClass/pkg1/A.java rename to test/langtools/tools/javadoc/generics/genericClass/pkg1/A.java diff --git a/langtools/test/tools/javadoc/generics/genericInnerAndOuter/Main.java b/test/langtools/tools/javadoc/generics/genericInnerAndOuter/Main.java similarity index 100% rename from langtools/test/tools/javadoc/generics/genericInnerAndOuter/Main.java rename to test/langtools/tools/javadoc/generics/genericInnerAndOuter/Main.java diff --git a/langtools/test/tools/javadoc/generics/genericInnerAndOuter/expected.out b/test/langtools/tools/javadoc/generics/genericInnerAndOuter/expected.out similarity index 100% rename from langtools/test/tools/javadoc/generics/genericInnerAndOuter/expected.out rename to test/langtools/tools/javadoc/generics/genericInnerAndOuter/expected.out diff --git a/langtools/test/tools/javadoc/generics/genericInnerAndOuter/pkg1/O.java b/test/langtools/tools/javadoc/generics/genericInnerAndOuter/pkg1/O.java similarity index 100% rename from langtools/test/tools/javadoc/generics/genericInnerAndOuter/pkg1/O.java rename to test/langtools/tools/javadoc/generics/genericInnerAndOuter/pkg1/O.java diff --git a/langtools/test/tools/javadoc/generics/genericInnerAndOuter/pkg1/X.java b/test/langtools/tools/javadoc/generics/genericInnerAndOuter/pkg1/X.java similarity index 100% rename from langtools/test/tools/javadoc/generics/genericInnerAndOuter/pkg1/X.java rename to test/langtools/tools/javadoc/generics/genericInnerAndOuter/pkg1/X.java diff --git a/langtools/test/tools/javadoc/generics/genericInterface/Main.java b/test/langtools/tools/javadoc/generics/genericInterface/Main.java similarity index 100% rename from langtools/test/tools/javadoc/generics/genericInterface/Main.java rename to test/langtools/tools/javadoc/generics/genericInterface/Main.java diff --git a/langtools/test/tools/javadoc/generics/genericInterface/expected.out b/test/langtools/tools/javadoc/generics/genericInterface/expected.out similarity index 100% rename from langtools/test/tools/javadoc/generics/genericInterface/expected.out rename to test/langtools/tools/javadoc/generics/genericInterface/expected.out diff --git a/langtools/test/tools/javadoc/generics/genericInterface/pkg1/A.java b/test/langtools/tools/javadoc/generics/genericInterface/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/generics/genericInterface/pkg1/A.java rename to test/langtools/tools/javadoc/generics/genericInterface/pkg1/A.java diff --git a/langtools/test/tools/javadoc/generics/genericMethod/Main.java b/test/langtools/tools/javadoc/generics/genericMethod/Main.java similarity index 100% rename from langtools/test/tools/javadoc/generics/genericMethod/Main.java rename to test/langtools/tools/javadoc/generics/genericMethod/Main.java diff --git a/langtools/test/tools/javadoc/generics/genericMethod/expected.out b/test/langtools/tools/javadoc/generics/genericMethod/expected.out similarity index 100% rename from langtools/test/tools/javadoc/generics/genericMethod/expected.out rename to test/langtools/tools/javadoc/generics/genericMethod/expected.out diff --git a/langtools/test/tools/javadoc/generics/genericMethod/pkg1/A.java b/test/langtools/tools/javadoc/generics/genericMethod/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/generics/genericMethod/pkg1/A.java rename to test/langtools/tools/javadoc/generics/genericMethod/pkg1/A.java diff --git a/langtools/test/tools/javadoc/generics/genericSuper/Main.java b/test/langtools/tools/javadoc/generics/genericSuper/Main.java similarity index 100% rename from langtools/test/tools/javadoc/generics/genericSuper/Main.java rename to test/langtools/tools/javadoc/generics/genericSuper/Main.java diff --git a/langtools/test/tools/javadoc/generics/genericSuper/expected.out b/test/langtools/tools/javadoc/generics/genericSuper/expected.out similarity index 100% rename from langtools/test/tools/javadoc/generics/genericSuper/expected.out rename to test/langtools/tools/javadoc/generics/genericSuper/expected.out diff --git a/langtools/test/tools/javadoc/generics/genericSuper/pkg1/A.java b/test/langtools/tools/javadoc/generics/genericSuper/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/generics/genericSuper/pkg1/A.java rename to test/langtools/tools/javadoc/generics/genericSuper/pkg1/A.java diff --git a/langtools/test/tools/javadoc/generics/supertypes/Main.java b/test/langtools/tools/javadoc/generics/supertypes/Main.java similarity index 100% rename from langtools/test/tools/javadoc/generics/supertypes/Main.java rename to test/langtools/tools/javadoc/generics/supertypes/Main.java diff --git a/langtools/test/tools/javadoc/generics/supertypes/expected.out b/test/langtools/tools/javadoc/generics/supertypes/expected.out similarity index 100% rename from langtools/test/tools/javadoc/generics/supertypes/expected.out rename to test/langtools/tools/javadoc/generics/supertypes/expected.out diff --git a/langtools/test/tools/javadoc/generics/supertypes/pkg1/A.java b/test/langtools/tools/javadoc/generics/supertypes/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/generics/supertypes/pkg1/A.java rename to test/langtools/tools/javadoc/generics/supertypes/pkg1/A.java diff --git a/langtools/test/tools/javadoc/generics/supertypes/pkg1/B.java b/test/langtools/tools/javadoc/generics/supertypes/pkg1/B.java similarity index 100% rename from langtools/test/tools/javadoc/generics/supertypes/pkg1/B.java rename to test/langtools/tools/javadoc/generics/supertypes/pkg1/B.java diff --git a/langtools/test/tools/javadoc/generics/throwsGeneric/Main.java b/test/langtools/tools/javadoc/generics/throwsGeneric/Main.java similarity index 100% rename from langtools/test/tools/javadoc/generics/throwsGeneric/Main.java rename to test/langtools/tools/javadoc/generics/throwsGeneric/Main.java diff --git a/langtools/test/tools/javadoc/generics/throwsGeneric/expected.out b/test/langtools/tools/javadoc/generics/throwsGeneric/expected.out similarity index 100% rename from langtools/test/tools/javadoc/generics/throwsGeneric/expected.out rename to test/langtools/tools/javadoc/generics/throwsGeneric/expected.out diff --git a/langtools/test/tools/javadoc/generics/throwsGeneric/pkg1/A.java b/test/langtools/tools/javadoc/generics/throwsGeneric/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/generics/throwsGeneric/pkg1/A.java rename to test/langtools/tools/javadoc/generics/throwsGeneric/pkg1/A.java diff --git a/langtools/test/tools/javadoc/generics/tparamCycle/Main.java b/test/langtools/tools/javadoc/generics/tparamCycle/Main.java similarity index 100% rename from langtools/test/tools/javadoc/generics/tparamCycle/Main.java rename to test/langtools/tools/javadoc/generics/tparamCycle/Main.java diff --git a/langtools/test/tools/javadoc/generics/tparamCycle/pkg1/LikeEnum.java b/test/langtools/tools/javadoc/generics/tparamCycle/pkg1/LikeEnum.java similarity index 100% rename from langtools/test/tools/javadoc/generics/tparamCycle/pkg1/LikeEnum.java rename to test/langtools/tools/javadoc/generics/tparamCycle/pkg1/LikeEnum.java diff --git a/langtools/test/tools/javadoc/generics/tparamTagOnMethod/Main.java b/test/langtools/tools/javadoc/generics/tparamTagOnMethod/Main.java similarity index 100% rename from langtools/test/tools/javadoc/generics/tparamTagOnMethod/Main.java rename to test/langtools/tools/javadoc/generics/tparamTagOnMethod/Main.java diff --git a/langtools/test/tools/javadoc/generics/tparamTagOnMethod/expected.out b/test/langtools/tools/javadoc/generics/tparamTagOnMethod/expected.out similarity index 100% rename from langtools/test/tools/javadoc/generics/tparamTagOnMethod/expected.out rename to test/langtools/tools/javadoc/generics/tparamTagOnMethod/expected.out diff --git a/langtools/test/tools/javadoc/generics/tparamTagOnMethod/pkg1/A.java b/test/langtools/tools/javadoc/generics/tparamTagOnMethod/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/generics/tparamTagOnMethod/pkg1/A.java rename to test/langtools/tools/javadoc/generics/tparamTagOnMethod/pkg1/A.java diff --git a/langtools/test/tools/javadoc/generics/tparamTagOnType/Main.java b/test/langtools/tools/javadoc/generics/tparamTagOnType/Main.java similarity index 100% rename from langtools/test/tools/javadoc/generics/tparamTagOnType/Main.java rename to test/langtools/tools/javadoc/generics/tparamTagOnType/Main.java diff --git a/langtools/test/tools/javadoc/generics/tparamTagOnType/expected.out b/test/langtools/tools/javadoc/generics/tparamTagOnType/expected.out similarity index 100% rename from langtools/test/tools/javadoc/generics/tparamTagOnType/expected.out rename to test/langtools/tools/javadoc/generics/tparamTagOnType/expected.out diff --git a/langtools/test/tools/javadoc/generics/tparamTagOnType/pkg1/A.java b/test/langtools/tools/javadoc/generics/tparamTagOnType/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/generics/tparamTagOnType/pkg1/A.java rename to test/langtools/tools/javadoc/generics/tparamTagOnType/pkg1/A.java diff --git a/langtools/test/tools/javadoc/generics/wildcards/Main.java b/test/langtools/tools/javadoc/generics/wildcards/Main.java similarity index 100% rename from langtools/test/tools/javadoc/generics/wildcards/Main.java rename to test/langtools/tools/javadoc/generics/wildcards/Main.java diff --git a/langtools/test/tools/javadoc/generics/wildcards/expected.out b/test/langtools/tools/javadoc/generics/wildcards/expected.out similarity index 100% rename from langtools/test/tools/javadoc/generics/wildcards/expected.out rename to test/langtools/tools/javadoc/generics/wildcards/expected.out diff --git a/langtools/test/tools/javadoc/generics/wildcards/pkg1/A.java b/test/langtools/tools/javadoc/generics/wildcards/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/generics/wildcards/pkg1/A.java rename to test/langtools/tools/javadoc/generics/wildcards/pkg1/A.java diff --git a/langtools/test/tools/javadoc/imports/I.java b/test/langtools/tools/javadoc/imports/I.java similarity index 100% rename from langtools/test/tools/javadoc/imports/I.java rename to test/langtools/tools/javadoc/imports/I.java diff --git a/langtools/test/tools/javadoc/imports/MissingImport.java b/test/langtools/tools/javadoc/imports/MissingImport.java similarity index 100% rename from langtools/test/tools/javadoc/imports/MissingImport.java rename to test/langtools/tools/javadoc/imports/MissingImport.java diff --git a/langtools/test/tools/javadoc/lib/OldToolTester.java b/test/langtools/tools/javadoc/lib/OldToolTester.java similarity index 100% rename from langtools/test/tools/javadoc/lib/OldToolTester.java rename to test/langtools/tools/javadoc/lib/OldToolTester.java diff --git a/langtools/test/tools/javadoc/lib/ToyDoclet.java b/test/langtools/tools/javadoc/lib/ToyDoclet.java similarity index 100% rename from langtools/test/tools/javadoc/lib/ToyDoclet.java rename to test/langtools/tools/javadoc/lib/ToyDoclet.java diff --git a/langtools/test/tools/javadoc/nestedClass/NestedClass.java b/test/langtools/tools/javadoc/nestedClass/NestedClass.java similarity index 100% rename from langtools/test/tools/javadoc/nestedClass/NestedClass.java rename to test/langtools/tools/javadoc/nestedClass/NestedClass.java diff --git a/langtools/test/tools/javadoc/nestedClass/NestedClassB.java b/test/langtools/tools/javadoc/nestedClass/NestedClassB.java similarity index 100% rename from langtools/test/tools/javadoc/nestedClass/NestedClassB.java rename to test/langtools/tools/javadoc/nestedClass/NestedClassB.java diff --git a/langtools/test/tools/javadoc/nonConstExprs/Test.java b/test/langtools/tools/javadoc/nonConstExprs/Test.java similarity index 100% rename from langtools/test/tools/javadoc/nonConstExprs/Test.java rename to test/langtools/tools/javadoc/nonConstExprs/Test.java diff --git a/langtools/test/tools/javadoc/outputRedirect/Test.java b/test/langtools/tools/javadoc/outputRedirect/Test.java similarity index 100% rename from langtools/test/tools/javadoc/outputRedirect/Test.java rename to test/langtools/tools/javadoc/outputRedirect/Test.java diff --git a/langtools/test/tools/javadoc/outputRedirect/p/OutputRedirect.java b/test/langtools/tools/javadoc/outputRedirect/p/OutputRedirect.java similarity index 100% rename from langtools/test/tools/javadoc/outputRedirect/p/OutputRedirect.java rename to test/langtools/tools/javadoc/outputRedirect/p/OutputRedirect.java diff --git a/langtools/test/tools/javadoc/parser/7091528/T7091528.java b/test/langtools/tools/javadoc/parser/7091528/T7091528.java similarity index 100% rename from langtools/test/tools/javadoc/parser/7091528/T7091528.java rename to test/langtools/tools/javadoc/parser/7091528/T7091528.java diff --git a/langtools/test/tools/javadoc/parser/7091528/p/C1.java b/test/langtools/tools/javadoc/parser/7091528/p/C1.java similarity index 100% rename from langtools/test/tools/javadoc/parser/7091528/p/C1.java rename to test/langtools/tools/javadoc/parser/7091528/p/C1.java diff --git a/langtools/test/tools/javadoc/parser/7091528/p/C3.java b/test/langtools/tools/javadoc/parser/7091528/p/C3.java similarity index 100% rename from langtools/test/tools/javadoc/parser/7091528/p/C3.java rename to test/langtools/tools/javadoc/parser/7091528/p/C3.java diff --git a/langtools/test/tools/javadoc/parser/7091528/p/q/C2.java b/test/langtools/tools/javadoc/parser/7091528/p/q/C2.java similarity index 100% rename from langtools/test/tools/javadoc/parser/7091528/p/q/C2.java rename to test/langtools/tools/javadoc/parser/7091528/p/q/C2.java diff --git a/langtools/test/tools/javadoc/sourceOnly/Test.java b/test/langtools/tools/javadoc/sourceOnly/Test.java similarity index 100% rename from langtools/test/tools/javadoc/sourceOnly/Test.java rename to test/langtools/tools/javadoc/sourceOnly/Test.java diff --git a/langtools/test/tools/javadoc/sourceOnly/p/NonSource.class b/test/langtools/tools/javadoc/sourceOnly/p/NonSource.class similarity index 100% rename from langtools/test/tools/javadoc/sourceOnly/p/NonSource.class rename to test/langtools/tools/javadoc/sourceOnly/p/NonSource.class diff --git a/langtools/test/tools/javadoc/sourceOnly/p/SourceOnly.java b/test/langtools/tools/javadoc/sourceOnly/p/SourceOnly.java similarity index 100% rename from langtools/test/tools/javadoc/sourceOnly/p/SourceOnly.java rename to test/langtools/tools/javadoc/sourceOnly/p/SourceOnly.java diff --git a/langtools/test/tools/javadoc/sourceOption/SourceOption.java b/test/langtools/tools/javadoc/sourceOption/SourceOption.java similarity index 100% rename from langtools/test/tools/javadoc/sourceOption/SourceOption.java rename to test/langtools/tools/javadoc/sourceOption/SourceOption.java diff --git a/langtools/test/tools/javadoc/sourceOption/p/LambdaConstructTest.java b/test/langtools/tools/javadoc/sourceOption/p/LambdaConstructTest.java similarity index 100% rename from langtools/test/tools/javadoc/sourceOption/p/LambdaConstructTest.java rename to test/langtools/tools/javadoc/sourceOption/p/LambdaConstructTest.java diff --git a/langtools/test/tools/javadoc/subpackageIgnore/SubpackageIgnore.java b/test/langtools/tools/javadoc/subpackageIgnore/SubpackageIgnore.java similarity index 100% rename from langtools/test/tools/javadoc/subpackageIgnore/SubpackageIgnore.java rename to test/langtools/tools/javadoc/subpackageIgnore/SubpackageIgnore.java diff --git a/langtools/test/tools/javadoc/subpackageIgnore/pkg1/not-subpkg/SomeJavaFile.java b/test/langtools/tools/javadoc/subpackageIgnore/pkg1/not-subpkg/SomeJavaFile.java similarity index 100% rename from langtools/test/tools/javadoc/subpackageIgnore/pkg1/not-subpkg/SomeJavaFile.java rename to test/langtools/tools/javadoc/subpackageIgnore/pkg1/not-subpkg/SomeJavaFile.java diff --git a/langtools/test/tools/javadoc/varArgs/Main.java b/test/langtools/tools/javadoc/varArgs/Main.java similarity index 100% rename from langtools/test/tools/javadoc/varArgs/Main.java rename to test/langtools/tools/javadoc/varArgs/Main.java diff --git a/langtools/test/tools/javadoc/varArgs/expected.out b/test/langtools/tools/javadoc/varArgs/expected.out similarity index 100% rename from langtools/test/tools/javadoc/varArgs/expected.out rename to test/langtools/tools/javadoc/varArgs/expected.out diff --git a/langtools/test/tools/javadoc/varArgs/pkg1/A.java b/test/langtools/tools/javadoc/varArgs/pkg1/A.java similarity index 100% rename from langtools/test/tools/javadoc/varArgs/pkg1/A.java rename to test/langtools/tools/javadoc/varArgs/pkg1/A.java diff --git a/langtools/test/tools/javah/4942232/ParamClassTest.java b/test/langtools/tools/javah/4942232/ParamClassTest.java similarity index 100% rename from langtools/test/tools/javah/4942232/ParamClassTest.java rename to test/langtools/tools/javah/4942232/ParamClassTest.java diff --git a/langtools/test/tools/javah/4942232/Test.java b/test/langtools/tools/javah/4942232/Test.java similarity index 100% rename from langtools/test/tools/javah/4942232/Test.java rename to test/langtools/tools/javah/4942232/Test.java diff --git a/langtools/test/tools/javah/6257087/T6257087.java b/test/langtools/tools/javah/6257087/T6257087.java similarity index 100% rename from langtools/test/tools/javah/6257087/T6257087.java rename to test/langtools/tools/javah/6257087/T6257087.java diff --git a/langtools/test/tools/javah/6572945/T6572945.java b/test/langtools/tools/javah/6572945/T6572945.java similarity index 100% rename from langtools/test/tools/javah/6572945/T6572945.java rename to test/langtools/tools/javah/6572945/T6572945.java diff --git a/langtools/test/tools/javah/6572945/TestClass1.java b/test/langtools/tools/javah/6572945/TestClass1.java similarity index 100% rename from langtools/test/tools/javah/6572945/TestClass1.java rename to test/langtools/tools/javah/6572945/TestClass1.java diff --git a/langtools/test/tools/javah/6572945/TestClass2.java b/test/langtools/tools/javah/6572945/TestClass2.java similarity index 100% rename from langtools/test/tools/javah/6572945/TestClass2.java rename to test/langtools/tools/javah/6572945/TestClass2.java diff --git a/langtools/test/tools/javah/6572945/TestClass3.java b/test/langtools/tools/javah/6572945/TestClass3.java similarity index 100% rename from langtools/test/tools/javah/6572945/TestClass3.java rename to test/langtools/tools/javah/6572945/TestClass3.java diff --git a/langtools/test/tools/javah/6572945/gold/jni.dir.1/TestClass1.h b/test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1.h similarity index 100% rename from langtools/test/tools/javah/6572945/gold/jni.dir.1/TestClass1.h rename to test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1.h diff --git a/langtools/test/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner1.h b/test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner1.h similarity index 100% rename from langtools/test/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner1.h rename to test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner1.h diff --git a/langtools/test/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner2.h b/test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner2.h similarity index 100% rename from langtools/test/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner2.h rename to test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner2.h diff --git a/langtools/test/tools/javah/6572945/gold/jni.dir.1/TestClass2.h b/test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass2.h similarity index 100% rename from langtools/test/tools/javah/6572945/gold/jni.dir.1/TestClass2.h rename to test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass2.h diff --git a/langtools/test/tools/javah/6572945/gold/jni.file.1 b/test/langtools/tools/javah/6572945/gold/jni.file.1 similarity index 100% rename from langtools/test/tools/javah/6572945/gold/jni.file.1 rename to test/langtools/tools/javah/6572945/gold/jni.file.1 diff --git a/langtools/test/tools/javah/6572945/gold/jni.file.2 b/test/langtools/tools/javah/6572945/gold/jni.file.2 similarity index 100% rename from langtools/test/tools/javah/6572945/gold/jni.file.2 rename to test/langtools/tools/javah/6572945/gold/jni.file.2 diff --git a/langtools/test/tools/javah/6572945/gold/jni.file.3 b/test/langtools/tools/javah/6572945/gold/jni.file.3 similarity index 100% rename from langtools/test/tools/javah/6572945/gold/jni.file.3 rename to test/langtools/tools/javah/6572945/gold/jni.file.3 diff --git a/langtools/test/tools/javah/ModuleClass.java b/test/langtools/tools/javah/ModuleClass.java similarity index 100% rename from langtools/test/tools/javah/ModuleClass.java rename to test/langtools/tools/javah/ModuleClass.java diff --git a/langtools/test/tools/javah/ReadOldClass.sh b/test/langtools/tools/javah/ReadOldClass.sh similarity index 100% rename from langtools/test/tools/javah/ReadOldClass.sh rename to test/langtools/tools/javah/ReadOldClass.sh diff --git a/langtools/test/tools/javah/T4942232/MissingParamClassTest.java b/test/langtools/tools/javah/T4942232/MissingParamClassTest.java similarity index 100% rename from langtools/test/tools/javah/T4942232/MissingParamClassTest.java rename to test/langtools/tools/javah/T4942232/MissingParamClassTest.java diff --git a/langtools/test/tools/javah/T5070898.java b/test/langtools/tools/javah/T5070898.java similarity index 100% rename from langtools/test/tools/javah/T5070898.java rename to test/langtools/tools/javah/T5070898.java diff --git a/langtools/test/tools/javah/T6893943.java b/test/langtools/tools/javah/T6893943.java similarity index 100% rename from langtools/test/tools/javah/T6893943.java rename to test/langtools/tools/javah/T6893943.java diff --git a/langtools/test/tools/javah/T6994608.java b/test/langtools/tools/javah/T6994608.java similarity index 100% rename from langtools/test/tools/javah/T6994608.java rename to test/langtools/tools/javah/T6994608.java diff --git a/langtools/test/tools/javah/T7126832/T7126832.java b/test/langtools/tools/javah/T7126832/T7126832.java similarity index 100% rename from langtools/test/tools/javah/T7126832/T7126832.java rename to test/langtools/tools/javah/T7126832/T7126832.java diff --git a/langtools/test/tools/javah/T7126832/java.java b/test/langtools/tools/javah/T7126832/java.java similarity index 100% rename from langtools/test/tools/javah/T7126832/java.java rename to test/langtools/tools/javah/T7126832/java.java diff --git a/langtools/test/tools/javah/T7185778.java b/test/langtools/tools/javah/T7185778.java similarity index 100% rename from langtools/test/tools/javah/T7185778.java rename to test/langtools/tools/javah/T7185778.java diff --git a/langtools/test/tools/javah/TestHelpOpts.java b/test/langtools/tools/javah/TestHelpOpts.java similarity index 100% rename from langtools/test/tools/javah/TestHelpOpts.java rename to test/langtools/tools/javah/TestHelpOpts.java diff --git a/langtools/test/tools/javah/VersionTest.java b/test/langtools/tools/javah/VersionTest.java similarity index 100% rename from langtools/test/tools/javah/VersionTest.java rename to test/langtools/tools/javah/VersionTest.java diff --git a/langtools/test/tools/javah/constMacroTest/ConstMacroTest.java b/test/langtools/tools/javah/constMacroTest/ConstMacroTest.java similarity index 100% rename from langtools/test/tools/javah/constMacroTest/ConstMacroTest.java rename to test/langtools/tools/javah/constMacroTest/ConstMacroTest.java diff --git a/langtools/test/tools/javap/4111861/A.java b/test/langtools/tools/javap/4111861/A.java similarity index 100% rename from langtools/test/tools/javap/4111861/A.java rename to test/langtools/tools/javap/4111861/A.java diff --git a/langtools/test/tools/javap/4111861/T4111861.java b/test/langtools/tools/javap/4111861/T4111861.java similarity index 100% rename from langtools/test/tools/javap/4111861/T4111861.java rename to test/langtools/tools/javap/4111861/T4111861.java diff --git a/langtools/test/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java b/test/langtools/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java similarity index 100% rename from langtools/test/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java rename to test/langtools/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java diff --git a/langtools/test/tools/javap/4866831/PublicInterfaceTest.java b/test/langtools/tools/javap/4866831/PublicInterfaceTest.java similarity index 100% rename from langtools/test/tools/javap/4866831/PublicInterfaceTest.java rename to test/langtools/tools/javap/4866831/PublicInterfaceTest.java diff --git a/langtools/test/tools/javap/4870651/T4870651.java b/test/langtools/tools/javap/4870651/T4870651.java similarity index 100% rename from langtools/test/tools/javap/4870651/T4870651.java rename to test/langtools/tools/javap/4870651/T4870651.java diff --git a/langtools/test/tools/javap/4870651/Test.java b/test/langtools/tools/javap/4870651/Test.java similarity index 100% rename from langtools/test/tools/javap/4870651/Test.java rename to test/langtools/tools/javap/4870651/Test.java diff --git a/langtools/test/tools/javap/6937244/T6937244.java b/test/langtools/tools/javap/6937244/T6937244.java similarity index 100% rename from langtools/test/tools/javap/6937244/T6937244.java rename to test/langtools/tools/javap/6937244/T6937244.java diff --git a/langtools/test/tools/javap/6937244/T6937244A.java b/test/langtools/tools/javap/6937244/T6937244A.java similarity index 100% rename from langtools/test/tools/javap/6937244/T6937244A.java rename to test/langtools/tools/javap/6937244/T6937244A.java diff --git a/langtools/test/tools/javap/8006334/JavapTaskCtorFailWithNPE.java b/test/langtools/tools/javap/8006334/JavapTaskCtorFailWithNPE.java similarity index 100% rename from langtools/test/tools/javap/8006334/JavapTaskCtorFailWithNPE.java rename to test/langtools/tools/javap/8006334/JavapTaskCtorFailWithNPE.java diff --git a/langtools/test/tools/javap/8007907/JavapReturns0AfterClassNotFoundTest.java b/test/langtools/tools/javap/8007907/JavapReturns0AfterClassNotFoundTest.java similarity index 100% rename from langtools/test/tools/javap/8007907/JavapReturns0AfterClassNotFoundTest.java rename to test/langtools/tools/javap/8007907/JavapReturns0AfterClassNotFoundTest.java diff --git a/langtools/test/tools/javap/AccessModifiers.java b/test/langtools/tools/javap/AccessModifiers.java similarity index 100% rename from langtools/test/tools/javap/AccessModifiers.java rename to test/langtools/tools/javap/AccessModifiers.java diff --git a/langtools/test/tools/javap/BadAttributeLength.java b/test/langtools/tools/javap/BadAttributeLength.java similarity index 100% rename from langtools/test/tools/javap/BadAttributeLength.java rename to test/langtools/tools/javap/BadAttributeLength.java diff --git a/langtools/test/tools/javap/BoundsTypeVariableTest.java b/test/langtools/tools/javap/BoundsTypeVariableTest.java similarity index 100% rename from langtools/test/tools/javap/BoundsTypeVariableTest.java rename to test/langtools/tools/javap/BoundsTypeVariableTest.java diff --git a/langtools/test/tools/javap/ControlCharTest.java b/test/langtools/tools/javap/ControlCharTest.java similarity index 100% rename from langtools/test/tools/javap/ControlCharTest.java rename to test/langtools/tools/javap/ControlCharTest.java diff --git a/langtools/test/tools/javap/DescriptorTest.java b/test/langtools/tools/javap/DescriptorTest.java similarity index 100% rename from langtools/test/tools/javap/DescriptorTest.java rename to test/langtools/tools/javap/DescriptorTest.java diff --git a/langtools/test/tools/javap/ExtPath.java b/test/langtools/tools/javap/ExtPath.java similarity index 100% rename from langtools/test/tools/javap/ExtPath.java rename to test/langtools/tools/javap/ExtPath.java diff --git a/langtools/test/tools/javap/InvalidOptions.java b/test/langtools/tools/javap/InvalidOptions.java similarity index 100% rename from langtools/test/tools/javap/InvalidOptions.java rename to test/langtools/tools/javap/InvalidOptions.java diff --git a/langtools/test/tools/javap/MethodParameters.java b/test/langtools/tools/javap/MethodParameters.java similarity index 100% rename from langtools/test/tools/javap/MethodParameters.java rename to test/langtools/tools/javap/MethodParameters.java diff --git a/langtools/test/tools/javap/StackMapTableTest.java b/test/langtools/tools/javap/StackMapTableTest.java similarity index 100% rename from langtools/test/tools/javap/StackMapTableTest.java rename to test/langtools/tools/javap/StackMapTableTest.java diff --git a/langtools/test/tools/javap/T4075403.java b/test/langtools/tools/javap/T4075403.java similarity index 100% rename from langtools/test/tools/javap/T4075403.java rename to test/langtools/tools/javap/T4075403.java diff --git a/langtools/test/tools/javap/T4459541.java b/test/langtools/tools/javap/T4459541.java similarity index 100% rename from langtools/test/tools/javap/T4459541.java rename to test/langtools/tools/javap/T4459541.java diff --git a/langtools/test/tools/javap/T4501660.java b/test/langtools/tools/javap/T4501660.java similarity index 100% rename from langtools/test/tools/javap/T4501660.java rename to test/langtools/tools/javap/T4501660.java diff --git a/langtools/test/tools/javap/T4501661.java b/test/langtools/tools/javap/T4501661.java similarity index 100% rename from langtools/test/tools/javap/T4501661.java rename to test/langtools/tools/javap/T4501661.java diff --git a/langtools/test/tools/javap/T4777949.java b/test/langtools/tools/javap/T4777949.java similarity index 100% rename from langtools/test/tools/javap/T4777949.java rename to test/langtools/tools/javap/T4777949.java diff --git a/langtools/test/tools/javap/T4876942.java b/test/langtools/tools/javap/T4876942.java similarity index 100% rename from langtools/test/tools/javap/T4876942.java rename to test/langtools/tools/javap/T4876942.java diff --git a/langtools/test/tools/javap/T4880663.java b/test/langtools/tools/javap/T4880663.java similarity index 100% rename from langtools/test/tools/javap/T4880663.java rename to test/langtools/tools/javap/T4880663.java diff --git a/langtools/test/tools/javap/T4880672.java b/test/langtools/tools/javap/T4880672.java similarity index 100% rename from langtools/test/tools/javap/T4880672.java rename to test/langtools/tools/javap/T4880672.java diff --git a/langtools/test/tools/javap/T4884240.java b/test/langtools/tools/javap/T4884240.java similarity index 100% rename from langtools/test/tools/javap/T4884240.java rename to test/langtools/tools/javap/T4884240.java diff --git a/langtools/test/tools/javap/T4975569.java b/test/langtools/tools/javap/T4975569.java similarity index 100% rename from langtools/test/tools/javap/T4975569.java rename to test/langtools/tools/javap/T4975569.java diff --git a/langtools/test/tools/javap/T6271787.java b/test/langtools/tools/javap/T6271787.java similarity index 100% rename from langtools/test/tools/javap/T6271787.java rename to test/langtools/tools/javap/T6271787.java diff --git a/langtools/test/tools/javap/T6474890.java b/test/langtools/tools/javap/T6474890.java similarity index 100% rename from langtools/test/tools/javap/T6474890.java rename to test/langtools/tools/javap/T6474890.java diff --git a/langtools/test/tools/javap/T6587786.java b/test/langtools/tools/javap/T6587786.java similarity index 100% rename from langtools/test/tools/javap/T6587786.java rename to test/langtools/tools/javap/T6587786.java diff --git a/langtools/test/tools/javap/T6622216.java b/test/langtools/tools/javap/T6622216.java similarity index 100% rename from langtools/test/tools/javap/T6622216.java rename to test/langtools/tools/javap/T6622216.java diff --git a/langtools/test/tools/javap/T6622232.java b/test/langtools/tools/javap/T6622232.java similarity index 100% rename from langtools/test/tools/javap/T6622232.java rename to test/langtools/tools/javap/T6622232.java diff --git a/langtools/test/tools/javap/T6622260.java b/test/langtools/tools/javap/T6622260.java similarity index 100% rename from langtools/test/tools/javap/T6622260.java rename to test/langtools/tools/javap/T6622260.java diff --git a/langtools/test/tools/javap/T6715251.java b/test/langtools/tools/javap/T6715251.java similarity index 100% rename from langtools/test/tools/javap/T6715251.java rename to test/langtools/tools/javap/T6715251.java diff --git a/langtools/test/tools/javap/T6715753.java b/test/langtools/tools/javap/T6715753.java similarity index 100% rename from langtools/test/tools/javap/T6715753.java rename to test/langtools/tools/javap/T6715753.java diff --git a/langtools/test/tools/javap/T6715767.java b/test/langtools/tools/javap/T6715767.java similarity index 100% rename from langtools/test/tools/javap/T6715767.java rename to test/langtools/tools/javap/T6715767.java diff --git a/langtools/test/tools/javap/T6716452.java b/test/langtools/tools/javap/T6716452.java similarity index 100% rename from langtools/test/tools/javap/T6716452.java rename to test/langtools/tools/javap/T6716452.java diff --git a/langtools/test/tools/javap/T6729471.java b/test/langtools/tools/javap/T6729471.java similarity index 100% rename from langtools/test/tools/javap/T6729471.java rename to test/langtools/tools/javap/T6729471.java diff --git a/langtools/test/tools/javap/T6824493.java b/test/langtools/tools/javap/T6824493.java similarity index 100% rename from langtools/test/tools/javap/T6824493.java rename to test/langtools/tools/javap/T6824493.java diff --git a/langtools/test/tools/javap/T6863746.java b/test/langtools/tools/javap/T6863746.java similarity index 100% rename from langtools/test/tools/javap/T6863746.java rename to test/langtools/tools/javap/T6863746.java diff --git a/langtools/test/tools/javap/T6866657.java b/test/langtools/tools/javap/T6866657.java similarity index 100% rename from langtools/test/tools/javap/T6866657.java rename to test/langtools/tools/javap/T6866657.java diff --git a/langtools/test/tools/javap/T6868539.java b/test/langtools/tools/javap/T6868539.java similarity index 100% rename from langtools/test/tools/javap/T6868539.java rename to test/langtools/tools/javap/T6868539.java diff --git a/langtools/test/tools/javap/T6879371.java b/test/langtools/tools/javap/T6879371.java similarity index 100% rename from langtools/test/tools/javap/T6879371.java rename to test/langtools/tools/javap/T6879371.java diff --git a/langtools/test/tools/javap/T6980017.java b/test/langtools/tools/javap/T6980017.java similarity index 100% rename from langtools/test/tools/javap/T6980017.java rename to test/langtools/tools/javap/T6980017.java diff --git a/langtools/test/tools/javap/T7004698.java b/test/langtools/tools/javap/T7004698.java similarity index 100% rename from langtools/test/tools/javap/T7004698.java rename to test/langtools/tools/javap/T7004698.java diff --git a/langtools/test/tools/javap/T7186925.java b/test/langtools/tools/javap/T7186925.java similarity index 100% rename from langtools/test/tools/javap/T7186925.java rename to test/langtools/tools/javap/T7186925.java diff --git a/langtools/test/tools/javap/T7190862.java b/test/langtools/tools/javap/T7190862.java similarity index 100% rename from langtools/test/tools/javap/T7190862.java rename to test/langtools/tools/javap/T7190862.java diff --git a/langtools/test/tools/javap/T8032814.java b/test/langtools/tools/javap/T8032814.java similarity index 100% rename from langtools/test/tools/javap/T8032814.java rename to test/langtools/tools/javap/T8032814.java diff --git a/langtools/test/tools/javap/T8032819.java b/test/langtools/tools/javap/T8032819.java similarity index 100% rename from langtools/test/tools/javap/T8032819.java rename to test/langtools/tools/javap/T8032819.java diff --git a/langtools/test/tools/javap/T8033180.java b/test/langtools/tools/javap/T8033180.java similarity index 100% rename from langtools/test/tools/javap/T8033180.java rename to test/langtools/tools/javap/T8033180.java diff --git a/langtools/test/tools/javap/T8033711.java b/test/langtools/tools/javap/T8033711.java similarity index 100% rename from langtools/test/tools/javap/T8033711.java rename to test/langtools/tools/javap/T8033711.java diff --git a/langtools/test/tools/javap/T8035104.java b/test/langtools/tools/javap/T8035104.java similarity index 100% rename from langtools/test/tools/javap/T8035104.java rename to test/langtools/tools/javap/T8035104.java diff --git a/langtools/test/tools/javap/T8038414.java b/test/langtools/tools/javap/T8038414.java similarity index 100% rename from langtools/test/tools/javap/T8038414.java rename to test/langtools/tools/javap/T8038414.java diff --git a/langtools/test/tools/javap/TestClassNameWarning.java b/test/langtools/tools/javap/TestClassNameWarning.java similarity index 100% rename from langtools/test/tools/javap/TestClassNameWarning.java rename to test/langtools/tools/javap/TestClassNameWarning.java diff --git a/langtools/test/tools/javap/TestSuperclass.java b/test/langtools/tools/javap/TestSuperclass.java similarity index 100% rename from langtools/test/tools/javap/TestSuperclass.java rename to test/langtools/tools/javap/TestSuperclass.java diff --git a/langtools/test/tools/javap/WhitespaceTest.java b/test/langtools/tools/javap/WhitespaceTest.java similarity index 100% rename from langtools/test/tools/javap/WhitespaceTest.java rename to test/langtools/tools/javap/WhitespaceTest.java diff --git a/langtools/test/tools/javap/classfile/6888367/T6888367.java b/test/langtools/tools/javap/classfile/6888367/T6888367.java similarity index 100% rename from langtools/test/tools/javap/classfile/6888367/T6888367.java rename to test/langtools/tools/javap/classfile/6888367/T6888367.java diff --git a/langtools/test/tools/javap/classfile/T6887895.java b/test/langtools/tools/javap/classfile/T6887895.java similarity index 100% rename from langtools/test/tools/javap/classfile/T6887895.java rename to test/langtools/tools/javap/classfile/T6887895.java diff --git a/langtools/test/tools/javap/classfile/deps/GetDeps.java b/test/langtools/tools/javap/classfile/deps/GetDeps.java similarity index 100% rename from langtools/test/tools/javap/classfile/deps/GetDeps.java rename to test/langtools/tools/javap/classfile/deps/GetDeps.java diff --git a/langtools/test/tools/javap/classfile/deps/T6907575.java b/test/langtools/tools/javap/classfile/deps/T6907575.java similarity index 100% rename from langtools/test/tools/javap/classfile/deps/T6907575.java rename to test/langtools/tools/javap/classfile/deps/T6907575.java diff --git a/langtools/test/tools/javap/classfile/deps/T6907575.out b/test/langtools/tools/javap/classfile/deps/T6907575.out similarity index 100% rename from langtools/test/tools/javap/classfile/deps/T6907575.out rename to test/langtools/tools/javap/classfile/deps/T6907575.out diff --git a/langtools/test/tools/javap/classfile/deps/p/C1.java b/test/langtools/tools/javap/classfile/deps/p/C1.java similarity index 100% rename from langtools/test/tools/javap/classfile/deps/p/C1.java rename to test/langtools/tools/javap/classfile/deps/p/C1.java diff --git a/langtools/test/tools/javap/output/JavapTester.java b/test/langtools/tools/javap/output/JavapTester.java similarity index 100% rename from langtools/test/tools/javap/output/JavapTester.java rename to test/langtools/tools/javap/output/JavapTester.java diff --git a/langtools/test/tools/javap/output/RepeatingTypeAnnotations.java b/test/langtools/tools/javap/output/RepeatingTypeAnnotations.java similarity index 100% rename from langtools/test/tools/javap/output/RepeatingTypeAnnotations.java rename to test/langtools/tools/javap/output/RepeatingTypeAnnotations.java diff --git a/langtools/test/tools/javap/stackmap/StackmapTest.java b/test/langtools/tools/javap/stackmap/StackmapTest.java similarity index 100% rename from langtools/test/tools/javap/stackmap/StackmapTest.java rename to test/langtools/tools/javap/stackmap/StackmapTest.java diff --git a/langtools/test/tools/javap/typeAnnotations/AnnotationDefaultNewlineTest.java b/test/langtools/tools/javap/typeAnnotations/AnnotationDefaultNewlineTest.java similarity index 100% rename from langtools/test/tools/javap/typeAnnotations/AnnotationDefaultNewlineTest.java rename to test/langtools/tools/javap/typeAnnotations/AnnotationDefaultNewlineTest.java diff --git a/langtools/test/tools/javap/typeAnnotations/InvisibleParameterAnnotationsTest.java b/test/langtools/tools/javap/typeAnnotations/InvisibleParameterAnnotationsTest.java similarity index 100% rename from langtools/test/tools/javap/typeAnnotations/InvisibleParameterAnnotationsTest.java rename to test/langtools/tools/javap/typeAnnotations/InvisibleParameterAnnotationsTest.java diff --git a/langtools/test/tools/javap/typeAnnotations/JSR175Annotations.java b/test/langtools/tools/javap/typeAnnotations/JSR175Annotations.java similarity index 100% rename from langtools/test/tools/javap/typeAnnotations/JSR175Annotations.java rename to test/langtools/tools/javap/typeAnnotations/JSR175Annotations.java diff --git a/langtools/test/tools/javap/typeAnnotations/NewArray.java b/test/langtools/tools/javap/typeAnnotations/NewArray.java similarity index 100% rename from langtools/test/tools/javap/typeAnnotations/NewArray.java rename to test/langtools/tools/javap/typeAnnotations/NewArray.java diff --git a/langtools/test/tools/javap/typeAnnotations/Presence.java b/test/langtools/tools/javap/typeAnnotations/Presence.java similarity index 100% rename from langtools/test/tools/javap/typeAnnotations/Presence.java rename to test/langtools/tools/javap/typeAnnotations/Presence.java diff --git a/langtools/test/tools/javap/typeAnnotations/PresenceInner.java b/test/langtools/tools/javap/typeAnnotations/PresenceInner.java similarity index 100% rename from langtools/test/tools/javap/typeAnnotations/PresenceInner.java rename to test/langtools/tools/javap/typeAnnotations/PresenceInner.java diff --git a/langtools/test/tools/javap/typeAnnotations/T6855990.java b/test/langtools/tools/javap/typeAnnotations/T6855990.java similarity index 100% rename from langtools/test/tools/javap/typeAnnotations/T6855990.java rename to test/langtools/tools/javap/typeAnnotations/T6855990.java diff --git a/langtools/test/tools/javap/typeAnnotations/TypeCasts.java b/test/langtools/tools/javap/typeAnnotations/TypeCasts.java similarity index 100% rename from langtools/test/tools/javap/typeAnnotations/TypeCasts.java rename to test/langtools/tools/javap/typeAnnotations/TypeCasts.java diff --git a/langtools/test/tools/javap/typeAnnotations/Visibility.java b/test/langtools/tools/javap/typeAnnotations/Visibility.java similarity index 100% rename from langtools/test/tools/javap/typeAnnotations/Visibility.java rename to test/langtools/tools/javap/typeAnnotations/Visibility.java diff --git a/langtools/test/tools/javap/typeAnnotations/Wildcards.java b/test/langtools/tools/javap/typeAnnotations/Wildcards.java similarity index 100% rename from langtools/test/tools/javap/typeAnnotations/Wildcards.java rename to test/langtools/tools/javap/typeAnnotations/Wildcards.java diff --git a/langtools/test/tools/jdeprscan/cases/jdk/deprcases/members/ExampleAnnotation.java b/test/langtools/tools/jdeprscan/cases/jdk/deprcases/members/ExampleAnnotation.java similarity index 100% rename from langtools/test/tools/jdeprscan/cases/jdk/deprcases/members/ExampleAnnotation.java rename to test/langtools/tools/jdeprscan/cases/jdk/deprcases/members/ExampleAnnotation.java diff --git a/langtools/test/tools/jdeprscan/cases/jdk/deprcases/members/ExampleClass.java b/test/langtools/tools/jdeprscan/cases/jdk/deprcases/members/ExampleClass.java similarity index 100% rename from langtools/test/tools/jdeprscan/cases/jdk/deprcases/members/ExampleClass.java rename to test/langtools/tools/jdeprscan/cases/jdk/deprcases/members/ExampleClass.java diff --git a/langtools/test/tools/jdeprscan/cases/jdk/deprcases/members/ExampleElements.java b/test/langtools/tools/jdeprscan/cases/jdk/deprcases/members/ExampleElements.java similarity index 100% rename from langtools/test/tools/jdeprscan/cases/jdk/deprcases/members/ExampleElements.java rename to test/langtools/tools/jdeprscan/cases/jdk/deprcases/members/ExampleElements.java diff --git a/langtools/test/tools/jdeprscan/cases/jdk/deprcases/members/ExampleEnum.java b/test/langtools/tools/jdeprscan/cases/jdk/deprcases/members/ExampleEnum.java similarity index 100% rename from langtools/test/tools/jdeprscan/cases/jdk/deprcases/members/ExampleEnum.java rename to test/langtools/tools/jdeprscan/cases/jdk/deprcases/members/ExampleEnum.java diff --git a/langtools/test/tools/jdeprscan/cases/jdk/deprcases/members/ExampleInterface.java b/test/langtools/tools/jdeprscan/cases/jdk/deprcases/members/ExampleInterface.java similarity index 100% rename from langtools/test/tools/jdeprscan/cases/jdk/deprcases/members/ExampleInterface.java rename to test/langtools/tools/jdeprscan/cases/jdk/deprcases/members/ExampleInterface.java diff --git a/langtools/test/tools/jdeprscan/cases/jdk/deprcases/members/ExampleSubclass.java b/test/langtools/tools/jdeprscan/cases/jdk/deprcases/members/ExampleSubclass.java similarity index 100% rename from langtools/test/tools/jdeprscan/cases/jdk/deprcases/members/ExampleSubclass.java rename to test/langtools/tools/jdeprscan/cases/jdk/deprcases/members/ExampleSubclass.java diff --git a/langtools/test/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedAnnotation.java b/test/langtools/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedAnnotation.java similarity index 100% rename from langtools/test/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedAnnotation.java rename to test/langtools/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedAnnotation.java diff --git a/langtools/test/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedClass.java b/test/langtools/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedClass.java similarity index 100% rename from langtools/test/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedClass.java rename to test/langtools/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedClass.java diff --git a/langtools/test/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedEnum.java b/test/langtools/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedEnum.java similarity index 100% rename from langtools/test/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedEnum.java rename to test/langtools/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedEnum.java diff --git a/langtools/test/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedException.java b/test/langtools/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedException.java similarity index 100% rename from langtools/test/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedException.java rename to test/langtools/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedException.java diff --git a/langtools/test/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedInterface.java b/test/langtools/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedInterface.java similarity index 100% rename from langtools/test/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedInterface.java rename to test/langtools/tools/jdeprscan/cases/jdk/deprcases/types/DeprecatedInterface.java diff --git a/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestCSV.java b/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestCSV.java similarity index 100% rename from langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestCSV.java rename to test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestCSV.java diff --git a/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestLoad.java b/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestLoad.java similarity index 100% rename from langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestLoad.java rename to test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestLoad.java diff --git a/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestLoadExpected.csv b/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestLoadExpected.csv similarity index 100% rename from langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestLoadExpected.csv rename to test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestLoadExpected.csv diff --git a/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestMethodSig.java b/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestMethodSig.java similarity index 100% rename from langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestMethodSig.java rename to test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestMethodSig.java diff --git a/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestNotFound.java b/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestNotFound.java similarity index 100% rename from langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestNotFound.java rename to test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestNotFound.java diff --git a/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestPrims.csv b/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestPrims.csv similarity index 100% rename from langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestPrims.csv rename to test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestPrims.csv diff --git a/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestPrims.java b/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestPrims.java similarity index 100% rename from langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestPrims.java rename to test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestPrims.java diff --git a/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestRelease.java b/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestRelease.java similarity index 100% rename from langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestRelease.java rename to test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestRelease.java diff --git a/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestScan.java b/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestScan.java similarity index 100% rename from langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestScan.java rename to test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestScan.java diff --git a/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestScanExpected.txt b/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestScanExpected.txt similarity index 100% rename from langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestScanExpected.txt rename to test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestScanExpected.txt diff --git a/langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseAnnotation.java b/test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseAnnotation.java similarity index 100% rename from langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseAnnotation.java rename to test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseAnnotation.java diff --git a/langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseClass.java b/test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseClass.java similarity index 100% rename from langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseClass.java rename to test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseClass.java diff --git a/langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseEnum.java b/test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseEnum.java similarity index 100% rename from langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseEnum.java rename to test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseEnum.java diff --git a/langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseEnumMembers.java b/test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseEnumMembers.java similarity index 100% rename from langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseEnumMembers.java rename to test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseEnumMembers.java diff --git a/langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseException.java b/test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseException.java similarity index 100% rename from langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseException.java rename to test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseException.java diff --git a/langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseField.java b/test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseField.java similarity index 100% rename from langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseField.java rename to test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseField.java diff --git a/langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseInterface.java b/test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseInterface.java similarity index 100% rename from langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseInterface.java rename to test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseInterface.java diff --git a/langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseMethod.java b/test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseMethod.java similarity index 100% rename from langtools/test/tools/jdeprscan/usage/jdk/deprusage/UseMethod.java rename to test/langtools/tools/jdeprscan/usage/jdk/deprusage/UseMethod.java diff --git a/langtools/test/tools/jdeps/APIDeps.java b/test/langtools/tools/jdeps/APIDeps.java similarity index 100% rename from langtools/test/tools/jdeps/APIDeps.java rename to test/langtools/tools/jdeps/APIDeps.java diff --git a/langtools/test/tools/jdeps/Basic.java b/test/langtools/tools/jdeps/Basic.java similarity index 100% rename from langtools/test/tools/jdeps/Basic.java rename to test/langtools/tools/jdeps/Basic.java diff --git a/langtools/test/tools/jdeps/DotFileTest.java b/test/langtools/tools/jdeps/DotFileTest.java similarity index 100% rename from langtools/test/tools/jdeps/DotFileTest.java rename to test/langtools/tools/jdeps/DotFileTest.java diff --git a/langtools/test/tools/jdeps/MultiReleaseJar.java b/test/langtools/tools/jdeps/MultiReleaseJar.java similarity index 100% rename from langtools/test/tools/jdeps/MultiReleaseJar.java rename to test/langtools/tools/jdeps/MultiReleaseJar.java diff --git a/langtools/test/tools/jdeps/Options.java b/test/langtools/tools/jdeps/Options.java similarity index 100% rename from langtools/test/tools/jdeps/Options.java rename to test/langtools/tools/jdeps/Options.java diff --git a/langtools/test/tools/jdeps/Test.java b/test/langtools/tools/jdeps/Test.java similarity index 100% rename from langtools/test/tools/jdeps/Test.java rename to test/langtools/tools/jdeps/Test.java diff --git a/langtools/test/tools/jdeps/VerboseFormat/JdepsDependencyClosure.java b/test/langtools/tools/jdeps/VerboseFormat/JdepsDependencyClosure.java similarity index 100% rename from langtools/test/tools/jdeps/VerboseFormat/JdepsDependencyClosure.java rename to test/langtools/tools/jdeps/VerboseFormat/JdepsDependencyClosure.java diff --git a/langtools/test/tools/jdeps/VerboseFormat/use/indirect/DontUseJdkInternal2.java b/test/langtools/tools/jdeps/VerboseFormat/use/indirect/DontUseJdkInternal2.java similarity index 100% rename from langtools/test/tools/jdeps/VerboseFormat/use/indirect/DontUseJdkInternal2.java rename to test/langtools/tools/jdeps/VerboseFormat/use/indirect/DontUseJdkInternal2.java diff --git a/langtools/test/tools/jdeps/VerboseFormat/use/indirect/UseJdkInternalIndirectly.java b/test/langtools/tools/jdeps/VerboseFormat/use/indirect/UseJdkInternalIndirectly.java similarity index 100% rename from langtools/test/tools/jdeps/VerboseFormat/use/indirect/UseJdkInternalIndirectly.java rename to test/langtools/tools/jdeps/VerboseFormat/use/indirect/UseJdkInternalIndirectly.java diff --git a/langtools/test/tools/jdeps/VerboseFormat/use/indirect2/DontUseJdkInternal3.java b/test/langtools/tools/jdeps/VerboseFormat/use/indirect2/DontUseJdkInternal3.java similarity index 100% rename from langtools/test/tools/jdeps/VerboseFormat/use/indirect2/DontUseJdkInternal3.java rename to test/langtools/tools/jdeps/VerboseFormat/use/indirect2/DontUseJdkInternal3.java diff --git a/langtools/test/tools/jdeps/VerboseFormat/use/indirect2/UseJdkInternalIndirectly2.java b/test/langtools/tools/jdeps/VerboseFormat/use/indirect2/UseJdkInternalIndirectly2.java similarity index 100% rename from langtools/test/tools/jdeps/VerboseFormat/use/indirect2/UseJdkInternalIndirectly2.java rename to test/langtools/tools/jdeps/VerboseFormat/use/indirect2/UseJdkInternalIndirectly2.java diff --git a/langtools/test/tools/jdeps/VerboseFormat/use/internal/DontUseJdkInternal.java b/test/langtools/tools/jdeps/VerboseFormat/use/internal/DontUseJdkInternal.java similarity index 100% rename from langtools/test/tools/jdeps/VerboseFormat/use/internal/DontUseJdkInternal.java rename to test/langtools/tools/jdeps/VerboseFormat/use/internal/DontUseJdkInternal.java diff --git a/langtools/test/tools/jdeps/VerboseFormat/use/internal/UseClassWithJdkInternal.java b/test/langtools/tools/jdeps/VerboseFormat/use/internal/UseClassWithJdkInternal.java similarity index 100% rename from langtools/test/tools/jdeps/VerboseFormat/use/internal/UseClassWithJdkInternal.java rename to test/langtools/tools/jdeps/VerboseFormat/use/internal/UseClassWithJdkInternal.java diff --git a/langtools/test/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass.java b/test/langtools/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass.java similarity index 100% rename from langtools/test/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass.java rename to test/langtools/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass.java diff --git a/langtools/test/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass2.java b/test/langtools/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass2.java similarity index 100% rename from langtools/test/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass2.java rename to test/langtools/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass2.java diff --git a/langtools/test/tools/jdeps/b/B.java b/test/langtools/tools/jdeps/b/B.java similarity index 100% rename from langtools/test/tools/jdeps/b/B.java rename to test/langtools/tools/jdeps/b/B.java diff --git a/langtools/test/tools/jdeps/c/C.java b/test/langtools/tools/jdeps/c/C.java similarity index 100% rename from langtools/test/tools/jdeps/c/C.java rename to test/langtools/tools/jdeps/c/C.java diff --git a/langtools/test/tools/jdeps/c/I.java b/test/langtools/tools/jdeps/c/I.java similarity index 100% rename from langtools/test/tools/jdeps/c/I.java rename to test/langtools/tools/jdeps/c/I.java diff --git a/langtools/test/tools/jdeps/d/D.java b/test/langtools/tools/jdeps/d/D.java similarity index 100% rename from langtools/test/tools/jdeps/d/D.java rename to test/langtools/tools/jdeps/d/D.java diff --git a/langtools/test/tools/jdeps/e/E.java b/test/langtools/tools/jdeps/e/E.java similarity index 100% rename from langtools/test/tools/jdeps/e/E.java rename to test/langtools/tools/jdeps/e/E.java diff --git a/langtools/test/tools/jdeps/f/F.java b/test/langtools/tools/jdeps/f/F.java similarity index 100% rename from langtools/test/tools/jdeps/f/F.java rename to test/langtools/tools/jdeps/f/F.java diff --git a/langtools/test/tools/jdeps/g/G.java b/test/langtools/tools/jdeps/g/G.java similarity index 100% rename from langtools/test/tools/jdeps/g/G.java rename to test/langtools/tools/jdeps/g/G.java diff --git a/langtools/test/tools/jdeps/jdkinternals/RemovedJDKInternals.java b/test/langtools/tools/jdeps/jdkinternals/RemovedJDKInternals.java similarity index 100% rename from langtools/test/tools/jdeps/jdkinternals/RemovedJDKInternals.java rename to test/langtools/tools/jdeps/jdkinternals/RemovedJDKInternals.java diff --git a/langtools/test/tools/jdeps/jdkinternals/ShowReplacement.java b/test/langtools/tools/jdeps/jdkinternals/ShowReplacement.java similarity index 100% rename from langtools/test/tools/jdeps/jdkinternals/ShowReplacement.java rename to test/langtools/tools/jdeps/jdkinternals/ShowReplacement.java diff --git a/langtools/test/tools/jdeps/jdkinternals/patches/java.desktop/com/sun/image/codec/jpeg/JPEGCodec.java b/test/langtools/tools/jdeps/jdkinternals/patches/java.desktop/com/sun/image/codec/jpeg/JPEGCodec.java similarity index 100% rename from langtools/test/tools/jdeps/jdkinternals/patches/java.desktop/com/sun/image/codec/jpeg/JPEGCodec.java rename to test/langtools/tools/jdeps/jdkinternals/patches/java.desktop/com/sun/image/codec/jpeg/JPEGCodec.java diff --git a/langtools/test/tools/jdeps/jdkinternals/patches/jdk.unsupported/sun/misc/Service.java b/test/langtools/tools/jdeps/jdkinternals/patches/jdk.unsupported/sun/misc/Service.java similarity index 100% rename from langtools/test/tools/jdeps/jdkinternals/patches/jdk.unsupported/sun/misc/Service.java rename to test/langtools/tools/jdeps/jdkinternals/patches/jdk.unsupported/sun/misc/Service.java diff --git a/langtools/test/tools/jdeps/jdkinternals/patches/jdk.unsupported/sun/misc/SoftCache.java b/test/langtools/tools/jdeps/jdkinternals/patches/jdk.unsupported/sun/misc/SoftCache.java similarity index 100% rename from langtools/test/tools/jdeps/jdkinternals/patches/jdk.unsupported/sun/misc/SoftCache.java rename to test/langtools/tools/jdeps/jdkinternals/patches/jdk.unsupported/sun/misc/SoftCache.java diff --git a/langtools/test/tools/jdeps/jdkinternals/src/apple/applescript/AppleScriptEngine.java b/test/langtools/tools/jdeps/jdkinternals/src/apple/applescript/AppleScriptEngine.java similarity index 100% rename from langtools/test/tools/jdeps/jdkinternals/src/apple/applescript/AppleScriptEngine.java rename to test/langtools/tools/jdeps/jdkinternals/src/apple/applescript/AppleScriptEngine.java diff --git a/langtools/test/tools/jdeps/jdkinternals/src/p/Main.java b/test/langtools/tools/jdeps/jdkinternals/src/p/Main.java similarity index 100% rename from langtools/test/tools/jdeps/jdkinternals/src/p/Main.java rename to test/langtools/tools/jdeps/jdkinternals/src/p/Main.java diff --git a/langtools/test/tools/jdeps/jdkinternals/src/p/S.java b/test/langtools/tools/jdeps/jdkinternals/src/p/S.java similarity index 100% rename from langtools/test/tools/jdeps/jdkinternals/src/p/S.java rename to test/langtools/tools/jdeps/jdkinternals/src/p/S.java diff --git a/langtools/test/tools/jdeps/jdkinternals/src/q/NoRepl.java b/test/langtools/tools/jdeps/jdkinternals/src/q/NoRepl.java similarity index 100% rename from langtools/test/tools/jdeps/jdkinternals/src/q/NoRepl.java rename to test/langtools/tools/jdeps/jdkinternals/src/q/NoRepl.java diff --git a/langtools/test/tools/jdeps/jdkinternals/src/q/RemovedPackage.java b/test/langtools/tools/jdeps/jdkinternals/src/q/RemovedPackage.java similarity index 100% rename from langtools/test/tools/jdeps/jdkinternals/src/q/RemovedPackage.java rename to test/langtools/tools/jdeps/jdkinternals/src/q/RemovedPackage.java diff --git a/langtools/test/tools/jdeps/jdkinternals/src/q/WithRepl.java b/test/langtools/tools/jdeps/jdkinternals/src/q/WithRepl.java similarity index 100% rename from langtools/test/tools/jdeps/jdkinternals/src/q/WithRepl.java rename to test/langtools/tools/jdeps/jdkinternals/src/q/WithRepl.java diff --git a/langtools/test/tools/jdeps/lib/CompilerUtils.java b/test/langtools/tools/jdeps/lib/CompilerUtils.java similarity index 100% rename from langtools/test/tools/jdeps/lib/CompilerUtils.java rename to test/langtools/tools/jdeps/lib/CompilerUtils.java diff --git a/langtools/test/tools/jdeps/lib/JdepsRunner.java b/test/langtools/tools/jdeps/lib/JdepsRunner.java similarity index 100% rename from langtools/test/tools/jdeps/lib/JdepsRunner.java rename to test/langtools/tools/jdeps/lib/JdepsRunner.java diff --git a/langtools/test/tools/jdeps/lib/JdepsUtil.java b/test/langtools/tools/jdeps/lib/JdepsUtil.java similarity index 100% rename from langtools/test/tools/jdeps/lib/JdepsUtil.java rename to test/langtools/tools/jdeps/lib/JdepsUtil.java diff --git a/langtools/test/tools/jdeps/lib/ModuleMetaData.java b/test/langtools/tools/jdeps/lib/ModuleMetaData.java similarity index 100% rename from langtools/test/tools/jdeps/lib/ModuleMetaData.java rename to test/langtools/tools/jdeps/lib/ModuleMetaData.java diff --git a/langtools/test/tools/jdeps/listdeps/ListModuleDeps.java b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java similarity index 100% rename from langtools/test/tools/jdeps/listdeps/ListModuleDeps.java rename to test/langtools/tools/jdeps/listdeps/ListModuleDeps.java diff --git a/langtools/test/tools/jdeps/listdeps/src/hi/Hi.java b/test/langtools/tools/jdeps/listdeps/src/hi/Hi.java similarity index 100% rename from langtools/test/tools/jdeps/listdeps/src/hi/Hi.java rename to test/langtools/tools/jdeps/listdeps/src/hi/Hi.java diff --git a/langtools/test/tools/jdeps/listdeps/src/lib/Lib.java b/test/langtools/tools/jdeps/listdeps/src/lib/Lib.java similarity index 100% rename from langtools/test/tools/jdeps/listdeps/src/lib/Lib.java rename to test/langtools/tools/jdeps/listdeps/src/lib/Lib.java diff --git a/langtools/test/tools/jdeps/listdeps/src/z/Bar.java b/test/langtools/tools/jdeps/listdeps/src/z/Bar.java similarity index 100% rename from langtools/test/tools/jdeps/listdeps/src/z/Bar.java rename to test/langtools/tools/jdeps/listdeps/src/z/Bar.java diff --git a/langtools/test/tools/jdeps/listdeps/src/z/Foo.java b/test/langtools/tools/jdeps/listdeps/src/z/Foo.java similarity index 100% rename from langtools/test/tools/jdeps/listdeps/src/z/Foo.java rename to test/langtools/tools/jdeps/listdeps/src/z/Foo.java diff --git a/langtools/test/tools/jdeps/listdeps/src/z/UseUnsafe.java b/test/langtools/tools/jdeps/listdeps/src/z/UseUnsafe.java similarity index 100% rename from langtools/test/tools/jdeps/listdeps/src/z/UseUnsafe.java rename to test/langtools/tools/jdeps/listdeps/src/z/UseUnsafe.java diff --git a/langtools/test/tools/jdeps/m/Bar.java b/test/langtools/tools/jdeps/m/Bar.java similarity index 100% rename from langtools/test/tools/jdeps/m/Bar.java rename to test/langtools/tools/jdeps/m/Bar.java diff --git a/langtools/test/tools/jdeps/m/Foo.java b/test/langtools/tools/jdeps/m/Foo.java similarity index 100% rename from langtools/test/tools/jdeps/m/Foo.java rename to test/langtools/tools/jdeps/m/Foo.java diff --git a/langtools/test/tools/jdeps/m/Gee.java b/test/langtools/tools/jdeps/m/Gee.java similarity index 100% rename from langtools/test/tools/jdeps/m/Gee.java rename to test/langtools/tools/jdeps/m/Gee.java diff --git a/langtools/test/tools/jdeps/modules/CheckModuleTest.java b/test/langtools/tools/jdeps/modules/CheckModuleTest.java similarity index 100% rename from langtools/test/tools/jdeps/modules/CheckModuleTest.java rename to test/langtools/tools/jdeps/modules/CheckModuleTest.java diff --git a/langtools/test/tools/jdeps/modules/DotFileTest.java b/test/langtools/tools/jdeps/modules/DotFileTest.java similarity index 100% rename from langtools/test/tools/jdeps/modules/DotFileTest.java rename to test/langtools/tools/jdeps/modules/DotFileTest.java diff --git a/langtools/test/tools/jdeps/modules/GenModuleInfo.java b/test/langtools/tools/jdeps/modules/GenModuleInfo.java similarity index 100% rename from langtools/test/tools/jdeps/modules/GenModuleInfo.java rename to test/langtools/tools/jdeps/modules/GenModuleInfo.java diff --git a/langtools/test/tools/jdeps/modules/GenOpenModule.java b/test/langtools/tools/jdeps/modules/GenOpenModule.java similarity index 100% rename from langtools/test/tools/jdeps/modules/GenOpenModule.java rename to test/langtools/tools/jdeps/modules/GenOpenModule.java diff --git a/langtools/test/tools/jdeps/modules/InverseDeps.java b/test/langtools/tools/jdeps/modules/InverseDeps.java similarity index 100% rename from langtools/test/tools/jdeps/modules/InverseDeps.java rename to test/langtools/tools/jdeps/modules/InverseDeps.java diff --git a/langtools/test/tools/jdeps/modules/ModuleTest.java b/test/langtools/tools/jdeps/modules/ModuleTest.java similarity index 100% rename from langtools/test/tools/jdeps/modules/ModuleTest.java rename to test/langtools/tools/jdeps/modules/ModuleTest.java diff --git a/langtools/test/tools/jdeps/modules/SplitPackage.java b/test/langtools/tools/jdeps/modules/SplitPackage.java similarity index 100% rename from langtools/test/tools/jdeps/modules/SplitPackage.java rename to test/langtools/tools/jdeps/modules/SplitPackage.java diff --git a/langtools/test/tools/jdeps/modules/TransitiveDeps.java b/test/langtools/tools/jdeps/modules/TransitiveDeps.java similarity index 100% rename from langtools/test/tools/jdeps/modules/TransitiveDeps.java rename to test/langtools/tools/jdeps/modules/TransitiveDeps.java diff --git a/langtools/test/tools/jdeps/modules/UnnamedPackage.java b/test/langtools/tools/jdeps/modules/UnnamedPackage.java similarity index 100% rename from langtools/test/tools/jdeps/modules/UnnamedPackage.java rename to test/langtools/tools/jdeps/modules/UnnamedPackage.java diff --git a/langtools/test/tools/jdeps/modules/patches/javax/annotation/NonNull.java b/test/langtools/tools/jdeps/modules/patches/javax/annotation/NonNull.java similarity index 100% rename from langtools/test/tools/jdeps/modules/patches/javax/annotation/NonNull.java rename to test/langtools/tools/jdeps/modules/patches/javax/annotation/NonNull.java diff --git a/langtools/test/tools/jdeps/modules/src/mI/module-info.java b/test/langtools/tools/jdeps/modules/src/mI/module-info.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mI/module-info.java rename to test/langtools/tools/jdeps/modules/src/mI/module-info.java diff --git a/langtools/test/tools/jdeps/modules/src/mI/p1/Goo.java b/test/langtools/tools/jdeps/modules/src/mI/p1/Goo.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mI/p1/Goo.java rename to test/langtools/tools/jdeps/modules/src/mI/p1/Goo.java diff --git a/langtools/test/tools/jdeps/modules/src/mI/p1/Lib.java b/test/langtools/tools/jdeps/modules/src/mI/p1/Lib.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mI/p1/Lib.java rename to test/langtools/tools/jdeps/modules/src/mI/p1/Lib.java diff --git a/langtools/test/tools/jdeps/modules/src/mI/p1/S.java b/test/langtools/tools/jdeps/modules/src/mI/p1/S.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mI/p1/S.java rename to test/langtools/tools/jdeps/modules/src/mI/p1/S.java diff --git a/langtools/test/tools/jdeps/modules/src/mI/p1/internal/Impl.java b/test/langtools/tools/jdeps/modules/src/mI/p1/internal/Impl.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mI/p1/internal/Impl.java rename to test/langtools/tools/jdeps/modules/src/mI/p1/internal/Impl.java diff --git a/langtools/test/tools/jdeps/modules/src/mII/module-info.java b/test/langtools/tools/jdeps/modules/src/mII/module-info.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mII/module-info.java rename to test/langtools/tools/jdeps/modules/src/mII/module-info.java diff --git a/langtools/test/tools/jdeps/modules/src/mII/p2/Bar.java b/test/langtools/tools/jdeps/modules/src/mII/p2/Bar.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mII/p2/Bar.java rename to test/langtools/tools/jdeps/modules/src/mII/p2/Bar.java diff --git a/langtools/test/tools/jdeps/modules/src/mII/p2/internal/T2.java b/test/langtools/tools/jdeps/modules/src/mII/p2/internal/T2.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mII/p2/internal/T2.java rename to test/langtools/tools/jdeps/modules/src/mII/p2/internal/T2.java diff --git a/langtools/test/tools/jdeps/modules/src/mIII/module-info.java b/test/langtools/tools/jdeps/modules/src/mIII/module-info.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mIII/module-info.java rename to test/langtools/tools/jdeps/modules/src/mIII/module-info.java diff --git a/langtools/test/tools/jdeps/modules/src/mIII/p3/Foo.java b/test/langtools/tools/jdeps/modules/src/mIII/p3/Foo.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mIII/p3/Foo.java rename to test/langtools/tools/jdeps/modules/src/mIII/p3/Foo.java diff --git a/langtools/test/tools/jdeps/modules/src/mIII/p3/Main.java b/test/langtools/tools/jdeps/modules/src/mIII/p3/Main.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mIII/p3/Main.java rename to test/langtools/tools/jdeps/modules/src/mIII/p3/Main.java diff --git a/langtools/test/tools/jdeps/modules/src/mIV/module-info.java b/test/langtools/tools/jdeps/modules/src/mIV/module-info.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mIV/module-info.java rename to test/langtools/tools/jdeps/modules/src/mIV/module-info.java diff --git a/langtools/test/tools/jdeps/modules/src/mIV/p4/Lib.java b/test/langtools/tools/jdeps/modules/src/mIV/p4/Lib.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mIV/p4/Lib.java rename to test/langtools/tools/jdeps/modules/src/mIV/p4/Lib.java diff --git a/langtools/test/tools/jdeps/modules/src/mIV/p4/internal/Impl.java b/test/langtools/tools/jdeps/modules/src/mIV/p4/internal/Impl.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mIV/p4/internal/Impl.java rename to test/langtools/tools/jdeps/modules/src/mIV/p4/internal/Impl.java diff --git a/langtools/test/tools/jdeps/modules/src/mV/module-info.java b/test/langtools/tools/jdeps/modules/src/mV/module-info.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mV/module-info.java rename to test/langtools/tools/jdeps/modules/src/mV/module-info.java diff --git a/langtools/test/tools/jdeps/modules/src/mV/p5/Main.java b/test/langtools/tools/jdeps/modules/src/mV/p5/Main.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mV/p5/Main.java rename to test/langtools/tools/jdeps/modules/src/mV/p5/Main.java diff --git a/langtools/test/tools/jdeps/modules/src/mV/p5/internal/T.java b/test/langtools/tools/jdeps/modules/src/mV/p5/internal/T.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mV/p5/internal/T.java rename to test/langtools/tools/jdeps/modules/src/mV/p5/internal/T.java diff --git a/langtools/test/tools/jdeps/modules/src/mVI/module-info.java b/test/langtools/tools/jdeps/modules/src/mVI/module-info.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mVI/module-info.java rename to test/langtools/tools/jdeps/modules/src/mVI/module-info.java diff --git a/langtools/test/tools/jdeps/modules/src/mVI/p6/indirect/UnsafeRef.java b/test/langtools/tools/jdeps/modules/src/mVI/p6/indirect/UnsafeRef.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mVI/p6/indirect/UnsafeRef.java rename to test/langtools/tools/jdeps/modules/src/mVI/p6/indirect/UnsafeRef.java diff --git a/langtools/test/tools/jdeps/modules/src/mVI/p6/safe/Lib.java b/test/langtools/tools/jdeps/modules/src/mVI/p6/safe/Lib.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mVI/p6/safe/Lib.java rename to test/langtools/tools/jdeps/modules/src/mVI/p6/safe/Lib.java diff --git a/langtools/test/tools/jdeps/modules/src/mVII/module-info.java b/test/langtools/tools/jdeps/modules/src/mVII/module-info.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mVII/module-info.java rename to test/langtools/tools/jdeps/modules/src/mVII/module-info.java diff --git a/langtools/test/tools/jdeps/modules/src/mVII/p7/Main.java b/test/langtools/tools/jdeps/modules/src/mVII/p7/Main.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mVII/p7/Main.java rename to test/langtools/tools/jdeps/modules/src/mVII/p7/Main.java diff --git a/langtools/test/tools/jdeps/modules/src/mVIII/module-info.java b/test/langtools/tools/jdeps/modules/src/mVIII/module-info.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mVIII/module-info.java rename to test/langtools/tools/jdeps/modules/src/mVIII/module-info.java diff --git a/langtools/test/tools/jdeps/modules/src/mVIII/p8/Main.java b/test/langtools/tools/jdeps/modules/src/mVIII/p8/Main.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/mVIII/p8/Main.java rename to test/langtools/tools/jdeps/modules/src/mVIII/p8/Main.java diff --git a/langtools/test/tools/jdeps/modules/src/provider/META-INF/services/java.util.spi.ToolProvider b/test/langtools/tools/jdeps/modules/src/provider/META-INF/services/java.util.spi.ToolProvider similarity index 100% rename from langtools/test/tools/jdeps/modules/src/provider/META-INF/services/java.util.spi.ToolProvider rename to test/langtools/tools/jdeps/modules/src/provider/META-INF/services/java.util.spi.ToolProvider diff --git a/langtools/test/tools/jdeps/modules/src/provider/META-INF/services/p.Service$I$J b/test/langtools/tools/jdeps/modules/src/provider/META-INF/services/p.Service$I$J similarity index 100% rename from langtools/test/tools/jdeps/modules/src/provider/META-INF/services/p.Service$I$J rename to test/langtools/tools/jdeps/modules/src/provider/META-INF/services/p.Service$I$J diff --git a/langtools/test/tools/jdeps/modules/src/provider/module-info.java b/test/langtools/tools/jdeps/modules/src/provider/module-info.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/provider/module-info.java rename to test/langtools/tools/jdeps/modules/src/provider/module-info.java diff --git a/langtools/test/tools/jdeps/modules/src/provider/p/Provider.java b/test/langtools/tools/jdeps/modules/src/provider/p/Provider.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/provider/p/Provider.java rename to test/langtools/tools/jdeps/modules/src/provider/p/Provider.java diff --git a/langtools/test/tools/jdeps/modules/src/provider/p/Service.java b/test/langtools/tools/jdeps/modules/src/provider/p/Service.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/provider/p/Service.java rename to test/langtools/tools/jdeps/modules/src/provider/p/Service.java diff --git a/langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl1.java b/test/langtools/tools/jdeps/modules/src/provider/q/ProviderImpl1.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl1.java rename to test/langtools/tools/jdeps/modules/src/provider/q/ProviderImpl1.java diff --git a/langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl2.java b/test/langtools/tools/jdeps/modules/src/provider/q/ProviderImpl2.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl2.java rename to test/langtools/tools/jdeps/modules/src/provider/q/ProviderImpl2.java diff --git a/langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl3.java b/test/langtools/tools/jdeps/modules/src/provider/q/ProviderImpl3.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl3.java rename to test/langtools/tools/jdeps/modules/src/provider/q/ProviderImpl3.java diff --git a/langtools/test/tools/jdeps/modules/src/unsafe/module-info.java b/test/langtools/tools/jdeps/modules/src/unsafe/module-info.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/unsafe/module-info.java rename to test/langtools/tools/jdeps/modules/src/unsafe/module-info.java diff --git a/langtools/test/tools/jdeps/modules/src/unsafe/org/indirect/UnsafeRef.java b/test/langtools/tools/jdeps/modules/src/unsafe/org/indirect/UnsafeRef.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/unsafe/org/indirect/UnsafeRef.java rename to test/langtools/tools/jdeps/modules/src/unsafe/org/indirect/UnsafeRef.java diff --git a/langtools/test/tools/jdeps/modules/src/unsafe/org/safe/Lib.java b/test/langtools/tools/jdeps/modules/src/unsafe/org/safe/Lib.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/unsafe/org/safe/Lib.java rename to test/langtools/tools/jdeps/modules/src/unsafe/org/safe/Lib.java diff --git a/langtools/test/tools/jdeps/modules/src/unsafe/org/unsafe/UseUnsafe.java b/test/langtools/tools/jdeps/modules/src/unsafe/org/unsafe/UseUnsafe.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/unsafe/org/unsafe/UseUnsafe.java rename to test/langtools/tools/jdeps/modules/src/unsafe/org/unsafe/UseUnsafe.java diff --git a/langtools/test/tools/jdeps/modules/src/unsupported/module-info.java b/test/langtools/tools/jdeps/modules/src/unsupported/module-info.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/unsupported/module-info.java rename to test/langtools/tools/jdeps/modules/src/unsupported/module-info.java diff --git a/langtools/test/tools/jdeps/modules/src/unsupported/q/Counter.java b/test/langtools/tools/jdeps/modules/src/unsupported/q/Counter.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/unsupported/q/Counter.java rename to test/langtools/tools/jdeps/modules/src/unsupported/q/Counter.java diff --git a/langtools/test/tools/jdeps/mrjar/10/test/Version.java b/test/langtools/tools/jdeps/mrjar/10/test/Version.java similarity index 100% rename from langtools/test/tools/jdeps/mrjar/10/test/Version.java rename to test/langtools/tools/jdeps/mrjar/10/test/Version.java diff --git a/langtools/test/tools/jdeps/mrjar/9/test/NonPublic.java b/test/langtools/tools/jdeps/mrjar/9/test/NonPublic.java similarity index 100% rename from langtools/test/tools/jdeps/mrjar/9/test/NonPublic.java rename to test/langtools/tools/jdeps/mrjar/9/test/NonPublic.java diff --git a/langtools/test/tools/jdeps/mrjar/9/test/Version.java b/test/langtools/tools/jdeps/mrjar/9/test/Version.java similarity index 100% rename from langtools/test/tools/jdeps/mrjar/9/test/Version.java rename to test/langtools/tools/jdeps/mrjar/9/test/Version.java diff --git a/langtools/test/tools/jdeps/mrjar/base/p/Foo.java b/test/langtools/tools/jdeps/mrjar/base/p/Foo.java similarity index 100% rename from langtools/test/tools/jdeps/mrjar/base/p/Foo.java rename to test/langtools/tools/jdeps/mrjar/base/p/Foo.java diff --git a/langtools/test/tools/jdeps/mrjar/base/test/Version.java b/test/langtools/tools/jdeps/mrjar/base/test/Version.java similarity index 100% rename from langtools/test/tools/jdeps/mrjar/base/test/Version.java rename to test/langtools/tools/jdeps/mrjar/base/test/Version.java diff --git a/langtools/test/tools/jdeps/mrjar/test/Main.java b/test/langtools/tools/jdeps/mrjar/test/Main.java similarity index 100% rename from langtools/test/tools/jdeps/mrjar/test/Main.java rename to test/langtools/tools/jdeps/mrjar/test/Main.java diff --git a/langtools/test/tools/jdeps/mrjar/v10/q/Bar.java b/test/langtools/tools/jdeps/mrjar/v10/q/Bar.java similarity index 100% rename from langtools/test/tools/jdeps/mrjar/v10/q/Bar.java rename to test/langtools/tools/jdeps/mrjar/v10/q/Bar.java diff --git a/langtools/test/tools/jdeps/mrjar/v10/q/Gee.java b/test/langtools/tools/jdeps/mrjar/v10/q/Gee.java similarity index 100% rename from langtools/test/tools/jdeps/mrjar/v10/q/Gee.java rename to test/langtools/tools/jdeps/mrjar/v10/q/Gee.java diff --git a/langtools/test/tools/jdeps/mrjar/v9/p/Foo.java b/test/langtools/tools/jdeps/mrjar/v9/p/Foo.java similarity index 100% rename from langtools/test/tools/jdeps/mrjar/v9/p/Foo.java rename to test/langtools/tools/jdeps/mrjar/v9/p/Foo.java diff --git a/langtools/test/tools/jdeps/mrjar/v9/q/Bar.java b/test/langtools/tools/jdeps/mrjar/v9/q/Bar.java similarity index 100% rename from langtools/test/tools/jdeps/mrjar/v9/q/Bar.java rename to test/langtools/tools/jdeps/mrjar/v9/q/Bar.java diff --git a/langtools/test/tools/jdeps/p/Bar.java b/test/langtools/tools/jdeps/p/Bar.java similarity index 100% rename from langtools/test/tools/jdeps/p/Bar.java rename to test/langtools/tools/jdeps/p/Bar.java diff --git a/langtools/test/tools/jdeps/p/C.java b/test/langtools/tools/jdeps/p/C.java similarity index 100% rename from langtools/test/tools/jdeps/p/C.java rename to test/langtools/tools/jdeps/p/C.java diff --git a/langtools/test/tools/jdeps/p/Foo.java b/test/langtools/tools/jdeps/p/Foo.java similarity index 100% rename from langtools/test/tools/jdeps/p/Foo.java rename to test/langtools/tools/jdeps/p/Foo.java diff --git a/langtools/test/tools/jdeps/p/SubClass.java b/test/langtools/tools/jdeps/p/SubClass.java similarity index 100% rename from langtools/test/tools/jdeps/p/SubClass.java rename to test/langtools/tools/jdeps/p/SubClass.java diff --git a/langtools/test/tools/jdeps/q/Gee.java b/test/langtools/tools/jdeps/q/Gee.java similarity index 100% rename from langtools/test/tools/jdeps/q/Gee.java rename to test/langtools/tools/jdeps/q/Gee.java diff --git a/langtools/test/tools/jdeps/unsupported/Bar.java b/test/langtools/tools/jdeps/unsupported/Bar.java similarity index 100% rename from langtools/test/tools/jdeps/unsupported/Bar.java rename to test/langtools/tools/jdeps/unsupported/Bar.java diff --git a/langtools/test/tools/jdeps/unsupported/Foo.java b/test/langtools/tools/jdeps/unsupported/Foo.java similarity index 100% rename from langtools/test/tools/jdeps/unsupported/Foo.java rename to test/langtools/tools/jdeps/unsupported/Foo.java diff --git a/langtools/test/tools/jdeps/unsupported/JDKUnsupportedTest.java b/test/langtools/tools/jdeps/unsupported/JDKUnsupportedTest.java similarity index 100% rename from langtools/test/tools/jdeps/unsupported/JDKUnsupportedTest.java rename to test/langtools/tools/jdeps/unsupported/JDKUnsupportedTest.java diff --git a/langtools/test/tools/lib/toolbox/AbstractTask.java b/test/langtools/tools/lib/toolbox/AbstractTask.java similarity index 100% rename from langtools/test/tools/lib/toolbox/AbstractTask.java rename to test/langtools/tools/lib/toolbox/AbstractTask.java diff --git a/langtools/test/tools/lib/toolbox/Assert.java b/test/langtools/tools/lib/toolbox/Assert.java similarity index 100% rename from langtools/test/tools/lib/toolbox/Assert.java rename to test/langtools/tools/lib/toolbox/Assert.java diff --git a/langtools/test/tools/lib/toolbox/ExecTask.java b/test/langtools/tools/lib/toolbox/ExecTask.java similarity index 100% rename from langtools/test/tools/lib/toolbox/ExecTask.java rename to test/langtools/tools/lib/toolbox/ExecTask.java diff --git a/langtools/test/tools/lib/toolbox/JarTask.java b/test/langtools/tools/lib/toolbox/JarTask.java similarity index 100% rename from langtools/test/tools/lib/toolbox/JarTask.java rename to test/langtools/tools/lib/toolbox/JarTask.java diff --git a/langtools/test/tools/lib/toolbox/JavaTask.java b/test/langtools/tools/lib/toolbox/JavaTask.java similarity index 100% rename from langtools/test/tools/lib/toolbox/JavaTask.java rename to test/langtools/tools/lib/toolbox/JavaTask.java diff --git a/langtools/test/tools/lib/toolbox/JavacTask.java b/test/langtools/tools/lib/toolbox/JavacTask.java similarity index 100% rename from langtools/test/tools/lib/toolbox/JavacTask.java rename to test/langtools/tools/lib/toolbox/JavacTask.java diff --git a/langtools/test/tools/lib/toolbox/JavadocTask.java b/test/langtools/tools/lib/toolbox/JavadocTask.java similarity index 100% rename from langtools/test/tools/lib/toolbox/JavadocTask.java rename to test/langtools/tools/lib/toolbox/JavadocTask.java diff --git a/langtools/test/tools/lib/toolbox/JavahTask.java b/test/langtools/tools/lib/toolbox/JavahTask.java similarity index 100% rename from langtools/test/tools/lib/toolbox/JavahTask.java rename to test/langtools/tools/lib/toolbox/JavahTask.java diff --git a/langtools/test/tools/lib/toolbox/JavapTask.java b/test/langtools/tools/lib/toolbox/JavapTask.java similarity index 100% rename from langtools/test/tools/lib/toolbox/JavapTask.java rename to test/langtools/tools/lib/toolbox/JavapTask.java diff --git a/langtools/test/tools/lib/toolbox/ModuleBuilder.java b/test/langtools/tools/lib/toolbox/ModuleBuilder.java similarity index 100% rename from langtools/test/tools/lib/toolbox/ModuleBuilder.java rename to test/langtools/tools/lib/toolbox/ModuleBuilder.java diff --git a/langtools/test/tools/lib/toolbox/Task.java b/test/langtools/tools/lib/toolbox/Task.java similarity index 100% rename from langtools/test/tools/lib/toolbox/Task.java rename to test/langtools/tools/lib/toolbox/Task.java diff --git a/langtools/test/tools/lib/toolbox/TestRunner.java b/test/langtools/tools/lib/toolbox/TestRunner.java similarity index 100% rename from langtools/test/tools/lib/toolbox/TestRunner.java rename to test/langtools/tools/lib/toolbox/TestRunner.java diff --git a/langtools/test/tools/lib/toolbox/ToolBox.java b/test/langtools/tools/lib/toolbox/ToolBox.java similarity index 100% rename from langtools/test/tools/lib/toolbox/ToolBox.java rename to test/langtools/tools/lib/toolbox/ToolBox.java diff --git a/langtools/test/tools/lib/types/TypeHarness.java b/test/langtools/tools/lib/types/TypeHarness.java similarity index 100% rename from langtools/test/tools/lib/types/TypeHarness.java rename to test/langtools/tools/lib/types/TypeHarness.java diff --git a/langtools/test/tools/sjavac/ApiExtraction.java b/test/langtools/tools/sjavac/ApiExtraction.java similarity index 100% rename from langtools/test/tools/sjavac/ApiExtraction.java rename to test/langtools/tools/sjavac/ApiExtraction.java diff --git a/langtools/test/tools/sjavac/ClasspathDependencies.java b/test/langtools/tools/sjavac/ClasspathDependencies.java similarity index 100% rename from langtools/test/tools/sjavac/ClasspathDependencies.java rename to test/langtools/tools/sjavac/ClasspathDependencies.java diff --git a/langtools/test/tools/sjavac/CompileCircularSources.java b/test/langtools/tools/sjavac/CompileCircularSources.java similarity index 100% rename from langtools/test/tools/sjavac/CompileCircularSources.java rename to test/langtools/tools/sjavac/CompileCircularSources.java diff --git a/langtools/test/tools/sjavac/CompileExcludingDependency.java b/test/langtools/tools/sjavac/CompileExcludingDependency.java similarity index 100% rename from langtools/test/tools/sjavac/CompileExcludingDependency.java rename to test/langtools/tools/sjavac/CompileExcludingDependency.java diff --git a/langtools/test/tools/sjavac/CompileWithAtFile.java b/test/langtools/tools/sjavac/CompileWithAtFile.java similarity index 100% rename from langtools/test/tools/sjavac/CompileWithAtFile.java rename to test/langtools/tools/sjavac/CompileWithAtFile.java diff --git a/langtools/test/tools/sjavac/CompileWithInvisibleSources.java b/test/langtools/tools/sjavac/CompileWithInvisibleSources.java similarity index 100% rename from langtools/test/tools/sjavac/CompileWithInvisibleSources.java rename to test/langtools/tools/sjavac/CompileWithInvisibleSources.java diff --git a/langtools/test/tools/sjavac/CompileWithOverrideSources.java b/test/langtools/tools/sjavac/CompileWithOverrideSources.java similarity index 100% rename from langtools/test/tools/sjavac/CompileWithOverrideSources.java rename to test/langtools/tools/sjavac/CompileWithOverrideSources.java diff --git a/langtools/test/tools/sjavac/HiddenFiles.java b/test/langtools/tools/sjavac/HiddenFiles.java similarity index 100% rename from langtools/test/tools/sjavac/HiddenFiles.java rename to test/langtools/tools/sjavac/HiddenFiles.java diff --git a/langtools/test/tools/sjavac/IdleShutdown.java b/test/langtools/tools/sjavac/IdleShutdown.java similarity index 100% rename from langtools/test/tools/sjavac/IdleShutdown.java rename to test/langtools/tools/sjavac/IdleShutdown.java diff --git a/langtools/test/tools/sjavac/IgnoreSymbolFile.java b/test/langtools/tools/sjavac/IgnoreSymbolFile.java similarity index 100% rename from langtools/test/tools/sjavac/IgnoreSymbolFile.java rename to test/langtools/tools/sjavac/IgnoreSymbolFile.java diff --git a/langtools/test/tools/sjavac/IncCompInheritance.java b/test/langtools/tools/sjavac/IncCompInheritance.java similarity index 100% rename from langtools/test/tools/sjavac/IncCompInheritance.java rename to test/langtools/tools/sjavac/IncCompInheritance.java diff --git a/langtools/test/tools/sjavac/IncCompileChangeNative.java b/test/langtools/tools/sjavac/IncCompileChangeNative.java similarity index 100% rename from langtools/test/tools/sjavac/IncCompileChangeNative.java rename to test/langtools/tools/sjavac/IncCompileChangeNative.java diff --git a/langtools/test/tools/sjavac/IncCompileDropClasses.java b/test/langtools/tools/sjavac/IncCompileDropClasses.java similarity index 100% rename from langtools/test/tools/sjavac/IncCompileDropClasses.java rename to test/langtools/tools/sjavac/IncCompileDropClasses.java diff --git a/langtools/test/tools/sjavac/IncCompileFullyQualifiedRef.java b/test/langtools/tools/sjavac/IncCompileFullyQualifiedRef.java similarity index 100% rename from langtools/test/tools/sjavac/IncCompileFullyQualifiedRef.java rename to test/langtools/tools/sjavac/IncCompileFullyQualifiedRef.java diff --git a/langtools/test/tools/sjavac/IncCompileNoChanges.java b/test/langtools/tools/sjavac/IncCompileNoChanges.java similarity index 100% rename from langtools/test/tools/sjavac/IncCompileNoChanges.java rename to test/langtools/tools/sjavac/IncCompileNoChanges.java diff --git a/langtools/test/tools/sjavac/IncCompileUpdateNative.java b/test/langtools/tools/sjavac/IncCompileUpdateNative.java similarity index 100% rename from langtools/test/tools/sjavac/IncCompileUpdateNative.java rename to test/langtools/tools/sjavac/IncCompileUpdateNative.java diff --git a/langtools/test/tools/sjavac/IncCompileWithChanges.java b/test/langtools/tools/sjavac/IncCompileWithChanges.java similarity index 100% rename from langtools/test/tools/sjavac/IncCompileWithChanges.java rename to test/langtools/tools/sjavac/IncCompileWithChanges.java diff --git a/langtools/test/tools/sjavac/IncludeExcludePatterns.java b/test/langtools/tools/sjavac/IncludeExcludePatterns.java similarity index 100% rename from langtools/test/tools/sjavac/IncludeExcludePatterns.java rename to test/langtools/tools/sjavac/IncludeExcludePatterns.java diff --git a/langtools/test/tools/sjavac/JavacOptionPrep.java b/test/langtools/tools/sjavac/JavacOptionPrep.java similarity index 100% rename from langtools/test/tools/sjavac/JavacOptionPrep.java rename to test/langtools/tools/sjavac/JavacOptionPrep.java diff --git a/langtools/test/tools/sjavac/NoState.java b/test/langtools/tools/sjavac/NoState.java similarity index 100% rename from langtools/test/tools/sjavac/NoState.java rename to test/langtools/tools/sjavac/NoState.java diff --git a/langtools/test/tools/sjavac/OptionDecoding.java b/test/langtools/tools/sjavac/OptionDecoding.java similarity index 100% rename from langtools/test/tools/sjavac/OptionDecoding.java rename to test/langtools/tools/sjavac/OptionDecoding.java diff --git a/langtools/test/tools/sjavac/OverlappingSrcDst.java b/test/langtools/tools/sjavac/OverlappingSrcDst.java similarity index 100% rename from langtools/test/tools/sjavac/OverlappingSrcDst.java rename to test/langtools/tools/sjavac/OverlappingSrcDst.java diff --git a/langtools/test/tools/sjavac/PackagePathMismatch.java b/test/langtools/tools/sjavac/PackagePathMismatch.java similarity index 100% rename from langtools/test/tools/sjavac/PackagePathMismatch.java rename to test/langtools/tools/sjavac/PackagePathMismatch.java diff --git a/langtools/test/tools/sjavac/ParallelCompilations.java b/test/langtools/tools/sjavac/ParallelCompilations.java similarity index 100% rename from langtools/test/tools/sjavac/ParallelCompilations.java rename to test/langtools/tools/sjavac/ParallelCompilations.java diff --git a/langtools/test/tools/sjavac/PermittedArtifact.java b/test/langtools/tools/sjavac/PermittedArtifact.java similarity index 100% rename from langtools/test/tools/sjavac/PermittedArtifact.java rename to test/langtools/tools/sjavac/PermittedArtifact.java diff --git a/langtools/test/tools/sjavac/PooledExecution.java b/test/langtools/tools/sjavac/PooledExecution.java similarity index 100% rename from langtools/test/tools/sjavac/PooledExecution.java rename to test/langtools/tools/sjavac/PooledExecution.java diff --git a/langtools/test/tools/sjavac/SJavacTester.java b/test/langtools/tools/sjavac/SJavacTester.java similarity index 100% rename from langtools/test/tools/sjavac/SJavacTester.java rename to test/langtools/tools/sjavac/SJavacTester.java diff --git a/langtools/test/tools/sjavac/Serialization.java b/test/langtools/tools/sjavac/Serialization.java similarity index 100% rename from langtools/test/tools/sjavac/Serialization.java rename to test/langtools/tools/sjavac/Serialization.java diff --git a/langtools/test/tools/sjavac/SjavacBase.java b/test/langtools/tools/sjavac/SjavacBase.java similarity index 100% rename from langtools/test/tools/sjavac/SjavacBase.java rename to test/langtools/tools/sjavac/SjavacBase.java diff --git a/langtools/test/tools/sjavac/StateDir.java b/test/langtools/tools/sjavac/StateDir.java similarity index 100% rename from langtools/test/tools/sjavac/StateDir.java rename to test/langtools/tools/sjavac/StateDir.java diff --git a/langtools/test/tools/sjavac/Wrapper.java b/test/langtools/tools/sjavac/Wrapper.java similarity index 100% rename from langtools/test/tools/sjavac/Wrapper.java rename to test/langtools/tools/sjavac/Wrapper.java diff --git a/langtools/test/tools/sjavac/util/OptionTestUtil.java b/test/langtools/tools/sjavac/util/OptionTestUtil.java similarity index 100% rename from langtools/test/tools/sjavac/util/OptionTestUtil.java rename to test/langtools/tools/sjavac/util/OptionTestUtil.java diff --git a/nashorn/test/Makefile b/test/nashorn/Makefile similarity index 100% rename from nashorn/test/Makefile rename to test/nashorn/Makefile diff --git a/nashorn/test/ProblemList.txt b/test/nashorn/ProblemList.txt similarity index 100% rename from nashorn/test/ProblemList.txt rename to test/nashorn/ProblemList.txt diff --git a/nashorn/test/README b/test/nashorn/README similarity index 100% rename from nashorn/test/README rename to test/nashorn/README diff --git a/nashorn/test/TEST.ROOT b/test/nashorn/TEST.ROOT similarity index 100% rename from nashorn/test/TEST.ROOT rename to test/nashorn/TEST.ROOT diff --git a/nashorn/test/TEST.groups b/test/nashorn/TEST.groups similarity index 100% rename from nashorn/test/TEST.groups rename to test/nashorn/TEST.groups diff --git a/nashorn/test/examples/apply_to_call_benchmark.js b/test/nashorn/examples/apply_to_call_benchmark.js similarity index 100% rename from nashorn/test/examples/apply_to_call_benchmark.js rename to test/nashorn/examples/apply_to_call_benchmark.js diff --git a/nashorn/test/examples/array-micro.js b/test/nashorn/examples/array-micro.js similarity index 100% rename from nashorn/test/examples/array-micro.js rename to test/nashorn/examples/array-micro.js diff --git a/nashorn/test/examples/charcodeat-benchmark.js b/test/nashorn/examples/charcodeat-benchmark.js similarity index 100% rename from nashorn/test/examples/charcodeat-benchmark.js rename to test/nashorn/examples/charcodeat-benchmark.js diff --git a/nashorn/test/examples/dual-fields-micro.js b/test/nashorn/examples/dual-fields-micro.js similarity index 100% rename from nashorn/test/examples/dual-fields-micro.js rename to test/nashorn/examples/dual-fields-micro.js diff --git a/nashorn/test/examples/getter-setter-micro.js b/test/nashorn/examples/getter-setter-micro.js similarity index 100% rename from nashorn/test/examples/getter-setter-micro.js rename to test/nashorn/examples/getter-setter-micro.js diff --git a/nashorn/test/examples/innerbench.js b/test/nashorn/examples/innerbench.js similarity index 100% rename from nashorn/test/examples/innerbench.js rename to test/nashorn/examples/innerbench.js diff --git a/nashorn/test/examples/int-micro.js b/test/nashorn/examples/int-micro.js similarity index 100% rename from nashorn/test/examples/int-micro.js rename to test/nashorn/examples/int-micro.js diff --git a/nashorn/test/examples/json-parser-micro.js b/test/nashorn/examples/json-parser-micro.js similarity index 100% rename from nashorn/test/examples/json-parser-micro.js rename to test/nashorn/examples/json-parser-micro.js diff --git a/nashorn/test/examples/push-pop-benchmark.js b/test/nashorn/examples/push-pop-benchmark.js similarity index 100% rename from nashorn/test/examples/push-pop-benchmark.js rename to test/nashorn/examples/push-pop-benchmark.js diff --git a/nashorn/test/examples/string-micro.js b/test/nashorn/examples/string-micro.js similarity index 100% rename from nashorn/test/examples/string-micro.js rename to test/nashorn/examples/string-micro.js diff --git a/nashorn/test/examples/typechain.js b/test/nashorn/examples/typechain.js similarity index 100% rename from nashorn/test/examples/typechain.js rename to test/nashorn/examples/typechain.js diff --git a/nashorn/test/lib/benchmark.js b/test/nashorn/lib/benchmark.js similarity index 100% rename from nashorn/test/lib/benchmark.js rename to test/nashorn/lib/benchmark.js diff --git a/nashorn/test/opt/add.js b/test/nashorn/opt/add.js similarity index 100% rename from nashorn/test/opt/add.js rename to test/nashorn/opt/add.js diff --git a/nashorn/test/opt/add_constant.js b/test/nashorn/opt/add_constant.js similarity index 100% rename from nashorn/test/opt/add_constant.js rename to test/nashorn/opt/add_constant.js diff --git a/nashorn/test/opt/add_reuse_callsite.js b/test/nashorn/opt/add_reuse_callsite.js similarity index 100% rename from nashorn/test/opt/add_reuse_callsite.js rename to test/nashorn/opt/add_reuse_callsite.js diff --git a/nashorn/test/opt/add_revert2.js b/test/nashorn/opt/add_revert2.js similarity index 100% rename from nashorn/test/opt/add_revert2.js rename to test/nashorn/opt/add_revert2.js diff --git a/nashorn/test/opt/cascade_specialize.js b/test/nashorn/opt/cascade_specialize.js similarity index 100% rename from nashorn/test/opt/cascade_specialize.js rename to test/nashorn/opt/cascade_specialize.js diff --git a/nashorn/test/script/README b/test/nashorn/script/README similarity index 100% rename from nashorn/test/script/README rename to test/nashorn/script/README diff --git a/nashorn/test/script/assert.js b/test/nashorn/script/assert.js similarity index 100% rename from nashorn/test/script/assert.js rename to test/nashorn/script/assert.js diff --git a/nashorn/test/script/basic/8024180/global_var_delete.js b/test/nashorn/script/basic/8024180/global_var_delete.js similarity index 100% rename from nashorn/test/script/basic/8024180/global_var_delete.js rename to test/nashorn/script/basic/8024180/global_var_delete.js diff --git a/nashorn/test/script/basic/8024180/global_var_delete.js.EXPECTED b/test/nashorn/script/basic/8024180/global_var_delete.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/8024180/global_var_delete.js.EXPECTED rename to test/nashorn/script/basic/8024180/global_var_delete.js.EXPECTED diff --git a/nashorn/test/script/basic/8024180/global_var_shadow.js b/test/nashorn/script/basic/8024180/global_var_shadow.js similarity index 100% rename from nashorn/test/script/basic/8024180/global_var_shadow.js rename to test/nashorn/script/basic/8024180/global_var_shadow.js diff --git a/nashorn/test/script/basic/8024180/global_var_shadow.js.EXPECTED b/test/nashorn/script/basic/8024180/global_var_shadow.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/8024180/global_var_shadow.js.EXPECTED rename to test/nashorn/script/basic/8024180/global_var_shadow.js.EXPECTED diff --git a/nashorn/test/script/basic/8024180/scope_no_such_prop.js b/test/nashorn/script/basic/8024180/scope_no_such_prop.js similarity index 100% rename from nashorn/test/script/basic/8024180/scope_no_such_prop.js rename to test/nashorn/script/basic/8024180/scope_no_such_prop.js diff --git a/nashorn/test/script/basic/8024180/scope_no_such_prop.js.EXPECTED b/test/nashorn/script/basic/8024180/scope_no_such_prop.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/8024180/scope_no_such_prop.js.EXPECTED rename to test/nashorn/script/basic/8024180/scope_no_such_prop.js.EXPECTED diff --git a/nashorn/test/script/basic/8024180/with_expr_prop_add.js b/test/nashorn/script/basic/8024180/with_expr_prop_add.js similarity index 100% rename from nashorn/test/script/basic/8024180/with_expr_prop_add.js rename to test/nashorn/script/basic/8024180/with_expr_prop_add.js diff --git a/nashorn/test/script/basic/8024180/with_expr_prop_add.js.EXPECTED b/test/nashorn/script/basic/8024180/with_expr_prop_add.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/8024180/with_expr_prop_add.js.EXPECTED rename to test/nashorn/script/basic/8024180/with_expr_prop_add.js.EXPECTED diff --git a/nashorn/test/script/basic/8024180/with_expr_proto_prop_add.js b/test/nashorn/script/basic/8024180/with_expr_proto_prop_add.js similarity index 100% rename from nashorn/test/script/basic/8024180/with_expr_proto_prop_add.js rename to test/nashorn/script/basic/8024180/with_expr_proto_prop_add.js diff --git a/nashorn/test/script/basic/8024180/with_expr_proto_prop_add.js.EXPECTED b/test/nashorn/script/basic/8024180/with_expr_proto_prop_add.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/8024180/with_expr_proto_prop_add.js.EXPECTED rename to test/nashorn/script/basic/8024180/with_expr_proto_prop_add.js.EXPECTED diff --git a/nashorn/test/script/basic/8024180/with_java_object.js b/test/nashorn/script/basic/8024180/with_java_object.js similarity index 100% rename from nashorn/test/script/basic/8024180/with_java_object.js rename to test/nashorn/script/basic/8024180/with_java_object.js diff --git a/nashorn/test/script/basic/8024180/with_java_object.js.EXPECTED b/test/nashorn/script/basic/8024180/with_java_object.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/8024180/with_java_object.js.EXPECTED rename to test/nashorn/script/basic/8024180/with_java_object.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8005958.js b/test/nashorn/script/basic/JDK-8005958.js similarity index 100% rename from nashorn/test/script/basic/JDK-8005958.js rename to test/nashorn/script/basic/JDK-8005958.js diff --git a/nashorn/test/script/basic/JDK-8006304.js b/test/nashorn/script/basic/JDK-8006304.js similarity index 100% rename from nashorn/test/script/basic/JDK-8006304.js rename to test/nashorn/script/basic/JDK-8006304.js diff --git a/nashorn/test/script/basic/JDK-8006304.js.EXPECTED b/test/nashorn/script/basic/JDK-8006304.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8006304.js.EXPECTED rename to test/nashorn/script/basic/JDK-8006304.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8006337.js b/test/nashorn/script/basic/JDK-8006337.js similarity index 100% rename from nashorn/test/script/basic/JDK-8006337.js rename to test/nashorn/script/basic/JDK-8006337.js diff --git a/nashorn/test/script/basic/JDK-8006337.js.EXPECTED b/test/nashorn/script/basic/JDK-8006337.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8006337.js.EXPECTED rename to test/nashorn/script/basic/JDK-8006337.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8006529-b.js b/test/nashorn/script/basic/JDK-8006529-b.js similarity index 100% rename from nashorn/test/script/basic/JDK-8006529-b.js rename to test/nashorn/script/basic/JDK-8006529-b.js diff --git a/nashorn/test/script/basic/JDK-8006529-b.js.EXPECTED b/test/nashorn/script/basic/JDK-8006529-b.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8006529-b.js.EXPECTED rename to test/nashorn/script/basic/JDK-8006529-b.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8006570.js b/test/nashorn/script/basic/JDK-8006570.js similarity index 100% rename from nashorn/test/script/basic/JDK-8006570.js rename to test/nashorn/script/basic/JDK-8006570.js diff --git a/nashorn/test/script/basic/JDK-8006570.js.EXPECTED b/test/nashorn/script/basic/JDK-8006570.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8006570.js.EXPECTED rename to test/nashorn/script/basic/JDK-8006570.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8006575.js b/test/nashorn/script/basic/JDK-8006575.js similarity index 100% rename from nashorn/test/script/basic/JDK-8006575.js rename to test/nashorn/script/basic/JDK-8006575.js diff --git a/nashorn/test/script/basic/JDK-8006755.js b/test/nashorn/script/basic/JDK-8006755.js similarity index 100% rename from nashorn/test/script/basic/JDK-8006755.js rename to test/nashorn/script/basic/JDK-8006755.js diff --git a/nashorn/test/script/basic/JDK-8006852a.js b/test/nashorn/script/basic/JDK-8006852a.js similarity index 100% rename from nashorn/test/script/basic/JDK-8006852a.js rename to test/nashorn/script/basic/JDK-8006852a.js diff --git a/nashorn/test/script/basic/JDK-8006852a.js.EXPECTED b/test/nashorn/script/basic/JDK-8006852a.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8006852a.js.EXPECTED rename to test/nashorn/script/basic/JDK-8006852a.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8006852b.js b/test/nashorn/script/basic/JDK-8006852b.js similarity index 100% rename from nashorn/test/script/basic/JDK-8006852b.js rename to test/nashorn/script/basic/JDK-8006852b.js diff --git a/nashorn/test/script/basic/JDK-8006857.js b/test/nashorn/script/basic/JDK-8006857.js similarity index 100% rename from nashorn/test/script/basic/JDK-8006857.js rename to test/nashorn/script/basic/JDK-8006857.js diff --git a/nashorn/test/script/basic/JDK-8006857.js.EXPECTED b/test/nashorn/script/basic/JDK-8006857.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8006857.js.EXPECTED rename to test/nashorn/script/basic/JDK-8006857.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8006983.js b/test/nashorn/script/basic/JDK-8006983.js similarity index 100% rename from nashorn/test/script/basic/JDK-8006983.js rename to test/nashorn/script/basic/JDK-8006983.js diff --git a/nashorn/test/script/basic/JDK-8006984.js b/test/nashorn/script/basic/JDK-8006984.js similarity index 100% rename from nashorn/test/script/basic/JDK-8006984.js rename to test/nashorn/script/basic/JDK-8006984.js diff --git a/nashorn/test/script/basic/JDK-8006984.js.EXPECTED b/test/nashorn/script/basic/JDK-8006984.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8006984.js.EXPECTED rename to test/nashorn/script/basic/JDK-8006984.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8007060.js b/test/nashorn/script/basic/JDK-8007060.js similarity index 100% rename from nashorn/test/script/basic/JDK-8007060.js rename to test/nashorn/script/basic/JDK-8007060.js diff --git a/nashorn/test/script/basic/JDK-8007060.js.EXPECTED b/test/nashorn/script/basic/JDK-8007060.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8007060.js.EXPECTED rename to test/nashorn/script/basic/JDK-8007060.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8007132.js b/test/nashorn/script/basic/JDK-8007132.js similarity index 100% rename from nashorn/test/script/basic/JDK-8007132.js rename to test/nashorn/script/basic/JDK-8007132.js diff --git a/nashorn/test/script/basic/JDK-8007140.js b/test/nashorn/script/basic/JDK-8007140.js similarity index 100% rename from nashorn/test/script/basic/JDK-8007140.js rename to test/nashorn/script/basic/JDK-8007140.js diff --git a/nashorn/test/script/basic/JDK-8007215.js b/test/nashorn/script/basic/JDK-8007215.js similarity index 100% rename from nashorn/test/script/basic/JDK-8007215.js rename to test/nashorn/script/basic/JDK-8007215.js diff --git a/nashorn/test/script/basic/JDK-8007215.js.EXPECTED b/test/nashorn/script/basic/JDK-8007215.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8007215.js.EXPECTED rename to test/nashorn/script/basic/JDK-8007215.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8007456.js b/test/nashorn/script/basic/JDK-8007456.js similarity index 100% rename from nashorn/test/script/basic/JDK-8007456.js rename to test/nashorn/script/basic/JDK-8007456.js diff --git a/nashorn/test/script/basic/JDK-8007456.js.EXPECTED b/test/nashorn/script/basic/JDK-8007456.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8007456.js.EXPECTED rename to test/nashorn/script/basic/JDK-8007456.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8007460.js b/test/nashorn/script/basic/JDK-8007460.js similarity index 100% rename from nashorn/test/script/basic/JDK-8007460.js rename to test/nashorn/script/basic/JDK-8007460.js diff --git a/nashorn/test/script/basic/JDK-8007460.js.EXPECTED b/test/nashorn/script/basic/JDK-8007460.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8007460.js.EXPECTED rename to test/nashorn/script/basic/JDK-8007460.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8007522.js b/test/nashorn/script/basic/JDK-8007522.js similarity index 100% rename from nashorn/test/script/basic/JDK-8007522.js rename to test/nashorn/script/basic/JDK-8007522.js diff --git a/nashorn/test/script/basic/JDK-8007523.js b/test/nashorn/script/basic/JDK-8007523.js similarity index 100% rename from nashorn/test/script/basic/JDK-8007523.js rename to test/nashorn/script/basic/JDK-8007523.js diff --git a/nashorn/test/script/basic/JDK-8007619.js b/test/nashorn/script/basic/JDK-8007619.js similarity index 100% rename from nashorn/test/script/basic/JDK-8007619.js rename to test/nashorn/script/basic/JDK-8007619.js diff --git a/nashorn/test/script/basic/JDK-8007619.js.EXPECTED b/test/nashorn/script/basic/JDK-8007619.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8007619.js.EXPECTED rename to test/nashorn/script/basic/JDK-8007619.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8007718.js b/test/nashorn/script/basic/JDK-8007718.js similarity index 100% rename from nashorn/test/script/basic/JDK-8007718.js rename to test/nashorn/script/basic/JDK-8007718.js diff --git a/nashorn/test/script/basic/JDK-8007718.js.EXPECTED b/test/nashorn/script/basic/JDK-8007718.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8007718.js.EXPECTED rename to test/nashorn/script/basic/JDK-8007718.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8007990.js b/test/nashorn/script/basic/JDK-8007990.js similarity index 100% rename from nashorn/test/script/basic/JDK-8007990.js rename to test/nashorn/script/basic/JDK-8007990.js diff --git a/nashorn/test/script/basic/JDK-8007990.js.EXPECTED b/test/nashorn/script/basic/JDK-8007990.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8007990.js.EXPECTED rename to test/nashorn/script/basic/JDK-8007990.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8008197.js b/test/nashorn/script/basic/JDK-8008197.js similarity index 100% rename from nashorn/test/script/basic/JDK-8008197.js rename to test/nashorn/script/basic/JDK-8008197.js diff --git a/nashorn/test/script/basic/JDK-8008198.js b/test/nashorn/script/basic/JDK-8008198.js similarity index 100% rename from nashorn/test/script/basic/JDK-8008198.js rename to test/nashorn/script/basic/JDK-8008198.js diff --git a/nashorn/test/script/basic/JDK-8008198.js.EXPECTED b/test/nashorn/script/basic/JDK-8008198.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8008198.js.EXPECTED rename to test/nashorn/script/basic/JDK-8008198.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8008206.js b/test/nashorn/script/basic/JDK-8008206.js similarity index 100% rename from nashorn/test/script/basic/JDK-8008206.js rename to test/nashorn/script/basic/JDK-8008206.js diff --git a/nashorn/test/script/basic/JDK-8008206.js.EXPECTED b/test/nashorn/script/basic/JDK-8008206.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8008206.js.EXPECTED rename to test/nashorn/script/basic/JDK-8008206.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8008215.js b/test/nashorn/script/basic/JDK-8008215.js similarity index 100% rename from nashorn/test/script/basic/JDK-8008215.js rename to test/nashorn/script/basic/JDK-8008215.js diff --git a/nashorn/test/script/basic/JDK-8008215.js.EXPECTED b/test/nashorn/script/basic/JDK-8008215.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8008215.js.EXPECTED rename to test/nashorn/script/basic/JDK-8008215.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8008238.js b/test/nashorn/script/basic/JDK-8008238.js similarity index 100% rename from nashorn/test/script/basic/JDK-8008238.js rename to test/nashorn/script/basic/JDK-8008238.js diff --git a/nashorn/test/script/basic/JDK-8008298.js b/test/nashorn/script/basic/JDK-8008298.js similarity index 100% rename from nashorn/test/script/basic/JDK-8008298.js rename to test/nashorn/script/basic/JDK-8008298.js diff --git a/nashorn/test/script/basic/JDK-8008370.js b/test/nashorn/script/basic/JDK-8008370.js similarity index 100% rename from nashorn/test/script/basic/JDK-8008370.js rename to test/nashorn/script/basic/JDK-8008370.js diff --git a/nashorn/test/script/basic/JDK-8008370.js.EXPECTED b/test/nashorn/script/basic/JDK-8008370.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8008370.js.EXPECTED rename to test/nashorn/script/basic/JDK-8008370.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8008448.js b/test/nashorn/script/basic/JDK-8008448.js similarity index 100% rename from nashorn/test/script/basic/JDK-8008448.js rename to test/nashorn/script/basic/JDK-8008448.js diff --git a/nashorn/test/script/basic/JDK-8008554.js b/test/nashorn/script/basic/JDK-8008554.js similarity index 100% rename from nashorn/test/script/basic/JDK-8008554.js rename to test/nashorn/script/basic/JDK-8008554.js diff --git a/nashorn/test/script/basic/JDK-8008814-3.js b/test/nashorn/script/basic/JDK-8008814-3.js similarity index 100% rename from nashorn/test/script/basic/JDK-8008814-3.js rename to test/nashorn/script/basic/JDK-8008814-3.js diff --git a/nashorn/test/script/basic/JDK-8008814-3.js.EXPECTED b/test/nashorn/script/basic/JDK-8008814-3.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8008814-3.js.EXPECTED rename to test/nashorn/script/basic/JDK-8008814-3.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8008814-4.js b/test/nashorn/script/basic/JDK-8008814-4.js similarity index 100% rename from nashorn/test/script/basic/JDK-8008814-4.js rename to test/nashorn/script/basic/JDK-8008814-4.js diff --git a/nashorn/test/script/basic/JDK-8008814-4.js.EXPECTED b/test/nashorn/script/basic/JDK-8008814-4.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8008814-4.js.EXPECTED rename to test/nashorn/script/basic/JDK-8008814-4.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8009230.js b/test/nashorn/script/basic/JDK-8009230.js similarity index 100% rename from nashorn/test/script/basic/JDK-8009230.js rename to test/nashorn/script/basic/JDK-8009230.js diff --git a/nashorn/test/script/basic/JDK-8009230.js.EXPECTED b/test/nashorn/script/basic/JDK-8009230.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8009230.js.EXPECTED rename to test/nashorn/script/basic/JDK-8009230.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8009553.js b/test/nashorn/script/basic/JDK-8009553.js similarity index 100% rename from nashorn/test/script/basic/JDK-8009553.js rename to test/nashorn/script/basic/JDK-8009553.js diff --git a/nashorn/test/script/basic/JDK-8009868.js b/test/nashorn/script/basic/JDK-8009868.js similarity index 100% rename from nashorn/test/script/basic/JDK-8009868.js rename to test/nashorn/script/basic/JDK-8009868.js diff --git a/nashorn/test/script/basic/JDK-8010199.js b/test/nashorn/script/basic/JDK-8010199.js similarity index 100% rename from nashorn/test/script/basic/JDK-8010199.js rename to test/nashorn/script/basic/JDK-8010199.js diff --git a/nashorn/test/script/basic/JDK-8010709.js b/test/nashorn/script/basic/JDK-8010709.js similarity index 100% rename from nashorn/test/script/basic/JDK-8010709.js rename to test/nashorn/script/basic/JDK-8010709.js diff --git a/nashorn/test/script/basic/JDK-8010710.js b/test/nashorn/script/basic/JDK-8010710.js similarity index 100% rename from nashorn/test/script/basic/JDK-8010710.js rename to test/nashorn/script/basic/JDK-8010710.js diff --git a/nashorn/test/script/basic/JDK-8010710.js.EXPECTED b/test/nashorn/script/basic/JDK-8010710.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8010710.js.EXPECTED rename to test/nashorn/script/basic/JDK-8010710.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8010720.js b/test/nashorn/script/basic/JDK-8010720.js similarity index 100% rename from nashorn/test/script/basic/JDK-8010720.js rename to test/nashorn/script/basic/JDK-8010720.js diff --git a/nashorn/test/script/basic/JDK-8010731.js b/test/nashorn/script/basic/JDK-8010731.js similarity index 100% rename from nashorn/test/script/basic/JDK-8010731.js rename to test/nashorn/script/basic/JDK-8010731.js diff --git a/nashorn/test/script/basic/JDK-8010732.js b/test/nashorn/script/basic/JDK-8010732.js similarity index 100% rename from nashorn/test/script/basic/JDK-8010732.js rename to test/nashorn/script/basic/JDK-8010732.js diff --git a/nashorn/test/script/basic/JDK-8010732.js.EXPECTED b/test/nashorn/script/basic/JDK-8010732.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8010732.js.EXPECTED rename to test/nashorn/script/basic/JDK-8010732.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8010804.js b/test/nashorn/script/basic/JDK-8010804.js similarity index 100% rename from nashorn/test/script/basic/JDK-8010804.js rename to test/nashorn/script/basic/JDK-8010804.js diff --git a/nashorn/test/script/basic/JDK-8010804.js.EXPECTED b/test/nashorn/script/basic/JDK-8010804.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8010804.js.EXPECTED rename to test/nashorn/script/basic/JDK-8010804.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8010924.js b/test/nashorn/script/basic/JDK-8010924.js similarity index 100% rename from nashorn/test/script/basic/JDK-8010924.js rename to test/nashorn/script/basic/JDK-8010924.js diff --git a/nashorn/test/script/basic/JDK-8010946-2.js b/test/nashorn/script/basic/JDK-8010946-2.js similarity index 100% rename from nashorn/test/script/basic/JDK-8010946-2.js rename to test/nashorn/script/basic/JDK-8010946-2.js diff --git a/nashorn/test/script/basic/JDK-8010946-2.js.EXPECTED b/test/nashorn/script/basic/JDK-8010946-2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8010946-2.js.EXPECTED rename to test/nashorn/script/basic/JDK-8010946-2.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8010946-privileged.js b/test/nashorn/script/basic/JDK-8010946-privileged.js similarity index 100% rename from nashorn/test/script/basic/JDK-8010946-privileged.js rename to test/nashorn/script/basic/JDK-8010946-privileged.js diff --git a/nashorn/test/script/basic/JDK-8010946.js b/test/nashorn/script/basic/JDK-8010946.js similarity index 100% rename from nashorn/test/script/basic/JDK-8010946.js rename to test/nashorn/script/basic/JDK-8010946.js diff --git a/nashorn/test/script/basic/JDK-8010946.js.EXPECTED b/test/nashorn/script/basic/JDK-8010946.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8010946.js.EXPECTED rename to test/nashorn/script/basic/JDK-8010946.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8011023.js b/test/nashorn/script/basic/JDK-8011023.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011023.js rename to test/nashorn/script/basic/JDK-8011023.js diff --git a/nashorn/test/script/basic/JDK-8011023.js.EXPECTED b/test/nashorn/script/basic/JDK-8011023.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8011023.js.EXPECTED rename to test/nashorn/script/basic/JDK-8011023.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8011209.js b/test/nashorn/script/basic/JDK-8011209.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011209.js rename to test/nashorn/script/basic/JDK-8011209.js diff --git a/nashorn/test/script/basic/JDK-8011237.js b/test/nashorn/script/basic/JDK-8011237.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011237.js rename to test/nashorn/script/basic/JDK-8011237.js diff --git a/nashorn/test/script/basic/JDK-8011274.js b/test/nashorn/script/basic/JDK-8011274.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011274.js rename to test/nashorn/script/basic/JDK-8011274.js diff --git a/nashorn/test/script/basic/JDK-8011357.js b/test/nashorn/script/basic/JDK-8011357.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011357.js rename to test/nashorn/script/basic/JDK-8011357.js diff --git a/nashorn/test/script/basic/JDK-8011362.js b/test/nashorn/script/basic/JDK-8011362.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011362.js rename to test/nashorn/script/basic/JDK-8011362.js diff --git a/nashorn/test/script/basic/JDK-8011362.js.EXPECTED b/test/nashorn/script/basic/JDK-8011362.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8011362.js.EXPECTED rename to test/nashorn/script/basic/JDK-8011362.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8011365.js b/test/nashorn/script/basic/JDK-8011365.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011365.js rename to test/nashorn/script/basic/JDK-8011365.js diff --git a/nashorn/test/script/basic/JDK-8011382.js b/test/nashorn/script/basic/JDK-8011382.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011382.js rename to test/nashorn/script/basic/JDK-8011382.js diff --git a/nashorn/test/script/basic/JDK-8011394.js b/test/nashorn/script/basic/JDK-8011394.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011394.js rename to test/nashorn/script/basic/JDK-8011394.js diff --git a/nashorn/test/script/basic/JDK-8011421.js b/test/nashorn/script/basic/JDK-8011421.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011421.js rename to test/nashorn/script/basic/JDK-8011421.js diff --git a/nashorn/test/script/basic/JDK-8011543.js b/test/nashorn/script/basic/JDK-8011543.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011543.js rename to test/nashorn/script/basic/JDK-8011543.js diff --git a/nashorn/test/script/basic/JDK-8011552.js b/test/nashorn/script/basic/JDK-8011552.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011552.js rename to test/nashorn/script/basic/JDK-8011552.js diff --git a/nashorn/test/script/basic/JDK-8011555.js b/test/nashorn/script/basic/JDK-8011555.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011555.js rename to test/nashorn/script/basic/JDK-8011555.js diff --git a/nashorn/test/script/basic/JDK-8011555.js.EXPECTED b/test/nashorn/script/basic/JDK-8011555.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8011555.js.EXPECTED rename to test/nashorn/script/basic/JDK-8011555.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8011578.js b/test/nashorn/script/basic/JDK-8011578.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011578.js rename to test/nashorn/script/basic/JDK-8011578.js diff --git a/nashorn/test/script/basic/JDK-8011578.js.EXPECTED b/test/nashorn/script/basic/JDK-8011578.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8011578.js.EXPECTED rename to test/nashorn/script/basic/JDK-8011578.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8011714.js b/test/nashorn/script/basic/JDK-8011714.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011714.js rename to test/nashorn/script/basic/JDK-8011714.js diff --git a/nashorn/test/script/basic/JDK-8011714.js.EXPECTED b/test/nashorn/script/basic/JDK-8011714.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8011714.js.EXPECTED rename to test/nashorn/script/basic/JDK-8011714.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8011718.js b/test/nashorn/script/basic/JDK-8011718.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011718.js rename to test/nashorn/script/basic/JDK-8011718.js diff --git a/nashorn/test/script/basic/JDK-8011718.js.EXPECTED b/test/nashorn/script/basic/JDK-8011718.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8011718.js.EXPECTED rename to test/nashorn/script/basic/JDK-8011718.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8011749.js b/test/nashorn/script/basic/JDK-8011749.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011749.js rename to test/nashorn/script/basic/JDK-8011749.js diff --git a/nashorn/test/script/basic/JDK-8011749.js.EXPECTED b/test/nashorn/script/basic/JDK-8011749.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8011749.js.EXPECTED rename to test/nashorn/script/basic/JDK-8011749.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8011756.js b/test/nashorn/script/basic/JDK-8011756.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011756.js rename to test/nashorn/script/basic/JDK-8011756.js diff --git a/nashorn/test/script/basic/JDK-8011756.js.EXPECTED b/test/nashorn/script/basic/JDK-8011756.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8011756.js.EXPECTED rename to test/nashorn/script/basic/JDK-8011756.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8011893.js b/test/nashorn/script/basic/JDK-8011893.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011893.js rename to test/nashorn/script/basic/JDK-8011893.js diff --git a/nashorn/test/script/basic/JDK-8011893.js.EXPECTED b/test/nashorn/script/basic/JDK-8011893.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8011893.js.EXPECTED rename to test/nashorn/script/basic/JDK-8011893.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8011960.js b/test/nashorn/script/basic/JDK-8011960.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011960.js rename to test/nashorn/script/basic/JDK-8011960.js diff --git a/nashorn/test/script/basic/JDK-8011964.js b/test/nashorn/script/basic/JDK-8011964.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011964.js rename to test/nashorn/script/basic/JDK-8011964.js diff --git a/nashorn/test/script/basic/JDK-8011964.js.EXPECTED b/test/nashorn/script/basic/JDK-8011964.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8011964.js.EXPECTED rename to test/nashorn/script/basic/JDK-8011964.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8011974.js b/test/nashorn/script/basic/JDK-8011974.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011974.js rename to test/nashorn/script/basic/JDK-8011974.js diff --git a/nashorn/test/script/basic/JDK-8011980.js b/test/nashorn/script/basic/JDK-8011980.js similarity index 100% rename from nashorn/test/script/basic/JDK-8011980.js rename to test/nashorn/script/basic/JDK-8011980.js diff --git a/nashorn/test/script/basic/JDK-8011980.js.EXPECTED b/test/nashorn/script/basic/JDK-8011980.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8011980.js.EXPECTED rename to test/nashorn/script/basic/JDK-8011980.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8012083.js b/test/nashorn/script/basic/JDK-8012083.js similarity index 100% rename from nashorn/test/script/basic/JDK-8012083.js rename to test/nashorn/script/basic/JDK-8012083.js diff --git a/nashorn/test/script/basic/JDK-8012083.js.EXPECTED b/test/nashorn/script/basic/JDK-8012083.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8012083.js.EXPECTED rename to test/nashorn/script/basic/JDK-8012083.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8012164.js b/test/nashorn/script/basic/JDK-8012164.js similarity index 100% rename from nashorn/test/script/basic/JDK-8012164.js rename to test/nashorn/script/basic/JDK-8012164.js diff --git a/nashorn/test/script/basic/JDK-8012164.js.EXPECTED b/test/nashorn/script/basic/JDK-8012164.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8012164.js.EXPECTED rename to test/nashorn/script/basic/JDK-8012164.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8012191.js b/test/nashorn/script/basic/JDK-8012191.js similarity index 100% rename from nashorn/test/script/basic/JDK-8012191.js rename to test/nashorn/script/basic/JDK-8012191.js diff --git a/nashorn/test/script/basic/JDK-8012191.js.EXPECTED b/test/nashorn/script/basic/JDK-8012191.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8012191.js.EXPECTED rename to test/nashorn/script/basic/JDK-8012191.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8012240.js b/test/nashorn/script/basic/JDK-8012240.js similarity index 100% rename from nashorn/test/script/basic/JDK-8012240.js rename to test/nashorn/script/basic/JDK-8012240.js diff --git a/nashorn/test/script/basic/JDK-8012291.js b/test/nashorn/script/basic/JDK-8012291.js similarity index 100% rename from nashorn/test/script/basic/JDK-8012291.js rename to test/nashorn/script/basic/JDK-8012291.js diff --git a/nashorn/test/script/basic/JDK-8012291.js.EXPECTED b/test/nashorn/script/basic/JDK-8012291.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8012291.js.EXPECTED rename to test/nashorn/script/basic/JDK-8012291.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8012305.js b/test/nashorn/script/basic/JDK-8012305.js similarity index 100% rename from nashorn/test/script/basic/JDK-8012305.js rename to test/nashorn/script/basic/JDK-8012305.js diff --git a/nashorn/test/script/basic/JDK-8012305.js.EXPECTED b/test/nashorn/script/basic/JDK-8012305.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8012305.js.EXPECTED rename to test/nashorn/script/basic/JDK-8012305.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8012334.js b/test/nashorn/script/basic/JDK-8012334.js similarity index 100% rename from nashorn/test/script/basic/JDK-8012334.js rename to test/nashorn/script/basic/JDK-8012334.js diff --git a/nashorn/test/script/basic/JDK-8012334.js.EXPECTED b/test/nashorn/script/basic/JDK-8012334.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8012334.js.EXPECTED rename to test/nashorn/script/basic/JDK-8012334.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8012457.js b/test/nashorn/script/basic/JDK-8012457.js similarity index 100% rename from nashorn/test/script/basic/JDK-8012457.js rename to test/nashorn/script/basic/JDK-8012457.js diff --git a/nashorn/test/script/basic/JDK-8012460.js b/test/nashorn/script/basic/JDK-8012460.js similarity index 100% rename from nashorn/test/script/basic/JDK-8012460.js rename to test/nashorn/script/basic/JDK-8012460.js diff --git a/nashorn/test/script/basic/JDK-8012460.js.EXPECTED b/test/nashorn/script/basic/JDK-8012460.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8012460.js.EXPECTED rename to test/nashorn/script/basic/JDK-8012460.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8012462.js b/test/nashorn/script/basic/JDK-8012462.js similarity index 100% rename from nashorn/test/script/basic/JDK-8012462.js rename to test/nashorn/script/basic/JDK-8012462.js diff --git a/nashorn/test/script/basic/JDK-8012931.js b/test/nashorn/script/basic/JDK-8012931.js similarity index 100% rename from nashorn/test/script/basic/JDK-8012931.js rename to test/nashorn/script/basic/JDK-8012931.js diff --git a/nashorn/test/script/basic/JDK-8012931.js.EXPECTED b/test/nashorn/script/basic/JDK-8012931.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8012931.js.EXPECTED rename to test/nashorn/script/basic/JDK-8012931.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8013131.js b/test/nashorn/script/basic/JDK-8013131.js similarity index 100% rename from nashorn/test/script/basic/JDK-8013131.js rename to test/nashorn/script/basic/JDK-8013131.js diff --git a/nashorn/test/script/basic/JDK-8013131.js.EXPECTED b/test/nashorn/script/basic/JDK-8013131.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8013131.js.EXPECTED rename to test/nashorn/script/basic/JDK-8013131.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8013167.js b/test/nashorn/script/basic/JDK-8013167.js similarity index 100% rename from nashorn/test/script/basic/JDK-8013167.js rename to test/nashorn/script/basic/JDK-8013167.js diff --git a/nashorn/test/script/basic/JDK-8013167.js.EXPECTED b/test/nashorn/script/basic/JDK-8013167.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8013167.js.EXPECTED rename to test/nashorn/script/basic/JDK-8013167.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8013325.js b/test/nashorn/script/basic/JDK-8013325.js similarity index 100% rename from nashorn/test/script/basic/JDK-8013325.js rename to test/nashorn/script/basic/JDK-8013325.js diff --git a/nashorn/test/script/basic/JDK-8013325.js.EXPECTED b/test/nashorn/script/basic/JDK-8013325.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8013325.js.EXPECTED rename to test/nashorn/script/basic/JDK-8013325.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8013337.js b/test/nashorn/script/basic/JDK-8013337.js similarity index 100% rename from nashorn/test/script/basic/JDK-8013337.js rename to test/nashorn/script/basic/JDK-8013337.js diff --git a/nashorn/test/script/basic/JDK-8013337.js.EXPECTED b/test/nashorn/script/basic/JDK-8013337.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8013337.js.EXPECTED rename to test/nashorn/script/basic/JDK-8013337.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8013444.js b/test/nashorn/script/basic/JDK-8013444.js similarity index 100% rename from nashorn/test/script/basic/JDK-8013444.js rename to test/nashorn/script/basic/JDK-8013444.js diff --git a/nashorn/test/script/basic/JDK-8013444.js.EXPECTED b/test/nashorn/script/basic/JDK-8013444.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8013444.js.EXPECTED rename to test/nashorn/script/basic/JDK-8013444.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8013729.js b/test/nashorn/script/basic/JDK-8013729.js similarity index 100% rename from nashorn/test/script/basic/JDK-8013729.js rename to test/nashorn/script/basic/JDK-8013729.js diff --git a/nashorn/test/script/basic/JDK-8013729.js.EXPECTED b/test/nashorn/script/basic/JDK-8013729.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8013729.js.EXPECTED rename to test/nashorn/script/basic/JDK-8013729.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8013873.js b/test/nashorn/script/basic/JDK-8013873.js similarity index 100% rename from nashorn/test/script/basic/JDK-8013873.js rename to test/nashorn/script/basic/JDK-8013873.js diff --git a/nashorn/test/script/basic/JDK-8013873.js.EXPECTED b/test/nashorn/script/basic/JDK-8013873.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8013873.js.EXPECTED rename to test/nashorn/script/basic/JDK-8013873.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8013874.js b/test/nashorn/script/basic/JDK-8013874.js similarity index 100% rename from nashorn/test/script/basic/JDK-8013874.js rename to test/nashorn/script/basic/JDK-8013874.js diff --git a/nashorn/test/script/basic/JDK-8013874.js.EXPECTED b/test/nashorn/script/basic/JDK-8013874.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8013874.js.EXPECTED rename to test/nashorn/script/basic/JDK-8013874.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8013878.js b/test/nashorn/script/basic/JDK-8013878.js similarity index 100% rename from nashorn/test/script/basic/JDK-8013878.js rename to test/nashorn/script/basic/JDK-8013878.js diff --git a/nashorn/test/script/basic/JDK-8013878.js.EXPECTED b/test/nashorn/script/basic/JDK-8013878.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8013878.js.EXPECTED rename to test/nashorn/script/basic/JDK-8013878.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8013919.js b/test/nashorn/script/basic/JDK-8013919.js similarity index 100% rename from nashorn/test/script/basic/JDK-8013919.js rename to test/nashorn/script/basic/JDK-8013919.js diff --git a/nashorn/test/script/basic/JDK-8013919.js.EXPECTED b/test/nashorn/script/basic/JDK-8013919.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8013919.js.EXPECTED rename to test/nashorn/script/basic/JDK-8013919.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8014426.js b/test/nashorn/script/basic/JDK-8014426.js similarity index 100% rename from nashorn/test/script/basic/JDK-8014426.js rename to test/nashorn/script/basic/JDK-8014426.js diff --git a/nashorn/test/script/basic/JDK-8014426.js.EXPECTED b/test/nashorn/script/basic/JDK-8014426.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8014426.js.EXPECTED rename to test/nashorn/script/basic/JDK-8014426.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8014647.js b/test/nashorn/script/basic/JDK-8014647.js similarity index 100% rename from nashorn/test/script/basic/JDK-8014647.js rename to test/nashorn/script/basic/JDK-8014647.js diff --git a/nashorn/test/script/basic/JDK-8014647.js.EXPECTED b/test/nashorn/script/basic/JDK-8014647.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8014647.js.EXPECTED rename to test/nashorn/script/basic/JDK-8014647.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8014735.js b/test/nashorn/script/basic/JDK-8014735.js similarity index 100% rename from nashorn/test/script/basic/JDK-8014735.js rename to test/nashorn/script/basic/JDK-8014735.js diff --git a/nashorn/test/script/basic/JDK-8014735.js.EXPECTED b/test/nashorn/script/basic/JDK-8014735.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8014735.js.EXPECTED rename to test/nashorn/script/basic/JDK-8014735.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8014781.js b/test/nashorn/script/basic/JDK-8014781.js similarity index 100% rename from nashorn/test/script/basic/JDK-8014781.js rename to test/nashorn/script/basic/JDK-8014781.js diff --git a/nashorn/test/script/basic/JDK-8014781.js.EXPECTED b/test/nashorn/script/basic/JDK-8014781.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8014781.js.EXPECTED rename to test/nashorn/script/basic/JDK-8014781.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8014785.js b/test/nashorn/script/basic/JDK-8014785.js similarity index 100% rename from nashorn/test/script/basic/JDK-8014785.js rename to test/nashorn/script/basic/JDK-8014785.js diff --git a/nashorn/test/script/basic/JDK-8014785.js.EXPECTED b/test/nashorn/script/basic/JDK-8014785.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8014785.js.EXPECTED rename to test/nashorn/script/basic/JDK-8014785.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8014953.js b/test/nashorn/script/basic/JDK-8014953.js similarity index 100% rename from nashorn/test/script/basic/JDK-8014953.js rename to test/nashorn/script/basic/JDK-8014953.js diff --git a/nashorn/test/script/basic/JDK-8014953.js.EXPECTED b/test/nashorn/script/basic/JDK-8014953.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8014953.js.EXPECTED rename to test/nashorn/script/basic/JDK-8014953.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8015267.js b/test/nashorn/script/basic/JDK-8015267.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015267.js rename to test/nashorn/script/basic/JDK-8015267.js diff --git a/nashorn/test/script/basic/JDK-8015267.js.EXPECTED b/test/nashorn/script/basic/JDK-8015267.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8015267.js.EXPECTED rename to test/nashorn/script/basic/JDK-8015267.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8015345.js b/test/nashorn/script/basic/JDK-8015345.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015345.js rename to test/nashorn/script/basic/JDK-8015345.js diff --git a/nashorn/test/script/basic/JDK-8015345.js.EXPECTED b/test/nashorn/script/basic/JDK-8015345.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8015345.js.EXPECTED rename to test/nashorn/script/basic/JDK-8015345.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8015346.js b/test/nashorn/script/basic/JDK-8015346.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015346.js rename to test/nashorn/script/basic/JDK-8015346.js diff --git a/nashorn/test/script/basic/JDK-8015347.js b/test/nashorn/script/basic/JDK-8015347.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015347.js rename to test/nashorn/script/basic/JDK-8015347.js diff --git a/nashorn/test/script/basic/JDK-8015348.js b/test/nashorn/script/basic/JDK-8015348.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015348.js rename to test/nashorn/script/basic/JDK-8015348.js diff --git a/nashorn/test/script/basic/JDK-8015348.js.EXPECTED b/test/nashorn/script/basic/JDK-8015348.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8015348.js.EXPECTED rename to test/nashorn/script/basic/JDK-8015348.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8015349.js b/test/nashorn/script/basic/JDK-8015349.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015349.js rename to test/nashorn/script/basic/JDK-8015349.js diff --git a/nashorn/test/script/basic/JDK-8015349.js.EXPECTED b/test/nashorn/script/basic/JDK-8015349.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8015349.js.EXPECTED rename to test/nashorn/script/basic/JDK-8015349.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8015350.js b/test/nashorn/script/basic/JDK-8015350.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015350.js rename to test/nashorn/script/basic/JDK-8015350.js diff --git a/nashorn/test/script/basic/JDK-8015350.js.EXPECTED b/test/nashorn/script/basic/JDK-8015350.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8015350.js.EXPECTED rename to test/nashorn/script/basic/JDK-8015350.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8015352.js b/test/nashorn/script/basic/JDK-8015352.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015352.js rename to test/nashorn/script/basic/JDK-8015352.js diff --git a/nashorn/test/script/basic/JDK-8015353.js b/test/nashorn/script/basic/JDK-8015353.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015353.js rename to test/nashorn/script/basic/JDK-8015353.js diff --git a/nashorn/test/script/basic/JDK-8015354.js b/test/nashorn/script/basic/JDK-8015354.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015354.js rename to test/nashorn/script/basic/JDK-8015354.js diff --git a/nashorn/test/script/basic/JDK-8015355.js b/test/nashorn/script/basic/JDK-8015355.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015355.js rename to test/nashorn/script/basic/JDK-8015355.js diff --git a/nashorn/test/script/basic/JDK-8015356.js b/test/nashorn/script/basic/JDK-8015356.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015356.js rename to test/nashorn/script/basic/JDK-8015356.js diff --git a/nashorn/test/script/basic/JDK-8015356.js.EXPECTED b/test/nashorn/script/basic/JDK-8015356.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8015356.js.EXPECTED rename to test/nashorn/script/basic/JDK-8015356.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8015357.js b/test/nashorn/script/basic/JDK-8015357.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015357.js rename to test/nashorn/script/basic/JDK-8015357.js diff --git a/nashorn/test/script/basic/JDK-8015741.js b/test/nashorn/script/basic/JDK-8015741.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015741.js rename to test/nashorn/script/basic/JDK-8015741.js diff --git a/nashorn/test/script/basic/JDK-8015741.js.EXPECTED b/test/nashorn/script/basic/JDK-8015741.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8015741.js.EXPECTED rename to test/nashorn/script/basic/JDK-8015741.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8015830.js b/test/nashorn/script/basic/JDK-8015830.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015830.js rename to test/nashorn/script/basic/JDK-8015830.js diff --git a/nashorn/test/script/basic/JDK-8015830.js.EXPECTED b/test/nashorn/script/basic/JDK-8015830.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8015830.js.EXPECTED rename to test/nashorn/script/basic/JDK-8015830.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8015892.js b/test/nashorn/script/basic/JDK-8015892.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015892.js rename to test/nashorn/script/basic/JDK-8015892.js diff --git a/nashorn/test/script/basic/JDK-8015945.js b/test/nashorn/script/basic/JDK-8015945.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015945.js rename to test/nashorn/script/basic/JDK-8015945.js diff --git a/nashorn/test/script/basic/JDK-8015945.js.EXPECTED b/test/nashorn/script/basic/JDK-8015945.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8015945.js.EXPECTED rename to test/nashorn/script/basic/JDK-8015945.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8015959.js b/test/nashorn/script/basic/JDK-8015959.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015959.js rename to test/nashorn/script/basic/JDK-8015959.js diff --git a/nashorn/test/script/basic/JDK-8015959.js.EXPECTED b/test/nashorn/script/basic/JDK-8015959.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8015959.js.EXPECTED rename to test/nashorn/script/basic/JDK-8015959.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8015969.js b/test/nashorn/script/basic/JDK-8015969.js similarity index 100% rename from nashorn/test/script/basic/JDK-8015969.js rename to test/nashorn/script/basic/JDK-8015969.js diff --git a/nashorn/test/script/basic/JDK-8016235.js b/test/nashorn/script/basic/JDK-8016235.js similarity index 100% rename from nashorn/test/script/basic/JDK-8016235.js rename to test/nashorn/script/basic/JDK-8016235.js diff --git a/nashorn/test/script/basic/JDK-8016239.js b/test/nashorn/script/basic/JDK-8016239.js similarity index 100% rename from nashorn/test/script/basic/JDK-8016239.js rename to test/nashorn/script/basic/JDK-8016239.js diff --git a/nashorn/test/script/basic/JDK-8016239.js.EXPECTED b/test/nashorn/script/basic/JDK-8016239.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8016239.js.EXPECTED rename to test/nashorn/script/basic/JDK-8016239.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8016518.js b/test/nashorn/script/basic/JDK-8016518.js similarity index 100% rename from nashorn/test/script/basic/JDK-8016518.js rename to test/nashorn/script/basic/JDK-8016518.js diff --git a/nashorn/test/script/basic/JDK-8016518.js.EXPECTED b/test/nashorn/script/basic/JDK-8016518.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8016518.js.EXPECTED rename to test/nashorn/script/basic/JDK-8016518.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8016528.js b/test/nashorn/script/basic/JDK-8016528.js similarity index 100% rename from nashorn/test/script/basic/JDK-8016528.js rename to test/nashorn/script/basic/JDK-8016528.js diff --git a/nashorn/test/script/basic/JDK-8016528.js.EXPECTED b/test/nashorn/script/basic/JDK-8016528.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8016528.js.EXPECTED rename to test/nashorn/script/basic/JDK-8016528.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8016542.js b/test/nashorn/script/basic/JDK-8016542.js similarity index 100% rename from nashorn/test/script/basic/JDK-8016542.js rename to test/nashorn/script/basic/JDK-8016542.js diff --git a/nashorn/test/script/basic/JDK-8016542.js.EXPECTED b/test/nashorn/script/basic/JDK-8016542.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8016542.js.EXPECTED rename to test/nashorn/script/basic/JDK-8016542.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8016618.js b/test/nashorn/script/basic/JDK-8016618.js similarity index 100% rename from nashorn/test/script/basic/JDK-8016618.js rename to test/nashorn/script/basic/JDK-8016618.js diff --git a/nashorn/test/script/basic/JDK-8016618.js.EXPECTED b/test/nashorn/script/basic/JDK-8016618.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8016618.js.EXPECTED rename to test/nashorn/script/basic/JDK-8016618.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8016667.js b/test/nashorn/script/basic/JDK-8016667.js similarity index 100% rename from nashorn/test/script/basic/JDK-8016667.js rename to test/nashorn/script/basic/JDK-8016667.js diff --git a/nashorn/test/script/basic/JDK-8016681.js b/test/nashorn/script/basic/JDK-8016681.js similarity index 100% rename from nashorn/test/script/basic/JDK-8016681.js rename to test/nashorn/script/basic/JDK-8016681.js diff --git a/nashorn/test/script/basic/JDK-8016681.js.EXPECTED b/test/nashorn/script/basic/JDK-8016681.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8016681.js.EXPECTED rename to test/nashorn/script/basic/JDK-8016681.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8017046.js b/test/nashorn/script/basic/JDK-8017046.js similarity index 100% rename from nashorn/test/script/basic/JDK-8017046.js rename to test/nashorn/script/basic/JDK-8017046.js diff --git a/nashorn/test/script/basic/JDK-8017082.js b/test/nashorn/script/basic/JDK-8017082.js similarity index 100% rename from nashorn/test/script/basic/JDK-8017082.js rename to test/nashorn/script/basic/JDK-8017082.js diff --git a/nashorn/test/script/basic/JDK-8017084.js b/test/nashorn/script/basic/JDK-8017084.js similarity index 100% rename from nashorn/test/script/basic/JDK-8017084.js rename to test/nashorn/script/basic/JDK-8017084.js diff --git a/nashorn/test/script/basic/JDK-8017084.js.EXPECTED b/test/nashorn/script/basic/JDK-8017084.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8017084.js.EXPECTED rename to test/nashorn/script/basic/JDK-8017084.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8017768.js b/test/nashorn/script/basic/JDK-8017768.js similarity index 100% rename from nashorn/test/script/basic/JDK-8017768.js rename to test/nashorn/script/basic/JDK-8017768.js diff --git a/nashorn/test/script/basic/JDK-8017768.js.EXPECTED b/test/nashorn/script/basic/JDK-8017768.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8017768.js.EXPECTED rename to test/nashorn/script/basic/JDK-8017768.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8017950.js b/test/nashorn/script/basic/JDK-8017950.js similarity index 100% rename from nashorn/test/script/basic/JDK-8017950.js rename to test/nashorn/script/basic/JDK-8017950.js diff --git a/nashorn/test/script/basic/JDK-8017950.js.EXPECTED b/test/nashorn/script/basic/JDK-8017950.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8017950.js.EXPECTED rename to test/nashorn/script/basic/JDK-8017950.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8019226.js b/test/nashorn/script/basic/JDK-8019226.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019226.js rename to test/nashorn/script/basic/JDK-8019226.js diff --git a/nashorn/test/script/basic/JDK-8019226.js.EXPECTED b/test/nashorn/script/basic/JDK-8019226.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8019226.js.EXPECTED rename to test/nashorn/script/basic/JDK-8019226.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8019473.js b/test/nashorn/script/basic/JDK-8019473.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019473.js rename to test/nashorn/script/basic/JDK-8019473.js diff --git a/nashorn/test/script/basic/JDK-8019478.js b/test/nashorn/script/basic/JDK-8019478.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019478.js rename to test/nashorn/script/basic/JDK-8019478.js diff --git a/nashorn/test/script/basic/JDK-8019482.js b/test/nashorn/script/basic/JDK-8019482.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019482.js rename to test/nashorn/script/basic/JDK-8019482.js diff --git a/nashorn/test/script/basic/JDK-8019488.js b/test/nashorn/script/basic/JDK-8019488.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019488.js rename to test/nashorn/script/basic/JDK-8019488.js diff --git a/nashorn/test/script/basic/JDK-8019508.js b/test/nashorn/script/basic/JDK-8019508.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019508.js rename to test/nashorn/script/basic/JDK-8019508.js diff --git a/nashorn/test/script/basic/JDK-8019508.js.EXPECTED b/test/nashorn/script/basic/JDK-8019508.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8019508.js.EXPECTED rename to test/nashorn/script/basic/JDK-8019508.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8019553.js b/test/nashorn/script/basic/JDK-8019553.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019553.js rename to test/nashorn/script/basic/JDK-8019553.js diff --git a/nashorn/test/script/basic/JDK-8019553.js.EXPECTED b/test/nashorn/script/basic/JDK-8019553.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8019553.js.EXPECTED rename to test/nashorn/script/basic/JDK-8019553.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8019585.js b/test/nashorn/script/basic/JDK-8019585.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019585.js rename to test/nashorn/script/basic/JDK-8019585.js diff --git a/nashorn/test/script/basic/JDK-8019629.js b/test/nashorn/script/basic/JDK-8019629.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019629.js rename to test/nashorn/script/basic/JDK-8019629.js diff --git a/nashorn/test/script/basic/JDK-8019783.js b/test/nashorn/script/basic/JDK-8019783.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019783.js rename to test/nashorn/script/basic/JDK-8019783.js diff --git a/nashorn/test/script/basic/JDK-8019783.js.EXPECTED b/test/nashorn/script/basic/JDK-8019783.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8019783.js.EXPECTED rename to test/nashorn/script/basic/JDK-8019783.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8019791.js b/test/nashorn/script/basic/JDK-8019791.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019791.js rename to test/nashorn/script/basic/JDK-8019791.js diff --git a/nashorn/test/script/basic/JDK-8019791.js.EXPECTED b/test/nashorn/script/basic/JDK-8019791.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8019791.js.EXPECTED rename to test/nashorn/script/basic/JDK-8019791.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8019805.js b/test/nashorn/script/basic/JDK-8019805.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019805.js rename to test/nashorn/script/basic/JDK-8019805.js diff --git a/nashorn/test/script/basic/JDK-8019805.js.EXPECTED b/test/nashorn/script/basic/JDK-8019805.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8019805.js.EXPECTED rename to test/nashorn/script/basic/JDK-8019805.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8019808.js b/test/nashorn/script/basic/JDK-8019808.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019808.js rename to test/nashorn/script/basic/JDK-8019808.js diff --git a/nashorn/test/script/basic/JDK-8019809.js b/test/nashorn/script/basic/JDK-8019809.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019809.js rename to test/nashorn/script/basic/JDK-8019809.js diff --git a/nashorn/test/script/basic/JDK-8019810.js b/test/nashorn/script/basic/JDK-8019810.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019810.js rename to test/nashorn/script/basic/JDK-8019810.js diff --git a/nashorn/test/script/basic/JDK-8019810.js.EXPECTED b/test/nashorn/script/basic/JDK-8019810.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8019810.js.EXPECTED rename to test/nashorn/script/basic/JDK-8019810.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8019811.js b/test/nashorn/script/basic/JDK-8019811.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019811.js rename to test/nashorn/script/basic/JDK-8019811.js diff --git a/nashorn/test/script/basic/JDK-8019814.js b/test/nashorn/script/basic/JDK-8019814.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019814.js rename to test/nashorn/script/basic/JDK-8019814.js diff --git a/nashorn/test/script/basic/JDK-8019814.js.EXPECTED b/test/nashorn/script/basic/JDK-8019814.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8019814.js.EXPECTED rename to test/nashorn/script/basic/JDK-8019814.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8019817.js b/test/nashorn/script/basic/JDK-8019817.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019817.js rename to test/nashorn/script/basic/JDK-8019817.js diff --git a/nashorn/test/script/basic/JDK-8019819.js b/test/nashorn/script/basic/JDK-8019819.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019819.js rename to test/nashorn/script/basic/JDK-8019819.js diff --git a/nashorn/test/script/basic/JDK-8019821.js b/test/nashorn/script/basic/JDK-8019821.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019821.js rename to test/nashorn/script/basic/JDK-8019821.js diff --git a/nashorn/test/script/basic/JDK-8019822.js b/test/nashorn/script/basic/JDK-8019822.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019822.js rename to test/nashorn/script/basic/JDK-8019822.js diff --git a/nashorn/test/script/basic/JDK-8019947.js b/test/nashorn/script/basic/JDK-8019947.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019947.js rename to test/nashorn/script/basic/JDK-8019947.js diff --git a/nashorn/test/script/basic/JDK-8019947.js.EXPECTED b/test/nashorn/script/basic/JDK-8019947.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8019947.js.EXPECTED rename to test/nashorn/script/basic/JDK-8019947.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8019963.js b/test/nashorn/script/basic/JDK-8019963.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019963.js rename to test/nashorn/script/basic/JDK-8019963.js diff --git a/nashorn/test/script/basic/JDK-8019963.js.EXPECTED b/test/nashorn/script/basic/JDK-8019963.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8019963.js.EXPECTED rename to test/nashorn/script/basic/JDK-8019963.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8019983.js b/test/nashorn/script/basic/JDK-8019983.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019983.js rename to test/nashorn/script/basic/JDK-8019983.js diff --git a/nashorn/test/script/basic/JDK-8019983.js.EXPECTED b/test/nashorn/script/basic/JDK-8019983.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8019983.js.EXPECTED rename to test/nashorn/script/basic/JDK-8019983.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8019985.js b/test/nashorn/script/basic/JDK-8019985.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019985.js rename to test/nashorn/script/basic/JDK-8019985.js diff --git a/nashorn/test/script/basic/JDK-8019987.js b/test/nashorn/script/basic/JDK-8019987.js similarity index 100% rename from nashorn/test/script/basic/JDK-8019987.js rename to test/nashorn/script/basic/JDK-8019987.js diff --git a/nashorn/test/script/basic/JDK-8020124.js b/test/nashorn/script/basic/JDK-8020124.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020124.js rename to test/nashorn/script/basic/JDK-8020124.js diff --git a/nashorn/test/script/basic/JDK-8020132.js b/test/nashorn/script/basic/JDK-8020132.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020132.js rename to test/nashorn/script/basic/JDK-8020132.js diff --git a/nashorn/test/script/basic/JDK-8020132.js.EXPECTED b/test/nashorn/script/basic/JDK-8020132.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8020132.js.EXPECTED rename to test/nashorn/script/basic/JDK-8020132.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8020223.js b/test/nashorn/script/basic/JDK-8020223.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020223.js rename to test/nashorn/script/basic/JDK-8020223.js diff --git a/nashorn/test/script/basic/JDK-8020324.js b/test/nashorn/script/basic/JDK-8020324.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020324.js rename to test/nashorn/script/basic/JDK-8020324.js diff --git a/nashorn/test/script/basic/JDK-8020324.js.EXPECTED b/test/nashorn/script/basic/JDK-8020324.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8020324.js.EXPECTED rename to test/nashorn/script/basic/JDK-8020324.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8020325.js b/test/nashorn/script/basic/JDK-8020325.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020325.js rename to test/nashorn/script/basic/JDK-8020325.js diff --git a/nashorn/test/script/basic/JDK-8020325.js.EXPECTED b/test/nashorn/script/basic/JDK-8020325.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8020325.js.EXPECTED rename to test/nashorn/script/basic/JDK-8020325.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8020354.js b/test/nashorn/script/basic/JDK-8020354.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020354.js rename to test/nashorn/script/basic/JDK-8020354.js diff --git a/nashorn/test/script/basic/JDK-8020354.js.EXPECTED b/test/nashorn/script/basic/JDK-8020354.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8020354.js.EXPECTED rename to test/nashorn/script/basic/JDK-8020354.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8020355.js b/test/nashorn/script/basic/JDK-8020355.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020355.js rename to test/nashorn/script/basic/JDK-8020355.js diff --git a/nashorn/test/script/basic/JDK-8020356.js b/test/nashorn/script/basic/JDK-8020356.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020356.js rename to test/nashorn/script/basic/JDK-8020356.js diff --git a/nashorn/test/script/basic/JDK-8020356.js.EXPECTED b/test/nashorn/script/basic/JDK-8020356.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8020356.js.EXPECTED rename to test/nashorn/script/basic/JDK-8020356.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8020357.js b/test/nashorn/script/basic/JDK-8020357.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020357.js rename to test/nashorn/script/basic/JDK-8020357.js diff --git a/nashorn/test/script/basic/JDK-8020357.js.EXPECTED b/test/nashorn/script/basic/JDK-8020357.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8020357.js.EXPECTED rename to test/nashorn/script/basic/JDK-8020357.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8020358.js b/test/nashorn/script/basic/JDK-8020358.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020358.js rename to test/nashorn/script/basic/JDK-8020358.js diff --git a/nashorn/test/script/basic/JDK-8020358.js.EXPECTED b/test/nashorn/script/basic/JDK-8020358.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8020358.js.EXPECTED rename to test/nashorn/script/basic/JDK-8020358.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8020380.js b/test/nashorn/script/basic/JDK-8020380.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020380.js rename to test/nashorn/script/basic/JDK-8020380.js diff --git a/nashorn/test/script/basic/JDK-8020437.js b/test/nashorn/script/basic/JDK-8020437.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020437.js rename to test/nashorn/script/basic/JDK-8020437.js diff --git a/nashorn/test/script/basic/JDK-8020437.js.EXPECTED b/test/nashorn/script/basic/JDK-8020437.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8020437.js.EXPECTED rename to test/nashorn/script/basic/JDK-8020437.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8020463.js b/test/nashorn/script/basic/JDK-8020463.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020463.js rename to test/nashorn/script/basic/JDK-8020463.js diff --git a/nashorn/test/script/basic/JDK-8020508.js b/test/nashorn/script/basic/JDK-8020508.js similarity index 100% rename from nashorn/test/script/basic/JDK-8020508.js rename to test/nashorn/script/basic/JDK-8020508.js diff --git a/nashorn/test/script/basic/JDK-8020508.js.EXPECTED b/test/nashorn/script/basic/JDK-8020508.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8020508.js.EXPECTED rename to test/nashorn/script/basic/JDK-8020508.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8021122.js b/test/nashorn/script/basic/JDK-8021122.js similarity index 100% rename from nashorn/test/script/basic/JDK-8021122.js rename to test/nashorn/script/basic/JDK-8021122.js diff --git a/nashorn/test/script/basic/JDK-8021122.js.EXPECTED b/test/nashorn/script/basic/JDK-8021122.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8021122.js.EXPECTED rename to test/nashorn/script/basic/JDK-8021122.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8022598.js b/test/nashorn/script/basic/JDK-8022598.js similarity index 100% rename from nashorn/test/script/basic/JDK-8022598.js rename to test/nashorn/script/basic/JDK-8022598.js diff --git a/nashorn/test/script/basic/JDK-8022731.js b/test/nashorn/script/basic/JDK-8022731.js similarity index 100% rename from nashorn/test/script/basic/JDK-8022731.js rename to test/nashorn/script/basic/JDK-8022731.js diff --git a/nashorn/test/script/basic/JDK-8022731.js.EXPECTED b/test/nashorn/script/basic/JDK-8022731.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8022731.js.EXPECTED rename to test/nashorn/script/basic/JDK-8022731.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8022903.js b/test/nashorn/script/basic/JDK-8022903.js similarity index 100% rename from nashorn/test/script/basic/JDK-8022903.js rename to test/nashorn/script/basic/JDK-8022903.js diff --git a/nashorn/test/script/basic/JDK-8022903.js.EXPECTED b/test/nashorn/script/basic/JDK-8022903.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8022903.js.EXPECTED rename to test/nashorn/script/basic/JDK-8022903.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8023026.js b/test/nashorn/script/basic/JDK-8023026.js similarity index 100% rename from nashorn/test/script/basic/JDK-8023026.js rename to test/nashorn/script/basic/JDK-8023026.js diff --git a/nashorn/test/script/basic/JDK-8023026.js.EXPECTED b/test/nashorn/script/basic/JDK-8023026.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8023026.js.EXPECTED rename to test/nashorn/script/basic/JDK-8023026.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8023368.js b/test/nashorn/script/basic/JDK-8023368.js similarity index 100% rename from nashorn/test/script/basic/JDK-8023368.js rename to test/nashorn/script/basic/JDK-8023368.js diff --git a/nashorn/test/script/basic/JDK-8023368.js.EXPECTED b/test/nashorn/script/basic/JDK-8023368.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8023368.js.EXPECTED rename to test/nashorn/script/basic/JDK-8023368.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8023368_2.js b/test/nashorn/script/basic/JDK-8023368_2.js similarity index 100% rename from nashorn/test/script/basic/JDK-8023368_2.js rename to test/nashorn/script/basic/JDK-8023368_2.js diff --git a/nashorn/test/script/basic/JDK-8023368_2.js.EXPECTED b/test/nashorn/script/basic/JDK-8023368_2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8023368_2.js.EXPECTED rename to test/nashorn/script/basic/JDK-8023368_2.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8023373.js b/test/nashorn/script/basic/JDK-8023373.js similarity index 100% rename from nashorn/test/script/basic/JDK-8023373.js rename to test/nashorn/script/basic/JDK-8023373.js diff --git a/nashorn/test/script/basic/JDK-8023373.js.EXPECTED b/test/nashorn/script/basic/JDK-8023373.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8023373.js.EXPECTED rename to test/nashorn/script/basic/JDK-8023373.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8023531.js b/test/nashorn/script/basic/JDK-8023531.js similarity index 100% rename from nashorn/test/script/basic/JDK-8023531.js rename to test/nashorn/script/basic/JDK-8023531.js diff --git a/nashorn/test/script/basic/JDK-8023551.js b/test/nashorn/script/basic/JDK-8023551.js similarity index 100% rename from nashorn/test/script/basic/JDK-8023551.js rename to test/nashorn/script/basic/JDK-8023551.js diff --git a/nashorn/test/script/basic/JDK-8023551.js.EXPECTED b/test/nashorn/script/basic/JDK-8023551.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8023551.js.EXPECTED rename to test/nashorn/script/basic/JDK-8023551.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8023630.js b/test/nashorn/script/basic/JDK-8023630.js similarity index 100% rename from nashorn/test/script/basic/JDK-8023630.js rename to test/nashorn/script/basic/JDK-8023630.js diff --git a/nashorn/test/script/basic/JDK-8023630.js.EXPECTED b/test/nashorn/script/basic/JDK-8023630.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8023630.js.EXPECTED rename to test/nashorn/script/basic/JDK-8023630.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8023650.js b/test/nashorn/script/basic/JDK-8023650.js similarity index 100% rename from nashorn/test/script/basic/JDK-8023650.js rename to test/nashorn/script/basic/JDK-8023650.js diff --git a/nashorn/test/script/basic/JDK-8023780.js b/test/nashorn/script/basic/JDK-8023780.js similarity index 100% rename from nashorn/test/script/basic/JDK-8023780.js rename to test/nashorn/script/basic/JDK-8023780.js diff --git a/nashorn/test/script/basic/JDK-8023780.js.EXPECTED b/test/nashorn/script/basic/JDK-8023780.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8023780.js.EXPECTED rename to test/nashorn/script/basic/JDK-8023780.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8023784.js b/test/nashorn/script/basic/JDK-8023784.js similarity index 100% rename from nashorn/test/script/basic/JDK-8023784.js rename to test/nashorn/script/basic/JDK-8023784.js diff --git a/nashorn/test/script/basic/JDK-8023784.js.EXPECTED b/test/nashorn/script/basic/JDK-8023784.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8023784.js.EXPECTED rename to test/nashorn/script/basic/JDK-8023784.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8024120.js b/test/nashorn/script/basic/JDK-8024120.js similarity index 100% rename from nashorn/test/script/basic/JDK-8024120.js rename to test/nashorn/script/basic/JDK-8024120.js diff --git a/nashorn/test/script/basic/JDK-8024174.js b/test/nashorn/script/basic/JDK-8024174.js similarity index 100% rename from nashorn/test/script/basic/JDK-8024174.js rename to test/nashorn/script/basic/JDK-8024174.js diff --git a/nashorn/test/script/basic/JDK-8024255.js b/test/nashorn/script/basic/JDK-8024255.js similarity index 100% rename from nashorn/test/script/basic/JDK-8024255.js rename to test/nashorn/script/basic/JDK-8024255.js diff --git a/nashorn/test/script/basic/JDK-8024512.js b/test/nashorn/script/basic/JDK-8024512.js similarity index 100% rename from nashorn/test/script/basic/JDK-8024512.js rename to test/nashorn/script/basic/JDK-8024512.js diff --git a/nashorn/test/script/basic/JDK-8024512.js.EXPECTED b/test/nashorn/script/basic/JDK-8024512.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8024512.js.EXPECTED rename to test/nashorn/script/basic/JDK-8024512.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8024619.js b/test/nashorn/script/basic/JDK-8024619.js similarity index 100% rename from nashorn/test/script/basic/JDK-8024619.js rename to test/nashorn/script/basic/JDK-8024619.js diff --git a/nashorn/test/script/basic/JDK-8024846.js b/test/nashorn/script/basic/JDK-8024846.js similarity index 100% rename from nashorn/test/script/basic/JDK-8024846.js rename to test/nashorn/script/basic/JDK-8024846.js diff --git a/nashorn/test/script/basic/JDK-8024847.js b/test/nashorn/script/basic/JDK-8024847.js similarity index 100% rename from nashorn/test/script/basic/JDK-8024847.js rename to test/nashorn/script/basic/JDK-8024847.js diff --git a/nashorn/test/script/basic/JDK-8024847.js.EXPECTED b/test/nashorn/script/basic/JDK-8024847.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8024847.js.EXPECTED rename to test/nashorn/script/basic/JDK-8024847.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8024972.js b/test/nashorn/script/basic/JDK-8024972.js similarity index 100% rename from nashorn/test/script/basic/JDK-8024972.js rename to test/nashorn/script/basic/JDK-8024972.js diff --git a/nashorn/test/script/basic/JDK-8024972.js.EXPECTED b/test/nashorn/script/basic/JDK-8024972.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8024972.js.EXPECTED rename to test/nashorn/script/basic/JDK-8024972.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8025048-2.js b/test/nashorn/script/basic/JDK-8025048-2.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025048-2.js rename to test/nashorn/script/basic/JDK-8025048-2.js diff --git a/nashorn/test/script/basic/JDK-8025048.js b/test/nashorn/script/basic/JDK-8025048.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025048.js rename to test/nashorn/script/basic/JDK-8025048.js diff --git a/nashorn/test/script/basic/JDK-8025080.js b/test/nashorn/script/basic/JDK-8025080.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025080.js rename to test/nashorn/script/basic/JDK-8025080.js diff --git a/nashorn/test/script/basic/JDK-8025080.js.EXPECTED b/test/nashorn/script/basic/JDK-8025080.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8025080.js.EXPECTED rename to test/nashorn/script/basic/JDK-8025080.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8025090.js b/test/nashorn/script/basic/JDK-8025090.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025090.js rename to test/nashorn/script/basic/JDK-8025090.js diff --git a/nashorn/test/script/basic/JDK-8025111.js b/test/nashorn/script/basic/JDK-8025111.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025111.js rename to test/nashorn/script/basic/JDK-8025111.js diff --git a/nashorn/test/script/basic/JDK-8025147.js b/test/nashorn/script/basic/JDK-8025147.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025147.js rename to test/nashorn/script/basic/JDK-8025147.js diff --git a/nashorn/test/script/basic/JDK-8025147.js.EXPECTED b/test/nashorn/script/basic/JDK-8025147.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8025147.js.EXPECTED rename to test/nashorn/script/basic/JDK-8025147.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8025149.js b/test/nashorn/script/basic/JDK-8025149.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025149.js rename to test/nashorn/script/basic/JDK-8025149.js diff --git a/nashorn/test/script/basic/JDK-8025149.js.EXPECTED b/test/nashorn/script/basic/JDK-8025149.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8025149.js.EXPECTED rename to test/nashorn/script/basic/JDK-8025149.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8025163.js b/test/nashorn/script/basic/JDK-8025163.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025163.js rename to test/nashorn/script/basic/JDK-8025163.js diff --git a/nashorn/test/script/basic/JDK-8025163.js.EXPECTED b/test/nashorn/script/basic/JDK-8025163.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8025163.js.EXPECTED rename to test/nashorn/script/basic/JDK-8025163.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8025197.js b/test/nashorn/script/basic/JDK-8025197.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025197.js rename to test/nashorn/script/basic/JDK-8025197.js diff --git a/nashorn/test/script/basic/JDK-8025197.js.EXPECTED b/test/nashorn/script/basic/JDK-8025197.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8025197.js.EXPECTED rename to test/nashorn/script/basic/JDK-8025197.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8025213.js b/test/nashorn/script/basic/JDK-8025213.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025213.js rename to test/nashorn/script/basic/JDK-8025213.js diff --git a/nashorn/test/script/basic/JDK-8025213.js.EXPECTED b/test/nashorn/script/basic/JDK-8025213.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8025213.js.EXPECTED rename to test/nashorn/script/basic/JDK-8025213.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8025312.js b/test/nashorn/script/basic/JDK-8025312.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025312.js rename to test/nashorn/script/basic/JDK-8025312.js diff --git a/nashorn/test/script/basic/JDK-8025312.js.EXPECTED b/test/nashorn/script/basic/JDK-8025312.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8025312.js.EXPECTED rename to test/nashorn/script/basic/JDK-8025312.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8025325.js b/test/nashorn/script/basic/JDK-8025325.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025325.js rename to test/nashorn/script/basic/JDK-8025325.js diff --git a/nashorn/test/script/basic/JDK-8025325.js.EXPECTED b/test/nashorn/script/basic/JDK-8025325.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8025325.js.EXPECTED rename to test/nashorn/script/basic/JDK-8025325.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8025434.js b/test/nashorn/script/basic/JDK-8025434.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025434.js rename to test/nashorn/script/basic/JDK-8025434.js diff --git a/nashorn/test/script/basic/JDK-8025486.js b/test/nashorn/script/basic/JDK-8025486.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025486.js rename to test/nashorn/script/basic/JDK-8025486.js diff --git a/nashorn/test/script/basic/JDK-8025486.js.EXPECTED b/test/nashorn/script/basic/JDK-8025486.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8025486.js.EXPECTED rename to test/nashorn/script/basic/JDK-8025486.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8025488.js b/test/nashorn/script/basic/JDK-8025488.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025488.js rename to test/nashorn/script/basic/JDK-8025488.js diff --git a/nashorn/test/script/basic/JDK-8025488.js.EXPECTED b/test/nashorn/script/basic/JDK-8025488.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8025488.js.EXPECTED rename to test/nashorn/script/basic/JDK-8025488.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8025515.js b/test/nashorn/script/basic/JDK-8025515.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025515.js rename to test/nashorn/script/basic/JDK-8025515.js diff --git a/nashorn/test/script/basic/JDK-8025520.js b/test/nashorn/script/basic/JDK-8025520.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025520.js rename to test/nashorn/script/basic/JDK-8025520.js diff --git a/nashorn/test/script/basic/JDK-8025589.js b/test/nashorn/script/basic/JDK-8025589.js similarity index 100% rename from nashorn/test/script/basic/JDK-8025589.js rename to test/nashorn/script/basic/JDK-8025589.js diff --git a/nashorn/test/script/basic/JDK-8026008.js b/test/nashorn/script/basic/JDK-8026008.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026008.js rename to test/nashorn/script/basic/JDK-8026008.js diff --git a/nashorn/test/script/basic/JDK-8026008.js.EXPECTED b/test/nashorn/script/basic/JDK-8026008.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8026008.js.EXPECTED rename to test/nashorn/script/basic/JDK-8026008.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8026016.js b/test/nashorn/script/basic/JDK-8026016.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026016.js rename to test/nashorn/script/basic/JDK-8026016.js diff --git a/nashorn/test/script/basic/JDK-8026016.js.EXPECTED b/test/nashorn/script/basic/JDK-8026016.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8026016.js.EXPECTED rename to test/nashorn/script/basic/JDK-8026016.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8026033.js b/test/nashorn/script/basic/JDK-8026033.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026033.js rename to test/nashorn/script/basic/JDK-8026033.js diff --git a/nashorn/test/script/basic/JDK-8026033.js.EXPECTED b/test/nashorn/script/basic/JDK-8026033.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8026033.js.EXPECTED rename to test/nashorn/script/basic/JDK-8026033.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8026042.js b/test/nashorn/script/basic/JDK-8026042.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026042.js rename to test/nashorn/script/basic/JDK-8026042.js diff --git a/nashorn/test/script/basic/JDK-8026042.js.EXPECTED b/test/nashorn/script/basic/JDK-8026042.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8026042.js.EXPECTED rename to test/nashorn/script/basic/JDK-8026042.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8026048.js b/test/nashorn/script/basic/JDK-8026048.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026048.js rename to test/nashorn/script/basic/JDK-8026048.js diff --git a/nashorn/test/script/basic/JDK-8026112.js b/test/nashorn/script/basic/JDK-8026112.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026112.js rename to test/nashorn/script/basic/JDK-8026112.js diff --git a/nashorn/test/script/basic/JDK-8026125.js b/test/nashorn/script/basic/JDK-8026125.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026125.js rename to test/nashorn/script/basic/JDK-8026125.js diff --git a/nashorn/test/script/basic/JDK-8026137.js b/test/nashorn/script/basic/JDK-8026137.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026137.js rename to test/nashorn/script/basic/JDK-8026137.js diff --git a/nashorn/test/script/basic/JDK-8026137.js.EXPECTED b/test/nashorn/script/basic/JDK-8026137.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8026137.js.EXPECTED rename to test/nashorn/script/basic/JDK-8026137.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8026161.js b/test/nashorn/script/basic/JDK-8026161.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026161.js rename to test/nashorn/script/basic/JDK-8026161.js diff --git a/nashorn/test/script/basic/JDK-8026161.js.EXPECTED b/test/nashorn/script/basic/JDK-8026161.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8026161.js.EXPECTED rename to test/nashorn/script/basic/JDK-8026161.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8026162.js b/test/nashorn/script/basic/JDK-8026162.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026162.js rename to test/nashorn/script/basic/JDK-8026162.js diff --git a/nashorn/test/script/basic/JDK-8026167.js b/test/nashorn/script/basic/JDK-8026167.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026167.js rename to test/nashorn/script/basic/JDK-8026167.js diff --git a/nashorn/test/script/basic/JDK-8026248.js b/test/nashorn/script/basic/JDK-8026248.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026248.js rename to test/nashorn/script/basic/JDK-8026248.js diff --git a/nashorn/test/script/basic/JDK-8026248.js.EXPECTED b/test/nashorn/script/basic/JDK-8026248.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8026248.js.EXPECTED rename to test/nashorn/script/basic/JDK-8026248.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8026249.js b/test/nashorn/script/basic/JDK-8026249.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026249.js rename to test/nashorn/script/basic/JDK-8026249.js diff --git a/nashorn/test/script/basic/JDK-8026264.js b/test/nashorn/script/basic/JDK-8026264.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026264.js rename to test/nashorn/script/basic/JDK-8026264.js diff --git a/nashorn/test/script/basic/JDK-8026292.js b/test/nashorn/script/basic/JDK-8026292.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026292.js rename to test/nashorn/script/basic/JDK-8026292.js diff --git a/nashorn/test/script/basic/JDK-8026302.js b/test/nashorn/script/basic/JDK-8026302.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026302.js rename to test/nashorn/script/basic/JDK-8026302.js diff --git a/nashorn/test/script/basic/JDK-8026302.js.EXPECTED b/test/nashorn/script/basic/JDK-8026302.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8026302.js.EXPECTED rename to test/nashorn/script/basic/JDK-8026302.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8026317.js b/test/nashorn/script/basic/JDK-8026317.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026317.js rename to test/nashorn/script/basic/JDK-8026317.js diff --git a/nashorn/test/script/basic/JDK-8026317.js.EXPECTED b/test/nashorn/script/basic/JDK-8026317.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8026317.js.EXPECTED rename to test/nashorn/script/basic/JDK-8026317.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8026367.js b/test/nashorn/script/basic/JDK-8026367.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026367.js rename to test/nashorn/script/basic/JDK-8026367.js diff --git a/nashorn/test/script/basic/JDK-8026692.js b/test/nashorn/script/basic/JDK-8026692.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026692.js rename to test/nashorn/script/basic/JDK-8026692.js diff --git a/nashorn/test/script/basic/JDK-8026693.js b/test/nashorn/script/basic/JDK-8026693.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026693.js rename to test/nashorn/script/basic/JDK-8026693.js diff --git a/nashorn/test/script/basic/JDK-8026701.js b/test/nashorn/script/basic/JDK-8026701.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026701.js rename to test/nashorn/script/basic/JDK-8026701.js diff --git a/nashorn/test/script/basic/JDK-8026701.js.EXPECTED b/test/nashorn/script/basic/JDK-8026701.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8026701.js.EXPECTED rename to test/nashorn/script/basic/JDK-8026701.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8026805.js b/test/nashorn/script/basic/JDK-8026805.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026805.js rename to test/nashorn/script/basic/JDK-8026805.js diff --git a/nashorn/test/script/basic/JDK-8026858.js b/test/nashorn/script/basic/JDK-8026858.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026858.js rename to test/nashorn/script/basic/JDK-8026858.js diff --git a/nashorn/test/script/basic/JDK-8026955.js b/test/nashorn/script/basic/JDK-8026955.js similarity index 100% rename from nashorn/test/script/basic/JDK-8026955.js rename to test/nashorn/script/basic/JDK-8026955.js diff --git a/nashorn/test/script/basic/JDK-8026955.js.EXPECTED b/test/nashorn/script/basic/JDK-8026955.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8026955.js.EXPECTED rename to test/nashorn/script/basic/JDK-8026955.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8027016.js b/test/nashorn/script/basic/JDK-8027016.js similarity index 100% rename from nashorn/test/script/basic/JDK-8027016.js rename to test/nashorn/script/basic/JDK-8027016.js diff --git a/nashorn/test/script/basic/JDK-8027024.js b/test/nashorn/script/basic/JDK-8027024.js similarity index 100% rename from nashorn/test/script/basic/JDK-8027024.js rename to test/nashorn/script/basic/JDK-8027024.js diff --git a/nashorn/test/script/basic/JDK-8027024.js.EXPECTED b/test/nashorn/script/basic/JDK-8027024.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8027024.js.EXPECTED rename to test/nashorn/script/basic/JDK-8027024.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8027042.js b/test/nashorn/script/basic/JDK-8027042.js similarity index 100% rename from nashorn/test/script/basic/JDK-8027042.js rename to test/nashorn/script/basic/JDK-8027042.js diff --git a/nashorn/test/script/basic/JDK-8027042.js.EXPECTED b/test/nashorn/script/basic/JDK-8027042.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8027042.js.EXPECTED rename to test/nashorn/script/basic/JDK-8027042.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8027236.js b/test/nashorn/script/basic/JDK-8027236.js similarity index 100% rename from nashorn/test/script/basic/JDK-8027236.js rename to test/nashorn/script/basic/JDK-8027236.js diff --git a/nashorn/test/script/basic/JDK-8027236.js.EXPECTED b/test/nashorn/script/basic/JDK-8027236.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8027236.js.EXPECTED rename to test/nashorn/script/basic/JDK-8027236.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8027562.js b/test/nashorn/script/basic/JDK-8027562.js similarity index 100% rename from nashorn/test/script/basic/JDK-8027562.js rename to test/nashorn/script/basic/JDK-8027562.js diff --git a/nashorn/test/script/basic/JDK-8027562.js.EXPECTED b/test/nashorn/script/basic/JDK-8027562.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8027562.js.EXPECTED rename to test/nashorn/script/basic/JDK-8027562.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8027700.js b/test/nashorn/script/basic/JDK-8027700.js similarity index 100% rename from nashorn/test/script/basic/JDK-8027700.js rename to test/nashorn/script/basic/JDK-8027700.js diff --git a/nashorn/test/script/basic/JDK-8027753.js b/test/nashorn/script/basic/JDK-8027753.js similarity index 100% rename from nashorn/test/script/basic/JDK-8027753.js rename to test/nashorn/script/basic/JDK-8027753.js diff --git a/nashorn/test/script/basic/JDK-8027753.js.EXPECTED b/test/nashorn/script/basic/JDK-8027753.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8027753.js.EXPECTED rename to test/nashorn/script/basic/JDK-8027753.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8027828.js b/test/nashorn/script/basic/JDK-8027828.js similarity index 100% rename from nashorn/test/script/basic/JDK-8027828.js rename to test/nashorn/script/basic/JDK-8027828.js diff --git a/nashorn/test/script/basic/JDK-8027828.js.EXPECTED b/test/nashorn/script/basic/JDK-8027828.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8027828.js.EXPECTED rename to test/nashorn/script/basic/JDK-8027828.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8027933.js b/test/nashorn/script/basic/JDK-8027933.js similarity index 100% rename from nashorn/test/script/basic/JDK-8027933.js rename to test/nashorn/script/basic/JDK-8027933.js diff --git a/nashorn/test/script/basic/JDK-8027933.js.EXPECTED b/test/nashorn/script/basic/JDK-8027933.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8027933.js.EXPECTED rename to test/nashorn/script/basic/JDK-8027933.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8028020.js b/test/nashorn/script/basic/JDK-8028020.js similarity index 100% rename from nashorn/test/script/basic/JDK-8028020.js rename to test/nashorn/script/basic/JDK-8028020.js diff --git a/nashorn/test/script/basic/JDK-8028020.js.EXPECTED b/test/nashorn/script/basic/JDK-8028020.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8028020.js.EXPECTED rename to test/nashorn/script/basic/JDK-8028020.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8028210.js b/test/nashorn/script/basic/JDK-8028210.js similarity index 100% rename from nashorn/test/script/basic/JDK-8028210.js rename to test/nashorn/script/basic/JDK-8028210.js diff --git a/nashorn/test/script/basic/JDK-8028210.js.EXPECTED b/test/nashorn/script/basic/JDK-8028210.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8028210.js.EXPECTED rename to test/nashorn/script/basic/JDK-8028210.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8028429.js b/test/nashorn/script/basic/JDK-8028429.js similarity index 100% rename from nashorn/test/script/basic/JDK-8028429.js rename to test/nashorn/script/basic/JDK-8028429.js diff --git a/nashorn/test/script/basic/JDK-8028429.js.EXPECTED b/test/nashorn/script/basic/JDK-8028429.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8028429.js.EXPECTED rename to test/nashorn/script/basic/JDK-8028429.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8028434.js b/test/nashorn/script/basic/JDK-8028434.js similarity index 100% rename from nashorn/test/script/basic/JDK-8028434.js rename to test/nashorn/script/basic/JDK-8028434.js diff --git a/nashorn/test/script/basic/JDK-8028434.js.EXPECTED b/test/nashorn/script/basic/JDK-8028434.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8028434.js.EXPECTED rename to test/nashorn/script/basic/JDK-8028434.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8029364.js b/test/nashorn/script/basic/JDK-8029364.js similarity index 100% rename from nashorn/test/script/basic/JDK-8029364.js rename to test/nashorn/script/basic/JDK-8029364.js diff --git a/nashorn/test/script/basic/JDK-8029364.js.EXPECTED b/test/nashorn/script/basic/JDK-8029364.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8029364.js.EXPECTED rename to test/nashorn/script/basic/JDK-8029364.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8029384.js b/test/nashorn/script/basic/JDK-8029384.js similarity index 100% rename from nashorn/test/script/basic/JDK-8029384.js rename to test/nashorn/script/basic/JDK-8029384.js diff --git a/nashorn/test/script/basic/JDK-8029384.js.EXPECTED b/test/nashorn/script/basic/JDK-8029384.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8029384.js.EXPECTED rename to test/nashorn/script/basic/JDK-8029384.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8029467.js b/test/nashorn/script/basic/JDK-8029467.js similarity index 100% rename from nashorn/test/script/basic/JDK-8029467.js rename to test/nashorn/script/basic/JDK-8029467.js diff --git a/nashorn/test/script/basic/JDK-8029467.js.EXPECTED b/test/nashorn/script/basic/JDK-8029467.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8029467.js.EXPECTED rename to test/nashorn/script/basic/JDK-8029467.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8029667.js b/test/nashorn/script/basic/JDK-8029667.js similarity index 100% rename from nashorn/test/script/basic/JDK-8029667.js rename to test/nashorn/script/basic/JDK-8029667.js diff --git a/nashorn/test/script/basic/JDK-8029667.js.EXPECTED b/test/nashorn/script/basic/JDK-8029667.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8029667.js.EXPECTED rename to test/nashorn/script/basic/JDK-8029667.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8030182.js b/test/nashorn/script/basic/JDK-8030182.js similarity index 100% rename from nashorn/test/script/basic/JDK-8030182.js rename to test/nashorn/script/basic/JDK-8030182.js diff --git a/nashorn/test/script/basic/JDK-8030182.js.EXPECTED b/test/nashorn/script/basic/JDK-8030182.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8030182.js.EXPECTED rename to test/nashorn/script/basic/JDK-8030182.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8030182_2.js b/test/nashorn/script/basic/JDK-8030182_2.js similarity index 100% rename from nashorn/test/script/basic/JDK-8030182_2.js rename to test/nashorn/script/basic/JDK-8030182_2.js diff --git a/nashorn/test/script/basic/JDK-8030182_2.js.EXPECTED b/test/nashorn/script/basic/JDK-8030182_2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8030182_2.js.EXPECTED rename to test/nashorn/script/basic/JDK-8030182_2.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8030197.js b/test/nashorn/script/basic/JDK-8030197.js similarity index 100% rename from nashorn/test/script/basic/JDK-8030197.js rename to test/nashorn/script/basic/JDK-8030197.js diff --git a/nashorn/test/script/basic/JDK-8030199.js b/test/nashorn/script/basic/JDK-8030199.js similarity index 100% rename from nashorn/test/script/basic/JDK-8030199.js rename to test/nashorn/script/basic/JDK-8030199.js diff --git a/nashorn/test/script/basic/JDK-8030199.js.EXPECTED b/test/nashorn/script/basic/JDK-8030199.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8030199.js.EXPECTED rename to test/nashorn/script/basic/JDK-8030199.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8030200.js b/test/nashorn/script/basic/JDK-8030200.js similarity index 100% rename from nashorn/test/script/basic/JDK-8030200.js rename to test/nashorn/script/basic/JDK-8030200.js diff --git a/nashorn/test/script/basic/JDK-8030200.js.EXPECTED b/test/nashorn/script/basic/JDK-8030200.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8030200.js.EXPECTED rename to test/nashorn/script/basic/JDK-8030200.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8030202.js b/test/nashorn/script/basic/JDK-8030202.js similarity index 100% rename from nashorn/test/script/basic/JDK-8030202.js rename to test/nashorn/script/basic/JDK-8030202.js diff --git a/nashorn/test/script/basic/JDK-8030202.js.EXPECTED b/test/nashorn/script/basic/JDK-8030202.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8030202.js.EXPECTED rename to test/nashorn/script/basic/JDK-8030202.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8030809.js b/test/nashorn/script/basic/JDK-8030809.js similarity index 100% rename from nashorn/test/script/basic/JDK-8030809.js rename to test/nashorn/script/basic/JDK-8030809.js diff --git a/nashorn/test/script/basic/JDK-8030809.js.EXPECTED b/test/nashorn/script/basic/JDK-8030809.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8030809.js.EXPECTED rename to test/nashorn/script/basic/JDK-8030809.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8031317.js b/test/nashorn/script/basic/JDK-8031317.js similarity index 100% rename from nashorn/test/script/basic/JDK-8031317.js rename to test/nashorn/script/basic/JDK-8031317.js diff --git a/nashorn/test/script/basic/JDK-8031317.js.EXPECTED b/test/nashorn/script/basic/JDK-8031317.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8031317.js.EXPECTED rename to test/nashorn/script/basic/JDK-8031317.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8031359.js b/test/nashorn/script/basic/JDK-8031359.js similarity index 100% rename from nashorn/test/script/basic/JDK-8031359.js rename to test/nashorn/script/basic/JDK-8031359.js diff --git a/nashorn/test/script/basic/JDK-8031359.js.EXPECTED b/test/nashorn/script/basic/JDK-8031359.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8031359.js.EXPECTED rename to test/nashorn/script/basic/JDK-8031359.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8031715.js b/test/nashorn/script/basic/JDK-8031715.js similarity index 100% rename from nashorn/test/script/basic/JDK-8031715.js rename to test/nashorn/script/basic/JDK-8031715.js diff --git a/nashorn/test/script/basic/JDK-8031715.js.EXPECTED b/test/nashorn/script/basic/JDK-8031715.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8031715.js.EXPECTED rename to test/nashorn/script/basic/JDK-8031715.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8031983.js b/test/nashorn/script/basic/JDK-8031983.js similarity index 100% rename from nashorn/test/script/basic/JDK-8031983.js rename to test/nashorn/script/basic/JDK-8031983.js diff --git a/nashorn/test/script/basic/JDK-8031983.js.EXPECTED b/test/nashorn/script/basic/JDK-8031983.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8031983.js.EXPECTED rename to test/nashorn/script/basic/JDK-8031983.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8032004.js b/test/nashorn/script/basic/JDK-8032004.js similarity index 100% rename from nashorn/test/script/basic/JDK-8032004.js rename to test/nashorn/script/basic/JDK-8032004.js diff --git a/nashorn/test/script/basic/JDK-8032068.js b/test/nashorn/script/basic/JDK-8032068.js similarity index 100% rename from nashorn/test/script/basic/JDK-8032068.js rename to test/nashorn/script/basic/JDK-8032068.js diff --git a/nashorn/test/script/basic/JDK-8032068.js.EXPECTED b/test/nashorn/script/basic/JDK-8032068.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8032068.js.EXPECTED rename to test/nashorn/script/basic/JDK-8032068.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8034055.js b/test/nashorn/script/basic/JDK-8034055.js similarity index 100% rename from nashorn/test/script/basic/JDK-8034055.js rename to test/nashorn/script/basic/JDK-8034055.js diff --git a/nashorn/test/script/basic/JDK-8034055.js.EXPECTED b/test/nashorn/script/basic/JDK-8034055.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8034055.js.EXPECTED rename to test/nashorn/script/basic/JDK-8034055.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8035312.js b/test/nashorn/script/basic/JDK-8035312.js similarity index 100% rename from nashorn/test/script/basic/JDK-8035312.js rename to test/nashorn/script/basic/JDK-8035312.js diff --git a/nashorn/test/script/basic/JDK-8035312.js.EXPECTED b/test/nashorn/script/basic/JDK-8035312.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8035312.js.EXPECTED rename to test/nashorn/script/basic/JDK-8035312.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8035312_2.js b/test/nashorn/script/basic/JDK-8035312_2.js similarity index 100% rename from nashorn/test/script/basic/JDK-8035312_2.js rename to test/nashorn/script/basic/JDK-8035312_2.js diff --git a/nashorn/test/script/basic/JDK-8035312_2.js.EXPECTED b/test/nashorn/script/basic/JDK-8035312_2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8035312_2.js.EXPECTED rename to test/nashorn/script/basic/JDK-8035312_2.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8035312_3.js b/test/nashorn/script/basic/JDK-8035312_3.js similarity index 100% rename from nashorn/test/script/basic/JDK-8035312_3.js rename to test/nashorn/script/basic/JDK-8035312_3.js diff --git a/nashorn/test/script/basic/JDK-8035312_3.js.EXPECTED b/test/nashorn/script/basic/JDK-8035312_3.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8035312_3.js.EXPECTED rename to test/nashorn/script/basic/JDK-8035312_3.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8035312_4.js b/test/nashorn/script/basic/JDK-8035312_4.js similarity index 100% rename from nashorn/test/script/basic/JDK-8035312_4.js rename to test/nashorn/script/basic/JDK-8035312_4.js diff --git a/nashorn/test/script/basic/JDK-8035312_4.js.EXPECTED b/test/nashorn/script/basic/JDK-8035312_4.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8035312_4.js.EXPECTED rename to test/nashorn/script/basic/JDK-8035312_4.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8035312_5.js b/test/nashorn/script/basic/JDK-8035312_5.js similarity index 100% rename from nashorn/test/script/basic/JDK-8035312_5.js rename to test/nashorn/script/basic/JDK-8035312_5.js diff --git a/nashorn/test/script/basic/JDK-8035312_5.js.EXPECTED b/test/nashorn/script/basic/JDK-8035312_5.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8035312_5.js.EXPECTED rename to test/nashorn/script/basic/JDK-8035312_5.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8035712.js b/test/nashorn/script/basic/JDK-8035712.js similarity index 100% rename from nashorn/test/script/basic/JDK-8035712.js rename to test/nashorn/script/basic/JDK-8035712.js diff --git a/nashorn/test/script/basic/JDK-8036743.js b/test/nashorn/script/basic/JDK-8036743.js similarity index 100% rename from nashorn/test/script/basic/JDK-8036743.js rename to test/nashorn/script/basic/JDK-8036743.js diff --git a/nashorn/test/script/basic/JDK-8036743.js.EXPECTED b/test/nashorn/script/basic/JDK-8036743.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8036743.js.EXPECTED rename to test/nashorn/script/basic/JDK-8036743.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8037562.js b/test/nashorn/script/basic/JDK-8037562.js similarity index 100% rename from nashorn/test/script/basic/JDK-8037562.js rename to test/nashorn/script/basic/JDK-8037562.js diff --git a/nashorn/test/script/basic/JDK-8037562.js.EXPECTED b/test/nashorn/script/basic/JDK-8037562.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8037562.js.EXPECTED rename to test/nashorn/script/basic/JDK-8037562.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8038413.js b/test/nashorn/script/basic/JDK-8038413.js similarity index 100% rename from nashorn/test/script/basic/JDK-8038413.js rename to test/nashorn/script/basic/JDK-8038413.js diff --git a/nashorn/test/script/basic/JDK-8038413.js.EXPECTED b/test/nashorn/script/basic/JDK-8038413.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8038413.js.EXPECTED rename to test/nashorn/script/basic/JDK-8038413.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8038945.js b/test/nashorn/script/basic/JDK-8038945.js similarity index 100% rename from nashorn/test/script/basic/JDK-8038945.js rename to test/nashorn/script/basic/JDK-8038945.js diff --git a/nashorn/test/script/basic/JDK-8038945.js.EXPECTED b/test/nashorn/script/basic/JDK-8038945.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8038945.js.EXPECTED rename to test/nashorn/script/basic/JDK-8038945.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8039387.js b/test/nashorn/script/basic/JDK-8039387.js similarity index 100% rename from nashorn/test/script/basic/JDK-8039387.js rename to test/nashorn/script/basic/JDK-8039387.js diff --git a/nashorn/test/script/basic/JDK-8039387.js.EXPECTED b/test/nashorn/script/basic/JDK-8039387.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8039387.js.EXPECTED rename to test/nashorn/script/basic/JDK-8039387.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8040024.js b/test/nashorn/script/basic/JDK-8040024.js similarity index 100% rename from nashorn/test/script/basic/JDK-8040024.js rename to test/nashorn/script/basic/JDK-8040024.js diff --git a/nashorn/test/script/basic/JDK-8040024.js.EXPECTED b/test/nashorn/script/basic/JDK-8040024.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8040024.js.EXPECTED rename to test/nashorn/script/basic/JDK-8040024.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8041995.js b/test/nashorn/script/basic/JDK-8041995.js similarity index 100% rename from nashorn/test/script/basic/JDK-8041995.js rename to test/nashorn/script/basic/JDK-8041995.js diff --git a/nashorn/test/script/basic/JDK-8041995.js.EXPECTED b/test/nashorn/script/basic/JDK-8041995.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8041995.js.EXPECTED rename to test/nashorn/script/basic/JDK-8041995.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8041998.js b/test/nashorn/script/basic/JDK-8041998.js similarity index 100% rename from nashorn/test/script/basic/JDK-8041998.js rename to test/nashorn/script/basic/JDK-8041998.js diff --git a/nashorn/test/script/basic/JDK-8041998.js.EXPECTED b/test/nashorn/script/basic/JDK-8041998.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8041998.js.EXPECTED rename to test/nashorn/script/basic/JDK-8041998.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8042364.js b/test/nashorn/script/basic/JDK-8042364.js similarity index 100% rename from nashorn/test/script/basic/JDK-8042364.js rename to test/nashorn/script/basic/JDK-8042364.js diff --git a/nashorn/test/script/basic/JDK-8042364.js.EXPECTED b/test/nashorn/script/basic/JDK-8042364.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8042364.js.EXPECTED rename to test/nashorn/script/basic/JDK-8042364.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8043133.js b/test/nashorn/script/basic/JDK-8043133.js similarity index 100% rename from nashorn/test/script/basic/JDK-8043133.js rename to test/nashorn/script/basic/JDK-8043133.js diff --git a/nashorn/test/script/basic/JDK-8043133.js.EXPECTED b/test/nashorn/script/basic/JDK-8043133.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8043133.js.EXPECTED rename to test/nashorn/script/basic/JDK-8043133.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8043232.js b/test/nashorn/script/basic/JDK-8043232.js similarity index 100% rename from nashorn/test/script/basic/JDK-8043232.js rename to test/nashorn/script/basic/JDK-8043232.js diff --git a/nashorn/test/script/basic/JDK-8043232.js.EXPECTED b/test/nashorn/script/basic/JDK-8043232.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8043232.js.EXPECTED rename to test/nashorn/script/basic/JDK-8043232.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8043235.js b/test/nashorn/script/basic/JDK-8043235.js similarity index 100% rename from nashorn/test/script/basic/JDK-8043235.js rename to test/nashorn/script/basic/JDK-8043235.js diff --git a/nashorn/test/script/basic/JDK-8043235.js.EXPECTED b/test/nashorn/script/basic/JDK-8043235.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8043235.js.EXPECTED rename to test/nashorn/script/basic/JDK-8043235.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8043431.js b/test/nashorn/script/basic/JDK-8043431.js similarity index 100% rename from nashorn/test/script/basic/JDK-8043431.js rename to test/nashorn/script/basic/JDK-8043431.js diff --git a/nashorn/test/script/basic/JDK-8043431.js.EXPECTED b/test/nashorn/script/basic/JDK-8043431.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8043431.js.EXPECTED rename to test/nashorn/script/basic/JDK-8043431.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8043930.js b/test/nashorn/script/basic/JDK-8043930.js similarity index 100% rename from nashorn/test/script/basic/JDK-8043930.js rename to test/nashorn/script/basic/JDK-8043930.js diff --git a/nashorn/test/script/basic/JDK-8043930.js.EXPECTED b/test/nashorn/script/basic/JDK-8043930.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8043930.js.EXPECTED rename to test/nashorn/script/basic/JDK-8043930.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8044520.js b/test/nashorn/script/basic/JDK-8044520.js similarity index 100% rename from nashorn/test/script/basic/JDK-8044520.js rename to test/nashorn/script/basic/JDK-8044520.js diff --git a/nashorn/test/script/basic/JDK-8044533.js b/test/nashorn/script/basic/JDK-8044533.js similarity index 100% rename from nashorn/test/script/basic/JDK-8044533.js rename to test/nashorn/script/basic/JDK-8044533.js diff --git a/nashorn/test/script/basic/JDK-8044533.js.EXPECTED b/test/nashorn/script/basic/JDK-8044533.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8044533.js.EXPECTED rename to test/nashorn/script/basic/JDK-8044533.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8044534.js b/test/nashorn/script/basic/JDK-8044534.js similarity index 100% rename from nashorn/test/script/basic/JDK-8044534.js rename to test/nashorn/script/basic/JDK-8044534.js diff --git a/nashorn/test/script/basic/JDK-8044534.js.EXPECTED b/test/nashorn/script/basic/JDK-8044534.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8044534.js.EXPECTED rename to test/nashorn/script/basic/JDK-8044534.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8044612.js b/test/nashorn/script/basic/JDK-8044612.js similarity index 100% rename from nashorn/test/script/basic/JDK-8044612.js rename to test/nashorn/script/basic/JDK-8044612.js diff --git a/nashorn/test/script/basic/JDK-8044695.js b/test/nashorn/script/basic/JDK-8044695.js similarity index 100% rename from nashorn/test/script/basic/JDK-8044695.js rename to test/nashorn/script/basic/JDK-8044695.js diff --git a/nashorn/test/script/basic/JDK-8044750.js b/test/nashorn/script/basic/JDK-8044750.js similarity index 100% rename from nashorn/test/script/basic/JDK-8044750.js rename to test/nashorn/script/basic/JDK-8044750.js diff --git a/nashorn/test/script/basic/JDK-8046013.js b/test/nashorn/script/basic/JDK-8046013.js similarity index 100% rename from nashorn/test/script/basic/JDK-8046013.js rename to test/nashorn/script/basic/JDK-8046013.js diff --git a/nashorn/test/script/basic/JDK-8046013.js.EXPECTED b/test/nashorn/script/basic/JDK-8046013.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8046013.js.EXPECTED rename to test/nashorn/script/basic/JDK-8046013.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8046026.js b/test/nashorn/script/basic/JDK-8046026.js similarity index 100% rename from nashorn/test/script/basic/JDK-8046026.js rename to test/nashorn/script/basic/JDK-8046026.js diff --git a/nashorn/test/script/basic/JDK-8046026.js.EXPECTED b/test/nashorn/script/basic/JDK-8046026.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8046026.js.EXPECTED rename to test/nashorn/script/basic/JDK-8046026.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8046905.js b/test/nashorn/script/basic/JDK-8046905.js similarity index 100% rename from nashorn/test/script/basic/JDK-8046905.js rename to test/nashorn/script/basic/JDK-8046905.js diff --git a/nashorn/test/script/basic/JDK-8046905.js.EXPECTED b/test/nashorn/script/basic/JDK-8046905.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8046905.js.EXPECTED rename to test/nashorn/script/basic/JDK-8046905.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8047035.js b/test/nashorn/script/basic/JDK-8047035.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047035.js rename to test/nashorn/script/basic/JDK-8047035.js diff --git a/nashorn/test/script/basic/JDK-8047035.js.EXPECTED b/test/nashorn/script/basic/JDK-8047035.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8047035.js.EXPECTED rename to test/nashorn/script/basic/JDK-8047035.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8047057.js b/test/nashorn/script/basic/JDK-8047057.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047057.js rename to test/nashorn/script/basic/JDK-8047057.js diff --git a/nashorn/test/script/basic/JDK-8047067.js b/test/nashorn/script/basic/JDK-8047067.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047067.js rename to test/nashorn/script/basic/JDK-8047067.js diff --git a/nashorn/test/script/basic/JDK-8047078.js b/test/nashorn/script/basic/JDK-8047078.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047078.js rename to test/nashorn/script/basic/JDK-8047078.js diff --git a/nashorn/test/script/basic/JDK-8047166.js b/test/nashorn/script/basic/JDK-8047166.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047166.js rename to test/nashorn/script/basic/JDK-8047166.js diff --git a/nashorn/test/script/basic/JDK-8047357.js b/test/nashorn/script/basic/JDK-8047357.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047357.js rename to test/nashorn/script/basic/JDK-8047357.js diff --git a/nashorn/test/script/basic/JDK-8047357.js.EXPECTED b/test/nashorn/script/basic/JDK-8047357.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8047357.js.EXPECTED rename to test/nashorn/script/basic/JDK-8047357.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8047359.js b/test/nashorn/script/basic/JDK-8047359.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047359.js rename to test/nashorn/script/basic/JDK-8047359.js diff --git a/nashorn/test/script/basic/JDK-8047365.js b/test/nashorn/script/basic/JDK-8047365.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047365.js rename to test/nashorn/script/basic/JDK-8047365.js diff --git a/nashorn/test/script/basic/JDK-8047365.js.EXPECTED b/test/nashorn/script/basic/JDK-8047365.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8047365.js.EXPECTED rename to test/nashorn/script/basic/JDK-8047365.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8047369.js b/test/nashorn/script/basic/JDK-8047369.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047369.js rename to test/nashorn/script/basic/JDK-8047369.js diff --git a/nashorn/test/script/basic/JDK-8047371.js b/test/nashorn/script/basic/JDK-8047371.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047371.js rename to test/nashorn/script/basic/JDK-8047371.js diff --git a/nashorn/test/script/basic/JDK-8047371.js.EXPECTED b/test/nashorn/script/basic/JDK-8047371.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8047371.js.EXPECTED rename to test/nashorn/script/basic/JDK-8047371.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8047728.js b/test/nashorn/script/basic/JDK-8047728.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047728.js rename to test/nashorn/script/basic/JDK-8047728.js diff --git a/nashorn/test/script/basic/JDK-8047764-strict.js b/test/nashorn/script/basic/JDK-8047764-strict.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047764-strict.js rename to test/nashorn/script/basic/JDK-8047764-strict.js diff --git a/nashorn/test/script/basic/JDK-8047764-strict.js.EXPECTED b/test/nashorn/script/basic/JDK-8047764-strict.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8047764-strict.js.EXPECTED rename to test/nashorn/script/basic/JDK-8047764-strict.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8047764.js b/test/nashorn/script/basic/JDK-8047764.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047764.js rename to test/nashorn/script/basic/JDK-8047764.js diff --git a/nashorn/test/script/basic/JDK-8047764.js.EXPECTED b/test/nashorn/script/basic/JDK-8047764.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8047764.js.EXPECTED rename to test/nashorn/script/basic/JDK-8047764.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8047959.js b/test/nashorn/script/basic/JDK-8047959.js similarity index 100% rename from nashorn/test/script/basic/JDK-8047959.js rename to test/nashorn/script/basic/JDK-8047959.js diff --git a/nashorn/test/script/basic/JDK-8047959.js.EXPECTED b/test/nashorn/script/basic/JDK-8047959.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8047959.js.EXPECTED rename to test/nashorn/script/basic/JDK-8047959.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8048071.js b/test/nashorn/script/basic/JDK-8048071.js similarity index 100% rename from nashorn/test/script/basic/JDK-8048071.js rename to test/nashorn/script/basic/JDK-8048071.js diff --git a/nashorn/test/script/basic/JDK-8048071.js.EXPECTED b/test/nashorn/script/basic/JDK-8048071.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8048071.js.EXPECTED rename to test/nashorn/script/basic/JDK-8048071.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8048079_1a.js b/test/nashorn/script/basic/JDK-8048079_1a.js similarity index 100% rename from nashorn/test/script/basic/JDK-8048079_1a.js rename to test/nashorn/script/basic/JDK-8048079_1a.js diff --git a/nashorn/test/script/basic/JDK-8048079_1a.js.EXPECTED b/test/nashorn/script/basic/JDK-8048079_1a.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8048079_1a.js.EXPECTED rename to test/nashorn/script/basic/JDK-8048079_1a.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8048079_1b.js b/test/nashorn/script/basic/JDK-8048079_1b.js similarity index 100% rename from nashorn/test/script/basic/JDK-8048079_1b.js rename to test/nashorn/script/basic/JDK-8048079_1b.js diff --git a/nashorn/test/script/basic/JDK-8048079_1b.js.EXPECTED b/test/nashorn/script/basic/JDK-8048079_1b.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8048079_1b.js.EXPECTED rename to test/nashorn/script/basic/JDK-8048079_1b.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8048079_2a.js b/test/nashorn/script/basic/JDK-8048079_2a.js similarity index 100% rename from nashorn/test/script/basic/JDK-8048079_2a.js rename to test/nashorn/script/basic/JDK-8048079_2a.js diff --git a/nashorn/test/script/basic/JDK-8048079_2a.js.EXPECTED b/test/nashorn/script/basic/JDK-8048079_2a.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8048079_2a.js.EXPECTED rename to test/nashorn/script/basic/JDK-8048079_2a.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8048079_2b.js b/test/nashorn/script/basic/JDK-8048079_2b.js similarity index 100% rename from nashorn/test/script/basic/JDK-8048079_2b.js rename to test/nashorn/script/basic/JDK-8048079_2b.js diff --git a/nashorn/test/script/basic/JDK-8048079_2b.js.EXPECTED b/test/nashorn/script/basic/JDK-8048079_2b.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8048079_2b.js.EXPECTED rename to test/nashorn/script/basic/JDK-8048079_2b.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8048505.js b/test/nashorn/script/basic/JDK-8048505.js similarity index 100% rename from nashorn/test/script/basic/JDK-8048505.js rename to test/nashorn/script/basic/JDK-8048505.js diff --git a/nashorn/test/script/basic/JDK-8048505.js.EXPECTED b/test/nashorn/script/basic/JDK-8048505.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8048505.js.EXPECTED rename to test/nashorn/script/basic/JDK-8048505.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8048586.js b/test/nashorn/script/basic/JDK-8048586.js similarity index 100% rename from nashorn/test/script/basic/JDK-8048586.js rename to test/nashorn/script/basic/JDK-8048586.js diff --git a/nashorn/test/script/basic/JDK-8048718.js b/test/nashorn/script/basic/JDK-8048718.js similarity index 100% rename from nashorn/test/script/basic/JDK-8048718.js rename to test/nashorn/script/basic/JDK-8048718.js diff --git a/nashorn/test/script/basic/JDK-8049086.js b/test/nashorn/script/basic/JDK-8049086.js similarity index 100% rename from nashorn/test/script/basic/JDK-8049086.js rename to test/nashorn/script/basic/JDK-8049086.js diff --git a/nashorn/test/script/basic/JDK-8049086.js.EXPECTED b/test/nashorn/script/basic/JDK-8049086.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8049086.js.EXPECTED rename to test/nashorn/script/basic/JDK-8049086.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8049242.js b/test/nashorn/script/basic/JDK-8049242.js similarity index 100% rename from nashorn/test/script/basic/JDK-8049242.js rename to test/nashorn/script/basic/JDK-8049242.js diff --git a/nashorn/test/script/basic/JDK-8049242.js.EXPECTED b/test/nashorn/script/basic/JDK-8049242.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8049242.js.EXPECTED rename to test/nashorn/script/basic/JDK-8049242.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8049407-big-endian.js b/test/nashorn/script/basic/JDK-8049407-big-endian.js similarity index 100% rename from nashorn/test/script/basic/JDK-8049407-big-endian.js rename to test/nashorn/script/basic/JDK-8049407-big-endian.js diff --git a/nashorn/test/script/basic/JDK-8049407-big-endian.js.EXPECTED b/test/nashorn/script/basic/JDK-8049407-big-endian.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8049407-big-endian.js.EXPECTED rename to test/nashorn/script/basic/JDK-8049407-big-endian.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8049407-payload.js b/test/nashorn/script/basic/JDK-8049407-payload.js similarity index 100% rename from nashorn/test/script/basic/JDK-8049407-payload.js rename to test/nashorn/script/basic/JDK-8049407-payload.js diff --git a/nashorn/test/script/basic/JDK-8049407.js b/test/nashorn/script/basic/JDK-8049407.js similarity index 100% rename from nashorn/test/script/basic/JDK-8049407.js rename to test/nashorn/script/basic/JDK-8049407.js diff --git a/nashorn/test/script/basic/JDK-8049407.js.EXPECTED b/test/nashorn/script/basic/JDK-8049407.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8049407.js.EXPECTED rename to test/nashorn/script/basic/JDK-8049407.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8050432.js b/test/nashorn/script/basic/JDK-8050432.js similarity index 100% rename from nashorn/test/script/basic/JDK-8050432.js rename to test/nashorn/script/basic/JDK-8050432.js diff --git a/nashorn/test/script/basic/JDK-8051439.js b/test/nashorn/script/basic/JDK-8051439.js similarity index 100% rename from nashorn/test/script/basic/JDK-8051439.js rename to test/nashorn/script/basic/JDK-8051439.js diff --git a/nashorn/test/script/basic/JDK-8051439.js.EXPECTED b/test/nashorn/script/basic/JDK-8051439.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8051439.js.EXPECTED rename to test/nashorn/script/basic/JDK-8051439.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8051778.js b/test/nashorn/script/basic/JDK-8051778.js similarity index 100% rename from nashorn/test/script/basic/JDK-8051778.js rename to test/nashorn/script/basic/JDK-8051778.js diff --git a/nashorn/test/script/basic/JDK-8051778.js.EXPECTED b/test/nashorn/script/basic/JDK-8051778.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8051778.js.EXPECTED rename to test/nashorn/script/basic/JDK-8051778.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8053905.js b/test/nashorn/script/basic/JDK-8053905.js similarity index 100% rename from nashorn/test/script/basic/JDK-8053905.js rename to test/nashorn/script/basic/JDK-8053905.js diff --git a/nashorn/test/script/basic/JDK-8053905.js.EXPECTED b/test/nashorn/script/basic/JDK-8053905.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8053905.js.EXPECTED rename to test/nashorn/script/basic/JDK-8053905.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8054503.js b/test/nashorn/script/basic/JDK-8054503.js similarity index 100% rename from nashorn/test/script/basic/JDK-8054503.js rename to test/nashorn/script/basic/JDK-8054503.js diff --git a/nashorn/test/script/basic/JDK-8055762.js b/test/nashorn/script/basic/JDK-8055762.js similarity index 100% rename from nashorn/test/script/basic/JDK-8055762.js rename to test/nashorn/script/basic/JDK-8055762.js diff --git a/nashorn/test/script/basic/JDK-8055762.js.EXPECTED b/test/nashorn/script/basic/JDK-8055762.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8055762.js.EXPECTED rename to test/nashorn/script/basic/JDK-8055762.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8055796.js b/test/nashorn/script/basic/JDK-8055796.js similarity index 100% rename from nashorn/test/script/basic/JDK-8055796.js rename to test/nashorn/script/basic/JDK-8055796.js diff --git a/nashorn/test/script/basic/JDK-8055796.js.EXPECTED b/test/nashorn/script/basic/JDK-8055796.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8055796.js.EXPECTED rename to test/nashorn/script/basic/JDK-8055796.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8055796_2.js b/test/nashorn/script/basic/JDK-8055796_2.js similarity index 100% rename from nashorn/test/script/basic/JDK-8055796_2.js rename to test/nashorn/script/basic/JDK-8055796_2.js diff --git a/nashorn/test/script/basic/JDK-8055796_2.js.EXPECTED b/test/nashorn/script/basic/JDK-8055796_2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8055796_2.js.EXPECTED rename to test/nashorn/script/basic/JDK-8055796_2.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8055870.js b/test/nashorn/script/basic/JDK-8055870.js similarity index 100% rename from nashorn/test/script/basic/JDK-8055870.js rename to test/nashorn/script/basic/JDK-8055870.js diff --git a/nashorn/test/script/basic/JDK-8055870.js.EXPECTED b/test/nashorn/script/basic/JDK-8055870.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8055870.js.EXPECTED rename to test/nashorn/script/basic/JDK-8055870.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8056123.js b/test/nashorn/script/basic/JDK-8056123.js similarity index 100% rename from nashorn/test/script/basic/JDK-8056123.js rename to test/nashorn/script/basic/JDK-8056123.js diff --git a/nashorn/test/script/basic/JDK-8056129.js b/test/nashorn/script/basic/JDK-8056129.js similarity index 100% rename from nashorn/test/script/basic/JDK-8056129.js rename to test/nashorn/script/basic/JDK-8056129.js diff --git a/nashorn/test/script/basic/JDK-8056129.js.EXPECTED b/test/nashorn/script/basic/JDK-8056129.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8056129.js.EXPECTED rename to test/nashorn/script/basic/JDK-8056129.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8056978.js b/test/nashorn/script/basic/JDK-8056978.js similarity index 100% rename from nashorn/test/script/basic/JDK-8056978.js rename to test/nashorn/script/basic/JDK-8056978.js diff --git a/nashorn/test/script/basic/JDK-8056978.js.EXPECTED b/test/nashorn/script/basic/JDK-8056978.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8056978.js.EXPECTED rename to test/nashorn/script/basic/JDK-8056978.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8057019-2.js b/test/nashorn/script/basic/JDK-8057019-2.js similarity index 100% rename from nashorn/test/script/basic/JDK-8057019-2.js rename to test/nashorn/script/basic/JDK-8057019-2.js diff --git a/nashorn/test/script/basic/JDK-8057019-2.js.EXPECTED b/test/nashorn/script/basic/JDK-8057019-2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8057019-2.js.EXPECTED rename to test/nashorn/script/basic/JDK-8057019-2.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8057019-payload.js b/test/nashorn/script/basic/JDK-8057019-payload.js similarity index 100% rename from nashorn/test/script/basic/JDK-8057019-payload.js rename to test/nashorn/script/basic/JDK-8057019-payload.js diff --git a/nashorn/test/script/basic/JDK-8057019.js b/test/nashorn/script/basic/JDK-8057019.js similarity index 100% rename from nashorn/test/script/basic/JDK-8057019.js rename to test/nashorn/script/basic/JDK-8057019.js diff --git a/nashorn/test/script/basic/JDK-8057019.js.EXPECTED b/test/nashorn/script/basic/JDK-8057019.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8057019.js.EXPECTED rename to test/nashorn/script/basic/JDK-8057019.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8057825.js b/test/nashorn/script/basic/JDK-8057825.js similarity index 100% rename from nashorn/test/script/basic/JDK-8057825.js rename to test/nashorn/script/basic/JDK-8057825.js diff --git a/nashorn/test/script/basic/JDK-8057825.js.EXPECTED b/test/nashorn/script/basic/JDK-8057825.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8057825.js.EXPECTED rename to test/nashorn/script/basic/JDK-8057825.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8058179.js b/test/nashorn/script/basic/JDK-8058179.js similarity index 100% rename from nashorn/test/script/basic/JDK-8058179.js rename to test/nashorn/script/basic/JDK-8058179.js diff --git a/nashorn/test/script/basic/JDK-8058179.js.EXPECTED b/test/nashorn/script/basic/JDK-8058179.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8058179.js.EXPECTED rename to test/nashorn/script/basic/JDK-8058179.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8058422.js b/test/nashorn/script/basic/JDK-8058422.js similarity index 100% rename from nashorn/test/script/basic/JDK-8058422.js rename to test/nashorn/script/basic/JDK-8058422.js diff --git a/nashorn/test/script/basic/JDK-8058545.js b/test/nashorn/script/basic/JDK-8058545.js similarity index 100% rename from nashorn/test/script/basic/JDK-8058545.js rename to test/nashorn/script/basic/JDK-8058545.js diff --git a/nashorn/test/script/basic/JDK-8058561.js b/test/nashorn/script/basic/JDK-8058561.js similarity index 100% rename from nashorn/test/script/basic/JDK-8058561.js rename to test/nashorn/script/basic/JDK-8058561.js diff --git a/nashorn/test/script/basic/JDK-8058610.js b/test/nashorn/script/basic/JDK-8058610.js similarity index 100% rename from nashorn/test/script/basic/JDK-8058610.js rename to test/nashorn/script/basic/JDK-8058610.js diff --git a/nashorn/test/script/basic/JDK-8058610.js.EXPECTED b/test/nashorn/script/basic/JDK-8058610.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8058610.js.EXPECTED rename to test/nashorn/script/basic/JDK-8058610.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8058615.js b/test/nashorn/script/basic/JDK-8058615.js similarity index 100% rename from nashorn/test/script/basic/JDK-8058615.js rename to test/nashorn/script/basic/JDK-8058615.js diff --git a/nashorn/test/script/basic/JDK-8058615.js.EXPECTED b/test/nashorn/script/basic/JDK-8058615.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8058615.js.EXPECTED rename to test/nashorn/script/basic/JDK-8058615.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8059443.js b/test/nashorn/script/basic/JDK-8059443.js similarity index 100% rename from nashorn/test/script/basic/JDK-8059443.js rename to test/nashorn/script/basic/JDK-8059443.js diff --git a/nashorn/test/script/basic/JDK-8059443.js.EXPECTED b/test/nashorn/script/basic/JDK-8059443.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8059443.js.EXPECTED rename to test/nashorn/script/basic/JDK-8059443.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8060011.js b/test/nashorn/script/basic/JDK-8060011.js similarity index 100% rename from nashorn/test/script/basic/JDK-8060011.js rename to test/nashorn/script/basic/JDK-8060011.js diff --git a/nashorn/test/script/basic/JDK-8060101.js b/test/nashorn/script/basic/JDK-8060101.js similarity index 100% rename from nashorn/test/script/basic/JDK-8060101.js rename to test/nashorn/script/basic/JDK-8060101.js diff --git a/nashorn/test/script/basic/JDK-8061113.js b/test/nashorn/script/basic/JDK-8061113.js similarity index 100% rename from nashorn/test/script/basic/JDK-8061113.js rename to test/nashorn/script/basic/JDK-8061113.js diff --git a/nashorn/test/script/basic/JDK-8061113.js.EXPECTED b/test/nashorn/script/basic/JDK-8061113.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8061113.js.EXPECTED rename to test/nashorn/script/basic/JDK-8061113.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8061391.js b/test/nashorn/script/basic/JDK-8061391.js similarity index 100% rename from nashorn/test/script/basic/JDK-8061391.js rename to test/nashorn/script/basic/JDK-8061391.js diff --git a/nashorn/test/script/basic/JDK-8061391.js.EXPECTED b/test/nashorn/script/basic/JDK-8061391.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8061391.js.EXPECTED rename to test/nashorn/script/basic/JDK-8061391.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8061391_2.js b/test/nashorn/script/basic/JDK-8061391_2.js similarity index 100% rename from nashorn/test/script/basic/JDK-8061391_2.js rename to test/nashorn/script/basic/JDK-8061391_2.js diff --git a/nashorn/test/script/basic/JDK-8061391_3.js b/test/nashorn/script/basic/JDK-8061391_3.js similarity index 100% rename from nashorn/test/script/basic/JDK-8061391_3.js rename to test/nashorn/script/basic/JDK-8061391_3.js diff --git a/nashorn/test/script/basic/JDK-8061391_3.js.EXPECTED b/test/nashorn/script/basic/JDK-8061391_3.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8061391_3.js.EXPECTED rename to test/nashorn/script/basic/JDK-8061391_3.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8061959.js b/test/nashorn/script/basic/JDK-8061959.js similarity index 100% rename from nashorn/test/script/basic/JDK-8061959.js rename to test/nashorn/script/basic/JDK-8061959.js diff --git a/nashorn/test/script/basic/JDK-8061959.js.EXPECTED b/test/nashorn/script/basic/JDK-8061959.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8061959.js.EXPECTED rename to test/nashorn/script/basic/JDK-8061959.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8062024.js b/test/nashorn/script/basic/JDK-8062024.js similarity index 100% rename from nashorn/test/script/basic/JDK-8062024.js rename to test/nashorn/script/basic/JDK-8062024.js diff --git a/nashorn/test/script/basic/JDK-8062024.js.EXPECTED b/test/nashorn/script/basic/JDK-8062024.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8062024.js.EXPECTED rename to test/nashorn/script/basic/JDK-8062024.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8062132.js b/test/nashorn/script/basic/JDK-8062132.js similarity index 100% rename from nashorn/test/script/basic/JDK-8062132.js rename to test/nashorn/script/basic/JDK-8062132.js diff --git a/nashorn/test/script/basic/JDK-8062132.js.EXPECTED b/test/nashorn/script/basic/JDK-8062132.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8062132.js.EXPECTED rename to test/nashorn/script/basic/JDK-8062132.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8062141.js b/test/nashorn/script/basic/JDK-8062141.js similarity index 100% rename from nashorn/test/script/basic/JDK-8062141.js rename to test/nashorn/script/basic/JDK-8062141.js diff --git a/nashorn/test/script/basic/JDK-8062141.js.EXPECTED b/test/nashorn/script/basic/JDK-8062141.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8062141.js.EXPECTED rename to test/nashorn/script/basic/JDK-8062141.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8062381.js b/test/nashorn/script/basic/JDK-8062381.js similarity index 100% rename from nashorn/test/script/basic/JDK-8062381.js rename to test/nashorn/script/basic/JDK-8062381.js diff --git a/nashorn/test/script/basic/JDK-8062381.js.EXPECTED b/test/nashorn/script/basic/JDK-8062381.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8062381.js.EXPECTED rename to test/nashorn/script/basic/JDK-8062381.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8062583.js b/test/nashorn/script/basic/JDK-8062583.js similarity index 100% rename from nashorn/test/script/basic/JDK-8062583.js rename to test/nashorn/script/basic/JDK-8062583.js diff --git a/nashorn/test/script/basic/JDK-8062583.js.EXPECTED b/test/nashorn/script/basic/JDK-8062583.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8062583.js.EXPECTED rename to test/nashorn/script/basic/JDK-8062583.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8062624.js b/test/nashorn/script/basic/JDK-8062624.js similarity index 100% rename from nashorn/test/script/basic/JDK-8062624.js rename to test/nashorn/script/basic/JDK-8062624.js diff --git a/nashorn/test/script/basic/JDK-8062624.js.EXPECTED b/test/nashorn/script/basic/JDK-8062624.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8062624.js.EXPECTED rename to test/nashorn/script/basic/JDK-8062624.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8062799.js b/test/nashorn/script/basic/JDK-8062799.js similarity index 100% rename from nashorn/test/script/basic/JDK-8062799.js rename to test/nashorn/script/basic/JDK-8062799.js diff --git a/nashorn/test/script/basic/JDK-8062799.js.EXPECTED b/test/nashorn/script/basic/JDK-8062799.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8062799.js.EXPECTED rename to test/nashorn/script/basic/JDK-8062799.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8062937.js b/test/nashorn/script/basic/JDK-8062937.js similarity index 100% rename from nashorn/test/script/basic/JDK-8062937.js rename to test/nashorn/script/basic/JDK-8062937.js diff --git a/nashorn/test/script/basic/JDK-8062937.js.EXPECTED b/test/nashorn/script/basic/JDK-8062937.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8062937.js.EXPECTED rename to test/nashorn/script/basic/JDK-8062937.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066214.js b/test/nashorn/script/basic/JDK-8066214.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066214.js rename to test/nashorn/script/basic/JDK-8066214.js diff --git a/nashorn/test/script/basic/JDK-8066214.js.EXPECTED b/test/nashorn/script/basic/JDK-8066214.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8066214.js.EXPECTED rename to test/nashorn/script/basic/JDK-8066214.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066215.js b/test/nashorn/script/basic/JDK-8066215.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066215.js rename to test/nashorn/script/basic/JDK-8066215.js diff --git a/nashorn/test/script/basic/JDK-8066215.js.EXPECTED b/test/nashorn/script/basic/JDK-8066215.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8066215.js.EXPECTED rename to test/nashorn/script/basic/JDK-8066215.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066220.js b/test/nashorn/script/basic/JDK-8066220.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066220.js rename to test/nashorn/script/basic/JDK-8066220.js diff --git a/nashorn/test/script/basic/JDK-8066220.js.EXPECTED b/test/nashorn/script/basic/JDK-8066220.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8066220.js.EXPECTED rename to test/nashorn/script/basic/JDK-8066220.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066221.js b/test/nashorn/script/basic/JDK-8066221.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066221.js rename to test/nashorn/script/basic/JDK-8066221.js diff --git a/nashorn/test/script/basic/JDK-8066222.js b/test/nashorn/script/basic/JDK-8066222.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066222.js rename to test/nashorn/script/basic/JDK-8066222.js diff --git a/nashorn/test/script/basic/JDK-8066222.js.EXPECTED b/test/nashorn/script/basic/JDK-8066222.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8066222.js.EXPECTED rename to test/nashorn/script/basic/JDK-8066222.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066224.js b/test/nashorn/script/basic/JDK-8066224.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066224.js rename to test/nashorn/script/basic/JDK-8066224.js diff --git a/nashorn/test/script/basic/JDK-8066224.js.EXPECTED b/test/nashorn/script/basic/JDK-8066224.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8066224.js.EXPECTED rename to test/nashorn/script/basic/JDK-8066224.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066225.js b/test/nashorn/script/basic/JDK-8066225.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066225.js rename to test/nashorn/script/basic/JDK-8066225.js diff --git a/nashorn/test/script/basic/JDK-8066225.js.EXPECTED b/test/nashorn/script/basic/JDK-8066225.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8066225.js.EXPECTED rename to test/nashorn/script/basic/JDK-8066225.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066226.js b/test/nashorn/script/basic/JDK-8066226.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066226.js rename to test/nashorn/script/basic/JDK-8066226.js diff --git a/nashorn/test/script/basic/JDK-8066226.js.EXPECTED b/test/nashorn/script/basic/JDK-8066226.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8066226.js.EXPECTED rename to test/nashorn/script/basic/JDK-8066226.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066227.js b/test/nashorn/script/basic/JDK-8066227.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066227.js rename to test/nashorn/script/basic/JDK-8066227.js diff --git a/nashorn/test/script/basic/JDK-8066227.js.EXPECTED b/test/nashorn/script/basic/JDK-8066227.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8066227.js.EXPECTED rename to test/nashorn/script/basic/JDK-8066227.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066229.js b/test/nashorn/script/basic/JDK-8066229.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066229.js rename to test/nashorn/script/basic/JDK-8066229.js diff --git a/nashorn/test/script/basic/JDK-8066230.js b/test/nashorn/script/basic/JDK-8066230.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066230.js rename to test/nashorn/script/basic/JDK-8066230.js diff --git a/nashorn/test/script/basic/JDK-8066230.js.EXPECTED b/test/nashorn/script/basic/JDK-8066230.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8066230.js.EXPECTED rename to test/nashorn/script/basic/JDK-8066230.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066232.js b/test/nashorn/script/basic/JDK-8066232.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066232.js rename to test/nashorn/script/basic/JDK-8066232.js diff --git a/nashorn/test/script/basic/JDK-8066232.js.EXPECTED b/test/nashorn/script/basic/JDK-8066232.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8066232.js.EXPECTED rename to test/nashorn/script/basic/JDK-8066232.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066236.js b/test/nashorn/script/basic/JDK-8066236.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066236.js rename to test/nashorn/script/basic/JDK-8066236.js diff --git a/nashorn/test/script/basic/JDK-8066236.js.EXPECTED b/test/nashorn/script/basic/JDK-8066236.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8066236.js.EXPECTED rename to test/nashorn/script/basic/JDK-8066236.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066237.js b/test/nashorn/script/basic/JDK-8066237.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066237.js rename to test/nashorn/script/basic/JDK-8066237.js diff --git a/nashorn/test/script/basic/JDK-8066238.js b/test/nashorn/script/basic/JDK-8066238.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066238.js rename to test/nashorn/script/basic/JDK-8066238.js diff --git a/nashorn/test/script/basic/JDK-8066407.js b/test/nashorn/script/basic/JDK-8066407.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066407.js rename to test/nashorn/script/basic/JDK-8066407.js diff --git a/nashorn/test/script/basic/JDK-8066669.js b/test/nashorn/script/basic/JDK-8066669.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066669.js rename to test/nashorn/script/basic/JDK-8066669.js diff --git a/nashorn/test/script/basic/JDK-8066669.js.EXPECTED b/test/nashorn/script/basic/JDK-8066669.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8066669.js.EXPECTED rename to test/nashorn/script/basic/JDK-8066669.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8066932.js b/test/nashorn/script/basic/JDK-8066932.js similarity index 100% rename from nashorn/test/script/basic/JDK-8066932.js rename to test/nashorn/script/basic/JDK-8066932.js diff --git a/nashorn/test/script/basic/JDK-8067136.js b/test/nashorn/script/basic/JDK-8067136.js similarity index 100% rename from nashorn/test/script/basic/JDK-8067136.js rename to test/nashorn/script/basic/JDK-8067136.js diff --git a/nashorn/test/script/basic/JDK-8067136.js.EXPECTED b/test/nashorn/script/basic/JDK-8067136.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8067136.js.EXPECTED rename to test/nashorn/script/basic/JDK-8067136.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8067139.js b/test/nashorn/script/basic/JDK-8067139.js similarity index 100% rename from nashorn/test/script/basic/JDK-8067139.js rename to test/nashorn/script/basic/JDK-8067139.js diff --git a/nashorn/test/script/basic/JDK-8067774.js b/test/nashorn/script/basic/JDK-8067774.js similarity index 100% rename from nashorn/test/script/basic/JDK-8067774.js rename to test/nashorn/script/basic/JDK-8067774.js diff --git a/nashorn/test/script/basic/JDK-8067774.js.EXPECTED b/test/nashorn/script/basic/JDK-8067774.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8067774.js.EXPECTED rename to test/nashorn/script/basic/JDK-8067774.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8068573.js b/test/nashorn/script/basic/JDK-8068573.js similarity index 100% rename from nashorn/test/script/basic/JDK-8068573.js rename to test/nashorn/script/basic/JDK-8068573.js diff --git a/nashorn/test/script/basic/JDK-8068580.js b/test/nashorn/script/basic/JDK-8068580.js similarity index 100% rename from nashorn/test/script/basic/JDK-8068580.js rename to test/nashorn/script/basic/JDK-8068580.js diff --git a/nashorn/test/script/basic/JDK-8068872.js b/test/nashorn/script/basic/JDK-8068872.js similarity index 100% rename from nashorn/test/script/basic/JDK-8068872.js rename to test/nashorn/script/basic/JDK-8068872.js diff --git a/nashorn/test/script/basic/JDK-8068872.js.EXPECTED b/test/nashorn/script/basic/JDK-8068872.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8068872.js.EXPECTED rename to test/nashorn/script/basic/JDK-8068872.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8068901.js b/test/nashorn/script/basic/JDK-8068901.js similarity index 100% rename from nashorn/test/script/basic/JDK-8068901.js rename to test/nashorn/script/basic/JDK-8068901.js diff --git a/nashorn/test/script/basic/JDK-8068901.js.EXPECTED b/test/nashorn/script/basic/JDK-8068901.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8068901.js.EXPECTED rename to test/nashorn/script/basic/JDK-8068901.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8068903.js b/test/nashorn/script/basic/JDK-8068903.js similarity index 100% rename from nashorn/test/script/basic/JDK-8068903.js rename to test/nashorn/script/basic/JDK-8068903.js diff --git a/nashorn/test/script/basic/JDK-8068972.js b/test/nashorn/script/basic/JDK-8068972.js similarity index 100% rename from nashorn/test/script/basic/JDK-8068972.js rename to test/nashorn/script/basic/JDK-8068972.js diff --git a/nashorn/test/script/basic/JDK-8068985.js b/test/nashorn/script/basic/JDK-8068985.js similarity index 100% rename from nashorn/test/script/basic/JDK-8068985.js rename to test/nashorn/script/basic/JDK-8068985.js diff --git a/nashorn/test/script/basic/JDK-8068985.js.EXPECTED b/test/nashorn/script/basic/JDK-8068985.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8068985.js.EXPECTED rename to test/nashorn/script/basic/JDK-8068985.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8069002.js b/test/nashorn/script/basic/JDK-8069002.js similarity index 100% rename from nashorn/test/script/basic/JDK-8069002.js rename to test/nashorn/script/basic/JDK-8069002.js diff --git a/nashorn/test/script/basic/JDK-8071928.js b/test/nashorn/script/basic/JDK-8071928.js similarity index 100% rename from nashorn/test/script/basic/JDK-8071928.js rename to test/nashorn/script/basic/JDK-8071928.js diff --git a/nashorn/test/script/basic/JDK-8072426.js b/test/nashorn/script/basic/JDK-8072426.js similarity index 100% rename from nashorn/test/script/basic/JDK-8072426.js rename to test/nashorn/script/basic/JDK-8072426.js diff --git a/nashorn/test/script/basic/JDK-8072596.js b/test/nashorn/script/basic/JDK-8072596.js similarity index 100% rename from nashorn/test/script/basic/JDK-8072596.js rename to test/nashorn/script/basic/JDK-8072596.js diff --git a/nashorn/test/script/basic/JDK-8073640.js b/test/nashorn/script/basic/JDK-8073640.js similarity index 100% rename from nashorn/test/script/basic/JDK-8073640.js rename to test/nashorn/script/basic/JDK-8073640.js diff --git a/nashorn/test/script/basic/JDK-8073640.js.EXPECTED b/test/nashorn/script/basic/JDK-8073640.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8073640.js.EXPECTED rename to test/nashorn/script/basic/JDK-8073640.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8073653.js b/test/nashorn/script/basic/JDK-8073653.js similarity index 100% rename from nashorn/test/script/basic/JDK-8073653.js rename to test/nashorn/script/basic/JDK-8073653.js diff --git a/nashorn/test/script/basic/JDK-8073653.js.EXPECTED b/test/nashorn/script/basic/JDK-8073653.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8073653.js.EXPECTED rename to test/nashorn/script/basic/JDK-8073653.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8073733.js b/test/nashorn/script/basic/JDK-8073733.js similarity index 100% rename from nashorn/test/script/basic/JDK-8073733.js rename to test/nashorn/script/basic/JDK-8073733.js diff --git a/nashorn/test/script/basic/JDK-8073733.js.EXPECTED b/test/nashorn/script/basic/JDK-8073733.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8073733.js.EXPECTED rename to test/nashorn/script/basic/JDK-8073733.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8073846.js b/test/nashorn/script/basic/JDK-8073846.js similarity index 100% rename from nashorn/test/script/basic/JDK-8073846.js rename to test/nashorn/script/basic/JDK-8073846.js diff --git a/nashorn/test/script/basic/JDK-8073868.js b/test/nashorn/script/basic/JDK-8073868.js similarity index 100% rename from nashorn/test/script/basic/JDK-8073868.js rename to test/nashorn/script/basic/JDK-8073868.js diff --git a/nashorn/test/script/basic/JDK-8074021.js b/test/nashorn/script/basic/JDK-8074021.js similarity index 100% rename from nashorn/test/script/basic/JDK-8074021.js rename to test/nashorn/script/basic/JDK-8074021.js diff --git a/nashorn/test/script/basic/JDK-8074021.js.EXPECTED b/test/nashorn/script/basic/JDK-8074021.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8074021.js.EXPECTED rename to test/nashorn/script/basic/JDK-8074021.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8074545.js b/test/nashorn/script/basic/JDK-8074545.js similarity index 100% rename from nashorn/test/script/basic/JDK-8074545.js rename to test/nashorn/script/basic/JDK-8074545.js diff --git a/nashorn/test/script/basic/JDK-8074556.js b/test/nashorn/script/basic/JDK-8074556.js similarity index 100% rename from nashorn/test/script/basic/JDK-8074556.js rename to test/nashorn/script/basic/JDK-8074556.js diff --git a/nashorn/test/script/basic/JDK-8074687.js b/test/nashorn/script/basic/JDK-8074687.js similarity index 100% rename from nashorn/test/script/basic/JDK-8074687.js rename to test/nashorn/script/basic/JDK-8074687.js diff --git a/nashorn/test/script/basic/JDK-8074693.js b/test/nashorn/script/basic/JDK-8074693.js similarity index 100% rename from nashorn/test/script/basic/JDK-8074693.js rename to test/nashorn/script/basic/JDK-8074693.js diff --git a/nashorn/test/script/basic/JDK-8074693.js.EXPECTED b/test/nashorn/script/basic/JDK-8074693.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8074693.js.EXPECTED rename to test/nashorn/script/basic/JDK-8074693.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8075090.js b/test/nashorn/script/basic/JDK-8075090.js similarity index 100% rename from nashorn/test/script/basic/JDK-8075090.js rename to test/nashorn/script/basic/JDK-8075090.js diff --git a/nashorn/test/script/basic/JDK-8075207.js b/test/nashorn/script/basic/JDK-8075207.js similarity index 100% rename from nashorn/test/script/basic/JDK-8075207.js rename to test/nashorn/script/basic/JDK-8075207.js diff --git a/nashorn/test/script/basic/JDK-8075448.js b/test/nashorn/script/basic/JDK-8075448.js similarity index 100% rename from nashorn/test/script/basic/JDK-8075448.js rename to test/nashorn/script/basic/JDK-8075448.js diff --git a/nashorn/test/script/basic/JDK-8075454.js b/test/nashorn/script/basic/JDK-8075454.js similarity index 100% rename from nashorn/test/script/basic/JDK-8075454.js rename to test/nashorn/script/basic/JDK-8075454.js diff --git a/nashorn/test/script/basic/JDK-8075927.js b/test/nashorn/script/basic/JDK-8075927.js similarity index 100% rename from nashorn/test/script/basic/JDK-8075927.js rename to test/nashorn/script/basic/JDK-8075927.js diff --git a/nashorn/test/script/basic/JDK-8077149.js b/test/nashorn/script/basic/JDK-8077149.js similarity index 100% rename from nashorn/test/script/basic/JDK-8077149.js rename to test/nashorn/script/basic/JDK-8077149.js diff --git a/nashorn/test/script/basic/JDK-8077955.js b/test/nashorn/script/basic/JDK-8077955.js similarity index 100% rename from nashorn/test/script/basic/JDK-8077955.js rename to test/nashorn/script/basic/JDK-8077955.js diff --git a/nashorn/test/script/basic/JDK-8078612_eager_1a.js b/test/nashorn/script/basic/JDK-8078612_eager_1a.js similarity index 100% rename from nashorn/test/script/basic/JDK-8078612_eager_1a.js rename to test/nashorn/script/basic/JDK-8078612_eager_1a.js diff --git a/nashorn/test/script/basic/JDK-8078612_eager_1a.js.EXPECTED b/test/nashorn/script/basic/JDK-8078612_eager_1a.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8078612_eager_1a.js.EXPECTED rename to test/nashorn/script/basic/JDK-8078612_eager_1a.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8078612_eager_1b.js b/test/nashorn/script/basic/JDK-8078612_eager_1b.js similarity index 100% rename from nashorn/test/script/basic/JDK-8078612_eager_1b.js rename to test/nashorn/script/basic/JDK-8078612_eager_1b.js diff --git a/nashorn/test/script/basic/JDK-8078612_eager_1b.js.EXPECTED b/test/nashorn/script/basic/JDK-8078612_eager_1b.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8078612_eager_1b.js.EXPECTED rename to test/nashorn/script/basic/JDK-8078612_eager_1b.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8078612_eager_2a.js b/test/nashorn/script/basic/JDK-8078612_eager_2a.js similarity index 100% rename from nashorn/test/script/basic/JDK-8078612_eager_2a.js rename to test/nashorn/script/basic/JDK-8078612_eager_2a.js diff --git a/nashorn/test/script/basic/JDK-8078612_eager_2a.js.EXPECTED b/test/nashorn/script/basic/JDK-8078612_eager_2a.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8078612_eager_2a.js.EXPECTED rename to test/nashorn/script/basic/JDK-8078612_eager_2a.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8078612_eager_2b.js b/test/nashorn/script/basic/JDK-8078612_eager_2b.js similarity index 100% rename from nashorn/test/script/basic/JDK-8078612_eager_2b.js rename to test/nashorn/script/basic/JDK-8078612_eager_2b.js diff --git a/nashorn/test/script/basic/JDK-8078612_eager_2b.js.EXPECTED b/test/nashorn/script/basic/JDK-8078612_eager_2b.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8078612_eager_2b.js.EXPECTED rename to test/nashorn/script/basic/JDK-8078612_eager_2b.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8079145.js b/test/nashorn/script/basic/JDK-8079145.js similarity index 100% rename from nashorn/test/script/basic/JDK-8079145.js rename to test/nashorn/script/basic/JDK-8079145.js diff --git a/nashorn/test/script/basic/JDK-8079145.js.EXPECTED b/test/nashorn/script/basic/JDK-8079145.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8079145.js.EXPECTED rename to test/nashorn/script/basic/JDK-8079145.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8079269.js b/test/nashorn/script/basic/JDK-8079269.js similarity index 100% rename from nashorn/test/script/basic/JDK-8079269.js rename to test/nashorn/script/basic/JDK-8079269.js diff --git a/nashorn/test/script/basic/JDK-8079424.js b/test/nashorn/script/basic/JDK-8079424.js similarity index 100% rename from nashorn/test/script/basic/JDK-8079424.js rename to test/nashorn/script/basic/JDK-8079424.js diff --git a/nashorn/test/script/basic/JDK-8079470.js b/test/nashorn/script/basic/JDK-8079470.js similarity index 100% rename from nashorn/test/script/basic/JDK-8079470.js rename to test/nashorn/script/basic/JDK-8079470.js diff --git a/nashorn/test/script/basic/JDK-8079470.js.EXPECTED b/test/nashorn/script/basic/JDK-8079470.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8079470.js.EXPECTED rename to test/nashorn/script/basic/JDK-8079470.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8080182.js b/test/nashorn/script/basic/JDK-8080182.js similarity index 100% rename from nashorn/test/script/basic/JDK-8080182.js rename to test/nashorn/script/basic/JDK-8080182.js diff --git a/nashorn/test/script/basic/JDK-8080848.js b/test/nashorn/script/basic/JDK-8080848.js similarity index 100% rename from nashorn/test/script/basic/JDK-8080848.js rename to test/nashorn/script/basic/JDK-8080848.js diff --git a/nashorn/test/script/basic/JDK-8081156.js b/test/nashorn/script/basic/JDK-8081156.js similarity index 100% rename from nashorn/test/script/basic/JDK-8081156.js rename to test/nashorn/script/basic/JDK-8081156.js diff --git a/nashorn/test/script/basic/JDK-8085802.js b/test/nashorn/script/basic/JDK-8085802.js similarity index 100% rename from nashorn/test/script/basic/JDK-8085802.js rename to test/nashorn/script/basic/JDK-8085802.js diff --git a/nashorn/test/script/basic/JDK-8087211.js b/test/nashorn/script/basic/JDK-8087211.js similarity index 100% rename from nashorn/test/script/basic/JDK-8087211.js rename to test/nashorn/script/basic/JDK-8087211.js diff --git a/nashorn/test/script/basic/JDK-8087211_2.js b/test/nashorn/script/basic/JDK-8087211_2.js similarity index 100% rename from nashorn/test/script/basic/JDK-8087211_2.js rename to test/nashorn/script/basic/JDK-8087211_2.js diff --git a/nashorn/test/script/basic/JDK-8087312.js b/test/nashorn/script/basic/JDK-8087312.js similarity index 100% rename from nashorn/test/script/basic/JDK-8087312.js rename to test/nashorn/script/basic/JDK-8087312.js diff --git a/nashorn/test/script/basic/JDK-8098546.js b/test/nashorn/script/basic/JDK-8098546.js similarity index 100% rename from nashorn/test/script/basic/JDK-8098546.js rename to test/nashorn/script/basic/JDK-8098546.js diff --git a/nashorn/test/script/basic/JDK-8098578.js b/test/nashorn/script/basic/JDK-8098578.js similarity index 100% rename from nashorn/test/script/basic/JDK-8098578.js rename to test/nashorn/script/basic/JDK-8098578.js diff --git a/nashorn/test/script/basic/JDK-8098807-payload.js b/test/nashorn/script/basic/JDK-8098807-payload.js similarity index 100% rename from nashorn/test/script/basic/JDK-8098807-payload.js rename to test/nashorn/script/basic/JDK-8098807-payload.js diff --git a/nashorn/test/script/basic/JDK-8098807.js b/test/nashorn/script/basic/JDK-8098807.js similarity index 100% rename from nashorn/test/script/basic/JDK-8098807.js rename to test/nashorn/script/basic/JDK-8098807.js diff --git a/nashorn/test/script/basic/JDK-8114838.js b/test/nashorn/script/basic/JDK-8114838.js similarity index 100% rename from nashorn/test/script/basic/JDK-8114838.js rename to test/nashorn/script/basic/JDK-8114838.js diff --git a/nashorn/test/script/basic/JDK-8129410.js b/test/nashorn/script/basic/JDK-8129410.js similarity index 100% rename from nashorn/test/script/basic/JDK-8129410.js rename to test/nashorn/script/basic/JDK-8129410.js diff --git a/nashorn/test/script/basic/JDK-8130853.js b/test/nashorn/script/basic/JDK-8130853.js similarity index 100% rename from nashorn/test/script/basic/JDK-8130853.js rename to test/nashorn/script/basic/JDK-8130853.js diff --git a/nashorn/test/script/basic/JDK-8131039.js b/test/nashorn/script/basic/JDK-8131039.js similarity index 100% rename from nashorn/test/script/basic/JDK-8131039.js rename to test/nashorn/script/basic/JDK-8131039.js diff --git a/nashorn/test/script/basic/JDK-8131340.js b/test/nashorn/script/basic/JDK-8131340.js similarity index 100% rename from nashorn/test/script/basic/JDK-8131340.js rename to test/nashorn/script/basic/JDK-8131340.js diff --git a/nashorn/test/script/basic/JDK-8131683.js b/test/nashorn/script/basic/JDK-8131683.js similarity index 100% rename from nashorn/test/script/basic/JDK-8131683.js rename to test/nashorn/script/basic/JDK-8131683.js diff --git a/nashorn/test/script/basic/JDK-8131683.js.EXPECTED b/test/nashorn/script/basic/JDK-8131683.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8131683.js.EXPECTED rename to test/nashorn/script/basic/JDK-8131683.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8131929.js b/test/nashorn/script/basic/JDK-8131929.js similarity index 100% rename from nashorn/test/script/basic/JDK-8131929.js rename to test/nashorn/script/basic/JDK-8131929.js diff --git a/nashorn/test/script/basic/JDK-8131929_prototype.js b/test/nashorn/script/basic/JDK-8131929_prototype.js similarity index 100% rename from nashorn/test/script/basic/JDK-8131929_prototype.js rename to test/nashorn/script/basic/JDK-8131929_prototype.js diff --git a/nashorn/test/script/basic/JDK-8131929_prototype.js.EXPECTED b/test/nashorn/script/basic/JDK-8131929_prototype.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8131929_prototype.js.EXPECTED rename to test/nashorn/script/basic/JDK-8131929_prototype.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8131929_yui.js b/test/nashorn/script/basic/JDK-8131929_yui.js similarity index 100% rename from nashorn/test/script/basic/JDK-8131929_yui.js rename to test/nashorn/script/basic/JDK-8131929_yui.js diff --git a/nashorn/test/script/basic/JDK-8131929_yui.js.EXPECTED b/test/nashorn/script/basic/JDK-8131929_yui.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8131929_yui.js.EXPECTED rename to test/nashorn/script/basic/JDK-8131929_yui.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8133119.js b/test/nashorn/script/basic/JDK-8133119.js similarity index 100% rename from nashorn/test/script/basic/JDK-8133119.js rename to test/nashorn/script/basic/JDK-8133119.js diff --git a/nashorn/test/script/basic/JDK-8133119.js.EXPECTED b/test/nashorn/script/basic/JDK-8133119.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8133119.js.EXPECTED rename to test/nashorn/script/basic/JDK-8133119.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8134488.js b/test/nashorn/script/basic/JDK-8134488.js similarity index 100% rename from nashorn/test/script/basic/JDK-8134488.js rename to test/nashorn/script/basic/JDK-8134488.js diff --git a/nashorn/test/script/basic/JDK-8134488.js.EXPECTED b/test/nashorn/script/basic/JDK-8134488.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8134488.js.EXPECTED rename to test/nashorn/script/basic/JDK-8134488.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8134490.js b/test/nashorn/script/basic/JDK-8134490.js similarity index 100% rename from nashorn/test/script/basic/JDK-8134490.js rename to test/nashorn/script/basic/JDK-8134490.js diff --git a/nashorn/test/script/basic/JDK-8134569.js b/test/nashorn/script/basic/JDK-8134569.js similarity index 100% rename from nashorn/test/script/basic/JDK-8134569.js rename to test/nashorn/script/basic/JDK-8134569.js diff --git a/nashorn/test/script/basic/JDK-8134569.js.EXPECTED b/test/nashorn/script/basic/JDK-8134569.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8134569.js.EXPECTED rename to test/nashorn/script/basic/JDK-8134569.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8134609.js b/test/nashorn/script/basic/JDK-8134609.js similarity index 100% rename from nashorn/test/script/basic/JDK-8134609.js rename to test/nashorn/script/basic/JDK-8134609.js diff --git a/nashorn/test/script/basic/JDK-8134731.js b/test/nashorn/script/basic/JDK-8134731.js similarity index 100% rename from nashorn/test/script/basic/JDK-8134731.js rename to test/nashorn/script/basic/JDK-8134731.js diff --git a/nashorn/test/script/basic/JDK-8134865.js b/test/nashorn/script/basic/JDK-8134865.js similarity index 100% rename from nashorn/test/script/basic/JDK-8134865.js rename to test/nashorn/script/basic/JDK-8134865.js diff --git a/nashorn/test/script/basic/JDK-8134939.js b/test/nashorn/script/basic/JDK-8134939.js similarity index 100% rename from nashorn/test/script/basic/JDK-8134939.js rename to test/nashorn/script/basic/JDK-8134939.js diff --git a/nashorn/test/script/basic/JDK-8135000.js b/test/nashorn/script/basic/JDK-8135000.js similarity index 100% rename from nashorn/test/script/basic/JDK-8135000.js rename to test/nashorn/script/basic/JDK-8135000.js diff --git a/nashorn/test/script/basic/JDK-8135000.js.EXPECTED b/test/nashorn/script/basic/JDK-8135000.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8135000.js.EXPECTED rename to test/nashorn/script/basic/JDK-8135000.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8135190.js b/test/nashorn/script/basic/JDK-8135190.js similarity index 100% rename from nashorn/test/script/basic/JDK-8135190.js rename to test/nashorn/script/basic/JDK-8135190.js diff --git a/nashorn/test/script/basic/JDK-8136544.js b/test/nashorn/script/basic/JDK-8136544.js similarity index 100% rename from nashorn/test/script/basic/JDK-8136544.js rename to test/nashorn/script/basic/JDK-8136544.js diff --git a/nashorn/test/script/basic/JDK-8136694.js b/test/nashorn/script/basic/JDK-8136694.js similarity index 100% rename from nashorn/test/script/basic/JDK-8136694.js rename to test/nashorn/script/basic/JDK-8136694.js diff --git a/nashorn/test/script/basic/JDK-8137134.js b/test/nashorn/script/basic/JDK-8137134.js similarity index 100% rename from nashorn/test/script/basic/JDK-8137134.js rename to test/nashorn/script/basic/JDK-8137134.js diff --git a/nashorn/test/script/basic/JDK-8137134.js.EXPECTED b/test/nashorn/script/basic/JDK-8137134.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8137134.js.EXPECTED rename to test/nashorn/script/basic/JDK-8137134.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8137240.js b/test/nashorn/script/basic/JDK-8137240.js similarity index 100% rename from nashorn/test/script/basic/JDK-8137240.js rename to test/nashorn/script/basic/JDK-8137240.js diff --git a/nashorn/test/script/basic/JDK-8137281.js b/test/nashorn/script/basic/JDK-8137281.js similarity index 100% rename from nashorn/test/script/basic/JDK-8137281.js rename to test/nashorn/script/basic/JDK-8137281.js diff --git a/nashorn/test/script/basic/JDK-8138632.js b/test/nashorn/script/basic/JDK-8138632.js similarity index 100% rename from nashorn/test/script/basic/JDK-8138632.js rename to test/nashorn/script/basic/JDK-8138632.js diff --git a/nashorn/test/script/basic/JDK-8138632.js.EXPECTED b/test/nashorn/script/basic/JDK-8138632.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8138632.js.EXPECTED rename to test/nashorn/script/basic/JDK-8138632.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8138758.js b/test/nashorn/script/basic/JDK-8138758.js similarity index 100% rename from nashorn/test/script/basic/JDK-8138758.js rename to test/nashorn/script/basic/JDK-8138758.js diff --git a/nashorn/test/script/basic/JDK-8141407.js b/test/nashorn/script/basic/JDK-8141407.js similarity index 100% rename from nashorn/test/script/basic/JDK-8141407.js rename to test/nashorn/script/basic/JDK-8141407.js diff --git a/nashorn/test/script/basic/JDK-8141505.js b/test/nashorn/script/basic/JDK-8141505.js similarity index 100% rename from nashorn/test/script/basic/JDK-8141505.js rename to test/nashorn/script/basic/JDK-8141505.js diff --git a/nashorn/test/script/basic/JDK-8143304.js b/test/nashorn/script/basic/JDK-8143304.js similarity index 100% rename from nashorn/test/script/basic/JDK-8143304.js rename to test/nashorn/script/basic/JDK-8143304.js diff --git a/nashorn/test/script/basic/JDK-8143896.js b/test/nashorn/script/basic/JDK-8143896.js similarity index 100% rename from nashorn/test/script/basic/JDK-8143896.js rename to test/nashorn/script/basic/JDK-8143896.js diff --git a/nashorn/test/script/basic/JDK-8144020.js b/test/nashorn/script/basic/JDK-8144020.js similarity index 100% rename from nashorn/test/script/basic/JDK-8144020.js rename to test/nashorn/script/basic/JDK-8144020.js diff --git a/nashorn/test/script/basic/JDK-8144131.js b/test/nashorn/script/basic/JDK-8144131.js similarity index 100% rename from nashorn/test/script/basic/JDK-8144131.js rename to test/nashorn/script/basic/JDK-8144131.js diff --git a/nashorn/test/script/basic/JDK-8144711.js b/test/nashorn/script/basic/JDK-8144711.js similarity index 100% rename from nashorn/test/script/basic/JDK-8144711.js rename to test/nashorn/script/basic/JDK-8144711.js diff --git a/nashorn/test/script/basic/JDK-8145550.js b/test/nashorn/script/basic/JDK-8145550.js similarity index 100% rename from nashorn/test/script/basic/JDK-8145550.js rename to test/nashorn/script/basic/JDK-8145550.js diff --git a/nashorn/test/script/basic/JDK-8146147.js b/test/nashorn/script/basic/JDK-8146147.js similarity index 100% rename from nashorn/test/script/basic/JDK-8146147.js rename to test/nashorn/script/basic/JDK-8146147.js diff --git a/nashorn/test/script/basic/JDK-8147845.js b/test/nashorn/script/basic/JDK-8147845.js similarity index 100% rename from nashorn/test/script/basic/JDK-8147845.js rename to test/nashorn/script/basic/JDK-8147845.js diff --git a/nashorn/test/script/basic/JDK-8150218.js b/test/nashorn/script/basic/JDK-8150218.js similarity index 100% rename from nashorn/test/script/basic/JDK-8150218.js rename to test/nashorn/script/basic/JDK-8150218.js diff --git a/nashorn/test/script/basic/JDK-8155025.js b/test/nashorn/script/basic/JDK-8155025.js similarity index 100% rename from nashorn/test/script/basic/JDK-8155025.js rename to test/nashorn/script/basic/JDK-8155025.js diff --git a/nashorn/test/script/basic/JDK-8155025.js.EXPECTED b/test/nashorn/script/basic/JDK-8155025.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8155025.js.EXPECTED rename to test/nashorn/script/basic/JDK-8155025.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8156714.js b/test/nashorn/script/basic/JDK-8156714.js similarity index 100% rename from nashorn/test/script/basic/JDK-8156714.js rename to test/nashorn/script/basic/JDK-8156714.js diff --git a/nashorn/test/script/basic/JDK-8156896.js b/test/nashorn/script/basic/JDK-8156896.js similarity index 100% rename from nashorn/test/script/basic/JDK-8156896.js rename to test/nashorn/script/basic/JDK-8156896.js diff --git a/nashorn/test/script/basic/JDK-8157160.js b/test/nashorn/script/basic/JDK-8157160.js similarity index 100% rename from nashorn/test/script/basic/JDK-8157160.js rename to test/nashorn/script/basic/JDK-8157160.js diff --git a/nashorn/test/script/basic/JDK-8157160.js.EXPECTED b/test/nashorn/script/basic/JDK-8157160.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8157160.js.EXPECTED rename to test/nashorn/script/basic/JDK-8157160.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8157250.js b/test/nashorn/script/basic/JDK-8157250.js similarity index 100% rename from nashorn/test/script/basic/JDK-8157250.js rename to test/nashorn/script/basic/JDK-8157250.js diff --git a/nashorn/test/script/basic/JDK-8157680.js b/test/nashorn/script/basic/JDK-8157680.js similarity index 100% rename from nashorn/test/script/basic/JDK-8157680.js rename to test/nashorn/script/basic/JDK-8157680.js diff --git a/nashorn/test/script/basic/JDK-8157680.js.EXPECTED b/test/nashorn/script/basic/JDK-8157680.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8157680.js.EXPECTED rename to test/nashorn/script/basic/JDK-8157680.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8157819.js b/test/nashorn/script/basic/JDK-8157819.js similarity index 100% rename from nashorn/test/script/basic/JDK-8157819.js rename to test/nashorn/script/basic/JDK-8157819.js diff --git a/nashorn/test/script/basic/JDK-8158467.js b/test/nashorn/script/basic/JDK-8158467.js similarity index 100% rename from nashorn/test/script/basic/JDK-8158467.js rename to test/nashorn/script/basic/JDK-8158467.js diff --git a/nashorn/test/script/basic/JDK-8158467.js.EXPECTED b/test/nashorn/script/basic/JDK-8158467.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8158467.js.EXPECTED rename to test/nashorn/script/basic/JDK-8158467.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8160034.js b/test/nashorn/script/basic/JDK-8160034.js similarity index 100% rename from nashorn/test/script/basic/JDK-8160034.js rename to test/nashorn/script/basic/JDK-8160034.js diff --git a/nashorn/test/script/basic/JDK-8160034.js.EXPECTED b/test/nashorn/script/basic/JDK-8160034.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8160034.js.EXPECTED rename to test/nashorn/script/basic/JDK-8160034.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8161579.js b/test/nashorn/script/basic/JDK-8161579.js similarity index 100% rename from nashorn/test/script/basic/JDK-8161579.js rename to test/nashorn/script/basic/JDK-8161579.js diff --git a/nashorn/test/script/basic/JDK-8162771.js b/test/nashorn/script/basic/JDK-8162771.js similarity index 100% rename from nashorn/test/script/basic/JDK-8162771.js rename to test/nashorn/script/basic/JDK-8162771.js diff --git a/nashorn/test/script/basic/JDK-8163945.js b/test/nashorn/script/basic/JDK-8163945.js similarity index 100% rename from nashorn/test/script/basic/JDK-8163945.js rename to test/nashorn/script/basic/JDK-8163945.js diff --git a/nashorn/test/script/basic/JDK-8164708.js b/test/nashorn/script/basic/JDK-8164708.js similarity index 100% rename from nashorn/test/script/basic/JDK-8164708.js rename to test/nashorn/script/basic/JDK-8164708.js diff --git a/nashorn/test/script/basic/JDK-8166186.js b/test/nashorn/script/basic/JDK-8166186.js similarity index 100% rename from nashorn/test/script/basic/JDK-8166186.js rename to test/nashorn/script/basic/JDK-8166186.js diff --git a/nashorn/test/script/basic/JDK-8166186.js.EXPECTED b/test/nashorn/script/basic/JDK-8166186.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8166186.js.EXPECTED rename to test/nashorn/script/basic/JDK-8166186.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8166902.js b/test/nashorn/script/basic/JDK-8166902.js similarity index 100% rename from nashorn/test/script/basic/JDK-8166902.js rename to test/nashorn/script/basic/JDK-8166902.js diff --git a/nashorn/test/script/basic/JDK-8168146.js b/test/nashorn/script/basic/JDK-8168146.js similarity index 100% rename from nashorn/test/script/basic/JDK-8168146.js rename to test/nashorn/script/basic/JDK-8168146.js diff --git a/nashorn/test/script/basic/JDK-8169233.js b/test/nashorn/script/basic/JDK-8169233.js similarity index 100% rename from nashorn/test/script/basic/JDK-8169233.js rename to test/nashorn/script/basic/JDK-8169233.js diff --git a/nashorn/test/script/basic/JDK-8169233.js.EXPECTED b/test/nashorn/script/basic/JDK-8169233.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8169233.js.EXPECTED rename to test/nashorn/script/basic/JDK-8169233.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8169886.js b/test/nashorn/script/basic/JDK-8169886.js similarity index 100% rename from nashorn/test/script/basic/JDK-8169886.js rename to test/nashorn/script/basic/JDK-8169886.js diff --git a/nashorn/test/script/basic/JDK-8170322.js b/test/nashorn/script/basic/JDK-8170322.js similarity index 100% rename from nashorn/test/script/basic/JDK-8170322.js rename to test/nashorn/script/basic/JDK-8170322.js diff --git a/nashorn/test/script/basic/JDK-8170594.js b/test/nashorn/script/basic/JDK-8170594.js similarity index 100% rename from nashorn/test/script/basic/JDK-8170594.js rename to test/nashorn/script/basic/JDK-8170594.js diff --git a/nashorn/test/script/basic/JDK-8171219.js b/test/nashorn/script/basic/JDK-8171219.js similarity index 100% rename from nashorn/test/script/basic/JDK-8171219.js rename to test/nashorn/script/basic/JDK-8171219.js diff --git a/nashorn/test/script/basic/JDK-8171849.js b/test/nashorn/script/basic/JDK-8171849.js similarity index 100% rename from nashorn/test/script/basic/JDK-8171849.js rename to test/nashorn/script/basic/JDK-8171849.js diff --git a/nashorn/test/script/basic/JDK-8172006.js b/test/nashorn/script/basic/JDK-8172006.js similarity index 100% rename from nashorn/test/script/basic/JDK-8172006.js rename to test/nashorn/script/basic/JDK-8172006.js diff --git a/nashorn/test/script/basic/JDK-8173480.js b/test/nashorn/script/basic/JDK-8173480.js similarity index 100% rename from nashorn/test/script/basic/JDK-8173480.js rename to test/nashorn/script/basic/JDK-8173480.js diff --git a/nashorn/test/script/basic/JDK-8175362.js b/test/nashorn/script/basic/JDK-8175362.js similarity index 100% rename from nashorn/test/script/basic/JDK-8175362.js rename to test/nashorn/script/basic/JDK-8175362.js diff --git a/nashorn/test/script/basic/JDK-8175362.js.EXPECTED b/test/nashorn/script/basic/JDK-8175362.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8175362.js.EXPECTED rename to test/nashorn/script/basic/JDK-8175362.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8176511.js b/test/nashorn/script/basic/JDK-8176511.js similarity index 100% rename from nashorn/test/script/basic/JDK-8176511.js rename to test/nashorn/script/basic/JDK-8176511.js diff --git a/nashorn/test/script/basic/JDK-8177691.js b/test/nashorn/script/basic/JDK-8177691.js similarity index 100% rename from nashorn/test/script/basic/JDK-8177691.js rename to test/nashorn/script/basic/JDK-8177691.js diff --git a/nashorn/test/script/basic/JDK-8177691.js.EXPECTED b/test/nashorn/script/basic/JDK-8177691.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/JDK-8177691.js.EXPECTED rename to test/nashorn/script/basic/JDK-8177691.js.EXPECTED diff --git a/nashorn/test/script/basic/JDK-8181191.js b/test/nashorn/script/basic/JDK-8181191.js similarity index 100% rename from nashorn/test/script/basic/JDK-8181191.js rename to test/nashorn/script/basic/JDK-8181191.js diff --git a/nashorn/test/script/basic/JDK-8184720.js b/test/nashorn/script/basic/JDK-8184720.js similarity index 100% rename from nashorn/test/script/basic/JDK-8184720.js rename to test/nashorn/script/basic/JDK-8184720.js diff --git a/nashorn/test/script/basic/JDK-8184893.js b/test/nashorn/script/basic/JDK-8184893.js similarity index 100% rename from nashorn/test/script/basic/JDK-8184893.js rename to test/nashorn/script/basic/JDK-8184893.js diff --git a/nashorn/test/script/basic/JDK_8005848.js b/test/nashorn/script/basic/JDK_8005848.js similarity index 100% rename from nashorn/test/script/basic/JDK_8005848.js rename to test/nashorn/script/basic/JDK_8005848.js diff --git a/nashorn/test/script/basic/NASHORN-100.js b/test/nashorn/script/basic/NASHORN-100.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-100.js rename to test/nashorn/script/basic/NASHORN-100.js diff --git a/nashorn/test/script/basic/NASHORN-100.js.EXPECTED b/test/nashorn/script/basic/NASHORN-100.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-100.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-100.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-101.js b/test/nashorn/script/basic/NASHORN-101.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-101.js rename to test/nashorn/script/basic/NASHORN-101.js diff --git a/nashorn/test/script/basic/NASHORN-101.js.EXPECTED b/test/nashorn/script/basic/NASHORN-101.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-101.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-101.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-102.js b/test/nashorn/script/basic/NASHORN-102.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-102.js rename to test/nashorn/script/basic/NASHORN-102.js diff --git a/nashorn/test/script/basic/NASHORN-102.js.EXPECTED b/test/nashorn/script/basic/NASHORN-102.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-102.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-102.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-103.js b/test/nashorn/script/basic/NASHORN-103.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-103.js rename to test/nashorn/script/basic/NASHORN-103.js diff --git a/nashorn/test/script/basic/NASHORN-104.js b/test/nashorn/script/basic/NASHORN-104.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-104.js rename to test/nashorn/script/basic/NASHORN-104.js diff --git a/nashorn/test/script/basic/NASHORN-104.js.EXPECTED b/test/nashorn/script/basic/NASHORN-104.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-104.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-104.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-105.js b/test/nashorn/script/basic/NASHORN-105.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-105.js rename to test/nashorn/script/basic/NASHORN-105.js diff --git a/nashorn/test/script/basic/NASHORN-105.js.EXPECTED b/test/nashorn/script/basic/NASHORN-105.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-105.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-105.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-106.js b/test/nashorn/script/basic/NASHORN-106.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-106.js rename to test/nashorn/script/basic/NASHORN-106.js diff --git a/nashorn/test/script/basic/NASHORN-106.js.EXPECTED b/test/nashorn/script/basic/NASHORN-106.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-106.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-106.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-107.js b/test/nashorn/script/basic/NASHORN-107.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-107.js rename to test/nashorn/script/basic/NASHORN-107.js diff --git a/nashorn/test/script/basic/NASHORN-108.js b/test/nashorn/script/basic/NASHORN-108.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-108.js rename to test/nashorn/script/basic/NASHORN-108.js diff --git a/nashorn/test/script/basic/NASHORN-108.js.EXPECTED b/test/nashorn/script/basic/NASHORN-108.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-108.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-108.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-109.js b/test/nashorn/script/basic/NASHORN-109.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-109.js rename to test/nashorn/script/basic/NASHORN-109.js diff --git a/nashorn/test/script/basic/NASHORN-109.js.EXPECTED b/test/nashorn/script/basic/NASHORN-109.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-109.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-109.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-11.js b/test/nashorn/script/basic/NASHORN-11.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-11.js rename to test/nashorn/script/basic/NASHORN-11.js diff --git a/nashorn/test/script/basic/NASHORN-11.js.EXPECTED b/test/nashorn/script/basic/NASHORN-11.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-11.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-11.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-111.js b/test/nashorn/script/basic/NASHORN-111.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-111.js rename to test/nashorn/script/basic/NASHORN-111.js diff --git a/nashorn/test/script/basic/NASHORN-111.js.EXPECTED b/test/nashorn/script/basic/NASHORN-111.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-111.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-111.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-113.js b/test/nashorn/script/basic/NASHORN-113.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-113.js rename to test/nashorn/script/basic/NASHORN-113.js diff --git a/nashorn/test/script/basic/NASHORN-113.js.EXPECTED b/test/nashorn/script/basic/NASHORN-113.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-113.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-113.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-114.js b/test/nashorn/script/basic/NASHORN-114.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-114.js rename to test/nashorn/script/basic/NASHORN-114.js diff --git a/nashorn/test/script/basic/NASHORN-115.js b/test/nashorn/script/basic/NASHORN-115.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-115.js rename to test/nashorn/script/basic/NASHORN-115.js diff --git a/nashorn/test/script/basic/NASHORN-115.js.EXPECTED b/test/nashorn/script/basic/NASHORN-115.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-115.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-115.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-117.js b/test/nashorn/script/basic/NASHORN-117.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-117.js rename to test/nashorn/script/basic/NASHORN-117.js diff --git a/nashorn/test/script/basic/NASHORN-118.js b/test/nashorn/script/basic/NASHORN-118.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-118.js rename to test/nashorn/script/basic/NASHORN-118.js diff --git a/nashorn/test/script/basic/NASHORN-118.js.EXPECTED b/test/nashorn/script/basic/NASHORN-118.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-118.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-118.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-119.js b/test/nashorn/script/basic/NASHORN-119.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-119.js rename to test/nashorn/script/basic/NASHORN-119.js diff --git a/nashorn/test/script/basic/NASHORN-119.js.EXPECTED b/test/nashorn/script/basic/NASHORN-119.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-119.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-119.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-12.js b/test/nashorn/script/basic/NASHORN-12.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-12.js rename to test/nashorn/script/basic/NASHORN-12.js diff --git a/nashorn/test/script/basic/NASHORN-120.js b/test/nashorn/script/basic/NASHORN-120.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-120.js rename to test/nashorn/script/basic/NASHORN-120.js diff --git a/nashorn/test/script/basic/NASHORN-122.js b/test/nashorn/script/basic/NASHORN-122.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-122.js rename to test/nashorn/script/basic/NASHORN-122.js diff --git a/nashorn/test/script/basic/NASHORN-122.js.EXPECTED b/test/nashorn/script/basic/NASHORN-122.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-122.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-122.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-126.js b/test/nashorn/script/basic/NASHORN-126.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-126.js rename to test/nashorn/script/basic/NASHORN-126.js diff --git a/nashorn/test/script/basic/NASHORN-126.js.EXPECTED b/test/nashorn/script/basic/NASHORN-126.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-126.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-126.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-127.js b/test/nashorn/script/basic/NASHORN-127.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-127.js rename to test/nashorn/script/basic/NASHORN-127.js diff --git a/nashorn/test/script/basic/NASHORN-127.js.EXPECTED b/test/nashorn/script/basic/NASHORN-127.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-127.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-127.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-130.js b/test/nashorn/script/basic/NASHORN-130.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-130.js rename to test/nashorn/script/basic/NASHORN-130.js diff --git a/nashorn/test/script/basic/NASHORN-132.js b/test/nashorn/script/basic/NASHORN-132.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-132.js rename to test/nashorn/script/basic/NASHORN-132.js diff --git a/nashorn/test/script/basic/NASHORN-132.js.EXPECTED b/test/nashorn/script/basic/NASHORN-132.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-132.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-132.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-133.js b/test/nashorn/script/basic/NASHORN-133.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-133.js rename to test/nashorn/script/basic/NASHORN-133.js diff --git a/nashorn/test/script/basic/NASHORN-133.js.EXPECTED b/test/nashorn/script/basic/NASHORN-133.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-133.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-133.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-135.js b/test/nashorn/script/basic/NASHORN-135.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-135.js rename to test/nashorn/script/basic/NASHORN-135.js diff --git a/nashorn/test/script/basic/NASHORN-136.js b/test/nashorn/script/basic/NASHORN-136.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-136.js rename to test/nashorn/script/basic/NASHORN-136.js diff --git a/nashorn/test/script/basic/NASHORN-136.js.EXPECTED b/test/nashorn/script/basic/NASHORN-136.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-136.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-136.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-14.js b/test/nashorn/script/basic/NASHORN-14.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-14.js rename to test/nashorn/script/basic/NASHORN-14.js diff --git a/nashorn/test/script/basic/NASHORN-14.js.EXPECTED b/test/nashorn/script/basic/NASHORN-14.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-14.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-14.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-148.js b/test/nashorn/script/basic/NASHORN-148.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-148.js rename to test/nashorn/script/basic/NASHORN-148.js diff --git a/nashorn/test/script/basic/NASHORN-148.js.EXPECTED b/test/nashorn/script/basic/NASHORN-148.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-148.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-148.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-15.js b/test/nashorn/script/basic/NASHORN-15.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-15.js rename to test/nashorn/script/basic/NASHORN-15.js diff --git a/nashorn/test/script/basic/NASHORN-15.js.EXPECTED b/test/nashorn/script/basic/NASHORN-15.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-15.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-15.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-153.js b/test/nashorn/script/basic/NASHORN-153.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-153.js rename to test/nashorn/script/basic/NASHORN-153.js diff --git a/nashorn/test/script/basic/NASHORN-156.js b/test/nashorn/script/basic/NASHORN-156.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-156.js rename to test/nashorn/script/basic/NASHORN-156.js diff --git a/nashorn/test/script/basic/NASHORN-157.js b/test/nashorn/script/basic/NASHORN-157.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-157.js rename to test/nashorn/script/basic/NASHORN-157.js diff --git a/nashorn/test/script/basic/NASHORN-163.js b/test/nashorn/script/basic/NASHORN-163.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-163.js rename to test/nashorn/script/basic/NASHORN-163.js diff --git a/nashorn/test/script/basic/NASHORN-163.js.EXPECTED b/test/nashorn/script/basic/NASHORN-163.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-163.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-163.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-164.js b/test/nashorn/script/basic/NASHORN-164.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-164.js rename to test/nashorn/script/basic/NASHORN-164.js diff --git a/nashorn/test/script/basic/NASHORN-165.js b/test/nashorn/script/basic/NASHORN-165.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-165.js rename to test/nashorn/script/basic/NASHORN-165.js diff --git a/nashorn/test/script/basic/NASHORN-166.js b/test/nashorn/script/basic/NASHORN-166.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-166.js rename to test/nashorn/script/basic/NASHORN-166.js diff --git a/nashorn/test/script/basic/NASHORN-168.js b/test/nashorn/script/basic/NASHORN-168.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-168.js rename to test/nashorn/script/basic/NASHORN-168.js diff --git a/nashorn/test/script/basic/NASHORN-168.js.EXPECTED b/test/nashorn/script/basic/NASHORN-168.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-168.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-168.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-169.js b/test/nashorn/script/basic/NASHORN-169.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-169.js rename to test/nashorn/script/basic/NASHORN-169.js diff --git a/nashorn/test/script/basic/NASHORN-172.js b/test/nashorn/script/basic/NASHORN-172.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-172.js rename to test/nashorn/script/basic/NASHORN-172.js diff --git a/nashorn/test/script/basic/NASHORN-173.js b/test/nashorn/script/basic/NASHORN-173.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-173.js rename to test/nashorn/script/basic/NASHORN-173.js diff --git a/nashorn/test/script/basic/NASHORN-173.js.EXPECTED b/test/nashorn/script/basic/NASHORN-173.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-173.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-173.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-174.js b/test/nashorn/script/basic/NASHORN-174.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-174.js rename to test/nashorn/script/basic/NASHORN-174.js diff --git a/nashorn/test/script/basic/NASHORN-175.js b/test/nashorn/script/basic/NASHORN-175.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-175.js rename to test/nashorn/script/basic/NASHORN-175.js diff --git a/nashorn/test/script/basic/NASHORN-176.js b/test/nashorn/script/basic/NASHORN-176.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-176.js rename to test/nashorn/script/basic/NASHORN-176.js diff --git a/nashorn/test/script/basic/NASHORN-177.js b/test/nashorn/script/basic/NASHORN-177.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-177.js rename to test/nashorn/script/basic/NASHORN-177.js diff --git a/nashorn/test/script/basic/NASHORN-177.js.EXPECTED b/test/nashorn/script/basic/NASHORN-177.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-177.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-177.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-178.js b/test/nashorn/script/basic/NASHORN-178.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-178.js rename to test/nashorn/script/basic/NASHORN-178.js diff --git a/nashorn/test/script/basic/NASHORN-178.js.EXPECTED b/test/nashorn/script/basic/NASHORN-178.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-178.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-178.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-179.js b/test/nashorn/script/basic/NASHORN-179.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-179.js rename to test/nashorn/script/basic/NASHORN-179.js diff --git a/nashorn/test/script/basic/NASHORN-18.js b/test/nashorn/script/basic/NASHORN-18.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-18.js rename to test/nashorn/script/basic/NASHORN-18.js diff --git a/nashorn/test/script/basic/NASHORN-18.js.EXPECTED b/test/nashorn/script/basic/NASHORN-18.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-18.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-18.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-181.js b/test/nashorn/script/basic/NASHORN-181.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-181.js rename to test/nashorn/script/basic/NASHORN-181.js diff --git a/nashorn/test/script/basic/NASHORN-182.js b/test/nashorn/script/basic/NASHORN-182.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-182.js rename to test/nashorn/script/basic/NASHORN-182.js diff --git a/nashorn/test/script/basic/NASHORN-183.js b/test/nashorn/script/basic/NASHORN-183.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-183.js rename to test/nashorn/script/basic/NASHORN-183.js diff --git a/nashorn/test/script/basic/NASHORN-184.js b/test/nashorn/script/basic/NASHORN-184.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-184.js rename to test/nashorn/script/basic/NASHORN-184.js diff --git a/nashorn/test/script/basic/NASHORN-184.js.EXPECTED b/test/nashorn/script/basic/NASHORN-184.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-184.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-184.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-185.js b/test/nashorn/script/basic/NASHORN-185.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-185.js rename to test/nashorn/script/basic/NASHORN-185.js diff --git a/nashorn/test/script/basic/NASHORN-185.js.EXPECTED b/test/nashorn/script/basic/NASHORN-185.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-185.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-185.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-187.js b/test/nashorn/script/basic/NASHORN-187.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-187.js rename to test/nashorn/script/basic/NASHORN-187.js diff --git a/nashorn/test/script/basic/NASHORN-188.js b/test/nashorn/script/basic/NASHORN-188.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-188.js rename to test/nashorn/script/basic/NASHORN-188.js diff --git a/nashorn/test/script/basic/NASHORN-188.js.EXPECTED b/test/nashorn/script/basic/NASHORN-188.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-188.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-188.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-19.js b/test/nashorn/script/basic/NASHORN-19.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-19.js rename to test/nashorn/script/basic/NASHORN-19.js diff --git a/nashorn/test/script/basic/NASHORN-19.js.EXPECTED b/test/nashorn/script/basic/NASHORN-19.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-19.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-19.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-190.js b/test/nashorn/script/basic/NASHORN-190.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-190.js rename to test/nashorn/script/basic/NASHORN-190.js diff --git a/nashorn/test/script/basic/NASHORN-192.js b/test/nashorn/script/basic/NASHORN-192.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-192.js rename to test/nashorn/script/basic/NASHORN-192.js diff --git a/nashorn/test/script/basic/NASHORN-194.js b/test/nashorn/script/basic/NASHORN-194.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-194.js rename to test/nashorn/script/basic/NASHORN-194.js diff --git a/nashorn/test/script/basic/NASHORN-196.js b/test/nashorn/script/basic/NASHORN-196.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-196.js rename to test/nashorn/script/basic/NASHORN-196.js diff --git a/nashorn/test/script/basic/NASHORN-198.js b/test/nashorn/script/basic/NASHORN-198.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-198.js rename to test/nashorn/script/basic/NASHORN-198.js diff --git a/nashorn/test/script/basic/NASHORN-20.js b/test/nashorn/script/basic/NASHORN-20.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-20.js rename to test/nashorn/script/basic/NASHORN-20.js diff --git a/nashorn/test/script/basic/NASHORN-20.js.EXPECTED b/test/nashorn/script/basic/NASHORN-20.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-20.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-20.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-201.js b/test/nashorn/script/basic/NASHORN-201.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-201.js rename to test/nashorn/script/basic/NASHORN-201.js diff --git a/nashorn/test/script/basic/NASHORN-202.js b/test/nashorn/script/basic/NASHORN-202.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-202.js rename to test/nashorn/script/basic/NASHORN-202.js diff --git a/nashorn/test/script/basic/NASHORN-203.js b/test/nashorn/script/basic/NASHORN-203.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-203.js rename to test/nashorn/script/basic/NASHORN-203.js diff --git a/nashorn/test/script/basic/NASHORN-204.js b/test/nashorn/script/basic/NASHORN-204.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-204.js rename to test/nashorn/script/basic/NASHORN-204.js diff --git a/nashorn/test/script/basic/NASHORN-205.js b/test/nashorn/script/basic/NASHORN-205.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-205.js rename to test/nashorn/script/basic/NASHORN-205.js diff --git a/nashorn/test/script/basic/NASHORN-206.js b/test/nashorn/script/basic/NASHORN-206.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-206.js rename to test/nashorn/script/basic/NASHORN-206.js diff --git a/nashorn/test/script/basic/NASHORN-207.js b/test/nashorn/script/basic/NASHORN-207.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-207.js rename to test/nashorn/script/basic/NASHORN-207.js diff --git a/nashorn/test/script/basic/NASHORN-207_2.js b/test/nashorn/script/basic/NASHORN-207_2.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-207_2.js rename to test/nashorn/script/basic/NASHORN-207_2.js diff --git a/nashorn/test/script/basic/NASHORN-208.js b/test/nashorn/script/basic/NASHORN-208.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-208.js rename to test/nashorn/script/basic/NASHORN-208.js diff --git a/nashorn/test/script/basic/NASHORN-208.js.EXPECTED b/test/nashorn/script/basic/NASHORN-208.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-208.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-208.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-209.js b/test/nashorn/script/basic/NASHORN-209.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-209.js rename to test/nashorn/script/basic/NASHORN-209.js diff --git a/nashorn/test/script/basic/NASHORN-209.js.EXPECTED b/test/nashorn/script/basic/NASHORN-209.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-209.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-209.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-21.js b/test/nashorn/script/basic/NASHORN-21.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-21.js rename to test/nashorn/script/basic/NASHORN-21.js diff --git a/nashorn/test/script/basic/NASHORN-21.js.EXPECTED b/test/nashorn/script/basic/NASHORN-21.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-21.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-21.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-211.js b/test/nashorn/script/basic/NASHORN-211.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-211.js rename to test/nashorn/script/basic/NASHORN-211.js diff --git a/nashorn/test/script/basic/NASHORN-212.js b/test/nashorn/script/basic/NASHORN-212.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-212.js rename to test/nashorn/script/basic/NASHORN-212.js diff --git a/nashorn/test/script/basic/NASHORN-213.js b/test/nashorn/script/basic/NASHORN-213.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-213.js rename to test/nashorn/script/basic/NASHORN-213.js diff --git a/nashorn/test/script/basic/NASHORN-215.js b/test/nashorn/script/basic/NASHORN-215.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-215.js rename to test/nashorn/script/basic/NASHORN-215.js diff --git a/nashorn/test/script/basic/NASHORN-215.js.EXPECTED b/test/nashorn/script/basic/NASHORN-215.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-215.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-215.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-216.js b/test/nashorn/script/basic/NASHORN-216.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-216.js rename to test/nashorn/script/basic/NASHORN-216.js diff --git a/nashorn/test/script/basic/NASHORN-217.js b/test/nashorn/script/basic/NASHORN-217.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-217.js rename to test/nashorn/script/basic/NASHORN-217.js diff --git a/nashorn/test/script/basic/NASHORN-217.js.EXPECTED b/test/nashorn/script/basic/NASHORN-217.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-217.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-217.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-219.js b/test/nashorn/script/basic/NASHORN-219.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-219.js rename to test/nashorn/script/basic/NASHORN-219.js diff --git a/nashorn/test/script/basic/NASHORN-219.js.EXPECTED b/test/nashorn/script/basic/NASHORN-219.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-219.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-219.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-22.js b/test/nashorn/script/basic/NASHORN-22.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-22.js rename to test/nashorn/script/basic/NASHORN-22.js diff --git a/nashorn/test/script/basic/NASHORN-22.js.EXPECTED b/test/nashorn/script/basic/NASHORN-22.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-22.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-22.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-221.js b/test/nashorn/script/basic/NASHORN-221.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-221.js rename to test/nashorn/script/basic/NASHORN-221.js diff --git a/nashorn/test/script/basic/NASHORN-222.js b/test/nashorn/script/basic/NASHORN-222.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-222.js rename to test/nashorn/script/basic/NASHORN-222.js diff --git a/nashorn/test/script/basic/NASHORN-223.js b/test/nashorn/script/basic/NASHORN-223.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-223.js rename to test/nashorn/script/basic/NASHORN-223.js diff --git a/nashorn/test/script/basic/NASHORN-225.js b/test/nashorn/script/basic/NASHORN-225.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-225.js rename to test/nashorn/script/basic/NASHORN-225.js diff --git a/nashorn/test/script/basic/NASHORN-226.js b/test/nashorn/script/basic/NASHORN-226.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-226.js rename to test/nashorn/script/basic/NASHORN-226.js diff --git a/nashorn/test/script/basic/NASHORN-227.js b/test/nashorn/script/basic/NASHORN-227.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-227.js rename to test/nashorn/script/basic/NASHORN-227.js diff --git a/nashorn/test/script/basic/NASHORN-228.js b/test/nashorn/script/basic/NASHORN-228.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-228.js rename to test/nashorn/script/basic/NASHORN-228.js diff --git a/nashorn/test/script/basic/NASHORN-229.js b/test/nashorn/script/basic/NASHORN-229.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-229.js rename to test/nashorn/script/basic/NASHORN-229.js diff --git a/nashorn/test/script/basic/NASHORN-229_subtest.js b/test/nashorn/script/basic/NASHORN-229_subtest.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-229_subtest.js rename to test/nashorn/script/basic/NASHORN-229_subtest.js diff --git a/nashorn/test/script/basic/NASHORN-23.js b/test/nashorn/script/basic/NASHORN-23.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-23.js rename to test/nashorn/script/basic/NASHORN-23.js diff --git a/nashorn/test/script/basic/NASHORN-23.js.EXPECTED b/test/nashorn/script/basic/NASHORN-23.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-23.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-23.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-232.js b/test/nashorn/script/basic/NASHORN-232.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-232.js rename to test/nashorn/script/basic/NASHORN-232.js diff --git a/nashorn/test/script/basic/NASHORN-234.js b/test/nashorn/script/basic/NASHORN-234.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-234.js rename to test/nashorn/script/basic/NASHORN-234.js diff --git a/nashorn/test/script/basic/NASHORN-235.js b/test/nashorn/script/basic/NASHORN-235.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-235.js rename to test/nashorn/script/basic/NASHORN-235.js diff --git a/nashorn/test/script/basic/NASHORN-236.js b/test/nashorn/script/basic/NASHORN-236.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-236.js rename to test/nashorn/script/basic/NASHORN-236.js diff --git a/nashorn/test/script/basic/NASHORN-237.js b/test/nashorn/script/basic/NASHORN-237.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-237.js rename to test/nashorn/script/basic/NASHORN-237.js diff --git a/nashorn/test/script/basic/NASHORN-239.js b/test/nashorn/script/basic/NASHORN-239.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-239.js rename to test/nashorn/script/basic/NASHORN-239.js diff --git a/nashorn/test/script/basic/NASHORN-24.js b/test/nashorn/script/basic/NASHORN-24.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-24.js rename to test/nashorn/script/basic/NASHORN-24.js diff --git a/nashorn/test/script/basic/NASHORN-24.js.EXPECTED b/test/nashorn/script/basic/NASHORN-24.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-24.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-24.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-241.js b/test/nashorn/script/basic/NASHORN-241.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-241.js rename to test/nashorn/script/basic/NASHORN-241.js diff --git a/nashorn/test/script/basic/NASHORN-242.js b/test/nashorn/script/basic/NASHORN-242.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-242.js rename to test/nashorn/script/basic/NASHORN-242.js diff --git a/nashorn/test/script/basic/NASHORN-245.js b/test/nashorn/script/basic/NASHORN-245.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-245.js rename to test/nashorn/script/basic/NASHORN-245.js diff --git a/nashorn/test/script/basic/NASHORN-247.js b/test/nashorn/script/basic/NASHORN-247.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-247.js rename to test/nashorn/script/basic/NASHORN-247.js diff --git a/nashorn/test/script/basic/NASHORN-25.js b/test/nashorn/script/basic/NASHORN-25.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-25.js rename to test/nashorn/script/basic/NASHORN-25.js diff --git a/nashorn/test/script/basic/NASHORN-25.js.EXPECTED b/test/nashorn/script/basic/NASHORN-25.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-25.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-25.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-251.js b/test/nashorn/script/basic/NASHORN-251.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-251.js rename to test/nashorn/script/basic/NASHORN-251.js diff --git a/nashorn/test/script/basic/NASHORN-252.js b/test/nashorn/script/basic/NASHORN-252.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-252.js rename to test/nashorn/script/basic/NASHORN-252.js diff --git a/nashorn/test/script/basic/NASHORN-253.js b/test/nashorn/script/basic/NASHORN-253.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-253.js rename to test/nashorn/script/basic/NASHORN-253.js diff --git a/nashorn/test/script/basic/NASHORN-256.js b/test/nashorn/script/basic/NASHORN-256.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-256.js rename to test/nashorn/script/basic/NASHORN-256.js diff --git a/nashorn/test/script/basic/NASHORN-258.js b/test/nashorn/script/basic/NASHORN-258.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-258.js rename to test/nashorn/script/basic/NASHORN-258.js diff --git a/nashorn/test/script/basic/NASHORN-258.js.EXPECTED b/test/nashorn/script/basic/NASHORN-258.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-258.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-258.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-26.js b/test/nashorn/script/basic/NASHORN-26.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-26.js rename to test/nashorn/script/basic/NASHORN-26.js diff --git a/nashorn/test/script/basic/NASHORN-26.js.EXPECTED b/test/nashorn/script/basic/NASHORN-26.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-26.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-26.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-260.js b/test/nashorn/script/basic/NASHORN-260.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-260.js rename to test/nashorn/script/basic/NASHORN-260.js diff --git a/nashorn/test/script/basic/NASHORN-261.js b/test/nashorn/script/basic/NASHORN-261.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-261.js rename to test/nashorn/script/basic/NASHORN-261.js diff --git a/nashorn/test/script/basic/NASHORN-262.js b/test/nashorn/script/basic/NASHORN-262.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-262.js rename to test/nashorn/script/basic/NASHORN-262.js diff --git a/nashorn/test/script/basic/NASHORN-263.js b/test/nashorn/script/basic/NASHORN-263.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-263.js rename to test/nashorn/script/basic/NASHORN-263.js diff --git a/nashorn/test/script/basic/NASHORN-264.js b/test/nashorn/script/basic/NASHORN-264.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-264.js rename to test/nashorn/script/basic/NASHORN-264.js diff --git a/nashorn/test/script/basic/NASHORN-265.js b/test/nashorn/script/basic/NASHORN-265.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-265.js rename to test/nashorn/script/basic/NASHORN-265.js diff --git a/nashorn/test/script/basic/NASHORN-265.js.EXPECTED b/test/nashorn/script/basic/NASHORN-265.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-265.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-265.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-266.js b/test/nashorn/script/basic/NASHORN-266.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-266.js rename to test/nashorn/script/basic/NASHORN-266.js diff --git a/nashorn/test/script/basic/NASHORN-269.js b/test/nashorn/script/basic/NASHORN-269.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-269.js rename to test/nashorn/script/basic/NASHORN-269.js diff --git a/nashorn/test/script/basic/NASHORN-27.js b/test/nashorn/script/basic/NASHORN-27.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-27.js rename to test/nashorn/script/basic/NASHORN-27.js diff --git a/nashorn/test/script/basic/NASHORN-27.js.EXPECTED b/test/nashorn/script/basic/NASHORN-27.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-27.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-27.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-270.js b/test/nashorn/script/basic/NASHORN-270.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-270.js rename to test/nashorn/script/basic/NASHORN-270.js diff --git a/nashorn/test/script/basic/NASHORN-271.js b/test/nashorn/script/basic/NASHORN-271.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-271.js rename to test/nashorn/script/basic/NASHORN-271.js diff --git a/nashorn/test/script/basic/NASHORN-275.js b/test/nashorn/script/basic/NASHORN-275.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-275.js rename to test/nashorn/script/basic/NASHORN-275.js diff --git a/nashorn/test/script/basic/NASHORN-276.js b/test/nashorn/script/basic/NASHORN-276.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-276.js rename to test/nashorn/script/basic/NASHORN-276.js diff --git a/nashorn/test/script/basic/NASHORN-277.js b/test/nashorn/script/basic/NASHORN-277.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-277.js rename to test/nashorn/script/basic/NASHORN-277.js diff --git a/nashorn/test/script/basic/NASHORN-278.js b/test/nashorn/script/basic/NASHORN-278.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-278.js rename to test/nashorn/script/basic/NASHORN-278.js diff --git a/nashorn/test/script/basic/NASHORN-28.js b/test/nashorn/script/basic/NASHORN-28.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-28.js rename to test/nashorn/script/basic/NASHORN-28.js diff --git a/nashorn/test/script/basic/NASHORN-28.js.EXPECTED b/test/nashorn/script/basic/NASHORN-28.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-28.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-28.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-281.js b/test/nashorn/script/basic/NASHORN-281.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-281.js rename to test/nashorn/script/basic/NASHORN-281.js diff --git a/nashorn/test/script/basic/NASHORN-284.js b/test/nashorn/script/basic/NASHORN-284.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-284.js rename to test/nashorn/script/basic/NASHORN-284.js diff --git a/nashorn/test/script/basic/NASHORN-284.js.EXPECTED b/test/nashorn/script/basic/NASHORN-284.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-284.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-284.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-285.js b/test/nashorn/script/basic/NASHORN-285.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-285.js rename to test/nashorn/script/basic/NASHORN-285.js diff --git a/nashorn/test/script/basic/NASHORN-285.js.EXPECTED b/test/nashorn/script/basic/NASHORN-285.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-285.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-285.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-288.js b/test/nashorn/script/basic/NASHORN-288.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-288.js rename to test/nashorn/script/basic/NASHORN-288.js diff --git a/nashorn/test/script/basic/NASHORN-29.js b/test/nashorn/script/basic/NASHORN-29.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-29.js rename to test/nashorn/script/basic/NASHORN-29.js diff --git a/nashorn/test/script/basic/NASHORN-29.js.EXPECTED b/test/nashorn/script/basic/NASHORN-29.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-29.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-29.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-293.js b/test/nashorn/script/basic/NASHORN-293.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-293.js rename to test/nashorn/script/basic/NASHORN-293.js diff --git a/nashorn/test/script/basic/NASHORN-293.js.EXPECTED b/test/nashorn/script/basic/NASHORN-293.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-293.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-293.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-294.js b/test/nashorn/script/basic/NASHORN-294.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-294.js rename to test/nashorn/script/basic/NASHORN-294.js diff --git a/nashorn/test/script/basic/NASHORN-296.js b/test/nashorn/script/basic/NASHORN-296.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-296.js rename to test/nashorn/script/basic/NASHORN-296.js diff --git a/nashorn/test/script/basic/NASHORN-297.js b/test/nashorn/script/basic/NASHORN-297.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-297.js rename to test/nashorn/script/basic/NASHORN-297.js diff --git a/nashorn/test/script/basic/NASHORN-30.js b/test/nashorn/script/basic/NASHORN-30.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-30.js rename to test/nashorn/script/basic/NASHORN-30.js diff --git a/nashorn/test/script/basic/NASHORN-30.js.EXPECTED b/test/nashorn/script/basic/NASHORN-30.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-30.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-30.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-300.js b/test/nashorn/script/basic/NASHORN-300.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-300.js rename to test/nashorn/script/basic/NASHORN-300.js diff --git a/nashorn/test/script/basic/NASHORN-301.js b/test/nashorn/script/basic/NASHORN-301.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-301.js rename to test/nashorn/script/basic/NASHORN-301.js diff --git a/nashorn/test/script/basic/NASHORN-301.js.EXPECTED b/test/nashorn/script/basic/NASHORN-301.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-301.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-301.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-304.js b/test/nashorn/script/basic/NASHORN-304.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-304.js rename to test/nashorn/script/basic/NASHORN-304.js diff --git a/nashorn/test/script/basic/NASHORN-310.js b/test/nashorn/script/basic/NASHORN-310.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-310.js rename to test/nashorn/script/basic/NASHORN-310.js diff --git a/nashorn/test/script/basic/NASHORN-310.js.EXPECTED b/test/nashorn/script/basic/NASHORN-310.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-310.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-310.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-318.js b/test/nashorn/script/basic/NASHORN-318.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-318.js rename to test/nashorn/script/basic/NASHORN-318.js diff --git a/nashorn/test/script/basic/NASHORN-318.js.EXPECTED b/test/nashorn/script/basic/NASHORN-318.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-318.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-318.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-32.js b/test/nashorn/script/basic/NASHORN-32.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-32.js rename to test/nashorn/script/basic/NASHORN-32.js diff --git a/nashorn/test/script/basic/NASHORN-32.js.EXPECTED b/test/nashorn/script/basic/NASHORN-32.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-32.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-32.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-321.js b/test/nashorn/script/basic/NASHORN-321.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-321.js rename to test/nashorn/script/basic/NASHORN-321.js diff --git a/nashorn/test/script/basic/NASHORN-321.js.EXPECTED b/test/nashorn/script/basic/NASHORN-321.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-321.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-321.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-323.js b/test/nashorn/script/basic/NASHORN-323.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-323.js rename to test/nashorn/script/basic/NASHORN-323.js diff --git a/nashorn/test/script/basic/NASHORN-323.js.EXPECTED b/test/nashorn/script/basic/NASHORN-323.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-323.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-323.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-324.js b/test/nashorn/script/basic/NASHORN-324.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-324.js rename to test/nashorn/script/basic/NASHORN-324.js diff --git a/nashorn/test/script/basic/NASHORN-33.js b/test/nashorn/script/basic/NASHORN-33.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-33.js rename to test/nashorn/script/basic/NASHORN-33.js diff --git a/nashorn/test/script/basic/NASHORN-33.js.EXPECTED b/test/nashorn/script/basic/NASHORN-33.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-33.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-33.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-331.js b/test/nashorn/script/basic/NASHORN-331.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-331.js rename to test/nashorn/script/basic/NASHORN-331.js diff --git a/nashorn/test/script/basic/NASHORN-331.js.EXPECTED b/test/nashorn/script/basic/NASHORN-331.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-331.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-331.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-337.js b/test/nashorn/script/basic/NASHORN-337.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-337.js rename to test/nashorn/script/basic/NASHORN-337.js diff --git a/nashorn/test/script/basic/NASHORN-337.js.EXPECTED b/test/nashorn/script/basic/NASHORN-337.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-337.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-337.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-34.js b/test/nashorn/script/basic/NASHORN-34.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-34.js rename to test/nashorn/script/basic/NASHORN-34.js diff --git a/nashorn/test/script/basic/NASHORN-34.js.EXPECTED b/test/nashorn/script/basic/NASHORN-34.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-34.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-34.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-340.js b/test/nashorn/script/basic/NASHORN-340.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-340.js rename to test/nashorn/script/basic/NASHORN-340.js diff --git a/nashorn/test/script/basic/NASHORN-340.js.EXPECTED b/test/nashorn/script/basic/NASHORN-340.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-340.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-340.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-349.js b/test/nashorn/script/basic/NASHORN-349.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-349.js rename to test/nashorn/script/basic/NASHORN-349.js diff --git a/nashorn/test/script/basic/NASHORN-354.js b/test/nashorn/script/basic/NASHORN-354.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-354.js rename to test/nashorn/script/basic/NASHORN-354.js diff --git a/nashorn/test/script/basic/NASHORN-354.js.EXPECTED b/test/nashorn/script/basic/NASHORN-354.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-354.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-354.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-355.js b/test/nashorn/script/basic/NASHORN-355.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-355.js rename to test/nashorn/script/basic/NASHORN-355.js diff --git a/nashorn/test/script/basic/NASHORN-355.js.EXPECTED b/test/nashorn/script/basic/NASHORN-355.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-355.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-355.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-36.js b/test/nashorn/script/basic/NASHORN-36.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-36.js rename to test/nashorn/script/basic/NASHORN-36.js diff --git a/nashorn/test/script/basic/NASHORN-36.js.EXPECTED b/test/nashorn/script/basic/NASHORN-36.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-36.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-36.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-365.js b/test/nashorn/script/basic/NASHORN-365.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-365.js rename to test/nashorn/script/basic/NASHORN-365.js diff --git a/nashorn/test/script/basic/NASHORN-366.js b/test/nashorn/script/basic/NASHORN-366.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-366.js rename to test/nashorn/script/basic/NASHORN-366.js diff --git a/nashorn/test/script/basic/NASHORN-366.js.EXPECTED b/test/nashorn/script/basic/NASHORN-366.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-366.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-366.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-368.js b/test/nashorn/script/basic/NASHORN-368.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-368.js rename to test/nashorn/script/basic/NASHORN-368.js diff --git a/nashorn/test/script/basic/NASHORN-368.js.EXPECTED b/test/nashorn/script/basic/NASHORN-368.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-368.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-368.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-37.js b/test/nashorn/script/basic/NASHORN-37.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-37.js rename to test/nashorn/script/basic/NASHORN-37.js diff --git a/nashorn/test/script/basic/NASHORN-37.js.EXPECTED b/test/nashorn/script/basic/NASHORN-37.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-37.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-37.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-375.js b/test/nashorn/script/basic/NASHORN-375.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-375.js rename to test/nashorn/script/basic/NASHORN-375.js diff --git a/nashorn/test/script/basic/NASHORN-376.js b/test/nashorn/script/basic/NASHORN-376.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-376.js rename to test/nashorn/script/basic/NASHORN-376.js diff --git a/nashorn/test/script/basic/NASHORN-377-big-endian.js b/test/nashorn/script/basic/NASHORN-377-big-endian.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-377-big-endian.js rename to test/nashorn/script/basic/NASHORN-377-big-endian.js diff --git a/nashorn/test/script/basic/NASHORN-377-big-endian.js.EXPECTED b/test/nashorn/script/basic/NASHORN-377-big-endian.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-377-big-endian.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-377-big-endian.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-377-payload.js b/test/nashorn/script/basic/NASHORN-377-payload.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-377-payload.js rename to test/nashorn/script/basic/NASHORN-377-payload.js diff --git a/nashorn/test/script/basic/NASHORN-377.js b/test/nashorn/script/basic/NASHORN-377.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-377.js rename to test/nashorn/script/basic/NASHORN-377.js diff --git a/nashorn/test/script/basic/NASHORN-377.js.EXPECTED b/test/nashorn/script/basic/NASHORN-377.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-377.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-377.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-378.js b/test/nashorn/script/basic/NASHORN-378.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-378.js rename to test/nashorn/script/basic/NASHORN-378.js diff --git a/nashorn/test/script/basic/NASHORN-38.js b/test/nashorn/script/basic/NASHORN-38.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-38.js rename to test/nashorn/script/basic/NASHORN-38.js diff --git a/nashorn/test/script/basic/NASHORN-38.js.EXPECTED b/test/nashorn/script/basic/NASHORN-38.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-38.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-38.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-380.js b/test/nashorn/script/basic/NASHORN-380.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-380.js rename to test/nashorn/script/basic/NASHORN-380.js diff --git a/nashorn/test/script/basic/NASHORN-380.js.EXPECTED b/test/nashorn/script/basic/NASHORN-380.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-380.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-380.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-381.js b/test/nashorn/script/basic/NASHORN-381.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-381.js rename to test/nashorn/script/basic/NASHORN-381.js diff --git a/nashorn/test/script/basic/NASHORN-382.js b/test/nashorn/script/basic/NASHORN-382.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-382.js rename to test/nashorn/script/basic/NASHORN-382.js diff --git a/nashorn/test/script/basic/NASHORN-383.js b/test/nashorn/script/basic/NASHORN-383.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-383.js rename to test/nashorn/script/basic/NASHORN-383.js diff --git a/nashorn/test/script/basic/NASHORN-384.js b/test/nashorn/script/basic/NASHORN-384.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-384.js rename to test/nashorn/script/basic/NASHORN-384.js diff --git a/nashorn/test/script/basic/NASHORN-384.js.EXPECTED b/test/nashorn/script/basic/NASHORN-384.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-384.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-384.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-385.js b/test/nashorn/script/basic/NASHORN-385.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-385.js rename to test/nashorn/script/basic/NASHORN-385.js diff --git a/nashorn/test/script/basic/NASHORN-385.js.EXPECTED b/test/nashorn/script/basic/NASHORN-385.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-385.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-385.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-389.js b/test/nashorn/script/basic/NASHORN-389.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-389.js rename to test/nashorn/script/basic/NASHORN-389.js diff --git a/nashorn/test/script/basic/NASHORN-389.js.EXPECTED b/test/nashorn/script/basic/NASHORN-389.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-389.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-389.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-393.js b/test/nashorn/script/basic/NASHORN-393.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-393.js rename to test/nashorn/script/basic/NASHORN-393.js diff --git a/nashorn/test/script/basic/NASHORN-393.js.EXPECTED b/test/nashorn/script/basic/NASHORN-393.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-393.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-393.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-394.js b/test/nashorn/script/basic/NASHORN-394.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-394.js rename to test/nashorn/script/basic/NASHORN-394.js diff --git a/nashorn/test/script/basic/NASHORN-394.js.EXPECTED b/test/nashorn/script/basic/NASHORN-394.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-394.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-394.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-396.js b/test/nashorn/script/basic/NASHORN-396.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-396.js rename to test/nashorn/script/basic/NASHORN-396.js diff --git a/nashorn/test/script/basic/NASHORN-397.js b/test/nashorn/script/basic/NASHORN-397.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-397.js rename to test/nashorn/script/basic/NASHORN-397.js diff --git a/nashorn/test/script/basic/NASHORN-398.js b/test/nashorn/script/basic/NASHORN-398.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-398.js rename to test/nashorn/script/basic/NASHORN-398.js diff --git a/nashorn/test/script/basic/NASHORN-40.js b/test/nashorn/script/basic/NASHORN-40.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-40.js rename to test/nashorn/script/basic/NASHORN-40.js diff --git a/nashorn/test/script/basic/NASHORN-40.js.EXPECTED b/test/nashorn/script/basic/NASHORN-40.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-40.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-40.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-400.js b/test/nashorn/script/basic/NASHORN-400.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-400.js rename to test/nashorn/script/basic/NASHORN-400.js diff --git a/nashorn/test/script/basic/NASHORN-400.js.EXPECTED b/test/nashorn/script/basic/NASHORN-400.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-400.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-400.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-401.js b/test/nashorn/script/basic/NASHORN-401.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-401.js rename to test/nashorn/script/basic/NASHORN-401.js diff --git a/nashorn/test/script/basic/NASHORN-401.js.EXPECTED b/test/nashorn/script/basic/NASHORN-401.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-401.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-401.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-402.js b/test/nashorn/script/basic/NASHORN-402.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-402.js rename to test/nashorn/script/basic/NASHORN-402.js diff --git a/nashorn/test/script/basic/NASHORN-402.js.EXPECTED b/test/nashorn/script/basic/NASHORN-402.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-402.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-402.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-404.js b/test/nashorn/script/basic/NASHORN-404.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-404.js rename to test/nashorn/script/basic/NASHORN-404.js diff --git a/nashorn/test/script/basic/NASHORN-405.js b/test/nashorn/script/basic/NASHORN-405.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-405.js rename to test/nashorn/script/basic/NASHORN-405.js diff --git a/nashorn/test/script/basic/NASHORN-405.js.EXPECTED b/test/nashorn/script/basic/NASHORN-405.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-405.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-405.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-406.js b/test/nashorn/script/basic/NASHORN-406.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-406.js rename to test/nashorn/script/basic/NASHORN-406.js diff --git a/nashorn/test/script/basic/NASHORN-408.js b/test/nashorn/script/basic/NASHORN-408.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-408.js rename to test/nashorn/script/basic/NASHORN-408.js diff --git a/nashorn/test/script/basic/NASHORN-408.js.EXPECTED b/test/nashorn/script/basic/NASHORN-408.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-408.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-408.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-415.js b/test/nashorn/script/basic/NASHORN-415.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-415.js rename to test/nashorn/script/basic/NASHORN-415.js diff --git a/nashorn/test/script/basic/NASHORN-415.js.EXPECTED b/test/nashorn/script/basic/NASHORN-415.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-415.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-415.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-416.js b/test/nashorn/script/basic/NASHORN-416.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-416.js rename to test/nashorn/script/basic/NASHORN-416.js diff --git a/nashorn/test/script/basic/NASHORN-417.js b/test/nashorn/script/basic/NASHORN-417.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-417.js rename to test/nashorn/script/basic/NASHORN-417.js diff --git a/nashorn/test/script/basic/NASHORN-418.js b/test/nashorn/script/basic/NASHORN-418.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-418.js rename to test/nashorn/script/basic/NASHORN-418.js diff --git a/nashorn/test/script/basic/NASHORN-420.js b/test/nashorn/script/basic/NASHORN-420.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-420.js rename to test/nashorn/script/basic/NASHORN-420.js diff --git a/nashorn/test/script/basic/NASHORN-421.js b/test/nashorn/script/basic/NASHORN-421.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-421.js rename to test/nashorn/script/basic/NASHORN-421.js diff --git a/nashorn/test/script/basic/NASHORN-423.js b/test/nashorn/script/basic/NASHORN-423.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-423.js rename to test/nashorn/script/basic/NASHORN-423.js diff --git a/nashorn/test/script/basic/NASHORN-423.js.EXPECTED b/test/nashorn/script/basic/NASHORN-423.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-423.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-423.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-423a.js b/test/nashorn/script/basic/NASHORN-423a.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-423a.js rename to test/nashorn/script/basic/NASHORN-423a.js diff --git a/nashorn/test/script/basic/NASHORN-424.js b/test/nashorn/script/basic/NASHORN-424.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-424.js rename to test/nashorn/script/basic/NASHORN-424.js diff --git a/nashorn/test/script/basic/NASHORN-424.js.EXPECTED b/test/nashorn/script/basic/NASHORN-424.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-424.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-424.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-425.js b/test/nashorn/script/basic/NASHORN-425.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-425.js rename to test/nashorn/script/basic/NASHORN-425.js diff --git a/nashorn/test/script/basic/NASHORN-425.js.EXPECTED b/test/nashorn/script/basic/NASHORN-425.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-425.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-425.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-426.js b/test/nashorn/script/basic/NASHORN-426.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-426.js rename to test/nashorn/script/basic/NASHORN-426.js diff --git a/nashorn/test/script/basic/NASHORN-427.js b/test/nashorn/script/basic/NASHORN-427.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-427.js rename to test/nashorn/script/basic/NASHORN-427.js diff --git a/nashorn/test/script/basic/NASHORN-428.js b/test/nashorn/script/basic/NASHORN-428.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-428.js rename to test/nashorn/script/basic/NASHORN-428.js diff --git a/nashorn/test/script/basic/NASHORN-429.js b/test/nashorn/script/basic/NASHORN-429.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-429.js rename to test/nashorn/script/basic/NASHORN-429.js diff --git a/nashorn/test/script/basic/NASHORN-432.js b/test/nashorn/script/basic/NASHORN-432.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-432.js rename to test/nashorn/script/basic/NASHORN-432.js diff --git a/nashorn/test/script/basic/NASHORN-433.js b/test/nashorn/script/basic/NASHORN-433.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-433.js rename to test/nashorn/script/basic/NASHORN-433.js diff --git a/nashorn/test/script/basic/NASHORN-434.js b/test/nashorn/script/basic/NASHORN-434.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-434.js rename to test/nashorn/script/basic/NASHORN-434.js diff --git a/nashorn/test/script/basic/NASHORN-435.js b/test/nashorn/script/basic/NASHORN-435.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-435.js rename to test/nashorn/script/basic/NASHORN-435.js diff --git a/nashorn/test/script/basic/NASHORN-437.js b/test/nashorn/script/basic/NASHORN-437.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-437.js rename to test/nashorn/script/basic/NASHORN-437.js diff --git a/nashorn/test/script/basic/NASHORN-44.js b/test/nashorn/script/basic/NASHORN-44.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-44.js rename to test/nashorn/script/basic/NASHORN-44.js diff --git a/nashorn/test/script/basic/NASHORN-44.js.EXPECTED b/test/nashorn/script/basic/NASHORN-44.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-44.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-44.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-441.js b/test/nashorn/script/basic/NASHORN-441.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-441.js rename to test/nashorn/script/basic/NASHORN-441.js diff --git a/nashorn/test/script/basic/NASHORN-441.js.EXPECTED b/test/nashorn/script/basic/NASHORN-441.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-441.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-441.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-442.js b/test/nashorn/script/basic/NASHORN-442.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-442.js rename to test/nashorn/script/basic/NASHORN-442.js diff --git a/nashorn/test/script/basic/NASHORN-443.js b/test/nashorn/script/basic/NASHORN-443.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-443.js rename to test/nashorn/script/basic/NASHORN-443.js diff --git a/nashorn/test/script/basic/NASHORN-444.js b/test/nashorn/script/basic/NASHORN-444.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-444.js rename to test/nashorn/script/basic/NASHORN-444.js diff --git a/nashorn/test/script/basic/NASHORN-444.js.EXPECTED b/test/nashorn/script/basic/NASHORN-444.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-444.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-444.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-445.js b/test/nashorn/script/basic/NASHORN-445.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-445.js rename to test/nashorn/script/basic/NASHORN-445.js diff --git a/nashorn/test/script/basic/NASHORN-446.js b/test/nashorn/script/basic/NASHORN-446.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-446.js rename to test/nashorn/script/basic/NASHORN-446.js diff --git a/nashorn/test/script/basic/NASHORN-447.js b/test/nashorn/script/basic/NASHORN-447.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-447.js rename to test/nashorn/script/basic/NASHORN-447.js diff --git a/nashorn/test/script/basic/NASHORN-448.js b/test/nashorn/script/basic/NASHORN-448.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-448.js rename to test/nashorn/script/basic/NASHORN-448.js diff --git a/nashorn/test/script/basic/NASHORN-449.js b/test/nashorn/script/basic/NASHORN-449.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-449.js rename to test/nashorn/script/basic/NASHORN-449.js diff --git a/nashorn/test/script/basic/NASHORN-449.js.EXPECTED b/test/nashorn/script/basic/NASHORN-449.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-449.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-449.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-45.js b/test/nashorn/script/basic/NASHORN-45.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-45.js rename to test/nashorn/script/basic/NASHORN-45.js diff --git a/nashorn/test/script/basic/NASHORN-45.js.EXPECTED b/test/nashorn/script/basic/NASHORN-45.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-45.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-45.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-450.js b/test/nashorn/script/basic/NASHORN-450.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-450.js rename to test/nashorn/script/basic/NASHORN-450.js diff --git a/nashorn/test/script/basic/NASHORN-452.js b/test/nashorn/script/basic/NASHORN-452.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-452.js rename to test/nashorn/script/basic/NASHORN-452.js diff --git a/nashorn/test/script/basic/NASHORN-459.js b/test/nashorn/script/basic/NASHORN-459.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-459.js rename to test/nashorn/script/basic/NASHORN-459.js diff --git a/nashorn/test/script/basic/NASHORN-46.js b/test/nashorn/script/basic/NASHORN-46.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-46.js rename to test/nashorn/script/basic/NASHORN-46.js diff --git a/nashorn/test/script/basic/NASHORN-46.js.EXPECTED b/test/nashorn/script/basic/NASHORN-46.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-46.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-46.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-462.js b/test/nashorn/script/basic/NASHORN-462.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-462.js rename to test/nashorn/script/basic/NASHORN-462.js diff --git a/nashorn/test/script/basic/NASHORN-463.js b/test/nashorn/script/basic/NASHORN-463.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-463.js rename to test/nashorn/script/basic/NASHORN-463.js diff --git a/nashorn/test/script/basic/NASHORN-468.js b/test/nashorn/script/basic/NASHORN-468.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-468.js rename to test/nashorn/script/basic/NASHORN-468.js diff --git a/nashorn/test/script/basic/NASHORN-47.js b/test/nashorn/script/basic/NASHORN-47.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-47.js rename to test/nashorn/script/basic/NASHORN-47.js diff --git a/nashorn/test/script/basic/NASHORN-473.js b/test/nashorn/script/basic/NASHORN-473.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-473.js rename to test/nashorn/script/basic/NASHORN-473.js diff --git a/nashorn/test/script/basic/NASHORN-473.js.EXPECTED b/test/nashorn/script/basic/NASHORN-473.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-473.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-473.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-474.js b/test/nashorn/script/basic/NASHORN-474.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-474.js rename to test/nashorn/script/basic/NASHORN-474.js diff --git a/nashorn/test/script/basic/NASHORN-474.js.EXPECTED b/test/nashorn/script/basic/NASHORN-474.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-474.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-474.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-478.js b/test/nashorn/script/basic/NASHORN-478.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-478.js rename to test/nashorn/script/basic/NASHORN-478.js diff --git a/nashorn/test/script/basic/NASHORN-48.js b/test/nashorn/script/basic/NASHORN-48.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-48.js rename to test/nashorn/script/basic/NASHORN-48.js diff --git a/nashorn/test/script/basic/NASHORN-48.js.EXPECTED b/test/nashorn/script/basic/NASHORN-48.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-48.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-48.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-481.js b/test/nashorn/script/basic/NASHORN-481.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-481.js rename to test/nashorn/script/basic/NASHORN-481.js diff --git a/nashorn/test/script/basic/NASHORN-481.js.EXPECTED b/test/nashorn/script/basic/NASHORN-481.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-481.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-481.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-482.js b/test/nashorn/script/basic/NASHORN-482.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-482.js rename to test/nashorn/script/basic/NASHORN-482.js diff --git a/nashorn/test/script/basic/NASHORN-484.js b/test/nashorn/script/basic/NASHORN-484.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-484.js rename to test/nashorn/script/basic/NASHORN-484.js diff --git a/nashorn/test/script/basic/NASHORN-484.js.EXPECTED b/test/nashorn/script/basic/NASHORN-484.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-484.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-484.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-486.js b/test/nashorn/script/basic/NASHORN-486.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-486.js rename to test/nashorn/script/basic/NASHORN-486.js diff --git a/nashorn/test/script/basic/NASHORN-487.js b/test/nashorn/script/basic/NASHORN-487.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-487.js rename to test/nashorn/script/basic/NASHORN-487.js diff --git a/nashorn/test/script/basic/NASHORN-488.js b/test/nashorn/script/basic/NASHORN-488.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-488.js rename to test/nashorn/script/basic/NASHORN-488.js diff --git a/nashorn/test/script/basic/NASHORN-49.js b/test/nashorn/script/basic/NASHORN-49.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-49.js rename to test/nashorn/script/basic/NASHORN-49.js diff --git a/nashorn/test/script/basic/NASHORN-49.js.EXPECTED b/test/nashorn/script/basic/NASHORN-49.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-49.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-49.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-490.js b/test/nashorn/script/basic/NASHORN-490.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-490.js rename to test/nashorn/script/basic/NASHORN-490.js diff --git a/nashorn/test/script/basic/NASHORN-494.js b/test/nashorn/script/basic/NASHORN-494.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-494.js rename to test/nashorn/script/basic/NASHORN-494.js diff --git a/nashorn/test/script/basic/NASHORN-497.js b/test/nashorn/script/basic/NASHORN-497.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-497.js rename to test/nashorn/script/basic/NASHORN-497.js diff --git a/nashorn/test/script/basic/NASHORN-498.js b/test/nashorn/script/basic/NASHORN-498.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-498.js rename to test/nashorn/script/basic/NASHORN-498.js diff --git a/nashorn/test/script/basic/NASHORN-499.js b/test/nashorn/script/basic/NASHORN-499.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-499.js rename to test/nashorn/script/basic/NASHORN-499.js diff --git a/nashorn/test/script/basic/NASHORN-50.js b/test/nashorn/script/basic/NASHORN-50.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-50.js rename to test/nashorn/script/basic/NASHORN-50.js diff --git a/nashorn/test/script/basic/NASHORN-50.js.EXPECTED b/test/nashorn/script/basic/NASHORN-50.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-50.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-50.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-500.js b/test/nashorn/script/basic/NASHORN-500.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-500.js rename to test/nashorn/script/basic/NASHORN-500.js diff --git a/nashorn/test/script/basic/NASHORN-503.js b/test/nashorn/script/basic/NASHORN-503.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-503.js rename to test/nashorn/script/basic/NASHORN-503.js diff --git a/nashorn/test/script/basic/NASHORN-503.js.EXPECTED b/test/nashorn/script/basic/NASHORN-503.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-503.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-503.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-51.js b/test/nashorn/script/basic/NASHORN-51.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-51.js rename to test/nashorn/script/basic/NASHORN-51.js diff --git a/nashorn/test/script/basic/NASHORN-51.js.EXPECTED b/test/nashorn/script/basic/NASHORN-51.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-51.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-51.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-511.js b/test/nashorn/script/basic/NASHORN-511.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-511.js rename to test/nashorn/script/basic/NASHORN-511.js diff --git a/nashorn/test/script/basic/NASHORN-515.js b/test/nashorn/script/basic/NASHORN-515.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-515.js rename to test/nashorn/script/basic/NASHORN-515.js diff --git a/nashorn/test/script/basic/NASHORN-515.js.EXPECTED b/test/nashorn/script/basic/NASHORN-515.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-515.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-515.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-516.js b/test/nashorn/script/basic/NASHORN-516.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-516.js rename to test/nashorn/script/basic/NASHORN-516.js diff --git a/nashorn/test/script/basic/NASHORN-52.js b/test/nashorn/script/basic/NASHORN-52.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-52.js rename to test/nashorn/script/basic/NASHORN-52.js diff --git a/nashorn/test/script/basic/NASHORN-534.js b/test/nashorn/script/basic/NASHORN-534.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-534.js rename to test/nashorn/script/basic/NASHORN-534.js diff --git a/nashorn/test/script/basic/NASHORN-534.js.EXPECTED b/test/nashorn/script/basic/NASHORN-534.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-534.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-534.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-535.js b/test/nashorn/script/basic/NASHORN-535.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-535.js rename to test/nashorn/script/basic/NASHORN-535.js diff --git a/nashorn/test/script/basic/NASHORN-535.js.EXPECTED b/test/nashorn/script/basic/NASHORN-535.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-535.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-535.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-544.js b/test/nashorn/script/basic/NASHORN-544.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-544.js rename to test/nashorn/script/basic/NASHORN-544.js diff --git a/nashorn/test/script/basic/NASHORN-55.js b/test/nashorn/script/basic/NASHORN-55.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-55.js rename to test/nashorn/script/basic/NASHORN-55.js diff --git a/nashorn/test/script/basic/NASHORN-554.js b/test/nashorn/script/basic/NASHORN-554.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-554.js rename to test/nashorn/script/basic/NASHORN-554.js diff --git a/nashorn/test/script/basic/NASHORN-554.js.EXPECTED b/test/nashorn/script/basic/NASHORN-554.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-554.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-554.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-556.js b/test/nashorn/script/basic/NASHORN-556.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-556.js rename to test/nashorn/script/basic/NASHORN-556.js diff --git a/nashorn/test/script/basic/NASHORN-556.js.EXPECTED b/test/nashorn/script/basic/NASHORN-556.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-556.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-556.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-56.js b/test/nashorn/script/basic/NASHORN-56.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-56.js rename to test/nashorn/script/basic/NASHORN-56.js diff --git a/nashorn/test/script/basic/NASHORN-56.js.EXPECTED b/test/nashorn/script/basic/NASHORN-56.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-56.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-56.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-562.js b/test/nashorn/script/basic/NASHORN-562.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-562.js rename to test/nashorn/script/basic/NASHORN-562.js diff --git a/nashorn/test/script/basic/NASHORN-565.js b/test/nashorn/script/basic/NASHORN-565.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-565.js rename to test/nashorn/script/basic/NASHORN-565.js diff --git a/nashorn/test/script/basic/NASHORN-565.js.EXPECTED b/test/nashorn/script/basic/NASHORN-565.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-565.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-565.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-575.js b/test/nashorn/script/basic/NASHORN-575.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-575.js rename to test/nashorn/script/basic/NASHORN-575.js diff --git a/nashorn/test/script/basic/NASHORN-575.js.EXPECTED b/test/nashorn/script/basic/NASHORN-575.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-575.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-575.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-58.js b/test/nashorn/script/basic/NASHORN-58.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-58.js rename to test/nashorn/script/basic/NASHORN-58.js diff --git a/nashorn/test/script/basic/NASHORN-58.js.EXPECTED b/test/nashorn/script/basic/NASHORN-58.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-58.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-58.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-59.js b/test/nashorn/script/basic/NASHORN-59.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-59.js rename to test/nashorn/script/basic/NASHORN-59.js diff --git a/nashorn/test/script/basic/NASHORN-59.js.EXPECTED b/test/nashorn/script/basic/NASHORN-59.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-59.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-59.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-592-dual.js b/test/nashorn/script/basic/NASHORN-592-dual.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-592-dual.js rename to test/nashorn/script/basic/NASHORN-592-dual.js diff --git a/nashorn/test/script/basic/NASHORN-592-dual.js.EXPECTED b/test/nashorn/script/basic/NASHORN-592-dual.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-592-dual.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-592-dual.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-592.js b/test/nashorn/script/basic/NASHORN-592.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-592.js rename to test/nashorn/script/basic/NASHORN-592.js diff --git a/nashorn/test/script/basic/NASHORN-592.js.EXPECTED b/test/nashorn/script/basic/NASHORN-592.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-592.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-592.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-597.js b/test/nashorn/script/basic/NASHORN-597.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-597.js rename to test/nashorn/script/basic/NASHORN-597.js diff --git a/nashorn/test/script/basic/NASHORN-597.js.EXPECTED b/test/nashorn/script/basic/NASHORN-597.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-597.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-597.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-60.js b/test/nashorn/script/basic/NASHORN-60.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-60.js rename to test/nashorn/script/basic/NASHORN-60.js diff --git a/nashorn/test/script/basic/NASHORN-60.js.EXPECTED b/test/nashorn/script/basic/NASHORN-60.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-60.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-60.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-609.js b/test/nashorn/script/basic/NASHORN-609.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-609.js rename to test/nashorn/script/basic/NASHORN-609.js diff --git a/nashorn/test/script/basic/NASHORN-609.js.EXPECTED b/test/nashorn/script/basic/NASHORN-609.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-609.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-609.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-61.js b/test/nashorn/script/basic/NASHORN-61.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-61.js rename to test/nashorn/script/basic/NASHORN-61.js diff --git a/nashorn/test/script/basic/NASHORN-61.js.EXPECTED b/test/nashorn/script/basic/NASHORN-61.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-61.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-61.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-62.js b/test/nashorn/script/basic/NASHORN-62.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-62.js rename to test/nashorn/script/basic/NASHORN-62.js diff --git a/nashorn/test/script/basic/NASHORN-62.js.EXPECTED b/test/nashorn/script/basic/NASHORN-62.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-62.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-62.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-620.js b/test/nashorn/script/basic/NASHORN-620.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-620.js rename to test/nashorn/script/basic/NASHORN-620.js diff --git a/nashorn/test/script/basic/NASHORN-620.js.EXPECTED b/test/nashorn/script/basic/NASHORN-620.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-620.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-620.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-623.js b/test/nashorn/script/basic/NASHORN-623.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-623.js rename to test/nashorn/script/basic/NASHORN-623.js diff --git a/nashorn/test/script/basic/NASHORN-623.js.EXPECTED b/test/nashorn/script/basic/NASHORN-623.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-623.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-623.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-63.js b/test/nashorn/script/basic/NASHORN-63.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-63.js rename to test/nashorn/script/basic/NASHORN-63.js diff --git a/nashorn/test/script/basic/NASHORN-631.js.EXPECTED b/test/nashorn/script/basic/NASHORN-631.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-631.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-631.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-637.js b/test/nashorn/script/basic/NASHORN-637.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-637.js rename to test/nashorn/script/basic/NASHORN-637.js diff --git a/nashorn/test/script/basic/NASHORN-637.js.EXPECTED b/test/nashorn/script/basic/NASHORN-637.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-637.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-637.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-639.js b/test/nashorn/script/basic/NASHORN-639.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-639.js rename to test/nashorn/script/basic/NASHORN-639.js diff --git a/nashorn/test/script/basic/NASHORN-64.js b/test/nashorn/script/basic/NASHORN-64.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-64.js rename to test/nashorn/script/basic/NASHORN-64.js diff --git a/nashorn/test/script/basic/NASHORN-642.js b/test/nashorn/script/basic/NASHORN-642.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-642.js rename to test/nashorn/script/basic/NASHORN-642.js diff --git a/nashorn/test/script/basic/NASHORN-642.js.EXPECTED b/test/nashorn/script/basic/NASHORN-642.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-642.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-642.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-646.js b/test/nashorn/script/basic/NASHORN-646.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-646.js rename to test/nashorn/script/basic/NASHORN-646.js diff --git a/nashorn/test/script/basic/NASHORN-658.js b/test/nashorn/script/basic/NASHORN-658.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-658.js rename to test/nashorn/script/basic/NASHORN-658.js diff --git a/nashorn/test/script/basic/NASHORN-659.js b/test/nashorn/script/basic/NASHORN-659.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-659.js rename to test/nashorn/script/basic/NASHORN-659.js diff --git a/nashorn/test/script/basic/NASHORN-66.js b/test/nashorn/script/basic/NASHORN-66.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-66.js rename to test/nashorn/script/basic/NASHORN-66.js diff --git a/nashorn/test/script/basic/NASHORN-66.js.EXPECTED b/test/nashorn/script/basic/NASHORN-66.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-66.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-66.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-664.js b/test/nashorn/script/basic/NASHORN-664.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-664.js rename to test/nashorn/script/basic/NASHORN-664.js diff --git a/nashorn/test/script/basic/NASHORN-665.js b/test/nashorn/script/basic/NASHORN-665.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-665.js rename to test/nashorn/script/basic/NASHORN-665.js diff --git a/nashorn/test/script/basic/NASHORN-67.js b/test/nashorn/script/basic/NASHORN-67.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-67.js rename to test/nashorn/script/basic/NASHORN-67.js diff --git a/nashorn/test/script/basic/NASHORN-67.js.EXPECTED b/test/nashorn/script/basic/NASHORN-67.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-67.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-67.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-678.js b/test/nashorn/script/basic/NASHORN-678.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-678.js rename to test/nashorn/script/basic/NASHORN-678.js diff --git a/nashorn/test/script/basic/NASHORN-68.js b/test/nashorn/script/basic/NASHORN-68.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-68.js rename to test/nashorn/script/basic/NASHORN-68.js diff --git a/nashorn/test/script/basic/NASHORN-68.js.EXPECTED b/test/nashorn/script/basic/NASHORN-68.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-68.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-68.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-689.js b/test/nashorn/script/basic/NASHORN-689.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-689.js rename to test/nashorn/script/basic/NASHORN-689.js diff --git a/nashorn/test/script/basic/NASHORN-689.js.EXPECTED b/test/nashorn/script/basic/NASHORN-689.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-689.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-689.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-69.js b/test/nashorn/script/basic/NASHORN-69.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-69.js rename to test/nashorn/script/basic/NASHORN-69.js diff --git a/nashorn/test/script/basic/NASHORN-69.js.EXPECTED b/test/nashorn/script/basic/NASHORN-69.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-69.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-69.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-691.js b/test/nashorn/script/basic/NASHORN-691.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-691.js rename to test/nashorn/script/basic/NASHORN-691.js diff --git a/nashorn/test/script/basic/NASHORN-691.js.EXPECTED b/test/nashorn/script/basic/NASHORN-691.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-691.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-691.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-694.js b/test/nashorn/script/basic/NASHORN-694.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-694.js rename to test/nashorn/script/basic/NASHORN-694.js diff --git a/nashorn/test/script/basic/NASHORN-694.js.EXPECTED b/test/nashorn/script/basic/NASHORN-694.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-694.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-694.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-697.js b/test/nashorn/script/basic/NASHORN-697.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-697.js rename to test/nashorn/script/basic/NASHORN-697.js diff --git a/nashorn/test/script/basic/NASHORN-703.js b/test/nashorn/script/basic/NASHORN-703.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-703.js rename to test/nashorn/script/basic/NASHORN-703.js diff --git a/nashorn/test/script/basic/NASHORN-703.js.EXPECTED b/test/nashorn/script/basic/NASHORN-703.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-703.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-703.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-703a.js b/test/nashorn/script/basic/NASHORN-703a.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-703a.js rename to test/nashorn/script/basic/NASHORN-703a.js diff --git a/nashorn/test/script/basic/NASHORN-703a.js.EXPECTED b/test/nashorn/script/basic/NASHORN-703a.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-703a.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-703a.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-705.js b/test/nashorn/script/basic/NASHORN-705.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-705.js rename to test/nashorn/script/basic/NASHORN-705.js diff --git a/nashorn/test/script/basic/NASHORN-71.js b/test/nashorn/script/basic/NASHORN-71.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-71.js rename to test/nashorn/script/basic/NASHORN-71.js diff --git a/nashorn/test/script/basic/NASHORN-710.js b/test/nashorn/script/basic/NASHORN-710.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-710.js rename to test/nashorn/script/basic/NASHORN-710.js diff --git a/nashorn/test/script/basic/NASHORN-711.js b/test/nashorn/script/basic/NASHORN-711.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-711.js rename to test/nashorn/script/basic/NASHORN-711.js diff --git a/nashorn/test/script/basic/NASHORN-711.js.EXPECTED b/test/nashorn/script/basic/NASHORN-711.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-711.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-711.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-72.js b/test/nashorn/script/basic/NASHORN-72.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-72.js rename to test/nashorn/script/basic/NASHORN-72.js diff --git a/nashorn/test/script/basic/NASHORN-72.js.EXPECTED b/test/nashorn/script/basic/NASHORN-72.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-72.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-72.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-722.js b/test/nashorn/script/basic/NASHORN-722.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-722.js rename to test/nashorn/script/basic/NASHORN-722.js diff --git a/nashorn/test/script/basic/NASHORN-73.js b/test/nashorn/script/basic/NASHORN-73.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-73.js rename to test/nashorn/script/basic/NASHORN-73.js diff --git a/nashorn/test/script/basic/NASHORN-73.js.EXPECTED b/test/nashorn/script/basic/NASHORN-73.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-73.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-73.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-737.js b/test/nashorn/script/basic/NASHORN-737.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-737.js rename to test/nashorn/script/basic/NASHORN-737.js diff --git a/nashorn/test/script/basic/NASHORN-737.js.EXPECTED b/test/nashorn/script/basic/NASHORN-737.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-737.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-737.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-74.js b/test/nashorn/script/basic/NASHORN-74.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-74.js rename to test/nashorn/script/basic/NASHORN-74.js diff --git a/nashorn/test/script/basic/NASHORN-74.js.EXPECTED b/test/nashorn/script/basic/NASHORN-74.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-74.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-74.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-740.js b/test/nashorn/script/basic/NASHORN-740.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-740.js rename to test/nashorn/script/basic/NASHORN-740.js diff --git a/nashorn/test/script/basic/NASHORN-740.js.EXPECTED b/test/nashorn/script/basic/NASHORN-740.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-740.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-740.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-75.js b/test/nashorn/script/basic/NASHORN-75.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-75.js rename to test/nashorn/script/basic/NASHORN-75.js diff --git a/nashorn/test/script/basic/NASHORN-75.js.EXPECTED b/test/nashorn/script/basic/NASHORN-75.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-75.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-75.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-758.js b/test/nashorn/script/basic/NASHORN-758.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-758.js rename to test/nashorn/script/basic/NASHORN-758.js diff --git a/nashorn/test/script/basic/NASHORN-759.js b/test/nashorn/script/basic/NASHORN-759.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-759.js rename to test/nashorn/script/basic/NASHORN-759.js diff --git a/nashorn/test/script/basic/NASHORN-759.js.EXPECTED b/test/nashorn/script/basic/NASHORN-759.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-759.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-759.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-760.js b/test/nashorn/script/basic/NASHORN-760.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-760.js rename to test/nashorn/script/basic/NASHORN-760.js diff --git a/nashorn/test/script/basic/NASHORN-768.js b/test/nashorn/script/basic/NASHORN-768.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-768.js rename to test/nashorn/script/basic/NASHORN-768.js diff --git a/nashorn/test/script/basic/NASHORN-778.js b/test/nashorn/script/basic/NASHORN-778.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-778.js rename to test/nashorn/script/basic/NASHORN-778.js diff --git a/nashorn/test/script/basic/NASHORN-78.js b/test/nashorn/script/basic/NASHORN-78.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-78.js rename to test/nashorn/script/basic/NASHORN-78.js diff --git a/nashorn/test/script/basic/NASHORN-79.js b/test/nashorn/script/basic/NASHORN-79.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-79.js rename to test/nashorn/script/basic/NASHORN-79.js diff --git a/nashorn/test/script/basic/NASHORN-79.js.EXPECTED b/test/nashorn/script/basic/NASHORN-79.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-79.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-79.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-792.js b/test/nashorn/script/basic/NASHORN-792.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-792.js rename to test/nashorn/script/basic/NASHORN-792.js diff --git a/nashorn/test/script/basic/NASHORN-792.js.EXPECTED b/test/nashorn/script/basic/NASHORN-792.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-792.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-792.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-80.js b/test/nashorn/script/basic/NASHORN-80.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-80.js rename to test/nashorn/script/basic/NASHORN-80.js diff --git a/nashorn/test/script/basic/NASHORN-80.js.EXPECTED b/test/nashorn/script/basic/NASHORN-80.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-80.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-80.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-81.js b/test/nashorn/script/basic/NASHORN-81.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-81.js rename to test/nashorn/script/basic/NASHORN-81.js diff --git a/nashorn/test/script/basic/NASHORN-833.js b/test/nashorn/script/basic/NASHORN-833.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-833.js rename to test/nashorn/script/basic/NASHORN-833.js diff --git a/nashorn/test/script/basic/NASHORN-833.js.EXPECTED b/test/nashorn/script/basic/NASHORN-833.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-833.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-833.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-837.js b/test/nashorn/script/basic/NASHORN-837.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-837.js rename to test/nashorn/script/basic/NASHORN-837.js diff --git a/nashorn/test/script/basic/NASHORN-85.js b/test/nashorn/script/basic/NASHORN-85.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-85.js rename to test/nashorn/script/basic/NASHORN-85.js diff --git a/nashorn/test/script/basic/NASHORN-85.js.EXPECTED b/test/nashorn/script/basic/NASHORN-85.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-85.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-85.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-86.js b/test/nashorn/script/basic/NASHORN-86.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-86.js rename to test/nashorn/script/basic/NASHORN-86.js diff --git a/nashorn/test/script/basic/NASHORN-87.js b/test/nashorn/script/basic/NASHORN-87.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-87.js rename to test/nashorn/script/basic/NASHORN-87.js diff --git a/nashorn/test/script/basic/NASHORN-89.js b/test/nashorn/script/basic/NASHORN-89.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-89.js rename to test/nashorn/script/basic/NASHORN-89.js diff --git a/nashorn/test/script/basic/NASHORN-90.js b/test/nashorn/script/basic/NASHORN-90.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-90.js rename to test/nashorn/script/basic/NASHORN-90.js diff --git a/nashorn/test/script/basic/NASHORN-90.js.EXPECTED b/test/nashorn/script/basic/NASHORN-90.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-90.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-90.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-91.js b/test/nashorn/script/basic/NASHORN-91.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-91.js rename to test/nashorn/script/basic/NASHORN-91.js diff --git a/nashorn/test/script/basic/NASHORN-91.js.EXPECTED b/test/nashorn/script/basic/NASHORN-91.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-91.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-91.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-92.js b/test/nashorn/script/basic/NASHORN-92.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-92.js rename to test/nashorn/script/basic/NASHORN-92.js diff --git a/nashorn/test/script/basic/NASHORN-92.js.EXPECTED b/test/nashorn/script/basic/NASHORN-92.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-92.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-92.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-93.js b/test/nashorn/script/basic/NASHORN-93.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-93.js rename to test/nashorn/script/basic/NASHORN-93.js diff --git a/nashorn/test/script/basic/NASHORN-95.js b/test/nashorn/script/basic/NASHORN-95.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-95.js rename to test/nashorn/script/basic/NASHORN-95.js diff --git a/nashorn/test/script/basic/NASHORN-95.js.EXPECTED b/test/nashorn/script/basic/NASHORN-95.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-95.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-95.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-96.js b/test/nashorn/script/basic/NASHORN-96.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-96.js rename to test/nashorn/script/basic/NASHORN-96.js diff --git a/nashorn/test/script/basic/NASHORN-96.js.EXPECTED b/test/nashorn/script/basic/NASHORN-96.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-96.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-96.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-97.js b/test/nashorn/script/basic/NASHORN-97.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-97.js rename to test/nashorn/script/basic/NASHORN-97.js diff --git a/nashorn/test/script/basic/NASHORN-98.js b/test/nashorn/script/basic/NASHORN-98.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-98.js rename to test/nashorn/script/basic/NASHORN-98.js diff --git a/nashorn/test/script/basic/NASHORN-98.js.EXPECTED b/test/nashorn/script/basic/NASHORN-98.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/NASHORN-98.js.EXPECTED rename to test/nashorn/script/basic/NASHORN-98.js.EXPECTED diff --git a/nashorn/test/script/basic/NASHORN-99.js b/test/nashorn/script/basic/NASHORN-99.js similarity index 100% rename from nashorn/test/script/basic/NASHORN-99.js rename to test/nashorn/script/basic/NASHORN-99.js diff --git a/nashorn/test/script/basic/access-specializer.js b/test/nashorn/script/basic/access-specializer.js similarity index 100% rename from nashorn/test/script/basic/access-specializer.js rename to test/nashorn/script/basic/access-specializer.js diff --git a/nashorn/test/script/basic/addition.js b/test/nashorn/script/basic/addition.js similarity index 100% rename from nashorn/test/script/basic/addition.js rename to test/nashorn/script/basic/addition.js diff --git a/nashorn/test/script/basic/addition.js.EXPECTED b/test/nashorn/script/basic/addition.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/addition.js.EXPECTED rename to test/nashorn/script/basic/addition.js.EXPECTED diff --git a/nashorn/test/script/basic/allgettersetters.js b/test/nashorn/script/basic/allgettersetters.js similarity index 100% rename from nashorn/test/script/basic/allgettersetters.js rename to test/nashorn/script/basic/allgettersetters.js diff --git a/nashorn/test/script/basic/andor.js b/test/nashorn/script/basic/andor.js similarity index 100% rename from nashorn/test/script/basic/andor.js rename to test/nashorn/script/basic/andor.js diff --git a/nashorn/test/script/basic/andor.js.EXPECTED b/test/nashorn/script/basic/andor.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/andor.js.EXPECTED rename to test/nashorn/script/basic/andor.js.EXPECTED diff --git a/nashorn/test/script/basic/anonrecur.js b/test/nashorn/script/basic/anonrecur.js similarity index 100% rename from nashorn/test/script/basic/anonrecur.js rename to test/nashorn/script/basic/anonrecur.js diff --git a/nashorn/test/script/basic/anonrecur.js.EXPECTED b/test/nashorn/script/basic/anonrecur.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/anonrecur.js.EXPECTED rename to test/nashorn/script/basic/anonrecur.js.EXPECTED diff --git a/nashorn/test/script/basic/apply_to_call/JDK-8145669.js b/test/nashorn/script/basic/apply_to_call/JDK-8145669.js similarity index 100% rename from nashorn/test/script/basic/apply_to_call/JDK-8145669.js rename to test/nashorn/script/basic/apply_to_call/JDK-8145669.js diff --git a/nashorn/test/script/basic/apply_to_call/JDK-8145669.js.EXPECTED b/test/nashorn/script/basic/apply_to_call/JDK-8145669.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/apply_to_call/JDK-8145669.js.EXPECTED rename to test/nashorn/script/basic/apply_to_call/JDK-8145669.js.EXPECTED diff --git a/nashorn/test/script/basic/apply_to_call/JDK-8145669_2.js b/test/nashorn/script/basic/apply_to_call/JDK-8145669_2.js similarity index 100% rename from nashorn/test/script/basic/apply_to_call/JDK-8145669_2.js rename to test/nashorn/script/basic/apply_to_call/JDK-8145669_2.js diff --git a/nashorn/test/script/basic/apply_to_call/JDK-8145669_2.js.EXPECTED b/test/nashorn/script/basic/apply_to_call/JDK-8145669_2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/apply_to_call/JDK-8145669_2.js.EXPECTED rename to test/nashorn/script/basic/apply_to_call/JDK-8145669_2.js.EXPECTED diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call1.js b/test/nashorn/script/basic/apply_to_call/apply_to_call1.js similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call1.js rename to test/nashorn/script/basic/apply_to_call/apply_to_call1.js diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call1.js.EXPECTED b/test/nashorn/script/basic/apply_to_call/apply_to_call1.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call1.js.EXPECTED rename to test/nashorn/script/basic/apply_to_call/apply_to_call1.js.EXPECTED diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call2.js b/test/nashorn/script/basic/apply_to_call/apply_to_call2.js similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call2.js rename to test/nashorn/script/basic/apply_to_call/apply_to_call2.js diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call2.js.EXPECTED b/test/nashorn/script/basic/apply_to_call/apply_to_call2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call2.js.EXPECTED rename to test/nashorn/script/basic/apply_to_call/apply_to_call2.js.EXPECTED diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call3.js b/test/nashorn/script/basic/apply_to_call/apply_to_call3.js similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call3.js rename to test/nashorn/script/basic/apply_to_call/apply_to_call3.js diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call3.js.EXPECTED b/test/nashorn/script/basic/apply_to_call/apply_to_call3.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call3.js.EXPECTED rename to test/nashorn/script/basic/apply_to_call/apply_to_call3.js.EXPECTED diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call4.js b/test/nashorn/script/basic/apply_to_call/apply_to_call4.js similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call4.js rename to test/nashorn/script/basic/apply_to_call/apply_to_call4.js diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call4.js.EXPECTED b/test/nashorn/script/basic/apply_to_call/apply_to_call4.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call4.js.EXPECTED rename to test/nashorn/script/basic/apply_to_call/apply_to_call4.js.EXPECTED diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call5.js b/test/nashorn/script/basic/apply_to_call/apply_to_call5.js similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call5.js rename to test/nashorn/script/basic/apply_to_call/apply_to_call5.js diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call5.js.EXPECTED b/test/nashorn/script/basic/apply_to_call/apply_to_call5.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call5.js.EXPECTED rename to test/nashorn/script/basic/apply_to_call/apply_to_call5.js.EXPECTED diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call_recompile.js b/test/nashorn/script/basic/apply_to_call/apply_to_call_recompile.js similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call_recompile.js rename to test/nashorn/script/basic/apply_to_call/apply_to_call_recompile.js diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call_recompile.js.EXPECTED b/test/nashorn/script/basic/apply_to_call/apply_to_call_recompile.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call_recompile.js.EXPECTED rename to test/nashorn/script/basic/apply_to_call/apply_to_call_recompile.js.EXPECTED diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call_varargs.js b/test/nashorn/script/basic/apply_to_call/apply_to_call_varargs.js similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call_varargs.js rename to test/nashorn/script/basic/apply_to_call/apply_to_call_varargs.js diff --git a/nashorn/test/script/basic/apply_to_call/apply_to_call_varargs.js.EXPECTED b/test/nashorn/script/basic/apply_to_call/apply_to_call_varargs.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/apply_to_call/apply_to_call_varargs.js.EXPECTED rename to test/nashorn/script/basic/apply_to_call/apply_to_call_varargs.js.EXPECTED diff --git a/nashorn/test/script/basic/applycall.js b/test/nashorn/script/basic/applycall.js similarity index 100% rename from nashorn/test/script/basic/applycall.js rename to test/nashorn/script/basic/applycall.js diff --git a/nashorn/test/script/basic/applycall.js.EXPECTED b/test/nashorn/script/basic/applycall.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/applycall.js.EXPECTED rename to test/nashorn/script/basic/applycall.js.EXPECTED diff --git a/nashorn/test/script/basic/args.js b/test/nashorn/script/basic/args.js similarity index 100% rename from nashorn/test/script/basic/args.js rename to test/nashorn/script/basic/args.js diff --git a/nashorn/test/script/basic/args.js.EXPECTED b/test/nashorn/script/basic/args.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/args.js.EXPECTED rename to test/nashorn/script/basic/args.js.EXPECTED diff --git a/nashorn/test/script/basic/arity.js b/test/nashorn/script/basic/arity.js similarity index 100% rename from nashorn/test/script/basic/arity.js rename to test/nashorn/script/basic/arity.js diff --git a/nashorn/test/script/basic/arity.js.EXPECTED b/test/nashorn/script/basic/arity.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/arity.js.EXPECTED rename to test/nashorn/script/basic/arity.js.EXPECTED diff --git a/nashorn/test/script/basic/arrayprotoclass.js b/test/nashorn/script/basic/arrayprotoclass.js similarity index 100% rename from nashorn/test/script/basic/arrayprotoclass.js rename to test/nashorn/script/basic/arrayprotoclass.js diff --git a/nashorn/test/script/basic/arrayprotoclass.js.EXPECTED b/test/nashorn/script/basic/arrayprotoclass.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/arrayprotoclass.js.EXPECTED rename to test/nashorn/script/basic/arrayprotoclass.js.EXPECTED diff --git a/nashorn/test/script/basic/arrays.js b/test/nashorn/script/basic/arrays.js similarity index 100% rename from nashorn/test/script/basic/arrays.js rename to test/nashorn/script/basic/arrays.js diff --git a/nashorn/test/script/basic/arrays.js.EXPECTED b/test/nashorn/script/basic/arrays.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/arrays.js.EXPECTED rename to test/nashorn/script/basic/arrays.js.EXPECTED diff --git a/nashorn/test/script/basic/arrays2.js b/test/nashorn/script/basic/arrays2.js similarity index 100% rename from nashorn/test/script/basic/arrays2.js rename to test/nashorn/script/basic/arrays2.js diff --git a/nashorn/test/script/basic/arrays2.js.EXPECTED b/test/nashorn/script/basic/arrays2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/arrays2.js.EXPECTED rename to test/nashorn/script/basic/arrays2.js.EXPECTED diff --git a/nashorn/test/script/basic/arrays_int_key.js b/test/nashorn/script/basic/arrays_int_key.js similarity index 100% rename from nashorn/test/script/basic/arrays_int_key.js rename to test/nashorn/script/basic/arrays_int_key.js diff --git a/nashorn/test/script/basic/arrays_int_key.js.EXPECTED b/test/nashorn/script/basic/arrays_int_key.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/arrays_int_key.js.EXPECTED rename to test/nashorn/script/basic/arrays_int_key.js.EXPECTED diff --git a/nashorn/test/script/basic/arrayset.js b/test/nashorn/script/basic/arrayset.js similarity index 100% rename from nashorn/test/script/basic/arrayset.js rename to test/nashorn/script/basic/arrayset.js diff --git a/nashorn/test/script/basic/arrayset.js.EXPECTED b/test/nashorn/script/basic/arrayset.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/arrayset.js.EXPECTED rename to test/nashorn/script/basic/arrayset.js.EXPECTED diff --git a/nashorn/test/script/basic/arrayundefined.js b/test/nashorn/script/basic/arrayundefined.js similarity index 100% rename from nashorn/test/script/basic/arrayundefined.js rename to test/nashorn/script/basic/arrayundefined.js diff --git a/nashorn/test/script/basic/arrayundefined.js.EXPECTED b/test/nashorn/script/basic/arrayundefined.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/arrayundefined.js.EXPECTED rename to test/nashorn/script/basic/arrayundefined.js.EXPECTED diff --git a/nashorn/test/script/basic/assign.js b/test/nashorn/script/basic/assign.js similarity index 100% rename from nashorn/test/script/basic/assign.js rename to test/nashorn/script/basic/assign.js diff --git a/nashorn/test/script/basic/assign.js.EXPECTED b/test/nashorn/script/basic/assign.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/assign.js.EXPECTED rename to test/nashorn/script/basic/assign.js.EXPECTED diff --git a/nashorn/test/script/basic/assign_builtin_func_props.js b/test/nashorn/script/basic/assign_builtin_func_props.js similarity index 100% rename from nashorn/test/script/basic/assign_builtin_func_props.js rename to test/nashorn/script/basic/assign_builtin_func_props.js diff --git a/nashorn/test/script/basic/bitwise_and.js b/test/nashorn/script/basic/bitwise_and.js similarity index 100% rename from nashorn/test/script/basic/bitwise_and.js rename to test/nashorn/script/basic/bitwise_and.js diff --git a/nashorn/test/script/basic/bitwise_and.js.EXPECTED b/test/nashorn/script/basic/bitwise_and.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/bitwise_and.js.EXPECTED rename to test/nashorn/script/basic/bitwise_and.js.EXPECTED diff --git a/nashorn/test/script/basic/boolean_arithmetic.js b/test/nashorn/script/basic/boolean_arithmetic.js similarity index 100% rename from nashorn/test/script/basic/boolean_arithmetic.js rename to test/nashorn/script/basic/boolean_arithmetic.js diff --git a/nashorn/test/script/basic/boolean_arithmetic.js.EXPECTED b/test/nashorn/script/basic/boolean_arithmetic.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/boolean_arithmetic.js.EXPECTED rename to test/nashorn/script/basic/boolean_arithmetic.js.EXPECTED diff --git a/nashorn/test/script/basic/booleangetter.js b/test/nashorn/script/basic/booleangetter.js similarity index 100% rename from nashorn/test/script/basic/booleangetter.js rename to test/nashorn/script/basic/booleangetter.js diff --git a/nashorn/test/script/basic/booleangetter.js.EXPECTED b/test/nashorn/script/basic/booleangetter.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/booleangetter.js.EXPECTED rename to test/nashorn/script/basic/booleangetter.js.EXPECTED diff --git a/nashorn/test/script/basic/builtin.js b/test/nashorn/script/basic/builtin.js similarity index 100% rename from nashorn/test/script/basic/builtin.js rename to test/nashorn/script/basic/builtin.js diff --git a/nashorn/test/script/basic/builtin.js.EXPECTED b/test/nashorn/script/basic/builtin.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/builtin.js.EXPECTED rename to test/nashorn/script/basic/builtin.js.EXPECTED diff --git a/nashorn/test/script/basic/builtin_assign.js b/test/nashorn/script/basic/builtin_assign.js similarity index 100% rename from nashorn/test/script/basic/builtin_assign.js rename to test/nashorn/script/basic/builtin_assign.js diff --git a/nashorn/test/script/basic/builtin_assign.js.EXPECTED b/test/nashorn/script/basic/builtin_assign.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/builtin_assign.js.EXPECTED rename to test/nashorn/script/basic/builtin_assign.js.EXPECTED diff --git a/nashorn/test/script/basic/builtinchain.js b/test/nashorn/script/basic/builtinchain.js similarity index 100% rename from nashorn/test/script/basic/builtinchain.js rename to test/nashorn/script/basic/builtinchain.js diff --git a/nashorn/test/script/basic/builtinchain.js.EXPECTED b/test/nashorn/script/basic/builtinchain.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/builtinchain.js.EXPECTED rename to test/nashorn/script/basic/builtinchain.js.EXPECTED diff --git a/nashorn/test/script/basic/calllink.js b/test/nashorn/script/basic/calllink.js similarity index 100% rename from nashorn/test/script/basic/calllink.js rename to test/nashorn/script/basic/calllink.js diff --git a/nashorn/test/script/basic/calllink.js.EXPECTED b/test/nashorn/script/basic/calllink.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/calllink.js.EXPECTED rename to test/nashorn/script/basic/calllink.js.EXPECTED diff --git a/nashorn/test/script/basic/circular_proto.js b/test/nashorn/script/basic/circular_proto.js similarity index 100% rename from nashorn/test/script/basic/circular_proto.js rename to test/nashorn/script/basic/circular_proto.js diff --git a/nashorn/test/script/basic/circular_proto.js.EXPECTED b/test/nashorn/script/basic/circular_proto.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/circular_proto.js.EXPECTED rename to test/nashorn/script/basic/circular_proto.js.EXPECTED diff --git a/nashorn/test/script/basic/classloader.js b/test/nashorn/script/basic/classloader.js similarity index 100% rename from nashorn/test/script/basic/classloader.js rename to test/nashorn/script/basic/classloader.js diff --git a/nashorn/test/script/basic/classloader.js.EXPECTED b/test/nashorn/script/basic/classloader.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/classloader.js.EXPECTED rename to test/nashorn/script/basic/classloader.js.EXPECTED diff --git a/nashorn/test/script/basic/closure.js b/test/nashorn/script/basic/closure.js similarity index 100% rename from nashorn/test/script/basic/closure.js rename to test/nashorn/script/basic/closure.js diff --git a/nashorn/test/script/basic/closure.js.EXPECTED b/test/nashorn/script/basic/closure.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/closure.js.EXPECTED rename to test/nashorn/script/basic/closure.js.EXPECTED diff --git a/nashorn/test/script/basic/commandargs.js b/test/nashorn/script/basic/commandargs.js similarity index 100% rename from nashorn/test/script/basic/commandargs.js rename to test/nashorn/script/basic/commandargs.js diff --git a/nashorn/test/script/basic/commandargs.js.EXPECTED b/test/nashorn/script/basic/commandargs.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/commandargs.js.EXPECTED rename to test/nashorn/script/basic/commandargs.js.EXPECTED diff --git a/nashorn/test/script/basic/compile-octane-normal.js b/test/nashorn/script/basic/compile-octane-normal.js similarity index 100% rename from nashorn/test/script/basic/compile-octane-normal.js rename to test/nashorn/script/basic/compile-octane-normal.js diff --git a/nashorn/test/script/basic/compile-octane-normal.js.EXPECTED b/test/nashorn/script/basic/compile-octane-normal.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/compile-octane-normal.js.EXPECTED rename to test/nashorn/script/basic/compile-octane-normal.js.EXPECTED diff --git a/nashorn/test/script/basic/compile-octane-splitter.js b/test/nashorn/script/basic/compile-octane-splitter.js similarity index 100% rename from nashorn/test/script/basic/compile-octane-splitter.js rename to test/nashorn/script/basic/compile-octane-splitter.js diff --git a/nashorn/test/script/basic/compile-octane-splitter.js.EXPECTED b/test/nashorn/script/basic/compile-octane-splitter.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/compile-octane-splitter.js.EXPECTED rename to test/nashorn/script/basic/compile-octane-splitter.js.EXPECTED diff --git a/nashorn/test/script/basic/compile-octane.js b/test/nashorn/script/basic/compile-octane.js similarity index 100% rename from nashorn/test/script/basic/compile-octane.js rename to test/nashorn/script/basic/compile-octane.js diff --git a/nashorn/test/script/basic/condassign.js b/test/nashorn/script/basic/condassign.js similarity index 100% rename from nashorn/test/script/basic/condassign.js rename to test/nashorn/script/basic/condassign.js diff --git a/nashorn/test/script/basic/condassign.js.EXPECTED b/test/nashorn/script/basic/condassign.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/condassign.js.EXPECTED rename to test/nashorn/script/basic/condassign.js.EXPECTED diff --git a/nashorn/test/script/basic/consstring.js b/test/nashorn/script/basic/consstring.js similarity index 100% rename from nashorn/test/script/basic/consstring.js rename to test/nashorn/script/basic/consstring.js diff --git a/nashorn/test/script/basic/construct.js b/test/nashorn/script/basic/construct.js similarity index 100% rename from nashorn/test/script/basic/construct.js rename to test/nashorn/script/basic/construct.js diff --git a/nashorn/test/script/basic/construct.js.EXPECTED b/test/nashorn/script/basic/construct.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/construct.js.EXPECTED rename to test/nashorn/script/basic/construct.js.EXPECTED diff --git a/nashorn/test/script/basic/constructorname.js b/test/nashorn/script/basic/constructorname.js similarity index 100% rename from nashorn/test/script/basic/constructorname.js rename to test/nashorn/script/basic/constructorname.js diff --git a/nashorn/test/script/basic/constructorname.js.EXPECTED b/test/nashorn/script/basic/constructorname.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/constructorname.js.EXPECTED rename to test/nashorn/script/basic/constructorname.js.EXPECTED diff --git a/nashorn/test/script/basic/convert.js b/test/nashorn/script/basic/convert.js similarity index 100% rename from nashorn/test/script/basic/convert.js rename to test/nashorn/script/basic/convert.js diff --git a/nashorn/test/script/basic/convert.js.EXPECTED b/test/nashorn/script/basic/convert.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/convert.js.EXPECTED rename to test/nashorn/script/basic/convert.js.EXPECTED diff --git a/nashorn/test/script/basic/dataview_endian.js b/test/nashorn/script/basic/dataview_endian.js similarity index 100% rename from nashorn/test/script/basic/dataview_endian.js rename to test/nashorn/script/basic/dataview_endian.js diff --git a/nashorn/test/script/basic/dataview_getset.js b/test/nashorn/script/basic/dataview_getset.js similarity index 100% rename from nashorn/test/script/basic/dataview_getset.js rename to test/nashorn/script/basic/dataview_getset.js diff --git a/nashorn/test/script/basic/dataview_new.js b/test/nashorn/script/basic/dataview_new.js similarity index 100% rename from nashorn/test/script/basic/dataview_new.js rename to test/nashorn/script/basic/dataview_new.js diff --git a/nashorn/test/script/basic/date.js b/test/nashorn/script/basic/date.js similarity index 100% rename from nashorn/test/script/basic/date.js rename to test/nashorn/script/basic/date.js diff --git a/nashorn/test/script/basic/date.js.EXPECTED b/test/nashorn/script/basic/date.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/date.js.EXPECTED rename to test/nashorn/script/basic/date.js.EXPECTED diff --git a/nashorn/test/script/basic/dateparse.js b/test/nashorn/script/basic/dateparse.js similarity index 100% rename from nashorn/test/script/basic/dateparse.js rename to test/nashorn/script/basic/dateparse.js diff --git a/nashorn/test/script/basic/dateparse.js.EXPECTED b/test/nashorn/script/basic/dateparse.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/dateparse.js.EXPECTED rename to test/nashorn/script/basic/dateparse.js.EXPECTED diff --git a/nashorn/test/script/basic/debugger.js b/test/nashorn/script/basic/debugger.js similarity index 100% rename from nashorn/test/script/basic/debugger.js rename to test/nashorn/script/basic/debugger.js diff --git a/nashorn/test/script/basic/decinc.js b/test/nashorn/script/basic/decinc.js similarity index 100% rename from nashorn/test/script/basic/decinc.js rename to test/nashorn/script/basic/decinc.js diff --git a/nashorn/test/script/basic/decinc.js.EXPECTED b/test/nashorn/script/basic/decinc.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/decinc.js.EXPECTED rename to test/nashorn/script/basic/decinc.js.EXPECTED diff --git a/nashorn/test/script/basic/delete.js b/test/nashorn/script/basic/delete.js similarity index 100% rename from nashorn/test/script/basic/delete.js rename to test/nashorn/script/basic/delete.js diff --git a/nashorn/test/script/basic/delete.js.EXPECTED b/test/nashorn/script/basic/delete.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/delete.js.EXPECTED rename to test/nashorn/script/basic/delete.js.EXPECTED diff --git a/nashorn/test/script/basic/delete2.js b/test/nashorn/script/basic/delete2.js similarity index 100% rename from nashorn/test/script/basic/delete2.js rename to test/nashorn/script/basic/delete2.js diff --git a/nashorn/test/script/basic/delete2.js.EXPECTED b/test/nashorn/script/basic/delete2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/delete2.js.EXPECTED rename to test/nashorn/script/basic/delete2.js.EXPECTED diff --git a/nashorn/test/script/basic/dotpropname.js b/test/nashorn/script/basic/dotpropname.js similarity index 100% rename from nashorn/test/script/basic/dotpropname.js rename to test/nashorn/script/basic/dotpropname.js diff --git a/nashorn/test/script/basic/dotpropname.js.EXPECTED b/test/nashorn/script/basic/dotpropname.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/dotpropname.js.EXPECTED rename to test/nashorn/script/basic/dotpropname.js.EXPECTED diff --git a/nashorn/test/script/basic/doublecache.js b/test/nashorn/script/basic/doublecache.js similarity index 100% rename from nashorn/test/script/basic/doublecache.js rename to test/nashorn/script/basic/doublecache.js diff --git a/nashorn/test/script/basic/doublecache.js.EXPECTED b/test/nashorn/script/basic/doublecache.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/doublecache.js.EXPECTED rename to test/nashorn/script/basic/doublecache.js.EXPECTED diff --git a/nashorn/test/script/basic/enumeration.js b/test/nashorn/script/basic/enumeration.js similarity index 100% rename from nashorn/test/script/basic/enumeration.js rename to test/nashorn/script/basic/enumeration.js diff --git a/nashorn/test/script/basic/enumeration.js.EXPECTED b/test/nashorn/script/basic/enumeration.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/enumeration.js.EXPECTED rename to test/nashorn/script/basic/enumeration.js.EXPECTED diff --git a/nashorn/test/script/basic/errors.js b/test/nashorn/script/basic/errors.js similarity index 100% rename from nashorn/test/script/basic/errors.js rename to test/nashorn/script/basic/errors.js diff --git a/nashorn/test/script/basic/errors.js.EXPECTED b/test/nashorn/script/basic/errors.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/errors.js.EXPECTED rename to test/nashorn/script/basic/errors.js.EXPECTED diff --git a/nashorn/test/script/basic/errorstack.js b/test/nashorn/script/basic/errorstack.js similarity index 100% rename from nashorn/test/script/basic/errorstack.js rename to test/nashorn/script/basic/errorstack.js diff --git a/nashorn/test/script/basic/errorstack.js.EXPECTED b/test/nashorn/script/basic/errorstack.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/errorstack.js.EXPECTED rename to test/nashorn/script/basic/errorstack.js.EXPECTED diff --git a/nashorn/test/script/basic/es6.js b/test/nashorn/script/basic/es6.js similarity index 100% rename from nashorn/test/script/basic/es6.js rename to test/nashorn/script/basic/es6.js diff --git a/nashorn/test/script/basic/es6/JDK-8151809.js b/test/nashorn/script/basic/es6/JDK-8151809.js similarity index 100% rename from nashorn/test/script/basic/es6/JDK-8151809.js rename to test/nashorn/script/basic/es6/JDK-8151809.js diff --git a/nashorn/test/script/basic/es6/JDK-8151810.js b/test/nashorn/script/basic/es6/JDK-8151810.js similarity index 100% rename from nashorn/test/script/basic/es6/JDK-8151810.js rename to test/nashorn/script/basic/es6/JDK-8151810.js diff --git a/nashorn/test/script/basic/es6/JDK-8151811.js b/test/nashorn/script/basic/es6/JDK-8151811.js similarity index 100% rename from nashorn/test/script/basic/es6/JDK-8151811.js rename to test/nashorn/script/basic/es6/JDK-8151811.js diff --git a/nashorn/test/script/basic/es6/JDK-8156492.js b/test/nashorn/script/basic/es6/JDK-8156492.js similarity index 100% rename from nashorn/test/script/basic/es6/JDK-8156492.js rename to test/nashorn/script/basic/es6/JDK-8156492.js diff --git a/nashorn/test/script/basic/es6/JDK-8156614.js b/test/nashorn/script/basic/es6/JDK-8156614.js similarity index 100% rename from nashorn/test/script/basic/es6/JDK-8156614.js rename to test/nashorn/script/basic/es6/JDK-8156614.js diff --git a/nashorn/test/script/basic/es6/JDK-8156665.js b/test/nashorn/script/basic/es6/JDK-8156665.js similarity index 100% rename from nashorn/test/script/basic/es6/JDK-8156665.js rename to test/nashorn/script/basic/es6/JDK-8156665.js diff --git a/nashorn/test/script/basic/es6/JDK-8156665.js.EXPECTED b/test/nashorn/script/basic/es6/JDK-8156665.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/JDK-8156665.js.EXPECTED rename to test/nashorn/script/basic/es6/JDK-8156665.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/JDK-8156743.js b/test/nashorn/script/basic/es6/JDK-8156743.js similarity index 100% rename from nashorn/test/script/basic/es6/JDK-8156743.js rename to test/nashorn/script/basic/es6/JDK-8156743.js diff --git a/nashorn/test/script/basic/es6/JDK-8156743.js.EXPECTED b/test/nashorn/script/basic/es6/JDK-8156743.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/JDK-8156743.js.EXPECTED rename to test/nashorn/script/basic/es6/JDK-8156743.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/JDK-8168140.js b/test/nashorn/script/basic/es6/JDK-8168140.js similarity index 100% rename from nashorn/test/script/basic/es6/JDK-8168140.js rename to test/nashorn/script/basic/es6/JDK-8168140.js diff --git a/nashorn/test/script/basic/es6/JDK-8168373.js b/test/nashorn/script/basic/es6/JDK-8168373.js similarity index 100% rename from nashorn/test/script/basic/es6/JDK-8168373.js rename to test/nashorn/script/basic/es6/JDK-8168373.js diff --git a/nashorn/test/script/basic/es6/block-function-decl.js b/test/nashorn/script/basic/es6/block-function-decl.js similarity index 100% rename from nashorn/test/script/basic/es6/block-function-decl.js rename to test/nashorn/script/basic/es6/block-function-decl.js diff --git a/nashorn/test/script/basic/es6/block-function-decl.js.EXPECTED b/test/nashorn/script/basic/es6/block-function-decl.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/block-function-decl.js.EXPECTED rename to test/nashorn/script/basic/es6/block-function-decl.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/class.js b/test/nashorn/script/basic/es6/class.js similarity index 100% rename from nashorn/test/script/basic/es6/class.js rename to test/nashorn/script/basic/es6/class.js diff --git a/nashorn/test/script/basic/es6/class.js.EXPECTED b/test/nashorn/script/basic/es6/class.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/class.js.EXPECTED rename to test/nashorn/script/basic/es6/class.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/computed-property-duplicate.js b/test/nashorn/script/basic/es6/computed-property-duplicate.js similarity index 100% rename from nashorn/test/script/basic/es6/computed-property-duplicate.js rename to test/nashorn/script/basic/es6/computed-property-duplicate.js diff --git a/nashorn/test/script/basic/es6/computed-property-getter.js b/test/nashorn/script/basic/es6/computed-property-getter.js similarity index 100% rename from nashorn/test/script/basic/es6/computed-property-getter.js rename to test/nashorn/script/basic/es6/computed-property-getter.js diff --git a/nashorn/test/script/basic/es6/computed-property-method.js b/test/nashorn/script/basic/es6/computed-property-method.js similarity index 100% rename from nashorn/test/script/basic/es6/computed-property-method.js rename to test/nashorn/script/basic/es6/computed-property-method.js diff --git a/nashorn/test/script/basic/es6/computed-property-number.js b/test/nashorn/script/basic/es6/computed-property-number.js similarity index 100% rename from nashorn/test/script/basic/es6/computed-property-number.js rename to test/nashorn/script/basic/es6/computed-property-number.js diff --git a/nashorn/test/script/basic/es6/computed-property-setter.js b/test/nashorn/script/basic/es6/computed-property-setter.js similarity index 100% rename from nashorn/test/script/basic/es6/computed-property-setter.js rename to test/nashorn/script/basic/es6/computed-property-setter.js diff --git a/nashorn/test/script/basic/es6/computed-property.js b/test/nashorn/script/basic/es6/computed-property.js similarity index 100% rename from nashorn/test/script/basic/es6/computed-property.js rename to test/nashorn/script/basic/es6/computed-property.js diff --git a/nashorn/test/script/basic/es6/const-empty.js b/test/nashorn/script/basic/es6/const-empty.js similarity index 100% rename from nashorn/test/script/basic/es6/const-empty.js rename to test/nashorn/script/basic/es6/const-empty.js diff --git a/nashorn/test/script/basic/es6/const-empty.js.EXPECTED b/test/nashorn/script/basic/es6/const-empty.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/const-empty.js.EXPECTED rename to test/nashorn/script/basic/es6/const-empty.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/const-reassign.js b/test/nashorn/script/basic/es6/const-reassign.js similarity index 100% rename from nashorn/test/script/basic/es6/const-reassign.js rename to test/nashorn/script/basic/es6/const-reassign.js diff --git a/nashorn/test/script/basic/es6/const-reassign.js.EXPECTED b/test/nashorn/script/basic/es6/const-reassign.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/const-reassign.js.EXPECTED rename to test/nashorn/script/basic/es6/const-reassign.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/const-redeclare-extra.js b/test/nashorn/script/basic/es6/const-redeclare-extra.js similarity index 100% rename from nashorn/test/script/basic/es6/const-redeclare-extra.js rename to test/nashorn/script/basic/es6/const-redeclare-extra.js diff --git a/nashorn/test/script/basic/es6/const-redeclare-extra.js.EXPECTED b/test/nashorn/script/basic/es6/const-redeclare-extra.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/const-redeclare-extra.js.EXPECTED rename to test/nashorn/script/basic/es6/const-redeclare-extra.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/const-redeclare.js b/test/nashorn/script/basic/es6/const-redeclare.js similarity index 100% rename from nashorn/test/script/basic/es6/const-redeclare.js rename to test/nashorn/script/basic/es6/const-redeclare.js diff --git a/nashorn/test/script/basic/es6/const-redeclare.js.EXPECTED b/test/nashorn/script/basic/es6/const-redeclare.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/const-redeclare.js.EXPECTED rename to test/nashorn/script/basic/es6/const-redeclare.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/const-self.js b/test/nashorn/script/basic/es6/const-self.js similarity index 100% rename from nashorn/test/script/basic/es6/const-self.js rename to test/nashorn/script/basic/es6/const-self.js diff --git a/nashorn/test/script/basic/es6/const-self.js.EXPECTED b/test/nashorn/script/basic/es6/const-self.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/const-self.js.EXPECTED rename to test/nashorn/script/basic/es6/const-self.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/const-tdz.js b/test/nashorn/script/basic/es6/const-tdz.js similarity index 100% rename from nashorn/test/script/basic/es6/const-tdz.js rename to test/nashorn/script/basic/es6/const-tdz.js diff --git a/nashorn/test/script/basic/es6/const-tdz.js.EXPECTED b/test/nashorn/script/basic/es6/const-tdz.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/const-tdz.js.EXPECTED rename to test/nashorn/script/basic/es6/const-tdz.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/const.js b/test/nashorn/script/basic/es6/const.js similarity index 100% rename from nashorn/test/script/basic/es6/const.js rename to test/nashorn/script/basic/es6/const.js diff --git a/nashorn/test/script/basic/es6/const.js.EXPECTED b/test/nashorn/script/basic/es6/const.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/const.js.EXPECTED rename to test/nashorn/script/basic/es6/const.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/destructuring.js b/test/nashorn/script/basic/es6/destructuring.js similarity index 100% rename from nashorn/test/script/basic/es6/destructuring.js rename to test/nashorn/script/basic/es6/destructuring.js diff --git a/nashorn/test/script/basic/es6/destructuring.js.EXPECTED b/test/nashorn/script/basic/es6/destructuring.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/destructuring.js.EXPECTED rename to test/nashorn/script/basic/es6/destructuring.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/for-let-object-fields.js b/test/nashorn/script/basic/es6/for-let-object-fields.js similarity index 100% rename from nashorn/test/script/basic/es6/for-let-object-fields.js rename to test/nashorn/script/basic/es6/for-let-object-fields.js diff --git a/nashorn/test/script/basic/es6/for-let-object-fields.js.EXPECTED b/test/nashorn/script/basic/es6/for-let-object-fields.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/for-let-object-fields.js.EXPECTED rename to test/nashorn/script/basic/es6/for-let-object-fields.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/for-let.js b/test/nashorn/script/basic/es6/for-let.js similarity index 100% rename from nashorn/test/script/basic/es6/for-let.js rename to test/nashorn/script/basic/es6/for-let.js diff --git a/nashorn/test/script/basic/es6/for-let.js.EXPECTED b/test/nashorn/script/basic/es6/for-let.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/for-let.js.EXPECTED rename to test/nashorn/script/basic/es6/for-let.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/for-of.js b/test/nashorn/script/basic/es6/for-of.js similarity index 100% rename from nashorn/test/script/basic/es6/for-of.js rename to test/nashorn/script/basic/es6/for-of.js diff --git a/nashorn/test/script/basic/es6/generator.js b/test/nashorn/script/basic/es6/generator.js similarity index 100% rename from nashorn/test/script/basic/es6/generator.js rename to test/nashorn/script/basic/es6/generator.js diff --git a/nashorn/test/script/basic/es6/generator.js.EXPECTED b/test/nashorn/script/basic/es6/generator.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/generator.js.EXPECTED rename to test/nashorn/script/basic/es6/generator.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/iterator.js b/test/nashorn/script/basic/es6/iterator.js similarity index 100% rename from nashorn/test/script/basic/es6/iterator.js rename to test/nashorn/script/basic/es6/iterator.js diff --git a/nashorn/test/script/basic/es6/let-const-statement-context.js b/test/nashorn/script/basic/es6/let-const-statement-context.js similarity index 100% rename from nashorn/test/script/basic/es6/let-const-statement-context.js rename to test/nashorn/script/basic/es6/let-const-statement-context.js diff --git a/nashorn/test/script/basic/es6/let-const-statement-context.js.EXPECTED b/test/nashorn/script/basic/es6/let-const-statement-context.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let-const-statement-context.js.EXPECTED rename to test/nashorn/script/basic/es6/let-const-statement-context.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let-const-switch.js b/test/nashorn/script/basic/es6/let-const-switch.js similarity index 100% rename from nashorn/test/script/basic/es6/let-const-switch.js rename to test/nashorn/script/basic/es6/let-const-switch.js diff --git a/nashorn/test/script/basic/es6/let-const-switch.js.EXPECTED b/test/nashorn/script/basic/es6/let-const-switch.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let-const-switch.js.EXPECTED rename to test/nashorn/script/basic/es6/let-const-switch.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let-eval.js b/test/nashorn/script/basic/es6/let-eval.js similarity index 100% rename from nashorn/test/script/basic/es6/let-eval.js rename to test/nashorn/script/basic/es6/let-eval.js diff --git a/nashorn/test/script/basic/es6/let-eval.js.EXPECTED b/test/nashorn/script/basic/es6/let-eval.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let-eval.js.EXPECTED rename to test/nashorn/script/basic/es6/let-eval.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let-load-lib.js b/test/nashorn/script/basic/es6/let-load-lib.js similarity index 100% rename from nashorn/test/script/basic/es6/let-load-lib.js rename to test/nashorn/script/basic/es6/let-load-lib.js diff --git a/nashorn/test/script/basic/es6/let-load.js b/test/nashorn/script/basic/es6/let-load.js similarity index 100% rename from nashorn/test/script/basic/es6/let-load.js rename to test/nashorn/script/basic/es6/let-load.js diff --git a/nashorn/test/script/basic/es6/let-load.js.EXPECTED b/test/nashorn/script/basic/es6/let-load.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let-load.js.EXPECTED rename to test/nashorn/script/basic/es6/let-load.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let-nodeclare.js b/test/nashorn/script/basic/es6/let-nodeclare.js similarity index 100% rename from nashorn/test/script/basic/es6/let-nodeclare.js rename to test/nashorn/script/basic/es6/let-nodeclare.js diff --git a/nashorn/test/script/basic/es6/let-nodeclare.js.EXPECTED b/test/nashorn/script/basic/es6/let-nodeclare.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let-nodeclare.js.EXPECTED rename to test/nashorn/script/basic/es6/let-nodeclare.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let-redeclare-extra.js b/test/nashorn/script/basic/es6/let-redeclare-extra.js similarity index 100% rename from nashorn/test/script/basic/es6/let-redeclare-extra.js rename to test/nashorn/script/basic/es6/let-redeclare-extra.js diff --git a/nashorn/test/script/basic/es6/let-redeclare-extra.js.EXPECTED b/test/nashorn/script/basic/es6/let-redeclare-extra.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let-redeclare-extra.js.EXPECTED rename to test/nashorn/script/basic/es6/let-redeclare-extra.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let-redeclare.js b/test/nashorn/script/basic/es6/let-redeclare.js similarity index 100% rename from nashorn/test/script/basic/es6/let-redeclare.js rename to test/nashorn/script/basic/es6/let-redeclare.js diff --git a/nashorn/test/script/basic/es6/let-redeclare.js.EXPECTED b/test/nashorn/script/basic/es6/let-redeclare.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let-redeclare.js.EXPECTED rename to test/nashorn/script/basic/es6/let-redeclare.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let-self.js b/test/nashorn/script/basic/es6/let-self.js similarity index 100% rename from nashorn/test/script/basic/es6/let-self.js rename to test/nashorn/script/basic/es6/let-self.js diff --git a/nashorn/test/script/basic/es6/let-self.js.EXPECTED b/test/nashorn/script/basic/es6/let-self.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let-self.js.EXPECTED rename to test/nashorn/script/basic/es6/let-self.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let-tdz.js b/test/nashorn/script/basic/es6/let-tdz.js similarity index 100% rename from nashorn/test/script/basic/es6/let-tdz.js rename to test/nashorn/script/basic/es6/let-tdz.js diff --git a/nashorn/test/script/basic/es6/let-tdz.js.EXPECTED b/test/nashorn/script/basic/es6/let-tdz.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let-tdz.js.EXPECTED rename to test/nashorn/script/basic/es6/let-tdz.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let.js b/test/nashorn/script/basic/es6/let.js similarity index 100% rename from nashorn/test/script/basic/es6/let.js rename to test/nashorn/script/basic/es6/let.js diff --git a/nashorn/test/script/basic/es6/let.js.EXPECTED b/test/nashorn/script/basic/es6/let.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let.js.EXPECTED rename to test/nashorn/script/basic/es6/let.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let_const_closure.js b/test/nashorn/script/basic/es6/let_const_closure.js similarity index 100% rename from nashorn/test/script/basic/es6/let_const_closure.js rename to test/nashorn/script/basic/es6/let_const_closure.js diff --git a/nashorn/test/script/basic/es6/let_const_closure.js.EXPECTED b/test/nashorn/script/basic/es6/let_const_closure.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let_const_closure.js.EXPECTED rename to test/nashorn/script/basic/es6/let_const_closure.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let_const_reuse.js b/test/nashorn/script/basic/es6/let_const_reuse.js similarity index 100% rename from nashorn/test/script/basic/es6/let_const_reuse.js rename to test/nashorn/script/basic/es6/let_const_reuse.js diff --git a/nashorn/test/script/basic/es6/let_const_reuse.js.EXPECTED b/test/nashorn/script/basic/es6/let_const_reuse.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let_const_reuse.js.EXPECTED rename to test/nashorn/script/basic/es6/let_const_reuse.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let_different_types.js b/test/nashorn/script/basic/es6/let_different_types.js similarity index 100% rename from nashorn/test/script/basic/es6/let_different_types.js rename to test/nashorn/script/basic/es6/let_different_types.js diff --git a/nashorn/test/script/basic/es6/let_different_types.js.EXPECTED b/test/nashorn/script/basic/es6/let_different_types.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let_different_types.js.EXPECTED rename to test/nashorn/script/basic/es6/let_different_types.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/let_loops.js b/test/nashorn/script/basic/es6/let_loops.js similarity index 100% rename from nashorn/test/script/basic/es6/let_loops.js rename to test/nashorn/script/basic/es6/let_loops.js diff --git a/nashorn/test/script/basic/es6/let_loops.js.EXPECTED b/test/nashorn/script/basic/es6/let_loops.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/let_loops.js.EXPECTED rename to test/nashorn/script/basic/es6/let_loops.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/lexical-toplevel-def.js b/test/nashorn/script/basic/es6/lexical-toplevel-def.js similarity index 100% rename from nashorn/test/script/basic/es6/lexical-toplevel-def.js rename to test/nashorn/script/basic/es6/lexical-toplevel-def.js diff --git a/nashorn/test/script/basic/es6/lexical-toplevel-print.js b/test/nashorn/script/basic/es6/lexical-toplevel-print.js similarity index 100% rename from nashorn/test/script/basic/es6/lexical-toplevel-print.js rename to test/nashorn/script/basic/es6/lexical-toplevel-print.js diff --git a/nashorn/test/script/basic/es6/lexical-toplevel-redeclare-func-on-let.js b/test/nashorn/script/basic/es6/lexical-toplevel-redeclare-func-on-let.js similarity index 100% rename from nashorn/test/script/basic/es6/lexical-toplevel-redeclare-func-on-let.js rename to test/nashorn/script/basic/es6/lexical-toplevel-redeclare-func-on-let.js diff --git a/nashorn/test/script/basic/es6/lexical-toplevel-redeclare-let-on-builtin.js b/test/nashorn/script/basic/es6/lexical-toplevel-redeclare-let-on-builtin.js similarity index 100% rename from nashorn/test/script/basic/es6/lexical-toplevel-redeclare-let-on-builtin.js rename to test/nashorn/script/basic/es6/lexical-toplevel-redeclare-let-on-builtin.js diff --git a/nashorn/test/script/basic/es6/lexical-toplevel-redeclare-let-on-func.js b/test/nashorn/script/basic/es6/lexical-toplevel-redeclare-let-on-func.js similarity index 100% rename from nashorn/test/script/basic/es6/lexical-toplevel-redeclare-let-on-func.js rename to test/nashorn/script/basic/es6/lexical-toplevel-redeclare-let-on-func.js diff --git a/nashorn/test/script/basic/es6/lexical-toplevel-redeclare-let-on-global.js b/test/nashorn/script/basic/es6/lexical-toplevel-redeclare-let-on-global.js similarity index 100% rename from nashorn/test/script/basic/es6/lexical-toplevel-redeclare-let-on-global.js rename to test/nashorn/script/basic/es6/lexical-toplevel-redeclare-let-on-global.js diff --git a/nashorn/test/script/basic/es6/lexical-toplevel-redeclare-let-on-var.js b/test/nashorn/script/basic/es6/lexical-toplevel-redeclare-let-on-var.js similarity index 100% rename from nashorn/test/script/basic/es6/lexical-toplevel-redeclare-let-on-var.js rename to test/nashorn/script/basic/es6/lexical-toplevel-redeclare-let-on-var.js diff --git a/nashorn/test/script/basic/es6/lexical-toplevel-redeclare-var-on-let.js b/test/nashorn/script/basic/es6/lexical-toplevel-redeclare-var-on-let.js similarity index 100% rename from nashorn/test/script/basic/es6/lexical-toplevel-redeclare-var-on-let.js rename to test/nashorn/script/basic/es6/lexical-toplevel-redeclare-var-on-let.js diff --git a/nashorn/test/script/basic/es6/lexical-toplevel-redeclare.js b/test/nashorn/script/basic/es6/lexical-toplevel-redeclare.js similarity index 100% rename from nashorn/test/script/basic/es6/lexical-toplevel-redeclare.js rename to test/nashorn/script/basic/es6/lexical-toplevel-redeclare.js diff --git a/nashorn/test/script/basic/es6/lexical-toplevel-redeclare.js.EXPECTED b/test/nashorn/script/basic/es6/lexical-toplevel-redeclare.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/lexical-toplevel-redeclare.js.EXPECTED rename to test/nashorn/script/basic/es6/lexical-toplevel-redeclare.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/lexical-toplevel.js b/test/nashorn/script/basic/es6/lexical-toplevel.js similarity index 100% rename from nashorn/test/script/basic/es6/lexical-toplevel.js rename to test/nashorn/script/basic/es6/lexical-toplevel.js diff --git a/nashorn/test/script/basic/es6/lexical-toplevel.js.EXPECTED b/test/nashorn/script/basic/es6/lexical-toplevel.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/lexical-toplevel.js.EXPECTED rename to test/nashorn/script/basic/es6/lexical-toplevel.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/map.js b/test/nashorn/script/basic/es6/map.js similarity index 100% rename from nashorn/test/script/basic/es6/map.js rename to test/nashorn/script/basic/es6/map.js diff --git a/nashorn/test/script/basic/es6/numeric-literals.js b/test/nashorn/script/basic/es6/numeric-literals.js similarity index 100% rename from nashorn/test/script/basic/es6/numeric-literals.js rename to test/nashorn/script/basic/es6/numeric-literals.js diff --git a/nashorn/test/script/basic/es6/parser-es6.js b/test/nashorn/script/basic/es6/parser-es6.js similarity index 100% rename from nashorn/test/script/basic/es6/parser-es6.js rename to test/nashorn/script/basic/es6/parser-es6.js diff --git a/nashorn/test/script/basic/es6/restparam.js b/test/nashorn/script/basic/es6/restparam.js similarity index 100% rename from nashorn/test/script/basic/es6/restparam.js rename to test/nashorn/script/basic/es6/restparam.js diff --git a/nashorn/test/script/basic/es6/restparam.js.EXPECTED b/test/nashorn/script/basic/es6/restparam.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/restparam.js.EXPECTED rename to test/nashorn/script/basic/es6/restparam.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/set.js b/test/nashorn/script/basic/es6/set.js similarity index 100% rename from nashorn/test/script/basic/es6/set.js rename to test/nashorn/script/basic/es6/set.js diff --git a/nashorn/test/script/basic/es6/spread.js b/test/nashorn/script/basic/es6/spread.js similarity index 100% rename from nashorn/test/script/basic/es6/spread.js rename to test/nashorn/script/basic/es6/spread.js diff --git a/nashorn/test/script/basic/es6/spread.js.EXPECTED b/test/nashorn/script/basic/es6/spread.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/spread.js.EXPECTED rename to test/nashorn/script/basic/es6/spread.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/super.js b/test/nashorn/script/basic/es6/super.js similarity index 100% rename from nashorn/test/script/basic/es6/super.js rename to test/nashorn/script/basic/es6/super.js diff --git a/nashorn/test/script/basic/es6/super.js.EXPECTED b/test/nashorn/script/basic/es6/super.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/super.js.EXPECTED rename to test/nashorn/script/basic/es6/super.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/symbols.js b/test/nashorn/script/basic/es6/symbols.js similarity index 100% rename from nashorn/test/script/basic/es6/symbols.js rename to test/nashorn/script/basic/es6/symbols.js diff --git a/nashorn/test/script/basic/es6/template-literals.js b/test/nashorn/script/basic/es6/template-literals.js similarity index 100% rename from nashorn/test/script/basic/es6/template-literals.js rename to test/nashorn/script/basic/es6/template-literals.js diff --git a/nashorn/test/script/basic/es6/template-literals.js.EXPECTED b/test/nashorn/script/basic/es6/template-literals.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/es6/template-literals.js.EXPECTED rename to test/nashorn/script/basic/es6/template-literals.js.EXPECTED diff --git a/nashorn/test/script/basic/es6/weakmap.js b/test/nashorn/script/basic/es6/weakmap.js similarity index 100% rename from nashorn/test/script/basic/es6/weakmap.js rename to test/nashorn/script/basic/es6/weakmap.js diff --git a/nashorn/test/script/basic/es6/weakset.js b/test/nashorn/script/basic/es6/weakset.js similarity index 100% rename from nashorn/test/script/basic/es6/weakset.js rename to test/nashorn/script/basic/es6/weakset.js diff --git a/nashorn/test/script/basic/eval.js b/test/nashorn/script/basic/eval.js similarity index 100% rename from nashorn/test/script/basic/eval.js rename to test/nashorn/script/basic/eval.js diff --git a/nashorn/test/script/basic/eval.js.EXPECTED b/test/nashorn/script/basic/eval.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/eval.js.EXPECTED rename to test/nashorn/script/basic/eval.js.EXPECTED diff --git a/nashorn/test/script/basic/evalreturn.js b/test/nashorn/script/basic/evalreturn.js similarity index 100% rename from nashorn/test/script/basic/evalreturn.js rename to test/nashorn/script/basic/evalreturn.js diff --git a/nashorn/test/script/basic/evalreturn.js.EXPECTED b/test/nashorn/script/basic/evalreturn.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/evalreturn.js.EXPECTED rename to test/nashorn/script/basic/evalreturn.js.EXPECTED diff --git a/nashorn/test/script/basic/exprclosure.js b/test/nashorn/script/basic/exprclosure.js similarity index 100% rename from nashorn/test/script/basic/exprclosure.js rename to test/nashorn/script/basic/exprclosure.js diff --git a/nashorn/test/script/basic/exprclosure.js.EXPECTED b/test/nashorn/script/basic/exprclosure.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/exprclosure.js.EXPECTED rename to test/nashorn/script/basic/exprclosure.js.EXPECTED diff --git a/nashorn/test/script/basic/extensibility.js b/test/nashorn/script/basic/extensibility.js similarity index 100% rename from nashorn/test/script/basic/extensibility.js rename to test/nashorn/script/basic/extensibility.js diff --git a/nashorn/test/script/basic/extensibility.js.EXPECTED b/test/nashorn/script/basic/extensibility.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/extensibility.js.EXPECTED rename to test/nashorn/script/basic/extensibility.js.EXPECTED diff --git a/nashorn/test/script/basic/fastpushpop.js b/test/nashorn/script/basic/fastpushpop.js similarity index 100% rename from nashorn/test/script/basic/fastpushpop.js rename to test/nashorn/script/basic/fastpushpop.js diff --git a/nashorn/test/script/basic/fastpushpop.js.EXPECTED b/test/nashorn/script/basic/fastpushpop.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/fastpushpop.js.EXPECTED rename to test/nashorn/script/basic/fastpushpop.js.EXPECTED diff --git a/nashorn/test/script/basic/fileline.js b/test/nashorn/script/basic/fileline.js similarity index 100% rename from nashorn/test/script/basic/fileline.js rename to test/nashorn/script/basic/fileline.js diff --git a/nashorn/test/script/basic/fileline.js.EXPECTED b/test/nashorn/script/basic/fileline.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/fileline.js.EXPECTED rename to test/nashorn/script/basic/fileline.js.EXPECTED diff --git a/nashorn/test/script/basic/finally-catchalls.js b/test/nashorn/script/basic/finally-catchalls.js similarity index 100% rename from nashorn/test/script/basic/finally-catchalls.js rename to test/nashorn/script/basic/finally-catchalls.js diff --git a/nashorn/test/script/basic/finally-catchalls.js.EXPECTED b/test/nashorn/script/basic/finally-catchalls.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/finally-catchalls.js.EXPECTED rename to test/nashorn/script/basic/finally-catchalls.js.EXPECTED diff --git a/nashorn/test/script/basic/finallyreturn.js b/test/nashorn/script/basic/finallyreturn.js similarity index 100% rename from nashorn/test/script/basic/finallyreturn.js rename to test/nashorn/script/basic/finallyreturn.js diff --git a/nashorn/test/script/basic/finallyreturn.js.EXPECTED b/test/nashorn/script/basic/finallyreturn.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/finallyreturn.js.EXPECTED rename to test/nashorn/script/basic/finallyreturn.js.EXPECTED diff --git a/nashorn/test/script/basic/forin.js b/test/nashorn/script/basic/forin.js similarity index 100% rename from nashorn/test/script/basic/forin.js rename to test/nashorn/script/basic/forin.js diff --git a/nashorn/test/script/basic/forin.js.EXPECTED b/test/nashorn/script/basic/forin.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/forin.js.EXPECTED rename to test/nashorn/script/basic/forin.js.EXPECTED diff --git a/nashorn/test/script/basic/forin2.js b/test/nashorn/script/basic/forin2.js similarity index 100% rename from nashorn/test/script/basic/forin2.js rename to test/nashorn/script/basic/forin2.js diff --git a/nashorn/test/script/basic/forin2.js.EXPECTED b/test/nashorn/script/basic/forin2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/forin2.js.EXPECTED rename to test/nashorn/script/basic/forin2.js.EXPECTED diff --git a/nashorn/test/script/basic/funcarray.js b/test/nashorn/script/basic/funcarray.js similarity index 100% rename from nashorn/test/script/basic/funcarray.js rename to test/nashorn/script/basic/funcarray.js diff --git a/nashorn/test/script/basic/funcarray.js.EXPECTED b/test/nashorn/script/basic/funcarray.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/funcarray.js.EXPECTED rename to test/nashorn/script/basic/funcarray.js.EXPECTED diff --git a/nashorn/test/script/basic/funcbind.js b/test/nashorn/script/basic/funcbind.js similarity index 100% rename from nashorn/test/script/basic/funcbind.js rename to test/nashorn/script/basic/funcbind.js diff --git a/nashorn/test/script/basic/funcbind.js.EXPECTED b/test/nashorn/script/basic/funcbind.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/funcbind.js.EXPECTED rename to test/nashorn/script/basic/funcbind.js.EXPECTED diff --git a/nashorn/test/script/basic/funcbind2.js b/test/nashorn/script/basic/funcbind2.js similarity index 100% rename from nashorn/test/script/basic/funcbind2.js rename to test/nashorn/script/basic/funcbind2.js diff --git a/nashorn/test/script/basic/funcbind2.js.EXPECTED b/test/nashorn/script/basic/funcbind2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/funcbind2.js.EXPECTED rename to test/nashorn/script/basic/funcbind2.js.EXPECTED diff --git a/nashorn/test/script/basic/funcbind3.js b/test/nashorn/script/basic/funcbind3.js similarity index 100% rename from nashorn/test/script/basic/funcbind3.js rename to test/nashorn/script/basic/funcbind3.js diff --git a/nashorn/test/script/basic/funcbind3.js.EXPECTED b/test/nashorn/script/basic/funcbind3.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/funcbind3.js.EXPECTED rename to test/nashorn/script/basic/funcbind3.js.EXPECTED diff --git a/nashorn/test/script/basic/funcconstructor.js b/test/nashorn/script/basic/funcconstructor.js similarity index 100% rename from nashorn/test/script/basic/funcconstructor.js rename to test/nashorn/script/basic/funcconstructor.js diff --git a/nashorn/test/script/basic/funcconstructor.js.EXPECTED b/test/nashorn/script/basic/funcconstructor.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/funcconstructor.js.EXPECTED rename to test/nashorn/script/basic/funcconstructor.js.EXPECTED diff --git a/nashorn/test/script/basic/getclassname.js b/test/nashorn/script/basic/getclassname.js similarity index 100% rename from nashorn/test/script/basic/getclassname.js rename to test/nashorn/script/basic/getclassname.js diff --git a/nashorn/test/script/basic/getter_callsite.js b/test/nashorn/script/basic/getter_callsite.js similarity index 100% rename from nashorn/test/script/basic/getter_callsite.js rename to test/nashorn/script/basic/getter_callsite.js diff --git a/nashorn/test/script/basic/getter_callsite.js.EXPECTED b/test/nashorn/script/basic/getter_callsite.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/getter_callsite.js.EXPECTED rename to test/nashorn/script/basic/getter_callsite.js.EXPECTED diff --git a/nashorn/test/script/basic/gettercalls.js b/test/nashorn/script/basic/gettercalls.js similarity index 100% rename from nashorn/test/script/basic/gettercalls.js rename to test/nashorn/script/basic/gettercalls.js diff --git a/nashorn/test/script/basic/gettercalls.js.EXPECTED b/test/nashorn/script/basic/gettercalls.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/gettercalls.js.EXPECTED rename to test/nashorn/script/basic/gettercalls.js.EXPECTED diff --git a/nashorn/test/script/basic/getterfunc.js b/test/nashorn/script/basic/getterfunc.js similarity index 100% rename from nashorn/test/script/basic/getterfunc.js rename to test/nashorn/script/basic/getterfunc.js diff --git a/nashorn/test/script/basic/getterfunc.js.EXPECTED b/test/nashorn/script/basic/getterfunc.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/getterfunc.js.EXPECTED rename to test/nashorn/script/basic/getterfunc.js.EXPECTED diff --git a/nashorn/test/script/basic/gettersetter.js b/test/nashorn/script/basic/gettersetter.js similarity index 100% rename from nashorn/test/script/basic/gettersetter.js rename to test/nashorn/script/basic/gettersetter.js diff --git a/nashorn/test/script/basic/gettersetter.js.EXPECTED b/test/nashorn/script/basic/gettersetter.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/gettersetter.js.EXPECTED rename to test/nashorn/script/basic/gettersetter.js.EXPECTED diff --git a/nashorn/test/script/basic/globalaccess.js b/test/nashorn/script/basic/globalaccess.js similarity index 100% rename from nashorn/test/script/basic/globalaccess.js rename to test/nashorn/script/basic/globalaccess.js diff --git a/nashorn/test/script/basic/globalaccess.js.EXPECTED b/test/nashorn/script/basic/globalaccess.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/globalaccess.js.EXPECTED rename to test/nashorn/script/basic/globalaccess.js.EXPECTED diff --git a/nashorn/test/script/basic/globals.js b/test/nashorn/script/basic/globals.js similarity index 100% rename from nashorn/test/script/basic/globals.js rename to test/nashorn/script/basic/globals.js diff --git a/nashorn/test/script/basic/globals.js.EXPECTED b/test/nashorn/script/basic/globals.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/globals.js.EXPECTED rename to test/nashorn/script/basic/globals.js.EXPECTED diff --git a/nashorn/test/script/basic/globalscope.js b/test/nashorn/script/basic/globalscope.js similarity index 100% rename from nashorn/test/script/basic/globalscope.js rename to test/nashorn/script/basic/globalscope.js diff --git a/nashorn/test/script/basic/globalscope.js.EXPECTED b/test/nashorn/script/basic/globalscope.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/globalscope.js.EXPECTED rename to test/nashorn/script/basic/globalscope.js.EXPECTED diff --git a/nashorn/test/script/basic/hello.js b/test/nashorn/script/basic/hello.js similarity index 100% rename from nashorn/test/script/basic/hello.js rename to test/nashorn/script/basic/hello.js diff --git a/nashorn/test/script/basic/hello.js.EXPECTED b/test/nashorn/script/basic/hello.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/hello.js.EXPECTED rename to test/nashorn/script/basic/hello.js.EXPECTED diff --git a/nashorn/test/script/basic/herestr_operator.js b/test/nashorn/script/basic/herestr_operator.js similarity index 100% rename from nashorn/test/script/basic/herestr_operator.js rename to test/nashorn/script/basic/herestr_operator.js diff --git a/nashorn/test/script/basic/herestr_operator.js.EXPECTED b/test/nashorn/script/basic/herestr_operator.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/herestr_operator.js.EXPECTED rename to test/nashorn/script/basic/herestr_operator.js.EXPECTED diff --git a/nashorn/test/script/basic/hideLocationProperties.js b/test/nashorn/script/basic/hideLocationProperties.js similarity index 100% rename from nashorn/test/script/basic/hideLocationProperties.js rename to test/nashorn/script/basic/hideLocationProperties.js diff --git a/nashorn/test/script/basic/hideLocationProperties.js.EXPECTED b/test/nashorn/script/basic/hideLocationProperties.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/hideLocationProperties.js.EXPECTED rename to test/nashorn/script/basic/hideLocationProperties.js.EXPECTED diff --git a/nashorn/test/script/basic/illegaljavaname.js b/test/nashorn/script/basic/illegaljavaname.js similarity index 100% rename from nashorn/test/script/basic/illegaljavaname.js rename to test/nashorn/script/basic/illegaljavaname.js diff --git a/nashorn/test/script/basic/illegaljavaname.js.EXPECTED b/test/nashorn/script/basic/illegaljavaname.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/illegaljavaname.js.EXPECTED rename to test/nashorn/script/basic/illegaljavaname.js.EXPECTED diff --git a/nashorn/test/script/basic/importpackage.js b/test/nashorn/script/basic/importpackage.js similarity index 100% rename from nashorn/test/script/basic/importpackage.js rename to test/nashorn/script/basic/importpackage.js diff --git a/nashorn/test/script/basic/incheck.js b/test/nashorn/script/basic/incheck.js similarity index 100% rename from nashorn/test/script/basic/incheck.js rename to test/nashorn/script/basic/incheck.js diff --git a/nashorn/test/script/basic/incheck.js.EXPECTED b/test/nashorn/script/basic/incheck.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/incheck.js.EXPECTED rename to test/nashorn/script/basic/incheck.js.EXPECTED diff --git a/nashorn/test/script/basic/indexedcall.js b/test/nashorn/script/basic/indexedcall.js similarity index 100% rename from nashorn/test/script/basic/indexedcall.js rename to test/nashorn/script/basic/indexedcall.js diff --git a/nashorn/test/script/basic/indexedcall.js.EXPECTED b/test/nashorn/script/basic/indexedcall.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/indexedcall.js.EXPECTED rename to test/nashorn/script/basic/indexedcall.js.EXPECTED diff --git a/nashorn/test/script/basic/info.js b/test/nashorn/script/basic/info.js similarity index 100% rename from nashorn/test/script/basic/info.js rename to test/nashorn/script/basic/info.js diff --git a/nashorn/test/script/basic/info.js.EXPECTED b/test/nashorn/script/basic/info.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/info.js.EXPECTED rename to test/nashorn/script/basic/info.js.EXPECTED diff --git a/nashorn/test/script/basic/inherited_nonwritable.js b/test/nashorn/script/basic/inherited_nonwritable.js similarity index 100% rename from nashorn/test/script/basic/inherited_nonwritable.js rename to test/nashorn/script/basic/inherited_nonwritable.js diff --git a/nashorn/test/script/basic/instanceof.js b/test/nashorn/script/basic/instanceof.js similarity index 100% rename from nashorn/test/script/basic/instanceof.js rename to test/nashorn/script/basic/instanceof.js diff --git a/nashorn/test/script/basic/instanceof.js.EXPECTED b/test/nashorn/script/basic/instanceof.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/instanceof.js.EXPECTED rename to test/nashorn/script/basic/instanceof.js.EXPECTED diff --git a/nashorn/test/script/basic/instanceof2.js b/test/nashorn/script/basic/instanceof2.js similarity index 100% rename from nashorn/test/script/basic/instanceof2.js rename to test/nashorn/script/basic/instanceof2.js diff --git a/nashorn/test/script/basic/instanceof2.js.EXPECTED b/test/nashorn/script/basic/instanceof2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/instanceof2.js.EXPECTED rename to test/nashorn/script/basic/instanceof2.js.EXPECTED diff --git a/nashorn/test/script/basic/interfaces.js b/test/nashorn/script/basic/interfaces.js similarity index 100% rename from nashorn/test/script/basic/interfaces.js rename to test/nashorn/script/basic/interfaces.js diff --git a/nashorn/test/script/basic/interfaces.js.EXPECTED b/test/nashorn/script/basic/interfaces.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/interfaces.js.EXPECTED rename to test/nashorn/script/basic/interfaces.js.EXPECTED diff --git a/nashorn/test/script/basic/iterator.js b/test/nashorn/script/basic/iterator.js similarity index 100% rename from nashorn/test/script/basic/iterator.js rename to test/nashorn/script/basic/iterator.js diff --git a/nashorn/test/script/basic/iterator.js.EXPECTED b/test/nashorn/script/basic/iterator.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/iterator.js.EXPECTED rename to test/nashorn/script/basic/iterator.js.EXPECTED diff --git a/nashorn/test/script/basic/java.js b/test/nashorn/script/basic/java.js similarity index 100% rename from nashorn/test/script/basic/java.js rename to test/nashorn/script/basic/java.js diff --git a/nashorn/test/script/basic/java.js.EXPECTED b/test/nashorn/script/basic/java.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/java.js.EXPECTED rename to test/nashorn/script/basic/java.js.EXPECTED diff --git a/nashorn/test/script/basic/javaadapter.js b/test/nashorn/script/basic/javaadapter.js similarity index 100% rename from nashorn/test/script/basic/javaadapter.js rename to test/nashorn/script/basic/javaadapter.js diff --git a/nashorn/test/script/basic/javaarray.js b/test/nashorn/script/basic/javaarray.js similarity index 100% rename from nashorn/test/script/basic/javaarray.js rename to test/nashorn/script/basic/javaarray.js diff --git a/nashorn/test/script/basic/javaarray.js.EXPECTED b/test/nashorn/script/basic/javaarray.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/javaarray.js.EXPECTED rename to test/nashorn/script/basic/javaarray.js.EXPECTED diff --git a/nashorn/test/script/basic/javaarrayconversion.js b/test/nashorn/script/basic/javaarrayconversion.js similarity index 100% rename from nashorn/test/script/basic/javaarrayconversion.js rename to test/nashorn/script/basic/javaarrayconversion.js diff --git a/nashorn/test/script/basic/javaarrayconversion.js.EXPECTED b/test/nashorn/script/basic/javaarrayconversion.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/javaarrayconversion.js.EXPECTED rename to test/nashorn/script/basic/javaarrayconversion.js.EXPECTED diff --git a/nashorn/test/script/basic/javaclassoverrides.js b/test/nashorn/script/basic/javaclassoverrides.js similarity index 100% rename from nashorn/test/script/basic/javaclassoverrides.js rename to test/nashorn/script/basic/javaclassoverrides.js diff --git a/nashorn/test/script/basic/javaclassoverrides.js.EXPECTED b/test/nashorn/script/basic/javaclassoverrides.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/javaclassoverrides.js.EXPECTED rename to test/nashorn/script/basic/javaclassoverrides.js.EXPECTED diff --git a/nashorn/test/script/basic/javaexceptions.js b/test/nashorn/script/basic/javaexceptions.js similarity index 100% rename from nashorn/test/script/basic/javaexceptions.js rename to test/nashorn/script/basic/javaexceptions.js diff --git a/nashorn/test/script/basic/javaexceptions.js.EXPECTED b/test/nashorn/script/basic/javaexceptions.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/javaexceptions.js.EXPECTED rename to test/nashorn/script/basic/javaexceptions.js.EXPECTED diff --git a/nashorn/test/script/basic/javaimporter.js b/test/nashorn/script/basic/javaimporter.js similarity index 100% rename from nashorn/test/script/basic/javaimporter.js rename to test/nashorn/script/basic/javaimporter.js diff --git a/nashorn/test/script/basic/javaimporter.js.EXPECTED b/test/nashorn/script/basic/javaimporter.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/javaimporter.js.EXPECTED rename to test/nashorn/script/basic/javaimporter.js.EXPECTED diff --git a/nashorn/test/script/basic/javainnerclasses.js b/test/nashorn/script/basic/javainnerclasses.js similarity index 100% rename from nashorn/test/script/basic/javainnerclasses.js rename to test/nashorn/script/basic/javainnerclasses.js diff --git a/nashorn/test/script/basic/javainnerclasses.js.EXPECTED b/test/nashorn/script/basic/javainnerclasses.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/javainnerclasses.js.EXPECTED rename to test/nashorn/script/basic/javainnerclasses.js.EXPECTED diff --git a/nashorn/test/script/basic/javamethodcallerrors.js b/test/nashorn/script/basic/javamethodcallerrors.js similarity index 100% rename from nashorn/test/script/basic/javamethodcallerrors.js rename to test/nashorn/script/basic/javamethodcallerrors.js diff --git a/nashorn/test/script/basic/javasigcall.js b/test/nashorn/script/basic/javasigcall.js similarity index 100% rename from nashorn/test/script/basic/javasigcall.js rename to test/nashorn/script/basic/javasigcall.js diff --git a/nashorn/test/script/basic/javasigcall.js.EXPECTED b/test/nashorn/script/basic/javasigcall.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/javasigcall.js.EXPECTED rename to test/nashorn/script/basic/javasigcall.js.EXPECTED diff --git a/nashorn/test/script/basic/jquery.js b/test/nashorn/script/basic/jquery.js similarity index 100% rename from nashorn/test/script/basic/jquery.js rename to test/nashorn/script/basic/jquery.js diff --git a/nashorn/test/script/basic/jquery.js.EXPECTED b/test/nashorn/script/basic/jquery.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/jquery.js.EXPECTED rename to test/nashorn/script/basic/jquery.js.EXPECTED diff --git a/nashorn/test/script/basic/jsadapter-ids.js b/test/nashorn/script/basic/jsadapter-ids.js similarity index 100% rename from nashorn/test/script/basic/jsadapter-ids.js rename to test/nashorn/script/basic/jsadapter-ids.js diff --git a/nashorn/test/script/basic/jsadapter-ids.js.EXPECTED b/test/nashorn/script/basic/jsadapter-ids.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/jsadapter-ids.js.EXPECTED rename to test/nashorn/script/basic/jsadapter-ids.js.EXPECTED diff --git a/nashorn/test/script/basic/jsadapter.js b/test/nashorn/script/basic/jsadapter.js similarity index 100% rename from nashorn/test/script/basic/jsadapter.js rename to test/nashorn/script/basic/jsadapter.js diff --git a/nashorn/test/script/basic/jsadapter.js.EXPECTED b/test/nashorn/script/basic/jsadapter.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/jsadapter.js.EXPECTED rename to test/nashorn/script/basic/jsadapter.js.EXPECTED diff --git a/nashorn/test/script/basic/jsadapterlink.js b/test/nashorn/script/basic/jsadapterlink.js similarity index 100% rename from nashorn/test/script/basic/jsadapterlink.js rename to test/nashorn/script/basic/jsadapterlink.js diff --git a/nashorn/test/script/basic/jsadapterlink.js.EXPECTED b/test/nashorn/script/basic/jsadapterlink.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/jsadapterlink.js.EXPECTED rename to test/nashorn/script/basic/jsadapterlink.js.EXPECTED diff --git a/nashorn/test/script/basic/jsobject.js b/test/nashorn/script/basic/jsobject.js similarity index 100% rename from nashorn/test/script/basic/jsobject.js rename to test/nashorn/script/basic/jsobject.js diff --git a/nashorn/test/script/basic/json.js b/test/nashorn/script/basic/json.js similarity index 100% rename from nashorn/test/script/basic/json.js rename to test/nashorn/script/basic/json.js diff --git a/nashorn/test/script/basic/json.js.EXPECTED b/test/nashorn/script/basic/json.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/json.js.EXPECTED rename to test/nashorn/script/basic/json.js.EXPECTED diff --git a/nashorn/test/script/basic/list.js b/test/nashorn/script/basic/list.js similarity index 100% rename from nashorn/test/script/basic/list.js rename to test/nashorn/script/basic/list.js diff --git a/nashorn/test/script/basic/list.js.EXPECTED b/test/nashorn/script/basic/list.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/list.js.EXPECTED rename to test/nashorn/script/basic/list.js.EXPECTED diff --git a/nashorn/test/script/basic/literal.js b/test/nashorn/script/basic/literal.js similarity index 100% rename from nashorn/test/script/basic/literal.js rename to test/nashorn/script/basic/literal.js diff --git a/nashorn/test/script/basic/literal.js.EXPECTED b/test/nashorn/script/basic/literal.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/literal.js.EXPECTED rename to test/nashorn/script/basic/literal.js.EXPECTED diff --git a/nashorn/test/script/basic/load.js b/test/nashorn/script/basic/load.js similarity index 100% rename from nashorn/test/script/basic/load.js rename to test/nashorn/script/basic/load.js diff --git a/nashorn/test/script/basic/load.js.EXPECTED b/test/nashorn/script/basic/load.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/load.js.EXPECTED rename to test/nashorn/script/basic/load.js.EXPECTED diff --git a/nashorn/test/script/basic/loadedfile.js b/test/nashorn/script/basic/loadedfile.js similarity index 100% rename from nashorn/test/script/basic/loadedfile.js rename to test/nashorn/script/basic/loadedfile.js diff --git a/nashorn/test/script/basic/localundef.js b/test/nashorn/script/basic/localundef.js similarity index 100% rename from nashorn/test/script/basic/localundef.js rename to test/nashorn/script/basic/localundef.js diff --git a/nashorn/test/script/basic/localundef.js.EXPECTED b/test/nashorn/script/basic/localundef.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/localundef.js.EXPECTED rename to test/nashorn/script/basic/localundef.js.EXPECTED diff --git a/nashorn/test/script/basic/map.js b/test/nashorn/script/basic/map.js similarity index 100% rename from nashorn/test/script/basic/map.js rename to test/nashorn/script/basic/map.js diff --git a/nashorn/test/script/basic/map.js.EXPECTED b/test/nashorn/script/basic/map.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/map.js.EXPECTED rename to test/nashorn/script/basic/map.js.EXPECTED diff --git a/nashorn/test/script/basic/math.js b/test/nashorn/script/basic/math.js similarity index 100% rename from nashorn/test/script/basic/math.js rename to test/nashorn/script/basic/math.js diff --git a/nashorn/test/script/basic/math.js.EXPECTED b/test/nashorn/script/basic/math.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/math.js.EXPECTED rename to test/nashorn/script/basic/math.js.EXPECTED diff --git a/nashorn/test/script/basic/minuszero.js b/test/nashorn/script/basic/minuszero.js similarity index 100% rename from nashorn/test/script/basic/minuszero.js rename to test/nashorn/script/basic/minuszero.js diff --git a/nashorn/test/script/basic/minuszero.js.EXPECTED b/test/nashorn/script/basic/minuszero.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/minuszero.js.EXPECTED rename to test/nashorn/script/basic/minuszero.js.EXPECTED diff --git a/nashorn/test/script/basic/mirror_proto_assign.js b/test/nashorn/script/basic/mirror_proto_assign.js similarity index 100% rename from nashorn/test/script/basic/mirror_proto_assign.js rename to test/nashorn/script/basic/mirror_proto_assign.js diff --git a/nashorn/test/script/basic/mirror_proto_assign.js.EXPECTED b/test/nashorn/script/basic/mirror_proto_assign.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/mirror_proto_assign.js.EXPECTED rename to test/nashorn/script/basic/mirror_proto_assign.js.EXPECTED diff --git a/nashorn/test/script/basic/module.js b/test/nashorn/script/basic/module.js similarity index 100% rename from nashorn/test/script/basic/module.js rename to test/nashorn/script/basic/module.js diff --git a/nashorn/test/script/basic/moduleload.js b/test/nashorn/script/basic/moduleload.js similarity index 100% rename from nashorn/test/script/basic/moduleload.js rename to test/nashorn/script/basic/moduleload.js diff --git a/nashorn/test/script/basic/moduleload.js.EXPECTED b/test/nashorn/script/basic/moduleload.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/moduleload.js.EXPECTED rename to test/nashorn/script/basic/moduleload.js.EXPECTED diff --git a/nashorn/test/script/basic/nashorn2.js b/test/nashorn/script/basic/nashorn2.js similarity index 100% rename from nashorn/test/script/basic/nashorn2.js rename to test/nashorn/script/basic/nashorn2.js diff --git a/nashorn/test/script/basic/nashorn2.js.EXPECTED b/test/nashorn/script/basic/nashorn2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/nashorn2.js.EXPECTED rename to test/nashorn/script/basic/nashorn2.js.EXPECTED diff --git a/nashorn/test/script/basic/natives.js b/test/nashorn/script/basic/natives.js similarity index 100% rename from nashorn/test/script/basic/natives.js rename to test/nashorn/script/basic/natives.js diff --git a/nashorn/test/script/basic/natives.js.EXPECTED b/test/nashorn/script/basic/natives.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/natives.js.EXPECTED rename to test/nashorn/script/basic/natives.js.EXPECTED diff --git a/nashorn/test/script/basic/new.js b/test/nashorn/script/basic/new.js similarity index 100% rename from nashorn/test/script/basic/new.js rename to test/nashorn/script/basic/new.js diff --git a/nashorn/test/script/basic/new.js.EXPECTED b/test/nashorn/script/basic/new.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/new.js.EXPECTED rename to test/nashorn/script/basic/new.js.EXPECTED diff --git a/nashorn/test/script/basic/newexpr.js b/test/nashorn/script/basic/newexpr.js similarity index 100% rename from nashorn/test/script/basic/newexpr.js rename to test/nashorn/script/basic/newexpr.js diff --git a/nashorn/test/script/basic/newexpr.js.EXPECTED b/test/nashorn/script/basic/newexpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/newexpr.js.EXPECTED rename to test/nashorn/script/basic/newexpr.js.EXPECTED diff --git a/nashorn/test/script/basic/newnew.js b/test/nashorn/script/basic/newnew.js similarity index 100% rename from nashorn/test/script/basic/newnew.js rename to test/nashorn/script/basic/newnew.js diff --git a/nashorn/test/script/basic/newnew.js.EXPECTED b/test/nashorn/script/basic/newnew.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/newnew.js.EXPECTED rename to test/nashorn/script/basic/newnew.js.EXPECTED diff --git a/nashorn/test/script/basic/no_line_numbers.js b/test/nashorn/script/basic/no_line_numbers.js similarity index 100% rename from nashorn/test/script/basic/no_line_numbers.js rename to test/nashorn/script/basic/no_line_numbers.js diff --git a/nashorn/test/script/basic/no_line_numbers.js.EXPECTED b/test/nashorn/script/basic/no_line_numbers.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/no_line_numbers.js.EXPECTED rename to test/nashorn/script/basic/no_line_numbers.js.EXPECTED diff --git a/nashorn/test/script/basic/nonconstructors.js b/test/nashorn/script/basic/nonconstructors.js similarity index 100% rename from nashorn/test/script/basic/nonconstructors.js rename to test/nashorn/script/basic/nonconstructors.js diff --git a/nashorn/test/script/basic/nonconstructors.js.EXPECTED b/test/nashorn/script/basic/nonconstructors.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/nonconstructors.js.EXPECTED rename to test/nashorn/script/basic/nonconstructors.js.EXPECTED diff --git a/nashorn/test/script/basic/nonextensible_proto_assign.js b/test/nashorn/script/basic/nonextensible_proto_assign.js similarity index 100% rename from nashorn/test/script/basic/nonextensible_proto_assign.js rename to test/nashorn/script/basic/nonextensible_proto_assign.js diff --git a/nashorn/test/script/basic/nonextensible_proto_assign.js.EXPECTED b/test/nashorn/script/basic/nonextensible_proto_assign.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/nonextensible_proto_assign.js.EXPECTED rename to test/nashorn/script/basic/nonextensible_proto_assign.js.EXPECTED diff --git a/nashorn/test/script/basic/nosuchmethod.js b/test/nashorn/script/basic/nosuchmethod.js similarity index 100% rename from nashorn/test/script/basic/nosuchmethod.js rename to test/nashorn/script/basic/nosuchmethod.js diff --git a/nashorn/test/script/basic/nosuchmethod.js.EXPECTED b/test/nashorn/script/basic/nosuchmethod.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/nosuchmethod.js.EXPECTED rename to test/nashorn/script/basic/nosuchmethod.js.EXPECTED diff --git a/nashorn/test/script/basic/nosuchproperty.js b/test/nashorn/script/basic/nosuchproperty.js similarity index 100% rename from nashorn/test/script/basic/nosuchproperty.js rename to test/nashorn/script/basic/nosuchproperty.js diff --git a/nashorn/test/script/basic/nosuchproperty.js.EXPECTED b/test/nashorn/script/basic/nosuchproperty.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/nosuchproperty.js.EXPECTED rename to test/nashorn/script/basic/nosuchproperty.js.EXPECTED diff --git a/nashorn/test/script/basic/number.js b/test/nashorn/script/basic/number.js similarity index 100% rename from nashorn/test/script/basic/number.js rename to test/nashorn/script/basic/number.js diff --git a/nashorn/test/script/basic/number.js.EXPECTED b/test/nashorn/script/basic/number.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/number.js.EXPECTED rename to test/nashorn/script/basic/number.js.EXPECTED diff --git a/nashorn/test/script/basic/numberstring.js b/test/nashorn/script/basic/numberstring.js similarity index 100% rename from nashorn/test/script/basic/numberstring.js rename to test/nashorn/script/basic/numberstring.js diff --git a/nashorn/test/script/basic/numberstring.js.EXPECTED b/test/nashorn/script/basic/numberstring.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/numberstring.js.EXPECTED rename to test/nashorn/script/basic/numberstring.js.EXPECTED diff --git a/nashorn/test/script/basic/objectprops.js b/test/nashorn/script/basic/objectprops.js similarity index 100% rename from nashorn/test/script/basic/objectprops.js rename to test/nashorn/script/basic/objectprops.js diff --git a/nashorn/test/script/basic/objectprops.js.EXPECTED b/test/nashorn/script/basic/objectprops.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/objectprops.js.EXPECTED rename to test/nashorn/script/basic/objectprops.js.EXPECTED diff --git a/nashorn/test/script/basic/objects.js b/test/nashorn/script/basic/objects.js similarity index 100% rename from nashorn/test/script/basic/objects.js rename to test/nashorn/script/basic/objects.js diff --git a/nashorn/test/script/basic/objects.js.EXPECTED b/test/nashorn/script/basic/objects.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/objects.js.EXPECTED rename to test/nashorn/script/basic/objects.js.EXPECTED diff --git a/nashorn/test/script/basic/octane-payload.js b/test/nashorn/script/basic/octane-payload.js similarity index 100% rename from nashorn/test/script/basic/octane-payload.js rename to test/nashorn/script/basic/octane-payload.js diff --git a/nashorn/test/script/basic/optimistic_arithmetic_check_type.js b/test/nashorn/script/basic/optimistic_arithmetic_check_type.js similarity index 100% rename from nashorn/test/script/basic/optimistic_arithmetic_check_type.js rename to test/nashorn/script/basic/optimistic_arithmetic_check_type.js diff --git a/nashorn/test/script/basic/optimistic_arithmetic_check_type.js.EXPECTED b/test/nashorn/script/basic/optimistic_arithmetic_check_type.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/optimistic_arithmetic_check_type.js.EXPECTED rename to test/nashorn/script/basic/optimistic_arithmetic_check_type.js.EXPECTED diff --git a/nashorn/test/script/basic/optimistic_assignment_check_type.js b/test/nashorn/script/basic/optimistic_assignment_check_type.js similarity index 100% rename from nashorn/test/script/basic/optimistic_assignment_check_type.js rename to test/nashorn/script/basic/optimistic_assignment_check_type.js diff --git a/nashorn/test/script/basic/optimistic_assignment_check_type.js.EXPECTED b/test/nashorn/script/basic/optimistic_assignment_check_type.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/optimistic_assignment_check_type.js.EXPECTED rename to test/nashorn/script/basic/optimistic_assignment_check_type.js.EXPECTED diff --git a/nashorn/test/script/basic/optimistic_check_type.js b/test/nashorn/script/basic/optimistic_check_type.js similarity index 100% rename from nashorn/test/script/basic/optimistic_check_type.js rename to test/nashorn/script/basic/optimistic_check_type.js diff --git a/nashorn/test/script/basic/optimistic_check_type.js.EXPECTED b/test/nashorn/script/basic/optimistic_check_type.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/optimistic_check_type.js.EXPECTED rename to test/nashorn/script/basic/optimistic_check_type.js.EXPECTED diff --git a/nashorn/test/script/basic/optimistic_logical_check_type.js b/test/nashorn/script/basic/optimistic_logical_check_type.js similarity index 100% rename from nashorn/test/script/basic/optimistic_logical_check_type.js rename to test/nashorn/script/basic/optimistic_logical_check_type.js diff --git a/nashorn/test/script/basic/optimistic_logical_check_type.js.EXPECTED b/test/nashorn/script/basic/optimistic_logical_check_type.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/optimistic_logical_check_type.js.EXPECTED rename to test/nashorn/script/basic/optimistic_logical_check_type.js.EXPECTED diff --git a/nashorn/test/script/basic/options.js b/test/nashorn/script/basic/options.js similarity index 100% rename from nashorn/test/script/basic/options.js rename to test/nashorn/script/basic/options.js diff --git a/nashorn/test/script/basic/options.js.EXPECTED b/test/nashorn/script/basic/options.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/options.js.EXPECTED rename to test/nashorn/script/basic/options.js.EXPECTED diff --git a/nashorn/test/script/basic/paramspec.js b/test/nashorn/script/basic/paramspec.js similarity index 100% rename from nashorn/test/script/basic/paramspec.js rename to test/nashorn/script/basic/paramspec.js diff --git a/nashorn/test/script/basic/paramspec.js.EXPECTED b/test/nashorn/script/basic/paramspec.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/paramspec.js.EXPECTED rename to test/nashorn/script/basic/paramspec.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/assignmentExpr.js b/test/nashorn/script/basic/parser/assignmentExpr.js similarity index 100% rename from nashorn/test/script/basic/parser/assignmentExpr.js rename to test/nashorn/script/basic/parser/assignmentExpr.js diff --git a/nashorn/test/script/basic/parser/assignmentExpr.js.EXPECTED b/test/nashorn/script/basic/parser/assignmentExpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/assignmentExpr.js.EXPECTED rename to test/nashorn/script/basic/parser/assignmentExpr.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/binaryExpr.js b/test/nashorn/script/basic/parser/binaryExpr.js similarity index 100% rename from nashorn/test/script/basic/parser/binaryExpr.js rename to test/nashorn/script/basic/parser/binaryExpr.js diff --git a/nashorn/test/script/basic/parser/binaryExpr.js.EXPECTED b/test/nashorn/script/basic/parser/binaryExpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/binaryExpr.js.EXPECTED rename to test/nashorn/script/basic/parser/binaryExpr.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/breakStat.js b/test/nashorn/script/basic/parser/breakStat.js similarity index 100% rename from nashorn/test/script/basic/parser/breakStat.js rename to test/nashorn/script/basic/parser/breakStat.js diff --git a/nashorn/test/script/basic/parser/breakStat.js.EXPECTED b/test/nashorn/script/basic/parser/breakStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/breakStat.js.EXPECTED rename to test/nashorn/script/basic/parser/breakStat.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/condExpr.js b/test/nashorn/script/basic/parser/condExpr.js similarity index 100% rename from nashorn/test/script/basic/parser/condExpr.js rename to test/nashorn/script/basic/parser/condExpr.js diff --git a/nashorn/test/script/basic/parser/condExpr.js.EXPECTED b/test/nashorn/script/basic/parser/condExpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/condExpr.js.EXPECTED rename to test/nashorn/script/basic/parser/condExpr.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/continueStat.js b/test/nashorn/script/basic/parser/continueStat.js similarity index 100% rename from nashorn/test/script/basic/parser/continueStat.js rename to test/nashorn/script/basic/parser/continueStat.js diff --git a/nashorn/test/script/basic/parser/continueStat.js.EXPECTED b/test/nashorn/script/basic/parser/continueStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/continueStat.js.EXPECTED rename to test/nashorn/script/basic/parser/continueStat.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/debuggerStat.js b/test/nashorn/script/basic/parser/debuggerStat.js similarity index 100% rename from nashorn/test/script/basic/parser/debuggerStat.js rename to test/nashorn/script/basic/parser/debuggerStat.js diff --git a/nashorn/test/script/basic/parser/debuggerStat.js.EXPECTED b/test/nashorn/script/basic/parser/debuggerStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/debuggerStat.js.EXPECTED rename to test/nashorn/script/basic/parser/debuggerStat.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/functions.js b/test/nashorn/script/basic/parser/functions.js similarity index 100% rename from nashorn/test/script/basic/parser/functions.js rename to test/nashorn/script/basic/parser/functions.js diff --git a/nashorn/test/script/basic/parser/functions.js.EXPECTED b/test/nashorn/script/basic/parser/functions.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/functions.js.EXPECTED rename to test/nashorn/script/basic/parser/functions.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/ifStat.js b/test/nashorn/script/basic/parser/ifStat.js similarity index 100% rename from nashorn/test/script/basic/parser/ifStat.js rename to test/nashorn/script/basic/parser/ifStat.js diff --git a/nashorn/test/script/basic/parser/ifStat.js.EXPECTED b/test/nashorn/script/basic/parser/ifStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/ifStat.js.EXPECTED rename to test/nashorn/script/basic/parser/ifStat.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/labelledStat.js b/test/nashorn/script/basic/parser/labelledStat.js similarity index 100% rename from nashorn/test/script/basic/parser/labelledStat.js rename to test/nashorn/script/basic/parser/labelledStat.js diff --git a/nashorn/test/script/basic/parser/labelledStat.js.EXPECTED b/test/nashorn/script/basic/parser/labelledStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/labelledStat.js.EXPECTED rename to test/nashorn/script/basic/parser/labelledStat.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/lhsExpr.js b/test/nashorn/script/basic/parser/lhsExpr.js similarity index 100% rename from nashorn/test/script/basic/parser/lhsExpr.js rename to test/nashorn/script/basic/parser/lhsExpr.js diff --git a/nashorn/test/script/basic/parser/lhsExpr.js.EXPECTED b/test/nashorn/script/basic/parser/lhsExpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/lhsExpr.js.EXPECTED rename to test/nashorn/script/basic/parser/lhsExpr.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/loopStat.js b/test/nashorn/script/basic/parser/loopStat.js similarity index 100% rename from nashorn/test/script/basic/parser/loopStat.js rename to test/nashorn/script/basic/parser/loopStat.js diff --git a/nashorn/test/script/basic/parser/loopStat.js.EXPECTED b/test/nashorn/script/basic/parser/loopStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/loopStat.js.EXPECTED rename to test/nashorn/script/basic/parser/loopStat.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/objectLitExpr.js b/test/nashorn/script/basic/parser/objectLitExpr.js similarity index 100% rename from nashorn/test/script/basic/parser/objectLitExpr.js rename to test/nashorn/script/basic/parser/objectLitExpr.js diff --git a/nashorn/test/script/basic/parser/objectLitExpr.js.EXPECTED b/test/nashorn/script/basic/parser/objectLitExpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/objectLitExpr.js.EXPECTED rename to test/nashorn/script/basic/parser/objectLitExpr.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/parenExpr.js b/test/nashorn/script/basic/parser/parenExpr.js similarity index 100% rename from nashorn/test/script/basic/parser/parenExpr.js rename to test/nashorn/script/basic/parser/parenExpr.js diff --git a/nashorn/test/script/basic/parser/parenExpr.js.EXPECTED b/test/nashorn/script/basic/parser/parenExpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/parenExpr.js.EXPECTED rename to test/nashorn/script/basic/parser/parenExpr.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/primaryExpr.js b/test/nashorn/script/basic/parser/primaryExpr.js similarity index 100% rename from nashorn/test/script/basic/parser/primaryExpr.js rename to test/nashorn/script/basic/parser/primaryExpr.js diff --git a/nashorn/test/script/basic/parser/primaryExpr.js.EXPECTED b/test/nashorn/script/basic/parser/primaryExpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/primaryExpr.js.EXPECTED rename to test/nashorn/script/basic/parser/primaryExpr.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/returnStat.js b/test/nashorn/script/basic/parser/returnStat.js similarity index 100% rename from nashorn/test/script/basic/parser/returnStat.js rename to test/nashorn/script/basic/parser/returnStat.js diff --git a/nashorn/test/script/basic/parser/returnStat.js.EXPECTED b/test/nashorn/script/basic/parser/returnStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/returnStat.js.EXPECTED rename to test/nashorn/script/basic/parser/returnStat.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/switchStat.js b/test/nashorn/script/basic/parser/switchStat.js similarity index 100% rename from nashorn/test/script/basic/parser/switchStat.js rename to test/nashorn/script/basic/parser/switchStat.js diff --git a/nashorn/test/script/basic/parser/switchStat.js.EXPECTED b/test/nashorn/script/basic/parser/switchStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/switchStat.js.EXPECTED rename to test/nashorn/script/basic/parser/switchStat.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/throwStat.js b/test/nashorn/script/basic/parser/throwStat.js similarity index 100% rename from nashorn/test/script/basic/parser/throwStat.js rename to test/nashorn/script/basic/parser/throwStat.js diff --git a/nashorn/test/script/basic/parser/throwStat.js.EXPECTED b/test/nashorn/script/basic/parser/throwStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/throwStat.js.EXPECTED rename to test/nashorn/script/basic/parser/throwStat.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/tryCatchStat.js b/test/nashorn/script/basic/parser/tryCatchStat.js similarity index 100% rename from nashorn/test/script/basic/parser/tryCatchStat.js rename to test/nashorn/script/basic/parser/tryCatchStat.js diff --git a/nashorn/test/script/basic/parser/tryCatchStat.js.EXPECTED b/test/nashorn/script/basic/parser/tryCatchStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/tryCatchStat.js.EXPECTED rename to test/nashorn/script/basic/parser/tryCatchStat.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/unaryExpr.js b/test/nashorn/script/basic/parser/unaryExpr.js similarity index 100% rename from nashorn/test/script/basic/parser/unaryExpr.js rename to test/nashorn/script/basic/parser/unaryExpr.js diff --git a/nashorn/test/script/basic/parser/unaryExpr.js.EXPECTED b/test/nashorn/script/basic/parser/unaryExpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/unaryExpr.js.EXPECTED rename to test/nashorn/script/basic/parser/unaryExpr.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/useStrict.js b/test/nashorn/script/basic/parser/useStrict.js similarity index 100% rename from nashorn/test/script/basic/parser/useStrict.js rename to test/nashorn/script/basic/parser/useStrict.js diff --git a/nashorn/test/script/basic/parser/useStrict.js.EXPECTED b/test/nashorn/script/basic/parser/useStrict.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/useStrict.js.EXPECTED rename to test/nashorn/script/basic/parser/useStrict.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/util.js b/test/nashorn/script/basic/parser/util.js similarity index 100% rename from nashorn/test/script/basic/parser/util.js rename to test/nashorn/script/basic/parser/util.js diff --git a/nashorn/test/script/basic/parser/varDecl.js b/test/nashorn/script/basic/parser/varDecl.js similarity index 100% rename from nashorn/test/script/basic/parser/varDecl.js rename to test/nashorn/script/basic/parser/varDecl.js diff --git a/nashorn/test/script/basic/parser/varDecl.js.EXPECTED b/test/nashorn/script/basic/parser/varDecl.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/varDecl.js.EXPECTED rename to test/nashorn/script/basic/parser/varDecl.js.EXPECTED diff --git a/nashorn/test/script/basic/parser/withStat.js b/test/nashorn/script/basic/parser/withStat.js similarity index 100% rename from nashorn/test/script/basic/parser/withStat.js rename to test/nashorn/script/basic/parser/withStat.js diff --git a/nashorn/test/script/basic/parser/withStat.js.EXPECTED b/test/nashorn/script/basic/parser/withStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/parser/withStat.js.EXPECTED rename to test/nashorn/script/basic/parser/withStat.js.EXPECTED diff --git a/nashorn/test/script/basic/propchange.js b/test/nashorn/script/basic/propchange.js similarity index 100% rename from nashorn/test/script/basic/propchange.js rename to test/nashorn/script/basic/propchange.js diff --git a/nashorn/test/script/basic/propchange.js.EXPECTED b/test/nashorn/script/basic/propchange.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/propchange.js.EXPECTED rename to test/nashorn/script/basic/propchange.js.EXPECTED diff --git a/nashorn/test/script/basic/propertycheck.js b/test/nashorn/script/basic/propertycheck.js similarity index 100% rename from nashorn/test/script/basic/propertycheck.js rename to test/nashorn/script/basic/propertycheck.js diff --git a/nashorn/test/script/basic/propertycheck.js.EXPECTED b/test/nashorn/script/basic/propertycheck.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/propertycheck.js.EXPECTED rename to test/nashorn/script/basic/propertycheck.js.EXPECTED diff --git a/nashorn/test/script/basic/proto.js.EXPECTED b/test/nashorn/script/basic/proto.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/proto.js.EXPECTED rename to test/nashorn/script/basic/proto.js.EXPECTED diff --git a/nashorn/test/script/basic/prototype.js b/test/nashorn/script/basic/prototype.js similarity index 100% rename from nashorn/test/script/basic/prototype.js rename to test/nashorn/script/basic/prototype.js diff --git a/nashorn/test/script/basic/prototype.js.EXPECTED b/test/nashorn/script/basic/prototype.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/prototype.js.EXPECTED rename to test/nashorn/script/basic/prototype.js.EXPECTED diff --git a/nashorn/test/script/basic/pushpull.js b/test/nashorn/script/basic/pushpull.js similarity index 100% rename from nashorn/test/script/basic/pushpull.js rename to test/nashorn/script/basic/pushpull.js diff --git a/nashorn/test/script/basic/pushpull.js.EXPECTED b/test/nashorn/script/basic/pushpull.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/pushpull.js.EXPECTED rename to test/nashorn/script/basic/pushpull.js.EXPECTED diff --git a/nashorn/test/script/basic/regex.js b/test/nashorn/script/basic/regex.js similarity index 100% rename from nashorn/test/script/basic/regex.js rename to test/nashorn/script/basic/regex.js diff --git a/nashorn/test/script/basic/regex.js.EXPECTED b/test/nashorn/script/basic/regex.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/regex.js.EXPECTED rename to test/nashorn/script/basic/regex.js.EXPECTED diff --git a/nashorn/test/script/basic/regexp_flags.js b/test/nashorn/script/basic/regexp_flags.js similarity index 100% rename from nashorn/test/script/basic/regexp_flags.js rename to test/nashorn/script/basic/regexp_flags.js diff --git a/nashorn/test/script/basic/relink_index_getter.js b/test/nashorn/script/basic/relink_index_getter.js similarity index 100% rename from nashorn/test/script/basic/relink_index_getter.js rename to test/nashorn/script/basic/relink_index_getter.js diff --git a/nashorn/test/script/basic/relink_index_getter.js.EXPECTED b/test/nashorn/script/basic/relink_index_getter.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/relink_index_getter.js.EXPECTED rename to test/nashorn/script/basic/relink_index_getter.js.EXPECTED diff --git a/nashorn/test/script/basic/run-octane.js b/test/nashorn/script/basic/run-octane.js similarity index 100% rename from nashorn/test/script/basic/run-octane.js rename to test/nashorn/script/basic/run-octane.js diff --git a/nashorn/test/script/basic/runsunspider-eager.js.EXPECTED b/test/nashorn/script/basic/runsunspider-eager.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/runsunspider-eager.js.EXPECTED rename to test/nashorn/script/basic/runsunspider-eager.js.EXPECTED diff --git a/nashorn/test/script/basic/runsunspider.js b/test/nashorn/script/basic/runsunspider.js similarity index 100% rename from nashorn/test/script/basic/runsunspider.js rename to test/nashorn/script/basic/runsunspider.js diff --git a/nashorn/test/script/basic/runsunspider.js.EXPECTED b/test/nashorn/script/basic/runsunspider.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/runsunspider.js.EXPECTED rename to test/nashorn/script/basic/runsunspider.js.EXPECTED diff --git a/nashorn/test/script/basic/samfunc.js b/test/nashorn/script/basic/samfunc.js similarity index 100% rename from nashorn/test/script/basic/samfunc.js rename to test/nashorn/script/basic/samfunc.js diff --git a/nashorn/test/script/basic/samfunc.js.EXPECTED b/test/nashorn/script/basic/samfunc.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/samfunc.js.EXPECTED rename to test/nashorn/script/basic/samfunc.js.EXPECTED diff --git a/nashorn/test/script/basic/scripting.js b/test/nashorn/script/basic/scripting.js similarity index 100% rename from nashorn/test/script/basic/scripting.js rename to test/nashorn/script/basic/scripting.js diff --git a/nashorn/test/script/basic/scripting.js.EXPECTED b/test/nashorn/script/basic/scripting.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/scripting.js.EXPECTED rename to test/nashorn/script/basic/scripting.js.EXPECTED diff --git a/nashorn/test/script/basic/sealfreeze.js b/test/nashorn/script/basic/sealfreeze.js similarity index 100% rename from nashorn/test/script/basic/sealfreeze.js rename to test/nashorn/script/basic/sealfreeze.js diff --git a/nashorn/test/script/basic/sealfreeze.js.EXPECTED b/test/nashorn/script/basic/sealfreeze.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/sealfreeze.js.EXPECTED rename to test/nashorn/script/basic/sealfreeze.js.EXPECTED diff --git a/nashorn/test/script/basic/setlength.js b/test/nashorn/script/basic/setlength.js similarity index 100% rename from nashorn/test/script/basic/setlength.js rename to test/nashorn/script/basic/setlength.js diff --git a/nashorn/test/script/basic/setlength.js.EXPECTED b/test/nashorn/script/basic/setlength.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/setlength.js.EXPECTED rename to test/nashorn/script/basic/setlength.js.EXPECTED diff --git a/nashorn/test/script/basic/splitter.js b/test/nashorn/script/basic/splitter.js similarity index 100% rename from nashorn/test/script/basic/splitter.js rename to test/nashorn/script/basic/splitter.js diff --git a/nashorn/test/script/basic/splitter.js.EXPECTED b/test/nashorn/script/basic/splitter.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/splitter.js.EXPECTED rename to test/nashorn/script/basic/splitter.js.EXPECTED diff --git a/nashorn/test/script/basic/splitter_prototype.js b/test/nashorn/script/basic/splitter_prototype.js similarity index 100% rename from nashorn/test/script/basic/splitter_prototype.js rename to test/nashorn/script/basic/splitter_prototype.js diff --git a/nashorn/test/script/basic/splitter_prototype.js.EXPECTED b/test/nashorn/script/basic/splitter_prototype.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/splitter_prototype.js.EXPECTED rename to test/nashorn/script/basic/splitter_prototype.js.EXPECTED diff --git a/nashorn/test/script/basic/splitter_yui.js b/test/nashorn/script/basic/splitter_yui.js similarity index 100% rename from nashorn/test/script/basic/splitter_yui.js rename to test/nashorn/script/basic/splitter_yui.js diff --git a/nashorn/test/script/basic/splitter_yui.js.EXPECTED b/test/nashorn/script/basic/splitter_yui.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/splitter_yui.js.EXPECTED rename to test/nashorn/script/basic/splitter_yui.js.EXPECTED diff --git a/nashorn/test/script/basic/stdin.js b/test/nashorn/script/basic/stdin.js similarity index 100% rename from nashorn/test/script/basic/stdin.js rename to test/nashorn/script/basic/stdin.js diff --git a/nashorn/test/script/basic/stdin.js.EXPECTED b/test/nashorn/script/basic/stdin.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/stdin.js.EXPECTED rename to test/nashorn/script/basic/stdin.js.EXPECTED diff --git a/nashorn/test/script/basic/strings.js b/test/nashorn/script/basic/strings.js similarity index 100% rename from nashorn/test/script/basic/strings.js rename to test/nashorn/script/basic/strings.js diff --git a/nashorn/test/script/basic/strings.js.EXPECTED b/test/nashorn/script/basic/strings.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/strings.js.EXPECTED rename to test/nashorn/script/basic/strings.js.EXPECTED diff --git a/nashorn/test/script/basic/throws.js b/test/nashorn/script/basic/throws.js similarity index 100% rename from nashorn/test/script/basic/throws.js rename to test/nashorn/script/basic/throws.js diff --git a/nashorn/test/script/basic/throws.js.EXPECTED b/test/nashorn/script/basic/throws.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/throws.js.EXPECTED rename to test/nashorn/script/basic/throws.js.EXPECTED diff --git a/nashorn/test/script/basic/tosource.js b/test/nashorn/script/basic/tosource.js similarity index 100% rename from nashorn/test/script/basic/tosource.js rename to test/nashorn/script/basic/tosource.js diff --git a/nashorn/test/script/basic/tosource.js.EXPECTED b/test/nashorn/script/basic/tosource.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/tosource.js.EXPECTED rename to test/nashorn/script/basic/tosource.js.EXPECTED diff --git a/nashorn/test/script/basic/tostring.js b/test/nashorn/script/basic/tostring.js similarity index 100% rename from nashorn/test/script/basic/tostring.js rename to test/nashorn/script/basic/tostring.js diff --git a/nashorn/test/script/basic/tostring.js.EXPECTED b/test/nashorn/script/basic/tostring.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/tostring.js.EXPECTED rename to test/nashorn/script/basic/tostring.js.EXPECTED diff --git a/nashorn/test/script/basic/try.js b/test/nashorn/script/basic/try.js similarity index 100% rename from nashorn/test/script/basic/try.js rename to test/nashorn/script/basic/try.js diff --git a/nashorn/test/script/basic/try.js.EXPECTED b/test/nashorn/script/basic/try.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/try.js.EXPECTED rename to test/nashorn/script/basic/try.js.EXPECTED diff --git a/nashorn/test/script/basic/try2.js b/test/nashorn/script/basic/try2.js similarity index 100% rename from nashorn/test/script/basic/try2.js rename to test/nashorn/script/basic/try2.js diff --git a/nashorn/test/script/basic/try2.js.EXPECTED b/test/nashorn/script/basic/try2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/try2.js.EXPECTED rename to test/nashorn/script/basic/try2.js.EXPECTED diff --git a/nashorn/test/script/basic/trybreakcont.js b/test/nashorn/script/basic/trybreakcont.js similarity index 100% rename from nashorn/test/script/basic/trybreakcont.js rename to test/nashorn/script/basic/trybreakcont.js diff --git a/nashorn/test/script/basic/trybreakcont.js.EXPECTED b/test/nashorn/script/basic/trybreakcont.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/trybreakcont.js.EXPECTED rename to test/nashorn/script/basic/trybreakcont.js.EXPECTED diff --git a/nashorn/test/script/basic/trycatch.js b/test/nashorn/script/basic/trycatch.js similarity index 100% rename from nashorn/test/script/basic/trycatch.js rename to test/nashorn/script/basic/trycatch.js diff --git a/nashorn/test/script/basic/trycatch.js.EXPECTED b/test/nashorn/script/basic/trycatch.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/trycatch.js.EXPECTED rename to test/nashorn/script/basic/trycatch.js.EXPECTED diff --git a/nashorn/test/script/basic/trycatchfor.js b/test/nashorn/script/basic/trycatchfor.js similarity index 100% rename from nashorn/test/script/basic/trycatchfor.js rename to test/nashorn/script/basic/trycatchfor.js diff --git a/nashorn/test/script/basic/trycatchfor.js.EXPECTED b/test/nashorn/script/basic/trycatchfor.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/trycatchfor.js.EXPECTED rename to test/nashorn/script/basic/trycatchfor.js.EXPECTED diff --git a/nashorn/test/script/basic/tryfinallyreturn.js b/test/nashorn/script/basic/tryfinallyreturn.js similarity index 100% rename from nashorn/test/script/basic/tryfinallyreturn.js rename to test/nashorn/script/basic/tryfinallyreturn.js diff --git a/nashorn/test/script/basic/tryfinallyreturn.js.EXPECTED b/test/nashorn/script/basic/tryfinallyreturn.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/tryfinallyreturn.js.EXPECTED rename to test/nashorn/script/basic/tryfinallyreturn.js.EXPECTED diff --git a/nashorn/test/script/basic/tryforbreak.js b/test/nashorn/script/basic/tryforbreak.js similarity index 100% rename from nashorn/test/script/basic/tryforbreak.js rename to test/nashorn/script/basic/tryforbreak.js diff --git a/nashorn/test/script/basic/tryforbreak.js.EXPECTED b/test/nashorn/script/basic/tryforbreak.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/tryforbreak.js.EXPECTED rename to test/nashorn/script/basic/tryforbreak.js.EXPECTED diff --git a/nashorn/test/script/basic/typechange.js b/test/nashorn/script/basic/typechange.js similarity index 100% rename from nashorn/test/script/basic/typechange.js rename to test/nashorn/script/basic/typechange.js diff --git a/nashorn/test/script/basic/typechange.js.EXPECTED b/test/nashorn/script/basic/typechange.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/typechange.js.EXPECTED rename to test/nashorn/script/basic/typechange.js.EXPECTED diff --git a/nashorn/test/script/basic/typecoerce.js b/test/nashorn/script/basic/typecoerce.js similarity index 100% rename from nashorn/test/script/basic/typecoerce.js rename to test/nashorn/script/basic/typecoerce.js diff --git a/nashorn/test/script/basic/typecoerce.js.EXPECTED b/test/nashorn/script/basic/typecoerce.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/typecoerce.js.EXPECTED rename to test/nashorn/script/basic/typecoerce.js.EXPECTED diff --git a/nashorn/test/script/basic/typedarrays.js b/test/nashorn/script/basic/typedarrays.js similarity index 100% rename from nashorn/test/script/basic/typedarrays.js rename to test/nashorn/script/basic/typedarrays.js diff --git a/nashorn/test/script/basic/typedarrays2.js b/test/nashorn/script/basic/typedarrays2.js similarity index 100% rename from nashorn/test/script/basic/typedarrays2.js rename to test/nashorn/script/basic/typedarrays2.js diff --git a/nashorn/test/script/basic/typedarrays2.js.EXPECTED b/test/nashorn/script/basic/typedarrays2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/typedarrays2.js.EXPECTED rename to test/nashorn/script/basic/typedarrays2.js.EXPECTED diff --git a/nashorn/test/script/basic/typeof.js b/test/nashorn/script/basic/typeof.js similarity index 100% rename from nashorn/test/script/basic/typeof.js rename to test/nashorn/script/basic/typeof.js diff --git a/nashorn/test/script/basic/typeof.js.EXPECTED b/test/nashorn/script/basic/typeof.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/typeof.js.EXPECTED rename to test/nashorn/script/basic/typeof.js.EXPECTED diff --git a/nashorn/test/script/basic/typeof2.js b/test/nashorn/script/basic/typeof2.js similarity index 100% rename from nashorn/test/script/basic/typeof2.js rename to test/nashorn/script/basic/typeof2.js diff --git a/nashorn/test/script/basic/typeof2.js.EXPECTED b/test/nashorn/script/basic/typeof2.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/typeof2.js.EXPECTED rename to test/nashorn/script/basic/typeof2.js.EXPECTED diff --git a/nashorn/test/script/basic/undefined.js b/test/nashorn/script/basic/undefined.js similarity index 100% rename from nashorn/test/script/basic/undefined.js rename to test/nashorn/script/basic/undefined.js diff --git a/nashorn/test/script/basic/undefined.js.EXPECTED b/test/nashorn/script/basic/undefined.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/undefined.js.EXPECTED rename to test/nashorn/script/basic/undefined.js.EXPECTED diff --git a/nashorn/test/script/basic/underscore.js b/test/nashorn/script/basic/underscore.js similarity index 100% rename from nashorn/test/script/basic/underscore.js rename to test/nashorn/script/basic/underscore.js diff --git a/nashorn/test/script/basic/underscore.js.EXPECTED b/test/nashorn/script/basic/underscore.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/underscore.js.EXPECTED rename to test/nashorn/script/basic/underscore.js.EXPECTED diff --git a/nashorn/test/script/basic/varargs.js b/test/nashorn/script/basic/varargs.js similarity index 100% rename from nashorn/test/script/basic/varargs.js rename to test/nashorn/script/basic/varargs.js diff --git a/nashorn/test/script/basic/varargs.js.EXPECTED b/test/nashorn/script/basic/varargs.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/varargs.js.EXPECTED rename to test/nashorn/script/basic/varargs.js.EXPECTED diff --git a/nashorn/test/script/basic/void.js b/test/nashorn/script/basic/void.js similarity index 100% rename from nashorn/test/script/basic/void.js rename to test/nashorn/script/basic/void.js diff --git a/nashorn/test/script/basic/void.js.EXPECTED b/test/nashorn/script/basic/void.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/void.js.EXPECTED rename to test/nashorn/script/basic/void.js.EXPECTED diff --git a/nashorn/test/script/basic/with.js b/test/nashorn/script/basic/with.js similarity index 100% rename from nashorn/test/script/basic/with.js rename to test/nashorn/script/basic/with.js diff --git a/nashorn/test/script/basic/with.js.EXPECTED b/test/nashorn/script/basic/with.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/with.js.EXPECTED rename to test/nashorn/script/basic/with.js.EXPECTED diff --git a/nashorn/test/script/basic/withprimitive.js b/test/nashorn/script/basic/withprimitive.js similarity index 100% rename from nashorn/test/script/basic/withprimitive.js rename to test/nashorn/script/basic/withprimitive.js diff --git a/nashorn/test/script/basic/withprimitive.js.EXPECTED b/test/nashorn/script/basic/withprimitive.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/withprimitive.js.EXPECTED rename to test/nashorn/script/basic/withprimitive.js.EXPECTED diff --git a/nashorn/test/script/basic/writable_relink.js b/test/nashorn/script/basic/writable_relink.js similarity index 100% rename from nashorn/test/script/basic/writable_relink.js rename to test/nashorn/script/basic/writable_relink.js diff --git a/nashorn/test/script/basic/writable_relink.js.EXPECTED b/test/nashorn/script/basic/writable_relink.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/writable_relink.js.EXPECTED rename to test/nashorn/script/basic/writable_relink.js.EXPECTED diff --git a/nashorn/test/script/basic/xmlStrings.js.EXPECTED b/test/nashorn/script/basic/xmlStrings.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/xmlStrings.js.EXPECTED rename to test/nashorn/script/basic/xmlStrings.js.EXPECTED diff --git a/nashorn/test/script/basic/xorassign.js b/test/nashorn/script/basic/xorassign.js similarity index 100% rename from nashorn/test/script/basic/xorassign.js rename to test/nashorn/script/basic/xorassign.js diff --git a/nashorn/test/script/basic/xorassign.js.EXPECTED b/test/nashorn/script/basic/xorassign.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/xorassign.js.EXPECTED rename to test/nashorn/script/basic/xorassign.js.EXPECTED diff --git a/nashorn/test/script/basic/yui.js b/test/nashorn/script/basic/yui.js similarity index 100% rename from nashorn/test/script/basic/yui.js rename to test/nashorn/script/basic/yui.js diff --git a/nashorn/test/script/basic/yui.js.EXPECTED b/test/nashorn/script/basic/yui.js.EXPECTED similarity index 100% rename from nashorn/test/script/basic/yui.js.EXPECTED rename to test/nashorn/script/basic/yui.js.EXPECTED diff --git a/nashorn/test/script/currently-failing/JDK-8006191.js b/test/nashorn/script/currently-failing/JDK-8006191.js similarity index 100% rename from nashorn/test/script/currently-failing/JDK-8006191.js rename to test/nashorn/script/currently-failing/JDK-8006191.js diff --git a/nashorn/test/script/currently-failing/JDK-8006191.js.EXPECTED b/test/nashorn/script/currently-failing/JDK-8006191.js.EXPECTED similarity index 100% rename from nashorn/test/script/currently-failing/JDK-8006191.js.EXPECTED rename to test/nashorn/script/currently-failing/JDK-8006191.js.EXPECTED diff --git a/nashorn/test/script/currently-failing/JDK-8010697.js b/test/nashorn/script/currently-failing/JDK-8010697.js similarity index 100% rename from nashorn/test/script/currently-failing/JDK-8010697.js rename to test/nashorn/script/currently-failing/JDK-8010697.js diff --git a/nashorn/test/script/currently-failing/JDK-8010697.js.EXPECTED b/test/nashorn/script/currently-failing/JDK-8010697.js.EXPECTED similarity index 100% rename from nashorn/test/script/currently-failing/JDK-8010697.js.EXPECTED rename to test/nashorn/script/currently-failing/JDK-8010697.js.EXPECTED diff --git a/nashorn/test/script/currently-failing/JDK-8055034.js b/test/nashorn/script/currently-failing/JDK-8055034.js similarity index 100% rename from nashorn/test/script/currently-failing/JDK-8055034.js rename to test/nashorn/script/currently-failing/JDK-8055034.js diff --git a/nashorn/test/script/currently-failing/JDK-8055034.js.EXPECTED b/test/nashorn/script/currently-failing/JDK-8055034.js.EXPECTED similarity index 100% rename from nashorn/test/script/currently-failing/JDK-8055034.js.EXPECTED rename to test/nashorn/script/currently-failing/JDK-8055034.js.EXPECTED diff --git a/nashorn/test/script/currently-failing/JDK-8144221.js b/test/nashorn/script/currently-failing/JDK-8144221.js similarity index 100% rename from nashorn/test/script/currently-failing/JDK-8144221.js rename to test/nashorn/script/currently-failing/JDK-8144221.js diff --git a/nashorn/test/script/currently-failing/JDK-8144221.js.EXPECTED b/test/nashorn/script/currently-failing/JDK-8144221.js.EXPECTED similarity index 100% rename from nashorn/test/script/currently-failing/JDK-8144221.js.EXPECTED rename to test/nashorn/script/currently-failing/JDK-8144221.js.EXPECTED diff --git a/nashorn/test/script/currently-failing/NASHORN-627.js b/test/nashorn/script/currently-failing/NASHORN-627.js similarity index 100% rename from nashorn/test/script/currently-failing/NASHORN-627.js rename to test/nashorn/script/currently-failing/NASHORN-627.js diff --git a/nashorn/test/script/currently-failing/NASHORN-627.js.EXPECTED b/test/nashorn/script/currently-failing/NASHORN-627.js.EXPECTED similarity index 100% rename from nashorn/test/script/currently-failing/NASHORN-627.js.EXPECTED rename to test/nashorn/script/currently-failing/NASHORN-627.js.EXPECTED diff --git a/nashorn/test/script/currently-failing/apply_to_call_bench.js b/test/nashorn/script/currently-failing/apply_to_call_bench.js similarity index 100% rename from nashorn/test/script/currently-failing/apply_to_call_bench.js rename to test/nashorn/script/currently-failing/apply_to_call_bench.js diff --git a/nashorn/test/script/currently-failing/apply_to_call_bench.js.EXPECTED b/test/nashorn/script/currently-failing/apply_to_call_bench.js.EXPECTED similarity index 100% rename from nashorn/test/script/currently-failing/apply_to_call_bench.js.EXPECTED rename to test/nashorn/script/currently-failing/apply_to_call_bench.js.EXPECTED diff --git a/nashorn/test/script/currently-failing/clone_ir.js b/test/nashorn/script/currently-failing/clone_ir.js similarity index 100% rename from nashorn/test/script/currently-failing/clone_ir.js rename to test/nashorn/script/currently-failing/clone_ir.js diff --git a/nashorn/test/script/currently-failing/optimistic_check_type_cases.js b/test/nashorn/script/currently-failing/optimistic_check_type_cases.js similarity index 100% rename from nashorn/test/script/currently-failing/optimistic_check_type_cases.js rename to test/nashorn/script/currently-failing/optimistic_check_type_cases.js diff --git a/nashorn/test/script/currently-failing/optimistic_check_type_cases.js.EXPECTED b/test/nashorn/script/currently-failing/optimistic_check_type_cases.js.EXPECTED similarity index 100% rename from nashorn/test/script/currently-failing/optimistic_check_type_cases.js.EXPECTED rename to test/nashorn/script/currently-failing/optimistic_check_type_cases.js.EXPECTED diff --git a/nashorn/test/script/error/JDK-8008814-1.js b/test/nashorn/script/error/JDK-8008814-1.js similarity index 100% rename from nashorn/test/script/error/JDK-8008814-1.js rename to test/nashorn/script/error/JDK-8008814-1.js diff --git a/nashorn/test/script/error/JDK-8008814-1.js.EXPECTED b/test/nashorn/script/error/JDK-8008814-1.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/JDK-8008814-1.js.EXPECTED rename to test/nashorn/script/error/JDK-8008814-1.js.EXPECTED diff --git a/nashorn/test/script/error/JDK-8008814-2.js b/test/nashorn/script/error/JDK-8008814-2.js similarity index 100% rename from nashorn/test/script/error/JDK-8008814-2.js rename to test/nashorn/script/error/JDK-8008814-2.js diff --git a/nashorn/test/script/error/JDK-8008814-2.js.EXPECTED b/test/nashorn/script/error/JDK-8008814-2.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/JDK-8008814-2.js.EXPECTED rename to test/nashorn/script/error/JDK-8008814-2.js.EXPECTED diff --git a/nashorn/test/script/error/JDK-8016522.js b/test/nashorn/script/error/JDK-8016522.js similarity index 100% rename from nashorn/test/script/error/JDK-8016522.js rename to test/nashorn/script/error/JDK-8016522.js diff --git a/nashorn/test/script/error/JDK-8016522.js.EXPECTED b/test/nashorn/script/error/JDK-8016522.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/JDK-8016522.js.EXPECTED rename to test/nashorn/script/error/JDK-8016522.js.EXPECTED diff --git a/nashorn/test/script/error/JDK-8020437-2.js b/test/nashorn/script/error/JDK-8020437-2.js similarity index 100% rename from nashorn/test/script/error/JDK-8020437-2.js rename to test/nashorn/script/error/JDK-8020437-2.js diff --git a/nashorn/test/script/error/JDK-8020437-2.js.EXPECTED b/test/nashorn/script/error/JDK-8020437-2.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/JDK-8020437-2.js.EXPECTED rename to test/nashorn/script/error/JDK-8020437-2.js.EXPECTED diff --git a/nashorn/test/script/error/JDK-8020437.js b/test/nashorn/script/error/JDK-8020437.js similarity index 100% rename from nashorn/test/script/error/JDK-8020437.js rename to test/nashorn/script/error/JDK-8020437.js diff --git a/nashorn/test/script/error/JDK-8020437.js.EXPECTED b/test/nashorn/script/error/JDK-8020437.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/JDK-8020437.js.EXPECTED rename to test/nashorn/script/error/JDK-8020437.js.EXPECTED diff --git a/nashorn/test/script/error/JDK-8026039.js b/test/nashorn/script/error/JDK-8026039.js similarity index 100% rename from nashorn/test/script/error/JDK-8026039.js rename to test/nashorn/script/error/JDK-8026039.js diff --git a/nashorn/test/script/error/JDK-8026039.js.EXPECTED b/test/nashorn/script/error/JDK-8026039.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/JDK-8026039.js.EXPECTED rename to test/nashorn/script/error/JDK-8026039.js.EXPECTED diff --git a/nashorn/test/script/error/JDK-8027933.js b/test/nashorn/script/error/JDK-8027933.js similarity index 100% rename from nashorn/test/script/error/JDK-8027933.js rename to test/nashorn/script/error/JDK-8027933.js diff --git a/nashorn/test/script/error/JDK-8027933.js.EXPECTED b/test/nashorn/script/error/JDK-8027933.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/JDK-8027933.js.EXPECTED rename to test/nashorn/script/error/JDK-8027933.js.EXPECTED diff --git a/nashorn/test/script/error/JDK-8039047.js b/test/nashorn/script/error/JDK-8039047.js similarity index 100% rename from nashorn/test/script/error/JDK-8039047.js rename to test/nashorn/script/error/JDK-8039047.js diff --git a/nashorn/test/script/error/JDK-8039047.js.EXPECTED b/test/nashorn/script/error/JDK-8039047.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/JDK-8039047.js.EXPECTED rename to test/nashorn/script/error/JDK-8039047.js.EXPECTED diff --git a/nashorn/test/script/error/JDK-8098847.js b/test/nashorn/script/error/JDK-8098847.js similarity index 100% rename from nashorn/test/script/error/JDK-8098847.js rename to test/nashorn/script/error/JDK-8098847.js diff --git a/nashorn/test/script/error/JDK-8098847.js.EXPECTED b/test/nashorn/script/error/JDK-8098847.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/JDK-8098847.js.EXPECTED rename to test/nashorn/script/error/JDK-8098847.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-154/README b/test/nashorn/script/error/NASHORN-154/README similarity index 100% rename from nashorn/test/script/error/NASHORN-154/README rename to test/nashorn/script/error/NASHORN-154/README diff --git a/nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js b/test/nashorn/script/error/NASHORN-154/function_mult_params_in_strict.js similarity index 100% rename from nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js rename to test/nashorn/script/error/NASHORN-154/function_mult_params_in_strict.js diff --git a/nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/function_mult_params_in_strict.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js.EXPECTED rename to test/nashorn/script/error/NASHORN-154/function_mult_params_in_strict.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js b/test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js similarity index 100% rename from nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js rename to test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js diff --git a/nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js.EXPECTED rename to test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-154/invalid_lvalue.js b/test/nashorn/script/error/NASHORN-154/invalid_lvalue.js similarity index 100% rename from nashorn/test/script/error/NASHORN-154/invalid_lvalue.js rename to test/nashorn/script/error/NASHORN-154/invalid_lvalue.js diff --git a/nashorn/test/script/error/NASHORN-154/invalid_lvalue.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/invalid_lvalue.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-154/invalid_lvalue.js.EXPECTED rename to test/nashorn/script/error/NASHORN-154/invalid_lvalue.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js b/test/nashorn/script/error/NASHORN-154/literal_data_and_accessor.js similarity index 100% rename from nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js rename to test/nashorn/script/error/NASHORN-154/literal_data_and_accessor.js diff --git a/nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/literal_data_and_accessor.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js.EXPECTED rename to test/nashorn/script/error/NASHORN-154/literal_data_and_accessor.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-154/literal_mult_getters.js b/test/nashorn/script/error/NASHORN-154/literal_mult_getters.js similarity index 100% rename from nashorn/test/script/error/NASHORN-154/literal_mult_getters.js rename to test/nashorn/script/error/NASHORN-154/literal_mult_getters.js diff --git a/nashorn/test/script/error/NASHORN-154/literal_mult_getters.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/literal_mult_getters.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-154/literal_mult_getters.js.EXPECTED rename to test/nashorn/script/error/NASHORN-154/literal_mult_getters.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js b/test/nashorn/script/error/NASHORN-154/literal_mult_prop_in_strict.js similarity index 100% rename from nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js rename to test/nashorn/script/error/NASHORN-154/literal_mult_prop_in_strict.js diff --git a/nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/literal_mult_prop_in_strict.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js.EXPECTED rename to test/nashorn/script/error/NASHORN-154/literal_mult_prop_in_strict.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-154/with_in_strict.js b/test/nashorn/script/error/NASHORN-154/with_in_strict.js similarity index 100% rename from nashorn/test/script/error/NASHORN-154/with_in_strict.js rename to test/nashorn/script/error/NASHORN-154/with_in_strict.js diff --git a/nashorn/test/script/error/NASHORN-154/with_in_strict.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/with_in_strict.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-154/with_in_strict.js.EXPECTED rename to test/nashorn/script/error/NASHORN-154/with_in_strict.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-214.js b/test/nashorn/script/error/NASHORN-214.js similarity index 100% rename from nashorn/test/script/error/NASHORN-214.js rename to test/nashorn/script/error/NASHORN-214.js diff --git a/nashorn/test/script/error/NASHORN-214.js.EXPECTED b/test/nashorn/script/error/NASHORN-214.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-214.js.EXPECTED rename to test/nashorn/script/error/NASHORN-214.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-35.js b/test/nashorn/script/error/NASHORN-35.js similarity index 100% rename from nashorn/test/script/error/NASHORN-35.js rename to test/nashorn/script/error/NASHORN-35.js diff --git a/nashorn/test/script/error/NASHORN-35.js.EXPECTED b/test/nashorn/script/error/NASHORN-35.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-35.js.EXPECTED rename to test/nashorn/script/error/NASHORN-35.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-39.js b/test/nashorn/script/error/NASHORN-39.js similarity index 100% rename from nashorn/test/script/error/NASHORN-39.js rename to test/nashorn/script/error/NASHORN-39.js diff --git a/nashorn/test/script/error/NASHORN-39.js.EXPECTED b/test/nashorn/script/error/NASHORN-39.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-39.js.EXPECTED rename to test/nashorn/script/error/NASHORN-39.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-568.js b/test/nashorn/script/error/NASHORN-568.js similarity index 100% rename from nashorn/test/script/error/NASHORN-568.js rename to test/nashorn/script/error/NASHORN-568.js diff --git a/nashorn/test/script/error/NASHORN-568.js.EXPECTED b/test/nashorn/script/error/NASHORN-568.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-568.js.EXPECTED rename to test/nashorn/script/error/NASHORN-568.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-57.js b/test/nashorn/script/error/NASHORN-57.js similarity index 100% rename from nashorn/test/script/error/NASHORN-57.js rename to test/nashorn/script/error/NASHORN-57.js diff --git a/nashorn/test/script/error/NASHORN-57.js.EXPECTED b/test/nashorn/script/error/NASHORN-57.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-57.js.EXPECTED rename to test/nashorn/script/error/NASHORN-57.js.EXPECTED diff --git a/nashorn/test/script/error/NASHORN-668.js b/test/nashorn/script/error/NASHORN-668.js similarity index 100% rename from nashorn/test/script/error/NASHORN-668.js rename to test/nashorn/script/error/NASHORN-668.js diff --git a/nashorn/test/script/error/NASHORN-668.js.EXPECTED b/test/nashorn/script/error/NASHORN-668.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/NASHORN-668.js.EXPECTED rename to test/nashorn/script/error/NASHORN-668.js.EXPECTED diff --git a/nashorn/test/script/error/anon_func_stat_nse.js b/test/nashorn/script/error/anon_func_stat_nse.js similarity index 100% rename from nashorn/test/script/error/anon_func_stat_nse.js rename to test/nashorn/script/error/anon_func_stat_nse.js diff --git a/nashorn/test/script/error/anon_func_stat_nse.js.EXPECTED b/test/nashorn/script/error/anon_func_stat_nse.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/anon_func_stat_nse.js.EXPECTED rename to test/nashorn/script/error/anon_func_stat_nse.js.EXPECTED diff --git a/nashorn/test/script/error/backquote_string_nse.js b/test/nashorn/script/error/backquote_string_nse.js similarity index 100% rename from nashorn/test/script/error/backquote_string_nse.js rename to test/nashorn/script/error/backquote_string_nse.js diff --git a/nashorn/test/script/error/backquote_string_nse.js.EXPECTED b/test/nashorn/script/error/backquote_string_nse.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/backquote_string_nse.js.EXPECTED rename to test/nashorn/script/error/backquote_string_nse.js.EXPECTED diff --git a/nashorn/test/script/error/conditional_catch_nse.js b/test/nashorn/script/error/conditional_catch_nse.js similarity index 100% rename from nashorn/test/script/error/conditional_catch_nse.js rename to test/nashorn/script/error/conditional_catch_nse.js diff --git a/nashorn/test/script/error/conditional_catch_nse.js.EXPECTED b/test/nashorn/script/error/conditional_catch_nse.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/conditional_catch_nse.js.EXPECTED rename to test/nashorn/script/error/conditional_catch_nse.js.EXPECTED diff --git a/nashorn/test/script/error/expr_closure_nse.js b/test/nashorn/script/error/expr_closure_nse.js similarity index 100% rename from nashorn/test/script/error/expr_closure_nse.js rename to test/nashorn/script/error/expr_closure_nse.js diff --git a/nashorn/test/script/error/expr_closure_nse.js.EXPECTED b/test/nashorn/script/error/expr_closure_nse.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/expr_closure_nse.js.EXPECTED rename to test/nashorn/script/error/expr_closure_nse.js.EXPECTED diff --git a/nashorn/test/script/error/for_each_nse.js b/test/nashorn/script/error/for_each_nse.js similarity index 100% rename from nashorn/test/script/error/for_each_nse.js rename to test/nashorn/script/error/for_each_nse.js diff --git a/nashorn/test/script/error/for_each_nse.js.EXPECTED b/test/nashorn/script/error/for_each_nse.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/for_each_nse.js.EXPECTED rename to test/nashorn/script/error/for_each_nse.js.EXPECTED diff --git a/nashorn/test/script/error/hash_comment_nse.js b/test/nashorn/script/error/hash_comment_nse.js similarity index 100% rename from nashorn/test/script/error/hash_comment_nse.js rename to test/nashorn/script/error/hash_comment_nse.js diff --git a/nashorn/test/script/error/hash_comment_nse.js.EXPECTED b/test/nashorn/script/error/hash_comment_nse.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/hash_comment_nse.js.EXPECTED rename to test/nashorn/script/error/hash_comment_nse.js.EXPECTED diff --git a/nashorn/test/script/error/heredoc_nse.js b/test/nashorn/script/error/heredoc_nse.js similarity index 100% rename from nashorn/test/script/error/heredoc_nse.js rename to test/nashorn/script/error/heredoc_nse.js diff --git a/nashorn/test/script/error/heredoc_nse.js.EXPECTED b/test/nashorn/script/error/heredoc_nse.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/heredoc_nse.js.EXPECTED rename to test/nashorn/script/error/heredoc_nse.js.EXPECTED diff --git a/nashorn/test/script/error/object_literal_in_new_nse.js b/test/nashorn/script/error/object_literal_in_new_nse.js similarity index 100% rename from nashorn/test/script/error/object_literal_in_new_nse.js rename to test/nashorn/script/error/object_literal_in_new_nse.js diff --git a/nashorn/test/script/error/object_literal_in_new_nse.js.EXPECTED b/test/nashorn/script/error/object_literal_in_new_nse.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/object_literal_in_new_nse.js.EXPECTED rename to test/nashorn/script/error/object_literal_in_new_nse.js.EXPECTED diff --git a/nashorn/test/script/error/quotemissing.js b/test/nashorn/script/error/quotemissing.js similarity index 100% rename from nashorn/test/script/error/quotemissing.js rename to test/nashorn/script/error/quotemissing.js diff --git a/nashorn/test/script/error/quotemissing.js.EXPECTED b/test/nashorn/script/error/quotemissing.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/quotemissing.js.EXPECTED rename to test/nashorn/script/error/quotemissing.js.EXPECTED diff --git a/nashorn/test/script/error/strictmode.js b/test/nashorn/script/error/strictmode.js similarity index 100% rename from nashorn/test/script/error/strictmode.js rename to test/nashorn/script/error/strictmode.js diff --git a/nashorn/test/script/error/strictmode.js.EXPECTED b/test/nashorn/script/error/strictmode.js.EXPECTED similarity index 100% rename from nashorn/test/script/error/strictmode.js.EXPECTED rename to test/nashorn/script/error/strictmode.js.EXPECTED diff --git a/nashorn/test/script/jfx.js b/test/nashorn/script/jfx.js similarity index 100% rename from nashorn/test/script/jfx.js rename to test/nashorn/script/jfx.js diff --git a/nashorn/test/script/jfx/flyingimage.js b/test/nashorn/script/jfx/flyingimage.js similarity index 100% rename from nashorn/test/script/jfx/flyingimage.js rename to test/nashorn/script/jfx/flyingimage.js diff --git a/nashorn/test/script/jfx/flyingimage/flyingimage.png b/test/nashorn/script/jfx/flyingimage/flyingimage.png similarity index 100% rename from nashorn/test/script/jfx/flyingimage/flyingimage.png rename to test/nashorn/script/jfx/flyingimage/flyingimage.png diff --git a/nashorn/test/script/jfx/flyingimage/golden/linux.png b/test/nashorn/script/jfx/flyingimage/golden/linux.png similarity index 100% rename from nashorn/test/script/jfx/flyingimage/golden/linux.png rename to test/nashorn/script/jfx/flyingimage/golden/linux.png diff --git a/nashorn/test/script/jfx/flyingimage/golden/macosx.png b/test/nashorn/script/jfx/flyingimage/golden/macosx.png similarity index 100% rename from nashorn/test/script/jfx/flyingimage/golden/macosx.png rename to test/nashorn/script/jfx/flyingimage/golden/macosx.png diff --git a/nashorn/test/script/jfx/flyingimage/golden/windows.png b/test/nashorn/script/jfx/flyingimage/golden/windows.png similarity index 100% rename from nashorn/test/script/jfx/flyingimage/golden/windows.png rename to test/nashorn/script/jfx/flyingimage/golden/windows.png diff --git a/nashorn/test/script/jfx/kaleidoscope.js b/test/nashorn/script/jfx/kaleidoscope.js similarity index 100% rename from nashorn/test/script/jfx/kaleidoscope.js rename to test/nashorn/script/jfx/kaleidoscope.js diff --git a/nashorn/test/script/jfx/kaleidoscope/golden/linux.png b/test/nashorn/script/jfx/kaleidoscope/golden/linux.png similarity index 100% rename from nashorn/test/script/jfx/kaleidoscope/golden/linux.png rename to test/nashorn/script/jfx/kaleidoscope/golden/linux.png diff --git a/nashorn/test/script/jfx/kaleidoscope/golden/macosx.png b/test/nashorn/script/jfx/kaleidoscope/golden/macosx.png similarity index 100% rename from nashorn/test/script/jfx/kaleidoscope/golden/macosx.png rename to test/nashorn/script/jfx/kaleidoscope/golden/macosx.png diff --git a/nashorn/test/script/jfx/kaleidoscope/golden/windows.png b/test/nashorn/script/jfx/kaleidoscope/golden/windows.png similarity index 100% rename from nashorn/test/script/jfx/kaleidoscope/golden/windows.png rename to test/nashorn/script/jfx/kaleidoscope/golden/windows.png diff --git a/nashorn/test/script/jfx/spread.js b/test/nashorn/script/jfx/spread.js similarity index 100% rename from nashorn/test/script/jfx/spread.js rename to test/nashorn/script/jfx/spread.js diff --git a/nashorn/test/script/jfx/spread/golden/linux.png b/test/nashorn/script/jfx/spread/golden/linux.png similarity index 100% rename from nashorn/test/script/jfx/spread/golden/linux.png rename to test/nashorn/script/jfx/spread/golden/linux.png diff --git a/nashorn/test/script/jfx/spread/golden/macosx.png b/test/nashorn/script/jfx/spread/golden/macosx.png similarity index 100% rename from nashorn/test/script/jfx/spread/golden/macosx.png rename to test/nashorn/script/jfx/spread/golden/macosx.png diff --git a/nashorn/test/script/jfx/spread/golden/windows.png b/test/nashorn/script/jfx/spread/golden/windows.png similarity index 100% rename from nashorn/test/script/jfx/spread/golden/windows.png rename to test/nashorn/script/jfx/spread/golden/windows.png diff --git a/nashorn/test/script/maptests/builtins.js b/test/nashorn/script/maptests/builtins.js similarity index 100% rename from nashorn/test/script/maptests/builtins.js rename to test/nashorn/script/maptests/builtins.js diff --git a/nashorn/test/script/maptests/constructor.js b/test/nashorn/script/maptests/constructor.js similarity index 100% rename from nashorn/test/script/maptests/constructor.js rename to test/nashorn/script/maptests/constructor.js diff --git a/nashorn/test/script/maptests/gettersetter.js b/test/nashorn/script/maptests/gettersetter.js similarity index 100% rename from nashorn/test/script/maptests/gettersetter.js rename to test/nashorn/script/maptests/gettersetter.js diff --git a/nashorn/test/script/maptests/maputil.js b/test/nashorn/script/maptests/maputil.js similarity index 100% rename from nashorn/test/script/maptests/maputil.js rename to test/nashorn/script/maptests/maputil.js diff --git a/nashorn/test/script/maptests/object_create.js b/test/nashorn/script/maptests/object_create.js similarity index 100% rename from nashorn/test/script/maptests/object_create.js rename to test/nashorn/script/maptests/object_create.js diff --git a/nashorn/test/script/maptests/object_literals.js b/test/nashorn/script/maptests/object_literals.js similarity index 100% rename from nashorn/test/script/maptests/object_literals.js rename to test/nashorn/script/maptests/object_literals.js diff --git a/nashorn/test/script/maptests/point.js b/test/nashorn/script/maptests/point.js similarity index 100% rename from nashorn/test/script/maptests/point.js rename to test/nashorn/script/maptests/point.js diff --git a/nashorn/test/script/maptests/property_add.js b/test/nashorn/script/maptests/property_add.js similarity index 100% rename from nashorn/test/script/maptests/property_add.js rename to test/nashorn/script/maptests/property_add.js diff --git a/nashorn/test/script/maptests/property_delete.js b/test/nashorn/script/maptests/property_delete.js similarity index 100% rename from nashorn/test/script/maptests/property_delete.js rename to test/nashorn/script/maptests/property_delete.js diff --git a/nashorn/test/script/maptests/proto.js b/test/nashorn/script/maptests/proto.js similarity index 100% rename from nashorn/test/script/maptests/proto.js rename to test/nashorn/script/maptests/proto.js diff --git a/nashorn/test/script/markdown.js b/test/nashorn/script/markdown.js similarity index 100% rename from nashorn/test/script/markdown.js rename to test/nashorn/script/markdown.js diff --git a/nashorn/test/script/markdown/anchors-by-reference.js b/test/nashorn/script/markdown/anchors-by-reference.js similarity index 100% rename from nashorn/test/script/markdown/anchors-by-reference.js rename to test/nashorn/script/markdown/anchors-by-reference.js diff --git a/nashorn/test/script/markdown/anchors-by-reference.js.EXPECTED b/test/nashorn/script/markdown/anchors-by-reference.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/anchors-by-reference.js.EXPECTED rename to test/nashorn/script/markdown/anchors-by-reference.js.EXPECTED diff --git a/nashorn/test/script/markdown/automatic-anchors.js b/test/nashorn/script/markdown/automatic-anchors.js similarity index 100% rename from nashorn/test/script/markdown/automatic-anchors.js rename to test/nashorn/script/markdown/automatic-anchors.js diff --git a/nashorn/test/script/markdown/automatic-anchors.js.EXPECTED b/test/nashorn/script/markdown/automatic-anchors.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/automatic-anchors.js.EXPECTED rename to test/nashorn/script/markdown/automatic-anchors.js.EXPECTED diff --git a/nashorn/test/script/markdown/blockquote-nested-markdown.js b/test/nashorn/script/markdown/blockquote-nested-markdown.js similarity index 100% rename from nashorn/test/script/markdown/blockquote-nested-markdown.js rename to test/nashorn/script/markdown/blockquote-nested-markdown.js diff --git a/nashorn/test/script/markdown/blockquote-nested-markdown.js.EXPECTED b/test/nashorn/script/markdown/blockquote-nested-markdown.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/blockquote-nested-markdown.js.EXPECTED rename to test/nashorn/script/markdown/blockquote-nested-markdown.js.EXPECTED diff --git a/nashorn/test/script/markdown/blockquote.js b/test/nashorn/script/markdown/blockquote.js similarity index 100% rename from nashorn/test/script/markdown/blockquote.js rename to test/nashorn/script/markdown/blockquote.js diff --git a/nashorn/test/script/markdown/blockquote.js.EXPECTED b/test/nashorn/script/markdown/blockquote.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/blockquote.js.EXPECTED rename to test/nashorn/script/markdown/blockquote.js.EXPECTED diff --git a/nashorn/test/script/markdown/code-block-html-escape.js b/test/nashorn/script/markdown/code-block-html-escape.js similarity index 100% rename from nashorn/test/script/markdown/code-block-html-escape.js rename to test/nashorn/script/markdown/code-block-html-escape.js diff --git a/nashorn/test/script/markdown/code-block-html-escape.js.EXPECTED b/test/nashorn/script/markdown/code-block-html-escape.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/code-block-html-escape.js.EXPECTED rename to test/nashorn/script/markdown/code-block-html-escape.js.EXPECTED diff --git a/nashorn/test/script/markdown/code-block.js b/test/nashorn/script/markdown/code-block.js similarity index 100% rename from nashorn/test/script/markdown/code-block.js rename to test/nashorn/script/markdown/code-block.js diff --git a/nashorn/test/script/markdown/code-block.js.EXPECTED b/test/nashorn/script/markdown/code-block.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/code-block.js.EXPECTED rename to test/nashorn/script/markdown/code-block.js.EXPECTED diff --git a/nashorn/test/script/markdown/doubline-list.js b/test/nashorn/script/markdown/doubline-list.js similarity index 100% rename from nashorn/test/script/markdown/doubline-list.js rename to test/nashorn/script/markdown/doubline-list.js diff --git a/nashorn/test/script/markdown/doubline-list.js.EXPECTED b/test/nashorn/script/markdown/doubline-list.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/doubline-list.js.EXPECTED rename to test/nashorn/script/markdown/doubline-list.js.EXPECTED diff --git a/nashorn/test/script/markdown/emphasis.js b/test/nashorn/script/markdown/emphasis.js similarity index 100% rename from nashorn/test/script/markdown/emphasis.js rename to test/nashorn/script/markdown/emphasis.js diff --git a/nashorn/test/script/markdown/emphasis.js.EXPECTED b/test/nashorn/script/markdown/emphasis.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/emphasis.js.EXPECTED rename to test/nashorn/script/markdown/emphasis.js.EXPECTED diff --git a/nashorn/test/script/markdown/escaped-number-period.js b/test/nashorn/script/markdown/escaped-number-period.js similarity index 100% rename from nashorn/test/script/markdown/escaped-number-period.js rename to test/nashorn/script/markdown/escaped-number-period.js diff --git a/nashorn/test/script/markdown/escaped-number-period.js.EXPECTED b/test/nashorn/script/markdown/escaped-number-period.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/escaped-number-period.js.EXPECTED rename to test/nashorn/script/markdown/escaped-number-period.js.EXPECTED diff --git a/nashorn/test/script/markdown/escaping.js b/test/nashorn/script/markdown/escaping.js similarity index 100% rename from nashorn/test/script/markdown/escaping.js rename to test/nashorn/script/markdown/escaping.js diff --git a/nashorn/test/script/markdown/escaping.js.EXPECTED b/test/nashorn/script/markdown/escaping.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/escaping.js.EXPECTED rename to test/nashorn/script/markdown/escaping.js.EXPECTED diff --git a/nashorn/test/script/markdown/github-style-at-start.js b/test/nashorn/script/markdown/github-style-at-start.js similarity index 100% rename from nashorn/test/script/markdown/github-style-at-start.js rename to test/nashorn/script/markdown/github-style-at-start.js diff --git a/nashorn/test/script/markdown/github-style-at-start.js.EXPECTED b/test/nashorn/script/markdown/github-style-at-start.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/github-style-at-start.js.EXPECTED rename to test/nashorn/script/markdown/github-style-at-start.js.EXPECTED diff --git a/nashorn/test/script/markdown/github-style-codeblock.js b/test/nashorn/script/markdown/github-style-codeblock.js similarity index 100% rename from nashorn/test/script/markdown/github-style-codeblock.js rename to test/nashorn/script/markdown/github-style-codeblock.js diff --git a/nashorn/test/script/markdown/github-style-codeblock.js.EXPECTED b/test/nashorn/script/markdown/github-style-codeblock.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/github-style-codeblock.js.EXPECTED rename to test/nashorn/script/markdown/github-style-codeblock.js.EXPECTED diff --git a/nashorn/test/script/markdown/github-style-linebreaks.js b/test/nashorn/script/markdown/github-style-linebreaks.js similarity index 100% rename from nashorn/test/script/markdown/github-style-linebreaks.js rename to test/nashorn/script/markdown/github-style-linebreaks.js diff --git a/nashorn/test/script/markdown/github-style-linebreaks.js.EXPECTED b/test/nashorn/script/markdown/github-style-linebreaks.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/github-style-linebreaks.js.EXPECTED rename to test/nashorn/script/markdown/github-style-linebreaks.js.EXPECTED diff --git a/nashorn/test/script/markdown/h1-with-double-hash.js b/test/nashorn/script/markdown/h1-with-double-hash.js similarity index 100% rename from nashorn/test/script/markdown/h1-with-double-hash.js rename to test/nashorn/script/markdown/h1-with-double-hash.js diff --git a/nashorn/test/script/markdown/h1-with-double-hash.js.EXPECTED b/test/nashorn/script/markdown/h1-with-double-hash.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/h1-with-double-hash.js.EXPECTED rename to test/nashorn/script/markdown/h1-with-double-hash.js.EXPECTED diff --git a/nashorn/test/script/markdown/h1-with-equals.js b/test/nashorn/script/markdown/h1-with-equals.js similarity index 100% rename from nashorn/test/script/markdown/h1-with-equals.js rename to test/nashorn/script/markdown/h1-with-equals.js diff --git a/nashorn/test/script/markdown/h1-with-equals.js.EXPECTED b/test/nashorn/script/markdown/h1-with-equals.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/h1-with-equals.js.EXPECTED rename to test/nashorn/script/markdown/h1-with-equals.js.EXPECTED diff --git a/nashorn/test/script/markdown/h1-with-single-hash.js b/test/nashorn/script/markdown/h1-with-single-hash.js similarity index 100% rename from nashorn/test/script/markdown/h1-with-single-hash.js rename to test/nashorn/script/markdown/h1-with-single-hash.js diff --git a/nashorn/test/script/markdown/h1-with-single-hash.js.EXPECTED b/test/nashorn/script/markdown/h1-with-single-hash.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/h1-with-single-hash.js.EXPECTED rename to test/nashorn/script/markdown/h1-with-single-hash.js.EXPECTED diff --git a/nashorn/test/script/markdown/h2-with-dashes.js b/test/nashorn/script/markdown/h2-with-dashes.js similarity index 100% rename from nashorn/test/script/markdown/h2-with-dashes.js rename to test/nashorn/script/markdown/h2-with-dashes.js diff --git a/nashorn/test/script/markdown/h2-with-dashes.js.EXPECTED b/test/nashorn/script/markdown/h2-with-dashes.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/h2-with-dashes.js.EXPECTED rename to test/nashorn/script/markdown/h2-with-dashes.js.EXPECTED diff --git a/nashorn/test/script/markdown/h2-with-double-hash.js b/test/nashorn/script/markdown/h2-with-double-hash.js similarity index 100% rename from nashorn/test/script/markdown/h2-with-double-hash.js rename to test/nashorn/script/markdown/h2-with-double-hash.js diff --git a/nashorn/test/script/markdown/h2-with-double-hash.js.EXPECTED b/test/nashorn/script/markdown/h2-with-double-hash.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/h2-with-double-hash.js.EXPECTED rename to test/nashorn/script/markdown/h2-with-double-hash.js.EXPECTED diff --git a/nashorn/test/script/markdown/h2-with-single-hash.js b/test/nashorn/script/markdown/h2-with-single-hash.js similarity index 100% rename from nashorn/test/script/markdown/h2-with-single-hash.js rename to test/nashorn/script/markdown/h2-with-single-hash.js diff --git a/nashorn/test/script/markdown/h2-with-single-hash.js.EXPECTED b/test/nashorn/script/markdown/h2-with-single-hash.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/h2-with-single-hash.js.EXPECTED rename to test/nashorn/script/markdown/h2-with-single-hash.js.EXPECTED diff --git a/nashorn/test/script/markdown/h3-with-double-hash.js b/test/nashorn/script/markdown/h3-with-double-hash.js similarity index 100% rename from nashorn/test/script/markdown/h3-with-double-hash.js rename to test/nashorn/script/markdown/h3-with-double-hash.js diff --git a/nashorn/test/script/markdown/h3-with-double-hash.js.EXPECTED b/test/nashorn/script/markdown/h3-with-double-hash.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/h3-with-double-hash.js.EXPECTED rename to test/nashorn/script/markdown/h3-with-double-hash.js.EXPECTED diff --git a/nashorn/test/script/markdown/h3-with-single-hash.js b/test/nashorn/script/markdown/h3-with-single-hash.js similarity index 100% rename from nashorn/test/script/markdown/h3-with-single-hash.js rename to test/nashorn/script/markdown/h3-with-single-hash.js diff --git a/nashorn/test/script/markdown/h3-with-single-hash.js.EXPECTED b/test/nashorn/script/markdown/h3-with-single-hash.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/h3-with-single-hash.js.EXPECTED rename to test/nashorn/script/markdown/h3-with-single-hash.js.EXPECTED diff --git a/nashorn/test/script/markdown/h4-with-single-hash.js b/test/nashorn/script/markdown/h4-with-single-hash.js similarity index 100% rename from nashorn/test/script/markdown/h4-with-single-hash.js rename to test/nashorn/script/markdown/h4-with-single-hash.js diff --git a/nashorn/test/script/markdown/h4-with-single-hash.js.EXPECTED b/test/nashorn/script/markdown/h4-with-single-hash.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/h4-with-single-hash.js.EXPECTED rename to test/nashorn/script/markdown/h4-with-single-hash.js.EXPECTED diff --git a/nashorn/test/script/markdown/h5-with-single-hash.js b/test/nashorn/script/markdown/h5-with-single-hash.js similarity index 100% rename from nashorn/test/script/markdown/h5-with-single-hash.js rename to test/nashorn/script/markdown/h5-with-single-hash.js diff --git a/nashorn/test/script/markdown/h5-with-single-hash.js.EXPECTED b/test/nashorn/script/markdown/h5-with-single-hash.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/h5-with-single-hash.js.EXPECTED rename to test/nashorn/script/markdown/h5-with-single-hash.js.EXPECTED diff --git a/nashorn/test/script/markdown/h6-with-single-hash.js b/test/nashorn/script/markdown/h6-with-single-hash.js similarity index 100% rename from nashorn/test/script/markdown/h6-with-single-hash.js rename to test/nashorn/script/markdown/h6-with-single-hash.js diff --git a/nashorn/test/script/markdown/h6-with-single-hash.js.EXPECTED b/test/nashorn/script/markdown/h6-with-single-hash.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/h6-with-single-hash.js.EXPECTED rename to test/nashorn/script/markdown/h6-with-single-hash.js.EXPECTED diff --git a/nashorn/test/script/markdown/horizontal-rules.js b/test/nashorn/script/markdown/horizontal-rules.js similarity index 100% rename from nashorn/test/script/markdown/horizontal-rules.js rename to test/nashorn/script/markdown/horizontal-rules.js diff --git a/nashorn/test/script/markdown/horizontal-rules.js.EXPECTED b/test/nashorn/script/markdown/horizontal-rules.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/horizontal-rules.js.EXPECTED rename to test/nashorn/script/markdown/horizontal-rules.js.EXPECTED diff --git a/nashorn/test/script/markdown/html5-strutural-tags.js b/test/nashorn/script/markdown/html5-strutural-tags.js similarity index 100% rename from nashorn/test/script/markdown/html5-strutural-tags.js rename to test/nashorn/script/markdown/html5-strutural-tags.js diff --git a/nashorn/test/script/markdown/html5-strutural-tags.js.EXPECTED b/test/nashorn/script/markdown/html5-strutural-tags.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/html5-strutural-tags.js.EXPECTED rename to test/nashorn/script/markdown/html5-strutural-tags.js.EXPECTED diff --git a/nashorn/test/script/markdown/images.js b/test/nashorn/script/markdown/images.js similarity index 100% rename from nashorn/test/script/markdown/images.js rename to test/nashorn/script/markdown/images.js diff --git a/nashorn/test/script/markdown/images.js.EXPECTED b/test/nashorn/script/markdown/images.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/images.js.EXPECTED rename to test/nashorn/script/markdown/images.js.EXPECTED diff --git a/nashorn/test/script/markdown/implicit-anchors.js b/test/nashorn/script/markdown/implicit-anchors.js similarity index 100% rename from nashorn/test/script/markdown/implicit-anchors.js rename to test/nashorn/script/markdown/implicit-anchors.js diff --git a/nashorn/test/script/markdown/implicit-anchors.js.EXPECTED b/test/nashorn/script/markdown/implicit-anchors.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/implicit-anchors.js.EXPECTED rename to test/nashorn/script/markdown/implicit-anchors.js.EXPECTED diff --git a/nashorn/test/script/markdown/inline-anchors.js b/test/nashorn/script/markdown/inline-anchors.js similarity index 100% rename from nashorn/test/script/markdown/inline-anchors.js rename to test/nashorn/script/markdown/inline-anchors.js diff --git a/nashorn/test/script/markdown/inline-anchors.js.EXPECTED b/test/nashorn/script/markdown/inline-anchors.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/inline-anchors.js.EXPECTED rename to test/nashorn/script/markdown/inline-anchors.js.EXPECTED diff --git a/nashorn/test/script/markdown/inline-code.js b/test/nashorn/script/markdown/inline-code.js similarity index 100% rename from nashorn/test/script/markdown/inline-code.js rename to test/nashorn/script/markdown/inline-code.js diff --git a/nashorn/test/script/markdown/inline-code.js.EXPECTED b/test/nashorn/script/markdown/inline-code.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/inline-code.js.EXPECTED rename to test/nashorn/script/markdown/inline-code.js.EXPECTED diff --git a/nashorn/test/script/markdown/inline-style-tag.js b/test/nashorn/script/markdown/inline-style-tag.js similarity index 100% rename from nashorn/test/script/markdown/inline-style-tag.js rename to test/nashorn/script/markdown/inline-style-tag.js diff --git a/nashorn/test/script/markdown/inline-style-tag.js.EXPECTED b/test/nashorn/script/markdown/inline-style-tag.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/inline-style-tag.js.EXPECTED rename to test/nashorn/script/markdown/inline-style-tag.js.EXPECTED diff --git a/nashorn/test/script/markdown/lazy-blockquote.js b/test/nashorn/script/markdown/lazy-blockquote.js similarity index 100% rename from nashorn/test/script/markdown/lazy-blockquote.js rename to test/nashorn/script/markdown/lazy-blockquote.js diff --git a/nashorn/test/script/markdown/lazy-blockquote.js.EXPECTED b/test/nashorn/script/markdown/lazy-blockquote.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/lazy-blockquote.js.EXPECTED rename to test/nashorn/script/markdown/lazy-blockquote.js.EXPECTED diff --git a/nashorn/test/script/markdown/list-with-blockquote.js b/test/nashorn/script/markdown/list-with-blockquote.js similarity index 100% rename from nashorn/test/script/markdown/list-with-blockquote.js rename to test/nashorn/script/markdown/list-with-blockquote.js diff --git a/nashorn/test/script/markdown/list-with-blockquote.js.EXPECTED b/test/nashorn/script/markdown/list-with-blockquote.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/list-with-blockquote.js.EXPECTED rename to test/nashorn/script/markdown/list-with-blockquote.js.EXPECTED diff --git a/nashorn/test/script/markdown/list-with-code.js b/test/nashorn/script/markdown/list-with-code.js similarity index 100% rename from nashorn/test/script/markdown/list-with-code.js rename to test/nashorn/script/markdown/list-with-code.js diff --git a/nashorn/test/script/markdown/list-with-code.js.EXPECTED b/test/nashorn/script/markdown/list-with-code.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/list-with-code.js.EXPECTED rename to test/nashorn/script/markdown/list-with-code.js.EXPECTED diff --git a/nashorn/test/script/markdown/multi-paragraph-list.js b/test/nashorn/script/markdown/multi-paragraph-list.js similarity index 100% rename from nashorn/test/script/markdown/multi-paragraph-list.js rename to test/nashorn/script/markdown/multi-paragraph-list.js diff --git a/nashorn/test/script/markdown/multi-paragraph-list.js.EXPECTED b/test/nashorn/script/markdown/multi-paragraph-list.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/multi-paragraph-list.js.EXPECTED rename to test/nashorn/script/markdown/multi-paragraph-list.js.EXPECTED diff --git a/nashorn/test/script/markdown/multiline-unordered-list.js b/test/nashorn/script/markdown/multiline-unordered-list.js similarity index 100% rename from nashorn/test/script/markdown/multiline-unordered-list.js rename to test/nashorn/script/markdown/multiline-unordered-list.js diff --git a/nashorn/test/script/markdown/multiline-unordered-list.js.EXPECTED b/test/nashorn/script/markdown/multiline-unordered-list.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/multiline-unordered-list.js.EXPECTED rename to test/nashorn/script/markdown/multiline-unordered-list.js.EXPECTED diff --git a/nashorn/test/script/markdown/nested-blockquote.js b/test/nashorn/script/markdown/nested-blockquote.js similarity index 100% rename from nashorn/test/script/markdown/nested-blockquote.js rename to test/nashorn/script/markdown/nested-blockquote.js diff --git a/nashorn/test/script/markdown/nested-blockquote.js.EXPECTED b/test/nashorn/script/markdown/nested-blockquote.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/nested-blockquote.js.EXPECTED rename to test/nashorn/script/markdown/nested-blockquote.js.EXPECTED diff --git a/nashorn/test/script/markdown/ordered-list-same-number.js b/test/nashorn/script/markdown/ordered-list-same-number.js similarity index 100% rename from nashorn/test/script/markdown/ordered-list-same-number.js rename to test/nashorn/script/markdown/ordered-list-same-number.js diff --git a/nashorn/test/script/markdown/ordered-list-same-number.js.EXPECTED b/test/nashorn/script/markdown/ordered-list-same-number.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/ordered-list-same-number.js.EXPECTED rename to test/nashorn/script/markdown/ordered-list-same-number.js.EXPECTED diff --git a/nashorn/test/script/markdown/ordered-list-wrong-numbers.js b/test/nashorn/script/markdown/ordered-list-wrong-numbers.js similarity index 100% rename from nashorn/test/script/markdown/ordered-list-wrong-numbers.js rename to test/nashorn/script/markdown/ordered-list-wrong-numbers.js diff --git a/nashorn/test/script/markdown/ordered-list-wrong-numbers.js.EXPECTED b/test/nashorn/script/markdown/ordered-list-wrong-numbers.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/ordered-list-wrong-numbers.js.EXPECTED rename to test/nashorn/script/markdown/ordered-list-wrong-numbers.js.EXPECTED diff --git a/nashorn/test/script/markdown/ordered-list.js b/test/nashorn/script/markdown/ordered-list.js similarity index 100% rename from nashorn/test/script/markdown/ordered-list.js rename to test/nashorn/script/markdown/ordered-list.js diff --git a/nashorn/test/script/markdown/ordered-list.js.EXPECTED b/test/nashorn/script/markdown/ordered-list.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/ordered-list.js.EXPECTED rename to test/nashorn/script/markdown/ordered-list.js.EXPECTED diff --git a/nashorn/test/script/markdown/relative-anchors.js b/test/nashorn/script/markdown/relative-anchors.js similarity index 100% rename from nashorn/test/script/markdown/relative-anchors.js rename to test/nashorn/script/markdown/relative-anchors.js diff --git a/nashorn/test/script/markdown/relative-anchors.js.EXPECTED b/test/nashorn/script/markdown/relative-anchors.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/relative-anchors.js.EXPECTED rename to test/nashorn/script/markdown/relative-anchors.js.EXPECTED diff --git a/nashorn/test/script/markdown/simple-paragraph.js b/test/nashorn/script/markdown/simple-paragraph.js similarity index 100% rename from nashorn/test/script/markdown/simple-paragraph.js rename to test/nashorn/script/markdown/simple-paragraph.js diff --git a/nashorn/test/script/markdown/simple-paragraph.js.EXPECTED b/test/nashorn/script/markdown/simple-paragraph.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/simple-paragraph.js.EXPECTED rename to test/nashorn/script/markdown/simple-paragraph.js.EXPECTED diff --git a/nashorn/test/script/markdown/strong.js b/test/nashorn/script/markdown/strong.js similarity index 100% rename from nashorn/test/script/markdown/strong.js rename to test/nashorn/script/markdown/strong.js diff --git a/nashorn/test/script/markdown/strong.js.EXPECTED b/test/nashorn/script/markdown/strong.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/strong.js.EXPECTED rename to test/nashorn/script/markdown/strong.js.EXPECTED diff --git a/nashorn/test/script/markdown/table-basic.js b/test/nashorn/script/markdown/table-basic.js similarity index 100% rename from nashorn/test/script/markdown/table-basic.js rename to test/nashorn/script/markdown/table-basic.js diff --git a/nashorn/test/script/markdown/table-basic.js.EXPECTED b/test/nashorn/script/markdown/table-basic.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/table-basic.js.EXPECTED rename to test/nashorn/script/markdown/table-basic.js.EXPECTED diff --git a/nashorn/test/script/markdown/table-large.js b/test/nashorn/script/markdown/table-large.js similarity index 100% rename from nashorn/test/script/markdown/table-large.js rename to test/nashorn/script/markdown/table-large.js diff --git a/nashorn/test/script/markdown/table-large.js.EXPECTED b/test/nashorn/script/markdown/table-large.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/table-large.js.EXPECTED rename to test/nashorn/script/markdown/table-large.js.EXPECTED diff --git a/nashorn/test/script/markdown/table-with-equals.js b/test/nashorn/script/markdown/table-with-equals.js similarity index 100% rename from nashorn/test/script/markdown/table-with-equals.js rename to test/nashorn/script/markdown/table-with-equals.js diff --git a/nashorn/test/script/markdown/table-with-equals.js.EXPECTED b/test/nashorn/script/markdown/table-with-equals.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/table-with-equals.js.EXPECTED rename to test/nashorn/script/markdown/table-with-equals.js.EXPECTED diff --git a/nashorn/test/script/markdown/unordered-list-asterisk.js b/test/nashorn/script/markdown/unordered-list-asterisk.js similarity index 100% rename from nashorn/test/script/markdown/unordered-list-asterisk.js rename to test/nashorn/script/markdown/unordered-list-asterisk.js diff --git a/nashorn/test/script/markdown/unordered-list-asterisk.js.EXPECTED b/test/nashorn/script/markdown/unordered-list-asterisk.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/unordered-list-asterisk.js.EXPECTED rename to test/nashorn/script/markdown/unordered-list-asterisk.js.EXPECTED diff --git a/nashorn/test/script/markdown/unordered-list-minus.js b/test/nashorn/script/markdown/unordered-list-minus.js similarity index 100% rename from nashorn/test/script/markdown/unordered-list-minus.js rename to test/nashorn/script/markdown/unordered-list-minus.js diff --git a/nashorn/test/script/markdown/unordered-list-minus.js.EXPECTED b/test/nashorn/script/markdown/unordered-list-minus.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/unordered-list-minus.js.EXPECTED rename to test/nashorn/script/markdown/unordered-list-minus.js.EXPECTED diff --git a/nashorn/test/script/markdown/unordered-list-plus.js b/test/nashorn/script/markdown/unordered-list-plus.js similarity index 100% rename from nashorn/test/script/markdown/unordered-list-plus.js rename to test/nashorn/script/markdown/unordered-list-plus.js diff --git a/nashorn/test/script/markdown/unordered-list-plus.js.EXPECTED b/test/nashorn/script/markdown/unordered-list-plus.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/unordered-list-plus.js.EXPECTED rename to test/nashorn/script/markdown/unordered-list-plus.js.EXPECTED diff --git a/nashorn/test/script/markdown/url-with-parenthesis.js b/test/nashorn/script/markdown/url-with-parenthesis.js similarity index 100% rename from nashorn/test/script/markdown/url-with-parenthesis.js rename to test/nashorn/script/markdown/url-with-parenthesis.js diff --git a/nashorn/test/script/markdown/url-with-parenthesis.js.EXPECTED b/test/nashorn/script/markdown/url-with-parenthesis.js.EXPECTED similarity index 100% rename from nashorn/test/script/markdown/url-with-parenthesis.js.EXPECTED rename to test/nashorn/script/markdown/url-with-parenthesis.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/Hello.java b/test/nashorn/script/nosecurity/Hello.java similarity index 100% rename from nashorn/test/script/nosecurity/Hello.java rename to test/nashorn/script/nosecurity/Hello.java diff --git a/nashorn/test/script/nosecurity/JDK-8044798.js b/test/nashorn/script/nosecurity/JDK-8044798.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8044798.js rename to test/nashorn/script/nosecurity/JDK-8044798.js diff --git a/nashorn/test/script/nosecurity/JDK-8044798.js.EXPECTED b/test/nashorn/script/nosecurity/JDK-8044798.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8044798.js.EXPECTED rename to test/nashorn/script/nosecurity/JDK-8044798.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/JDK-8044851.js b/test/nashorn/script/nosecurity/JDK-8044851.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8044851.js rename to test/nashorn/script/nosecurity/JDK-8044851.js diff --git a/nashorn/test/script/nosecurity/JDK-8044851.js.EXPECTED b/test/nashorn/script/nosecurity/JDK-8044851.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8044851.js.EXPECTED rename to test/nashorn/script/nosecurity/JDK-8044851.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/JDK-8050964.js b/test/nashorn/script/nosecurity/JDK-8050964.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8050964.js rename to test/nashorn/script/nosecurity/JDK-8050964.js diff --git a/nashorn/test/script/nosecurity/JDK-8055107.js b/test/nashorn/script/nosecurity/JDK-8055107.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8055107.js rename to test/nashorn/script/nosecurity/JDK-8055107.js diff --git a/nashorn/test/script/nosecurity/JDK-8060688.js b/test/nashorn/script/nosecurity/JDK-8060688.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8060688.js rename to test/nashorn/script/nosecurity/JDK-8060688.js diff --git a/nashorn/test/script/nosecurity/JDK-8067215.js b/test/nashorn/script/nosecurity/JDK-8067215.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8067215.js rename to test/nashorn/script/nosecurity/JDK-8067215.js diff --git a/nashorn/test/script/nosecurity/JDK-8073613.js b/test/nashorn/script/nosecurity/JDK-8073613.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8073613.js rename to test/nashorn/script/nosecurity/JDK-8073613.js diff --git a/nashorn/test/script/nosecurity/JDK-8073613.js.EXPECTED b/test/nashorn/script/nosecurity/JDK-8073613.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8073613.js.EXPECTED rename to test/nashorn/script/nosecurity/JDK-8073613.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/JDK-8078049.js b/test/nashorn/script/nosecurity/JDK-8078049.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8078049.js rename to test/nashorn/script/nosecurity/JDK-8078049.js diff --git a/nashorn/test/script/nosecurity/JDK-8080087.js b/test/nashorn/script/nosecurity/JDK-8080087.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8080087.js rename to test/nashorn/script/nosecurity/JDK-8080087.js diff --git a/nashorn/test/script/nosecurity/JDK-8130127.js b/test/nashorn/script/nosecurity/JDK-8130127.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8130127.js rename to test/nashorn/script/nosecurity/JDK-8130127.js diff --git a/nashorn/test/script/nosecurity/JDK-8130127.js.EXPECTED b/test/nashorn/script/nosecurity/JDK-8130127.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8130127.js.EXPECTED rename to test/nashorn/script/nosecurity/JDK-8130127.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/JDK-8148926.js b/test/nashorn/script/nosecurity/JDK-8148926.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8148926.js rename to test/nashorn/script/nosecurity/JDK-8148926.js diff --git a/nashorn/test/script/nosecurity/JDK-8149334.js b/test/nashorn/script/nosecurity/JDK-8149334.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8149334.js rename to test/nashorn/script/nosecurity/JDK-8149334.js diff --git a/nashorn/test/script/nosecurity/JDK-8149334.js.EXPECTED b/test/nashorn/script/nosecurity/JDK-8149334.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8149334.js.EXPECTED rename to test/nashorn/script/nosecurity/JDK-8149334.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/JDK-8151291.js b/test/nashorn/script/nosecurity/JDK-8151291.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8151291.js rename to test/nashorn/script/nosecurity/JDK-8151291.js diff --git a/nashorn/test/script/nosecurity/JDK-8184241.js b/test/nashorn/script/nosecurity/JDK-8184241.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8184241.js rename to test/nashorn/script/nosecurity/JDK-8184241.js diff --git a/nashorn/test/script/nosecurity/JDK-8184241.js.EXPECTED b/test/nashorn/script/nosecurity/JDK-8184241.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8184241.js.EXPECTED rename to test/nashorn/script/nosecurity/JDK-8184241.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/JDK-8185252.js b/test/nashorn/script/nosecurity/JDK-8185252.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8185252.js rename to test/nashorn/script/nosecurity/JDK-8185252.js diff --git a/nashorn/test/script/nosecurity/JDK-8185252.js.EXPECTED b/test/nashorn/script/nosecurity/JDK-8185252.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/JDK-8185252.js.EXPECTED rename to test/nashorn/script/nosecurity/JDK-8185252.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/JDK-util.js b/test/nashorn/script/nosecurity/JDK-util.js similarity index 100% rename from nashorn/test/script/nosecurity/JDK-util.js rename to test/nashorn/script/nosecurity/JDK-util.js diff --git a/nashorn/test/script/nosecurity/context-dependent-logging.js b/test/nashorn/script/nosecurity/context-dependent-logging.js similarity index 100% rename from nashorn/test/script/nosecurity/context-dependent-logging.js rename to test/nashorn/script/nosecurity/context-dependent-logging.js diff --git a/nashorn/test/script/nosecurity/debuggersupportapi.js b/test/nashorn/script/nosecurity/debuggersupportapi.js similarity index 100% rename from nashorn/test/script/nosecurity/debuggersupportapi.js rename to test/nashorn/script/nosecurity/debuggersupportapi.js diff --git a/nashorn/test/script/nosecurity/debuggersupportapi.js.EXPECTED b/test/nashorn/script/nosecurity/debuggersupportapi.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/debuggersupportapi.js.EXPECTED rename to test/nashorn/script/nosecurity/debuggersupportapi.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/jjs-common.js b/test/nashorn/script/nosecurity/jjs-common.js similarity index 100% rename from nashorn/test/script/nosecurity/jjs-common.js rename to test/nashorn/script/nosecurity/jjs-common.js diff --git a/nashorn/test/script/nosecurity/jjs-option-cp.js b/test/nashorn/script/nosecurity/jjs-option-cp.js similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-cp.js rename to test/nashorn/script/nosecurity/jjs-option-cp.js diff --git a/nashorn/test/script/nosecurity/jjs-option-cp.js.EXPECTED b/test/nashorn/script/nosecurity/jjs-option-cp.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-cp.js.EXPECTED rename to test/nashorn/script/nosecurity/jjs-option-cp.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/jjs-option-define.js b/test/nashorn/script/nosecurity/jjs-option-define.js similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-define.js rename to test/nashorn/script/nosecurity/jjs-option-define.js diff --git a/nashorn/test/script/nosecurity/jjs-option-define.js.EXPECTED b/test/nashorn/script/nosecurity/jjs-option-define.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-define.js.EXPECTED rename to test/nashorn/script/nosecurity/jjs-option-define.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/jjs-option-doe.js b/test/nashorn/script/nosecurity/jjs-option-doe.js similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-doe.js rename to test/nashorn/script/nosecurity/jjs-option-doe.js diff --git a/nashorn/test/script/nosecurity/jjs-option-doe.js.EXPECTED b/test/nashorn/script/nosecurity/jjs-option-doe.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-doe.js.EXPECTED rename to test/nashorn/script/nosecurity/jjs-option-doe.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/jjs-option-fv.js b/test/nashorn/script/nosecurity/jjs-option-fv.js similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-fv.js rename to test/nashorn/script/nosecurity/jjs-option-fv.js diff --git a/nashorn/test/script/nosecurity/jjs-option-fv.js.EXPECTED b/test/nashorn/script/nosecurity/jjs-option-fv.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-fv.js.EXPECTED rename to test/nashorn/script/nosecurity/jjs-option-fv.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/jjs-option-fx.js b/test/nashorn/script/nosecurity/jjs-option-fx.js similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-fx.js rename to test/nashorn/script/nosecurity/jjs-option-fx.js diff --git a/nashorn/test/script/nosecurity/jjs-option-fx.js.EXPECTED b/test/nashorn/script/nosecurity/jjs-option-fx.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-fx.js.EXPECTED rename to test/nashorn/script/nosecurity/jjs-option-fx.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/jjs-option-lang.js b/test/nashorn/script/nosecurity/jjs-option-lang.js similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-lang.js rename to test/nashorn/script/nosecurity/jjs-option-lang.js diff --git a/nashorn/test/script/nosecurity/jjs-option-lang.js.EXPECTED b/test/nashorn/script/nosecurity/jjs-option-lang.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-lang.js.EXPECTED rename to test/nashorn/script/nosecurity/jjs-option-lang.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/jjs-option-ot.js b/test/nashorn/script/nosecurity/jjs-option-ot.js similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-ot.js rename to test/nashorn/script/nosecurity/jjs-option-ot.js diff --git a/nashorn/test/script/nosecurity/jjs-option-ot.js.EXPECTED b/test/nashorn/script/nosecurity/jjs-option-ot.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-ot.js.EXPECTED rename to test/nashorn/script/nosecurity/jjs-option-ot.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/jjs-option-scripting.js b/test/nashorn/script/nosecurity/jjs-option-scripting.js similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-scripting.js rename to test/nashorn/script/nosecurity/jjs-option-scripting.js diff --git a/nashorn/test/script/nosecurity/jjs-option-scripting.js.EXPECTED b/test/nashorn/script/nosecurity/jjs-option-scripting.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-scripting.js.EXPECTED rename to test/nashorn/script/nosecurity/jjs-option-scripting.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/jjs-option-strict.js b/test/nashorn/script/nosecurity/jjs-option-strict.js similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-strict.js rename to test/nashorn/script/nosecurity/jjs-option-strict.js diff --git a/nashorn/test/script/nosecurity/jjs-option-strict.js.EXPECTED b/test/nashorn/script/nosecurity/jjs-option-strict.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-strict.js.EXPECTED rename to test/nashorn/script/nosecurity/jjs-option-strict.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/jjs-option-version.js b/test/nashorn/script/nosecurity/jjs-option-version.js similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-version.js rename to test/nashorn/script/nosecurity/jjs-option-version.js diff --git a/nashorn/test/script/nosecurity/jjs-option-version.js.EXPECTED b/test/nashorn/script/nosecurity/jjs-option-version.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/jjs-option-version.js.EXPECTED rename to test/nashorn/script/nosecurity/jjs-option-version.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/logcoverage.js b/test/nashorn/script/nosecurity/logcoverage.js similarity index 100% rename from nashorn/test/script/nosecurity/logcoverage.js rename to test/nashorn/script/nosecurity/logcoverage.js diff --git a/nashorn/test/script/nosecurity/logcoverage.js.EXPECTED b/test/nashorn/script/nosecurity/logcoverage.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/logcoverage.js.EXPECTED rename to test/nashorn/script/nosecurity/logcoverage.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/nosecurity.js b/test/nashorn/script/nosecurity/nosecurity.js similarity index 100% rename from nashorn/test/script/nosecurity/nosecurity.js rename to test/nashorn/script/nosecurity/nosecurity.js diff --git a/nashorn/test/script/nosecurity/os-not-windows.js b/test/nashorn/script/nosecurity/os-not-windows.js similarity index 100% rename from nashorn/test/script/nosecurity/os-not-windows.js rename to test/nashorn/script/nosecurity/os-not-windows.js diff --git a/nashorn/test/script/nosecurity/parser-args.js b/test/nashorn/script/nosecurity/parser-args.js similarity index 100% rename from nashorn/test/script/nosecurity/parser-args.js rename to test/nashorn/script/nosecurity/parser-args.js diff --git a/nashorn/test/script/nosecurity/parser.js b/test/nashorn/script/nosecurity/parser.js similarity index 100% rename from nashorn/test/script/nosecurity/parser.js rename to test/nashorn/script/nosecurity/parser.js diff --git a/nashorn/test/script/nosecurity/parserapi.js b/test/nashorn/script/nosecurity/parserapi.js similarity index 100% rename from nashorn/test/script/nosecurity/parserapi.js rename to test/nashorn/script/nosecurity/parserapi.js diff --git a/nashorn/test/script/nosecurity/parserapi.js.EXPECTED b/test/nashorn/script/nosecurity/parserapi.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/parserapi.js.EXPECTED rename to test/nashorn/script/nosecurity/parserapi.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/parserapi_const_as_var.js b/test/nashorn/script/nosecurity/parserapi_const_as_var.js similarity index 100% rename from nashorn/test/script/nosecurity/parserapi_const_as_var.js rename to test/nashorn/script/nosecurity/parserapi_const_as_var.js diff --git a/nashorn/test/script/nosecurity/parserapi_const_as_var.js.EXPECTED b/test/nashorn/script/nosecurity/parserapi_const_as_var.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/parserapi_const_as_var.js.EXPECTED rename to test/nashorn/script/nosecurity/parserapi_const_as_var.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/parserapi_empty_stat.js b/test/nashorn/script/nosecurity/parserapi_empty_stat.js similarity index 100% rename from nashorn/test/script/nosecurity/parserapi_empty_stat.js rename to test/nashorn/script/nosecurity/parserapi_empty_stat.js diff --git a/nashorn/test/script/nosecurity/parserapi_empty_stat.js.EXPECTED b/test/nashorn/script/nosecurity/parserapi_empty_stat.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/parserapi_empty_stat.js.EXPECTED rename to test/nashorn/script/nosecurity/parserapi_empty_stat.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/parserapi_nse.js b/test/nashorn/script/nosecurity/parserapi_nse.js similarity index 100% rename from nashorn/test/script/nosecurity/parserapi_nse.js rename to test/nashorn/script/nosecurity/parserapi_nse.js diff --git a/nashorn/test/script/nosecurity/parserapi_nse.js.EXPECTED b/test/nashorn/script/nosecurity/parserapi_nse.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/parserapi_nse.js.EXPECTED rename to test/nashorn/script/nosecurity/parserapi_nse.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/parserapi_scripting.js b/test/nashorn/script/nosecurity/parserapi_scripting.js similarity index 100% rename from nashorn/test/script/nosecurity/parserapi_scripting.js rename to test/nashorn/script/nosecurity/parserapi_scripting.js diff --git a/nashorn/test/script/nosecurity/parserapi_scripting.js.EXPECTED b/test/nashorn/script/nosecurity/parserapi_scripting.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/parserapi_scripting.js.EXPECTED rename to test/nashorn/script/nosecurity/parserapi_scripting.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/parserapi_strict.js b/test/nashorn/script/nosecurity/parserapi_strict.js similarity index 100% rename from nashorn/test/script/nosecurity/parserapi_strict.js rename to test/nashorn/script/nosecurity/parserapi_strict.js diff --git a/nashorn/test/script/nosecurity/parserapi_strict.js.EXPECTED b/test/nashorn/script/nosecurity/parserapi_strict.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/parserapi_strict.js.EXPECTED rename to test/nashorn/script/nosecurity/parserapi_strict.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/parsernegativetests/caseoutofswitch.js b/test/nashorn/script/nosecurity/parsernegativetests/caseoutofswitch.js similarity index 100% rename from nashorn/test/script/nosecurity/parsernegativetests/caseoutofswitch.js rename to test/nashorn/script/nosecurity/parsernegativetests/caseoutofswitch.js diff --git a/nashorn/test/script/nosecurity/parsernegativetests/illegalbreak.js b/test/nashorn/script/nosecurity/parsernegativetests/illegalbreak.js similarity index 100% rename from nashorn/test/script/nosecurity/parsernegativetests/illegalbreak.js rename to test/nashorn/script/nosecurity/parsernegativetests/illegalbreak.js diff --git a/nashorn/test/script/nosecurity/parsernegativetests/illegalcontinue.js b/test/nashorn/script/nosecurity/parsernegativetests/illegalcontinue.js similarity index 100% rename from nashorn/test/script/nosecurity/parsernegativetests/illegalcontinue.js rename to test/nashorn/script/nosecurity/parsernegativetests/illegalcontinue.js diff --git a/nashorn/test/script/nosecurity/parsernegativetests/illegallvalue.js b/test/nashorn/script/nosecurity/parsernegativetests/illegallvalue.js similarity index 100% rename from nashorn/test/script/nosecurity/parsernegativetests/illegallvalue.js rename to test/nashorn/script/nosecurity/parsernegativetests/illegallvalue.js diff --git a/nashorn/test/script/nosecurity/parsernegativetests/illegaloperator.js b/test/nashorn/script/nosecurity/parsernegativetests/illegaloperator.js similarity index 100% rename from nashorn/test/script/nosecurity/parsernegativetests/illegaloperator.js rename to test/nashorn/script/nosecurity/parsernegativetests/illegaloperator.js diff --git a/nashorn/test/script/nosecurity/parsernegativetests/keywordident.js b/test/nashorn/script/nosecurity/parsernegativetests/keywordident.js similarity index 100% rename from nashorn/test/script/nosecurity/parsernegativetests/keywordident.js rename to test/nashorn/script/nosecurity/parsernegativetests/keywordident.js diff --git a/nashorn/test/script/nosecurity/parsernegativetests/parenmissing.js b/test/nashorn/script/nosecurity/parsernegativetests/parenmissing.js similarity index 100% rename from nashorn/test/script/nosecurity/parsernegativetests/parenmissing.js rename to test/nashorn/script/nosecurity/parsernegativetests/parenmissing.js diff --git a/nashorn/test/script/nosecurity/parsernegativetests/repeatedproperty.js b/test/nashorn/script/nosecurity/parsernegativetests/repeatedproperty.js similarity index 100% rename from nashorn/test/script/nosecurity/parsernegativetests/repeatedproperty.js rename to test/nashorn/script/nosecurity/parsernegativetests/repeatedproperty.js diff --git a/nashorn/test/script/nosecurity/parsernegativetests/strict_repeatedproperty.js b/test/nashorn/script/nosecurity/parsernegativetests/strict_repeatedproperty.js similarity index 100% rename from nashorn/test/script/nosecurity/parsernegativetests/strict_repeatedproperty.js rename to test/nashorn/script/nosecurity/parsernegativetests/strict_repeatedproperty.js diff --git a/nashorn/test/script/nosecurity/parsernegativetests/strict_repeatparam.js b/test/nashorn/script/nosecurity/parsernegativetests/strict_repeatparam.js similarity index 100% rename from nashorn/test/script/nosecurity/parsernegativetests/strict_repeatparam.js rename to test/nashorn/script/nosecurity/parsernegativetests/strict_repeatparam.js diff --git a/nashorn/test/script/nosecurity/parsernegativetests/strict_with.js b/test/nashorn/script/nosecurity/parsernegativetests/strict_with.js similarity index 100% rename from nashorn/test/script/nosecurity/parsernegativetests/strict_with.js rename to test/nashorn/script/nosecurity/parsernegativetests/strict_with.js diff --git a/nashorn/test/script/nosecurity/parsernegativetests/toplevelreturn.js b/test/nashorn/script/nosecurity/parsernegativetests/toplevelreturn.js similarity index 100% rename from nashorn/test/script/nosecurity/parsernegativetests/toplevelreturn.js rename to test/nashorn/script/nosecurity/parsernegativetests/toplevelreturn.js diff --git a/nashorn/test/script/nosecurity/parsertests/array_literal.js b/test/nashorn/script/nosecurity/parsertests/array_literal.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/array_literal.js rename to test/nashorn/script/nosecurity/parsertests/array_literal.js diff --git a/nashorn/test/script/nosecurity/parsertests/assignmentExpr.js b/test/nashorn/script/nosecurity/parsertests/assignmentExpr.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/assignmentExpr.js rename to test/nashorn/script/nosecurity/parsertests/assignmentExpr.js diff --git a/nashorn/test/script/nosecurity/parsertests/binaryExpr.js b/test/nashorn/script/nosecurity/parsertests/binaryExpr.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/binaryExpr.js rename to test/nashorn/script/nosecurity/parsertests/binaryExpr.js diff --git a/nashorn/test/script/nosecurity/parsertests/block.js b/test/nashorn/script/nosecurity/parsertests/block.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/block.js rename to test/nashorn/script/nosecurity/parsertests/block.js diff --git a/nashorn/test/script/nosecurity/parsertests/breakStat.js b/test/nashorn/script/nosecurity/parsertests/breakStat.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/breakStat.js rename to test/nashorn/script/nosecurity/parsertests/breakStat.js diff --git a/nashorn/test/script/nosecurity/parsertests/condExpr.js b/test/nashorn/script/nosecurity/parsertests/condExpr.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/condExpr.js rename to test/nashorn/script/nosecurity/parsertests/condExpr.js diff --git a/nashorn/test/script/nosecurity/parsertests/continueStat.js b/test/nashorn/script/nosecurity/parsertests/continueStat.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/continueStat.js rename to test/nashorn/script/nosecurity/parsertests/continueStat.js diff --git a/nashorn/test/script/nosecurity/parsertests/debuggerStat.js b/test/nashorn/script/nosecurity/parsertests/debuggerStat.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/debuggerStat.js rename to test/nashorn/script/nosecurity/parsertests/debuggerStat.js diff --git a/nashorn/test/script/nosecurity/parsertests/functions.js b/test/nashorn/script/nosecurity/parsertests/functions.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/functions.js rename to test/nashorn/script/nosecurity/parsertests/functions.js diff --git a/nashorn/test/script/nosecurity/parsertests/ifStat.js b/test/nashorn/script/nosecurity/parsertests/ifStat.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/ifStat.js rename to test/nashorn/script/nosecurity/parsertests/ifStat.js diff --git a/nashorn/test/script/nosecurity/parsertests/labelledStat.js b/test/nashorn/script/nosecurity/parsertests/labelledStat.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/labelledStat.js rename to test/nashorn/script/nosecurity/parsertests/labelledStat.js diff --git a/nashorn/test/script/nosecurity/parsertests/lhsExpr.js b/test/nashorn/script/nosecurity/parsertests/lhsExpr.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/lhsExpr.js rename to test/nashorn/script/nosecurity/parsertests/lhsExpr.js diff --git a/nashorn/test/script/nosecurity/parsertests/loopStat.js b/test/nashorn/script/nosecurity/parsertests/loopStat.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/loopStat.js rename to test/nashorn/script/nosecurity/parsertests/loopStat.js diff --git a/nashorn/test/script/nosecurity/parsertests/objectLitExpr.js b/test/nashorn/script/nosecurity/parsertests/objectLitExpr.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/objectLitExpr.js rename to test/nashorn/script/nosecurity/parsertests/objectLitExpr.js diff --git a/nashorn/test/script/nosecurity/parsertests/parenExpr.js b/test/nashorn/script/nosecurity/parsertests/parenExpr.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/parenExpr.js rename to test/nashorn/script/nosecurity/parsertests/parenExpr.js diff --git a/nashorn/test/script/nosecurity/parsertests/primaryExpr.js b/test/nashorn/script/nosecurity/parsertests/primaryExpr.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/primaryExpr.js rename to test/nashorn/script/nosecurity/parsertests/primaryExpr.js diff --git a/nashorn/test/script/nosecurity/parsertests/regexp_literal.js b/test/nashorn/script/nosecurity/parsertests/regexp_literal.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/regexp_literal.js rename to test/nashorn/script/nosecurity/parsertests/regexp_literal.js diff --git a/nashorn/test/script/nosecurity/parsertests/returnStat.js b/test/nashorn/script/nosecurity/parsertests/returnStat.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/returnStat.js rename to test/nashorn/script/nosecurity/parsertests/returnStat.js diff --git a/nashorn/test/script/nosecurity/parsertests/switchStat.js b/test/nashorn/script/nosecurity/parsertests/switchStat.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/switchStat.js rename to test/nashorn/script/nosecurity/parsertests/switchStat.js diff --git a/nashorn/test/script/nosecurity/parsertests/throwStat.js b/test/nashorn/script/nosecurity/parsertests/throwStat.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/throwStat.js rename to test/nashorn/script/nosecurity/parsertests/throwStat.js diff --git a/nashorn/test/script/nosecurity/parsertests/tryCatchStat.js b/test/nashorn/script/nosecurity/parsertests/tryCatchStat.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/tryCatchStat.js rename to test/nashorn/script/nosecurity/parsertests/tryCatchStat.js diff --git a/nashorn/test/script/nosecurity/parsertests/unaryExpr.js b/test/nashorn/script/nosecurity/parsertests/unaryExpr.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/unaryExpr.js rename to test/nashorn/script/nosecurity/parsertests/unaryExpr.js diff --git a/nashorn/test/script/nosecurity/parsertests/useStrict.js b/test/nashorn/script/nosecurity/parsertests/useStrict.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/useStrict.js rename to test/nashorn/script/nosecurity/parsertests/useStrict.js diff --git a/nashorn/test/script/nosecurity/parsertests/varDecl.js b/test/nashorn/script/nosecurity/parsertests/varDecl.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/varDecl.js rename to test/nashorn/script/nosecurity/parsertests/varDecl.js diff --git a/nashorn/test/script/nosecurity/parsertests/withStat.js b/test/nashorn/script/nosecurity/parsertests/withStat.js similarity index 100% rename from nashorn/test/script/nosecurity/parsertests/withStat.js rename to test/nashorn/script/nosecurity/parsertests/withStat.js diff --git a/nashorn/test/script/nosecurity/parservisitor.js b/test/nashorn/script/nosecurity/parservisitor.js similarity index 100% rename from nashorn/test/script/nosecurity/parservisitor.js rename to test/nashorn/script/nosecurity/parservisitor.js diff --git a/nashorn/test/script/nosecurity/parservisitor.js.EXPECTED b/test/nashorn/script/nosecurity/parservisitor.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/parservisitor.js.EXPECTED rename to test/nashorn/script/nosecurity/parservisitor.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/readprint.js b/test/nashorn/script/nosecurity/readprint.js similarity index 100% rename from nashorn/test/script/nosecurity/readprint.js rename to test/nashorn/script/nosecurity/readprint.js diff --git a/nashorn/test/script/nosecurity/treeapi/array_access.js b/test/nashorn/script/nosecurity/treeapi/array_access.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/array_access.js rename to test/nashorn/script/nosecurity/treeapi/array_access.js diff --git a/nashorn/test/script/nosecurity/treeapi/array_access.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/array_access.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/array_access.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/array_access.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/array_literal.js b/test/nashorn/script/nosecurity/treeapi/array_literal.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/array_literal.js rename to test/nashorn/script/nosecurity/treeapi/array_literal.js diff --git a/nashorn/test/script/nosecurity/treeapi/array_literal.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/array_literal.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/array_literal.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/array_literal.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/arrow.js b/test/nashorn/script/nosecurity/treeapi/arrow.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/arrow.js rename to test/nashorn/script/nosecurity/treeapi/arrow.js diff --git a/nashorn/test/script/nosecurity/treeapi/arrow.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/arrow.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/arrow.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/arrow.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/arrow_params.js b/test/nashorn/script/nosecurity/treeapi/arrow_params.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/arrow_params.js rename to test/nashorn/script/nosecurity/treeapi/arrow_params.js diff --git a/nashorn/test/script/nosecurity/treeapi/arrow_params.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/arrow_params.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/arrow_params.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/arrow_params.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/assignment.js b/test/nashorn/script/nosecurity/treeapi/assignment.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/assignment.js rename to test/nashorn/script/nosecurity/treeapi/assignment.js diff --git a/nashorn/test/script/nosecurity/treeapi/assignment.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/assignment.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/assignment.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/assignment.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/assignmentExpr.js b/test/nashorn/script/nosecurity/treeapi/assignmentExpr.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/assignmentExpr.js rename to test/nashorn/script/nosecurity/treeapi/assignmentExpr.js diff --git a/nashorn/test/script/nosecurity/treeapi/assignmentExpr.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/assignmentExpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/assignmentExpr.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/assignmentExpr.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/binaryExpr.js b/test/nashorn/script/nosecurity/treeapi/binaryExpr.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/binaryExpr.js rename to test/nashorn/script/nosecurity/treeapi/binaryExpr.js diff --git a/nashorn/test/script/nosecurity/treeapi/binaryExpr.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/binaryExpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/binaryExpr.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/binaryExpr.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/block.js b/test/nashorn/script/nosecurity/treeapi/block.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/block.js rename to test/nashorn/script/nosecurity/treeapi/block.js diff --git a/nashorn/test/script/nosecurity/treeapi/block.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/block.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/block.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/block.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/breakStat.js b/test/nashorn/script/nosecurity/treeapi/breakStat.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/breakStat.js rename to test/nashorn/script/nosecurity/treeapi/breakStat.js diff --git a/nashorn/test/script/nosecurity/treeapi/breakStat.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/breakStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/breakStat.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/breakStat.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/case.js b/test/nashorn/script/nosecurity/treeapi/case.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/case.js rename to test/nashorn/script/nosecurity/treeapi/case.js diff --git a/nashorn/test/script/nosecurity/treeapi/case.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/case.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/case.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/case.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/class.js b/test/nashorn/script/nosecurity/treeapi/class.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/class.js rename to test/nashorn/script/nosecurity/treeapi/class.js diff --git a/nashorn/test/script/nosecurity/treeapi/class.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/class.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/class.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/class.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/compilationUnitTree.js b/test/nashorn/script/nosecurity/treeapi/compilationUnitTree.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/compilationUnitTree.js rename to test/nashorn/script/nosecurity/treeapi/compilationUnitTree.js diff --git a/nashorn/test/script/nosecurity/treeapi/condExpr.js b/test/nashorn/script/nosecurity/treeapi/condExpr.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/condExpr.js rename to test/nashorn/script/nosecurity/treeapi/condExpr.js diff --git a/nashorn/test/script/nosecurity/treeapi/condExpr.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/condExpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/condExpr.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/condExpr.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/const.js b/test/nashorn/script/nosecurity/treeapi/const.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/const.js rename to test/nashorn/script/nosecurity/treeapi/const.js diff --git a/nashorn/test/script/nosecurity/treeapi/const.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/const.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/const.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/const.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/continueStat.js b/test/nashorn/script/nosecurity/treeapi/continueStat.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/continueStat.js rename to test/nashorn/script/nosecurity/treeapi/continueStat.js diff --git a/nashorn/test/script/nosecurity/treeapi/continueStat.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/continueStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/continueStat.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/continueStat.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/debuggerStat.js b/test/nashorn/script/nosecurity/treeapi/debuggerStat.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/debuggerStat.js rename to test/nashorn/script/nosecurity/treeapi/debuggerStat.js diff --git a/nashorn/test/script/nosecurity/treeapi/debuggerStat.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/debuggerStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/debuggerStat.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/debuggerStat.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/defaultparams.js b/test/nashorn/script/nosecurity/treeapi/defaultparams.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/defaultparams.js rename to test/nashorn/script/nosecurity/treeapi/defaultparams.js diff --git a/nashorn/test/script/nosecurity/treeapi/defaultparams.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/defaultparams.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/defaultparams.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/defaultparams.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/destructuring_assign.js b/test/nashorn/script/nosecurity/treeapi/destructuring_assign.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/destructuring_assign.js rename to test/nashorn/script/nosecurity/treeapi/destructuring_assign.js diff --git a/nashorn/test/script/nosecurity/treeapi/destructuring_assign.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/destructuring_assign.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/destructuring_assign.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/destructuring_assign.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/destructuring_catch.js b/test/nashorn/script/nosecurity/treeapi/destructuring_catch.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/destructuring_catch.js rename to test/nashorn/script/nosecurity/treeapi/destructuring_catch.js diff --git a/nashorn/test/script/nosecurity/treeapi/destructuring_catch.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/destructuring_catch.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/destructuring_catch.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/destructuring_catch.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/destructuring_decl.js b/test/nashorn/script/nosecurity/treeapi/destructuring_decl.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/destructuring_decl.js rename to test/nashorn/script/nosecurity/treeapi/destructuring_decl.js diff --git a/nashorn/test/script/nosecurity/treeapi/destructuring_decl.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/destructuring_decl.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/destructuring_decl.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/destructuring_decl.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/destructuring_params.js b/test/nashorn/script/nosecurity/treeapi/destructuring_params.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/destructuring_params.js rename to test/nashorn/script/nosecurity/treeapi/destructuring_params.js diff --git a/nashorn/test/script/nosecurity/treeapi/destructuring_params.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/destructuring_params.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/destructuring_params.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/destructuring_params.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/diagnostic.js b/test/nashorn/script/nosecurity/treeapi/diagnostic.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/diagnostic.js rename to test/nashorn/script/nosecurity/treeapi/diagnostic.js diff --git a/nashorn/test/script/nosecurity/treeapi/diagnostic.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/diagnostic.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/diagnostic.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/diagnostic.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/dowhile.js b/test/nashorn/script/nosecurity/treeapi/dowhile.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/dowhile.js rename to test/nashorn/script/nosecurity/treeapi/dowhile.js diff --git a/nashorn/test/script/nosecurity/treeapi/dowhile.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/dowhile.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/dowhile.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/dowhile.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/empty.js b/test/nashorn/script/nosecurity/treeapi/empty.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/empty.js rename to test/nashorn/script/nosecurity/treeapi/empty.js diff --git a/nashorn/test/script/nosecurity/treeapi/empty.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/empty.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/empty.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/empty.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/erroneous.js b/test/nashorn/script/nosecurity/treeapi/erroneous.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/erroneous.js rename to test/nashorn/script/nosecurity/treeapi/erroneous.js diff --git a/nashorn/test/script/nosecurity/treeapi/erroneous.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/erroneous.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/erroneous.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/erroneous.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/for.js b/test/nashorn/script/nosecurity/treeapi/for.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/for.js rename to test/nashorn/script/nosecurity/treeapi/for.js diff --git a/nashorn/test/script/nosecurity/treeapi/for.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/for.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/for.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/for.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/forin.js b/test/nashorn/script/nosecurity/treeapi/forin.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/forin.js rename to test/nashorn/script/nosecurity/treeapi/forin.js diff --git a/nashorn/test/script/nosecurity/treeapi/forin.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/forin.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/forin.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/forin.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/functionCall.js b/test/nashorn/script/nosecurity/treeapi/functionCall.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/functionCall.js rename to test/nashorn/script/nosecurity/treeapi/functionCall.js diff --git a/nashorn/test/script/nosecurity/treeapi/functionCall.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/functionCall.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/functionCall.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/functionCall.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/functionDeclaration.js b/test/nashorn/script/nosecurity/treeapi/functionDeclaration.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/functionDeclaration.js rename to test/nashorn/script/nosecurity/treeapi/functionDeclaration.js diff --git a/nashorn/test/script/nosecurity/treeapi/functionDeclaration.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/functionDeclaration.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/functionDeclaration.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/functionDeclaration.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/functionExpr.js b/test/nashorn/script/nosecurity/treeapi/functionExpr.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/functionExpr.js rename to test/nashorn/script/nosecurity/treeapi/functionExpr.js diff --git a/nashorn/test/script/nosecurity/treeapi/functionExpr.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/functionExpr.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/functionExpr.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/functionExpr.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/generator.js b/test/nashorn/script/nosecurity/treeapi/generator.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/generator.js rename to test/nashorn/script/nosecurity/treeapi/generator.js diff --git a/nashorn/test/script/nosecurity/treeapi/generator.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/generator.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/generator.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/generator.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/identifier.js b/test/nashorn/script/nosecurity/treeapi/identifier.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/identifier.js rename to test/nashorn/script/nosecurity/treeapi/identifier.js diff --git a/nashorn/test/script/nosecurity/treeapi/identifier.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/identifier.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/identifier.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/identifier.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/if.js b/test/nashorn/script/nosecurity/treeapi/if.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/if.js rename to test/nashorn/script/nosecurity/treeapi/if.js diff --git a/nashorn/test/script/nosecurity/treeapi/if.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/if.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/if.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/if.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/instanceof.js b/test/nashorn/script/nosecurity/treeapi/instanceof.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/instanceof.js rename to test/nashorn/script/nosecurity/treeapi/instanceof.js diff --git a/nashorn/test/script/nosecurity/treeapi/instanceof.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/instanceof.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/instanceof.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/instanceof.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/labelledStat.js b/test/nashorn/script/nosecurity/treeapi/labelledStat.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/labelledStat.js rename to test/nashorn/script/nosecurity/treeapi/labelledStat.js diff --git a/nashorn/test/script/nosecurity/treeapi/labelledStat.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/labelledStat.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/labelledStat.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/labelledStat.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/let.js b/test/nashorn/script/nosecurity/treeapi/let.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/let.js rename to test/nashorn/script/nosecurity/treeapi/let.js diff --git a/nashorn/test/script/nosecurity/treeapi/let.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/let.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/let.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/let.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/literal.js b/test/nashorn/script/nosecurity/treeapi/literal.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/literal.js rename to test/nashorn/script/nosecurity/treeapi/literal.js diff --git a/nashorn/test/script/nosecurity/treeapi/literal.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/literal.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/literal.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/literal.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/memberSelect.js b/test/nashorn/script/nosecurity/treeapi/memberSelect.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/memberSelect.js rename to test/nashorn/script/nosecurity/treeapi/memberSelect.js diff --git a/nashorn/test/script/nosecurity/treeapi/memberSelect.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/memberSelect.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/memberSelect.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/memberSelect.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/modules.js b/test/nashorn/script/nosecurity/treeapi/modules.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/modules.js rename to test/nashorn/script/nosecurity/treeapi/modules.js diff --git a/nashorn/test/script/nosecurity/treeapi/modules.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/modules.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/modules.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/modules.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/new.js b/test/nashorn/script/nosecurity/treeapi/new.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/new.js rename to test/nashorn/script/nosecurity/treeapi/new.js diff --git a/nashorn/test/script/nosecurity/treeapi/new.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/new.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/new.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/new.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/objectLiteral.js b/test/nashorn/script/nosecurity/treeapi/objectLiteral.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/objectLiteral.js rename to test/nashorn/script/nosecurity/treeapi/objectLiteral.js diff --git a/nashorn/test/script/nosecurity/treeapi/objectLiteral.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/objectLiteral.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/objectLiteral.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/objectLiteral.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/property.js b/test/nashorn/script/nosecurity/treeapi/property.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/property.js rename to test/nashorn/script/nosecurity/treeapi/property.js diff --git a/nashorn/test/script/nosecurity/treeapi/property.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/property.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/property.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/property.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/regexp.js b/test/nashorn/script/nosecurity/treeapi/regexp.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/regexp.js rename to test/nashorn/script/nosecurity/treeapi/regexp.js diff --git a/nashorn/test/script/nosecurity/treeapi/regexp.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/regexp.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/regexp.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/regexp.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/rest.js b/test/nashorn/script/nosecurity/treeapi/rest.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/rest.js rename to test/nashorn/script/nosecurity/treeapi/rest.js diff --git a/nashorn/test/script/nosecurity/treeapi/rest.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/rest.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/rest.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/rest.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/return.js b/test/nashorn/script/nosecurity/treeapi/return.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/return.js rename to test/nashorn/script/nosecurity/treeapi/return.js diff --git a/nashorn/test/script/nosecurity/treeapi/return.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/return.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/return.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/return.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/spread.js b/test/nashorn/script/nosecurity/treeapi/spread.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/spread.js rename to test/nashorn/script/nosecurity/treeapi/spread.js diff --git a/nashorn/test/script/nosecurity/treeapi/spread.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/spread.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/spread.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/spread.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/switch.js b/test/nashorn/script/nosecurity/treeapi/switch.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/switch.js rename to test/nashorn/script/nosecurity/treeapi/switch.js diff --git a/nashorn/test/script/nosecurity/treeapi/switch.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/switch.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/switch.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/switch.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/template_literal.js b/test/nashorn/script/nosecurity/treeapi/template_literal.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/template_literal.js rename to test/nashorn/script/nosecurity/treeapi/template_literal.js diff --git a/nashorn/test/script/nosecurity/treeapi/template_literal.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/template_literal.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/template_literal.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/template_literal.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/throw.js b/test/nashorn/script/nosecurity/treeapi/throw.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/throw.js rename to test/nashorn/script/nosecurity/treeapi/throw.js diff --git a/nashorn/test/script/nosecurity/treeapi/throw.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/throw.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/throw.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/throw.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/try.js b/test/nashorn/script/nosecurity/treeapi/try.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/try.js rename to test/nashorn/script/nosecurity/treeapi/try.js diff --git a/nashorn/test/script/nosecurity/treeapi/try.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/try.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/try.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/try.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/unary.js b/test/nashorn/script/nosecurity/treeapi/unary.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/unary.js rename to test/nashorn/script/nosecurity/treeapi/unary.js diff --git a/nashorn/test/script/nosecurity/treeapi/unary.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/unary.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/unary.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/unary.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/utils.js b/test/nashorn/script/nosecurity/treeapi/utils.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/utils.js rename to test/nashorn/script/nosecurity/treeapi/utils.js diff --git a/nashorn/test/script/nosecurity/treeapi/variable.js b/test/nashorn/script/nosecurity/treeapi/variable.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/variable.js rename to test/nashorn/script/nosecurity/treeapi/variable.js diff --git a/nashorn/test/script/nosecurity/treeapi/variable.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/variable.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/variable.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/variable.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/while.js b/test/nashorn/script/nosecurity/treeapi/while.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/while.js rename to test/nashorn/script/nosecurity/treeapi/while.js diff --git a/nashorn/test/script/nosecurity/treeapi/while.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/while.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/while.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/while.js.EXPECTED diff --git a/nashorn/test/script/nosecurity/treeapi/with.js b/test/nashorn/script/nosecurity/treeapi/with.js similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/with.js rename to test/nashorn/script/nosecurity/treeapi/with.js diff --git a/nashorn/test/script/nosecurity/treeapi/with.js.EXPECTED b/test/nashorn/script/nosecurity/treeapi/with.js.EXPECTED similarity index 100% rename from nashorn/test/script/nosecurity/treeapi/with.js.EXPECTED rename to test/nashorn/script/nosecurity/treeapi/with.js.EXPECTED diff --git a/nashorn/test/script/sandbox/JDK-8031106.js b/test/nashorn/script/sandbox/JDK-8031106.js similarity index 100% rename from nashorn/test/script/sandbox/JDK-8031106.js rename to test/nashorn/script/sandbox/JDK-8031106.js diff --git a/nashorn/test/script/sandbox/NASHORN-525.js b/test/nashorn/script/sandbox/NASHORN-525.js similarity index 100% rename from nashorn/test/script/sandbox/NASHORN-525.js rename to test/nashorn/script/sandbox/NASHORN-525.js diff --git a/nashorn/test/script/sandbox/README b/test/nashorn/script/sandbox/README similarity index 100% rename from nashorn/test/script/sandbox/README rename to test/nashorn/script/sandbox/README diff --git a/nashorn/test/script/sandbox/arrayclass.js b/test/nashorn/script/sandbox/arrayclass.js similarity index 100% rename from nashorn/test/script/sandbox/arrayclass.js rename to test/nashorn/script/sandbox/arrayclass.js diff --git a/nashorn/test/script/sandbox/arrayclass.js.EXPECTED b/test/nashorn/script/sandbox/arrayclass.js.EXPECTED similarity index 100% rename from nashorn/test/script/sandbox/arrayclass.js.EXPECTED rename to test/nashorn/script/sandbox/arrayclass.js.EXPECTED diff --git a/nashorn/test/script/sandbox/classbind.js b/test/nashorn/script/sandbox/classbind.js similarity index 100% rename from nashorn/test/script/sandbox/classbind.js rename to test/nashorn/script/sandbox/classbind.js diff --git a/nashorn/test/script/sandbox/classloader.js b/test/nashorn/script/sandbox/classloader.js similarity index 100% rename from nashorn/test/script/sandbox/classloader.js rename to test/nashorn/script/sandbox/classloader.js diff --git a/nashorn/test/script/sandbox/classloader.js.EXPECTED b/test/nashorn/script/sandbox/classloader.js.EXPECTED similarity index 100% rename from nashorn/test/script/sandbox/classloader.js.EXPECTED rename to test/nashorn/script/sandbox/classloader.js.EXPECTED diff --git a/nashorn/test/script/sandbox/doprivileged.js b/test/nashorn/script/sandbox/doprivileged.js similarity index 100% rename from nashorn/test/script/sandbox/doprivileged.js rename to test/nashorn/script/sandbox/doprivileged.js diff --git a/nashorn/test/script/sandbox/doprivileged.js.EXPECTED b/test/nashorn/script/sandbox/doprivileged.js.EXPECTED similarity index 100% rename from nashorn/test/script/sandbox/doprivileged.js.EXPECTED rename to test/nashorn/script/sandbox/doprivileged.js.EXPECTED diff --git a/nashorn/test/script/sandbox/engine.js b/test/nashorn/script/sandbox/engine.js similarity index 100% rename from nashorn/test/script/sandbox/engine.js rename to test/nashorn/script/sandbox/engine.js diff --git a/nashorn/test/script/sandbox/engine.js.EXPECTED b/test/nashorn/script/sandbox/engine.js.EXPECTED similarity index 100% rename from nashorn/test/script/sandbox/engine.js.EXPECTED rename to test/nashorn/script/sandbox/engine.js.EXPECTED diff --git a/nashorn/test/script/sandbox/env.js b/test/nashorn/script/sandbox/env.js similarity index 100% rename from nashorn/test/script/sandbox/env.js rename to test/nashorn/script/sandbox/env.js diff --git a/nashorn/test/script/sandbox/exec.js b/test/nashorn/script/sandbox/exec.js similarity index 100% rename from nashorn/test/script/sandbox/exec.js rename to test/nashorn/script/sandbox/exec.js diff --git a/nashorn/test/script/sandbox/exit.js b/test/nashorn/script/sandbox/exit.js similarity index 100% rename from nashorn/test/script/sandbox/exit.js rename to test/nashorn/script/sandbox/exit.js diff --git a/nashorn/test/script/sandbox/exit.js.EXPECTED b/test/nashorn/script/sandbox/exit.js.EXPECTED similarity index 100% rename from nashorn/test/script/sandbox/exit.js.EXPECTED rename to test/nashorn/script/sandbox/exit.js.EXPECTED diff --git a/nashorn/test/script/sandbox/file.js b/test/nashorn/script/sandbox/file.js similarity index 100% rename from nashorn/test/script/sandbox/file.js rename to test/nashorn/script/sandbox/file.js diff --git a/nashorn/test/script/sandbox/file.js.EXPECTED b/test/nashorn/script/sandbox/file.js.EXPECTED similarity index 100% rename from nashorn/test/script/sandbox/file.js.EXPECTED rename to test/nashorn/script/sandbox/file.js.EXPECTED diff --git a/nashorn/test/script/sandbox/interfaceimpl.js b/test/nashorn/script/sandbox/interfaceimpl.js similarity index 100% rename from nashorn/test/script/sandbox/interfaceimpl.js rename to test/nashorn/script/sandbox/interfaceimpl.js diff --git a/nashorn/test/script/sandbox/javaextend.js b/test/nashorn/script/sandbox/javaextend.js similarity index 100% rename from nashorn/test/script/sandbox/javaextend.js rename to test/nashorn/script/sandbox/javaextend.js diff --git a/nashorn/test/script/sandbox/javaextend.js.EXPECTED b/test/nashorn/script/sandbox/javaextend.js.EXPECTED similarity index 100% rename from nashorn/test/script/sandbox/javaextend.js.EXPECTED rename to test/nashorn/script/sandbox/javaextend.js.EXPECTED diff --git a/nashorn/test/script/sandbox/jsadapter.js b/test/nashorn/script/sandbox/jsadapter.js similarity index 100% rename from nashorn/test/script/sandbox/jsadapter.js rename to test/nashorn/script/sandbox/jsadapter.js diff --git a/nashorn/test/script/sandbox/loadLibrary.js b/test/nashorn/script/sandbox/loadLibrary.js similarity index 100% rename from nashorn/test/script/sandbox/loadLibrary.js rename to test/nashorn/script/sandbox/loadLibrary.js diff --git a/nashorn/test/script/sandbox/loadcompat.js b/test/nashorn/script/sandbox/loadcompat.js similarity index 100% rename from nashorn/test/script/sandbox/loadcompat.js rename to test/nashorn/script/sandbox/loadcompat.js diff --git a/nashorn/test/script/sandbox/nashorninternals.js b/test/nashorn/script/sandbox/nashorninternals.js similarity index 100% rename from nashorn/test/script/sandbox/nashorninternals.js rename to test/nashorn/script/sandbox/nashorninternals.js diff --git a/nashorn/test/script/sandbox/net.js b/test/nashorn/script/sandbox/net.js similarity index 100% rename from nashorn/test/script/sandbox/net.js rename to test/nashorn/script/sandbox/net.js diff --git a/nashorn/test/script/sandbox/net.js.EXPECTED b/test/nashorn/script/sandbox/net.js.EXPECTED similarity index 100% rename from nashorn/test/script/sandbox/net.js.EXPECTED rename to test/nashorn/script/sandbox/net.js.EXPECTED diff --git a/nashorn/test/script/sandbox/property.js b/test/nashorn/script/sandbox/property.js similarity index 100% rename from nashorn/test/script/sandbox/property.js rename to test/nashorn/script/sandbox/property.js diff --git a/nashorn/test/script/sandbox/property.js.EXPECTED b/test/nashorn/script/sandbox/property.js.EXPECTED similarity index 100% rename from nashorn/test/script/sandbox/property.js.EXPECTED rename to test/nashorn/script/sandbox/property.js.EXPECTED diff --git a/nashorn/test/script/sandbox/reflection.js b/test/nashorn/script/sandbox/reflection.js similarity index 100% rename from nashorn/test/script/sandbox/reflection.js rename to test/nashorn/script/sandbox/reflection.js diff --git a/nashorn/test/script/sandbox/runnable.js b/test/nashorn/script/sandbox/runnable.js similarity index 100% rename from nashorn/test/script/sandbox/runnable.js rename to test/nashorn/script/sandbox/runnable.js diff --git a/nashorn/test/script/sandbox/runnable.js.EXPECTED b/test/nashorn/script/sandbox/runnable.js.EXPECTED similarity index 100% rename from nashorn/test/script/sandbox/runnable.js.EXPECTED rename to test/nashorn/script/sandbox/runnable.js.EXPECTED diff --git a/nashorn/test/script/sandbox/safeprops.js b/test/nashorn/script/sandbox/safeprops.js similarity index 100% rename from nashorn/test/script/sandbox/safeprops.js rename to test/nashorn/script/sandbox/safeprops.js diff --git a/nashorn/test/script/sandbox/unsafe.js b/test/nashorn/script/sandbox/unsafe.js similarity index 100% rename from nashorn/test/script/sandbox/unsafe.js rename to test/nashorn/script/sandbox/unsafe.js diff --git a/nashorn/test/script/test262.js b/test/nashorn/script/test262.js similarity index 100% rename from nashorn/test/script/test262.js rename to test/nashorn/script/test262.js diff --git a/nashorn/test/script/test262_single.js b/test/nashorn/script/test262_single.js similarity index 100% rename from nashorn/test/script/test262_single.js rename to test/nashorn/script/test262_single.js diff --git a/nashorn/test/script/trusted/JDK-8006424.js b/test/nashorn/script/trusted/JDK-8006424.js similarity index 100% rename from nashorn/test/script/trusted/JDK-8006424.js rename to test/nashorn/script/trusted/JDK-8006424.js diff --git a/nashorn/test/script/trusted/JDK-8006529.js b/test/nashorn/script/trusted/JDK-8006529.js similarity index 100% rename from nashorn/test/script/trusted/JDK-8006529.js rename to test/nashorn/script/trusted/JDK-8006529.js diff --git a/nashorn/test/script/trusted/JDK-8008305.js b/test/nashorn/script/trusted/JDK-8008305.js similarity index 100% rename from nashorn/test/script/trusted/JDK-8008305.js rename to test/nashorn/script/trusted/JDK-8008305.js diff --git a/nashorn/test/script/trusted/JDK-8008305_subtest.js b/test/nashorn/script/trusted/JDK-8008305_subtest.js similarity index 100% rename from nashorn/test/script/trusted/JDK-8008305_subtest.js rename to test/nashorn/script/trusted/JDK-8008305_subtest.js diff --git a/nashorn/test/script/trusted/JDK-8020809.js b/test/nashorn/script/trusted/JDK-8020809.js similarity index 100% rename from nashorn/test/script/trusted/JDK-8020809.js rename to test/nashorn/script/trusted/JDK-8020809.js diff --git a/nashorn/test/script/trusted/JDK-8020809.js.EXPECTED b/test/nashorn/script/trusted/JDK-8020809.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/JDK-8020809.js.EXPECTED rename to test/nashorn/script/trusted/JDK-8020809.js.EXPECTED diff --git a/nashorn/test/script/trusted/JDK-8021129.js b/test/nashorn/script/trusted/JDK-8021129.js similarity index 100% rename from nashorn/test/script/trusted/JDK-8021129.js rename to test/nashorn/script/trusted/JDK-8021129.js diff --git a/nashorn/test/script/trusted/JDK-8021129.js.EXPECTED b/test/nashorn/script/trusted/JDK-8021129.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/JDK-8021129.js.EXPECTED rename to test/nashorn/script/trusted/JDK-8021129.js.EXPECTED diff --git a/nashorn/test/script/trusted/JDK-8021189.js b/test/nashorn/script/trusted/JDK-8021189.js similarity index 100% rename from nashorn/test/script/trusted/JDK-8021189.js rename to test/nashorn/script/trusted/JDK-8021189.js diff --git a/nashorn/test/script/trusted/JDK-8021189.js.EXPECTED b/test/nashorn/script/trusted/JDK-8021189.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/JDK-8021189.js.EXPECTED rename to test/nashorn/script/trusted/JDK-8021189.js.EXPECTED diff --git a/nashorn/test/script/trusted/JDK-8025629.js b/test/nashorn/script/trusted/JDK-8025629.js similarity index 100% rename from nashorn/test/script/trusted/JDK-8025629.js rename to test/nashorn/script/trusted/JDK-8025629.js diff --git a/nashorn/test/script/trusted/JDK-8032060.js b/test/nashorn/script/trusted/JDK-8032060.js similarity index 100% rename from nashorn/test/script/trusted/JDK-8032060.js rename to test/nashorn/script/trusted/JDK-8032060.js diff --git a/nashorn/test/script/trusted/JDK-8067854.js b/test/nashorn/script/trusted/JDK-8067854.js similarity index 100% rename from nashorn/test/script/trusted/JDK-8067854.js rename to test/nashorn/script/trusted/JDK-8067854.js diff --git a/nashorn/test/script/trusted/JDK-8087292.js b/test/nashorn/script/trusted/JDK-8087292.js similarity index 100% rename from nashorn/test/script/trusted/JDK-8087292.js rename to test/nashorn/script/trusted/JDK-8087292.js diff --git a/nashorn/test/script/trusted/JDK-8087292.js.EXPECTED b/test/nashorn/script/trusted/JDK-8087292.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/JDK-8087292.js.EXPECTED rename to test/nashorn/script/trusted/JDK-8087292.js.EXPECTED diff --git a/nashorn/test/script/trusted/JDK-8141209.js b/test/nashorn/script/trusted/JDK-8141209.js similarity index 100% rename from nashorn/test/script/trusted/JDK-8141209.js rename to test/nashorn/script/trusted/JDK-8141209.js diff --git a/nashorn/test/script/trusted/JDK-8141209.js.EXPECTED b/test/nashorn/script/trusted/JDK-8141209.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/JDK-8141209.js.EXPECTED rename to test/nashorn/script/trusted/JDK-8141209.js.EXPECTED diff --git a/nashorn/test/script/trusted/JDK-util.js b/test/nashorn/script/trusted/JDK-util.js similarity index 100% rename from nashorn/test/script/trusted/JDK-util.js rename to test/nashorn/script/trusted/JDK-util.js diff --git a/nashorn/test/script/trusted/NASHORN-638.js b/test/nashorn/script/trusted/NASHORN-638.js similarity index 100% rename from nashorn/test/script/trusted/NASHORN-638.js rename to test/nashorn/script/trusted/NASHORN-638.js diff --git a/nashorn/test/script/trusted/NASHORN-638.js.EXPECTED b/test/nashorn/script/trusted/NASHORN-638.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/NASHORN-638.js.EXPECTED rename to test/nashorn/script/trusted/NASHORN-638.js.EXPECTED diff --git a/nashorn/test/script/trusted/NASHORN-653.js b/test/nashorn/script/trusted/NASHORN-653.js similarity index 100% rename from nashorn/test/script/trusted/NASHORN-653.js rename to test/nashorn/script/trusted/NASHORN-653.js diff --git a/nashorn/test/script/trusted/README b/test/nashorn/script/trusted/README similarity index 100% rename from nashorn/test/script/trusted/README rename to test/nashorn/script/trusted/README diff --git a/nashorn/test/script/trusted/classfilter.js b/test/nashorn/script/trusted/classfilter.js similarity index 100% rename from nashorn/test/script/trusted/classfilter.js rename to test/nashorn/script/trusted/classfilter.js diff --git a/nashorn/test/script/trusted/classfilter.js.EXPECTED b/test/nashorn/script/trusted/classfilter.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/classfilter.js.EXPECTED rename to test/nashorn/script/trusted/classfilter.js.EXPECTED diff --git a/nashorn/test/script/trusted/classfilter_extends.js b/test/nashorn/script/trusted/classfilter_extends.js similarity index 100% rename from nashorn/test/script/trusted/classfilter_extends.js rename to test/nashorn/script/trusted/classfilter_extends.js diff --git a/nashorn/test/script/trusted/classfilter_extends.js.EXPECTED b/test/nashorn/script/trusted/classfilter_extends.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/classfilter_extends.js.EXPECTED rename to test/nashorn/script/trusted/classfilter_extends.js.EXPECTED diff --git a/nashorn/test/script/trusted/classfilter_mozilla_compat.js b/test/nashorn/script/trusted/classfilter_mozilla_compat.js similarity index 100% rename from nashorn/test/script/trusted/classfilter_mozilla_compat.js rename to test/nashorn/script/trusted/classfilter_mozilla_compat.js diff --git a/nashorn/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED b/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED rename to test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED diff --git a/nashorn/test/script/trusted/event_queue.js b/test/nashorn/script/trusted/event_queue.js similarity index 100% rename from nashorn/test/script/trusted/event_queue.js rename to test/nashorn/script/trusted/event_queue.js diff --git a/nashorn/test/script/trusted/event_queue.js.EXPECTED b/test/nashorn/script/trusted/event_queue.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/event_queue.js.EXPECTED rename to test/nashorn/script/trusted/event_queue.js.EXPECTED diff --git a/nashorn/test/script/trusted/getenv.js b/test/nashorn/script/trusted/getenv.js similarity index 100% rename from nashorn/test/script/trusted/getenv.js rename to test/nashorn/script/trusted/getenv.js diff --git a/nashorn/test/script/trusted/getenv.js.EXPECTED b/test/nashorn/script/trusted/getenv.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/getenv.js.EXPECTED rename to test/nashorn/script/trusted/getenv.js.EXPECTED diff --git a/nashorn/test/script/trusted/logcoverage.js.EXPECTED b/test/nashorn/script/trusted/logcoverage.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/logcoverage.js.EXPECTED rename to test/nashorn/script/trusted/logcoverage.js.EXPECTED diff --git a/nashorn/test/script/trusted/optimistic_recompilation.js b/test/nashorn/script/trusted/optimistic_recompilation.js similarity index 100% rename from nashorn/test/script/trusted/optimistic_recompilation.js rename to test/nashorn/script/trusted/optimistic_recompilation.js diff --git a/nashorn/test/script/trusted/optimistic_recompilation.js.EXPECTED b/test/nashorn/script/trusted/optimistic_recompilation.js.EXPECTED similarity index 100% rename from nashorn/test/script/trusted/optimistic_recompilation.js.EXPECTED rename to test/nashorn/script/trusted/optimistic_recompilation.js.EXPECTED diff --git a/nashorn/test/script/trusted/urlreader.js b/test/nashorn/script/trusted/urlreader.js similarity index 100% rename from nashorn/test/script/trusted/urlreader.js rename to test/nashorn/script/trusted/urlreader.js diff --git a/nashorn/test/src/META-INF/services/java.sql.Driver b/test/nashorn/src/META-INF/services/java.sql.Driver similarity index 100% rename from nashorn/test/src/META-INF/services/java.sql.Driver rename to test/nashorn/src/META-INF/services/java.sql.Driver diff --git a/nashorn/test/src/META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter b/test/nashorn/src/META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter similarity index 100% rename from nashorn/test/src/META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter rename to test/nashorn/src/META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter diff --git a/nashorn/test/src/UnnamedPackageTestCallback.java b/test/nashorn/src/UnnamedPackageTestCallback.java similarity index 100% rename from nashorn/test/src/UnnamedPackageTestCallback.java rename to test/nashorn/src/UnnamedPackageTestCallback.java diff --git a/nashorn/test/src/jdk/dynalink/beans/test/BeanLinkerTest.java b/test/nashorn/src/jdk/dynalink/beans/test/BeanLinkerTest.java similarity index 100% rename from nashorn/test/src/jdk/dynalink/beans/test/BeanLinkerTest.java rename to test/nashorn/src/jdk/dynalink/beans/test/BeanLinkerTest.java diff --git a/nashorn/test/src/jdk/dynalink/beans/test/BeansLinkerTest.java b/test/nashorn/src/jdk/dynalink/beans/test/BeansLinkerTest.java similarity index 100% rename from nashorn/test/src/jdk/dynalink/beans/test/BeansLinkerTest.java rename to test/nashorn/src/jdk/dynalink/beans/test/BeansLinkerTest.java diff --git a/nashorn/test/src/jdk/dynalink/beans/test/CallerSensitiveTest.java b/test/nashorn/src/jdk/dynalink/beans/test/CallerSensitiveTest.java similarity index 100% rename from nashorn/test/src/jdk/dynalink/beans/test/CallerSensitiveTest.java rename to test/nashorn/src/jdk/dynalink/beans/test/CallerSensitiveTest.java diff --git a/nashorn/test/src/jdk/dynalink/linker/support/test/LookupTest.java b/test/nashorn/src/jdk/dynalink/linker/support/test/LookupTest.java similarity index 100% rename from nashorn/test/src/jdk/dynalink/linker/support/test/LookupTest.java rename to test/nashorn/src/jdk/dynalink/linker/support/test/LookupTest.java diff --git a/nashorn/test/src/jdk/dynalink/support/test/CallSiteTest.java b/test/nashorn/src/jdk/dynalink/support/test/CallSiteTest.java similarity index 100% rename from nashorn/test/src/jdk/dynalink/support/test/CallSiteTest.java rename to test/nashorn/src/jdk/dynalink/support/test/CallSiteTest.java diff --git a/nashorn/test/src/jdk/dynalink/test/ArrayRunnableTest.java b/test/nashorn/src/jdk/dynalink/test/ArrayRunnableTest.java similarity index 100% rename from nashorn/test/src/jdk/dynalink/test/ArrayRunnableTest.java rename to test/nashorn/src/jdk/dynalink/test/ArrayRunnableTest.java diff --git a/nashorn/test/src/jdk/dynalink/test/DynamicLinkerFactoryTest.java b/test/nashorn/src/jdk/dynalink/test/DynamicLinkerFactoryTest.java similarity index 100% rename from nashorn/test/src/jdk/dynalink/test/DynamicLinkerFactoryTest.java rename to test/nashorn/src/jdk/dynalink/test/DynamicLinkerFactoryTest.java diff --git a/nashorn/test/src/jdk/dynalink/test/LinkedCallSiteLocationTest.java b/test/nashorn/src/jdk/dynalink/test/LinkedCallSiteLocationTest.java similarity index 100% rename from nashorn/test/src/jdk/dynalink/test/LinkedCallSiteLocationTest.java rename to test/nashorn/src/jdk/dynalink/test/LinkedCallSiteLocationTest.java diff --git a/nashorn/test/src/jdk/dynalink/test/TrustedGuardingDynamicLinkerExporter.java b/test/nashorn/src/jdk/dynalink/test/TrustedGuardingDynamicLinkerExporter.java similarity index 100% rename from nashorn/test/src/jdk/dynalink/test/TrustedGuardingDynamicLinkerExporter.java rename to test/nashorn/src/jdk/dynalink/test/TrustedGuardingDynamicLinkerExporter.java diff --git a/nashorn/test/src/jdk/dynalink/test/TrustedUnderscoreNameLinkerExporter.java b/test/nashorn/src/jdk/dynalink/test/TrustedUnderscoreNameLinkerExporter.java similarity index 100% rename from nashorn/test/src/jdk/dynalink/test/TrustedUnderscoreNameLinkerExporter.java rename to test/nashorn/src/jdk/dynalink/test/TrustedUnderscoreNameLinkerExporter.java diff --git a/nashorn/test/src/jdk/dynalink/test/UntrustedGuardingDynamicLinkerExporter.java b/test/nashorn/src/jdk/dynalink/test/UntrustedGuardingDynamicLinkerExporter.java similarity index 100% rename from nashorn/test/src/jdk/dynalink/test/UntrustedGuardingDynamicLinkerExporter.java rename to test/nashorn/src/jdk/dynalink/test/UntrustedGuardingDynamicLinkerExporter.java diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/ArrayConversionTest.java b/test/nashorn/src/jdk/nashorn/api/javaaccess/test/ArrayConversionTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/javaaccess/test/ArrayConversionTest.java rename to test/nashorn/src/jdk/nashorn/api/javaaccess/test/ArrayConversionTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/BooleanAccessTest.java b/test/nashorn/src/jdk/nashorn/api/javaaccess/test/BooleanAccessTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/javaaccess/test/BooleanAccessTest.java rename to test/nashorn/src/jdk/nashorn/api/javaaccess/test/BooleanAccessTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/ConsStringTest.java b/test/nashorn/src/jdk/nashorn/api/javaaccess/test/ConsStringTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/javaaccess/test/ConsStringTest.java rename to test/nashorn/src/jdk/nashorn/api/javaaccess/test/ConsStringTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/MethodAccessTest.java b/test/nashorn/src/jdk/nashorn/api/javaaccess/test/MethodAccessTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/javaaccess/test/MethodAccessTest.java rename to test/nashorn/src/jdk/nashorn/api/javaaccess/test/MethodAccessTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/NumberAccessTest.java b/test/nashorn/src/jdk/nashorn/api/javaaccess/test/NumberAccessTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/javaaccess/test/NumberAccessTest.java rename to test/nashorn/src/jdk/nashorn/api/javaaccess/test/NumberAccessTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/NumberBoxingTest.java b/test/nashorn/src/jdk/nashorn/api/javaaccess/test/NumberBoxingTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/javaaccess/test/NumberBoxingTest.java rename to test/nashorn/src/jdk/nashorn/api/javaaccess/test/NumberBoxingTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/ObjectAccessTest.java b/test/nashorn/src/jdk/nashorn/api/javaaccess/test/ObjectAccessTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/javaaccess/test/ObjectAccessTest.java rename to test/nashorn/src/jdk/nashorn/api/javaaccess/test/ObjectAccessTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/Person.java b/test/nashorn/src/jdk/nashorn/api/javaaccess/test/Person.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/javaaccess/test/Person.java rename to test/nashorn/src/jdk/nashorn/api/javaaccess/test/Person.java diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/SharedObject.java b/test/nashorn/src/jdk/nashorn/api/javaaccess/test/SharedObject.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/javaaccess/test/SharedObject.java rename to test/nashorn/src/jdk/nashorn/api/javaaccess/test/SharedObject.java diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/test/StringAccessTest.java b/test/nashorn/src/jdk/nashorn/api/javaaccess/test/StringAccessTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/javaaccess/test/StringAccessTest.java rename to test/nashorn/src/jdk/nashorn/api/javaaccess/test/StringAccessTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/InvocableTest.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/InvocableTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/InvocableTest.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/InvocableTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/JDK_8148140_Test.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8148140_Test.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/JDK_8148140_Test.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8148140_Test.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/JDK_8169050_Test.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8169050_Test.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/JDK_8169050_Test.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8169050_Test.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/JSONCompatibleTest.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/JSONCompatibleTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/JSONCompatibleTest.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/JSONCompatibleTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/MultipleEngineTest.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/MultipleEngineTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/MultipleEngineTest.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/MultipleEngineTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/PluggableJSObjectTest.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/PluggableJSObjectTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/PluggableJSObjectTest.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/PluggableJSObjectTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/ScopeTest.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/ScopeTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/ScopeTest.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/ScopeTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/ScriptEngineSecurityTest.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptEngineSecurityTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/ScriptEngineSecurityTest.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptEngineSecurityTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/ScriptEngineTest.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptEngineTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/ScriptEngineTest.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptEngineTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/VariableArityTestInterface.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/VariableArityTestInterface.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/VariableArityTestInterface.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/VariableArityTestInterface.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/Window.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/Window.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/Window.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/Window.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/WindowEventHandler.java b/test/nashorn/src/jdk/nashorn/api/scripting/test/WindowEventHandler.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/WindowEventHandler.java rename to test/nashorn/src/jdk/nashorn/api/scripting/test/WindowEventHandler.java diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/resources/func.js b/test/nashorn/src/jdk/nashorn/api/scripting/test/resources/func.js similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/resources/func.js rename to test/nashorn/src/jdk/nashorn/api/scripting/test/resources/func.js diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/resources/gettersetter.js b/test/nashorn/src/jdk/nashorn/api/scripting/test/resources/gettersetter.js similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/resources/gettersetter.js rename to test/nashorn/src/jdk/nashorn/api/scripting/test/resources/gettersetter.js diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/resources/witheval.js b/test/nashorn/src/jdk/nashorn/api/scripting/test/resources/witheval.js similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/scripting/test/resources/witheval.js rename to test/nashorn/src/jdk/nashorn/api/scripting/test/resources/witheval.js diff --git a/nashorn/test/src/jdk/nashorn/api/test/NashornSQLDriver.java b/test/nashorn/src/jdk/nashorn/api/test/NashornSQLDriver.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/test/NashornSQLDriver.java rename to test/nashorn/src/jdk/nashorn/api/test/NashornSQLDriver.java diff --git a/nashorn/test/src/jdk/nashorn/api/tree/test/ParseAPITest.java b/test/nashorn/src/jdk/nashorn/api/tree/test/ParseAPITest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/api/tree/test/ParseAPITest.java rename to test/nashorn/src/jdk/nashorn/api/tree/test/ParseAPITest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/codegen/test/CompilerTest.java b/test/nashorn/src/jdk/nashorn/internal/codegen/test/CompilerTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/codegen/test/CompilerTest.java rename to test/nashorn/src/jdk/nashorn/internal/codegen/test/CompilerTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/parser/test/ParserTest.java b/test/nashorn/src/jdk/nashorn/internal/parser/test/ParserTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/parser/test/ParserTest.java rename to test/nashorn/src/jdk/nashorn/internal/parser/test/ParserTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/performance/AuroraWrapper.java b/test/nashorn/src/jdk/nashorn/internal/performance/AuroraWrapper.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/performance/AuroraWrapper.java rename to test/nashorn/src/jdk/nashorn/internal/performance/AuroraWrapper.java diff --git a/nashorn/test/src/jdk/nashorn/internal/performance/OctaneTest.java b/test/nashorn/src/jdk/nashorn/internal/performance/OctaneTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/performance/OctaneTest.java rename to test/nashorn/src/jdk/nashorn/internal/performance/OctaneTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/performance/PerformanceWrapper.java b/test/nashorn/src/jdk/nashorn/internal/performance/PerformanceWrapper.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/performance/PerformanceWrapper.java rename to test/nashorn/src/jdk/nashorn/internal/performance/PerformanceWrapper.java diff --git a/nashorn/test/src/jdk/nashorn/internal/performance/SplayTest.java b/test/nashorn/src/jdk/nashorn/internal/performance/SplayTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/performance/SplayTest.java rename to test/nashorn/src/jdk/nashorn/internal/performance/SplayTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumDtoaTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumDtoaTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumDtoaTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumDtoaTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/DiyFpTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/DiyFpTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/DiyFpTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/DiyFpTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/FastDtoaTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/FastDtoaTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/FastDtoaTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/FastDtoaTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/FixedDtoaTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/FixedDtoaTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/FixedDtoaTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/FixedDtoaTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/IeeeDoubleTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/IeeeDoubleTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/IeeeDoubleTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/IeeeDoubleTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-fixed.txt b/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-fixed.txt similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-fixed.txt rename to test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-fixed.txt diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-precision.txt b/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-precision.txt similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-precision.txt rename to test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-precision.txt diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-shortest.txt b/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-shortest.txt similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-shortest.txt rename to test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-shortest.txt diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/linker/test/JDK_8184723_Test.java b/test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/JDK_8184723_Test.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/linker/test/JDK_8184723_Test.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/JDK_8184723_Test.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/linker/test/JavaAdapterTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/JavaAdapterTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/linker/test/JavaAdapterTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/JavaAdapterTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/linker/test/NameCodecTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/NameCodecTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/linker/test/NameCodecTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/NameCodecTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/regexp/joni/test/JoniTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/test/JoniTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/regexp/joni/test/JoniTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/test/JoniTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/regexp/test/JdkRegExpTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/regexp/test/JdkRegExpTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/regexp/test/JdkRegExpTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/regexp/test/JdkRegExpTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/AddAndRemoveOnListAdapterOutsideOfJavaScriptContextTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/AddAndRemoveOnListAdapterOutsideOfJavaScriptContextTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/AddAndRemoveOnListAdapterOutsideOfJavaScriptContextTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/AddAndRemoveOnListAdapterOutsideOfJavaScriptContextTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/ClassFilterTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/ClassFilterTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/ClassFilterTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/ClassFilterTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/ConsStringTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/ConsStringTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/ConsStringTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/ConsStringTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/ContextTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/ContextTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/ContextTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/ContextTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/ExceptionsNotSerializable.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/ExceptionsNotSerializable.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/ExceptionsNotSerializable.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/ExceptionsNotSerializable.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/JDK_8078414_Test.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8078414_Test.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/JDK_8078414_Test.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8078414_Test.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/JDK_8081015_Test.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8081015_Test.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/JDK_8081015_Test.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8081015_Test.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/JDK_8142924_Test.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8142924_Test.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/JDK_8142924_Test.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8142924_Test.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/JSTypeTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/JSTypeTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/JSTypeTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/JSTypeTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/LexicalBindingTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/LexicalBindingTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/LexicalBindingTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/LexicalBindingTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/NoPersistenceCachingTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/NoPersistenceCachingTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/NoPersistenceCachingTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/NoPersistenceCachingTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/PropertyMapTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/PropertyMapTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/PropertyMapTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/PropertyMapTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/SourceTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/SourceTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/SourceTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/SourceTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/TrustedScriptEngineTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/TrustedScriptEngineTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/TrustedScriptEngineTest.java rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/TrustedScriptEngineTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/test/resources/load_test.js b/test/nashorn/src/jdk/nashorn/internal/runtime/test/resources/load_test.js similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/runtime/test/resources/load_test.js rename to test/nashorn/src/jdk/nashorn/internal/runtime/test/resources/load_test.js diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptTest.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptTest.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptTest.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptTest.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestConfig.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/TestConfig.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/TestConfig.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/TestConfig.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestFinder.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/TestFinder.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/TestFinder.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/TestFinder.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestHelper.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/TestHelper.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/TestHelper.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/TestHelper.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java rename to test/nashorn/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/InternalRunnable.java b/test/nashorn/src/jdk/nashorn/internal/test/models/InternalRunnable.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/models/InternalRunnable.java rename to test/nashorn/src/jdk/nashorn/internal/test/models/InternalRunnable.java diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/RestrictedRunnable.java b/test/nashorn/src/jdk/nashorn/internal/test/models/RestrictedRunnable.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/internal/test/models/RestrictedRunnable.java rename to test/nashorn/src/jdk/nashorn/internal/test/models/RestrictedRunnable.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/A.java b/test/nashorn/src/jdk/nashorn/test/models/A.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/A.java rename to test/nashorn/src/jdk/nashorn/test/models/A.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/ArrayConversionPreferences.java b/test/nashorn/src/jdk/nashorn/test/models/ArrayConversionPreferences.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/ArrayConversionPreferences.java rename to test/nashorn/src/jdk/nashorn/test/models/ArrayConversionPreferences.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/B.java b/test/nashorn/src/jdk/nashorn/test/models/B.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/B.java rename to test/nashorn/src/jdk/nashorn/test/models/B.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/BigAbstract.java b/test/nashorn/src/jdk/nashorn/test/models/BigAbstract.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/BigAbstract.java rename to test/nashorn/src/jdk/nashorn/test/models/BigAbstract.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/ClassLoaderAware.java b/test/nashorn/src/jdk/nashorn/test/models/ClassLoaderAware.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/ClassLoaderAware.java rename to test/nashorn/src/jdk/nashorn/test/models/ClassLoaderAware.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/ClassWithFinalFinalizer.java b/test/nashorn/src/jdk/nashorn/test/models/ClassWithFinalFinalizer.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/ClassWithFinalFinalizer.java rename to test/nashorn/src/jdk/nashorn/test/models/ClassWithFinalFinalizer.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/ClassWithInheritedFinalFinalizer.java b/test/nashorn/src/jdk/nashorn/test/models/ClassWithInheritedFinalFinalizer.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/ClassWithInheritedFinalFinalizer.java rename to test/nashorn/src/jdk/nashorn/test/models/ClassWithInheritedFinalFinalizer.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/ConstructorWithArgument.java b/test/nashorn/src/jdk/nashorn/test/models/ConstructorWithArgument.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/ConstructorWithArgument.java rename to test/nashorn/src/jdk/nashorn/test/models/ConstructorWithArgument.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/DessertTopping.java b/test/nashorn/src/jdk/nashorn/test/models/DessertTopping.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/DessertTopping.java rename to test/nashorn/src/jdk/nashorn/test/models/DessertTopping.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/DessertToppingFloorWaxDriver.java b/test/nashorn/src/jdk/nashorn/test/models/DessertToppingFloorWaxDriver.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/DessertToppingFloorWaxDriver.java rename to test/nashorn/src/jdk/nashorn/test/models/DessertToppingFloorWaxDriver.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/FinalClass.java b/test/nashorn/src/jdk/nashorn/test/models/FinalClass.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/FinalClass.java rename to test/nashorn/src/jdk/nashorn/test/models/FinalClass.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/FloorWax.java b/test/nashorn/src/jdk/nashorn/test/models/FloorWax.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/FloorWax.java rename to test/nashorn/src/jdk/nashorn/test/models/FloorWax.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/FunctionalInterfaceProvider.java b/test/nashorn/src/jdk/nashorn/test/models/FunctionalInterfaceProvider.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/FunctionalInterfaceProvider.java rename to test/nashorn/src/jdk/nashorn/test/models/FunctionalInterfaceProvider.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java b/test/nashorn/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java rename to test/nashorn/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/InternalRunnableSuperclass.java b/test/nashorn/src/jdk/nashorn/test/models/InternalRunnableSuperclass.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/InternalRunnableSuperclass.java rename to test/nashorn/src/jdk/nashorn/test/models/InternalRunnableSuperclass.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/JDK_8081015_TestModel.java b/test/nashorn/src/jdk/nashorn/test/models/JDK_8081015_TestModel.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/JDK_8081015_TestModel.java rename to test/nashorn/src/jdk/nashorn/test/models/JDK_8081015_TestModel.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/JDK_8184241Test.java b/test/nashorn/src/jdk/nashorn/test/models/JDK_8184241Test.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/JDK_8184241Test.java rename to test/nashorn/src/jdk/nashorn/test/models/JDK_8184241Test.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/Jdk8011362TestSubject.java b/test/nashorn/src/jdk/nashorn/test/models/Jdk8011362TestSubject.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/Jdk8011362TestSubject.java rename to test/nashorn/src/jdk/nashorn/test/models/Jdk8011362TestSubject.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/Jdk8072596TestSubject.java b/test/nashorn/src/jdk/nashorn/test/models/Jdk8072596TestSubject.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/Jdk8072596TestSubject.java rename to test/nashorn/src/jdk/nashorn/test/models/Jdk8072596TestSubject.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/LongProvider.java b/test/nashorn/src/jdk/nashorn/test/models/LongProvider.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/LongProvider.java rename to test/nashorn/src/jdk/nashorn/test/models/LongProvider.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/Nashorn401TestSubject.java b/test/nashorn/src/jdk/nashorn/test/models/Nashorn401TestSubject.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/Nashorn401TestSubject.java rename to test/nashorn/src/jdk/nashorn/test/models/Nashorn401TestSubject.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/NoAccessibleConstructorClass.java b/test/nashorn/src/jdk/nashorn/test/models/NoAccessibleConstructorClass.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/NoAccessibleConstructorClass.java rename to test/nashorn/src/jdk/nashorn/test/models/NoAccessibleConstructorClass.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/NonPublicClass.java b/test/nashorn/src/jdk/nashorn/test/models/NonPublicClass.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/NonPublicClass.java rename to test/nashorn/src/jdk/nashorn/test/models/NonPublicClass.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/NullProvider.java b/test/nashorn/src/jdk/nashorn/test/models/NullProvider.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/NullProvider.java rename to test/nashorn/src/jdk/nashorn/test/models/NullProvider.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/OuterClass.java b/test/nashorn/src/jdk/nashorn/test/models/OuterClass.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/OuterClass.java rename to test/nashorn/src/jdk/nashorn/test/models/OuterClass.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/OverloadedSam.java b/test/nashorn/src/jdk/nashorn/test/models/OverloadedSam.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/OverloadedSam.java rename to test/nashorn/src/jdk/nashorn/test/models/OverloadedSam.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/OverloadedSetter.java b/test/nashorn/src/jdk/nashorn/test/models/OverloadedSetter.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/OverloadedSetter.java rename to test/nashorn/src/jdk/nashorn/test/models/OverloadedSetter.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/OverrideObject.java b/test/nashorn/src/jdk/nashorn/test/models/OverrideObject.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/OverrideObject.java rename to test/nashorn/src/jdk/nashorn/test/models/OverrideObject.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/PropertyBind.java b/test/nashorn/src/jdk/nashorn/test/models/PropertyBind.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/PropertyBind.java rename to test/nashorn/src/jdk/nashorn/test/models/PropertyBind.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/Reflector.java b/test/nashorn/src/jdk/nashorn/test/models/Reflector.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/Reflector.java rename to test/nashorn/src/jdk/nashorn/test/models/Reflector.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/SourceHelper.java b/test/nashorn/src/jdk/nashorn/test/models/SourceHelper.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/SourceHelper.java rename to test/nashorn/src/jdk/nashorn/test/models/SourceHelper.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/StringArgs.java b/test/nashorn/src/jdk/nashorn/test/models/StringArgs.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/StringArgs.java rename to test/nashorn/src/jdk/nashorn/test/models/StringArgs.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/Toothpaste.java b/test/nashorn/src/jdk/nashorn/test/models/Toothpaste.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/Toothpaste.java rename to test/nashorn/src/jdk/nashorn/test/models/Toothpaste.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/VarArgConstructor.java b/test/nashorn/src/jdk/nashorn/test/models/VarArgConstructor.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/VarArgConstructor.java rename to test/nashorn/src/jdk/nashorn/test/models/VarArgConstructor.java diff --git a/nashorn/test/src/jdk/nashorn/test/models/VarArgConsumer.java b/test/nashorn/src/jdk/nashorn/test/models/VarArgConsumer.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/models/VarArgConsumer.java rename to test/nashorn/src/jdk/nashorn/test/models/VarArgConsumer.java diff --git a/nashorn/test/src/jdk/nashorn/test/tools/StaticTypeInspector.java b/test/nashorn/src/jdk/nashorn/test/tools/StaticTypeInspector.java similarity index 100% rename from nashorn/test/src/jdk/nashorn/test/tools/StaticTypeInspector.java rename to test/nashorn/src/jdk/nashorn/test/tools/StaticTypeInspector.java